Commit ed5b71c0 authored by Roel Aaij's avatar Roel Aaij
Browse files

Add some simple upgrade configuration settings and set project version to head.

parent fc1b589f
......@@ -6,8 +6,8 @@ find_package(GaudiProject)
#---------------------------------------------------------------
# Declare project name and version
gaudi_project(Moore v24r4
USE Hlt v24r4
gaudi_project(Moore HEAD
USE Hlt HEAD
DATA AppConfig VERSION v3r*
FieldMap VERSION v5r*
PRConfig
......
......@@ -68,6 +68,7 @@ class Moore(LHCbConfigurableUser):
, "DataType": '2012' # Data type, can be [ 'DC06','2008' ]
, "DDDBtag" : 'default' # default as set in DDDBConf for DataType
, "CondDBtag" : 'default' # default as set in DDDBConf for DataType
, "Upgrade" : False
#########################################
# Mandatory options to consider
#########################################
......@@ -151,6 +152,7 @@ class Moore(LHCbConfigurableUser):
, "DataType": 'Data type, can be 2010, 2012, etc.'
, "DDDBtag" : 'database tag, default as set in DDDBConf for DataType'
, "CondDBtag" : 'database tag, default as set in DDDBConf for DataType'
, "Upgrade" : 'Use upgrade geometry'
#########################################
# Mandatory options to consider
#########################################
......@@ -675,7 +677,8 @@ class Moore(LHCbConfigurableUser):
hltConf = HltConf()
self.setOtherProps( hltConf,
[ 'ThresholdSettings'
[ 'Upgrade'
, 'ThresholdSettings'
, 'DataType'
, 'Split'
, 'ForceSingleL0Configuration'
......@@ -717,6 +720,14 @@ class Moore(LHCbConfigurableUser):
LHCb__ParticlePropertySvc().ParticlePropertiesFile = 'conddb:///param/ParticleTable.txt';
def _configureUpgrade(self):
# Upgrade hackzors
app = LHCbApp()
if self.getProp("Upgrade"):
app.Detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']
from Configurables import HltRecoConf
HltRecoConf().InitFits = False
def _definePersistency(self):
#online, do the minimum possible, of only setting up MDF
......@@ -824,12 +835,9 @@ class Moore(LHCbConfigurableUser):
# forward some settings...
# WARNING: this triggers setup of /dd -- could be avoided in PA only mode...
app = LHCbApp()
self.setOtherProps( app, ['EvtMax','SkipEvents','Simulation', 'DataType' ] )
# this was a hack. Someone thought setOtherProps did not work?
#app.CondDBtag = self.getProp('CondDBtag')
#app.DDDBtag = self.getProp('DDDBtag')
self.setOtherProps( app, ['CondDBtag','DDDBtag'])
self.setOtherProps( app, ['EvtMax','SkipEvents','Simulation', 'DataType',
'CondDBtag','DDDBtag', 'Upgrade'])
# Get the event time (for CondDb) from ODIN
from DAQSys.Configuration import SetEvtClock
SetEvtClock("ODIN")
......@@ -847,6 +855,8 @@ class Moore(LHCbConfigurableUser):
#set the decoders to read from the default location
self._setRawEventLocations()
self._configureUpgrade()
self._configureDQTags()
if self.getProp('UseTCK') :
......
project MOORE
use HLT HLT_v24r4
use HLT HLT_HEAD
container MooreSys
build_strategy with_installarea
......
Markdown is supported
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