From 6b1ec43e0cdee5ca6179536f6aad81adaf3b203a Mon Sep 17 00:00:00 2001 From: Chiara Zampolli Date: Thu, 19 Nov 2020 00:33:56 +0100 Subject: [PATCH 1/3] Fixing CCDB filling for DCS processors --- .../DCS/testWorkflow/DCSDataProcessorSpec.h | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/Detectors/DCS/testWorkflow/DCSDataProcessorSpec.h b/Detectors/DCS/testWorkflow/DCSDataProcessorSpec.h index 2f5569106e77c..19e4fb9103d32 100644 --- a/Detectors/DCS/testWorkflow/DCSDataProcessorSpec.h +++ b/Detectors/DCS/testWorkflow/DCSDataProcessorSpec.h @@ -93,9 +93,6 @@ class DCSDataProcessor : public o2::framework::Task pidVect.push_back(dpidtmp); mDetectorPid[dpidtmp] = vectDet; - mDCSproc.init(pidVect); - mDCSproc.setMaxCyclesNoFullMap(ic.options().get("max-cycles-no-full-map")); - mDCSproc.setName("Test0Det"); for (int idet = 0; idet < kNdetectors; idet++) { mDCSprocVect[idet].init(pidVect); mDCSprocVect[idet].setMaxCyclesNoFullMap(ic.options().get("max-cycles-no-full-map")); @@ -107,7 +104,6 @@ class DCSDataProcessor : public o2::framework::Task void run(o2::framework::ProcessingContext& pc) final { auto tfid = o2::header::get(pc.inputs().get("input").header)->startTime; - mDCSproc.setTF(tfid); for (int idet = 0; idet < kNdetectors; idet++) { mDCSprocVect[idet].setTF(tfid); } @@ -213,6 +209,7 @@ class DCSDataProcessor : public o2::framework::Task // now preparing CCDB object for (int idet = 0; idet < kNdetectors; idet++) { std::map md; + LOG(INFO) << "HEEERE! preparing the CCDBobject"; mDCSprocVect[idet].prepareCCDBobject(mDCSprocVect[idet].getCCDBSimpleMovingAverage(), mDCSprocVect[idet].getCCDBSimpleMovingAverageInfo(), mDCSprocVect[idet].getName() + "/TestDCS/SimpleMovingAverageDPs", @@ -275,7 +272,6 @@ class DCSDataProcessor : public o2::framework::Task private: std::unordered_map> mDetectorPid; std::array mDCSprocVect; - o2::dcs::DCSProcessor mDCSproc; TStopwatch mReceiveBinaryData; TStopwatch mDeltaReceiveBinaryData; TStopwatch mBuildingUnorderedMap; @@ -299,14 +295,16 @@ class DCSDataProcessor : public o2::framework::Task // extract CCDB infos and calibration objects, convert it to TMemFile and send them to the output // copied from LHCClockCalibratorSpec.cxx using clbUtils = o2::calibration::Utils; - const auto& payload = mDCSproc.getCCDBSimpleMovingAverage(); - auto& info = mDCSproc.getCCDBSimpleMovingAverageInfo(); - auto image = o2::ccdb::CcdbApi::createObjectImage(&payload, &info); - LOG(INFO) << "Sending object " << info.getPath() << "/" << info.getFileName() << " of size " << image->size() - << " bytes, valid for " << info.getStartValidityTimestamp() << " : " << info.getEndValidityTimestamp(); - - output.snapshot(Output{clbUtils::gDataOriginCLB, clbUtils::gDataDescriptionCLBPayload, 0}, *image.get()); - output.snapshot(Output{clbUtils::gDataOriginCLB, clbUtils::gDataDescriptionCLBInfo, 0}, info); + for (int idet = 0; idet < kNdetectors; idet++) { + const auto& payload = mDCSprocVect[idet].getCCDBSimpleMovingAverage(); + auto& info = mDCSprocVect[idet].getCCDBSimpleMovingAverageInfo(); + auto image = o2::ccdb::CcdbApi::createObjectImage(&payload, &info); + LOG(INFO) << "Sending object " << info.getPath() << "/" << info.getFileName() << " of size " << image->size() + << " bytes, valid for " << info.getStartValidityTimestamp() << " : " << info.getEndValidityTimestamp(); + + output.snapshot(Output{clbUtils::gDataOriginCLB, clbUtils::gDataDescriptionCLBPayload, 0}, *image.get()); + output.snapshot(Output{clbUtils::gDataOriginCLB, clbUtils::gDataDescriptionCLBInfo, 0}, info); + } } }; // end class } // namespace dcs From a3e423e1aaf72726123835d19696ac9ed91dc613 Mon Sep 17 00:00:00 2001 From: Chiara Zampolli Date: Thu, 19 Nov 2020 00:43:25 +0100 Subject: [PATCH 2/3] Update DCSDataProcessorSpec.h --- Detectors/DCS/testWorkflow/DCSDataProcessorSpec.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Detectors/DCS/testWorkflow/DCSDataProcessorSpec.h b/Detectors/DCS/testWorkflow/DCSDataProcessorSpec.h index 19e4fb9103d32..51d1a6bfa6bf3 100644 --- a/Detectors/DCS/testWorkflow/DCSDataProcessorSpec.h +++ b/Detectors/DCS/testWorkflow/DCSDataProcessorSpec.h @@ -209,7 +209,6 @@ class DCSDataProcessor : public o2::framework::Task // now preparing CCDB object for (int idet = 0; idet < kNdetectors; idet++) { std::map md; - LOG(INFO) << "HEEERE! preparing the CCDBobject"; mDCSprocVect[idet].prepareCCDBobject(mDCSprocVect[idet].getCCDBSimpleMovingAverage(), mDCSprocVect[idet].getCCDBSimpleMovingAverageInfo(), mDCSprocVect[idet].getName() + "/TestDCS/SimpleMovingAverageDPs", From f9a01b88c570afc56d4da33af1b2f18426a3bbd1 Mon Sep 17 00:00:00 2001 From: ALICE Builder Date: Thu, 19 Nov 2020 00:45:32 +0100 Subject: [PATCH 3/3] Please consider the following formatting changes (#23) --- Detectors/DCS/testWorkflow/DCSDataProcessorSpec.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Detectors/DCS/testWorkflow/DCSDataProcessorSpec.h b/Detectors/DCS/testWorkflow/DCSDataProcessorSpec.h index 51d1a6bfa6bf3..1f00bcadc8744 100644 --- a/Detectors/DCS/testWorkflow/DCSDataProcessorSpec.h +++ b/Detectors/DCS/testWorkflow/DCSDataProcessorSpec.h @@ -299,8 +299,8 @@ class DCSDataProcessor : public o2::framework::Task auto& info = mDCSprocVect[idet].getCCDBSimpleMovingAverageInfo(); auto image = o2::ccdb::CcdbApi::createObjectImage(&payload, &info); LOG(INFO) << "Sending object " << info.getPath() << "/" << info.getFileName() << " of size " << image->size() - << " bytes, valid for " << info.getStartValidityTimestamp() << " : " << info.getEndValidityTimestamp(); - + << " bytes, valid for " << info.getStartValidityTimestamp() << " : " << info.getEndValidityTimestamp(); + output.snapshot(Output{clbUtils::gDataOriginCLB, clbUtils::gDataDescriptionCLBPayload, 0}, *image.get()); output.snapshot(Output{clbUtils::gDataOriginCLB, clbUtils::gDataDescriptionCLBInfo, 0}, info); }