Merge pull request #12807 from diguida/dropCondDBv1_AlCa

Dropped references to CondDBv1 in Configuration.

Author: davidlange6

Configuration/AlCa/python/GlobalTag_condDBv1.py

@@ -26,7 +26,6 @@ class Options:
 defaultOptions.geometryExtendedOptions = ['ExtendedGFlash','Extended','NoCastor']
 defaultOptions.magField = ''
 defaultOptions.conditions = None
-defaultOptions.useCondDBv1 = False
 defaultOptions.scenarioOptions=['pp','cosmics','nocoll','HeavyIons']
 defaultOptions.harvesting= 'AtRunEnd'
 defaultOptions.gflash = False
@@ -798,19 +797,9 @@ def addConditions(self):
 		self._options.conditions = self._options.conditions.replace("FrontierConditions_GlobalTag,",'')
 
         self.loadAndRemember(self.ConditionsDefaultCFF)
-
-	if self._options.useCondDBv1:
-		from Configuration.AlCa.GlobalTag_condDBv1 import GlobalTag
-	else:
-		from Configuration.AlCa.GlobalTag import GlobalTag
-
+        from Configuration.AlCa.GlobalTag import GlobalTag
         self.process.GlobalTag = GlobalTag(self.process.GlobalTag, self._options.conditions, self._options.custom_conditions)
-
-	if self._options.useCondDBv1:
-	        self.additionalCommands.append('from Configuration.AlCa.GlobalTag_condDBv1 import GlobalTag')
-	else:
-	        self.additionalCommands.append('from Configuration.AlCa.GlobalTag import GlobalTag')
-
+        self.additionalCommands.append('from Configuration.AlCa.GlobalTag import GlobalTag')
         self.additionalCommands.append('process.GlobalTag = GlobalTag(process.GlobalTag, %s, %s)' % (repr(self._options.conditions), repr(self._options.custom_conditions)))
 
 	if self._options.slhc:
@@ -938,10 +927,7 @@ def define_Configs(self):
         self.HARVESTINGDefaultCFF="Configuration/StandardSequences/Harvesting_cff"
         self.ALCAHARVESTDefaultCFF="Configuration/StandardSequences/AlCaHarvesting_cff"
         self.ENDJOBDefaultCFF="Configuration/StandardSequences/EndOfProcess_cff"
-        if self._options.useCondDBv1:
-	    self.ConditionsDefaultCFF = "Configuration/StandardSequences/FrontierConditions_GlobalTag_condDBv1_cff"
-	else:
-            self.ConditionsDefaultCFF = "Configuration/StandardSequences/FrontierConditions_GlobalTag_cff"
+        self.ConditionsDefaultCFF = "Configuration/StandardSequences/FrontierConditions_GlobalTag_cff"
         self.CFWRITERDefaultCFF = "Configuration/StandardSequences/CrossingFrameWriter_cff"
         self.REPACKDefaultCFF="Configuration/StandardSequences/DigiToRaw_Repack_cff"
 

Configuration/AlCa/python/autoCond_condDBv1.py

@@ -34,12 +34,6 @@
                   default=None,
                   dest="conditions")
 
-parser.add_option("--useCondDBv1",
-                  help="use conditions DB V1",
-                  action="store_false",
-                  default=False,
-                  dest="useCondDBv1")
-
 parser.add_option("--eventcontent",
                   help="What event content to write out. Default=FEVTDEBUG, or FEVT (for cosmics)",
                   default='RECOSIM',