Skip to content

Commit 0e03486

Browse files
GernotMaierGernotMaier
authored
Merge pull request #18 from Eventdisplay/prod5-v08
Prod5 v08
2 parents 855bd8a + 575dcf0 commit 0e03486

File tree

57 files changed

+1958
-371
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1958
-371
lines changed

‎CTA.runAnalysis.sh‎

Lines changed: 87 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ echo "Telescope multiplicities: LST $LST MST $MST SST $SST SCMST $SCMST"
4747
#####################################
4848
# qsub options (priorities)
4949
# _M_ = -; _X_ = " "
50-
QSUBOPT="_M_P_X_cta_high_X__M_js_X_1"
50+
QSUBOPT="_M_P_X_cta_high_X__M_js_X_9"
5151

5252
#####################################
5353
# output directory for script parameter files
@@ -117,14 +117,22 @@ then
117117
elif [[ $P2 == "prod3b-N20deg" ]]
118118
then
119119
SITE=( "prod3b-LaPalma-20deg" )
120-
ARRAY="subArray.prod3b.North.list"
120+
SITE=( "prod3b-LaPalma-20deg-NSB1x" )
121+
ARRAY="subArray.prod3b.North.NSB1x.list"
121122
EDM=( "-sq2-LL" )
122123
ARRAYDIR=( "prod3b" )
123124
elif [[ $P2 == "prod3b-N40deg" ]]
124125
then
125126
SITE=( "prod3b-LaPalma-40deg" )
126127
ARRAY="subArray.prod3b.North.list"
127128
ARRAYDIR=( "prod3b" )
129+
elif [[ $P2 == "prod3b-S20deg-SCT" ]]
130+
then
131+
prod3b-paranal20deg_SCT-sq08-LL
132+
SITE=( "prod3b-paranal20deg_SCT" )
133+
ARRAY="subArray.prod3b.South-SCT.list"
134+
ARRAYDIR=( "prod3b" )
135+
EDM=( "-sq08-LL" )
128136
###############################################################
129137
# PROD4 Analysis
130138
elif [[ $P2 == "prod4-S20deg-MST" ]]
@@ -137,108 +145,104 @@ then
137145
# for other prod4(b) SST data sets:
138146
# - set file lists correctly
139147
# - prepare and install software (each SST type is a DSET)
140-
SITE=( "prod4-SST-paranal-20deg-sst-astri-chec-s" )
148+
SITE=( "prod4b-SST-paranal20deg" )
149+
EDM=( "-sq08-LL" )
141150
ARRAY=( "subArray.prod4-SST.list" )
151+
ARRAY=( "subArray.prod4-SST-A.list" )
142152
ARRAYDIR=( "prod4" )
153+
TDATE="g20201021"
154+
ANADATE="${TDATE}"
155+
TMVADATE="${ANADATE}"
156+
EFFDATE="${TMVADATE}"
157+
####################################
143158
###############################################################
144159
###############################################################
145160
# PROD5 Analysis
146161
# prod5-N
147162
# prod5-N-moon (NSB5x)
148163
elif [[ $P2 == "prod5-N"* ]]
149164
then
150-
TDATE="g20200909"
151-
if [[ $P2 == *"sq2"* ]]; then
152-
ANADATE="${TDATE}"
153-
TMVADATE="${ANADATE}"
154-
EFFDATE="${TMVADATE}"
155-
EDM=( "-sq2-LL" )
156-
ARRAY=( "subArray.prod5.North-Hyper.list" )
157-
ARRAY=( "subArray.prod5.North-MSTF-Arrays.list" )
158-
ARRAY=( "subArray.prod5.North-MSTN-Arrays.list" )
159-
if [[ $P2 == *"LST"* ]]; then
160-
ARRAY=( "subArray.prod5.North-LST.list" )
161-
fi
162-
fi
163-
if [[ $P2 == *"sq07"* ]]; then
164-
# accident in naming of dates
165-
ANADATE="g20200930-TWdispE"
166-
TMVADATE="${ANADATE}-TMVAbins"
167-
EFFDATE="${TMVADATE}"
168-
EDM=( "-sq07-LL" )
169-
ARRAY=( "subArray.prod5.North-XST.list" )
170-
if [[ $P2 == *"LST"* ]]; then
171-
ARRAY=( "subArray.prod5.North-LSTX.list" )
172-
fi
173-
else
174-
echo "DSet not found: $P2"
175-
exit
176-
fi
177-
if [[ $P2 == *"VTS"* ]]; then
178-
ARRAY=( "subArray.prod5.North-VTS.list" )
179-
fi
180165
if [[ $P2 == *"moon"* ]]; then
181166
SITE=( "prod5-LaPalma-20deg-NSB5x" )
182-
ANADATE="20201012"
183-
TMVADATE="${ANADATE}"
184-
EFFDATE="${TMVADATE}"
185-
ARRAY=( "subArray.prod5.North-Hyper.list" )
186-
ARRAY=( "subArray.prod5.North-BL.list" )
187-
if [[ $P2 == *"LST"* ]]; then
188-
ARRAY=( "subArray.prod5.North-LST.list" )
189-
fi
190167
else
191168
SITE=( "prod5-LaPalma-20deg" )
192169
fi
170+
EDM=( "-sq08-LL" )
171+
ARRAY=( "subArray.prod5.North-MSTF-Arrays.list" )
172+
ARRAY=( "subArray.prod5.North-XST.list" )
173+
# prod5-prod5b comparision
174+
ARRAY=( "subArray.prod5-prod5b.North.list" )
175+
if [[ $P2 == *"Hyper"* ]]; then
176+
ARRAY=( "subArray.prod5.North-Hyper.list" )
177+
fi
178+
if [[ $P2 == *"LST"* ]]; then
179+
ARRAY=( "subArray.prod5.North-LST.list" )
180+
fi
181+
ARRAYDIR=( "prod5" )
182+
TDATE="g20201021"
183+
ANADATE="${TDATE}"
184+
TMVADATE="${ANADATE}"
185+
EFFDATE="${TMVADATE}"
186+
####################################
187+
# PROD5 Analysis
188+
# prod5-N
189+
elif [[ $P2 == "prod5b-N"* ]]
190+
then
191+
SITE=( "prod5b-LaPalma-20deg" )
192+
EDM=( "-sq08-LL" )
193+
ARRAY=( "subArray.prod5b.North.list" )
194+
ARRAY=( "subArray.prod5-prod5b.North.list" )
195+
if [[ $P2 == *"LST"* ]]; then
196+
ARRAY=( "subArray.prod5.North-LST.list" )
197+
fi
198+
if [[ $P2 == *"XST"* ]]; then
199+
ARRAY=( "subArray.prod5.North-XST.list" )
200+
fi
193201
ARRAYDIR=( "prod5" )
202+
TDATE="g20201203"
203+
ANADATE="${TDATE}"
204+
TMVADATE="${ANADATE}"
205+
EFFDATE="${ANADATE}"
194206
####################################
195207
# prod5 - Paranal
196208
# prod5-S
197209
# prod5-S-moon (NSB5x)
198210
elif [[ $P2 == "prod5-S"* ]]
199211
then
200212
if [[ $P2 == *"moon"* ]]; then
201-
SITE=( "prod5-Paranal-20deg-Moon" )
213+
SITE=( "prod5-Paranal-20deg-NSB5x" )
202214
else
203215
SITE=( "prod5-Paranal-20deg" )
204216
fi
205-
EDM=( "-h05-LL" )
217+
EDM=( "-sq08-LL" )
206218
ARRAY=( "subArray.prod5.South.list" )
219+
ARRAY=( "subArray.prod5.South-Opt-SubArray.list" )
220+
ARRAY=( "subArray.prod5.South-XST.list" )
221+
ARRAY=( "subArray.prod5.South-Opt.list" )
222+
ARRAY=( "subArray.prod5.South-Opt-SubArray.list" )
223+
ARRAY=( "subArray.prod5.South-Opt-15MSTs50SSTs.list" )
224+
ARRAY=( "subArray.prod5.South-Opt-13MSTs30SSTs.list" )
207225
if [[ $P2 == *"Hyper"* ]]; then
208226
ARRAY=( "subArray.prod5.South-Hyper.list" )
209-
EDM=( "-sq2-LL" )
210-
elif [[ $P2 == *"sq2"* ]]; then
211-
EDM=( "-sq2-LL" )
212-
ARRAY=( "subArray.prod5.South-BGR.list" )
213-
ARRAY=( "subArray.prod5.South.list" )
214-
if [[ $P2 == *"LST"* ]]; then
215-
ARRAY=( "subArray.prod5.South-LST.list" )
216-
fi
217-
elif [[ $P2 == *"sq07"* ]]; then
218-
EDM=( "-sq07-LL" )
219-
ARRAY=( "subArray.prod5.South-XST.list" )
220-
ARRAY=( "subArray.prod5.South-TS.list" )
221-
if [[ $P2 == *"LST"* ]]; then
222-
ARRAY=( "subArray.prod5.South-LST.list" )
223-
fi
224-
elif [[ $P2 == *"sqS7"* ]]; then
225-
EDM=( "-sqS7-LL" )
226-
ARRAY=( "subArray.prod5.South-Hyper.list" )
227-
ARRAY=( "subArray.prod5.South.list" )
228-
else
229-
ARRAY=( "subArray.prod5.South-BGR.list" )
230227
fi
231-
if [[ $P2 == *"moon"* ]]; then
232-
SITE=( "prod5-Paranal-20deg-NSB5x" )
233-
ARRAY=( "subArray.prod5.South-Hyper.list" )
234-
ARRAY=( "subArray.prod5.South.list" )
228+
if [[ $P2 == *"LST"* ]]; then
229+
ARRAY=( "subArray.prod5.South-LST.list" )
230+
fi
231+
if [[ $P2 == *"SST"* ]]; then
232+
ARRAY=( "subArray.prod5.South-SST.list" )
233+
fi
234+
if [[ $P2 == *"1ST"* ]]; then
235+
ARRAY=( "subArray.prod5.South-1ST.list" )
236+
fi
237+
if [[ $P2 == *"SV0"* ]]; then
238+
EDM=( "-1MST-LL" )
239+
ARRAY=( "subArray.prod5.South-SV0.list" )
235240
fi
236241
ARRAYDIR=( "prod5" )
237-
TDATE="g20210909"
238-
ANADATE="g20201012"
239-
ANADATE="g20200817"
242+
TDATE="g20210921"
243+
ANADATE="${TDATE}"
240244
TMVADATE="${ANADATE}"
241-
TMVADATE="g20201012"
245+
TMVADATE="g20201021"
242246
EFFDATE="${ANADATE}"
243247
else
244248
echo "error: unknown site; allowed are N or S/S40deg/S60deg"
@@ -250,11 +254,7 @@ OFFAXIS="cone"
250254

