remove illegal nested parameters in DBParameters

mmusich · mmusich · commit 667478164825 · 2025-04-12T13:31:13.000+02:00
diff --git a/Alignment/LaserAlignment/test/laserAlignment.py b/Alignment/LaserAlignment/test/laserAlignment.py
@@ -38,7 +38,6 @@
 ## get the tracker alignment records from this file
 process.trackerAlignment = cms.ESSource( "PoolDBESSource",
   process.CondDBSetup,
-  timetype = cms.string( 'runnumber' ),
   toGet = cms.VPSet(
     cms.PSet(
       record = cms.string( 'TrackerAlignmentRcd' ),
diff --git a/Alignment/LaserAlignment/test/laserAlignment_sim.py b/Alignment/LaserAlignment/test/laserAlignment_sim.py
@@ -33,7 +33,6 @@
 ## get the tracker alignment records from this file
 process.trackerAlignment = cms.ESSource( "PoolDBESSource",
   process.CondDBSetup,
-  timetype = cms.string( 'runnumber' ),
   toGet = cms.VPSet(
     cms.PSet(
       record = cms.string( 'TrackerAlignmentRcd' ),
diff --git a/CalibCalorimetry/CastorCalib/test/castor_localrun_pedestals_cfg.py b/CalibCalorimetry/CastorCalib/test/castor_localrun_pedestals_cfg.py
@@ -72,9 +72,7 @@
 process.es_pool = cms.ESSource(
    "PoolDBESSource",
    process.CondDBSetup,
-   timetype = cms.string('runnumber'),
    connect = cms.string('frontier://cmsfrontier.cern.ch:8000/FrontierPrep/CMS_COND_30X_HCAL'),
-   authenticationMethod = cms.untracked.uint32(0),
    toGet = cms.VPSet(
        cms.PSet(
            record = cms.string('CastorPedestalsRcd'),
diff --git a/CalibMuon/CSCCalibration/python/CSC_BadChambers_cfi.py b/CalibMuon/CSCCalibration/python/CSC_BadChambers_cfi.py
@@ -3,7 +3,6 @@
 cscBadChambers = cms.ESSource("PoolDBESSource",
    DBParameters = cms.PSet(
        authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-       authenticationMethod = cms.untracked.uint32(1)
    ),
    toGet = cms.VPSet(cms.PSet(
        record = cms.string('CSCBadChambersRcd'),
diff --git a/CalibMuon/CSCCalibration/test/readConstantsFromDB_cfg.py b/CalibMuon/CSCCalibration/test/readConstantsFromDB_cfg.py
@@ -20,7 +20,6 @@
         )),
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-        authenticationMethod = cms.untracked.uint32(1)
     ),
 
     #read constants from DB
diff --git a/CalibMuon/CSCCalibration/test/readDBBadChambers_cfg.py b/CalibMuon/CSCCalibration/test/readDBBadChambers_cfg.py
@@ -17,7 +17,6 @@
     #connect =  cms.string("oracle://cms_orcoff_prep/CMS_COND_CSC"),
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-        authenticationMethod = cms.untracked.uint32(1)
     )
 )
 
diff --git a/CalibMuon/CSCCalibration/test/readDBBadStrips_cfg.py b/CalibMuon/CSCCalibration/test/readDBBadStrips_cfg.py
@@ -17,7 +17,6 @@
     #string connect = "oracle://cms_orcoff_int2r/CMS_COND_CSC"
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-        authenticationMethod = cms.untracked.uint32(1)
     )
 )
 
diff --git a/CalibMuon/CSCCalibration/test/readDBBadWires_cfg.py b/CalibMuon/CSCCalibration/test/readDBBadWires_cfg.py
@@ -18,7 +18,6 @@
     #string connect = "oracle://cms_orcoff_int2r/CMS_COND_CSC"
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-        authenticationMethod = cms.untracked.uint32(1)
     )
 )
 
diff --git a/CalibMuon/CSCCalibration/test/readDBChipSpeedCorrection_cfg.py b/CalibMuon/CSCCalibration/test/readDBChipSpeedCorrection_cfg.py
@@ -16,7 +16,6 @@
     #string connect="frontier://FrontierDev/CMS_COND_CSC"
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-        authenticationMethod = cms.untracked.uint32(1)
     )
 )
 
diff --git a/CalibMuon/CSCCalibration/test/readDBCrosstalk_cfg.py b/CalibMuon/CSCCalibration/test/readDBCrosstalk_cfg.py
@@ -16,7 +16,6 @@
     #string connect = "frontier://FrontierDev/CMS_COND_CSC"
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/nfshome0/popcondev/conddb/'),
-        authenticationMethod = cms.untracked.uint32(1)
     )
 )
 
