diff --git a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py index c48f4e15ccfeea280f489498323b695e6be877ec..0db548bf4aac58187966873ffcd555d7ee8da122 100644 --- a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py @@ -108,7 +108,7 @@ class ConfiguredNewTrackingSiPattern: ServiceMgr.THistSvc.Output = ["valNtuples DATAFILE='SeedMakerValidation.root' OPT='RECREATE'"] - if NewTrackingCuts.mode() == "Offline" or InDetFlags.doHeavyIon() or NewTrackingCuts.mode() == "ForwardTracks": + if NewTrackingCuts.mode() == "Offline" or NewTrackingCuts.mode() == "BLS" or InDetFlags.doHeavyIon() or NewTrackingCuts.mode() == "ForwardTracks": InDetSiSpacePointsSeedMaker.maxdImpactPPS = NewTrackingCuts.maxdImpactPPSSeeds() InDetSiSpacePointsSeedMaker.maxdImpactSSS = NewTrackingCuts.maxdImpactSSSSeeds() @@ -243,7 +243,7 @@ class ConfiguredNewTrackingSiPattern: useSCT = DetFlags.haveRIO.SCT_on() if not is_dbm else False, PixelClusterContainer = InDetKeys.PixelClusters(), SCT_ClusterContainer = InDetKeys.SCT_Clusters()) - if NewTrackingCuts.mode() == "Offline": + if NewTrackingCuts.mode() == "Offline" or NewTrackingCuts.mode() == "BLS": track_finder.writeHolesFromPattern = InDetFlags.useHolesFromPattern() if is_dbm : track_finder.MagneticFieldMode = "NoField" @@ -256,7 +256,7 @@ class ConfiguredNewTrackingSiPattern: ToolSvc += track_finder - useBremMode = NewTrackingCuts.mode() == "Offline" or NewTrackingCuts.mode() == "DBM" + useBremMode = NewTrackingCuts.mode() == "Offline" or NewTrackingCuts.mode() == "BLS" or NewTrackingCuts.mode() == "DBM" from SiTrackMakerTool_xk.SiTrackMakerTool_xkConf import InDet__SiTrackMaker_xk as SiTrackMaker InDetSiTrackMaker = SiTrackMaker(name = 'InDetSiTrackMaker'+NewTrackingCuts.extension(), useSCT = NewTrackingCuts.useSCT(), @@ -375,7 +375,7 @@ class ConfiguredNewTrackingSiPattern: if InDetFlags.doHeavyIon() : InDetSiSPSeededTrackFinder.FreeClustersCut = 2 #Heavy Ion optimization from Igor - if NewTrackingCuts.mode() == "Offline": + if NewTrackingCuts.mode() == "Offline" or NewTrackingCuts.mode() == "BLS": InDetSiSPSeededTrackFinder.writeHolesFromPattern = InDetFlags.useHolesFromPattern() #InDetSiSPSeededTrackFinder.OutputLevel =VERBOSE @@ -500,7 +500,7 @@ class ConfiguredNewTrackingSiPattern: # # --- load Ambiguity Processor # - useBremMode = NewTrackingCuts.mode() == "Offline" + useBremMode = NewTrackingCuts.mode() == "Offline" or NewTrackingCuts.mode() == "BLS" # @TODO is the cluster split probability container needed here ? ambi_track_summary_tool = TrackingCommon.getInDetTrackSummaryTool(namePrefix = 'InDetAmbiguityProcessorSplitProb', diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py index 7244954b0f52bf5999f21a051d9bd55d4bd764bd..b7dc305f5bc4f7f95e0027dcb4b6f2decf9441da 100755 --- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py @@ -88,6 +88,8 @@ else: InDetNewTrackingCuts = ConfiguredNewTrackingCuts("MinBias") elif InDetFlags.doDVRetracking(): InDetNewTrackingCuts = ConfiguredNewTrackingCuts("R3LargeD0") + elif InDetFlags.doBLS(): + InDetNewTrackingCuts = ConfiguredNewTrackingCuts("BLS") else: InDetNewTrackingCuts = ConfiguredNewTrackingCuts("Offline") InDetNewTrackingCuts.printInfo() diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py index 16742c41b7798777513e8a53d444310c9c242dab..b1d214191717bdc2220a9559bf677284377fc7fe 100644 --- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py +++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py @@ -535,7 +535,9 @@ topSequence += InDetSiTrackerSpacePointFinder # Taken from InDetRecExample/share/InDetRec_jobOptions.py from InDetRecExample.ConfiguredNewTrackingCuts import ConfiguredNewTrackingCuts NewTrackingCuts = None -if doPixel and doSCT: +if doPixel and doSCT and InDetFlags.doBLS(): + NewTrackingCuts = ConfiguredNewTrackingCuts("BLS") +elif doPixel and doSCT: NewTrackingCuts = ConfiguredNewTrackingCuts("Offline") elif doPixel: NewTrackingCuts = ConfiguredNewTrackingCuts("Pixel") diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py index d4559803072e9958f4957e1e590e10a509d33d38..3ad8ba6f54a67c06c433dd90cc139185f498b72c 100644 --- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py +++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py @@ -433,7 +433,9 @@ topSequence += InDetSiTrackerSpacePointFinder # Taken from InDetRecExample/share/InDetRec_jobOptions.py from InDetRecExample.ConfiguredNewTrackingCuts import ConfiguredNewTrackingCuts NewTrackingCuts = None -if doPixel and doSCT: +if doPixel and doSCT and InDetFlags.doBLS(): + NewTrackingCuts = ConfiguredNewTrackingCuts("BLS") +elif doPixel and doSCT: NewTrackingCuts = ConfiguredNewTrackingCuts("Offline") elif doPixel: NewTrackingCuts = ConfiguredNewTrackingCuts("Pixel")