Skip to content

Commit d329283

Browse files
GernotMaierGernotMaier
authored
Merge pull request #23 from Eventdisplay/prod5-v11
Prod5 v11
2 parents e811839 + d32b89f commit d329283

40 files changed

+548
-85
lines changed

‎CTA.mainRunScripts.sh‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
#!/bin/sh
2+
#
3+
# wrapper analysis script to run
4+
# different multiplicity cut dependent
5+
# steps
6+
#
7+
8+
if [ $# -lt 2 ]; then
9+
echo "
10+
./CTA.mainRunScripts.hs <data set> <run mode>
11+
12+
data sets:
13+
prod5-South-20deg prod5-South-40deg prod5-South-60deg
14+
prod5b-North-20deg prod5b-North-40deg prod5b-North-60deg
15+
prod3b-S20deg-SCTAlpha
16+
17+
run modes:
18+
MAKETABLES DISPBDT ANATABLES PREPARETMVA TRAIN ANGRES QC CUTS PHYS
19+
20+
"
21+
exit
22+
fi
23+
# site
24+
P2="$1"
25+
# run mode
26+
RUN="$2"
27+
28+
NMULT=( 2 3 4 5 6 )
29+
if [[ ${P2} == *"North"* ]]; then
30+
NMULT=( 2 3 4 )
31+
fi
32+
33+
if [[ ${RUN} == "MAKETABLES" ]] || [[ ${RUN} == "DISPBDT" ]] || [[ ${RUN} == "ANATABLES" ]] || [[ ${RUN} == "PREPARETMVA" ]]; then
34+
./CTA.runAnalysis.sh ${P2} ${RUN}
35+
./CTA.runAnalysis.sh ${P2}-sub ${RUN}
36+
else
37+
if [[ ${P2} == *"South"* ]] || [[ ${P2} == *"SCTAlpha"* ]]; then
38+
for M in "${NMULT[@]}"
39+
do
40+
for S in "${NMULT[@]}"
41+
do
42+
echo $M $S
43+
# minimum between MSTs and SSTs
44+
NIM=$(($M<$S ? $M : $S))
45+
./CTA.runAnalysis.sh ${P2} ${RUN} 0 $NIM $M $S $NIM
46+
if [[ "$S" == "$M" ]]; then
47+
./CTA.runAnalysis.sh ${P2}-sub ${RUN} 0 $NIM $M $S $NIM
48+
fi
49+
done
50+
done
51+
else
52+
for M in "${NMULT[@]}"
53+
do
54+
./CTA.runAnalysis.sh ${P2} ${RUN} 0 $M $M $M $M
55+
# ./CTA.runAnalysis.sh ${P2} ${RUN} 2 $M $M $M $M
56+
# ./CTA.runAnalysis.sh ${P2}-sub ${RUN} 0 $M $M $M $M
57+
done
58+
fi
59+
fi
60+
61+

‎CTA.runAnalysis.sh‎

Lines changed: 90 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
#
3-
# analysis submission for production 3b analysis
3+
# analysis submission for production 3b/5 analysis
44
#
55
# this script is optimized for the DESY analysis
66
#
@@ -19,10 +19,9 @@ then
1919
Prod4 analysis:
2020
prod4-S20deg-MST
2121
Prod5 analysis:
22-
prod5-N , prod5-N-s01-F, prod5-N-s01-N
23-
prod5-South
24-
prod5-South-40deg
25-
prod5-South-60deg
22+
prod5b-N
23+
prod5-South-20deg prod5-South-40deg prod5-South-60deg
24+
prod5b-North-20deg prod5b-North-40deg prod5b-North-60deg
2625
add 'moon' for NSB5x data sets
2726
2827
possible run modes are EVNDISP MAKETABLES DISPBDT/DISPMLP ANATABLES PREPARETMVA TRAIN ANGRES QC CUTS PHYS
@@ -137,6 +136,15 @@ then
137136
ARRAY="subArray.prod3b.South-SCT.list"
138137
ARRAYDIR="prod3b"
139138
EDM="-sq09-LL"
139+
elif [[ $P2 == "prod3b-S20deg-SCTAlpha"* ]]
140+
then
141+
SITE="prod3b-paranal20deg_SCT"
142+
ARRAY="subArray.prod3b.South-SCTAlpha.list"
143+
if [[ $P2 == *"sub"* ]]; then
144+
ARRAY=( "subArray.prod3b.South-SCTAlpha-sub.list" )
145+
fi
146+
ARRAYDIR="prod3b"
147+
EDM="-sq11-LL"
140148
elif [[ $P2 == "prod3b-S20deg-SCTlin" ]]
141149
then
142150
SITE="prod3b-paranal20deg_SCTlin"
@@ -170,6 +178,7 @@ then
170178
###############################################################
171179
###############################################################
172180
# PROD5 Analysis
181+
# NOTE: for N, use prod5b analysis
173182
# prod5-N
174183
# prod5-N-moon (NSB5x)
175184
elif [[ $P2 == "prod5-N"* ]]
@@ -184,37 +193,56 @@ then
184193
ARRAY=( "subArray.prod5.North-XST.list" )
185194
# prod5-prod5b comparision
186195
ARRAY=( "subArray.prod5-prod5b.North.list" )
196+
ARRAY=( "subArray.prod5.North-PB.list" )
187197
if [[ $P2 == *"Hyper"* ]]; then
188198
ARRAY=( "subArray.prod5.North-Hyper.list" )
189199
fi
190200
if [[ $P2 == *"LST"* ]]; then
191201
ARRAY=( "subArray.prod5.North-LST.list" )
192202
fi
193203
ARRAYDIR="prod5"
194-
TDATE="g20201021"
204+
TDATE="g20210610"
195205
ANADATE="${TDATE}"
196206
TMVADATE="${ANADATE}"
197207
EFFDATE="${TMVADATE}"
208+
PHYSDATE="${EFFDATE}"
198209
####################################
199210
# PROD5 Analysis
200211
# prod5b-N (including additional telescopes)
201212
elif [[ $P2 == "prod5b-N"* ]]
202213
then
203-
SITE="prod5b-LaPalma-20deg"
204-
EDM="-sq08-LL"
205-
ARRAY=( "subArray.prod5b.North.list" )
206-
ARRAY=( "subArray.prod5-prod5b.North.list" )
214+
if [[ $P2 == *"40deg"* ]]; then
215+
SITE="prod5b-LaPalma-40deg"
216+
elif [[ $P2 == *"60deg"* ]]; then
217+
SITE="prod5b-LaPalma-60deg"
218+
else
219+
SITE="prod5b-LaPalma-20deg"
220+
fi
221+
if [[ $P2 == *"moon"* ]]; then
222+
SITE="${SITE}-NSB5x"
223+
fi
224+
EDM="-sq10-LL"
225+
ARRAY=( "subArray.prod5.North-SV3.list" )
226+
ARRAY=( "subArray.prod5.North-BL.list" )
227+
ARRAY=( "subArray.prod5.North-D25.list" )
228+
ARRAY=( "subArray.prod5.North-PB.list" )
229+
if [[ $P2 == *"sub"* ]]; then
230+
ARRAY=( "subArray.prod5.North-SV3-sub.list" )
231+
ARRAY=( "subArray.prod5.North-BL-sub.list" )
232+
ARRAY=( "subArray.prod5.North-D25-sub.list" )
233+
fi
207234
if [[ $P2 == *"LST"* ]]; then
208235
ARRAY=( "subArray.prod5.North-LST.list" )
209236
fi
210237
if [[ $P2 == *"XST"* ]]; then
211238
ARRAY=( "subArray.prod5.North-XST.list" )
212239
fi
213240
ARRAYDIR="prod5"
214-
TDATE="g20201203"
241+
TDATE="g20210610"
215242
ANADATE="${TDATE}"
216243
TMVADATE="${ANADATE}"
217244
EFFDATE="${ANADATE}"
245+
PHYSDATE="${EFFDATE}"
218246
####################################
219247
# prod5 - Paranal
220248
# prod5-S
@@ -232,14 +260,17 @@ then
232260
SITE="${SITE}-NSB5x"
233261
fi
234262
EDM="-sq10-LL"
235-
ARRAY=( "subArray.prod5.South-Opt-13MSTsN0SSTs-MX.list" )
263+
ARRAY=( "subArray.prod5.South-BL.list" )
264+
ARRAY=( "subArray.prod5.South-D1a.list" )
265+
ARRAY=( "subArray.prod5.South-M1.list" )
266+
ARRAY=( "subArray.prod5.South-ax.list" )
236267
if [[ $P2 == *"sub"* ]]; then
237-
ARRAY=( "subArray.prod5.South-Opt-SubArray.list" )
268+
ARRAY=( "subArray.prod5.South-BL-sub.list" )
269+
ARRAY=( "subArray.prod5.South-D1a-sub.list" )
270+
ARRAY=( "subArray.prod5.South-M1-sub.list" )
271+
ARRAY=( "subArray.prod5.South-ax-sub.list" )
238272
fi
239-
if [[ $P2 == *"moon"* ]]; then
240-
ARRAY=( "subArray.prod5.South-Opt-Top4.list" )
241-
fi
242-
if [[ $P2 == *"Hyper"* ]]; then
273+
if [[ $P2 == *"Hyper"* ]] || [[ $P2 == *"hyper"* ]]; then
243274
ARRAY=( "subArray.prod5.South-Hyper.list" )
244275
fi
245276
if [[ $P2 == *"LST"* ]]; then
@@ -252,19 +283,23 @@ then
252283
ARRAY=( "subArray.prod5.South-1ST.list" )
253284
fi
254285
if [[ $P2 == *"SV0"* ]]; then
255-
EDM="-1MST-LL"
256286
ARRAY=( "subArray.prod5.South-SV0.list" )
257287
fi
258288
ARRAYDIR="prod5"
259-
TDATE="g20210921"
289+
TDATE="g20210610"
260290
ANADATE="${TDATE}"
261291
TMVADATE="${ANADATE}"
262292
EFFDATE="${ANADATE}"
293+
PHYSDATE="${EFFDATE}"
294+
PHYSDATE="g20211004"
263295
else
264296
echo "error: unknown site; allowed are N or S/S40deg/S60deg"
265297
echo "$P2"
266298
exit
267299
fi
300+
if [[ -z ${PHYSDATE} ]]; then
301+
PHYSDATE=${EFFDATE}
302+
fi
268303
# should be either onSource or cone (default is cone)
269304
OFFAXIS="cone"
270305

@@ -284,8 +319,9 @@ NIMAGESMIN=$((SCMST<NIMAGESMIN ? SCMST : NIMAGESMIN))
284319
# observing time [h]
285320
# (note that all steps except CUTS and PHYS are done only for 50h)
286321
OBSTIME=( "50h" "5h" "30m" "10m" "10h" "20h" "100h" "500h" "5m" "1m" "2h" )
287-
OBSTIME=( "50h" "5h" "30m" "100s" )
288322
OBSTIME=( "50h" "30m" )
323+
OBSTIME=( "10s" "30s" "300s" "1000s" "3000s" "10000s" "30000s" )
324+
OBSTIME=( "50h" "5h" "30m" "100s" )
289325

290326
echo "$RUN" "$SITE"
291327

@@ -400,11 +436,10 @@ do
400436
OOTIME=${OBSTIME[$o]}
401437

402438
# Only the last two steps are run for all observation times
403-
if [[ ${RUN} != "CUTS" ]] && [[ ${OOTIME} != "50h" ]]; then
404-
continue
405-
fi
406-
if [[ ${RUN} != "PHYS" ]] && [[ ${OOTIME} != "50h" ]]; then
407-
continue
439+
if [[ ${OOTIME} != "50h" ]]; then
440+
if [[ ${RUN} != "CUTS" ]] && [[ ${RUN} != "PHYS" ]]; then
441+
continue
442+
fi
408443
fi
409444

410445
##########################################
@@ -442,8 +477,8 @@ do
442477
echo "GETXOFFYOFFAFTERCUTS yes" >> "$PARA"
443478
echo "OFFAXISFINEBINNING $BFINEBINNING" >> "$PARA"
444479
if [[ ${RUN} == "CUTS" ]] && [[ ${OOTIME} == "50h" ]]; then
445-
# echo "DL2FILLING DL2" >> "$PARA"
446-
echo "DL2FILLING FALSE" >> "$PARA"
480+
echo "DL2FILLING DL2" >> "$PARA"
481+
#echo "DL2FILLING FULLTREES" >> "$PARA"
447482
else
448483
echo "DL2FILLING FALSE" >> "$PARA"
449484
fi
@@ -485,6 +520,13 @@ do
485520
elif [[ $RUN == "CUTS" ]]
486521
then
487522
# large multiplicity runs use 80% max signal efficiency (best resolution)
523+
#if [[ "${MST}" -ge "4" ]]
524+
#then
525+
# ./CTA.EFFAREA.sub_analyse_list.sh "$NFILARRAY" ANASUM.GammaHadron.TMVA "$PARA" BDT."$OOTIME"-${EFFVERSION}.$EFFDATE ${SITE}${EDM} 0 $QSUBOPT $AZ
526+
# low multiplicity runs use 95% max signal efficiency (lower requirements on resolution)
527+
#else
528+
# ./CTA.EFFAREA.sub_analyse_list.sh "$NFILARRAY" ANASUM.GammaHadron95p.TMVA "$PARA" BDT."$OOTIME"-${EFFVERSION}.$EFFDATE ${SITE}${EDM} 0 $QSUBOPT $AZ
529+
#fi
488530
if [[ "${MST}" -ge "4" ]]
489531
then
490532
./CTA.EFFAREA.sub_analyse_list.sh "$NFILARRAY" ANASUM.GammaHadron.TMVA "$PARA" BDT."$OOTIME"-${EFFVERSION}.$EFFDATE ${SITE}${EDM} 0 $QSUBOPT $AZ
@@ -498,11 +540,28 @@ do
498540
then
499541
if [[ $OFFAXIS == "cone" ]]
500542
then
501-
./CTA.WPPhysWriter.sub.sh "$NFILARRAY" ${EFFFULLDIR}/BDT."$OOTIME"-${EFFVERSION}.$EFFDATE \
502-
$OOTIME DESY.$EFFDATE.${EFFVERSION}.ID$ID$AZ$ETYPF.${SITE}${EDM} 1 $ID ${SITE}${EDM} $BFINEBINNING $EFFDATE $QSUBOPT
543+
./CTA.WPPhysWriter.sub.sh \
544+
"$NFILARRAY "\
545+
${EFFFULLDIR}/BDT."$OOTIME"-${EFFVERSION}.$EFFDATE \
546+
$OOTIME \
547+
DESY.$EFFDATE.${EFFVERSION}.ID$ID$AZ$ETYPF.${SITE}${EDM} \
548+
1 \
549+
$ID \
550+
${SITE}${EDM} \
551+
$BFINEBINNING \
552+
$PHYSDATE \
553+
$QSUBOPT
503554
else
504-
./CTA.WPPhysWriter.sub.sh "$NFILARRAY" ${EFFFULLDIR}/BDT."$OOTIME"-${EFFVERSION}.$EFFDATE \
505-
$OOTIME DESY.$EFFDATE.${EFFVERSION}.ID$ID$AZ$ETYPF.${SITE}${EDM} 0 $ID ${SITE}${EDM} $BFINEBINNING $EFFDATE $QSUBOPT
555+
./CTA.WPPhysWriter.sub.sh \
556+
"$NFILARRAY" \
557+
${EFFFULLDIR}/BDT."$OOTIME"-${EFFVERSION}.$EFFDATE \
558+
$OOTIME DESY.$EFFDATE.${EFFVERSION}.ID$ID$AZ$ETYPF.${SITE}${EDM} \
559+
0 \
560+
$ID \
561+
${SITE}${EDM} \
562+
$BFINEBINNING \
563+
$PHYSDATE \
564+
$QSUBOPT
506565
fi
507566
# unknown run set
508567
elif [[ $RUN != "EVNDISP" ]]

‎analysis/CTA.DISPTRAINING.qsub_analyse.sh‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -56,27 +56,30 @@ fi
5656

5757
#########################################
5858
# train TMVA
59-
$EVNDISPSYS/bin/trainTMVAforAngularReconstruction $TLIST $ODIR 0.5 ${RECID} ${TTYPE} ${BDT} ${TMVAO} ${ADIR} "" ${QC} > $ODIR/${BDT}-${TTYPE}.training.log 2>&1
59+
$EVNDISPSYS/bin/trainTMVAforAngularReconstruction $TLIST \
60+
$ODIR \
61+
0.8 \
62+
${RECID} \
63+
${TTYPE} \
64+
${BDT} \
65+
${TMVAO} \
66+
${ADIR} \
67+
"" \
68+
${QC} \
69+
0 > $ODIR/${BDT}-${TTYPE}.training.log 2>&1
6070
#########################################
6171

6272
##############
6373
# cleanup
64-
65-
# pipe file list into log file
66-
if [ -e $TLIST ]
67-
then
68-
echo "========================================" >> $ODIR/${BDT}-${TTYPE}.training.log
69-
echo "List of files used for training: " >> $ODIR/${BDT}-${TTYPE}.training.log
70-
cat $TLIST >> $ODIR/${BDT}-${TTYPE}.training.log
71-
rm -f $TLIST
72-
fi
73-
7474
# remove everything if telescope type is not found
75-
if grep -Fxq "Number of telescope types: 0" $ODIR/${BDT}-${TTYPE}.training.log
76-
then
77-
echo "No telescopes found of type ${TTYPE}"
78-
rm -f -v $ODIR/${BDT}"_"${TTYPE}.root
79-
rm -f $ODIR/${BDT}-${TTYPE}.training.log
75+
if [[ -e $ODIR/${BDT}-${TTYPE}.training.log ]]; then
76+
if grep -Fxq "Number of telescope types: 0" $ODIR/${BDT}-${TTYPE}.training.log
77+
then
78+
echo "No telescopes found of type ${TTYPE}"
79+
head -n 10 ${TLIST}
80+
# rm -f -v $ODIR/${BDT}"_"${TTYPE}.root
81+
# rm -f $ODIR/${BDT}-${TTYPE}.training.log
82+
fi
8083
fi
8184
# move everything into root files
8285
if [[ -e $ODIR/${BDT}_BDT_${TTYPE}.weights.xml ]]; then
@@ -89,10 +92,10 @@ if [[ -e $ODIR/${BDT}_MLP_${TTYPE}.weights.xml ]]; then
8992
fi
9093
if [[ -e $ODIR/${BDT}-${TTYPE}.training.log ]]; then
9194
$EVNDISPSYS/bin/logFile dispLog-${TTYPE} $ODIR/${BDT}-${TTYPE}.disptmva.root $ODIR/${BDT}-${TTYPE}.training.log
92-
rm -f $ODIR/${BDT}-${TTYPE}.training.log
95+
# rm -f $ODIR/${BDT}-${TTYPE}.training.log
9396
fi
9497

95-
rm -f $ODIR/${BDT}_${TTYPE}.root
96-
rm -f $ODIR/${BDT}_${TTYPE}.tmva.root
98+
#rm -f $ODIR/${BDT}_${TTYPE}.root
99+
#rm -f $ODIR/${BDT}_${TTYPE}.tmva.root
97100

98101
exit

0 commit comments

Comments
 (0)