From b03b985d30e297bf4455292cc869a30d3277e468 Mon Sep 17 00:00:00 2001
From: Chris Jones <jonesc@hep.phy.cam.ac.uk>
Date: Fri, 18 Aug 2023 17:18:34 +0100
Subject: [PATCH] Rename time info in RichGeomPhoton to be only the radiator
transit time
---
.../include/RichFutureUtils/RichGeomPhoton.h | 9 ++++-----
.../include/RichFutureUtils/RichSIMDGeomPhoton.h | 11 +++++------
Rich/RichFutureUtils/src/RichGeomPhoton.cpp | 2 +-
3 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/Rich/RichFutureUtils/include/RichFutureUtils/RichGeomPhoton.h b/Rich/RichFutureUtils/include/RichFutureUtils/RichGeomPhoton.h
index 06c2419ab18..3cda0cc0e2e 100644
--- a/Rich/RichFutureUtils/include/RichFutureUtils/RichGeomPhoton.h
+++ b/Rich/RichFutureUtils/include/RichFutureUtils/RichGeomPhoton.h
@@ -83,7 +83,7 @@ namespace Rich::Future {
, m_CherenkovPhi( phi )
, m_smartID( smartID )
, m_activeSegmentFraction( activeFrac )
- , m_recoHitTime( detectionTime ) {}
+ , m_radTransitTime( detectionTime ) {}
public:
// getters and setters
@@ -123,7 +123,7 @@ namespace Rich::Future {
[[nodiscard]] Scalar activeSegmentFraction() const noexcept { return m_activeSegmentFraction; }
/// Access the reconstructed photon detection time
- [[nodiscard]] Scalar recoDetectionTime() const noexcept { return m_recoHitTime; }
+ [[nodiscard]] Scalar radTransitTime() const noexcept { return m_radTransitTime; }
/** Set accessor for the RichSmartID
* @param id The new RichSmartID */
@@ -157,9 +157,8 @@ namespace Rich::Future {
* with for which it is geometrically possible this photon was produced */
Scalar m_activeSegmentFraction{1};
- /* Expected photon detection time based on reconstructed track and photon trajectory
- * and track origin time */
- Scalar m_recoHitTime{0};
+ /// Transit time inside the radiator volume (from entry plane)
+ Scalar m_radTransitTime{0};
};
/** @class GeomPhoton RichGeomPhoton.h RichFutureUtils/RichGeomPhoton.h
diff --git a/Rich/RichFutureUtils/include/RichFutureUtils/RichSIMDGeomPhoton.h b/Rich/RichFutureUtils/include/RichFutureUtils/RichSIMDGeomPhoton.h
index ecdc5782d0b..d408b531f03 100644
--- a/Rich/RichFutureUtils/include/RichFutureUtils/RichSIMDGeomPhoton.h
+++ b/Rich/RichFutureUtils/include/RichFutureUtils/RichSIMDGeomPhoton.h
@@ -100,7 +100,7 @@ namespace Rich::SIMD::Future {
: m_ckTheta( theta )
, m_ckPhi( phi )
, m_activeFraction( activeFrac )
- , m_recoHitTime( detTime )
+ , m_radTransitTime( detTime )
, m_valid( validMask )
, m_smartIDs( smartIDs )
, m_rich( rich ) {}
@@ -146,7 +146,7 @@ namespace Rich::SIMD::Future {
[[nodiscard]] const SIMDFP& activeSegmentFraction() const noexcept { return m_activeFraction; }
/// Access the reconstructed photon detection time
- [[nodiscard]] const SIMDFP& recoDetectionTime() const noexcept { return m_recoHitTime; }
+ [[nodiscard]] const SIMDFP& radTransitTime() const noexcept { return m_radTransitTime; }
/** Get accessor to RichSmartID
* @return the current value of RichSmartID */
@@ -169,7 +169,7 @@ namespace Rich::SIMD::Future {
CherenkovPhi()[simdEntry], //
smartID()[simdEntry], //
activeSegmentFraction()[simdEntry], //
- recoDetectionTime()[simdEntry]}
+ radTransitTime()[simdEntry]}
: ScalarPhoton{} );
}
@@ -201,9 +201,8 @@ namespace Rich::SIMD::Future {
* with for which it is geometrically possible these photon were produced */
alignas( LHCb::SIMD::VectorAlignment ) SIMDFP m_activeFraction{SIMDFP::One()};
- /* Expected photon detection time based on reconstructed track and photon trajectory
- * and track origin time */
- alignas( LHCb::SIMD::VectorAlignment ) SIMDFP m_recoHitTime{SIMDFP::Zero()};
+ /// Transit time inside the RICH radiator volume
+ alignas( LHCb::SIMD::VectorAlignment ) SIMDFP m_radTransitTime{SIMDFP::Zero()};
/// Validity mask
alignas( LHCb::SIMD::VectorAlignment ) MASK m_valid{MASK( false )};
diff --git a/Rich/RichFutureUtils/src/RichGeomPhoton.cpp b/Rich/RichFutureUtils/src/RichGeomPhoton.cpp
index dc27ec082ef..32abcd249bc 100644
--- a/Rich/RichFutureUtils/src/RichGeomPhoton.cpp
+++ b/Rich/RichFutureUtils/src/RichGeomPhoton.cpp
@@ -28,7 +28,7 @@ std::ostream& Rich::Future::RecoPhoton::fillStream( std::ostream& s ) const {
<< " ckPhi:" << CherenkovPhi() //
<< " smartID:" << smartID() //
<< " activeFraction:" << activeSegmentFraction() //
- << " recoTime:" << recoDetectionTime() //
+ << " radTransitTime:" << radTransitTime() //
<< " }";
}
--
GitLab