Merge pull request #34761 from smuzaffar/calib-header-fix

[Calib] Move public headers to interface directory
cms-sw · Aug 12, 2021 · 4edd3d6 · 4edd3d6
2 parents 51f6807 + c09facb
commit 4edd3d6
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 17 deletions.
diff --git a/...metry/CaloTPG/src/CaloTPGTranscoderULUT.h → ...CaloTPG/interface/CaloTPGTranscoderULUT.h b/...metry/CaloTPG/src/CaloTPGTranscoderULUT.h → ...CaloTPG/interface/CaloTPGTranscoderULUT.h
diff --git a/CalibCalorimetry/CaloTPG/plugins/CaloTPGTranscoderULUTs.cc b/CalibCalorimetry/CaloTPG/plugins/CaloTPGTranscoderULUTs.cc
@@ -25,7 +25,7 @@
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
 
-#include "CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.h"
+#include "CalibCalorimetry/CaloTPG/interface/CaloTPGTranscoderULUT.h"
 #include "CalibFormats/CaloTPG/interface/CaloTPGRecord.h"
 #include "FWCore/Framework/interface/ValidityInterval.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"

diff --git a/CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.cc b/CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.cc
@@ -1,4 +1,4 @@
-#include "CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.h"
+#include "CalibCalorimetry/CaloTPG/interface/CaloTPGTranscoderULUT.h"
 #include "DataFormats/HcalDetId/interface/HcalGenericDetId.h"
 #include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/Framework/interface/ESTransientHandle.h"

diff --git a/CalibMuon/DTDigiSync/src/DTTTrigSyncFromDB.h → .../DTDigiSync/interface/DTTTrigSyncFromDB.h b/CalibMuon/DTDigiSync/src/DTTTrigSyncFromDB.h → .../DTDigiSync/interface/DTTTrigSyncFromDB.h
diff --git a/CalibMuon/DTDigiSync/src/DTTTrigSyncT0Only.h → .../DTDigiSync/interface/DTTTrigSyncT0Only.h b/CalibMuon/DTDigiSync/src/DTTTrigSyncT0Only.h → .../DTDigiSync/interface/DTTTrigSyncT0Only.h
diff --git a/...bMuon/DTDigiSync/src/DTTTrigSyncTOFCorr.h → ...DTDigiSync/interface/DTTTrigSyncTOFCorr.h b/...bMuon/DTDigiSync/src/DTTTrigSyncTOFCorr.h → ...DTDigiSync/interface/DTTTrigSyncTOFCorr.h
diff --git a/CalibMuon/DTDigiSync/plugins/BuildFile.xml b/CalibMuon/DTDigiSync/plugins/BuildFile.xml
@@ -0,0 +1,5 @@
+<use name="FWCore/PluginManager"/>
+<use name="CalibMuon/DTDigiSync"/>
+<library file="*.cc" name="CalibMuonDTDigiSyncPlugins">
+  <flags EDM_PLUGIN="1"/>
+</library>
diff --git a/CalibMuon/DTDigiSync/plugins/SealModule.cc b/CalibMuon/DTDigiSync/plugins/SealModule.cc
@@ -0,0 +1,9 @@
+#include "FWCore/PluginManager/interface/PluginFactory.h"
+#include "CalibMuon/DTDigiSync/interface/DTTTrigSyncFactory.h"
+#include "CalibMuon/DTDigiSync/interface/DTTTrigSyncTOFCorr.h"
+#include "CalibMuon/DTDigiSync/interface/DTTTrigSyncT0Only.h"
+#include "CalibMuon/DTDigiSync/interface/DTTTrigSyncFromDB.h"
+
+DEFINE_EDM_PLUGIN(DTTTrigSyncFactory, DTTTrigSyncTOFCorr, "DTTTrigSyncTOFCorr");
+DEFINE_EDM_PLUGIN(DTTTrigSyncFactory, DTTTrigSyncT0Only, "DTTTrigSyncT0Only");
+DEFINE_EDM_PLUGIN(DTTTrigSyncFactory, DTTTrigSyncFromDB, "DTTTrigSyncFromDB");
diff --git a/CalibMuon/DTDigiSync/src/DTTTrigSyncFromDB.cc b/CalibMuon/DTDigiSync/src/DTTTrigSyncFromDB.cc
@@ -4,7 +4,7 @@
  *  \author G. Cerminara - INFN Torino
  */
 
-#include "DTTTrigSyncFromDB.h"
+#include "CalibMuon/DTDigiSync/interface/DTTTrigSyncFromDB.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/EventSetup.h"

diff --git a/CalibMuon/DTDigiSync/src/DTTTrigSyncT0Only.cc b/CalibMuon/DTDigiSync/src/DTTTrigSyncT0Only.cc
@@ -4,7 +4,7 @@
  *  \author G. Cerminara - INFN Torino
  */
 
-#include "DTTTrigSyncT0Only.h"
+#include "CalibMuon/DTDigiSync/interface/DTTTrigSyncT0Only.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/EventSetup.h"

diff --git a/CalibMuon/DTDigiSync/src/DTTTrigSyncTOFCorr.cc b/CalibMuon/DTDigiSync/src/DTTTrigSyncTOFCorr.cc
@@ -4,7 +4,7 @@
  *  \author G. Cerminara - INFN Torino
  */
 
-#include "DTTTrigSyncTOFCorr.h"
+#include "CalibMuon/DTDigiSync/interface/DTTTrigSyncTOFCorr.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/Exception.h"

diff --git a/CaloOnlineTools/HcalOnlineDb/interface/HcalLutManager.h b/CaloOnlineTools/HcalOnlineDb/interface/HcalLutManager.h
@@ -21,7 +21,7 @@
 #include "CaloOnlineTools/HcalOnlineDb/interface/HCALConfigDB.h"
 #include "CaloOnlineTools/HcalOnlineDb/interface/LMap.h"
 #include "CalibFormats/HcalObjects/interface/HcalTPGCoder.h"
-#include "CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.h"
+#include "CalibCalorimetry/CaloTPG/interface/CaloTPGTranscoderULUT.h"
 #include "CaloOnlineTools/HcalOnlineDb/interface/HcalAssistant.h"
 #include "CaloOnlineTools/HcalOnlineDb/interface/HcalChannelIterator.h"
 #include "SimCalorimetry/HcalTrigPrimAlgos/interface/HcalFinegrainBit.h"

diff --git a/L1TriggerConfig/L1ScalesProducers/src/L1CaloHcalScaleConfigOnlineProd.cc b/L1TriggerConfig/L1ScalesProducers/src/L1CaloHcalScaleConfigOnlineProd.cc
@@ -24,7 +24,7 @@
 #include "CondFormats/DataRecord/interface/L1CaloHcalScaleRcd.h"
 #include "Geometry/HcalTowerAlgo/interface/HcalTrigTowerGeometry.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
-#include "CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.h"
+#include "CalibCalorimetry/CaloTPG/interface/CaloTPGTranscoderULUT.h"
 #include "CondTools/L1Trigger/interface/OMDSReader.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 

diff --git a/RecoLocalMuon/DTRecHit/plugins/SealModule.cc b/RecoLocalMuon/DTRecHit/plugins/SealModule.cc
@@ -1,5 +1,4 @@
-#include "FWCore/PluginManager/interface/ModuleDef.h"
-
+#include "FWCore/PluginManager/interface/PluginFactory.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "RecoLocalMuon/DTRecHit/plugins/DTRecHitProducer.h"
@@ -9,17 +8,9 @@
 #include "RecoLocalMuon/DTRecHit/plugins/DTLinearDriftFromDBAlgo.h"
 #include "RecoLocalMuon/DTRecHit/plugins/DTParametrizedDriftAlgo.h"
 
-#include "CalibMuon/DTDigiSync/interface/DTTTrigSyncFactory.h"
-#include "CalibMuon/DTDigiSync/src/DTTTrigSyncTOFCorr.h"
-#include "CalibMuon/DTDigiSync/src/DTTTrigSyncT0Only.h"
-#include "CalibMuon/DTDigiSync/src/DTTTrigSyncFromDB.h"
-
 DEFINE_FWK_MODULE(DTRecHitProducer);
 
 DEFINE_EDM_PLUGIN(DTRecHitAlgoFactory, DTNoDriftAlgo, "DTNoDriftAlgo");
 DEFINE_EDM_PLUGIN(DTRecHitAlgoFactory, DTLinearDriftAlgo, "DTLinearDriftAlgo");
 DEFINE_EDM_PLUGIN(DTRecHitAlgoFactory, DTLinearDriftFromDBAlgo, "DTLinearDriftFromDBAlgo");
 DEFINE_EDM_PLUGIN(DTRecHitAlgoFactory, DTParametrizedDriftAlgo, "DTParametrizedDriftAlgo");
-DEFINE_EDM_PLUGIN(DTTTrigSyncFactory, DTTTrigSyncTOFCorr, "DTTTrigSyncTOFCorr");
-DEFINE_EDM_PLUGIN(DTTTrigSyncFactory, DTTTrigSyncT0Only, "DTTTrigSyncT0Only");
-DEFINE_EDM_PLUGIN(DTTTrigSyncFactory, DTTTrigSyncFromDB, "DTTTrigSyncFromDB");