Skip to content

Commit

Permalink
Merge pull request #35591 from Dr15Jones/removeObsoleteSignalsActivit…
Browse files Browse the repository at this point in the history 
…yRegistry

Remove obsolete signals from ActivityRegistry
  • Loading branch information
@cmsbuild
cmsbuild authored Oct 10, 2021
2 parents 1c40f80 + 4464dfd commit 17ce642
Showing 1 changed file with 0 additions and 226 deletions.
226 changes: 0 additions & 226 deletions FWCore/ServiceRegistry/interface/ActivityRegistry.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<void(EventID const&, Timestamp const&)> 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<void(Event const&, EventSetup const&)> 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<void(RunID const&, Timestamp const&)> 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<void(Run const&, EventSetup const&)> 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<void(RunID const&, Timestamp const&)> 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<void(Run const&, EventSetup const&)> 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<void(LuminosityBlockID const&, Timestamp const&)> 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<void(LuminosityBlock const&, EventSetup const&)> 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<void(LuminosityBlockID const&, Timestamp const&)> 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<void(LuminosityBlock const&, EventSetup const&)> 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<void(std::string const&)> 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<void(std::string const&, HLTPathStatus const&)> 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<void(std::string const&)> 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<void(std::string const&, HLTPathStatus const&)> 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<void(std::string const&)> 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<void(std::string const&, HLTPathStatus const&)> 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<void(std::string const&)> 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<void(std::string const&, HLTPathStatus const&)> 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<void(std::string const&)> 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<void(std::string const&, HLTPathStatus const&)> 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:
Expand Down Expand Up @@ -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<void(ModuleDescription const&)> 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<void(ModuleDescription const&)> 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<void(ModuleDescription const&)> 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<void(ModuleDescription const&)> 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<void(ModuleDescription const&)> 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<void(ModuleDescription const&)> 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<void(ModuleDescription const&)> 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<void(ModuleDescription const&)> 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<void(ModuleDescription const&)> 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<void(ModuleDescription const&)> 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<void(ModuleDescription const&)> PreSourceConstruction;
PreSourceConstruction preSourceConstructionSignal_;
Expand Down

0 comments on commit 17ce642

Please sign in to comment.