Commit 03ff002c authored by Andrey Filippov's avatar Andrey Filippov
Browse files

Before terrain elevation

parent 6a053711

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

+28 −3
Original line number Diff line number Diff line
@@ -805,10 +805,12 @@ min_str_neib_fpn 0.35 
	public double    terr_alpha_loss_lin =     0.0;

	public double    terr_alpha_offset =       0.1; // alpha offset near alpha ~=1.0

	public double    terr_alpha_0offset =      0.0; // New - a separate alpha offset nea alpha ~= 0.0

	public double    terr_alpha_min_veg =      -1; // old version 0.5;  // Minimal vegetation alpha. If (alpha-alpha_offset)/(1-2*alpha_offset) < alpha_min_veg, pull down to lpha_offset

	

	public double    terr_alpha_min_veg =      0.5; // old version 0.5;  // Minimal vegetation alpha. If (alpha-alpha_offset)/(1-2*alpha_offset) < alpha_min_veg, pull down to lpha_offset

	public double    terr_alpha_max_terrain =  0.75;// increase pull vegetation if below

	public double    terr_alpha_pull_pwr =     1.0; // raise extra pull to that power

	

	public double    terr_alpha_lpf =          2.5;  // pull to average of 4 neighbors

	public double    terr_alpha_lpf_border =   1.0;  // pull to average of 4 neighbors for border tiles (to keep stable)

	public boolean   terr_alpha_piece_linear = true;

	public double    terr_alpha_scale_avg =    1.0;  // scale average alpha (around 0.5) when pulling to it

	public double    terr_alpha_push =        12;    // push from alpha==0.5
@@ -824,6 +826,7 @@ min_str_neib_fpn 0.35 
	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_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_elev_pull0 =         1.0;  // pull elevation to initial (pre-adjustment) values

	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
@@ -2154,8 +2157,11 @@ min_str_neib_fpn 0.35 
		gd.addNumericField("Alpha offset @1.0",    terr_alpha_offset, 5,7,"",   "Start alpha losses below 1.0 by this value.");

		gd.addNumericField("Alpha offset @0.0",    terr_alpha_0offset, 5,7,"",  "Start alpha losses above 0.0 by this value.");

		gd.addNumericField("Minimal vegetation alpha", terr_alpha_min_veg, 5,7,"","Minimal vegetation alpha. If (alpha-alpha_offset)/(1-2*alpha_offset) < alpha_min_veg, pull down to lpha_offset.");

		gd.addNumericField("Maximal terrain alpha",terr_alpha_max_terrain, 5,7,"","Increase pull vegetation if below.");

		gd.addNumericField("Extra pull power",     terr_alpha_pull_pwr, 5,7,"","Raise extra pull (below maximal terrain alpha) to that power.");

		

		gd.addNumericField("Alpha diffusion",      terr_alpha_lpf, 5,7,"", 	    "Alpha diffusion to 4 ortho neighbors.");

		gd.addNumericField("Alpha diffusion border",terr_alpha_lpf_border, 5,7,"","Alpha diffusion to ortho neighbors on the border (for stability with low alpha diffusion).");

		gd.addCheckbox    ("Alpha piece-linear",   terr_alpha_piece_linear,     "Piece-linear alpha (_/\u203E, false - 0.0-cosine-1.0.");

		gd.addNumericField("Scale alpha",          terr_alpha_scale_avg, 5,7,"","Scale target (average of neighbors) alpha before pulling to it (not used now).");

		gd.addNumericField("Push alpha",           terr_alpha_push, 5,7,"", 	"Quadratic loss for middle alpha (push to 0.0 or 1.0.");
