Changeset 4acf2fd in git for modules/TreeWriter.cc

Timestamp:

May 17, 2021, 6:05:38 PM (3 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

7dac4ea

Parents:

46d3442 (diff), 4afb18d (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:

Michele Selvaggi <michele.selvaggi@…> (05/17/21 18:05:38)

git-committer:

GitHub <noreply@…> (05/17/21 18:05:38)

Message:

Merge branch 'master' into master

File:

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

modules/TreeWriter.cc

@@ -356 +356 @@
     entry->DZ = candidate->DZ;
     entry->Nclusters = candidate->Nclusters;
+    entry->dNdx = candidate->dNdx;
 
     entry->ErrorP = candidate->ErrorP;
@@ -404 +405 @@
     entry->Mass = m;
 
-    particle = static_cast<Candidate *>(candidate->GetCandidates()->At(0));
-    const TLorentzVector &initialPosition = particle->Position;
+    //particle = static_cast<Candidate *>(candidate->GetCandidates()->At(0));
+    //const TLorentzVector &initialPosition = particle->Position;
+    const TLorentzVector &initialPosition = candidate->InitialPosition;
 
     entry->X = initialPosition.X();
@@ -411 +413 @@
     entry->Z = initialPosition.Z();
     entry->T = initialPosition.T() * 1.0E-3 / c_light;
+    entry->ErrorT =candidate-> ErrorT * 1.0E-3 / c_light;
 
     entry->Particle = particle;
@@ -509 +512 @@
     entry->DZ = candidate->DZ;
     entry->Nclusters = candidate->Nclusters;
+    entry->dNdx = candidate->dNdx;
 
     entry->ErrorP = candidate->ErrorP;
@@ -557 +561 @@
     entry->Mass = m;
 
-    particle = static_cast<Candidate *>(candidate->GetCandidates()->At(0));
-    const TLorentzVector &initialPosition = particle->Position;
+    //particle = static_cast<Candidate *>(candidate->GetCandidates()->At(0));
+    //const TLorentzVector &initialPosition = particle->Position;
+    const TLorentzVector &initialPosition = candidate->InitialPosition;
 
     entry->X = initialPosition.X();
@@ -564 +569 @@
     entry->Z = initialPosition.Z();
     entry->T = initialPosition.T() * 1.0E-3 / c_light;
+    entry->ErrorT = candidate-> ErrorT * 1.0E-3 / c_light;
 
     entry->VertexIndex = candidate->ClusterIndex;
@@ -574 +580 @@
     entry->Edges[3] = candidate->Edges[3];
 
-    entry->T = position.T() * 1.0E-3 / c_light;
+    //entry->T = position.T() * 1.0E-3 / c_light;
     entry->NTimeHits = candidate->NTimeHits;