diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/ConfiguredNewTrackingTrigCuts.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/ConfiguredNewTrackingTrigCuts.py index a5392b9879eb73ae7c005c0f30ffee783207b7cf..1835a9e49e02466e0db0a87784578a8ac04dee73 100644 --- a/InnerDetector/InDetExample/InDetTrigRecExample/python/ConfiguredNewTrackingTrigCuts.py +++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/ConfiguredNewTrackingTrigCuts.py @@ -16,11 +16,8 @@ else: del _sharedcuts class ConfiguredNewTrackingTrigCuts(InDetTrigTrackingCuts): - def __set_indetflags(self): - from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags - self.__indetflags = InDetTrigFlags - - + pass + if not 'EFIDTrackingCuts' in globals(): EFIDTrackingCuts = ConfiguredNewTrackingTrigCuts("Offline") EFIDTrackingCutsCosmics = ConfiguredNewTrackingTrigCuts("Cosmics") diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigTrackingCuts.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigTrackingCuts.py index 7e2476b027b9ae7519ad5a230db0f22958c255d7..3eb6db3aa4d3ac8692226543a7782d83eb482588 100755 --- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigTrackingCuts.py +++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigTrackingCuts.py @@ -194,7 +194,6 @@ class InDetTrigTrackingCuts : self.__nHolesMax = 2 # was 3 self.__nHolesGapMax = 2 # was 3 - """ if self.__indetflags.cutLevel() >= 13 and DetFlags.detdescr.Calo_allOn(): # --- turn on RoI seeded for Back Tracking and TRT only self.__RoISeededBackTracking = True @@ -232,7 +231,6 @@ class InDetTrigTrackingCuts : self.__minRoIClusterEt = 6000. * Units.MeV self.__minSecondaryPt = 3.0 * Units.GeV # Increase pT cut used for back-tracking to match calo-RoI - """ if self.__indetflags.cutLevel() >= mxlevel: print ('InDetTrigTrackingCuts INFO using cutLevel %d/%d' % (mxlevel,self.__indetflags.cutLevel())) @@ -433,8 +431,8 @@ class InDetTrigTrackingCuts : # ---------------------------------------------------------------------------- # --- private method def __set_indetflags(self): - from InDetRecExample.InDetJobProperties import InDetFlags - self.__indetflags = InDetFlags + from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags + self.__indetflags = InDetTrigFlags # ---------------------------------------------------------------------------- # --- return methods for the cut values - the main purpose of this class diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/share/InDetTrigRec_jobOptions.py b/InnerDetector/InDetExample/InDetTrigRecExample/share/InDetTrigRec_jobOptions.py index 6262b5f47feddd2542a51e8eeaf9aef2bf759cfc..75f5fdef7cdbaa2eb71b869497bbd66977e7ba52 100755 --- a/InnerDetector/InDetExample/InDetTrigRecExample/share/InDetTrigRec_jobOptions.py +++ b/InnerDetector/InDetExample/InDetTrigRecExample/share/InDetTrigRec_jobOptions.py @@ -15,7 +15,7 @@ log = logging.getLogger("InDetTrigRec_jobOptions.py") log.info("InDetTrigRec_jobOptions: InDetTrigFlags - setting to defaults") from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags InDetTrigFlags.doNewTracking.set_Value_and_Lock(True) -InDetTrigFlags.cutLevel.set_Value_and_Lock(12) +InDetTrigFlags.cutLevel=12 #InDetTrigFlags.InDet25nsec = True #autoconfig and runHLT_standalone setting for BS InDetTrigFlags.primaryVertexSetup = "IterativeFinding" InDetTrigFlags.doRefit = True # switched on for ATR-12226 (z0 uncertainties in bjets)