Merge pull request #3022 from hidaspal/relocateLorentzAngleDBBuilderR…

…eader SiPixelLorentzAngle -- rebase of relocateLorentzAngleDB
cms-sw · Mar 28, 2014 · ae098a9 · ae098a9
2 parents fc686ea + 66fae05
commit ae098a9
Show file tree

Hide file tree

Showing 12 changed files with 437 additions and 270 deletions.
diff --git a/CalibTracker/SiPixelLorentzAngle/test/BuildFile.xml b/CalibTracker/SiPixelLorentzAngle/test/BuildFile.xml
diff --git a/CalibTracker/SiPixelLorentzAngle/test/SealModules.cc b/CalibTracker/SiPixelLorentzAngle/test/SealModules.cc
diff --git a/CalibTracker/SiPixelLorentzAngle/test/SiPixelLorentzAngleDB_cfg.py b/CalibTracker/SiPixelLorentzAngle/test/SiPixelLorentzAngleDB_cfg.py
diff --git a/CalibTracker/SiPixelLorentzAngle/test/SiPixelLorentzAngleReader.cc b/CalibTracker/SiPixelLorentzAngle/test/SiPixelLorentzAngleReader.cc
diff --git a/CalibTracker/SiPixelLorentzAngle/test/SiPixelLorentzAngleReader_cfg.py b/CalibTracker/SiPixelLorentzAngle/test/SiPixelLorentzAngleReader_cfg.py
diff --git a/CondTools/SiPixel/test/SealModules.cc b/CondTools/SiPixel/test/SealModules.cc
@@ -7,18 +7,23 @@
 #include "CondTools/SiPixel/test/SiPixelCondObjOfflineBuilder.h"
 #include "CondTools/SiPixel/test/SiPixelCondObjOfflineReader.h"
 #include "CondTools/SiPixel/test/SiPixelCondObjAllPayloadsReader.h"
-#include "CondTools/SiPixel/test/SiPixelBadModuleByHandBuilder.h"
-#include "CondTools/SiPixel/test/SiPixelBadModuleReader.h"
 
 #include "CondTools/SiPixel/test/SiPixelGainCalibrationReadDQMFile.h"
 #include "CondTools/SiPixel/test/SiPixelGainCalibrationRejectNoisyAndDead.h"
 
+#include "CondTools/SiPixel/test/SiPixelBadModuleByHandBuilder.h"
+#include "CondTools/SiPixel/test/SiPixelBadModuleReader.h"
+
+#include "CondTools/SiPixel/test/SiPixelLorentzAngleReader.h"
+#include "CondTools/SiPixel/test/SiPixelLorentzAngleDB.h"
+
 #include "CondTools/SiPixel/test/SiPixelPerformanceSummaryBuilder.h"
 #include "CondTools/SiPixel/test/SiPixelPerformanceSummaryReader.h"
 
 #include "CondTools/SiPixel/test/SiPixelCPEGenericErrorParmReader.h"
 #include "CondTools/SiPixel/test/SiPixelCPEGenericErrorParmUploader.h"
 #include "CondTools/SiPixel/test/SiPixelFakeCPEGenericErrorParmSourceReader.h"
+
 #include "CondTools/SiPixel/test/SiPixelTemplateDBObjectReader.h"
 #include "CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader.h"
 #include "CondTools/SiPixel/test/SiPixelFakeTemplateDBSourceReader.h"
@@ -45,6 +50,8 @@ DEFINE_FWK_MODULE(SiPixelCondObjForHLTReader);
 DEFINE_FWK_MODULE(SiPixelCondObjOfflineBuilder);
 DEFINE_FWK_MODULE(SiPixelCondObjOfflineReader);
 DEFINE_FWK_MODULE(SiPixelCondObjAllPayloadsReader);
+DEFINE_FWK_MODULE(SiPixelLorentzAngleReader);
+DEFINE_FWK_MODULE(SiPixelLorentzAngleDB);
 DEFINE_FWK_MODULE(SiPixelPerformanceSummaryBuilder);
 DEFINE_FWK_MODULE(SiPixelPerformanceSummaryReader);
 DEFINE_FWK_MODULE(SiPixelBadModuleByHandBuilder);

diff --git a/...LorentzAngle/src/SiPixelLorentzAngleDB.cc → ...ols/SiPixel/test/SiPixelLorentzAngleDB.cc b/...LorentzAngle/src/SiPixelLorentzAngleDB.cc → ...ols/SiPixel/test/SiPixelLorentzAngleDB.cc
@@ -2,10 +2,8 @@
 #include <string>
 #include <iostream>
 #include <fstream>
-#include "FWCore/PluginManager/interface/ModuleDef.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
 #include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
-#include "SiPixelLorentzAngleDB.h"
+#include "CondTools/SiPixel/test/SiPixelLorentzAngleDB.h"
 #include "DataFormats/SiPixelDetId/interface/PXBDetId.h"
 #include "DataFormats/SiPixelDetId/interface/PXFDetId.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelLorentzAngle.h"
@@ -177,4 +175,3 @@ void SiPixelLorentzAngleDB::endJob(){
 }
 
 
-DEFINE_FWK_MODULE(SiPixelLorentzAngleDB);
diff --git a/...lLorentzAngle/src/SiPixelLorentzAngleDB.h → ...ools/SiPixel/test/SiPixelLorentzAngleDB.h b/...lLorentzAngle/src/SiPixelLorentzAngleDB.h → ...ools/SiPixel/test/SiPixelLorentzAngleDB.h