From 074831ca9c6a27d2587b590b9c878e925a894dd4 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Mon, 4 Jun 2018 16:55:13 +0200 Subject: [PATCH 1/2] fix hdrs CommonTools --- CommonTools/PileupAlgos/plugins/PuppiPhoton.h | 2 ++ CommonTools/PileupAlgos/plugins/PuppiProducer.h | 5 ++++- CommonTools/UtilAlgos/interface/EtaRangeSelector.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CommonTools/PileupAlgos/plugins/PuppiPhoton.h b/CommonTools/PileupAlgos/plugins/PuppiPhoton.h index 2c710f966a68a..f3a7fe0b17e7a 100644 --- a/CommonTools/PileupAlgos/plugins/PuppiPhoton.h +++ b/CommonTools/PileupAlgos/plugins/PuppiPhoton.h @@ -13,6 +13,8 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "DataFormats/Math/interface/PtEtaPhiMass.h" #include "DataFormats/Candidate/interface/Candidate.h" +#include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h" +#include "DataFormats/Common/interface/ValueMap.h" // ------------------------------------------------------------------------------------------ class PuppiPhoton : public edm::stream::EDProducer<> { diff --git a/CommonTools/PileupAlgos/plugins/PuppiProducer.h b/CommonTools/PileupAlgos/plugins/PuppiProducer.h index e8074966d1a28..7d33e2dd75f9c 100644 --- a/CommonTools/PileupAlgos/plugins/PuppiProducer.h +++ b/CommonTools/PileupAlgos/plugins/PuppiProducer.h @@ -12,7 +12,10 @@ #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "DataFormats/Math/interface/PtEtaPhiMass.h" - +#include "DataFormats/Math/interface/LorentzVector.h" +#include "DataFormats/VertexReco/interface/VertexFwd.h" +#include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h" +#include "DataFormats/PatCandidates/interface/PackedCandidate.h" #include "CommonTools/PileupAlgos/interface/PuppiContainer.h" // ------------------------------------------------------------------------------------------ diff --git a/CommonTools/UtilAlgos/interface/EtaRangeSelector.h b/CommonTools/UtilAlgos/interface/EtaRangeSelector.h index 4fe060b499772..2865c5a45b175 100755 --- a/CommonTools/UtilAlgos/interface/EtaRangeSelector.h +++ b/CommonTools/UtilAlgos/interface/EtaRangeSelector.h @@ -3,6 +3,7 @@ #include "FWCore/Framework/interface/ConsumesCollector.h" #include "CommonTools/UtilAlgos/interface/ParameterAdapter.h" #include "CommonTools/Utils/interface/EtaRangeSelector.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" namespace reco { namespace modules { From 5ffb82149656ae49f710485af3f27a2e4212196b Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Tue, 5 Jun 2018 16:35:40 +0200 Subject: [PATCH 2/2] Update PR with review suggestions --- CommonTools/PileupAlgos/plugins/PuppiPhoton.cc | 3 --- CommonTools/PileupAlgos/plugins/PuppiProducer.cc | 5 ----- 2 files changed, 8 deletions(-) diff --git a/CommonTools/PileupAlgos/plugins/PuppiPhoton.cc b/CommonTools/PileupAlgos/plugins/PuppiPhoton.cc index 651ae771faeb0..bc5c6ee029641 100644 --- a/CommonTools/PileupAlgos/plugins/PuppiPhoton.cc +++ b/CommonTools/PileupAlgos/plugins/PuppiPhoton.cc @@ -6,7 +6,6 @@ #include "FWCore/Framework/interface/EDProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" -#include "DataFormats/Common/interface/ValueMap.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -15,8 +14,6 @@ #include "DataFormats/PatCandidates/interface/PackedCandidate.h" #include "DataFormats/PatCandidates/interface/Photon.h" #include "DataFormats/PatCandidates/interface/Electron.h" -#include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h" -#include "DataFormats/ParticleFlowCandidate/interface/PFCandidateFwd.h" #include "DataFormats/VertexReco/interface/VertexFwd.h" #include "DataFormats/VertexReco/interface/Vertex.h" #include "DataFormats/GsfTrackReco/interface/GsfTrack.h" diff --git a/CommonTools/PileupAlgos/plugins/PuppiProducer.cc b/CommonTools/PileupAlgos/plugins/PuppiProducer.cc index cf4d3f252f71e..b3f240207f83f 100644 --- a/CommonTools/PileupAlgos/plugins/PuppiProducer.cc +++ b/CommonTools/PileupAlgos/plugins/PuppiProducer.cc @@ -13,11 +13,6 @@ #include "DataFormats/Common/interface/View.h" #include "DataFormats/Candidate/interface/Candidate.h" #include "DataFormats/Candidate/interface/CandidateFwd.h" -#include "DataFormats/PatCandidates/interface/PackedCandidate.h" -#include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h" -#include "DataFormats/ParticleFlowCandidate/interface/PFCandidateFwd.h" -#include "DataFormats/VertexReco/interface/VertexFwd.h" -#include "DataFormats/VertexReco/interface/Vertex.h" #include "DataFormats/GsfTrackReco/interface/GsfTrack.h" #include "DataFormats/GsfTrackReco/interface/GsfTrackFwd.h" #include "DataFormats/Common/interface/Association.h"