Skip to content

Commit

Permalink
Merge pull request madgraph5#793 from valassi/gpucpp
Browse files Browse the repository at this point in the history 
Include Olivier's latest upstream changes, regenerate and run tests
  • Loading branch information
@valassi
valassi authored Nov 10, 2023
2 parents f82b7be + b89bf4c commit a059006
Show file tree
Hide file tree
Showing 407 changed files with 7,318 additions and 5,424 deletions.
2 changes: 1 addition & 1 deletion MG5aMC/mg5amcnlo
Submodule mg5amcnlo updated 80 files
+1,943 −0 .github/workflows/acceptancetest.yml
+57 −0 .github/workflows/aloha.yml
+0 −90 .github/workflows/main.yml
+582 −0 .github/workflows/unittest.yml
+2 −2 Template/LO/SubProcesses/genps.f
+2 −0 Template/MadWeight/bin/internal/pass_to_madweight
+1 −1 Template/MadWeight/src/makefile
+0 −33 Template/MadWeight/src/setrun.f
+1 −1 Template/MadWeight/transfer_function/makefile
+7 −0 Template/NLO/Cards/shower_card.dat
+57 −14 Template/NLO/MCatNLO/Scripts/MCatNLO_MadFKS_PYTHIA8.Script
+2 −0 Template/NLO/SubProcesses/test_soft_col_limits.f
+7 −2 Template/NLO/bin/aMCatNLO
+2 −2 Template/loop_material/StandAlone/Cards/MadLoopParams.dat
+13 −1 UpdateNotes.txt
+2 −3 VERSION
+19 −15 bin/create_release.py
+1 −1 bin/mg5_aMC
+1 −0 madgraph/__init__.py
+7 −2 madgraph/core/base_objects.py
+11 −9 madgraph/interface/amcatnlo_run_interface.py
+14 −3 madgraph/interface/common_run_interface.py
+2 −1 madgraph/interface/loop_interface.py
+15 −10 madgraph/interface/madevent_interface.py
+9 −4 madgraph/interface/madgraph_interface.py
+50 −13 madgraph/iolibs/export_v4.py
+1 −1 madgraph/iolibs/gen_infohtml.py
+6 −1 madgraph/loop/loop_diagram_generation.py
+12 −6 madgraph/madevent/gen_ximprove.py
+9 −4 madgraph/various/banner.py
+1 −1 madgraph/various/misc.py
+8 −2 madgraph/various/shower_card.py
+17 −1 models/import_ufo.py
+17 −1 tests/IOTests.py
+8 −5 tests/acceptance_tests/test_cmd.py
+8 −3 tests/acceptance_tests/test_cmd_amcatnlo.py
+1 −0 tests/acceptance_tests/test_cmd_madevent.py
+3 −0 tests/acceptance_tests/test_cmd_reweight.py
+1 −1 tests/acceptance_tests/test_madspin.py
+59 −43 tests/acceptance_tests/test_madweight.py
+17 −9 tests/acceptance_tests/test_model_equivalence.py
+23 −26 tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%matrix_1.f
+0 −733 ...OTestsComparison/IOExportFKSTest/test_wprod_fksew/%SubProcesses%P0_dxu_veep%V0_dxu_veep%COLLIER_interface.f
+0 −313 ...les/IOTestsComparison/IOExportFKSTest/test_wprod_fksew/%SubProcesses%P0_dxu_veep%V0_dxu_veep%CT_interface.f
+2 −13 ...es/IOTestsComparison/IOExportFKSTest/test_wprod_fksew/%SubProcesses%P0_dxu_veep%V0_dxu_veep%TIR_interface.f
+4 −4 ...TestsComparison/IOExportFKSTest/test_wprod_fksew/%SubProcesses%P0_dxu_veep%V0_dxu_veep%helas_calls_ampb_1.f
+1 −7 ...iles/IOTestsComparison/IOExportFKSTest/test_wprod_fksew/%SubProcesses%P0_dxu_veep%V0_dxu_veep%loop_matrix.f
+4 −4 ...tsComparison/IOExportFKSTest/test_wprod_fksew/%SubProcesses%P0_dxu_veep%V0_dxu_veep%mp_helas_calls_ampb_1.f
+0 −36 ...files/IOTestsComparison/IOExportFKSTest/test_wprod_fksew/%SubProcesses%P0_dxu_veep%V0_dxu_veep%polynomial.f
+0 −733 ...OTestsComparison/IOExportFKSTest/test_wprod_fksew/%SubProcesses%P0_udx_veep%V0_udx_veep%COLLIER_interface.f
+0 −313 ...les/IOTestsComparison/IOExportFKSTest/test_wprod_fksew/%SubProcesses%P0_udx_veep%V0_udx_veep%CT_interface.f
+2 −13 ...es/IOTestsComparison/IOExportFKSTest/test_wprod_fksew/%SubProcesses%P0_udx_veep%V0_udx_veep%TIR_interface.f
+4 −4 ...TestsComparison/IOExportFKSTest/test_wprod_fksew/%SubProcesses%P0_udx_veep%V0_udx_veep%helas_calls_ampb_1.f
+1 −7 ...iles/IOTestsComparison/IOExportFKSTest/test_wprod_fksew/%SubProcesses%P0_udx_veep%V0_udx_veep%loop_matrix.f
+4 −4 ...tsComparison/IOExportFKSTest/test_wprod_fksew/%SubProcesses%P0_udx_veep%V0_udx_veep%mp_helas_calls_ampb_1.f
+0 −36 ...files/IOTestsComparison/IOExportFKSTest/test_wprod_fksew/%SubProcesses%P0_udx_veep%V0_udx_veep%polynomial.f
+4 −1 tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_standalone/matrix.f
+4 −2 ...sComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%born_matrix.f
+110 −37 tests/input_files/IOTestsComparison/SquaredOrder_IOTest/sqso_uux_uuxuuxx/matrix_NoSQSO.f
+111 −37 tests/input_files/IOTestsComparison/SquaredOrder_IOTest/sqso_uux_uuxuuxx/matrix_QCDsq_le_6.f
+111 −37 ...es/IOTestsComparison/SquaredOrder_IOTest/sqso_uux_uuxuuxx/matrix_ampOrderQED2_eq_2_WGTsq_le_14_QCDsq_gt_4.f
+4 −4 tests/input_files/IOTestsComparison/TestCmdMatchBox/MatchBoxOutput/%TEST%SubProcesses%P0_wpwm_wpwm%matrix.f
+12 −8 tests/input_files/IOTestsComparison/TestCmdMatchBox/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%born_matrix.f
+2 −1 tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/born_matrix.f
+8 −3 tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/born_matrix.f
+2 −1 tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/born_matrix.f
+8 −3 tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/born_matrix.f
+2 −2 tests/input_files/IOTestsComparison/short_ML_SMQCD_default/ddx_ttx/born_matrix.f
+4 −2 tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/born_matrix.f
+2 −2 tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/born_matrix.f
+4 −2 tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/born_matrix.f
+2 −0 tests/parallel_tests/compare_gauge.py
+3 −1 tests/parallel_tests/madevent_comparator.py
+36 −7 tests/test_manager.py
+5 −1 tests/unit_tests/iolibs/test_export_fks.py
+2 −2 tests/unit_tests/iolibs/test_export_v4.py
+6 −1 tests/unit_tests/iolibs/test_link_to_ufo.py
+3 −5 tests/unit_tests/various/test_cmd.py
+2 −1 tests/unit_tests/various/test_import_ufo.py
+0 −1 vendor/SMWidth/oneloop
4 changes: 2 additions & 2 deletions epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@
__author__ = 'Andrea Valassi'
__email__ = '[email protected]'
__version__ = (1,0,0)
minimal_mg5amcnlo_version = (3,5,1)
minimal_mg5amcnlo_version = (3,5,2)
maximal_mg5amcnlo_version = (1000,1000,1000)
latest_validated_version = (3,5,1)
latest_validated_version = (3,5,2)
4 changes: 2 additions & 2 deletions epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/launch_plugin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def reset_simd(self, old_value, new_value, name):
return
Sourcedir = pjoin(os.path.dirname(os.path.dirname(self.path)), 'Source')
subprocess.call(['make', 'cleanavx'], cwd=Sourcedir, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)

