Calorimeter/CaloRec/python/CaloConfigFlags.py

 # Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.AthConfigFlags import AthConfigFlags
+from AthenaConfiguration.Enums import HIMode
 
 def createCaloConfigFlags(): 
     ccf=AthConfigFlags()
@@ -24,7 +25,7 @@ def createCaloConfigFlags():
     ccf.addFlag("Calo.TopoCluster.doTreatEnergyCutAsAbsolute", False)
     ccf.addFlag("Calo.TopoCluster.doTopoClusterLocalCalib", True)
     ccf.addFlag("Calo.TopoCluster.doTimeCut",
-                lambda prevFlags: not prevFlags.Trigger.doHLT)
+                lambda prevFlags: not prevFlags.Trigger.doHLT and not prevFlags.Reco.EnableHI)
     ccf.addFlag("Calo.TopoCluster.extendTimeCut",
                 lambda prevFlags: prevFlags.Calo.TopoCluster.doTimeCut)
     ccf.addFlag("Calo.TopoCluster.useUpperLimitForTimeCut",
@@ -38,7 +39,8 @@ def createCaloConfigFlags():
     ccf.addFlag("Calo.TopoCluster.doCalibHitMoments",False)
     ccf.addFlag("Calo.TopoCluster.writeCalibHitClusterMoments",False)
     ccf.addFlag("Calo.TopoCluster.doCellWeightCalib", False)
-    ccf.addFlag("Calo.TopoCluster.skipWriteList", [])
+    ccf.addFlag("Calo.TopoCluster.skipWriteList", lambda prevFlags:
+                ["CaloCalTopoClusters", "CaloTopoClusters"] if prevFlags.Reco.HIMode is HIMode.HI else [])
 
     #### Cluster correction flags:
     # If true, then reweight cells to prevent double-counting between clusters.
@@ -96,7 +98,8 @@ def createCaloConfigFlags():
     # Flags from Forward Towers:
     ccf.addFlag('Calo.FwdTower.prepareLCW', True)
     ccf.addFlag('Calo.FwdTower.clusterRange', 2.5)
-    ccf.addFlag('Calo.FwdTower.WriteToAOD', True)
+    ccf.addFlag('Calo.FwdTower.WriteToAOD', 
+                lambda prevFlags: prevFlags.Reco.HIMode is not HIMode.HI)
     
     # Flag for thinning negative energy clusters
     ccf.addFlag('Calo.Thin.NegativeEnergyCaloClusters', True)

Control/AthenaConfiguration/python/Enums.py

@@ -85,7 +85,7 @@ class BeamType(FlagEnum):
     SingleBeam = 'singlebeam'
     Cosmics = 'cosmics'
     TestBeam = 'testbeam'
-
+    
 
 class BunchStructureSource(FlagEnum):
     FILLPARAMS = 0
@@ -101,3 +101,10 @@ class MetadataCategory(FlagEnum):
     LumiBlockMetaData = auto()
     TriggerMenuMetaData = auto()
     TruthMetaData = auto()
+
+
+class HIMode(FlagEnum):
+    pp  = "pp"
+    HI  = "hi"
+    HIP = "hip"
+    UPC = "upc"

Control/AthenaMonitoring/python/DQConfigFlags.py

@@ -3,7 +3,7 @@
 #
 
 from AthenaConfiguration.AthConfigFlags import AthConfigFlags
-from AthenaConfiguration.Enums import FlagEnum
+from AthenaConfiguration.Enums import FlagEnum,HIMode
 
 _steeringFlags = [ 'doGlobalMon', 'doLVL1CaloMon', 'doLVL1InterfacesMon', 'doCTPMon', 'doHLTMon',
                    'doPixelMon', 'doSCTMon', 'doTRTMon', 'doInDetMon',
@@ -60,7 +60,9 @@ def createDQConfigFlags():
     # steering ...
     for flag in _steeringFlags + _lowLevelSteeringFlags:
         arg = True
-        if flag in ['doJetTagMon', 'doJetMon', 'doMissingEtMon', 'doTauMon']:
+        if flag in ['doJetTagMon', 'doMissingEtMon', 'doTauMon']:
+            arg = lambda x: x.DQ.DataType is not DQDataType.Cosmics and x.Reco.HIMode is not HIMode.HI # noqa: E731
+        if flag in [ 'doJetMon','doJetTagMon'] :
             arg = lambda x: x.DQ.DataType is not DQDataType.Cosmics # noqa: E731
         if flag == 'doHLTMon':
             # new HLT monitoring not yet compatible with pre-Run 3 data

DataQuality/DataQualityInterfaces/src/HanOutput.cxx

@@ -382,6 +382,33 @@ namespace dqi
 
   void HanOutput::setInput(TDirectory* input) { m_input = input; }
 
+  static bool include_hist(TObject* obj) { //Check if object a hist or include hist
+    bool result = false;
+
+    if ((strncmp(obj->ClassName(), "TH", 2) == 0) || (strncmp(obj->ClassName(), "TGraph", 6) == 0) ||
+        (strncmp(obj->ClassName(), "TProfile", 8) == 0) || (strncmp(obj->ClassName(), "TEfficiency", 11) == 0))
+    {
+      return true;
+    }
+
+    TSeqCollection* tmpList{};
+    tmpList = dynamic_cast<TSeqCollection*>(obj);
+    if (tmpList != 0)
+    { //If it is collection - check, that it contains histograms or not
+      TIter nextElem(tmpList);
+      TObject* tmpobj{};
+      while ((tmpobj = nextElem()) != 0)
+      {
+        result = include_hist(tmpobj);
+        if (result == true)
+        {
+          return result;
+        }
+      }
+    }
+    return result;
+  }
+
   static void WriteListToDirectory(
     TDirectory* dir, TSeqCollection* list, TFile* file, int level, int HanOutput_FileVersion)
   {
@@ -431,16 +458,29 @@ namespace dqi
           {  
             ///First: we need to know - are there any histograms storing in this dir (e.g. References).
             //If yes - we should save them in the upper level
-            TIter nextElem(tmpList);
+            TIter nextElemConfRes(tmpList);
             TObject* objInResultConfig;
-            while ((objInResultConfig = nextElem()) != 0)
+            while ((objInResultConfig = nextElemConfRes()) != 0)
             {
-              if ((strncmp(objInResultConfig->ClassName(), "TH", 2) == 0) || (strncmp(objInResultConfig->ClassName(), "TGraph", 6) == 0) ||
-                  (strncmp(objInResultConfig->ClassName(), "TProfile", 8) == 0) || (strncmp(objInResultConfig->ClassName(), "TEfficiency", 11) == 0) ||
-                  (strncmp(objInResultConfig->GetName(), "Reference", 9) == 0)) //Sometimes (not a commoon case) 'Reference' is not a name of histogam 
-                  //directly, but a TDirectory, containing histogram
+              if (include_hist(objInResultConfig))
               {
-                dir->WriteTObject(objInResultConfig);
+                //If the element consist of histograms
+                TSeqCollection* tmpList_ResConf{}; //it should be a collection type
+                tmpList_ResConf = dynamic_cast<TSeqCollection*>(objInResultConfig);
+                if ((tmpList_ResConf != 0) && (strncmp(tmpList_ResConf->GetName(), "TObjArray", 9) == 0))
+                { //Here is the special case. In case the object is an Array with the name "TObjArray", containing histograms,
+                  //we should not only store it on the upper level, but also extract all the hists from it.
+                  TIter nextEleminTObjArray(tmpList_ResConf);
+                  TObject* objInTObjArray;
+                  while ((objInTObjArray = nextEleminTObjArray()) != 0){
+                    dir->WriteTObject(objInTObjArray);
+                  }
+                  tmpList->Remove(objInResultConfig); //This Array should not participate in JSON formation
+                }
+                else //If the element is histogram (or other Array, containing hist)- just store this obj in a higher level
+                {
+                  dir->WriteTObject(objInResultConfig);
+                }
               }
             }
             // For the rest of the content - Convert them to JSON 

ForwardDetectors/ZDC/ZdcAnalysis/Root/ZDCFitWrapper.cxx

@@ -8,6 +8,13 @@
 
 void ZDCFitWrapper::Initialize(float initialAmp, float initialT0, float ampMin, float ampMax)
 {
+  // Clear the errors on the TF1 because retaining the errors seems to affect 
+  //   the convergence of fits
+  //
+  unsigned int npar = GetWrapperTF1()->GetNpar();
+  std::vector<double> zeroVec(npar, 0.0);
+  GetWrapperTF1()->SetParErrors(&zeroVec[0]);
+
   // If we adjusted the time range on the previous event, restore to default
   //
   if (m_adjTLimitsEvent) {
@@ -24,6 +31,13 @@ void ZDCFitWrapper::Initialize(float initialAmp, float initialT0, float ampMin,
 
 void ZDCFitWrapper::Initialize(float initialAmp, float initialT0, float ampMin, float ampMax, float fitTmin, float fitTmax, float fitTRef)
 {
+  // Clear the errors on the TF1 because retaining the errors seems to affect 
+  //   the convergence of fits
+  //
+  unsigned int npar = GetWrapperTF1()->GetNpar();
+  std::vector<double> zeroVec(npar, 0.0);
+  GetWrapperTF1()->SetParErrors(&zeroVec[0]);
+
   m_adjTLimitsEvent = true;
 
   m_tminAdjust = fitTRef;
@@ -175,6 +189,9 @@ void ZDCFitExpFermiVariableTausLHCf::UnconstrainFit()
   theTF1->ReleaseParameter(4);
   theTF1->ReleaseParameter(5);
   theTF1->ReleaseParameter(6);
+
+  theTF1->SetParLimits(6, -1e-4, 0.2);
+  theTF1->SetParameter(6, 0.1);
 }
 
 ZDCFitExpFermiFixedTaus::ZDCFitExpFermiFixedTaus(const std::string& tag, float tmin, float tmax, float tau1, float tau2) :

ForwardDetectors/ZDC/ZdcAnalysis/Root/ZDCPulseAnalyzer.cxx

@@ -1254,9 +1254,13 @@ void ZDCPulseAnalyzer::DoFit()
 	  //
 	  m_fitFailed = true;
 	}
-	
+
+	result_ptr = constrFit2Result_ptr;
 	fitWrapper->UnconstrainFit();
       }
+      else {
+	result_ptr = unconstrFitResult_ptr;
+      }
     }
   }
 

Projects/AthDataQuality/version.txt

-23.0.49
+23.0.50

Projects/AthSimulation/version.txt

-23.0.49
+23.0.50

Projects/Athena/version.txt

-23.0.49
+23.0.50

Projects/DetCommon/version.txt

-23.0.49
+23.0.50

Projects/VP1Light/version.txt

-23.0.49
+23.0.50

Reconstruction/HeavyIonRec/HIGlobal/python/HIGlobalConfig.py

@@ -49,7 +49,7 @@ def HIEventShapeMakerCfg(flags, name="HIEventShapeMaker", doWeighted=False, **kw
     towerMaker = acc.getPrimaryAndMerge(CaloTowerMakerCfg(flags))
 
     kwargs.setdefault("NaviTowerKey", towerMaker.TowerContainerName)
-    kwargs.setdefault("InputTowerKey", towerMaker.TowerContainerName)
+    kwargs.setdefault("InputTowerKey", "")
     kwargs.setdefault("OutputContainerKey", "HIEventShape")
     if "HIEventShapeFillerTool" not in kwargs:
         name_esft="HIEventShapeFillerTool_Weighted" if doWeighted else "HIEventShapeFillerTool"

Reconstruction/HeavyIonRec/HIGlobal/src/HIEventShapeMaker.cxx

@@ -29,8 +29,7 @@ StatusCode HIEventShapeMaker::initialize()
   ATH_CHECK(m_summaryKey.initialize(!m_summaryKey.key().empty()));
 
   // assure consistent setup of the input
-  ATH_CHECK(m_towerContainerKey.empty() == m_naviContainerKey.empty()); 
-  ATH_CHECK(m_towerContainerKey.empty() != m_cellContainerKey.empty());
+  ATH_CHECK(m_naviContainerKey.empty() != m_cellContainerKey.empty());
 
   //Create the HIEventShapeFillerTool
   if (!m_summaryOnly)

Reconstruction/HeavyIonRec/HIRecConfig/python/HIModeFlags.py

@@ -2,59 +2,60 @@
 
 def _HIcommon(flags):
     flags.Reco.EnableHI = True
-    flags.Reco.EnableCaloRinger = False
-    flags.Reco.EnableBTagging = True
+    flags.Reco.EnableCaloRinger = False #AutoConfig not prevFlags.Reco.EnableHI)
+    flags.Reco.EnableBTagging = True  #anyway auto-configured based on EnableJets
     # disable TopoCluster out of time pileup cut
-    flags.Calo.TopoCluster.doTimeCut = False
-    flags.Calo.TopoCluster.extendTimeCut = False
-    flags.Calo.TopoCluster.useUpperLimitForTimeCut = False
-    flags.Reco.PostProcessing.ThinNegativeClusters = False
+    flags.Calo.TopoCluster.doTimeCut = False #AutoConfig not prevFlags.Reco.EnableHI
+    flags.Calo.TopoCluster.extendTimeCut = False #anyway auto-configured on doTimeCut 
+    flags.Calo.TopoCluster.useUpperLimitForTimeCut = False #anyway auto-configured on doTimeCut 
+    flags.Reco.PostProcessing.ThinNegativeClusters = False #auto-config not prevFlags.Reco.EnableHI
+
 
 
 def HImode(flags):
     _HIcommon(flags)
-    flags.Reco.EnableTau = False
-    flags.DQ.Steering.doTauMon = False
-    flags.Reco.EnableJet = False
-    flags.Reco.EnableMet = False
-    flags.DQ.Steering.doMissingEtMon = False
-    flags.Jet.WriteToAOD = True  # this is to save btagging to xAOD
+    flags.Reco.EnableTau = False #anyway dependent to EnableJet
+    flags.DQ.Steering.doTauMon = False  #switch on DQType.HeavyIon FIXME might not work for UPC
+    flags.Reco.EnableJet = False # ..and prevFlags.HIMode is not HIMode.HI
+    flags.Reco.EnableMet = False  #anyway dependent to EnableJet
+    flags.DQ.Steering.doMissingEtMon = False  #switch on DQType.HeavyIon FIXME might not work for UPC
+    flags.Jet.WriteToAOD = True  #prevFlags.HIMode is HIMode.HI # this is to save btagging to xAOD
     flags.Calo.TopoCluster.skipWriteList = [
-        "CaloCalTopoClusters", "CaloTopoClusters"]
-    flags.Egamma.doForward = False
-    flags.Calo.FwdTower.WriteToAOD = False
-    flags.HeavyIon.Egamma.doSubtractedClusters = True
-    flags.HeavyIon.Jet.ApplyTowerEtaPhiCorrection = True
-    flags.HeavyIon.Jet.HarmonicsForSubtraction = [2, 3, 4]
-    flags.HeavyIon.Jet.SeedPtMin = 25000
-    flags.HeavyIon.Jet.RecoOutputPtMin = 25000
-    flags.HeavyIon.Jet.TrackJetPtMin = 7000
+        "CaloCalTopoClusters", "CaloTopoClusters"] #if prevFlags.HIMode is HIMode.HI
+    flags.Egamma.doForward = False  # and prevFlags.HIMode is not HIMode.HI)
+    flags.Calo.FwdTower.WriteToAOD = False  # ..and prevFlags.HIMode is not HIMode.HI
+    flags.HeavyIon.Egamma.doSubtractedClusters = True #prevFlags.HIMode is HIMode.HI
+    flags.HeavyIon.Jet.ApplyTowerEtaPhiCorrection = True #lambda prevFlags: prevFlags.HIMode is HIMode.HI)
+    flags.HeavyIon.Jet.HarmonicsForSubtraction = [2, 3, 4] #if prevFlags.HIMode is HIMode.HI else []))
+    flags.HeavyIon.Jet.SeedPtMin = 25000 # if prevFlags.HIMode is HIMode.HI else 8000))
+    flags.HeavyIon.Jet.RecoOutputPtMin = 25000 #if prevFlags.HIMode is HIMode.HI else 8000))
+    flags.HeavyIon.Jet.TrackJetPtMin = 7000#if prevFlags.HIMode is HIMode.HI else 4000))
 
 
 def _HIP_UPC_common(flags):
     _HIcommon(flags)
-    flags.Reco.EnableTau = True
-    flags.Reco.EnableJet = True
-    flags.Reco.EnableMet = True
-    flags.Jet.WriteToAOD = True  # this is to save "standard" jets and btagging to xAOD
-    flags.MET.WritetoAOD = True
-    flags.HeavyIon.Egamma.doSubtractedClusters = False
-    flags.HeavyIon.Jet.ApplyTowerEtaPhiCorrection = False
-    flags.HeavyIon.Jet.HarmonicsForSubtraction = []
-    flags.HeavyIon.Jet.SeedPtMin = 8000
-    flags.HeavyIon.Jet.RecoOutputPtMin = 8000
-    flags.HeavyIon.Jet.TrackJetPtMin = 4000
+    flags.Reco.EnableTau = True  #anyway dependent of jet
+    flags.Reco.EnableJet = True  #..and prevFlags.HIMode is not HIMode.HI
+    flags.Reco.EnableMet = True  #anyway dependent of jet
+    flags.Jet.WriteToAOD = True  # this is to save "standard" jets and btagging to xAOD prevFlags.Reco.HIMode in [HIMode.HI,HIMode.UPC,HIMode.HIP )
+    flags.MET.WritetoAOD = True  #prevFlags.Reco.HIMode in [HIMode.HI,HIMode.UPC,HIMode.HIP )
+    flags.HeavyIon.Egamma.doSubtractedClusters = False #lambda prevFlags: prevFlags.HIMode is HIMode.HI)
+    flags.HeavyIon.Jet.ApplyTowerEtaPhiCorrection = False #lambda prevFlags: prevFlags.HIMode is HIMode.HI)
+    flags.HeavyIon.Jet.HarmonicsForSubtraction = [] #if prevFlags.HIMode is HIMode.HI else
+    flags.HeavyIon.Jet.SeedPtMin = 8000 #if prevFlags.HIMode is HIMode.HI else
+    flags.HeavyIon.Jet.RecoOutputPtMin = 8000 #if prevFlags.HIMode is HIMode.HI else
+    flags.HeavyIon.Jet.TrackJetPtMin = 4000 #if prevFlags.HIMode is HIMode.HI else
 
 
 def HIPmode(flags):
     _HIP_UPC_common(flags)
     # HIP dedicated flags
-    flags.Tracking.doHIP = True
+    flags.Tracking.doHIP = True #Now AutoConfig
 
 
 def UPCmode(flags):
     _HIP_UPC_common(flags)
     # UPC dedicated flags
-    flags.Tracking.doUPC = True
-    flags.Egamma.doLowMu = True
-    flags.HeavyIon.Jet.WriteHIClusters = False
+    flags.Tracking.doUPC = True # prevFlags.Reco.HIMode is HIMode.UPC)
+    flags.Egamma.doLowMu = True # prevFlags.Reco.HIMode is HIMode.UPC)
+    flags.HeavyIon.Jet.WriteHIClusters = False #prevFlags.HIMode is not UPC

Reconstruction/HeavyIonRec/HIRecConfig/python/HIRecConfigFlags.py

 # Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.AthConfigFlags import AthConfigFlags
-
+from AthenaConfiguration.Enums import HIMode
 
 def createHIRecConfigFlags():
   flags=AthConfigFlags()
@@ -12,19 +12,19 @@ def createHIRecConfigFlags():
 
   flags.addFlag("HeavyIon.doJet", True)
   flags.addFlag("HeavyIon.Jet.doTrackJetSeed", True)
-  flags.addFlag("HeavyIon.Jet.ApplyTowerEtaPhiCorrection", True)
-  flags.addFlag("HeavyIon.Jet.HarmonicsForSubtraction", [2, 3, 4])
-  flags.addFlag("HeavyIon.Jet.SeedPtMin", 25000)
-  flags.addFlag("HeavyIon.Jet.RecoOutputPtMin", 25000)
-  flags.addFlag("HeavyIon.Jet.TrackJetPtMin", 7000)
+  flags.addFlag("HeavyIon.Jet.ApplyTowerEtaPhiCorrection", lambda prevFlags: prevFlags.Reco.HIMode is HIMode.HI)
+  flags.addFlag("HeavyIon.Jet.HarmonicsForSubtraction", lambda prevFlags: [2, 3, 4] if prevFlags.Reco.HIMode is HIMode.HI else [])
+  flags.addFlag("HeavyIon.Jet.SeedPtMin", lambda prevFlags: 25000 if prevFlags.Reco.HIMode is HIMode.HI else 8000)
+  flags.addFlag("HeavyIon.Jet.RecoOutputPtMin", lambda prevFlags: 25000 if prevFlags.Reco.HIMode is HIMode.HI else 8000)
+  flags.addFlag("HeavyIon.Jet.TrackJetPtMin", lambda prevFlags: 7000 if prevFlags.Reco.HIMode is HIMode.HI else 4000)
   flags.addFlag("HeavyIon.Jet.HIClusterGeoWeightFile", "auto")
   flags.addFlag("HeavyIon.Jet.ClusterKey", "HIClusters")
   flags.addFlag("HeavyIon.Jet.Internal.ClusterKey", "HIClusters_temp")
-  flags.addFlag("HeavyIon.Jet.WriteHIClusters", True)
+  flags.addFlag("HeavyIon.Jet.WriteHIClusters", lambda prevFlags: prevFlags.Reco.HIMode is not HIMode.UPC)
   flags.addFlag("HeavyIon.Jet.RValues", [2,4])#this are the R's we want to reconstruct
   flags.addFlag("HeavyIon.Jet.CaliRValues", ["2","3","4","10"])#this are the R's that are supported for calibration, if not listed then cali R=0.4 is picked
 
-  flags.addFlag("HeavyIon.Egamma.doSubtractedClusters", lambda prevFlags: prevFlags.Reco.EnableHI)
+  flags.addFlag("HeavyIon.Egamma.doSubtractedClusters", lambda prevFlags: prevFlags.Reco.HIMode is HIMode.HI)
   flags.addFlag("HeavyIon.Egamma.EventShape", "HIEventShape_iter_egamma")
   flags.addFlag("HeavyIon.Egamma.SubtractedCells", "SubtractedCells")
   flags.addFlag("HeavyIon.Egamma.UncalibCaloTopoCluster", "SubtractedCaloTopoClusters")

Reconstruction/Jet/JetRecConfig/python/JetConfigFlags.py

-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.AthConfigFlags import AthConfigFlags
+from AthenaConfiguration.Enums import HIMode
 
 def createJetConfigFlags():
     flags = AthConfigFlags()
 
     flags.addFlag("Jet.doUpstreamDependencies", False)
-    flags.addFlag("Jet.WriteToAOD", False)
+    flags.addFlag("Jet.WriteToAOD", 
+                  lambda prevFlags: prevFlags.Reco.HIMode in [HIMode.HI,HIMode.UPC,HIMode.HIP] )
     flags.addFlag("Jet.useCalibJetThreshold", True)
 
     return flags

Reconstruction/MET/METReconstruction/python/METConfigFlags.py

-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.AthConfigFlags import AthConfigFlags
-
+from AthenaConfiguration.Enums import HIMode
 def createMETConfigFlags():
     metConfigFlags=AthConfigFlags()
     metConfigFlags.addFlag("MET.UseTracks",True)
     metConfigFlags.addFlag("MET.DoPFlow",True)
     metConfigFlags.addFlag("MET.UseFELinks",True)
-    metConfigFlags.addFlag("MET.WritetoAOD",False)
-    return metConfigFlags
\ No newline at end of file
+    metConfigFlags.addFlag("MET.WritetoAOD", 
+                           lambda prevFlags: prevFlags.Reco.HIMode in [HIMode.UPC,HIMode.HIP])
+    return metConfigFlags

Reconstruction/RecJobTransforms/python/RecoConfigFlags.py

 # Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 from AthenaConfiguration.AthConfigFlags import AthConfigFlags
-
+from AthenaConfiguration.Enums import HIMode
 _all_domains = [
     "Trigger",
     "BeamSpotDecoration",
@@ -72,12 +72,15 @@ def createRecoConfigFlags():
         and prevFlags.Reco.EnableTracking
         and prevFlags.Reco.EnableEgamma
         and prevFlags.Reco.EnableCombinedMuon
-        and prevFlags.Reco.EnablePFlow))
+        and prevFlags.Reco.EnablePFlow
+        and prevFlags.Reco.HIMode is not HIMode.HI))
+
     # Enable Tau Reconstruction
     flags.addFlag("Reco.EnableTau", lambda prevFlags: prevFlags.Reco.EnableJet)
     # Enable BTagging Reconstruction
     flags.addFlag("Reco.EnableBTagging",
-                  lambda prevFlags: prevFlags.Reco.EnableJet)
+                  lambda prevFlags: prevFlags.Reco.EnableJet or 
+                   prevFlags.HeavyIon.doJet) 
     # Enable MET Reconstruction
     flags.addFlag("Reco.EnableMet", lambda prevFlags: (
         prevFlags.Reco.EnableJet
@@ -96,7 +99,8 @@ def createRecoConfigFlags():
                   prevFlags.Reco.EnableTracking)
     # Enable creation of "Rings" of calorimeter cells
     flags.addFlag("Reco.EnableCaloRinger",
-                  lambda prevFlags: prevFlags.Reco.EnableEgamma)
+                  lambda prevFlags: prevFlags.Reco.EnableEgamma and 
+                  not prevFlags.Reco.EnableHI)
 
     # This flags enables trigger data decoding (not trigger simulation)
     # EDMVersion > 0 check prevents this flag being true in jobs before
@@ -106,7 +110,9 @@ def createRecoConfigFlags():
 
     # enable automatically for HI data
     flags.addFlag("Reco.EnableHI",
-                  lambda prevFlags: "_hi" in prevFlags.Input.ProjectName)
+                  lambda prevFlags: prevFlags.Reco.HIMode is not HIMode.pp)
+
+    flags.addFlag("Reco.HIMode", _hiModeChoice, enum=HIMode)
 
     # Enable alg for decorating EventInfo with BeamSpot info
     # (maybe not always available for calibration runs, etc)
@@ -123,7 +129,9 @@ def createRecoConfigFlags():
                   lambda prevFlags: prevFlags.Reco.EnablePostProcessing and
                   prevFlags.Detector.EnableCalo and
                   prevFlags.Output.doWriteAOD and
-                  prevFlags.Calo.Thin.NegativeEnergyCaloClusters)
+                  prevFlags.Calo.Thin.NegativeEnergyCaloClusters and
+                  not prevFlags.Reco.EnableHI)
+
     flags.addFlag("Reco.PostProcessing.TRTAloneThinning",
                   lambda prevFlags: prevFlags.Reco.EnablePostProcessing and
                   prevFlags.Reco.EnableTracking and
@@ -213,3 +221,16 @@ def _recoZDC(prevFlags):
         maskbits=maskbits[0] #Check the first input file
         detMask=DetectorMask(maskbits & 0xFFFFFFFFFFFFFFFF, maskbits >> 64) #DetectorMask constructor swallows two 64bit ints
         return detMask.is_set(SubDetector.FORWARD_ZDC)
+
+
+
+def _hiModeChoice(prevFlags):
+
+    if ("_hip" in prevFlags.Input.ProjectName):
+        return HIMode.HIP
+    elif ("_hi" in prevFlags.Input.ProjectName):
+        if (prevFlags.Input.TriggerStream == "physics_UPC"):
+            return HIMode.UPC
+        else:
+            return HIMode.HI
+    return HIMode.pp

Reconstruction/RecoAlgs/IsolationAlgs/python/IsoToolsConfig.py

@@ -50,6 +50,17 @@ def EGammaCaloIsolationToolCfg(flags, **kwargs):
             phi_size=7,
             cells_name=flags.Egamma.Keys.Input.CaloCells)
         kwargs['CaloFillRectangularClusterTool'] = cfrc
+
+    # default is to read calocaltopoclusters.
+    # In HI, if subtracted clusters, use them instead, and do not do pu correction
+    if flags.HeavyIon.Egamma.doSubtractedClusters:
+        ccict = CompFactory.xAOD.CaloClustersInConeTool(
+            name="topoiso_CaloClustersInConeTool",
+            CaloClusterLocation=flags.Egamma.Keys.Input.TopoClusters)
+        kwargs['ClustersInConeTool'] = ccict
+        # No pileup correction, and do not save it
+        kwargs['InitializeReadHandles'] = False
+        kwargs['saveOnlyRequestedCorrections'] = True
         
     kwargs.setdefault('name','egCaloIsolationTool')
     kwargs.setdefault('ParticleCaloExtensionTool',None)
@@ -70,9 +81,17 @@ def MuonCaloIsolationToolCfg(flags, **kwargs):
         kwargs['FlowElementsInConeTool'] = CompFactory.xAOD.FlowElementsInConeTool(
             name='FlowElementsInConeTool')
 
-    from CaloIdentifier import SUBCALO 
-    kwargs.setdefault('EMCaloNums',[SUBCALO.LAREM])
-    kwargs.setdefault('HadCaloNums',[SUBCALO.LARHEC, SUBCALO.TILE])
+    # default is to read calocaltopoclusters.
+    # In HI, if subtracted clusters, use them instead, and do not do pu correction
+    if flags.HeavyIon.Egamma.doSubtractedClusters:
+        ccict = CompFactory.xAOD.CaloClustersInConeTool(
+            name="topoiso_CaloClustersInConeTool",
+            CaloClusterLocation=flags.Egamma.Keys.Input.TopoClusters)
+        kwargs['ClustersInConeTool'] = ccict
+        # No pileup correction, and do not save it
+        kwargs['InitializeReadHandles'] = False
+        kwargs['saveOnlyRequestedCorrections'] = True
+
     kwargs.setdefault('ParticleCaloCellAssociationTool',None)
     kwargs.setdefault('UseEtaDepPUCorr',False)
     kwargs.setdefault('name','muonCaloIsolationTool')

