From afa95855d9dbda92e617107f31c9c35d876f48a4 Mon Sep 17 00:00:00 2001 From: Andre Govinda Stahl Leiton Date: Wed, 10 Jul 2024 11:19:58 +0200 Subject: [PATCH] Update starlight and superchic --- bin/Starlight/gridpack_generation.sh | 4 ++-- bin/Superchic/gridpack_generation.sh | 2 +- .../PbPb_5p36TeV/superchic_dielectron.dat | 4 ++-- .../production/PbPb_5p36TeV/superchic_dimuon.dat | 4 ++-- .../production/PbPb_5p36TeV/superchic_ditau.dat | 4 ++-- bin/Superchic/run_generic_tarball_cvmfs.sh | 14 +++++++++++++- bin/UPCgen/production/PbPb_5p36TeV/upcgen_LbyL.in | 2 +- bin/UPCgen/production/PbPb_5p36TeV/upcgen_axion.in | 2 +- .../production/PbPb_5p36TeV/upcgen_dielectron.in | 10 +++++----- .../production/PbPb_5p36TeV/upcgen_dimuon.in | 10 +++++----- .../production/PbPb_5p36TeV/upcgen_dipion.in | 2 +- bin/UPCgen/production/PbPb_5p36TeV/upcgen_ditau.in | 2 +- bin/UPCgen/run_generic_tarball_cvmfs.sh | 14 +++++++++++++- 13 files changed, 49 insertions(+), 25 deletions(-) diff --git a/bin/Starlight/gridpack_generation.sh b/bin/Starlight/gridpack_generation.sh index 9c512f8e9f8d..90d65f4f5733 100755 --- 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 index 19ce61c4f75c..18e36971995a 100755 --- 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 index c12bd70841ae..615b41ea13df 100644 --- 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 index b96a957c30e7..8ceab8be9edb 100644 --- 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 index 29e7890e4a9b..cf779c07db4d 100644 --- 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 index f4ef612f537a..5e76aacad605 100755 --- 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 index 14390076aee7..149980b1476b 100644 --- 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 index 3d5ee83ab3a7..100579eaf110 100644 --- 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 index 3d1d2ef832e7..7d8876ce189c 100644 --- 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 index 2e6f73df3d3d..9117a3392c29 100644 --- 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 index 1887d5a8522c..162abe2ff85d 100644 --- 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 index e81d1b3f3db8..64364435ee0a 100644 --- 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 index f4ef612f537a..5e76aacad605 100755 --- 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/