Skip to content

Commit 759c1a1

Browse files
romainschotterromainschotter
authored
Update DPL configurations related to analysis QC (#2149)
* Update existing O2Physics analysis configurations to latest standards * Remove global counters in multcentable and the use of NN in TPC PID
1 parent a53f4c0 commit 759c1a1

12 files changed

+1164
-77
lines changed

‎MC/config/analysis_testing/json/analyses_config.json‎

Lines changed: 42 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"expected_output": ["AnalysisResults.root"],
77
"valid_mc": true,
88
"valid_data": false,
9-
"tasks": ["o2-analysis-timestamp",
10-
"o2-analysis-track-propagation",
9+
"tasks": ["o2-analysis-event-selection-service",
10+
"o2-analysis-propagationservice",
1111
"o2-analysistutorial-mc-histograms"]
1212
},
1313
{
@@ -16,10 +16,9 @@
1616
"expected_output": ["AnalysisResults.root"],
1717
"valid_mc": true,
1818
"valid_data": true,
19-
"tasks": ["o2-analysis-timestamp",
20-
"o2-analysis-track-propagation",
19+
"tasks": ["o2-analysis-event-selection-service",
20+
"o2-analysis-propagationservice",
2121
"o2-analysis-trackselection",
22-
"o2-analysis-event-selection",
2322
"o2-analysis-qa-efficiency"]
2423
},
2524
{
@@ -28,10 +27,9 @@
2827
"expected_output": ["AnalysisResults.root"],
2928
"valid_mc": true,
3029
"valid_data": true,
31-
"tasks": ["o2-analysis-timestamp",
32-
"o2-analysis-track-propagation",
30+
"tasks": ["o2-analysis-event-selection-service",
31+
"o2-analysis-propagationservice",
3332
"o2-analysis-trackselection",
34-
"o2-analysis-event-selection",
3533
"o2-analysis-qa-event-track"]
3634
},
3735
{
@@ -40,18 +38,14 @@
4038
"expected_output": ["AnalysisResults.root"],
4139
"valid_mc": true,
4240
"valid_data": true,
43-
"tasks": ["o2-analysis-lf-lambdakzerobuilder",
44-
"o2-analysis-track-propagation",
45-
"o2-analysis-trackselection",
46-
"o2-analysis-pid-tof-base",
47-
"o2-analysis-pid-tof",
48-
"o2-analysis-pid-tof-full",
49-
"o2-analysis-pid-tpc-base",
50-
"o2-analysis-pid-tpc",
51-
"o2-analysis-event-selection",
52-
"o2-analysis-timestamp",
53-
"o2-analysis-multiplicity-table",
54-
"o2-analysis-qa-k0s-tracking-efficiency",
41+
"tasks": ["o2-analysis-trackselection",
42+
"o2-analysis-pid-tof-merge",
43+
"o2-analysis-lf-strangenesstofpid",
44+
"o2-analysis-pid-tpc-service",
45+
"o2-analysis-event-selection-service",
46+
"o2-analysis-multcenttable",
47+
"o2-analysis-ft0-corrected-table",
48+
"o2-analysis-propagationservice",
5549
"o2-analysis-perf-k0s-resolution"]
5650
},
5751
{
@@ -61,33 +55,28 @@
6155
"valid_mc": true,
6256
"valid_data": true,
6357
"tasks": ["o2-analysis-ft0-corrected-table",
64-
"o2-analysis-timestamp",
65-
"o2-analysis-track-propagation",
58+
"o2-analysis-event-selection-service",
59+
"o2-analysis-propagationservice",
6660
"o2-analysis-trackselection",
67-
"o2-analysis-event-selection",
68-
"o2-analysis-multiplicity-table",
69-
"o2-analysis-pid-tof-base",
70-
"o2-analysis-pid-tof",
71-
"o2-analysis-pid-tof-full",
61+
"o2-analysis-multcenttable",
62+
"o2-analysis-pid-tof-merge",
7263
"o2-analysis-pid-tof-qa",
7364
"o2-analysis-pid-tof-qa-evtime",
74-
"o2-analysis-pid-tof-beta",
7565
"o2-analysis-pid-tof-qa-beta",
7666
"o2-analysis-pid-tpc-qa",
77-
"o2-analysis-pid-tpc-base",
78-
"o2-analysis-pid-tpc"]
67+
"o2-analysis-pid-tpc-service"]
7968
},
8069
{
8170
"name": "PWGMMMFT",
8271
"enabled": true,
8372
"expected_output": ["AnalysisResults.root"],
8473
"valid_mc": true,
8574
"valid_data": true,
86-
"tasks": ["o2-analysis-timestamp",
87-
"o2-analysis-track-propagation",
75+
"tasks": ["o2-analysis-event-selection-service",
76+
"o2-analysis-propagationservice",
8877
"o2-analysis-trackselection",
89-
"o2-analysis-event-selection",
90-
"o2-analysis-multiplicity-table",
78+
"o2-analysis-multcenttable",
79+
"o2-analysis-fwdtrack-to-collision-associator",
9180
"o2-analysis-mm-track-propagation",
9281
"o2-analysis-mm-dndeta-mft"]
9382
},
@@ -97,9 +86,8 @@
9786
"expected_output": ["AnalysisResults.root"],
9887
"valid_mc": true,
9988
"valid_data": true,
100-
"tasks": ["o2-analysis-timestamp",
101-
"o2-analysis-track-propagation",
102-
"o2-analysis-event-selection",
89+
"tasks": ["o2-analysis-event-selection-service",
90+
"o2-analysis-propagationservice",
10391
"o2-analysis-event-selection-qa"]
10492
},
10593
{
@@ -108,11 +96,10 @@
10896
"expected_output": ["AnalysisResults.root"],
10997
"valid_mc": true,
11098
"valid_data": true,
111-
"tasks": ["o2-analysis-timestamp",
112-
"o2-analysis-track-propagation",
99+
"tasks": ["o2-analysis-event-selection-service",
100+
"o2-analysis-propagationservice",
113101
"o2-analysis-trackselection",
114-
"o2-analysis-event-selection",
115-
"o2-analysis-multiplicity-table",
102+
"o2-analysis-multcenttable",
116103
"o2-analysis-ft0-corrected-table",
117104
"o2-analysis-time-dependent-qa"]
118105
},
@@ -130,7 +117,7 @@
130117
"expected_output": ["AnalysisResults.root"],
131118
"valid_mc": true,
132119
"valid_data": false,
133-
"tasks": ["o2-analysis-timestamp",
120+
"tasks": ["o2-analysis-event-selection-service",
134121
"o2-analysis-mm-vertexing-fwd"]
135122
},
136123
{
@@ -139,10 +126,9 @@
139126
"expected_output": ["AnalysisResults.root"],
140127
"valid_mc": true,
141128
"valid_data": false,
142-
"tasks": ["o2-analysis-timestamp",
143-
"o2-analysis-track-propagation",
129+
"tasks": ["o2-analysis-event-selection-service",
130+
"o2-analysis-propagationservice",
144131
"o2-analysis-trackselection",
145-
"o2-analysis-event-selection",
146132
"o2-analysis-task-mc-simple-qc"]
147133
},
148134
{
@@ -156,12 +142,10 @@
156142
"o2-analysis-je-emcal-correction-task",
157143
"o2-analysis-je-emc-clustermonitor",
158144
"o2-analysis-je-emc-tmmonitor",
159-
"o2-analysis-timestamp",
160-
"o2-analysis-track-propagation",
145+
"o2-analysis-event-selection-service",
146+
"o2-analysis-propagationservice",
161147
"o2-analysis-trackselection",
162-
"o2-analysis-event-selection",
163-
"o2-analysis-pid-tpc",
164-
"o2-analysis-pid-tpc-base"
148+
"o2-analysis-pid-tpc-service"
165149
]
166150
},
167151
{
@@ -170,11 +154,10 @@
170154
"expected_output": ["AnalysisResults.root"],
171155
"valid_mc": true,
172156
"valid_data": true,
173-
"tasks": ["o2-analysis-timestamp",
174-
"o2-analysis-track-propagation",
157+
"tasks": ["o2-analysis-event-selection-service",
158+
"o2-analysis-propagationservice",
175159
"o2-analysis-trackselection",
176-
"o2-analysis-event-selection",
177-
"o2-analysis-multiplicity-table",
160+
"o2-analysis-multcenttable",
178161
"o2-analysis-ft0-corrected-table",
179162
"o2-analysis-ft0-qa"]
180163
},
@@ -191,15 +174,11 @@
191174
"o2-analysis-track-to-collision-associator",
192175
"o2-analysis-hf-pid-creator",
193176
"o2-analysis-trackselection",
194-
"o2-analysis-multiplicity-table",
195-
"o2-analysis-centrality-table",
196-
"o2-analysis-event-selection",
197-
"o2-analysis-track-propagation",
198-
"o2-analysis-timestamp",
199-
"o2-analysis-pid-tpc",
200-
"o2-analysis-pid-tpc-base",
201-
"o2-analysis-pid-tof-full",
202-
"o2-analysis-pid-tof-base",
177+
"o2-analysis-multcenttable",
178+
"o2-analysis-propagationservice",
179+
"o2-analysis-event-selection-service",
180+
"o2-analysis-pid-tpc-service",
181+
"o2-analysis-pid-tof-merge",
203182
"o2-analysis-ft0-corrected-table"]
204183
}
205184
]

‎MC/config/analysis_testing/json/dpl/o2-analysis-event-selection-service.json‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
{
2+
"event-selection-service": {
3+
"timestamp": {
4+
"verbose": "0",
5+
"fatalOnInvalidTimestamp": "0",
6+
"rct-path": "RCT/Info/RunInformation",
7+
"orbit-reset-path": "CTP/Calib/OrbitReset",
8+
"isRun2MC": "-1"
9+
},
10+
"bcselOpts": {
11+
"amIneeded": "-1",
12+
"triggerBcShift": "0",
13+
"ITSROFrameStartBorderMargin": "-1",
14+
"ITSROFrameEndBorderMargin": "-1",
15+
"TimeFrameStartBorderMargin": "-1",
16+
"TimeFrameEndBorderMargin": "-1",
17+
"checkRunDurationLimits": "0",
18+
"maxInactiveChipsPerLayer": {
19+
"values": [
20+
"8",
21+
"8",
22+
"8",
23+
"111",
24+
"111",
25+
"195",
26+
"195"
27+
]
28+
},
29+
"NumberOfOrbitsPerTF": "-1"
30+
},
31+
"evselOpts": {
32+
"amIneeded": "-1",
33+
"muonSelection": "0",
34+
"maxDiffZvtxFT0vsPV": "1",
35+
"isMC": "-1",
36+
"confSigmaBCforHighPtTracks": "4",
37+
"TimeIntervalForOccupancyCalculationMin": "-40",
38+
"TimeIntervalForOccupancyCalculationMax": "100",
39+
"TimeRangeVetoOnCollStandard": "10",
40+
"TimeRangeVetoOnCollNarrow": "2",
41+
"FT0CamplPerCollCutVetoOnCollInTimeRange": "8000",
42+
"FT0CamplPerCollCutVetoOnCollInROF": "5000",
43+
"EpsilonVzDiffVetoInROF": "0.300000012",
44+
"UseWeightsForOccupancyEstimator": "1",
45+
"NumberOfOrbitsPerTF": "-1",
46+
"TestAlternativeBcMatching": "0",
47+
"TestModifyTimeVetoOnNearbyColl": "0",
48+
"TestVetoOnTRDinPast": "0",
49+
"TestVzDiffNsigma": "3",
50+
"TestVzDiffMargin": "0.200000003"
51+
},
52+
"lumiOpts": {
53+
"amIneeded": "-1"
54+
},
55+
"ccdburl": "http://alice-ccdb.cern.ch"
56+
}
57+
}

‎MC/config/analysis_testing/json/dpl/o2-analysis-ft0-corrected-table.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"ft0-corrected-table": {
3+
"resoFT0A": "20",
4+
"resoFT0C": "20",
5+
"addHistograms": "0",
6+
"collisionSystem": "-2",
7+
"ccdb-url": "http://alice-ccdb.cern.ch",
8+
"ccdb-path-grplhcif": "GLO/Config/GRPLHCIF",
9+
"ccdb-timestamp": "-1",
10+
"processStandard": "1",
11+
"processWithBypassFT0timeInMC": "0"
12+
}
13+
}

‎MC/config/analysis_testing/json/dpl/o2-analysis-fwdtrack-to-collision-associator.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"fwd-track-to-collision-association": {
3+
"nSigmaForTimeCompat": "4",
4+
"timeMargin": "0",
5+
"includeUnassigned": "0",
6+
"fillTableOfCollIdsPerTrack": "1",
7+
"bcWindowForOneSigma": "115",
8+
"processFwdAssocWithTime": "0",
9+
"processFwdStandardAssoc": "0",
10+
"processMFTAssocWithTime": "1",
11+
"processMFTStandardAssoc": "0"
12+
}
13+
}

0 commit comments

Comments
 (0)