From d24566ad07ea5ce175f946034d10c9ace5549406 Mon Sep 17 00:00:00 2001 From: Maurice Coquet Date: Thu, 21 Aug 2025 14:56:21 +0200 Subject: [PATCH 1/3] Fixing calls of ccdb objects construction --- .../calibration/src/NoiseCalibratorSpec.cxx | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Detectors/ITSMFT/MFT/calibration/src/NoiseCalibratorSpec.cxx b/Detectors/ITSMFT/MFT/calibration/src/NoiseCalibratorSpec.cxx index 8359d6c89ab60..728dd5692718a 100644 --- a/Detectors/ITSMFT/MFT/calibration/src/NoiseCalibratorSpec.cxx +++ b/Detectors/ITSMFT/MFT/calibration/src/NoiseCalibratorSpec.cxx @@ -78,13 +78,13 @@ void NoiseCalibratorSpec::run(ProcessingContext& pc) LOG(info) << "Sending an object to Production-CCDBMerge"; sendOutputCcdbMerge(pc.outputs()); } else if (mOutputType.compare("DCS") == 0) { - LOG(info) << "Sending an object to DCS-CCDB"; - sendOutputDcs(pc.outputs()); + LOG(info) << "Sending an object to DCS-Merge"; + sendOutputDcsMerge(ec.outputs()); } else { - LOG(info) << "Sending an object to Production-CCDB and DCS-CCDB"; - sendOutputCcdbDcs(pc.outputs()); - LOG(info) << "Sending an object to Production-CCDBMerge"; - sendOutputCcdbMerge(pc.outputs()); + LOG(info) << "Sending an object to Production-CCDB, Production-CCDB-Merge and DCS-Merge"; + sendOutputCcdb(ec.outputs()); + sendOutputDcsMerge(ec.outputs()); + sendOutputCcdbMerge(ec.outputs()); } pc.services().get().readyToQuit(mStopMeOnly ? QuitRequest::Me : QuitRequest::All); } @@ -102,13 +102,13 @@ void NoiseCalibratorSpec::run(ProcessingContext& pc) LOG(info) << "Sending an object to Production-CCDBMerge"; sendOutputCcdbMerge(pc.outputs()); } else if (mOutputType.compare("DCS") == 0) { - LOG(info) << "Sending an object to DCS-CCDB"; - sendOutputDcs(pc.outputs()); + LOG(info) << "Sending an object to DCS-Merge"; + sendOutputDcsMerge(ec.outputs()); } else { - LOG(info) << "Sending an object to Production-CCDB and DCS-CCDB"; - sendOutputCcdbDcs(pc.outputs()); - LOG(info) << "Sending an object to Production-CCDBMerge"; - sendOutputCcdbMerge(pc.outputs()); + LOG(info) << "Sending an object to Production-CCDB, Production-CCDB-Merge and DCS-Merge"; + sendOutputCcdb(ec.outputs()); + sendOutputDcsMerge(ec.outputs()); + sendOutputCcdbMerge(ec.outputs()); } pc.services().get().readyToQuit(mStopMeOnly ? QuitRequest::Me : QuitRequest::All); } @@ -385,7 +385,7 @@ void NoiseCalibratorSpec::sendOutputDcs(DataAllocator& output) void NoiseCalibratorSpec::sendOutputDcsMerge(DataAllocator& output) { - LOG(info) << "DCS mode"; + LOG(info) << "DCS-Merge mode"; static bool done = false; if (done) { From 3b8213ab426ca4e1cb175763469e77ef896e4a18 Mon Sep 17 00:00:00 2001 From: Maurice Coquet Date: Thu, 21 Aug 2025 14:57:03 +0200 Subject: [PATCH 2/3] Clang format --- .../calibration/src/NoiseCalibratorSpec.cxx | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Detectors/ITSMFT/MFT/calibration/src/NoiseCalibratorSpec.cxx b/Detectors/ITSMFT/MFT/calibration/src/NoiseCalibratorSpec.cxx index 728dd5692718a..3ab00c40b16d9 100644 --- a/Detectors/ITSMFT/MFT/calibration/src/NoiseCalibratorSpec.cxx +++ b/Detectors/ITSMFT/MFT/calibration/src/NoiseCalibratorSpec.cxx @@ -78,13 +78,13 @@ void NoiseCalibratorSpec::run(ProcessingContext& pc) LOG(info) << "Sending an object to Production-CCDBMerge"; sendOutputCcdbMerge(pc.outputs()); } else if (mOutputType.compare("DCS") == 0) { - LOG(info) << "Sending an object to DCS-Merge"; - sendOutputDcsMerge(ec.outputs()); + LOG(info) << "Sending an object to DCS-Merge"; + sendOutputDcsMerge(ec.outputs()); } else { - LOG(info) << "Sending an object to Production-CCDB, Production-CCDB-Merge and DCS-Merge"; - sendOutputCcdb(ec.outputs()); - sendOutputDcsMerge(ec.outputs()); - sendOutputCcdbMerge(ec.outputs()); + LOG(info) << "Sending an object to Production-CCDB, Production-CCDB-Merge and DCS-Merge"; + sendOutputCcdb(ec.outputs()); + sendOutputDcsMerge(ec.outputs()); + sendOutputCcdbMerge(ec.outputs()); } pc.services().get().readyToQuit(mStopMeOnly ? QuitRequest::Me : QuitRequest::All); } @@ -102,13 +102,13 @@ void NoiseCalibratorSpec::run(ProcessingContext& pc) LOG(info) << "Sending an object to Production-CCDBMerge"; sendOutputCcdbMerge(pc.outputs()); } else if (mOutputType.compare("DCS") == 0) { - LOG(info) << "Sending an object to DCS-Merge"; - sendOutputDcsMerge(ec.outputs()); + LOG(info) << "Sending an object to DCS-Merge"; + sendOutputDcsMerge(ec.outputs()); } else { - LOG(info) << "Sending an object to Production-CCDB, Production-CCDB-Merge and DCS-Merge"; - sendOutputCcdb(ec.outputs()); - sendOutputDcsMerge(ec.outputs()); - sendOutputCcdbMerge(ec.outputs()); + LOG(info) << "Sending an object to Production-CCDB, Production-CCDB-Merge and DCS-Merge"; + sendOutputCcdb(ec.outputs()); + sendOutputDcsMerge(ec.outputs()); + sendOutputCcdbMerge(ec.outputs()); } pc.services().get().readyToQuit(mStopMeOnly ? QuitRequest::Me : QuitRequest::All); } From 148ea18721478f1f518bf1d254a2b1d64d36d5e8 Mon Sep 17 00:00:00 2001 From: Maurice Coquet Date: Thu, 21 Aug 2025 14:58:54 +0200 Subject: [PATCH 3/3] Fix typo --- .../MFT/calibration/src/NoiseCalibratorSpec.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Detectors/ITSMFT/MFT/calibration/src/NoiseCalibratorSpec.cxx b/Detectors/ITSMFT/MFT/calibration/src/NoiseCalibratorSpec.cxx index 3ab00c40b16d9..29cdb09692f4e 100644 --- a/Detectors/ITSMFT/MFT/calibration/src/NoiseCalibratorSpec.cxx +++ b/Detectors/ITSMFT/MFT/calibration/src/NoiseCalibratorSpec.cxx @@ -79,12 +79,12 @@ void NoiseCalibratorSpec::run(ProcessingContext& pc) sendOutputCcdbMerge(pc.outputs()); } else if (mOutputType.compare("DCS") == 0) { LOG(info) << "Sending an object to DCS-Merge"; - sendOutputDcsMerge(ec.outputs()); + sendOutputDcsMerge(pc.outputs()); } else { LOG(info) << "Sending an object to Production-CCDB, Production-CCDB-Merge and DCS-Merge"; - sendOutputCcdb(ec.outputs()); - sendOutputDcsMerge(ec.outputs()); - sendOutputCcdbMerge(ec.outputs()); + sendOutputCcdb(pc.outputs()); + sendOutputDcsMerge(pc.outputs()); + sendOutputCcdbMerge(pc.outputs()); } pc.services().get().readyToQuit(mStopMeOnly ? QuitRequest::Me : QuitRequest::All); } @@ -103,12 +103,12 @@ void NoiseCalibratorSpec::run(ProcessingContext& pc) sendOutputCcdbMerge(pc.outputs()); } else if (mOutputType.compare("DCS") == 0) { LOG(info) << "Sending an object to DCS-Merge"; - sendOutputDcsMerge(ec.outputs()); + sendOutputDcsMerge(pc.outputs()); } else { LOG(info) << "Sending an object to Production-CCDB, Production-CCDB-Merge and DCS-Merge"; - sendOutputCcdb(ec.outputs()); - sendOutputDcsMerge(ec.outputs()); - sendOutputCcdbMerge(ec.outputs()); + sendOutputCcdb(pc.outputs()); + sendOutputDcsMerge(pc.outputs()); + sendOutputCcdbMerge(pc.outputs()); } pc.services().get().readyToQuit(mStopMeOnly ? QuitRequest::Me : QuitRequest::All); }