Skip to content

Commit 664039e

Browse files
ehellbarehellbar
authored
Merge c9e5de3 into sapling-pr-archive-ehellbar
2 parents 6406128 + c9e5de3 commit 664039e

92 files changed

Lines changed: 3648 additions & 544 deletions

File tree

Some content is hidden

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

‎DATA/production/configurations/asyncReco/async_pass.sh‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,10 @@ if [[ "$ALIEN_JDL_EXTRACTTIMESERIES" == "1" ]]; then
205205
export ADD_CALIB=1
206206
fi
207207

208+
if [[ "$ALIEN_JDL_DOTPCTIMEGAINCALIB" == "1" ]]; then
209+
export ADD_CALIB=1
210+
fi
211+
208212
# AOD file size
209213
if [[ -n "$ALIEN_JDL_AODFILESIZE" ]]; then
210214
export AOD_FILE_SIZE="$ALIEN_JDL_AODFILESIZE"
@@ -280,16 +284,13 @@ fi
280284
ln -sf $O2DPG_ROOT/DATA/common/setenv.sh
281285
ln -sf $O2DPG_ROOT/DATA/common/getCommonArgs.sh
282286

283-
# TFDELAY and throttling
284-
export TFDELAYSECONDS=40
285-
if [[ -n "$ALIEN_JDL_TFDELAYSECONDS" ]]; then
286-
TFDELAYSECONDS="$ALIEN_JDL_TFDELAYSECONDS"
287-
# ...otherwise, it depends on whether we have throttling
288-
elif [[ -n "$ALIEN_JDL_USETHROTTLING" ]]; then
289-
TFDELAYSECONDS=1
290-
if [[ -n "$ALIEN_JDL_NOTFDELAY" ]]; then
291-
TFDELAYSECONDS=0
292-
fi
287+
# throttling and TF-delay
288+
: ${TFDELAYSECONDS:=0}
289+
if [[ -n "$ALIEN_JDL_NOTFDELAY" ]] && [[ "$ALIEN_JDL_NOTFDELAY" -gt 0 ]] ; then
290+
TFDELAYSECONDS=0
291+
fi
292+
293+
if [[ -n "$ALIEN_JDL_USETHROTTLING" ]] && [[ -z "$TIMEFRAME_RATE_LIMIT" ]] ; then
293294
export TIMEFRAME_RATE_LIMIT=1
294295
fi
295296

‎DATA/production/configurations/asyncReco/setenv_extra.sh‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,7 @@ fi
147147
# other settings
148148
echo RUN = $RUNNUMBER
149149
if [[ $RUNNUMBER -ge 521889 ]]; then
150-
export ARGS_EXTRA_PROCESS_o2_ctf_reader_workflow+=" --its-digits --mft-digits"
151-
export DISABLE_DIGIT_CLUSTER_INPUT="--digits-from-upstream"
150+
export ITSMFT_RECO_RERUN_CLUSTERIZER=1
152151
MAXBCDIFFTOMASKBIAS_ITS="ITSClustererParam.maxBCDiffToMaskBias=-10" # this explicitly disables ITS masking
153152
MAXBCDIFFTOSQUASHBIAS_ITS="ITSClustererParam.maxBCDiffToSquashBias=10" # this explicitly enables ITS squashing
154153
MAXBCDIFFTOMASKBIAS_MFT="MFTClustererParam.maxBCDiffToMaskBias=-10" # this explicitly disables MFT masking
@@ -761,6 +760,16 @@ if [[ $ADD_CALIB == "1" ]]; then
761760
if [[ $ALIEN_JDL_DOUPLOADSLOCALLY == 1 ]]; then
762761
export CCDB_POPULATOR_UPLOAD_PATH="file://$PWD"
763762
fi
763+
764+
# enable time gain calibration
765+
if [[ $ALIEN_JDL_DOTPCTIMEGAINCALIB == 1 ]]; then
766+
echo "Enabling TPC time gain calibration"
767+
export CALIB_TPC_TIMEGAIN=1
768+
export ARGS_EXTRA_PROCESS_o2_tpc_calibrator_dedx+=" --dump-histograms 1 --min-entries 1" # write full calibration objects for time gain without rejecting low statistics timeslots
769+
export ARGS_EXTRA_PROCESS_o2_tpc_miptrack_filter+=" --use-global-tracks"
770+
export SCALEEVENTS_TPC_TIMEGAIN=${SCALEEVENTS_TPC_TIMEGAIN:-1} # use all TFs
771+
export SCALETRACKS_TPC_TIMEGAIN=${SCALETRACKS_TPC_TIMEGAIN:--1} # use all tracks
772+
fi
764773
fi
765774

