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
0647ee91
Commit
0647ee91
authored
2 years ago
by
29iduser
Browse files
Options
Downloads
Patches
Plain Diff
fixed mono_status for change grating
parent
57c1ea97
No related branches found
No related tags found
1 merge request
!11
Main merge jmcchesn-main-patch branch with main
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
iexcode/instruments/VLS_PGM.py
+6
-5
6 additions, 5 deletions
iexcode/instruments/VLS_PGM.py
with
6 additions
and
5 deletions
iexcode/instruments/VLS_PGM.py
+
6
−
5
View file @
0647ee91
...
...
@@ -247,8 +247,9 @@ def mono_scan_pvs():
def
mono_status_get
():
"""
returns the status of the mirror (GRT * MIR)
1 = ready
2 = moving
1 = positioned/ready
0 = somebody moving
1 > somebody not happy
Previously Mono_Status
...
...
@@ -256,8 +257,8 @@ def mono_status_get():
pvs
=
_mono_pvs
()
mir_P_status
=
int
(
caget
(
pvs
[
'
mir_P_status
'
]))
grt_P_status
=
int
(
caget
(
pvs
[
'
grt_P_status
'
]))
mir_X_status
=
int
(
caget
(
pvs
[
'
mir_
P
_status
'
]))
grt_X_status
=
int
(
caget
(
pvs
[
'
grt_
P
_status
'
]))
mir_X_status
=
int
(
caget
(
pvs
[
'
mir_
X
_status
'
]))
grt_X_status
=
int
(
caget
(
pvs
[
'
grt_
X
_status
'
]))
mirror_status
=
mir_P_status
*
mir_X_status
grating_status
=
grt_P_status
*
grt_X_status
return
mirror_status
*
grating_status
...
...
@@ -317,7 +318,7 @@ def _mono_optic_change(optic,name, verbose=True):
caput
(
type_move
,
1
,
wait
=
True
,
timeout
=
18000
)
while
True
:
if
mono_status_get
()
>
1
:
if
mono_status_get
()
!=
1
:
time
.
sleep
(
5
)
else
:
break
...
...
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