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
f580e71e
Commit
f580e71e
authored
Feb 02, 2020
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tested new fiel calibration with ers
parent
b47dba20
Changes
10
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
1044 additions
and
456 deletions
+1044
-456
CLTParameters.java
src/main/java/com/elphel/imagej/cameras/CLTParameters.java
+64
-25
ShowDoubleFloatArrays.java
.../java/com/elphel/imagej/common/ShowDoubleFloatArrays.java
+1
-1
CLTPass3d.java
src/main/java/com/elphel/imagej/tileprocessor/CLTPass3d.java
+31
-1
Correlation2d.java
...n/java/com/elphel/imagej/tileprocessor/Correlation2d.java
+2
-2
ExtrinsicAdjustment.java
.../com/elphel/imagej/tileprocessor/ExtrinsicAdjustment.java
+141
-32
GeometryCorrection.java
...a/com/elphel/imagej/tileprocessor/GeometryCorrection.java
+106
-45
ImageDtt.java
src/main/java/com/elphel/imagej/tileprocessor/ImageDtt.java
+209
-186
ImageDttParameters.java
...a/com/elphel/imagej/tileprocessor/ImageDttParameters.java
+15
-15
QuadCLT.java
src/main/java/com/elphel/imagej/tileprocessor/QuadCLT.java
+474
-148
TwoQuadCLT.java
...main/java/com/elphel/imagej/tileprocessor/TwoQuadCLT.java
+1
-1
No files found.
src/main/java/com/elphel/imagej/cameras/CLTParameters.java
View file @
f580e71e
This diff is collapsed.
Click to expand it.
src/main/java/com/elphel/imagej/common/ShowDoubleFloatArrays.java
View file @
f580e71e
...
...
@@ -85,7 +85,7 @@ import ij.process.ImageProcessor;
}
}
ImagePlus
imp_stack
=
new
ImagePlus
(
title
,
array_stack
);
ImagePlus
imp_stack
=
new
ImagePlus
(
title
,
array_stack
);
// stack is empty
imp_stack
.
getProcessor
().
resetMinAndMax
();
imp_stack
.
show
();
return
;
...
...
src/main/java/com/elphel/imagej/tileprocessor/CLTPass3d.java
View file @
f580e71e
...
...
@@ -34,7 +34,12 @@ public class CLTPass3d{
private
double
[][]
disparity_sav
;
// saved disparity
private
int
[][]
tile_op_sav
;
// saved tile_op
public
double
[][]
disparity_map
=
null
;
// add 4 layers - worst difference for the port
public
double
[][]
lazy_eye_data
=
null
;
public
int
lma_cluster_size
=
-
1
;
public
boolean
[]
lazy_eye_force_disparity
=
null
;
double
[]
calc_disparity
=
null
;
// composite disparity, calculated from "disparity", and "disparity_map" fields
// using horizontal features and corr_magic_scale
// used directly in TileProcessor.compositeScan()
double
[]
calc_disparity_hor
=
null
;
// composite disparity, calculated from "disparity", and "disparity_map" fields
...
...
@@ -55,7 +60,7 @@ public class CLTPass3d{
public
boolean
[]
border_tiles
=
null
;
// these are border tiles, zero out alpha
public
boolean
[]
selected
=
null
;
// which tiles are selected for this layer
public
double
[][][][]
texture_tiles
;
public
double
[][]
max_tried_disparity
=
null
;
//[ty][tx] used for combined passes, shows maximal disparity for this tile, regardless of results
public
double
[][]
max_tried_disparity
=
null
;
//[ty][tx] used for combined passes, shows maximal disparity for this tile, regardless of results
public
boolean
is_combo
=
false
;
public
boolean
is_measured
=
false
;
public
String
texture
=
null
;
// relative (to x3d) path
...
...
@@ -235,6 +240,31 @@ public class CLTPass3d{
}
public
boolean
[]
getLazyEyeForceDisparity
()
{
return
lazy_eye_force_disparity
;
}
public
void
setLazyEyeForceDisparity
(
boolean
[]
lazy_eye_force_disparity
)
{
this
.
lazy_eye_force_disparity
=
lazy_eye_force_disparity
;
}
public
double
[][]
getLazyEyeData
()
{
return
lazy_eye_data
;
}
public
void
setLazyEyeData
(
double
[][]
lazy_eye_data
)
{
this
.
lazy_eye_data
=
lazy_eye_data
;
}
public
int
getLazyEyeClusterSize
()
{
return
lma_cluster_size
;
}
public
void
setLazyEyeClusterSize
(
int
lma_cluster_size
)
{
this
.
lma_cluster_size
=
lma_cluster_size
;
}
public
boolean
[]
getSelected
(){
return
selected
;
}
...
...
src/main/java/com/elphel/imagej/tileprocessor/Correlation2d.java
View file @
f580e71e
...
...
@@ -1948,13 +1948,13 @@ public class Correlation2d {
}
if
(
debug_graphic
)
{
if
(
debug_graphic
&&
(
dbg_corr
!=
null
)
)
{
double
[][]
dbg_corrs
=
repackCluster
(
dbg_corr
,
clust_width
);
(
new
ShowDoubleFloatArrays
()).
showArrays
(
(
new
ShowDoubleFloatArrays
()).
showArrays
(
// empty array
dbg_corrs
,
dbg_out_width
,
dbg_out_height
,
...
...
src/main/java/com/elphel/imagej/tileprocessor/ExtrinsicAdjustment.java
View file @
f580e71e
This diff is collapsed.
Click to expand it.
src/main/java/com/elphel/imagej/tileprocessor/GeometryCorrection.java
View file @
f580e71e
This diff is collapsed.
Click to expand it.
src/main/java/com/elphel/imagej/tileprocessor/ImageDtt.java
View file @
f580e71e
This diff is collapsed.
Click to expand it.
src/main/java/com/elphel/imagej/tileprocessor/ImageDttParameters.java
View file @
f580e71e
...
...
@@ -99,7 +99,7 @@ public class ImageDttParameters {
public
double
corr_wndx_blur
=
5.0
;
// 100% to 0 % vertical transition range
// LMA parameters
public
double
lma_disp_range
=
2
.0
;
// disparity range to combine in one cluster (to mitigate ERS
public
double
lma_disp_range
=
5
.0
;
// disparity range to combine in one cluster (to mitigate ERS
// LMA single parameters
public
boolean
lmas_gaussian
=
false
;
// model correlation maximum as a Gaussian (false - as a parabola)
public
boolean
lmas_adjust_wm
=
true
;
// used in new for width
...
...
@@ -110,16 +110,16 @@ public class ImageDttParameters {
public
double
lmas_poly_str_min
=
0.05
;
// ignore tiles with poly strength (scaled) below
public
double
lmas_lambda_initial
=
0.03
;
//
public
double
lmas_rms_diff
=
0.00
1
;
//
public
double
lmas_rms_diff
=
0.00
03
;
//
public
int
lmas_num_iter
=
20
;
//
// Filtering and strength calculation
public
double
lmas_max_rel_rms
=
0.
2
;
// maximal relative (to average max/min amplitude LMA RMS) // May be up to 0.3)
public
double
lmas_min_strength
=
1.0
;
// minimal composite strength (sqrt(average amp squared over absolute RMS)
public
double
lmas_min_ac
=
0.0
3
;
// minimal of a and C coefficients maximum (measures sharpest point/line)
public
double
lmas_max_rel_rms
=
0.
3
;
// maximal relative (to average max/min amplitude LMA RMS) // May be up to 0.3)
public
double
lmas_min_strength
=
0.7
;
// minimal composite strength (sqrt(average amp squared over absolute RMS)
public
double
lmas_min_ac
=
0.0
2
;
// minimal of a and C coefficients maximum (measures sharpest point/line)
public
double
lmas_max_area
=
0.0
;
// maximal half-area (if > 0.0)
public
boolean
lma_gaussian
=
false
;
// model correlation maximum as a Gaussian (false - as a parabola)
public
boolean
lma_second
=
fals
e
;
// re-run LMA after removing weak/failed tiles
public
boolean
lma_second
=
tru
e
;
// re-run LMA after removing weak/failed tiles
public
boolean
lma_second_gaussian
=
false
;
// re-run after removing weal/failed in Gaussian mode
public
boolean
lma_adjust_wm
=
true
;
// used in new for width
public
boolean
lma_adjust_wy
=
true
;
// false; // used in new for ellipse
...
...
@@ -128,7 +128,7 @@ public class ImageDttParameters {
public
boolean
lma_adjust_ag
=
true
;
// used in new for gains
// new LMA parameters
public
double
lma_wnd
=
1.5
;
// raise cosine window to this power (1.0 - just 2D cosine)
public
double
lma_wnd
=
1.
0
;
//1.
5; // raise cosine window to this power (1.0 - just 2D cosine)
public
double
lma_min_wnd
=
0.4
;
// divide values by the 2D correlation window if it is >= this value for finding maximums and convex areas
public
double
lma_wnd_pwr
=
0.8
;
// Raise window for finding a maximum and a convex region to this power
public
int
lma_hard_marg
=
1
;
// Zero out this width margins before blurring
...
...
@@ -148,13 +148,13 @@ public class ImageDttParameters {
public
double
lma_lambda_scale_good
=
0.5
;
//
public
double
lma_lambda_scale_bad
=
8.0
;
//
public
double
lma_lambda_max
=
100.0
;
//
public
double
lma_rms_diff
=
0.00
1
;
//
public
int
lma_num_iter
=
2
0
;
//
public
double
lma_rms_diff
=
0.00
3
;
//
public
int
lma_num_iter
=
1
0
;
//
// Filtering and strength calculation
public
double
lma_max_rel_rms
=
0.
1
2
;
// maximal relative (to average max/min amplitude LMA RMS) // May be up to 0.3)
public
double
lma_min_strength
=
1.
25
;
// minimal composite strength (sqrt(average amp squared over absolute RMS)
public
double
lma_min_ac
=
0.
1
5
;
// minimal of a and C coefficients maximum (measures sharpest point/line)
public
double
lma_max_area
=
30
.0
;
// maximal half-area (if > 0.0)
public
double
lma_max_rel_rms
=
0.2
;
// maximal relative (to average max/min amplitude LMA RMS) // May be up to 0.3)
public
double
lma_min_strength
=
1.
0
;
// minimal composite strength (sqrt(average amp squared over absolute RMS)
public
double
lma_min_ac
=
0.
0
5
;
// minimal of a and C coefficients maximum (measures sharpest point/line)
public
double
lma_max_area
=
45
.0
;
// maximal half-area (if > 0.0)
public
double
lma_str_scale
=
0.2
;
// convert lma-generated strength to match previous ones - scale
public
double
lma_str_offset
=
0.05
;
// convert lma-generated strength to match previous ones - add to result
...
...
@@ -162,8 +162,8 @@ public class ImageDttParameters {
// Lazy eye results interpretation
public
boolean
lma_diff_xy
=
true
;
// convert dd/nd to x,y
public
double
lma_diff_minw
=
0.
5
;
// minimal weight to keep
public
double
lma_diff_sigma
=
1
.0
;
// blur differential data (relative to the cluster linear size)
public
double
lma_diff_minw
=
0.
07
;
// minimal weight to keep
public
double
lma_diff_sigma
=
2
.0
;
// blur differential data (relative to the cluster linear size)
public
int
lma_debug_level
=
0
;
//
public
int
lma_debug_level1
=
0
;
//
...
...
src/main/java/com/elphel/imagej/tileprocessor/QuadCLT.java
View file @
f580e71e
This diff is collapsed.
Click to expand it.
src/main/java/com/elphel/imagej/tileprocessor/TwoQuadCLT.java
View file @
f580e71e
...
...
@@ -8255,7 +8255,7 @@ if (debugLevel > -100) return true; // temporarily !
final
boolean
updateStatus
,
final
int
debugLevel
)
throws
Exception
{
//
final boolean batch_mode = clt_parameters.batch_run;
// final boolean batch_mode = clt_parameters.batch_run;
// Reset dsi data (only 2 slices will be used)
this
.
dsi
=
new
double
[
DSI_SLICES
.
length
][];
this
.
dsi_aux_from_main
=
null
;
// full data, including rms, fg and bg data
...
...
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