[FOCAL-10] Fixes in EventReader

- Add missing ClassDefNV to EventReader
- Add boundary checks to range access
- Fix copy/paste error in PixelChipRecord

Author: mfasDa

DataFormats/Detectors/FOCAL/include/DataFormatsFOCAL/PixelChipRecord.h

@@ -37,7 +37,7 @@ class PixelChipRecord
   int getLaneID() const { return mLaneID; }
   int getChipID() const { return mChipID; }
   int getFirstHit() const { return mHitIndexRange.getFirstEntry(); }
-  int getNumberOfHits() const { return mHitIndexRange.getFirstEntry(); }
+  int getNumberOfHits() const { return mHitIndexRange.getEntries(); }
 
   void printStream(std::ostream& stream) const;
 

DataFormats/Detectors/FOCAL/src/Event.cxx

@@ -11,6 +11,8 @@
 #include <algorithm>
 #include <DataFormatsFOCAL/ErrorHandling.h>
 #include <DataFormatsFOCAL/Event.h>
+#include <iostream>
+
 using namespace o2::focal;
 
 PadLayerEvent& Event::getPadLayer(unsigned int index)
@@ -69,7 +71,21 @@ void Event::construct(const o2::InteractionRecord& interaction, gsl::span<const
   }
 
   for (auto& chip : eventPixels) {
-    mPixelLayers[chip.getLayerID()].addChip(chip.getLaneID(), chip.getChipID(), pixelHits.subspan(chip.getFirstHit(), chip.getNumberOfHits()));
+    if (chip.getLayerID() > 1) {
+      std::cerr << "Invalid layer ID chip " << chip.getChipID() << ": " << chip.getLayerID() << std::endl;
+      continue;
+    }
+    if (chip.getNumberOfHits()) {
+      if (chip.getFirstHit() >= pixelHits.size()) {
+        std::cerr << "First hit index " << chip.getFirstHit() << " exceeding hit contiainer " << pixelHits.size() << std::endl;
+        continue;
+      }
+      if (chip.getFirstHit() + chip.getNumberOfHits() - 1 >= pixelHits.size()) {
+        std::cerr << "First hit index " << chip.getFirstHit() + chip.getNumberOfHits() - 1 << " exceeding hit contiainer " << pixelHits.size() << std::endl;
+        continue;
+      }
+      mPixelLayers[chip.getLayerID()].addChip(chip.getLaneID(), chip.getChipID(), pixelHits.subspan(chip.getFirstHit(), chip.getNumberOfHits()));
+    }
   }
 }
 

Detectors/FOCAL/base/include/FOCALBase/EventReader.h

@@ -44,6 +44,8 @@ class EventReader
   std::unique_ptr<TTreeReaderValue<std::vector<PixelHit>>> mPixelHitBranch;
   std::unique_ptr<TTreeReaderValue<std::vector<PixelChipRecord>>> mPixelChipBranch;
   std::unique_ptr<TTreeReaderValue<std::vector<TriggerRecord>>> mTriggerBranch;
+
+  ClassDefNV(EventReader, 1);
 };
 
 } // namespace o2::focal