251255
#####################################
252256
# particle types
253-
PARTICLE=( "gamma_onSource" "electron" "proton" )
254-
PARTICLE=( "gamma_cone" )
255-
PARTICLE=( "gamma_cone" "gamma_onSource" "electron" )
256-
PARTICLE=( "proton" )
257-
PARTICLE=( "gamma_cone" "gamma_onSource" "electron" "proton" )
257+
PARTICLE=( "gamma_cone" "electron" "proton" "gamma_onSource" )
258258

259259
#####################################
260260
# cut on number of images
@@ -270,6 +270,7 @@ OBSTIME=( "50h" "5h" "30m" "10m" "10h" "20h" "100h" "500h" "5m" "1m" "2h" )
270270
OBSTIME=( "50h" "5h" "30m" "100s" )
271271
OBSTIME=( "5h" "30m" "100s" )
272272
OBSTIME=( "50h" )
273+
OBSTIME=( "30m" )
273274

274275
echo "$RUN" "$SITE"
275276

@@ -360,18 +361,19 @@ do
360361
TABLE="tables_CTA-$S$M-ID0${AZ}-$TDATE"
361362
if [[ $RUN == "MAKETABLES" ]]
362363
then
363-
echo "Filling table $TABLE with mintel option ${LST}"
364+
echo "Filling table $TABLE with mintel option ${NIMAGESMIN}"
364365
cd ./analysis/
365-
./CTA.MSCW_ENERGY.sub_make_tables.sh $TABLE $ID "$NFILARRAY" $OFFAXIS $S$M ${AZ} ${LST} $QSUBOPT
366+
./CTA.MSCW_ENERGY.sub_make_tables.sh $TABLE $ID "$NFILARRAY" $OFFAXIS $S$M ${AZ} ${NIMAGESMIN} $QSUBOPT
366367
cd ../
367368
continue
368369
##########################################
369370
# analyse with lookup tables
370371
elif [[ $RUN == "ANATABLES" ]]
371372
then
372-
echo "Using table $TABLE"
373+
echo "Analysing files with mintel option ${NIMAGESMIN}"
374+
echo " using table $TABLE"
373375
cd ./analysis/
374-
./CTA.MSCW_ENERGY.sub_analyse_MC.sh $TABLE $ID "$NFILARRAY" $S$M $MSCWSUBDIRECTORY $OFFAXIS ${AZ} $QSUBOPT
376+
./CTA.MSCW_ENERGY.sub_analyse_MC.sh $TABLE $ID "$NFILARRAY" $S$M $MSCWSUBDIRECTORY $OFFAXIS ${AZ} ${NIMAGESMIN} $QSUBOPT
375377
cd ../
376378
continue
377379
fi
@@ -410,6 +412,8 @@ do
410412
echo "MSCWSUBDIRECTORY $MSCWSUBDIRECTORY" >> "$PARA"
411413
echo "TMVASUBDIR BDT-${TMVAVERSION}-ID$ID$AZ-$TMVATYPF-$TMVADATE" >> "$PARA"
412414
echo "EFFAREASUBDIR $EFFDIR" >> "$PARA"
415+
EFFBDIR=EffectiveArea-50h-ID$ID$AZ-$ETYPF-$EFFDATE-$EFFVERSION
416+
echo "EFFAREASUBBASEDIR $EFFBDIR" >> "$PARA"
413417
echo "RECID $ID" >> "$PARA"
414418
echo "NIMAGESMIN $NIMAGESMIN" >> "$PARA"
415419
echo "NLST $LST" >> "$PARA"
@@ -439,7 +443,7 @@ do
439443
# IRFs: effective areas after quality cuts
440444
elif [[ $RUN == "QC" ]]
441445
then
442-
if [[ "$OOTIME" = "50h" ]] && [[ "$MST" -ge "4" ]]
446+
if [[ "$MST" -ge "4" ]]
443447
then
444448
./CTA.EFFAREA.sub_analyse_list.sh "$NFILARRAY" ANASUM.GammaHadron.QC "$PARA" QualityCuts001CU $S$M 3 $QSUBOPT $AZ
445449
# min angle cut depends on observation time: 50h stricter, 5h and and 30 min more relaxed
@@ -452,7 +456,7 @@ do
452456
elif [[ $RUN == "CUTS" ]]
453457
then
454458
# large multiplicity runs use 80% max signal efficiency (best resolution)
455-
if [[ "$OOTIME" = "50h" ]] && [[ "$MST" -ge "4" ]]
459+
if [[ "$MST" -ge "4" ]]
456460
then
457461
./CTA.EFFAREA.sub_analyse_list.sh "$NFILARRAY" ANASUM.GammaHadron.TMVA "$PARA" BDT."$OOTIME"-${EFFVERSION}.$EFFDATE $S$M 0 $QSUBOPT $AZ
458462
# low multiplicity runs use 95% max signal efficiency (lower requirements on resolution)
@@ -467,11 +471,9 @@ do
467471
then
468472
./CTA.WPPhysWriter.sub.sh "$NFILARRAY" ${EFFFULLDIR}/BDT."$OOTIME"-${EFFVERSION}.$EFFDATE \
469473
$OOTIME DESY.$EFFDATE.${EFFVERSION}.ID$ID$AZ$ETYPF.$S$M 1 $ID $S$M $BFINEBINNING $EFFDATE $QSUBOPT
470-
#$OOTIME DESY.g20201012.${EFFVERSION}.ID$ID$AZ$ETYPF.$S$M 1 $ID $S$M $BFINEBINNING $EFFDATE $QSUBOPT
471474
else
472475
./CTA.WPPhysWriter.sub.sh "$NFILARRAY" ${EFFFULLDIR}/BDT."$OOTIME"-${EFFVERSION}.$EFFDATE \
473476
$OOTIME DESY.$EFFDATE.${EFFVERSION}.ID$ID$AZ$ETYPF.$S$M 0 $ID $S$M $BFINEBINNING $EFFDATE $QSUBOPT
474-
#$OOTIME DESY.g20201012.${EFFVERSION}.ID$ID$AZ$ETYPF.$S$M 0 $ID $S$M $BFINEBINNING $EFFDATE $QSUBOPT
475477
fi
476478
# unknown run set
477479
elif [[ $RUN != "EVNDISP" ]]

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 3-Clause License
22

3-
Copyright (c) 2019, GernotMaier
3+
Copyright (c) 2019, Eventdisplay Developers
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without

0 commit comments

Comments
 (0)