From 63b4b43b3a5283d44003631016eb6a9dd2566a3d Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Mon, 2 Aug 2021 19:06:47 +0200 Subject: [PATCH] [Sim] Move public headers on to interface directory --- DQM/SiTrackerPhase2/plugins/Phase2TrackerMonitorDigi.cc | 2 +- GeneratorInterface/AMPTInterface/src/HepEvt.F | 4 ++-- GeneratorInterface/BeamHaloGenerator/interface/chepevt.inc | 4 ++-- GeneratorInterface/Hydjet2Interface/src/HepEvt.F | 4 ++-- GeneratorInterface/HydjetInterface/src/HepEvt.F | 4 ++-- .../EcalElectronicsEmulation/interface/EcalSimRawData.h | 2 +- .../{src => interface}/EcalSelectiveReadout.h | 0 .../interface/EcalSelectiveReadoutSuppressor.h | 2 +- .../EcalSelectiveReadoutAlgos/src/EcalSelectiveReadout.cc | 2 +- .../src/EcalSelectiveReadoutSuppressor.cc | 2 +- .../GeneratorProducts/{data => interface}/hepev4.inc | 0 .../GeneratorProducts/{data => interface}/stdhep.inc | 0 SimDataFormats/GeneratorProducts/src/HepEvt.F | 4 ++-- SimMuon/DTDigitizer/{test => interface}/Histograms.h | 0 SimMuon/DTDigitizer/test/DTDigiAnalyzer.cc | 2 +- SimMuon/DTDigitizer/test/DTDigiAnalyzer.h | 2 +- SimTracker/SiPhase2Digitizer/test/TBeamTest.cc | 4 +++- Validation/DTRecHits/test/plotAllWStrue.r | 2 +- Validation/DTRecHits/test/plotValidation.r | 2 +- Validation/DTRecHits/test/writeSummaryTable.r | 2 +- Validation/MuonDTDigis/src/MuonDTDigis.cc | 2 +- Validation/MuonDTDigis/src/MuonDTDigis.h | 2 +- Validation/SiTrackerPhase2V/plugins/Phase2OTValidateRecHit.cc | 1 - .../plugins/Phase2OTValidateTrackingRecHit.cc | 1 - 24 files changed, 25 insertions(+), 25 deletions(-) rename SimCalorimetry/EcalSelectiveReadoutAlgos/{src => interface}/EcalSelectiveReadout.h (100%) rename SimDataFormats/GeneratorProducts/{data => interface}/hepev4.inc (100%) rename SimDataFormats/GeneratorProducts/{data => interface}/stdhep.inc (100%) rename SimMuon/DTDigitizer/{test => interface}/Histograms.h (100%) diff --git a/DQM/SiTrackerPhase2/plugins/Phase2TrackerMonitorDigi.cc b/DQM/SiTrackerPhase2/plugins/Phase2TrackerMonitorDigi.cc index 98ab4c61d930f..c47514dc18bc6 100644 --- 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 index eb70f5dec0270..26f85adfc4031 100644 --- 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 index d33bdfdbb31c3..f708f00f364c3 100644 --- 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 index a5037c2162644..e9f05ac200e6f 100644 --- 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 index eb70f5dec0270..26f85adfc4031 100644 --- 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 index e3205ec6fbeb3..f9d0bf83acb49 100644 --- 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 #include diff --git a/SimCalorimetry/EcalSelectiveReadoutAlgos/src/EcalSelectiveReadout.h b/SimCalorimetry/EcalSelectiveReadoutAlgos/interface/EcalSelectiveReadout.h similarity index 100% rename from SimCalorimetry/EcalSelectiveReadoutAlgos/src/EcalSelectiveReadout.h rename to SimCalorimetry/EcalSelectiveReadoutAlgos/interface/EcalSelectiveReadout.h diff --git a/SimCalorimetry/EcalSelectiveReadoutAlgos/interface/EcalSelectiveReadoutSuppressor.h b/SimCalorimetry/EcalSelectiveReadoutAlgos/interface/EcalSelectiveReadoutSuppressor.h index d572b72fae0ee..c839c15b62add 100644 --- 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 index 289942f40e80c..3d63a206e4a88 100644 --- 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 index 42e0c0083165b..acb524a5da956 100644 --- 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/SimDataFormats/GeneratorProducts/data/hepev4.inc b/SimDataFormats/GeneratorProducts/interface/hepev4.inc similarity index 100% rename from SimDataFormats/GeneratorProducts/data/hepev4.inc rename to SimDataFormats/GeneratorProducts/interface/hepev4.inc diff --git a/SimDataFormats/GeneratorProducts/data/stdhep.inc b/SimDataFormats/GeneratorProducts/interface/stdhep.inc similarity index 100% rename from SimDataFormats/GeneratorProducts/data/stdhep.inc rename to SimDataFormats/GeneratorProducts/interface/stdhep.inc diff --git a/SimDataFormats/GeneratorProducts/src/HepEvt.F b/SimDataFormats/GeneratorProducts/src/HepEvt.F index eb70f5dec0270..26f85adfc4031 100644 --- 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 b/SimMuon/DTDigitizer/interface/Histograms.h similarity index 100% rename from SimMuon/DTDigitizer/test/Histograms.h rename to SimMuon/DTDigitizer/interface/Histograms.h diff --git a/SimMuon/DTDigitizer/test/DTDigiAnalyzer.cc b/SimMuon/DTDigitizer/test/DTDigiAnalyzer.cc index 848263edc5cbc..7d6df5b3ccddc 100644 --- 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 index 5b157635c8bbb..1d9ec4926e603 100644 --- 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 #include diff --git a/SimTracker/SiPhase2Digitizer/test/TBeamTest.cc b/SimTracker/SiPhase2Digitizer/test/TBeamTest.cc index 6e93b149d6496..bc3ebf899646d 100644 --- 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 + +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 index 204117b64e19d..28ecae59b8033 100644 --- 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 index b4325b86f0749..995b70e70136f 100644 --- 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 index 0a5f5e416db72..a6c507a8dd9b9 100644 --- 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 index 90307a2543de5..28b7a4fedc3bc 100644 --- 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 index cdcfc93f11bf8..7f4e4673b920f 100644 --- 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 diff --git a/Validation/SiTrackerPhase2V/plugins/Phase2OTValidateRecHit.cc b/Validation/SiTrackerPhase2V/plugins/Phase2OTValidateRecHit.cc index 69bc6c33f2a52..0a6946eb85d64 100644 --- 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 index 193b7f955af60..3949d48c62488 100644 --- 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"