Commit 4fd3530b authored by scott snyder's avatar scott snyder
Browse files

Improve names

parent 4d457f84
......@@ -32,9 +32,9 @@ _clusterTypes = dict(
)
# Configure non-supercell corrections
def configureCellClusterCorrections(swTool):
"Add attributes ClusterCorrectionToolsXX to egammaSwTool object for non-supercell corrections."
# Configure fixed-size (non-supercell) corrections
def configureFixedSizeClusterCorrections(swTool):
"Add attributes ClusterCorrectionToolsXX to egammaSwTool object for fixed-size cluster corrections."
from CaloClusterCorrection.CaloSwCorrections import (
make_CaloSwCorrections, rfac, etaoff_b1, etaoff_e1,
etaoff_b2, etaoff_e2, phioff_b2, phioff_e2, update,
......@@ -53,9 +53,9 @@ def configureCellClusterCorrections(swTool):
setattr(swTool, x, _process_tools(swTool, y))
# Configure supercell corrections
def configureSuperCellClusterCorrections(swTool):
"Add attributes ClusterCorrectionToolsXX to egammaSwTool object for supercell corrections."
# Configure corrections for superclusters.
def configureSuperClusterCorrections(swTool):
"Add attributes ClusterCorrectionToolsXX to egammaSwTool object for corrections for superclusters."
from CaloClusterCorrection.CaloSwCorrections import (
make_CaloSwCorrections, rfac, etaoff_b1, etaoff_e1,
etaoff_b2, etaoff_e2, phioff_b2, phioff_e2, update,
......@@ -90,17 +90,17 @@ def configureSuperCellClusterCorrections(swTool):
def configureClusterCorrections(swTool):
"Add attributes ClusterCorrectionToolsXX to egammaSwTool object"
configureCellClusterCorrections(swTool)
configureFixedSizeClusterCorrections(swTool)
if jobproperties.egammaRecFlags.doSuperclusters():
configureSuperCellClusterCorrections(swTool)
configureSuperClusterCorrections(swTool)
egammaSwTool = ToolFactory(egammaToolsConf.egammaSwTool,
postInit=[configureClusterCorrections])
egammaSwSuperCellTool = ToolFactory(egammaToolsConf.egammaSwTool,
postInit=[configureSuperCellClusterCorrections])
egammaSwSuperClusterTool = ToolFactory(egammaToolsConf.egammaSwTool,
postInit=[configureSuperClusterCorrections])
EMClusterTool = ToolFactory(
......
......@@ -20,7 +20,7 @@ from CaloIdentifier import SUBCALO
# Egamma imports
from egammaRec.Factories import ToolFactory
from egammaTools.egammaToolsFactories import egammaToolsConf, egammaSwSuperCellTool, egammaMVASvc, EMFourMomBuilder, PhotonPIDBuilder, ElectronPIDBuilder
from egammaTools.egammaToolsFactories import egammaToolsConf, egammaSwSuperClusterTool, egammaMVASvc, EMFourMomBuilder, PhotonPIDBuilder, ElectronPIDBuilder
from egammaTrackTools.egammaTrackToolsFactories import EMExtrapolationTools
# Load TrigEgammaKeys where we store the container names and other TrigEgamma configuration values
......@@ -65,7 +65,7 @@ TrigEMClusterTool = ToolFactory(egammaToolsConf.EMClusterTool,
name = 'TrigEMClusterTool',
OutputClusterContainerName = TrigEgammaKeys.TrigEMClusterToolOutputContainer,
OutputTopoSeededClusterContainerName = TrigEgammaKeys.outputTopoSeededClusterKey,
ClusterCorrectionTool = egammaSwSuperCellTool,
ClusterCorrectionTool = egammaSwSuperClusterTool,
doSuperCluster = True,
MVACalibSvc = egammaMVASvc
)
......
......@@ -17,7 +17,7 @@ from TriggerMenuMT.HLTMenuConfig.Egamma.EgammaDefs import TrigEgammaKeys
from TriggerMenuMT.HLTMenuConfig.Egamma.TrigEgammaFactories import TrigEMClusterTool, TrigEMTrackMatchBuilder, TrigEMShowerBuilder, TrigEgammaDecorationTools
""" Importing all the tool components """
from egammaTools.egammaToolsFactories import egammaSwSuperCellTool, egammaMVASvc, EGammaAmbiguityTool
from egammaTools.egammaToolsFactories import egammaSwSuperClusterTool, egammaMVASvc, EGammaAmbiguityTool
from egammaAlgs import egammaAlgsConf
from egammaRec.Factories import AlgFactory, FcnWrapper
......@@ -38,7 +38,7 @@ TrigElectronSuperClusterBuilder = AlgFactory( egammaAlgsConf.electronSuperCluste
name = 'TrigElectronSuperClusterBuilder',
InputEgammaRecContainerName = TrigEgammaKeys.EgammaRecKey,
SuperElectronRecCollectionName = TrigEgammaKeys.SuperElectronRecCollectionName,
ClusterCorrectionTool=egammaSwSuperCellTool,
ClusterCorrectionTool=egammaSwSuperClusterTool,
MVACalibSvc=egammaMVASvc,
EtThresholdCut=1000,
TrackMatchBuilderTool = TrigEMTrackMatchBuilder,
......
......@@ -13,7 +13,7 @@ Offline configurations are available here:
from egammaAlgs import egammaAlgsConf
from egammaRec.Factories import AlgFactory, FcnWrapper
from egammaTools.egammaToolsFactories import egammaSwSuperCellTool, egammaMVASvc, EGammaAmbiguityTool
from egammaTools.egammaToolsFactories import egammaSwSuperClusterTool, egammaMVASvc, EGammaAmbiguityTool
# Tools and funtions from TrigEgammaFactories
from TriggerMenuMT.HLTMenuConfig.Egamma.TrigEgammaFactories import TrigEMClusterTool, TrigEMShowerBuilder ,TrigEgammaDecorationTools, TrigPhotonDecorationTools, TrigEMTrackMatchBuilder
......@@ -45,7 +45,7 @@ TrigPhotonSuperClusterBuilder = AlgFactory( egammaAlgsConf.photonSuperClusterBui
name = 'TrigPhotonSuperClusterBuilder',
InputEgammaRecContainerName=TrigEgammaKeys.EgammaRecKey,
SuperPhotonRecCollectionName=TrigEgammaKeys.SuperPhotonRecCollectionName,
ClusterCorrectionTool=egammaSwSuperCellTool,
ClusterCorrectionTool=egammaSwSuperClusterTool,
MVACalibSvc= egammaMVASvc,
doConversions = False,
AddClustrsMatchingVtxTracks = False,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment