Skip to content

Commit 4336231

Browse files
committed
try to fix macro compilation
Signed-off-by: Felix Schlepper <felix.schlepper@cern.ch>
1 parent 928c399 commit 4336231

File tree

5 files changed

+40
-19
lines changed

5 files changed

+40
-19
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,5 @@ o2_add_test_root_macro(CheckDROF.C
122122
o2_add_test_root_macro(CheckStaggering.C
123123
PUBLIC_LINK_LIBRARIES O2::DataFormatsITS
124124
O2::DataFormatsITSMFT
125+
O2::Framework
125126
LABELS its)

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,14 @@
3939
#include "SimulationDataFormat/MCTruthContainer.h"
4040
#include "DataFormatsITSMFT/CompCluster.h"
4141
#include "DataFormatsITS/TrackITS.h"
42+
#include "DataFormatsITS/Vertex.h"
4243
#include "DataFormatsITSMFT/ROFRecord.h"
4344
#include "SimulationDataFormat/DigitizationContext.h"
4445

4546
#endif
4647

4748
using namespace std;
48-
using Vertex = o2::dataformats::Vertex<o2::dataformats::TimeStamp<int>>;
49+
using Vertex = o2::its::Vertex;
4950

5051
void plotHistos(TFile* fWO, TFile* f, const char* append = "");
5152

@@ -876,11 +877,12 @@ void CheckDROF(bool plot = false, bool write = false, const std::string& tracfil
876877
if (!trk.hasHitOnLayer(iL) || !trk.isFakeOnLayer(iL) || (part.clusters & (0x1 << iL)) == 0) {
877878
continue;
878879
}
879-
if (trk.hasHitInNextROF()) {
880-
hFakMig->Fill(trk.getPt(), trk.getNClusters(), iL);
881-
} else {
882-
hFakVal->Fill(trk.getPt(), trk.getNClusters(), iL);
883-
}
880+
// TODO: figure out how to find hit migration
881+
// if (trk.hasHitInNextROF()) {
882+
// hFakMig->Fill(trk.getPt(), trk.getNClusters(), iL);
883+
// } else {
884+
// hFakVal->Fill(trk.getPt(), trk.getNClusters(), iL);
885+
// }
884886
}
885887
}
886888
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
1+
// Copyright 2019-2026 CERN and copyright holders of ALICE O2.
22
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
33
// All rights not expressly granted are reserved.
44
//

macro/run_rawdecoding_its.C

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
// Copyright 2019-2026 CERN and copyright holders of ALICE O2.
2+
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
3+
// All rights not expressly granted are reserved.
4+
//
5+
// This software is distributed under the terms of the GNU General Public
6+
// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
7+
//
8+
// In applying this license CERN does not waive the privileges and immunities
9+
// granted to it by virtue of its status as an Intergovernmental Organization
10+
// or submit itself to any jurisdiction.
11+
112
#if !defined(__CLING__) || defined(__ROOTCLING__)
213

