Debugging field calibration with GPU (901f0a49) · Commits · Elphel / imagej-elphel

src/main/java/com/elphel/imagej/cameras/CLTParameters.java

+7 −2

src/main/java/com/elphel/imagej/gpu/GPUTileProcessor.java

+20 −3

Original line number	Original line	Diff line number	Diff line
	@@ -222,6 +222,18 @@ public class GPUTileProcessor {
	}		}
	}		}
	}		}
			public float [][] getDispDist(){
			return disp_dist;
			}
			public float [][] getXY(boolean use_aux){
			return use_aux? xy_aux : xy;
			}
			public int getTileY(){
			return ty;
			}
			public int getTileX(){
			return tx;
			}

	// convert this class instance to float array to match layout of the C struct		// convert this class instance to float array to match layout of the C struct
	public float [] asFloatArray(boolean use_aux) {		public float [] asFloatArray(boolean use_aux) {
	@@ -2043,10 +2055,13 @@ public class GPUTileProcessor {
	}		}
	}		}
	setCorrIndicesTdData(		setCorrIndicesTdData(
	ntile, // int num_tiles, // corr_indices, fdata may be longer than needed		ntile * num_pairs, // int num_tiles, // corr_indices, fdata may be longer than needed
	indices, // int [] corr_indices,		indices, // int [] corr_indices,
	fdata); // float [] fdata);		fdata); // float [] fdata);
	return indices;		// trim indices
			int [] indices_trim = new int [ntile * num_pairs];
			System.arraycopy(indices, 0, indices_trim, 0 , indices_trim.length);
			return indices_trim;
	}		}

	public float [][][][] getCorrTilesTd() // [tileY][tileX][pair][4*64] , read all available pairs		public float [][][][] getCorrTilesTd() // [tileY][tileX][pair][4*64] , read all available pairs
	@@ -2104,7 +2119,9 @@ public class GPUTileProcessor {
	ntile, // int num_tiles, // corr_indices, fdata may be longer than needed		ntile, // int num_tiles, // corr_indices, fdata may be longer than needed
	indices, // int [] corr_indices,		indices, // int [] corr_indices,
	fdata); // float [] fdata);		fdata); // float [] fdata);
	return indices;		int [] indices_trim = new int [ntile];
			System.arraycopy(indices, 0, indices_trim, 0 , indices_trim.length);
			return indices_trim;
	}		}

	public float [][][] getCorrTilesComboTd() // [tileY][tileX][4*64] , read all available pairs		public float [][][] getCorrTilesComboTd() // [tileY][tileX][4*64] , read all available pairs

