diff --git a/FWCore/ServiceRegistry/interface/ActivityRegistry.h b/FWCore/ServiceRegistry/interface/ActivityRegistry.h index 3b1d2fccce7cf..9e72cced9b951 100644 --- a/FWCore/ServiceRegistry/interface/ActivityRegistry.h +++ b/FWCore/ServiceRegistry/interface/ActivityRegistry.h @@ -549,152 +549,6 @@ namespace edm { void watchPostESModule(PostESModule::slot_type const& iSlot) { postESModuleSignal_.connect_front(iSlot); } AR_WATCH_USING_METHOD_2(watchPostESModule) - // OLD DELETE THIS - typedef signalslot::ObsoleteSignal PreProcessEvent; - /// signal is emitted after the Event has been created by the InputSource but before any modules have seen the Event - PreProcessEvent preProcessEventSignal_; - void watchPreProcessEvent(PreProcessEvent::slot_type const& iSlot) { preProcessEventSignal_.connect(iSlot); } - AR_WATCH_USING_METHOD_2(watchPreProcessEvent) - - // OLD DELETE THIS - typedef signalslot::ObsoleteSignal PostProcessEvent; - /// signal is emitted after all modules have finished processing the Event - PostProcessEvent postProcessEventSignal_; - void watchPostProcessEvent(PostProcessEvent::slot_type const& iSlot) { - postProcessEventSignal_.connect_front(iSlot); - } - AR_WATCH_USING_METHOD_2(watchPostProcessEvent) - - // OLD DELETE THIS - typedef signalslot::ObsoleteSignal PreBeginRun; - /// signal is emitted after the Run has been created by the InputSource but before any modules have seen the Run - PreBeginRun preBeginRunSignal_; - void watchPreBeginRun(PreBeginRun::slot_type const& iSlot) { preBeginRunSignal_.connect(iSlot); } - AR_WATCH_USING_METHOD_2(watchPreBeginRun) - - // OLD DELETE THIS - typedef signalslot::ObsoleteSignal PostBeginRun; - /// signal is emitted after all modules have finished processing the beginRun - PostBeginRun postBeginRunSignal_; - void watchPostBeginRun(PostBeginRun::slot_type const& iSlot) { postBeginRunSignal_.connect_front(iSlot); } - AR_WATCH_USING_METHOD_2(watchPostBeginRun) - - // OLD DELETE THIS - typedef signalslot::ObsoleteSignal PreEndRun; - /// signal is emitted before the endRun is processed - PreEndRun preEndRunSignal_; - void watchPreEndRun(PreEndRun::slot_type const& iSlot) { preEndRunSignal_.connect(iSlot); } - AR_WATCH_USING_METHOD_2(watchPreEndRun) - - // OLD DELETE THIS - typedef signalslot::ObsoleteSignal PostEndRun; - /// signal is emitted after all modules have finished processing the Run - PostEndRun postEndRunSignal_; - void watchPostEndRun(PostEndRun::slot_type const& iSlot) { postEndRunSignal_.connect_front(iSlot); } - AR_WATCH_USING_METHOD_2(watchPostEndRun) - - // OLD DELETE THIS - typedef signalslot::ObsoleteSignal PreBeginLumi; - /// signal is emitted after the Lumi has been created by the InputSource but before any modules have seen the Lumi - PreBeginLumi preBeginLumiSignal_; - void watchPreBeginLumi(PreBeginLumi::slot_type const& iSlot) { preBeginLumiSignal_.connect(iSlot); } - AR_WATCH_USING_METHOD_2(watchPreBeginLumi) - - // OLD DELETE THIS - typedef signalslot::ObsoleteSignal PostBeginLumi; - /// signal is emitted after all modules have finished processing the beginLumi - PostBeginLumi postBeginLumiSignal_; - void watchPostBeginLumi(PostBeginLumi::slot_type const& iSlot) { postBeginLumiSignal_.connect_front(iSlot); } - AR_WATCH_USING_METHOD_2(watchPostBeginLumi) - - // OLD DELETE THIS - typedef signalslot::ObsoleteSignal PreEndLumi; - /// signal is emitted before the endLumi is processed - PreEndLumi preEndLumiSignal_; - void watchPreEndLumi(PreEndLumi::slot_type const& iSlot) { preEndLumiSignal_.connect(iSlot); } - AR_WATCH_USING_METHOD_2(watchPreEndLumi) - - // OLD DELETE THIS - typedef signalslot::ObsoleteSignal PostEndLumi; - /// signal is emitted after all modules have finished processing the Lumi - PostEndLumi postEndLumiSignal_; - void watchPostEndLumi(PostEndLumi::slot_type const& iSlot) { postEndLumiSignal_.connect_front(iSlot); } - AR_WATCH_USING_METHOD_2(watchPostEndLumi) - - // OLD DELETE THIS - /// signal is emitted before starting to process a Path for an event - typedef signalslot::ObsoleteSignal PreProcessPath; - PreProcessPath preProcessPathSignal_; - void watchPreProcessPath(PreProcessPath::slot_type const& iSlot) { preProcessPathSignal_.connect(iSlot); } - AR_WATCH_USING_METHOD_1(watchPreProcessPath) - - // OLD DELETE THIS - /// signal is emitted after all modules have finished for the Path for an event - typedef signalslot::ObsoleteSignal PostProcessPath; - PostProcessPath postProcessPathSignal_; - void watchPostProcessPath(PostProcessPath::slot_type const& iSlot) { postProcessPathSignal_.connect_front(iSlot); } - AR_WATCH_USING_METHOD_2(watchPostProcessPath) - - // OLD DELETE THIS - /// signal is emitted before starting to process a Path for beginRun - typedef signalslot::ObsoleteSignal PrePathBeginRun; - PrePathBeginRun prePathBeginRunSignal_; - void watchPrePathBeginRun(PrePathBeginRun::slot_type const& iSlot) { prePathBeginRunSignal_.connect(iSlot); } - AR_WATCH_USING_METHOD_1(watchPrePathBeginRun) - - // OLD DELETE THIS - /// signal is emitted after all modules have finished for the Path for beginRun - typedef signalslot::ObsoleteSignal PostPathBeginRun; - PostPathBeginRun postPathBeginRunSignal_; - void watchPostPathBeginRun(PostPathBeginRun::slot_type const& iSlot) { - postPathBeginRunSignal_.connect_front(iSlot); - } - AR_WATCH_USING_METHOD_2(watchPostPathBeginRun) - - // OLD DELETE THIS - /// signal is emitted before starting to process a Path for endRun - typedef signalslot::ObsoleteSignal PrePathEndRun; - PrePathEndRun prePathEndRunSignal_; - void watchPrePathEndRun(PrePathEndRun::slot_type const& iSlot) { prePathEndRunSignal_.connect(iSlot); } - AR_WATCH_USING_METHOD_1(watchPrePathEndRun) - - // OLD DELETE THIS - /// signal is emitted after all modules have finished for the Path for endRun - typedef signalslot::ObsoleteSignal PostPathEndRun; - PostPathEndRun postPathEndRunSignal_; - void watchPostPathEndRun(PostPathEndRun::slot_type const& iSlot) { postPathEndRunSignal_.connect_front(iSlot); } - AR_WATCH_USING_METHOD_2(watchPostPathEndRun) - - // OLD DELETE THIS - /// signal is emitted before starting to process a Path for beginLumi - typedef signalslot::ObsoleteSignal PrePathBeginLumi; - PrePathBeginLumi prePathBeginLumiSignal_; - void watchPrePathBeginLumi(PrePathBeginLumi::slot_type const& iSlot) { prePathBeginLumiSignal_.connect(iSlot); } - AR_WATCH_USING_METHOD_1(watchPrePathBeginLumi) - - // OLD DELETE THIS - /// signal is emitted after all modules have finished for the Path for beginLumi - typedef signalslot::ObsoleteSignal PostPathBeginLumi; - PostPathBeginLumi postPathBeginLumiSignal_; - void watchPostPathBeginLumi(PostPathBeginLumi::slot_type const& iSlot) { - postPathBeginLumiSignal_.connect_front(iSlot); - } - AR_WATCH_USING_METHOD_2(watchPostPathBeginLumi) - - // OLD DELETE THIS - /// signal is emitted before starting to process a Path for endRun - typedef signalslot::ObsoleteSignal PrePathEndLumi; - PrePathEndLumi prePathEndLumiSignal_; - void watchPrePathEndLumi(PrePathEndLumi::slot_type const& iSlot) { prePathEndLumiSignal_.connect(iSlot); } - AR_WATCH_USING_METHOD_1(watchPrePathEndLumi) - - // OLD DELETE THIS - /// signal is emitted after all modules have finished for the Path for endRun - typedef signalslot::ObsoleteSignal PostPathEndLumi; - PostPathEndLumi postPathEndLumiSignal_; - void watchPostPathEndLumi(PostPathEndLumi::slot_type const& iSlot) { postPathEndLumiSignal_.connect_front(iSlot); } - AR_WATCH_USING_METHOD_2(watchPostPathEndLumi) - /* Note M: Concerning use of address of module descriptor during functions called before/after module or source construction: @@ -1042,86 +896,6 @@ namespace edm { } AR_WATCH_USING_METHOD_2(watchPostModuleWriteLumi) - // OLD DELETE THIS - /// signal is emitted before the module starts processing the Event - typedef signalslot::ObsoleteSignal PreModule; - PreModule preModuleSignal_; - void watchPreModule(PreModule::slot_type const& iSlot) { preModuleSignal_.connect(iSlot); } - AR_WATCH_USING_METHOD_1(watchPreModule) - - // OLD DELETE THIS - /// signal is emitted after the module finished processing the Event - typedef signalslot::ObsoleteSignal PostModule; - PostModule postModuleSignal_; - void watchPostModule(PostModule::slot_type const& iSlot) { postModuleSignal_.connect_front(iSlot); } - AR_WATCH_USING_METHOD_1(watchPostModule) - - // OLD DELETE THIS - /// signal is emitted before the module starts processing beginRun - typedef signalslot::ObsoleteSignal PreModuleBeginRun; - PreModuleBeginRun preModuleBeginRunSignal_; - void watchPreModuleBeginRun(PreModuleBeginRun::slot_type const& iSlot) { preModuleBeginRunSignal_.connect(iSlot); } - AR_WATCH_USING_METHOD_1(watchPreModuleBeginRun) - - // OLD DELETE THIS - /// signal is emitted after the module finished processing beginRun - typedef signalslot::ObsoleteSignal PostModuleBeginRun; - PostModuleBeginRun postModuleBeginRunSignal_; - void watchPostModuleBeginRun(PostModuleBeginRun::slot_type const& iSlot) { - postModuleBeginRunSignal_.connect_front(iSlot); - } - AR_WATCH_USING_METHOD_1(watchPostModuleBeginRun) - - // OLD DELETE THIS - /// signal is emitted before the module starts processing endRun - typedef signalslot::ObsoleteSignal PreModuleEndRun; - PreModuleEndRun preModuleEndRunSignal_; - void watchPreModuleEndRun(PreModuleEndRun::slot_type const& iSlot) { preModuleEndRunSignal_.connect(iSlot); } - AR_WATCH_USING_METHOD_1(watchPreModuleEndRun) - - // OLD DELETE THIS - /// signal is emitted after the module finished processing endRun - typedef signalslot::ObsoleteSignal PostModuleEndRun; - PostModuleEndRun postModuleEndRunSignal_; - void watchPostModuleEndRun(PostModuleEndRun::slot_type const& iSlot) { - postModuleEndRunSignal_.connect_front(iSlot); - } - AR_WATCH_USING_METHOD_1(watchPostModuleEndRun) - - // OLD DELETE THIS - /// signal is emitted before the module starts processing beginLumi - typedef signalslot::ObsoleteSignal PreModuleBeginLumi; - PreModuleBeginLumi preModuleBeginLumiSignal_; - void watchPreModuleBeginLumi(PreModuleBeginLumi::slot_type const& iSlot) { - preModuleBeginLumiSignal_.connect(iSlot); - } - AR_WATCH_USING_METHOD_1(watchPreModuleBeginLumi) - - // OLD DELETE THIS - /// signal is emitted after the module finished processing beginLumi - typedef signalslot::ObsoleteSignal PostModuleBeginLumi; - PostModuleBeginLumi postModuleBeginLumiSignal_; - void watchPostModuleBeginLumi(PostModuleBeginLumi::slot_type const& iSlot) { - postModuleBeginLumiSignal_.connect_front(iSlot); - } - AR_WATCH_USING_METHOD_1(watchPostModuleBeginLumi) - - // OLD DELETE THIS - /// signal is emitted before the module starts processing endLumi - typedef signalslot::ObsoleteSignal PreModuleEndLumi; - PreModuleEndLumi preModuleEndLumiSignal_; - void watchPreModuleEndLumi(PreModuleEndLumi::slot_type const& iSlot) { preModuleEndLumiSignal_.connect(iSlot); } - AR_WATCH_USING_METHOD_1(watchPreModuleEndLumi) - - // OLD DELETE THIS - /// signal is emitted after the module finished processing endLumi - typedef signalslot::ObsoleteSignal PostModuleEndLumi; - PostModuleEndLumi postModuleEndLumiSignal_; - void watchPostModuleEndLumi(PostModuleEndLumi::slot_type const& iSlot) { - postModuleEndLumiSignal_.connect_front(iSlot); - } - AR_WATCH_USING_METHOD_1(watchPostModuleEndLumi) - /// signal is emitted before the source is constructed typedef signalslot::Signal PreSourceConstruction; PreSourceConstruction preSourceConstructionSignal_;