Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_reverseViews_build.py

@@ -28,6 +28,15 @@ test.art_type = 'build'
 test.exec_steps = [ex]
 test.check_steps = CheckSteps.default_check_steps(test)
 
+# Add a step comparing counts against a reference from test_trigP1_v1Dev_decodeBS_build
+chaindump = test.get_step("ChainDump")
+chaindump.args = '--json --yaml ref_v1Dev_decodeBS_build.new'
+refcomp = CheckSteps.ChainCompStep("CountRefComp")
+refcomp.input_file = 'ref_v1Dev_decodeBS_build.new'
+refcomp.reference_from_release = True # installed from TrigP1Test/share
+refcomp.required = True # Final exit code depends on this step
+CheckSteps.add_step_after_type(test.check_steps, CheckSteps.ChainDumpStep, refcomp)
+
 # Use RootComp reference from test_trigP1_v1Dev_decodeBS_build
 test.get_step('RootComp').ref_test_name = 'trigP1_v1Dev_decodeBS_build'
 

Trigger/TrigValidation/TrigValTools/bin/trigDumpTimers.py

@@ -22,21 +22,25 @@ def timing(hist):
   else:
     return mean_plus_err + "\tOverflow: " + str(overflow)
 
-def get_matches(pattern, exclude, myFile):
-  #Run-3 timers always contain TIME
+def get_matches(pattern, exclude, noSkip, myFile):
   names=lsroot(myFile)
   regex         = re.compile(".*" + pattern + ".*")
   if exclude:
     regex_exclude = re.compile(".*" + exclude + ".*")
   for name in names:
-    if "TIME" not in name:
-      continue
+    if not noSkip:
+      #Run-3 timers always contain TIME or TotalTime
+      if "TIME" not in name:
+        if "TotalTime" not in name:
+          continue
     if not regex.match(name):
       continue
     if exclude:
       if regex_exclude.match(name):
         continue
     hist = myFile.Get(name)
+    if not hist.IsA().InheritsFrom( "TH1" ):
+      continue
     print(name + " " + timing(hist))
 
 def main():
@@ -45,6 +49,8 @@ def main():
                     help="Pattern to match histogram to")
   parser.add_option("-x", "--exclude", dest="exclude", type = "string", default = None,
                     help="Pattern to exclude histogram from matching")
+  parser.add_option("-n", "--noSkip", dest="noSkip", action = "store_true",
+                    help="Match all histograms (not just trigger timers)")
   (options, args) = parser.parse_args()        
 
   for arg in args:
@@ -53,7 +59,7 @@ def main():
     pattern = ".*"
     if (options.pattern):
       pattern = options.pattern
-    get_matches(pattern, options.exclude, myFile)
+    get_matches(pattern, options.exclude, options.noSkip, myFile)
 
     
 if __name__ == "__main__":