Changeset eee94204 in git for modules

Timestamp:

Oct 15, 2021, 11:37:55 AM (3 years ago)

Author:

michele <michele.selvaggi@…>

Branches:

master

Children:

10c0ebe

Parents:

83e77ee

Message:

fixed bug introduced on calo tower postion

Location:

modules

Files:

• DualReadoutCalorimeter.cc (modified) (3 diffs)
• SimpleCalorimeter.cc (modified) (1 diff)

modules/DualReadoutCalorimeter.cc

@@ -510 +510 @@
   if(!fTower) return;
 
-
   // if no hadronic energy, use ECAL resolution
   if (fHCalTowerEnergy <= fHCalEnergyMin)
@@ -528 +527 @@
 
   energy = LogNormal(energy, sigma);
-  //cout<<energy<<","<<ecalEnergy<<","<<hcalEnergy<<endl;
 
   if(energy < fEnergyMin || energy < fEnergySignificanceMin*sigma) energy = 0.0;
@@ -561 +559 @@
 
   // check whether barrel or endcap tower
-  if ((fTowerRmax - fTower->Position.Perp()) < 1.e-06 && TMath::Abs(eta) > 0.)
+
+  // endcap
+  if (TMath::Abs(fTower->Position.Pt() - fTowerRmax) > 1.e-06 && TMath::Abs(eta) > 0.){
     r = fTower->Position.Z()/TMath::SinH(eta);
-  else
+  }
+  // barrel
+  else {
     r = fTower->Position.Pt();
+  }
 
   fTower->Position.SetPtEtaPhiE(r, eta, phi, time);
-
   fTower->Momentum.SetPtEtaPhiE(pt, eta, phi, energy);
   fTower->L = fTower->Position.Vect().Mag();
-  //cout<<"   tower pt, eta, phi, l, tof:  "<<fTower->Momentum.E()<<", "<<fTower->Momentum.Eta()<<", "<<fTower->Momentum.Phi()<<", "<<fTower->L<<", "<<fTower->Position.T()/2.99792458E2<<endl;
 
   fTower->Momentum.SetPtEtaPhiE(pt, eta, phi, energy);

modules/SimpleCalorimeter.cc

@@ -450 +450 @@
   pt = energy / TMath::CosH(eta);
 
-  // check whether barrel or endcap tower
-  if ((fTowerRmax - fTower->Position.Perp()) < 1.e-06 && TMath::Abs(eta) > 0.)
+  // endcap
+  if (TMath::Abs(fTower->Position.Pt() - fTowerRmax) > 1.e-06 && TMath::Abs(eta) > 0.){
     r = fTower->Position.Z()/TMath::SinH(eta);
-  else
+  }
+  // barrel
+  else {
     r = fTower->Position.Pt();
+  }
 
   fTower->Position.SetPtEtaPhiE(r, eta, phi, time);