From 35416587db33f918e6b7bc1e46a8dbf486c7c657 Mon Sep 17 00:00:00 2001
From: Andrea Bocci <andrea.bocci@cern.ch>
Date: Sun, 8 Jul 2018 14:35:44 +0200
Subject: [PATCH] Update CA GPU code following the reorganisation in #23363

---
 .../CAHitNtupletHeterogeneousEDProducer.cc    |  6 ++---
 .../plugins/CAHitQuadrupletGeneratorGPU.cc    | 18 +++++--------
 .../plugins/CAHitQuadrupletGeneratorGPU.h     | 26 +++++++++----------
 3 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/RecoPixelVertexing/PixelTriplets/plugins/CAHitNtupletHeterogeneousEDProducer.cc b/RecoPixelVertexing/PixelTriplets/plugins/CAHitNtupletHeterogeneousEDProducer.cc
index 1e4f2fcd56ad6..186a84617e8d3 100644
--- a/RecoPixelVertexing/PixelTriplets/plugins/CAHitNtupletHeterogeneousEDProducer.cc
+++ b/RecoPixelVertexing/PixelTriplets/plugins/CAHitNtupletHeterogeneousEDProducer.cc
@@ -11,13 +11,13 @@
 #include "HeterogeneousCore/CUDACore/interface/GPUCuda.h"
 #include "HeterogeneousCore/CUDAServices/interface/CUDAService.h"
 #include "HeterogeneousCore/Producer/interface/HeterogeneousEDProducer.h"
-
-#include "CAHitQuadrupletGenerator.h"
-#include "CAHitQuadrupletGeneratorGPU.h"
+#include "RecoPixelVertexing/PixelTriplets/interface/CAHitQuadrupletGenerator.h"
 #include "RecoPixelVertexing/PixelTriplets/interface/OrderedHitSeeds.h"
 #include "RecoTracker/TkHitPairs/interface/IntermediateHitDoublets.h"
 #include "RecoTracker/TkHitPairs/interface/RegionsSeedingHitSets.h"
 
+#include "CAHitQuadrupletGeneratorGPU.h"
+
 namespace {
 void fillNtuplets(RegionsSeedingHitSets::RegionFiller &seedingHitSetsFiller,
                   const OrderedHitSeeds &quadruplets) {
diff --git a/RecoPixelVertexing/PixelTriplets/plugins/CAHitQuadrupletGeneratorGPU.cc b/RecoPixelVertexing/PixelTriplets/plugins/CAHitQuadrupletGeneratorGPU.cc
index d7abc6dc65e5b..1230d29f123ff 100644
--- a/RecoPixelVertexing/PixelTriplets/plugins/CAHitQuadrupletGeneratorGPU.cc
+++ b/RecoPixelVertexing/PixelTriplets/plugins/CAHitQuadrupletGeneratorGPU.cc
@@ -2,24 +2,20 @@
 // Author: Felice Pantaleo, CERN
 //
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "CAHitQuadrupletGeneratorGPU.h"
-#include "RecoPixelVertexing/PixelTriplets/interface/ThirdHitPredictionFromCircle.h"
+#include <functional>
 
+#include "CommonTools/Utils/interface/DynArray.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
-
-#include "TrackingTools/DetLayers/interface/BarrelDetLayer.h"
-
-#include "CellularAutomaton.h"
-
-#include "CommonTools/Utils/interface/DynArray.h"
-
 #include "FWCore/Utilities/interface/isFinite.h"
+#include "RecoPixelVertexing/PixelTriplets/interface/ThirdHitPredictionFromCircle.h"
+#include "RecoPixelVertexing/PixelTriplets/src/CellularAutomaton.h"
+#include "TrackingTools/DetLayers/interface/BarrelDetLayer.h"
 
-#include <functional>
+#include "CAHitQuadrupletGeneratorGPU.h"
 
 namespace {
 
diff --git a/RecoPixelVertexing/PixelTriplets/plugins/CAHitQuadrupletGeneratorGPU.h b/RecoPixelVertexing/PixelTriplets/plugins/CAHitQuadrupletGeneratorGPU.h
index 5df14e1857a2e..a6e9db46e68e7 100644
--- a/RecoPixelVertexing/PixelTriplets/plugins/CAHitQuadrupletGeneratorGPU.h
+++ b/RecoPixelVertexing/PixelTriplets/plugins/CAHitQuadrupletGeneratorGPU.h
@@ -2,26 +2,24 @@
 #define RECOPIXELVERTEXING_PIXELTRIPLETS_CAHITQUADRUPLETGENERATORGPU_H
 
 #include <cuda_runtime.h>
-#include "GPUHitsAndDoublets.h"
 
-#include "RecoTracker/TkSeedingLayers/interface/SeedComparitorFactory.h"
-#include "RecoTracker/TkSeedingLayers/interface/SeedComparitor.h"
-#include "RecoPixelVertexing/PixelTrackFitting/interface/RZLine.h"
-#include "RecoTracker/TkSeedGenerator/interface/FastCircleFit.h"
-#include "RecoTracker/TkMSParametrization/interface/PixelRecoUtilities.h"
-#include "RecoTracker/TkMSParametrization/interface/LongitudinalBendingCorrection.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
-#include "CAGraph.h"
-
-#include "RecoTracker/TkHitPairs/interface/HitPairGeneratorFromLayerPair.h"
-#include "RecoTracker/TkHitPairs/interface/LayerHitMapCache.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
-
-#include "RecoTracker/TkHitPairs/interface/IntermediateHitDoublets.h"
-#include "RecoPixelVertexing/PixelTriplets/interface/OrderedHitSeeds.h"
 #include "HeterogeneousCore/CUDAUtilities/interface/GPUSimpleVector.h"
+#include "RecoPixelVertexing/PixelTrackFitting/interface/RZLine.h"
+#include "RecoPixelVertexing/PixelTriplets/interface/OrderedHitSeeds.h"
+#include "RecoTracker/TkHitPairs/interface/HitPairGeneratorFromLayerPair.h"
+#include "RecoTracker/TkHitPairs/interface/IntermediateHitDoublets.h"
+#include "RecoTracker/TkHitPairs/interface/LayerHitMapCache.h"
+#include "RecoTracker/TkMSParametrization/interface/LongitudinalBendingCorrection.h"
+#include "RecoTracker/TkMSParametrization/interface/PixelRecoUtilities.h"
+#include "RecoTracker/TkSeedGenerator/interface/FastCircleFit.h"
+#include "RecoTracker/TkSeedingLayers/interface/SeedComparitor.h"
+#include "RecoTracker/TkSeedingLayers/interface/SeedComparitorFactory.h"
+
 #include "GPUCACell.h"
+#include "GPUHitsAndDoublets.h"
 
 class TrackingRegion;
 class SeedingLayerSetsHits;