Support per-layer ITS clusters in its-standalone-postprocessing-workflow

All 7 study classes selectable from this single workflow. AnomalyStudy
is ported in full (its nROF is a config parameter and all histograms
are per layer, so per-layer ROF counters are the natural granularity).
EfficiencyStudy and ITSBeamBackgroundStudy request the per-layer input
but refuse to run on it (LOGP fatal): their algorithms rely on
assumptions the staggered readout breaks (cluster-ROF index == track-ROF
index; chaining consecutive ROFs across the 3 IB layers into one strobe
series), and the replacement is an analysis choice for the study to make.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

Author: shahor02

Detectors/ITSMFT/ITS/postprocessing/studies/include/ITSStudies/AnomalyStudy.h

@@ -22,7 +22,7 @@ namespace study
 
 using mask_t = o2::dataformats::GlobalTrackID::mask_t;
 
-o2::framework::DataProcessorSpec getAnomalyStudy(mask_t srcClustersMask, bool useMC);
+o2::framework::DataProcessorSpec getAnomalyStudy(mask_t srcClustersMask, bool useMC, bool itsStag);
 } // namespace study
 } // namespace o2::its
 

Detectors/ITSMFT/ITS/postprocessing/studies/include/ITSStudies/AvgClusSize.h

@@ -28,7 +28,7 @@ namespace study
 
 using mask_t = o2::dataformats::GlobalTrackID::mask_t;
 
-o2::framework::DataProcessorSpec getAvgClusSizeStudy(mask_t srcTracksMask, mask_t srcClustersMask, bool useMC, std::shared_ptr<o2::steer::MCKinematicsReader> kineReader);
+o2::framework::DataProcessorSpec getAvgClusSizeStudy(mask_t srcTracksMask, mask_t srcClustersMask, bool useMC, std::shared_ptr<o2::steer::MCKinematicsReader> kineReader, bool itsStag);
 } // namespace study
 } // namespace its
 } // namespace o2

Detectors/ITSMFT/ITS/postprocessing/studies/include/ITSStudies/Efficiency.h

@@ -26,7 +26,7 @@ namespace its
 namespace study
 {
 using mask_t = o2::dataformats::GlobalTrackID::mask_t;
-o2::framework::DataProcessorSpec getEfficiencyStudy(mask_t srcTracksMask, mask_t srcClustersMask, bool useMC, std::shared_ptr<o2::steer::MCKinematicsReader> kineReader);
+o2::framework::DataProcessorSpec getEfficiencyStudy(mask_t srcTracksMask, mask_t srcClustersMask, bool useMC, std::shared_ptr<o2::steer::MCKinematicsReader> kineReader, bool itsStag);
 
 float mEtaCuts[2] = {-1.0, 1.0};
 float mPtCuts[2] = {0, 10}; /// no cut for B=0

Detectors/ITSMFT/ITS/postprocessing/studies/include/ITSStudies/ITSBeamBackgroundStudy.h

@@ -20,7 +20,7 @@ namespace o2::its::study
 
 using mask_t = o2::dataformats::GlobalTrackID::mask_t;
 
-o2::framework::DataProcessorSpec getITSBeamBackgroundStudy(mask_t srcTracksMask, mask_t srcClustersMask, bool useMC);
+o2::framework::DataProcessorSpec getITSBeamBackgroundStudy(mask_t srcTracksMask, mask_t srcClustersMask, bool useMC, bool itsStag);
 
 } // namespace o2::its::study
 #endif

Detectors/ITSMFT/ITS/postprocessing/studies/include/ITSStudies/PIDStudy.h

@@ -28,7 +28,7 @@ namespace study
 
 using mask_t = o2::dataformats::GlobalTrackID::mask_t;
 
-o2::framework::DataProcessorSpec getPIDStudy(mask_t srcTracksMask, mask_t srcClustersMask, bool useMC, std::shared_ptr<o2::steer::MCKinematicsReader> kineReader);
+o2::framework::DataProcessorSpec getPIDStudy(mask_t srcTracksMask, mask_t srcClustersMask, bool useMC, std::shared_ptr<o2::steer::MCKinematicsReader> kineReader, bool itsStag);
 } // namespace study
 } // namespace its
 } // namespace o2

Detectors/ITSMFT/ITS/postprocessing/studies/include/ITSStudies/TrackCheck.h

@@ -26,7 +26,7 @@ namespace its
 namespace study
 {
 using mask_t = o2::dataformats::GlobalTrackID::mask_t;
-o2::framework::DataProcessorSpec getTrackCheckStudy(mask_t srcTracksMask, mask_t srcClustersMask, bool useMC, std::shared_ptr<o2::steer::MCKinematicsReader> kineReader);
+o2::framework::DataProcessorSpec getTrackCheckStudy(mask_t srcTracksMask, mask_t srcClustersMask, bool useMC, std::shared_ptr<o2::steer::MCKinematicsReader> kineReader, bool itsStag);
 } // namespace study
 } // namespace its
 } // namespace o2

