Changeset e7e90df in git for modules

Timestamp:

Dec 9, 2014, 1:26:26 PM (10 years ago)

Author:

Michele <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

49234af

Parents:

01f457a (diff), f6b6ee7 (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 branch 'master' into TestFastJet310b1

Conflicts:

Makefile
examples/Example1.C
examples/Example2.C
examples/Example3.C

Location:

modules

Files:

• ParticlePropagator.cc (modified) (1 diff)
• PileUpMergerPythia8.cc (modified) (1 diff)

modules/ParticlePropagator.cc

@@ -158 +158 @@
     if(TMath::Abs(q) < 1.0E-9 || TMath::Abs(fBz) < 1.0E-9)
     {
-      // solve pt2*t^2 + 2*(px*x + py*y)*t + (fRadius2 - x*x - y*y) = 0
+      // solve pt2*t^2 + 2*(px*x + py*y)*t - (fRadius2 - x*x - y*y) = 0
       tmp = px*y - py*x;
       discr2 = pt2*fRadius2 - tmp*tmp;

modules/PileUpMergerPythia8.cc

@@ -132 +132 @@
     dphi = gRandom->Uniform(-TMath::Pi(), TMath::Pi());
 
-    for(i = 0; i < fPythia->event.size(); ++i)
+    for(i = 1; i < fPythia->event.size(); ++i)
     {
       Pythia8::Particle &particle = fPythia->event[i];