Commit 48429931 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

before implementing interscene ERS correction

parent ba6fb0e3

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

+163 −25

File changed.

Preview size limit exceeded, changes collapsed.

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

+7 −1
Original line number Original line Diff line number Diff line
@@ -5010,6 +5010,9 @@ private Panel panel1, 
    } else if (label.equals("LIST extrinsics")) {

    } else if (label.equals("LIST extrinsics")) {

        DEBUG_LEVEL=MASTER_DEBUG_LEVEL;

        DEBUG_LEVEL=MASTER_DEBUG_LEVEL;

    	EYESIS_CORRECTIONS.setDebug(DEBUG_LEVEL);

    	EYESIS_CORRECTIONS.setDebug(DEBUG_LEVEL);

    	if (EYESIS_CORRECTIONS_AUX == null) {

    		EYESIS_CORRECTIONS_AUX = new EyesisCorrections(SYNC_COMMAND.stopRequested,CORRECTION_PARAMETERS.getAux());

    	}

    	listExtrinsics();

    	listExtrinsics();

    	return;

    	return;

/* ======================================================================== */

/* ======================================================================== */
@@ -6531,7 +6534,10 @@ private Panel panel1, 
		if (dir!=null) {

		if (dir!=null) {

			System.out.println("top directory = "+dir);

			System.out.println("top directory = "+dir);

		}

		}

		return MLStats.listExtrinsics(dir); // , mask);

		return MLStats.listExtrinsics(

				dir, // ); // , mask);

				EYESIS_CORRECTIONS,

				EYESIS_CORRECTIONS_AUX);

	}

	}





	public boolean mlRecalc() {

	public boolean mlRecalc() {

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -1461,7 +1461,7 @@ public class Corr2dLMA { 
	}

	}





	

	

	public double [][] lmaDisparityStrength( // restored from git

	public double [][] lmaDisparityStrength1( // restored from git

			double  lma_max_rel_rms,  // maximal relative (to average max/min amplitude LMA RMS) // May be up to 0.3)

			double  lma_max_rel_rms,  // maximal relative (to average max/min amplitude LMA RMS) // May be up to 0.3)

			double  lma_min_strength, // minimal composite strength (sqrt(average amp squared over absolute RMS)

			double  lma_min_strength, // minimal composite strength (sqrt(average amp squared over absolute RMS)

			double  lma_min_ac,       // minimal of A and C coefficients maximum (measures sharpest point/line)

			double  lma_min_ac,       // minimal of A and C coefficients maximum (measures sharpest point/line)
@@ -1510,7 +1510,7 @@ public class Corr2dLMA { 








	

	

	public double [][] lmaDisparityStrength0(

	public double [][] lmaDisparityStrength(

			double  lma_max_rel_rms,  // maximal relative (to average max/min amplitude LMA RMS) // May be up to 0.3)

			double  lma_max_rel_rms,  // maximal relative (to average max/min amplitude LMA RMS) // May be up to 0.3)

			double  lma_min_strength, // minimal composite strength (sqrt(average amp squared over absolute RMS)

			double  lma_min_strength, // minimal composite strength (sqrt(average amp squared over absolute RMS)

			double  lma_min_max_ac,   // minimal of A and C coefficients maximum (measures sharpest point/line)

			double  lma_min_max_ac,   // minimal of A and C coefficients maximum (measures sharpest point/line)
@@ -1554,7 +1554,7 @@ public class Corr2dLMA { 
			if ((strength < lma_min_strength) || Double.isNaN(disparity)) {

			if ((strength < lma_min_strength) || Double.isNaN(disparity)) {

				continue;

				continue;

			}

			}

//			strength = Math.sqrt(strength * Math.sqrt(abc[tile][0] * abc[tile][2])); // / area ); // new strength

			strength = Math.sqrt(strength * Math.sqrt(abc[tile][0] * abc[tile][2])); // / area ); // new strength

			ds[tile][0] = disparity;

			ds[tile][0] = disparity;

			ds[tile][1] = (strength * lma_str_scale) + lma_str_offset;

			ds[tile][1] = (strength * lma_str_scale) + lma_str_offset;

		}

		}

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

+543 −222

File changed.

Preview size limit exceeded, changes collapsed.

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

+24 −418

File changed.

Preview size limit exceeded, changes collapsed.