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
31555875
Commit
31555875
authored
Sep 07, 2021
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed races in DttRad2 initialization in Correlation2d
parent
b5dc98c9
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
47 additions
and
258 deletions
+47
-258
Corr2dLMA.java
src/main/java/com/elphel/imagej/tileprocessor/Corr2dLMA.java
+1
-1
Correlation2d.java
...n/java/com/elphel/imagej/tileprocessor/Correlation2d.java
+2
-0
DttRad2.java
src/main/java/com/elphel/imagej/tileprocessor/DttRad2.java
+4
-0
ImageDttCPU.java
...ain/java/com/elphel/imagej/tileprocessor/ImageDttCPU.java
+40
-257
No files found.
src/main/java/com/elphel/imagej/tileprocessor/Corr2dLMA.java
View file @
31555875
...
@@ -1666,7 +1666,7 @@ public class Corr2dLMA {
...
@@ -1666,7 +1666,7 @@ public class Corr2dLMA {
if
(
Double
.
isNaN
(
maxmin_amp
[
tile
][
0
]))
{
if
(
Double
.
isNaN
(
maxmin_amp
[
tile
][
0
]))
{
continue
;
continue
;
}
}
double
avg
=
0.5
*(
maxmin_amp
[
tile
][
0
]+
maxmin_amp
[
tile
][
1
]);
double
avg
=
0.5
0
*(
maxmin_amp
[
tile
][
0
]+
maxmin_amp
[
tile
][
1
]);
double
rrms
=
rms
[
tile
]/
avg
;
double
rrms
=
rms
[
tile
]/
avg
;
if
(((
lma_max_rel_rms
>
0.0
)
&&
(
rrms
>
lma_max_rel_rms
))
||
if
(((
lma_max_rel_rms
>
0.0
)
&&
(
rrms
>
lma_max_rel_rms
))
||
(
Math
.
max
(
abc
[
tile
][
0
],
abc
[
tile
][
2
])
<
lma_min_max_ac
)
(
Math
.
max
(
abc
[
tile
][
0
],
abc
[
tile
][
2
])
<
lma_min_max_ac
)
...
...
src/main/java/com/elphel/imagej/tileprocessor/Correlation2d.java
View file @
31555875
...
@@ -753,6 +753,7 @@ public class Correlation2d {
...
@@ -753,6 +753,7 @@ public class Correlation2d {
this
.
numSensors
=
numSensors
;
this
.
numSensors
=
numSensors
;
this
.
monochrome
=
monochrome
;
this
.
monochrome
=
monochrome
;
this
.
dtt
=
new
DttRad2
(
transform_size
);
this
.
dtt
=
new
DttRad2
(
transform_size
);
this
.
dtt
.
setup_CSIIe
(
transform_size
);
// common for multiple threads, initializing on demand fails
this
.
transform_size
=
transform_size
;
this
.
transform_size
=
transform_size
;
this
.
transform_len
=
transform_size
*
transform_size
;
this
.
transform_len
=
transform_size
*
transform_size
;
this
.
corr_size
=
transform_size
*
2
-
1
;
this
.
corr_size
=
transform_size
*
2
-
1
;
...
@@ -799,6 +800,7 @@ public class Correlation2d {
...
@@ -799,6 +800,7 @@ public class Correlation2d {
this
.
numSensors
=
numSensors
;
this
.
numSensors
=
numSensors
;
this
.
monochrome
=
monochrome
;
this
.
monochrome
=
monochrome
;
this
.
dtt
=
new
DttRad2
(
transform_size
);
this
.
dtt
=
new
DttRad2
(
transform_size
);
this
.
dtt
.
setup_CSIIe
(
transform_size
);
// common for multiple threads, initializing on demand fails
this
.
transform_size
=
transform_size
;
this
.
transform_size
=
transform_size
;
this
.
transform_len
=
transform_size
*
transform_size
;
this
.
transform_len
=
transform_size
*
transform_size
;
this
.
corr_size
=
transform_size
*
2
-
1
;
this
.
corr_size
=
transform_size
*
2
-
1
;
...
...
src/main/java/com/elphel/imagej/tileprocessor/DttRad2.java
View file @
31555875
...
@@ -1135,6 +1135,10 @@ public class DttRad2 {
...
@@ -1135,6 +1135,10 @@ public class DttRad2 {
}
}
}
}
public
void
setup_CSIIe
(
int
maxN
){
setup_CIIe
(
maxN
);
setup_SIIe
(
maxN
);
}
private
void
setup_SIIe
(
int
maxN
){
private
void
setup_SIIe
(
int
maxN
){
if
(
maxN
>
N
)
setup_arrays
(
maxN
);
if
(
maxN
>
N
)
setup_arrays
(
maxN
);
int
l
=
ilog2
(
N
);
int
l
=
ilog2
(
N
);
...
...
src/main/java/com/elphel/imagej/tileprocessor/ImageDttCPU.java
View file @
31555875
This diff is collapsed.
Click to expand it.
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