add UFOCSSK to OnTheFly,FTAG1 and correct a typo in FTAG2 (AFT-609)

PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/ContainersOnTheFly.py

@@ -123,6 +123,9 @@ ContainersOnTheFly = [
                         ["CHSGNeutralParticleFlowObjects","xAOD::FlowElementContainer"], 
                         ["CHSGNeutralParticleFlowObjectsAux","xAOD::ShallowAuxContainer"],
 
+                        ['UFOCSSK', 'xAOD::FlowElementContainer'],
+                        ['UFOCSSKAux', 'xAOD::FlowElementAuxContainer'],
+
 ]
 
 from InDetPrepRawDataToxAOD.InDetDxAODJobProperties import InDetDxAODFlags

PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FTAG1.py

@@ -74,6 +74,7 @@ def FTAG1Cfg(ConfigFlags):
             "BTagging_AntiKt4EMPFlowJFVtx",
             "BTagging_AntiKt4EMPFlowSecVtx",
             "AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets",
+            "UFOCSSK",
             "TruthParticles",
             "TruthVertices",
             "TruthBottom", "TruthElectrons","TruthMuons","TruthTaus",

PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FTAG2.py

@@ -119,21 +119,21 @@ def FTAG2Cfg(ConfigFlags):
             "TruthBottom", "TruthElectrons","TruthMuons","TruthTaus",
             ]
 
-    from DerivationFrameworkFlavourTag import FtagCommonCA
+    from DerivationFrameworkFlavourTag import FtagBaseContent
 
     # Static content
-    FtagCommonCA.add_static_content_to_SlimmingHelper(FTAG2SlimmingHelper)
+    FtagBaseContent.add_static_content_to_SlimmingHelper(FTAG2SlimmingHelper)
 
     # Add truth containers
     if ConfigFlags.Input.isMC:
-        FtagCommonCA.add_truth_to_SlimmingHelper(FTAG2SlimmingHelper)
+        FtagBaseContent.add_truth_to_SlimmingHelper(FTAG2SlimmingHelper)
 
     # Add ExtraVariables
-    FtagCommonCA.add_ExtraVariables_to_SlimmingHelper(FTAG2SlimmingHelper)
+    FtagBaseContent.add_ExtraVariables_to_SlimmingHelper(FTAG2SlimmingHelper)
    
     # Trigger content
-    FtagCommonCA.trigger_setup(FTAG2SlimmingHelper, 'FTAG2')
-    FtagCommonCA.trigger_matching(FTAG2SlimmingHelper, FTAG2TriggerListsHelper, ConfigFlags)
+    FtagBaseContent.trigger_setup(FTAG2SlimmingHelper, 'FTAG2')
+    FtagBaseContent.trigger_matching(FTAG2SlimmingHelper, FTAG2TriggerListsHelper, ConfigFlags)
 
 
     # Output stream