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
9fe0872c
Commit
9fe0872c
authored
Jun 20, 2021
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
weighths format - added sensor number
parent
f35dc2de
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
Aberration_Calibration.java
...com/elphel/imagej/calibration/Aberration_Calibration.java
+1
-1
EyesisAberrations.java
...java/com/elphel/imagej/calibration/EyesisAberrations.java
+2
-2
MatchSimulatedPattern.java
.../com/elphel/imagej/calibration/MatchSimulatedPattern.java
+1
-1
No files found.
src/main/java/com/elphel/imagej/calibration/Aberration_Calibration.java
View file @
9fe0872c
...
@@ -1711,7 +1711,7 @@ if (MORE_BUTTONS) {
...
@@ -1711,7 +1711,7 @@ if (MORE_BUTTONS) {
}
}
// SDFA_INSTANCE.showArrays(weights, kWidth, kHeight, true, "weights");
// SDFA_INSTANCE.showArrays(weights, kWidth, kHeight, true, "weights");
}
}
SDFA_INSTANCE.showArrays(weights, kWidth, kHeight, true, "weights");
SDFA_INSTANCE.showArrays(weights, kWidth, kHeight, true, "weights
-all
");
// double [][] weights=new double[nFiles+1][kLength];
// double [][] weights=new double[nFiles+1][kLength];
for (int i=0;i<kLength;i++) weights[0][i]=0.0;
for (int i=0;i<kLength;i++) weights[0][i]=0.0;
PSF_KERNEL_MAP=new double [kHeight][kWidth][nChn][];
PSF_KERNEL_MAP=new double [kHeight][kWidth][nChn][];
src/main/java/com/elphel/imagej/calibration/EyesisAberrations.java
View file @
9fe0872c
...
@@ -1598,7 +1598,7 @@ public class EyesisAberrations {
...
@@ -1598,7 +1598,7 @@ public class EyesisAberrations {
weights
[
0
][
index
]+=
weights
[
nFile
+
1
][
index
];
weights
[
0
][
index
]+=
weights
[
nFile
+
1
][
index
];
}
}
}
}
if
(
thisDebugLevel
>
1
)
sdfa_instance
.
showArrays
(
weights
,
kWidth
,
kHeight
,
true
,
"weights
0"
);
if
(
thisDebugLevel
>
1
)
sdfa_instance
.
showArrays
(
weights
,
kWidth
,
kHeight
,
true
,
"weights
_"
+
String
.
format
(
"%02d"
,
sensor_channel
)
);
// remove any border ones if non-border is present in the same cell
// remove any border ones if non-border is present in the same cell
double
[][]
weightsMasked
=
new
double
[
weights
.
length
][];
double
[][]
weightsMasked
=
new
double
[
weights
.
length
][];
...
@@ -1821,7 +1821,7 @@ public class EyesisAberrations {
...
@@ -1821,7 +1821,7 @@ public class EyesisAberrations {
}
}
}
}
if
(
multiFilePSF
.
showWeights
)
sdfa_instance
.
showArrays
(
weights
,
kWidth
,
kHeight
,
true
,
"weights-"
+
sensor_channel
);
if
(
multiFilePSF
.
showWeights
)
sdfa_instance
.
showArrays
(
weights
,
kWidth
,
kHeight
,
true
,
"weights-"
+
String
.
format
(
"%02d"
,
sensor_channel
)
);
// double [][] weights=new double[nFiles+1][kLength];
// double [][] weights=new double[nFiles+1][kLength];
for
(
int
i
=
0
;
i
<
kLength
;
i
++)
weights
[
0
][
i
]=
0.0
;
for
(
int
i
=
0
;
i
<
kLength
;
i
++)
weights
[
0
][
i
]=
0.0
;
psfKernelMap
=
new
double
[
kHeight
][
kWidth
][
nChn
][];
psfKernelMap
=
new
double
[
kHeight
][
kWidth
][
nChn
][];
...
...
src/main/java/com/elphel/imagej/calibration/MatchSimulatedPattern.java
View file @
9fe0872c
...
@@ -8399,7 +8399,7 @@ public class MatchSimulatedPattern {
...
@@ -8399,7 +8399,7 @@ public class MatchSimulatedPattern {
}
}
if
(
global_debug_level
>
0
)
{
if
(
global_debug_level
>
0
)
{
System
.
out
.
println
(
System
.
out
.
println
(
(((
iGridMatchCoeff
[
0
][
2
]
+
iGridMatchCoeff
[
1
][
2
])
&
1
)
==
0
)
?
"EVEN shift"
:
"ODD shift"
);
(((
iGridMatchCoeff
[
0
][
2
]
+
iGridMatchCoeff
[
1
][
2
])
&
1
)
==
0
)
?
"EVEN shift"
:
"ODD shift"
);
// here
}
}
}
else
{
}
else
{
if
(
global_debug_level
>
0
)
if
(
global_debug_level
>
0
)
...
...
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