Correct silently failing ACTS CI test

Correct silently failing ACTS CI test

Tracking/Acts/ActsConfig/test/ActsPersistifyEDM.sh

@@ -14,12 +14,22 @@ Reco_tf.py --CA \
   --outputAODFile AOD.pool.root \
   --maxEvents ${n_events}
 
+rc=$?
+if [ $rc != 0 ]; then
+    exit $rc
+fi
+
 # Check we can retrieve the EDM, and related quantities, with our analysis algorithms
 ActsReadEDM.py \
    --filesInput AOD.pool.root -- \
    readClusters=True \
    readSpacePoints=True
 
+rc=$?
+if [ $rc != 0 ]; then
+    exit $rc
+fi
+
 # Check we can run IDPVM
 runIDPVM.py \
    --filesInput AOD.pool.root \

Tracking/Acts/ActsDataPreparation/test/runCompositeRoICode.py

@@ -57,8 +57,9 @@ if __name__ == "__main__":
     acc.merge(ActsITkStripClusterizationAlgCfg(flags,
                                                RoIs='TestCompositeRoI'))
 
-    from ActsConfig.ActsAnalysisConfig import ActsClusterAnalysisCfg
-    acc.merge(ActsClusterAnalysisCfg(flags))
+    from ActsConfig.ActsAnalysisConfig import ActsPixelClusterAnalysisAlgCfg, ActsStripClusterAnalysisAlgCfg
+    acc.merge(ActsPixelClusterAnalysisAlgCfg(flags))
+    acc.merge(ActsStripClusterAnalysisAlgCfg(flags))
 
     acc.printConfig(withDetails = True, summariseProps = True)
     acc.run()

Tracking/Acts/ActsDataPreparation/test/runFullScanRoICode.py

@@ -34,8 +34,9 @@ if __name__ == "__main__":
     from ActsConfig.ActsClusterizationConfig import ActsITkStripClusterizationAlgCfg
     acc.merge(ActsITkStripClusterizationAlgCfg(flags))
 
-    from ActsConfig.ActsAnalysisConfig import ActsClusterAnalysisCfg
-    acc.merge(ActsClusterAnalysisCfg(flags))
+    from ActsConfig.ActsAnalysisConfig import ActsPixelClusterAnalysisAlgCfg, ActsStripClusterAnalysisAlgCfg
+    acc.merge(ActsPixelClusterAnalysisAlgCfg(flags))
+    acc.merge(ActsStripClusterAnalysisAlgCfg(flags))
 
     acc.printConfig(withDetails = True, summariseProps = True)
     acc.run()

Tracking/Acts/ActsDataPreparation/test/runSingleRoICode.py

@@ -52,8 +52,9 @@ if __name__ == "__main__":
     acc.merge(ActsITkStripClusterizationAlgCfg(flags,
                                                RoIs='TestSingleRoI'))
 
-    from ActsConfig.ActsAnalysisConfig import ActsClusterAnalysisCfg
-    acc.merge(ActsClusterAnalysisCfg(flags))
+    from ActsConfig.ActsAnalysisConfig import ActsPixelClusterAnalysisAlgCfg, ActsStripClusterAnalysisAlgCfg
+    acc.merge(ActsPixelClusterAnalysisAlgCfg(flags))
+    acc.merge(ActsStripClusterAnalysisAlgCfg(flags))
 
     acc.printConfig(withDetails = True, summariseProps = True)
     acc.run()

Tracking/Acts/ActsMonitoring/test/ActsReadEDM.py

@@ -29,13 +29,22 @@ if __name__ == "__main__":
     acc.merge(PoolReadCfg(flags))
     
     if flags.readClusters:
-        from ActsConfig.ActsAnalysisConfig import ActsClusterAnalysisCfg
-        acc.merge(ActsClusterAnalysisCfg(flags))
+        if flags.Detector.EnableITkPixel:
+            from ActsConfig.ActsAnalysisConfig import ActsPixelClusterAnalysisAlgCfg
+            acc.merge(ActsPixelClusterAnalysisAlgCfg(flags))
+        if flags.Detector.EnableITkStrip:
+            from ActsConfig.ActsAnalysisConfig import ActsStripClusterAnalysisAlgCfg
+            acc.merge(ActsStripClusterAnalysisAlgCfg(flags))
 
     if flags.readSpacePoints:
-        from ActsConfig.ActsAnalysisConfig import ActsSpacePointAnalysisCfg
-        acc.merge(ActsSpacePointAnalysisCfg(flags))
-
+        if flags.Detector.EnableITkPixel:             
+            from ActsConfig.ActsAnalysisConfig import ActsPixelSpacePointAnalysisAlgCfg
+            acc.merge(ActsPixelSpacePointAnalysisAlgCfg(flags))
+        if flags.Detector.EnableITkStrip:
+            from ActsConfig.ActsAnalysisConfig import ActsStripSpacePointAnalysisAlgCfg, ActsStripOverlapSpacePointAnalysisAlgCfg
+            acc.merge(ActsStripSpacePointAnalysisAlgCfg(flags))
+            acc.merge(ActsStripOverlapSpacePointAnalysisAlgCfg(flags))
+             
     acc.printConfig()
     status = acc.run()
     if status.isFailure():