Merge pull request #34773 from smuzaffar/dqm-header-fix

[DQM] Cleanup for private header usage
cms-sw · Aug 10, 2021 · 17fc5ea · 17fc5ea
2 parents 044d1f2 + a459f06
commit 17fc5ea
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 6 deletions.
diff --git a/DQMOffline/Ecal/plugins/EcalZmassClient.cc b/DQMOffline/Ecal/plugins/EcalZmassClient.cc
@@ -21,7 +21,6 @@
 #include <memory>
 
 // user include files
-#include "DQM/Physics/src/EwkDQM.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/Framework/interface/MakerMacros.h"

diff --git a/DQMOffline/Ecal/plugins/EcalZmassTask.cc b/DQMOffline/Ecal/plugins/EcalZmassTask.cc
@@ -21,7 +21,6 @@ Description: [one line class summary]
 
 // user include files
 
-#include "DQM/Physics/src/EwkDQM.h"
 #include "DataFormats/Candidate/interface/Candidate.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/EgammaCandidates/interface/GsfElectron.h"

diff --git a/DQMServices/Components/bin/fastHadd.cc b/DQMServices/Components/bin/fastHadd.cc
@@ -88,7 +88,7 @@ PATH=/afs/cern.ch/work/r/rovere/protocolbuf/bin
 #include <thread>
 #include <mutex>
 #include <list>
-#include "DQMServices/Core/src/ROOTFilePB.pb.h"
+#include "DQMServices/Core/interface/ROOTFilePB.pb.h"
 #include <google/protobuf/io/coded_stream.h>
 #include <google/protobuf/io/gzip_stream.h>
 #include <google/protobuf/io/zero_copy_stream_impl.h>

diff --git a/DQMServices/Core/src/ROOTFilePB.pb.h → DQMServices/Core/interface/ROOTFilePB.pb.h b/DQMServices/Core/src/ROOTFilePB.pb.h → DQMServices/Core/interface/ROOTFilePB.pb.h
diff --git a/DQMServices/Core/src/ROOTFilePB.pb.cc b/DQMServices/Core/src/ROOTFilePB.pb.cc
diff --git a/DQMServices/FileIO/plugins/DQMFileSaverPB.cc b/DQMServices/FileIO/plugins/DQMFileSaverPB.cc
@@ -21,7 +21,7 @@
 
 #include "zlib.h"
 #include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/src/ROOTFilePB.pb.h"
+#include "DQMServices/Core/interface/ROOTFilePB.pb.h"
 #include "FWCore/Framework/interface/LuminosityBlock.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"

diff --git a/DQMServices/StreamerIO/plugins/DQMProtobufReader.cc b/DQMServices/StreamerIO/plugins/DQMProtobufReader.cc
@@ -7,7 +7,7 @@
 #include "FWCore/Utilities/interface/UnixSignalHandlers.h"
 // #include "FWCore/Sources/interface/ProducerSourceBase.h"
 
-#include "DQMServices/Core/src/ROOTFilePB.pb.h"
+#include "DQMServices/Core/interface/ROOTFilePB.pb.h"
 #include <google/protobuf/io/coded_stream.h>
 #include <google/protobuf/io/gzip_stream.h>
 #include <google/protobuf/io/zero_copy_stream_impl.h>