Changeset dd514ae in git for modules/SimpleCalorimeter.cc

Timestamp:

Jun 10, 2015, 4:04:47 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

8707eeb

Parents:

6ec8d18 (diff), 9c491e1 (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:

resolve conflict in DelphesClasses.h

File:

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

modules/SimpleCalorimeter.cc

@@ -149 +149 @@
 
   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
@@ -425 +428 @@
   fTower->Momentum.SetPtEtaPhiE(pt, eta, phi, energy);
 
+  fTower->Eem = (!fIsEcal) ? 0 : energy;
+  fTower->Ehad = (fIsEcal) ? 0 : energy; 
+
   fTower->Edges[0] = fTowerEdges[0];
   fTower->Edges[1] = fTowerEdges[1];
@@ -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);