From ebe72da686d96c50de3f40b7e6ee51ae3bc2912b Mon Sep 17 00:00:00 2001
From: Edward Moyse <edward.moyse@cern.ch>
Date: Thu, 6 Feb 2020 17:51:42 +0000
Subject: [PATCH] Revert "Merge branch 'master-npetters-newcutsandvertex' into
'master'"
This reverts merge request !30116
---
.../InDetRecExample/python/InDetJobProperties.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
index 1d04eab72a2..c60eb52f8cf 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from __future__ import print_function
@@ -309,7 +309,7 @@ class cutLevel(InDetFlagsJobProperty):
statusOn = True
allowedTypes = ['int']
allowedValues= [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16]
- StoredValue = 16
+ StoredValue = 14
class doBremRecovery(InDetFlagsJobProperty):
"""Turn on running of Brem Recover in tracking"""
@@ -615,7 +615,7 @@ class primaryVertexSetup(InDetFlagsJobProperty):
statusOn = True
allowedTypes = ['str']
allowedValues= [ 'AdaptiveMultiFinding', 'IterativeFinding', 'AdaptiveFinding', 'DefaultFastFinding', 'DefaultFullFinding', 'DefaultKalmanFinding', 'DefaultAdaptiveFinding', 'DefaultVKalVrtFinding', 'DummyVxFinder', 'MedImgMultiFinding', 'GaussIterativeFinding', 'GaussAdaptiveMultiFinding' ]
- StoredValue = 'GaussAdaptiveMultiFinding'
+ StoredValue = 'IterativeFinding'
class primaryVertexCutSetup(InDetFlagsJobProperty):
""" string to store the type of cuts to be used in PV reconstruction: 'Offline', 'IBL', 'SLHC' 'HeavyIon' """
@@ -1642,7 +1642,7 @@ class InDetJobProperties(JobPropertyContainer):
self.checkThenSet(self.priVtxCutLevel , 1 )
else:
# --- vertexing setup is the pileup one now (if not set already above)
- self.checkThenSet(self.primaryVertexSetup , "GaussAdaptiveMultiFinding")
+ self.checkThenSet(self.primaryVertexSetup , "IterativeFinding")
self.checkThenSet(self.primaryVertexCutSetup, "Offline")
# --- turn off brem reco for non collision reconstruction
--
GitLab