add uncalibrated energy to the SPTableZDC

Author: lubynets

PWGCF/DataModel/SPTableZDC.h

@@ -39,6 +39,14 @@ DECLARE_SOA_COLUMN(QxC, qxC, float);
 DECLARE_SOA_COLUMN(QyC, qyC, float);
 DECLARE_SOA_COLUMN(IsSelected, isSelected, bool);
 DECLARE_SOA_COLUMN(EventSelectionFlags, eventSelectionFlags, uint16_t);
+DECLARE_SOA_COLUMN(UncalibratedEnergyA1, uncalibratedEnergyA1, float);
+DECLARE_SOA_COLUMN(UncalibratedEnergyA2, uncalibratedEnergyA2, float);
+DECLARE_SOA_COLUMN(UncalibratedEnergyA3, uncalibratedEnergyA3, float);
+DECLARE_SOA_COLUMN(UncalibratedEnergyA4, uncalibratedEnergyA4, float);
+DECLARE_SOA_COLUMN(UncalibratedEnergyC1, uncalibratedEnergyC1, float);
+DECLARE_SOA_COLUMN(UncalibratedEnergyC2, uncalibratedEnergyC2, float);
+DECLARE_SOA_COLUMN(UncalibratedEnergyC3, uncalibratedEnergyC3, float);
+DECLARE_SOA_COLUMN(UncalibratedEnergyC4, uncalibratedEnergyC4, float);
 
 } // namespace sptablezdc
 
@@ -52,6 +60,14 @@ DECLARE_SOA_TABLE(SPTableZDC, "AOD", "SPZDC",
                   sptablezdc::QxC,
                   sptablezdc::QyC,
                   sptablezdc::IsSelected,
-                  sptablezdc::EventSelectionFlags);
+                  sptablezdc::EventSelectionFlags,
+                  sptablezdc::UncalibratedEnergyA1,
+                  sptablezdc::UncalibratedEnergyA2,
+                  sptablezdc::UncalibratedEnergyA3,
+                  sptablezdc::UncalibratedEnergyA4,
+                  sptablezdc::UncalibratedEnergyC1,
+                  sptablezdc::UncalibratedEnergyC2,
+                  sptablezdc::UncalibratedEnergyC3,
+                  sptablezdc::UncalibratedEnergyC4);
 } // namespace o2::aod
 #endif // PWGCF_DATAMODEL_SPTABLEZDC_H_

PWGCF/Flow/TableProducer/zdcQVectors.cxx

@@ -767,7 +767,7 @@ struct ZdcQVectors {
 
     if (!foundBC.has_zdc()) {
       isSelected = false;
-      spTableZDC(runnumber, cents, v, foundBC.timestamp(), 0, 0, 0, 0, isSelected, 0);
+      spTableZDC(runnumber, cents, v, foundBC.timestamp(), 0, 0, 0, 0, isSelected, 0, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f);
       counter++;
       lastRunNumber = runnumber;
       return;
@@ -803,7 +803,7 @@ struct ZdcQVectors {
     if (!isZNAhit || !isZNChit) {
       counter++;
       isSelected = false;
-      spTableZDC(runnumber, cents, v, foundBC.timestamp(), 0, 0, 0, 0, isSelected, 0);
+      spTableZDC(runnumber, cents, v, foundBC.timestamp(), 0, 0, 0, 0, isSelected, 0, eZN[0], eZN[1], eZN[2], eZN[3], eZN[4], eZN[5], eZN[6], eZN[7]);
       lastRunNumber = runnumber;
       return;
     }
@@ -815,7 +815,7 @@ struct ZdcQVectors {
     if (cent < EvSel.cfgCentMin || cent > EvSel.cfgCentMax || !collision.sel8() || std::abs(collision.posZ()) > cfgVtxZ) {
       // event not selected
       isSelected = false;
-      spTableZDC(runnumber, cents, v, foundBC.timestamp(), 0, 0, 0, 0, isSelected, eventSelectionFlags);
+      spTableZDC(runnumber, cents, v, foundBC.timestamp(), 0, 0, 0, 0, isSelected, eventSelectionFlags, eZN[0], eZN[1], eZN[2], eZN[3], eZN[4], eZN[5], eZN[6], eZN[7]);
       counter++;
       lastRunNumber = runnumber;
       return;
@@ -878,7 +878,7 @@ struct ZdcQVectors {
     if (!cal.calibfilesLoaded[0]) {
       counter++;
       isSelected = false;
-      spTableZDC(runnumber, cents, v, foundBC.timestamp(), 0, 0, 0, 0, isSelected, eventSelectionFlags);
+      spTableZDC(runnumber, cents, v, foundBC.timestamp(), 0, 0, 0, 0, isSelected, eventSelectionFlags, eZN[0], eZN[1], eZN[2], eZN[3], eZN[4], eZN[5], eZN[6], eZN[7]);
       lastRunNumber = runnumber;
       return;
     }
@@ -1031,7 +1031,7 @@ struct ZdcQVectors {
       if (isSelected && cfgFillHistRegistry)
         fillCommonRegistry<kBefore>(q[0], q[1], q[2], q[3], v, centrality, rsTimestamp);
 
-      spTableZDC(runnumber, cents, v, foundBC.timestamp(), q[0], q[1], q[2], q[3], isSelected, eventSelectionFlags);
+      spTableZDC(runnumber, cents, v, foundBC.timestamp(), q[0], q[1], q[2], q[3], isSelected, eventSelectionFlags, eZN[0], eZN[1], eZN[2], eZN[3], eZN[4], eZN[5], eZN[6], eZN[7]);
       counter++;
       lastRunNumber = runnumber;
       return;
@@ -1184,7 +1184,7 @@ struct ZdcQVectors {
         registry.get<TProfile>(HIST("QA/after/ZNC_Qy"))->Fill(Form("%d", runnumber), qRec[3]);
       }
 
-      spTableZDC(runnumber, cents, v, foundBC.timestamp(), qXaShift, qYaShift, qXcShift, qYcShift, isSelected, eventSelectionFlags);
+      spTableZDC(runnumber, cents, v, foundBC.timestamp(), qXaShift, qYaShift, qXcShift, qYcShift, isSelected, eventSelectionFlags, eZN[0], eZN[1], eZN[2], eZN[3], eZN[4], eZN[5], eZN[6], eZN[7]);
       qRec.clear();
 
       counter++;