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
07ab125e
Commit
07ab125e
authored
Jul 09, 2014
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more on bypassing missing kernels
parent
d457b908
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
12 deletions
+16
-12
Aberration_Calibration.java
src/main/java/Aberration_Calibration.java
+15
-11
MatchSimulatedPattern.java
src/main/java/MatchSimulatedPattern.java
+1
-1
No files found.
src/main/java/Aberration_Calibration.java
View file @
07ab125e
...
...
@@ -10710,9 +10710,9 @@ if (MORE_BUTTONS) {
*/
// tanRad[0]/=(focusMeasurementParameters.subdiv/2); // to sesnor pixels
// tanRad[1]/=(focusMeasurementParameters.subdiv/2);
double
[][]
quadCoeff
=
matchSimulatedPattern
.
approximatePSFQuadratic
(
double
[][]
quadCoeff
=
null
;
try
{
quadCoeff
=
matchSimulatedPattern
.
approximatePSFQuadratic
(
psf
[
i
][
j
][
color
],
// PSF function, square array, nominally positive
focusMeasurementParameters
.
psf_cutoffEnergy
,
// fraction of energy in the pixels to be used
focusMeasurementParameters
.
psf_cutoffLevel
,
// minimal level as a fraction of maximal
...
...
@@ -10721,6 +10721,10 @@ if (MORE_BUTTONS) {
0.1
,
//maskCutOff,
debugLevel
-
2
,
// debug level
i
+
":"
+
j
+
"["
+
color
+
"]"
);
// String title) { // prefix used for debug images
}
catch
(
Exception
e
)
{
System
.
out
.
println
(
"Failed to get approximatePSFQuadratic(...) for i="
+
i
+
", j="
+
j
);
continue
;
}
/*
* f(x,y)=A*x^2+B*y^2+C*x*y+D*x+E*y+F
*
...
...
src/main/java/MatchSimulatedPattern.java
View file @
07ab125e
...
...
@@ -5433,7 +5433,7 @@ java.lang.ArrayIndexOutOfBoundsException: -3566
if
(
maxValue
<=
0.0
){
String
msg
=
"psf array does not contain any positive values"
;
// IJ.showMessage("Error",msg);
System
.
out
.
println
(
"Error"
+
msg
);
System
.
out
.
println
(
"Error
"
+
msg
);
throw
new
IllegalArgumentException
(
msg
);
}
ix
=
Index
%
size
;
...
...
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