Merge branch '21.0-fix-hi-topo-aodfix' into '21.0'

Fix to HIegamma topo cluster processing and HI AODFIx using special flag

See merge request !6477

(cherry picked from commit 3518c3de [formerly 9ad64ba914b150e1468a2dfc581eccbc611617e9])

7abefbbf Change to HIegamma in HIJetRec fixing configuration of topo cluster cell processing.

Former-commit-id: dea0f2afae218dbf0b8e361535188c2c2e1ad602

Reconstruction/HeavyIonRec/HIJetRec/share/HIegamma_jobOptions.py

@@ -76,6 +76,26 @@ AODFix_postEgammaRec()
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
 
+#from IsoGetter.py
+import ROOT, cppyy
+cppyy.loadDictionary('xAODCoreRflxDict')
+cppyy.loadDictionary('xAODPrimitivesDict')
+isoPar = ROOT.xAOD.Iso
+
+#remove isoPar.pileupCorrection from standard corrections
+
+IsoCorEg = [
+    [ isoPar.core57cells, isoPar.ptCorrection ],
+    [ isoPar.core57cells, isoPar.ptCorrection ],
+    [ isoPar.coreTrackPtr ] #still hard-coded
+    ]
+IsoCorMu = [
+    #[ isoPar.coreCone ], 
+    [ isoPar.coreMuon ],
+    [ isoPar.coreCone ],
+    [ isoPar.coreTrackPtr ] #still hard-coded
+    ]
+
 if hasattr(topSequence,"EDtpIsoCentralAlg") :
     EDtpIsoCentralAlg=getattr(topSequence,"EDtpIsoCentralAlg")
     topSequence.remove(EDtpIsoCentralAlg)
@@ -86,10 +106,20 @@ if hasattr(topSequence,"EDtpIsoForwardAlg") :
     topSequence.remove(EDtpIsoForwardAlg)
     topSequence+=EDtpIsoForwardAlg
 
+if hasattr(topSequence,"EDtpIsoVeryForwardAlg") :
+    EDtpIsoVeryForwardAlg=getattr(topSequence,"EDtpIsoVeryForwardAlg")
+    topSequence.remove(EDtpIsoVeryForwardAlg)
+    topSequence+=EDtpIsoVeryForwardAlg
+
 if hasattr(topSequence,"IsolationBuilder") :
     iso=getattr(topSequence,"IsolationBuilder")
     topSequence.remove(iso)
     iso.EgIsoTypes=iso.MuIsoTypes
+    iso.EgCorTypes=IsoCorEg
+    iso.MuCorTypes=IsoCorMu
     iso.CellCollectionName='SubtractedCells'
-    topSequence+=iso
+
+    
+
+topSequence+=iso
 

Reconstruction/HeavyIonRec/HIRecExample/python/HIRecExampleFlags.py

@@ -44,6 +44,13 @@ class doHIegamma(JobProperty):
     allowedTypes = ['bool']
     StoredValue  = True
 
+class doHIAODFix(JobProperty):
+    """ Run AOD fix
+    """
+    statusOn     = True
+    allowedTypes = ['bool']
+    StoredValue  = False
+
 class doHIJetAnalysis(JobProperty):
     """ Run heavy ion jet analysis
     """
@@ -109,6 +116,7 @@ list_jobproperties = [
     doHIGlobal,
     doHIJetRec,
     doHIegamma,
+    doHIAODFix,
     doHIJetAnalysis,
     doHIEventView,
     doValidation,

Reconstruction/HeavyIonRec/HIRecExample/share/HIRec_jobOptions.py

@@ -12,7 +12,7 @@ print 'IN HEAVY ION REC'
 # include("HIRecExample/HICalibrationsCoolFolders.py")
 
 # from AthenaCommon.DetFlags import DetFlags
-# from HIRecExample.HIRecExampleFlags import jobproperties
+from HIRecExample.HIRecExampleFlags import jobproperties
 
 #   if jobproperties.HIRecExampleFlags.doHIEventView:
 #       include( "HIRecExample/HIEventView_jobOptions.py" )
@@ -24,10 +24,13 @@ if rec.doESD:
     if jobproperties.HIRecExampleFlags.doHIGlobal:
         include( "HIGlobal/HIGlobal_jobOptions.py" )
     
-    if (jobproperties.HIRecExampleFlags.doHIJetRec and DetFlags.haveRIO.Calo_on() and   rec.triggerStream() != 'CosmicCalo') :
+    if (jobproperties.HIRecExampleFlags.doHIJetRec and \
+            DetFlags.haveRIO.Calo_on() and \
+            rec.triggerStream() != 'CosmicCalo') :
         include( "HIJetRec/HIJetRec_jobOptions.py" )
         if jobproperties.HIRecExampleFlags.doHIegamma : 
             include ("HIJetRec/HIegamma_jobOptions.py");
+
 # else :
 #     jobproperties.HIRecExampleFlags.doHIJetRec=False
 
@@ -35,5 +38,8 @@ if rec.doESD:
 #       include( "HIValidation/HIValidation_jobOptions.py")
 
 
-if not rec.doESD and not rec.doWriteTAG and rec.doWritexAOD :
-    include( "HIJetRec/HIJetRec_AODFix_207.py" );
+if (jobproperties.HIRecExampleFlags.doHIJetRec and \
+        DetFlags.haveRIO.Calo_on() and \
+        rec.triggerStream() != 'CosmicCalo') :
+    if jobproperties.HIRecExampleFlags.doHIAODFix :
+        include( "HIJetRec/HIJetRec_AODFix_207.py" );

Reconstruction/HeavyIonRec/HIRecExample/share/heavyion_flagsESD.py

@@ -31,8 +31,7 @@ if not jobproperties.HIRecExampleFlags.ppMode :
 
       from CaloRec.CaloRecFlags import jobproperties
       #need this eventually, but for now it breaks egamma isolation
-      #needed for now in rel. 21 for egamma reco
-      #jobproperties.CaloRecFlags.doCaloTopoCluster = False
+      jobproperties.CaloRecFlags.doCaloTopoCluster = False
       jobproperties.CaloRecFlags.doCaloEMTopoCluster = False
       jobproperties.CaloRecFlags.doCaloTopoTower = False
       # 2015 data, no pileup