[Sim] Move public headers on to interface directory

cms-sw · Aug 2, 2021 · 63b4b43 · 63b4b43
1 parent 88ee3fc
commit 63b4b43
Show file tree

Hide file tree

Showing 24 changed files with 25 additions and 25 deletions.
diff --git a/DQM/SiTrackerPhase2/plugins/Phase2TrackerMonitorDigi.cc b/DQM/SiTrackerPhase2/plugins/Phase2TrackerMonitorDigi.cc
@@ -36,12 +36,12 @@
 #include "DataFormats/SiPixelDigi/interface/PixelDigi.h"
 #include "DataFormats/SiPixelDigi/interface/PixelDigiCollection.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerFwd.h"
 
 // DQM Histograming
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQM/SiTrackerPhase2/interface/TrackerPhase2DQMUtil.h"
 
+using Phase2TrackerGeomDetUnit = PixelGeomDetUnit;
 //
 // constructors
 //

diff --git a/GeneratorInterface/AMPTInterface/src/HepEvt.F b/GeneratorInterface/AMPTInterface/src/HepEvt.F
@@ -3,8 +3,8 @@
       subroutine ihepevt
 
 
-#include "SimDataFormats/GeneratorProducts/data/stdhep.inc"
-#include "SimDataFormats/GeneratorProducts/data/hepev4.inc"
+#include "SimDataFormats/GeneratorProducts/interface/stdhep.inc"
+#include "SimDataFormats/GeneratorProducts/interface/hepev4.inc"
 
       return
       end
diff --git a/GeneratorInterface/BeamHaloGenerator/interface/chepevt.inc b/GeneratorInterface/BeamHaloGenerator/interface/chepevt.inc
@@ -1,5 +1,5 @@
 C -- see in /afs/cern.ch/cms/sw/slc3_ia32_gcc323/external/clhep/1.9.2.2/include/CLHEP/
 
 
-#include "SimDataFormats/GeneratorProducts/data/stdhep.inc"
-#include "SimDataFormats/GeneratorProducts/data/hepev4.inc"
+#include "SimDataFormats/GeneratorProducts/interface/stdhep.inc"
+#include "SimDataFormats/GeneratorProducts/interface/hepev4.inc"
diff --git a/GeneratorInterface/Hydjet2Interface/src/HepEvt.F b/GeneratorInterface/Hydjet2Interface/src/HepEvt.F
@@ -1,8 +1,8 @@
 
       subroutine ihepevt
 
-#include "SimDataFormats/GeneratorProducts/data/stdhep.inc"
-#include "SimDataFormats/GeneratorProducts/data/hepev4.inc"
+#include "SimDataFormats/GeneratorProducts/interface/stdhep.inc"
+#include "SimDataFormats/GeneratorProducts/interface/hepev4.inc"
 
       return
       end
diff --git a/GeneratorInterface/HydjetInterface/src/HepEvt.F b/GeneratorInterface/HydjetInterface/src/HepEvt.F
@@ -3,8 +3,8 @@
       subroutine ihepevt
 
 
-#include "SimDataFormats/GeneratorProducts/data/stdhep.inc"
-#include "SimDataFormats/GeneratorProducts/data/hepev4.inc"
+#include "SimDataFormats/GeneratorProducts/interface/stdhep.inc"
+#include "SimDataFormats/GeneratorProducts/interface/hepev4.inc"
 
       return
       end
diff --git a/SimCalorimetry/EcalElectronicsEmulation/interface/EcalSimRawData.h b/SimCalorimetry/EcalElectronicsEmulation/interface/EcalSimRawData.h
@@ -7,7 +7,7 @@
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/CaloTopology/interface/EcalTrigTowerConstituentsMap.h"
-#include "SimCalorimetry/EcalSelectiveReadoutAlgos/src/EcalSelectiveReadout.h"
+#include "SimCalorimetry/EcalSelectiveReadoutAlgos/interface/EcalSelectiveReadout.h"
 #include <fstream>
 #include <string>
 

diff --git a/...veReadoutAlgos/src/EcalSelectiveReadout.h → ...outAlgos/interface/EcalSelectiveReadout.h b/...veReadoutAlgos/src/EcalSelectiveReadout.h → ...outAlgos/interface/EcalSelectiveReadout.h
diff --git a/SimCalorimetry/EcalSelectiveReadoutAlgos/interface/EcalSelectiveReadoutSuppressor.h b/SimCalorimetry/EcalSelectiveReadoutAlgos/interface/EcalSelectiveReadoutSuppressor.h
@@ -8,7 +8,7 @@
 #include "Geometry/CaloTopology/interface/EcalTrigTowerConstituentsMap.h"
 #include "Geometry/EcalMapping/interface/EcalElectronicsMapping.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "SimCalorimetry/EcalSelectiveReadoutAlgos/src/EcalSelectiveReadout.h"
