From 49dd1b109c72dd3e118b45f9fdf8c1d55d73df5a Mon Sep 17 00:00:00 2001
From: Florian Beaudette <Florian.Beaudette@cern.ch>
Date: Tue, 28 Feb 2017 23:41:20 +0100
Subject: [PATCH] fix problem with CaloParticles

---
 HGCalAnalysis/plugins/HGCalAnalysis.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/HGCalAnalysis/plugins/HGCalAnalysis.cc b/HGCalAnalysis/plugins/HGCalAnalysis.cc
index a458eb69794d6..aa82279983d87 100644
--- a/HGCalAnalysis/plugins/HGCalAnalysis.cc
+++ b/HGCalAnalysis/plugins/HGCalAnalysis.cc
@@ -148,15 +148,15 @@ HGCalAnalysis::HGCalAnalysis(const edm::ParameterSet& iConfig) :
     _vtx = consumes<std::vector<TrackingVertex> >(edm::InputTag("mix","MergedTrackTruth"));
     _part = consumes<std::vector<TrackingParticle> >(edm::InputTag("mix","MergedTrackTruth"));
     _simClusters = consumes<std::vector<SimCluster> >(edm::InputTag("mix","MergedCaloTruth"));
-    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"));