Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
experiment-control
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
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
whuie2
experiment-control
Commits
4c962783
Commit
4c962783
authored
3 years ago
by
Yb Tweezer
Browse files
Options
Downloads
Patches
Plain Diff
switch to TimeBase driver
parent
631ea875
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
lib/__init__.py
+2
-0
2 additions, 0 deletions
lib/__init__.py
lib/system.py
+26
-4
26 additions, 4 deletions
lib/system.py
with
28 additions
and
4 deletions
lib/__init__.py
+
2
−
0
View file @
4c962783
...
...
@@ -53,6 +53,8 @@ from .system import (
AD5791_INIT
,
AD5791_CTRL
,
AD5791_DAC
,
MOT3_GREEN_AOM_FM
,
MOT3_GREEN_AOM_AM
,
)
from
.dataio
import
(
get_timestamp
,
...
...
This diff is collapsed.
Click to expand it.
lib/system.py
+
26
−
4
View file @
4c962783
...
...
@@ -27,6 +27,7 @@ DATADIRS = DataPaths(
green_fluo_green_mot
=
DATA_HOME
.
joinpath
(
"
green fluorescene and mot
"
),
narrow_cooling_opt
=
DATA_HOME
.
joinpath
(
"
cmot optimization
"
),
narrow_cooling_tweezer
=
DATA_HOME
.
joinpath
(
"
tweezer optimization
"
),
tweezer_atoms
=
DATA_HOME
.
joinpath
(
"
tweezer atoms
"
),
cmot_tof
=
DATA_HOME
.
joinpath
(
"
cmot tof
"
),
freespace_green
=
DATA_HOME
.
joinpath
(
"
freespace green resonance
"
),
)
...
...
@@ -74,9 +75,9 @@ CONNECTIONS = ConnectionLayout(
mot3_blue_sh
=
Digital
(
1
,
7
,
1
),
mot2_blue_aom
=
Digital
(
0
,
1
,
1
),
mot3_blue_aom
=
Digital
(
0
,
7
,
1
),
mot3_green_aom
=
Digital
(
0
,
9
,
0
),
mot3_green_aom_am
=
Analog
(
7
,
0.
98
),
mot3_green_aom_fm
=
Analog
(
8
,
-
1
.0
4
),
mot3_green_aom
=
Digital
(
0
,
9
,
1
),
mot3_green_aom_am
=
Analog
(
7
,
+
0.
40
),
mot3_green_aom_fm
=
Analog
(
8
,
-
5
.0
0
),
mot3_green_aom_trig
=
Digital
(
1
,
13
,
0
),
mot3_green_sh
=
Digital
(
1
,
11
,
0
),
push_aom
=
Digital
(
0
,
3
,
1
),
...
...
@@ -94,6 +95,7 @@ CONNECTIONS = ConnectionLayout(
andor_sh
=
Digital
(
3
,
6
,
0
),
scope_trig
=
Digital
(
3
,
2
,
0
),
dummy
=
Digital
(
3
,
31
,
0
),
test_sh
=
Digital
(
0
,
24
,
1
),
)
MAIN
=
Computer
(
...
...
@@ -118,5 +120,25 @@ AD5791_CTRL = 0b0010
AD5791_INIT
=
0b00000000000000010010
AD5791_DAC
=
0b0001
MOT3_GREEN_AOM_AM
=
lambda
p
:
(
p
-
14.5
)
/
14.51
# 29.0 nominal; -68 offset on controller
# 92.0 nominal; depth = 3.2768 MHz (n = 10)
def
MOT3_GREEN_AOM_FM
(
f
:
float
)
->
float
:
if
f
<
88.8
or
f
>
95.4
:
raise
Exception
(
"
MOT3_GREEN_AOM_FM: frequency out of range
"
)
a
=
[
-
20410.0125
,
+
656.931397
,
-
7.07415392
,
+
0.02548931
,
]
return
sum
(
a
[
k
]
*
f
**
k
for
k
in
range
(
4
))
# 29.0 nominal; -60 offset on driver
def
MOT3_GREEN_AOM_AM
(
p
:
float
)
->
float
:
if
p
<
-
25.0
or
p
>
29.5
:
raise
Exception
(
"
MOT3_GREEN_AOM_AM: power out of range
"
)
A
=
+
421.384083
P0
=
+
45.7474511
B
=
-
1.10711219
return
A
/
(
p
-
P0
)
**
2
+
B
RAMAN_GREEN_AOM_AM
=
lambda
p
:
(
p
-
15.0
)
/
15.01
# 29.0 nominal; -73 offset on controller
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