Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Regenerate code (and susyggt1t1 reference logs) with couplings fix from PR 918 #934

Merged
merged 19 commits into from
Jul 29, 2024

Conversation

valassi
Copy link
Member

@valassi valassi commented Jul 22, 2024

Regenerate code with couplings fix from PR 918

This is simply an extension of PR #918 adding code regeneration - and I will add a few more manual tests probably

valassi added 2 commits July 22, 2024 19:26
…dX.sh -susyggt1t1 -makeclean) - yes indeed will revert
Revert "[susy2] check that issue madgraph5#826 is still pending (./tmad/teeMadX.sh -susyggt1t1 -makeclean) - yes indeed will revert"
This reverts commit 8d0ee2c.
@valassi valassi self-assigned this Jul 22, 2024
@valassi valassi marked this pull request as draft July 22, 2024 17:45
@valassi
Copy link
Member Author

valassi commented Jul 22, 2024

PR 918 is confirmed to fix #826 about zero cross section in a susy process, itself caused by #862 about couplings order

valassi added 10 commits July 23, 2024 16:26
…e variables in main sequence and inside functions
…but after fixing PASSED in tput scripts - all ok

./tput/teeThroughputX.sh -mix -hrd -makej -susyggt1t1 -makeclean
….sh -susyggt1t1 -makeclean)

Will regenerate all processes, launch the CI and later launch manual tests
madgraph5#918 - confirms that only susy_gg_t1t1 code has been affected
…fixing the order of couplings

CUDACPP_RUNTEST_DUMPEVENTS=1 ./build.cuda_d_inl0_hrd0/runTest_cuda.exe
\cp ../../test/ref/dump* ../../../CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/test/ref/
\cp ../../test/ref/dump* ../../../susy_gg_t1t1.sa/test/ref/
…d recreating reference logs, all ok

./tput/teeThroughputX.sh -mix -hrd -makej -susyggt1t1 -makeclean
…ll ok, confirming madgraph5#826 is fixed

./tmad/teeMadX.sh -susyggt1t1 -mix +10x
@valassi valassi changed the title WIP Regenerate code with couplings fix from PR 918 Regenerate code (and susyggt1t1 reference logs) with couplings fix from PR 918 Jul 23, 2024
@valassi valassi marked this pull request as ready for review July 23, 2024 15:13
@valassi valassi requested a review from oliviermattelaer July 23, 2024 15:13
@valassi
Copy link
Member Author

valassi commented Jul 23, 2024

Hi @oliviermattelaer this is ready for review for me can you have a look after your holidays please?

In addition to the fix in #918, this includes

  • the regeneration of all code generated processes
  • the update of the reference log for susyggt1t1 (normally this should have showed up in the CI, but I suspect there is a bug tput_test in the CI does nothing? #937 that I will have a look at)

I suggest approving this, then mering 918, then merging this one.

Copy link
Member

@oliviermattelaer oliviermattelaer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just nitpicking on two pep08 stype of writing code (that are technically in the other PR already).
But ok, this is good to go.

Thanks,

Olivier

valassi and others added 2 commits July 29, 2024 17:50
Olivier's suggestion for better pep08 formatting in python

Co-authored-by: oliviermattelaer <33414646+oliviermattelaer@users.noreply.github.com>
Olivier's suggestion for better pep08 formatting in python

Co-authored-by: oliviermattelaer <33414646+oliviermattelaer@users.noreply.github.com>
@valassi
Copy link
Member Author

valassi commented Jul 29, 2024

Just nitpicking on two pep08 stype of writing code (that are technically in the other PR already).

Thanks I committed your suggestions (can you tell me how you check pep08 please? coul dbe useful for me too)

But ok, this is good to go.

Thanks :-)

I will resolve conflicts (I have just merged #849 and #939) an dthen merge

…er merging

git checkout upstream/master $(git ls-tree --name-only HEAD */CODEGEN*txt)
@valassi
Copy link
Member Author

valassi commented Jul 29, 2024

Ok the CI has 3 failing checks.
image

I will merge 918 an dthen merge this one.

…rder madgraph5#918, and smaller patch madgraph5#939 and madgraph5#849) into susy2

Note: there is no change with respect to the previous origin/susy2 after this merge (no need to rerun the CI)
@valassi
Copy link
Member Author

valassi commented Jul 29, 2024

I had to merge upstream/master with 918 into this one.

But there is no change anywhere, no need to rerun teh CI.

I wil ljust merge.

@valassi valassi merged commit a681a18 into madgraph5:master Jul 29, 2024
66 checks passed
valassi added a commit to valassi/madgraph4gpu that referenced this pull request Jul 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants