Fix topocluster naming and input sequence handling in JetRecConfig

Reconstruction/Jet/JetRecConfig/python/JetDefinition.py

@@ -114,12 +114,7 @@ class JetConstit(object):
         # Jets could specify a filter e.g. pt cut or JVT??
         modstring = ""
         if self.__modifiers:
-            for mod in self.__modifiers:
-                # Handle special case of topocluster state
-                if mod in ["EM","LC"]:
-                    self.label += mod
-                else:
-                    modstring += mod
+            modstring = "".join(self.__modifiers)
 
         self.label += labelnames[self.basetype]
         if self.basetype!=xAODType.Jet:
@@ -127,6 +122,10 @@ class JetConstit(object):
         if self.basetype==xAODType.TruthParticle:
             self.label = self.label.replace("NoWZ","WZ")
 
+	if self.basetype==xAODType.CaloCluster:
+	    self.label = self.label.replace("TopoEM","EMTopo")
+	    self.label = self.label.replace("TopoLC","LCTopo")
+
         containernames = {
             xAODType.CaloCluster:      "TopoClusters",
             xAODType.ParticleFlow:     "ParticleFlowObjects",

Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py

@@ -65,11 +65,11 @@ def JetRecCfg(jetdef, configFlags, jetnameprefix="",jetnamesuffix="", jetnameove
     # 
     # To facilitate running in serial mode, we also prepare
     # the constituent PseudoJetGetter here (needed for rho)
-    inputcomps = JetInputCfg(deps["inputs"], configFlags, sequenceName=jetsfullname)
+    inputcomps = JetInputCfg(deps["inputs"], configFlags)
     constitpjalg = inputcomps.getPrimary()
     constitpjkey = constitpjalg.PJGetter.OutputContainer
 
-    components.merge(inputcomps)
+    components.merge(inputcomps,sequencename)
     pjs = [constitpjkey]
 
     # Schedule the ghost PseudoJetGetterAlgs
@@ -235,13 +235,13 @@ def getEventShapeAlg( constit, constitpjkey, nameprefix="" ):
 #
 # This includes constituent modifications, track selection, copying of
 # input truth particles and event density calculations
-def JetInputCfg(inputdeps, configFlags, sequenceName):
+def JetInputCfg(inputdeps, configFlags):
     jetlog.info("Setting up jet inputs.")
-    components = ComponentAccumulator(sequenceName)
+    components = ComponentAccumulator()
 
     jetlog.info("Inspecting input file contents")
     filecontents = configFlags.Input.Collections
-    
+
     constit = inputdeps[0]
     # Truth and track particle inputs are handled later
     if constit.basetype not in [xAODType.TruthParticle, xAODType.TrackParticle] and constit.inputname!=constit.rawname: