Merge pull request #19209 from bsunanda/Phase2-hgx86

Phase2-hgx86 Fix the bug for overwriting (backport from 9_2_X #19198)
cms-sw · Jun 15, 2017 · 7807fa5 · 7807fa5
2 parents 0f621cf + 9b8b88a
commit 7807fa5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/RecoLocalCalo/HGCalRecAlgos/interface/HGCalImagingAlgo.h b/RecoLocalCalo/HGCalRecAlgos/interface/HGCalImagingAlgo.h
@@ -112,10 +112,10 @@ HGCalImagingAlgo(const std::vector<double>& vecDeltas_in, double kappa_in, doubl
         verbosity(the_verbosity),
         initialized(false),
         points(2*(maxlayer+1)),
-        minpos(2*(maxlayer+1),{
+	minpos(2*(maxlayer+1),{
                 {0.0f,0.0f}
         }),
-        maxpos(2*(maxlayer+1),{ {0.0f,0.0f} })
+	maxpos(2*(maxlayer+1),{ {0.0f,0.0f} })
 {
 }
 
@@ -164,12 +164,11 @@ static const unsigned int maxlayer = 52;
 
 
 private:
-
 // last layer per subdetector
 static const unsigned int lastLayerEE = 28;
 static const unsigned int lastLayerFH = 40;
 // maximum number of wafers per Layer: 666 (V7), 794 (V8)
-static const unsigned int maxNumberOfWafersPerLayer = 794;
+static const unsigned int maxNumberOfWafersPerLayer = 796;
 
 // The two parameters used to identify clusters
 std::vector<double> vecDeltas;

diff --git a/RecoLocalCalo/HGCalRecAlgos/src/HGCalImagingAlgo.cc b/RecoLocalCalo/HGCalRecAlgos/src/HGCalImagingAlgo.cc
@@ -568,8 +568,8 @@ void HGCalImagingAlgo::computeThreshold() {
 	  else if( thickness>299. && thickness<301. ) thickIndex=2;
 	  else assert( thickIndex>0 && "ERROR - silicon thickness has a nonsensical value" );
 	  float sigmaNoise = 0.001 * fcPerEle * nonAgedNoises[thickIndex] * dEdXweights[layer] / (fcPerMip[thickIndex] * thicknessCorrection[thickIndex]);
-	  thresholds[layer-1][wafer]=sigmaNoise*ecut;
-	  v_sigmaNoise[layer-1][wafer] = sigmaNoise;
+          thresholds[layer-1][wafer]=sigmaNoise*ecut;
+          v_sigmaNoise[layer-1][wafer] = sigmaNoise;
 	}
     }