diff --git a/Hlt/RecoConf/python/RecoConf/calorimeter_reconstruction.py b/Hlt/RecoConf/python/RecoConf/calorimeter_reconstruction.py index 19246727c7174b60acd55057d55a4ca69d58ad4e..3cc62a3de4d5c81e31dc5f76b991b773b0710c5c 100644 --- a/Hlt/RecoConf/python/RecoConf/calorimeter_reconstruction.py +++ b/Hlt/RecoConf/python/RecoConf/calorimeter_reconstruction.py @@ -112,10 +112,10 @@ def make_digits(calo_raw_bank=True): return {"digitsEcal": digitsEcal, "digitsHcal": digitsHcal} -def make_correction_base_tool(condPath): +def make_correction_base_tool(condPath, name): from PyConf.Tools import CaloFutureCorrectionBase - return CaloFutureCorrectionBase(ConditionName=condPath) + return CaloFutureCorrectionBase(ConditionName=condPath, name=name) def make_covariance_matrix_tool( @@ -129,7 +129,9 @@ def make_covariance_matrix_tool( return FutureClusterCovarianceMatrixTool( name="EcalCovariance", ConditionName=condPath, - CorrectionBase=make_correction_base(condPath), + CorrectionBase=make_correction_base( + condPath, name="CorrectionBase_EcalCovariance" + ), ) @@ -144,7 +146,9 @@ def make_subCluster_selector_tool( return FutureSubClusterSelectorTool( name="EcalClusterTag", ConditionName=condPath, - CaloFutureCorrectionBase=make_correction_base(condPath), + CaloFutureCorrectionBase=make_correction_base( + condPath, name="CorrectionBase_EcalClusterTag" + ), ) @@ -159,7 +163,9 @@ def make_shower_overlap_tool( return CaloFutureShowerOverlapTool( name="SplitPhotonShowerOverlap", Profile=condPath, - CaloFutureCorrectionBase=make_correction_base(condPath), + CaloFutureCorrectionBase=make_correction_base( + condPath, name="CorrectionBase_SplitPhotonShowerOverlap" + ), CaloFutureSCorrection=CaloFutureSCorrection( ConditionName=ecalCorrectionPath("SplitPhoton", "S"), ), @@ -262,23 +268,29 @@ def make_photons_and_electrons(clusters, matchtable, matchclassifier, pvs): PrimaryVertices=pvs, PhotonCorrection=[ CaloFutureECorrection( + name="ECorrectionPhoton", ConditionName=ecalCorrectionPath("Photon", "E"), ), CaloFutureSCorrection( + name="SCorrectionPhoton", ConditionName=ecalCorrectionPath("Photon", "S"), ), CaloFutureLCorrection( + name="LCorrectionPhoton", ConditionName=ecalCorrectionPath("Photon", "L"), ), ], ElectronCorrection=[ CaloFutureECorrection( + name="ECorrectionElectron", ConditionName=ecalCorrectionPath("Electron", "E"), ), CaloFutureSCorrection( + name="SCorrectionElectron", ConditionName=ecalCorrectionPath("Electron", "S"), ), CaloFutureLCorrection( + name="LCorrectionElectron", ConditionName=ecalCorrectionPath("Electron", "L"), ), ], @@ -413,12 +425,15 @@ def make_track_electron_and_brem_matching( fillResidual=fill_residual_clusters_for_brem, PhotonCorrection=[ CaloFutureECorrection( + name="ECorrectionBremPhoton", ConditionName=ecalCorrectionPath("Photon", "E"), ), CaloFutureSCorrection( + name="SCorrectionBremPhoton", ConditionName=ecalCorrectionPath("Photon", "S"), ), CaloFutureLCorrection( + name="LCorrectionBremPhoton", ConditionName=ecalCorrectionPath("Photon", "L"), ), ], @@ -537,12 +552,15 @@ def make_merged_pi0(ecalClusters, pvs, maxIterations=25, applyLSCorr=True): PrimaryVertices=pvs, PhotonTools=[ CaloFutureECorrection( + name="ECorrectionSplitPhoton", ConditionName=ecalCorrectionPath("SplitPhoton", "E"), ), CaloFutureSCorrection( + name="SCorrectionSplitPhoton", ConditionName=ecalCorrectionPath("SplitPhoton", "S"), ), CaloFutureLCorrection( + name="LCorrectionSplitPhoton", ConditionName=ecalCorrectionPath("SplitPhoton", "L"), ), ],