Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
Lbcom
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
Lbcom
Commits
f8e9d82b
Commit
f8e9d82b
authored
7 years ago
by
Marco Clemencic
Browse files
Options
Downloads
Patches
Plain Diff
Use Git version of STCOND if possible
parent
094a1c1c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
3 merge requests
!206
Rebase RichTTFUStudies to current master
,
!178
Master 2 future
,
!170
GitCondDB support for STMonitor
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
ST/STMonitors/python/ONLINE/General.py
+25
-2
25 additions, 2 deletions
ST/STMonitors/python/ONLINE/General.py
with
25 additions
and
2 deletions
ST/STMonitors/python/ONLINE/General.py
+
25
−
2
View file @
f8e9d82b
...
...
@@ -18,7 +18,7 @@ def patchMessages():
msg
=
Configs
.
LHCb__FmcMessageSvc
(
'
MessageSvc
'
)
msg
.
LoggerOnly
=
True
msg
.
fifoPath
=
os
.
environ
[
'
LOGFIFO
'
]
msg
.
OutputLevel
=
3
msg
.
OutputLevel
=
3
msg
.
doPrintAlways
=
True
#False
def
SetupApplicationMgr
(
task
):
...
...
@@ -42,7 +42,7 @@ def SetupApplicationMgr(task):
for
i
in
[
'
ToolSvc
'
,
'
AuditorSvc
'
]
:
ApplicationMgr
().
ExtSvc
.
append
(
i
)
#importOptions("/group/st/sw/OnlineMonitoring/scripts/Online.opts")
mepMgr
=
OnlineEnv
.
mepManager
(
OnlineEnv
.
PartitionID
,
OnlineEnv
.
PartitionName
,[
'
Events
'
],
True
)
...
...
@@ -96,6 +96,29 @@ def DatabaseTags(task):
CondDB
().
EnableRunStampCheck
=
False
if
task
in
[
'
STCalibMon
'
,
'
ITNZSMon
'
,
'
TTNZSMon
'
]:
try
:
from
DDDB.Configuration
import
GIT_CONDDBS
except
ImportError
:
GIT_CONDDBS
=
{}
if
'
STCOND
'
in
GIT_CONDDBS
:
# get Git CondDB access component
from
Configurables
import
GitEntityResolver
,
XmlParserSvc
from
Gaudi.Configuration
import
appendPostConfigAction
GitSTCOND
=
GitEntityResolver
(
'
GitSTCOND
'
,
PathToRepository
=
GIT_CONDDBS
[
'
STCOND
'
])
GitSTCOND
.
Ignore
=
r
'
^(?!(lhcb\.xml$|[IT]TCondDB)).*$
'
# FIXME: this is ugly but it's unavoidable until we get
# https://its.cern.ch/jira/browse/LHCBPS-1738 fixed
def
inject_git_stcond
():
try
:
xps
=
XmlParserSvc
()
xps
.
EntityResolver
.
EntityResolvers
.
insert
(
0
,
GitSTCOND
)
except
AttributeError
:
# ignore non git-based configuration
pass
appendPostConfigAction
(
inject_git_stcond
)
# it's fine to set the SQLite access when using Git because it's ignored
# in that case
from
Configurables
import
CondDB
,
CondDBAccessSvc
connection
=
"
sqlite_file:$STSQLDDDBROOT/db/STCOND.db/COND
"
CondDB
().
addLayer
(
CondDBAccessSvc
(
"
COND
"
,
ConnectionString
=
connection
))
...
...
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