Skip to content

Commit 723bbe6

Browse files
authored
Merge pull request AliceO2Group#17 from noferini/tof-dev
restore version 1 of TOF CTF
2 parents bd21a3c + 9f49a5e commit 723bbe6

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

DataFormats/Detectors/TOF/include/DataFormatsTOF/CTF.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ struct CTFHeader {
3535
uint32_t firstOrbit = 0; /// 1st orbit of TF
3636
uint16_t firstBC = 0; /// 1st BC of TF
3737

38-
ClassDefNV(CTFHeader, 2);
38+
ClassDefNV(CTFHeader, 1);
3939
};
4040

4141
/// Compressed but not yet entropy-encoded infos

Detectors/TOF/base/include/TOFBase/WindowFiller.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class WindowFiller
7676

7777
std::vector<uint32_t>& getPatterns() { return mPatterns; }
7878
void addPattern(const uint32_t val, int icrate, int orbit, int bc) { mCratePatterns.emplace_back(val, icrate, orbit * 3 + (bc + 100) / Geo::BC_IN_WINDOW); }
79-
void addCrateHeaderData(ulong orbit, int crate, int32_t bc, uint32_t eventCounter);
79+
void addCrateHeaderData(unsigned long orbit, int crate, int32_t bc, uint32_t eventCounter);
8080

8181
protected:
8282
// info TOF timewindow

Detectors/TOF/base/src/WindowFiller.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ void WindowFiller::fillDigitsInStrip(std::vector<Strip>* strips, int channel, in
107107
(*strips)[istrip].addDigit(channel, tdc, tot, nbc, 0, triggerorbit, triggerbunch);
108108
}
109109
//______________________________________________________________________
110-
void WindowFiller::addCrateHeaderData(ulong orbit, int crate, int32_t bc, uint32_t eventCounter)
110+
void WindowFiller::addCrateHeaderData(unsigned long orbit, int crate, int32_t bc, uint32_t eventCounter)
111111
{
112112
if (orbit < mFirstIR.orbit)
113113
return;
@@ -144,7 +144,7 @@ void WindowFiller::fillOutputContainer(std::vector<Digit>& digits)
144144
if (mReadoutWindowData.size() >= mCrateHeaderData.size())
145145
bc_shift = (mReadoutWindowData.size() % Geo::NWINDOW_IN_ORBIT) * Geo::BC_IN_WINDOW; // insert default value
146146
else {
147-
ulong irow = mReadoutWindowData.size();
147+
unsigned long irow = mReadoutWindowData.size();
148148
for (int icrate = 0; icrate < Geo::kNCrate; icrate++) {
149149
if (mCrateHeaderData[irow].bc[icrate] == -1) { // crate not read
150150
continue;

0 commit comments

Comments
 (0)