Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
pjlsa
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review 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
scripting-tools
pjlsa
Commits
a918794f
Commit
a918794f
authored
4 years ago
by
Philip Elson
Browse files
Options
Downloads
Plain Diff
Merge branch 'update-dependencies-with-group-id' into 'master'
update dependencies with group IDs See merge request
!8
parents
2fb6be0d
ad788791
No related branches found
No related tags found
1 merge request
!8
update dependencies with group IDs
Pipeline
#2217962
passed
4 years ago
Stage: build
Stage: test
Stage: deploy
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pjlsa/__init__.py
+3
-3
3 additions, 3 deletions
pjlsa/__init__.py
tests/test_basic.py
+8
-8
8 additions, 8 deletions
tests/test_basic.py
with
11 additions
and
11 deletions
pjlsa/__init__.py
+
3
−
3
View file @
a918794f
__version__
=
"
0.2.
3
"
__version__
=
"
0.2.
4
"
__cmmnbuild_deps__
=
[
"
log4j
"
,
"
lsa-client
"
,
{
"
product
"
:
"
log4j
"
,
"
groupId
"
:
"
log4j
"
}
,
{
"
product
"
:
"
lsa-client
"
,
"
groupId
"
:
"
cern.lsa
"
}
]
from
.pjlsa
import
LSAClient
...
...
This diff is collapsed.
Click to expand it.
tests/test_basic.py
+
8
−
8
View file @
a918794f
...
...
@@ -24,11 +24,11 @@ def test_parameter():
def
test_trim
():
t1
=
"
201
5-11
-22 00:00:00
"
t2
=
"
201
5-11
-23 00:00:00
"
t1
=
"
201
8-09
-22 00:00:00
"
t2
=
"
201
8-09
-23 00:00:00
"
name
=
"
LHCBEAM2/IP1_SEPSCAN_Y_MM
"
trims
=
lsa
.
getTrims
(
beamprocess
=
"
PHYSICS-
2
.5
1
TeV-
4m
-201
5
_V1@
9
0_[END]
"
,
beamprocess
=
"
PHYSICS-
6
.5TeV-
30cm-120s
-201
8
_V1@
12
0_[END]
"
,
parameter
=
name
,
start
=
t1
,
end
=
t2
,
...
...
@@ -39,13 +39,13 @@ def test_trim():
def
test_trim_function
():
name
=
"
RQ5.L1B1/I
"
trims
=
lsa
.
getTrims
(
beamprocess
=
"
PC_INTERLOCK_REF-SQUEEZE-6.5TeV-
3
m-
4
0cm-201
6
_V1
"
,
beamprocess
=
"
PC_INTERLOCK_REF-SQUEEZE-6.5TeV-
ATS-1
m-
3
0cm-201
8
_V1
"
,
parameter
=
name
)
func
=
trims
[
name
].
data
assert
len
(
func
)
>
0
assert
type
(
func
[
0
])
is
np
.
ndarray
assert
func
[
0
].
shape
==
(
2
,
575
)
assert
func
[
0
].
shape
==
(
2
,
329
)
def
test_optics
():
...
...
@@ -54,14 +54,14 @@ def test_optics():
def
test_factors
():
ot
=
lsa
.
getOpticTable
(
"
PHYSICS-
2
.5
1
TeV-
4m
-201
5
_V1@
9
0_[END]
"
)
ot
=
lsa
.
getOpticTable
(
"
PHYSICS-
6
.5TeV-
30cm-120s
-201
8
_V1@
12
0_[END]
"
)
f
=
lsa
.
getKnobFactors
(
"
LHCBEAM2/IP1_SEPSCAN_Y_MM
"
,
ot
[
0
])
assert
len
(
f
)
>
3
def
test_beamprocess
():
bp
=
lsa
.
_getBeamProcess
(
"
PHYSICS-
2
.5
1
TeV-
4m
-201
5
_V1@
9
0_[END]
"
)
bp1
=
lsa
.
_getBeamProcessByUser
(
"
LHC.USER.PHYSICS
"
,
"
2
.5
1
TeV_201
5_CRS
"
)
bp
=
lsa
.
_getBeamProcess
(
"
PHYSICS-
6
.5TeV-
30cm-120s
-201
8
_V1@
12
0_[END]
"
)
bp1
=
lsa
.
_getBeamProcessByUser
(
"
LHC.USER.PHYSICS
"
,
"
6
.5TeV_201
8_PELP_RAMP
"
)
assert
(
bp
==
bp1
)
==
1
...
...
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