Merge pull request #20 from Eventdisplay/prod5-v08-DL2

Prod5 v08 dl2

Author: GernotMaier

CTA.runAnalysis.sh

@@ -219,9 +219,13 @@ then
    ARRAY=( "subArray.prod5.South-Opt-SubArray.list" )
    ARRAY=( "subArray.prod5.South-XST.list" )
    ARRAY=( "subArray.prod5.South-Opt.list" )
-   ARRAY=( "subArray.prod5.South-Opt-SubArray.list" )
+   ARRAY=( "subArray.prod5.South-Opt-14MSTs40SSTs.list" )
+   ARRAY=( "subArray.prod5.South-Opt-14MSTs40SSTs.list" )
    ARRAY=( "subArray.prod5.South-Opt-15MSTs50SSTs.list" )
-   ARRAY=( "subArray.prod5.South-Opt-13MSTs30SSTs.list" )
+   ARRAY=( "subArray.prod5.South-Opt-13MSTs40SSTs.list" )
+   ARRAY=( "subArray.prod5.South-Opt-SubArray.list" )
+   ARRAY=( "set_X.list" )
+   ARRAY=( "subArray.prod5.South-Opt-SubArray.list" )
    if [[ $P2 == *"Hyper"* ]]; then
        ARRAY=( "subArray.prod5.South-Hyper.list" )
    fi
@@ -269,8 +273,8 @@ NIMAGESMIN=$((SCMST<NIMAGESMIN ? SCMST : NIMAGESMIN))
 OBSTIME=( "50h" "5h" "30m" "10m" "10h" "20h" "100h" "500h" "5m" "1m" "2h" )
 OBSTIME=( "50h" "5h" "30m" "100s" )
 OBSTIME=( "5h" "30m" "100s" )
-OBSTIME=( "50h" )
 OBSTIME=( "30m" )
+OBSTIME=( "50h" )
 
 echo "$RUN" "$SITE"
 

analysis/CTA.EFFAREA.qsub_analyse_list.sh

@@ -61,6 +61,12 @@ if grep -q OFFAXISFINEBINNING $ANAPAR
 then
     BFINEBINNING=`grep OFFAXISFINEBINNING $ANAPAR | awk {'print $2'}`
 fi
+# DL2 filling
+DL2FILLING="FALSE"
+if grep -q DL2 $ANAPAR
+then
+   DL2FILLING=`grep DL2 $ANAPAR | awk {'print $2'}`
+fi
 
 NIMAGESMIN=`grep NIMAGESMIN $ANAPAR | awk {'print $2'}`
 # get telescope type dependent cuts 
@@ -338,8 +344,8 @@ do
 
          # onSource
          if [[ $PART == *"onSource"* ]]; then
+             echo "PPPP $ARRAY onSource $RECID $QCDIR $TMPDIR $AXDIR"
              ${EVNDISPSYS}/bin/writeParticleRateFilesFromEffectiveAreas $ARRAY onSource $RECID $QCDIR $TMPDIR $AXDIR > $LLOG
-             echo $AXDIR/ParticleNumbers.${ARRAY}.00.root
          else
              # cone
              # off-axis fine binning
@@ -348,6 +354,7 @@ do
                  ${EVNDISPSYS}/bin/writeParticleRateFilesFromEffectiveAreas  $ARRAY coneFB $RECID $QCDIR $TMPDIR $AXDIR > $LLOG
              else
              # off-axis std binning
+                 echo "PPP $ARRAY cone $RECID $QCDIR $TMPDIR $AXDIR"
                  ${EVNDISPSYS}/bin/writeParticleRateFilesFromEffectiveAreas  $ARRAY cone $RECID $QCDIR $TMPDIR $AXDIR > $LLOG
              fi
          fi
@@ -481,9 +488,11 @@ do
       fi
       echo "* CUTFILE $iCFIL" >> $MSCF
       echo "* SIMULATIONFILE_DATA $MSCFILE" >> $MSCF
-      # to write full data tress 
+      # to write full data trees (DL2)
       # (note: very large output files!)
-      # echo "* WRITEEVENTDATATREE 1" >> $MSCF
+      if [[ $DL2FILLING = "TRUE" ]]; then
+          echo "* WRITEEVENTDATATREE 1" >> $MSCF
+      fi
 
 # output file
       if [ $PART = "gamma_onSource" ] || [ $PART = "gamma_cone" ]

testProduction/test-CTA.EFFAREA.sh

@@ -27,7 +27,7 @@ EFFDATE="g20210921"
 OBSTIME="30m"
 OBSTIME="50h"
 # Number of off-axis bins
-NWBINS=5
+NWBINS=6
 # (end of) hardwired values
 ##########################################################
 
@@ -99,7 +99,11 @@ do
      #################################################
      # check output of effective area stage
      #for E in AngularResolution QualityCuts001CU BDT.50h-V3.${EFFDATE}
-     for E in BDT.${OBSTIME}-V3.${EFFDATE}
+     #for E in BDT.${OBSTIME}-V3.${EFFDATE}
+     #for E in AngularResolution
+     #for E in QualityCuts001CU
+     #for E in BDT.${OBSTIME}-V3.${EFFDATE}
+     for E in BDT.30m-V3.${EFFDATE}
      do
          #################### 
          # multiplicity loop 
@@ -115,7 +119,7 @@ do
                   fi
                fi
 
-               echo "  testing ${E} ${M}MSTs ${S}SSTs"
+               echo "  testing ${E} ${M}MSTs ${S}SSTs (${E})"
                FILESTATUS="TRUE"
                FILELOGSTATUS="TRUE"
                # (will always rerun all AZ bins, even if only one is wrong)
@@ -128,6 +132,7 @@ do
                    ADIR=${EFFDIR}/EffectiveArea-${OBSTIME}-ID${I}${MCAZ}-${NIM}-${EFFDATE}-V3/${E}/
                    if [[ ! -d ${ADIR} ]]; then
                        echo "ERROR: directory with effarea data not found: ${ADIR}"
+                       FILESTATUS="FALSE"
                        continue
                    fi
                    for P in gamma_onSource gamma_cone electron proton
@@ -163,8 +168,9 @@ do
                   echo "REDO ${A}"
                   cd ../
                   echo "RERUNNING ./CTA.runAnalysis.sh.testRedo prod5-S-sq08 ${RMODE} ${I} ${NIMMIN} ${M} ${S} ${NIMMIN}"
-                  #./CTA.runAnalysis.sh.testRedo prod5-S-sq08 ${RMODE} ${I} ${NIMMIN} ${M} ${S} ${NIMMIN}
+                  ./CTA.runAnalysis.sh.testRedo prod5-S-sq08 ${RMODE} ${I} ${NIMMIN} ${M} ${S} ${NIMMIN}
                   #./CTA.runAnalysis.sh.testRedo prod5-S-sq08 QC ${I} ${NIMMIN} ${M} ${S} ${NIMMIN}
+                  #./CTA.runAnalysis.sh.testRedo prod5-S-sq08 TRAIN ${I} ${NIMMIN} ${M} ${S} ${NIMMIN}
                   cd ./testProduction
               fi
             done