Merge pull request #57 from Eventdisplay/v2.2-dev3

v2.2 dev3 - 30 ns SST integration window

Author: GernotMaier

DSTgeneration/README.md

@@ -21,9 +21,8 @@ Execute:
 ./generateDSTFiles.sh
 ```
 
-Output is written to: 
+Output is written to:
 
 ```
 $CTA_USER_DATA_DIR/DST_testDevelopment_prod5/
 ```
-

DSTgeneration/generateDSTFiles.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# 
+#
 # generate DST files
 #
 
@@ -111,7 +111,7 @@ elif [[ $SITE == "Paranal" ]]; then
         OFILE="${ODIR}/${N}-${TYPE}-Emin05TeV"
         $EVNDISPSYS/bin/CTA.convert_hessio_to_VDST -a ${ARRAY} -minenergy 5. -c ${IPR} -o ${OFILE}.root ${MCFILE} > ${OFILE}.log
 
-        # superE 
+        # superE
         OFILE="${ODIR}/${N}-${TYPE}-Emin20TeV"
         $EVNDISPSYS/bin/CTA.convert_hessio_to_VDST -a ${ARRAY} -minenergy 20. -c ${IPR} -o ${OFILE}.root ${MCFILE} > ${OFILE}.log
 

IPRgeneration/convertToDST.sh

@@ -1,28 +1,20 @@
 #!/bin/sh
-# Produce IPR graphs from NSB simulations
-# Converts first simtel_array ouput file to DST
+# Converts first simtel_array ouput file to DST for IPR generation
 #
 # Requires an Eventdisplay installation
 # including all environmental variables
 #
 
 if [ $# -lt 1 ]; then
     echo "
-./produceIPRGraphs.sh <directory with simtel files> [production (default=PROD6; optional PROD5)
+./convertToDST.sh <directory with simtel files> [production (default=PROD6; optional PROD5)
     "
     exit
 fi
 SCRATCH=${1}
 [[ "$2" ]] && PROD=$2 || PROD="PROD6"
 CDIR=$(pwd)
 
-if [[ $PROD == "PROD5" ]]; then
-    RUNPARA="EVNDISP.prod5.reconstruction.runparameter"
-else
-    RUNPARA="EVNDISP.prod6.reconstruction.runparameter"
-fi
-echo "Using ${RUNPARA} for Production ${PROD}"
-
 FLIST=$(find $SCRATCH -name "*.simtel.gz")
 
 for F in $FLIST

IPRgeneration/mergeIPRGraphs.C

@@ -4,9 +4,9 @@
  *  eventdisplay analysis
  *
  *  root -l -q -b 'mergeIPRGraphs.C( "output.root", "inputdirectory/" )'
- *. 
- *. If the output file name contains the word "halfmoon", e.g., prod5-halfmoon-ze-20-IPR.root,
- *. then the halfmoon pedestal files are merged.
+ *
+ *  If the output file name contains the word "halfmoon", e.g., prod5-halfmoon-ze-20-IPR.root,
+ *  then the halfmoon pedestal files are merged.
  */
 
 vector< string > get_file_list( string iFileListName )
@@ -69,4 +69,3 @@ void mergeIPRGraphs( string iMergedFile = "prod6-ze-20-IPR.root",
       }
       f->Close();
 }
-

IPRgeneration/mergeIPRGraphs.sh

@@ -17,17 +17,18 @@ IPRFILE=${2}
 CDIR=$(pwd)
 
 # list of files to be merged
-FLIST=${SCRATCH}/pedestals-${MOON}-ze-${ZE}.list
+FLIST="${SCRATCH}/pedestals.list"
 rm -f ${FLIST}
-find $SCRATCH -name "*.pedestal.root" > ${FLIST}
+find $SCRATCH -name "*.pedestal.root" | sort  > ${FLIST}
 echo "IPR files to be merged (from ${FLIST}):"
 cat ${FLIST}
 
 # merge IPR graphs
 root -l -q -b 'mergeIPRGraphs.C( '\"$IPRFILE\"', '\"$FLIST\"' )'
 
 # add log files
-for logFileNow in $(ls ${SCRATCH}/*.log)
+LOGFILES=$(find $SCRATCH -name "*.log" | sort)
+for logFileNow in $LOGFILES
 do
     logFile=$(basename -- "$logFileNow")
     fileTitle="${logFile%.*}"

IPRgeneration/produceIPRGraphs.sh

@@ -13,7 +13,7 @@ if [ $# -lt 1 ]; then
     "
     exit
 fi
-SCRATCH=${1}
+SCRATCH=$(realpath "$1")
 [[ "$2" ]] && PROD=$2 || PROD="PROD6"
 CDIR=$(pwd)
 
@@ -38,7 +38,7 @@ do
                             -sourcefile ${SCRATCH}/${FILEN}.dst.root \
                             -runmode=1 -singlepedestalrootfile=1  \
                             -donotusepeds -usePedestalsInTimeSlices=0 \
-                            -calibrationsumwindow=10 -calibrationsumfirst=0 \
+                            -calibrationsumwindow=30 -calibrationsumfirst=0 \
                             -reconstructionparameter ${RUNPARA} \
                             -nopedestalsintimeslices  -combine_pedestal_channels ${ADC}
 

IPRgeneration/producePedestals.sh

@@ -41,7 +41,6 @@ SCRATCH="."
 
 if [[ $PROD == "PROD5" ]]; then
     TELTYPES=( LST MST-FlashCam MST-NectarCam SST )
-    TELTYPES=( SST )
 else
     TELTYPES=( LST MST-FlashCam MST-NectarCam SST SCT MAGIC )
     SITE=( CTA_NORTH CTA_SOUTH CTA_NORTH CTA_SOUTH CTA_SOUTH CTA_NORTH )

IPRgeneration/run_prod6_all.sh

@@ -4,7 +4,7 @@
 
 if [ $# -lt 1 ]; then
     echo "
-    ./run_all.sh <producePedestals/convertToDST/produceIPRGraphs/mergeIPRGraphs> 
+    ./run_all.sh <producePedestals/convertToDST/produceIPRGraphs/mergeIPRGraphs>
     "
     exit
 fi

IPRgeneration/setupPackage.sh

@@ -7,7 +7,7 @@ source /cvmfs/sw.cta-observatory.org/software/centos7/gcc48_noOpt/tools/gsl/v1.1
 
 # Main directory
 # USER: Change this path to the grid package you want to use! # TODO
-export CTA_PROD6_PATH="/cvmfs/sw.cta-observatory.org/software/centos7/gcc48_noOpt/simulations/corsika_simtelarray/2020-06-29/"
+export CTA_PROD6_PATH="/cvmfs/sw.cta-observatory.org/software/centos7/gcc83_noOpt/simulations/corsika_simtelarray/2020-06-29b/"
 export CTA_PATH=${CTA_PROD6_PATH}
 
 # CORSIKA and SIMTEL

analysis/CTA.EFFAREA.sub_analyse_list.sh

@@ -12,7 +12,7 @@ h_cpu="11:29:00"
 h_vmem="40000M"
 tmpdir_size="15G"
 
-if [ $# -lt 6 ] 
+if [ $# -lt 6 ]
 then
    echo ""
    echo "./CTA.EFFAREA.sub_analyse_list.sh <subarray list> <cutfile template> <analysis parameter file> <output subdirectory> <data set> [filling mode] [qsub options] [job_dir] [direction (e.g. _180deg)]"
@@ -24,7 +24,7 @@ then
    echo "     template for gamma/hadron cut file"
    echo "     (suffix must be .gamma/.CRbck ; this will be added by this script)"
    echo "     examples can be found in $CTA_EVNDISP_AUX_DIR/GammaHadronCutFiles"
-   echo 
+   echo
    echo "<analysis parameter file>"
    echo "     file with analysis parameter"
    echo "     examples can be found in $CTA_EVNDISP_AUX_DIR/ParameterFiles/"
@@ -64,9 +64,9 @@ if [ -n $7 ]
 then
    QSUBOPT="$7"
 fi
-QSUBOPT=${QSUBOPT//_X_/ } 
-QSUBOPT=${QSUBOPT//_M_/-} 
-QSUBOPT=${QSUBOPT//\"/} 
+QSUBOPT=${QSUBOPT//_X_/ }
+QSUBOPT=${QSUBOPT//_M_/-}
+QSUBOPT=${QSUBOPT//\"/}
 
 # set directories
 source ../setSoftwarePaths.sh $DSET
@@ -76,7 +76,7 @@ CDIR="$CTA_EVNDISP_AUX_DIR/GammaHadronCutFiles/"
 # read values from parameter file
 if [ ! -e $ANAPAR ]
 then
-  echo "error: analysis parameter file not found: $ANAPAR" 
+  echo "error: analysis parameter file not found: $ANAPAR"
   exit
 fi
 echo "reading analysis parameter from $ANAPAR"
@@ -106,7 +106,7 @@ mkdir -p $QSHELLDIR
 mkdir -p $QDIR
 
 #################################################
-# set particle types 
+# set particle types
 # (don't expect to have cone for all data sets)
 if [ $GMOD = "0" ] || [ $GMOD = "3" ]
 then