Provide stored channels for BC as a span

shahor02 · shahor02 · commit 728364c08546 · 2019-12-12T21:42:07.000+01:00
diff --git a/DataFormats/Detectors/ZDC/CMakeLists.txt b/DataFormats/Detectors/ZDC/CMakeLists.txt
@@ -13,7 +13,7 @@ o2_add_library(DataFormatsZDC
 	       	       src/OrbitRawData.cxx src/OrbitRecData.cxx 
                PUBLIC_LINK_LIBRARIES O2::CommonConstants O2::CommonDataFormat
 	       			     O2::ZDCBase ROOT::MathCore FairRoot::Base
-				     O2::MathUtils)
+				     O2::MathUtils ms_gsl::ms_gsl)
 
 o2_target_root_dictionary(DataFormatsZDC
                HEADERS include/DataFormatsZDC/BCData.h include/DataFormatsZDC/ChannelData.h
diff --git a/DataFormats/Detectors/ZDC/include/DataFormatsZDC/BCData.h b/DataFormats/Detectors/ZDC/include/DataFormatsZDC/BCData.h
@@ -15,6 +15,7 @@
 #include "CommonDataFormat/RangeReference.h"
 #include "ZDCBase/Constants.h"
 #include <Rtypes.h>
+#include <gsl/span>
 
 /// \file BCData.h
 /// \brief Class to describe fired triggered and/or stored channels for the BC and to refer to channel data
@@ -24,6 +25,7 @@ namespace o2
 {
 namespace zdc
 {
+class ChannelData;
 
 struct BCData {
   /// we are going to refer to at most 26 channels, so 5 bits for the NChannels and 27 for the reference
@@ -41,6 +43,8 @@ struct BCData {
     channels = chSto;
     triggers = chTrig;
   }
+
+  gsl::span<const ChannelData> getBunchChannelData(const gsl::span<const ChannelData> tfdata) const;
   void print() const;
 
   ClassDefNV(BCData, 1);
diff --git a/DataFormats/Detectors/ZDC/src/BCData.cxx b/DataFormats/Detectors/ZDC/src/BCData.cxx
@@ -9,6 +9,7 @@
 // or submit itself to any jurisdiction.
 
 #include "DataFormatsZDC/BCData.h"
+#include "DataFormatsZDC/ChannelData.h"
 #include <bitset>
 
 using namespace o2::zdc;
@@ -31,3 +32,9 @@ void BCData::print() const
   }
   printf("]\n");
 }
+
+gsl::span<const ChannelData> BCData::getBunchChannelData(const gsl::span<const ChannelData> tfdata) const
+{
+  // extract the span of channel data for this bunch from the whole TF data
+  return gsl::span<const ChannelData>(&tfdata[ref.getFirstEntry()], ref.getEntries());
+}
diff --git a/Detectors/ZDC/macro/readZDCDigits.C b/Detectors/ZDC/macro/readZDCDigits.C
@@ -57,11 +57,18 @@ void readZDCDigits(std::string digiFName = "zdcdigits.root")
       }
       bcd.print();
       //
+      auto channels = bcd.getBunchChannelData(zdcChData);
+      int nch = channels.size();
+      for (int ich = 0; ich < nch; ich++) {
+        channels[ich].print();
+      }
+      /* // alternative way:
       int chEnt = bcd.ref.getFirstEntry();
       for (int ic = 0; ic < bcd.ref.getEntries(); ic++) {
         const auto& chd = zdcChData[chEnt++];
         chd.print();
       }
+      */
       if (labelsPtr) {
         const auto lbl = labelsPtr->getLabels(ibc);
         for (int lb = 0; lb < lbl.size(); lb++) {
