Merge pull request #23651 from smuzaffar/fix-include-DQM

[10.2.X][DQM] Fix include statements relative paths
cms-sw · Jun 23, 2018 · f739a30 · f739a30
2 parents 562835d + 46017d7
commit f739a30
Show file tree

Hide file tree

Showing 48 changed files with 56 additions and 56 deletions.
diff --git a/DQM/EcalMonitorClient/interface/EcalDQMonitorClient.h b/DQM/EcalMonitorClient/interface/EcalDQMonitorClient.h
@@ -5,12 +5,12 @@
 #include "DQM/EcalCommon/interface/EcalDQMonitor.h"
 #include "DQM/EcalCommon/interface/StatusManager.h"
 
-#include "../interface/DQWorkerClient.h"
+#include "DQM/EcalMonitorClient/interface/DQWorkerClient.h"
 
 class EcalDQMonitorClient : public DQMEDHarvester, public ecaldqm::EcalDQMonitor {
  public:
   EcalDQMonitorClient(edm::ParameterSet const&);
-  ~EcalDQMonitorClient();
+  ~EcalDQMonitorClient() override;
 
   static void fillDescriptions(edm::ConfigurationDescriptions&);
 

diff --git a/DQM/EcalMonitorClient/plugins/EcalDQMonitorClient.cc b/DQM/EcalMonitorClient/plugins/EcalDQMonitorClient.cc
@@ -1,4 +1,4 @@
-#include "../interface/EcalDQMonitorClient.h"
+#include "DQM/EcalMonitorClient/interface/EcalDQMonitorClient.h"
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 

diff --git a/DQM/EcalMonitorClient/src/CalibrationSummaryClient.cc b/DQM/EcalMonitorClient/src/CalibrationSummaryClient.cc
@@ -1,4 +1,4 @@
-#include "../interface/CalibrationSummaryClient.h"
+#include "DQM/EcalMonitorClient/interface/CalibrationSummaryClient.h"
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 #include "DQM/EcalCommon/interface/MESetMulti.h"

diff --git a/DQM/EcalMonitorClient/src/CertificationClient.cc b/DQM/EcalMonitorClient/src/CertificationClient.cc
@@ -1,4 +1,4 @@
-#include "../interface/CertificationClient.h"
+#include "DQM/EcalMonitorClient/interface/CertificationClient.h"
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 

diff --git a/DQM/EcalMonitorClient/src/DQWorkerClient.cc b/DQM/EcalMonitorClient/src/DQWorkerClient.cc
@@ -1,4 +1,4 @@
-#include "../interface/DQWorkerClient.h"
+#include "DQM/EcalMonitorClient/interface/DQWorkerClient.h"
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 #include "DQM/EcalCommon/interface/StatusManager.h"

diff --git a/DQM/EcalMonitorClient/src/IntegrityClient.cc b/DQM/EcalMonitorClient/src/IntegrityClient.cc
@@ -1,4 +1,4 @@
-#include "../interface/IntegrityClient.h"
+#include "DQM/EcalMonitorClient/interface/IntegrityClient.h"
 
 #include "CondFormats/EcalObjects/interface/EcalDQMStatusHelper.h"
 

diff --git a/DQM/EcalMonitorClient/src/LaserClient.cc b/DQM/EcalMonitorClient/src/LaserClient.cc
@@ -1,4 +1,4 @@
-#include "../interface/LaserClient.h"
+#include "DQM/EcalMonitorClient/interface/LaserClient.h"
 
 #include "DataFormats/EcalDetId/interface/EcalPnDiodeDetId.h"
 

diff --git a/DQM/EcalMonitorClient/src/LedClient.cc b/DQM/EcalMonitorClient/src/LedClient.cc
@@ -1,4 +1,4 @@
-#include "../interface/LedClient.h"
+#include "DQM/EcalMonitorClient/interface/LedClient.h"
 
 #include "DataFormats/EcalDetId/interface/EcalPnDiodeDetId.h"
 

diff --git a/DQM/EcalMonitorClient/src/OccupancyClient.cc b/DQM/EcalMonitorClient/src/OccupancyClient.cc
@@ -1,4 +1,4 @@
-#include "../interface/OccupancyClient.h"
+#include "DQM/EcalMonitorClient/interface/OccupancyClient.h"
 
 #include "DataFormats/EcalDetId/interface/EcalTrigTowerDetId.h"
 

diff --git a/DQM/EcalMonitorClient/src/PNIntegrityClient.cc b/DQM/EcalMonitorClient/src/PNIntegrityClient.cc
@@ -1,4 +1,4 @@
-#include "../interface/PNIntegrityClient.h"
+#include "DQM/EcalMonitorClient/interface/PNIntegrityClient.h"
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 

diff --git a/DQM/EcalMonitorClient/src/PedestalClient.cc b/DQM/EcalMonitorClient/src/PedestalClient.cc
@@ -1,4 +1,4 @@
-#include "../interface/PedestalClient.h"
+#include "DQM/EcalMonitorClient/interface/PedestalClient.h"
 
 #include "DQM/EcalCommon/interface/MESetMulti.h"
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"

diff --git a/DQM/EcalMonitorClient/src/PresampleClient.cc b/DQM/EcalMonitorClient/src/PresampleClient.cc
@@ -1,4 +1,4 @@
-#include "../interface/PresampleClient.h"
+#include "DQM/EcalMonitorClient/interface/PresampleClient.h"
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 

diff --git a/DQM/EcalMonitorClient/src/RawDataClient.cc b/DQM/EcalMonitorClient/src/RawDataClient.cc
@@ -1,4 +1,4 @@
-#include "../interface/RawDataClient.h"
+#include "DQM/EcalMonitorClient/interface/RawDataClient.h"
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 #include "DQM/EcalCommon/interface/FEFlags.h"

diff --git a/DQM/EcalMonitorClient/src/SelectiveReadoutClient.cc b/DQM/EcalMonitorClient/src/SelectiveReadoutClient.cc
@@ -1,4 +1,4 @@
-#include "../interface/SelectiveReadoutClient.h"
+#include "DQM/EcalMonitorClient/interface/SelectiveReadoutClient.h"
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 

diff --git a/DQM/EcalMonitorClient/src/SummaryClient.cc b/DQM/EcalMonitorClient/src/SummaryClient.cc
@@ -1,4 +1,4 @@
-#include "../interface/SummaryClient.h"
+#include "DQM/EcalMonitorClient/interface/SummaryClient.h"
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 

diff --git a/DQM/EcalMonitorClient/src/TestPulseClient.cc b/DQM/EcalMonitorClient/src/TestPulseClient.cc
@@ -1,4 +1,4 @@
-#include "../interface/TestPulseClient.h"
+#include "DQM/EcalMonitorClient/interface/TestPulseClient.h"
 
 #include "DQM/EcalCommon/interface/MESetMulti.h"
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"

diff --git a/DQM/EcalMonitorClient/src/TimingClient.cc b/DQM/EcalMonitorClient/src/TimingClient.cc
@@ -1,4 +1,4 @@
-#include "../interface/TimingClient.h"
+#include "DQM/EcalMonitorClient/interface/TimingClient.h"
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 

diff --git a/DQM/EcalMonitorClient/src/TowerStatusTask.cc b/DQM/EcalMonitorClient/src/TowerStatusTask.cc
@@ -1,4 +1,4 @@
-#include "../interface/TowerStatusTask.h"
+#include "DQM/EcalMonitorClient/interface/TowerStatusTask.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"

diff --git a/DQM/EcalMonitorClient/src/TrigPrimClient.cc b/DQM/EcalMonitorClient/src/TrigPrimClient.cc
@@ -1,4 +1,4 @@
-#include "../interface/TrigPrimClient.h"
+#include "DQM/EcalMonitorClient/interface/TrigPrimClient.h"
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 #include "DQM/EcalCommon/interface/MESetNonObject.h"

diff --git a/DQM/EcalMonitorDbModule/plugins/EcalBarrelMonitorDbModule.cc b/DQM/EcalMonitorDbModule/plugins/EcalBarrelMonitorDbModule.cc
@@ -5,7 +5,7 @@
  *
 */
 
-#include "../interface/EcalBarrelMonitorDbModule.h"
+#include "DQM/EcalMonitorDbModule/interface/EcalBarrelMonitorDbModule.h"
 
 #include <unistd.h>
 
@@ -21,7 +21,7 @@
 #include "CoralBase/Attribute.h"
 #include "CoralKernel/Context.h"
 
-#include "../interface/MonitorElementsDb.h"
+#include "DQM/EcalMonitorDbModule/interface/MonitorElementsDb.h"
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 

diff --git a/DQM/EcalMonitorDbModule/plugins/EcalCondDBReader.cc b/DQM/EcalMonitorDbModule/plugins/EcalCondDBReader.cc
@@ -1,4 +1,4 @@
-#include "../interface/EcalCondDBReader.h"
+#include "DQM/EcalMonitorDbModule/interface/EcalCondDBReader.h"
 
 #include "DQM/EcalCommon/interface/MESetUtils.h"
 #include "DQMServices/Core/interface/DQMStore.h"
@@ -64,7 +64,7 @@ EcalCondDBReader::EcalCondDBReader(edm::ParameterSet const& _ps) :
     db = std::auto_ptr<EcalCondDBInterface>(new EcalCondDBInterface(DBName, userName, password));
   }
   catch(std::runtime_error& re){
-    if(hostName != ""){
+    if(!hostName.empty()){
       try{
         db = std::auto_ptr<EcalCondDBInterface>(new EcalCondDBInterface(hostName, DBName, userName, password, hostPort));
       }

diff --git a/DQM/EcalMonitorDbModule/plugins/EcalCondDBWriter.cc b/DQM/EcalMonitorDbModule/plugins/EcalCondDBWriter.cc
@@ -1,4 +1,4 @@
-#include "../interface/EcalCondDBWriter.h"
+#include "DQM/EcalMonitorDbModule/interface/EcalCondDBWriter.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 
@@ -76,7 +76,7 @@ EcalCondDBWriter::EcalCondDBWriter(edm::ParameterSet const& _ps) :
     db = std::auto_ptr<EcalCondDBInterface>(new EcalCondDBInterface(DBName, userName, password));
   }
   catch(std::runtime_error& re){
-    if(hostName != ""){
+    if(!hostName.empty()){
       try{
         db = std::auto_ptr<EcalCondDBInterface>(new EcalCondDBInterface(hostName, DBName, userName, password, hostPort));
       }

diff --git a/DQM/EcalMonitorDbModule/plugins/EcalDQMStatusWriter.cc b/DQM/EcalMonitorDbModule/plugins/EcalDQMStatusWriter.cc
@@ -1,4 +1,4 @@
-#include "../interface/EcalDQMStatusWriter.h"
+#include "DQM/EcalMonitorDbModule/interface/EcalDQMStatusWriter.h"
 
 #include "DQM/EcalCommon/interface/StatusManager.h"
 

diff --git a/DQM/EcalMonitorDbModule/src/DBReaderWorkers.cc b/DQM/EcalMonitorDbModule/src/DBReaderWorkers.cc
@@ -1,5 +1,5 @@
-#include "../interface/DBReaderWorkers.h"
-#include "../interface/LogicIDTranslation.h"
+#include "DQM/EcalMonitorDbModule/interface/DBReaderWorkers.h"
+#include "DQM/EcalMonitorDbModule/interface/LogicIDTranslation.h"
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 

diff --git a/DQM/EcalMonitorDbModule/src/DBWriterWorkers.cc b/DQM/EcalMonitorDbModule/src/DBWriterWorkers.cc
@@ -1,5 +1,5 @@
-#include "../interface/DBWriterWorkers.h"
-#include "../interface/LogicIDTranslation.h"
+#include "DQM/EcalMonitorDbModule/interface/DBWriterWorkers.h"
+#include "DQM/EcalMonitorDbModule/interface/LogicIDTranslation.h"
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 

diff --git a/DQM/EcalMonitorDbModule/src/LogicIDTranslation.cc b/DQM/EcalMonitorDbModule/src/LogicIDTranslation.cc
@@ -1,4 +1,4 @@
-#include "../interface/LogicIDTranslation.h"
+#include "DQM/EcalMonitorDbModule/interface/LogicIDTranslation.h"
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 

diff --git a/DQM/EcalMonitorDbModule/src/MonitorElementsDb.cc b/DQM/EcalMonitorDbModule/src/MonitorElementsDb.cc
@@ -29,7 +29,7 @@
 #include "TH2.h"
 #include "TProfile.h"
 
-#include "../interface/MonitorElementsDb.h"
+#include "DQM/EcalMonitorDbModule/interface/MonitorElementsDb.h"
 
 MonitorElementsDb::MonitorElementsDb( const edm::ParameterSet& ps, std::string& xmlFile ){
 

diff --git a/DQM/EcalMonitorDbModule/src/MonitorXMLParser.cc b/DQM/EcalMonitorDbModule/src/MonitorXMLParser.cc
@@ -13,7 +13,7 @@
 #include <sstream>
 #include <stdexcept>
 
-#include "../interface/MonitorXMLParser.h"
+#include "DQM/EcalMonitorDbModule/interface/MonitorXMLParser.h"
 
 MonitorXMLParser::MonitorXMLParser( const std::string& fromFile ) {
 

diff --git a/DQM/EcalMonitorTasks/plugins/EcalDQMonitorTask.cc b/DQM/EcalMonitorTasks/plugins/EcalDQMonitorTask.cc
@@ -1,6 +1,6 @@
-#include "../interface/EcalDQMonitorTask.h"
+#include "DQM/EcalMonitorTasks/interface/EcalDQMonitorTask.h"
 
-#include "../interface/DQWorkerTask.h"
+#include "DQM/EcalMonitorTasks/interface/DQWorkerTask.h"
 
 #include "DQM/EcalCommon/interface/MESet.h"
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"

diff --git a/DQM/EcalMonitorTasks/plugins/EcalDQMonitorTask2.cc b/DQM/EcalMonitorTasks/plugins/EcalDQMonitorTask2.cc
@@ -1,6 +1,6 @@
-#include "../interface/EcalDQMonitorTask.h"
+#include "DQM/EcalMonitorTasks/interface/EcalDQMonitorTask.h"
 
-#include "../interface/DQWorkerTask.h"
+#include "DQM/EcalMonitorTasks/interface/DQWorkerTask.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Utilities/interface/Exception.h"

diff --git a/DQM/EcalMonitorTasks/plugins/EcalFEDMonitor.cc b/DQM/EcalMonitorTasks/plugins/EcalFEDMonitor.cc
@@ -1,4 +1,4 @@
-#include "../interface/EcalFEDMonitor.h"
+#include "DQM/EcalMonitorTasks/interface/EcalFEDMonitor.h"
 #include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 

diff --git a/DQM/EcalMonitorTasks/src/ClusterTask.cc b/DQM/EcalMonitorTasks/src/ClusterTask.cc
@@ -1,4 +1,4 @@
-#include "../interface/ClusterTask.h"
+#include "DQM/EcalMonitorTasks/interface/ClusterTask.h"
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 #include "DQM/EcalCommon/interface/MESetMulti.h"

diff --git a/DQM/EcalMonitorTasks/src/DQWorkerTask.cc b/DQM/EcalMonitorTasks/src/DQWorkerTask.cc
@@ -1,4 +1,4 @@
-#include "../interface/DQWorkerTask.h"
+#include "DQM/EcalMonitorTasks/interface/DQWorkerTask.h"
 
 #include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"

diff --git a/DQM/EcalMonitorTasks/src/EnergyTask.cc b/DQM/EcalMonitorTasks/src/EnergyTask.cc
@@ -1,4 +1,4 @@
-#include "../interface/EnergyTask.h"
+#include "DQM/EcalMonitorTasks/interface/EnergyTask.h"
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 

diff --git a/DQM/EcalMonitorTasks/src/IntegrityTask.cc b/DQM/EcalMonitorTasks/src/IntegrityTask.cc
@@ -1,4 +1,4 @@
-#include "../interface/IntegrityTask.h"
+#include "DQM/EcalMonitorTasks/interface/IntegrityTask.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/Exception.h"

diff --git a/DQM/EcalMonitorTasks/src/LaserTask.cc b/DQM/EcalMonitorTasks/src/LaserTask.cc
@@ -1,4 +1,4 @@
-#include "../interface/LaserTask.h"
+#include "DQM/EcalMonitorTasks/interface/LaserTask.h"
 
 #include "DQM/EcalCommon/interface/MESetMulti.h"
 

diff --git a/DQM/EcalMonitorTasks/src/LedTask.cc b/DQM/EcalMonitorTasks/src/LedTask.cc
@@ -1,4 +1,4 @@
-#include "../interface/LedTask.h"
+#include "DQM/EcalMonitorTasks/interface/LedTask.h"
 
 #include "DQM/EcalCommon/interface/MESetMulti.h"
 

diff --git a/DQM/EcalMonitorTasks/src/OccupancyTask.cc b/DQM/EcalMonitorTasks/src/OccupancyTask.cc
@@ -1,4 +1,4 @@
-#include "../interface/OccupancyTask.h"
+#include "DQM/EcalMonitorTasks/interface/OccupancyTask.h"
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 #include "DataFormats/EcalRawData/interface/EcalDCCHeaderBlock.h"

diff --git a/DQM/EcalMonitorTasks/src/PNDiodeTask.cc b/DQM/EcalMonitorTasks/src/PNDiodeTask.cc
@@ -1,4 +1,4 @@
-#include "../interface/PNDiodeTask.h"
+#include "DQM/EcalMonitorTasks/interface/PNDiodeTask.h"
 
 #include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"

diff --git a/DQM/EcalMonitorTasks/src/PedestalTask.cc b/DQM/EcalMonitorTasks/src/PedestalTask.cc
@@ -1,4 +1,4 @@
-#include "../interface/PedestalTask.h"
+#include "DQM/EcalMonitorTasks/interface/PedestalTask.h"
 
 #include <iomanip>
 

diff --git a/DQM/EcalMonitorTasks/src/PresampleTask.cc b/DQM/EcalMonitorTasks/src/PresampleTask.cc
@@ -1,4 +1,4 @@
-#include "../interface/PresampleTask.h"
+#include "DQM/EcalMonitorTasks/interface/PresampleTask.h"
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 

diff --git a/DQM/EcalMonitorTasks/src/RawDataTask.cc b/DQM/EcalMonitorTasks/src/RawDataTask.cc
@@ -1,4 +1,4 @@
-#include "../interface/RawDataTask.h"
+#include "DQM/EcalMonitorTasks/interface/RawDataTask.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/Run.h"

diff --git a/DQM/EcalMonitorTasks/src/RecoSummaryTask.cc b/DQM/EcalMonitorTasks/src/RecoSummaryTask.cc
@@ -1,4 +1,4 @@
-#include "../interface/RecoSummaryTask.h"
+#include "DQM/EcalMonitorTasks/interface/RecoSummaryTask.h"
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 #include "DataFormats/EcalRawData/interface/EcalDCCHeaderBlock.h"

diff --git a/DQM/EcalMonitorTasks/src/SelectiveReadoutTask.cc b/DQM/EcalMonitorTasks/src/SelectiveReadoutTask.cc
@@ -1,4 +1,4 @@
-#include "../interface/SelectiveReadoutTask.h"
+#include "DQM/EcalMonitorTasks/interface/SelectiveReadoutTask.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"

diff --git a/DQM/EcalMonitorTasks/src/TestPulseTask.cc b/DQM/EcalMonitorTasks/src/TestPulseTask.cc
@@ -1,4 +1,4 @@
-#include "../interface/TestPulseTask.h"
+#include "DQM/EcalMonitorTasks/interface/TestPulseTask.h"
 
 #include <algorithm>
 #include <iomanip>

diff --git a/DQM/EcalMonitorTasks/src/TimingTask.cc b/DQM/EcalMonitorTasks/src/TimingTask.cc
@@ -1,4 +1,4 @@
-#include "../interface/TimingTask.h"
+#include "DQM/EcalMonitorTasks/interface/TimingTask.h"
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 #include "FWCore/Framework/interface/EventSetup.h"

diff --git a/DQM/EcalMonitorTasks/src/TrigPrimTask.cc b/DQM/EcalMonitorTasks/src/TrigPrimTask.cc
@@ -1,4 +1,4 @@
-#include "../interface/TrigPrimTask.h"
+#include "DQM/EcalMonitorTasks/interface/TrigPrimTask.h"
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 #include "FWCore/Framework/interface/EventSetup.h"

diff --git a/DQM/SiPixelPhase1Common/src/SiPixelCoordinates.cc b/DQM/SiPixelPhase1Common/src/SiPixelCoordinates.cc
@@ -6,7 +6,7 @@
 // 
 // Original Author: Janos Karancsi
 
-#include "../interface/SiPixelCoordinates.h"
+#include "DQM/SiPixelPhase1Common/interface/SiPixelCoordinates.h"
 
 #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"