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
d87f98cc
Commit
d87f98cc
authored
Dec 18, 2023
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed LMA bug, commented thread_invariant for LMA
parent
1bbeb0e2
Changes
2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
159 additions
and
218 deletions
+159
-218
Interscene.java
...main/java/com/elphel/imagej/tileprocessor/Interscene.java
+4
-2
IntersceneLma.java
...n/java/com/elphel/imagej/tileprocessor/IntersceneLma.java
+155
-216
No files found.
src/main/java/com/elphel/imagej/tileprocessor/Interscene.java
View file @
d87f98cc
...
@@ -1389,6 +1389,7 @@ public class Interscene {
...
@@ -1389,6 +1389,7 @@ public class Interscene {
{
{
System
.
out
.
println
(
"reAdjustPairsLMAInterscene(): using mb_max_gain="
+
mb_max_gain
);
System
.
out
.
println
(
"reAdjustPairsLMAInterscene(): using mb_max_gain="
+
mb_max_gain
);
boolean
freeze_xy_pull
=
false
;
// true; // debugging freezing xy to xy_pull
boolean
freeze_xy_pull
=
false
;
// true; // debugging freezing xy to xy_pull
boolean
copy_pull_current
=
true
;
final
boolean
[]
param_select
=
configured_lma
?
clt_parameters
.
ilp
.
ilma_lma_select
:
final
boolean
[]
param_select
=
configured_lma
?
clt_parameters
.
ilp
.
ilma_lma_select
:
ErsCorrection
.
getParamSelect
(
ErsCorrection
.
getParamSelect
(
!
freeze_xy_pull
&&
(!
readjust_xy_ims
||
(
reg_weight_xy
!=
0
)),
// false only in mode c): freeze X,Y// boolean use_XY
!
freeze_xy_pull
&&
(!
readjust_xy_ims
||
(
reg_weight_xy
!=
0
)),
// false only in mode c): freeze X,Y// boolean use_XY
...
@@ -1545,7 +1546,7 @@ public class Interscene {
...
@@ -1545,7 +1546,7 @@ public class Interscene {
earliest_scene
,
// int early_index,
earliest_scene
,
// int early_index,
last_scene
);
// int last_index)
last_scene
);
// int last_index)
}
}
if
(
freeze_xy_pull
)
{
if
(
copy_pull_current
)
{
//
freeze_xy_pull) {
System
.
out
.
println
(
"reAdjustPairsLMAInterscene(): freezing X,Y to X,Y pull values"
);
System
.
out
.
println
(
"reAdjustPairsLMAInterscene(): freezing X,Y to X,Y pull values"
);
for
(
int
nscene
=
last_scene
;
nscene
>=
earliest_scene
;
nscene
--)
{
for
(
int
nscene
=
last_scene
;
nscene
>=
earliest_scene
;
nscene
--)
{
if
(
scenes_xyzatr_pull
[
nscene
]
!=
null
)
{
if
(
scenes_xyzatr_pull
[
nscene
]
!=
null
)
{
...
@@ -2261,13 +2262,14 @@ public class Interscene {
...
@@ -2261,13 +2262,14 @@ public class Interscene {
ers_scene.ers_wxyz_center_dt = ers_ref.ers_wxyz_center_dt.clone();
ers_scene.ers_wxyz_center_dt = ers_ref.ers_wxyz_center_dt.clone();
*/
*/
}
}
// TODO: save ers_scene.ers_watr_center_dt and ers_scene.ers_wxyz_center_dt
// TODO: save ers_scene.ers_watr_center_dt and ers_scene.ers_wxyz_center_dt
intersceneLma
.
prepareLMA
(
intersceneLma
.
prepareLMA
(
camera_xyz0
,
// final double [] scene_xyz0, // camera center in world coordinates (or null to use instance)
camera_xyz0
,
// final double [] scene_xyz0, // camera center in world coordinates (or null to use instance)
camera_atr0
,
// final double [] scene_atr0, // camera orientation relative to world frame (or null to use instance)
camera_atr0
,
// final double [] scene_atr0, // camera orientation relative to world frame (or null to use instance)
scene_xyz_pull
,
// final double [] scene_xyz_pull, // if both are not null, specify target values to pull to
scene_xyz_pull
,
// final double [] scene_xyz_pull, // if both are not null, specify target values to pull to
scene_atr_pull
,
// final double [] scene_atr_pull, //
scene_atr_pull
,
// final double [] scene_atr_pull, //
// reference atr, xyz are considered 0.0
// reference atr, xyz are considered 0.0
not anymore?
scene_QuadClt
,
// final QuadCLT scene_QuadClt,
scene_QuadClt
,
// final QuadCLT scene_QuadClt,
reference_QuadClt
,
// final QuadCLT reference_QuadClt,
reference_QuadClt
,
// final QuadCLT reference_QuadClt,
param_select_mod
,
// param_select, // final boolean[] param_select,
param_select_mod
,
// param_select, // final boolean[] param_select,
...
...
src/main/java/com/elphel/imagej/tileprocessor/IntersceneLma.java
View file @
d87f98cc
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