Merge pull request #7654 from cms-sw/revert-7613-revert_to_conddb1

Revert "go back to conddb1 as default"
cms-sw · Feb 10, 2015 · b0ed23c · b0ed23c
2 parents 0c260b0 + eff5796
commit b0ed23c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Configuration/Applications/python/Options.py b/Configuration/Applications/python/Options.py
@@ -34,10 +34,10 @@
                   default=None,
                   dest="conditions")
 
-parser.add_option("--useCondDBv2",
-                  help="use conditions DB V2",
+parser.add_option("--useCondDBv1",
+                  help="use conditions DB V1",
                   action="store_false",
-                  default=True,
+                  default=False,
                   dest="useCondDBv1")
 
 parser.add_option("--eventcontent",

diff --git a/Configuration/PyReleaseValidation/python/ConfigBuilder.py b/Configuration/PyReleaseValidation/python/ConfigBuilder.py
@@ -23,7 +23,7 @@ class Options:
 defaultOptions.geometryExtendedOptions = ['ExtendedGFlash','Extended','NoCastor']
 defaultOptions.magField = '38T'
 defaultOptions.conditions = None
-defaultOptions.useCondDBv1 = True
+defaultOptions.useCondDBv1 = False
 defaultOptions.scenarioOptions=['pp','cosmics','nocoll','HeavyIons']
 defaultOptions.harvesting= 'AtRunEnd'
 defaultOptions.gflash = False