Changeset 5eda6767 in git for modules/Calorimeter.cc

Timestamp:

Mar 18, 2021, 6:28:10 PM (4 years ago)

Author:

Michele Selvaggi <michele@…>

Branches:

master

Children:

cb80e6f

Parents:

d1678fd

Message:

fix calo tower position

File:

• modules/Calorimeter.cc (modified) (2 diffs)

modules/Calorimeter.cc

@@ -231 +231 @@
   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);
@@ -518 +523 @@
   }
 
-  r = TMath::Sqrt(fTower->Position.X()*fTower->Position.X()+fTower->Position.Y()*fTower->Position.Y());
+  // 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();
 
   if(sumWeight > 0.0)