Skip to content

Commit fba905c

Browse files
GernotMaierGernotMaier
authored
Merge pull request #35 from Eventdisplay/prod6-dev-v03-htcondor
HTCondor adaption of job submission scripts
2 parents 50fc5e2 + 05f449e commit fba905c

17 files changed

+305
-191
lines changed

‎CTA.mainRunScripts.sh‎

Lines changed: 0 additions & 88 deletions
This file was deleted.

‎CTA.mainRunScriptsReduced.sh‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,20 @@
77

88
if [ $# -lt 2 ]; then
99
echo "
10-
./CTA.mainRunScripts.hs <data set> <run mode>
10+
./CTA.mainRunScripts.sh <data set> <run mode>
1111
1212
data sets:
13-
prod5-South-20deg prod5-South-40deg prod5-South-60deg
14-
prod5-South-20deg-moon prod5-South-40deg-moon prod5-South-60deg-moon
15-
prod5b-North-20deg prod5b-North-40deg prod5b-North-60deg
16-
prod5b-North-20deg-moon prod5b-North-40deg-moon prod5b-North-60deg-moon
17-
prod3b-S20deg-SCTAlpha
13+
14+
Prod3b analysis:
15+
prod3b-S20deg-SCTAlpha
16+
Prod5 analysis:
17+
prod5-South-20deg prod5-South-40deg prod5-South-60deg
18+
prod5-South-20deg-moon prod5-South-40deg-moon prod5-South-60deg-moon
19+
prod5b-North-20deg prod5b-North-40deg prod5b-North-60deg
20+
prod5b-North-20deg-moon prod5b-North-40deg-moon prod5b-North-60deg-moon
21+
Prod6 analysis:
22+
prod6-North-20deg
23+
prod6-South-20deg
1824
1925
run modes:
2026
MAKETABLES DISPBDT ANATABLES PREPARETMVA TRAIN ANGRES QC CUTS PHYS
@@ -34,17 +40,21 @@ if [[ ${P2} == *"North"* ]]; then
3440
NMULT=( 2 3 4 )
3541
fi
3642
LSTMULT=( 2 3 4 )
43+
44+
# run scripts are collected here
45+
RUNSCRIPTDIR="${CTA_USER_LOG_DIR}/jobs/$(uuidgen)"
46+
mkdir -p ${RUNSCRIPTDIR}
3747

3848
if [[ ${RUN} == "MAKETABLES" ]] || [[ ${RUN} == "DISPBDT" ]] || [[ ${RUN} == "ANATABLES" ]] || [[ ${RUN} == "PREPARETMVA" ]]; then
39-
./CTA.runAnalysis.sh ${P2} ${RUN}
40-
./CTA.runAnalysis.sh ${P2}-sub ${RUN}
49+
./CTA.runAnalysis.sh ${P2} ${RUN} 0 2 2 2 2 ${RUNSCRIPTDIR}
50+
./CTA.runAnalysis.sh ${P2}-sub ${RUN} 0 2 2 2 2 ${RUNSCRIPTDIR}
4151
else
4252
while IFS= read -r mult
4353
do
44-
./CTA.runAnalysis.sh ${P2} ${RUN} 0 $mult
54+
./CTA.runAnalysis.sh ${P2} ${RUN} 0 $mult ${RUNSCRIPTDIR}
4555
done < NIM-South.txt
4656
while IFS= read -r mult
4757
do
48-
./CTA.runAnalysis.sh ${P2}-sub ${RUN} 0 $mult
58+
./CTA.runAnalysis.sh ${P2}-sub ${RUN} 0 $mult ${RUNSCRIPTDIR}
4959
done < NIM-South-sub.txt
5060
fi

‎CTA.runAnalysis.sh‎

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if [ $# -lt 2 ]
1111
then
1212
echo "
1313
./CTA.runbAnalysis.sh <S/S40deg> <run mode> [recid] \\\\
14-
[min number of LSTs] [min number of MSTs] [min number of SSTs] [min number of SCMSTs]
14+
[min number of LSTs] [min number of MSTs] [min number of SSTs] [min number of SCMSTs] [job_dir]
1515
1616
Prod3b analysis:
1717
prod3b-S20deg / prod3b-S40deg / prod3b-S60deg
@@ -31,7 +31,8 @@ then
3131
possible run modes are EVNDISP MAKETABLES DISPBDT/DISPMLP ANATABLES PREPARETMVA TRAIN ANGRES QC CUTS PHYS
3232
3333
[recids]: 0 = all telescopes (default), 1 = LSTs, 2 = MSTs, 3 = SSTs, 4 = MSTs+SSTs, 5 = LSTs+MSTs
34-
[XST multiplicities]: default = 2
34+
35+
[job_dir]: run scripts and job files are written to this directory
3536
"
3637

3738
exit
@@ -48,17 +49,18 @@ RUN="$2"
4849
[[ "$5" ]] && MST=$5 || MST="2"
4950
[[ "$6" ]] && SST=$6 || SST="2"
5051
[[ "$7" ]] && SCMST=$7 || SCMST="2"
52+
[[ "$8" ]] && PDIR=${8} || PDIR="$CTA_USER_LOG_DIR/"
5153
echo "Telescope multiplicities: LST ${LST} MST ${MST} SST ${SST} SCMST ${SCMST}"
5254

5355
#####################################
5456
# qsub options (priorities)
5557
# _M_ = -; _X_ = " "
58+
# even without using gridengine: do not remove this
5659
QSUBOPT="_M_P_X_cta_high_X__M_js_X_9"
5760

5861
#####################################
5962
# output directory for script parameter files
60-
PDIR="$CTA_USER_LOG_DIR/tempRunParameterDir/"
61-
mkdir -p "$PDIR"
63+
mkdir -p "$PDIR/tempRunParameterDir/"
6264

6365
#####################################
6466
# analysis dates and table dates
@@ -290,9 +292,10 @@ then
290292
ARRAY=( "subArray.prod5.South-SV0.list" )
291293
fi
292294
ARRAYDIR="prod5"
293-
TDATE="g20220408"
295+
TDATE="g20220902"
296+
TDATE="g20221101"
294297
ANADATE="${TDATE}"
295-
ANADATE="g20220609"
298+
ANADATE="g20221101"
296299
TMVADATE="${ANADATE}"
297300
EFFDATE="${ANADATE}"
298301
PHYSDATE="${EFFDATE}"
@@ -404,8 +407,7 @@ then
404407
${SITE}${EDM} \
405408
${KEEPDST} \
406409
$i \
407-
$QSUBOPT \
408-
$TRG
410+
$QSUBOPT
409411
cd ../
410412
done
411413
continue
@@ -417,7 +419,7 @@ if [[ ! -e ${ARRAYDIR}/$ARRAY ]]; then
417419
exit
418420
fi
419421
NXARRAY=$(cat ${ARRAYDIR}/$ARRAY)
420-
NFILARRAY=$PDIR/temp.$ARRAY.list
422+
NFILARRAY=$PDIR/tempRunParameterDir/temp.$ARRAY.list
421423
rm -f "$NFILARRAY"
422424
touch "$NFILARRAY"
423425
for A in $NXARRAY
@@ -448,7 +450,8 @@ then
448450
$RUNPAR \
449451
99 \
450452
$QCPAR \
451-
$QSUBOPT
453+
$QSUBOPT \
454+
${PDIR}
452455
cd ../
453456
done
454457
exit
@@ -482,7 +485,8 @@ do
482485
${SITE}${EDM} \
483486
${AZ} \
484487
${NIMAGESMIN} \
485-
$QSUBOPT
488+
$QSUBOPT \
489+
${PDIR}
486490
cd ../
487491
continue
488492
##########################################
@@ -501,7 +505,8 @@ do
501505
$OFFAXIS \
502506
${AZ} \
503507
${NIMAGESMIN} \
504-
$QSUBOPT
508+
$QSUBOPT \
509+
${PDIR}
505510
cd ../
506511
continue
507512
fi
@@ -538,7 +543,7 @@ do
538543
then
539544
TMVATYPF=NIM${NIMAGESMIN}LST${LST}MST${MST}SST${SST}
540545
fi
541-
PARA="$PDIR/scriptsInput.${ID}${ETYPF}${AZ}.${SITE}${AZ}${OOTIME}.runparameter"
546+
PARA="$PDIR/tempRunParameterDir/scriptsInput.${ID}${ETYPF}${AZ}.${SITE}${AZ}${OOTIME}.runparameter"
542547
rm -f "$PARA"
543548
touch "$PARA"
544549
echo "WRITING PARAMETERFILE $PARA"
@@ -589,7 +594,8 @@ do
589594
${SITE}${EDM} \
590595
"$PARA" \
591596
$QSUBOPT \
592-
$AZ
597+
$AZ \
598+
${PDIR}
593599
fi
594600
##########################################
595601
# train BDTs
@@ -604,7 +610,8 @@ do
604610
${SITE}${EDM} \
605611
"$PARA" \
606612
$QSUBOPT \
607-
$AZ
613+
$AZ \
614+
${PDIR}
608615
fi
609616
##########################################
610617
# IRFs: angular resolution
@@ -619,6 +626,7 @@ do
619626
${SITE}${EDM} \
620627
2 \
621628
$QSUBOPT \
629+
${PDIR} \
622630
$AZ
623631
fi
624632
##########################################
@@ -634,6 +642,7 @@ do
634642
${SITE}${EDM} \
635643
3 \
636644
$QSUBOPT \
645+
${PDIR} \
637646
$AZ
638647
fi
639648
##########################################
@@ -651,6 +660,7 @@ do
651660
${SITE}${EDM} \
652661
0 \
653662
$QSUBOPT \
663+
${PDIR} \
654664
$AZ
655665
# low multiplicity runs use 95% max signal efficiency (lower requirements on resolution)
656666
else
@@ -662,6 +672,7 @@ do
662672
${SITE}${EDM} \
663673
0 \
664674
$QSUBOPT \
675+
${PDIR} \
665676
$AZ
666677
fi
667678
##########################################
@@ -680,6 +691,7 @@ do
680691
${SITE}${EDM} \
681692
$BFINEBINNING \
682693
$PHYSDATE \
694+
${PDIR} \
683695
$QSUBOPT
684696
else
685697
./CTA.WPPhysWriter.sub.sh \
@@ -692,6 +704,7 @@ do
692704
${SITE}${EDM} \
693705
$BFINEBINNING \
694706
$PHYSDATE \
707+
${PDIR} \
695708
$QSUBOPT
696709
fi
697710
# unknown run set

‎analysis/CTA.DISPTRAINING.sub_analyse.sh‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,15 @@
1717
#
1818
# Removed BDTDispCore (could be simply added)
1919
#
20+
SUBC="condor"
21+
h_cpu="47:29:00"
22+
h_vmem="12000M"
23+
tmpdir_size="1G"
2024

2125
if [ $# -lt 5 ]
2226
then
2327
echo
24-
echo "CTA.DISPTRAINING_sub_analyse.sh <data set> <output directory> <recid> <array layout (e.g. S.3HB1)> <TMVA parameters> [scaling] [qsub options (optional)]"
28+
echo "CTA.DISPTRAINING_sub_analyse.sh <data set> <output directory> <recid> <array layout (e.g. S.3HB1)> <TMVA parameters> [scaling] [qsub options (optional)] [job_dir]"
2529
echo ""
2630
echo " <data set> e.g. cta-ultra3, ISDC3700m, ... "
2731
echo " <output directory> training results will be written to this directory (full path)"
@@ -83,10 +87,12 @@ EVNDISP="EVNDISP"
8387
# in case you submit a lot of scripts: QLOG=/dev/null
8488
DATE=`date +"%y%m%d"`
8589
QLOG=$CTA_USER_LOG_DIR/$DATE/DISPTRAINING/
86-
mkdir -p $QLOG
87-
88-
# output directory for shell scripts
8990
SHELLDIR=$CTA_USER_LOG_DIR/$DATE/DISPTRAINING/
91+
if [ -n ${9} ]; then
92+
QLOG=${9}
93+
SHELLDIR=${QLOG}
94+
fi
95+
mkdir -p $QLOG
9096
mkdir -p $SHELLDIR
9197

9298
# skeleton script
@@ -234,7 +240,11 @@ do
234240
echo "shell script " $FNAM.sh
235241

236242
# submit the job
237-
qsub $QSUBOPT -l h_cpu=47:45:00 -l h_rss=12000M -V -o $QLOG/ -e $QLOG/ "$FNAM.sh"
243+
if [[ $SUBC == *qsub* ]]; then
244+
qsub $QSUBOPT -l h_cpu=${h_cpu} -l h_rss=${h_vmem} -V -o $QLOG/ -e $QLOG/ "$FNAM.sh"
245+
elif [[ $SUBC == *condor* ]]; then
246+
./condorSubmission.sh "${FNAM}.sh" $h_vmem $tmpdir_size
247+
fi
238248
done
239249
done
240250
done

‎analysis/CTA.EFFAREA.qsub_analyse_list.sh‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,14 @@ ODIR=PPPODIR
2525
GFILLING=PPPGMOD
2626
DSET=PPPDSET
2727
MCAZ="PPPMCAZ"
28+
PARTID="PARTIDNOTSET"
2829
######################################################################
2930

30-
# Choose PARTICLE type from job id
31-
let "PARTID = $SGE_TASK_ID - 1"
31+
# Choose PARTICLE type from job id for SGE qsub system
32+
re='^[0-9]+$'
33+
if ! [[ $PARTID =~ $re ]] ; then
34+
let "PARTID = $SGE_TASK_ID - 1"
35+
fi
3236
declare -a PTYPELIST=("gamma_onSource" "electron_onSource" "proton_onSource" "gamma_cone" "electron" "proton")
3337
if [ $PTYPE = "GAMMA" ]
3438
then

0 commit comments

Comments
 (0)