Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
X
XiaDxp
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software Control System
Tango devices
Acquisition
1D
XiaDxp
Commits
e6b6f294
Commit
e6b6f294
authored
4 months ago
by
Arafat NOUREDDINE
Browse files
Options
Downloads
Patches
Plain Diff
conanfile.py : 3.5.0
parent
57e041e2
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
conanfile.py
+2
-2
2 additions, 2 deletions
conanfile.py
test/test_load_switch_mca_map.py
+1
-1
1 addition, 1 deletion
test/test_load_switch_mca_map.py
with
3 additions
and
3 deletions
conanfile.py
+
2
−
2
View file @
e6b6f294
...
@@ -3,14 +3,14 @@ from conan import ConanFile
...
@@ -3,14 +3,14 @@ from conan import ConanFile
class
XiaDxpRecipe
(
ConanFile
):
class
XiaDxpRecipe
(
ConanFile
):
name
=
"
xiadxp
"
name
=
"
xiadxp
"
executable
=
"
ds_XiaDxp
"
executable
=
"
ds_XiaDxp
"
version
=
"
3.
4
.0
"
version
=
"
3.
5
.0
"
package_type
=
"
application
"
package_type
=
"
application
"
user
=
"
soleil
"
user
=
"
soleil
"
python_requires
=
"
base/[>=1.0]@soleil/stable
"
python_requires
=
"
base/[>=1.0]@soleil/stable
"
python_requires_extend
=
"
base.Device
"
python_requires_extend
=
"
base.Device
"
license
=
"
GPL-3.0-or-later
"
license
=
"
GPL-3.0-or-later
"
author
=
"
Arafat Nour
r
edine
"
author
=
"
Arafat Noure
d
dine
"
url
=
"
https://gitlab.synchrotron-soleil.fr/software-control-system/tango-devices/acquisition/1d/xiadxp.git
"
url
=
"
https://gitlab.synchrotron-soleil.fr/software-control-system/tango-devices/acquisition/1d/xiadxp.git
"
description
=
"
XiaDxp device
"
description
=
"
XiaDxp device
"
topics
=
(
"
control-system
"
,
"
tango
"
,
"
device
"
)
topics
=
(
"
control-system
"
,
"
tango
"
,
"
device
"
)
...
...
This diff is collapsed.
Click to expand it.
test/test_load_switch_mca_map.py
+
1
−
1
View file @
e6b6f294
...
@@ -69,7 +69,7 @@ def load(proxy, alias):
...
@@ -69,7 +69,7 @@ def load(proxy, alias):
state
=
proxy
.
state
()
state
=
proxy
.
state
()
if
state
==
PyTango
.
DevState
.
STANDBY
:
if
state
==
PyTango
.
DevState
.
STANDBY
:
break
break
log
(
'
.
'
,
end
=
''
,
flush
=
True
)
#
Affiche un point sans nouvelle
li
g
ne
log
(
'
.
'
,
end
=
''
,
flush
=
True
)
#
print "." no new
line
time
.
sleep
(
1
)
time
.
sleep
(
1
)
# Record end time and device state
# Record end time and device state
...
...
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