diff --git a/epochX/cudacpp/pp_dy012j.mad/Cards/run_card.dat b/epochX/cudacpp/pp_dy012j.mad/Cards/run_card.dat index ac61f6c417..e63c4fe983 100644 --- a/epochX/cudacpp/pp_dy012j.mad/Cards/run_card.dat +++ b/epochX/cudacpp/pp_dy012j.mad/Cards/run_card.dat @@ -23,7 +23,7 @@ # Number of events and rnd seed * # Warning: Do not generate more than 1M events in a single run * #********************************************************************* - 100 = nevents ! Number of unweighted events requested + 10000 = nevents ! Number of unweighted events requested 0 = iseed ! rnd seed (0=assigned automatically=default)) #********************************************************************* # Collider type and energy * @@ -233,8 +233,8 @@ systematics = systematics_program ! none, systematics [python], SysCalc [deprece #*********************************************************************** # SIMD/GPU configuration for the CUDACPP plugin #************************************************************************ -cuda = cudacpp_backend ! CUDACPP backend: fortran, cuda, hip, cpp, cppnone, cppsse4, cppavx2, cpp512y, cpp512z, cppauto + cpp = cudacpp_backend ! CUDACPP backend: fortran, cuda, hip, cpp, cppnone, cppsse4, cppavx2, cpp512y, cpp512z, cppauto #*** WARNING! Do not change the cudacpp runcard below! Users should normally change only the cudacpp_backend card *** m = cudacpp_fptype ! CUDACPP floating point precision: f (single), d (double), m (mixed: double for amplitudes, single for colors) - True = cudacpp_bldall ! CUDACPP build all available backends in separate build directories: False, True + False = cudacpp_bldall ! CUDACPP build all available backends in separate build directories: False, True diff --git a/epochX/cudacpp/pp_dy012j.mad/Source/make_opts b/epochX/cudacpp/pp_dy012j.mad/Source/make_opts index 8a937d6878..e4b87ee6ad 100644 --- a/epochX/cudacpp/pp_dy012j.mad/Source/make_opts +++ b/epochX/cudacpp/pp_dy012j.mad/Source/make_opts @@ -1,16 +1,10 @@ -FPTYPE=m -pdlabel1= -pdlabel2= -lhapdf= -PYTHIA8_PATH=NotInstalled -MG5AMC_VERSION=3.5.3_lo_vect -GLOBAL_FLAG=-ffast-math -fbounds-check -g -ALOHA_FLAG=--fast-math -MATRIX_FLAG=-O3 DEFAULT_CPP_COMPILER=g++ DEFAULT_F2PY_COMPILER=f2py3 DEFAULT_F_COMPILER=gfortran +GLOBAL_FLAG=-O3 -ffast-math -fbounds-check MACFLAG= +MG5AMC_VERSION=SpecifiedByMG5aMCAtRunTime +PYTHIA8_PATH=NotInstalled STDLIB_FLAG= STDLIB=-lstdc++ #end_of_make_opts_variables @@ -126,4 +120,4 @@ endif # Helper function to check MG5 version define CHECK_MG5AMC_VERSION python -c 'import re; from distutils.version import StrictVersion; print StrictVersion("$(MG5AMC_VERSION)") >= StrictVersion("$(1)") if re.match("^[\d\.]+$$","$(MG5AMC_VERSION)") else True;' -endef +endef \ No newline at end of file diff --git a/epochX/cudacpp/pp_dy012j.mad/Source/param_card.inc b/epochX/cudacpp/pp_dy012j.mad/Source/param_card.inc index 6c431f35ad..ffbccd5a97 100644 --- a/epochX/cudacpp/pp_dy012j.mad/Source/param_card.inc +++ b/epochX/cudacpp/pp_dy012j.mad/Source/param_card.inc @@ -1,13 +1,13 @@ - MDL_WZ = 2.441404D+00 - MDL_WW = 2.047600D+00 - MDL_WH = 6.382339D-03 - MDL_WT = 1.491500D+00 + MDL_MT = 1.730000D+02 MDL_MTA = 1.777000D+00 MDL_MZ = 9.118800D+01 MDL_MH = 1.250000D+02 - MDL_MT = 1.730000D+02 AEWM1 = 1.325070D+02 MDL_GF = 1.166390D-05 AS = 1.180000D-01 - MDL_YMTAU = 1.777000D+00 MDL_YMT = 1.730000D+02 + MDL_YMTAU = 1.777000D+00 + MDL_WT = 1.491500D+00 + MDL_WZ = 2.441404D+00 + MDL_WW = 2.047600D+00 + MDL_WH = 6.382339D-03 diff --git a/epochX/cudacpp/pp_dy012j.mad/Source/run_card.inc b/epochX/cudacpp/pp_dy012j.mad/Source/run_card.inc index 50b0e3be01..096c853f8f 100644 --- a/epochX/cudacpp/pp_dy012j.mad/Source/run_card.inc +++ b/epochX/cudacpp/pp_dy012j.mad/Source/run_card.inc @@ -1,6 +1,6 @@ GRIDPACK = .FALSE. - NEVENTS = 100 + NEVENTS = 10000 ISEED = 0 diff --git a/epochX/cudacpp/pp_dy012j.mad/SubProcesses/P2_uc_epemuc/auto_dsig1.f b/epochX/cudacpp/pp_dy012j.mad/SubProcesses/P2_uc_epemuc/auto_dsig1.f index ddbe4e3e6b..e15b2ac220 100644 --- a/epochX/cudacpp/pp_dy012j.mad/SubProcesses/P2_uc_epemuc/auto_dsig1.f +++ b/epochX/cudacpp/pp_dy012j.mad/SubProcesses/P2_uc_epemuc/auto_dsig1.f @@ -381,10 +381,7 @@ DOUBLE PRECISION FUNCTION DSIG1_VEC(ALL_PP, ALL_XBK, ALL_Q2FACT, RETURN ENDIF - write(6,*) 'maxproc=', maxproc DO IVEC=1,VECSIZE_USED - write(6,*) 'ivec, all_pd(0,ivec) =', ivec, all_pd(0,ivec) - write(6,*) 'all_pd(0,ivec) == 0?', all_pd(0,ivec).eq.0 C Do not need those three here do I? XBK(:) = ALL_XBK(:,IVEC) C CM_RAP = ALL_CM_RAP(IVEC) diff --git a/epochX/cudacpp/pp_dy012j.mad/SubProcesses/cudacpp.mk b/epochX/cudacpp/pp_dy012j.mad/SubProcesses/cudacpp.mk index 64501d9903..359f16c029 100644 --- a/epochX/cudacpp/pp_dy012j.mad/SubProcesses/cudacpp.mk +++ b/epochX/cudacpp/pp_dy012j.mad/SubProcesses/cudacpp.mk @@ -89,7 +89,7 @@ ifeq ($(shell $(CXX) --version | grep ^nvc++),) CXXFLAGS += -ffast-math # see issue #117 endif ###CXXFLAGS+= -Ofast # performance is not different from --fast-math -CXXFLAGS+= -g # FOR DEBUGGING ONLY +###CXXFLAGS+= -g # FOR DEBUGGING ONLY # Optionally add debug flags to display the full list of flags (eg on Darwin) ###CXXFLAGS+= -v diff --git a/epochX/cudacpp/pp_dy012j.mad/SubProcesses/randinit b/epochX/cudacpp/pp_dy012j.mad/SubProcesses/randinit index 5fb673d7e7..828ab5393f 100644 --- a/epochX/cudacpp/pp_dy012j.mad/SubProcesses/randinit +++ b/epochX/cudacpp/pp_dy012j.mad/SubProcesses/randinit @@ -1 +1 @@ -r=27 +r=21 diff --git a/epochX/cudacpp/pp_dy012j.mad/bin/internal/gen_ximprove.py b/epochX/cudacpp/pp_dy012j.mad/bin/internal/gen_ximprove.py index 58bb700889..c86da36a05 100755 --- a/epochX/cudacpp/pp_dy012j.mad/bin/internal/gen_ximprove.py +++ b/epochX/cudacpp/pp_dy012j.mad/bin/internal/gen_ximprove.py @@ -938,7 +938,7 @@ def resubmit_survey(self, Pdir, G, Gdirs, step): def write_parameter_file(self, path, options): """ """ - template =""" 8192 1 1 !Number of events and max and min iterations + template =""" %(event)s %(maxiter)s %(miniter)s !Number of events and max and min iterations %(accuracy)s !Accuracy %(gridmode)s !Grid Adjustment 0=none, 2=adjust 1 !Suppress Amplitude 1=yes diff --git a/epochX/cudacpp/pp_dy012j.mad/bin/internal/madevent_interface.py b/epochX/cudacpp/pp_dy012j.mad/bin/internal/madevent_interface.py index cbaf668ece..2a118e21bf 100755 --- a/epochX/cudacpp/pp_dy012j.mad/bin/internal/madevent_interface.py +++ b/epochX/cudacpp/pp_dy012j.mad/bin/internal/madevent_interface.py @@ -2053,8 +2053,8 @@ class MadEventCmd(CompleteForCmd, CmdExtended, HelpToCmd, common_run.CommonRunCm _save_opts = ['options'] _initMadLoop_opts = ['-f','-r','--nPS='] # survey options, dict from name to type, default value, and help text - _survey_options = {'points':('int', 8192,'Number of points for first iteration'), - 'iterations':('int', 1, 'Number of iterations'), + _survey_options = {'points':('int', 1000,'Number of points for first iteration'), + 'iterations':('int', 5, 'Number of iterations'), 'accuracy':('float', 0.1, 'Required accuracy'), 'gridpack':('str', '.false.', 'Gridpack generation')} # Variables to store object information