Merge branch 'gunther_KFToolSuggestions' into 'master'

Adapt Track History

See merge request !1006

Phys/DaVinciTransporter/src/ParticleTransporterWithStateProvider.cpp

@@ -245,7 +245,7 @@ StatusCode DaVinci::ParticleTransporter::transportElectron( const LHCb::Particle
   StatusCode  sc = m_particle2state->particle2State( *particle, state );
   if ( sc.isFailure() ) { return Warning( "Error from Particle2State", sc, 3 ); }
   if ( track->checkType( LHCb::Track::Types::Long ) || track->checkType( LHCb::Track::Types::Velo ) ||
-       track->checkType( LHCb::Track::Types::VeloR ) || 0 == m_extrapolator2 ) {
+       0 == m_extrapolator2 ) {
     // first try "simple" extrapolator
     sc = m_extrapolator1->propagate( state, znew, geometry, LHCb::Tr::PID( particle->particleID().abspid() ) );
     if ( sc.isFailure() && 0 != m_extrapolator2 ) {

Phys/ExtraInfoTools/src/ConeVariables.cpp

@@ -258,7 +258,7 @@ std::pair<std::vector<double>, int> ConeVariables::ConeP( const LHCb::Particle*
     double deltaR = std::sqrt( deltaPhi * deltaPhi + deltaEta * deltaEta );
 
     // -- Add the tracks to the summation if deltaR is smaller than the cut value of deltaR
-    if ( deltaR < rcut && track->type() == m_trackType ) {
+    if ( deltaR < rcut && static_cast<int>( track->type() ) == m_trackType ) {
       sumPx += trackpx;
       sumPy += trackpy;
       sumPz += trackpz;

Phys/ExtraInfoTools/src/ConeVariablesForEW.cpp

@@ -296,7 +296,7 @@ StatusCode ConeVariablesForEW::ChargedCone( const LHCb::Particle* seed, const LH
         double deltaEta = seedMomentum.Eta() - trackMomentum.Eta();
         double deltaR   = sqrt( deltaPhi * deltaPhi + deltaEta * deltaEta );
 
-        if ( track->type() == m_trackType ) {
+        if ( static_cast<int>( track->type() ) == m_trackType ) {
           if ( ( rcut == 0. ) || ( deltaR < rcut ) ) {
             // -- Calculate vector information
             sPx += trackMomentum.X();

Phys/FlavourTagging/src/Features/FeatureGenerator.h

@@ -326,7 +326,7 @@ public:
       {"TRCHI2DOF", [this]() { return m_taggingParticle->proto()->track()->chi2PerDoF(); }},
       {"TRGHP", [this]() { return m_taggingParticle->proto()->track()->ghostProbability(); }},
       {"PP_InAccHcal", [this]() { return m_taggingParticle->proto()->info( LHCb::ProtoParticle::InAccHcal, -998 ); }},
-      {"TRTYPE", [this]() { return m_taggingParticle->proto()->track()->type(); }},
+      {"TRTYPE", [this]() { return static_cast<int>( m_taggingParticle->proto()->track()->type() ); }},
       {"PIDe", [this]() { return m_taggingParticle->proto()->info( LHCb::ProtoParticle::CombDLLe, -998 ); }},
       {"PIDmu", [this]() { return m_taggingParticle->proto()->info( LHCb::ProtoParticle::CombDLLmu, -998 ); }},
       {"PP_VeloCharge", [this]() { return m_taggingParticle->proto()->info( LHCb::ProtoParticle::VeloCharge, -998 ); }},

Phys/FlavourTagging/src/Taggers/OSKaon/TaggerNEWKaonOppositeTool.cpp

@@ -207,9 +207,7 @@ Tagger TaggerNEWKaonOppositeTool::tagReco12( const Particle* AXB0, const RecVert
     if ( tsa > m_ghost_cut ) continue;
     if ( m_util->isInTree( *ipart, axdaugh, distphi ) ) continue; // exclude signal
     if ( distphi < m_distPhi_cut ) continue;
-
-    const int type = ( *ipart )->proto()->track()->type();
-    if ( type != 3 ) continue;
+    if ( ( *ipart )->proto()->track()->type() != LHCb::Track::Types::Long ) continue;
 
     ////////////////////////////////
     vtags_sel.push_back( *ipart ); // store presel tagger candidate
@@ -446,9 +444,7 @@ Tagger TaggerNEWKaonOppositeTool::tagReco14( const Particle* AXB0, const RecVert
 
     if ( m_util->isInTree( *ipart, axdaugh, distphi ) ) continue; // exclude signal
     if ( distphi < m_distPhi_cut ) continue;
-
-    const int type = ( *ipart )->proto()->track()->type();
-    if ( type != 3 ) continue;
+    if ( ( *ipart )->proto()->track()->type() != LHCb::Track::Types::Long ) continue;
 
     ////////////////////////////////
     vtags_sel.push_back( *ipart ); // store presel tagger candidate

Phys/FlavourTagging/src/Taggers/SSKaon/TaggerNEWKaonSameTool.cpp

@@ -149,8 +149,7 @@ Tagger TaggerNEWKaonSameTool::tag( const Particle* AXB0, const RecVertex* RecVer
     if ( m_util->isInTree( *ipart, axdaugh, distphi ) ) continue; // exclude signal
     if ( distphi < m_distPhi_cut_kaon ) continue;
 
-    const int type = ( *ipart )->proto()->track()->type();
-    if ( type != 3 ) continue;
+    if ( ( *ipart )->proto()->track()->type() != LHCb::Track::Types::Long ) continue;
 
     // in future should be changed: use TaggingHelpers:dphi BUT FOR NOW NOT:
     // need to check the sign and the NNEt is stable

Phys/FlavourTagging/src/Taggers/SSKaon/TaggerSSKaon_dev_Tool.cpp

@@ -136,8 +136,9 @@ Tagger TaggerSSKaon_dev_Tool::tag( const Particle* AXB0, const RecVertex* RecVer
 
     if ( m_util->isInTree( *ipart, axdaugh, distphi ) ) continue; // exclude signal
     if ( distphi < m_distPhi_cut_kaon ) continue;
-    const int type = ( *ipart )->proto()->track()->type();
-    if ( type != 3 && type != 4 ) continue;
+    if ( const auto type = ( *ipart )->proto()->track()->type();
+         type != LHCb::Track::Types::Long && type != LHCb::Track::Types::Upstream )
+      continue;
     double IP, IPerr;
     m_util->calcIP( *ipart, RecVert, IP, IPerr ).ignore();
     IP                 = fabs( IP );

Phys/GenericVertexFinder/src/GenericVertexFinder.cpp

@@ -402,7 +402,7 @@ void GenericVertexFinder::fillParticleFromTrajVertex( LHCb::Particle&
     double             mass( 0 );
     if ( dautrk ) {
       // a value of -1 flags to the vertex fit not to use the mass
-      if ( m_skipVeloTracksForMass && dautrk->type() == LHCb::Track::Velo )
+      if ( m_skipVeloTracksForMass && dautrk->type() == LHCb::Track::Types::Velo )
         mass = -1;
       else
         mass = daughter->measuredMass();

Phys/GenericVertexFinder/src/GenericVertexFinderTwo.cpp

@@ -134,7 +134,7 @@ GenericVertexFinder::TrajVertices GenericVertexFinderTwo::findVertices( const Ow
         const double norm = 1e-6; // abritrary norm
         twoprong.density  = -trajvertex->vertex->chi2() - std::log( detV / norm );
         // shall we give tracks that are not long an extra penalty?
-        if ( m_downweightNonLong && trajvertex->numTracks( LHCb::Track::Long ) != 2 )
+        if ( m_downweightNonLong && trajvertex->numTracks( LHCb::Track::Types::Long ) != 2 )
           twoprong.density -= m_maxSeedVertexChi2;
         seedtwoprongs.push_back( std::move( twoprong ) );
       }

Phys/GenericVertexFinder/src/TrajParticle.cpp

@@ -37,14 +37,13 @@ namespace {
 
   constexpr auto typeForSorting( LHCb::Track::Types i ) {
     switch ( i ) {
-    case LHCb::Track::Velo:
-    case LHCb::Track::VeloR:
+    case LHCb::Track::Types::Velo:
       return TypeForSorting::Velo;
-    case LHCb::Track::Long:
+    case LHCb::Track::Types::Long:
       return TypeForSorting::Long;
-    case LHCb::Track::Upstream:
+    case LHCb::Track::Types::Upstream:
       return TypeForSorting::Upstream;
-    case LHCb::Track::Downstream:
+    case LHCb::Track::Types::Downstream:
       return TypeForSorting::Downstream;
     default:
       return TypeForSorting::Other;
@@ -59,7 +58,7 @@ namespace {
   }
 
   constexpr auto typeForSortingMap() {
-    constexpr int N = int( LHCb::Track::UT ) + 1;
+    constexpr int N = static_cast<int>( LHCb::Track::Types::Last );
     return init_array_helper( std::make_index_sequence<N>{} );
   }
 

Phys/JetAccessories/src/HltParticleFlow.cpp

@@ -484,8 +484,8 @@ Particle* HltParticleFlow::create( const ProtoParticle* pro, const int& id, cons
     const Track* trk = pro->track();
     State        sta = trk->firstState();
     double       p( -1 ), q( pro->charge() ? pro->charge() : -1 );
-    int          type( trk->type() );
-    prt = new Particle( ParticleID( id * q ) );
+    auto         type = trk->type();
+    prt               = new Particle( ParticleID( id * q ) );
     if ( type == Track::Types::Velo )
       p = m_trkVlP;
     else {

Phys/JetAccessories/src/PFJetMakerAlg.cpp

@@ -298,21 +298,24 @@ StatusCode LoKi::PFJetMaker::analyse() {
     for ( int i = 0; i < (int)m_inputTypes.size(); i++ ) {
       GoodInput = GoodInput || fabs( PFType - m_inputTypes[i] ) < 1e-6;
     }
-    LoKi::Types::Cut PerPVinputs =
-        ( PFType > LHCb::PFParticle::Charged && PFType < LHCb::PFParticle::Neutral &&
-          LHCb::Track::Types::Downstream != TRTYPE ) ||
-        ( PFType > LHCb::PFParticle::Composite && PFType < LHCb::PFParticle::BadParticle ) ||
-        ( PFType == LHCb::PFParticle::ChargedInfMomentum && LHCb::Track::Types::Downstream != TRTYPE ) ||
-        ( PFType == LHCb::PFParticle::Charged0Momentum && LHCb::Track::Types::Downstream != TRTYPE ) ||
-        ( fabs( PFType + 10 ) < 1e-6 );
-    LoKi::Types::Cut AllPVinputs =
-        ( PFType > LHCb::PFParticle::Neutral && PFType < LHCb::PFParticle::Composite ) ||
-        ( PFType == LHCb::PFParticle::BadPhotonMatchingT ) || ( PFType == LHCb::PFParticle::BadPhoton ) ||
-        ( PFType == LHCb::PFParticle::IsolatedPhoton ) ||
-        ( PFType > LHCb::PFParticle::Charged && PFType < LHCb::PFParticle::Neutral &&
-          LHCb::Track::Types::Downstream == TRTYPE ) ||
-        ( PFType == LHCb::PFParticle::ChargedInfMomentum && LHCb::Track::Types::Downstream == TRTYPE ) ||
-        ( PFType == LHCb::PFParticle::Charged0Momentum && LHCb::Track::Types::Downstream == TRTYPE );
+    LoKi::Types::Cut PerPVinputs = ( PFType > LHCb::PFParticle::Charged && PFType < LHCb::PFParticle::Neutral &&
+                                     static_cast<int>( LHCb::Track::Types::Downstream ) != TRTYPE ) ||
+                                   ( PFType > LHCb::PFParticle::Composite && PFType < LHCb::PFParticle::BadParticle ) ||
+                                   ( PFType == LHCb::PFParticle::ChargedInfMomentum &&
+                                     static_cast<int>( LHCb::Track::Types::Downstream ) != TRTYPE ) ||
+                                   ( PFType == LHCb::PFParticle::Charged0Momentum &&
+                                     static_cast<int>( LHCb::Track::Types::Downstream ) != TRTYPE ) ||
+                                   ( fabs( PFType + 10 ) < 1e-6 );
+    LoKi::Types::Cut AllPVinputs = ( PFType > LHCb::PFParticle::Neutral && PFType < LHCb::PFParticle::Composite ) ||
+                                   ( PFType == LHCb::PFParticle::BadPhotonMatchingT ) ||
+                                   ( PFType == LHCb::PFParticle::BadPhoton ) ||
+                                   ( PFType == LHCb::PFParticle::IsolatedPhoton ) ||
+                                   ( PFType > LHCb::PFParticle::Charged && PFType < LHCb::PFParticle::Neutral &&
+                                     static_cast<int>( LHCb::Track::Types::Downstream ) == TRTYPE ) ||
+                                   ( PFType == LHCb::PFParticle::ChargedInfMomentum &&
+                                     static_cast<int>( LHCb::Track::Types::Downstream ) == TRTYPE ) ||
+                                   ( PFType == LHCb::PFParticle::Charged0Momentum &&
+                                     static_cast<int>( LHCb::Track::Types::Downstream ) == TRTYPE );
 
     LoKi::Types::Cut PVPointingInfo = NINTREE( PerPVinputs ) > 0;
 
@@ -596,13 +599,13 @@ StatusCode LoKi::PFJetMaker::appendJetIDInfo( LHCb::Particle* jet ) {
   LoKi::Types::Fun NsatCells     = NECALsatCells + NHCALsatCells;
   // Function to get the number of particles with PV information
   LoKi::Types::Fun BestPVIPChi2 = LoKi::Cuts::BPVIPCHI2( this, "" );
-  LoKi::Types::Fun N_HasPVInfo =
-      LoKi::Cuts::NINTREE( ( PFType > LHCb::PFParticle::Composite && PFType < LHCb::PFParticle::BadParticle ) ||
-                           ( LoKi::Cuts::HASTRACK && LHCb::Track::Types::Downstream != LoKi::Cuts::TRTYPE ) );
-  LoKi::Types::Fun N_HasPVInfoChi24 =
-      LoKi::Cuts::NINTREE( ( ( PFType > LHCb::PFParticle::Composite && PFType < LHCb::PFParticle::BadParticle ) ||
-                             ( LoKi::Cuts::HASTRACK && LHCb::Track::Types::Downstream != LoKi::Cuts::TRTYPE ) ) &&
-                           BestPVIPChi2 < 9 );
+  LoKi::Types::Fun N_HasPVInfo  = LoKi::Cuts::NINTREE(
+      ( PFType > LHCb::PFParticle::Composite && PFType < LHCb::PFParticle::BadParticle ) ||
+      ( LoKi::Cuts::HASTRACK && static_cast<int>( LHCb::Track::Types::Downstream ) != LoKi::Cuts::TRTYPE ) );
+  LoKi::Types::Fun N_HasPVInfoChi24 = LoKi::Cuts::NINTREE(
+      ( ( PFType > LHCb::PFParticle::Composite && PFType < LHCb::PFParticle::BadParticle ) ||
+        ( LoKi::Cuts::HASTRACK && static_cast<int>( LHCb::Track::Types::Downstream ) != LoKi::Cuts::TRTYPE ) ) &&
+      BestPVIPChi2 < 9 );
 
   jet->addInfo( LHCb::JetIDInfo::Ntracks, ntrk );
   jet->addInfo( LHCb::JetIDInfo::N90, n90 );
@@ -689,26 +692,29 @@ StatusCode LoKi::PFJetMaker::appendJetIDInfo( LHCb::Particle* jet ) {
       ( ( fabs( PFType - LHCb::PFParticle::ChargedHadron ) < 1e-6 ) ||
         ( fabs( PFType - LHCb::PFParticle::Electron ) < 1e-6 ) || ( fabs( PFType - LHCb::PFParticle::Muon ) < 1e-6 ) );
 
-  LoKi::Types::Fun N_LongTrk =
-      LoKi::Cuts::NINTREE( LoKi::Cuts::HASTRACK && LHCb::Track::Types::Long == LoKi::Cuts::TRTYPE && NoV0s );
+  LoKi::Types::Fun N_LongTrk = LoKi::Cuts::NINTREE(
+      LoKi::Cuts::HASTRACK && static_cast<int>( LHCb::Track::Types::Long ) == LoKi::Cuts::TRTYPE && NoV0s );
   LoKi::Types::Fun Ef_LongTrk = LoKi::Cuts::SUMTREE(
-      LoKi::Cuts::E, LoKi::Cuts::HASTRACK && LHCb::Track::Types::Long == LoKi::Cuts::TRTYPE && NoV0s, 0. );
+      LoKi::Cuts::E,
+      LoKi::Cuts::HASTRACK && static_cast<int>( LHCb::Track::Types::Long ) == LoKi::Cuts::TRTYPE && NoV0s, 0. );
 
   jet->addInfo( LHCb::JetEnergyFractionInfo::NLongTrk, N_LongTrk( jet ) );
   jet->addInfo( LHCb::JetEnergyFractionInfo::EfLongTrk, Ef_LongTrk( jet ) / LoKi::Cuts::E( jet ) );
 
-  LoKi::Types::Fun N_DownTrk =
-      LoKi::Cuts::NINTREE( LoKi::Cuts::HASTRACK && LHCb::Track::Types::Downstream == LoKi::Cuts::TRTYPE && NoV0s );
+  LoKi::Types::Fun N_DownTrk = LoKi::Cuts::NINTREE(
+      LoKi::Cuts::HASTRACK && static_cast<int>( LHCb::Track::Types::Downstream ) == LoKi::Cuts::TRTYPE && NoV0s );
   LoKi::Types::Fun Ef_DownTrk = LoKi::Cuts::SUMTREE(
-      LoKi::Cuts::E, LoKi::Cuts::HASTRACK && LHCb::Track::Types::Downstream == LoKi::Cuts::TRTYPE && NoV0s, 0. );
+      LoKi::Cuts::E,
+      LoKi::Cuts::HASTRACK && static_cast<int>( LHCb::Track::Types::Downstream ) == LoKi::Cuts::TRTYPE && NoV0s, 0. );
 
   jet->addInfo( LHCb::JetEnergyFractionInfo::NDownTrk, N_DownTrk( jet ) );
   jet->addInfo( LHCb::JetEnergyFractionInfo::EfDownTrk, Ef_DownTrk( jet ) / LoKi::Cuts::E( jet ) );
 
-  LoKi::Types::Fun N_UpTrk =
-      LoKi::Cuts::NINTREE( LoKi::Cuts::HASTRACK && LHCb::Track::Types::Upstream == LoKi::Cuts::TRTYPE && NoV0s );
+  LoKi::Types::Fun N_UpTrk = LoKi::Cuts::NINTREE(
+      LoKi::Cuts::HASTRACK && static_cast<int>( LHCb::Track::Types::Upstream ) == LoKi::Cuts::TRTYPE && NoV0s );
   LoKi::Types::Fun Ef_UpTrk = LoKi::Cuts::SUMTREE(
-      LoKi::Cuts::E, LoKi::Cuts::HASTRACK && LHCb::Track::Types::Upstream == LoKi::Cuts::TRTYPE && NoV0s, 0. );
+      LoKi::Cuts::E,
+      LoKi::Cuts::HASTRACK && static_cast<int>( LHCb::Track::Types::Upstream ) == LoKi::Cuts::TRTYPE && NoV0s, 0. );
 
   jet->addInfo( LHCb::JetEnergyFractionInfo::NUpTrk, N_UpTrk( jet ) );
   jet->addInfo( LHCb::JetEnergyFractionInfo::EfUpTrk, Ef_UpTrk( jet ) / LoKi::Cuts::E( jet ) );

Phys/JetAccessories/src/ParticleFlow4Jets.cpp

@@ -786,7 +786,8 @@ StatusCode ParticleFlow4Jets::execute() {
         newP->addInfo( 951, banType );
         if ( m_tableTrECAL->relations( hypoClusters[0].target() ).size() > 0 ) {
           newP->addInfo( 952, m_tableTrECAL->relations( hypoClusters[0].target() ).front().weight() );
-          newP->addInfo( 953, m_tableTrECAL->relations( hypoClusters[0].target() ).front().to()->type() );
+          newP->addInfo(
+              953, static_cast<int>( m_tableTrECAL->relations( hypoClusters[0].target() ).front().to()->type() ) );
         }
         // Isn't that Photon only???
         if ( banType == Photon || banType == TrackMatchTT )
@@ -802,7 +803,8 @@ StatusCode ParticleFlow4Jets::execute() {
         LHCb::Particle* newP = photon->clone();
         if ( m_tableTrECAL->relations( hypoClusters[0].target() ).size() > 0 ) {
           newP->addInfo( 952, m_tableTrECAL->relations( hypoClusters[0].target() ).front().weight() );
-          newP->addInfo( 953, m_tableTrECAL->relations( hypoClusters[0].target() ).front().to()->type() );
+          newP->addInfo(
+              953, static_cast<int>( m_tableTrECAL->relations( hypoClusters[0].target() ).front().to()->type() ) );
         }
         newP->addInfo( 955, numberOfSaturatedCells( hypoClusters[0].target(), m_ecal ) );
         PFParticles->insert( newP );
@@ -861,7 +863,7 @@ StatusCode ParticleFlow4Jets::execute() {
         p.setProto( NewProto );
         if ( m_tableTrHCAL->relations( cluster ).size() > 0 ) {
           p.addInfo( 952, m_tableTrHCAL->relations( cluster ).front().weight() );
-          p.addInfo( 953, m_tableTrHCAL->relations( cluster ).front().to()->type() );
+          p.addInfo( 953, static_cast<int>( m_tableTrHCAL->relations( cluster ).front().to()->type() ) );
         }
 
         p.addInfo( 955, numberOfSaturatedCells( cluster, m_hcal ) );

Phys/LoKiFitters/src/PVReFitter.cpp

@@ -167,7 +167,7 @@ namespace LoKi {
       //
       // velo-only case
       //
-      if ( LHCb::Track::Types::Velo == track.type() || LHCb::Track::Types::VeloR == track.type() ) {
+      if ( LHCb::Track::Types::Velo == track.type() ) {
         if ( 0 != m_veloExtrapolator ) {
           StatusCode sc = m_veloExtrapolator->propagate( m_state, point, geometry );
           if ( sc.isSuccess() ) { return &m_state; } // RETURN

Phys/LoKiFitters/src/VertexFitter.h

@@ -525,8 +525,7 @@ namespace LoKi {
     // ========================================================================
     //
     inline bool forMassage( const LHCb::Track* t ) const {
-      return 0 != t && ( LHCb::Track::Types::Long != t->type() && LHCb::Track::Types::Velo != t->type() &&
-                         LHCb::Track::Types::VeloR != t->type() );
+      return 0 != t && ( LHCb::Track::Types::Long != t->type() && LHCb::Track::Types::Velo != t->type() );
     }
     //
     inline bool forMassage( const LHCb::ProtoParticle* p ) const { return 0 != p && forMassage( p->track() ); }

Phys/LoKiJets/src/LoKiJetMakerAlg.cpp

@@ -147,7 +147,8 @@ StatusCode LoKi::JetMaker::analyse() {
 
     // A cut to check that a jet contains information able to link it to a PV
     LoKi::Types::Cut withPVPointingInfo =
-        NINTREE( ( ABSID == 310 || ABSID == 3122 ) || ( HASTRACK && LHCb::Track::Types::Downstream != TRTYPE ) ) > 0;
+        NINTREE( ( ABSID == 310 || ABSID == 3122 ) ||
+                 ( HASTRACK && static_cast<int>( LHCb::Track::Types::Downstream ) != TRTYPE ) ) > 0;
 
     Range part = select( "part", PALL );
 
@@ -170,7 +171,7 @@ StatusCode LoKi::JetMaker::analyse() {
         // Charged inputs
         else {
           // Take all downstream tracks
-          if ( LHCb::Track::Types::Downstream == TRTYPE( *i_p ) ) inputs.push_back( *i_p );
+          if ( static_cast<int>( LHCb::Track::Types::Downstream ) == TRTYPE( *i_p ) ) inputs.push_back( *i_p );
           // Keep only the tracks with velo segment that match to the vertex
           else if ( bestVertexVX( *i_p ) == VX( *i_pv ) && bestVertexVY( *i_p ) == VY( *i_pv ) &&
                     bestVertexVZ( *i_p ) == VZ( *i_pv ) )
@@ -320,10 +321,10 @@ StatusCode LoKi::JetMaker::appendJetIDInfo( LHCb::Particle* jet ) {
     if ( auxptsum / sumpt > 0.9 ) break;
   }
 
-  LoKi::Types::Fun NsatCells = LoKi::Cuts::SUMTREE( LoKi::Cuts::INFO( 955, 0. ), LoKi::Cuts::Q == 0, 0. );
-  LoKi::Types::Fun N_HasPVInfo =
-      LoKi::Cuts::NINTREE( ( LoKi::Cuts::ABSID == 310 || LoKi::Cuts::ABSID == 3122 ) ||
-                           ( LoKi::Cuts::HASTRACK && LHCb::Track::Types::Downstream != LoKi::Cuts::TRTYPE ) );
+  LoKi::Types::Fun NsatCells   = LoKi::Cuts::SUMTREE( LoKi::Cuts::INFO( 955, 0. ), LoKi::Cuts::Q == 0, 0. );
+  LoKi::Types::Fun N_HasPVInfo = LoKi::Cuts::NINTREE(
+      ( LoKi::Cuts::ABSID == 310 || LoKi::Cuts::ABSID == 3122 ) ||
+      ( LoKi::Cuts::HASTRACK && static_cast<int>( LHCb::Track::Types::Downstream ) != LoKi::Cuts::TRTYPE ) );
 
   jet->addInfo( 9001, ntrk );
   jet->addInfo( 9002, n90 );

Phys/LoKiJets/src/LoKiSeedFinder.cpp

@@ -423,7 +423,7 @@ StatusCode LoKi::SeedFinder::makeJets( const IJetMaker::Input& input_, const LHC
         double CloneDist = trk->info( LHCb::Track::AdditionalInfo::CloneDist, 9999. );
         double TrkLi     = trk->likelihood();
         double GhostProb = trk->ghostProbability();
-        double LongTrk   = trk->type();
+        double LongTrk   = static_cast<int>( trk->type() );
         if ( msgLevel( MSG::VERBOSE ) ) {
           verbose() << "addinfo Likelihood = " << TrkLi << endmsg;
           verbose() << "addinfo CloneDist  = " << CloneDist << endmsg;

Phys/LoKiJets/src/LoKiVVSeedFinder.cpp

@@ -415,7 +415,7 @@ StatusCode LoKi::VVSeedFinder::makeJets( const IJetMaker::Input& input_, const L
         double CloneDist = trk->info( LHCb::Track::AdditionalInfo::CloneDist, 9999. );
         double TrkLi     = trk->likelihood();
         double GhostProb = trk->ghostProbability();
-        double LongTrk   = trk->type();
+        double LongTrk   = static_cast<int>( trk->type() );
         if ( msgLevel( MSG::VERBOSE ) ) {
           verbose() << "addinfo Likelihood = " << TrkLi << endmsg;
           verbose() << "addinfo CloneDist  = " << CloneDist << endmsg;

Phys/LoKiPhys/include/LoKi/ParticleCuts.h

@@ -935,7 +935,8 @@ namespace LoKi {
      *  @author Vanya BELYAEV Ivan.BElyaev@cern.ch
      *  @date 2011-01-12
      */
-    const auto CLONEDIST = LoKi::Particles::TrackInfo{LHCb::Track::AdditionalInfo::CloneDist, 1.e+9};
+    const auto CLONEDIST =
+        LoKi::Particles::TrackInfo{static_cast<int>( LHCb::Track::AdditionalInfo::CloneDist ), 1.e+9};
     // ========================================================================
     /** @typedef CLOSESTAPPROACH
      *  Evaluator of the closest approach
@@ -2612,7 +2613,7 @@ namespace LoKi {
      *  @author Vanya BELYAEV ibelyaev@physics.syr.edu
      *  @date 2006-02-23
      */
-    const auto ISDOWN = EQUALTO{TRTYPE, LHCb::Track::Types::Downstream};
+    const auto ISDOWN = EQUALTO{TRTYPE, static_cast<int>( LHCb::Track::Types::Downstream )};
     // ========================================================================
     /** @typedef ISINTREE
      *  The trivial predicate which
@@ -2662,7 +2663,7 @@ namespace LoKi {
      *  @author Vanya BELYAEV ibelyaev@physics.syr.edu
      *  @date 2006-02-23
      */
-    const auto ISLONG = EQUALTO{TRTYPE, LHCb::Track::Types::Long};
+    const auto ISLONG = EQUALTO{TRTYPE, static_cast<int>( LHCb::Track::Types::Long )};
     // ========================================================================
     /** @var ISLOOSEMUON
      *  The simple evaluator of LHCb::MuonPID::IsMuonLoose
@@ -2876,7 +2877,7 @@ namespace LoKi {
      *  @author Vanya BELYAEV ibelyaev@physics.syr.edu
      *  @date 2006-02-23
      */
-    const auto ISTTRACK = EQUALTO{TRTYPE, LHCb::Track::Types::Ttrack};
+    const auto ISTTRACK = EQUALTO{TRTYPE, static_cast<int>( LHCb::Track::Types::Ttrack )};
     // ========================================================================
     /** @var ISUP
      *  The trivial predicate which evaluates to true for particles,
@@ -2901,7 +2902,7 @@ namespace LoKi {
      *  @author Vanya BELYAEV ibelyaev@physics.syr.edu
      *  @date 2006-02-23
      */
-    const auto ISUP = EQUALTO{TRTYPE, LHCb::Track::Types::Upstream};
+    const auto ISUP = EQUALTO{TRTYPE, static_cast<int>( LHCb::Track::Types::Upstream )};
     // ========================================================================
     /** @var KEY
      *  The trivial predicate, it relies on Particle::hasKey method
@@ -5962,7 +5963,7 @@ namespace LoKi {
      *  @author Vanya BELYAEV ibelyaev@physics.syr.edu
      *  @date 2006-02-23
      */
-    const auto TRDOWN = EQUALTO{TRTYPE, LHCb::Track::Types::Downstream};
+    const auto TRDOWN = EQUALTO{TRTYPE, static_cast<int>( LHCb::Track::Types::Downstream )};
     // ========================================================================
     /** @var TRGHP
      *  simple evaluator of "ghost probability"
@@ -6035,7 +6036,7 @@ namespace LoKi {
      *  @author Vanya BELYAEV ibelyaev@physics.syr.edu
      *  @date 2006-02-23
      */
-    const auto TRLONG = EQUALTO{TRTYPE, LHCb::Track::Types::Long};
+    const auto TRLONG = EQUALTO{TRTYPE, static_cast<int>( LHCb::Track::Types::Long )};
     // ========================================================================
     /** @var TRLH
      *  simple evaluator of "track likelihood"
@@ -6132,7 +6133,7 @@ namespace LoKi {
      *  @author Vanya BELYAEV ibelyaev@physics.syr.edu
      *  @date 2006-02-23
      */
-    const auto TRTTRACK = EQUALTO{TRTYPE, LHCb::Track::Types::Ttrack};
+    const auto TRTTRACK = EQUALTO{TRTYPE, static_cast<int>( LHCb::Track::Types::Ttrack )};
     // ========================================================================
     /** @var TRUP
      *  The trivial predicate which evaluates to true for particles,
@@ -6157,7 +6158,7 @@ namespace LoKi {
      *  @author Vanya BELYAEV ibelyaev@physics.syr.edu
      *  @date 2006-02-23
      */
-    const auto TRUP = EQUALTO{TRTYPE, LHCb::Track::Types::Upstream};
+    const auto TRUP = EQUALTO{TRTYPE, static_cast<int>( LHCb::Track::Types::Upstream )};
     // ========================================================================
     /** @typedef TSIGND
      *  Simple evaluator of the proper lifetime

Phys/LoKiPhys/python/LoKiPhys/decorators.py

@@ -202,13 +202,13 @@ VGAUSS = VONE >> _LoKiNumbers.XGAUSS
 VRAND = VONE >> _LoKiNumbers.XRAND
 
 ## @see LoKi::Cuts::ISLONG
-ISLONG = equal_to(TRTYPE, LHCb.Track.Long)
+ISLONG = equal_to(TRTYPE, LHCb.Event.Enum.Track.Type.Long)
 ## @see LoKi::Cuts::ISUP
-ISUP = equal_to(TRTYPE, LHCb.Track.Upstream)
+ISUP = equal_to(TRTYPE, LHCb.Event.Enum.Track.Type.Upstream)
 ## @see LoKi::Cuts::ISDOWN
-ISDOWN = equal_to(TRTYPE, LHCb.Track.Downstream)
+ISDOWN = equal_to(TRTYPE, LHCb.Event.Enum.Track.Type.Downstream)
 ## @see LoKi::Cuts::ISTTRACK
-ISTTRACK = equal_to(TRTYPE, LHCb.Track.Ttrack)
+ISTTRACK = equal_to(TRTYPE, LHCb.Event.Enum.Track.Type.Ttrack)
 
 # =============================================================================
 if '__main__' == __name__: