Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
iexcode
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
29id
iexcode
Commits
c8519496
Commit
c8519496
authored
2 years ago
by
29iduser
Browse files
Options
Downloads
Patches
Plain Diff
debug
parent
52a840c2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
Loading
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
iexcode/instruments/resolution.py
+5
-2
5 additions, 2 deletions
iexcode/instruments/resolution.py
iexcode/instruments/xrays.py
+2
-1
2 additions, 1 deletion
iexcode/instruments/xrays.py
with
7 additions
and
3 deletions
iexcode/instruments/resolution.py
+
5
−
2
View file @
c8519496
from
iexcode.instruments.IEX_BL_config
import
BLconfig_endstation_name
import
numpy
as
np
from
epics
import
caget
...
...
@@ -8,6 +9,7 @@ from iexcode.instruments.xrays import getE, slit_get
from
iexcode.instruments.VLS_PGM
import
mono_grating_get
from
iexcode.instruments.electron_analyzer
import
EA
,
resolution_EA
,
SES_slit_get
from
iexcode.instruments.ARPES
import
ARPES_extra_pvs
from
iexcode.instruments.scanRecord
import
*
#############################################################################################################
############################## Resolution ##############################
#############################################################################################################
...
...
@@ -19,9 +21,10 @@ def resolution():
"""
grt
=
mono_grating_get
()
hv_eV
=
getE
()
slit_size
=
take_closest_value
([
10
,
20
,
50
,
100
,
200
],
round
(
slit_get
(),
0
))
slit_size
=
take_closest_value
([
10
,
20
,
50
,
100
,
200
],
round
(
slit_get
()
[
0
][
0
]
,
0
))
if
iex
.
BL
.
endstation_name
==
"
ARPES
"
:
#if iex.BL.endstation_name == "ARPES":
if
BLconfig_endstation_name
==
'
ARPES
'
:
slit_SES
=
SES_slit_get
()
PE
=
int
(
EA
.
PassEnergy
)
Tsample
=
caget
(
ARPES_extra_pvs
[
'
TA
'
])
...
...
This diff is collapsed.
Click to expand it.
iexcode/instruments/xrays.py
+
2
−
1
View file @
c8519496
...
...
@@ -566,7 +566,8 @@ def slit_get(verbose=True):
ARPES = 0 < x < 300 um
Kappa = 0 < x < 1000 um
"""
branch
=
iex
.
BL
.
branch
#branch = iex.BL.branch
branch
=
BLconfig_branch
()
slit_size
,
slit_center
=
exit_slit_get
(
branch
,
verbose
=
verbose
)
return
slit_size
,
slit_center
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment