Skip to content

Commit 76bf6aa

Browse files
Benedikt Volkelchiarazampolli
authored andcommitted
Add track prop, add analysis for AOD check
1 parent f5907fb commit 76bf6aa

File tree

3 files changed

+40
-8
lines changed

3 files changed

+40
-8
lines changed

MC/analysis_testing/o2dpg_analysis_test_workflow.py

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -100,42 +100,47 @@
100100
analysis_MCHistograms = {"name": "MCHistograms",
101101
"expected_output": None,
102102
"valid_for": [ANALYSIS_VALID_MC],
103-
"cmd": "o2-analysistutorial-mc-histograms {CONFIG} {AOD}"}
103+
"cmd": "o2-analysis-track-propagation {CONFIG} | o2-analysistutorial-mc-histograms {CONFIG} {AOD}"}
104104
ANALYSES.append(analysis_MCHistograms)
105105
analysis_Efficiency = {"name": "Efficiency",
106106
"expected_output": ["AnalysisResults.root"],
107107
"valid_for": [ANALYSIS_VALID_MC],
108-
"cmd": "o2-analysis-timestamp {CONFIG} | o2-analysis-trackextension {CONFIG} | o2-analysis-trackselection {CONFIG} | o2-analysis-event-selection {CONFIG} | o2-analysis-qa-efficiency --eff-mc 1 --eff-mc-pos 1 --eff-mc-neg 1 {CONFIG} {AOD}"}
108+
"cmd": "o2-analysis-timestamp {CONFIG} | o2-analysis-track-propagation {CONFIG} | o2-analysis-trackextension {CONFIG} | o2-analysis-trackselection {CONFIG} | o2-analysis-event-selection {CONFIG} | o2-analysis-qa-efficiency --eff-mc 1 --eff-mc-pos 1 --eff-mc-neg 1 {CONFIG} {AOD}"}
109109
ANALYSES.append(analysis_Efficiency)
110110
analysis_EventTrackQA = {"name": "EventTrackQA",
111111
"expected_output": ["AnalysisResults.root"],
112112
"valid_for": [ANALYSIS_VALID_MC, ANALYSIS_VALID_DATA],
113-
"cmd": "o2-analysis-timestamp {CONFIG} | o2-analysis-trackextension {CONFIG} | o2-analysis-trackselection {CONFIG} | o2-analysis-event-selection {CONFIG} | o2-analysis-qa-event-track {CONFIG} {AOD}"}
113+
"cmd": "o2-analysis-timestamp {CONFIG} | o2-analysis-track-propagation {CONFIG} | o2-analysis-trackextension {CONFIG} | o2-analysis-trackselection {CONFIG} | o2-analysis-event-selection {CONFIG} | o2-analysis-qa-event-track {CONFIG} {AOD}"}
114114
ANALYSES.append(analysis_EventTrackQA)
115115
analysis_Validation = {"name": "Validation",
116116
"expected_output": ["AnalysisResults.root"],
117117
"valid_for": [ANALYSIS_VALID_MC, ANALYSIS_VALID_DATA],
118-
"cmd": "o2-analysis-validation {CONFIG} {AOD}"}
118+
"cmd": "o2-analysis-track-propagation {CONFIG} | o2-analysis-validation {CONFIG} {AOD}"}
119119
ANALYSES.append(analysis_Validation)
120120
analysis_PIDFull = {"name": "PIDFull",
121121
"expected_output": ["AnalysisResults.root"],
122122
"valid_for": [ANALYSIS_VALID_MC],
123-
"cmd": "o2-analysis-dq-table-maker-mc {CONFIG} --severity error --shm-segment-size 12000000000 --aod-writer-json aodWriterTempConfig.json | o2-analysis-timestamp {CONFIG} | o2-analysis-trackextension {CONFIG} | o2-analysis-trackselection {CONFIG} | o2-analysis-event-selection {CONFIG} | o2-analysis-multiplicity-table {CONFIG} | o2-analysis-pid-tof {CONFIG} | o2-analysis-pid-tof-full {CONFIG} | o2-analysis-pid-tof-beta {CONFIG} | o2-analysis-pid-tpc-full {CONFIG} {AOD}"}
123+
"cmd": "o2-analysis-dq-table-maker-mc {CONFIG} --severity error --shm-segment-size 12000000000 --aod-writer-json aodWriterTempConfig.json | o2-analysis-timestamp {CONFIG} | o2-analysis-track-propagation {CONFIG} | o2-analysis-trackextension {CONFIG} | o2-analysis-trackselection {CONFIG} | o2-analysis-event-selection {CONFIG} | o2-analysis-multiplicity-table {CONFIG} | o2-analysis-pid-tof {CONFIG} | o2-analysis-pid-tof-full {CONFIG} | o2-analysis-pid-tof-beta {CONFIG} | o2-analysis-pid-tpc-full {CONFIG} {AOD}"}
124124
ANALYSES.append(analysis_PIDFull)
125125
analysis_PWGMMMFT = {"name": "PWGMMMFT",
126126
"expected_output": ["AnalysisResults.root"],
127127
"valid_for": [ANALYSIS_VALID_MC, ANALYSIS_VALID_DATA],
128-
"cmd": "o2-analysis-timestamp {CONFIG} | o2-analysis-trackextension {CONFIG} | o2-analysis-trackselection {CONFIG} | o2-analysis-event-selection {CONFIG} | o2-analysis-multiplicity-table {CONFIG} | o2-analysis-mm-dndeta-mft {CONFIG} {AOD}"}
128+
"cmd": "o2-analysis-timestamp {CONFIG} | o2-analysis-track-propagation {CONFIG} | o2-analysis-trackextension {CONFIG} | o2-analysis-trackselection {CONFIG} | o2-analysis-event-selection {CONFIG} | o2-analysis-multiplicity-table {CONFIG} | o2-analysis-mm-dndeta-mft {CONFIG} {AOD}"}
129129
ANALYSES.append(analysis_PWGMMMFT)
130130
analysis_EventSelectionQA = {"name": "EventSelectionQA",
131131
"expected_output": ["AnalysisResults.root"],
132132
"valid_for": [ANALYSIS_VALID_MC, ANALYSIS_VALID_DATA],
133-
"cmd": "o2-analysis-timestamp {CONFIG} | o2-analysis-event-selection {CONFIG} | o2-analysis-event-selection-qa {CONFIG} {AOD}"}
133+
"cmd": "o2-analysis-timestamp {CONFIG} | o2-analysis-track-propagation {CONFIG} | o2-analysis-event-selection {CONFIG} | o2-analysis-event-selection-qa {CONFIG} {AOD}"}
134134
ANALYSES.append(analysis_EventSelectionQA)
135135
analysis_WeakDecayTutorial = {"name": "WeakDecayTutorial",
136136
"expected_output": None,
137137
"valid_for": [ANALYSIS_VALID_MC],
138-
"cmd": "o2-analysistutorial-weak-decay-iteration {CONFIG} {AOD}"}
138+
"cmd": "o2-analysis-track-propagation {CONFIG} | o2-analysistutorial-weak-decay-iteration {CONFIG} {AOD}"}
139+
ANALYSES.append(analysis_WeakDecayTutorial)
140+
analysis_WeakDecayTutorial = {"name": "CheckDataModelMC",
141+
"expected_output": ["AnalysisResults.root"],
142+
"valid_for": [ANALYSIS_VALID_MC],
143+
"cmd": "o2-analysis-track-propagation {CONFIG} | o2-analysis-check-data-model-mc {CONFIG} {AOD}"}
139144
ANALYSES.append(analysis_WeakDecayTutorial)
140145