diff --git a/CalibMuon/CSCCalibration/test/readDBGains_cfg.py b/CalibMuon/CSCCalibration/test/readDBGains_cfg.py
@@ -16,7 +16,6 @@
     #string connect="frontier://FrontierDev/CMS_COND_CSC"
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/nfshome0/popcondev/conddb/'),
-        authenticationMethod = cms.untracked.uint32(1)
     )
 )
 
diff --git a/CalibMuon/CSCCalibration/test/readDBGasGainCorrection_cfg.py b/CalibMuon/CSCCalibration/test/readDBGasGainCorrection_cfg.py
@@ -16,7 +16,6 @@
     #string connect="frontier://FrontierDev/CMS_COND_CSC"
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-        authenticationMethod = cms.untracked.uint32(1)
     )
 )
 
diff --git a/CalibMuon/CSCCalibration/test/readDBNoiseMatrix_cfg.py b/CalibMuon/CSCCalibration/test/readDBNoiseMatrix_cfg.py
@@ -16,7 +16,6 @@
     connect=cms.string("oracle://cms_orcon_prod/CMS_COND_31X_CSC"),
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/nfshome0/popcondev/conddb/'),
-        authenticationMethod = cms.untracked.uint32(1)
     )
 )
 
diff --git a/CalibMuon/CSCCalibration/test/readDBPedestals_cfg.py b/CalibMuon/CSCCalibration/test/readDBPedestals_cfg.py
@@ -14,7 +14,6 @@
     #string connect = "frontier://FrontierDev/CMS_COND_CSC"
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/nfshome0/popcondev/conddb/'),
-        authenticationMethod = cms.untracked.uint32(0)
     )
 )
 
diff --git a/CalibMuon/CSCCalibration/test/readL1TPParameters_cfg.py b/CalibMuon/CSCCalibration/test/readL1TPParameters_cfg.py
@@ -18,7 +18,6 @@
     connect = cms.string('oracle://cms_orcoff_int2r/CMS_COND_CSC'),
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-        authenticationMethod = cms.untracked.uint32(1)
     )
 )
 
