From eb36fc2f826c7b73a6c7e8f605e575bdf3024f18 Mon Sep 17 00:00:00 2001
From: Charles Leggett <charles.g.leggett@gmail.com>
Date: Mon, 23 Dec 2019 23:31:21 +0000
Subject: [PATCH] update Gaudi to v33r0.001
---
AtlasTest/TestTools/share/post.sh | 1 +
Control/AthenaCommon/python/Configurable.py | 2 +-
.../AthExJobOptions/share/BasicJobOptions.ref | 6 ------
.../AthExJobOptions/share/CustomToolJobOptions.ref | 8 +-------
.../share/CustomTopAlgorithmJobOptions.ref | 4 ----
Control/AthenaPython/src/PyAthenaAud.cxx | 4 ----
Control/IOVSvc/src/CondSvc.cxx | 10 ++++++++++
Control/IOVSvc/src/CondSvc.h | 4 ++++
Control/SGComps/share/AddressRemappingConfig_test.ref | 2 --
Projects/AthSimulation/externals.txt | 2 +-
Projects/Athena/externals.txt | 2 +-
.../egamma/egammaAlgs/src/egammaSelectedTrackCopy.h | 2 +-
.../TrkExTools/TrkExTools/Extrapolator.h | 2 +-
.../TrkExtrapolation/TrkExTools/TrkExTools/Navigator.h | 2 +-
.../TrkGaussianSumFilter/GsfExtrapolator.h | 2 +-
15 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/AtlasTest/TestTools/share/post.sh b/AtlasTest/TestTools/share/post.sh
index bb491195ef8a..1581fb5fde42 100755
--- a/AtlasTest/TestTools/share/post.sh
+++ b/AtlasTest/TestTools/share/post.sh
@@ -165,6 +165,7 @@ PP="$PP"'|^WARNING: TCMALLOCDIR not defined'
#Sebastien says not to worry about this...
PP="$PP"'|^Py:AthFile .*shutting down athfile-server'
PP="$PP"'|^HistogramPersis... INFO *.CnvServices.:'
+PP="$PP"'|^HistogramPersis.*Histograms saving not required.'
PP="$PP"'|StatusCodeSvc INFO initialize'
PP="$PP"'|^ApplicationMgr +INFO Successfully loaded'
PP="$PP"'|^IncidentSvc +DEBUG Service base class'
diff --git a/Control/AthenaCommon/python/Configurable.py b/Control/AthenaCommon/python/Configurable.py
index e12bac1c6ce7..90caa8933452 100755
--- a/Control/AthenaCommon/python/Configurable.py
+++ b/Control/AthenaCommon/python/Configurable.py
@@ -826,7 +826,7 @@ class ConfigurableAlgorithm( Configurable ):
__slots__ = { '_jobOptName' : 0, 'OutputLevel' : 0, \
'Enable' : 1, 'ErrorMax' : 1, 'ErrorCounter' : 0, 'AuditAlgorithms' : 0, \
'AuditInitialize' : 0, 'AuditReinitialize' : 0, 'AuditExecute' : 0, \
- 'AuditFinalize' : 0, 'AuditBeginRun' : 0, 'AuditEndRun' : 0 }
+ 'AuditFinalize' : 0 }
def __init__( self, name = Configurable.DefaultName ):
super( ConfigurableAlgorithm, self ).__init__( name )
diff --git a/Control/AthenaExamples/AthExJobOptions/share/BasicJobOptions.ref b/Control/AthenaExamples/AthExJobOptions/share/BasicJobOptions.ref
index bf2293d14e59..6890e1b70485 100644
--- a/Control/AthenaExamples/AthExJobOptions/share/BasicJobOptions.ref
+++ b/Control/AthenaExamples/AthExJobOptions/share/BasicJobOptions.ref
@@ -19,8 +19,6 @@ Py:Athena INFO Can't set non-existing property (this is correct)
/***** Algorithm AthSequencer/TopAlg ***************************************************************
|-Atomic = False
|-AuditAlgorithms = False
-|-AuditBeginRun = False
-|-AuditEndRun = False
|-AuditExecute = False
|-AuditFinalize = False
|-AuditInitialize = False
@@ -53,8 +51,6 @@ Py:Athena INFO Can't set non-existing property (this is correct)
|-Timeline = True
|=/***** Algorithm TopAlgorithm/TopAlgorithm *********************************************************
| |-AuditAlgorithms = False
-| |-AuditBeginRun = False
-| |-AuditEndRun = False
| |-AuditExecute = False
| |-AuditFinalize = False
| |-AuditInitialize = False
@@ -197,8 +193,6 @@ Py:Athena INFO Can't set non-existing property (this is correct)
| \----- (End of Algorithm TopAlgorithm/TopAlgorithm) ------------------------------------------------
|=/***** Algorithm TopAlgorithm/MyAlg ****************************************************************
| |-AuditAlgorithms = False
-| |-AuditBeginRun = False
-| |-AuditEndRun = False
| |-AuditExecute = False
| |-AuditFinalize = False
| |-AuditInitialize = False
diff --git a/Control/AthenaExamples/AthExJobOptions/share/CustomToolJobOptions.ref b/Control/AthenaExamples/AthExJobOptions/share/CustomToolJobOptions.ref
index 795f06ff0396..013158a57b1d 100644
--- a/Control/AthenaExamples/AthExJobOptions/share/CustomToolJobOptions.ref
+++ b/Control/AthenaExamples/AthExJobOptions/share/CustomToolJobOptions.ref
@@ -14,12 +14,10 @@ Py:ConfigurableDb WARNING --------------------------------------------------
Py:ConfigurableDb WARNING -IDTrackCaloDepositsDecoratorTool: MuonTPTools.MuonTPToolsConf - ['DerivationFrameworkMuons.DerivationFrameworkMuonsConf']
Py:ConfigurableDb WARNING -MuonTPExtrapolationTool: MuonTPTools.MuonTPToolsConf - ['DerivationFrameworkMuons.DerivationFrameworkMuonsConf']
Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
-{'TheTool': <ToolUsingTool/YourTopAlg.ToolUsingTool at 0x7fed06ae9470>, 'ErrorMax': '<no value>', 'RndmFactor': '<no value>', 'PublicToolList': PublicToolHandleArray(['ConcreteTool/Tool4','ToolUsingTool/Tool5','ToolSpace::TemplatedTool<double>/Tool6']), 'AuditExecute': '<no value>', 'EmptyPublicTool': PublicToolHandle(''), 'AuditReinitialize': '<no value>', 'EmptyPrivateTool': PrivateToolHandle(''), 'InputKey': '<no value>', 'AuditRestart': '<no value>', 'OutputKey': '<no value>', 'MonitorService': '<no value>', 'Enable': '<no value>', 'Timeline': '<no value>', 'AuditFinalize': '<no value>', 'PrivateToolList': PrivateToolHandleArray(['ConcreteTool/Tool1','ToolUsingTool/Tool2','ToolSpace::TemplatedTool<double>/Tool3']), 'AuditEndRun': '<no value>', 'NeededResources': [], 'AuditBeginRun': '<no value>', 'AutoRetrieveTools': '<no value>', 'FilterCircularDependencies': '<no value>', 'ExtraOutputs': [], 'IsIOBound': '<no value>', 'AuditInitialize': '<no value>', 'OutputLevel': '<no value>', 'ExtraInputs': [], 'AuditStop': '<no value>', 'DetStore': ServiceHandle('StoreGateSvc/DetectorStore'), 'TheSvc': ServiceHandle('ConcreteSvc'), 'Cardinality': '<no value>', 'EvtStore': ServiceHandle('StoreGateSvc'), 'AuditStart': '<no value>', 'RegisterForContextService': '<no value>', 'AuditAlgorithms': '<no value>', 'ThePublicTool': PublicToolHandle('ConcreteTool'), 'ErrorCounter': '<no value>'}
+{'TheTool': <ToolUsingTool/YourTopAlg.ToolUsingTool at 0x7fed06ae9470>, 'ErrorMax': '<no value>', 'RndmFactor': '<no value>', 'PublicToolList': PublicToolHandleArray(['ConcreteTool/Tool4','ToolUsingTool/Tool5','ToolSpace::TemplatedTool<double>/Tool6']), 'AuditExecute': '<no value>', 'EmptyPublicTool': PublicToolHandle(''), 'AuditReinitialize': '<no value>', 'EmptyPrivateTool': PrivateToolHandle(''), 'InputKey': '<no value>', 'AuditRestart': '<no value>', 'OutputKey': '<no value>', 'MonitorService': '<no value>', 'Enable': '<no value>', 'Timeline': '<no value>', 'AuditFinalize': '<no value>', 'PrivateToolList': PrivateToolHandleArray(['ConcreteTool/Tool1','ToolUsingTool/Tool2','ToolSpace::TemplatedTool<double>/Tool3']), 'NeededResources': [], 'AutoRetrieveTools': '<no value>', 'FilterCircularDependencies': '<no value>', 'ExtraOutputs': [], 'IsIOBound': '<no value>', 'AuditInitialize': '<no value>', 'OutputLevel': '<no value>', 'ExtraInputs': [], 'AuditStop': '<no value>', 'DetStore': ServiceHandle('StoreGateSvc/DetectorStore'), 'TheSvc': ServiceHandle('ConcreteSvc'), 'Cardinality': '<no value>', 'EvtStore': ServiceHandle('StoreGateSvc'), 'AuditStart': '<no value>', 'RegisterForContextService': '<no value>', 'AuditAlgorithms': '<no value>', 'ThePublicTool': PublicToolHandle('ConcreteTool'), 'ErrorCounter': '<no value>'}
/***** Algorithm AthSequencer/TopAlg ***************************************************************
|-Atomic = False
|-AuditAlgorithms = False
-|-AuditBeginRun = False
-|-AuditEndRun = False
|-AuditExecute = False
|-AuditFinalize = False
|-AuditInitialize = False
@@ -52,8 +50,6 @@ Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
|-Timeline = True
|=/***** Algorithm TopAlgorithm/MyTopAlg *************************************************************
| |-AuditAlgorithms = False
-| |-AuditBeginRun = False
-| |-AuditEndRun = False
| |-AuditExecute = False
| |-AuditFinalize = False
| |-AuditInitialize = False
@@ -144,8 +140,6 @@ Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
| \----- (End of Algorithm TopAlgorithm/MyTopAlg) ----------------------------------------------------
|=/***** Algorithm TopAlgorithm/YourTopAlg ***********************************************************
| |-AuditAlgorithms = False
-| |-AuditBeginRun = False
-| |-AuditEndRun = False
| |-AuditExecute = False
| |-AuditFinalize = False
| |-AuditInitialize = False
diff --git a/Control/AthenaExamples/AthExJobOptions/share/CustomTopAlgorithmJobOptions.ref b/Control/AthenaExamples/AthExJobOptions/share/CustomTopAlgorithmJobOptions.ref
index e3215e921cc4..4b5c9074d9cc 100644
--- a/Control/AthenaExamples/AthExJobOptions/share/CustomTopAlgorithmJobOptions.ref
+++ b/Control/AthenaExamples/AthExJobOptions/share/CustomTopAlgorithmJobOptions.ref
@@ -9,8 +9,6 @@ Py:Athena INFO including file "AthExJobOptions/AthExJobOptions_Custom
/***** Algorithm AthSequencer/TopAlg ***************************************************************
|-Atomic = False
|-AuditAlgorithms = False
-|-AuditBeginRun = False
-|-AuditEndRun = False
|-AuditExecute = False
|-AuditFinalize = False
|-AuditInitialize = False
@@ -43,8 +41,6 @@ Py:Athena INFO including file "AthExJobOptions/AthExJobOptions_Custom
|-Timeline = True
|=/***** Algorithm TopAlgorithm/MyCustomAlg **********************************************************
| |-AuditAlgorithms = False
-| |-AuditBeginRun = False
-| |-AuditEndRun = False
| |-AuditExecute = False
| |-AuditFinalize = False
| |-AuditInitialize = False
diff --git a/Control/AthenaPython/src/PyAthenaAud.cxx b/Control/AthenaPython/src/PyAthenaAud.cxx
index 0c9d777d2f5b..f6bd5ce550da 100644
--- a/Control/AthenaPython/src/PyAthenaAud.cxx
+++ b/Control/AthenaPython/src/PyAthenaAud.cxx
@@ -210,8 +210,6 @@ Aud::py_before (IAuditor::StandardEventType evt, const std::string& component)
case Initialize: evtname = "initialize"; break;
case ReInitialize: evtname = "reinitialize"; break;
case Execute: evtname = "execute"; break;
- case BeginRun: evtname = "beginrun"; break;
- case EndRun: evtname = "endrun"; break;
case Finalize: evtname = "finalize"; break;
case Start: evtname = "start"; break;
case Stop: evtname = "stop"; break;
@@ -236,8 +234,6 @@ Aud::py_after(IAuditor::StandardEventType evt,
case Initialize: evtname = "initialize"; break;
case ReInitialize: evtname = "reinitialize"; break;
case Execute: evtname = "execute"; break;
- case BeginRun: evtname = "beginrun"; break;
- case EndRun: evtname = "endrun"; break;
case Finalize: evtname = "finalize"; break;
case Start: evtname = "start"; break;
case Stop: evtname = "stop"; break;
diff --git a/Control/IOVSvc/src/CondSvc.cxx b/Control/IOVSvc/src/CondSvc.cxx
index 24db5d65cc02..b163bb9615e3 100644
--- a/Control/IOVSvc/src/CondSvc.cxx
+++ b/Control/IOVSvc/src/CondSvc.cxx
@@ -370,3 +370,13 @@ CondSvc::conditionIDs() const {
}
+//---------------------------------------------------------------------------
+
+StatusCode
+CondSvc::validRanges( std::vector<EventIDRange>& /*ranges*/,
+ const DataObjID& /*id*/ ) const {
+
+ // not yet implemented
+
+ return StatusCode::FAILURE;
+}
diff --git a/Control/IOVSvc/src/CondSvc.h b/Control/IOVSvc/src/CondSvc.h
index 88872258249d..d3d05626b9c4 100644
--- a/Control/IOVSvc/src/CondSvc.h
+++ b/Control/IOVSvc/src/CondSvc.h
@@ -46,6 +46,10 @@ public:
virtual const DataObjIDColl& conditionIDs() const;
+ virtual StatusCode validRanges( std::vector<EventIDRange>& ranges,
+ const DataObjID& id ) const;
+
+
// virtual void dump() const;
virtual void dump(std::ostream&) const;
diff --git a/Control/SGComps/share/AddressRemappingConfig_test.ref b/Control/SGComps/share/AddressRemappingConfig_test.ref
index efce79c83762..70d4145e7f98 100644
--- a/Control/SGComps/share/AddressRemappingConfig_test.ref
+++ b/Control/SGComps/share/AddressRemappingConfig_test.ref
@@ -4,8 +4,6 @@ Py:ComponentAccumulator INFO Event Algorithm Sequences
Py:ComponentAccumulator INFO /***** Algorithm AthSequencer/AthAlgSeq ************************************************************
|-Atomic = False
|-AuditAlgorithms = False
-|-AuditBeginRun = False
-|-AuditEndRun = False
|-AuditExecute = False
|-AuditFinalize = False
|-AuditInitialize = False
diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt
index 0590bd04e3db..b406aed6ff96 100644
--- a/Projects/AthSimulation/externals.txt
+++ b/Projects/AthSimulation/externals.txt
@@ -9,4 +9,4 @@
AthSimulationExternalsVersion = 2.0.51
# The version of atlas/Gaudi to use:
-GaudiVersion = v32r2.006
+GaudiVersion = v33r0.001
diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt
index c26f9558ea1f..3c4cd821a0d0 100644
--- a/Projects/Athena/externals.txt
+++ b/Projects/Athena/externals.txt
@@ -9,4 +9,4 @@
AthenaExternalsVersion = 2.0.51
# The version of atlas/Gaudi to use:
-GaudiVersion = v32r2.006
+GaudiVersion = v33r0.001
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaSelectedTrackCopy.h b/Reconstruction/egamma/egammaAlgs/src/egammaSelectedTrackCopy.h
index 43e2041e488c..c608f1848cf0 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaSelectedTrackCopy.h
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaSelectedTrackCopy.h
@@ -26,7 +26,7 @@
#include "AthContainers/ConstDataVector.h"
#include "egammaInterfaces/IegammaCaloClusterSelector.h"
-#include "GaudiKernel/Counters.h"
+#include <Gaudi/Accumulators.h>
#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
#include "StoreGate/ReadCondHandleKey.h"
diff --git a/Tracking/TrkExtrapolation/TrkExTools/TrkExTools/Extrapolator.h b/Tracking/TrkExtrapolation/TrkExTools/TrkExTools/Extrapolator.h
index 2aed49c38235..784b07423555 100755
--- a/Tracking/TrkExtrapolation/TrkExTools/TrkExTools/Extrapolator.h
+++ b/Tracking/TrkExtrapolation/TrkExTools/TrkExTools/Extrapolator.h
@@ -39,7 +39,7 @@
#include "xAODTracking/TrackParticle.h"
#include "xAODTracking/NeutralParticle.h"
-#include "GaudiKernel/Counters.h"
+#include <Gaudi/Accumulators.h>
#include "tbb/concurrent_unordered_map.h"
class MsgStream;
diff --git a/Tracking/TrkExtrapolation/TrkExTools/TrkExTools/Navigator.h b/Tracking/TrkExtrapolation/TrkExTools/TrkExTools/Navigator.h
index 4c73856bc618..67b8ab4501a8 100755
--- a/Tracking/TrkExtrapolation/TrkExTools/TrkExTools/Navigator.h
+++ b/Tracking/TrkExtrapolation/TrkExTools/TrkExTools/Navigator.h
@@ -23,7 +23,7 @@
#include <cstring>
#include <exception>
-#include "GaudiKernel/Counters.h"
+#include <Gaudi/Accumulators.h>
#include "CxxUtils/checker_macros.h"
namespace Trk {
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfExtrapolator.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfExtrapolator.h
index b4b75d12cac7..35b51fdb7e28 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfExtrapolator.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfExtrapolator.h
@@ -16,7 +16,7 @@ AlgTool inheriting from the IMultiStateExtrapolator class
#ifndef TrkGsfExtrapolator_H
#define TrkGsfExtrapolator_H
-#include "GaudiKernel/Counters.h"
+#include <Gaudi/Accumulators.h>
#include "TrkExInterfaces/IEnergyLossUpdator.h"
#include "TrkExInterfaces/INavigator.h"
--
GitLab