Clean up includes (key4hep#368)

SwathiSasikumar · Aug 9, 2024 · 976c22e · 976c22e
1 parent 87d40e0
commit 976c22e
Show file tree

Hide file tree

Showing 101 changed files with 21 additions and 262 deletions.
diff --git a/detector/CaloTB/CaloPrototype_v01.cpp b/detector/CaloTB/CaloPrototype_v01.cpp
@@ -8,11 +8,7 @@
 #include "DD4hep/DetFactoryHelper.h"
 #include "XML/Layering.h"
 #include "XML/Utilities.h"
-#include "DDRec/DetectorData.h"
-#include "LcgeoExceptions.h"
 
-#include <iostream>
-#include <vector>
 
 using namespace std;
 

diff --git a/detector/CaloTB/CaloPrototype_v02.cpp b/detector/CaloTB/CaloPrototype_v02.cpp
@@ -8,12 +8,8 @@
 #include "DD4hep/DetFactoryHelper.h"
 #include "XML/Layering.h"
 #include "XML/Utilities.h"
-#include "DDRec/DetectorData.h"
 #include "DDSegmentation/TiledLayerGridXY.h"
-#include "LcgeoExceptions.h"
 
-#include <iostream>
-#include <vector>
 
 using namespace std;
 

diff --git a/detector/CaloTB/CaloPrototype_v03.cpp b/detector/CaloTB/CaloPrototype_v03.cpp
@@ -10,7 +10,6 @@
 #include "DD4hep/DetFactoryHelper.h"
 #include "XML/Layering.h"
 #include "XML/Utilities.h"
-#include "LcgeoExceptions.h"
 
 #include <string>
 

diff --git a/detector/CaloTB/TBecal4d.cpp b/detector/CaloTB/TBecal4d.cpp
@@ -8,11 +8,7 @@
 #include "DD4hep/DetFactoryHelper.h"
 #include "XML/Layering.h"
 #include "XML/Utilities.h"
-#include "DDRec/DetectorData.h"
-#include "DDSegmentation/TiledLayerGridXY.h"
-#include "LcgeoExceptions.h"
 
-#include <iostream>
 #include <vector>
 
 using namespace std;

diff --git a/detector/CaloTB/TBhcal4d.cpp b/detector/CaloTB/TBhcal4d.cpp
@@ -8,11 +8,7 @@
 #include "DD4hep/DetFactoryHelper.h"
 #include "XML/Layering.h"
 #include "XML/Utilities.h"
-#include "DDRec/DetectorData.h"
-#include "DDSegmentation/TiledLayerGridXY.h"
-#include "LcgeoExceptions.h"
 
-#include <iostream>
 #include <vector>
 
 using namespace std;

diff --git a/detector/calorimeter/ECalBarrel_o1_v01_geo.cpp b/detector/calorimeter/ECalBarrel_o1_v01_geo.cpp
@@ -12,9 +12,7 @@
 //=========================================================================
 
 #include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/Printout.h"
 #include "XML/Layering.h"
-#include "TGeoTrd2.h"
 #include "XML/Utilities.h"
 #include "DDRec/DetectorData.h"
 #include "DDSegmentation/Segmentation.h"

diff --git a/detector/calorimeter/ECalBarrel_o1_v02_geo.cpp b/detector/calorimeter/ECalBarrel_o1_v02_geo.cpp
@@ -15,9 +15,7 @@
 #define VERBOSE_LEVEL 2
 
 #include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/Printout.h"
 #include "XML/Layering.h"
-#include "TGeoTrd2.h"
 #include "XML/Utilities.h"
 #include "DDRec/DetectorData.h"
 #include "DDSegmentation/Segmentation.h"

diff --git a/detector/calorimeter/ECalBarrel_o1_v03_geo.cpp b/detector/calorimeter/ECalBarrel_o1_v03_geo.cpp
@@ -16,9 +16,7 @@
 #define VERBOSE_LEVEL 0
 
 #include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/Printout.h"
 #include "XML/Layering.h"
-#include "TGeoTrd2.h"
 #include "XML/Utilities.h"
 #include "DDRec/DetectorData.h"
 #include "DDSegmentation/Segmentation.h"

diff --git a/detector/calorimeter/ECalBarrel_o2_v03_geo.cpp b/detector/calorimeter/ECalBarrel_o2_v03_geo.cpp
@@ -16,9 +16,7 @@
 #define VERBOSE_LEVEL 0
 
 #include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/Printout.h"
 #include "XML/Layering.h"
-#include "TGeoTrd2.h"
 #include "XML/Utilities.h"
 #include "DDRec/DetectorData.h"
 #include "DDSegmentation/Segmentation.h"

diff --git a/detector/calorimeter/ECalBarrel_o2_v04_geo.cpp b/detector/calorimeter/ECalBarrel_o2_v04_geo.cpp
@@ -17,9 +17,7 @@
 #define VERBOSE_LEVEL 0
 
 #include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/Printout.h"
 #include "XML/Layering.h"
-#include "TGeoTrd2.h"
 #include "XML/Utilities.h"
 #include "DDRec/DetectorData.h"
 #include "DDSegmentation/Segmentation.h"

diff --git a/detector/calorimeter/ECalEndcap_o1_v01_geo.cpp b/detector/calorimeter/ECalEndcap_o1_v01_geo.cpp
@@ -12,9 +12,7 @@
 //=========================================================================
 
 #include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/Printout.h"
 #include "XML/Layering.h"
-#include "TGeoTrd2.h"
 #include "TMath.h"
 #include "XML/Utilities.h"
 #include "DDRec/DetectorData.h"

diff --git a/detector/calorimeter/ECalPlug_o1_v01_geo.cpp b/detector/calorimeter/ECalPlug_o1_v01_geo.cpp
@@ -12,9 +12,6 @@
 //=========================================================================
 
 #include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/Printout.h"
-#include "XML/Layering.h"
-#include "TGeoTrd2.h"
 #include "XML/Utilities.h"
 
 using namespace std;

diff --git a/detector/calorimeter/Hcal_BarrelSD_v00.cpp b/detector/calorimeter/Hcal_BarrelSD_v00.cpp
@@ -8,10 +8,7 @@
 //====================================================================
 
 #include "DD4hep/DetFactoryHelper.h"
-#include "XML/Layering.h"
 #include "XML/Utilities.h"
-#include "DDRec/DetectorData.h"
-#include "LcgeoExceptions.h"
 
 using namespace std;
 

diff --git a/detector/calorimeter/Hcal_Barrel_SD_v01.cpp b/detector/calorimeter/Hcal_Barrel_SD_v01.cpp
@@ -5,10 +5,8 @@
 //  $Id:  $
 //====================================================================
 #include "DD4hep/DetFactoryHelper.h"
-#include "XML/Layering.h"
 #include "XML/Utilities.h"
 #include "DDRec/DetectorData.h"
-#include "LcgeoExceptions.h"
 
 using namespace std;
 

diff --git a/detector/calorimeter/Hcal_Barrel_SD_v02.cpp b/detector/calorimeter/Hcal_Barrel_SD_v02.cpp
@@ -5,10 +5,8 @@
 //  $Id:  $
 //====================================================================
 #include "DD4hep/DetFactoryHelper.h"
-#include "XML/Layering.h"
 #include "XML/Utilities.h"
 #include "DDRec/DetectorData.h"
-#include "LcgeoExceptions.h"
 
 using namespace std;
 

diff --git a/detector/calorimeter/Hcal_EndcapRing_SD_v01.cpp b/detector/calorimeter/Hcal_EndcapRing_SD_v01.cpp
@@ -41,7 +41,6 @@
  */
 
 #include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/DetType.h"
 #include "XML/Layering.h"
 #include "DD4hep/Shapes.h"
 #include "XML/Utilities.h"

diff --git a/detector/calorimeter/Hcal_Endcaps_SD_v01.cpp b/detector/calorimeter/Hcal_Endcaps_SD_v01.cpp
@@ -42,7 +42,6 @@
  */
 
 #include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/DetType.h"
 #include "XML/Layering.h"
 #include "DD4hep/Shapes.h"
 #include "XML/Utilities.h"

diff --git a/detector/calorimeter/Hcal_Endcaps_SD_v02.cpp b/detector/calorimeter/Hcal_Endcaps_SD_v02.cpp
@@ -34,7 +34,6 @@
 //                                                                ²
 //====================================================================
 #include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/DetType.h"
 #include "XML/Layering.h"
 #include "XML/Utilities.h"
 #include "DDRec/DetectorData.h"

diff --git a/detector/calorimeter/SECalEndcap_o1_v01_geo.cpp b/detector/calorimeter/SECalEndcap_o1_v01_geo.cpp
@@ -10,10 +10,8 @@
 //=========================================================================
 
 #include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/Printout.h"
 #include "DD4hep/DetType.h"
 #include "XML/Layering.h"
-#include "TGeoTrd2.h"
 #include "TMath.h"
 #include "XML/Utilities.h"
 #include "DDRec/DetectorData.h"

diff --git a/detector/calorimeter/SEcal04_Barrel.cpp b/detector/calorimeter/SEcal04_Barrel.cpp
@@ -9,9 +9,7 @@
 //====================================================================
 
 #include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/DetType.h"
 #include "XML/Layering.h"
-#include "TGeoTrd2.h"
 
 #include "XML/Utilities.h"
 #include "DDRec/DetectorData.h"

diff --git a/detector/calorimeter/SEcal04_Barrel_v01.cpp b/detector/calorimeter/SEcal04_Barrel_v01.cpp
@@ -9,9 +9,7 @@
 //====================================================================
 
 #include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/DetType.h"
 #include "XML/Layering.h"
-#include "TGeoTrd2.h"
 
 #include "XML/Utilities.h"
 #include "DDRec/DetectorData.h"

diff --git a/detector/calorimeter/SEcal04_ECRing.cpp b/detector/calorimeter/SEcal04_ECRing.cpp
@@ -37,7 +37,6 @@
  */
 
 #include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/DetType.h"
 #include "XML/Layering.h"
 #include "XML/Utilities.h"
 #include "DDRec/DetectorData.h"

diff --git a/detector/calorimeter/SEcal05_Barrel.cpp b/detector/calorimeter/SEcal05_Barrel.cpp
@@ -9,16 +9,12 @@
 //====================================================================
 
 #include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/DetType.h"
 
 #include "XML/Layering.h"
-#include "TGeoTrd2.h"
 
 #include "XML/Utilities.h"
 #include "DDRec/DetectorData.h"
 
-#include "DDSegmentation/MegatileLayerGridXY.h"
-#include "DDSegmentation/WaferGridXY.h"
 
 #include "SEcal05_Helpers.h"
 

diff --git a/detector/calorimeter/SEcal05_ECRing.cpp b/detector/calorimeter/SEcal05_ECRing.cpp
@@ -73,7 +73,6 @@ Start ECRing ...
 
 
 #include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/DetType.h"
 #include "XML/Layering.h"
 #include "XML/Utilities.h"
 #include "DDRec/DetectorData.h"

diff --git a/detector/calorimeter/SEcal05_Endcaps.cpp b/detector/calorimeter/SEcal05_Endcaps.cpp
@@ -40,7 +40,6 @@
 #include "DD4hep/Shapes.h"
 #include "XML/Utilities.h"
 #include "DDRec/DetectorData.h"
-#include "DDSegmentation/WaferGridXY.h"
 #include <sstream>
 
 using namespace std;

diff --git a/detector/calorimeter/SEcal05_Helpers.h b/detector/calorimeter/SEcal05_Helpers.h
@@ -6,9 +6,7 @@
 #include "DDRec/DetectorData.h"
 
 #include "XML/Layering.h"
-#include "XML/Utilities.h"
 
-#include "DD4hep/Segmentations.h"
 
 #include "DDSegmentation/MegatileLayerGridXY.h"
 

diff --git a/detector/calorimeter/SEcal06_Barrel.cpp b/detector/calorimeter/SEcal06_Barrel.cpp
@@ -9,10 +9,8 @@
 //====================================================================
 
 #include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/DetType.h"
 
 #include "XML/Layering.h"
-#include "TGeoTrd2.h"
 
 #include "XML/Utilities.h"
 #include "DDRec/DetectorData.h"

diff --git a/detector/calorimeter/SEcal06_Helpers.cpp b/detector/calorimeter/SEcal06_Helpers.cpp
@@ -1,6 +1,5 @@
 #include "SEcal06_Helpers.h"
 #include "LcgeoExceptions.h"
-#include <sstream>
 
 #include "DDSegmentation/MegatileLayerGridXY.h"
 #include "DDSegmentation/WaferGridXY.h"

diff --git a/detector/calorimeter/SEcal06_Helpers.h b/detector/calorimeter/SEcal06_Helpers.h
@@ -6,7 +6,6 @@
 #include "DDRec/DetectorData.h"
 
 #include "XML/Layering.h"
-#include "XML/Utilities.h"
 
 #include "DD4hep/Segmentations.h"
 

diff --git a/detector/calorimeter/SHcalSc04_Barrel_v01.cpp b/detector/calorimeter/SHcalSc04_Barrel_v01.cpp
@@ -6,7 +6,6 @@
 //====================================================================
 #include "DD4hep/Printout.h"
 #include "DD4hep/DetFactoryHelper.h"
-#include "XML/Layering.h"
 #include "XML/Utilities.h"
 #include "DDRec/DetectorData.h"
 #include "DDSegmentation/TiledLayerGridXY.h"

diff --git a/detector/calorimeter/SHcalSc04_Barrel_v02.cpp b/detector/calorimeter/SHcalSc04_Barrel_v02.cpp
@@ -7,7 +7,6 @@
 #include "DD4hep/DetFactoryHelper.h"
 #include "XML/Utilities.h"
 #include "DDRec/DetectorData.h"
-#include "LcgeoExceptions.h"
 
 using namespace std;
 

diff --git a/detector/calorimeter/SHcalSc04_Barrel_v03.cpp b/detector/calorimeter/SHcalSc04_Barrel_v03.cpp
@@ -9,9 +9,7 @@
 #include "XML/Utilities.h"
 #include "DDRec/DetectorData.h"
 #include "DDSegmentation/TiledLayerGridXY.h"
-#include "LcgeoExceptions.h"
 
-#include <iostream>
 #include <vector>
 
 using namespace std;

diff --git a/detector/calorimeter/SHcalSc04_EndcapRing.cpp b/detector/calorimeter/SHcalSc04_EndcapRing.cpp
@@ -35,7 +35,6 @@
  */
 
 #include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/DetType.h"
 #include "XML/Layering.h"
 #include "DD4hep/Shapes.h"
 #include "XML/Utilities.h"

diff --git a/detector/calorimeter/SHcalSc04_EndcapRing_v01.cpp b/detector/calorimeter/SHcalSc04_EndcapRing_v01.cpp
@@ -38,7 +38,6 @@
  */
 
 #include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/DetType.h"
 #include "XML/Layering.h"
 #include "DD4hep/Shapes.h"
 #include "XML/Utilities.h"

diff --git a/detector/calorimeter/Yoke05_Barrel.cpp b/detector/calorimeter/Yoke05_Barrel.cpp
@@ -32,7 +32,6 @@
 #include "DD4hep/DetFactoryHelper.h"
 #include "DD4hep/DetType.h"
 #include "XML/Layering.h"
-#include "TGeoTrd2.h"
 #include "XML/Utilities.h"
 #include "DDRec/DetectorData.h"
 

diff --git a/detector/calorimeter/dual-readout/include/DRconstructor.h b/detector/calorimeter/dual-readout/include/DRconstructor.h
@@ -1,13 +1,9 @@
 #ifndef DRconstructor_h
 #define DRconstructor_h 1
 
-#include "detectorSegmentations/DRparamBarrel_k4geo.h"
 #include "detectorSegmentations/GridDRcaloHandle_k4geo.h"
 
 #include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/OpticalSurfaces.h"
-#include "DD4hep/Printout.h"
-#include "DD4hep/Detector.h"
 
 namespace ddDRcalo {
   class DRconstructor {

diff --git a/detector/calorimeter/dual-readout/src/FiberDualReadoutCalo_o1_v01.cpp b/detector/calorimeter/dual-readout/src/FiberDualReadoutCalo_o1_v01.cpp
@@ -1,12 +1,10 @@
 #include "detectorSegmentations/DRparamBarrel_k4geo.h"
 #include "detectorSegmentations/DRparamEndcap_k4geo.h"
-#include "detectorSegmentations/GridDRcaloHandle_k4geo.h"
 
 #include "DRconstructor.h"
 
 #include "DD4hep/DetFactoryHelper.h"
 #include "DD4hep/OpticalSurfaces.h"
-#include "DD4hep/Printout.h"
 #include "DD4hep/Detector.h"
 
 namespace ddDRcalo {
@@ -71,4 +69,4 @@ namespace ddDRcalo {
     return drDet;
   }
 } // namespace detector
-DECLARE_DETELEMENT(FiberDualReadoutCalo_o1_v01, ddDRcalo::create_detector) // factory method
+DECLARE_DETELEMENT(FiberDualReadoutCalo_o1_v01, ddDRcalo::create_detector) // factory method
diff --git a/detector/fcal/BeamCal_o1_v01_geo.cpp b/detector/fcal/BeamCal_o1_v01_geo.cpp
@@ -1,5 +1,4 @@
 #include <DD4hep/DetFactoryHelper.h>
-#include "DD4hep/DetType.h"
 #include <XML/Layering.h>
 #include "XML/Utilities.h"
 #include "DDRec/DetectorData.h"

diff --git a/detector/fcal/BeamCal_o1_v02_geo.cpp b/detector/fcal/BeamCal_o1_v02_geo.cpp
@@ -1,5 +1,4 @@
 #include <DD4hep/DetFactoryHelper.h>
-#include "DD4hep/DetType.h"
 #include <XML/Layering.h>
 #include "XML/Utilities.h"
 #include "DDRec/DetectorData.h"

diff --git a/detector/muonSystem/muonSystemMuRWELL_o1_v01.cpp b/detector/muonSystem/muonSystemMuRWELL_o1_v01.cpp
@@ -23,10 +23,8 @@ If used with sensitive layers, the readout must contain a "slice" field
 
 
 #include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/Printout.h"
 #include "XML/XMLElements.h"
-#include <sstream> 
-#include <iostream>
+#include <sstream>
 #include <cmath>
 
 using namespace std;