+#include "SimCalorimetry/EcalSelectiveReadoutAlgos/interface/EcalSelectiveReadout.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "CondFormats/EcalObjects/interface/EcalSRSettings.h"
 

diff --git a/SimCalorimetry/EcalSelectiveReadoutAlgos/src/EcalSelectiveReadout.cc b/SimCalorimetry/EcalSelectiveReadoutAlgos/src/EcalSelectiveReadout.cc
@@ -2,7 +2,7 @@
 /*
  */
 
-#include "SimCalorimetry/EcalSelectiveReadoutAlgos/src/EcalSelectiveReadout.h"
+#include "SimCalorimetry/EcalSelectiveReadoutAlgos/interface/EcalSelectiveReadout.h"
 #include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
 #include "DataFormats/EcalDetId/interface/EcalElectronicsId.h"
 #include "FWCore/Utilities/interface/EDMException.h"

diff --git a/SimCalorimetry/EcalSelectiveReadoutAlgos/src/EcalSelectiveReadoutSuppressor.cc b/SimCalorimetry/EcalSelectiveReadoutAlgos/src/EcalSelectiveReadoutSuppressor.cc
@@ -1,5 +1,5 @@
 #include "SimCalorimetry/EcalSelectiveReadoutAlgos/interface/EcalSelectiveReadoutSuppressor.h"
-#include "SimCalorimetry/EcalSelectiveReadoutAlgos/src/EcalSelectiveReadout.h"
+#include "SimCalorimetry/EcalSelectiveReadoutAlgos/interface/EcalSelectiveReadout.h"
 #include "DataFormats/EcalDigi/interface/EEDataFrame.h"
 #include "DataFormats/EcalDigi/interface/EBDataFrame.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"

diff --git a/...Formats/GeneratorProducts/data/hepev4.inc → ...ts/GeneratorProducts/interface/hepev4.inc b/...Formats/GeneratorProducts/data/hepev4.inc → ...ts/GeneratorProducts/interface/hepev4.inc
diff --git a/...Formats/GeneratorProducts/data/stdhep.inc → ...ts/GeneratorProducts/interface/stdhep.inc b/...Formats/GeneratorProducts/data/stdhep.inc → ...ts/GeneratorProducts/interface/stdhep.inc
diff --git a/SimDataFormats/GeneratorProducts/src/HepEvt.F b/SimDataFormats/GeneratorProducts/src/HepEvt.F
@@ -3,8 +3,8 @@
       subroutine ihepevt
 
 
-#include "SimDataFormats/GeneratorProducts/data/stdhep.inc"
-#include "SimDataFormats/GeneratorProducts/data/hepev4.inc"
+#include "SimDataFormats/GeneratorProducts/interface/stdhep.inc"
+#include "SimDataFormats/GeneratorProducts/interface/hepev4.inc"
 
       return
       end
diff --git a/SimMuon/DTDigitizer/test/Histograms.h → SimMuon/DTDigitizer/interface/Histograms.h b/SimMuon/DTDigitizer/test/Histograms.h → SimMuon/DTDigitizer/interface/Histograms.h
diff --git a/SimMuon/DTDigitizer/test/DTDigiAnalyzer.cc b/SimMuon/DTDigitizer/test/DTDigiAnalyzer.cc
@@ -31,7 +31,7 @@
 
 #include "TFile.h"
 
-#include "SimMuon/DTDigitizer/test/Histograms.h"
+#include "SimMuon/DTDigitizer/interface/Histograms.h"
 
 using namespace edm;
 using namespace std;

diff --git a/SimMuon/DTDigitizer/test/DTDigiAnalyzer.h b/SimMuon/DTDigitizer/test/DTDigiAnalyzer.h
@@ -12,7 +12,7 @@
 #include "DataFormats/DTDigi/interface/DTDigiCollection.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
-#include "SimMuon/DTDigitizer/test/Histograms.h"
+#include "SimMuon/DTDigitizer/interface/Histograms.h"
 #include <DataFormats/MuonDetId/interface/DTWireId.h>
 #include <FWCore/Framework/interface/EDAnalyzer.h>
 

