Commit c36afe07 authored by Alex Pearce's avatar Alex Pearce
Browse files

Run the packing after making MC relations.

Otherwise the MC relations aren't packed, because they don't exist when
the packer runs. D'oh!
parent 5bb21d1e
......@@ -297,32 +297,6 @@ class Tesla(LHCbConfigurableUser):
if self.getProp('DuplicateCheck'):
TeslaReportAlgoSeq.Members += [dplic]
if self.getProp('Pack'):
packer = PackParticlesAndVertices( name = "TurboPacker",
InputStream = "/Event"+"/"+self.base.rstrip('/'),
DeleteInput = False,
EnableCheck = False,
AlwaysCreateOutput = True)
TeslaReportAlgoSeq.Members +=[packer]
from Configurables import PackCaloHypo as PackCaloHypos
hypopacker = PackCaloHypos( name = "PackCaloHypos",
AlwaysCreateOutput = True,
DeleteInput = False,
OutputLevel = self.getProp('OutputLevel'),
InputName = self.base+"CaloHypos",
OutputName = self.base+"pRec/neutral/Hypos" )
from Configurables import DataPacking__Pack_LHCb__CaloClusterPacker_ as PackCaloClusters
clusterpacker = PackCaloClusters( name = "PackCaloClusters",
AlwaysCreateOutput = True,
DeleteInput = False,
OutputLevel = self.getProp('OutputLevel'),
InputName = self.base+"CaloClusters",
OutputName = self.base+"pRec/neutral/Clusters" )
TeslaReportAlgoSeq.Members +=[hypopacker,clusterpacker]
packer.OutputLevel = min(self.getProp('OutputLevel'),self.getProp('PackerOutputLevel'))
# Make protoparticle -> truth tables *****************************************
inputType = self.getProp('InputType')
if (inputType=='XDST') or (inputType=='LDST'):
......@@ -414,6 +388,32 @@ class Tesla(LHCbConfigurableUser):
# Add final sequences
TeslaReportAlgoSeq.Members+=[ChargedProtoSeq,NeutralProtoSeq]
if self.getProp('Pack'):
packer = PackParticlesAndVertices( name = "TurboPacker",
InputStream = "/Event"+"/"+self.base.rstrip('/'),
DeleteInput = False,
EnableCheck = False,
AlwaysCreateOutput = True)
TeslaReportAlgoSeq.Members +=[packer]
from Configurables import PackCaloHypo as PackCaloHypos
hypopacker = PackCaloHypos( name = "PackCaloHypos",
AlwaysCreateOutput = True,
DeleteInput = False,
OutputLevel = self.getProp('OutputLevel'),
InputName = self.base+"CaloHypos",
OutputName = self.base+"pRec/neutral/Hypos" )
from Configurables import DataPacking__Pack_LHCb__CaloClusterPacker_ as PackCaloClusters
clusterpacker = PackCaloClusters( name = "PackCaloClusters",
AlwaysCreateOutput = True,
DeleteInput = False,
OutputLevel = self.getProp('OutputLevel'),
InputName = self.base+"CaloClusters",
OutputName = self.base+"pRec/neutral/Clusters" )
TeslaReportAlgoSeq.Members +=[hypopacker,clusterpacker]
packer.OutputLevel = min(self.getProp('OutputLevel'),self.getProp('PackerOutputLevel'))
TeslaOutputStreamsSequence = GaudiSequencer('TeslaOutputStreamsSequence')
TeslaOutputStreamsSequence.ModeOR = True;
......
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