Merge pull request #34904 from smuzaffar/validation-hdr-fix0817

[Validation] Move EcalDigis sources in to plugins dir
cms-sw · Aug 19, 2021 · 0c1fafc · 0c1fafc
2 parents 6827de0 + ec693cf
commit 0c1fafc
Show file tree

Hide file tree

Showing 22 changed files with 35 additions and 38 deletions.
diff --git a/Validation/EcalDigis/BuildFile.xml → Validation/EcalDigis/plugins/BuildFile.xml b/Validation/EcalDigis/BuildFile.xml → Validation/EcalDigis/plugins/BuildFile.xml
diff --git a/Validation/EcalDigis/plugins/CollHandle.cpp b/Validation/EcalDigis/plugins/CollHandle.cpp
@@ -0,0 +1 @@
+#include "CollHandle.h"
diff --git a/Validation/EcalDigis/src/CollHandle.h → Validation/EcalDigis/plugins/CollHandle.h b/Validation/EcalDigis/src/CollHandle.h → Validation/EcalDigis/plugins/CollHandle.h
diff --git a/...calDigis/src/EcalBarrelDigisValidation.cc → ...igis/plugins/EcalBarrelDigisValidation.cc b/...calDigis/src/EcalBarrelDigisValidation.cc → ...igis/plugins/EcalBarrelDigisValidation.cc
@@ -5,7 +5,7 @@
  *
 */
 
-#include <Validation/EcalDigis/interface/EcalBarrelDigisValidation.h>
+#include "EcalBarrelDigisValidation.h"
 #include "CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 

diff --git a/...gis/interface/EcalBarrelDigisValidation.h → ...Digis/plugins/EcalBarrelDigisValidation.h b/...gis/interface/EcalBarrelDigisValidation.h → ...Digis/plugins/EcalBarrelDigisValidation.h
@@ -31,7 +31,6 @@
 #include <map>
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
-#include <Validation/EcalDigis/interface/EcalBarrelDigisValidation.h>
 #include "CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h"
 
 class EcalBarrelDigisValidation : public DQMEDAnalyzer {

diff --git a/...tion/EcalDigis/src/EcalDigisValidation.cc → .../EcalDigis/plugins/EcalDigisValidation.cc b/...tion/EcalDigis/src/EcalDigisValidation.cc → .../EcalDigis/plugins/EcalDigisValidation.cc
@@ -5,7 +5,7 @@
  *
 */
 
-#include <Validation/EcalDigis/interface/EcalDigisValidation.h>
+#include "EcalDigisValidation.h"
 #include <DataFormats/EcalDetId/interface/EBDetId.h>
 #include <DataFormats/EcalDetId/interface/EEDetId.h>
 #include <DataFormats/EcalDetId/interface/ESDetId.h>

diff --git a/...EcalDigis/interface/EcalDigisValidation.h → ...n/EcalDigis/plugins/EcalDigisValidation.h b/...EcalDigis/interface/EcalDigisValidation.h → ...n/EcalDigis/plugins/EcalDigisValidation.h
@@ -37,7 +37,6 @@
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
 #include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
-#include <Validation/EcalDigis/interface/EcalDigisValidation.h>
 #include "CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h"
 
 #include <iostream>

diff --git a/...calDigis/src/EcalEndcapDigisValidation.cc → ...igis/plugins/EcalEndcapDigisValidation.cc b/...calDigis/src/EcalEndcapDigisValidation.cc → ...igis/plugins/EcalEndcapDigisValidation.cc
@@ -5,7 +5,7 @@
  *
 */
 
-#include <Validation/EcalDigis/interface/EcalEndcapDigisValidation.h>
+#include "EcalEndcapDigisValidation.h"
 #include "CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h"
 
 using namespace cms;

diff --git a/...gis/interface/EcalEndcapDigisValidation.h → ...Digis/plugins/EcalEndcapDigisValidation.h b/...gis/interface/EcalEndcapDigisValidation.h → ...Digis/plugins/EcalEndcapDigisValidation.h
@@ -25,7 +25,6 @@
 #include "DataFormats/EcalDigi/interface/EEDataFrame.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 
-#include <Validation/EcalDigis/interface/EcalEndcapDigisValidation.h>
 #include "CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h"
 
 #include <iostream>

diff --git a/...alDigis/src/EcalMixingModuleValidation.cc → ...gis/plugins/EcalMixingModuleValidation.cc b/...alDigis/src/EcalMixingModuleValidation.cc → ...gis/plugins/EcalMixingModuleValidation.cc
@@ -5,7 +5,7 @@
  *
 */
 
-#include <Validation/EcalDigis/interface/EcalMixingModuleValidation.h>
+#include "EcalMixingModuleValidation.h"
 #include <DataFormats/EcalDetId/interface/EBDetId.h>
 #include <DataFormats/EcalDetId/interface/EEDetId.h>
 #include <DataFormats/EcalDetId/interface/ESDetId.h>

diff --git a/...is/interface/EcalMixingModuleValidation.h → ...igis/plugins/EcalMixingModuleValidation.h b/...is/interface/EcalMixingModuleValidation.h → ...igis/plugins/EcalMixingModuleValidation.h
@@ -55,7 +55,7 @@
 #include "CondFormats/ESObjects/interface/ESPedestals.h"
 #include "CondFormats/DataRecord/interface/ESPedestalsRcd.h"
 #include "CondFormats/ESObjects/interface/ESIntercalibConstants.h"
-#include <Validation/EcalDigis/interface/EcalBarrelDigisValidation.h>
+#include "EcalBarrelDigisValidation.h"
 #include "CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
 

diff --git a/...Digis/src/EcalPreshowerDigisValidation.cc → ...s/plugins/EcalPreshowerDigisValidation.cc b/...Digis/src/EcalPreshowerDigisValidation.cc → ...s/plugins/EcalPreshowerDigisValidation.cc
@@ -5,7 +5,7 @@
  *
 */
 
-#include <Validation/EcalDigis/interface/EcalPreshowerDigisValidation.h>
+#include "EcalPreshowerDigisValidation.h"
 
 EcalPreshowerDigisValidation::EcalPreshowerDigisValidation(const edm::ParameterSet& ps)
     : ESdigiCollectionToken_(consumes<ESDigiCollection>(ps.getParameter<edm::InputTag>("ESdigiCollection"))) {

diff --git a/.../interface/EcalPreshowerDigisValidation.h → ...is/plugins/EcalPreshowerDigisValidation.h b/.../interface/EcalPreshowerDigisValidation.h → ...is/plugins/EcalPreshowerDigisValidation.h
diff --git a/...calDigis/src/EcalPreshowerNoiseDistrib.cc → ...igis/plugins/EcalPreshowerNoiseDistrib.cc b/...calDigis/src/EcalPreshowerNoiseDistrib.cc → ...igis/plugins/EcalPreshowerNoiseDistrib.cc
@@ -3,7 +3,7 @@
  *
 */
 
-#include <Validation/EcalDigis/interface/EcalPreshowerNoiseDistrib.h>
+#include "EcalPreshowerNoiseDistrib.h"
 
 EcalPreshowerNoiseDistrib::EcalPreshowerNoiseDistrib(const edm::ParameterSet& ps)
     : ESdigiCollectionToken_(consumes<ESDigiCollection>(ps.getParameter<edm::InputTag>("ESdigiCollection"))) {

diff --git a/...gis/interface/EcalPreshowerNoiseDistrib.h → ...Digis/plugins/EcalPreshowerNoiseDistrib.h b/...gis/interface/EcalPreshowerNoiseDistrib.h → ...Digis/plugins/EcalPreshowerNoiseDistrib.h
diff --git a/Validation/EcalDigis/src/EcalSRPCompat.h → Validation/EcalDigis/plugins/EcalSRPCompat.h b/Validation/EcalDigis/src/EcalSRPCompat.h → Validation/EcalDigis/plugins/EcalSRPCompat.h
diff --git a/...gis/src/EcalSelectiveReadoutValidation.cc → ...plugins/EcalSelectiveReadoutValidation.cc b/...gis/src/EcalSelectiveReadoutValidation.cc → ...plugins/EcalSelectiveReadoutValidation.cc
@@ -4,9 +4,9 @@
  *
  */
 
-#include "Validation/EcalDigis/interface/EcalSelectiveReadoutValidation.h"
+#include "EcalSelectiveReadoutValidation.h"
 
-#include "Validation/EcalDigis/src/ecalDccMap.h"
+#include "ecalDccMap.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Framework/interface/ESHandle.h"

diff --git a/...nterface/EcalSelectiveReadoutValidation.h → .../plugins/EcalSelectiveReadoutValidation.h b/...nterface/EcalSelectiveReadoutValidation.h → .../plugins/EcalSelectiveReadoutValidation.h
@@ -32,7 +32,7 @@
 #include "CondFormats/DataRecord/interface/EcalTPGLutGroupRcd.h"
 #include "CondFormats/DataRecord/interface/EcalTPGPhysicsConstRcd.h"
 
-#include "Validation/EcalDigis/src/CollHandle.h"
+#include "CollHandle.h"
 
 #include <string>
 #include <set>

diff --git a/Validation/EcalDigis/plugins/SealModule.cc b/Validation/EcalDigis/plugins/SealModule.cc
@@ -0,0 +1,24 @@
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+
+#include "FWCore/Framework/interface/MakerMacros.h"
+
+#include "EcalDigisValidation.h"
+DEFINE_FWK_MODULE(EcalDigisValidation);
+
+#include "EcalBarrelDigisValidation.h"
+DEFINE_FWK_MODULE(EcalBarrelDigisValidation);
+
+#include "EcalEndcapDigisValidation.h"
+DEFINE_FWK_MODULE(EcalEndcapDigisValidation);
+
+#include "EcalPreshowerDigisValidation.h"
+DEFINE_FWK_MODULE(EcalPreshowerDigisValidation);
+
+#include "EcalPreshowerNoiseDistrib.h"
+DEFINE_FWK_MODULE(EcalPreshowerNoiseDistrib);
+
+#include "EcalMixingModuleValidation.h"
+DEFINE_FWK_MODULE(EcalMixingModuleValidation);
+
+#include "EcalSelectiveReadoutValidation.h"
+DEFINE_FWK_MODULE(EcalSelectiveReadoutValidation);
diff --git a/Validation/EcalDigis/src/ecalDccMap.h → Validation/EcalDigis/plugins/ecalDccMap.h b/Validation/EcalDigis/src/ecalDccMap.h → Validation/EcalDigis/plugins/ecalDccMap.h
diff --git a/Validation/EcalDigis/src/CollHandle.cpp b/Validation/EcalDigis/src/CollHandle.cpp
diff --git a/Validation/EcalDigis/src/SealModule.cc b/Validation/EcalDigis/src/SealModule.cc