Skip to content

[EMCAL-524,EMCAL-526] New histograms for pilotBeam #830

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
Barthelemy merged 2 commits into from
Sep 15, 2021
Merged

[EMCAL-524,EMCAL-526] New histograms for pilotBeam #830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94a8903
[EMCAL-524] added 4 Digits+Raw histos(JIRA 04/Aug/21)
cterrevo Aug 5, 2021
e390cc3
[EMCAL-524,EMCAL-526] New histograms for pilotBeam
cterrevo Sep 13, 2021
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
18 changes: 11 additions & 7 deletions Modules/EMCAL/include/EMCAL/DigitsQcTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,19 +76,23 @@ class DigitsQcTask final : public TaskInterface
TH2* mDigitTimeSupermodule = nullptr;
TH2* mDigitTimeSupermoduleCalib = nullptr;

TH2* mDigitOccupancy = nullptr; ///< Digit occupancy EMCAL and DCAL
TH2* mDigitOccupancyThr = nullptr; ///< Digit occupancy EMCAL and DCAL with Energy trheshold
TH2* mIntegratedOccupancy = nullptr; ///< Digit integrated occupancy
TH1* mDigitAmplitudeEMCAL = nullptr; ///< Digit amplitude in EMCAL
TH1* mDigitAmplitudeDCAL = nullptr; ///< Digit amplitude in DCAL
TH1* mnumberEvents = nullptr; ///< Number of Events for normalization
TH2* mDigitOccupancy = nullptr; ///< Digit occupancy EMCAL and DCAL
TH2* mDigitOccupancyThr = nullptr; ///< Digit occupancy EMCAL and DCAL with Energy trheshold
TH2* mDigitOccupancyThrBelow = nullptr; ///< Digit occupancy EMCAL and DCAL with Energy trheshold
TH2* mIntegratedOccupancy = nullptr; ///< Digit integrated occupancy
TH1* mDigitAmplitudeEMCAL = nullptr; ///< Digit amplitude in EMCAL
TH1* mDigitAmplitudeEMCAL_0 = nullptr; ///< Digit amplitude in EMCAL if bc==0
TH1* mDigitAmplitudeDCAL = nullptr; ///< Digit amplitude in DCAL
TH1* mDigitTimeSupermoduleEMCAL = nullptr; ///< Digit amplitude in DCAL per SuperModule
TH1* mDigitTimeSupermoduleDCAL = nullptr; ///< Digit amplitude in DCAL per SuperModule
TH1* mnumberEvents = nullptr; ///< Number of Events for normalization

void initForTrigger(const std::string trigger, bool hasAmpVsCellID, bool hasTimeVsCellID, bool hasHistosCalib2D);
void startPublishing(o2::quality_control::core::ObjectsManager& manager);
void reset();
void clean();

void fillHistograms(const o2::emcal::Cell& cell, bool isGood, double timeoffset);
void fillHistograms(const o2::emcal::Cell& cell, bool isGood, double timeoffset, int bcphase);
void countEvent();
};

Expand Down
15 changes: 15 additions & 0 deletions Modules/EMCAL/include/EMCAL/RawTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,15 @@ class RawTask final : public TaskInterface
void endOfActivity(Activity& activity) override;
void reset() override;

/// \brief Set the data origin
/// \param origin Data origin
///
/// Normally data origin is EMC, however in case the
/// Task subscribes directly to readout or the origin
/// is different in the STFbuilder this needs to be handled
/// accordingly
void setDataOrigin(const std::string_view origin) { mDataOrigin = origin; }

