Skip to content

TPC: move disable-IDC-scalers to CorrectionMapsOptions #15754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shahor02 merged 2 commits into from
Sep 3, 2026
+21 −29
Merged

TPC: move disable-IDC-scalers to CorrectionMapsOptions #15754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a97a7c
TPC: move disable-IDC-scalers to CorrectionMapsOptions
matthias-kleiner Sep 3, 2026
cd73feb
TPC: derive enableIDCs from lumiType==TPCScaler in getTPCScalerSpec
matthias-kleiner Sep 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Detectors/Align/Workflow/src/barrel-alignment-workflow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
}

if (!configcontext.options().get<bool>("disable-root-input")) {
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt.lumiType == o2::tpc::LumiScaleType::TPCScaler, sclOpt.enableMShapeCorrection, sclOpt));
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt));
}

specs.emplace_back(o2::align::getBarrelAlignmentSpec(srcMP, src, dets, skipDetClusters, enableCosmic, postprocess, useMC));
Expand Down
2 changes: 1 addition & 1 deletion Detectors/GlobalTrackingWorkflow/src/cosmics-match-workflow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
GID::mask_t srcCl = src;
GID::mask_t dummy;
if (!configcontext.options().get<bool>("disable-root-input")) {
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt.lumiType == o2::tpc::LumiScaleType::TPCScaler, sclOpt.enableMShapeCorrection, sclOpt));
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt));
}
bool usePV = configcontext.options().get<bool>("use-pv-info");
specs.emplace_back(o2::globaltracking::getCosmicsMatchingSpec(src, usePV, useMC));
Expand Down
2 changes: 1 addition & 1 deletion Detectors/GlobalTrackingWorkflow/src/secondary-vertexing-workflow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
}
WorkflowSpec specs;
if (!configcontext.options().get<bool>("disable-root-input")) {
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt.lumiType == o2::tpc::LumiScaleType::TPCScaler, sclOpt.enableMShapeCorrection, sclOpt));
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt));
}
specs.emplace_back(o2::vertexing::getSecondaryVertexingSpec(src, enableCasc, enable3body, enableStrTr, enableCCDBParams, useMC, useGeom));

Expand Down
2 changes: 1 addition & 1 deletion Detectors/GlobalTrackingWorkflow/src/tof-matcher-workflow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
}
}
if (!configcontext.options().get<bool>("disable-root-input")) {
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt.lumiType == o2::tpc::LumiScaleType::TPCScaler, sclOpt.enableMShapeCorrection, sclOpt));
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt));
}
specs.emplace_back(o2::globaltracking::getTOFMatcherSpec(src, useMC, useFIT, refitTPCTOF, strict, extratolerancetrd, writeMatchable, sclOpt.requestCTPLumi, nLanes)); // doTPCrefit not yet supported (need to load TPC clusters?)

Expand Down
2 changes: 1 addition & 1 deletion Detectors/GlobalTrackingWorkflow/src/tpcits-match-workflow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ WorkflowSpec defineDataProcessing(o2::framework::ConfigContext const& configcont

o2::framework::WorkflowSpec specs;
if (!configcontext.options().get<bool>("disable-root-input")) {
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt.lumiType == o2::tpc::LumiScaleType::TPCScaler, sclOpt.enableMShapeCorrection, sclOpt));
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt));
}
specs.emplace_back(o2::globaltracking::getTPCITSMatchingSpec(srcL, useFT0, calib, !GID::includesSource(GID::TPC, src), useGeom, useMC, sclOpt.requestCTPLumi));

Expand Down
2 changes: 1 addition & 1 deletion Detectors/GlobalTrackingWorkflow/study/src/tpc-track-study-workflow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
o2::globaltracking::InputHelper::addInputSpecs(configcontext, specs, srcCls, srcTrc, srcTrc, useMC);
o2::globaltracking::InputHelper::addInputSpecsPVertex(configcontext, specs, useMC); // P-vertex is always needed
if (!configcontext.options().get<bool>("disable-root-input")) {
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt.lumiType == o2::tpc::LumiScaleType::TPCScaler, sclOpt.enableMShapeCorrection, sclOpt));
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt));
}
specs.emplace_back(o2::trackstudy::getTPCTrackStudySpec(srcTrc, srcCls, useMC));

Expand Down
2 changes: 1 addition & 1 deletion Detectors/GlobalTrackingWorkflow/study/src/trackMCStudy-workflow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
o2::globaltracking::InputHelper::addInputSpecsSVertex(configcontext, specs);
}
if (!configcontext.options().get<bool>("disable-root-input")) {
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt.lumiType == o2::tpc::LumiScaleType::TPCScaler, sclOpt.enableMShapeCorrection, sclOpt));
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt));
}

