Changeset d77b51d in git for display/DelphesBranchElement.cc

Timestamp:

Sep 29, 2015, 2:08:10 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

a98c7ef

Parents:

d870fc5 (diff), 06ec139 (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.

Message:

Merge remote-tracking branch 'upstream/master'

File:

• display/DelphesBranchElement.cc (modified) (6 diffs)

display/DelphesBranchElement.cc

@@ -155 +155 @@
   trkProp->SetMaxR(tkRadius_);
   trkProp->SetMaxZ(tkHalfLength_);
+  GenParticle *particle;
   if(type=="Track") { // CASE 1: TRACKS
     Track *track;
@@ -161 +162 @@
                    track->P4().Px(), track->P4().Py(),
                    track->P4().Pz(), track->P4().E(),
-                   track->X, track->Y, track->Z, 0.0);
+                   track->X/10.0, track->Y/10.0, track->Z/10.0, track->T/10.0);
       eveTrack = new TEveTrack(&pb, counter, trkProp);
       eveTrack->SetName(Form("%s [%d]", pb.GetName(), counter++));
@@ -173 +174 @@
     Electron *electron;
     while((electron = (Electron *) itTrack.Next())) {
+      particle = (GenParticle*) electron->Particle.GetObject();
       TParticle pb(electron->Charge<0?11:-11, 1, 0, 0, 0, 0,
                    electron->P4().Px(), electron->P4().Py(),
                    electron->P4().Pz(), electron->P4().E(),
-                   0., 0., 0., 0.);
+                   particle->X/10.0, particle->Y/10.0, particle->Z/10.0, particle->T/10.0);
       eveTrack = new TEveTrack(&pb, counter, trkProp);
       eveTrack->SetName(Form("%s [%d]", pb.GetName(), counter++));
@@ -188 +190 @@
     Muon *muon;
     while((muon = (Muon *) itTrack.Next())) {
+      particle = (GenParticle*) muon->Particle.GetObject();
       TParticle pb(muon->Charge<0?13:-13, 1, 0, 0, 0, 0,
                    muon->P4().Px(), muon->P4().Py(),
                    muon->P4().Pz(), muon->P4().E(),
-                   0., 0., 0., 0.);
+                   particle->X/10.0, particle->Y/10.0, particle->Z/10.0, particle->T/10.0);
       eveTrack = new TEveTrack(&pb, counter, trkProp);
       eveTrack->SetName(Form("%s [%d]", pb.GetName(), counter++));
@@ -206 +209 @@
                    photon->P4().Px(), photon->P4().Py(),
                    photon->P4().Pz(), photon->P4().E(),
-                   0., 0., 0., 0.);
+                   0.0, 0.0, 0.0, 0.0);
       eveTrack = new TEveTrack(&pb, counter, trkProp);
       eveTrack->SetName(Form("%s [%d]", pb.GetName(), counter++));
@@ -223 +226 @@
                    particle->P4().Px(), particle->P4().Py(),
                    particle->P4().Pz(), particle->P4().E(),
-                   particle->X, particle->Y, particle->Z, particle->T);
+                   particle->X/10.0, particle->Y/10.0, particle->Z/10.0, particle->T/10.0);
       eveTrack = new TEveTrack(&pb, counter, trkProp);
       eveTrack->SetName(Form("%s [%d]", pb.GetName(), counter++));