@@ -2171,8 +2177,9 @@ min_str_neib_fpn 0.35 
		gd.addNumericField("Terrain pull up",      terr_terr_pull_up, 5,7,"",	"Terrain pixels pull to initial (pre-adjustment) values when it is colder than initial (<0 - sqme as above).");

		gd.addNumericField("Terrain pull to average",terr_terr_pull_avg, 5,7,"","Pull terrain to the initial offset by the average offset of all terrain pixels.");

		gd.addNumericField("Vegetation pull",      terr_veget_pull0, 5,7,"",	"Vegetation pixels pull initial (pre-adjustment) values.");

		gd.addNumericField("Elevation pull",       terr_elev_pull0, 5,7,"",  	"Elevation pixels pull to initial (pre-adjustment) values.");

		gd.addNumericField("Boost for low alpha",  terr_veget_pull_low_alpha, 5,7,"x",	"Scale vegetation pull (terr_veget_pull0) for low alpha (mostly terrain) .");



		gd.addNumericField("Elevation pull",       terr_elev_pull0, 5,7,"",  	"Elevation pixels pull to initial (pre-adjustment) values.");

		gd.addCheckbox    ("Enable low vegetation",terr_elev_alpha_en,          "Enable loss for low vegetation with high opacity.");

		gd.addNumericField("Low vegetation loss",  terr_elev_alpha, 5,7,"",  	"Multiply alpha by under-low elevation for loss.");

		gd.addNumericField("Low vegetation power", terr_elev_alpha_pwr, 5,7,"", "Raise alpha to this power for low vegetation loss.");
@@ -2933,7 +2940,11 @@ min_str_neib_fpn 0.35 
		terr_alpha_offset =        gd.getNextNumber();// double 

		terr_alpha_0offset =       gd.getNextNumber();// double 

		terr_alpha_min_veg =       gd.getNextNumber();// double

		terr_alpha_max_terrain =   gd.getNextNumber();// double

		terr_alpha_pull_pwr =      gd.getNextNumber();// double

		

		terr_alpha_lpf =           gd.getNextNumber();// double 

		terr_alpha_lpf_border =    gd.getNextNumber();// double 

		terr_alpha_piece_linear =  gd.getNextBoolean();// boolean

		terr_alpha_scale_avg =     gd.getNextNumber();// double 

		terr_alpha_push =          gd.getNextNumber();// double
@@ -2950,6 +2961,7 @@ min_str_neib_fpn 0.35 
		terr_terr_pull_up =        gd.getNextNumber();// double 

		terr_terr_pull_avg =       gd.getNextNumber();// double 

		terr_veget_pull0 =         gd.getNextNumber();// double

		terr_veget_pull_low_alpha= gd.getNextNumber();// double

		terr_elev_pull0 =          gd.getNextNumber();// double

		terr_elev_alpha_en =       gd.getNextBoolean();// boolean

		terr_elev_alpha =          gd.getNextNumber();// double
@@ -3674,7 +3686,10 @@ min_str_neib_fpn 0.35 
		properties.setProperty(prefix+"terr_alpha_offset",           terr_alpha_offset+"");       // double 

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

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

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

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

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

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

		properties.setProperty(prefix+"terr_alpha_piece_linear",     terr_alpha_piece_linear+""); // boolean

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

		properties.setProperty(prefix+"terr_alpha_push",             terr_alpha_push+"");         // double
@@ -3691,6 +3706,7 @@ min_str_neib_fpn 0.35 
		properties.setProperty(prefix+"terr_terr_pull_up",           terr_terr_pull_up+"");       // double 

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

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

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

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

		properties.setProperty(prefix+"terr_elev_alpha_en",          terr_elev_alpha_en+"");      // boolean

		properties.setProperty(prefix+"terr_elev_alpha",             terr_elev_alpha+"");         // double
@@ -4435,7 +4451,10 @@ min_str_neib_fpn 0.35 
		if (properties.getProperty(prefix+"terr_alpha_offset")!=       null) terr_alpha_offset=Double.parseDouble(properties.getProperty(prefix+"terr_alpha_offset"));

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

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

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

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

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

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

		if (properties.getProperty(prefix+"terr_alpha_piece_linear")!= null) terr_alpha_piece_linear=Boolean.parseBoolean(properties.getProperty(prefix+"terr_alpha_piece_linear"));

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

		if (properties.getProperty(prefix+"terr_alpha_push")!=         null) terr_alpha_push=Double.parseDouble(properties.getProperty(prefix+"terr_alpha_push"));
