Changeset 3052 for branches/mcstas-1.x

Timestamp:

04/08/11 15:12:44 (14 months ago)

Author:

erkn

Message:

fixed potential crash (ticket #43)

Pol_simpleBfield set the precession routine pointer to NULL when
exiting the magnetic region. other components rely on its validity.

Files:

• branches/mcstas-1.x/lib/optics/Pol_simpleBfield.comp (modified) (4 diffs)

branches/mcstas-1.x/lib/optics/Pol_simpleBfield.comp

@@ -145 +145 @@
   Coords localG = rot_apply(ROT_A_CURRENT_COMP, coords_set(0,-GRAVITY,0));
 
+  if(!mcMagnetPrecession) 
+    mcMagnetPrecession = &SimpleNumMagnetPrecession;
+
   if(mcMagnet==0) {
     
@@ -154 +157 @@
     parPtr[4] = yh;
     parPtr[5] = length;
-    MAGNET_ON;
+    //MAGNET_ON;
   } else {    
-    MAGNET_OFF;
+    //MAGNET_OFF;
   }
 
@@ -181 +184 @@
     MAGNET_ON;
     mcMagneticField = fieldFunction;
-    mcMagnetPrecession = &SimpleNumMagnetPrecession;
     mcMagnetData = parPtr;
-
     rot_copy(mcMagnetRot, ROT_A_CURRENT_COMP);
     mcMagnetPos = coords_scale(POS_A_CURRENT_COMP, 1.0);
-
-    // i=0: Bx parameter 
-    // i=1: By parameter
-    // i=2: Bz parameter
-    // i=3: Magnet width
-    // i=4: Magnet height
-    // i=5: Magnet length
-    
   } else {
     
@@ -201 +194 @@
     MAGNET_OFF;
     mcMagneticField = NULL;
-    mcMagnetPrecession = NULL;
     mcMagnetData = NULL;
     // Here, we ought to clean up mcMagnet(Rot,Pos)
   }
-
-  //  printf("Exit z: %f, mcmagnet: %d\n", z, mcmagnet);
-
-  %}
-
-/* This section is executed when the simulation ends (C code). Other    */
-/* optional sections are : SAVE                                         */
+%}
+
 FINALLY
 %{