refactoring, alignment with LWIR sensors (6c2fb8a0) · Commits · Elphel / imagej-elphel

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

+3949 −3915

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

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1247,7 +1247,9 @@ public class EyesisCorrectionParameters {

	String [] extensions = getSourceSuffixes();// ={this.sourceSuffix};		String [] extensions = getSourceSuffixes();// ={this.sourceSuffix};
	String [] prefixes = getSourcePrefixes();		String [] prefixes = getSourcePrefixes();
	int num_chn_files = numSubCameras + ((aux_camera != null)?aux_camera.numSubCameras : 0);		int num_chn_main = numSubCameras;
			int num_chn_aux = ((aux_camera != null)?aux_camera.numSubCameras : 0);
			int num_chn_files = num_chn_main + num_chn_aux;
	extensions[0] = sourceSuffix;		extensions[0] = sourceSuffix;
	prefixes[0] = sourcePrefix;		prefixes[0] = sourcePrefix;
	MultipleExtensionsFileFilter setFilter = new MultipleExtensionsFileFilter(prefixes,extensions,"Image sets");		MultipleExtensionsFileFilter setFilter = new MultipleExtensionsFileFilter(prefixes,extensions,"Image sets");
	@@ -1281,7 +1283,10 @@ public class EyesisCorrectionParameters {
	// String [] setChnFiles = files[nFile].list(setFilter);		// String [] setChnFiles = files[nFile].list(setFilter);
	File [] setChnFiles = files[nFile].listFiles(setFilter);		File [] setChnFiles = files[nFile].listFiles(setFilter);
	int num_match = setChnFiles.length;		int num_match = setChnFiles.length;
	if (num_match == num_chn_files) { // only use sets of exact number of files		if ( (num_match == num_chn_files) \|\| // all files for main and aux
			(num_match == num_chn_main) \|\| // only main camera files
			(num_match == num_chn_aux)) // only aux camera files
			{ // only use sets of exact number of files
	setDirList.add(files[nFile]);		setDirList.add(files[nFile]);
	for (File f: setChnFiles) {		for (File f: setChnFiles) {
	setFilesList.add(f);		setFilesList.add(f);

src/main/java/com/elphel/imagej/correction/EyesisDCT.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1220,7 +1220,7 @@ public class EyesisDCT {
	}		}

	if (this.correctionsParameters.deconvolve) { // process with DCT, otherwise use simple debayer		if (this.correctionsParameters.deconvolve) { // process with DCT, otherwise use simple debayer
	ImageDtt image_dtt = new ImageDtt(false); // Bayer, not monochrome		ImageDtt image_dtt = new ImageDtt(false, 1.0); // Bayer( not monochrome), scale correlation strengths
	double [][][][] dct_data = image_dtt.mdctStack(		double [][][][] dct_data = image_dtt.mdctStack(
	stack,		stack,
	channel,		channel,

src/main/java/com/elphel/imagej/correction/Eyesis_Correction.java

+29 −100

Original line number	Original line	Diff line number	Diff line
	@@ -3064,7 +3064,7 @@ private Panel panel1,
	}		}

	}		}
	ImageDtt image_dtt = new ImageDtt(false); // Bayer, not monochrome		ImageDtt image_dtt = new ImageDtt(false, 1.0); // Bayer( not monochrome), scale correlation strengths
	double [][][][] dctdc_data = image_dtt.mdctScale(		double [][][][] dctdc_data = image_dtt.mdctScale(
	DBG_IMP.getStack(),		DBG_IMP.getStack(),
	DCT_PARAMETERS.kernel_chn,		DCT_PARAMETERS.kernel_chn,
	@@ -3162,7 +3162,7 @@ private Panel panel1,
	}		}

	}		}
	ImageDtt image_dtt = new ImageDtt(false); // Bayer, not monochrome		ImageDtt image_dtt = new ImageDtt(false, 1.0); // Bayer( not monochrome), scale correlation strengths
	double [][][][] dctdc_data = image_dtt.mdctStack(		double [][][][] dctdc_data = image_dtt.mdctStack(
	DBG_IMP.getStack(),		DBG_IMP.getStack(),
	DCT_PARAMETERS.kernel_chn,		DCT_PARAMETERS.kernel_chn,
	@@ -4631,7 +4631,6 @@ private Panel panel1,
	QUAD_CLT.cltDisparityScans(		QUAD_CLT.cltDisparityScans(
	CLT_PARAMETERS, // EyesisCorrectionParameters.DCTParameters dct_parameters,		CLT_PARAMETERS, // EyesisCorrectionParameters.DCTParameters dct_parameters,
	DEBAYER_PARAMETERS, //EyesisCorrectionParameters.DebayerParameters debayerParameters,		DEBAYER_PARAMETERS, //EyesisCorrectionParameters.DebayerParameters debayerParameters,
	// NONLIN_PARAMETERS, //EyesisCorrectionParameters.NonlinParameters nonlinParameters,
	COLOR_PROC_PARAMETERS, //EyesisCorrectionParameters.ColorProcParameters colorProcParameters,		COLOR_PROC_PARAMETERS, //EyesisCorrectionParameters.ColorProcParameters colorProcParameters,
	CHANNEL_GAINS_PARAMETERS, //CorrectionColorProc.ColorGainsParameters channelGainParameters,		CHANNEL_GAINS_PARAMETERS, //CorrectionColorProc.ColorGainsParameters channelGainParameters,
	RGB_PARAMETERS, //EyesisCorrectionParameters.RGBParameters rgbParameters,		RGB_PARAMETERS, //EyesisCorrectionParameters.RGBParameters rgbParameters,
	@@ -4678,82 +4677,12 @@ private Panel panel1,

	clt3d(adjust_extrinsics, adjust_poly, dry_run);		clt3d(adjust_extrinsics, adjust_poly, dry_run);
	return;		return;
	} else if (label.equals("AUX extrinsics") \|\| label.equals("AUX Poly corr")) {		} else if (label.equals("AUX 3D") \|\| label.equals("AUX extrinsics") \|\| label.equals("AUX Poly corr")) {
	boolean adjust_extrinsics = label.equals("AUX extrinsics") \|\| label.equals("AUX Poly corr");		boolean adjust_extrinsics = label.equals("AUX extrinsics") \|\| label.equals("AUX Poly corr");
	boolean adjust_poly = label.equals("AUX Poly corr");		boolean adjust_poly = label.equals("AUX Poly corr");
	DEBUG_LEVEL=MASTER_DEBUG_LEVEL;		DEBUG_LEVEL=MASTER_DEBUG_LEVEL;
	EYESIS_CORRECTIONS.setDebug(DEBUG_LEVEL);		EYESIS_CORRECTIONS.setDebug(DEBUG_LEVEL);
	clt3d_aux(adjust_extrinsics, adjust_poly);		clt3d_aux(adjust_extrinsics, adjust_poly);
	/*
	if (QUAD_CLT_AUX == null){
	if (EYESIS_CORRECTIONS_AUX == null) {
	EYESIS_CORRECTIONS_AUX = new EyesisCorrections(SYNC_COMMAND.stopRequested,CORRECTION_PARAMETERS.getAux());
	}
	QUAD_CLT_AUX = new QuadCLT (
	QuadCLT.PREFIX_AUX,
	PROPERTIES,
	EYESIS_CORRECTIONS_AUX,
	CORRECTION_PARAMETERS.getAux());
	if (DEBUG_LEVEL > 0){
	System.out.println("Created new QuadCLT instance for AUX camera, will need to read CLT kernels for aux camera");
	}
	}
	String configPath=getSaveCongigPath();
	if (configPath.equals("ABORT")) return;

	EYESIS_CORRECTIONS_AUX.initSensorFiles(DEBUG_LEVEL);
	int numChannelsAux=EYESIS_CORRECTIONS_AUX.getNumChannels();
	CHANNEL_GAINS_PARAMETERS_AUX.modifyNumChannels(numChannelsAux);

	if (!QUAD_CLT_AUX.CLTKernelsAvailable()){
	if (DEBUG_LEVEL > 0){
	System.out.println("Reading AUX CLT kernels");
	}
	QUAD_CLT_AUX.readCLTKernels(
	CLT_PARAMETERS,
	THREADS_MAX,
	UPDATE_STATUS, // update status info
	DEBUG_LEVEL);

	if (DEBUG_LEVEL > 1){
	QUAD_CLT_AUX.showCLTKernels(
	THREADS_MAX,
	UPDATE_STATUS, // update status info
	DEBUG_LEVEL);
	}
	}

	if (!QUAD_CLT_AUX.geometryCorrectionAvailable()){
	if (DEBUG_LEVEL > 0){
	System.out.println("Calculating geometryCorrection for AUX camera");
	}
	if (!QUAD_CLT_AUX.initGeometryCorrection(DEBUG_LEVEL+2)){
	return;
	}
	}

	QUAD_CLT_AUX.processCLTQuads3d(
	adjust_extrinsics, // boolean adjust_extrinsics,
	adjust_poly, // boolean adjust_poly,
	CLT_PARAMETERS, // EyesisCorrectionParameters.DCTParameters dct_parameters,
	DEBAYER_PARAMETERS, //EyesisCorrectionParameters.DebayerParameters debayerParameters,
	COLOR_PROC_PARAMETERS, //EyesisCorrectionParameters.ColorProcParameters colorProcParameters,
	CHANNEL_GAINS_PARAMETERS_AUX, //CorrectionColorProc.ColorGainsParameters channelGainParameters,
	RGB_PARAMETERS, //EyesisCorrectionParameters.RGBParameters rgbParameters,
	EQUIRECTANGULAR_PARAMETERS, // EyesisCorrectionParameters.EquirectangularParameters equirectangularParameters,
	THREADS_MAX, //final int threadsMax, // maximal number of threads to launch
	UPDATE_STATUS, //final boolean updateStatus,
	DEBUG_LEVEL); //final int debugLevel);


	if (configPath!=null) {
	saveTimestampedProperties( // save config again
	configPath, // full path or null
	null, // use as default directory if path==null
	true,
	PROPERTIES);
	}
	*/
	return;		return;

	} else if (label.equals("CLT planes")) {		} else if (label.equals("CLT planes")) {
	@@ -5826,7 +5755,7 @@ private Panel panel1,
	TWO_QUAD_CLT, // TwoQuadCLT twoQuadCLT, //maybe null in no-rig mode, otherwise may contain rig measurements to be used as infinity ground truth		TWO_QUAD_CLT, // TwoQuadCLT twoQuadCLT, //maybe null in no-rig mode, otherwise may contain rig measurements to be used as infinity ground truth
	CLT_PARAMETERS, // EyesisCorrectionParameters.DCTParameters dct_parameters,		CLT_PARAMETERS, // EyesisCorrectionParameters.DCTParameters dct_parameters,
	DEBAYER_PARAMETERS, // EyesisCorrectionParameters.DebayerParameters debayerParameters,		DEBAYER_PARAMETERS, // EyesisCorrectionParameters.DebayerParameters debayerParameters,
	COLOR_PROC_PARAMETERS, //EyesisCorrectionParameters.ColorProcParameters colorProcParameters,		COLOR_PROC_PARAMETERS_AUX, // EyesisCorrectionParameters.ColorProcParameters colorProcParameters,
	CHANNEL_GAINS_PARAMETERS_AUX, // CorrectionColorProc.ColorGainsParameters channelGainParameters,		CHANNEL_GAINS_PARAMETERS_AUX, // CorrectionColorProc.ColorGainsParameters channelGainParameters,
	RGB_PARAMETERS, // EyesisCorrectionParameters.RGBParameters rgbParameters,		RGB_PARAMETERS, // EyesisCorrectionParameters.RGBParameters rgbParameters,
	EQUIRECTANGULAR_PARAMETERS, // EyesisCorrectionParameters.EquirectangularParameters equirectangularParameters,		EQUIRECTANGULAR_PARAMETERS, // EyesisCorrectionParameters.EquirectangularParameters equirectangularParameters,
	@@ -6840,7 +6769,7 @@ private Panel panel1,
	}		}
	}		}

	ImageDtt image_dtt = new ImageDtt(false); // Bayer, not monochrome		ImageDtt image_dtt = new ImageDtt(false, 1.0); // Bayer( not monochrome), scale correlation strengths
	double [][][][][] clt_data = image_dtt.cltStack(		double [][][][][] clt_data = image_dtt.cltStack(
	DBG_IMP.getStack(),		DBG_IMP.getStack(),
	0, // CLT_PARAMETERS.kernel_chn,		0, // CLT_PARAMETERS.kernel_chn,
	@@ -6970,7 +6899,7 @@ private Panel panel1,

	}		}
	String suffix = "-dx_"+(CLT_PARAMETERS.ishift_x+CLT_PARAMETERS.shift_x)+"_dy_"+(CLT_PARAMETERS.ishift_y+CLT_PARAMETERS.shift_y);		String suffix = "-dx_"+(CLT_PARAMETERS.ishift_x+CLT_PARAMETERS.shift_x)+"_dy_"+(CLT_PARAMETERS.ishift_y+CLT_PARAMETERS.shift_y);
	ImageDtt image_dtt = new ImageDtt(COLOR_PROC_PARAMETERS.isMonochrome()); // Bayer, not monochrome		ImageDtt image_dtt = new ImageDtt(COLOR_PROC_PARAMETERS.isMonochrome(), CLT_PARAMETERS.getScaleStrength(false)); // Bayer, not monochrome
	String [] titles = {		String [] titles = {
	"redCC", "redSC", "redCS", "redSS",		"redCC", "redSC", "redCS", "redSS",
	"blueCC", "blueSC", "blueCS", "blueSS",		"blueCC", "blueSC", "blueCS", "blueSS",
	@@ -7059,7 +6988,7 @@ private Panel panel1,
	clt_data[chn], // final double [][][][] data1, // array [tilesY][tilesX][4][dct_size*dct_size]		clt_data[chn], // final double [][][][] data1, // array [tilesY][tilesX][4][dct_size*dct_size]
	clt_data2[chn], // final double [][][][] data2, // array [tilesY][tilesX][4][dct_size*dct_size]		clt_data2[chn], // final double [][][][] data2, // array [tilesY][tilesX][4][dct_size*dct_size]
	CLT_PARAMETERS.transform_size, // final int dct_size,		CLT_PARAMETERS.transform_size, // final int dct_size,
	CLT_PARAMETERS.fat_zero, // final double fat_zero, // add to denominator to modify phase correlation (same units as data1, data2)		CLT_PARAMETERS.getFatZero(image_dtt.isMonochrome()), // final double fat_zero, // add to denominator to modify phase correlation (same units as data1, data2)
	CLT_PARAMETERS.tileX, //final int debug_tileX		CLT_PARAMETERS.tileX, //final int debug_tileX
	CLT_PARAMETERS.tileY, //final int debug_tileY		CLT_PARAMETERS.tileY, //final int debug_tileY

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

+33 −2

File changed.

Preview size limit exceeded, changes collapsed.

Original line number	Original line	Diff line number	Diff line
	@@ -29,9 +29,12 @@ public class CLTParameters {
	public int dbg_mode = 0; // 0 - normal, +1 - no DCT/IDCT		public int dbg_mode = 0; // 0 - normal, +1 - no DCT/IDCT
	public int ishift_x = 0; // debug feature - shift source image by this pixels left		public int ishift_x = 0; // debug feature - shift source image by this pixels left
	public int ishift_y = 0; // debug feature - shift source image by this pixels down		public int ishift_y = 0; // debug feature - shift source image by this pixels down
	public double fat_zero = 0.0; // modify phase correlation to prevent division by very small numbers		private double fat_zero = 0.05; // modify phase correlation to prevent division by very small numbers
			private double fat_zero_mono = 0.1; // modify phase correlation to prevent division by very small numbers
	private double corr_sigma = 0.8; // LPF correlation sigma		private double corr_sigma = 0.8; // LPF correlation sigma
	private double corr_sigma_mono = 0.1; // LPF correlation sigma for monochrome images		private double corr_sigma_mono = 0.1; // LPF correlation sigma for monochrome images
			private double scale_strength_main = 1.0; // leave as is
			private double scale_strength_aux = 0.3; // reduce to match lower sigma
	public boolean norm_kern = true; // normalize kernels		public boolean norm_kern = true; // normalize kernels
	public boolean gain_equalize = false;// equalize green channel gain (bug fix for wrong exposure in Exif ?)		public boolean gain_equalize = false;// equalize green channel gain (bug fix for wrong exposure in Exif ?)
	public boolean colors_equalize = true; // equalize R/G, B/G of the individual channels		public boolean colors_equalize = true; // equalize R/G, B/G of the individual channels
	@@ -168,6 +171,7 @@ public class CLTParameters {
	public boolean ly_com_roll= false; // Enable common roll (valid for high disparity range only)		public boolean ly_com_roll= false; // Enable common roll (valid for high disparity range only)
	public int ly_par_sel = 0; // Manually select the parameter mask bit 0 - sym0, bit1 - sym1, ... (0 - use checkbox selections above)		public int ly_par_sel = 0; // Manually select the parameter mask bit 0 - sym0, bit1 - sym1, ... (0 - use checkbox selections above)

			public boolean ly_right_left= false; // equalize weights of right/left FoV (use with horizon in both halves and gross infinity correction)
	public double ly_inf_frac = 0.5; // Relative weight of infinity calibration data		public double ly_inf_frac = 0.5; // Relative weight of infinity calibration data
	public double ly_inf_max_disparity = 0.2; // Maximal disparity to be treated as infinity when adjusting with rig data		public double ly_inf_max_disparity = 0.2; // Maximal disparity to be treated as infinity when adjusting with rig data
	public boolean ly_inf_disp= false; // Correct disparity for infinity tiles		public boolean ly_inf_disp= false; // Correct disparity for infinity tiles
	@@ -186,7 +190,8 @@ public class CLTParameters {
	public double lym_overexp = 0.0001; // Any (near) saturated pixels - discard tile (see sat_level also)		public double lym_overexp = 0.0001; // Any (near) saturated pixels - discard tile (see sat_level also)
	public boolean lym_update_disp = true; // Update target disparity after each step		public boolean lym_update_disp = true; // Update target disparity after each step
	public int lym_iter = 25; // Maximal number of iterations		public int lym_iter = 25; // Maximal number of iterations
	public double lym_change = 1e-5; // Parameter vector difference to exit 4e-6 - OK		private double lym_change = 1e-5; // Parameter vector difference to exit 4e-6 - OK
			private double lym_change_aux = 1e-4; // same for aux camera (currntly)lwir
	public double lym_poly_change = 0.002; // Parameter vector difference to exit from polynomial correction		public double lym_poly_change = 0.002; // Parameter vector difference to exit from polynomial correction

	public boolean lyf_filter = true; // Filter lazy eye pairs by their values		public boolean lyf_filter = true; // Filter lazy eye pairs by their values
	@@ -770,6 +775,18 @@ public class CLTParameters {
	public double getCorrSigma(boolean monochrome) {		public double getCorrSigma(boolean monochrome) {
	return monochrome ? corr_sigma_mono : corr_sigma;		return monochrome ? corr_sigma_mono : corr_sigma;
	}		}
			public double getFatZero(boolean monochrome) {
			return monochrome ? fat_zero_mono : fat_zero;
			}

			public double getScaleStrength(boolean aux) {
			return aux ? scale_strength_aux : scale_strength_main;