More debugging (5fb0ddfb) · Commits · Elphel / imagej-elphel

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -129,6 +129,7 @@ import com.elphel.imagej.tileprocessor.SymmVector;
	import com.elphel.imagej.tileprocessor.TwoQuadCLT;		import com.elphel.imagej.tileprocessor.TwoQuadCLT;
	import com.elphel.imagej.tileprocessor.lwoc.LwirWorld;		import com.elphel.imagej.tileprocessor.lwoc.LwirWorld;
	import com.elphel.imagej.vegetation.VegetationModel;		import com.elphel.imagej.vegetation.VegetationModel;
			import com.elphel.imagej.vegetation.VegetationSegment;

	import ij.CompositeImage;		import ij.CompositeImage;
	import ij.IJ;		import ij.IJ;
	@@ -863,6 +864,7 @@ public class Eyesis_Correction implements PlugIn, ActionListener {
	addButton("Process Merged", panelOrange, color_process);		addButton("Process Merged", panelOrange, color_process);
	addButton("Vegetation LMA", panelOrange, color_process);		addButton("Vegetation LMA", panelOrange, color_process);
	addButton("Combine LMA Segments", panelOrange, color_process);		addButton("Combine LMA Segments", panelOrange, color_process);
			addButton("Generate LWIR target", panelOrange, color_process);
	plugInFrame.add(panelOrange);		plugInFrame.add(panelOrange);
	}		}
	plugInFrame.pack();		plugInFrame.pack();
	@@ -5805,6 +5807,8 @@ public class Eyesis_Correction implements PlugIn, ActionListener {
	SYNC_COMMAND, // // SyncCommand SYNC_COMMAND,		SYNC_COMMAND, // // SyncCommand SYNC_COMMAND,
	CLT_PARAMETERS, //CLTParameters clt_parameters,		CLT_PARAMETERS, //CLTParameters clt_parameters,
	true); //boolean combine_segments);		true); //boolean combine_segments);
			} else if (label.equals("Generate LWIR target")) {
			VegetationSegment.generateSineTarget();
	}		}
	//		//
	}		}

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

+12 −12

src/main/java/com/elphel/imagej/vegetation/VegetationLMA.java

+77 −33