Original line number	Original line	Diff line number	Diff line
	@@ -167,7 +167,7 @@ public class CLTParameters {
	public boolean inf_restore_disp = true; // Add disparity back to d{x,y}[i] (debug feature)		public boolean inf_restore_disp = true; // Add disparity back to d{x,y}[i] (debug feature)
	// Lazy eye parameters		// Lazy eye parameters

	public boolean ly_lma_ers = true; // Use 2020 LMA-based measurement of mismatch		public boolean ly_lma_ers = true; // Use 2020 LMA-based measurement of mismatch (GPU-supported)
	public double ly_gt_strength = 0.18; // use some configurable parameters		public double ly_gt_strength = 0.18; // use some configurable parameters
	public boolean ly_gt_use_wnd = true; //		public boolean ly_gt_use_wnd = true; //
	public double ly_gt_rms = 0.2; // split small source samples to FG/BG if all aux tile RMS exceeds this value		public double ly_gt_rms = 0.2; // split small source samples to FG/BG if all aux tile RMS exceeds this value
	@@ -797,6 +797,7 @@ public class CLTParameters {
	public boolean gpu_use_aux = false; // accelerate tile processor for the aux (lwir) quad camera		public boolean gpu_use_aux = false; // accelerate tile processor for the aux (lwir) quad camera
	public boolean gpu_use_aux_macro = false; // accelerate tile processor for the aux (lwir) quad camera in macro mode		public boolean gpu_use_aux_macro = false; // accelerate tile processor for the aux (lwir) quad camera in macro mode
	public boolean gpu_use_aux_adjust = false; // accelerate tile processor for the aux (lwir) quad camera for field calibration		public boolean gpu_use_aux_adjust = false; // accelerate tile processor for the aux (lwir) quad camera for field calibration
			public boolean gpu_debug_accum = false; // debug multi-tile TD accumulation

	public boolean replaceWeakOutliers = true; // false;		public boolean replaceWeakOutliers = true; // false;

	@@ -1600,6 +1601,7 @@ public class CLTParameters {
	properties.setProperty(prefix+"gpu_use_aux", this.gpu_use_aux +"");		properties.setProperty(prefix+"gpu_use_aux", this.gpu_use_aux +"");
	properties.setProperty(prefix+"gpu_use_aux_macro", this.gpu_use_aux_macro +"");		properties.setProperty(prefix+"gpu_use_aux_macro", this.gpu_use_aux_macro +"");
	properties.setProperty(prefix+"gpu_use_aux_adjust", this.gpu_use_aux_adjust +"");		properties.setProperty(prefix+"gpu_use_aux_adjust", this.gpu_use_aux_adjust +"");
			properties.setProperty(prefix+"gpu_debug_accum", this.gpu_debug_accum +"");

	properties.setProperty(prefix+"debug_initial_discriminate", this.debug_initial_discriminate+"");		properties.setProperty(prefix+"debug_initial_discriminate", this.debug_initial_discriminate+"");
	properties.setProperty(prefix+"dbg_migrate", this.dbg_migrate+"");		properties.setProperty(prefix+"dbg_migrate", this.dbg_migrate+"");
	@@ -2387,6 +2389,7 @@ public class CLTParameters {
	if (properties.getProperty(prefix+"gpu_use_aux")!=null) this.gpu_use_aux=Boolean.parseBoolean(properties.getProperty(prefix+"gpu_use_aux"));		if (properties.getProperty(prefix+"gpu_use_aux")!=null) this.gpu_use_aux=Boolean.parseBoolean(properties.getProperty(prefix+"gpu_use_aux"));
	if (properties.getProperty(prefix+"gpu_use_aux_macro")!=null) this.gpu_use_aux_macro=Boolean.parseBoolean(properties.getProperty(prefix+"gpu_use_aux_macro"));		if (properties.getProperty(prefix+"gpu_use_aux_macro")!=null) this.gpu_use_aux_macro=Boolean.parseBoolean(properties.getProperty(prefix+"gpu_use_aux_macro"));
	if (properties.getProperty(prefix+"gpu_use_aux_adjust")!=null) this.gpu_use_aux_adjust=Boolean.parseBoolean(properties.getProperty(prefix+"gpu_use_aux_adjust"));		if (properties.getProperty(prefix+"gpu_use_aux_adjust")!=null) this.gpu_use_aux_adjust=Boolean.parseBoolean(properties.getProperty(prefix+"gpu_use_aux_adjust"));
			if (properties.getProperty(prefix+"gpu_debug_accum")!=null) this.gpu_debug_accum=Boolean.parseBoolean(properties.getProperty(prefix+"gpu_debug_accum"));

	if (properties.getProperty(prefix+"debug_initial_discriminate")!=null) this.debug_initial_discriminate=Boolean.parseBoolean(properties.getProperty(prefix+"debug_initial_discriminate"));		if (properties.getProperty(prefix+"debug_initial_discriminate")!=null) this.debug_initial_discriminate=Boolean.parseBoolean(properties.getProperty(prefix+"debug_initial_discriminate"));
	if (properties.getProperty(prefix+"dbg_migrate")!=null) this.dbg_migrate=Boolean.parseBoolean(properties.getProperty(prefix+"dbg_migrate"));		if (properties.getProperty(prefix+"dbg_migrate")!=null) this.dbg_migrate=Boolean.parseBoolean(properties.getProperty(prefix+"dbg_migrate"));
	@@ -2612,7 +2615,7 @@ public class CLTParameters {

	gd.addTab ("Lazy eye", "Lazy eye parameters");		gd.addTab ("Lazy eye", "Lazy eye parameters");

	gd.addCheckbox ("Use 2020 LMA-based measurement of mismatch", this.ly_lma_ers);		gd.addCheckbox ("Use 2020 LMA-based measurement of mismatch (GPU-supported)", this.ly_lma_ers);
	gd.addMessage ("--- main-to-aux depth map parameters ---");		gd.addMessage ("--- main-to-aux depth map parameters ---");
	gd.addNumericField("Minimal reference (main) channel correlation strength", this.ly_gt_strength, 3);		gd.addNumericField("Minimal reference (main) channel correlation strength", this.ly_gt_strength, 3);
	gd.addCheckbox ("Use window for AUX tiles to reduce weight of the hi-res tiles near low-res tile boundaries", this.ly_gt_use_wnd);		gd.addCheckbox ("Use window for AUX tiles to reduce weight of the hi-res tiles near low-res tile boundaries", this.ly_gt_use_wnd);