Merge branch 'RewriteSpacePointFormationJobOption' into 'main'

Rewrite ACTS space point formation job option

See merge request atlas/athena!71155

Tracking/Acts/ActsConfig/test/ActsConversionWorkflow.sh

@@ -10,7 +10,7 @@ ignore_pattern="ActsTrackFindingAlg.+ERROR.+Propagation.+reached.+the.+step.+cou
 
 export ATHENA_CORE_NUMBER=1
 Reco_tf.py --CA \
-  --preExec "flags.Acts.doITkConversion=True;flags.Tracking.doTruth=False;flags.Tracking.doITkConversion=False;" \
+  --preExec "flags.Acts.doITkConversion=True;flags.Tracking.doITkConversion=False;" \
   --preInclude "ActsConfig.ActsCIFlags.actsWorkflowFlags" \
   --ignorePatterns "${ignore_pattern}" \
   --inputRDOFile ${input_rdo} \

Tracking/Acts/ActsDataPreparation/src/CacheCreator.cxx

@@ -5,23 +5,27 @@
 #include "CacheCreator.h"
 
 namespace ActsTrk::Cache {
-    CreatorAlg::CreatorAlg(const std::string &name,ISvcLocator *pSvcLocator):IDCCacheCreatorBase(name,pSvcLocator)
-    {
-    }
-
-    StatusCode CreatorAlg::initialize(){
-        ATH_CHECK(m_pixelClusterCacheKey.initialize(SG::AllowEmpty));
-        ATH_CHECK(m_stripClusterCacheKey.initialize(SG::AllowEmpty));
+    CreatorAlg::CreatorAlg(const std::string &name,
+			   ISvcLocator *pSvcLocator)
+      : IDCCacheCreatorBase(name,pSvcLocator)
+    {}
 
-        ATH_CHECK(m_pixelSPCacheKey.initialize(SG::AllowEmpty));
-        ATH_CHECK(m_stripSPCacheKey.initialize(SG::AllowEmpty));
-        ATH_CHECK(m_stripOSPCacheKey.initialize(SG::AllowEmpty));
+    StatusCode CreatorAlg::initialize() {
+        ATH_MSG_DEBUG("Initializing " << name() << " ...");
+	
+	m_do_pixClusters = not m_pixelClusterCacheKey.empty();
+        m_do_stripClusters = not m_stripClusterCacheKey.empty();
 
-        m_do_pixClusters = !m_pixelClusterCacheKey.key().empty();
-        m_do_stripClusters = !m_stripClusterCacheKey.key().empty();
+        m_do_pixSpacePoints = not m_pixelSPCacheKey.empty();
+	m_do_stripSpacePoints = not m_stripSPCacheKey.empty();
+	m_do_stripOverlapSpacePoints = not m_stripOSPCacheKey.empty();
+	
+        ATH_CHECK(m_pixelClusterCacheKey.initialize(m_do_pixClusters));
+        ATH_CHECK(m_stripClusterCacheKey.initialize(m_do_stripClusters));
 
-        m_do_pixSP = !m_pixelSPCacheKey.key().empty();
-        m_do_stripSP = !m_stripSPCacheKey.key().empty();
+        ATH_CHECK(m_pixelSPCacheKey.initialize(m_do_pixSpacePoints));
+        ATH_CHECK(m_stripSPCacheKey.initialize(m_do_stripSpacePoints));
+        ATH_CHECK(m_stripOSPCacheKey.initialize(m_do_stripOverlapSpacePoints));
 
         ATH_CHECK(detStore()->retrieve(m_pix_idHelper, "PixelID"));
         ATH_CHECK(detStore()->retrieve(m_strip_idHelper, "SCT_ID"));
@@ -29,25 +33,34 @@ namespace ActsTrk::Cache {
         return StatusCode::SUCCESS;
     }
 
-    StatusCode CreatorAlg::execute(const EventContext& ctx) const{
-        if(m_do_pixClusters){
+    StatusCode CreatorAlg::execute(const EventContext& ctx) const {
+      ATH_MSG_DEBUG("Executing " << name() << " ...");
+      
+        if (m_do_pixClusters) {
             ATH_CHECK(createContainer(m_pixelClusterCacheKey, m_pix_idHelper->wafer_hash_max(), ctx));
+	    ATH_MSG_DEBUG("created pixel cluster container");
         }
 
-        if(m_do_stripClusters){
+        if (m_do_stripClusters) {
             ATH_CHECK(createContainer(m_stripClusterCacheKey, m_strip_idHelper->wafer_hash_max(), ctx));
+	    ATH_MSG_DEBUG("created strip cluster container");
         }
 
-        if(m_do_pixSP){
+        if (m_do_pixSpacePoints) {
             ATH_CHECK(createContainer(m_pixelSPCacheKey, m_pix_idHelper->wafer_hash_max(), ctx));
+	    ATH_MSG_DEBUG("created pixel space point container");
         }
 
-        if(m_do_stripSP){
+        if (m_do_stripSpacePoints) {
             ATH_CHECK(createContainer(m_stripSPCacheKey, m_strip_idHelper->wafer_hash_max(), ctx));
-            ATH_CHECK(createContainer(m_stripOSPCacheKey, m_strip_idHelper->wafer_hash_max(), ctx));
-	    ATH_MSG_DEBUG("created strip sp containers");
+	    ATH_MSG_DEBUG("created strip space point container");
         }
 
+	if (m_do_stripOverlapSpacePoints) {
+	  ATH_CHECK(createContainer(m_stripOSPCacheKey, m_strip_idHelper->wafer_hash_max(), ctx));
+	  ATH_MSG_DEBUG("created overlap strip space point container");
+	}
+
         return StatusCode::SUCCESS;
     }
 }

Tracking/Acts/ActsDataPreparation/src/CacheCreator.h

@@ -18,6 +18,8 @@ namespace ActsTrk::Cache{
     class CreatorAlg: public IDCCacheCreatorBase{
     public:
         CreatorAlg(const std::string &name,ISvcLocator *pSvcLocator);
+        virtual ~CreatorAlg() = default;
+
         virtual StatusCode initialize () override;
         virtual StatusCode execute (const EventContext& ctx) const override;
 
@@ -25,18 +27,19 @@ namespace ActsTrk::Cache{
         SG::WriteHandleKey<Handles<xAOD::PixelCluster>::IDCBackend> m_pixelClusterCacheKey{this, "PixelClustersCacheKey", ""};
         SG::WriteHandleKey<Handles<xAOD::StripCluster>::IDCBackend> m_stripClusterCacheKey{this, "StripClustersCacheKey", ""};
 
-        SG::WriteHandleKey<Handles<xAOD::SpacePoint>::IDCBackend> m_pixelSPCacheKey{this, "PixelSPCacheKey", ""};
-        SG::WriteHandleKey<Handles<xAOD::SpacePoint>::IDCBackend> m_stripSPCacheKey{this, "StripSPCacheKey", ""};
-        SG::WriteHandleKey<Handles<xAOD::SpacePoint>::IDCBackend> m_stripOSPCacheKey{this, "StripOSPCacheKey", ""};
+        SG::WriteHandleKey<Handles<xAOD::SpacePoint>::IDCBackend> m_pixelSPCacheKey{this, "PixelSpacePointCacheKey", ""};
+        SG::WriteHandleKey<Handles<xAOD::SpacePoint>::IDCBackend> m_stripSPCacheKey{this, "StripSpacePointCacheKey", ""};
+        SG::WriteHandleKey<Handles<xAOD::SpacePoint>::IDCBackend> m_stripOSPCacheKey{this, "StripOverlapSpacePointCacheKey", ""};
 
         const PixelID* m_pix_idHelper{};
         const SCT_ID*  m_strip_idHelper{};
 
-        bool m_do_pixSP{false};
-        bool m_do_stripSP{false};
-
         bool m_do_pixClusters{false};
         bool m_do_stripClusters{false};
-    };
+
+        bool m_do_pixSpacePoints{false};
+        bool m_do_stripSpacePoints{false};
+        bool m_do_stripOverlapSpacePoints{false};
+};
 }
 #endif