Skip to content
Snippets Groups Projects
Commit b03b985d authored by Christopher Rob Jones's avatar Christopher Rob Jones
Browse files

Rename time info in RichGeomPhoton to be only the radiator transit time

parent 3704d443
No related branches found
No related tags found
1 merge request!4251Add support for RICH 4D reconstruction
Pipeline #6068041 passed
...@@ -83,7 +83,7 @@ namespace Rich::Future { ...@@ -83,7 +83,7 @@ namespace Rich::Future {
, m_CherenkovPhi( phi ) , m_CherenkovPhi( phi )
, m_smartID( smartID ) , m_smartID( smartID )
, m_activeSegmentFraction( activeFrac ) , m_activeSegmentFraction( activeFrac )
, m_recoHitTime( detectionTime ) {} , m_radTransitTime( detectionTime ) {}
public: public:
// getters and setters // getters and setters
...@@ -123,7 +123,7 @@ namespace Rich::Future { ...@@ -123,7 +123,7 @@ namespace Rich::Future {
[[nodiscard]] Scalar activeSegmentFraction() const noexcept { return m_activeSegmentFraction; } [[nodiscard]] Scalar activeSegmentFraction() const noexcept { return m_activeSegmentFraction; }
/// Access the reconstructed photon detection time /// 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 /** Set accessor for the RichSmartID
* @param id The new RichSmartID */ * @param id The new RichSmartID */
...@@ -157,9 +157,8 @@ namespace Rich::Future { ...@@ -157,9 +157,8 @@ namespace Rich::Future {
* with for which it is geometrically possible this photon was produced */ * with for which it is geometrically possible this photon was produced */
Scalar m_activeSegmentFraction{1}; Scalar m_activeSegmentFraction{1};
/* Expected photon detection time based on reconstructed track and photon trajectory /// Transit time inside the radiator volume (from entry plane)
* and track origin time */ Scalar m_radTransitTime{0};
Scalar m_recoHitTime{0};
}; };
/** @class GeomPhoton RichGeomPhoton.h RichFutureUtils/RichGeomPhoton.h /** @class GeomPhoton RichGeomPhoton.h RichFutureUtils/RichGeomPhoton.h
......
...@@ -100,7 +100,7 @@ namespace Rich::SIMD::Future { ...@@ -100,7 +100,7 @@ namespace Rich::SIMD::Future {
: m_ckTheta( theta ) : m_ckTheta( theta )
, m_ckPhi( phi ) , m_ckPhi( phi )
, m_activeFraction( activeFrac ) , m_activeFraction( activeFrac )
, m_recoHitTime( detTime ) , m_radTransitTime( detTime )
, m_valid( validMask ) , m_valid( validMask )
, m_smartIDs( smartIDs ) , m_smartIDs( smartIDs )
, m_rich( rich ) {} , m_rich( rich ) {}
...@@ -146,7 +146,7 @@ namespace Rich::SIMD::Future { ...@@ -146,7 +146,7 @@ namespace Rich::SIMD::Future {
[[nodiscard]] const SIMDFP& activeSegmentFraction() const noexcept { return m_activeFraction; } [[nodiscard]] const SIMDFP& activeSegmentFraction() const noexcept { return m_activeFraction; }
/// Access the reconstructed photon detection time /// 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 /** Get accessor to RichSmartID
* @return the current value of RichSmartID */ * @return the current value of RichSmartID */
...@@ -169,7 +169,7 @@ namespace Rich::SIMD::Future { ...@@ -169,7 +169,7 @@ namespace Rich::SIMD::Future {
CherenkovPhi()[simdEntry], // CherenkovPhi()[simdEntry], //
smartID()[simdEntry], // smartID()[simdEntry], //
activeSegmentFraction()[simdEntry], // activeSegmentFraction()[simdEntry], //
recoDetectionTime()[simdEntry]} radTransitTime()[simdEntry]}
: ScalarPhoton{} ); : ScalarPhoton{} );
} }
...@@ -201,9 +201,8 @@ namespace Rich::SIMD::Future { ...@@ -201,9 +201,8 @@ namespace Rich::SIMD::Future {
* with for which it is geometrically possible these photon were produced */ * with for which it is geometrically possible these photon were produced */
alignas( LHCb::SIMD::VectorAlignment ) SIMDFP m_activeFraction{SIMDFP::One()}; alignas( LHCb::SIMD::VectorAlignment ) SIMDFP m_activeFraction{SIMDFP::One()};
/* Expected photon detection time based on reconstructed track and photon trajectory /// Transit time inside the RICH radiator volume
* and track origin time */ alignas( LHCb::SIMD::VectorAlignment ) SIMDFP m_radTransitTime{SIMDFP::Zero()};
alignas( LHCb::SIMD::VectorAlignment ) SIMDFP m_recoHitTime{SIMDFP::Zero()};
/// Validity mask /// Validity mask
alignas( LHCb::SIMD::VectorAlignment ) MASK m_valid{MASK( false )}; alignas( LHCb::SIMD::VectorAlignment ) MASK m_valid{MASK( false )};
......
...@@ -28,7 +28,7 @@ std::ostream& Rich::Future::RecoPhoton::fillStream( std::ostream& s ) const { ...@@ -28,7 +28,7 @@ std::ostream& Rich::Future::RecoPhoton::fillStream( std::ostream& s ) const {
<< " ckPhi:" << CherenkovPhi() // << " ckPhi:" << CherenkovPhi() //
<< " smartID:" << smartID() // << " smartID:" << smartID() //
<< " activeFraction:" << activeSegmentFraction() // << " activeFraction:" << activeSegmentFraction() //
<< " recoTime:" << recoDetectionTime() // << " radTransitTime:" << radTransitTime() //
<< " }"; << " }";
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment