Skip to content

Commit 2cfcfc2

Browse files
stefan-zugravelstefan-zugravel
committed
[ZDC] bug fix and plot addition
1 parent e1052ca commit 2cfcfc2

File tree

4 files changed

+204
-9
lines changed

4 files changed

+204
-9
lines changed

‎Modules/ZDC/include/ZDC/ZDCRawDataTask.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ class ZDCRawDataTask final : public TaskInterface
141141
std::string fNameChannel[o2::zdc::NModules][o2::zdc::NChPerModule];
142142
std::vector<infoHisto1D> fMatrixHistoBaseline[o2::zdc::NModules][o2::zdc::NChPerModule];
143143
std::vector<infoHisto1D> fMatrixHistoCounts[o2::zdc::NModules][o2::zdc::NChPerModule];
144+
std::vector<infoHisto1D> fMatrixHistoCounts_a[o2::zdc::NModules][o2::zdc::NChPerModule];
144145
std::vector<infoHisto2D> fMatrixHistoSignal[o2::zdc::NModules][o2::zdc::NChPerModule];
145146
std::vector<infoHisto2D> fMatrixHistoBunch[o2::zdc::NModules][o2::zdc::NChPerModule];
146147

‎Modules/ZDC/src/ZDCRawDataTask.cxx‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,15 @@ void ZDCRawDataTask::startOfActivity(const Activity& activity)
7676
void ZDCRawDataTask::startOfCycle()
7777
{
7878
ILOG(Debug, Devel) << "startOfCycle" << ENDM;
79+
80+
// Reset at each QC cycle of the trending plot data for the rate measurement
81+
for (int i = 0; i < o2::zdc::NModules; i++) {
82+
for (int j = 0; j < o2::zdc::NChPerModule; j++) {
83+
for (int k = 0; k < (int)fMatrixHistoCounts_a[i][j].size(); k++) {
84+
fMatrixHistoCounts_a[i][j].at(k).histo->Reset();
85+
}
86+
}
87+
}
7988
fNumCycle++;
8089
fNumCycleErr++;
8190
}
@@ -324,6 +333,18 @@ void ZDCRawDataTask::initHisto()
324333

325334
addNewHisto("COUNTS", "hcounts-ZEM1_TR", "Counts ZEM1", "ZEM1_TR", "LBC");
326335
addNewHisto("COUNTS", "hcounts-ZEM2_TR", "Counts ZEM2", "ZEM2_TR", "LBC");
336+
337+
addNewHisto("COUNTSA", "hcounts_ZNA_TC_TR", "Counts ZNA TC istantaneous", "ZNA_TC_TR", "LBC");
338+
addNewHisto("COUNTSA", "hcounts_ZNA_SUM", "Counts ZNA SUM istantaneous", "ZNA_SUM", "LBC");
339+
addNewHisto("COUNTSA", "hcounts_ZNC_TC_TR", "Counts ZNC TC istantaneous", "ZNC_TC_TR", "LBC");
340+
addNewHisto("COUNTSA", "hcounts_ZNC_SUM", "Counts ZNC SUM istantaneous", "ZNC_SUM", "LBC");
341+
addNewHisto("COUNTSA", "hcounts_ZPA_TC_TR", "Counts ZPA TC istantaneous", "ZPA_TC_TR", "LBC");
342+
addNewHisto("COUNTSA", "hcounts_ZPA_SUM", "Counts ZPA SUM istantaneous", "ZPA_SUM", "LBC");
343+
addNewHisto("COUNTSA", "hcounts_ZPC_TC_TR", "Counts ZPC TC istantaneous", "ZPC_TC_TR", "LBC");
344+
addNewHisto("COUNTSA", "hcounts_ZPC_SUM", "Counts ZPC SUM istantaneous", "ZPC_SUM", "LBC");
345+
addNewHisto("COUNTSA", "hcounts_ZEM1_TR", "Counts ZEM1 istantaneous", "ZEM1_TR", "LBC");
346+
addNewHisto("COUNTSA", "hcounts_ZEM2_TR", "Counts ZEM2 istantaneous", "ZEM2_TR", "LBC");
347+
327348
// Histograms Signal
328349
int nBCAheadTrig = 3;
329350
int nbx = (nBCAheadTrig + 1 + 12) * o2::zdc::NTimeBinsPerBC;
@@ -780,10 +801,17 @@ int ZDCRawDataTask::process(const o2::zdc::EventChData& ch)
780801
if (fSummaryError && (f.error)) {
781802
fSummaryError->Fill(fMatrixAlign[f.board][f.ch].bin - 1, 0);
782803
}
804+
805+
// Fill counts
783806
for (int i = 0; i < (int)fMatrixHistoCounts[f.board][f.ch].size(); i++) {
784807
fMatrixHistoCounts[f.board][f.ch].at(i).histo->Fill(f.hits & 0xfff);
785808
}
786809

