Skip to content

Commit c9fec28

Browse files
GernotMaierGernotMaier
authored
Merge pull request #30 from Eventdisplay/prod5-north-sq20
Prod5 North sq20 updates
2 parents 5403493 + 4da9330 commit c9fec28

13 files changed

+208
-101
lines changed

‎CTA.mainRunScripts.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ else
7777
do
7878
./CTA.runAnalysis.sh ${P2} ${RUN} 0 $M $M $M $M
7979
# ./CTA.runAnalysis.sh ${P2} ${RUN} 2 $M $M $M $M
80-
# ./CTA.runAnalysis.sh ${P2}-sub ${RUN} 0 $M $M $M $M
80+
./CTA.runAnalysis.sh ${P2}-sub ${RUN} 0 $M $M $M $M
8181
done
8282
fi
8383
fi

‎CTA.runAnalysis.sh‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ then
223223
if [[ $P2 == *"moon"* ]]; then
224224
SITE="${SITE}-NSB5x"
225225
fi
226-
EDM="-sq10-LL"
226+
EDM="-sq20-LL"
227227
if [[ $P2 == *"DL2plus"* ]]; then
228228
EDM="-sq10-LL-DL2plus"
229229
fi
@@ -270,23 +270,19 @@ then
270270
EDM="-sq10-LL-DL2plus"
271271
fi
272272
ARRAY=( "subArray.prod5.South-BL.list" )
273-
ARRAY=( "subArray.prod5.South-D1a.list" )
274-
ARRAY=( "subArray.prod5.South-M1.list" )
275-
ARRAY=( "subArray.prod5.South-ax.list" )
276273
ARRAY=( "subArray.prod5.South-Alpha.list" )
277-
ARRAY=( "subArray.prod5.South-AlphaLSTs.list" );
278-
ARRAY=( "subArray.prod5.South-AlphaC8aj.list" );
274+
ARRAY=( "subArray.prod5.South-AlphaLSTs.list" )
275+
##
276+
ARRAY=( "subArray.prod5.South-AlphaC8aj.list" )
279277
ARRAY=( "subArray.prod5.South-BetaPlus.list" )
280-
ARRAY=( "subArray.prod5.South-BetaPlus-redo.list")
278+
ARRAY=( "subArray.prod5.South-AlphaC8aj-BetaPlus.list" )
281279
if [[ $P2 == *"sub"* ]]; then
282280
ARRAY=( "subArray.prod5.South-BL-sub.list" )
283-
ARRAY=( "subArray.prod5.South-D1a-sub.list" )
284-
ARRAY=( "subArray.prod5.South-M1-sub.list" )
285-
ARRAY=( "subArray.prod5.South-ax-sub.list" )
286281
ARRAY=( "subArray.prod5.South-Alpha-sub.list" )
282+
##
287283
ARRAY=( "subArray.prod5.South-AlphaC8aj-sub.list" );
288-
ARRAY=( "subArray.prod5.South-AlphaLSTs-sub.list" );
289284
ARRAY=( "subArray.prod5.South-BetaPlus-sub.list" )
285+
ARRAY=( "subArray.prod5.South-AlphaC8aj-BetaPlus-sub.list" )
290286
fi
291287
if [[ $P2 == *"Hyper"* ]] || [[ $P2 == *"hyper"* ]]; then
292288
ARRAY=( "subArray.prod5.South-Hyper.list" )
@@ -338,8 +334,8 @@ NIMAGESMIN=$((SCMST<NIMAGESMIN ? SCMST : NIMAGESMIN))
338334
# (note that all steps except CUTS and PHYS are done only for 50h)
339335
OBSTIME=( "50h" "5h" "30m" "10m" "10h" "20h" "100h" "500h" "5m" "1m" "2h" )
340336
OBSTIME=( "10s" "30s" "300s" "1000s" "3000s" "10000s" "30000s" )
341-
OBSTIME=( "50h" "5h" "30m" "100s" )
342337
OBSTIME=( "50h" "30m" )
338+
OBSTIME=( "50h" "5h" "30m" "100s" )
343339

