merging EVcreators

AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestWrite.py

@@ -13,10 +13,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-gbl.AthenaServices.SetFatalHandler(438)
-
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
@@ -27,6 +23,9 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
 ## get a handle to the ApplicationManager
 from AthenaCommon.AppMgr import theApp
 
+# Set handler for traceback
+svcMgr.CoreDumpSvc.FatalHandler = 438
+
 #--------------------------------------------------------------
 # Load POOL support
 #--------------------------------------------------------------

AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWrite.py

@@ -13,10 +13,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()

AtlasTest/DatabaseTest/IOVDbTestAlg/share/AllReadCool.py

@@ -7,9 +7,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
 #import password for devdb10 from devdb10pwd.py
 from devdb10_pwd import devdb10pwd
 

AtlasTest/DatabaseTest/IOVDbTestAlg/share/AllWriteCool.py

 import AthenaCommon.AtlasUnixGeneratorJob
-gbl.AthenaServices.SetFatalHandler(438)
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
 from AthenaCommon.AppMgr import ServiceMgr as svcMgr
@@ -10,6 +9,8 @@ from devdb10_pwd import devdb10pwd
 
 import IOVDbSvc.IOVDb
 
+svcMgr.CoreDumpSvc.FatalHandler = 438
+
 from IOVDbTestAlg.IOVDbTestAlgConf import IOVDbTestAlg
 topSequence += IOVDbTestAlg( "IOVDbTestAlg" )
 

AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCool.py

@@ -7,9 +7,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()

AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolAfterTwoStep.py

@@ -6,9 +6,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()

AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolAndReg.py

@@ -7,9 +7,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()

AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolFromMetaData.py

@@ -6,9 +6,6 @@
 ## basic job configuration
 import AthenaCommon.AtlasUnixStandardJob
 
-# Set handler for traceback
-gbl.AthenaServices.SetFatalHandler(438)
-
 ## get a handle on the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
@@ -31,6 +28,9 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
 ## get a handle on the ToolSvc
 from AthenaCommon.AppMgr import ToolSvc
 
+# Set handler for traceback
+svcMgr.CoreDumpSvc.FatalHandler = 438
+
 #svcMgr.EventSelector.InputCollections = [ "SimplePoolFile1.root" ]
 svcMgr.EventSelector.InputCollections = [ "SimpleEventPoolFile.root" ]
 

AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolNewTag.py

@@ -7,9 +7,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()

AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolNoReg.py

@@ -7,10 +7,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()

AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolWriteMD.py

@@ -7,9 +7,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()

AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCool.py

@@ -7,9 +7,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()

AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolNewTag.py

@@ -7,9 +7,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()

AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolNoReg.py

@@ -7,10 +7,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()

AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolStep2.py

@@ -7,9 +7,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()

AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolStep3.py

@@ -7,9 +7,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()

AtlasTest/TestTools/share/post.sh

@@ -213,6 +213,9 @@ PP="$PP"'|Warning in <TInterpreter::ReadRootmapFile>: enum'
 # Ignore sourceID message from EventSelector.
 PP="$PP"'|Disconnecting input sourceID'
 
+# Printouts from new-style job configuration.
+PP="$PP"'|Py:ComponentAccumulator +INFO '
+PP="$PP"'|^[a-zA-Z0-9.]+ +: [^ ]'
 
 if [ "$extrapatterns" != "" ]; then
  PP="$PP""|$extrapatterns"

Calorimeter/CaloExample/CaloTests/CaloTests/AnalysisCal.h

@@ -42,7 +42,7 @@ namespace MyAnalysisCal {
     /** standard Athena-Algorithm method */
     virtual StatusCode          initialize() override;
     /** standard Athena-Algorithm method */
-    virtual StatusCode          execute_r(const EventContext& ctx) const override;
+    virtual StatusCode          execute(const EventContext& ctx) const override;
     /** standard Athena-Algorithm method */
     virtual StatusCode          finalize() override;
   private:

Calorimeter/CaloExample/CaloTests/src/MyAnalysisCal.cxx

@@ -51,7 +51,7 @@ namespace MyAnalysisCal {
   }
   
   //__________________________________________________________________________
-  StatusCode AnalysisCal::execute_r (const EventContext& ctx) const
+  StatusCode AnalysisCal::execute (const EventContext& ctx) const
   {
     //.............................................
     

Calorimeter/CaloRec/CaloRec/ToolWithConstantsMixin.icc

@@ -43,7 +43,7 @@ StatusCode do_declare (ToolWithConstantsMixin* self,
   if (AlgTool* x = dynamic_cast<AlgTool*> (self)) {
     x->declareProperty (name, c);
     return StatusCode::SUCCESS;
-  } else if (Algorithm* x = dynamic_cast<Algorithm*> (self)) {
+  } else if (Gaudi::Algorithm* x = dynamic_cast<Gaudi::Algorithm*> (self)) {
     x->declareProperty (name, c);
     return StatusCode::SUCCESS;
   } else if (Service* x = dynamic_cast<Service*> (self)) {