Merge pull request #16 from beaudett/master

fix problem with CaloParticles
felicepantaleo · Mar 1, 2017 · 5fff339 · 5fff339
2 parents c8172da + 61ddd1a
commit 5fff339
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/HGCalAnalysis/plugins/HGCalAnalysis.cc b/HGCalAnalysis/plugins/HGCalAnalysis.cc
@@ -153,15 +153,15 @@ HGCalAnalysis::HGCalAnalysis(const edm::ParameterSet& iConfig) :
   if(!readOfficialReco) {
     _vtx = consumes<std::vector<TrackingVertex> >(edm::InputTag("mix","MergedTrackTruth"));
     _part = consumes<std::vector<TrackingParticle> >(edm::InputTag("mix","MergedTrackTruth"));
-    if (!readCaloParticles) {
-      _caloParticles = consumes<std::vector<CaloParticle> >(edm::InputTag("mix","MergedCaloTruth"));
-    }
   }
   else {
     _hev = consumes<edm::HepMCProduct>(edm::InputTag("generatorSmeared") );
     _simTracks = consumes<std::vector<SimTrack> >(edm::InputTag("g4SimHits"));
     _simVertices = consumes<std::vector<SimVertex> >(edm::InputTag("g4SimHits"));
   }
+  if (readCaloParticles) {
+    _caloParticles = consumes<std::vector<CaloParticle> >(edm::InputTag("mix","MergedCaloTruth"));
+  } 
   _pfClusters = consumes<std::vector<reco::PFCluster> >(edm::InputTag("particleFlowClusterHGCal"));
   _multiClusters = consumes<std::vector<reco::HGCalMultiCluster> >(edm::InputTag("hgcalLayerClusters"));
   _tracks = consumes<std::vector<reco::Track> >(edm::InputTag("generalTracks"));