From 3f3b7cf9cd1bdffc499c50784d1d1b665b0114a9 Mon Sep 17 00:00:00 2001
From: Chris Jones <jonesc@hep.phy.cam.ac.uk>
Date: Wed, 23 Oct 2024 12:58:19 +0100
Subject: [PATCH] RichParticleProperties: Adapt to RadiatorArray to
 DetectorArray migration

---
 .../src/RichParticleProperties.cpp            | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Rich/RichFutureTools/src/RichParticleProperties.cpp b/Rich/RichFutureTools/src/RichParticleProperties.cpp
index a63aaecd6..f454466b0 100644
--- a/Rich/RichFutureTools/src/RichParticleProperties.cpp
+++ b/Rich/RichFutureTools/src/RichParticleProperties.cpp
@@ -93,20 +93,20 @@ namespace Rich::Future {
     const Rich::Particles& particleTypes() const override { return m_pidTypes; }
 
     // Access the minimum cherenkov photon energies (Aero/R1Gas/R2Gas)
-    const RadiatorArray<float>& minPhotonEnergy() const override { return m_minPhotEn.value(); }
+    const DetectorArray<float>& minPhotonEnergy() const override { return m_minPhotEn.value(); }
 
     // Access the minimum cherenkov photon energies (Aero/R1Gas/R2Gas)
-    const RadiatorArray<float>& maxPhotonEnergy() const override { return m_maxPhotEn.value(); }
+    const DetectorArray<float>& maxPhotonEnergy() const override { return m_maxPhotEn.value(); }
 
     // Access the minimum cherenkov photon energy for given radiator
-    float minPhotonEnergy( const Rich::RadiatorType rad ) const override { return m_minPhotEn[rad]; }
+    float minPhotonEnergy( const Rich::DetectorType rich ) const override { return m_minPhotEn[rich]; }
 
     // Access the minimum cherenkov photon energy for given radiator
-    float maxPhotonEnergy( const Rich::RadiatorType rad ) const override { return m_maxPhotEn[rad]; }
+    float maxPhotonEnergy( const Rich::DetectorType rich ) const override { return m_maxPhotEn[rich]; }
 
     // Access the mean cherenkov photon energies (Aero/R1Gas/R2Gas)
-    float meanPhotonEnergy( const Rich::RadiatorType rad ) const override {
-      return 0.5f * ( m_maxPhotEn[rad] + m_minPhotEn[rad] );
+    float meanPhotonEnergy( const Rich::DetectorType rich ) const override {
+      return 0.5f * ( m_maxPhotEn[rich] + m_minPhotEn[rich] );
     }
 
   private:
@@ -115,11 +115,11 @@ namespace Rich::Future {
     /// Particle ID types to consider in the likelihood minimisation (JO)
     Gaudi::Property<std::vector<std::string>> m_pidTypesJO{this, "ParticleTypes"};
 
-    /// The minimum photon energies
-    Gaudi::Property<RadiatorArray<float>> m_minPhotEn{this, "MinPhotonEnergy", {1.75, 1.75, 1.75}};
+    /// The minimum photon energies for each RICH
+    Gaudi::Property<DetectorArray<float>> m_minPhotEn{this, "MinPhotonEnergy", {1.75, 1.75}};
 
-    /// The maximum photon energies
-    Gaudi::Property<RadiatorArray<float>> m_maxPhotEn{this, "MaxPhotonEnergy", {4.0, 7.0, 7.0}};
+    /// The maximum photon energies for each RICH
+    Gaudi::Property<DetectorArray<float>> m_maxPhotEn{this, "MaxPhotonEnergy", {7.0, 7.0}};
 
   private:
     // Private data
-- 
GitLab