Prototype 2 compiles, but for now produces 0 intensity

Author: willend

common/lib/share/mccode-r.c

@@ -4807,6 +4807,7 @@ mcparseoptions(int argc, char *argv[])
 #ifdef TOF_TRAIN
     else if(!strncmp("--tof-trains=", argv[i], 13)) {
       NTOF=atoi(&argv[i][13]);
+    }
 #endif
 #ifdef USE_NEXUS
     else if(!strcmp("--IDF", argv[i])) {

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

@@ -174,7 +174,7 @@ TRACE
 	int one_did_hit = 0; 
 	double this_train_t;
 	int all_dead = 1;	
-    for (train_index=0; train_index<N_trains; train_index++) {
+    for (train_index=0; train_index<_particle->N_trains; train_index++) {
 
 		if (_particle->alive_trains[train_index] == 0) continue;
 		all_dead = 0;

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

@@ -110,7 +110,7 @@ SETTING PARAMETERS (string sector="N",int beamline=1, yheight=0.03, cold_frac=0.
   c_performance=1, t_performance=1, Lmin, Lmax, tmax_multiplier=3, int n_pulses=1,
   acc_power=5,tfocus_dist=0,tfocus_time=0,tfocus_width=0)
 
-DEPENDENCY " -DTOF_TRAINS "
+DEPENDENCY " -DTOF_TRAIN "
 
 SHARE %{
   %include "ESS_butterfly-lib"
@@ -549,7 +549,7 @@ TRACE
   vx = v*dx/r;
 
   int train_index;
-  for (train_index=0; train_index<N_trains; train_index++) {
+  for (train_index=0; train_index<_particle->N_trains; train_index++) {
 
     /* Are we using time focusing? */
     if (tfocus_width>0) {
@@ -589,7 +589,7 @@ TRACE
 	// Save these to t_offset and p_train
 
 	_particle->t_offset[train_index] = t;
-	_particle->p_trains[train_index] = p/N_trains;
+	_particle->p_trains[train_index] = p/_particle->N_trains;
     _particle->alive_trains[train_index] = 1;
 
  }

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

@@ -571,9 +571,9 @@ TRACE
 	double p_original = p;
 
 	if (tsplit==1) {
-	  double pp_array[N_trains];
+	  double pp_array[_particle->N_trains];
 	  double t_original = t;
-  	  for (train_index=0; train_index<N_trains; train_index++) {
+  	  for (train_index=0; train_index<_particle->N_trains; train_index++) {
 
         if (_particle->alive_trains[train_index] == 1) {
 	      p = p_original*_particle->p_trains[train_index];
@@ -587,7 +587,7 @@ TRACE
 	  t = t_original;
 
 	  int pp_total = 0;
-	  for (train_index=0; train_index<N_trains; train_index++) {
+	  for (train_index=0; train_index<_particle->N_trains; train_index++) {
 	    pp_total += pp_array[train_index];
 	  } 
       if (pp_total == 0.0) {
@@ -598,7 +598,7 @@ TRACE
     } else {
 
 		double total_p = 0;
-		for (train_index=0; train_index<N_trains; train_index++) {
+		for (train_index=0; train_index<_particle->N_trains; train_index++) {
 		   	if (_particle->alive_trains[train_index]) total_p += p_original*_particle->p_trains[train_index];
 		}
 

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

@@ -286,7 +286,7 @@ TRACE
 		int this_t_hit;
 		double this_train_t;
     	int all_dead = 1;					
-	    for (train_index=0; train_index<N_trains; train_index++) {
+	    for (train_index=0; train_index<_particle->N_trains; train_index++) {
 
 		  if (_particle->alive_trains[train_index] == 0) continue;
 		  all_dead = 0;