monochrome mode of the tile processor - debugging (adf9d12f) · Commits · Elphel / imagej-elphel

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

+171 −150

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

+26 −21

Original line number	Original line	Diff line number	Diff line
	@@ -3224,6 +3224,7 @@ public class QuadCLT {
	boolean lwir_subtract_dc = colorProcParameters.lwir_subtract_dc;		boolean lwir_subtract_dc = colorProcParameters.lwir_subtract_dc;
	boolean lwir_eq_chn = colorProcParameters.lwir_eq_chn;		boolean lwir_eq_chn = colorProcParameters.lwir_eq_chn;
	boolean correct_vignetting = colorProcParameters.correct_vignetting;		boolean correct_vignetting = colorProcParameters.correct_vignetting;
			this.is_mono = is_lwir; // maybe add other monochrome?

	for (int srcChannel=0; srcChannel < channelFiles.length; srcChannel++){		for (int srcChannel=0; srcChannel < channelFiles.length; srcChannel++){
	int nFile=channelFiles[srcChannel]; // channelFiles[srcChannel];		int nFile=channelFiles[srcChannel]; // channelFiles[srcChannel];
	@@ -3256,10 +3257,10 @@ public class QuadCLT {
	float [] pixels=(float []) imp_srcs[srcChannel].getProcessor().getPixels();		float [] pixels=(float []) imp_srcs[srcChannel].getProcessor().getPixels();
	int width = imp_srcs[srcChannel].getWidth();		int width = imp_srcs[srcChannel].getWidth();
	int height = imp_srcs[srcChannel].getHeight();		int height = imp_srcs[srcChannel].getHeight();
	if (debugLevel > -1) {		if ((debugLevel > -1) && (!isMonochrome())) {
	double [] max_pix= {0.0, 0.0, 0.0, 0.0};		double [] max_pix= {0.0, 0.0, 0.0, 0.0};
	// for (int y = 0; y < height-1; y+=2){		// for (int y = 0; y < height-1; y+=2){
	for (int y = 0; y < 499; y+=2){		for (int y = 0; (y < 499) && (y < height); y+=2){
	// for (int x = 0; x < width-1; x+=2){		// for (int x = 0; x < width-1; x+=2){
	for (int x = width/2; x < width-1; x+=2){		for (int x = width/2; x < width-1; x+=2){
	if (pixels[ywidth+x ] > max_pix[0]) max_pix[0] = pixels[ywidth+x ];		if (pixels[ywidth+x ] > max_pix[0]) max_pix[0] = pixels[ywidth+x ];
	@@ -3373,7 +3374,7 @@ public class QuadCLT {

	}		}

	if ((debugLevel > -1) && (saturation_imp != null)){		if ((debugLevel > -1) && (saturation_imp != null) && !is_lwir){
	String [] titles = {"chn0","chn1","chn2","chn3"};		String [] titles = {"chn0","chn1","chn2","chn3"};
	double [][] dbg_satur = new double [saturation_imp.length] [saturation_imp[0].length];		double [][] dbg_satur = new double [saturation_imp.length] [saturation_imp[0].length];
	for (int srcChannel=0; srcChannel<channelFiles.length; srcChannel++){		for (int srcChannel=0; srcChannel<channelFiles.length; srcChannel++){
	@@ -3385,7 +3386,7 @@ public class QuadCLT {
	int height = imp_srcs[0].getHeight();		int height = imp_srcs[0].getHeight();
	(new ShowDoubleFloatArrays()).showArrays(dbg_satur, width, height, true, "Saturated" , titles);		(new ShowDoubleFloatArrays()).showArrays(dbg_satur, width, height, true, "Saturated" , titles);

	if (debugLevel > -1) { // 0){		if ((debugLevel > -1) && !isMonochrome()) { // 0){
	double [][] dbg_dpixels_norm = new double [channelFiles.length][];		double [][] dbg_dpixels_norm = new double [channelFiles.length][];
	for (int srcChannel=0; srcChannel<channelFiles.length; srcChannel++){		for (int srcChannel=0; srcChannel<channelFiles.length; srcChannel++){
	float [] pixels=(float []) imp_srcs[srcChannel].getProcessor().getPixels();		float [] pixels=(float []) imp_srcs[srcChannel].getProcessor().getPixels();
	@@ -3444,7 +3445,6 @@ public class QuadCLT {
	}		}
	this.lwir_offset /= num_avg;		this.lwir_offset /= num_avg;
	}		}
	this.is_mono = is_lwir; // maybe add other monochrome?
	return imp_srcs;		return imp_srcs;
	}		}

	@@ -3793,7 +3793,8 @@ public class QuadCLT {
	for (int srcChannel=0; srcChannel < channelFiles.length; srcChannel++){		for (int srcChannel=0; srcChannel < channelFiles.length; srcChannel++){
	int nFile=channelFiles[srcChannel];		int nFile=channelFiles[srcChannel];
	if (nFile >=0) {		if (nFile >=0) {
	offsets[srcChannel]= (avr_pix[srcChannel][0] - (remove_dc ? 0.0: avg));		// offsets[srcChannel]= (avr_pix[srcChannel][0] - (remove_dc ? 0.0: avg));
			offsets[srcChannel]= avr_pix[srcChannel][0];
	float fd = (float)offsets[srcChannel];		float fd = (float)offsets[srcChannel];
	float [] pixels = (float []) imp_srcs[srcChannel].getProcessor().getPixels();		float [] pixels = (float []) imp_srcs[srcChannel].getProcessor().getPixels();
	for (int i = 0; i < pixels.length; i++) {		for (int i = 0; i < pixels.length; i++) {
	@@ -3853,7 +3854,7 @@ public class QuadCLT {
	}		}
	} else {		} else {
	for (int j =0 ; j < double_stacks[i][0].length; j++){		for (int j =0 ; j < double_stacks[i][0].length; j++){
	double_stacks[i][0][j]*=0.25; // Scale mono by 1/4 - to have the same overall "gain" as for bayer		double_stacks[i][0][j]*=1.0; // Scale mono by 1/4 - to have the same overall "gain" as for bayer
	}		}
	}		}
	}		}
	@@ -3979,10 +3980,11 @@ public class QuadCLT {
	// (clt_parameters.dbg_mode & 256) != 0, // transpose convolve		// (clt_parameters.dbg_mode & 256) != 0, // transpose convolve
	threadsMax,		threadsMax,
	debugLevel);		debugLevel);
			int first_color = isMonochrome()? ImageDtt.MONO_CHN:0;
	if (debugLevel > -1){		if (debugLevel > -1){
	System.out.println("clt_data.length="+clt_data.length+" clt_data[0].length="+clt_data[0].length		System.out.println("clt_data.length="+clt_data.length+" clt_data[0].length="+clt_data[0].length
	+" clt_data[0][0].length="+clt_data[0][0].length+" clt_data[0][0][0].length="+		+" clt_data[0]["+first_color+"].length="+clt_data[0][first_color].length+" clt_data[0]["+first_color+"][0].length="+
	clt_data[0][0][0].length);		clt_data[0][first_color][0].length);
	}		}
	// visualize texture tiles as RGBA slices		// visualize texture tiles as RGBA slices
	double [][] texture_nonoverlap = null;		double [][] texture_nonoverlap = null;
	@@ -4029,7 +4031,7 @@ public class QuadCLT {
	}		}

	if (!batch_mode && clt_parameters.show_overlap) {		if (!batch_mode && clt_parameters.show_overlap) {
	sdfa_instance.showArrays(		sdfa_instance.showArrays( // all but r-rms, b-rms
	texture_overlap,		texture_overlap,
	tilesX * clt_parameters.transform_size,		tilesX * clt_parameters.transform_size,
	tilesY * clt_parameters.transform_size,		tilesY * clt_parameters.transform_size,
	@@ -4061,6 +4063,7 @@ public class QuadCLT {
	}		}
	}		}
	// visualize correlation results		// visualize correlation results
			// bo-b3 non-zero, r, g - zero
	if (clt_corr_combo!=null){		if (clt_corr_combo!=null){
	if (disparity_map != null){		if (disparity_map != null){
	if (!batch_mode && clt_parameters.show_map && (debugLevel > -1)){		if (!batch_mode && clt_parameters.show_map && (debugLevel > -1)){
	@@ -4215,7 +4218,7 @@ public class QuadCLT {
	threadsMax,		threadsMax,
	debugLevel);		debugLevel);
	}		}
			// all zeros
	sdfa_instance.showArrays(		sdfa_instance.showArrays(
	corr_rslt,		corr_rslt,
	tilesX(2clt_parameters.transform_size),		tilesX(2clt_parameters.transform_size),
	@@ -4240,13 +4243,15 @@ public class QuadCLT {
	clt_parameters.corr_border_contrast,		clt_parameters.corr_border_contrast,
	threadsMax,		threadsMax,
	debugLevel);		debugLevel);
	sdfa_instance.showArrays(		// titles.length = 15, corr_rslt_partial.length=16!
			System.out.println("corr_rslt_partial.length = "+corr_rslt_partial.length+", titles.length = "+titles.length);
			sdfa_instance.showArrays( // out of boundary 15
	corr_rslt_partial,		corr_rslt_partial,
	tilesX(2clt_parameters.transform_size),		tilesX(2clt_parameters.transform_size),
	tilesY(2clt_parameters.transform_size),		tilesY(2clt_parameters.transform_size),
	true,		true,
	name+"-PART_CORR-D"+clt_parameters.disparity,		name+"-PART_CORR-D"+clt_parameters.disparity);
	titles);		// titles);
	}		}
	}		}
	}		}
	@@ -4259,7 +4264,7 @@ public class QuadCLT {
	// String titleFull=title+"-SPLIT-D"+clt_parameters.disparity;		// String titleFull=title+"-SPLIT-D"+clt_parameters.disparity;

	if (clt_parameters.corr_sigma > 0){ // no filter at all		if (clt_parameters.corr_sigma > 0){ // no filter at all
	for (int chn = 0; chn < clt_data[iQuad].length; chn++) {		for (int chn = 0; chn < clt_data[iQuad].length; chn++) if (clt_data[iQuad][chn] != null){
	image_dtt.clt_lpf(		image_dtt.clt_lpf(
	clt_parameters.corr_sigma,		clt_parameters.corr_sigma,
	clt_data[iQuad][chn],		clt_data[iQuad][chn],
	@@ -4275,7 +4280,7 @@ public class QuadCLT {
	}		}
	if (!batch_mode && (debugLevel > 0)){		if (!batch_mode && (debugLevel > 0)){
	double [][] clt = new double [clt_data[iQuad].length*4][];		double [][] clt = new double [clt_data[iQuad].length*4][];
	for (int chn = 0; chn < clt_data[iQuad].length; chn++) {		for (int chn = 0; chn < clt_data[iQuad].length; chn++) if (clt_data[iQuad][chn] != null){
	double [][] clt_set = image_dtt.clt_dbg(		double [][] clt_set = image_dtt.clt_dbg(
	clt_data [iQuad][chn],		clt_data [iQuad][chn],
	threadsMax,		threadsMax,
	@@ -4292,7 +4297,7 @@ public class QuadCLT {
	}		}
	}		}
	double [][] iclt_data = new double [clt_data[iQuad].length][];		double [][] iclt_data = new double [clt_data[iQuad].length][];
	for (int chn=0; chn<iclt_data.length;chn++){		for (int chn=0; chn<iclt_data.length;chn++) if (clt_data[iQuad][chn] != null) {
	iclt_data[chn] = image_dtt.iclt_2d(		iclt_data[chn] = image_dtt.iclt_2d(
	clt_data[iQuad][chn], // scanline representation of dcd data, organized as dct_size x dct_size tiles		clt_data[iQuad][chn], // scanline representation of dcd data, organized as dct_size x dct_size tiles
	clt_parameters.transform_size, // final int		clt_parameters.transform_size, // final int
	@@ -4509,11 +4514,11 @@ public class QuadCLT {
	mx,		mx,
	255.0);		255.0);
	rbg_in = new double [3][iclt_data[green_index].length];		rbg_in = new double [3][iclt_data[green_index].length];
	for (int i = 0; i < rbg_in.length; i++) {		for (int i = 0; i < rbg_in[0].length; i++) {
	double [] rgb = tc.getRGB(iclt_data[green_index][i]);		double [] rgb = tc.getRGB(iclt_data[green_index][i]);
	rbg_in[i][0] = rgb[0]; // red		rbg_in[0][i] = rgb[0]; // red
	rbg_in[i][1] = rgb[2]; // blue		rbg_in[1][i] = rgb[2]; // blue
	rbg_in[i][2] = rgb[1]; // green		rbg_in[2][i] = rgb[1]; // green
	}		}
	}		}

Original line number	Original line	Diff line number	Diff line
	@@ -1562,12 +1562,12 @@ public class ImageDtt {

	final int numcol = 3; // number of colors // keep the same, just do not use [0] and [1], [2] - green		final int numcol = 3; // number of colors // keep the same, just do not use [0] and [1], [2] - green

	final int nChn = image_data[0].length;		// final int numColors = image_data[0].length;
	final int height=image_data[0][0].length/width;		final int height=image_data[0][0].length/width;
	final int tilesX=width/transform_size;		final int tilesX=width/transform_size;
	final int tilesY=height/transform_size;		final int tilesY=height/transform_size;
	final int nTilesInChn=tilesX*tilesY;		final int nTilesInChn=tilesX*tilesY;
	final double [][][][][][] clt_data = new double[quad][nChn][tilesY][tilesX][][];		final double [][][][][][] clt_data = new double[quad][numcol][tilesY][tilesX][][];
	final Thread[] threads = newThreadArray(threadsMax);		final Thread[] threads = newThreadArray(threadsMax);
	final AtomicInteger ai = new AtomicInteger(0);		final AtomicInteger ai = new AtomicInteger(0);
	final double [] col_weights= new double [numcol]; // colors are RBG		final double [] col_weights= new double [numcol]; // colors are RBG
	@@ -1603,6 +1603,9 @@ public class ImageDtt {
	}		}
	}		}


			final int first_color = isMonochrome()? MONO_CHN : 0; // color that is non-zero

	// reducing weight of on-axis correlation values to enhance detection of vertical/horizontal lines		// reducing weight of on-axis correlation values to enhance detection of vertical/horizontal lines
	// multiply correlation results inside the horizontal center strip 2*enhortho_width - 1 wide by enhortho_scale		// multiply correlation results inside the horizontal center strip 2*enhortho_width - 1 wide by enhortho_scale

	@@ -1905,9 +1908,10 @@ public class ImageDtt {
	);		);
	}		}
	// See if macro_mode uses color channels for non-color?		// See if macro_mode uses color channels for non-color?
	for (int chn = 0; chn <numcol; chn++) if (!isMonochrome() \|\| (chn == MONO_CHN) \|\| macro_mode) { // in monochrome mode skip all non-mono (green) channels		for (int ncol = 0; ncol <numcol; ncol++) {
	boolean debug_for_fpga = FPGA_COMPARE_DATA && (globalDebugLevel > 0) && (tileX == debug_tileX) && (tileY == debug_tileY) && (chn == 2);		if (!isMonochrome() \|\| (ncol == MONO_CHN) \|\| macro_mode) { // in monochrome mode skip all non-mono (green) channels
	if ((globalDebugLevel > -1) && (tileX == debug_tileX) && (tileY == debug_tileY) && (chn == 2)) {		boolean debug_for_fpga = FPGA_COMPARE_DATA && (globalDebugLevel > 0) && (tileX == debug_tileX) && (tileY == debug_tileY) && (ncol == 2);
			if ((globalDebugLevel > -1) && (tileX == debug_tileX) && (tileY == debug_tileY) && (ncol == 2)) {
	System.out.println("\nUsing "+(macro_mode?"MACRO":"PIXEL")+" mode, centerX="+centerX+", centerY="+centerY);		System.out.println("\nUsing "+(macro_mode?"MACRO":"PIXEL")+" mode, centerX="+centerX+", centerY="+centerY);
	System.out.println(disparity_array[tileY][tileX]+"\t"+		System.out.println(disparity_array[tileY][tileX]+"\t"+
	centersXY[0][0]+"\t"+centersXY[0][1]+"\t"+		centersXY[0][0]+"\t"+centersXY[0][1]+"\t"+
	@@ -1921,7 +1925,7 @@ public class ImageDtt {
	double [][] fpga_clt_data = new double [4][];		double [][] fpga_clt_data = new double [4][];
	double [] fpga_fract_shiftsXY;		double [] fpga_fract_shiftsXY;
	double [] fpga_centersXY = {centersXY[i][0],centersXY[i][1]};		double [] fpga_centersXY = {centersXY[i][0],centersXY[i][1]};
	int fpga_chn = chn; // ==2, green		int fpga_chn = ncol; // ==2, green
	// round to nearest 1/128 pix (supported by FPGA code)		// round to nearest 1/128 pix (supported by FPGA code)

Admin message