diff --git a/IgTools/IgProf/plugins/IgProfService.cc b/IgTools/IgProf/plugins/IgProfService.cc index ee4a15494f2a1..41053c33e8fe9 100644 --- a/IgTools/IgProf/plugins/IgProfService.cc +++ b/IgTools/IgProf/plugins/IgProfService.cc @@ -66,7 +66,13 @@ IgProfService::IgProfService(ParameterSet const &ps, ActivityRegistry &iRegistry atPostModuleEvent_ = ps.getUntrackedParameter("reportToFileAtPostModuleEvent", atPostModuleEvent_); atPostEndLumi_ = ps.getUntrackedParameter("reportToFileAtPostEndLumi", atPostEndLumi_); + atPreEndRun_ = ps.getUntrackedParameter("reportToFileAtPreEndRun", atPreEndRun_); atPostEndRun_ = ps.getUntrackedParameter("reportToFileAtPostEndRun", atPostEndRun_); + atPreEndProcessBlock_ = + ps.getUntrackedParameter("reportToFileAtPreEndProcessBlock", atPreEndProcessBlock_); + atPostEndProcessBlock_ = + ps.getUntrackedParameter("reportToFileAtPostEndProcessBlock", atPostEndProcessBlock_); + atPreEndJob_ = ps.getUntrackedParameter("reportToFileAtPreEndJob", atPreEndJob_); atPostEndJob_ = ps.getUntrackedParameter("reportToFileAtPostEndJob", atPostEndJob_); atPostOpenFile_ = ps.getUntrackedParameter("reportToFileAtPostOpenFile", atPostOpenFile_); @@ -86,7 +92,11 @@ IgProfService::IgProfService(ParameterSet const &ps, ActivityRegistry &iRegistry } iRegistry.watchPostGlobalEndLumi(this, &IgProfService::postEndLumi); + iRegistry.watchPreGlobalEndRun(this, &IgProfService::preEndRun); iRegistry.watchPostGlobalEndRun(this, &IgProfService::postEndRun); + iRegistry.watchPreEndProcessBlock(this, &IgProfService::preEndProcessBlock); + iRegistry.watchPostEndProcessBlock(this, &IgProfService::postEndProcessBlock); + iRegistry.watchPreEndJob(this, &IgProfService::preEndJob); iRegistry.watchPostEndJob(this, &IgProfService::postEndJob); iRegistry.watchPostOpenFile(this, &IgProfService::postOpenFile); @@ -147,11 +157,22 @@ void IgProfService::postEndLumi(GlobalContext const &gc) { makeDump(atPostEndLumi_); } +void IgProfService::preEndRun(GlobalContext const &gc) { + nrun_ = gc.luminosityBlockID().run(); + makeDump(atPreEndRun_); +} + void IgProfService::postEndRun(GlobalContext const &gc) { nrun_ = gc.luminosityBlockID().run(); makeDump(atPostEndRun_); } +void IgProfService::preEndProcessBlock(GlobalContext const &gc) { makeDump(atPreEndProcessBlock_); } + +void IgProfService::postEndProcessBlock(GlobalContext const &gc) { makeDump(atPostEndProcessBlock_); } + +void IgProfService::preEndJob() { makeDump(atPreEndJob_); } + void IgProfService::postEndJob() { makeDump(atPostEndJob_); } void IgProfService::postOpenFile(std::string const &) { diff --git a/IgTools/IgProf/plugins/IgProfService.h b/IgTools/IgProf/plugins/IgProfService.h index 38f3a210b69f4..aab5c160b0d5e 100644 --- a/IgTools/IgProf/plugins/IgProfService.h +++ b/IgTools/IgProf/plugins/IgProfService.h @@ -35,8 +35,13 @@ namespace edm { void postEndLumi(GlobalContext const &gc); + void preEndRun(GlobalContext const &gc); void postEndRun(GlobalContext const &gc); + void preEndProcessBlock(GlobalContext const &gc); + void postEndProcessBlock(GlobalContext const &gc); + + void preEndJob(); void postEndJob(); void postOpenFile(std::string const &); @@ -64,7 +69,11 @@ namespace edm { std::string atPostModuleEvent_; std::string atPostEndLumi_; + std::string atPreEndRun_; std::string atPostEndRun_; + std::string atPreEndProcessBlock_; + std::string atPostEndProcessBlock_; + std::string atPreEndJob_; std::string atPostEndJob_; std::string atPostOpenFile_;