diff --git a/Rich/RichFutureRecPhotonAlgorithms/src/RichBasePhotonReco.cpp b/Rich/RichFutureRecPhotonAlgorithms/src/RichBasePhotonReco.cpp index 72837d2902810435a103f479239f2dd4a4c30d79..52e43f6c5be50903c061ed4cf871c981e9c5dde6 100644 --- a/Rich/RichFutureRecPhotonAlgorithms/src/RichBasePhotonReco.cpp +++ b/Rich/RichFutureRecPhotonAlgorithms/src/RichBasePhotonReco.cpp @@ -19,17 +19,6 @@ using namespace Rich::Future::Rec; //============================================================================= -BasePhotonReco::BasePhotonReco( const std::string& name, ISvcLocator* pSvcLocator ) : AlgBase( name, pSvcLocator ) { - // initialise - pre sel - m_minROI2PreSel.fill( 0 ); - m_maxROI2PreSel.fill( 0 ); - m_scalePreSel.fill( 0 ); - // initialise - sel - m_ckBiasCorrs.fill( 0 ); -} - -//============================================================================= - StatusCode BasePhotonReco::initialize() { // Sets up various tools and services diff --git a/Rich/RichFutureRecPhotonAlgorithms/src/RichBasePhotonReco.h b/Rich/RichFutureRecPhotonAlgorithms/src/RichBasePhotonReco.h index 7202f7dcfee2fe14ab4054aa2c6befc4511eb6f7..a3c7769b8d3c34e0ec740e2eb2cc1029bf29b2b9 100644 --- a/Rich/RichFutureRecPhotonAlgorithms/src/RichBasePhotonReco.h +++ b/Rich/RichFutureRecPhotonAlgorithms/src/RichBasePhotonReco.h @@ -11,14 +11,6 @@ #pragma once -// STL -#include <algorithm> -#include <array> -#include <iterator> -#include <sstream> -#include <tuple> -#include <vector> - // Gaudi #include "GaudiKernel/ParsersFactory.h" #include "GaudiKernel/PhysicalConstants.h" @@ -43,6 +35,14 @@ // Kernel #include "Kernel/STLExtensions.h" +// STL +#include <algorithm> +#include <array> +#include <iterator> +#include <sstream> +#include <tuple> +#include <vector> + namespace Rich::Future::Rec { /** @class BasePhotonReco RichBasePhotonReco.h @@ -57,7 +57,7 @@ namespace Rich::Future::Rec { public: /// Standard constructor - BasePhotonReco( const std::string& name, ISvcLocator* pSvcLocator ); + BasePhotonReco( const std::string& name, ISvcLocator* pSvcLocator ) : AlgBase( name, pSvcLocator ) {} /// Initialization after creation virtual StatusCode initialize() override; @@ -206,13 +206,13 @@ namespace Rich::Future::Rec { // cache values for speed /// Square of m_maxROI - RadiatorArray<float> m_maxROI2PreSel = {{}}; + RadiatorArray<float> m_maxROI2PreSel{0.0, 0.0, 0.0}; /// Square of m_minROI - RadiatorArray<float> m_minROI2PreSel = {{}}; + RadiatorArray<float> m_minROI2PreSel{0.0, 0.0, 0.0}; /// Internal cached parameter for speed - RadiatorArray<float> m_scalePreSel = {{}}; + RadiatorArray<float> m_scalePreSel{0.0, 0.0, 0.0}; protected: // reco options @@ -240,7 +240,7 @@ namespace Rich::Future::Rec { /** Cherenkov theta bias corrections, specific for each photon * reconstruction method. */ - RadiatorArray<float> m_ckBiasCorrs = {{}}; + RadiatorArray<float> m_ckBiasCorrs{0.0, 0.0, 0.0}; private: /** Job-Option Corrections applied to the reconstructed theta vales. diff --git a/Rich/RichFutureRecPhotonAlgorithms/src/RichCommonQuarticPhotonReco.cpp b/Rich/RichFutureRecPhotonAlgorithms/src/RichCommonQuarticPhotonReco.cpp index b3f03ff1f417084539b8e3f3f32d6b0c508b5d71..a8b205f5c608bf3a33e9c78fad0d1e80c34e8d77 100644 --- a/Rich/RichFutureRecPhotonAlgorithms/src/RichCommonQuarticPhotonReco.cpp +++ b/Rich/RichFutureRecPhotonAlgorithms/src/RichCommonQuarticPhotonReco.cpp @@ -16,16 +16,6 @@ using namespace Rich::Future::Rec; //============================================================================= -CommonQuarticPhotonReco::CommonQuarticPhotonReco( const std::string& name, ISvcLocator* pSvcLocator ) - : BasePhotonReco( name, pSvcLocator ) { - // Corrections for the intrinsic biases - // Aerogel Rich1Gas Rich2Gas - // m_ckBiasCorrs = { -0.000358914, -7.505e-5, -4.287e-5 }; // Run(1+2) HPD values - m_ckBiasCorrs = {0.0, 2.0e-5, -1.0e-5}; // Run3 PMT values -} - -//============================================================================= - StatusCode CommonQuarticPhotonReco::initialize() { // Sets up various tools and services diff --git a/Rich/RichFutureRecPhotonAlgorithms/src/RichCommonQuarticPhotonReco.h b/Rich/RichFutureRecPhotonAlgorithms/src/RichCommonQuarticPhotonReco.h index 32d19319fdb75a3050c2e453d1760bcfb0a79a24..8b43f5bfc90dd87c2c4b3036d9e458bc79018ef9 100644 --- a/Rich/RichFutureRecPhotonAlgorithms/src/RichCommonQuarticPhotonReco.h +++ b/Rich/RichFutureRecPhotonAlgorithms/src/RichCommonQuarticPhotonReco.h @@ -17,14 +17,6 @@ #include "GaudiKernel/StdArrayAsProperty.h" #include "GaudiKernel/SystemOfUnits.h" -// STL -#include <algorithm> -#include <array> -#include <cmath> -#include <functional> -#include <ios> -#include <type_traits> - // Base class #include "RichBasePhotonReco.h" @@ -44,6 +36,14 @@ // Math #include "LHCbMath/Truncate.h" +// STL +#include <algorithm> +#include <array> +#include <cmath> +#include <functional> +#include <ios> +#include <type_traits> + namespace Rich::Future::Rec { // pull in methods from Rich::RayTracingUtils @@ -61,7 +61,15 @@ namespace Rich::Future::Rec { public: /// Standard constructor - CommonQuarticPhotonReco( const std::string& name, ISvcLocator* pSvcLocator ); + CommonQuarticPhotonReco( const std::string& name, ISvcLocator* pSvcL ) : BasePhotonReco( name, pSvcL ) { + // Corrections for the intrinsic biases + // Aerogel Rich1Gas Rich2Gas +#ifdef USE_DD4HEP + m_ckBiasCorrs = {0.0, 2.15e-4, 1.8e-5}; +#else + m_ckBiasCorrs = {0.0, 1.2e-4, 5.0e-5}; +#endif + } /// Initialization after creation virtual StatusCode initialize() override;