Merge branch 'eflowRec_fixTauLinks' into 'master'

Fixes for cluster links used by taus

See merge request !32082

Reconstruction/eflowRec/python/eflowRecFlags.py

@@ -121,6 +121,13 @@ class usePFEGammaPFOAssoc(JobProperty):
     allowedTypes = ['bool']
     StoredValue = False
 
+class provideShowerSubtractedClusters(JobProperty):
+    """ Flag to toggle provision of ElementLink to charged shower subtracted calorimeter clusters. Such links are added to
+    neutral PFO and we write out the relevant CaloClusterContainer to AOD such that the links remain valid """
+    statusOn = True
+    allowedTypes = ['bool']
+    StoredValue = False
+
 # Defines the container for the eflowRec flags
 
 class eflowRecFlags(JobPropertyContainer):
@@ -131,7 +138,7 @@ class eflowRecFlags(JobPropertyContainer):
 # add the flags container to the top container 
 jobproperties.add_Container(eflowRecFlags)
 
-eflowJobProperties = [eflowAlgType,CalType,useLocalHadWeightsOOCC,useOverLapShowerCells,useSplitShowers,useEEtaFirstInt,recoverIsolatedTracks,UseElectronHadronID,runTauMode, useLeptons,storeLeptonCells, useLCInput, useUpdated2015ChargedShowerSubtraction,useAODReductionClusterMomentList,useCalibHitTruth,usePFEGammaPFOAssoc]
+eflowJobProperties = [eflowAlgType,CalType,useLocalHadWeightsOOCC,useOverLapShowerCells,useSplitShowers,useEEtaFirstInt,recoverIsolatedTracks,UseElectronHadronID,runTauMode, useLeptons,storeLeptonCells, useLCInput, useUpdated2015ChargedShowerSubtraction,useAODReductionClusterMomentList,useCalibHitTruth,usePFEGammaPFOAssoc,provideShowerSubtractedClusters]
 
 for i in eflowJobProperties :
     jobproperties.eflowRecFlags.add_JobProperty(i)

Reconstruction/eflowRec/share/PFlowMTConfig.py

@@ -246,6 +246,9 @@ if jobproperties.eflowRecFlags.eflowAlgType == "EOverP":
    PFONeutralCreatorAlgorithm.PFOOutputName="EOverPNeutralParticleFlowObjects"
    PFONeutralCreatorAlgorithm.EOverPMode=True
 
+if True == jobproperties.eflowRecFlags.provideShowerSubtractedClusters:
+    PFONeutralCreatorAlgorithm.AddShowerSubtractedClusters = True
+
 topSequence += PFONeutralCreatorAlgorithm
 
 if jobproperties.eflowRecFlags.usePFEGammaPFOAssoc:

Reconstruction/eflowRec/share/eflowRecAODList.py

@@ -17,5 +17,7 @@ else:
     eflowRecAODList += [ "xAOD::PFOAuxContainer#JetETMissChargedParticleFlowObjectsAux."]
     eflowRecAODList += [ "xAOD::PFOAuxContainer#JetETMissNeutralParticleFlowObjectsAux."+excludeList]
 
-
+if True == jobproperties.eflowRecFlags.provideShowerSubtractedClusters:
+    eflowRecAODList += [ "xAOD::CaloClusterContainer#PFCaloCluster"]
+    eflowRecAODList += [ "xAOD::CaloClusterAuxContainer#PFCaloClusterAux."]
     

Reconstruction/eflowRec/share/eflowRecESDList.py

@@ -17,3 +17,7 @@ else:
     eflowRecESDList += [ "xAOD::PFOAuxContainer#JetETMissChargedParticleFlowObjectsAux."]
     eflowRecESDList += [ "xAOD::PFOAuxContainer#JetETMissNeutralParticleFlowObjectsAux."+excludeList]
 
+if True == jobproperties.eflowRecFlags.provideShowerSubtractedClusters:
+    eflowRecESDList += [ "xAOD::CaloClusterContainer#PFCaloCluster"]
+    eflowRecESDList += [ "xAOD::CaloClusterAuxContainer#PFCaloClusterAux."]
+

Reconstruction/eflowRec/src/eflowRecCluster.cxx

@@ -19,6 +19,7 @@ eflowRecCluster::eflowRecCluster(const ElementLink<xAOD::CaloClusterContainer>&
   const xAOD::CaloCluster* originalCluster = *clusElementLink;
   m_cluster = new xAOD::CaloCluster();
   newClusContainer.push_back(m_cluster);
+  m_clusElementLink = ElementLink<xAOD::CaloClusterContainer>(newClusContainer,newClusContainer.size()-1);
 
   const CaloClusterCellLink* theOldCellLinks = originalCluster->getCellLinks();