Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BCU-Vercors
ID26
id26
Commits
218ac1a7
Commit
218ac1a7
authored
Nov 03, 2021
by
bliss administrator
Browse files
fscan remove unused import and use of scripts/energy.py
parent
e4f67a45
Changes
1
Hide whitespace changes
Inline
Side-by-side
id26/scripts/fscan.py
View file @
218ac1a7
...
...
@@ -9,24 +9,16 @@ from bliss.common.logtools import (
log_error
,
log_warning
,
log_debug
,
log_info
,
log_exception
)
from
bliss.scanning.scan
import
Scan
,
ScanState
,
DataWatchCallback
from
bliss.scanning.scan_info
import
ScanInfo
from
id26.scripts.energy
import
(
stepstoenergy
,
angletoenergy
,
stepstoangle
,
energytosteps
,
energytoangle
,
)
FSCAN
=
setup_globals
.
fastscan
FSCAN_PAR
=
FSCAN
.
parameters
stepstoenergy
=
FSCAN
.
energy
.
controller
.
mono
.
steps2energy
energytosteps
=
FSCAN
.
energy
.
controller
.
mono
.
energy2steps
def
_retry_fscan_once_on_exception
(
func
):
@
functools
.
wraps
(
func
)
def
wrapper
(
*
a
,
**
b
):
...
...
@@ -210,7 +202,6 @@ def fscan_check_traj(e0):
ene
=
stepstoenergy
(
energytosteps
(
ene
)
+
mr
)
yield
ene
#I AM HERE
class
FScanDisplay
(
DataWatchCallback
):
...
...
Write
Preview
Supports
Markdown
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