v492.0 dev4 - use pip for v2dl3

scripts/IRF.generalproduction.sh

@@ -15,6 +15,7 @@ required parameters:
 
     <sim type>              simulation type
                             Main types: GRISU, CARE_24_20, CARE_RedHV_Feb2024, CARE_UV_2212
+                            V6 basic types: CARE_202404, CARE_RedHV_Feb202
                             Others: CARE_June2020, CARE_RedHV, CARE_202404
 
     <IRF type>              type of instrument response function to produce.

scripts/IRF.production.sh

@@ -15,6 +15,7 @@ required parameters:
     <sim type>              simulation type
                             (e.g. GRISU, CARE_June2020, CARE_RedHV, CARE_UV,
                             CARE_RedHV_Feb2024, CARE_202404, CARE_24_20)
+                            V6 basic types: CARE_202404, CARE_RedHV_Feb2024
 
     <IRF type>              type of instrument response function to produce
                             (e.g. EVNDISP, MAKETABLES, COMBINETABLES,

scripts/helper_scripts/ANALYSIS.anasum_sub.sh

@@ -27,21 +27,24 @@ BACKGND=BBACKGND
 # default simulation types
 SIMTYPE_DEFAULT_V4="GRISU"
 SIMTYPE_DEFAULT_V5="GRISU"
-SIMTYPE_DEFAULT_V6="CARE_24_20"
+SIMTYPE_DEFAULT_V6="CARE_202404"
 SIMTYPE_DEFAULT_V6_REDHV="CARE_RedHV_Feb2024"
 SIMTYPE_DEFAULT_V6_UV="CARE_UV_2212"
 if [[ $IRFVERSION == v490* ]]; then
     SIMTYPE_DEFAULT_V6="CARE_June2020"
     SIMTYPE_DEFAULT_V6_REDHV="CARE_RedHV"
+elif [[ $IRFVERSION == v491* ]]; then
+    SIMTYPE_DEFAULT_V6="CARE_24_20"
+    SIMTYPE_DEFAULT_V6_REDHV="CARE_RedHV_Feb2024"
 fi
 
 INFILEPATH="$INDIR/$RUNNUM.mscw.root"
 OUTPUTDATAFILE="$ODIR/$ONAME.root"
 OUTPUTLOGFILE="$ODIR/$ONAME.log"
 
-# temporary (scratch) directory
-if [[ -n $TMPDIR ]]; then
-    TEMPDIR=${TMPDIR}/MSCWDISP-$(uuidgen)
+# temporary directory
+if [[ -n "$TMPDIR" ]]; then
+    TEMPDIR="${TMPDIR}/MSCWDISP-$(uuidgen)"
 else
     TEMPDIR="$VERITAS_USER_DATA_DIR/TMPDIR/MSCWDISP-$(uuidgen)"
 fi
@@ -235,5 +238,3 @@ fi
 
 echo "RUN$RUNNUM ANPARLOG log file: $OUTPUTLOGFILE"
 echo "RUN$RUNNUM ANPARDATA data file: $OUTPUTDATAFILE"
-
-exit

scripts/helper_scripts/ANALYSIS.mscw_energy_sub.sh

@@ -17,12 +17,15 @@ IRFVERSION=VERSIONIRF
 # default simulation types
 SIMTYPE_DEFAULT_V4="GRISU"
 SIMTYPE_DEFAULT_V5="GRISU"
-SIMTYPE_DEFAULT_V6="CARE_24_20"
+SIMTYPE_DEFAULT_V6="CARE_202404"
 SIMTYPE_DEFAULT_V6_REDHV="CARE_RedHV_Feb2024"
 SIMTYPE_DEFAULT_V6_UV="CARE_UV_2212"
 if [[ $IRFVERSION == v490* ]]; then
     SIMTYPE_DEFAULT_V6="CARE_June2020"
     SIMTYPE_DEFAULT_V6_REDHV="CARE_RedHV"
+elif [[ $IRFVERSION == v491* ]]; then
+    SIMTYPE_DEFAULT_V6="CARE_24_20"
+    SIMTYPE_DEFAULT_V6_REDHV="CARE_RedHV_Feb2024"
 fi
 
 ANATYPE="AP"

scripts/helper_scripts/ANALYSIS.v2dl3_sub.sh

@@ -55,7 +55,7 @@ check_conda_installation
 
 source activate base
 conda activate v2dl3Eventdisplay-${V2DL3VERSION}
-export PYTHONPATH=\$PYTHONPATH:${V2DL3SYS}
+pip install -e "${V2DL3SYS%/}-v${V2DL3VERSION}"
 
 V2DL3OPT="--fuzzy_boundary zenith 0.05 --fuzzy_boundary pedvar 0.5 --save_multiplicity"
 # selection for full-gamma files
@@ -106,7 +106,7 @@ do
         continue
     fi
     echo "   ANASUM file: ${ANASUMFILE}"
-    result=$(python ${V2DL3SYS}/utils/query_anasum_runparameters.py ${ANASUMFILE} ${RUN})
+    result=$(v2dl3-eventdisplay-query-runparameters ${ANASUMFILE} ${RUN})
     EPOCH=$(echo $result |  awk '{print $2}')
     EFFAREA=$(echo $result | awk '{print $5}')
     echo "   Effective area file: $EFFAREA Epoch: $EPOCH"
@@ -136,7 +136,7 @@ do
             mkdir -p ${ODIR}/${m}${p}
             rm -f ${ODIR}/${m}${p}/${RUN}.log
 
-            python ${V2DL3SYS}/pyV2DL3/script/v2dl3_for_Eventdisplay.py \
+            v2dl3-eventdisplay \
                 --${m} \
                 ${V2DL3OPT} ${V2DL3SELECT} \
                 --file_pair ${ANASUMFILE} $VERITAS_EVNDISP_AUX_DIR/EffectiveAreas/${EFFAREA} \

scripts/helper_scripts/IRF.trainTMVAforAngularReconstruction_sub.sh

@@ -71,8 +71,10 @@ EWEIGHT=""
 if [[ $IRFVERSION != v490* ]]; then
     # TMVA options
     TMVAOPTIONS="$(grep 'MVAOPTIONS' $TMVAO | awk '{print $3}')"
+    echo "TMVAOPTIONS: $TMVAOPTIONS"
     # quality cuts
     QUALITYCUTS="$(grep 'MVAQUALITYCUTS' $TMVAO | awk '{print $3}')"
+    echo "QUALITYCUTS: $QUALITYCUTS"
 
     $EVNDISPSYS/bin/trainTMVAforAngularReconstruction \
         "${DDIR}/${NLIST}" \
@@ -98,4 +100,4 @@ fi
 cp -f ${DDIR}/${BDT}_*.root ${ODIR}/
 cp -f ${DDIR}/${BDT}_*.xml ${ODIR}/
 # (potentially large training file)
-cp -v ${DDIR}/BDTDisp.root ${ODIR}/
+cp -v ${DDIR}/BDTDisp_${TELTYPE}.root ${ODIR}/