Merge pull request #21 from Eventdisplay/prod5-v09

Prod5 v09

Author: GernotMaier

CTA.runAnalysis.sh

@@ -128,11 +128,16 @@ then
    ARRAYDIR=( "prod3b" )
 elif [[ $P2 == "prod3b-S20deg-SCT" ]]
 then
-   prod3b-paranal20deg_SCT-sq08-LL
    SITE=( "prod3b-paranal20deg_SCT" )
    ARRAY="subArray.prod3b.South-SCT.list"
    ARRAYDIR=( "prod3b" )
-   EDM=( "-sq08-LL" )
+   EDM=( "-sq09-LL" )
+elif [[ $P2 == "prod3b-S20deg-SCTlin" ]]
+then
+   SITE=( "prod3b-paranal20deg_SCTlin" )
+   ARRAY="subArray.prod3b.South-SCT.list"
+   ARRAYDIR=( "prod3b" )
+   EDM=( "-sq09-LL" )
 ###############################################################
 # PROD4 Analysis
 elif [[ $P2 == "prod4-S20deg-MST" ]]
@@ -211,6 +216,8 @@ elif [[ $P2 == "prod5-S"* ]]
 then
    if [[ $P2 == *"moon"* ]]; then
        SITE=( "prod5-Paranal-20deg-NSB5x" )
+   elif [[ $P2 == *"60deg"* ]]; then
+       SITE=( "prod5-Paranal-60deg" )
    else
        SITE=( "prod5-Paranal-20deg" )
    fi

analysis/CTA.MSCW_ENERGY.qsub_analyse_MC.sh

@@ -113,11 +113,12 @@ MOPT="$MOPT -redo_stereo_reconstruction -sub_array_sim_telarray_counting $LISFIL
 # IMPORTANT: this must be the same or lower value as in dispBDT training
 MOPT="$MOPT -maxloss=0.2 -minfui=0."
 # MST small array analysis
-if [[ $DSET == *"paranal"* ]]; then
-    MOPT="$MOPT -maxdistfraction=0.70"
-else
-    MOPT="$MOPT -maxdistfraction=0.80"
-fi
+#if [[ $DSET == *"paranal"* ]]; then
+#    MOPT="$MOPT -maxdistfraction=0.70"
+#else
+#    MOPT="$MOPT -maxdistfraction=0.80"
+#fi
+MOPT="$MOPT -maxdistfraction=0.80"
 
 #########################################
 # disp main directory name

install/prepareProductionBinaries.sh

@@ -18,7 +18,7 @@ set -e
 DSET="$1"
 TDIR=$(pwd)
 
-VERSION="prod5-v08"
+VERSION="prod5-v09"
 
 # parameter and configuration files
 AUXDIR="$CTA_USER_WORK_DIR/analysis/AnalysisData/${DSET}/"

prod3b/subArray.prod3b.South-SCT.list

@@ -1 +1,4 @@
-S.SCT.hyperarray
+S.BL-25SCTs
+S.BL-15SCTs
+S.M3-15SCTs
+S.M5-15SCTs