Commit a225cddb authored by Marco Clemencic's avatar Marco Clemencic
Browse files

Enforce the default name of RootCnvSvc (without namespace).

Needed to preserve the compatibility with LHCb.

From: Marco Clemencic <marco.clemencic@cern.ch>


git-svn-id: svn+ssh://svn.cern.ch/reps/gaudi/Gaudi/branches/GAUDI/GAUDI_newpack@6743 53ecefc3-a64d-0410-9bdf-b8581fa3287e
parent d4a50980
Package : Gaudi
Package manager : Marco Clemencic
! 2011-12-09 - Marco Clemencic
- Added RootCnvSvc and RootEvtSelector to the list of aliased services
(enforcing the default name to preserve compatibility with LHCb).
! 2011-12-08 - Marco Clemencic
- Added support for class aliases in the meta-module "Configurables".
- Added a ConfigurableUser to setup the persistency via RootCnv:
......
# File: Gaudi/CommonGaudiConfigurables.py
# Author: Pere Mato (per.mato@cern.ch)
# Author: Pere Mato (pere.mato@cern.ch)
"""
This module would scan all known Gaudi configurable modules for
......@@ -12,7 +12,8 @@ from GaudiKernel.ConfigurableMeta import ConfigurableMeta
__all__ = []
packages = ['GaudiCoreSvc', 'GaudiCommonSvc', 'GaudiSvc', 'GaudiAlg',
'GaudiAud', 'GaudiPoolDb', 'RootHistCnv', 'GaudiUtils']
'GaudiAud', 'GaudiPoolDb', 'RootHistCnv', 'GaudiUtils',
'RootCnv']
#--Loop open all listed packages and populate __all__ with the names and
# the local scope with the Configurable classes
......@@ -42,6 +43,9 @@ aliases = {
'FileCatalog': 'Gaudi__MultiFileCatalog',
'IODataManager': 'Gaudi__IODataManager',
'RootCnvSvc': 'Gaudi__RootCnvSvc',
'RootEvtSelector': 'Gaudi__RootEvtSelector',
}
_gbl = globals() # optimization
......
# File: Gaudi/python/Gaudi/Configuration.py
# Author: Pere Mato (per.mato@cern.ch)
# Author: Pere Mato (pere.mato@cern.ch)
from GaudiKernel.Constants import *
from GaudiKernel.Configurable import *
......@@ -55,7 +55,7 @@ def configurationDict(all=False):
"""Return a dictionary representing the configuration.
The dictionary contains one entry per configurable which is a dictionary
with one entry per property.
The optional argument "all" is used to decide if to inluce only values
The optional argument "all" is used to decide if to include only values
different from the default or all of them.
"""
from GaudiKernel.Proxy.Configurable import getNeededConfigurables
......@@ -126,16 +126,21 @@ class GaudiPersistency(ConfigurableUser):
__slots__ = {}
def __apply_configuration__(self):
"""Apply low-level configuration"""
from Configurables import (PersistencySvc,
Gaudi__RootCnvSvc as RootCnvSvc,
ApplicationMgr,
from Configurables import (ApplicationMgr,
PersistencySvc,
FileRecordDataSvc,
EventPersistencySvc,
)
# aliased names
from Configurables import (RootCnvSvc,
RootEvtSelector,
IODataManager,
FileCatalog)
FileCatalog,
)
cnvSvcs = [ RootCnvSvc() ]
EventPersistencySvc().CnvServices += cnvSvcs
PersistencySvc("FileRecordPersistencySvc").CnvServices += cnvSvcs
app = ApplicationMgr()
app.SvcOptMapping += [ FileCatalog(), IODataManager() ]
app.SvcOptMapping += [ FileCatalog(), IODataManager(),
RootCnvSvc() ]
app.ExtSvc += [ FileRecordDataSvc() ]
......@@ -6,6 +6,8 @@
! 2011-12-09 - Marco Clemencic
- Added missing dependency on GaudiUtils.
- Removed the namespace from the instance name of RootCnvSvc
(compatibility with LHCb).
! 2011-12-08 - Marco Clemencic
- Modified Gaudi::RootEvtSelector to use the fully qualified name of RootCnvSvc
......
......@@ -98,7 +98,7 @@ using namespace std;
RootEvtSelector::RootEvtSelector(const string& name,ISvcLocator* svcloc )
: base_class(name, svcloc), m_rootCLID(CLID_NULL)
{
m_cnvSvcName = "Gaudi::RootCnvSvc";
m_cnvSvcName = "Gaudi::RootCnvSvc/RootCnvSvc";
declareProperty("DbType", m_dummy);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment