Skip to content

Commit 21d4e7b

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent e7d2a4c commit 21d4e7b

2 files changed

Lines changed: 175 additions & 102 deletions

File tree

‎Common/Tasks/zdcTableReader.cxx‎

Lines changed: 174 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ struct ZDCLIAnalysis {
3737
Configurable<int> nBinstStamp{"nBinstStamp", 1000, "no. bins in histo vs. timestamp"};
3838
Configurable<float> tStampMax{"tStampMax", 1000, ",maximum value for timestamp"};
3939
//
40-
Configurable<bool> tdcCut{"tdcCut", false, "Flag for TDC cut"};
40+
Configurable<bool> tdcCut{"tdcCut", false, "Flag for TDC cut"};
4141
Configurable<float> tdcZNmincut{"tdcZNmincut", -1.5, "Min. ZN TDC cut value"};
42-
Configurable<float> tdcZNmaxcut{"tdcZNmaxcut", 1.5, "Max. ZN TDC cut value"};
42+
Configurable<float> tdcZNmaxcut{"tdcZNmaxcut", 1.5, "Max. ZN TDC cut value"};
4343
Configurable<float> tdcZPmincut{"tdcZPmincut", -1.5, "Min. ZP TDC cut value"};
44-
Configurable<float> tdcZPmaxcut{"tdcZPmaxcut", 1.5, "Max. ZP TDC cut value"};
44+
Configurable<float> tdcZPmaxcut{"tdcZPmaxcut", 1.5, "Max. ZP TDC cut value"};
4545
//
4646
Configurable<int> nBinsADC{"nBinsADC", 1000, "n bins 4 ZDC ADCs"};
4747
Configurable<int> nBinsAmpZN{"nBinsAmpZN", 1025, "n bins 4 ZN amplitudes"};
@@ -278,21 +278,32 @@ struct ZDCLIAnalysis {
278278
istriggerTVX = true;
279279

280280
// comment the if when you want the output for BC selection!!!
281-
//if (zvtxSel && ottoSel && istriggerTVX && isdoOccupancySel && isnoSameBunchPileupCut && isGoodZvtxFT0vsPVsel && isnoCollInTimeRangeStandard && isnoTimeFrameBorder && isnoITSROFFrameBorder && isGoodITSLayersAllsel) {
281+
// if (zvtxSel && ottoSel && istriggerTVX && isdoOccupancySel && isnoSameBunchPileupCut && isGoodZvtxFT0vsPVsel && isnoCollInTimeRangeStandard && isnoTimeFrameBorder && isnoITSROFFrameBorder && isGoodITSLayersAllsel) {
282282
if (zvtxSel && ottoSel && isnoSameBunchPileupCut) {
283-
283+
284284
registry.get<TH1>(HIST("hcounts"))->Fill(0., 1.);
285-
if(isZNAtdc) registry.get<TH1>(HIST("hcounts"))->Fill(1., 1.);
286-
if(isZPAtdc) registry.get<TH1>(HIST("hcounts"))->Fill(2., 1.);
287-
if(isZNCtdc) registry.get<TH1>(HIST("hcounts"))->Fill(3., 1.);
288-
if(isZPCtdc) registry.get<TH1>(HIST("hcounts"))->Fill(4., 1.);
289-
if(isZNAtdc || isZNCtdc) registry.get<TH1>(HIST("hcounts"))->Fill(5., 1.);
290-
if(isZNAtdc || isZPAtdc) registry.get<TH1>(HIST("hcounts"))->Fill(6., 1.);
291-
if(isZNCtdc || isZPCtdc) registry.get<TH1>(HIST("hcounts"))->Fill(7., 1.);
292-
if(isZNAtdc || isZPAtdc || isZNCtdc || isZPCtdc) registry.get<TH1>(HIST("hcounts"))->Fill(8., 1.);
293-
if(isZNAtdc && isZNCtdc) registry.get<TH1>(HIST("hcounts"))->Fill(9., 1.);
294-
if(isZNAtdc && isZPAtdc) registry.get<TH1>(HIST("hcounts"))->Fill(10., 1.);
295-
if(isZNCtdc && isZPCtdc) registry.get<TH1>(HIST("hcounts"))->Fill(11., 1.);
285+
if (isZNAtdc)
286+
registry.get<TH1>(HIST("hcounts"))->Fill(1., 1.);
287+
if (isZPAtdc)
288+
registry.get<TH1>(HIST("hcounts"))->Fill(2., 1.);
289+
if (isZNCtdc)
290+
registry.get<TH1>(HIST("hcounts"))->Fill(3., 1.);
291+
if (isZPCtdc)
292+
registry.get<TH1>(HIST("hcounts"))->Fill(4., 1.);
293+
if (isZNAtdc || isZNCtdc)
294+
registry.get<TH1>(HIST("hcounts"))->Fill(5., 1.);
295+
if (isZNAtdc || isZPAtdc)
296+
registry.get<TH1>(HIST("hcounts"))->Fill(6., 1.);
297+
if (isZNCtdc || isZPCtdc)
298+
registry.get<TH1>(HIST("hcounts"))->Fill(7., 1.);
299+
if (isZNAtdc || isZPAtdc || isZNCtdc || isZPCtdc)
300+
registry.get<TH1>(HIST("hcounts"))->Fill(8., 1.);
301+
if (isZNAtdc && isZNCtdc)
302+
registry.get<TH1>(HIST("hcounts"))->Fill(9., 1.);
303+
if (isZNAtdc && isZPAtdc)
304+
registry.get<TH1>(HIST("hcounts"))->Fill(10., 1.);
305+
if (isZNCtdc && isZPCtdc)
306+
registry.get<TH1>(HIST("hcounts"))->Fill(11., 1.);
296307

297308
if (enCalibZNA > 0.) {
298309
zna *= enCalibZNA;
@@ -321,40 +332,61 @@ struct ZDCLIAnalysis {
321332

322333
registry.get<TH1>(HIST("hzvertex"))->Fill(zvtx);
323334

324-
325335
if (!applyZDCcut) {
326336

327-
if (isZNAtdc) registry.get<TH1>(HIST("hZNApmc"))->Fill(zna);
328-
if (isZNCtdc) registry.get<TH1>(HIST("hZNCpmc"))->Fill(znc);
329-
if (isZPAtdc) registry.get<TH1>(HIST("hZPApmc"))->Fill(zpa);
330-
if (isZPCtdc) registry.get<TH1>(HIST("hZPCpmc"))->Fill(zpc);
337+
if (isZNAtdc)
338+
registry.get<TH1>(HIST("hZNApmc"))->Fill(zna);
339+
if (isZNCtdc)
340+
registry.get<TH1>(HIST("hZNCpmc"))->Fill(znc);
341+
if (isZPAtdc)
342+
registry.get<TH1>(HIST("hZPApmc"))->Fill(zpa);
343+
if (isZPCtdc)
344+
registry.get<TH1>(HIST("hZPCpmc"))->Fill(zpc);
331345
//
332-
if (isZNAtdc || isZPAtdc) registry.get<TH1>(HIST("hZDCA"))->Fill(zna + zpa);
333-
if (isZNCtdc || isZPCtdc) registry.get<TH1>(HIST("hZDCC"))->Fill(znc + zpc);
346+
if (isZNAtdc || isZPAtdc)
347+
registry.get<TH1>(HIST("hZDCA"))->Fill(zna + zpa);
348+
if (isZNCtdc || isZPCtdc)
349+
registry.get<TH1>(HIST("hZDCC"))->Fill(znc + zpc);
334350
//
335-
if (isZNAtdc) registry.get<TH2>(HIST("hZNAamplvsADC"))->Fill(znaADC, zna);
336-
if (isZNCtdc) registry.get<TH2>(HIST("hZNCamplvsADC"))->Fill(zncADC, znc);
337-
if (isZPAtdc) registry.get<TH2>(HIST("hZPAamplvsADC"))->Fill(zpaADC, zpa);
338-
if (isZPCtdc) registry.get<TH2>(HIST("hZPCamplvsADC"))->Fill(zpcADC, zpc);
351+
if (isZNAtdc)
352+
registry.get<TH2>(HIST("hZNAamplvsADC"))->Fill(znaADC, zna);
353+
if (isZNCtdc)
354+
registry.get<TH2>(HIST("hZNCamplvsADC"))->Fill(zncADC, znc);
355+
if (isZPAtdc)
356+
registry.get<TH2>(HIST("hZPAamplvsADC"))->Fill(zpaADC, zpa);
357+
if (isZPCtdc)
358+
registry.get<TH2>(HIST("hZPCamplvsADC"))->Fill(zpcADC, zpc);
339359
//
340-
if (isZNAtdc || isZNCtdc) registry.get<TH2>(HIST("hZNAvsZNC"))->Fill(znc, zna);
341-
if (isZPAtdc || isZPCtdc) registry.get<TH2>(HIST("hZPAvsZPC"))->Fill(zpc, zpa);
342-
if (isZNAtdc || isZPAtdc) registry.get<TH2>(HIST("hZNAvsZPA"))->Fill(zpa, zna);
343-
if (isZNCtdc || isZPCtdc) registry.get<TH2>(HIST("hZNCvsZPC"))->Fill(zpc, znc);
360+
if (isZNAtdc || isZNCtdc)
361+
registry.get<TH2>(HIST("hZNAvsZNC"))->Fill(znc, zna);
362+
if (isZPAtdc || isZPCtdc)
363+
registry.get<TH2>(HIST("hZPAvsZPC"))->Fill(zpc, zpa);
364+
if (isZNAtdc || isZPAtdc)
365+
registry.get<TH2>(HIST("hZNAvsZPA"))->Fill(zpa, zna);
366+
if (isZNCtdc || isZPCtdc)
367+
registry.get<TH2>(HIST("hZNCvsZPC"))->Fill(zpc, znc);
344368
//
345-
if (isZNAtdc) registry.get<TH2>(HIST("hZNAvstdc"))->Fill(tdczna, zna);
346-
if (isZNCtdc) registry.get<TH2>(HIST("hZNCvstdc"))->Fill(tdcznc, znc);
347-
if (isZPAtdc) registry.get<TH2>(HIST("hZPAvstdc"))->Fill(tdczpa, zpa);
348-
if (isZPCtdc) registry.get<TH2>(HIST("hZPCvstdc"))->Fill(tdczpc, zpc);
369+
if (isZNAtdc)
370+
registry.get<TH2>(HIST("hZNAvstdc"))->Fill(tdczna, zna);
371+
if (isZNCtdc)
372+
registry.get<TH2>(HIST("hZNCvstdc"))->Fill(tdcznc, znc);
373+
if (isZPAtdc)
374+
registry.get<TH2>(HIST("hZPAvstdc"))->Fill(tdczpa, zpa);
375+
if (isZPCtdc)
376+
registry.get<TH2>(HIST("hZPCvstdc"))->Fill(tdczpc, zpc);
349377
//
350-
if (isZNAtdc) registry.get<TH2>(HIST("hZNAcvsZNAsum"))->Fill(0.25 * (znapm1 + znapm2 + znapm3 + znapm4), zna);
351-
if (isZNCtdc) registry.get<TH2>(HIST("hZNCcvsZNCsum"))->Fill(0.25 * (zncpm1 + zncpm2 + zncpm3 + zncpm4), znc);
378+
if (isZNAtdc)
379+
registry.get<TH2>(HIST("hZNAcvsZNAsum"))->Fill(0.25 * (znapm1 + znapm2 + znapm3 + znapm4), zna);
380+
if (isZNCtdc)
381+
registry.get<TH2>(HIST("hZNCcvsZNCsum"))->Fill(0.25 * (zncpm1 + zncpm2 + zncpm3 + zncpm4), znc);
352382
//
353-
if (isZNAtdc || isZNCtdc) registry.get<TH2>(HIST("hZNvsV0A"))->Fill(multV0A / 100., zna + znc);
354-
if (isZNAtdc) registry.get<TH2>(HIST("hZNAvsFT0A"))->Fill((multFT0A) / 100., zna);
355-
if (isZNCtdc) registry.get<TH2>(HIST("hZNCvsFT0C"))->Fill((multFT0C) / 100., znc);
356-
}
357-
else {
383+
if (isZNAtdc || isZNCtdc)
384+
registry.get<TH2>(HIST("hZNvsV0A"))->Fill(multV0A / 100., zna + znc);
385+
if (isZNAtdc)
386+
registry.get<TH2>(HIST("hZNAvsFT0A"))->Fill((multFT0A) / 100., zna);
387+
if (isZNCtdc)
388+
registry.get<TH2>(HIST("hZNCvsFT0C"))->Fill((multFT0C) / 100., znc);
389+
} else {
358390
bool isZNChigh = false;
359391
if (znc >= zdccCutLow)
360392
isZNChigh = true;
@@ -368,32 +400,50 @@ struct ZDCLIAnalysis {
368400
if (zpc >= zdccCutLow)
369401
isZPChigh = true;
370402
//
371-
if (isZNAtdc && isZNChigh) registry.get<TH1>(HIST("hZNApmc"))->Fill(zna);
372-
if (isZNCtdc && isZNAhigh) registry.get<TH1>(HIST("hZNCpmc"))->Fill(znc);
373-
if (isZPAtdc && isZPChigh) registry.get<TH1>(HIST("hZPApmc"))->Fill(zpa);
374-
if (isZPCtdc && isZPAhigh) registry.get<TH1>(HIST("hZPCpmc"))->Fill(zpc);
403+
if (isZNAtdc && isZNChigh)
404+
registry.get<TH1>(HIST("hZNApmc"))->Fill(zna);
405+
if (isZNCtdc && isZNAhigh)
406+
registry.get<TH1>(HIST("hZNCpmc"))->Fill(znc);
407+
if (isZPAtdc && isZPChigh)
408+
registry.get<TH1>(HIST("hZPApmc"))->Fill(zpa);
409+
if (isZPCtdc && isZPAhigh)
410+
registry.get<TH1>(HIST("hZPCpmc"))->Fill(zpc);
375411
//
376-
if ((isZNAtdc || isZPAtdc) && (isZNChigh && isZPChigh)) registry.get<TH1>(HIST("hZDCA"))->Fill(zna + zpa);
377-
if ((isZNCtdc || isZPCtdc) && (isZNAhigh && isZPAhigh)) registry.get<TH1>(HIST("hZDCC"))->Fill(znc + zpc);
412+
if ((isZNAtdc || isZPAtdc) && (isZNChigh && isZPChigh))
413+
registry.get<TH1>(HIST("hZDCA"))->Fill(zna + zpa);
414+
if ((isZNCtdc || isZPCtdc) && (isZNAhigh && isZPAhigh))
415+
registry.get<TH1>(HIST("hZDCC"))->Fill(znc + zpc);
378416
//
379-
if (isZNAtdc && isZNChigh) registry.get<TH2>(HIST("hZNAamplvsADC"))->Fill(znaADC, zna);
380-
if (isZNCtdc && isZNAhigh) registry.get<TH2>(HIST("hZNCamplvsADC"))->Fill(zncADC, znc);
381-
if (isZPAtdc && isZPChigh) registry.get<TH2>(HIST("hZPAamplvsADC"))->Fill(zpaADC, zpa);
382-
if (isZPCtdc && isZPAhigh) registry.get<TH2>(HIST("hZPCamplvsADC"))->Fill(zpcADC, zpc);
417+
if (isZNAtdc && isZNChigh)
418+
registry.get<TH2>(HIST("hZNAamplvsADC"))->Fill(znaADC, zna);
419+
if (isZNCtdc && isZNAhigh)
420+
registry.get<TH2>(HIST("hZNCamplvsADC"))->Fill(zncADC, znc);
421+
if (isZPAtdc && isZPChigh)
422+
registry.get<TH2>(HIST("hZPAamplvsADC"))->Fill(zpaADC, zpa);
423+
if (isZPCtdc && isZPAhigh)
424+
registry.get<TH2>(HIST("hZPCamplvsADC"))->Fill(zpcADC, zpc);
383425
//
384-
if (isZNAtdc && isZNChigh) registry.get<TH2>(HIST("hZNAvstdc"))->Fill(tdczna, zna);
385-
if (isZNCtdc && isZNAhigh) registry.get<TH2>(HIST("hZNCvstdc"))->Fill(tdcznc, znc);
386-
if (isZPAtdc && isZPChigh) registry.get<TH2>(HIST("hZPAvstdc"))->Fill(tdczpa, zpa);
387-
if (isZPCtdc && isZPAhigh) registry.get<TH2>(HIST("hZPCvstdc"))->Fill(tdczpc, zpc);
426+
if (isZNAtdc && isZNChigh)
427+
registry.get<TH2>(HIST("hZNAvstdc"))->Fill(tdczna, zna);
428+
if (isZNCtdc && isZNAhigh)
429+
registry.get<TH2>(HIST("hZNCvstdc"))->Fill(tdcznc, znc);
430+
if (isZPAtdc && isZPChigh)
431+
registry.get<TH2>(HIST("hZPAvstdc"))->Fill(tdczpa, zpa);
432+
if (isZPCtdc && isZPAhigh)
433+
registry.get<TH2>(HIST("hZPCvstdc"))->Fill(tdczpc, zpc);
388434
//
389-
if (isZNAtdc && isZNChigh) registry.get<TH2>(HIST("hZNAcvsZNAsum"))->Fill(0.25 * (znapm1 + znapm2 + znapm3 + znapm4), zna);
390-
if (isZNCtdc && isZNAhigh) registry.get<TH2>(HIST("hZNCcvsZNCsum"))->Fill(0.25 * (zncpm1 + zncpm2 + zncpm3 + zncpm4), znc);
435+
if (isZNAtdc && isZNChigh)
436+
registry.get<TH2>(HIST("hZNAcvsZNAsum"))->Fill(0.25 * (znapm1 + znapm2 + znapm3 + znapm4), zna);
437+
if (isZNCtdc && isZNAhigh)
438+
registry.get<TH2>(HIST("hZNCcvsZNCsum"))->Fill(0.25 * (zncpm1 + zncpm2 + zncpm3 + zncpm4), znc);
391439
//
392-
if (isZNAtdc && isZNChigh) registry.get<TH2>(HIST("hZNAvsFT0A"))->Fill((multFT0A) / 100., zna);
393-
if (isZNCtdc && isZNAhigh) registry.get<TH2>(HIST("hZNCvsFT0C"))->Fill((multFT0C) / 100., znc);
440+
if (isZNAtdc && isZNChigh)
441+
registry.get<TH2>(HIST("hZNAvsFT0A"))->Fill((multFT0A) / 100., zna);
442+
if (isZNCtdc && isZNAhigh)
443+
registry.get<TH2>(HIST("hZNCvsFT0C"))->Fill((multFT0C) / 100., znc);
394444
}
395-
396-
// Timestamp
445+
446+
// Timestamp
397447
if (tStampOffset > timestamp) {
398448
printf("\n\n ################# OFFSET timestamp too large!!!!!!!!!!!!!!!!!!!!!!!!!! > timestamp %llu \n\n", timestamp);
399449
return;
@@ -404,11 +454,15 @@ struct ZDCLIAnalysis {
404454
return;
405455
}
406456

407-
if (!applyZDCcut) {
408-
if (isZNAtdc) registry.get<TH2>(HIST("hZNAvstimestamp"))->Fill(tsh, zna);
409-
if (isZNCtdc) registry.get<TH2>(HIST("hZNCvstimestamp"))->Fill(tsh, znc);
410-
if (isZPAtdc) registry.get<TH2>(HIST("hZPAvstimestamp"))->Fill(tsh, zpa);
411-
if (isZPCtdc) registry.get<TH2>(HIST("hZPCvstimestamp"))->Fill(tsh, zpc);
457+
if (!applyZDCcut) {
458+
if (isZNAtdc)
459+
registry.get<TH2>(HIST("hZNAvstimestamp"))->Fill(tsh, zna);
460+
if (isZNCtdc)
461+
registry.get<TH2>(HIST("hZNCvstimestamp"))->Fill(tsh, znc);
462+
if (isZPAtdc)
463+
registry.get<TH2>(HIST("hZPAvstimestamp"))->Fill(tsh, zpa);
464+
if (isZPCtdc)
465+
registry.get<TH2>(HIST("hZPCvstimestamp"))->Fill(tsh, zpc);
412466
} else {
413467
if (isZNAtdc && znc >= zdccCutLow) {
414468
registry.get<TH2>(HIST("hZNAvstimestamp"))->Fill(tsh, zna);
@@ -430,45 +484,65 @@ struct ZDCLIAnalysis {
430484
}
431485
}
432486
// TDCs
433-
if (isZNAtdc) registry.get<TH1>(HIST("hZNAtdc"))->Fill(tdczna);
434-
if (isZNCtdc) registry.get<TH1>(HIST("hZNCtdc"))->Fill(tdcznc);
435-
if (isZPAtdc) registry.get<TH1>(HIST("hZPAtdc"))->Fill(tdczpa);
436-
if (isZPCtdc) registry.get<TH1>(HIST("hZPCtdc"))->Fill(tdczpc);
487+
if (isZNAtdc)
488+
registry.get<TH1>(HIST("hZNAtdc"))->Fill(tdczna);
489+
if (isZNCtdc)
490+
registry.get<TH1>(HIST("hZNCtdc"))->Fill(tdcznc);
491+
if (isZPAtdc)
492+
registry.get<TH1>(HIST("hZPAtdc"))->Fill(tdczpa);
493+
if (isZPCtdc)
494+
registry.get<TH1>(HIST("hZPCtdc"))->Fill(tdczpc);
437495
//
438496
registry.get<TH1>(HIST("hZEM"))->Fill(zem1 + zem2);
439-
if (isZNAtdc || isZNCtdc) registry.get<TH2>(HIST("hZNvsZEM"))->Fill(zem1 + zem2, zna + znc);
440-
if (isZNAtdc) registry.get<TH2>(HIST("hZNAvsZEM"))->Fill(zem1 + zem2, zna);
441-
if (isZNCtdc) registry.get<TH2>(HIST("hZNCvsZEM"))->Fill(zem1 + zem2, znc);
497+
if (isZNAtdc || isZNCtdc)
498+
registry.get<TH2>(HIST("hZNvsZEM"))->Fill(zem1 + zem2, zna + znc);
499+
if (isZNAtdc)
500+
registry.get<TH2>(HIST("hZNAvsZEM"))->Fill(zem1 + zem2, zna);
501+
if (isZNCtdc)
502+
registry.get<TH2>(HIST("hZNCvsZEM"))->Fill(zem1 + zem2, znc);
442503
//
443-
if (isZNAtdc || isZNCtdc || isZPAtdc || isZPCtdc) registry.get<TH2>(HIST("hZDCCvsA"))->Fill(zna + zpa, znc + zpc);
504+
if (isZNAtdc || isZNCtdc || isZPAtdc || isZPCtdc)
505+
registry.get<TH2>(HIST("hZDCCvsA"))->Fill(zna + zpa, znc + zpc);
444506
//
445-
if(centrFT0C > -1. && centrFT0C < 101.) {
446-
if (isZNAtdc) registry.get<TH2>(HIST("hZNAvscentrFT0C"))->Fill(centrFT0C, zna);
447-
if (isZPAtdc) registry.get<TH2>(HIST("hZPAvscentrFT0C"))->Fill(centrFT0C, zpa);
448-
if (isZNCtdc) registry.get<TH2>(HIST("hZNCvscentrFT0C"))->Fill(centrFT0C, znc);
449-
if (isZPCtdc) registry.get<TH2>(HIST("hZPCvscentrFT0C"))->Fill(centrFT0C, zpc);
450-
registry.get<TH2>(HIST("hNnZNAvscentrFT0C"))->Fill(centrFT0C, zna/2.680);
451-
registry.get<TH2>(HIST("hNnZNCvscentrFT0C"))->Fill(centrFT0C, znc/2.680);
452-
registry.get<TH2>(HIST("hNpZPAvscentrFT0C"))->Fill(centrFT0C, zpa/2.680);
453-
registry.get<TH2>(HIST("hNpZPCvscentrFT0C"))->Fill(centrFT0C, zpc/2.680);
507+
if (centrFT0C > -1. && centrFT0C < 101.) {
508+
if (isZNAtdc)
509+
registry.get<TH2>(HIST("hZNAvscentrFT0C"))->Fill(centrFT0C, zna);
510+
if (isZPAtdc)
511+
registry.get<TH2>(HIST("hZPAvscentrFT0C"))->Fill(centrFT0C, zpa);
512+
if (isZNCtdc)
513+
registry.get<TH2>(HIST("hZNCvscentrFT0C"))->Fill(centrFT0C, znc);
514+
if (isZPCtdc)
515+
registry.get<TH2>(HIST("hZPCvscentrFT0C"))->Fill(centrFT0C, zpc);
516+
registry.get<TH2>(HIST("hNnZNAvscentrFT0C"))->Fill(centrFT0C, zna / 2.680);
517+
registry.get<TH2>(HIST("hNnZNCvscentrFT0C"))->Fill(centrFT0C, znc / 2.680);
518+
registry.get<TH2>(HIST("hNpZPAvscentrFT0C"))->Fill(centrFT0C, zpa / 2.680);
519+
registry.get<TH2>(HIST("hNpZPCvscentrFT0C"))->Fill(centrFT0C, zpc / 2.680);
454520
}
455-
if(centrFT0A > -1. && centrFT0A < 101.) {
456-
if (isZNAtdc) registry.get<TH2>(HIST("hZNAvscentrFT0A"))->Fill(centrFT0A, zna);
457-
if (isZPAtdc) registry.get<TH2>(HIST("hZPAvscentrFT0A"))->Fill(centrFT0A, zpa);
458-
if (isZNCtdc) registry.get<TH2>(HIST("hZNCvscentrFT0A"))->Fill(centrFT0A, znc);
459-
if (isZPCtdc) registry.get<TH2>(HIST("hZPCvscentrFT0A"))->Fill(centrFT0A, zpc);
521+
if (centrFT0A > -1. && centrFT0A < 101.) {
522+
if (isZNAtdc)
523+
registry.get<TH2>(HIST("hZNAvscentrFT0A"))->Fill(centrFT0A, zna);
524+
if (isZPAtdc)
525+
registry.get<TH2>(HIST("hZPAvscentrFT0A"))->Fill(centrFT0A, zpa);
526+
if (isZNCtdc)
527+
registry.get<TH2>(HIST("hZNCvscentrFT0A"))->Fill(centrFT0A, znc);
528+
if (isZPCtdc)
529+
registry.get<TH2>(HIST("hZPCvscentrFT0A"))->Fill(centrFT0A, zpc);
460530
}
461-
if(centrFT0M > -1. && centrFT0M < 101.) {
462-
if (isZNAtdc) registry.get<TH2>(HIST("hZNAvscentrFT0M"))->Fill(centrFT0M, zna);
463-
if (isZPAtdc) registry.get<TH2>(HIST("hZPAvscentrFT0M"))->Fill(centrFT0M, zpa);
464-
if (isZNCtdc) registry.get<TH2>(HIST("hZNCvscentrFT0M"))->Fill(centrFT0M, znc);
465-
if (isZPCtdc) registry.get<TH2>(HIST("hZPCvscentrFT0M"))->Fill(centrFT0M, zpc);
466-
registry.get<TH2>(HIST("hNnZNAvscentrFT0M"))->Fill(centrFT0M, zna/2.680);
467-
registry.get<TH2>(HIST("hNnZNCvscentrFT0M"))->Fill(centrFT0M, znc/2.680);
468-
registry.get<TH2>(HIST("hNpZPAvscentrFT0M"))->Fill(centrFT0M, zpa/2.680);
469-
registry.get<TH2>(HIST("hNpZPCvscentrFT0M"))->Fill(centrFT0M, zpc/2.680);
470-
registry.get<TH2>(HIST("hNpvsNnZNA"))->Fill(zna/2.680, zpa/2.680);
471-
registry.get<TH2>(HIST("hNpvsNnZNC"))->Fill(znc/2.680, zpc/2.680);
531+
if (centrFT0M > -1. && centrFT0M < 101.) {
532+
if (isZNAtdc)
533+
registry.get<TH2>(HIST("hZNAvscentrFT0M"))->Fill(centrFT0M, zna);
534+
if (isZPAtdc)
535+
registry.get<TH2>(HIST("hZPAvscentrFT0M"))->Fill(centrFT0M, zpa);
536+
if (isZNCtdc)
537+
registry.get<TH2>(HIST("hZNCvscentrFT0M"))->Fill(centrFT0M, znc);
538+
if (isZPCtdc)
539+
registry.get<TH2>(HIST("hZPCvscentrFT0M"))->Fill(centrFT0M, zpc);
540+
registry.get<TH2>(HIST("hNnZNAvscentrFT0M"))->Fill(centrFT0M, zna / 2.680);
541+
registry.get<TH2>(HIST("hNnZNCvscentrFT0M"))->Fill(centrFT0M, znc / 2.680);
542+
registry.get<TH2>(HIST("hNpZPAvscentrFT0M"))->Fill(centrFT0M, zpa / 2.680);
543+
registry.get<TH2>(HIST("hNpZPCvscentrFT0M"))->Fill(centrFT0M, zpc / 2.680);
544+
registry.get<TH2>(HIST("hNpvsNnZNA"))->Fill(zna / 2.680, zpa / 2.680);
545+
registry.get<TH2>(HIST("hNpvsNnZNC"))->Fill(znc / 2.680, zpc / 2.680);
472546
}
473547
}
474548
}

‎Common/zdcTaskLightIons.cxx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@
1313
/// \brief Task for ZDC in light ions
1414
/// \author chiara.oppedisano@cern.ch
1515

16-
17-
#include <CCDB/BasicCCDBManager.h>
1816
#include "Common/CCDB/EventSelectionParams.h"
1917
#include "Common/DataModel/Centrality.h"
2018
#include "Common/DataModel/EventSelection.h"
2119
#include "Common/DataModel/ZDCLightIons.h"
2220

21+
#include <CCDB/BasicCCDBManager.h>
2322
#include <DataFormatsParameters/GRPLHCIFData.h>
2423
#include <Framework/AnalysisDataModel.h>
2524
#include <Framework/AnalysisHelpers.h>

0 commit comments

Comments
 (0)