Removed use of edm::EDFilter

This finished the migration away from the deprecated class.

FWCore/Framework/interface/EDFilter.h

@@ -1,126 +1,7 @@
 #ifndef FWCore_Framework_EDFilter_h
 #define FWCore_Framework_EDFilter_h
 
-/*----------------------------------------------------------------------
-  
-EDFilter: The base class of all "modules" used to control the flow of
-processing in a processing path.
-Filters can also insert products into the event.
-These products should be informational products about the filter decision.
-
-
-----------------------------------------------------------------------*/
-
-#include "FWCore/Framework/interface/ProducerBase.h"
-#include "FWCore/Framework/interface/EDConsumerBase.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/SharedResourcesAcquirer.h"
-
-#include "FWCore/Concurrency/interface/WaitingTaskHolder.h"
-#include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
-#include "DataFormats/Provenance/interface/ModuleDescription.h"
-#include "FWCore/Utilities/interface/deprecated_macro.h"
-
-#include <string>
-#include <vector>
-#include <array>
-
-namespace edm {
-  namespace maker {
-    template <typename T>
-    class ModuleHolderT;
-  }
-
-  class ModuleCallingContext;
-  class PreallocationConfiguration;
-  class ActivityRegistry;
-  class ThinnedAssociationsHelper;
-
-  /**
-   * The legacy EDFilter class is deprecated. We annotate the
-   * constructor only with the CMS_DEPRECATED, because with gcc it
-   * turns out to flag deriving classes more reliably than annotating
-   * the entire class.
-   */
-  class EDFilter : public ProducerBase, public EDConsumerBase {
-  public:
-    template <typename T>
-    friend class maker::ModuleHolderT;
-    template <typename T>
-    friend class WorkerT;
-    typedef EDFilter ModuleType;
-
-    CMS_DEPRECATED EDFilter();
-    ~EDFilter() override;
-
-    static void fillDescriptions(ConfigurationDescriptions& descriptions);
-    static void prevalidate(ConfigurationDescriptions&);
-
-    static const std::string& baseType();
-
-    // Warning: the returned moduleDescription will be invalid during construction
-    ModuleDescription const& moduleDescription() const { return moduleDescription_; }
-
-    static bool wantsProcessBlocks() { return false; }
-    static bool wantsInputProcessBlocks() { return false; }
-    static bool wantsGlobalRuns() { return true; }
-    static bool wantsGlobalLuminosityBlocks() { return true; }
-    static bool wantsStreamRuns() { return false; }
-    static bool wantsStreamLuminosityBlocks() { return false; };
-
-    SerialTaskQueue* globalRunsQueue() { return &runQueue_; }
-    SerialTaskQueue* globalLuminosityBlocksQueue() { return &luminosityBlockQueue_; }
-
-  private:
-    bool doEvent(EventTransitionInfo const&, ActivityRegistry*, ModuleCallingContext const*);
-    //Needed by WorkerT but not supported
-    void preActionBeforeRunEventAsync(WaitingTaskHolder, ModuleCallingContext const&, Principal const&) const {}
-
-    void doPreallocate(PreallocationConfiguration const&) {}
-    void doBeginJob();
-    void doEndJob();
-    void doBeginProcessBlock(ProcessBlockPrincipal const&, ModuleCallingContext const*) {}
-    void doAccessInputProcessBlock(ProcessBlockPrincipal const&, ModuleCallingContext const*) {}
-    void doEndProcessBlock(ProcessBlockPrincipal const&, ModuleCallingContext const*) {}
-    void doBeginRun(RunTransitionInfo const&, ModuleCallingContext const*);
-    void doEndRun(RunTransitionInfo const&, ModuleCallingContext const*);
-    void doBeginLuminosityBlock(LumiTransitionInfo const&, ModuleCallingContext const*);
-    void doEndLuminosityBlock(LumiTransitionInfo const&, ModuleCallingContext const*);
-    void doRespondToOpenInputFile(FileBlock const& fb);
-    void doRespondToCloseInputFile(FileBlock const& fb);
-    void doRespondToCloseOutputFile() {}
-    void doRegisterThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&) {}
-
-    void registerProductsAndCallbacks(EDFilter* module, ProductRegistry* reg) {
-      registerProducts(module, reg, moduleDescription_);
-    }
-
-    std::string workerType() const { return "WorkerT<EDFilter>"; }
-
-    SharedResourcesAcquirer& sharedResourcesAcquirer() { return resourceAcquirer_; }
-
-    virtual bool filter(Event&, EventSetup const&) = 0;
-    virtual void beginJob() {}
-    virtual void endJob() {}
-
-    virtual void beginRun(Run const&, EventSetup const&) {}
-    virtual void endRun(Run const&, EventSetup const&) {}
-    virtual void beginLuminosityBlock(LuminosityBlock const&, EventSetup const&) {}
-    virtual void endLuminosityBlock(LuminosityBlock const&, EventSetup const&) {}
-    virtual void respondToOpenInputFile(FileBlock const&) {}
-    virtual void respondToCloseInputFile(FileBlock const&) {}
-
-    bool hasAcquire() const { return false; }
-    bool hasAccumulator() const { return false; }
-
-    void setModuleDescription(ModuleDescription const& md) { moduleDescription_ = md; }
-    ModuleDescription moduleDescription_;
-    std::vector<BranchID> previousParentage_;
-    SharedResourcesAcquirer resourceAcquirer_;
-    SerialTaskQueue runQueue_;
-    SerialTaskQueue luminosityBlockQueue_;
-    ParentageID previousParentageId_;
-  };
-}  // namespace edm
+#error \
+    "The use of edm::EDFilter has been removed. Please stop use of this header and switch module to a thread-friendly type."
 
 #endif

