Adaptation of MCPL_TOF_train to global/particle tof train

Author: willend

mcstas-comps/examples/Prototypes/ODIN_MCPL_TOF_train4/DiskChopper.comp

@@ -170,8 +170,8 @@ TRACE
   } else {
 
 	// Check whether each t_offset carried by the ray make it through
-	double weight_update = p/_particle->p_last_time_manipulation;
-	_particle->p_last_time_manipulation = 0;
+	double weight_update = p/p_last_time_manipulation;
+	p_last_time_manipulation = 0;
 
     int train_index;
 	int one_did_hit = 0; 
@@ -180,26 +180,26 @@ TRACE
 
     for (train_index=0; train_index<adaptive_N; train_index++) {
 
-		if (_particle->p_trains[train_index] == 0) continue;
+		if (p_trains[train_index] == 0) continue;
 		all_dead = 0;
 
-		this_train_t = t + _particle->t_offset[train_index];
+		this_train_t = t + t_offset[train_index];
         toff = fabs (this_train_t - atan2 (x, yprime) / omega - delay - (jitter ? jitter * randnorm () : 0));
 
         /* does neutron hit outside slit? */
         if (fmod (toff + To / 2.0, Tg) > To)
-          _particle->p_trains[train_index] = 0; // T_ABSORB
+          p_trains[train_index] = 0; // T_ABSORB
 		else {	
 			// T_TRANSMIT
 		   one_did_hit = 1;
-		   _particle->p_trains[train_index] *= weight_update;
-		   _particle->p_last_time_manipulation += _particle->p_trains[train_index];
+		   p_trains[train_index] *= weight_update;
+		   p_last_time_manipulation += p_trains[train_index];
 	   }
 
 	}
 	if (!one_did_hit || all_dead) ABSORB;
 
-	p = _particle->p_last_time_manipulation;
+	p = p_last_time_manipulation;
 
   }
   SCATTER;

mcstas-comps/examples/Prototypes/ODIN_MCPL_TOF_train4/ESS_butterfly.comp

@@ -552,14 +552,14 @@ TRACE
 
   if (total_N_sent == 0) {
     #pragma acc atomic
-    adaptive_N = _particle->N_trains;
+    adaptive_N = N_trains;
   } else {
     long tmp = ceil(target_tsplit*total_N_sent/total_arrived);
     #pragma acc atomic
     adaptive_N = tmp;
-    if (adaptive_N > _particle->N_trains) {
+    if (adaptive_N > N_trains) {
       #pragma acc atomic
-      adaptive_N = _particle->N_trains;
+      adaptive_N = N_trains;
     }
   } 
 
@@ -602,13 +602,13 @@ TRACE
 	// Generate ray as normal with its associated p and t
 	// Save these to t_offset and p_train
 
-	_particle->t_offset[train_index] = t;
-	_particle->p_trains[train_index] = p/adaptive_N;
-  	_particle->p_last_time_manipulation += _particle->p_trains[train_index];
+	t_offset[train_index] = t;
+	p_trains[train_index] = p/adaptive_N;
+  	p_last_time_manipulation += p_trains[train_index];
  }
  // Set base particle t and p, now p will be decoupled from the source intensity.
  t=0;
- p=_particle->p_last_time_manipulation;
+ p=p_last_time_manipulation;
 
   SCATTER;
 %}

mcstas-comps/examples/Prototypes/ODIN_MCPL_TOF_train4/Monitor_nD.comp

@@ -424,7 +424,7 @@ TRACE
   #define thread_offdata offdata
   #endif
 
-  double *pp_array=malloc(sizeof(double)*_particle->N_trains);
+  double *pp_array=malloc(sizeof(double)*N_trains);
 
   /* this is done automatically
     STORE_NEUTRON(INDEX_CURRENT_COMP, x, y, z, vx, vy, vz, t, sx, sy, sz, p);
@@ -571,7 +571,7 @@ TRACE
 
 	int train_index;
 	double p_original = p;	
-	double p_factor = p/_particle->p_last_time_manipulation;
+	double p_factor = p/p_last_time_manipulation;
 
 	if (adaptive_target) {
 	  #pragma acc atomic
@@ -584,9 +584,9 @@ TRACE
 	  double t_original = t;
   	  for (train_index=0; train_index<adaptive_N; train_index++) {
 
-        if (_particle->p_trains[train_index] > 0) {
-	      p = p_factor*_particle->p_trains[train_index];
-	      t = t_original + _particle->t_offset[train_index];
+        if (p_trains[train_index] > 0) {
+	      p = p_factor*p_trains[train_index];
+	      t = t_original + t_offset[train_index];
 
 	      pp_array[train_index] = Monitor_nD_Trace (&DEFS, &Vars, _particle);
 
@@ -613,7 +613,7 @@ TRACE
 		// Now just use normal p 
 		double total_p = 0;
 		for (train_index=0; train_index<N_trains; train_index++) {
-		   	if (_particle->alive_trains[train_index]) total_p += p_original*_particle->p_trains[train_index];
+		   	if (alive_trains[train_index]) total_p += p_original*p_trains[train_index];
 		}
 
 		p = total_p;

mcstas-comps/examples/Prototypes/ODIN_MCPL_TOF_train4/MultiDiskChopper.comp

@@ -281,8 +281,8 @@ TRACE
     } else {
 
 		// Check whether each t_offset carried by the ray make it through
-		double weight_update = p/_particle->p_last_time_manipulation;
-		_particle->p_last_time_manipulation = 0;
+		double weight_update = p/p_last_time_manipulation;
+		p_last_time_manipulation = 0;
 
 	    int train_index;
 		int one_did_hit = 0;
@@ -292,10 +292,10 @@ TRACE
 		double p_total = 0;				
 	    for (train_index=0; train_index<adaptive_N; train_index++) {
 
-		  if (_particle->p_trains[train_index] == 0) continue;
+		  if (p_trains[train_index] == 0) continue;
 		  all_dead = 0;
 
-		  this_train_t = t + _particle->t_offset[train_index];
+		  this_train_t = t + t_offset[train_index];
           // where does the neutron hit the disk ?
           phi = atan2 (xprime, yprime) + omega * (this_train_t - delay - (jitter ? jitter * randnorm () : 0));
 
@@ -308,17 +308,17 @@ TRACE
 
             islit++;
           }
-		  if (this_t_hit == 0) _particle->p_trains[train_index] = 0;
+		  if (this_t_hit == 0) p_trains[train_index] = 0;
 		  else {
 			  one_did_hit = 1;
-   		      _particle->p_trains[train_index] *= weight_update;
-   		      _particle->p_last_time_manipulation += _particle->p_trains[train_index];
+   		      p_trains[train_index] *= weight_update;
+   		      p_last_time_manipulation += p_trains[train_index];
 		  }
 	    }
 		// if not a single t_offset made it through a slit, absorb this ray
 		if (!one_did_hit || all_dead) ABSORB;
 
-		p = _particle->p_last_time_manipulation;
+		p = p_last_time_manipulation;
     }
   }
 %}