Merge pull request #8994 from namapane/MFConfigDB_740

Make the fast parabolic MF parametrization dynamic

Configuration/StandardSequences/python/MagneticField_0T_cff.py

@@ -1,3 +1,5 @@
+# Load the 0T field map, with the geometry specified in the GT
+
 import FWCore.ParameterSet.Config as cms
-from MagneticField.Engine.autoMagneticFieldProducer_cfi import *
-AutoMagneticFieldESProducer.valueOverride = 0
+from MagneticField.Engine.volumeBasedMagneticFieldFromDB_cfi import *
+VolumeBasedMagneticFieldESProducer.valueOverride = 0

Configuration/StandardSequences/python/MagneticField_20T_cff.py

@@ -1,10 +1,5 @@
-import FWCore.ParameterSet.Config as cms
-
-# This cfi contains everything needed to use the VolumeBased magnetic
-# field engine.
-#Default is version 85l
-from MagneticField.Engine.volumeBasedMagneticField_1103l_cfi import *
-VolumeBasedMagneticFieldESProducer.version = 'grid_1103l_071212_2t'
-ParametrizedMagneticFieldProducer.parameters.BValue = '2_0T'
-
+# Load the 2T field map, with the geometry and configuration specified in the GT
 
+import FWCore.ParameterSet.Config as cms
+from MagneticField.Engine.volumeBasedMagneticFieldFromDB_cfi import *
+VolumeBasedMagneticFieldESProducer.valueOverride = 9558

Configuration/StandardSequences/python/MagneticField_30T_cff.py

@@ -1,10 +1,5 @@
-import FWCore.ParameterSet.Config as cms
-
-# This cfi contains everything needed to use the VolumeBased magnetic
-# field engine.
-#Default is version 85l
-from MagneticField.Engine.volumeBasedMagneticField_1103l_cfi import *
-VolumeBasedMagneticFieldESProducer.version = 'grid_1103l_071212_3t'
-ParametrizedMagneticFieldProducer.parameters.BValue = '3_0T'
-
+# Load the 3 T field map, with the geometry and configuration specified in the GT
 
+import FWCore.ParameterSet.Config as cms
+from MagneticField.Engine.volumeBasedMagneticFieldFromDB_cfi import *
+VolumeBasedMagneticFieldESProducer.valueOverride = 14416

Configuration/StandardSequences/python/MagneticField_35T_cff.py

@@ -1,10 +1,5 @@
-import FWCore.ParameterSet.Config as cms
-
-# This cfi contains everything needed to use the VolumeBased magnetic
-# field engine.
-#Default is version 85l
-from MagneticField.Engine.volumeBasedMagneticField_1103l_cfi import *
-VolumeBasedMagneticFieldESProducer.version = 'grid_1103l_071212_3_5t'
-ParametrizedMagneticFieldProducer.parameters.BValue = '3_5T'
-
+# Load the 3.5 T field map, with the geometry and configuration specified in the GT
 
+import FWCore.ParameterSet.Config as cms
+from MagneticField.Engine.volumeBasedMagneticFieldFromDB_cfi import *
+VolumeBasedMagneticFieldESProducer.valueOverride = 16819

Configuration/StandardSequences/python/MagneticField_38T_PostLS1_cff.py

@@ -1,8 +1,6 @@
-import FWCore.ParameterSet.Config as cms
+# Run 2 default field map configuration. This cff is DEPRECATED, please use MagneticField_AutoFromDBCurrent_cff.py
 
-# This cfi contains everything needed to use the VolumeBased magnetic
-# field engine.
-#Default is version 85l
+import FWCore.ParameterSet.Config as cms
 from MagneticField.Engine.volumeBasedMagneticField_120812_largeYE4_cfi import *
 
 # Parabolic parametrized magnetic field used for track building

Configuration/StandardSequences/python/MagneticField_38T_UpdatedMap_cff.py

@@ -1,8 +1,8 @@
-import FWCore.ParameterSet.Config as cms
+# This cfi is DEPRECATED - to be removed once dependencies are cleared up
+
+print 'Using Configuration.StandardSequences.MagneticField_UpdatedMap_cff is DEPRECATED. Please change this to Configuration.StandardSequences.MagneticField_38T_cff'
 
-# This cfi contains everything needed to use the VolumeBased magnetic
-# field engine.
-#version coming from updated TOSCA simulation after CRAFT08 analysis
-from MagneticField.Engine.volumeBasedMagneticField_1103l_090216_cfi import *
+import FWCore.ParameterSet.Config as cms
+from Configuration.StandardSequences.MagneticField_38T_cff import *
 
 

Configuration/StandardSequences/python/MagneticField_38T_cff.py

@@ -1,12 +1,11 @@
+# Load the 3.8 T field map, with the geometry and configuration specified in the GT
+
 import FWCore.ParameterSet.Config as cms
