From 779b8fe4e8b78d512908a645cf416bea47f32493 Mon Sep 17 00:00:00 2001
From: Sunanda <sunanda.banerjee@cern.ch>
Date: Thu, 8 Sep 2016 16:24:14 +0200
Subject: [PATCH] Fix a few things more

---
 .../HGCalCommonData/data/TB161/8Module/hgcalEE.xml   | 10 +++++-----
 SimG4CMS/HGCalTestBeam/plugins/HGCalTBAnalyzer.cc    | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Geometry/HGCalCommonData/data/TB161/8Module/hgcalEE.xml b/Geometry/HGCalCommonData/data/TB161/8Module/hgcalEE.xml
index 0dc4c888338d1..81becdad2ea1a 100644
--- a/Geometry/HGCalCommonData/data/TB161/8Module/hgcalEE.xml
+++ b/Geometry/HGCalCommonData/data/TB161/8Module/hgcalEE.xml
@@ -28,22 +28,22 @@
       EEAirGap6, EEAirGap7, EEAirGap8, EEAirGap9, EEAirGap10, EEAirGap11, 
       EEAirGap12, EEAirGap13, EEAirGap14, EEHeatShield2</Vector>
     <Vector name="Thickness" type="numeric" nEntries="26">
-      44.9*mm, 8.0*mm, 4.0*mm, 2.0*mm, 0.0*mm, 2.2*mm, 1.6*mm, 0.6*mm, 6.0*mm,
+      44.9*mm, 8.0*mm, 4.0*mm, 2.0*mm, 0.0*mm, 2.2*mm, 1.2*mm, 0.6*mm, 6.0*mm,
       2.0*mm,  0.10*mm, 1.0*mm, 3.2*mm, 4.7*mm, 5.0*mm, 6.0*mm, 13.7*mm, 
       17.8*mm, 18.8*mm, 19.4*mm, 19.6*mm, 20.3*mm, 22.3*mm, 23.5*mm, 24.4*mm,
-      3.0*mm </Vector>
+      12.0*mm </Vector>
     <Vector name="Layers" type="numeric" nEntries="6"> 
        16, 9, 9, 9, 14, 18</Vector>
     <Vector name="LayerThick" type="numeric" nEntries="6"> 
-      54.9*mm, 56.7*mm, 54.9*mm, 43.4*mm, 55.2*mm, 66.0*mm
+      54.9*mm, 56.7*mm, 54.9*mm, 43.0*mm, 60.8*mm, 72.0*mm
     </Vector>
     <Vector name="LayerType" type="numeric" nEntries="75"> 
       2, 14, 2, 14, 2, 14, 2, 14, 2, 15, 8, 7, 9, 10, 10, 10, 
       23, 3, 22, 8, 7, 9, 10, 10, 10, 
       24, 3, 20, 8, 7, 9, 10, 10, 10,
       17, 3, 16, 8, 6, 9, 10, 10, 10,
-      19, 3, 19, 10, 10, 10, 9, 6, 8, 5, 9, 10, 10, 10,
-      18, 3, 21, 10, 10, 10, 9, 5, 25, 12, 3, 13, 25, 5, 9, 10, 10, 10 
+      19, 3, 19, 10, 10, 10, 9, 6, 25, 5, 9, 10, 10, 10,
+      18, 3, 21, 10, 10, 10, 9, 5, 8, 12, 3, 13, 8, 5, 9, 10, 10, 10 
     </Vector>
     <Vector name="LayerSense" type="numeric" nEntries="75">
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 
diff --git a/SimG4CMS/HGCalTestBeam/plugins/HGCalTBAnalyzer.cc b/SimG4CMS/HGCalTestBeam/plugins/HGCalTBAnalyzer.cc
index a1ec26e784431..a7a197593eb43 100644
--- a/SimG4CMS/HGCalTestBeam/plugins/HGCalTBAnalyzer.cc
+++ b/SimG4CMS/HGCalTestBeam/plugins/HGCalTBAnalyzer.cc
@@ -560,14 +560,14 @@ void HGCalTBAnalyzer::analyzeSimHits (int type, std::vector<PCaloHit>& hits) {
 #endif
     hSimHitLng1_[type]->Fill(layer,energy);
     if (type == 0) {
-      if (layer<(int)(hSimHitLayEn2E_.size())) {
-	simHitLayEn2E[layer] = energy;
-	hSimHitLayEn2E_[layer]->Fill(energy);
+      if (layer-1 < (int)(hSimHitLayEn2E_.size())) {
+	simHitLayEn2E[layer-1] = energy;
+	hSimHitLayEn2E_[layer-1]->Fill(energy);
       }
     } else {
-      if (layer<(int)(hSimHitLayEn2H_.size())) {
-	simHitLayEn2H[layer] = energy;
-	hSimHitLayEn2H_[layer]->Fill(energy);
+      if (layer-1 < (int)(hSimHitLayEn2H_.size())) {
+	simHitLayEn2H[layer-1] = energy;
+	hSimHitLayEn2H_[layer-1]->Fill(energy);
       }
     }
   }