Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
imagej-elphel
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Elphel
imagej-elphel
Commits
9c511734
Commit
9c511734
authored
Apr 28, 2022
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
LY multi-scene
parent
b23f9b92
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
435 additions
and
223 deletions
+435
-223
CLTParameters.java
src/main/java/com/elphel/imagej/cameras/CLTParameters.java
+74
-16
ImageDttCPU.java
...ain/java/com/elphel/imagej/tileprocessor/ImageDttCPU.java
+58
-0
MultisceneLY.java
...in/java/com/elphel/imagej/tileprocessor/MultisceneLY.java
+216
-69
TwoQuadCLT.java
...main/java/com/elphel/imagej/tileprocessor/TwoQuadCLT.java
+87
-138
No files found.
src/main/java/com/elphel/imagej/cameras/CLTParameters.java
View file @
9c511734
...
@@ -321,6 +321,21 @@ public class CLTParameters {
...
@@ -321,6 +321,21 @@ public class CLTParameters {
public
boolean
lyr_filter_ds
=
false
;
// true;
public
boolean
lyr_filter_ds
=
false
;
// true;
public
boolean
lyr_filter_lyf
=
false
;
// ~clt_parameters.lyf_filter, but may be different, now off for a single cameras
public
boolean
lyr_filter_lyf
=
false
;
// ~clt_parameters.lyf_filter, but may be different, now off for a single cameras
// Multi-scene LY parameters
// Infinity detection
public
double
lyms_far_inf
=
-
0.5
;
// Far limit when searching for infinity objects
public
double
lyms_near_inf
=
0.5
;
// Near limit when searching for infinity objects
public
double
lyms_far_fract
=
0.05
;
// Mode of disparity distribution within range
public
double
lyms_inf_range_offs
=
0.05
;
// Add to the disparity distribution mode for infinity center
public
double
lyms_inf_range
=
0.15
;
// Consider infinity tiles that are within +/- half of this range from infinity center
//non-infinity parameters
public
double
lyms_min_inf_str
=
0.2
;
// Minimal strength of infinity tiles
public
double
lyms_min_fg_str
=
0.4
;
// Minimal strength of non-infinity tiles
public
int
lyms_clust_size
=
4
;
// cluster size (same in both directions) for measuring LY data
public
double
lyms_scene_range
=
10.0
;
// disparity range for non-infinity in the same cluster
public
int
lyms_min_num_inf
=
10
;
// Minimal number of tiles (in all scenes total) in an infinity cluster
// old fcorr parameters, reuse?
// old fcorr parameters, reuse?
// public int fcorr_sample_size = 32; // Use square this size side to detect outliers
// public int fcorr_sample_size = 32; // Use square this size side to detect outliers
...
@@ -1243,6 +1258,17 @@ public class CLTParameters {
...
@@ -1243,6 +1258,17 @@ public class CLTParameters {
properties
.
setProperty
(
prefix
+
"lyr_filter_ds"
,
this
.
lyr_filter_ds
+
""
);
properties
.
setProperty
(
prefix
+
"lyr_filter_ds"
,
this
.
lyr_filter_ds
+
""
);
properties
.
setProperty
(
prefix
+
"lyr_filter_lyf"
,
this
.
lyr_filter_lyf
+
""
);
properties
.
setProperty
(
prefix
+
"lyr_filter_lyf"
,
this
.
lyr_filter_lyf
+
""
);
properties
.
setProperty
(
prefix
+
"lyms_far_inf"
,
this
.
lyms_far_inf
+
""
);
properties
.
setProperty
(
prefix
+
"lyms_near_inf"
,
this
.
lyms_near_inf
+
""
);
properties
.
setProperty
(
prefix
+
"lyms_far_fract"
,
this
.
lyms_far_fract
+
""
);
properties
.
setProperty
(
prefix
+
"lyms_inf_range_offs"
,
this
.
lyms_inf_range_offs
+
""
);
properties
.
setProperty
(
prefix
+
"lyms_inf_range"
,
this
.
lyms_inf_range
+
""
);
properties
.
setProperty
(
prefix
+
"lyms_min_inf_str"
,
this
.
lyms_min_inf_str
+
""
);
properties
.
setProperty
(
prefix
+
"lyms_min_fg_str"
,
this
.
lyms_min_fg_str
+
""
);
properties
.
setProperty
(
prefix
+
"lyms_clust_size"
,
this
.
lyms_clust_size
+
""
);
properties
.
setProperty
(
prefix
+
"lyms_scene_range"
,
this
.
lyms_scene_range
+
""
);
properties
.
setProperty
(
prefix
+
"lyms_min_num_inf"
,
this
.
lyms_min_num_inf
+
""
);
properties
.
setProperty
(
prefix
+
"corr_magic_scale"
,
this
.
corr_magic_scale
+
""
);
properties
.
setProperty
(
prefix
+
"corr_magic_scale"
,
this
.
corr_magic_scale
+
""
);
properties
.
setProperty
(
prefix
+
"corr_select"
,
this
.
corr_select
+
""
);
properties
.
setProperty
(
prefix
+
"corr_select"
,
this
.
corr_select
+
""
);
...
@@ -2073,6 +2099,17 @@ public class CLTParameters {
...
@@ -2073,6 +2099,17 @@ public class CLTParameters {
if
(
properties
.
getProperty
(
prefix
+
"lyr_filter_ds"
)!=
null
)
this
.
lyr_filter_ds
=
Boolean
.
parseBoolean
(
properties
.
getProperty
(
prefix
+
"lyr_filter_ds"
));
if
(
properties
.
getProperty
(
prefix
+
"lyr_filter_ds"
)!=
null
)
this
.
lyr_filter_ds
=
Boolean
.
parseBoolean
(
properties
.
getProperty
(
prefix
+
"lyr_filter_ds"
));
if
(
properties
.
getProperty
(
prefix
+
"lyr_filter_lyf"
)!=
null
)
this
.
lyr_filter_lyf
=
Boolean
.
parseBoolean
(
properties
.
getProperty
(
prefix
+
"lyr_filter_lyf"
));
if
(
properties
.
getProperty
(
prefix
+
"lyr_filter_lyf"
)!=
null
)
this
.
lyr_filter_lyf
=
Boolean
.
parseBoolean
(
properties
.
getProperty
(
prefix
+
"lyr_filter_lyf"
));
if
(
properties
.
getProperty
(
prefix
+
"lyms_far_inf"
)!=
null
)
this
.
lyms_far_inf
=
Double
.
parseDouble
(
properties
.
getProperty
(
prefix
+
"lyms_far_inf"
));
if
(
properties
.
getProperty
(
prefix
+
"lyms_near_inf"
)!=
null
)
this
.
lyms_near_inf
=
Double
.
parseDouble
(
properties
.
getProperty
(
prefix
+
"lyms_near_inf"
));
if
(
properties
.
getProperty
(
prefix
+
"lyms_far_fract"
)!=
null
)
this
.
lyms_far_fract
=
Double
.
parseDouble
(
properties
.
getProperty
(
prefix
+
"lyms_far_fract"
));
if
(
properties
.
getProperty
(
prefix
+
"lyms_inf_range_offs"
)!=
null
)
this
.
lyms_inf_range_offs
=
Double
.
parseDouble
(
properties
.
getProperty
(
prefix
+
"lyms_inf_range_offs"
));
if
(
properties
.
getProperty
(
prefix
+
"lyms_inf_range"
)!=
null
)
this
.
lyms_inf_range
=
Double
.
parseDouble
(
properties
.
getProperty
(
prefix
+
"lyms_inf_range"
));
if
(
properties
.
getProperty
(
prefix
+
"lyms_min_inf_str"
)!=
null
)
this
.
lyms_min_inf_str
=
Double
.
parseDouble
(
properties
.
getProperty
(
prefix
+
"lyms_min_inf_str"
));
if
(
properties
.
getProperty
(
prefix
+
"lyms_min_fg_str"
)!=
null
)
this
.
lyms_min_fg_str
=
Double
.
parseDouble
(
properties
.
getProperty
(
prefix
+
"lyms_min_fg_str"
));
if
(
properties
.
getProperty
(
prefix
+
"lyms_clust_size"
)!=
null
)
this
.
lyms_clust_size
=
Integer
.
parseInt
(
properties
.
getProperty
(
prefix
+
"lyms_clust_size"
));
if
(
properties
.
getProperty
(
prefix
+
"lyms_scene_range"
)!=
null
)
this
.
lyms_scene_range
=
Double
.
parseDouble
(
properties
.
getProperty
(
prefix
+
"lyms_scene_range"
));
if
(
properties
.
getProperty
(
prefix
+
"lyms_min_num_inf"
)!=
null
)
this
.
lyms_min_num_inf
=
Integer
.
parseInt
(
properties
.
getProperty
(
prefix
+
"lyms_min_num_inf"
));
if
(
properties
.
getProperty
(
prefix
+
"corr_magic_scale"
)!=
null
)
this
.
corr_magic_scale
=
Double
.
parseDouble
(
properties
.
getProperty
(
prefix
+
"corr_magic_scale"
));
if
(
properties
.
getProperty
(
prefix
+
"corr_magic_scale"
)!=
null
)
this
.
corr_magic_scale
=
Double
.
parseDouble
(
properties
.
getProperty
(
prefix
+
"corr_magic_scale"
));
if
(
properties
.
getProperty
(
prefix
+
"corr_select"
)!=
null
)
this
.
corr_select
=
Integer
.
parseInt
(
properties
.
getProperty
(
prefix
+
"corr_select"
));
if
(
properties
.
getProperty
(
prefix
+
"corr_select"
)!=
null
)
this
.
corr_select
=
Integer
.
parseInt
(
properties
.
getProperty
(
prefix
+
"corr_select"
));
...
@@ -3006,13 +3043,30 @@ public class CLTParameters {
...
@@ -3006,13 +3043,30 @@ public class CLTParameters {
gd
.
addCheckbox
(
"Filter lazy eye pairs by their values wen GT data is available"
,
this
.
lyr_filter_lyf
,
gd
.
addCheckbox
(
"Filter lazy eye pairs by their values wen GT data is available"
,
this
.
lyr_filter_lyf
,
"Same as \"Filter lazy eye pairs by their values\" above, but for the rig-guided adjustments"
);
"Same as \"Filter lazy eye pairs by their values\" above, but for the rig-guided adjustments"
);
gd
.
addTab
(
"LY multiscene"
,
"Multiscene series Lazy Eye correction"
);
// gd.addNumericField("Use square this size side to detect outliers", this.fcorr_sample_size, 0);
// gd.addNumericField("Keep tiles only if there are more in each square", this.fcorr_mintiles, 0);
gd
.
addMessage
(
"--- Infinity detection ---"
);
// gd.addNumericField("Remove this fraction of tiles from each sample", this.fcorr_reloutliers, 3);
gd
.
addNumericField
(
"Infinity far"
,
this
.
lyms_far_inf
,
4
,
6
,
"pix"
,
// gd.addNumericField("Gaussian blur channel mismatch data", this.fcorr_sigma, 3);
"Far limit when searching for infinity objects"
);
gd
.
addNumericField
(
"Infinity near"
,
this
.
lyms_near_inf
,
4
,
6
,
"pix"
,
/// gd.addNumericField("Calculated from correlation offset vs. actual one (not yet understood)", this.corr_magic_scale, 3);
"Near limit when searching for infinity objects"
);
gd
.
addNumericField
(
"Infinity mode (0.0 - min, 1.0 - max"
,
this
.
lyms_far_fract
,
4
,
6
,
""
,
"Mode of disparity distribution within range (0.0 - min, 1.0 - max)"
);
gd
.
addNumericField
(
"Offset infinity center from mode"
,
this
.
lyms_inf_range_offs
,
4
,
6
,
"pix"
,
"Add to the disparity distribution mode for infinity center"
);
gd
.
addNumericField
(
"Infinity full range"
,
this
.
lyms_inf_range
,
4
,
6
,
"pix"
,
"Consider infinity tiles that are within +/- half of this range from infinity center"
);
gd
.
addMessage
(
"--- LY data measurement ---"
);
gd
.
addNumericField
(
"Minimal strength (infinity)"
,
this
.
lyms_min_inf_str
,
4
,
6
,
""
,
"Minimal strength of infinity tiles"
);
gd
.
addNumericField
(
"Minimal strength (non-infinity)"
,
this
.
lyms_min_fg_str
,
4
,
6
,
""
,
"Minimal strength of non-infinity tiles"
);
gd
.
addNumericField
(
"Cluster size"
,
this
.
lyms_clust_size
,
0
,
3
,
"pix"
,
"Cluster size (same in both directions) for measuring LY data"
);
gd
.
addNumericField
(
"Per-scene disparity range"
,
this
.
lyms_scene_range
,
4
,
6
,
"pix"
,
"Disparity range for non-infinity in the same cluster"
);
gd
.
addNumericField
(
"Minimal number of infinity tiles"
,
this
.
lyms_min_num_inf
,
0
,
3
,
""
,
"Minimal number of tiles (in all scenes total) in an infinity cluster"
);
gd
.
addTab
(
"3D"
,
"3D reconstruction"
);
gd
.
addTab
(
"3D"
,
"3D reconstruction"
);
gd
.
addMessage
(
"--- 3D reconstruction ---"
);
gd
.
addMessage
(
"--- 3D reconstruction ---"
);
...
@@ -3977,12 +4031,16 @@ public class CLTParameters {
...
@@ -3977,12 +4031,16 @@ public class CLTParameters {
this
.
lyr_filter_ds
=
gd
.
getNextBoolean
();
this
.
lyr_filter_ds
=
gd
.
getNextBoolean
();
this
.
lyr_filter_lyf
=
gd
.
getNextBoolean
();
this
.
lyr_filter_lyf
=
gd
.
getNextBoolean
();
// this.fcorr_sample_size= (int)gd.getNextNumber();
this
.
lyms_far_inf
=
gd
.
getNextNumber
();
// this.fcorr_mintiles= (int) gd.getNextNumber();
this
.
lyms_near_inf
=
gd
.
getNextNumber
();
// this.fcorr_reloutliers= gd.getNextNumber();
this
.
lyms_far_fract
=
gd
.
getNextNumber
();
// this.fcorr_sigma= gd.getNextNumber();
this
.
lyms_inf_range_offs
=
gd
.
getNextNumber
();
this
.
lyms_inf_range
=
gd
.
getNextNumber
();
/// this.corr_magic_scale= gd.getNextNumber();
this
.
lyms_min_inf_str
=
gd
.
getNextNumber
();
this
.
lyms_min_fg_str
=
gd
.
getNextNumber
();
this
.
lyms_clust_size
=
(
int
)
gd
.
getNextNumber
();
this
.
lyms_scene_range
=
gd
.
getNextNumber
();
this
.
lyms_min_num_inf
=(
int
)
gd
.
getNextNumber
();
this
.
show_textures
=
gd
.
getNextBoolean
();
this
.
show_textures
=
gd
.
getNextBoolean
();
this
.
debug_filters
=
gd
.
getNextBoolean
();
this
.
debug_filters
=
gd
.
getNextBoolean
();
...
...
src/main/java/com/elphel/imagej/tileprocessor/ImageDttCPU.java
View file @
9c511734
...
@@ -8950,6 +8950,64 @@ public class ImageDttCPU {
...
@@ -8950,6 +8950,64 @@ public class ImageDttCPU {
return
corr2d_decimated
;
return
corr2d_decimated
;
}
}
public
static
double
[][]
corr2d_decimate
(
// not used in lwir
final
double
[][]
corr2d_img
,
final
int
tilesX
,
final
int
tilesY
,
final
int
clust_size
,
final
int
[]
wh
,
final
int
threadsMax
,
// maximal number of threads to launch
final
int
globalDebugLevel
)
{
int
len
=
0
;
final
double
[][]
corr2d_decimated
=
new
double
[
corr2d_img
.
length
][];
for
(
int
i
=
0
;
i
<
corr2d_img
.
length
;
i
++)
{
if
(
corr2d_img
[
i
]
!=
null
)
{
len
=
corr2d_img
[
i
].
length
;
break
;
}
}
final
int
tile_size
=
(
int
)
Math
.
round
(
Math
.
sqrt
(
len
/(
tilesX
*
tilesY
)));
final
int
clustersX
=
(
int
)
Math
.
ceil
(
1.0
*
tilesX
/
clust_size
);
final
int
clustersY
=
(
int
)
Math
.
ceil
(
1.0
*
tilesY
/
clust_size
);
final
int
clusters
=
clustersX
*
clustersY
;
final
Thread
[]
threads
=
newThreadArray
(
threadsMax
);
final
AtomicInteger
ai
=
new
AtomicInteger
(
0
);
final
int
clust_lines
=
clust_size
*
tile_size
;
final
int
in_line_len
=
clustersX
*
clust_size
*
tile_size
;
final
int
out_line_len
=
clustersX
*
tile_size
;
if
(
wh
!=
null
)
{
wh
[
0
]
=
clustersX
*
tile_size
;
wh
[
1
]
=
clustersY
*
tile_size
;
}
for
(
int
ithread
=
0
;
ithread
<
threads
.
length
;
ithread
++)
{
threads
[
ithread
]
=
new
Thread
()
{
@Override
public
void
run
()
{
for
(
int
nLayer
=
ai
.
getAndIncrement
();
nLayer
<
corr2d_img
.
length
;
nLayer
=
ai
.
getAndIncrement
())
{
if
(
corr2d_img
[
nLayer
]
!=
null
){
corr2d_decimated
[
nLayer
]
=
new
double
[
clusters
*
tile_size
*
tile_size
];
for
(
int
clustY
=
0
;
clustY
<
clustersY
;
clustY
++)
{
for
(
int
clustX
=
0
;
clustX
<
clustersX
;
clustX
++)
{
int
offs
=
clustY
*
clust_lines
*
in_line_len
;
for
(
int
line
=
0
;
line
<
tile_size
;
line
++)
{
System
.
arraycopy
(
corr2d_img
[
nLayer
],
(
clustY
*
clust_lines
+
line
)
*
in_line_len
+
clustX
*
clust_lines
,
corr2d_decimated
[
nLayer
],
(
clustY
*
tile_size
+
line
)
*
out_line_len
+
clustX
*
tile_size
,
tile_size
);
}
}
}
}
}
}
};
}
startAndJoin
(
threads
);
return
corr2d_decimated
;
}
...
...
src/main/java/com/elphel/imagej/tileprocessor/MultisceneLY.java
View file @
9c511734
This diff is collapsed.
Click to expand it.
src/main/java/com/elphel/imagej/tileprocessor/TwoQuadCLT.java
View file @
9c511734
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment