ITS3: macro fixes

Signed-off-by: Felix Schlepper <[email protected]>

Author: f3sch

Detectors/Upgrades/ITS3/macros/test/CheckClusterSize.C

@@ -43,6 +43,7 @@
 #include "SimulationDataFormat/MCCompLabel.h"
 #include "SimulationDataFormat/MCEventHeader.h"
 #include "SimulationDataFormat/MCTrack.h"
+#include "ITS3Base/SpecsV2.h"
 #endif
 #define ENABLE_UPGRADES
 #include "SimulationDataFormat/MCTruthContainer.h"
@@ -65,7 +66,11 @@ void checkFile(const std::unique_ptr<TFile>& file);
 
 inline auto hist_map(unsigned short id)
 {
-  return std::clamp(id, static_cast<unsigned short>(0), static_cast<unsigned short>(6)) / 2;
+  int lay = o2::its3::constants::detID::getDetID2Layer<int>(id);
+  if (lay == -1) {
+    return nLayers - 1;
+  }
+  return lay;
 }
 
 void CheckClusterSize(std::string clusFileName = "o2clus_its.root",
@@ -133,7 +138,7 @@ void CheckClusterSize(std::string clusFileName = "o2clus_its.root",
   std::vector<TH2D> hOtherSecondaryEta;
   std::vector<TH2D> hOtherSecondaryPt;
   std::vector<TH2D> hOtherSecondaryPhi;
-  for (int i = 0; i < 4; ++i) {
+  for (int i = 0; i < nLayers; ++i) {
     hPrimary.emplace_back(Form("primary/L%d", i), Form("L%d Primary Cluster Size", i), maxClusterSize, 0, maxClusterSize);
     hPrimaryEta.emplace_back(Form("primary/EtaL%d", i), Form("L%d Primary Cluster Size vs Eta", i), maxClusterSize, 0, maxClusterSize, 100, -3.0, 3.0);
     hPrimaryPt.emplace_back(Form("primary/Pt%d", i), Form("L%d Primary Cluster Size vs Pt", i), maxClusterSize, 0, maxClusterSize, 100, 0.0, 10.0);
@@ -238,14 +243,15 @@ void CheckClusterSize(std::string clusFileName = "o2clus_its.root",
   int nROFRec = (int)rofRecVec.size();
   auto pattIt = patternsPtr->cbegin();
 
+  int cInvalid{0}, cGood{0};
   for (int irof = 0; irof < nROFRec; irof++) {
     const auto& rofRec = rofRecVec[irof];
-    // rofRec.print();
+    /*rofRec.print();*/
 
     for (int icl = 0; icl < rofRec.getNEntries(); icl++) {
       int clEntry = rofRec.getFirstEntry() + icl;
       const auto& cluster = clusArr[clEntry];
-      // cluster.print();
+      /*cluster.print();*/
 
       auto pattId = cluster.getPatternID();
       auto id = cluster.getSensorID();
@@ -260,13 +266,15 @@ void CheckClusterSize(std::string clusFileName = "o2clus_its.root",
 
       const auto& label = (clusLabArr->getLabels(clEntry))[0];
       if (!label.isValid() || label.getSourceID() != 0 || !label.isCorrect()) {
+        ++cInvalid;
         continue;
       }
+      ++cGood;
 
       const int trackID = label.getTrackID();
       int evID = label.getEventID();
       const auto& pInfo = info[evID][trackID];
-      if (id > 6) {
+      if (!o2::its3::constants::detID::isDetITS3(id)) {
         hOuterBarrel.Fill(clusterSize);
       }
 
@@ -332,6 +340,7 @@ void CheckClusterSize(std::string clusFileName = "o2clus_its.root",
       }
     }
   }
+  std::cout << "Good labels: " << cGood << "; invalid: " << cInvalid << '\n';
   std::cout << "Done measuring cluster sizes:" << std::endl;
   for (int i = 0; i < nLayers; ++i) {
     std::cout << "* Layer " << i << ":\n";

Detectors/Upgrades/ITS3/macros/test/CheckClustersITS3.C

@@ -57,7 +57,8 @@ void CheckClustersITS3(const std::string& clusfile = "o2clus_its.root",
   using ROFRec = o2::itsmft::ROFRecord;
   using MC2ROF = o2::itsmft::MC2ROFRecord;
   using HitVec = std::vector<Hit>;
-  using MC2HITS_map = std::unordered_map<uint64_t, int>; // maps (track_ID<<16 + chip_ID) to entry in the hit vector
+  using MC2HITS_map = std::unordered_map<uint64_t, int>; // maps (track_ID<<32 + chip_ID) to entry in the hit vector
+  std::array<SuperSegmentation, 3> mSuperSegmentations{0, 1, 2};
 
   std::vector<HitVec*> hitVecPool;
   std::vector<MC2HITS_map> mc2hitVec;
@@ -234,10 +235,10 @@ void CheckClustersITS3(const std::string& clusfile = "o2clus_its.root",
       } else {
         // compare in local flat coordinates
         float xFlatEnd{0.}, yFlatEnd{0.};
-        o2::its3::SuperSegmentations[layer].curvedToFlat(locH.X(), locH.Y(), xFlatEnd, yFlatEnd);
+        mSuperSegmentations[layer].curvedToFlat(locH.X(), locH.Y(), xFlatEnd, yFlatEnd);
         locH.SetXYZ(xFlatEnd, yFlatEnd, locH.Z());
         float xFlatSta{0.}, yFlatSta{0.};
-        o2::its3::SuperSegmentations[layer].curvedToFlat(locHsta.X(), locHsta.Y(), xFlatSta, yFlatSta);
+        mSuperSegmentations[layer].curvedToFlat(locHsta.X(), locHsta.Y(), xFlatSta, yFlatSta);
         locHsta.SetXYZ(xFlatSta, yFlatSta, locHsta.Z());
         // recalculate x/y in flat
         // x0 = xFlatSta, dltx = xFlatEnd - x0;
@@ -248,7 +249,7 @@ void CheckClustersITS3(const std::string& clusfile = "o2clus_its.root",
         // not really precise, but okish
         locH.SetXYZ(0.5f * (locH.X() + locHsta.X()), 0.5f * (locH.Y() + locHsta.Y()), 0.5f * (locH.Z() + locHsta.Z()));
 
-        o2::its3::SuperSegmentations[layer].curvedToFlat(locC.X(), locC.Y(), xFlatSta, yFlatSta);
+        mSuperSegmentations[layer].curvedToFlat(locC.X(), locC.Y(), xFlatSta, yFlatSta);
         locC.SetXYZ(xFlatSta, yFlatSta, locC.Z());
       }
 

Detectors/Upgrades/ITS3/macros/test/CompareClustersAndDigits.C

@@ -126,9 +126,9 @@ void CompareClustersAndDigits(std::string clusfile = "o2clus_it3.root",
   TFile fileC(clusfile.data());
   auto* clusTree = dynamic_cast<TTree*>(fileC.Get("o2sim"));
   std::vector<CompClusterExt>* clusArr = nullptr;
-  clusTree->SetBranchAddress("IT3ClusterComp", &clusArr);
+  clusTree->SetBranchAddress("ITSClusterComp", &clusArr);
   std::vector<unsigned char>* patternsPtr = nullptr;
-  auto pattBranch = clusTree->GetBranch("IT3ClusterPatt");
+  auto pattBranch = clusTree->GetBranch("ITSClusterPatt");
   if (pattBranch != nullptr) {
     pattBranch->SetAddress(&patternsPtr);
   }
@@ -146,14 +146,14 @@ void CompareClustersAndDigits(std::string clusfile = "o2clus_it3.root",
 
   // ROFrecords
   std::vector<ROFRec> rofRecVec, *rofRecVecP = &rofRecVec;
-  clusTree->SetBranchAddress("IT3ClustersROF", &rofRecVecP);
+  clusTree->SetBranchAddress("ITSClustersROF", &rofRecVecP);
 
   // Cluster MC labels
   o2::dataformats::MCTruthContainer<o2::MCCompLabel>* clusLabArr = nullptr;
   std::vector<MC2ROF> mc2rofVec, *mc2rofVecP = &mc2rofVec;
-  if ((hitTree != nullptr) && (clusTree->GetBranch("IT3ClusterMCTruth") != nullptr)) {
-    clusTree->SetBranchAddress("IT3ClusterMCTruth", &clusLabArr);
-    clusTree->SetBranchAddress("IT3ClustersMC2ROF", &mc2rofVecP);
+  if ((hitTree != nullptr) && (clusTree->GetBranch("ITSClusterMCTruth") != nullptr)) {
+    clusTree->SetBranchAddress("ITSClusterMCTruth", &clusLabArr);
+    clusTree->SetBranchAddress("ITSClustersMC2ROF", &mc2rofVecP);
   }
 
   clusTree->GetEntry(0);
@@ -340,8 +340,8 @@ void CompareClustersAndDigits(std::string clusfile = "o2clus_it3.root",
     }
     auto& dat = data[iChip];
     gFile->cd();
-    /* auto path = gman->getMatrixPath(iChip); */
-    TString path; // TODO wrong use above
+    auto path = gman->getMatrixPath(iChip);
+    /*TString path; // TODO wrong use above*/
     const std::string cpath{path.Data() + 39, path.Data() + path.Length()};
     const std::filesystem::path p{cpath};
     if (oFile->mkdir(p.parent_path().c_str(), "", true) == nullptr) {