Remove references to cms.FinalPath from HLT tools

Author: makortel

HLTrigger/Configuration/scripts/hltDumpStream

@@ -89,8 +89,8 @@ def getStreamsInfoFromProcess(process, prescaleValues, numberOfPrescaleColumns):
 
   each stream dict contains the following entries (key: value)
    - name: name of the stream
-   - path: cms.EndPath/FinalPath associated to the stream
-   - prescales: list of prescale values (1 per PS column) applied to the EndPath/FinalPath associated to the stream
+   - path: cms.EndPath associated to the stream
+   - prescales: list of prescale values (1 per PS column) applied to the EndPath associated to the stream
    - smartPrescales: dictionary (path:ps) of smart-prescales applied at stream level
    - datasets: list of dataset dictionaries (see below)
 
@@ -123,9 +123,9 @@ def getStreamsInfoFromProcess(process, prescaleValues, numberOfPrescaleColumns):
       raise RuntimeError('ERROR -- the process holds multiple partial schedules: '+str(process._Process__partialschedules))
 
   # find list of streams:
-  #  - stream XYZ exists if the configuration contains a EndPath/FinalPath that contains an OutputModule named hltOutputXYZ
-  #  - if more than one such EndPath/FinalPath exists, it is an error (unsupported configuration)
-  #  - if the configuration contains a cms.Schedule, the EndPath/FinalPath is required to be part of the cms.Schedule
+  #  - stream XYZ exists if the configuration contains a EndPath that contains an OutputModule named hltOutputXYZ
+  #  - if more than one such EndPath exists, it is an error (unsupported configuration)
+  #  - if the configuration contains a cms.Schedule, the EndPath is required to be part of the cms.Schedule
   #  - reliance on the PSet "streams" is minimised:
   #    - the latter PSet, if present, should be a superset of the streams found in the configuration
   #      (this is the case for HLT configs containing only a subset of the triggers of a menu, e.g. "hltGetConfiguration --paths [..]")
@@ -141,27 +141,26 @@ def getStreamsInfoFromProcess(process, prescaleValues, numberOfPrescaleColumns):
       continue
     streamName = outModName[len('hltOutput'):]
 
-    # find EndPath/FinalPath containing stream OutputModule
+    # find EndPath containing stream OutputModule
     streamPath = None
     outputModule = process.outputModules_()[outModName]
-    for efPaths in [process.endpaths_().values(), process.finalpaths_().values()]:
-      for efPath in efPaths:
-        if procSchedule != None:
-          # skip EndPath/FinalPath if not included in the schedule
-          # (schedule.contains does not seem to be enough, so the index of the EndPath/FinalPath in the schedule is searched;
-          #  if the EndPath/FinalPath is not in the schedule, this search leads to a runtime-error)
-          try: procSchedule.index(efPath)
-          except: continue
-        if efPath.contains(outputModule):
-          # if streamPath is already set, throw a runtime error:
-          # no more than one EndPath/FinalPath can hold a given OutputModule in valid HLT configurations
-          if streamPath != None:
-            errMsg = 'ERROR -- output module "'+outModName+'" is associated to'
-            errMsg += ' more than one EndPath/FinalPath: '+str([streamPath.label(), efPath.label()])
-            raise RuntimeError(errMsg)
-          streamPath = efPath
-
-    # OutputModule not included in any active EndPath/FinalPath
+    for efPath in process.endpaths_().values():
+      if procSchedule != None:
+        # skip EndPath if not included in the schedule
+        # (schedule.contains does not seem to be enough, so the index of the EndPath in the schedule is searched;
+        #  if the EndPath is not in the schedule, this search leads to a runtime-error)
+        try: procSchedule.index(efPath)
+        except: continue
+      if efPath.contains(outputModule):
+        # if streamPath is already set, throw a runtime error:
+        # no more than one EndPath can hold a given OutputModule in valid HLT configurations
+        if streamPath != None:
+          errMsg = 'ERROR -- output module "'+outModName+'" is associated to'
+          errMsg += ' more than one EndPath: '+str([streamPath.label(), efPath.label()])
+          raise RuntimeError(errMsg)
+        streamPath = efPath
+
+    # OutputModule not included in any active EndPath
     if streamPath == None:
       continue
 
