Update FIT extras

Author: andreasmolander

Common/DataModel/FITExtra.h

@@ -14,6 +14,7 @@
 
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
+#include <cstdint>
 
 namespace o2::aod
 {
@@ -30,8 +31,19 @@ static constexpr int nADC = 4096;  ///< Number of ADC channels
 
 // Quantities copied straight from AOD
 // TODO: do we need them here?
-DECLARE_SOA_COLUMN(PV, pv, float);                     //! Primary vertex position in cm (o2::aod::‌collision::PosZ)
+DECLARE_SOA_COLUMN(RunNumber, runNumber, int);
+DECLARE_SOA_COLUMN(GlobalBC, globalBC, uint64_t);
+DECLARE_SOA_COLUMN(CTPtriggerMask, ctpTriggerMask, uint64_t);
+DECLARE_SOA_COLUMN(CTPinputMask, ctpInputMask, uint64_t);
+
+DECLARE_SOA_COLUMN(BCId, bcId, int32_t);              //! BC ID (o2::aod::collision::BCId)
+DECLARE_SOA_COLUMN(PosX, posX, float);
+DECLARE_SOA_COLUMN(PosY, posY, float);
+DECLARE_SOA_COLUMN(PosZ, posZ, float);                     //! Primary vertex position in cm (o2::aod::‌collision::PosZ)
+DECLARE_SOA_COLUMN(Flags, flags, uint16_t);                 //! Collision flags (o2::aod::collision::Flags)
 DECLARE_SOA_COLUMN(NContrib, nContrib, int);           //! Number of contributors to primary vertex (o2::aod::‌collision::NumContrib)
+DECLARE_SOA_COLUMN(CollisionTime, collisionTime, float); //! Collision time (o2::aod::collision::CollisionTime)
+DECLARE_SOA_COLUMN(CollisionTimeRes, collisionTimeRes, float); //! Collision time resolution (o2::aod::collision::CollisionTimeRes)
 
 DECLARE_SOA_COLUMN(FT0TimeA, ft0timeA, float);         //! FT0-A average time in ns (o2::aod::ft0::TimeA)
 DECLARE_SOA_COLUMN(FT0TimeC, ft0timeC, float);         //! FT0-C average time in ns (o2::aod::ft0::TimeC)
@@ -43,6 +55,8 @@ DECLARE_SOA_COLUMN(FT0Vtx, ft0vtx, float);             //! FT0 vertex in cm (o2:
 DECLARE_SOA_COLUMN(FT0ChAmpl, ft0chAmpl, std::vector<float>); //! FT0 channel amplitudes
 DECLARE_SOA_COLUMN(FT0TotAmplA, ft0totAmplA, float);     //! FT0-A total amplitude (o2::aod::ft0::SumAmpA)
 DECLARE_SOA_COLUMN(FT0TotAmplC, ft0totAmplC, float);     //! FT0-C total amplitude (o2::aod::ft0::SumAmpC)
+DECLARE_SOA_COLUMN(FT0TotAmplACheck, ft0totabletAmplACheck, float);     //! FT0-A total amplitude computed from channel amplitudes (for cross check)
+DECLARE_SOA_COLUMN(FT0TotAmplCCheck, ft0totAmplCCheck, float);     //! FT0-C total amplitude computed from channel amplitudes (for cross check)
 
 DECLARE_SOA_COLUMN(FV0Time, fv0time, float);           //! FV0 average time in ns (o2::aod::fv0a::Time)
 DECLARE_SOA_COLUMN(FV0ChAmpl, fv0chAmpl, std::vector<float>); //! FV0 channel amplitudes
@@ -70,10 +84,11 @@ DECLARE_SOA_COLUMN(FDDTriggers, fddTriggers, uint8_t); //! FDD trigger mask (o2:
 DECLARE_SOA_TABLE(FITExtras, "AOD", "FITEXTRA", //! Table with extra FIT information
                   fit::Sel8, fit::HasFT0, fit::HasFV0, fit::HasFDD,
                   fit::FT0Triggers, fit::FV0Triggers, fit::FDDTriggers,
-                  fit::PV, fit::NContrib,
+                  fit::RunNumber, fit::GlobalBC, fit::CTPtriggerMask, fit::CTPinputMask,
+                  fit::BCId, fit::PosX, fit::PosY, fit::PosZ, fit::Flags, fit::NContrib, fit::CollisionTime, fit::CollisionTimeRes,
                   fit::FT0TimeA, fit::FT0TimeC, fit::FT0TimeACorr, fit::FT0TimeCCorr,
                   fit::FT0Time, fit::FT0TimeRes, fit::FT0Vtx,
-                  fit::FT0ChAmpl, fit::FT0TotAmplA, fit::FT0TotAmplC,
+                  fit::FT0ChAmpl, fit::FT0TotAmplA, fit::FT0TotAmplC, fit::FT0TotAmplACheck, fit::FT0TotAmplCCheck,
                   fit::FV0Time, fit::FV0ChAmpl, fit::FV0TotAmpl,
                   fit::FDDTimeA, fit::FDDTimeC, fit::FDDChAmpl, fit::FDDTotAmplA, fit::FDDTotAmplC);
 

Common/TableProducer/fitExtraTable.cxx

@@ -23,6 +23,8 @@ using namespace o2::framework;
 
 #include "Framework/runDataProcessing.h"
 
+using BCsWithTimestamps = soa::Join<aod::BCs, aod::Timestamps>;
+
 struct fitExtraTable {
   // Producer
   Produces<o2::aod::FITExtra> table;
@@ -35,11 +37,23 @@ struct fitExtraTable {
   }
 
   void process(soa::Join<aod::Collisions, aod::EvSels, aod::FT0sCorrected> const& collisions,
+               aod::BCsWithTimestamps const&,
                aod::FT0s const&, aod::FV0As const&, aod::FDDs const&) {
     table.reserve(collisions.size());
 
-    float pv = -200;
+    int runnumber = -1;
+    uint64_t globalBC = 0;
+    uint64_t ctpTriggerMask = 0;
+    uint64_t ctpInputMask = 0;
+
+    int32_t bcId = -1;
+    float posX = -200;
+    float posY = -200;
+    float posZ = -200;
+    uint16_t flags = 0;
     int nContrib = -1;
+    float collisionTime = -200;
+    float collisionTimeRes = -200;
 
     float ft0timeA = -200;
     float ft0timeC = -200;
@@ -51,6 +65,8 @@ struct fitExtraTable {
     std::vector<float> ft0chAmpl(o2::aod::fit::nChFT0, 0);
     float ft0totAmplA = 0;
     float ft0totAmplC = 0;
+    float ft0totAmplACheck = 0;
+    float ft0totAmplCCheck = 0;
 
     float fv0time = -200;
     std::vector<float> fv0chAmpl(o2::aod::fit::nChFV0, 0);
@@ -66,8 +82,21 @@ struct fitExtraTable {
     uint8_t ft0Triggers, fv0Triggers, fddTriggers;
 
     for (const auto& collision : collisions) {
-      pv = collision.posZ();
+      auto bc = collision.bc_as<aod::BCsWithTimestamps>();
+      runnumber = bc.runNumber();
+      globalBC = bc.globalBC();
+      ctpTriggerMask = bc.triggerMask();
+      ctpInputMask = bc.inputMask();
+
+      bcId = collision.bcId();
+      posX = collision.posX();
+      posY = collision.posY();
+      posZ = collision.posZ();
+      flags = collision.flags();
       nContrib = collision.numContrib();
+      collisionTime = collision.collisionTime();
+      collisionTimeRes = collision.collisionTimeRes();
+
       sel8 = collision.sel8();
 
       ft0timeA = -200;
@@ -80,6 +109,8 @@ struct fitExtraTable {
       std::fill(ft0chAmpl.begin(), ft0chAmpl.end(), 0);
       ft0totAmplA = 0;
       ft0totAmplC = 0;
+      ft0totAmplACheck = 0;
+      ft0totAmplCCheck = 0;
 
       fv0time = -200;
       std::fill(fv0chAmpl.begin(), fv0chAmpl.end(), 0);
@@ -110,9 +141,11 @@ struct fitExtraTable {
         ft0Triggers = ft0.triggerMask();
         for (size_t i = 0; i < ft0.amplitudeA().size(); i++) {
           ft0chAmpl[ft0.channelA()[i]] = ft0.amplitudeA()[i];
+          ft0totAmplA += ft0.amplitudeA()[i];
         }
         for (size_t i = 0; i < ft0.amplitudeC().size(); i++) {
           ft0chAmpl[ft0.channelC()[i] + o2::aod::fit::nChFT0A] = ft0.amplitudeC()[i]; // Channel IDs in the C-side array start from zero in AO2D (JIRA AFIT-129)
+          ft0totAmplC += ft0.amplitudeC()[i];
         }
         ft0totAmplA = ft0.sumAmpA();
         ft0totAmplC = ft0.sumAmpC();
@@ -145,10 +178,11 @@ struct fitExtraTable {
 
       table(sel8, hasFT0, hasFV0, hasFDD,
             ft0Triggers, fv0Triggers, fddTriggers,
-            pv, nContrib,
+            runnumber, globalBC, ctpTriggerMask, ctpInputMask,
+            bcId, posX, posY, posZ, flags, nContrib, collisionTime, collisionTimeRes,
             ft0timeA, ft0timeC, ft0timeACorr, ft0timeCCorr,
             ft0time, ft0timeRes, ft0vtx,
-            ft0chAmpl, ft0totAmplA, ft0totAmplC,
+            ft0chAmpl, ft0totAmplA, ft0totAmplC, ft0totAmplACheck, ft0totAmplCCheck,
             fv0time, fv0chAmpl, fv0totAmpl,
             fddtimeA, fddtimeC, fddchAmpl, fddtotAmplA, fddtotAmplC);
     }