Skip to content

Commit 3801e2c

Browse files
committed
Add/fix staggering options to all workflows reading ITS,MFT clusters
To pass the sim-challenge test. W/o this option even <workflow> -h leads to a crash. Strictly speaking, one could use in the DPLAlpideParamInitializer::isITSStaggeringEnabled and DPLAlpideParamInitializer::isMFTStaggeringEnabled a test ic.options().hasOption(stagITSOpt) and ic.options().hasOption(stagMFTOpt) before testing the option itself. But better to have an explicit detection of missing staggering option.
1 parent d3aa1e2 commit 3801e2c

File tree

17 files changed

+35
-5
lines changed

17 files changed

+35
-5
lines changed

Detectors/AOD/src/aod-producer-workflow.cxx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "DetectorsRaw/HBFUtilsInitializer.h"
1919
#include "Framework/CallbacksPolicy.h"
2020
#include "DetectorsBase/DPLWorkflowUtils.h"
21+
#include "DataFormatsITSMFT/DPLAlpideParamInitializer.h"
2122

2223
using namespace o2::framework;
2324
using GID = o2::dataformats::GlobalTrackID;
@@ -43,6 +44,7 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
4344
{"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings ..."}},
4445
{"combine-source-devices", o2::framework::VariantType::Bool, false, {"merge DPL source devices"}},
4546
{"ctpconfig-run-independent", o2::framework::VariantType::Bool, false, {"Use CTP config w/o runNumber tag"}}};
47+
o2::itsmft::DPLAlpideParamInitializer::addConfigOption(options);
4648
o2::raw::HBFUtilsInitializer::addConfigOption(options);
4749
std::swap(workflowOptions, options);
4850
}

Detectors/Align/Workflow/src/barrel-alignment-workflow.cxx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "ReconstructionDataFormats/GlobalTrackID.h"
2828
#include "DetectorsCommonDataFormats/DetID.h"
2929
#include "GlobalTrackingWorkflowReaders/TrackTPCITSReaderSpec.h"
30+
#include "DataFormatsITSMFT/DPLAlpideParamInitializer.h"
3031

3132
#include "Algorithm/RangeTokenizer.h"
3233
#include "DetectorsRaw/HBFUtilsInitializer.h"
@@ -59,6 +60,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
5960
{"enable-cosmic", VariantType::Bool, false, {"enable cosmic tracks)"}},
6061
{"postprocessing", VariantType::Int, 0, {"postprocessing bits: 1 - extract alignment objects, 2 - check constraints, 4 - print mpParams/Constraints, 8 - relabel pede results"}},
6162
{"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings ..."}}};
63+
o2::itsmft::DPLAlpideParamInitializer::addITSConfigOption(options);
6264
o2::tpc::CorrectionMapsLoader::addGlobalOptions(options);
6365
o2::raw::HBFUtilsInitializer::addConfigOption(options);
6466
std::swap(workflowOptions, options);

Detectors/Filtering/src/filtering-workflow.cxx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "DetectorsCommonDataFormats/DetID.h"
1818
#include "DetectorsRaw/HBFUtilsInitializer.h"
1919
#include "Framework/CallbacksPolicy.h"
20+
#include "DataFormatsITSMFT/DPLAlpideParamInitializer.h"
2021

2122
using namespace o2::framework;
2223
using GID = o2::dataformats::GlobalTrackID;
@@ -36,6 +37,7 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
3637
{"disable-secondary-vertices", o2::framework::VariantType::Bool, false, {"disable filling secondary vertices"}},
3738
{"data-sources", VariantType::String, std::string{GID::ALL}, {"comma-separated list of sources to use"}},
3839
{"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings ..."}}};
40+
o2::itsmft::DPLAlpideParamInitializer::addConfigOption(options);
3941
o2::raw::HBFUtilsInitializer::addConfigOption(options);
4042
std::swap(workflowOptions, options);
4143
}

Detectors/GlobalTrackingWorkflow/src/cosmics-match-workflow.cxx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include "Framework/CallbacksPolicy.h"
3333
#include "GlobalTrackingWorkflowHelpers/InputHelper.h"
3434
#include "TPCCalibration/CorrectionMapsLoader.h"
35+
#include "DataFormatsITSMFT/DPLAlpideParamInitializer.h"
3536

3637
using namespace o2::framework;
3738
using DetID = o2::detectors::DetID;
@@ -52,6 +53,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
5253
{"disable-root-output", o2::framework::VariantType::Bool, false, {"disable root-files output writer"}},
5354
{"track-sources", VariantType::String, std::string{GID::ALL}, {"comma-separated list of sources to use"}},
5455
{"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings ..."}}};
56+
o2::itsmft::DPLAlpideParamInitializer::addITSConfigOption(options);
5557
o2::tpc::CorrectionMapsLoader::addGlobalOptions(options);
5658
o2::raw::HBFUtilsInitializer::addConfigOption(options);
5759
std::swap(workflowOptions, options);

Detectors/GlobalTrackingWorkflow/src/globalfwd-matcher-workflow.cxx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "GlobalTrackingWorkflow/MatchedMFTMCHWriterSpec.h"
2222
#include "GlobalTrackingWorkflowHelpers/InputHelper.h"
2323
#include "GlobalTracking/MatchGlobalFwdParam.h"
24+
#include "DataFormatsITSMFT/DPLAlpideParamInitializer.h"
2425

2526
using namespace o2::framework;
2627
using GID = o2::dataformats::GlobalTrackID;
@@ -46,6 +47,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
4647
{"disable-root-output", o2::framework::VariantType::Bool, false, {"do not write output root files"}},
4748
{"enable-match-output", o2::framework::VariantType::Bool, false, {"stores mftmch matching info on mftmchmatches.root"}},
4849
{"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings ..."}}};
50+
o2::itsmft::DPLAlpideParamInitializer::addMFTConfigOption(options);
4951
o2::raw::HBFUtilsInitializer::addConfigOption(options);
5052
std::swap(workflowOptions, options);
5153
}