344340
echo "$RUN" "$SITE"
345341

‎analysis/CTA.DISPTRAINING.sub_analyse.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ do
186186
k=`expr 0.2*$NFIL | bc`
187187
if [[ $DSET == *"LaPalma"* ]]
188188
then
189-
k=$(echo $NFIL | awk '{printf "%d\n",$1*0.20}')
189+
k=$(echo $NFIL | awk '{printf "%d\n",$1*0.25}')
190190
elif [[ $DSET == *"SCT"* ]]
191191
then
192192
k=$(echo $NFIL | awk '{printf "%d\n",$1*0.30}')

‎analysis/CTA.MSCW_ENERGY.qsub_analyse_MC.sh‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,11 @@ MOPT="$MOPT -redo_stereo_reconstruction -sub_array_sim_telarray_counting $LISFIL
122122

123123
# IMPORTANT: this must be the same or lower value as in dispBDT training
124124
MOPT="$MOPT -maxloss=0.2 -minfui=0."
125-
# MST small array analysis
126-
#if [[ $DSET == *"paranal"* ]]; then
127-
# MOPT="$MOPT -maxdistfraction=0.70"
128-
#else
129-
# MOPT="$MOPT -maxdistfraction=0.80"
130-
#fi
131-
MOPT="$MOPT -maxdistfraction=0.80"
125+
if [[ $DSET == *"LaPalma"* ]]; then
126+
MOPT="$MOPT -maxdistfraction=0.70"
127+
else
128+
MOPT="$MOPT -maxdistfraction=0.80"
129+
fi
132130

133131
#########################################
134132
# disp reconstruction