diff --git a/CalibMuon/CSCCalibration/test/readNewVectorConstants_cfg.py b/CalibMuon/CSCCalibration/test/readNewVectorConstants_cfg.py
@@ -4,7 +4,6 @@
 process.PoolDBESSource = cms.ESSource("PoolDBESSource",
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-        authenticationMethod = cms.untracked.uint32(1)
     ),
     #bool loadAll = true
     toGet = cms.VPSet(cms.PSet(
diff --git a/CondFormats/CSCObjects/test/readBadChambers_cfg.py b/CondFormats/CSCObjects/test/readBadChambers_cfg.py
@@ -6,7 +6,6 @@
 process.PoolDBESSource = cms.ESSource("PoolDBESSource",
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-        authenticationMethod = cms.untracked.uint32(1)
     ),
     # For testing, sqlite database file expected to be in local directory 
     toGet = cms.VPSet(cms.PSet(
diff --git a/CondFormats/CSCObjects/test/readBadStrips_cfg.py b/CondFormats/CSCObjects/test/readBadStrips_cfg.py
@@ -7,7 +7,6 @@
 process.PoolDBESSource = cms.ESSource("PoolDBESSource",
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-        authenticationMethod = cms.untracked.uint32(1)
     ),
     # For testing, sqlite database file expected to be in local directory 
     toGet = cms.VPSet(cms.PSet(
diff --git a/CondFormats/CSCObjects/test/readBadWires_cfg.py b/CondFormats/CSCObjects/test/readBadWires_cfg.py
@@ -7,7 +7,6 @@
 process.PoolDBESSource = cms.ESSource("PoolDBESSource",
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-        authenticationMethod = cms.untracked.uint32(1)
     ),
     # For testing, sqlite database file expected to be in local directory 
     toGet = cms.VPSet(cms.PSet(
diff --git a/CondFormats/CSCObjects/test/readChamberIndex_cfg.py b/CondFormats/CSCObjects/test/readChamberIndex_cfg.py
@@ -4,7 +4,6 @@
 process.PoolDBESSource = cms.ESSource("PoolDBESSource",
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-        authenticationMethod = cms.untracked.uint32(1)
     ),
     #bool loadAll = true
     toGet = cms.VPSet(cms.PSet(
diff --git a/CondFormats/CSCObjects/test/readChamberMap_cfg.py b/CondFormats/CSCObjects/test/readChamberMap_cfg.py
@@ -4,7 +4,6 @@
 process.PoolDBESSource = cms.ESSource("PoolDBESSource",
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-        authenticationMethod = cms.untracked.uint32(1)
     ),
     #bool loadAll = true
     toGet = cms.VPSet(cms.PSet(
diff --git a/CondFormats/CSCObjects/test/readChamberTimeCorrections_cfg.py b/CondFormats/CSCObjects/test/readChamberTimeCorrections_cfg.py
@@ -10,7 +10,6 @@
 process.PoolDBESSource = cms.ESSource("PoolDBESSource",
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-        authenticationMethod = cms.untracked.uint32(1)
     ),
 #    loadAll = cms.bool(True),
     toGet = cms.VPSet(cms.PSet(
diff --git a/CondFormats/CSCObjects/test/readCrateMap_cfg.py b/CondFormats/CSCObjects/test/readCrateMap_cfg.py
@@ -4,7 +4,6 @@
 process.PoolDBESSource = cms.ESSource("PoolDBESSource",
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-        authenticationMethod = cms.untracked.uint32(1)
     ),
     #bool loadAll = true
     toGet = cms.VPSet(cms.PSet(
diff --git a/CondFormats/CSCObjects/test/readDCSData_cfg.py b/CondFormats/CSCObjects/test/readDCSData_cfg.py
@@ -4,7 +4,6 @@
 process.PoolDBESSource = cms.ESSource("PoolDBESSource",
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-        authenticationMethod = cms.untracked.uint32(1)
     ),
     #bool loadAll = true
     toGet = cms.VPSet(cms.PSet(
diff --git a/CondFormats/CSCObjects/test/readDDUMap_cfg.py b/CondFormats/CSCObjects/test/readDDUMap_cfg.py
@@ -10,7 +10,6 @@
 process.PoolDBESSource = cms.ESSource("PoolDBESSource",
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-        authenticationMethod = cms.untracked.uint32(1)
     ),
     #bool loadAll = true
     toGet = cms.VPSet(cms.PSet(
diff --git a/CondFormats/CSCObjects/test/testReadoutMap_cfg.py b/CondFormats/CSCObjects/test/testReadoutMap_cfg.py
@@ -4,7 +4,6 @@
 process.PoolDBESSource = cms.ESSource("PoolDBESSource",
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-        authenticationMethod = cms.untracked.uint32(1)
     ),
     toGet = cms.VPSet(cms.PSet(
         record = cms.string('CSCCrateMapRcd'),
diff --git a/CondTools/Hcal/test/dumpCastorCond_cfg.py b/CondTools/Hcal/test/dumpCastorCond_cfg.py
@@ -34,9 +34,7 @@
 process.es_pool = cms.ESSource(
    "PoolDBESSource",
    process.CondDBSetup,
-   timetype = cms.string('runnumber'),
     connect = cms.string('sqlite_fle:CastorSaturationCorrs.db'),
-authenticationMethod = cms.untracked.uint32(0),
    toGet = cms.VPSet(
        #cms.PSet(
 #           record = cms.string('CastorPedestalsRcd'),
diff --git a/CondTools/SiPixel/python/SiPixelGainCalibrationESSource_cfi.py b/CondTools/SiPixel/python/SiPixelGainCalibrationESSource_cfi.py
@@ -9,7 +9,6 @@
     DBParameters = cms.PSet(
         messageLevel = cms.untracked.int32(1),
         authenticationPath = cms.untracked.string('./'),
-        loadBlobStreamer = cms.untracked.bool(True)
     )
 )
 
diff --git a/CondTools/SiStrip/test/db_tree_dump.py b/CondTools/SiStrip/test/db_tree_dump.py
@@ -121,13 +121,11 @@ def best_match(rcd):
     print("overriding using local conditions: %s" %records)
     process.poolDBESSource = cms.ESSource(
         "PoolDBESSource",
-        BlobStreamerName = cms.untracked.string('TBufferBlobStreamingService'),
         DBParameters = cms.PSet(
             messageLevel = cms.untracked.int32(1),  # it used to be 2
             authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb')
             ),
         #DumpStat = cms.untracked.bool(True),
-        timetype = cms.untracked.string('runnumber'),
         toGet = cms.VPSet(records),
         connect = cms.string('frontier://FrontierProd/CMS_CONDITIONS')
         )
diff --git a/DQM/SiStripMonitorSummary/test/SiStripCorrelateBadStripAndNoise_cfg.py b/DQM/SiStripMonitorSummary/test/SiStripCorrelateBadStripAndNoise_cfg.py
@@ -28,13 +28,10 @@
 
 process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(-1))
 
-process.poolDBESSource = cms.ESSource(
-                                      "PoolDBESSource",
-                                      BlobStreamerName = cms.untracked.string('TBufferBlobStreamingService'),
+process.poolDBESSource = cms.ESSource("PoolDBESSource",
                                       DBParameters = cms.PSet(messageLevel = cms.untracked.int32(2),
                                                               authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb')
                                                               ),
-                                      timetype = cms.untracked.string('runnumber'),
                                       connect = cms.string('frontier://FrontierProd/CMS_COND_31X_STRIP'),
                                       toGet = cms.VPSet(cms.PSet(record = cms.string('SiStripNoisesRcd'),
                                                                  tag = cms.string('SiStripNoise_GR09_31X_v1_hlt')
diff --git a/DQM/SiStripMonitorSummary/test/SiStripCorrelateNoise_conddbmonitoring_cfg.py b/DQM/SiStripMonitorSummary/test/SiStripCorrelateNoise_conddbmonitoring_cfg.py
@@ -55,13 +55,10 @@
 
 process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(-1))
 
-process.poolDBESSource = cms.ESSource(
-                                      "PoolDBESSource",
-                                      BlobStreamerName = cms.untracked.string('TBufferBlobStreamingService'),
+process.poolDBESSource = cms.ESSource("PoolDBESSource",
                                       DBParameters = cms.PSet(messageLevel = cms.untracked.int32(1), # it used to be 2
                                                               authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb')
                                                               ),
-                                      timetype = cms.untracked.string('runnumber'),
                                       connect = cms.string(options.connectionString),
                                       toGet = cms.VPSet(cms.PSet(record = cms.string('SiStripNoisesRcd'),
                                                                  tag = cms.string(options.noiseTagName)
diff --git a/DQM/SiStripMonitorSummary/test/SiStripPlotGain_cfg.py b/DQM/SiStripMonitorSummary/test/SiStripPlotGain_cfg.py
@@ -26,13 +26,10 @@
 
 process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(-1))
 
-process.poolDBESSource = cms.ESSource(
-                                      "PoolDBESSource",
-                                      BlobStreamerName = cms.untracked.string('TBufferBlobStreamingService'),
+process.poolDBESSource = cms.ESSource("PoolDBESSource",
                                       DBParameters = cms.PSet(messageLevel = cms.untracked.int32(2),
                                                               authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb')
                                                               ),
-                                      timetype = cms.untracked.string('runnumber'),
                                       connect = cms.string('frontier://FrontierProd/CMS_COND_31X_STRIP'),
                                       toGet = cms.VPSet(cms.PSet(record = cms.string('SiStripApvGainRcd'),
                                                                  tag = cms.string('SiStripApvGain_GR09_31X_v1_hlt')
diff --git a/Geometry/CaloEventSetup/python/xmlsqlitefile.py b/Geometry/CaloEventSetup/python/xmlsqlitefile.py
@@ -5,12 +5,9 @@
 
 PoolDBESSource = cms.ESSource( "PoolDBESSource",
                                CondDBCommon,
-                               loadAll = cms.bool(True),
                                toGet = cms.VPSet(
     cms.PSet( record = cms.string('GeometryFileRcd'   ),
               tag = cms.string('XMLFILE_Geometry_Test03'))    ),
-                               BlobStreamerName = cms.untracked.string('TBufferBlobStreamingService'),
-                               timetype = cms.untracked.string('runnumber')
                                )
 
 PoolDBESSource.connect = cms.string('sqlite_file:allxml.db')
diff --git a/L1Trigger/Configuration/python/customiseReEmul.py b/L1Trigger/Configuration/python/customiseReEmul.py
@@ -36,7 +36,6 @@ def L1TEventSetupForHF1x1TPs(process):
     process.es_pool_hf1x1 = cms.ESSource(
         "PoolDBESSource",
         #process.CondDBSetup,
-        timetype = cms.string('runnumber'),
         toGet = cms.VPSet(
             cms.PSet(record = cms.string("HcalLutMetadataRcd"),
                      tag = cms.string("HcalLutMetadata_HFTP_1x1")
@@ -46,7 +45,6 @@ def L1TEventSetupForHF1x1TPs(process):
                      )
             ),
         connect = cms.string('frontier://FrontierProd/CMS_CONDITIONS'),
-        authenticationMethod = cms.untracked.uint32(0)
         )
     process.es_prefer_es_pool_hf1x1 = cms.ESPrefer("PoolDBESSource", "es_pool_hf1x1")    
     return process
diff --git a/L1Trigger/L1TMuonOverlapPhase1/test/runMuonOverlap_run3_data.py b/L1Trigger/L1TMuonOverlapPhase1/test/runMuonOverlap_run3_data.py
@@ -96,7 +96,6 @@
           cms.PSet(record = cms.string('L1TMuonOverlapParamsRcd'),
                    data = cms.vstring('L1TMuonOverlapParams'))
                        ),
-       verbose = cms.untracked.bool(False)
     )
 
 
diff --git a/L1Trigger/L1TNtuples/python/customiseL1CustomReco.py b/L1Trigger/L1TNtuples/python/customiseL1CustomReco.py
@@ -101,7 +101,6 @@ def getJECFromSQLite(process):
         DBParameters = cms.PSet(
             messageLevel = cms.untracked.int32(0)
             ),
-        timetype = cms.string('runnumber'),
         toGet = cms.VPSet(
             cms.PSet(
                 record = cms.string('JetCorrectionsRecord'),
diff --git a/OnlineDB/CSCCondDB/test/readChamberIndex_cfg.py b/OnlineDB/CSCCondDB/test/readChamberIndex_cfg.py
@@ -4,7 +4,6 @@
 process.PoolDBESSource = cms.ESSource("PoolDBESSource",
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-        authenticationMethod = cms.untracked.uint32(1)
     ),
     #bool loadAll = true
     toGet = cms.VPSet(cms.PSet(
diff --git a/OnlineDB/CSCCondDB/test/readChamberMap_cfg.py b/OnlineDB/CSCCondDB/test/readChamberMap_cfg.py
@@ -4,7 +4,6 @@
 process.PoolDBESSource = cms.ESSource("PoolDBESSource",
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-        authenticationMethod = cms.untracked.uint32(1)
     ),
     #bool loadAll = true
     toGet = cms.VPSet(cms.PSet(
diff --git a/OnlineDB/CSCCondDB/test/readCrateMap_cfg.py b/OnlineDB/CSCCondDB/test/readCrateMap_cfg.py
@@ -4,7 +4,6 @@
 process.PoolDBESSource = cms.ESSource("PoolDBESSource",
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-        authenticationMethod = cms.untracked.uint32(1)
     ),
     #bool loadAll = true
     toGet = cms.VPSet(cms.PSet(
diff --git a/OnlineDB/CSCCondDB/test/readDDUMap_cfg.py b/OnlineDB/CSCCondDB/test/readDDUMap_cfg.py
@@ -4,7 +4,6 @@
 process.PoolDBESSource = cms.ESSource("PoolDBESSource",
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-        authenticationMethod = cms.untracked.uint32(1)
     ),
     #bool loadAll = true
     toGet = cms.VPSet(cms.PSet(
diff --git a/RecoBTag/TrackProbability/python/trackProbabilityFakeCond_cfi.py b/RecoBTag/TrackProbability/python/trackProbabilityFakeCond_cfi.py
@@ -4,14 +4,7 @@
 trackProbabilityFakeCond = cms.ESSource("PoolDBESSource",
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('.'),
-        connectionRetrialPeriod = cms.untracked.int32(30),
-        loadBlobStreamer = cms.untracked.bool(False),
         messageLevel = cms.untracked.int32(0),
-        enablePoolAutomaticCleanUp = cms.untracked.bool(True),
-        enableConnectionSharing = cms.untracked.bool(False),
-        connectionRetrialTimeOut = cms.untracked.int32(180),
-        connectionTimeOut = cms.untracked.int32(600),
-        enableReadOnlySessionOnUpdateConnection = cms.untracked.bool(False)
     ),
     toGet = cms.VPSet(cms.PSet(
         record = cms.string('BTagTrackProbability2DRcd'),
diff --git a/RecoBTag/TrackProbability/python/trackProbabilityFrontierCond_cfi.py b/RecoBTag/TrackProbability/python/trackProbabilityFrontierCond_cfi.py
@@ -4,14 +4,7 @@
 trackProbabilityFrontierCond = cms.ESSource("PoolDBESSource",
     DBParameters = cms.PSet(
         authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),
-        connectionRetrialPeriod = cms.untracked.int32(30),
-        loadBlobStreamer = cms.untracked.bool(False),
         messageLevel = cms.untracked.int32(0),
-        enablePoolAutomaticCleanUp = cms.untracked.bool(True),
-        enableConnectionSharing = cms.untracked.bool(False),
-        connectionRetrialTimeOut = cms.untracked.int32(180),
-        connectionTimeOut = cms.untracked.int32(600),
-        enableReadOnlySessionOnUpdateConnection = cms.untracked.bool(False)
     ),
     toGet = cms.VPSet(cms.PSet(
         record = cms.string('BTagTrackProbability2DRcd'),
diff --git a/RecoLocalCalo/Castor/test/castor_cfg.py b/RecoLocalCalo/Castor/test/castor_cfg.py
diff --git a/SimCalorimetry/CastorSim/data/CastorDigiReco.py b/SimCalorimetry/CastorSim/data/CastorDigiReco.py
diff --git a/SimCalorimetry/CastorSim/data/CastorDigiValidation.py b/SimCalorimetry/CastorSim/data/CastorDigiValidation.py
diff --git a/SimCalorimetry/CastorSim/data/pythia_cfg.py b/SimCalorimetry/CastorSim/data/pythia_cfg.py

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`#connect = cms.string("oracle://cms_orcoff_prep/CMS_COND_CSC"),`
`18`	`18`	`DBParameters = cms.PSet(`
`19`	`19`	`authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),`
`20`		`- authenticationMethod = cms.untracked.uint32(1)`
`21`	`20`	`)`
`22`	`21`	`)`
`23`	`22`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`#string connect = "oracle://cms_orcoff_int2r/CMS_COND_CSC"`
`19`	`19`	`DBParameters = cms.PSet(`
`20`	`20`	`authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),`
`21`		`- authenticationMethod = cms.untracked.uint32(1)`
`22`	`21`	`)`
`23`	`22`	`)`
`24`	`23`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`	`#string connect="frontier://FrontierDev/CMS_COND_CSC"`
`17`	`17`	`DBParameters = cms.PSet(`
`18`	`18`	`authenticationPath = cms.untracked.string('/afs/cern.ch/cms/DB/conddb'),`
`19`		`- authenticationMethod = cms.untracked.uint32(1)`
`20`	`19`	`)`
`21`	`20`	`)`
`22`	`21`