FWCore/Framework/interface/Frameworkfwd.h

@@ -16,7 +16,6 @@ namespace edm {
   class ConsumesCollector;
   class DelayedReader;
   class EDAnalyzer;
-  class EDFilter;
   class EDLooper;
   class EDProducer;
   class Event;

FWCore/Framework/interface/ProducerBase.h

@@ -29,7 +29,6 @@ namespace edm {
   class Run;
 
   class EDProducer;
-  class EDFilter;
   namespace one {
     class EDProducerBase;
     class EDFilterBase;

FWCore/Framework/src/WorkerT.cc

@@ -2,7 +2,6 @@
 #include "FWCore/Framework/interface/EventPrincipal.h"
 
 #include "FWCore/Framework/interface/EDProducer.h"
-#include "FWCore/Framework/interface/EDFilter.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/one/EDProducerBase.h"
 #include "FWCore/Framework/interface/one/EDFilterBase.h"
@@ -172,14 +171,6 @@ namespace edm {
     return module_->globalLuminosityBlocksQueue();
   }
   template <>
-  SerialTaskQueue* WorkerT<EDFilter>::globalRunsQueue() {
-    return module_->globalRunsQueue();
-  }
-  template <>
-  SerialTaskQueue* WorkerT<EDFilter>::globalLuminosityBlocksQueue() {
-    return module_->globalLuminosityBlocksQueue();
-  }
-  template <>
   SerialTaskQueue* WorkerT<EDAnalyzer>::globalRunsQueue() {
     return module_->globalRunsQueue();
   }
@@ -653,10 +644,6 @@ namespace edm {
     return &(module_->sharedResourcesAcquirer().serialQueueChain());
   }
   template <>
-  Worker::TaskQueueAdaptor WorkerT<EDFilter>::serializeRunModule() {
-    return &(module_->sharedResourcesAcquirer().serialQueueChain());
-  }
-  template <>
   Worker::TaskQueueAdaptor WorkerT<EDProducer>::serializeRunModule() {
     return &(module_->sharedResourcesAcquirer().serialQueueChain());
   }
@@ -705,10 +692,6 @@ namespace edm {
     bool mustPrefetchMayGet<EDProducer>() {
       return true;
     }
-    template <>
-    bool mustPrefetchMayGet<EDFilter>() {
-      return true;
-    }
 
     template <>
     bool mustPrefetchMayGet<edm::one::EDProducerBase>() {
@@ -841,10 +824,6 @@ namespace edm {
     return Worker::kProducer;
   }
   template <>
-  Worker::Types WorkerT<EDFilter>::moduleType() const {
-    return Worker::kFilter;
-  }
-  template <>
   Worker::Types WorkerT<edm::one::EDProducerBase>::moduleType() const {
     return Worker::kProducer;
   }
@@ -917,10 +896,6 @@ namespace edm {
     return Worker::kLegacy;
   }
   template <>
-  Worker::ConcurrencyTypes WorkerT<EDFilter>::moduleConcurrencyType() const {
-    return Worker::kLegacy;
-  }
-  template <>
   Worker::ConcurrencyTypes WorkerT<edm::one::EDProducerBase>::moduleConcurrencyType() const {
     return Worker::kOne;
   }
@@ -987,7 +962,6 @@ namespace edm {
   //Explicitly instantiate our needed templates to avoid having the compiler
   // instantiate them in all of our libraries
   template class WorkerT<EDProducer>;
-  template class WorkerT<EDFilter>;
   template class WorkerT<EDAnalyzer>;
   template class WorkerT<one::EDProducerBase>;
   template class WorkerT<one::EDFilterBase>;

FWCore/ParameterSet/interface/ParameterSetDescriptionFillerBase.h

@@ -31,7 +31,6 @@ and query the component for its allowed ParameterSetDescription.
 
 namespace edm {
   class EDProducer;
-  class EDFilter;
   class EDAnalyzer;
 
   namespace one {
@@ -106,7 +105,6 @@ namespace edm {
 
     static const std::string& extendedBaseType(EDAnalyzer const*) { return kExtendedBaseForEDAnalyzer; }
     static const std::string& extendedBaseType(EDProducer const*) { return kExtendedBaseForEDProducer; }
-    static const std::string& extendedBaseType(EDFilter const*) { return kExtendedBaseForEDFilter; }
     static const std::string& extendedBaseType(one::EDAnalyzerBase const*) { return kExtendedBaseForOneEDAnalyzer; }
     static const std::string& extendedBaseType(one::EDProducerBase const*) { return kExtendedBaseForOneEDProducer; }
     static const std::string& extendedBaseType(one::EDFilterBase const*) { return kExtendedBaseForOneEDFilter; }