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
269fb54f
Commit
269fb54f
authored
Jun 27, 2019
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
committing w/o breaking - 15
parent
ced0865e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
6 deletions
+18
-6
EyesisAberrations.java
...java/com/elphel/imagej/calibration/EyesisAberrations.java
+18
-6
No files found.
src/main/java/com/elphel/imagej/calibration/EyesisAberrations.java
View file @
269fb54f
...
...
@@ -2868,17 +2868,29 @@ public class EyesisAberrations {
y0
*
subpixel
/
2
,
tile_size
*
subpixel
/
2
,
tile_size
*
subpixel
/
2
);
// getting here
simul_pixels
=
new
double
[
6
][];
for
(
i
=
0
;
i
<
simul_pixels
.
length
;
i
++)
{
if
(
colorComponents
.
colorsToCorrect
[
i
])
simul_pixels
[
i
]=
simulationPattern
.
extractBayerSim
(
if
(
is_mono
)
{
simul_pixels
=
new
double
[
1
][];
simul_pixels
[
0
]=
simulationPattern
.
extractBayerSim
(
simArray
,
// [0] - regular pixels, [1] - shifted by 1/2 diagonally, for checker greens
imgWidth
*
subpixel
/
2
,
PSFCellSim
,
subpixel
,
// 4
i
);
else
simul_pixels
[
i
]=
null
;
-
1
);
//New : -1 - extract mono TODO: see if 1/2pix shift is needed
}
else
{
simul_pixels
=
new
double
[
6
][];
for
(
i
=
0
;
i
<
simul_pixels
.
length
;
i
++)
{
if
(
colorComponents
.
colorsToCorrect
[
i
])
simul_pixels
[
i
]=
simulationPattern
.
extractBayerSim
(
simArray
,
// [0] - regular pixels, [1] - shifted by 1/2 diagonally, for checker greens
imgWidth
*
subpixel
/
2
,
PSFCellSim
,
subpixel
,
// 4
i
);
else
simul_pixels
[
i
]=
null
;
}
}
int
index
=
matchSimulatedPattern
.
getUVIndex
((
PSFCell
.
y
+
PSFCell
.
height
/
2
)*
imgWidth
+(
PSFCell
.
x
+
PSFCell
.
width
/
2
));
//System.out.println("PSFCell.y="+PSFCell.y+" PSFCell.height="+PSFCell.height+" imgWidth="+imgWidth+" PSFCell.x="+PSFCell.x+" PSFCell.width="+PSFCell.width+" matchSimulatedPattern.UV_INDEX.length="+matchSimulatedPattern.UV_INDEX.length);
int
index
=
matchSimulatedPattern
.
getUVIndex
(
(
PSFCell
.
y
+
PSFCell
.
height
/
2
)*
imgWidth
+(
PSFCell
.
x
+
PSFCell
.
width
/
2
));
if
(
index
<
0
)
{
System
.
out
.
println
(
"Error, No UV pattern @ x="
+(
PSFCell
.
x
+
PSFCell
.
width
/
2
)+
", y="
+(
PSFCell
.
y
+
PSFCell
.
height
/
2
));
...
...
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