ATR-28887: Avoid modifying retrieved CA in JetRecoSequencesConfig

Solving the longstanding (and basically harmless) mystery as to how the jetview_HLT_AntiKt10LCTopoJets_nojcalib_pt10 alg kept going missing between step configuration and full menu configuration.

An ill-conceived modification of the CA returned by StandardJetBuildSeq meant that this alg was situationally added to a sequence. The fact that we optimise the global HLT CA construction by selectively merging CAs on the basis of sequence name (assumed to be unique) meant that depending on the HLT menu ordering we could merge the version of the sequence that omitted this alg and then discard the version containing the alg.

Instead we now properly integrate this into a higher level CA, generating JetRecSeq_a10_nojcalib that will hold the view sequence, and ensure that JetBuildSeq_a10_tc_lcw_nojcalib is uniquely defined.

Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetRecoSequencesConfig.py

@@ -202,10 +202,17 @@ def StandardJetRecoCfg(flags, dataSource, clustersKey, **jetRecoDict):
     as a shallow copy.
     """
 
-    if jetRecoDict["jetCalib"] == "nojcalib":
+    seqname = "JetRecSeq_"+jetRecoDict['jetDefStr']
+    if jetRecoDict["jetCalib"] == "nojcalib":        
+
+        reco_acc = ComponentAccumulator()
+        reco_acc.addSequence(parOR(seqname))
+
         build_acc, jetsNoCalib, jetDef = StandardJetBuildCfg(
             flags, dataSource, clustersKey, **jetRecoDict
         )
+        reco_acc.merge(build_acc, seqname)
+
 
         # This view alg is added here rather than in StandardJetBuildCfg
         # so that we are able to get the no-calib collection name later
@@ -215,8 +222,8 @@ def StandardJetRecoCfg(flags, dataSource, clustersKey, **jetRecoDict):
             jetPtMin=10, # GeV converted internally
             **jetRecoDict
         )
-        build_acc.merge(jetViewAcc, 'JetBuildSeq_'+jetRecoDict['jetDefStr'])
-        return build_acc, jetsOut, jetDef
+        reco_acc.merge(jetViewAcc, seqname)
+        return reco_acc, jetsOut, jetDef
 
     # Schedule reconstruction w/o calibration
     jrdNoJCalib = cloneAndUpdateJetRecoDict(
@@ -224,13 +231,13 @@ def StandardJetRecoCfg(flags, dataSource, clustersKey, **jetRecoDict):
         jetCalib="nojcalib"
     )
 
-    seqname = "JetRecSeq_"+jetRecoDict['jetDefStr']
     acc = ComponentAccumulator()
     acc.addSequence(parOR(seqname))
 
     build_acc, jetsNoCalib, jetDefNoCalib = StandardJetBuildCfg(
         flags, dataSource, clustersKey, **jrdNoJCalib
     )
+    acc.merge(build_acc,seqname)
 
     jetViewAcc, jetsViewNoCalib = JetViewAlgCfg(
         flags,
@@ -238,9 +245,8 @@ def StandardJetRecoCfg(flags, dataSource, clustersKey, **jetRecoDict):
         jetPtMin=10, # GeV converted internally
         **jrdNoJCalib
     )
-    build_acc.merge(jetViewAcc, 'JetBuildSeq_'+jrdNoJCalib['jetDefStr'])
+    acc.merge(jetViewAcc, seqname)
 
-    acc.merge(build_acc,seqname)
     # Get the calibration tool
     jetDef = jetDefNoCalib.clone()
     jetDef.suffix = jetDefNoCalib.suffix.replace("nojcalib", jetRecoDict["jetCalib"])