[Reco][clang-tidy] make deleted function public

Author: smuzaffar

RecoJets/FFTJetAlgorithms/interface/EtaAndPtDependentPeakSelector.h

@@ -17,16 +17,15 @@ namespace fftjetcms {
   class EtaAndPtDependentPeakSelector : public fftjet::Functor1<bool, fftjet::Peak> {
   public:
     explicit EtaAndPtDependentPeakSelector(std::istream& in);
+    EtaAndPtDependentPeakSelector() = delete;
+    EtaAndPtDependentPeakSelector(const EtaAndPtDependentPeakSelector&) = delete;
+    EtaAndPtDependentPeakSelector& operator=(const EtaAndPtDependentPeakSelector&) = delete;
     ~EtaAndPtDependentPeakSelector() override;
 
     bool operator()(const fftjet::Peak& peak) const override;
     inline bool isValid() const { return ip_; }
 
   private:
-    EtaAndPtDependentPeakSelector() = delete;
-    EtaAndPtDependentPeakSelector(const EtaAndPtDependentPeakSelector&) = delete;
-    EtaAndPtDependentPeakSelector& operator=(const EtaAndPtDependentPeakSelector&) = delete;
-
     fftjet::LinearInterpolator2d* ip_;
   };
 

RecoJets/FFTJetAlgorithms/interface/JetConvergenceDistance.h

@@ -11,13 +11,12 @@ namespace fftjetcms {
       : public fftjet::Functor2<double, fftjet::RecombinedJet<VectorLike>, fftjet::RecombinedJet<VectorLike> > {
   public:
     JetConvergenceDistance(double etaToPhiBandwidthRatio, double relativePtBandwidth);
+    JetConvergenceDistance() = delete;
 
     double operator()(const fftjet::RecombinedJet<VectorLike>& jet1,
                       const fftjet::RecombinedJet<VectorLike>& jet2) const override;
 
   private:
-    JetConvergenceDistance() = delete;
-
     double etaBw_;
     double phiBw_;
     double ptBw_;

RecoJets/FFTJetAlgorithms/interface/LookupTable2d.h

@@ -8,6 +8,7 @@ namespace fftjetcms {
   public:
     LookupTable2d(
         unsigned nx, double xmin, double xmax, unsigned ny, double ymin, double ymax, const std::vector<double>& data);
+    LookupTable2d() = delete;
 
     inline const std::vector<double>& data() const { return data_; }
     inline unsigned nx() const { return nx_; }
@@ -23,8 +24,6 @@ namespace fftjetcms {
     double closest(double x, double y) const;
 
   private:
-    LookupTable2d() = delete;
-
     std::vector<double> data_;
     unsigned nx_;
     unsigned ny_;

RecoJets/FFTJetAlgorithms/interface/ScaleCalculators.h

@@ -17,10 +17,10 @@ namespace fftjetcms {
   class ConstDouble : public fftjet::Functor1<double, Arg1> {
   public:
     inline ConstDouble(const double value) : c_(value) {}
+    ConstDouble() = delete;
     inline double operator()(const Arg1&) const override { return c_; }
 
   private:
-    ConstDouble() = delete;
     double c_;
   };
 
@@ -29,10 +29,10 @@ namespace fftjetcms {
   class ProportionalToScale : public fftjet::Functor1<double, T> {
   public:
     inline ProportionalToScale(const double value) : c_(value) {}
+    ProportionalToScale() = delete;
     inline double operator()(const T& r) const override { return r.scale() * c_; }
 
   private:
-    ProportionalToScale() = delete;
     double c_;
   };
 
@@ -42,6 +42,7 @@ namespace fftjetcms {
   public:
     inline MultiplyByConst(const double factor, const fftjet::Functor1<double, T>* f, const bool takeOwnership = false)
         : c_(factor), func_(f), ownsPointer_(takeOwnership) {}
+    MultiplyByConst() = delete;
 
     inline ~MultiplyByConst() override {
       if (ownsPointer_)
@@ -51,7 +52,6 @@ namespace fftjetcms {
     inline double operator()(const T& r) const override { return (*func_)(r)*c_; }
 
   private:
-    MultiplyByConst() = delete;
     double c_;
     const fftjet::Functor1<double, T>* func_;
     const bool ownsPointer_;
@@ -65,6 +65,7 @@ namespace fftjetcms {
                             const fftjet::Functor1<double, T>* f2,
                             const bool takeOwnership = false)
         : f1_(f1), f2_(f2), ownsPointers_(takeOwnership) {}
+    CompositeFunctor() = delete;
 
     inline ~CompositeFunctor() override {
       if (ownsPointers_) {
@@ -76,7 +77,6 @@ namespace fftjetcms {
     inline double operator()(const T& r) const override { return (*f1_)((*f2_)(r)); }
 
   private:
-    CompositeFunctor() = delete;
     const fftjet::Functor1<double, double>* f1_;
     const fftjet::Functor1<double, T>* f2_;
     const bool ownsPointers_;
@@ -90,6 +90,7 @@ namespace fftjetcms {
                           const fftjet::Functor1<double, T>* f2,
                           const bool takeOwnership = false)
         : f1_(f1), f2_(f2), ownsPointers_(takeOwnership) {}
+    ProductFunctor() = delete;
 
     inline ~ProductFunctor() override {
       if (ownsPointers_) {
@@ -101,7 +102,6 @@ namespace fftjetcms {
     inline double operator()(const T& r) const override { return (*f1_)(r) * (*f2_)(r); }
 
   private:
-    ProductFunctor() = delete;
     const fftjet::Functor1<double, T>* f1_;
     const fftjet::Functor1<double, T>* f2_;
     const bool ownsPointers_;
@@ -113,6 +113,7 @@ namespace fftjetcms {
   public:
     inline MagnitudeDependent(const fftjet::Functor1<double, double>* f1, const bool takeOwnership = false)
         : f1_(f1), ownsPointer_(takeOwnership) {}
+    MagnitudeDependent() = delete;
 
     inline ~MagnitudeDependent() override {
       if (ownsPointer_)
@@ -122,7 +123,6 @@ namespace fftjetcms {
     inline double operator()(const T& r) const override { return (*f1_)(r.magnitude()); }
 
   private:
-    MagnitudeDependent() = delete;
     const fftjet::Functor1<double, double>* f1_;
     const bool ownsPointer_;
   };
@@ -132,6 +132,7 @@ namespace fftjetcms {
   public:
     inline PeakEtaDependent(const fftjet::Functor1<double, double>* f1, const bool takeOwnership = false)
         : f1_(f1), ownsPointer_(takeOwnership) {}
+    PeakEtaDependent() = delete;
 
     inline ~PeakEtaDependent() override {
       if (ownsPointer_)
@@ -141,7 +142,6 @@ namespace fftjetcms {
     inline double operator()(const fftjet::Peak& r) const override { return (*f1_)(r.eta()); }
 
   private:
-    PeakEtaDependent() = delete;
     const fftjet::Functor1<double, double>* f1_;
     const bool ownsPointer_;
   };
@@ -154,6 +154,7 @@ namespace fftjetcms {
                                   const bool ownjmp,
                                   const double fc)
         : f1_(f1), ownsPointer_(takeOwnership), jmmp_(jmmp), ownsjmmpPointer_(ownjmp), factor_(fc) {}
+    PeakEtaMagSsqDependent() = delete;
 
     inline ~PeakEtaMagSsqDependent() override {
       if (ownsPointer_)
@@ -171,7 +172,6 @@ namespace fftjetcms {
     }
 
   private:
-    PeakEtaMagSsqDependent() = delete;
     const fftjet::LinearInterpolator2d* f1_;
     const bool ownsPointer_;
     const fftjet::JetMagnitudeMapper2d<fftjet::Peak>* jmmp_;
@@ -184,6 +184,7 @@ namespace fftjetcms {
   public:
     inline JetEtaDependent(const fftjet::Functor1<double, double>* f1, const bool takeOwnership = false)
         : f1_(f1), ownsPointer_(takeOwnership) {}
+    JetEtaDependent() = delete;
 
     inline ~JetEtaDependent() override {
       if (ownsPointer_)
@@ -195,7 +196,6 @@ namespace fftjetcms {
     }
 
   private:
-    JetEtaDependent() = delete;
     const fftjet::Functor1<double, double>* f1_;
     const bool ownsPointer_;
   };
@@ -209,6 +209,7 @@ namespace fftjetcms {
         std::copy(coeffs.begin(), coeffs.end(), coeffs_);
       }
     }
+    Polynomial() = delete;
     inline ~Polynomial() override { delete[] coeffs_; }
 
     inline double operator()(const double& x) const override {
@@ -222,7 +223,6 @@ namespace fftjetcms {
     }
 
   private:
-    Polynomial() = delete;
     double* coeffs_;
     const unsigned nCoeffs;
   };

RecoJets/FFTJetProducers/interface/FFTJetInterface.h

@@ -51,6 +51,10 @@
 namespace fftjetcms {
   class FFTJetInterface : public edm::EDProducer {
   public:
+    // Explicitly disable other ways to construct this object
+    FFTJetInterface() = delete;
+    FFTJetInterface(const FFTJetInterface&) = delete;
+    FFTJetInterface& operator=(const FFTJetInterface&) = delete;
     ~FFTJetInterface() override {}
 
   protected:
@@ -103,11 +107,6 @@ namespace fftjetcms {
     edm::Handle<reco::CandidateView> inputCollection;
 
   private:
-    // Explicitly disable other ways to construct this object
-    FFTJetInterface() = delete;
-    FFTJetInterface(const FFTJetInterface&) = delete;
-    FFTJetInterface& operator=(const FFTJetInterface&) = delete;
-
     const bool insertCompleteEvent;
     const double completeEventScale;
     reco::Particle::Point vertex_;

RecoJets/FFTJetProducers/plugins/FFTJetDijetFilter.cc

@@ -54,15 +54,14 @@ class FFTJetDijetFilter : public edm::EDFilter {
   typedef fftjet::SparseClusteringTree<fftjet::Peak, long> SparseTree;
 
   explicit FFTJetDijetFilter(const edm::ParameterSet&);
+  FFTJetDijetFilter() = delete;
+  FFTJetDijetFilter(const FFTJetDijetFilter&) = delete;
+  FFTJetDijetFilter& operator=(const FFTJetDijetFilter&) = delete;
   ~FFTJetDijetFilter() override;
 
 private:
   typedef reco::PattRecoTree<float, reco::PattRecoPeak<float> > StoredTree;
 
-  FFTJetDijetFilter() = delete;
-  FFTJetDijetFilter(const FFTJetDijetFilter&) = delete;
-  FFTJetDijetFilter& operator=(const FFTJetDijetFilter&) = delete;
-
   void beginJob() override;
   bool filter(edm::Event& iEvent, const edm::EventSetup& iSetup) override;
   void endJob() override;

RecoJets/FFTJetProducers/plugins/FFTJetEFlowSmoother.cc

@@ -51,6 +51,9 @@ using namespace fftjetcms;
 class FFTJetEFlowSmoother : public FFTJetInterface {
 public:
   explicit FFTJetEFlowSmoother(const edm::ParameterSet&);
+  FFTJetEFlowSmoother() = delete;
+  FFTJetEFlowSmoother(const FFTJetEFlowSmoother&) = delete;
+  FFTJetEFlowSmoother& operator=(const FFTJetEFlowSmoother&) = delete;
   ~FFTJetEFlowSmoother() override;
 
 protected:
@@ -60,10 +63,6 @@ class FFTJetEFlowSmoother : public FFTJetInterface {
   void endJob() override;
 
 private:
-  FFTJetEFlowSmoother() = delete;
-  FFTJetEFlowSmoother(const FFTJetEFlowSmoother&) = delete;
-  FFTJetEFlowSmoother& operator=(const FFTJetEFlowSmoother&) = delete;
-
   void buildKernelConvolver(const edm::ParameterSet&);
 
   // Storage for convolved energy flow

RecoJets/FFTJetProducers/plugins/FFTJetPFPileupCleaner.cc

@@ -45,6 +45,9 @@
 class FFTJetPFPileupCleaner : public edm::EDProducer {
 public:
   explicit FFTJetPFPileupCleaner(const edm::ParameterSet&);
+  FFTJetPFPileupCleaner() = delete;
+  FFTJetPFPileupCleaner(const FFTJetPFPileupCleaner&) = delete;
+  FFTJetPFPileupCleaner& operator=(const FFTJetPFPileupCleaner&) = delete;
   ~FFTJetPFPileupCleaner() override;
 
 protected:
@@ -54,10 +57,6 @@ class FFTJetPFPileupCleaner : public edm::EDProducer {
   void endJob() override;
 
 private:
-  FFTJetPFPileupCleaner() = delete;
-  FFTJetPFPileupCleaner(const FFTJetPFPileupCleaner&) = delete;
-  FFTJetPFPileupCleaner& operator=(const FFTJetPFPileupCleaner&) = delete;
-
   bool isRemovable(reco::PFCandidate::ParticleType ptype) const;
   void setRemovalBit(reco::PFCandidate::ParticleType ptype, bool onOff);
   void buildRemovalMask();

RecoJets/FFTJetProducers/plugins/FFTJetPatRecoProducer.cc

@@ -64,6 +64,9 @@ using namespace fftjetcms;
 class FFTJetPatRecoProducer : public FFTJetInterface {
 public:
   explicit FFTJetPatRecoProducer(const edm::ParameterSet&);
+  FFTJetPatRecoProducer() = delete;
+  FFTJetPatRecoProducer(const FFTJetPatRecoProducer&) = delete;
+  FFTJetPatRecoProducer& operator=(const FFTJetPatRecoProducer&) = delete;
   ~FFTJetPatRecoProducer() override;
 
 protected:
@@ -136,10 +139,6 @@ class FFTJetPatRecoProducer : public FFTJetInterface {
   const bool sparsify;
 
 private:
-  FFTJetPatRecoProducer() = delete;
-  FFTJetPatRecoProducer(const FFTJetPatRecoProducer&) = delete;
-  FFTJetPatRecoProducer& operator=(const FFTJetPatRecoProducer&) = delete;
-
   // Members needed for storing grids externally
   std::ofstream externalGridStream;
   bool storeGridsExternally;

RecoJets/FFTJetProducers/plugins/FFTJetPileupEstimator.cc

@@ -46,6 +46,9 @@ using namespace fftjetcms;
 class FFTJetPileupEstimator : public edm::EDProducer {
 public:
   explicit FFTJetPileupEstimator(const edm::ParameterSet&);
+  FFTJetPileupEstimator() = delete;
+  FFTJetPileupEstimator(const FFTJetPileupEstimator&) = delete;
+  FFTJetPileupEstimator& operator=(const FFTJetPileupEstimator&) = delete;
   ~FFTJetPileupEstimator() override;
 
 protected:
@@ -55,10 +58,6 @@ class FFTJetPileupEstimator : public edm::EDProducer {
   void endJob() override;
 
 private:
-  FFTJetPileupEstimator() = delete;
-  FFTJetPileupEstimator(const FFTJetPileupEstimator&) = delete;
-  FFTJetPileupEstimator& operator=(const FFTJetPileupEstimator&) = delete;
-
   std::unique_ptr<reco::FFTJetPileupSummary> calibrateFromConfig(double uncalibrated) const;
 
   std::unique_ptr<reco::FFTJetPileupSummary> calibrateFromDB(double uncalibrated, const edm::EventSetup& iSetup) const;