Merge pull request #38 from Eventdisplay/prod5-3LST

Prod5 3LST-adjustments

Author: GernotMaier

CTA.runAnalysis.sh

@@ -233,7 +233,6 @@ then
    EDM="-sq40-LL"
    EDM="-lin40-LL"
    if [[ $P2 == *"DL2plus"* ]]; then
-   EDM="-lin30-LL"
        EDM="-sq10-LL-DL2plus"
    fi
    ARRAY=( "subArray.prod5.North-Alpha.list" )
@@ -294,9 +293,7 @@ then
       ARRAY=( "subArray.prod5.South-SV0.list" )
    fi
    ARRAYDIR="prod5"
-   TDATE="g20220902"
-   TDATE="g20221101"
-   ANADATE="${TDATE}"
+   TDATE="g20221202"
    ANADATE="g20221101"
    TMVADATE="${ANADATE}"
    EFFDATE="${ANADATE}"

analysis/CTA.MSCW_ENERGY.qsub_analyse_MC.sh

@@ -131,7 +131,7 @@ MOPT="$MOPT -redo_stereo_reconstruction -sub_array_sim_telarray_counting $LISFIL
 if [[ $DSET == *"LaPalma"* ]]; then
     MOPT="$MOPT -minangle_stereo_reconstruction=15."
 else
-    MOPT="$MOPT -minangle_stereo_reconstruction=0.01"
+    MOPT="$MOPT -minangle_stereo_reconstruction=10."
 fi
 # IMPORTANT: this must be the same or lower value as in dispBDT training
 MOPT="$MOPT -maxloss=0.2 -minfui=0."

prod5/subArray.prod5.South-Alpha-2LSTs42SSTs-sub.list

@@ -1,13 +1,20 @@
-S.C8aj-37SSTs
-S.C8aj-40SSTs
-S.C8aj-42SSTs
-S.C8aj-46SSTs
-S.C8aj-50SSTs
 S.BL-2LSTs00MSTs00SSTs-MSTF
 S.BL-2LSTsA
 S.BL-2LSTsB
 S.BL-2LSTsC
 S.BL-2LSTsD
 S.BL-2LSTsE
 S.BL-2LSTsF
+S.BL-3LSTs00MSTs00SSTs-MSTF
+S.BL-4LSTs00MSTs00SSTs-MSTF
+S.BL-B-3LSTs00MSTs00SSTs-MSTF
+S.BL-C-3LSTs00MSTs00SSTs-MSTF
+S.BL-D-3LSTs00MSTs00SSTs-MSTF
+S.C8aj-37SSTs
+S.C8aj-40SSTs
+S.C8aj-42SSTs
+S.C8aj-46SSTs
+S.C8aj-50SSTs
+S.C8ajA-46SSTs
+S.C8ajB-46SSTs
 S.M6-14MSTs-MSTF

prod5/subArray.prod5.South-Alpha-2LSTs42SSTs.list

@@ -1,3 +1,4 @@
+S-LM6C8aj-2LSTs14MSTs40SSTs-MSTF
 S-LM6C8aj-3LSTs14MSTs37SSTs-MSTF
 S-LM6C8aj-3LSTs14MSTs40SSTs-MSTF
 S-LM6C8aj-3LSTs14MSTs42SSTs-MSTF
@@ -9,10 +10,15 @@ S-LM6C8aj-4LSTs14MSTs42SSTs-MSTF
 S-LM6C8aj-4LSTs14MSTs46SSTs-MSTF
 S-LM6C8aj-4LSTs14MSTs50SSTs-MSTF
 S-LM6C8ajA-2LSTs14MSTs42SSTs-MSTF
+S-LM6C8ajA-3LSTs14MSTs46SSTs-MSTF
+S-LM6C8ajA-4LSTs14MSTs46SSTs-MSTF
 S-LM6C8ajB-2LSTs14MSTs42SSTs-MSTF
+S-LM6C8ajB-3LSTs14MSTs46SSTs-MSTF
+S-LM6C8ajB-4LSTs14MSTs46SSTs-MSTF
 S-LM6C8ajC-2LSTs14MSTs42SSTs-MSTF
+S-LM6C8ajC-3LSTs14MSTs46SSTs-MSTF
 S-LM6C8ajD-2LSTs14MSTs42SSTs-MSTF
+S-LM6C8ajD-3LSTs14MSTs46SSTs-MSTF
 S-LM6C8ajE-2LSTs14MSTs42SSTs-MSTF
 S-LM6C8ajF-2LSTs14MSTs42SSTs-MSTF
 S-M6C8aj-14MSTs37SSTs-MSTF
-S.BL-4LSTs25MSTs70SSTs-MSTF

prod5/subArray.prod5.South-AlphaC8aj-BetaPlus-sub.list

@@ -7,3 +7,6 @@ S.C8aj-50SSTs
 S.C8aj-40SSTs
 S.BL-2LSTs00MSTs00SSTs-MSTF
 S.BL-3LSTs00MSTs00SSTs-MSTF
+S.BL-B-3LSTs00MSTs00SSTs-MSTF
+S.BL-C-3LSTs00MSTs00SSTs-MSTF
+S.BL-D-3LSTs00MSTs00SSTs-MSTF

prod5/subArray.prod5.South-AlphaC8aj-BetaPlus.list

@@ -5,6 +5,8 @@ S-LM6C8ajA-4LSTs14MSTs46SSTs-MSTF
 S-LM6C8ajB-4LSTs14MSTs46SSTs-MSTF
 S-LM6C8ajA-3LSTs14MSTs46SSTs-MSTF
 S-LM6C8ajB-3LSTs14MSTs46SSTs-MSTF
+S-LM6C8ajC-3LSTs14MSTs46SSTs-MSTF
+S-LM6C8ajD-3LSTs14MSTs46SSTs-MSTF
 S-LM6C8aj-2LSTs14MSTs40SSTs-MSTF
 S-LM6C8aj-3LSTs14MSTs40SSTs-MSTF
 S-LM6C8aj-4LSTs14MSTs50SSTs-MSTF

setSoftwarePaths.sh

@@ -19,6 +19,8 @@ fi
 
 TDIR=$(pwd)
 
+export ROOTSYS=/afs/ifh.de/group/cta/cta/software/root/root-6.20.04_build/
+
 # main working directory (logs and code)
 DSET="${1}"
 export WORKDIR="${CTA_USER_WORK_DIR}/analysis/AnalysisData/${DSET}"

utilities/removeUnreaseonablePhysFiles.sh

@@ -36,6 +36,9 @@ find "$1" -name "*NIM4LST4*2LSTs00MSTs00SSTs-*" ${OPTION}
 find "$1" -name "*NIM3LST3*2LSTs00MSTs00SSTs-*" ${OPTION}
 find "$1" -name "*NIM3LST3*S.BL-2LSTs[A-Z]*" ${OPTION}
 find "$1" -name "*NIM4LST4*S.BL-2LSTs[A-Z]*" ${OPTION}
+find "$1" -name "*NIM[3-9]LST*S-*2LSTs*" ${OPTION}
+find "$1" -name "*NIM[4-9]LST*S-*3LSTs*" ${OPTION}
+find "$1" -name "*NIM[5-9]LST*S-*4LSTs*" ${OPTION}
 # 2LST 3 MSTs
 find "$1" -name "*NIM3LST3MST3*2LSTs03MSTs*" ${OPTION}
 find "$1" -name "*NIM4LST4MST4*2LSTs03MSTs*" ${OPTION}