Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
total_control_app
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Martin Drechsler
total_control_app
Commits
da12b4f6
Commit
da12b4f6
authored
May 03, 2019
by
Martin Drechsler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some minor updates
parent
4b177e64
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
scanFunctions.py
resources/scanFunctions.py
+1
-1
zylaCameraWorker.py
zylaCameraWorker.py
+5
-3
No files found.
resources/scanFunctions.py
View file @
da12b4f6
...
...
@@ -47,7 +47,7 @@ def create_measurement_array(start, stop, steps, back_and_forth=False):
"""
Simply creates the array of a measurement.
"""
pass
return
np
.
linspace
(
start
,
stop
,
steps
)
def
yield_array
(
arr
):
...
...
zylaCameraWorker.py
View file @
da12b4f6
...
...
@@ -130,11 +130,13 @@ class CameraWorker(QtCore.QObject):
directory
=
measure_params
[
'directory'
]
scan_array
=
create_measurement_array
(
start
,
end
,
step_num
)
storage
=
Storage
(
directory
)
self
.
cam
.
TriggerMode
.
setString
(
'Software'
)
def
get_scan_signal
():
pass
for
value
in
scan_array
:
signal_to_scan
.
AO
.
set_out
(
value
)
def
get_scan_signal
(
self
,
ao_name
):
return
[
ao
for
ao
in
anal_control_signal
.
_registry
if
ao
.
name
==
ao_name
][
0
]
QtCore
.
QTimer
.
singleShot
(
5000
,
self
.
measurementEndingSignal
.
emit
)
print
(
'Ending measurement'
)
...
...
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