From 45390d8c8fa34f90a15343ce9ed8ca72f097e074 Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Thu, 19 Jan 2023 11:49:43 +0100
Subject: [PATCH] Cleanup mvd code

Remove path from include statements
Add missing include statements and remove unneeded ones.
Use forward declaration whenever possible.
---
 reco/detectors/mvd/CbmMvdClusterfinder.cxx                    | 1 +
 .../mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h         | 1 +
 reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h    | 2 ++
 sim/detectors/mvd/CbmMvdPixelCharge.h                         | 4 ----
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/reco/detectors/mvd/CbmMvdClusterfinder.cxx b/reco/detectors/mvd/CbmMvdClusterfinder.cxx
index f51ebcbd21..9a819fcda6 100644
--- a/reco/detectors/mvd/CbmMvdClusterfinder.cxx
+++ b/reco/detectors/mvd/CbmMvdClusterfinder.cxx
@@ -25,6 +25,7 @@
 #include <map>       // for allocator, __map_i...
 #include <utility>   // for pair
 
+#include <TClonesArray.h>                          // for TClonesArray
 
 using std::endl;
 using std::fixed;
diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h
index a0c80a5601..1ca9cbe9ef 100644
--- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h
+++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h
@@ -19,6 +19,7 @@
 
 #include "TArrayS.h"
 #include "TCanvas.h"
+#include <TClonesArray.h>
 #include "TH1.h"
 #include "TH1F.h"
 #include "TH2.h"
diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h
index af365c9b93..c33252c826 100644
--- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h
+++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h
@@ -15,12 +15,14 @@
 #include "CbmMvdDigi.h"
 #include "CbmMvdPoint.h"
 #include "CbmMvdSensor.h"
+#include "CbmMvdCluster.h"
 #include "CbmMvdSensorTask.h"
 
 #include "FairTask.h"
 
 #include "TArrayS.h"
 #include "TCanvas.h"
+#include <TClonesArray.h>
 #include "TH1.h"
 #include "TH1F.h"
 #include "TH2.h"
diff --git a/sim/detectors/mvd/CbmMvdPixelCharge.h b/sim/detectors/mvd/CbmMvdPixelCharge.h
index e05dde12a8..72b92da7cb 100644
--- a/sim/detectors/mvd/CbmMvdPixelCharge.h
+++ b/sim/detectors/mvd/CbmMvdPixelCharge.h
@@ -80,8 +80,4 @@ private:
   ClassDef(CbmMvdPixelCharge, 1);
 };
 
-<<<<<<< HEAD
-=======
-
->>>>>>> 85e08e45 (Create separate simulation library from mvd code)
 #endif
-- 
GitLab