Erasing source images

src/main/java/com/elphel/imagej/cuas/CuasRanging.java

@@ -438,6 +438,7 @@ public class CuasRanging {
 				start_scene, // final int       start_scene,
 				num_scenes,   // final int       num_scenes,
 				clean_up,     // final boolean   clean_up, // remove unneded data
+				false,        // final boolean   erase_source_images, // erase source images (will not clean up this.img_um)
 				debugLevel);  // final int debugLevel)
 		/*
 		final double [][][] img_um_seq = QuadCLT.unsharpMaskSourceMono(
@@ -1007,6 +1008,7 @@ public class CuasRanging {
 			final int       start_scene,
 			final int       num_scenes,
 			final boolean   clean_up, // remove unneded data
+			final boolean   erase_source, // erase source images (will not clean up this.img_um, will erase used source images instead)
 			final int debugLevel) {
 		final boolean um_en =       clt_parameters.imp.cuas_rng_um;
 		final double  um_sigma =    clt_parameters.imp.cuas_rng_um_sigma;
@@ -1014,11 +1016,15 @@ public class CuasRanging {
 		final double  um_weight =   clt_parameters.imp.cuas_rng_um_weight;
 		if (clean_up) {
 			for (int nscene = 0; nscene < start_scene; nscene++) {
-				this.img_um[nscene] = null;
+				if (erase_source) { // keep cache if source images are deleted
+					this.img_um[nscene] = null;
+				}
 				scenes[nscene].setImageDataAlt(null);
 			}
 			for (int nscene = start_scene+num_scenes; nscene < this.img_um.length; nscene++) {
-				this.img_um[nscene] = null;
+				if (erase_source) { // keep cache if source images are deleted
+					this.img_um[nscene] = null;
+				}
 				scenes[nscene].setImageDataAlt(null);
 			}
 			Runtime runtime = Runtime.getRuntime();
@@ -1035,6 +1041,7 @@ public class CuasRanging {
 			    		img_um,      // final double [][][] img_um, // cache for unsharped images, same length as scenes. May be null
 			    		false,       // final boolean   unsharped, // ==false, not used 
 			    		false,       // final boolean   update_source, // ==false, not used if update_source will not generate output, return null
+			    		erase_source,// final boolean   erase_source,
 			    		um_sigma,    // final double    um_sigma,
 			    		um_twice,    // final boolean   um_twice,
 			    		um_weight,   // final double    um_weight,
@@ -1082,25 +1089,16 @@ public class CuasRanging {
 		final int start_scene = frame_center - half_accum_range;
 		final int num_scenes = 2*half_accum_range + 1;
 		boolean   clean_up = true;  // remove unneded data
+		
+		boolean   erase_source = true; // check everything works
+		
+		
 		final double [][][] img_um_seq = getUMSequence(
-				start_scene, // final int       start_scene,
+				start_scene,  // final int       start_scene,
 				num_scenes,   // final int       num_scenes,
 				clean_up,     // final boolean   clean_up, // remove unneded data
+				erase_source, // final boolean   erase_source, // erase source images (will not clean up this.img_um)
 				debugLevel);  // final int debugLevel)
-		/*
-		
-		final double [][][] img_um_seq = QuadCLT.unsharpMaskSourceMono( // [num_scenes][num_sens][pixels]
-				scenes,      // final QuadCLT[] scenes,
-				start_scene, // final int       start_scene,
-				num_scenes,  // final int       num_scenes,
-				um_en,       // final boolean   um_en,
-				
-				um_all,      // final boolean   unsharped,
-				um_sigma,    // final double    um_sigma,
-				um_twice,    // final boolean   um_twice,
-				um_weight,   // final double    um_weight,
-				debugLevel); // final int       debugLevel)
-       */				
 
 		double [][][] pXpYDs = cuasMotion.targetPxPyD(
 				targets[nseq]); // final double [][] targets)