working terrain-only mode (47963228) · Commits · Elphel / imagej-elphel

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

+60 −5

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

+1115 −372

File changed.

Preview size limit exceeded, changes collapsed.

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

+29 −6

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

+17 −9

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,7 @@ import com.elphel.imagej.tileprocessor.ImageDtt;
	import com.elphel.imagej.tileprocessor.QuadCLT;		import com.elphel.imagej.tileprocessor.QuadCLT;

	public class VegetationSegment {		public class VegetationSegment {
	public Rectangle woi_veg;		public Rectangle woi_max;
	public Rectangle woi;		public Rectangle woi;
	public double [] scene_offsets;		public double [] scene_offsets;
	public double [][] tva; // woi_veg		public double [][] tva; // woi_veg
	@@ -19,7 +19,7 @@ public class VegetationSegment {
	public String path;		public String path;
	public VegetationSegment(		public VegetationSegment(
	String path,		String path,
	Rectangle woi_veg,		Rectangle woi_max,
	Rectangle woi,		Rectangle woi,
	double terrain_offset,		double terrain_offset,
	double [] scene_offsets, // has NaNs		double [] scene_offsets, // has NaNs
	@@ -28,7 +28,7 @@ public class VegetationSegment {
	boolean [] overlaid) {		boolean [] overlaid) {
	this.path = path;		this.path = path;
	this.woi = woi;		this.woi = woi;
	this.woi_veg = woi_veg;		this.woi_max = woi_max;
	this.scene_offsets = scene_offsets;		this.scene_offsets = scene_offsets;
	this.tva = tva;		this.tva = tva;
	this.terrain_offset = terrain_offset;		this.terrain_offset = terrain_offset;
	@@ -43,7 +43,7 @@ public class VegetationSegment {
	for (int windx = 0; windx < woi_length; windx++) {		for (int windx = 0; windx < woi_length; windx++) {
	int wx = windx % woi.width;		int wx = windx % woi.width;
	int wy = windx / woi.height;		int wy = windx / woi.height;
	int wvindx = (wx + woi.x - woi_veg.x) + (wy + woi.y - woi_veg.y) * woi_veg.width;		int wvindx = (wx + woi.x - woi_max.x) + (wy + woi.y - woi_max.y) * woi_max.width;
	if (overlaid[windx]) {		if (overlaid[windx]) {
	tva[0][wvindx] += terrain_offset;		tva[0][wvindx] += terrain_offset;
	}		}
	@@ -56,7 +56,7 @@ public class VegetationSegment {
	boolean use_veg) {		boolean use_veg) {
	Rectangle bounds = null;		Rectangle bounds = null;
	for (VegetationSegment segment:segments) {		for (VegetationSegment segment:segments) {
	Rectangle selected_woi = use_veg ?segment.woi_veg : segment.woi;		Rectangle selected_woi = use_veg ?segment.woi_max : segment.woi;
	if (bounds == null) {		if (bounds == null) {
	bounds = new Rectangle(selected_woi);		bounds = new Rectangle(selected_woi);
	} else {		} else {
	@@ -92,12 +92,12 @@ public class VegetationSegment {
	double min_sw = 1e-4;		double min_sw = 1e-4;
	int out_length = out_woi.width*out_woi.height;		int out_length = out_woi.width*out_woi.height;
	int accum_indx = segments.length;		int accum_indx = segments.length;
	String [] top_titles = {"terrain","vegetation","alpha","elevation","confidence"};		String [] top_titles = {"terrain","vegetation","alpha","elevation","terrain_elevation","confidence"};
	double [][][] preview_data = new double [top_titles.length][accum_indx+1][out_length];		double [][][] preview_data = new double [top_titles.length][accum_indx+1][out_length];
	String [] titles = new String[accum_indx+1];		String [] titles = new String[accum_indx+1];
	for (int ns = 0; ns < segments.length; ns++) {		for (int ns = 0; ns < segments.length; ns++) {
	Rectangle woi = segments[ns].woi; // for confidence and limits for terrain		Rectangle woi = segments[ns].woi; // for confidence and limits for terrain
	Rectangle woi_veg = segments[ns].woi_veg;		Rectangle woi_veg = segments[ns].woi_max;
	titles[ns] = woi.toString();		titles[ns] = woi.toString();
	int woi_length = woi.width * woi.height;		int woi_length = woi.width * woi.height;
	int woi_veg_length = woi_veg.width * woi_veg.height;		int woi_veg_length = woi_veg.width * woi_veg.height;
	@@ -121,7 +121,7 @@ public class VegetationSegment {
	break;		break;
	case 1: // vegetation		case 1: // vegetation
	case 2: // alpha		case 2: // alpha
	case 3: // vegetation		case 3: // elevation
	for (int windx = 0; windx < woi_veg_length; windx++) {		for (int windx = 0; windx < woi_veg_length; windx++) {
	int x = windx % woi_veg.width + woi_veg.x - out_woi.x;		int x = windx % woi_veg.width + woi_veg.x - out_woi.x;
	int y = windx / woi_veg.width + woi_veg.y - out_woi.y;		int y = windx / woi_veg.width + woi_veg.y - out_woi.y;
	@@ -129,7 +129,15 @@ public class VegetationSegment {
	preview_data[t][ns][indx] = woi_tva[t][windx];		preview_data[t][ns][indx] = woi_tva[t][windx];
	}		}
	break;		break;
	case 4: // confidence		case 4: // terrain elevation
			for (int windx = 0; windx < woi_veg_length; windx++) {
			int x = windx % woi_veg.width + woi_veg.x - out_woi.x;
			int y = windx / woi_veg.width + woi_veg.y - out_woi.y;
			int indx = x + y * out_woi.width;
			preview_data[t][ns][indx] = woi_tva[t][windx]; // skipping terrain elevation average
			}
			break;
			case 5: // confidence
	for (int windx = 0; windx < woi_length; windx++) {		for (int windx = 0; windx < woi_length; windx++) {
	int x = windx % woi.width + woi_veg.x - out_woi.x;		int x = windx % woi.width + woi_veg.x - out_woi.x;
	int y = windx / woi.width + woi_veg.y - out_woi.y;		int y = windx / woi.width + woi_veg.y - out_woi.y;

Original line number	Original line	Diff line number	Diff line
	@@ -763,7 +763,8 @@ min_str_neib_fpn 0.35
	public boolean terr_fit_scenes = true; // adjust scene offsets (start from 0 always?)		public boolean terr_fit_scenes = true; // adjust scene offsets (start from 0 always?)
	public boolean terr_fit_elevations = false; // adjust elevation pixels (not yet implemented)		public boolean terr_fit_elevations = false; // adjust elevation pixels (not yet implemented)
	public boolean terr_fit_terr_elev = false; // adjust terrain elevation (common, maybe add per-pixel later)		public boolean terr_fit_terr_elev = false; // adjust terrain elevation (common, maybe add per-pixel later)
	public boolean [][] terr_fits_disable = {{false},{false},{false},{true,false,true},{false},{false}};		public boolean terr_fit_terr_elev_pix = false; // adjust terrain elevation (common, maybe add per-pixel later)
			public boolean [][] terr_fits_disable = {{false},{false},{false},{true,false,true},{false},{false},{false}};

	public double terr_max_warp = 1.8;		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_elevation = 22; // maximal offset to consider when looking for vegetation influence
	@@ -822,15 +823,20 @@ min_str_neib_fpn 0.35
	public double terr_terr_lpf = 0.1; // pull terrain to average of 4 neighbors		public double terr_terr_lpf = 0.1; // pull terrain to average of 4 neighbors
	public double terr_veget_lpf = 10.0; // pull vegetation to average of 4 neighbors		public double terr_veget_lpf = 10.0; // pull vegetation to average of 4 neighbors
	public double terr_elev_lpf = 50.0; // pull elevation to average of 4 neighbors		public double terr_elev_lpf = 50.0; // pull elevation to average of 4 neighbors
			public double terr_terr_elev_lpf = 10.0; // pull terrain elevation to average of 4 neighbors
	public double terr_terr_pull0 = 0.1; // pull terrain to initial (pre-adjustment) values		public double terr_terr_pull0 = 0.1; // pull terrain to initial (pre-adjustment) values
	public double terr_terr_pull_up= 0.25; // pull terrain to initial when it is colder		public double terr_terr_pull_up= 0.25; // pull terrain to initial when it is colder
	public double terr_terr_pull_avg= 0.1; // Pull terrain to the initial offset by the average offset of all terrain pixels		public double terr_terr_pull_avg= 0.1; // Pull terrain to the initial offset by the average offset of all terrain pixels
	public double terr_veget_pull0 = 5.0; // pull vegetation initial (pre-adjustment) values		public double terr_veget_pull0 = 5.0; // pull vegetation initial (pre-adjustment) values
	public double terr_veget_pull_low_alpha = 10; // scale (boost) pull0 for low alpha (mostly terrain)		public double terr_veget_pull_low_alpha = 10; // scale (boost) pull0 for low alpha (mostly terrain)
	public double terr_elev_pull0 = 1.0; // pull elevation to initial (pre-adjustment) values		public double terr_elev_pull0 = 1.0; // pull elevation to initial (pre-adjustment) values
			public double terr_terr_elev_pull0 = 1.0; // pull terrain elevation to average of all segment terrain elevation

	public boolean terr_elev_alpha_en = false;// Enable loss for low vegetation with high opacity		public boolean terr_elev_alpha_en = false;// Enable loss for low vegetation with high opacity
	public double terr_elev_alpha = 1.0; // multiply alpha by under-low elevation for loss		public double terr_elev_alpha = 1.0; // multiply alpha by under-low elevation for loss
	public double terr_elev_alpha_pwr = 2.0; // raise alpha to this power (when alpha > 0)		public double terr_elev_alpha_pwr = 2.0; // raise alpha to this power (when alpha > 0)


	public double terr_low_veget = 2.0; // (pix) Elevation considered low (lower loss for high alpha)		public double terr_low_veget = 2.0; // (pix) Elevation considered low (lower loss for high alpha)
	public double terr_scenes_pull0 = 1.0; // pull average scene offset to zero		public double terr_scenes_pull0 = 1.0; // pull average scene offset to zero
	// scaling elevation losses for high elevations (decrease pull and/or lpf for high elevations)		// scaling elevation losses for high elevations (decrease pull and/or lpf for high elevations)
	@@ -864,6 +870,11 @@ 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_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_num_iters = {25}; // number of iterations

	// second run		// second run

Original line number	Original line	Diff line number	Diff line
	@@ -1535,6 +1535,7 @@ public class VegetationModel {
	double terr_lpf = clt_parameters.imp.terr_terr_lpf; // 0.1; // 0.15; /// 0.2; /// 0.1; // pull terrain to average of 4 neighbors (very small)		double terr_lpf = clt_parameters.imp.terr_terr_lpf; // 0.1; // 0.15; /// 0.2; /// 0.1; // pull terrain to average of 4 neighbors (very small)
	double veget_lpf = clt_parameters.imp.terr_veget_lpf; // 0.2; //0.15; /// 0.2; //// 0.01; /// 0.1; // pull vegetation to average of 4 neighbors (very small - maybe not needed)		double veget_lpf = clt_parameters.imp.terr_veget_lpf; // 0.2; //0.15; /// 0.2; //// 0.01; /// 0.1; // pull vegetation to average of 4 neighbors (very small - maybe not needed)
	double elevation_lpf = clt_parameters.imp.terr_elev_lpf;		double elevation_lpf = clt_parameters.imp.terr_elev_lpf;
			double terr_elev_lpf = clt_parameters.imp.terr_terr_elev_lpf;
	double terr_pull0 = clt_parameters.imp.terr_terr_pull0; // 0.1; //0.03; ////// 0.05; ///// 0.1; //// 0.01; /// 0.2; /// 0.1; //pull terrain to zero (makes sense with UM		double terr_pull0 = clt_parameters.imp.terr_terr_pull0; // 0.1; //0.03; ////// 0.05; ///// 0.1; //// 0.01; /// 0.2; /// 0.1; //pull terrain to zero (makes sense with UM
	double terr_pull_up = clt_parameters.imp.terr_terr_pull_up; // 0.2; // Terrain pixels pull to initial (pre-adjustment) values when it is colder than initial.		double terr_pull_up = clt_parameters.imp.terr_terr_pull_up; // 0.2; // Terrain pixels pull to initial (pre-adjustment) values when it is colder than initial.
	double terr_pull_avg = clt_parameters.imp.terr_terr_pull_avg; // 0.1; // Pull terrain to the initial offset by the average offset of all terrain pixels		double terr_pull_avg = clt_parameters.imp.terr_terr_pull_avg; // 0.1; // Pull terrain to the initial offset by the average offset of all terrain pixels
	@@ -1543,6 +1544,9 @@ public class VegetationModel {
	double veget_pull_low_alpha = clt_parameters.imp.terr_veget_pull_low_alpha; //10; // scale pull0 for low alpha (mostly terrain)		double veget_pull_low_alpha = clt_parameters.imp.terr_veget_pull_low_alpha; //10; // scale pull0 for low alpha (mostly terrain)

	double elev_pull0 = clt_parameters.imp.terr_elev_pull0;		double elev_pull0 = clt_parameters.imp.terr_elev_pull0;
			double terr_elev_pull0 = clt_parameters.imp.terr_terr_elev_pull0;


	boolean elev_alpha_en= clt_parameters.imp.terr_elev_alpha_en; // false;// Enable loss for low vegetation with high opacity		boolean elev_alpha_en= clt_parameters.imp.terr_elev_alpha_en; // false;// Enable loss for low vegetation with high opacity
	double elev_alpha = clt_parameters.imp.terr_elev_alpha; // 1.0; // multiply alpha by under-low elevation for loss		double elev_alpha = clt_parameters.imp.terr_elev_alpha; // 1.0; // multiply alpha by under-low elevation for loss
	double elev_alpha_pwr = clt_parameters.imp.terr_elev_alpha_pwr; // 1.0; // multiply alpha by under-low elevation for loss		double elev_alpha_pwr = clt_parameters.imp.terr_elev_alpha_pwr; // 1.0; // multiply alpha by under-low elevation for loss
	@@ -1573,6 +1577,7 @@ public class VegetationModel {
	boolean fit_scenes = clt_parameters.imp.terr_fit_scenes; // true; // adjust scene offsets (start from 0 always?)		boolean fit_scenes = clt_parameters.imp.terr_fit_scenes; // true; // adjust scene offsets (start from 0 always?)
	boolean fit_elevations = clt_parameters.imp.terr_fit_elevations; // false; // adjust elevation pixels (not yet implemented)		boolean fit_elevations = clt_parameters.imp.terr_fit_elevations; // false; // adjust elevation pixels (not yet implemented)
	boolean fit_terr_elev = clt_parameters.imp.terr_fit_terr_elev; // false; // adjust terrain elevation (common, maybe add per-pixel later)		boolean fit_terr_elev = clt_parameters.imp.terr_fit_terr_elev; // false; // adjust terrain elevation (common, maybe add per-pixel later)
			boolean fit_terr_elev_pix = clt_parameters.imp.terr_fit_terr_elev_pix; // false; // adjust terrain elevation (common, maybe add per-pixel later)

	// boolean [] fit_disable = clt_parameters.imp.terr_fit_disable.clone();		// boolean [] fit_disable = clt_parameters.imp.terr_fit_disable.clone();
	boolean [][] fits_disable = new boolean[clt_parameters.imp.terr_fits_disable.length][];		boolean [][] fits_disable = new boolean[clt_parameters.imp.terr_fits_disable.length][];
	@@ -1589,6 +1594,13 @@ public class VegetationModel {
	int [] num_iters = clt_parameters.imp.terr_num_iters; // {25}; // 100;		int [] num_iters = clt_parameters.imp.terr_num_iters; // {25}; // 100;
	int last_series = clt_parameters.imp.terr_last_series; // -1; // 100;		int last_series = clt_parameters.imp.terr_last_series; // -1; // 100;
	if (last_series < 0) last_series = num_iters.length - 1;		if (last_series < 0) last_series = num_iters.length - 1;

			boolean terr_only_special = clt_parameters.imp.terr_only_special; // true; // special sequences for terrain-only tiles
			boolean terr_only_pix = clt_parameters.imp.terr_only_pix; // true; // force per-pixel terrain elevation in terrain-only mode, overwrite fits_disable[TVAO_TERR_ELEV_PIX]
			int terr_only_series = clt_parameters.imp.terr_only_series; // -1; // similar to terr_last_series but for terrain-only mode (<0 - length of terr_only_num_iters)
			int [] terr_only_num_iters=clt_parameters.imp.terr_only_num_iters; // {25}; // number of iterations
			if (terr_only_series < 0) terr_only_series = terr_only_num_iters.length - 1;

	// Combine parameters		// Combine parameters
	int border_width = clt_parameters.imp.terr_border_width; // 6;		int border_width = clt_parameters.imp.terr_border_width; // 6;
	boolean render_open = clt_parameters.imp.terr_render_open; // true; // render open areas (no vegetation offset)		boolean render_open = clt_parameters.imp.terr_render_open; // true; // render open areas (no vegetation offset)

Admin message