diff --git a/[refs] b/[refs] index 9a85cb3657537..30ca7421c5ae1 100644 --- a/[refs] +++ b/[refs] @@ -1,3 +1,3 @@ --- refs/heads/gh-pages: ac155dadd83efa75cad55c0508a57a2b9dd3d66c -"refs/heads/CMSSW_7_1_X": 04baab190438c7dce51464fdd8897356acf9fcd4 +"refs/heads/CMSSW_7_1_X": 8b66d51a4cc1bbbe783fe9ae2010d00111390e55 diff --git a/trunk/RecoEcal/EgammaClusterAlgos/src/HybridClusterAlgo.cc b/trunk/RecoEcal/EgammaClusterAlgos/src/HybridClusterAlgo.cc index 9283f53f1fa1f..165155f0c99e5 100644 --- a/trunk/RecoEcal/EgammaClusterAlgos/src/HybridClusterAlgo.cc +++ b/trunk/RecoEcal/EgammaClusterAlgos/src/HybridClusterAlgo.cc @@ -328,9 +328,9 @@ void HybridClusterAlgo::mainSearch(const EcalRecHitCollection* hits, const CaloS //std::cout << "idxPeak, phiSteps " << idxPeak << ", " << phiSteps << std::endl; e5x5 = lump; //std::cout << "lump " << e5x5 << std::endl; - if (abs(idxPeak + 1) < dominoEnergy.size()) e5x5 += dominoEnergy[idxPeak + 1]; + if (abs(idxPeak + 1) < (int)dominoEnergy.size()) e5x5 += dominoEnergy[idxPeak + 1]; //std::cout << "+1 " << e5x5 << std::endl; - if (abs(idxPeak + 2) < dominoEnergy.size()) e5x5 += dominoEnergy[idxPeak + 2]; + if (abs(idxPeak + 2) < (int)dominoEnergy.size()) e5x5 += dominoEnergy[idxPeak + 2]; //std::cout << "+2 " << e5x5 << std::endl; if (abs(idxPeak - 1) > 0) e5x5 += dominoEnergy[idxPeak - 1]; //std::cout << "-1 " << e5x5 << std::endl;