810+
// Fill counts for trending
811+
for (int i = 0; i < (int)fMatrixHistoCounts_a[f.board][f.ch].size(); i++) {
812+
fMatrixHistoCounts_a[f.board][f.ch].at(i).histo->Fill(f.hits & 0xfff);
813+
}
814+
787815
// Fill Summary
788816
if (fMapBinNameIdSummaryHisto.find(getNameChannel(f.board, f.ch)) != fMapBinNameIdSummaryHisto.end()) {
789817
if (fMatrixHistoBaseline[f.board][f.ch].size() > 0) {
@@ -952,12 +980,46 @@ bool ZDCRawDataTask::addNewHisto(std::string type, std::string name, std::string
952980
return true;
953981
}
954982
}
983+
984+
if (type == "COUNTSA") {
985+
// Check if Histogram Exist
986+
if (std::find(fNameHisto.begin(), fNameHisto.end(), name) == fNameHisto.end()) {
987+
fNameHisto.push_back(name);
988+
h1d.histo = new TH1F(hname, htit, fNumBinX, fMinBinX, fMaxBinX);
989+
h1d.condHisto.push_back(condition);
990+
ih = (int)fMatrixHistoCounts_a[mod][ch].size();
991+
fMatrixHistoCounts_a[mod][ch].push_back(h1d);
992+
993+
if (ih < (int)fMatrixHistoCounts_a[mod][ch].size()) {
994+
getObjectsManager()->startPublishing(fMatrixHistoCounts_a[mod][ch].at(ih).histo);
995+
try {
996+
getObjectsManager()->addMetadata(fMatrixHistoCounts_a[mod][ch].at(ih).histo->GetName(), fMatrixHistoCounts_a[mod][ch].at(ih).histo->GetName(), "34");
997+
return true;
998+
} catch (...) {
999+
ILOG(Warning, Support) << "Metadata could not be added to " << fMatrixHistoCounts_a[mod][ch].at(ih).histo->GetName() << ENDM;
1000+
return false;
1001+
}
1002+
1003+
delete h1d.histo;
1004+
h1d.condHisto.clear();
1005+
}
1006+
return true;
1007+
} else {
1008+
for (int i = 0; i < (int)fMatrixHistoCounts_a[mod][ch].size(); i++) {
1009+
fMatrixHistoCounts_a[mod][ch].at(i).histo->Reset();
1010+
}
1011+
return true;
1012+
}
1013+
}
1014+
9551015
// SIGNAL
9561016
if (type == "SIGNAL") {
9571017
// Check if Histogram Exist
9581018
if (std::find(fNameHisto.begin(), fNameHisto.end(), name) == fNameHisto.end()) {
9591019
fNameHisto.push_back(name);
9601020
h2d.histo = new TH2F(hname, htit, fNumBinX, fMinBinX, fMaxBinX, fNumBinY, fMinBinY, fMaxBinY);
1021+
h2d.histo->GetXaxis()->SetTitle("Sample number");
1022+
h2d.histo->GetYaxis()->SetTitle("ADC units");
9611023
h2d.condHisto.push_back(condition);
9621024
ih = (int)fMatrixHistoSignal[mod][ch].size();
9631025
fMatrixHistoSignal[mod][ch].push_back(h2d);

‎Modules/ZDC/src/ZDCRecDataPostProcessing.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ void ZDCRecDataPostProcessing::updateSummaryPeak1pHistos(Trigger t, repository::
357357
} else {
358358
maxBin1p = 250;
359359
}
360-
h->GetXaxis()->SetRangeUser(2, 250);
360+
h->GetXaxis()->SetRangeUser(minBin1p, maxBin1p);
361361
mSummaryPeak1pHisto->SetBinContent(bin, h->GetBinCenter(h->GetMaximumBin()));
362362
}
363363
}

‎Modules/ZDC/src/ZDCRecDataTask.cxx‎

Lines changed: 140 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ void ZDCRecDataTask::initVecType()
165165
insertTypeVec("ADC");
166166
insertTypeVec("TDCV");
167167
insertTypeVec("TDCA");
168+
insertTypeVec("TDCAC");
169+
insertTypeVec("ADCAC");
168170
insertTypeVec("BC");
169171
insertTypeVec("INFO");
170172
}
@@ -292,6 +294,15 @@ void ZDCRecDataTask::initHisto()
292294
addNewHisto("ADC1D", "h_ADC_ZPC_TC_H", "ADC ZPC TC ZOOM", "ADC", "ZPCC", "", "", 0);
293295
addNewHisto("ADC1D", "h_ADC_ZPC_SUM_H", "ADC ZPC SUM ZOOM", "ADC", "ZPCS", "", "", 0);
294296

