Remove subdetID and geometry instance from Clusterer class

Author: Marcello Di Costanzo

Detectors/Upgrades/ALICE3/IOTOF/DataFormatsIOTOF/include/DataFormatsIOTOF/Cluster.h

@@ -24,7 +24,6 @@ struct Cluster {
   uint16_t row = 0;
   uint16_t col = 0;
   uint16_t size = 1;
-  int16_t subDetID = -1;
   double time = 0.0;
 
   std::string asString() const;

Detectors/Upgrades/ALICE3/IOTOF/DataFormatsIOTOF/src/Cluster.cxx

@@ -20,8 +20,7 @@ namespace o2::iotof
 std::string Cluster::asString() const
 {
   std::ostringstream stream;
-  stream << "chip=" << chipID << " row=" << row << " col=" << col
-          << " size=" << size << " subDet=" << subDetID;
+  stream << "chip=" << chipID << " row=" << row << " col=" << col << " size=" << size;
   return stream.str();
 }
 

Detectors/Upgrades/ALICE3/IOTOF/macros/CheckClustersIOTOF.C

@@ -94,7 +94,7 @@ void CheckClustersIOTOF(std::string digiFilePath = "tf3digits.root", std::string
   std::cout << "---> Number of clusters with MC label: " << clsLabels->getIndexedSize() << std::endl;
   std::cout << std::endl;
 
-  auto clsTuple = new TNtuple("clsTuple", "clsTuple", "chip_id:x:y:z:subdet_id:row:col:time");
+  auto clsTuple = new TNtuple("clsTuple", "clsTuple", "chip_id:x:y:z:row:col:time");
   clsTuple->SetDirectory(nullptr);
 
   TH1F* histXCoordCls = new TH1F("histXCoordCls", "histXCoordCls", 8000, -100, 100);
@@ -176,7 +176,6 @@ void CheckClustersIOTOF(std::string digiFilePath = "tf3digits.root", std::string
                      globalClsCoords.x(),
                      globalClsCoords.y(),
                      globalClsCoords.z(),
-                     (*clsArray)[iCls].subDetID,
                      (*clsArray)[iCls].row,
                      (*clsArray)[iCls].col,
                      (*clsArray)[iCls].time);

Detectors/Upgrades/ALICE3/IOTOF/reconstruction/include/IOTOFReconstruction/Clusterer.h

@@ -63,12 +63,10 @@ class Clusterer
 
     void fetchMCLabels(uint32_t digID, const ConstDigitTruth* labelsDig, int& nfilled);
     void finishChipSingleHitFast(gsl::span<const Digit> digits, uint32_t digitIdx,
-                                 const ConstDigitTruth* labelsDigPtr, ClusterTruth* labelsClusPtr,
-                                 GeometryTGeo* geom);
+                                 const ConstDigitTruth* labelsDigPtr, ClusterTruth* labelsClusPtr);
     void processChip(gsl::span<const Digit> digits, int chipFirst, int chipN,
                      std::vector<Cluster>* clustersOut, std::vector<unsigned char>* patternsOut,
-                     const ConstDigitTruth* labelsDigPtr, ClusterTruth* labelsClusPtr,
-                     GeometryTGeo* geom);
+                     const ConstDigitTruth* labelsDigPtr, ClusterTruth* labelsClusPtr);
 
     explicit ClustererThread(Clusterer* par = nullptr) : parent(par) {}
     ClustererThread(const ClustererThread&) = delete;

Detectors/Upgrades/ALICE3/IOTOF/reconstruction/src/Clusterer.cxx

@@ -12,9 +12,9 @@
 /// \file Clusterer.cxx
 /// \brief Implementation of the IOTOF cluster finder
 
+#include "Framework/Logger.h"
+
 #include "IOTOFReconstruction/Clusterer.h"
-#include "IOTOFBase/GeometryTGeo.h"
-#include "IOTOFSimulation/Segmentation.h"
 
 #include <algorithm>
 #include <numeric>