766775
# Enabling AOD

‎DATA/production/qc-async/mchmid-tracks.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"maxNumberCycles": "-1",
1212
"dataSource": {
1313
"type": "direct",
14-
"query": "trackMCH:MCH/TRACKS;trackMCHROF:MCH/TRACKROFS;trackMCHTRACKCLUSTERS:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/CLUSTERDIGITS;trackMID:MID/TRACKS;trackMIDROF:MID/TRACKROFS;trackMIDTRACKCLUSTERS:MID/TRACKCLUSTERS;trackClMIDROF:MID/TRCLUSROFS;matchMCHMID:GLO/MTC_MCHMID"
14+
"query": "trackMCH:MCH/TRACKS;trackMCHROF:MCH/TRACKROFS;trackMCHTRACKCLUSTERS:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/CLUSTERDIGITS;trackMID:MID/TRACKS/0;trackMIDROF:MID/TRACKROFS/0;trackMIDTRACKCLUSTERS:MID/TRACKCLUSTERS/0;trackClMIDROF:MID/TRCLUSROFS/0;matchMCHMID:GLO/MTC_MCHMID"
1515
},
1616
"movingWindows": [
1717
"WithCuts/TracksPerTF",

‎DATA/production/qc-async/mftmchmid-tracks.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"type": "direct",
1414
"_type": "dataSamplingPolicy",
1515
"name": "muon-tracks",
16-
"query": "trackMCH:MCH/TRACKS;trackMCHROF:MCH/TRACKROFS;trackMCHTRACKCLUSTERS:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/CLUSTERDIGITS;trackMFT:MFT/TRACKS;trackMFTROF:MFT/MFTTrackROF;trackMFTClIdx:MFT/TRACKCLSID;alpparMFT:MFT/ALPIDEPARAM/0?lifetime=condition&ccdb-path=MFT/Config/AlpideParam;fwdtracks:GLO/GLFWD;trackMID:MID/TRACKS;trackMIDROF:MID/TRACKROFS;trackMIDTRACKCLUSTERS:MID/TRACKCLUSTERS;trackClMIDROF:MID/TRCLUSROFS;matchMCHMID:GLO/MTC_MCHMID"
16+
"query": "trackMCH:MCH/TRACKS;trackMCHROF:MCH/TRACKROFS;trackMCHTRACKCLUSTERS:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/CLUSTERDIGITS;trackMFT:MFT/TRACKS;trackMFTROF:MFT/MFTTrackROF;trackMFTClIdx:MFT/TRACKCLSID;alpparMFT:MFT/ALPIDEPARAM/0?lifetime=condition&ccdb-path=MFT/Config/AlpideParam;fwdtracks:GLO/GLFWD;trackMID:MID/TRACKS/0;trackMIDROF:MID/TRACKROFS/0;trackMIDTRACKCLUSTERS:MID/TRACKCLUSTERS/0;trackClMIDROF:MID/TRCLUSROFS/0;matchMCHMID:GLO/MTC_MCHMID"
1717
},
1818
"movingWindows": [
1919
"WithCuts/TracksPerTF",
@@ -64,7 +64,7 @@
6464
"_type": "direct",
6565
"type": "dataSamplingPolicy",
6666
"name": "glo-mu-tracks",
67-
"query": "trackMCH:MCH/TRACKS;trackMCHROF:MCH/TRACKROFS;trackMCHTRACKCLUSTERS:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/CLUSTERDIGITS;trackMFT:MFT/TRACKS;trackMFTROF:MFT/MFTTrackROF;trackMFTClIdx:MFT/TRACKCLSID;alpparMFT:MFT/ALPIDEPARAM/0?lifetime=condition&ccdb-path=MFT/Config/AlpideParam;fwdtracks:GLO/GLFWD;trackMID:MID/TRACKS;trackMIDROF:MID/TRACKROFS;trackMIDTRACKCLUSTERS:MID/TRACKCLUSTERS;trackClMIDROF:MID/TRCLUSROFS;matchMCHMID:GLO/MTC_MCHMID"
67+
"query": "trackMCH:MCH/TRACKS;trackMCHROF:MCH/TRACKROFS;trackMCHTRACKCLUSTERS:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/CLUSTERDIGITS;trackMFT:MFT/TRACKS;trackMFTROF:MFT/MFTTrackROF;trackMFTClIdx:MFT/TRACKCLSID;alpparMFT:MFT/ALPIDEPARAM/0?lifetime=condition&ccdb-path=MFT/Config/AlpideParam;fwdtracks:GLO/GLFWD;trackMID:MID/TRACKS/0;trackMIDROF:MID/TRACKROFS/0;trackMIDTRACKCLUSTERS:MID/TRACKCLUSTERS/0;trackClMIDROF:MID/TRCLUSROFS/0;matchMCHMID:GLO/MTC_MCHMID"
6868
},
6969
"movingWindows": [
7070
"MCH-MID/WithCuts/TracksPerTF",
@@ -111,7 +111,7 @@
111111
"id": "muon-tracks",
112112
"active": "true",
113113
"machines": [],
114-
"query": "trackMCH:MCH/TRACKS;trackMCHROF:MCH/TRACKROFS;trackMCHTRACKCLUSTERS:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/CLUSTERDIGITS;trackMFT:MFT/TRACKS;trackMFTROF:MFT/MFTTrackROF;trackMFTClIdx:MFT/TRACKCLSID;alpparMFT:MFT/ALPIDEPARAM/0?lifetime=condition&ccdb-path=MFT/Config/AlpideParam;fwdtracks:GLO/GLFWD;trackMID:MID/TRACKS;trackMIDROF:MID/TRACKROFS;trackMIDTRACKCLUSTERS:MID/TRACKCLUSTERS;trackClMIDROF:MID/TRCLUSROFS;matchMCHMID:GLO/MTC_MCHMID",
114+
"query": "trackMCH:MCH/TRACKS;trackMCHROF:MCH/TRACKROFS;trackMCHTRACKCLUSTERS:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/CLUSTERDIGITS;trackMFT:MFT/TRACKS;trackMFTROF:MFT/MFTTrackROF;trackMFTClIdx:MFT/TRACKCLSID;alpparMFT:MFT/ALPIDEPARAM/0?lifetime=condition&ccdb-path=MFT/Config/AlpideParam;fwdtracks:GLO/GLFWD;trackMID:MID/TRACKS/0;trackMIDROF:MID/TRACKROFS/0;trackMIDTRACKCLUSTERS:MID/TRACKCLUSTERS/0;trackClMIDROF:MID/TRCLUSROFS/0;matchMCHMID:GLO/MTC_MCHMID",
115115
"samplingConditions": [
116116
{
117117
"condition": "random",
@@ -125,7 +125,7 @@
125125
"id": "glo-mu-tracks",
126126
"active": "true",
127127
"machines": [],
128-
"query": "trackMCH:MCH/TRACKS;trackMCHROF:MCH/TRACKROFS;trackMCHTRACKCLUSTERS:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/CLUSTERDIGITS;trackMFT:MFT/TRACKS;trackMFTROF:MFT/MFTTrackROF;trackMFTClIdx:MFT/TRACKCLSID;alpparMFT:MFT/ALPIDEPARAM/0?lifetime=condition&ccdb-path=MFT/Config/AlpideParam;fwdtracks:GLO/GLFWD;trackMID:MID/TRACKS;trackMIDROF:MID/TRACKROFS;trackMIDTRACKCLUSTERS:MID/TRACKCLUSTERS;trackClMIDROF:MID/TRCLUSROFS;matchMCHMID:GLO/MTC_MCHMID",
128+
"query": "trackMCH:MCH/TRACKS;trackMCHROF:MCH/TRACKROFS;trackMCHTRACKCLUSTERS:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/CLUSTERDIGITS;trackMFT:MFT/TRACKS;trackMFTROF:MFT/MFTTrackROF;trackMFTClIdx:MFT/TRACKCLSID;alpparMFT:MFT/ALPIDEPARAM/0?lifetime=condition&ccdb-path=MFT/Config/AlpideParam;fwdtracks:GLO/GLFWD;trackMID:MID/TRACKS/0;trackMIDROF:MID/TRACKROFS/0;trackMIDTRACKCLUSTERS:MID/TRACKCLUSTERS/0;trackClMIDROF:MID/TRCLUSROFS/0;matchMCHMID:GLO/MTC_MCHMID",
129129
"samplingConditions": [
130130
{
131131
"condition": "random",

‎DATA/production/qc-async/mid.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
],
3131
"dataSource": {
3232
"type": "direct",
33-
"query": "digits:MID/DATA;digits_rof:MID/DATAROF"
33+
"query": "digits:MID/DATA/0;digits_rof:MID/DATAROF/0"
3434
}
3535
},
3636
"MIDFilteredDigits": {
@@ -42,7 +42,7 @@
4242
"cycleDurationSeconds": "60",
4343
"dataSource": {
4444
"type": "direct",
45-
"query": "digits:MID/FDATA;digits_rof:MID/FDATAROF"
45+
"query": "digits:MID/FDATA/0;digits_rof:MID/FDATAROF/0"
4646
}
4747
},
4848
"MIDClusters": {
@@ -54,7 +54,7 @@
5454
"cycleDurationSeconds": "60",
5555
"dataSource": {
5656
"type": "direct",
57-
"query": "clusters:MID/TRACKCLUSTERS;clusterrofs:MID/TRCLUSROFS"
57+
"query": "clusters:MID/TRACKCLUSTERS/0;clusterrofs:MID/TRCLUSROFS/0"
5858
}
5959
},
6060
"MIDTracks": {
@@ -66,7 +66,7 @@
6666
"cycleDurationSeconds": "60",
6767
"dataSource": {
6868
"type": "direct",
69-
"query": "tracks:MID/TRACKS;trackrofs:MID/TRACKROFS"
69+
"query": "tracks:MID/TRACKS/0;trackrofs:MID/TRACKROFS/0"
7070
}
7171
}
7272
},

‎DATA/production/qc-sync/glo-mchmid-mtch-qcmn-epn.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"disableLastCycle": "true",
3434
"dataSource": {
3535
"type": "direct",
36-
"query": "trackMCH:MCH/TRACKS;trackMCHROF:MCH/TRACKROFS;trackMCHTRACKCLUSTERS:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/CLUSTERDIGITS;trackMID:MID/TRACKS;trackMIDROF:MID/TRACKROFS;trackMIDTRACKCLUSTERS:MID/TRACKCLUSTERS;trackClMIDROF:MID/TRCLUSROFS;matchMCHMID:GLO/MTC_MCHMID"
36+
"query": "trackMCH:MCH/TRACKS;trackMCHROF:MCH/TRACKROFS;trackMCHTRACKCLUSTERS:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/CLUSTERDIGITS;trackMID:MID/TRACKS/0;trackMIDROF:MID/TRACKROFS/0;trackMIDTRACKCLUSTERS:MID/TRACKCLUSTERS/0;trackClMIDROF:MID/TRCLUSROFS/0;matchMCHMID:GLO/MTC_MCHMID"
3737
},
3838
"taskParameters": {
3939
"maxTracksPerTF": "600",

‎DATA/production/qc-sync/glo-mftmchmid-mtch-qcmn-epn.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"disableLastCycle": "true",
3434
"dataSource": {
3535
"type": "direct",
36-
"query": "trackMCH:MCH/TRACKS;trackMCHROF:MCH/TRACKROFS;trackMCHTRACKCLUSTERS:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/CLUSTERDIGITS;trackMFT:MFT/TRACKS;trackMFTROF:MFT/MFTTrackROF;trackMFTClIdx:MFT/TRACKCLSID;alpparMFT:MFT/ALPIDEPARAM/0?lifetime=condition&ccdb-path=MFT/Config/AlpideParam;fwdtracks:GLO/GLFWD;trackMID:MID/TRACKS;trackMIDROF:MID/TRACKROFS;trackMIDTRACKCLUSTERS:MID/TRACKCLUSTERS;trackClMIDROF:MID/TRCLUSROFS;matchMCHMID:GLO/MTC_MCHMID"
36+
"query": "trackMCH:MCH/TRACKS;trackMCHROF:MCH/TRACKROFS;trackMCHTRACKCLUSTERS:MCH/TRACKCLUSTERS;mchtrackdigits:MCH/CLUSTERDIGITS;trackMFT:MFT/TRACKS;trackMFTROF:MFT/MFTTrackROF;trackMFTClIdx:MFT/TRACKCLSID;alpparMFT:MFT/ALPIDEPARAM/0?lifetime=condition&ccdb-path=MFT/Config/AlpideParam;fwdtracks:GLO/GLFWD;trackMID:MID/TRACKS/0;trackMIDROF:MID/TRACKROFS/0;trackMIDTRACKCLUSTERS:MID/TRACKCLUSTERS/0;trackClMIDROF:MID/TRCLUSROFS/0;matchMCHMID:GLO/MTC_MCHMID"
3737
},
3838
"taskParameters": {
3939
"maxTracksPerTF": "600",

‎DATA/production/qc-sync/mid-digits.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"id": "middigits",
5656
"active": "true",
5757
"machines": [],
58-
"query": "digits:MID/DATA;digits_rof:MID/DATAROF",
58+
"query": "digits:MID/DATA/0;digits_rof:MID/DATAROF/0",
5959
"samplingConditions": [
6060
{
6161
"condition": "random",

‎DATA/production/qc-sync/mid.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
"epn",
149149
"localhost"
150150
],
151-
"query": "tracks:MID/TRACKS;trackrofs:MID/TRACKROFS",
151+
"query": "tracks:MID/TRACKS/0;trackrofs:MID/TRACKROFS/0",
152152
"samplingConditions": [
153153
{
154154
"condition": "random",
@@ -165,7 +165,7 @@
165165
"epn",
166166
"localhost"
167167
],
168-
"query": "clusters:MID/TRACKCLUSTERS;clusterrofs:MID/TRCLUSROFS",
168+
"query": "clusters:MID/TRACKCLUSTERS/0;clusterrofs:MID/TRCLUSROFS/0",
169169
"samplingConditions": [
170170
{
171171
"condition": "random",
@@ -182,7 +182,7 @@
182182
"epn",
183183
"localhost"
184184
],
185-
"query": "digits:MID/DATA;digits_rof:MID/DATAROF",
185+
"query": "digits:MID/DATA/0;digits_rof:MID/DATAROF/0",
186186
"samplingConditions": [
187187
{
188188
"condition": "random",

‎DATA/testing/detectors/MID/mid-qcmn-epn-digits.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"id": "mid-digits",
5656
"active": "true",
5757
"machines": [],
58-
"query": "digits:MID/DATA;digits_rof:MID/DATAROF",
58+
"query": "digits:MID/DATA/0;digits_rof:MID/DATAROF/0",
5959
"samplingConditions": [
6060
{
6161
"condition": "random",

0 commit comments

Comments
 (0)