Clean up LHCbID

Goals:

• Reorder detectors in enum to follow ordering by z coordinate.
• Remove detectors from Run 1/2.

Needs: Rec!2680 (merged) Run2Support!21 (merged) Alignment!231 (merged) Moore!1263 (merged)

Needs Rec!3143 (merged) Lbcom!625 (merged) Allen!978 (merged) Moore!1807 (merged)

Event/TrackEvent/tests/src/test_track_v2.cpp

@@ -191,7 +191,7 @@ BOOST_AUTO_TEST_CASE( test_track_lhcbids ) {
   BOOST_CHECK( tracks[0].nCommonLhcbIDs( tracks[1] ) == 0 );
   BOOST_CHECK( tracks[1].nCommonLhcbIDs( tracks[2] ) == 2 );
 
-  std::vector<LHCb::LHCbID> lhcbids{velo_id, ut_id, ft_id};
+  std::vector<LHCb::LHCbID> lhcbids{velo_id, ft_id, ut_id};
   BOOST_CHECK( std::is_sorted( begin( lhcbids ), end( lhcbids ) ) == false );
   auto tr = Track{};
   tr.setLhcbIDs( lhcbids, LHCb::Tag::Unordered );
@@ -205,7 +205,7 @@ BOOST_AUTO_TEST_CASE( test_track_lhcbids ) {
 
   ut_id.setID( 100 );
   ft_id.setID( 20 );
-  std::vector<LHCb::LHCbID> more_lhcbids{velo_id, ut_id, ft_id};
+  std::vector<LHCb::LHCbID> more_lhcbids{velo_id, ft_id, ut_id};
   std::sort( begin( more_lhcbids ), end( more_lhcbids ) );
   // tr.addSortedToLhcbIDs(more_lhcbids);
   tr.addToLhcbIDs( more_lhcbids, LHCb::Tag::Sorted );
@@ -215,7 +215,7 @@ BOOST_AUTO_TEST_CASE( test_track_lhcbids ) {
 
   ut_id.setID( 101 );
   ft_id.setID( 21 );
-  std::vector<LHCb::LHCbID> even_more_lhcbids{velo_id, ut_id, ft_id};
+  std::vector<LHCb::LHCbID> even_more_lhcbids{velo_id, ft_id, ut_id};
   BOOST_CHECK( std::is_sorted( begin( even_more_lhcbids ), end( even_more_lhcbids ) ) == false );
   BOOST_CHECK( tr.addToLhcbIDs( even_more_lhcbids, LHCb::Tag::Unordered ) == false );
   ids = tr.lhcbIDs();