merge two packets in one

cms-sw · Sep 18, 2020 · 25cc7bf · 25cc7bf
1 parent 3d04120
commit 25cc7bf
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 323 deletions.
diff --git a/RecoLocalCalo/HGCalESProducers/BuildFile.xml b/RecoLocalCalo/HGCalESProducers/BuildFile.xml
@@ -12,6 +12,7 @@
 <use name="DataFormats/ForwardDetId"/>
 <use name="CommonTools/UtilAlgos"/>
 <use name="RecoLocalCalo/HGCalRecAlgos"/>
+<use name="RecoLocalCalo/HGCalESProducers"/>
 <use name="HeterogeneousCore/CUDACore"/>
 <use name="HeterogeneousCore/CUDAUtilities"/>
 <use name="clhep"/>

diff --git a/RecoLocalCalo/HGCalESProducers/plugins/BuildFile.xml b/RecoLocalCalo/HGCalESProducers/plugins/BuildFile.xml
diff --git a/RecoLocalCalo/HGCalESProducers/plugins/HGCalCellPositionsKernelImpl.cu b/RecoLocalCalo/HGCalESProducers/plugins/HGCalCellPositionsKernelImpl.cu
diff --git a/RecoLocalCalo/HGCalESProducers/plugins/HGCalCellPositionsKernelImpl.cuh b/RecoLocalCalo/HGCalESProducers/plugins/HGCalCellPositionsKernelImpl.cuh
diff --git a/RecoLocalCalo/HGCalESProducers/plugins/HeterogeneousHGCalHEFCellPositionsFiller.cc b/RecoLocalCalo/HGCalESProducers/plugins/HeterogeneousHGCalHEFCellPositionsFiller.cc
diff --git a/RecoLocalCalo/HGCalESProducers/plugins/HeterogeneousHGCalHEFCellPositionsFiller.h b/RecoLocalCalo/HGCalESProducers/plugins/HeterogeneousHGCalHEFCellPositionsFiller.h
diff --git a/RecoLocalCalo/HGCalESProducers/plugins/KernelManagerHGCalCellPositions.cu b/RecoLocalCalo/HGCalESProducers/plugins/KernelManagerHGCalCellPositions.cu
diff --git a/RecoLocalCalo/HGCalESProducers/plugins/KernelManagerHGCalCellPositions.h b/RecoLocalCalo/HGCalESProducers/plugins/KernelManagerHGCalCellPositions.h
diff --git a/RecoLocalCalo/HGCalRecProducers/BuildFile.xml b/RecoLocalCalo/HGCalRecProducers/BuildFile.xml
@@ -10,7 +10,6 @@
 <use name="DataFormats/ForwardDetId"/>
 <use name="CommonTools/UtilAlgos"/>
 <use name="RecoLocalCalo/HGCalRecAlgos"/>
-<use name="RecoLocalCalo/HGCalESProducers"/>
 <use name="Geometry/HGCalGeometry"/>
 <use name="Geometry/HGCalCommonData"/>
 <use name="CondFormats/DataRecord"/>

diff --git a/RecoLocalCalo/HGCalRecProducers/plugins/BuildFile.xml b/RecoLocalCalo/HGCalRecProducers/plugins/BuildFile.xml
@@ -9,7 +9,6 @@
 <use name="DataFormats/HcalDetId"/>
 <use name="RecoLocalCalo/HGCalRecAlgos"/>
 <use name="RecoLocalCalo/HGCalRecProducers"/>
-<use name="RecoLocalCalo/HGCalESProducers"/>
 <use name="FWCore/MessageLogger"/>
 <use name="Geometry/CaloGeometry"/>
 <use name="Geometry/HGCalGeometry"/>

diff --git a/RecoLocalCalo/HGCalRecProducers/plugins/HeterogeneousHGCalHEFRecHitProducer.h b/RecoLocalCalo/HGCalRecProducers/plugins/HeterogeneousHGCalHEFRecHitProducer.h
@@ -36,7 +36,7 @@
 #include "CondFormats/HGCalObjects/interface/HeterogeneousHGCalHEFCellPositionsConditions.h"
 #include "CondFormats/DataRecord/interface/HeterogeneousHGCalHEFCellPositionsConditionsRecord.h"
 #include "RecoLocalCalo/HGCalRecProducers/plugins/KernelManagerHGCalRecHit.h"
-#include "RecoLocalCalo/HGCalESProducers/plugins/KernelManagerHGCalCellPositions.h"
+#include "RecoLocalCalo/HGCalRecProducers/plugins/KernelManagerHGCalCellPositions.h"
 
 class HeterogeneousHGCalHEFRecHitProducer: public edm::stream::EDProducer<edm::ExternalWork> 
 {