@@ -4452,6 +4471,7 @@ min_str_neib_fpn 0.35 
		if (properties.getProperty(prefix+"terr_terr_pull_up")!=       null) terr_terr_pull_up=Double.parseDouble(properties.getProperty(prefix+"terr_terr_pull_up"));

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

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

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

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

		if (properties.getProperty(prefix+"terr_elev_alpha_en")!=      null) terr_elev_alpha_en=Boolean.parseBoolean(properties.getProperty(prefix+"terr_elev_alpha_en"));

		if (properties.getProperty(prefix+"terr_elev_alpha")!=         null) terr_elev_alpha=Double.parseDouble(properties.getProperty(prefix+"terr_elev_alpha"));
@@ -5164,7 +5184,11 @@ min_str_neib_fpn 0.35 
		imp.terr_alpha_offset =                  this.terr_alpha_offset;

		imp.terr_alpha_0offset =                 this.terr_alpha_0offset;

		imp.terr_alpha_min_veg =                 this.terr_alpha_min_veg;

		imp.terr_alpha_max_terrain =             this.terr_alpha_max_terrain;

		imp.terr_alpha_pull_pwr =                this.terr_alpha_pull_pwr;

		

		imp.terr_alpha_lpf =                     this.terr_alpha_lpf;                           

		imp.terr_alpha_lpf_border =              this.terr_alpha_lpf_border;                           

		imp.terr_alpha_piece_linear =            this.terr_alpha_piece_linear;                           

		imp.terr_alpha_scale_avg =               this.terr_alpha_scale_avg;                           

		imp.terr_alpha_push =                    this.terr_alpha_push;
@@ -5180,6 +5204,7 @@ min_str_neib_fpn 0.35 
		imp.terr_terr_pull_up =                  this.terr_terr_pull_up;                           

		imp.terr_terr_pull_avg =                 this.terr_terr_pull_avg;                           

		imp.terr_veget_pull0 =                   this.terr_veget_pull0; 

		imp.terr_veget_pull_low_alpha =          this.terr_veget_pull_low_alpha; 

		imp.terr_elev_pull0 =                    this.terr_elev_pull0;

		imp.terr_elev_alpha_en =                 this.terr_elev_alpha_en;

		imp.terr_elev_alpha =                    this.terr_elev_alpha;

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

+179 −63

File changed.

Preview size limit exceeded, changes collapsed.

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

