diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref index 90dc123efc6bf4e49374c390a68c4dcd9640c8f0..38bda04643c28ab4a1a95d59072c18c3fdcbb238 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref @@ -406,6 +406,9 @@ TrigSignatureMoniMT INFO -- #1275052132 Features TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM #2456480859 TrigSignatureMoniMT INFO -- #2456480859 Events 14 14 11 10 6 - - - 6 TrigSignatureMoniMT INFO -- #2456480859 Features 20 14 6 - - - +TrigSignatureMoniMT INFO HLT_tilecalib_laser_TilePEB_L1CALREQ2 #1063154655 +TrigSignatureMoniMT INFO -- #1063154655 Events 0 0 0 - - - - - 0 +TrigSignatureMoniMT INFO -- #1063154655 Features 0 - - - - - TrigSignatureMoniMT INFO HLT_xe100_mht_L1XE50 #532175988 TrigSignatureMoniMT INFO -- #532175988 Events 10 10 6 - - - - - 6 TrigSignatureMoniMT INFO -- #532175988 Features 6 - - - - - diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref index ad6089f0dd35b593979af63228f32c1cf56d6605..a624b645e3f03d262e1eeb07f2c15bc32eaf72d5 100644 --- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref +++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref @@ -579,6 +579,9 @@ TrigSignatureMoniMT INFO -- #1275052132 Features TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM #2456480859 TrigSignatureMoniMT INFO -- #2456480859 Events 20 20 3 3 2 - - - 2 TrigSignatureMoniMT INFO -- #2456480859 Features 4 3 2 - - - +TrigSignatureMoniMT INFO HLT_tilecalib_laser_TilePEB_L1CALREQ2 #1063154655 +TrigSignatureMoniMT INFO -- #1063154655 Events 20 20 20 - - - - - 20 +TrigSignatureMoniMT INFO -- #1063154655 Features 20 - - - - - TrigSignatureMoniMT INFO HLT_timeburner_L1All #819160059 TrigSignatureMoniMT INFO -- #819160059 Events 20 20 0 - - - - - 0 TrigSignatureMoniMT INFO -- #819160059 Features 0 - - - - - diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/CosmicChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/CosmicChainConfiguration.py index ee73b6fd2d9db68c22e1fbb61d79772b51455116..333d56e5cdd5f689e751cc922aa05e4294df2056 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/CosmicChainConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/CosmicChainConfiguration.py @@ -2,7 +2,7 @@ from AthenaCommon.Logging import logging logging.getLogger().info("Importing %s",__name__) -log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.BeamspotChainConfiguration") +log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.CosmicChainConfiguration") from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase @@ -23,7 +23,8 @@ class CosmicChainConfiguration(ChainConfigurationBase): # define here the names of the steps and obtain the chainStep configuration # -------------------- stepDictionary = { - "sct_noise":[] + "sct_noise":[], + "tilecalib_laser" : [] } key = self.chainPart['chainPartName'] diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateCosmicChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateCosmicChainDefs.py index d4afe0c8f8245de39cfc091ad2cd27d0216ee44a..bc324550b3253a8dc9dda96df5d230df60cfc6c5 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateCosmicChainDefs.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateCosmicChainDefs.py @@ -13,9 +13,6 @@ log.info("Importing %s",__name__) def generateChainConfigs( chainDict ): - import pprint - pprint.pprint( chainDict ) - listOfChainDicts = splitChainDict(chainDict) log.debug("Will generate Config for streamer: ",chainDict['chainName']) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py index a856ca83967518dd8adba7dd44813ce8b81d3c8e..cf8f4b3dec84733af8425ad48ae12a921519c83b 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py @@ -74,6 +74,20 @@ def pebInfoWriterTool(name, eventBuildType): SubDetector.SCT_ENDCAP_A_SIDE, SubDetector.SCT_ENDCAP_C_SIDE ]) + elif 'TilePEB' in eventBuildType: + tool = StaticPEBInfoWriterToolCfg(name) + tool.addSubDets([SubDetector.TILECAL_LASER_CRATE, + SubDetector.TILECAL_BARREL_A_SIDE, + SubDetector.TILECAL_BARREL_C_SIDE, + SubDetector.TILECAL_EXT_A_SIDE, + SubDetector.TILECAL_EXT_C_SIDE, + SubDetector.TDAQ_CTP, + SubDetector.TDAQ_CALO_PREPROC, # = 0x71 + SubDetector.TDAQ_CALO_CLUSTER_PROC_DAQ, # = 0x72 + SubDetector.TDAQ_CALO_CLUSTER_PROC_ROI, # = 0x73 + SubDetector.TDAQ_CALO_JET_PROC_DAQ, # = 0x74 + SubDetector.TDAQ_CALO_JET_PROC_ROI # = 0x75 + ]) elif eventBuildType in DataScoutingInfo.getAllDataScoutingIdentifiers(): # Pure DataScouting configuration tool = StaticPEBInfoWriterToolCfg(name) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py index 14039de85bc55a3f9245e7718f1d190d1a16d6e1..1e42d4694a78a33b33e0887b73f4e5a3fcf39a6b 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py @@ -27,7 +27,8 @@ PartialEventBuildingIdentifiers = [ 'BeamSpotPEB', 'LArPEB', 'RPCPEBSecondaryReadout', - 'SCTPEB' + 'SCTPEB', + 'TilePEB' ] diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py index 63f63ae780ad9fb84ca72ca374f3f656013f8c79..0ab92825e5b869450743c6534cd12b87f601a88d 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py @@ -230,6 +230,7 @@ def setupMenu(): ] TriggerFlags.CalibSlice.signatures = TriggerFlags.CalibSlice.signatures() + [] TriggerFlags.CosmicSlice.signatures = TriggerFlags.CosmicSlice.signatures() + [ + ChainProp(name='HLT_tilecalib_laser_TilePEB_L1CALREQ2', l1SeedThresholds=['FSNOSEED'], stream=['Tile'], groups=['RATE:TileCalibration','BW:Detector']) ] TriggerFlags.StreamingSlice.signatures = TriggerFlags.StreamingSlice.signatures() + [ diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py index 780a1ec3a57e94703a2cb25bcb84844b7dd06daa..a04c8221bad71a46d13cb1d313040585dab05fab 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py @@ -39,6 +39,7 @@ _all_streams = [ StreamInfo('RPCSecondaryReadout', 'calibration', False, False), StreamInfo('CostMonitoring','calibration', False, False), StreamInfo('SCTNoise','calibration',False,False), + StreamInfo('Tile','calibration',False,False), # HI STREAMS StreamInfo('HardProbes', 'physics', True, True), StreamInfo('MinBias', 'physics', True, True),