Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
Lima-camera-frelon
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
LimaGroup
Lima-camera-frelon
Commits
c64fa1d4
Commit
c64fa1d4
authored
Sep 19, 2019
by
Alejandro Homs Puron
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fixed_py3' into 'master'
hoops an other py3 fix See merge request
!14
parents
760a487a
05cd3353
Pipeline
#14519
passed with stages
in 4 minutes and 33 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
tango/Frelon.py
tango/Frelon.py
+2
-2
No files found.
tango/Frelon.py
View file @
c64fa1d4
...
...
@@ -39,7 +39,7 @@
# (c) - Bliss - ESRF
#=============================================================================
#
import
time
,
string
import
time
import
PyTango
from
Lima
import
Core
from
Lima
import
Frelon
as
FrelonHw
...
...
@@ -290,7 +290,7 @@ class FrelonTacoProxy:
@
Core
.
DEB_MEMBER_FUNCT
def
DevCcdSetHwPar
(
self
,
hw_par_str
):
hw_par
=
map
(
int
,
string
.
split
(
hw_par_str
))
hw_par
=
map
(
int
,
hw_par_str
.
split
(
))
deb
.
Param
(
'Setting hw par:
%
s'
%
hw_par
)
kin_win_size
,
kin_line_beg
,
kin_stripes
=
self
.
getKinPars
()
flip_mode
,
kin_line_beg
,
kin_stripes
,
d0
,
roi_mode_int
=
hw_par
...
...
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