diff --git a/Phys/Tesla/python/Tesla/Configuration.py b/Phys/Tesla/python/Tesla/Configuration.py index 6370f6530b3ae0f3c713c46ab2f0d04a794d57a9..c0bea1330be39a1e3d46e5f9f0ddb65f05eedb24 100644 --- a/Phys/Tesla/python/Tesla/Configuration.py +++ b/Phys/Tesla/python/Tesla/Configuration.py @@ -200,7 +200,7 @@ class Tesla(LHCbConfigurableUser): HistogramPersistencySvc().OutputFile = self.getProp("Histogram") def _configureTimingAuditor(self): - """Enable the printing of the atelgorithm timing table.""" + """Enable the printing of the algorithm timing table.""" ApplicationMgr().ExtSvc += ['ToolSvc', 'AuditorSvc'] ApplicationMgr().AuditAlgorithms = True AuditorSvc().Auditors += ['TimingAuditor'] @@ -597,7 +597,7 @@ class Tesla(LHCbConfigurableUser): def _configureTruthMatching(self, name, packing): # CHARGED STUFF ##################################################################### - # Get the location of all tracks and all charged protoparticles we want to truthmatch + # Get the location of all tracks and all protoparticles we want to truthmatch track_locs = [v for v in packing.outputs.values() if 'track' in v.lower()] proto_locs = [v for v in packing.outputs.values() if 'proto' in v.lower()] @@ -617,10 +617,7 @@ class Tesla(LHCbConfigurableUser): # for path in assocpp.InputData] #relationsLocations.append(protoneutral) print "++++++++++++++++" - print relationsLocations print proto_locs - #dummy = [ loc.lstrip('/Event/') for loc in proto_locs ] - #relationsLocations = [ '/Event/Relations' + v for v in dummy ] relationsLocations = [ loc.replace('/Event', '/Event/Relations') for loc in proto_locs ] print relationsLocations print "++++++++++++++++" @@ -1216,8 +1213,7 @@ class Tesla(LHCbConfigurableUser): if self.getProp('Mode') is "Online": self.setProp('WriteFSR',True) self._configureLumi() - if self.getProp('Simulation')==True: - self._unpackMC() + else: DecodeRawEvent().DataOnDemand=True RecombineRawEvent(Version=self.getProp('SplitRawEventInput'))