adding fixes for closeBy correction for combining PHYS with LLP1 and FTAG

Fix for adding in CloseByIsolation correction when running multiple derivation formats. See ATLASG-2539. Temporarily removed the writing out of information to be able to do CloseByIso correction when reading the derivations.

PhysicsAnalysis/AnalysisCommon/IsolationSelection/python/IsolationSelectionConfig.py

@@ -82,7 +82,7 @@ def IsoCloseByCorrAlgCfg(flags, name="IsoCloseByCorrAlg", isPhysLite = False, co
                                                                 MuQuality     = 2, ### Select the loose working point
                                                                 )))  
 
-    # For PhysLite, add in electron and photon selection tools for el LH very loose and ph isEM loose
+    # For PhysLite or LLP1, add in electron and photon selection tools for el LH very loose and ph isEM loose
     if isPhysLite or useSelTools:
         from ElectronPhotonSelectorTools.AsgElectronLikelihoodToolsConfig import AsgElectronLikelihoodToolCfg
         from ElectronPhotonSelectorTools.ElectronLikelihoodToolMapping import  electronLHmenu
@@ -98,16 +98,15 @@ def IsoCloseByCorrAlgCfg(flags, name="IsoCloseByCorrAlg", isPhysLite = False, co
         kwargs.setdefault("PhotonSelectionTool", result.popToolsAndMerge(AsgPhotonIsEMSelectorCfg(flags,
                                                                          name= "PhotonSelTool",
                                                                          quality = egammaPID.PhotonIDLoose)))
+    else:
+        # Only PHYS has veryLoose and IsEMLoose defined:
+        kwargs.setdefault("ElecSelectionKey",  "Electrons.DFCommonElectronsLHVeryLoose")
+        kwargs.setdefault("PhotSelectionKey",  "Photons.DFCommonPhotonsIsEMLoose")
 
 
     # Set selection for muons, electrons and photons to contribute to overlap
     kwargs.setdefault("ParticleContainerKeys",    containerNames)
     
-    # For Phys, use the already defined DFCommon id variables for electron and photon, for loose muons, use tool above
-    # For PhysLite, the tools above are used
-    if not isPhysLite and not useSelTools:
-        kwargs.setdefault("ElecSelectionKey",  "Electrons.DFCommonElectronsLHVeryLoose")
-        kwargs.setdefault("PhotSelectionKey",  "Photons.DFCommonPhotonsIsEMLoose")
     # No default pt cuts for the moment
     kwargs.setdefault("MinElecPt", 0.)
     kwargs.setdefault("MinMuonPt", 0.)
@@ -164,17 +163,18 @@ def IsoCloseByAlgsCfg(flags, isPhysLite = False, containerNames = [ "Muons", "El
     # information on PhysLite.
     acc = ComponentAccumulator()
 
-    # Add additional information to derivation output to be able to run IsoCloseByCorrectionTool on it 
-    if not isPhysLite:
-        from IsolationSelection.IsolationSelectionConfig import IsoCloseByCorrSkimmingAlgCfg, IsoCloseByCaloDecorCfg
-        ### Add the tracks that potentially polute the isolation cones of others to the collection. 
-        ### Question: Is the list of recommended TTVA working points used for isolation available somewhere?
-        acc.merge(IsoCloseByCorrSkimmingAlgCfg(flags, ttva_wp = "Nonprompt_All_MaxWeight",
-                                                            OutputStream = stream_name))
+    ## Temporarily comment out for parent/child augmentation tests
+    # # Add additional information to derivation output to be able to run IsoCloseByCorrectionTool on it 
+    # if not isPhysLite:
+    #     from IsolationSelection.IsolationSelectionConfig import IsoCloseByCorrSkimmingAlgCfg, IsoCloseByCaloDecorCfg
+    #     ### Add the tracks that potentially polute the isolation cones of others to the collection. 
+    #     ### Question: Is the list of recommended TTVA working points used for isolation available somewhere?
+    #     acc.merge(IsoCloseByCorrSkimmingAlgCfg(flags, ttva_wp = "Nonprompt_All_MaxWeight",
+    #                                                         OutputStream = stream_name))
         
-        ### Associate the close-by pflow objects and the calorimeter clusters
-        acc.merge(IsoCloseByCaloDecorCfg(flags,
-                                         containers = containerNames ))
+    #     ### Associate the close-by pflow objects and the calorimeter clusters
+    #     acc.merge(IsoCloseByCaloDecorCfg(flags,
+    #                                      containers = containerNames ))
 
     # Setup the isolation close-by correction algorithm sequence to correct the isolation of near-by el, mu, ph
     from IsolationSelection.IsolationSelectionConfig import IsoCloseByCorrAlgCfg