Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
beamlinetools_1
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository 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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
HZB
Bluesky
beamlines_endstations
MySpot
source
beamlinetools_1
Commits
40fff6b8
Commit
40fff6b8
authored
1 year ago
by
Simone Vadilonga
Browse files
Options
Downloads
Patches
Plain Diff
comment kth
parent
93db84ea
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
beamlinetools/BEAMLINE_CONFIG/baseline.py
+1
-1
1 addition, 1 deletion
beamlinetools/BEAMLINE_CONFIG/baseline.py
beamlinetools/BEAMLINE_CONFIG/beamline.py
+11
-11
11 additions, 11 deletions
beamlinetools/BEAMLINE_CONFIG/beamline.py
with
12 additions
and
12 deletions
beamlinetools/BEAMLINE_CONFIG/baseline.py
+
1
−
1
View file @
40fff6b8
...
...
@@ -10,7 +10,7 @@ baseline = [det1]
# here the devices to be read during each scan,
# but not plotted unless explicitly set in the plan
silent_devices
=
[
kth01
,
kth00
]
silent_devices
=
[]
#
[kth01, kth00]
sd
=
SupplementalDataSilentDets
(
baseline
=
baseline
,
silent_devices
=
silent_devices
)
...
...
This diff is collapsed.
Click to expand it.
beamlinetools/BEAMLINE_CONFIG/beamline.py
+
11
−
11
View file @
40fff6b8
...
...
@@ -38,12 +38,12 @@ from beamlinetools.devices.mca_old import xMap
# next_injection.wait_for_connection()
# Keithleys
print
(
'
Connecting to Amperometers
'
)
ks
=
'
K64851MF102L:
'
kth00
=
keithley6485
(
ks
+
'
12
'
,
name
=
'
myspot_keithley0
'
,
read_attrs
=
[
'
readback
'
],
labels
=
{
'
detectors
'
})
kth00
.
wait_for_connection
()
kth01
=
keithley6485
(
ks
+
'
14
'
,
name
=
'
myspot_keithley1
'
,
read_attrs
=
[
'
readback
'
],
labels
=
{
'
detectors
'
})
kth01
.
wait_for_connection
()
#
print('Connecting to Amperometers')
#
ks = 'K64851MF102L:'
#
kth00 = keithley6485(ks + '12', name='myspot_keithley0', read_attrs=['readback'], labels={'detectors'})
#
kth00.wait_for_connection()
#
kth01 = keithley6485(ks + '14', name='myspot_keithley1', read_attrs=['readback'], labels={'detectors'})
#
kth01.wait_for_connection()
# motors
# print('Connecting to motors')
...
...
@@ -76,14 +76,14 @@ mca_old.wait_for_connection()
from
beamlinetools.devices.mca
import
MyEpicsMCA
mca
=
MyEpicsMCA
(
'
dxpXMAP:
'
,
name
=
"
mca
"
)
from
beamlinetools.devices.mca
import
DivideByArgs
#
from beamlinetools.devices.mca import DivideByArgs
div_det1
=
DivideByArgs
(
mca
.
ch1
.
roi0
.
count
,
[
mca
.
ch1
.
lifetime
],
name
=
"
div_det1
"
)
div_det2
=
DivideByArgs
(
mca
.
ch1
.
roi0
.
count
,
[
mca
.
ch1
.
lifetime
,
kth00
.
readback
],
name
=
"
div_det2
"
)
div_det2l
=
DivideByArgs
(
mca
.
ch1
.
roi0
.
count
,
[
mca
.
ch1
.
lifetime
,
kth00
.
readback
],
log
=
True
,
name
=
"
div_det2l
"
)
#
div_det1 = DivideByArgs(mca.ch1.roi0.count, [mca.ch1.lifetime], name="div_det1")
#
div_det2 = DivideByArgs(mca.ch1.roi0.count, [mca.ch1.lifetime, kth00.readback], name="div_det2")
#
div_det2l = DivideByArgs(mca.ch1.roi0.count, [mca.ch1.lifetime, kth00.readback], log=True, name="div_det2l")
div_mca
=
DivideByArgs
(
derived_from
=
mca
.
ch1
.
roi0
.
count
,
divisors
=
[
mca
.
ch1
.
lifetime
,
kth00
.
readback
],
log
=
True
,
name
=
"
div_det2l
"
)
#
div_mca = DivideByArgs(derived_from=mca.ch1.roi0.count, divisors=[mca.ch1.lifetime, kth00.readback], log=True, name="div_det2l")
from
beamlinetools.devices.eiger
import
MyDetector
...
...
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