TPC: move disable-IDC-scalers to CorrectionMapsOptions

Author: matthias-kleiner

Detectors/TPC/calibration/src/CorrectionMapsOptions.cxx

@@ -34,6 +34,7 @@ CorrectionMapsGloOpts CorrectionMapsOptions::parseGlobalOptions(const o2::framew
 
   tpcopt.enableMShapeCorrection = opts.get<bool>("enable-M-shape-correction");
   tpcopt.enableSecEdgeFlucCorrection = !opts.get<bool>("disable-sec-edge-fluc-correction");
+  tpcopt.enableIDCScalers = !opts.get<bool>("disable-IDC-scalers");
   tpcopt.requestCTPLumi = !opts.get<bool>("disable-ctp-lumi-request");
   tpcopt.checkCTPIDCconsistency = !opts.get<bool>("disable-lumi-type-consistency-check");
   if (!tpcopt.requestCTPLumi && tpcopt.lumiType == LumiScaleType::CTPLumi) {
@@ -51,6 +52,7 @@ void CorrectionMapsOptions::addGlobalOptions(std::vector<ConfigParamSpec>& optio
   addOption(options, ConfigParamSpec{"disable-ctp-lumi-request", o2::framework::VariantType::Bool, false, {"do not request CTP lumi (regardless what is used for corrections)"}});
   addOption(options, ConfigParamSpec{"disable-lumi-type-consistency-check", o2::framework::VariantType::Bool, false, {"disable check of selected CTP or IDC scaling source being consistent with the map"}});
   addOption(options, ConfigParamSpec{"disable-sec-edge-fluc-correction", o2::framework::VariantType::Bool, false, {"Disable sector edge fluctuation correction"}});
+  addOption(options, ConfigParamSpec{"disable-IDC-scalers", o2::framework::VariantType::Bool, false, {"Disable TPC scalers for space-charge distortion fluctuation correction"}});
 }
 
 void CorrectionMapsOptions::addOption(std::vector<ConfigParamSpec>& options, ConfigParamSpec&& osp)

Detectors/TPC/workflow/src/tpc-refitter-workflow.cxx

@@ -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);
@@ -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.enableIDCScalers, sclOpt.enableMShapeCorrection, sclOpt));
 
   o2::globaltracking::InputHelper::addInputSpecs(configcontext, specs, srcCls, srcTrc, srcTrc, useMC);
   o2::globaltracking::InputHelper::addInputSpecsPVertex(configcontext, specs, useMC); // P-vertex is always needed

Detectors/TPC/workflow/src/tpc-scaler.cxx

@@ -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);
 }
@@ -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.enableIDCScalers, sclOpt.enableMShapeCorrection, sclOpt));
   return workflow;
 }

GPU/TPCFastTransformation/CorrectionMapsTypes.h

@@ -43,6 +43,7 @@ struct CorrectionMapsGloOpts {
   bool requestCTPLumi = true;         ///< request CTP Lumi regardless of what is used for corrections scaling
   bool checkCTPIDCconsistency = true; ///< check the selected CTP or IDC scaling source being consistent with mean scaler of the map
   bool enableSecEdgeFlucCorrection = true; ///< enable correction of sector edge fluctuations
+  bool enableIDCScalers = true;            ///< enable TPC scalers for space-charge distortion fluctuation correction
 };
 } // namespace o2::tpc
 #endif