Commit 5a125530 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

Before updates to conditioning images and filtering correlations by tile

average values.
parent e868199f
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ public class EyesisCorrections {
				if (!this.usedChannels[nChn]) this.pixelMapping.removeChannel(nChn);
			}
		}
		int numUsedChannels=0;
		int numUsedChannels=00;
		for (int nChn=0;nChn< this.usedChannels.length; nChn++) if (this.usedChannels[nChn]) numUsedChannels++;
		if (this.debugLevel>0) {
			String sChannels="";
@@ -739,6 +739,7 @@ public class EyesisCorrections {
			};
		}		      
		ImageDtt.startAndJoin(threads);
		return;
	}

	boolean [] usedChannels(String [] paths){
+1 −1
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ public class BiQuadParameters {
		gd.addMessage("ML output files export for LWIR16 camera");
		gd.addCheckbox    ("Add combo slice",                                                                     this.mll_add_combo,
				"Add combined correlations slice from all available pairs after rotation/scaling. Will not be used for training, can be removed to reduce processing time");
		gd.addCheckbox    ("Save interscene correlations",                                                        this.mll_save_accum,
		gd.addCheckbox    ("Save interscene correlations (no-shift)",                                             this.mll_save_accum,
				"Save interscene combination of correlations as used for GT calculation. Will not be used for training, can be removed to reduce processing time");
		gd.addCheckbox    ("Randomize disparity offsets",                                                         this.mll_randomize_offsets,
				"Add random offset to the file-common disparity offset. The total disparity offset histogram is squared half-period of cosine"+
+17 −2
Original line number Diff line number Diff line
@@ -2876,6 +2876,7 @@ public class ImageDtt extends ImageDttCPU {
			final int                 debug_tileX,
			final int                 debug_tileY,
			final int                 threadsMax,      // maximal number of threads to launch
			final String              debug_suffix,
			final int                 globalDebugLevel)
	{
		final double disparity_scale = 1.0/Math.sqrt(2); // combo pixels -> disparity pixels
@@ -3471,13 +3472,27 @@ public class ImageDtt extends ImageDttCPU {
			}
			startAndJoin(threads);
			if (debug_lma != null) {
				String suffix = (debug_suffix == null)?"":debug_suffix; 
				if (imgdtt_params.bimax_dual_LMA) {
					System.out.println("Parameters that influence LMA results filtering:");
					System.out.println("Reasons of failure is in the last slice (fail_reason) of the image.");
					System.out.println("Reasons ar in the code of Cor2dLMA.lmaDisparityStrengths().");
					System.out.println("     lmas_min_amp: "+imgdtt_params.lmas_min_amp);
					System.out.println("  lmas_min_amp_bg: "+imgdtt_params.lmas_min_amp_bg);
					System.out.println(" lmas_max_rel_rms: "+imgdtt_params.lmas_max_rel_rms);
					System.out.println("lmas_min_strength: "+imgdtt_params.lmas_min_strength);
					System.out.println("  lmas_min_max_ac: "+imgdtt_params.lmas_min_max_ac);
					System.out.println("  lmas_min_min_ac: "+imgdtt_params.lmas_min_min_ac);
					System.out.println("    lmas_max_area: "+imgdtt_params.lmas_max_area);
					System.out.println("    lma_str_scale: "+imgdtt_params.lma_str_scale);
					System.out.println("   lma_str_offset: "+imgdtt_params.lma_str_offset);
					System.out.println("    lma_ac_offset: "+imgdtt_params.lma_ac_offset);
					(new ShowDoubleFloatArrays()).showArrays(
							debug_lma,
							tilesX,
							tilesY,
							true,
							"lma_debug_dual_LMA",
							"lma_debug_dual_LMA-"+suffix,
							debug_lma_titles
							);
				} else {
@@ -3486,7 +3501,7 @@ public class ImageDtt extends ImageDttCPU {
							tilesX,
							tilesY,
							true,
							"lma_debug",
							"lma_debug-"+suffix,
							debug_lma_titles
							);
				}
+3 −0
Original line number Diff line number Diff line
@@ -16403,6 +16403,7 @@ public class ImageDttCPU {
			final int                 debug_tileX,
			final int                 debug_tileY,
			final int                 threadsMax,      // maximal number of threads to launch
			final String              debug_suffix,    // not yet implemented
			final int                 globalDebugLevel)
	{
		if (correlation2d == null) {
@@ -16810,6 +16811,7 @@ public class ImageDttCPU {
					clt_parameters.tileX,          // final int                 debug_tileX,
					clt_parameters.tileY,          // final int                 debug_tileY,
					threadsMax,                    // final int                 threadsMax,      // maximal number of threads to launch
					null,                          // final String              debug_suffix,
					debugLevel + 2); // -1 );              // final int                 globalDebugLevel)
			
		} else { // if ((this instanceof ImageDtt) && (getGPU() != null)) - CPU mode
@@ -16871,6 +16873,7 @@ public class ImageDttCPU {
					clt_parameters.tileX,          // final int                 debug_tileX,
					clt_parameters.tileY,          // final int                 debug_tileY,
					threadsMax,                    // final int                 threadsMax,      // maximal number of threads to launch
					null,                          // final String              debug_suffix,
					debugLevel + 2); // -1 );              // final int                 globalDebugLevel)
			
		}
+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ public class ImageDttParameters {
	public double  lmas_min_amp =            0.1;   // minimal ratio of minimal pair correlation amplitude to maximal pair correlation amplitude           
	public double  lmas_min_amp_bg =         0.01;  // same for background objects (all but fg)          
	public double  lmas_max_rel_rms =        0.5; // 0.3;   // LWIR16: 0.5 maximal relative (to average max/min amplitude LMA RMS) // May be up to 0.3)
	public double  lmas_min_strength =       1.0; // 1.1; // 0.7;   // LWIR16: 0.4 minimal composite strength (sqrt(average amp squared over absolute RMS)
	public double  lmas_min_strength =       1.5; // 1.3; // 1.0;// TE was 1.0? // 1.1; // 0.7;   // LWIR16: 0.4 minimal composite strength (sqrt(average amp squared over absolute RMS)
	public double  lmas_min_max_ac =         0.04; // 0.175; // 0.14;  // LWIR16: 0.01  maximal of a and C coefficients minimum (measures sharpest point/line)
	public double  lmas_min_min_ac =         0.003; // LWIR16: 0.007 minimal of a and C coefficients minimum (measures sharpest point)
	public double  lmas_max_area =          45.0; // 30.0;   // LWIR16: 0.0  maximal half-area (if > 0.0)
Loading