Changeset 4a0d9d5 in git for modules/SimpleCalorimeter.cc

Timestamp:

Jun 6, 2016, 4:47:16 PM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

bd0a1aa

Parents:

4406bf8 (diff), 740d430 (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 branch 'master' into dev_01

File:

• modules/SimpleCalorimeter.cc (modified) (1 diff)

modules/SimpleCalorimeter.cc

@@ -504 +504 @@
     tower->Eem = (!fIsEcal) ? 0 : energy;
     tower->Ehad = (fIsEcal) ? 0 : energy;
-
+    
     tower->Momentum.SetPtEtaPhiE(pt, eta, phi, energy);
+    
+    tower->PID = (fIsEcal) ? 22 : 0;
+    
     fEFlowTowerOutputArray->Add(tower);
   }