diff --git a/Configuration/Applications/python/ConfigBuilder.py b/Configuration/Applications/python/ConfigBuilder.py index 5b6c6f8e7166b..672e4fef0d37a 100644 --- a/Configuration/Applications/python/ConfigBuilder.py +++ b/Configuration/Applications/python/ConfigBuilder.py @@ -1050,10 +1050,6 @@ def define_Configs(self): self.USERDefaultCFF=None # the magnetic field - if self._options.isData: - if self._options.magField==defaultOptions.magField: - print("magnetic field option forced to: AutoFromDBCurrent") - self._options.magField='AutoFromDBCurrent' self.magFieldCFF = 'Configuration/StandardSequences/MagneticField_'+self._options.magField.replace('.','')+'_cff' self.magFieldCFF = self.magFieldCFF.replace("__",'_') diff --git a/Configuration/StandardSequences/python/MagneticField_38T_PostLS1_cff.py b/Configuration/StandardSequences/python/MagneticField_38T_PostLS1_cff.py deleted file mode 100644 index 739c9b113917b..0000000000000 --- a/Configuration/StandardSequences/python/MagneticField_38T_PostLS1_cff.py +++ /dev/null @@ -1,13 +0,0 @@ -### THIS CFF IS DEPRECATED!!!! ### -# please use MagneticField_cff.py instead - -from __future__ import print_function -print(" ##################################################################### ") -print(" # WARNING: the module # ") -print(" # Configuration.StandardSequences.MagneticField_38T_PostLS1_cff # ") -print(" # is deprecated. Please import # ") -print(" # Configuration.StandardSequences.MagneticField_cff # ") -print(" ##################################################################### ") - -from Configuration.StandardSequences.MagneticField_38T_cff import * - diff --git a/SimMuon/RPCDigitizer/test/runRPCDigiProducer_cfg.py b/SimMuon/RPCDigitizer/test/runRPCDigiProducer_cfg.py index 15efdb3ad8815..79d9ee597410c 100644 --- a/SimMuon/RPCDigitizer/test/runRPCDigiProducer_cfg.py +++ b/SimMuon/RPCDigitizer/test/runRPCDigiProducer_cfg.py @@ -23,7 +23,7 @@ # process = customize_digi_addGEM_muon_only(process) # Digi only Muon Detectors # process.load('Configuration.Geometry.GeometryExtended2023MuonReco_cff') # process.load('Configuration.Geometry.GeometryExtended2023Muon_cff') -# process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') +# process.load('Configuration.StandardSequences.MagneticField_cff') ############################ ### 2023 Geometry w/o ME0 ### @@ -35,7 +35,7 @@ # process = customize_digi_addGEM_muon_only(process) # Digi only Muon Detectors # process.load('Configuration.Geometry.GeometryExtended2023Reco_cff') # process.load('Configuration.Geometry.GeometryExtended2023_cff') -# process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') +# process.load('Configuration.StandardSequences.MagneticField_cff') ############################# ### 2021 Geometry w/ GEM ### @@ -55,7 +55,7 @@ # process = customize_digi_addGEM_muon_only(process) # Digi only Muon Detectors # process.load('Configuration.Geometry.GeometryExtended2021Reco_cff') # process.load('Configuration.Geometry.GeometryExtended2021_cff') -# process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') +# process.load('Configuration.StandardSequences.MagneticField_cff') ############################ ### Run 2 Geometry ### @@ -65,7 +65,7 @@ # process = customize_digi_muon_only(process) # Digi only Muon Detectors # process.load('Configuration.Geometry.GeometryExtended2015Reco_cff') # process.load('Configuration.Geometry.GeometryExtended2015_cff') -# process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') +# process.load('Configuration.StandardSequences.MagneticField_cff') ###################### ### Run 1 Geometry ### @@ -74,7 +74,7 @@ from SimMuon.RPCDigitizer.customizeRPCDigi import customize_digi_muon_only # Customize for CSC + DT + RPC process = customize_digi_muon_only(process) # Digi only Muon Detectors process.load('Configuration.StandardSequences.GeometryRecoDB_cff') -process.load('Configuration.StandardSequences.MagneticField_38T_cff') +process.load('Configuration.StandardSequences.MagneticField_cff') ###################### diff --git a/Validation/HGCalValidation/test/python/digiValidation_cfg.py b/Validation/HGCalValidation/test/python/digiValidation_cfg.py index 1f38fb5b37da4..1298a4b39aa2f 100644 --- a/Validation/HGCalValidation/test/python/digiValidation_cfg.py +++ b/Validation/HGCalValidation/test/python/digiValidation_cfg.py @@ -14,7 +14,7 @@ process.load('SimGeneral.MixingModule.mixNoPU_cfi') process.load('Configuration.Geometry.GeometryExtended2026D46Reco_cff') process.load('Configuration.Geometry.GeometryExtended2026D46_cff') -process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') +process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedGauss_cfi') process.load('GeneratorInterface.Core.genFilterSummary_cff') diff --git a/Validation/HGCalValidation/test/python/rechitValidation_cfg.py b/Validation/HGCalValidation/test/python/rechitValidation_cfg.py index b0d100ce16d8f..72fce599744d7 100644 --- a/Validation/HGCalValidation/test/python/rechitValidation_cfg.py +++ b/Validation/HGCalValidation/test/python/rechitValidation_cfg.py @@ -14,7 +14,7 @@ process.load('SimGeneral.MixingModule.mixNoPU_cfi') process.load('Configuration.Geometry.GeometryExtended2026D46Reco_cff') process.load('Configuration.Geometry.GeometryExtended2026D46_cff') -process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') +process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedGauss_cfi') process.load('GeneratorInterface.Core.genFilterSummary_cff') diff --git a/Validation/HGCalValidation/test/python/simHitValidation_cfg.py b/Validation/HGCalValidation/test/python/simHitValidation_cfg.py index f2569a850f963..5c659988f1f57 100644 --- a/Validation/HGCalValidation/test/python/simHitValidation_cfg.py +++ b/Validation/HGCalValidation/test/python/simHitValidation_cfg.py @@ -13,7 +13,7 @@ process.load('SimGeneral.MixingModule.mixNoPU_cfi') process.load('Configuration.Geometry.GeometryExtended2026D46Reco_cff') process.load('Configuration.Geometry.GeometryExtended2026D46_cff') -process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') +process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedGauss_cfi') process.load('GeneratorInterface.Core.genFilterSummary_cff') diff --git a/Validation/MuonGEMHits/test/runGEMRecHitProducer_GE21v7_10deg_cfg.py b/Validation/MuonGEMHits/test/runGEMRecHitProducer_GE21v7_10deg_cfg.py index a3b8124cc4111..390560d36cb04 100644 --- a/Validation/MuonGEMHits/test/runGEMRecHitProducer_GE21v7_10deg_cfg.py +++ b/Validation/MuonGEMHits/test/runGEMRecHitProducer_GE21v7_10deg_cfg.py @@ -33,7 +33,7 @@ # process.load('Configuration.Geometry.GeometryExtended2023_cff') process.load('Configuration.Geometry.GeometryExtended2015MuonGEMDevReco_cff') process.load('Configuration.Geometry.GeometryExtended2015MuonGEMDev_cff') -process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') +process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic8TeVCollision_cfi') process.load('GeneratorInterface.Core.genFilterSummary_cff') diff --git a/Validation/MuonGEMHits/test/runGEMRecHitProducer_GE21v7_cfg.py b/Validation/MuonGEMHits/test/runGEMRecHitProducer_GE21v7_cfg.py index 09bc7e37d37a2..4054e244d6e34 100644 --- a/Validation/MuonGEMHits/test/runGEMRecHitProducer_GE21v7_cfg.py +++ b/Validation/MuonGEMHits/test/runGEMRecHitProducer_GE21v7_cfg.py @@ -33,7 +33,7 @@ # process.load('Configuration.Geometry.GeometryExtended2023_cff') process.load('Configuration.Geometry.GeometryExtended2015MuonGEMDevReco_cff') process.load('Configuration.Geometry.GeometryExtended2015MuonGEMDev_cff') -process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') +process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic8TeVCollision_cfi') process.load('GeneratorInterface.Core.genFilterSummary_cff') diff --git a/Validation/RecoJets/test/sequence_validation_cfg.py b/Validation/RecoJets/test/sequence_validation_cfg.py index e5b40e707b7c9..9979f57d8a899 100644 --- a/Validation/RecoJets/test/sequence_validation_cfg.py +++ b/Validation/RecoJets/test/sequence_validation_cfg.py @@ -4,7 +4,7 @@ process = cms.Process("METVALIDATION") process.load('Configuration.StandardSequences.GeometryRecoDB_cff') -process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') +process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Reconstruction_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') diff --git a/Validation/RecoMET/test/sequence_validation_cfg.py b/Validation/RecoMET/test/sequence_validation_cfg.py index ea9efb453e4fe..7c187b590214f 100644 --- a/Validation/RecoMET/test/sequence_validation_cfg.py +++ b/Validation/RecoMET/test/sequence_validation_cfg.py @@ -4,7 +4,7 @@ process = cms.Process("METVALIDATION") process.load('Configuration.StandardSequences.GeometryRecoDB_cff') -process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') +process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Reconstruction_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') diff --git a/Validation/TrackerRecHits/test/stripClusterMCanalysis_cfg.py b/Validation/TrackerRecHits/test/stripClusterMCanalysis_cfg.py index 9a884e08b1aee..7ea7b7d990b40 100644 --- a/Validation/TrackerRecHits/test/stripClusterMCanalysis_cfg.py +++ b/Validation/TrackerRecHits/test/stripClusterMCanalysis_cfg.py @@ -29,7 +29,7 @@ process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') process.load('Configuration.StandardSequences.GeometryRecoDB_cff') -process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') +process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.RawToDigi_cff') process.load('Configuration.StandardSequences.Reconstruction_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff')