---

yaml --- r: 62333 b: refs/heads/l1tmuon-upgrade-dev c: 4929732 h: refs/heads/l1tmuon-upgrade-dev i: 62331: f754ae6
cms-sw · Mar 19, 2009 · cceb806 · cceb806
1 parent 53c497b
commit cceb806
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 70 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/l1tmuon-upgrade-dev: 18ccf6ccd79277bb854a444bc6d84e9d81b2a1f7
+refs/heads/l1tmuon-upgrade-dev: 49297324e87f9eec692e04fceef7e1db934b349d
diff --git a/trunk/MagneticField/GeomBuilder/plugins/AutoMagneticFieldESProducer.cc b/trunk/MagneticField/GeomBuilder/plugins/AutoMagneticFieldESProducer.cc
@@ -1,7 +1,7 @@
 /** \file
  *
- *  $Date: 2009/01/16 16:43:46 $
- *  $Revision: 1.3 $
+ *  $Date: 2009/03/03 12:58:02 $
+ *  $Revision: 1.4 $
  *  \author Nicola Amapane 11/08
  */
 
@@ -65,31 +65,25 @@ AutoMagneticFieldESProducer::produce(const IdealMagneticFieldRecord& iRecord)
   } else {
     edm::LogInfo("MagneticField|AutoMagneticField") << "Ignoring DB current readings; using map for " << value/10. << " T";
   }
+
+  MagneticField * paramField=0;
+
+  string version;
 
-
-  string sValue;
-  if (value == 0) {  // B=0, uniform field map
-    //    result = new UniformMagneticField(0.);
-
-    ParameterSet VBFPset;
-    VBFPset.addUntrackedParameter<bool>("debugBuilder",false);
-    VBFPset.addUntrackedParameter<bool>("cacheLastVolume",true);
-    VBFPset.addParameter<string>("version","fake");
-
-    MagGeoBuilderFromDDD builder(VBFPset.getParameter<std::string>("version"),
-				 VBFPset.getUntrackedParameter<bool>("debugBuilder", false));
-    result = new VolumeBasedMagneticField(VBFPset,
-					  builder.barrelLayers(), 
-					  builder.endcapSectors(), 
-					  builder.barrelVolumes(), 
-					  builder.endcapVolumes(),
-					  builder.maxR(), 
-					  builder.maxZ(), 
-					  new UniformMagneticField(0.));
-
-  } else {  // Use VolumeBasedMagneticField
-
-    // different conventions...
+  if (value == 0) {
+    // Use UniformMagneticField instead of the inner region parametrization.
+    // This trick allows to keep a VBF field to be used by propagators to check the geometry.
+    paramField = new UniformMagneticField(0.);
+
+    // Temporary hack: set 3.8T underlying VBF map so that SHP can decide if volume is iron
+    //    version = "fake";
+    stringstream str;
+    string model = pset.getParameter<string>("model");
+    str << model << "_" << "3_8t";
+    version = str.str();
+
+  } else {
+    // Handle different labelling conventions
     string VBFValue;
     string OAEValue;
 
@@ -112,9 +106,12 @@ AutoMagneticFieldESProducer::produce(const IdealMagneticFieldRecord& iRecord)
       throw cms::Exception("InvalidParameter")<<"Invalid field value: requested : " << value << " kGauss";
     }
 
-    // Build slave field
-    MagneticField * paramField=0;
+    stringstream str;
+    string model = pset.getParameter<string>("model");
+    str << model << "_" << VBFValue;
+    version = str.str();
 
+    // Build slave field
     if (pset.getParameter<bool>("useParametrizedTrackerField")) {
 
       string parVersion = pset.getParameter<string>("subModel");
@@ -124,52 +121,48 @@ AutoMagneticFieldESProducer::produce(const IdealMagneticFieldRecord& iRecord)
 	ParameterSet ppar;
 	ppar.addParameter<string>("BValue", OAEValue);
 	paramField =  new OAEParametrizedMagneticField(ppar);
-//       } else if (parVersion=="PolyFit2D") {
-// 	// V. Maroussov polynomial fit to mapping data
-// 	ParameterSet ppar;
-// 	ppar.addParameter<double>("BValue", 4.01242188708911); //FIXME
-// 	paramField = new PolyFit2DParametrizedMagneticField(ppar);
-//       }
+	//      } else if (parVersion=="PolyFit2D") {
+ 	// V. Maroussov polynomial fit to mapping data
+	// 	ParameterSet ppar;
+	// 	ppar.addParameter<double>("BValue", 4.01242188708911); //FIXME
+	// 	paramField = new PolyFit2DParametrizedMagneticField(ppar);
+	//       }
       } else {
 	throw cms::Exception("InvalidParameter")<<"Invalid parametrization version " << parVersion;
       }
     }