@@ -33,14 +33,12 @@ void Clusterer::process(gsl::span<const Digit> digits,
                         gsl::span<const DigMC2ROFRecord> digMC2ROFs,
                         std::vector<o2::itsmft::MC2ROFRecord>* clusterMC2ROFs)
 {
-  LOG(info) << "Clusterizing " << digitROFs.size() << " ROFs, total digits: " << digits.size();
+  LOG(info) << "Running clusterizer on " << digitROFs.size() << " ROFs, total digits: " << digits.size();
 
   if (!mThread) {
     mThread = std::make_unique<ClustererThread>(this);
   }
 
-  auto* geom = o2::iotof::GeometryTGeo::Instance();
-
   for (size_t iROF = 0; iROF < digitROFs.size(); ++iROF) {
     LOG(debug) << "Processing digit ROF " << iROF << "/" << digitROFs.size();
     const auto& inROF = digitROFs[iROF];
@@ -82,7 +80,7 @@ void Clusterer::process(gsl::span<const Digit> digits,
       const int chipN = sliceStart - chipFirst;
 
       LOG(debug) << "Processing chip " << chipID << " with " << chipN << " digits, next chip start from index " << sliceStart;
-      mThread->processChip(digits, chipFirst, chipN, &clusters, &patterns, digitLabels, clusterLabels, geom);
+      mThread->processChip(digits, chipFirst, chipN, &clusters, &patterns, digitLabels, clusterLabels);
     }
 
     LOG(debug) << "Finished processing digit ROF " << iROF << ", produced " << (clusters.size() - outFirst) << " clusters";
@@ -105,8 +103,7 @@ void Clusterer::ClustererThread::processChip(gsl::span<const Digit> digits,
                                              std::vector<Cluster>* clustersOut,
                                              std::vector<unsigned char>* patternsOut,
                                              const ConstDigitTruth* labelsDigPtr,
-                                             ClusterTruth* labelsClusPtr,
-                                             GeometryTGeo* geom)
+                                             ClusterTruth* labelsClusPtr)
 {
   // chipFirst and chipN are relative to mSortIdx (i.e. mSortIdx[chipFirst..chipFirst+chipN-1]
   // are the global digit indices for this chip, already sorted by col then row).
@@ -117,13 +114,13 @@ void Clusterer::ClustererThread::processChip(gsl::span<const Digit> digits,
   // are handled with a preclusterer. TF3 still does not have per-ROF readout, so we 
   // use finishChipSingleHitFast on all hits for now.
   for (auto i = 0; i < chipN; ++i) {
-    finishChipSingleHitFast(digits, sortIdx[chipFirst + i], labelsDigPtr, labelsClusPtr, geom);
+    finishChipSingleHitFast(digits, sortIdx[chipFirst + i], labelsDigPtr, labelsClusPtr);
   }
 
   // // TRK logic for per-ROF readout, not used for TF3 yet.
   // if (chipN == 1) {
   //   LOG(debug) << "Processing single hit chip";
-  //   finishChipSingleHitFast(digits, sortIdx[chipFirst], labelsDigPtr, labelsClusPtr, geom);
+  //   finishChipSingleHitFast(digits, sortIdx[chipFirst], labelsDigPtr, labelsClusPtr);
   // } else {
   //   LOG(debug) << "Processing multi-hit chip with " << chipN << " hits";
   //   // Call to initChip()
@@ -151,8 +148,7 @@ void Clusterer::ClustererThread::processChip(gsl::span<const Digit> digits,
 void Clusterer::ClustererThread::finishChipSingleHitFast(gsl::span<const Digit> digits,
                                                          uint32_t digitIdx,
                                                          const ConstDigitTruth* labelsDigPtr,
-                                                         ClusterTruth* labelsClusPtr,
-                                                         GeometryTGeo* geom)
+                                                         ClusterTruth* labelsClusPtr)
 {
   const auto& digit = digits[digitIdx];
   const uint16_t chipID = digit.getChipIndex();
@@ -179,9 +175,6 @@ void Clusterer::ClustererThread::finishChipSingleHitFast(gsl::span<const Digit>
   cluster.row = row;
   cluster.col = col;
   cluster.size = 1;
-  if (geom) {
-    cluster.subDetID = geom->getIOTOFLayer(chipID);
-  }
   cluster.time = time;
   clusters.emplace_back(cluster);
 }

Detectors/Upgrades/ALICE3/IOTOF/workflow/src/ClustererSpec.cxx

@@ -90,7 +90,6 @@ o2::framework::DataProcessorSpec getClustererSpec(bool useMC)
   if (useMC) {
     inputs.emplace_back(std::format("labels_{}", iLayer), "TF3", "DIGITSMCTR", iLayer, o2::framework::Lifetime::Timeframe);
   }
-  LOG(debug) << "Created " << inputs.size() << " input specifications for IOTOFClusterer";
 
   std::vector<o2::framework::OutputSpec> outputs;
   outputs.emplace_back("TF3", "COMPCLUSTERS", iLayer, o2::framework::Lifetime::Timeframe);
@@ -99,7 +98,6 @@ o2::framework::DataProcessorSpec getClustererSpec(bool useMC)
   if (useMC) {
     outputs.emplace_back("TF3", "CLUSTERSMCTR", iLayer, o2::framework::Lifetime::Timeframe);
   }
-  LOG(debug) << "Created " << outputs.size() << " output specifications for IOTOFClusterer";
 
   return o2::framework::DataProcessorSpec{
     "iotof-clusterer",

Detectors/Upgrades/ALICE3/IOTOF/workflow/src/RecoWorkflow.cxx

@@ -29,20 +29,16 @@ framework::WorkflowSpec getWorkflow(bool useMC,
   framework::WorkflowSpec specs;
 
   if (!(upstreamDigits || upstreamClusters)) {
-    LOG(debug) << "Adding DigitReaderSpec to workflow";
     specs.emplace_back(o2::iotof::getIOTOFDigitReaderSpec(useMC, false, "tf3digits.root"));
   }
   if (!upstreamClusters) {
-    LOG(debug) << "Adding ClustererSpec to workflow";
     specs.emplace_back(o2::iotof::getIOTOFClustererSpec(useMC));
   }
 
   if (!disableRootOutput) {
-    LOG(debug) << "Adding ClusterWriterSpec to workflow";
     specs.emplace_back(o2::iotof::getIOTOFClusterWriterSpec(useMC, false));
   }
 
-  LOG(debug) << "Starting execution with " << specs.size() << " workflow specifications";
   return specs;
 }
 

Detectors/Upgrades/ALICE3/IOTOF/workflow/src/iotof-reco-workflow.cxx

@@ -64,7 +64,6 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
 
 o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext const& configcontext)
 {
-  LOG(debug) << "Entering iotof-reco-workflow";
   // Update the (declared) parameters if changed from the command line
   auto useMC = !configcontext.options().get<bool>("disable-mc");
   // auto hitRecoConfig = configcontext.options().get<std::string>("tracking-from-hits-config");
@@ -78,6 +77,5 @@ o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext co
   // write the configuration used for the reco workflow
   o2::conf::ConfigurableParam::writeINI("o2tf3recoflow_configuration.ini");
 
-  LOG(debug) << "Calling o2::iotof::reco_workflow::getWorkflow";
   return o2::iotof::reco_workflow::getWorkflow(useMC, /*hitRecoConfig,*/ extDigits, extClusters, disableRootOutput /*, useGpuWF, gpuDevice*/);
 }