Merge pull request #32 from Eventdisplay/v1.6.1-beta

Updates for prod5b North response

Author: GernotMaier

CTA.mainRunScripts.sh

@@ -11,7 +11,9 @@ if [ $# -lt 2 ]; then
     
     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
 
     run modes:
@@ -75,9 +77,11 @@ else
     else
         for M in "${NMULT[@]}"
         do
-             ./CTA.runAnalysis.sh ${P2} ${RUN} 0 $M $M $M $M
-#             ./CTA.runAnalysis.sh ${P2} ${RUN} 2 $M $M $M $M
-             ./CTA.runAnalysis.sh ${P2}-sub ${RUN} 0 $M $M $M $M
+            for L in "${LSTMULT[@]}"
+            do
+                 ./CTA.runAnalysis.sh ${P2} ${RUN} 0 $L $M $M $M
+            done
+            ./CTA.runAnalysis.sh ${P2}-sub ${RUN} 0 $M $M $M $M
         done
     fi
 fi

CTA.runAnalysis.sh

@@ -223,17 +223,20 @@ then
    if [[ $P2 == *"moon"* ]]; then
        SITE="${SITE}-NSB5x"
    fi
-   EDM="-sq20-LL"
+   EDM="-lin40-LL"
    if [[ $P2 == *"DL2plus"* ]]; then
+   EDM="-lin30-LL"
        EDM="-sq10-LL-DL2plus"
    fi
    ARRAY=( "subArray.prod5.North-SV3.list" )
    ARRAY=( "subArray.prod5.North-BL.list" )
    ARRAY=( "subArray.prod5.North-D25.list" )
+   ARRAY=( "subArray.prod5.North-Alpha-MSTF.list" )
    ARRAY=( "subArray.prod5.North-Alpha.list" )
    if [[ $P2 == *"sub"* ]]; then
        ARRAY=( "subArray.prod5.North-SV3-sub.list" )
        ARRAY=( "subArray.prod5.North-D25-sub.list" )
+       ARRAY=( "subArray.prod5.North-Alpha-MSTF-sub.list" )
        ARRAY=( "subArray.prod5.North-Alpha-sub.list" )
    fi
    if [[ $P2 == *"LST"* ]]; then
@@ -245,6 +248,7 @@ then
    ARRAYDIR="prod5"
    TDATE="g20210610"
    ANADATE="${TDATE}"
+   ANADATE="g20220408"
    TMVADATE="${ANADATE}"
    EFFDATE="${ANADATE}"
 #  PHYSDATE="${EFFDATE}"
@@ -264,8 +268,7 @@ then
    if [[ $P2 == *"moon"* ]]; then
        SITE="${SITE}-NSB5x"
    fi
-   EDM="-sq70-LL"
-   EDM="-sq20-LL"
+   EDM="-sq40-LL"
    if [[ $P2 == *"DL2plus"* ]]; then
        EDM="-sq10-LL-DL2plus"
    fi
@@ -274,7 +277,6 @@ then
    ARRAY=( "subArray.prod5.South-AlphaLSTs.list" )
    ##
    ARRAY=( "subArray.prod5.South-AlphaC8aj.list" )
-   ARRAY=( "subArray.prod5.South-BetaPlus.list" )
    ARRAY=( "subArray.prod5.South-AlphaC8aj-BetaPlus.list" )
    if [[ $P2 == *"sub"* ]]; then
        ARRAY=( "subArray.prod5.South-BL-sub.list" )
@@ -300,9 +302,9 @@ then
       ARRAY=( "subArray.prod5.South-SV0.list" )
    fi
    ARRAYDIR="prod5"
-   TDATE="g20210610"
+   TDATE="g20220408"
    ANADATE="${TDATE}"
-   ANADATE="g20220103"
+   ANADATE="g20220408"
    TMVADATE="${ANADATE}"
    EFFDATE="${ANADATE}"
    PHYSDATE="${EFFDATE}"
@@ -335,7 +337,7 @@ NIMAGESMIN=$((SCMST<NIMAGESMIN ? SCMST : NIMAGESMIN))
 OBSTIME=( "50h" "5h" "30m" "10m" "10h" "20h" "100h" "500h" "5m" "1m" "2h" )
 OBSTIME=( "10s" "30s" "300s" "1000s" "3000s" "10000s" "30000s" )
 OBSTIME=( "50h" "30m" )
-OBSTIME=( "5h" )
+OBSTIME=( "50h" "5h" )
 OBSTIME=( "50h" "5h" "30m" "100s" )
 
 echo "$RUN" "$SITE"
@@ -522,6 +524,15 @@ do
                   echo "NSCMST ${SCMST}" >> "$PARA"
                   echo "OBSERVINGTIME_H $OOTIME" >> "$PARA"
                   echo "GETXOFFYOFFAFTERCUTS yes" >> "$PARA"
+                  if [[ ${SITE} == *"paranal"* ]]; then
+                      echo "THETA2MINENEERGY 1." >> "$PARA"
+                  else
+                      if [[ ${OOTIME} != "50h" ]]; then
+                          echo "THETA2MINENEERGY 0.35" >> "$PARA"
+                      else
+                          echo "THETA2MINENEERGY 1." >> "$PARA"
+                      fi
+                  fi
                   echo "OFFAXISFINEBINNING $BFINEBINNING" >> "$PARA"
                   if [[ ${RUN} == "CUTS" ]] && [[ ${OOTIME} == "50h" ]]; then
                      if [[ $P2 == *"DL2plus"* ]] || [[ $EDM == *"sq70"* ]]; then

analysis/CTA.EFFAREA.qsub_analyse_list.sh

@@ -91,6 +91,7 @@ else
   echo "Problem / error? ${TELLIST} teltype file not found"
   exit
 fi
+THETA2MINENEERGY=`grep THETA2MINENEERGY $ANAPAR | awk {'print $2'}`
 
 for T in LST MST SST SCMST 
 do
@@ -444,11 +445,13 @@ do
                  -e "s|TELTYPESSCMST|$TELTYPESSCMST|" \
                  -e "s|MCAZIMUTH|${VMCAZ}|" \
                  -e "s|ANGRESFILE|$ANGRESFILE|" \
+                 -e "s|THETA2ENERGYMIN|${THETA2MINENEERGY}|" \
                  -e "s|PARTICLENUMBERFILE|$PNF|" \
                  -e "s|MAXCOREDISTANCE|$MAXCDISTANCE|" \
                  -e "s|OBSERVINGTIME_H|$OBSTIME|" $iCFIL
 
           echo  "CUTFIL $iCFIL"
+          cat $iCFIL
           CUTFILIST[$ii]=$iCFIL
 ###############################################################################
 # unpack XML files from TMVA

analysis/CTA.MSCW_ENERGY.qsub_analyse_MC.sh

@@ -117,16 +117,15 @@ fi
 
 #########################################
 # options for simple stereo reconstruction
-#MOPT="$MOPT -redo_stereo_reconstruction -sub_array_sim_telarray_counting $LISFILE -minangle_stereo_reconstruction=15"
-MOPT="$MOPT -redo_stereo_reconstruction -sub_array_sim_telarray_counting $LISFILE -minangle_stereo_reconstruction=0.01"
-
-# IMPORTANT: this must be the same or lower value as in dispBDT training
-MOPT="$MOPT -maxloss=0.2 -minfui=0."
+MOPT="$MOPT -redo_stereo_reconstruction -sub_array_sim_telarray_counting $LISFILE"
 if [[ $DSET == *"LaPalma"* ]]; then
-    MOPT="$MOPT -maxdistfraction=0.70"
+    MOPT="$MOPT -minangle_stereo_reconstruction=15."
 else
-    MOPT="$MOPT -maxdistfraction=0.80"
+    MOPT="$MOPT -minangle_stereo_reconstruction=0.01"
 fi
+# IMPORTANT: this must be the same or lower value as in dispBDT training
+MOPT="$MOPT -maxloss=0.2 -minfui=0."
+MOPT="$MOPT -maxdistfraction=0.80"
 
 #########################################
 # disp reconstruction

analysis/CTA.WPPhysWriter.sub.sh

@@ -79,7 +79,7 @@ do
    OXUTNAME=${ODIR}/${OUTNAME}
    echo "WP Phys file written to $OXUTNAME"
 
-   FNAM=${FDIR}/$FSCRIPT-$ARRAY-$DSET-$OBSTIME.sh
+   FNAM=${FDIR}/$FSCRIPT-$ARRAY-$DSET-$OBSTIME-$(basename $OXUTNAME).sh
    cp -f $FSCRIPT.sh $FNAM
 
    echo "run script $FNAM"

prod5/subArray.prod5.North-Alpha-MSTF-sub.list

@@ -0,0 +1,3 @@
+N.D25-0LSTs09MSTs-MSTF
+N.BL-0LSTs15MSTs-MSTF
+N.TS-0LSTs05MSTs-MSTF

prod5/subArray.prod5.North-Alpha-MSTF.list

@@ -0,0 +1,3 @@
+N.D25-4LSTs09MSTs-MSTF
+N.BL-4LSTs15MSTs-MSTF
+N.TS-4LSTs05MSTs-MSTF