addedsome of the most used parameters to batch dialog (77c78973) · Commits · Elphel / imagej-elphel

src/main/java/EyesisCorrectionParameters.java

+17 −13

src/main/java/QuadCLT.java

+1 −16

Original line number	Original line	Diff line number	Diff line
	@@ -6284,15 +6284,6 @@ public class QuadCLT {
	final int disp_index = ImageDtt.DISPARITY_INDEX_CM;		final int disp_index = ImageDtt.DISPARITY_INDEX_CM;
	final int str_index = ImageDtt.DISPARITY_STRENGTH_INDEX;		final int str_index = ImageDtt.DISPARITY_STRENGTH_INDEX;
	final double strength_floor = clt_parameters.fds_str_floor; // 0.6* clt_parameters.combine_min_strength;		final double strength_floor = clt_parameters.fds_str_floor; // 0.6* clt_parameters.combine_min_strength;
	// final double strength_floor = 0.8* clt_parameters.combine_min_strength;

	// TODO: define, make parameters
	// final double comboMinStrength = clt_parameters.gr_ovrbg_cmb; // 0.3; // 0.3;
	// final double comboMinStrengthHor = clt_parameters.gr_ovrbg_cmb_hor ; // 0.3; // 0.3;
	// final double comboMinStrengthVert =clt_parameters.gr_ovrbg_cmb_vert ; // 0.3; // 0.3;
	// final double filterMinStrength = clt_parameters.gr_ovrbg_filtered ; // 0.3; // 0.3;



	// TODO: make parameters		// TODO: make parameters
	final double strength_pow = clt_parameters.fds_str_pow ; // 1.0;		final double strength_pow = clt_parameters.fds_str_pow ; // 1.0;
	@@ -6308,13 +6299,7 @@ public class QuadCLT {
	final int dbg_x = 155;		final int dbg_x = 155;
	final int dbg_y = 207;		final int dbg_y = 207;


	// TEMPORARY EXIT
	// if (tp.clt_3d_passes.size() > 0) return null; // just to fool compiler

	// above - multiple refinements (reduce, make conditional?)
	int num_extended = -1;		int num_extended = -1;
	// int [] numLeftRemoved;
	// process once more to try combining of processed		// process once more to try combining of processed
	boolean last_pass = false;		boolean last_pass = false;
	// for (int num_expand = 0; (num_expand < 4) && (num_extended != 0); num_expand++) {		// for (int num_expand = 0; (num_expand < 4) && (num_extended != 0); num_expand++) {
	@@ -8379,7 +8364,7 @@ public class QuadCLT {
	int nSet = 0;		int nSet = 0;
	for (nSet = 0; nSet < setNames.size(); nSet++){		for (nSet = 0; nSet < setNames.size(); nSet++){
	if ((nSet > 0) &&(debugLevel > -2)) {		if ((nSet > 0) &&(debugLevel > -2)) {
	System.out.println("Processing set "+(nSet+1)+" (of "+setNames.size()+") finished at "+		System.out.println("Processing set "+(nSet+0)+" (of "+setNames.size()+") finished at "+
	IJ.d2s(0.000000001*(System.nanoTime()-this.startSetTime),3)+" sec, --- Free memory="+Runtime.getRuntime().freeMemory()+" (of "+Runtime.getRuntime().totalMemory()+")");		IJ.d2s(0.000000001*(System.nanoTime()-this.startSetTime),3)+" sec, --- Free memory="+Runtime.getRuntime().freeMemory()+" (of "+Runtime.getRuntime().totalMemory()+")");
	}		}
	this.startSetTime = System.nanoTime();		this.startSetTime = System.nanoTime();

src/main/java/SuperTiles.java

+3 −3

src/main/java/TileProcessor.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1562,7 +1562,7 @@ public class TileProcessor {
	// scan.restoreKeepTileOpDisparity();// it is not used from this scan, but from last_scan		// scan.restoreKeepTileOpDisparity();// it is not used from this scan, but from last_scan
	continue;		continue;
	}		}
	if (debugLevel > -1){		if (debugLevel > -2){
	System.out.println("prepareExpandVariants(): remaining "+num_left+" tiles to be processed, used variant "+num_var+" ("+num_left+")");		System.out.println("prepareExpandVariants(): remaining "+num_left+" tiles to be processed, used variant "+num_var+" ("+num_left+")");
	}		}
	int [] rslt = {num_left, num_var};		int [] rslt = {num_left, num_var};
	@@ -5261,7 +5261,7 @@ public class TileProcessor {
	clt_parameters.plDiscrTolerance, // final double plDiscrTolerance, // = 0.4; // Maximal disparity difference from the plane to consider tile		clt_parameters.plDiscrTolerance, // final double plDiscrTolerance, // = 0.4; // Maximal disparity difference from the plane to consider tile
	clt_parameters.plDiscrDispRange, // final double plDiscrDispRange, // = 0.6; // Parallel move known planes around original know value for the best overall fit		clt_parameters.plDiscrDispRange, // final double plDiscrDispRange, // = 0.6; // Parallel move known planes around original know value for the best overall fit
	clt_parameters.plDiscrSteps, // final int plDiscrSteps, // = 3; // Number of steps (each direction) for each plane to search for the best fit (0 - single, 1 - 1 each side)		clt_parameters.plDiscrSteps, // final int plDiscrSteps, // = 3; // Number of steps (each direction) for each plane to search for the best fit (0 - single, 1 - 1 each side)
	clt_parameters.plDiscrVariants, // final int plDiscrVariants, // = 100; // Total number of variants to try (protect from too many planes)		// clt_parameters.plDiscrVariants, // final int plDiscrVariants, // = 100; // Total number of variants to try (protect from too many planes)
	clt_parameters.plDiscrMode, // final int plDiscrMode, // = 3; // What plane to use as a hint: 0 - weighted, 1 - equalized, 2 - best, 3 - combined		clt_parameters.plDiscrMode, // final int plDiscrMode, // = 3; // What plane to use as a hint: 0 - weighted, 1 - equalized, 2 - best, 3 - combined

	clt_parameters.plDiscrVarFloor, // final double plDiscrVarFloor, // = 0.03; // Squared add to variance to calculate reverse flatness (used mostly for single-cell clusters)		clt_parameters.plDiscrVarFloor, // final double plDiscrVarFloor, // = 0.03; // Squared add to variance to calculate reverse flatness (used mostly for single-cell clusters)

Original line number	Original line	Diff line number	Diff line
	@@ -557,6 +557,8 @@ public class EyesisCorrectionParameters {
	gd.addNumericField("Maximal disparity to try", clt_parameters.grow_disp_max, 6);		gd.addNumericField("Maximal disparity to try", clt_parameters.grow_disp_max, 6);
	gd.addCheckbox ("Equalize green channel gain of the individual cnannels (bug fix for exposure)", clt_parameters.gain_equalize);		gd.addCheckbox ("Equalize green channel gain of the individual cnannels (bug fix for exposure)", clt_parameters.gain_equalize);
	gd.addNumericField("Inverse distance to infinity (misalignment correction)", clt_parameters.z_correction, 6);		gd.addNumericField("Inverse distance to infinity (misalignment correction)", clt_parameters.z_correction, 6);
			gd.addNumericField("Number of clusters to keep", clt_parameters.tsNumClust, 0);
			gd.addNumericField("Maximal number of output meshes to generate", clt_parameters.max_clusters, 0);

	}		}
	WindowTools.addScrollBars(gd);		WindowTools.addScrollBars(gd);
	@@ -594,6 +596,8 @@ public class EyesisCorrectionParameters {
	clt_parameters.grow_disp_max = gd.getNextNumber();		clt_parameters.grow_disp_max = gd.getNextNumber();
	clt_parameters.gain_equalize = gd.getNextBoolean();		clt_parameters.gain_equalize = gd.getNextBoolean();
	clt_parameters.z_correction = gd.getNextNumber();		clt_parameters.z_correction = gd.getNextNumber();
			clt_parameters.tsNumClust = (int) gd.getNextNumber();
			clt_parameters.max_clusters = (int) gd.getNextNumber();
	}		}
	return true;		return true;
	}		}
	@@ -2399,7 +2403,7 @@ public class EyesisCorrectionParameters {

	// New for initial growing		// New for initial growing
	public boolean gr_new_expand = true;		public boolean gr_new_expand = true;
	public int gr_max_expand = 500; // 150; // 30;		// public int gr_max_expand = 500; // 150; // 30;
	public double gr_ovrbg_cmb = 0.3; // 0.3;		public double gr_ovrbg_cmb = 0.3; // 0.3;
	public double gr_ovrbg_cmb_hor = 0.3; // 0.3;		public double gr_ovrbg_cmb_hor = 0.3; // 0.3;
	public double gr_ovrbg_cmb_vert = 0.3; // 0.3;		public double gr_ovrbg_cmb_vert = 0.3; // 0.3;
	@@ -2520,7 +2524,7 @@ public class EyesisCorrectionParameters {
	public double plDiscrTolerance = 0.4; // Maximal disparity difference from the plane to consider tile		public double plDiscrTolerance = 0.4; // Maximal disparity difference from the plane to consider tile
	public double plDiscrDispRange = 1.0; // Parallel move known planes around original know value for the best overall fit		public double plDiscrDispRange = 1.0; // Parallel move known planes around original know value for the best overall fit
	public int plDiscrSteps = 10; // Number of steps (each direction) for each plane to search for the best fit (0 - single, 1 - 1 each side)		public int plDiscrSteps = 10; // Number of steps (each direction) for each plane to search for the best fit (0 - single, 1 - 1 each side)
	public int plDiscrVariants = 100; // total number of variants to try (protect from too many planes)		// public int plDiscrVariants = 500; // total number of variants to try (protect from too many planes)
	public int plDiscrMode = 3; // 0 - weighted, 1 - equalized, 2 - best, 3 - combined		public int plDiscrMode = 3; // 0 - weighted, 1 - equalized, 2 - best, 3 - combined

	public double plDiscrVarFloor = 0.03; // Squared add to variance to calculate reverse flatness (used mostly for single-cell clusters)		public double plDiscrVarFloor = 0.03; // Squared add to variance to calculate reverse flatness (used mostly for single-cell clusters)
	@@ -3031,7 +3035,7 @@ public class EyesisCorrectionParameters {
	properties.setProperty(prefix+"grow_retry_inf", this.grow_retry_inf+"");		properties.setProperty(prefix+"grow_retry_inf", this.grow_retry_inf+"");

	properties.setProperty(prefix+"gr_new_expand", this.gr_new_expand+"");		properties.setProperty(prefix+"gr_new_expand", this.gr_new_expand+"");
	properties.setProperty(prefix+"gr_max_expand", this.gr_max_expand+"");		// properties.setProperty(prefix+"gr_max_expand", this.gr_max_expand+"");
	properties.setProperty(prefix+"fds_str_floor", this.fds_str_floor +"");		properties.setProperty(prefix+"fds_str_floor", this.fds_str_floor +"");

Admin message