enum class EventType {
CAL_EVENT,
PHYS_EVENT
Expand Down Expand Up @@ -98,6 +107,7 @@ class RawTask final : public TaskInterface
bool isLostTimeframe(framework::ProcessingContext& ctx) const;

o2::emcal::Geometry* mGeometry = nullptr; ///< EMCAL geometry
std::string mDataOrigin = "EMC";
TH1* mPayloadSize = nullptr;
TH1* mMessageCounter = nullptr;
TH1* mNumberOfSuperpagesPerMessage;
Expand All @@ -108,6 +118,10 @@ class RawTask final : public TaskInterface
TH1* mNbunchPerChan = nullptr; ///< Number of bunch per Channel
TH1* mNofADCsamples = nullptr; ///< Number of ADC samples per Channel
TH1* mADCsize = nullptr; ///< ADC size per bunch
TH2* mFECmaxCountperSM = nullptr; ///< max number of hit channels per SM
TH2* mFECmaxIDperSM = nullptr; ///< FEC ID max number of hit channels per SM
std::unordered_map<EventType, TH1*> mRawAmplMinEMCAL_tot; ///< Min Raw amplitude in whole EMCAL
std::unordered_map<EventType, TH1*> mRawAmplMinDCAL_tot; ///< Min Raw amplitude in whole DCAL
std::array<TH1*, 20> mFECmaxCount; ///< max number of hit channels
std::array<TH1*, 20> mFECmaxID; ///< FEC ID max number of hit channels
std::unordered_map<EventType, TProfile2D*> mRMS; ///< ADC rms for EMCAL+DCAL togheter
Expand All @@ -125,6 +139,7 @@ class RawTask final : public TaskInterface
std::unique_ptr<o2::emcal::MappingHandler> mMappings; ///< Mappings Hardware address -> Channel
TH2F* mErrorTypeAltro = nullptr; ///< Error from AltroDecoder
TH2F* mPayloadSizePerDDL = nullptr; ///< Payload size per ddl
TH2F* mPayloadSizeTFPerDDL = nullptr; ///< Payload size per TimeFrame per ddl
Int_t mNumberOfSuperpages = 0; ///< Simple total superpage counter
Int_t mNumberOfPages = 0; ///< Simple total number of superpages counter
Int_t mNumberOfMessages = 0;
Expand Down
40 changes: 34 additions & 6 deletions Modules/EMCAL/src/DigitsQcTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,11 @@ void DigitsQcTask::initialize(o2::framework::InitContext& /*ctx*/)
auto hasAmpVsCell = get_bool(getConfigValueLower("hasAmpVsCell")),
hasTimeVsCell = get_bool(getConfigValueLower("hasTimeVsCell")),
hasCalib2D = get_bool(getConfigValueLower("hasHistValibVsCell"));

mIgnoreTriggerTypes = get_bool(getConfigValue("ignoreTriggers"));
double threshold = hasConfigValue("threshold") ? get_double(getConfigValue("threshold")) : 0.5;
//add a second threshold
double thresholdCAL = hasConfigValue("threshold") ? get_double(getConfigValue("threshold")) : 0.5;
double thresholdPHYS = hasConfigValue("threshold") ? get_double(getConfigValue("threshold")) : 0.2;

if (hasAmpVsCell) {
QcInfoLogger::GetInstance() << QcInfoLogger::Debug << "Enabling histograms : Amplitude vs. cellID" << QcInfoLogger::endm;
Expand All @@ -105,7 +108,7 @@ void DigitsQcTask::initialize(o2::framework::InitContext& /*ctx*/)
std::array<std::string, 2> triggers = { { "CAL", "PHYS" } };
for (const auto& trg : triggers) {
DigitsHistograms histos;
histos.mCellThreshold = threshold;
histos.mCellThreshold = (trg == "CAL") ? thresholdCAL : thresholdPHYS;
histos.mGeometry = mGeometry;
histos.initForTrigger(trg.data(), hasAmpVsCell, hasTimeVsCell, hasCalib2D);
histos.startPublishing(*getObjectsManager());
Expand Down Expand Up @@ -234,6 +237,7 @@ void DigitsQcTask::monitorData(o2::framework::ProcessingContext& ctx)
continue;
}

auto bcphase = trg.mInteractionRecord.bc % 4; // to be fixed:4 histos for EMCAL, 4 histos for DCAL
auto histos = mHistogramContainer[trgClass];

// iterate over subevents
Expand All @@ -254,7 +258,7 @@ void DigitsQcTask::monitorData(o2::framework::ProcessingContext& ctx)
if (mBadChannelMap) {
goodcell = mBadChannelMap->getChannelStatus(digit.getTower()) != MaskType_t::GOOD_CELL;
}
histos.fillHistograms(digit, goodcell, timeoffset);
histos.fillHistograms(digit, goodcell, timeoffset, bcphase);
ndigit++;
ndigitGlobal++;
}
Expand Down Expand Up @@ -399,7 +403,7 @@ void DigitsQcTask::DigitsHistograms::initForTrigger(const std::string trigger, b
}

mDigitAmpSupermodule = histBuilder2D("digitAmplitudeSupermodule", "Digit amplitude vs. supermodule ID ", 400, 0., 100, 20, -0.5, 19.5, false);
mDigitTimeSupermodule = histBuilder2D("digitTimeSupermodule", "Digit Time vs. supermodule ID (High gain)", 400, -200, 200, 20, -0.5, 19.5, false);
mDigitTimeSupermodule = histBuilder2D("digitTimeSupermodule", "Digit Time vs. supermodule ID ", 400, -200, 200, 20, -0.5, 19.5, false);
if (hasHistosCalib2D) {
mDigitAmpSupermoduleCalib = histBuilder2D("digitAmplitudeSupermoduleCalib", "Digit amplitude (Calib) vs. supermodule ID ", 400, 0., 100, 20, -0.5, 19.5, false);
mDigitTimeSupermoduleCalib = histBuilder2D("digitTimeSupermoduleCalib", "Digit Time (Calib) vs. supermodule ID (High gain)", 400, -200, 200, 20, -0.5, 19.5, false);
Expand All @@ -408,18 +412,22 @@ void DigitsQcTask::DigitsHistograms::initForTrigger(const std::string trigger, b

mDigitOccupancy = histBuilder2D("digitOccupancyEMC", "Digit Occupancy EMCAL", 96, -0.5, 95.5, 208, -0.5, 207.5, false);
mDigitOccupancyThr = histBuilder2D("digitOccupancyEMCwThr", Form("Digit Occupancy EMCAL with E>%.1f GeV/c", mCellThreshold), 96, -0.5, 95.5, 208, -0.5, 207.5, false);
mDigitOccupancyThrBelow = histBuilder2D("digitOccupancyEMCwThrBelow", Form("Digit Occupancy EMCAL with E<%.1f GeV/c", mCellThreshold), 96, -0.5, 95.5, 208, -0.5, 207.5, false);

mIntegratedOccupancy = histBuilder2D("digitOccupancyInt", "Digit Occupancy Integrated", 96, -0.5, 95.5, 208, -0.5, 207.5, true);
mIntegratedOccupancy->GetXaxis()->SetTitle("col");
mIntegratedOccupancy->GetYaxis()->SetTitle("row");
// 1D histograms for showing the integrated spectrum

mDigitTimeSupermoduleEMCAL = histBuilder1D("digitTimeEMCAL", "Digit Time EMCAL", 400, -200, 200);
mDigitTimeSupermoduleDCAL = histBuilder1D("digitTimeDCAL", "Digit Time DCAL", 400, -200, 200);
mDigitAmplitudeEMCAL = histBuilder1D("digitAmplitudeEMCAL", "Digit amplitude in EMCAL", 400, 0., 100.);
mDigitAmplitudeEMCAL_0 = histBuilder1D("digitAmplitudeEMCAL_bc0", "Digit amplitude in EMCAL(bc=0)", 400, 0., 100.);
mDigitAmplitudeDCAL = histBuilder1D("digitAmplitudeDCAL", "Digit amplitude in DCAL", 400, 0., 100.);
mnumberEvents = histBuilder1D("NumberOfEvents", "Number Of Events", 1, 0.5, 1.5);
}

void DigitsQcTask::DigitsHistograms::fillHistograms(const o2::emcal::Cell& digit, bool goodCell, double timecalib)
void DigitsQcTask::DigitsHistograms::fillHistograms(const o2::emcal::Cell& digit, bool goodCell, double timecalib, int bcphase)
{
auto fillOptional1D = [](TH1* hist, double x, double weight = 1.) {
if (hist)
Expand Down Expand Up @@ -449,7 +457,10 @@ void DigitsQcTask::DigitsHistograms::fillHistograms(const o2::emcal::Cell& digit
}
if (digit.getEnergy() > mCellThreshold) {
fillOptional2D(mDigitOccupancyThr, col, row);
} else {
fillOptional2D(mDigitOccupancyThrBelow, col, row);
}

fillOptional2D(mIntegratedOccupancy, col, row, digit.getEnergy());

} catch (o2::emcal::InvalidCellIDException& e) {
Expand All @@ -466,9 +477,14 @@ void DigitsQcTask::DigitsHistograms::fillHistograms(const o2::emcal::Cell& digit
fillOptional2D(mDigitTimeSupermoduleCalib, digit.getTimeStamp() - timecalib, supermoduleID);
}
if (supermoduleID < 12) {
fillOptional1D(mDigitAmplitudeEMCAL, digit.getEnergy());

fillOptional1D(mDigitTimeSupermoduleEMCAL, digit.getTimeStamp());
fillOptional1D(mDigitAmplitudeEMCAL, digit.getEnergy()); //EMCAL
if (bcphase == 0)
fillOptional1D(mDigitAmplitudeEMCAL_0, digit.getEnergy()); //EMCALBC bcphase in the name?if bcphase=0-->Fill?
} else {
fillOptional1D(mDigitAmplitudeDCAL, digit.getEnergy());
fillOptional1D(mDigitTimeSupermoduleDCAL, digit.getTimeStamp());
}
} catch (o2::emcal::InvalidCellIDException& e) {
QcInfoLogger::GetInstance() << "Invalid cell ID: " << e.getCellID() << QcInfoLogger::endm;
Expand All @@ -494,11 +510,15 @@ void DigitsQcTask::DigitsHistograms::startPublishing(o2::quality_control::core::
publishOptional(mDigitAmpSupermodule);
publishOptional(mDigitAmpSupermoduleCalib);
publishOptional(mDigitTimeSupermodule);
publishOptional(mDigitTimeSupermoduleEMCAL);
publishOptional(mDigitTimeSupermoduleDCAL);
publishOptional(mDigitTimeSupermoduleCalib);
publishOptional(mDigitAmplitudeEMCAL);
publishOptional(mDigitAmplitudeEMCAL_0);
publishOptional(mDigitAmplitudeDCAL);
publishOptional(mDigitOccupancy);
publishOptional(mDigitOccupancyThr);
publishOptional(mDigitOccupancyThrBelow);
publishOptional(mIntegratedOccupancy);
publishOptional(mnumberEvents);
// publishOptional(mEvCounterTF);
Expand Down Expand Up @@ -535,11 +555,15 @@ void DigitsQcTask::DigitsHistograms::reset()
resetOptional(mDigitAmpSupermodule);
resetOptional(mDigitAmpSupermoduleCalib);
resetOptional(mDigitTimeSupermodule);
resetOptional(mDigitTimeSupermoduleEMCAL);
resetOptional(mDigitTimeSupermoduleDCAL);
resetOptional(mDigitTimeSupermoduleCalib);
resetOptional(mDigitAmplitudeEMCAL);
resetOptional(mDigitAmplitudeEMCAL_0);
resetOptional(mDigitAmplitudeDCAL);
resetOptional(mDigitOccupancy);
resetOptional(mDigitOccupancyThr);
resetOptional(mDigitOccupancyThrBelow);
resetOptional(mIntegratedOccupancy);
resetOptional(mnumberEvents);
// resetOptional(mEvCounterTF);
Expand Down Expand Up @@ -575,11 +599,15 @@ void DigitsQcTask::DigitsHistograms::clean()
cleanOptional(mDigitAmpSupermodule);
cleanOptional(mDigitAmpSupermoduleCalib);
cleanOptional(mDigitTimeSupermodule);
cleanOptional(mDigitTimeSupermoduleEMCAL);
cleanOptional(mDigitTimeSupermoduleDCAL);
cleanOptional(mDigitTimeSupermoduleCalib);
cleanOptional(mDigitAmplitudeEMCAL);
cleanOptional(mDigitAmplitudeEMCAL_0);
cleanOptional(mDigitAmplitudeDCAL);
cleanOptional(mDigitOccupancy);
cleanOptional(mDigitOccupancyThr);
cleanOptional(mDigitOccupancyThrBelow);
cleanOptional(mIntegratedOccupancy);
cleanOptional(mnumberEvents);
// cleanOptional(mEvCounterTF);
Expand Down
Loading