diff --git a/MuonSpectrometer/MuonConfig/python/MuonCalibConfig.py b/MuonSpectrometer/MuonConfig/python/MuonCalibConfig.py
index 39850214cbb36af2c6d90012d831fa9ab25853c6..fd727cca40a883ef02d32a4980ca1e5b75833bc1 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonCalibConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonCalibConfig.py
@@ -382,7 +382,7 @@ def _setupMdtCondDB(flags):
return result, mdt_folder_name_appendix
# end of function setupMdtCondDB()
-def MdtCalibDbToolCfg(flags,**kwargs):
+def MdtCalibDbToolCfg(flags,name="MdtCalibDbTool",**kwargs):
result=ComponentAccumulator()
# result.merge( IOVDbSvcCfg(flags) )
@@ -400,7 +400,7 @@ def MdtCalibDbToolCfg(flags,**kwargs):
kwargs.setdefault("TubeFolder", "/MDT/T0"+ mdt_folder_name_appendix)
kwargs.setdefault("RtFolder", "/MDT/RT"+ mdt_folder_name_appendix)
kwargs.setdefault("RT_InputFiles" , ["Muon_RT_default.data"])
- if not flags.Input.isMC == 'data':
+ if flags.Input.isMC == False: # Should be " if flags.Input.isMC=='data' " ?
kwargs.setdefault("defaultT0", 40)
else:
kwargs.setdefault("defaultT0", 799)
@@ -408,7 +408,7 @@ def MdtCalibDbToolCfg(flags,**kwargs):
kwargs.setdefault("TimeSlewingCorrection", flags.Muon.Calib.correctMdtRtForTimeSlewing)
kwargs.setdefault("MeanCorrectionVsR", [ -5.45973, -4.57559, -3.71995, -3.45051, -3.4505, -3.4834, -3.59509, -3.74869, -3.92066, -4.10799, -4.35237, -4.61329, -4.84111, -5.14524 ])
kwargs.setdefault("PropagationSpeedBeta", flags.Muon.Calib.mdtPropagationSpeedBeta)
- return result, MuonCalib__MdtCalibDbCoolStrTool(**kwargs)
+ return result, MuonCalib__MdtCalibDbCoolStrTool(name,**kwargs)
def MdtCalibrationDbSvcCfg(flags, **kwargs):
result=ComponentAccumulator()
@@ -416,7 +416,8 @@ def MdtCalibrationDbSvcCfg(flags, **kwargs):
kwargs.setdefault( "CreateBFieldFunctions", flags.Muon.Calib.correctMdtRtForBField )
kwargs.setdefault( "CreateWireSagFunctions", flags.Muon.Calib.correctMdtRtWireSag )
kwargs.setdefault( "CreateSlewingFunctions", flags.Muon.Calib.correctMdtRtForTimeSlewing)
-
+ kwargs.setdefault( "DBTool", "MuonCalib::MdtCalibDbCoolStrTool/MdtCalibDbTool")
+
acc, mdt_calib_db_tool = MdtCalibDbToolCfg(flags)
acc.addPublicTool(mdt_calib_db_tool)
result.merge(acc)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/MuonMenuConfig.py b/Trigger/TrigValidation/TrigUpgradeTest/python/MuonMenuConfig.py
index 154e8c86891fbf3b5b20abb0bc0d8bbf5cc29b7c..1ba7e950116c23d647440b0b8eb16261d608d1da 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/MuonMenuConfig.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/MuonMenuConfig.py
@@ -118,8 +118,8 @@ def CscDataPreparatorCfg( flags, roisKey ):
return acc, CscDataPreparator
-# Configure Reco alg of muFast step
-def muFastSteeringCfg( flags, roisKey ):
+# Based on TrigL2MuonSAMTConfig at TrigL2MuonSA/TrigL2MuonSAConfig.py
+def muFastSteeringCfg( flags, roisKey, setup="" ):
acc = ComponentAccumulator()
@@ -146,24 +146,77 @@ def muFastSteeringCfg( flags, roisKey ):
RPCDataPreparator = RpcDataPreparator,
TGCDataPreparator = TgcDataPreparator )
+ # Setup the station fitter
+ from TrigL2MuonSA.TrigL2MuonSAConf import TrigL2MuonSA__MuFastStationFitter,TrigL2MuonSA__PtFromAlphaBeta
+ PtFromAlphaBeta = TrigL2MuonSA__PtFromAlphaBeta()
+ if flags.Trigger.run2Config == '2016':
+ PtFromAlphaBeta.useCscPt = False
+ PtFromAlphaBeta.AvoidMisalignedCSCs = True
+ else:
+ PtFromAlphaBeta.useCscPt = True
+ PtFromAlphaBeta.AvoidMisalignedCSCs = True
+
+ MuFastStationFitter = TrigL2MuonSA__MuFastStationFitter( PtFromAlphaBeta = PtFromAlphaBeta )
+
+ from TrigL2MuonSA.TrigL2MuonSAConf import TrigL2MuonSA__MuFastPatternFinder,TrigL2MuonSA__MuFastTrackFitter,TrigL2MuonSA__MuFastTrackExtrapolator,TrigL2MuonSA__MuCalStreamerTool,TrigL2MuonSA__CscSegmentMaker
+ MuFastPatternFinder = TrigL2MuonSA__MuFastPatternFinder()
+ MuFastTrackFitter = TrigL2MuonSA__MuFastTrackFitter()
+ MuFastTrackExtrapolator = TrigL2MuonSA__MuFastTrackExtrapolator()
+ MuCalStreamerTool = TrigL2MuonSA__MuCalStreamerTool()
+ CscSegmentMaker = TrigL2MuonSA__CscSegmentMaker()
+
# Set Reco alg of muFast step
+ from TrigL2MuonSA.TrigL2MuonSAMonitoring import TrigL2MuonSAMonitoring
from TrigL2MuonSA.TrigL2MuonSAConf import MuFastSteering
- muFastAlg = MuFastSteering( name = "MuFastSteering_Muon",
- DataPreparator = MuFastDataPreparator,
- R_WIDTH_TGC_FAILED = 200,
- R_WIDTH_RPC_FAILED = 400,
- DoCalibrationStream = False,
- USE_ROIBASEDACCESS_CSC = True,
- RpcErrToDebugStream = True,
- Timing = False,
- MonTool = "",
- # TriggerFlags.run2Config != '2016'
- UseEndcapInnerFromBarrel = True,
- # not 900 GeV
- WinPt = 6.0,
- Scale_Road_BarrelInner = 1,
- Scale_Road_BarrelMiddle = 1,
- Scale_Road_BarrelOuter = 1 )
+ muFastAlg = MuFastSteering( name = "MuFastSteering_Muon"+setup,
+ DataPreparator = MuFastDataPreparator,
+ StationFitter = MuFastStationFitter,
+ PatternFinder = MuFastPatternFinder,
+ TrackFitter = MuFastTrackFitter,
+ TrackExtrapolator = MuFastTrackExtrapolator,
+ CalibrationStreamer = MuCalStreamerTool,
+ CscSegmentMaker = CscSegmentMaker,
+ R_WIDTH_TGC_FAILED = 200,
+ R_WIDTH_RPC_FAILED = 400,
+ DoCalibrationStream = False,
+ USE_ROIBASEDACCESS_CSC = True,
+ RpcErrToDebugStream = True,
+ Timing = False,
+ MonTool = TrigL2MuonSAMonitoring() )
+
+ # Default backextrapolator is for MC Misaligned Detector
+ # Based on MuonBackExtrapolatorForMisalignedDet at TrigMuonBackExtrapolator/TrigMuonBackExtrapolatorConfig.py
+ from TrigMuonBackExtrapolator.TrigMuonBackExtrapolatorConf import TrigMuonBackExtrapolator
+ muFastAlg.BackExtrapolator = TrigMuonBackExtrapolator( name = "MisalignedBackExtrapolator",
+ Aligned = False,
+ DataSet = False )
+
+ if flags.Trigger.run2Config == '2016':
+ muFastAlg.UseEndcapInnerFromBarrel = False
+ else:
+ muFastAlg.UseEndcapInnerFromBarrel = True
+
+ if setup == '900GeV':
+ muFastAlg.WinPt = 4.0
+ muFastAlg.Scale_Road_BarrelInner = 3
+ muFastAlg.Scale_Road_BarrelMiddle = 3
+ muFastAlg.Scale_Road_BarrelOuter = 3
+ else:
+ muFastAlg.WinPt = 6.0
+ muFastAlg.Scale_Road_BarrelInner = 1
+ muFastAlg.Scale_Road_BarrelMiddle = 1
+ muFastAlg.Scale_Road_BarrelOuter = 1
+
+ if setup == 'MuonCalib':
+ muFastAlg.DoCalibrationStream = True
+ muFastAlg.MuonCalDataScouting = False
+ muFastAlg.MuonCalBufferSize = 1024*1024
+
+ if setup == 'MuonCalibDataScouting':
+ muFastAlg.DoCalibrationStream = True
+ muFastAlg.MuonCalDataScouting = True
+ muFastAlg.MuonCalBufferSize = 1024*1024
+
return acc, muFastAlg
def PtBarrelLUTSvcCfg( flags ):