Merge pull request cms-sw#3736 from stahlleiton/SuperChic_v5p3

Update starlight and superchic
soumyadipbarman · Jul 10, 2024 · 20285af · 20285af
2 parents 2b5bed6 + afa9585
commit 20285af
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 25 deletions.
diff --git a/bin/Starlight/gridpack_generation.sh b/bin/Starlight/gridpack_generation.sh
@@ -28,14 +28,14 @@ install_starlight(){
 
     echo "Downloading "${DPMJET}
     export DPMJETDIR=${WORKDIR}/dpmjet_v${DPMJET//[!0-9]/}
-    wget --no-verbose --no-check-certificate https://anstahll.web.cern.ch/anstahll/starlight/${DPMJET}.tar.gz
+    wget --no-verbose --no-check-certificate https://cms-project-generators.web.cern.ch/cms-project-generators/starlight/${DPMJET}.tar.gz
     tar -xzf ${DPMJET}.tar.gz && mv ${DPMJET} ${DPMJETDIR}
     rm -f ${DPMJET}.tar.gz
 
     echo "Downloading "${STARLIGHT}
     STARLIGHT_VER=${STARLIGHT//[!0-9]/}
     STARLIGHTDIR=${WORKDIR}/starlight_v${STARLIGHT_VER}
-    wget --no-verbose --no-check-certificate https://anstahll.web.cern.ch/anstahll/starlight/${STARLIGHT}.tar.gz
+    wget --no-verbose --no-check-certificate https://cms-project-generators.web.cern.ch/cms-project-generators/starlight/${STARLIGHT}.tar.gz
     tar -xzf ${STARLIGHT}.tar.gz && mv ${STARLIGHT} ${STARLIGHTDIR}
     rm -f ${STARLIGHT}.tar.gz
 

diff --git a/bin/Superchic/gridpack_generation.sh b/bin/Superchic/gridpack_generation.sh
@@ -24,7 +24,7 @@ create_setup(){
 }
 
 install_superchic(){
-    SUPERCHIC=SuperChic-5.2
+    SUPERCHIC=SuperChic-5.3
     cd ${WORKDIR}
 
     echo "Downloading "${SUPERCHIC}

diff --git a/bin/Superchic/production/PbPb_5p36TeV/superchic_dielectron.dat b/bin/Superchic/production/PbPb_5p36TeV/superchic_dielectron.dat
@@ -49,8 +49,8 @@
 ****************************************************************************************
 *******************************   general cuts    **************************************
 ****************************************************************************************
--2.5d0          ! [ymin]
-2.5d0          ! [ymax]
+-3.0d0          ! [ymin]
+3.0d0          ! [ymax]
 2d0          ! [mmin]
 202d0          ! [mmax]
 .false.        ! [gencuts] : Generate cuts below

diff --git a/bin/Superchic/production/PbPb_5p36TeV/superchic_dimuon.dat b/bin/Superchic/production/PbPb_5p36TeV/superchic_dimuon.dat
@@ -49,8 +49,8 @@
 ****************************************************************************************
 *******************************   general cuts    **************************************
 ****************************************************************************************
--2.5d0          ! [ymin]
-2.5d0          ! [ymax]
+-3.0d0          ! [ymin]
+3.0d0          ! [ymax]
 2d0          ! [mmin]
 202d0          ! [mmax]
 .false.        ! [gencuts] : Generate cuts below

diff --git a/bin/Superchic/production/PbPb_5p36TeV/superchic_ditau.dat b/bin/Superchic/production/PbPb_5p36TeV/superchic_ditau.dat
@@ -49,8 +49,8 @@
 ****************************************************************************************
 *******************************   general cuts    **************************************
 ****************************************************************************************
--2.5d0          ! [ymin]
-2.5d0          ! [ymax]
+-4.0d0          ! [ymin]
+4.0d0          ! [ymax]
 3.56d0          ! [mmin]
 50d0          ! [mmax]
 .false.        ! [gencuts] : Generate cuts below

diff --git a/bin/Superchic/run_generic_tarball_cvmfs.sh b/bin/Superchic/run_generic_tarball_cvmfs.sh
@@ -72,8 +72,20 @@ tar -xaf ${path}
 # and fallback to /tmp
 export TMPDIR=${TMPDIR:-${_CONDOR_SCRATCH_DIR:-/tmp}}
 
+# define singularity
+if [ "$use_gridpack_env" != false ]; then
+    if [ -n "$scram_arch_version" ]; then
+        sing=$(echo ${scram_arch_version} | sed -E 's/^[^0-9]*([0-9]{1,2}).*/\1/')
+    elif egrep -q "scram_arch_version=[^$]" runcmsgrid.sh; then
+        sing=$(grep "scram_arch_version=[^$]" runcmsgrid.sh | sed -E 's/^[^0-9]*([0-9]{1,2}).*/\1/')
+    fi
+    if [ -n "${sing}" ]; then
+        sing="cmssw-el"${sing}" --"
+    fi
+fi
+
 #generate events
-./runcmsgrid.sh $nevt $rnum $ncpu ${@:5}
+${sing} ./runcmsgrid.sh $nevt $rnum $ncpu ${@:5}
 
 mv cmsgrid_final.lhe $LHEWORKDIR/
 

diff --git a/bin/UPCgen/production/PbPb_5p36TeV/upcgen_LbyL.in b/bin/UPCgen/production/PbPb_5p36TeV/upcgen_LbyL.in
@@ -6,7 +6,7 @@ SQRTS 5362
 PROC_ID 22
 DO_PT_CUT 0
 PT_MIN 0
-DO_ETA_CUT 1
+DO_ETA_CUT 0
 ETA_MIN -10
 ETA_MAX 10
 DO_M_CUT 1

diff --git a/bin/UPCgen/production/PbPb_5p36TeV/upcgen_axion.in b/bin/UPCgen/production/PbPb_5p36TeV/upcgen_axion.in
@@ -8,7 +8,7 @@ ALP_MASS 1.
 ALP_WIDTH 0.01
 DO_PT_CUT 0
 PT_MIN 0
-DO_ETA_CUT 1
+DO_ETA_CUT 0
 ETA_MIN -3
 ETA_MAX 3
 ZMIN -1

diff --git a/bin/UPCgen/production/PbPb_5p36TeV/upcgen_dielectron.in b/bin/UPCgen/production/PbPb_5p36TeV/upcgen_dielectron.in
@@ -6,15 +6,15 @@ SQRTS 5362
 PROC_ID 11
 DO_PT_CUT 0
 PT_MIN 0
-DO_ETA_CUT 1
+DO_ETA_CUT 0
 ETA_MIN -2.8
 ETA_MAX 2.8
-ZMIN -1
-ZMAX 1
+ZMIN -0.9999
+ZMAX 0.9999
 MMIN 2.0
 MMAX 202.0
-YMIN -4
-YMAX 4
+YMIN -3
+YMAX 3
 BINS_Z 2000
 BINS_M 2000
 BINS_Y 250

diff --git a/bin/UPCgen/production/PbPb_5p36TeV/upcgen_dimuon.in b/bin/UPCgen/production/PbPb_5p36TeV/upcgen_dimuon.in
@@ -6,15 +6,15 @@ SQRTS 5362
 PROC_ID 13
 DO_PT_CUT 0
 PT_MIN 0
-DO_ETA_CUT 1
+DO_ETA_CUT 0
 ETA_MIN -2.8
 ETA_MAX 2.8
-ZMIN -1
-ZMAX 1
+ZMIN -0.9999
+ZMAX 0.9999
 MMIN 2.0
 MMAX 202.0
-YMIN -4
-YMAX 4
+YMIN -3
+YMAX 3
 BINS_Z 2000
 BINS_M 2000
 BINS_Y 250

diff --git a/bin/UPCgen/production/PbPb_5p36TeV/upcgen_dipion.in b/bin/UPCgen/production/PbPb_5p36TeV/upcgen_dipion.in
@@ -6,7 +6,7 @@ SQRTS 5362
 PROC_ID 111
 DO_PT_CUT 0
 PT_MIN 0
-DO_ETA_CUT 1
+DO_ETA_CUT 0
 ETA_MIN -3
 ETA_MAX 3
 ZMIN -1

diff --git a/bin/UPCgen/production/PbPb_5p36TeV/upcgen_ditau.in b/bin/UPCgen/production/PbPb_5p36TeV/upcgen_ditau.in
@@ -7,7 +7,7 @@ PROC_ID 15
 LEP_A 0
 DO_PT_CUT 0
 PT_MIN 0
-DO_ETA_CUT 1
+DO_ETA_CUT 0
 ETA_MIN -3
 ETA_MAX 3
 ZMIN -1

diff --git a/bin/UPCgen/run_generic_tarball_cvmfs.sh b/bin/UPCgen/run_generic_tarball_cvmfs.sh
@@ -72,8 +72,20 @@ tar -xaf ${path}
 # and fallback to /tmp
 export TMPDIR=${TMPDIR:-${_CONDOR_SCRATCH_DIR:-/tmp}}
 
+# define singularity
+if [ "$use_gridpack_env" != false ]; then
+    if [ -n "$scram_arch_version" ]; then
+        sing=$(echo ${scram_arch_version} | sed -E 's/^[^0-9]*([0-9]{1,2}).*/\1/')
+    elif egrep -q "scram_arch_version=[^$]" runcmsgrid.sh; then
+        sing=$(grep "scram_arch_version=[^$]" runcmsgrid.sh | sed -E 's/^[^0-9]*([0-9]{1,2}).*/\1/')
+    fi
+    if [ -n "${sing}" ]; then
+        sing="cmssw-el"${sing}" --"
+    fi
+fi
+
 #generate events
-./runcmsgrid.sh $nevt $rnum $ncpu ${@:5}
+${sing} ./runcmsgrid.sh $nevt $rnum $ncpu ${@:5}
 
 mv cmsgrid_final.lhe $LHEWORKDIR/