Skip to content

Commit 3815abb

Browse files
authored
Merge pull request #20 from Eventdisplay/prod5-v08-DL2
Prod5 v08 dl2
2 parents 31b9918 + 04e093e commit 3815abb

File tree

3 files changed

+29
-10
lines changed

3 files changed

+29
-10
lines changed

CTA.runAnalysis.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,13 @@ then
219219
ARRAY=( "subArray.prod5.South-Opt-SubArray.list" )
220220
ARRAY=( "subArray.prod5.South-XST.list" )
221221
ARRAY=( "subArray.prod5.South-Opt.list" )
222-
ARRAY=( "subArray.prod5.South-Opt-SubArray.list" )
222+
ARRAY=( "subArray.prod5.South-Opt-14MSTs40SSTs.list" )
223+
ARRAY=( "subArray.prod5.South-Opt-14MSTs40SSTs.list" )
223224
ARRAY=( "subArray.prod5.South-Opt-15MSTs50SSTs.list" )
224-
ARRAY=( "subArray.prod5.South-Opt-13MSTs30SSTs.list" )
225+
ARRAY=( "subArray.prod5.South-Opt-13MSTs40SSTs.list" )
226+
ARRAY=( "subArray.prod5.South-Opt-SubArray.list" )
227+
ARRAY=( "set_X.list" )
228+
ARRAY=( "subArray.prod5.South-Opt-SubArray.list" )
225229
if [[ $P2 == *"Hyper"* ]]; then
226230
ARRAY=( "subArray.prod5.South-Hyper.list" )
227231
fi
@@ -269,8 +273,8 @@ NIMAGESMIN=$((SCMST<NIMAGESMIN ? SCMST : NIMAGESMIN))
269273
OBSTIME=( "50h" "5h" "30m" "10m" "10h" "20h" "100h" "500h" "5m" "1m" "2h" )
270274
OBSTIME=( "50h" "5h" "30m" "100s" )
271275
OBSTIME=( "5h" "30m" "100s" )
272-
OBSTIME=( "50h" )
273276
OBSTIME=( "30m" )
277+
OBSTIME=( "50h" )
274278

275279
echo "$RUN" "$SITE"
276280

analysis/CTA.EFFAREA.qsub_analyse_list.sh

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,12 @@ if grep -q OFFAXISFINEBINNING $ANAPAR
6161
then
6262
BFINEBINNING=`grep OFFAXISFINEBINNING $ANAPAR | awk {'print $2'}`
6363
fi
64+
# DL2 filling
65+
DL2FILLING="FALSE"
66+
if grep -q DL2 $ANAPAR
67+
then
68+
DL2FILLING=`grep DL2 $ANAPAR | awk {'print $2'}`
69+
fi
6470

6571
NIMAGESMIN=`grep NIMAGESMIN $ANAPAR | awk {'print $2'}`
6672
# get telescope type dependent cuts
@@ -338,8 +344,8 @@ do
338344

339345
# onSource
340346
if [[ $PART == *"onSource"* ]]; then
347+
echo "PPPP $ARRAY onSource $RECID $QCDIR $TMPDIR $AXDIR"
341348
${EVNDISPSYS}/bin/writeParticleRateFilesFromEffectiveAreas $ARRAY onSource $RECID $QCDIR $TMPDIR $AXDIR > $LLOG
342-
echo $AXDIR/ParticleNumbers.${ARRAY}.00.root
343349
else
344350
# cone
345351
# off-axis fine binning
@@ -348,6 +354,7 @@ do
348354
${EVNDISPSYS}/bin/writeParticleRateFilesFromEffectiveAreas $ARRAY coneFB $RECID $QCDIR $TMPDIR $AXDIR > $LLOG
349355
else
350356
# off-axis std binning
357+
echo "PPP $ARRAY cone $RECID $QCDIR $TMPDIR $AXDIR"
351358
${EVNDISPSYS}/bin/writeParticleRateFilesFromEffectiveAreas $ARRAY cone $RECID $QCDIR $TMPDIR $AXDIR > $LLOG
352359
fi
353360
fi
@@ -481,9 +488,11 @@ do
481488
fi
482489
echo "* CUTFILE $iCFIL" >> $MSCF
483490
echo "* SIMULATIONFILE_DATA $MSCFILE" >> $MSCF
484-
# to write full data tress
491+
# to write full data trees (DL2)
485492
# (note: very large output files!)
486-
# echo "* WRITEEVENTDATATREE 1" >> $MSCF
493+
if [[ $DL2FILLING = "TRUE" ]]; then
494+
echo "* WRITEEVENTDATATREE 1" >> $MSCF
495+
fi
487496

488497
# output file
489498
if [ $PART = "gamma_onSource" ] || [ $PART = "gamma_cone" ]

testProduction/test-CTA.EFFAREA.sh

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ EFFDATE="g20210921"
2727
OBSTIME="30m"
2828
OBSTIME="50h"
2929
# Number of off-axis bins
30-
NWBINS=5
30+
NWBINS=6
3131
# (end of) hardwired values
3232
##########################################################
3333

@@ -99,7 +99,11 @@ do
9999
#################################################
100100
# check output of effective area stage
101101
#for E in AngularResolution QualityCuts001CU BDT.50h-V3.${EFFDATE}
102-
for E in BDT.${OBSTIME}-V3.${EFFDATE}
102+
#for E in BDT.${OBSTIME}-V3.${EFFDATE}
103+
#for E in AngularResolution
104+
#for E in QualityCuts001CU
105+
#for E in BDT.${OBSTIME}-V3.${EFFDATE}
106+
for E in BDT.30m-V3.${EFFDATE}
103107
do
104108
####################
105109
# multiplicity loop
@@ -115,7 +119,7 @@ do
115119
fi
116120
fi
117121

118-
echo " testing ${E} ${M}MSTs ${S}SSTs"
122+
echo " testing ${E} ${M}MSTs ${S}SSTs (${E})"
119123
FILESTATUS="TRUE"
120124
FILELOGSTATUS="TRUE"
121125
# (will always rerun all AZ bins, even if only one is wrong)
@@ -128,6 +132,7 @@ do
128132
ADIR=${EFFDIR}/EffectiveArea-${OBSTIME}-ID${I}${MCAZ}-${NIM}-${EFFDATE}-V3/${E}/
129133
if [[ ! -d ${ADIR} ]]; then
130134
echo "ERROR: directory with effarea data not found: ${ADIR}"
135+
FILESTATUS="FALSE"
131136
continue
132137
fi
133138
for P in gamma_onSource gamma_cone electron proton
@@ -163,8 +168,9 @@ do
163168
echo "REDO ${A}"
164169
cd ../
165170
echo "RERUNNING ./CTA.runAnalysis.sh.testRedo prod5-S-sq08 ${RMODE} ${I} ${NIMMIN} ${M} ${S} ${NIMMIN}"
166-
#./CTA.runAnalysis.sh.testRedo prod5-S-sq08 ${RMODE} ${I} ${NIMMIN} ${M} ${S} ${NIMMIN}
171+
./CTA.runAnalysis.sh.testRedo prod5-S-sq08 ${RMODE} ${I} ${NIMMIN} ${M} ${S} ${NIMMIN}
167172
#./CTA.runAnalysis.sh.testRedo prod5-S-sq08 QC ${I} ${NIMMIN} ${M} ${S} ${NIMMIN}
173+
#./CTA.runAnalysis.sh.testRedo prod5-S-sq08 TRAIN ${I} ${NIMMIN} ${M} ${S} ${NIMMIN}
168174
cd ./testProduction
169175
fi
170176
done

0 commit comments

Comments
 (0)