Skip to content
Snippets Groups Projects
Commit 84acb23a authored by Sebastien Ponce's avatar Sebastien Ponce
Browse files

Merge branch 'another-selections-change' into 'master'

Prefer Particle::Range over Particles

See merge request !3732
parents dffa774c 4872c2a2
No related branches found
No related tags found
2 merge requests!3788Draft: Update SciFi cluster monitoring,!3732Prefer Particle::Range over Particles
Pipeline #6802583 passed
......@@ -42,7 +42,7 @@ namespace LHCb::Phys::RelationTables {
Construct multiple relation tables from Additional Info
*/
struct MakeRelTables final
: Gaudi::Functional::SplittingTransformer<std::vector<Relations>( const LHCb::Particles& )> {
: Gaudi::Functional::SplittingTransformer<std::vector<Relations>( const LHCb::Particle::Range& )> {
Gaudi::Property<std::vector<LHCb::ProtoParticle::additionalInfo>> m_vai{
this, "AdditionalInfo", {LHCb::ProtoParticle::additionalInfo::IsPhoton}, "List of all Ai."};
......@@ -50,7 +50,7 @@ namespace LHCb::Phys::RelationTables {
MakeRelTables( const std::string& name, ISvcLocator* svcLoc )
: SplittingTransformer( name, svcLoc, KeyValue( "InputParticles", {} ), KeyValues( "OutputLocation", {""} ) ) {}
std::vector<Relations> operator()( const LHCb::Particles& input ) const override {
std::vector<Relations> operator()( const LHCb::Particle::Range& input ) const override {
assert( m_vai.size() == outputLocationSize() );
std::vector<Relations> vai;
vai.reserve( m_vai.size() );
......@@ -147,7 +147,7 @@ namespace LHCb::Phys::RelationTables {
Construct relation table from Additional Info
*/
struct AiToRelTable final
: Gaudi::Functional::Transformer<LHCb::Relation1D<LHCb::Particle, double>( const LHCb::Particles& ),
: Gaudi::Functional::Transformer<LHCb::Relation1D<LHCb::Particle, double>( const LHCb::Particle::Range& ),
BaseClass_t> {
Gaudi::Property<LHCb::ProtoParticle::additionalInfo> m_ai{this, "AdditionalInfo",
......@@ -157,7 +157,7 @@ namespace LHCb::Phys::RelationTables {
AiToRelTable( const std::string& name, ISvcLocator* svcLoc )
: Transformer( name, svcLoc, KeyValue( "InputParticles", "" ), KeyValue( "OutputLocation", "" ) ) {}
LHCb::Relation1D<LHCb::Particle, double> operator()( const LHCb::Particles& input ) const override {
LHCb::Relation1D<LHCb::Particle, double> operator()( const LHCb::Particle::Range& input ) const override {
LHCb::Relation1D<LHCb::Particle, double> table;
for ( const auto* particle : input ) {
LHCb::ProtoParticle const* pp = particle->proto();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment