Fixing CCDB filling for DCS processors (AliceO2Group#4867)

chiarazampolli · alibuild · web-flow · commit d7fcd3f2fc00 · 2020-11-20T11:02:53.000+01:00
* Fixing CCDB filling for DCS processors * Update DCSDataProcessorSpec.h * Please consider the following formatting changes (AliceO2Group#23) Co-authored-by: ALICE Builder <alibuild@users.noreply.github.com>
diff --git 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<int64_t>("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<int64_t>("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<o2::framework::DataProcessingHeader*>(pc.inputs().get("input").header)->startTime;
-    mDCSproc.setTF(tfid);
     for (int idet = 0; idet < kNdetectors; idet++) {
       mDCSprocVect[idet].setTF(tfid);
     }
@@ -275,7 +271,6 @@ class DCSDataProcessor : public o2::framework::Task
  private:
   std::unordered_map<DPID, std::vector<int>> mDetectorPid;
   std::array<DCSProcessor, kNdetectors> mDCSprocVect;
-  o2::dcs::DCSProcessor mDCSproc;
   TStopwatch mReceiveBinaryData;
   TStopwatch mDeltaReceiveBinaryData;
   TStopwatch mBuildingUnorderedMap;
@@ -299,14 +294,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
