Merge branch '21.2_api' into '21.2'

Update Trigger API to full run-2 GRL

See merge request atlas/athena!15853

Former-commit-id: bafd0332d4b40fdbe10f0a6f0d5ec28d1dd4269f

Trigger/TriggerCommon/TriggerMenu/python/api/TriggerAPI.py

@@ -11,10 +11,10 @@ from AthenaCommon.Logging import logging
 
 class TriggerAPI:
     log = logging.getLogger( 'TriggerMenu.api.TriggerAPI.py' )
-    centralPickleFile = PathResolver.FindCalibFile("TriggerMenu/TriggerInfo_20180925.pickle")
+    centralPickleFile = PathResolver.FindCalibFile("TriggerMenu/TriggerInfo_20181112.pickle")
     if not centralPickleFile: 
         log.warning("Couldn't find primary pickle file, try backup")
-        centralPickleFile = PathResolver.FindCalibFile("TriggerMenu/TriggerInfo_20180904.pickle")
+        centralPickleFile = PathResolver.FindCalibFile("TriggerMenu/TriggerInfo_20180925.pickle")
     if centralPickleFile: 
         log.info("Found pickle file:"+centralPickleFile)
         centralPickleFile = os.path.realpath(centralPickleFile)
@@ -201,7 +201,7 @@ def main(dumpFullPickle=False):
         TriggerAPI.dumpFullPickle()
     else:
         try: period = int(sys.argv[1])
-        except: period = TriggerPeriod.y2017
+        except: period = TriggerPeriod.y2018
         for triggerType in TriggerType:
             unprescaled = TriggerAPI.getLowestUnprescaled(period,triggerType)
             print triggerType

Trigger/TriggerCommon/TriggerMenu/python/api/TriggerDataAccess.py

@@ -333,8 +333,8 @@ def getHLTmap_fromTM(period, release):
 def getMenuPathFromRelease(release):
     if release: #already format-proofed in TriggerAPI
         return "/cvmfs/atlas.cern.ch/repo/sw/software/21.1/AthenaP1/%s/InstallArea/x86_64-slc6-gcc62-opt/python/TriggerMenu/menu"%release
-    #21.1.45 contains the final menu, no need to find the last release
-    return "/cvmfs/atlas.cern.ch/repo/sw/software/21.1/AthenaP1/21.1.45/InstallArea/x86_64-slc6-gcc62-opt/python/TriggerMenu/menu"
+    #21.1.50 contains the final menu, no need to find the last release
+    return "/cvmfs/atlas.cern.ch/repo/sw/software/21.1/AthenaP1/21.1.50/InstallArea/x86_64-slc6-gcc62-opt/python/TriggerMenu/menu"
 
 
 def getHLTlist(period, customGRL, release):

Trigger/TriggerCommon/TriggerMenu/python/api/TriggerEnums.py

@@ -53,7 +53,7 @@ class TriggerPeriod(IntEnum):
     y2018periodBE     = 1 << 14
     y2018periodFI     = 1 << 15
     y2018lowmu        = 1 << 16
-    y2018periodKL     = 1 << 17
+    y2018periodKQ     = 1 << 17
 
     runNumber         = 1 << 18 #Can't get higher than this, enters the run number domain
     future1p8e34      = 1 << 19 
@@ -62,7 +62,7 @@ class TriggerPeriod(IntEnum):
     y2017periodB      = y2017periodB1   | y2017periodB2B4 | y2017periodB5B7 | y2017periodB8
     y2017periodD      = y2017periodD1D5 | y2017periodD6
     y2017periodAll    = y2017periodB    | y2017periodC    | y2017periodD    | y2017periodEF | y2017periodGHIK #low-mu period is not considered 
-    y2018             = y2018periodBE   | y2018periodFI   | y2018periodKL  #low-mu period is not considered 
+    y2018             = y2018periodBE   | y2018periodFI   | y2018periodKQ  #low-mu period is not considered 
     y2017             = y2017periodAll
     y2016             = y2016periodA    | y2016periodBD3  | y2016periodD4plus
     future            = future1p8e34    | future2e34
@@ -94,6 +94,7 @@ class LBexceptions:
        341294: [(137, 156)], #Standby keys
        355650: [(117, 117)], #Last LB of emittance scan
        357283: [(117, 117)], #Last LB of emittance scan
+       359623: [(129, 129)], #Last LB of emittance scan
        }
 
 class TriggerRenaming:

Trigger/TriggerCommon/TriggerMenu/python/api/TriggerPeriodData.py

@@ -99,10 +99,14 @@ class TriggerPeriodData:
         'J':(355331,355468,18781),
         'K':(355529,356259,19958),
         'L':(357050,359171,19935),
+        'M':(359191,360414,20904),
+        'N':(361635,361696,9464 ),
+        'O':(361738,363400,19822),
+        'Q':(363664,364292,19618),
     }
     
     grlbase = "/cvmfs/atlas.cern.ch/repo/sw/database/GroupData/GoodRunsLists/"
-    y2018grlpath = grlbase+"data18_13TeV/20180906/data18_13TeV.periodAllYear_DetStatus-v102-pro22-03_Unknown_PHYS_StandardGRL_All_Good_25ns_Triggerno17e33prim.xml"
+    y2018grlpath = grlbase+"data18_13TeV/20181105/data18_13TeV.periodAllYear_DetStatus-v102-pro22-04_Unknown_PHYS_StandardGRL_All_Good_25ns_Triggerno17e33prim.xml"
     y2017grlpath = grlbase+"data17_13TeV/20180619/data17_13TeV.periodAllYear_DetStatus-v99-pro22-01_Unknown_PHYS_StandardGRL_All_Good_25ns_Triggerno17e33prim.xml"
     y2016grlpath = grlbase+"data16_13TeV/20180129/data16_13TeV.periodAllYear_DetStatus-v89-pro21-01_DQDefects-00-02-04_PHYS_StandardGRL_All_Good_25ns.xml"
     y2015grlpath = grlbase+"data15_13TeV/20170619/data15_13TeV.periodAllYear_DetStatus-v89-pro21-02_Unknown_PHYS_StandardGRL_All_Good_25ns.xml"
@@ -201,9 +205,13 @@ class TriggerPeriodData:
             if period & TriggerPeriod.y2018lowmu       :
                 ranges.append( self.periodMap2018['G4'] )
                 ranges.append( self.periodMap2018['J'] )
-            if period & TriggerPeriod.y2018periodKL   :
+            if period & TriggerPeriod.y2018periodKQ   :
                 ranges.append( self.periodMap2018['K'] )
                 ranges.append( self.periodMap2018['L'] )
+                ranges.append( self.periodMap2018['M'] )
+                ranges.append( self.periodMap2018['N'] )
+                ranges.append( self.periodMap2018['O'] )
+                ranges.append( self.periodMap2018['Q'] )
             for run in self.grl.keys()[:]:
                 if not any([run >= x[0] and run <= x[1] for x in ranges]): self.grl.pop(run)