Changes in modules/SimpleCalorimeter.cc [fc6300d:e5767b57] in git

File:

• modules/SimpleCalorimeter.cc (modified) (4 diffs)

modules/SimpleCalorimeter.cc

@@ -150 +150 @@
   fEnergySignificanceMin = GetDouble("EnergySignificanceMin", 0.0);
 
-  // flag that says if current calo is Ecal of Hcal (will then fill correct values of Eem and Ehad)
-  fIsEcal = GetBool("IsEcal", false);
-
   // switch on or off the dithering of the center of calorimeter towers
-  fSmearTowerCenter = GetBool("SmearTowerCenter", true);
+  fDitherTowerCenter = GetBool("DitherTowerCenter", true);
 
   // read resolution formulas
@@ -412 +409 @@
   if(energy < fEnergyMin || energy < fEnergySignificanceMin*sigma) energy = 0.0;
 
-  if(fSmearTowerCenter)
+  if(fDitherTowerCenter)
   {
     eta = gRandom->Uniform(fTowerEdges[0], fTowerEdges[1]);
@@ -427 +424 @@
   fTower->Position.SetPtEtaPhiE(1.0, eta, phi, time);
   fTower->Momentum.SetPtEtaPhiE(pt, eta, phi, energy);
-
-  fTower->Eem = (!fIsEcal) ? 0 : energy;
-  fTower->Ehad = (fIsEcal) ? 0 : energy; 
 
   fTower->Edges[0] = fTowerEdges[0];
@@ -453 +447 @@
     pt = energy / TMath::CosH(eta);
 
-    tower->Eem = (!fIsEcal) ? 0 : energy;
-    tower->Ehad = (fIsEcal) ? 0 : energy; 
-
     tower->Momentum.SetPtEtaPhiE(pt, eta, phi, energy);
     fEFlowTowerOutputArray->Add(tower);