Merge remote-tracking branch 'upstream/master' into nobm (after mergi…

…ng getgoodhel/uu_gg #705 into upstream/master)

epochX/cudacpp/CODEGEN/MG5aMC_patches/PROD/commit.GIT

@@ -1 +1 @@
-ebcb307fa
+91f37b6aa

epochX/cudacpp/CODEGEN/MG5aMC_patches/PROD/patch.P1

@@ -1,5 +1,5 @@
 diff --git b/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/auto_dsig1.f a/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/auto_dsig1.f
-index a5c686eb1..20d101dcf 100644
+index 27ed1439e..3b24a9924 100644
 --- b/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/auto_dsig1.f
 +++ a/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/auto_dsig1.f
 @@ -469,23 +469,140 @@ C
@@ -157,7 +157,7 @@ index a5c686eb1..20d101dcf 100644
        END
 
 diff --git b/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/driver.f a/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/driver.f
-index a04c93011..2825f59d0 100644
+index 71fbf2b25..0f1d199fc 100644
 --- b/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/driver.f
 +++ a/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/driver.f
 @@ -74,13 +74,77 @@ c      common/to_colstats/ncols,ncolflow,ncolalt,ic
@@ -239,7 +239,7 @@ index a04c93011..2825f59d0 100644
  c
  c     Read process number
  c
-@@ -202,8 +266,33 @@ c      call sample_result(xsec,xerr)
+@@ -207,8 +271,33 @@ c      call sample_result(xsec,xerr)
  c      write(*,*) 'Final xsec: ',xsec
 
        rewind(lun)
@@ -274,7 +274,7 @@ index a04c93011..2825f59d0 100644
        end
 
  c     $B$ get_user_params $B$ ! tag for MadWeight
-@@ -381,7 +470,7 @@ c
+@@ -386,7 +475,7 @@ c
        fopened=.false.
        tempname=filename 	 
        fine=index(tempname,' ') 	 
@@ -284,7 +284,7 @@ index a04c93011..2825f59d0 100644
        open(unit=lun,file=tempname,status='old',ERR=20)
        fopened=.true.
 diff --git b/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f a/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f
-index b6b52f2df..582e2b564 100644
+index 3ac962688..ef18aff22 100644
 --- b/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f
 +++ a/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f
 @@ -72,7 +72,10 @@ C

epochX/cudacpp/CODEGEN/MG5aMC_patches/PROD/patch.common

@@ -47,17 +47,20 @@ index 863eebbc7..92254c0f2 100644
 +      PARAMETER (VECSIZE_MEMMAX=16384) ! NB: 16k events per GPU grid is the minimum required to fill a V100 GPU
 +c     PARAMETER (VECSIZE_MEMMAX=32) ! NB: workaround for out-of-memory on Juwels: 32 is enough for no-CUDA builds (issue #498)
 diff --git b/epochX/cudacpp/gg_tt.mad/SubProcesses/makefile a/epochX/cudacpp/gg_tt.mad/SubProcesses/makefile
-index 348c283be..6999320d9 100644
+index 348c283be..74db44d84 100644
 --- b/epochX/cudacpp/gg_tt.mad/SubProcesses/makefile
 +++ a/epochX/cudacpp/gg_tt.mad/SubProcesses/makefile
-@@ -1,6 +1,19 @@
+@@ -1,6 +1,22 @@
 +SHELL := /bin/bash
 +
  include ../../Source/make_opts
  FFLAGS+= -w
 
 +# Enable the C preprocessor https://gcc.gnu.org/onlinedocs/gfortran/Preprocessing-Options.html
-+FFLAGS+= -cpp 
++FFLAGS+= -cpp
++
++# Compile counters with -O3 as in the cudacpp makefile (avoid being "unfair" to Fortran #740)
++CXXFLAGS = -O3 -Wall -Wshadow -Wextra
 +
 +# Enable ccache if USECCACHE=1
 +ifeq ($(USECCACHE)$(shell echo $(CXX) | grep ccache),1)
@@ -70,7 +73,7 @@ index 348c283be..6999320d9 100644
  # Load additional dependencies of the bias module, if present
  ifeq (,$(wildcard ../bias_dependencies))
  BIASDEPENDENCIES =
-@@ -24,7 +37,26 @@ else
+@@ -24,7 +40,26 @@ else
      MADLOOP_LIB =
  endif
 
@@ -98,7 +101,7 @@ index 348c283be..6999320d9 100644
 
  LIBS = $(LIBDIR)libbias.$(libext) $(LIBDIR)libdhelas.$(libext) $(LIBDIR)libdsample.$(libext) $(LIBDIR)libgeneric.$(libext) $(LIBDIR)libpdf.$(libext) $(LIBDIR)libgammaUPC.$(libext) $(LIBDIR)libmodel.$(libext) $(LIBDIR)libcernlib.$(libext) $(MADLOOP_LIB) $(LOOP_LIBS)
 
-@@ -43,41 +75,112 @@ ifeq ($(strip $(MATRIX_HEL)),)
+@@ -43,41 +78,112 @@ ifeq ($(strip $(MATRIX_HEL)),)
  endif
 
 
@@ -179,23 +182,23 @@ index 348c283be..6999320d9 100644
 +madevent_cuda_link: $(CUDACPP_BUILDDIR)/$(PROG)_cuda
 +	rm -f $(PROG)
 +	ln -s $(CUDACPP_BUILDDIR)/$(PROG)_cuda $(PROG)
-+
+
+-$(LIBDIR)libpdf.$(libext): 
+-	cd ../../Source/PDF; make
 +# Building $(PROG)_cpp also builds $(PROG)_cuda if $(CUDACPP_CULIB) exists (improved patch for cpp-only builds #503)
 +$(CUDACPP_BUILDDIR)/$(PROG)_cpp: $(PROCESS) $(DSIG_cudacpp) auto_dsig.o $(LIBS) $(MATRIX) counters.o ompnumthreads.o $(CUDACPP_BUILDDIR)/.cudacpplibs
 +	$(FC) -o $(CUDACPP_BUILDDIR)/$(PROG)_cpp $(PROCESS) $(DSIG_cudacpp) auto_dsig.o $(MATRIX) $(LINKLIBS) $(BIASDEPENDENCIES) $(OMPFLAGS) counters.o ompnumthreads.o -L$(LIBDIR)/$(CUDACPP_BUILDDIR) -l$(CUDACPP_COMMONLIB) -l$(CUDACPP_CXXLIB) $(LIBFLAGSRPATH) $(LDFLAGS)
 +	if [ -f $(LIBDIR)/$(CUDACPP_BUILDDIR)/lib$(CUDACPP_CULIB).* ]; then $(FC) -o $(CUDACPP_BUILDDIR)/$(PROG)_cuda $(PROCESS) $(DSIG_cudacpp) auto_dsig.o $(MATRIX) $(LINKLIBS) $(BIASDEPENDENCIES) $(OMPFLAGS) counters.o ompnumthreads.o -L$(LIBDIR)/$(CUDACPP_BUILDDIR) -l$(CUDACPP_COMMONLIB) -l$(CUDACPP_CULIB) $(LIBFLAGSRPATH) $(LDFLAGS); fi
 
--$(LIBDIR)libpdf.$(libext): 
--	cd ../../Source/PDF; make
-+$(CUDACPP_BUILDDIR)/$(PROG)_cuda: $(CUDACPP_BUILDDIR)/$(PROG)_cpp
-
 -$(LIBDIR)libgammaUPC.$(libext):
 -	cd ../../Source/PDF/gammaUPC; make
++$(CUDACPP_BUILDDIR)/$(PROG)_cuda: $(CUDACPP_BUILDDIR)/$(PROG)_cpp
++
 +counters.o: counters.cc timer.h
-+	$(CXX) -std=c++11 -Wall -Wshadow -Wextra -c $< -o $@
++	$(CXX) $(CXXFLAGS) -c $< -o $@
 +
 +ompnumthreads.o: ompnumthreads.cc ompnumthreads.h
-+	$(CXX) -I. -std=c++11 -Wall -Wshadow -Wextra $(OMPFLAGS) -c $< -o $@
++	$(CXX) -I. $(CXXFLAGS) $(OMPFLAGS) -c $< -o $@
 +
 +$(PROG)_forhel: $(PROCESS) auto_dsig.o $(LIBS) $(MATRIX_HEL)
 +	$(FC) -o $(PROG)_forhel $(PROCESS) $(MATRIX_HEL) $(LINKLIBS) $(LDFLAGS) $(BIASDEPENDENCIES) $(OMPFLAGS)
@@ -227,7 +230,7 @@ index 348c283be..6999320d9 100644
 
  # Dependencies
 
-@@ -97,5 +200,61 @@ unwgt.o: genps.inc nexternal.inc symswap.inc cluster.inc run.inc message.inc \
+@@ -97,5 +203,61 @@ unwgt.o: genps.inc nexternal.inc symswap.inc cluster.inc run.inc message.inc \
  	 run_config.inc
  initcluster.o: message.inc
 
@@ -316,7 +319,7 @@ index 57f5f7bb9..bd3c24228 100644
 
  BIASLIBDIR=../../../lib/
 diff --git b/epochX/cudacpp/gg_tt.mad/bin/internal/banner.py a/epochX/cudacpp/gg_tt.mad/bin/internal/banner.py
-index 90434be1f..5d595b30b 100755
+index 27cd896a7..c1e54d3cb 100755
 --- b/epochX/cudacpp/gg_tt.mad/bin/internal/banner.py
 +++ a/epochX/cudacpp/gg_tt.mad/bin/internal/banner.py
 @@ -4164,7 +4164,8 @@ class RunCardLO(RunCard):
@@ -330,10 +333,10 @@ index 90434be1f..5d595b30b 100755
      def check_validity(self):
          """ """
 diff --git b/epochX/cudacpp/gg_tt.mad/bin/internal/gen_ximprove.py a/epochX/cudacpp/gg_tt.mad/bin/internal/gen_ximprove.py
-index 7d91ea6a1..ce7cb5735 100755
+index 4dd71db86..3b8ec3121 100755
 --- b/epochX/cudacpp/gg_tt.mad/bin/internal/gen_ximprove.py
 +++ a/epochX/cudacpp/gg_tt.mad/bin/internal/gen_ximprove.py
-@@ -367,8 +367,20 @@ class gensym(object):
+@@ -380,8 +380,20 @@ class gensym(object):
                          done = True
                  if not done:
                      raise Exception('Parsing error in gensym: %s' % stdout)
@@ -357,7 +360,7 @@ index 7d91ea6a1..ce7cb5735 100755
                  self.submit_to_cluster(job_list)
                  job_list = {}
 diff --git b/epochX/cudacpp/gg_tt.mad/bin/internal/madevent_interface.py a/epochX/cudacpp/gg_tt.mad/bin/internal/madevent_interface.py
-index a0dbe1766..f5e115dc3 100755
+index a056d3861..b70b548e5 100755
 --- b/epochX/cudacpp/gg_tt.mad/bin/internal/madevent_interface.py
 +++ a/epochX/cudacpp/gg_tt.mad/bin/internal/madevent_interface.py
 @@ -3614,8 +3614,20 @@ Beware that this can be dangerous for local multicore runs.""")

epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/__init__.py

@@ -47,6 +47,6 @@
     __author__ = 'Andrea Valassi'
     __email__ = '[email protected]'
     __version__ = (1,0,0)
-    minimal_mg5amcnlo_version = (3,5,0)
+    minimal_mg5amcnlo_version = (3,5,1)
     maximal_mg5amcnlo_version = (1000,1000,1000)
-    latest_validated_version = (3,5,0)
+    latest_validated_version = (3,5,1)

epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/madgraph/iolibs/template_files/gpu/process_function_definitions.inc

@@ -251,12 +251,12 @@ namespace mg5amcCpu
                        fptype* allDenominators,    // output: multichannel denominators[nevt], running_sum_over_helicities
 #endif
                        bool* isGoodHel )           // output: isGoodHel[ncomb] - device array (CUDA implementation)
-  { /* clang-format on */
-    fptype allMEsLast = 0;
+  {                                                         /* clang-format on */
     const int ievt = blockDim.x * blockIdx.x + threadIdx.x; // index of event (thread) in grid
-    allMEs[ievt] = 0;
     for( int ihel = 0; ihel < ncomb; ihel++ )
     {
+      // NEW IMPLEMENTATION OF GETGOODHEL (#630): RESET THE RUNNING SUM OVER HELICITIES TO 0 BEFORE ADDING A NEW HELICITY
+      allMEs[ievt] = 0;
       // NB: calculate_wavefunctions ADDS |M|^2 for a given ihel to the running sum of |M|^2 over helicities for the given event(s)
       constexpr fptype_sv* jamp2_sv = nullptr; // no need for color selection during helicity filtering
 #ifdef MGONGPU_SUPPORTS_MULTICHANNEL
@@ -265,12 +265,11 @@ namespace mg5amcCpu
 #else
       calculate_wavefunctions( ihel, allmomenta, allcouplings, allMEs, jamp2_sv );
 #endif
-      if( allMEs[ievt] != allMEsLast )
+      if( allMEs[ievt] != 0 ) // NEW IMPLEMENTATION OF GETGOODHEL (#630): COMPARE EACH HELICITY CONTRIBUTION TO 0
       {
         //if ( !isGoodHel[ihel] ) std::cout << "sigmaKin_getGoodHel ihel=" << ihel << " TRUE" << std::endl;
         isGoodHel[ihel] = true;
       }
-      allMEsLast = allMEs[ievt]; // running sum up to helicity ihel for event ievt
     }
   }
 #else
@@ -289,19 +288,11 @@ namespace mg5amcCpu
     //assert( (size_t)(allMEs) %% mgOnGpu::cppAlign == 0 ); // SANITY CHECK: require SIMD-friendly alignment [COMMENT OUT TO TEST MISALIGNED ACCESS]
     // Allocate arrays at build time to contain at least 16 events (or at least neppV events if neppV>16, e.g. in future VPUs)
     constexpr int maxtry0 = std::max( 16, neppV ); // 16, but at least neppV (otherwise the npagV loop does not even start)
-    fptype allMEsLast[maxtry0] = { 0 };            // allocated at build time: maxtry0 must be a constexpr
     // Loop over only nevt events if nevt is < 16 (note that nevt is always >= neppV)
     assert( nevt >= neppV );
     const int maxtry = std::min( maxtry0, nevt ); // 16, but at most nevt (avoid invalid memory access if nevt<maxtry0)
 
-    // PART 0 - INITIALISATION (before calculate_wavefunctions)
-    // Reset the "matrix elements" - running sums of |M|^2 over helicities for the given event
-    for( int ievt = 0; ievt < maxtry; ++ievt )
-    {
-      allMEs[ievt] = 0; // all zeros
-    }
-
-    // PART 1 - HELICITY LOOP: CALCULATE WAVEFUNCTIONS
+    // HELICITY LOOP: CALCULATE WAVEFUNCTIONS
     const int npagV = maxtry / neppV;
 #if defined MGONGPU_CPPSIMD and defined MGONGPU_FPTYPE_DOUBLE and defined MGONGPU_FPTYPE2_FLOAT
     // Mixed fptypes #537: float for color algebra and double elsewhere
@@ -320,6 +311,16 @@ namespace mg5amcCpu
 #endif
       for( int ihel = 0; ihel < ncomb; ihel++ )
       {
+        // NEW IMPLEMENTATION OF GETGOODHEL (#630): RESET THE RUNNING SUM OVER HELICITIES TO 0 BEFORE ADDING A NEW HELICITY
+        for( int ieppV = 0; ieppV < neppV; ++ieppV )
+        {
+          const int ievt = ievt00 + ieppV;
+          allMEs[ievt] = 0;
+#if defined MGONGPU_CPPSIMD and defined MGONGPU_FPTYPE_DOUBLE and defined MGONGPU_FPTYPE2_FLOAT
+          const int ievt2 = ievt00 + ieppV + neppV;
+          allMEs[ievt2] = 0;
+#endif
+        }
         constexpr fptype_sv* jamp2_sv = nullptr; // no need for color selection during helicity filtering
         //std::cout << "sigmaKin_getGoodHel ihel=" << ihel << ( isGoodHel[ihel] ? " true" : " false" ) << std::endl;
 #ifdef MGONGPU_SUPPORTS_MULTICHANNEL
@@ -331,22 +332,18 @@ namespace mg5amcCpu
         for( int ieppV = 0; ieppV < neppV; ++ieppV )
         {
           const int ievt = ievt00 + ieppV;
-          const bool differs = ( allMEs[ievt] != allMEsLast[ievt] );
-          if( differs )
+          if( allMEs[ievt] != 0 ) // NEW IMPLEMENTATION OF GETGOODHEL (#630): COMPARE EACH HELICITY CONTRIBUTION TO 0
           {
             //if ( !isGoodHel[ihel] ) std::cout << "sigmaKin_getGoodHel ihel=" << ihel << " TRUE" << std::endl;
             isGoodHel[ihel] = true;
           }
-          allMEsLast[ievt] = allMEs[ievt]; // running sum up to helicity ihel
 #if defined MGONGPU_CPPSIMD and defined MGONGPU_FPTYPE_DOUBLE and defined MGONGPU_FPTYPE2_FLOAT
           const int ievt2 = ievt00 + ieppV + neppV;
-          const bool differs2 = ( allMEs[ievt2] != allMEsLast[ievt2] );
-          if( differs2 )
+          if( allMEs[ievt2] != 0 ) // NEW IMPLEMENTATION OF GETGOODHEL (#630): COMPARE EACH HELICITY CONTRIBUTION TO 0
           {
             //if ( !isGoodHel[ihel] ) std::cout << "sigmaKin_getGoodHel ihel=" << ihel << " TRUE" << std::endl;
             isGoodHel[ihel] = true;
           }
-          allMEsLast[ievt2] = allMEs[ievt2]; // running sum up to helicity ihel
 #endif
         }
       }

epochX/cudacpp/CODEGEN/generateAndCompare.sh

@@ -38,6 +38,12 @@ function codeGenAndDiff()
     gq_ttq)
       cmd="define q = u c d s u~ c~ d~ s~; generate g q > t t~ q"
       ;;
+    gu_ttu)
+      cmd="generate g u > t t~ u"
+      ;;
+    gg_uu)
+      cmd="generate g g > u u~"
+      ;;
     gq_ttllq)
       cmd="define q = u c d s u~ c~ d~ s~; generate g q > t t~ l- l+ q"
       ;;
@@ -47,6 +53,12 @@ function codeGenAndDiff()
     pp_tttt)
       cmd="generate p p > t t~ t t~"
       ;;
+    pp_tt012j)
+      cmd="define j = p
+      generate p p > t t~ @0
+      add process p p > t t~ j @1
+      add process p p > t t~ j j @2"
+      ;;
     pp_ttW) # TEMPORARY! until no_b_mass #695 and/or #696 are fixed
       cmd="define p = p b b~
       define j = p
@@ -60,11 +72,14 @@ function codeGenAndDiff()
       generate p p > t t~ z @0
       add process p p > t t~ z j @1"
       ;;
+    uu_dd)
+      cmd="generate u u~ > d d~"
+      ;;
     uu_tt)
       cmd="generate u u~ > t t~"
       ;;
-    uu_dd)
-      cmd="generate u u~ > d d~"
+    uu_ttg)
+      cmd="generate u u~ > t t~ g"
       ;;
     bb_tt)
       cmd="generate b b~ > t t~"

epochX/cudacpp/CODEGEN/patchMad.sh

@@ -120,17 +120,18 @@ done
 cd - > /dev/null
 
 # Patch the default cudacpp code to fix a bug in coloramps
+# ** NEW AUG 2023: DISABLING THE COLORAMPS PATCH FIXES THE LHE COLOR MISMATCH IN GG_TTGG (#655 and #713) **
 # (3) Process-dependent patches
-for p1dir in ${dir}/SubProcesses/P*; do
-  cd $p1dir
-  cat coloramps.h | awk -vp=1 '{if (p==1) print $0; if ($1=="__device__") p=0}' > coloramps.h.new
-  cat coloramps.inc | sed 's|)/|)/ {|' | sed 's|/$|}, /|' \
-    | awk -vb= '{if($1~")/"){b=$2}; if($1=="$"){b=b$2}; if($3=="/"){print "    "b}}' \
-    | sed 's/.TRUE./ true/g' | sed 's/.FALSE./ false/g' | sed 's/}/ }/' >> coloramps.h.new
-  truncate -s -2 coloramps.h.new
-  echo "">> coloramps.h.new
-  cat coloramps.h | awk -vp=0 '{if ($1=="};") p=1; if (p==1) print $0}' >> coloramps.h.new
-  \mv coloramps.h.new coloramps.h
-done
+#for p1dir in ${dir}/SubProcesses/P*; do
+#  cd $p1dir
+#  cat coloramps.h | awk -vp=1 '{if (p==1) print $0; if ($1=="__device__") p=0}' > coloramps.h.new
+#  cat coloramps.inc | sed 's|)/|)/ {|' | sed 's|/$|}, /|' \
+#    | awk -vb= '{if($1~")/"){b=$2}; if($1=="$"){b=b$2}; if($3=="/"){print "    "b}}' \
+#    | sed 's/.TRUE./ true/g' | sed 's/.FALSE./ false/g' | sed 's/}/ }/' >> coloramps.h.new
+#  truncate -s -2 coloramps.h.new
+#  echo "">> coloramps.h.new
+#  cat coloramps.h | awk -vp=0 '{if ($1=="};") p=1; if (p==1) print $0}' >> coloramps.h.new
+#  \mv coloramps.h.new coloramps.h
+#done
 
 exit $status

epochX/cudacpp/ee_mumu.mad/CODEGEN_mad_ee_mumu_log.txt

@@ -14,7 +14,7 @@ Running MG5 in debug mode
 *                   *        * *        *                  *
 *                 *                       *                *
 *                                                          *
-*         VERSION 3.5.0_lo_vect         2023-06-09         *
+*         VERSION 3.5.1_lo_vect         2023-08-08         *
 *                                                          *
 *          WARNING: UNKNOWN DEVELOPMENT VERSION.           *
 *            WARNING: DO NOT USE FOR PRODUCTION            *
@@ -51,8 +51,8 @@ Note that you can still compile and run aMC@NLO with the built-in PDFs
  MG5_aMC> set lhapdf /PATH/TO/lhapdf-config
 
 Using default text editor "vi". Set another one in ./input/mg5_configuration.txt
-Using default eps viewer "evince". Set another one in ./input/mg5_configuration.txt
-No valid web browser found. Please set in ./input/mg5_configuration.txt
+No valid eps viewer found. Please set in ./input/mg5_configuration.txt
+Using default web browser "firefox". Set another one in ./input/mg5_configuration.txt
 import /data/avalassi/GPU2023/MG5aMC/ghav-mg5amcnlo/CODEGEN_mad_ee_mumu.mg
 The import format was not given, so we guess it as command
 set stdout_level DEBUG
@@ -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.005298137664794922 
+DEBUG: model prefixing  takes 0.004861593246459961 
 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 
@@ -176,7 +176,7 @@ INFO: Creating files in directory P1_epem_mupmum
 DEBUG:  Entering PLUGIN_OneProcessExporter.__init__ [model_handling.py at line 1039] 
 DEBUG:  kwargs[prefix] = 0 [model_handling.py at line 1040] 
 DEBUG:  proc_id =  1 [model_handling.py at line 1045] 
-DEBUG:  process_exporter_cpp =  <PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_OneProcessExporter object at 0x7f0559c1aa00> [export_v4.py at line 6174] 
+DEBUG:  process_exporter_cpp =  <PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_OneProcessExporter object at 0x7f7e993895e0> [export_v4.py at line 6179] 
 INFO: Creating files in directory . 
 DEBUG:  Entering PLUGIN_OneProcessExporter.generate_process_files [model_handling.py at line 1297] 
 DEBUG:  self.include_multi_channel is already defined: this is madevent+second_exporter mode [model_handling.py at line 1299] 
@@ -215,14 +215,14 @@ 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.167 s
+ALOHA: aloha creates 3 routines in  0.171 s
 DEBUG:  Entering PLUGIN_ProcessExporter.convert_model (create the model) [output.py at line 194] 
 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.217 s
+ALOHA: aloha creates 7 routines in  0.216 s
 <class 'aloha.create_aloha.AbstractRoutine'> FFV1
 <class 'aloha.create_aloha.AbstractRoutine'> FFV1
 <class 'aloha.create_aloha.AbstractRoutine'> FFV2
@@ -254,6 +254,6 @@ Type "launch" to generate events from this process, or see
 Run "open index.html" to see more information about this process.
 quit
 
-real	0m2.155s
-user	0m1.726s
-sys	0m0.362s
+real	0m1.771s
+user	0m1.516s
+sys	0m0.203s