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
a095795c
Commit
a095795c
authored
Oct 16, 2023
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor cleanup
parent
96ea490a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
19 deletions
+0
-19
Interscene.java
...main/java/com/elphel/imagej/tileprocessor/Interscene.java
+0
-11
OpticalFlow.java
...ain/java/com/elphel/imagej/tileprocessor/OpticalFlow.java
+0
-8
No files found.
src/main/java/com/elphel/imagej/tileprocessor/Interscene.java
View file @
a095795c
...
@@ -91,11 +91,6 @@ public class Interscene {
...
@@ -91,11 +91,6 @@ public class Interscene {
final
int
threadsMax
,
// int threadsMax,
final
int
threadsMax
,
// int threadsMax,
final
boolean
updateStatus
,
final
boolean
updateStatus
,
final
int
debugLevel
)
{
final
int
debugLevel
)
{
// int num_scene_retries = 10;
// int retry_radius = 2;
// double scale_extrap_atr = clt_parameters.imp.scale_extrap_atr;
// double scale_extrap_xyz = clt_parameters.imp.scale_extrap_xyz;
// int avg_len = clt_parameters.imp.avg_len;
double
maximal_series_rms
=
0.0
;
double
maximal_series_rms
=
0.0
;
double
min_ref_str
=
clt_parameters
.
imp
.
min_ref_str
;
double
min_ref_str
=
clt_parameters
.
imp
.
min_ref_str
;
double
min_ref_frac
=
clt_parameters
.
imp
.
min_ref_frac
;
double
min_ref_frac
=
clt_parameters
.
imp
.
min_ref_frac
;
...
@@ -118,10 +113,8 @@ public class Interscene {
...
@@ -118,10 +113,8 @@ public class Interscene {
}
}
double
[]
lma_rms
=
new
double
[
2
];
double
[]
lma_rms
=
new
double
[
2
];
// double [] use_atr = null;
int
tilesX
=
quadCLTs
[
ref_index
].
getTileProcessor
().
getTilesX
();
int
tilesX
=
quadCLTs
[
ref_index
].
getTileProcessor
().
getTilesX
();
// int tilesY = quadCLTs[ref_index].getTileProcessor().getTilesY();
int
tile_size
=
quadCLTs
[
ref_index
].
getTileProcessor
().
getTileSize
();
int
tile_size
=
quadCLTs
[
ref_index
].
getTileProcessor
().
getTileSize
();
double
min_offset
=
0.0
;
// clt_parameters.imp.min_offset;
double
min_offset
=
0.0
;
// clt_parameters.imp.min_offset;
double
max_offset
=
clt_parameters
.
imp
.
max_rel_offset
*
tilesX
*
tile_size
;
double
max_offset
=
clt_parameters
.
imp
.
max_rel_offset
*
tilesX
*
tile_size
;
...
@@ -238,9 +231,6 @@ public class Interscene {
...
@@ -238,9 +231,6 @@ public class Interscene {
initial_pose
[
1
].
clone
()
initial_pose
[
1
].
clone
()
};
};
// Refine with LMA
// Refine with LMA
// boolean rot_to_transl = after_spiral && clt_parameters.ilp.ilma_translation_priority;
// double [] reg_weights = rot_to_transl? clt_parameters.ilp.ilma_regularization_weights0 : clt_parameters.ilp.ilma_regularization_weights;
double
[]
reg_weights
=
clt_parameters
.
ilp
.
ilma_regularization_weights
;
double
[]
reg_weights
=
clt_parameters
.
ilp
.
ilma_regularization_weights
;
min_max
[
1
]
=
max_offset
;
min_max
[
1
]
=
max_offset
;
//boost_zoom_short
//boost_zoom_short
...
@@ -308,7 +298,6 @@ public class Interscene {
...
@@ -308,7 +298,6 @@ public class Interscene {
// FAIL_REASON_ROLL
// FAIL_REASON_ROLL
handle_failure:
{
handle_failure:
{
if
(!
adjust_OK
)
{
if
(!
adjust_OK
)
{
// boolean OK = false;
System
.
out
.
println
(
"LMA failed at nscene = "
+
scene_index
+
". Reason = "
+
fail_reason
[
0
]+
System
.
out
.
println
(
"LMA failed at nscene = "
+
scene_index
+
". Reason = "
+
fail_reason
[
0
]+
" ("
+
getFailReason
(
fail_reason
[
0
])+
")"
);
" ("
+
getFailReason
(
fail_reason
[
0
])+
")"
);
if
((
fail_reason
[
0
]==
FAIL_REASON_MIN
)
||
((
fail_reason
[
0
]==
FAIL_REASON_LMA
)
&&
!
got_spiral
))
{
if
((
fail_reason
[
0
]==
FAIL_REASON_MIN
)
||
((
fail_reason
[
0
]==
FAIL_REASON_LMA
)
&&
!
got_spiral
))
{
...
...
src/main/java/com/elphel/imagej/tileprocessor/OpticalFlow.java
View file @
a095795c
...
@@ -4556,14 +4556,6 @@ public class OpticalFlow {
...
@@ -4556,14 +4556,6 @@ public class OpticalFlow {
final
boolean
updateStatus
,
final
boolean
updateStatus
,
final
int
debugLevel
)
throws
Exception
final
int
debugLevel
)
throws
Exception
{
{
/*
if (clt_parameters.imp.ims_use && (Eyesis_Correction.EVENT_LOGGER == null)) {
System.out.println("Preparing IMS data as it is needed but does not exist");
String imx_logs = Eyesis_Correction.CORRECTION_PARAMETERS.getImsSourceDirectory(); // sourceImsDirectory;
Eyesis_Correction.EVENT_LOGGER = new EventLogger (imx_logs);
}
EventLogger eventLogger = Eyesis_Correction.EVENT_LOGGER;
*/
int
earliest_scene
=
0
;
// increase on failure
int
earliest_scene
=
0
;
// increase on failure
boolean
build_ref_dsi
=
clt_parameters
.
imp
.
force_ref_dsi
;
boolean
build_ref_dsi
=
clt_parameters
.
imp
.
force_ref_dsi
;
...
...
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