Merge pull request #7 from GiorgioAlbertoLucia/iotofdigi

maciacco · web-flow · commit fecf36377a1b · 2026-05-22T18:08:13.000+02:00
developing digitizer, added chips
diff --git a/Detectors/Upgrades/ALICE3/IOTOF/DataFormatsIOTOF/include/DataFormatsIOTOF/Digit.h b/Detectors/Upgrades/ALICE3/IOTOF/DataFormatsIOTOF/include/DataFormatsIOTOF/Digit.h
@@ -37,6 +37,11 @@ class Digit : public o2::itsmft::Digit
   // Getters
   double getTime() const { return mTime; }
 
+  static UInt_t getOrderingKey(UShort_t chipindex, UShort_t row, UShort_t col)
+  {
+    return (static_cast<UInt_t>(chipindex) << 16) | (static_cast<UInt_t>(row) << 8) | static_cast<UInt_t>(col);
+  }
+
  private:
   double mTime = 0.; ///< Measured time (ns)
   ClassDefNV(Digit, 1);
diff --git a/Detectors/Upgrades/ALICE3/IOTOF/base/include/IOTOFBase/GeometryTGeo.h b/Detectors/Upgrades/ALICE3/IOTOF/base/include/IOTOFBase/GeometryTGeo.h
@@ -33,25 +33,29 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache
   static const char* getIOTOFVolPattern() { return sIOTOFVolumeName.c_str(); }
 
   // Inner TOF
+  const int getITOFNumberOfChips() { return mNumberOfChipsIOTOF[0]; }
   static const char* getITOFLayerPattern() { return sITOFLayerName.c_str(); }
   static const char* getITOFStavePattern() { return sITOFStaveName.c_str(); }
   static const char* getITOFModulePattern() { return sITOFModuleName.c_str(); }
   static const char* getITOFChipPattern() { return sITOFChipName.c_str(); }
   static const char* getITOFSensorPattern() { return sITOFSensorName.c_str(); }
 
   // Outer TOF
+  const int getOTOFNumberOfChips() { return mNumberOfChipsIOTOF[1]; }
   static const char* getOTOFLayerPattern() { return sOTOFLayerName.c_str(); }
   static const char* getOTOFStavePattern() { return sOTOFStaveName.c_str(); }
   static const char* getOTOFModulePattern() { return sOTOFModuleName.c_str(); }
   static const char* getOTOFChipPattern() { return sOTOFChipName.c_str(); }
   static const char* getOTOFSensorPattern() { return sOTOFSensorName.c_str(); }
 
   // Forward TOF
+  const int getFTOFNumberOfChips() { return mNumberOfChipsFTOF; }
   static const char* getFTOFLayerPattern() { return sFTOFLayerName.c_str(); }
   static const char* getFTOFChipPattern() { return sFTOFChipName.c_str(); }
   static const char* getFTOFSensorPattern() { return sFTOFSensorName.c_str(); }
 
   // Backward TOF
+  const int getBTOFNumberOfChips() { return mNumberOfChipsBTOF; }
   static const char* getBTOFLayerPattern() { return sBTOFLayerName.c_str(); }
   static const char* getBTOFChipPattern() { return sBTOFChipName.c_str(); }
   static const char* getBTOFSensorPattern() { return sBTOFSensorName.c_str(); }
diff --git a/Detectors/Upgrades/ALICE3/IOTOF/base/src/GeometryTGeo.cxx b/Detectors/Upgrades/ALICE3/IOTOF/base/src/GeometryTGeo.cxx
@@ -273,6 +273,8 @@ void GeometryTGeo::fillMatrixCache(int mask)
     return;
   }
 
