diff --git a/Reconstruction/RecoAlgs/CaloRingerAlgs/CMakeLists.txt b/Reconstruction/RecoAlgs/CaloRingerAlgs/CMakeLists.txt
index 835e29fa66977bcbebe3b65164f649d39e092a7a..a53a963189824f3520755d9eb9e70450ca62c01e 100644
--- a/Reconstruction/RecoAlgs/CaloRingerAlgs/CMakeLists.txt
+++ b/Reconstruction/RecoAlgs/CaloRingerAlgs/CMakeLists.txt
@@ -1,32 +1,14 @@
-################################################################################
-# Package: CaloRingerAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloRingerAlgs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Calorimeter/CaloEvent
- Control/AthContainers
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- Event/xAOD/xAODBase
- Event/xAOD/xAODCaloRings
- Event/xAOD/xAODCore
- Reconstruction/RecoTools/CaloRingerTools )
-
# Component(s) in the package:
atlas_add_component( CaloRingerAlgs
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES GaudiKernel CaloEvent AthContainers AthenaBaseComps AthenaKernel StoreGateLib SGtests xAODBase xAODCaloRings xAODCore CaloRingerToolsLib )
+ LINK_LIBRARIES GaudiKernel CaloEvent AthContainers AthenaBaseComps AthenaKernel StoreGateLib xAODBase xAODCaloRings xAODCore CaloRingerToolsLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
-atlas_install_runtime( test/CaloRingerAlgs_TestConfiguration.xml share/NeuralNetTests_Ref.txt )
-
diff --git a/Reconstruction/RecoAlgs/CaloRingerAlgs/python/CaloRingerAlgorithmBuilder.py b/Reconstruction/RecoAlgs/CaloRingerAlgs/python/CaloRingerAlgorithmBuilder.py
index 0b844c1586a7f6b431eae348eee12dac175debaa..b44aabc82d4df79e4be504f53b163494e84ace0c 100644
--- a/Reconstruction/RecoAlgs/CaloRingerAlgs/python/CaloRingerAlgorithmBuilder.py
+++ b/Reconstruction/RecoAlgs/CaloRingerAlgs/python/CaloRingerAlgorithmBuilder.py
@@ -4,23 +4,18 @@ import traceback
from . import CaloRingerAlgsConf
# We use egammaRec.Factories as a helper to instantiate CaloRingerAlgorithm
# handle
-from GaudiKernel.GaudiHandles import PublicToolHandle, PublicToolHandleArray, GaudiHandle, GaudiHandleArray
+from GaudiKernel.GaudiHandles import PublicToolHandleArray, GaudiHandle, GaudiHandleArray
from egammaRec.Factories import AlgFactory, FcnWrapper
from AthenaCommon.Resilience import treatException
from AthenaCommon.Logging import logging
from RecExConfig.Configured import Configured
-from AthenaCommon.Include import include
from AthenaCommon import CfgMgr
from RecExConfig.RecFlags import rec
from egammaRec.egammaRecFlags import jobproperties
-from CaloRingerAlgs.CaloRingerKeys import *
-from egammaRec import egammaKeys
+from CaloRingerAlgs import CaloRingerKeys as ringer
-from CaloRingerTools.CaloRingerToolsConf import Ringer__CaloRingsBuilder, \
- Ringer__CaloAsymRingsBuilder, \
- Ringer__CaloRingerElectronsReader, \
- Ringer__CaloRingerPhotonsReader
+from CaloRingerTools.CaloRingerToolsConf import Ringer__CaloRingsBuilder, Ringer__CaloAsymRingsBuilder # noqa: F401
mlog = logging.getLogger( 'CaloRingerAlgorithmBuilder.py' )
mlog.info("Entering")
@@ -54,7 +49,7 @@ def checkBuildElectronCaloRings():
mlog.info("Turning off ringer algorithm electron reconstruction since not doing ESD.")
caloRingerFlags.buildElectronCaloRings = False
return False
- if not inputAvailable(inputElectronType(), inputElectronKey()):
+ if not inputAvailable(ringer.inputElectronType(), ringer.inputElectronKey()):
if not jobproperties.egammaRecFlags.doEgammaCaloSeeded():
mlog.warning(("Requested to build ElectronCaloRings but egamma"
" calo seeded is off. Deactivating ElectronCaloRings and electron selection.")
@@ -83,10 +78,10 @@ def checkDoElectronIdentification():
asked to run electron identification."""
if caloRingerFlags.doElectronIdentification():
if not caloRingerFlags.buildElectronCaloRings():
- if not ( inputAvailable(outputCaloRingsType(), outputElectronCaloRingsKey()) or \
- inputAvailable(outputCaloRingsType(), outputElectronCaloAsymRingsKey()) ) or \
- not ( inputAvailable(outputRingSetType(), outputElectronRingSetsKey()) or \
- inputAvailable(outputRingSetType(), outputElectronAsymRingSetsKey()) ):
+ if not ( inputAvailable(ringer.outputCaloRingsType(), ringer.outputElectronCaloRingsKey()) or \
+ inputAvailable(ringer.outputCaloRingsType(), ringer.outputElectronCaloAsymRingsKey()) ) or \
+ not ( inputAvailable(ringer.outputRingSetType(), ringer.outputElectronRingSetsKey()) or \
+ inputAvailable(ringer.outputRingSetType(), ringer.outputElectronAsymRingSetsKey()) ):
mlog.warning(("Requested to do Electron identification using "
"Ringer discrimination, but one or more of the Ringer needed "
@@ -117,7 +112,7 @@ def checkBuildPhotonCaloRings():
mlog.info("Turning off ringer algorithm photon reconstruction since not doing ESD.")
caloRingerFlags.buildPhotonCaloRings = False
return False
- if not inputAvailable(inputPhotonType(), inputPhotonKey()):
+ if not inputAvailable(ringer.inputPhotonType(), ringer.inputPhotonKey()):
# Deadtivate photon calo rings if egamma calo seeded is off:
if not jobproperties.egammaRecFlags.doEgammaCaloSeeded():
@@ -148,10 +143,10 @@ def checkDoPhotonIdentification():
asked to run electron identification."""
if caloRingerFlags.doPhotonIdentification():
if not caloRingerFlags.buildPhotonCaloRings():
- if not ( inputAvailable(outputCaloRingsType(), outputPhotonCaloRingsKey()) or \
- inputAvailable(outputCaloRingsType(), outputPhotonCaloAsymRingsKey()) ) or \
- not ( inputAvailable(outputRingSetType(), outputPhotonRingSetsKey()) or \
- inputAvailable(outputRingSetType(), outputPhotonAsymRingSetsKey()) ):
+ if not ( inputAvailable(ringer.outputCaloRingsType(), ringer.outputPhotonCaloRingsKey()) or \
+ inputAvailable(ringer.outputCaloRingsType(), ringer.outputPhotonCaloAsymRingsKey()) ) or \
+ not ( inputAvailable(ringer.outputRingSetType(), ringer.outputPhotonRingSetsKey()) or \
+ inputAvailable(ringer.outputRingSetType(), ringer.outputPhotonAsymRingSetsKey()) ):
mlog.warning(("Requested to do Photon identification using "
"Ringer discrimination, but one or more of the Ringer needed "
@@ -309,9 +304,8 @@ def getSelectors(inputReaders):
def postponeEgammaLock(ringerAlg):
"Postpone egamma locker tool to execute after the last tool on toolList"
- from AthenaCommon.AlgSequence import AlgSequence, dumpSequence
+ from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
- from egammaRec.egammaLocker import egammaLocker
# Make sure we add it before streams:
foundRingerAlg = False
foundEgammaLocker = False
@@ -423,9 +417,9 @@ class CaloRingerAlgorithmBuilder ( Configured ):
"without readers."))
if caloRingerFlags.buildCaloRingsOn():
- self._eventOutputs = { outputCaloRingsType() : \
+ self._eventOutputs = { ringer.outputCaloRingsType() : \
getCaloRingerOutputs(self._caloRingerAlg.inputReaderTools,addRingSetsContainers=False), \
- outputRingSetType() : \
+ ringer.outputRingSetType() : \
getCaloRingerOutputs(self._caloRingerAlg.inputReaderTools,addCaloRingsContainers=False) \
}
self._output.update(self._eventOutputs)
@@ -435,15 +429,15 @@ class CaloRingerAlgorithmBuilder ( Configured ):
if not self.ignoreExistingDataObject() \
and ( ( caloRingerFlags.buildElectronCaloRings() and \
- ( inputAvailable(outputCaloRingsType(), outputElectronCaloRingsKey()) or \
- inputAvailable(outputCaloRingsType(), outputElectronCaloAsymRingsKey()) ) or \
- ( inputAvailable(outputRingSetType(), outputElectronRingSetsKey()) or \
- inputAvailable(outputRingSetType(), outputElectronAsymRingSetsKey()) ) ) \
+ ( inputAvailable(ringer.outputCaloRingsType(), ringer.outputElectronCaloRingsKey()) or \
+ inputAvailable(ringer.outputCaloRingsType(), ringer.outputElectronCaloAsymRingsKey()) ) or \
+ ( inputAvailable(ringer.outputRingSetType(), ringer.outputElectronRingSetsKey()) or \
+ inputAvailable(ringer.outputRingSetType(), ringer.outputElectronAsymRingSetsKey()) ) ) \
or ( caloRingerFlags.buildPhotonCaloRings() and \
- ( inputAvailable(outputCaloRingsType(), outputPhotonCaloRingsKey()) or \
- inputAvailable(outputCaloRingsType(), outputPhotonCaloAsymRingsKey()) ) or \
- ( inputAvailable(outputRingSetType(), outputPhotonRingSetsKey()) or \
- inputAvailable(outputRingSetType(), outputPhotonAsymRingSetsKey()) ) ) ):
+ ( inputAvailable(ringer.outputCaloRingsType(), ringer.outputPhotonCaloRingsKey()) or \
+ inputAvailable(ringer.outputCaloRingsType(), ringer.outputPhotonCaloAsymRingsKey()) ) or \
+ ( inputAvailable(ringer.outputRingSetType(), ringer.outputPhotonRingSetsKey()) or \
+ inputAvailable(ringer.outputRingSetType(), ringer.outputPhotonAsymRingSetsKey()) ) ) ):
raise RuntimeError(("Already existing input will be overwriten and not set Ringer flag "
"ignoreExistingDataObject."))
diff --git a/Reconstruction/RecoAlgs/CaloRingerAlgs/python/CaloRingerLocker.py b/Reconstruction/RecoAlgs/CaloRingerAlgs/python/CaloRingerLocker.py
index 738719e9b9a1215a1fadf8e0f9613d6f6f8ce28e..0f088a056106bd22ca9408463ae550540e849ae3 100644
--- a/Reconstruction/RecoAlgs/CaloRingerAlgs/python/CaloRingerLocker.py
+++ b/Reconstruction/RecoAlgs/CaloRingerAlgs/python/CaloRingerLocker.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
__doc__ = "Algorithm to lock CaloRinger containers (based on egammaLocker by Bruno Lenzi)"
__author__ = "Werner Freund <wsfreund@cern.ch>"
@@ -68,7 +68,7 @@ class CaloRingerLocker( PyAthena.Alg ):
"Loop over event dict items and yield (key, type) for those that pass filterKey"
for cType, cKeys in self.CaloRingerDict.items():
for cKey in cKeys:
- if not self.filterKey(cKey) or not cKey in self.storeGateSvc.keys():
+ if not self.filterKey(cKey) or cKey not in self.storeGateSvc.keys():
continue
yield cKey, cType
@@ -76,7 +76,7 @@ class CaloRingerLocker( PyAthena.Alg ):
"Loop over event dict items and yield (key, type) for those that pass filterKey"
for cType, cKeys in self.CaloRingerMetaDict.items():
for cKey in cKeys:
- if not self.filterKey(cKey) or not cKey in self.metaDataStore.keys():
+ if not self.filterKey(cKey) or cKey not in self.metaDataStore.keys():
continue
yield cKey, cType
@@ -98,9 +98,9 @@ class CaloRingerLocker( PyAthena.Alg ):
self.msg.debug( 'Keys are: %r', self.keys)
for cKey, cType in self.keys.items():
- self.msg.debug('Locking container %s of type %s' % (cKey, cType))
+ self.msg.debug('Locking container %s of type %s', cKey, cType)
if self.storeGateSvc.setConst( self.storeGateSvc[cKey] ).isFailure():
- self.msg.error('Problem locking container %s of type %s' % (cKey, cType))
+ self.msg.error('Problem locking container %s of type %s', cKey, cType)
# Flag that a failure happened, but keep looping to try to lock other
# containers
sc = StatusCode.Failure
@@ -118,9 +118,9 @@ class CaloRingerLocker( PyAthena.Alg ):
metaKeys = dict( self.getMetadataKeys() )
for cKey, cType in metaKeys.items():
- self.msg.debug('Locking Metadata container %s of type %s' % (cKey, cType))
+ self.msg.debug('Locking Metadata container %s of type %s', cKey, cType)
if self.metaDataStore.setConst( self.metaDataStore[cKey] ).isFailure():
- self.msg.error('Problem locking Metadata container %s of type %s' % (cKey, cType))
+ self.msg.error('Problem locking Metadata container %s of type %s', cKey, cType)
# Flag that a failure happened, but keep looping to try to lock other
# containers
sc = StatusCode.Failure
diff --git a/Reconstruction/RecoAlgs/CaloRingerAlgs/python/CaloRingerMetaDataBuilder.py b/Reconstruction/RecoAlgs/CaloRingerAlgs/python/CaloRingerMetaDataBuilder.py
index fcc458179878a1afc74b818fc411d9cadea683ea..9ebfd24ceab4b07c2e38b96e3ee125b1e5db8006 100644
--- a/Reconstruction/RecoAlgs/CaloRingerAlgs/python/CaloRingerMetaDataBuilder.py
+++ b/Reconstruction/RecoAlgs/CaloRingerAlgs/python/CaloRingerMetaDataBuilder.py
@@ -4,11 +4,10 @@ import traceback
from . import CaloRingerAlgsConf
from AthenaCommon.Resilience import treatException
from RecExConfig.Configured import Configured
-from CaloRingerAlgs.CaloRingerKeys import *
+from CaloRingerAlgs import CaloRingerKeys as ringer
from CaloRingerAlgs.CaloRingerFlags import caloRingerFlags
from CaloRingerAlgs.CaloRingerAlgorithmBuilder import removeFromTopSequence
-from egammaRec.Factories import AlgFactory, FcnWrapper
-
+from egammaRec.Factories import AlgFactory
from AthenaCommon.Logging import logging
@@ -82,17 +81,17 @@ class CaloRingerMetaDataBuilder ( Configured ):
if crBuilder.usable():
builderNames = [tool.getName() for tool in crBuilder.getCaloRingerBuilderHandles()]
if any(['Electron' in builderName for builderName in builderNames]):
- outputList.append(outputElectronRingSetsConfKey())
- electronMetaAvailable = metaDataInputAvailable(outputRingSetConfType(), outputElectronRingSetsConfKey())
+ outputList.append(ringer.outputElectronRingSetsConfKey())
+ electronMetaAvailable = metaDataInputAvailable(ringer.outputRingSetConfType(), ringer.outputElectronRingSetsConfKey())
if electronMetaAvailable:
self._overwriting = True
if any(['Photon' in builderName for builderName in builderNames]):
- outputList.append(outputPhotonRingSetsConfKey())
- photonMetaAvailable = metaDataInputAvailable(outputRingSetConfType(), outputPhotonRingSetsConfKey())
+ outputList.append(ringer.outputPhotonRingSetsConfKey())
+ photonMetaAvailable = metaDataInputAvailable(ringer.outputRingSetConfType(), ringer.outputPhotonRingSetsConfKey())
if photonMetaAvailable:
self. _overwriting = True
metaBuilder.RingSetConfContainerNames = outputList
- self._outputMetaData = {outputRingSetConfType() : outputList }
+ self._outputMetaData = {ringer.outputRingSetConfType() : outputList }
self._output.update(self._outputMetaData)
diff --git a/Reconstruction/RecoAlgs/CaloRingerAlgs/share/NeuralNetTests_Ref.txt b/Reconstruction/RecoAlgs/CaloRingerAlgs/share/NeuralNetTests_Ref.txt
deleted file mode 100644
index 4eb30ea80f81e203764f1667ba5123cfc2cbdc02..0000000000000000000000000000000000000000
--- a/Reconstruction/RecoAlgs/CaloRingerAlgs/share/NeuralNetTests_Ref.txt
+++ /dev/null
@@ -1,127 +0,0 @@
-stdout: -- FileGrepResult --
- fn: /pool/lsf/rtt/765127316/caloringeralgs_log
- pattern: Output space
- pmax: 9223372036854775807
- pmin: 1
- success: True
- vetoFlag: False
- matchLines [117]:
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.538683]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.538683]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.538683]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.621306]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.621306]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.621306]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.996962]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.948311]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.999008]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.993593]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.99887]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.996962]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.948311]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.999008]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.993593]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.99887]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.996962]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.948311]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.999008]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.993593]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.99887]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.563287]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.993328]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.999104]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.563287]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.993328]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.999104]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.563287]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.993328]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.999104]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.997245]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.996499]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.992486]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.943482]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.996376]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.999961]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.960854]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.997812]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.984893]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.993568]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.997245]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.996499]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.992486]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.943482]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.996376]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.999961]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.960854]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.997812]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.984893]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.993568]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.997245]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.996499]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.992486]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.943482]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.996376]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.999961]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.960854]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.997812]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.984893]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.993568]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.991852]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.999668]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.991852]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.999668]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.991852]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.999668]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.103501]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.103501]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.103501]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.999808]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [0.624281]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.999808]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [0.624281]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.999808]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [0.624281]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.995596]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.908205]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.991354]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.999076]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.95908]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.969097]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.994815]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.995596]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.908205]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.991354]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.999076]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.95908]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.969097]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.994815]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.995596]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.908205]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.991354]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.999076]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.95908]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.969097]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.994815]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.981325]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.951614]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.998283]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.981325]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.951614]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.998283]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.981325]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.951614]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.998283]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.970742]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.970742]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.970742]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.981591]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.982775]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.981591]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.982775]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.981591]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.982775]
- ToolSvc.ElectronRingerSelector_TestLoose DEBUG Applying UniqueThreshold (Value: 0.948). Output space is: [-0.998898]
- ToolSvc.ElectronRingerSelector_TestMedium DEBUG Applying UniqueThreshold (Value: 0.2644). Output space is: [-0.998898]
- ToolSvc.ElectronRingerSelector_TestTight DEBUG Applying UniqueThreshold (Value: 0.2826). Output space is: [-0.998898]
-
-stderr:
diff --git a/Reconstruction/RecoAlgs/CaloRingerAlgs/test/CaloRingerAlgs_TestConfiguration.xml b/Reconstruction/RecoAlgs/CaloRingerAlgs/test/CaloRingerAlgs_TestConfiguration.xml
deleted file mode 100755
index 85c9fdfac4fdb418203b33c484df18fd4f3cc379..0000000000000000000000000000000000000000
--- a/Reconstruction/RecoAlgs/CaloRingerAlgs/test/CaloRingerAlgs_TestConfiguration.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE unifiedTestConfiguration SYSTEM "http://www.hep.ucl.ac.uk/atlas/AtlasTesting/DTD/unifiedTestConfiguration.dtd">
-
-<unifiedTestConfiguration>
- <rtt xmlns="http://www.hep.ucl.ac.uk/atlas/AtlasTesting/rtt">
- <rttContactPerson>Nicolas Bulla</rttContactPerson>
- <mailto>nbullacr@cern.ch, wsfreund@cern.ch</mailto>
-
- <jobList>
- <chain>
- <chainName>MyChainJob</chainName>
- <sequential>
- <chainElement>
- <athena userJobId="caloringeralgs">
- <doc>CaloRinger Algorithm Nightly Test</doc>
- <options>CaloRingerAlgs/CaloRinger_ATN</options>
- <group>RTT:Athena</group>
- <queue>medium</queue>
- <dataset_info>
- <dc2 />
-
- <datasetName>/afs/cern.ch/atlas/project/rig/referencefiles/QTests-Run2/RDO-run2.Nov27.2014-500events.pool.root</datasetName>
- </dataset_info>
-
- <test position="1">
- <modulename>RttLibraryTools</modulename>
- <testname>FileGrepper</testname>
- <outputFile>myRingSetFile.txt</outputFile>
- <arg>
- <argname>inputFile</argname>
- <argvalue>caloringeralgs_log</argvalue>
- </arg>
- <arg>
- <argname>searchList</argname>
- <argvalue>Ringset</argvalue>
- </arg>
- <keepFilePattern>myRingSetFile.txt</keepFilePattern>
- </test>
-
- <test position="2">
- <modulename>RttLibraryTools</modulename>
- <testname>FileComparatorRunner</testname>
- <outputFile>myRingComparatorFile.txt</outputFile>
- <arg>
- <argname>testFile</argname>
- <argvalue>myRingSetFile.txt</argvalue>
- </arg>
- <arg>
- <argname>refFile</argname>
- <argvalue>RingerTests_Builders.txt</argvalue>
- </arg>
- <keepFilePattern>myRingComparatorFile.txt</keepFilePattern>
- <noalarm/>
- </test>
-
- <test position="3">
- <modulename>RttLibraryTools</modulename>
- <testname>FileGrepper</testname>
- <outputFile>myNeuralNetOutput.txt</outputFile>
- <arg>
- <argname>inputFile</argname>
- <argvalue>caloringeralgs_log</argvalue>
- </arg>
- <arg>
- <argname>searchList</argname>
- <argvalue>Output space</argvalue>
- </arg>
- <keepFilePattern>myNeuralNetOutput.txt</keepFilePattern>
- </test>
-
- <test position="4">
- <modulename>RttLibraryTools</modulename>
- <testname>FileComparatorRunner</testname>
- <outputFile>myNetComparatorFile.txt</outputFile>
- <arg>
- <argname>testFile</argname>
- <argvalue>myNeuralNetOutput.txt</argvalue>
- </arg>
- <arg>
- <argname>refFile</argname>
- <argvalue>NeuralNetTests_Ref.txt</argvalue>
- </arg>
- <keepFilePattern>myNetComparatorFile.txt</keepFilePattern>
- <noalarm/>
- </test>
-
- <test position="5">
- <modulename>RttLibraryTools</modulename>
- <testname>FileGrepper</testname>
- <outputFile>RingComparator_OK.txt</outputFile>
- <arg>
- <argname>inputFile</argname>
- <argvalue>myRingComparatorFile.txt</argvalue>
- </arg>
- <arg>
- <argname>vetoList</argname>
- <argvalue>DEBUG Ringset</argvalue>
- </arg>
- <keepFilePattern>RingComparator_OK.txt</keepFilePattern>
- </test>
-
- <test position="6">
- <modulename>RttLibraryTools</modulename>
- <testname>FileGrepper</testname>
- <outputFile>NetComparator_OK.txt</outputFile>
- <arg>
- <argname>inputFile</argname>
- <argvalue>myNetComparatorFile.txt</argvalue>
- </arg>
- <arg>
- <argname>vetoList</argname>
- <argvalue>Output space</argvalue>
- </arg>
- <keepFilePattern>NetComparator_OK.txt</keepFilePattern>
- </test>
-
- <auxFilePattern>myRingComparatorFile.txt</auxFilePattern>
- <auxFilePattern>myNetComparatorFile.txt</auxFilePattern>
- <auxFilePattern>RingerTests_Builders.txt</auxFilePattern>
- <auxFilePattern>NeuralNetTests_Ref.txt</auxFilePattern>
- </athena>
- </chainElement>
- </sequential>
- </chain>
- </jobList>
-
- <jobGroups>
- <jobGroup name="CaloRinger" parent="RTT:Athena">
- <keepFilePattern>*.txt</keepFilePattern>
- <keepFilePattern>*.log</keepFilePattern>
- <keepFilePattern>*.root</keepFilePattern>
- <auxFilePattern>RingerTests_Builders.txt</auxFilePattern>
- <auxFilePattern>NeuralNetTests_Ref.txt</auxFilePattern>
- <auxFilePattern>myRingComparatorFile.txt</auxFilePattern>
- </jobGroup>
- </jobGroups>
- </rtt>
-</unifiedTestConfiguration>