Update FITExtras

Author: andreasmolander

Common/DataModel/FITExtra.h

@@ -20,6 +20,7 @@ namespace o2::aod
 namespace fit
 {
 // 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(NContrib, nContrib, int);           //! Number of contributors to primary vertex (o2::aod::‌collision::NumContrib)
 DECLARE_SOA_COLUMN(FT0TimeA, ft0timeA, float);         //! FT0-A average time in ns (o2::aod::ft0::TimeA)
@@ -36,22 +37,26 @@ DECLARE_SOA_COLUMN(FDDTimeC, fddtimeC, float);         //! FDD-C average time in
 // Derived quantities
 
 // Event selection conditions straigt from AOD
+// TODO: do we need them here?
 DECLARE_SOA_COLUMN(Sel8, sel8, bool);                  //! (o2::aod::evsel::Sel8)
 DECLARE_SOA_COLUMN(HasFT0, hasFT0, bool);              //! (o2::aod::collision::has_foundFT0())
 DECLARE_SOA_COLUMN(HasFV0, hasFV0, bool);              //! (o2::aod::collision::has_foundFV0())
 DECLARE_SOA_COLUMN(HasFDD, hasFDD, bool);              //! (o2::aod::collision::has_foundFDD())
-DECLARE_SOA_COLUMN(FT0Triggers, ft0Triggers, uint8_t); //! FT0 trigger mask
-DECLARE_SOA_COLUMN(FV0Triggers, fv0Triggers, uint8_t); //! FV0 trigger mask
-DECLARE_SOA_COLUMN(FDDTriggers, fddTriggers, uint8_t); //! FDD trigger mask
+DECLARE_SOA_COLUMN(FT0Triggers, ft0Triggers, uint8_t); //! FT0 trigger mask (o2::aod::ft0::TriggerMask)
+DECLARE_SOA_COLUMN(FV0Triggers, fv0Triggers, uint8_t); //! FV0 trigger mask (o2::aod::fv0a::TriggerMask)
+DECLARE_SOA_COLUMN(FDDTriggers, fddTriggers, uint8_t); //! FDD trigger mask (o2::aod::fdd::TriggerMask)
 } // namespace fit
+
 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::FT0TimeA, fit::FT0TimeC, fit::FT0TimeACorr, fit::FT0TimeCCorr,
                   fit::FT0Time, fit::FT0TimeRes, fit::FT0Vtx,
                   fit::FV0Time, fit::FDDTimeA, fit::FDDTimeC);
+
 using FITExtra = FITExtras::iterator;
+
 } // namespace o2::aod
 
 #endif // COMMON_DATAMODEL_FITEXTRA_H_

Common/TableProducer/fitExtraTable.cxx

@@ -100,25 +100,31 @@ struct fitExtraTable {
         fddTriggers = fdd.triggerMask();
       }
 
-      table(pv,
-            nContrib,
-            ft0timeA,
-            ft0timeC,
-            ft0timeACorr,
-            ft0timeCCorr,
-            ft0time,
-            ft0timeRes,
-            ft0vtx,
-            fv0time,
-            fddtimeA,
-            fddtimeC,
-            sel8,
-            hasFT0,
-            hasFV0,
-            hasFDD,
-            ft0Triggers,
-            fv0Triggers,
-            fddTriggers);
+      // table(pv,
+      //       nContrib,
+      //       ft0timeA,
+      //       ft0timeC,
+      //       ft0timeACorr,
+      //       ft0timeCCorr,
+      //       ft0time,
+      //       ft0timeRes,
+      //       ft0vtx,
+      //       fv0time,
+      //       fddtimeA,
+      //       fddtimeC,
+      //       sel8,
+      //       hasFT0,
+      //       hasFV0,
+      //       hasFDD,
+      //       ft0Triggers,
+      //       fv0Triggers,
+      //       fddTriggers);
+      table(sel8, hasFT0, hasFV0, hasFDD,
+            ft0Triggers, fv0Triggers, fddTriggers,
+            pv, nContrib,
+            ft0timeA, ft0timeC, ft0timeACorr, ft0timeCCorr,
+            ft0time, ft0timeRes, ft0vtx,
+            fv0time, fddtimeA, fddtimeC);
     }
   }
 };