diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigSliceSettings.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigSliceSettings.py index b519e34a448560ae9a4fdfa5f1517ce091ae41f9..f04e7a70ca042cc47404588d2c5e77a9f0fddcd5 100644 --- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigSliceSettings.py +++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigSliceSettings.py @@ -10,9 +10,7 @@ """ __author__ = "Jiri Masik" -__version__= "$Revision: 1.6 $" __doc__ = "InDetTrigSliceSettings" - __all__ = [ "InDetTrigSliceSettings" ] class InDetTrigSliceSettingsDB: @@ -21,6 +19,9 @@ class InDetTrigSliceSettingsDB: their default settings. The settings may be overriden by user if the InDetTrigSliceSettings is instantiated early in the jO (before other InDetTrigRecExample files are included) + for example a preExec line + from InDetTrigRecExample.InDetTrigSliceSettings import InDetTrigSliceSettings; InDetTrigSliceSettings[('pTmin','bjetVtx')] = 2000. + allows testing the bjetVtx instance with as different reconstruction threshold """ def __init__(self): from AthenaCommon.SystemOfUnits import GeV @@ -35,7 +36,8 @@ class InDetTrigSliceSettingsDB: 'tauCore', 'tauIso', 'beamSpot', 'cosmics', 'bjetVtx', - 'FTK', 'FTKRefit' + 'FTK', 'FTKRefit', + 'bphysHighPt' ] self.db = {} @@ -74,6 +76,8 @@ class InDetTrigSliceSettingsDB: ptmin['hadCalib'] = 0.5 * GeV ptmin['fullScan500'] = 0.5 * GeV ptmin['minBias400'] = 0.39 * GeV + ptmin['bphysHighPt'] = 2. * GeV + ptmin['bjetVtx'] = 5. * GeV self.db['pTmin']=ptmin @@ -82,6 +86,7 @@ class InDetTrigSliceSettingsDB: d0seedppsmax[i] = 1.7 d0trackinitialmax[i] = 20.0 d0seedmax['bphysics'] = 10.0 + d0seedmax['bphysHighPt'] = 10.0 d0seedmax['muon'] = 10.0 d0seedmax['muonCore'] = 10.0 @@ -111,6 +116,7 @@ class InDetTrigSliceSettingsDB: dospphifiltering['muon'] = False dospphifiltering['muonCore'] = False dospphifiltering['bphysics'] = False + dospphifiltering['bphysHighPt'] = False self.db['doSpPhiFiltering'] = dospphifiltering for i in _slices: @@ -147,6 +153,7 @@ class InDetTrigSliceSettingsDB: 'tau' : 0.4, 'bjet' : 0.2, 'bphysics' : 0.75, + 'bphysHighPt' : 0.75, 'hadCalib' : 0.4, 'fullScan' : 3.0, 'fullScan500': 3.0, @@ -176,6 +183,7 @@ class InDetTrigSliceSettingsDB: 'tau' : 0.4, 'bjet' : 0.201, 'bphysics' : 0.75, + 'bphysHighPt' : 0.75, 'hadCalib' : 0.4, 'fullScan' : 3.14159, 'fullScan500' : 3.14159, diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py index 6e2374c9dbc1369c1621674cf5a40b1bac700cf9..3c9ccaac462b0e1b72c5f9cccca4a265f8e1a580 100755 --- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py +++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py @@ -358,6 +358,7 @@ class TrigFastTrackFinder_Cosmic_Monitoring(TrigFastTrackFinder_CommonMonitoring xbins = 100, xmin=-0.5, xmax=99.5)] def remapper(type): + #this funcion should not be needed - we don't have to remap in both directions remap = { "Muon" : "muon", "MuonCore" : "muonCore", @@ -367,7 +368,7 @@ def remapper(type): "TauCore" : "tauCore", "TauIso" : "tauIso", "Jet" : "bjet", - "Jet" : "bjetVtx", + #"Jet" : "bjetVtx", "FullScan" : "fullScan", "BeamSpot" : "beamSpot", "Bphysics" : "bphysics", diff --git a/Trigger/TrigTools/TrigInDetConf/python/TrackingAlgCfgble.py b/Trigger/TrigTools/TrigInDetConf/python/TrackingAlgCfgble.py index 2dd1fb6c5ea2d1b96a084fef0f5b524ce5ef9d58..79ca92b951808144468b63dfdec7ccd228346d94 100644 --- a/Trigger/TrigTools/TrigInDetConf/python/TrackingAlgCfgble.py +++ b/Trigger/TrigTools/TrigInDetConf/python/TrackingAlgCfgble.py @@ -4,20 +4,23 @@ from TrigFastTrackFinder.TrigFastTrackFinder_Config import TrigFastTrackFinderBa class TrigFastTrackFinder(TrigFastTrackFinderBase): def __init__(self, name="TrigTrackFinder_Muon", type="muon"): + + #dictionary to accommodate old instance naming of the TrigFastTrackFinder + #new configurations should not enter here remap = { - "muon" : "Muon", - "muonCore" : "MuonCore", - "muonIso" : "MuonIso", - "electron" : "eGamma", - "tau" : "Tau", - "tauCore" : "TauCore", - "tauIso" : "TauIso", - "bjet" : "Jet", - "bjetVtx" : "Jet", - "fullScan" : "FullScan", - "beamSpot" : "BeamSpot", - "bphysics" : "Bphysics", - "cosmics" : "Cosmic", + "muon" : "Muon", + "muonCore" : "MuonCore", + "muonIso" : "MuonIso", + "electron" : "eGamma", + "tau" : "Tau", + "tauCore" : "TauCore", + "tauIso" : "TauIso", + "bjet" : "Jet", + #"bjetVtx" : "Jet", #if configs are the same they can map to the same instance + "fullScan" : "FullScan", + "beamSpot" : "BeamSpot", + "bphysics" : "Bphysics", + "cosmics" : "Cosmic", } #this should not happen here @@ -27,8 +30,10 @@ class TrigFastTrackFinder(TrigFastTrackFinderBase): elif 'Iso' in name and 'Iso' not in type: hacktype = type+'Iso' - #more type hacking - conftype = remap[hacktype] + conftype = hacktype + if hacktype in remap: + conftype = remap[hacktype] + if name.find('TrigFastTrackFinder_FTK')>-1: import re conftype = re.search("FTK.*$",name).group(0) diff --git a/Trigger/TrigTools/TrigInDetConf/python/TrigInDetSequence.py b/Trigger/TrigTools/TrigInDetConf/python/TrigInDetSequence.py index 853721555add7d24785c3e81e141c385e7147547..986dc24bcd249c964ab2382ea3592571edf22d09 100644 --- a/Trigger/TrigTools/TrigInDetConf/python/TrigInDetSequence.py +++ b/Trigger/TrigTools/TrigInDetConf/python/TrigInDetSequence.py @@ -191,6 +191,7 @@ class TrigInDetSequence(TrigInDetSequenceBase): ftfname = "" roiupdater = "" cnvname = "InDetTrigTrackingxAODCnv_%s_FTF" + cnvptname = "" if sequenceFlavour=="2step": ftfname = "TrigFastTrackFinder_%sCore"; ftf2name = "TrigFastTrackFinder_%sIso"; @@ -205,8 +206,10 @@ class TrigInDetSequence(TrigInDetSequenceBase): ftfname = "TrigFastTrackFinder_%s_IDTrig"; ftf2name = "TrigFastTrackFinder_%sIso_IDTrig"; cnvname = "InDetTrigTrackingxAODCnv_%s_FTF"; cnv2name = "InDetTrigTrackingxAODCnv_%sIso_FTF"; roiupdater = "IDTrigRoiUpdater_%s_IDTrig"; roi2updater="IDTrigRoiUpdater_%sIso_IDTrig" - - + + if self.__signature__=="bphysHighPt": + cnvname = "InDetTrigTrackingxAODCnv_Bphysics_FTF" + cnvptname = "InDetTrigTrackingxAODCnv_Bphysics_%s" % sequenceType if sequenceType=="IDTrig": @@ -249,7 +252,7 @@ class TrigInDetSequence(TrigInDetSequenceBase): ("TRTTrackExtAlg",""), ("TrigExtProcessor",""), #("InDetTrigTrackSlimmer",""), - ("InDetTrigTrackingxAODCnv",""), + ("InDetTrigTrackingxAODCnv",cnvptname), ("InDetTrigDetailedTrackTruthMaker",""), #("TrigVxPrimary",""), #("InDetTrigParticleCreation",""),