Skip to content

Commit 8a21e94

Browse files
chiarazampollichiarazampolli
authored
Do not get B field from external file anymore, but from CCDB - O2DPG (#977)
* Do not get B field from external file anymore, but from CCDB * Also for TOF * Including ITS and MFT * For MC too * more MFT
1 parent 6beccf2 commit 8a21e94

27 files changed

Lines changed: 282 additions & 73 deletions

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -115,18 +115,6 @@ echo processing run $RUNNUMBER, from period $PERIOD with $BEAMTYPE collisions an
115115
export timeUsed=0
116116

117117
###if [[ $MODE == "remote" ]]; then
118-
# common archive
119-
if [[ ! -f commonInput.tgz ]]; then
120-
echo "No commonInput.tgz found exiting"
121-
exit 2
122-
fi
123-
tar -xzvf commonInput.tgz
124-
if [[ -f o2sim_grp.root ]]; then rm o2sim_grp.root; fi
125-
SELECTSETTINGSSCRIPT="$O2DPG_ROOT/DATA/production/configurations/$ALIEN_JDL_LPMANCHORYEAR/$O2DPGPATH/$PASS/selectSettings.sh"
126-
if [[ -f "selectSettings.sh" ]]; then
127-
SELECTSETTINGSSCRIPT="selectSettings.sh"
128-
fi
129-
source $SELECTSETTINGSSCRIPT || { echo "$SELECTSETTINGSSCRIPT failed" && exit 4; }
130118
# run specific archive
131119
if [[ ! -f runInput_$RUNNUMBER.tgz ]]; then
132120
echo "No runInput_$RUNNUMBER.tgz, let's hope we don't need it"

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,18 @@
4242
"nThreads": "1",
4343
"nBCbins" : "103",
4444
"dicttimestamp" : "0",
45-
"geomPath" : "o2sim_geometry-aligned.root",
4645
"publishDetailedSummary": "0",
4746
"publishSummary1D": "0"
47+
},
48+
"grpGeomRequest" : {
49+
"geomRequest": "Aligned",
50+
"askGRPECS": "false",
51+
"askGRPLHCIF": "false",
52+
"askGRPMagField": "false",
53+
"askMatLUT": "false",
54+
"askTime": "false",
55+
"askOnceAllButField": "false",
56+
"needPropagatorD": "false"
4857
}
4958
},
5059
"ITSTracks": {

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,17 @@
4848
"etaCut" : "1.4f",
4949
"minNTPCClustersCut" : "60",
5050
"minDCACut" : "100.f",
51-
"minDCACutY" : "10.f",
52-
"grpFileName" : "o2sim_grp.root",
53-
"geomFileName" : "o2sim_geometry-aligned.root"
51+
"minDCACutY" : "10.f"
52+
},
53+
"grpGeomRequest" : {
54+
"geomRequest": "Aligned",
55+
"askGRPECS": "false",
56+
"askGRPLHCIF": "false",
57+
"askGRPMagField": "true",
58+
"askMatLUT": "false",
59+
"askTime": "false",
60+
"askOnceAllButField": "false",
61+
"needPropagatorD": "false"
5462
},
5563
"saveObjectsToFile" : "ITSTPCmatched.root",
5664
"" : "For debugging, path to the file where to save. If empty or missing it won't save."

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,17 @@
4343
"etaCut" : "0.8f",
4444
"minNTPCClustersCut" : "60",
4545
"minDCACut" : "100.f",
46-
"minDCACutY" : "10.f",
47-
"grpFileName" : "o2sim_grp.root",
48-
"geomFileName" : "o2sim_geometry-aligned.root"
46+
"minDCACutY" : "10.f"
47+
},
48+
"grpGeomRequest" : {
49+
"geomRequest": "Aligned",
50+
"askGRPECS": "false",
51+
"askGRPLHCIF": "false",
52+
"askGRPMagField": "true",
53+
"askMatLUT": "false",
54+
"askTime": "false",
55+
"askOnceAllButField": "false",
56+
"needPropagatorD": "false"
4957
},
5058
"saveObjectsToFile" : "TOFmatchedITSTPCTOF_TPCTOF.root",
5159
"" : "For debugging, path to the file where to save. If empty or missing it won't save."

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,17 @@
4343
"etaCut" : "0.8f",
4444
"minNTPCClustersCut" : "60",
4545
"minDCACut" : "100.f",
46-
"minDCACutY" : "10.f",
47-
"grpFileName" : "o2sim_grp.root",
48-
"geomFileName" : "o2sim_geometry-aligned.root"
46+
"minDCACutY" : "10.f"
47+
},
48+
"grpGeomRequest" : {
49+
"geomRequest": "Aligned",
50+
"askGRPECS": "false",
51+
"askGRPLHCIF": "false",
52+
"askGRPMagField": "true",
53+
"askMatLUT": "false",
54+
"askTime": "false",
55+
"askOnceAllButField": "false",
56+
"needPropagatorD": "false"
4957
},
5058
"saveObjectsToFile" : "TOFmatchedITSTPCTOF_TPCTOF.root",
5159
"" : "For debugging, path to the file where to save. If empty or missing it won't save."

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,17 @@
3939
"maxClusterROFSize" : "50000",
4040
"maxDuration" : "60000",
4141
"timeBinSize" : "0.1",
42-
"ROFLengthInBC" : "594",
43-
"geomFileName" : "o2sim_geometry-aligned.root"
42+
"ROFLengthInBC" : "594"
43+
},
44+
"grpGeomRequest" : {
45+
"geomRequest": "Aligned",
46+
"askGRPECS": "false",
47+
"askGRPLHCIF": "false",
48+
"askGRPMagField": "true",
49+
"askMatLUT": "false",
50+
"askTime": "false",
51+
"askOnceAllButField": "false",
52+
"needPropagatorD": "false"
4453
}
4554
},
4655
"MFTTracks": {

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,17 @@
5151
"minNTPCClustersCut": "60",
5252
"useFT0": "true",
5353
"minDCACut": "100.f",
54-
"minDCACutY": "10.f",
55-
"grpFileName": "o2sim_grp.root",
56-
"geomFileName": "o2sim_geometry-aligned.root"
54+
"minDCACutY": "10.f"
55+
},
56+
"grpGeomRequest" : {
57+
"geomRequest": "Aligned",
58+
"askGRPECS": "false",
59+
"askGRPLHCIF": "false",
60+
"askGRPMagField": "true",
61+
"askMatLUT": "false",
62+
"askTime": "false",
63+
"askOnceAllButField": "false",
64+
"needPropagatorD": "false"
5765
},
5866
"": "For debugging, path to the file where to save. If empty or missing it won't save."
5967
}

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,17 @@
5151
"minNTPCClustersCut": "60",
5252
"useFT0": "true",
5353
"minDCACut": "100.f",
54-
"minDCACutY": "10.f",
55-
"grpFileName": "o2sim_grp.root",
56-
"geomFileName": "o2sim_geometry-aligned.root"
54+
"minDCACutY": "10.f"
55+
},
56+
"grpGeomRequest" : {
57+
"geomRequest": "Aligned",
58+
"askGRPECS": "false",
59+
"askGRPLHCIF": "false",
60+
"askGRPMagField": "true",
61+
"askMatLUT": "false",
62+
"askTime": "false",
63+
"askOnceAllButField": "false",
64+
"needPropagatorD": "false"
5765
},
5866
"": "For debugging, path to the file where to save. If empty or missing it won't save."
5967
}

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,17 @@
5050
"etaCut": "0.8f",
5151
"minNTPCClustersCut": "60",
5252
"minDCACut": "100.f",
53-
"minDCACutY": "10.f",
54-
"grpFileName": "o2sim_grp.root",
55-
"geomFileName": "o2sim_geometry-aligned.root"
53+
"minDCACutY": "10.f"
54+
},
55+
"grpGeomRequest" : {
56+
"geomRequest": "Aligned",
57+
"askGRPECS": "false",
58+
"askGRPLHCIF": "false",
59+
"askGRPMagField": "true",
60+
"askMatLUT": "false",
61+
"askTime": "false",
62+
"askOnceAllButField": "false",
63+
"needPropagatorD": "false"
5664
},
5765
"": "For debugging, path to the file where to save. If empty or missing it won't save."
5866
}

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,16 @@
4343
"NbinsMultiplicity": "15000",
4444
"applyCalib": "True",
4545
"NoiseClassSelection": "1"
46+
},
47+
"grpGeomRequest" : {
48+
"geomRequest": "Aligned",
49+
"askGRPECS": "false",
50+
"askGRPLHCIF": "false",
51+
"askGRPMagField": "false",
52+
"askMatLUT": "false",
53+
"askTime": "false",
54+
"askOnceAllButField": "false",
55+
"needPropagatorD": "false"
4656
}
4757
}
4858
},

0 commit comments

Comments
 (0)