Detectors/ITSMFT/ITS/postprocessing/studies/include/ITSStudies/TrackExtension.h

@@ -24,7 +24,7 @@ class MCKinematicsReader;
 namespace its::study
 {
 using mask_t = o2::dataformats::GlobalTrackID::mask_t;
-o2::framework::DataProcessorSpec getTrackExtensionStudy(mask_t srcTracksMask, mask_t srcClustersMask, std::shared_ptr<o2::steer::MCKinematicsReader> kineReader);
+o2::framework::DataProcessorSpec getTrackExtensionStudy(mask_t srcTracksMask, mask_t srcClustersMask, std::shared_ptr<o2::steer::MCKinematicsReader> kineReader, bool itsStag);
 } // namespace its::study
 
 } // namespace o2

Detectors/ITSMFT/ITS/postprocessing/studies/src/AnomalyStudy.cxx

@@ -197,41 +197,47 @@ void AnomalyStudy::process(o2::globaltracking::RecoContainer& recoData)
   auto nROF = o2::its::study::AnomalyStudyParamConfig::Instance().nRofTimeFrames;
   auto nLayProc = o2::its::study::AnomalyStudyParamConfig::Instance().nLayersToProcess;
   auto doROFAnalysis = o2::its::study::AnomalyStudyParamConfig::Instance().doROFAnalysis;
-  int rofCount = 0;
-  auto clusRofRecords = recoData.getITSClustersROFRecords();
-  auto compClus = recoData.getITSClusters();
-  auto clusPatt = recoData.getITSClustersPatterns();
-
-  getClusterPatterns(compClus, clusPatt, *mDict);
-
-  auto pattIt = clusPatt.begin();
-  std::vector<ITSCluster> globalClusters;
-  o2::its::ioutils::convertCompactClusters(compClus, pattIt, globalClusters, mDict);
-
   int lay, sta, ssta, mod, chipInMod;
