use DEC in analysis object writer

Author: aalkin

Framework/AnalysisSupport/src/AODWriterHelpers.cxx

@@ -241,14 +241,13 @@ AlgorithmSpec AODWriterHelpers::getOutputTTreeWriter(ConfigContext const& ctx)
   };
 }
 
-AlgorithmSpec AODWriterHelpers::getOutputObjHistWriter(ConfigContext const& ctx)
+AlgorithmSpec AODWriterHelpers::getOutputObjHistWriter(ConfigContext const& /*ctx*/)
 {
-  using namespace monitoring;
-  auto& ac = ctx.services().get<DanglingEdgesContext>();
-  auto tskmap = ac.outTskMap;
-  auto objmap = ac.outObjHistMap;
-
-  return AlgorithmSpec{[objmap, tskmap](InitContext& ic) -> std::function<void(ProcessingContext&)> {
+  return AlgorithmSpec{[](InitContext& ic) -> std::function<void(ProcessingContext&)> {
+    using namespace monitoring;
+    auto& dec = ic.services().get<DanglingEdgesContext>();
+    auto tskmap = dec.outTskMap;
+    auto objmap = dec.outObjHistMap;
     auto& callbacks = ic.services().get<CallbackService>();
     auto inputObjects = std::make_shared<std::vector<std::pair<InputObjectRoute, InputObject>>>();
 
@@ -278,7 +277,7 @@ AlgorithmSpec AODWriterHelpers::getOutputObjHistWriter(ConfigContext const& ctx)
 
     callbacks.set<CallbackService::Id::EndOfStream>(endofdatacb);
     return [inputObjects, objmap, tskmap](ProcessingContext& pc) mutable -> void {
-      auto mergePart = [&inputObjects, &objmap, &tskmap, &pc](DataRef const& ref) {
+      auto mergePart = [&inputObjects, &objmap, &tskmap](DataRef const& ref) {
         O2_SIGNPOST_ID_GENERATE(hid, histogram_registry);
         O2_SIGNPOST_START(histogram_registry, hid, "mergePart", "Merging histogram");
         if (!ref.header) {
@@ -474,7 +473,7 @@ AlgorithmSpec AODWriterHelpers::getOutputObjHistWriter(ConfigContext const& ctx)
       };
       O2_SIGNPOST_ID_GENERATE(rid, histogram_registry);
       O2_SIGNPOST_START(histogram_registry, rid, "processParts", "Start merging %zu parts received together.", pc.inputs().getNofParts(0));
-      for (int pi = 0; pi < pc.inputs().getNofParts(0); ++pi) {
+      for (auto pi = 0U; pi < pc.inputs().getNofParts(0); ++pi) {
         mergePart(pc.inputs().get("x", pi));
       }
       O2_SIGNPOST_END(histogram_registry, rid, "processParts", "Done histograms in multipart message.");