Commit 91124a2f authored by Andrey Filippov's avatar Andrey Filippov
Browse files

started major changes for elevation

parent 9ba553bb

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

+8 −2
Original line number Diff line number Diff line
@@ -775,6 +775,7 @@ min_str_neib_fpn 0.35 
	public double    terr_alpha_mm_hole    =   0.1;  // NaN to disable. Local "almost minimum" (lower than this fraction between min and max neighbor) is not subject to alpha_lpf

	public double    terr_terr_lpf =           0.1;  // pull terrain to average of 4 neighbors (very small)

	public double    terr_veget_lpf =          0.2;  // pull vegetation to average of 4 neighbors (very small - maybe not needed)

	public double    terr_elev_lpf =           0.1;  // pull elevation to average of 4 neighbors (very small - maybe not needed)

	public double    terr_terr_pull0 =         0.05; // pull terrain to zero (makes sense with UM

	public double    terr_veget_pull0 =        0.05; // pull vegetation to zero (makes sense with UM

	public double    terr_scenes_pull0 =       1.0;  // pull average scene offset to zero
@@ -2040,6 +2041,7 @@ min_str_neib_fpn 0.35 
		gd.addNumericField("Alpha MM fraction",    terr_alpha_mm_hole, 5,7,"",	"Disable diffusion for local \"almost minimum\" (lower than this fraction between min and max neighbors).");

		gd.addNumericField("Terrain diffusion",    terr_terr_lpf, 5,7,"",       "LPF for terrain pixels (diffusion to 4 neighbors).");

		gd.addNumericField("Vegetation diffusion", terr_veget_lpf, 5,7,"", 		"LPF for vegetation pixels (diffusion to 4 neighbors).");

		gd.addNumericField("Elevation diffusion",  terr_elev_lpf, 5,7,"", 		"LPF for elevation pixels (diffusion to 4 neighbors).");

		gd.addNumericField("Terrain pull zero",    terr_terr_pull0, 5,7,"",		"Terrain pixels pull to 0 (makes sense with UM).");

		gd.addNumericField("Vegetation pull zero", terr_veget_pull0, 5,7,"",	"Vegetation pixels pull to 0 (makes sense with UM).");

		gd.addNumericField("Pull scene offset",    terr_scenes_pull0, 5,7,"",	"Pull average scene offset to zero.");
@@ -2744,6 +2746,7 @@ min_str_neib_fpn 0.35 
		terr_alpha_mm_hole =       gd.getNextNumber();// double 

		terr_terr_lpf =            gd.getNextNumber();// double 

		terr_veget_lpf =           gd.getNextNumber();// double

		terr_elev_lpf =            gd.getNextNumber();// double

		terr_terr_pull0 =          gd.getNextNumber();// double 

		terr_veget_pull0 =         gd.getNextNumber();// double 

		terr_scenes_pull0 =        gd.getNextNumber();// double
@@ -3415,6 +3418,7 @@ min_str_neib_fpn 0.35 
		properties.setProperty(prefix+"terr_en_holes",               terr_en_holes+"");           // boolean

		properties.setProperty(prefix+"terr_terr_lpf",               terr_terr_lpf+"");           // double 

		properties.setProperty(prefix+"terr_veget_lpf",              terr_veget_lpf+"");          // double 

		properties.setProperty(prefix+"terr_elev_lpf",               terr_elev_lpf+"");           // double 

		properties.setProperty(prefix+"terr_terr_pull0",             terr_terr_pull0+"");         // double 

		properties.setProperty(prefix+"terr_veget_pull0",            terr_veget_pull0+"");        // double

		properties.setProperty(prefix+"terr_scenes_pull0",           terr_scenes_pull0+"");       // double
@@ -4109,6 +4113,7 @@ min_str_neib_fpn 0.35 
		if (properties.getProperty(prefix+"terr_alpha_mm_hole")!=      null) terr_alpha_mm_hole=Double.parseDouble(properties.getProperty(prefix+"terr_alpha_mm_hole"));

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

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

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

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

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

		if (properties.getProperty(prefix+"terr_scenes_pull0")!=       null) terr_scenes_pull0=Double.parseDouble(properties.getProperty(prefix+"terr_scenes_pull0"));
@@ -4770,6 +4775,7 @@ min_str_neib_fpn 0.35 
		imp.terr_alpha_mm_hole =                 this.terr_alpha_mm_hole;                           

		imp.terr_terr_lpf =                      this.terr_terr_lpf;                           

		imp.terr_veget_lpf =                     this.terr_veget_lpf;

		imp.terr_elev_lpf =                      this.terr_elev_lpf;

		imp.terr_terr_pull0 =                    this.terr_terr_pull0;                           

		imp.terr_veget_pull0 =                   this.terr_veget_pull0; 

		imp.terr_scenes_pull0 =                  this.terr_scenes_pull0;