diff --git a/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETFromClustersPufitMT.cxx b/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETFromClustersPufitMT.cxx index 64c8b3e89f02d80ebcc4af8187cea210b0b0d8b6..74c298b5f33726eddbd5a4948c5dbf69c6ba3b40 100644 --- a/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETFromClustersPufitMT.cxx +++ b/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETFromClustersPufitMT.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /******************************************************************** diff --git a/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETFromClustersPufitMT.h b/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETFromClustersPufitMT.h index c50342e215bc54fb64136a5ba2afa78ab0a1a52c..facd1fd051d92083c1fc86eb2b4eea8779cfe2fa 100644 --- a/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETFromClustersPufitMT.h +++ b/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETFromClustersPufitMT.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ #ifndef TRIGEFMISSINGET_EFMissingETFromClustersPufitMT_H diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/met.fromClustersPufit.py b/Trigger/TrigValidation/TrigUpgradeTest/share/met.fromClustersPufit.py index 890d0bd1c1aa60c680b16c574c9138fc5505b52d..1bff215bacba09d8827d3b9427e53eb4bf93c07e 100644 --- a/Trigger/TrigValidation/TrigUpgradeTest/share/met.fromClustersPufit.py +++ b/Trigger/TrigValidation/TrigUpgradeTest/share/met.fromClustersPufit.py @@ -7,17 +7,10 @@ from AthenaCommon.AlgSequence import AlgSequence topSequence = AlgSequence() import math -from TrigT2CaloCommon.TrigT2CaloCommonConf import TrigCaloDataAccessSvc#, TestCaloDataAccess +from TrigT2CaloCommon.TrigT2CaloCommonConf import TrigCaloDataAccessSvc from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram -mon = GenericMonitoringTool("CaloDataAccessSvcMon") -mon.Histograms += [defineHistogram( "TIME_locking_LAr_RoI", path='EXPERT', title="Time spent in unlocking the LAr collection", xbins=100, xmin=0, xmax=100 ), - defineHistogram( "roiROBs_LAr", path='EXPERT', title="Number of ROBs unpacked in RoI requests", xbins=20, xmin=0, xmax=20 ), - defineHistogram( "TIME_locking_LAr_FullDet", path='EXPERT', title="Time spent in unlocking the LAr collection", xbins=100, xmin=0, xmax=100 ), - defineHistogram( "roiEta_LAr,roiPhi_LAr", type="TH2F", path='EXPERT', title="Geometric usage", xbins=50, xmin=-5, xmax=5, ybins=64, ymin=-math.pi, ymax=math.pi )] - svcMgr += TrigCaloDataAccessSvc() -svcMgr.TrigCaloDataAccessSvc.MonTool = mon from L1Decoder.L1DecoderConf import CreateFullScanRoI topSequence += CreateFullScanRoI()