Merge pull request #2357 from willend/main

Add ‘allow_backprop’ as _particle member in McXtrace like McStas

Author: willend

mccode/src/cogen.c.in

@@ -1609,9 +1609,9 @@ void def_trace_section(struct instr_def *instr)
           "x", "y", "z", "vx", "vy", "vz",
           "t", "sx", "sy", "sz", "p", "mcgravitation", "mcMagnet", "allow_backprop", "_mctmp_a", "_mctmp_b", "_mctmp_c"
   #elif MCCODE_PROJECT == 2   /* xray */
-  #define NUM_STATE_PARS 15
+  #define NUM_STATE_PARS 16
           "x", "y", "z", "kx", "ky", "kz",
-          "phi", "t", "Ex", "Ey","Ez", "p", "_mctmp_a", "_mctmp_b", "_mctmp_c"
+          "phi", "t", "Ex", "Ey","Ez", "p", "allow_backprop", "_mctmp_a", "_mctmp_b", "_mctmp_c"
   #endif
   };
 
@@ -2448,11 +2448,11 @@ cogen_header(struct instr_def *instr, char *output_name)
   cout("  double sx,sy,sz; /* spin [0-1] */");
   cout("  int mcgravitation; /* gravity-state */");
   cout("  void *mcMagnet;    /* precession-state */");
-  cout("  int allow_backprop; /* allow backprop */");
 #elif MCCODE_PROJECT == 2 /* xray */
   cout("  double kx,ky,kz; /* wave-vector */");
   cout("  double phi, Ex,Ey,Ez; /* phase and electrical field */");
 #endif
+  cout("  int allow_backprop; /* allow backprop */");
   cout("  /* Generic Temporaries: */");
   cout("  /* May be used internally by components e.g. for special */");
   cout("  /* return-values from functions used in trace, thusreturned via */");

mccode/xlib/share/mcxtrace-r.c

@@ -51,8 +51,8 @@ _class_particle mcsetstate(double x, double y, double z, double kx, double ky, d
   mcphoton.Ez = Ez;
   mcphoton.p  = p;
   /*mcphoton.mcgravitation = mcgravitation;
-  mcphoton.mcMagnet = mcMagnet;
-  mcphoton.allow_backprop = mcallowbackprop;*/
+    mcphoton.mcMagnet = mcMagnet;*/
+  mcphoton.allow_backprop = mcallowbackprop;
   mcphoton._uid       = 0;
   mcphoton._index     = 1;
   mcphoton._absorbed  = 0;

mccode/xlib/share/mcxtrace-r.h

@@ -62,12 +62,12 @@
 
 #define ALLOW_BACKPROP \
   do { \
-    mcallowbackprop = 1; \
+    allow_backprop = 1; \
   } while(0)
 
 #define DISALLOW_BACKPROP \
   do { \
-    mcallowbackprop = 0; \
+    allow_backprop = 0; \
   } while(0)
 
 #define PROP_MAGNET(dt) \
@@ -111,7 +111,7 @@
 /* ADD: E. Farhi, Aug 6th, 2001 PROP_GRAV_DT propagation with acceleration. */
 #define PROP_GRAV_DT(dt, Ax, Ay, Az) \
   do { \
-    if(dt < 0 && mcallowbackprop == 0) { instrument->counter_AbsorbProp[INDEX_CURRENT_COMP]++; ABSORB; }\
+    if(dt < 0 && allow_backprop == 0) { instrument->counter_AbsorbProp[INDEX_CURRENT_COMP]++; ABSORB; }\
     if (mcMagnet) /*printf("Spin precession gravity\n")*/; \
     x  += vx*(dt) + (Ax)*(dt)*(dt)/2; \
     y  += vy*(dt) + (Ay)*(dt)*(dt)/2; \
@@ -154,7 +154,7 @@
     if(kx == 0) { ABSORB; }; \
     mc_k=sqrt(scalar_prod(kx,ky,kz,kx,ky,kz)); \
     mc_dl= -x * mc_k / kx; \
-    if(mc_dl<0 && mcallowbackprop==0) { ABSORB; };\
+    if(mc_dl<0 && allow_backprop==0) { ABSORB; };\
     PROP_DL(mc_dl); \
   } while(0)
 
@@ -170,7 +170,7 @@
     if(ky == 0) { ABSORB; }; \
     mc_k=sqrt(scalar_prod(kx,ky,kz,kx,ky,kz)); \
     mc_dl= -y * mc_k / ky; \
-    if(mc_dl<0 && mcallowbackprop==0) { ABSORB; };\
+    if(mc_dl<0 && allow_backprop==0) { ABSORB; };\
     PROP_DL(mc_dl); \
   } while(0)
 
@@ -186,7 +186,7 @@
     if(kz == 0) { ABSORB; }; \
     mc_k=sqrt(scalar_prod(kx,ky,kz,kx,ky,kz)); \
     mc_dl= -z * mc_k / kz; \
-    if(mc_dl<0 && mcallowbackprop==0) { ABSORB; };\
+    if(mc_dl<0 && allow_backprop==0) { ABSORB; };\
     PROP_DL(mc_dl); \
   } while(0)
 

mcxtrace-comps/astrox/MM_c.comp

@@ -104,7 +104,7 @@ SHARE
       if(kz == 0) { ABSORB; }; \
       mc_k=sqrt(scalar_prod(kx,ky,kz,kx,ky,kz)); \
       mc_dl= ((zz)-z) * mc_k / kz; \
-      if(mc_dl<0 && mcallowbackprop==0) { ABSORB; };\
+      if(mc_dl<0 && allow_backprop==0) { ABSORB; };\
       PROP_DL(mc_dl); \
     } while(0)
   #endif

mcxtrace-comps/astrox/MM_p.comp

@@ -115,7 +115,7 @@ SHARE
       if(kz == 0) { ABSORB; }; \
       mc_k=sqrt(scalar_prod(kx,ky,kz,kx,ky,kz)); \
       mc_dl= ((zz)-z) * mc_k / kz; \
-      if(mc_dl<0 && mcallowbackprop==0) { ABSORB; };\
+      if(mc_dl<0 && allow_backprop==0) { ABSORB; };\
       PROP_DL(mc_dl); \
     } while(0)
   #endif

mcxtrace-comps/astrox/Ring_c.comp

@@ -102,7 +102,7 @@ SHARE
       if(kz == 0) { ABSORB; }; \
       mc_k=sqrt(scalar_prod(kx,ky,kz,kx,ky,kz)); \
       mc_dl= ((zz)-z) * mc_k / kz; \
-      if(mc_dl<0 && mcallowbackprop==0) { ABSORB; };\
+      if(mc_dl<0 && allow_backprop==0) { ABSORB; };\
       PROP_DL(mc_dl); \
     } while(0)
   #endif

mcxtrace-comps/astrox/Ring_p.comp

@@ -112,7 +112,7 @@ SHARE
       if(kz == 0) { ABSORB; }; \
       mc_k=sqrt(scalar_prod(kx,ky,kz,kx,ky,kz)); \
       mc_dl= ((zz)-z) * mc_k / kz; \
-      if(mc_dl<0 && mcallowbackprop==0) { ABSORB; };\
+      if(mc_dl<0 && allow_backprop==0) { ABSORB; };\
       PROP_DL(mc_dl); \
     } while(0)
   #endif