Merge pull request #18411 from fwyzard/FastTimerService_91x

update FastTimerService for CMSSW 9.1.x

Calibration/IsolatedParticles/test/HLT_IsoTrig_Data_New1.py

@@ -171,37 +171,14 @@
 # instrument the menu with the FastTimerService
 process.load( "HLTrigger.Timer.FastTimerService_cfi" )
 
-# this is currently ignored in 7.x, and alway uses the real tim clock
-process.FastTimerService.useRealTimeClock         = True
-
-# enable specific features
-process.FastTimerService.enableTimingPaths        = True
-process.FastTimerService.enableTimingModules      = True
-process.FastTimerService.enableTimingExclusive    = True
-
 # print a text summary at the end of the job
-process.FastTimerService.enableTimingSummary      = True
-
-# skip the first path (useful for HLT timing studies to disregard the time spent loading event and conditions data)
-process.FastTimerService.skipFirstPath            = False
+process.FastTimerService.printJobSummary          = True
 
 # enable per-event DQM plots
 process.FastTimerService.enableDQM                = True
 
-# enable per-path DQM plots
-process.FastTimerService.enableDQMbyPathActive    = True
-process.FastTimerService.enableDQMbyPathTotal     = True
-process.FastTimerService.enableDQMbyPathOverhead  = True
-process.FastTimerService.enableDQMbyPathDetails   = True
-process.FastTimerService.enableDQMbyPathCounters  = True
-process.FastTimerService.enableDQMbyPathExclusive = True
-
 # enable per-module DQM plots
 process.FastTimerService.enableDQMbyModule        = True
-process.FastTimerService.enableDQMbyModuleType    = True
-
-# enable per-event DQM sumary plots
-process.FastTimerService.enableDQMSummary         = True
 
 # enable per-event DQM plots by lumisection
 process.FastTimerService.enableDQMbyLumiSection   = True

Calibration/IsolatedParticles/test/HLT_IsoTrig_MC_New0.py

@@ -133,37 +133,14 @@
 process.load( "HLTrigger.Timer.FastTimerService_cfi" )
 process.load ("HLTrigger.Timer.fastTimerServiceClient_cfi" )
 
-# this is currently ignored in 7.x, and alway uses the real tim clock
-process.FastTimerService.useRealTimeClock         = False
-
-# enable specific features
-process.FastTimerService.enableTimingPaths        = True
-process.FastTimerService.enableTimingModules      = True
-process.FastTimerService.enableTimingExclusive    = True
-
 # print a text summary at the end of the job
-process.FastTimerService.enableTimingSummary      = True
-
-# skip the first path (useful for HLT timing studies to disregard the time spent loading event and conditions data)
-process.FastTimerService.skipFirstPath            = False
+process.FastTimerService.printJobSummary          = True
 
 # enable per-event DQM plots
 process.FastTimerService.enableDQM                = True
 
-# enable per-path DQM plots
-process.FastTimerService.enableDQMbyPathActive    = True
-process.FastTimerService.enableDQMbyPathTotal     = True
-process.FastTimerService.enableDQMbyPathOverhead  = True
-process.FastTimerService.enableDQMbyPathDetails   = True
-process.FastTimerService.enableDQMbyPathCounters  = True
-process.FastTimerService.enableDQMbyPathExclusive = True
-
 # enable per-module DQM plots
 process.FastTimerService.enableDQMbyModule        = True
-#process.FastTimerService.enableDQMbyModuleType    = True
-
-# enable per-event DQM sumary plots
-process.FastTimerService.enableDQMSummary         = True
 
 # enable per-event DQM plots by lumisection
 process.FastTimerService.enableDQMbyLumiSection   = True

Calibration/IsolatedParticles/test/HLT_IsoTrig_MC_New1.py

@@ -144,37 +144,14 @@
 process.load( "HLTrigger.Timer.FastTimerService_cfi" )
 process.load ("HLTrigger.Timer.fastTimerServiceClient_cfi" )
 
-# this is currently ignored in 7.x, and alway uses the real tim clock
-process.FastTimerService.useRealTimeClock         = False
-
-# enable specific features
-process.FastTimerService.enableTimingPaths        = True
-process.FastTimerService.enableTimingModules      = True
-process.FastTimerService.enableTimingExclusive    = True
-
 # print a text summary at the end of the job
-process.FastTimerService.enableTimingSummary      = True
-
-# skip the first path (useful for HLT timing studies to disregard the time spent loading event and conditions data)
-process.FastTimerService.skipFirstPath            = False
+process.FastTimerService.printJobSummary          = True
 
 # enable per-event DQM plots
 process.FastTimerService.enableDQM                = True
 
