Changeset 071a8d7 in git for modules

Timestamp:

Oct 2, 2020, 6:25:52 PM (4 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

47327f8

Parents:

f0f1443 (diff), e7cccc2 (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:

Aleksander Filip Żarnecki <zarnecki@…> (10/02/20 18:25:52)

git-committer:

GitHub <noreply@…> (10/02/20 18:25:52)

Message:

Merge pull request #2 from delphes/master

Fork update

Location:

modules

Files:

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

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

modules/TrackCovariance.cc

@@ -102 +102 @@
   while((candidate = static_cast<Candidate *>(fItInputArray->Next())))
   {
-    const TLorentzVector &candidatePosition = candidate->InitialPosition;
+
+    // converting to meters
+    const TLorentzVector &candidatePosition = candidate->InitialPosition*1e-03;
     const TLorentzVector &candidateMomentum = candidate->Momentum;
 
@@ -113 +115 @@
 
     candidate->Momentum.SetVectM(track.GetObsP(), mass);
-    candidate->InitialPosition.SetXYZT(track.GetObsX().X(),track.GetObsX().Y(),track.GetObsX().Z(),candidatePosition.T());
     
+    // converting back to mm
+    candidate->InitialPosition.SetXYZT(track.GetObsX().X()*1e03,track.GetObsX().Y()*1e03,track.GetObsX().Z()*1e03,candidatePosition.T()*1e03);
+
     // save full covariance 5x5 matrix internally (D0, phi, Curvature, dz, ctg(theta))
     candidate->TrackCovariance = track.GetCov();
@@ -123 +127 @@
     ct = track.GetObsPar()[4];
 
-    candidate->Xd = track.GetObsX().X();
-    candidate->Yd = track.GetObsX().Y();
-    candidate->Zd = track.GetObsX().Z();
+    candidate->Xd = track.GetObsX().X()*1e03;
+    candidate->Yd = track.GetObsX().Y()*1e03;
+    candidate->Zd = track.GetObsX().Z()*1e03;
     
-    candidate->D0 = track.GetObsPar()[0];
-    candidate->Phi = track.GetObsPar()[1];
-    candidate->C = track.GetObsPar()[2];
-    candidate->DZ = track.GetObsPar()[3];
+    candidate->D0       = track.GetObsPar()[0]*1e03;
+    candidate->Phi      = track.GetObsPar()[1];
+    candidate->C        = track.GetObsPar()[2]*1e03;
+    candidate->DZ       = track.GetObsPar()[3]*1e03;
     candidate->CtgTheta = track.GetObsPar()[4];
-    candidate->P  = track.GetObsP().Mag();
-    candidate->PT = pt;
-    candidate->Charge = q;
+    candidate->P        = track.GetObsP().Mag();
+    candidate->PT       = pt;
+    candidate->Charge   = q;
 
-    dd0       = TMath::Sqrt(track.GetCov()(0, 0)); 
-    ddz       = TMath::Sqrt(track.GetCov()(3, 3)); 
+    dd0       = TMath::Sqrt(track.GetCov()(0, 0))*1e03; 
+    ddz       = TMath::Sqrt(track.GetCov()(3, 3))*1e03; 
     dphi      = TMath::Sqrt(track.GetCov()(1, 1)); 
     dct       = TMath::Sqrt(track.GetCov()(4, 4)); 
     dpt       = 2 * TMath::Sqrt( track.GetCov()(2, 2))*pt*pt / (0.2998*fBz);
     dp        = TMath::Sqrt((1.+ct*ct)*dpt*dpt + 4*pt*pt*ct*ct*dct*dct/(1.+ct*ct)/(1.+ct*ct));
-    dC        = TMath::Sqrt(track.GetCov()(2, 2));
+    dC        = TMath::Sqrt(track.GetCov()(2, 2))*1e03;
 
     candidate->ErrorD0 = dd0;