diff --git a/Detectors/AOD/src/aod-producer-workflow.cxx b/Detectors/AOD/src/aod-producer-workflow.cxx index e7c971a547440..855f84e3031b3 100644 --- a/Detectors/AOD/src/aod-producer-workflow.cxx +++ b/Detectors/AOD/src/aod-producer-workflow.cxx @@ -40,7 +40,7 @@ void customize(std::vector& workflowOptions) {"info-sources", VariantType::String, std::string{GID::ALL}, {"comma-separated list of sources to use"}}, {"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings ..."}}, {"combine-source-devices", o2::framework::VariantType::Bool, false, {"merge DPL source devices"}}, - {"ctpconfig-per-run", o2::framework::VariantType::Bool, false, {"Use CTP config per run. 1 -- on (Data), 0 -- off (MC)"}}}; + {"ctpconfig-run-independent", o2::framework::VariantType::Bool, false, {"Use CTP config w/o runNumber tag"}}}; o2::raw::HBFUtilsInitializer::addConfigOption(options); std::swap(workflowOptions, options); } @@ -53,7 +53,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext) auto useMC = !configcontext.options().get("disable-mc"); bool enableSV = !configcontext.options().get("disable-secondary-vertices"); bool enableST = !configcontext.options().get("disable-strangeness-tracking"); - bool ctpcfgperrun = configcontext.options().get("ctpconfig-per-run"); + bool ctpcfgperrun = !configcontext.options().get("ctpconfig-run-independent"); GID::mask_t allowedSrc = GID::getSourcesMask("ITS,MFT,MCH,MID,MCH-MID,TPC,TRD,ITS-TPC,TPC-TOF,TPC-TRD,ITS-TPC-TOF,ITS-TPC-TRD,TPC-TRD-TOF,ITS-TPC-TRD-TOF,MFT-MCH,FT0,FV0,FDD,ZDC,EMC,CTP,PHS,CPV,HMP"); GID::mask_t src = allowedSrc & GID::getSourcesMask(configcontext.options().get("info-sources")); diff --git a/Detectors/EMCAL/calibration/testWorkflow/emc-channel-calib-workflow.cxx b/Detectors/EMCAL/calibration/testWorkflow/emc-channel-calib-workflow.cxx index b01d374fbc1d5..2eb67276905aa 100644 --- a/Detectors/EMCAL/calibration/testWorkflow/emc-channel-calib-workflow.cxx +++ b/Detectors/EMCAL/calibration/testWorkflow/emc-channel-calib-workflow.cxx @@ -42,7 +42,7 @@ void customize(std::vector& workflowOptions) {"no-rejectCalibTrigger", VariantType::Bool, false, {"disabled by default such that calib triggers are rejected. If enabled, calibration triggers (LED events etc.) also enter the calibration"}}, {"no-rejectL0Trigger", VariantType::Bool, false, {"disabled by default such that L0 triggers are rejected. If enabled, L0 triggers (Gamma trigger and jet trigger) also enter the calibration"}}, {"no-applyGainCalib", VariantType::Bool, false, {"if appplication of gain calibration should be disabled"}}, - {"ctpconfig-per-run", VariantType::Bool, false, {"Use CTP config per run. 1 -- on (Data), 0 -- off (MC)"}}}; + {"ctpconfig-run-independent", VariantType::Bool, false, {"Use CTP config w/o runNumber tag"}}}; std::swap(workflowOptions, options); } @@ -57,7 +57,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) bool loadCalibParamsFromCCDB = !cfgc.options().get("no-loadCalibParamsFromCCDB"); bool rejectCalibTrigger = !cfgc.options().get("no-rejectCalibTrigger"); bool rejectL0Trigger = !cfgc.options().get("no-rejectL0Trigger"); - bool ctpcfgperrun = cfgc.options().get("ctpconfig-per-run"); + bool ctpcfgperrun = !cfgc.options().get("ctpconfig-run-independent"); bool applyGainCalib = !cfgc.options().get("no-applyGainCalib"); WorkflowSpec specs; diff --git a/Detectors/EMCAL/workflow/src/emc-offline-calib-workflow.cxx b/Detectors/EMCAL/workflow/src/emc-offline-calib-workflow.cxx index 8c1b437d6e26c..85416ed6f7a13 100644 --- a/Detectors/EMCAL/workflow/src/emc-offline-calib-workflow.cxx +++ b/Detectors/EMCAL/workflow/src/emc-offline-calib-workflow.cxx @@ -26,7 +26,7 @@ void customize(std::vector& workflowOptions) {"input-subspec", VariantType::UInt32, 0U, {"Subspecification for input objects"}}, {"applyGainCalib", VariantType::Bool, false, {"Apply the gain calibration parameters for the bad channel calibration"}}, {"rejectL0Trigger", VariantType::Bool, false, {"Reject all emcal triggers except the minimum bias trigger"}}, - {"ctpconfig-per-run", VariantType::Bool, false, {"Use CTP config per run. 1 -- on (Data), 0 -- off (MC)"}}, + {"ctpconfig-run-independent", VariantType::Bool, false, {"Use CTP config w/o runNumber tag"}}, {"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings"}}}; workflowOptions.insert(workflowOptions.end(), options.begin(), options.end()); } @@ -43,7 +43,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) bool rejectCalibTrigg = !cfgc.options().get("no-rejectCalibTrigg"); bool doApplyGainCalib = cfgc.options().get("applyGainCalib"); bool doRejectL0Trigger = cfgc.options().get("rejectL0Trigger"); - bool ctpcfgperrun = cfgc.options().get("ctpconfig-per-run"); + bool ctpcfgperrun = !cfgc.options().get("ctpconfig-run-independent"); // subpsecs for input auto inputsubspec = cfgc.options().get("input-subspec"); @@ -51,4 +51,4 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) o2::conf::ConfigurableParam::updateFromString(cfgc.options().get("configKeyValues")); wf.emplace_back(o2::emcal::getEmcalOfflineCalibSpec(makeCellIDTimeEnergy, rejectCalibTrigg, inputsubspec, doApplyGainCalib, doRejectL0Trigger, ctpcfgperrun)); return wf; -} \ No newline at end of file +}