Raw to digits

DataFormats/Detectors/ZDC/CMakeLists.txt

@@ -10,7 +10,7 @@
 
 o2_add_library(DataFormatsZDC
                SOURCES src/ChannelData.cxx src/BCData.cxx src/RecEvent.cxx src/RawEventData.cxx
-	       	       src/OrbitRawData.cxx src/OrbitRecData.cxx  src/PedestalData.cxx
+	       	       src/OrbitRawData.cxx src/OrbitRecData.cxx  src/OrbitData.cxx
 		       src/CTF.cxx
                PUBLIC_LINK_LIBRARIES O2::CommonConstants O2::CommonDataFormat
 	       			     O2::ZDCBase ROOT::MathCore FairRoot::Base
@@ -20,6 +20,6 @@ o2_add_library(DataFormatsZDC
 o2_target_root_dictionary(DataFormatsZDC
                HEADERS include/DataFormatsZDC/Hit.h include/DataFormatsZDC/MCLabel.h
                        include/DataFormatsZDC/BCData.h include/DataFormatsZDC/ChannelData.h
-	               include/DataFormatsZDC/PedestalData.h include/DataFormatsZDC/CTF.h
+	               include/DataFormatsZDC/OrbitData.h include/DataFormatsZDC/CTF.h
 	       	       include/DataFormatsZDC/RecEvent.h include/DataFormatsZDC/OrbitRawData.h
 		       include/DataFormatsZDC/OrbitRecData.h include/DataFormatsZDC/RawEventData.h)

DataFormats/Detectors/ZDC/include/DataFormatsZDC/BCData.h

@@ -27,6 +27,25 @@ namespace zdc
 {
 class ChannelData;
 
+struct __attribute__((__packed__)) ModuleTriggerMap {
+  unsigned Alice_0 : 1;
+  unsigned Alice_1 : 1;
+  unsigned Alice_2 : 1;
+  unsigned Alice_3 : 1;
+  unsigned Auto_m : 1;
+  unsigned Auto_0 : 1;
+  unsigned Auto_1 : 1;
+  unsigned Auto_2 : 1;
+  unsigned Auto_3 : 1;
+  unsigned empty : 7;
+};
+
+union ModuleTriggerMapData {
+  uint16_t w;
+  struct ModuleTriggerMap f;
+  void reset();
+};
+
 struct BCData {
   /// we are going to refer to at most 26 channels, so 5 bits for the NChannels and 27 for the reference
   o2::dataformats::RangeRefComp<5> ref;
@@ -48,7 +67,7 @@ struct BCData {
   }
 
   gsl::span<const ChannelData> getBunchChannelData(const gsl::span<const ChannelData> tfdata) const;
-  void print() const;
+  void print(uint32_t triggerMask = 0, int diff = 0) const;
 
   ClassDefNV(BCData, 2);
 };

DataFormats/Detectors/ZDC/include/DataFormatsZDC/CTF.h

@@ -20,7 +20,7 @@
 #include "DetectorsCommonDataFormats/EncodedBlocks.h"
 #include "DataFormatsZDC/ChannelData.h"
 #include "DataFormatsZDC/BCData.h"
-#include "DataFormatsZDC/PedestalData.h"
+#include "DataFormatsZDC/OrbitData.h"
 
 namespace o2
 {

DataFormats/Detectors/ZDC/include/DataFormatsZDC/PedestalData.h → DataFormats/Detectors/ZDC/include/DataFormatsZDC/OrbitData.h

@@ -25,14 +25,15 @@ namespace o2
 namespace zdc
 {
 
-struct PedestalData {
+struct OrbitData {
   o2::InteractionRecord ir;
   std::array<int16_t, NChannels> data{};
+  std::array<uint16_t, NChannels> scaler{};
 
   float asFloat(int i) const { return data[i] / 8.; }
   void print() const;
 
-  ClassDefNV(PedestalData, 1);
+  ClassDefNV(OrbitData, 1);
 };
 } // namespace zdc
 } // namespace o2

DataFormats/Detectors/ZDC/src/BCData.cxx

@@ -14,9 +14,13 @@
 
 using namespace o2::zdc;
 
-void BCData::print() const
+void BCData::print(uint32_t triggerMask, int diff) const
 {
-  printf("Orbit %9u bc %4u nch %2d pos %d\n", ir.orbit, ir.bc, ref.getEntries(), ref.getFirstEntry());
+  if (diff == 0) {
+    printf("Orbit %9u bc %4u nch %2d pos %d\n", ir.orbit, ir.bc, ref.getEntries(), ref.getFirstEntry());
+  } else {
+    printf("%9u.%04u ", ir.orbit, ir.bc);
+  }
   printf("Read:");
   for (int ic = 0; ic < NDigiChannels; ic++) {
     if (ic % NChPerModule == 0) {
@@ -32,16 +36,11 @@ void BCData::print() const
       printf(" ");
     }
   }
-  printf("]\nTrigs:");
-  for (int i = 0; i < NChannels; i++) {
-    std::bitset<10> bb(moduleTriggers[i]);
-    printf("[%2d: %s]", i, bb.to_string().c_str());
-    if (i % (NChannels / 3) == 0 && i) {
-      printf("\n");
-    }
+  printf("]\n");
+  if (diff) {
+    printf("%9u.%04u ", ir.orbit, ir.bc);
   }
-
-  printf("]\nHits:");
+  printf("Hits:");
   for (int ic = 0; ic < NDigiChannels; ic++) {
     if (ic % NChPerModule == 0) {
       if (ic == 0) {
@@ -50,13 +49,41 @@ void BCData::print() const
         printf("] %d[", ic / NChPerModule);
       }
     }
-    if (triggers & (0x1 << ic)) {
-      printf("H");
+    bool is_hit = triggers & (0x1 << ic);
+    bool is_trig = triggerMask & (0x1 << ic);
+    if (is_trig) {
+      if (is_hit) {
+        printf("T");
+      } else {
+        printf(".");
+      }
     } else {
-      printf(" ");
+      if (is_hit) {
+        printf("H");
+      } else {
+        printf(" ");
+      }
     }
   }
   printf("]\n");
+  if (diff) {
+    printf("%9u.%04u ", ir.orbit, ir.bc);
+  }
+  printf("AUTO:");
+  for (int i = 0; i < NModules; i++) {
+    std::bitset<10> bb(moduleTriggers[i]);
+    printf(" %d %s%s%s%s%s", i, bb[8] ? "3" : "-", bb[7] ? "2" : "-", bb[6] ? "1" : "-", bb[5] ? "0" : "-", bb[4] ? "M" : "-");
+  }
+  printf("\n");
+  if (diff) {
+    printf("%9u.%04u ", ir.orbit, ir.bc);
+  }
+  printf("ALIT:");
+  for (int i = 0; i < NModules; i++) {
+    std::bitset<10> bb(moduleTriggers[i]);
+    printf(" %d %s%s%s%s ", i, bb[3] ? "3" : "-", bb[2] ? "2" : "-", bb[1] ? "1" : "-", bb[0] ? "0" : "-");
+  }
+  printf("\n");
 }
 
 gsl::span<const ChannelData> BCData::getBunchChannelData(const gsl::span<const ChannelData> tfdata) const

DataFormats/Detectors/ZDC/src/DataFormatsZDCLinkDef.h

@@ -23,10 +23,10 @@
 
 #pragma link C++ class o2::zdc::ChannelData + ;
 #pragma link C++ class o2::zdc::BCData + ;
-#pragma link C++ class o2::zdc::PedestalData + ;
+#pragma link C++ class o2::zdc::OrbitData + ;
 #pragma link C++ class std::vector < o2::zdc::ChannelData> + ;
 #pragma link C++ class std::vector < o2::zdc::BCData> + ;
-#pragma link C++ class std::vector < o2::zdc::PedestalData> + ;
+#pragma link C++ class std::vector < o2::zdc::OrbitData> + ;
 
 #pragma link C++ class std::vector < o2::zdc::RecEvent> + ;
 #pragma link C++ class std::vector < o2::zdc::OrbitRawData> + ;

DataFormats/Detectors/ZDC/src/PedestalData.cxx → DataFormats/Detectors/ZDC/src/OrbitData.cxx

@@ -8,14 +8,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "DataFormatsZDC/PedestalData.h"
+#include "DataFormatsZDC/OrbitData.h"
+#include "ZDCBase/Constants.h"
 
 using namespace o2::zdc;
 
-void PedestalData::print() const
+void OrbitData::print() const
 {
   printf("Orbit %9u bc %4u\n", ir.orbit, ir.bc);
   for (int i = 0; i < NChannels; i++) {
-    printf("channel %2d : %9.3f\n", i, asFloat(i));
+    printf("%2d %s: %9.3f cnt: %4u\n", i, ChannelNames[i].data(), asFloat(i), scaler[i]);
   }
 }

Detectors/CTF/test/test_ctf_io_zdc.cxx

@@ -28,7 +28,7 @@ BOOST_AUTO_TEST_CASE(CTFTest)
 {
   std::vector<BCData> bcdata;
   std::vector<ChannelData> chandata;
-  std::vector<PedestalData> pedsdata;
+  std::vector<OrbitData> pedsdata;
   // RS: don't understand why, but this library is not loaded automatically, although the dependencies are clearly
   // indicated. What it more weird is that for similar tests of other detectors the library is loaded!
   // Absence of the library leads to complains about the StreamerInfo and eventually segm.faul when appending the
@@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE(CTFTest)
     }
   }
 
-  // PedestalData
+  // OrbitData
   const auto &irFirst = bcdata.front().ir, irLast = bcdata.back().ir;
   o2::InteractionRecord irPed(o2::constants::lhc::LHCMaxBunches - 1, irFirst.orbit);
   int norbits = irLast.orbit - irFirst.orbit + 1;
@@ -111,7 +111,7 @@ BOOST_AUTO_TEST_CASE(CTFTest)
 
   std::vector<BCData> bcdataD;
   std::vector<ChannelData> chandataD;
-  std::vector<PedestalData> pedsdataD;
+  std::vector<OrbitData> pedsdataD;
 
   sw.Start();
   const auto ctfImage = o2::zdc::CTF::getImage(vec.data());
@@ -153,12 +153,12 @@ BOOST_AUTO_TEST_CASE(CTFTest)
     BOOST_CHECK(cmpChData);
   }
 
-  LOG(INFO) << "Testing PedestalData: BOOST_CHECK(pedsdataD.size() " << pedsdataD.size() << " pedsdata.size()) " << pedsdata.size();
+  LOG(INFO) << "Testing OrbitData: BOOST_CHECK(pedsdataD.size() " << pedsdataD.size() << " pedsdata.size()) " << pedsdata.size();
   BOOST_CHECK(pedsdataD.size() == pedsdata.size());
   for (size_t i = 0; i < pedsdata.size(); i++) {
     bool cmpPdData = pedsdata[i].ir == pedsdataD[i].ir && pedsdata[i].data == pedsdataD[i].data;
     if (!cmpPdData) {
-      LOG(ERROR) << "Mismatch in PedestalData " << i;
+      LOG(ERROR) << "Mismatch in OrbitData " << i;
       pedsdata[i].print();
       pedsdataD[i].print();
     }

Detectors/ZDC/base/include/ZDCBase/Geometry.h

@@ -50,9 +50,9 @@ class Geometry
   static constexpr double ZEMPOSITION[3] = {9.69, 0., 760.};
 
  private:
-  static Int_t getDetector(const Int_t det);
-  static Int_t getSector(const Int_t tow);
-  static Int_t getVolumeId(const Int_t* vol);
+  static int32_t getDetector(const int32_t det);
+  static int32_t getSector(const int32_t tow);
+  static int32_t getVolumeId(const int32_t* vol);
 
   ClassDefNV(Geometry, 1);
 };

Detectors/ZDC/raw/CMakeLists.txt

@@ -9,7 +9,9 @@
 # submit itself to any jurisdiction.
 
 o2_add_library(ZDCRaw
-               SOURCES src/DumpRaw.cxx src/raw-parser.cxx
+               SOURCES src/DumpRaw.cxx
+	               src/raw-parser.cxx
+		       src/RawReaderZDC.cxx
                PUBLIC_LINK_LIBRARIES O2::SimulationDataFormat O2::ZDCBase O2::ZDCSimulation
 	       			     O2::DataFormatsZDC O2::CCDB O2::SimConfig O2::DPLUtils
 				     O2::DetectorsRaw O2::Headers)
@@ -28,4 +30,3 @@ o2_add_executable(raw-parser
                                         O2::DetectorsRaw
                                         O2::DetectorsCommonDataFormats
                                         O2::CommonUtils)
-

Detectors/ZDC/raw/include/ZDCRaw/DumpRaw.h

@@ -26,7 +26,7 @@ class DumpRaw
   void init();
   int process(const EventData& ev);
   int process(const EventChData& ch);
-  int processWord(const UInt_t* word);
+  int processWord(const uint32_t* word);
   int getHPos(uint32_t board, uint32_t ch);
   void write();
   void setVerbosity(int v)

Detectors/ZDC/raw/include/ZDCRaw/RawReaderZDC.h

@@ -0,0 +1,94 @@
+// Copyright CERN and copyright holders of ALICE O2. This software is
+// distributed under the terms of the GNU General Public License v3 (GPL
+// Version 3), copied verbatim in the file "COPYING".
+//
+// See http://alice-o2.web.cern.ch/license for full licensing information.
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+//
+//file RawReaderZDC.h class  for RAW data reading
+
+#ifndef ALICEO2_RAWREADERZDC_H_
+#define ALICEO2_RAWREADERZDC_H_
+#include <iostream>
+#include <vector>
+#include <Rtypes.h>
+#include <CommonDataFormat/InteractionRecord.h>
+#include <Framework/Logger.h>
+#include "Headers/RAWDataHeader.h"
+#include "DataFormatsZDC/RawEventData.h"
+#include "DataFormatsZDC/ChannelData.h"
+#include "DataFormatsZDC/BCData.h"
+#include "DataFormatsZDC/OrbitData.h"
+#include "ZDCSimulation/Digits2Raw.h"
+#include "ZDCBase/ModuleConfig.h"
+#include "Framework/ProcessingContext.h"
+#include "Framework/DataAllocator.h"
+#include "Framework/OutputSpec.h"
+#include "Framework/Lifetime.h"
+#include <gsl/span>
+
+namespace o2
+{
+namespace zdc
+{
+class RawReaderZDC
+{
+ public:
+  RawReaderZDC(bool dumpData) : mDumpData(dumpData) {}
+  RawReaderZDC(const RawReaderZDC&) = default;
+
+  RawReaderZDC() = default;
+  ~RawReaderZDC() = default;
+
+  std::map<InteractionRecord, EventData> mMapData; /// Raw data cache
+  const ModuleConfig* mModuleConfig = nullptr;     /// Trigger/readout configuration object
+  void setModuleConfig(const ModuleConfig* moduleConfig) { mModuleConfig = moduleConfig; };
+  const ModuleConfig* getModuleConfig() { return mModuleConfig; };
+  uint32_t mTriggerMask = 0; // Trigger mask from ModuleConfig
+  void setTriggerMask();
+
+  bool mVerifyTrigger = true; // Verify trigger condition during conversion to digits
+
+  std::vector<o2::zdc::BCData> mDigitsBC;
+  std::vector<o2::zdc::ChannelData> mDigitsCh;
+  std::vector<o2::zdc::OrbitData> mOrbitData;
+
+  void clear();
+
+  //decoding binary data into data blocks
+  void processBinaryData(gsl::span<const uint8_t> payload, int linkID); //processing data blocks into digits
+  int processWord(const uint32_t* word);
+  EventChData mCh; // Channel data to be decoded
+  void process(const EventChData& ch);
+
+  void accumulateDigits()
+  {
+    getDigits(mDigitsBC, mDigitsCh, mOrbitData);
+    LOG(INFO) << "Number of Digits: " << mDigitsBC.size();
+    LOG(INFO) << "Number of ChannelData: " << mDigitsCh.size();
+    LOG(INFO) << "Number of OrbitData: " << mOrbitData.size();
+  }
+
+  int getDigits(std::vector<BCData>& digitsBC, std::vector<ChannelData>& digitsCh, std::vector<OrbitData>& orbitData);
+
+  static void prepareOutputSpec(std::vector<o2::framework::OutputSpec>& outputSpec)
+  {
+    outputSpec.emplace_back("ZDC", "DIGITSBC", 0, o2::framework::Lifetime::Timeframe);
+    outputSpec.emplace_back("ZDC", "DIGITSCH", 0, o2::framework::Lifetime::Timeframe);
+    outputSpec.emplace_back("ZDC", "DIGITSPD", 0, o2::framework::Lifetime::Timeframe);
+  }
+  void makeSnapshot(o2::framework::ProcessingContext& pc)
+  {
+    pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginZDC, "DIGITSBC", 0, o2::framework::Lifetime::Timeframe}, mDigitsBC);
+    pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginZDC, "DIGITSCH", 0, o2::framework::Lifetime::Timeframe}, mDigitsCh);
+    pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginZDC, "DIGITSPD", 0, o2::framework::Lifetime::Timeframe}, mOrbitData);
+  }
+  bool mDumpData;
+};
+} // namespace zdc
+} // namespace o2
+
+#endif