Changeset 1448 for trunk/WuerzburgSoft/Thomas/mphys/MParticle.cc

Timestamp:

07/26/02 14:49:58 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/WuerzburgSoft/Thomas/mphys/MParticle.cc (modified) (3 diffs)

trunk/WuerzburgSoft/Thomas/mphys/MParticle.cc

@@ -198 +198 @@
 
 MParticle::MParticle(ParticleType_t t, const char *name, const char *title)
-    : fPType(t), fZ(0), fR(0), fPhi(0), fTheta(0), fPsi(0)
+    : fPType(t), fZ(0), fR(0), fPhi(0), fTheta(0), fPsi(0), fX(0)
 {
     //
@@ -259 +259 @@
     x(2) = cos(fTheta);
 
-    x *= dr;
-
     // ------------------------------
 
     const Double_t R = RofZ(&fZ);
 
-    if (x(2) > R*cos(fTheta))
+    const Double_t dx = R - dr*x(2);
+
+    if (dx < 0)
     {
-        x *= R/dr;
+        dr = R/x(2); // R>0 --> x(2)>0
         rc = kFALSE;
     }
+    else
+        fX += dr*(1.-x(2));
+
+    x  *= dr;
 
     // ------------------------------
@@ -283 +287 @@
     r -= x;
 
-    fR   = sqrt(r(0)*r(0)+r(1)*r(1));
-    fPhi = atan2(r(1), r(0));
-    fZ   = ZofR(&r(2));
+    if (fR!=0)
+        fPhi = atan2(r(1), r(0));
+
+    fR = sqrt(r(0)*r(0)+r(1)*r(1));
+    fZ = ZofR(&r(2));
 
     return rc;