Skip to content

Commit 5af7310

Browse files
njacaziosawenzel
authored andcommitted
Sync PIDQA in analysis
- Remove DQ producer from PID workflow
1 parent ddc539d commit 5af7310

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

MC/analysis_testing/o2dpg_analysis_test_workflow.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@
119119
ANALYSES.append(analysis_Validation)
120120
analysis_PIDFull = {"name": "PIDFull",
121121
"expected_output": ["AnalysisResults.root"],
122-
"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-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-base {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}"}
122+
"valid_for": [ANALYSIS_VALID_MC, ANALYSIS_VALID_DATA],
123+
"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-pid-tof-base {CONFIG} | o2-analysis-pid-tof {CONFIG} --add-qa 1 | o2-analysis-pid-tof-full {CONFIG} --add-qa 1 | o2-analysis-pid-tof-beta {CONFIG} --add-qa 1 | o2-analysis-pid-tpc-full {CONFIG} --add-qa 1 {AOD}"}
124124
ANALYSES.append(analysis_PIDFull)
125125
analysis_PWGMMMFT = {"name": "PWGMMMFT",
126126
"expected_output": ["AnalysisResults.root"],
@@ -270,6 +270,8 @@ def add_analysis_tasks(workflow, input_aod="./AO2D.root", output_dir="./Analysis
270270
if specified, list of other tasks which need to be run before
271271
"""
272272
input_aod = abspath(input_aod)
273+
if input_aod.endswith(".txt") and not input_aod.startswith("@"):
274+
input_aod = f"@{input_aod}"
273275
data_or_mc = ANALYSIS_VALID_MC if is_mc else ANALYSIS_VALID_DATA
274276
configuration = ANALYSIS_CONFIGS[data_or_mc] if config is None else config
275277
for ana in ANALYSES:

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,6 @@
131131
"processRun2": "false",
132132
"processRun3": "true"
133133
},
134-
"track-extension": {
135-
"processRun2": "false",
136-
"processRun3": "true"
137-
},
138134
"multiplicity-table": {
139135
"processRun2": "false",
140136
"processRun3": "true"

0 commit comments

Comments
 (0)