def plugin_input(self, finput):
return

Expand All @@ -79,7 +79,7 @@ def check_validity(self):
self['sde_strategy'] = 1
if self['hel_recycling']:
self['hel_recycling'] = False

class GPURunCard(CPPRunCard):
def default_setup(self):
super(CPPRunCard, self).default_setup()
Expand Down
16 changes: 8 additions & 8 deletions epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/output.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,9 @@ def convert_model(self, model, wanted_lorentz=[], wanted_coupling=[]):
# AV (default from OM's tutorial) - add a debug printout
def finalize(self, matrix_element, cmdhistory, MG5options, outputflag):
"""Typically creating jpeg/HTML output/ compilation/...
cmdhistory is the list of command used so far.
MG5options are all the options of the main interface
outputflags is a list of options provided when doing the output command"""
cmdhistory is the list of command used so far.
MG5options are all the options of the main interface
outputflags is a list of options provided when doing the output command"""
misc.sprint('Entering PLUGIN_ProcessExporter.finalize', self.in_madevent_mode, type(self))
if self.in_madevent_mode:
self.add_input_for_banner()
Expand All @@ -214,7 +214,7 @@ def finalize(self, matrix_element, cmdhistory, MG5options, outputflag):
#if os.system(path + os.sep + 'patchMad.sh ' + self.dir_path + ' PROD ' + patchlevel) != 0:
# logger.debug("####### \n stdout is \n %s", stdout)
# logger.info("####### \n stderr is \n %s", stderr)
# raise Exception('ERROR! the O/S call to patchMad.sh failed')
# raise Exception('ERROR! the O/S call to patchMad.sh failed')
# OLD implementation (SH PR #762)
#if os.system(PLUGINDIR + os.sep + 'patchMad.sh ' + self.dir_path + ' PROD ' + patchlevel) != 0:
# logger.debug("####### \n stdout is \n %s", stdout)
Expand Down Expand Up @@ -267,7 +267,7 @@ def add_madevent_plugin_fct(self):
which contains a series of functions and one dictionary variable TO_OVERWRITE
that will be used to have temporary overwrite of all the key variable passed as string by their value.
all variable that are file related should be called as madgraph.dir.file.variable
"""
"""
plugin_path = os.path.dirname(os.path.realpath( __file__ ))
files.cp(pjoin(plugin_path, 'launch_plugin.py'), pjoin(self.dir_path, 'bin', 'internal'))
files.ln(pjoin(self.dir_path, 'lib'), pjoin(self.dir_path, 'SubProcesses'))
Expand All @@ -283,10 +283,10 @@ def change_output_args(args, cmd):
if 'vector_size' not in ''.join(args):
args.append('--vector_size=16')
return args

#------------------------------------------------------------------------------------

class GPU_ProcessExporter(PLUGIN_ProcessExporter):
class GPU_ProcessExporter(PLUGIN_ProcessExporter):
def change_output_args(args, cmd):
""" """
cmd._export_format = "madevent"
Expand All @@ -295,7 +295,7 @@ def change_output_args(args, cmd):
if 'vector_size' not in ''.join(args):
args.append('--vector_size=16384')
return args

def finalize(self, matrix_element, cmdhistory, MG5options, outputflag):
misc.sprint("enter dedicated function")
out = super().finalize(matrix_element, cmdhistory, MG5options, outputflag)
Expand Down
33 changes: 17 additions & 16 deletions epochX/cudacpp/ee_mumu.mad/CODEGEN_mad_ee_mumu_log.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Running MG5 in debug mode
* * * * * *
* * * *
* *
* VERSION 3.5.1_lo_vect 2023-08-08 *
* VERSION 3.5.2_lo_vect 2023-11-08 *
* *
* WARNING: UNKNOWN DEVELOPMENT VERSION. *
* WARNING: DO NOT USE FOR PRODUCTION *
Expand Down Expand Up @@ -62,7 +62,7 @@ generate e+ e- > mu+ mu-
No model currently active, so we import the Standard Model
INFO: load particles
INFO: load vertices
DEBUG: model prefixing takes 0.005366802215576172 
DEBUG: model prefixing takes 0.005372047424316406 
INFO: Restrict model sm with file models/sm/restrict_default.dat .
DEBUG: Simplifying conditional expressions 
DEBUG: remove interactions: u s w+ at order: QED=1 
Expand Down Expand Up @@ -154,7 +154,7 @@ INFO: Checking for minimal orders which gives processes.
INFO: Please specify coupling orders to bypass this step.
INFO: Trying process: e+ e- > mu+ mu- WEIGHTED<=4 @1
INFO: Process has 2 diagrams
1 processes with 2 diagrams generated in 0.005 s
1 processes with 2 diagrams generated in 0.004 s
Total: 1 processes with 2 diagrams
output madevent ../TMPOUT/CODEGEN_mad_ee_mumu --hel_recycling=False --vector_size=16384 --me_exporter=standalone_cudacpp
Load PLUGIN.CUDACPP_OUTPUT
Expand All @@ -174,7 +174,7 @@ INFO: Generating Helas calls for process: e+ e- > mu+ mu- WEIGHTED<=4 @1
INFO: Processing color information for process: e+ e- > mu+ mu- @1
INFO: Creating files in directory P1_epem_mupmum
DEBUG: kwargs[prefix] = 0 [model_handling.py at line 1058] 
DEBUG: process_exporter_cpp =  <PLUGIN.CUDACPP_OUTPUT.model_handling.PLUGIN_OneProcessExporter object at 0x7f2b9e5d1490> [export_v4.py at line 6226] 
DEBUG: process_exporter_cpp =  <PLUGIN.CUDACPP_OUTPUT.model_handling.PLUGIN_OneProcessExporter object at 0x7f64657c44f0> [export_v4.py at line 6262] 
INFO: Creating files in directory .
FileWriter <class 'PLUGIN.CUDACPP_OUTPUT.model_handling.PLUGIN_CPPWriter'> for ././CPPProcess.h
FileWriter <class 'PLUGIN.CUDACPP_OUTPUT.model_handling.PLUGIN_CPPWriter'> for ././CPPProcess.cc
Expand All @@ -183,27 +183,27 @@ INFO: Created files CPPProcess.h and CPPProcess.cc in directory ./.
DEBUG: config_map =  [1, 2] [export_cpp.py at line 711] 
DEBUG: subproc_number =  0 [export_cpp.py at line 712] 
DEBUG: Done [export_cpp.py at line 713] 
DEBUG: vector, subproc_group,self.opt['vector_size'] =  False True 16384 [export_v4.py at line 1862] 
DEBUG: vector, subproc_group,self.opt['vector_size'] =  False True 16384 [export_v4.py at line 1862] 
DEBUG: vector, subproc_group,self.opt['vector_size'] =  16384 True 16384 [export_v4.py at line 1862] 
DEBUG: vector, subproc_group,self.opt['vector_size'] =  False True 16384 [export_v4.py at line 1872] 
DEBUG: vector, subproc_group,self.opt['vector_size'] =  False True 16384 [export_v4.py at line 1872] 
DEBUG: vector, subproc_group,self.opt['vector_size'] =  16384 True 16384 [export_v4.py at line 1872] 
WARNING: vector code for lepton pdf not implemented. We removed the option to run dressed lepton 
DEBUG: vector, subproc_group,self.opt['vector_size'] =  16384 True 16384 [export_v4.py at line 1862] 
DEBUG: vector, subproc_group,self.opt['vector_size'] =  16384 True 16384 [export_v4.py at line 1872] 
INFO: Generating Feynman diagrams for Process: e+ e- > mu+ mu- WEIGHTED<=4 @1
INFO: Finding symmetric diagrams for subprocess group epem_mupmum
Generated helas calls for 1 subprocesses (2 diagrams) in 0.004 s
Wrote files for 8 helas calls in 0.102 s
Wrote files for 8 helas calls in 0.098 s
ALOHA: aloha starts to compute helicity amplitudes
ALOHA: aloha creates FFV1 routines
ALOHA: aloha creates FFV2 routines
ALOHA: aloha creates FFV4 routines
ALOHA: aloha creates 3 routines in 0.201 s
ALOHA: aloha creates 3 routines in 0.200 s
DEBUG: Entering PLUGIN_ProcessExporter.convert_model (create the model) [output.py at line 197] 
ALOHA: aloha starts to compute helicity amplitudes
ALOHA: aloha creates FFV1 routines
ALOHA: aloha creates FFV2 routines
ALOHA: aloha creates FFV4 routines
ALOHA: aloha creates FFV2_4 routines
ALOHA: aloha creates 7 routines in 0.258 s
ALOHA: aloha creates 7 routines in 0.255 s
<class 'aloha.create_aloha.AbstractRoutine'> FFV1
<class 'aloha.create_aloha.AbstractRoutine'> FFV1
<class 'aloha.create_aloha.AbstractRoutine'> FFV2
Expand Down Expand Up @@ -232,6 +232,7 @@ patching file Source/genps.inc
patching file Source/makefile
patching file SubProcesses/makefile
patching file bin/internal/gen_ximprove.py
Hunk #1 succeeded at 391 (offset 6 lines).
patching file bin/internal/madevent_interface.py
DEBUG: cd /data/avalassi/GPU2023/madgraph4gpuX/MG5aMC/TMPOUT/CODEGEN_mad_ee_mumu/SubProcesses/P1_epem_mupmum; patch -p6 -i /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.P1
patching file auto_dsig1.f
Expand All @@ -248,9 +249,9 @@ Type "launch" to generate events from this process, or see
Run "open index.html" to see more information about this process.
quit

real 0m1.973s
user 0m1.681s
sys 0m0.231s
real 0m4.853s
user 0m1.653s
sys 0m0.201s
************************************************************
* *
* W E L C O M E to *
Expand All @@ -263,7 +264,7 @@ sys 0m0.231s
* * * * * *
* * * *
* *
* VERSION 3.5.1_lo_vect *
* VERSION 3.5.2_lo_vect *
* *
* The MadGraph5_aMC@NLO Development Team - Find us at *
* https://server06.fynu.ucl.ac.be/projects/madgraph *
Expand Down Expand Up @@ -297,7 +298,7 @@ launch in debug mode
* * * * * *
* * * *
* *
* VERSION 3.5.1_lo_vect *
* VERSION 3.5.2_lo_vect *
* *
* The MadGraph5_aMC@NLO Development Team - Find us at *
* https://server06.fynu.ucl.ac.be/projects/madgraph *
Expand Down
2 changes: 1 addition & 1 deletion epochX/cudacpp/ee_mumu.mad/Cards/proc_card_mg5.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#* * * *
#* *
#* *
#* VERSION 3.5.1_lo_vect 2023-08-08 *
#* VERSION 3.5.2_lo_vect 2023-11-08 *
#* *
#* WARNING: UNKNOWN DEVELOPMENT VERSION. *
#* WARNING: DO NOT USE FOR PRODUCTION *
Expand Down
2 changes: 1 addition & 1 deletion epochX/cudacpp/ee_mumu.mad/MGMEVersion.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.5.1_lo_vect
3.5.2_lo_vect
2 changes: 1 addition & 1 deletion epochX/cudacpp/ee_mumu.mad/SubProcesses/MGVersion.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.5.1_lo_vect
3.5.2_lo_vect
2 changes: 1 addition & 1 deletion epochX/cudacpp/ee_mumu.mad/SubProcesses/P1_epem_mupmum/CPPProcess.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// Further modified by: S. Hageboeck, O. Mattelaer, S. Roiser, A. Valassi, Z. Wettersten (2020-2023) for the MG5aMC CUDACPP plugin.
//==========================================================================
// This file has been automatically generated for CUDA/C++ standalone by
// MadGraph5_aMC@NLO v. 3.5.1_lo_vect, 2023-08-08
// MadGraph5_aMC@NLO v. 3.5.2_lo_vect, 2023-11-08
// By the MadGraph5_aMC@NLO Development Team
// Visit launchpad.net/madgraph5 and amcatnlo.web.cern.ch
//==========================================================================
Expand Down
2 changes: 1 addition & 1 deletion epochX/cudacpp/ee_mumu.mad/SubProcesses/P1_epem_mupmum/CPPProcess.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// Further modified by: O. Mattelaer, S. Roiser, A. Valassi (2020-2023) for the MG5aMC CUDACPP plugin.
//==========================================================================
// This file has been automatically generated for CUDA/C++ standalone by
// MadGraph5_aMC@NLO v. 3.5.1_lo_vect, 2023-08-08
// MadGraph5_aMC@NLO v. 3.5.2_lo_vect, 2023-11-08
// By the MadGraph5_aMC@NLO Development Team
// Visit launchpad.net/madgraph5 and amcatnlo.web.cern.ch
//==========================================================================
Expand Down
2 changes: 1 addition & 1 deletion epochX/cudacpp/ee_mumu.mad/SubProcesses/P1_epem_mupmum/auto_dsig.f
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ SUBROUTINE DSIG_VEC(ALL_P,ALL_WGT,ALL_XBK,ALL_Q2FACT,ALL_CM_RAP
DOUBLE PRECISION FUNCTION DSIG(PP,WGT,IMODE)
C ****************************************************
C
C Generated by MadGraph5_aMC@NLO v. 3.5.1_lo_vect, 2023-08-08
C Generated by MadGraph5_aMC@NLO v. 3.5.2_lo_vect, 2023-11-08
C By the MadGraph5_aMC@NLO Development Team
C Visit launchpad.net/madgraph5 and amcatnlo.web.cern.ch
C
Expand Down
4 changes: 2 additions & 2 deletions epochX/cudacpp/ee_mumu.mad/SubProcesses/P1_epem_mupmum/auto_dsig1.f
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
DOUBLE PRECISION FUNCTION DSIG1(PP,WGT,IMODE)
C ****************************************************
C
C Generated by MadGraph5_aMC@NLO v. 3.5.1_lo_vect, 2023-08-08
C Generated by MadGraph5_aMC@NLO v. 3.5.2_lo_vect, 2023-11-08
C By the MadGraph5_aMC@NLO Development Team
C Visit launchpad.net/madgraph5 and amcatnlo.web.cern.ch
C
Expand Down Expand Up @@ -225,7 +225,7 @@ DOUBLE PRECISION FUNCTION DSIG1_VEC(ALL_PP, ALL_XBK, ALL_Q2FACT,
$ ALL_CM_RAP, ALL_WGT, IMODE, ALL_OUT, VECSIZE_USED)
C ****************************************************
C
C Generated by MadGraph5_aMC@NLO v. 3.5.1_lo_vect, 2023-08-08
C Generated by MadGraph5_aMC@NLO v. 3.5.2_lo_vect, 2023-11-08
C By the MadGraph5_aMC@NLO Development Team
C Visit launchpad.net/madgraph5 and amcatnlo.web.cern.ch
C
Expand Down
4 changes: 2 additions & 2 deletions epochX/cudacpp/ee_mumu.mad/SubProcesses/P1_epem_mupmum/matrix1.f
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SUBROUTINE SMATRIX1(P, RHEL, RCOL, CHANNEL, IVEC, ANS, IHEL,
$ ICOL)
C
C Generated by MadGraph5_aMC@NLO v. 3.5.1_lo_vect, 2023-08-08
C Generated by MadGraph5_aMC@NLO v. 3.5.2_lo_vect, 2023-11-08
C By the MadGraph5_aMC@NLO Development Team
C Visit launchpad.net/madgraph5 and amcatnlo.web.cern.ch
C
Expand Down Expand Up @@ -319,7 +319,7 @@ SUBROUTINE SMATRIX1(P, RHEL, RCOL, CHANNEL, IVEC, ANS, IHEL,
REAL*8 FUNCTION MATRIX1(P,NHEL,IC, IHEL,AMP2, JAMP2, IVEC)
C
C Generated by MadGraph5_aMC@NLO v. 3.5.1_lo_vect, 2023-08-08
C Generated by MadGraph5_aMC@NLO v. 3.5.2_lo_vect, 2023-11-08
C By the MadGraph5_aMC@NLO Development Team
C Visit launchpad.net/madgraph5 and amcatnlo.web.cern.ch
C
Expand Down
4 changes: 2 additions & 2 deletions epochX/cudacpp/ee_mumu.mad/SubProcesses/genps.f
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1877,12 +1877,12 @@ double precision function get_channel_cut(p, config)
d1 = iforest(1, -i, config)
d2 = iforest(2, -i, config)
do j=0,3
if (d1.gt.0.and.d1.le.2) then
if (d1.gt.0.and.d1.le.nincoming) then
ptemp(j,-i) = ptemp(j,-i) - ptemp(j, d1)
else
ptemp(j,-i) = ptemp(j,-i)+ptemp(j, d1)
endif
if (d2.gt.0.and.d2.le.2) then
if (d2.gt.0.and.d2.le.nincoming) then
ptemp(j,-i) = ptemp(j,-i) - ptemp(j, d2)
else
ptemp(j,-i) = ptemp(j,-i)+ptemp(j, d2)
Expand Down
1 change: 1 addition & 0 deletions epochX/cudacpp/ee_mumu.mad/bin/internal/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class aMCatNLOError(MadGraph5Error):
import os
import logging
import time
pjoin = os.path.join

#Look for basic file position MG5DIR and MG4DIR
MG5DIR = os.path.realpath(os.path.join(os.path.dirname(__file__),
Expand Down
13 changes: 9 additions & 4 deletions epochX/cudacpp/ee_mumu.mad/bin/internal/banner.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2704,7 +2704,8 @@ def __new__(cls, finput=None, **opt):
except Exception as error:
import launch_plugin
target_class = launch_plugin.RunCard

elif issubclass(finput, RunCard):
target_class = finput
else:
return None

Expand Down Expand Up @@ -2968,11 +2969,12 @@ def write(self, output_file, template=None, python_template=False,
if python_template and not to_write:
import string
if self.blocks:
text = string.Template(text)
mapping = {}
for b in self.blocks:
mapping[b.name] = b.get_template(self)
text = text.substitute(mapping)
if "$%s" % b.name not in text:
text += "\n$%s\n" % b.name
text = string.Template(text).substitute(mapping)

if not self.list_parameter:
text = text % self
Expand Down Expand Up @@ -4875,6 +4877,9 @@ def create_default_for_process(self, proc_characteristic, history, proc_def):
continue
break

if proc_characteristic['ninitial'] == 1:
self['SDE_strategy'] =1

if 'MLM' in proc_characteristic['limitations']:
if self['dynamical_scale_choice'] == -1:
self['dynamical_scale_choice'] = 3
Expand Down Expand Up @@ -5940,7 +5945,7 @@ def default_setup(self):
self.add_param("CheckCycle", 3)
self.add_param("MaxAttempts", 10)
self.add_param("ZeroThres", 1e-9)
self.add_param("OSThres", 1.0e-13)
self.add_param("OSThres", 1.0e-8)
self.add_param("DoubleCheckHelicityFilter", True)
self.add_param("WriteOutFilters", True)
self.add_param("UseLoopFilter", False)
Expand Down
Loading

0 comments on commit a059006

Please sign in to comment.