- Timestamp:
- Dec 9, 2014, 1:26:26 PM (10 years ago)
- 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. - Location:
- modules
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
modules/ParticlePropagator.cc
r01f457a re7e90df 158 158 if(TMath::Abs(q) < 1.0E-9 || TMath::Abs(fBz) < 1.0E-9) 159 159 { 160 // solve pt2*t^2 + 2*(px*x + py*y)*t +(fRadius2 - x*x - y*y) = 0160 // solve pt2*t^2 + 2*(px*x + py*y)*t - (fRadius2 - x*x - y*y) = 0 161 161 tmp = px*y - py*x; 162 162 discr2 = pt2*fRadius2 - tmp*tmp; -
modules/PileUpMergerPythia8.cc
r01f457a re7e90df 132 132 dphi = gRandom->Uniform(-TMath::Pi(), TMath::Pi()); 133 133 134 for(i = 0; i < fPythia->event.size(); ++i)134 for(i = 1; i < fPythia->event.size(); ++i) 135 135 { 136 136 Pythia8::Particle &particle = fPythia->event[i];
Note:
See TracChangeset
for help on using the changeset viewer.