Changeset 1535 for trunk/MagicSoft/Simulation/Detector/ReflectorII/ph2cph.c

Timestamp:

10/09/02 19:15:28 (22 years ago)

Author:

bigongia

Message:

Version 0.6. Changed output format: added run header, changed event header,
             added ascii parameter files attached at the end of every output
             file to keep all info.

File:

• trunk/MagicSoft/Simulation/Detector/ReflectorII/ph2cph.c (modified) (5 diffs)

trunk/MagicSoft/Simulation/Detector/ReflectorII/ph2cph.c

@@ -94 +94 @@
   float sx, sy;
   float t1, t2;
+  float dummy = 0.;
+
 
   void makeOmega(float theta, float phi);
@@ -255 +257 @@
 
   } else {
-          
-    d = (float) sqrt( b*b - 4.0*a*c );
-          
+
+    /* Introduce positiveness check, AM 3/7/2002 */
+
+    dummy = b*b - 4.0*a*c;
+
+    if (dummy < 0.)           /* No intersection */
+      return 2;
+
+    d = (float) sqrt(dummy);
+
     /*  two possible values for z */ 
           
@@ -276 +285 @@
   xcut[0] = xCT[0] + rCT[0]/rCT[2]*(xcut[2]-xCT[2]);
   xcut[1] = xCT[1] + rCT[1]/rCT[2]*(xcut[2]-xCT[2]);
+      
 
   /* CBC */
@@ -285 +295 @@
   sx = Lin2Curv( xcut[0] );
   sy = Lin2Curv( xcut[1] );
-          
+
   /* CBC */
   Debug("@4 sx sy %f %f\n", sx, sy);
@@ -310 +320 @@
     if (distmirr2 < distmirr) {
       i_mirror = i;
-      distmirr = distmirr2;
+      distmirr  = distmirr2;
     }
   }