+from MagneticField.Engine.volumeBasedMagneticFieldFromDB_cfi import *
+VolumeBasedMagneticFieldESProducer.valueOverride = 18268
 
-# This cfi contains everything needed to use the VolumeBased magnetic
-# field engine.
-#Default is version 85l
-from MagneticField.Engine.volumeBasedMagneticField_090322_2pi_scaled_cfi import *
 
-# Parabolic parametrized magnetic field used for track building
+# Parabolic parametrized magnetic field used for track building (at 3.8T)
 from MagneticField.ParametrizedEngine.ParabolicParametrizedField_cfi import ParametrizedMagneticFieldProducer as ParabolicParametrizedMagneticFieldProducer
 ParabolicParametrizedMagneticFieldProducer.label = "ParabolicMf"
 
-

Configuration/StandardSequences/python/MagneticField_38T_polyFit2D_cff.py

@@ -1,7 +1,6 @@
-import FWCore.ParameterSet.Config as cms
+#Configuration for teh RUN 1 field map + detailed (2D) parametrization of tracker region.
 
-# This cfi contains everything needed to use the VolumeBased magnetic
-# field engine.
+import FWCore.ParameterSet.Config as cms
 from MagneticField.Engine.volumeBasedMagneticField_090322_2pi_scaled_cfi import *
 
 

Configuration/StandardSequences/python/MagneticField_40T_cff.py

@@ -1,10 +1,5 @@
-import FWCore.ParameterSet.Config as cms
-
-# This cfi contains everything needed to use the VolumeBased magnetic
-# field engine.
-#Default is version 85l
-from MagneticField.Engine.volumeBasedMagneticField_1103l_cfi import *
-VolumeBasedMagneticFieldESProducer.version = 'grid_1103l_071212_4t'
-ParametrizedMagneticFieldProducer.parameters.BValue = '4_0T'
-
+# Load the 4 T field map, with the geometry and configuration specified in the GT
 
+import FWCore.ParameterSet.Config as cms
+from MagneticField.Engine.volumeBasedMagneticFieldFromDB_cfi import *
+VolumeBasedMagneticFieldESProducer.valueOverride = 19262

Configuration/StandardSequences/python/MagneticField_AutoFromDBCurrent_cff.py

@@ -1,11 +1,11 @@
-import FWCore.ParameterSet.Config as cms
+# Load the field map corresponding to the current stored in the runInfo,
+# with the geometry and configuration specified in the GT
 
-#this will load the auto magnetic field producer reading the current from the DB
-# and loading the best map available for that current as specified in the file 
-from MagneticField.Engine.autoMagneticFieldProducer_cfi import *
+import FWCore.ParameterSet.Config as cms
+from MagneticField.Engine.volumeBasedMagneticFieldFromDB_cfi import *
 
-# Parabolic parametrized magnetic field used for track building
-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"
 
 

Configuration/StandardSequences/python/MagneticField_cff.py

@@ -1,6 +1,5 @@
+# Load the default 3.8 T field map with the geometry and configuration specified in the GT.
+# Note that this does NOT depend on the actual solenoid current:
+# MagneticField_AutoFromDBCurrent_cff should be used if a current-dependent map is needed.
 import FWCore.ParameterSet.Config as cms
-
-#
-# Master configuration for the magnetic field
-# old mapping with 4T
 from Configuration.StandardSequences.MagneticField_38T_cff import *

MagneticField/ParametrizedEngine/interface/ParametrizedMagneticFieldFactory.h

