Skip to content

Commit fdfdcc1

Browse files
chiarazampollichiarazampolli
committed
Extra fix, and possibility to take parse.sh from local file
1 parent 495c31b commit fdfdcc1

File tree

3 files changed

+65
-36
lines changed

3 files changed

+65
-36
lines changed

‎DATA/production/configurations/2022/MayJunePilotBeam/apass1/async_pass.sh‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,11 @@ echo processing run $RUNNUMBER, from period $PERIOD with $BEAMTYPE collisions an
9696
exit 2
9797
fi
9898
tar -xzvf commonInput.tgz
99-
source $O2DPG_ROOT/DATA/production/configurations/$ALIEN_JDL_LPMANCHORYEAR/$O2DPGPATH/$ALIEN_JDL_LPMPASSNAME/selectSettings.sh
99+
SELECTSETTINGSSCRIPT="$O2DPG_ROOT/DATA/production/configurations/$ALIEN_JDL_LPMANCHORYEAR/$O2DPGPATH/$ALIEN_JDL_LPMPASSNAME/selectSettings.sh"
100+
if [[ -f "selectSettings.sh" ]]; then
101+
SELECTSETTINGSSCRIPT="selectSettings.sh"
102+
fi
103+
source $SELECTSETTINGSSCRIPT
100104
# run specific archive
101105
if [[ ! -f runInput_$RUNNUMBER.tgz ]]; then
102106
echo "No runInput_$RUNNUMBER.tgz, let's hope we don't need it"
@@ -111,8 +115,12 @@ ls -altr
111115
# define whether to remap or not the Cluster Dictionaries for ITS and MFT
112116
# needed only till run 517224 included (other runs are mapped in the ctf2epn
113117
# but they are not for async reco)
118+
PARSESCRIPT="$O2DPG_ROOT/DATA/production/configurations/$ALIEN_JDL_LPMANCHORYEAR/$O2DPGPATH/$ALIEN_JDL_LPMPASSNAME/parse.sh"
119+
if [[ -f "parse.sh" ]]; then
120+
PARSESCRIPT="parse.sh"
121+
fi
114122
if [[ $RUNNUMBER -le 517224 ]]; then
115-
source $O2DPG_ROOT/DATA/production/configurations/$ALIEN_JDL_LPMANCHORYEAR/$O2DPGPATH/$ALIEN_JDL_LPMPASSNAME/parse.sh `cat list.list`
123+
source $PARSESCRIPT `cat list.list`
116124
fi
117125

118126
if [[ -f "setenv_extra.sh" ]]; then

‎DATA/production/configurations/2022/MayJunePilotBeam/apass1/parse.sh‎

Lines changed: 51 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ if [[ -z $line ]]; then
1010
else
1111
epn=`echo $line | cut -d' ' -f1`
1212
start=`echo $line | cut -d' ' -f2`
13-
echo epn = $epn
14-
echo start = $start
13+
echo "epn = $epn"
14+
echo "start of CTF data = $start"
1515

1616
lineTimes=`grep ${epn} $O2DPG_ROOT/DATA/production/configurations/$ALIEN_JDL_LPMANCHORYEAR/$O2DPGPATH/$ALIEN_JDL_LPMPASSNAME/goodITSMFT_fixed.txt`
1717
echo lineTimes = $lineTimes
@@ -42,62 +42,79 @@ else
4242
echo "good MFT: month = $goodMFTmonth, day = $goodMFTday, hour = $goodMFThour, minute = $goodMFTminute, seconds = $goodMFTsecond"
4343
echo "checking: month = $startmonth, day = $startday, hour = $starthour, minute = $startminute, seconds = $startsecond"
4444

45-
if [[ $startday < $goodITSday ]]; then
46-
echo "day triggers remappingITS"
45+
# check for ITS
46+
if [[ $startmonth < $goodITSmonth ]]; then
47+
echo "month triggers remappingITS"
4748
remappingITS=1
48-
elif [[ $startday == $goodITSday ]]; then
49-
if [[ $starthour < $goodITShour ]]; then
50-
echo "hour triggers remappingITS"
49+
elif [[ $startmonth == $goodITSmonth ]]; then
50+
if [[ $startday < $goodITSday ]]; then
51+
echo "day triggers remappingITS"
5152
remappingITS=1
52-
elif [[ $starthour == $goodITShour ]]; then
53-
if [[ $startminute < $goodITSminute ]]; then
54-
echo "minute triggers remappingITS"
53+
elif [[ $startday == $goodITSday ]]; then
54+
if [[ $starthour < $goodITShour ]]; then
55+
echo "hour triggers remappingITS"
5556
remappingITS=1
56-
elif [[ $startminute == $goodITSminute ]]; then
57-
if [[ $startsecond -le $goodITSsecond ]]; then
58-
echo "second triggers remappingITS"
57+
elif [[ $starthour == $goodITShour ]]; then
58+
if [[ $startminute < $goodITSminute ]]; then
59+
echo "minute triggers remappingITS"
5960
remappingITS=1
61+
elif [[ $startminute == $goodITSminute ]]; then
62+
if [[ $startsecond -le $goodITSsecond ]]; then
63+
echo "second triggers remappingITS"
64+
remappingITS=1
65+
else
66+
echo "month, day, hour, minute would trigger remapping, but seconds are larger than what is needed to trigger remapping for ITS"
67+
fi
6068
else
61-
echo "day, hour, minute would trigger remapping, but seconds are larger than what is needed to trigger remapping for ITS"
69+
echo "month, day, hour would trigger remapping, but minutes are larger than what is needed to trigger remapping for ITS"
6270
fi
6371
else
64-
echo "day, hour would trigger remapping, but minutes are larger than what is needed to trigger remapping for ITS"
72+
echo "month, day would trigger remapping, but hours are larger than what is needed to trigger remapping for ITS"
6573
fi
6674
else
67-
echo "day would trigger remapping, but minutes are larger than what is needed to trigger remapping for ITS"
75+
echo "month, would trigger remapping, but days are larger than what is needed to trigger remapping for ITS"
6876
fi
69-
else
70-
echo "start day is later than what is needed to trigger remapping for ITS"
77+
else
78+
echo "start month is later than what is needed to trigger remapping for ITS"
7179
fi
7280

