Merge pull request #8992 from namapane/MFConfigFromDB

make the fast parabolic MF parametrization dynamic
cms-sw · May 15, 2015 · 658917b · 658917b
2 parents 4342d07 + e5574c0
commit 658917b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/Configuration/StandardSequences/python/MagneticField_38T_cff.py b/Configuration/StandardSequences/python/MagneticField_38T_cff.py
@@ -5,8 +5,7 @@
 VolumeBasedMagneticFieldESProducer.valueOverride = 18268
 
 
-# Parabolic parametrized magnetic field used for track building.
-# NOTE that as of now  this does not scale with the current from the DB.
+# Parabolic parametrized magnetic field used for track building (at 3.8T)
 from MagneticField.ParametrizedEngine.ParabolicParametrizedField_cfi import ParametrizedMagneticFieldProducer as ParabolicParametrizedMagneticFieldProducer
 ParabolicParametrizedMagneticFieldProducer.label = "ParabolicMf"
 
diff --git a/Configuration/StandardSequences/python/MagneticField_AutoFromDBCurrent_cff.py b/Configuration/StandardSequences/python/MagneticField_AutoFromDBCurrent_cff.py
@@ -4,9 +4,8 @@
 import FWCore.ParameterSet.Config as cms
 from MagneticField.Engine.volumeBasedMagneticFieldFromDB_cfi import *
 
-# Parabolic parametrized magnetic field used for track building.
-# NOTE that as of now  this does not scale with the current from the DB.
-from MagneticField.ParametrizedEngine.ParabolicParametrizedField_cfi import ParametrizedMagneticFieldProducer as ParabolicParametrizedMagneticFieldProducer
+# Parabolic parametrized magnetic field used for track building (scaled to nominal map closest to current from runInfo)
+from MagneticField.ParametrizedEngine.autoParabolicParametrizedField_cfi import ParametrizedMagneticFieldProducer as ParabolicParametrizedMagneticFieldProducer
 ParabolicParametrizedMagneticFieldProducer.label = "ParabolicMf"