Changeset d77b51d in git for modules/SimpleCalorimeter.cc

Timestamp:

Sep 29, 2015, 2:08:10 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

a98c7ef

Parents:

d870fc5 (diff), 06ec139 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'upstream/master'

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
-  fDitherTowerCenter = GetBool("DitherTowerCenter", true);
+  fSmearTowerCenter = GetBool("SmearTowerCenter", true);
 
   // read resolution formulas
@@ -409 +412 @@
   if(energy < fEnergyMin || energy < fEnergySignificanceMin*sigma) energy = 0.0;
 
-  if(fDitherTowerCenter)
+  if(fSmearTowerCenter)
   {
     eta = gRandom->Uniform(fTowerEdges[0], fTowerEdges[1]);
@@ -424 +427 @@
   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];
@@ -447 +453 @@
     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);