Skip to content

[MCH] set bcWidth in digit ROFs #6896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aphecetche merged 1 commit into from
Aug 30, 2021
Merged

[MCH] set bcWidth in digit ROFs #6896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/ROFRecord.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class ROFRecord
public:
ROFRecord() = default;
ROFRecord(const BCData& bc, int firstIdx, int nEntries) : mBCData(bc), mDataRef(firstIdx, nEntries) {}
ROFRecord(const BCData& bc, int firstIdx, int nEntries, int bcWidth) : mBCData(bc), mDataRef(firstIdx, nEntries), mBCWidth(bcWidth) {}

/// get the interaction record
const BCData& getBCData() const { return mBCData; }
Expand All @@ -56,8 +57,6 @@ class ROFRecord

/// get the time span by this ROF, in BC unit
int getBCWidth() const { return mBCWidth; }
/// set the time span by this ROF, in BC unit
void setBCWidth(int bcWidth);

bool operator==(const ROFRecord& other) const
{
Expand Down
6 changes: 0 additions & 6 deletions DataFormats/Detectors/MUON/MCH/src/ROFRecord.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,5 @@ std::ostream& operator<<(std::ostream& os, const ROFRecord& rof)
rof.getBCWidth());
return os;
}
void ROFRecord::setBCWidth(int bcWidth)
{
if (bcWidth < 4) {
throw std::invalid_argument(fmt::format("bcWidth must be strictly greater than 4 bunch-crossings"));
}
}

} // namespace o2::mch
3 changes: 1 addition & 2 deletions Detectors/MUON/MCH/DevIO/Digits/DigitIOV1.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ bool DigitReaderV1::read(std::istream& in,
return false;
}
for (auto r0 : rofsr0) {
ROFRecord r(r0.ir, r0.ref.getFirstEntry(), r0.ref.getEntries());
r.setBCWidth(4);
ROFRecord r(r0.ir, r0.ref.getFirstEntry(), r0.ref.getEntries(), 4);
rofs.push_back(r);
}

