Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
DaVinci
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
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
LHCb
DaVinci
Commits
adc7da1a
Commit
adc7da1a
authored
1 year ago
by
Gerhard Raven
Browse files
Options
Downloads
Patches
Plain Diff
notify user if a specified option is overruled
parent
ef45e216
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!1103
Draft: Add AnalysisHelpers to DaVinci Stack
,
!904
notify user if a specified option is overruled, fix python test
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Phys/DaVinci/python/DaVinci/LbExec.py
+6
-1
6 additions, 1 deletion
Phys/DaVinci/python/DaVinci/LbExec.py
Phys/DaVinci/tests/config/test_algorithms.py
+1
-1
1 addition, 1 deletion
Phys/DaVinci/tests/config/test_algorithms.py
with
7 additions
and
2 deletions
Phys/DaVinci/python/DaVinci/LbExec.py
+
6
−
1
View file @
adc7da1a
...
...
@@ -14,6 +14,7 @@ from GaudiConf.LbExec import Options as DefaultOptions, InputProcessTypes
from
pydantic
import
root_validator
from
PyConf.reading
import
(
upfront_decoder
,
reconstruction
,
get_tes_root
)
from
PyConf.application
import
default_raw_event
import
logging
class
Options
(
DefaultOptions
):
...
...
@@ -56,9 +57,13 @@ class Options(DefaultOptions):
dict: Modified attributes of the Options object.
"""
input_process
=
values
.
get
(
"
input_process
"
)
input_stream
=
values
.
get
(
"
input_stream
"
)
if
input_process
not
in
{
InputProcessTypes
.
Spruce
,
InputProcessTypes
.
TurboPass
}:
}
and
input_stream
!=
''
:
logging
.
getLogger
(
__name__
).
warning
(
f
'
input_stream is set to
\'
{
input_stream
}
\'
, but will be reset to
\'\'
because current input_process =
{
input_process
}
'
)
values
[
'
input_stream
'
]
=
''
return
values
...
...
This diff is collapsed.
Click to expand it.
Phys/DaVinci/tests/config/test_algorithms.py
+
1
−
1
View file @
adc7da1a
...
...
@@ -46,7 +46,7 @@ def test_add_hlt2_filter():
evt_max
=
1
,
simulation
=
True
,
input_process
=
"
Hlt2
"
,
input_stream
=
"
default
"
,
input_stream
=
''
,
)
#Note here that we need to manually apply a bind to the PyConf functions
# as they are not automatically configured in the pytests.
...
...
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