Changeset 3297

Timestamp:

01/26/12 21:07:25 (4 months ago)

Author:

erkn

Message:

added a warning when dist!=1

dist is not used anymore. It will be removed in upcoming releases.
for the time being a warning is issued if dist != 1

Files:

• branches/mcxtrace-1.0/xlib/sources/Source_gaussian.comp (modified) (2 diffs)

branches/mcxtrace-1.0/xlib/sources/Source_gaussian.comp

@@ -103 +103 @@
     prms.pmul=1.0/(double)mcget_ncount();
   }
+  if (dist!=1){
+    fprintf(stderr,"Source_gaussian (%s): parameter dist is superfluous and is ignored. It will be removed in future releases of McXtrace - please update your instrument file.\n");
+  } 
+
 %}
 
@@ -147 +151 @@
 
   // Beam's footprint at a dist calculation
-  spX=sqrt(sig_x*sig_x+sigPr_x*sigPr_x*dist*dist);
-  spY=sqrt(sig_y*sig_y+sigPr_y*sigPr_y*dist*dist);
+  spX=sqrt(sig_x*sig_x+sigPr_x*sigPr_x);
+  spY=sqrt(sig_y*sig_y+sigPr_y*sigPr_y);
   
   // targeted area calculation
   x1=randnorm()*spX;
   y1=randnorm()*spY;
-  z1=dist;
+  z1=1;
   
   dx=x1-x;
   dy=y1-y;
-  dz=sqrt(dx*dx+dy*dy+dist*dist);
+  dz=sqrt(dx*dx+dy*dy+1);
   
   kx=(k*dx)/dz;
   ky=(k*dy)/dz;
-  kz=(k*dist)/dz;
+  kz=(k)/dz;
   
   // Guassian distribution at a distance