extra

Author: andreasmolander

Common/DataModel/FITExtra.h

@@ -113,18 +113,14 @@ DECLARE_SOA_TABLE(FITExtras, "AOD", "FITEXTRA", //! Table with extra FIT informa
                   fit::Timestamp,
                   fit::Sel8, fit::HasFT0, fit::HasFV0, fit::HasFDD,
                   fit::BCId, fit::PosX, fit::PosY, fit::PosZ, fit::Flags, fit::NumContrib, fit::CollisionTime, fit::CollisionTimeRes,
-                //   fit::FT0BCId,
-                  fit::FT0AmplitudeA, fit::FT0ChannelA, fit::FT0AmplitudeC, fit::FT0ChannelC,
+                  fit::FT0BCId, fit::FT0AmplitudeA, fit::FT0ChannelA, fit::FT0AmplitudeC, fit::FT0ChannelC,
                   fit::FT0TimeA, fit::FT0TimeC, fit::FT0TriggerMask, fit::FT0PosZ, fit::FT0CollTime, fit::FT0SumAmpA, fit::FT0SumAmpC,
                   fit::T0ACorrected, fit::T0CCorrected, fit::T0AC, fit::T0Resolution,
                   fit::FT0ChAmpl, fit::FT0TotAmplA, fit::FT0TotAmplC,
-                //   fit::FV0BCId,
-                  fit::FV0Amplitude, fit::FV0Channel, fit::FV0Time, fit::FV0TriggerMask,
+                  fit::FV0BCId, fit::FV0Amplitude, fit::FV0Channel, fit::FV0Time, fit::FV0TriggerMask,
                   fit::FV0ChAmpl, fit::FV0TotAmpl,
-                //   fit::FDDBCId,
-                  fit::FDDChargeA, fit::FDDChargeC, fit::FDDTimeA, fit::FDDTimeC, fit::FDDTriggerMask,
-                  fit::FDDChAmpl, fit::FDDTotAmplA, fit::FDDTotAmplC
-                );
+                  fit::FDDBCId, fit::FDDChargeA, fit::FDDChargeC, fit::FDDTimeA, fit::FDDTimeC, fit::FDDTriggerMask,
+                  fit::FDDChAmpl, fit::FDDTotAmplA, fit::FDDTotAmplC);
 
 using FITExtra = FITExtras::iterator;
 

Common/TableProducer/fitExtraTable.cxx

@@ -70,9 +70,9 @@ struct fitExtraTable {
     // FT0
     int32_t ft0BCId = -1;
     std::vector<float> ft0AmplitudeA;
-    std::vector<int8_t> ft0ChannelA;
+    std::vector<uint8_t> ft0ChannelA;
     std::vector<float> ft0AmplitudeC;
-    std::vector<int8_t> ft0ChannelC;
+    std::vector<uint8_t> ft0ChannelC;
     float ft0TimeA = -200;
     float ft0TimeC = -200;
     uint8_t ft0TriggerMask = 0;
@@ -95,7 +95,7 @@ struct fitExtraTable {
     // FV0A
     int32_t fv0BCId = -1;
     std::vector<float> fv0Amplitude;
-    std::vector<int8_t> fv0Channel;
+    std::vector<uint8_t> fv0Channel;
     float fv0Time = -200;
     uint8_t fv0TriggerMask = 0;
 
@@ -268,18 +268,14 @@ struct fitExtraTable {
             timestamp,
             sel8, hasFT0, hasFV0, hasFDD,
             bcId, posX, posY, posZ, flags, numContrib, collisionTime, collisionTimeRes,
-            // ft0BCId,
-            ft0AmplitudeA, ft0ChannelA, ft0AmplitudeC, ft0ChannelC,
+            ft0BCId, ft0AmplitudeA, ft0ChannelA, ft0AmplitudeC, ft0ChannelC,
             ft0TimeA, ft0TimeC, ft0TriggerMask, ft0PosZ, ft0CollTime, ft0SumAmpA, ft0SumAmpC,
             t0ACorrected, t0CCorrected, t0AC, t0resolution,
             ft0ChAmpl, ft0TotAmplA, ft0TotAmplC,
-            // fv0BCId,
-            fv0Amplitude, fv0Channel, fv0Time, fv0TriggerMask,
+            fv0BCId, fv0Amplitude, fv0Channel, fv0Time, fv0TriggerMask,
             fv0ChAmpl, fv0TotAmpl,
-            // fddBCId,
-            fddChargeA, fddChargeC, fddTimeA, fddTimeC, fddTriggerMask,
-            fddChAmpl, fddTotAmplA, fddTotAmplC
-          );
+            fddBCId, fddChargeA, fddChargeC, fddTimeA, fddTimeC, fddTriggerMask,
+            fddChAmpl, fddTotAmplA, fddTotAmplC);
     }
   }
 };