Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
FofbTool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container 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
Insights
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
DG
FOFB
FofbTool
Commits
f45f1a0a
Commit
f45f1a0a
authored
7 months ago
by
BRONES Romain
Browse files
Options
Downloads
Patches
Plain Diff
Fix configuration of centralnode corrector
parent
321c540f
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
DG_PY_FOFBTool/DG_PY_FOFBTool.py
+38
-0
38 additions, 0 deletions
DG_PY_FOFBTool/DG_PY_FOFBTool.py
DG_PY_FOFBTool/DG_PY_FOFBTool.xmi
+16
-0
16 additions, 0 deletions
DG_PY_FOFBTool/DG_PY_FOFBTool.xmi
with
54 additions
and
0 deletions
DG_PY_FOFBTool/DG_PY_FOFBTool.py
+
38
−
0
View file @
f45f1a0a
...
...
@@ -27,6 +27,7 @@ import FofbTool.Operation
import
FofbTool.Configuration
import
logging
import
multiprocessing
import
numpy
as
np
#----- PROTECTED REGION END -----# // DG_PY_FOFBTool.additionnal_import
...
...
@@ -66,6 +67,14 @@ class DG_PY_FOFBTool(Device):
- Type:
'
DevString
'
tangopath_centralnode
- Type:
'
DevString
'
k1_x
- Type:
'
DevVarLongArray
'
k2_x
- Type:
'
DevVarLongArray
'
k1_y
- Type:
'
DevVarLongArray
'
k2_y
- Type:
'
DevVarLongArray
'
"""
# PROTECTED REGION ID(DG_PY_FOFBTool.class_variable) ENABLED START #
...
...
@@ -139,6 +148,26 @@ class DG_PY_FOFBTool(Device):
mandatory
=
True
)
k1_x
=
device_property
(
dtype
=
'
DevVarLongArray
'
,
mandatory
=
True
)
k2_x
=
device_property
(
dtype
=
'
DevVarLongArray
'
,
mandatory
=
True
)
k1_y
=
device_property
(
dtype
=
'
DevVarLongArray
'
,
mandatory
=
True
)
k2_y
=
device_property
(
dtype
=
'
DevVarLongArray
'
,
mandatory
=
True
)
# ----------
# Attributes
# ----------
...
...
@@ -262,6 +291,15 @@ class DG_PY_FOFBTool(Device):
self
.
error_stream
(
"
Failed to configure CCN on {}
"
.
format
(
cn
))
s
=
FofbTool
.
Configuration
.
centralnode_configure_ccn
(
self
.
tangopath_centralnode
,
self
.
ccn_nbpm
,
self
.
ccn_npsc
)
success
=
success
and
s
if
not
s
:
self
.
error_stream
(
"
Failed to configure CCN on {}
"
.
format
(
self
.
tangopath_centralnode
))
numbpm
=
int
(
np
.
sum
(
self
.
ccn_nbpm
))
self
.
debug_stream
(
"
Summed {} bpm for corrector
"
.
format
(
numbpm
))
FofbTool
.
Configuration
.
centralnode_configure_corr
(
self
.
tangopath_centralnode
,
numbpm
,
[
int
(
p
)
for
p
in
self
.
corr_pscid
.
split
()],
self
.
k1_x
,
self
.
k1_y
,
self
.
k2_x
,
self
.
k2_y
)
if
success
:
self
.
d_status
[
"
configure
"
]
=
"
Configure: success
"
...
...
This diff is collapsed.
Click to expand it.
DG_PY_FOFBTool/DG_PY_FOFBTool.xmi
+
16
−
0
View file @
f45f1a0a
...
...
@@ -45,6 +45,22 @@
<type
xsi:type=
"pogoDsl:StringType"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
</deviceProperties>
<deviceProperties
name=
"k1_x"
mandatory=
"true"
description=
""
>
<type
xsi:type=
"pogoDsl:IntVectorType"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
</deviceProperties>
<deviceProperties
name=
"k2_x"
mandatory=
"true"
description=
""
>
<type
xsi:type=
"pogoDsl:IntVectorType"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
</deviceProperties>
<deviceProperties
name=
"k1_y"
mandatory=
"true"
description=
""
>
<type
xsi:type=
"pogoDsl:IntVectorType"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
</deviceProperties>
<deviceProperties
name=
"k2_y"
mandatory=
"true"
description=
""
>
<type
xsi:type=
"pogoDsl:IntVectorType"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
</deviceProperties>
<commands
name=
"State"
description=
"This command gets the device state (stored in its device_state data member) and returns it to the caller."
execMethod=
"dev_state"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
>
<argin
description=
"none"
>
<type
xsi:type=
"pogoDsl:VoidType"
/>
...
...
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