Merge branch 'main' into prod3b-SCT-202211

Conflicts:
	CTA.runAnalysis.sh

Author: GernotMaier

CTA.mainRunScripts.sh

@@ -7,14 +7,20 @@
 
 if [ $# -lt 2 ]; then
     echo "
-./CTA.mainRunScripts.hs <data set> <run mode>
+./CTA.mainRunScripts.sh <data set> <run mode>
     
     data sets:
-        prod5-South-20deg prod5-South-40deg prod5-South-60deg
-        prod5-South-20deg-moon prod5-South-40deg-moon prod5-South-60deg-moon
-        prod5b-North-20deg prod5b-North-40deg prod5b-North-60deg
-        prod5b-North-20deg-moon prod5b-North-40deg-moon prod5b-North-60deg-moon
-        prod3b-S20deg-SCTAlpha
+
+       Prod3b analysis:
+            prod3b-S20deg-SCTAlpha
+       Prod5 analysis:
+            prod5-South-20deg prod5-South-40deg prod5-South-60deg
+            prod5-South-20deg-moon prod5-South-40deg-moon prod5-South-60deg-moon
+            prod5b-North-20deg prod5b-North-40deg prod5b-North-60deg
+            prod5b-North-20deg-moon prod5b-North-40deg-moon prod5b-North-60deg-moon
+       Prod6 analysis:
+            prod6-North-20deg
+            prod6-South-20deg
 
     run modes:
         MAKETABLES DISPBDT ANATABLES PREPARETMVA TRAIN ANGRES QC CUTS PHYS
@@ -34,17 +40,21 @@ if [[ ${P2} == *"North"* ]]; then
    NMULT=( 2 3 4 )
 fi
 LSTMULT=( 2 3 4 )
+
+# run scripts are collected here
+RUNSCRIPTDIR="${CTA_USER_LOG_DIR}/jobs/$(uuidgen)"
+mkdir -p ${RUNSCRIPTDIR}
 
 if [[ ${RUN} == "MAKETABLES" ]] || [[ ${RUN} == "DISPBDT" ]] || [[ ${RUN} == "ANATABLES" ]] || [[ ${RUN} == "PREPARETMVA" ]]; then
-   ./CTA.runAnalysis.sh ${P2} ${RUN}
-   ./CTA.runAnalysis.sh ${P2}-sub ${RUN}
+   ./CTA.runAnalysis.sh ${P2} ${RUN} 0 2 2 2 2 ${RUNSCRIPTDIR}
+   ./CTA.runAnalysis.sh ${P2}-sub ${RUN} 0 2 2 2 2 ${RUNSCRIPTDIR}
 else
     while IFS= read -r mult
     do
-        ./CTA.runAnalysis.sh ${P2} ${RUN} 0 $mult
+        ./CTA.runAnalysis.sh ${P2} ${RUN} 0 $mult ${RUNSCRIPTDIR}
     done < NIM-South.txt
     while IFS= read -r mult
     do
-        ./CTA.runAnalysis.sh ${P2}-sub ${RUN} 0 $mult
+        ./CTA.runAnalysis.sh ${P2}-sub ${RUN} 0 $mult ${RUNSCRIPTDIR}
     done < NIM-South-sub.txt
 fi