-
-    string model = pset.getParameter<string>("model");
-
-    stringstream str;
-    str << model << "_" << VBFValue;
-
-    ParameterSet VBFPset;
-    VBFPset.addUntrackedParameter<bool>("debugBuilder",false);
-    VBFPset.addUntrackedParameter<bool>("cacheLastVolume",true);
-    VBFPset.addParameter<string>("version",str.str());
+  }
+
+  ParameterSet VBFPset;
+  VBFPset.addUntrackedParameter<bool>("debugBuilder",false);
+  VBFPset.addUntrackedParameter<bool>("cacheLastVolume",true);
+  VBFPset.addParameter<string>("version",version);
 
-    edm::ESHandle<DDCompactView> cpv;
-    iRecord.get("magfield",cpv );
-    MagGeoBuilderFromDDD builder(VBFPset.getParameter<std::string>("version"),
-				 VBFPset.getUntrackedParameter<bool>("debugBuilder", false));
+  edm::ESHandle<DDCompactView> cpv;
+  iRecord.get("magfield",cpv );
+  MagGeoBuilderFromDDD builder(VBFPset.getParameter<std::string>("version"),
+			       VBFPset.getUntrackedParameter<bool>("debugBuilder", false));
 
 
-    // Get scaling factors
-    vector<int> keys = pset.getParameter<vector<int> >("scalingVolumes");
-    vector<double> values = pset.getParameter<vector<double> >("scalingFactors");
+  // Get scaling factors
+  vector<int> keys = pset.getParameter<vector<int> >("scalingVolumes");
+  vector<double> values = pset.getParameter<vector<double> >("scalingFactors");
 
-    if (keys.size() != 0) {
-      builder.setScaling(keys, values);
-    }
+  if (keys.size() != 0) {
+    builder.setScaling(keys, values);
+  }
 
-    builder.build(*cpv);
+  builder.build(*cpv);
+
+  result = new VolumeBasedMagneticField(VBFPset,
+					builder.barrelLayers(), 
+					builder.endcapSectors(), 
+					builder.barrelVolumes(), 
+					builder.endcapVolumes(),
+					builder.maxR(), 
+					builder.maxZ(), 
+					paramField, true);
 
-    result = new VolumeBasedMagneticField(VBFPset,
-					  builder.barrelLayers(), 
-					  builder.endcapSectors(), 
-					  builder.barrelVolumes(), 
-					  builder.endcapVolumes(),
-					  builder.maxR(), 
-					  builder.maxZ(), 
-					  paramField);
-  }
 
   std::auto_ptr<MagneticField> s(result);
   return s;

diff --git a/trunk/MagneticField/GeomBuilder/plugins/VolumeBasedMagneticFieldESProducer.cc b/trunk/MagneticField/GeomBuilder/plugins/VolumeBasedMagneticFieldESProducer.cc
@@ -1,7 +1,7 @@
 /** \file
  *
- *  $Date: 2008/11/14 10:42:41 $
- *  $Revision: 1.1 $
+ *  $Date: 2009/01/16 16:43:46 $
+ *  $Revision: 1.2 $
  */
 
 #include "MagneticField/GeomBuilder/plugins/VolumeBasedMagneticFieldESProducer.h"
@@ -55,9 +55,7 @@ std::auto_ptr<MagneticField> VolumeBasedMagneticFieldESProducer::produce(const I
   if (pset.getParameter<bool>("useParametrizedTrackerField")) {;
     iRecord.get("parametrizedField",paramField);
   }
-
-
-  std::auto_ptr<MagneticField> s(new VolumeBasedMagneticField(pset,builder.barrelLayers(), builder.endcapSectors(), builder.barrelVolumes(), builder.endcapVolumes(), builder.maxR(), builder.maxZ(), paramField.product()));
+  std::auto_ptr<MagneticField> s(new VolumeBasedMagneticField(pset,builder.barrelLayers(), builder.endcapSectors(), builder.barrelVolumes(), builder.endcapVolumes(), builder.maxR(), builder.maxZ(), paramField.product(), false));
   return s;
 }