Merge branch '21.9-TrackSummaryAndUpdates_1901' into '21.9'

Fixing reco problem due to missing fields in the xAOD::TrackSummary

See merge request atlas/athena!20322

Event/xAOD/xAODTracking/Root/TrackSummaryAccessors_v1.cxx

@@ -107,7 +107,20 @@ trackSummaryAccessorV1<uint8_t>( xAOD::SummaryType type ) {
   DEFINE_ACCESSOR( uint8_t, numberOfTriggerEtaHoleLayers );
   DEFINE_ACCESSOR( uint8_t, numberOfOutliersOnTrack           );
   DEFINE_ACCESSOR( uint8_t, standardDeviationOfChi2OS         );
-  DEFINE_ACCESSOR( uint8_t, numberOfGoodPrecisionLayers       );
+  DEFINE_ACCESSOR( uint8_t, numberOfGoodPrecisionLayers       );  
+  DEFINE_ACCESSOR( uint8_t, numberOfContribPixelBarrelFlatLayers    );
+  DEFINE_ACCESSOR( uint8_t, numberOfContribPixelBarrelInclinedLayers);
+  DEFINE_ACCESSOR( uint8_t, numberOfContribPixelBarrelRings         );
+  DEFINE_ACCESSOR( uint8_t, numberOfContribPixelEndcap              );
+  DEFINE_ACCESSOR( uint8_t, numberOfPixelBarrelFlatHits             );
+  DEFINE_ACCESSOR( uint8_t, numberOfPixelBarrelInclinedHits         );
+  DEFINE_ACCESSOR( uint8_t, numberOfPixelBarrelRingHits             );
+  DEFINE_ACCESSOR( uint8_t, numberOfPixelEndcapHits                 );
+  DEFINE_ACCESSOR( uint8_t, numberOfPixelBarrelFlatHoles            );
+  DEFINE_ACCESSOR( uint8_t, numberOfPixelBarrelInclinedHoles        );
+  DEFINE_ACCESSOR( uint8_t, numberOfPixelBarrelRingHoles            );
+  DEFINE_ACCESSOR( uint8_t, numberOfPixelEndcapHoles                );
+  
   default:
     std::cerr << "xAOD::TrackParticle_v1 ERROR Unknown SummaryType ("
               << type << ") requested" << std::endl;

Event/xAOD/xAODTracking/xAODTracking/TrackingPrimitives.h

@@ -287,8 +287,25 @@ namespace xAOD {
     // removed:   eProbabilityToT                 = 49, //!< Electron probability from Time-Over-Threshold (ToT) information [float].    
     // removed:   eProbabilityBrem                = 50, //!< Electron probability from Brem fitting (DNA) [float].  
     pixeldEdx                       = 51, //!< the dE/dx estimate, calculated using the pixel clusters [?]
+    
+    // Additional info for ITk
+    numberOfContribPixelBarrelFlatLayers     = 73,  //!< number of contributing barrel flat layers of the pixel detector [unit8_t].
+    numberOfContribPixelBarrelInclinedLayers = 74,  //!< number of contributing barrel inclined layers of the pixel detector [unit8_t].
+    numberOfContribPixelBarrelRings          = 75,  //!< number of contributing barrel ring layers of the pixel detector [unit8_t].
+    numberOfContribPixelEndcap               = 76,  //!< number of contributing endcap layers of the pixel detector [unit8_t].
+    
+    numberOfPixelBarrelFlatHits              = 77,  //!< these are the pixel hits, in the barrel flat layers [unit8_t].
+    numberOfPixelBarrelInclinedHits          = 78,  //!< these are the pixel hits, in the barrel inclined layers [unit8_t].
+    numberOfPixelBarrelRingHits              = 79,  //!< these are the pixel hits, in the barrel ring layers [unit8_t].
+    numberOfPixelEndcapHits                  = 80,  //!< these are the pixel hits, in the endcap layers [unit8_t].
+                                            
+    numberOfPixelBarrelFlatHoles             = 81,  //!< number of pixel barrel flat layers on track with absence of hits [unit8_t].
+    numberOfPixelBarrelInclinedHoles         = 82,  //!< number of pixel barrel flat inclined on track with absence of hits [unit8_t].
+    numberOfPixelBarrelRingHoles             = 83,  //!< number of pixel barrel ring layers on track with absence of hits [unit8_t].
+    numberOfPixelEndcapHoles                 = 84,  //!< number of pixel endcap layers on track with absence of hits [unit8_t].
+    
     // -- numbers...
-    numberOfTrackSummaryTypes       = 67
+    numberOfTrackSummaryTypes       = 85
   };
 
   /// Enumerates the different types of information stored in Summary. 

InnerDetector/InDetExample/InDetRecExample/share/InDetxAODCreator.py

@@ -45,6 +45,8 @@ InDetxAODParticleCreatorTool = Trk__TrackParticleCreatorTool(name = "InDetxAODPa
                                                              KeepFirstParameters     = InDetFlags.KeepFirstParameters(),
                                                              PerigeeExpression       = _perigee_expression)
 
+if InDetFlags.doSLHC():
+    InDetxAODParticleCreatorTool.DoITk=True
 
 ToolSvc += InDetxAODParticleCreatorTool 
 if InDetFlags.doPrintConfigurables(): 

Tracking/TrkTools/TrkParticleCreator/TrkParticleCreator/TrackParticleCreatorTool.h

@@ -192,6 +192,7 @@ private:
   bool m_doIBL;
   bool m_useTrackSummaryTool;
   bool m_useMuonSummaryTool;
+  bool m_doITk;
   bool m_forceTrackSummaryUpdate; /** use to force an update of the track summary
   rather than using the cached summary */
     /** the following keep options are mutually exclusive **/

Tracking/TrkTools/TrkParticleCreator/src/TrackParticleCreatorTool.cxx

@@ -115,6 +115,7 @@ namespace Trk
     m_copyExtraSummaryName {"eProbabilityComb","eProbabilityHT","TRTTrackOccupancy","TRTdEdx","TRTdEdxUsedHits"},
     m_useTrackSummaryTool (true),
     m_useMuonSummaryTool  (false),
+    m_doITk               (false),
     m_forceTrackSummaryUpdate (false),
     m_keepParameters      (false),
     m_keepFirstParameters(false),
@@ -131,6 +132,7 @@ namespace Trk
     declareProperty("MagFieldSvc",              m_magFieldSvc);
     declareProperty("UseTrackSummaryTool" , m_useTrackSummaryTool);
     declareProperty("UseMuonSummaryTool" , m_useMuonSummaryTool);
+    declareProperty("DoITk" , m_doITk);
     declareProperty("KeepParameters",   m_keepParameters);
     declareProperty("KeepFirstParameters",   m_keepFirstParameters);
     declareProperty("KeepAllPerigee",   m_keepAllPerigee);
@@ -1006,6 +1008,7 @@ void TrackParticleCreatorTool::setTrackSummary( xAOD::TrackParticle& tp, const T
       continue;
     }
     if( i >= Trk::numberOfStgcEtaHits && i <= Trk::numberOfMmHoles) continue;
+    if( !m_doITk && i >= Trk::numberOfContribPixelBarrelFlatLayers && i <= Trk::numberOfPixelEndcapHoles) continue;
     // coverity[mixed_enums]
     if (i == Trk::numberOfTRTHitsUsedFordEdx ) continue;