ITS: Improve CheckClusters.C, mv CheckTopologies.C

Author: mconcas

Detectors/ITSMFT/ITS/macros/test/CMakeLists.txt

@@ -33,7 +33,7 @@ o2_add_test_root_macro(CheckDigits.C
 #                                             O2::DataFormatsITSMFT
 #                       LABELS its)
 
-o2_add_test_root_macro(CheckTopologies.C
+o2_add_test_root_macro(CreateDictionaries.C
                        PUBLIC_LINK_LIBRARIES O2::MathUtils
                                              O2::ITSBase
                                              O2::ITSMFTReconstruction

Detectors/ITSMFT/ITS/macros/test/CheckClusters.C

@@ -1,4 +1,4 @@
-/// \file CheckDigits.C
+/// \file CheckClusters.C
 /// \brief Simple macro to check ITSU clusters
 
 #if !defined(__CLING__) || defined(__ROOTCLING__)
@@ -43,7 +43,7 @@ void CheckClusters(std::string clusfile = "o2clus_its.root", std::string hitfile
   std::vector<MC2HITS_map> mc2hitVec;
 
   TFile fout("CheckClusters.root", "recreate");
-  TNtuple nt("ntc", "cluster ntuple", "ev:lab:hlx:hlz:tx:tz:cgx:cgy:cgz:dx:dy:dz:rof:npx:id");
+  TNtuple nt("ntc", "cluster ntuple", "ev:lab:hlx:hlz:tx:tz:cgx:cgy:cgz:dx:dy:dz:ex:ez:rof:npx:id");
 
   // Geometry
   o2::base::GeometryManager::loadGeometry(inputGeom);
@@ -147,6 +147,8 @@ void CheckClusters(std::string clusfile = "o2clus_its.root", std::string hitfile
 
       const auto& cluster = (*clusArr)[clEntry];
 
+      float errX{0.f};
+      float errZ{0.f};
       int npix = 0;
       auto pattID = cluster.getPatternID();
       o2::math_utils::Point3D<float> locC;
@@ -155,6 +157,8 @@ void CheckClusters(std::string clusfile = "o2clus_its.root", std::string hitfile
         locC = dict.getClusterCoordinates(cluster, patt, false);
       } else {
         locC = dict.getClusterCoordinates(cluster);
+        errX = dict.getErrX(pattID);
+        errZ = dict.getErrZ(pattID);
         npix = dict.getNpixels(pattID);
       }
       auto chipID = cluster.getSensorID();
@@ -191,11 +195,13 @@ void CheckClusters(std::string clusfile = "o2clus_its.root", std::string hitfile
       auto r = (0.5 * (Segmentation::SensorLayerThickness - Segmentation::SensorLayerThicknessEff) - y0) / dlty;
       locH.SetXYZ(x0 + r * dltx, y0 + r * dlty, z0 + r * dltz);
       //locH.SetXYZ(0.5 * (locH.X() + locHsta.X()), 0.5 * (locH.Y() + locHsta.Y()), 0.5 * (locH.Z() + locHsta.Z()));
-      nt.Fill(lab.getEventID(), trID,
-              locH.X(), locH.Z(), dltx / dlty, dltz / dlty,
-              gloC.X(), gloC.Y(), gloC.Z(),
-              locC.X() - locH.X(), locC.Y() - locH.Y(), locC.Z() - locH.Z(),
-              rofRec.getROFrame(), npix, chipID);
+      std::array<float, 17> data = {(float)lab.getEventID(), (float)trID,
+                                    locH.X(), locH.Z(), dltx / dlty, dltz / dlty,
+                                    gloC.X(), gloC.Y(), gloC.Z(),
+                                    locC.X() - locH.X(), locC.Y() - locH.Y(), locC.Z() - locH.Z(),
+                                    errX, errZ,
+                                    (float)rofRec.getROFrame(), (float)npix, (float)chipID};
+      nt.Fill(data.data());
     }
   }
 
@@ -205,6 +211,14 @@ void CheckClusters(std::string clusfile = "o2clus_its.root", std::string hitfile
   nt.Draw("dz:dx", "abs(dz)<0.01 && abs(dx)<0.01");
   new TCanvas;
   nt.Draw("dz:tz", "abs(dz)<0.005 && abs(tz)<2");
+  auto c1 = new TCanvas("p1","pullX");
+  c1->cd();
+  c1->SetLogy();
+  nt.Draw("dx/ex", "abs(dx/ex)<10");
+  auto c2 = new TCanvas("p2","pullZ");
+  c2->cd();
+  c2->SetLogy();
+  nt.Draw("dz/ez", "abs(dz/ez)<10");
   fout.cd();
   nt.Write();
 }

…ITSMFT/ITS/macros/test/CheckTopologies.C …MFT/ITS/macros/test/CreateDictionaries.CDetectors/ITSMFT/ITS/macros/test/CheckTopologies.C renamed to Detectors/ITSMFT/ITS/macros/test/CreateDictionaries.C Detectors/ITSMFT/ITS/macros/test/CheckTopologies.C renamed to Detectors/ITSMFT/ITS/macros/test/CreateDictionaries.C

@@ -1,4 +1,4 @@
-/// \file CheckTopologies.C
+/// \file CreateDictionaries.C
 /// Macros to test the generation of a dictionary of topologies. Three dictionaries are generated: one with signal-cluster only, one with noise-clusters only and one with all the clusters.
 
 #if !defined(__CLING__) || defined(__ROOTCLING__)
@@ -32,12 +32,12 @@
 #include <unordered_map>
 #endif
 
-void CheckTopologies(std::string clusfile = "o2clus_its.root",
-                     std::string hitfile = "o2sim_HitsITS.root",
-                     std::string collContextfile = "collisioncontext.root",
-                     std::string inputGeom = "",
-                     float checkOutliers = 2., // reject outliers (MC dX or dZ exceeds row/col span by a factor above the threshold)
-                     float minPtMC = 0.01)     // account only MC hits with pT above threshold
+void CreateDictionaries(std::string clusfile = "o2clus_its.root",
+                        std::string hitfile = "o2sim_HitsITS.root",
+                        std::string collContextfile = "collisioncontext.root",
+                        std::string inputGeom = "",
+                        float checkOutliers = 2., // reject outliers (MC dX or dZ exceeds row/col span by a factor above the threshold)
+                        float minPtMC = 0.01)     // account only MC hits with pT above threshold
 {
   const int QEDSourceID = 99; // Clusters from this MC source correspond to QED electrons
 

Detectors/ITSMFT/ITS/macros/test/run_test.sh

@@ -18,7 +18,7 @@ root -b -q $O2_ROOT/share/macro/run_clus_itsSA.C+\(\"itsdigits.root\",\"o2clus_i
 
 root.exe -b -q CheckClusters.C+ >& CheckClusters.log
 
-#root.exe -b -q CheckTopologies.C+ >& CheckTopologies.log
+#root.exe -b -q CreateDictionaries.C+ >& CreateDictionaries.log
 
 root.exe -b -q $O2_ROOT/share/macro/run_trac_its.C+ >& trac_its.log
 

Detectors/ITSMFT/ITS/macros/test/run_workflows.sh

@@ -8,7 +8,7 @@ o2-its-reco-workflow >& reco.log
 # These macros can be run to check the quality of the results
 # root.exe CheckDigits.C+
 # root.exe CheckClusters.C+
-# root.exe CheckTopologies.C+
+# root.exe CreateDictionaries.C+
 # root.exe CheckTracks.C+
 # root.exe DisplayTrack.C+