+  LOG(debug) << "Filling matrix cache for " << getName() << " with mask " << mask;
+
   if ((mask & o2::math_utils::bit2Mask(o2::math_utils::TransformType::L2G)) && !getCacheL2G().isFilled()) {
     // Matrices for Local (Sensor!!! rather than the full chip) to Global frame transformation
     LOG(info) << "Loading " << getName() << " L2G matrices from TGeo; there are " << mSize << " matrices";
diff --git a/Detectors/Upgrades/ALICE3/IOTOF/simulation/src/Digitizer.cxx b/Detectors/Upgrades/ALICE3/IOTOF/simulation/src/Digitizer.cxx
@@ -107,7 +107,7 @@ void Digitizer::processHit(const o2::itsmft::Hit& hit, int evID, int srcID)
   uint16_t chipIndex = static_cast<uint16_t>(detID);
 
   if (detID > mGeometry->getSize() || mGeometry->getSize() < 1) {
-    LOG(debug) << "Invalid detector ID: " << detID;
+    LOG(debug) << "Invalid detector ID: " << detID << ", geometry size: " << mGeometry->getSize();
     return; // invalid detector ID
   }
   const auto& matrix = mGeometry->getMatrixL2G(hit.GetDetectorID());
diff --git a/Detectors/Upgrades/ALICE3/IOTOF/workflow/src/DigitWriterSpec.cxx b/Detectors/Upgrades/ALICE3/IOTOF/workflow/src/DigitWriterSpec.cxx
@@ -13,7 +13,7 @@
 
 #include "IOTOFWorkflow/DigitWriterSpec.h"
 #include "DPLUtils/MakeRootTreeWriterSpec.h"
-#include "DataFormatsITSMFT/Digit.h"
+#include "DataFormatsIOTOF/Digit.h"
 #include "DataFormatsITSMFT/GBTCalibData.h"
 #include "Headers/DataHeader.h"
 #include "DetectorsCommonDataFormats/DetID.h"
@@ -45,7 +45,7 @@ DataProcessorSpec getDigitWriterSpec(bool mctruth, bool dec, bool calib, o2::hea
   std::string detStrL = dec ? "o2_" : ""; // for decoded digits prepend by o2
   detStrL += detStr;
   std::transform(detStrL.begin(), detStrL.end(), detStrL.begin(), ::tolower);
-  auto logger = [](std::vector<o2::itsmft::Digit> const& inDigits) {
+  auto logger = [](std::vector<o2::iotof::Digit> const& inDigits) {
     LOG(info) << "RECEIVED DIGITS SIZE " << inDigits.size();
   };
 
@@ -85,20 +85,21 @@ DataProcessorSpec getDigitWriterSpec(bool mctruth, bool dec, bool calib, o2::hea
                                 MakeRootTreeWriterSpec::TreeAttributes{"o2sim", "Digits tree"},
                                 MakeRootTreeWriterSpec::CustomClose(finishWriting),
                                 // in case of labels we first read them as std::vector<char> and process them correctly in the fillLabels hook
-                                BranchDefinition<std::vector<char>>{InputSpec{"digitsMCTR", detOrig, "DIGITSMCTR", 0},
-                                                                    (detStr + "DigitMCTruth").c_str(),
-                                                                    (mctruth ? 1 : 0), fillLabels},
-                                BranchDefinition<std::vector<itsmft::MC2ROFRecord>>{InputSpec{"digitsMC2ROF", detOrig, "DIGITSMC2ROF", 0},
-                                                                                    (detStr + "DigitMC2ROF").c_str(),
-                                                                                    (mctruth ? 1 : 0)},
-                                BranchDefinition<std::vector<itsmft::Digit>>{InputSpec{"digits", detOrig, "DIGITS", 0},
+                                //BranchDefinition<std::vector<char>>{InputSpec{"digitsMCTR", detOrig, "DIGITSMCTR", 0},
+                                //                                    (detStr + "DigitMCTruth").c_str(),
+                                //                                    (mctruth ? 1 : 0), fillLabels},
+                                //BranchDefinition<std::vector<itsmft::MC2ROFRecord>>{InputSpec{"digitsMC2ROF", detOrig, "DIGITSMC2ROF", 0},
+                                //                                                    (detStr + "DigitMC2ROF").c_str(),
+                                //                                                    (mctruth ? 1 : 0)},
+                                BranchDefinition<std::vector<iotof::Digit>>{InputSpec{"digits", detOrig, "DIGITS", 0},
                                                                              (detStr + "Digit").c_str(),
-                                                                             logger},
+                                                                             logger} //,
                                 // BranchDefinition<std::vector<itsmft::GBTCalibData>>{InputSpec{"calib", detOrig, "GBTCALIB", 0},
                                 //                                                     (detStr + "Calib").c_str(),
                                 //                                                     (calib ? 1 : 0)},
-                                BranchDefinition<std::vector<itsmft::ROFRecord>>{InputSpec{"digitsROF", detOrig, "DIGITSROF", 0},
-                                                                                 (detStr + "DigitROF").c_str()})();
+                                //BranchDefinition<std::vector<itsmft::ROFRecord>>{InputSpec{"digitsROF", detOrig, "DIGITSROF", 0},
+                                //                                                 (detStr + "DigitROF").c_str()}
+                                )();
 }
 
 DataProcessorSpec getIOTOFDigitWriterSpec(bool mctruth, bool dec, bool calib)
diff --git a/Steer/DigitizerWorkflow/src/IOTOFDigitizerSpec.cxx b/Steer/DigitizerWorkflow/src/IOTOFDigitizerSpec.cxx
@@ -29,6 +29,7 @@
 #include "IOTOFSimulation/Digitizer.h"
 #include "Headers/DataHeader.h"
 #include "IOTOFBase/GeometryTGeo.h"
+#include "IOTOFBase/IOTOFBaseParam.h"
 
 #include <TChain.h>
 #include <TStopwatch.h>
@@ -53,8 +54,10 @@ class IOTOFDPLDigitizerTask : o2::base::BaseDPLDigitizer
   void initDigitizerTask(framework::InitContext& ic) override
   {
     mDisableQED = ic.options().get<bool>("disable-qed");
+    
     auto geom = GeometryTGeo::Instance();
     geom->fillMatrixCache(o2::math_utils::bit2Mask(o2::math_utils::TransformType::L2G)); // make sure L2G matrices are loaded
+
     mDigitizer.setGeometry(geom);
     mDigitizer.setChargeThreshold(-1000.f);
     mDigitizer.init();
@@ -85,8 +88,6 @@ class IOTOFDPLDigitizerTask : o2::base::BaseDPLDigitizer
     timer.Start();
     LOG(info) << " CALLING TF3 DIGITIZATION ";
 
-    uint64_t nDigits{0};
-
     mDigitizer.setDigits(&mDigits);
     mDigitizer.setROFRecords(&mROFRecords);
     if (mWithMCTruth) {
@@ -111,7 +112,7 @@ class IOTOFDPLDigitizerTask : o2::base::BaseDPLDigitizer
         context->retrieveHits(mSimChains, o2::detectors::SimTraits::DETECTORBRANCHNAMES[mID][0].c_str(), part.sourceID, part.entryID, &mHits);
 
         if (mHits.size() > 0) {
-          mDigits.clear();
+          //mDigits.clear();
           if (mWithMCTruth) {
             mLabels.clear();
           }
@@ -122,26 +123,31 @@ class IOTOFDPLDigitizerTask : o2::base::BaseDPLDigitizer
       }
     }
     if (mDigitizer.isContinuous()) {
-      mDigits.clear();
+      //mDigits.clear();
       if (mWithMCTruth) {
         mLabels.clear();
       }
       mDigitizer.fillOutputContainer();
     }
 
+    for (int iDigit = 0; iDigit < mDigits.size(); iDigit++) {
+      mROFRecords.emplace_back();
+    }
+
     // here we have all digits and we can send them to consumer (aka snapshot it onto output)
+
+    LOG(debug) << "Digitization finished with " << mDigits.size() << " digits and " << mROFRecords.size() << " ROF records";
     pc.outputs().snapshot(Output{mOrigin, "DIGITS", 0}, mDigits);
-    pc.outputs().snapshot(Output{mOrigin, "DIGITSROF"}, mROFRecords);
+    //pc.outputs().snapshot(Output{mOrigin, "DIGITSROF", 0}, mROFRecords);
     if (mWithMCTruth) {
       //
     }
 
     LOG(info) << mID.getName() << ": Sending ROMode= " << mROMode << " to GRPUpdater";
-    pc.outputs().snapshot(Output{mOrigin, "ROMode", 0}, mROMode);
+    //pc.outputs().snapshot(Output{mOrigin, "ROMode", 0}, mROMode);
 
     timer.Stop();
     LOG(info) << "Digitization took " << timer.CpuTime() << "s";
-    LOG(info) << "Produced " << nDigits << " digits";
 
     // we should be only called once; tell DPL that this process is ready to exit
     pc.services().get<ControlService>().readyToQuit(QuitRequest::Me);

Original file line number	Diff line number	Diff line change
`@@ -273,6 +273,8 @@ void GeometryTGeo::fillMatrixCache(int mask)`
`273`	`273`	`return;`
`274`	`274`	`}`
`275`	`275`
	`276`	`+ LOG(debug) << "Filling matrix cache for " << getName() << " with mask " << mask;`
	`277`	`+`
`276`	`278`	`if ((mask & o2::math_utils::bit2Mask(o2::math_utils::TransformType::L2G)) && !getCacheL2G().isFilled()) {`
`277`	`279`	`// Matrices for Local (Sensor!!! rather than the full chip) to Global frame transformation`
`278`	`280`	`LOG(info) << "Loading " << getName() << " L2G matrices from TGeo; there are " << mSize << " matrices";`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ void Digitizer::processHit(const o2::itsmft::Hit& hit, int evID, int srcID)`
`107`	`107`	`uint16_t chipIndex = static_cast<uint16_t>(detID);`
`108`	`108`
`109`	`109`	`if (detID > mGeometry->getSize() \|\| mGeometry->getSize() < 1) {`
`110`		`- LOG(debug) << "Invalid detector ID: " << detID;`
	`110`	`+ LOG(debug) << "Invalid detector ID: " << detID << ", geometry size: " << mGeometry->getSize();`
`111`	`111`	`return; // invalid detector ID`
`112`	`112`	`}`
`113`	`113`	`const auto& matrix = mGeometry->getMatrixL2G(hit.GetDetectorID());`