Merge branch 'master-ATLASRECT-5078-TrigOnlineSpacePointTool' into 'master'

Partially use SiDetectorElementCollection of condition store in TrigOnlineSpacePointTool (ATLASRECTS-5078)

See merge request atlas/athena!26328

Trigger/TrigTools/TrigOnlineSpacePointTool/src/FastPixelClusterization.cxx

@@ -113,7 +113,12 @@ void FastPixelClusterization::initializeGeometry(const InDetDD::PixelDetectorMan
 
 
 
-void FastPixelClusterization::addHit( const Identifier waferId, const IdentifierHash  hashElemId, const unsigned int phi_channel, const unsigned int rz_channel, const PixelRDORawData* pHit ) {
+void FastPixelClusterization::addHit( const Identifier waferId,
+                                      const IdentifierHash hashElemId,
+                                      const unsigned int phi_channel,
+                                      const unsigned int rz_channel,
+                                      const PixelRDORawData* pHit,
+                                      const InDetDD::SiDetectorElement* element ) {
 
 #ifdef CLUSTERING_DBG   
   std::cout << "phi_channel = " << phi_channel << "  rz_channel = " << rz_channel << std::endl; 
@@ -139,7 +144,7 @@ void FastPixelClusterization::addHit( const Identifier waferId, const Identifier
     m_element = waferId;
     m_currentClusterColl = new InDet::PixelClusterCollection(hashElemId);
     m_currentClusterColl->setIdentifier(waferId);
-    m_detEl=m_man->getDetectorElement(hashElemId);
+    m_detEl=element;
 
     // Add the hit
     filling_withHit(phi_channel, rz_channel,tot);
@@ -198,7 +203,7 @@ void FastPixelClusterization::addHit( const Identifier waferId, const Identifier
 	m_splittedCollection=false;
       }
 
-    m_detEl=m_man->getDetectorElement(hashElemId);
+    m_detEl=element;
 
     // Add the hit
 

Trigger/TrigTools/TrigOnlineSpacePointTool/src/FastPixelClusterization.h

@@ -54,8 +54,9 @@ class FastPixelClusterization {
     void setPixelID(const PixelID* pixelID){ m_pixelID = pixelID; }  
 
     void addHit( const Identifier waferId, const IdentifierHash  hashElemId, 
-        const unsigned int phi_channel, const unsigned int rz_channel, 
-        const PixelRDORawData* pHit = 0);
+                 const unsigned int phi_channel, const unsigned int rz_channel, 
+                 const PixelRDORawData* pHit,
+                 const InDetDD::SiDetectorElement* element );
 
     void finishHits();
 
@@ -221,7 +222,7 @@ class FastPixelClusterization {
   private:
 
     const InDetDD::PixelDetectorManager* m_man;
-    InDetDD::SiDetectorElement* m_detEl;
+    const InDetDD::SiDetectorElement* m_detEl;
 
     const ISiLorentzAngleTool* m_lorentzAngleTool;
 

Trigger/TrigTools/TrigOnlineSpacePointTool/src/PixelClusterCacheTool.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <algorithm>
@@ -8,7 +8,7 @@
 #include "InDetIdentifier/PixelID.h"
 #include "Identifier/IdentifierHash.h" 
 
-#include "InDetReadoutGeometry/SiDetectorManager.h"
+#include "InDetReadoutGeometry/PixelDetectorManager.h"
 
 #include "InDetPrepRawData/SiClusterContainer.h"
 #include "InDetPrepRawData/PixelClusterCollection.h"
@@ -69,8 +69,6 @@ StatusCode PixelClusterCacheTool::initialize()  {
     return StatusCode::FAILURE;
   } 
 
-  p_indet_mgr = mgr;  
-
   m_clusterization.setPixelID(m_pixel_id);
   m_clusterization.initializeGeometry(mgr);
   m_clusterization.setLorentzAngleTool(m_lorentzAngleTool.get());
@@ -132,6 +130,8 @@ StatusCode PixelClusterCacheTool::initialize()  {
     m_rdoContainer->addRef();
   }
 
+  ATH_CHECK(m_pixelDetEleCollKey.initialize());
+
   return sc;
 }
 
@@ -151,6 +151,14 @@ StatusCode PixelClusterCacheTool::convertBStoClusters(std::vector<const ROBF*>&
                                                       const std::vector<IdentifierHash>& listOfPixIds,
 							std::vector<int>& errorVect, bool isFullScan)
 {
+  // Get PixelDetectorElementCollection
+  SG::ReadCondHandle<InDetDD::SiDetectorElementCollection> pixelDetEle(m_pixelDetEleCollKey);
+  const InDetDD::SiDetectorElementCollection* elements(pixelDetEle.retrieve());
+  if (elements==nullptr) {
+    ATH_MSG_FATAL(m_pixelDetEleCollKey.fullKey() << " could not be retrieved");
+    return StatusCode::FAILURE;
+  }
+
   if(!evtStore()->contains<InDet::PixelClusterContainer>(m_containerName))
     {
       m_clusterContainer->cleanup();
@@ -285,6 +293,7 @@ StatusCode PixelClusterCacheTool::convertBStoClusters(std::vector<const ROBF*>&
   int npixels=0;
   for (std::vector<IdentifierHash>::iterator it=reducedList.begin(); it != reducedList.end(); ++it)
     {
+      const InDetDD::SiDetectorElement* element = elements->getDetectorElement((*it));
       PixelRDO_Container::const_iterator collIt=m_rdoContainer->indexFind((*it));
       if(collIt==m_rdoContainer->end())
 	continue;
@@ -302,7 +311,8 @@ StatusCode PixelClusterCacheTool::convertBStoClusters(std::vector<const ROBF*>&
 		  npixels++;
 		  m_clusterization.addHit(coll_id,coll_hash_id,
 					  m_pixel_id->phi_index(pixId),
-					  m_pixel_id->eta_index(pixId),(*rdoIt));
+					  m_pixel_id->eta_index(pixId),(*rdoIt),
+                                          element);
 		}
 	    }
 	  else 

Trigger/TrigTools/TrigOnlineSpacePointTool/src/PixelClusterCacheTool.h

@@ -7,14 +7,15 @@
 
 #include "ByteStreamData/RawEvent.h"
 #include "AthenaBaseComps/AthAlgTool.h"
-#include "InDetReadoutGeometry/PixelDetectorManager.h"
 #include "IPixelClusterCacheTool.h"
 #include "InDetPrepRawData/PixelClusterCollection.h"
 #include "InDetPrepRawData/PixelClusterContainer.h"
 #include "InDetRawData/PixelRDO_Container.h"
+#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
 #include "PixelRawDataByteStreamCnv/IPixelRodDecoder.h"
 #include "PixelConditionsServices/IPixelByteStreamErrorsSvc.h"
 #include "SiClusterizationTool/IPixelClusteringTool.h"
+#include "StoreGate/ReadCondHandleKey.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "InDetCondTools/ISiLorentzAngleTool.h"
 #include <vector>
@@ -45,7 +46,6 @@ private:
   std::string m_containerName;
   FastPixelClusterization m_clusterization;
   //PixelIdMapping *m_IdMapping; 
-  const InDetDD::PixelDetectorManager* p_indet_mgr;
   const PixelID* m_pixel_id;
   IdContext m_cntx_pix;   
   ToolHandle<IPixelRodDecoder> m_offlineDecoder;
@@ -55,6 +55,7 @@ private:
   ServiceHandle<IPixelByteStreamErrorsSvc>   m_bsErrorSvc;
   ToolHandle<InDet::IPixelClusteringTool> m_clusteringTool;
   ToolHandle<ISiLorentzAngleTool> m_lorentzAngleTool{this, "LorentzAngleTool", "PixelLorentzAngleTool", "Tool to retreive Lorentz angle"};
+  SG::ReadCondHandleKey<InDetDD::SiDetectorElementCollection> m_pixelDetEleCollKey{this, "PixelDetEleCollKey", "PixelDetectorElementCollection", "Key of SiDetectorElementCollection for Pixel"};
 
   bool m_doBS;
 };