Original line number	Original line	Diff line number	Diff line
	@@ -871,8 +871,8 @@ min_str_neib_fpn 0.35
	public double terr_rms_diff = 1e-8; // 0.0001; virtually forever		public double terr_rms_diff = 1e-8; // 0.0001; virtually forever
	public int terr_last_series = -1; // Last LMA adjustment series (<0 - to the terr_num_iters.length -1)		public int terr_last_series = -1; // Last LMA adjustment series (<0 - to the terr_num_iters.length -1)
	public int [] terr_num_iters = {30}; //sequence on numbers of iterations		public int [] terr_num_iters = {30}; //sequence on numbers of iterations
	public boolean terr_only_special = true; // special sequences for terrain-only tiles		/// public boolean terr_only_special = true; // special sequences for terrain-only tiles
	public boolean terr_only_pix = true; // force per-pixel terrain elevation in terrain-only mode, overwrite fits_disable[TVAO_TERR_ELEV_PIX]		/// public boolean terr_only_pix = true; // force per-pixel terrain elevation in terrain-only mode, overwrite fits_disable[TVAO_TERR_ELEV_PIX]
	public int terr_only_series = -1; // similar to terr_last_series but for terrain-only mode (<0 - length of terr_only_num_iters)		public int terr_only_series = -1; // similar to terr_last_series but for terrain-only mode (<0 - length of terr_only_num_iters)
	public int [] terr_only_num_iters = {25}; // number of iterations		public int [] terr_only_num_iters = {25}; // number of iterations

	@@ -2246,8 +2246,8 @@ min_str_neib_fpn 0.35
	gd.addStringField ("Maximal iterations", intsToString(terr_num_iters), 40, "Maximal number of LMA iterations per series, 1 or several values.");		gd.addStringField ("Maximal iterations", intsToString(terr_num_iters), 40, "Maximal number of LMA iterations per series, 1 or several values.");

	gd.addMessage ("Terrain-only LMA");		gd.addMessage ("Terrain-only LMA");
	gd.addCheckbox ("Terrain-only mode", terr_only_special, "Treat terrain-only tiles differently (below).");		/// gd.addCheckbox ("Terrain-only mode", terr_only_special, "Treat terrain-only tiles differently (below).");
	gd.addCheckbox ("Adjust pixel elevation",terr_only_pix, "Force per-pixel terrain elevation adjustment in terrain-only mode.");		/// gd.addCheckbox ("Adjust pixel elevation",terr_only_pix, "Force per-pixel terrain elevation adjustment in terrain-only mode.");
	gd.addNumericField("Terrain-only iterations",terr_only_series, 0,3,"", "Last LMA series in terrain-only mode, -1 - to last available in the sequence below.");		gd.addNumericField("Terrain-only iterations",terr_only_series, 0,3,"", "Last LMA series in terrain-only mode, -1 - to last available in the sequence below.");
	gd.addStringField ("Maximal iterations", intsToString(terr_only_num_iters), 40, "Maximal number of LMA iterations per series, 1 or several values.");		gd.addStringField ("Maximal iterations", intsToString(terr_only_num_iters), 40, "Maximal number of LMA iterations per series, 1 or several values.");

	@@ -3041,8 +3041,8 @@ min_str_neib_fpn 0.35
	terr_last_series = (int) gd.getNextNumber();// int		terr_last_series = (int) gd.getNextNumber();// int
	terr_num_iters = StringToInts(gd.getNextString());		terr_num_iters = StringToInts(gd.getNextString());

	terr_only_special = gd.getNextBoolean();// boolean		/// terr_only_special = gd.getNextBoolean();// boolean
	terr_only_pix = gd.getNextBoolean();// boolean		/// terr_only_pix = gd.getNextBoolean();// boolean
	terr_only_series = (int) gd.getNextNumber();// int		terr_only_series = (int) gd.getNextNumber();// int
	terr_only_num_iters = StringToInts(gd.getNextString());		terr_only_num_iters = StringToInts(gd.getNextString());

	@@ -3811,8 +3811,8 @@ min_str_neib_fpn 0.35
	properties.setProperty(prefix+"terr_last_series", terr_last_series+""); // int		properties.setProperty(prefix+"terr_last_series", terr_last_series+""); // int
	properties.setProperty(prefix+"terr_num_iters", intsToString(terr_num_iters)+""); // int []		properties.setProperty(prefix+"terr_num_iters", intsToString(terr_num_iters)+""); // int []

	properties.setProperty(prefix+"terr_only_special", terr_only_special+""); // boolean		/// properties.setProperty(prefix+"terr_only_special", terr_only_special+""); // boolean
	properties.setProperty(prefix+"terr_only_pix", terr_only_pix+""); // boolean		/// properties.setProperty(prefix+"terr_only_pix", terr_only_pix+""); // boolean
	properties.setProperty(prefix+"terr_only_series", terr_only_series+""); // int		properties.setProperty(prefix+"terr_only_series", terr_only_series+""); // int
	properties.setProperty(prefix+"terr_only_num_iters", intsToString(terr_only_num_iters)+""); // int []		properties.setProperty(prefix+"terr_only_num_iters", intsToString(terr_only_num_iters)+""); // int []

	@@ -4596,8 +4596,8 @@ min_str_neib_fpn 0.35
	if (properties.getProperty(prefix+"terr_num_iter")!= null) terr_num_iters=new int[] {Integer.parseInt(properties.getProperty(prefix+"terr_num_iter"))};		if (properties.getProperty(prefix+"terr_num_iter")!= null) terr_num_iters=new int[] {Integer.parseInt(properties.getProperty(prefix+"terr_num_iter"))};
	if (properties.getProperty(prefix+"terr_num_iters")!= null) terr_num_iters=StringToInts((String) properties.getProperty(prefix+"terr_num_iters"));		if (properties.getProperty(prefix+"terr_num_iters")!= null) terr_num_iters=StringToInts((String) properties.getProperty(prefix+"terr_num_iters"));

