From b464155ea33c991dcb74a536f9e8f0a492f13b22 Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Mon, 31 May 2021 08:58:23 -0500 Subject: [PATCH 1/2] Removed unnecessary includes --- CalibFormats/CastorObjects/interface/CastorDbService.h | 3 --- CalibFormats/HcalObjects/interface/HcalDbService.h | 3 --- 2 files changed, 6 deletions(-) diff --git a/CalibFormats/CastorObjects/interface/CastorDbService.h b/CalibFormats/CastorObjects/interface/CastorDbService.h index 2a1b78fdac673..3e58cebf6cd53 100644 --- a/CalibFormats/CastorObjects/interface/CastorDbService.h +++ b/CalibFormats/CastorObjects/interface/CastorDbService.h @@ -17,9 +17,6 @@ #include "CalibFormats/CastorObjects/interface/CastorCalibrationsSet.h" #include "CalibFormats/CastorObjects/interface/CastorCalibrationWidthsSet.h" -#include "FWCore/Framework/interface/ModuleFactory.h" -#include "FWCore/Framework/interface/ESProducer.h" - #include "CondFormats/CastorObjects/interface/AllObjects.h" class CastorCalibrations; diff --git a/CalibFormats/HcalObjects/interface/HcalDbService.h b/CalibFormats/HcalObjects/interface/HcalDbService.h index a8c5f341961c4..1a3e5889ede9d 100644 --- a/CalibFormats/HcalObjects/interface/HcalDbService.h +++ b/CalibFormats/HcalObjects/interface/HcalDbService.h @@ -14,9 +14,6 @@ #include "CalibFormats/HcalObjects/interface/HcalCalibrationsSet.h" #include "CalibFormats/HcalObjects/interface/HcalCalibrationWidthsSet.h" -#include "FWCore/Framework/interface/ModuleFactory.h" -#include "FWCore/Framework/interface/ESProducer.h" - #include "CondFormats/HcalObjects/interface/AllObjects.h" class HcalCalibrations; From 38e1610711954d9d444691fe6f1452aa38c9675e Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Mon, 31 May 2021 11:35:30 -0500 Subject: [PATCH 2/2] Added missing includes --- .../plugins/SelectedElectronFEDListProducer.cc | 1 + CaloOnlineTools/HcalOnlineDb/bin/hcalLUT.cc | 1 + CommonTools/ParticleFlow/plugins/PFCandidateRecalibrator.cc | 2 ++ SimCalorimetry/CastorSim/src/CastorAmplifier.cc | 1 + SimCalorimetry/CastorSim/src/CastorCoderFactory.cc | 1 + SimCalorimetry/CastorSim/src/CastorSimParameters.cc | 1 + .../HcalTrigPrimAlgos/interface/HcalTriggerPrimitiveAlgo.h | 2 ++ 7 files changed, 9 insertions(+) diff --git a/Calibration/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc b/Calibration/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc index 3c28905dd2c27..c020bc7a498c9 100644 --- a/Calibration/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc +++ b/Calibration/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc @@ -6,6 +6,7 @@ #include "FWCore/Framework/interface/ESTransientHandle.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" //#include "DataFormats/Common/interface/Handle.h" diff --git a/CaloOnlineTools/HcalOnlineDb/bin/hcalLUT.cc b/CaloOnlineTools/HcalOnlineDb/bin/hcalLUT.cc index 6c1c9279185f6..4926a5cf4a69f 100644 --- a/CaloOnlineTools/HcalOnlineDb/bin/hcalLUT.cc +++ b/CaloOnlineTools/HcalOnlineDb/bin/hcalLUT.cc @@ -4,6 +4,7 @@ #include "TString.h" #include "PhysicsTools/FWLite/interface/CommandLineParser.h" #include "CaloOnlineTools/HcalOnlineDb/interface/HcalLutManager.h" +#include "FWCore/Utilities/interface/FileInPath.h" using namespace std; diff --git a/CommonTools/ParticleFlow/plugins/PFCandidateRecalibrator.cc b/CommonTools/ParticleFlow/plugins/PFCandidateRecalibrator.cc index d2515c4788d28..afc9bbf89617b 100644 --- a/CommonTools/ParticleFlow/plugins/PFCandidateRecalibrator.cc +++ b/CommonTools/ParticleFlow/plugins/PFCandidateRecalibrator.cc @@ -11,6 +11,8 @@ #include "FWCore/Framework/interface/stream/EDProducer.h" #include "FWCore/Framework/interface/ESWatcher.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" diff --git a/SimCalorimetry/CastorSim/src/CastorAmplifier.cc b/SimCalorimetry/CastorSim/src/CastorAmplifier.cc index 63dd3a5d4897c..75aac28d5829a 100644 --- a/SimCalorimetry/CastorSim/src/CastorAmplifier.cc +++ b/SimCalorimetry/CastorSim/src/CastorAmplifier.cc @@ -12,6 +12,7 @@ #include "CLHEP/Random/RandGaussQ.h" #include +#include CastorAmplifier::CastorAmplifier(const CastorSimParameterMap *parameters, bool addNoise) : theDbService(nullptr), theParameterMap(parameters), theStartingCapId(0), addNoise_(addNoise) {} diff --git a/SimCalorimetry/CastorSim/src/CastorCoderFactory.cc b/SimCalorimetry/CastorSim/src/CastorCoderFactory.cc index c87725ef721ef..ee01e3ab63a02 100644 --- a/SimCalorimetry/CastorSim/src/CastorCoderFactory.cc +++ b/SimCalorimetry/CastorSim/src/CastorCoderFactory.cc @@ -1,6 +1,7 @@ #include "CalibFormats/CastorObjects/interface/CastorCoderDb.h" #include "CalibFormats/CastorObjects/interface/CastorNominalCoder.h" #include "SimCalorimetry/CastorSim/src/CastorCoderFactory.h" +#include CastorCoderFactory::CastorCoderFactory(CoderType coderType) : theCoderType(coderType), theDbService(nullptr) {} diff --git a/SimCalorimetry/CastorSim/src/CastorSimParameters.cc b/SimCalorimetry/CastorSim/src/CastorSimParameters.cc index d9e814951322c..b03a8d6ef8f2c 100644 --- a/SimCalorimetry/CastorSim/src/CastorSimParameters.cc +++ b/SimCalorimetry/CastorSim/src/CastorSimParameters.cc @@ -6,6 +6,7 @@ #include "DataFormats/HcalDetId/interface/HcalSubdetector.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "SimCalorimetry/CastorSim/src/CastorSimParameters.h" +#include CastorSimParameters::CastorSimParameters(double simHitToPhotoelectrons, double photoelectronsToAnalog, diff --git a/SimCalorimetry/HcalTrigPrimAlgos/interface/HcalTriggerPrimitiveAlgo.h b/SimCalorimetry/HcalTrigPrimAlgos/interface/HcalTriggerPrimitiveAlgo.h index 82dee6171edf2..2d251e7a359b4 100644 --- a/SimCalorimetry/HcalTrigPrimAlgos/interface/HcalTriggerPrimitiveAlgo.h +++ b/SimCalorimetry/HcalTrigPrimAlgos/interface/HcalTriggerPrimitiveAlgo.h @@ -16,6 +16,8 @@ #include "SimCalorimetry/HcalTrigPrimAlgos/interface/HcalFeatureHFEMBit.h" #include "SimCalorimetry/HcalTrigPrimAlgos/interface/HcalFinegrainBit.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" + #include #include