From 5cc8824402c00a256634957d0bee7d82fcf965d8 Mon Sep 17 00:00:00 2001
From: GernotMaier <gernot.maier@desy.de>
Date: Mon, 29 Jun 2026 14:47:30 +0200
Subject: [PATCH 1/6] dates and loops

---
 CTA.runAllScripts.sh | 2 +-
 CTA.runAnalysis.sh   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CTA.runAllScripts.sh b/CTA.runAllScripts.sh
index b1749ae..d3bcd79 100755
--- a/CTA.runAllScripts.sh
+++ b/CTA.runAllScripts.sh
@@ -19,7 +19,7 @@ fi
 RUN="$1"
 SITE="South"
 
-for ZE in 20deg;
+for ZE in 20deg 40deg 52deg 60deg; do
     for NSB in dark; do
         dataset="prod6-${SITE}-${ZE}-${NSB}"
         ./CTA.mainRunScriptsReduced.sh $dataset $RUN
diff --git a/CTA.runAnalysis.sh b/CTA.runAnalysis.sh
index e41c467..5cfaf4f 100755
--- a/CTA.runAnalysis.sh
+++ b/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}"

From de80ee16c06cfd5087cb964206154e409d288a18 Mon Sep 17 00:00:00 2001
From: GernotMaier <gernot.maier@desy.de>
Date: Wed, 1 Jul 2026 09:29:15 +0200
Subject: [PATCH 2/6] remove high multiplicity option for 2-telescope arrays

---
 analysis/CTA.XGBSTEREO.qsub_analyse.sh | 3 ++-
 analysis/CTA.XGBSTEREO.sub_analyse.sh  | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/analysis/CTA.XGBSTEREO.qsub_analyse.sh b/analysis/CTA.XGBSTEREO.qsub_analyse.sh
