diff --git a/Calorimeter/CaloRec/python/CaloBCIDAvgAlgConfig.py b/Calorimeter/CaloRec/python/CaloBCIDAvgAlgConfig.py index ad6976a2c839f5e029b336a14f23a075d0c3fc7f..d269d63e1bb7dac30957228b962904ea532ca695 100644 --- a/Calorimeter/CaloRec/python/CaloBCIDAvgAlgConfig.py +++ b/Calorimeter/CaloRec/python/CaloBCIDAvgAlgConfig.py @@ -77,12 +77,22 @@ if __name__ == "__main__": from AthenaConfiguration.TestDefaults import defaultTestFiles ConfigFlags.loadAllDynamicFlags (quiet = True) + only = ['CaloBCIDAvgAlg', + 'CondInputLoader', + 'LuminosityCondAlg-', + 'LArPileUpAvgSymCondAlg', + 'LArPileUpShapeSymCondAlg', + 'LArADC2MeVCondAlg-', + 'LArOFCCondAlg-', + 'LArAutoCorrTotalCondAlg-', + 'BunchCrossingTool-', + ] print ('--- data') flags1 = ConfigFlags.clone() flags1.Input.Files = defaultTestFiles.RAW flags1.lock() acc1 = CaloBCIDAvgAlgCfg (flags1) - acc1.printConfig(summariseProps=True) + acc1.printConfig(summariseProps=True, onlyComponents=only) acc1.wasMerged() print ('--- mc') @@ -91,7 +101,7 @@ if __name__ == "__main__": flags2.Input.isMC = True flags2.lock() acc2 = CaloBCIDAvgAlgCfg (flags2) - acc2.printConfig(summariseProps=True) + acc2.printConfig(summariseProps=True, onlyComponents=only) acc2.wasMerged() print ('--- online') @@ -100,5 +110,5 @@ if __name__ == "__main__": flags3.Common.isOnline = True flags3.lock() acc3 = CaloBCIDAvgAlgCfg (flags3) - acc3.printConfig(summariseProps=True) + acc3.printConfig(summariseProps=True, onlyComponents=only) acc3.wasMerged() diff --git a/Calorimeter/CaloRec/share/CaloBCIDAvgAlgConfig_test.ref b/Calorimeter/CaloRec/share/CaloBCIDAvgAlgConfig_test.ref index 7fd44bc0775a79911df852730c2285081d10f0b8..38d721ba901a523427a798efdb5b39ad6b3c9487 100644 --- a/Calorimeter/CaloRec/share/CaloBCIDAvgAlgConfig_test.ref +++ b/Calorimeter/CaloRec/share/CaloBCIDAvgAlgConfig_test.ref @@ -1,4 +1,4 @@ -Py:Athena INFO using release [WorkDir-22.0.5] [x86_64-centos7-gcc8-opt] [const120.FastCaloSim-20190905/133346da1078] -- built on [2019-09-06T2051] +Py:Athena INFO using release [WorkDir-22.0.5] [x86_64-centos7-gcc8-opt] [atlas-work3/af41e7f170b] -- built on [2019-09-20T1552] --- data Py:AutoConfigFlags INFO Obtaining metadata of auto-configuration by peeking into /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1 Py:MetaReader INFO Current mode used: peeker @@ -15,20 +15,9 @@ Py:ComponentAccumulator INFO * LuminosityCondDataKey: LuminosityCondDa Py:ComponentAccumulator INFO * ShapeKey: LArShape32Sym Py:ComponentAccumulator INFO * isMC: False Py:ComponentAccumulator INFO Condition Algorithms -Py:ComponentAccumulator INFO \__ LArMCSymCondAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: LArOnOffIdMap Py:ComponentAccumulator INFO \__ CondInputLoader (cond alg) Py:ComponentAccumulator INFO * Load: [('CondAttrListCollection', '/TRIGGER/OFLLUMI/OflPrefLumi'), ('CondAttrListCollection', '/TDAQ/OLC/CALIBRATIONS'), ('LArShape32MC', '/LAR/ElecCalibOfl/LArPileupShape'), ('LArMinBiasAverageMC', '/LAR/ElecCalibOfl/LArPileupAverage')] -Py:ComponentAccumulator INFO \__ OnlineLumiCalibrationCondAlg (cond alg) -Py:ComponentAccumulator INFO * CalibrationFolderInputKey: /TDAQ/OLC/CALIBRATIONS -Py:ComponentAccumulator INFO * LumiCalibOutputKey: OnlineLumiCalibrationCondData Py:ComponentAccumulator INFO \__ LuminosityCondAlg (cond alg) -Py:ComponentAccumulator INFO * BunchGroupInputKey: -Py:ComponentAccumulator INFO * BunchLumisInputKey: -Py:ComponentAccumulator INFO * FillParamsInputKey: -Py:ComponentAccumulator INFO * LuminosityFolderInputKey: /TRIGGER/OFLLUMI/OflPrefLumi -Py:ComponentAccumulator INFO * LuminosityOutputKey: LuminosityCondData -Py:ComponentAccumulator INFO * OnlineLumiCalibrationInputKey: OnlineLumiCalibrationCondData Py:ComponentAccumulator INFO \__ LArPileUpAvgSymCondAlg (cond alg) Py:ComponentAccumulator INFO * ReadKey: LArPileupAverage Py:ComponentAccumulator INFO * WriteKey: LArPileupAverageSym @@ -36,7 +25,7 @@ Py:ComponentAccumulator INFO \__ LArPileUpShapeSymCondAlg (cond alg) Py:ComponentAccumulator INFO * ReadKey: LArShape32 Py:ComponentAccumulator INFO * WriteKey: LArShape32Sym Py:ComponentAccumulator INFO Services -Py:ComponentAccumulator INFO ['IOVDbSvc', 'PoolSvc', 'CondSvc', 'ProxyProviderSvc', 'DBReplicaSvc', 'AthenaPoolCnvSvc', 'EventPersistencySvc'] +Py:ComponentAccumulator INFO [] Py:ComponentAccumulator INFO Public Tools Py:ComponentAccumulator INFO [ Py:ComponentAccumulator INFO ] @@ -48,7 +37,7 @@ Py:ComponentAccumulator INFO TheApp properties Py:LArOFCCondAlgCfg INFO Standard OFC optimization computation Py:BunchCrossingTool INFO Selecting MCBunchCrossingTool for this job Py:MCBunchCrossingTool INFO Set the default values for the MCBunchCrossingTool configuration -Py:ConfigurableDb INFO Read module info for 5536 configurables from 7 genConfDb files +Py:ConfigurableDb INFO Read module info for 5577 configurables from 49 genConfDb files Py:ConfigurableDb INFO No duplicates have been found: that's good ! EventInfoMgtInit: Got release version Athena-22.0.5 Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200 @@ -62,58 +51,16 @@ Py:ComponentAccumulator INFO * BunchCrossingTool: Trig::MCBunchCrossin Py:ComponentAccumulator INFO * ShapeKey: LArShapeSym Py:ComponentAccumulator INFO * isMC: True Py:ComponentAccumulator INFO Condition Algorithms -Py:ComponentAccumulator INFO \__ LArMCSymCondAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: LArOnOffIdMap Py:ComponentAccumulator INFO \__ CondInputLoader (cond alg) Py:ComponentAccumulator INFO * Load: [('AthenaAttributeList', '/LAR/Identifier/OnOffIdMap'), ('LArRampMC', '/LAR/ElecCalibMC/Ramp'), ('LArDAC2uAMC', '/LAR/ElecCalibMC/DAC2uA'), ('LAruA2MeVMC', '/LAR/ElecCalibMC/uA2MeV'), ('LArMphysOverMcalMC', '/LAR/ElecCalibMC/MphysOverMcal'), ('LArHVScaleCorrComplete', '/LAR/ElecCalibMC/HVScaleCorr'), ('LArShape32MC', '/LAR/ElecCalibMC/Shape'), ('LArNoiseMC', '/LAR/ElecCalibMC/Noise'), ('LArPedestalMC', '/LAR/ElecCalibMC/Pedestal'), ('LArAutoCorrMC', '/LAR/ElecCalibMC/AutoCorr'), ('LArfSamplMC', '/LAR/ElecCalibMC/fSampl'), ('LArMinBiasMC', '/LAR/ElecCalibMC/MinBias'), ('LArMinBiasAverageMC', '/LAR/ElecCalibMC/LArPileupAverage')] -Py:ComponentAccumulator INFO \__ LArOnOffMappingAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: /LAR/Identifier/OnOffIdMap -Py:ComponentAccumulator INFO \__ LArSymConditionsAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: LArRamp -Py:ComponentAccumulator INFO * WriteKey: LArRampSym -Py:ComponentAccumulator INFO \__ LArSymConditionsAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: LArDAC2uA -Py:ComponentAccumulator INFO * WriteKey: LArDAC2uASym -Py:ComponentAccumulator INFO \__ LArSymConditionsAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: LAruA2MeV -Py:ComponentAccumulator INFO * WriteKey: LAruA2MeVSym -Py:ComponentAccumulator INFO \__ LArSymConditionsAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: LArMphysOverMcal -Py:ComponentAccumulator INFO * WriteKey: LArMphysOverMcalSym Py:ComponentAccumulator INFO \__ LArADC2MeVCondAlg (cond alg) -Py:ComponentAccumulator INFO * LArDAC2uAKey: LArDAC2uASym -Py:ComponentAccumulator INFO * LArHVScaleCorrKey: LArHVScaleCorr -Py:ComponentAccumulator INFO * LArMphysOverMcalKey: LArMphysOverMcalSym -Py:ComponentAccumulator INFO * LArRampKey: LArRampSym -Py:ComponentAccumulator INFO * LAruA2MeVKey: LAruA2MeVSym -Py:ComponentAccumulator INFO * UseFEBGainTresholds: False -Py:ComponentAccumulator INFO \__ LArSymConditionsAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: LArShape -Py:ComponentAccumulator INFO * WriteKey: LArShapeSym -Py:ComponentAccumulator INFO \__ LArSymConditionsAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: LArNoise -Py:ComponentAccumulator INFO * WriteKey: LArNoiseSym -Py:ComponentAccumulator INFO \__ LArSymConditionsAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: LArAutoCorr -Py:ComponentAccumulator INFO * WriteKey: LArAutoCorrSym -Py:ComponentAccumulator INFO \__ LArSymConditionsAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: LArfSampl -Py:ComponentAccumulator INFO * WriteKey: LArfSamplSym -Py:ComponentAccumulator INFO \__ LArSymConditionsAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: LArMinBias -Py:ComponentAccumulator INFO * WriteKey: LArMinBiasSym Py:ComponentAccumulator INFO \__ LArAutoCorrTotalCondAlg (cond alg) -Py:ComponentAccumulator INFO * Nsamples: 5 Py:ComponentAccumulator INFO \__ LArOFCCondAlg (cond alg) -Py:ComponentAccumulator INFO * UseDelta: 0 -Py:ComponentAccumulator INFO * firstSample: 0 -Py:ComponentAccumulator INFO * isMC: True -Py:ComponentAccumulator INFO * useHighestGainAutoCorr: False Py:ComponentAccumulator INFO \__ LArPileUpAvgSymCondAlg (cond alg) Py:ComponentAccumulator INFO * ReadKey: LArPileupAverage Py:ComponentAccumulator INFO * WriteKey: LArPileupAverageSym Py:ComponentAccumulator INFO Services -Py:ComponentAccumulator INFO ['IOVDbSvc', 'PoolSvc', 'CondSvc', 'ProxyProviderSvc', 'AthenaPoolCnvSvc', 'EventPersistencySvc', 'DetDescrCnvSvc'] +Py:ComponentAccumulator INFO [] Py:ComponentAccumulator INFO Public Tools Py:ComponentAccumulator INFO [ Py:ComponentAccumulator INFO ] @@ -133,21 +80,9 @@ Py:ComponentAccumulator INFO * LuminosityCondDataKey: LuminosityCondDa Py:ComponentAccumulator INFO * ShapeKey: LArShape32Sym Py:ComponentAccumulator INFO * isMC: False Py:ComponentAccumulator INFO Condition Algorithms -Py:ComponentAccumulator INFO \__ LArMCSymCondAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: LArOnOffIdMap Py:ComponentAccumulator INFO \__ CondInputLoader (cond alg) Py:ComponentAccumulator INFO * Load: [('CondAttrListCollection', '/TRIGGER/LUMI/HLTPrefLumi'), ('CondAttrListCollection', '/TDAQ/OLC/CALIBRATIONS'), ('LArShape32MC', '/LAR/LArPileup/LArPileupShape'), ('LArMinBiasAverageMC', '/LAR/LArPileup/LArPileupAverage')] -Py:ComponentAccumulator INFO \__ OnlineLumiCalibrationCondAlg (cond alg) -Py:ComponentAccumulator INFO * CalibrationFolderInputKey: /TDAQ/OLC/CALIBRATIONS -Py:ComponentAccumulator INFO * LumiCalibOutputKey: OnlineLumiCalibrationCondData Py:ComponentAccumulator INFO \__ LuminosityCondAlg (cond alg) -Py:ComponentAccumulator INFO * BunchGroupInputKey: -Py:ComponentAccumulator INFO * BunchLumisInputKey: -Py:ComponentAccumulator INFO * FillParamsInputKey: -Py:ComponentAccumulator INFO * LuminosityFolderInputKey: /TRIGGER/LUMI/HLTPrefLumi -Py:ComponentAccumulator INFO * LuminosityOutputKey: LuminosityCondData -Py:ComponentAccumulator INFO * OnlineLumiCalibrationInputKey: OnlineLumiCalibrationCondData -Py:ComponentAccumulator INFO * SkipInvalid: False Py:ComponentAccumulator INFO \__ LArPileUpAvgSymCondAlg (cond alg) Py:ComponentAccumulator INFO * ReadKey: LArPileupAverage Py:ComponentAccumulator INFO * WriteKey: LArPileupAverageSym @@ -155,7 +90,7 @@ Py:ComponentAccumulator INFO \__ LArPileUpShapeSymCondAlg (cond alg) Py:ComponentAccumulator INFO * ReadKey: LArShape32 Py:ComponentAccumulator INFO * WriteKey: LArShape32Sym Py:ComponentAccumulator INFO Services -Py:ComponentAccumulator INFO ['IOVDbSvc', 'PoolSvc', 'CondSvc', 'ProxyProviderSvc', 'DBReplicaSvc', 'AthenaPoolCnvSvc', 'EventPersistencySvc'] +Py:ComponentAccumulator INFO [] Py:ComponentAccumulator INFO Public Tools Py:ComponentAccumulator INFO [ Py:ComponentAccumulator INFO ] diff --git a/Calorimeter/CaloTools/python/CaloEstimatedGainToolConfig.py b/Calorimeter/CaloTools/python/CaloEstimatedGainToolConfig.py index 19e2e3cd4e271acdf1498d53b4e916824936101b..0acc83f508367b8210558a7202bdfd8172ecdb8d 100644 --- a/Calorimeter/CaloTools/python/CaloEstimatedGainToolConfig.py +++ b/Calorimeter/CaloTools/python/CaloEstimatedGainToolConfig.py @@ -68,7 +68,7 @@ if __name__ == "__main__": flags1.Input.Files = defaultTestFiles.RDO flags1.lock() acc1 = CaloEstimatedGainToolCfg (flags1) - acc1.printCondAlgs(summariseProps=True) - print ('IOVDbSvc:', acc1.getService('IOVDbSvc').Folders) + only = ['CaloEstimatedGainTool'] + acc1.printCondAlgs(summariseProps=True, onlyComponents = only) print ('ComponentAccumulator:', acc1.popPrivateTools()) acc1.wasMerged() diff --git a/Calorimeter/CaloTools/share/CaloEstimatedGainToolConfig_test.ref b/Calorimeter/CaloTools/share/CaloEstimatedGainToolConfig_test.ref index 830e24a7ffe545037b67d966dff44d1f0333880d..5406baed8002868a3a3c10cdf5d6c6c3410cb427 100644 --- a/Calorimeter/CaloTools/share/CaloEstimatedGainToolConfig_test.ref +++ b/Calorimeter/CaloTools/share/CaloEstimatedGainToolConfig_test.ref @@ -1,62 +1,12 @@ -Py:Athena INFO using release [WorkDir-22.0.4] [x86_64-centos7-gcc8-opt] [atlas-work3/cba27fd4815] -- built on [2019-08-16T1937] +Py:Athena INFO using release [WorkDir-22.0.5] [x86_64-centos7-gcc8-opt] [atlas-work3/af41e7f170b] -- built on [2019-09-20T1552] Py:AutoConfigFlags INFO Obtaining metadata of auto-configuration by peeking into /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q221/21.0/v1/myRDO.pool.root Py:MetaReader INFO Current mode used: peeker Py:MetaReader INFO MetaReader is called with the parameter "unique_tag_info_values" set to True. This is a workaround to remove all duplicate values from "/TagInfo" key Py:TileCablingSvc INFO Forcing RUN2 (2014-2017) cabling for run 284500 with geometry ATLAS-R2-2016-01-00-01 -Py:TileInfoLoader INFO Adjusting TileInfo to return cell noise for Opt.Filter without iterations +Py:TileInfoLoaderCfg INFO Adjusting TileInfo to return cell noise for Opt.Filter without iterations Py:TileCablingSvc INFO Forcing RUN2 (2014-2017) cabling for run 284500 with geometry ATLAS-R2-2016-01-00-01 Py:TileCablingSvc INFO Forcing RUN2 (2014-2017) cabling for run 284500 with geometry ATLAS-R2-2016-01-00-01 Py:ComponentAccumulator INFO Condition Algorithms -Py:ComponentAccumulator INFO \__ CondInputLoader (cond alg) -Py:ComponentAccumulator INFO * Load: [('AthenaAttributeList', '/LAR/Identifier/FebRodMap'), ('AthenaAttributeList', '/LAR/Identifier/CalibIdMap'), ('CondAttrListCollection', '/TILE/OFL02/CALIB/LAS/LIN'), ('CondAttrListCollection', '/TILE/OFL02/CALIB/CES'), ('CondAttrListCollection', '/TILE/OFL02/CALIB/EMS'), ('CondAttrListCollection', '/TILE/OFL02/CALIB/CIS/FIT/LIN'), ('CondAttrListCollection', '/TILE/OFL02/CALIB/LAS/LIN'), ('CondAttrListCollection', '/TILE/OFL02/CALIB/CES'), ('CondAttrListCollection', '/TILE/OFL02/CALIB/EMS'), ('CondAttrListCollection', '/TILE/OFL02/CALIB/CIS/FIT/LIN'), ('CondAttrListCollection', '/TILE/OFL02/CALIB/CIS/FIT/NLN'), ('CondAttrListCollection', '/TILE/OFL02/CALIB/LAS/NLN'), ('CondAttrListCollection', '/TILE/OFL02/CALIB/LAS/FIBER'), ('CondAttrListCollection', '/TILE/OFL02/NOISE/SAMPLE'), ('AthenaAttributeList', '/LAR/Identifier/OnOffIdMap'), ('LArRampMC', '/LAR/ElecCalibMC/Ramp'), ('LArDAC2uAMC', '/LAR/ElecCalibMC/DAC2uA'), ('LAruA2MeVMC', '/LAR/ElecCalibMC/uA2MeV'), ('LArMphysOverMcalMC', '/LAR/ElecCalibMC/MphysOverMcal'), ('LArHVScaleCorrComplete', '/LAR/ElecCalibMC/HVScaleCorr')] -Py:ComponentAccumulator INFO \__ LArFebRodMappingAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: /LAR/Identifier/FebRodMap -Py:ComponentAccumulator INFO \__ LArCalibLineMappingAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: /LAR/Identifier/CalibIdMap -Py:ComponentAccumulator INFO \__ TileEMScaleCondAlg (cond alg) -Py:ComponentAccumulator INFO * CondSvc: CondSvc -Py:ComponentAccumulator INFO * OflCesProxy: TileCondProxyCool/TileCondProxyCool_OflCes -Py:ComponentAccumulator INFO * OflCisLinProxy: TileCondProxyCool/TileCondProxyCool_OflCisLin -Py:ComponentAccumulator INFO * OflCisNlnProxy: TileCondProxyCool/TileCondProxyCool_OflCisNln -Py:ComponentAccumulator INFO * OflEmsProxy: TileCondProxyCool/TileCondProxyCool_OflEms -Py:ComponentAccumulator INFO * OflLasFibProxy: TileCondProxyCool/TileCondProxyCool_OflLasFib -Py:ComponentAccumulator INFO * OflLasLinProxy: TileCondProxyCool/TileCondProxyCool_OflLasLin -Py:ComponentAccumulator INFO * OflLasNlnProxy: TileCondProxyCool/TileCondProxyCool_OflLasNln -Py:ComponentAccumulator INFO * OnlCacheUnit: Invalid -Py:ComponentAccumulator INFO * OnlCesProxy: TileCondProxyCool/TileCondProxyCool_OnlCes -Py:ComponentAccumulator INFO * OnlCisProxy: TileCondProxyCool/TileCondProxyCool_OnlCis -Py:ComponentAccumulator INFO * OnlEmsProxy: TileCondProxyCool/TileCondProxyCool_OnlEms -Py:ComponentAccumulator INFO * OnlLasProxy: TileCondProxyCool/TileCondProxyCool_OnlLas -Py:ComponentAccumulator INFO * TileCablingSvc: TileCablingSvc -Py:ComponentAccumulator INFO * TileEMScale: TileEMScale -Py:ComponentAccumulator INFO \__ TileSampleNoiseCondAlg (cond alg) -Py:ComponentAccumulator INFO * ConditionsProxy: TileCondProxyCool/TileCondProxyCool_NoiseSample -Py:ComponentAccumulator INFO * TileCalibData: TileSampleNoise -Py:ComponentAccumulator INFO \__ LArOnOffMappingAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: /LAR/Identifier/OnOffIdMap -Py:ComponentAccumulator INFO \__ LArMCSymCondAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: LArOnOffIdMap -Py:ComponentAccumulator INFO \__ LArSymConditionsAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: LArRamp -Py:ComponentAccumulator INFO * WriteKey: LArRampSym -Py:ComponentAccumulator INFO \__ LArSymConditionsAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: LArDAC2uA -Py:ComponentAccumulator INFO * WriteKey: LArDAC2uASym -Py:ComponentAccumulator INFO \__ LArSymConditionsAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: LAruA2MeV -Py:ComponentAccumulator INFO * WriteKey: LAruA2MeVSym -Py:ComponentAccumulator INFO \__ LArSymConditionsAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: LArMphysOverMcal -Py:ComponentAccumulator INFO * WriteKey: LArMphysOverMcalSym -Py:ComponentAccumulator INFO \__ LArADC2MeVCondAlg (cond alg) -Py:ComponentAccumulator INFO * LArADC2MeVKey: LArADC2MeV -Py:ComponentAccumulator INFO * LArDAC2uAKey: LArDAC2uASym -Py:ComponentAccumulator INFO * LArHVScaleCorrKey: LArHVScaleCorr -Py:ComponentAccumulator INFO * LArMphysOverMcalKey: LArMphysOverMcalSym -Py:ComponentAccumulator INFO * LArRampKey: LArRampSym -Py:ComponentAccumulator INFO * LAruA2MeVKey: LAruA2MeVSym -Py:ComponentAccumulator INFO * UseFEBGainTresholds: False -IOVDbSvc: ['/LAR/AlignCOOLOFL_LAR/OFLP200', '/LAR/LArCellPositionShiftCOOLOFL_LAR/OFLP200', '/LAR/Identifier/FebRodMapLARIdentifierFebRodMap-005COOLOFL_LAR/OFLP200', '/LAR/Identifier/CalibIdMapLARIdentifierCalibIdMap-012COOLOFL_LAR/OFLP200', '/TILE/OFL02/CALIB/LAS/LIN/TILE/OFL02/CALIB/LAS/LINCOOLOFL_TILE/OFLP200', '/TILE/OFL02/CALIB/CES/TILE/OFL02/CALIB/CESCOOLOFL_TILE/OFLP200', '/TILE/OFL02/CALIB/EMS/TILE/OFL02/CALIB/EMSCOOLOFL_TILE/OFLP200', '/TILE/OFL02/CALIB/CIS/FIT/LIN/TILE/OFL02/CALIB/CIS/FIT/LINCOOLOFL_TILE/OFLP200', '/TILE/OFL02/CALIB/LAS/LIN/TILE/OFL02/CALIB/LAS/LINCOOLOFL_TILE/OFLP200', '/TILE/OFL02/CALIB/CES/TILE/OFL02/CALIB/CESCOOLOFL_TILE/OFLP200', '/TILE/OFL02/CALIB/EMS/TILE/OFL02/CALIB/EMSCOOLOFL_TILE/OFLP200', '/TILE/OFL02/CALIB/CIS/FIT/LIN/TILE/OFL02/CALIB/CIS/FIT/LINCOOLOFL_TILE/OFLP200', '/TILE/OFL02/CALIB/CIS/FIT/NLN/TILE/OFL02/CALIB/CIS/FIT/NLNCOOLOFL_TILE/OFLP200', '/TILE/OFL02/CALIB/LAS/NLN/TILE/OFL02/CALIB/LAS/NLNCOOLOFL_TILE/OFLP200', '/TILE/OFL02/CALIB/LAS/FIBER/TILE/OFL02/CALIB/LAS/FIBERCOOLOFL_TILE/OFLP200', '/TILE/OFL02/NOISE/SAMPLE/TILE/OFL02/NOISE/SAMPLECOOLOFL_TILE/OFLP200', '/LAR/Identifier/OnOffIdMapLARIdentifierOnOffIdMap-012COOLOFL_LAR/OFLP200', '/LAR/ElecCalibMC/RampCOOLOFL_LAR/OFLP200', '/LAR/ElecCalibMC/DAC2uACOOLOFL_LAR/OFLP200', '/LAR/ElecCalibMC/uA2MeVCOOLOFL_LAR/OFLP200', '/LAR/ElecCalibMC/MphysOverMcalCOOLOFL_LAR/OFLP200', '/LAR/ElecCalibMC/HVScaleCorrCOOLOFL_LAR/OFLP200'] ComponentAccumulator: /***** Private AlgTool CaloEstimatedGainTool/CaloEstimatedGainTool ********************************* |-ADC2MeVKey = 'LArADC2MeV' (default: 'ConditionStore+LArADC2MeV') |-AuditFinalize = False diff --git a/Control/AthenaConfiguration/python/ComponentAccumulator.py b/Control/AthenaConfiguration/python/ComponentAccumulator.py index e23a9f080320bc0748e09726f82c43f9cff0e83b..720f206abae65666dfbfe06760b56a24152fe037 100644 --- a/Control/AthenaConfiguration/python/ComponentAccumulator.py +++ b/Control/AthenaConfiguration/python/ComponentAccumulator.py @@ -50,6 +50,16 @@ def printProperties(msg, c, nestLevel = 0): return +def filterComponents (comps, onlyComponents = []): + ret = [] + for c in comps: + if not onlyComponents or c.getName() in onlyComponents: + ret.append ((c, True)) + elif c.getName()+'-' in onlyComponents: + ret.append ((c, False)) + return ret + + class ComponentAccumulator(object): def __init__(self,sequenceName='AthAlgSeq'): @@ -113,16 +123,21 @@ class ComponentAccumulator(object): - def printCondAlgs(self, summariseProps=False): + def printCondAlgs(self, summariseProps=False, onlyComponents=[]): self._msg.info( "Condition Algorithms" ) - for c in self._conditionsAlgs: + for (c, flag) in filterComponents (self._conditionsAlgs, onlyComponents): self._msg.info( " " +"\\__ "+ c.name() +" (cond alg)" ) - if summariseProps: + if summariseProps and flag: printProperties(self._msg, c, 1) return - def printConfig(self, withDetails=False, summariseProps=False): + # If onlyComponents is set, then only print components with names + # that appear in the onlyComponents list. If a name is present + # in the list with a trailing `-', then only the name of the component + # will be printed, not its properties. + def printConfig(self, withDetails=False, summariseProps=False, + onlyComponents = []): self._msg.info( "Event Inputs" ) self._msg.info( "Event Algorithm Sequences" ) @@ -130,7 +145,8 @@ class ComponentAccumulator(object): if withDetails: self._msg.info( self._sequence ) else: - def printSeqAndAlgs(seq, nestLevel = 0): + def printSeqAndAlgs(seq, nestLevel = 0, + onlyComponents = []): def __prop(name): if name in seq.getValuedProperties(): return seq.getValuedProperties()[name] @@ -139,36 +155,37 @@ class ComponentAccumulator(object): self._msg.info( " "*nestLevel +"\\__ "+ seq.name() +" (seq: %s %s)", "SEQ" if __prop("Sequential") else "PAR", "OR" if __prop("ModeOR") else "AND" ) nestLevel += 3 - for c in seq.getChildren(): + for (c, flag) in filterComponents (seq.getChildren(), onlyComponents): if isSequence(c): - printSeqAndAlgs(c, nestLevel ) + printSeqAndAlgs(c, nestLevel, onlyComponents = onlyComponents ) else: self._msg.info( " "*nestLevel +"\\__ "+ c.name() +" (alg)" ) - if summariseProps: + if summariseProps and flag: printProperties(self._msg, c, nestLevel) for n,s in enumerate(self._allSequences): self._msg.info( "Top sequence {}".format(n) ) - printSeqAndAlgs(s) + printSeqAndAlgs(s, onlyComponents = onlyComponents) - self.printCondAlgs (summariseProps = summariseProps) + self.printCondAlgs (summariseProps = summariseProps, + onlyComponents = onlyComponents) self._msg.info( "Services" ) - self._msg.info( [ s.getName() for s in self._services ] ) + self._msg.info( [ s[0].getName() for s in filterComponents (self._services, onlyComponents) ] ) self._msg.info( "Public Tools" ) self._msg.info( "[" ) - for t in self._publicTools: + for (t, flag) in filterComponents (self._publicTools, onlyComponents): self._msg.info( " {0},".format(t.getFullName()) ) # Not nested, for now - if summariseProps: + if summariseProps and flag: printProperties(self._msg, t) self._msg.info( "]" ) self._msg.info( "Private Tools") self._msg.info( "[" ) if (isinstance(self._privateTools, list)): - for t in self._privateTools: + for (t, flag) in filterComponents (self._privateTools, onlyComponents): self._msg.info( " {0},".format(t.getFullName()) ) # Not nested, for now - if summariseProps: + if summariseProps and flag: printProperties(self._msg, t) else: if self._privateTools is not None: diff --git a/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderToolConfig.py b/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderToolConfig.py index 112ca71580db7d3f1bc8ce943391e1528ef1751d..0f5f47cb005585ff06da29b49125fbfdf2085bee 100644 --- a/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderToolConfig.py +++ b/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderToolConfig.py @@ -42,7 +42,8 @@ if __name__ == "__main__": flags1.Input.Files = defaultTestFiles.RDO flags1.lock() acc1 = AddNoiseCellBuilderToolCfg (flags1) - acc1.printCondAlgs(summariseProps=True) - print ('IOVDbSvc:', acc1.getService('IOVDbSvc').Folders) + only = ['AddNoiseCellBuilderTool', + 'CaloNoiseCondAlg-'] + acc1.printCondAlgs(summariseProps=True, onlyComponents = only) print ('ComponentAccumulator:', acc1.popPrivateTools()) acc1.wasMerged() diff --git a/Simulation/FastShower/FastCaloSim/share/AddNoiseCellBuilderToolConfigTest_test.ref b/Simulation/FastShower/FastCaloSim/share/AddNoiseCellBuilderToolConfigTest_test.ref index 0ee0e82916a76536ea40814e9858b1d5238f4522..d1bf84bd05a4f3b01513f1a571525c1ed6374eae 100644 --- a/Simulation/FastShower/FastCaloSim/share/AddNoiseCellBuilderToolConfigTest_test.ref +++ b/Simulation/FastShower/FastCaloSim/share/AddNoiseCellBuilderToolConfigTest_test.ref @@ -1,4 +1,4 @@ -Py:Athena INFO using release [WorkDir-22.0.5] [x86_64-centos7-gcc8-opt] [atlas-work3/ab6a9b29b3e7] -- built on [2019-09-05T1832] +Py:Athena INFO using release [WorkDir-22.0.5] [x86_64-centos7-gcc8-opt] [atlas-work3/af41e7f170b] -- built on [2019-09-20T1552] Py:AutoConfigFlags INFO Obtaining metadata of auto-configuration by peeking into /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q221/21.0/v1/myRDO.pool.root Py:MetaReader INFO Current mode used: peeker Py:MetaReader INFO MetaReader is called with the parameter "unique_tag_info_values" set to True. This is a workaround to remove all duplicate values from "/TagInfo" key @@ -9,63 +9,6 @@ Py:TileCablingSvc INFO Forcing RUN2 (2014-2017) cabling for run 284500 with g Py:CaloNoiseToolCfg INFO Configuring CaloNoiseCondAlg for MC data processing Py:CaloNoiseToolCfg INFO offline mode: use luminosity from /CALO/Ofl/Noise/PileuUpNoiseLumi to scale pileup noise Py:ComponentAccumulator INFO Condition Algorithms -Py:ComponentAccumulator INFO \__ CondInputLoader (cond alg) -Py:ComponentAccumulator INFO * Load: [('AthenaAttributeList', '/LAR/Identifier/FebRodMap'), ('AthenaAttributeList', '/LAR/Identifier/CalibIdMap'), ('CondAttrListCollection', '/TILE/OFL02/CALIB/LAS/LIN'), ('CondAttrListCollection', '/TILE/OFL02/CALIB/CES'), ('CondAttrListCollection', '/TILE/OFL02/CALIB/EMS'), ('CondAttrListCollection', '/TILE/OFL02/CALIB/CIS/FIT/LIN'), ('CondAttrListCollection', '/TILE/OFL02/CALIB/LAS/LIN'), ('CondAttrListCollection', '/TILE/OFL02/CALIB/CES'), ('CondAttrListCollection', '/TILE/OFL02/CALIB/EMS'), ('CondAttrListCollection', '/TILE/OFL02/CALIB/CIS/FIT/LIN'), ('CondAttrListCollection', '/TILE/OFL02/CALIB/CIS/FIT/NLN'), ('CondAttrListCollection', '/TILE/OFL02/CALIB/LAS/NLN'), ('CondAttrListCollection', '/TILE/OFL02/CALIB/LAS/FIBER'), ('CondAttrListCollection', '/TILE/OFL02/NOISE/SAMPLE'), ('AthenaAttributeList', '/LAR/Identifier/OnOffIdMap'), ('LArRampMC', '/LAR/ElecCalibMC/Ramp'), ('LArDAC2uAMC', '/LAR/ElecCalibMC/DAC2uA'), ('LAruA2MeVMC', '/LAR/ElecCalibMC/uA2MeV'), ('LArMphysOverMcalMC', '/LAR/ElecCalibMC/MphysOverMcal'), ('LArHVScaleCorrComplete', '/LAR/ElecCalibMC/HVScaleCorr'), ('CondAttrListCollection', '/CALO/Ofl/Noise/PileUpNoiseLumi'), ('CondAttrListCollection', '/LAR/NoiseOfl/CellNoise'), ('CondAttrListCollection', '/TILE/OFL02/NOISE/CELL'), ('CondAttrListCollection', '/CALO/Ofl/Noise/CellNoise')] -Py:ComponentAccumulator INFO \__ LArFebRodMappingAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: /LAR/Identifier/FebRodMap -Py:ComponentAccumulator INFO \__ LArCalibLineMappingAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: /LAR/Identifier/CalibIdMap -Py:ComponentAccumulator INFO \__ TileEMScaleCondAlg (cond alg) -Py:ComponentAccumulator INFO * CondSvc: CondSvc -Py:ComponentAccumulator INFO * OflCesProxy: TileCondProxyCool/TileCondProxyCool_OflCes -Py:ComponentAccumulator INFO * OflCisLinProxy: TileCondProxyCool/TileCondProxyCool_OflCisLin -Py:ComponentAccumulator INFO * OflCisNlnProxy: TileCondProxyCool/TileCondProxyCool_OflCisNln -Py:ComponentAccumulator INFO * OflEmsProxy: TileCondProxyCool/TileCondProxyCool_OflEms -Py:ComponentAccumulator INFO * OflLasFibProxy: TileCondProxyCool/TileCondProxyCool_OflLasFib -Py:ComponentAccumulator INFO * OflLasLinProxy: TileCondProxyCool/TileCondProxyCool_OflLasLin -Py:ComponentAccumulator INFO * OflLasNlnProxy: TileCondProxyCool/TileCondProxyCool_OflLasNln -Py:ComponentAccumulator INFO * OnlCacheUnit: Invalid -Py:ComponentAccumulator INFO * OnlCesProxy: TileCondProxyCool/TileCondProxyCool_OnlCes -Py:ComponentAccumulator INFO * OnlCisProxy: TileCondProxyCool/TileCondProxyCool_OnlCis -Py:ComponentAccumulator INFO * OnlEmsProxy: TileCondProxyCool/TileCondProxyCool_OnlEms -Py:ComponentAccumulator INFO * OnlLasProxy: TileCondProxyCool/TileCondProxyCool_OnlLas -Py:ComponentAccumulator INFO * TileCablingSvc: TileCablingSvc -Py:ComponentAccumulator INFO * TileEMScale: TileEMScale -Py:ComponentAccumulator INFO \__ TileSampleNoiseCondAlg (cond alg) -Py:ComponentAccumulator INFO * ConditionsProxy: TileCondProxyCool/TileCondProxyCool_NoiseSample -Py:ComponentAccumulator INFO * TileCalibData: TileSampleNoise -Py:ComponentAccumulator INFO \__ LArOnOffMappingAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: /LAR/Identifier/OnOffIdMap -Py:ComponentAccumulator INFO \__ LArMCSymCondAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: LArOnOffIdMap -Py:ComponentAccumulator INFO \__ LArSymConditionsAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: LArRamp -Py:ComponentAccumulator INFO * WriteKey: LArRampSym -Py:ComponentAccumulator INFO \__ LArSymConditionsAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: LArDAC2uA -Py:ComponentAccumulator INFO * WriteKey: LArDAC2uASym -Py:ComponentAccumulator INFO \__ LArSymConditionsAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: LAruA2MeV -Py:ComponentAccumulator INFO * WriteKey: LAruA2MeVSym -Py:ComponentAccumulator INFO \__ LArSymConditionsAlg (cond alg) -Py:ComponentAccumulator INFO * ReadKey: LArMphysOverMcal -Py:ComponentAccumulator INFO * WriteKey: LArMphysOverMcalSym -Py:ComponentAccumulator INFO \__ LArADC2MeVCondAlg (cond alg) -Py:ComponentAccumulator INFO * LArADC2MeVKey: LArADC2MeV -Py:ComponentAccumulator INFO * LArDAC2uAKey: LArDAC2uASym -Py:ComponentAccumulator INFO * LArHVScaleCorrKey: LArHVScaleCorr -Py:ComponentAccumulator INFO * LArMphysOverMcalKey: LArMphysOverMcalSym -Py:ComponentAccumulator INFO * LArRampKey: LArRampSym -Py:ComponentAccumulator INFO * LAruA2MeVKey: LAruA2MeVSym -Py:ComponentAccumulator INFO * UseFEBGainTresholds: False -Py:ComponentAccumulator INFO \__ Calo_electronicNoiseAlg (cond alg) -Py:ComponentAccumulator INFO * CaloNoiseFolder: /CALO/Ofl/Noise/CellNoise -Py:ComponentAccumulator INFO * LArNoiseFolder: /LAR/NoiseOfl/CellNoise -Py:ComponentAccumulator INFO * LumiFolder: /CALO/Ofl/Noise/PileUpNoiseLumi -Py:ComponentAccumulator INFO * Luminosity: -1.0 -Py:ComponentAccumulator INFO * OutputKey: electronicNoise -Py:ComponentAccumulator INFO * TileNoiseFolder: /TILE/OFL02/NOISE/CELL -IOVDbSvc: ['/LAR/AlignCOOLOFL_LAR/OFLP200', '/LAR/LArCellPositionShiftCOOLOFL_LAR/OFLP200', '/LAR/Identifier/FebRodMapLARIdentifierFebRodMap-005COOLOFL_LAR/OFLP200', '/LAR/Identifier/CalibIdMapLARIdentifierCalibIdMap-012COOLOFL_LAR/OFLP200', '/TILE/OFL02/CALIB/LAS/LIN/TILE/OFL02/CALIB/LAS/LINCOOLOFL_TILE/OFLP200', '/TILE/OFL02/CALIB/CES/TILE/OFL02/CALIB/CESCOOLOFL_TILE/OFLP200', '/TILE/OFL02/CALIB/EMS/TILE/OFL02/CALIB/EMSCOOLOFL_TILE/OFLP200', '/TILE/OFL02/CALIB/CIS/FIT/LIN/TILE/OFL02/CALIB/CIS/FIT/LINCOOLOFL_TILE/OFLP200', '/TILE/OFL02/CALIB/LAS/LIN/TILE/OFL02/CALIB/LAS/LINCOOLOFL_TILE/OFLP200', '/TILE/OFL02/CALIB/CES/TILE/OFL02/CALIB/CESCOOLOFL_TILE/OFLP200', '/TILE/OFL02/CALIB/EMS/TILE/OFL02/CALIB/EMSCOOLOFL_TILE/OFLP200', '/TILE/OFL02/CALIB/CIS/FIT/LIN/TILE/OFL02/CALIB/CIS/FIT/LINCOOLOFL_TILE/OFLP200', '/TILE/OFL02/CALIB/CIS/FIT/NLN/TILE/OFL02/CALIB/CIS/FIT/NLNCOOLOFL_TILE/OFLP200', '/TILE/OFL02/CALIB/LAS/NLN/TILE/OFL02/CALIB/LAS/NLNCOOLOFL_TILE/OFLP200', '/TILE/OFL02/CALIB/LAS/FIBER/TILE/OFL02/CALIB/LAS/FIBERCOOLOFL_TILE/OFLP200', '/TILE/OFL02/NOISE/SAMPLE/TILE/OFL02/NOISE/SAMPLECOOLOFL_TILE/OFLP200', '/LAR/Identifier/OnOffIdMapLARIdentifierOnOffIdMap-012COOLOFL_LAR/OFLP200', '/LAR/ElecCalibMC/RampCOOLOFL_LAR/OFLP200', '/LAR/ElecCalibMC/DAC2uACOOLOFL_LAR/OFLP200', '/LAR/ElecCalibMC/uA2MeVCOOLOFL_LAR/OFLP200', '/LAR/ElecCalibMC/MphysOverMcalCOOLOFL_LAR/OFLP200', '/LAR/ElecCalibMC/HVScaleCorrCOOLOFL_LAR/OFLP200', '/CALO/Ofl/Noise/PileUpNoiseLumiCOOLOFL_CALO/OFLP200', '/LAR/NoiseOfl/CellNoiseCOOLOFL_LAR/OFLP200', '/TILE/OFL02/NOISE/CELLCOOLOFL_TILE/OFLP200', '/CALO/Ofl/Noise/CellNoiseCOOLOFL_CALO/OFLP200'] ComponentAccumulator: /***** Private AlgTool AddNoiseCellBuilderTool/AddNoiseCellBuilderTool ***************************** |-AuditFinalize = False |-AuditInitialize = False