Merge pull request #31809 from namapane/MFStandardSequencesCleanup

MF standard sequences cleanup
cms-sw · Oct 16, 2020 · 7f18adc · 7f18adc
2 parents d674b3b + fab0961
commit 7f18adc
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 30 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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')