Skip to content

I
imagej-elphel
Commit ca8ad02a authored by Andrey Filippov's avatar Andrey Filippov
Browse files
Options

Before adding MCP analysis of the targets, using the saved files

parent cf0298e1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 42 deletions
src/main/java/com/elphel/imagej/tileprocessor/IntersceneMatchParameters.java
View file @ ca8ad02a
...@@ -794,6 +794,7 @@ min_str_neib_fpn 0.35 ...@@ -794,6 +794,7 @@ min_str_neib_fpn 0.35
public boolean cuas_smooth = true; // used cosine window when averaging correlations public boolean cuas_smooth = true; // used cosine window when averaging correlations
public int cuas_corr_pairs = 20; // number of correlation pairs to accumulate public int cuas_corr_pairs = 20; // number of correlation pairs to accumulate
public double cuas_boost_slow = 4.0; // if >1 and the motion vector is below tile_size/cuas_boost_slow, scale corr_pairs public double cuas_boost_slow = 4.0; // if >1 and the motion vector is below tile_size/cuas_boost_slow, scale corr_pairs
public double cuas_boost_accum = 4.0; // if >1 increase tracking camera exposure (TODO: conditional / compete)
public double cuas_boost_mstr = 0.007; // scale corr_pairs if motion strength is below public double cuas_boost_mstr = 0.007; // scale corr_pairs if motion strength is below
public int cuas_corr_offset = 5; // offset between motion detection pairs public int cuas_corr_offset = 5; // offset between motion detection pairs
public boolean cuas_gaussian_ra = true; // use gaussian temporal Gaussian instead of running average public boolean cuas_gaussian_ra = true; // use gaussian temporal Gaussian instead of running average
...@@ -872,7 +873,7 @@ min_str_neib_fpn 0.35 ...@@ -872,7 +873,7 @@ min_str_neib_fpn 0.35
public double cuas_lma_a2a = 0.5; // Minimal ratio of the maximal pixel to the amplitude public double cuas_lma_a2a = 0.5; // Minimal ratio of the maximal pixel to the amplitude
public boolean cuas_slow_en = true; // enable slow (almost static) target detection // verify temporal offset with fast
public double cuas_slow_ra = 50.0; // running averaging for slow targets public double cuas_slow_ra = 50.0; // running averaging for slow targets
public double cuas_slow_score = 1.0; // scale scores for slow target mode public double cuas_slow_score = 1.0; // scale scores for slow target mode
public double cuas_score_mv = 0.0; // minimal score for the motion vectors public double cuas_score_mv = 0.0; // minimal score for the motion vectors
...@@ -2688,6 +2689,8 @@ min_str_neib_fpn 0.35 ...@@ -2688,6 +2689,8 @@ min_str_neib_fpn 0.35
"The number of correlation pairs to accumulate."); "The number of correlation pairs to accumulate.");
gd.addNumericField("Boost pairs for slow targets", this.cuas_boost_slow, 5,8,"", gd.addNumericField("Boost pairs for slow targets", this.cuas_boost_slow, 5,8,"",
"If >1 and the motion vector is below tile_size/cuas_boost_slow, scale corr_pairs."); "If >1 and the motion vector is below tile_size/cuas_boost_slow, scale corr_pairs.");
gd.addNumericField("Increase tracking camera exposure", this.cuas_boost_accum, 5,8,"",
"If >1 increase tracking camera exposure (later - conditional).");
gd.addNumericField("Boost pairs for weak targets", this.cuas_boost_mstr, 5,8,"", gd.addNumericField("Boost pairs for weak targets", this.cuas_boost_mstr, 5,8,"",
"Scale corr_pairs if motion strength is below."); "Scale corr_pairs if motion strength is below.");
gd.addNumericField("Pairs offset", this.cuas_corr_offset, 0,3,"scenes", gd.addNumericField("Pairs offset", this.cuas_corr_offset, 0,3,"scenes",
...@@ -2832,7 +2835,10 @@ min_str_neib_fpn 0.35 ...@@ -2832,7 +2835,10 @@ min_str_neib_fpn 0.35
"Maximal ratio of the overshoot radius to the first 0 radius (typical 3.0)."); "Maximal ratio of the overshoot radius to the first 0 radius (typical 3.0).");
gd.addNumericField("Minimal max pixel to amplitude ratio", this.cuas_lma_a2a, 5,8,"", gd.addNumericField("Minimal max pixel to amplitude ratio", this.cuas_lma_a2a, 5,8,"",
"Minimal ratio of the maximal pixel near fitted maximum to the LMA amplitude."); "Minimal ratio of the maximal pixel near fitted maximum to the LMA amplitude.");
gd.addMessage("=== Slow targets detection ==="); gd.addMessage("=== Slow targets detection ===");
gd.addCheckbox ("Enable slow targets detection", this.cuas_slow_en,
"Enable slow (almost static) target detection // verify temporal offset with fast.");
gd.addNumericField("Slow targets averaging", this.cuas_slow_ra, 5,8,"frames", gd.addNumericField("Slow targets averaging", this.cuas_slow_ra, 5,8,"frames",
"Running averaging for slow targets."); "Running averaging for slow targets.");
gd.addNumericField("Slow targets score scale", this.cuas_slow_score, 5,8,"", gd.addNumericField("Slow targets score scale", this.cuas_slow_score, 5,8,"",
...@@ -4343,6 +4349,7 @@ min_str_neib_fpn 0.35 ...@@ -4343,6 +4349,7 @@ min_str_neib_fpn 0.35
this.cuas_smooth = gd.getNextBoolean(); this.cuas_smooth = gd.getNextBoolean();
this.cuas_corr_pairs = (int) gd.getNextNumber(); this.cuas_corr_pairs = (int) gd.getNextNumber();
this.cuas_boost_slow = gd.getNextNumber(); this.cuas_boost_slow = gd.getNextNumber();
this.cuas_boost_accum = gd.getNextNumber();
this.cuas_boost_mstr = gd.getNextNumber(); this.cuas_boost_mstr = gd.getNextNumber();
this.cuas_corr_offset = (int) gd.getNextNumber(); this.cuas_corr_offset = (int) gd.getNextNumber();
this.cuas_gaussian_ra = gd.getNextBoolean(); this.cuas_gaussian_ra = gd.getNextBoolean();
...@@ -4414,6 +4421,7 @@ min_str_neib_fpn 0.35 ...@@ -4414,6 +4421,7 @@ min_str_neib_fpn 0.35
this.cuas_lma_maxk = gd.getNextNumber(); this.cuas_lma_maxk = gd.getNextNumber();
this.cuas_lma_a2a = gd.getNextNumber(); this.cuas_lma_a2a = gd.getNextNumber();
this.cuas_slow_en = gd.getNextBoolean();
this.cuas_slow_ra = gd.getNextNumber(); this.cuas_slow_ra = gd.getNextNumber();
this.cuas_slow_score = gd.getNextNumber(); this.cuas_slow_score = gd.getNextNumber();
...@@ -5641,6 +5649,7 @@ min_str_neib_fpn 0.35 ...@@ -5641,6 +5649,7 @@ min_str_neib_fpn 0.35
properties.setProperty(prefix+"cuas_smooth", this.cuas_smooth+""); // boolean properties.setProperty(prefix+"cuas_smooth", this.cuas_smooth+""); // boolean
properties.setProperty(prefix+"cuas_corr_pairs", this.cuas_corr_pairs+""); // int properties.setProperty(prefix+"cuas_corr_pairs", this.cuas_corr_pairs+""); // int
properties.setProperty(prefix+"cuas_boost_slow", this.cuas_boost_slow+""); // double properties.setProperty(prefix+"cuas_boost_slow", this.cuas_boost_slow+""); // double
properties.setProperty(prefix+"cuas_boost_accum", this.cuas_boost_accum+""); // double
properties.setProperty(prefix+"cuas_boost_mstr", this.cuas_boost_mstr+""); // double properties.setProperty(prefix+"cuas_boost_mstr", this.cuas_boost_mstr+""); // double
properties.setProperty(prefix+"cuas_corr_offset", this.cuas_corr_offset+""); // int properties.setProperty(prefix+"cuas_corr_offset", this.cuas_corr_offset+""); // int
properties.setProperty(prefix+"cuas_gaussian_ra", this.cuas_gaussian_ra+""); // boolean properties.setProperty(prefix+"cuas_gaussian_ra", this.cuas_gaussian_ra+""); // boolean
...@@ -5709,6 +5718,7 @@ min_str_neib_fpn 0.35 ...@@ -5709,6 +5718,7 @@ min_str_neib_fpn 0.35
properties.setProperty(prefix+"cuas_lma_maxk", this.cuas_lma_maxk+""); // double properties.setProperty(prefix+"cuas_lma_maxk", this.cuas_lma_maxk+""); // double
properties.setProperty(prefix+"cuas_lma_a2a", this.cuas_lma_a2a+""); // double properties.setProperty(prefix+"cuas_lma_a2a", this.cuas_lma_a2a+""); // double
properties.setProperty(prefix+"cuas_slow_en", this.cuas_slow_en+""); // boolean
properties.setProperty(prefix+"cuas_slow_ra", this.cuas_slow_ra+""); // double properties.setProperty(prefix+"cuas_slow_ra", this.cuas_slow_ra+""); // double
properties.setProperty(prefix+"cuas_slow_score", this.cuas_slow_score+""); // double properties.setProperty(prefix+"cuas_slow_score", this.cuas_slow_score+""); // double
...@@ -6874,6 +6884,7 @@ min_str_neib_fpn 0.35 ...@@ -6874,6 +6884,7 @@ min_str_neib_fpn 0.35
if (properties.getProperty(prefix+"cuas_smooth")!=null) this.cuas_smooth=Boolean.parseBoolean(properties.getProperty(prefix+"cuas_smooth")); if (properties.getProperty(prefix+"cuas_smooth")!=null) this.cuas_smooth=Boolean.parseBoolean(properties.getProperty(prefix+"cuas_smooth"));
if (properties.getProperty(prefix+"cuas_corr_pairs")!=null) this.cuas_corr_pairs=Integer.parseInt(properties.getProperty(prefix+"cuas_corr_pairs")); if (properties.getProperty(prefix+"cuas_corr_pairs")!=null) this.cuas_corr_pairs=Integer.parseInt(properties.getProperty(prefix+"cuas_corr_pairs"));
if (properties.getProperty(prefix+"cuas_boost_slow")!=null) this.cuas_boost_slow=Double.parseDouble(properties.getProperty(prefix+"cuas_boost_slow")); if (properties.getProperty(prefix+"cuas_boost_slow")!=null) this.cuas_boost_slow=Double.parseDouble(properties.getProperty(prefix+"cuas_boost_slow"));
if (properties.getProperty(prefix+"cuas_boost_accum")!=null) this.cuas_boost_accum=Double.parseDouble(properties.getProperty(prefix+"cuas_boost_accum"));
if (properties.getProperty(prefix+"cuas_boost_mstr")!=null) this.cuas_boost_mstr=Double.parseDouble(properties.getProperty(prefix+"cuas_boost_mstr")); if (properties.getProperty(prefix+"cuas_boost_mstr")!=null) this.cuas_boost_mstr=Double.parseDouble(properties.getProperty(prefix+"cuas_boost_mstr"));
if (properties.getProperty(prefix+"cuas_corr_offset")!=null) this.cuas_corr_offset=Integer.parseInt(properties.getProperty(prefix+"cuas_corr_offset")); if (properties.getProperty(prefix+"cuas_corr_offset")!=null) this.cuas_corr_offset=Integer.parseInt(properties.getProperty(prefix+"cuas_corr_offset"));
if (properties.getProperty(prefix+"cuas_gaussian_ra")!=null) this.cuas_gaussian_ra=Boolean.parseBoolean(properties.getProperty(prefix+"cuas_gaussian_ra")); if (properties.getProperty(prefix+"cuas_gaussian_ra")!=null) this.cuas_gaussian_ra=Boolean.parseBoolean(properties.getProperty(prefix+"cuas_gaussian_ra"));
...@@ -6946,6 +6957,7 @@ min_str_neib_fpn 0.35 ...@@ -6946,6 +6957,7 @@ min_str_neib_fpn 0.35
if (properties.getProperty(prefix+"cuas_lma_maxk")!=null) this.cuas_lma_maxk=Double.parseDouble(properties.getProperty(prefix+"cuas_lma_maxk")); if (properties.getProperty(prefix+"cuas_lma_maxk")!=null) this.cuas_lma_maxk=Double.parseDouble(properties.getProperty(prefix+"cuas_lma_maxk"));
if (properties.getProperty(prefix+"cuas_lma_a2a")!=null) this.cuas_lma_a2a=Double.parseDouble(properties.getProperty(prefix+"cuas_lma_a2a")); if (properties.getProperty(prefix+"cuas_lma_a2a")!=null) this.cuas_lma_a2a=Double.parseDouble(properties.getProperty(prefix+"cuas_lma_a2a"));
if (properties.getProperty(prefix+"cuas_slow_en")!=null) this.cuas_slow_en=Boolean.parseBoolean(properties.getProperty(prefix+"cuas_slow_en"));
if (properties.getProperty(prefix+"cuas_slow_ra")!=null) this.cuas_slow_ra=Double.parseDouble(properties.getProperty(prefix+"cuas_slow_ra")); if (properties.getProperty(prefix+"cuas_slow_ra")!=null) this.cuas_slow_ra=Double.parseDouble(properties.getProperty(prefix+"cuas_slow_ra"));
if (properties.getProperty(prefix+"cuas_slow_score")!=null) this.cuas_slow_score=Double.parseDouble(properties.getProperty(prefix+"cuas_slow_score")); if (properties.getProperty(prefix+"cuas_slow_score")!=null) this.cuas_slow_score=Double.parseDouble(properties.getProperty(prefix+"cuas_slow_score"));
...@@ -8124,6 +8136,7 @@ min_str_neib_fpn 0.35 ...@@ -8124,6 +8136,7 @@ min_str_neib_fpn 0.35
imp.cuas_smooth = this.cuas_smooth; imp.cuas_smooth = this.cuas_smooth;
imp.cuas_corr_pairs = this.cuas_corr_pairs; imp.cuas_corr_pairs = this.cuas_corr_pairs;
imp.cuas_boost_slow = this.cuas_boost_slow; imp.cuas_boost_slow = this.cuas_boost_slow;
imp.cuas_boost_accum = this.cuas_boost_accum;
imp.cuas_boost_mstr = this.cuas_boost_mstr; imp.cuas_boost_mstr = this.cuas_boost_mstr;
imp.cuas_corr_offset = this.cuas_corr_offset; imp.cuas_corr_offset = this.cuas_corr_offset;
imp.cuas_gaussian_ra = this.cuas_gaussian_ra; imp.cuas_gaussian_ra = this.cuas_gaussian_ra;
...@@ -8194,6 +8207,7 @@ min_str_neib_fpn 0.35 ...@@ -8194,6 +8207,7 @@ min_str_neib_fpn 0.35
imp.cuas_lma_maxk = this.cuas_lma_maxk; imp.cuas_lma_maxk = this.cuas_lma_maxk;
imp.cuas_lma_a2a = this.cuas_lma_a2a; imp.cuas_lma_a2a = this.cuas_lma_a2a;
imp.cuas_slow_en = this.cuas_slow_en;
imp.cuas_slow_ra = this.cuas_slow_ra; imp.cuas_slow_ra = this.cuas_slow_ra;
imp.cuas_slow_score = this.cuas_slow_score; imp.cuas_slow_score = this.cuas_slow_score;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment