Manual merge 7_3_X into 7_3_ROOT6_X

CondCore/Utilities/BuildFile.xml

@@ -35,6 +35,7 @@
 <use   name="CondFormats/SiStripObjects"/>
 <use   name="CondFormats/Common"/>
 <use   name="CondFormats/BTauObjects"/>
+<use   name="CondFormats/MFObjects"/>
 <export>
   <lib   name="1"/>
 </export>

CondCore/Utilities/src/CondDBImport.cc

@@ -220,6 +220,7 @@ namespace cond {
       IMPORT_PAYLOAD_CASE( L1RPCHsbConfig ) 
       IMPORT_PAYLOAD_CASE( L1RPCHwConfig )
       IMPORT_PAYLOAD_CASE( L1TriggerKey )
+      IMPORT_PAYLOAD_CASE( MagFieldConfig )
       if( inputTypeName == "L1TriggerKeyList" ){ 
 	match = true;
 	const L1TriggerKeyList& obj = *static_cast<const L1TriggerKeyList*>( inputPtr );
@@ -258,6 +259,7 @@ namespace cond {
       IMPORT_PAYLOAD_CASE( lumi::LumiSectionData )
       IMPORT_PAYLOAD_CASE( MixingModuleConfig )
       IMPORT_PAYLOAD_CASE( MuScleFitDBobject )
+      IMPORT_PAYLOAD_CASE( DYTThrObject )
       IMPORT_PAYLOAD_CASE( OOTPileupCorrectionBuffer )
       IMPORT_PAYLOAD_CASE( StorableDoubleMap<AbsOOTPileupCorrection> )
       IMPORT_PAYLOAD_CASE( PhysicsTools::Calibration::MVAComputerContainer )
@@ -285,6 +287,7 @@ namespace cond {
       IMPORT_PAYLOAD_CASE( RPCObTemp )
       IMPORT_PAYLOAD_CASE( RPCObUXC )
       IMPORT_PAYLOAD_CASE( RPCObVmon )
+      IMPORT_PAYLOAD_CASE( RPFlatParams )
       IMPORT_PAYLOAD_CASE( RecoIdealGeometry )
       IMPORT_PAYLOAD_CASE( RunInfo )
       IMPORT_PAYLOAD_CASE( SiPixelCalibConfiguration )
@@ -295,6 +298,7 @@ namespace cond {
       IMPORT_PAYLOAD_CASE( SiPixelLorentzAngle )
       IMPORT_PAYLOAD_CASE( SiPixelQuality )
       IMPORT_PAYLOAD_CASE( SiPixelTemplateDBObject )
+      IMPORT_PAYLOAD_CASE( SiPixel2DTemplateDBObject )
       IMPORT_PAYLOAD_CASE( SiStripApvGain )
       IMPORT_PAYLOAD_CASE( SiStripBadStrip )
       IMPORT_PAYLOAD_CASE( SiStripBackPlaneCorrection )
@@ -518,6 +522,7 @@ namespace cond {
     FETCH_PAYLOAD_CASE( lumi::LumiSectionData )
     FETCH_PAYLOAD_CASE( MixingModuleConfig )
     FETCH_PAYLOAD_CASE( MuScleFitDBobject )
+    FETCH_PAYLOAD_CASE( DYTThrObject )
     FETCH_PAYLOAD_CASE( PhysicsTools::Calibration::MVAComputerContainer )
     FETCH_PAYLOAD_CASE( PCaloGeometry )
     FETCH_PAYLOAD_CASE( PGeometricDet )
@@ -543,6 +548,7 @@ namespace cond {
     FETCH_PAYLOAD_CASE( RPCObTemp )
     FETCH_PAYLOAD_CASE( RPCObUXC )
     FETCH_PAYLOAD_CASE( RPCObVmon )
+    FETCH_PAYLOAD_CASE( RPFlatParams )
     FETCH_PAYLOAD_CASE( RecoIdealGeometry )
     FETCH_PAYLOAD_CASE( RunInfo )
     FETCH_PAYLOAD_CASE( SiPixelCalibConfiguration )
@@ -553,6 +559,7 @@ namespace cond {
     FETCH_PAYLOAD_CASE( SiPixelLorentzAngle )
     FETCH_PAYLOAD_CASE( SiPixelQuality )
     FETCH_PAYLOAD_CASE( SiPixelTemplateDBObject )
+    FETCH_PAYLOAD_CASE( SiPixel2DTemplateDBObject )
     FETCH_PAYLOAD_CASE( SiStripApvGain )
     FETCH_PAYLOAD_CASE( SiStripBackPlaneCorrection )
     FETCH_PAYLOAD_CASE( SiStripBadStrip )
@@ -574,6 +581,7 @@ namespace cond {
     FETCH_PAYLOAD_CASE( EcalCondObjectContainer<EcalTPGPedestal> )
     FETCH_PAYLOAD_CASE( EcalCondObjectContainer<EcalXtalGroupId> )
     FETCH_PAYLOAD_CASE( EcalCondObjectContainer<float> )
+    FETCH_PAYLOAD_CASE( MagFieldConfig )
 
     //   
     if( payloadTypeName == "PhysicsTools::Calibration::Histogram3D<double,double,double,double>" ){    

CondCore/Utilities/src/CondFormats.h

@@ -9,6 +9,7 @@
 #include "CondFormats/CastorObjects/interface/CastorElectronicsMap.h"
 #include "CondFormats/CastorObjects/interface/CastorSaturationCorrs.h"
 #include "CondFormats/HIObjects/interface/CentralityTable.h"
+#include "CondFormats/HIObjects/interface/RPFlatParams.h"
 #include "CondFormats/GeometryObjects/interface/CSCRecoDigiParameters.h"
 #include "CondFormats/CSCObjects/interface/CSCBadChambers.h"
 #include "CondFormats/CSCObjects/interface/CSCBadStrips.h"
@@ -31,7 +32,6 @@
 #include "CondFormats/DTObjects/interface/DTLVStatus.h"
 #include "CondFormats/DTObjects/interface/DTMtime.h"
 #include "CondFormats/DTObjects/interface/DTReadOutMapping.h"
-#include "CondFormats/DTObjects/interface/DTRecoUncertainties.h"
 #include "CondFormats/DTObjects/interface/DTStatusFlag.h"
 #include "CondFormats/DTObjects/interface/DTT0.h"
 #include "CondFormats/DTObjects/interface/DTTPGParameters.h"
@@ -100,6 +100,7 @@
 #include "CondFormats/RPCObjects/interface/RPCObPVSSmap.h"
 #include "CondFormats/RPCObjects/interface/RPCObUXC.h"
 #include "CondFormats/GeometryObjects/interface/RecoIdealGeometry.h"
+#include "CondFormats/RecoMuonObjects/interface/DYTThrObject.h"
 #include "CondFormats/RecoMuonObjects/interface/MuScleFitDBobject.h"
 #include "CondFormats/RunInfo/interface/RunInfo.h"
 #include "CondFormats/RunInfo/interface/MixingModuleConfig.h"
@@ -110,6 +111,7 @@
 #include "CondFormats/SiPixelObjects/interface/SiPixelLorentzAngle.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelQuality.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelTemplateDBObject.h"
+#include "CondFormats/SiPixelObjects/interface/SiPixel2DTemplateDBObject.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelGenErrorDBObject.h"
 #include "CondFormats/SiStripObjects/interface/SiStripApvGain.h"
 #include "CondFormats/SiStripObjects/interface/SiStripBadStrip.h"
@@ -202,6 +204,8 @@
 #include "CondFormats/SiStripObjects/interface/SiStripNoises.h"
 #include "CondFormats/SiStripObjects/interface/SiStripPedestals.h"
 #include "CondFormats/BTauObjects/interface/TrackProbabilityCalibration.h"
+#include "CondFormats/MFObjects/interface/MagFieldConfig.h"
+
 #include "CondFormats/Common/interface/BaseKeyed.h"
 //#include "CondFormats/Common/interface/KeyList.h"
 

CondFormats/DataRecord/interface/MFGeometryFileRcd.h

@@ -0,0 +1,6 @@
+#ifndef MFGEOMETRYFILERCD_H
+#define MFGEOMETRYFILERCD_H
+
+#include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
+class MFGeometryFileRcd : public edm::eventsetup::EventSetupRecordImplementation<MFGeometryFileRcd> {};
+#endif

CondFormats/DataRecord/interface/MagFieldConfigRcd.h

@@ -0,0 +1,8 @@
+#ifndef CondFormats_MagFieldConfigRcd_h
+#define CondFormats_MagFieldConfigRcd_h
+
+#include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
+
+class MagFieldConfigRcd : public edm::eventsetup::EventSetupRecordImplementation<MagFieldConfigRcd> {};
+
+#endif

CondFormats/DataRecord/src/MFGeometryFileRcd.cc

@@ -0,0 +1,4 @@
+#include "CondFormats/DataRecord/interface/MFGeometryFileRcd.h"
+#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"
+
+EVENTSETUP_RECORD_REG(MFGeometryFileRcd);

CondFormats/DataRecord/src/MagFieldConfigRcd.cc

@@ -0,0 +1,4 @@
+#include "CondFormats/DataRecord/interface/MagFieldConfigRcd.h"
+#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"
+
+EVENTSETUP_RECORD_REG(MagFieldConfigRcd);

CondFormats/MFObjects/BuildFile.xml

@@ -0,0 +1,9 @@
+<flags   GENREFLEX_ARGS="--"/>
+<use   name="CondFormats/Common"/>
+<use   name="FWCore/Utilities"/>
+<use   name="CondCore/DBCommon"/>
+<use   name="boost_serialization"/>
+<use   name="rootrflx"/>
+<export>
+  <lib   name="1"/>
+</export>

CondFormats/MFObjects/interface/MagFieldConfig.h

@@ -0,0 +1,62 @@
+#ifndef MagFieldConfig_h
+#define MagFieldConfig_h
+
+/** \class MagFieldConfig
+ *
+ *  No description available.
+ *
+ *  \author N. Amapane - Torino
+ */
+
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "CondFormats/Serialization/interface/Serializable.h"
+
+#include <string>
+#include <vector>
+#include <map>
+
+namespace edm {class ParameterSet;}
+
+namespace magneticfield {
+  typedef std::map<int, std::pair<std::string, int> > TableFileMap;
+}
+
+
+class MagFieldConfig {
+public:
+
+  MagFieldConfig(){}
+
+  /// Constructor
+  MagFieldConfig(const edm::ParameterSet& pset, bool debug=false);
+
+  // Operations
+public:
+  std::vector<unsigned> expandList(const std::string& list);
+
+  /// Version of the geometry to be used
+  int geometryVersion;
+
+  /// Version of the data tables to be used
+  std::string version;  
+
+  /// Specification of which data table is to be used for each volume
+  magneticfield::TableFileMap gridFiles;
+
+  /// Scaling factors for the field in specific volumes
+  std::vector<int> keys;
+  std::vector<double> values;
+
+  /// Label or type of the tracker parametrization
+  std::string slaveFieldVersion;
+
+  /// Parameters for the tracker parametrization
+  /// (not used in legacy producers where slaveFieldVersion is the label of the 
+  /// parametrization in the EventSetup)
+  std::vector<double> slaveFieldParameters;
+
+  COND_SERIALIZABLE;
+};
+#endif
+
+

CondFormats/MFObjects/plugins/BuildFile.xml

@@ -0,0 +1,6 @@
+<use   name="FWCore/Framework"/>
+<use   name="FWCore/PluginManager"/>
+<use   name="CondCore/ESSources"/>
+<use   name="CondFormats/MFObjects"/>
+<use   name="CondFormats/DataRecord"/>
+<flags   EDM_PLUGIN="1"/>

CondFormats/MFObjects/plugins/plugin.cc

@@ -0,0 +1,8 @@
+#include "CondCore/ESSources/interface/registration_macros.h"
+#include "CondFormats/MFObjects/interface/MagFieldConfig.h"
+#include "CondFormats/DataRecord/interface/MagFieldConfigRcd.h"
+#include "CondFormats/Common/interface/FileBlob.h"
+#include "CondFormats/DataRecord/interface/MFGeometryFileRcd.h"
+
+REGISTER_PLUGIN(MagFieldConfigRcd, MagFieldConfig);
+REGISTER_PLUGIN(MFGeometryFileRcd, FileBlob);

CondFormats/MFObjects/src/MagFieldConfig.cc

@@ -0,0 +1,98 @@
+/** \file
+ *
+ *  \author N. Amapane - Torino
+ */
+
+#include "CondFormats/MFObjects/interface/MagFieldConfig.h"
+#include <FWCore/MessageLogger/interface/MessageLogger.h>
+
+#include <iostream>
+#include <vector>
+#include <memory>
+
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/lexical_cast.hpp>
+
+using namespace std;
+using namespace magneticfield;
+
+
+MagFieldConfig::MagFieldConfig(const edm::ParameterSet& pset, bool debug) {
+
+  version = pset.getParameter<std::string>("version");
+  geometryVersion = pset.getParameter<int>("geometryVersion");
+
+
+  // Get specification for the grid tables to be used.
+  typedef vector<edm::ParameterSet> VPSet;
+
+  VPSet fileSpec = pset.getParameter<VPSet>("gridFiles");
+  if (fileSpec.size()!=0) {
+    for(VPSet::const_iterator rule = fileSpec.begin(); rule != fileSpec.end(); ++rule){
+      string s_volumes = rule->getParameter<string>("volumes");
+      string s_sectors = rule->getParameter<string>("sectors"); // 0 means all volumes
+      int master       = rule->getParameter<int>("master");
+      string path      = rule->getParameter<string>("path");
+
+      vector<unsigned> volumes = expandList(s_volumes);
+      vector<unsigned> sectors = expandList(s_sectors);
+
+      if (debug) {
+	cout << "Volumes: " << s_volumes <<" Sectors: " << s_sectors 
+	     << " Master: " << master << " Path:   " << path << endl;
+	cout << " Expanded volumes: ";
+	copy(volumes.begin(), volumes.end(), ostream_iterator<unsigned>(cout, " "));
+	cout << endl;
+	cout << " Expanded sectors: ";
+	copy(sectors.begin(), sectors.end(), ostream_iterator<unsigned>(cout, " "));
+	cout << endl;
+      }
+
+      for (vector<unsigned>::iterator i = volumes.begin(); i!=volumes.end(); ++i){
+	for (vector<unsigned>::iterator j = sectors.begin(); j!=sectors.end(); ++j){
+	  unsigned vpacked = (*i)*100+(*j);
+	  if (gridFiles.find(vpacked)==gridFiles.end()) {
+	    gridFiles[vpacked] = make_pair(path, master);
+	  } else {
+	    throw cms::Exception("ConfigurationError") << "VolumeBasedMagneticFieldESProducer: malformed gridFiles config parameter" << endl;
+	  }
+	}
+      }
+    }
+  }
+
+  // Get scaling factors
+  keys = pset.getParameter<vector<int> >("scalingVolumes");
+  values = pset.getParameter<vector<double> >("scalingFactors");
+
+
+  // Slave field label. Either a label of an existing map (legacy support), or the 
+  // type of parametrization to be constructed with the "paramData" parameters.
+  slaveFieldVersion = pset.getParameter<string>("paramLabel");
+  // Check for compatibility with older configurations
+  if (pset.existsAs<vector<double> >("paramData")) {
+    slaveFieldParameters = pset.getParameter<vector<double> >("paramData");
+  }
+
+}
+
+vector<unsigned> MagFieldConfig::expandList(const string& list) {
+  typedef vector<string> vstring;
+  vector<unsigned> values;
+  vstring v1;
+  boost::split(v1, list, boost::is_any_of(","));
+  for (vstring::const_iterator i= v1.begin(); i!=v1.end(); ++i){
+    vstring v2;
+    boost::split(v2, *i, boost::is_any_of("-"));	
+    unsigned start = boost::lexical_cast<unsigned>(v2.front());
+    unsigned end   = boost::lexical_cast<unsigned>(v2.back());
+    if ((v2.size()>2) || (start>end)) {
+      throw cms::Exception("ConfigurationError") << "VolumeBasedMagneticFieldESProducerFromDB: malformed configuration" << list << endl;
+    }
+    for (unsigned k = start; k<=end; ++k){
+      values.push_back(k);
+    }
+  }
+  return values;
+}

CondFormats/MFObjects/src/T_EventSetup_MagFieldConfig.cc

@@ -0,0 +1,5 @@
+// user include files
+#include "CondFormats/MFObjects/interface/MagFieldConfig.h"
+#include "FWCore/Utilities/interface/typelookup.h"
+
+TYPELOOKUP_DATA_REG(MagFieldConfig);

CondFormats/MFObjects/src/classes.h

@@ -0,0 +1,11 @@
+#include "headers.h"
+
+namespace CondFormats_MFObjects {
+  struct dictionary {
+    std::pair<std::string, int> str_int;
+    std::pair<int, std::pair<std::string, int> > tablemappair;
+    std::pair<const int, std::pair<std::string, int> > tablemappairc;
+    std::map<int, std::pair<std::string, int> > tablemap;
+    MagFieldConfig conf;
+  };
+}

CondFormats/MFObjects/src/classes_def.xml

@@ -0,0 +1,7 @@
+<lcgdict>
+  <class name="std::pair<std::string, int>"/>  
+  <class name="std::pair<int, std::pair<std::string, int> >"/>
+  <class name="std::pair<const int, std::pair<std::string, int> >"/>
+  <class name="std::map<int, std::pair<std::string, int> >"/>
+  <class name="MagFieldConfig"/>
+</lcgdict>

CondFormats/MFObjects/src/headers.h

@@ -0,0 +1,5 @@
+/* Condition Objects
+ * MagFieldConfig
+ */
+
+#include "CondFormats/MFObjects/interface/MagFieldConfig.h"

CondFormats/MFObjects/test/BuildFile.xml

@@ -0,0 +1,14 @@
+<use   name="FWCore/Framework"/>
+<use   name="FWCore/ParameterSet"/>
+<use   name="CondFormats/MFObjects"/>
+<use   name="CondCore/DBCommon"/>
+<use   name="CondCore/DBOutputService"/>
+<use   name="CondCore/IOVService"/>
+<use   name="CondCore/MetaDataService"/>
+<use   name="CondFormats/DataRecord"/>
+<library   file="MagFieldConfigDBWriter.cc" name="CondFormatsMFObjectsTest">
+  <flags   EDM_PLUGIN="1"/>
+</library>
+
+<bin file="testSerializationMFObjects.cpp">
+</bin>