-# enable per-path DQM plots
-process.FastTimerService.enableDQMbyPathActive    = True
-process.FastTimerService.enableDQMbyPathTotal     = True
-process.FastTimerService.enableDQMbyPathOverhead  = True
-process.FastTimerService.enableDQMbyPathDetails   = True
-process.FastTimerService.enableDQMbyPathCounters  = True
-process.FastTimerService.enableDQMbyPathExclusive = True
-
 # enable per-module DQM plots
 process.FastTimerService.enableDQMbyModule        = True
-#process.FastTimerService.enableDQMbyModuleType    = True
-
-# enable per-event DQM sumary plots
-process.FastTimerService.enableDQMSummary         = True
 
 # enable per-event DQM plots by lumisection
 process.FastTimerService.enableDQMbyLumiSection   = True

Calibration/IsolatedParticles/test/HLT_IsoTrig_MC_New2.py

@@ -247,37 +247,14 @@
 process.load( "HLTrigger.Timer.FastTimerService_cfi" )
 process.load ("HLTrigger.Timer.fastTimerServiceClient_cfi" )
 
-# this is currently ignored in 7.x, and alway uses the real tim clock
-process.FastTimerService.useRealTimeClock         = False
-
-# enable specific features
-process.FastTimerService.enableTimingPaths        = True
-process.FastTimerService.enableTimingModules      = True
-process.FastTimerService.enableTimingExclusive    = True
-
 # print a text summary at the end of the job
-process.FastTimerService.enableTimingSummary      = True
-
-# skip the first path (useful for HLT timing studies to disregard the time spent loading event and conditions data)
-process.FastTimerService.skipFirstPath            = False
+process.FastTimerService.printJobSummary          = True
 
 # enable per-event DQM plots
 process.FastTimerService.enableDQM                = True
 
-# enable per-path DQM plots
-process.FastTimerService.enableDQMbyPathActive    = True
-process.FastTimerService.enableDQMbyPathTotal     = True
-process.FastTimerService.enableDQMbyPathOverhead  = True
-process.FastTimerService.enableDQMbyPathDetails   = True
-process.FastTimerService.enableDQMbyPathCounters  = True
-process.FastTimerService.enableDQMbyPathExclusive = True
-
 # enable per-module DQM plots
 process.FastTimerService.enableDQMbyModule        = True
-#process.FastTimerService.enableDQMbyModuleType    = True
-
-# enable per-event DQM sumary plots
-process.FastTimerService.enableDQMSummary         = True
 
 # enable per-event DQM plots by lumisection
 process.FastTimerService.enableDQMbyLumiSection   = True

DQMOffline/Configuration/python/DQMOffline_cff.py

@@ -3,7 +3,6 @@
 from DQMServices.Components.DQMMessageLogger_cfi import *
 from DQMServices.Components.DQMDcsInfo_cfi import *
 from DQMServices.Components.DQMFastTimerService_cff import *
-from DQMServices.Components.DQMFastTimerServiceLuminosity_cfi import *
 
 from DQMOffline.Ecal.ecal_dqm_source_offline_cff import *
 from DQM.HcalTasks.OfflineSourceSequence_pp import *
@@ -75,7 +74,7 @@
 DQMOffline = cms.Sequence( DQMOfflinePreDPG *
                            DQMOfflinePrePOG *
                            HLTMonitoring *
-                           dqmFastTimerServiceLuminosity *
+                           # dqmFastTimerServiceLuminosity *
                            DQMMessageLogger )
 
 _ctpps_2016_DQMOffline = DQMOffline.copy()

DQMServices/Components/python/DQMFastTimerService_cff.py

@@ -3,37 +3,16 @@
 # instrument the process with the FastTimerService
 from HLTrigger.Timer.FastTimerService_cfi import FastTimerService
 
-# this is currently ignored in 7.x, and always uses the real time clock
-FastTimerService.useRealTimeClock           = False
-
-# enable specific features
-FastTimerService.enableTimingPaths          = True
-FastTimerService.enableTimingModules        = False
-FastTimerService.enableTimingExclusive      = False
-
 # print a text summary at the end of the job
-FastTimerService.enableTimingSummary        = True
-
-# skip the first path (useful for HLT timing studies to disregard the time spent loading event and conditions data)
-FastTimerService.skipFirstPath              = False
+FastTimerService.printEventSummary          = False
+FastTimerService.printRunSummary            = False
+FastTimerService.printJobSummary            = True
 
 # enable per-event DQM plots
 FastTimerService.enableDQM                  = True
 
-# enable per-path DQM plots
-FastTimerService.enableDQMbyPathActive      = True
-FastTimerService.enableDQMbyPathTotal       = True
-FastTimerService.enableDQMbyPathOverhead    = False
-FastTimerService.enableDQMbyPathDetails     = True
-FastTimerService.enableDQMbyPathCounters    = True
-FastTimerService.enableDQMbyPathExclusive   = False
-
-# enable per-module DQM plots
+# disable per-module DQM plots
 FastTimerService.enableDQMbyModule          = False
-FastTimerService.enableDQMbyModuleType      = False
-
-# enable per-event DQM sumary plots
-FastTimerService.enableDQMSummary           = True
 
 # enable per-event DQM plots by lumisection
 FastTimerService.enableDQMbyLumiSection     = True

HLTrigger/Configuration/python/Tools/confdb.py

@@ -661,46 +661,31 @@ def instrumentTiming(self):
 # instrument the menu with the modules and EndPath needed for timing studies
 """
 
+      self.data += '\n# configure the FastTimerService\n'
       if not 'FastTimerService' in self.data:
-        self.data += '\n# configure the FastTimerService\n'
         self.loadCff('HLTrigger.Timer.FastTimerService_cfi')
-      else:
-        self.data += '\n# configure the FastTimerService\n'
-
-      self.data += """# this is currently ignored in CMSSW 7.x, always using the real time clock
-%(process)s.FastTimerService.useRealTimeClock          = True
-# enable specific features
-%(process)s.FastTimerService.enableTimingPaths         = True
-%(process)s.FastTimerService.enableTimingModules       = True
-%(process)s.FastTimerService.enableTimingExclusive     = True
-# print a text summary at the end of the job
-%(process)s.FastTimerService.enableTimingSummary       = True
-# skip the first path (disregard the time spent loading event and conditions data)
-%(process)s.FastTimerService.skipFirstPath             = True
+
+      self.data += """# print a text summary at the end of the job
+%(process)s.FastTimerService.printJobSummary           = True
+
 # enable DQM plots
 %(process)s.FastTimerService.enableDQM                 = True
-# enable most per-path DQM plots
-%(process)s.FastTimerService.enableDQMbyPathActive     = True
-%(process)s.FastTimerService.enableDQMbyPathTotal      = True
-%(process)s.FastTimerService.enableDQMbyPathOverhead   = False
-%(process)s.FastTimerService.enableDQMbyPathDetails    = True
-%(process)s.FastTimerService.enableDQMbyPathCounters   = True
-%(process)s.FastTimerService.enableDQMbyPathExclusive  = True
+
 # disable per-module DQM plots
 %(process)s.FastTimerService.enableDQMbyModule         = False
-%(process)s.FastTimerService.enableDQMbyModuleType     = False
-# enable per-event DQM sumary plots
-%(process)s.FastTimerService.enableDQMSummary          = True
+
 # enable per-event DQM plots by lumisection
 %(process)s.FastTimerService.enableDQMbyLumiSection    = True
 %(process)s.FastTimerService.dqmLumiSectionsRange      = 2500
+
 # set the time resolution of the DQM plots
 %(process)s.FastTimerService.dqmTimeRange              = 1000.
 %(process)s.FastTimerService.dqmTimeResolution         =    5.
 %(process)s.FastTimerService.dqmPathTimeRange          =  100.
 %(process)s.FastTimerService.dqmPathTimeResolution     =    0.5
 %(process)s.FastTimerService.dqmModuleTimeRange        =   40.
 %(process)s.FastTimerService.dqmModuleTimeResolution   =    0.2
+
 # set the base DQM folder for the plots
 %(process)s.FastTimerService.dqmPath                   = 'HLT/TimerService'
 %(process)s.FastTimerService.enableDQMbyProcesses      = True

HLTrigger/Timer/BuildFile.xml

@@ -6,7 +6,7 @@
 <use name="FWCore/Utilities"/>
 <use name="DQMServices/Core"/>
 <use name="sigcpp"/>
-<use name="sockets"/>       <!-- needed for -lrt -->
+<use name="boost_chrono"/>
 <export>
   <lib   name="1"/>
 </export>

HLTrigger/Timer/interface/EDMModuleType.h

@@ -0,0 +1,37 @@
+#ifndef HLTrigger_Timer_interface_EDMModuleType_h
+#define HLTrigger_Timer_interface_EDMModuleType_h
+
+#include "DataFormats/Provenance/interface/ModuleDescription.h"
+
+namespace edm {
+
+enum class EDMModuleType {
+  kUnknown,
+  kSource,
+  kESSource,
+  kESProducer,
+  kEDAnalyzer,
+  kEDProducer,
+  kEDFilter,
+  kOutputModule
+};
+
+constexpr
+const char * module_type_desc[] {
+  "Unknown",
+  "Source",
+  "ESSource",
+  "ESProducer",
+  "EDAnalyzer",
+  "EDProducer",
+  "EDFilter",
+  "OutputModule"
+};
+
+EDMModuleType edmModuleTypeEnum(edm::ModuleDescription const & module);
+
+const char * edmModuleType(edm::ModuleDescription const & module);
+
+} // namespace edm
+
+#endif // not defined HLTrigger_Timer_interface_EDMModuleType_h