specs.emplace_back(o2::trackstudy::getTrackMCStudySpec(srcTrc, srcCls, checkSV));
Expand Down
2 changes: 1 addition & 1 deletion Detectors/GlobalTrackingWorkflow/study/src/tracking-study-workflow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
srcCls = srcCls | GID::getSourcesMask("CTP");
}
if (!configcontext.options().get<bool>("disable-root-input")) {
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt.lumiType == o2::tpc::LumiScaleType::TPCScaler, sclOpt.enableMShapeCorrection, sclOpt));
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt));
}
o2::globaltracking::InputHelper::addInputSpecs(configcontext, specs, srcCls, srcTrc, srcTrc, useMC);
o2::globaltracking::InputHelper::addInputSpecsPVertex(configcontext, specs, useMC); // P-vertex is always needed
Expand Down
2 changes: 1 addition & 1 deletion Detectors/TPC/workflow/include/TPCWorkflow/TPCScalerSpec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace o2
namespace tpc
{

o2::framework::DataProcessorSpec getTPCScalerSpec(bool enableIDCs, bool enableMShape, const o2::tpc::CorrectionMapsGloOpts& sclOpts);
o2::framework::DataProcessorSpec getTPCScalerSpec(const o2::tpc::CorrectionMapsGloOpts& sclOpts);

} // end namespace tpc
} // end namespace o2
Expand Down
4 changes: 2 additions & 2 deletions Detectors/TPC/workflow/src/RecoWorkflow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ framework::WorkflowSpec getWorkflow(CompletionPolicyData* policyData, std::vecto
laneConfiguration,
&hook},
propagateMC));
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpts.lumiType == o2::tpc::LumiScaleType::TPCScaler, sclOpts.enableMShapeCorrection, sclOpts));
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpts));
if (produceTracks && sclOpts.requestCTPLumi) { // need CTP digits (lumi) reader
specs.emplace_back(o2::ctp::getDigitsReaderSpec(false));
}
Expand All @@ -223,7 +223,7 @@ framework::WorkflowSpec getWorkflow(CompletionPolicyData* policyData, std::vecto
if (!getenv("DPL_DISABLE_TPC_TRIGGER_READER") || atoi(getenv("DPL_DISABLE_TPC_TRIGGER_READER")) != 1) {
specs.emplace_back(o2::tpc::getTPCTriggerReaderSpec());
}
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpts.lumiType == o2::tpc::LumiScaleType::TPCScaler, sclOpts.enableMShapeCorrection, sclOpts));
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpts));
if (sclOpts.requestCTPLumi) { // need CTP digits (lumi) reader
specs.emplace_back(o2::ctp::getDigitsReaderSpec(false));
}
Expand Down
4 changes: 3 additions & 1 deletion Detectors/TPC/workflow/src/TPCScalerSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,8 +329,10 @@ class TPCScalerSpec : public Task
}
};

o2::framework::DataProcessorSpec getTPCScalerSpec(bool enableIDCs, bool enableMShape, const o2::tpc::CorrectionMapsGloOpts& sclOpts)
o2::framework::DataProcessorSpec getTPCScalerSpec(const o2::tpc::CorrectionMapsGloOpts& sclOpts)
{
const bool enableIDCs = sclOpts.lumiType == o2::tpc::LumiScaleType::TPCScaler;
const bool enableMShape = sclOpts.enableMShapeCorrection;
std::vector<InputSpec> inputs;
if (enableIDCs) {
LOGP(info, "Publishing IDC scalers for space-charge distortion fluctuation correction");
Expand Down
2 changes: 1 addition & 1 deletion Detectors/TPC/workflow/src/tpc-calib-gainmap-tracks.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& config)
const auto disablePolynomialsCCDB = config.options().get<bool>("disablePolynomialsCCDB");
const auto sclOpt = o2::tpc::CorrectionMapsOptions::parseGlobalOptions(config.options());
WorkflowSpec workflow;
workflow.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt.lumiType == o2::tpc::LumiScaleType::TPCScaler, sclOpt.enableMShapeCorrection, sclOpt));
workflow.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt));
workflow.emplace_back(o2::tpc::getTPCCalibPadGainTracksSpec(publishAfterTFs, debug, useLastExtractedMapAsReference, polynomialsFile, disablePolynomialsCCDB));
return workflow;
}
6 changes: 1 addition & 5 deletions Detectors/TPC/workflow/src/tpc-refitter-workflow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
{"track-sources", VariantType::String, std::string{GID::ALL}, {"comma-separated list of track sources to use"}},
{"cluster-sources", VariantType::String, std::string{GID::ALL}, {"comma-separated list of cluster sources to use"}},
{"disable-root-input", VariantType::Bool, false, {"disable root-files input reader"}},
{"enable-M-shape-correction", VariantType::Bool, false, {"Enable M-shape distortion correction"}},
{"disable-IDC-scalers", VariantType::Bool, false, {"Disable TPC scalers for space-charge distortion fluctuation correction"}},
{"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings ..."}}};
o2::tpc::CorrectionMapsOptions::addGlobalOptions(options);
o2::raw::HBFUtilsInitializer::addConfigOption(options);
Expand Down Expand Up @@ -76,9 +74,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
srcCls = srcCls | GID::getSourcesMask("CTP");
}