Detectors/GlobalTrackingWorkflow/src/secondary-vertexing-workflow.cxx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "Framework/CompletionPolicyHelpers.h"
3131
#include "DetectorsBase/DPLWorkflowUtils.h"
3232
#include "TPCCalibration/CorrectionMapsLoader.h"
33+
#include "DataFormatsITSMFT/DPLAlpideParamInitializer.h"
3334

3435
using namespace o2::framework;
3536
using GID = o2::dataformats::GlobalTrackID;
@@ -62,6 +63,7 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
6263
{"use-full-geometry", o2::framework::VariantType::Bool, false, {"use full geometry instead of the light-weight ITS part"}},
6364
{"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings ..."}},
6465
{"combine-source-devices", o2::framework::VariantType::Bool, false, {"merge DPL source devices"}}};
66+
o2::itsmft::DPLAlpideParamInitializer::addITSConfigOption(options);
6567
o2::tpc::CorrectionMapsLoader::addGlobalOptions(options);
6668
o2::raw::HBFUtilsInitializer::addConfigOption(options);
6769
std::swap(workflowOptions, options);

Detectors/GlobalTrackingWorkflow/src/strangeness-tracking-workflow.cxx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "GlobalTrackingWorkflowReaders/TrackTPCITSReaderSpec.h"
2222
#include "GlobalTrackingWorkflowReaders/PrimaryVertexReaderSpec.h"
2323
#include "GlobalTrackingWorkflowHelpers/InputHelper.h"
24+
#include "DataFormatsITSMFT/DPLAlpideParamInitializer.h"
2425

2526
#include "DetectorsRaw/HBFUtilsInitializer.h"
2627
#include "Framework/CallbacksPolicy.h"
@@ -46,6 +47,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
4647
{"disable-mc", o2::framework::VariantType::Bool, false, {"disable MC"}},
4748
{"use-full-geometry", o2::framework::VariantType::Bool, false, {"use full geometry instead of the light-weight ITS part"}},
4849
{"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings"}}};
50+
o2::itsmft::DPLAlpideParamInitializer::addITSConfigOption(options);
4951
o2::raw::HBFUtilsInitializer::addConfigOption(options);
5052
std::swap(workflowOptions, options);
5153
}

Detectors/GlobalTrackingWorkflow/study/src/check-resid-workflow.cxx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "DetectorsRaw/HBFUtilsInitializer.h"
2323
#include "TPCCalibration/CorrectionMapsLoader.h"
2424
#include "TPCWorkflow/TPCScalerSpec.h"
25+
#include "DataFormatsITSMFT/DPLAlpideParamInitializer.h"
2526

2627
using namespace o2::framework;
2728
using GID = o2::dataformats::GlobalTrackID;
@@ -44,6 +45,7 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
4445
{"disable-root-input", VariantType::Bool, false, {"disable root-files input reader"}},
4546
{"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings ..."}}};
4647
// o2::tpc::CorrectionMapsLoader::addGlobalOptions(options);
48+
o2::itsmft::DPLAlpideParamInitializer::addITSConfigOption(options);
4749
o2::raw::HBFUtilsInitializer::addConfigOption(options);
4850
std::swap(workflowOptions, options);
4951
}

Detectors/GlobalTrackingWorkflow/study/src/its-offset-study-workflow.cxx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "DetectorsBase/DPLWorkflowUtils.h"
2121
#include "GlobalTrackingWorkflowHelpers/InputHelper.h"
2222
#include "DetectorsRaw/HBFUtilsInitializer.h"
23+
#include "DataFormatsITSMFT/DPLAlpideParamInitializer.h"
2324

2425
using namespace o2::framework;
2526
using GID = o2::dataformats::GlobalTrackID;
@@ -39,6 +40,7 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
3940
{"track-sources", VariantType::String, std::string{"ITS,ITS-TPC-TRD-TOF,ITS-TPC-TOF,ITS-TPC,ITS-TPC-TRD"}, {"comma-separated list of track sources to use"}},
4041
{"disable-root-input", VariantType::Bool, false, {"disable root-files input reader"}},
4142
{"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings ..."}}};
43+
o2::itsmft::DPLAlpideParamInitializer::addITSConfigOption(options);
4244
o2::raw::HBFUtilsInitializer::addConfigOption(options, "o2_tfidinfo.root");
4345
std::swap(workflowOptions, options);
4446
}

Detectors/GlobalTrackingWorkflow/study/src/trackMCStudy-workflow.cxx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "TPCCalibration/CorrectionMapsLoader.h"
2323
#include "TPCWorkflow/TPCScalerSpec.h"
2424
#include "DetectorsRaw/HBFUtilsInitializer.h"
25+
#include "DataFormatsITSMFT/DPLAlpideParamInitializer.h"
2526

2627
using namespace o2::framework;
2728
using GID = o2::dataformats::GlobalTrackID;
@@ -44,6 +45,7 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
4445
{"ignore-sv-check", VariantType::Bool, false, {"disable check for SV combinatorics"}},
4546
{"disable-mc", o2::framework::VariantType::Bool, false, {"disable MC propagation, never use it"}},
4647
{"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings ..."}}};
48+
o2::itsmft::DPLAlpideParamInitializer::addITSConfigOption(options);
4749
o2::tpc::CorrectionMapsLoader::addGlobalOptions(options);
4850
o2::raw::HBFUtilsInitializer::addConfigOption(options);
4951
std::swap(workflowOptions, options);

0 commit comments

Comments
 (0)