Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Modules/TRD/include/TRD/DigitsTask.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ class DigitsTask final : public TaskInterface
void monitorData(o2::framework::ProcessingContext& ctx) override;
void endOfCycle() override;
void endOfActivity(const Activity& activity) override;
void finaliseCCDB(o2::framework::ConcreteDataMatcher& matcher, void* obj) override;
void reset() override;
void buildHistograms();
void drawLinesOnPulseHeight(TH1F* h);
Expand Down Expand Up @@ -84,7 +85,6 @@ class DigitsTask final : public TaskInterface

// CCDB objects
const o2::trd::NoiseStatusMCM* mNoiseMap = nullptr;
const std::array<int, o2::trd::constants::MAXCHAMBER>* mChamberStatus = nullptr;
};

} // namespace o2::quality_control_modules::trd
Expand Down
2 changes: 1 addition & 1 deletion Modules/TRD/include/TRD/TrackletsTask.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ class TrackletsTask final : public TaskInterface
void monitorData(o2::framework::ProcessingContext& ctx) override;
void endOfCycle() override;
void endOfActivity(const Activity& activity) override;
void finaliseCCDB(o2::framework::ConcreteDataMatcher& matcher, void* obj) override;
void reset() override;
void buildHistograms();

Expand All @@ -64,7 +65,6 @@ class TrackletsTask final : public TaskInterface

// data to pull from CCDB
const o2::trd::NoiseStatusMCM* mNoiseMap = nullptr;
const std::array<int, o2::trd::constants::MAXCHAMBER>* mChamberStatus = nullptr;
};

} // namespace o2::quality_control_modules::trd
Expand Down
20 changes: 9 additions & 11 deletions Modules/TRD/src/DigitsTask.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -146,17 +146,7 @@ void DigitsTask::monitorData(o2::framework::ProcessingContext& ctx)
mNoiseMap = ptr.get();
}

if (!mChamberStatus) {
auto ptr = ctx.inputs().get<std::array<int, MAXCHAMBER>*>("fedChamberStatus");
mChamberStatus = ptr.get();
// LB: only draw in plots if it is first instance, e.g. null ptr to non null ptr
if (mChamberStatus) {
// LB: no half chamber distribution map for Digits, pass it as null pointer
TRDHelpers::drawChamberStatusOnHistograms(mChamberStatus, nullptr, mLayers, NCOLUMN);
} else {
ILOG(Info, Support) << "Failed to retrieve ChamberStatus, so it will not show on plots" << ENDM;
}
}
auto ptr = ctx.inputs().get<std::array<int, MAXCHAMBER>*>("fedChamberStatus");

// fill histograms
auto digits = ctx.inputs().get<gsl::span<o2::trd::Digit>>("digits");
Expand Down Expand Up @@ -343,6 +333,14 @@ void DigitsTask::endOfActivity(const Activity& /*activity*/)
ILOG(Debug, Devel) << "endOfActivity" << ENDM;
}

void DigitsTask::finaliseCCDB(o2::framework::ConcreteDataMatcher& matcher, void* obj)
{
if (matcher == o2::framework::ConcreteDataMatcher("TRD", "FCHSTATUS", 0)) {
// LB: no half chamber distribution map for Digits, pass it as null pointer
TRDHelpers::drawChamberStatusOnHistograms(static_cast<std::array<int, MAXCHAMBER>*>(obj), nullptr, mLayers, NCOLUMN);
}
}

void DigitsTask::reset()
{
// clean all the monitor objects here
Expand Down
18 changes: 8 additions & 10 deletions Modules/TRD/src/TrackletsTask.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,7 @@ void TrackletsTask::monitorData(o2::framework::ProcessingContext& ctx)
mNoiseMap = ptr.get();
}

if (!mChamberStatus) {
auto ptr = ctx.inputs().get<std::array<int, MAXCHAMBER>*>("fedChamberStatus");
mChamberStatus = ptr.get();
// LB: only draw in plots if it is first instance, e.g. null ptr to non null ptr
if (mChamberStatus) {
TRDHelpers::drawChamberStatusOnHistograms(mChamberStatus, mTrackletsPerHC2D, mLayers, NCOLUMN / NSECTOR);
} else {
ILOG(Info, Support) << "Failed to retrieve ChamberStatus, so it will not show on plots" << ENDM;
}
}
auto ptr = ctx.inputs().get<std::array<int, MAXCHAMBER>*>("fedChamberStatus");

// Fill histograms
auto tracklets = ctx.inputs().get<gsl::span<o2::trd::Tracklet64>>("tracklets");
Expand Down Expand Up @@ -204,6 +195,13 @@ void TrackletsTask::endOfActivity(const Activity& /*activity*/)
ILOG(Debug, Devel) << "endOfActivity" << ENDM;
}

void TrackletsTask::finaliseCCDB(o2::framework::ConcreteDataMatcher& matcher, void* obj)
{
if (matcher == o2::framework::ConcreteDataMatcher("TRD", "FCHSTATUS", 0)) {
TRDHelpers::drawChamberStatusOnHistograms(static_cast<std::array<int, MAXCHAMBER>*>(obj), mTrackletsPerHC2D, mLayers, NCOLUMN / NSECTOR);
}
}

void TrackletsTask::reset()
{
// clean all the monitor objects here
Expand Down