141146
def make_merged_analysis(*analysis_names, accept_data_or_mc=ANALYSIS_VALID_MC):

MC/config/analysis_testing/json/analysis-testing-data.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,5 +206,14 @@
206206
"isRun3": "true",
207207
"processData": "true",
208208
"processMC": "false"
209+
},
210+
"track-propagation": {
211+
"ccdb-url": "http:\/\/alice-ccdb.cern.ch",
212+
"lutPath": "GLO\/Param\/MatLUT",
213+
"geoPath": "GLO\/Config\/GeometryAligned",
214+
"grpPath": "GLO\/GRP\/GRP",
215+
"mVtxPath": "GLO\/Calib\/MeanVertex",
216+
"processStandard": "false",
217+
"processCovariance": "true"
209218
}
210219
}

MC/config/analysis_testing/json/analysis-testing-mc.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,5 +225,23 @@
225225
"isRun3": "true",
226226
"processData": "false",
227227
"processMC": "true"
228+
},
229+
"track-propagation": {
230+
"ccdb-url": "http:\/\/alice-ccdb.cern.ch",
231+
"lutPath": "GLO\/Param\/MatLUT",
232+
"geoPath": "GLO\/Config\/GeometryAligned",
233+
"grpPath": "GLO\/GRP\/GRP",
234+
"mVtxPath": "GLO\/Calib\/MeanVertex",
235+
"processStandard": "false",
236+
"processCovariance": "true"
237+
},
238+
"McCollisions": {},
239+
"McParticles": {},
240+
"McTrackLabels": {},
241+
"check-mc-particles-indices-grouped": {
242+
"debugMode": "1"
243+
},
244+
"check-mc-particles-indices": {
245+
"debugMode": "0"
228246
}
229247
}

0 commit comments

Comments
 (0)