Changes in modules/TreeWriter.cc [fd4b326:c614dd7] in git

File:

• modules/TreeWriter.cc (modified) (11 diffs)

modules/TreeWriter.cc

@@ -123 +123 @@
     fBranchMap.insert(make_pair(branch, make_pair(itClassMap->second, array)));
   }
-
-  param = GetParam("Info");
-  TString infoName;
-  Double_t infoValue;
-
-  size = param.GetSize();
-  for(i = 0; i < size / 2; ++i)
-  {
-    infoName = param[i * 2].GetString();
-    infoValue = param[i * 2 + 1].GetDouble();
-
-    AddInfo(infoName, infoValue);
-  }
 }
 
@@ -151 +138 @@
   it1.Reset();
   array->Clear();
-
+  
   while((candidate = static_cast<Candidate *>(it1.Next())))
   {
@@ -228 +215 @@
     entry->Pz = momentum.Pz();
 
+    entry->D0 = candidate->D0;
+    entry->DZ = candidate->DZ;
+    entry->P = candidate->P;
+    entry->PT = candidate->PT;
+    entry->CtgTheta = candidate->CtgTheta;
+    entry->Phi = candidate->Phi;
+
     entry->Eta = eta;
     entry->Phi = momentum.Phi();
@@ -320 +314 @@
   Candidate *particle = 0;
   Track *entry = 0;
-  Double_t pt, signz, cosTheta, eta, rapidity, p, ctgTheta, phi, m;
+  Double_t pt, signz, cosTheta, eta, rapidity, p, ctgTheta, phi;
   const Double_t c_light = 2.99792458E8;
 
@@ -354 +348 @@
 
     entry->D0 = candidate->D0;
+    entry->ErrorD0 = candidate->ErrorD0;
     entry->DZ = candidate->DZ;
+    entry->ErrorDZ = candidate->ErrorDZ;
 
     entry->ErrorP = candidate->ErrorP;
     entry->ErrorPT = candidate->ErrorPT;
-
-    // diagonal covariance matrix terms
-    entry->ErrorD0 = candidate->ErrorD0;
-    entry->ErrorC = candidate->ErrorC;
+    entry->ErrorCtgTheta = candidate->ErrorCtgTheta;
     entry->ErrorPhi = candidate->ErrorPhi;
-    entry->ErrorDZ = candidate->ErrorDZ;
-    entry->ErrorCtgTheta = candidate->ErrorCtgTheta;
-
-    // add some offdiagonal covariance matrix elements
-    entry->ErrorD0Phi          = candidate->TrackCovariance(0,1);
-    entry->ErrorD0C            = candidate->TrackCovariance(0,2);
-    entry->ErrorD0DZ           = candidate->TrackCovariance(0,3);
-    entry->ErrorD0CtgTheta     = candidate->TrackCovariance(0,4);
-    entry->ErrorPhiC           = candidate->TrackCovariance(1,2);
-    entry->ErrorPhiDZ          = candidate->TrackCovariance(1,3);
-    entry->ErrorPhiCtgTheta    = candidate->TrackCovariance(1,4);
-    entry->ErrorCDZ            = candidate->TrackCovariance(2,3);
-    entry->ErrorCCtgTheta      = candidate->TrackCovariance(2,4);
-    entry->ErrorDZCtgTheta     = candidate->TrackCovariance(3,4);
 
     entry->Xd = candidate->Xd;
@@ -387 +366 @@
     p = momentum.P();
     phi = momentum.Phi();
-    m = momentum.M();
     ctgTheta = (TMath::Tan(momentum.Theta()) != 0) ? 1 / TMath::Tan(momentum.Theta()) : 1e10;
 
@@ -400 +378 @@
     entry->Phi = phi;
     entry->CtgTheta = ctgTheta;
-    entry->C = candidate->C;
-    entry->Mass = m;
 
     particle = static_cast<Candidate *>(candidate->GetCandidates()->At(0));
@@ -472 +448 @@
   Candidate *particle = 0;
   ParticleFlowCandidate *entry = 0;
-  Double_t e, pt, signz, cosTheta, eta, rapidity, p, ctgTheta, phi, m;
+  Double_t e, pt, signz, cosTheta, eta, rapidity, p, ctgTheta, phi;
   const Double_t c_light = 2.99792458E8;
 
@@ -506 +482 @@
 
     entry->D0 = candidate->D0;
+    entry->ErrorD0 = candidate->ErrorD0;
     entry->DZ = candidate->DZ;
+    entry->ErrorDZ = candidate->ErrorDZ;
 
     entry->ErrorP = candidate->ErrorP;
     entry->ErrorPT = candidate->ErrorPT;
     entry->ErrorCtgTheta = candidate->ErrorCtgTheta;
-
-
-    // diagonal covariance matrix terms
-
-    entry->ErrorD0 = candidate->ErrorD0;
-    entry->ErrorC = candidate->ErrorC;
     entry->ErrorPhi = candidate->ErrorPhi;
-    entry->ErrorDZ = candidate->ErrorDZ;
-    entry->ErrorCtgTheta = candidate->ErrorCtgTheta;
-
-    // add some offdiagonal covariance matrix elements
-    entry->ErrorD0Phi          = candidate->TrackCovariance(0,1);
-    entry->ErrorD0C            = candidate->TrackCovariance(0,2);
-    entry->ErrorD0DZ           = candidate->TrackCovariance(0,3);
-    entry->ErrorD0CtgTheta     = candidate->TrackCovariance(0,4);
-    entry->ErrorPhiC           = candidate->TrackCovariance(1,2);
-    entry->ErrorPhiDZ          = candidate->TrackCovariance(1,3);
-    entry->ErrorPhiCtgTheta    = candidate->TrackCovariance(1,4);
-    entry->ErrorCDZ            = candidate->TrackCovariance(2,3);
-    entry->ErrorCCtgTheta      = candidate->TrackCovariance(2,4);
-    entry->ErrorDZCtgTheta     = candidate->TrackCovariance(3,4);
 
     entry->Xd = candidate->Xd;
@@ -543 +501 @@
     p = momentum.P();
     phi = momentum.Phi();
-    m = momentum.M();
     ctgTheta = (TMath::Tan(momentum.Theta()) != 0) ? 1 / TMath::Tan(momentum.Theta()) : 1e10;
 
@@ -552 +509 @@
     entry->Phi = phi;
     entry->CtgTheta = ctgTheta;
-    entry->C = candidate->C;
-    entry->Mass = m;
 
     particle = static_cast<Candidate *>(candidate->GetCandidates()->At(0));