297+
addNewHisto("ADC1D", "h_ADC_ZPA_TC_H_CUT", "ADC ZPA TC ZOOM with cut", "ADCAC", "ZPAC", "", "", 0);
298+
addNewHisto("ADC1D", "h_ADC_ZPA_SUM_H_CUT", "ADC ZPA SUM ZOOM with cut", "ADCAC", "ZPAS", "", "", 0);
299+
addNewHisto("ADC1D", "h_ADC_ZPC_TC_H_CUT", "ADC ZPC TC ZOOM with cut", "ADCAC", "ZPCC", "", "", 0);
300+
addNewHisto("ADC1D", "h_ADC_ZPC_SUM_H_CUT", "ADC ZPC SUM ZOOM with cut", "ADCAC", "ZPCS", "", "", 0);
301+
addNewHisto("ADC1D", "h_ADC_ZNA_TC_H_CUT", "ADC ZNA TC ZOOM with cut", "ADCAC", "ZNAC", "", "", 0);
302+
addNewHisto("ADC1D", "h_ADC_ZNA_SUM_H_CUT", "ADC ZNA SUM ZOOM with cut", "ADCAC", "ZNAS", "", "", 0);
303+
addNewHisto("ADC1D", "h_ADC_ZNC_TC_H_CUT", "ADC ZNC TC ZOOM with cut", "ADCAC", "ZNCC", "", "", 0);
304+
addNewHisto("ADC1D", "h_ADC_ZNC_SUM_H_CUT", "ADC ZNC SUM ZOOM with cut", "ADCAC", "ZNCS", "", "", 0);
305+
295306
if (auto param = mCustomParameters.find("TDCT"); param != mCustomParameters.end()) {
296307
ILOG(Debug, Devel) << "Custom parameter - TDCT: " << param->second << ENDM;
297308
tokenString = tokenLine(param->second, ";");
@@ -350,6 +361,16 @@ void ZDCRecDataTask::initHisto()
350361
addNewHisto("TDC1D", "h_TDC_ZNC_SUM_A_H", "TDC Amplitude ZNC SUM ZOOM", "TDCA", "ZNCS", "", "", 0);
351362
addNewHisto("TDC1D", "h_TDC_ZPC_TC_A_H", "TDC Amplitude ZPC TC ZOOM", "TDCA", "ZPCC", "", "", 0);
352363
addNewHisto("TDC1D", "h_TDC_ZPC_SUM_A_H", "TDC Amplitude ZPC SUM ZOOM", "TDCA", "ZPCS", "", "", 0);
364+
365+
addNewHisto("TDC1D", "h_TDC_ZPA_TC_A_H_CUT", "TDC Amplitude ZPA TC ZOOM with cut", "TDCAC", "ZPAC", "", "", 0);
366+
addNewHisto("TDC1D", "h_TDC_ZPA_SUM_A_H_CUT", "TDC Amplitude ZPA SUM ZOOM with cut", "TDCAC", "ZPAS", "", "", 0);
367+
addNewHisto("TDC1D", "h_TDC_ZPC_TC_A_H_CUT", "TDC Amplitude ZPC TC ZOOM with cut", "TDCAC", "ZPCC", "", "", 0);
368+
addNewHisto("TDC1D", "h_TDC_ZPC_SUM_A_H_CUT", "TDC Amplitude ZPC SUM ZOOM with cut", "TDCAC", "ZPCS", "", "", 0);
369+
addNewHisto("TDC1D", "h_TDC_ZNA_TC_A_H_CUT", "TDC Amplitude ZNA TC ZOOM with cut", "TDCAC", "ZNAC", "", "", 0);
370+
addNewHisto("TDC1D", "h_TDC_ZNA_SUM_A_H_CUT", "TDC Amplitude ZNA SUM ZOOM with cut", "TDCAC", "ZNAS", "", "", 0);
371+
addNewHisto("TDC1D", "h_TDC_ZNC_TC_A_H_CUT", "TDC Amplitude ZNC TC ZOOM with cut", "TDCAC", "ZNCC", "", "", 0);
372+
addNewHisto("TDC1D", "h_TDC_ZNC_SUM_A_H_CUT", "TDC Amplitude ZNC SUM ZOOM with cut", "TDCAC", "ZNCS", "", "", 0);
373+
353374
// Centroid ZPA
354375
if (auto param = mCustomParameters.find("CENTR_ZPA"); param != mCustomParameters.end()) {
355376
ILOG(Debug, Devel) << "Custom parameter - CENTR_ZPA: " << param->second << ENDM;
@@ -521,6 +542,8 @@ void ZDCRecDataTask::initHisto()
521542
setBinHisto2D(200, -2, 2, 200, -2, 2);
522543
}
523544
addNewHisto("CENTR_ZNA", "h_CENTR_ZNA", "ZNA Centroid (cm)", "ADC", "CXZNA", "ADC", "CYZNA", 0);
545+
addNewHisto("CENTR_ZNA", "h_CENTR_ZNA_cut_ZEM", "ZNA Centroid (cm)", "ADC", "CXZNA", "ADC", "CYZNA", 0);
546+
524547
// Centroid ZNC
525548
if (auto param = mCustomParameters.find("CENTR_ZNC"); param != mCustomParameters.end()) {
526549
ILOG(Debug, Devel) << "Custom parameter - CENTR_ZNC: " << param->second << ENDM;
@@ -530,6 +553,7 @@ void ZDCRecDataTask::initHisto()
530553
setBinHisto2D(200, -2, 2, 200, -2, 2);
531554
}
532555
addNewHisto("CENTR_ZNC", "h_CENTR_ZNC", "ZNC Centroid (cm)", "ADC", "CXZNC", "ADC", "CYZNC", 0);
556+
addNewHisto("CENTR_ZNC", "h_CENTR_ZNC_cut_ZEM", "ZNC Centroid (cm)", "ADC", "CXZNC", "ADC", "CYZNC", 0);
533557
}
534558