+13 −2
Original line number Diff line number Diff line
@@ -1516,7 +1516,11 @@ public class VegetationModel { 
		double    alpha_0offset =     clt_parameters.imp.terr_alpha_0offset;       //  0.0; // if >0,  start losses above 0.0

		double    alpha_min_veg =     clt_parameters.imp.terr_alpha_min_veg;       //  0.5  // Minimal vegetation alpha. If (alpha-alpha_offset)/(1-2*alpha_offset) < alpha_min_veg, pull down to lpha_offset

		

		double    alpha_max_terrain = clt_parameters.imp.terr_alpha_max_terrain;   //  0.75; // () increase pull vegetation if below

		double    alpha_pull_pwr =    clt_parameters.imp.terr_alpha_pull_pwr;      //  1.0;  // () raise extra pull to that power

		

		double    alpha_lpf =         clt_parameters.imp.terr_alpha_lpf;           //  2.5; // 5; /// 2; // 5; /// 10; /// 15; // 10.0; // 5.0; // 10.0; // 3; // 10;   // 20; // 6.0; // 3.0; // 2.0;    // 1.5; // 5.0; // 0.5;         // pull to average of 4 neighbors

		double    alpha_lpf_border =  clt_parameters.imp.terr_alpha_lpf_border;    //  10.0; // pull to average of 4 neighbors for border tiles (to keep stable)

		boolean   alpha_piece_linear =clt_parameters.imp.terr_alpha_piece_linear;  // true; // false; // true;

		double    alpha_scale_avg =   clt_parameters.imp.terr_alpha_scale_avg;     //  1.0; // 1.1; // 0.9; // 2.0; // 1.5; // scale average alpha (around 0.5) when pulling to it

		double    alpha_push =        clt_parameters.imp.terr_alpha_push;          // 12; // 10.0; // 15.0;   // push from alpha==0.5
@@ -1533,6 +1537,9 @@ public class VegetationModel { 
		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    veget_pull0 =       clt_parameters.imp.terr_veget_pull0;         // 0.05; //0.1; // 0.03; ////// 0.05; ///// 0.1; //// 0.01; /// 0.1;    // pull vegetation to zero (makes sense with UM



		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; 

	    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
@@ -2095,7 +2102,10 @@ public class VegetationModel { 
					alpha_offset,      // final double             alpha_offset,       // quadratic loss when alpha > 1.0 - alpha_offset

					alpha_0offset,     // final double             alpha_0ffset,       // quadratic loss when alpha < alpha0_offset

					alpha_min_veg,     // final double             alpha_min_veg, // 0.5; // if (alpha-alpha_offset)/(1-2*alpha_offset) < alpha_min_veg, pull down to lpha_offset

					alpha_max_terrain, // final double             alpha_max_terrain, // 0.75; // () increase pull vegetation if below

					alpha_pull_pwr,    //final double             alpha_pull_pwr,    // 1.0;  // () raise extra pull to that power

					alpha_lpf,         // final double             alpha_lpf,          // pull to average of 4 neighbors

					alpha_lpf_border,  // final double             alpha_lpf_border, //  pull to average of 4 neighbors for border tiles (to keep stable)

					alpha_piece_linear, // final boolean       alpha_piece_linear, // true - piece-linear, false - half-cosine

					alpha_scale_avg,    // final double             alpha_scale_avg, //  = 1.2; // scale average alpha (around 0.5) when pulling to it

					alpha_push,         //  final double             alpha_push,      //  5.0;   // push from alpha==0.5
@@ -2111,6 +2121,7 @@ public class VegetationModel { 
					terr_pull_up,   // final double             terr_pull_up,   // Terrain pixels pull to initial (pre-adjustment) values when it is colder than initial.

					terr_pull_avg,  // final double             terr_pull_avg,  // pull terrain to the initial offset by the average offset of all terrain pixels  

					veget_pull0,    // final double             veget_pull0,    // pull vegetation to initial (pre-adjustment) values

					veget_pull_low_alpha, //final double        veget_pull_low_alpha, //  10; // ()scale pull0 for low alpha (mostly terrain) 

					elev_pull0,     // final double             elev_pull0,     // pull elevation to initial (pre-adjustment) values

					elev_alpha_en,  // final boolean            elev_alpha_en,  // false; // Enable loss for low vegetation with high opacity

					elev_alpha,     // final double             elev_alpha,     // 1.0;   // multiply alpha by under-low elevation for loss
@@ -2207,7 +2218,7 @@ public class VegetationModel { 
			}

			

			if ((show_final_result) && (debugLevel > -2)) { // 0)) {

				String reconstructed_title = reference_scene+"-reconstructed-pre-step"+step_restore; // 

				String reconstructed_title = reference_scene+"-recnstr-pre-step"+step_restore; // 

				vegetationLMA.showYfX(

						null, // double [] vector,

						reconstructed_title); // String title)
@@ -2328,7 +2339,7 @@ public class VegetationModel { 
//				continue;

			}

			if (show_final_result) {

				String reconstructed_title = reference_scene+"-reconstructed-"+vegetationLMA.getParametersDebugTitle()+"-series"+last_series;

				String reconstructed_title = reference_scene+"-recnstr-"+vegetationLMA.getParametersDebugTitle()+"-ser"+last_series;

				vegetationLMA.showYfX(

						null, // double [] vector,

						reconstructed_title); // String title)