Clean up includes and dependencies

cms-sw · Feb 3, 2024 · 64e5704 · 64e5704
1 parent 0b45749
commit 64e5704
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/CondFormats/SiPixelObjects/BuildFile.xml b/CondFormats/SiPixelObjects/BuildFile.xml
@@ -1,20 +1,28 @@
 <use name="alpaka"/>
-<use name="DataFormats/DetId"/>
-<use name="DataFormats/SiPixelDetId"/>
 <use name="CalibFormats/SiPixelObjects"/>
-<use name="FWCore/Utilities"/>
-<use name="DataFormats/FEDRawData"/>
-<use name="CondFormats/Serialization"/>
+<use name="CondCore/DBOutputService"/>
 <use name="CondFormats/DataRecord"/>
-<use name="CondFormats/SiStripObjects"/>
-<use name="Geometry/TrackerGeometryBuilder"/>
 <use name="CondFormats/External"/>
+<use name="CondFormats/Serialization"/>
+<use name="CondFormats/SiStripObjects"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/FEDRawData"/>
 <use name="DataFormats/GeometryVector"/>
+<use name="DataFormats/Portable"/>
+<use name="DataFormats/SiPixelDetId"/>
+<use name="DataFormats/SoATemplate"/>
+<use name="DataFormats/TrackerCommon"/>
+<use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
 <use name="Geometry/CommonDetUnit"/>
 <use name="Geometry/CommonTopologies"/>
-<use name="HeterogeneousCore/AlpakaInterface"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/TrackerGeometryBuilder"/>
 <use name="HeterogeneousCore/AlpakaCore"/>
+<use name="HeterogeneousCore/AlpakaInterface"/>
 <flags ALPAKA_BACKENDS="1"/>
 <export>
   <lib name="1"/>

diff --git a/CondFormats/SiPixelObjects/interface/SiPixelMappingHost.h b/CondFormats/SiPixelObjects/interface/SiPixelMappingHost.h
@@ -1,10 +1,9 @@
-#ifndef CondFormats_SiPixelObjects_SiPixelMappingHost_h
-#define CondFormats_SiPixelObjects_SiPixelMappingHost_h
+#ifndef CondFormats_SiPixelObjects_interface_SiPixelMappingHost_h
+#define CondFormats_SiPixelObjects_interface_SiPixelMappingHost_h
 
-#include <alpaka/alpaka.hpp>
-#include "DataFormats/Portable/interface/PortableHostCollection.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelMappingLayout.h"
+#include "DataFormats/Portable/interface/PortableHostCollection.h"
 
 using SiPixelMappingHost = PortableHostCollection<SiPixelMappingSoA>;
 
-#endif  // CondFormats_SiPixelObjects_SiPixelMappingHost_h
+#endif  // CondFormats_SiPixelObjects_interface_SiPixelMappingHost_h
diff --git a/CondFormats/SiPixelObjects/interface/alpaka/SiPixelMappingDevice.h b/CondFormats/SiPixelObjects/interface/alpaka/SiPixelMappingDevice.h
@@ -2,11 +2,10 @@
 #define CondFormats_SiPixelObjects_interface_alpaka_SiPixelMappingDevice_h
 
 #include <cstdint>
-#include <alpaka/alpaka.hpp>
+
 #include "DataFormats/Portable/interface/alpaka/PortableCollection.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelMappingLayout.h"
-#include "HeterogeneousCore/AlpakaCore/interface/alpaka/ESProducer.h"
-#include "DataFormats/Portable/interface/PortableHostCollection.h"
+#include "HeterogeneousCore/AlpakaInterface/interface/config.h"
 
 namespace ALPAKA_ACCELERATOR_NAMESPACE {