Improved sky, movements (cfa9c56d) · Commits · Elphel / imagej-elphel

src/main/java/com/elphel/imagej/cameras/EyesisCorrectionParameters.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1546,7 +1546,6 @@ public class EyesisCorrectionParameters {
	}		}
	Path base_path = seq_path.getParent();		Path base_path = seq_path.getParent();
	// first - scan all file and set sourceDirectory, x3dDirectory, linkedModels,videoDirectory,resultsDirectory		// first - scan all file and set sourceDirectory, x3dDirectory, linkedModels,videoDirectory,resultsDirectory
	// String [] dir_paths = new String[KEY_DIRS.length];
	HashMap<String,String> dir_map = new HashMap<String,String>();		HashMap<String,String> dir_map = new HashMap<String,String>();
	for (String line:lines){		for (String line:lines){
	String[] tokens = line.split("#")[0].trim().split("[\\s,;=]+");		String[] tokens = line.split("#")[0].trim().split("[\\s,;=]+");

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

+31 −7

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

+122 −14

Original line number	Original line	Diff line number	Diff line
	@@ -4047,8 +4047,6 @@ public class OpticalFlow {

	boolean show_dsi_image = clt_parameters.imp.show_ranges && !batch_mode;		boolean show_dsi_image = clt_parameters.imp.show_ranges && !batch_mode;
	boolean show_images = clt_parameters.imp.show_images && !batch_mode;		boolean show_images = clt_parameters.imp.show_images && !batch_mode;
	// boolean show_color_nan = clt_parameters.imp.show_color_nan;
	// boolean show_mono_nan = clt_parameters.imp.show_mono_nan;
	int min_num_scenes = clt_parameters.imp.min_num_scenes; // abandon series if there are less than this number of scenes in it		int min_num_scenes = clt_parameters.imp.min_num_scenes; // abandon series if there are less than this number of scenes in it

	boolean show_images_bgfg = clt_parameters.imp.show_images_bgfg && !batch_mode;		boolean show_images_bgfg = clt_parameters.imp.show_images_bgfg && !batch_mode;
	@@ -4060,8 +4058,6 @@ public class OpticalFlow {

	boolean [] save_mapped_mono_color = {clt_parameters.imp.save_mapped_mono, clt_parameters.imp.save_mapped_color};		boolean [] save_mapped_mono_color = {clt_parameters.imp.save_mapped_mono, clt_parameters.imp.save_mapped_color};
	boolean [] gen_avi_mono_color = {clt_parameters.imp.gen_avi_mono, clt_parameters.imp.gen_avi_color};		boolean [] gen_avi_mono_color = {clt_parameters.imp.gen_avi_mono, clt_parameters.imp.gen_avi_color};
	// boolean show_mapped_color = clt_parameters.imp.show_mapped_color && !batch_mode;
	// boolean show_mapped_mono = clt_parameters.imp.show_mapped_mono && !batch_mode;
	boolean [] show_mono_color = {		boolean [] show_mono_color = {
	clt_parameters.imp.show_mapped_mono && !batch_mode,		clt_parameters.imp.show_mapped_mono && !batch_mode,
	clt_parameters.imp.show_mapped_color && !batch_mode};		clt_parameters.imp.show_mapped_color && !batch_mode};
	@@ -4084,7 +4080,6 @@ public class OpticalFlow {
	clt_parameters.imp.generate_bg};		clt_parameters.imp.generate_bg};
	boolean generate_stereo = clt_parameters.imp.generate_stereo;		boolean generate_stereo = clt_parameters.imp.generate_stereo;

	// double [] stereo_bases = clt_parameters.imp.stereo_bases; // {0.0, 200.0, 500.0, 1000.0};
	double [][] stereo_views = clt_parameters.imp.stereo_views; // {0.0, 200.0, 500.0, 1000.0};		double [][] stereo_views = clt_parameters.imp.stereo_views; // {0.0, 200.0, 500.0, 1000.0};
	boolean [] generate_stereo_var = clt_parameters.imp.generate_stereo_var;		boolean [] generate_stereo_var = clt_parameters.imp.generate_stereo_var;

	@@ -4094,8 +4089,6 @@ public class OpticalFlow {
	final Color anaglyph_right = clt_parameters.imp.anaglyph_right;		final Color anaglyph_right = clt_parameters.imp.anaglyph_right;

	int stereo_gap = clt_parameters.imp.stereo_gap;		int stereo_gap = clt_parameters.imp.stereo_gap;
	// double stereo_intereye = clt_parameters.imp.stereo_intereye;
	// double stereo_phone_width = clt_parameters.imp.stereo_phone_width;

	int extra_hor_tile = clt_parameters.imp.extra_hor_tile;		int extra_hor_tile = clt_parameters.imp.extra_hor_tile;
	int extra_vert_tile = clt_parameters.imp.extra_vert_tile;		int extra_vert_tile = clt_parameters.imp.extra_vert_tile;
	@@ -4108,7 +4101,6 @@ public class OpticalFlow {
	boolean run_ffmpeg = clt_parameters.imp.run_ffmpeg;		boolean run_ffmpeg = clt_parameters.imp.run_ffmpeg;
	String video_ext = clt_parameters.imp.video_ext;		String video_ext = clt_parameters.imp.video_ext;
	String video_codec = clt_parameters.imp.video_codec.toLowerCase();		String video_codec = clt_parameters.imp.video_codec.toLowerCase();
	// String video_extra = clt_parameters.imp.video_extra;
	int video_crf = clt_parameters.imp.video_crf;		int video_crf = clt_parameters.imp.video_crf;
	boolean remove_avi = clt_parameters.imp.remove_avi;		boolean remove_avi = clt_parameters.imp.remove_avi;
	boolean um_mono = clt_parameters.imp.um_mono;		boolean um_mono = clt_parameters.imp.um_mono;
	@@ -4124,7 +4116,6 @@ public class OpticalFlow {
	final Color annotate_color_color = clt_parameters.imp.annotate_color_color;		final Color annotate_color_color = clt_parameters.imp.annotate_color_color;
	final Color annotate_color_mono = clt_parameters.imp.annotate_color_mono;		final Color annotate_color_mono = clt_parameters.imp.annotate_color_mono;

	// boolean readjust_orient = clt_parameters.imp.readjust_orient;
	boolean test_ers = clt_parameters.imp.test_ers && !batch_mode;		boolean test_ers = clt_parameters.imp.test_ers && !batch_mode;
	int test_ers0 = clt_parameters.imp.test_ers0; // try adjusting a pair of scenes with ERS. Reference scene index		int test_ers0 = clt_parameters.imp.test_ers0; // try adjusting a pair of scenes with ERS. Reference scene index
	int test_ers1 = clt_parameters.imp.test_ers1; // try adjusting a pair of scenes with ERS. Other scene index		int test_ers1 = clt_parameters.imp.test_ers1; // try adjusting a pair of scenes with ERS. Other scene index
	@@ -4145,6 +4136,8 @@ public class OpticalFlow {
	int sky_expand_extra = clt_parameters.imp.sky_expand_extra;		int sky_expand_extra = clt_parameters.imp.sky_expand_extra;
	double min_strength = clt_parameters.imp.min_strength;		double min_strength = clt_parameters.imp.min_strength;
	int lowest_sky_row = clt_parameters.imp.lowest_sky_row;		int lowest_sky_row = clt_parameters.imp.lowest_sky_row;
			double sky_bottom_override = clt_parameters.imp.sky_bottom_override;
			int sky_override_shrink = clt_parameters.imp.sky_override_shrink;

	boolean [] ref_blue_sky = null; // turn off "lma" in the ML output		boolean [] ref_blue_sky = null; // turn off "lma" in the ML output

	@@ -4281,6 +4274,8 @@ public class OpticalFlow {
	min_strength, // = 0.08;		min_strength, // = 0.08;
	seed_rows, // = 5; // sky should appear in this top rows		seed_rows, // = 5; // sky should appear in this top rows
	lowest_sky_row, // = 50;// appears that low - invalid, remove completely		lowest_sky_row, // = 50;// appears that low - invalid, remove completely
			sky_bottom_override, // double sky_temp_override, // really cold average seed - ignore lowest_sky_row filter
			sky_override_shrink, // int shrink_for_temp, // shrink before finding hottest sky
	sky_highest_min, // = 100; // lowest absolute value should not be higher (requires photometric)		sky_highest_min, // = 100; // lowest absolute value should not be higher (requires photometric)
	dsi[TwoQuadCLT.DSI_STRENGTH_AUX], // double [] strength,		dsi[TwoQuadCLT.DSI_STRENGTH_AUX], // double [] strength,
	dsi[TwoQuadCLT.DSI_SPREAD_AUX], // double [] spread,		dsi[TwoQuadCLT.DSI_SPREAD_AUX], // double [] spread,
	@@ -4332,6 +4327,8 @@ public class OpticalFlow {
	min_strength, // = 0.08;		min_strength, // = 0.08;
	seed_rows, // = 5; // sky should appear in this top rows		seed_rows, // = 5; // sky should appear in this top rows
	lowest_sky_row, // = 50;// appears that low - invalid, remove completely		lowest_sky_row, // = 50;// appears that low - invalid, remove completely
			sky_bottom_override, // double sky_temp_override, // really cold average seed - ignore lowest_sky_row filter
			sky_override_shrink, // int shrink_for_temp, // shrink before finding hottest sky
	sky_highest_min, // = 100; // lowest absolute value should not be higher (requires photometric)		sky_highest_min, // = 100; // lowest absolute value should not be higher (requires photometric)
	dsi[TwoQuadCLT.DSI_STRENGTH_AUX], // double [] strength,		dsi[TwoQuadCLT.DSI_STRENGTH_AUX], // double [] strength,
	dsi[TwoQuadCLT.DSI_SPREAD_AUX], // double [] spread,		dsi[TwoQuadCLT.DSI_SPREAD_AUX], // double [] spread,
	@@ -12823,7 +12820,7 @@ public double[][] correlateIntersceneDebug( // only uses GPU and quad
	{		{
	boolean show_debug_images = (debug_image_name != null);		boolean show_debug_images = (debug_image_name != null);

	String [] mvTitles = {"dx", "dy", "conf", "blur", "blurX","blurY","clust","mask"};		String [] mvTitles = {"dx", "dy", "conf", "blur", "blurX","blurY","clust","filtclust","re-clust","mask"};
	boolean mov_en = clt_parameters.imp.mov_en; // true; // enable detection/removal of the moving objects during pose matching		boolean mov_en = clt_parameters.imp.mov_en; // true; // enable detection/removal of the moving objects during pose matching
	if (!mov_en) {		if (!mov_en) {
	return null;		return null;
	@@ -12835,6 +12832,9 @@ public double[][] correlateIntersceneDebug( // only uses GPU and quad
	double mov_thresh_abs= clt_parameters.imp.mov_thresh_abs; // 1.0; // sqrt(dx^2+dy^2) in moving areas		double mov_thresh_abs= clt_parameters.imp.mov_thresh_abs; // 1.0; // sqrt(dx^2+dy^2) in moving areas
	double mov_clust_max = clt_parameters.imp.mov_clust_max; // 1.5; // cluster maximum should exceed threshold this times		double mov_clust_max = clt_parameters.imp.mov_clust_max; // 1.5; // cluster maximum should exceed threshold this times
	int mov_grow = clt_parameters.imp.mov_grow; // 4; // grow detected moving area		int mov_grow = clt_parameters.imp.mov_grow; // 4; // grow detected moving area
			int mov_max_len = clt_parameters.imp.mov_max_len; // 0 - no limit

			double frac_clust = 0.25;// cluster tiles compared to cluster max
	double mov_max_std2 = mov_max_std * mov_max_std;		double mov_max_std2 = mov_max_std * mov_max_std;
	double mov_thresh_rel2 = mov_thresh_rel* mov_thresh_rel;		double mov_thresh_rel2 = mov_thresh_rel* mov_thresh_rel;
	double mov_thresh_abs2 = mov_thresh_abs * mov_thresh_abs;		double mov_thresh_abs2 = mov_thresh_abs * mov_thresh_abs;
	@@ -12875,6 +12875,8 @@ public double[][] correlateIntersceneDebug( // only uses GPU and quad
	}		}
	}		}
	boolean [] move_mask = null;		boolean [] move_mask = null;
			double [] clust_max = null;
			int [][] minx_maxx_miny_maxy = null;
	process_movements:		process_movements:
	{		{
	if (sl2 > mov_max_std2) {		if (sl2 > mov_max_std2) {
	@@ -12935,7 +12937,7 @@ public double[][] correlateIntersceneDebug( // only uses GPU and quad
	for (int nTile=0; nTile < clusters.length;nTile++) if (clusters[nTile] > max_clust_num) {		for (int nTile=0; nTile < clusters.length;nTile++) if (clusters[nTile] > max_clust_num) {
	max_clust_num = clusters[nTile];		max_clust_num = clusters[nTile];
	}		}
	double [] clust_max = new double [max_clust_num];		clust_max = new double [max_clust_num];
	for (int nTile=0; nTile < clusters.length;nTile++) if (clusters[nTile] > 0) {		for (int nTile=0; nTile < clusters.length;nTile++) if (clusters[nTile] > 0) {
	int i = clusters[nTile]-1;		int i = clusters[nTile]-1;
	if (mov_obj[1][nTile] > clust_max[i]) {		if (mov_obj[1][nTile] > clust_max[i]) {
	@@ -12954,11 +12956,26 @@ public double[][] correlateIntersceneDebug( // only uses GPU and quad
	System.out.println("getMovementMask(): Cluster "+i+(good_clusters[i]?"*":" ")+", max = "+clust_max[i]);		System.out.println("getMovementMask(): Cluster "+i+(good_clusters[i]?"*":" ")+", max = "+clust_max[i]);
	}		}
	}		}

	if(show_debug_images) {		if(show_debug_images) {
	for (int nTile = 0; nTile < motion.length; nTile++) if (clusters[nTile] > 0){		for (int nTile = 0; nTile < motion.length; nTile++) if (clusters[nTile] > 0){
	dbg_img[6][nTile] = clusters[nTile];		dbg_img[6][nTile] = clusters[nTile];
	}		}
	}		}
			// remove tiles much lower than cluster max
			for (int nTile=0; nTile < clusters.length;nTile++) if (clusters[nTile] > 0) {
			int iclust = clusters[nTile] - 1;
			double threshold = clust_max[iclust] * frac_clust;
			if (!good_clusters[iclust] \|\| (mov_obj[1][nTile] < threshold)) {
			clusters[nTile] = 0;
			}
			}

			if(show_debug_images) {
			for (int nTile = 0; nTile < motion.length; nTile++) if (clusters[nTile] > 0){
			dbg_img[7][nTile] = clusters[nTile];
			}
			}

	if (num_good_clusters == 0) {		if (num_good_clusters == 0) {
	if (debug_level>0) {		if (debug_level>0) {
	@@ -12966,17 +12983,99 @@ public double[][] correlateIntersceneDebug( // only uses GPU and quad
	}		}
	break process_movements;		break process_movements;
	}		}

	move_mask = new boolean [clusters.length];		move_mask = new boolean [clusters.length];
	for (int nTile=0; nTile < clusters.length; nTile++) if (clusters[nTile] > 0) {		for (int nTile=0; nTile < clusters.length; nTile++) if (clusters[nTile] > 0) {
	move_mask[nTile] = good_clusters[clusters[nTile] -1];		move_mask[nTile] = good_clusters[clusters[nTile] -1];
	}		}

	tn.growSelection(		tn.growSelection(
	mov_grow, // int grow, // grow tile selection by 1 over non-background tiles 1: 4 directions, 2 - 8 directions, 3 - 8 by 1, 4 by 1 more		mov_grow, // int grow, // grow tile selection by 1 over non-background tiles 1: 4 directions, 2 - 8 directions, 3 - 8 by 1, 4 by 1 more
	move_mask, // boolean [] tiles,		move_mask, // boolean [] tiles,
	null); // boolean [] prohibit);		null); // boolean [] prohibit);

			// Re-clusterize

			clusters = tn.enumerateClusters(
			move_mask, // boolean [] tiles,
			false); // boolean ordered)
			if(show_debug_images) {
			for (int nTile = 0; nTile < motion.length; nTile++) if (clusters[nTile] > 0){
			dbg_img[8][nTile] = clusters[nTile];
			}
			}

			// Measure cluster sizes and remove too big ones
			if (mov_max_len > 0) {
			max_clust_num = 0;
			for (int nTile=0; nTile < clusters.length;nTile++) if (clusters[nTile] > max_clust_num) {
			max_clust_num = clusters[nTile];
			}
			minx_maxx_miny_maxy = new int [max_clust_num][];
			for (int nTile = 0; nTile < motion.length; nTile++) if (clusters[nTile] > 0){
			int x = nTile % tilesX;
			int y = nTile / tilesX;
			int iclust = clusters[nTile] - 1;
			if (minx_maxx_miny_maxy[iclust] == null) {
			minx_maxx_miny_maxy[iclust] = new int[] {x,x,y,y};
			}
			if (x < minx_maxx_miny_maxy[iclust][0]) minx_maxx_miny_maxy[iclust][0] = x;
			if (x > minx_maxx_miny_maxy[iclust][1]) minx_maxx_miny_maxy[iclust][1] = x;
			if (y < minx_maxx_miny_maxy[iclust][2]) minx_maxx_miny_maxy[iclust][2] = y;
			if (y > minx_maxx_miny_maxy[iclust][3]) minx_maxx_miny_maxy[iclust][3] = y;
			}

			num_good_clusters = 0;
			good_clusters = new boolean[max_clust_num];
			for (int iclust = 0; iclust < max_clust_num; iclust++) {
			if ( (minx_maxx_miny_maxy[iclust] != null) &&
			((minx_maxx_miny_maxy[iclust][1] - minx_maxx_miny_maxy[iclust][0]) <= mov_max_len) &&
			((minx_maxx_miny_maxy[iclust][3] - minx_maxx_miny_maxy[iclust][2]) <= mov_max_len)) {
			good_clusters[iclust] = true;
			num_good_clusters ++;
			} else {
			minx_maxx_miny_maxy[iclust] = null;
			}
			}
			if (num_good_clusters == 0) {
			if (debug_level>0) {
			System.out.println("getMovementMask(): No small enough moving clusters (of total "+clust_max.length+"), aborting movement processing");
			}
			break process_movements;
			}

			if (debug_level>0) { // -1) {
			System.out.println("getMovementMask(): Got "+max_clust_num+" clusters, of them good - "+num_good_clusters );
			for (int i = 0; i < minx_maxx_miny_maxy.length; i++) {
			int sizex = minx_maxx_miny_maxy[i][1] - minx_maxx_miny_maxy[i][0];
			int sizey = minx_maxx_miny_maxy[i][3] - minx_maxx_miny_maxy[i][2];
			int max_size = (sizex>sizey)? sizex:sizey;
			System.out.println("getMovementMask(): Cluster "+i+(good_clusters[i]?"*":" ")+
			", max_size="+max_size+" ("+sizex+", "+sizey+")"+
			", xmin = "+minx_maxx_miny_maxy[i][0]+
			", xmax = "+minx_maxx_miny_maxy[i][1]+
			", ymin = "+minx_maxx_miny_maxy[i][2]+
			", ymax = "+minx_maxx_miny_maxy[i][3]);
			}
			}
			// remove too large clusters
			if (mov_max_len > 0) {
			for (int nTile=0; nTile < clusters.length; nTile++) if (clusters[nTile] > 0) {
			int iclust = clusters[nTile] - 1;
			if (!good_clusters[iclust]) {
			clusters[nTile] = 0;
			}
			}
			}
			move_mask = new boolean [clusters.length];
			for (int nTile=0; nTile < clusters.length; nTile++) if (clusters[nTile] > 0) {
			move_mask[nTile] = good_clusters[clusters[nTile] -1];
			}
			}

	if(show_debug_images) {		if(show_debug_images) {
	for (int nTile = 0; nTile < motion.length; nTile++) if (move_mask[nTile]){		for (int nTile = 0; nTile < motion.length; nTile++) if (move_mask[nTile]){
	dbg_img[7][nTile] = 1.0;		dbg_img[9][nTile] = 1.0;
	}		}
	}		}

	@@ -12996,7 +13095,16 @@ public double[][] correlateIntersceneDebug( // only uses GPU and quad
	for (int nTile=0; nTile<move_mask.length;nTile++) if (move_mask[nTile]) {		for (int nTile=0; nTile<move_mask.length;nTile++) if (move_mask[nTile]) {
	num_mov++;		num_mov++;
	}		}
	System.out.println("getMovementMask(): Created moving objects mask of "+num_mov+" tiles.");		System.out.print("getMovementMask(): Created moving objects mask of "+num_mov+" tiles. Sizes:");
			if (minx_maxx_miny_maxy != null) {
			for (int iclust = 0; iclust < minx_maxx_miny_maxy.length; iclust++) if (minx_maxx_miny_maxy[iclust] != null){
			int sizex = minx_maxx_miny_maxy[iclust][1] - minx_maxx_miny_maxy[iclust][0];
			int sizey = minx_maxx_miny_maxy[iclust][3] - minx_maxx_miny_maxy[iclust][2];
			int max_size = (sizex>sizey)? sizex:sizey;
			System.out.print(" "+max_size);
			}
			}
			System.out.println();

	} else {		} else {
	System.out.println("getMovementMask(): No moving objects mask is created.");		System.out.println("getMovementMask(): No moving objects mask is created.");

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

+44 −6

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -8617,7 +8617,7 @@ if (debugLevel > -100) return true; // temporarily !
	class VideoSet {		class VideoSet {
	String [] video_paths;		String [] video_paths;
	int [] stereo_widths;		int [] stereo_widths;
	int earliest_scene, reference_scene;		int earliest_scene, reference_scene; // , movement_size;
	VideoSet(		VideoSet(
	String [] paths,		String [] paths,
	int [] stereo_widths,		int [] stereo_widths,
	@@ -8684,6 +8684,7 @@ if (debugLevel > -100) return true; // temporarily !
	widths_list[0], // int [] stereo_widths,		widths_list[0], // int [] stereo_widths,
	start_ref_pointers[0], // int earliest_scene,		start_ref_pointers[0], // int earliest_scene,
	start_ref_pointers[1])); // int reference_scene);		start_ref_pointers[1])); // int reference_scene);

	String series_action = (start_ref_pointers[0] < (min_num_scenes-1))?"is FINISHED ":("will continue down from scene "+(start_ref_pointers[0]));		String series_action = (start_ref_pointers[0] < (min_num_scenes-1))?"is FINISHED ":("will continue down from scene "+(start_ref_pointers[0]));
	System.out.println("PROCESSING SCENE SEQUENCE "+nseq+" (last is "+(num_seq-1)+") "+series_action+" in "+		System.out.println("PROCESSING SCENE SEQUENCE "+nseq+" (last is "+(num_seq-1)+") "+series_action+" in "+
	IJ.d2s(0.000000001*(System.nanoTime()-start_time_seq),3)+" sec ("+		IJ.d2s(0.000000001*(System.nanoTime()-start_time_seq),3)+" sec ("+

Original line number	Original line	Diff line number	Diff line
	@@ -148,6 +148,9 @@ public class IntersceneMatchParameters {
	public int sky_expand_extra = 0; // 1?		public int sky_expand_extra = 0; // 1?
	public double min_strength = 0.08;		public double min_strength = 0.08;
	public int lowest_sky_row = 50; // appears that low - invalid, remove completely		public int lowest_sky_row = 50; // appears that low - invalid, remove completely
			public double sky_bottom_override = -300; // maximal average sky value to override lowest_sky_row test
			public int sky_override_shrink = 10; // shrink detected sky before finding hottest tile there


	// Some "AGC" to adjust how much to discard		// Some "AGC" to adjust how much to discard
	public int margin = 1; // do not use tiles if their centers are closer to the image edge		public int margin = 1; // do not use tiles if their centers are closer to the image edge
	@@ -201,11 +204,12 @@ public class IntersceneMatchParameters {
	public boolean mov_en = true; // enable detection/removal of the moving objects during pose matching		public boolean mov_en = true; // enable detection/removal of the moving objects during pose matching
	public double mov_sigma = 1.5; // pix - weighted-blur offsets before detection		public double mov_sigma = 1.5; // pix - weighted-blur offsets before detection
	// next two to prevent motion detection while errors are too big		// next two to prevent motion detection while errors are too big
	public double mov_max_std = 0.5; // pix		public double mov_max_std = 1.2; // pix
	public double mov_thresh_rel = 3.5; // .0; // exceed average error		public double mov_thresh_rel = 3.5; // .0; // exceed average error
	public double mov_thresh_abs= 0.5; // sqrt(dx^2+dy^2) in moving areas		public double mov_thresh_abs= 0.5; // sqrt(dx^2+dy^2) in moving areas
	public double mov_clust_max = 1.5; // cluster maximum should exceed threshold this times		public double mov_clust_max = 1.5; // cluster maximum should exceed threshold this times
	public int mov_grow = 4; // grow detected moving area		public int mov_grow = 4; // grow detected moving area
			public int mov_max_len = 0; // (0 - no limit) do not remove moving objects if they do not fit into the square
	public boolean mov_show = true; // show debug images for movement detection		public boolean mov_show = true; // show debug images for movement detection
	public int mov_debug_level = 1; // >0 verbose		public int mov_debug_level = 1; // >0 verbose
	//LMA parameters		//LMA parameters
	@@ -529,7 +533,11 @@ public class IntersceneMatchParameters {
	gd.addNumericField("Modify strength to be at least this", this.min_strength, 5,7,"",		gd.addNumericField("Modify strength to be at least this", this.min_strength, 5,7,"",
	"Input strength has some with zero values resulting in zero FOM. Make them at least this.");		"Input strength has some with zero values resulting in zero FOM. Make them at least this.");
	gd.addNumericField("Lowest sky row", this.lowest_sky_row, 0,3,"",		gd.addNumericField("Lowest sky row", this.lowest_sky_row, 0,3,"",
	"Last defense - if the detected sky area reaches near-bottom of the page - it is invalid, remove it (but keep in debug images)");		"Last defense - if the detected sky area reaches near-bottom of the page - it is invalid, remove it (but keep in debug images).");
			gd.addNumericField("Hottest sky tile to override lowest row",this.sky_bottom_override, 5,7,"",
			"If the detected sky is all cold enough, bypass lowest row test, allow to raise camera.");
			gd.addNumericField("Shrink before finding hottest sky", this.sky_override_shrink, 0,3,"",
			"Shrink detected sky before looking for the hottest skyt tile (blurred skyline in wet atmosphere).");

	gd.addTab ("Inter-Match", "Parameters for full-resolution scene matching");		gd.addTab ("Inter-Match", "Parameters for full-resolution scene matching");
	// gd.addTab("Interscene Equalization","Equalization of the interscene correlation confidence to improve camera X,Y,Z matching");		// gd.addTab("Interscene Equalization","Equalization of the interscene correlation confidence to improve camera X,Y,Z matching");
	@@ -634,7 +642,10 @@ public class IntersceneMatchParameters {
	gd.addNumericField("Cluster max over threshold", this.mov_clust_max, 6,7,"",		gd.addNumericField("Cluster max over threshold", this.mov_clust_max, 6,7,"",
	"Moving cluster should contain tile with this exceed over thresholds");		"Moving cluster should contain tile with this exceed over thresholds");
	gd.addNumericField("Moving cluster grow", this.mov_grow, 0,3,"",		gd.addNumericField("Moving cluster grow", this.mov_grow, 0,3,"",
	"Standard grow values - 1 - ortho, 2 - diagonal, 3 - twice orto, 4 - twice diagonal");		"Standard grow values - 1 - ortho, 2 - diagonal, 3 - twice orto, 4 - twice diagonal.");

Admin message