-  for (auto& rofRecord : clusRofRecords) {
-    auto clustersInRof = rofRecord.getROFData(compClus);
-    auto patternsInRof = rofRecord.getROFData(mPatterns);
-    auto locClustersInRof = rofRecord.getROFData(globalClusters);
-    for (unsigned int clusInd{0}; clusInd < clustersInRof.size(); clusInd++) {
-      const auto& compClus = clustersInRof[clusInd];
-      auto& locClus = locClustersInRof[clusInd];
-      auto& clusPattern = patternsInRof[clusInd];
-      auto gloC = locClus.getXYZGlo(*mGeom);
-      mChipMapping.expandChipInfoHW(compClus.getChipID(), lay, sta, ssta, mod, chipInMod);
-      if (lay >= nLayProc) {
-        continue;
-      }
-      float phi = TMath::ATan2(gloC.Y(), gloC.X());
-      mTFvsPhiHist[lay]->Fill(phi, mTFCount);
-      mTFvsPhiClusSizeHist[lay]->Fill(phi, mTFCount, clusPattern.getNPixels());
-      if (doROFAnalysis) {
-        mROFvsPhiHist[lay]->Fill(phi, (mTFCount - 1) * nROF + rofCount);
-        mROFvsPhiClusSizeHist[lay]->Fill(phi, (mTFCount - 1) * nROF + rofCount, clusPattern.getNPixels());
+  // in the staggered readout the clusters and their ROFs are provided per layer, every layer having its
+  // own ROF length and numbering; all the filled histograms are per layer, hence each layer slot is
+  // processed with its own ROF counter
+  int nLr = recoData.getITSPerLayer() ? o2::globaltracking::MaxITSLayers : 1;
+  for (int lr = 0; lr < nLr; lr++) { // with a single (monolithic) input all clusters are in the layer slot 0
+    int rofCount = 0;
+    auto clusRofRecords = recoData.getITSClustersROFRecords(lr);
+    auto compClus = recoData.getITSClusters(lr);
+    auto clusPatt = recoData.getITSClustersPatterns(lr);
+
+    getClusterPatterns(compClus, clusPatt, *mDict);
+
+    auto pattIt = clusPatt.begin();
+    std::vector<ITSCluster> globalClusters;
+    o2::its::ioutils::convertCompactClusters(compClus, pattIt, globalClusters, mDict);
+
+    for (auto& rofRecord : clusRofRecords) {
+      auto clustersInRof = rofRecord.getROFData(compClus);
+      auto patternsInRof = rofRecord.getROFData(mPatterns);
+      auto locClustersInRof = rofRecord.getROFData(globalClusters);
+      for (unsigned int clusInd{0}; clusInd < clustersInRof.size(); clusInd++) {
+        const auto& compClus = clustersInRof[clusInd];
+        auto& locClus = locClustersInRof[clusInd];
+        auto& clusPattern = patternsInRof[clusInd];
+        auto gloC = locClus.getXYZGlo(*mGeom);
+        mChipMapping.expandChipInfoHW(compClus.getChipID(), lay, sta, ssta, mod, chipInMod);
+        if (lay >= nLayProc) {
+          continue;
+        }
+        float phi = TMath::ATan2(gloC.Y(), gloC.X());
+        mTFvsPhiHist[lay]->Fill(phi, mTFCount);
+        mTFvsPhiClusSizeHist[lay]->Fill(phi, mTFCount, clusPattern.getNPixels());
+        if (doROFAnalysis) {
+          mROFvsPhiHist[lay]->Fill(phi, (mTFCount - 1) * nROF + rofCount);
+          mROFvsPhiClusSizeHist[lay]->Fill(phi, (mTFCount - 1) * nROF + rofCount, clusPattern.getNPixels());
+        }
       }
+      ++rofCount;
     }
-    ++rofCount;
-  }
+  } // loop over the layer slots
   mStopwatch.Stop();
   LOGP(info, "Processed TF: {} in {} s", mTFCount, mStopwatch.RealTime());
 }
@@ -263,10 +269,11 @@ void AnomalyStudy::getClusterPatterns(gsl::span<const o2::itsmft::CompClusterExt
 }
 
 // getter
-DataProcessorSpec getAnomalyStudy(mask_t srcClustersMask, bool useMC)
+DataProcessorSpec getAnomalyStudy(mask_t srcClustersMask, bool useMC, bool itsStag)
 {
   std::vector<OutputSpec> outputs;
   auto dataRequest = std::make_shared<DataRequest>();
+  dataRequest->setITSPerLayer(itsStag);
   dataRequest->requestClusters(srcClustersMask, useMC);
   dataRequest->requestTracks(GTrackID::getSourcesMask(""), useMC);
 

Detectors/ITSMFT/ITS/postprocessing/studies/src/AvgClusSize.cxx

@@ -25,6 +25,7 @@
 #include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsITS/TrackITS.h"
 #include "DataFormatsGlobalTracking/RecoContainer.h"
+#include "DataFormatsITSMFT/ClustersPerLayer.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "ReconstructionDataFormats/PrimaryVertex.h"
 #include "ReconstructionDataFormats/PID.h"
@@ -90,7 +91,7 @@ class AvgClusSizeStudy final : public Task
   float getAverageClusterSize(o2::its::TrackITS*);
   float calcV0HypoMass(const V0&, PID, PID);
   void calcAPVars(const V0&, float*, float*);
-  void getClusterSizes(std::vector<int>&, const gsl::span<const o2::itsmft::CompClusterExt>, gsl::span<const unsigned char>::iterator&, const o2::itsmft::TopologyDictionary*);
+  void getClusterSizes(std::vector<int>&, int offs, const gsl::span<const o2::itsmft::CompClusterExt>, gsl::span<const unsigned char>::iterator&, const o2::itsmft::TopologyDictionary*);
   void saveHistograms();
   void plotHistograms();
   void fillEtaBin(float eta, float clusSize, int i);
@@ -101,7 +102,7 @@ class AvgClusSizeStudy final : public Task
   // Data
   std::shared_ptr<o2::base::GRPGeomRequest> mGGCCDBRequest;
   std::shared_ptr<DataRequest> mDataRequest;
-  std::vector<int> mClusterSizes;
+  o2::itsmft::ClustersPerLayer<int> mClusterSizes; // addressed by the composed (layer,index) ID
   gsl::span<const int> mInputITSidxs;
   std::vector<o2::MCTrack> mMCTracks;
   const o2::itsmft::TopologyDictionary* mDict = nullptr;
@@ -294,7 +295,7 @@ void AvgClusSizeStudy::run(ProcessingContext& pc)
   process(recoData);
 }
 
-void AvgClusSizeStudy::getClusterSizes(std::vector<int>& clusSizeVec, const gsl::span<const o2::itsmft::CompClusterExt> ITSclus, gsl::span<const unsigned char>::iterator& pattIt, const o2::itsmft::TopologyDictionary* mdict)
+void AvgClusSizeStudy::getClusterSizes(std::vector<int>& clusSizeVec, int offs, const gsl::span<const o2::itsmft::CompClusterExt> ITSclus, gsl::span<const unsigned char>::iterator& pattIt, const o2::itsmft::TopologyDictionary* mdict)
 {
   for (unsigned int iClus{0}; iClus < ITSclus.size(); ++iClus) {
     auto& clus = ITSclus[iClus];
@@ -309,18 +310,26 @@ void AvgClusSizeStudy::getClusterSizes(std::vector<int>& clusSizeVec, const gsl:
       npix = mdict->getNpixels(pattID);
       patt = mdict->getPattern(pattID);
     }
-    clusSizeVec[iClus] = npix;
+    clusSizeVec[offs + iClus] = npix;
   }
 }
 
 void AvgClusSizeStudy::loadData(o2::globaltracking::RecoContainer& recoData)
 {
   mInputITSidxs = recoData.getITSTracksClusterRefs();
-  auto compClus = recoData.getITSClusters();
-  auto clusPatt = recoData.getITSClustersPatterns();
-  mClusterSizes.resize(compClus.size());
-  auto pattIt = clusPatt.begin();
-  getClusterSizes(mClusterSizes, compClus, pattIt, mDict);
+  int nLr = recoData.getITSPerLayer() ? o2::globaltracking::MaxITSLayers : 1;
+  mClusterSizes.init(nLr);
+  for (int lr = 0; lr < nLr; lr++) { // with a single (monolithic) input all clusters are in the layer slot 0
+    mClusterSizes.beginLayer(lr);
+    auto compClus = recoData.getITSClusters(lr);
+    auto clusPatt = recoData.getITSClustersPatterns(lr);
+    auto pattIt = clusPatt.begin();
+    auto& sizes = mClusterSizes.getClusters();
+    int offs = (int)sizes.size();
+    sizes.resize(offs + compClus.size());
+    getClusterSizes(sizes, offs, compClus, pattIt, mDict);
+  }
+  mClusterSizes.finalize();
 }
 
 void AvgClusSizeStudy::process(o2::globaltracking::RecoContainer& recoData)
@@ -646,10 +655,11 @@ void AvgClusSizeStudy::finaliseCCDB(ConcreteDataMatcher& matcher, void* obj)
   }
 }
 
