Changeset 25291dd in git for modules/DualReadoutCalorimeter.cc

Timestamp:

Oct 17, 2020, 4:05:03 AM (4 years ago)

Author:

Stephen Sekula <sekula@…>

Children:

44f4a4e

Parents:

4e5ed02 (diff), be1a3be (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/DualReadoutCalorimeter.cc (modified) (1 diff)

modules/DualReadoutCalorimeter.cc

@@ -645 +645 @@
     //cout<<"Creating tower with Pt, Eta, Phi, Energy: "<<pt<<","<<eta<<","<<phi<<","<<neutralEnergy<<endl;
     tower->Momentum.SetPtEtaPhiE(pt, eta, phi, neutralEnergy);
-    tower->Eem = neutralEnergy;
-    tower->Ehad = 0.0;
-    tower->PID = 22;
-
+
+    // if no hadronic energy, use ECAL resolution 
+    if (fHCalTowerEnergy <= fHCalEnergyMin)
+    {
+      tower->Eem = neutralEnergy;
+      tower->Ehad = 0.0;
+      tower->PID = 22;
+    }
+
+    // if hadronic fraction > 0, use HCAL resolution 
+    else
+    {
+      tower->Eem = 0;
+      tower->Ehad = neutralEnergy;
+      tower->PID = 130;
+    }
+
+    fEFlowPhotonOutputArray->Add(tower);
     
-
-    fEFlowPhotonOutputArray->Add(tower);
-
 
     //clone tracks