Separate file names for detection and ranging

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

@@ -6489,6 +6489,44 @@ public class CuasMotion {
 	    boolean center_targ =    clt_parameters.imp.cuas_center_targ;
 	    
 	    
+		String ps = ((prefix != null)?prefix:"") + "-OFFS"+corr_offset+"-PAIRS"+corr_pairs+"-RSTR"+rstr+"-RMS"+lma_rms+
+				"-SRMS"+lma_arms+"-RRMS"+lma_rrms+"-AMP"+lma_mina+"-FZ"+fat_zero+"-PCRA"+precorr_ra+"-PS"+corr_ra_step+
+				"-TUM"+temporal_um+"-TT"+tum_threshold+"-MF"+lmax_fraction+
+				"-HR"+lmax_hack_ridge+
+				"-NL"+lmax_flt_neglim+"-FH"+lmax_flt_hsigma+"-FL"+lmax_flt_lsigma+"-FS"+lmax_flt_scale;
+		if (center_targ) {
+			ps+="-CENT";
+		}
+		return ps;
+	}
+
+	public static String getParametersSuffixRanging(
+			 CLTParameters       clt_parameters,	
+			 String              prefix) {
+		int     corr_offset =    clt_parameters.imp.cuas_corr_offset;
+		int     corr_pairs =     clt_parameters.imp.cuas_corr_pairs;
+		
+		int     temporal_um =    clt_parameters.imp.cuas_temporal_um;
+		double  tum_threshold =  clt_parameters.imp.cuas_tum_threshold;// 0.003; //  clt_parameters.imp.rln_sngl_rstr; // FIXME: ADD
+		
+		int     precorr_ra =     clt_parameters.imp.cuas_precorr_ra;
+		int     corr_ra_step =   clt_parameters.imp.cuas_corr_step;
+		double  rstr =           clt_parameters.imp.cuas_rstr;// 0.003; //  clt_parameters.imp.rln_sngl_rstr; // FIXME: ADD
+	    double  lma_rms =        clt_parameters.imp.cuas_lma_rms; // =       1.5;  // Maximal RMS, regardless of amplitude
+	    double  lma_arms =       clt_parameters.imp.cuas_lma_arms; // =      0.06; // Maximal absolute RMS, sufficient for any amplitude
+	    double  lma_rrms =       clt_parameters.imp.cuas_lma_rrms; // =      0.15; // Maximal relative to A rms. OK is when (RMS < cuas_lma_arms) || (RMS < cuas_lma_rrms * A)
+	    double  lma_mina =       clt_parameters.imp.cuas_lma_mina; // =      1.0;  // Minimal A (amplitude)
+	    double  fat_zero =       clt_parameters.imp.cuas_fat_zero;
+	    double  lmax_fraction =  clt_parameters.imp.cuas_lmax_fraction; // 0.7;     // Check if local maximum is separated from tye surrounding by this fraction of the maximum value
+	    double  lmax_hack_ridge =  clt_parameters.imp.cuas_lmax_hack_ridge; // 0.45;    // Hack for ridges: remove horizontal streaks, where average(abs()) for the line exceeds fraction of abs max 0.32-good, 0.55 - bad
+	    
+//	    double  lmax_flt_neglim= clt_parameters.imp.cuas_lmax_flt_neglim;   // -0.3;   // limit negative data to reduce ridge influence (make -10 to disable)        
+//	    double  lmax_flt_hsigma =  clt_parameters.imp.cuas_lmax_flt_hsigma; // 1.0 // HPF (~UM) subtract GB with this sigma from the data tile 
+//	    double  lmax_flt_lsigma =  clt_parameters.imp.cuas_lmax_flt_lsigma; // 1.0 // LPF - GB result of the previous subtraction
+//	    double  lmax_flt_scale =  clt_parameters.imp.cuas_lmax_flt_scale;   // 5.0 // scale filtering result
+	    boolean center_targ =    clt_parameters.imp.cuas_center_targ;
+	    
+	    
 		String ps = ((prefix != null)?prefix:"") + "-OFFS"+corr_offset+"-PAIRS"+corr_pairs+"-RSTR"+rstr+"-RMS"+lma_rms+
 				"-SRMS"+lma_arms+"-RRMS"+lma_rrms+"-AMP"+lma_mina+"-FZ"+fat_zero+"-PCRA"+precorr_ra+"-PS"+corr_ra_step+
 				"-TUM"+temporal_um+"-TT"+tum_threshold+"-MF"+lmax_fraction+
@@ -6496,13 +6534,16 @@ 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+
+				"-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) {
 			ps+="-CENT";
 		}
 		return ps;
 	}
-
+	
+	
+	
 	public static String getParametersSuffixRslt(
 			 CLTParameters       clt_parameters,	
 			 String              prefix) {

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

@@ -211,7 +211,7 @@ public class CuasRanging {
 				debugLevel);    // final int             debugLevel) {
 		double[][][] targets = cuasMotion.getTargets();
 
-		String model_prefix = center_CLT.getImageName()+CuasMotion.getParametersSuffix(clt_parameters,null);
+		String model_prefix = center_CLT.getImageName()+CuasMotion.getParametersSuffixRanging(clt_parameters,null);
 		
 		if (rng_disp) {
 			double [][][] disparity_targets = null;