Changes in modules/TreeWriter.cc [2600216:839deb7] in git

File:

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

modules/TreeWriter.cc

@@ -215 +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();
@@ -244 +237 @@
 
   const Double_t c_light = 2.99792458E8;
- 
-  Double_t x, y, z, t, xError, yError, zError, sigma, sumPT2, btvSumPT2, genDeltaZ, genSumPT2;
-  UInt_t index, ndf;
- 
+
   // loop over all vertices
   iterator.Reset();
   while((candidate = static_cast<Candidate*>(iterator.Next())))
   {
-   
-    index = candidate->ClusterIndex;
-    ndf = candidate->ClusterNDF;
-    sigma = candidate->ClusterSigma;
-    sumPT2 = candidate->SumPT2;
-    btvSumPT2 = candidate->BTVSumPT2;
-    genDeltaZ = candidate->GenDeltaZ;
-    genSumPT2 = candidate->GenSumPT2;
-
-    x = candidate->Position.X ();
-    y = candidate->Position.Y ();
-    z = candidate->Position.Z ();
-    t = candidate->Position.T()*1.0E-3/c_light;
-  
-    xError = candidate->PositionError.X ();
-    yError = candidate->PositionError.Y ();
-    zError = candidate->PositionError.Z ();
+    const TLorentzVector &position = candidate->Position;
 
     entry = static_cast<Vertex*>(branch->NewEntry());
 
-    entry->Index = index;
-    entry->NDF = ndf;
-    entry->Sigma = sigma;
-    entry->SumPT2 = sumPT2;
-    entry->BTVSumPT2 = btvSumPT2;
-    entry->GenDeltaZ = genDeltaZ;
-    entry->GenSumPT2 = genSumPT2;
-  
-    entry->X = x;
-    entry->Y = y;
-    entry->Z = z;
-    entry->T = t;
-    
-    entry->ErrorX = xError;
-    entry->ErrorY = yError;
-    entry->ErrorZ = zError;
-  }
-}
-
+    entry->X = position.X();
+    entry->Y = position.Y();
+    entry->Z = position.Z();
+    entry->T = position.T()*1.0E-3/c_light;
+  }
+}
 
 //------------------------------------------------------------------------------
@@ -330 +291 @@
     entry->ZOuter = position.Z();
     entry->TOuter = position.T()*1.0E-3/c_light;
- 
-    entry->L = candidate->L;
-  
-    entry->D0            = candidate->D0;
-    entry->ErrorD0       = candidate->ErrorD0;
-    entry->DZ            = candidate->DZ;
-    entry->ErrorDZ       = candidate->ErrorDZ;
-    entry->P             = candidate->P;
-    entry->ErrorP        = candidate->ErrorP;
-    entry->PT            = candidate->PT;
-    entry->ErrorPT       = candidate->ErrorPT;
-    entry->CtgTheta      = candidate->CtgTheta;
-    entry->ErrorCtgTheta = candidate->ErrorCtgTheta;
-    entry->Phi           = candidate->Phi;
-    entry->ErrorPhi      = candidate->ErrorPhi; 
-    
+
+    entry->Dxy = candidate->Dxy;
+    entry->SDxy = candidate->SDxy ;
     entry->Xd = candidate->Xd;
     entry->Yd = candidate->Yd;
@@ -359 +307 @@
 
     entry->Eta = eta;
-    
+    entry->Phi = momentum.Phi();
+    entry->PT = pt;
+
     particle = static_cast<Candidate*>(candidate->GetCandidates()->At(0));
     const TLorentzVector &initialPosition = particle->Position;
@@ -369 +319 @@
 
     entry->Particle = particle;
-
-    entry->VertexIndex = candidate->ClusterIndex;
-
   }
 }