try to fix macro compilation

f3sch · f3sch · commit b84a8c672411 · 2026-03-18T18:25:00.000+01:00
Signed-off-by: Felix Schlepper &lt;felix.schlepper@cern.ch&gt;
diff --git a/Detectors/ITSMFT/ITS/macros/test/CheckDROF.C b/Detectors/ITSMFT/ITS/macros/test/CheckDROF.C
@@ -39,13 +39,13 @@
 #include "SimulationDataFormat/MCTruthContainer.h"
 #include "DataFormatsITSMFT/CompCluster.h"
 #include "DataFormatsITS/TrackITS.h"
+#include "DataFormatsITS/Vertex.h"
 #include "DataFormatsITSMFT/ROFRecord.h"
 #include "SimulationDataFormat/DigitizationContext.h"
 
 #endif
 
 using namespace std;
-using Vertex = o2::dataformats::Vertex<o2::dataformats::TimeStamp<int>>;
 
 void plotHistos(TFile* fWO, TFile* f, const char* append = "");
 
@@ -93,9 +93,9 @@ struct ParticleInfo { // particle level information for tracks
 #pragma link C++ class ParticleInfo + ;
 #pragma link C++ class std::vector < ParticleInfo> + ;
 
-struct VertexInfo { // Vertex level info
-  float purity;     // fraction of main cont. labels to all
-  Vertex vertex;    // reconstructed vertex
+struct VertexInfo {       // Vertex level info
+  float purity;           // fraction of main cont. labels to all
+  o2::its::Vertex vertex; // reconstructed vertex
   int bcInROF{-1};
   int rofId{-1};
   int event{-1};                       // corresponding MC event
@@ -199,7 +199,7 @@ void CheckDROF(bool plot = false, bool write = false, const std::string& tracfil
     std::vector<o2::itsmft::ROFRecord> rofRecVec, *rofRecVecP = &rofRecVec;
     recTree->SetBranchAddress("ITSTracksROF", &rofRecVecP);
     // Vertices
-    std::vector<Vertex>* recVerArr = nullptr;
+    std::vector<o2::its::Vertex>* recVerArr = nullptr;
     recTree->SetBranchAddress("Vertices", &recVerArr);
     std::vector<ROFRecord>* recVerROFArr = nullptr;
     recTree->SetBranchAddress("VerticesROF", &recVerROFArr);
@@ -876,11 +876,12 @@ void CheckDROF(bool plot = false, bool write = false, const std::string& tracfil
             if (!trk.hasHitOnLayer(iL) || !trk.isFakeOnLayer(iL) || (part.clusters & (0x1 << iL)) == 0) {
               continue;
             }
-            if (trk.hasHitInNextROF()) {
-              hFakMig->Fill(trk.getPt(), trk.getNClusters(), iL);
-            } else {
-              hFakVal->Fill(trk.getPt(), trk.getNClusters(), iL);
-            }
+            // TODO: figure out how to find hit migration
+            // if (trk.hasHitInNextROF()) {
+            //   hFakMig->Fill(trk.getPt(), trk.getNClusters(), iL);
+            // } else {
+            //   hFakVal->Fill(trk.getPt(), trk.getNClusters(), iL);
+            // }
           }
         }
       }
diff --git a/Detectors/ITSMFT/ITS/macros/test/CheckStaggering.C b/Detectors/ITSMFT/ITS/macros/test/CheckStaggering.C
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// Copyright 2019-2026 CERN and copyright holders of ALICE O2.
 // See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
 // All rights not expressly granted are reserved.
 //
@@ -44,7 +44,6 @@
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
 #include "ReconstructionDataFormats/Vertex.h"
-#include "Framework/Logger.h"
 #include "DetectorsVertexing/SVertexHypothesis.h"
 #include "DCAFitter/DCAFitterN.h"
 #endif
@@ -65,25 +64,25 @@ void CheckStaggering(int runNumber, int max = -1, const std::string& dir = "")
 {
   gStyle->SetOptStat(0);
   auto dirs = findDirs(dir);
-  LOGP(info, "Will iterate over {} input dirs", dirs.size());
+  printf("Will iterate over %zu input dirs", dirs.size());
   if (dirs.empty()) {
-    LOGP(error, "No input found");
+    printf("No input found");
     return;
   }
   if (max > 0 && (int)dirs.size() > max) {
     std::random_device rd;
     std::mt19937 g(rd());
     std::shuffle(dirs.begin(), dirs.end(), g);
     dirs.resize(max);
-    LOGP(info, "restricting to {} dirs", max);
+    printf("restricting to %ddirs", max);
   }
 
   auto& ccdbmgr = o2::ccdb::BasicCCDBManager::instance();
   ccdbmgr.setURL("https://alice-ccdb.cern.ch");
   auto runDuration = ccdbmgr.getRunDuration(runNumber);
   auto tRun = runDuration.first + (runDuration.second - runDuration.first) / 2; // time stamp for the middle of the run duration
   ccdbmgr.setTimestamp(tRun);
-  LOGP(info, "Run {} has TS {}", runNumber, tRun);
+  printf("Run %d has TS %lld", runNumber, tRun);
   auto geoAligned = ccdbmgr.get<TGeoManager>("GLO/Config/GeometryAligned");
   auto magField = ccdbmgr.get<o2::parameters::GRPMagField>("GLO/Config/GRPMagField");
   auto grpLHC = ccdbmgr.get<o2::parameters::GRPLHCIFData>("GLO/Config/GRPLHCIF");
@@ -170,17 +169,14 @@ void CheckStaggering(int runNumber, int max = -1, const std::string& dir = "")
     fflush(stdout);
 
     const auto& d = dirs[iDir];
-    LOGP(debug, "\nEntering {}", d.c_str());
     auto fTrks = TFile::Open((d / tracFile).c_str());
     auto fCls = TFile::Open((d / clsFile).c_str());
     if (!fTrks || !fCls || fTrks->IsZombie() || fCls->IsZombie()) {
-      LOGP(error, "\nCould not open files");
       continue;
     }
     auto tTrks = fTrks->Get<TTree>("o2sim");
     auto tCls = fCls->Get<TTree>("o2sim");
     if (!tTrks || !tCls) {
-      LOGP(error, "\nCould not retrieve trees");
       continue;
     }
 
@@ -198,7 +194,6 @@ void CheckStaggering(int runNumber, int max = -1, const std::string& dir = "")
       for (int i{0}; i < 7; ++i) {
         ncls += clsArr[i]->size();
       }
-      LOGP(debug, "\n\tTF:{:03} {} trks {} vtx {} cls", iTF, trkArr.size(), vtxArr.size(), ncls);
 
       // for each TF built pool of positive and negaitve tracks
       std::vector<const o2::its::TrackITS*> posPool, negPool;
diff --git a/macro/run_rawdecoding_its.C b/macro/run_rawdecoding_its.C
@@ -1,3 +1,14 @@
+// Copyright 2019-2026 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
 #if !defined(__CLING__) || defined(__ROOTCLING__)
 
 #include <TTree.h>
@@ -42,7 +53,7 @@ void run_rawdecoding_its(std::string inpName = "rawits.bin", // input binary dat
   TStopwatch sw;
   sw.Start();
   uint32_t roFrame = 0;
-  o2::InteractionRecord irHB, irTrig;
+  o2::InteractionRecord irTrig;
   std::vector<o2::itsmft::Digit> digits, *digitsPtr = &digits;
   std::vector<o2::itsmft::ROFRecord> rofRecVec, *rofRecVecPtr = &rofRecVec;
   std::size_t rofEntry = 0, nrofdig = 0;
@@ -62,12 +73,11 @@ void run_rawdecoding_its(std::string inpName = "rawits.bin", // input binary dat
     }
 
     if (outTreeDig) { // >> store digits
-      if (irHB != rawReader.getInteractionRecordHB() || irTrig != rawReader.getInteractionRecord()) {
+      if (irTrig != rawReader.getInteractionRecord()) {
         if (!irTrig.isDummy()) {
-          rofRecVec.emplace_back(irHB, roFrame, rofEntry, nrofdig); // registed finished ROF
+          rofRecVec.emplace_back(irTrig, roFrame, rofEntry, nrofdig); // registed finished ROF
           roFrame++;
         }
-        irHB = rawReader.getInteractionRecordHB();
         irTrig = rawReader.getInteractionRecord();
         rofEntry = digits.size();
         nrofdig = 0;
@@ -79,15 +89,14 @@ void run_rawdecoding_its(std::string inpName = "rawits.bin", // input binary dat
       }
 
       printf("ROF %7d ch: %5d IR: ", roFrame, chipData.getChipID());
-      irHB.print();
 
     } // << store digits
     //
   }
 
   if (outTreeDig) {
     // register last ROF
-    rofRecVec.emplace_back(irHB, roFrame, rofEntry, nrofdig); // registed finished ROF
+    rofRecVec.emplace_back(irTrig, roFrame, rofEntry, nrofdig); // registed finished ROF
 
     // fill last (and the only one?) entry
     outTreeDig->Fill();
diff --git a/macro/run_rawdecoding_mft.C b/macro/run_rawdecoding_mft.C
@@ -1,3 +1,14 @@
+// Copyright 2019-2026 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
 #if !defined(__CLING__) || defined(__ROOTCLING__)
 
 #include <TTree.h>
@@ -42,7 +53,7 @@ void run_rawdecoding_mft(std::string inpName = "06282019_1854_output.bin", // in
   TStopwatch sw;
   sw.Start();
   uint32_t roFrame = 0;
-  o2::InteractionRecord irHB, irTrig;
+  o2::InteractionRecord irTrig;
   std::vector<o2::itsmft::Digit> digits, *digitsPtr = &digits;
   std::vector<o2::itsmft::ROFRecord> rofRecVec, *rofRecVecPtr = &rofRecVec;
   int rofEntry = 0, nrofdig = 0;
@@ -62,12 +73,11 @@ void run_rawdecoding_mft(std::string inpName = "06282019_1854_output.bin", // in
     }
 
     if (outTreeDig) { // >> store digits
-      if (irHB != rawReader.getInteractionRecordHB() || irTrig != rawReader.getInteractionRecord()) {
+      if (irTrig != rawReader.getInteractionRecord()) {
         if (!irTrig.isDummy()) {
-          rofRecVec.emplace_back(irHB, roFrame, rofEntry, nrofdig); // registed finished ROF
+          rofRecVec.emplace_back(irTrig, roFrame, rofEntry, nrofdig); // registed finished ROF
           roFrame++;
         }
-        irHB = rawReader.getInteractionRecordHB();
         irTrig = rawReader.getInteractionRecord();
         rofEntry = digits.size();
         nrofdig = 0;
@@ -79,15 +89,14 @@ void run_rawdecoding_mft(std::string inpName = "06282019_1854_output.bin", // in
       }
 
       printf("ROF %7d ch: %5d IR: ", roFrame, chipData.getChipID());
-      irHB.print();
 
     } // << store digits
     //
   }
 
   if (outTreeDig) {
     // register last ROF
-    rofRecVec.emplace_back(irHB, roFrame, rofEntry, nrofdig); // registed finished ROF
+    rofRecVec.emplace_back(irTrig, roFrame, rofEntry, nrofdig); // registed finished ROF
 
     // fill last (and the only one?) entry
     outTreeDig->Fill();
