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

WIP: if needed fix the order of couplings #757

Merged
merged 1 commit into from
Aug 30, 2023

Conversation

roiser
Copy link
Member

@roiser roiser commented Aug 29, 2023

override the prepare_couplings function in the in PLUGIN_UFOModelConverter class
the additional functionality will re-order the dictionary keys of the dependent couplings such that they follow the correct ordering. The wanted_couplings parameter of the function contains the correct ordering as it is discovered in the OneProcessExporter class

fixes #748

the additional functionality will re-order the dictionary keys such that they follow the order of the couplings in parameter wanted_couplings
wanted_couplings contains the correct ordering as it is discovered in the OneProcessExporter class
@oliviermattelaer
Copy link
Member

I do approve this... (But we should do the merge in the other repo as well)

@valassi
Copy link
Member

valassi commented Oct 26, 2023

Thanks @roiser ! I confirm this fixes #748. It introduced a few minor issues (gqttq ref log, eemumu generation), fixed later on.

valassi added a commit to valassi/madgraph4gpu that referenced this pull request Oct 26, 2023
…coupling order in PR madgraph5#757

cp dump_SIGMA_SM_GUX_TTXUX_CPU_MadgraphTest.CompareMomentaAndME_0.txt ../../../CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/test/ref/
valassi added a commit to valassi/madgraph4gpu that referenced this pull request Oct 28, 2023
…ter merging Stefan's fix for coupling order in PR madgraph5#757 - code changes only in gq_ttq

The new codebase includes in particular also
  6bf4a65       oliviermattelaer        Wed Aug 30 14:57:19 2023 +0200  Merge pull request madgraph5#754 from madgraph5/fix_mirror
  0aba0c6       oliviermattelaer        Wed Aug 30 14:53:17 2023 +0200  Merge pull request madgraph5#757 from roiser/fixcouplingordering
  4f3cdd8       Stefan Roiser   Tue Aug 29 17:43:25 2023 +0200  in PLUGIN_UFOModelConverter overwrite teh prepare_couplings function the additional functionality will re-order the dictionary keys such that they follow the order of the couplings in parameter wanted_couplings wanted_couplings contains the correct ordering as it is discovered in the OneProcessExporter class

NB: generated code is identical in all processes except for gq_ttq

NB: ee_mumu.mad code generation (and similary ee_mumu.sa) fails with
  Command "import /data/avalassi/GPU2023/madgraph4gpuX/MG5aMC/TMPOUT/CODEGEN_mad_ee_mumu.mg" interrupted in sub-command:
  "output madevent ../TMPOUT/CODEGEN_mad_ee_mumu --hel_recycling=False --vector_size=16384 --me_exporter=standalone_cudacpp" with error:
  KeyError : 'GC_3'
valassi added a commit to valassi/madgraph4gpu that referenced this pull request Oct 28, 2023
…qttq xsec is now correct! fixes high-priority issue madgraph5#748

These three tests now succeed (they used to fail)
  ./tmad/teeMadX.sh +10x -gqttq -makeclean
  ./tmad/teeMadX.sh +10x -gqttq -makeclean -fltonly
  ./tmad/teeMadX.sh +10x -gqttq -makeclean -mixonly

NB: eemumu code generation remains to be fixed after PR madgraph5#757
valassi added a commit to valassi/madgraph4gpu that referenced this pull request Oct 28, 2023
…he ref needs updating after fixing the coupling order in PR madgraph5#757)

./tput/teeThroughputX.sh -mix -hrd -makej -gqttq -makeclean
./tput/teeThroughputX.sh -makej -gqttq -flt -bridge -makeclean
valassi added a commit to valassi/madgraph4gpu that referenced this pull request Oct 28, 2023
…coupling order in PR madgraph5#757

cp dump_SIGMA_SM_GUX_TTXUX_CPU_MadgraphTest.CompareMomentaAndME_0.txt ../../../CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/test/ref/
valassi added a commit to valassi/madgraph4gpu that referenced this pull request Oct 28, 2023
This COMPLETES the merging of the current usptream.master into oct23av
It adds the following commits by Stefan and myself (PRs madgraph5#778 madgraph5#779)
6771781       Andrea Valassi  Thu Oct 26 20:16:42 2023 +0200  Merge pull request madgraph5#779 from valassi/ghav_minorfixes
59922dd       Andrea Valassi  Thu Oct 26 17:58:55 2023 +0200  [oct23av] in CODEGEN MatrixElementKernels.cc, fix clang-format after cherry-picking Olivier's 9fc9873
040f574       Andrea Valassi  Thu Oct 26 13:06:20 2023 +0200  [oct23av] in CODEGEN, improve comments to generated code for mirror processes (see PR madgraph5#754)
7564f04       Andrea Valassi  Thu Oct 26 20:06:29 2023 +0200  Merge pull request madgraph5#778 from valassi/ghav_gqttqref
d9c3fae       Andrea Valassi  Thu Oct 26 17:19:24 2023 +0200  [oct23av] in CODEGEN, update gqttq ref file for runTest after fixing coupling order in PR madgraph5#757
c803581       Stefan Roiser   Thu Oct 26 17:46:11 2023 +0200  sync submodule
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.

xsec from fortran and cpp differ in gq_ttq tmad tests (wrong order of couplings)
3 participants