TrackEnums drop unused FitHistory types and add PrKalmanFilter and TrackMasterFitter

Event/TrackEvent/include/Event/SOATrackConversion.h

@@ -87,14 +87,16 @@ namespace LHCb::Event::conversion {
     case v3::TrackType::Long:
       switch ( t.fitHistory() ) {
       case Enum::Track::FitHistory::Unknown:
+      case Enum::Track::FitHistory::PrKalmanFilter:
+      case Enum::Track::FitHistory::TrackMasterFitter:
         return detail::update_states_impl( outTrack, t, v3::available_states_t<v3::TrackType::Long>{} );
       case Enum::Track::FitHistory::VeloKalman:
         return detail::update_states_impl(
             outTrack, t, v3::available_states_t<v3::TrackType::Long, Enum::Track::FitHistory::VeloKalman>{} );
-      default:
-        throw GaudiException( "FitHistory case for Long track not handled.", "SOATrackConversion",
-                              StatusCode::FAILURE );
+      case Enum::Track::FitHistory::Last:
+        throw GaudiException( "Last is not a valid FitHistory.", "SOATrackConversion", StatusCode::FAILURE );
       }
+      __builtin_unreachable();
     case v3::TrackType::Upstream:
       return detail::update_states_impl( outTrack, t, v3::available_states_t<v3::TrackType::Upstream>{} );
     case v3::TrackType::Downstream:

Event/TrackEvent/include/Event/TrackEnums.h

@@ -35,11 +35,11 @@ namespace LHCb::Event::Enum::Track {
                    Last )
 
       /// Track fit history enumerations
-      meta_enum_class( FitHistory, int, Unknown = 0,
-                       // FIXME: define better ones or drop ? they are not used anywhere          // track not fitted
-                       // yet (fit history not set)
-                       StdKalman,                    // track fitted with the standard Kalman fitter
-                       BiKalmanm, VeloKalman, Last ) // track fitted with the bi-directional Kalman fitter
+      meta_enum_class( FitHistory, int, Unknown = 0, // track probably not fitted
+                       PrKalmanFilter,               // track fitted by PrKalmanFilter
+                       TrackMasterFitter,            // track fitted by TrackMasterFitter
+                       VeloKalman,                   // track fitted VeloKalman (CPU or GPU version)
+                       Last )
 
       /// Track type enumerations, note that these are not consecutive numbers (to not break downstream code)
       meta_enum_class( Type, int,

Event/TrackEvent/include/Event/Track_v3.h

@@ -438,13 +438,16 @@ namespace LHCb::Event::v3 {
       case TrackType::Long:
         switch ( m_fitHistory ) {
         case FitHistory::Unknown:
+        case FitHistory::PrKalmanFilter:
+        case FitHistory::TrackMasterFitter:
           return available_states_t<TrackType::Long>::set;
         case FitHistory::VeloKalman:
           return available_states_t<TrackType::Long, FitHistory::VeloKalman>::set;
-        default:
-          throw GaudiException( "FitHistory case for Long track not handled.", "LHCb::Event::v3::Tracks::state_set()",
+        case FitHistory::Last:
+          throw GaudiException( "Last is not a valid FitHistory.", "LHCb::Event::v3::Tracks::state_set()",
                                 StatusCode::FAILURE );
         }
+        __builtin_unreachable();
       case TrackType::Upstream:
         return available_states_t<TrackType::Upstream>::set;
       case TrackType::Downstream: