Use standard geometry file record for magnetic field payload.

cms-sw · Jul 16, 2013 · 16f2ebf · 16f2ebf
1 parent 62db3c5
commit 16f2ebf
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 85 deletions.
diff --git a/CondCore/GeometryPlugins/plugins/BuildFile.xml b/CondCore/GeometryPlugins/plugins/BuildFile.xml
@@ -3,7 +3,6 @@
 <use name="CondFormats/GeometryObjects"/>
 <use name="CondCore/ESSources"/>
 <use name="Geometry/Records"/>
-<use name="MagneticField/Records"/>
 <use name="CondFormats/DataRecord"/>   
 <library file="plugin.cc" name="CondCoreGeometryPluginsPlugins">
  <flags EDM_PLUGIN="1"/>

diff --git a/CondCore/GeometryPlugins/plugins/plugin.cc b/CondCore/GeometryPlugins/plugins/plugin.cc
@@ -2,7 +2,6 @@
 
 #include "CondFormats/Common/interface/FileBlob.h"
 #include "Geometry/Records/interface/GeometryFileRcd.h"
-#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 
 #include "CondFormats/GeometryObjects/interface/PGeometricDet.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h" 
@@ -29,7 +28,6 @@
 #include "Geometry/Records/interface/PGeometricDetExtraRcd.h"
 
 REGISTER_PLUGIN(GeometryFileRcd,FileBlob);
-REGISTER_PLUGIN(IdealMagneticFieldRecord,FileBlob);
 REGISTER_PLUGIN(IdealGeometryRecord,PGeometricDet);
 REGISTER_PLUGIN(PGeometricDetExtraRcd,PGeometricDetExtra);
 REGISTER_PLUGIN(PEcalBarrelRcd,PCaloGeometry);

diff --git a/CondTools/Geometry/plugins/SealModules.cc b/CondTools/Geometry/plugins/SealModules.cc
@@ -6,9 +6,6 @@
 #include "CondTools/Geometry/plugins/XMLGeometryBuilder.h"
 DEFINE_FWK_MODULE(XMLGeometryBuilder);
 
-#include "CondTools/Geometry/plugins/XMLMagneticFieldGeometryBuilder.h"
-DEFINE_FWK_MODULE(XMLMagneticFieldGeometryBuilder);
-
 #include "CondTools/Geometry/plugins/PGeometricDetBuilder.h"
 DEFINE_FWK_MODULE(PGeometricDetBuilder);
 

diff --git a/CondTools/Geometry/plugins/XMLMagneticFieldGeometryBuilder.cc b/CondTools/Geometry/plugins/XMLMagneticFieldGeometryBuilder.cc
diff --git a/CondTools/Geometry/plugins/XMLMagneticFieldGeometryBuilder.h b/CondTools/Geometry/plugins/XMLMagneticFieldGeometryBuilder.h
diff --git a/CondTools/Geometry/test/writehelpers/mfwriter.py b/CondTools/Geometry/test/writehelpers/mfwriter.py
@@ -20,7 +20,7 @@
 # somewhat duplicates the information read from the little
 # XML files, but there is no way to directly build the
 # DDCompactView from this.
-process.XMLMagneticFieldGeometryWriter = cms.EDAnalyzer("XMLMagneticFieldGeometryBuilder",
+process.XMLGeometryWriter = cms.EDAnalyzer("XMLGeometryBuilder",
                                            XMLFileName = cms.untracked.string("./mfSingleBigFile.xml"),
                                            ZIP = cms.untracked.bool(True)
                                            )
@@ -30,11 +30,11 @@
 process.CondDBCommon.connect = cms.string('sqlite_file:myfile.db')
 process.PoolDBOutputService = cms.Service("PoolDBOutputService",
                                           process.CondDBCommon,
-                                          toPut = cms.VPSet(cms.PSet(record = cms.string('IdealMagneticFieldRecord'),tag = cms.string('XMLFILE_MagneticFieldGeometry_TagXX')))
+                                          toPut = cms.VPSet(cms.PSet(record = cms.string('GeometryFileRcd'),tag = cms.string('XMLFILE_MagneticFieldGeometry_TagXX')))
                                           )
 
 process.maxEvents = cms.untracked.PSet(
     input = cms.untracked.int32(1)
     )
 
-process.p1 = cms.Path(process.XMLMagneticFieldGeometryWriter)
+process.p1 = cms.Path(process.XMLGeometryWriter)