added if geo.reverb check when dumping delay info, fixes #152

sirocco-rt · Jun 16, 2015 · 7cbde3a · 7cbde3a
1 parent d2a237c
commit 7cbde3a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/source/extract.c b/source/extract.c
@@ -404,7 +404,9 @@ the same resonance again */
 		{
 			stuff_v(pstart.x, pp->x);	// Restore photon to initial position (necessary for reweighting schemes)
 			pp->path = pstart.path;
-			delay_dump_single(pp, 1);	// Dump photon now weight has been modified
+
+			if (geo.reverb > REV_NONE)		// only want to dump photon if the reverb structures are set up
+			  delay_dump_single(pp, 1);	// Dump photon now weight has been modified
 		}
 
 

diff --git a/source/python.c b/source/python.c
@@ -1077,7 +1077,7 @@ main (argc, argv)
     }
 
 	/* SWM - Setup for path tracking */
-	if(geo.reverb > 0)
+	if(geo.reverb > REV_NONE)
 	{
 		reverb_init(wmain, nangles, freqmin, freqmax);
 		delay_dump_prep(files.root, restart_stat, rank_global);
@@ -1502,7 +1502,7 @@ main (argc, argv)
 	   geo.pcycle, timer ());
 
 		/* SWM0215: Delay dump photons from this cycle */
-		if(geo.reverb > 0) delay_dump(p, NPHOT, 0);	// SWM - Dump delay tracks from this iteration
+		if(geo.reverb > REV_NONE) delay_dump(p, NPHOT, 0);	// SWM - Dump delay tracks from this iteration
 
       /* JM1304: moved geo.pcycle++ after xsignal to record cycles correctly. First cycle is cycle 0. */
 

diff --git a/source/setup.c b/source/setup.c
@@ -962,7 +962,7 @@ int get_compton_torus_params ()
 int 
 get_meta_params (void)
 {
-  geo.reverb = 0;
+  geo.reverb = REV_NONE;
   rdint("reverb.type", &geo.reverb);
   if (geo.reverb == REV_WIND)
   {