From f924c3c03debe89c5d9d5aee8bf990e428b9095e Mon Sep 17 00:00:00 2001 From: Marco Clemencic Date: Wed, 2 Jul 2025 09:29:32 +0200 Subject: [PATCH] Rename namespace Gaudi::Units to Allen::Units --- Dumpers/BinaryDumpers/src/DumpVPGeometry.cpp | 1 - Dumpers/BinaryDumpers/src/PVDumper.cpp | 4 +- Dumpers/RootDumpers/src/PrTrackerDumper.cpp | 2 +- .../src/GaudiAllenCaloToCaloClusters.cpp | 2 +- .../src/GaudiAllenTrackViewsToV3Tracks.cpp | 2 +- .../src/ConsolidateSciFiSeeding.cu | 2 +- .../include/CompassUTDefineCandidates.cuh | 6 +-- .../compass_ut/include/CompassUTFitTracks.cuh | 2 +- .../UT/compass_ut/src/CompassUTFitTracks.cu | 2 +- .../associate/include/AssociateConstants.cuh | 2 +- device/combiners/include/FilterSvs.cuh | 14 +++---- device/combiners/include/FilterTwoSvs.cuh | 16 ++++---- .../vertexing/include/DownstreamVertexing.cuh | 18 ++++----- .../event_model/PV/include/PV_Definitions.cuh | 6 +-- .../SciFi/include/LookingForwardConstants.cuh | 2 +- .../SciFi/include/SciFiDefinitions.cuh | 6 +-- .../event_model/UT/include/UTDefinitions.cuh | 4 +- .../jets/include/JetDefinitions.cuh | 8 ++-- .../muon/include/MuonDefinitions.cuh | 2 +- .../muon/include/MuonEventModel.cuh | 28 +++++++------- device/lumi/src/VeloLumiCounters.cu | 6 +-- device/muon/chi2corr/src/Chi2Muon.cu | 14 +++---- device/muon/is_muon/src/IsMuon.cu | 2 +- .../include/FunctionsMatchUpstreamMuon.cuh | 6 +-- .../filters/include/CheckECALEnergy.cuh | 4 +- .../include/SMOG2_DiMuonHighMassLine.cuh | 12 +++--- .../lines/SMOG2/include/SMOG2_DiTrack.cuh | 22 +++++------ .../include/SMOG2_DisplacedDiMuonLine.cuh | 14 +++---- .../SMOG2/include/SMOG2_JpsiToMuMuTaPLine.cuh | 20 +++++----- .../lines/SMOG2/include/SMOG2_KsToPiPi.cuh | 12 +++--- .../SMOG2/include/SMOG2_MinimumBiasLine.cuh | 4 +- .../lines/SMOG2/include/SMOG2_SingleMuon.cuh | 8 ++-- .../lines/SMOG2/include/SMOG2_SingleTrack.cuh | 8 ++-- .../lines/calibration/include/D2KPiLine.cuh | 14 +++---- .../include/DiMuonMassAlignmentLine.cuh | 14 +++---- .../include/DisplacedDiMuonMassLine.cuh | 6 +-- .../calibration/include/Dst2D0piLine.cuh | 14 +++---- .../lines/calibration/include/RICH1Line.cuh | 4 +- .../lines/calibration/include/RICH2Line.cuh | 4 +- .../lines/charm/include/D02KsKsDDDDLine.cuh | 18 ++++----- .../lines/charm/include/D2KKLine.cuh | 12 +++--- .../lines/charm/include/D2KsHHLine.cuh | 26 ++++++------- .../lines/charm/include/D2PiPiLine.cuh | 12 +++--- .../lines/charm/include/TwoKsLine.cuh | 14 +++---- .../charm/include/TwoTrackMVACharmXSec.cuh | 14 +++---- .../include/DownstreamGamma2EELine.cuh | 8 ++-- .../include/DownstreamKs2PiPiLine.cuh | 4 +- .../include/DownstreamLambda2PPiLine.cuh | 4 +- .../include/DownstreamTwoTrackKsLine.cuh | 14 +++---- .../include/DisplacedDielectronLine.cuh | 2 +- .../electron/include/DisplacedLeptonsLine.cuh | 2 +- .../include/HighMassDielectronLine.cuh | 12 +++--- .../include/LowMassDielectronLine.cuh | 2 +- .../include/SingleHighPtElectronLine.cuh | 4 +- .../electron/include/TrackElectronMVALine.cuh | 10 ++--- .../include/Kplus2ThreeTracksLine.cuh | 22 +++++------ .../src/Kplus2ThreeTracksLine.cu | 10 ++--- .../inclusive_hadron/include/ConeJetLine.cuh | 6 +-- .../include/DiProtonHighMassLine.cuh | 12 +++--- .../inclusive_hadron/include/KsToPiPiLine.cuh | 8 ++-- .../include/Lambda2PPiLine.cuh | 26 ++++++------- .../include/LambdaLLDetachedTrackLine.cuh | 32 ++++++++-------- .../include/TauToPhiMuLine.cuh | 32 ++++++++-------- .../inclusive_hadron/include/TrackMVALine.cuh | 12 +++--- .../include/TwoTrackKsLine.cuh | 14 +++---- .../include/TwoTrackMVALine.cuh | 6 +-- .../include/XiOmegaLLLLine.cuh | 38 +++++++++---------- .../lines/monitoring/include/BeamGasLine.cuh | 4 +- .../muon/include/DetJPsiToMuMuTaPLine.cuh | 16 ++++---- .../lines/muon/include/DiMuonDrellYanLine.cuh | 12 +++--- .../lines/muon/include/DiMuonMassLine.cuh | 8 ++-- .../lines/muon/include/DiMuonNoIPLine.cuh | 8 ++-- .../muon/include/DisplacedDiMuonLine.cuh | 4 +- .../lines/muon/include/LowPtDiMuonLine.cuh | 2 +- .../lines/muon/include/LowPtMuonLine.cuh | 4 +- .../muon/include/SingleHighPtMuonLine.cuh | 6 +-- .../include/SingleHighPtMuonLineNoMuID.cuh | 6 +-- .../lines/muon/include/TrackMuonMVALine.cuh | 6 +-- .../lines/muon/src/TrackMuonMVALine.cu | 6 +-- .../vertex_fitter/include/FilterSVTrack.cuh | 16 ++++---- .../vertex_fitter/include/FilterTracks.cuh | 8 ++-- doc/develop/selections.rst | 6 +-- main/include/SystemOfUnits.h | 12 ++---- 83 files changed, 406 insertions(+), 411 deletions(-) diff --git a/Dumpers/BinaryDumpers/src/DumpVPGeometry.cpp b/Dumpers/BinaryDumpers/src/DumpVPGeometry.cpp index a8a9a36ad2a..ed57e71d960 100644 --- a/Dumpers/BinaryDumpers/src/DumpVPGeometry.cpp +++ b/Dumpers/BinaryDumpers/src/DumpVPGeometry.cpp @@ -24,7 +24,6 @@ // Gaudi #include "GaudiAlg/Transformer.h" -#include "GaudiKernel/SystemOfUnits.h" // Allen #include diff --git a/Dumpers/BinaryDumpers/src/PVDumper.cpp b/Dumpers/BinaryDumpers/src/PVDumper.cpp index 52453842e60..cc983166d30 100644 --- a/Dumpers/BinaryDumpers/src/PVDumper.cpp +++ b/Dumpers/BinaryDumpers/src/PVDumper.cpp @@ -27,7 +27,7 @@ namespace { { for (const auto& idau : mcvtx.products()) { double dv2 = (mcpv.position() - idau->originVertex()->position()).Mag2(); - if (dv2 > (100. * Gaudi::Units::mm) * (100. * Gaudi::Units::mm)) continue; + if (dv2 > (100. * Allen::Units::mm) * (100. * Allen::Units::mm)) continue; allprods.emplace_back(idau); for (const auto& ivtx : idau->endVertices()) { collectProductss(mcpv, *ivtx, allprods); @@ -94,6 +94,6 @@ int PVDumper::count_reconstructible_mc_particles(const LHCb::MCVertex& avtx, con return std::count_if(allproducts.begin(), allproducts.end(), [&](const auto* pmcp) { if (pmcp->particleID().threeCharge() == 0 || !trInfo.hasVelo(pmcp)) return false; double dv2 = (avtx.position() - pmcp->originVertex()->position()).Mag2(); - return dv2 < 0.0000001 && pmcp->p() > 100. * Gaudi::Units::MeV; + return dv2 < 0.0000001 && pmcp->p() > 100. * Allen::Units::MeV; }); } diff --git a/Dumpers/RootDumpers/src/PrTrackerDumper.cpp b/Dumpers/RootDumpers/src/PrTrackerDumper.cpp index dd6ebbc4478..88908df8244 100644 --- a/Dumpers/RootDumpers/src/PrTrackerDumper.cpp +++ b/Dumpers/RootDumpers/src/PrTrackerDumper.cpp @@ -364,7 +364,7 @@ double mcpTau(const LHCb::MCParticle* mcp) Gaudi::XYZVector dir = mcp_evtx - mcp_ovtx; double tau = mcp->momentum().M() * dir.Dot(mcp->momentum().Vect()) / mcp->momentum().Vect().mag2(); tau /= Gaudi::Units::c_light; - tau /= Gaudi::Units::picosecond; + tau /= Allen::Units::picosecond; return tau; } return 0; diff --git a/Rec/Allen/src/GaudiAllenCaloToCaloClusters.cpp b/Rec/Allen/src/GaudiAllenCaloToCaloClusters.cpp index 4fa2195f225..e4de6e86132 100644 --- a/Rec/Allen/src/GaudiAllenCaloToCaloClusters.cpp +++ b/Rec/Allen/src/GaudiAllenCaloToCaloClusters.cpp @@ -44,7 +44,7 @@ public: const std::vector& allen_ecal_clusters) const override; private: - Gaudi::Property m_EtCalo {this, "EtCalo", 400 * Gaudi::Units::MeV, "Default ET for Calo Clusters"}; + Gaudi::Property m_EtCalo {this, "EtCalo", 400 * Allen::Units::MeV, "Default ET for Calo Clusters"}; }; DECLARE_COMPONENT(GaudiAllenCaloToCaloClusters) diff --git a/Rec/Allen/src/GaudiAllenTrackViewsToV3Tracks.cpp b/Rec/Allen/src/GaudiAllenTrackViewsToV3Tracks.cpp index b48ab8fc14f..9100d887e91 100644 --- a/Rec/Allen/src/GaudiAllenTrackViewsToV3Tracks.cpp +++ b/Rec/Allen/src/GaudiAllenTrackViewsToV3Tracks.cpp @@ -703,7 +703,7 @@ namespace GaudiAllen::Converters::v3 { private: Gaudi::Property m_qopvar_rel {this, "relQoPVar", 0.1, "Default relative qop variance (qopVar/(qop*qop))"}; - Gaudi::Property m_ptVelo {this, "ptVelo", 400 * Gaudi::Units::MeV, "Default pT for Velo tracks"}; + Gaudi::Property m_ptVelo {this, "ptVelo", 400 * Allen::Units::MeV, "Default pT for Velo tracks"}; template OutType make_output_container(const LHCb::UniqueIDGenerator& unique_id_gen) const diff --git a/device/SciFi/hybridseeding/consolidate/src/ConsolidateSciFiSeeding.cu b/device/SciFi/hybridseeding/consolidate/src/ConsolidateSciFiSeeding.cu index 26f6278286d..7b1fdf91bce 100644 --- a/device/SciFi/hybridseeding/consolidate/src/ConsolidateSciFiSeeding.cu +++ b/device/SciFi/hybridseeding/consolidate/src/ConsolidateSciFiSeeding.cu @@ -90,7 +90,7 @@ __device__ float qop_seeding_calculation(const float magSign, const MiniState se const float denom = p * scale_factor * 1e6f * (-1.f); if (std::fabs(scale_factor) < 1e-6f) { - qop = 0.01f / Gaudi::Units::GeV; + qop = 0.01f / Allen::Units::GeV; } else { qop = x0 / denom; diff --git a/device/UT/compass_ut/include/CompassUTDefineCandidates.cuh b/device/UT/compass_ut/include/CompassUTDefineCandidates.cuh index 4febebad1ce..29e9a4bc2a4 100644 --- a/device/UT/compass_ut/include/CompassUTDefineCandidates.cuh +++ b/device/UT/compass_ut/include/CompassUTDefineCandidates.cuh @@ -71,10 +71,10 @@ namespace compass_ut_define_candidates { private: Allen::Property m_min_momentum {this, "min_momentum", - 1500.f * Gaudi::Units::MeV, + 1500.f * Allen::Units::MeV, "min momentum cut [MeV/c]"}; - Allen::Property m_min_pt {this, "min_pt", 300.f * Gaudi::Units::MeV, "min pT cut [MeV/c]"}; - Allen::Property m_y_tol {this, "y_tol", 0.5f * Gaudi::Units::mm, "y tol [mm]"}; + Allen::Property m_min_pt {this, "min_pt", 300.f * Allen::Units::MeV, "min pT cut [MeV/c]"}; + Allen::Property m_y_tol {this, "y_tol", 0.5f * Allen::Units::mm, "y tol [mm]"}; Allen::Property m_y_tol_slope {this, "y_tol_slope", 0.08f, "y tol slope [mm]"}; Allen::Property m_block_dim {this, "block_dim", {256, 1, 1}, "block dimensions"}; }; diff --git a/device/UT/compass_ut/include/CompassUTFitTracks.cuh b/device/UT/compass_ut/include/CompassUTFitTracks.cuh index a8e1edf4893..565a4c888db 100644 --- a/device/UT/compass_ut/include/CompassUTFitTracks.cuh +++ b/device/UT/compass_ut/include/CompassUTFitTracks.cuh @@ -64,7 +64,7 @@ namespace compass_ut_fit_tracks { private: Allen::Property m_sigma_velo_slope {this, "sigma_velo_slope", - 0.1f * Gaudi::Units::mrad, + 0.1f * Allen::Units::mrad, "sigma velo slope [radians]"}; Allen::Property m_min_momentum_final {this, "min_momentum_final", 2500.f, "final min momentum cut [MeV/c]"}; Allen::Property m_min_pt_final {this, "min_pt_final", 425.f, "final min pT cut [MeV/c]"}; diff --git a/device/UT/compass_ut/src/CompassUTFitTracks.cu b/device/UT/compass_ut/src/CompassUTFitTracks.cu index 6fda935fd01..f9760dd5e80 100644 --- a/device/UT/compass_ut/src/CompassUTFitTracks.cu +++ b/device/UT/compass_ut/src/CompassUTFitTracks.cu @@ -80,7 +80,7 @@ namespace { // Get bdl // const auto bdl = get_bdl(bdl_table, velo_state); - const float qpxz2p = -1.f / bdl * 3.3356f / Gaudi::Units::GeV; + const float qpxz2p = -1.f / bdl * 3.3356f / Allen::Units::GeV; // // First we perform a pkick fit diff --git a/device/associate/include/AssociateConstants.cuh b/device/associate/include/AssociateConstants.cuh index cc4763e6e80..0023b2e938e 100644 --- a/device/associate/include/AssociateConstants.cuh +++ b/device/associate/include/AssociateConstants.cuh @@ -20,7 +20,7 @@ namespace Associate { namespace VeloPVIP { - constexpr float baseline = 50.f * Gaudi::Units::um; + constexpr float baseline = 50.f * Allen::Units::um; } namespace KalmanPVIP { constexpr float baseline = 100.f; diff --git a/device/combiners/include/FilterSvs.cuh b/device/combiners/include/FilterSvs.cuh index 55d577fe290..7faf21d2517 100644 --- a/device/combiners/include/FilterSvs.cuh +++ b/device/combiners/include/FilterSvs.cuh @@ -59,25 +59,25 @@ namespace FilterSvs { private: Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 30.f, "Max child vertex chi2"}; - Allen::Property m_minComboPt {this, "minComboPt", 500.f * Gaudi::Units::MeV, "Minimum combo pT"}; + Allen::Property m_minComboPt {this, "minComboPt", 500.f * Allen::Units::MeV, "Minimum combo pT"}; Allen::Property m_minComboPtHighIP {this, "minComboPtHighIP", - 200.f * Gaudi::Units::MeV, + 200.f * Allen::Units::MeV, "Minimum combo pT high IP"}; // Momenta of SVs from displaced decays won't point back to a PV, so don't // make a DIRA cut here by default. Allen::Property m_minCosDira {this, "minChildCosDira", 0.0f, "Minimum child DIRA"}; Allen::Property m_minChildEta {this, "minChildEta", 2.f, "Minimum child eta"}; Allen::Property m_maxChildEta {this, "maxChildEta", 5.f, "Maximum child eta"}; - Allen::Property m_minTrackPt {this, "minTrackPt", 200.f * Gaudi::Units::MeV, "Minimum track pT"}; + Allen::Property m_minTrackPt {this, "minTrackPt", 200.f * Allen::Units::MeV, "Minimum track pT"}; Allen::Property m_minTrackPtLowIP {this, "minTrackPtLowIP", - 500.f * Gaudi::Units::MeV, + 500.f * Allen::Units::MeV, "Minimum track pT Low IP"}; - Allen::Property m_minTrackP {this, "minTrackP", 1000.f * Gaudi::Units::MeV, "Minimum track p"}; + Allen::Property m_minTrackP {this, "minTrackP", 1000.f * Allen::Units::MeV, "Minimum track p"}; Allen::Property m_minTrackIPChi2 {this, "minTrackIPChi2", 4.f, "Minimum track IP chi2"}; - Allen::Property m_minTrackHighIP {this, "minTrackHighIP", 0.2f * Gaudi::Units::mm, "Minimum track high IP"}; - Allen::Property m_minTrackLowIP {this, "minTrackLowIP", 0.06f * Gaudi::Units::mm, "Minimum track low IP"}; + Allen::Property m_minTrackHighIP {this, "minTrackHighIP", 0.2f * Allen::Units::mm, "Minimum track high IP"}; + Allen::Property m_minTrackLowIP {this, "minTrackLowIP", 0.06f * Allen::Units::mm, "Minimum track low IP"}; Allen::Property m_block_dim_filter {this, "block_dim_filter", {128, 1, 1}, diff --git a/device/combiners/include/FilterTwoSvs.cuh b/device/combiners/include/FilterTwoSvs.cuh index 92fe2a8ba0b..16949400bf5 100644 --- a/device/combiners/include/FilterTwoSvs.cuh +++ b/device/combiners/include/FilterTwoSvs.cuh @@ -69,7 +69,7 @@ namespace FilterTwoSvs { // Selection cuts for first vertex Allen::Property m_minMassV1 {this, "minMassV1", 0.f, "Minimum mass of first vertex"}; Allen::Property m_maxMassV1 {this, "maxMassV1", 20000.f, "Maximum mass of first vertex"}; - Allen::Property m_minPtV1 {this, "minPtV1", 200.f * Gaudi::Units::MeV, "Minimum pT of first vertex"}; + Allen::Property m_minPtV1 {this, "minPtV1", 200.f * Allen::Units::MeV, "Minimum pT of first vertex"}; // Momenta of SVs from displaced decays won't point back to a PV, so don't // make a DIRA cut here by default. Allen::Property m_minCosDiraV1 {this, "minCosDiraV1", 0.0f, "Minimum DIRA of first vertex"}; @@ -77,36 +77,36 @@ namespace FilterTwoSvs { Allen::Property m_maxEtaV1 {this, "maxEtaV1", 5.f, "Maximum eta of first vertex"}; Allen::Property m_minTrackPtV1 {this, "minTrackPtV1", - 200.f * Gaudi::Units::MeV, + 200.f * Allen::Units::MeV, "Minimum track pT of first vertex"}; Allen::Property m_minTrackPV1 {this, "minTrackPV1", - 1000.f * Gaudi::Units::MeV, + 1000.f * Allen::Units::MeV, "Minimum track p of first vertex"}; Allen::Property m_minTrackIPChi2V1 {this, "minTrackIPChi2V1", 4.f, "Minimum track IP chi2 of first vertex"}; Allen::Property m_minTrackIPV1 {this, "minTrackIPV1", - 0.2f * Gaudi::Units::mm, + 0.2f * Allen::Units::mm, "Minimum track IP of first vertex"}; // Selection cuts for second vertex Allen::Property m_minMassV2 {this, "minMassV2", 0.f, "Minimum mass of second vertex"}; Allen::Property m_maxMassV2 {this, "maxMassV2", 20000.f, "Maximum mass of second vertex"}; - Allen::Property m_minPtV2 {this, "minPtV2", 200.f * Gaudi::Units::MeV, "Minimum pT of second vertex"}; + Allen::Property m_minPtV2 {this, "minPtV2", 200.f * Allen::Units::MeV, "Minimum pT of second vertex"}; Allen::Property m_minCosDiraV2 {this, "minCosDiraV2", 0.0f, "Minimum DIRA of second vertex"}; Allen::Property m_minEtaV2 {this, "minEtaV2", 2.f, "Minimum eta of second vertex"}; Allen::Property m_maxEtaV2 {this, "maxEtaV2", 5.f, "Maximum eta of second vertex"}; Allen::Property m_minTrackPtV2 {this, "minTrackPtV2", - 200.f * Gaudi::Units::MeV, + 200.f * Allen::Units::MeV, "Minimum track pT of second vertex"}; Allen::Property m_minTrackPV2 {this, "minTrackPV2", - 2000.f * Gaudi::Units::MeV, + 2000.f * Allen::Units::MeV, "Minimum track p of second vertex"}; Allen::Property m_minTrackIPChi2V2 {this, "minTrackIPChi2V2", 4.f, "Minimum track IP chi2 of second vertex"}; Allen::Property m_minTrackIPV2 {this, "minTrackIPV2", - 0.06f * Gaudi::Units::mm, + 0.06f * Allen::Units::mm, "Minimum track IP of second vertex"}; Allen::Property m_block_dim_filter {this, "block_dim_filter", diff --git a/device/downstream/vertexing/include/DownstreamVertexing.cuh b/device/downstream/vertexing/include/DownstreamVertexing.cuh index ef0aab044cf..91992a842a0 100644 --- a/device/downstream/vertexing/include/DownstreamVertexing.cuh +++ b/device/downstream/vertexing/include/DownstreamVertexing.cuh @@ -73,29 +73,29 @@ namespace downstream_vertexing { // Cuts Allen::Property m_minpt_both {this, "track_min_pt_both", - 136.1f * Gaudi::Units::MeV, + 136.1f * Allen::Units::MeV, "Minimum track pT required for both tracks."}; Allen::Property m_minpt_either {this, "track_min_pt_either", - 277.1f * Gaudi::Units::MeV, + 277.1f * Allen::Units::MeV, "Minimum track pT required for at least one track."}; Allen::Property m_minip_both {this, "track_min_ip_both", - 64.7f * Gaudi::Units::mm, + 64.7f * Allen::Units::mm, "Minimum track IP required for both tracks."}; Allen::Property m_minip_either {this, "track_min_ip_either", - 64.7f * Gaudi::Units::mm, + 64.7f * Allen::Units::mm, "Minimum track IP required for at least one track."}; - Allen::Property m_minsumpt {this, "sum_pt_min", 471.8f * Gaudi::Units::MeV, "Minimum sum of track pT."}; - Allen::Property m_maxdoca {this, "doca_max", 19.1f * Gaudi::Units::mm, "Maximum DOCA between tracks."}; + Allen::Property m_minsumpt {this, "sum_pt_min", 471.8f * Allen::Units::MeV, "Minimum sum of track pT."}; + Allen::Property m_maxdoca {this, "doca_max", 19.1f * Allen::Units::mm, "Maximum DOCA between tracks."}; Allen::Property m_min_vtx_z {this, "min_vtx_z", - 54.5f * Gaudi::Units::mm, + 54.5f * Allen::Units::mm, "Minimum z position of the vertex."}; Allen::Property m_max_vtx_z {this, "max_vtx_z", - 2484.6f * Gaudi::Units::mm, + 2484.6f * Allen::Units::mm, "Maximum z position of the vertex."}; Allen::Property m_min_quality {this, "min_quality", 0.1, "Minimum MVA quality score."}; Allen::Property m_dihadron {this, "dihadron", true, "Filter leptons"}; @@ -105,4 +105,4 @@ namespace downstream_vertexing { CompositeQualityEvaluator composite_quality_nn {"composite_quality_nn", "/HLT1Downstream/Hlt1_Downstream_Composite_Quality.json"}; }; -} // namespace downstream_vertexing \ No newline at end of file +} // namespace downstream_vertexing diff --git a/device/event_model/PV/include/PV_Definitions.cuh b/device/event_model/PV/include/PV_Definitions.cuh index 925714be3ea..76080895d67 100644 --- a/device/event_model/PV/include/PV_Definitions.cuh +++ b/device/event_model/PV/include/PV_Definitions.cuh @@ -38,7 +38,7 @@ namespace PV { // steering parameters for final cluster selection // int m_minClusterMult = 3; - static constexpr float mcu_dzCloseTracksInCluster = 5.f * Gaudi::Units::mm; + static constexpr float mcu_dzCloseTracksInCluster = 5.f * Allen::Units::mm; // int m_minCloseTracksInCluster = 3; static constexpr int mcu_highMult = 10; static constexpr float mcu_ratioSig2HighMult = 1.0f; @@ -59,7 +59,7 @@ namespace PV { static constexpr size_t m_minTr = 4; static constexpr int m_Iterations = 20; static constexpr int m_minIter = 5; - static constexpr float m_maxDeltaZ = 0.0005f * Gaudi::Units::mm; + static constexpr float m_maxDeltaZ = 0.0005f * Allen::Units::mm; static constexpr float m_minTrackWeight = 0.00000001f; static constexpr float m_TrackErrorScaleFactor = 1.0f; static constexpr float m_maxChi2 = 400.0f; @@ -67,7 +67,7 @@ namespace PV { // static constexpr double m_trackChi = sqrtf(m_trackMaxChi2); // sqrt of trackMaxChi2 static constexpr float m_trackChi = 3.464f; // sqrt of trackMaxChi2 static constexpr float m_trackMaxChi2Remove = 25.f; - static constexpr float m_maxDeltaZCache = 1.f * Gaudi::Units::mm; + static constexpr float m_maxDeltaZCache = 1.f * Allen::Units::mm; struct vtxCluster final { diff --git a/device/event_model/SciFi/include/LookingForwardConstants.cuh b/device/event_model/SciFi/include/LookingForwardConstants.cuh index 54b52998871..2a6a8f25910 100644 --- a/device/event_model/SciFi/include/LookingForwardConstants.cuh +++ b/device/event_model/SciFi/include/LookingForwardConstants.cuh @@ -33,7 +33,7 @@ namespace LookingForward { }; // Reference z plane - constexpr float z_mid_t = 8520.f * Gaudi::Units::mm; // FIXME_GEOMETRY_HARDCODING + constexpr float z_mid_t = 8520.f * Allen::Units::mm; // FIXME_GEOMETRY_HARDCODING // ================================== // Constants for lf search by triplet diff --git a/device/event_model/SciFi/include/SciFiDefinitions.cuh b/device/event_model/SciFi/include/SciFiDefinitions.cuh index edae81293df..fd1ee509c07 100644 --- a/device/event_model/SciFi/include/SciFiDefinitions.cuh +++ b/device/event_model/SciFi/include/SciFiDefinitions.cuh @@ -50,9 +50,9 @@ namespace SciFi { // todo: use dzdy defined in geometry, read by mat static constexpr float dzdy = 0.003601f; static constexpr float dRatio = -0.00028f; - static constexpr float ZBegT = 7500.f * Gaudi::Units::mm; // FIXME_GEOMETRY_HARDCODING - static constexpr float ZEndT = 9410.f * Gaudi::Units::mm; // FIXME_GEOMETRY_HARDCODING - static constexpr float z_mid_t = 8520.f * Gaudi::Units::mm; // FIXME_GEOMETRY_HARDCODING + static constexpr float ZBegT = 7500.f * Allen::Units::mm; // FIXME_GEOMETRY_HARDCODING + static constexpr float ZEndT = 9410.f * Allen::Units::mm; // FIXME_GEOMETRY_HARDCODING + static constexpr float z_mid_t = 8520.f * Allen::Units::mm; // FIXME_GEOMETRY_HARDCODING // Looking Forward static constexpr int max_track_size = n_layers; diff --git a/device/event_model/UT/include/UTDefinitions.cuh b/device/event_model/UT/include/UTDefinitions.cuh index f7da8a1f4e1..e94047c626e 100644 --- a/device/event_model/UT/include/UTDefinitions.cuh +++ b/device/event_model/UT/include/UTDefinitions.cuh @@ -89,8 +89,8 @@ namespace UT { static constexpr float maxPseudoChi2 = 1280.0f; static constexpr float maxXSlope = 0.350f; static constexpr float maxYSlope = 0.300f; - static constexpr float centralHoleSize = 33.0f * Gaudi::Units::mm; - static constexpr float passHoleSize = 40.0f * Gaudi::Units::mm; + static constexpr float centralHoleSize = 33.0f * Allen::Units::mm; + static constexpr float passHoleSize = 40.0f * Allen::Units::mm; static constexpr bool passTracks = false; // Scale the z-component, to not run into numerical problems with floats diff --git a/device/event_model/jets/include/JetDefinitions.cuh b/device/event_model/jets/include/JetDefinitions.cuh index 9f4b3e9371c..6a89d1d2d67 100644 --- a/device/event_model/jets/include/JetDefinitions.cuh +++ b/device/event_model/jets/include/JetDefinitions.cuh @@ -13,9 +13,9 @@ #include "SystemOfUnits.h" namespace Jets { - static constexpr float pt_sum_precision = 0.1f * Gaudi::Units::MeV; - static constexpr float eta_weighted_sum_precision = 0.1f * Gaudi::Units::MeV; - static constexpr float phi_weighted_sum_precision = 0.01f * Gaudi::Units::MeV; + static constexpr float pt_sum_precision = 0.1f * Allen::Units::MeV; + static constexpr float eta_weighted_sum_precision = 0.1f * Allen::Units::MeV; + static constexpr float phi_weighted_sum_precision = 0.01f * Allen::Units::MeV; struct Jet { // Jet kinematics. @@ -28,4 +28,4 @@ namespace Jets { unsigned n_tracks = 0; unsigned n_calos = 0; }; -} // namespace Jets \ No newline at end of file +} // namespace Jets diff --git a/device/event_model/muon/include/MuonDefinitions.cuh b/device/event_model/muon/include/MuonDefinitions.cuh index bd1e82eac99..69e59aeb723 100644 --- a/device/event_model/muon/include/MuonDefinitions.cuh +++ b/device/event_model/muon/include/MuonDefinitions.cuh @@ -68,7 +68,7 @@ namespace Muon { static constexpr unsigned y = 1; } // namespace FoiParams - static constexpr float momentum_cuts[] = {3 * Gaudi::Units::GeV, 6 * Gaudi::Units::GeV, 10 * Gaudi::Units::GeV}; + static constexpr float momentum_cuts[] = {3 * Allen::Units::GeV, 6 * Allen::Units::GeV, 10 * Allen::Units::GeV}; struct FieldOfInterest { private: /* FOI_x = a_x + b_x * exp(-c_x * p) diff --git a/device/event_model/muon/include/MuonEventModel.cuh b/device/event_model/muon/include/MuonEventModel.cuh index a33bca8c696..318568bbccf 100644 --- a/device/event_model/muon/include/MuonEventModel.cuh +++ b/device/event_model/muon/include/MuonEventModel.cuh @@ -272,12 +272,12 @@ struct MuonTrack { }; namespace MatchUpstreamMuon { - static constexpr float kickOffset = 338.92f * Gaudi::Units::MeV; // KickOffset - static constexpr float kickScale = 1218.62f * Gaudi::Units::MeV; // KickScale - static constexpr float za = 5.331f * Gaudi::Units::m; // MagnetPlaneParA - static constexpr float zb = -0.958f * Gaudi::Units::m; // MagnetPlaneParB - static constexpr float ca = 25.17f * Gaudi::Units::mm; // MagnetCorrParA - static constexpr float cb = -701.5f * Gaudi::Units::mm; // MagnetCorrParB + static constexpr float kickOffset = 338.92f * Allen::Units::MeV; // KickOffset + static constexpr float kickScale = 1218.62f * Allen::Units::MeV; // KickScale + static constexpr float za = 5.331f * Allen::Units::m; // MagnetPlaneParA + static constexpr float zb = -0.958f * Allen::Units::m; // MagnetPlaneParB + static constexpr float ca = 25.17f * Allen::Units::mm; // MagnetCorrParA + static constexpr float cb = -701.5f * Allen::Units::mm; // MagnetCorrParB static constexpr float maxChi2DoF = 20.f; // static constexpr bool fitY = false; @@ -322,17 +322,17 @@ namespace MatchUpstreamMuon { }; struct SearchWindows { - float Windows[8] {500.f * Gaudi::Units::mm, // M2 - 400.f * Gaudi::Units::mm, + float Windows[8] {500.f * Allen::Units::mm, // M2 + 400.f * Allen::Units::mm, - 600.f * Gaudi::Units::mm, // M3 - 500.f * Gaudi::Units::mm, + 600.f * Allen::Units::mm, // M3 + 500.f * Allen::Units::mm, - 700.f * Gaudi::Units::mm, // M4 - 600.f * Gaudi::Units::mm, + 700.f * Allen::Units::mm, // M4 + 600.f * Allen::Units::mm, - 800.f * Gaudi::Units::mm, // M5 - 700.f * Gaudi::Units::mm + 800.f * Allen::Units::mm, // M5 + 700.f * Allen::Units::mm }; }; diff --git a/device/lumi/src/VeloLumiCounters.cu b/device/lumi/src/VeloLumiCounters.cu index 96ef447e380..cf43c9fff93 100644 --- a/device/lumi/src/VeloLumiCounters.cu +++ b/device/lumi/src/VeloLumiCounters.cu @@ -100,19 +100,19 @@ __global__ void velo_lumi_counters::velo_lumi_gec_counters( // fiducial cut: doca<3 mm && |poca|<300 mm if (velo_state.z() > -300.f && velo_state.z() < 300.f) { - if (velo_DOCAz(velo_state) < 3.f * Gaudi::Units::mm) { + if (velo_DOCAz(velo_state) < 3.f * Allen::Units::mm) { atomicAdd(&reco_counters[1], 1); } } // fill eta bins float eta = velo_eta(velo_state, parameters.dev_is_backward[track_offset + track_index]); - if (eta > tracks_eta_bins[Lumi::Constants::n_velo_eta_bin_edges - 1u] * Gaudi::Units::mm) { + if (eta > tracks_eta_bins[Lumi::Constants::n_velo_eta_bin_edges - 1u] * Allen::Units::mm) { atomicAdd(&reco_counters[2u + Lumi::Constants::n_velo_eta_bin_edges], 1); continue; } for (unsigned eta_bin = 0; eta_bin < Lumi::Constants::n_velo_eta_bin_edges; ++eta_bin) { - if (eta < tracks_eta_bins[eta_bin] * Gaudi::Units::mm) { + if (eta < tracks_eta_bins[eta_bin] * Allen::Units::mm) { atomicAdd(&reco_counters[2u + eta_bin], 1); break; } diff --git a/device/muon/chi2corr/src/Chi2Muon.cu b/device/muon/chi2corr/src/Chi2Muon.cu index 293ad1dd527..727f776a6db 100644 --- a/device/muon/chi2corr/src/Chi2Muon.cu +++ b/device/muon/chi2corr/src/Chi2Muon.cu @@ -163,11 +163,11 @@ __global__ void chi2_muon::chi2_muon(chi2_muon::Parameters parameters) // z position of the absorber float msz[5] { - 12800.f * Gaudi::Units::mm, // ECAL + SPD + PS - 14300.f * Gaudi::Units::mm, // HCAL - 15800.f * Gaudi::Units::mm, // M23 filter - 17100.f * Gaudi::Units::mm, // M34 filter - 18300.f * Gaudi::Units::mm // M45 filter + 12800.f * Allen::Units::mm, // ECAL + SPD + PS + 14300.f * Allen::Units::mm, // HCAL + 15800.f * Allen::Units::mm, // M23 filter + 17100.f * Allen::Units::mm, // M34 filter + 18300.f * Allen::Units::mm // M45 filter }; // Radiation lenghts z/X0 @@ -216,8 +216,8 @@ __global__ void chi2_muon::chi2_muon(chi2_muon::Parameters parameters) // the z of the absorber has to be smaller than the z of the hit station if (msz[i] < min(zj, zk)) { - covX[j][k] += (zj - msz[i]) * (zk - msz[i]) * square((13.6f * Gaudi::Units::MeV) / momentum) * msrl[i]; - covY[j][k] += (zj - msz[i]) * (zk - msz[i]) * square((13.6f * Gaudi::Units::MeV) / momentum) * msrl[i]; + covX[j][k] += (zj - msz[i]) * (zk - msz[i]) * square((13.6f * Allen::Units::MeV) / momentum) * msrl[i]; + covY[j][k] += (zj - msz[i]) * (zk - msz[i]) * square((13.6f * Allen::Units::MeV) / momentum) * msrl[i]; } } // end i } // end k diff --git a/device/muon/is_muon/src/IsMuon.cu b/device/muon/is_muon/src/IsMuon.cu index 5f0e0ad130e..e2415da1ea4 100644 --- a/device/muon/is_muon/src/IsMuon.cu +++ b/device/muon/is_muon/src/IsMuon.cu @@ -50,7 +50,7 @@ void is_muon::is_muon_t::operator()( __device__ float elliptical_foi_window(const float a, const float b, const float c, const float momentum) { - return a + b * expf(-c * momentum / Gaudi::Units::GeV); + return a + b * expf(-c * momentum / Allen::Units::GeV); } __device__ std::pair field_of_interest( diff --git a/device/muon/match_upstream_muon/include/FunctionsMatchUpstreamMuon.cuh b/device/muon/match_upstream_muon/include/FunctionsMatchUpstreamMuon.cuh index fc3f4f14aa3..080f7f47c65 100644 --- a/device/muon/match_upstream_muon/include/FunctionsMatchUpstreamMuon.cuh +++ b/device/muon/match_upstream_muon/include/FunctionsMatchUpstreamMuon.cuh @@ -43,13 +43,13 @@ __device__ inline int trackTypeFromMomentum(float p) // The following quantities have been set from the references // for offline muons in the MuonID, giving room for resolution. - if (p < 2.5f * Gaudi::Units::GeV) // 3 GeV/c for offline muons + if (p < 2.5f * Allen::Units::GeV) // 3 GeV/c for offline muons return MatchUpstreamMuon::VeryLowP; - else if (p < 7.f * Gaudi::Units::GeV) // 6 GeV/c for offline muons + else if (p < 7.f * Allen::Units::GeV) // 6 GeV/c for offline muons return MatchUpstreamMuon::LowP; - else if (p < 12.f * Gaudi::Units::GeV) // 10 GeV/c for offline muons + else if (p < 12.f * Allen::Units::GeV) // 10 GeV/c for offline muons return MatchUpstreamMuon::MediumP; else diff --git a/device/selections/filters/include/CheckECALEnergy.cuh b/device/selections/filters/include/CheckECALEnergy.cuh index 88adeb0ece5..643b845ba6d 100644 --- a/device/selections/filters/include/CheckECALEnergy.cuh +++ b/device/selections/filters/include/CheckECALEnergy.cuh @@ -40,8 +40,8 @@ namespace check_ecal_energy { private: Allen::Property m_block_dim {this, "block_dim", {256, 1, 1}, "block dimensions"}; - Allen::Property m_ecalCut {this, "ecalCut", 310.f * Gaudi::Units::GeV, "ECAL cut value."}; + Allen::Property m_ecalCut {this, "ecalCut", 310.f * Allen::Units::GeV, "ECAL cut value."}; Allen::Property m_cutHigh {this, "cutHigh", true, "Select events with ECAL energy less than ecalCut."}; }; // check_ecal_energy_t -} // namespace check_ecal_energy \ No newline at end of file +} // namespace check_ecal_energy diff --git a/device/selections/lines/SMOG2/include/SMOG2_DiMuonHighMassLine.cuh b/device/selections/lines/SMOG2/include/SMOG2_DiMuonHighMassLine.cuh index 03ca3533df4..7c2b2e78ee3 100644 --- a/device/selections/lines/SMOG2/include/SMOG2_DiMuonHighMassLine.cuh +++ b/device/selections/lines/SMOG2/include/SMOG2_DiMuonHighMassLine.cuh @@ -93,18 +93,18 @@ namespace SMOG2_dimuon_highmass_line { Allen::Property m_maxTrackChi2Ndf {this, "maxTrackChi2Ndf", 5.f, "max track fit Chi2ndf"}; Allen::Property m_minTrackPt {this, "minTrackPt", - 500.f * Gaudi::Units::MeV, + 500.f * Allen::Units::MeV, "min track transverse momentum"}; - Allen::Property m_minTrackP {this, "minTrackP", 3000.f * Gaudi::Units::MeV, "min track momentum"}; + Allen::Property m_minTrackP {this, "minTrackP", 3000.f * Allen::Units::MeV, "min track momentum"}; Allen::Property m_minMass {this, "minMass", - 2700.f * Gaudi::Units::MeV, + 2700.f * Allen::Units::MeV, "min invariant mass for track combination"}; Allen::Property m_CombCharge {this, "HighMassCombCharge", 0, "Charge of the combination"}; - Allen::Property m_maxDoca {this, "maxDoca", 0.5f * Gaudi::Units::mm, "max distance of closest approach"}; + Allen::Property m_maxDoca {this, "maxDoca", 0.5f * Allen::Units::mm, "max distance of closest approach"}; Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 25.0f, "Max vertex chi2"}; - Allen::Property m_minZ {this, "minZ", -537.5f * Gaudi::Units::mm, "minimum vertex z"}; - Allen::Property m_maxZ {this, "maxZ", -337.5f * Gaudi::Units::mm, "maximum vertex z"}; + Allen::Property m_minZ {this, "minZ", -537.5f * Allen::Units::mm, "minimum vertex z"}; + Allen::Property m_maxZ {this, "maxZ", -337.5f * Allen::Units::mm, "maximum vertex z"}; Allen::Property m_maxChi2Corr {this, "maxChi2Corr", 1.8, "maximum Chi2Muon evaluation"}; Allen::Monitoring::Histogram<> m_histogram_smogdimuon_mass {this, diff --git a/device/selections/lines/SMOG2/include/SMOG2_DiTrack.cuh b/device/selections/lines/SMOG2/include/SMOG2_DiTrack.cuh index 7220c44ddf8..8bc0ecc28ff 100644 --- a/device/selections/lines/SMOG2/include/SMOG2_DiTrack.cuh +++ b/device/selections/lines/SMOG2/include/SMOG2_DiTrack.cuh @@ -110,33 +110,33 @@ namespace SMOG2_ditrack_line { Allen::Property m_maxTrackChi2Ndf {this, "maxTrackChi2Ndf", 4.f, "max track fit Chi2ndf"}; Allen::Property m_minTrackP {this, "minTrackP", - 3000.f * Gaudi::Units::MeV, + 3000.f * Allen::Units::MeV, "minimum final-state particles momentum"}; Allen::Property m_minTrackPt {this, "minTrackPt", - 400.f * Gaudi::Units::MeV, + 400.f * Allen::Units::MeV, "minimum final-state particles transverse momentum"}; Allen::Property m_minEitherTrackPt {this, "minEitherTrackPt", - 800.f * Gaudi::Units::MeV, + 800.f * Allen::Units::MeV, "minimum transverse momentum for at least one final-state particle"}; Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 20.f, "max SV Chi2"}; - Allen::Property m_minZ {this, "minZ", -537.5f * Gaudi::Units::mm, "minimum accepted SV z"}; - Allen::Property m_maxZ {this, "maxZ", -337.5f * Gaudi::Units::mm, "maximum accepted SV z"}; - Allen::Property m_maxDoca {this, "maxDoca", 0.2f * Gaudi::Units::mm, "max distance of closest approach"}; + Allen::Property m_minZ {this, "minZ", -537.5f * Allen::Units::mm, "minimum accepted SV z"}; + Allen::Property m_maxZ {this, "maxZ", -337.5f * Allen::Units::mm, "maximum accepted SV z"}; + Allen::Property m_maxDoca {this, "maxDoca", 0.2f * Allen::Units::mm, "max distance of closest approach"}; Allen::Property m_combCharge {this, "combCharge", 0, "Charge of the combination"}; Allen::Property m_minTrackIPCHI2 {this, "minTrackIPCHI2", 5.f, "Min IPCHI2 for the final-state parts"}; Allen::Property m_maxTrackIPCHI2 {this, "maxTrackIPCHI2", 999999.f, "Max IPCHI2 for the final-state parts"}; - Allen::Property m_m1 {this, "m1", -1.f * Gaudi::Units::MeV, "first final-state particle mass"}; - Allen::Property m_m2 {this, "m2", -1.f * Gaudi::Units::MeV, "second final-state particle mass"}; + Allen::Property m_m1 {this, "m1", -1.f * Allen::Units::MeV, "first final-state particle mass"}; + Allen::Property m_m2 {this, "m2", -1.f * Allen::Units::MeV, "second final-state particle mass"}; Allen::Property m_minMdipion {this, "minMdipion", - -1.f * Gaudi::Units::MeV, + -1.f * Allen::Units::MeV, "Minimum mass assuming dipion hypothesis in MeV"}; - Allen::Property m_mMother {this, "mMother", -1.f * Gaudi::Units::MeV, "resonance mass"}; + Allen::Property m_mMother {this, "mMother", -1.f * Allen::Units::MeV, "resonance mass"}; Allen::Property m_massWindow {this, "massWindow", - -1.f * Gaudi::Units::MeV, + -1.f * Allen::Units::MeV, "maximum mass difference wrt mM"}; Allen::Property m_minFDCHI2 {this, "minFDCHI2", -10.f, "Min flight distance CHI2 for the final-state part"}; Allen::Property m_maxFDCHI2 {this, diff --git a/device/selections/lines/SMOG2/include/SMOG2_DisplacedDiMuonLine.cuh b/device/selections/lines/SMOG2/include/SMOG2_DisplacedDiMuonLine.cuh index 2c868a7514c..4a4c1b251c2 100644 --- a/device/selections/lines/SMOG2/include/SMOG2_DisplacedDiMuonLine.cuh +++ b/device/selections/lines/SMOG2/include/SMOG2_DisplacedDiMuonLine.cuh @@ -86,18 +86,18 @@ namespace SMOG2_displaced_di_muon_line { // Dimuon track pt. Allen::Property m_minDispTrackPt {this, "minDispTrackPt", - 250.f * Gaudi::Units::MeV, + 250.f * Allen::Units::MeV, "minDispTrackPt description"}; Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 30.f, "maxVertexChi2 description"}; - Allen::Property m_minComboPt {this, "minComboPt", 1.f * Gaudi::Units::GeV, "minComboPt description"}; + Allen::Property m_minComboPt {this, "minComboPt", 1.f * Allen::Units::GeV, "minComboPt description"}; // Displaced dimuon selections. - Allen::Property m_mass {this, "mass", 500.f * Gaudi::Units::MeV, "mass of dimuon"}; - Allen::Property m_minZ {this, "minZ", -537.5f * Gaudi::Units::mm, "minimum vertex z dimuon coordinate"}; + Allen::Property m_mass {this, "mass", 500.f * Allen::Units::MeV, "mass of dimuon"}; + Allen::Property m_minZ {this, "minZ", -537.5f * Allen::Units::mm, "minimum vertex z dimuon coordinate"}; Allen::Property m_maxChi2CorrMuon {this, "maxChi2CorrMuon", 2.5, "maximum Chi2CorrMuon evaluation"}; - Allen::Property m_minPVZ {this, "minPVZ", -537.5f * Gaudi::Units::mm, "minimum PV z coordinate"}; - Allen::Property m_maxPVZ {this, "maxPVZ", -337.5f * Gaudi::Units::mm, "maximum PV z coordinate"}; + Allen::Property m_minPVZ {this, "minPVZ", -537.5f * Allen::Units::mm, "minimum PV z coordinate"}; + Allen::Property m_maxPVZ {this, "maxPVZ", -337.5f * Allen::Units::mm, "maximum PV z coordinate"}; Allen::Property m_minFDCHI2 {this, "minFDCHI2", 15.f, "chi2 of pv and endvertex"}; - Allen::Property m_maxIP {this, "maxIP", 1.f * Gaudi::Units::mm, "mother IP"}; + Allen::Property m_maxIP {this, "maxIP", 1.f * Allen::Units::mm, "mother IP"}; Allen::Property m_minMuonNN {this, "minMuonNN", 0.1, "min NN evaluation"}; Allen::Property m_useNN {this, "useNN", true, "useNN"}; diff --git a/device/selections/lines/SMOG2/include/SMOG2_JpsiToMuMuTaPLine.cuh b/device/selections/lines/SMOG2/include/SMOG2_JpsiToMuMuTaPLine.cuh index 64d9e704b57..f71e597d8d6 100644 --- a/device/selections/lines/SMOG2/include/SMOG2_JpsiToMuMuTaPLine.cuh +++ b/device/selections/lines/SMOG2/include/SMOG2_JpsiToMuMuTaPLine.cuh @@ -93,34 +93,34 @@ namespace SMOG2jpsitomumu_tap_line { private: Allen::Property m_JpsiMinMass {this, "JpsiMinMass", - 2850.f * Gaudi::Units::MeV, + 2850.f * Allen::Units::MeV, "Min invariant mass for JPsi candidate"}; Allen::Property m_JpsiMaxMass {this, "JpsiMaxMass", - 3350.f * Gaudi::Units::MeV, + 3350.f * Allen::Units::MeV, "Min invariant mass for JPsi candidate"}; Allen::Property m_JpsiMinZ {this, "JpsiMinZ", - -537.5f * Gaudi::Units::mm, + -537.5f * Allen::Units::mm, "minimum vertex z dimuon coordinate"}; Allen::Property m_JpsiMaxZ {this, "JpsiMaxZ", - -337.5f * Gaudi::Units::mm, + -337.5f * Allen::Units::mm, "maximum vertex z dimuon coordinate"}; - Allen::Property m_mutagMinP {this, "mutagMinP", 3000.f * Gaudi::Units::MeV, "Min momentum for tag muon"}; - Allen::Property m_mutagMinPt {this, "mutagMinPt", 600.f * Gaudi::Units::MeV, "Min Pt for tag muon"}; + Allen::Property m_mutagMinP {this, "mutagMinP", 3000.f * Allen::Units::MeV, "Min momentum for tag muon"}; + Allen::Property m_mutagMinPt {this, "mutagMinPt", 600.f * Allen::Units::MeV, "Min Pt for tag muon"}; Allen::Property m_mutagMaxChi2Corr {this, "mutagMaxChi2Corr", 1.8, "maximum muon tag correlated chi2"}; Allen::Property m_muprobeMinP {this, "muprobeMinP", - 3000.f * Gaudi::Units::MeV, + 3000.f * Allen::Units::MeV, "Min momentum for probe muon"}; - Allen::Property m_muprobeMinPt {this, "muprobeMinPt", 150.f * Gaudi::Units::MeV, "Min Pt for probe muon"}; - Allen::Property m_JpsiMinPt {this, "JpsiMinPt", 0.f * Gaudi::Units::MeV, "Min Pt for the Jpsi candidate"}; + Allen::Property m_muprobeMinPt {this, "muprobeMinPt", 150.f * Allen::Units::MeV, "Min Pt for probe muon"}; + Allen::Property m_JpsiMinPt {this, "JpsiMinPt", 0.f * Allen::Units::MeV, "Min Pt for the Jpsi candidate"}; Allen::Property m_posTag {this, "posTag", true, "Tags positive charged tracks with isMuon"}; Allen::Property m_JpsiMaxVChi2 {this, "JpsiMaxVChi2", 16.f, "Max chi2 for the J/psi candidate vertex"}; Allen::Property m_JpsiMaxDoca {this, "JpsiMaxDoca", - 0.5f * Gaudi::Units::mm, + 0.5f * Allen::Units::mm, "Max DOCA for the J/psi candidate combination"}; Allen::Property m_maxTrackChi2Ndf {this, "maxTrackChi2Ndf", 5.f, "max track fit Chi2ndf"}; Allen::Property m_minMuonNN {this, "minMuonNN", 0.1, "min NN evaluation"}; diff --git a/device/selections/lines/SMOG2/include/SMOG2_KsToPiPi.cuh b/device/selections/lines/SMOG2/include/SMOG2_KsToPiPi.cuh index 929655b7d3f..40ec8c97c45 100644 --- a/device/selections/lines/SMOG2/include/SMOG2_KsToPiPi.cuh +++ b/device/selections/lines/SMOG2/include/SMOG2_KsToPiPi.cuh @@ -85,15 +85,15 @@ namespace SMOG2_kstopipi_line { private: Allen::Property m_minIPChi2 {this, "minIPChi2", 100.f, "Minimum IPCHI2"}; Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 10.0f, "Maximum vertex Chi2"}; - Allen::Property m_maxIP {this, "maxIP", 0.3f * Gaudi::Units::mm, "Maximum IP"}; - Allen::Property m_minMass {this, "minMass", 400.f * Gaudi::Units::MeV, "Minimum invariant mass"}; + Allen::Property m_maxIP {this, "maxIP", 0.3f * Allen::Units::mm, "Maximum IP"}; + Allen::Property m_minMass {this, "minMass", 400.f * Allen::Units::MeV, "Minimum invariant mass"}; Allen::Property m_minTrackPt {this, "minTrackPt", - 200.f * Gaudi::Units::MeV, + 200.f * Allen::Units::MeV, "Minimum final-state particles Pt"}; - Allen::Property m_maxMass {this, "maxMass", 600.f * Gaudi::Units::MeV, "Maximum invariat mass"}; - Allen::Property m_minPVZ {this, "minPVZ", -537.5f * Gaudi::Units::mm, "minimum PV z coordinate"}; - Allen::Property m_maxPVZ {this, "maxPVZ", -337.5f * Gaudi::Units::mm, "maximum PV z coordinate"}; + Allen::Property m_maxMass {this, "maxMass", 600.f * Allen::Units::MeV, "Maximum invariat mass"}; + Allen::Property m_minPVZ {this, "minPVZ", -537.5f * Allen::Units::mm, "minimum PV z coordinate"}; + Allen::Property m_maxPVZ {this, "maxPVZ", -337.5f * Allen::Units::mm, "maximum PV z coordinate"}; Allen::Property m_CombCharge {this, "CombCharge", 0, "Charge of the combination"}; Allen::Monitoring::Histogram<> m_histogram_smogks_mass {this, diff --git a/device/selections/lines/SMOG2/include/SMOG2_MinimumBiasLine.cuh b/device/selections/lines/SMOG2/include/SMOG2_MinimumBiasLine.cuh index a093396b8b7..6c96fc68447 100644 --- a/device/selections/lines/SMOG2/include/SMOG2_MinimumBiasLine.cuh +++ b/device/selections/lines/SMOG2/include/SMOG2_MinimumBiasLine.cuh @@ -67,11 +67,11 @@ namespace SMOG2_minimum_bias_line { Allen::Property m_minNHits {this, "minNHits", 12, "min number of hits of velo track"}; Allen::Property m_minZ {this, "minZ", - -537.5f * Gaudi::Units::mm, + -537.5f * Allen::Units::mm, "min z coordinate for accepted reconstructed primary vertex"}; Allen::Property m_maxZ {this, "maxZ", - -337.5f * Gaudi::Units::mm, + -337.5f * Allen::Units::mm, "max z coordinate for accepted reconstructed primary vertex"}; }; } // namespace SMOG2_minimum_bias_line diff --git a/device/selections/lines/SMOG2/include/SMOG2_SingleMuon.cuh b/device/selections/lines/SMOG2/include/SMOG2_SingleMuon.cuh index 1f022e1c499..266bd77ae26 100644 --- a/device/selections/lines/SMOG2/include/SMOG2_SingleMuon.cuh +++ b/device/selections/lines/SMOG2/include/SMOG2_SingleMuon.cuh @@ -72,10 +72,10 @@ namespace SMOG2_single_muon_line { private: Allen::Property m_maxChi2Ndof {this, "maxChi2Ndof", 100.f, "maxChi2Ndof description"}; - Allen::Property m_MinPt {this, "MinPt", 600.f / Gaudi::Units::MeV, "Minimum PT"}; - Allen::Property m_MinP {this, "MinP", 5000.f / Gaudi::Units::MeV, "Minimum P"}; - Allen::Property m_minBPVz {this, "minBPVz", -537.5f * Gaudi::Units::mm, "minimum z for the track BPV"}; - Allen::Property m_maxBPVz {this, "maxBPVz", -337.5f * Gaudi::Units::mm, "maximum z for the track BPV"}; + Allen::Property m_MinPt {this, "MinPt", 600.f / Allen::Units::MeV, "Minimum PT"}; + Allen::Property m_MinP {this, "MinP", 5000.f / Allen::Units::MeV, "Minimum P"}; + Allen::Property m_minBPVz {this, "minBPVz", -537.5f * Allen::Units::mm, "minimum z for the track BPV"}; + Allen::Property m_maxBPVz {this, "maxBPVz", -337.5f * Allen::Units::mm, "maximum z for the track BPV"}; Allen::Property m_maxChi2Corr {this, "maxChi2Corr", 1.8, "maximum Chi2Muon evaluation"}; Allen::Property m_minMuonNN {this, "minMuonNN", 0.15, "minimum NN evaluation"}; Allen::Property m_useNN {this, "useNN", true, "Use NN instead of Chi2Corr"}; diff --git a/device/selections/lines/SMOG2/include/SMOG2_SingleTrack.cuh b/device/selections/lines/SMOG2/include/SMOG2_SingleTrack.cuh index 0f5098852e3..2f93aead6e7 100644 --- a/device/selections/lines/SMOG2/include/SMOG2_SingleTrack.cuh +++ b/device/selections/lines/SMOG2/include/SMOG2_SingleTrack.cuh @@ -47,16 +47,16 @@ namespace SMOG2_singletrack_line { select(const Parameters&, const DeviceProperties&, std::tuple input); private: - Allen::Property m_minP {this, "minP", 5000.f * Gaudi::Units::MeV, "minimum P"}; - Allen::Property m_minPt {this, "minPt", 1500.f * Gaudi::Units::MeV, "minimum Pt"}; + Allen::Property m_minP {this, "minP", 5000.f * Allen::Units::MeV, "minimum P"}; + Allen::Property m_minPt {this, "minPt", 1500.f * Allen::Units::MeV, "minimum Pt"}; Allen::Property m_maxChi2Ndof {this, "maxChi2Ndof", 3.f, "maximum track fit chi2 per degree of freedom"}; Allen::Property m_minBPVz {this, "minBPVz", - -537.5f * Gaudi::Units::mm, + -537.5f * Allen::Units::mm, "minimum z for the best associated primary vertex"}; Allen::Property m_maxBPVz {this, "maxBPVz", - -337.5f * Gaudi::Units::mm, + -337.5f * Allen::Units::mm, "maximum z for the best associated primary vertex"}; Allen::Property m_maxGhostProb {this, "maxGhostProb", 0.5, "Maximum ghost probability of the tracks"}; }; diff --git a/device/selections/lines/calibration/include/D2KPiLine.cuh b/device/selections/lines/calibration/include/D2KPiLine.cuh index e84dc01f9b9..525af5ff9db 100644 --- a/device/selections/lines/calibration/include/D2KPiLine.cuh +++ b/device/selections/lines/calibration/include/D2KPiLine.cuh @@ -87,17 +87,17 @@ namespace d2kpi_line { using monitoring_types = std::tuple; private: - Allen::Property m_minComboPt {this, "minComboPt", 2000.0f * Gaudi::Units::MeV, "minComboPt description"}; + Allen::Property m_minComboPt {this, "minComboPt", 2000.0f * Allen::Units::MeV, "minComboPt description"}; Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 20.f, "maxVertexChi2 description"}; - Allen::Property m_maxDOCA {this, "maxDOCA", 0.2f * Gaudi::Units::mm, "maxDOCA description"}; + Allen::Property m_maxDOCA {this, "maxDOCA", 0.2f * Allen::Units::mm, "maxDOCA description"}; Allen::Property m_minEta {this, "minEta", 2.0f, "minEta description"}; Allen::Property m_maxEta {this, "maxEta", 5.0f, "maxEta description"}; - Allen::Property m_minTrackPt {this, "minTrackPt", 800.f * Gaudi::Units::MeV, "minTrackPt description"}; - Allen::Property m_minTrackP {this, "minTrackP", 0.f * Gaudi::Units::MeV, "minTrackP description"}; - Allen::Property m_massWindow {this, "massWindow", 100.f * Gaudi::Units::MeV, "massWindow description"}; - Allen::Property m_minTrackIP {this, "minTrackIP", 0.06f * Gaudi::Units::mm, "minTrackIP description"}; + Allen::Property m_minTrackPt {this, "minTrackPt", 800.f * Allen::Units::MeV, "minTrackPt description"}; + Allen::Property m_minTrackP {this, "minTrackP", 0.f * Allen::Units::MeV, "minTrackP description"}; + Allen::Property m_massWindow {this, "massWindow", 100.f * Allen::Units::MeV, "massWindow description"}; + Allen::Property m_minTrackIP {this, "minTrackIP", 0.06f * Allen::Units::mm, "minTrackIP description"}; Allen::Property m_ctIPScale {this, "ctIPScale", 1.f, "D0 ct should be larger than this time minTrackIP"}; - Allen::Property m_minZ {this, "minZ", -330.f * Gaudi::Units::mm, "minimum vertex z coordinate"}; + Allen::Property m_minZ {this, "minZ", -330.f * Allen::Units::mm, "minimum vertex z coordinate"}; Allen::Property m_minDira {this, "minDira", 0.f, "minimum value of cos(theta_dira)"}; Allen::Property m_opposite_sign {this, "OppositeSign", true, "Selects opposite sign dibody combinations"}; diff --git a/device/selections/lines/calibration/include/DiMuonMassAlignmentLine.cuh b/device/selections/lines/calibration/include/DiMuonMassAlignmentLine.cuh index 0ac3b829b2e..98b33ef2620 100644 --- a/device/selections/lines/calibration/include/DiMuonMassAlignmentLine.cuh +++ b/device/selections/lines/calibration/include/DiMuonMassAlignmentLine.cuh @@ -69,23 +69,23 @@ namespace di_muon_mass_alignment_line { private: Allen::Property m_minHighMassTrackPt {this, "minHighMassTrackPt", - 1000.f / Gaudi::Units::MeV, + 1000.f / Allen::Units::MeV, "minHighMassTrackPt description"}; Allen::Property m_minHighMassTrackP {this, "minHighMassTrackP", - 6000.f / Gaudi::Units::MeV, + 6000.f / Allen::Units::MeV, "minHighMassTrackP description"}; - Allen::Property m_minMass {this, "minMass", 2996.f / Gaudi::Units::MeV, "minMass description"}; - Allen::Property m_maxMass {this, "maxMass", 3196.f / Gaudi::Units::MeV, "maxMass description"}; + Allen::Property m_minMass {this, "minMass", 2996.f / Allen::Units::MeV, "minMass description"}; + Allen::Property m_maxMass {this, "maxMass", 3196.f / Allen::Units::MeV, "maxMass description"}; Allen::Property m_maxDoca {this, "maxDoca", 0.2f, "maxDoca description"}; Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 10.0f, "maxVertexChi2 description"}; - Allen::Property m_minIP {this, "minIP", 0.07f * Gaudi::Units::mm, "minIP description"}; + Allen::Property m_minIP {this, "minIP", 0.07f * Allen::Units::mm, "minIP description"}; Allen::Property m_minFdChi2 {this, "minFdChi2", 5.f, "minFdChi2 description"}; - Allen::Property m_minZ {this, "minZ", -330.f * Gaudi::Units::mm, "minimum vertex z coordinate"}; + Allen::Property m_minZ {this, "minZ", -330.f * Allen::Units::mm, "minimum vertex z coordinate"}; Allen::Property m_minEta {this, "minEta", 2.0f, "minEta description"}; Allen::Property m_maxEta {this, "maxEta", 5.0f, "maxEta description"}; Allen::Property m_minDira {this, "minDira", 0.9995f, "minimum value of cos(theta_dira)"}; - Allen::Property m_minComboPt {this, "minComboPt", 2000.0f * Gaudi::Units::MeV, "minComboPt description"}; + Allen::Property m_minComboPt {this, "minComboPt", 2000.0f * Allen::Units::MeV, "minComboPt description"}; Allen::Property m_maxChi2Muon {this, "maxChi2Muon", 1.8, "max Chi2Muon evaluation"}; Allen::Property m_dimuon_charge {this, "DiMuonCharge", 0, "Charge of the dimuon combination"}; }; diff --git a/device/selections/lines/calibration/include/DisplacedDiMuonMassLine.cuh b/device/selections/lines/calibration/include/DisplacedDiMuonMassLine.cuh index af369dd9188..fe979d88c22 100644 --- a/device/selections/lines/calibration/include/DisplacedDiMuonMassLine.cuh +++ b/device/selections/lines/calibration/include/DisplacedDiMuonMassLine.cuh @@ -48,18 +48,18 @@ namespace displaced_di_muon_mass_line { private: // Dimuon mass cut - Allen::Property m_minMass {this, "minMass", 2700.f / Gaudi::Units::MeV, "minMass description"}; + Allen::Property m_minMass {this, "minMass", 2700.f / Allen::Units::MeV, "minMass description"}; // Dimuon track pt. Allen::Property m_minDispTrackPt {this, "minDispTrackPt", - 500.f / Gaudi::Units::MeV, + 500.f / Allen::Units::MeV, "minDispTrackPt description"}; Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 6.f, "maxVertexChi2 description"}; // Displaced dimuon selections. Allen::Property m_dispMinIPChi2 {this, "dispMinIPChi2", 6.f, "dispMinIPChi2 description"}; Allen::Property m_dispMinEta {this, "dispMinEta", 2.f, "dispMinEta description"}; Allen::Property m_dispMaxEta {this, "dispMaxEta", 5.f, "dispMaxEta description"}; - Allen::Property m_minZ {this, "minZ", -330.f * Gaudi::Units::mm, "minimum vertex z dimuon coordinate"}; + Allen::Property m_minZ {this, "minZ", -330.f * Allen::Units::mm, "minimum vertex z dimuon coordinate"}; Allen::Property m_dimuon_charge {this, "DiMuonCharge", 0, "Charge of the dimuon combination"}; }; } // namespace displaced_di_muon_mass_line diff --git a/device/selections/lines/calibration/include/Dst2D0piLine.cuh b/device/selections/lines/calibration/include/Dst2D0piLine.cuh index 3a2ea89dfd2..0a3e46223c2 100644 --- a/device/selections/lines/calibration/include/Dst2D0piLine.cuh +++ b/device/selections/lines/calibration/include/Dst2D0piLine.cuh @@ -82,18 +82,18 @@ namespace dst_d2kpi_line { using monitoring_types = std::tuple; private: - Allen::Property m_minComboPt {this, "minComboPt", 500.0f * Gaudi::Units::MeV, "minComboPt description"}; + Allen::Property m_minComboPt {this, "minComboPt", 500.0f * Allen::Units::MeV, "minComboPt description"}; Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 20.f, "maxVertexChi2 description"}; Allen::Property m_minFDChi2 {this, "minFDChi2", 25.f, "minFDChi2 description"}; - Allen::Property m_maxDOCA {this, "maxDOCA", 0.2f * Gaudi::Units::mm, "maxDOCA description"}; + Allen::Property m_maxDOCA {this, "maxDOCA", 0.2f * Allen::Units::mm, "maxDOCA description"}; Allen::Property m_minEta {this, "minEta", 2.0f, "minEta description"}; Allen::Property m_maxEta {this, "maxEta", 5.0f, "maxEta description"}; - Allen::Property m_minTrackPt {this, "minTrackPt", 250.f * Gaudi::Units::MeV, "minTrackPt description"}; - Allen::Property m_massWindow {this, "massWindow", 100.f * Gaudi::Units::MeV, "massWindow description"}; - Allen::Property m_minTrackIP {this, "minTrackIP", 0.06f * Gaudi::Units::mm, "minTrackIP description"}; + Allen::Property m_minTrackPt {this, "minTrackPt", 250.f * Allen::Units::MeV, "minTrackPt description"}; + Allen::Property m_massWindow {this, "massWindow", 100.f * Allen::Units::MeV, "massWindow description"}; + Allen::Property m_minTrackIP {this, "minTrackIP", 0.06f * Allen::Units::mm, "minTrackIP description"}; Allen::Property m_ctIPScale {this, "ctIPScale", 1.f, "D0 ct should be larger than this time minTrackIP"}; - Allen::Property m_dmMax {this, "dmMax", 160.f * Gaudi::Units::MeV, "Maximum Dst-D0 mass difference."}; - Allen::Property m_minZ {this, "minZ", -330.f * Gaudi::Units::mm, "minimum vertex z coordinate"}; + Allen::Property m_dmMax {this, "dmMax", 160.f * Allen::Units::MeV, "Maximum Dst-D0 mass difference."}; + Allen::Property m_minZ {this, "minZ", -330.f * Allen::Units::mm, "minimum vertex z coordinate"}; Allen::Monitoring::Histogram<> m_histogram_d0_mass {this, "d0_mass", "m(D0)", {100u, 1765.f, 1965.f}}; Allen::Monitoring::Histogram<> m_histogram_d0_pt {this, "d0_pt", "pT(D0)", {100u, 0.f, 1e4f}}; diff --git a/device/selections/lines/calibration/include/RICH1Line.cuh b/device/selections/lines/calibration/include/RICH1Line.cuh index 82bba32e559..c523d6c3b33 100644 --- a/device/selections/lines/calibration/include/RICH1Line.cuh +++ b/device/selections/lines/calibration/include/RICH1Line.cuh @@ -94,8 +94,8 @@ namespace rich_1_line { private: // Commonly required properties // RICH 1 Line-specific properties - Allen::Property m_minPt {this, "minPt", 500.0f / Gaudi::Units::MeV, "minPt description"}; - Allen::Property m_minP {this, "minP", 30000.0f / Gaudi::Units::MeV, "minP description"}; + Allen::Property m_minPt {this, "minPt", 500.0f / Allen::Units::MeV, "minPt description"}; + Allen::Property m_minP {this, "minP", 30000.0f / Allen::Units::MeV, "minP description"}; Allen::Property m_maxTrChi2 {this, "maxTrChi2", 2.0f, "max track chi2"}; Allen::Property> m_minEta {this, "minEta", {1.60}, "minimum pseudorapidity"}; diff --git a/device/selections/lines/calibration/include/RICH2Line.cuh b/device/selections/lines/calibration/include/RICH2Line.cuh index 046d43a7e79..22326afcea5 100644 --- a/device/selections/lines/calibration/include/RICH2Line.cuh +++ b/device/selections/lines/calibration/include/RICH2Line.cuh @@ -94,8 +94,8 @@ namespace rich_2_line { private: // Commonly required properties // RICH 2 Line-specific properties - Allen::Property m_minPt {this, "minPt", 500.0f / Gaudi::Units::MeV, "minPt description"}; - Allen::Property m_minP {this, "minP", 60000.0f / Gaudi::Units::MeV, "minP description"}; + Allen::Property m_minPt {this, "minPt", 500.0f / Allen::Units::MeV, "minPt description"}; + Allen::Property m_minP {this, "minP", 60000.0f / Allen::Units::MeV, "minP description"}; Allen::Property m_maxTrChi2 {this, "maxTrChi2", 2.0f, "max track chi2"}; Allen::Property> m_minEta {this, "minEta", {2.65}, "minimum pseudorapidity"}; Allen::Property> m_maxEta {this, "maxEta", {2.80}, "maximum pseudorapidity"}; diff --git a/device/selections/lines/charm/include/D02KsKsDDDDLine.cuh b/device/selections/lines/charm/include/D02KsKsDDDDLine.cuh index 1e9a27a1142..9b429953c61 100644 --- a/device/selections/lines/charm/include/D02KsKsDDDDLine.cuh +++ b/device/selections/lines/charm/include/D02KsKsDDDDLine.cuh @@ -206,25 +206,25 @@ namespace d02ksks_DDDD_line { Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 20.f, "maxVertexChi2 description"}; Allen::Property m_minComboPt_Ks {this, "minComboPt_Ks", - 1200.f * Gaudi::Units::MeV, + 1200.f * Allen::Units::MeV, "minComboPt_Ks description"}; Allen::Property m_minEta_Ks {this, "minEta_Ks", 2.f, "minEta_Ks description"}; Allen::Property m_maxEta_Ks {this, "maxEta_Ks", 4.2f, "maxEta_Ks description"}; Allen::Property m_minTrackPt_piKs {this, "minTrackPt_piKs", - 450.f * Gaudi::Units::MeV, + 450.f * Allen::Units::MeV, "minTrackPt_piKs description"}; Allen::Property m_minTrackP_piKs {this, "minTrackP_piKs", - 3000.f * Gaudi::Units::MeV, + 3000.f * Allen::Units::MeV, "minTrackP_piKs description"}; Allen::Property m_minTrackIP_piKs {this, "minTrackIP_piKs", 1.f, "minTrackIP_piKs description"}; - Allen::Property m_minM_Ks {this, "minM_Ks", 400.0f * Gaudi::Units::MeV, "minM_Ks description"}; - Allen::Property m_maxM_Ks {this, "maxM_Ks", 600.0f * Gaudi::Units::MeV, "maxM_Ks description"}; - Allen::Property m_minM_D0 {this, "minM_D0", 1650.0f * Gaudi::Units::MeV, "minM_D0 description"}; - Allen::Property m_maxM_D0 {this, "maxM_D0", 2100.0f * Gaudi::Units::MeV, "maxM_D0 description"}; - Allen::Property m_minZ_sv {this, "minZ_sv", 400.f * Gaudi::Units::mm, "minZ_sv description"}; - Allen::Property m_minZ_pv {this, "minZ_pv", -330.f * Gaudi::Units::mm, "minZ_pv description"}; + Allen::Property m_minM_Ks {this, "minM_Ks", 400.0f * Allen::Units::MeV, "minM_Ks description"}; + Allen::Property m_maxM_Ks {this, "maxM_Ks", 600.0f * Allen::Units::MeV, "maxM_Ks description"}; + Allen::Property m_minM_D0 {this, "minM_D0", 1650.0f * Allen::Units::MeV, "minM_D0 description"}; + Allen::Property m_maxM_D0 {this, "maxM_D0", 2100.0f * Allen::Units::MeV, "maxM_D0 description"}; + Allen::Property m_minZ_sv {this, "minZ_sv", 400.f * Allen::Units::mm, "minZ_sv description"}; + Allen::Property m_minZ_pv {this, "minZ_pv", -330.f * Allen::Units::mm, "minZ_pv description"}; Allen::Property m_opposite_sign {this, "OppositeSign", true, "Selects opposite sign dibody combinations"}; }; } // namespace d02ksks_DDDD_line diff --git a/device/selections/lines/charm/include/D2KKLine.cuh b/device/selections/lines/charm/include/D2KKLine.cuh index 768351e0bc0..d289e81c8bc 100644 --- a/device/selections/lines/charm/include/D2KKLine.cuh +++ b/device/selections/lines/charm/include/D2KKLine.cuh @@ -79,16 +79,16 @@ namespace d2kk_line { using monitoring_types = std::tuple; private: - Allen::Property m_minComboPt {this, "minComboPt", 2000.0f * Gaudi::Units::MeV, "minComboPt description"}; + Allen::Property m_minComboPt {this, "minComboPt", 2000.0f * Allen::Units::MeV, "minComboPt description"}; Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 20.f, "maxVertexChi2 description"}; - Allen::Property m_maxDOCA {this, "maxDOCA", 0.2f * Gaudi::Units::mm, "maxDOCA description"}; + Allen::Property m_maxDOCA {this, "maxDOCA", 0.2f * Allen::Units::mm, "maxDOCA description"}; Allen::Property m_minEta {this, "minEta", 2.0f, "minEta description"}; Allen::Property m_maxEta {this, "maxEta", 5.0f, "maxEta description"}; - Allen::Property m_minTrackPt {this, "minTrackPt", 800.f * Gaudi::Units::MeV, "minTrackPt description"}; - Allen::Property m_massWindow {this, "massWindow", 100.f * Gaudi::Units::MeV, "massWindow description"}; - Allen::Property m_minTrackIP {this, "minTrackIP", 0.06f * Gaudi::Units::mm, "minTrackIP description"}; + Allen::Property m_minTrackPt {this, "minTrackPt", 800.f * Allen::Units::MeV, "minTrackPt description"}; + Allen::Property m_massWindow {this, "massWindow", 100.f * Allen::Units::MeV, "massWindow description"}; + Allen::Property m_minTrackIP {this, "minTrackIP", 0.06f * Allen::Units::mm, "minTrackIP description"}; Allen::Property m_ctIPScale {this, "ctIPScale", 1.f, "D0 ct should be larger than this time minTrackIP"}; - Allen::Property m_minZ {this, "minZ", -330.f * Gaudi::Units::mm, "minimum vertex z coordinate"}; + Allen::Property m_minZ {this, "minZ", -330.f * Allen::Units::mm, "minimum vertex z coordinate"}; Allen::Property m_opposite_sign {this, "OppositeSign", true, "Selects opposite sign dibody combinations"}; Allen::Monitoring::Histogram<> m_histogram_d02kk_mass {this, "d02kk_mass", "m(D0)", {100u, 1765.f, 1965.f}}; diff --git a/device/selections/lines/charm/include/D2KsHHLine.cuh b/device/selections/lines/charm/include/D2KsHHLine.cuh index 08a199ae946..33ca3182f6c 100644 --- a/device/selections/lines/charm/include/D2KsHHLine.cuh +++ b/device/selections/lines/charm/include/D2KsHHLine.cuh @@ -151,45 +151,45 @@ namespace d2kshh_line { private: Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 20.f, "max VertexChi2 of the two vertices"}; - Allen::Property m_maxDOCA {this, "maxDOCA", 0.5f * Gaudi::Units::mm, "max DOCA of the two vertices"}; + Allen::Property m_maxDOCA {this, "maxDOCA", 0.5f * Allen::Units::mm, "max DOCA of the two vertices"}; Allen::Property m_minTrackPt_piKs {this, "minTrackPt_Ks", - 200.f * Gaudi::Units::MeV, + 200.f * Allen::Units::MeV, "min Pt of KS vertex tracks"}; Allen::Property m_minTrackP_piKs {this, "minTrackP_Ks", - 1500.f * Gaudi::Units::MeV, + 1500.f * Allen::Units::MeV, "min P of KS vertex tracks"}; Allen::Property m_minTrackIP_Ks {this, "minTrackIP_Ks", - 0.2f * Gaudi::Units::mm, + 0.2f * Allen::Units::mm, "min IP of KS vertex tracks"}; - Allen::Property m_minComboPt_Ks {this, "minComboPt_Ks", 200.f * Gaudi::Units::MeV, "min Pt of Ks candidate"}; + Allen::Property m_minComboPt_Ks {this, "minComboPt_Ks", 200.f * Allen::Units::MeV, "min Pt of Ks candidate"}; Allen::Property m_minEta_Ks {this, "minEta_Ks", 2.0f, "min Pseudorapidity of KS candidate"}; Allen::Property m_maxEta_Ks {this, "maxEta_Ks", 5.0f, "max Pseudorapidity of KS candidate"}; - Allen::Property m_minM_Ks {this, "minM_Ks", 455.0f * Gaudi::Units::MeV, "min mass of KS candidate"}; - Allen::Property m_maxM_Ks {this, "maxM_Ks", 545.0f * Gaudi::Units::MeV, "max mass of KS candidate"}; + Allen::Property m_minM_Ks {this, "minM_Ks", 455.0f * Allen::Units::MeV, "min mass of KS candidate"}; + Allen::Property m_maxM_Ks {this, "maxM_Ks", 545.0f * Allen::Units::MeV, "max mass of KS candidate"}; Allen::Property m_maxDOCA_hh {this, "maxDOCA_hh", 0.05f, "max DOCA of hh tracks"}; Allen::Property m_minEta_hh {this, "minEta_hh", 2.0f, "min Pseudorapidity of hh candidate"}; Allen::Property m_maxEta_hh {this, "maxEta_hh", 5.0f, "max Pseudorapidity of hh candidate"}; Allen::Property m_minTrackPt_hh {this, "minTrackPt_hh", - 250.f * Gaudi::Units::MeV, + 250.f * Allen::Units::MeV, "min Pt of D0 candidate tracks"}; Allen::Property m_minTrackP_hh {this, "minTrackP_hh", - 1500.f * Gaudi::Units::MeV, + 1500.f * Allen::Units::MeV, "min P of hh candidate tracks"}; Allen::Property m_minTrackIP_hh {this, "minTrackIP_hh", - 0.06f * Gaudi::Units::mm, + 0.06f * Allen::Units::mm, "min IP of D0 candidate tracks"}; Allen::Property m_minComboPt_D0 {this, "minComboPt_D0", - 1500.0f * Gaudi::Units::MeV, + 1500.0f * Allen::Units::MeV, "min Pt of D0 candidate"}; Allen::Property m_minCTau_D0 {this, "minCTau_D0", 0.5f * 0.1229f, "minimum D0 proper time"}; // 0.5 * D0 ctau - Allen::Property m_massWindow {this, "massWindow", 100.f * Gaudi::Units::MeV, "D0 massWindow"}; + Allen::Property m_massWindow {this, "massWindow", 100.f * Allen::Units::MeV, "D0 massWindow"}; Allen::Monitoring::Histogram<> m_histogram_d02kshh_mass {this, "d02kshh_mass", "m(D0)", {100u, 1765.f, 1965.f}}; Allen::Monitoring::Histogram<> m_histogram_d02kshh_pt {this, "d02kshh_pt", "pT(D0)", {100u, 0.f, 1e4f}}; @@ -200,4 +200,4 @@ namespace d2kshh_line { Allen::Monitoring::Histogram<> m_histogram_d02kshh_mKS {this, "d02kshh_mKS", "m(KS)", {100u, 455.f, 545.f}}; Allen::Monitoring::Histogram<> m_histogram_d02kshh_mhh {this, "d02kshh_mhh", "m(hh)", {100u, 275.f, 1555.f}}; }; -} // namespace d2kshh_line \ No newline at end of file +} // namespace d2kshh_line diff --git a/device/selections/lines/charm/include/D2PiPiLine.cuh b/device/selections/lines/charm/include/D2PiPiLine.cuh index 8ef3cd43eab..d5902d57fff 100644 --- a/device/selections/lines/charm/include/D2PiPiLine.cuh +++ b/device/selections/lines/charm/include/D2PiPiLine.cuh @@ -81,16 +81,16 @@ namespace d2pipi_line { using monitoring_types = std::tuple; private: - Allen::Property m_minComboPt {this, "minComboPt", 2000.0f * Gaudi::Units::MeV, "minComboPt description"}; + Allen::Property m_minComboPt {this, "minComboPt", 2000.0f * Allen::Units::MeV, "minComboPt description"}; Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 20.f, "maxVertexChi2 description"}; - Allen::Property m_maxDOCA {this, "maxDOCA", 0.2f * Gaudi::Units::mm, "maxDOCA description"}; + Allen::Property m_maxDOCA {this, "maxDOCA", 0.2f * Allen::Units::mm, "maxDOCA description"}; Allen::Property m_minEta {this, "minEta", 2.0f, "minEta description"}; Allen::Property m_maxEta {this, "maxEta", 5.0f, "maxEta description"}; - Allen::Property m_minTrackPt {this, "minTrackPt", 800.f * Gaudi::Units::MeV, "minTrackPt description"}; - Allen::Property m_massWindow {this, "massWindow", 100.f * Gaudi::Units::MeV, "massWindow description"}; - Allen::Property m_minTrackIP {this, "minTrackIP", 0.06f * Gaudi::Units::mm, "minTrackIP description"}; + Allen::Property m_minTrackPt {this, "minTrackPt", 800.f * Allen::Units::MeV, "minTrackPt description"}; + Allen::Property m_massWindow {this, "massWindow", 100.f * Allen::Units::MeV, "massWindow description"}; + Allen::Property m_minTrackIP {this, "minTrackIP", 0.06f * Allen::Units::mm, "minTrackIP description"}; Allen::Property m_ctIPScale {this, "ctIPScale", 1.f, "D0 ct should be larger than this time minTrackIP"}; - Allen::Property m_minZ {this, "minZ", -330.f * Gaudi::Units::mm, "minimum vertex z coordinate"}; + Allen::Property m_minZ {this, "minZ", -330.f * Allen::Units::mm, "minimum vertex z coordinate"}; Allen::Property m_opposite_sign {this, "OppositeSign", true, "Selects opposite sign dibody combinations"}; Allen::Monitoring::Histogram<> m_histogram_d02pipi_mass {this, "d02pipi_mass", "m(D0)", {100u, 1765.f, 1965.f}}; diff --git a/device/selections/lines/charm/include/TwoKsLine.cuh b/device/selections/lines/charm/include/TwoKsLine.cuh index f44f843a5fa..2f7f7099d34 100644 --- a/device/selections/lines/charm/include/TwoKsLine.cuh +++ b/device/selections/lines/charm/include/TwoKsLine.cuh @@ -204,25 +204,25 @@ namespace two_ks_line { Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 20.f, "maxVertexChi2 description"}; Allen::Property m_minComboPt_Ks {this, "minComboPt_Ks", - 1150.f / Gaudi::Units::MeV, + 1150.f / Allen::Units::MeV, "minComboPt Ks description"}; Allen::Property m_minCosDira {this, "minCosDira", 0.99f, "minCosDira description"}; Allen::Property m_minEta_Ks {this, "minEta_Ks", 2.f, "minEta_Ks description"}; Allen::Property m_maxEta_Ks {this, "maxEta_Ks", 4.2f, "maxEta_Ks description"}; Allen::Property m_minTrackPt_piKs {this, "minTrackPt_piKs", - 425.f / Gaudi::Units::MeV, + 425.f / Allen::Units::MeV, "minTrackPt_piKs description"}; Allen::Property m_minTrackP_piKs {this, "minTrackP_piKs", - 3000.f / Gaudi::Units::MeV, + 3000.f / Allen::Units::MeV, "minTrackP_piKs description"}; Allen::Property m_minTrackIPChi2_Ks {this, "minTrackIPChi2_Ks", 15.f, "minTrackIPChi2_Ks description"}; - Allen::Property m_minM_Ks {this, "minM_Ks", 455.0f / Gaudi::Units::MeV, "minM_Ks description"}; - Allen::Property m_maxM_Ks {this, "maxM_Ks", 545.0f / Gaudi::Units::MeV, "maxM_Ks description"}; + Allen::Property m_minM_Ks {this, "minM_Ks", 455.0f / Allen::Units::MeV, "minM_Ks description"}; + Allen::Property m_maxM_Ks {this, "maxM_Ks", 545.0f / Allen::Units::MeV, "maxM_Ks description"}; Allen::Property m_minCosOpening {this, "minCosOpening", 0.99f, "minCosOpening description"}; - Allen::Property m_min_combip {this, "min_combip", 0.23f / Gaudi::Units::mm, "min_combip description"}; - Allen::Property m_minZ {this, "minZ", -330.f * Gaudi::Units::mm, "minimum vertex z coordinate"}; + Allen::Property m_min_combip {this, "min_combip", 0.23f / Allen::Units::mm, "min_combip description"}; + Allen::Property m_minZ {this, "minZ", -330.f * Allen::Units::mm, "minimum vertex z coordinate"}; Allen::Property m_opposite_sign {this, "OppositeSign", true, "Selects opposite sign dibody combinations"}; }; } // namespace two_ks_line diff --git a/device/selections/lines/charm/include/TwoTrackMVACharmXSec.cuh b/device/selections/lines/charm/include/TwoTrackMVACharmXSec.cuh index c0f98fdadb8..679097e7738 100644 --- a/device/selections/lines/charm/include/TwoTrackMVACharmXSec.cuh +++ b/device/selections/lines/charm/include/TwoTrackMVACharmXSec.cuh @@ -66,28 +66,28 @@ namespace two_track_mva_charm_xsec_line { Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 20.f, "Maximum chi2 of the combination vertex."}; Allen::Property m_minTrackPt {this, "minTrackPt", - 250.f * Gaudi::Units::MeV, + 250.f * Allen::Units::MeV, "Minimum transverse momentum of tracks."}; - Allen::Property m_minTrackP {this, "minTrackP", 2000.f * Gaudi::Units::MeV, "Minimum momentum of tracks."}; + Allen::Property m_minTrackP {this, "minTrackP", 2000.f * Allen::Units::MeV, "Minimum momentum of tracks."}; Allen::Property m_minTrackIPChi2 {this, "minTrackIPChi2", 4.f, "Minimum IPCHI2 of tracks."}; Allen::Property m_maxDOCA {this, "maxDOCA", - 0.2f * Gaudi::Units::mm, + 0.2f * Allen::Units::mm, "Maximum distance of closest approach of tracks."}; Allen::Property m_massWindow {this, "massWindow", - 100.f * Gaudi::Units::MeV, + 100.f * Allen::Units::MeV, "Window around the combination mass."}; Allen::Property m_maxCombKpiMass {this, "maxCombKpiMass", - 1830.f * Gaudi::Units::MeV, + 1830.f * Allen::Units::MeV, "Maximum invariant mass of combination assuming kaon and pion."}; Allen::Property m_lowSVpt {this, "lowSVpt", - 1500.f * Gaudi::Units::MeV, + 1500.f * Allen::Units::MeV, "Value of SV pT in MeV below which the low PT MVA cut is applied."}; Allen::Property m_minMVAhighPt {this, "minMVAhighPt", 0.92385f, "Minimum passing MVA response at hight Pt."}; Allen::Property m_minMVAlowPt {this, "minMVAlowPt", 0.7f, "Minimum passing MVA response at low Pt."}; - Allen::Property m_minZ {this, "minZ", -330.f * Gaudi::Units::mm, "minimum vertex z coordinate"}; + Allen::Property m_minZ {this, "minZ", -330.f * Allen::Units::mm, "minimum vertex z coordinate"}; }; } // namespace two_track_mva_charm_xsec_line diff --git a/device/selections/lines/downstream/include/DownstreamGamma2EELine.cuh b/device/selections/lines/downstream/include/DownstreamGamma2EELine.cuh index c13273483b4..47ec88242d9 100644 --- a/device/selections/lines/downstream/include/DownstreamGamma2EELine.cuh +++ b/device/selections/lines/downstream/include/DownstreamGamma2EELine.cuh @@ -72,12 +72,12 @@ namespace downstream_gammatoee_line { bool sel); private: - Allen::Property m_minMass {this, "minMass", (0.0f) * Gaudi::Units::MeV, "Minimum invariant mass"}; - Allen::Property m_maxMass {this, "maxMass", (100.0f) * Gaudi::Units::MeV, "Maximum invariat mass"}; - Allen::Property m_minPt {this, "minPt", (1000.0f) * Gaudi::Units::MeV, "Minimum pt"}; + Allen::Property m_minMass {this, "minMass", (0.0f) * Allen::Units::MeV, "Minimum invariant mass"}; + Allen::Property m_maxMass {this, "maxMass", (100.0f) * Allen::Units::MeV, "Maximum invariat mass"}; + Allen::Property m_minPt {this, "minPt", (1000.0f) * Allen::Units::MeV, "Minimum pt"}; Allen::Property m_maxArmenterosY {this, "maxArmenterosY", (60.0f), "Upper limit on Armenteros y"}; Allen::Monitoring::Histogram<> m_histogram_gamma_mass {this, "gamma_mass", "m(ee)", {100u, 0.0f, 100.0f}}; Allen::Monitoring::Histogram<> m_histogram_gamma_pt {this, "gamma_pt", "pT(ee)", {100u, 0.0f, 1e4f}}; }; -} // namespace downstream_gammatoee_line \ No newline at end of file +} // namespace downstream_gammatoee_line diff --git a/device/selections/lines/downstream/include/DownstreamKs2PiPiLine.cuh b/device/selections/lines/downstream/include/DownstreamKs2PiPiLine.cuh index e8923985eb2..29896edc3fd 100644 --- a/device/selections/lines/downstream/include/DownstreamKs2PiPiLine.cuh +++ b/device/selections/lines/downstream/include/DownstreamKs2PiPiLine.cuh @@ -75,8 +75,8 @@ namespace downstream_kstopipi_line { bool sel); private: - Allen::Property m_minMass {this, "minMass", (497.6f - 80.f) * Gaudi::Units::MeV, "Minimum invariant mass"}; - Allen::Property m_maxMass {this, "maxMass", (497.6f + 80.f) * Gaudi::Units::MeV, "Maximum invariat mass"}; + Allen::Property m_minMass {this, "minMass", (497.6f - 80.f) * Allen::Units::MeV, "Minimum invariant mass"}; + Allen::Property m_maxMass {this, "maxMass", (497.6f + 80.f) * Allen::Units::MeV, "Maximum invariat mass"}; Allen::Property m_mva_ks_threshold {this, "mva_ks_threshold", 0.5f, "MVA threshold for Kshort selection"}; Allen::Property m_mva_detached_ks_threshold {this, "mva_detached_ks_threshold", diff --git a/device/selections/lines/downstream/include/DownstreamLambda2PPiLine.cuh b/device/selections/lines/downstream/include/DownstreamLambda2PPiLine.cuh index 2ace03f5de6..15668f41250 100644 --- a/device/selections/lines/downstream/include/DownstreamLambda2PPiLine.cuh +++ b/device/selections/lines/downstream/include/DownstreamLambda2PPiLine.cuh @@ -75,8 +75,8 @@ namespace downstream_lambdatoppi_line { bool sel); private: - Allen::Property m_minMass {this, "minMass", (1115.7f - 30.f) * Gaudi::Units::MeV, "Minimum invariant mass"}; - Allen::Property m_maxMass {this, "maxMass", (1115.7f + 30.f) * Gaudi::Units::MeV, "Maximum invariat mass"}; + Allen::Property m_minMass {this, "minMass", (1115.7f - 30.f) * Allen::Units::MeV, "Minimum invariant mass"}; + Allen::Property m_maxMass {this, "maxMass", (1115.7f + 30.f) * Allen::Units::MeV, "Maximum invariat mass"}; Allen::Property m_mva_l0_threshold {this, "mva_l0_threshold", 0.5f, "MVA threshold for Lambda selection"}; Allen::Property m_mva_detached_l0_threshold {this, "mva_detached_l0_threshold", diff --git a/device/selections/lines/downstream/include/DownstreamTwoTrackKsLine.cuh b/device/selections/lines/downstream/include/DownstreamTwoTrackKsLine.cuh index 10fcae59b0e..c07ef9a1152 100644 --- a/device/selections/lines/downstream/include/DownstreamTwoTrackKsLine.cuh +++ b/device/selections/lines/downstream/include/DownstreamTwoTrackKsLine.cuh @@ -142,23 +142,23 @@ namespace downstream_two_track_ks_line { Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 20.f, "maxVertexChi2 description"}; Allen::Property m_minComboPt_Ks {this, "minComboPt_Ks", - 3500.f * Gaudi::Units::MeV, + 3500.f * Allen::Units::MeV, "minComboPt_Ks description"}; Allen::Property m_minEta_Ks {this, "minEta_Ks", 2.f, "minEta_Ks description"}; Allen::Property m_maxEta_Ks {this, "maxEta_Ks", 4.2f, "maxEta_Ks description"}; Allen::Property m_minTrackPt_piKs {this, "minTrackPt_piKs", - 475.f * Gaudi::Units::MeV, + 475.f * Allen::Units::MeV, "minTrackPt_piKs description"}; Allen::Property m_minTrackP_piKs {this, "minTrackP_piKs", - 5000.f * Gaudi::Units::MeV, + 5000.f * Allen::Units::MeV, "minTrackP_piKs description"}; Allen::Property m_minTrackIP_piKs {this, "minTrackIP_piKs", 1.f, "minTrackIP_piKs description"}; - Allen::Property m_minM_Ks {this, "minM_Ks", 400.0f * Gaudi::Units::MeV, "minM_Ks description"}; - Allen::Property m_maxM_Ks {this, "maxM_Ks", 600.0f * Gaudi::Units::MeV, "maxM_Ks description"}; - Allen::Property m_minZ_sv {this, "minZ_sv", 400.f * Gaudi::Units::mm, "minZ_sv description"}; - Allen::Property m_minZ_pv {this, "minZ_pv", -330.f * Gaudi::Units::mm, "minZ_pv description"}; + Allen::Property m_minM_Ks {this, "minM_Ks", 400.0f * Allen::Units::MeV, "minM_Ks description"}; + Allen::Property m_maxM_Ks {this, "maxM_Ks", 600.0f * Allen::Units::MeV, "maxM_Ks description"}; + Allen::Property m_minZ_sv {this, "minZ_sv", 400.f * Allen::Units::mm, "minZ_sv description"}; + Allen::Property m_minZ_pv {this, "minZ_pv", -330.f * Allen::Units::mm, "minZ_pv description"}; Allen::Property m_opposite_sign {this, "OppositeSign", true, "Selects opposite sign dibody combinations"}; Allen::Monitoring::Histogram<> m_histogram_ks_mass {this, "ks_mass", "m(ks)", {100u, 400.f, 600.f}}; diff --git a/device/selections/lines/electron/include/DisplacedDielectronLine.cuh b/device/selections/lines/electron/include/DisplacedDielectronLine.cuh index 241e41fc9b7..a8ba90caf52 100644 --- a/device/selections/lines/electron/include/DisplacedDielectronLine.cuh +++ b/device/selections/lines/electron/include/DisplacedDielectronLine.cuh @@ -77,7 +77,7 @@ namespace displaced_dielectron_line { Allen::Property m_MaxDOCA {this, "MaxDOCA", 0.082f, "Max DOCA"}; Allen::Property m_MinPT {this, "MinPT", 500.f, "Min PT"}; Allen::Property m_MaxVtxChi2 {this, "MaxVtxChi2", 7.4f, "Max vertex chi2"}; - Allen::Property m_MinZ {this, "MinZ", -330.f * Gaudi::Units::mm, "Min z dielectron coordinate"}; + Allen::Property m_MinZ {this, "MinZ", -330.f * Allen::Units::mm, "Min z dielectron coordinate"}; Allen::Property m_opposite_sign {this, "OppositeSign", true, "Selects opposite sign dielectron combinations"}; Allen::Property m_minElectronNN {this, "minElectronNN", 0.1, "min NN evaluation"}; Allen::Property m_useNN {this, "useNN", true, "useNN"}; diff --git a/device/selections/lines/electron/include/DisplacedLeptonsLine.cuh b/device/selections/lines/electron/include/DisplacedLeptonsLine.cuh index ad6955abc05..231d922d56c 100644 --- a/device/selections/lines/electron/include/DisplacedLeptonsLine.cuh +++ b/device/selections/lines/electron/include/DisplacedLeptonsLine.cuh @@ -56,7 +56,7 @@ namespace displaced_leptons_line { Allen::Property m_min_pt {this, "min_pt", 1000.f, "Minimum pt"}; Allen::Property m_minBPVz {this, "min_BPVz", - -330.f * Gaudi::Units::mm, + -330.f * Allen::Units::mm, "Minimum z for the associated best primary vertex"}; }; } // namespace displaced_leptons_line diff --git a/device/selections/lines/electron/include/HighMassDielectronLine.cuh b/device/selections/lines/electron/include/HighMassDielectronLine.cuh index e042c40654a..a637f6bf269 100644 --- a/device/selections/lines/electron/include/HighMassDielectronLine.cuh +++ b/device/selections/lines/electron/include/HighMassDielectronLine.cuh @@ -106,14 +106,14 @@ namespace highmass_dielectron_line { // Low-mass no-IP dielectron selections. Allen::Property m_minTrackP {this, "minTrackP", - 14.f * Gaudi::Units::GeV, + 14.f * Allen::Units::GeV, "Minimal momentum for both daughters "}; - Allen::Property m_minTrackPt {this, "minTrackPt", 1.5f * Gaudi::Units::GeV, "Minimal pT for both daughters"}; + Allen::Property m_minTrackPt {this, "minTrackPt", 1.5f * Allen::Units::GeV, "Minimal pT for both daughters"}; Allen::Property m_maxTrackEta {this, "maxTrackEta", 5.0, "Maximal ETA for both daughters"}; - Allen::Property m_minMass {this, "minMass", 8.0f * Gaudi::Units::GeV, "Min mass of the composite"}; - Allen::Property m_maxMass {this, "maxMass", 140.f * Gaudi::Units::GeV, "Max mass of the composite"}; - Allen::Property m_maxDoca {this, "maxDoca", .2f * Gaudi::Units::mm, "maxDoca description"}; - Allen::Property m_MinZ {this, "MinZ", -330.f * Gaudi::Units::mm, "Min z dielectron coordinate"}; + Allen::Property m_minMass {this, "minMass", 8.0f * Allen::Units::GeV, "Min mass of the composite"}; + Allen::Property m_maxMass {this, "maxMass", 140.f * Allen::Units::GeV, "Max mass of the composite"}; + Allen::Property m_maxDoca {this, "maxDoca", .2f * Allen::Units::mm, "maxDoca description"}; + Allen::Property m_MinZ {this, "MinZ", -330.f * Allen::Units::mm, "Min z dielectron coordinate"}; Allen::Property m_only_select_opposite_sign {this, "OppositeSign", true, diff --git a/device/selections/lines/electron/include/LowMassDielectronLine.cuh b/device/selections/lines/electron/include/LowMassDielectronLine.cuh index 2f31c643de0..1e37c9eed36 100644 --- a/device/selections/lines/electron/include/LowMassDielectronLine.cuh +++ b/device/selections/lines/electron/include/LowMassDielectronLine.cuh @@ -110,7 +110,7 @@ namespace lowmass_dielectron_line { Allen::Property m_minMass {this, "MinMass", 5.f, "Min vertex mass"}; Allen::Property m_maxMass {this, "MaxMass", 300.f, "Max vertex mass"}; Allen::Property m_ss_on {this, "ss_on", false, "Flag when same-sign candidates should be selected"}; - Allen::Property m_minZ {this, "MinZ", -330.f * Gaudi::Units::mm, "Min z dielectron coordinate"}; + Allen::Property m_minZ {this, "MinZ", -330.f * Allen::Units::mm, "Min z dielectron coordinate"}; Allen::Property m_trackIPChi2Threshold { this, "TrackIPChi2Threshold", diff --git a/device/selections/lines/electron/include/SingleHighPtElectronLine.cuh b/device/selections/lines/electron/include/SingleHighPtElectronLine.cuh index bb49da2ae24..0ae967e9ebb 100644 --- a/device/selections/lines/electron/include/SingleHighPtElectronLine.cuh +++ b/device/selections/lines/electron/include/SingleHighPtElectronLine.cuh @@ -61,7 +61,7 @@ namespace single_high_pt_electron_line { private: Allen::Property m_maxChi2Ndof {this, "maxChi2Ndof", 100.f, "maxChi2Ndof description"}; - Allen::Property m_singleMinPt {this, "singleMinPt", 6000.f / Gaudi::Units::MeV, "singleMinPt description"}; - Allen::Property m_minZ {this, "MinZ", -330.f * Gaudi::Units::mm, "Minimum track state z"}; + Allen::Property m_singleMinPt {this, "singleMinPt", 6000.f / Allen::Units::MeV, "singleMinPt description"}; + Allen::Property m_minZ {this, "MinZ", -330.f * Allen::Units::mm, "Minimum track state z"}; }; } // namespace single_high_pt_electron_line diff --git a/device/selections/lines/electron/include/TrackElectronMVALine.cuh b/device/selections/lines/electron/include/TrackElectronMVALine.cuh index e742dd1a5a2..006bff7cc88 100644 --- a/device/selections/lines/electron/include/TrackElectronMVALine.cuh +++ b/device/selections/lines/electron/include/TrackElectronMVALine.cuh @@ -75,16 +75,16 @@ namespace track_electron_mva_line { private: Allen::Property m_maxChi2Ndof {this, "maxChi2Ndof", 2.5f, "maxChi2Ndof description"}; - Allen::Property m_minPt {this, "minPt", 1.f * Gaudi::Units::GeV, "minPt description"}; - Allen::Property m_maxPt {this, "maxPt", 26.f * Gaudi::Units::GeV, "maxPt description"}; + Allen::Property m_minPt {this, "minPt", 1.f * Allen::Units::GeV, "minPt description"}; + Allen::Property m_maxPt {this, "maxPt", 26.f * Allen::Units::GeV, "maxPt description"}; Allen::Property m_minIPChi2 {this, "minIPChi2", 3.f, "minIPChi2 description"}; - Allen::Property m_param1 {this, "param1", 1.f * Gaudi::Units::GeV* Gaudi::Units::GeV, "param1 description"}; - Allen::Property m_param2 {this, "param2", 1.f * Gaudi::Units::GeV, "param2 description"}; + Allen::Property m_param1 {this, "param1", 1.f * Allen::Units::GeV* Allen::Units::GeV, "param1 description"}; + Allen::Property m_param2 {this, "param2", 1.f * Allen::Units::GeV, "param2 description"}; Allen::Property m_param3 {this, "param3", 1.248f, "param3 description"}; Allen::Property m_alpha {this, "alpha", 0.f, "alpha description"}; Allen::Property m_minBPVz {this, "min_BPVz", - -330.f * Gaudi::Units::mm, + -330.f * Allen::Units::mm, "Minimum z for the associated best primary vertex"}; Allen::Property m_minElectronNN {this, "minElectronNN", 0.1, "min NN evaluation"}; Allen::Property m_useNN {this, "useNN", true, "useNN"}; diff --git a/device/selections/lines/exclusive_strange/include/Kplus2ThreeTracksLine.cuh b/device/selections/lines/exclusive_strange/include/Kplus2ThreeTracksLine.cuh index 97b22b1ec0c..a5699f2d6b0 100644 --- a/device/selections/lines/exclusive_strange/include/Kplus2ThreeTracksLine.cuh +++ b/device/selections/lines/exclusive_strange/include/Kplus2ThreeTracksLine.cuh @@ -94,24 +94,24 @@ namespace kplus_to_three_tracks_line { using monitoring_types = std::tuple; private: - Allen::Property m_minComboPt {this, "minComboPt", 100.0f * Gaudi::Units::MeV, "Minimum combination pt"}; + Allen::Property m_minComboPt {this, "minComboPt", 100.0f * Allen::Units::MeV, "Minimum combination pt"}; Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 20.f, "Maximum vertex chi2"}; - Allen::Property m_maxDOCA {this, "maxDOCA", 0.2f * Gaudi::Units::mm, "Maximum DOCA"}; + Allen::Property m_maxDOCA {this, "maxDOCA", 0.2f * Allen::Units::mm, "Maximum DOCA"}; Allen::Property m_minEta {this, "minEta", 2.0f, "Minimum PV-SV eta"}; Allen::Property m_maxEta {this, "maxEta", 5.0f, "Maximum PV-SV eta"}; - Allen::Property m_minTrackPt {this, "minTrackPt", 100.f * Gaudi::Units::MeV, "Minimum track pt"}; - Allen::Property m_minTrackP {this, "minTrackP", 100.f * Gaudi::Units::MeV, "Minimum track P"}; - Allen::Property m_massWindow_min {this, "massWindow_min", 200.f * Gaudi::Units::MeV, "Low mass window"}; - Allen::Property m_massWindow_max {this, "massWindow_max", 200.f * Gaudi::Units::MeV, "Upper mass window"}; - Allen::Property m_minTrackIP {this, "minTrackIP", 0.5f * Gaudi::Units::mm, "Minimum track IP"}; - Allen::Property m_minZ {this, "minZ", -341.f * Gaudi::Units::mm, "Minimum z of vertex"}; + Allen::Property m_minTrackPt {this, "minTrackPt", 100.f * Allen::Units::MeV, "Minimum track pt"}; + Allen::Property m_minTrackP {this, "minTrackP", 100.f * Allen::Units::MeV, "Minimum track P"}; + Allen::Property m_massWindow_min {this, "massWindow_min", 200.f * Allen::Units::MeV, "Low mass window"}; + Allen::Property m_massWindow_max {this, "massWindow_max", 200.f * Allen::Units::MeV, "Upper mass window"}; + Allen::Property m_minTrackIP {this, "minTrackIP", 0.5f * Allen::Units::mm, "Minimum track IP"}; + Allen::Property m_minZ {this, "minZ", -341.f * Allen::Units::mm, "Minimum z of vertex"}; Allen::Property m_minPairMass {this, "minPairMass", - 0.f * Gaudi::Units::MeV, + 0.f * Allen::Units::MeV, "Minimum mass of the two-track pair"}; Allen::Property m_maxPairMass {this, "maxPairMass", - 1000.f * Gaudi::Units::MeV, + 1000.f * Allen::Units::MeV, "Maximum mass of the two-track pair"}; Allen::Property m_is_dimuon {this, "is_dimuon", false, "Require dimuon"}; Allen::Property m_is_dielectron {this, "is_dielectron", false, "Require dielectron"}; @@ -120,7 +120,7 @@ namespace kplus_to_three_tracks_line { Allen::Property m_mass_seed_track_two {this, "mass_seed_track_two", Allen::mPi, "Mass of child 2"}; Allen::Property m_minFlightDistance {this, "minFlightDistance", - Gaudi::Units::mm, + Allen::Units::mm, "Mininum Flight Distance of mother"}; Allen::Monitoring::Histogram<> m_histogramTwoBodySeedMass {this, "two_body_seed_mass", diff --git a/device/selections/lines/exclusive_strange/src/Kplus2ThreeTracksLine.cu b/device/selections/lines/exclusive_strange/src/Kplus2ThreeTracksLine.cu index 56abef0e154..7ffd4c1f03d 100644 --- a/device/selections/lines/exclusive_strange/src/Kplus2ThreeTracksLine.cu +++ b/device/selections/lines/exclusive_strange/src/Kplus2ThreeTracksLine.cu @@ -26,8 +26,8 @@ __device__ bool kplus_to_three_tracks_line::kplus_to_three_tracks_line_t::select const auto c2_state = c2->state(); // Calculate c1 + c2 invariant mass - const float e_pair = c1_state.e(properties.mass_seed_track_one * Gaudi::Units::MeV) + - c2_state.e(properties.mass_seed_track_two * Gaudi::Units::MeV); + const float e_pair = c1_state.e(properties.mass_seed_track_one * Allen::Units::MeV) + + c2_state.e(properties.mass_seed_track_two * Allen::Units::MeV); const float p2_pair = (c1_state.px() + c2_state.px()) * (c1_state.px() + c2_state.px()) + (c1_state.py() + c2_state.py()) * (c1_state.py() + c2_state.py()) + (c1_state.pz() + c2_state.pz()) * (c1_state.pz() + c2_state.pz()); @@ -36,9 +36,9 @@ __device__ bool kplus_to_three_tracks_line::kplus_to_three_tracks_line_t::select // Calculate the combination invariant mass const auto piplus_state = piplus->state(); const float p2_kplus = particle.vertex().p2(); - const float e_kplus = piplus_state.e(properties.mass_companion * Gaudi::Units::MeV) + - c1_state.e(properties.mass_seed_track_one * Gaudi::Units::MeV) + - c2_state.e(properties.mass_seed_track_two * Gaudi::Units::MeV); + const float e_kplus = piplus_state.e(properties.mass_companion * Allen::Units::MeV) + + c1_state.e(properties.mass_seed_track_one * Allen::Units::MeV) + + c2_state.e(properties.mass_seed_track_two * Allen::Units::MeV); const float m_kplus = sqrtf(e_kplus * e_kplus - p2_kplus); if (properties.is_dimuon) { diff --git a/device/selections/lines/inclusive_hadron/include/ConeJetLine.cuh b/device/selections/lines/inclusive_hadron/include/ConeJetLine.cuh index dab2bc73742..4992ff1b01f 100644 --- a/device/selections/lines/inclusive_hadron/include/ConeJetLine.cuh +++ b/device/selections/lines/inclusive_hadron/include/ConeJetLine.cuh @@ -65,8 +65,8 @@ namespace cone_jet_line { using monitoring_types = std::tuple; private: - Allen::Property m_min_jet_pt {this, "min_jet_pt", 15.f * Gaudi::Units::GeV, "Minimum jet pT"}; - Allen::Property m_max_jet_pt {this, "max_jet_pt", 1000.f * Gaudi::Units::GeV, "Maximum jet pT"}; + Allen::Property m_min_jet_pt {this, "min_jet_pt", 15.f * Allen::Units::GeV, "Minimum jet pT"}; + Allen::Property m_max_jet_pt {this, "max_jet_pt", 1000.f * Allen::Units::GeV, "Maximum jet pT"}; }; -} // namespace cone_jet_line \ No newline at end of file +} // namespace cone_jet_line diff --git a/device/selections/lines/inclusive_hadron/include/DiProtonHighMassLine.cuh b/device/selections/lines/inclusive_hadron/include/DiProtonHighMassLine.cuh index 531947031ce..d0367d7ed44 100644 --- a/device/selections/lines/inclusive_hadron/include/DiProtonHighMassLine.cuh +++ b/device/selections/lines/inclusive_hadron/include/DiProtonHighMassLine.cuh @@ -89,13 +89,13 @@ namespace diproton_highmass_line { bool sel); private: - Allen::Property m_minPT_p {this, "minPT_p", 5000.f * Gaudi::Units::MeV, "Minimum proton PT"}; - Allen::Property m_minP_p {this, "minP_p", 25000.f * Gaudi::Units::MeV, "Minimum proton P"}; - Allen::Property m_minPT_pp {this, "minPT_pp", 6000.f * Gaudi::Units::MeV, "Minimum DiProton PT"}; - Allen::Property m_minP_pp {this, "minP_pp", 60000.f * Gaudi::Units::MeV, "Minimum DiProton P"}; + Allen::Property m_minPT_p {this, "minPT_p", 5000.f * Allen::Units::MeV, "Minimum proton PT"}; + Allen::Property m_minP_p {this, "minP_p", 25000.f * Allen::Units::MeV, "Minimum proton P"}; + Allen::Property m_minPT_pp {this, "minPT_pp", 6000.f * Allen::Units::MeV, "Minimum DiProton PT"}; + Allen::Property m_minP_pp {this, "minP_pp", 60000.f * Allen::Units::MeV, "Minimum DiProton P"}; Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 16.0f, "Maximum vertex Chi2"}; - Allen::Property m_minMass {this, "minMass", 8500.f * Gaudi::Units::MeV, "Minimum invariant mass"}; - Allen::Property m_maxMass {this, "maxMass", 12500.f * Gaudi::Units::MeV, "Maximum invariat mass"}; + Allen::Property m_minMass {this, "minMass", 8500.f * Allen::Units::MeV, "Minimum invariant mass"}; + Allen::Property m_maxMass {this, "maxMass", 12500.f * Allen::Units::MeV, "Maximum invariat mass"}; Allen::Property m_maxPtAsym {this, "maxPtAsym", 0.7f, "Maximum PT asymmetry daughters w.r.t. the mother"}; Allen::Property m_opposite_sign {this, "OppositeSign", true, "Selects opposite sign proton combinations"}; Allen::Property m_maxGhostProb {this, "maxGhostProb", 0.5, "Maximum ghost probability of the tracks"}; diff --git a/device/selections/lines/inclusive_hadron/include/KsToPiPiLine.cuh b/device/selections/lines/inclusive_hadron/include/KsToPiPiLine.cuh index 052169258f6..9c234b81f7d 100644 --- a/device/selections/lines/inclusive_hadron/include/KsToPiPiLine.cuh +++ b/device/selections/lines/inclusive_hadron/include/KsToPiPiLine.cuh @@ -78,10 +78,10 @@ namespace kstopipi_line { private: Allen::Property m_minIPChi2 {this, "minIPChi2", 100.f, "Minimum IPCHI2"}; Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 10.0f, "Maximum vertex Chi2"}; - Allen::Property m_maxIP {this, "maxIP", 0.3f * Gaudi::Units::mm, "Maximum IP"}; - Allen::Property m_minMass {this, "minMass", 400.f * Gaudi::Units::MeV, "Minimum invariant mass"}; - Allen::Property m_maxMass {this, "maxMass", 600.f * Gaudi::Units::MeV, "Maximum invariat mass"}; - Allen::Property m_minZ {this, "minZ", -330.f * Gaudi::Units::mm, "minimum vertex z coordinate"}; + Allen::Property m_maxIP {this, "maxIP", 0.3f * Allen::Units::mm, "Maximum IP"}; + Allen::Property m_minMass {this, "minMass", 400.f * Allen::Units::MeV, "Minimum invariant mass"}; + Allen::Property m_maxMass {this, "maxMass", 600.f * Allen::Units::MeV, "Maximum invariat mass"}; + Allen::Property m_minZ {this, "minZ", -330.f * Allen::Units::mm, "minimum vertex z coordinate"}; Allen::Property m_opposite_sign {this, "OppositeSign", true, "Selects opposite sign dimuon combinations"}; Allen::Property m_double_muon_misid {this, "double_muon_misid", false, "Selects dimuon combinations"}; diff --git a/device/selections/lines/inclusive_hadron/include/Lambda2PPiLine.cuh b/device/selections/lines/inclusive_hadron/include/Lambda2PPiLine.cuh index d4699d998db..2ce14b3b8d8 100644 --- a/device/selections/lines/inclusive_hadron/include/Lambda2PPiLine.cuh +++ b/device/selections/lines/inclusive_hadron/include/Lambda2PPiLine.cuh @@ -135,21 +135,21 @@ namespace lambda2ppi_line { private: Allen::Property m_L_p_MIPCHI2_min {this, "L_p_MIPCHI2_min", 12.f, "proton min ip chi^2 for Lambda LL"}; Allen::Property m_L_pi_MIPCHI2_min {this, "L_pi_MIPCHI2_min", 32.f, "pion min ip chi^2 for Lambda LL"}; - Allen::Property m_L_p_MIP_min {this, "L_p_MIP_min", 80.f * Gaudi::Units::um, "proton min ip for Lambda LL"}; - Allen::Property m_L_pi_MIP_min {this, "L_pi_MIP_min", 200.f * Gaudi::Units::um, "pion min ip for Lambda LL"}; - Allen::Property m_L_p_PT_min {this, "L_p_PT_min", 450.f * Gaudi::Units::MeV, "proton min pT for Lambda LL"}; - Allen::Property m_L_pi_PT_min {this, "L_pi_PT_min", 80.f * Gaudi::Units::MeV, "pion min pT for Lambda LL"}; - Allen::Property m_L_DOCA_max {this, "L_DOCA_max", 500.f * Gaudi::Units::um, "max p, pi DOCA for Lambda LL"}; - Allen::Property m_L_PT_min {this, "L_PT_min", 500.f * Gaudi::Units::MeV, "min pT of Lambda LL"}; - Allen::Property m_L_M_max {this, "L_M_max", 1140.f * Gaudi::Units::MeV, "max mass for Lambda LL"}; + Allen::Property m_L_p_MIP_min {this, "L_p_MIP_min", 80.f * Allen::Units::um, "proton min ip for Lambda LL"}; + Allen::Property m_L_pi_MIP_min {this, "L_pi_MIP_min", 200.f * Allen::Units::um, "pion min ip for Lambda LL"}; + Allen::Property m_L_p_PT_min {this, "L_p_PT_min", 450.f * Allen::Units::MeV, "proton min pT for Lambda LL"}; + Allen::Property m_L_pi_PT_min {this, "L_pi_PT_min", 80.f * Allen::Units::MeV, "pion min pT for Lambda LL"}; + Allen::Property m_L_DOCA_max {this, "L_DOCA_max", 500.f * Allen::Units::um, "max p, pi DOCA for Lambda LL"}; + Allen::Property m_L_PT_min {this, "L_PT_min", 500.f * Allen::Units::MeV, "min pT of Lambda LL"}; + Allen::Property m_L_M_max {this, "L_M_max", 1140.f * Allen::Units::MeV, "max mass for Lambda LL"}; Allen::Property m_L_VCHI2_max {this, "L_VCHI2_max", 16.f, "max p pi vertex chi2"}; Allen::Property m_L_VZ_min {this, "L_VZ_min", - -80.f * Gaudi::Units::mm, + -80.f * Allen::Units::mm, "min vertex z position of Lambda candidate"}; Allen::Property m_L_VZ_max {this, "L_VZ_max", - 650.f * Gaudi::Units::mm, + 650.f * Allen::Units::mm, "max vertex z position of Lambda candidate"}; Allen::Property m_L_BPVVDCHI2_min {this, "L_BPVVDCHI2_min", @@ -157,18 +157,18 @@ namespace lambda2ppi_line { "min flight distance chi2 between p pi vertex and its best PV"}; Allen::Property m_L_BPVVDZ_min {this, "L_BPVVDZ_min", - 12.f * Gaudi::Units::mm, + 12.f * Allen::Units::mm, "min distance (in z) between Lambda vertex and best PV"}; Allen::Property m_L_BPVVDRHO_min {this, "L_BPVVDRHO_min", - 2.f * Gaudi::Units::mm, + 2.f * Allen::Units::mm, "min squared radial vertex distance of Lambda w.r.t. its best PV"}; Allen::Property m_L_BPVDIRA_min {this, "L_BPVDIRA_min", 0.9997, "min cosine of direction angle of Lambda w.r.t. its best PV"}; - Allen::Property m_minPVZ {this, "minPVZ", -200.f * Gaudi::Units::mm, "minimum PV z coordinate"}; - Allen::Property m_maxPVZ {this, "maxPVZ", 200.f * Gaudi::Units::mm, "maximum PV z coordinate"}; + Allen::Property m_minPVZ {this, "minPVZ", -200.f * Allen::Units::mm, "minimum PV z coordinate"}; + Allen::Property m_maxPVZ {this, "maxPVZ", 200.f * Allen::Units::mm, "maximum PV z coordinate"}; Allen::Monitoring::Histogram<> m_histogram_lz_mass {this, "lz_mass", "mass", {100u, 1000.f, 1200.f}}; Allen::Monitoring::Histogram<> m_histogram_lz_pt {this, "lz_pt", "pT (lz)", {100u, 0.f, 1e4f}}; diff --git a/device/selections/lines/inclusive_hadron/include/LambdaLLDetachedTrackLine.cuh b/device/selections/lines/inclusive_hadron/include/LambdaLLDetachedTrackLine.cuh index 4a96388d30a..0b5e9f3f4b6 100644 --- a/device/selections/lines/inclusive_hadron/include/LambdaLLDetachedTrackLine.cuh +++ b/device/selections/lines/inclusive_hadron/include/LambdaLLDetachedTrackLine.cuh @@ -162,47 +162,47 @@ namespace lambda_ll_detached_track_line { runNo_t>; private: - Allen::Property m_pi_PT_min {this, "pi_PT_min", 130.f * Gaudi::Units::MeV, "pT of pion candidate"}; - Allen::Property m_p_PT_min {this, "p_PT_min", 1200.f * Gaudi::Units::MeV, "pT of proton candidate"}; + Allen::Property m_pi_PT_min {this, "pi_PT_min", 130.f * Allen::Units::MeV, "pT of pion candidate"}; + Allen::Property m_p_PT_min {this, "p_PT_min", 1200.f * Allen::Units::MeV, "pT of proton candidate"}; Allen::Property m_pi_MIPCHI2_min {this, "pi_MIPCHI2_min", 64.f, "min IP chi2 of pion candidate"}; Allen::Property m_p_MIPCHI2_min {this, "p_MIPCHI2_min", 12.f, "min IP chi2 of proton candidate"}; - Allen::Property m_L_PT_min {this, "L_PT_min", 1400.f * Gaudi::Units::MeV, "pT of Lambda candidate"}; - Allen::Property m_L_DOCA_max {this, "L_DOCA_max", 100.f * Gaudi::Units::um, "DOCA of proton and pion"}; + Allen::Property m_L_PT_min {this, "L_PT_min", 1400.f * Allen::Units::MeV, "pT of Lambda candidate"}; + Allen::Property m_L_DOCA_max {this, "L_DOCA_max", 100.f * Allen::Units::um, "DOCA of proton and pion"}; Allen::Property m_L_VCHI2_max {this, "L_VCHI2_max", 16.f, "Lambda vertex chi2"}; Allen::Property m_L_BPVFDCHI2_min {this, "L_BPVFDCHI2_min", 240.f, "flight distance chi2 of Lambda candidate"}; - Allen::Property m_L_M_min {this, "L_M_min", 1090.f * Gaudi::Units::MeV, "min mass of Lambda candidate"}; - Allen::Property m_L_M_max {this, "L_M_max", 1140.f * Gaudi::Units::MeV, "max mass of Lambda candidate"}; + Allen::Property m_L_M_min {this, "L_M_min", 1090.f * Allen::Units::MeV, "min mass of Lambda candidate"}; + Allen::Property m_L_M_max {this, "L_M_max", 1140.f * Allen::Units::MeV, "max mass of Lambda candidate"}; Allen::Property m_t_MIPCHI2_min {this, "t_MIPCHI2_min", 12.f, "min companion track IP chi2"}; - Allen::Property m_t_PT_min {this, "t_PT_min", 700.f * Gaudi::Units::MeV, "min companion track PT"}; - Allen::Property m_VZ_min {this, "VZ_min", -200.f * Gaudi::Units::mm, "min vertex z position"}; - Allen::Property m_VZ_max {this, "VZ_max", 250.f * Gaudi::Units::mm, "max vertex z position"}; + Allen::Property m_t_PT_min {this, "t_PT_min", 700.f * Allen::Units::MeV, "min companion track PT"}; + Allen::Property m_VZ_min {this, "VZ_min", -200.f * Allen::Units::mm, "min vertex z position"}; + Allen::Property m_VZ_max {this, "VZ_max", 250.f * Allen::Units::mm, "max vertex z position"}; Allen::Property m_M_max {this, "M_max", - 3.6f * Gaudi::Units::GeV, + 3.6f * Allen::Units::GeV, "max mass given pion mass hypothesis for companion track"}; - Allen::Property m_BPVVDZ_min {this, "BPVVDZ_min", 1.5f * Gaudi::Units::mm, "min distance (in z) to best PV"}; + Allen::Property m_BPVVDZ_min {this, "BPVVDZ_min", 1.5f * Allen::Units::mm, "min distance (in z) to best PV"}; Allen::Property m_BPVVDRHO_min {this, "BPVVDRHO_min", - 120.f * Gaudi::Units::um, + 120.f * Allen::Units::um, "min distance (in z) to best PV"}; Allen::Property m_LVDZ_min {this, "LVDZ_min", - 8.f * Gaudi::Units::mm, + 8.f * Allen::Units::mm, "min distance (in z) to Lambda vertex"}; - Allen::Property m_SUMPT_min {this, "SUMPT_min", 2.8f * Gaudi::Units::GeV, "sum of Lambda and track pT"}; + Allen::Property m_SUMPT_min {this, "SUMPT_min", 2.8f * Allen::Units::GeV, "sum of Lambda and track pT"}; Allen::Monitoring::Histogram<> m_histogram_Lambda_mass { this, "Lambda_mass_LambdaLLDetachedTrack", "m(p#pi^{#minus}) [MeV]", - {100u, 1090.f * Gaudi::Units::MeV, 1140.f * Gaudi::Units::MeV}}; + {100u, 1090.f * Allen::Units::MeV, 1140.f * Allen::Units::MeV}}; Allen::Monitoring::Histogram<> m_histogram_LambdaPi_mass { this, "LambdaTrack_mass", "m(#Lambda#pi^{+}) [MeV]", - {94u, 1.25f * Gaudi::Units::GeV, 3.6f * Gaudi::Units::GeV}}; + {94u, 1.25f * Allen::Units::GeV, 3.6f * Allen::Units::GeV}}; }; } // namespace lambda_ll_detached_track_line diff --git a/device/selections/lines/inclusive_hadron/include/TauToPhiMuLine.cuh b/device/selections/lines/inclusive_hadron/include/TauToPhiMuLine.cuh index 8bd56912ce3..fb3c7d74285 100644 --- a/device/selections/lines/inclusive_hadron/include/TauToPhiMuLine.cuh +++ b/device/selections/lines/inclusive_hadron/include/TauToPhiMuLine.cuh @@ -181,31 +181,31 @@ namespace tautophimu_line { runNo_t>; private: - Allen::Property m_minTrackP {this, "minTrackP", 3.0f * Gaudi::Units::GeV, "Minimum track momentum"}; - Allen::Property m_minTrackPt {this, "minTrackPt", 450.0f * Gaudi::Units::MeV, "Minimum track pT"}; + Allen::Property m_minTrackP {this, "minTrackP", 3.0f * Allen::Units::GeV, "Minimum track momentum"}; + Allen::Property m_minTrackPt {this, "minTrackPt", 450.0f * Allen::Units::MeV, "Minimum track pT"}; Allen::Property m_minTrackIPChi2 {this, "minTrackIPChi2", 4.0f, "Minimum track IP chi2"}; - Allen::Property m_minTrackIP {this, "minTrackIP", 0.0f * Gaudi::Units::mm, "Minimum track IP"}; + Allen::Property m_minTrackIP {this, "minTrackIP", 0.0f * Allen::Units::mm, "Minimum track IP"}; Allen::Property m_minTrackEta {this, "minTrackEta", 2.0f, "Minimum track eta"}; Allen::Property m_maxTrackEta {this, "maxTrackEta", 5.0f, "Maximum track eta"}; - Allen::Property m_minPhiPt {this, "minPhiPt", 900.0f * Gaudi::Units::MeV, "Minimum phi pT"}; + Allen::Property m_minPhiPt {this, "minPhiPt", 900.0f * Allen::Units::MeV, "Minimum phi pT"}; Allen::Property m_maxPhiVertexChi2 {this, "maxPhiVertexChi2", 10.0f, "Maximum phi vertex chi2"}; - Allen::Property m_maxPhiDOCA {this, "maxPhiDOCA", 0.2f * Gaudi::Units::mm, "Maximum phi DOCA"}; - Allen::Property m_maxDOCA {this, "maxDOCA", 0.2f * Gaudi::Units::mm, "Maximum DOCA btw phi and muon"}; + Allen::Property m_maxPhiDOCA {this, "maxPhiDOCA", 0.2f * Allen::Units::mm, "Maximum phi DOCA"}; + Allen::Property m_maxDOCA {this, "maxDOCA", 0.2f * Allen::Units::mm, "Maximum DOCA btw phi and muon"}; Allen::Property m_minPhiFDChi2 {this, "minPhiFDChi2", 10.0f, "Minimum phi FD chi2"}; - Allen::Property m_PhiMassWindow {this, "PhiMassWindow", 30.0f * Gaudi::Units::MeV, "Phi mass window"}; - Allen::Property m_minSVpt {this, "minSVpt", 2.5f * Gaudi::Units::GeV, "Minimum tau pT"}; - Allen::Property m_minctau {this, "minctau", 0.07f * Gaudi::Units::mm, "Minimum tau ctau"}; - Allen::Property m_maxctau {this, "maxctau", 1.0f * Gaudi::Units::mm, "Maximum tau ctau"}; - Allen::Property m_minZ {this, "minZ", -200.f * Gaudi::Units::mm, "Minimum z"}; - Allen::Property m_minInvMass {this, "minInvMass", 1620.0f * Gaudi::Units::MeV, "Minimum tau invariant mass"}; - Allen::Property m_maxInvMass {this, "maxInvMass", 2050.0f * Gaudi::Units::MeV, "Maximum tau invariant mass"}; + Allen::Property m_PhiMassWindow {this, "PhiMassWindow", 30.0f * Allen::Units::MeV, "Phi mass window"}; + Allen::Property m_minSVpt {this, "minSVpt", 2.5f * Allen::Units::GeV, "Minimum tau pT"}; + Allen::Property m_minctau {this, "minctau", 0.07f * Allen::Units::mm, "Minimum tau ctau"}; + Allen::Property m_maxctau {this, "maxctau", 1.0f * Allen::Units::mm, "Maximum tau ctau"}; + Allen::Property m_minZ {this, "minZ", -200.f * Allen::Units::mm, "Minimum z"}; + Allen::Property m_minInvMass {this, "minInvMass", 1620.0f * Allen::Units::MeV, "Minimum tau invariant mass"}; + Allen::Property m_maxInvMass {this, "maxInvMass", 2050.0f * Allen::Units::MeV, "Maximum tau invariant mass"}; Allen::Property m_minThirdTrackP {this, "minThirdTrackP", - 3.0f * Gaudi::Units::GeV, + 3.0f * Allen::Units::GeV, "Minimum third track momentum"}; Allen::Property m_minThirdTrackPt {this, "minThirdTrackPt", - 350.0f * Gaudi::Units::MeV, + 350.0f * Allen::Units::MeV, "Minimum third track pT"}; Allen::Property m_minThirdTrackIPChi2 {this, "minThirdTrackIPChi2", 9.0f, "Minimum third track IP chi2"}; Allen::Property m_minThirdTrackEta {this, "minThirdTrackEta", 2.0f, "Minimum third track eta"}; @@ -214,4 +214,4 @@ namespace tautophimu_line { Allen::Monitoring::Histogram<> m_histogram_phi_pt {this, "phi_pt", "pT(phi)", {100u, 0.f, 1e4f}}; Allen::Monitoring::Histogram<> m_histogram_phi_m {this, "phi_m", "m(phi)", {84u, 980.f, 1060.f}}; }; -} // namespace tautophimu_line \ No newline at end of file +} // namespace tautophimu_line diff --git a/device/selections/lines/inclusive_hadron/include/TrackMVALine.cuh b/device/selections/lines/inclusive_hadron/include/TrackMVALine.cuh index 322482441a9..7b271e59059 100644 --- a/device/selections/lines/inclusive_hadron/include/TrackMVALine.cuh +++ b/device/selections/lines/inclusive_hadron/include/TrackMVALine.cuh @@ -75,19 +75,19 @@ namespace track_mva_line { private: Allen::Property m_maxChi2Ndof {this, "maxChi2Ndof", 2.5f, "maxChi2Ndof description"}; - Allen::Property m_minPt {this, "minPt", 2.f * Gaudi::Units::GeV, "minPt description"}; - Allen::Property m_maxPt {this, "maxPt", 26.f * Gaudi::Units::GeV, "maxPt description"}; + Allen::Property m_minPt {this, "minPt", 2.f * Allen::Units::GeV, "minPt description"}; + Allen::Property m_maxPt {this, "maxPt", 26.f * Allen::Units::GeV, "maxPt description"}; Allen::Property m_minIPChi2 {this, "minIPChi2", 7.4f, "minIPChi2 description"}; - Allen::Property m_param1 {this, "param1", 1.f * Gaudi::Units::GeV* Gaudi::Units::GeV, "param1 description"}; - Allen::Property m_param2 {this, "param2", 2.f * Gaudi::Units::GeV, "param2 description"}; + Allen::Property m_param1 {this, "param1", 1.f * Allen::Units::GeV* Allen::Units::GeV, "param1 description"}; + Allen::Property m_param2 {this, "param2", 2.f * Allen::Units::GeV, "param2 description"}; Allen::Property m_param3 {this, "param3", 1.248f, "param3 description"}; Allen::Property m_alpha {this, "alpha", - 296.f * Gaudi::Units::MeV, + 296.f * Allen::Units::MeV, "alpha description"}; // tuned to about 330 kHz (modulo GEC) Allen::Property m_minBPVz {this, "minBPVz", - -330.f * Gaudi::Units::mm, + -330.f * Allen::Units::mm, "minimum z for the best associated primary vertex"}; Allen::Property m_maxGhostProb {this, "maxGhostProb", 0.5, "Maximum ghost probability of the tracks"}; diff --git a/device/selections/lines/inclusive_hadron/include/TwoTrackKsLine.cuh b/device/selections/lines/inclusive_hadron/include/TwoTrackKsLine.cuh index 70c6c227e11..27fe2e48374 100644 --- a/device/selections/lines/inclusive_hadron/include/TwoTrackKsLine.cuh +++ b/device/selections/lines/inclusive_hadron/include/TwoTrackKsLine.cuh @@ -80,25 +80,25 @@ namespace two_track_line_ks { Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 20.f, "maxVertexChi2 description"}; Allen::Property m_minComboPt_Ks {this, "minComboPt_Ks", - 2500.f / Gaudi::Units::MeV, + 2500.f / Allen::Units::MeV, "minComboPt Ks description"}; Allen::Property m_minCosDira {this, "minCosDira", 0.99f, "minCosDira description"}; Allen::Property m_minEta_Ks {this, "minEta_Ks", 2.f, "minEta_Ks description"}; Allen::Property m_maxEta_Ks {this, "maxEta_Ks", 4.2f, "maxEta_Ks description"}; Allen::Property m_minTrackPt_piKs {this, "minTrackPt_piKs", - 470.f / Gaudi::Units::MeV, + 470.f / Allen::Units::MeV, "minTrackPt_piKs description"}; Allen::Property m_minTrackP_piKs {this, "minTrackP_piKs", - 5000.f / Gaudi::Units::MeV, + 5000.f / Allen::Units::MeV, "minTrackP_piKs description"}; Allen::Property m_minTrackIPChi2_Ks {this, "minTrackIPChi2_Ks", 50.f, "minTrackIPChi2_Ks description"}; - Allen::Property m_minM_Ks {this, "minM_Ks", 455.0f / Gaudi::Units::MeV, "minM_Ks description"}; - Allen::Property m_maxM_Ks {this, "maxM_Ks", 545.0f / Gaudi::Units::MeV, "maxM_Ks description"}; + Allen::Property m_minM_Ks {this, "minM_Ks", 455.0f / Allen::Units::MeV, "minM_Ks description"}; + Allen::Property m_maxM_Ks {this, "maxM_Ks", 545.0f / Allen::Units::MeV, "maxM_Ks description"}; Allen::Property m_minCosOpening {this, "minCosOpening", 0.99f, "minCosOpening description"}; - Allen::Property m_min_combip {this, "min_combip", 0.72f / Gaudi::Units::mm, "min_combip description"}; - Allen::Property m_minZ {this, "minZ", -330.f * Gaudi::Units::mm, "minimum vertex z coordinate"}; + Allen::Property m_min_combip {this, "min_combip", 0.72f / Allen::Units::mm, "min_combip description"}; + Allen::Property m_minZ {this, "minZ", -330.f * Allen::Units::mm, "minimum vertex z coordinate"}; Allen::Property m_opposite_sign {this, "OppositeSign", true, "Selects opposite sign dimuon combinations"}; }; } // namespace two_track_line_ks diff --git a/device/selections/lines/inclusive_hadron/include/TwoTrackMVALine.cuh b/device/selections/lines/inclusive_hadron/include/TwoTrackMVALine.cuh index 581901a4a26..ef20f462804 100644 --- a/device/selections/lines/inclusive_hadron/include/TwoTrackMVALine.cuh +++ b/device/selections/lines/inclusive_hadron/include/TwoTrackMVALine.cuh @@ -96,8 +96,8 @@ namespace two_track_mva_line { "minMVA", 0.9569f, "Minimum passing MVA response."}; // tuned to about 660 kHz (modulo GEC) - Allen::Property m_minPt {this, "minPt", 200.f * Gaudi::Units::MeV, "Minimum track pT in MeV."}; - Allen::Property m_minSVpt {this, "minSVpt", 1000.f * Gaudi::Units::MeV, "Minimum SV pT in MeV."}; + Allen::Property m_minPt {this, "minPt", 200.f * Allen::Units::MeV, "Minimum track pT in MeV."}; + Allen::Property m_minSVpt {this, "minSVpt", 1000.f * Allen::Units::MeV, "Minimum SV pT in MeV."}; Allen::Property m_minEta {this, "minEta", 2.f, "Minimum PV-SV eta."}; Allen::Property m_maxEta {this, "maxEta", 5.f, "Maximum PV-SV eta."}; Allen::Property m_minMcor {this, "minMcor", 1000.f, "Minimum corrected mass in MeV"}; @@ -108,7 +108,7 @@ namespace two_track_mva_line { "minipchi2", 4.f, "minimum ipchi2 of the tracks"}; // this is probably a noop, but better safe than sorry - Allen::Property m_minZ {this, "minZ", -330.f * Gaudi::Units::mm, "minimum vertex z coordinate"}; + Allen::Property m_minZ {this, "minZ", -330.f * Allen::Units::mm, "minimum vertex z coordinate"}; Allen::Property m_maxGhostProb {this, "maxGhostProb", 0.5, "Maximum ghost probability of the tracks"}; Allen::Monitoring::Histogram<> m_histogram_p0_ghost_prob {this, diff --git a/device/selections/lines/inclusive_hadron/include/XiOmegaLLLLine.cuh b/device/selections/lines/inclusive_hadron/include/XiOmegaLLLLine.cuh index 167ffac7640..88109dda43f 100644 --- a/device/selections/lines/inclusive_hadron/include/XiOmegaLLLLine.cuh +++ b/device/selections/lines/inclusive_hadron/include/XiOmegaLLLLine.cuh @@ -195,62 +195,62 @@ namespace xi_omega_lll_line { runNo_t>; private: - Allen::Property m_L_DOCA_max {this, "L_DOCA_max", 180.f * Gaudi::Units::um, "max p, pi DOCA for Lambda LL"}; + Allen::Property m_L_DOCA_max {this, "L_DOCA_max", 180.f * Allen::Units::um, "max p, pi DOCA for Lambda LL"}; Allen::Property m_L_VCHI2_max {this, "L_VCHI2_max", 24.f, "Lambda vertex chi2"}; - Allen::Property m_L_M_min {this, "L_M_min", 1090.f * Gaudi::Units::MeV, "min mass of Lambda candidate"}; - Allen::Property m_L_M_max {this, "L_M_max", 1140.f * Gaudi::Units::MeV, "max mass of Lambda candidate"}; - Allen::Property m_BPVZ_min {this, "BPVZ_min", -200.f * Gaudi::Units::mm, "min primary vertex z position"}; - Allen::Property m_VZ_min {this, "VZ_min", -200.f * Gaudi::Units::mm, "min vertex z position"}; - Allen::Property m_VZ_max {this, "VZ_max", 640.f * Gaudi::Units::mm, "max vertex z position"}; + Allen::Property m_L_M_min {this, "L_M_min", 1090.f * Allen::Units::MeV, "min mass of Lambda candidate"}; + Allen::Property m_L_M_max {this, "L_M_max", 1140.f * Allen::Units::MeV, "max mass of Lambda candidate"}; + Allen::Property m_BPVZ_min {this, "BPVZ_min", -200.f * Allen::Units::mm, "min primary vertex z position"}; + Allen::Property m_VZ_min {this, "VZ_min", -200.f * Allen::Units::mm, "min vertex z position"}; + Allen::Property m_VZ_max {this, "VZ_max", 640.f * Allen::Units::mm, "max vertex z position"}; Allen::Property m_Xi_M_min {this, "Xi_M_min", - 1292.f * Gaudi::Units::MeV, + 1292.f * Allen::Units::MeV, "min mass given pion mass hypothesis for tertiary track"}; Allen::Property m_Xi_M_max {this, "Xi_M_max", - 1352.f * Gaudi::Units::MeV, + 1352.f * Allen::Units::MeV, "max mass given pion mass hypothesis for tertiary track"}; Allen::Property m_Omega_M_min {this, "Omega_M_min", - 1647.f * Gaudi::Units::MeV, + 1647.f * Allen::Units::MeV, "min mass given kaon mass hypothesis for tertiary track"}; Allen::Property m_Omega_M_max {this, "Omega_M_max", - 1697.f * Gaudi::Units::MeV, + 1697.f * Allen::Units::MeV, "max mass given kaon mass hypothesis for tertiary track"}; - Allen::Property m_t_PT_min {this, "t_PT_min", 280.f * Gaudi::Units::MeV, "min companion track pT"}; + Allen::Property m_t_PT_min {this, "t_PT_min", 280.f * Allen::Units::MeV, "min companion track pT"}; Allen::Property m_t_MIPCHI2_min {this, "t_MIPCHI2_min", 6.f, "min companion track IP chi2"}; Allen::Property m_XimOmmt_M_max {this, "XimOmmt_M_max", - 6.f * Gaudi::Units::GeV, + 6.f * Allen::Units::GeV, "max mass given muon mass hypothesis for companion track"}; Allen::Property m_LVDZ_min {this, "LVDZ_min", - 4.f * Gaudi::Units::mm, + 4.f * Allen::Units::mm, "min distance (in z) of Lambda to Xi/Omega vertex"}; Allen::Property m_XimOmmVDZ_min {this, "XimOmmVDZ_min", - 4.f * Gaudi::Units::mm, + 4.f * Allen::Units::mm, "min distance (in z) of Xi/Omega to charm vertex"}; - Allen::Property m_BPVVDZ_min {this, "BPVVDZ_min", 1.f * Gaudi::Units::mm, "min distance (in z) to best PV"}; + Allen::Property m_BPVVDZ_min {this, "BPVVDZ_min", 1.f * Allen::Units::mm, "min distance (in z) to best PV"}; Allen::Property m_BPVVDRHO_min {this, "BPVVDRHO_min", - 75.f * Gaudi::Units::um, + 75.f * Allen::Units::um, "min radial distance to best PV"}; Allen::Monitoring::Histogram<> m_histogram_Lambda_mass { this, "Lambda_mass_XiOmegaLLL", "m(p#pi^{#minus}) [MeV]", - {100u, 1090.f * Gaudi::Units::MeV, 1140.f * Gaudi::Units::MeV}}; + {100u, 1090.f * Allen::Units::MeV, 1140.f * Allen::Units::MeV}}; Allen::Monitoring::Histogram<> m_histogram_Xi_mass {this, "Xi_mass", "m(#Lambda#pi^{#minus}) [MeV]", - {60u, 1292.f * Gaudi::Units::MeV, 1352.f * Gaudi::Units::MeV}}; + {60u, 1292.f * Allen::Units::MeV, 1352.f * Allen::Units::MeV}}; Allen::Monitoring::Histogram<> m_histogram_Omega_mass { this, "Omega_mass", "m(#LambdaK^{#minus}) [MeV]", - {50u, 1647.f * Gaudi::Units::MeV, 1697.f * Gaudi::Units::MeV}}; + {50u, 1647.f * Allen::Units::MeV, 1697.f * Allen::Units::MeV}}; }; } // namespace xi_omega_lll_line diff --git a/device/selections/lines/monitoring/include/BeamGasLine.cuh b/device/selections/lines/monitoring/include/BeamGasLine.cuh index c9fef44489c..6dac9818fc6 100644 --- a/device/selections/lines/monitoring/include/BeamGasLine.cuh +++ b/device/selections/lines/monitoring/include/BeamGasLine.cuh @@ -66,11 +66,11 @@ namespace beam_gas_line { Allen::Property m_minNHits {this, "minNHits", 12, "min number of hits of velo track"}; Allen::Property m_minZ {this, "minZ", - -550.f * Gaudi::Units::mm, + -550.f * Allen::Units::mm, "min z coordinate for accepted velo track POCA"}; Allen::Property m_maxZ {this, "maxZ", - -300.f * Gaudi::Units::mm, + -300.f * Allen::Units::mm, "max z coordinate for accepted velo track POCA"}; }; } // namespace beam_gas_line diff --git a/device/selections/lines/muon/include/DetJPsiToMuMuTaPLine.cuh b/device/selections/lines/muon/include/DetJPsiToMuMuTaPLine.cuh index 2986e14d4f5..7b2a675da0f 100644 --- a/device/selections/lines/muon/include/DetJPsiToMuMuTaPLine.cuh +++ b/device/selections/lines/muon/include/DetJPsiToMuMuTaPLine.cuh @@ -141,22 +141,22 @@ namespace det_jpsitomumu_tap_line { muprobe_eta_t>; private: - Allen::Property m_JpsiMinPt {this, "JpsiMinPt", 1000.f * Gaudi::Units::MeV, "JpsiMinPt description"}; + Allen::Property m_JpsiMinPt {this, "JpsiMinPt", 1000.f * Allen::Units::MeV, "JpsiMinPt description"}; Allen::Property m_JpsiMaxVChi2 {this, "JpsiMaxVChi2", 15.f, "JpsiMaxVChi2 description"}; - Allen::Property m_JpsiMinMass {this, "JpsiMinMass", 2950.f * Gaudi::Units::MeV, "JpsiMinMass description"}; - Allen::Property m_JpsiMaxMass {this, "JpsiMaxMass", 3250.f * Gaudi::Units::MeV, "JpsiMaxMass description"}; + Allen::Property m_JpsiMinMass {this, "JpsiMinMass", 2950.f * Allen::Units::MeV, "JpsiMinMass description"}; + Allen::Property m_JpsiMaxMass {this, "JpsiMaxMass", 3250.f * Allen::Units::MeV, "JpsiMaxMass description"}; Allen::Property m_JpsiMinZ {this, "JpsiMinZ", - -330.f * Gaudi::Units::mm, + -330.f * Allen::Units::mm, "minimum vertex z dimuon coordinate"}; - Allen::Property m_JpsiMaxDoca {this, "JpsiMaxDoca", 1.f * Gaudi::Units::mm, "JpsiMaxDoca description"}; + Allen::Property m_JpsiMaxDoca {this, "JpsiMaxDoca", 1.f * Allen::Units::mm, "JpsiMaxDoca description"}; Allen::Property m_JpsiMinCosDira {this, "JpsiMinCosDira", 0.99f, "JpsiMinCosDira description"}; Allen::Property m_JpsiMinFDChi2 {this, "JpsiMinFDChi2", 50.f, "JpsiMinFDChi2 description"}; - Allen::Property m_mutagMinP {this, "mutagMinP", 3000.f * Gaudi::Units::MeV, "mutagMinP description"}; - Allen::Property m_mutagMinPt {this, "mutagMinPt", 1200.f * Gaudi::Units::MeV, "mutagMinPt description"}; + Allen::Property m_mutagMinP {this, "mutagMinP", 3000.f * Allen::Units::MeV, "mutagMinP description"}; + Allen::Property m_mutagMinPt {this, "mutagMinPt", 1200.f * Allen::Units::MeV, "mutagMinPt description"}; Allen::Property m_mutagMinIPChi2 {this, "mutagMinIPChi2", 9.f, "mutagMinIPChi2 description"}; Allen::Property m_muprobeMinIPChi2 {this, "muprobeMinIPChi2", 9.f, "muprobeMinIPChi2 description"}; - Allen::Property m_muprobeMinP {this, "muprobeMinP", 3000.f * Gaudi::Units::MeV, "muprobeMinP description"}; + Allen::Property m_muprobeMinP {this, "muprobeMinP", 3000.f * Allen::Units::MeV, "muprobeMinP description"}; Allen::Property m_posTag {this, "posTag", true, "Tags positive charged tracks with isMuon"}; Allen::Monitoring::Histogram<> m_histogram_det_jpsitomumu_tap_mass {this, diff --git a/device/selections/lines/muon/include/DiMuonDrellYanLine.cuh b/device/selections/lines/muon/include/DiMuonDrellYanLine.cuh index 7a4c021e167..8d5e542d95c 100644 --- a/device/selections/lines/muon/include/DiMuonDrellYanLine.cuh +++ b/device/selections/lines/muon/include/DiMuonDrellYanLine.cuh @@ -90,16 +90,16 @@ namespace di_muon_drell_yan_line { private: Allen::Property m_minTrackP {this, "minTrackP", - 15.f * Gaudi::Units::GeV, + 15.f * Allen::Units::GeV, "Minimal momentum for both daughters "}; - Allen::Property m_minTrackPt {this, "minTrackPt", 1.2f * Gaudi::Units::GeV, "Minimal pT for both daughters"}; + Allen::Property m_minTrackPt {this, "minTrackPt", 1.2f * Allen::Units::GeV, "Minimal pT for both daughters"}; Allen::Property m_maxTrackEta {this, "maxTrackEta", 4.9, "Maximal ETA for both daughters"}; - Allen::Property m_minMass {this, "minMass", 5.f * Gaudi::Units::GeV, "Min mass of the composite"}; - Allen::Property m_maxMass {this, "maxMass", 400.f * Gaudi::Units::GeV, "Max mass of the composite"}; - Allen::Property m_maxDoca {this, "maxDoca", .15f * Gaudi::Units::mm, "maxDoca description"}; + Allen::Property m_minMass {this, "minMass", 5.f * Allen::Units::GeV, "Min mass of the composite"}; + Allen::Property m_maxMass {this, "maxMass", 400.f * Allen::Units::GeV, "Max mass of the composite"}; + Allen::Property m_maxDoca {this, "maxDoca", .15f * Allen::Units::mm, "maxDoca description"}; Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 20.f, "maxVertexChi2 description"}; Allen::Property m_opposite_sign {this, "OppositeSign", true, "Selects opposite sign dimuon combinations"}; - Allen::Property m_minZ {this, "minZ", -330.f * Gaudi::Units::mm, "minimum dimuon vertex z coordinate"}; + Allen::Property m_minZ {this, "minZ", -330.f * Allen::Units::mm, "minimum dimuon vertex z coordinate"}; Allen::Property m_maxChi2Muon {this, "maxChi2Muon", 2.2, "maximum muonID chi2corr value"}; Allen::Property m_minMuonNN {this, "minMuonNN", 0.15, "minimum NN evaluation"}; Allen::Property m_useNN {this, "useNN", true, "Use NN instead of Chi2Corr"}; diff --git a/device/selections/lines/muon/include/DiMuonMassLine.cuh b/device/selections/lines/muon/include/DiMuonMassLine.cuh index 3dd212e66a7..c66f833dab8 100644 --- a/device/selections/lines/muon/include/DiMuonMassLine.cuh +++ b/device/selections/lines/muon/include/DiMuonMassLine.cuh @@ -88,17 +88,17 @@ namespace di_muon_mass_line { private: Allen::Property m_minHighMassTrackPt {this, "minHighMassTrackPt", - 300.f / Gaudi::Units::MeV, + 300.f / Allen::Units::MeV, "minHighMassTrackPt description"}; Allen::Property m_minHighMassTrackP {this, "minHighMassTrackP", - 6000.f / Gaudi::Units::MeV, + 6000.f / Allen::Units::MeV, "minHighMassTrackP description"}; - Allen::Property m_minMass {this, "minMass", 2700.f / Gaudi::Units::MeV, "minMass description"}; + Allen::Property m_minMass {this, "minMass", 2700.f / Allen::Units::MeV, "minMass description"}; Allen::Property m_maxDoca {this, "maxDoca", 0.2f, "maxDoca description"}; Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 25.0f, "maxVertexChi2 description"}; Allen::Property m_minIPChi2 {this, "minIPChi2", 0.f, "minIPChi2 description"}; - Allen::Property m_minZ {this, "minZ", -330.f * Gaudi::Units::mm, "minimum vertex z coordinate"}; + Allen::Property m_minZ {this, "minZ", -330.f * Allen::Units::mm, "minimum vertex z coordinate"}; Allen::Property m_maxChi2Muon {this, "maxChi2Muon", 1.8, "maximum Chi2Muon evaluation"}; Allen::Property m_minMuonNN {this, "minMuonNN", 0.1, "min NN evaluation"}; Allen::Property m_opposite_sign {this, "OppositeSign", true, "Selects opposite sign dimuon combinations"}; diff --git a/device/selections/lines/muon/include/DiMuonNoIPLine.cuh b/device/selections/lines/muon/include/DiMuonNoIPLine.cuh index 7bc285f3d3b..dac3bb04a07 100644 --- a/device/selections/lines/muon/include/DiMuonNoIPLine.cuh +++ b/device/selections/lines/muon/include/DiMuonNoIPLine.cuh @@ -106,18 +106,18 @@ namespace di_muon_no_ip_line { private: Allen::Property m_minTrackPtPROD {this, "minTrackPtPROD", - 1.f * Gaudi::Units::GeV* Gaudi::Units::GeV, + 1.f * Allen::Units::GeV* Allen::Units::GeV, "minTrackPtPROD description"}; // run 2 value: 1.*GeV*GeV Allen::Property m_minTrackP {this, "minTrackP", - 5000.f * Gaudi::Units::MeV, + 5000.f * Allen::Units::MeV, "minTrackP description"}; // run 2 value: 10000 Allen::Property m_maxDoca {this, "maxDoca", .3f, "maxDoca description"}; // run 2 value: 0.1 Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 9.f, "maxVertexChi2 description"}; // run 2 value: 9 Allen::Property m_maxTrChi2 {this, "maxTrChi2", 3.f, "maxTrChi2 description"}; // run 2 value: 3 Allen::Property m_ss_on {this, "ss_on", false, "ss_on description"}; - Allen::Property m_minPt {this, "minPt", 1.f * Gaudi::Units::GeV, "minPt description"}; - Allen::Property m_minZ {this, "minZ", -330.f * Gaudi::Units::mm, "minimum vertex z coordinate"}; + Allen::Property m_minPt {this, "minPt", 1.f * Allen::Units::GeV, "minPt description"}; + Allen::Property m_minZ {this, "minZ", -330.f * Allen::Units::mm, "minimum vertex z coordinate"}; Allen::Property m_maxChi2Muon {this, "maxChi2Muon", 1.3f, "maximum Chi2Muon evaluation"}; Allen::Property m_minNN {this, "minNN", 0.74f, "minimum NN evaluation"}; }; diff --git a/device/selections/lines/muon/include/DisplacedDiMuonLine.cuh b/device/selections/lines/muon/include/DisplacedDiMuonLine.cuh index 163602bf068..cd0e9eb3754 100644 --- a/device/selections/lines/muon/include/DisplacedDiMuonLine.cuh +++ b/device/selections/lines/muon/include/DisplacedDiMuonLine.cuh @@ -64,14 +64,14 @@ namespace displaced_di_muon_line { // Dimuon track pt. Allen::Property m_minDispTrackPt {this, "minDispTrackPt", - 500.f / Gaudi::Units::MeV, + 500.f / Allen::Units::MeV, "minDispTrackPt description"}; Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 6.f, "maxVertexChi2 description"}; // Displaced dimuon selections. Allen::Property m_dispMinIPChi2 {this, "dispMinIPChi2", 6.f, "dispMinIPChi2 description"}; Allen::Property m_dispMinEta {this, "dispMinEta", 2.f, "dispMinEta description"}; Allen::Property m_dispMaxEta {this, "dispMaxEta", 5.f, "dispMaxEta description"}; - Allen::Property m_minZ {this, "minZ", -330.f * Gaudi::Units::mm, "minimum vertex z dimuon coordinate"}; + Allen::Property m_minZ {this, "minZ", -330.f * Allen::Units::mm, "minimum vertex z dimuon coordinate"}; Allen::Property m_maxChi2Muon {this, "maxChi2Muon", 1.8, "maximum Chi2Muon evaluation"}; Allen::Monitoring::Histogram<> m_histogram_displaced_dimuon_mass {this, diff --git a/device/selections/lines/muon/include/LowPtDiMuonLine.cuh b/device/selections/lines/muon/include/LowPtDiMuonLine.cuh index 757b0c0be00..4a3ec68d3cf 100644 --- a/device/selections/lines/muon/include/LowPtDiMuonLine.cuh +++ b/device/selections/lines/muon/include/LowPtDiMuonLine.cuh @@ -55,7 +55,7 @@ namespace low_pt_di_muon_line { Allen::Property m_maxDOCA {this, "maxDOCA", 0.2f, "maxDOCA description"}; Allen::Property m_maxVertexChi2 {this, "maxVertexChi2", 25.f, "maxVertexChi2 description"}; Allen::Property m_minMass {this, "minMass", 220.f, "minMass description"}; - Allen::Property m_minZ {this, "minZ", -330.f * Gaudi::Units::mm, "minimum vertex z coordinate"}; + Allen::Property m_minZ {this, "minZ", -330.f * Allen::Units::mm, "minimum vertex z coordinate"}; Allen::Property m_opposite_sign {this, "OppositeSign", true, "Selects opposite sign dimuon combinations"}; }; } // namespace low_pt_di_muon_line diff --git a/device/selections/lines/muon/include/LowPtMuonLine.cuh b/device/selections/lines/muon/include/LowPtMuonLine.cuh index 7d6c4e753fb..46a3d3f16d7 100644 --- a/device/selections/lines/muon/include/LowPtMuonLine.cuh +++ b/device/selections/lines/muon/include/LowPtMuonLine.cuh @@ -43,12 +43,12 @@ namespace low_pt_muon_line { private: Allen::Property m_maxChi2Ndof {this, "maxChi2Ndof", 100.f, "maxChi2Ndof description"}; // NB: This pt cut is looser than default tracking threshold. - Allen::Property m_minPt {this, "minPt", 80.0f * Gaudi::Units::MeV, "minPt description"}; + Allen::Property m_minPt {this, "minPt", 80.0f * Allen::Units::MeV, "minPt description"}; Allen::Property m_minIP {this, "minIP", 4.f, "minIP description"}; Allen::Property m_minIPChi2 {this, "minIPChi2", 7.4f, "minIPChi2 description"}; Allen::Property m_minBPVz {this, "minBPVz", - -330.f * Gaudi::Units::mm, + -330.f * Allen::Units::mm, "minimum z for the best primary vertex associated to the muon"}; }; } // namespace low_pt_muon_line diff --git a/device/selections/lines/muon/include/SingleHighPtMuonLine.cuh b/device/selections/lines/muon/include/SingleHighPtMuonLine.cuh index a207f4d13ad..926ea77cb76 100644 --- a/device/selections/lines/muon/include/SingleHighPtMuonLine.cuh +++ b/device/selections/lines/muon/include/SingleHighPtMuonLine.cuh @@ -56,8 +56,8 @@ namespace single_high_pt_muon_line { private: Allen::Property m_maxChi2Ndof {this, "maxChi2Ndof", 100.f, "maxChi2Ndof description"}; - Allen::Property m_singleMinPt {this, "singleMinPt", 6000.f / Gaudi::Units::MeV, "singleMinPt description"}; - Allen::Property m_singleMinP {this, "singleMinP", 6000.f / Gaudi::Units::MeV, "singleMinP description"}; - Allen::Property m_minZ {this, "minZ", -330.f * Gaudi::Units::mm, "minimum Z for the track state"}; + Allen::Property m_singleMinPt {this, "singleMinPt", 6000.f / Allen::Units::MeV, "singleMinPt description"}; + Allen::Property m_singleMinP {this, "singleMinP", 6000.f / Allen::Units::MeV, "singleMinP description"}; + Allen::Property m_minZ {this, "minZ", -330.f * Allen::Units::mm, "minimum Z for the track state"}; }; } // namespace single_high_pt_muon_line diff --git a/device/selections/lines/muon/include/SingleHighPtMuonLineNoMuID.cuh b/device/selections/lines/muon/include/SingleHighPtMuonLineNoMuID.cuh index 9143a4412cc..0657c9dbd58 100644 --- a/device/selections/lines/muon/include/SingleHighPtMuonLineNoMuID.cuh +++ b/device/selections/lines/muon/include/SingleHighPtMuonLineNoMuID.cuh @@ -55,8 +55,8 @@ namespace single_high_pt_muon_no_muid_line { private: Allen::Property m_maxChi2Ndof {this, "maxChi2Ndof", 100.f, "maxChi2Ndof description"}; - Allen::Property m_singleMinPt {this, "singleMinPt", 8000.f / Gaudi::Units::MeV, "singleMinPt description"}; - Allen::Property m_singleMinP {this, "singleMinP", 6000.f / Gaudi::Units::MeV, "singleMinP description"}; - Allen::Property m_minZ {this, "minZ", -330.f * Gaudi::Units::mm, "minimum z for the track state"}; + Allen::Property m_singleMinPt {this, "singleMinPt", 8000.f / Allen::Units::MeV, "singleMinPt description"}; + Allen::Property m_singleMinP {this, "singleMinP", 6000.f / Allen::Units::MeV, "singleMinP description"}; + Allen::Property m_minZ {this, "minZ", -330.f * Allen::Units::mm, "minimum z for the track state"}; }; } // namespace single_high_pt_muon_no_muid_line diff --git a/device/selections/lines/muon/include/TrackMuonMVALine.cuh b/device/selections/lines/muon/include/TrackMuonMVALine.cuh index b1065177ebd..142d09c73b6 100644 --- a/device/selections/lines/muon/include/TrackMuonMVALine.cuh +++ b/device/selections/lines/muon/include/TrackMuonMVALine.cuh @@ -77,8 +77,8 @@ namespace track_muon_mva_line { private: Allen::Property m_maxChi2Ndof {this, "maxChi2Ndof", 100.0f, "maxChi2Ndof description"}; - Allen::Property m_minPt {this, "minPt", 2000.0f * Gaudi::Units::MeV, "minPt description"}; - Allen::Property m_maxPt {this, "maxPt", 26000.0f * Gaudi::Units::MeV, "maxPt description"}; + Allen::Property m_minPt {this, "minPt", 2000.0f * Allen::Units::MeV, "minPt description"}; + Allen::Property m_maxPt {this, "maxPt", 26000.0f * Allen::Units::MeV, "maxPt description"}; Allen::Property m_minIPChi2 {this, "minIPChi2", 7.4f, "minIPChi2 description"}; Allen::Property m_param1 {this, "param1", 1.0f, "param1 description"}; Allen::Property m_param2 {this, "param2", 2.0f, "param2 description"}; @@ -86,7 +86,7 @@ namespace track_muon_mva_line { Allen::Property m_alpha {this, "alpha", 0.f, "alpha description"}; Allen::Property m_minBPVz {this, "minBPVz", - -330.f * Gaudi::Units::mm, + -330.f * Allen::Units::mm, "minimum z for the best primary vertex associated to the muon"}; Allen::Property m_maxChi2Muon {this, "maxChi2Muon", 1.8, "maximum Chi2Muon evaluation"}; Allen::Property m_minMuonNN {this, "minMuonNN", 0.15, "minimum NN evaluation"}; diff --git a/device/selections/lines/muon/src/TrackMuonMVALine.cu b/device/selections/lines/muon/src/TrackMuonMVALine.cu index 0f4bdd602fb..fd88bcb2242 100644 --- a/device/selections/lines/muon/src/TrackMuonMVALine.cu +++ b/device/selections/lines/muon/src/TrackMuonMVALine.cu @@ -37,9 +37,9 @@ __device__ bool track_muon_mva_line::track_muon_mva_line_t::select( return false; } - const auto ptShift = (track.state().pt() - properties.alpha) / Gaudi::Units::GeV; - const auto maxPt_GeV = properties.maxPt / Gaudi::Units::GeV; - const auto minPt_GeV = properties.minPt / Gaudi::Units::GeV; + const auto ptShift = (track.state().pt() - properties.alpha) / Allen::Units::GeV; + const auto maxPt_GeV = properties.maxPt / Allen::Units::GeV; + const auto minPt_GeV = properties.minPt / Allen::Units::GeV; const auto ipChi2 = track.ip_chi2(); const auto minBPVz = properties.minBPVz; const auto chi2corr = parameters.dev_chi2muon[parameters.dev_track_offsets[event_number] + track.get_index()]; diff --git a/device/vertex_fit/vertex_fitter/include/FilterSVTrack.cuh b/device/vertex_fit/vertex_fitter/include/FilterSVTrack.cuh index bc71a4905fb..28d1bbb8927 100644 --- a/device/vertex_fit/vertex_fitter/include/FilterSVTrack.cuh +++ b/device/vertex_fit/vertex_fitter/include/FilterSVTrack.cuh @@ -63,30 +63,30 @@ namespace FilterSVTrack { private: Allen::Property m_SV_VZ_min {this, "SV_VZ_min", - -180.f * Gaudi::Units::mm, + -180.f * Allen::Units::mm, "min vertex z position of sv candidate"}; Allen::Property m_SV_VZ_max {this, "SV_VZ_max", - 650.f * Gaudi::Units::mm, + 650.f * Allen::Units::mm, "max vertex z position of sv candidate"}; Allen::Property m_SV_BPVIP_min {this, "SV_BPVIP_min", - 32.f * Gaudi::Units::um, + 32.f * Allen::Units::um, "min IP of sv w.r.t. its best PV"}; Allen::Property m_SV_BPVVDZ_min {this, "SV_BPVVDZ_min", - 24.f * Gaudi::Units::mm, + 24.f * Allen::Units::mm, "min z vertex distance of sv w.r.t. its best PV"}; Allen::Property m_SV_BPVVDRHO_min {this, "SV_BPVVDRHO_min", - 3.f * Gaudi::Units::mm, + 3.f * Allen::Units::mm, "min radial vertex distance of sv w.r.t. its best PV"}; Allen::Property m_SV_BPVDIRA_min {this, "SV_BPVDIRA_min", 0.9999f, "min cosine of direction angle of sv w.r.t. its best PV"}; Allen::Property m_T_CHI2NDF_max {this, "T_CHI2NDF_max", 10.f, "Maximum track chi2 per n.d.f. (VeloKalman)"}; - Allen::Property m_T_PT_min {this, "T_PT_min", 100.f * Gaudi::Units::MeV, "Minimal track pT"}; + Allen::Property m_T_PT_min {this, "T_PT_min", 100.f * Allen::Units::MeV, "Minimal track pT"}; Allen::Property m_T_MIPCHI2_min {this, "T_MIPCHI2_min", 6.f, "Minimal IP chi^2 of track w.r.t. any PV"}; Allen::Property m_T_MIPCHI2_max {this, "T_MIPCHI2_max", @@ -97,10 +97,10 @@ namespace FilterSVTrack { "T_MIP_max", std::numeric_limits::max(), "Maximum minimal IP of track w.r.t. any PV"}; - Allen::Property m_SV_T_DOCA_max {this, "SV_T_DOCA_max", 150.f * Gaudi::Units::um, "DOCA of sv and track"}; + Allen::Property m_SV_T_DOCA_max {this, "SV_T_DOCA_max", 150.f * Allen::Units::um, "DOCA of sv and track"}; Allen::Property m_opening_angle_min {this, "opening_angle_min", - 0.5f * Gaudi::Units::mrad, + 0.5f * Allen::Units::mrad, "min angle between tracks from sv and companion track"}; Allen::Property m_require_same_pv {this, "require_same_pv", diff --git a/device/vertex_fit/vertex_fitter/include/FilterTracks.cuh b/device/vertex_fit/vertex_fitter/include/FilterTracks.cuh index d7ed6c6964d..d49172b4d45 100644 --- a/device/vertex_fit/vertex_fitter/include/FilterTracks.cuh +++ b/device/vertex_fit/vertex_fitter/include/FilterTracks.cuh @@ -94,15 +94,15 @@ namespace FilterTracks { "Minimum track IP chi2 required for at least one tracks."}; Allen::Property m_minip_both {this, "track_min_ip_both", - 0.06f * Gaudi::Units::mm, + 0.06f * Allen::Units::mm, "Minimum track IP required for both tracks."}; Allen::Property m_minip_either {this, "track_min_ip_either", - 0.06f * Gaudi::Units::mm, + 0.06f * Allen::Units::mm, "Minimum track IP required for at least one track."}; Allen::Property m_maxchi2ndof {this, "track_max_chi2ndof", 10.0f, "max track chi2/ndof"}; - Allen::Property m_maxdoca {this, "doca_max", 1.f * Gaudi::Units::mm, "Maximum DOCA between tracks."}; - Allen::Property m_minsumpt {this, "sum_pt_min", 400.0f * Gaudi::Units::MeV, "Minimum sum of track pT."}; + Allen::Property m_maxdoca {this, "doca_max", 1.f * Allen::Units::mm, "Maximum DOCA between tracks."}; + Allen::Property m_minsumpt {this, "sum_pt_min", 400.0f * Allen::Units::MeV, "Minimum sum of track pT."}; Allen::Property m_require_os_pair {this, "require_os_pair", false, diff --git a/doc/develop/selections.rst b/doc/develop/selections.rst index 2829026d6a0..e386a546be2 100644 --- a/doc/develop/selections.rst +++ b/doc/develop/selections.rst @@ -195,7 +195,7 @@ header. private: // Line-specific properties - Property m_minPt {this, "minPt", 10000.0f * Gaudi::Units::MeV, "minPt description"}; + Property m_minPt {this, "minPt", 10000.0f * Allen::Units::MeV, "minPt description"}; Property m_minIPChi2 {this, "minIPChi2", 25.0f, "minIPChi2 description"}; }; } // namespace example_one_track_line @@ -252,8 +252,8 @@ secondary vertices with no postscale. This line inherits from `CompositeParticle private: // Line-specific properties - Property m_minComboPt {this, "minComboPt", 2000.0f * Gaudi::Units::MeV, "minComboPt description"}; - Property m_minTrackPt {this, "minTrackPt", 500.0f * Gaudi::Units::MeV, "minTrackPt description"}; + Property m_minComboPt {this, "minComboPt", 2000.0f * Allen::Units::MeV, "minComboPt description"}; + Property m_minTrackPt {this, "minTrackPt", 500.0f * Allen::Units::MeV, "minTrackPt description"}; Property m_minTrackIPChi2 {this, "minTrackIPChi2", 25.0f, "minTrackIPChi2 description"}; }; diff --git a/main/include/SystemOfUnits.h b/main/include/SystemOfUnits.h index 3234f962ab3..1d1345a9053 100644 --- a/main/include/SystemOfUnits.h +++ b/main/include/SystemOfUnits.h @@ -1,5 +1,5 @@ /*****************************************************************************\ -* (c) Copyright 2018-2020 CERN for the benefit of the LHCb Collaboration * +* (c) Copyright 2018-2025 CERN for the benefit of the LHCb Collaboration * * * * This software is distributed under the terms of the Apache License * * version 2 (Apache-2.0), copied verbatim in the file "LICENSE". * @@ -48,11 +48,9 @@ // 01.03.01 parsec // 28.04.06 import from CLHEP to GaudiKernel -- HD // 11.05.06 Rename pascal to Pa to avoid warnings on Windows - MC +#pragma once -#ifndef GAUDI_SYSTEM_OF_UNITS_H -#define GAUDI_SYSTEM_OF_UNITS_H - -namespace Gaudi { +namespace Allen { namespace Units { // @@ -290,6 +288,4 @@ namespace Gaudi { constexpr float perMillion = 0.000001f; } // namespace Units -} // namespace Gaudi - -#endif /* GAUDI_SYSTEM_OF_UNITS_H */ +} // namespace Allen -- GitLab