‎analysis/CTA.WPPhysWriter.sub.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
if [ $# -lt 7 ]
99
then
1010
echo
11-
echo "./CTA.WPPhysWriter.sh <sub array list> <directory with effective areas> <observation time> <output file name> <offset=0/1> <recid> <data set> [off-axis fine binning (default=FALSE)] [qsub options] [name]"
11+
echo "./CTA.WPPhysWriter.sh <sub array list> <directory with effective areas> <observation time> <output file name> <offset=0/1> <recid> <data set> [off-axis fine binning (default=FALSE)] [name] [qsub options]"
1212
echo
1313
echo " <sub array list> text file with list of subarray IDs"
1414
echo ""

‎install/prepareProductionBinaries.sh‎

Lines changed: 80 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -32,98 +32,104 @@ if [[ $DSET = *"SCT-sq11-LL"* ]]; then
3232
VERSION="prod3b-v11"
3333
fi
3434

35-
# parameter and configuration files
36-
AUXDIR="$CTA_USER_WORK_DIR/analysis/AnalysisData/${DSET}/"
37-
mkdir -p $AUXDIR
38-
cd $AUXDIR
39-
rm -rf Eventdisplay_AnalysisFiles_CTA
40-
echo "Analysis file installation into $AUXDIR/Eventdisplay_AnalysisFiles_CTA/"
41-
if [[ $VERSION == "main" ]]; then
42-
git clone [email protected]:Eventdisplay/Eventdisplay_AnalysisFiles_CTA.git
43-
else
44-
git clone -b ${VERSION} [email protected]:Eventdisplay/Eventdisplay_AnalysisFiles_CTA.git
45-
fi
46-
47-
# everything below is code
48-
export EVNDISPSYS="$CTA_USER_WORK_DIR/analysis/AnalysisData/${DSET}/code/"
49-
rm -rf $EVNDISPSYS
50-
mkdir -p $EVNDISPSYS
51-
echo "Software installation into $EVNDISPSYS"
52-
53-
echo "Preparing binaries for $DSET"
54-
55-
echo
56-
echo "Getting Eventdisplay..."
57-
cd $EVNDISPSYS
58-
if [[ $VERSION == "main" ]]; then
59-
git clone [email protected]:Eventdisplay/Eventdisplay.git
60-
else
61-
git clone -b ${VERSION} [email protected]:Eventdisplay/Eventdisplay.git .
62-
fi
35+
install_analysis_files()
36+
{
37+
# parameter and configuration files
38+
AUXDIR="$CTA_USER_WORK_DIR/analysis/AnalysisData/${DSET}/"
39+
mkdir -p $AUXDIR
40+
cd $AUXDIR
41+
rm -rf Eventdisplay_AnalysisFiles_CTA
42+
echo "Analysis file installation into $AUXDIR/Eventdisplay_AnalysisFiles_CTA/"
43+
if [[ $VERSION == "main" ]]; then
44+
git clone [email protected]:Eventdisplay/Eventdisplay_AnalysisFiles_CTA.git
45+
else
46+
git clone -b ${VERSION} [email protected]:Eventdisplay/Eventdisplay_AnalysisFiles_CTA.git
47+
fi
48+
}
6349

64-
# HESSIOSYS
65-
HESSPACKAGE="hessioxxx.tar.gz"
66-
if [[ ! -e ${HESSPACKAGE} ]]; then
67-
wget https://www.mpi-hd.mpg.de/hfm/CTA/MC/Software/Testing/$HESSPACKAGE
68-
fi
69-
tar -xvzf $HESSPACKAGE
70-
cd hessioxxx
50+
install_hessio()
51+
{
52+
HESSPACKAGE="hessioxxx.tar.gz"
53+
if [[ ! -e ${HESSPACKAGE} ]]; then
54+
wget https://www.mpi-hd.mpg.de/hfm/CTA/MC/Software/Testing/$HESSPACKAGE
55+
fi
56+
tar -xvzf $HESSPACKAGE
57+
cd hessioxxx
7158

72-
# FLAGS for hessioxx and Eventdisplay compilation
73-
if [[ $DSET = *"prod3"* ]]
74-
then
75-
if [[ $DSET = *"SCT"* ]]
59+
# FLAGS for hessioxx and Eventdisplay compilation
60+
if [[ $DSET = *"prod3"* ]]
7661
then
77-
if [[ $DSET = *"sq11"* ]]; then
78-
if [[ $DSET = *"156"* ]]; then
79-
export HESSIOCFLAGS="-DCTA_PROD4_SC -DMAXIMUM_TELESCOPES=156"
80-
export MAXTEL=156
62+
if [[ $DSET = *"SCT"* ]]
63+
then
64+
if [[ $DSET = *"sq11"* ]]; then
65+
if [[ $DSET = *"156"* ]]; then
66+
export HESSIOCFLAGS="-DCTA_PROD4_SC -DMAXIMUM_TELESCOPES=156"
67+
export MAXTEL=156
68+
else
69+
export HESSIOCFLAGS="-DCTA_PROD4_SC -DMAXIMUM_TELESCOPES=92"
70+
export MAXTEL=92
71+
fi
72+
EFLAGS="PROD3b_SCTALPHA"
8173
else
82-
export HESSIOCFLAGS="-DCTA_PROD4_SC -DMAXIMUM_TELESCOPES=92"
83-
export MAXTEL=92
74+
export HESSIOCFLAGS="-DCTA -DCTA_PROD3_DEMO"
75+
EFLAGS="PROD3b_SCT"
8476
fi
85-
EFLAGS="PROD3b_SCTALPHA"
86-
else
87-
export HESSIOCFLAGS="-DCTA -DCTA_PROD3_DEMO"
88-
EFLAGS="PROD3b_SCT"
89-
fi
90-
elif [[ $DSET = *"paranal"* ]]
91-
then
92-
export HESSIOCFLAGS="-DCTA -DCTA_PROD3_MERGE"
93-
EFLAGS="PROD3b_South"
94-
elif [[ $DSET = *"LaPalma"* ]]
77+
elif [[ $DSET = *"paranal"* ]]
78+
then
79+
export HESSIOCFLAGS="-DCTA -DCTA_PROD3_MERGE"
80+
EFLAGS="PROD3b_South"
81+
elif [[ $DSET = *"LaPalma"* ]]
9582
then
9683
export HESSIOCFLAGS="-DCTA -DCTA_PROD3_DEMO"
9784
EFLAGS="PROD3b_North"
9885
else
9986
echo "unknown data"
10087
exit
10188
fi
102-
elif [[ $DSET = *"prod4"* ]]
103-
then
104-
export HESSIOCFLAGS="-DCTA -DCTA_PROD3_MERGE"
105-
EFLAGS="PROD4b"
106-
elif [[ $DSET = *"prod5"* ]]
107-
then
108-
export HESSIOCFLAGS="-DCTA_PROD4 -DMAXIMUM_TELESCOPES=180 -DWITH_GSL_RNG"
109-
EFLAGS="PROD5"
89+
elif [[ $DSET = *"prod4"* ]]
90+
then
91+
export HESSIOCFLAGS="-DCTA -DCTA_PROD3_MERGE"
92+
EFLAGS="PROD4b"
93+
elif [[ $DSET = *"prod5"* ]]
94+
then
95+
export HESSIOCFLAGS="-DCTA_PROD4 -DMAXIMUM_TELESCOPES=180 -DWITH_GSL_RNG"
96+
EFLAGS="PROD5"
97+
else
98+
echo "unknown production"
99+
exit
100+
fi
101+
make EXTRA_DEFINES="${HESSIOCFLAGS}"
102+
cd ..
103+
rm -f hessioxxx.tar.gz
104+
}
105+
106+
install_analysis_files
107+
108+
CODEDIR="$CTA_USER_WORK_DIR/analysis/AnalysisData/${DSET}/code/"
109+
EVNDISPSYS="${CODEDIR}/Eventdisplay"
110+
export EVNDISPSYS="${CODEDIR}/Eventdisplay"
111+
rm -rf ${EVNDISPSYS}
112+
mkdir -p $CODEDIR || return
113+
echo "Software installation into $CODEDIR"
114+
echo "Preparing binaries for $DSET"
115+
116+
echo
117+
echo "Getting Eventdisplay..."
118+
cd $CODEDIR
119+
if [[ $VERSION == "main" ]]; then
120+
git clone [email protected]:Eventdisplay/Eventdisplay.git
110121
else
111-
echo "unknown production"
112-
exit
122+
git clone -b ${VERSION} [email protected]:Eventdisplay/Eventdisplay.git .
113123
fi
114-
make EXTRA_DEFINES="${HESSIOCFLAGS}"
115-
cd $EVNDISPSYS
116-
rm -f hessioxxx.tar.gz
117124

118-
# install sofa
125+
install_hessio
126+
127+
cd $EVNDISPSYS
119128
./install_sofa.sh
120129

121-
# set all flags
122130
cd ${TDIR}
123131
source ../setSoftwarePaths.sh ${DSET}
124-
125-
# compile eventdisplay
126132
cd $EVNDISPSYS
127-
make CTA CTAPROD=$EFLAGS GRIDPROD=CTAGRID
128-
133+
pwd
134+
make -j 12 CTA CTAPROD=$EFLAGS GRIDPROD=CTAGRID
129135
cd ${TDIR}

‎prod5/subArray.prod5.North-Alpha-sub.list‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
N.D25-0LSTs09MSTs-MSTN
22
N.BL-4LSTs00MSTs-MSTN
33
N.BL-0LSTs15MSTs-MSTN
4+
N.TS-0LSTs05MSTs-MSTN

‎prod5/subArray.prod5.North-Alpha.list‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
N.D25-4LSTs09MSTs-MSTN
22
N.BL-4LSTs15MSTs-MSTN
3+
N.TS-4LSTs05MSTs-MSTN

‎prod5/subArray.prod5.South-AlphaC8aj-sub.list‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
S.C8aj-37SSTs
2-
S.C8aj-40SSTs
32
S.M6-14MSTs-MSTF

‎prod5/subArray.prod5.South-BetaPlus-sub.list‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
S.C8ajA-46SSTs
22
S.C8ajB-46SSTs
33
S.C8aj-50SSTs
4+
S.C8aj-40SSTs
5+
S.BL-2LSTs00MSTs00SSTs-MSTF
6+
S.BL-3LSTs00MSTs00SSTs-MSTF
7+
S.BL-4LSTs00MSTs00SSTs-MSTF

0 commit comments

Comments
 (0)