v492-dev11

scripts/ANALYSIS.v2dl3.sh

@@ -21,7 +21,7 @@ required parameters:
 
     <cut name>              cut name to search pre-processing directories
 
-    [nruns per job]        number of runs per job (default: 100)
+    [nruns per job]        number of runs per job (default: 25)
 
 Expect installation of V2DL3 (https://github.com/VERITAS-Observatory/V2DL3) and
 corresponding conda installation (v2dl3Eventdisplay)
@@ -33,7 +33,7 @@ fi
 RUNLIST=$1
 ODIR=$2
 CUT=$3
-[[ "$4" ]] && SPLITRUN=$4 || SPLITRUN=100
+[[ "$4" ]] && SPLITRUN=$4 || SPLITRUN=25
 
 # Check that run list exists
 if [[ ! -f "$RUNLIST" ]]; then

scripts/IRF.evndisp_MC.sh

@@ -164,7 +164,7 @@ elif [ ${SIMTYPE} == "CARE_RedHV" ]; then
 elif [ ${SIMTYPE:0:4} == "CARE" ]; then
 #    VBFILENAME="*_${WOBBLE}wob_${NOISE}MHz*.zst"
 # Used for processing of pre-2025 simulations (run number starting with 65...)
-#   VBFILENAME="*_${WOBBLE}wob_${NOISE}MHz_[0-5].vbf.zst"
+#   VBFILENAME="*_${WOBBLE}wob_${NOISE}MHz_*.vbf.zst"
     VBFILENAME="*_${WOBBLE}wob_${NOISE}MHz_65*.vbf.zst"
 # Used for 2025 additional MC production
 #    VBFILENAME="*_${WOBBLE}wob_${NOISE}MHz_66*.zst"
@@ -193,7 +193,7 @@ rm -f "${FSCRIPT}.txt"
 touch "${FSCRIPT}.txt"
 
 for V in $VBFNAME; do
-    echo "$RUNNUM,$(basename $V)" >> "${FSCRIPT}.txt"
+    echo "$RUNNUM $(basename $V)" >> "${FSCRIPT}.txt"
     let "RUNNUM = ${RUNNUM} + 100"
 done
 
@@ -233,6 +233,6 @@ request_disk = $tmpdir_size
 getenv = True
 max_materialize = 50
 priority = 1
-queue RUNNUM VBFNAME from ${SUBSCRIPT}.txt
+queue RUNNUM, VBFNAME from ${SUBSCRIPT}.txt
 EOL
 fi

scripts/IRF.generate_effective_area_parts.sh

@@ -67,8 +67,8 @@ SIMTYPE="$8"
 ANALYSIS_TYPE="${9:-}"
 DISPBDT="${10:-0}"
 UUID="${11:-$(date +"%y%m%d")-$(uuidgen)}"
-# XGBVERSION="None" --> no XGB applied
-XGBVERSION="xgb"
+XGBVERSION="None" --> no XGB applied
+# XGBVERSION="xgb"
 
 echo "IRF.generate_effective_area_parts for epoch $EPOCH, atmo $ATM, zenith $ZA, wobble $WOBBLE, noise $NOISE (DISP: $DISPBDT, XGB $XGBVERSION)"
 

scripts/IRF.production.sh

@@ -38,7 +38,7 @@ optional parameters:
                              V6_2014_2015 V6_2015_2016 V6_2016_2017 V6_2017_2018 V6_2018_2019 V6_2019_2020
                              V6_2019_2020w V6_2020_2020s V6_2020_2021w V6_2021_2021s V6_2021_2022w
                              V6_2022_2022s V6_2022_2023w V6_2023_2023s V6_2023_2024w V6_2024_2024s
-                             V6_2024_2025w \")
+                             V6_2024_2025w V6_2025_2025s \")
 
     [atmosphere]            atmosphere model(s) (21/61 = winter, 22/62 = summer)
                             (default: \"61 62\")
@@ -156,7 +156,7 @@ elif [ "${SIMTYPE}" == "CARE_UV_2212" ]; then
     NSB_LEVELS=$(ls ${SIMDIR}/*.zst | awk -F "wob_" '{print $2}' | awk -F "MHz." '{print $1}' | sort | uniq)
     WOBBLE_OFFSETS=$(ls ${SIMDIR}/*.zst | awk -F "_" '{print $8}' |  awk -F "wob" '{print $1}' | sort -u)
 elif [ "${SIMTYPE}" == "CARE_RedHV" ]; then
-    SIMDIR="${VERITAS_DATA_DIR}/simulations/V6_FLWO/CARE_June1702_RHV/ATM${ATMOS}"
+    SIMDIR="${VERITAS_DCACHE_DIR}/simulations/V6_FLWO/CARE_June1702_RHV/ATM${ATMOS}"
     ZENITH_ANGLES=$(ls ${SIMDIR}/*.zst | awk -F "_zen" '{print $2}' | awk -F "deg." '{print $1}' | sort | uniq)
     NSB_LEVELS=$(ls ${SIMDIR}/*.zst | awk -F "wob_" '{print $2}' | awk -F "MHz." '{print $1}' | sort | uniq)
     WOBBLE_OFFSETS=( 0.5 )

scripts/IRF.trainTMVAforGammaHadronSeparation.sh

@@ -12,15 +12,15 @@ EDVERSION=$(cat $VERITAS_EVNDISP_AUX_DIR/IRFVERSION)
 
 if [ $# -lt 7 ]; then
 echo "
-TMVA (BDT) training for gamma/hadron separation: submit jobs from a TMVA run-parameter file
+TMVA (BDT) training for gamma/hadron separation
 
 IRF.trainTMVAforGammaHadronSeparation.sh <background file directory> <TMVA run-parameter file> <output directory> <output file name> <sim type> <epoch> <atmosphere>
 
 required parameters:
 
     <background file directory>     directory with background training (mscw) files
 
-    <TMVA run-parameter file>        TMVA run-parameter file with basic options (incl. whole range of
+    <run-parameter file>            run-parameter file with basic options (incl. whole range of
 	                                energy and zenith angle bins) and full path
 
     <output directory>              BDT files are written to this directory
@@ -33,16 +33,16 @@ required parameters:
     <epoch>                         array epoch e.g. V4, V5,
                                     V6 epochs: e.g., \"V6_2012_2013a V6_2012_2013b\"
 
-    <atmosphere>                    atmosphere model(s) (61 = winter, 62 = summer)
+    <atmosphere>                    atmosphere model (61 = winter, 62 = summer)
 
 --------------------------------------------------------------------------------
 "
 exit
 fi
 
 # Run init script
-if [ ! -n "$EVNDISP_APPTAINER" ]; then
-    bash "$( cd "$( dirname "$0" )" && pwd )/helper_scripts/UTILITY.script_init.sh"
+if [ -z "$EVNDISP_APPTAINER" ]; then
+    bash $(dirname "$0")"/helper_scripts/UTILITY.script_init.sh"
 fi
 [[ $? != "0" ]] && exit 1
 
@@ -56,7 +56,7 @@ ATM="$7"
 
 RECID="0"
 PARTICLE_TYPE="gamma"
-UUID="${12:-$(date +"%y%m%d")-$(uuidgen)}"
+UUID="${8:-$(date +"%y%m%d")-$(uuidgen)}"
 
 echo "Background file directory: $BDIR"
 echo "Run parameters: $RUNPAR"
@@ -249,7 +249,7 @@ do
       # expect training files to be from pre-processing directory
       BCKFILEDIR="$VERITAS_PREPROCESSED_DATA_DIR/$ANATYPE/mscw"
 
-      FSCRIPT="$LOGDIR"/"{$ONAME}_${EPOCH}_${ATM}_${i}_${j}"
+      FSCRIPT="$LOGDIR"/"${ONAME}_${EPOCH}_${ATM}_${i}_${j}"
       sed -e "s|RUNPARAM|$RFIL|"  \
           -e "s|MCDIRECTORY|$SDIR|" \
           -e "s|DATADIRECTORY|$BCKFILEDIR|" \

scripts/preprocessing/prepro_rsync_data_ucla.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 # Sync pre-processed Eventdisplay data with UCLA
 # This includes Eventdisplay data products
-# data products
 
 if [ ! -n "$1" ] || [ "$1" = "-h" ]; then
 echo "
@@ -24,8 +23,8 @@ VERSION="v491.0"
 VERSION="v490.7"
 BACKUP="$1"
 ANATYPE="${VERITAS_ANALYSIS_TYPE:0:2}"
-ANATYPE="AP"
 ANATYPE="NN"
+ANATYPE="AP"
 
 echo "USER: $USER VERSION $VERSION ANATYPE $ANATYPE BACKUP $BACKUP"
 if [[ $VERSION = "v490.7"* ]]; then

scripts/preprocessing/prepro_rsync_desy_dcache.sh

@@ -27,4 +27,4 @@ rsync -av $IDIR/processed_data_v490.7/NN/dl3*.tar.gz "$BDIR/v490.7/DL3/"
 echo "Syncing DL3 v491.0"
 rsync -av $IDIR/processed_data_v491.0/AP/dl3*.tar.gz "$BDIR/v491.0/"
 echo "Syncing mscw v491.0"
-rsync -av $IDIR/processed_data_v491.0/AP/mscw/* "$BDIR/v491.0/AP/"
+rsync -av $IDIR/processed_data_v491.0/AP/mscw/* "$BDIR/v491.0/AP/mscw/"

scripts/set_environment.sh

@@ -57,7 +57,7 @@ export EVNDISPSCRIPTS="$(pwd)"
 
 ########################################################################
 # software settings
-export V2DL3SYS=${USERAFSDIR}/EVNDISP/EVNDISP-400/GITHUB_Eventdisplay/PreProcessing/V2DL3
+export V2DL3SYS=${USERAFSDIR}/EVNDISP/EVNDISP-400/GITHUB_Eventdisplay/PreProcessing/V2DL3-v0.8.1
 export EVNDISP_MLSYS=${USERAFSDIR}/EVNDISP/EVNDISP-400/GITHUB_Eventdisplay/Eventdisplay-ML
 # EVENTDISPLAY using apptainers
 if [[ $PROCESS == "apptainer"* ]]; then