diff --git a/SimTracker/SiPhase2Digitizer/test/TBeamTest.cc b/SimTracker/SiPhase2Digitizer/test/TBeamTest.cc
@@ -34,7 +34,6 @@
 #include "DataFormats/GeometryCommonDetAlgo/interface/MeasurementPoint.h"
 #include "SimDataFormats/TrackerDigiSimLink/interface/PixelDigiSimLink.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
-#include "SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerFwd.h"
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
@@ -48,6 +47,9 @@
 // DQM Histograming
 #include "DQMServices/Core/interface/DQMStore.h"
 #include <cmath>
+
+using Phase2TrackerGeomDetUnit = PixelGeomDetUnit;
+
 class TBeamTest : public DQMEDAnalyzer {
 public:
   explicit TBeamTest(const edm::ParameterSet&);

diff --git a/Validation/DTRecHits/test/plotAllWStrue.r b/Validation/DTRecHits/test/plotAllWStrue.r
@@ -2,7 +2,7 @@ void plotAllWStrue(TString filename, int sector, int sl){
 
 
   if (! TString(gSystem->GetLibraries()).Contains("Histograms_h")) {
-    gROOT->LoadMacro("$CMSSW_BASE/src/Validation/DTRecHits/test/Histograms.h+"); 
+    gROOT->LoadMacro("$CMSSW_BASE/src/Validation/DTRecHits/interface/Histograms.h+"); 
      gROOT->LoadMacro("macros.C");
      gROOT->LoadMacro("ranges.C+");
      gROOT->LoadMacro("summaryPlot.C+");

diff --git a/Validation/DTRecHits/test/plotValidation.r b/Validation/DTRecHits/test/plotValidation.r
@@ -22,7 +22,7 @@ void plotValidation(){
 void plotValidation(TString filename, int wheel, int station) {
 
   if (! TString(gSystem->GetLibraries()).Contains("Histograms_h")) {
-    gROOT->LoadMacro("$CMSSW_BASE/src/Validation/DTRecHits/test/Histograms.h+");
+    gROOT->LoadMacro("$CMSSW_BASE/src/Validation/DTRecHits/interface/Histograms.h+");
     gROOT->LoadMacro("macros.C");
   }
 

diff --git a/Validation/DTRecHits/test/writeSummaryTable.r b/Validation/DTRecHits/test/writeSummaryTable.r
@@ -27,7 +27,7 @@ void writeSummaryTable(TString filename, bool doEff=true, bool doEffab = true, b
   //----------------------------------------------------------------------
 
   if (! TString(gSystem->GetLibraries()).Contains("Histograms_h")) {
-    gROOT->LoadMacro("$CMSSW_BASE/src/Validation/DTRecHits/test/Histograms.h+");
+    gROOT->LoadMacro("$CMSSW_BASE/src/Validation/DTRecHits/interface/Histograms.h+");
     gROOT->LoadMacro("macros.C");
     gROOT->LoadMacro("ranges.C");
   }

diff --git a/Validation/MuonDTDigis/src/MuonDTDigis.cc b/Validation/MuonDTDigis/src/MuonDTDigis.cc
@@ -11,7 +11,7 @@
 
 #include "TFile.h"
 
-#include "SimMuon/DTDigitizer/test/Histograms.h"
+#include "SimMuon/DTDigitizer/interface/Histograms.h"
 
 using namespace edm;
 using namespace std;

diff --git a/Validation/MuonDTDigis/src/MuonDTDigis.h b/Validation/MuonDTDigis/src/MuonDTDigis.h
@@ -27,7 +27,7 @@
 #include "DataFormats/MuonDetId/interface/DTLayerId.h"
 #include "DataFormats/MuonDetId/interface/DTWireId.h"
 
-#include "SimMuon/DTDigitizer/test/Histograms.h"
+#include "SimMuon/DTDigitizer/interface/Histograms.h"
 
 #include <vector>
 

diff --git a/Validation/SiTrackerPhase2V/plugins/Phase2OTValidateRecHit.cc b/Validation/SiTrackerPhase2V/plugins/Phase2OTValidateRecHit.cc
@@ -39,7 +39,6 @@
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 #include "SimDataFormats/TrackerDigiSimLink/interface/PixelDigiSimLink.h"
-#include "SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerFwd.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
 #include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
 

diff --git a/Validation/SiTrackerPhase2V/plugins/Phase2OTValidateTrackingRecHit.cc b/Validation/SiTrackerPhase2V/plugins/Phase2OTValidateTrackingRecHit.cc
@@ -42,7 +42,6 @@
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 #include "SimDataFormats/TrackerDigiSimLink/interface/PixelDigiSimLink.h"
-#include "SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerFwd.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
 #include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"