Merge pull request #54 from Eventdisplay/v2.2-dev1

v2.2 dev1

Author: GernotMaier

CTA.runAnalysis.sh

@@ -258,14 +258,16 @@ then
    ARRAY=( "subArray.prod5.South-Alpha-2LSTs42SSTsBeta.list" )
    ARRAY=( "subArray.prod5.South-Alpha.list" )
    ARRAY=( "subArray.prod5.South-SV3f-v2.list" )
+   ARRAY=( "subArray.prod5.South-AlphaC8aj.list" )
    if [[ $P2 == *"sub"* ]]; then
        ARRAY=( "subArray.prod5.South-Alpha-2LSTs42SSTsBeta-sub.list")
        ARRAY=( "subArray.prod5.South-Alpha-sub.list" )
        ARRAY=( "subArray.prod5.South-SV3f-v3-sub.list" )
        ARRAY=( "subArray.prod5.South-AlphaC8aj-sub.list" )
-       ARRAY=( "subArray.prod5.South-70SSTs-sub.list" )
+#       ARRAY=( "subArray.prod5.South-70SSTs-sub.list" )
    fi
    if [[ $P2 == *"Hyper"* ]] || [[ $P2 == *"hyper"* ]]; then
+#       ARRAY=( "subArray.prod5.South-HyperSST.list" )
        ARRAY=( "subArray.prod5.South-Hyper.list" )
    fi
    if [[ $P2 == *"LST"* ]]; then
@@ -290,9 +292,9 @@ then
    ARRAYDIR="prod5"
    TDATE="g20230823"
    ANADATE="${TDATE}"
+   ANADATE="g20250108"
    TMVADATE="${ANADATE}"
    EFFDATE="${ANADATE}"
-   EFFDATE="g20240315"
    PHYSDATE="${EFFDATE}"
 ####################################
 # prod6 - Paranal and LaPalma
@@ -392,7 +394,7 @@ echo "RUN: $RUN"
 # run eventdisplay
 if [[ $RUN == "EVNDISP" ]]
 then
-  # Keep DST files on disk (require a lot of disk space
+  # Keep DST files on disk (require a lot of disk space)
   KEEPDST="0"
   for ((i = 0; i < ${#PARTICLE[@]}; i++ ))
   do

NIM-South-sub.dat

@@ -1,6 +1,3 @@
-2 1 2 2
-3 1 3 3
-4 1 4 4
 2 2 2 2
 3 3 3 3
 4 4 4 4

analysis/CTA.EVNDISP.qsub_convert_and_analyse_MC_VDST_ArrayJob.sh

@@ -189,7 +189,7 @@ do
       then
           $EVNDISPSYS/bin/logFile convLog $TMPDIR/${RUNN}.root $TMPDIR/$OFIL.$N.convert.log
       fi
-      cp -v -f $TMPDIR/[0-9]*.root ${ODIR}/${RUNN}HD_${ILINE}_${MCAZ}deg.root
+      cp -v -f $TMPDIR/[0-9]*.root ${ODIR}/${RUNN}CTAO_${ILINE}_${MCAZ}deg.root
   else
       echo "No root files found!"
       if [ -e $TMPDIR/$OFIL.$N.convert.log ]; then

analysis/CTA.EVNDISP.sub_convert_and_analyse_MC_VDST_ArrayJob.sh

@@ -224,7 +224,7 @@ do
 done
 
 echo "submit script with $FNAM.sh"
-echo "condor_submit $FNAM.sh.condor requirements='OpSysAndVer==\"AlmaLinux9\"'"
+echo "condor_submit $FNAM.sh.condor"
 echo "writing queue log and error files to $QLOG"
 
 exit

prod5/subArray.prod5.South-70SSTs-sub.list

@@ -1,2 +1,2 @@
-S.BL-0LSTs00MSTs70SSTs-MSTF
-S.C8aj-37SSTs
+S.50SST.hyperarray
+S.37SSTs-50SST.hyperarray

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

@@ -1,2 +1,3 @@
 S.C8aj-37SSTs
 S.M6-14MSTs-MSTF
+S.BL-0LSTs25MSTs00SSTs-MSTF

prod5/subArray.prod5.South-HyperSST.list

@@ -0,0 +1 @@
+S.50SST.hyperarray