314
#include <TTree.h>
@@ -42,7 +53,7 @@ void run_rawdecoding_its(std::string inpName = "rawits.bin", // input binary dat
4253
TStopwatch sw;
4354
sw.Start();
4455
uint32_t roFrame = 0;
45-
o2::InteractionRecord irHB, irTrig;
56+
o2::InteractionRecord irTrig;
4657
std::vector<o2::itsmft::Digit> digits, *digitsPtr = &digits;
4758
std::vector<o2::itsmft::ROFRecord> rofRecVec, *rofRecVecPtr = &rofRecVec;
4859
std::size_t rofEntry = 0, nrofdig = 0;
@@ -62,12 +73,11 @@ void run_rawdecoding_its(std::string inpName = "rawits.bin", // input binary dat
6273
}
6374

6475
if (outTreeDig) { // >> store digits
65-
if (irHB != rawReader.getInteractionRecordHB() || irTrig != rawReader.getInteractionRecord()) {
76+
if (irTrig != rawReader.getInteractionRecord()) {
6677
if (!irTrig.isDummy()) {
67-
rofRecVec.emplace_back(irHB, roFrame, rofEntry, nrofdig); // registed finished ROF
78+
rofRecVec.emplace_back(irTrig, roFrame, rofEntry, nrofdig); // registed finished ROF
6879
roFrame++;
6980
}
70-
irHB = rawReader.getInteractionRecordHB();
7181
irTrig = rawReader.getInteractionRecord();
7282
rofEntry = digits.size();
7383
nrofdig = 0;
@@ -79,15 +89,14 @@ void run_rawdecoding_its(std::string inpName = "rawits.bin", // input binary dat
7989
}
8090

8191
printf("ROF %7d ch: %5d IR: ", roFrame, chipData.getChipID());
82-
irHB.print();
8392

8493
} // << store digits
8594
//
8695
}
8796

8897
if (outTreeDig) {
8998
// register last ROF
90-
rofRecVec.emplace_back(irHB, roFrame, rofEntry, nrofdig); // registed finished ROF
99+
rofRecVec.emplace_back(irTrig, roFrame, rofEntry, nrofdig); // registed finished ROF
91100

92101
// fill last (and the only one?) entry
93102
outTreeDig->Fill();

macro/run_rawdecoding_mft.C

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
// Copyright 2019-2026 CERN and copyright holders of ALICE O2.
2+
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
3+
// All rights not expressly granted are reserved.
4+
//
5+
// This software is distributed under the terms of the GNU General Public
6+
// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
7+
//
8+
// In applying this license CERN does not waive the privileges and immunities
9+
// granted to it by virtue of its status as an Intergovernmental Organization
10+
// or submit itself to any jurisdiction.
11+
112
#if !defined(__CLING__) || defined(__ROOTCLING__)
213

314
#include <TTree.h>
@@ -42,7 +53,7 @@ void run_rawdecoding_mft(std::string inpName = "06282019_1854_output.bin", // in
4253
TStopwatch sw;
4354
sw.Start();
4455
uint32_t roFrame = 0;
45-
o2::InteractionRecord irHB, irTrig;
56+
o2::InteractionRecord irTrig;
4657
std::vector<o2::itsmft::Digit> digits, *digitsPtr = &digits;
4758
std::vector<o2::itsmft::ROFRecord> rofRecVec, *rofRecVecPtr = &rofRecVec;
4859
int rofEntry = 0, nrofdig = 0;
@@ -62,12 +73,11 @@ void run_rawdecoding_mft(std::string inpName = "06282019_1854_output.bin", // in
6273
}
6374

6475
if (outTreeDig) { // >> store digits
65-
if (irHB != rawReader.getInteractionRecordHB() || irTrig != rawReader.getInteractionRecord()) {
76+
if (irTrig != rawReader.getInteractionRecord()) {
6677
if (!irTrig.isDummy()) {
67-
rofRecVec.emplace_back(irHB, roFrame, rofEntry, nrofdig); // registed finished ROF
78+
rofRecVec.emplace_back(irTrig, roFrame, rofEntry, nrofdig); // registed finished ROF
6879
roFrame++;
6980
}
70-
irHB = rawReader.getInteractionRecordHB();
7181
irTrig = rawReader.getInteractionRecord();
7282
rofEntry = digits.size();
7383
nrofdig = 0;
@@ -79,15 +89,14 @@ void run_rawdecoding_mft(std::string inpName = "06282019_1854_output.bin", // in
7989
}
8090

8191
printf("ROF %7d ch: %5d IR: ", roFrame, chipData.getChipID());
82-
irHB.print();
8392

8493
} // << store digits
8594
//
8695
}
8796

8897
if (outTreeDig) {
8998
// register last ROF
90-
rofRecVec.emplace_back(irHB, roFrame, rofEntry, nrofdig); // registed finished ROF
99+
rofRecVec.emplace_back(irTrig, roFrame, rofEntry, nrofdig); // registed finished ROF
91100

92101
// fill last (and the only one?) entry
93102
outTreeDig->Fill();

0 commit comments

Comments
 (0)