Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
bliss
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
338
Issues
338
List
Boards
Labels
Milestones
JIRA
JIRA
Merge Requests
53
Merge Requests
53
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Bliss
bliss
Commits
3c625a13
Commit
3c625a13
authored
Feb 19, 2019
by
bliss administrator
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[wip] reformated files
parent
23f50547
Pipeline
#8626
passed with stages
in 24 minutes and 20 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
6 deletions
+10
-6
bliss/controllers/motors/pi_hexa.py
bliss/controllers/motors/pi_hexa.py
+6
-2
bliss/scanning/acquisition/counter.py
bliss/scanning/acquisition/counter.py
+2
-2
bliss/scanning/acquisition/lima.py
bliss/scanning/acquisition/lima.py
+2
-2
No files found.
bliss/controllers/motors/pi_hexa.py
View file @
3c625a13
...
...
@@ -52,7 +52,9 @@ def _atomic_communication(fn):
class
PI_HEXA
(
Controller
):
COMMAND
=
enum
.
Enum
(
"PI_HEXA.COMMAND"
,
"POSITIONS MOVE_STATE MOVE_SEP INIT STOP_ERROR"
)
COMMAND
=
enum
.
Enum
(
"PI_HEXA.COMMAND"
,
"POSITIONS MOVE_STATE MOVE_SEP INIT STOP_ERROR"
)
def
__init__
(
self
,
*
args
,
**
kwargs
):
Controller
.
__init__
(
self
,
*
args
,
**
kwargs
)
...
...
@@ -216,7 +218,9 @@ class PI_HEXA(Controller):
def
_check_error_and_raise
(
self
,
ignore_stop
=
False
,
**
kwargs
):
err
=
int
(
self
.
command
(
"ERR?"
,
**
kwargs
))
if
err
>
0
:
if
ignore_stop
and
err
==
self
.
_commands
[
self
.
COMMAND
.
STOP_ERROR
]:
# stopped by user
if
(
ignore_stop
and
err
==
self
.
_commands
[
self
.
COMMAND
.
STOP_ERROR
]
):
# stopped by user
return
human_error
=
get_error_str
(
err
)
errors
=
[
self
.
name
,
err
,
human_error
]
...
...
bliss/scanning/acquisition/counter.py
View file @
3c625a13
...
...
@@ -240,8 +240,8 @@ class IntegratingCounterAcquisitionDevice(BaseCounterAcquisitionDevice):
reader
,
count_time
,
npoints
=
None
,
prepare_once
=
keys
.
pop
(
'prepare_once'
,
None
),
start_once
=
keys
.
pop
(
'start_once'
,
None
),
prepare_once
=
keys
.
pop
(
"prepare_once"
,
None
),
start_once
=
keys
.
pop
(
"start_once"
,
None
),
**
keys
)
for
cnt
in
counters
:
...
...
bliss/scanning/acquisition/lima.py
View file @
3c625a13
...
...
@@ -191,7 +191,7 @@ class LimaAcquisitionMaster(AcquisitionMaster):
return
True
def
wait_ready
(
self
):
if
self
.
device
.
camera_model
.
find
(
'Eiger'
)
>
-
1
:
if
self
.
device
.
camera_model
.
find
(
"Eiger"
)
>
-
1
:
return
True
if
self
.
_reading_task
:
self
.
_ready_event
.
wait
()
...
...
@@ -203,7 +203,7 @@ class LimaAcquisitionMaster(AcquisitionMaster):
return
with
self
.
__lock
:
self
.
device
.
startAcq
()
self
.
device
.
startAcq
()
acq_trigger_mode
=
self
.
parameters
.
get
(
"acq_trigger_mode"
,
"INTERNAL_TRIGGER"
...
...
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