535559
bool ZDCRecDataTask::add1DHisto(std::string typeH, std::string name, std::string title, std::string typeCh1, std::string ch1, int bin)
@@ -638,8 +662,42 @@ int ZDCRecDataTask::process(const gsl::span<const o2::zdc::BCRecData>& RecBC,
638662
// Histo 1D
639663
for (int i = 0; i < (int)mHisto1D.size(); i++) {
640664
// Fill ADC 1D
641-
if (mHisto1D.at(i).typeh == "ADC1D" && mHisto1D.at(i).typech == "ADC") {
642-
mHisto1D.at(i).histo->Fill(getADCRecValue(mHisto1D.at(i).typech, mHisto1D.at(i).ch));
665+
if (mHisto1D.at(i).typeh == "ADC1D" && (mHisto1D.at(i).typech == "ADC" || mHisto1D.at(i).typech == "ADCAC")) {
666+
667+
if (mHisto1D.at(i).typech == "ADC") {
668+
mHisto1D.at(i).histo->Fill(getADCRecValue(mHisto1D.at(i).typech, mHisto1D.at(i).ch));
669+
}
670+
671+
if (mHisto1D.at(i).typech == "ADCAC") {
672+
if (mHisto1D.at(i).ch == "ZPAC" || mHisto1D.at(i).ch == "ZPAS") {
673+
if (mEv.NtdcA(o2::zdc::TDCZNAC) == 0 && mEv.NtdcA(o2::zdc::TDCZNAS) == 0) {
674+
if (getADCRecValue("ADC", mHisto1D.at(i).ch) > -8000) {
675+
mHisto1D.at(i).histo->Fill(getADCRecValue("ADC", mHisto1D.at(i).ch));
676+
}
677+
}
678+
}
679+
if (mHisto1D.at(i).ch == "ZPCC" || mHisto1D.at(i).ch == "ZPCS") {
680+
if (mEv.NtdcA(o2::zdc::TDCZNCC) == 0 && mEv.NtdcA(o2::zdc::TDCZNCS) == 0) {
681+
if (getADCRecValue("ADC", mHisto1D.at(i).ch) > -8000) {
682+
mHisto1D.at(i).histo->Fill(getADCRecValue("ADC", mHisto1D.at(i).ch));
683+
}
684+
}
685+
}
686+
if (mHisto1D.at(i).ch == "ZNAC" || mHisto1D.at(i).ch == "ZNAS") {
687+
if (mEv.NtdcA(o2::zdc::TDCZPAC) == 0 && mEv.NtdcA(o2::zdc::TDCZPAS) == 0) {
688+
if (getADCRecValue("ADC", mHisto1D.at(i).ch) > -8000) {
689+
mHisto1D.at(i).histo->Fill(getADCRecValue("ADC", mHisto1D.at(i).ch));
690+
}
691+
}
692+
}
693+
if (mHisto1D.at(i).ch == "ZNCC" || mHisto1D.at(i).ch == "ZNCS") {
694+
if (mEv.NtdcA(o2::zdc::TDCZPCC) == 0 && mEv.NtdcA(o2::zdc::TDCZPCS) == 0) {
695+
if (getADCRecValue("ADC", mHisto1D.at(i).ch) > -8000) {
696+
mHisto1D.at(i).histo->Fill(getADCRecValue("ADC", mHisto1D.at(i).ch));
697+
}
698+
}
699+
}
700+
}
643701
}
644702

645703
// Fill TDC 1D
@@ -657,6 +715,65 @@ int ZDCRecDataTask::process(const gsl::span<const o2::zdc::BCRecData>& RecBC,
657715
}
658716
}
659717
}
718+
719+
// Fill TDCA with cut 1D
720+
if (mHisto1D.at(i).typeh == "TDC1D" && (mHisto1D.at(i).typech == "TDCAC")) {
721+
int tdcid = getIdTDCch("TDCA", mHisto1D.at(i).ch);
722+
auto nhitv = mEv.NtdcV(tdcid);
723+
if (tdcid == o2::zdc::TDCZPAC || tdcid == o2::zdc::TDCZPAS) {
724+
if (mEv.NtdcA(o2::zdc::TDCZNAC) == 0 && mEv.NtdcA(o2::zdc::TDCZNAS) == 0) {
725+
if (mEv.NtdcA(tdcid) == nhitv && nhitv > 0) {
726+
for (int ihit = 0; ihit < nhitv; ihit++) {
727+
if (mHisto1D.at(i).typech == "TDCAC") {
728+
if ((mEv.tdcV(tdcid, ihit) > -2.5 && mEv.tdcV(tdcid, ihit) < 2.5)) {
729+
mHisto1D.at(i).histo->Fill(mEv.tdcA(tdcid, ihit));
730+
}
731+
}
732+
}
733+
}
734+
}
735+
}
736+
if (tdcid == o2::zdc::TDCZPCC || tdcid == o2::zdc::TDCZPCS) {
737+
if (mEv.NtdcA(o2::zdc::TDCZNCC) == 0 && mEv.NtdcA(o2::zdc::TDCZNCS) == 0) {
738+
if (mEv.NtdcA(tdcid) == nhitv && nhitv > 0) {
739+
for (int ihit = 0; ihit < nhitv; ihit++) {
740+
if (mHisto1D.at(i).typech == "TDCAC") {
741+
if ((mEv.tdcV(tdcid, ihit) > -2.5 && mEv.tdcV(tdcid, ihit) < 2.5)) {
742+
mHisto1D.at(i).histo->Fill(mEv.tdcA(tdcid, ihit));
743+
}
744+
}
745+
}
746+
}
747+
}
748+
}
749+
if (tdcid == o2::zdc::TDCZNAC || tdcid == o2::zdc::TDCZNAS) {
750+
if (mEv.NtdcA(o2::zdc::TDCZPAC) == 0 && mEv.NtdcA(o2::zdc::TDCZPAS) == 0) {
751+
if (mEv.NtdcA(tdcid) == nhitv && nhitv > 0) {
752+
for (int ihit = 0; ihit < nhitv; ihit++) {
753+
if (mHisto1D.at(i).typech == "TDCAC") {
754+
if ((mEv.tdcV(tdcid, ihit) > -2.5 && mEv.tdcV(tdcid, ihit) < 2.5)) {
755+
mHisto1D.at(i).histo->Fill(mEv.tdcA(tdcid, ihit));
756+
}
757+
}
758+
}
759+
}
760+
}
761+
}
762+
if (tdcid == o2::zdc::TDCZNCC || tdcid == o2::zdc::TDCZNCS) {
763+
if (mEv.NtdcA(o2::zdc::TDCZPCC) == 0 && mEv.NtdcA(o2::zdc::TDCZPCS) == 0) {
764+
if (mEv.NtdcA(tdcid) == nhitv && nhitv > 0) {
765+
for (int ihit = 0; ihit < nhitv; ihit++) {
766+
if (mHisto1D.at(i).typech == "TDCAC") {
767+
if ((mEv.tdcV(tdcid, ihit) > -2.5 && mEv.tdcV(tdcid, ihit) < 2.5)) {
768+
mHisto1D.at(i).histo->Fill(mEv.tdcA(tdcid, ihit));
769+
}
770+
}
771+
}
772+
}
773+
}
774+
}
775+
}
776+
660777
// Fill CENTROID ZP
661778
if (mHisto1D.at(i).typeh == "CENTR_ZPA" && mHisto1D.at(i).typech == "ADC") {
662779
mHisto1D.at(i).histo->Fill(mEv.xZPA());
@@ -717,15 +834,30 @@ int ZDCRecDataTask::process(const gsl::span<const o2::zdc::BCRecData>& RecBC,
717834
}
718835
}
719836
if (mHisto2D.at(i).typeh == "CENTR_ZNA" && mHisto2D.at(i).typech1 == "ADC" && mHisto2D.at(i).typech2 == "ADC") {
720-
mEv.centroidZNA(x, y);
721-
mHisto2D.at(i).histo->Fill(x, y);
837+
if (mHisto2D.at(i).histo->GetName() == TString::Format("h_CENTR_ZNA")) {
838+
mEv.centroidZNA(x, y);
839+
mHisto2D.at(i).histo->Fill(x, y);
840+
} else {
841+
// if (( (float)o2::zdc::TDCZEM2 > -2.5 && (float)o2::zdc::TDCZEM2 < 2.5 ) && ( (float)o2::zdc::TDCZEM1 > -2.5 && (float)o2::zdc::TDCZEM1 < 2.5 ) ){
842+
if (((float)mEv.tdcV(5, 0) > -2.5 && (float)mEv.tdcV(5, 0) < 2.5) && ((float)mEv.tdcV(4, 0) > -2.5 && (float)mEv.tdcV(4, 0) < 2.5)) {
843+
mEv.centroidZNA(x, y);
844+
mHisto2D.at(i).histo->Fill(x, y);
845+
}
846+
}
722847
}
723848
if (mHisto2D.at(i).typeh == "CENTR_ZNC" && mHisto2D.at(i).typech1 == "ADC" && mHisto2D.at(i).typech2 == "ADC") {
724-
mEv.centroidZNC(x, y);
725-
mHisto2D.at(i).histo->Fill(x, y);
849+
if (mHisto2D.at(i).histo->GetName() == TString::Format("h_CENTR_ZNC")) {
850+
mEv.centroidZNC(x, y);
851+
mHisto2D.at(i).histo->Fill(x, y);
852+
} else {
853+
if (((float)mEv.tdcV(5, 0) > -2.5 && (float)mEv.tdcV(5, 0) < 2.5) && ((float)mEv.tdcV(4, 0) > -2.5 && (float)mEv.tdcV(4, 0) < 2.5)) {
854+
mEv.centroidZNC(x, y);
855+
mHisto2D.at(i).histo->Fill(x, y);
856+
}
857+
}
726858
}
727859
} // for histo 2D
728-
} // while
860+
} // while
729861
return 0;
730862
}
731863

@@ -809,7 +941,7 @@ float ZDCRecDataTask::getADCRecValue(std::string typech, std::string ch)
809941
if (typech == "ADC" && ch == "ZEM2") {
810942
return mEv.EZEM2();
811943
}
812-
return 0.00;
944+
return -9000.0;
813945
}
814946

815947
int ZDCRecDataTask::getIdTDCch(std::string typech, std::string ch)

0 commit comments

Comments
 (0)