const auto enableMShape = configcontext.options().get<bool>("enable-M-shape-correction");
const auto enableIDCs = !configcontext.options().get<bool>("disable-IDC-scalers");
specs.emplace_back(o2::tpc::getTPCScalerSpec(enableIDCs, enableMShape, sclOpt));
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt));

o2::globaltracking::InputHelper::addInputSpecs(configcontext, specs, srcCls, srcTrc, srcTrc, useMC);
o2::globaltracking::InputHelper::addInputSpecsPVertex(configcontext, specs, useMC); // P-vertex is always needed
Expand Down
8 changes: 2 additions & 6 deletions Detectors/TPC/workflow/src/tpc-scaler.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
{
// option allowing to set parameters
std::vector<ConfigParamSpec> options{
ConfigParamSpec{"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings"}},
{"enable-M-shape-correction", VariantType::Bool, false, {"Enable M-shape distortion correction"}},
{"disable-IDC-scalers", VariantType::Bool, false, {"Disable TPC scalers for space-charge distortion fluctuation correction"}}};
ConfigParamSpec{"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings"}}};
o2::tpc::CorrectionMapsOptions::addGlobalOptions(options);
std::swap(workflowOptions, options);
}
Expand All @@ -36,9 +34,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& config)
{
WorkflowSpec workflow;
o2::conf::ConfigurableParam::updateFromString(config.options().get<std::string>("configKeyValues"));
const auto enableMShape = config.options().get<bool>("enable-M-shape-correction");
const auto enableIDCs = !config.options().get<bool>("disable-IDC-scalers");
auto sclOpt = o2::tpc::CorrectionMapsOptions::parseGlobalOptions(config.options());
workflow.emplace_back(o2::tpc::getTPCScalerSpec(enableIDCs, enableMShape, sclOpt));
workflow.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt));
return workflow;
}
2 changes: 1 addition & 1 deletion Detectors/TRD/workflow/src/trd-tracking-workflow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
// processing devices
o2::framework::WorkflowSpec specs;
if (!configcontext.options().get<bool>("disable-root-input")) {
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt.lumiType == o2::tpc::LumiScaleType::TPCScaler, sclOpt.enableMShapeCorrection, sclOpt));
specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt));
}
specs.emplace_back(o2::trd::getTRDGlobalTrackingSpec(useMC, srcTRD, trigRecFilterActive, strict, pid, policy, sclOpt.requestCTPLumi));
if (vdexb || gain) {
Expand Down
6 changes: 2 additions & 4 deletions prodtests/full-system-test/dpl-workflow.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,20 +372,18 @@ GPU_CONFIG_SELF="--severity $SEVERITY_TPC"

parse_TPC_CORR_SCALING()
{
local IGNOREIDC=1
local CTPLUMY_DISABLED=0
while [[ $# -gt 0 ]]; do
case "$1" in
--lumi-type=*) TPC_CORR_OPT+=" --lumi-type ${1#*=}"; [[ ${1#*=} == "2" ]] && { IGNOREIDC=0; }; shift 1;;
--lumi-type) TPC_CORR_OPT+=" --lumi-type ${2}"; [[ ${2} == "2" ]] && { IGNOREIDC=0; }; shift 2;;
--lumi-type=*) TPC_CORR_OPT+=" --lumi-type ${1#*=}"; shift 1;;
--lumi-type) TPC_CORR_OPT+=" --lumi-type ${2}"; shift 2;;
--enable-M-shape-correction) TPC_CORR_OPT+=" --enable-M-shape-correction"; shift 1;;
--corrmap-lumi-mode=*) TPC_CORR_OPT+=" --corrmap-lumi-mode ${1#*=}"; shift 1;;
--corrmap-lumi-mode) TPC_CORR_OPT+=" --corrmap-lumi-mode ${2}"; shift 2;;
--disable-ctp-lumi-request) TPC_CORR_OPT+=" --disable-ctp-lumi-request"; CTPLUMY_DISABLED=1; shift 1;;
*) TPC_CORR_KEY+="$1;"; shift 1;;
esac
done
[[ $IGNOREIDC == 1 ]] && TPC_SCALERS_CONF+=" --disable-IDC-scalers"
! has_detector CTP && [[ ${CTPLUMY_DISABLED:-} != 1 ]] && TPC_CORR_OPT+=" --disable-ctp-lumi-request"
TPC_SCALERS_CONF+=" ${TPC_CORR_OPT}"
}
Expand Down
Loading