@@ -202,11 +202,13 @@ struct FlowZdcTask {
202202 histos.add (" ZNVsFT0A" , " ;T0A (#times 1/100);ZNA+ZNC Amplitude;" , kTH2F , {{{nBinsAmpFT0, 0 ., maxAmpFT0}, {nBinsZDC, -0.5 , maxZn}}});
203203 histos.add (" ZNVsFT0C" , " ;T0C (#times 1/100);ZNA+ZNC Amplitude;" , kTH2F , {{{nBinsAmpFT0, 0 ., maxAmpFT0}, {nBinsZDC, -0.5 , maxZn}}});
204204 histos.add (" ZNVsFT0M" , " ;T0A+T0C (#times 1/100);ZNA+ZNC Amplitude;" , kTH2F , {{{nBinsAmpFT0, 0 ., maxAmpFT0M}, {nBinsZDC, -0.5 , maxZn}}});
205- histos.add (" CommonZNVsFT0M" , " ;T0A+T0C (#times 1/100);ZPA+ZPC Amplitude;" , kTH2F , {{{nBinsAmpFT0, 0 ., maxAmpFT0M}, {nBinsZDC, -0.5 , maxZn}}});
205+ histos.add (" CommonZNVsFT0M" , " ;T0A+T0C (#times 1/100);ZNA+ZNC Common Energy;" , kTH2F , {{{nBinsAmpFT0, 0 ., maxAmpFT0M}, {nBinsZDC, -0.5 , maxZn}}});
206+ histos.add (" SectorZNVsFT0M" , " ;T0A+T0C (#times 1/100);ZNA+ZNC Sector Energy;" , kTH2F , {{{nBinsAmpFT0, 0 ., maxAmpFT0M}, {nBinsZDC, -0.5 , maxZn}}});
206207 histos.add (" ZPVsFT0A" , " ;T0A (#times 1/100);ZPA+ZPC Amplitude;" , kTH2F , {{{nBinsAmpFT0, 0 ., maxAmpFT0}, {nBinsZDC, -0.5 , maxZp}}});
207208 histos.add (" ZPVsFT0C" , " ;T0C (#times 1/100);ZPA+ZPC Amplitude;" , kTH2F , {{{nBinsAmpFT0, 0 ., maxAmpFT0}, {nBinsZDC, -0.5 , maxZp}}});
208209 histos.add (" ZPVsFT0M" , " ;T0A+T0C (#times 1/100);ZPA+ZPC Amplitude;" , kTH2F , {{{nBinsAmpFT0, 0 ., maxAmpFT0M}, {nBinsZDC, -0.5 , maxZp}}});
209- histos.add (" CommonZPVsFT0M" , " ;T0A+T0C (#times 1/100);ZPA+ZPC Amplitude;" , kTH2F , {{{nBinsAmpFT0, 0 ., maxAmpFT0M}, {nBinsZDC, -0.5 , maxZp}}});
210+ histos.add (" CommonZPVsFT0M" , " ;T0A+T0C (#times 1/100);ZPA+ZPC Common Energy;" , kTH2F , {{{nBinsAmpFT0, 0 ., maxAmpFT0M}, {nBinsZDC, -0.5 , maxZp}}});
211+ histos.add (" SectorZPVsFT0M" , " ;T0A+T0C (#times 1/100);ZPA+ZPC Sector Energy;" , kTH2F , {{{nBinsAmpFT0, 0 ., maxAmpFT0M}, {nBinsZDC, -0.5 , maxZp}}});
210212 histos.add (" ZNAVsFT0A" , " ;T0A (#times 1/100);ZNA Amplitude;" , kTH2F , {{{nBinsAmpFT0, 0 ., maxAmpFT0}, {nBinsZDC, -0.5 , maxZn}}});
211213 histos.add (" ZNAVsFT0C" , " ;T0C (#times 1/100);ZNA Amplitude;" , kTH2F , {{{nBinsAmpFT0, 0 ., maxAmpFT0}, {nBinsZDC, -0.5 , maxZn}}});
212214 histos.add (" ZNAVsFT0M" , " ;T0A+T0C (#times 1/100);ZNA Amplitude;" , kTH2F , {{{nBinsAmpFT0, 0 ., maxAmpFT0M}, {nBinsZDC, -0.5 , maxZn}}});
@@ -281,10 +283,14 @@ struct FlowZdcTask {
281283 histos.add (" ampZpa" , " ;ZPA Amplitude;Entries;" , kTH1F , {{nBinsZDC, -0.5 , maxZp}});
282284 histos.add (" ampZnc" , " ;ZNC Amplitude;Entries;" , kTH1F , {{nBinsZDC, -0.5 , maxZn}});
283285 histos.add (" ampZpc" , " ;ZPC Amplitude;Entries;" , kTH1F , {{nBinsZDC, -0.5 , maxZp}});
284- histos.add (" commonZna" , " ;ZNA Amplitude;Entries;" , kTH1F , {{nBinsZDC, -0.5 , maxZn}});
285- histos.add (" commonZpa" , " ;ZPA Amplitude;Entries;" , kTH1F , {{nBinsZDC, -0.5 , maxZp}});
286- histos.add (" commonZnc" , " ;ZNC Amplitude;Entries;" , kTH1F , {{nBinsZDC, -0.5 , maxZn}});
287- histos.add (" commonZpc" , " ;ZPC Amplitude;Entries;" , kTH1F , {{nBinsZDC, -0.5 , maxZp}});
286+ histos.add (" commonZna" , " ;ZNA Common;Entries;" , kTH1F , {{nBinsZDC, -0.5 , maxZn}});
287+ histos.add (" commonZpa" , " ;ZPA Common;Entries;" , kTH1F , {{nBinsZDC, -0.5 , maxZp}});
288+ histos.add (" commonZnc" , " ;ZNC Common;Entries;" , kTH1F , {{nBinsZDC, -0.5 , maxZn}});
289+ histos.add (" commonZpc" , " ;ZPC Common;Entries;" , kTH1F , {{nBinsZDC, -0.5 , maxZp}});
290+ histos.add (" sectorSumZna" , " ;ZNA Sector Sum;Entries;" , kTH1F , {{nBinsZDC, -0.5 , maxZn}});
291+ histos.add (" sectorSumZnc" , " ;ZNC Sector Sum;Entries;" , kTH1F , {{nBinsZDC, -0.5 , maxZn}});
292+ histos.add (" sectorSumZpa" , " ;ZPA Sector Sum;Entries;" , kTH1F , {{nBinsZDC, -0.5 , maxZp}});
293+ histos.add (" sectorSumZpc" , " ;ZPC Sector Sum;Entries;" , kTH1F , {{nBinsZDC, -0.5 , maxZp}});
288294 histos.add (" ampZEM1" , " ;ZEM1 Amplitude;Entries;" , kTH1F , {{nBinsZDC, -0.5 , maxZem}});
289295 histos.add (" ampZEM2" , " ;ZEM2 Amplitude;Entries;" , kTH1F , {{nBinsZDC, -0.5 , maxZem}});
290296 histos.add (" ZnVsZem" , " ZnVsZEM; ZEM; ZNA + ZNC" , kTH2F , {{{nBinsZDC, -0.5 , maxZem}, {nBinsZDC, -0.5 , maxZn}}});
@@ -438,24 +444,26 @@ struct FlowZdcTask {
438444 float commonSumZna = zdc.energyCommonZNA () / cfgCollisionEnergy;
439445 float commonSumZpc = zdc.energyCommonZPC () / cfgCollisionEnergy;
440446 float commonSumZpa = zdc.energyCommonZPA () / cfgCollisionEnergy;
447+ float sumZNC = ((zdc.energySectorZNC ())[0 ] + (zdc.energySectorZNC ())[1 ] + (zdc.energySectorZNC ())[2 ] + (zdc.energySectorZNC ())[3 ]) / cfgCollisionEnergy;
448+ float sumZNA = ((zdc.energySectorZNA ())[0 ] + (zdc.energySectorZNA ())[1 ] + (zdc.energySectorZNA ())[2 ] + (zdc.energySectorZNA ())[3 ]) / cfgCollisionEnergy;
449+ float sumZPC = ((zdc.energySectorZPC ())[0 ] + (zdc.energySectorZPC ())[1 ] + (zdc.energySectorZPC ())[2 ] + (zdc.energySectorZPC ())[3 ]) / cfgCollisionEnergy;
450+ float sumZPA = ((zdc.energySectorZPA ())[0 ] + (zdc.energySectorZPA ())[1 ] + (zdc.energySectorZPA ())[2 ] + (zdc.energySectorZPA ())[3 ]) / cfgCollisionEnergy;
441451 if (applyZdcCorrection) {
442452 const float a = zpaCoeff;
443453 const float b = zpcCoeff;
444454 zpA = zpA - a * znA;
445455 commonSumZpa = commonSumZpa - a * commonSumZna;
456+ sumZPA = sumZPA - a * sumZNA;
446457 zpC = zpC - b * znC;
447458 commonSumZpc = commonSumZpc - b * commonSumZnc;
459+ sumZPC = sumZPC - b * sumZNC;
448460 }
449461 float aZEM1{zdc.amplitudeZEM1 ()};
450462 float aZEM2{zdc.amplitudeZEM2 ()};
451463 float sumZEMs{aZEM1 + aZEM2};
452464 float tZEM1{zdc.timeZEM1 ()};
453465 float tZEM2{zdc.timeZEM2 ()};
454466 float sumZNs{znA + znC};
455- float sumZNC = ((zdc.energySectorZNC ())[0 ] + (zdc.energySectorZNC ())[1 ] + (zdc.energySectorZNC ())[2 ] + (zdc.energySectorZNC ())[3 ]) / cfgCollisionEnergy;
456- float sumZNA = ((zdc.energySectorZNA ())[0 ] + (zdc.energySectorZNA ())[1 ] + (zdc.energySectorZNA ())[2 ] + (zdc.energySectorZNA ())[3 ]) / cfgCollisionEnergy;
457- float sumZPC = ((zdc.energySectorZPC ())[0 ] + (zdc.energySectorZPC ())[1 ] + (zdc.energySectorZPC ())[2 ] + (zdc.energySectorZPC ())[3 ]) / cfgCollisionEnergy;
458- float sumZPA = ((zdc.energySectorZPA ())[0 ] + (zdc.energySectorZPA ())[1 ] + (zdc.energySectorZPA ())[2 ] + (zdc.energySectorZPA ())[3 ]) / cfgCollisionEnergy;
459467 float sumSectZN = (sumZNC + sumZNA);
460468 float sumSectZP = (sumZPC + sumZPA);
461469
@@ -501,13 +509,15 @@ struct FlowZdcTask {
501509 histos.fill (HIST (" ZNVsFT0C" ), aT0C / 100 ., znA + znC);
502510 histos.fill (HIST (" ZNVsFT0M" ), (aT0A + aT0C) / 100 ., znA + znC);
503511 histos.fill (HIST (" CommonZNVsFT0M" ), (aT0A + aT0C) / 100 ., commonSumZna + commonSumZnc);
512+ histos.fill (HIST (" SectorZNVsFT0M" ), (aT0A + aT0C) / 100 ., sumZNA + sumZNC);
504513 }
505514 if (((tZPA >= minTdcZp) && (tZPA <= maxTdcZp)) && ((tZPC >= minTdcZp) && (tZPC <= maxTdcZp))) {
506515 histos.fill (HIST (" ZPAVsZPC" ), zpC, zpA);
507516 histos.fill (HIST (" ZPVsFT0A" ), aT0A / 100 ., zpA + zpC);
508517 histos.fill (HIST (" ZPVsFT0C" ), aT0C / 100 ., zpA + zpC);
509518 histos.fill (HIST (" ZPVsFT0M" ), (aT0A + aT0C) / 100 ., zpA + zpC);
510519 histos.fill (HIST (" CommonZPVsFT0M" ), (aT0A + aT0C) / 100 ., commonSumZpa + commonSumZpc);
520+ histos.fill (HIST (" SectorZPVsFT0M" ), (aT0A + aT0C) / 100 ., sumZPA + sumZPC);
511521 }
512522 if (((tZNA >= minTdcZn) && (tZNA <= maxTdcZn)) && ((tZPA >= minTdcZp) && (tZPA <= maxTdcZp)))
513523 histos.fill (HIST (" ZNAVsZPA" ), zpA, znA);
@@ -536,12 +546,14 @@ struct FlowZdcTask {
536546 histos.fill (HIST (" ZPVsFT0C" ), aT0C / 100 ., zpA + zpC);
537547 histos.fill (HIST (" ZPVsFT0M" ), (aT0A + aT0C) / 100 ., zpA + zpC);
538548 histos.fill (HIST (" CommonZPVsFT0M" ), (aT0A + aT0C) / 100 ., commonSumZpa + commonSumZpc);
549+ histos.fill (HIST (" SectorZPVsFT0M" ), (aT0A + aT0C) / 100 ., sumZPA + sumZPC);
539550 histos.fill (HIST (" ZPAVsFT0A" ), aT0A / 100 ., zpA);
540551 histos.fill (HIST (" ZPAVsFT0C" ), aT0C / 100 ., zpA);
541552 histos.fill (HIST (" ZPAVsFT0M" ), (aT0A + aT0C) / 100 ., zpA);
542553 histos.fill (HIST (" ZNVsFT0C" ), aT0C / 100 ., znA + znC);
543554 histos.fill (HIST (" ZNVsFT0M" ), (aT0A + aT0C) / 100 ., znA + znC);
544555 histos.fill (HIST (" CommonZNVsFT0M" ), (aT0A + aT0C) / 100 ., commonSumZna + commonSumZnc);
556+ histos.fill (HIST (" SectorZNVsFT0M" ), (aT0A + aT0C) / 100 ., sumZNA + sumZNC);
545557 histos.fill (HIST (" ZPCVsFT0A" ), aT0A / 100 ., zpC);
546558 histos.fill (HIST (" ZPCVsFT0C" ), aT0C / 100 ., zpC);
547559 histos.fill (HIST (" ZPCVsFT0M" ), (aT0A + aT0C) / 100 ., zpC);
@@ -686,10 +698,10 @@ struct FlowZdcTask {
686698 auto znC = zdc.amplitudeZNC () / cfgCollisionEnergy;
687699 auto zpA = zdc.amplitudeZPA () / cfgCollisionEnergy;
688700 auto zpC = zdc.amplitudeZPC () / cfgCollisionEnergy;
689- float sumZNC = ((zdc.energySectorZNC ())[0 ] + (zdc.energySectorZNC ())[1 ] + (zdc.energySectorZNC ())[2 ] + (zdc.energySectorZNC ())[3 ]) / cfgCollisionEnergy;
690- float sumZNA = ((zdc.energySectorZNA ())[0 ] + (zdc.energySectorZNA ())[1 ] + (zdc.energySectorZNA ())[2 ] + (zdc.energySectorZNA ())[3 ]) / cfgCollisionEnergy;
691- float sumZPC = ((zdc.energySectorZPC ())[0 ] + (zdc.energySectorZPC ())[1 ] + (zdc.energySectorZPC ())[2 ] + (zdc.energySectorZPC ())[3 ]) / cfgCollisionEnergy;
692- float sumZPA = ((zdc.energySectorZPA ())[0 ] + (zdc.energySectorZPA ())[1 ] + (zdc.energySectorZPA ())[2 ] + (zdc.energySectorZPA ())[3 ]) / cfgCollisionEnergy;
701+ float sectorSumZNC = ((zdc.energySectorZNC ())[0 ] + (zdc.energySectorZNC ())[1 ] + (zdc.energySectorZNC ())[2 ] + (zdc.energySectorZNC ())[3 ]) / cfgCollisionEnergy;
702+ float sectorSumZNA = ((zdc.energySectorZNA ())[0 ] + (zdc.energySectorZNA ())[1 ] + (zdc.energySectorZNA ())[2 ] + (zdc.energySectorZNA ())[3 ]) / cfgCollisionEnergy;
703+ float sectorSumZPC = ((zdc.energySectorZPC ())[0 ] + (zdc.energySectorZPC ())[1 ] + (zdc.energySectorZPC ())[2 ] + (zdc.energySectorZPC ())[3 ]) / cfgCollisionEnergy;
704+ float sectorSumZPA = ((zdc.energySectorZPA ())[0 ] + (zdc.energySectorZPA ())[1 ] + (zdc.energySectorZPA ())[2 ] + (zdc.energySectorZPA ())[3 ]) / cfgCollisionEnergy;
693705 float commonSumZnc = zdc.energyCommonZNC () / cfgCollisionEnergy;
694706 float commonSumZna = zdc.energyCommonZNA () / cfgCollisionEnergy;
695707 float commonSumZpc = zdc.energyCommonZPC () / cfgCollisionEnergy;
@@ -705,18 +717,22 @@ struct FlowZdcTask {
705717 if ((tZNA >= minTdcZn) && (tZNA <= maxTdcZn)) {
706718 histos.fill (HIST (" ampZna" ), znA);
707719 histos.fill (HIST (" commonZna" ), commonSumZna);
720+ histos.fill (HIST (" sectorSumZna" ), sectorSumZNA);
708721 }
709722 if ((tZNC >= minTdcZn) && (tZNC <= maxTdcZn)) {
710723 histos.fill (HIST (" ampZnc" ), znC);
711724 histos.fill (HIST (" commonZnc" ), commonSumZnc);
725+ histos.fill (HIST (" sectorSumZnc" ), sectorSumZNC);
712726 }
713727 if ((tZPA >= minTdcZp) && (tZPA <= maxTdcZp)) {
714728 histos.fill (HIST (" ampZpa" ), zpA);
715729 histos.fill (HIST (" commonZpa" ), commonSumZpa);
730+ histos.fill (HIST (" sectorSumZpa" ), sectorSumZPA);
716731 }
717732 if ((tZPC >= minTdcZp) && (tZPC <= maxTdcZp)) {
718733 histos.fill (HIST (" ampZpc" ), zpC);
719734 histos.fill (HIST (" commonZpc" ), commonSumZpc);
735+ histos.fill (HIST (" sectorSumZpc" ), sectorSumZPC);
720736 }
721737 if (((tZNC >= minTdcZn) && (tZNC <= maxTdcZn)) && ((tZNA >= minTdcZn) && (tZNA <= maxTdcZn)))
722738 histos.fill (HIST (" ZnVsZem" ), sumZEMs, znC + znA);
@@ -737,6 +753,10 @@ struct FlowZdcTask {
737753 histos.fill (HIST (" commonZnc" ), commonSumZnc);
738754 histos.fill (HIST (" commonZpa" ), commonSumZpa);
739755 histos.fill (HIST (" commonZpc" ), commonSumZpc);
756+ histos.fill (HIST (" sectorSumZna" ), sectorSumZNA);
757+ histos.fill (HIST (" sectorSumZnc" ), sectorSumZNC);
758+ histos.fill (HIST (" sectorSumZpa" ), sectorSumZPA);
759+ histos.fill (HIST (" sectorSumZpc" ), sectorSumZPC);
740760 histos.fill (HIST (" ZnVsZem" ), sumZEMs, znC + znA);
741761 histos.fill (HIST (" ZnaVsZnc" ), znA, znC);
742762 histos.fill (HIST (" ZpaVsZpc" ), zpA, zpC);
@@ -745,10 +765,10 @@ struct FlowZdcTask {
745765 }
746766 histos.fill (HIST (" ampZEM1" ), aZEM1);
747767 histos.fill (HIST (" ampZEM2" ), aZEM2);
748- histos.fill (HIST (" ZnccVsZncSum" ), sumZNC , commonSumZnc);
749- histos.fill (HIST (" ZnacVsZnaSum" ), sumZNA , commonSumZna);
750- histos.fill (HIST (" ZpccVsZpcSum" ), sumZPC , commonSumZpc);
751- histos.fill (HIST (" ZpacVsZpaSum" ), sumZPA , commonSumZpa);
768+ histos.fill (HIST (" ZnccVsZncSum" ), sectorSumZNC , commonSumZnc);
769+ histos.fill (HIST (" ZnacVsZnaSum" ), sectorSumZNA , commonSumZna);
770+ histos.fill (HIST (" ZpccVsZpcSum" ), sectorSumZPC , commonSumZpc);
771+ histos.fill (HIST (" ZpacVsZpaSum" ), sectorSumZPA , commonSumZpa);
752772 histos.fill (HIST (" ZncVsTdc" ), zdc.timeZNC (), znC);
753773 histos.fill (HIST (" ZnaVsTdc" ), zdc.timeZNA (), znA);
754774 histos.fill (HIST (" ZpcVsTdc" ), zdc.timeZPC (), zpC);
0 commit comments