Merge pull request #9012 from cms-sw/revert-9009-CMSSW_7_3_5_patch2/a…

…utoPseudoParabolic Revert "auto pseudo parabolic for data taking or field from DB for B …
cms-sw · May 8, 2015 · b4bbf6b · b4bbf6b
2 parents 9178bcb + 8cb28e9
commit b4bbf6b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 18 deletions.
diff --git a/Configuration/StandardSequences/python/MagneticField_AutoFromDBCurrent_cff.py b/Configuration/StandardSequences/python/MagneticField_AutoFromDBCurrent_cff.py
@@ -5,17 +5,7 @@
 from MagneticField.Engine.autoMagneticFieldProducer_cfi import *
 
 # Parabolic parametrized magnetic field used for track building
-import MagneticField.ParametrizedEngine.ParabolicParametrizedField_cfi
-ParabolicParametrizedMagneticFieldProducer38T = MagneticField.ParametrizedEngine.ParabolicParametrizedField_cfi.ParametrizedMagneticFieldProducer.clone( label = "ParabolicMf38T" )
-
-AutoParabolicParametrizedMagneticFieldProducer = cms.ESProducer("AutoMagneticFieldESProducer",
-    # if positive, set B value (in kGauss), overriding the current reading from DB
-    valueOverride = cms.int32(-1),
-    nominalCurrents = cms.untracked.vint32(-1, 0,9558,14416,16819,18268,19262),
-    mapLabels = cms.untracked.vstring("ParabolicMf38T",
-                                      "slave_0", "slave_20", "slave_30", "slave_35", 
-                                      "ParabolicMf38T", "slave_40" ),
-   label = cms.untracked.string('ParabolicMf')
-)
+from MagneticField.ParametrizedEngine.ParabolicParametrizedField_cfi import ParametrizedMagneticFieldProducer as ParabolicParametrizedMagneticFieldProducer
+ParabolicParametrizedMagneticFieldProducer.label = "ParabolicMf"
 
 
diff --git a/MagneticField/ParametrizedEngine/src/OAEParametrizedMagneticField.h b/MagneticField/ParametrizedEngine/src/OAEParametrizedMagneticField.h
@@ -32,8 +32,6 @@ class OAEParametrizedMagneticField : public MagneticField {
   /// Destructor
   virtual ~OAEParametrizedMagneticField();
 
-  virtual MagneticField* clone() const { return new OAEParametrizedMagneticField(*this);}
-
   GlobalVector inTesla (const GlobalPoint& gp) const;
 
   GlobalVector inTeslaUnchecked (const GlobalPoint& gp) const;

diff --git a/MagneticField/ParametrizedEngine/src/ParabolicParametrizedMagneticField.h b/MagneticField/ParametrizedEngine/src/ParabolicParametrizedMagneticField.h
@@ -25,8 +25,6 @@ class ParabolicParametrizedMagneticField : public MagneticField {
   /// Destructor
   virtual ~ParabolicParametrizedMagneticField();
 
-  virtual MagneticField* clone() const { return new ParabolicParametrizedMagneticField(*this);}
-
   GlobalVector inTesla (const GlobalPoint& gp) const;
 
   GlobalVector inTeslaUnchecked (const GlobalPoint& gp) const;

diff --git a/MagneticField/UniformEngine/src/UniformMagneticField.h b/MagneticField/UniformEngine/src/UniformMagneticField.h
@@ -19,8 +19,6 @@ class UniformMagneticField : public MagneticField {
 
   virtual ~UniformMagneticField() {}
 
-  virtual MagneticField* clone() const { return new UniformMagneticField(*this);}
-
   GlobalVector inTesla (const GlobalPoint& gp) const;
 
   GlobalVector inTeslaUnchecked (const GlobalPoint& gp) const;