working snapshot, running composite (108cab36) · Commits · Elphel / imagej-elphel

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -768,6 +768,7 @@ min_str_neib_fpn 0.35
		public double terr_max_warp = 1.8;
		public int terr_max_elevation = 22; // maximal offset to consider when looking for vegetation influence
		public int terr_max_elev_terr = 2; // maximal offset to consider when looking for terrain of variable elevation
		public double terr_max_elev_chng = 0.5; // maximal terrain elevation change from last successfully used


		@Deprecated
		@@ -2130,6 +2131,7 @@ min_str_neib_fpn 0.35
		gd.addNumericField("Maximal warp", terr_max_warp, 5,7,"pix", "(1.8) Do not use scenes where distance between vegetation projection exceeds this.");
		gd.addNumericField("Max elevation/offset", terr_max_elevation, 0,3,"pix","Maximal offset to consider when looking for vegetation influence.");
		gd.addNumericField("Max terrain elevation",terr_max_elev_terr, 0,3,"pix","Maximal terrain offset to consider when looking for variable-elevation terrain.");
		gd.addNumericField("Max elevation cjange", terr_max_elev_chng, 5,7,"pix","Maximal terrain elevation change from the previous success.");

		gd.addNumericField("(Min influenced scenes)",terr_min_scenes, 0,3, "", "Deprecated: Minimal number of scenes (inside woi) vegetation pixel must influence.");
		gd.addNumericField("Minimal samples/scene",terr_min_samples_scene, 0,3,"","Minimal samples per scene used for fitting (skip scene if less).");
		@@ -2919,6 +2921,7 @@ min_str_neib_fpn 0.35
		terr_max_warp = gd.getNextNumber();// double
		terr_max_elevation = (int) gd.getNextNumber();// int
		terr_max_elev_terr = (int) gd.getNextNumber();// int
		terr_max_elev_chng = gd.getNextNumber();// double

		terr_min_scenes = (int) gd.getNextNumber();// int
		terr_min_samples_scene=(int) gd.getNextNumber();// int
		@@ -3668,6 +3671,8 @@ min_str_neib_fpn 0.35
		properties.setProperty(prefix+"terr_max_warp", terr_max_warp+""); // double
		properties.setProperty(prefix+"terr_max_elevation", terr_max_elevation+""); // int
		properties.setProperty(prefix+"terr_max_elev_terr", terr_max_elev_terr+""); // int
		properties.setProperty(prefix+"terr_max_elev_chng", terr_max_elev_chng+""); // double

		properties.setProperty(prefix+"terr_min_scenes", terr_min_scenes+""); // int
		properties.setProperty(prefix+"terr_min_samples_scene", terr_min_samples_scene+""); // int
		properties.setProperty(prefix+"terr_min_total_scenes", terr_min_total_scenes+""); // int
		@@ -4435,6 +4440,7 @@ min_str_neib_fpn 0.35
		if (properties.getProperty(prefix+"terr_max_warp")!= null) terr_max_warp=Double.parseDouble(properties.getProperty(prefix+"terr_max_warp"));
		if (properties.getProperty(prefix+"terr_max_elevation")!= null) terr_max_elevation=Integer.parseInt(properties.getProperty(prefix+"terr_max_elevation"));
		if (properties.getProperty(prefix+"terr_max_elev_terr")!= null) terr_max_elev_terr=Integer.parseInt(properties.getProperty(prefix+"terr_max_elev_terr"));
		if (properties.getProperty(prefix+"terr_max_elev_chng")!= null) terr_max_elev_chng=Double.parseDouble(properties.getProperty(prefix+"terr_max_elev_chng"));
		if (properties.getProperty(prefix+"terr_min_scenes")!= null) terr_min_scenes=Integer.parseInt(properties.getProperty(prefix+"terr_min_scenes"));
		if (properties.getProperty(prefix+"terr_min_samples_scene")!= null) terr_min_samples_scene=Integer.parseInt(properties.getProperty(prefix+"terr_min_samples_scene"));
		if (properties.getProperty(prefix+"terr_min_total_scenes")!= null) terr_min_total_scenes=Integer.parseInt(properties.getProperty(prefix+"terr_min_total_scenes"));
		@@ -5171,6 +5177,7 @@ min_str_neib_fpn 0.35
		imp.terr_max_warp = this.terr_max_warp;
		imp.terr_max_elevation = this.terr_max_elevation;
		imp.terr_max_elev_terr = this.terr_max_elev_terr;
		imp.terr_max_elev_chng = this.terr_max_elev_chng;
		imp.terr_min_scenes = this.terr_min_scenes;
		imp.terr_min_samples_scene = this.terr_min_samples_scene;
		imp.terr_min_total_scenes = this.terr_min_total_scenes;

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

+393 −30

File changed.

Preview size limit exceeded, changes collapsed.

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -1489,7 +1489,8 @@ public class VegetationModel {
		boolean continue_woi = clt_parameters.imp.terr_continue; // false;
		double max_warp = clt_parameters.imp.terr_max_warp; // 1.8 - do not use scenes where distance between vegetation projection exceeds this
		int max_elevation = clt_parameters.imp.terr_max_elevation; // maximal "elevation" to consider
		int max_elev_terr = clt_parameters.imp.terr_max_elev_terr; // maximal "elevation" to consider
		int max_elev_terr = clt_parameters.imp.terr_max_elev_terr; // 2.0 maximal "elevation" to consider
		double max_elev_terr_chg = clt_parameters.imp.terr_max_elev_chng; // 0.5 maximal terrain elevation change from last successfully used

		// int min_scenes = clt_parameters.imp.terr_min_scenes; // 1;
		// int min_samples_scene = clt_parameters.imp.terr_min_samples_scene; //10;
		@@ -2090,6 +2091,7 @@ public class VegetationModel {
		max_warp, // final double max_warp, // 1.8 - do not use scenes where distance between vegetation projection exceeds this
		max_elevation, // final int max_offset, // maximal "elevation" to consider
		max_elev_terr, // final int max_elev_terr, // maximal terrain "elevation" to consider
		max_elev_terr_chg, // final double max_elev_terr_chg, // 0.5 maximal terrain elevation change from last successfully used
		elevation_radius, // final double elevation_radius, // Radius of elevation/vegetation influence.
		null, // final boolean [] valid_scene_pix,
		hifreq_weight, //final double hifreq_weight, // 22.5 0 - do not use high-freq. Relative weight of laplacian components

Admin message