-DataProcessorSpec getAvgClusSizeStudy(mask_t srcTracksMask, mask_t srcClustersMask, bool useMC, std::shared_ptr<o2::steer::MCKinematicsReader> kineReader)
+DataProcessorSpec getAvgClusSizeStudy(mask_t srcTracksMask, mask_t srcClustersMask, bool useMC, std::shared_ptr<o2::steer::MCKinematicsReader> kineReader, bool itsStag)
 {
   std::vector<OutputSpec> outputs;
   auto dataRequest = std::make_shared<DataRequest>();
+  dataRequest->setITSPerLayer(itsStag);
   dataRequest->requestTracks(srcTracksMask, useMC);
   dataRequest->requestClusters(srcClustersMask, useMC);
   dataRequest->requestSecondaryVertices(useMC);

Detectors/ITSMFT/ITS/postprocessing/studies/src/Efficiency.cxx

@@ -558,6 +558,14 @@ void EfficiencyStudy::run(ProcessingContext& pc)
 void EfficiencyStudy::initialiseRun(o2::globaltracking::RecoContainer& recoData)
 {
   LOGP(info, "--------------- initialiseRun");
+  if (recoData.getITSPerLayer()) {
+    // The duplicated-cluster search scans the cluster ROF whose index equals that of the track ROF and
+    // relies on the two ROF series being the same. With the staggered readout every layer has its own
+    // ROF length and numbering, while the track ROFs follow the clock layer only, so the ROF of the
+    // layer to scan has to be found from the track time instead. This requires deciding whether a
+    // duplicate is searched in a single ROF or in all the ROFs compatible with the track time bracket.
+    LOGP(fatal, "EfficiencyStudy does not support the per-layer (staggered) ITS clusters input yet");
+  }
   if (mUseMC) {
     mTracksMCLabels = recoData.getITSTracksMCLabels();
     mClustersMCLCont = recoData.getITSClustersMCLabels();
@@ -2837,10 +2845,11 @@ void EfficiencyStudy::finaliseCCDB(ConcreteDataMatcher& matcher, void* obj)
   }
 }
 
-DataProcessorSpec getEfficiencyStudy(mask_t srcTracksMask, mask_t srcClustersMask, bool useMC, std::shared_ptr<o2::steer::MCKinematicsReader> kineReader)
+DataProcessorSpec getEfficiencyStudy(mask_t srcTracksMask, mask_t srcClustersMask, bool useMC, std::shared_ptr<o2::steer::MCKinematicsReader> kineReader, bool itsStag)
 {
   std::vector<OutputSpec> outputs;
   auto dataRequest = std::make_shared<DataRequest>();
+  dataRequest->setITSPerLayer(itsStag);
   dataRequest->requestTracks(srcTracksMask, useMC);
   dataRequest->requestClusters(srcClustersMask, useMC);