FastSim HF timing from SL

cms-sw · Mar 10, 2016 · 93238b0 · 93238b0
1 parent 5770125
commit 93238b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/FastSimulation/Calorimetry/src/CalorimetryManager.cc b/FastSimulation/Calorimetry/src/CalorimetryManager.cc
@@ -1318,14 +1318,14 @@ void CalorimetryManager::updateHCAL(const std::map<CaloHitID,float>& hitMap, int
       else if (hdetid.subdetId()== HcalForward){
         if(useShowerLibrary) {
  	  if(useCorrectionSL) {
-             if(hdetid.depth()== 1) energy *= hfcorrEm[hdetid.ietaAbs()-29];
-             if(hdetid.depth()== 2) energy *= hfcorrHad[hdetid.ietaAbs()-29];
+             if(hdetid.depth()== 1) energy *= hfcorrEm[hdetid.ietaAbs()-ietaShiftHF_];
+             if(hdetid.depth()== 2) energy *= hfcorrHad[hdetid.ietaAbs()-ietaShiftHF_];
           }
 	} else {
 	  if(hdetid.depth()== 1) energy *= samplingHF_[0];
 	  if(hdetid.depth()== 2) energy *= samplingHF_[1];
+          time = timeShiftHF_[hdetid.ietaAbs()-ietaShiftHF_];
 	} 
-	time = timeShiftHF_[hdetid.ietaAbs()-ietaShiftHF_];
       }
       else if (hdetid.subdetId()== HcalOuter){
 	energy /= samplingHO_[hdetid.ietaAbs()-1];

diff --git a/FastSimulation/ShowerDevelopment/src/FastHFShowerLibrary.cc b/FastSimulation/ShowerDevelopment/src/FastHFShowerLibrary.cc
@@ -95,7 +95,7 @@ void FastHFShowerLibrary::recoHFShowerLibrary(const FSimTrack& myTrack) {
   double tSlice = 0.1*vertex.mag()/29.98;
 
   std::vector<HFShowerLibrary::Hit> hits =
-    hfshower->fillHits(vertex,direction,parCode,eGen,ok,weight,false,tSlice);
+    hfshower->fillHits(vertex,direction,parCode,eGen,ok,weight,tSlice,false);
 
   for (unsigned int i=0; i<hits.size(); ++i) {
     G4ThreeVector pos = hits[i].position;