Expand Down
3 changes: 1 addition & 2 deletions Detectors/MUON/MCH/DevIO/Digits/DigitIOV4.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@ bool DigitReaderV4::read(std::istream& in,
in.read(reinterpret_cast<char*>(&firstIdx), sizeof(uint32_t));
in.read(reinterpret_cast<char*>(&nentries), sizeof(uint32_t));
in.read(reinterpret_cast<char*>(&bcWidth), sizeof(uint32_t));
rofs.emplace_back(o2::InteractionRecord{bc, orbit}, firstIdx, nentries);
rofs.back().setBCWidth(bcWidth);
rofs.emplace_back(o2::InteractionRecord{bc, orbit}, firstIdx, nentries, bcWidth);
if (in.fail()) {
return false;
}
Expand Down
7 changes: 4 additions & 3 deletions Detectors/MUON/MCH/Raw/Decoder/src/ROFFinder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ namespace raw

using namespace std;

static constexpr int sBcInOneADCclock = 4;

//_________________________________________________________________________________________________
ROFFinder::ROFFinder(const DataDecoder::RawDigitVector& digits, uint32_t firstTForbit) : mInputDigits(digits), mFirstTForbit(firstTForbit)
{
Expand Down Expand Up @@ -115,9 +117,8 @@ void ROFFinder::process(bool dummyROFs)
std::cout << fmt::format(" checking digit {} -> {}\n", id2, inputId2);
#endif

constexpr int oneADCclock = 4;
auto tdiff = digit.getTime() - rofSeed.getTime();
if (std::abs(tdiff) < oneADCclock) {
if (std::abs(tdiff) < sBcInOneADCclock) {
mEntries += 1;
#ifdef ROFDEBUG
std::cout << fmt::format(" digit {} -> {} added to current ROF\n", id2, inputId2);
Expand Down Expand Up @@ -196,7 +197,7 @@ o2::InteractionRecord ROFFinder::digitTime2IR(const RawDigit& digit)
void ROFFinder::storeROF()
{
if (mEntries > 0) {
mOutputROFs.emplace_back(mIR, mFirstIdx, mEntries);
mOutputROFs.emplace_back(mIR, mFirstIdx, mEntries, sBcInOneADCclock);
}
}

Expand Down
7 changes: 7 additions & 0 deletions Detectors/MUON/MCH/Raw/Decoder/src/testROFFinder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ BOOST_AUTO_TEST_CASE(TwoDigitsInOneROF)
BOOST_CHECK_EQUAL(rofRecords[0].getNEntries(), 2);

BOOST_CHECK_EQUAL(rofRecords[0].getBCData(), rofFinder.digitTime2IR(digits[0]));
BOOST_CHECK_EQUAL(rofRecords[0].getBCWidth(), 4);

BOOST_CHECK_EQUAL(rofFinder.isDigitsTimeAligned(), true);
}
Expand Down Expand Up @@ -103,6 +104,7 @@ BOOST_AUTO_TEST_CASE(TwoDigitsInOneROFUnaligned)
BOOST_CHECK_EQUAL(rofRecords[0].getNEntries(), 2);

BOOST_CHECK_EQUAL(rofRecords[0].getBCData(), rofFinder.digitTime2IR(digits[0]));
BOOST_CHECK_EQUAL(rofRecords[0].getBCWidth(), 4);

BOOST_CHECK_EQUAL(rofFinder.isDigitsTimeAligned(), false);
}
Expand Down Expand Up @@ -130,6 +132,7 @@ BOOST_AUTO_TEST_CASE(TwoDigitsInOneROFsConsecutiveOrbits)
BOOST_CHECK_EQUAL(rofRecords[0].getNEntries(), 2);

BOOST_CHECK_EQUAL(rofRecords[0].getBCData(), rofFinder.digitTime2IR(digits[0]));
BOOST_CHECK_EQUAL(rofRecords[0].getBCWidth(), 4);
}

//----------------------------------------------------------------------------
Expand All @@ -154,10 +157,12 @@ BOOST_AUTO_TEST_CASE(TwoDigitsInTwoROFs)
BOOST_CHECK_EQUAL(rofRecords[0].getFirstIdx(), 0);
BOOST_CHECK_EQUAL(rofRecords[0].getNEntries(), 1);
BOOST_CHECK_EQUAL(rofRecords[0].getBCData(), rofFinder.digitTime2IR(digits[0]));
BOOST_CHECK_EQUAL(rofRecords[0].getBCWidth(), 4);

BOOST_CHECK_EQUAL(rofRecords[1].getFirstIdx(), 1);
BOOST_CHECK_EQUAL(rofRecords[1].getNEntries(), 1);
BOOST_CHECK_EQUAL(rofRecords[1].getBCData(), rofFinder.digitTime2IR(digits[1]));
BOOST_CHECK_EQUAL(rofRecords[1].getBCWidth(), 4);

const auto rofDigit1 = rofFinder.getOrderedDigit(rofRecords[0].getFirstIdx());
const auto rofDigit2 = rofFinder.getOrderedDigit(rofRecords[1].getFirstIdx());
Expand Down Expand Up @@ -194,10 +199,12 @@ BOOST_AUTO_TEST_CASE(TwoDigitsInTwoROFsConsecutiveOrbits)
BOOST_CHECK_EQUAL(rofRecords[0].getFirstIdx(), 0);
BOOST_CHECK_EQUAL(rofRecords[0].getNEntries(), 1);
BOOST_CHECK_EQUAL(rofRecords[0].getBCData(), rofFinder.digitTime2IR(digits[1]));
BOOST_CHECK_EQUAL(rofRecords[0].getBCWidth(), 4);

BOOST_CHECK_EQUAL(rofRecords[1].getFirstIdx(), 1);
BOOST_CHECK_EQUAL(rofRecords[1].getNEntries(), 1);
BOOST_CHECK_EQUAL(rofRecords[1].getBCData(), rofFinder.digitTime2IR(digits[0]));
BOOST_CHECK_EQUAL(rofRecords[1].getBCWidth(), 4);

const auto rofDigit1 = rofFinder.getOrderedDigit(rofRecords[0].getFirstIdx());
const auto rofDigit2 = rofFinder.getOrderedDigit(rofRecords[1].getFirstIdx());
Expand Down