implementing non-quad 2D correlation (CPU) (182ed7f3) · Commits · Elphel / imagej-elphel

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -158,6 +158,9 @@ public class CLTParameters {
		public double fine_corr_y_2 = 0.0; // additionally shift image in port 2 in y direction
		public double fine_corr_x_3 = 0.0; // additionally shift image in port 3 in x direction
		public double fine_corr_y_3 = 0.0; // additionally shift image in port 3 in y direction

		// public double [][] fine_corr_xy;

		public boolean fine_corr_ignore = false; // Ignore manual pixel correction
		public boolean fine_corr_apply = true; // Apply and set to ignore manual pixel correction after extrinsics correction

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -1221,7 +1221,9 @@ public class EyesisDCT {

		if (this.correctionsParameters.deconvolve) { // process with DCT, otherwise use simple debayer
		ImageDtt image_dtt = new ImageDtt(
		4, // 4 sensors, will not be used here
		dctParameters.dct_size,
		null, // FIXME: needs ImageDttParameters (clt_parameters.img_dtt),
		false, // mono
		false, // lwir
		1.0); // Bayer( not monochrome), scale correlation strengths

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

+18 −9

Original line number	Diff line number	Diff line
		@@ -3113,7 +3113,9 @@ private Panel panel1,

		}
		ImageDtt image_dtt = new ImageDtt(
		4, // number of sensors - not used here ?
		DCT_PARAMETERS.dct_size,
		null, // FIXME: needs ImageDttParameters (clt_parameters.img_dtt),
		false, // mono
		false, // lwir
		1.0); // Bayer( not monochrome), scale correlation strengths
		@@ -3215,7 +3217,9 @@ private Panel panel1,

		}
		ImageDtt image_dtt = new ImageDtt(
		4, // number of sensors - not used here ?
		DCT_PARAMETERS.dct_size,
		null, // FIXME: needs ImageDttParameters (clt_parameters.img_dtt),
		false, // mono
		false, // lwir
		1.0); // Bayer( not monochrome), scale correlation strengths
		@@ -3309,7 +3313,7 @@ private Panel panel1,
		EYESIS_DCT.showKernels(); // show restored kernels
		}
		}
		EYESIS_DCT.processDCTChannelImages(
		EYESIS_DCT.processDCTChannelImages( // hard-wired 4 sensors!
		DCT_PARAMETERS, // EyesisCorrectionParameters.DCTParameters dct_parameters,
		DEBAYER_PARAMETERS, //EyesisCorrectionParameters.DebayerParameters debayerParameters,
		NONLIN_PARAMETERS, //EyesisCorrectionParameters.NonlinParameters nonlinParameters,
		@@ -4729,7 +4733,8 @@ private Panel panel1,
		}

		///========================================

		System.out.println("***** QUAD_CLT.cltDisparityScans() is removed");
		/*
		QUAD_CLT.cltDisparityScans(
		CLT_PARAMETERS, // EyesisCorrectionParameters.DCTParameters dct_parameters,
		DEBAYER_PARAMETERS, //EyesisCorrectionParameters.DebayerParameters debayerParameters,
		@@ -4740,7 +4745,7 @@ private Panel panel1,
		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
		@@ -8074,7 +8079,9 @@ private Panel panel1,
		}

		ImageDtt image_dtt = new ImageDtt(
		4, // number of sensors - not used here ?
		CLT_PARAMETERS.transform_size,
		CLT_PARAMETERS.img_dtt,
		false, // mono
		false, // lwir
		1.0); // Bayer( not monochrome), scale correlation strengths
		@@ -8208,7 +8215,9 @@ private Panel panel1,
		}
		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(
		4, // number of sensors
		CLT_PARAMETERS.transform_size,
		CLT_PARAMETERS.img_dtt,
		COLOR_PROC_PARAMETERS.isMonochrome(),
		COLOR_PROC_PARAMETERS.isLwir(),
		CLT_PARAMETERS.getScaleStrength(false)); // Bayer, not monochrome

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ public class Clt1d {

		public int transform_size = 8;
		int transform_len = 64;
		int nSens = 4;
		DttRad2 dtt;
		ImageDtt image_dtt;
		Correlation2d corr2d;
		@@ -46,11 +47,14 @@ public class Clt1d {
		dtt = new DttRad2(transform_size);
		dtt.set_window(1);
		image_dtt = new ImageDtt(
		nSens,
		transform_size,
		null, // FIXME: needs ImageDttParameters (clt_parameters.img_dtt),
		false,
		false,
		1.0);
		corr2d = new Correlation2d(
		nSens,
		transform_size, // int transform_size,
		false, // boolean monochrome,
		false); // boolean debug)

Admin message