diff --git a/Event/EventPacker/src/lib/PackedProtoParticle.cpp b/Event/EventPacker/src/lib/PackedProtoParticle.cpp index e555df0ee3fd094dc7da517f9364e60e4ef4a29d..70f5d9051021c1e104b5348e0b03808a48eb244d 100644 --- a/Event/EventPacker/src/lib/PackedProtoParticle.cpp +++ b/Event/EventPacker/src/lib/PackedProtoParticle.cpp @@ -216,22 +216,6 @@ StatusCode ProtoParticlePacker::unpack( const PackedData& pproto, Data& proto, c proto.addInfo( k, StandardPacker::fltPacked( v ) ); } } - - // Work around for time when RichDLL el/mu values where removed from additional Info. - // If missing, but RichPID is linked, add them back. - // See https://gitlab.cern.ch/lhcb/LHCb/-/merge_requests/4301 for more details - if ( proto.richPID() ) { - if ( !proto.hasInfo( LHCb::ProtoParticle::additionalInfo::RichDLLe ) ) { - parent().debug() << "Adding missing RichDLLe additional Info" << endmsg; - proto.addInfo( LHCb::ProtoParticle::additionalInfo::RichDLLe, // - proto.richPID()->particleDeltaLL( Rich::Electron ) ); - } - if ( !proto.hasInfo( LHCb::ProtoParticle::additionalInfo::RichDLLmu ) ) { - parent().debug() << "Adding missing RichDLLmu additional Info" << endmsg; - proto.addInfo( LHCb::ProtoParticle::additionalInfo::RichDLLmu, // - proto.richPID()->particleDeltaLL( Rich::Muon ) ); - } - } return StatusCode::SUCCESS; } diff --git a/Event/RecreatePIDTools/src/ChargedProtoParticleAddCombineDLLs.cpp b/Event/RecreatePIDTools/src/ChargedProtoParticleAddCombineDLLs.cpp index b77f2e948f2c842450990f0e3c0702a4ffa43e9e..ab439d85db239372660039507438f1406684289a 100644 --- a/Event/RecreatePIDTools/src/ChargedProtoParticleAddCombineDLLs.cpp +++ b/Event/RecreatePIDTools/src/ChargedProtoParticleAddCombineDLLs.cpp @@ -223,30 +223,19 @@ namespace LHCb::Rec::ProtoParticle::Charged { bool AddCombineDLLs::addRich( LHCb::ProtoParticle* proto, CombinedLL& combDLL ) const { // Add RICH Dll information. - bool ok = false; - if ( proto->hasInfo( LHCb::ProtoParticle::additionalInfo::RichPIDStatus ) ) { + bool ok = false; + auto pid = proto->richPID(); + if ( pid ) { ok = true; // Apply renormalisation of RICH el and mu DLL values // Eventually, should make these tunable job options .... const int rTechnique = m_maskTechnique.at( "RICH" ); - if ( 0 != ( m_elCombDll & rTechnique ) ) - combDLL.elDLL += LHCb::RichPID::scaledDLLForCombDLL( - Rich::Electron, proto->info( LHCb::ProtoParticle::additionalInfo::RichDLLe, 0 ) ); - if ( 0 != ( m_muCombDll & rTechnique ) ) - combDLL.muDLL += LHCb::RichPID::scaledDLLForCombDLL( - Rich::Muon, proto->info( LHCb::ProtoParticle::additionalInfo::RichDLLmu, 0 ) ); - if ( 0 != ( m_piCombDll & rTechnique ) ) - combDLL.piDLL += LHCb::RichPID::scaledDLLForCombDLL( - Rich::Pion, proto->info( LHCb::ProtoParticle::additionalInfo::RichDLLpi, 0 ) ); - if ( 0 != ( m_kaCombDll & rTechnique ) ) - combDLL.kaDLL += LHCb::RichPID::scaledDLLForCombDLL( - Rich::Kaon, proto->info( LHCb::ProtoParticle::additionalInfo::RichDLLk, 0 ) ); - if ( 0 != ( m_prCombDll & rTechnique ) ) - combDLL.prDLL += LHCb::RichPID::scaledDLLForCombDLL( - Rich::Proton, proto->info( LHCb::ProtoParticle::additionalInfo::RichDLLp, 0 ) ); - if ( 0 != ( m_deCombDll & rTechnique ) ) - combDLL.deDLL += LHCb::RichPID::scaledDLLForCombDLL( - Rich::Deuteron, proto->info( LHCb::ProtoParticle::additionalInfo::RichDLLd, 0 ) ); + if ( 0 != ( m_elCombDll & rTechnique ) ) combDLL.elDLL += pid->scaledDLLForCombDLL( Rich::Electron ); + if ( 0 != ( m_muCombDll & rTechnique ) ) combDLL.muDLL += pid->scaledDLLForCombDLL( Rich::Muon ); + if ( 0 != ( m_piCombDll & rTechnique ) ) combDLL.piDLL += pid->scaledDLLForCombDLL( Rich::Pion ); + if ( 0 != ( m_kaCombDll & rTechnique ) ) combDLL.kaDLL += pid->scaledDLLForCombDLL( Rich::Kaon ); + if ( 0 != ( m_prCombDll & rTechnique ) ) combDLL.prDLL += pid->scaledDLLForCombDLL( Rich::Proton ); + if ( 0 != ( m_deCombDll & rTechnique ) ) combDLL.deDLL += pid->scaledDLLForCombDLL( Rich::Deuteron ); if ( msgLevel( MSG::VERBOSE ) ) verbose() << " -> Adding RICH info " << combDLL << endmsg; } return ok; diff --git a/Event/RecreatePIDTools/src/ChargedProtoParticleAddRichInfo.cpp b/Event/RecreatePIDTools/src/ChargedProtoParticleAddRichInfo.cpp index 1a9624046904837deca12c22f7dd88e2b73a8dec..29bd37bed4f2a66f2556c23e56b021fa72a0df6f 100644 --- a/Event/RecreatePIDTools/src/ChargedProtoParticleAddRichInfo.cpp +++ b/Event/RecreatePIDTools/src/ChargedProtoParticleAddRichInfo.cpp @@ -98,18 +98,6 @@ namespace LHCb::Rec::ProtoParticle::Charged { // reference to RichPID object proto.setRichPID( richPID ); - - // Store the raw RICH PID info - proto.addInfo( LHCb::ProtoParticle::additionalInfo::RichDLLe, richPID->particleDeltaLL( Rich::Electron ) ); - proto.addInfo( LHCb::ProtoParticle::additionalInfo::RichDLLmu, richPID->particleDeltaLL( Rich::Muon ) ); - proto.addInfo( LHCb::ProtoParticle::additionalInfo::RichDLLpi, richPID->particleDeltaLL( Rich::Pion ) ); - proto.addInfo( LHCb::ProtoParticle::additionalInfo::RichDLLk, richPID->particleDeltaLL( Rich::Kaon ) ); - proto.addInfo( LHCb::ProtoParticle::additionalInfo::RichDLLp, richPID->particleDeltaLL( Rich::Proton ) ); - proto.addInfo( LHCb::ProtoParticle::additionalInfo::RichDLLbt, richPID->particleDeltaLL( Rich::BelowThreshold ) ); - proto.addInfo( LHCb::ProtoParticle::additionalInfo::RichDLLd, richPID->particleDeltaLL( Rich::Deuteron ) ); - - // Store History - proto.addInfo( LHCb::ProtoParticle::additionalInfo::RichPIDStatus, richPID->pidResultCode() ); } //=============================================================================