Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
X
xsocs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
22
Issues
22
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Package Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
kmap
xsocs
Commits
cb346a35
Commit
cb346a35
authored
Feb 03, 2017
by
Damien Naudet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed bug with roi_indices comparison.
parent
eb0096fb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
kmap/process/peak_fit.py
kmap/process/peak_fit.py
+8
-6
No files found.
kmap/process/peak_fit.py
View file @
cb346a35
...
...
@@ -366,7 +366,7 @@ def _fit_process(th_idx, roiIndices=None):
q_dtype
=
dset
.
dtype
histo
=
qspace_h5
.
histo
if
roiIndices
:
if
roiIndices
is
not
None
:
q_x
=
q_x
[
xSlice
]
q_y
=
q_y
[
ySlice
]
q_z
=
q_z
[
zSlice
]
...
...
@@ -383,16 +383,18 @@ def _fit_process(th_idx, roiIndices=None):
while
True
:
# TODO : timeout
i_cube
=
idx_queue
.
get
()
next
=
idx_queue
.
get
()
if
i_cube
is
None
:
if
next
is
None
:
break
progress
[
th_idx
]
=
i_cube
i_fit
,
i_cube
=
next
progress
[
th_idx
]
=
i_fit
if
i_cube
%
100
==
0
:
print
(
'Processing cube {0}/{1}.'
.
format
(
i_
cube
,
result_shape
[
0
]))
'Processing cube {0}/{1}.'
.
format
(
i_
fit
,
result_shape
[
0
]))
t0
=
time
.
time
()
with
qspace_h5
.
qspace_dset_ctx
()
as
dset
:
...
...
@@ -401,7 +403,7 @@ def _fit_process(th_idx, roiIndices=None):
dest_sel
=
None
)
t_read
+=
time
.
time
()
-
t0
if
roiIndices
:
if
roiIndices
is
not
None
:
cube
=
read_cube
[
xSlice
,
ySlice
,
zSlice
]
else
:
cube
=
read_cube
...
...
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