Add HBFUtilsInitializer to MCH cl.reader and o2-eve-exporter

shahor02 · shahor02 · commit 250eeef1d54f · 2022-06-30T11:07:51.000+02:00
diff --git a/Detectors/MUON/MCH/Workflow/src/clusters-reader-workflow.cxx b/Detectors/MUON/MCH/Workflow/src/clusters-reader-workflow.cxx
@@ -12,15 +12,24 @@
 #include <vector>
 #include "Framework/ConfigParamSpec.h"
 #include "MCHWorkflow/ClusterReaderSpec.h"
+#include "DetectorsRaw/HBFUtilsInitializer.h"
+#include "Framework/CallbacksPolicy.h"
 
 using namespace o2::framework;
 
+// ------------------------------------------------------------------
+void customize(std::vector<o2::framework::CallbacksPolicy>& policies)
+{
+  o2::raw::HBFUtilsInitializer::addNewTimeSliceCallback(policies);
+}
+
 // we need to add workflow options before including Framework/runDataProcessing
 void customize(std::vector<ConfigParamSpec>& workflowOptions)
 {
   workflowOptions.emplace_back("enable-mc", VariantType::Bool, false, ConfigParamSpec::HelpString{"Propagate MC info"});
   workflowOptions.emplace_back("local", VariantType::Bool, false, ConfigParamSpec::HelpString{"Read clusters in local reference frame"});
   workflowOptions.emplace_back("digits", VariantType::Bool, false, ConfigParamSpec::HelpString{"Read the associated digits"});
+  o2::raw::HBFUtilsInitializer::addConfigOption(workflowOptions);
 }
 
 #include "Framework/runDataProcessing.h"
@@ -30,5 +39,7 @@ WorkflowSpec defineDataProcessing(const ConfigContext& config)
   bool useMC = config.options().get<bool>("enable-mc");
   bool global = !config.options().get<bool>("local");
   bool digits = config.options().get<bool>("digits");
-  return WorkflowSpec{o2::mch::getClusterReaderSpec(useMC, "mch-cluster-reader", global, digits)};
+  WorkflowSpec wf{o2::mch::getClusterReaderSpec(useMC, "mch-cluster-reader", global, digits)};
+  o2::raw::HBFUtilsInitializer hbfIni(config, wf);
+  return wf;
 }
diff --git a/EventVisualisation/Workflow/src/O2DPLDisplay.cxx b/EventVisualisation/Workflow/src/O2DPLDisplay.cxx
@@ -12,6 +12,9 @@
 /// \file
 /// \author Julian Myrcha
 
+#include "DetectorsRaw/HBFUtilsInitializer.h"
+#include "Framework/CallbacksPolicy.h"
+#include "Framework/CompletionPolicyHelpers.h"
 #include "EveWorkflow/O2DPLDisplay.h"
 #include "EveWorkflow/EveWorkflowHelper.h"
 #include "EventVisualisationBase/ConfigurationManager.h"
@@ -38,6 +41,12 @@ using namespace o2::globaltracking;
 using namespace o2::tpc;
 using namespace o2::trd;
 
+// ------------------------------------------------------------------
+void customize(std::vector<o2::framework::CallbacksPolicy>& policies)
+{
+  o2::raw::HBFUtilsInitializer::addNewTimeSliceCallback(policies);
+}
+
 void customize(std::vector<ConfigParamSpec>& workflowOptions)
 {
   std::vector<o2::framework::ConfigParamSpec> options{
@@ -63,7 +72,7 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
     {"only-nth-event", VariantType::Int, 0, {"process only every nth event"}},
     {"primary-vertex-mode", VariantType::Bool, false, {"produce jsons with individual primary vertices, not total time frame data"}},
   };
-
+  o2::raw::HBFUtilsInitializer::addConfigOption(options);
   std::swap(workflowOptions, options);
 }
 
@@ -284,7 +293,6 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
   if (primaryVertexMode) {
     dataRequest->requestPrimaryVertertices(useMC);
   }
-
   InputHelper::addInputSpecs(cfgc, specs, srcCl, srcTrk, srcTrk, useMC);
 
   auto minITSTracks = cfgc.options().get<int>("min-its-tracks");
@@ -302,5 +310,8 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
     {},
     AlgorithmSpec{adaptFromTask<O2DPLDisplaySpec>(useMC, srcTrk, srcCl, dataRequest, jsonFolder, timeInterval, numberOfFiles, numberOfTracks, eveHostNameMatch, minITSTracks, minTracks, filterITSROF, filterTime, timeBracket, removeTPCEta, etaBracket, tracksSorting, onlyNthEvent, primaryVertexMode)}});
 
+  // configure dpl timer to inject correct firstTFOrbit: start from the 1st orbit of TF containing 1st sampled orbit
+  o2::raw::HBFUtilsInitializer hbfIni(cfgc, specs);
+
   return std::move(specs);
 }