Original line number	Original line	Diff line number	Diff line
	@@ -165,6 +165,7 @@ public class VegetationLMA {
	private double [] weights; // normalized so sum is 1.0 for all - samples and extra regularization		private double [] weights; // normalized so sum is 1.0 for all - samples and extra regularization

	boolean [] fits_disable = new boolean[TVAO_TYPES]; // (+)		boolean [] fits_disable = new boolean[TVAO_TYPES]; // (+)
			boolean [] fits_disable_terronly = new boolean[TVAO_TYPES]; // (+)
	private double terrain_correction = 0.02; // (+) weight of y_wavg		private double terrain_correction = 0.02; // (+) weight of y_wavg

	// Parameters saved/resored in a file		// Parameters saved/resored in a file
	@@ -234,8 +235,8 @@ public class VegetationLMA {
	public double ttop_rel_rad = 0.25; // (+) Relative (to the top height) sample ring radius		public double ttop_rel_rad = 0.25; // (+) Relative (to the top height) sample ring radius
	public double ttop_frac = 0.5; // (+) Minimal fraction of the ring pixels below sample level		public double ttop_frac = 0.5; // (+) Minimal fraction of the ring pixels below sample level
	public double ttop_rem_rad = 0.25; // (+) Relative (to the top height) remove transparency radius		public double ttop_rem_rad = 0.25; // (+) Relative (to the top height) remove transparency radius
	public boolean terr_only_special = true; // (+) special sequences for terrain-only tiles		// public boolean terr_only_special = true; // (+) special sequences for terrain-only tiles
	public boolean terr_only_pix = true; // (+) force per-pixel terrain elevation in terrain-only mode, overwrite fits_disable[TVAO_TERR_ELEV_PIX]		// public boolean terr_only_pix = true; // (+) force per-pixel terrain elevation in terrain-only mode, overwrite fits_disable[TVAO_TERR_ELEV_PIX]

	public double boost_parallax = 1; // (+)		public double boost_parallax = 1; // (+)
	public double max_parallax = 10; // (+)		public double max_parallax = 10; // (+)
	@@ -868,6 +869,7 @@ public class VegetationLMA {
	final boolean fit_terr_elev,		final boolean fit_terr_elev,
	final boolean fit_terr_elev_pix,		final boolean fit_terr_elev_pix,
	final boolean [] fits_disable,		final boolean [] fits_disable,
			final boolean [] fits_disable_terronly,
	final double reg_weights, // fraction of the total weight used for regularization		final double reg_weights, // fraction of the total weight used for regularization
	final double alpha_loss, // alpha quadratic growing loss for when out of [0,1] range		final double alpha_loss, // alpha quadratic growing loss for when out of [0,1] range
	final double alpha_loss_lin, // alpha linear growing loss for when out of [0,1] range and below minimal vegetation alpha		final double alpha_loss_lin, // alpha linear growing loss for when out of [0,1] range and below minimal vegetation alpha
	@@ -912,8 +914,8 @@ public class VegetationLMA {
	final double ttop_rel_rad, // 0.25; // Relative (to the top height) sample ring radius		final double ttop_rel_rad, // 0.25; // Relative (to the top height) sample ring radius
	final double ttop_frac, // 0.5; // Minimal fraction of the ring pixels below sample level		final double ttop_frac, // 0.5; // Minimal fraction of the ring pixels below sample level
	final double ttop_rem_rad, // 0.25; // Relative (to the top height) remove transparency radius		final double ttop_rem_rad, // 0.25; // Relative (to the top height) remove transparency radius
	final boolean terr_only_special,//true; // special sequences for terrain-only tiles		/// final boolean terr_only_special,//true; // special sequences for terrain-only tiles
	final boolean terr_only_pix, //true; // force per-pixel terrain elevation in terrain-only mode, overwrite fits_disable[TVAO_TERR_ELEV_PIX]		/// final boolean terr_only_pix, //true; // force per-pixel terrain elevation in terrain-only mode, overwrite fits_disable[TVAO_TERR_ELEV_PIX]
	final double boost_parallax, // increase weight of scene with maximal parallax relative to the reference scene		final double boost_parallax, // increase weight of scene with maximal parallax relative to the reference scene
	final double max_parallax, // do not consider maximal parallax above this (consider it a glitch)		final double max_parallax, // do not consider maximal parallax above this (consider it a glitch)
	final int debugLevel,		final int debugLevel,
	@@ -932,8 +934,12 @@ public class VegetationLMA {
	fits[TVAO_TERR_ELEV] = fit_terr_elev \|\| fit_terr_elev_pix; // always both		fits[TVAO_TERR_ELEV] = fit_terr_elev \|\| fit_terr_elev_pix; // always both
	fits[TVAO_TERR_ELEV_PIX] = fit_terr_elev \|\| fit_terr_elev_pix;		fits[TVAO_TERR_ELEV_PIX] = fit_terr_elev \|\| fit_terr_elev_pix;
	this.fits_disable = fits_disable.clone();		this.fits_disable = fits_disable.clone();
			this.fits_disable_terronly = (fits_disable_terronly != null)? fits_disable_terronly.clone() : null;
	// TODO: modify fits_disable with setter only ?		// TODO: modify fits_disable with setter only ?

Admin message