Cleaning up, debugging blue sky (b36a0561) · Commits · Elphel / imagej-elphel

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

+14 −1

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

+66 −8

Original line number	Original line	Diff line number	Diff line
	@@ -385,6 +385,7 @@ public class CLTParameters {
	public double photo_offs = 21946; // weighted average offset target value, if photo_offs_set (and not photo_offs_balance)		public double photo_offs = 21946; // weighted average offset target value, if photo_offs_set (and not photo_offs_balance)

	public boolean photo_debug = false;// Generate images and text		public boolean photo_debug = false;// Generate images and text
			public boolean photo_each_debug = false;// Debug after Blue Sky

	public double tex_disp_adiffo = 0.10; // 0.35; // 0.3; disparity absolute tolerance to connect in ortho directions		public double tex_disp_adiffo = 0.10; // 0.35; // 0.3; disparity absolute tolerance to connect in ortho directions
	public double tex_disp_rdiffo = 0.08; // 0.12; // 0.1; disparity relative tolerance to connect in ortho directions		public double tex_disp_rdiffo = 0.08; // 0.12; // 0.1; disparity relative tolerance to connect in ortho directions
	@@ -448,6 +449,8 @@ public class CLTParameters {
	public double maxZ = 20000; // maximal distance to far object		public double maxZ = 20000; // maximal distance to far object
	public boolean limitZ = true; // limit Z, if false - remove triangle		public boolean limitZ = true; // limit Z, if false - remove triangle
	public double infinityDistance = 10000; // Distance to generate backdrop (0 - use regular backdrop)		public double infinityDistance = 10000; // Distance to generate backdrop (0 - use regular backdrop)
			public double min_from_inf = 500; // farthest non-infinity closer than infinity

	public int min_bgnd_tiles = 10; // Minimal number of background tiles to generate background		public int min_bgnd_tiles = 10; // Minimal number of background tiles to generate background

	public boolean gltf_emissive = false; // true; // Use emissive textures		public boolean gltf_emissive = false; // true; // Use emissive textures
	@@ -1487,6 +1490,7 @@ public class CLTParameters {
	properties.setProperty(prefix+"photo_offs_set", this.photo_offs_set+""); // int		properties.setProperty(prefix+"photo_offs_set", this.photo_offs_set+""); // int
	properties.setProperty(prefix+"photo_offs", this.photo_offs+""); // double		properties.setProperty(prefix+"photo_offs", this.photo_offs+""); // double
	properties.setProperty(prefix+"photo_debug", this.photo_debug+""); // boolean		properties.setProperty(prefix+"photo_debug", this.photo_debug+""); // boolean
			properties.setProperty(prefix+"photo_each_debug", this.photo_each_debug+""); // boolean

	properties.setProperty(prefix+"tex_disp_adiffo", this.tex_disp_adiffo+""); // double		properties.setProperty(prefix+"tex_disp_adiffo", this.tex_disp_adiffo+""); // double
	properties.setProperty(prefix+"tex_disp_rdiffo", this.tex_disp_rdiffo+""); // double		properties.setProperty(prefix+"tex_disp_rdiffo", this.tex_disp_rdiffo+""); // double
	@@ -1551,6 +1555,7 @@ public class CLTParameters {
	properties.setProperty(prefix+"limitZ", this.limitZ+"");		properties.setProperty(prefix+"limitZ", this.limitZ+"");

	properties.setProperty(prefix+"infinityDistance", this.infinityDistance +"");		properties.setProperty(prefix+"infinityDistance", this.infinityDistance +"");
			properties.setProperty(prefix+"min_from_inf", this.min_from_inf +"");
	properties.setProperty(prefix+"min_bgnd_tiles", this.min_bgnd_tiles+"");		properties.setProperty(prefix+"min_bgnd_tiles", this.min_bgnd_tiles+"");

	properties.setProperty(prefix+"gltf_emissive", this.gltf_emissive+"");		properties.setProperty(prefix+"gltf_emissive", this.gltf_emissive+"");
	@@ -2467,6 +2472,7 @@ public class CLTParameters {
	if (properties.getProperty(prefix+"photo_offs_set")!=null) this.photo_offs_set=Integer.parseInt(properties.getProperty(prefix+"photo_offs_set"));		if (properties.getProperty(prefix+"photo_offs_set")!=null) this.photo_offs_set=Integer.parseInt(properties.getProperty(prefix+"photo_offs_set"));
	if (properties.getProperty(prefix+"photo_offs")!=null) this.photo_offs=Double.parseDouble(properties.getProperty(prefix+"photo_offs"));		if (properties.getProperty(prefix+"photo_offs")!=null) this.photo_offs=Double.parseDouble(properties.getProperty(prefix+"photo_offs"));
	if (properties.getProperty(prefix+"photo_debug")!=null) this.photo_debug=Boolean.parseBoolean(properties.getProperty(prefix+"photo_debug"));		if (properties.getProperty(prefix+"photo_debug")!=null) this.photo_debug=Boolean.parseBoolean(properties.getProperty(prefix+"photo_debug"));
			if (properties.getProperty(prefix+"photo_each_debug")!=null) this.photo_each_debug=Boolean.parseBoolean(properties.getProperty(prefix+"photo_each_debug"));

	if (properties.getProperty(prefix+"tex_disp_adiffo")!=null) this.tex_disp_adiffo=Double.parseDouble(properties.getProperty(prefix+"tex_disp_adiffo"));		if (properties.getProperty(prefix+"tex_disp_adiffo")!=null) this.tex_disp_adiffo=Double.parseDouble(properties.getProperty(prefix+"tex_disp_adiffo"));

Original line number	Original line	Diff line number	Diff line
	@@ -136,28 +136,37 @@ public class IntersceneMatchParameters {
	//------------		//------------

	// Sky detection/filtering		// Sky detection/filtering
			public boolean sky_recalc = false; // force blue sky recalculation even if it exists
	public double sky_highest_min = -50; // lowest absolute value should not be higher (requires photometric)		public double sky_highest_min = -50; // lowest absolute value should not be higher (requires photometric)
	public double cold_frac = 0.005; // this and lower will scale fom by cold_scale		public double cold_frac = 0.005; // this and lower will scale fom by cold_scale
	public double hot_frac = 0.9; // this and above will scale fom by 1.0		public double hot_frac = 0.9; // this and above will scale fom by 1.0
	public double cold_scale = 0.2; // <=1.0. 1.0 - disables temperature dependence		public double cold_scale = 0.2; // <=1.0. 1.0 - disables temperature dependence
	public double sky_seed = 5.0; // start with product of strength by diff_second below this
			public double sky_seed = 5.0; // 5.0 start with product of strength by diff_second below this
	public double lma_seed = 2.0; // seed - disparity_lma limit double sky_lim = 15.0; // then expand to product of strength by diff_second below this		public double lma_seed = 2.0; // seed - disparity_lma limit double sky_lim = 15.0; // then expand to product of strength by diff_second below this
			public double seed_temp = 0.5; // seed colder that this point between min and max temp

	public int sky_shrink = 2;		public int sky_shrink = 2;
	public int seed_rows = 5; // sky should appear in this top rows		public int seed_rows = 5; // sky should appear in this top rows
			public double max_disparity = 0.3; // maximal strong sky disparity
			public double max_disparity_strength = 0.2; // maximal strength of high disparity sky
	public double sky_lim = 15.0; // then expand to product of strength by diff_second below this		public double sky_lim = 15.0; // then expand to product of strength by diff_second below this
			public double lim_temp = 0.5; // sky colder that this point between min and max temp
	public int sky_expand_extra = 0; // 1?		public int sky_expand_extra = 0; // 1?
	public int sky_bottleneck = 5;		public int sky_bottleneck = 5;
			public int sky_reexpand_extra = 9;// re-expand after bottleneck in addition to how it was shrank
	public double min_strength = 0.08;		public double min_strength = 0.08;
	public int lowest_sky_row = 50; // appears that low - invalid, remove completely		public int lowest_sky_row = 50; // appears that low - invalid, remove completely
	public double sky_bottom_override = -300; // maximal average sky value to override lowest_sky_row test		public double sky_bottom_override = -300; // maximal average sky value to override lowest_sky_row test
	public int sky_override_shrink = 10; // shrink detected sky before finding hottest tile there		public int sky_override_shrink = 6; // shrink detected sky before finding hottest tile there

	// Increase fom if there are enough LMA-defined similar tiles around		// Increase fom if there are enough LMA-defined similar tiles around
	public double disp_boost_min = 0.5;		public double disp_boost_min = 0.5;
	public double disp_boost_diff = 0.35;		public double disp_boost_diff = 0.35;
	public int disp_boost_neibs = 2;		public int disp_boost_neibs = 2;
	public double disp_boost_amount = 2.0;		public double disp_boost_amount = 2.0;
			public double scale_combo_strength = 0.4; // reduce strength when it comes from combo, not DSI-MAIN
			public boolean save_debug_images = true; // Save blue sky debug images in model directory

	// Some "AGC" to adjust how much to discard		// Some "AGC" to adjust how much to discard
	public int margin = 1; // do not use tiles if their centers are closer to the image edge		public int margin = 1; // do not use tiles if their centers are closer to the image edge
	@@ -519,6 +528,8 @@ public class IntersceneMatchParameters {

Admin message