From d770a246fc2b2e1f4210aa016fdb444eb854dcfa Mon Sep 17 00:00:00 2001 From: Marcin Nowak <Marcin.Nowak@cern.ch> Date: Fri, 19 Jun 2020 19:33:56 +0200 Subject: [PATCH] Removed AthenaSealSvc and cleaned joboptions SealSvc does not have any useful function any more --- .../AthenaDBTestRec/scripts/ReadReal.py | 8 +- .../AthenaDBTestRec/scripts/ReadRun.py | 8 +- .../AthenaDBTestRec/share/ReadRefDBExample.py | 6 - .../share/TestCoolRecExample.py | 6 - .../share/AthenaPoolTestCopy.py | 9 - .../share/AthenaPoolTestPartialWrite.py | 160 ++- .../share/AthenaPoolTestStep2Write.py | 213 ++-- .../AthenaPoolTestStep2WriteDoubleSelector.py | 8 - .../share/AthenaPoolTestWrite.py | 236 ++-- .../AthenaPoolTestWriteDoubleSelector.py | 9 - .../share/AtlfastPoolReadOptions.py | 4 - .../share/AtlfastPoolWriteOptions.py | 4 - .../CaloCluster2StepReader_jobOptions.py | 159 ++- .../CaloClusterStep1Writer_jobOptions.py | 174 ++- .../CaloClusterStep2Writer_jobOptions.py | 200 ++- .../share/CaloClusterWriter_jobOptions.py | 208 ++-- .../AthenaPoolTest/share/EventInfoWrite.py | 3 - .../share/InDetRawDataWriter_jobOptions.py | 8 - .../share/LArCellContReader_jobOptionsReg.py | 179 ++- .../share/LArCellContWriter_jobOptions.py | 8 - .../share/LArCellContWriter_jobOptionsReg.py | 233 ++-- .../LArCellContWriter_jobOptionsRegStep2.py | 226 ++-- .../LArCellContWriter_jobOptionsRegStep3.py | 200 ++- .../LArCellContWriter_jobOptionsStep1.py | 164 ++- .../LArCellContWriter_jobOptionsStep2.py | 164 ++- .../share/PileUpEventInfoWrite.py | 197 ++- .../share/TrkTrackWriter_jobOptions.py | 8 - .../share/IOVDbTestAlgReadCool.py | 6 - .../share/IOVDbTestAlgReadCoolAfterTwoStep.py | 6 - .../share/IOVDbTestAlgReadCoolAndReg.py | 7 - .../share/IOVDbTestAlgReadCoolFromMetaData.py | 5 - .../share/IOVDbTestAlgReadCoolNewTag.py | 6 - .../share/IOVDbTestAlgReadCoolNoReg.py | 6 - .../share/IOVDbTestAlgReadCoolWriteMD.py | 6 - .../share/IOVDbTestAlgWriteCool.py | 3 - .../share/IOVDbTestAlgWriteCoolNewTag.py | 3 - .../share/IOVDbTestAlgWriteCoolNoReg.py | 4 - .../share/IOVDbTestAlgWriteCoolStep2.py | 3 - .../IOVDbTestAlg/share/IOVDbTestCoolDCS.py | 6 - .../share/OutputConditionsAlg_jobOptions.py | 4 - .../CaloAnaEx/share/CaloAnaExTB.py | 6 - .../share/CaloReadLCClassificationFile.py | 2 - .../share/CaloReadLCJetEnergyScaleFile.py | 2 - .../share/CaloReadLCOutOfClusterFile.py | 2 - .../share/CaloReadLCOutOfClusterPi0File.py | 2 - .../share/CaloReadLCWeightsFile.py | 2 - .../share/CaloReadLC_Cl_W_OOC_OOCPi0_File.py | 2 - .../share/GetH6LCSinglePionsPerf_cbt.py | 1 - .../share/GetLCSinglePionsPerf.py | 1 - .../CaloLocalHadCalib/share/cl_w_ooc.py | 1 - .../CaloLocalHadCalib/share/cl_w_ooc_H6.py | 1 - .../CaloLocalHadCalib/share/classify.py | 1 - .../share/deadmaterialcoeff.py | 2 - .../share/deadmaterialcoeff_ctb.py | 2 - .../share/deadmaterialtree.py | 1 - .../share/deadmaterialtree_ctb.py | 1 - .../CaloLocalHadCalib/share/outofcluster.py | 1 - .../CaloLocalHadCalib/share/weights.py | 1 - .../python/AtlasUnixStandardJob.py | 5 - .../share/GenerateBootstrapTest.ref | 12 +- Control/AthenaCommon/share/bootstrap.pkl | 268 ++-- .../AthenaCommon/share/bootstrap_threaded.pkl | 314 +++-- .../share/AthExThinning_makeData.py | 4 - .../AthenaKernel/IAthenaSealSvc.h | 54 - .../AthenaPython/AthenaPythonDict.h | 1 - .../AthenaPython/AthenaPython/selection.xml | 1 - Control/AthenaServices/CMakeLists.txt | 3 +- .../AthenaServices/share/AthDictLoaderSvc.ref | 23 +- Control/AthenaServices/share/AthTPCnvSvc.ref | 29 +- .../share/AthenaSealSvc_joboptions.py | 27 - .../share/SimplePOSIXTimeKeeperSvc.ref | 31 +- Control/AthenaServices/share/TestStopRun.ref | 26 +- Control/AthenaServices/src/AthenaSealSvc.cxx | 1094 ----------------- Control/AthenaServices/src/AthenaSealSvc.h | 157 --- .../src/components/AthenaServices_entries.cxx | 2 - .../share/test_perfMonSvc_baseline_bench.py | 2 - .../share/test_perfMonSvc_truthjets.py | 3 - .../AthenaRootComps/python/AthenaRootBase.py | 12 - .../python/OldCLHEPStreamers.py | 8 - .../DumpGeo/share/dump-geo.py | 1 - .../share/ClusterCreator_jobOptions.py | 2 - .../share/ClusterDumper_jobOptions.py | 2 - .../xAODJetCnv/share/JetCreator_jobOptions.py | 2 - .../share/xAODMuonCnv_jobOptions.py | 1 - .../xAODTauCnv/share/xAODTauCnv_jobOptions.py | 1 - .../share/HepMCTruthReader_jobOptions.py | 1 - .../share/xAODTruthCnv_jobOptions.py | 1 - .../share/xAODTruthReader_jobOptions.py | 1 - .../share/AFP_LocReco_joboption_standalone.py | 10 - .../share/jobOption_Alfa_GloRec.py | 10 - Generators/EvtGen_i/share/BsJpsiphi.py | 4 - Generators/EvtGen_i/share/BtoJpsieeK0s.py | 2 - Generators/EvtGen_i/share/BtoJpsieeX.py | 2 - Generators/EvtGen_i/share/Lb2Lll.py | 3 - Generators/EvtGen_i/share/PythiaBEvtGen.py | 3 - .../EvtGen_i/share/PythiaBEvtGen_Signal.py | 4 - .../share/PythiaB_B0_DPhiA1_Signal3.py | 2 - .../share/PythiaB_B0_DPhiPi_Signal3.py | 2 - .../share/PythiaB_B0_DsPhiA1_Signal3.py | 2 - .../share/PythiaB_B0_DsPhiPi_Signal3.py | 2 - .../share/PythiaB_Bp_D0MuNu_Signal3.py | 2 - .../share/PythiaB_Bs_DsPhiMuNu_Signal3.py | 2 - .../share/PythiaB_Bs_DsStDsPhiA1_Signal3.py | 2 - .../share/PythiaB_Bs_GammaMuMu_Signal.py | 2 - Generators/EvtGen_i/share/PythiaB_Signal.py | 2 - Generators/EvtGen_i/share/PythiaB_bbe10X.py | 2 - .../EvtGen_i/share/PythiaB_bbmu12mu12X.py | 2 - Generators/EvtGen_i/share/PythiaB_bbmu6e4X.py | 2 - .../EvtGen_i/share/PythiaB_bbmu6mu4_massX.py | 2 - Generators/EvtGen_i/share/PythiaEvtGen.py | 4 - Generators/EvtGen_i/share/bTosllAli.py | 4 - .../share/SCTCalib_topOptions.py | 5 - .../SCT_CalibAlgs/share/referenceOptions.py | 5 - .../SCT_CalibAlgs/share/skeleton.sct_calib.py | 5 - .../share/PixelDCSTestWrite.py | 4 - .../share/testMonRead.py | 6 - .../TRT_ConditionsAlgs/share/WriteAlignCTB.py | 4 - .../TRT_ConditionsAlgs/share/WriteCalibCTB.py | 4 - .../share/WriteCosmicSR1DB.py | 4 - .../share/SiSmearing_noPU_CompletedjO.py | 2 - .../InDetRecExample/share/InDetRec_all.py | 2 - .../share/GeantinoMapping_ITk_jobOptions.py | 2 - .../GeantinoMapping_jobOptionsOverride.py | 2 - .../SCT_Monitoring/run/CosmicMonitorOpts.py | 2 - .../share/PixeldEdxWriteCool.py | 7 - .../LArAlignmentAlgs/share/LArAlignDbRead.py | 3 - .../share/LArAlignDbReadCoolAndReg.py | 8 - .../share/LArAlignDbReadNoReg.py | 8 - .../LArAlignmentAlgs/share/LArAlignDbWrite.py | 7 - .../share/LArAlignDbWriteCoolNoReg.py | 10 - .../share/LArBadChannelBrowser.py | 2 - .../LArCafJobs/python/LArCafJobsConfig.py | 3 - .../share/LArParams2Ntuple_POOL_jobOptions.py | 7 - .../share/LArPedestal2Ntuple_jobOptions.py | 3 - .../share/LArPhysWaveFromTuple_jobOptions.py | 4 - ...ArReadParamsFromFile_CTB2004_jobOptions.py | 5 - .../share/LArIdMap_Pool_Read.py | 4 - .../share/LArIdMap_Pool_Write.py | 10 - .../LArSimAthenaPool_ReadTest_jobOptions.py | 71 +- .../LArSimAthenaPool_WriteTest_jobOptions.py | 85 +- .../share/LArHVPathologyDbRead.py | 8 - .../share/LArHVPathologyDbWrite.py | 19 - .../share/LArCalib_CTB04_Delay_jobOptions.py | 3 - .../LArCalib_CTB04_MasterWaves_jobOptions.py | 8 - .../LArCalib_CTB04_OFC_Phys_jobOptions.py | 7 - ...rCalib_CTB04_PhysWaveShifter_jobOptions.py | 6 - .../LArCalib_CTB04_RTMParams_jobOptions.py | 3 - .../LArCalib_CTB04_RTMPhysWaves_jobOptions.py | 3 - .../LArCalib_CaliWaveMerger_jobOptions.py | 7 - ...Calib_Example_CaliWaveMerger_jobOptions.py | 8 - ...ArCalib_Example_ReadLocalConditionsPool.py | 3 - .../LArConditionsCommon/share/CheckADC2MeV.py | 3 - .../share/DumpLArCondData_Config.py | 8 - .../share/LArCellConditions.py | 2 - .../share/LArConditionsCopy.py | 3 - .../FixLArElecCalib_FcalIdFix7_jobOptions.py | 10 - .../share/FixLArElecCalib_fix3_jobOptions.py | 10 - .../share/FixLArElecCalib_fix4_jobOptions.py | 10 - .../share/FixLArElecCalib_fix5_jobOptions.py | 10 - .../share/FixLArElecCalib_fix6_jobOptions.py | 10 - .../share/FixLArElecCalib_fix7_jobOptions.py | 10 - .../share/FixLArElecCalib_fix8_jobOptions.py | 8 - .../share/FixLArElecCalib_fix9_jobOptions.py | 8 - .../share/FixLArIdMap_jobOptions.py | 11 - .../share/LArConvertCTBConditonsToPool.py | 6 - .../share/LArConvertH6ConditonsToPool.py | 6 - .../share/LArConvertH6IdMapToPool.py | 9 - .../share/LArConvertH8IdMapToPool.py | 9 - .../share/LArConvertMCNovaToPool.py | 6 - .../share/LArConvertMCNovaToPool_DC3-05.py | 6 - .../share/LArFecLvCTempTest_jobOptions.py | 5 - .../share/LArHVCommissionTest_jobOptions.py | 5 - .../LArCalibTest/share/LArReadHadDMCoeff.py | 4 - .../share/LArCondDataTest_jobOptions.py | 7 - .../share/LArConditionsTest.ref | 61 +- .../share/LArConditionsTestMC_jobOptions.py | 7 - .../LArConditionsTestReadAndReg_jobOptions.py | 9 - .../LArConditionsTestReadNoCorr_jobOptions.py | 9 - .../share/LArConditionsTestReadNoReg.ref | 69 +- .../LArConditionsTestReadNoReg_jobOptions.py | 9 - .../share/LArConditionsTestRead_jobOptions.py | 9 - .../LArConditionsTestWriteCorr_jobOptions.py | 9 - ...LArConditionsTestWriteNoCorr_jobOptions.py | 9 - .../share/LArConditionsTestWriteNoReg.ref | 67 +- .../LArConditionsTestWriteNoReg_jobOptions.py | 9 - ...LArConditionsTestWriteObjRel_jobOptions.py | 9 - .../LArConditionsTestWrite_jobOptions.py | 9 - .../share/LArConditionsTest_jobOptions.py | 9 - .../share/MuonDigitToPool_jobOptions.py | 4 - .../share/MuonRdoToPool_jobOptions.py | 4 - .../MDT_DigitizationStandalone_jobOptions.py | 2 - .../MuonCalibMonitoring/CMakeLists.txt | 4 - .../share/Load_AthenaSealSvc_joboptions.py | 34 - .../share/AODTriggerWrite_topOptions.py | 3 - .../share/EventTagTest_topOptions.py | 2 - .../share/ReadINav4MomAssocs_jobOptions.py | 5 - .../share/WriteINav4MomAssocs_jobOptions.py | 9 - .../share/AfpD3PDMaker_jobOption.py | 11 - .../share/AlfaD3PDMaker_jobOption.py | 11 - .../JetValidation/share/JetTask_ESDtoAOD.py | 2 - .../share/AnalysisCommon_topOptions.py | 7 - .../share/RecExCommon_topOptions.py | 11 - .../share/RecoOutputPoolCnv_jobOptions.py | 4 - .../RecExample/RecExCommon/share/RecoUtils.py | 1 - .../RecExTB/scripts/ctb.reco.merge.trf | 6 - .../RecExample/RecExTB/scripts/ctb.reco.trf | 6 - .../share/RecExTB_Combined_2004_jobOptions.py | 3 - .../RecExTB/share/RecExTB_H6_esdtoesd.py | 1 - .../RecExTB/share/RecExTB_H6_jobOptions.py | 1 - .../share/LarEMSamplingFraction_topOptions.py | 1 - .../share/atlas_error_categories.db | 1 - .../share/GeantinoMapping_jobOptions.py | 2 - .../share/TrkDetDescrTPCnvTest_jobOptions.py | 3 - .../share/EnergyLossSimulation_jobOptions.py | 2 - .../share/GeantFollowingMS_jobOptions.py | 2 - .../share/GeantFollowing_jobOptions.py | 2 - .../share/GeantinoMapping_jobOptions.py | 2 - .../share/trigDec_pureSteering_WritePOOL.py | 11 - .../share/HelloSerializerWorld.py | 10 +- .../TrigBSExtraction/share/unpackBS.py | 5 - .../share/L1CaloDumpRampData_topOptions.py | 2 - .../L1CaloLinearCalibration_topOptions.py | 1 - .../L1CaloPedestalCOOL2Ntuple_jobOptions.py | 5 - .../share/jobOptions_WriteLVL1_Pool.py | 4 - .../share/ReadLVL1BS_jobOptions.py | 8 - ...ergingEventLoopMgr_TriggerBSandRDOtoRDO.py | 5 - graphics/VP1/VP1Algs/share/vp1.py | 1 - 227 files changed, 1797 insertions(+), 4278 deletions(-) delete mode 100644 Control/AthenaKernel/AthenaKernel/IAthenaSealSvc.h delete mode 100755 Control/AthenaServices/share/AthenaSealSvc_joboptions.py delete mode 100644 Control/AthenaServices/src/AthenaSealSvc.cxx delete mode 100644 Control/AthenaServices/src/AthenaSealSvc.h delete mode 100755 MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/share/Load_AthenaSealSvc_joboptions.py diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/scripts/ReadReal.py b/AtlasTest/DatabaseTest/AthenaDBTestRec/scripts/ReadReal.py index bdfefd303b04..95f661e1f9cc 100755 --- a/AtlasTest/DatabaseTest/AthenaDBTestRec/scripts/ReadReal.py +++ b/AtlasTest/DatabaseTest/AthenaDBTestRec/scripts/ReadReal.py @@ -1,6 +1,6 @@ #!/bin/env python -# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration # import sys,os,traceback,time,commands,getopt from PyCool import cool @@ -57,12 +57,6 @@ conddb.iovdbsvc.GlobalTag='%s' from DBReplicaSvc.DBReplicaSvcConf import DBReplicaSvc svcMgr+=DBReplicaSvc(UseCOOLSQLite=False) -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -# include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -svcMgr.AthenaSealSvc.CheckDictionary=True - #-------------------------------------------------------------- # Private Application Configuration options #-------------------------------------------------------------- diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/scripts/ReadRun.py b/AtlasTest/DatabaseTest/AthenaDBTestRec/scripts/ReadRun.py index d67207a7c7e7..fc6d7947a660 100755 --- a/AtlasTest/DatabaseTest/AthenaDBTestRec/scripts/ReadRun.py +++ b/AtlasTest/DatabaseTest/AthenaDBTestRec/scripts/ReadRun.py @@ -1,6 +1,6 @@ #!/bin/env python -# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration # import sys,os,traceback,time,commands,getopt @@ -55,12 +55,6 @@ PoolSvc.SortReplicas=True from DBReplicaSvc.DBReplicaSvcConf import DBReplicaSvc svcMgr+=DBReplicaSvc(UseCOOLSQLite=False) -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -# include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -svcMgr.AthenaSealSvc.CheckDictionary=True - #-------------------------------------------------------------- # Private Application Configuration options #-------------------------------------------------------------- diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/share/ReadRefDBExample.py b/AtlasTest/DatabaseTest/AthenaDBTestRec/share/ReadRefDBExample.py index 48b0c3cc4e81..d33b83593d17 100644 --- a/AtlasTest/DatabaseTest/AthenaDBTestRec/share/ReadRefDBExample.py +++ b/AtlasTest/DatabaseTest/AthenaDBTestRec/share/ReadRefDBExample.py @@ -20,12 +20,6 @@ import IOVDbSvc.IOVDb svcMgr.IOVDbSvc.OutputLevel = 3 svcMgr.IOVDbSvc.ManageConnections=False -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -# include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -svcMgr.AthenaSealSvc.CheckDictionary=True - #-------------------------------------------------------------- # Private Application Configuration options #-------------------------------------------------------------- diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/share/TestCoolRecExample.py b/AtlasTest/DatabaseTest/AthenaDBTestRec/share/TestCoolRecExample.py index 6bbd26842831..6021a348be6d 100644 --- a/AtlasTest/DatabaseTest/AthenaDBTestRec/share/TestCoolRecExample.py +++ b/AtlasTest/DatabaseTest/AthenaDBTestRec/share/TestCoolRecExample.py @@ -20,12 +20,6 @@ import IOVDbSvc.IOVDb svcMgr.IOVDbSvc.OutputLevel=3 svcMgr.IOVDbSvc.ManageConnections=False -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -# include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -svcMgr.AthenaSealSvc.CheckDictionary=True - #-------------------------------------------------------------- # Private Application Configuration options #-------------------------------------------------------------- diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestCopy.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestCopy.py index a7f81e6955f7..1711fd7ff4bd 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestCopy.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestCopy.py @@ -54,14 +54,6 @@ GeoModelSvc.MuonVersionOverride="MuonSpectrometer-R.01.01.Initial.Light" svcMgr.EventSelector.InputCollections = [ "rfio:/castor/cern.ch/grid/atlas/t0/perm/M4cosmics/0020897/ESD/M4.0020897.debug.L1TT-b00000011.ESD.v13002507.part0013._lumi0000._0001.1" ] -#-------------------------------------------------------------- -# JobOptions for the loading of the AthenaSealSvc -#-------------------------------------------------------------- - -# Add in dictionary name: -#AthenaSealSvc.DictNames += [ "SealCLHEPDict" ] -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = True #-------------------------------------------------------------- # Event related parameters #-------------------------------------------------------------- @@ -105,7 +97,6 @@ print Stream1.ItemList svcMgr.MessageSvc = Service( "MessageSvc" ) svcMgr.MessageSvc.OutputLevel = INFO svcMgr.MessageSvc.debugLimit = 100000 -svcMgr.AthenaSealSvc.OutputLevel = INFO AthenaEventLoopMgr = Service( "AthenaEventLoopMgr" ) #AthenaEventLoopMgr.OutputLevel = DEBUG diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestPartialWrite.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestPartialWrite.py index e6b2d69b4d12..ccca92a4374f 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestPartialWrite.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestPartialWrite.py @@ -1,88 +1,74 @@ ############################################################### -# -# Job options file -# -## @file LArCellContWriter_jobOptions.py -## -## @brief For Athena POOL test: write out LArCellContainers -## -## @author RD Schaffer <R.D.Schaffer@cern.ch> -# -#============================================================== -# MC Event Selector -include( "AthenaCommon/Atlas_Gen.UnixStandardJob.py" ) - -#-------------------------------------------------------------- -# Load POOL support -#-------------------------------------------------------------- -include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" ) - -#-------------------------------------------------------------- -# JobOptions for the loading of the AthenaSealSvc -#-------------------------------------------------------------- -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - -# Dictionaries for AthenaSealSvc: -include( "EventInfo/EventInfoDict_joboptions.py" ) - -include( "AthenaPoolTestData/AthenaPoolTestDataDict_joboptions.py" ) - -# Add in dictionary name: -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.DictNames += [ "SealCLHEPDict" ] -# Check the dictionary in memory for completeness -#AthenaSealSvc.CheckDictionary = TRUE -#-------------------------------------------------------------- -# Event related parameters -#-------------------------------------------------------------- -theApp.EvtMax = 5 -#-------------------------------------------------------------- -# Application: AthenaPoolTest options -#-------------------------------------------------------------- -theApp.Dlls += [ "AthenaPoolTest" ] -theApp.TopAlg += [ "AthenaPoolTestDataWriter" ] -AthenaPoolTestDataWriter = Algorithm( "AthenaPoolTestDataWriter" ) -AthenaPoolTestDataWriter.PartialCreate = TRUE -#-------------------------------------------------------------- -# Output options -#-------------------------------------------------------------- -# LAr Hit -# Converters: -include( "EventAthenaPool/EventAthenaPool_joboptions.py" ) - -include( "AthenaPoolTestAthenaPool/AthenaPoolTestAthenaPool_joboptions.py" ) - -# ItemList: -include( "EventAthenaPool/EventAthenaPoolItemList_joboptions.py" ) -include( "AthenaPoolTestAthenaPool/AthenaPoolTestAthenaPoolItemList_joboptions.py" ) - -print fullItemList - -# Stream's output file -Stream1 = Algorithm( "Stream1" ) -Stream1.OutputFile = "SimplePoolFile1.root" -# List of DO's to write out -Stream1.ItemList += fullItemList -#Stream1.ItemList += ["EventInfo#*"] -#Stream1.ItemList += ["IAthenaPoolTestCollection#*"] -#Stream1.ItemList += ["AthenaPoolTestMatrix#*"] -#-------------------------------------------------------------- -# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) -#-------------------------------------------------------------- -MessageSvc = Service( "MessageSvc" ) -MessageSvc.OutputLevel = 3 -MessageSvc.debugLimit = 100000 -ClassIDSvc = Service( "ClassIDSvc" ) -ClassIDSvc.OutputLevel = 3 -AthenaSealSvc.OutputLevel = 3 -AthenaPoolTestDataWriter = Algorithm( "AthenaPoolTestDataWriter" ) -AthenaPoolTestDataWriter.OutputLevel = 2 - -# No stats printout -include( "AthenaPoolTest/NoStats_jobOptions.py" ) - -#============================================================== -# -# End of job options file -# -############################################################### +# +# Job options file +# +## @file LArCellContWriter_jobOptions.py +## +## @brief For Athena POOL test: write out LArCellContainers +## +## @author RD Schaffer <R.D.Schaffer@cern.ch> +# +#============================================================== +# MC Event Selector +include( "AthenaCommon/Atlas_Gen.UnixStandardJob.py" ) + +#-------------------------------------------------------------- +# Load POOL support +#-------------------------------------------------------------- +include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" ) + +include( "AthenaPoolTestData/AthenaPoolTestDataDict_joboptions.py" ) + +#-------------------------------------------------------------- +# Event related parameters +#-------------------------------------------------------------- +theApp.EvtMax = 5 +#-------------------------------------------------------------- +# Application: AthenaPoolTest options +#-------------------------------------------------------------- +theApp.Dlls += [ "AthenaPoolTest" ] +theApp.TopAlg += [ "AthenaPoolTestDataWriter" ] +AthenaPoolTestDataWriter = Algorithm( "AthenaPoolTestDataWriter" ) +AthenaPoolTestDataWriter.PartialCreate = TRUE +#-------------------------------------------------------------- +# Output options +#-------------------------------------------------------------- +# LAr Hit +# Converters: +include( "EventAthenaPool/EventAthenaPool_joboptions.py" ) + +include( "AthenaPoolTestAthenaPool/AthenaPoolTestAthenaPool_joboptions.py" ) + +# ItemList: +include( "EventAthenaPool/EventAthenaPoolItemList_joboptions.py" ) +include( "AthenaPoolTestAthenaPool/AthenaPoolTestAthenaPoolItemList_joboptions.py" ) + +print fullItemList + +# Stream's output file +Stream1 = Algorithm( "Stream1" ) +Stream1.OutputFile = "SimplePoolFile1.root" +# List of DO's to write out +Stream1.ItemList += fullItemList +#Stream1.ItemList += ["EventInfo#*"] +#Stream1.ItemList += ["IAthenaPoolTestCollection#*"] +#Stream1.ItemList += ["AthenaPoolTestMatrix#*"] +#-------------------------------------------------------------- +# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) +#-------------------------------------------------------------- +MessageSvc = Service( "MessageSvc" ) +MessageSvc.OutputLevel = 3 +MessageSvc.debugLimit = 100000 +ClassIDSvc = Service( "ClassIDSvc" ) +ClassIDSvc.OutputLevel = 3 +AthenaPoolTestDataWriter = Algorithm( "AthenaPoolTestDataWriter" ) +AthenaPoolTestDataWriter.OutputLevel = 2 + +# No stats printout +include( "AthenaPoolTest/NoStats_jobOptions.py" ) + +#============================================================== +# +# End of job options file +# +############################################################### diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2Write.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2Write.py index bd0e18823d87..8053c30fb1f1 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2Write.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2Write.py @@ -1,111 +1,104 @@ ############################################################### -# -# Job options file -# -## @file AthenaPoolTestStep2Write.py -## -## @brief For Athena POOL test: write out AthenaPoolTest data objects -## in a second file to test navigation -## -## @author RD Schaffer <R.D.Schaffer@cern.ch> -# -#============================================================== - -## basic job configuration -import AthenaCommon.AtlasUnixStandardJob - -## get a handle to the default top-level algorithm sequence -from AthenaCommon.AlgSequence import AlgSequence -topSequence = AlgSequence() - -## get a handle to the ApplicationManager -from AthenaCommon.AppMgr import theApp - -## get a handle to the ServiceManager -from AthenaCommon.AppMgr import ServiceMgr as svcMgr - -#-------------------------------------------------------------- -# Load POOL support -#-------------------------------------------------------------- -import AthenaPoolCnvSvc.ReadAthenaPool -import AthenaPoolCnvSvc.WriteAthenaPool - -#-------------------------------------------------------------- -# Define the input parameters -#-------------------------------------------------------------- - -svcMgr.EventSelector.InputCollections = [ "SimplePoolFile.root" ] - -#-------------------------------------------------------------- -# JobOptions for the loading of the AthenaSealSvc -#-------------------------------------------------------------- - -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = True -#-------------------------------------------------------------- -# Event related parameters -#-------------------------------------------------------------- -theApp.EvtMax = 5 -#-------------------------------------------------------------- -# Application: AthenaPoolTest options -#-------------------------------------------------------------- -from AthenaPoolTest.AthenaPoolTestConf import AthenaPoolTestDataWriter -topSequence += AthenaPoolTestDataWriter( "AthenaPoolTestDataWriter" ) -AthenaPoolTestDataWriter.PartialCreate = TRUE -AthenaPoolTestDataWriter.ReadOtherHalf = TRUE -# Try to also read in the first half that is going to be written out -# again => this should produce an error -#AthenaPoolTestDataWriter.ReadFirstHalf = TRUE -#-------------------------------------------------------------- -# Output options -#-------------------------------------------------------------- -# ItemList: -include( "EventAthenaPool/EventAthenaPoolItemList_joboptions.py" ) -include( "AthenaPoolTestAthenaPool/AthenaPoolTestAthenaPoolItemList_joboptions.py" ) - -printfunc (fullItemList) - -from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream -Stream1 = AthenaPoolOutputStream( "Stream1", noTag=True ) - -# Run OutputStream as an algorithm -topSequence += AthenaPoolOutputStream( "Stream1", noTag=True ) -# Must make sure that no OutStream's have been declared -theApp.OutStream = []; -# Stream's output file -Stream1.WritingTool = "AthenaOutputStreamTool" -Stream1.OutputFile = "SimplePoolFile1.root" -# List of DO's to write out -#Stream1.ItemList += fullItemList -Stream1.ItemList += ["EventInfo#*"] -#Stream1.ItemList += ["IAthenaPoolTestCollection#*"] -# Write out only a new set of cols 1,2,3, and matrix -Stream1.ItemList += ["IAthenaPoolTestCollection#AthenaPoolTestCollection_1"] -Stream1.ItemList += ["IAthenaPoolTestCollection#AthenaPoolTestCollection_2"] -Stream1.ItemList += ["IAthenaPoolTestCollection#AthenaPoolTestCollection_3"] -Stream1.ItemList += ["AthenaPoolTestMatrix#*"] - -printfunc (Stream1.ItemList) - -#-------------------------------------------------------------- -# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) -#-------------------------------------------------------------- -svcMgr.MessageSvc.OutputLevel = WARNING -svcMgr.MessageSvc.debugLimit = 100000 -#rds ClassIDSvc = Service( "ClassIDSvc" ) -#rds ClassIDSvc.OutputLevel = 3 -svcMgr.AthenaSealSvc.OutputLevel = WARNING -AthenaPoolTestDataWriter.OutputLevel = DEBUG - -from AthenaServices import AthenaServicesConf -AthenaEventLoopMgr = AthenaServicesConf.AthenaEventLoopMgr() -AthenaEventLoopMgr.OutputLevel = INFO - -# No stats printout -include( "AthenaPoolTest/NoStats_jobOptions.py" ) - -#============================================================== -# -# End of job options file -# -############################################################### +# +# Job options file +# +## @file AthenaPoolTestStep2Write.py +## +## @brief For Athena POOL test: write out AthenaPoolTest data objects +## in a second file to test navigation +## +## @author RD Schaffer <R.D.Schaffer@cern.ch> +# +#============================================================== + +## basic job configuration +import AthenaCommon.AtlasUnixStandardJob + +## get a handle to the default top-level algorithm sequence +from AthenaCommon.AlgSequence import AlgSequence +topSequence = AlgSequence() + +## get a handle to the ApplicationManager +from AthenaCommon.AppMgr import theApp + +## get a handle to the ServiceManager +from AthenaCommon.AppMgr import ServiceMgr as svcMgr + +#-------------------------------------------------------------- +# Load POOL support +#-------------------------------------------------------------- +import AthenaPoolCnvSvc.ReadAthenaPool +import AthenaPoolCnvSvc.WriteAthenaPool + +#-------------------------------------------------------------- +# Define the input parameters +#-------------------------------------------------------------- + +svcMgr.EventSelector.InputCollections = [ "SimplePoolFile.root" ] + +#-------------------------------------------------------------- +# Event related parameters +#-------------------------------------------------------------- +theApp.EvtMax = 5 +#-------------------------------------------------------------- +# Application: AthenaPoolTest options +#-------------------------------------------------------------- +from AthenaPoolTest.AthenaPoolTestConf import AthenaPoolTestDataWriter +topSequence += AthenaPoolTestDataWriter( "AthenaPoolTestDataWriter" ) +AthenaPoolTestDataWriter.PartialCreate = TRUE +AthenaPoolTestDataWriter.ReadOtherHalf = TRUE +# Try to also read in the first half that is going to be written out +# again => this should produce an error +#AthenaPoolTestDataWriter.ReadFirstHalf = TRUE +#-------------------------------------------------------------- +# Output options +#-------------------------------------------------------------- +# ItemList: +include( "EventAthenaPool/EventAthenaPoolItemList_joboptions.py" ) +include( "AthenaPoolTestAthenaPool/AthenaPoolTestAthenaPoolItemList_joboptions.py" ) + +printfunc (fullItemList) + +from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream +Stream1 = AthenaPoolOutputStream( "Stream1", noTag=True ) + +# Run OutputStream as an algorithm +topSequence += AthenaPoolOutputStream( "Stream1", noTag=True ) +# Must make sure that no OutStream's have been declared +theApp.OutStream = []; +# Stream's output file +Stream1.WritingTool = "AthenaOutputStreamTool" +Stream1.OutputFile = "SimplePoolFile1.root" +# List of DO's to write out +#Stream1.ItemList += fullItemList +Stream1.ItemList += ["EventInfo#*"] +#Stream1.ItemList += ["IAthenaPoolTestCollection#*"] +# Write out only a new set of cols 1,2,3, and matrix +Stream1.ItemList += ["IAthenaPoolTestCollection#AthenaPoolTestCollection_1"] +Stream1.ItemList += ["IAthenaPoolTestCollection#AthenaPoolTestCollection_2"] +Stream1.ItemList += ["IAthenaPoolTestCollection#AthenaPoolTestCollection_3"] +Stream1.ItemList += ["AthenaPoolTestMatrix#*"] + +printfunc (Stream1.ItemList) + +#-------------------------------------------------------------- +# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) +#-------------------------------------------------------------- +svcMgr.MessageSvc.OutputLevel = WARNING +svcMgr.MessageSvc.debugLimit = 100000 +#rds ClassIDSvc = Service( "ClassIDSvc" ) +#rds ClassIDSvc.OutputLevel = 3 +AthenaPoolTestDataWriter.OutputLevel = DEBUG + +from AthenaServices import AthenaServicesConf +AthenaEventLoopMgr = AthenaServicesConf.AthenaEventLoopMgr() +AthenaEventLoopMgr.OutputLevel = INFO + +# No stats printout +include( "AthenaPoolTest/NoStats_jobOptions.py" ) + +#============================================================== +# +# End of job options file +# +############################################################### diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2WriteDoubleSelector.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2WriteDoubleSelector.py index 86d3f144b860..3e02a527833f 100644 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2WriteDoubleSelector.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2WriteDoubleSelector.py @@ -41,13 +41,6 @@ svcMgr.SecondaryEventSelector.InputCollections = [ "SimplePoolFile2.root" ] svcMgr.DoubleEventSelector.OutputLevel = DEBUG svcMgr.SecondaryEventSelector.OutputLevel = DEBUG -#-------------------------------------------------------------- -# JobOptions for the loading of the AthenaSealSvc -#-------------------------------------------------------------- - -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = True - #-------------------------------------------------------------- # Event related parameters #-------------------------------------------------------------- @@ -102,7 +95,6 @@ PoolSvc.WriteCatalog = 'file:AthenaPoolTestStep2WriteDoubleSelector_catalog.xml' #-------------------------------------------------------------- svcMgr.MessageSvc.OutputLevel = WARNING svcMgr.MessageSvc.debugLimit = 100000 -svcMgr.AthenaSealSvc.OutputLevel = WARNING AthenaPoolTestDataWriter.OutputLevel = DEBUG from AthenaServices import AthenaServicesConf diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestWrite.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestWrite.py index 00900bb10aa6..9b619d1ae391 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestWrite.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestWrite.py @@ -1,124 +1,114 @@ ############################################################### -# -# Job options file -# -## @file AthenaPoolTestWrite.py -## -## @brief For Athena POOL test: write out AthenaPoolTest data objects -## -## @author RD Schaffer <R.D.Schaffer@cern.ch> -# -#============================================================== -# MC Event Selector -## basic job configuration (for generator) -import AthenaCommon.AtlasUnixGeneratorJob - -## get a handle to the default top-level algorithm sequence -from AthenaCommon.AlgSequence import AlgSequence -topSequence = AlgSequence() - -## get a handle to the ServiceManager -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 -#-------------------------------------------------------------- -import AthenaPoolCnvSvc.WriteAthenaPool - -#-------------------------------------------------------------- -# JobOptions for the loading of the AthenaSealSvc -#-------------------------------------------------------------- - -# Add in dictionary name: -#svcMgr.AthenaSealSvc = Service( "AthenaSealSvc" ) -#AthenaSealSvc.DictNames += [ "SealCLHEPDict" ] -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = True -#-------------------------------------------------------------- -# Event related parameters -#-------------------------------------------------------------- -theApp.EvtMax = 5 - -#-------------------------------------------------------------- -# Event related parameters -#-------------------------------------------------------------- -# Set the following when reading back to adjust the run/event numbers -# (don't forget ApplicationMgr.EvtMax) -svcMgr.EventSelector.RunNumber = 1 -svcMgr.EventSelector.EventsPerRun = 0x10000000000 -svcMgr.EventSelector.FirstEvent = 0x100000000 -svcMgr.EventSelector.EventsPerLB = 1 -svcMgr.EventSelector.FirstLB = 1 -svcMgr.EventSelector.InitialTimeStamp = 0 -svcMgr.EventSelector.TimeStampInterval = 5 -theApp.EvtMax = 2 - -svcMgr.EventSelector.OutputLevel = DEBUG - -#-------------------------------------------------------------- -# Application: AthenaPoolTest options -#-------------------------------------------------------------- - -# Load "user algorithm" top algorithms to be run, and the libraries that house them -from AthenaPoolTest.AthenaPoolTestConf import AthenaPoolTestDataWriter -topSequence += AthenaPoolTestDataWriter( "AthenaPoolTestDataWriter" ) -AthenaPoolTestDataWriter.OutputLevel = DEBUG - -#-------------------------------------------------------------- -# Output options -#-------------------------------------------------------------- -# LAr Hit -# Converters: - -# ItemList: -include( "EventAthenaPool/EventAthenaPoolItemList_joboptions.py" ) -include( "AthenaPoolTestAthenaPool/AthenaPoolTestAthenaPoolItemList_joboptions.py" ) - -printfunc (fullItemList) - -# Stream's output file -from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream -Stream1 = AthenaPoolOutputStream( "Stream1", noTag=True ) -Stream1.OutputFile = "SimplePoolFile.root" -# List of DO's to write out -Stream1.ItemList += fullItemList - -# Remove dumm_A from itemlist -#Stream1.ItemList = [ o for o in Stream1.ItemList if not o in 'dummy_A#*' ] -#Stream1.ItemList = [ o for o in Stream1.ItemList if not o in 'AthenaPoolTestMap#*' ] -#Stream1.ItemList = [ o for o in Stream1.ItemList if not o == 'PileUpEventInfo#*' ] - -printfunc (Stream1.ItemList) - -#-------------------------------------------------------------- -# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) -#-------------------------------------------------------------- -svcMgr.MessageSvc.OutputLevel = WARNING -svcMgr.MessageSvc.debugLimit = 100000 - -#rds svcMgr.ClassIDSvc = Service( "ClassIDSvc" ) -#rds svcMgr.ClassIDSvc.OutputLevel = 3 -svcMgr.AthenaSealSvc.OutputLevel = WARNING - -from AthenaServices import AthenaServicesConf -AthenaEventLoopMgr = AthenaServicesConf.AthenaEventLoopMgr() -AthenaEventLoopMgr.OutputLevel = INFO - -#svcMgr.StoreGateSvc = Service( "StoreGateSvc" ) -#svcMgr.StoreGateSvc.Dump = TRUE -#svcMgr.StoreGateSvc.OutputLevel = 2 - -# No stats printout -include( "AthenaPoolTest/NoStats_jobOptions.py" ) - -#============================================================== -# -# End of job options file -# -############################################################### +# +# Job options file +# +## @file AthenaPoolTestWrite.py +## +## @brief For Athena POOL test: write out AthenaPoolTest data objects +## +## @author RD Schaffer <R.D.Schaffer@cern.ch> +# +#============================================================== +# MC Event Selector +## basic job configuration (for generator) +import AthenaCommon.AtlasUnixGeneratorJob + +## get a handle to the default top-level algorithm sequence +from AthenaCommon.AlgSequence import AlgSequence +topSequence = AlgSequence() + +## get a handle to the ServiceManager +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 +#-------------------------------------------------------------- +import AthenaPoolCnvSvc.WriteAthenaPool + +#-------------------------------------------------------------- +# Event related parameters +#-------------------------------------------------------------- +theApp.EvtMax = 5 + +#-------------------------------------------------------------- +# Event related parameters +#-------------------------------------------------------------- +# Set the following when reading back to adjust the run/event numbers +# (don't forget ApplicationMgr.EvtMax) +svcMgr.EventSelector.RunNumber = 1 +svcMgr.EventSelector.EventsPerRun = 0x10000000000 +svcMgr.EventSelector.FirstEvent = 0x100000000 +svcMgr.EventSelector.EventsPerLB = 1 +svcMgr.EventSelector.FirstLB = 1 +svcMgr.EventSelector.InitialTimeStamp = 0 +svcMgr.EventSelector.TimeStampInterval = 5 +theApp.EvtMax = 2 + +svcMgr.EventSelector.OutputLevel = DEBUG + +#-------------------------------------------------------------- +# Application: AthenaPoolTest options +#-------------------------------------------------------------- + +# Load "user algorithm" top algorithms to be run, and the libraries that house them +from AthenaPoolTest.AthenaPoolTestConf import AthenaPoolTestDataWriter +topSequence += AthenaPoolTestDataWriter( "AthenaPoolTestDataWriter" ) +AthenaPoolTestDataWriter.OutputLevel = DEBUG + +#-------------------------------------------------------------- +# Output options +#-------------------------------------------------------------- +# LAr Hit +# Converters: + +# ItemList: +include( "EventAthenaPool/EventAthenaPoolItemList_joboptions.py" ) +include( "AthenaPoolTestAthenaPool/AthenaPoolTestAthenaPoolItemList_joboptions.py" ) + +printfunc (fullItemList) + +# Stream's output file +from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream +Stream1 = AthenaPoolOutputStream( "Stream1", noTag=True ) +Stream1.OutputFile = "SimplePoolFile.root" +# List of DO's to write out +Stream1.ItemList += fullItemList + +# Remove dumm_A from itemlist +#Stream1.ItemList = [ o for o in Stream1.ItemList if not o in 'dummy_A#*' ] +#Stream1.ItemList = [ o for o in Stream1.ItemList if not o in 'AthenaPoolTestMap#*' ] +#Stream1.ItemList = [ o for o in Stream1.ItemList if not o == 'PileUpEventInfo#*' ] + +printfunc (Stream1.ItemList) + +#-------------------------------------------------------------- +# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) +#-------------------------------------------------------------- +svcMgr.MessageSvc.OutputLevel = WARNING +svcMgr.MessageSvc.debugLimit = 100000 + +#rds svcMgr.ClassIDSvc = Service( "ClassIDSvc" ) +#rds svcMgr.ClassIDSvc.OutputLevel = 3 + +from AthenaServices import AthenaServicesConf +AthenaEventLoopMgr = AthenaServicesConf.AthenaEventLoopMgr() +AthenaEventLoopMgr.OutputLevel = INFO + +#svcMgr.StoreGateSvc = Service( "StoreGateSvc" ) +#svcMgr.StoreGateSvc.Dump = TRUE +#svcMgr.StoreGateSvc.OutputLevel = 2 + +# No stats printout +include( "AthenaPoolTest/NoStats_jobOptions.py" ) + +#============================================================== +# +# End of job options file +# +############################################################### diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestWriteDoubleSelector.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestWriteDoubleSelector.py index c1cf51e73f4f..401a9122b375 100644 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestWriteDoubleSelector.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestWriteDoubleSelector.py @@ -28,13 +28,6 @@ from AthenaCommon.AppMgr import theApp #-------------------------------------------------------------- import AthenaPoolCnvSvc.WriteAthenaPool -#-------------------------------------------------------------- -# JobOptions for the loading of the AthenaSealSvc -#-------------------------------------------------------------- - -# Add in dictionary name: -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = True #-------------------------------------------------------------- # Event related parameters #-------------------------------------------------------------- @@ -104,8 +97,6 @@ printfunc ("Stream2.ItemList ",Stream2.ItemList) svcMgr.MessageSvc.OutputLevel = WARNING svcMgr.MessageSvc.debugLimit = 100000 -svcMgr.AthenaSealSvc.OutputLevel = WARNING - from AthenaServices import AthenaServicesConf AthenaEventLoopMgr = AthenaServicesConf.AthenaEventLoopMgr() AthenaEventLoopMgr.OutputLevel = INFO diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AtlfastPoolReadOptions.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AtlfastPoolReadOptions.py index 9157f4216e01..7f1781819c2f 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AtlfastPoolReadOptions.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AtlfastPoolReadOptions.py @@ -86,10 +86,6 @@ IKinematicDumper.cellLocation = "/Event/AtlfastPoolTestCells" #-------------------------------------------------------------- # Input options #-------------------------------------------------------------- -# Include AthenaSealSvc and dicts that are -# not linked against converters (temporary) -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - include( "FourMom/FourMomDict_joboptions.py" ) # Converters: diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AtlfastPoolWriteOptions.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AtlfastPoolWriteOptions.py index ad7cf87e4a91..2ee88d09227c 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AtlfastPoolWriteOptions.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AtlfastPoolWriteOptions.py @@ -82,10 +82,6 @@ AtlfastPoolTest.OutputLevel = 2 #-------------------------------------------------------------- # Output options #-------------------------------------------------------------- -# Include AthenaSealSvc and dicts that are -# not linked against converters (temporary) -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - include( "FourMom/FourMomDict_joboptions.py" ) # Converters: diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloCluster2StepReader_jobOptions.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloCluster2StepReader_jobOptions.py index af279466a4f3..88f7ae35e40d 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloCluster2StepReader_jobOptions.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloCluster2StepReader_jobOptions.py @@ -1,84 +1,77 @@ ############################################################### -# -# Job options file -# -## @file CaloCluster2StepReader_jobOptions.py -## -## @brief For Athena POOL test: read back CaloClusterContainers and -## LArCellContainers using element links from across two files -## -## @author RD Schaffer <R.D.Schaffer@cern.ch> -# -#============================================================== -#-------------------------------------------------------------- -# Load POOL support -#-------------------------------------------------------------- -include( "AthenaPoolCnvSvc/ReadAthenaPool_jobOptions.py" ) - -#-------------------------------------------------------------- -# Set flags and load det descr -#-------------------------------------------------------------- -# For general flags -doAOD = False -doTrigger = False -DetDescrVersion = "ATLAS-CSC-01-01-00" -include( "RecExCond/RecExCommon_flags.py" ) - -# Set local flags - only need LAr DetDescr -DetFlags.detdescr.ID_setOff() -DetFlags.detdescr.Tile_setOff() -DetFlags.detdescr.Muon_setOff() - -# set up all detector description description -include ("RecExCond/AllDet_detDescr.py") - -#-------------------------------------------------------------- -# Define input -#-------------------------------------------------------------- -EventSelector = Service( "EventSelector" ) -EventSelector.InputCollections = [ "SimplePoolFile2.root" ] -#-------------------------------------------------------------- -# Event related parameters -#-------------------------------------------------------------- -theApp.EvtMax = 20 -#-------------------------------------------------------------- -# Application: AthenaPoolTest InDetRawData options -#-------------------------------------------------------------- -theApp.Dlls += [ "AthenaPoolTest" ] -theApp.TopAlg += [ "CaloClusterFakeReader" ] -#-------------------------------------------------------------- -# JobOptions for the loading of the AthenaSealSvc -#-------------------------------------------------------------- -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - - -# Check the dictionary in memory for completeness -#AthenaSealSvc.CheckDictionary = true; -#-------------------------------------------------------------- -# Input options -#-------------------------------------------------------------- -# Converters: -include( "EventAthenaPool/EventAthenaPool_joboptions.py" ) - -include( "CaloAthenaPool/CaloAthenaPool_joboptions.py" ) -#include( "LArAthenaPool/LArAthenaPool_joboptions.py" ) - -#-------------------------------------------------------------- -# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) -#-------------------------------------------------------------- -MessageSvc = Service( "MessageSvc" ) -MessageSvc.OutputLevel = INFO -MessageSvc.debugLimit = 100000 -ClassIDSvc = Service( "ClassIDSvc" ) -ClassIDSvc.OutputLevel = INFO -CaloClusterFakeReader = Algorithm( "CaloClusterFakeReader" ) -CaloClusterFakeReader.OutputLevel = DEBUG - -# No stats printout -include( "AthenaPoolTest/NoStats_jobOptions.py" ) - -#============================================================== -# -# End of job options file -# -############################################################### +# +# Job options file +# +## @file CaloCluster2StepReader_jobOptions.py +## +## @brief For Athena POOL test: read back CaloClusterContainers and +## LArCellContainers using element links from across two files +## +## @author RD Schaffer <R.D.Schaffer@cern.ch> +# +#============================================================== +#-------------------------------------------------------------- +# Load POOL support +#-------------------------------------------------------------- +include( "AthenaPoolCnvSvc/ReadAthenaPool_jobOptions.py" ) + +#-------------------------------------------------------------- +# Set flags and load det descr +#-------------------------------------------------------------- +# For general flags +doAOD = False +doTrigger = False +DetDescrVersion = "ATLAS-CSC-01-01-00" +include( "RecExCond/RecExCommon_flags.py" ) + +# Set local flags - only need LAr DetDescr +DetFlags.detdescr.ID_setOff() +DetFlags.detdescr.Tile_setOff() +DetFlags.detdescr.Muon_setOff() + +# set up all detector description description +include ("RecExCond/AllDet_detDescr.py") + +#-------------------------------------------------------------- +# Define input +#-------------------------------------------------------------- +EventSelector = Service( "EventSelector" ) +EventSelector.InputCollections = [ "SimplePoolFile2.root" ] +#-------------------------------------------------------------- +# Event related parameters +#-------------------------------------------------------------- +theApp.EvtMax = 20 +#-------------------------------------------------------------- +# Application: AthenaPoolTest InDetRawData options +#-------------------------------------------------------------- +theApp.Dlls += [ "AthenaPoolTest" ] +theApp.TopAlg += [ "CaloClusterFakeReader" ] + +#-------------------------------------------------------------- +# Input options +#-------------------------------------------------------------- +# Converters: +include( "EventAthenaPool/EventAthenaPool_joboptions.py" ) + +include( "CaloAthenaPool/CaloAthenaPool_joboptions.py" ) +#include( "LArAthenaPool/LArAthenaPool_joboptions.py" ) + +#-------------------------------------------------------------- +# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) +#-------------------------------------------------------------- +MessageSvc = Service( "MessageSvc" ) +MessageSvc.OutputLevel = INFO +MessageSvc.debugLimit = 100000 +ClassIDSvc = Service( "ClassIDSvc" ) +ClassIDSvc.OutputLevel = INFO +CaloClusterFakeReader = Algorithm( "CaloClusterFakeReader" ) +CaloClusterFakeReader.OutputLevel = DEBUG + +# No stats printout +include( "AthenaPoolTest/NoStats_jobOptions.py" ) + +#============================================================== +# +# End of job options file +# +############################################################### diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloClusterStep1Writer_jobOptions.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloClusterStep1Writer_jobOptions.py index f6dfe728c6a8..2b41947d973a 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloClusterStep1Writer_jobOptions.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloClusterStep1Writer_jobOptions.py @@ -1,92 +1,84 @@ ############################################################### -# -# Job options file -# -## @file CaloClusterStep1Writer_jobOptions.py -## -## @brief For Athena POOL test: write out LArCellContainers to -## a first file as part of test of ElementLinks across files -## -## @author RD Schaffer <R.D.Schaffer@cern.ch> -# -#============================================================== -# MC Event Selector -include( "AthenaCommon/Atlas_Gen.UnixStandardJob.py" ) - -#-------------------------------------------------------------- -# Set flags and load det descr -#-------------------------------------------------------------- -# For general flags -doAOD = False -doTrigger = False -DetDescrVersion = "ATLAS-CSC-01-01-00" -include( "RecExCond/RecExCommon_flags.py" ) - -# Set local flags - only need LAr DetDescr -DetFlags.detdescr.ID_setOff() -DetFlags.detdescr.Tile_setOff() -DetFlags.detdescr.Muon_setOff() - -# set up all detector description description -include ("RecExCond/AllDet_detDescr.py") - -#-------------------------------------------------------------- -# Load POOL support -#-------------------------------------------------------------- -include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" ) - -#-------------------------------------------------------------- -# Event related parameters -#-------------------------------------------------------------- -theApp.EvtMax = 20 -#-------------------------------------------------------------- -# Application: AthenaPoolTest InDetRawData options -#-------------------------------------------------------------- -theApp.Dlls += [ "AthenaPoolTest" ] -theApp.TopAlg += [ "LArCellContFakeWriter" ] -#theApp.TopAlg += [ "CaloClusterFakeWriter" ] -#-------------------------------------------------------------- -# JobOptions for the loading of the AthenaSealSvc -#-------------------------------------------------------------- -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - - -# Check the dictionary in memory for completeness -#AthenaSealSvc.CheckDictionary = true; -#-------------------------------------------------------------- -# Output options -#-------------------------------------------------------------- -# Converters: -include( "EventAthenaPool/EventAthenaPool_joboptions.py" ) - -include( "CaloAthenaPool/CaloAthenaPool_joboptions.py" ) -#include( "LArAthenaPool/LArAthenaPool_joboptions.py" ) - -# Stream's output file -Stream1 = Algorithm( "Stream1" ) -Stream1.OutputFile = "SimplePoolFile1.root" -# List of DO's to write out -Stream1.ItemList+=["CaloCellContainer#*"] -#Stream1.ItemList+=["CaloClusterContainer#*"] -Stream1.ItemList+=["EventInfo#*"] -#-------------------------------------------------------------- -# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) -#-------------------------------------------------------------- -MessageSvc = Service( "MessageSvc" ) -MessageSvc.OutputLevel = INFO -MessageSvc.debugLimit = 100000 -ClassIDSvc = Service( "ClassIDSvc" ) -ClassIDSvc.OutputLevel = INFO -LArCellContFakeWriter = Algorithm( "LArCellContFakeWriter" ) -LArCellContFakeWriter.OutputLevel = DEBUG -#CaloClusterFakeWriter = Algorithm( "CaloClusterFakeWriter" ) -#CaloClusterFakeWriter.OutputLevel = 2 - -# No stats printout -include( "AthenaPoolTest/NoStats_jobOptions.py" ) - -#============================================================== -# -# End of job options file -# -############################################################### +# +# Job options file +# +## @file CaloClusterStep1Writer_jobOptions.py +## +## @brief For Athena POOL test: write out LArCellContainers to +## a first file as part of test of ElementLinks across files +## +## @author RD Schaffer <R.D.Schaffer@cern.ch> +# +#============================================================== +# MC Event Selector +include( "AthenaCommon/Atlas_Gen.UnixStandardJob.py" ) + +#-------------------------------------------------------------- +# Set flags and load det descr +#-------------------------------------------------------------- +# For general flags +doAOD = False +doTrigger = False +DetDescrVersion = "ATLAS-CSC-01-01-00" +include( "RecExCond/RecExCommon_flags.py" ) + +# Set local flags - only need LAr DetDescr +DetFlags.detdescr.ID_setOff() +DetFlags.detdescr.Tile_setOff() +DetFlags.detdescr.Muon_setOff() + +# set up all detector description description +include ("RecExCond/AllDet_detDescr.py") + +#-------------------------------------------------------------- +# Load POOL support +#-------------------------------------------------------------- +include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" ) + +#-------------------------------------------------------------- +# Event related parameters +#-------------------------------------------------------------- +theApp.EvtMax = 20 +#-------------------------------------------------------------- +# Application: AthenaPoolTest InDetRawData options +#-------------------------------------------------------------- +theApp.Dlls += [ "AthenaPoolTest" ] +theApp.TopAlg += [ "LArCellContFakeWriter" ] +#theApp.TopAlg += [ "CaloClusterFakeWriter" ] +#-------------------------------------------------------------- +# Output options +#-------------------------------------------------------------- +# Converters: +include( "EventAthenaPool/EventAthenaPool_joboptions.py" ) + +include( "CaloAthenaPool/CaloAthenaPool_joboptions.py" ) +#include( "LArAthenaPool/LArAthenaPool_joboptions.py" ) + +# Stream's output file +Stream1 = Algorithm( "Stream1" ) +Stream1.OutputFile = "SimplePoolFile1.root" +# List of DO's to write out +Stream1.ItemList+=["CaloCellContainer#*"] +#Stream1.ItemList+=["CaloClusterContainer#*"] +Stream1.ItemList+=["EventInfo#*"] +#-------------------------------------------------------------- +# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) +#-------------------------------------------------------------- +MessageSvc = Service( "MessageSvc" ) +MessageSvc.OutputLevel = INFO +MessageSvc.debugLimit = 100000 +ClassIDSvc = Service( "ClassIDSvc" ) +ClassIDSvc.OutputLevel = INFO +LArCellContFakeWriter = Algorithm( "LArCellContFakeWriter" ) +LArCellContFakeWriter.OutputLevel = DEBUG +#CaloClusterFakeWriter = Algorithm( "CaloClusterFakeWriter" ) +#CaloClusterFakeWriter.OutputLevel = 2 + +# No stats printout +include( "AthenaPoolTest/NoStats_jobOptions.py" ) + +#============================================================== +# +# End of job options file +# +############################################################### diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloClusterStep2Writer_jobOptions.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloClusterStep2Writer_jobOptions.py index 74f485d91065..5b77a669b9e2 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloClusterStep2Writer_jobOptions.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloClusterStep2Writer_jobOptions.py @@ -1,105 +1,97 @@ ############################################################### -# -# Job options file -# -## @file CaloClusterStep2Writer_jobOptions.py -## -## @brief For Athena POOL test: write out CaloClusterContainers to -## a second file with ElemenetLinks to LArCellContainers in first file -## -## @author RD Schaffer <R.D.Schaffer@cern.ch> -# -#============================================================== -#-------------------------------------------------------------- -# Load POOL support -#-------------------------------------------------------------- -include( "AthenaPoolCnvSvc/ReadAthenaPool_jobOptions.py" ) -include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" ) - -#-------------------------------------------------------------- -# Set flags and load det descr -#-------------------------------------------------------------- -# For general flags -doAOD = False -doTrigger = False -DetDescrVersion = "ATLAS-CSC-01-01-00" -include( "RecExCond/RecExCommon_flags.py" ) - -# Set local flags - only need LAr DetDescr -DetFlags.detdescr.ID_setOff() -DetFlags.detdescr.Tile_setOff() -DetFlags.detdescr.Muon_setOff() - -# set up all detector description description -include ("RecExCond/AllDet_detDescr.py") - -#-------------------------------------------------------------- -# Define input -#-------------------------------------------------------------- -EventSelector = Service( "EventSelector" ) -EventSelector.InputCollections = [ "SimplePoolFile1.root" ] - -#-------------------------------------------------------------- -# Event related parameters -#-------------------------------------------------------------- -theApp.EvtMax = 20 - -#-------------------------------------------------------------- -# Application: AthenaPoolTest InDetRawData options -#-------------------------------------------------------------- -theApp.Dlls += [ "AthenaPoolTest" ] -#theApp.TopAlg += [ "LArCellContFakeWriter" ] -theApp.TopAlg += [ "CaloClusterFakeWriter" ] - -#-------------------------------------------------------------- -# JobOptions for the loading of the AthenaSealSvc -#-------------------------------------------------------------- -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - - -# Check the dictionary in memory for completeness -#AthenaSealSvc.CheckDictionary = true; -#-------------------------------------------------------------- -# Output options -#-------------------------------------------------------------- -# Converters: -include( "EventAthenaPool/EventAthenaPool_joboptions.py" ) - -include( "CaloAthenaPool/CaloAthenaPool_joboptions.py" ) -#include( "LArAthenaPool/LArAthenaPool_joboptions.py" ) - -# Run OutputStream as an algorithm -theApp.TopAlg += [ "AthenaOutputStream/Stream1" ] -# Must make sure that no OutStream's have been declared -theApp.OutStream = []; -# Stream's output file -Stream1 = Algorithm( "AthenaOutputStream/Stream1" ) -Stream1.WritingTool = "AthenaOutputStreamTool" -Stream1.OutputFile = "SimplePoolFile2.root" -# List of DO's to write out -#Stream1.ItemList += ["CaloCellContainer#*"] -Stream1.ItemList += ["CaloClusterContainer#*"] -Stream1.ItemList += ["CaloCellLinkContainer#*"] -Stream1.ItemList += ["CaloShowerContainer#*"] -Stream1.ItemList += ["EventInfo#*"] -#-------------------------------------------------------------- -# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) -#-------------------------------------------------------------- -MessageSvc = Service( "MessageSvc" ) -MessageSvc.OutputLevel = INFO -MessageSvc.debugLimit = 100000 -ClassIDSvc = Service( "ClassIDSvc" ) -ClassIDSvc.OutputLevel = INFO -#LArCellContFakeWriter = Algorithm( "LArCellContFakeWriter" ) -#LArCellContFakeWriter.OutputLevel = DEBUG -CaloClusterFakeWriter = Algorithm( "CaloClusterFakeWriter" ) -CaloClusterFakeWriter.OutputLevel = DEBUG - -# No stats printout -include( "AthenaPoolTest/NoStats_jobOptions.py" ) - -#============================================================== -# -# End of job options file -# -############################################################### +# +# Job options file +# +## @file CaloClusterStep2Writer_jobOptions.py +## +## @brief For Athena POOL test: write out CaloClusterContainers to +## a second file with ElemenetLinks to LArCellContainers in first file +## +## @author RD Schaffer <R.D.Schaffer@cern.ch> +# +#============================================================== +#-------------------------------------------------------------- +# Load POOL support +#-------------------------------------------------------------- +include( "AthenaPoolCnvSvc/ReadAthenaPool_jobOptions.py" ) +include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" ) + +#-------------------------------------------------------------- +# Set flags and load det descr +#-------------------------------------------------------------- +# For general flags +doAOD = False +doTrigger = False +DetDescrVersion = "ATLAS-CSC-01-01-00" +include( "RecExCond/RecExCommon_flags.py" ) + +# Set local flags - only need LAr DetDescr +DetFlags.detdescr.ID_setOff() +DetFlags.detdescr.Tile_setOff() +DetFlags.detdescr.Muon_setOff() + +# set up all detector description description +include ("RecExCond/AllDet_detDescr.py") + +#-------------------------------------------------------------- +# Define input +#-------------------------------------------------------------- +EventSelector = Service( "EventSelector" ) +EventSelector.InputCollections = [ "SimplePoolFile1.root" ] + +#-------------------------------------------------------------- +# Event related parameters +#-------------------------------------------------------------- +theApp.EvtMax = 20 + +#-------------------------------------------------------------- +# Application: AthenaPoolTest InDetRawData options +#-------------------------------------------------------------- +theApp.Dlls += [ "AthenaPoolTest" ] +#theApp.TopAlg += [ "LArCellContFakeWriter" ] +theApp.TopAlg += [ "CaloClusterFakeWriter" ] + +#-------------------------------------------------------------- +# Output options +#-------------------------------------------------------------- +# Converters: +include( "EventAthenaPool/EventAthenaPool_joboptions.py" ) + +include( "CaloAthenaPool/CaloAthenaPool_joboptions.py" ) +#include( "LArAthenaPool/LArAthenaPool_joboptions.py" ) + +# Run OutputStream as an algorithm +theApp.TopAlg += [ "AthenaOutputStream/Stream1" ] +# Must make sure that no OutStream's have been declared +theApp.OutStream = []; +# Stream's output file +Stream1 = Algorithm( "AthenaOutputStream/Stream1" ) +Stream1.WritingTool = "AthenaOutputStreamTool" +Stream1.OutputFile = "SimplePoolFile2.root" +# List of DO's to write out +#Stream1.ItemList += ["CaloCellContainer#*"] +Stream1.ItemList += ["CaloClusterContainer#*"] +Stream1.ItemList += ["CaloCellLinkContainer#*"] +Stream1.ItemList += ["CaloShowerContainer#*"] +Stream1.ItemList += ["EventInfo#*"] +#-------------------------------------------------------------- +# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) +#-------------------------------------------------------------- +MessageSvc = Service( "MessageSvc" ) +MessageSvc.OutputLevel = INFO +MessageSvc.debugLimit = 100000 +ClassIDSvc = Service( "ClassIDSvc" ) +ClassIDSvc.OutputLevel = INFO +#LArCellContFakeWriter = Algorithm( "LArCellContFakeWriter" ) +#LArCellContFakeWriter.OutputLevel = DEBUG +CaloClusterFakeWriter = Algorithm( "CaloClusterFakeWriter" ) +CaloClusterFakeWriter.OutputLevel = DEBUG + +# No stats printout +include( "AthenaPoolTest/NoStats_jobOptions.py" ) + +#============================================================== +# +# End of job options file +# +############################################################### diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloClusterWriter_jobOptions.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloClusterWriter_jobOptions.py index 4f16de6acb69..a991e5d8b11e 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloClusterWriter_jobOptions.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloClusterWriter_jobOptions.py @@ -1,106 +1,104 @@ ############################################################### -# -# Job options file -# -## @file CaloClusterWriter_jobOptions.py -## -## @brief For Athena POOL test: write out CaloClusterContainers -## -## @author RD Schaffer <R.D.Schaffer@cern.ch> -# -#============================================================== - -# MC Event Selector -## basic job configuration (for generator) -import AthenaCommon.AtlasUnixGeneratorJob - -## get a handle to the default top-level algorithm sequence -from AthenaCommon.AlgSequence import AlgSequence -topSequence = AlgSequence() - -## get a handle to the ServiceManager -from AthenaCommon.AppMgr import ServiceMgr as svcMgr - -## get a handle to the ApplicationManager -from AthenaCommon.AppMgr import theApp - -#-------------------------------------------------------------- -# Set flags and load det descr -#-------------------------------------------------------------- -from AthenaCommon.GlobalFlags import globalflags -from AthenaCommon.DetFlags import DetFlags -from RecExConfig.RecFlags import rec - -# For general flags -rec.doAOD = False -rec.doTrigger = False -rec.doWriteTAG = False -DetDescrVersion = "ATLAS-GEO-17-00-00" - -# Set local flags - only need LAr DetDescr -DetFlags.detdescr.Calo_setOn() -DetFlags.detdescr.ID_setOff() -DetFlags.detdescr.Tile_setOff() -DetFlags.detdescr.Muon_setOff() - -# set up all detector description description -include ("RecExCond/AllDet_detDescr.py") - -# the correct tag should be specified -from IOVDbSvc.CondDB import conddb -conddb.setGlobalTag("OFLCOND-SDR-BS7T-04-00") - -#-------------------------------------------------------------- -# Load POOL support -#-------------------------------------------------------------- -include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" ) - -#-------------------------------------------------------------- -# Event related parameters -#-------------------------------------------------------------- -theApp.EvtMax = 20 -#-------------------------------------------------------------- -# Application: AthenaPoolTest InDetRawData options -#-------------------------------------------------------------- - -from AthenaPoolTest.AthenaPoolTestConf import LArCellContFakeWriter -topSequence += LArCellContFakeWriter( "LArCellContFakeWriter" ) - -from AthenaPoolTest.AthenaPoolTestConf import CaloClusterFakeWriter -topSequence += CaloClusterFakeWriter( "CaloClusterFakeWriter" ) - -# Check the dictionary in memory for completeness -#AthenaSealSvc.CheckDictionary = true; -#-------------------------------------------------------------- -# Output options -#-------------------------------------------------------------- - -# Stream's output file -from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream -Stream1 = AthenaPoolOutputStream( "Stream1" ) -Stream1.OutputFile = "SimplePoolFile.root" -# List of DO's to write out -Stream1.ItemList+=["CaloCellContainer#*"] -Stream1.ItemList+=["CaloCellLinkContainer#*"] -Stream1.ItemList+=["CaloClusterContainer#*"] -Stream1.ItemList+=["CaloShowerContainer#*"] -Stream1.ItemList+=["EventInfo#*"] -#-------------------------------------------------------------- -# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) -#-------------------------------------------------------------- -svcMgr.MessageSvc.Format = "% F%30W%S%7W%R%T %0W%M" -svcMgr.MessageSvc.OutputLevel = WARNING -svcMgr.MessageSvc.debugLimit = 100000 -svcMgr.MessageSvc.errorLimit = 100000 -#svcMgr.ClassIDSvc.OutputLevel = DEBUG -LArCellContFakeWriter.OutputLevel = DEBUG -CaloClusterFakeWriter.OutputLevel = DEBUG - -# No stats printout -include( "AthenaPoolTest/NoStats_jobOptions.py" ) - -#============================================================== -# -# End of job options file -# -############################################################### +# +# Job options file +# +## @file CaloClusterWriter_jobOptions.py +## +## @brief For Athena POOL test: write out CaloClusterContainers +## +## @author RD Schaffer <R.D.Schaffer@cern.ch> +# +#============================================================== + +# MC Event Selector +## basic job configuration (for generator) +import AthenaCommon.AtlasUnixGeneratorJob + +## get a handle to the default top-level algorithm sequence +from AthenaCommon.AlgSequence import AlgSequence +topSequence = AlgSequence() + +## get a handle to the ServiceManager +from AthenaCommon.AppMgr import ServiceMgr as svcMgr + +## get a handle to the ApplicationManager +from AthenaCommon.AppMgr import theApp + +#-------------------------------------------------------------- +# Set flags and load det descr +#-------------------------------------------------------------- +from AthenaCommon.GlobalFlags import globalflags +from AthenaCommon.DetFlags import DetFlags +from RecExConfig.RecFlags import rec + +# For general flags +rec.doAOD = False +rec.doTrigger = False +rec.doWriteTAG = False +DetDescrVersion = "ATLAS-GEO-17-00-00" + +# Set local flags - only need LAr DetDescr +DetFlags.detdescr.Calo_setOn() +DetFlags.detdescr.ID_setOff() +DetFlags.detdescr.Tile_setOff() +DetFlags.detdescr.Muon_setOff() + +# set up all detector description description +include ("RecExCond/AllDet_detDescr.py") + +# the correct tag should be specified +from IOVDbSvc.CondDB import conddb +conddb.setGlobalTag("OFLCOND-SDR-BS7T-04-00") + +#-------------------------------------------------------------- +# Load POOL support +#-------------------------------------------------------------- +include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" ) + +#-------------------------------------------------------------- +# Event related parameters +#-------------------------------------------------------------- +theApp.EvtMax = 20 +#-------------------------------------------------------------- +# Application: AthenaPoolTest InDetRawData options +#-------------------------------------------------------------- + +from AthenaPoolTest.AthenaPoolTestConf import LArCellContFakeWriter +topSequence += LArCellContFakeWriter( "LArCellContFakeWriter" ) + +from AthenaPoolTest.AthenaPoolTestConf import CaloClusterFakeWriter +topSequence += CaloClusterFakeWriter( "CaloClusterFakeWriter" ) + +#-------------------------------------------------------------- +# Output options +#-------------------------------------------------------------- + +# Stream's output file +from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream +Stream1 = AthenaPoolOutputStream( "Stream1" ) +Stream1.OutputFile = "SimplePoolFile.root" +# List of DO's to write out +Stream1.ItemList+=["CaloCellContainer#*"] +Stream1.ItemList+=["CaloCellLinkContainer#*"] +Stream1.ItemList+=["CaloClusterContainer#*"] +Stream1.ItemList+=["CaloShowerContainer#*"] +Stream1.ItemList+=["EventInfo#*"] +#-------------------------------------------------------------- +# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) +#-------------------------------------------------------------- +svcMgr.MessageSvc.Format = "% F%30W%S%7W%R%T %0W%M" +svcMgr.MessageSvc.OutputLevel = WARNING +svcMgr.MessageSvc.debugLimit = 100000 +svcMgr.MessageSvc.errorLimit = 100000 +#svcMgr.ClassIDSvc.OutputLevel = DEBUG +LArCellContFakeWriter.OutputLevel = DEBUG +CaloClusterFakeWriter.OutputLevel = DEBUG + +# No stats printout +include( "AthenaPoolTest/NoStats_jobOptions.py" ) + +#============================================================== +# +# End of job options file +# +############################################################### diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWrite.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWrite.py index 46c8ac5fadaf..898f245ae0d4 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWrite.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWrite.py @@ -70,9 +70,6 @@ if len(globalflags.ConditionsTag())!=0: #-------------------------------------------------------------- import AthenaPoolCnvSvc.WriteAthenaPool -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = True - #-------------------------------------------------------------- # Event related parameters #-------------------------------------------------------------- diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/InDetRawDataWriter_jobOptions.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/InDetRawDataWriter_jobOptions.py index c4cb2559ed5e..774e66f5ce56 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/InDetRawDataWriter_jobOptions.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/InDetRawDataWriter_jobOptions.py @@ -69,14 +69,6 @@ theApp.EvtMax = 20 from AthenaPoolTest.AthenaPoolTestConf import InDetRawDataFakeWriter topSequence += InDetRawDataFakeWriter( "InDetRawDataFakeWriter" ) -#-------------------------------------------------------------- -# JobOptions for the loading of the AthenaSealSvc -#-------------------------------------------------------------- - -# Check the dictionary in memory for completeness -#include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -svcMgr.AthenaSealSvc.CheckDictionary = True - #-------------------------------------------------------------- # Output options #-------------------------------------------------------------- diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContReader_jobOptionsReg.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContReader_jobOptionsReg.py index d8f78625d4d2..ba4fbde0fd2d 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContReader_jobOptionsReg.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContReader_jobOptionsReg.py @@ -1,91 +1,90 @@ ############################################################### -# -# Job options file -# -## @file LArCellContReader_jobOptionsReg.py -## -## @brief For Athena POOL test: read in LArCellContainers via explicit collections -## -## @author RD Schaffer <R.D.Schaffer@cern.ch> -# -#============================================================== - -## basic job configuration -import AthenaCommon.AtlasUnixStandardJob - -## get a handle to the default top-level algorithm sequence -from AthenaCommon.AlgSequence import AlgSequence -topSequence = AlgSequence() - -## get a handle to the ServiceManager -from AthenaCommon.AppMgr import ServiceMgr as svcMgr - -## get a handle to the ApplicationManager -from AthenaCommon.AppMgr import theApp - -#-------------------------------------------------------------- -# Load POOL support -#-------------------------------------------------------------- -import AthenaPoolCnvSvc.ReadAthenaPool - -#-------------------------------------------------------------- -# Set flags and load det descr -#-------------------------------------------------------------- -# For general flags -doAOD = False -doTrigger = False -DetDescrVersion = "ATLAS-CSC-01-02-00" -include( "RecExCond/RecExCommon_flags.py" ) - -# Set local flags - only need LAr DetDescr -DetFlags.detdescr.ID_setOff() -DetFlags.detdescr.Tile_setOff() -DetFlags.detdescr.Muon_setOff() - -# set up all detector description description -include ("RecExCond/AllDet_detDescr.py") - -# the correct tag should be specified -svcMgr.IOVDbSvc.GlobalTag="OFLCOND-CSC-00-01-00" - -#-------------------------------------------------------------- -# Define the output Db parameters (the default value are shown) -#-------------------------------------------------------------- -#svcMgr.EventSelector.CollectionType = "ExplicitROOT" -svcMgr.EventSelector.InputCollections = [ "NewEventCollection" ] -#-------------------------------------------------------------- -# Event related parameters -#-------------------------------------------------------------- -theApp.EvtMax = 20 - -#-------------------------------------------------------------- -# Application: AthenaPoolTest options -#-------------------------------------------------------------- - -from AthenaPoolTest.AthenaPoolTestConf import LArCellContFakeReader -topSequence += LArCellContFakeReader( "LArCellContFakeReader" ) - -from AthenaPoolTest.AthenaPoolTestConf import AthenaPoolTestAttrReader -topSequence += AthenaPoolTestAttrReader( "AthenaPoolTestAttrReader" ) - -#-------------------------------------------------------------- -# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) -#-------------------------------------------------------------- -svcMgr.MessageSvc.OutputLevel = INFO -svcMgr.MessageSvc.debugLimit = 100000 -svcMgr.ClassIDSvc.OutputLevel = INFO -svcMgr.AthenaSealSvc.OutputLevel = INFO -svcMgr.MetaDataSvc.OutputLevel = DEBUG -#AthenaPoolTestAttrReader.OutputLevel = DEBUG -LArCellContFakeReader.OutputLevel = DEBUG -#StoreGateSvc = Service( "StoreGateSvc" ) -#StoreGateSvc.Dump = TRUE - -# No stats printout -include( "AthenaPoolTest/NoStats_jobOptions.py" ) - -#============================================================== -# -# End of job options file -# -############################################################### +# +# Job options file +# +## @file LArCellContReader_jobOptionsReg.py +## +## @brief For Athena POOL test: read in LArCellContainers via explicit collections +## +## @author RD Schaffer <R.D.Schaffer@cern.ch> +# +#============================================================== + +## basic job configuration +import AthenaCommon.AtlasUnixStandardJob + +## get a handle to the default top-level algorithm sequence +from AthenaCommon.AlgSequence import AlgSequence +topSequence = AlgSequence() + +## get a handle to the ServiceManager +from AthenaCommon.AppMgr import ServiceMgr as svcMgr + +## get a handle to the ApplicationManager +from AthenaCommon.AppMgr import theApp + +#-------------------------------------------------------------- +# Load POOL support +#-------------------------------------------------------------- +import AthenaPoolCnvSvc.ReadAthenaPool + +#-------------------------------------------------------------- +# Set flags and load det descr +#-------------------------------------------------------------- +# For general flags +doAOD = False +doTrigger = False +DetDescrVersion = "ATLAS-CSC-01-02-00" +include( "RecExCond/RecExCommon_flags.py" ) + +# Set local flags - only need LAr DetDescr +DetFlags.detdescr.ID_setOff() +DetFlags.detdescr.Tile_setOff() +DetFlags.detdescr.Muon_setOff() + +# set up all detector description description +include ("RecExCond/AllDet_detDescr.py") + +# the correct tag should be specified +svcMgr.IOVDbSvc.GlobalTag="OFLCOND-CSC-00-01-00" + +#-------------------------------------------------------------- +# Define the output Db parameters (the default value are shown) +#-------------------------------------------------------------- +#svcMgr.EventSelector.CollectionType = "ExplicitROOT" +svcMgr.EventSelector.InputCollections = [ "NewEventCollection" ] +#-------------------------------------------------------------- +# Event related parameters +#-------------------------------------------------------------- +theApp.EvtMax = 20 + +#-------------------------------------------------------------- +# Application: AthenaPoolTest options +#-------------------------------------------------------------- + +from AthenaPoolTest.AthenaPoolTestConf import LArCellContFakeReader +topSequence += LArCellContFakeReader( "LArCellContFakeReader" ) + +from AthenaPoolTest.AthenaPoolTestConf import AthenaPoolTestAttrReader +topSequence += AthenaPoolTestAttrReader( "AthenaPoolTestAttrReader" ) + +#-------------------------------------------------------------- +# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) +#-------------------------------------------------------------- +svcMgr.MessageSvc.OutputLevel = INFO +svcMgr.MessageSvc.debugLimit = 100000 +svcMgr.ClassIDSvc.OutputLevel = INFO +svcMgr.MetaDataSvc.OutputLevel = DEBUG +#AthenaPoolTestAttrReader.OutputLevel = DEBUG +LArCellContFakeReader.OutputLevel = DEBUG +#StoreGateSvc = Service( "StoreGateSvc" ) +#StoreGateSvc.Dump = TRUE + +# No stats printout +include( "AthenaPoolTest/NoStats_jobOptions.py" ) + +#============================================================== +# +# End of job options file +# +############################################################### diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptions.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptions.py index c8448859a769..3888a46d8272 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptions.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptions.py @@ -65,14 +65,6 @@ theApp.EvtMax = 20 from AthenaPoolTest.AthenaPoolTestConf import LArCellContFakeWriter topSequence += LArCellContFakeWriter( "LArCellContFakeWriter" ) -#-------------------------------------------------------------- -# JobOptions for the loading of the AthenaSealSvc -#-------------------------------------------------------------- - -# Check the dictionary in memory for completeness -#include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -svcMgr.AthenaSealSvc.CheckDictionary = True - #-------------------------------------------------------------- # Output options #-------------------------------------------------------------- diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptionsReg.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptionsReg.py index 7a9feadc80c7..d8863acaee94 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptionsReg.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptionsReg.py @@ -1,118 +1,117 @@ ############################################################### -# -# Job options file -# -## @file LArCellContWriter_jobOptionsReg.py -## -## @brief For Athena POOL test: write out LArCellContainers -## -## @author RD Schaffer <R.D.Schaffer@cern.ch> -# -#============================================================== - -# MC Event Selector -## basic job configuration (for generator) -import AthenaCommon.AtlasUnixGeneratorJob - -## get a handle to the default top-level algorithm sequence -from AthenaCommon.AlgSequence import AlgSequence -topSequence = AlgSequence() - -## get a handle to the ServiceManager -from AthenaCommon.AppMgr import ServiceMgr as svcMgr - -## get a handle to the ApplicationManager -from AthenaCommon.AppMgr import theApp - -#-------------------------------------------------------------- -# Set flags and load det descr -#-------------------------------------------------------------- -# For general flags -doAOD = False -doTrigger = False -DetDescrVersion = "ATLAS-CSC-01-02-00" -include( "RecExCond/RecExCommon_flags.py" ) - -# Set local flags - only need LAr DetDescr -DetFlags.detdescr.ID_setOff() -DetFlags.detdescr.Tile_setOff() -DetFlags.detdescr.Muon_setOff() - -# set up all detector description description -include ("RecExCond/AllDet_detDescr.py") - -# the correct tag should be specified -svcMgr.IOVDbSvc.GlobalTag="OFLCOND-CSC-00-01-00" - -#-------------------------------------------------------------- -# Load POOL support -#-------------------------------------------------------------- -import AthenaPoolCnvSvc.WriteAthenaPool - -#-------------------------------------------------------------- -# Define the output Db parameters (the default value are shown) -#-------------------------------------------------------------- -svcMgr.EventSelector.RunNumber=1 -svcMgr.EventSelector.EventsPerRun=5 -svcMgr.EventSelector.FirstEvent=1 -theApp.EvtMax = 20 - -#-------------------------------------------------------------- -# Application: AthenaPoolTest options -#-------------------------------------------------------------- -from AthenaPoolTest.AthenaPoolTestConf import LArCellContFakeWriter -topSequence += LArCellContFakeWriter( "LArCellContFakeWriter" ) - -from AthenaPoolTest.AthenaPoolTestConf import AthenaPoolTestAttrWriter -topSequence += AthenaPoolTestAttrWriter( "AthenaPoolTestAttrWriter" ) - -#-------------------------------------------------------------- -# Output options -#-------------------------------------------------------------- - -# Stream's output file -from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream -Stream1 = AthenaPoolOutputStream( "Stream1" ) -Stream1.OutputFile = "SimplePoolFile.root" -# List of DO's to write out -Stream1.ItemList+=["CaloCellContainer#*"] -Stream1.ItemList+=["EventInfo#*"] - -# Must make sure that no OutStream's have been declared -theApp.OutStream = []; - -#-------------------------------------------------------------- -# Event Collection Registration -#-------------------------------------------------------------- -# Run OutputStream as an algorithm -from RegistrationServices.RegistrationServicesConf import RegistrationStream -RegStream1 = RegistrationStream( "RegStream1" ) -RegStream1.CollectionType = "ExplicitROOT" -RegStream1.OutputCollection = "NewEventCollection" -RegStream1.OutputLevel = INFO -# List of DO's to register -RegStream1.ItemList += [ "DataHeader#*" ] -# Key name of AthenaAttributeList used for the tag: -RegStream1.ItemList += [ "AthenaAttributeList#SimpleTag" ] -topSequence += RegStream1 - -#-------------------------------------------------------------- -# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) -#-------------------------------------------------------------- -svcMgr.MessageSvc.OutputLevel = INFO -svcMgr.MessageSvc.debugLimit = 100000 -svcMgr.ClassIDSvc.OutputLevel = INFO -svcMgr.AthenaSealSvc.OutputLevel = INFO -#AthenaPoolTestAttrWriter.OutputLevel = 2 -LArCellContFakeWriter.OutputLevel = DEBUG -#StoreGateSvc = Service( "StoreGateSvc" ) -#StoreGateSvc.Dump = TRUE - -# No stats printout -include( "AthenaPoolTest/NoStats_jobOptions.py" ) - -#============================================================== -# -# End of job options file -# -############################################################### +# +# Job options file +# +## @file LArCellContWriter_jobOptionsReg.py +## +## @brief For Athena POOL test: write out LArCellContainers +## +## @author RD Schaffer <R.D.Schaffer@cern.ch> +# +#============================================================== + +# MC Event Selector +## basic job configuration (for generator) +import AthenaCommon.AtlasUnixGeneratorJob + +## get a handle to the default top-level algorithm sequence +from AthenaCommon.AlgSequence import AlgSequence +topSequence = AlgSequence() + +## get a handle to the ServiceManager +from AthenaCommon.AppMgr import ServiceMgr as svcMgr + +## get a handle to the ApplicationManager +from AthenaCommon.AppMgr import theApp + +#-------------------------------------------------------------- +# Set flags and load det descr +#-------------------------------------------------------------- +# For general flags +doAOD = False +doTrigger = False +DetDescrVersion = "ATLAS-CSC-01-02-00" +include( "RecExCond/RecExCommon_flags.py" ) + +# Set local flags - only need LAr DetDescr +DetFlags.detdescr.ID_setOff() +DetFlags.detdescr.Tile_setOff() +DetFlags.detdescr.Muon_setOff() + +# set up all detector description description +include ("RecExCond/AllDet_detDescr.py") + +# the correct tag should be specified +svcMgr.IOVDbSvc.GlobalTag="OFLCOND-CSC-00-01-00" + +#-------------------------------------------------------------- +# Load POOL support +#-------------------------------------------------------------- +import AthenaPoolCnvSvc.WriteAthenaPool + +#-------------------------------------------------------------- +# Define the output Db parameters (the default value are shown) +#-------------------------------------------------------------- +svcMgr.EventSelector.RunNumber=1 +svcMgr.EventSelector.EventsPerRun=5 +svcMgr.EventSelector.FirstEvent=1 +theApp.EvtMax = 20 + +#-------------------------------------------------------------- +# Application: AthenaPoolTest options +#-------------------------------------------------------------- +from AthenaPoolTest.AthenaPoolTestConf import LArCellContFakeWriter +topSequence += LArCellContFakeWriter( "LArCellContFakeWriter" ) + +from AthenaPoolTest.AthenaPoolTestConf import AthenaPoolTestAttrWriter +topSequence += AthenaPoolTestAttrWriter( "AthenaPoolTestAttrWriter" ) + +#-------------------------------------------------------------- +# Output options +#-------------------------------------------------------------- + +# Stream's output file +from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream +Stream1 = AthenaPoolOutputStream( "Stream1" ) +Stream1.OutputFile = "SimplePoolFile.root" +# List of DO's to write out +Stream1.ItemList+=["CaloCellContainer#*"] +Stream1.ItemList+=["EventInfo#*"] + +# Must make sure that no OutStream's have been declared +theApp.OutStream = []; + +#-------------------------------------------------------------- +# Event Collection Registration +#-------------------------------------------------------------- +# Run OutputStream as an algorithm +from RegistrationServices.RegistrationServicesConf import RegistrationStream +RegStream1 = RegistrationStream( "RegStream1" ) +RegStream1.CollectionType = "ExplicitROOT" +RegStream1.OutputCollection = "NewEventCollection" +RegStream1.OutputLevel = INFO +# List of DO's to register +RegStream1.ItemList += [ "DataHeader#*" ] +# Key name of AthenaAttributeList used for the tag: +RegStream1.ItemList += [ "AthenaAttributeList#SimpleTag" ] +topSequence += RegStream1 + +#-------------------------------------------------------------- +# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) +#-------------------------------------------------------------- +svcMgr.MessageSvc.OutputLevel = INFO +svcMgr.MessageSvc.debugLimit = 100000 +svcMgr.ClassIDSvc.OutputLevel = INFO +#AthenaPoolTestAttrWriter.OutputLevel = 2 +LArCellContFakeWriter.OutputLevel = DEBUG +#StoreGateSvc = Service( "StoreGateSvc" ) +#StoreGateSvc.Dump = TRUE + +# No stats printout +include( "AthenaPoolTest/NoStats_jobOptions.py" ) + +#============================================================== +# +# End of job options file +# +############################################################### diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptionsRegStep2.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptionsRegStep2.py index c48652c1b2d8..ab0cc3c50504 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptionsRegStep2.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptionsRegStep2.py @@ -1,115 +1,113 @@ ############################################################### -# -# Job options file -# -# Read AthenaPoolData objects and write out registration -# -## @file LArCellContWriter_jobOptionsRegStep2.py -## -## @brief For Athena POOL test: write out explicit collection with LArCellCont -## -## @author RD Schaffer <R.D.Schaffer@cern.ch> -# -#============================================================== -#-------------------------------------------------------------- -# Load POOL support -#-------------------------------------------------------------- -include( "AthenaPoolCnvSvc/ReadAthenaPool_jobOptions.py" ) -include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" ) - -#-------------------------------------------------------------- -# Set flags and load det descr -#-------------------------------------------------------------- -# For general flags -doAOD = False -doTrigger = False -DetDescrVersion = "ATLAS-CSC-01-01-00" -include( "RecExCond/RecExCommon_flags.py" ) - -# Set local flags - only need LAr DetDescr -DetFlags.detdescr.ID_setOff() -DetFlags.detdescr.Tile_setOff() -DetFlags.detdescr.Muon_setOff() - -# set up all detector description description -include ("RecExCond/AllDet_detDescr.py") - -#-------------------------------------------------------------- -# Define the input parameters -#-------------------------------------------------------------- -EventSelector = Service( "EventSelector" ) -EventSelector.InputCollections = [ "SimplePoolFile.root" ] - -#-------------------------------------------------------------- -# Application: AthenaPoolTest options -#-------------------------------------------------------------- -theApp.Dlls += [ "AthenaPoolTest", "RegistrationServices" ] -theApp.TopAlg += [ "LArCellContFakeWriter", "AthenaPoolTestAttrWriter" ] - - -#-------------------------------------------------------------- -# Output options -#-------------------------------------------------------------- -# Converters: -include( "EventAthenaPool/EventAthenaPool_joboptions.py" ) - -include( "CaloAthenaPool/CaloAthenaPool_joboptions.py" ) -#include( "LArAthenaPool/LArAthenaPool_joboptions.py" ) - -include( "AthenaPoolTestAthenaPool/AthenaPoolTestAthenaPool_joboptions.py" ) - -# Run OutputStream as an algorithm -theApp.TopAlg += [ "AthenaOutputStream/Stream1" ] -# Must make sure that no OutStream's have been declared -theApp.OutStream = []; -# Must assigne conversion service to output stream -Stream1 = Algorithm( "Stream1" ) -Stream1.WritingTool = "AthenaOutputStreamTool" -Stream1.OutputFile = "SimplePoolFile1.root" -# List of DO's to write out -Stream1.ItemList += ["EventInfo#*"] -Stream1.ItemList += ["CaloCellContainer#*"] - -#-------------------------------------------------------------- -# Event Collection Registration -#-------------------------------------------------------------- -# Run OutputStream as an algorithm -theApp.TopAlg += [ "RegistrationStream/RegStream1" ] -RegStream1 = Algorithm( "RegStream1" ) -RegStream1.CollectionType = "ExplicitROOT" -RegStream1.OutputCollection = "NewEventCollection1" -# print level -RegStream1.OutputLevel = 3 -# List of DO's to register -RegStream1.ItemList += [ "DataHeader#Stream1" ] -#RegStream1.ItemList += [ "DataHeader#*" ] -# Key name of AthenaAttributeList used for the tag: -RegStream1.ItemList += [ "AthenaAttributeList#SimpleTag" ] -# Add in ref to input file with name: -RegStream1.ExtraRefNames = [ "ESD" ] - -#-------------------------------------------------------------- -# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) -#-------------------------------------------------------------- -MessageSvc = Service( "MessageSvc" ) -MessageSvc.OutputLevel = INFO -MessageSvc.debugLimit = 100000 -ClassIDSvc = Service( "ClassIDSvc" ) -ClassIDSvc.OutputLevel = INFO -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.OutputLevel = INFO -AthenaPoolTestAttrWriter = Algorithm ( "AthenaPoolTestAttrWriter" ) -AthenaPoolTestAttrWriter.OutputLevel = DEBUG -LArCellContFakeWriter = Algorithm( "LArCellContFakeWriter" ) -LArCellContFakeWriter.OutputLevel = DEBUG -StoreGateSvc = Service( "StoreGateSvc" ) -#StoreGateSvc.Dump = TRUE - -# No stats printout -include( "AthenaPoolTest/NoStats_jobOptions.py" ) - -#============================================================== -# -# End of job options file -# -############################################################### +# +# Job options file +# +# Read AthenaPoolData objects and write out registration +# +## @file LArCellContWriter_jobOptionsRegStep2.py +## +## @brief For Athena POOL test: write out explicit collection with LArCellCont +## +## @author RD Schaffer <R.D.Schaffer@cern.ch> +# +#============================================================== +#-------------------------------------------------------------- +# Load POOL support +#-------------------------------------------------------------- +include( "AthenaPoolCnvSvc/ReadAthenaPool_jobOptions.py" ) +include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" ) + +#-------------------------------------------------------------- +# Set flags and load det descr +#-------------------------------------------------------------- +# For general flags +doAOD = False +doTrigger = False +DetDescrVersion = "ATLAS-CSC-01-01-00" +include( "RecExCond/RecExCommon_flags.py" ) + +# Set local flags - only need LAr DetDescr +DetFlags.detdescr.ID_setOff() +DetFlags.detdescr.Tile_setOff() +DetFlags.detdescr.Muon_setOff() + +# set up all detector description description +include ("RecExCond/AllDet_detDescr.py") + +#-------------------------------------------------------------- +# Define the input parameters +#-------------------------------------------------------------- +EventSelector = Service( "EventSelector" ) +EventSelector.InputCollections = [ "SimplePoolFile.root" ] + +#-------------------------------------------------------------- +# Application: AthenaPoolTest options +#-------------------------------------------------------------- +theApp.Dlls += [ "AthenaPoolTest", "RegistrationServices" ] +theApp.TopAlg += [ "LArCellContFakeWriter", "AthenaPoolTestAttrWriter" ] + + +#-------------------------------------------------------------- +# Output options +#-------------------------------------------------------------- +# Converters: +include( "EventAthenaPool/EventAthenaPool_joboptions.py" ) + +include( "CaloAthenaPool/CaloAthenaPool_joboptions.py" ) +#include( "LArAthenaPool/LArAthenaPool_joboptions.py" ) + +include( "AthenaPoolTestAthenaPool/AthenaPoolTestAthenaPool_joboptions.py" ) + +# Run OutputStream as an algorithm +theApp.TopAlg += [ "AthenaOutputStream/Stream1" ] +# Must make sure that no OutStream's have been declared +theApp.OutStream = []; +# Must assigne conversion service to output stream +Stream1 = Algorithm( "Stream1" ) +Stream1.WritingTool = "AthenaOutputStreamTool" +Stream1.OutputFile = "SimplePoolFile1.root" +# List of DO's to write out +Stream1.ItemList += ["EventInfo#*"] +Stream1.ItemList += ["CaloCellContainer#*"] + +#-------------------------------------------------------------- +# Event Collection Registration +#-------------------------------------------------------------- +# Run OutputStream as an algorithm +theApp.TopAlg += [ "RegistrationStream/RegStream1" ] +RegStream1 = Algorithm( "RegStream1" ) +RegStream1.CollectionType = "ExplicitROOT" +RegStream1.OutputCollection = "NewEventCollection1" +# print level +RegStream1.OutputLevel = 3 +# List of DO's to register +RegStream1.ItemList += [ "DataHeader#Stream1" ] +#RegStream1.ItemList += [ "DataHeader#*" ] +# Key name of AthenaAttributeList used for the tag: +RegStream1.ItemList += [ "AthenaAttributeList#SimpleTag" ] +# Add in ref to input file with name: +RegStream1.ExtraRefNames = [ "ESD" ] + +#-------------------------------------------------------------- +# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) +#-------------------------------------------------------------- +MessageSvc = Service( "MessageSvc" ) +MessageSvc.OutputLevel = INFO +MessageSvc.debugLimit = 100000 +ClassIDSvc = Service( "ClassIDSvc" ) +ClassIDSvc.OutputLevel = INFO +AthenaPoolTestAttrWriter = Algorithm ( "AthenaPoolTestAttrWriter" ) +AthenaPoolTestAttrWriter.OutputLevel = DEBUG +LArCellContFakeWriter = Algorithm( "LArCellContFakeWriter" ) +LArCellContFakeWriter.OutputLevel = DEBUG +StoreGateSvc = Service( "StoreGateSvc" ) +#StoreGateSvc.Dump = TRUE + +# No stats printout +include( "AthenaPoolTest/NoStats_jobOptions.py" ) + +#============================================================== +# +# End of job options file +# +############################################################### diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptionsRegStep3.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptionsRegStep3.py index c3bece4f1bba..94ddfb4e9920 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptionsRegStep3.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptionsRegStep3.py @@ -1,102 +1,100 @@ ############################################################### -# -# Job options file -# -# Read AthenaPoolData objects and write out registration -# -## @file LArCellContWriter_jobOptionsRegStep2.py -## -## @brief For Athena POOL test: write out explicit collection with LArCellCont -## -## @author RD Schaffer <R.D.Schaffer@cern.ch> -# -#============================================================== -#-------------------------------------------------------------- -# Load POOL support -#-------------------------------------------------------------- -include( "AthenaPoolCnvSvc/ReadAthenaPool_jobOptions.py" ) - -#-------------------------------------------------------------- -# Set flags and load det descr -#-------------------------------------------------------------- -# For general flags -doAOD = False -doTrigger = False -DetDescrVersion = "ATLAS-CSC-01-01-00" -include( "RecExCond/RecExCommon_flags.py" ) - -# Set local flags - only need LAr DetDescr -DetFlags.detdescr.ID_setOff() -DetFlags.detdescr.Tile_setOff() -DetFlags.detdescr.Muon_setOff() - -# set up all detector description description -include ("RecExCond/AllDet_detDescr.py") - -#-------------------------------------------------------------- -# Define the input parameters -#-------------------------------------------------------------- -EventSelector = Service( "EventSelector" ) -EventSelector.InputCollections = [ "SimplePoolFile1.root" ] - -#-------------------------------------------------------------- -# Application: AthenaPoolTest options -#-------------------------------------------------------------- -theApp.Dlls += [ "AthenaPoolTest", "RegistrationServices" ] -theApp.TopAlg += [ "LArCellContFakeWriter", "AthenaPoolTestAttrWriter" ] - -#-------------------------------------------------------------- -# Output options -#-------------------------------------------------------------- -# Converters: -include( "EventAthenaPool/EventAthenaPool_joboptions.py" ) - -include( "CaloAthenaPool/CaloAthenaPool_joboptions.py" ) -#include( "LArAthenaPool/LArAthenaPool_joboptions.py" ) - -include( "AthenaPoolTestAthenaPool/AthenaPoolTestAthenaPool_joboptions.py" ) - -#-------------------------------------------------------------- -# Event Collection Registration -#-------------------------------------------------------------- -# Run OutputStream as an algorithm -theApp.TopAlg += [ "RegistrationStream/RegStream1" ] -RegStream1 = Algorithm( "RegStream1" ) -RegStream1.CollectionType = "ExplicitROOT" -RegStream1.OutputCollection = "NewEventCollection2" -RegStream1.WriteInputDataHeader = TRUE -# print level -RegStream1.OutputLevel = 3 -# List of DO's to register -RegStream1.ItemList += [ "DataHeader#*" ] -#RegStream1.ItemList += [ "DataHeader#*" ] -# Key name of AthenaAttributeList used for the tag: -RegStream1.ItemList += [ "AthenaAttributeList#SimpleTag" ] -# Add in ref to input file with name: -RegStream1.ExtraRefNames = [ "ESD" ] - -#-------------------------------------------------------------- -# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) -#-------------------------------------------------------------- -MessageSvc = Service( "MessageSvc" ) -MessageSvc.OutputLevel = INFO -MessageSvc.debugLimit = 100000 -ClassIDSvc = Service( "ClassIDSvc" ) -ClassIDSvc.OutputLevel = INFO -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.OutputLevel = INFO -AthenaPoolTestAttrWriter = Algorithm ( "AthenaPoolTestAttrWriter" ) -AthenaPoolTestAttrWriter.OutputLevel = DEBUG -LArCellContFakeWriter = Algorithm( "LArCellContFakeWriter" ) -LArCellContFakeWriter.OutputLevel = DEBUG -StoreGateSvc = Service( "StoreGateSvc" ) -#StoreGateSvc.Dump = TRUE - -# No stats printout -include( "AthenaPoolTest/NoStats_jobOptions.py" ) - -#============================================================== -# -# End of job options file -# -############################################################### +# +# Job options file +# +# Read AthenaPoolData objects and write out registration +# +## @file LArCellContWriter_jobOptionsRegStep2.py +## +## @brief For Athena POOL test: write out explicit collection with LArCellCont +## +## @author RD Schaffer <R.D.Schaffer@cern.ch> +# +#============================================================== +#-------------------------------------------------------------- +# Load POOL support +#-------------------------------------------------------------- +include( "AthenaPoolCnvSvc/ReadAthenaPool_jobOptions.py" ) + +#-------------------------------------------------------------- +# Set flags and load det descr +#-------------------------------------------------------------- +# For general flags +doAOD = False +doTrigger = False +DetDescrVersion = "ATLAS-CSC-01-01-00" +include( "RecExCond/RecExCommon_flags.py" ) + +# Set local flags - only need LAr DetDescr +DetFlags.detdescr.ID_setOff() +DetFlags.detdescr.Tile_setOff() +DetFlags.detdescr.Muon_setOff() + +# set up all detector description description +include ("RecExCond/AllDet_detDescr.py") + +#-------------------------------------------------------------- +# Define the input parameters +#-------------------------------------------------------------- +EventSelector = Service( "EventSelector" ) +EventSelector.InputCollections = [ "SimplePoolFile1.root" ] + +#-------------------------------------------------------------- +# Application: AthenaPoolTest options +#-------------------------------------------------------------- +theApp.Dlls += [ "AthenaPoolTest", "RegistrationServices" ] +theApp.TopAlg += [ "LArCellContFakeWriter", "AthenaPoolTestAttrWriter" ] + +#-------------------------------------------------------------- +# Output options +#-------------------------------------------------------------- +# Converters: +include( "EventAthenaPool/EventAthenaPool_joboptions.py" ) + +include( "CaloAthenaPool/CaloAthenaPool_joboptions.py" ) +#include( "LArAthenaPool/LArAthenaPool_joboptions.py" ) + +include( "AthenaPoolTestAthenaPool/AthenaPoolTestAthenaPool_joboptions.py" ) + +#-------------------------------------------------------------- +# Event Collection Registration +#-------------------------------------------------------------- +# Run OutputStream as an algorithm +theApp.TopAlg += [ "RegistrationStream/RegStream1" ] +RegStream1 = Algorithm( "RegStream1" ) +RegStream1.CollectionType = "ExplicitROOT" +RegStream1.OutputCollection = "NewEventCollection2" +RegStream1.WriteInputDataHeader = TRUE +# print level +RegStream1.OutputLevel = 3 +# List of DO's to register +RegStream1.ItemList += [ "DataHeader#*" ] +#RegStream1.ItemList += [ "DataHeader#*" ] +# Key name of AthenaAttributeList used for the tag: +RegStream1.ItemList += [ "AthenaAttributeList#SimpleTag" ] +# Add in ref to input file with name: +RegStream1.ExtraRefNames = [ "ESD" ] + +#-------------------------------------------------------------- +# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) +#-------------------------------------------------------------- +MessageSvc = Service( "MessageSvc" ) +MessageSvc.OutputLevel = INFO +MessageSvc.debugLimit = 100000 +ClassIDSvc = Service( "ClassIDSvc" ) +ClassIDSvc.OutputLevel = INFO +AthenaPoolTestAttrWriter = Algorithm ( "AthenaPoolTestAttrWriter" ) +AthenaPoolTestAttrWriter.OutputLevel = DEBUG +LArCellContFakeWriter = Algorithm( "LArCellContFakeWriter" ) +LArCellContFakeWriter.OutputLevel = DEBUG +StoreGateSvc = Service( "StoreGateSvc" ) +#StoreGateSvc.Dump = TRUE + +# No stats printout +include( "AthenaPoolTest/NoStats_jobOptions.py" ) + +#============================================================== +# +# End of job options file +# +############################################################### diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptionsStep1.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptionsStep1.py index 737adf1c9d3e..ddd9692c73ae 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptionsStep1.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptionsStep1.py @@ -1,84 +1,82 @@ ############################################################### -# -# Job options file -# -## @file LArCellContWriter_jobOptionsStep1.py -## -## @brief For Athena POOL test: write out first file with LArCellContainers -## -## @author RD Schaffer <R.D.Schaffer@cern.ch> -# -#============================================================== -# MC Event Selector -include( "AthenaCommon/Atlas_Gen.UnixStandardJob.py" ) - -#-------------------------------------------------------------- -# Set flags and load det descr -#-------------------------------------------------------------- -# For general flags -doAOD = False -doTrigger = False -DetDescrVersion = "ATLAS-CSC-01-01-00" -include( "RecExCond/RecExCommon_flags.py" ) - -# Set local flags - only need LAr DetDescr -DetFlags.detdescr.ID_setOff() -DetFlags.detdescr.Tile_setOff() -DetFlags.detdescr.Muon_setOff() - -# set up all detector description description -include ("RecExCond/AllDet_detDescr.py") - -#-------------------------------------------------------------- -# Load POOL support -#-------------------------------------------------------------- -include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" ) - -#-------------------------------------------------------------- -# Event related parameters -#-------------------------------------------------------------- -theApp.EvtMax = 20 - -#-------------------------------------------------------------- -# Application: -#-------------------------------------------------------------- -theApp.Dlls += [ "AthenaPoolTest" ] -theApp.TopAlg += [ "LArCellContFakeWriter" ] - - -#-------------------------------------------------------------- -# Output options -#-------------------------------------------------------------- -# Converters: -include( "EventAthenaPool/EventAthenaPool_joboptions.py" ) - -include( "CaloAthenaPool/CaloAthenaPool_joboptions.py" ) -#include( "LArAthenaPool/LArAthenaPool_joboptions.py" ) - -# Stream's output file -Stream1 = Algorithm( "Stream1" ) -Stream1.OutputFile = "SimplePoolFile1.root" -# List of DO's to write out -Stream1.ItemList+=["EventInfo#*"] -Stream1.ItemList+=["CaloCellContainer#*"] -#-------------------------------------------------------------- -# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) -#-------------------------------------------------------------- -MessageSvc = Service( "MessageSvc" ) -MessageSvc.OutputLevel = INFO -MessageSvc.debugLimit = 100000 -ClassIDSvc = Service( "ClassIDSvc" ) -ClassIDSvc.OutputLevel = INFO -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.OutputLevel = INFO -LArCellContFakeWriter = Algorithm( "LArCellContFakeWriter" ) -LArCellContFakeWriter.OutputLevel = DEBUG - -# No stats printout -include( "AthenaPoolTest/NoStats_jobOptions.py" ) - -#============================================================== -# -# End of job options file -# -############################################################### +# +# Job options file +# +## @file LArCellContWriter_jobOptionsStep1.py +## +## @brief For Athena POOL test: write out first file with LArCellContainers +## +## @author RD Schaffer <R.D.Schaffer@cern.ch> +# +#============================================================== +# MC Event Selector +include( "AthenaCommon/Atlas_Gen.UnixStandardJob.py" ) + +#-------------------------------------------------------------- +# Set flags and load det descr +#-------------------------------------------------------------- +# For general flags +doAOD = False +doTrigger = False +DetDescrVersion = "ATLAS-CSC-01-01-00" +include( "RecExCond/RecExCommon_flags.py" ) + +# Set local flags - only need LAr DetDescr +DetFlags.detdescr.ID_setOff() +DetFlags.detdescr.Tile_setOff() +DetFlags.detdescr.Muon_setOff() + +# set up all detector description description +include ("RecExCond/AllDet_detDescr.py") + +#-------------------------------------------------------------- +# Load POOL support +#-------------------------------------------------------------- +include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" ) + +#-------------------------------------------------------------- +# Event related parameters +#-------------------------------------------------------------- +theApp.EvtMax = 20 + +#-------------------------------------------------------------- +# Application: +#-------------------------------------------------------------- +theApp.Dlls += [ "AthenaPoolTest" ] +theApp.TopAlg += [ "LArCellContFakeWriter" ] + + +#-------------------------------------------------------------- +# Output options +#-------------------------------------------------------------- +# Converters: +include( "EventAthenaPool/EventAthenaPool_joboptions.py" ) + +include( "CaloAthenaPool/CaloAthenaPool_joboptions.py" ) +#include( "LArAthenaPool/LArAthenaPool_joboptions.py" ) + +# Stream's output file +Stream1 = Algorithm( "Stream1" ) +Stream1.OutputFile = "SimplePoolFile1.root" +# List of DO's to write out +Stream1.ItemList+=["EventInfo#*"] +Stream1.ItemList+=["CaloCellContainer#*"] +#-------------------------------------------------------------- +# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) +#-------------------------------------------------------------- +MessageSvc = Service( "MessageSvc" ) +MessageSvc.OutputLevel = INFO +MessageSvc.debugLimit = 100000 +ClassIDSvc = Service( "ClassIDSvc" ) +ClassIDSvc.OutputLevel = INFO +LArCellContFakeWriter = Algorithm( "LArCellContFakeWriter" ) +LArCellContFakeWriter.OutputLevel = DEBUG + +# No stats printout +include( "AthenaPoolTest/NoStats_jobOptions.py" ) + +#============================================================== +# +# End of job options file +# +############################################################### diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptionsStep2.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptionsStep2.py index e9c5378607a3..4cbeb4d8af3c 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptionsStep2.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptionsStep2.py @@ -1,84 +1,82 @@ ############################################################### -# -# Job options file -# -## @file LArCellContWriter_jobOptionsStep2.py -## -## @brief For Athena POOL test: write second file of LArCellContainers -## -## @author RD Schaffer <R.D.Schaffer@cern.ch> -# -#============================================================== -# MC Event Selector -include( "AthenaCommon/Atlas_Gen.UnixStandardJob.py" ) - -#-------------------------------------------------------------- -# Set flags and load det descr -#-------------------------------------------------------------- -# For general flags -doAOD = False -doTrigger = False -DetDescrVersion = "ATLAS-CSC-01-01-00" -include( "RecExCond/RecExCommon_flags.py" ) - -# Set local flags - only need LAr DetDescr -DetFlags.detdescr.ID_setOff() -DetFlags.detdescr.Tile_setOff() -DetFlags.detdescr.Muon_setOff() - -# set up all detector description description -include ("RecExCond/AllDet_detDescr.py") - -#-------------------------------------------------------------- -# Load POOL support -#-------------------------------------------------------------- -include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" ) - -#-------------------------------------------------------------- -# Event related parameters -#-------------------------------------------------------------- -theApp.EvtMax = 20 - -#-------------------------------------------------------------- -# Application: -#-------------------------------------------------------------- -theApp.Dlls += [ "AthenaPoolTest" ] -theApp.TopAlg += [ "LArCellContFakeWriter" ] - - -#-------------------------------------------------------------- -# Output options -#-------------------------------------------------------------- -# Converters: -include( "EventAthenaPool/EventAthenaPool_joboptions.py" ) - -include( "CaloAthenaPool/CaloAthenaPool_joboptions.py" ) -#include( "LArAthenaPool/LArAthenaPool_joboptions.py" ) - -# Stream's output file -Stream1 = Algorithm( "Stream1" ) -Stream1.OutputFile = "SimplePoolFile2.root" -# List of DO's to write out -Stream1.ItemList+=["EventInfo#*"] -Stream1.ItemList+=["CaloCellContainer#*"] -#-------------------------------------------------------------- -# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) -#-------------------------------------------------------------- -MessageSvc = Service( "MessageSvc" ) -MessageSvc.OutputLevel = INFO -MessageSvc.debugLimit = 100000 -ClassIDSvc = Service( "ClassIDSvc" ) -ClassIDSvc.OutputLevel = INFO -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.OutputLevel = INFO -LArCellContFakeWriter = Algorithm( "LArCellContFakeWriter" ) -LArCellContFakeWriter.OutputLevel = DEBUG - -# No stats printout -include( "AthenaPoolTest/NoStats_jobOptions.py" ) - -#============================================================== -# -# End of job options file -# -############################################################### +# +# Job options file +# +## @file LArCellContWriter_jobOptionsStep2.py +## +## @brief For Athena POOL test: write second file of LArCellContainers +## +## @author RD Schaffer <R.D.Schaffer@cern.ch> +# +#============================================================== +# MC Event Selector +include( "AthenaCommon/Atlas_Gen.UnixStandardJob.py" ) + +#-------------------------------------------------------------- +# Set flags and load det descr +#-------------------------------------------------------------- +# For general flags +doAOD = False +doTrigger = False +DetDescrVersion = "ATLAS-CSC-01-01-00" +include( "RecExCond/RecExCommon_flags.py" ) + +# Set local flags - only need LAr DetDescr +DetFlags.detdescr.ID_setOff() +DetFlags.detdescr.Tile_setOff() +DetFlags.detdescr.Muon_setOff() + +# set up all detector description description +include ("RecExCond/AllDet_detDescr.py") + +#-------------------------------------------------------------- +# Load POOL support +#-------------------------------------------------------------- +include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" ) + +#-------------------------------------------------------------- +# Event related parameters +#-------------------------------------------------------------- +theApp.EvtMax = 20 + +#-------------------------------------------------------------- +# Application: +#-------------------------------------------------------------- +theApp.Dlls += [ "AthenaPoolTest" ] +theApp.TopAlg += [ "LArCellContFakeWriter" ] + + +#-------------------------------------------------------------- +# Output options +#-------------------------------------------------------------- +# Converters: +include( "EventAthenaPool/EventAthenaPool_joboptions.py" ) + +include( "CaloAthenaPool/CaloAthenaPool_joboptions.py" ) +#include( "LArAthenaPool/LArAthenaPool_joboptions.py" ) + +# Stream's output file +Stream1 = Algorithm( "Stream1" ) +Stream1.OutputFile = "SimplePoolFile2.root" +# List of DO's to write out +Stream1.ItemList+=["EventInfo#*"] +Stream1.ItemList+=["CaloCellContainer#*"] +#-------------------------------------------------------------- +# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) +#-------------------------------------------------------------- +MessageSvc = Service( "MessageSvc" ) +MessageSvc.OutputLevel = INFO +MessageSvc.debugLimit = 100000 +ClassIDSvc = Service( "ClassIDSvc" ) +ClassIDSvc.OutputLevel = INFO +LArCellContFakeWriter = Algorithm( "LArCellContFakeWriter" ) +LArCellContFakeWriter.OutputLevel = DEBUG + +# No stats printout +include( "AthenaPoolTest/NoStats_jobOptions.py" ) + +#============================================================== +# +# End of job options file +# +############################################################### diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/PileUpEventInfoWrite.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/PileUpEventInfoWrite.py index fb8bfcaea750..59a8973b7ca4 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/PileUpEventInfoWrite.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/PileUpEventInfoWrite.py @@ -1,106 +1,93 @@ ############################################################### -# -# Job options file -# -## @file AthenaPoolTestWrite.py -## -## @brief For Athena POOL test: write out AthenaPoolTest data objects -## -## @author RD Schaffer <R.D.Schaffer@cern.ch> -# -#============================================================== -# MC Event Selector -## basic job configuration (for generator) -import AthenaCommon.AtlasUnixGeneratorJob - -## get a handle to the default top-level algorithm sequence -from AthenaCommon.AlgSequence import AlgSequence -topSequence = AlgSequence() - -## get a handle to the ServiceManager -from AthenaCommon.AppMgr import ServiceMgr as svcMgr - -## get a handle to the ApplicationManager -from AthenaCommon.AppMgr import theApp - - -#-------------------------------------------------------------- -# Load POOL support -#-------------------------------------------------------------- -import AthenaPoolCnvSvc.WriteAthenaPool - -#-------------------------------------------------------------- -# JobOptions for the loading of the AthenaSealSvc -#-------------------------------------------------------------- -#include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - -# Dictionaries for AthenaSealSvc: -#include( "EventInfo/EventInfoDict_joboptions.py" ) - -# Add in dictionary name: -#AthenaSealSvc = Service( "AthenaSealSvc" ) -#AthenaSealSvc.DictNames += [ "SealCLHEPDict" ] -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = True -#-------------------------------------------------------------- -# Event related parameters -#-------------------------------------------------------------- -theApp.EvtMax = 5 -#-------------------------------------------------------------- -# Application: AthenaPoolTest options -#-------------------------------------------------------------- - -# Load "user algorithm" top algorithms to be run, and the libraries that house them -from AthenaPoolTest.AthenaPoolTestConf import PileUpEventInfoWriter -topSequence += PileUpEventInfoWriter( "PileUpEventInfoWriter" ) - -#-------------------------------------------------------------- -# Output options -#-------------------------------------------------------------- -# LAr Hit -# Converters: - -# ItemList: -include( "EventAthenaPool/EventAthenaPoolItemList_joboptions.py" ) - -print fullItemList - -# Stream's output file -from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream -Stream1 = AthenaPoolOutputStream( "Stream1" ) -Stream1.OutputFile = "SimplePoolFile.root" - -# List of DO's to write out -#Stream1.ItemList = ["PileUpEventInfo#OverlayEvent"] -#Stream1.ItemList = ["EventInfo#OverlayEvent"] -#Stream1.ItemList = ["EventInfo#McEventInfo", "EventInfo#OverlayEvent"] -Stream1.ItemList += fullItemList - -print Stream1.ItemList - - -#Stream1.ItemList += ["EventInfo#*"] -#Stream1.ItemList += ["IAthenaPoolTestCollection#*"] -#Stream1.ItemList += ["AthenaPoolTestMatrix#*"] -#-------------------------------------------------------------- -# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) -#-------------------------------------------------------------- -svcMgr.MessageSvc.OutputLevel = WARNING -svcMgr.MessageSvc.debugLimit = 100000 - -PileUpEventInfoWriter.OutputLevel = DEBUG - -#svcMgr.StoreGateSvc = Service( "StoreGateSvc" ) -#svcMgr.StoreGateSvc.Dump = TRUE - -AthenaEventLoopMgr = Service( "AthenaEventLoopMgr" ) -#AthenaEventLoopMgr.OutputLevel = DEBUG - -# No stats printout -include( "AthenaPoolTest/NoStats_jobOptions.py" ) - -#============================================================== -# -# End of job options file -# -############################################################### +# +# Job options file +# +## @file AthenaPoolTestWrite.py +## +## @brief For Athena POOL test: write out AthenaPoolTest data objects +## +## @author RD Schaffer <R.D.Schaffer@cern.ch> +# +#============================================================== +# MC Event Selector +## basic job configuration (for generator) +import AthenaCommon.AtlasUnixGeneratorJob + +## get a handle to the default top-level algorithm sequence +from AthenaCommon.AlgSequence import AlgSequence +topSequence = AlgSequence() + +## get a handle to the ServiceManager +from AthenaCommon.AppMgr import ServiceMgr as svcMgr + +## get a handle to the ApplicationManager +from AthenaCommon.AppMgr import theApp + + +#-------------------------------------------------------------- +# Load POOL support +#-------------------------------------------------------------- +import AthenaPoolCnvSvc.WriteAthenaPool + +#-------------------------------------------------------------- +# Event related parameters +#-------------------------------------------------------------- +theApp.EvtMax = 5 +#-------------------------------------------------------------- +# Application: AthenaPoolTest options +#-------------------------------------------------------------- + +# Load "user algorithm" top algorithms to be run, and the libraries that house them +from AthenaPoolTest.AthenaPoolTestConf import PileUpEventInfoWriter +topSequence += PileUpEventInfoWriter( "PileUpEventInfoWriter" ) + +#-------------------------------------------------------------- +# Output options +#-------------------------------------------------------------- +# LAr Hit +# Converters: + +# ItemList: +include( "EventAthenaPool/EventAthenaPoolItemList_joboptions.py" ) + +print fullItemList + +# Stream's output file +from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream +Stream1 = AthenaPoolOutputStream( "Stream1" ) +Stream1.OutputFile = "SimplePoolFile.root" + +# List of DO's to write out +#Stream1.ItemList = ["PileUpEventInfo#OverlayEvent"] +#Stream1.ItemList = ["EventInfo#OverlayEvent"] +#Stream1.ItemList = ["EventInfo#McEventInfo", "EventInfo#OverlayEvent"] +Stream1.ItemList += fullItemList + +print Stream1.ItemList + + +#Stream1.ItemList += ["EventInfo#*"] +#Stream1.ItemList += ["IAthenaPoolTestCollection#*"] +#Stream1.ItemList += ["AthenaPoolTestMatrix#*"] +#-------------------------------------------------------------- +# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) +#-------------------------------------------------------------- +svcMgr.MessageSvc.OutputLevel = WARNING +svcMgr.MessageSvc.debugLimit = 100000 + +PileUpEventInfoWriter.OutputLevel = DEBUG + +#svcMgr.StoreGateSvc = Service( "StoreGateSvc" ) +#svcMgr.StoreGateSvc.Dump = TRUE + +AthenaEventLoopMgr = Service( "AthenaEventLoopMgr" ) +#AthenaEventLoopMgr.OutputLevel = DEBUG + +# No stats printout +include( "AthenaPoolTest/NoStats_jobOptions.py" ) + +#============================================================== +# +# End of job options file +# +############################################################### diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/TrkTrackWriter_jobOptions.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/TrkTrackWriter_jobOptions.py index 51ad66190698..461a339684ae 100755 --- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/TrkTrackWriter_jobOptions.py +++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/TrkTrackWriter_jobOptions.py @@ -69,14 +69,6 @@ theApp.EvtMax = 20 from AthenaPoolTest.AthenaPoolTestConf import TrkTrackFakeWriter topSequence += TrkTrackFakeWriter( "TrkTrackFakeWriter" ) -#-------------------------------------------------------------- -# JobOptions for the loading of the AthenaSealSvc -#-------------------------------------------------------------- - -# Check the dictionary in memory for completeness -#include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -svcMgr.AthenaSealSvc.CheckDictionary = True - #-------------------------------------------------------------- # Output options #-------------------------------------------------------------- diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCool.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCool.py index cc9e6a4da260..aa2a09417da6 100644 --- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCool.py +++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCool.py @@ -27,12 +27,6 @@ import AthenaPoolCnvSvc.AthenaPool #-------------------------------------------------------------- import IOVDbSvc.IOVDb -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = TRUE - #-------------------------------------------------------------- # Private Application Configuration options #-------------------------------------------------------------- diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolAfterTwoStep.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolAfterTwoStep.py index 91f6f2725338..c749bb4db3ce 100644 --- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolAfterTwoStep.py +++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolAfterTwoStep.py @@ -26,12 +26,6 @@ import AthenaPoolCnvSvc.AthenaPool #-------------------------------------------------------------- import IOVDbSvc.IOVDb -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = TRUE - #-------------------------------------------------------------- # Private Application Configuration options #-------------------------------------------------------------- diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolAndReg.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolAndReg.py index 512575927b35..6c8633b4dbc2 100644 --- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolAndReg.py +++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolAndReg.py @@ -115,10 +115,3 @@ svcMgr.ProxyProviderSvc.ProviderNames += [ "CondProxyProvider" ] svcMgr += getConfigurable( "CondProxyProvider" )() svcMgr.CondProxyProvider.InputCollections = ["SimplePoolFile.root"] - -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = TRUE - diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolFromMetaData.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolFromMetaData.py index f1328760141e..65ba6a330b63 100644 --- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolFromMetaData.py +++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolFromMetaData.py @@ -49,11 +49,6 @@ svcMgr.MetaDataSvc.MetaDataTools += [ "IOVDbMetaDataTool" ] #-------------------------------------------------------------- import IOVDbSvc.IOVDb -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -svcMgr.AthenaSealSvc.CheckDictionary = TRUE - #-------------------------------------------------------------- # Private Application Configuration options #-------------------------------------------------------------- diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolNewTag.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolNewTag.py index c42d79270351..93884229a9af 100644 --- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolNewTag.py +++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolNewTag.py @@ -27,12 +27,6 @@ import AthenaPoolCnvSvc.AthenaPool #-------------------------------------------------------------- import IOVDbSvc.IOVDb -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = TRUE - #-------------------------------------------------------------- # Private Application Configuration options #-------------------------------------------------------------- diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolNoReg.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolNoReg.py index cc5d7d3a317a..9ff84e5c5e8e 100644 --- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolNoReg.py +++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolNoReg.py @@ -27,12 +27,6 @@ import AthenaPoolCnvSvc.AthenaPool #-------------------------------------------------------------- import IOVDbSvc.IOVDb -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = TRUE - #-------------------------------------------------------------- # Private Application Configuration options #-------------------------------------------------------------- diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolWriteMD.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolWriteMD.py index 85dd8b3efc52..c226ab9d0df9 100644 --- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolWriteMD.py +++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolWriteMD.py @@ -27,12 +27,6 @@ import AthenaPoolCnvSvc.AthenaPool #-------------------------------------------------------------- import IOVDbSvc.IOVDb -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = TRUE - #-------------------------------------------------------------- # Private Application Configuration options #-------------------------------------------------------------- diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCool.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCool.py index 5a2911b776f2..04abe9f72ec9 100644 --- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCool.py +++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCool.py @@ -131,9 +131,6 @@ svcMgr.AthenaPoolCnvSvc.PoolContainerPrefix = "ROOTTREE:CollectionTree" # AthenaPool details #-------------------------------------------------------------- -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = TRUE - #-------------------------------------------------------------- # Use AthenaOutputStreamTool to write # Must "turn off" standard AthenaOutputStream diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolNewTag.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolNewTag.py index cd6fdbdd2746..4fb8fdc24435 100644 --- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolNewTag.py +++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolNewTag.py @@ -124,9 +124,6 @@ import AthenaPoolCnvSvc.WriteAthenaPool # AthenaPool details #-------------------------------------------------------------- -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = TRUE - #-------------------------------------------------------------- # Use AthenaOutputStreamTool to write # Must "turn off" standard AthenaOutputStream diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolNoReg.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolNoReg.py index 06ad40ade26d..946e2fd2a46b 100644 --- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolNoReg.py +++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolNoReg.py @@ -74,10 +74,6 @@ import AthenaPoolCnvSvc.WriteAthenaPool # AthenaPool details #-------------------------------------------------------------- -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = TRUE - - #-------------------------------------------------------------- # Use AthenaOutputStreamTool to write # Must "turn off" standard AthenaOutputStream diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolStep2.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolStep2.py index 8d3508f7defc..6a2027838dd9 100644 --- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolStep2.py +++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolStep2.py @@ -120,9 +120,6 @@ svcMgr.AthenaPoolCnvSvc.PoolContainerPrefix = "ROOTTREE:CollectionTree" # AthenaPool details #-------------------------------------------------------------- -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = TRUE - #-------------------------------------------------------------- # Use AthenaOutputStreamTool to write # Must "turn off" standard AthenaOutputStream diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestCoolDCS.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestCoolDCS.py index f42c6da3bf74..a02c86c1def4 100644 --- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestCoolDCS.py +++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestCoolDCS.py @@ -33,12 +33,6 @@ import AthenaPoolCnvSvc.AthenaPool #-------------------------------------------------------------- import IOVDbSvc.IOVDb -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = TRUE - #-------------------------------------------------------------- # Private Application Configuration options #-------------------------------------------------------------- diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/OutputConditionsAlg_jobOptions.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/OutputConditionsAlg_jobOptions.py index c1a4c71e3ef3..54231ef1297b 100644 --- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/OutputConditionsAlg_jobOptions.py +++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/OutputConditionsAlg_jobOptions.py @@ -129,10 +129,6 @@ import AthenaPoolCnvSvc.WriteAthenaPool # AthenaPool details #-------------------------------------------------------------- -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = TRUE - - #==================== Configure OutputConditionAlgs # from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg diff --git a/Calorimeter/CaloExample/CaloAnaEx/share/CaloAnaExTB.py b/Calorimeter/CaloExample/CaloAnaEx/share/CaloAnaExTB.py index 2139a1410b8a..5bfd28b56793 100755 --- a/Calorimeter/CaloExample/CaloAnaEx/share/CaloAnaExTB.py +++ b/Calorimeter/CaloExample/CaloAnaEx/share/CaloAnaExTB.py @@ -665,12 +665,6 @@ if doWriteESD: Stream1.EvtConversionSvc = "AthenaPoolCnvSvc" Stream1.OutputFile = "reconstruction.root" - #check dictionary - AthenaSealSvc.CheckDictionary = True - - # Needed for TBEvent ESD writing - include ( "TBEvent/TBEventDict_joboptions.py") - # Define the output file name Stream1.OutputFile = "athena.root" diff --git a/Calorimeter/CaloLocalHadCalib/share/CaloReadLCClassificationFile.py b/Calorimeter/CaloLocalHadCalib/share/CaloReadLCClassificationFile.py index ebb2dc3693d8..e055dc02df3b 100644 --- a/Calorimeter/CaloLocalHadCalib/share/CaloReadLCClassificationFile.py +++ b/Calorimeter/CaloLocalHadCalib/share/CaloReadLCClassificationFile.py @@ -19,8 +19,6 @@ topSequence += ReadLCClassification theApp.EvtMax = 1 AthenaPoolCnvSvc = Service( "AthenaPoolCnvSvc" ) -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = True from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg myOCA=OutputConditionsAlg("myOCA",outFileName) diff --git a/Calorimeter/CaloLocalHadCalib/share/CaloReadLCJetEnergyScaleFile.py b/Calorimeter/CaloLocalHadCalib/share/CaloReadLCJetEnergyScaleFile.py index 10c169b95fcd..230a7705840d 100644 --- a/Calorimeter/CaloLocalHadCalib/share/CaloReadLCJetEnergyScaleFile.py +++ b/Calorimeter/CaloLocalHadCalib/share/CaloReadLCJetEnergyScaleFile.py @@ -31,8 +31,6 @@ theApp.EvtMax = 1 AthenaPoolCnvSvc = Service( "AthenaPoolCnvSvc" ) -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = True from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg myOCA=OutputConditionsAlg("myOCA",outFileName) diff --git a/Calorimeter/CaloLocalHadCalib/share/CaloReadLCOutOfClusterFile.py b/Calorimeter/CaloLocalHadCalib/share/CaloReadLCOutOfClusterFile.py index 5e2a6246540c..589e5949c074 100644 --- a/Calorimeter/CaloLocalHadCalib/share/CaloReadLCOutOfClusterFile.py +++ b/Calorimeter/CaloLocalHadCalib/share/CaloReadLCOutOfClusterFile.py @@ -20,8 +20,6 @@ theApp.EvtMax = 1 AthenaPoolCnvSvc = Service( "AthenaPoolCnvSvc" ) -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = True from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg myOCA=OutputConditionsAlg("myOCA",outFileName) diff --git a/Calorimeter/CaloLocalHadCalib/share/CaloReadLCOutOfClusterPi0File.py b/Calorimeter/CaloLocalHadCalib/share/CaloReadLCOutOfClusterPi0File.py index afe7725e226f..0c039adeeaf5 100644 --- a/Calorimeter/CaloLocalHadCalib/share/CaloReadLCOutOfClusterPi0File.py +++ b/Calorimeter/CaloLocalHadCalib/share/CaloReadLCOutOfClusterPi0File.py @@ -19,8 +19,6 @@ topSequence += ReadLCOutOfCluster theApp.EvtMax = 1 AthenaPoolCnvSvc = Service( "AthenaPoolCnvSvc" ) -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = True from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg myOCA=OutputConditionsAlg("myOCA",outFileName) diff --git a/Calorimeter/CaloLocalHadCalib/share/CaloReadLCWeightsFile.py b/Calorimeter/CaloLocalHadCalib/share/CaloReadLCWeightsFile.py index d1b2afbe1744..75a5400e2123 100644 --- a/Calorimeter/CaloLocalHadCalib/share/CaloReadLCWeightsFile.py +++ b/Calorimeter/CaloLocalHadCalib/share/CaloReadLCWeightsFile.py @@ -19,8 +19,6 @@ topSequence += ReadLCWeights theApp.EvtMax = 1 AthenaPoolCnvSvc = Service( "AthenaPoolCnvSvc" ) -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = True from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg myOCA=OutputConditionsAlg("myOCA",outFileName) diff --git a/Calorimeter/CaloLocalHadCalib/share/CaloReadLC_Cl_W_OOC_OOCPi0_File.py b/Calorimeter/CaloLocalHadCalib/share/CaloReadLC_Cl_W_OOC_OOCPi0_File.py index 5fe3062c9f6f..e38647ac169c 100644 --- a/Calorimeter/CaloLocalHadCalib/share/CaloReadLC_Cl_W_OOC_OOCPi0_File.py +++ b/Calorimeter/CaloLocalHadCalib/share/CaloReadLC_Cl_W_OOC_OOCPi0_File.py @@ -66,8 +66,6 @@ topSequence += ReadLCOutOfClusterPi0 theApp.EvtMax = 1 AthenaPoolCnvSvc = Service( "AthenaPoolCnvSvc" ) -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = True from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg myOCA=OutputConditionsAlg("myOCA",outFileName) diff --git a/Calorimeter/CaloLocalHadCalib/share/GetH6LCSinglePionsPerf_cbt.py b/Calorimeter/CaloLocalHadCalib/share/GetH6LCSinglePionsPerf_cbt.py index 824f958bcf8f..8c4e725d132a 100644 --- a/Calorimeter/CaloLocalHadCalib/share/GetH6LCSinglePionsPerf_cbt.py +++ b/Calorimeter/CaloLocalHadCalib/share/GetH6LCSinglePionsPerf_cbt.py @@ -26,7 +26,6 @@ theApp.EvtMax = -1 ## load POOL support import AthenaPoolCnvSvc.ReadAthenaPool -svcMgr.AthenaSealSvc.OutputLevel = Lvl.ERROR ## general job configuration from AthenaCommon.AlgSequence import AlgSequence diff --git a/Calorimeter/CaloLocalHadCalib/share/GetLCSinglePionsPerf.py b/Calorimeter/CaloLocalHadCalib/share/GetLCSinglePionsPerf.py index b5e1c8da47ca..6dc9e56b9da3 100644 --- a/Calorimeter/CaloLocalHadCalib/share/GetLCSinglePionsPerf.py +++ b/Calorimeter/CaloLocalHadCalib/share/GetLCSinglePionsPerf.py @@ -16,7 +16,6 @@ from AthenaCommon.AppMgr import theApp ## load POOL support import AthenaPoolCnvSvc.ReadAthenaPool -svcMgr.AthenaSealSvc.OutputLevel = Lvl.ERROR ## general job configuration from AthenaCommon.AlgSequence import AlgSequence diff --git a/Calorimeter/CaloLocalHadCalib/share/cl_w_ooc.py b/Calorimeter/CaloLocalHadCalib/share/cl_w_ooc.py index 8b7b9feb2beb..7823a3efcffe 100644 --- a/Calorimeter/CaloLocalHadCalib/share/cl_w_ooc.py +++ b/Calorimeter/CaloLocalHadCalib/share/cl_w_ooc.py @@ -47,7 +47,6 @@ from AthenaCommon.AppMgr import theApp ## load POOL support import AthenaPoolCnvSvc.ReadAthenaPool -svcMgr.AthenaSealSvc.OutputLevel = Lvl.ERROR ## general job configuration from AthenaCommon.AlgSequence import AlgSequence diff --git a/Calorimeter/CaloLocalHadCalib/share/cl_w_ooc_H6.py b/Calorimeter/CaloLocalHadCalib/share/cl_w_ooc_H6.py index db154f50d917..d0559bb8aeb9 100644 --- a/Calorimeter/CaloLocalHadCalib/share/cl_w_ooc_H6.py +++ b/Calorimeter/CaloLocalHadCalib/share/cl_w_ooc_H6.py @@ -44,7 +44,6 @@ theApp.EvtMax = -1 ## load POOL support import AthenaPoolCnvSvc.ReadAthenaPool -svcMgr.AthenaSealSvc.OutputLevel = Lvl.ERROR ## general job configuration from AthenaCommon.AlgSequence import AlgSequence diff --git a/Calorimeter/CaloLocalHadCalib/share/classify.py b/Calorimeter/CaloLocalHadCalib/share/classify.py index 75ce45ed0e10..27fb29b3c9f1 100644 --- a/Calorimeter/CaloLocalHadCalib/share/classify.py +++ b/Calorimeter/CaloLocalHadCalib/share/classify.py @@ -14,7 +14,6 @@ from AthenaCommon.AppMgr import theApp ## load POOL support import AthenaPoolCnvSvc.ReadAthenaPool -svcMgr.AthenaSealSvc.OutputLevel = Lvl.ERROR ## general job configuration from AthenaCommon.AlgSequence import AlgSequence diff --git a/Calorimeter/CaloLocalHadCalib/share/deadmaterialcoeff.py b/Calorimeter/CaloLocalHadCalib/share/deadmaterialcoeff.py index 3b5c4f4b88c1..f6f9e79a5390 100644 --- a/Calorimeter/CaloLocalHadCalib/share/deadmaterialcoeff.py +++ b/Calorimeter/CaloLocalHadCalib/share/deadmaterialcoeff.py @@ -56,8 +56,6 @@ topSequence += GetLCDM theApp.EvtMax = 1 AthenaPoolCnvSvc = Service( "AthenaPoolCnvSvc" ) -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = True from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg #myOCA=OutputConditionsAlg("myOCA","CaloLocalHadCoeff.dmcorr."+mysfx+".pool.root") diff --git a/Calorimeter/CaloLocalHadCalib/share/deadmaterialcoeff_ctb.py b/Calorimeter/CaloLocalHadCalib/share/deadmaterialcoeff_ctb.py index 4e99eb32825b..5b5531693811 100644 --- a/Calorimeter/CaloLocalHadCalib/share/deadmaterialcoeff_ctb.py +++ b/Calorimeter/CaloLocalHadCalib/share/deadmaterialcoeff_ctb.py @@ -90,8 +90,6 @@ topSequence += GetLCDM theApp.EvtMax = 1 AthenaPoolCnvSvc = Service( "AthenaPoolCnvSvc" ) -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = True from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg myOCA=OutputConditionsAlg("myOCA","CaloLocalHadCoeff.dmcorr."+mysfx+".pool.root") diff --git a/Calorimeter/CaloLocalHadCalib/share/deadmaterialtree.py b/Calorimeter/CaloLocalHadCalib/share/deadmaterialtree.py index ab9b2cf00436..a8a2d114a57c 100644 --- a/Calorimeter/CaloLocalHadCalib/share/deadmaterialtree.py +++ b/Calorimeter/CaloLocalHadCalib/share/deadmaterialtree.py @@ -18,7 +18,6 @@ from AthenaCommon.AppMgr import theApp ## load POOL support import AthenaPoolCnvSvc.ReadAthenaPool -svcMgr.AthenaSealSvc.OutputLevel = Lvl.ERROR ## general job configuration from AthenaCommon.AlgSequence import AlgSequence diff --git a/Calorimeter/CaloLocalHadCalib/share/deadmaterialtree_ctb.py b/Calorimeter/CaloLocalHadCalib/share/deadmaterialtree_ctb.py index cff0f79ffd15..22ec5d145ca5 100644 --- a/Calorimeter/CaloLocalHadCalib/share/deadmaterialtree_ctb.py +++ b/Calorimeter/CaloLocalHadCalib/share/deadmaterialtree_ctb.py @@ -37,7 +37,6 @@ theApp.EvtMax = -1 ## load POOL support import AthenaPoolCnvSvc.ReadAthenaPool -svcMgr.AthenaSealSvc.OutputLevel = Lvl.ERROR ## general job configuration from AthenaCommon.AlgSequence import AlgSequence diff --git a/Calorimeter/CaloLocalHadCalib/share/outofcluster.py b/Calorimeter/CaloLocalHadCalib/share/outofcluster.py index 6bcce8406aba..5f6e6775f34e 100644 --- a/Calorimeter/CaloLocalHadCalib/share/outofcluster.py +++ b/Calorimeter/CaloLocalHadCalib/share/outofcluster.py @@ -14,7 +14,6 @@ from AthenaCommon.AppMgr import theApp ## load POOL support import AthenaPoolCnvSvc.ReadAthenaPool -svcMgr.AthenaSealSvc.OutputLevel = Lvl.ERROR ## general job configuration from AthenaCommon.AlgSequence import AlgSequence diff --git a/Calorimeter/CaloLocalHadCalib/share/weights.py b/Calorimeter/CaloLocalHadCalib/share/weights.py index 5c825946fe9e..aaea05a457af 100644 --- a/Calorimeter/CaloLocalHadCalib/share/weights.py +++ b/Calorimeter/CaloLocalHadCalib/share/weights.py @@ -14,7 +14,6 @@ from AthenaCommon.AppMgr import theApp ## load POOL support import AthenaPoolCnvSvc.ReadAthenaPool -svcMgr.AthenaSealSvc.OutputLevel = Lvl.ERROR ## general job configuration from AthenaCommon.AlgSequence import AlgSequence diff --git a/Control/AthenaCommon/python/AtlasUnixStandardJob.py b/Control/AthenaCommon/python/AtlasUnixStandardJob.py index e4507c5a3a09..0b63caee67c2 100755 --- a/Control/AthenaCommon/python/AtlasUnixStandardJob.py +++ b/Control/AthenaCommon/python/AtlasUnixStandardJob.py @@ -59,11 +59,6 @@ def _setupAtlasUnixStandardJob(): svcMgr += AthenaServicesConf.AthDictLoaderSvc() theApp.CreateSvc += [svcMgr.AthDictLoaderSvc.getFullJobOptName()] - # the dict checker - if not hasattr(svcMgr, 'AthenaSealSvc'): - svcMgr += AthenaServicesConf.AthenaSealSvc() - theApp.CreateSvc += [svcMgr.AthenaSealSvc.getFullJobOptName()] - # add-in a service to handle core-dumps if not hasattr(svcMgr, 'CoreDumpSvc'): svcMgr += AthenaServicesConf.CoreDumpSvc() diff --git a/Control/AthenaCommon/share/GenerateBootstrapTest.ref b/Control/AthenaCommon/share/GenerateBootstrapTest.ref index b8aa02562e91..f192f34d0938 100644 --- a/Control/AthenaCommon/share/GenerateBootstrapTest.ref +++ b/Control/AthenaCommon/share/GenerateBootstrapTest.ref @@ -1,16 +1,16 @@ Willing to acquire file bootstrap.pkl from -/afs/cern.ch/user/s/ssnyder/atlas-work3g/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/share/bootstrap.pkl +/build/mnowak/work/sealsvc/build/x86_64-centos7-gcc8-opt/share/bootstrap.pkl copy bootstrap.pkl ... Read 2 items from python pickle file: bootstrap.pkl ... Read 2 items from python pickle file: bootstrap_test.pkl Given list of size 0. Not looking for differences. -Step 1: reference file #components: 28 -Step 2: file to check #components: 28 +Step 1: reference file #components: 27 +Step 2: file to check #components: 27 Willing to acquire file bootstrap_threaded.pkl from -/afs/cern.ch/user/s/ssnyder/atlas-work3g/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/share/bootstrap_threaded.pkl +/build/mnowak/work/sealsvc/build/x86_64-centos7-gcc8-opt/share/bootstrap_threaded.pkl copy bootstrap_threaded.pkl ... Read 2 items from python pickle file: bootstrap_threaded.pkl ... Read 2 items from python pickle file: bootstrap_threaded_test.pkl Given list of size 0. Not looking for differences. -Step 1: reference file #components: 34 -Step 2: file to check #components: 34 +Step 1: reference file #components: 33 +Step 2: file to check #components: 33 diff --git a/Control/AthenaCommon/share/bootstrap.pkl b/Control/AthenaCommon/share/bootstrap.pkl index afb1153c49e6..23d4121dede4 100644 --- a/Control/AthenaCommon/share/bootstrap.pkl +++ b/Control/AthenaCommon/share/bootstrap.pkl @@ -446,20 +446,20 @@ sS'DetStore' p232 S'StoreGateSvc/DetectorStore' p233 -ssS'AthenaSealSvc' +ssS'IncidentProcAlg1' p234 (dp235 -S'DictNames' +S'ExtraOutputs' p236 S'[]' p237 -sS'IgnoreDicts' +sS'NeededResources' p238 -S"['libSealCLHEPDict']" +S'[]' p239 -sS'IgnoreNames' +sS'ExtraInputs' p240 -S"['Gaudi', 'GaudiPython::Interface', 'GaudiPython::Helper', 'FactoryTable', 'IInterface', 'IFactory', 'IAlgFactory', 'ISvcFactory', 'IToolFactory', 'InterfaceID', 'StatusCode', 'IAppMgrUI', 'IProperty', 'Property', 'std::vector<Property*>', 'std::vector<const Property*>', 'std::list<IAlgorithm*>', 'std::list<IService*>', 'std::list<const IFactory*>', 'std::vector<IRegistry*>', 'SimpleProperty', 'SimplePropertyRef', 'IService', 'IAlgorithm', 'ISvcManager', 'IAlgManager', 'IJobOptionsSvc', 'ISvcLocator', 'IEventProcessor', 'IDataProviderSvc', 'IDataManagerSvc', 'IRegistry', 'ContainedObject', 'std::vector<const ContainedObject*>', 'DataObject', 'IHistogramSvc', 'AIDA::I', 'Algorithm', 'Service', 'GaudiPython::PyAlgorithm', 'GaudiPython::PyAlgorithmWrap', 'IParticlePropertySvc', 'ParticleProperty', 'StoreGateSvc', 'IStoragePolicy', 'CharDbArray', 'DoubleDbArray', 'FloatDbArray', 'IntDbArray', 'LongDbArray', 'ShortDbArray', 'AthenaEventLoopMgr', 'MinimalEventLoopMgr', 'PyAthenaEventLoopMgr', 'NTuple::Directory', 'NTuple::File ', 'NTuple::Tuple', 'INTuple', 'NTuple::Tuple', 'greater<int>', 'allocator<', 'string']" +S'[]' p241 ssS'IncidentProcAlg2' p242 @@ -498,43 +498,28 @@ sS'ProxyProviderSvc' p260 S'ProxyProviderSvc' p261 -ssS'IncidentProcAlg1' +ssS'HistogramDataSvc' p262 (dp263 -S'ExtraOutputs' +S'Input' p264 S'[]' p265 -sS'NeededResources' +sS'InhibitPathes' p266 S'[]' p267 -sS'ExtraInputs' -p268 -S'[]' -p269 -ssS'HistogramDataSvc' -p270 -(dp271 -S'Input' -p272 -S'[]' -p273 -sS'InhibitPathes' -p274 -S'[]' -p275 ssS'HistoryStore' -p276 -(dp277 +p268 +(dp269 S'IncidentSvc' -p278 +p270 S'IncidentSvc' -p279 +p271 sS'ProxyProviderSvc' -p280 +p272 S'ProxyProviderSvc' -p281 +p273 ss.ccollections defaultdict p1 @@ -553,223 +538,208 @@ sS'FatalHandler' p8 S'-1' p9 -ssS'AthenaSealSvc' +ssS'ApplicationMgr' p10 (dp11 -S'DictNames' -p12 -S'[]' -p13 -sS'IgnoreDicts' -p14 -S"['libSealCLHEPDict']" -p15 -sS'IgnoreNames' -p16 -S"['Gaudi', 'GaudiPython::Interface', 'GaudiPython::Helper', 'FactoryTable', 'IInterface', 'IFactory', 'IAlgFactory', 'ISvcFactory', 'IToolFactory', 'InterfaceID', 'StatusCode', 'IAppMgrUI', 'IProperty', 'Property', 'std::vector<Property*>', 'std::vector<const Property*>', 'std::list<IAlgorithm*>', 'std::list<IService*>', 'std::list<const IFactory*>', 'std::vector<IRegistry*>', 'SimpleProperty', 'SimplePropertyRef', 'IService', 'IAlgorithm', 'ISvcManager', 'IAlgManager', 'IJobOptionsSvc', 'ISvcLocator', 'IEventProcessor', 'IDataProviderSvc', 'IDataManagerSvc', 'IRegistry', 'ContainedObject', 'std::vector<const ContainedObject*>', 'DataObject', 'IHistogramSvc', 'AIDA::I', 'Algorithm', 'Service', 'GaudiPython::PyAlgorithm', 'GaudiPython::PyAlgorithmWrap', 'IParticlePropertySvc', 'ParticleProperty', 'StoreGateSvc', 'IStoragePolicy', 'CharDbArray', 'DoubleDbArray', 'FloatDbArray', 'IntDbArray', 'LongDbArray', 'ShortDbArray', 'AthenaEventLoopMgr', 'MinimalEventLoopMgr', 'PyAthenaEventLoopMgr', 'NTuple::Directory', 'NTuple::File ', 'NTuple::Tuple', 'INTuple', 'NTuple::Tuple', 'greater<int>', 'allocator<', 'string']" -p17 -ssS'ApplicationMgr' -p18 -(dp19 S'Runable' -p20 +p12 S'AppMgrRunable' -p21 +p13 sS'ReturnCode' -p22 +p14 S'0' sS'TopAlg' -p23 +p15 S"['AthSequencer/AthMasterSeq']" -p24 +p16 sS'PrintAlgsSequence' -p25 +p17 S'False' -p26 +p18 sS'EventLoop' -p27 +p19 S'AthenaEventLoopMgr' -p28 +p20 sS'ExtSvcCreates' -p29 -g26 +p21 +g18 sS'Environment' -p30 +p22 S'{}' -p31 +p23 sS'JobOptionsPath' -p32 +p24 S'' sS'Dlls' -p33 +p25 S'[]' -p34 +p26 sS'SvcMapping' -p35 +p27 S"['EvtDataSvc/EventDataSvc', 'DetDataSvc/DetectorDataSvc', 'HistogramSvc/HistogramDataSvc', 'HbookCnv::PersSvc/HbookHistSvc', 'RootHistCnv::PersSvc/RootHistSvc', 'EvtPersistencySvc/EventPersistencySvc', 'DetPersistencySvc/DetectorPersistencySvc', 'HistogramPersistencySvc/HistogramPersistencySvc']" -p36 +p28 sS'AppName' -p37 +p29 S'ApplicationMgr' -p38 +p30 sS'AuditServices' -p39 -g26 +p31 +g18 sS'OutStream' -p40 +p32 S'[]' -p41 +p33 sS'ActivateHistory' -p42 -g26 +p34 +g18 sS'StalledEventMonitoring' -p43 -g26 +p35 +g18 sS'InitializationLoopCheck' -p44 -g26 +p36 +g18 sS'JobOptionsSvcType' -p45 +p37 S'JobOptionsSvc' -p46 +p38 sS'JobOptionsPreAction' -p47 +p39 S'' sS'StatusCodeCheck' -p48 -g26 +p40 +g18 sS'AuditTools' -p49 -g26 +p41 +g18 sS'AlgTypeAliases' -p50 +p42 S'{}' -p51 +p43 sS'EvtSel' -p52 +p44 S'' sS'PluginDebugLevel' -p53 +p45 S'0' sS'OutputLevel' -p54 +p46 S'3' sS'AppVersion' -p55 +p47 S'' sS'EvtMax' -p56 +p48 S'-1' -p57 +p49 sS'SvcOptMapping' -p58 +p50 S'[]' -p59 +p51 sS'CreateSvc' -p60 -S"['ToolSvc/ToolSvc', 'AthDictLoaderSvc/AthDictLoaderSvc', 'AthenaSealSvc/AthenaSealSvc', 'CoreDumpSvc/CoreDumpSvc']" -p61 +p52 +S"['ToolSvc/ToolSvc', 'AthDictLoaderSvc/AthDictLoaderSvc', 'CoreDumpSvc/CoreDumpSvc']" +p53 sS'PropertiesPrint' -p62 -g26 +p54 +g18 sS'JobOptionsType' -p63 +p55 S'NONE' -p64 +p56 sS'OutStreamType' -p65 +p57 S'AthenaOutputStream' -p66 +p58 sS'StopOnSignal' -p67 -g26 +p59 +g18 sS'ExtSvc' -p68 -S"['ToolSvc/ToolSvc', 'AuditorSvc/AuditorSvc', 'MessageSvc/MessageSvc', 'IncidentSvc/IncidentSvc', 'EvtPersistencySvc/EventPersistencySvc', 'HistogramSvc/HistogramDataSvc', 'NTupleSvc/NTupleSvc', 'RndmGenSvc/RndmGenSvc', 'ChronoStatSvc/ChronoStatSvc', 'StoreGateSvc/StoreGateSvc', 'StoreGateSvc/DetectorStore', 'StoreGateSvc/HistoryStore', 'StoreGateSvc/ConditionStore', 'ClassIDSvc/ClassIDSvc', 'AthDictLoaderSvc/AthDictLoaderSvc', 'AthenaSealSvc/AthenaSealSvc', 'CoreDumpSvc/CoreDumpSvc', 'JobOptionsSvc/JobOptionsSvc']" -p69 +p60 +S"['ToolSvc/ToolSvc', 'AuditorSvc/AuditorSvc', 'MessageSvc/MessageSvc', 'IncidentSvc/IncidentSvc', 'EvtPersistencySvc/EventPersistencySvc', 'HistogramSvc/HistogramDataSvc', 'NTupleSvc/NTupleSvc', 'RndmGenSvc/RndmGenSvc', 'ChronoStatSvc/ChronoStatSvc', 'StoreGateSvc/StoreGateSvc', 'StoreGateSvc/DetectorStore', 'StoreGateSvc/HistoryStore', 'StoreGateSvc/ConditionStore', 'ClassIDSvc/ClassIDSvc', 'AthDictLoaderSvc/AthDictLoaderSvc', 'CoreDumpSvc/CoreDumpSvc', 'JobOptionsSvc/JobOptionsSvc']" +p61 sS'AuditAlgorithms' -p70 -g26 +p62 +g18 sS'HistogramPersistency' -p71 +p63 S'NONE' -p72 +p64 sS'MessageSvcType' -p73 +p65 S'MessageSvc' -p74 +p66 sS'JobOptionsPostAction' -p75 +p67 S'' ssS'MessageSvc' -p76 -(dp77 +p68 +(dp69 S'verboseColorCode' -p78 +p70 S'[]' -p79 +p71 sS'setInfo' -p80 +p72 S'[]' -p81 +p73 sS'tracedInactiveSources' -p82 +p74 S'[]' -p83 +p75 sS'setAlways' -p84 +p76 S'[]' -p85 +p77 sS'debugColorCode' -p86 +p78 S'[]' -p87 +p79 sS'alwaysColorCode' -p88 +p80 S'[]' -p89 +p81 sS'enableSuppression' -p90 +p82 S'True' -p91 +p83 sS'OutputLevel' -p92 +p84 S'3' sS'warningColorCode' -p93 +p85 S"['yellow']" -p94 +p86 sS'errorColorCode' -p95 +p87 S"['white', 'red']" -p96 +p88 sS'setVerbose' -p97 +p89 S'[]' -p98 +p90 sS'infoColorCode' -p99 +p91 S'[]' -p100 +p92 sS'setDebug' -p101 +p93 S'[]' -p102 +p94 sS'setFatal' -p103 +p95 S'[]' -p104 +p96 sS'setError' -p105 +p97 S'[]' -p106 +p98 sS'fatalColorCode' -p107 +p99 S"['blue', 'red']" -p108 +p100 sS'setWarning' -p109 +p101 S'[]' -p110 +p102 ss.(lp1 . \ No newline at end of file diff --git a/Control/AthenaCommon/share/bootstrap_threaded.pkl b/Control/AthenaCommon/share/bootstrap_threaded.pkl index e3f4e7d4f354..5792db164840 100644 --- a/Control/AthenaCommon/share/bootstrap_threaded.pkl +++ b/Control/AthenaCommon/share/bootstrap_threaded.pkl @@ -533,20 +533,20 @@ sS'DetStore' p276 S'StoreGateSvc/DetectorStore' p277 -ssS'AthenaSealSvc' +ssS'IncidentProcAlg1' p278 (dp279 -S'DictNames' +S'ExtraOutputs' p280 S'[]' p281 -sS'IgnoreDicts' +sS'NeededResources' p282 -S"['libSealCLHEPDict']" +S'[]' p283 -sS'IgnoreNames' +sS'ExtraInputs' p284 -S"['Gaudi', 'GaudiPython::Interface', 'GaudiPython::Helper', 'FactoryTable', 'IInterface', 'IFactory', 'IAlgFactory', 'ISvcFactory', 'IToolFactory', 'InterfaceID', 'StatusCode', 'IAppMgrUI', 'IProperty', 'Property', 'std::vector<Property*>', 'std::vector<const Property*>', 'std::list<IAlgorithm*>', 'std::list<IService*>', 'std::list<const IFactory*>', 'std::vector<IRegistry*>', 'SimpleProperty', 'SimplePropertyRef', 'IService', 'IAlgorithm', 'ISvcManager', 'IAlgManager', 'IJobOptionsSvc', 'ISvcLocator', 'IEventProcessor', 'IDataProviderSvc', 'IDataManagerSvc', 'IRegistry', 'ContainedObject', 'std::vector<const ContainedObject*>', 'DataObject', 'IHistogramSvc', 'AIDA::I', 'Algorithm', 'Service', 'GaudiPython::PyAlgorithm', 'GaudiPython::PyAlgorithmWrap', 'IParticlePropertySvc', 'ParticleProperty', 'StoreGateSvc', 'IStoragePolicy', 'CharDbArray', 'DoubleDbArray', 'FloatDbArray', 'IntDbArray', 'LongDbArray', 'ShortDbArray', 'AthenaEventLoopMgr', 'MinimalEventLoopMgr', 'PyAthenaEventLoopMgr', 'NTuple::Directory', 'NTuple::File ', 'NTuple::Tuple', 'INTuple', 'NTuple::Tuple', 'greater<int>', 'allocator<', 'string']" +S'[]' p285 ssS'IncidentProcAlg2' p286 @@ -585,43 +585,28 @@ sS'ProxyProviderSvc' p304 S'ProxyProviderSvc' p305 -ssS'IncidentProcAlg1' +ssS'HistogramDataSvc' p306 (dp307 -S'ExtraOutputs' +S'Input' p308 S'[]' p309 -sS'NeededResources' +sS'InhibitPathes' p310 S'[]' p311 -sS'ExtraInputs' -p312 -S'[]' -p313 -ssS'HistogramDataSvc' -p314 -(dp315 -S'Input' -p316 -S'[]' -p317 -sS'InhibitPathes' -p318 -S'[]' -p319 ssS'HistoryStore' -p320 -(dp321 +p312 +(dp313 S'IncidentSvc' -p322 +p314 S'IncidentSvc' -p323 +p315 sS'ProxyProviderSvc' -p324 +p316 S'ProxyProviderSvc' -p325 +p317 ss.ccollections defaultdict p1 @@ -629,268 +614,253 @@ p1 dict p2 tRp3 -S'AthenaSealSvc' +S'CoreDumpSvc' p4 (dp5 -S'DictNames' +S'Signals' p6 -S'[]' +S'[11, 7, 4, 8]' p7 -sS'IgnoreDicts' +sS'FatalHandler' p8 -S"['libSealCLHEPDict']" +S'-1' p9 -sS'IgnoreNames' -p10 -S"['Gaudi', 'GaudiPython::Interface', 'GaudiPython::Helper', 'FactoryTable', 'IInterface', 'IFactory', 'IAlgFactory', 'ISvcFactory', 'IToolFactory', 'InterfaceID', 'StatusCode', 'IAppMgrUI', 'IProperty', 'Property', 'std::vector<Property*>', 'std::vector<const Property*>', 'std::list<IAlgorithm*>', 'std::list<IService*>', 'std::list<const IFactory*>', 'std::vector<IRegistry*>', 'SimpleProperty', 'SimplePropertyRef', 'IService', 'IAlgorithm', 'ISvcManager', 'IAlgManager', 'IJobOptionsSvc', 'ISvcLocator', 'IEventProcessor', 'IDataProviderSvc', 'IDataManagerSvc', 'IRegistry', 'ContainedObject', 'std::vector<const ContainedObject*>', 'DataObject', 'IHistogramSvc', 'AIDA::I', 'Algorithm', 'Service', 'GaudiPython::PyAlgorithm', 'GaudiPython::PyAlgorithmWrap', 'IParticlePropertySvc', 'ParticleProperty', 'StoreGateSvc', 'IStoragePolicy', 'CharDbArray', 'DoubleDbArray', 'FloatDbArray', 'IntDbArray', 'LongDbArray', 'ShortDbArray', 'AthenaEventLoopMgr', 'MinimalEventLoopMgr', 'PyAthenaEventLoopMgr', 'NTuple::Directory', 'NTuple::File ', 'NTuple::Tuple', 'INTuple', 'NTuple::Tuple', 'greater<int>', 'allocator<', 'string']" -p11 ssS'AthenaHiveEventLoopMgr' -p12 -(dp13 +p10 +(dp11 S'TopAlg' -p14 +p12 S'[]' -p15 +p13 sS'OutStream' -p16 +p14 S'[]' -p17 +p15 sS'EventStore' -p18 +p16 S'StoreGateSvc' -p19 +p17 sS'SchedulerSvc' -p20 +p18 S'AvalancheSchedulerSvc' -p21 +p19 sS'WhiteboardSvc' -p22 +p20 S'EventDataSvc' -p23 +p21 sS'PreSelectTools' -p24 +p22 S'[]' -p25 -ssS'CoreDumpSvc' -p26 -(dp27 -S'Signals' -p28 -S'[11, 7, 4, 8]' -p29 -sS'FatalHandler' -p30 -S'-1' -p31 +p23 ssS'ApplicationMgr' -p32 -(dp33 +p24 +(dp25 S'Runable' -p34 +p26 S'AppMgrRunable' -p35 +p27 sS'ReturnCode' -p36 +p28 S'0' sS'TopAlg' -p37 +p29 S"['AthSequencer/AthMasterSeq']" -p38 +p30 sS'PrintAlgsSequence' -p39 +p31 S'False' -p40 +p32 sS'EventLoop' -p41 +p33 S'AthenaHiveEventLoopMgr' -p42 +p34 sS'ExtSvcCreates' -p43 -g40 +p35 +g32 sS'Environment' -p44 +p36 S'{}' -p45 +p37 sS'JobOptionsPath' -p46 +p38 S'' sS'Dlls' -p47 +p39 S'[]' -p48 +p40 sS'SvcMapping' -p49 +p41 S"['EvtDataSvc/EventDataSvc', 'DetDataSvc/DetectorDataSvc', 'HistogramSvc/HistogramDataSvc', 'HbookCnv::PersSvc/HbookHistSvc', 'RootHistCnv::PersSvc/RootHistSvc', 'EvtPersistencySvc/EventPersistencySvc', 'DetPersistencySvc/DetectorPersistencySvc', 'HistogramPersistencySvc/HistogramPersistencySvc']" -p50 +p42 sS'AppName' -p51 +p43 S'ApplicationMgr' -p52 +p44 sS'AuditServices' -p53 -g40 +p45 +g32 sS'OutStream' -p54 +p46 S'[]' -p55 +p47 sS'ActivateHistory' -p56 -g40 +p48 +g32 sS'StalledEventMonitoring' -p57 -g40 +p49 +g32 sS'InitializationLoopCheck' -p58 -g40 +p50 +g32 sS'JobOptionsSvcType' -p59 +p51 S'JobOptionsSvc' -p60 +p52 sS'JobOptionsPreAction' -p61 +p53 S'' sS'StatusCodeCheck' -p62 -g40 +p54 +g32 sS'AuditTools' -p63 -g40 +p55 +g32 sS'AlgTypeAliases' -p64 +p56 S'{}' -p65 +p57 sS'EvtSel' -p66 +p58 S'' sS'PluginDebugLevel' -p67 +p59 S'0' sS'OutputLevel' -p68 +p60 S'3' sS'AppVersion' -p69 +p61 S'' sS'EvtMax' -p70 +p62 S'-1' -p71 +p63 sS'SvcOptMapping' -p72 +p64 S'[]' -p73 +p65 sS'CreateSvc' -p74 -S"['ToolSvc/ToolSvc', 'AthDictLoaderSvc/AthDictLoaderSvc', 'AthenaSealSvc/AthenaSealSvc', 'CoreDumpSvc/CoreDumpSvc']" -p75 +p66 +S"['ToolSvc/ToolSvc', 'AthDictLoaderSvc/AthDictLoaderSvc', 'CoreDumpSvc/CoreDumpSvc']" +p67 sS'PropertiesPrint' -p76 -g40 +p68 +g32 sS'JobOptionsType' -p77 +p69 S'NONE' -p78 +p70 sS'OutStreamType' -p79 +p71 S'AthenaOutputStream' -p80 +p72 sS'StopOnSignal' -p81 -g40 +p73 +g32 sS'ExtSvc' -p82 -S"['ToolSvc/ToolSvc', 'AuditorSvc/AuditorSvc', 'MessageSvc/MessageSvc', 'IncidentSvc/IncidentSvc', 'EvtPersistencySvc/EventPersistencySvc', 'HistogramSvc/HistogramDataSvc', 'NTupleSvc/NTupleSvc', 'RndmGenSvc/RndmGenSvc', 'ChronoStatSvc/ChronoStatSvc', 'StoreGateSvc/StoreGateSvc', 'StoreGateSvc/DetectorStore', 'StoreGateSvc/HistoryStore', 'StoreGateSvc/ConditionStore', 'ClassIDSvc/ClassIDSvc', 'AthDictLoaderSvc/AthDictLoaderSvc', 'AthenaSealSvc/AthenaSealSvc', 'CoreDumpSvc/CoreDumpSvc', 'SG::HiveMgrSvc/EventDataSvc', 'AlgResourcePool/AlgResourcePool', 'AvalancheSchedulerSvc/AvalancheSchedulerSvc', 'AthenaHiveEventLoopMgr/AthenaHiveEventLoopMgr', 'TimelineSvc/TimelineSvc', 'JobOptionsSvc/JobOptionsSvc']" -p83 +p74 +S"['ToolSvc/ToolSvc', 'AuditorSvc/AuditorSvc', 'MessageSvc/MessageSvc', 'IncidentSvc/IncidentSvc', 'EvtPersistencySvc/EventPersistencySvc', 'HistogramSvc/HistogramDataSvc', 'NTupleSvc/NTupleSvc', 'RndmGenSvc/RndmGenSvc', 'ChronoStatSvc/ChronoStatSvc', 'StoreGateSvc/StoreGateSvc', 'StoreGateSvc/DetectorStore', 'StoreGateSvc/HistoryStore', 'StoreGateSvc/ConditionStore', 'ClassIDSvc/ClassIDSvc', 'AthDictLoaderSvc/AthDictLoaderSvc', 'CoreDumpSvc/CoreDumpSvc', 'SG::HiveMgrSvc/EventDataSvc', 'AlgResourcePool/AlgResourcePool', 'AvalancheSchedulerSvc/AvalancheSchedulerSvc', 'AthenaHiveEventLoopMgr/AthenaHiveEventLoopMgr', 'TimelineSvc/TimelineSvc', 'JobOptionsSvc/JobOptionsSvc']" +p75 sS'AuditAlgorithms' -p84 +p76 S'True' -p85 +p77 sS'HistogramPersistency' -p86 +p78 S'NONE' -p87 +p79 sS'MessageSvcType' -p88 +p80 S'InertMessageSvc' -p89 +p81 sS'JobOptionsPostAction' -p90 +p82 S'' ssS'MessageSvc' -p91 -(dp92 +p83 +(dp84 S'verboseColorCode' -p93 +p85 S'[]' -p94 +p86 sS'alwaysColorCode' -p95 +p87 S'[]' -p96 +p88 sS'setInfo' -p97 +p89 S'[]' -p98 +p90 sS'tracedInactiveSources' -p99 +p91 S'[]' -p100 +p92 sS'setAlways' -p101 +p93 S'[]' -p102 +p94 sS'Format' -p103 +p95 S'% F%40W%S%4W%R%e%s%8W%R%T %0W%M' -p104 +p96 sS'defaultLimit' -p105 +p97 S'0' sS'enableSuppression' -p106 -g85 +p98 +g77 sS'OutputLevel' -p107 +p99 S'3' sS'warningColorCode' -p108 +p100 S"['yellow']" -p109 +p101 sS'errorColorCode' -p110 +p102 S"['white', 'red']" -p111 +p103 sS'setVerbose' -p112 +p104 S'[]' -p113 +p105 sS'debugColorCode' -p114 +p106 S'[]' -p115 +p107 sS'infoColorCode' -p116 +p108 S'[]' -p117 +p109 sS'setDebug' -p118 +p110 S'[]' -p119 +p111 sS'setFatal' -p120 +p112 S'[]' -p121 +p113 sS'setError' -p122 +p114 S'[]' -p123 +p115 sS'fatalColorCode' -p124 +p116 S"['blue', 'red']" -p125 +p117 sS'setWarning' -p126 +p118 S'[]' -p127 +p119 ss.(lp1 . \ No newline at end of file diff --git a/Control/AthenaExamples/AthExThinning/share/AthExThinning_makeData.py b/Control/AthenaExamples/AthExThinning/share/AthExThinning_makeData.py index b7399af225b8..33b88eb89963 100644 --- a/Control/AthenaExamples/AthExThinning/share/AthExThinning_makeData.py +++ b/Control/AthenaExamples/AthExThinning/share/AthExThinning_makeData.py @@ -62,10 +62,6 @@ if not 'OUTPUT' in dir(): pass outStream.OutputFile = OUTPUT -if not hasattr (svcMgr, 'AthenaSealSvc'): - svcMgr += CfgMgr.AthenaSealSvc() -svcMgr.AthenaSealSvc.OutputLevel = ERROR - svcMgr += CfgMgr.MessageSvc( defaultLimit = 4000000 ) #svcMgr.MessageSvc.OutputLevel = ERROR diff --git a/Control/AthenaKernel/AthenaKernel/IAthenaSealSvc.h b/Control/AthenaKernel/AthenaKernel/IAthenaSealSvc.h deleted file mode 100644 index 409ee2f4fde6..000000000000 --- a/Control/AthenaKernel/AthenaKernel/IAthenaSealSvc.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/*************************************************************************** - Athena Kernel package - ----------------------------------------- - ***************************************************************************/ - -//<doc><file> $Id: IAthenaSealSvc.h,v 1.5 2008-06-02 07:49:43 yyao Exp $ -//<version> $Name: not supported by cvs2svn $ - -#ifndef ATHENAKERNEL_IATHENASEALSVC_H -# define ATHENAKERNEL_IATHENASEALSVC_H - - -#include "GaudiKernel/IInterface.h" - -// Declaration of the interface ID ( interface id, major version, minor version) - - -/** @class IAthenaSealSvc - - * @brief The interface implemented by the AthenaSealSvc service. This is - * used by clients to check the seal dictionary. - - * @author RD Schaffer - */ -class IAthenaSealSvc : virtual public IInterface { -public: - /** Check dictionary for a class - - dictionary filler must have been loaded, either by the - "system" or explicitly with "load" below - @param typeName - type/name of class to check - */ - virtual StatusCode checkClass(const std::string& typeName) const = 0; - - - /** Dynamically load a dictionary filler - @param dictName - name of dict filler lib, e.g. MyClassesDict - */ - virtual StatusCode loadDictFiller(const std::string& dictName) const = 0; - - /// Retrieve interface ID - static const InterfaceID& interfaceID() { - static const InterfaceID iid("IAthenaSealSvc", 1 , 0); - return iid; - } -}; - - - - -#endif // ATHENAKERNEL_IATHENASEALSVC_H diff --git a/Control/AthenaPython/AthenaPython/AthenaPythonDict.h b/Control/AthenaPython/AthenaPython/AthenaPythonDict.h index 91d4e378646f..a5f33b50011c 100644 --- a/Control/AthenaPython/AthenaPython/AthenaPythonDict.h +++ b/Control/AthenaPython/AthenaPython/AthenaPythonDict.h @@ -14,7 +14,6 @@ #include "AthenaKernel/IThinningHdlr.h" #include "AthenaKernel/ISlimmingHdlr.h" #include "AthenaKernel/IValgrindSvc.h" -#include "AthenaKernel/IAthenaSealSvc.h" #include "AthenaKernel/IDictLoaderSvc.h" #include "AthenaKernel/IEvtIdModifierSvc.h" #include "GaudiKernel/IIoComponent.h" diff --git a/Control/AthenaPython/AthenaPython/selection.xml b/Control/AthenaPython/AthenaPython/selection.xml index 20d87758c6b2..30d8dc59b806 100644 --- a/Control/AthenaPython/AthenaPython/selection.xml +++ b/Control/AthenaPython/AthenaPython/selection.xml @@ -5,7 +5,6 @@ <class name="Athena::IThinningHdlr" /> <class name="Athena::ISlimmingHdlr" /> <class name="IValgrindSvc" /> - <class name="IAthenaSealSvc" /> <class name="IDictLoaderSvc" /> <class name="IEvtIdModifierSvc" /> <class name="IIoComponent" /> diff --git a/Control/AthenaServices/CMakeLists.txt b/Control/AthenaServices/CMakeLists.txt index cd9bda4b2242..901d90d7ebf8 100644 --- a/Control/AthenaServices/CMakeLists.txt +++ b/Control/AthenaServices/CMakeLists.txt @@ -55,7 +55,7 @@ atlas_add_test( AthenaOutputStream_test src/OutputStreamSequencerSvc.cxx src/MetaDataSvc.cxx INCLUDE_DIRS ${Boost_INCLUDE_DIRS} LINK_LIBRARIES TestTools AsgTools AthenaKernel SGTools StoreGateLib GaudiKernel AthenaBaseComps PersistentDataModel - LOG_IGNORE_PATTERN "^AthenaRootStrea... +(INFO|DEBUG)|^AthenaSealSvc +DEBUG|^SGAudSvc +(INFO|DEBUG)|of type DataHistory|DEBUG Recorded object|object modifiable when retrieved|^ToolSvc +DEBUG Service base class initialized|^ServiceManager +DEBUG Initializing service|^IncidentSvc *DEBUG Adding .* listener|DecisionSvc +DEBUG|^IoComponentMgr +(INFO|DEBUG)|DBReplicaSvc|^HistogramPersis.*DEBUG|^ItemListSvc +(INFO|DEBUG)|Info File PoolFileCatalog.xml does not exist|DataModelCompatSvc::initialize|^ProxyProviderSvc +DEBUG|^DataModelCompatSvc +DEBUG|^AthenaOutputStreamVERBOSE|^AthenaOutputStream +DEBUG|^TimelineSvc +DEBUG" + LOG_IGNORE_PATTERN "^AthenaRootStrea... +(INFO|DEBUG)|^SGAudSvc +(INFO|DEBUG)|of type DataHistory|DEBUG Recorded object|object modifiable when retrieved|^ToolSvc +DEBUG Service base class initialized|^ServiceManager +DEBUG Initializing service|^IncidentSvc *DEBUG Adding .* listener|DecisionSvc +DEBUG|^IoComponentMgr +(INFO|DEBUG)|DBReplicaSvc|^HistogramPersis.*DEBUG|^ItemListSvc +(INFO|DEBUG)|Info File PoolFileCatalog.xml does not exist|DataModelCompatSvc::initialize|^ProxyProviderSvc +DEBUG|^DataModelCompatSvc +DEBUG|^AthenaOutputStreamVERBOSE|^AthenaOutputStream +DEBUG|^TimelineSvc +DEBUG" ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" ) # Avoid spurious ubsan warnings. set_target_properties( AthenaServices_AthenaOutputStream_test PROPERTIES ENABLE_EXPORTS True ) @@ -126,7 +126,6 @@ atlas_install_joboptions( share/AthTPCnvSvc_test.py share/AthDictLoaderSvc_test.py share/ReadAthenaPoolSeek_jobOptions.py share/AthenaJobOptionsSvc_jobOptions.py - share/AthenaSealSvc_joboptions.py share/test_tpcnvdb.py ) # Need to make sure that python file installation happens before genconf diff --git a/Control/AthenaServices/share/AthDictLoaderSvc.ref b/Control/AthenaServices/share/AthDictLoaderSvc.ref index 6f6e712bc0ad..bf7ba0ac76f3 100644 --- a/Control/AthenaServices/share/AthDictLoaderSvc.ref +++ b/Control/AthenaServices/share/AthDictLoaderSvc.ref @@ -1,35 +1,32 @@ -Thu Sep 6 16:10:28 CEST 2018 +Fri Jun 19 15:39:42 CEST 2020 Preloading tcmalloc_minimal.so Py:Athena INFO including file "AthenaCommon/Preparation.py" -Py:Athena INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-opt] [atlas-work3e/78123ca2f8a] -- built on [2018-09-06T1402] +Py:Athena INFO using release [WorkDir-22.0.15] [x86_64-centos7-gcc8-opt] [master/b9ffea6f446] -- built on [2020-06-18T1816] Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py" Py:Athena INFO executing ROOT6Setup Py:Athena INFO including file "AthenaCommon/Execution.py" Py:Athena INFO including file "AthenaServices/AthDictLoaderSvc_test.py" Py:Athena INFO including file "AthenaCommon/runbatch.py" -Py:ConfigurableDb INFO Read module info for 5528 configurables from 10 genConfDb files +Py:ConfigurableDb INFO Read module info for 5534 configurables from 58 genConfDb files Py:ConfigurableDb INFO No duplicates have been found: that's good ! -[?1034hApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0 +ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0 ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0 ApplicationMgr SUCCESS ==================================================================================================================================== - Welcome to ApplicationMgr (GaudiCoreSvc v30r3) - running on lxplus051.cern.ch on Thu Sep 6 16:11:57 2018 + Welcome to ApplicationMgr (GaudiCoreSvc v33r1) + running on aibuild20-040.cern.ch on Fri Jun 19 15:39:55 2020 ==================================================================================================================================== -ApplicationMgr INFO Successfully loaded modules : AthenaServices ApplicationMgr INFO Application Manager Configured successfully ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0 -StatusCodeSvc INFO initialize AthDictLoaderSvc INFO in initialize... AthDictLoaderSvc INFO acquired Dso-registry -ClassIDSvc INFO getRegistryEntries: read 2918 CLIDRegistry entries for module ALL +ClassIDSvc INFO getRegistryEntries: read 3361 CLIDRegistry entries for module ALL CoreDumpSvc INFO install f-a-t-a-l handler... (flag = -1) CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00 PyComponentMgr INFO Initializing PyComponentMgr... AthDictLoaderTe... INFO Initializing AthDictLoaderTestAlg... Py:AthDictLoaderTestAlg INFO retrieving the dictionary loader svc... -HistogramPersis...WARNING Histograms saving not required. ApplicationMgr INFO Application Manager Initialized successfully ApplicationMgr INFO Application Manager Started successfully AthenaEventLoopMgr INFO ===>>> start of run 1 <<<=== @@ -104,12 +101,6 @@ IncidentProcAlg2 INFO Finalize PyComponentMgr INFO Finalizing PyComponentMgr... AthDictLoaderSvc INFO in finalize... ToolSvc INFO Removing all tools created by ToolSvc -*****Chrono***** INFO **************************************************************************************************** -*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered) -*****Chrono***** INFO **************************************************************************************************** -ChronoStatSvc INFO Time User : Tot= 2.56 [s] #= 1 -*****Chrono***** INFO **************************************************************************************************** -ChronoStatSvc.f... INFO Service finalized successfully ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully Py:Athena INFO leaving with code 0: "successful run" diff --git a/Control/AthenaServices/share/AthTPCnvSvc.ref b/Control/AthenaServices/share/AthTPCnvSvc.ref index 1f3ac8706b28..9717790050a9 100644 --- a/Control/AthenaServices/share/AthTPCnvSvc.ref +++ b/Control/AthenaServices/share/AthTPCnvSvc.ref @@ -1,34 +1,30 @@ -Sun Jul 8 10:45:18 EDT 2018 -WARNING: TCMALLOCDIR not defined, will use libc malloc +Fri Jun 19 15:20:48 CEST 2020 +Preloading tcmalloc_minimal.so Py:Athena INFO including file "AthenaCommon/Preparation.py" -Py:Athena INFO using release [?-21.0.0] [i686-slc5-gcc43-dbg] [?/?] -- built on [?] +Py:Athena INFO using release [WorkDir-22.0.15] [x86_64-centos7-gcc8-opt] [master/b9ffea6f446] -- built on [2020-06-18T1816] Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py" Py:Athena INFO executing ROOT6Setup Py:Athena INFO including file "AthenaCommon/Execution.py" Py:Athena INFO including file "AthenaServices/AthTPCnvSvc_test.py" -Py:ConfigurableDb INFO Read module info for 502 configurables from 2 genConfDb files +Py:ConfigurableDb INFO Read module info for 5534 configurables from 58 genConfDb files Py:ConfigurableDb INFO No duplicates have been found: that's good ! -# setting LC_ALL to "C" ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0 ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0 ApplicationMgr SUCCESS ==================================================================================================================================== - Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99) - running on karma on Sun Jul 8 10:45:20 2018 + Welcome to ApplicationMgr (GaudiCoreSvc v33r1) + running on aibuild20-040.cern.ch on Fri Jun 19 15:21:02 2020 ==================================================================================================================================== -ApplicationMgr INFO Successfully loaded modules : AthenaServices ApplicationMgr INFO Application Manager Configured successfully ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0 -StatusCodeSvc INFO initialize AthDictLoaderSvc INFO in initialize... AthDictLoaderSvc INFO acquired Dso-registry -ClassIDSvc INFO getRegistryEntries: read 2826 CLIDRegistry entries for module ALL +ClassIDSvc INFO getRegistryEntries: read 3361 CLIDRegistry entries for module ALL CoreDumpSvc INFO install f-a-t-a-l handler... (flag = -1) CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00 -HistogramPersis...WARNING Histograms saving not required. ApplicationMgr INFO Application Manager Initialized successfully -ClassIDSvc INFO getRegistryEntries: read 1136 CLIDRegistry entries for module ALL +ClassIDSvc INFO getRegistryEntries: read 1276 CLIDRegistry entries for module ALL AthTPCnvSvc WARNING Could not load converter for transient class [AthenaServicesTestConverters::TBTRIG] AthTPCnvSvc WARNING Could not load converter for transient class [AthenaServicesTestConverters::TBTRIG] AthTPCnvSvc WARNING could not load converter for transient CLID [20394825] (AthenaServicesTestConverters::TBTRIG) @@ -48,9 +44,8 @@ Py:Configurable ERROR attempt to add a duplicate (AthAlgEvtSeq.AthEndSeq) .. Py:Configurable ERROR attempt to add a duplicate (AthMasterSeq.AthAlgEvtSeq) ... dupe ignored Py:Configurable ERROR attempt to add a duplicate (AthMasterSeq.AthOutSeq) ... dupe ignored Py:Configurable ERROR attempt to add a duplicate (AthMasterSeq.AthRegSeq) ... dupe ignored -StatusCodeSvc INFO reinitialize ClassIDSvc INFO RE-initializing ClassIDSvc -HistogramPersis...WARNING Histograms saving not required. +ApplicationMgr INFO Application Manager Reinitialized successfully ApplicationMgr INFO Application Manager Started successfully AthenaEventLoopMgr INFO ===>>> start of run 1 <<<=== AthenaEventLoopMgr INFO ===>>> start processing event #1, run #1 0 events processed so far <<<=== @@ -60,12 +55,6 @@ IncidentProcAlg1 INFO Finalize IncidentProcAlg2 INFO Finalize AthDictLoaderSvc INFO in finalize... ToolSvc INFO Removing all tools created by ToolSvc -*****Chrono***** INFO **************************************************************************************************** -*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered) -*****Chrono***** INFO **************************************************************************************************** -ChronoStatSvc INFO Time User : Tot= 1.54 [s] #= 1 -*****Chrono***** INFO **************************************************************************************************** -ChronoStatSvc.f... INFO Service finalized successfully ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully Py:Athena INFO leaving with code 0: "successful run" diff --git a/Control/AthenaServices/share/AthenaSealSvc_joboptions.py b/Control/AthenaServices/share/AthenaSealSvc_joboptions.py deleted file mode 100755 index db992399349d..000000000000 --- a/Control/AthenaServices/share/AthenaSealSvc_joboptions.py +++ /dev/null @@ -1,27 +0,0 @@ -# -# Joboptions for loading the AthenaSealSvc -# - -# Block multiple includes -include.block( "AthenaSealSvc/AthenaSealSvc_joboptions.py" ) - -# general application configuration options - -## get a handle to the Service Manager -from AthenaCommon.AppMgr import ServiceMgr as svcMgr -from AthenaCommon import CfgMgr - -if not hasattr (svcMgr, 'AthenaSealSvc'): - svcMgr += CfgMgr.AthenaSealSvc() - -## put here additional configuration - -## - -from AthenaCommon.Logging import logging -msg = logging.getLogger( 'AthenaSealSvc' ) -msg.info( "DictNames: %r", svcMgr.AthenaSealSvc.DictNames ) - -## backward compat -AthenaSealSvc = svcMgr.AthenaSealSvc - diff --git a/Control/AthenaServices/share/SimplePOSIXTimeKeeperSvc.ref b/Control/AthenaServices/share/SimplePOSIXTimeKeeperSvc.ref index abc27f01dc15..4c1356f07334 100644 --- a/Control/AthenaServices/share/SimplePOSIXTimeKeeperSvc.ref +++ b/Control/AthenaServices/share/SimplePOSIXTimeKeeperSvc.ref @@ -1,41 +1,38 @@ -Thu Sep 6 15:46:12 CEST 2018 +Fri Jun 19 15:37:27 CEST 2020 Preloading tcmalloc_minimal.so Py:Athena INFO including file "AthenaCommon/Preparation.py" -Py:Athena INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-opt] [atlas-work3e/78123ca2f8a] -- built on [2018-09-06T1340] +Py:Athena INFO using release [WorkDir-22.0.15] [x86_64-centos7-gcc8-opt] [master/b9ffea6f446] -- built on [2020-06-18T1816] Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py" Py:Athena INFO executing ROOT6Setup Py:Athena INFO including file "AthenaCommon/Execution.py" Py:Athena INFO including file "AthenaServices/SimplePOSIXTimeKeeperSvc_test.py" -[?1034hPy:Athena INFO including file "AthenaServices/SimplePOSIXTimeKeeperOptions.py" +Py:Athena INFO including file "AthenaServices/SimplePOSIXTimeKeeperOptions.py" Py:Athena INFO including file "AthenaCommon/runbatch.py" -Py:ConfigurableDb INFO Read module info for 5528 configurables from 10 genConfDb files +Py:ConfigurableDb INFO Read module info for 5534 configurables from 58 genConfDb files Py:ConfigurableDb INFO No duplicates have been found: that's good ! ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0 ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0 ApplicationMgr SUCCESS ==================================================================================================================================== - Welcome to ApplicationMgr (GaudiCoreSvc v30r3) - running on lxplus051.cern.ch on Thu Sep 6 15:47:45 2018 + Welcome to ApplicationMgr (GaudiCoreSvc v33r1) + running on aibuild20-040.cern.ch on Fri Jun 19 15:37:42 2020 ==================================================================================================================================== -ApplicationMgr INFO Successfully loaded modules : AthenaServices ApplicationMgr INFO Application Manager Configured successfully ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0 AthenaEventLoopMgr INFO No TimeKeeper selected. No time limit control on event loop. -StatusCodeSvc INFO initialize SimplePOSIXTime... DEBUG Property update for OutputLevel : new value = 1 SimplePOSIXTime... INFO Initializing SimplePOSIXTimeKeeperSvc - package version AthenaServices-00-00-00 AthDictLoaderSvc INFO in initialize... AthDictLoaderSvc INFO acquired Dso-registry -ClassIDSvc INFO getRegistryEntries: read 3630 CLIDRegistry entries for module ALL +ClassIDSvc INFO getRegistryEntries: read 3733 CLIDRegistry entries for module ALL CoreDumpSvc INFO install f-a-t-a-l handler... (flag = -1) CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00 -HistogramPersis...WARNING Histograms saving not required. ApplicationMgr INFO Application Manager Initialized successfully ApplicationMgr INFO Application Manager Started successfully SimplePOSIXTime...VERBOSE TimeKeeper status: (all times in 1/100 CPU secs) - allocated job time 600 - job time used so far 1761 - average time per iteration 0 - time left -1161 + allocated job time 600 - job time used so far 1097 + average time per iteration 0 - time left -497 Not enough time for another iteration ApplicationMgr INFO Application Manager Stopped successfully IncidentProcAlg1 INFO Finalize @@ -43,15 +40,9 @@ IncidentProcAlg2 INFO Finalize AthDictLoaderSvc INFO in finalize... ToolSvc INFO Removing all tools created by ToolSvc SimplePOSIXTime... INFO TimeKeeper status: (all times in 1/100 CPU secs) - allocated job time 600 - job time used so far 1761 - average time per iteration 0 - time left -1161 + allocated job time 600 - job time used so far 1097 + average time per iteration 0 - time left -497 Not enough time for another iteration -*****Chrono***** INFO **************************************************************************************************** -*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered) -*****Chrono***** INFO **************************************************************************************************** -ChronoStatSvc INFO Time User : Tot= 90 [ms] #= 1 -*****Chrono***** INFO **************************************************************************************************** -ChronoStatSvc.f... INFO Service finalized successfully ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully Py:Athena INFO leaving with code 65: "failure in an algorithm execute" diff --git a/Control/AthenaServices/share/TestStopRun.ref b/Control/AthenaServices/share/TestStopRun.ref index 3f0bfc517287..b82c7a1bb534 100644 --- a/Control/AthenaServices/share/TestStopRun.ref +++ b/Control/AthenaServices/share/TestStopRun.ref @@ -1,35 +1,31 @@ -Fri Mar 17 17:22:43 CET 2017 +Fri Jun 19 15:03:07 CEST 2020 Preloading tcmalloc_minimal.so Py:Athena INFO including file "AthenaCommon/Preparation.py" -Py:Athena INFO using release [AthenaWorkDir-22.0.0] [x86_64-slc6-gcc49-opt] [private/private] -- built on [2017-03-17 17:16] +Py:Athena INFO using release [WorkDir-22.0.15] [x86_64-centos7-gcc8-opt] [master/b9ffea6f446] -- built on [2020-06-18T1816] Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py" Py:Athena INFO executing ROOT6Setup -[?1034hPy:Athena INFO including file "AthenaCommon/Execution.py" +Py:Athena INFO including file "AthenaCommon/Execution.py" Py:Athena INFO including file "AthenaServices/TestStopRun.py" Py:Athena INFO including file "AthenaCommon/runbatch.py" -Py:ConfigurableDb INFO Read module info for 5282 configurables from 7 genConfDb files +Py:ConfigurableDb INFO Read module info for 5534 configurables from 58 genConfDb files Py:ConfigurableDb INFO No duplicates have been found: that's good ! ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0 +ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0 ApplicationMgr SUCCESS ==================================================================================================================================== - Welcome to ApplicationMgr (GaudiCoreSvc v28r1) - running on p05614910w96644.cern.ch on Fri Mar 17 17:22:53 2017 + Welcome to ApplicationMgr (GaudiCoreSvc v33r1) + running on aibuild20-040.cern.ch on Fri Jun 19 15:03:23 2020 ==================================================================================================================================== -ApplicationMgr INFO Successfully loaded modules : AthenaServices ApplicationMgr INFO Application Manager Configured successfully ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0 -StatusCodeSvc INFO initialize AthDictLoaderSvc INFO in initialize... AthDictLoaderSvc INFO acquired Dso-registry -ClassIDSvc INFO getRegistryEntries: read 2303 CLIDRegistry entries for module ALL -ChronoStatSvc INFO Number of skipped events for MemStat-1 +ClassIDSvc INFO getRegistryEntries: read 3361 CLIDRegistry entries for module ALL CoreDumpSvc INFO install f-a-t-a-l handler... (flag = -1) CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00 -HistogramPersis...WARNING Histograms saving not required. ApplicationMgr INFO Application Manager Initialized successfully ApplicationMgr INFO Application Manager Started successfully -ClassIDSvc INFO getRegistryEntries: read 665 CLIDRegistry entries for module ALL AthenaEventLoopMgr INFO ===>>> start of run 1 <<<=== AthenaEventLoopMgr INFO ===>>> start processing event #1, run #1 0 events processed so far <<<=== AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 1 events processed so far <<<=== @@ -42,12 +38,6 @@ IncidentProcAlg1 INFO Finalize IncidentProcAlg2 INFO Finalize AthDictLoaderSvc INFO in finalize... ToolSvc INFO Removing all tools created by ToolSvc -*****Chrono***** INFO **************************************************************************************************** -*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered) -*****Chrono***** INFO **************************************************************************************************** -ChronoStatSvc INFO Time User : Tot= 80 [ms] #= 1 -*****Chrono***** INFO **************************************************************************************************** -ChronoStatSvc.f... INFO Service finalized successfully ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully with a user requested ScheduledStop Py:Athena INFO leaving with code 0: "successful run" diff --git a/Control/AthenaServices/src/AthenaSealSvc.cxx b/Control/AthenaServices/src/AthenaSealSvc.cxx deleted file mode 100644 index 32c501048bd7..000000000000 --- a/Control/AthenaServices/src/AthenaSealSvc.cxx +++ /dev/null @@ -1,1094 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - - -/******************************************************************** - -NAME: AthenaSealSvc.cxx -PACKAGE: AthenaSealSvc - -AUTHORS: Christian Arnault -CREATED: May. 13, 2003 - -UPDATES FOR ROOT6: Wim Lavrijsen (WLavrijsen@lbl.gov) - -PURPOSE: Verify dictionary completeness by attempting to load all - referenced classes -********************************************************************/ - -#include "AthenaSealSvc.h" - -#include "GaudiKernel/MsgStream.h" -#include "GaudiKernel/ISvcLocator.h" -#include "GaudiKernel/IChronoStatSvc.h" -#include "GaudiKernel/Bootstrap.h" -#include "GaudiKernel/MsgStream.h" -#include "GaudiKernel/IAlgManager.h" -#include "GaudiKernel/IAlgorithm.h" -#include "GaudiKernel/SmartIF.h" -#include "GaudiKernel/System.h" - -#include <errno.h> -#include <set> -#include <algorithm> - -///////////////////////////////////////////////////////////////////////////// -// -// Job control cards: -// -// "Dictionaries" - list of the dictionaries to load -// -///////////////////////////////////////////////////////////////////////////// - -//---------------------------------------------------------------------------- -static inline ReflexType mig56_ReflexTypeByName(const std::string& name) -{ - return ReflexType::ByName(name, kFALSE /* load */, kFALSE /* quiet */ ); -} - -static inline ReflexScope mig56_ReflexScopeByName(const std::string& name) -{ - return ReflexScope::ByName(name, kFALSE /* load */, kFALSE /* quiet */ ); -} - - -//---------------------------------------------------------------------------- -AthenaSealSvc::AthenaSealSvc(const std::string& name, ISvcLocator* pSvcLocator) - : - AthService(name, pSvcLocator), - m_checkDictAtInit(false), - m_checkDictionary(true), - m_loadAllDicts(false), - m_chronoStatSvc( "ChronoStatSvc", name ), - m_dictLoaderSvc( "AthDictLoaderSvc", name ), - m_doChronoStat (true) -{ - declareProperty ("DictNames", m_dictionaryNames); - declareProperty ("IgnoreNames", m_ignoreNames); - declareProperty ("CheckDictionary", m_checkDictionary); - declareProperty ("CheckDictAtInit", m_checkDictAtInit); - declareProperty ("LoadAllDicts", m_loadAllDicts); - declareProperty ("IgnoreDicts", m_ignoreDicts); - declareProperty ("UseChronoStag", m_doChronoStat); - - // configure sensible defaults - setDefaultDictNames(); - setDefaultIgnoreNames(); - setDefaultIgnoreDicts(); -} - -//---------------------------------------------------------------------------- -AthenaSealSvc::~AthenaSealSvc() -{} - -//---------------------------------------------------------------------------- -StatusCode AthenaSealSvc::queryInterface ( const InterfaceID& riid, void** ppvInterface ) -{ - if ( IAthenaSealSvc::interfaceID() == riid ) - { - *ppvInterface = (IAthenaSealSvc*)this; - } - else - { - // Interface is not directly available: try out a base class - return AthService::queryInterface(riid, ppvInterface); - } - addRef(); - return StatusCode::SUCCESS; -} - - -//---------------------------------------------------------------------------- -StatusCode AthenaSealSvc::initialize() -{ -///////////////////////////////////////////////////////////////////////////// -// -// AthenaSealSvc::initialize() -// Initiliaze the streams defined by the job control cards as follows: -// -// No data-card name Action -// -- --------------- -------------------------------------------- -// 1. "Dictionaries" - load the specified dictionaries -// -- --------------- ---------------------------------------------------- -// -///////////////////////////////////////////////////////////////////////////// - - // get ChronoStatSvc - StatusCode status = m_chronoStatSvc.retrieve(); - if (!status.isSuccess()) { - ATH_MSG_ERROR ("Can not get ChronoStatSvc."); - return(status); - } - - if (!m_dictLoaderSvc.retrieve().isSuccess()) { - ATH_MSG_ERROR ("could not retrieve athena dict. loader service !"); - return StatusCode::FAILURE; - } - - ATH_MSG_DEBUG - ("begin initialize() - loading dictionary fillers: size " - << m_dictionaryNames.value().size()); - - if (m_dictionaryNames.value().size()) { - - if (m_doChronoStat) { - m_chronoStatSvc->chronoStart("AthenaSealSvc::dictLoading"); - } - - for (unsigned int i = 0; i < m_dictionaryNames.value().size(); i++) { - std::string name = m_dictionaryNames.value()[i]; - - // Try to load: we ignore the return code for the moment - status = loadDictFiller(name); - if (status.isFailure()) { - return status; - } - } - - if (m_doChronoStat) { - m_chronoStatSvc->chronoStop("AthenaSealSvc::dictLoading"); - } - } - - - // Print out names to ignore - for (unsigned int i = 0; i < m_ignoreNames.value().size(); i++) { - std::string name = m_ignoreNames.value()[i]; - ATH_MSG_VERBOSE ("Ignore name: " << name); - } - - - // Load all classes available - if(m_loadAllDicts) { - status = loadClasses(); - if (status.isFailure()) { - ATH_MSG_ERROR ("Unable to load classes"); - return status; - } - } - - // Check the dictionary completeness - if(m_checkDictAtInit) { - try { - checkDictionary(); - } - - catch (std::exception& e) { - ATH_MSG_FATAL ("*** Reflex exception caught: " << e.what()); - return StatusCode::FAILURE; - } - } - - ATH_MSG_VERBOSE ("end initialize()"); - - return status; -} - - -//---------------------------------------------------------------------------- -StatusCode -AthenaSealSvc::loadClasses() const -{ - ATH_MSG_VERBOSE ("loadClasses: Looking for class capabilities"); - - // Iterate over the reflex types - - // Don't loadClasses() ... at issue is that with no longer any distinction - // between Reflex-based classes (i.e. ATLAS classes) and ROOT ones, we'd be - // pulling all of ROOT and its derived uses. - - // Further, the use of this function seems to have been to resolve conflicts - // by loading Reflex-based classes early. This is no longer an issue. - - // Final point: this function is only called when LoadAllDicts == True, which - // is not the currently case (per LXR). Since this could change, a warning is - // warrented: - ATH_MSG_WARNING ("loadClasses() is a no-op under ROOT6 (LoadAllDicts ignored)"); - return (StatusCode::SUCCESS); -} - - -//---------------------------------------------------------------------------- -void -AthenaSealSvc::show_member (const ReflexMember& m) const -{ - // none of this code will print unless the current level is VERBOSE, so just - // return and be done with it if not - if (!msgLvl(MSG::VERBOSE)) - return; - - const ReflexType t1 = m.DeclaringType (); - const ReflexType t2 = m.TypeOf (); - unsigned int width = 20; - - if (t1) { - msg(MSG::VERBOSE) << " " << m.Name(); - unsigned int s = m.Name().size(); - if (s < width) { - std::string tab(width - s,' '); - msg(MSG::VERBOSE) << tab; - } - } - else msg(MSG::VERBOSE) << " warning - declaring type unknown for " << m.Name(); - - msg(MSG::VERBOSE) << " -- offset: "; - if (m.Offset() < 100) { - msg(MSG::VERBOSE) << ' '; - if (m.Offset() < 10) msg(MSG::VERBOSE) << ' '; - } - - msg(MSG::VERBOSE) << m.Offset(); - - if (t2) { - msg(MSG::VERBOSE) << " -- type: " << t2.Name(); - if (m.IsTransient()) { - msg(MSG::VERBOSE) << " [declared transient]"; - } - if (m.IsStatic()) { - msg(MSG::VERBOSE) << " [declared static]"; - } - } - else { - if (m.IsTransient()) { - msg(MSG::VERBOSE) << " -- type: " << "[unknown - declared transient]"; - } - else if (m.IsStatic()) { - msg(MSG::VERBOSE) << " -- type: " << "[unknown - declared static]"; - } - else { - msg(MSG::VERBOSE) << " -- type: " << "[unknown]"; - } - } - msg(MSG::VERBOSE) << endmsg; -} - -//---------------------------------------------------------------------------- -void -AthenaSealSvc::show_type (const ReflexType& t) const -{ - // none of this code nor show_member() will print unless the current level - // is VERBOSE, so just return and be done with it if not - if (!msgLvl(MSG::VERBOSE)) - return; - - // show info of members - msg(MSG::VERBOSE) << "Members of class " << t.Name() << ":" << endmsg; - for (size_t i = 0; i < t.DataMemberSize(); ++i) { - ReflexMember m = t.DataMemberAt(i); - if (m) { - show_member (m); - } - } - -} - -//---------------------------------------------------------------------------- -bool -AthenaSealSvc::member_is_ok(const std::string& typeName, - const std::string& memberName) const -{ - if (typeName == "basic_string<char>" && - memberName == "_M_dataplus") { - return (true); - } - if (typeName.find("map<") != std::string::npos && - memberName == "_M_t") { - return (true); - } - if (typeName.find("hash_") != std::string::npos && - memberName == "_M_ht") { - return (true); - } - if (typeName.find("set<") != std::string::npos && - memberName == "_M_t") { - return (true); - } - if (typeName.find("std::_Vector_alloc_base<DataLinkVector") != std::string::npos && - memberName.find("_M_") != std::string::npos) { - return (true); - } - if (typeName == "DetailedTrackTruthCollection" && - memberName == "m_trackCollection") { - return (true); - } - if( typeName.find("DataVector<") == 0 && memberName == "m_pCont") { - msg(MSG::VERBOSE) << "**** Ignoring " << typeName << "." << memberName << endmsg; - return (true); - } - - return (false); -} - -//---------------------------------------------------------------------------- -static bool -isnum(const std::string& str) -{ - for (unsigned int i = 0; i < str.size(); i++) { - if ((str[i] < '0') || (str[i] > '9')) - return false; - } - return true; -} - -//---------------------------------------------------------------------------- -void -AthenaSealSvc::find_extra_types (const ReflexType& t, - std::vector<ReflexType>& newTypes) const -{ - // Add the type of each field - - // check that types of the fields are defined - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Looking for members of type " << t.Name() << ":" - << " newTypes size " << newTypes.size() << endmsg; - for (size_t i = 0; i < t.DataMemberSize(); ++i) { - ReflexMember m = t.DataMemberAt(i); - if (m) { - ReflexType t2 = m.TypeOf (); - // If type is pointer, get the underlying type - if (t2.IsPointer()) t2 = t2.ToType(); - - // Skip transient fields - this and downstream classes may - // not yet be defined - if (m.IsTransient()) { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) - << " Skipping check for transient member " << m.Name() - << " of type " << t2.Name() - << endmsg; - continue; - } - // Also skip static members. - if (m.IsStatic()) { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) - << " Skipping check for static member " << m.Name() - << " of type " << t2.Name() - << endmsg; - continue; - } - if (t2) { - newTypes.push_back(t2); - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << " found class " << t2.Name() << endmsg; - } - } - } - - // Add in types for each superclass - if (t.IsClass()) { - if(t.BaseSize()) { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << " Loop over superclass names " << endmsg; - } - for (size_t i = 0; i < t.BaseSize(); ++i) { - ReflexBase b = t.BaseAt(i); - if (b) { - std::string bname = b.Name(); - // Remove stl container base classes - if (bname.find("_base<") == std::string::npos) { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << " found name: " << bname; - ReflexType tb = b.ToType(); - if (tb) { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << ". Type IS defined in dictionary. "; - newTypes.push_back(tb); - } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << endmsg; - } - } - } - } - - // Add in types for templates - if (t.IsTemplateInstance()) { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << " Loop over template args of " << t.Name()<< " " - << endmsg; - for (size_t i = 0; i < t.TemplateArgumentSize(); ++i) { - ReflexType ta = t.TemplateArgumentAt(i); - - // If type not found, try to dynamically load it - std::string taname = ta.Name(7); - if (!ta) { - std::string name = ta.Name(7); - // skip single digit strings - if (name.size() == 1 && isdigit(name[0])) { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Skip template arg: " << name << " is digit " << endmsg; - continue; - } - if ('*' == name[name.size()-1]) name = name.substr(0, name.size()-1); - if ("const " == name.substr(0, 6)) name = name.substr(6, name.size()); - int ntypesBefore = ReflexType::TypeSize(); - if (m_doChronoStat) { - m_chronoStatSvc->chronoStart("AthenaSealSvc::autoLoading"); - } - ta = m_dictLoaderSvc->load_type (name); - if (m_doChronoStat) { - m_chronoStatSvc->chronoStop("AthenaSealSvc::autoLoading"); - } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "Trying to 'Autoload' dictionary for class " - << name - << " ntypes before load " << ntypesBefore - << " ntypes loaded " << ReflexType::TypeSize() - ntypesBefore - << " top level class " << m_currentClassName << endmsg; - } - - - // If type is pointer, get the underlying type - if (ta.IsPointer()) ta = ta.ToType(); - - if (ta) { - newTypes.push_back(ta); - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << " name " << ta.Name()<< " " << endmsg; - } - else { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << " type not found " << taname - << " isnum: " << isnum(taname) << endmsg; - if (!(ignoreName(t) || ignoreName(ta) || isnum(taname) )) { - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) - << "****> Missing type for template argument " << taname - << " of template " << t.Name() - << endmsg; - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) - << "****> For the moment, we DO NOT return FAILURE - so expect abort if type is really missing!! " - << endmsg; - } - } - if (t.IsPointer()) { - if (msgLvl(MSG::WARNING)) msg(MSG::WARNING) << " type is pointer: " << t.Name() << endmsg; - } - - // Check for pointers and add in simple class -// msg(MSG::VERBOSE) << "Checking for pointer class: " -// <<((*it2)) << endmsg; -// std::string nm = (*it2); -// nm = nm.substr(0, nm.size() - 1); -// msg(MSG::VERBOSE) << " try class " << nm << " " << endmsg; - } - } - - return; -} - -//---------------------------------------------------------------------------- -bool -AthenaSealSvc::incorrect_guid (const ReflexType& t) const -{ - bool result = false; - - // Check that guid is ok - - // If class has GUID, try to look it up in this way - ReflexPropertyList plist = t.Properties(); - if (plist.HasProperty("ClassID")) { - const std::string clid = plist.PropertyAsString("ClassID"); - if (clid.size()) { - for (unsigned int i = 0; i < clid.size(); ++i) { - if ('a' <= clid[i] && clid[i] <= 'z') { - msg(MSG::ERROR) - << "-----> Found lower case letter in class guid: pos, value - " - << i << ", " << clid[i] << endmsg - << "-----> For class, guid " - << t.Name() << ", " << clid << endmsg - << "-----> The guid MUST be all upper case. " - << endmsg; - result = true; - } - } - } - else { - ATH_MSG_VERBOSE ("Class " << t.Name() << " has an empty CLID. "); - } - } - else { - ATH_MSG_VERBOSE ("Class " << t.Name() << " does NOT have CLID. "); - } - return result; -} - - -//---------------------------------------------------------------------------- -bool -AthenaSealSvc::missing_member_types (const ReflexType& t) const -{ - bool result = false; - int nmembers = 0; - - // check that types of the fields are defined - if (t.DataMemberSize()) { - ATH_MSG_DEBUG ("Checking members of type " << t.Name() << " for " - << t.DataMemberSize() << " members:"); - } - - bool first = true; - for (size_t i = 0; i < t.DataMemberSize(); ++i) { - ReflexMember m = t.DataMemberAt(i); - if (m) { - ReflexType t1 = m.DeclaringType (); - ReflexType t2 = m.TypeOf (); - bool transient = m.IsTransient(); - bool is_static = m.IsStatic(); - bool is_enum = m.IsEnum(); - //MN: protect against anonymous enums - if( t2.Name().find("(anonymous)") != std::string::npos ) - is_enum = true; - - msg(MSG::VERBOSE) << "Checking member: " << m.Name() << " of type " << t1.Name(7) << "::" << t2.Name(7) << endmsg; - msg(MSG::VERBOSE) << "Trans:" << transient << " Static:" << is_static << " Enum:" << is_enum << " Const:" << m.IsConstant() << endmsg; - if (!t2 && !member_is_ok(t1.Name(), m.Name()) - && !transient && !is_static && !is_enum ) { - // Missing type, try to load it - // We ignore transient types and some special members - std::string name = t2.Name(7); - if ('*' == name[name.size()-1]) name = name.substr(0, name.size()-1); - if ("const " == name.substr(0, 6)) name = name.substr(6, name.size()); - ATH_MSG_VERBOSE (' '); - int ntypesBefore = ReflexType::TypeSize(); - if (m_doChronoStat) { - m_chronoStatSvc->chronoStart("AthenaSealSvc::autoLoading"); - } - t2 = m_dictLoaderSvc->load_type (name); - if (m_doChronoStat) { - m_chronoStatSvc->chronoStop("AthenaSealSvc::autoLoading"); - } - ATH_MSG_VERBOSE ( "Trying to 'Autoload' dictionary for class " - << name - << " ntypes before load " << ntypesBefore - << " ntypes loaded " - << ReflexType::TypeSize() - ntypesBefore - << " top level class " << m_currentClassName); - } - - if (t2) { - nmembers++; - } - else { - // 0 => possible error: - // Know exceptions: - if (member_is_ok(t1.Name(), m.Name()) || transient || is_static || is_enum ) { - if (first) { - first = false; - ATH_MSG_VERBOSE (' '); - } - if (transient) { - ATH_MSG_VERBOSE ("****> IGNORING missing type for transient member " - << " " << m.Name()); - } - else if (is_static) { - ATH_MSG_VERBOSE ("****> IGNORING missing type for static member " - << " " << m.Name()); - } - else { - ATH_MSG_VERBOSE ("****> IGNORING missing type for " << t1.Name() - << " " << m.Name()); - } - } - else { - if (first) { - first = false; - ATH_MSG_VERBOSE (' '); - } - ATH_MSG_VERBOSE ("****> Missing type " - << m.TypeOf().Name(7) - << " for " << t1.Name() - << "::" << m.Name()); - result = true; - } - } - } - } - if (!result) { - if (t.DataMemberSize()) - ATH_MSG_VERBOSE (" ok - isComplete " << t.IsComplete()); - } - - // print out class info - if(nmembers && msgLvl(MSG::VERBOSE)) show_type(t); - return (result); -} - - - -//---------------------------------------------------------------------------- -StatusCode AthenaSealSvc::checkClass(const std::string& typeName) const -{ - //msg().setLevel(MSG::VERBOSE); - - if(!m_checkDictionary) { - ATH_MSG_VERBOSE - ("checkClass - AthenaSealSvc.CheckDictionary is set to false. " - "No checks done for class: " << typeName); - return (StatusCode::SUCCESS); - } - - if (m_doChronoStat) { - m_chronoStatSvc->chronoStart("AthenaSealSvc::checkClass"); - } - - ATH_MSG_DEBUG - ("checkClass - Number of types on entry " << ReflexType::TypeSize()); - - ReflexType t = mig56_ReflexTypeByName(typeName); - - // Set current class name - m_currentClassName = typeName; - if (!t) { - int ntypesBefore = ReflexType::TypeSize(); - if (m_doChronoStat) { - m_chronoStatSvc->chronoStart("AthenaSealSvc::autoLoading"); - } - if (!m_dictLoaderSvc->load_type (typeName)) { - ATH_MSG_DEBUG ("problem loading type [" << typeName << "] !"); - } - if (m_doChronoStat) { - m_chronoStatSvc->chronoStop("AthenaSealSvc::autoLoading"); - } - t = mig56_ReflexTypeByName(typeName); - ATH_MSG_VERBOSE - ("Loaded dictionary for class " << typeName - << " ntypes before load " << ntypesBefore - << " ntypes loaded " << ReflexType::TypeSize() - ntypesBefore); - } - - - // typeName comes from typeinfo and may not be the same as the - // name of the class in the reflection dictionary, e.g. for - // maps. Skip checks if class not found. - if (!t) { - ATH_MSG_WARNING - ("checkClass - could NOT find reflection class for type " - << typeName << " => NO CHECKS DONE "); - - ReflexScope s = mig56_ReflexScopeByName(typeName); - if (s) { - ATH_MSG_DEBUG ("checkClass - found scope " << s.Name()); - } - else { - ATH_MSG_DEBUG ("checkClass - unable to find scope "); - } - - return (StatusCode::SUCCESS); - } - - ATH_MSG_DEBUG ("checkClass - found type " << t.Name()); - - // We require class c to have a GUID - assume that it it a data - // object. (Otherwise, add and argument to the method call) - ReflexPropertyList plist = t.Properties(); - const std::string clid = plist.PropertyAsString("ClassID"); - ATH_MSG_DEBUG ("checkClass - found ClassID " << clid); - if (!clid.size()) { - ATH_MSG_ERROR - ("-----> MISSING GUID (id in selection file) for class " << t.Name() - << endmsg - << "-----> This is needed for ALL DataObjects "); - return (StatusCode::FAILURE); - } - - std::vector<ReflexType> toCheck; - std::vector<ReflexType> toCheckAll; - std::vector<ReflexType>::const_iterator it; - - std::map<std::string, ReflexType> checked; - std::string cn = t.Name(); - checked[cn] = t; - if(cn.find('*') == std::string::npos) - m_checkedClasses.insert(cn); - - // Print names for verbose -// ATH_MSG_VERBOSE ("Found classes"); -// std::vector <const reflect::Class*> myvec = reflect::Class::forNames (); -// for (it = myvec.begin(); it != myvec.end (); ++it) { -// const reflect::Class* c = *it; -// if (c) ATH_MSG_VERBOSE (c->fullName()); -// } - - - bool continueCheck = true; - - do { - if( !ignoreName(t.Name()) ) { - if(missingTypes(t)) return (StatusCode::FAILURE); - - ATH_MSG_VERBOSE ("checkClass - check for class " << t.Name() << " ok"); - // Collect the extra types for this class - fields, base - // classes, template args, etc. - find_extra_types (t, toCheck); - - // Select the new classes to be checked - for (it = toCheck.begin(); it != toCheck.end(); ++it) { - if (checked.find((*it).Name()) == checked.end()) { - toCheckAll.push_back((*it)); - cn = (*it).Name(); - checked[cn] = (*it); - if(cn.find('*') == std::string::npos) - m_checkedClasses.insert(cn); -// ATH_MSG_VERBOSE ("checkClass - added class " << (*it)->fullName()); - } - } - toCheck.clear(); - } - - if (toCheckAll.size() > 0) { - // Select the next one to check and save in set - t = toCheckAll[0]; - //checked.insert(c); - //checked[c->fullName()] = c; - } - else { - continueCheck = false; - } - if (toCheckAll.size() > 1) { - // Remove the first element - toCheck = toCheckAll; - toCheckAll.clear(); - it = toCheck.begin(); - ++it; - for (; it != toCheck.end(); ++it )toCheckAll.push_back((*it)); - // Clear vec for collecting new classes to check - toCheck.clear(); - } - else { - toCheckAll.clear(); - } - - - } while (continueCheck); - - ATH_MSG_DEBUG - ("checkClass - NO MISSING FIELDS!!!" - << endmsg - << "checkClass - Number of types on exit " << ReflexType::TypeSize()); - -// ATH_MSG_VERBOSE ("Classes checked: "); - -// std::map<std::string, const reflect::Class*>::const_iterator it1 = checked.begin(); -// std::map<std::string, const reflect::Class*>::const_iterator last1 = checked.end(); -// for (; it1 != last1; ++it1) { -// ATH_MSG_VERBOSE ((*it1).first); -// } - - if (m_doChronoStat) { - m_chronoStatSvc->chronoStop("AthenaSealSvc::checkClass"); - } - - return (StatusCode::SUCCESS); - -} - - -//---------------------------------------------------------------------------- -StatusCode -AthenaSealSvc::loadDictFiller(const std::string& dictName) const -{ - unsigned int typesBefore = ReflexType::TypeSize(); - - System::ImageHandle h; - long rc = System::loadDynamicLib (dictName, &h); - - ATH_MSG_DEBUG - ("loadDictFiller - Ntypes before " << typesBefore - << " types added " << (ReflexType::TypeSize() - typesBefore) - << " dictionary filler name:" << dictName); - - if (1 == rc) { - ATH_MSG_VERBOSE (" Loaded dict filler " << dictName); - } - else { - ATH_MSG_ERROR - (" Unable to load " << dictName << " rc=" << rc - << " h=" << h << " errno=" << errno); - return (StatusCode::FAILURE); - } - return (StatusCode::SUCCESS); -} - -//---------------------------------------------------------------------------- -void AthenaSealSvc::checkDictionary() const -{ - ATH_MSG_DEBUG - ("Checking the completeness of the dictionary for all classes"); - bool isMissingTypes = false; - - ATH_MSG_VERBOSE ("Number of types: " << ReflexType::TypeSize()); - - for (size_t i = 0; i < ReflexType::TypeSize(); ++i) { - ReflexType t = ReflexType::TypeAt(i); - if(t && t.IsClass()) { - ATH_MSG_DEBUG ("Checking type " << t.Name() << " number: " << i); -// if (missingTypes(t)) isMissingTypes = true; - - // Build up full type name - std::string name = t.Name(); - bool finished = false; - ReflexScope s = t.DeclaringScope(); - do { - if (s) { -// ATH_MSG_DEBUG ("checkDictionary - found scope " << s.Name()); - if (s.IsTopScope()) { - finished = true; - } - else { - name = s.Name() + "::" + name; - s = s.DeclaringScope(); - } - } - else { - finished = true; - } - } while (!finished); - - ReflexType t1 = mig56_ReflexTypeByName(name); - if(t1) { - ATH_MSG_DEBUG ("Found type: " << t1.Name()); - } - ATH_MSG_DEBUG ("checkDictionary - full scope name " << name); - - //if (checkClass(t.Name()) != StatusCode::SUCCESS) isMissingTypes = true; - if (checkClass(name) != StatusCode::SUCCESS) isMissingTypes = true; - - } - //ATH_MSG_VERBOSE ("Checking type number: " << i); - } - - if (isMissingTypes) { - - ATH_MSG_DEBUG ("-----> Missing fields. Please check output and complete selection file!!"); - - } - else { - ATH_MSG_DEBUG ("-----> NO Missing fields!!"); - } -} - -//---------------------------------------------------------------------------- -bool AthenaSealSvc::ignoreName(const ReflexType& t) const -{ -// if (t) { - ATH_MSG_VERBOSE ("Check if class should be ignored: " << t.Name()); -// } -// else { -// return (false); -// } - // Now try and match - for (unsigned int i = 0, iMax = m_ignoreNames.value().size(); i!=iMax; i++) { - const std::string& name = m_ignoreNames.value()[i]; - if(t.Name().find(name) != std::string::npos) { - ATH_MSG_VERBOSE - ("Warning: Ignoring checks for class name: " << t.Name()); - return (true); - } - - } - ATH_MSG_VERBOSE ("Not ignored."); - return (false); -} - -//---------------------------------------------------------------------------- -bool AthenaSealSvc::ignoreName(const std::string& typeName) const -{ - if (typeName.size()) { - ATH_MSG_VERBOSE ("Check if class should be ignored: " << typeName); - } - else { - return (false); - } - // Now try and match - for (unsigned int i = 0, iMax = m_ignoreNames.value().size(); i!=iMax; i++) { - const std::string& ignoreName = m_ignoreNames.value()[i]; - if(typeName.find(ignoreName) != std::string::npos) { - ATH_MSG_VERBOSE - ("Warning: Ignoring checks for class name: " << typeName); - return (true); - } - - } - ATH_MSG_VERBOSE ("Not ignored."); - return (false); -} - - -//---------------------------------------------------------------------------- -bool -AthenaSealSvc::missingTypes(const ReflexType& t) const -{ - bool isMissingTypes = false; - - // Check for missing class name - NOT NORMAL!!! - if (t) { - if (t.Name() == "") { - ATH_MSG_DEBUG ("missingTypes: empty Type name - NOT NORMAL "); - return (false); - } - } - else { - // Missing class object, return true - return (true); - } - - - //ATH_MSG_DEBUG ("missingTypes: check type " << t.Name() << " isComplete " << t.IsComplete()); - - - // Check if we should ignore this class - if (ignoreName(t)) return (false); - - - // Check c and collect additional classes to check - if (missing_member_types (t)) isMissingTypes = true; - - - // Now check base classes - if (t.IsClass()) { - if(t.BaseSize()) { - ATH_MSG_VERBOSE (" Loop over superclass names "); - } - for (size_t i = 0; i < t.BaseSize(); ++i) { - ReflexBase b = t.BaseAt(i); - if (b) { - std::string bname = b.Name(); - // Remove stl container base classes - if (bname.find("_base<") == std::string::npos) - { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << " found name: " << bname; - ReflexType tb = b.ToType(); - if (tb) { - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << ". Type IS defined in dictionary. "; - } - else { - if (!ignoreName(bname)) { - if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) - << endmsg - << " ****> Missing base class not defined in dictionary!! " - << endmsg - << " ****> Looking for base class " - << bname << " of type " << t.Name() - << endmsg; - isMissingTypes = true; - } - } - } - } - if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << endmsg; - } - } - - // Now check the guid - if (incorrect_guid (t)) isMissingTypes = true; - - return (isMissingTypes); -} - - -//---------------------------------------------------------------------------- -StatusCode AthenaSealSvc::finalize() -{ - ATH_MSG_DEBUG ("finalize() in AthenaSealSvc"); - - if (msgLvl(MSG::VERBOSE)) { - ATH_MSG_VERBOSE ("Classes checked: "); - - std::set<std::string>::const_iterator it = m_checkedClasses.begin(); - std::set<std::string>::const_iterator last = m_checkedClasses.end(); - for (; it != last; ++it) { - ATH_MSG_VERBOSE ((*it)); - } - } - return StatusCode::SUCCESS; -} - - -void AthenaSealSvc::setDefaultDictNames() -{ - std::vector<std::string> dictNames; - m_dictionaryNames.set( dictNames ); - return; -} - -void AthenaSealSvc::setDefaultIgnoreNames() -{ - std::vector<std::string> ignoreNames; - ignoreNames.reserve( 100 ); - - /// Gaudi - ignoreNames.push_back( "Gaudi" ); - ignoreNames.push_back( "GaudiPython::Interface" ); - ignoreNames.push_back( "GaudiPython::Helper" ); - ignoreNames.push_back( "FactoryTable" ); - ignoreNames.push_back( "IInterface" ); - ignoreNames.push_back( "IFactory" ); - ignoreNames.push_back( "IAlgFactory" ); - ignoreNames.push_back( "ISvcFactory" ); - ignoreNames.push_back( "IToolFactory" ); - ignoreNames.push_back( "InterfaceID" ); - ignoreNames.push_back( "StatusCode" ); - ignoreNames.push_back( "IAppMgrUI" ); - ignoreNames.push_back( "IProperty" ); - ignoreNames.push_back( "Property" ); - ignoreNames.push_back( "std::vector<Property*>" ); - ignoreNames.push_back( "std::vector<const Property*>" ); - ignoreNames.push_back( "std::list<IAlgorithm*>" ); - ignoreNames.push_back( "std::list<IService*>" ); - ignoreNames.push_back( "std::list<const IFactory*>" ); - ignoreNames.push_back( "std::vector<IRegistry*>" ); - ignoreNames.push_back( "SimpleProperty" ); - ignoreNames.push_back( "SimplePropertyRef" ); - ignoreNames.push_back( "IService" ); - ignoreNames.push_back( "IAlgorithm" ); - ignoreNames.push_back( "ISvcManager" ); - ignoreNames.push_back( "IAlgManager" ); - ignoreNames.push_back( "IJobOptionsSvc" ); - ignoreNames.push_back( "ISvcLocator" ); - ignoreNames.push_back( "IEventProcessor" ); - ignoreNames.push_back( "IDataProviderSvc" ); - ignoreNames.push_back( "IDataManagerSvc" ); - ignoreNames.push_back( "IRegistry" ); - ignoreNames.push_back( "ContainedObject" ); - ignoreNames.push_back( "std::vector<const ContainedObject*>" ); - ignoreNames.push_back( "DataObject" ); - ignoreNames.push_back( "IHistogramSvc" ); - ignoreNames.push_back( "AIDA::I" ); - ignoreNames.push_back( "Algorithm" ); - ignoreNames.push_back( "Service" ); - ignoreNames.push_back( "GaudiPython::PyAlgorithm" ); - ignoreNames.push_back( "GaudiPython::PyAlgorithmWrap" ); - ignoreNames.push_back( "IParticlePropertySvc" ); - ignoreNames.push_back( "ParticleProperty" ); - ignoreNames.push_back( "StoreGateSvc" ); - ignoreNames.push_back( "IStoragePolicy" ); - - /// POOL - StorageSvc/DbArray.h - ignoreNames.push_back( "CharDbArray" ); - ignoreNames.push_back( "DoubleDbArray" ); - ignoreNames.push_back( "FloatDbArray" ); - ignoreNames.push_back( "IntDbArray" ); - ignoreNames.push_back( "LongDbArray" ); - ignoreNames.push_back( "ShortDbArray" ); - - - /// Dicts added by athena.py - ignoreNames.push_back( "AthenaEventLoopMgr" ); - ignoreNames.push_back( "MinimalEventLoopMgr" ); - ignoreNames.push_back( "PyAthenaEventLoopMgr" ); - ignoreNames.push_back( "NTuple::Directory" ); - ignoreNames.push_back( "NTuple::File " ); - ignoreNames.push_back( "NTuple::Tuple" ); - ignoreNames.push_back( "INTuple" ); - ignoreNames.push_back( "NTuple::Tuple" ); - - /// Ignore extra template args - ignoreNames.push_back( "greater<int>" ); - ignoreNames.push_back( "allocator<" ); - - // MN: adding stuff for ROOT6 - ignoreNames.push_back( "string" ); - - m_ignoreNames.set( ignoreNames ); - return; -} - -void AthenaSealSvc::setDefaultIgnoreDicts() -{ - std::vector<std::string> ignoreDicts; - ignoreDicts.reserve( 5 ); - - ignoreDicts.push_back( "libSealCLHEPDict" ); - - m_ignoreDicts.set( ignoreDicts ); - return; -} diff --git a/Control/AthenaServices/src/AthenaSealSvc.h b/Control/AthenaServices/src/AthenaSealSvc.h deleted file mode 100644 index c7df541d252a..000000000000 --- a/Control/AthenaServices/src/AthenaSealSvc.h +++ /dev/null @@ -1,157 +0,0 @@ -// this is -*- C++ -*- - -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef ATHENASERVICES_ATHENASEALSVC_H -#define ATHENASERVICES_ATHENASEALSVC_H 1 - -/** - * @file AthenaSealSvc.h - * - * @brief AthenaSealSvc is a Gaudi service for loading and checking - * reflex dictionaries - * - * @author RD Schaffer <R.D.Schaffer@cern.ch> - * - * $Id: AthenaSealSvc.h,v 1.2 2008-12-10 13:37:27 dquarrie Exp $ - */ - - -#include "AthenaBaseComps/AthService.h" -#include "AthenaKernel/IAthenaSealSvc.h" -#include "AthenaKernel/IDictLoaderSvc.h" -#include "GaudiKernel/ServiceHandle.h" -#include <vector> -#include <set> -#include <string> - -#include "DataModelRoot/RootType.h" -typedef RootBase ReflexBase; -typedef RootDataMember ReflexMember; -typedef RootPropertyList ReflexPropertyList; -typedef RootScope ReflexScope; -typedef RootType ReflexType; - - -template <class TYPE> class SvcFactory; - -class MsgStream; -class IChronoStatSvc; - -/** - ** @class AthenaSealSvc - ** - ** @brief AthenaSealSvc is a Gaudi service for loading and checking - ** Reflex dictionaries - ** - ** This Athena service check "completeness" of class definitions in - ** Reflex dictionaries. - ** - ** The "completeness" check for classes makes sure that the types of all - ** attributes of a class have their corresponding types defined. The - ** checks are automatically done for the classes being written or read - ** in. The checking is controled by a jobOption flag, which by default - ** is True: - ** - ** <pre> - ** # Check the dictionary in memory for completeness (set to True of False) - ** AthenaSealSvc.CheckDictionary = True; - ** </pre> - ** - ** A list of class names to be ignored during the completeness check may - ** be added to AthenaSealSvcIgnore_joboptions.py. - ** - **/ - -class AthenaSealSvc - : virtual public IAthenaSealSvc, - public AthService -{ - - -public: - - AthenaSealSvc (const std::string& name, ISvcLocator* pSvcLocator); - ~AthenaSealSvc(); - - /// Gaudi Service interface method implementatios: - StatusCode initialize(); - StatusCode finalize(); - StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface ); - - /** Check dictionary for a class - - dictionary library containing class will automatically be loaded if needed - @param typeName - type/name of class to check - */ - virtual StatusCode checkClass(const std::string& typeName) const; - - - /** Dynamically load a dictionary filler - @param dictName - name of dict filler lib, e.g. MyClassesDict - */ - virtual StatusCode loadDictFiller(const std::string& dictName) const; - - - -private: - - // initialise seal components - void initSeal(); // MN: missing ?? - - // check dictionary - void checkDictionary() const; - bool missingTypes(const ReflexType& type) const; - bool ignoreName(const ReflexType& type) const; - bool ignoreName(const std::string& name) const; - - StatusCode loadClasses() const; - const ReflexType loadClass(const std::string& name ) const; - const ReflexType loadClassAndDependents(const std::string& name ) const; - - void show_member (const ReflexMember& m) const; - void show_type (const ReflexType& t) const; - bool member_is_ok(const std::string& className, - const std::string& memberName) const; - void find_extra_types (const ReflexType& t, - std::vector<ReflexType>& newTypes) const; - bool incorrect_guid (const ReflexType& t) const; - bool missing_member_types (const ReflexType& t) const; - - /// Helper method to setup the default dicts list - void setDefaultDictNames(); - - /// Helper method to setup the default ignore-name list - void setDefaultIgnoreNames(); - - /// Helper method to setup the default ignore-dict list - void setDefaultIgnoreDicts(); - - AthenaSealSvc(const AthenaSealSvc& rhs); - AthenaSealSvc& operator=(const AthenaSealSvc& rhs); - - StringArrayProperty m_dictionaryNames; - StringArrayProperty m_ignoreNames; - StringArrayProperty m_ignoreDicts; - BooleanProperty m_checkDictAtInit; - BooleanProperty m_checkDictionary; - BooleanProperty m_loadAllDicts; - mutable std::set<std::string> m_checkedClasses; - typedef ServiceHandle<IChronoStatSvc> IChronoStatSvc_t; - IChronoStatSvc_t m_chronoStatSvc; - typedef ServiceHandle<IDictLoaderSvc> IDictLoaderSvc_t; - /** @brief a handle to the autoloader of reflex dictionaries - */ - IDictLoaderSvc_t m_dictLoaderSvc; - /// bool to activate the chrono stats, depending on the - /// m_skipFirstChronoCommit data member - bool m_doChronoStat; - mutable std::string m_currentClassName; -}; - -#endif // !ATHENASERVICES_ATHENASEALSVC_H - - - - diff --git a/Control/AthenaServices/src/components/AthenaServices_entries.cxx b/Control/AthenaServices/src/components/AthenaServices_entries.cxx index 465609cb5a92..0b26e4b73b8e 100644 --- a/Control/AthenaServices/src/components/AthenaServices_entries.cxx +++ b/Control/AthenaServices/src/components/AthenaServices_entries.cxx @@ -14,7 +14,6 @@ #include "../JobIDSvc.h" #include "../CoreDumpSvc.h" #include "../AthDictLoaderSvc.h" -#include "../AthenaSealSvc.h" #include "../PageAccessControlSvc.h" #include "../DecisionSvc.h" #include "../ItemListSvc.h" @@ -55,7 +54,6 @@ DECLARE_COMPONENT( JobIDSvc ) DECLARE_COMPONENT( CoreDumpSvc ) DECLARE_COMPONENT( PageAccessControlSvc ) DECLARE_COMPONENT( AthDictLoaderSvc ) -DECLARE_COMPONENT( AthenaSealSvc ) DECLARE_COMPONENT( DecisionSvc ) DECLARE_COMPONENT( ItemListSvc ) DECLARE_COMPONENT( AthenaSummarySvc ) diff --git a/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_baseline_bench.py b/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_baseline_bench.py index 40df29e5c38a..7dd49721e1f6 100755 --- a/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_baseline_bench.py +++ b/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_baseline_bench.py @@ -76,8 +76,6 @@ outStream.OutputFile = OUTPUT ## somehow better configure the AthenaPoolCnvSvc for our small ## persistency output job -svcMgr += CfgMgr.AthenaSealSvc( OutputLevel = ERROR ) - svcMgr += CfgMgr.MessageSvc( defaultLimit = 4000000, OutputLevel = ERROR ) diff --git a/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_truthjets.py b/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_truthjets.py index 6336b2c9b841..a8d92c095101 100755 --- a/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_truthjets.py +++ b/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_truthjets.py @@ -99,9 +99,6 @@ if not 'OUTPUT' in dir(): pass outStream.OutputFile = OUTPUT -from AthenaServices.AthenaServicesConf import AthenaSealSvc -svcMgr += AthenaSealSvc( OutputLevel = ERROR ) - from GaudiSvc.GaudiSvcConf import MessageSvc svcMgr += MessageSvc( defaultLimit = 4000000 ) svcMgr.MessageSvc.OutputLevel = ERROR diff --git a/Database/AthenaRoot/AthenaRootComps/python/AthenaRootBase.py b/Database/AthenaRoot/AthenaRootComps/python/AthenaRootBase.py index 5e29e105bfdc..f95391bd7da8 100644 --- a/Database/AthenaRoot/AthenaRootComps/python/AthenaRootBase.py +++ b/Database/AthenaRoot/AthenaRootComps/python/AthenaRootBase.py @@ -30,11 +30,6 @@ def _loadBasicAthenaRoot(): if not hasattr (svcMgr, 'ProxyProviderSvc'): svcMgr += CfgMgr.ProxyProviderSvc() - # - # Make sure AthenaSealSvc is loaded for dict check - svcMgr += CfgMgr.AthenaSealSvc() - - # # Make sure AthenaPoolServices is loaded for custom streamer try: svcMgr += CfgMgr.AthenaRootStreamerSvc() @@ -42,13 +37,6 @@ def _loadBasicAthenaRoot(): msg.info("could not load AthenaRootStreamerSvc") pass - # Load streamer allowing conversion of old CLHEP classes - try: - import AtlasSealCLHEP.OldCLHEPStreamers - except ImportError: - msg.info("could not load AtlasSealCLHEP") - pass - if not hasattr (svcMgr, 'InputMetaDataStore'): svcMgr += CfgMgr.StoreGateSvc ("InputMetaDataStore") pass diff --git a/Database/AtlasSealCLHEP/python/OldCLHEPStreamers.py b/Database/AtlasSealCLHEP/python/OldCLHEPStreamers.py index ffeff73ae0b7..1b0b228a2e7c 100755 --- a/Database/AtlasSealCLHEP/python/OldCLHEPStreamers.py +++ b/Database/AtlasSealCLHEP/python/OldCLHEPStreamers.py @@ -13,14 +13,6 @@ def loadOldCLHEPStreamers(): msg = logging.getLogger( 'loadOldCLHEPStreamers' ) msg.debug( "Loading Old CLHEP streamers..." ) - # Seal services: for loading dictionaries - if not hasattr (svcMgr, 'AthenaSealSvc'): - svcMgr += CfgMgr.AthenaSealSvc() - - # Reguest loading CLHEP dictionary - svcMgr.AthenaSealSvc.DictNames += [ "AtlasSealCLHEPDict" ] - - # ROOT streaming service if not hasattr (svcMgr, 'AthenaRootStreamerSvc'): svcMgr += CfgMgr.AthenaRootStreamerSvc() diff --git a/DetectorDescription/GeoModel/GeoModelStandalone/DumpGeo/share/dump-geo.py b/DetectorDescription/GeoModel/GeoModelStandalone/DumpGeo/share/dump-geo.py index c782c67db42f..c80d81024135 100644 --- a/DetectorDescription/GeoModel/GeoModelStandalone/DumpGeo/share/dump-geo.py +++ b/DetectorDescription/GeoModel/GeoModelStandalone/DumpGeo/share/dump-geo.py @@ -387,7 +387,6 @@ else: #watch LAr HV: if ( vp1LarHvData ): from time import time - svcMgr.AthenaSealSvc.CheckDictionary = TRUE svcMgr.EventSelector.InitialTimeStamp = int (time()) svcMgr.EventSelector.TimeStampInterval = 1 from IOVDbSvc.CondDB import conddb diff --git a/Event/xAOD/xAODCaloEventCnv/share/ClusterCreator_jobOptions.py b/Event/xAOD/xAODCaloEventCnv/share/ClusterCreator_jobOptions.py index 62e2a0a05c1e..1c922bfed531 100644 --- a/Event/xAOD/xAODCaloEventCnv/share/ClusterCreator_jobOptions.py +++ b/Event/xAOD/xAODCaloEventCnv/share/ClusterCreator_jobOptions.py @@ -46,8 +46,6 @@ theApp.EvtMax = 5 ServiceMgr.MessageSvc.OutputLevel = INFO ServiceMgr.MessageSvc.defaultLimit = 1000000 -#ServiceMgr.AthenaSealSvc.OutputLevel = VERBOSE - #ServiceMgr.StoreGateSvc.Dump=True from AthenaServices.AthenaServicesConf import AthenaEventLoopMgr ServiceMgr += AthenaEventLoopMgr(EventPrintoutInterval = 100) diff --git a/Event/xAOD/xAODCaloEventCnv/share/ClusterDumper_jobOptions.py b/Event/xAOD/xAODCaloEventCnv/share/ClusterDumper_jobOptions.py index 63384e9f91bd..85b74aa64f3b 100644 --- a/Event/xAOD/xAODCaloEventCnv/share/ClusterDumper_jobOptions.py +++ b/Event/xAOD/xAODCaloEventCnv/share/ClusterDumper_jobOptions.py @@ -24,8 +24,6 @@ theApp.EvtMax = 5 ServiceMgr.MessageSvc.OutputLevel = INFO ServiceMgr.MessageSvc.defaultLimit = 1000000 -ServiceMgr.AthenaSealSvc.OutputLevel = VERBOSE - ServiceMgr.StoreGateSvc.Dump=True from AthenaServices.AthenaServicesConf import AthenaEventLoopMgr ServiceMgr += AthenaEventLoopMgr(EventPrintoutInterval = 1) diff --git a/Event/xAOD/xAODJetCnv/share/JetCreator_jobOptions.py b/Event/xAOD/xAODJetCnv/share/JetCreator_jobOptions.py index f9bcb9a6840c..35a49ad24ad5 100644 --- a/Event/xAOD/xAODJetCnv/share/JetCreator_jobOptions.py +++ b/Event/xAOD/xAODJetCnv/share/JetCreator_jobOptions.py @@ -57,8 +57,6 @@ theApp.EvtMax = 5 ServiceMgr.MessageSvc.OutputLevel = INFO ServiceMgr.MessageSvc.defaultLimit = 1000000 -#ServiceMgr.AthenaSealSvc.OutputLevel = VERBOSE - #ServiceMgr.StoreGateSvc.Dump=True from AthenaServices.AthenaServicesConf import AthenaEventLoopMgr ServiceMgr += AthenaEventLoopMgr(EventPrintoutInterval = 100) diff --git a/Event/xAOD/xAODMuonCnv/share/xAODMuonCnv_jobOptions.py b/Event/xAOD/xAODMuonCnv/share/xAODMuonCnv_jobOptions.py index f277fe76387b..4310cf46bc5e 100755 --- a/Event/xAOD/xAODMuonCnv/share/xAODMuonCnv_jobOptions.py +++ b/Event/xAOD/xAODMuonCnv/share/xAODMuonCnv_jobOptions.py @@ -45,7 +45,6 @@ from AthenaCommon.AppMgr import theApp theApp.EvtMax = -1 ServiceMgr.MessageSvc.OutputLevel = INFO ServiceMgr.MessageSvc.defaultLimit = 1000000 -# ServiceMgr.AthenaSealSvc.OutputLevel = VERBOSE #from VP1Algs.VP1AlgsConf import VP1Alg #theJob += VP1Alg() diff --git a/Event/xAOD/xAODTauCnv/share/xAODTauCnv_jobOptions.py b/Event/xAOD/xAODTauCnv/share/xAODTauCnv_jobOptions.py index 65c858fd5571..6b8f5e8ced7f 100644 --- a/Event/xAOD/xAODTauCnv/share/xAODTauCnv_jobOptions.py +++ b/Event/xAOD/xAODTauCnv/share/xAODTauCnv_jobOptions.py @@ -32,7 +32,6 @@ ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [ # Force POOL to just simply use the StoreGate keys as branch names: ServiceMgr.AthenaPoolCnvSvc.SubLevelBranchName = "<key>" -#ServiceMgr.AthenaSealSvc.OutputLevel = VERBOSE # Do some additional tweaking: from AthenaCommon.AppMgr import theApp diff --git a/Event/xAOD/xAODTruthCnv/share/HepMCTruthReader_jobOptions.py b/Event/xAOD/xAODTruthCnv/share/HepMCTruthReader_jobOptions.py index fe5595ea3d67..15f73b699e14 100644 --- a/Event/xAOD/xAODTruthCnv/share/HepMCTruthReader_jobOptions.py +++ b/Event/xAOD/xAODTruthCnv/share/HepMCTruthReader_jobOptions.py @@ -17,4 +17,3 @@ from AthenaCommon.AppMgr import theApp theApp.EvtMax = -1 ServiceMgr.MessageSvc.OutputLevel = INFO ServiceMgr.MessageSvc.defaultLimit = 1000000 -ServiceMgr.AthenaSealSvc.OutputLevel = INFO diff --git a/Event/xAOD/xAODTruthCnv/share/xAODTruthCnv_jobOptions.py b/Event/xAOD/xAODTruthCnv/share/xAODTruthCnv_jobOptions.py index 93fecb48cef0..266294c69c7d 100644 --- a/Event/xAOD/xAODTruthCnv/share/xAODTruthCnv_jobOptions.py +++ b/Event/xAOD/xAODTruthCnv/share/xAODTruthCnv_jobOptions.py @@ -55,4 +55,3 @@ from AthenaCommon.AppMgr import theApp theApp.EvtMax = -1 ServiceMgr.MessageSvc.OutputLevel = INFO ServiceMgr.MessageSvc.defaultLimit = 1000000 -ServiceMgr.AthenaSealSvc.OutputLevel = INFO diff --git a/Event/xAOD/xAODTruthCnv/share/xAODTruthReader_jobOptions.py b/Event/xAOD/xAODTruthCnv/share/xAODTruthReader_jobOptions.py index a52f8d077145..df41cea9e194 100644 --- a/Event/xAOD/xAODTruthCnv/share/xAODTruthReader_jobOptions.py +++ b/Event/xAOD/xAODTruthCnv/share/xAODTruthReader_jobOptions.py @@ -16,4 +16,3 @@ from AthenaCommon.AppMgr import theApp theApp.EvtMax = -1 ServiceMgr.MessageSvc.OutputLevel = INFO ServiceMgr.MessageSvc.defaultLimit = 1000000 -ServiceMgr.AthenaSealSvc.OutputLevel = INFO diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/share/AFP_LocReco_joboption_standalone.py b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/share/AFP_LocReco_joboption_standalone.py index 88c42c9b97a8..2c3d5f339897 100644 --- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/share/AFP_LocReco_joboption_standalone.py +++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/share/AFP_LocReco_joboption_standalone.py @@ -17,16 +17,6 @@ print strOutputRootFile include( "AthenaPoolCnvSvc/ReadAthenaPool_jobOptions.py" ) ServiceMgr.EventSelector.InputCollections = [strInputRootCollection] -#-------------------------------------------------------------- -# JobOptions for the loading of the AthenaSealSvc -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - -# Add in dictionary name: -AthenaSealSvc = Service( "AthenaSealSvc" ) - -# Check the dictionary in memory for completeness -AthenaSealSvc.CheckDictionary = TRUE - #-------------------------------------------------------------- # Event related parameters #theApp.EvtMax = jobOptionValues.iEventCountLocRecCorr diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/share/jobOption_Alfa_GloRec.py b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/share/jobOption_Alfa_GloRec.py index cec2da9204a6..18228a8a972b 100644 --- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/share/jobOption_Alfa_GloRec.py +++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/share/jobOption_Alfa_GloRec.py @@ -16,16 +16,6 @@ print strOutputRootFile include( "AthenaPoolCnvSvc/ReadAthenaPool_jobOptions.py" ) ServiceMgr.EventSelector.InputCollections = [strInputRootCollection] -#-------------------------------------------------------------- -# JobOptions for the loading of the AthenaSealSvc -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - -# Add in dictionary name: -AthenaSealSvc = Service( "AthenaSealSvc" ) - -# Check the dictionary in memory for completeness -AthenaSealSvc.CheckDictionary = TRUE - #-------------------------------------------------------------- # Event related parameters #theApp.EvtMax = jobOptionValues.iEventCountLocRecCorr diff --git a/Generators/EvtGen_i/share/BsJpsiphi.py b/Generators/EvtGen_i/share/BsJpsiphi.py index ad47e8afc187..39e2d49f1ada 100644 --- a/Generators/EvtGen_i/share/BsJpsiphi.py +++ b/Generators/EvtGen_i/share/BsJpsiphi.py @@ -145,10 +145,6 @@ Stream1.OutputFile = "pythiaB.pool.root" Stream1.ItemList += [ "2101#*", "133273#*" ] Stream1.AcceptAlgs = ["BSignalFilter"] -include("AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = TRUE - - #============================================================== # # End of job options file diff --git a/Generators/EvtGen_i/share/BtoJpsieeK0s.py b/Generators/EvtGen_i/share/BtoJpsieeK0s.py index 6ea95b442a90..4e98db3038ad 100644 --- a/Generators/EvtGen_i/share/BtoJpsieeK0s.py +++ b/Generators/EvtGen_i/share/BtoJpsieeK0s.py @@ -157,8 +157,6 @@ include( "GeneratorObjectsAthenaPool/GeneratorObjectsAthenaPool_joboptions.py" ) # 2101 = EventInfo # 133273 = MCTruth (HepMC) Stream1.ItemList += [ "2101#*", "133273#*" ] -include("AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = TRUE Stream1.OutputFile = "pythiaB.pool.root" diff --git a/Generators/EvtGen_i/share/BtoJpsieeX.py b/Generators/EvtGen_i/share/BtoJpsieeX.py index a0218cbddefe..dc09a0c8221e 100644 --- a/Generators/EvtGen_i/share/BtoJpsieeX.py +++ b/Generators/EvtGen_i/share/BtoJpsieeX.py @@ -152,8 +152,6 @@ include( "GeneratorObjectsAthenaPool/GeneratorObjectsAthenaPool_joboptions.py" ) # 2101 = EventInfo # 133273 = MCTruth (HepMC) Stream1.ItemList += [ "2101#*", "133273#*" ] -include("AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = TRUE Stream1.OutputFile = "pythiaB.pool.root" diff --git a/Generators/EvtGen_i/share/Lb2Lll.py b/Generators/EvtGen_i/share/Lb2Lll.py index d8d015a16dbe..3f9a016aca2f 100644 --- a/Generators/EvtGen_i/share/Lb2Lll.py +++ b/Generators/EvtGen_i/share/Lb2Lll.py @@ -246,9 +246,6 @@ if not doNotWritePOOL: Stream1.ItemList += [ "2101#*", "133273#*" ] Stream1.AcceptAlgs = [ "BSignalFilter" ] - include("AthenaServices/AthenaSealSvc_joboptions.py" ) - AthenaSealSvc.CheckDictionary = TRUE - #============================================================== # # End of job options file diff --git a/Generators/EvtGen_i/share/PythiaBEvtGen.py b/Generators/EvtGen_i/share/PythiaBEvtGen.py index cf2338fd5f8d..273625288456 100644 --- a/Generators/EvtGen_i/share/PythiaBEvtGen.py +++ b/Generators/EvtGen_i/share/PythiaBEvtGen.py @@ -127,9 +127,6 @@ Stream1.OutputFile = "pythiaB.pool.root" # 133273 = MCTruth (HepMC) Stream1.ItemList += [ "2101#*", "133273#*" ] -include("AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = TRUE - #============================================================== # # End of job options file diff --git a/Generators/EvtGen_i/share/PythiaBEvtGen_Signal.py b/Generators/EvtGen_i/share/PythiaBEvtGen_Signal.py index 333c1c2cf1f6..4dab2c0da207 100644 --- a/Generators/EvtGen_i/share/PythiaBEvtGen_Signal.py +++ b/Generators/EvtGen_i/share/PythiaBEvtGen_Signal.py @@ -131,10 +131,6 @@ Stream1.OutputFile = "pythiaB.pool.root" Stream1.ItemList += [ "2101#*", "133273#*" ] Stream1.AcceptAlgs = [ "BSignalFilter" ] -include("AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = TRUE - - #============================================================== # # End of job options file diff --git a/Generators/EvtGen_i/share/PythiaB_B0_DPhiA1_Signal3.py b/Generators/EvtGen_i/share/PythiaB_B0_DPhiA1_Signal3.py index 119ec068a83b..81325e7bf5af 100644 --- a/Generators/EvtGen_i/share/PythiaB_B0_DPhiA1_Signal3.py +++ b/Generators/EvtGen_i/share/PythiaB_B0_DPhiA1_Signal3.py @@ -198,8 +198,6 @@ include( "GeneratorObjectsAthenaPool/GeneratorObjectsAthenaPool_joboptions.py" ) # 2101 = EventInfo # 133273 = MCTruth (HepMC) Stream1.ItemList += ["2101#*", "133273#*" ] -include("AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = TRUE Stream1.OutputFile = "pythiaB.pool.root" #============================================================== diff --git a/Generators/EvtGen_i/share/PythiaB_B0_DPhiPi_Signal3.py b/Generators/EvtGen_i/share/PythiaB_B0_DPhiPi_Signal3.py index 7edf96451b1d..3254a004efd0 100644 --- a/Generators/EvtGen_i/share/PythiaB_B0_DPhiPi_Signal3.py +++ b/Generators/EvtGen_i/share/PythiaB_B0_DPhiPi_Signal3.py @@ -201,8 +201,6 @@ include( "GeneratorObjectsAthenaPool/GeneratorObjectsAthenaPool_joboptions.py" ) # 2101 = EventInfo # 133273 = MCTruth (HepMC) Stream1.ItemList += ["2101#*", "133273#*" ] -include("AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = TRUE Stream1.OutputFile = "pythiaB.pool.root" #============================================================== diff --git a/Generators/EvtGen_i/share/PythiaB_B0_DsPhiA1_Signal3.py b/Generators/EvtGen_i/share/PythiaB_B0_DsPhiA1_Signal3.py index 69b5daf9482c..36170b5d8efc 100644 --- a/Generators/EvtGen_i/share/PythiaB_B0_DsPhiA1_Signal3.py +++ b/Generators/EvtGen_i/share/PythiaB_B0_DsPhiA1_Signal3.py @@ -204,8 +204,6 @@ include( "GeneratorObjectsAthenaPool/GeneratorObjectsAthenaPool_joboptions.py" ) # 2101 = EventInfo # 133273 = MCTruth (HepMC) Stream1.ItemList += ["2101#*", "133273#*" ] -include("AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = TRUE Stream1.OutputFile = "pythiaB.pool.root" #============================================================== diff --git a/Generators/EvtGen_i/share/PythiaB_B0_DsPhiPi_Signal3.py b/Generators/EvtGen_i/share/PythiaB_B0_DsPhiPi_Signal3.py index 54e51fa4d911..295e2093ffe0 100644 --- a/Generators/EvtGen_i/share/PythiaB_B0_DsPhiPi_Signal3.py +++ b/Generators/EvtGen_i/share/PythiaB_B0_DsPhiPi_Signal3.py @@ -206,8 +206,6 @@ include( "GeneratorObjectsAthenaPool/GeneratorObjectsAthenaPool_joboptions.py" ) # 2101 = EventInfo # 133273 = MCTruth (HepMC) Stream1.ItemList += ["2101#*", "133273#*" ] -include("AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = TRUE Stream1.OutputFile = "pythiaB.pool.root" #============================================================== diff --git a/Generators/EvtGen_i/share/PythiaB_Bp_D0MuNu_Signal3.py b/Generators/EvtGen_i/share/PythiaB_Bp_D0MuNu_Signal3.py index 07ac577f9427..435764b8da1f 100644 --- a/Generators/EvtGen_i/share/PythiaB_Bp_D0MuNu_Signal3.py +++ b/Generators/EvtGen_i/share/PythiaB_Bp_D0MuNu_Signal3.py @@ -226,8 +226,6 @@ include( "GeneratorObjectsAthenaPool/GeneratorObjectsAthenaPool_joboptions.py" ) # 2101 = EventInfo # 133273 = MCTruth (HepMC) Stream1.ItemList += ["2101#*", "133273#*" ] -include("AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = TRUE Stream1.OutputFile = "pythiaB.pool.root" #============================================================== diff --git a/Generators/EvtGen_i/share/PythiaB_Bs_DsPhiMuNu_Signal3.py b/Generators/EvtGen_i/share/PythiaB_Bs_DsPhiMuNu_Signal3.py index 07e0457aecaf..8821824a48b3 100644 --- a/Generators/EvtGen_i/share/PythiaB_Bs_DsPhiMuNu_Signal3.py +++ b/Generators/EvtGen_i/share/PythiaB_Bs_DsPhiMuNu_Signal3.py @@ -173,8 +173,6 @@ include( "GeneratorObjectsAthenaPool/GeneratorObjectsAthenaPool_joboptions.py" ) # 2101 = EventInfo # 133273 = MCTruth (HepMC) Stream1.ItemList += ["2101#*", "133273#*" ] -include("AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = TRUE Stream1.OutputFile = "pythiaB.pool.root" #============================================================== diff --git a/Generators/EvtGen_i/share/PythiaB_Bs_DsStDsPhiA1_Signal3.py b/Generators/EvtGen_i/share/PythiaB_Bs_DsStDsPhiA1_Signal3.py index 87f02a859fc2..e9bfa12f00d8 100644 --- a/Generators/EvtGen_i/share/PythiaB_Bs_DsStDsPhiA1_Signal3.py +++ b/Generators/EvtGen_i/share/PythiaB_Bs_DsStDsPhiA1_Signal3.py @@ -224,8 +224,6 @@ include( "GeneratorObjectsAthenaPool/GeneratorObjectsAthenaPool_joboptions.py" ) # 2101 = EventInfo # 133273 = MCTruth (HepMC) Stream1.ItemList += ["2101#*", "133273#*" ] -include("AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = TRUE Stream1.OutputFile = "pythiaB.pool.root" #============================================================== diff --git a/Generators/EvtGen_i/share/PythiaB_Bs_GammaMuMu_Signal.py b/Generators/EvtGen_i/share/PythiaB_Bs_GammaMuMu_Signal.py index b3458eb19ecc..684dd2978c37 100644 --- a/Generators/EvtGen_i/share/PythiaB_Bs_GammaMuMu_Signal.py +++ b/Generators/EvtGen_i/share/PythiaB_Bs_GammaMuMu_Signal.py @@ -153,8 +153,6 @@ include( "GeneratorObjectsAthenaPool/GeneratorObjectsAthenaPool_joboptions.py" ) # 2101 = EventInfo # 133273 = MCTruth (HepMC) Stream1.ItemList += [ "2101#*", "133273#*" ] -include("AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = TRUE Stream1.OutputFile = "pythiaB.pool.root" diff --git a/Generators/EvtGen_i/share/PythiaB_Signal.py b/Generators/EvtGen_i/share/PythiaB_Signal.py index 5152bff9f706..bce19decf156 100644 --- a/Generators/EvtGen_i/share/PythiaB_Signal.py +++ b/Generators/EvtGen_i/share/PythiaB_Signal.py @@ -153,8 +153,6 @@ include( "GeneratorObjectsAthenaPool/GeneratorObjectsAthenaPool_joboptions.py" ) # 2101 = EventInfo # 133273 = MCTruth (HepMC) Stream1.ItemList += [ "2101#*", "133273#*" ] -include("AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = TRUE Stream1.OutputFile = "pythiaB.pool.root" diff --git a/Generators/EvtGen_i/share/PythiaB_bbe10X.py b/Generators/EvtGen_i/share/PythiaB_bbe10X.py index 99fe9f3f2dda..9114ce294ea9 100644 --- a/Generators/EvtGen_i/share/PythiaB_bbe10X.py +++ b/Generators/EvtGen_i/share/PythiaB_bbe10X.py @@ -124,8 +124,6 @@ include( "GeneratorObjectsAthenaPool/GeneratorObjectsAthenaPool_joboptions.py" ) # 2101 = EventInfo # 133273 = MCTruth (HepMC) Stream1.ItemList += [ "2101#*", "133273#*" ] -include("AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = TRUE Stream1.OutputFile = "pythiaB.pool.root" diff --git a/Generators/EvtGen_i/share/PythiaB_bbmu12mu12X.py b/Generators/EvtGen_i/share/PythiaB_bbmu12mu12X.py index ad08d333bf61..87585b84a90d 100644 --- a/Generators/EvtGen_i/share/PythiaB_bbmu12mu12X.py +++ b/Generators/EvtGen_i/share/PythiaB_bbmu12mu12X.py @@ -123,8 +123,6 @@ include( "GeneratorObjectsAthenaPool/GeneratorObjectsAthenaPool_joboptions.py" ) # 2101 = EventInfo # 133273 = MCTruth (HepMC) Stream1.ItemList += [ "2101#*", "133273#*" ] -include("AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = TRUE Stream1.OutputFile = "pythiaB.pool.root" diff --git a/Generators/EvtGen_i/share/PythiaB_bbmu6e4X.py b/Generators/EvtGen_i/share/PythiaB_bbmu6e4X.py index 861f5185fd38..be8d64362522 100644 --- a/Generators/EvtGen_i/share/PythiaB_bbmu6e4X.py +++ b/Generators/EvtGen_i/share/PythiaB_bbmu6e4X.py @@ -123,8 +123,6 @@ include( "GeneratorObjectsAthenaPool/GeneratorObjectsAthenaPool_joboptions.py" ) # 2101 = EventInfo # 133273 = MCTruth (HepMC) Stream1.ItemList += [ "2101#*", "133273#*" ] -include("AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = TRUE Stream1.OutputFile = "pythiaB.pool.root" diff --git a/Generators/EvtGen_i/share/PythiaB_bbmu6mu4_massX.py b/Generators/EvtGen_i/share/PythiaB_bbmu6mu4_massX.py index 2c23716a0306..9e61974288b1 100644 --- a/Generators/EvtGen_i/share/PythiaB_bbmu6mu4_massX.py +++ b/Generators/EvtGen_i/share/PythiaB_bbmu6mu4_massX.py @@ -131,8 +131,6 @@ include( "GeneratorObjectsAthenaPool/GeneratorObjectsAthenaPool_joboptions.py" ) # 2101 = EventInfo # 133273 = MCTruth (HepMC) Stream1.ItemList += [ "2101#*", "133273#*" ] -include("AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = TRUE Stream1.OutputFile = "pythiaB.pool.root" diff --git a/Generators/EvtGen_i/share/PythiaEvtGen.py b/Generators/EvtGen_i/share/PythiaEvtGen.py index 5a3c08845030..de61c7fb106b 100644 --- a/Generators/EvtGen_i/share/PythiaEvtGen.py +++ b/Generators/EvtGen_i/share/PythiaEvtGen.py @@ -108,10 +108,6 @@ Stream1.OutputFile = "pythiaB.pool.root" # 133273 = MCTruth (HepMC) Stream1.ItemList += [ "2101#*", "133273#*" ] -include("AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = TRUE - - #============================================================== # # End of job options file diff --git a/Generators/EvtGen_i/share/bTosllAli.py b/Generators/EvtGen_i/share/bTosllAli.py index c762b0919088..ae6943149987 100644 --- a/Generators/EvtGen_i/share/bTosllAli.py +++ b/Generators/EvtGen_i/share/bTosllAli.py @@ -156,10 +156,6 @@ Stream1.OutputFile = "pythiaB.pool.root" Stream1.ItemList += [ "2101#*", "133273#*" ] Stream1.AcceptAlgs = [ "BSignalFilter" ] -include("AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = TRUE - - #============================================================== # # End of job options file diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/SCTCalib_topOptions.py b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/SCTCalib_topOptions.py index 5a17fb5c1978..5878f45764ea 100755 --- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/SCTCalib_topOptions.py +++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/SCTCalib_topOptions.py @@ -55,11 +55,6 @@ theAuditorSvc.Auditors += [ "MemStatAuditor" ] theApp.AuditAlgorithms = True theApp.AuditServices = True -#-------------------------------------------------------------- -# Load AthenaSealSvc -#-------------------------------------------------------------- -ServiceMgr.AthenaSealSvc.CheckDictionary = True - #-------------------------------------------------------------- # Setup geometry and conditions tag # - Chosen from magnet current info diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/referenceOptions.py b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/referenceOptions.py index f76e464246b7..5b2dcd012b66 100755 --- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/referenceOptions.py +++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/referenceOptions.py @@ -56,11 +56,6 @@ theAuditorSvc.Auditors += [ "MemStatAuditor" ] theApp.AuditAlgorithms = True theApp.AuditServices = True -#-------------------------------------------------------------- -# Load AthenaSealSvc -#-------------------------------------------------------------- -ServiceMgr.AthenaSealSvc.CheckDictionary = True - #-------------------------------------------------------------- # Setup geometry and conditions tag # - Chosen from magnet current info diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/skeleton.sct_calib.py b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/skeleton.sct_calib.py index 3a1f2e3b90dc..3d6cf3673d02 100644 --- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/skeleton.sct_calib.py +++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/share/skeleton.sct_calib.py @@ -41,11 +41,6 @@ theAuditorSvc.Auditors += [ "MemStatAuditor" ] theApp.AuditAlgorithms = True theApp.AuditServices = True -#-------------------------------------------------------------- -# Load AthenaSealSvc -#-------------------------------------------------------------- -ServiceMgr.AthenaSealSvc.CheckDictionary = True - #-------------------------------------------------------------- # User setup to run each algorithm # - SCTCalibConfig.py is used as input to the following diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/share/PixelDCSTestWrite.py b/InnerDetector/InDetConditions/PixelConditionsTools/share/PixelDCSTestWrite.py index 9b88bb502af8..1a6890648bd7 100644 --- a/InnerDetector/InDetConditions/PixelConditionsTools/share/PixelDCSTestWrite.py +++ b/InnerDetector/InDetConditions/PixelConditionsTools/share/PixelDCSTestWrite.py @@ -66,10 +66,6 @@ from AthenaCommon.AppMgr import ToolSvc #include("AthenaPoolCnvSvc/AthenaPool_jobOptions.py") import AthenaPoolCnvSvc.AthenaPool -from AthenaServices.AthenaServicesConf import AthenaSealSvc -ServiceMgr += AthenaSealSvc(CheckDictionary = TRUE) - - from PoolSvc.PoolSvcConf import PoolSvc ServiceMgr += PoolSvc( DbOpen = "update" ) diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testMonRead.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testMonRead.py index 6a59eab3602c..65b374b210ea 100644 --- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testMonRead.py +++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testMonRead.py @@ -104,12 +104,6 @@ regSvc.RecreateFolders = False #-------------------------------------------------------------- import AthenaPoolCnvSvc.WriteAthenaPool -#-------------------------------------------------------------- -# AthenaPool details -#-------------------------------------------------------------- -# Check the dictionary in memory for completeness -ServiceMgr.AthenaSealSvc.CheckDictionary = TRUE - #-------------------------------------------------------------- import AthenaCommon.AtlasUnixGeneratorJob diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/share/WriteAlignCTB.py b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/share/WriteAlignCTB.py index 0e22ffa84229..23c703b0bd70 100755 --- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/share/WriteAlignCTB.py +++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/share/WriteAlignCTB.py @@ -26,10 +26,6 @@ MessageSvc.OutputLevel = 3 MessageSvc.debugLimit = 2000 MessageSvc.infoLimit = 2000 -#data dictionqary -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = TRUE - #configure IOVRegistrationSvc include( "RegistrationServices/IOVRegistrationSvc_jobOptions.py" ) regSvc = Service( "IOVRegistrationSvc" ) diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/share/WriteCalibCTB.py b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/share/WriteCalibCTB.py index f00e280e7335..3f1b2c89199c 100755 --- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/share/WriteCalibCTB.py +++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/share/WriteCalibCTB.py @@ -36,10 +36,6 @@ MessageSvc.OutputLevel = 3 MessageSvc.debugLimit = 2000 MessageSvc.infoLimit = 2000 -#data dictionqary -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = TRUE - #configure IOVRegistrationSvc include( "RegistrationServices/IOVRegistrationSvc_jobOptions.py" ) regSvc = Service( "IOVRegistrationSvc" ) diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/share/WriteCosmicSR1DB.py b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/share/WriteCosmicSR1DB.py index 7386ffc494ac..68b38d04a883 100755 --- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/share/WriteCosmicSR1DB.py +++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/share/WriteCosmicSR1DB.py @@ -71,10 +71,6 @@ MessageSvc.OutputLevel = 3 MessageSvc.debugLimit = 2000 MessageSvc.infoLimit = 2000 -#data dictionqary -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = TRUE - #configure IOVRegistrationSvc include( "RegistrationServices/IOVRegistrationSvc_jobOptions.py" ) regSvc = Service( "IOVRegistrationSvc" ) diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/share/SiSmearing_noPU_CompletedjO.py b/InnerDetector/InDetDigitization/FastSiDigitization/share/SiSmearing_noPU_CompletedjO.py index 4c01b8c930a4..59b77056c397 100644 --- a/InnerDetector/InDetDigitization/FastSiDigitization/share/SiSmearing_noPU_CompletedjO.py +++ b/InnerDetector/InDetDigitization/FastSiDigitization/share/SiSmearing_noPU_CompletedjO.py @@ -118,8 +118,6 @@ ToolSvc.PixelRecoDbTool.InputSource = 1 from AthenaCommon.AppMgr import ServiceMgr ServiceMgr.MessageSvc.enableSuppression = False ServiceMgr.MessageSvc.Format = "% F%50W%S%7W%R%T %0W%M" -#ServiceMgr.AthenaSealSvc.OutputLevel = 1 -#ServiceMgr.AthenaSealSvc.CheckDictionary = True OutputNameString = 'CheckSmearing' diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_all.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_all.py index dc78cdfc6ccd..df068c306bab 100755 --- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_all.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_all.py @@ -204,8 +204,6 @@ if 'doWriteBS' in dir() and doWriteBS: if doWriteESD or doWriteAOD or ('doCopyRDO' in dir() and doCopyRDO): # --- load setup from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream - # --- check dictionary - ServiceMgr.AthenaSealSvc.CheckDictionary = True # MC truth information if doWriteESD or doWriteAOD: diff --git a/InnerDetector/InDetExample/InDetSLHC_Example/share/GeantinoMapping_ITk_jobOptions.py b/InnerDetector/InDetExample/InDetSLHC_Example/share/GeantinoMapping_ITk_jobOptions.py index 209b7c8a3b18..7070f85246e9 100644 --- a/InnerDetector/InDetExample/InDetSLHC_Example/share/GeantinoMapping_ITk_jobOptions.py +++ b/InnerDetector/InDetExample/InDetSLHC_Example/share/GeantinoMapping_ITk_jobOptions.py @@ -109,8 +109,6 @@ simFlags.OptionalUserActionList.addAction('G4UA::MaterialStepRecorderTool') ############### The Material hit collection ################## from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream -# --- check dictionary -ServiceMgr.AthenaSealSvc.CheckDictionary = True # --- commit interval (test) ServiceMgr.AthenaPoolCnvSvc.OutputLevel = DEBUG MaterialStream = AthenaPoolOutputStream ( 'MaterialStream' ) diff --git a/InnerDetector/InDetExample/InDetSLHC_Example/share/GeantinoMapping_jobOptionsOverride.py b/InnerDetector/InDetExample/InDetSLHC_Example/share/GeantinoMapping_jobOptionsOverride.py index 2b8b23991c28..b96952b3130d 100755 --- a/InnerDetector/InDetExample/InDetSLHC_Example/share/GeantinoMapping_jobOptionsOverride.py +++ b/InnerDetector/InDetExample/InDetSLHC_Example/share/GeantinoMapping_jobOptionsOverride.py @@ -105,8 +105,6 @@ DumpMC.VerboseOutput = False ############### The Material hit collection ################## from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream -# --- check dictionary -ServiceMgr.AthenaSealSvc.CheckDictionary = True # --- commit interval (test) ServiceMgr.AthenaPoolCnvSvc.OutputLevel = DEBUG MaterialStream = AthenaPoolOutputStream ( 'MaterialStream' ) diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/run/CosmicMonitorOpts.py b/InnerDetector/InDetMonitoring/SCT_Monitoring/run/CosmicMonitorOpts.py index 25a92e03bdb6..f13fbb0d0e2a 100755 --- a/InnerDetector/InDetMonitoring/SCT_Monitoring/run/CosmicMonitorOpts.py +++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/run/CosmicMonitorOpts.py @@ -203,8 +203,6 @@ CBNT_Athena.NtupleLocID="/FILE1/Cosmic/tree" # Write out Transient Event Store content in POOL #------------------------------------------------- -AthenaSealSvc.CheckDictionary = True - if CosmicMonitorFlags.doWriteESD: if not CosmicMonitorFlags.doSim: include ("AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py") diff --git a/InnerDetector/InDetRecTools/PixelToTPIDTool/share/PixeldEdxWriteCool.py b/InnerDetector/InDetRecTools/PixelToTPIDTool/share/PixeldEdxWriteCool.py index 49a6f70bb9d3..2514bb5512f3 100755 --- a/InnerDetector/InDetRecTools/PixelToTPIDTool/share/PixeldEdxWriteCool.py +++ b/InnerDetector/InDetRecTools/PixelToTPIDTool/share/PixeldEdxWriteCool.py @@ -113,13 +113,6 @@ theApp.EvtMax = 1 #-------------------------------------------------------------- import AthenaPoolCnvSvc.WriteAthenaPool -#-------------------------------------------------------------- -# AthenaPool details -#-------------------------------------------------------------- - -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = TRUE - #-------------------------------------------------------------- # Use AthenaOutputStreamTool to write # Must "turn off" standard AthenaOutputStream diff --git a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/share/LArAlignDbRead.py b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/share/LArAlignDbRead.py index e3e1060a483d..bcf2dfe940bb 100755 --- a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/share/LArAlignDbRead.py +++ b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/share/LArAlignDbRead.py @@ -55,8 +55,5 @@ theApp.EvtMax = 1 #-------------------------------------------------------------- import AthenaPoolCnvSvc.WriteAthenaPool -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = TRUE - diff --git a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/share/LArAlignDbReadCoolAndReg.py b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/share/LArAlignDbReadCoolAndReg.py index 5ff0a92babbe..bf0d61c0c78d 100755 --- a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/share/LArAlignDbReadCoolAndReg.py +++ b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/share/LArAlignDbReadCoolAndReg.py @@ -6,14 +6,6 @@ #use McEventSelector theApp.setup( MONTECARLO ) -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# Check the dictionary in memory for completeness -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = TRUE - #-------------------------------------------------------------- # Private Application Configuration options #-------------------------------------------------------------- diff --git a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/share/LArAlignDbReadNoReg.py b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/share/LArAlignDbReadNoReg.py index 27c283897690..dbeb8dec474d 100755 --- a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/share/LArAlignDbReadNoReg.py +++ b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/share/LArAlignDbReadNoReg.py @@ -6,14 +6,6 @@ #use McEventSelector theApp.setup( MONTECARLO ) -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# Check the dictionary in memory for completeness -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = TRUE - #-------------------------------------------------------------- # Private Application Configuration options #-------------------------------------------------------------- diff --git a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/share/LArAlignDbWrite.py b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/share/LArAlignDbWrite.py index 4dec4f21502a..2b8022f1ff0a 100755 --- a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/share/LArAlignDbWrite.py +++ b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/share/LArAlignDbWrite.py @@ -75,13 +75,6 @@ theApp.EvtMax = 1 #-------------------------------------------------------------- import AthenaPoolCnvSvc.WriteAthenaPool -#-------------------------------------------------------------- -# AthenaPool details -#-------------------------------------------------------------- - -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = TRUE - #-------------------------------------------------------------- # Use AthenaOutputStreamTool to write # Must "turn off" standard AthenaOutputStream diff --git a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/share/LArAlignDbWriteCoolNoReg.py b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/share/LArAlignDbWriteCoolNoReg.py index 7d2fbf4f33b9..34655e171322 100755 --- a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/share/LArAlignDbWriteCoolNoReg.py +++ b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/share/LArAlignDbWriteCoolNoReg.py @@ -83,16 +83,6 @@ EventSelector.InitialTimeStamp = 0 EventSelector.TimeStampInterval = 5 theApp.EvtMax = 5 - - -#-------------------------------------------------------------- -# AthenaPool details -#-------------------------------------------------------------- - -# Check the dictionary in memory for completeness -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = TRUE - #-------------------------------------------------------------- # Load POOL support #-------------------------------------------------------------- diff --git a/LArCalorimeter/LArBadChannelTool/share/LArBadChannelBrowser.py b/LArCalorimeter/LArBadChannelTool/share/LArBadChannelBrowser.py index 3decb8b159ef..7ede0cb4d69f 100644 --- a/LArCalorimeter/LArBadChannelTool/share/LArBadChannelBrowser.py +++ b/LArCalorimeter/LArBadChannelTool/share/LArBadChannelBrowser.py @@ -26,8 +26,6 @@ include( "CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv_joboptions.py" ) #include("CaloIdCnv/CaloIdCnv_joboptions.py") -include ("AthenaServices/AthenaSealSvc_joboptions.py") - from AthenaCommon.AlgSequence import AlgSequence job = AlgSequence() diff --git a/LArCalorimeter/LArCafJobs/python/LArCafJobsConfig.py b/LArCalorimeter/LArCafJobs/python/LArCafJobsConfig.py index 8dd458a72aca..c56c65cf178d 100644 --- a/LArCalorimeter/LArCafJobs/python/LArCafJobsConfig.py +++ b/LArCalorimeter/LArCafJobs/python/LArCafJobsConfig.py @@ -57,9 +57,6 @@ class DefaultShapeDumper(LArShapeDumper) : StreamLArSamples.MetadataItemList += ['LArSamplesContainer#Samples'] StreamLArSamples.WriteOnExecute = False StreamLArSamples.WriteOnFinalize = True - else : - from AthenaCommon.AppMgr import ServiceMgr as svcMgr - svcMgr.AthenaSealSvc.DictNames += [ "LArCafJobsDict" ] self.CaloType = caloType self.Prescale = prescale diff --git a/LArCalorimeter/LArCalibTools/share/LArParams2Ntuple_POOL_jobOptions.py b/LArCalorimeter/LArCalibTools/share/LArParams2Ntuple_POOL_jobOptions.py index 721823c1d739..a346abe140fc 100755 --- a/LArCalorimeter/LArCalibTools/share/LArParams2Ntuple_POOL_jobOptions.py +++ b/LArCalorimeter/LArCalibTools/share/LArParams2Ntuple_POOL_jobOptions.py @@ -88,10 +88,6 @@ ToolSvc.LArRoI_Map.Print = False # # Read in from POOL file # -include("AthenaServices/AthenaSealSvc_joboptions.py") -include("LArRawConditions/LArRawConditionsDict_joboptions.py") -AthenaSealSvc.CheckDictionary = True - include("AthenaPoolCnvSvc/AthenaPool_jobOptions.py") theApp.Dlls += ["EventSelectorAthenaPool"] theApp.Dlls += [ "LArAthenaPoolPoolCnv" ] @@ -108,9 +104,6 @@ CondProxyProvider.OutputLevel = DEBUG EventPersistencySvc = Service( "EventPersistencySvc" ) EventPersistencySvc.CnvServices += [ "AthenaPoolCnvSvc" ] -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -include( "LArRawConditions/LArRawConditionsDict_joboptions.py" ) - PoolSvc = Service ( "PoolSvc" ) PoolSvc.ReadCatalog += [ "xmlcatalog_file:"+PoolFileCatalog ] diff --git a/LArCalorimeter/LArCalibTools/share/LArPedestal2Ntuple_jobOptions.py b/LArCalorimeter/LArCalibTools/share/LArPedestal2Ntuple_jobOptions.py index 02fae5b2eb18..907a6e0b605c 100755 --- a/LArCalorimeter/LArCalibTools/share/LArPedestal2Ntuple_jobOptions.py +++ b/LArCalorimeter/LArCalibTools/share/LArPedestal2Ntuple_jobOptions.py @@ -119,9 +119,6 @@ if (ReadCOOL): IOVDbSvc.OutputLevel = DEBUG else: - - include("AthenaServices/AthenaSealSvc_joboptions.py") - include("LArRawConditions/LArRawConditionsDict_joboptions.py") include("AthenaPoolCnvSvc/AthenaPool_jobOptions.py") EventPersistencySvc = Service( "EventPersistencySvc" ) diff --git a/LArCalorimeter/LArCalibTools/share/LArPhysWaveFromTuple_jobOptions.py b/LArCalorimeter/LArCalibTools/share/LArPhysWaveFromTuple_jobOptions.py index 78e9e398b18a..d8df01a6fbe2 100644 --- a/LArCalorimeter/LArCalibTools/share/LArPhysWaveFromTuple_jobOptions.py +++ b/LArCalorimeter/LArCalibTools/share/LArPhysWaveFromTuple_jobOptions.py @@ -64,10 +64,6 @@ MessageSvc.OutputLevel = INFO ########################################################################### if ( writePOOLfile ) : - include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - include ("LArRawConditions/LArRawConditionsDict_joboptions.py") - AthenaSealSvc.CheckDictionary = True - include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) include( "LArAthenaPool/LArAthenaPool_joboptions.py" ) include( "LArCondAthenaPool/LArCondAthenaPool_joboptions.py" ) diff --git a/LArCalorimeter/LArCalibTools/share/LArReadParamsFromFile_CTB2004_jobOptions.py b/LArCalorimeter/LArCalibTools/share/LArReadParamsFromFile_CTB2004_jobOptions.py index e5ca8b28804b..c01fe5ab1d7b 100755 --- a/LArCalorimeter/LArCalibTools/share/LArReadParamsFromFile_CTB2004_jobOptions.py +++ b/LArCalorimeter/LArCalibTools/share/LArReadParamsFromFile_CTB2004_jobOptions.py @@ -157,11 +157,6 @@ if ( WriteRootFile ) : NTupleSvc.Output = [ "FILE1 DATAFILE='"+RootFileName+"' OPT='NEW'" ] if ( WritePoolFile ) : - - include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - include ("LArRawConditions/LArRawConditionsDict_joboptions.py") - AthenaSealSvc.CheckDictionary = True - include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) theApp.Dlls += [ "LArAthenaPoolPoolCnv" ] theApp.Dlls += [ "LArCondAthenaPoolPoolCnv" ] diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/share/LArIdMap_Pool_Read.py b/LArCalorimeter/LArCnv/LArCondAthenaPool/share/LArIdMap_Pool_Read.py index af79a215858d..fd5abe2d5791 100755 --- a/LArCalorimeter/LArCnv/LArCondAthenaPool/share/LArIdMap_Pool_Read.py +++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/share/LArIdMap_Pool_Read.py @@ -56,10 +56,6 @@ EventSelector.EventsPerRun=2 EventSelector.FirstEvent=1 include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) -AthenaSealSvc.CheckDictionary = True -AthenaSealSvc.CheckDictAtInit = True - -theApp.Dlls += [ "EventSelectorAthenaPool","LArCondAthenaPoolPoolCnv" ] ProxyProviderSvc = Service( "ProxyProviderSvc" ) ProxyProviderSvc.ProviderNames += [ "CondProxyProvider" ] diff --git a/LArCalorimeter/LArCnv/LArCondAthenaPool/share/LArIdMap_Pool_Write.py b/LArCalorimeter/LArCnv/LArCondAthenaPool/share/LArIdMap_Pool_Write.py index fcf327f461b9..d142dcce1fe0 100755 --- a/LArCalorimeter/LArCnv/LArCondAthenaPool/share/LArIdMap_Pool_Write.py +++ b/LArCalorimeter/LArCnv/LArCondAthenaPool/share/LArIdMap_Pool_Write.py @@ -53,16 +53,6 @@ EventSelector.FirstEvent=1 include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) -theApp.Dlls += [ "AthenaPoolCnvSvc" ] -theApp.Dlls += [ "LArCondAthenaPoolPoolCnv" ] -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = True -AthenaSealSvc.CheckDictAtInit = True - -include ("LArRawConditions/LArRawConditionsDict_joboptions.py") -# include ("LArTools/LArToolsDict_joboptions.py") - - # Exercise writing the objects to NOVA (no IOV). theApp.OutStream =["StreamDet"] theApp.OutStreamType ="AthenaOutputStream" diff --git a/LArCalorimeter/LArCnv/LArSimEventAthenaPool/share/LArSimAthenaPool_ReadTest_jobOptions.py b/LArCalorimeter/LArCnv/LArSimEventAthenaPool/share/LArSimAthenaPool_ReadTest_jobOptions.py index f0a7d80066a9..afd1bc8a11d8 100755 --- a/LArCalorimeter/LArCnv/LArSimEventAthenaPool/share/LArSimAthenaPool_ReadTest_jobOptions.py +++ b/LArCalorimeter/LArCnv/LArSimEventAthenaPool/share/LArSimAthenaPool_ReadTest_jobOptions.py @@ -1,37 +1,36 @@ ############################################################### -# -# Job options file -# -#============================================================== -#-------------------------------------------------------------- -# Load POOL support -#-------------------------------------------------------------- -include( "AthenaPoolCnvSvc/ReadAthenaPool_jobOptions.py" ) - -#-------------------------------------------------------------- -# Event related parameters -#-------------------------------------------------------------- -theApp.EvtMax = 200 -#-------------------------------------------------------------- -# Private Application Configuration options -#-------------------------------------------------------------- -#-------------------------------------------------------------- -# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) -#-------------------------------------------------------------- -MessageSvc = Service( "MessageSvc" ) -MessageSvc.OutputLevel = 2 -##include "$ATHENASEALSVCROOT/share/AthenaSealSvc_joboptions.txt" -##include "$DETDESCRDICTIONARYROOT/dict/DetDescrDictionary_joboptions.txt" -##include "$LARSIMEVENTROOT/dict/LArSimEvent_joboptions.txt" -##include "$EVENTINFOROOT/dict/EventInfo_joboptions.txt" -theApp.Dlls += [ "LArSim" ] -theApp.TopAlg += [ "LArHitReader" ] -theApp.Dlls += [ "LArSimEventAthenaPoolPoolCnv" ] -EventSelector = Service( "EventSelector" ) -EventSelector.InputCollection = "LArSimTest.root" -PoolSvc = Service( "PoolSvc" ) -#============================================================== -# -# End of job options file -# -############################################################### +# +# Job options file +# +#============================================================== +#-------------------------------------------------------------- +# Load POOL support +#-------------------------------------------------------------- +include( "AthenaPoolCnvSvc/ReadAthenaPool_jobOptions.py" ) + +#-------------------------------------------------------------- +# Event related parameters +#-------------------------------------------------------------- +theApp.EvtMax = 200 +#-------------------------------------------------------------- +# Private Application Configuration options +#-------------------------------------------------------------- +#-------------------------------------------------------------- +# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) +#-------------------------------------------------------------- +MessageSvc = Service( "MessageSvc" ) +MessageSvc.OutputLevel = 2 +##include "$DETDESCRDICTIONARYROOT/dict/DetDescrDictionary_joboptions.txt" +##include "$LARSIMEVENTROOT/dict/LArSimEvent_joboptions.txt" +##include "$EVENTINFOROOT/dict/EventInfo_joboptions.txt" +theApp.Dlls += [ "LArSim" ] +theApp.TopAlg += [ "LArHitReader" ] +theApp.Dlls += [ "LArSimEventAthenaPoolPoolCnv" ] +EventSelector = Service( "EventSelector" ) +EventSelector.InputCollection = "LArSimTest.root" +PoolSvc = Service( "PoolSvc" ) +#============================================================== +# +# End of job options file +# +############################################################### diff --git a/LArCalorimeter/LArCnv/LArSimEventAthenaPool/share/LArSimAthenaPool_WriteTest_jobOptions.py b/LArCalorimeter/LArCnv/LArSimEventAthenaPool/share/LArSimAthenaPool_WriteTest_jobOptions.py index 3b8a111317c0..5984520eaa02 100755 --- a/LArCalorimeter/LArCnv/LArSimEventAthenaPool/share/LArSimAthenaPool_WriteTest_jobOptions.py +++ b/LArCalorimeter/LArCnv/LArSimEventAthenaPool/share/LArSimAthenaPool_WriteTest_jobOptions.py @@ -1,44 +1,43 @@ ############################################################### -# -# Job options file -# -#============================================================== -theApp.setup( MONTECARLO ) - -#-------------------------------------------------------------- -# Load POOL support -#-------------------------------------------------------------- -include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" ) - -#-------------------------------------------------------------- -# Event related parameters -#-------------------------------------------------------------- -theApp.EvtMax = 20 -#-------------------------------------------------------------- -# Private Application Configuration options -#-------------------------------------------------------------- -#-------------------------------------------------------------- -# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) -#-------------------------------------------------------------- -##include "$ATHENASEALSVCROOT/share/AthenaSealSvc_joboptions.txt" -##include "$LARSIMEVENTROOT/dict/LArSimEvent_joboptions.txt" -##include "$IDENTIFIERROOT/dict/Identifier_joboptions.txt" -##include "$EVENTINFOROOT/dict/EventInfo_joboptions.txt" -# LAr Hit -# #include "$TDRDETDESCRATHENAROOTROOT/share/TDRDetDescrAthenaRoot_jobOptions.txt" -# #include "$LARDETMGRDETDESCRCNVROOT/share/LArDetMgrDetDescrCnv_joboptions.txt" -# #include "$LARSIMROOT/share/LArSim_Fake_jobOptions.txt" -theApp.Dlls += [ "LArSim" ] -theApp.TopAlg += [ "LArFakeHitProducer" ] -theApp.Dlls += [ "LArSimEventAthenaPoolPoolCnv" ] -Stream1 = Algorithm( "Stream1" ) -Stream1.ItemList+=["LArHitContainer#*"] -Stream1.ItemList+=["EventInfo#*"] -MessageSvc = Service( "MessageSvc" ) -MessageSvc.OutputLevel = 2 -Stream1.OutputFile="LArSimTest.root" -#============================================================== -# -# End of job options file -# -############################################################### +# +# Job options file +# +#============================================================== +theApp.setup( MONTECARLO ) + +#-------------------------------------------------------------- +# Load POOL support +#-------------------------------------------------------------- +include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" ) + +#-------------------------------------------------------------- +# Event related parameters +#-------------------------------------------------------------- +theApp.EvtMax = 20 +#-------------------------------------------------------------- +# Private Application Configuration options +#-------------------------------------------------------------- +#-------------------------------------------------------------- +# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL ) +#-------------------------------------------------------------- +##include "$LARSIMEVENTROOT/dict/LArSimEvent_joboptions.txt" +##include "$IDENTIFIERROOT/dict/Identifier_joboptions.txt" +##include "$EVENTINFOROOT/dict/EventInfo_joboptions.txt" +# LAr Hit +# #include "$TDRDETDESCRATHENAROOTROOT/share/TDRDetDescrAthenaRoot_jobOptions.txt" +# #include "$LARDETMGRDETDESCRCNVROOT/share/LArDetMgrDetDescrCnv_joboptions.txt" +# #include "$LARSIMROOT/share/LArSim_Fake_jobOptions.txt" +theApp.Dlls += [ "LArSim" ] +theApp.TopAlg += [ "LArFakeHitProducer" ] +theApp.Dlls += [ "LArSimEventAthenaPoolPoolCnv" ] +Stream1 = Algorithm( "Stream1" ) +Stream1.ItemList+=["LArHitContainer#*"] +Stream1.ItemList+=["EventInfo#*"] +MessageSvc = Service( "MessageSvc" ) +MessageSvc.OutputLevel = 2 +Stream1.OutputFile="LArSimTest.root" +#============================================================== +# +# End of job options file +# +############################################################### diff --git a/LArCalorimeter/LArCondUtils/share/LArHVPathologyDbRead.py b/LArCalorimeter/LArCondUtils/share/LArHVPathologyDbRead.py index c16a66b53d56..386e7d26794b 100755 --- a/LArCalorimeter/LArCondUtils/share/LArHVPathologyDbRead.py +++ b/LArCalorimeter/LArCondUtils/share/LArHVPathologyDbRead.py @@ -115,11 +115,3 @@ svcMgr.EventSelector.FirstLB = 1 svcMgr.EventSelector.InitialTimeStamp = int(TimeStamp/1e9) svcMgr.EventSelector.TimeStampInterval = 5 theApp.EvtMax = 1 - -#-------------------------------------------------------------- -# Load POOL support -#-------------------------------------------------------------- -#import AthenaPoolCnvSvc.WriteAthenaPool - -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = TRUE diff --git a/LArCalorimeter/LArCondUtils/share/LArHVPathologyDbWrite.py b/LArCalorimeter/LArCondUtils/share/LArHVPathologyDbWrite.py index e1aa27f3dfc1..376c4f9b4889 100755 --- a/LArCalorimeter/LArCondUtils/share/LArHVPathologyDbWrite.py +++ b/LArCalorimeter/LArCondUtils/share/LArHVPathologyDbWrite.py @@ -136,23 +136,4 @@ svcMgr.EventSelector.InitialTimeStamp = int(TimeStamp/1e9) svcMgr.EventSelector.TimeStampInterval = 5 theApp.EvtMax = 1 -#-------------------------------------------------------------- -# Load POOL support -#-------------------------------------------------------------- -#import AthenaPoolCnvSvc.WriteAthenaPool - -#-------------------------------------------------------------- -# AthenaPool details -#-------------------------------------------------------------- - -# Check the dictionary in memory for completeness -svcMgr.AthenaSealSvc.CheckDictionary = TRUE - -#-------------------------------------------------------------- -# Use AthenaOutputStreamTool to write -# Must "turn off" standard AthenaOutputStream -#-------------------------------------------------------------- -#theApp.OutStream = [] - - diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_Delay_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_Delay_jobOptions.py index c40fc964cd25..17e918a61900 100644 --- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_Delay_jobOptions.py +++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_Delay_jobOptions.py @@ -266,9 +266,6 @@ if ( WriteNtuple ) : NTupleSvc.Output = [ "FILE1 DATAFILE='"+RootFileName+"' OPT='NEW'" ] if ( WritePOOLFile ) : - include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - AthenaSealSvc.CheckDictionary = True - include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) theApp.Dlls += [ "LArAthenaPoolPoolCnv" ] theApp.Dlls += [ "LArCondAthenaPoolPoolCnv" ] diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_MasterWaves_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_MasterWaves_jobOptions.py index 4ae8b5c0e5ab..aca9ff1a750c 100644 --- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_MasterWaves_jobOptions.py +++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_MasterWaves_jobOptions.py @@ -45,9 +45,6 @@ DetFlags.em_setOn() # # Read POOL file # -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = True - include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) theApp.Dlls += ["EventSelectorAthenaPool"] theApp.Dlls += ["LArAthenaPoolPoolCnv"] @@ -61,8 +58,6 @@ CondProxyProvider.InputCollections = PoolFileList EventPersistencySvc = Service( "EventPersistencySvc" ) EventPersistencySvc.CnvServices += [ "AthenaPoolCnvSvc" ] -include("AthenaServices/AthenaSealSvc_joboptions.py") - # # build master waveforms from single-DAC calibration waves # @@ -117,9 +112,6 @@ if ( WriteRootFile ) : NTupleSvc.Output = [ "FILE1 DATAFILE='"+RootFileName+"' OPT='NEW'" ] if ( WritePoolFile ) : - include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - AthenaSealSvc.CheckDictionary = True - include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) theApp.Dlls += [ "LArAthenaPoolPoolCnv" ] theApp.Dlls += [ "LArCondAthenaPoolPoolCnv" ] diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_OFC_Phys_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_OFC_Phys_jobOptions.py index 7d0b853decd9..4d6cad0cfeac 100644 --- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_OFC_Phys_jobOptions.py +++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_OFC_Phys_jobOptions.py @@ -237,9 +237,6 @@ ToolSvc.LArRoI_Map.Print = False # POOL # if ( readPOOLFile) : - include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - AthenaSealSvc.CheckDictionary = True - include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) theApp.Dlls += ["EventSelectorAthenaPool"] theApp.Dlls += [ "LArAthenaPoolPoolCnv" ] @@ -363,10 +360,6 @@ if ( doPhysOFC ) : LArPhysOFCAlg.StoreEmpty = True # clean up DB folder if ( writePOOLFile ) : - include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - AthenaSealSvc.CheckDictionary = True - AthenaSealSvc.OutputLevel = INFO - include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) theApp.Dlls += [ "LArAthenaPoolPoolCnv" ] theApp.Dlls += [ "LArCondAthenaPoolPoolCnv" ] diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_PhysWaveShifter_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_PhysWaveShifter_jobOptions.py index a1855bde666a..58eeaddf2f28 100644 --- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_PhysWaveShifter_jobOptions.py +++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_PhysWaveShifter_jobOptions.py @@ -237,9 +237,6 @@ if ( readNovaDB ) : # POOL # if ( readPOOLfile) : - include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - AthenaSealSvc.CheckDictionary = True - include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) theApp.Dlls += ["EventSelectorAthenaPool"] theApp.Dlls += [ "LArAthenaPoolPoolCnv" ] @@ -298,9 +295,6 @@ if ( writeNovaDB ) : IOVDbSvc.OutputLevel = INFO if ( writePOOLfile ) : - include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - AthenaSealSvc.CheckDictionary = True - include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) theApp.Dlls += [ "LArAthenaPoolPoolCnv" ] theApp.Dlls += [ "LArCondAthenaPoolPoolCnv" ] diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_RTMParams_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_RTMParams_jobOptions.py index d9e4a0c415f6..769bd5406417 100644 --- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_RTMParams_jobOptions.py +++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_RTMParams_jobOptions.py @@ -157,9 +157,6 @@ if ( WriteNT ) : # write extracted parameters to local POOL file # if ( WritePOOLFile ) : - include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - AthenaSealSvc.CheckDictionary = True - include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) theApp.Dlls += [ "LArAthenaPoolPoolCnv" ] theApp.Dlls += [ "LArCondAthenaPoolPoolCnv" ] diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_RTMPhysWaves_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_RTMPhysWaves_jobOptions.py index 1e2096a16cba..11db58a64b1f 100644 --- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_RTMPhysWaves_jobOptions.py +++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CTB04_RTMPhysWaves_jobOptions.py @@ -223,9 +223,6 @@ if ( WriteNT ) : LArWFParams2Ntuple.DetStoreSuffix = "_RTM" if ( WritePOOLFile ) : - include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - AthenaSealSvc.CheckDictionary = True - include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) theApp.Dlls += [ "LArAthenaPoolPoolCnv" ] theApp.Dlls += [ "LArCondAthenaPoolPoolCnv" ] diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CaliWaveMerger_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CaliWaveMerger_jobOptions.py index 112be1dae9dd..7a7ff9a81f47 100644 --- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CaliWaveMerger_jobOptions.py +++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_CaliWaveMerger_jobOptions.py @@ -59,9 +59,6 @@ ToolSvc.LArRoI_Map.Print = False # ############################################################################### -include("AthenaServices/AthenaSealSvc_joboptions.py") -AthenaSealSvc.CheckDictionary = True - include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) CondProxyProvider = Service( "CondProxyProvider" ) @@ -99,10 +96,6 @@ if ( WriteRootFile ) : NTupleSvc.Output = [ "FILE1 DATAFILE='"+RootFileName+"' OPT='NEW'" ] if ( WritePoolFile ) : - - include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - AthenaSealSvc.CheckDictionary = True - include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) include("RegistrationServices/OutputConditionsAlg_jobOptions.py") diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Example_CaliWaveMerger_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Example_CaliWaveMerger_jobOptions.py index f4ec8c2a457f..55c6bbcb7263 100644 --- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Example_CaliWaveMerger_jobOptions.py +++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Example_CaliWaveMerger_jobOptions.py @@ -40,9 +40,6 @@ DetFlags.em_setOn() # # Read POOL file(s) # -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = True - include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) theApp.Dlls += ["EventSelectorAthenaPool"] theApp.Dlls += ["LArAthenaPoolPoolCnv"] @@ -56,8 +53,6 @@ CondProxyProvider.InputCollections = PoolFileList EventPersistencySvc = Service( "EventPersistencySvc" ) EventPersistencySvc.CnvServices += [ "AthenaPoolCnvSvc" ] -include("AthenaServices/AthenaSealSvc_joboptions.py") - # # Merge LArCaliWaveContainers # @@ -81,9 +76,6 @@ if ( WriteNtuple ) : NTupleSvc.Output = [ "FILE1 DATAFILE='"+RootFileName+"' OPT='NEW'" ] if ( WritePOOLFile ) : - include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - AthenaSealSvc.CheckDictionary = True - include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) theApp.Dlls += [ "LArAthenaPoolPoolCnv" ] theApp.Dlls += [ "LArCondAthenaPoolPoolCnv" ] diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Example_ReadLocalConditionsPool.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Example_ReadLocalConditionsPool.py index 45ca6cbb35f7..88dd5efa8b09 100644 --- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Example_ReadLocalConditionsPool.py +++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Example_ReadLocalConditionsPool.py @@ -4,13 +4,10 @@ # ################################################################### -include("AthenaServices/AthenaSealSvc_joboptions.py") include("AthenaPoolCnvSvc/AthenaPool_jobOptions.py") include("LArAthenaPool/LArAthenaPool_joboptions.py" ) include("LArCondAthenaPool/LArCondAthenaPool_joboptions.py") -#AthenaSealSvc.CheckDictionary = True - CondProxyProvider = Service("CondProxyProvider") ProxyProviderSvc = Service("ProxyProviderSvc") ProxyProviderSvc.ProviderNames += [ "CondProxyProvider" ] diff --git a/LArCalorimeter/LArExample/LArConditionsCommon/share/CheckADC2MeV.py b/LArCalorimeter/LArExample/LArConditionsCommon/share/CheckADC2MeV.py index 73bcc37597f2..ec1f700ca65f 100755 --- a/LArCalorimeter/LArExample/LArConditionsCommon/share/CheckADC2MeV.py +++ b/LArCalorimeter/LArExample/LArConditionsCommon/share/CheckADC2MeV.py @@ -72,9 +72,6 @@ else: theApp.Dlls += ["LArCalibUtils"] -#AthenaSealSvc.DictNames += [ "LArRawChannelCnvDict" ] - - #-------------------------------------------------------------- # initialize Athena, then go to first event #-------------------------------------------------------------- diff --git a/LArCalorimeter/LArExample/LArConditionsCommon/share/DumpLArCondData_Config.py b/LArCalorimeter/LArExample/LArConditionsCommon/share/DumpLArCondData_Config.py index 7546034f6a15..32d5b8cc36ba 100755 --- a/LArCalorimeter/LArExample/LArConditionsCommon/share/DumpLArCondData_Config.py +++ b/LArCalorimeter/LArExample/LArConditionsCommon/share/DumpLArCondData_Config.py @@ -28,14 +28,6 @@ theApp.Dlls += [ "LArRawUtils" ] theApp.Dlls += [ "LArTools" ] theApp.Dlls += [ "LArConditionsTest" ] -#-------------------------------------------------------------- -# Load SEAL/POOL support -#-------------------------------------------------------------- -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# Check the dictionary in memory for completeness -AthenaSealSvc = Service( "AthenaSealSvc" ) -# AthenaSealSvc.CheckDictionary = True - # Make sure AthenaPoolServices is loaded for custom streamer include ("AthenaPoolServices/AthenaRootStreamerSvc_jobOptions.py") include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) diff --git a/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py b/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py index b51aa3a7b185..08b36ecbb1b6 100755 --- a/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py +++ b/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py @@ -182,8 +182,6 @@ include( "CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv_joboptions.py" ) #include("CaloIdCnv/CaloIdCnv_joboptions.py") -include ("AthenaServices/AthenaSealSvc_joboptions.py") - include( "LArConditionsCommon/LArConditionsCommon_comm_jobOptions.py" ) #if dspth: diff --git a/LArCalorimeter/LArExample/LArConditionsCommon/share/LArConditionsCopy.py b/LArCalorimeter/LArExample/LArConditionsCommon/share/LArConditionsCopy.py index b97d04fabea1..2c228edd7f2a 100644 --- a/LArCalorimeter/LArExample/LArConditionsCommon/share/LArConditionsCopy.py +++ b/LArCalorimeter/LArExample/LArConditionsCommon/share/LArConditionsCopy.py @@ -75,9 +75,6 @@ for obj in outObjects: outTags+=[tag] -include("AthenaServices/AthenaSealSvc_joboptions.py") -AthenaSealSvc.CheckDictionary = True - from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg theOutputConditionsAlg=OutputConditionsAlg("OutputConditionsAlg",OutputFile, outObjects,outTags,WriteIOV) diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_FcalIdFix7_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_FcalIdFix7_jobOptions.py index 137f87ac56fa..d4570fd61d36 100755 --- a/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_FcalIdFix7_jobOptions.py +++ b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_FcalIdFix7_jobOptions.py @@ -99,18 +99,8 @@ EventSelector.RunNumber=1 EventSelector.EventsPerRun=2 EventSelector.FirstEvent=1 -theApp.Dlls += [ "PoolSvc", "AthenaPoolCnvSvc", "AthenaPoolCnvSvcPoolCnv", "EventAthenaPoolPoolCnv", "EventSelectorAthenaPool" ] - include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) -theApp.Dlls += [ "AthenaPoolCnvSvc" ] -theApp.Dlls += [ "LArCondAthenaPoolPoolCnv" ] -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# AthenaSealSvc.CheckDictAtInit = True - -include ("LArRawConditions/LArRawConditionsDict_joboptions.py") -# include ("LArTools/LArToolsDict_joboptions.py") - theApp.EvtMax=1 AthenaEventLoopMgr=Service("AthenaEventLoopMgr") diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix3_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix3_jobOptions.py index 6851aa696cff..1491565ee6f9 100755 --- a/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix3_jobOptions.py +++ b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix3_jobOptions.py @@ -88,18 +88,8 @@ EventSelector.RunNumber=1 EventSelector.EventsPerRun=2 EventSelector.FirstEvent=1 -# theApp.Dlls += [ "PoolSvc", "AthenaPoolCnvSvc", "AthenaPoolCnvSvcPoolCnv", "EventAthenaPoolPoolCnv", "EventSelectorAthenaPool" ] - include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) -theApp.Dlls += [ "AthenaPoolCnvSvc" ] -theApp.Dlls += [ "LArCondAthenaPoolPoolCnv" ] -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# AthenaSealSvc.CheckDictAtInit = True - -include ("LArRawConditions/LArRawConditionsDict_joboptions.py") -# include ("LArTools/LArToolsDict_joboptions.py") - theApp.EvtMax=1 AthenaEventLoopMgr=Service("AthenaEventLoopMgr") diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix4_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix4_jobOptions.py index 9078a4d4f6f9..42f584f4d45a 100755 --- a/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix4_jobOptions.py +++ b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix4_jobOptions.py @@ -79,18 +79,8 @@ EventSelector.RunNumber=1 EventSelector.EventsPerRun=2 EventSelector.FirstEvent=1 -# theApp.Dlls += [ "PoolSvc", "AthenaPoolCnvSvc", "AthenaPoolCnvSvcPoolCnv", "EventAthenaPoolPoolCnv", "EventSelectorAthenaPool" ] - include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) -theApp.Dlls += [ "AthenaPoolCnvSvc" ] -theApp.Dlls += [ "LArCondAthenaPoolPoolCnv" ] -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# AthenaSealSvc.CheckDictAtInit = True - -include ("LArRawConditions/LArRawConditionsDict_joboptions.py") -# include ("LArTools/LArToolsDict_joboptions.py") - theApp.EvtMax=1 AthenaEventLoopMgr=Service("AthenaEventLoopMgr") diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix5_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix5_jobOptions.py index b67c38d6c71f..ea71ca03376e 100644 --- a/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix5_jobOptions.py +++ b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix5_jobOptions.py @@ -88,18 +88,8 @@ EventSelector.RunNumber=1 EventSelector.EventsPerRun=2 EventSelector.FirstEvent=1 -# theApp.Dlls += [ "PoolSvc", "AthenaPoolCnvSvc", "AthenaPoolCnvSvcPoolCnv", "EventAthenaPoolPoolCnv", "EventSelectorAthenaPool" ] - include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) -theApp.Dlls += [ "AthenaPoolCnvSvc" ] -theApp.Dlls += [ "LArCondAthenaPoolPoolCnv" ] -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# AthenaSealSvc.CheckDictAtInit = True - -include ("LArRawConditions/LArRawConditionsDict_joboptions.py") -# include ("LArTools/LArToolsDict_joboptions.py") - theApp.EvtMax=1 AthenaEventLoopMgr=Service("AthenaEventLoopMgr") diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix6_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix6_jobOptions.py index f9f87565a395..1a0295692fa8 100644 --- a/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix6_jobOptions.py +++ b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix6_jobOptions.py @@ -93,18 +93,8 @@ EventSelector.RunNumber=1 EventSelector.EventsPerRun=2 EventSelector.FirstEvent=1 -# theApp.Dlls += [ "PoolSvc", "AthenaPoolCnvSvc", "AthenaPoolCnvSvcPoolCnv", "EventAthenaPoolPoolCnv", "EventSelectorAthenaPool" ] - include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) -theApp.Dlls += [ "AthenaPoolCnvSvc" ] -theApp.Dlls += [ "LArCondAthenaPoolPoolCnv" ] -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# AthenaSealSvc.CheckDictAtInit = True - -include ("LArRawConditions/LArRawConditionsDict_joboptions.py") -# include ("LArTools/LArToolsDict_joboptions.py") - theApp.EvtMax=1 AthenaEventLoopMgr=Service("AthenaEventLoopMgr") diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix7_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix7_jobOptions.py index 2eb875634d05..7e9b7d9fdbe0 100644 --- a/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix7_jobOptions.py +++ b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix7_jobOptions.py @@ -99,18 +99,8 @@ EventSelector.RunNumber=1 EventSelector.EventsPerRun=2 EventSelector.FirstEvent=1 -# theApp.Dlls += [ "PoolSvc", "AthenaPoolCnvSvc", "AthenaPoolCnvSvcPoolCnv", "EventAthenaPoolPoolCnv", "EventSelectorAthenaPool" ] - include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) -theApp.Dlls += [ "AthenaPoolCnvSvc" ] -theApp.Dlls += [ "LArCondAthenaPoolPoolCnv" ] -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# AthenaSealSvc.CheckDictAtInit = True - -include ("LArRawConditions/LArRawConditionsDict_joboptions.py") -# include ("LArTools/LArToolsDict_joboptions.py") - theApp.EvtMax=1 AthenaEventLoopMgr=Service("AthenaEventLoopMgr") diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix8_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix8_jobOptions.py index 288ce4b3b541..72ca16270e64 100644 --- a/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix8_jobOptions.py +++ b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix8_jobOptions.py @@ -102,14 +102,6 @@ EventSelector.FirstEvent=1 include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) -theApp.Dlls += [ "AthenaPoolCnvSvc" ] -theApp.Dlls += [ "LArCondAthenaPoolPoolCnv" ] -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# AthenaSealSvc.CheckDictAtInit = True - -include ("LArRawConditions/LArRawConditionsDict_joboptions.py") -# include ("LArTools/LArToolsDict_joboptions.py") - theApp.EvtMax=1 MessageSvc = svcMgr.MessageSvc diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix9_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix9_jobOptions.py index ab2a55dff9cb..7e3bd345f06e 100644 --- a/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix9_jobOptions.py +++ b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix9_jobOptions.py @@ -103,14 +103,6 @@ EventSelector.FirstEvent=1 include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) -theApp.Dlls += [ "AthenaPoolCnvSvc" ] -theApp.Dlls += [ "LArCondAthenaPoolPoolCnv" ] -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# AthenaSealSvc.CheckDictAtInit = True - -#include ("LArRawConditions/LArRawConditionsDict_joboptions.py") -#include ("LArTools/LArToolsDict_joboptions.py") - theApp.EvtMax=1 MessageSvc = svcMgr.MessageSvc diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/FixLArIdMap_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArIdMap_jobOptions.py index f4e15c716f33..b4b5d396aa61 100755 --- a/LArCalorimeter/LArTest/LArCalibTest/share/FixLArIdMap_jobOptions.py +++ b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArIdMap_jobOptions.py @@ -104,19 +104,8 @@ include( "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py" ) include( "LArConditionsCommon/LArConditionsCommon_MC_jobOptions.py" ) include( "LArConditionsCommon/LArIdMap_MC_jobOptions.py" ) -theApp.Dlls += [ "LArTools" ] - - include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) -theApp.Dlls += [ "AthenaPoolCnvSvc" ] -theApp.Dlls += [ "LArCondAthenaPoolPoolCnv" ] -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# AthenaSealSvc.CheckDictAtInit = True - -include ("LArRawConditions/LArRawConditionsDict_joboptions.py") -# include ("LArTools/LArToolsDict_joboptions.py") - theApp.EvtMax=1 MessageSvc = svcMgr.MessageSvc diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertCTBConditonsToPool.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertCTBConditonsToPool.py index 244c4af99b91..18a2742516c4 100755 --- a/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertCTBConditonsToPool.py +++ b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertCTBConditonsToPool.py @@ -115,12 +115,6 @@ theApp.EvtMax = 1 include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) -theApp.Dlls += [ "AthenaPoolCnvSvc" ] -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# AthenaSealSvc.CheckDictionary = True -include ("DetDescrDictionary/DetDescrDictionaryDict_joboptions.py") -include ("LArRawConditions/LArRawConditionsDict_joboptions.py") - include( "LArCondAthenaPool/LArCondAthenaPool_joboptions.py" ) # include regstration alg (default is WriteIOV = False) diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH6ConditonsToPool.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH6ConditonsToPool.py index 0e8e36a962c7..71687d35181f 100755 --- a/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH6ConditonsToPool.py +++ b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH6ConditonsToPool.py @@ -117,12 +117,6 @@ theApp.EvtMax = 1 include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) -theApp.Dlls += [ "AthenaPoolCnvSvc" ] -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# AthenaSealSvc.CheckDictionary = True -include ("DetDescrDictionary/DetDescrDictionaryDict_joboptions.py") -include ("LArRawConditions/LArRawConditionsDict_joboptions.py") - include( "LArCondAthenaPool/LArCondAthenaPool_joboptions.py" ) # include regstration alg (default is WriteIOV = False) diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH6IdMapToPool.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH6IdMapToPool.py index 8925e326e595..056d857974e9 100755 --- a/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH6IdMapToPool.py +++ b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH6IdMapToPool.py @@ -40,15 +40,6 @@ EventSelector.FirstEvent=1 include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) -theApp.Dlls += [ "AthenaPoolCnvSvc" ] -theApp.Dlls += [ "LArCondAthenaPoolPoolCnv" ] -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = True -AthenaSealSvc.CheckDictAtInit = True - -include ("LArRawConditions/LArRawConditionsDict_joboptions.py") - - # Exercise writing the objects to NOVA (no IOV). theApp.OutStream =["StreamDet"] theApp.OutStreamType ="AthenaOutputStream" diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH8IdMapToPool.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH8IdMapToPool.py index 09dbe58e368b..5dd4bbf922bd 100755 --- a/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH8IdMapToPool.py +++ b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH8IdMapToPool.py @@ -40,15 +40,6 @@ EventSelector.FirstEvent=1 include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) -theApp.Dlls += [ "AthenaPoolCnvSvc" ] -theApp.Dlls += [ "LArCondAthenaPoolPoolCnv" ] -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = True -AthenaSealSvc.CheckDictAtInit = True - -include ("LArRawConditions/LArRawConditionsDict_joboptions.py") - - # Exercise writing the objects to NOVA (no IOV). theApp.OutStream =["StreamDet"] theApp.OutStreamType ="AthenaOutputStream" diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertMCNovaToPool.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertMCNovaToPool.py index 74ae8af37ea7..5f1a0a60d944 100755 --- a/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertMCNovaToPool.py +++ b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertMCNovaToPool.py @@ -94,12 +94,6 @@ EventSelector.FirstEvent=1 include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) -theApp.Dlls += [ "AthenaPoolCnvSvc" ] -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# AthenaSealSvc.CheckDictionary = True -include ("DetDescrDictionary/DetDescrDictionaryDict_joboptions.py") -include ("LArRawConditions/LArRawConditionsDict_joboptions.py") - include( "LArCondAthenaPool/LArCondAthenaPool_joboptions.py" ) theApp.EvtMax=1 diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertMCNovaToPool_DC3-05.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertMCNovaToPool_DC3-05.py index 9243974ff4a4..34832308a939 100755 --- a/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertMCNovaToPool_DC3-05.py +++ b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertMCNovaToPool_DC3-05.py @@ -97,12 +97,6 @@ EventSelector.FirstEvent=1 include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) -theApp.Dlls += [ "AthenaPoolCnvSvc" ] -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# AthenaSealSvc.CheckDictionary = True -include ("DetDescrDictionary/DetDescrDictionaryDict_joboptions.py") -include ("LArRawConditions/LArRawConditionsDict_joboptions.py") - include( "LArCondAthenaPool/LArCondAthenaPool_joboptions.py" ) theApp.EvtMax=1 diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/LArFecLvCTempTest_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArFecLvCTempTest_jobOptions.py index b5546459a486..74ff1076969a 100755 --- a/LArCalorimeter/LArTest/LArCalibTest/share/LArFecLvCTempTest_jobOptions.py +++ b/LArCalorimeter/LArTest/LArCalibTest/share/LArFecLvCTempTest_jobOptions.py @@ -39,11 +39,6 @@ include( "LArCondCnv/LArCondCnv_IdMapAtlas_jobOptions.py" ) #-------------------------------------------------------------- include ( "IOVDbSvc/IOVDbSvc_jobOptions.py" ) -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - #-------------------------------------------------------------- # Private Application Configuration options #-------------------------------------------------------------- diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/LArHVCommissionTest_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArHVCommissionTest_jobOptions.py index 51fab064f89d..e7c85b405af1 100755 --- a/LArCalorimeter/LArTest/LArCalibTest/share/LArHVCommissionTest_jobOptions.py +++ b/LArCalorimeter/LArTest/LArCalibTest/share/LArHVCommissionTest_jobOptions.py @@ -22,11 +22,6 @@ include( "LArIdCnv/LArIdCnv_joboptions.py" ) #-------------------------------------------------------------- include ( "IOVDbSvc/IOVDbSvc_jobOptions.py" ) -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - #-------------------------------------------------------------- # Private Application Configuration options #-------------------------------------------------------------- diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/LArReadHadDMCoeff.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArReadHadDMCoeff.py index 995fb62f8a4c..4b224d52ad14 100755 --- a/LArCalorimeter/LArTest/LArCalibTest/share/LArReadHadDMCoeff.py +++ b/LArCalorimeter/LArTest/LArCalibTest/share/LArReadHadDMCoeff.py @@ -22,10 +22,6 @@ theApp.EvtMax = 1 include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" ) -theApp.Dlls += [ "AthenaPoolCnvSvc" ] -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = True -include ("DetDescrDictionary/DetDescrDictionaryDict_joboptions.py") include("CaloCondAthenaPool/CaloCondAthenaPool_joboptions.py") from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArCondDataTest_jobOptions.py b/LArCalorimeter/LArTest/LArConditionsTest/share/LArCondDataTest_jobOptions.py index bd9f05e2b028..c493bb73bdd6 100755 --- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArCondDataTest_jobOptions.py +++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArCondDataTest_jobOptions.py @@ -89,13 +89,6 @@ EventSelector = Service( "EventSelector" ) # For the moment, only read one event to get conditions theApp.EvtMax = 1 -#-------------------------------------------------------------- -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# Check the dictionary in memory for completeness -AthenaSealSvc = Service( "AthenaSealSvc" ) -# AthenaSealSvc.CheckDictionary = True -AthenaSealSvc.OutputLevel = 3 - #-------------------------------------------------------------- # Load POOL support #-------------------------------------------------------------- diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest.ref b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest.ref index ec597394b3fd..c714288cb9d0 100644 --- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest.ref +++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest.ref @@ -1,7 +1,7 @@ -Thu May 21 18:33:58 CEST 2020 +Fri Jun 19 19:05:25 CEST 2020 Preloading tcmalloc_minimal.so Py:Athena INFO including file "AthenaCommon/Preparation.py" -Py:Athena INFO using release [WorkDir-22.0.14] [x86_64-centos7-gcc8-opt] [atlas-work3/a38808b681cd] -- built on [2020-05-21T1646] +Py:Athena INFO using release [WorkDir-22.0.15] [x86_64-centos7-gcc8-opt] [master/b9ffea6f446] -- built on [2020-06-18T1816] Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py" Py:Athena INFO executing ROOT6Setup Py:Athena INFO including file "AthenaCommon/Execution.py" @@ -11,9 +11,9 @@ Py:Athena INFO including file "AtlasGeoModel/SetGeometryVersion.py" AtlasGeoModel/SetGeometryVersion.py is OBSOLETE Py:Athena INFO SetGeometryVersion.py obtained major release version 22 Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py" -Py:ConfigurableDb INFO Read module info for 5533 configurables from 44 genConfDb files +Py:ConfigurableDb INFO Read module info for 5534 configurables from 58 genConfDb files Py:ConfigurableDb INFO No duplicates have been found: that's good ! -EventInfoMgtInit: Got release version Athena-22.0.14 +EventInfoMgtInit: Got release version Athena-22.0.15 Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200 Py:Athena INFO including file "LArRawConditions/LArIdMap_ATLAS_jobOptions.py" Py:Athena INFO including file "LArConditionsCommon/LArIdMap_MC_jobOptions.py" @@ -29,21 +29,19 @@ Py:Athena INFO including file "CaloConditions/CaloTTIdMap_ATLAS_jobOp Py:Athena INFO including file "CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv_joboptions.py" Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py" Py:Athena INFO including file "LArCondAthenaPool/LArCondAthenaPool_joboptions.py" -Py:Athena INFO including file "AthenaServices/AthenaSealSvc_joboptions.py" -Py:AthenaSealSvc INFO DictNames: [] Py:Athena INFO including file "AthenaCommon/runbatch.py" ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0 ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0 ApplicationMgr SUCCESS ==================================================================================================================================== Welcome to ApplicationMgr (GaudiCoreSvc v33r1) - running on lxplus7106.cern.ch on Thu May 21 18:34:11 2020 + running on aibuild20-040.cern.ch on Fri Jun 19 19:05:48 2020 ==================================================================================================================================== ApplicationMgr INFO Application Manager Configured successfully ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0 AthDictLoaderSvc INFO in initialize... AthDictLoaderSvc INFO acquired Dso-registry -ClassIDSvc INFO getRegistryEntries: read 3736 CLIDRegistry entries for module ALL +ClassIDSvc INFO getRegistryEntries: read 3634 CLIDRegistry entries for module ALL CoreDumpSvc INFO install f-a-t-a-l handler... (flag = -1) CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00 @@ -51,8 +49,8 @@ AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version Athena PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled PoolSvc INFO Frontier compression level set to 5 DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data -DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config -DBReplicaSvc INFO Total of 10 servers found for host lxplus7106.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ] +DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config +DBReplicaSvc INFO Total of 10 servers found for host aibuild20-040.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ] PoolSvc INFO Successfully setup replica sorting algorithm PoolSvc INFO Setting up APR FileCatalog and Streams PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables @@ -62,6 +60,7 @@ PoolSvc INFO POOL WriteCatalog is file:Catalog1.xml DbSession INFO Open DbSession Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All] MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([]) +OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00 IOVDbSvc INFO Opened read transaction for POOL PersistencySvc IOVDbSvc INFO Only 5 POOL conditions files will be open at once IOVDbSvc INFO Cache alignment will be done in 3 slices @@ -72,7 +71,7 @@ IOVDbSvc INFO Folder /LAR/Identifier/FebRodMap, adding new key tag w IOVDbFolder INFO Read from meta data only for folder /TagInfo IOVDbSvc INFO Initialised with 3 connections and 10 folders IOVDbSvc INFO Service IOVDbSvc initialised successfully -ClassIDSvc INFO getRegistryEntries: read 1967 CLIDRegistry entries for module ALL +ClassIDSvc INFO getRegistryEntries: read 1429 CLIDRegistry entries for module ALL IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found. IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" @@ -197,7 +196,7 @@ TileDddbManager INFO n_tilb = 21 TileDddbManager INFO n_tileSwitches = 1 CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store AtlasDetectorID INFO initialize_from_dictionary - OK -TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt +TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store TileHWID INFO initialize_from_dictionary AtlasDetectorID INFO initialize_from_dictionary - OK @@ -209,9 +208,9 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th AtlasDetectorID INFO initialize_from_dictionary - OK CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store AtlasDetectorID INFO initialize_from_dictionary - OK -LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt -LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt -LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt +LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt +LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt +LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store AtlasDetectorID INFO initialize_from_dictionary - OK LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID. @@ -219,7 +218,7 @@ AtlasDetectorID INFO initialize_from_dictionary - OK TileDetDescrMan... INFO Entering create_elements() ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00 -ClassIDSvc INFO getRegistryEntries: read 7030 CLIDRegistry entries for module ALL +ClassIDSvc INFO getRegistryEntries: read 7140 CLIDRegistry entries for module ALL CondInputLoader INFO Initializing CondInputLoader... CondInputLoader INFO Adding base classes: + ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/CalibIdMap' ) -> @@ -291,12 +290,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob AtlasDetectorID INFO initialize_from_dictionary - OK CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store AtlasDetectorID INFO initialize_from_dictionary - OK -LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt -LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt -LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt +LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt +LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt +LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store AtlasDetectorID INFO initialize_from_dictionary - OK -TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt +TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt AtlasDetectorID INFO initialize_from_dictionary - OK CaloIdMgrDetDes... INFO Finished CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv @@ -6906,28 +6905,28 @@ CondInputLoader INFO Finalizing CondInputLoader... IncidentProcAlg2 INFO Finalize EventSelector INFO finalize IdDictDetDescrCnv INFO in finalize -IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 5/1 objs/chan/bytes 5/1/840 (( 0.26 ))s -IOVDbFolder INFO Folder /LAR/Identifier/CalibIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/7600740 (( 0.20 ))s -IOVDbFolder INFO Folder /LAR/Identifier/FebRodMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/30500 (( 0.08 ))s -IOVDbFolder INFO Folder /LAR/Identifier/OnOffIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/3901460 (( 0.31 ))s +IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 5/1 objs/chan/bytes 5/1/840 (( 11.11 ))s +IOVDbFolder INFO Folder /LAR/Identifier/CalibIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/7600740 (( 7.42 ))s +IOVDbFolder INFO Folder /LAR/Identifier/FebRodMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/30500 (( 6.24 ))s +IOVDbFolder INFO Folder /LAR/Identifier/OnOffIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/3901460 (( 20.03 ))s IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s -IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/1 objs/chan/bytes 2/1/390 (( 0.03 ))s -IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 5/0 objs/chan/bytes 5/1/865 (( 0.08 ))s +IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/1 objs/chan/bytes 2/1/390 (( 2.01 ))s +IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 5/0 objs/chan/bytes 5/1/865 (( 5.96 ))s IOVDbFolder WARNING Folder /LAR/Identifier/LArTTCellMapAtlas is requested but no data retrieved -IOVDbSvc INFO bytes in (( 0.96 ))s +IOVDbSvc INFO bytes in (( 52.77 ))s IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s -IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 6 nFolders: 6 ReadTime: (( 0.96 ))s +IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 6 nFolders: 6 ReadTime: (( 52.77 ))s IOVDbSvc INFO Connection COOLOFL_CALO/OFLP200 : nConnect: 1 nFolders: 3 ReadTime: (( 0.00 ))s AthDictLoaderSvc INFO in finalize... ToolSvc INFO Removing all tools created by ToolSvc *****Chrono***** INFO **************************************************************************************************** *****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered) *****Chrono***** INFO **************************************************************************************************** -cObjR_ALL INFO Time User : Tot= 430 [ms] Ave/Min/Max= 215(+- 205)/ 10/ 420 [ms] #= 2 -cObj_ALL INFO Time User : Tot= 0.5 [s] Ave/Min/Max= 0.1(+- 0.19)/ 0/ 0.48 [s] #= 5 -ChronoStatSvc INFO Time User : Tot= 3.61 [s] #= 1 +cObjR_ALL INFO Time User : Tot= 480 [ms] Ave/Min/Max= 240(+- 220)/ 20/ 460 [ms] #= 2 +cObj_ALL INFO Time User : Tot= 0.56 [s] Ave/Min/Max=0.112(+-0.205)/ 0/ 0.52 [s] #= 5 +ChronoStatSvc INFO Time User : Tot= 3.22 [s] #= 1 *****Chrono***** INFO **************************************************************************************************** ChronoStatSvc.f... INFO Service finalized successfully ApplicationMgr INFO Application Manager Finalized successfully diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestMC_jobOptions.py b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestMC_jobOptions.py index b4b6c3a737c0..34082c6d6515 100755 --- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestMC_jobOptions.py +++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestMC_jobOptions.py @@ -103,13 +103,6 @@ LArConditionsTestAlg.TestMC = True; # For the moment, only read one event to get conditions theApp.EvtMax = 1 -#-------------------------------------------------------------- -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# Check the dictionary in memory for completeness -AthenaSealSvc = Service( "AthenaSealSvc" ) -# AthenaSealSvc.CheckDictionary = True -AthenaSealSvc.OutputLevel = 3 - #-------------------------------------------------------------- # Load POOL support #-------------------------------------------------------------- diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadAndReg_jobOptions.py b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadAndReg_jobOptions.py index 537e65693a9a..42f28e4f1213 100755 --- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadAndReg_jobOptions.py +++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadAndReg_jobOptions.py @@ -92,15 +92,6 @@ EventSelector = svcMgr.EventSelector # For the moment, only read one event to get conditions theApp.EvtMax = 1 -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# Check the dictionary in memory for completeness -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = TRUE -AthenaSealSvc.OutputLevel = 3 - #-------------------------------------------------------------- # Load POOL support #-------------------------------------------------------------- diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoCorr_jobOptions.py b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoCorr_jobOptions.py index d0ca552cfbfc..6297f7976a5b 100755 --- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoCorr_jobOptions.py +++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoCorr_jobOptions.py @@ -103,15 +103,6 @@ IOVDbSvc.Folders += [ "/LArCalorimeter/LArTests/LArRampsFeedThroughGrouping" ] # Set DB connection IOVDbSvc.dbConnection = "impl=cool;techno=oracle;devdb10:LARCORR:ATLAS_COOLTEST:cool4devdb" -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# Check the dictionary in memory for completeness -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = TRUE -AthenaSealSvc.OutputLevel = 3 - #-------------------------------------------------------------- # Load POOL support #-------------------------------------------------------------- diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg.ref b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg.ref index 51432591bcb8..85d5b729542f 100644 --- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg.ref +++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg.ref @@ -1,7 +1,7 @@ -Thu May 21 18:50:21 CEST 2020 +Fri Jun 19 19:12:26 CEST 2020 Preloading tcmalloc_minimal.so Py:Athena INFO including file "AthenaCommon/Preparation.py" -Py:Athena INFO using release [WorkDir-22.0.14] [x86_64-centos7-gcc8-opt] [atlas-work3/a38808b681cd] -- built on [2020-05-21T1646] +Py:Athena INFO using release [WorkDir-22.0.15] [x86_64-centos7-gcc8-opt] [master/b9ffea6f446] -- built on [2020-06-18T1816] Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py" Py:Athena INFO executing ROOT6Setup Py:Athena INFO including file "AthenaCommon/Execution.py" @@ -11,9 +11,9 @@ Py:Athena INFO including file "AtlasGeoModel/SetGeometryVersion.py" AtlasGeoModel/SetGeometryVersion.py is OBSOLETE Py:Athena INFO SetGeometryVersion.py obtained major release version 22 Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py" -Py:ConfigurableDb INFO Read module info for 5533 configurables from 44 genConfDb files +Py:ConfigurableDb INFO Read module info for 5534 configurables from 58 genConfDb files Py:ConfigurableDb INFO No duplicates have been found: that's good ! -EventInfoMgtInit: Got release version Athena-22.0.14 +EventInfoMgtInit: Got release version Athena-22.0.15 Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200 Py:Athena INFO including file "LArRawConditions/LArIdMap_ATLAS_jobOptions.py" Py:Athena INFO including file "LArConditionsCommon/LArIdMap_MC_jobOptions.py" @@ -29,8 +29,6 @@ Py:Athena INFO including file "CaloConditions/CaloTTIdMap_ATLAS_jobOp Py:Athena INFO including file "CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv_joboptions.py" Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py" Py:Athena INFO including file "LArCondAthenaPool/LArCondAthenaPool_joboptions.py" -Py:Athena INFO including file "AthenaServices/AthenaSealSvc_joboptions.py" -Py:AthenaSealSvc INFO DictNames: [] Py:Athena INFO including file "AthenaPoolServices/AthenaRootStreamerSvc_jobOptions.py" Py:Athena INFO including file "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" Py:Athena INFO including file "AthenaCommon/runbatch.py" @@ -39,13 +37,13 @@ ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to leve ApplicationMgr SUCCESS ==================================================================================================================================== Welcome to ApplicationMgr (GaudiCoreSvc v33r1) - running on lxplus7106.cern.ch on Thu May 21 18:50:34 2020 + running on aibuild20-040.cern.ch on Fri Jun 19 19:12:42 2020 ==================================================================================================================================== ApplicationMgr INFO Application Manager Configured successfully ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0 AthDictLoaderSvc INFO in initialize... AthDictLoaderSvc INFO acquired Dso-registry -ClassIDSvc INFO getRegistryEntries: read 3736 CLIDRegistry entries for module ALL +ClassIDSvc INFO getRegistryEntries: read 3634 CLIDRegistry entries for module ALL CoreDumpSvc INFO install f-a-t-a-l handler... (flag = -1) CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00 @@ -53,8 +51,8 @@ AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version Athena PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled PoolSvc INFO Frontier compression level set to 5 DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data -DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config -DBReplicaSvc INFO Total of 10 servers found for host lxplus7106.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ] +DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config +DBReplicaSvc INFO Total of 10 servers found for host aibuild20-040.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ] PoolSvc INFO Successfully setup replica sorting algorithm PoolSvc INFO Setting up APR FileCatalog and Streams PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables @@ -64,6 +62,7 @@ PoolSvc INFO POOL WriteCatalog is file:Catalog2.xml DbSession INFO Open DbSession Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All] MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([]) +OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00 IOVDbSvc INFO Opened read transaction for POOL PersistencySvc IOVDbSvc INFO Only 5 POOL conditions files will be open at once IOVDbSvc INFO Cache alignment will be done in 3 slices @@ -75,10 +74,10 @@ IOVDbFolder INFO Read from meta data only for folder /TagInfo IOVDbSvc INFO Initialised with 3 connections and 10 folders IOVDbSvc INFO Service IOVDbSvc initialised successfully CondProxyProvider INFO Initializing CondProxyProvider - package version EventSelectorAthenaPool-00-00-00 -Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 45F2DD4D-41E2-5E4B-A8AB-77C060E29F59 +Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] A6B968DB-9C78-4148-9C5C-A41979AF763A Domain[ROOT_All] INFO LarCondTestNoReg.root RootDatabase.open INFO LarCondTestNoReg.root File version:62002 -ClassIDSvc INFO getRegistryEntries: read 4616 CLIDRegistry entries for module ALL +ClassIDSvc INFO getRegistryEntries: read 4078 CLIDRegistry entries for module ALL IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found. IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" @@ -96,7 +95,7 @@ IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTPp IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/LArTTCellMapAtlas LarCondTestNoRe... INFO Database being retired... -Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 45F2DD4D-41E2-5E4B-A8AB-77C060E29F59 +Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] A6B968DB-9C78-4148-9C5C-A41979AF763A Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All] ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL EventPersistenc... INFO Added successfully Conversion service:McCnvSvc @@ -143,7 +142,7 @@ EventPersistenc... INFO Added successfully Conversion service:DetDescrCnvSvc EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc DbSession INFO Open DbSession Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All] -Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 45F2DD4D-41E2-5E4B-A8AB-77C060E29F59 +Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] A6B968DB-9C78-4148-9C5C-A41979AF763A Domain[ROOT_All] INFO LarCondTestNoReg.root RootDatabase.open INFO LarCondTestNoReg.root File version:62002 ClassIDSvc INFO getRegistryEntries: read 161 CLIDRegistry entries for module ALL @@ -213,7 +212,7 @@ TileDddbManager INFO n_tilb = 21 TileDddbManager INFO n_tileSwitches = 1 CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store AtlasDetectorID INFO initialize_from_dictionary - OK -TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt +TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store TileHWID INFO initialize_from_dictionary AtlasDetectorID INFO initialize_from_dictionary - OK @@ -225,9 +224,9 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th AtlasDetectorID INFO initialize_from_dictionary - OK CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store AtlasDetectorID INFO initialize_from_dictionary - OK -LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt -LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt -LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt +LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt +LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt +LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store AtlasDetectorID INFO initialize_from_dictionary - OK LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID. @@ -235,7 +234,7 @@ AtlasDetectorID INFO initialize_from_dictionary - OK TileDetDescrMan... INFO Entering create_elements() ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00 -ClassIDSvc INFO getRegistryEntries: read 5438 CLIDRegistry entries for module ALL +ClassIDSvc INFO getRegistryEntries: read 5548 CLIDRegistry entries for module ALL CondInputLoader INFO Initializing CondInputLoader... CondInputLoader INFO Adding base classes: + ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/CalibIdMap' ) -> @@ -306,12 +305,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob AtlasDetectorID INFO initialize_from_dictionary - OK CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store AtlasDetectorID INFO initialize_from_dictionary - OK -LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt -LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt -LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt +LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt +LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt +LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store AtlasDetectorID INFO initialize_from_dictionary - OK -TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt +TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt AtlasDetectorID INFO initialize_from_dictionary - OK CaloIdMgrDetDes... INFO Finished CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv @@ -6253,7 +6252,7 @@ LArConditionsTe... DEBUG Total number of correction objects 20 LArConditionsTe... DEBUG End of testCondObjects AthenaEventLoopMgr INFO ===>>> done processing event #0, run #0 1 events processed so far <<<=== LarCondTestNoRe... INFO Database being retired... -Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 45F2DD4D-41E2-5E4B-A8AB-77C060E29F59 +Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] A6B968DB-9C78-4148-9C5C-A41979AF763A /cvmfs/atlas-co... INFO Database being retired... Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] E01BD448-BF95-DB11-983E-0015C5098AA3 /cvmfs/atlas-co... INFO Database being retired... @@ -6265,28 +6264,28 @@ CondInputLoader INFO Finalizing CondInputLoader... IncidentProcAlg2 INFO Finalize EventSelector INFO finalize IdDictDetDescrCnv INFO in finalize -IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 5/1 objs/chan/bytes 5/1/840 (( 0.23 ))s -IOVDbFolder INFO Folder /LAR/Identifier/CalibIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/7600740 (( 0.15 ))s -IOVDbFolder INFO Folder /LAR/Identifier/FebRodMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/30500 (( 0.11 ))s -IOVDbFolder INFO Folder /LAR/Identifier/OnOffIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/3901460 (( 0.30 ))s +IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 5/1 objs/chan/bytes 5/1/840 (( 1.33 ))s +IOVDbFolder INFO Folder /LAR/Identifier/CalibIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/7600740 (( 1.31 ))s +IOVDbFolder INFO Folder /LAR/Identifier/FebRodMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/30500 (( 0.17 ))s +IOVDbFolder INFO Folder /LAR/Identifier/OnOffIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/3901460 (( 0.76 ))s IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s -IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/1 objs/chan/bytes 2/1/390 (( 0.10 ))s -IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 5/0 objs/chan/bytes 5/1/865 (( 0.27 ))s +IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/1 objs/chan/bytes 2/1/390 (( 0.03 ))s +IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 5/0 objs/chan/bytes 5/1/865 (( 0.22 ))s IOVDbFolder WARNING Folder /LAR/Identifier/LArTTCellMapAtlas is requested but no data retrieved -IOVDbSvc INFO bytes in (( 1.17 ))s +IOVDbSvc INFO bytes in (( 3.82 ))s IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s -IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 6 nFolders: 6 ReadTime: (( 1.17 ))s +IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 6 nFolders: 6 ReadTime: (( 3.82 ))s IOVDbSvc INFO Connection COOLOFL_CALO/OFLP200 : nConnect: 1 nFolders: 3 ReadTime: (( 0.00 ))s AthDictLoaderSvc INFO in finalize... ToolSvc INFO Removing all tools created by ToolSvc *****Chrono***** INFO **************************************************************************************************** *****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered) *****Chrono***** INFO **************************************************************************************************** -cObjR_ALL INFO Time User : Tot= 300 [ms] Ave/Min/Max= 1.17(+- 16.8)/ 0/ 270 [ms] #=257 -cObj_ALL INFO Time User : Tot= 400 [ms] Ave/Min/Max= 44.4(+- 98.6)/ 0/ 320 [ms] #= 9 -ChronoStatSvc INFO Time User : Tot= 3.7 [s] #= 1 +cObjR_ALL INFO Time User : Tot= 300 [ms] Ave/Min/Max= 1.17(+- 18.1)/ 0/ 290 [ms] #=257 +cObj_ALL INFO Time User : Tot= 400 [ms] Ave/Min/Max= 44.4(+- 102)/ 0/ 330 [ms] #= 9 +ChronoStatSvc INFO Time User : Tot= 3.2 [s] #= 1 *****Chrono***** INFO **************************************************************************************************** ChronoStatSvc.f... INFO Service finalized successfully ApplicationMgr INFO Application Manager Finalized successfully diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg_jobOptions.py b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg_jobOptions.py index 44c533a26ab1..0eec7035d55f 100755 --- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg_jobOptions.py +++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg_jobOptions.py @@ -91,15 +91,6 @@ EventSelector = svcMgr.EventSelector # For the moment, only read one event to get conditions theApp.EvtMax = 1 -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# Check the dictionary in memory for completeness -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = TRUE -AthenaSealSvc.OutputLevel = 3 - #-------------------------------------------------------------- # Load POOL support #-------------------------------------------------------------- diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestRead_jobOptions.py b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestRead_jobOptions.py index c796ec52bc35..e39a8890dc2c 100755 --- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestRead_jobOptions.py +++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestRead_jobOptions.py @@ -114,15 +114,6 @@ except: IOVDbSvc.dbConnection = "impl=cool;techno=oracle;devdb10:LARTEST:ATLAS_COOLTEST:cool4devdb" #IOVDbSvc.OutputLevel = 1 -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# Check the dictionary in memory for completeness -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = TRUE -AthenaSealSvc.OutputLevel = 3 - #-------------------------------------------------------------- # Load POOL support #-------------------------------------------------------------- diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteCorr_jobOptions.py b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteCorr_jobOptions.py index 2093cdfc01a3..7f4b7dc7daff 100755 --- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteCorr_jobOptions.py +++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteCorr_jobOptions.py @@ -86,15 +86,6 @@ EventSelector = Service( "EventSelector" ) # For the moment, only read one event to get conditions theApp.EvtMax = 1 -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# Check the dictionary in memory for completeness -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = TRUE -AthenaSealSvc.OutputLevel = 3 - #-------------------------------------------------------------- # Use OutputConditionsAlg to write #-------------------------------------------------------------- diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoCorr_jobOptions.py b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoCorr_jobOptions.py index c3e370aa62bb..89fbcc32417d 100755 --- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoCorr_jobOptions.py +++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoCorr_jobOptions.py @@ -86,15 +86,6 @@ EventSelector = Service( "EventSelector" ) # For the moment, only read one event to get conditions theApp.EvtMax = 1 -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# Check the dictionary in memory for completeness -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = TRUE -AthenaSealSvc.OutputLevel = 3 - #-------------------------------------------------------------- # Use OutputConditionsAlg to write #-------------------------------------------------------------- diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg.ref b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg.ref index a1c38459619e..ba1c29c7550f 100644 --- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg.ref +++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg.ref @@ -1,7 +1,7 @@ -Thu May 21 18:52:24 CEST 2020 +Fri Jun 19 19:10:37 CEST 2020 Preloading tcmalloc_minimal.so Py:Athena INFO including file "AthenaCommon/Preparation.py" -Py:Athena INFO using release [WorkDir-22.0.14] [x86_64-centos7-gcc8-opt] [atlas-work3/a38808b681cd] -- built on [2020-05-21T1646] +Py:Athena INFO using release [WorkDir-22.0.15] [x86_64-centos7-gcc8-opt] [master/b9ffea6f446] -- built on [2020-06-18T1816] Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py" Py:Athena INFO executing ROOT6Setup Py:Athena INFO including file "AthenaCommon/Execution.py" @@ -11,9 +11,9 @@ Py:Athena INFO including file "AtlasGeoModel/SetGeometryVersion.py" AtlasGeoModel/SetGeometryVersion.py is OBSOLETE Py:Athena INFO SetGeometryVersion.py obtained major release version 22 Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py" -Py:ConfigurableDb INFO Read module info for 5533 configurables from 44 genConfDb files +Py:ConfigurableDb INFO Read module info for 5534 configurables from 58 genConfDb files Py:ConfigurableDb INFO No duplicates have been found: that's good ! -EventInfoMgtInit: Got release version Athena-22.0.14 +EventInfoMgtInit: Got release version Athena-22.0.15 Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200 Py:Athena INFO including file "LArRawConditions/LArIdMap_ATLAS_jobOptions.py" Py:Athena INFO including file "LArConditionsCommon/LArIdMap_MC_jobOptions.py" @@ -29,8 +29,6 @@ Py:Athena INFO including file "CaloConditions/CaloTTIdMap_ATLAS_jobOp Py:Athena INFO including file "CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv_joboptions.py" Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py" Py:Athena INFO including file "LArCondAthenaPool/LArCondAthenaPool_joboptions.py" -Py:Athena INFO including file "AthenaServices/AthenaSealSvc_joboptions.py" -Py:AthenaSealSvc INFO DictNames: [] Py:Athena INFO including file "LArCondAthenaPool/LArCondAthenaPool_joboptions.py" Py:Athena INFO including file "AthenaCommon/runbatch.py" ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0 @@ -38,13 +36,13 @@ ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to leve ApplicationMgr SUCCESS ==================================================================================================================================== Welcome to ApplicationMgr (GaudiCoreSvc v33r1) - running on lxplus7106.cern.ch on Thu May 21 18:52:37 2020 + running on aibuild20-040.cern.ch on Fri Jun 19 19:10:55 2020 ==================================================================================================================================== ApplicationMgr INFO Application Manager Configured successfully ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0 AthDictLoaderSvc INFO in initialize... AthDictLoaderSvc INFO acquired Dso-registry -ClassIDSvc INFO getRegistryEntries: read 3736 CLIDRegistry entries for module ALL +ClassIDSvc INFO getRegistryEntries: read 3634 CLIDRegistry entries for module ALL CoreDumpSvc INFO install f-a-t-a-l handler... (flag = -1) CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00 @@ -52,8 +50,8 @@ AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version Athena PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled PoolSvc INFO Frontier compression level set to 5 DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data -DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config -DBReplicaSvc INFO Total of 10 servers found for host lxplus7106.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ] +DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config +DBReplicaSvc INFO Total of 10 servers found for host aibuild20-040.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ] PoolSvc INFO Successfully setup replica sorting algorithm PoolSvc INFO Setting up APR FileCatalog and Streams PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables @@ -63,6 +61,7 @@ PoolSvc INFO POOL WriteCatalog is file:Catalog3.xml DbSession INFO Open DbSession Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All] MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([]) +OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00 IOVDbSvc INFO Opened read transaction for POOL PersistencySvc IOVDbSvc INFO Only 5 POOL conditions files will be open at once IOVDbSvc INFO Cache alignment will be done in 3 slices @@ -73,7 +72,7 @@ IOVDbSvc INFO Folder /LAR/Identifier/FebRodMap, adding new key tag w IOVDbFolder INFO Read from meta data only for folder /TagInfo IOVDbSvc INFO Initialised with 3 connections and 10 folders IOVDbSvc INFO Service IOVDbSvc initialised successfully -ClassIDSvc INFO getRegistryEntries: read 1967 CLIDRegistry entries for module ALL +ClassIDSvc INFO getRegistryEntries: read 1429 CLIDRegistry entries for module ALL IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found. IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" @@ -198,7 +197,7 @@ TileDddbManager INFO n_tilb = 21 TileDddbManager INFO n_tileSwitches = 1 CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store AtlasDetectorID INFO initialize_from_dictionary - OK -TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt +TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store TileHWID INFO initialize_from_dictionary AtlasDetectorID INFO initialize_from_dictionary - OK @@ -210,9 +209,9 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th AtlasDetectorID INFO initialize_from_dictionary - OK CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store AtlasDetectorID INFO initialize_from_dictionary - OK -LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt -LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt -LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt +LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt +LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt +LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store AtlasDetectorID INFO initialize_from_dictionary - OK LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID. @@ -220,7 +219,7 @@ AtlasDetectorID INFO initialize_from_dictionary - OK TileDetDescrMan... INFO Entering create_elements() ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00 -ClassIDSvc INFO getRegistryEntries: read 7030 CLIDRegistry entries for module ALL +ClassIDSvc INFO getRegistryEntries: read 7140 CLIDRegistry entries for module ALL CondInputLoader INFO Initializing CondInputLoader... CondInputLoader INFO Adding base classes: + ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/CalibIdMap' ) -> @@ -293,12 +292,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob AtlasDetectorID INFO initialize_from_dictionary - OK CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store AtlasDetectorID INFO initialize_from_dictionary - OK -LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt -LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt -LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt +LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt +LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt +LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store AtlasDetectorID INFO initialize_from_dictionary - OK -TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-20T2143/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt +TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt AtlasDetectorID INFO initialize_from_dictionary - OK CaloIdMgrDetDes... INFO Finished CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv @@ -6908,12 +6907,12 @@ CondInputLoader INFO Finalizing CondInputLoader... OutputCondition... INFO Finalize: preparing to write conditions objects DbSession INFO Open DbSession Domain[ROOT_All] INFO > Access DbDomain UPDATE [ROOT_All] -Domain[ROOT_All] INFO -> Access DbDatabase CREATE [ROOT_All] 45F2DD4D-41E2-5E4B-A8AB-77C060E29F59 +Domain[ROOT_All] INFO -> Access DbDatabase CREATE [ROOT_All] A6B968DB-9C78-4148-9C5C-A41979AF763A Domain[ROOT_All] INFO LarCondTestNoReg.root RootDatabase.open INFO LarCondTestNoReg.root File version:62002 +ClassIDSvc INFO getRegistryEntries: read 33 CLIDRegistry entries for module ALL OutputCondition... INFO Identified a total of 3 objects to write out: OutputCondition... INFO 0: LArRampMC#/LArCalorimeter/LArTests/LArRampsSingleGroup#/LArCalorimeter/LArTests/LArRampsSingleGroup -ClassIDSvc INFO getRegistryEntries: read 33 CLIDRegistry entries for module ALL OutputCondition... INFO 1: LArRampMC#/LArCalorimeter/LArTests/LArRampsSubDetectorGrouping#/LArCalorimeter/LArTests/LArRampsSubDetectorGrouping OutputCondition... INFO 2: LArRampMC#/LArCalorimeter/LArTests/LArRampsFeedThroughGrouping#/LArCalorimeter/LArTests/LArRampsFeedThroughGrouping StorageSvc INFO Building shape according to reflection information using shape ID for: @@ -6935,23 +6934,23 @@ OutputCondition... INFO Registered 3 objects in IOV database IncidentProcAlg2 INFO Finalize EventSelector INFO finalize IdDictDetDescrCnv INFO in finalize -IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 5/1 objs/chan/bytes 5/1/840 (( 0.28 ))s -IOVDbFolder INFO Folder /LAR/Identifier/CalibIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/7600740 (( 0.16 ))s -IOVDbFolder INFO Folder /LAR/Identifier/FebRodMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/30500 (( 0.10 ))s -IOVDbFolder INFO Folder /LAR/Identifier/OnOffIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/3901460 (( 0.37 ))s +IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 5/1 objs/chan/bytes 5/1/840 (( 9.49 ))s +IOVDbFolder INFO Folder /LAR/Identifier/CalibIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/7600740 (( 1.37 ))s +IOVDbFolder INFO Folder /LAR/Identifier/FebRodMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/30500 (( 1.73 ))s +IOVDbFolder INFO Folder /LAR/Identifier/OnOffIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/3901460 (( 4.75 ))s IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s -IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/1 objs/chan/bytes 2/1/390 (( 0.04 ))s -IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 5/0 objs/chan/bytes 5/1/865 (( 0.08 ))s +IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/1 objs/chan/bytes 2/1/390 (( 0.13 ))s +IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 5/0 objs/chan/bytes 5/1/865 (( 0.48 ))s IOVDbFolder WARNING Folder /LAR/Identifier/LArTTCellMapAtlas is requested but no data retrieved -IOVDbSvc INFO bytes in (( 1.04 ))s +IOVDbSvc INFO bytes in (( 17.95 ))s IOVDbSvc INFO Disconnecting from sqlite://;schema=mycool.db;dbname=OFLP200 IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 1 nFolders: 0 ReadTime: (( 0.00 ))s -IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 6 nFolders: 6 ReadTime: (( 1.04 ))s +IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 6 nFolders: 6 ReadTime: (( 17.95 ))s IOVDbSvc INFO Connection COOLOFL_CALO/OFLP200 : nConnect: 1 nFolders: 3 ReadTime: (( 0.00 ))s LarCondTestNoRe... INFO Database being retired... -Domain[ROOT_All] INFO -> Deaccess DbDatabase CREATE [ROOT_All] 45F2DD4D-41E2-5E4B-A8AB-77C060E29F59 +Domain[ROOT_All] INFO -> Deaccess DbDatabase CREATE [ROOT_All] A6B968DB-9C78-4148-9C5C-A41979AF763A Domain[ROOT_All] INFO > Deaccess DbDomain UPDATE [ROOT_All] AthDictLoaderSvc INFO in finalize... ToolSvc INFO Removing all tools created by ToolSvc @@ -6962,9 +6961,9 @@ fRep_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0 commitOutput INFO Time User : Tot= 10 [ms] #= 1 cRepR_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max=0.0784(+-0.882)/ 0/ 10 [ms] #=255 cRep_ALL INFO Time User : Tot= 100 [ms] Ave/Min/Max= 25(+- 37.7)/ 0/ 90 [ms] #= 4 -cObjR_ALL INFO Time User : Tot= 420 [ms] Ave/Min/Max= 210(+- 200)/ 10/ 410 [ms] #= 2 -cObj_ALL INFO Time User : Tot= 490 [ms] Ave/Min/Max= 98(+- 186)/ 0/ 470 [ms] #= 5 -ChronoStatSvc INFO Time User : Tot= 4.35 [s] #= 1 +cObjR_ALL INFO Time User : Tot= 400 [ms] Ave/Min/Max= 200(+- 190)/ 10/ 390 [ms] #= 2 +cObj_ALL INFO Time User : Tot= 460 [ms] Ave/Min/Max= 92(+- 174)/ 0/ 440 [ms] #= 5 +ChronoStatSvc INFO Time User : Tot= 3.55 [s] #= 1 *****Chrono***** INFO **************************************************************************************************** ChronoStatSvc.f... INFO Service finalized successfully ApplicationMgr INFO Application Manager Finalized successfully diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg_jobOptions.py b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg_jobOptions.py index aed727d51068..e8b964fbedea 100755 --- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg_jobOptions.py +++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg_jobOptions.py @@ -90,15 +90,6 @@ EventSelector = svcMgr.EventSelector # For the moment, only read one event to get conditions theApp.EvtMax = 1 -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# Check the dictionary in memory for completeness -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = TRUE -AthenaSealSvc.OutputLevel = 3 - #-------------------------------------------------------------- # Include the needed converters #-------------------------------------------------------------- diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteObjRel_jobOptions.py b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteObjRel_jobOptions.py index 1b60b53621e6..82d01da4c0ac 100755 --- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteObjRel_jobOptions.py +++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteObjRel_jobOptions.py @@ -86,15 +86,6 @@ EventSelector = Service( "EventSelector" ) # For the moment, only read one event to get conditions theApp.EvtMax = 1 -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# Check the dictionary in memory for completeness -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = TRUE -AthenaSealSvc.OutputLevel = 3 - #-------------------------------------------------------------- # Use OutputConditionsAlg to write #-------------------------------------------------------------- diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWrite_jobOptions.py b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWrite_jobOptions.py index 84c2c06d65c3..341145c3dc8c 100755 --- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWrite_jobOptions.py +++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWrite_jobOptions.py @@ -86,15 +86,6 @@ EventSelector = Service( "EventSelector" ) # For the moment, only read one event to get conditions theApp.EvtMax = 1 -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# Check the dictionary in memory for completeness -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = TRUE -AthenaSealSvc.OutputLevel = 3 - #-------------------------------------------------------------- # Use OutputConditionsAlg to write #-------------------------------------------------------------- diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest_jobOptions.py b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest_jobOptions.py index d45026759229..bc2b1e3839ff 100755 --- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest_jobOptions.py +++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest_jobOptions.py @@ -97,15 +97,6 @@ EventSelector = svcMgr.EventSelector # For the moment, only read one event to get conditions theApp.EvtMax = 1 -#-------------------------------------------------------------- -# Make sure AthenaSealSvc is loaded for dict check -#-------------------------------------------------------------- -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -# Check the dictionary in memory for completeness -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = TRUE -AthenaSealSvc.OutputLevel = 3 - #-------------------------------------------------------------- # Load POOL support #-------------------------------------------------------------- diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonDigitToPool_jobOptions.py b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonDigitToPool_jobOptions.py index abc742ac848f..e9a8f8b31498 100644 --- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonDigitToPool_jobOptions.py +++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonDigitToPool_jobOptions.py @@ -4,10 +4,6 @@ # Load POOL support include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" ) -# check dictionary -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - -#AthenaSealSvc.CheckDictionary = true; # Define the output Db parameters (the default value are shown) Stream1.OutputFile = "MuonPool.root" diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonRdoToPool_jobOptions.py b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonRdoToPool_jobOptions.py index da01f21cf236..ad8cfd0eb610 100644 --- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonRdoToPool_jobOptions.py +++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonRdoToPool_jobOptions.py @@ -4,10 +4,6 @@ # Load POOL support include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" ) -# check dictionary -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - -#AthenaSealSvc.CheckDictionary = true; # Define the output Db parameters (the default value are shown) Stream1.OutputFile = "MuonPool.root" diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/share/MDT_DigitizationStandalone_jobOptions.py b/MuonSpectrometer/MuonDigitization/MDT_Digitization/share/MDT_DigitizationStandalone_jobOptions.py index c1e6ed6209aa..36daaf11736b 100644 --- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/share/MDT_DigitizationStandalone_jobOptions.py +++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/share/MDT_DigitizationStandalone_jobOptions.py @@ -27,8 +27,6 @@ DetDescrCnvSvc.DecodeIdDict = TRUE theApp.Dlls += [ "AmdbAth", "MuonAsciiDetDescrDecoder" ] theApp.ExtSvc += [ "AmdbsimrecAthenaSvc"] theApp.ExtSvc += [ "MuonAsciiDetDescrSvc" ] -#dictionary name -#AthenaSealSvc.DictNames += { "MuonSimEventDict" }; theApp.TopAlg += ["MDT_Digitizer"] # MDT_Digitizer # ------------ diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/CMakeLists.txt b/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/CMakeLists.txt index 725936dc0327..586da758b084 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/CMakeLists.txt +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/CMakeLists.txt @@ -25,7 +25,3 @@ atlas_add_component( MuonCalibMonitoring src/components/*.cxx INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaMonitoringLib StoreGateLib SGtests GaudiKernel CscCalibData MuonCondData MuonCondInterface MuonReadoutGeometry MuonIdHelpersLib ) - -# Install files from the package: -atlas_install_joboptions( share/*.py ) - diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/share/Load_AthenaSealSvc_joboptions.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/share/Load_AthenaSealSvc_joboptions.py deleted file mode 100755 index ca3134f68eac..000000000000 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/share/Load_AthenaSealSvc_joboptions.py +++ /dev/null @@ -1,34 +0,0 @@ -# -# JobOptions for the loading of the AthenaSealSvc -# -# Some standard joboptions for dictionaries: -import AthenaCommon.AtlasUnixGeneratorJob - -theApp.EvtMax = 1 - - -AthenaSealSvc = Service( "AthenaSealSvc" ) - -# Set up service -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - -# Add in your includes to check specific dictionaries: e.g. EventInfo: -#include( "EventInfo/EventInfoDict_joboptions.py" ) -include("CscCalibData/CscCalibDataDict_joboptions.py") - -print AthenaSealSvc.DictNames - -# Set to output level to debug (2) for more information -AthenaSealSvc.OutputLevel = 2 -MessageSvc.debugLimit = 100000 -MessageSvc.infoLimit = 100000 - -# Check the dictionary in memory for completeness -AthenaSealSvc.CheckDictAtInit = TRUE -AthenaSealSvc.CheckDictionary = True; - -# Must add in svc to be created via python below -theApp.CreateSvc += [ "AthenaSealSvc" ] - -# Must initialize service explicitly -AthenaSealSvc.initialize() diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/AODTriggerWrite_topOptions.py b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/AODTriggerWrite_topOptions.py index 0d5cee923af1..0ccd06b68615 100644 --- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/AODTriggerWrite_topOptions.py +++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/AODTriggerWrite_topOptions.py @@ -38,9 +38,6 @@ theApp.OutStreamType = "AthenaOutputStream" Stream1 = Algorithm( "Stream1" ) Stream1.EvtConversionSvc = "AthenaPoolCnvSvc" -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.CheckDictionary = True - # Output file name Stream1.OutputFile = "AOD_Trigger.root" diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/EventTagTest_topOptions.py b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/EventTagTest_topOptions.py index 95561366148c..8c1b61f2842e 100644 --- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/EventTagTest_topOptions.py +++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/EventTagTest_topOptions.py @@ -69,8 +69,6 @@ MessageSvc = Service( "MessageSvc" ) MessageSvc.OutputLevel = 1 ClassIDSvc = Service( "ClassIDSvc" ) ClassIDSvc.OutputLevel = 3 -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.OutputLevel = 3 StoreGateSvc = Service( "StoreGateSvc" ) StoreGateSvc.Dump = TRUE diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/ReadINav4MomAssocs_jobOptions.py b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/ReadINav4MomAssocs_jobOptions.py index 9b91460ba519..196f8c47d9b0 100644 --- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/ReadINav4MomAssocs_jobOptions.py +++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/ReadINav4MomAssocs_jobOptions.py @@ -77,10 +77,6 @@ include( "ParticleBuilderOptions/AOD_PoolCnv_jobOptions.py" ) PoolSvc = Service( "PoolSvc" ) -AthenaSealSvc = Service("AthenaSealSvc") -AthenaSealSvc.CheckDictionary = True -AthenaSealSvc.OutputLevel = DEBUG - # Run OutputStream as an algorithm theApp.TopAlg += [ "AthenaOutputStream/Stream1" ] # Must make sure that no OutStream's have been declared @@ -94,7 +90,6 @@ Stream1.OutputFile = "assocs.readback.pool.root" Stream1.ItemList += [ "EventInfo#*" ] PoolSvc.OutputLevel = WARNING -AthenaSealSvc.OutputLevel = WARNING ############################################################## # diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/WriteINav4MomAssocs_jobOptions.py b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/WriteINav4MomAssocs_jobOptions.py index 25ba3e3d9b6c..ca85fcf6d632 100644 --- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/WriteINav4MomAssocs_jobOptions.py +++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/share/WriteINav4MomAssocs_jobOptions.py @@ -123,15 +123,6 @@ StoreGateSvc = Service( "StoreGateSvc" ) #StoreGateSvc.Dump = True; StoreGateSvc.OutputLevel=3 -checkDict = False -if 'CHECKDICT' in dir() : - checkDict = CHECKDICT - pass - -AthenaSealSvc.CheckDictionary = checkDict -AthenaSealSvc.IgnoreNames += ["Trk"] -AthenaSealSvc.OutputLevel = DEBUG - #============================================================== # # End of job options file diff --git a/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/share/AfpD3PDMaker_jobOption.py b/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/share/AfpD3PDMaker_jobOption.py index f28a5f2d34e4..08ecd0f07f6b 100644 --- a/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/share/AfpD3PDMaker_jobOption.py +++ b/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/share/AfpD3PDMaker_jobOption.py @@ -11,21 +11,12 @@ ServiceMgr.EventSelector.InputCollections += [InputRootCollection] theApp.EvtMax = -1 ServiceMgr.EventSelector.SkipEvents = 0 -#-------------------------------------------------------------- -# JobOptions for the loading of the AthenaSealSvc -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - -# Add in dictionary name: -AthenaSealSvc = Service( "AthenaSealSvc" ) IOVDbSvc = Service( "IOVDbSvc" ) from IOVDbSvc.CondDB import conddb ####for other possible servers see dbreplica.config in Athena installation directory #IOVDbSvc.dbConnection="oracle://ATLAS_COOLPROD;schema=ATLAS_COOLOFL_DCS;dbname=COMP200" -# Check the dictionary in memory for completeness -AthenaSealSvc.CheckDictionary = TRUE - ################################################################################################### # Load Global Flags and set defaults (import the new jobProperty globalflags) ################################################################################################### @@ -79,5 +70,3 @@ MessageSvc.defaultLimit = 9999999 ClassIDSvc = Service( "ClassIDSvc" ) ClassIDSvc.OutputLevel = 2 -AthenaSealSvc.OutputLevel = 5 - diff --git a/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/share/AlfaD3PDMaker_jobOption.py b/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/share/AlfaD3PDMaker_jobOption.py index 288c18e8f03a..9a8634357087 100644 --- a/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/share/AlfaD3PDMaker_jobOption.py +++ b/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/share/AlfaD3PDMaker_jobOption.py @@ -29,11 +29,6 @@ globalflags.print_JobProperties() if globalflags.DataSource == "data": #-------------------------------------------------------------- - # JobOptions for the loading of the AthenaSealSvc - include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - - # Add in dictionary name: - AthenaSealSvc = Service( "AthenaSealSvc" ) IOVDbSvc = Service( "IOVDbSvc" ) from IOVDbSvc.CondDB import conddb @@ -65,9 +60,6 @@ if globalflags.DataSource == "data": #IOVDbSvc.Folders += ["/RPO/DCS/TRIGGERRATES"] #IOVDbSvc.Folders += ["/RPO/DCS/TRIGGERSETTINGS"] - # Check the dictionary in memory for completeness - AthenaSealSvc.CheckDictionary = TRUE - ## Load algorithm to TopSequence # from AthenaCommon.AlgSequence import AlgSequence @@ -109,6 +101,3 @@ MessageSvc.defaultLimit = 9999999 ClassIDSvc = Service( "ClassIDSvc" ) ClassIDSvc.OutputLevel = 5 -if globalflags.DataSource == "data": - AthenaSealSvc.OutputLevel = 5 - diff --git a/Reconstruction/Jet/JetValidation/share/JetTask_ESDtoAOD.py b/Reconstruction/Jet/JetValidation/share/JetTask_ESDtoAOD.py index a2aed986da1f..81630049a36a 100644 --- a/Reconstruction/Jet/JetValidation/share/JetTask_ESDtoAOD.py +++ b/Reconstruction/Jet/JetValidation/share/JetTask_ESDtoAOD.py @@ -59,8 +59,6 @@ from AthenaCommon.AppMgr import theApp ServiceMgr.MessageSvc.OutputLevel = INFO ServiceMgr.MessageSvc.defaultLimit = 1000000 -#ServiceMgr.AthenaSealSvc.OutputLevel = VERBOSE - #ServiceMgr.StoreGateSvc.Dump=True from AthenaServices.AthenaServicesConf import AthenaEventLoopMgr ServiceMgr += AthenaEventLoopMgr(EventPrintoutInterval = 100) diff --git a/Reconstruction/RecExample/RecExCommon/share/AnalysisCommon_topOptions.py b/Reconstruction/RecExample/RecExCommon/share/AnalysisCommon_topOptions.py index 3ef77ff5fc0d..8720819503bb 100644 --- a/Reconstruction/RecExample/RecExCommon/share/AnalysisCommon_topOptions.py +++ b/Reconstruction/RecExample/RecExCommon/share/AnalysisCommon_topOptions.py @@ -288,13 +288,6 @@ if not objKeyStore.isInInput( "xAOD::EventInfo"): # functionality : monitor memory and cpu time # -# check dictionary all the time -ServiceMgr.AthenaSealSvc.CheckDictionary = True -if not rec.doCheckDictionary(): - ServiceMgr.AthenaSealSvc.OutputLevel=WARNING - pass - -# # #now write out Transient Event Store content in POOL if rec.doWriteESD() or rec.doWriteAOD() or rec.doWriteRDO() or rec.doWriteTAG(): diff --git a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py index 9d1eec45e471..9e67abc9d9f8 100644 --- a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py +++ b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py @@ -844,17 +844,6 @@ if rec.doPersint() : # gathering info from all the reco algorithms # - - - -# check dictionary all the time -ServiceMgr.AthenaSealSvc.CheckDictionary = True -if not rec.doCheckDictionary(): - ServiceMgr.AthenaSealSvc.OutputLevel=WARNING - - - -# # #now write out Transient Event Store content in POOL # diff --git a/Reconstruction/RecExample/RecExCommon/share/RecoOutputPoolCnv_jobOptions.py b/Reconstruction/RecExample/RecExCommon/share/RecoOutputPoolCnv_jobOptions.py index 33f937ef0755..c93bf6525624 100755 --- a/Reconstruction/RecExample/RecExCommon/share/RecoOutputPoolCnv_jobOptions.py +++ b/Reconstruction/RecExample/RecExCommon/share/RecoOutputPoolCnv_jobOptions.py @@ -33,10 +33,6 @@ if DetFlags.ID_on(): include ( "InDetEventCnvTools/InDetEventCnvTools_jobOptions.py" ) include( "InDetEventAthenaPool/InDetEventAthenaPool_joboptions.py" ) include( "TrkEventAthenaPool/TrkEventAthenaPool_joboptions.py" ) - #kludge needed because of DetailedTruthMap - #svcMgr.AthenaSealSvc.DictNames += [ "TrkTrackDict" ] - - if rec.doTruth(): include ("TrackParticleTruthAthenaPool/TrackParticleTruthAthenaPool_joboptions.py") diff --git a/Reconstruction/RecExample/RecExCommon/share/RecoUtils.py b/Reconstruction/RecExample/RecExCommon/share/RecoUtils.py index 00e3311402af..61fce65d89ef 100644 --- a/Reconstruction/RecExample/RecExCommon/share/RecoUtils.py +++ b/Reconstruction/RecExample/RecExCommon/share/RecoUtils.py @@ -11,7 +11,6 @@ softas, hardas = resource.getrlimit( resource.RLIMIT_RSS ) logRecoUtils.info( 'Memory resident state RSS soft limit : %s hard limit: %s ',softas == -1 and 'unlimited' or str(softas), hardas == -1 and 'unlimited' or str(hardas)) # make IOV calls in reproducible order -Service("AthenaSealSvc").OutputLevel=WARNING Service('IOVSvc').sortKeys=True ############ diff --git a/Reconstruction/RecExample/RecExTB/scripts/ctb.reco.merge.trf b/Reconstruction/RecExample/RecExTB/scripts/ctb.reco.merge.trf index c5bd61eda9a4..9c8280676d16 100755 --- a/Reconstruction/RecExample/RecExTB/scripts/ctb.reco.merge.trf +++ b/Reconstruction/RecExample/RecExTB/scripts/ctb.reco.merge.trf @@ -902,12 +902,6 @@ if doWriteESD: Stream1.EvtConversionSvc = "AthenaPoolCnvSvc" Stream1.OutputFile = "$ESDFN" - #check dictionary - AthenaSealSvc.CheckDictionary = True - - # Needed for TBEvent ESD writing - include ( "TBEvent/TBEventDict_joboptions.py") - # Define the output file name Stream1.OutputFile = "athena.root" diff --git a/Reconstruction/RecExample/RecExTB/scripts/ctb.reco.trf b/Reconstruction/RecExample/RecExTB/scripts/ctb.reco.trf index c17326f79e68..af6e8eb259a3 100755 --- a/Reconstruction/RecExample/RecExTB/scripts/ctb.reco.trf +++ b/Reconstruction/RecExample/RecExTB/scripts/ctb.reco.trf @@ -864,12 +864,6 @@ if doWriteESD: Stream1.EvtConversionSvc = "AthenaPoolCnvSvc" Stream1.OutputFile = "$ESDFN" - #check dictionary - AthenaSealSvc.CheckDictionary = True - - # Needed for TBEvent ESD writing - include ( "TBEvent/TBEventDict_joboptions.py") - # Define the output file name Stream1.OutputFile = "athena.root" diff --git a/Reconstruction/RecExample/RecExTB/share/RecExTB_Combined_2004_jobOptions.py b/Reconstruction/RecExample/RecExTB/share/RecExTB_Combined_2004_jobOptions.py index 43f493deb146..3bccfe6bd3a5 100755 --- a/Reconstruction/RecExample/RecExTB/share/RecExTB_Combined_2004_jobOptions.py +++ b/Reconstruction/RecExample/RecExTB/share/RecExTB_Combined_2004_jobOptions.py @@ -827,9 +827,6 @@ if doWriteESD: from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream Stream1 = AthenaPoolOutputStream( "Stream1" ) - #check dictionary - svcMgr.AthenaSealSvc.CheckDictionary = True - # Define the output file name # if not doSim: Stream1.OutputFile = OutputESDFile diff --git a/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_esdtoesd.py b/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_esdtoesd.py index 73b6b610a75b..9caf645baf20 100644 --- a/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_esdtoesd.py +++ b/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_esdtoesd.py @@ -22,7 +22,6 @@ theApp.EvtMax = -1 ## load POOL support import AthenaPoolCnvSvc.ReadAthenaPool -svcMgr.AthenaSealSvc.OutputLevel = Lvl.ERROR ## general job configuration from AthenaCommon.AlgSequence import AlgSequence diff --git a/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_jobOptions.py b/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_jobOptions.py index 55ff377f9f46..7c764d1a050a 100755 --- a/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_jobOptions.py +++ b/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_jobOptions.py @@ -1055,7 +1055,6 @@ if doWriteESD: topSequence += CfgMgr.AthenaOutputStream("OutStream", WritingTool="AthenaOutputStreamTool") Stream1 = topSequence.OutStream Stream1.OutputFile = ESDOutputFileName - svcMgr.AthenaSealSvc.CheckDictionary = True try: fullItemList += ["EventInfo#*"] except: diff --git a/Simulation/Tools/CaloSamplingFractionAnalysis/share/LarEMSamplingFraction_topOptions.py b/Simulation/Tools/CaloSamplingFractionAnalysis/share/LarEMSamplingFraction_topOptions.py index 634e43b458ca..8016ec3ba6be 100644 --- a/Simulation/Tools/CaloSamplingFractionAnalysis/share/LarEMSamplingFraction_topOptions.py +++ b/Simulation/Tools/CaloSamplingFractionAnalysis/share/LarEMSamplingFraction_topOptions.py @@ -49,7 +49,6 @@ include("TileConditions/TileConditions_jobOptions.py" ) include("LArConditionsCommon/LArConditionsCommon_MC_jobOptions.py") svcMgr.IOVDbSvc.GlobalTag = "OFLCOND-MC16-SDR-16" -svcMgr.AthenaSealSvc.OutputLevel = Lvl.ERROR svcMgr.IOVDbSvc.forceRunNumber=284500 svcMgr += CfgMgr.THistSvc() diff --git a/Tools/PyJobTransformsCore/share/atlas_error_categories.db b/Tools/PyJobTransformsCore/share/atlas_error_categories.db index 2bdca061e439..8cf2b61d01e6 100755 --- a/Tools/PyJobTransformsCore/share/atlas_error_categories.db +++ b/Tools/PyJobTransformsCore/share/atlas_error_categories.db @@ -12,7 +12,6 @@ 61020, TRF_MOD_EP, DllClassManager Entry point failure in module 61100, TRF_ALGOINIT, EventLoopMgr Unable to initialize Algorithm 61200, TRF_SVRINIT, ServiceManager Unable to initialize Service -62000, TRF_SEALSVC, ServiceManager Finalization of service AthenaSealSvc failed 62100, TRF_DETSTORE, pixelRoI service_i: can not locate service DetectorStore 62200, TRF_POOLCONF, pool::PersistencySvc::UserDatabase::connectForRead: PFN is not existing in the catalog 62300, TRF_EVNTSEL, ServiceManager: unable to initialize Service: EventSelector diff --git a/Tracking/Acts/ActsGeometry/share/GeantinoMapping_jobOptions.py b/Tracking/Acts/ActsGeometry/share/GeantinoMapping_jobOptions.py index 1bd322b752cc..3254ac502069 100644 --- a/Tracking/Acts/ActsGeometry/share/GeantinoMapping_jobOptions.py +++ b/Tracking/Acts/ActsGeometry/share/GeantinoMapping_jobOptions.py @@ -123,8 +123,6 @@ simFlags.OptionalUserActionList.addAction('G4UA::MaterialStepRecorderTool') ############### The Material hit collection ################## from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream -# --- check dictionary -ServiceMgr.AthenaSealSvc.CheckDictionary = True # --- commit interval (test) ServiceMgr.AthenaPoolCnvSvc.OutputLevel = DEBUG MaterialStream = AthenaPoolOutputStream ( 'MaterialStream' ) diff --git a/Tracking/TrkDetDescr/TrkDetDescrUnitTests/share/TrkDetDescrTPCnvTest_jobOptions.py b/Tracking/TrkDetDescr/TrkDetDescrUnitTests/share/TrkDetDescrTPCnvTest_jobOptions.py index 7b0111eac328..d3bea9ddec1d 100644 --- a/Tracking/TrkDetDescr/TrkDetDescrUnitTests/share/TrkDetDescrTPCnvTest_jobOptions.py +++ b/Tracking/TrkDetDescr/TrkDetDescrUnitTests/share/TrkDetDescrTPCnvTest_jobOptions.py @@ -57,7 +57,6 @@ svcMgr = theApp.serviceMgr() svcMgr.MessageSvc.OutputLevel = VERBOSE svcMgr.MessageSvc.Format = "% F%30W%S%7W%R%T %0W%M" svcMgr.MessageSvc.defaultLimit = 1000000 -svcMgr.AthenaSealSvc.OutputLevel = VERBOSE # level for HelloAlg only (note name: instance, not type) BinUtilityTest = INFO @@ -84,8 +83,6 @@ theApp.EvtMax = 1 ############### The Material hit collection ################## if WriteFile : from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream - # --- check dictionary - ServiceMgr.AthenaSealSvc.CheckDictionary = True # --- commit interval (test) ServiceMgr.AthenaPoolCnvSvc.OutputLevel = DEBUG MaterialStream = AthenaPoolOutputStream ( 'TrkDetDescrTPCnv' ) diff --git a/Tracking/TrkG4Components/TrkG4UserActions/share/EnergyLossSimulation_jobOptions.py b/Tracking/TrkG4Components/TrkG4UserActions/share/EnergyLossSimulation_jobOptions.py index 024257cdc813..2375f79da06a 100644 --- a/Tracking/TrkG4Components/TrkG4UserActions/share/EnergyLossSimulation_jobOptions.py +++ b/Tracking/TrkG4Components/TrkG4UserActions/share/EnergyLossSimulation_jobOptions.py @@ -99,8 +99,6 @@ ServiceMgr.THistSvc.Output += [ "val DATAFILE='/tmp/salzburg/EnergyLossRecorder. #from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream -## --- check dictionary -#ServiceMgr.AthenaSealSvc.CheckDictionary = True ## --- commit interval (test) #ServiceMgr.AthenaPoolCnvSvc.OutputLevel = DEBUG #MaterialStream = AthenaPoolOutputStream ( 'MaterialStream' ) diff --git a/Tracking/TrkG4Components/TrkG4UserActions/share/GeantFollowingMS_jobOptions.py b/Tracking/TrkG4Components/TrkG4UserActions/share/GeantFollowingMS_jobOptions.py index 47d814fa7304..a5c131dec506 100644 --- a/Tracking/TrkG4Components/TrkG4UserActions/share/GeantFollowingMS_jobOptions.py +++ b/Tracking/TrkG4Components/TrkG4UserActions/share/GeantFollowingMS_jobOptions.py @@ -334,8 +334,6 @@ SimFlags.OptionalUserActionList.addAction('G4UA::GeantFollowerMSTool',['Step','E ############### The output collection ####################### from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream -## --- check dictionary -ServiceMgr.AthenaSealSvc.CheckDictionary = True ## --- commit interval (test) #ServiceMgr.AthenaPoolCnvSvc.OutputLevel = DEBUG diff --git a/Tracking/TrkG4Components/TrkG4UserActions/share/GeantFollowing_jobOptions.py b/Tracking/TrkG4Components/TrkG4UserActions/share/GeantFollowing_jobOptions.py index 7b574ce52575..42fcd1edbe22 100644 --- a/Tracking/TrkG4Components/TrkG4UserActions/share/GeantFollowing_jobOptions.py +++ b/Tracking/TrkG4Components/TrkG4UserActions/share/GeantFollowing_jobOptions.py @@ -338,8 +338,6 @@ SimFlags.OptionalUserActionList.addAction('G4UA::GeantFollowerTool',['Step','Eve ############### The output collection ####################### from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream -## --- check dictionary -ServiceMgr.AthenaSealSvc.CheckDictionary = True ## --- commit interval (test) #ServiceMgr.AthenaPoolCnvSvc.OutputLevel = DEBUG diff --git a/Tracking/TrkG4Components/TrkG4UserActions/share/GeantinoMapping_jobOptions.py b/Tracking/TrkG4Components/TrkG4UserActions/share/GeantinoMapping_jobOptions.py index fba841d859b4..542ebc51d9a4 100644 --- a/Tracking/TrkG4Components/TrkG4UserActions/share/GeantinoMapping_jobOptions.py +++ b/Tracking/TrkG4Components/TrkG4UserActions/share/GeantinoMapping_jobOptions.py @@ -109,8 +109,6 @@ SimFlags.OptionalUserActionList.addAction('G4UA::MaterialStepRecorderTool',['Run ############### The Material hit collection ################## from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream -# --- check dictionary -ServiceMgr.AthenaSealSvc.CheckDictionary = True # --- commit interval (test) ServiceMgr.AthenaPoolCnvSvc.OutputLevel = DEBUG MaterialStream = AthenaPoolOutputStream ( 'MaterialStream' ) diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/share/trigDec_pureSteering_WritePOOL.py b/Trigger/TrigAnalysis/TrigDecisionMaker/share/trigDec_pureSteering_WritePOOL.py index 15787a12714b..c2e09eff8e7c 100644 --- a/Trigger/TrigAnalysis/TrigDecisionMaker/share/trigDec_pureSteering_WritePOOL.py +++ b/Trigger/TrigAnalysis/TrigDecisionMaker/share/trigDec_pureSteering_WritePOOL.py @@ -85,9 +85,7 @@ trigDecStream.TrigDecMaker.OutputLevel = VERBOSE ######################## # Serialization ######################## -AthenaSealSvc = Service( "AthenaSealSvc" ) # Set up service -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) include( "FourMom/FourMomDict_joboptions.py" ) include( "Navigation/NavigationDict_joboptions.py" ) include( "EventKernel/EventKernelDict_joboptions.py" ) @@ -95,15 +93,6 @@ include( "TrigCaloEvent/TrigCaloEventDict_joboptions.py" ) include( "TrigParticle/TrigParticleDict_joboptions.py" ) include ("TrigSteeringEvent/TrigSteeringEventDict_joboptions.py") -theApp.CreateSvc += [ "AthenaSealSvc" ] -AthenaSealSvc.CheckDictAtInit = False -#AthenaSealSvc.initialize() -theApp.Dlls += [ "TrigSerializeResult" ] -AthenaSealSvc.OutputLevel = VERBOSE - - - - ############################ # Set output level threshold diff --git a/Trigger/TrigDataAccess/TrigSerializeResult/share/HelloSerializerWorld.py b/Trigger/TrigDataAccess/TrigSerializeResult/share/HelloSerializerWorld.py index 60511e0ef6f4..f8059b594e34 100755 --- a/Trigger/TrigDataAccess/TrigSerializeResult/share/HelloSerializerWorld.py +++ b/Trigger/TrigDataAccess/TrigSerializeResult/share/HelloSerializerWorld.py @@ -27,16 +27,8 @@ include( "AthenaCommon/Atlas_Gen.UnixStandardJob.py" ) #-------------------------------------------------------------- # Private Application Configuration options #-------------------------------------------------------------- -AthenaSealSvc = Service( "AthenaSealSvc" ) - -# Set up service -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -AthenaSealSvc.DictNames += [ "HelloSerializerWorldDictDict" ] -theApp.CreateSvc += [ "AthenaSealSvc" ] -AthenaSealSvc.CheckDictAtInit = TRUE - - #load relevant libraries +#AthenaSealSvc.DictNames += [ "HelloSerializerWorldDictDict" ] theApp.Dlls += [ "TrigSerializeResult" ] #top algorithms to be run diff --git a/Trigger/TrigEvent/TrigBSExtraction/share/unpackBS.py b/Trigger/TrigEvent/TrigBSExtraction/share/unpackBS.py index 64f0f5f5fb2f..7c58bf52bc8c 100644 --- a/Trigger/TrigEvent/TrigBSExtraction/share/unpackBS.py +++ b/Trigger/TrigEvent/TrigBSExtraction/share/unpackBS.py @@ -13,11 +13,6 @@ MessageSvc.OutputLevel=INFO EvtMax=-1 ############################## - -AthenaSealSvc = Service( "AthenaSealSvc" ) -# Set up service -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - # Services from ByteStreamCnvSvc.ByteStreamCnvSvcConf import ByteStreamEventStorageInputSvc svcMgr += ByteStreamEventStorageInputSvc("ByteStreamInputSvc") diff --git a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloDumpRampData_topOptions.py b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloDumpRampData_topOptions.py index 036355b4c50b..12792dff1aef 100644 --- a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloDumpRampData_topOptions.py +++ b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloDumpRampData_topOptions.py @@ -9,8 +9,6 @@ from AthenaCommon.AppMgr import theApp import AthenaPoolCnvSvc.AthenaPool import IOVDbSvc.IOVDb -svcMgr.AthenaSealSvc.CheckDictionary = True - theApp.EvtMax = 1 from AthenaCommon.ConfigurableDb import getConfigurable diff --git a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloLinearCalibration_topOptions.py b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloLinearCalibration_topOptions.py index 15f393fe224c..41d1ac7fa05e 100644 --- a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloLinearCalibration_topOptions.py +++ b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloLinearCalibration_topOptions.py @@ -26,7 +26,6 @@ from AthenaCommon.AppMgr import theApp import AthenaPoolCnvSvc.AthenaPool import IOVDbSvc.IOVDb -svcMgr.AthenaSealSvc.CheckDictionary = True theApp.EvtMax = 1 from AthenaCommon.GlobalFlags import globalflags diff --git a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloPedestalCOOL2Ntuple_jobOptions.py b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloPedestalCOOL2Ntuple_jobOptions.py index 34ef408c5778..792e76a89988 100755 --- a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloPedestalCOOL2Ntuple_jobOptions.py +++ b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloPedestalCOOL2Ntuple_jobOptions.py @@ -78,11 +78,6 @@ theApp.EvtMax = 1 #-------------------------------------------------------------- include ( "IOVDbSvc/IOVDbSvc_jobOptions.py" ) -# Check the dictionary in memory for completeness -AthenaSealSvc = Service( "AthenaSealSvc" ) -AthenaSealSvc.CheckDictionary = TRUE - - #-------------------------------------------------------------- # Input options #-------------------------------------------------------------- diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/share/jobOptions_WriteLVL1_Pool.py b/Trigger/TrigT1/TrigT1EventAthenaPool/share/jobOptions_WriteLVL1_Pool.py index 154e55862061..83e3d3a52f29 100755 --- a/Trigger/TrigT1/TrigT1EventAthenaPool/share/jobOptions_WriteLVL1_Pool.py +++ b/Trigger/TrigT1/TrigT1EventAthenaPool/share/jobOptions_WriteLVL1_Pool.py @@ -17,10 +17,6 @@ theApp.EvtMax = 10 #-------------------------------------------------------------- include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" ) -# check dictionary -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) - -#AthenaSealSvc.CheckDictionary = true; # Define the output Db parameters (the default value are shown) Stream1.OutputFile = "LVL1Pool.root" diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/share/ReadLVL1BS_jobOptions.py b/Trigger/TrigT1/TrigT1ResultByteStream/share/ReadLVL1BS_jobOptions.py index 448ed45b44f3..d4e39d6b6fac 100644 --- a/Trigger/TrigT1/TrigT1ResultByteStream/share/ReadLVL1BS_jobOptions.py +++ b/Trigger/TrigT1/TrigT1ResultByteStream/share/ReadLVL1BS_jobOptions.py @@ -36,14 +36,6 @@ include( "ByteStreamCnvSvcBase/BSAddProvSvc_RIO_jobOptions.py" ) log.info( "Set input BS file" ) -# -# Force-load AthenaSealSvc (to have all the dictionaries for CBNT -# writing): -# -include( "AthenaServices/AthenaSealSvc_joboptions.py" ) -from AthenaCommon.AppMgr import theApp -theApp.CreateSvc += [ ServiceMgr.AthenaSealSvc.getFullName() ] - # # Set up writing of the AANT file: # diff --git a/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py b/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py index 3fd1dfa6997f..70c78fccfc69 100644 --- a/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py +++ b/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py @@ -17,7 +17,6 @@ from ByteStreamCnvSvcBase.ByteStreamCnvSvcBaseConf import ByteStreamAddressProvi #------------------------------------------------------------------------------- from AthenaPoolCnvSvc.AthenaPoolCnvSvcConf import AthenaPoolCnvSvc from PoolSvc.PoolSvcConf import PoolSvc -from AthenaServices.AthenaServicesConf import AthenaSealSvc from AthenaPoolServices.AthenaRootStreamerSvcConf import AthenaRootStreamerSvc from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import EventSelectorAthenaPool from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import AthenaPoolAddressProviderSvc @@ -182,10 +181,6 @@ svcMgr.AthenaPoolCnvSvc.PoolAttributes += [ "STREAM_MEMBER_WISE = '1'" ] svcMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DEFAULT_BUFFERSIZE = '32000'" ] svcMgr.AthenaPoolCnvSvc.PoolAttributes += [ "ContainerName = 'TTree=POOLContainer'; TREE_AUTO_FLUSH = '0'" ] -svcMgr.AthenaSealSvc.CheckDictionary = True -#svcMgr.AthenaSealSvc.CheckDictAtInit = True - - from OutputStreamAthenaPool.CreateOutputStreams import AthenaPoolOutputStream ostream = AthenaPoolOutputStream("StreamRDO", athenaCommonFlags.PoolRDOOutput(), True) diff --git a/graphics/VP1/VP1Algs/share/vp1.py b/graphics/VP1/VP1Algs/share/vp1.py index 4cef9284cfce..55d094bf729c 100644 --- a/graphics/VP1/VP1Algs/share/vp1.py +++ b/graphics/VP1/VP1Algs/share/vp1.py @@ -372,7 +372,6 @@ else: #watch LAr HV: if ( vp1LarHvData ): from time import time - svcMgr.AthenaSealSvc.CheckDictionary = TRUE svcMgr.EventSelector.InitialTimeStamp = int (time()) svcMgr.EventSelector.TimeStampInterval = 1 from IOVDbSvc.CondDB import conddb -- GitLab