read number of channels from Geometry

Author: AllaMaevskaya

DataFormats/Detectors/FIT/FT0/include/DataFormatsFT0/RawEventData.h

@@ -18,6 +18,7 @@
 #include "Headers/RAWDataHeader.h"
 #include "TList.h" //temporary for QC-FT0 (ChannelTimeCalibrationCheck.cxx), should be moved
 #include "DataFormatsFIT/RawEventData.h"
+#include "FT0Base/Geometry.h"
 #include <CommonDataFormat/InteractionRecord.h>
 #include <Framework/Logger.h>
 #include <utility>
@@ -29,7 +30,7 @@ namespace o2
 {
 namespace ft0
 {
-constexpr int Nchannels_FT0 = 208;
+constexpr int Nchannels_FT0 = o2::ft0::Geometry::Nchannels;
 constexpr int Nchannels_PM = 12;
 constexpr int NPMs = 20;
 using EventHeader = o2::fit::EventHeader;

Detectors/AOD/src/AODProducerWorkflowSpec.cxx

@@ -36,6 +36,7 @@
 #include "SimulationDataFormat/MCTrack.h"
 #include "SimulationDataFormat/MCTruthContainer.h"
 #include "SimulationDataFormat/MCEventLabel.h"
+#include "FT0Base/Geometry.h"
 #include "TMath.h"
 #include "MathUtils/Utils.h"
 #include <map>
@@ -606,21 +607,24 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
   }
 
   // vector of FT0 amplitudes
-  std::vector<float> vAmplitudes(208, 0.);
+  int nFT0Channels = o2::ft0::Geometry::Nchannels;
+  int nFT0ChannelsAside = o2::ft0::Geometry::NCellsA * 4;
+  std::vector<float> vAmplitudes(nFT0Channels, 0.);
   // filling FT0 table
   for (auto& ft0RecPoint : ft0RecPoints) {
     const auto channelData = ft0RecPoint.getBunchChannelData(ft0ChData);
     // TODO: switch to calibrated amplitude
     for (auto& channel : channelData) {
       vAmplitudes[channel.ChId] = channel.QTCAmpl; // amplitude, mV
     }
-    float aAmplitudesA[96];
-    float aAmplitudesC[112];
-    for (int i = 0; i < 96; i++) {
-      aAmplitudesA[i] = truncateFloatFraction(vAmplitudes[i], mT0Amplitude);
-    }
-    for (int i = 0; i < 112; i++) {
-      aAmplitudesC[i] = truncateFloatFraction(vAmplitudes[i + 96], mT0Amplitude);
+    float aAmplitudesA[nFT0ChannelsAside];
+    float aAmplitudesC[133];
+    for (int i = 0; i < nFT0Channels; i++) {
+      if (i < nFT0ChannelsAside) {
+        aAmplitudesA[i] = truncateFloatFraction(vAmplitudes[i], mT0Amplitude);
+      } else {
+        aAmplitudesC[i - nFT0ChannelsAside] = truncateFloatFraction(vAmplitudes[i], mT0Amplitude);
+      }
     }
     uint64_t globalBC = ft0RecPoint.getInteractionRecord().toLong();
     uint64_t bc = globalBC;