Merge pull request #39 from Eventdisplay/v1.10-dev

V1.10 develeopment

Author: GernotMaier

CTA.mainRunScriptsReduced.sh

@@ -32,14 +32,6 @@ fi
 P2="$1"
 # run mode
 RUN="$2"
-# loop over LSTs
-[[ "$3" ]] && LST=$3 || LST="FALSE"
-
-NMULT=( 2 3 4 5 6 )
-if [[ ${P2} == *"North"* ]]; then
-   NMULT=( 2 3 4 )
-fi
-LSTMULT=( 2 3 4 )
 
 # run scripts are collected here
 RUNSCRIPTDIR="${CTA_USER_LOG_DIR}/jobs/$(uuidgen)"

CTA.runAnalysis.sh

@@ -231,7 +231,8 @@ then
        SITE="${SITE}-NSB5x"
    fi
    EDM="-sq40-LL"
-   EDM="-lin40-LL"
+   # lin is default reconstruction for North
+   EDM="-lin50-LL"
    if [[ $P2 == *"DL2plus"* ]]; then
        EDM="-sq10-LL-DL2plus"
    fi
@@ -246,12 +247,12 @@ then
        ARRAY=( "subArray.prod5.North-XST.list" )
    fi
    ARRAYDIR="prod5"
-   TDATE="g20210610"
+   TDATE="g20221204"
    ANADATE="${TDATE}"
-   ANADATE="g20220408"
    TMVADATE="${ANADATE}"
    EFFDATE="${ANADATE}"
-#  PHYSDATE="${EFFDATE}"
+   EFFDATE="g20230206"
+   PHYSDATE="${EFFDATE}"
 ####################################
 # prod5 - Paranal
 # prod5-S
@@ -268,14 +269,17 @@ then
    if [[ $P2 == *"moon"* ]]; then
        SITE="${SITE}-NSB5x"
    fi
-   EDM="-sq40-LL"
+   EDM="-sq50-LL"
    if [[ $P2 == *"DL2plus"* ]]; then
        EDM="-sq10-LL-DL2plus"
    fi
    ARRAY=( "subArray.prod5.South-BL.list" )
    ARRAY=( "subArray.prod5.South-Alpha.list" )
+   ARRAY=( "subArray.prod5.South-Alpha-2LSTs42SSTs.list" )
+   ARRAY=( "subArray.prod5.South-Alpha-2LSTs42SSTsBeta.list" )
    if [[ $P2 == *"sub"* ]]; then
        ARRAY=( "subArray.prod5.South-Alpha-sub.list" )
+       ARRAY=( "subArray.prod5.South-Alpha-2LSTs42SSTsBeta-sub.list")
    fi
    if [[ $P2 == *"Hyper"* ]] || [[ $P2 == *"hyper"* ]]; then
        ARRAY=( "subArray.prod5.South-Hyper.list" )
@@ -294,10 +298,13 @@ then
    fi
    ARRAYDIR="prod5"
    TDATE="g20221202"
-   ANADATE="g20221101"
+   ANADATE="${TDATE}"
+   ANADATE="g20221204"
    TMVADATE="${ANADATE}"
    EFFDATE="${ANADATE}"
+   EFFDATE="g20230206"
    PHYSDATE="${EFFDATE}"
+   PHYSDATE="g20230206"
 ####################################
 # prod6 - Paranal and LaPalma
 elif [[ $P2 == "prod6"* ]]
@@ -371,8 +378,9 @@ 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=( "50h" "5h" "30m" "100s" )
 OBSTIME=( "50h" "5h" )
+OBSTIME=( "50h" "5h" "30m" "100s" )
+OBSTIME=( "5h" "30m" "100s" )
 OBSTIME=( "50h" )
 
 echo "$RUN" "$SITE"

analysis/CTA.prepareTMVA.qsub_train.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# script to prepare trianing events
+# script to prepare training events
 #
 #
 #

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

@@ -0,0 +1,6 @@
+S.C8aj-37SSTs
+S.C8aj-42SSTs
+S.BL-2LSTsA
+S.M6-14MSTs-MSTF
+S.M6-04MSTsA-MSTF
+S.M6-04MSTsB-MSTF

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

@@ -0,0 +1,2 @@
+S-LM6C8ajA-2LSTs14MSTs42SSTs-MSTF
+S-M6C8aj-14MSTs37SSTs-MSTF

utilities/submit_scripts_to_htcondor.sh

@@ -32,7 +32,7 @@ echo "error = \$(file).error" >>  ${SUBMITF}
 echo "$(grep -h request_memory ${JDIR}/*.condor | sort -u)"  >>  ${SUBMITF}
 echo "$(grep -h request_disk ${JDIR}/*.condor | sort -u)" >>  ${SUBMITF}
 echo "getenv = True" >>  ${SUBMITF}
-echo "max_materialize = 50" >>  ${SUBMITF}
+echo "max_materialize = 5000" >>  ${SUBMITF}
 echo "queue file matching files *.sh" >> ${SUBMITF}
 
 PDIR=$(pwd)