Changeset 4acf2fd in git for modules/DualReadoutCalorimeter.cc

Timestamp:

May 17, 2021, 6:05:38 PM (3 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

7dac4ea

Parents:

46d3442 (diff), 4afb18d (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.

git-author:

Michele Selvaggi <michele.selvaggi@…> (05/17/21 18:05:38)

git-committer:

GitHub <noreply@…> (05/17/21 18:05:38)

Message:

Merge branch 'master' into master

File:

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

modules/DualReadoutCalorimeter.cc

@@ -613 +613 @@
     // create new photon tower
     tower = static_cast<Candidate*>(fTower->Clone());
-    pt =  neutralEnergy / TMath::CosH(eta);
+    pt = neutralEnergy / TMath::CosH(eta);
     //cout<<"Creating tower with Pt, Eta, Phi, Energy: "<<pt<<","<<eta<<","<<phi<<","<<neutralEnergy<<endl;
     tower->Momentum.SetPtEtaPhiE(pt, eta, phi, neutralEnergy);
@@ -623 +623 @@
       tower->Ehad = 0.0;
       tower->PID = 22;
-    }
-
+      fEFlowPhotonOutputArray->Add(tower);
+    }
     // if hadronic fraction > 0, use HCAL resolution
     else
@@ -631 +631 @@
       tower->Ehad = neutralEnergy;
       tower->PID = 130;
-    }
-
-    fEFlowPhotonOutputArray->Add(tower);
-
+      fEFlowNeutralHadronOutputArray->Add(tower);
+    }
 
     //clone tracks