ranging following target

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

@@ -4925,7 +4925,7 @@ public class CuasMotion {
 ///				"-NL"+lmax_flt_neglim+"-FH"+lmax_flt_hsigma+"-FL"+lmax_flt_lsigma+"-FS"+lmax_flt_scale+
 				"-CB"+clt_parameters.imp.cuas_rng_combine+(clt_parameters.imp.cuas_rng_coswnd?"-WC":"-WR")+
 				"-UM"+(clt_parameters.imp.cuas_rng_um2?"D":"") +clt_parameters.imp.cuas_rng_um_sigma+
-				"-FZ"+clt_parameters.imp.cuas_rng_fz+
+				"-FZ"+clt_parameters.imp.cuas_rng_fz0+":"+clt_parameters.imp.cuas_rng_fz+
 				"-R"+clt_parameters.imp.cuas_rng_radius0+":"+clt_parameters.imp.cuas_rng_radius+
 				"-M"+clt_parameters.imp.cuas_mcorr_sel+"-"+clt_parameters.imp.cuas_mcorr_sel_lma;
 		if (center_targ) {
@@ -4976,7 +4976,7 @@ public class CuasMotion {
 				"-MS"+min_score_lma+"-ML"+min_seq+"-SL"+enough_seq+"-MT"+seq_travel+
 				"-CB"+clt_parameters.imp.cuas_rng_combine+(clt_parameters.imp.cuas_rng_coswnd?"-WC":"-WR")+
 				"-UM"+(clt_parameters.imp.cuas_rng_um2?"D":"") +clt_parameters.imp.cuas_rng_um_sigma+
-				"-FZ"+clt_parameters.imp.cuas_rng_fz+
+				"-FZ"+clt_parameters.imp.cuas_rng_fz0+":"+clt_parameters.imp.cuas_rng_fz+
 				"-R"+clt_parameters.imp.cuas_rng_radius0+":"+clt_parameters.imp.cuas_rng_radius+
 				"-M"+clt_parameters.imp.cuas_mcorr_sel+"-"+clt_parameters.imp.cuas_mcorr_sel_lma;
 		

src/main/java/com/elphel/imagej/tileprocessor/IntersceneMatchParameters.java

@@ -879,6 +879,7 @@ min_str_neib_fpn	0.35
 	public double   cuas_rng_radius0 =     3.0;  // mask out data outside peripheral areas, keep 0.5 at the radius - first iteration 
 	public double   cuas_rng_radius =      2.5;  // mask out data outside peripheral areas, keep 0.5 at the radius  - next iteration
 	public double   cuas_rng_blur =        0.5;  // relative transition radius range (for 0.5 the mask inside (1-0.5) radius will be 1.0, outside (1+0.5) radius will be 0
+	public double   cuas_rng_fz0 =        300.0; // Fat zero in target ranging mode, first iteration (first 2?)
 	public double   cuas_rng_fz =         30.0;  // Fat zero in target ranging mode
 	public double   cuas_rng_scale =       8.0;  // Scale alt_data to use same strength as for normal ranging because targets
 
@@ -2666,8 +2667,10 @@ min_str_neib_fpn	0.35
 				"Mask out data outside peripheral areas, keep 0.5 at the radius .");
 		gd.addNumericField("Mask blur fraction for ranging",         this.cuas_rng_blur, 5,8,"",
 				"Relative transition radius range (for 0.5 the mask inside (1-0.5) radius will be 1.0, outside (1+0.5) radius will be 0.");
-		gd.addNumericField("Fat zero",                               this.cuas_rng_fz, 5,8,"",
-				"Fat zero for target ranging.");
+		gd.addNumericField("Fat zero (first iteration)",             this.cuas_rng_fz0, 5,8,"",
+				"Fat zero for target ranging (larger, use for the initial fitting).");
+		gd.addNumericField("Fat zero (next iterations)",             this.cuas_rng_fz, 5,8,"",
+				"Fat zero for target ranging (smaller, use for the next LMA iterations).");
 		gd.addNumericField("Scale alt image data",                   this.cuas_rng_scale, 5,8,"x",
 				"Scale alt_data to use same strength as for normal ranging because targets are smaller than tile.");
 		
@@ -3890,6 +3893,7 @@ min_str_neib_fpn	0.35
 		this.cuas_rng_radius0 =         gd.getNextNumber();
 		this.cuas_rng_radius =          gd.getNextNumber();
 		this.cuas_rng_blur =            gd.getNextNumber();
+		this.cuas_rng_fz0=              gd.getNextNumber();
 		this.cuas_rng_fz =              gd.getNextNumber();
 		this.cuas_rng_scale =           gd.getNextNumber();
 		
@@ -4977,6 +4981,7 @@ min_str_neib_fpn	0.35
 		properties.setProperty(prefix+"cuas_rng_radius0",     this.cuas_rng_radius0+"");    // double
 		properties.setProperty(prefix+"cuas_rng_radius",      this.cuas_rng_radius+"");     // double
 		properties.setProperty(prefix+"cuas_rng_blur",        this.cuas_rng_blur+"");       // double
+		properties.setProperty(prefix+"cuas_rng_fz0",         this.cuas_rng_fz0+"");        // double
 		properties.setProperty(prefix+"cuas_rng_fz",          this.cuas_rng_fz+"");         // double
 		properties.setProperty(prefix+"cuas_rng_scale",       this.cuas_rng_scale+"");      // double
 		
@@ -6041,6 +6046,7 @@ min_str_neib_fpn	0.35
 		if (properties.getProperty(prefix+"cuas_rng_radius0")!=null)     this.cuas_rng_radius0=Double.parseDouble(properties.getProperty(prefix+"cuas_rng_radius0"));
 		if (properties.getProperty(prefix+"cuas_rng_radius")!=null)      this.cuas_rng_radius=Double.parseDouble(properties.getProperty(prefix+"cuas_rng_radius"));
 		if (properties.getProperty(prefix+"cuas_rng_blur")!=null)        this.cuas_rng_blur=Double.parseDouble(properties.getProperty(prefix+"cuas_rng_blur"));
+		if (properties.getProperty(prefix+"cuas_rng_fz0")!=null)         this.cuas_rng_fz0=Double.parseDouble(properties.getProperty(prefix+"cuas_rng_fz0"));
 		if (properties.getProperty(prefix+"cuas_rng_fz")!=null)          this.cuas_rng_fz=Double.parseDouble(properties.getProperty(prefix+"cuas_rng_fz"));
 		if (properties.getProperty(prefix+"cuas_rng_scale")!=null)       this.cuas_rng_scale=Double.parseDouble(properties.getProperty(prefix+"cuas_rng_scale"));
 		
@@ -7092,6 +7098,7 @@ min_str_neib_fpn	0.35
 		imp.cuas_rng_radius0 =      this.cuas_rng_radius0;
 		imp.cuas_rng_radius =       this.cuas_rng_radius;
 		imp.cuas_rng_blur =         this.cuas_rng_blur;
+		imp.cuas_rng_fz0 =          this.cuas_rng_fz0;
 		imp.cuas_rng_fz =           this.cuas_rng_fz;
 		imp.cuas_rng_scale =        this.cuas_rng_scale;