Changes in modules/SimpleCalorimeter.cc [5eda6767:341014c] in git

File:

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

modules/SimpleCalorimeter.cc

@@ -208 +208 @@
   fItParticleInputArray->Reset();
   number = -1;
-  fTowerRmax=0.;
   while((particle = static_cast<Candidate *>(fItParticleInputArray->Next())))
   {
     const TLorentzVector &particlePosition = particle->Position;
     ++number;
-
-    // compute maximum radius (needed in FinalizeTower to assess whether barrel or endcap tower)
-    if (particlePosition.Perp() > fTowerRmax)
-      fTowerRmax=particlePosition.Perp();
 
     pdgCode = TMath::Abs(particle->PID);
@@ -399 +394 @@
     fTowerEnergy += energy;
 
-    fTowerTime += energy * energy * position.T(); //sigma_t ~ 1/E
-    fTowerTimeWeight += energy * energy;
+    fTowerTime += energy * position.T();
+    fTowerTimeWeight += energy;
 
     fTower->AddCandidate(particle);
-    fTower->Position = position;
-
   }
 
@@ -416 +409 @@
 {
   Candidate *tower, *track, *mother;
-  Double_t energy, neutralEnergy, pt, eta, phi, r;
+  Double_t energy, neutralEnergy, pt, eta, phi;
   Double_t sigma, neutralSigma;
   Double_t time;
@@ -450 +443 @@
   pt = energy / TMath::CosH(eta);
 
-  // check whether barrel or endcap tower
-  if (fTower->Position.Perp() < fTowerRmax && TMath::Abs(eta) > 0.)
-    r = fTower->Position.Z()/TMath::SinH(eta);
-  else
-    r = fTower->Position.Pt();
-
-  fTower->Position.SetPtEtaPhiE(r, eta, phi, time);
+  fTower->Position.SetPtEtaPhiE(1.0, eta, phi, time);
   fTower->Momentum.SetPtEtaPhiE(pt, eta, phi, energy);
 
@@ -520 +507 @@
       track = static_cast<Candidate *>(track->Clone());
       track->AddCandidate(mother);
-      track->Momentum.SetPtEtaPhiM(track->Momentum.Pt()*rescaleFactor, track->Momentum.Eta(), track->Momentum.Phi(), track->Momentum.M());
+
+      track->Momentum *= rescaleFactor;
+
       fEFlowTrackOutputArray->Add(track);
     }