Support per-layer ITS clusters in cosmics-match-workflow

Author: shahor02

Detectors/GlobalTracking/include/GlobalTracking/MatchCosmics.h

@@ -23,6 +23,7 @@
 #include "ReconstructionDataFormats/GlobalTrackAccessor.h"
 #include "ReconstructionDataFormats/BaseCluster.h"
 #include "DataFormatsITSMFT/TopologyDictionary.h"
+#include "DataFormatsITSMFT/ClustersPerLayer.h"
 #include "SimulationDataFormat/MCCompLabel.h"
 #include "GlobalTracking/MatchCosmicsParams.h"
 #include "CommonUtils/TreeStreamRedirector.h"
@@ -134,7 +135,7 @@ class MatchCosmics
   bool validateMatch(int partner0);
   void selectWinners();
   void refitWinners(const o2::globaltracking::RecoContainer& data);
-  std::vector<o2::BaseCluster<float>> prepareITSClusters(const o2::globaltracking::RecoContainer& data) const;
+  o2::itsmft::ClustersPerLayer<o2::BaseCluster<float>> prepareITSClusters(const o2::globaltracking::RecoContainer& data) const;
 
   std::vector<TrackSeed> mSeeds;
   std::vector<MatchRecord> mRecords;

Detectors/GlobalTracking/src/MatchCosmics.cxx

@@ -622,17 +622,22 @@ void MatchCosmics::init()
 }
 
 //________________________________________________________
-std::vector<o2::BaseCluster<float>> MatchCosmics::prepareITSClusters(const o2::globaltracking::RecoContainer& data) const
+o2::itsmft::ClustersPerLayer<o2::BaseCluster<float>> MatchCosmics::prepareITSClusters(const o2::globaltracking::RecoContainer& data) const
 {
-  std::vector<o2::BaseCluster<float>> itscl;
-  const auto& clusITS = data.getITSClusters();
-  if (clusITS.size()) {
-    const auto& patterns = data.getITSClustersPatterns();
-    itscl.reserve(clusITS.size());
-    auto pattIt = patterns.begin();
-    o2::its::ioutils::convertCompactClusters(clusITS, pattIt, itscl, mITSDict);
+  o2::itsmft::ClustersPerLayer<o2::BaseCluster<float>> itscl;
+  int nLr = data.getITSPerLayer() ? o2::globaltracking::MaxITSLayers : 1;
+  itscl.init(nLr);
+  for (int lr = 0; lr < nLr; lr++) {
+    itscl.beginLayer(lr);
+    const auto& clusITS = data.getITSClusters(lr);
+    if (clusITS.size()) {
+      auto pattIt = data.getITSClustersPatterns(lr).begin();
+      itscl.getClusters().reserve(itscl.size() + clusITS.size());
+      o2::its::ioutils::convertCompactClusters(clusITS, pattIt, itscl.getClusters(), mITSDict);
+    }
   }
-  return std::move(itscl);
+  itscl.finalize();
+  return itscl;
 }
 
 //______________________________________________

Detectors/GlobalTrackingWorkflow/include/GlobalTrackingWorkflow/CosmicsMatchingSpec.h

@@ -24,7 +24,7 @@ namespace globaltracking
 {
 
 /// create a processor spec
-framework::DataProcessorSpec getCosmicsMatchingSpec(o2::dataformats::GlobalTrackID::mask_t src, bool usePV, bool useMC);
+framework::DataProcessorSpec getCosmicsMatchingSpec(o2::dataformats::GlobalTrackID::mask_t src, bool usePV, bool useMC, bool itsStag);
 
 } // namespace globaltracking
 } // namespace o2

Detectors/GlobalTrackingWorkflow/src/CosmicsMatchingSpec.cxx

@@ -183,14 +183,15 @@ void CosmicsMatchingSpec::endOfStream(EndOfStreamContext& ec)
        mTimer.CpuTime(), mTimer.RealTime(), mTimer.Counter() - 1);
 }
 
-DataProcessorSpec getCosmicsMatchingSpec(GTrackID::mask_t src, bool usePV, bool useMC)
+DataProcessorSpec getCosmicsMatchingSpec(GTrackID::mask_t src, bool usePV, bool useMC, bool itsStag)
 {
   std::vector<OutputSpec> outputs;
   Options opts{
     {"material-lut-path", VariantType::String, "", {"Path of the material LUT file"}},
     {"debug-tree-flags", VariantType::Int, 0, {"DebugFlagTypes bit-pattern for debug tree"}}};
 
   auto dataRequest = std::make_shared<DataRequest>();
+  dataRequest->setITSPerLayer(itsStag);
 
   dataRequest->requestTracks(src, useMC);
   dataRequest->requestClusters(src, false); // no MC labels for clusters needed for refit only

Detectors/GlobalTrackingWorkflow/src/cosmics-match-workflow.cxx

@@ -88,6 +88,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
   o2::conf::ConfigurableParam::writeINI("o2match-cosmics-workflow_configuration.ini");
   auto sclOpt = o2::tpc::CorrectionMapsOptions::parseGlobalOptions(configcontext.options());
   auto useMC = !configcontext.options().get<bool>("disable-mc");
+  auto doStag = o2::itsmft::DPLAlpideParamInitializer::isITSStaggeringEnabled(configcontext);
   auto disableRootOut = configcontext.options().get<bool>("disable-root-output");
 
   GID::mask_t src = alowedSources & GID::getSourcesMask(configcontext.options().get<std::string>("track-sources"));
@@ -110,7 +111,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
     specs.emplace_back(o2::tpc::getTPCScalerSpec(sclOpt));
   }
   bool usePV = configcontext.options().get<bool>("use-pv-info");
-  specs.emplace_back(o2::globaltracking::getCosmicsMatchingSpec(src, usePV, useMC));
+  specs.emplace_back(o2::globaltracking::getCosmicsMatchingSpec(src, usePV, useMC, doStag));
 
   o2::globaltracking::InputHelper::addInputSpecs(configcontext, specs, src, src, src, useMC, dummy); // clusters MC is not needed
   if (usePV) {