Merge pull request #3012 from VinInn/MagFieldInlined

Reco -- make nominalValue() inlined
cms-sw · Mar 29, 2014 · 19ba3ad · 19ba3ad
2 parents cceeb18 + 1c80ad7
commit 19ba3ad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/MagneticField/Engine/interface/MagneticField.h b/MagneticField/Engine/interface/MagneticField.h
@@ -53,7 +53,10 @@ class MagneticField
   }
 
   /// The nominal field value for this map in kGauss
-  int nominalValue() const;
+  int nominalValue() const {  
+     if(kSet==nominalValueCompiuted.load()) return theNominalValue;
+     return computeNominalValue();
+  }     
 
 private:
   //nominal field value 

diff --git a/MagneticField/Engine/src/MagneticField.cc b/MagneticField/Engine/src/MagneticField.cc
@@ -20,14 +20,7 @@ MagneticField::MagneticField(const MagneticField& orig) : nominalValueCompiuted(
 MagneticField::~MagneticField(){}
 
 int MagneticField::computeNominalValue() const {
-  return int((inTesla(GlobalPoint(0.f,0.f,0.f))).z() * 10.f + 0.5f);
-}
-
-int MagneticField::nominalValue() const {
-  if(kSet==nominalValueCompiuted.load()) return theNominalValue;
-
-  //need to make one
-  int tmp = computeNominalValue();
+  int tmp = int((inTesla(GlobalPoint(0.f,0.f,0.f))).z() * 10.f + 0.5f);
 
   //Try to cache
   char expected = kUnset;