Commit e98365d5 authored by Lucia Grillo's avatar Lucia Grillo Committed by Chris Burr
Browse files

RunType Upgrade, update to TrackListMerger outputLocation, Upgrade DefaultRecoSequences

parent cb83a166
......@@ -38,7 +38,8 @@ class Escher(LHCbConfigurableUser):
KnownSpecialData = []
DefaultRecoSequences = {'Run1':["Decoding"]+RecSysConf().DefaultTrackingSubdets,
'Run2':["Decoding"]+RecSysConf().DefaultTrackingSubdetsRun2}
'Run2':["Decoding"]+RecSysConf().DefaultTrackingSubdetsRun2,
'Upgrade':["Decoding"]+RecSysConf().DefaultTrackingSubdetsUpgrade}
# Steering options
......@@ -446,7 +447,11 @@ class Escher(LHCbConfigurableUser):
## Check the reconstruction sequence
def CheckRecoSequence(self):
RecoSeq = self.getProp("RecoSequence")
RunType = 'Run2' if int(self.getProp("DataType")) >= 2015 else 'Run1'
if self.getProp("DataType") == "Upgrade":
RunType = 'Upgrade'
else:
RunType = 'Run2' if int(self.getProp("DataType")) >= 2015 else 'Run1'
# Set default sequence if not specified
if RecoSeq == []:
RecoSeq = self.DefaultRecoSequences[RunType]
......
......@@ -99,7 +99,7 @@ class TAlignment( LHCbConfigurableUser ):
from Configurables import TrackListMerger
trackmerger = TrackListMerger( "AlignTracks",
outputLocation = "Rec/Track/AlignTracks")
self.setProp("TrackLocation",trackmerger.outputLocation)
self.setProp("TrackLocation",trackmerger.outputLocation.toStringProperty())
for i in trackselections :
alg = i.algorithm()
if alg: trackInputSeq.Members.append( alg )
......
......@@ -96,7 +96,7 @@ StatusCode TStation::execute() {
iterT != inCont->end(); iterT++) {
LHCb::Track* aTrack = *iterT;
if ( m_refit )
m_tfit->fit( *aTrack );
(*m_tfit)( *aTrack );
// debug() << "Track chi2/ndof = " << aTrack->chi2PerDoF() << " Fitted: " << aTrack->fitStatus() << endmsg;
if ( m_trackselection->accept( *aTrack ) ) {
num_tracks++;
......
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