73-
if [[ $startday < $goodMFTday ]]; then
74-
echo "day triggers remappingMFT"
81+
# check for MFT
82+
if [[ $startmonth < $goodMFTmonth ]]; then
83+
echo "month triggers remappingMFT"
7584
remappingMFT=1
76-
elif [[ $startday == $goodMFTday ]]; then
77-
if [[ $starthour < $goodMFThour ]]; then
78-
echo "hour triggers remappingMFT"
85+
elif [[ $startmonth == $goodMFTmonth ]]; then
86+
if [[ $startday < $goodMFTday ]]; then
87+
echo "day triggers remappingMFT"
7988
remappingMFT=1
80-
elif [[ $starthour == $goodMFThour ]]; then
81-
if [[ $startminute < $goodMFTminute ]]; then
82-
echo "minute triggers remappingMFT"
89+
elif [[ $startday == $goodMFTday ]]; then
90+
if [[ $starthour < $goodMFThour ]]; then
91+
echo "hour triggers remappingMFT"
8392
remappingMFT=1
84-
elif [[ $startminute == $goodMFTminute ]]; then
85-
if [[ $startsecond -le $goodMFTsecond ]]; then
86-
echo "second triggers remappingMFT"
93+
elif [[ $starthour == $goodMFThour ]]; then
94+
if [[ $startminute < $goodMFTminute ]]; then
95+
echo "minute triggers remappingMFT"
8796
remappingMFT=1
97+
elif [[ $startminute == $goodMFTminute ]]; then
98+
if [[ $startsecond -le $goodMFTsecond ]]; then
99+
echo "second triggers remappingMFT"
100+
remappingMFT=1
101+
else
102+
echo "month, day, hour, minute would trigger remapping, but seconds are larger than what is needed to trigger remapping for MFT"
103+
fi
88104
else
89-
echo "day, hour, minute would trigger remapping, but seconds are larger than what is needed to trigger remapping for MFT"
105+
echo "month, day, hour would trigger remapping, but minutes are larger than what is needed to trigger remapping for MFT"
90106
fi
91107
else
92-
echo "day, hour would trigger remapping, but minutes are larger than what is needed to trigger remapping for MFT"
108+
echo "month, day would trigger remapping, but hours are larger than what is needed to trigger remapping for MFT"
93109
fi
94110
else
95-
echo "day would trigger remapping, but minutes are larger than what is needed to trigger remapping for MFT"
111+
echo "month, would trigger remapping, but days are larger than what is needed to trigger remapping for MFT"
96112
fi
97-
else
98-
echo "start day is later than what is needed to trigger remapping for MFT"
113+
else
114+
echo "start month is later than what is needed to trigger remapping for MFT"
99115
fi
100116

117+
101118
echo "start = $start, goodITS = $goodITS, goodMFT = $goodMFT, remappingITS = $remappingITS, remappingMFT = $remappingMFT"
102119
fi
103120

‎DATA/production/configurations/2022/MayJunePilotBeam/apass1/selectSettings.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ if [[ $RUNNUMBER -ge 517684 ]] && [[ $RUNNUMBER -le 517693 ]]; then
1414
COLLISIONCONTEXT=collisioncontext_Single_3b_3_1_1.root
1515
fi
1616

17+
if [[ $RUNNUMBER -ge 519041 ]] && [[ $RUNNUMBER -le 519045 ]]; then
18+
COLLISIONCONTEXT=collisioncontext_Single_16b_8_8_8_noLR.root
19+
fi
20+
1721
echo "filling scheme = $COLLISIONCONTEXT"
1822

1923
ln -s $COLLISIONCONTEXT collisioncontext.root

0 commit comments

Comments
 (0)