V2.5 def8

CTA.runAllScripts.sh

@@ -19,8 +19,8 @@ fi
 RUN="$1"
 SITE="South"
 
-for ZE in 20deg;
-    for NSB in dark; do
+for ZE in 20deg 40deg 52deg 60deg; do
+    for NSB in dark moon; do
         dataset="prod6-${SITE}-${ZE}-${NSB}"
         ./CTA.mainRunScriptsReduced.sh $dataset $RUN
     done

CTA.runAnalysis.sh

@@ -337,8 +337,8 @@ then
    # Reuse the existing reconstruction files, but keep products from the new
    # XGBoost analysis under a new analysis date.
    ANASOURCEDATE="g20260325"
-   ANADATE="g20260629"
-   XGBDATE="g20260629"
+   ANADATE="g20260630"
+   XGBDATE="g20260630"
    TMVADATE="${ANADATE}"
    EFFDATE="${ANADATE}"
    PHYSDATE="${EFFDATE}"

analysis/CTA.XGBSTEREO.qsub_analyse.sh

@@ -6,6 +6,7 @@
 MSCW_FILE="FFILE"
 XGBDIR="DIRXGB"
 MINTEL=TELMIN
+MAXTEL=TELMAX
 XGB="xgb_stereo"
 DSET="DATASET"
 ENV_BIN="CONDA_ENV_BIN"
@@ -37,7 +38,7 @@ MODEL_OPTIONS=( --model_prefix "${PREFIX}" )
 # high multiplicity events
 OMINTEL=${MINTEL}
 [ "$OMINTEL" -eq 2 ] && OMINTEL=23
-if [ "$MINTEL" -eq 2 ]; then
+if [ "$MINTEL" -eq 2 ] && [ "$MAXTEL" -ne 2 ]; then
     MODEL_OPTIONS+=(
         --model_prefix_high_multiplicity
         "${XGBDIR}/dispdir_bdt_mintel3"

analysis/CTA.XGBSTEREO.sub_analyse.sh

@@ -108,6 +108,11 @@ FSCRIPT="CTA.XGBSTEREO.qsub_analyse"
 for ARRAY in $VARRAY
 do
    XGBDIR=$CTA_USER_DATA_DIR/analysis/AnalysisData/$DSET/$ARRAY/$MODELDIR
+   TELMAX="3"
+   if [[ $ARRAY == *"0LSTs02MSTs00SSTs"* ]] || [[ $ARRAY == *"2LSTs00MSTs00SSTs"* ]] || [[ $ARRAY == *"0LSTs00MSTs02SSTs"* ]]; then
+       TELMAX="2"
+   fi
+
 
    for ((m = 0; m < $NPART; m++ ))
    do
@@ -125,6 +130,7 @@ do
           sed -e "s|FFILE|$FILE|" \
               -e "s|DATASET|$DSET|" \
               -e "s|TELMIN|$NIMAGESMIN|" \
+              -e "s|TELMAX|$TELMAX|" \
               -e "s|CONDA_ENV_BIN|$CONDA_ENV_BIN|" \
               -e "s|DIRXGB|$XGBDIR|" $FSCRIPT.sh > $FNAM.sh
           chmod u+x $FNAM.sh

analysis/CTA.prepareAnalysis_no_sub.sh

@@ -60,6 +60,7 @@ if [ -z "$TARGET_ANALYSIS" ]; then
     exit 1
 fi
 SOURCE_ANALYSIS=${4:-$TARGET_ANALYSIS}
+
 case "$TARGET_ANALYSIS:$SOURCE_ANALYSIS" in
     *"/"*)
         echo "Error: analysis directory arguments must be directory names, not paths" >&2
@@ -70,6 +71,10 @@ esac
 DATASET_DIR="${CTA_USER_DATA_DIR%/}/analysis/AnalysisData/$DSET"
 DIRECTIONS=( "_0deg" "_180deg" )
 
+if [[ ! -d ${DATASET_DIR}/$SOURCE_ANALYSIS ]]; then
+    SOURCE_ANALYSIS=$TARGET_ANALYSIS
+fi
+
 link_file()
 {
     local source_file=$1

docs/changes/70.maintenance.md

@@ -0,0 +1 @@
+Bugfix related to telescope multiplicity and XGB model selection.

prod6/subArray.prod6.SouthAlpha.list

@@ -14,5 +14,7 @@ S.Am-2LSTs10MSTs22SSTs
 S.Am-2LSTs11MSTs37SSTs
 S.Am-2LSTs14MSTs37SSTs
 S.Am-2LSTs14MSTs42SSTs
+S.Am-3LSTs14MSTs37SSTs
+S.Am-3LSTs14MSTs42SSTs
 S.Am-4LSTs14MSTs37SSTs
 S.Am-4LSTs14MSTs42SSTs

setSoftwarePaths.sh

@@ -47,7 +47,7 @@ if [[ -d ${WORKDIR}/code/Eventdisplay/ ]]; then
 elif [[ -d ${WORKDIR}/code ]]; then
     export EVNDISPSYS="${WORKDIR}/code"
 else
-   echo "Error: directory with software not found"
+   echo "Warning: directory with software not found"
    echo ${WORKDIR}
    return
 fi