diff --git a/Reconstruction/egamma/egammaRec/python/egammaRecFlags.py b/Reconstruction/egamma/egammaRec/python/egammaRecFlags.py index 4667e9465606adeccac3582c4b2820f16124b9e6..8b2425563986febd35588cef08cc426238dac9ea 100755 --- a/Reconstruction/egamma/egammaRec/python/egammaRecFlags.py +++ b/Reconstruction/egamma/egammaRec/python/egammaRecFlags.py @@ -59,8 +59,16 @@ class doBremFinding (egammaRecFlagsJobProperty): allowedTypes = ['bool'] StoredValue = True -# Other options +class doVertexBuilding (egammaRecFlagsJobProperty): + """ switch for whether to do the conversion vertex building + """ + statusOn = True + allowedTypes = ['bool'] + StoredValue = True + + +# Other options class doEgammaTruthAssociation (JobProperty): """ switch for truth association alg @@ -144,7 +152,7 @@ jobproperties.add_Container(egammaRecFlags) # I want always the following flags in the container _list_Egamma = [Enabled, doEgammaCaloSeeded, doEgammaForwardSeeded, - doBremFinding, doConversions, + doBremFinding, doVertexBuilding, doConversions, cellContainerName, doEgammaTruthAssociation, clusterCorrectionVersion, calibMVAVersion, doSuperclusters, inputTopoClusterCollection, egammaTopoClusterCollection] diff --git a/Reconstruction/egamma/egammaRec/share/egammaRec_jobOptions.py b/Reconstruction/egamma/egammaRec/share/egammaRec_jobOptions.py index d7edb912d2562dbb92f8010675075ab398af7838..1404a2e29c2594cf969283f93529f6c89b7afabc 100755 --- a/Reconstruction/egamma/egammaRec/share/egammaRec_jobOptions.py +++ b/Reconstruction/egamma/egammaRec/share/egammaRec_jobOptions.py @@ -18,13 +18,12 @@ if not rec.doTruth(): # GSF and vertex building need the inner detector if not DetFlags.detdescr.ID_on(): jobproperties.egammaRecFlags.doBremFinding = False - jobproperties.egammaRecFlags.doConversions = False + jobproperties.egammaRecFlags.doVertexBuilding = False # We can not run without having the Calo if not (rec.readESD() or jobproperties.CaloRecFlags.doCaloTopoCluster()): jobproperties.egammaRecFlags.doEgammaCaloSeeded = False jobproperties.egammaRecFlags.doEgammaForwardSeeded = False - # Function to schedule the GSF @@ -68,7 +67,7 @@ def setupVertices(): treatException( "Could not set up the conversion vertex building." "Switch vertex building off !") - jobproperties.egammaRecFlags.doConversions = False + jobproperties.egammaRecFlags.doVertexBuilding = False # Function to schedule the Topo cluster based egamma @@ -115,7 +114,7 @@ def setupTruthAssociation(): if jobproperties.egammaRecFlags.doBremFinding(): setupGSF() -if jobproperties.egammaRecFlags.doConversions(): +if jobproperties.egammaRecFlags.doVertexBuilding(): setupVertices() if jobproperties.egammaRecFlags.doEgammaCaloSeeded():