diff --git a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcPedMon.py b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcPedMon.py
index 19cbbfd44be6b11097c2aaf1e26fb7b5ee4b43cb..897f84aaa4adfab09c767c2671e4bbd6190c8f11 100644
--- a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcPedMon.py
+++ b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcPedMon.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
#**************************************************************
#
# Csc Pedestal Calibration
@@ -5,37 +7,7 @@
#==============================================================
runNumber = 2147483647
-#Input files:
-#prelimDir = "/raid01/lampen/testarea/Calib/August09CosmicRun/data/preliminaryData/"
-#AugustRunDir = "rfio:/castor/cern.ch/grid/atlas/DAQ/muon/csc/00124401/"
-#myInputFiles = [
-# AugustRunDir + 'data_test.00124401.calibration_ped.daq.RAW._lb0000._CSC-EB._0001.data',
-# AugustRunDir + 'data_test.00124401.calibration_ped.daq.RAW._lb0000._CSC-EB._0002.data',
-# AugustRunDir + 'data_test.00124401.calibration_ped.daq.RAW._lb0000._CSC-EB._0003.data',
-# ]
-
-#SeptRunDir = 'rfio:/castor/cern.ch/grid/atlas/DAQ/muon/csc/00129083/'
-#myInputFiles = [
-# SeptRunDir + 'data_test.00129083.calibration_ped.daq.RAW._lb0000._CSC-EB._0001.data',
-# SeptRunDir + 'data_test.00129083.calibration_ped.daq.RAW._lb0000._CSC-EB._0002.data',
-# SeptRunDir + 'data_test.00129083.calibration_ped.daq.RAW._lb0000._CSC-EB._0003.data',
-# ]
-
-#OctRunDir = '/raid02/lampen/datasets/csc/pedRuns/oct/raw/'
-#OctRUn1
-#myInputFiles = [
-# OctRunDir + 'data_test.00132435.calibration_ped.daq.RAW._lb0000._CSC-EB._0001.data',
-# OctRunDir + 'data_test.00132435.calibration_ped.daq.RAW._lb0000._CSC-EB._0002.data',
-# OctRunDir + 'data_test.00132435.calibration_ped.daq.RAW._lb0000._CSC-EB._0003.data'
-# ]
-
-#OctRun2
-#myInputFiles = [
-# OctRunDir + 'data_test.00133116.calibration_ped.daq.RAW._lb0000._CSC-EB._0001.data',
-#OctRunDir + 'data_test.00133116.calibration_ped.daq.RAW._lb0000._CSC-EB._0002.data',
-#OctRunDir + 'data_test.00133116.calibration_ped.daq.RAW._lb0000._CSC-EB._0003.data'
-#]
NovRunDir="/raid02/lampen/datasets/csc/pedRuns/nov/raw/*.data"
import glob
@@ -125,8 +97,15 @@ printfunc (MuonCscRawDataProviderTool)
# --- RawData Provider
from MuonByteStream.MuonByteStreamConf import Muon__CscRawDataProvider
-topSequence += Muon__CscRawDataProvider(name = "MuonCscRawDataProvider",
- ProviderTool = ToolSvc.MuonCscRawDataProviderTool)
+cscRawDataProvider = Muon__CscRawDataProvider(name = "MuonCscRawDataProvider",
+ ProviderTool = ToolSvc.MuonCscRawDataProviderTool)
+
+
+from RegionSelector.RegSelToolConfig import makeRegSelTool_CSC
+cscRawDataProvider.RegionSelectionTool = makeRegSelTool_CSC()
+
+topSequence += cscRawDataProvider
+
printfunc (topSequence.MuonCscRawDataProvider)
# --- BS Converter
diff --git a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcSlopeMon.py b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcSlopeMon.py
index d549f9c85cec2779b9c4d9f506f9bc3704aefce0..37061490c33c38a0fc54c660b7994ecd6f845449 100644
--- a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcSlopeMon.py
+++ b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcSlopeMon.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
runNumber = 2147483647
if('inputPat' not in dir()):
@@ -6,20 +8,6 @@ if('inputPat' not in dir()):
import glob
myInputFiles = glob.glob(inputPat)
-#Lots of pulses
-#defInputFile = "/afs/cern.ch/user/l/lampen/public/bytestreamTest/daq.cal.0079571.No.Streaming.LB0000.CSC-EB._0001.data"
-#myGeometryTag = 'ATLAS-GEO-01-00-00'
-#myIsCosmics = False
-#Old Cosmics
-#defInputFile = "rfio:/castor/cern.ch/atlas/muon/CSC/daq_CSC-EB-RCD__0001209_file01.data"
-#myGeometryTag = "MuonSpectrometer-CSC-CS-00"
-#myIsCosmics = True
-#Cosmics
-#defInputFile = "rfio:/castor/cern.ch/atlas/muon/CSC/daq_CSC-EB-RCD__0001853_file01.data"
-#myGeometryTag = "MuonSpectrometer-CSC-CS-00"
-#myIsCosmics = True
-############################
-
#######################################################################
#Input/Ouptut job settings.
#Command line options can give an input file as well as an output prefix
@@ -91,8 +79,14 @@ printfunc (MuonCscRawDataProviderTool)
# --- RawData Provider
from MuonByteStream.MuonByteStreamConf import Muon__CscRawDataProvider
-topSequence += Muon__CscRawDataProvider(name = "MuonCscRawDataProvider",
- ProviderTool = ToolSvc.MuonCscRawDataProviderTool)
+cscRawDataProvider = Muon__CscRawDataProvider(name = "MuonCscRawDataProvider",
+ ProviderTool = ToolSvc.MuonCscRawDataProviderTool)
+
+from RegionSelector.RegSelToolConfig import makeRegSelTool_CSC
+cscRawDataProvider.RegionSelectionTool = makeRegSelTool_CSC()
+
+topSequence += cscRawDataProvider
+
printfunc (topSequence.MuonCscRawDataProvider)
# --- BS Converter
diff --git a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalibCommonOptions.py b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalibCommonOptions.py
index 0e3953526aef2be9f3dd4617d64cb35c7f2e5d7a..e92557f6881f3181a40dc2e48212fccabf30b918 100644
--- a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalibCommonOptions.py
+++ b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalibCommonOptions.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
#**************************************************************
#
# Read in ByteStream events, and Access CSC RDO
@@ -66,8 +68,14 @@ printfunc (MuonCscRawDataProviderTool)
# load the CscRawDataProvider
from MuonByteStream.MuonByteStreamConf import Muon__CscRawDataProvider
-topSequence += Muon__CscRawDataProvider(name = "MuonCscRawDataProvider",
- ProviderTool = ToolSvc.MuonCscRawDataProviderTool)
+cscDataProvider = Muon__CscRawDataProvider(name = "MuonCscRawDataProvider",
+ ProviderTool = ToolSvc.MuonCscRawDataProviderTool)
+
+from RegionSelector.RegSelToolConfig import makeRegSelTool_CSC
+cscDataProvider.RegionSelectionTool = makeRegSelTool_CSC()
+
+topSequence += cscDataProvider
+
printfunc (topSequence.MuonCscRawDataProvider)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
index 747038c4ec9e2e31b811c20c3afe21901258d963..bf9e816007d7a6f382fd8c9a086dc0d8f700e919 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
@@ -132,10 +132,24 @@ def MuonTrackParticleCnvCfg(flags, name = "MuonTrackParticleCnvAlg",**kwargs):
def decodeCfg(flags, RoIs):
acc = ComponentAccumulator()
+
+ from RegionSelector.RegSelToolConfig import regSelTool_RPC_Cfg
+ RegSelTool_RPC = acc.popToolsAndMerge(regSelTool_RPC_Cfg(flags))
+
+ from RegionSelector.RegSelToolConfig import regSelTool_TGC_Cfg
+ RegSelTool_TGC = acc.popToolsAndMerge(regSelTool_TGC_Cfg(flags))
+
+ from RegionSelector.RegSelToolConfig import regSelTool_MDT_Cfg
+ RegSelTool_MDT = acc.popToolsAndMerge(regSelTool_MDT_Cfg(flags))
+
+ from RegionSelector.RegSelToolConfig import regSelTool_CSC_Cfg
+ RegSelTool_CSC = acc.popToolsAndMerge(regSelTool_CSC_Cfg(flags))
+
# Get RPC BS decoder
from MuonConfig.MuonBytestreamDecodeConfig import RpcBytestreamDecodeCfg
rpcAcc = RpcBytestreamDecodeCfg( flags, name = "RpcRawDataProvider_"+RoIs )
rpcAcc.getEventAlgo("RpcRawDataProvider_"+RoIs).RoIs = RoIs
+ rpcAcc.getEventAlgo("RpcRawDataProvider_"+RoIs).RegionSelectionTool = RegSelTool_RPC
acc.merge( rpcAcc )
# Get RPC BS->RDO convertor
@@ -148,6 +162,7 @@ def decodeCfg(flags, RoIs):
from MuonConfig.MuonBytestreamDecodeConfig import TgcBytestreamDecodeCfg
tgcAcc = TgcBytestreamDecodeCfg( flags, name="TgcRawDataProvider_"+RoIs )
tgcAcc.getEventAlgo("TgcRawDataProvider_"+RoIs).RoIs = RoIs
+ tgcAcc.getEventAlgo("TgcRawDataProvider_"+RoIs).RegionSelectionTool = RegSelTool_TGC
acc.merge( tgcAcc )
# Get TGC BS->RDO convertor
@@ -160,6 +175,7 @@ def decodeCfg(flags, RoIs):
from MuonConfig.MuonBytestreamDecodeConfig import MdtBytestreamDecodeCfg
mdtAcc = MdtBytestreamDecodeCfg( flags, name="MdtRawDataProvider_"+RoIs )
mdtAcc.getEventAlgo("MdtRawDataProvider_"+RoIs).RoIs = RoIs
+ mdtAcc.getEventAlgo("MdtRawDataProvider_"+RoIs).RegionSelectionTool = RegSelTool_MDT
acc.merge( mdtAcc )
# Get MDT BS->RDO convertor
@@ -172,6 +188,7 @@ def decodeCfg(flags, RoIs):
from MuonConfig.MuonBytestreamDecodeConfig import CscBytestreamDecodeCfg
cscAcc = CscBytestreamDecodeCfg( flags, name="CscRawDataProvider_"+RoIs )
cscAcc.getEventAlgo("CscRawDataProvider_"+RoIs).RoIs = RoIs
+ cscAcc.getEventAlgo("CscRawDataProvider_"+RoIs).RegionSelectionTool = RegSelTool_CSC
acc.merge( cscAcc )
# Get CSC BS->RDO convertor