@@ -290,9 +289,8 @@ def getStreamsInfoFromProcess(process, prescaleValues, numberOfPrescaleColumns):
 
     # fill smart-PS applied at stream level
     # (in Run-2 HLT menus, smart-PSs are applied to standard Paths in the stream EndPath)
-    # (in Run-3 HLT menus, prescales at stream level have not been used yet, plus they cannot be applied inside FinalPaths)
     streamSmartPrescales = {} # dictionary of smart-PSs applied at stream level
-    smartPSModuleName = None  # smart-PS module in the stream EndPath/FinalPath
+    smartPSModuleName = None  # smart-PS module in the stream EndPath
 
     # build list of Paths that can have a smart-PS at stream level:
     # this includes the Paths of all datasets in the stream, and the DatasetPaths (if present)
@@ -307,7 +305,7 @@ def getStreamsInfoFromProcess(process, prescaleValues, numberOfPrescaleColumns):
     for foo in pathNamesForStreamSmartPS:
       streamSmartPrescales[foo] = 1
 
-    # loop on modules preceding the OutputModule in the EndPath/FinalPath
+    # loop on modules preceding the OutputModule in the EndPath
     # to extract smart prescales at stream level, requiring no more than one smart-PS module
     streamPathExpanded = streamPath.expandAndClone()
     for modIdx in range(streamPathExpanded.index(outputModule)):

HLTrigger/Configuration/scripts/hltListPaths

@@ -37,7 +37,7 @@ def getPathList(args):
   if not isinstance(process, cms.Process):
     raise Exception(f'query did not return a valid HLT menu:\n query="{cmdline}"')
 
-  usePaths, useEndPaths, useFinalPaths = False, False, False
+  usePaths, useEndPaths = False, False
 
   # Paths only
   if args.selection == 'paths':
@@ -47,17 +47,13 @@ def getPathList(args):
   elif args.selection == 'endpaths':
     useEndPaths = True
 
-  # FinalPaths only
-  elif args.selection == 'finalpaths':
-    useFinalPaths = True
-
-  # Paths, EndPaths, and FinalPaths ('all')
+  # Paths and EndPaths ('all')
   elif args.selection == 'all':
-    usePaths, useEndPaths, useFinalPaths = True, True, True
+    usePaths, useEndPaths = True, True
 
   # invalid value
   else:
-    raise RuntimeError(f'ERROR: invalid value for option "--selection" (must be "paths", "endpaths", "finalpaths", or "all"): {args.selection}')
+    raise RuntimeError(f'ERROR: invalid value for option "--selection" (must be "paths", "endpaths", or "all"): {args.selection}')
 
   path_keep_rules = []
   for path_keep_rule in args.path_keep_rules.split(','):
@@ -72,7 +68,6 @@ def getPathList(args):
   for pathDict in [
     process.paths_() if usePaths else None,
     process.endpaths_() if useEndPaths else None,
-    process.finalpaths_() if useFinalPaths else None,
   ]:
     if pathDict == None:
       continue
@@ -145,7 +140,7 @@ def hltMenu(name):
   return name if os.path.isfile(name) else options.ConnectionHLTMenu(name)
 
 parser = argparse.ArgumentParser(
-  description       = 'List all the Paths, EndPaths and FinalPaths of an HLT configuration.',
+  description       = 'List all the Paths and EndPaths of an HLT configuration.',
   argument_default  = argparse.SUPPRESS,
   formatter_class   = formatter,
   add_help          = False )
@@ -187,17 +182,12 @@ group.add_argument('-e', '--only-endpaths',
                     action  = 'store_const',
                     const   = 'endpaths',
                     help    = 'List only EndPaths' )
-group.add_argument('-f', '--only-finalpaths',
-                    dest    = 'selection',
-                    action  = 'store_const',
-                    const   = 'finalpaths',
-                    help    = 'List only FinalPaths' )
 group.add_argument('-a', '--all', 
                     dest    = 'selection',
                     action  = 'store_const',
                     const   = 'all',
                     default = 'all',
-                    help    = 'List Paths, EndPaths and FinalPaths (default)' )
+                    help    = 'List Paths and EndPaths (default)' )
 
 parser.add_argument('--no-dependent-paths',
                     dest    = 'no_dependent_paths',