Merge pull request #36317 from atishelmanch/from-CMSSW_12_2_0_pre2_EC…

…AL_Deprecated_Modules Updating ECAL Module Class Inheritance
cms-sw · Dec 2, 2021 · f0646ac · f0646ac
2 parents 8d06acb + c703efd
commit f0646ac
Show file tree

Hide file tree

Showing 23 changed files with 61 additions and 129 deletions.
diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/interface/EcnaAnalyzer.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/interface/EcnaAnalyzer.h
@@ -44,7 +44,7 @@
 // CMSSW include files
 #include "CondCore/CondDB/interface/Time.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -62,8 +62,6 @@
 #include "DataFormats/Provenance/interface/EventID.h"
 
 #include "DataFormats/Provenance/interface/Timestamp.h"
-//#include "Geometry/EcalMapping/interface/EcalElectronicsMapping.h"
-//#include "Geometry/EcalMapping/interface/EcalMappingRcd.h"
 
 #include "DataFormats/EcalRawData/interface/EcalRawDataCollections.h"
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
@@ -132,7 +130,7 @@
 // class declaration
 //
 
-class EcnaAnalyzer : public edm::EDAnalyzer {
+class EcnaAnalyzer : public edm::one::EDAnalyzer<> {
 public:
   enum { kChannels = 1700, kGains = 3, kFirstGainId = 1 };
 

diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/EcnaAnalyzer.cc b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/EcnaAnalyzer.cc
@@ -23,7 +23,6 @@
 //#include <signal.h>
 
 #include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/interface/EcnaAnalyzer.h"
-//#include <DataFormats/Provenance/interface/Timestamp.h>
 
 //--------------------------------------
 //  EcnaAnalyzer.cc

diff --git a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzerYousi.cc b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzerYousi.cc
@@ -23,7 +23,7 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -49,7 +49,7 @@
 // class decleration
 //
 
-class EcalLaserAnalyzerYousi : public edm::EDAnalyzer {
+class EcalLaserAnalyzerYousi : public edm::one::EDAnalyzer<> {
 public:
   explicit EcalLaserAnalyzerYousi(const edm::ParameterSet &);
   ~EcalLaserAnalyzerYousi() override;

diff --git a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalMatacqAnalyzer.h b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalMatacqAnalyzer.h
@@ -1,7 +1,7 @@
 // $Id: EcalMatacqAnalyzer.h
 
 #include <memory>
-#include <FWCore/Framework/interface/EDAnalyzer.h>
+#include <FWCore/Framework/interface/one/EDAnalyzer.h>
 
 class TFile;
 class TTree;
@@ -11,7 +11,7 @@ class TMTQ;
 #define N_channels 1
 #define NSIDES 2  // Number of sides
 
-class EcalMatacqAnalyzer : public edm::EDAnalyzer {
+class EcalMatacqAnalyzer : public edm::one::EDAnalyzer<> {
 public:
   explicit EcalMatacqAnalyzer(const edm::ParameterSet &iConfig);
   ~EcalMatacqAnalyzer() override;

diff --git a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalPerEvtMatacqAnalyzer.h b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalPerEvtMatacqAnalyzer.h
@@ -1,15 +1,15 @@
 // $Id: EcalPerEvtMatacqAnalyzer.h
 
 #include <memory>
-#include <FWCore/Framework/interface/EDAnalyzer.h>
+#include <FWCore/Framework/interface/one/EDAnalyzer.h>
 
 class TTree;
 class TFile;
 
 #define N_samples 2560
 #define N_channels 1
 
-class EcalPerEvtMatacqAnalyzer : public edm::EDAnalyzer {
+class EcalPerEvtMatacqAnalyzer : public edm::one::EDAnalyzer<> {
 public:
   explicit EcalPerEvtMatacqAnalyzer(const edm::ParameterSet& iConfig);
   ~EcalPerEvtMatacqAnalyzer() override;

diff --git a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalStatusAnalyzer.h b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalStatusAnalyzer.h
@@ -4,11 +4,11 @@
 #include <map>
 
 #include <memory>
-#include <FWCore/Framework/interface/EDAnalyzer.h>
+#include <FWCore/Framework/interface/one/EDAnalyzer.h>
 
 class Timestamp;
 
-class EcalStatusAnalyzer : public edm::EDAnalyzer {
+class EcalStatusAnalyzer : public edm::one::EDAnalyzer<> {
 public:
   explicit EcalStatusAnalyzer(const edm::ParameterSet& iConfig);
   ~EcalStatusAnalyzer() override;

diff --git a/CalibCalorimetry/EcalLaserSorting/interface/LaserSorter.h b/CalibCalorimetry/EcalLaserSorting/interface/LaserSorter.h
@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
@@ -41,7 +41,7 @@
  * the each output file.Once a file is completed (see above), it is renamed
  * without the enclosing .part suffix.
  */
-class LaserSorter : public edm::EDAnalyzer {
+class LaserSorter : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
   //inner classes
 private:
   struct IndexRecord {
@@ -124,6 +124,7 @@ class LaserSorter : public edm::EDAnalyzer {
   void endJob() override;
   void beginJob() override;
   void beginRun(edm::Run const&, edm::EventSetup const&) override;
+  void endRun(edm::Run const&, edm::EventSetup const&) override;
 
 private:
   int dcc2Lme(int dccNum, int dccSide);

diff --git a/CalibCalorimetry/EcalLaserSorting/src/LaserSorter.cc b/CalibCalorimetry/EcalLaserSorting/src/LaserSorter.cc
@@ -10,9 +10,7 @@
 #include "CalibCalorimetry/EcalLaserSorting/src/Majority.h"
 
 #include <iostream>
-//#include <fstream>
 #include <iomanip>
-//#include <limits>
 #include <algorithm>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -1156,6 +1154,6 @@ void LaserSorter::restoreStreamsOfLumiBlock(int lumiBlock) {
   }
 }
 
-void LaserSorter::beginRun(edm::Run const& run, edm::EventSetup const& es) {
-  //  cout << "Run starts at :" << run.runAuxiliary().beginTime().value() << "\n";
-}
+void LaserSorter::beginRun(edm::Run const& run, edm::EventSetup const& es) {}
+
+void LaserSorter::endRun(edm::Run const& run, edm::EventSetup const& es) {}
diff --git a/CalibCalorimetry/EcalPedestalOffsets/interface/testChannel.h b/CalibCalorimetry/EcalPedestalOffsets/interface/testChannel.h
@@ -12,7 +12,7 @@
 #include "CalibCalorimetry/EcalPedestalOffsets/interface/TPedResult.h"
 #include "CalibCalorimetry/EcalPedestalOffsets/interface/TPedValues.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include <map>
@@ -33,7 +33,7 @@
 #include <string>
 #include <vector>
 
-class testChannel : public edm::EDAnalyzer {
+class testChannel : public edm::one::EDAnalyzer<> {
 public:
   //! Constructor
   testChannel(const edm::ParameterSet &ps);

diff --git a/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamReaderFromDB.cc b/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamReaderFromDB.cc
@@ -3,7 +3,7 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -12,7 +12,7 @@
 
 using namespace std;
 
-class EcalTPGParamReaderFromDB : public edm::EDAnalyzer {
+class EcalTPGParamReaderFromDB : public edm::one::EDAnalyzer<> {
 public:
   explicit EcalTPGParamReaderFromDB(const edm::ParameterSet&);
   ~EcalTPGParamReaderFromDB() override;
@@ -47,11 +47,6 @@ EcalTPGParamReaderFromDB::~EcalTPGParamReaderFromDB() {}
 
 void EcalTPGParamReaderFromDB::analyze(const edm::Event& ev, const edm::EventSetup& es) {
   EcalTPGDBApp app(sid, user, pass);
-
-  //int i ;
-  //app.readTPGPedestals(i);
-  //app.writeTPGLUT();
-  //app.writeTPGWeights();
 }
 
 void EcalTPGParamReaderFromDB::beginJob() {}

diff --git a/CalibCalorimetry/EcalTPGTools/plugins/testEcalTPGScale.h b/CalibCalorimetry/EcalTPGTools/plugins/testEcalTPGScale.h
@@ -9,7 +9,7 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -28,7 +28,7 @@
 
 class CaloSubdetectorGeometry;
 
-class testEcalTPGScale : public edm::EDAnalyzer {
+class testEcalTPGScale : public edm::one::EDAnalyzer<> {
 public:
   explicit testEcalTPGScale(edm::ParameterSet const& pSet);
   void analyze(const edm::Event& evt, const edm::EventSetup& evtSetup) override;

diff --git a/Calibration/EcalAlCaRecoProducers/plugins/PUDumper.cc b/Calibration/EcalAlCaRecoProducers/plugins/PUDumper.cc
@@ -2,7 +2,6 @@
 
 //! ctor
 PUDumper::PUDumper(const edm::ParameterSet& iConfig) {
-  //  MCPileupTag_ = iConfig.getParameter<edm::InputTag>("MCPileupTag");
   pileupSummaryToken_ = consumes<std::vector<PileupSummaryInfo> >(iConfig.getParameter<edm::InputTag>("pileupSummary"));
 
   // create TTree

diff --git a/Calibration/EcalAlCaRecoProducers/plugins/PUDumper.h b/Calibration/EcalAlCaRecoProducers/plugins/PUDumper.h
@@ -2,7 +2,7 @@
 #define PUDumper_h
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -16,7 +16,7 @@
 
 #include "TTree.h"
 
-class PUDumper : public edm::EDAnalyzer {
+class PUDumper : public edm::one::EDAnalyzer<> {
 public:
   //! ctor
   explicit PUDumper(const edm::ParameterSet&);
@@ -31,14 +31,11 @@ class PUDumper : public edm::EDAnalyzer {
 private:
   edm::EDGetTokenT<std::vector<PileupSummaryInfo> > pileupSummaryToken_;
 
-  //edm::InputTag MCPileupTag_;
-
   TTree* PUTree_;
 
   Int_t runNumber;       ///<
   Long64_t eventNumber;  ///<
   Int_t lumiBlock;       ///< lumi section
-  //UInt_t 	runTime;     ///< unix time
 
   Int_t nBX;
   Int_t BX_[100];

diff --git a/Calibration/EcalAlCaRecoProducers/src/ValueMapTraslator.cc b/Calibration/EcalAlCaRecoProducers/src/ValueMapTraslator.cc
@@ -22,7 +22,7 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 
 #include "FWCore/Framework/interface/Event.h"
@@ -38,7 +38,7 @@
 // class declaration
 //
 
-class ValueMapTraslator : public edm::EDProducer {
+class ValueMapTraslator : public edm::stream::EDProducer<> {
   typedef double value_t;
   typedef edm::ValueMap<value_t> Map_t;
 

diff --git a/Calibration/EcalCalibAlgos/interface/ElectronCalibration.h b/Calibration/EcalCalibAlgos/interface/ElectronCalibration.h
@@ -24,7 +24,7 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -39,10 +39,9 @@
 #include "TH1.h"
 #include "TH2.h"
 
-// class decleration
-//
+// class declaration
 
-class ElectronCalibration : public edm::EDAnalyzer {
+class ElectronCalibration : public edm::one::EDAnalyzer<> {
 public:
   explicit ElectronCalibration(const edm::ParameterSet&);
   ~ElectronCalibration() override;

diff --git a/Calibration/EcalCalibAlgos/interface/ElectronRecalibSuperClusterAssociator.h b/Calibration/EcalCalibAlgos/interface/ElectronRecalibSuperClusterAssociator.h
@@ -7,7 +7,7 @@
 //
 // Description:
 
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -20,9 +20,7 @@
 
 #include <string>
 
-//class PixelMatchElectronAlgo;
-
-class ElectronRecalibSuperClusterAssociator : public edm::EDProducer {
+class ElectronRecalibSuperClusterAssociator : public edm::stream::EDProducer<> {
 public:
   explicit ElectronRecalibSuperClusterAssociator(const edm::ParameterSet& conf);
 

diff --git a/Calibration/EcalCalibAlgos/interface/miscalibExample.h b/Calibration/EcalCalibAlgos/interface/miscalibExample.h
@@ -16,21 +16,24 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
+#include "DataFormats/EgammaReco/interface/SuperCluster.h"
+#include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
+
 #include <string>
 #include "TH1.h"
 #include "TFile.h"
 //
 // class declaration
 //
 
-class miscalibExample : public edm::EDAnalyzer {
+class miscalibExample : public edm::one::EDAnalyzer<> {
 public:
   explicit miscalibExample(const edm::ParameterSet&);
   ~miscalibExample() override;
@@ -41,12 +44,11 @@ class miscalibExample : public edm::EDAnalyzer {
 
 private:
   // ----------member data ---------------------------
-  std::string rootfile_;
-  std::string correctedHybridSuperClusterProducer_;
-  std::string correctedHybridSuperClusterCollection_;
-  std::string BarrelHitsCollection_;
-  std::string ecalHitsProducer_;
+  const std::string rootfile_;
+  const std::string correctedHybridSuperClusterProducer_;
+  const std::string correctedHybridSuperClusterCollection_;
   int read_events;
+  const edm::EDGetTokenT<reco::SuperClusterCollection> correctedHybridSuperClusterToken_;
 
   TH1F* scEnergy;
 };

diff --git a/Calibration/EcalCalibAlgos/plugins/SealModule.cc b/Calibration/EcalCalibAlgos/plugins/SealModule.cc
@@ -3,14 +3,12 @@
 #include "Calibration/EcalCalibAlgos/interface/InvRingCalib.h"
 #include "Calibration/EcalCalibAlgos/interface/miscalibExample.h"
 #include "Calibration/EcalCalibAlgos/interface/ZeeCalibration.h"
-#include "Calibration/EcalCalibAlgos/interface/ElectronRecalibSuperClusterAssociator.h"
 #include "Calibration/EcalCalibAlgos/interface/PhiSymmetryCalibration.h"
 #include "Calibration/EcalCalibAlgos/interface/Pi0FixedMassWindowCalibration.h"
 #include "Calibration/EcalCalibAlgos/interface/ECALpedestalPCLworker.h"
 #include "Calibration/EcalCalibAlgos/interface/ECALpedestalPCLHarvester.h"
 
 DEFINE_FWK_MODULE(miscalibExample);
-//DEFINE_FWK_MODULE(ElectronRecalibSuperClusterAssociator);
 DEFINE_FWK_MODULE(PhiSymmetryCalibration);
 DEFINE_FWK_LOOPER(Pi0FixedMassWindowCalibration);
 DEFINE_FWK_LOOPER(ZeeCalibration);

diff --git a/Calibration/EcalCalibAlgos/python/electronRecalibSCAssociator_cfi.py b/Calibration/EcalCalibAlgos/python/electronRecalibSCAssociator_cfi.py
@@ -1,12 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
 electronRecalibSCAssociator = cms.EDProducer("ElectronRecalibSuperClusterAssociator",
-#    superClusterCollectionEB = cms.InputTag('correctedHybridSuperClusters'),    
-#    superClusterCollectionEE = cms.InputTag('correctedMulti5x5SuperClustersWithPreshower'),
                                              superClusterCollectionEB = cms.InputTag("particleFlowSuperClusterECAL:particleFlowSuperClusterECALBarrel"),
                                              superClusterCollectionEE = cms.InputTag("particleFlowSuperClusterECAL:particleFlowSuperClusterECALEndcapWithPreshower"),
     electronSrc = cms.InputTag('gedGsfElectrons'),
     outputLabel = cms.string('recalibSC')
 )
-
-