Roel Aaij · 3d9d2c7d · 3d9d2c7d · 3d9d2c7d · 20e9fb79
--- a/Pr/PrPixel/src/PrPixelHit.h
+++ b/Pr/PrPixel/src/PrPixelHit.h
-        m_module(0),
-        m_id(0),
-        m_isUsed(false) {}
+  PrPixelHit(const LHCb::LHCbID &id, 
+             const float x, const float y, const float z,
+             const float wxerr, const float wyerr,
+             const unsigned int module) :
+    m_x(x),
+    m_y(y),
+    m_z(z),
+    m_wxerr(wxerr),
+    m_wyerr(wyerr),
+    m_module(module),
+    m_id(id) {}
  /// Destructor
  virtual ~PrPixelHit() {}
--- a/Pr/PrPixel/src/PrPixelHit.h
+++ b/Pr/PrPixel/src/PrPixelHit.h
 class PrPixelHit {
--- a/Pr/PrPixel/src/PrPixelModule.h
+++ b/Pr/PrPixel/src/PrPixelModule.h
 class PrPixelModule {

 public:
  /// Constructor
  PrPixelModule(const unsigned int number, const bool right)
-      : m_lastHitX(-1),
-        m_number(number),
-        m_previous(-1),
-        m_empty(true),
-        m_isRight(right) {
-    reset();
-  }
+      : m_number(number),
+        m_isRight(right) {}
  /// Destructor
  virtual ~PrPixelModule() {}
--- a/Pr/PrPixel/src/PrPixelHitManager.cpp
+++ b/Pr/PrPixel/src/PrPixelHitManager.cpp
  }    // loop over all banks

-  // DO NOT MOVE THIS IN THE ABOVE LOOP IN A FUTILE OPTIMIZATION ATTEMPT!  The
-  // pool container could have been resized during clustering in which case
-  // all pointers and iterators would be rendered invalid. We HAVE to do this
-  // here!
-  for (unsigned int i = 0; i < pool.size(); ++i) {
-    auto& hit = pool[i];
-    modulehits[hit.module()].addHit(&hit);
+  for (size_t module = 0; module < hitsPerModule.size(); ++module) {
+    modulehits[module].hits().reserve(hitsPerModule[module]);
+  }
+
+  if (m_trigger) {
+     // Add hits without channel IDs in trigger mode
+     for (const auto& t : view::zip(pool, xFractions, yFractions)) {