Clean up ECAL unapcker code (#444)

Fix compilation warnings, remove commented out code, and apply code formatting rules.
cms-patatrack · Dec 29, 2020 · 823d7fe · 823d7fe
1 parent 6be25f4
commit 823d7fe
Show file tree

Hide file tree

Showing 22 changed files with 1,491 additions and 1,713 deletions.
diff --git a/CUDADataFormats/EcalDigi/BuildFile.xml b/CUDADataFormats/EcalDigi/BuildFile.xml
@@ -1,7 +1,6 @@
-<use name="DataFormats/Common"/>
 <use name="CUDADataFormats/Common"/>
+<use name="DataFormats/Common"/>
 <use name="HeterogeneousCore/CUDAUtilities"/>
-<use name="cuda"/>
 
 <export>
   <lib   name="1"/>

diff --git a/CUDADataFormats/EcalRecHitSoA/BuildFile.xml b/CUDADataFormats/EcalRecHitSoA/BuildFile.xml
@@ -1,8 +1,8 @@
-<use name="DataFormats/Common"/>
+<use name="cuda"/>
 <use name="CUDADataFormats/Common"/>
+<use name="DataFormats/Common"/>
 <use name="DataFormats/EcalDigi"/>
 <use name="HeterogeneousCore/CUDAUtilities"/>
-<use name="cuda"/>
 
 <export>
   <lib   name="1"/>

diff --git a/CUDADataFormats/EcalRecHitSoA/src/classes_def.xml b/CUDADataFormats/EcalRecHitSoA/src/classes_def.xml
@@ -8,14 +8,6 @@
     <class name="cms::cuda::Product<ecal::UncalibratedRecHit<ecal::Tag::ptr>>" persistent="false" />
     <class name="edm::Wrapper<cms::cuda::Product<ecal::UncalibratedRecHit<ecal::Tag::ptr>>>" persistent="false" />
 
-    <!--
-    <class name="std::vector<double, CUDAHostAllocator<double> >"/>
-    <class name="std::vector<float, CUDAHostAllocator<float> >"/>
-    <class name="std::vector<unsigned int, CUDAHostAllocator<unsigned int> >" />
-    -->
-
-    <!--  <class name="std::array<double, 10>" />
-    <class name="std::array<float, 10>" /> -->
     <class name="ecal::UncalibratedRecHit<ecal::Tag::soa>"/>
     <class name="edm::Wrapper<ecal::UncalibratedRecHit<ecal::Tag::soa> >"/>
 </lcgdict>
diff --git a/EventFilter/EcalRawToDigi/BuildFile.xml b/EventFilter/EcalRawToDigi/BuildFile.xml
@@ -1,28 +1,27 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="boost"/>
-<use   name="CalibCalorimetry/EcalLaserCorrection"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/EcalObjects"/>
-<use   name="DataFormats/EcalDetId"/>
-<use   name="DataFormats/EcalDigi"/>
-<use   name="DataFormats/EcalRawData"/>
-<use   name="DataFormats/EcalRecHit"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="DataFormats/Common"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="Geometry/EcalMapping"/>
-<use   name="Geometry/Records"/>
-<use   name="RecoLocalCalo/EcalRecAlgos"/>
-<use   name="RecoLocalCalo/EcalRecProducers"/>
-<use   name="Utilities/StorageFactory"/>
-
-<use   name="cuda"/>
-<use   name="HeterogeneousCore/CUDAUtilities"/>
-<use   name="HeterogeneousCore/CUDACore"/>
-<use   name="CUDADataFormats/EcalDigi" />
+<use name="boost"/>
+<use name="cuda"/>
+<use name="CUDADataFormats/EcalDigi" />
+<use name="CalibCalorimetry/EcalLaserCorrection"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/EcalObjects"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/EcalDetId"/>
+<use name="DataFormats/EcalDigi"/>
+<use name="DataFormats/EcalRawData"/>
+<use name="DataFormats/EcalRecHit"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
+<use name="Geometry/EcalMapping"/>
+<use name="Geometry/Records"/>
+<use name="HeterogeneousCore/CUDACore"/>
+<use name="HeterogeneousCore/CUDAUtilities"/>
+<use name="RecoLocalCalo/EcalRecAlgos"/>
+<use name="RecoLocalCalo/EcalRecProducers"/>
+<use name="Utilities/StorageFactory"/>
 
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>