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
7ac2edeb
Commit
7ac2edeb
authored
Jul 31, 2022
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Corrected saving source of the photometric calibration
parent
3abbfc39
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
4 deletions
+16
-4
OpticalFlow.java
...ain/java/com/elphel/imagej/tileprocessor/OpticalFlow.java
+2
-0
QuadCLT.java
src/main/java/com/elphel/imagej/tileprocessor/QuadCLT.java
+3
-0
QuadCLTCPU.java
...main/java/com/elphel/imagej/tileprocessor/QuadCLTCPU.java
+11
-4
No files found.
src/main/java/com/elphel/imagej/tileprocessor/OpticalFlow.java
View file @
7ac2edeb
...
...
@@ -4639,6 +4639,8 @@ public class OpticalFlow {
quadCLT_main
.
setLwirOffsets
(
quadCLTs
[
ref_index
].
getLwirOffsets
());
quadCLT_main
.
setLwirScales
(
quadCLTs
[
ref_index
].
getLwirScales
());
quadCLT_main
.
setLwirScales2
(
quadCLTs
[
ref_index
].
getLwirScales2
());
quadCLT_main
.
setPhotometricScene
(
quadCLTs
[
ref_index
].
getPhotometricScene
());
// Re-read reference and other scenes using new offsets
quadCLTs
[
ref_index
].
saveQuadClt
();
// to re-load new set of Bayer images to the GPU (do nothing for CPU) and Geometry
quadCLTs
[
ref_index
]
=
(
QuadCLT
)
quadCLT_main
.
spawnQuadCLT
(
// restores dsi from "DSI-MAIN"
...
...
src/main/java/com/elphel/imagej/tileprocessor/QuadCLT.java
View file @
7ac2edeb
...
...
@@ -2443,8 +2443,10 @@ public class QuadCLT extends QuadCLTCPU {
ref_scene
.
setLwirOffsets
(
offsets_new
);
ref_scene
.
setLwirScales
(
scales_new
);
ref_scene
.
setLwirScales2
(
scales2_new
);
ref_scene
.
setPhotometricScene
();
// use ref_scene name
return
true
;
}
public
static
boolean
calibratePhotometric2
(
// quadratic
CLTParameters
clt_parameters
,
final
QuadCLT
ref_scene
,
// now - may be null - for testing if scene is rotated ref
...
...
@@ -2653,6 +2655,7 @@ public class QuadCLT extends QuadCLTCPU {
ref_scene
.
setLwirOffsets
(
offs_new
);
ref_scene
.
setLwirScales
(
scales_new
);
ref_scene
.
setLwirScales2
(
scales2_new
);
ref_scene
.
setPhotometricScene
();
// use ref_scene name
return
true
;
}
...
...
src/main/java/com/elphel/imagej/tileprocessor/QuadCLTCPU.java
View file @
7ac2edeb
...
...
@@ -1810,20 +1810,27 @@ public class QuadCLTCPU {
}
else
{
lwir_offset
=
Double
.
NaN
;
}
this
.
photometric_scene
=
getImageName
();
//
this.photometric_scene = getImageName();
}
public
String
getPhotometricScene
()
{
return
this
.
photometric_scene
;
}
public
void
setPhotometricScene
(
String
scene_name
)
{
this
.
photometric_scene
=
scene_name
;
}
public
void
setPhotometricScene
()
{
setPhotometricScene
(
getImageName
());
}
public
void
setLwirScales
(
double
[]
scales
)
{
lwir_scales
=
scales
;
// will need to update properties!
this
.
photometric_scene
=
getImageName
();
//
this.photometric_scene = getImageName();
}
public
void
setLwirScales2
(
double
[]
scales2
)
{
lwir_scales2
=
scales2
;
// will need to update properties!
this
.
photometric_scene
=
getImageName
();
//
this.photometric_scene = getImageName();
}
public
double
[]
getColdHot
()
{
// USED in lwir
...
...
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