Remove upgrade detectors

See merge request !583 (merged)

(cherry picked from commit b10e1828)

Phys/DecayTreeTupleReco/src/TupleToolTrackInfo.cpp

 /*****************************************************************************\
-* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2000-2020 CERN for the benefit of the LHCb Collaboration      *
 *                                                                             *
 * This software is distributed under the terms of the GNU General Public      *
 * Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   *
@@ -8,7 +8,6 @@
 * granted to it by virtue of its status as an Intergovernmental Organization  *
 * or submit itself to any jurisdiction.                                       *
 \*****************************************************************************/
-// $Id: TupleToolTrackInfo.cpp,v 1.12 2010-04-23 12:01:26 jhe Exp $
 // Include files
 
 // from Gaudi
@@ -106,7 +105,6 @@ StatusCode TupleToolTrackInfo::fill( const LHCb::Particle*
   }
   if ( isVerbose() )
   {
-    // -- Run I+II
     int nVeloR      = 0;
     int nVeloPhi    = 0;
     int nVelo       = 0;
@@ -114,19 +112,12 @@ StatusCode TupleToolTrackInfo::fill( const LHCb::Particle*
     int nTT         = 0;
     int nIT         = 0;
     int nOT         = 0;
-    // -- Run III
-    int nVP         = 0;
-    int nUT         = 0;
-    int nFT         = 0;
 
     //-- hopefully unique double constructed from multiplying all hit IDs
     double veloUTID = 1.;
     double ttUTID   = 1.;
     double itUTID   = 1.;
     double otUTID   = 1.;
-    double vpUTID   = 1.;
-    double utUTID   = 1.;
-    double ftUTID   = 1.;
 
     for ( LHCb::LHCbID id : track->lhcbIDs() ){
       if ( id.isVelo() ){
@@ -144,16 +135,6 @@ StatusCode TupleToolTrackInfo::fill( const LHCb::Particle*
       }else if( id.isOT() ){
         otUTID *=  (double(id.otID().channelID())/50000000.);
         ++nOT;
-        // -- numbers to divide by for upgrade are 'untuned'
-      }else if( id.isVP() ){
-        vpUTID *=  (double(id.vpID().channelID())/1000000.);
-        ++nVP;
-      }else if( id.isUT() ){
-        utUTID *=  (double(id.stID().channelID())/10000000.);
-        ++nUT;
-      }else if( id.isFT() ){
-        ftUTID *=  (double(id.ftID().channelID())/100000000.);
-        ++nFT;
       }
     }
     // -- unique ids
@@ -161,9 +142,6 @@ StatusCode TupleToolTrackInfo::fill( const LHCb::Particle*
     test &= tuple->column( prefix+"_TRACK_TT_UTID",   ttUTID   );
     test &= tuple->column( prefix+"_TRACK_IT_UTID",   itUTID   );
     test &= tuple->column( prefix+"_TRACK_OT_UTID",   otUTID   );
-    test &= tuple->column( prefix+"_TRACK_VP_UTID",   vpUTID   );
-    test &= tuple->column( prefix+"_TRACK_UT_UTID",   utUTID   );
-    test &= tuple->column( prefix+"_TRACK_FT_UTID",   ftUTID   );
 
     // -- nHits
     test &= tuple->column( prefix+"_TRACK_nVeloHits",       nVelo       );
@@ -173,9 +151,6 @@ StatusCode TupleToolTrackInfo::fill( const LHCb::Particle*
     test &= tuple->column( prefix+"_TRACK_nTTHits",         nTT         );
     test &= tuple->column( prefix+"_TRACK_nITHits",         nIT         );
     test &= tuple->column( prefix+"_TRACK_nOTHits",         nOT         );
-    test &= tuple->column( prefix+"_TRACK_nVPHits",         nVP         );
-    test &= tuple->column( prefix+"_TRACK_nUTHits",         nUT         );
-    test &= tuple->column( prefix+"_TRACK_nFTHits",         nFT         );
 
     const LHCb::State* uState = track->stateAt( LHCb::State::FirstMeasurement );
     test &= tuple->column( prefix+"_TRACK_FirstMeasurementX", uState ? uState->x() : -999 );