Reconstruction/RecoAlgs/IsolationAlgs/python/IsolationBuilderConfig.py

@@ -52,6 +52,9 @@ def egIsolationCfg(flags, name='egIsolation', **kwargs):
             [ isoPar.topoetcone20, isoPar.topoetcone30, isoPar.topoetcone40 ])
         isoCor.append(
             [ isoPar.core57cells, isoPar.ptCorrection, isoPar.pileupCorrection ])
+        # do not do pileup correction if HI with subtracted clusters
+        if flags.HeavyIon.Egamma.doSubtractedClusters:
+            isoCor[-1] = [ x for x in isoCor[-1] if x != isoPar.pileupCorrection ]
         isoExCor.append([])
         if 'CaloTopoIsolationTool' not in kwargs:
             kwargs['CaloTopoIsolationTool'] = acc.popToolsAndMerge(
@@ -96,6 +99,9 @@ def muIsolationCfg(flags, name='muIsolation', **kwargs):
         isoType.append(
             [ isoPar.topoetcone20, isoPar.topoetcone30, isoPar.topoetcone40 ])
         isoCor.append([ isoPar.coreCone, isoPar.pileupCorrection ])
+        # do not do pileup correction if HI with subtracted clusters
+        if flags.HeavyIon.Egamma.doSubtractedClusters:
+            isoCor[-1] = [ x for x in isoCor[-1] if x != isoPar.pileupCorrection ]
         isoExCor.append([])
         if ('CaloTopoIsolationTool' not in kwargs) or (
                 'PFlowIsolationTool' not in kwargs):
@@ -106,6 +112,10 @@ def muIsolationCfg(flags, name='muIsolation', **kwargs):
             isoType.append(
                 [ isoPar.neflowisol20, isoPar.neflowisol30, isoPar.neflowisol40 ])
             isoCor.append([ isoPar.coreCone, isoPar.pileupCorrection ])
+            # do not do pileup correction for HI reco...
+            # and pflow iso is more than experimental in such reco anyway
+            if flags.HeavyIon.Egamma.doSubtractedClusters:
+                isoCor[-1] = [ x for x in isoCor[-1] if x != isoPar.pileupCorrection ]
             isoExCor.append([])
             kwargs['PFlowIsolationTool'] = cisoTool