@@ -20,6 +20,7 @@ namespace edm{
 
 namespace magneticfield{
   class ParametrizedMagneticFieldProducer;
+  class AutoParametrizedMagneticFieldProducer;
   class VolumeBasedMagneticFieldESProducerFromDB;
 }
 
@@ -30,6 +31,7 @@ class ParametrizedMagneticFieldFactory {
 
  private:
   friend class magneticfield::ParametrizedMagneticFieldProducer;
+  friend class magneticfield::AutoParametrizedMagneticFieldProducer;
   friend class magneticfield::VolumeBasedMagneticFieldESProducerFromDB;
 
   // Get map configured from pset (deprecated)

MagneticField/ParametrizedEngine/plugins/AutoParametrizedMagneticFieldProducer.cc

@@ -0,0 +1,109 @@
+/** \class AutoParametrizedMagneticFieldProducer
+ *
+ *   Description: Producer for parametrized Magnetics Fields, with value scaled depending on current.
+ *
+ */
+
+#include "FWCore/Framework/interface/ESProducer.h"
+
+#include "MagneticField/Engine/interface/MagneticField.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "MagneticField/ParametrizedEngine/interface/ParametrizedMagneticFieldFactory.h"
+
+#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
+#include "CondFormats/RunInfo/interface/RunInfo.h"
+#include "CondFormats/DataRecord/interface/RunSummaryRcd.h"
+
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <FWCore/MessageLogger/interface/MessageLogger.h>
+
+#include <string>
+#include <iostream>
+
+using namespace std;
+using namespace edm;
+
+namespace magneticfield{
+  class AutoParametrizedMagneticFieldProducer : public edm::ESProducer
+  {
+  public:
+    AutoParametrizedMagneticFieldProducer(const edm::ParameterSet&);
+    ~AutoParametrizedMagneticFieldProducer(){}
+
+    std::auto_ptr<MagneticField> produce(const IdealMagneticFieldRecord&);
+
+    int closerNominaCurrent(float current);
+    edm::ParameterSet pset;
+    std::vector<int> nominalCurrents;
+    //  std::vector<std::string> nominalLabels;
+  };
+}
+
+using namespace magneticfield;
+
+AutoParametrizedMagneticFieldProducer::AutoParametrizedMagneticFieldProducer(const edm::ParameterSet& iConfig) : pset(iConfig) {
+  setWhatProduced(this, pset.getUntrackedParameter<std::string>("label",""));
+  nominalCurrents={-1, 0,9558,14416,16819,18268,19262};
+  //  nominalLabels  ={"3.8T","0T","2T", "3T", "3.5T", "3.8T", "4T"};
+}
+
+std::auto_ptr<MagneticField>
+AutoParametrizedMagneticFieldProducer::produce(const IdealMagneticFieldRecord& iRecord)
+{
+  string version = pset.getParameter<string>("version");
+
+  // Get value of the current from condition DB
+  float current = pset.getParameter<int>("valueOverride");
+  string message;
+  if (current < 0) {
+    ESHandle<RunInfo> rInfo;
+    iRecord.getRecord<RunInfoRcd>().get(rInfo);
+    current = rInfo->m_avg_current;
+    message = " (from RunInfo DB)";
+  } else {
+    message = " (from valueOverride card)";
+  }
+  float cnc= closerNominaCurrent(current);
+
+  edm::LogInfo("MagneticField|AutoParametrizedMagneticField") << "Current: " << current << message << "; using map for: " << cnc;
+
+  vector<double> parameters;
+
+  if (cnc==0) {
+    version = "Uniform";
+    parameters.push_back(0);
+  }
+
+  else if (version=="Parabolic"){
+    parameters.push_back(3.8114);       //c1
+    parameters.push_back(-3.94991e-06); //b0
+    parameters.push_back(7.53701e-06);  //b1
+    parameters.push_back(2.43878e-11);   //a
+    if (cnc!=18268){ // Linear scaling for B!= 3.8T; note that just c1, b0 and b1 have to be scaled to get linear scaling
+      double scale=double(cnc)/double(18268);
+      parameters[0]*=scale;
+      parameters[1]*=scale;
+      parameters[2]*=scale;
+    }
+  } else {  
+    //Other parametrizations are not relevant here and not supported
+    throw cms::Exception("InvalidParameter") << "version " << version << " is not supported";
+  }
+
+  return ParametrizedMagneticFieldFactory::get(version, parameters);
+}
+
+int AutoParametrizedMagneticFieldProducer::closerNominaCurrent(float current) {
+  int i=0;
+  for(;i<(int)nominalCurrents.size()-1;i++) {
+    if(2*current < nominalCurrents[i]+nominalCurrents[i+1] )
+      return nominalCurrents[i];
+  }
+  return nominalCurrents[i];
+}
+
+
+#include "FWCore/Framework/interface/ModuleFactory.h"
+DEFINE_FWK_EVENTSETUP_MODULE(AutoParametrizedMagneticFieldProducer);

MagneticField/ParametrizedEngine/plugins/BuildFile.xml

@@ -4,6 +4,7 @@
 <use   name="MagneticField/Engine"/>
 <use   name="MagneticField/Records"/>
 <use   name="MagneticField/ParametrizedEngine"/>
+<use   name="CondFormats/RunInfo"/>
 <library   file="*.cc" name="MagneticFieldParametrizedEnginePlugins">
   <flags   EDM_PLUGIN="1"/>
 </library>

MagneticField/ParametrizedEngine/python/autoParabolicParametrizedField_cfi.py

@@ -0,0 +1,17 @@
+import FWCore.ParameterSet.Config as cms
+
+# This cfi contains everything needed to use the parabolic magnetic
+# field engine (tracker region only) scaled to the nominal value closest to the current read from RunInfo.
+
+idealMagneticFieldRecordSource = cms.ESSource("EmptyESSource",
+    recordName = cms.string('IdealMagneticFieldRecord'),
+    iovIsRunNotTime = cms.bool(True),
+    firstValid = cms.vuint32(1)
+)
+
+ParametrizedMagneticFieldProducer = cms.ESProducer("AutoParametrizedMagneticFieldProducer",
+    version = cms.string('Parabolic'),
+    label = cms.untracked.string(''),
+    valueOverride = cms.int32(-1)
+)
+