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
5f858cc9
Commit
5f858cc9
authored
7 months ago
by
BRONES Romain
Browse files
Options
Downloads
Patches
Plain Diff
Fixes
* Test on full restart and sync
parent
336ea07b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
FofbTool/Configuration.py
+2
-2
2 additions, 2 deletions
FofbTool/Configuration.py
FofbTool/Operation.py
+3
-1
3 additions, 1 deletion
FofbTool/Operation.py
FofbTool/Utils.py
+4
-4
4 additions, 4 deletions
FofbTool/Utils.py
scripts/FofbTool
+1
-1
1 addition, 1 deletion
scripts/FofbTool
with
10 additions
and
8 deletions
FofbTool/Configuration.py
+
2
−
2
View file @
5f858cc9
...
...
@@ -85,11 +85,11 @@ def cellnode_configure_comlbp(node_tangopath, seqoffset=0):
logger
.
error
(
"
Failed to obtain tango proxy or to ping to {}
"
.
format
(
node_tangopath
))
return
None
logger
.
debug
(
"
Program sequence offset {} in {}
"
.
format
(
seqoffset
,
cellnodename
))
logger
.
debug
(
"
Program sequence offset {} in {}
"
.
format
(
seqoffset
,
node_tangopath
))
for
n
in
range
(
4
):
prx
[
"
comlbp{}_seqoffset
"
.
format
(
n
)]
=
seqoffset
logger
.
info
(
"
Configuration of ComLBP done on {}.
"
.
format
(
p
))
logger
.
info
(
"
Configuration of ComLBP done on {}.
"
.
format
(
node_tangopath
))
return
True
###################################################################################################
...
...
This diff is collapsed.
Click to expand it.
FofbTool/Operation.py
+
3
−
1
View file @
5f858cc9
...
...
@@ -550,7 +550,7 @@ def electron_stop_com(bpmlist):
# OPERATIONS FOR LBP and Electron SYNCHRONIZATION
###################################################################################################
def
sync_
all_
bpm
(
bpmlist
,
lbpevrx
,
tlocal
,
tcentral
):
def
sync_bpm
(
bpmlist
,
bpmidlist
,
lbpevrx
,
tlocal
,
tcentral
):
"""
Synchronize all BPM electronics, Electron and Brillance Plus.
This will use the timing system (central and local board).
...
...
@@ -559,6 +559,8 @@ def sync_all_bpm(bpmlist, lbpevrx, tlocal, tcentral):
-----------
bpmlist: list
list of Libera Electron tango path
bpmidlist: list
list of ID to put on Libera Electron
lbpevrx: list
list of LBP Evrx tanfo path
tlocal: list
...
...
This diff is collapsed.
Click to expand it.
FofbTool/Utils.py
+
4
−
4
View file @
5f858cc9
...
...
@@ -435,7 +435,7 @@ def align_all_ccn(cellnodename, force=False):
for
n
,
p
in
config
[
"
tangopath.fofbnodes
"
].
items
():
if
'
cellnode
'
in
n
:
try
:
FofbTool
.
Configuration
.
cellnode_configure_comlbp
(
n
,
seqoffset
)
FofbTool
.
Configuration
.
cellnode_configure_comlbp
(
p
,
seqoffset
)
except
(
tango
.
DevFailed
,
TypeError
):
logger
.
error
(
"
Could not set comlbp offset on {}
"
.
format
(
n
))
...
...
@@ -468,9 +468,9 @@ def sync_all_bpm():
# Set a group of Libera Brillance Plus EVRX board, from FofbTool configuration
lbpevrx
=
tango
.
Group
(
'
lbpevrx
'
)
lbpevrx
.
add
(
FofbTool
.
Configuration
.
config
[
"
tangopath
"
][
"
lbpevrx
"
].
split
())
lbpevrx
.
add
(
config
[
"
tangopath
"
][
"
lbpevrx
"
].
split
())
tcentral
=
tango
.
DeviceProxy
(
FofbTool
.
Configuration
.
config
[
"
tangopath
"
][
"
timing-central
"
])
tcentral
=
tango
.
DeviceProxy
(
config
[
"
tangopath
"
][
"
timing-central
"
])
FofbTool
.
Operation
.
sync_bpm
(
bpmlist
,
lbpevrx
,
tlocal
,
tcentral
)
FofbTool
.
Operation
.
sync_bpm
(
bpmlist
,
bpmidlist
,
lbpevrx
,
tlocal
,
tcentral
)
This diff is collapsed.
Click to expand it.
scripts/FofbTool
+
1
−
1
View file @
5f858cc9
...
...
@@ -139,7 +139,7 @@ if __name__ == '__main__':
FofbTool
.
Utils
.
conf_centralnode_corr
()
if
args
.
sync
:
FofbTool
.
Operation
.
sync_all_bpm
()
FofbTool
.
Utils
.
sync_all_bpm
()
if
(
args
.
start
or
args
.
start_comlbp
)
and
not
args
.
nolbp
:
FofbTool
.
Utils
.
start_all_comlbp
()
...
...
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