index 748e915..a6b73a4 100755
--- a/analysis/CTA.XGBSTEREO.qsub_analyse.sh
+++ b/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 3 ]; then
     MODEL_OPTIONS+=(
         --model_prefix_high_multiplicity
         "${XGBDIR}/dispdir_bdt_mintel3"
diff --git a/analysis/CTA.XGBSTEREO.sub_analyse.sh b/analysis/CTA.XGBSTEREO.sub_analyse.sh
index eba87c9..1cb3f26 100755
--- a/analysis/CTA.XGBSTEREO.sub_analyse.sh
+++ b/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"* ]]; 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|$NIMAGESMAX|" \
               -e "s|CONDA_ENV_BIN|$CONDA_ENV_BIN|" \
               -e "s|DIRXGB|$XGBDIR|" $FSCRIPT.sh > $FNAM.sh
           chmod u+x $FNAM.sh

From 39dcad675a436b56071e5daad701d0299bd25979 Mon Sep 17 00:00:00 2001
From: GernotMaier <gernot.maier@desy.de>
Date: Mon, 6 Jul 2026 19:55:05 +0200
Subject: [PATCH 3/6] fix source analysis path

---
 analysis/CTA.prepareAnalysis_no_sub.sh | 5 +++++
 setSoftwarePaths.sh                    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/analysis/CTA.prepareAnalysis_no_sub.sh b/analysis/CTA.prepareAnalysis_no_sub.sh
index d48966b..4e16fa1 100755
--- a/analysis/CTA.prepareAnalysis_no_sub.sh
+++ b/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
diff --git a/setSoftwarePaths.sh b/setSoftwarePaths.sh
index e26561e..dd5bb9e 100755
--- a/setSoftwarePaths.sh
+++ b/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

From 89d9303fb6226e7a94fe33eef59ad2efcecfb9cf Mon Sep 17 00:00:00 2001
From: GernotMaier <gernot.maier@desy.de>
Date: Wed, 8 Jul 2026 12:49:26 +0200
Subject: [PATCH 4/6] multiplicity

---
 CTA.runAllScripts.sh                 | 2 +-
 prod6/subArray.prod6.SouthAlpha.list | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CTA.runAllScripts.sh b/CTA.runAllScripts.sh
index d3bcd79..14a03c0 100755
--- a/CTA.runAllScripts.sh
+++ b/CTA.runAllScripts.sh
@@ -20,7 +20,7 @@ RUN="$1"
 SITE="South"
 
 for ZE in 20deg 40deg 52deg 60deg; do
-    for NSB in dark; do
+    for NSB in dark moon; do
         dataset="prod6-${SITE}-${ZE}-${NSB}"
         ./CTA.mainRunScriptsReduced.sh $dataset $RUN
     done
diff --git a/prod6/subArray.prod6.SouthAlpha.list b/prod6/subArray.prod6.SouthAlpha.list
index f26f889..81f31cf 100644
--- a/prod6/subArray.prod6.SouthAlpha.list
+++ b/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

From 19f59b54107d499b67d86b27f9b5ce64bb0a0db3 Mon Sep 17 00:00:00 2001
From: GernotMaier <gernot.maier@desy.de>
Date: Fri, 10 Jul 2026 10:29:47 +0200
Subject: [PATCH 5/6] changelog

---
 docs/changes/70.maintenance.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docs/changes/70.maintenance.md

diff --git a/docs/changes/70.maintenance.md b/docs/changes/70.maintenance.md
new file mode 100644
index 0000000..c922e31
--- /dev/null
+++ b/docs/changes/70.maintenance.md
@@ -0,0 +1 @@
+Bugfix related to telescope multiplicity and XGB model selection.

From bf20f3ba48177cb756ca76e88f0b5e23c168a06c Mon Sep 17 00:00:00 2001
From: Gernot Maier <gernot.maier@desy.de>
Date: Fri, 10 Jul 2026 10:55:34 +0200
Subject: [PATCH 6/6] maxtel fix

---
 analysis/CTA.XGBSTEREO.qsub_analyse.sh | 2 +-
 analysis/CTA.XGBSTEREO.sub_analyse.sh  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/analysis/CTA.XGBSTEREO.qsub_analyse.sh b/analysis/CTA.XGBSTEREO.qsub_analyse.sh
index a6b73a4..36a7aed 100755
--- a/analysis/CTA.XGBSTEREO.qsub_analyse.sh
+++ b/analysis/CTA.XGBSTEREO.qsub_analyse.sh
@@ -38,7 +38,7 @@ MODEL_OPTIONS=( --model_prefix "${PREFIX}" )
 # high multiplicity events
 OMINTEL=${MINTEL}
 [ "$OMINTEL" -eq 2 ] && OMINTEL=23
-if [ "$MINTEL" -eq 2 ] && [ "$MAXTEL" -ne 3 ]; then
+if [ "$MINTEL" -eq 2 ] && [ "$MAXTEL" -ne 2 ]; then
     MODEL_OPTIONS+=(
         --model_prefix_high_multiplicity
         "${XGBDIR}/dispdir_bdt_mintel3"
diff --git a/analysis/CTA.XGBSTEREO.sub_analyse.sh b/analysis/CTA.XGBSTEREO.sub_analyse.sh
index 1cb3f26..b993135 100755
--- a/analysis/CTA.XGBSTEREO.sub_analyse.sh
+++ b/analysis/CTA.XGBSTEREO.sub_analyse.sh
@@ -109,7 +109,7 @@ for ARRAY in $VARRAY
 do
    XGBDIR=$CTA_USER_DATA_DIR/analysis/AnalysisData/$DSET/$ARRAY/$MODELDIR
    TELMAX="3"
-   if [[ $ARRAY == *"0LSTs02MSTs00SSTs"* ]] || [[ $ARRAY == *"2LSTs00MSTs00SSTs"* ]]; then
+   if [[ $ARRAY == *"0LSTs02MSTs00SSTs"* ]] || [[ $ARRAY == *"2LSTs00MSTs00SSTs"* ]] || [[ $ARRAY == *"0LSTs00MSTs02SSTs"* ]]; then
        TELMAX="2"
    fi
 
@@ -130,7 +130,7 @@ do
           sed -e "s|FFILE|$FILE|" \
               -e "s|DATASET|$DSET|" \
               -e "s|TELMIN|$NIMAGESMIN|" \
-              -e "s|TELMAX|$NIMAGESMAX|" \
+              -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