Skip to content

Commit b636ae8

Browse files
cterrevocterrevo
authored
[EMCAL-524] removing Low Gain histos (#790)
1 parent 3827650 commit b636ae8

2 files changed

Lines changed: 87 additions & 61 deletions

File tree

‎Modules/EMCAL/include/EMCAL/DigitsQcTask.h‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,14 @@ class DigitsQcTask final : public TaskInterface
5959
public:
6060
struct DigitsHistograms {
6161
std::string mTriggerClass;
62-
std::array<TH2*, 2> mDigitAmplitude; ///< Digit amplitude
63-
std::array<TH2*, 2> mDigitTime; ///< Digit time
64-
std::array<TH2*, 2> mDigitAmplitudeCalib; ///< Digit amplitude calibrated
65-
std::array<TH2*, 2> mDigitTimeCalib; ///< Digit time calibrated
62+
//std::array<TH2*, 2> mDigitAmplitude; ///< Digit amplitude
63+
TH2* mDigitAmplitude; ///< Digit amplitude
64+
// std::array<TH2*, 2> mDigitTime; ///< Digit time
65+
TH2* mDigitTime; ///< Digit time
66+
//std::array<TH2*, 2> mDigitAmplitudeCalib; ///< Digit amplitude calibrated
67+
TH2* mDigitAmplitudeCalib; ///< Digit amplitude calibrated
68+
// std::array<TH2*, 2> mDigitTimeCalib; ///< Digit time calibrated
69+
TH2* mDigitTimeCalib; ///< Digit time calibrated
6670

6771
TH2* mDigitOccupancy = nullptr; ///< Digit occupancy EMCAL and DCAL
6872
TH2* mDigitOccupancyThr = nullptr; ///< Digit occupancy EMCAL and DCAL with Energy trheshold

‎Modules/EMCAL/src/DigitsQcTask.cxx‎

Lines changed: 79 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -162,19 +162,23 @@ void DigitsQcTask::monitorData(o2::framework::ProcessingContext& ctx)
162162
QcInfoLogger::GetInstance() << QcInfoLogger::Debug << subev.mCellRange.getEntries() << " digits in subevent from equipment " << subev.mSpecification << QcInfoLogger::endm;
163163
gsl::span<const o2::emcal::Cell> eventdigits(cellsSubspec->second.data() + subev.mCellRange.getFirstEntry(), subev.mCellRange.getEntries());
164164
for (auto digit : eventdigits) {
165-
int index = digit.getHighGain() ? 0 : (digit.getLowGain() ? 1 : -1);
166-
if (index < 0)
167-
continue;
165+
//int index = digit.getHighGain() ? 0 : (digit.getLowGain() ? 1 : -1);
166+
//if (index < 0)
167+
// continue;
168168
auto cellindices = mGeometry->GetCellIndex(digit.getTower());
169-
histos.mDigitAmplitude[index]->Fill(digit.getEnergy(), digit.getTower());
169+
histos.mDigitAmplitude->Fill(digit.getEnergy(), digit.getTower());
170+
//histos.mDigitAmplitude[index]->Fill(digit.getEnergy(), digit.getTower());
170171

171172
auto timeoffset = mTimeCalib ? mTimeCalib->getTimeCalibParam(digit.getTower(), digit.getLowGain()) : 0.;
172173

173174
if (!mBadChannelMap || (mBadChannelMap->getChannelStatus(digit.getTower()) == MaskType_t::GOOD_CELL)) {
174-
histos.mDigitAmplitudeCalib[index]->Fill(digit.getEnergy(), digit.getTower());
175-
histos.mDigitTimeCalib[index]->Fill(digit.getTimeStamp() - timeoffset, digit.getTower());
175+
histos.mDigitAmplitudeCalib->Fill(digit.getEnergy(), digit.getTower());
176+
//histos.mDigitAmplitudeCalib[index]->Fill(digit.getEnergy(), digit.getTower());
177+
histos.mDigitTimeCalib->Fill(digit.getTimeStamp() - timeoffset, digit.getTower());
178+
//histos.mDigitTimeCalib[index]->Fill(digit.getTimeStamp() - timeoffset, digit.getTower());
176179
}
177-
histos.mDigitTime[index]->Fill(digit.getTimeStamp(), digit.getTower());
180+
histos.mDigitTime->Fill(digit.getTimeStamp(), digit.getTower());
181+
//histos.mDigitTime[index]->Fill(digit.getTimeStamp(), digit.getTower());
178182

179183
// get the supermodule for filling EMCAL/DCAL spectra
180184

@@ -265,23 +269,25 @@ std::vector<DigitsQcTask::CombinedEvent> DigitsQcTask::buildCombinedEvents(const
265269

266270
void DigitsQcTask::startPublishing(DigitsHistograms& histos)
267271
{
268-
for (auto h : histos.mDigitAmplitude) {
269-
getObjectsManager()->startPublishing(h);
270-
}
271-
272-
/*
273-
for (auto h : histos.mDigitTime) {
274-
getObjectsManager()->startPublishing(h);
275-
}
276-
*/
277-
for (auto h : histos.mDigitAmplitudeCalib) {
278-
getObjectsManager()->startPublishing(h);
279-
}
280-
/*
281-
for (auto h : histos.mDigitTimeCalib) {
282-
getObjectsManager()->startPublishing(h);
283-
}
284-
*/
272+
// for (auto h : histos.mDigitAmplitude) {
273+
// getObjectsManager()->startPublishing(h);
274+
// }
275+
276+
// for (auto h : histos.mDigitTime) {
277+
// getObjectsManager()->startPublishing(h);
278+
// }
279+
// for (auto h : histos.mDigitAmplitudeCalib) {
280+
// getObjectsManager()->startPublishing(h);
281+
// }
282+
283+
// for (auto h : histos.mDigitTimeCalib) {
284+
// getObjectsManager()->startPublishing(h);
285+
//}
286+
287+
getObjectsManager()->startPublishing(histos.mDigitTime);
288+
getObjectsManager()->startPublishing(histos.mDigitTimeCalib);
289+
getObjectsManager()->startPublishing(histos.mDigitAmplitude);
290+
getObjectsManager()->startPublishing(histos.mDigitAmplitudeCalib);
285291

286292
getObjectsManager()->startPublishing(histos.mDigitAmplitudeEMCAL);
287293
getObjectsManager()->startPublishing(histos.mDigitAmplitudeDCAL);
@@ -295,17 +301,17 @@ void DigitsQcTask::DigitsHistograms::initForTrigger(const char* trigger)
295301
{
296302
mTriggerClass = trigger;
297303

298-
mDigitAmplitude[0] = new TH2F(Form("digitAmplitudeHG_%s", mTriggerClass.data()), Form("Digit Amplitude (High gain) %s", mTriggerClass.data()), 100, 0, 100, 17664, -0.5, 17663.5);
299-
mDigitAmplitude[1] = new TH2F(Form("digitAmplitudeLG_%s", mTriggerClass.data()), Form("Digit Amplitude (Low gain) %s", mTriggerClass.data()), 100, 0, 100, 17664, -0.5, 17663.5);
304+
mDigitAmplitude = new TH2F(Form("digitAmplitudeHG_%s", mTriggerClass.data()), Form("Digit Amplitude (High gain) %s", mTriggerClass.data()), 100, 0, 100, 17664, -0.5, 17663.5);
305+
//mDigitAmplitude[1] = new TH2F(Form("digitAmplitudeLG_%s", mTriggerClass.data()), Form("Digit Amplitude (Low gain) %s", mTriggerClass.data()), 100, 0, 100, 17664, -0.5, 17663.5);
300306

301-
mDigitAmplitudeCalib[0] = new TH2F(Form("digitAmplitudeHGCalib_%s", mTriggerClass.data()), Form("Digit Amplitude (High gain) %s", mTriggerClass.data()), 100, 0, 100, 17664, -0.5, 17663.5);
302-
mDigitAmplitudeCalib[1] = new TH2F(Form("digitAmplitudeLGCalib_%s", mTriggerClass.data()), Form("Digit Amplitude (Low gain) %s", mTriggerClass.data()), 100, 0, 100, 17664, -0.5, 17663.5);
307+
mDigitAmplitudeCalib = new TH2F(Form("digitAmplitudeHGCalib_%s", mTriggerClass.data()), Form("Digit Amplitude (High gain) %s", mTriggerClass.data()), 100, 0, 100, 17664, -0.5, 17663.5);
308+
//mDigitAmplitudeCalib[1] = new TH2F(Form("digitAmplitudeLGCalib_%s", mTriggerClass.data()), Form("Digit Amplitude (Low gain) %s", mTriggerClass.data()), 100, 0, 100, 17664, -0.5, 17663.5);
303309

304-
mDigitTime[0] = new TH2F(Form("digitTimeHG_%s", mTriggerClass.data()), Form("Digit Time (High gain) %s", mTriggerClass.data()), 2000, -200, 200, 17664, -0.5, 17663.5);
305-
mDigitTime[1] = new TH2F(Form("digitTimeLG_%s", mTriggerClass.data()), Form("Digit Time (Low gain) %s", mTriggerClass.data()), 2000, -200, 200, 17664, -0.5, 17663.5);
310+
mDigitTime = new TH2F(Form("digitTimeHG_%s", mTriggerClass.data()), Form("Digit Time (High gain) %s", mTriggerClass.data()), 2000, -200, 200, 17664, -0.5, 17663.5);
311+
// mDigitTime[1] = new TH2F(Form("digitTimeLG_%s", mTriggerClass.data()), Form("Digit Time (Low gain) %s", mTriggerClass.data()), 2000, -200, 200, 17664, -0.5, 17663.5);
306312

307-
mDigitTimeCalib[0] = new TH2F(Form("digitTimeHGCalib_%s", mTriggerClass.data()), Form("Digit Time Calib (High gain) %s", mTriggerClass.data()), 2000, -200, 200, 17664, -0.5, 17663.5);
308-
mDigitTimeCalib[1] = new TH2F(Form("digitTimeLGCalib_%s", mTriggerClass.data()), Form("Digit Time Calib (Low gain) %s", mTriggerClass.data()), 2000, -200, 200, 17664, -0.5, 17663.5);
313+
mDigitTimeCalib = new TH2F(Form("digitTimeHGCalib_%s", mTriggerClass.data()), Form("Digit Time Calib (High gain) %s", mTriggerClass.data()), 2000, -200, 200, 17664, -0.5, 17663.5);
314+
// mDigitTimeCalib[1] = new TH2F(Form("digitTimeLGCalib_%s", mTriggerClass.data()), Form("Digit Time Calib (Low gain) %s", mTriggerClass.data()), 2000, -200, 200, 17664, -0.5, 17663.5);
309315

310316
mDigitOccupancy = new TH2F(Form("digitOccupancyEMC_%s", mTriggerClass.data()), Form("Digit Occupancy EMCAL %s", mTriggerClass.data()), 96, -0.5, 95.5, 208, -0.5, 207.5);
311317
mDigitOccupancyThr = new TH2F(Form("digitOccupancyEMCwThr_%s", mTriggerClass.data()), Form("Digit Occupancy EMCAL with E>0.5 GeV/c %s", mTriggerClass.data()), 96, -0.5, 95.5, 208, -0.5, 207.5);
@@ -323,19 +329,23 @@ void DigitsQcTask::DigitsHistograms::initForTrigger(const char* trigger)
323329
void DigitsQcTask::DigitsHistograms::reset()
324330
{
325331

326-
for (auto h : mDigitAmplitude) {
327-
h->Reset();
328-
}
329-
for (auto h : mDigitTime) {
330-
h->Reset();
331-
}
332-
for (auto h : mDigitAmplitudeCalib) {
333-
h->Reset();
334-
}
335-
for (auto h : mDigitTimeCalib) {
336-
h->Reset();
337-
}
338-
332+
// for (auto h : mDigitAmplitude) {
333+
// h->Reset();
334+
// }
335+
// for (auto h : mDigitTime) {
336+
// h->Reset();
337+
// }
338+
// for (auto h : mDigitAmplitudeCalib) {
339+
// h->Reset();
340+
// }
341+
// for (auto h : mDigitTimeCalib) {
342+
// h->Reset();
343+
// }
344+
345+
mDigitTime->Reset();
346+
mDigitTimeCalib->Reset();
347+
mDigitAmplitude->Reset();
348+
mDigitAmplitudeCalib->Reset();
339349
mDigitAmplitudeEMCAL->Reset();
340350
mDigitAmplitudeDCAL->Reset();
341351
mDigitOccupancy->Reset();
@@ -346,18 +356,30 @@ void DigitsQcTask::DigitsHistograms::reset()
346356

347357
void DigitsQcTask::DigitsHistograms::clean()
348358
{
349-
for (auto h : mDigitAmplitude) {
350-
delete h;
351-
}
352-
for (auto h : mDigitTime) {
353-
delete h;
354-
}
355-
for (auto h : mDigitAmplitudeCalib) {
356-
delete h;
357-
}
358-
for (auto h : mDigitTimeCalib) {
359-
delete h;
360-
}
359+
//for (auto h : mDigitAmplitude) {
360+
// delete h;
361+
//}
362+
// for (auto h : mDigitTime) {
363+
// delete h;
364+
// }
365+
//for (auto h : mDigitAmplitudeCalib) {
366+
// delete h;
367+
//}
368+
//for (auto h : mDigitTimeCalib) {
369+
// delete h;
370+
// }
371+
372+
if (mDigitTime)
373+
delete mDigitTime;
374+
375+
if (mDigitTimeCalib)
376+
delete mDigitTimeCalib;
377+
378+
if (mDigitAmplitude)
379+
delete mDigitAmplitude;
380+
381+
if (mDigitAmplitudeCalib)
382+
delete mDigitAmplitudeCalib;
361383

362384
if (mDigitAmplitudeEMCAL)
363385
delete mDigitAmplitudeEMCAL;

0 commit comments

Comments
 (0)