before redoing neighbor processing for pivots

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

@@ -785,11 +785,12 @@ min_str_neib_fpn	0.35
 	public double    terr_alpha_weight_center =1.5;  // weight of center alpha pixel relative to each of the 4 ortho ones
 	public boolean   terr_en_holes =           true; // enable small holes // maybe second pass after good fit with vegetation and search for correct offset?
 	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_terr_lpf =           0.1;  // pull terrain to average of 4 neighbors
+	public double    terr_veget_lpf =          0.2;  // pull vegetation to average of 4 neighbors
+	public double    terr_elev_lpf =           0.1;  // pull elevation to average of 4 neighbors
+	public double    terr_terr_pull0 =         0.05; // pull terrain to initial (pre-adjustment) values
+	public double    terr_veget_pull0 =        0.05; // pull vegetation initial (pre-adjustment) values
+	public double    terr_elev_pull0 =         0.1;  // pull elevation to initial (pre-adjustment) values
 	public double    terr_scenes_pull0 =       1.0;  // pull average scene offset to zero
 
 	// LMA parameters        
@@ -2057,8 +2058,9 @@ min_str_neib_fpn	0.35
 		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("Terrain pull",         terr_terr_pull0, 5,7,"",		"Terrain pixels pull to initial (pre-adjustment) values.");
+		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("Pull scene offset",    terr_scenes_pull0, 5,7,"",	"Pull average scene offset to zero.");
 	
 		gd.addMessage     ("LMA parameters");
@@ -2766,7 +2768,8 @@ min_str_neib_fpn	0.35
 		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_veget_pull0 =         gd.getNextNumber();// double
+		terr_elev_pull0 =          gd.getNextNumber();// double
 		terr_scenes_pull0 =        gd.getNextNumber();// double
 		terr_boost_parallax =      gd.getNextNumber();// double 
 		terr_max_parallax =        gd.getNextNumber();// double 
@@ -3441,6 +3444,7 @@ min_str_neib_fpn	0.35
 		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_elev_pull0",             terr_elev_pull0+"");         // double
 		properties.setProperty(prefix+"terr_scenes_pull0",           terr_scenes_pull0+"");       // double
 
 		properties.setProperty(prefix+"terr_boost_parallax",         terr_boost_parallax+"");     // double 
@@ -4139,6 +4143,7 @@ min_str_neib_fpn	0.35
 		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_elev_pull0")!=        null) terr_elev_pull0=Double.parseDouble(properties.getProperty(prefix+"terr_elev_pull0"));
 		if (properties.getProperty(prefix+"terr_scenes_pull0")!=       null) terr_scenes_pull0=Double.parseDouble(properties.getProperty(prefix+"terr_scenes_pull0"));
 
 		if (properties.getProperty(prefix+"terr_boost_parallax")!=     null) terr_boost_parallax=Double.parseDouble(properties.getProperty(prefix+"terr_boost_parallax"));
@@ -4803,6 +4808,7 @@ min_str_neib_fpn	0.35
 		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_elev_pull0 =                    this.terr_elev_pull0;
 		imp.terr_scenes_pull0 =                  this.terr_scenes_pull0;
 
 		imp.terr_boost_parallax =                this.terr_boost_parallax;                           

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

@@ -1409,9 +1409,10 @@ public class VegetationModel {
 		double    alpha_mm_hole =     clt_parameters.imp.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
 		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    elevation_lpf = 0;		
+		double    elevation_lpf =     clt_parameters.imp.terr_elev_lpf;		
 		double    terr_pull0 =        clt_parameters.imp.terr_terr_pull0;          // 0.05; //0.03; ////// 0.05; ///// 0.1; //// 0.01; /// 0.2; /// 0.1;    //pull terrain to zero (makes sense with UM
 		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    elev_pull0 =        clt_parameters.imp.terr_elev_pull0; 
 		double    scenes_pull0 =      clt_parameters.imp.terr_scenes_pull0;        // 1.0
 		
 		// LMA parameters        
@@ -1953,8 +1954,9 @@ public class VegetationModel {
 					terr_lpf,       // final double             terr_lpf,           // pull terrain to average of 4 neighbors (very small)
 					veget_lpf,      // final double             veget_lpf,          // pull vegetation to average of 4 neighbors (very small - maybe not needed)
 					elevation_lpf,  // final double             elevation_lpf,
-					terr_pull0,     // final double             terr_pull0,        // pull terrain to zero (makes sense with UM
-					veget_pull0,    // final double             veget_pull0,       // pull vegetation to zero (makes sense with UM
+					terr_pull0,     // final double             terr_pull0,     // pull terrain to initial (pre-adjustment) values
+					veget_pull0,    // final double             veget_pull0,    // pull vegetation to initial (pre-adjustment) values
+					elev_pull0,     // final double             elev_pull0,     // pull elevation to initial (pre-adjustment) values
 					scenes_pull0,   // final double             scenes_pull0,
 					boost_parallax,// final double             boost_parallax,     // increase weight of scene with maximal parallax relative to the reference scene
 					max_parallax,   //final double             max_parallax,  // do not consider maximal parallax above this (consider it a glitch)