Move Detector class into own folder in core

src/core/Analysis.hpp

@@ -17,18 +17,16 @@
 #include "TDirectory.h"
 #include "TFile.h"
 
-#include "Detector.h"
 #include "clipboard/Clipboard.hpp"
 #include "config/ConfigManager.hpp"
+#include "detector/Detector.hpp"
 #include "module/Module.hpp"
 
 namespace corryvreckan {
 
     /**
-     * @brief Provides the link between the core framework and the executable.
+     * @brief Core class of the Corryvreckan analysis framework
      *
-     * Supply the path location the main configuration which should be provided to the executable. Hereafter this class
-     * should be used to load, initialize, run and finalize all the modules.
      * The analysis class is the core class which allows the event processing to run. It basically contains a vector of
      * modules, each of which is initialised, run on each event and finalised. It does not define what an event is, merely
      * runs each module sequentially and passes the clipboard between them (erasing it at the end of each run sequence). When

src/core/CMakeLists.txt

@@ -4,7 +4,7 @@ INCLUDE_DIRECTORIES(SYSTEM ${CORRYVRECKAN_DEPS_INCLUDE_DIRS})
 # Create core library
 ADD_LIBRARY(CorryvreckanCore SHARED
     Analysis.cpp
-    Detector.cpp
+    detector/Detector.cpp
     utils/log.cpp
     utils/unit.cpp
     clipboard/Clipboard.cpp

src/core/Detector.cpp → src/core/detector/Detector.cpp

+/** @file
+ *  @brief Implementation of the detector model
+ *  @copyright Copyright (c) 2017 CERN and the Corryvreckan authors.
+ * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
+ * In applying this license, CERN does not waive the privileges and immunities granted to it by virtue of its status as an
+ * Intergovernmental Organization or submit itself to any jurisdiction.
+ */
+
 #include <fstream>
 #include <map>
 #include <string>
 
-#include "Detector.h"
-#include "utils/log.h"
+#include "Detector.hpp"
+#include "core/utils/log.h"
 
 using namespace ROOT::Math;
 using namespace corryvreckan;

src/core/Detector.h → src/core/detector/Detector.hpp

+/** @file
+ *  @brief Detector model class
+ *  @copyright Copyright (c) 2017 CERN and the Corryvreckan authors.
+ * This software is distributed under the terms of the MIT License, copied verbatim in the file "LICENSE.md".
+ * In applying this license, CERN does not waive the privileges and immunities granted to it by virtue of its status as an
+ * Intergovernmental Organization or submit itself to any jurisdiction.
+ */
+
 #ifndef CORRYVRECKAN_DETECTOR_H
 #define CORRYVRECKAN_DETECTOR_H
 
@@ -19,10 +27,10 @@
 #include "Math/Translation3D.h"
 #include "Math/Vector3D.h"
 
-#include "config/Configuration.hpp"
+#include "core/config/Configuration.hpp"
+#include "core/utils/ROOT.h"
+#include "core/utils/log.h"
 #include "objects/Track.h"
-#include "utils/ROOT.h"
-#include "utils/log.h"
 
 using namespace ROOT::Math;
 

src/core/module/Module.hpp

@@ -4,9 +4,9 @@
 // Include files
 #include <string>
 #include "TStopwatch.h"
-#include "core/Detector.h"
 #include "core/clipboard/Clipboard.hpp"
 #include "core/config/Configuration.hpp"
+#include "core/detector/Detector.hpp"
 #include "exceptions.h"
 
 //-------------------------------------------------------------------------------

src/modules/EtaCalculation/EtaCalculation.h

@@ -8,7 +8,6 @@
 #include "TH2F.h"
 #include "TProfile.h"
 
-#include "core/Detector.h"
 #include "core/module/Module.hpp"
 #include "objects/Cluster.h"
 #include "objects/Pixel.h"

src/modules/EtaCorrection/EtaCorrection.h

@@ -8,7 +8,6 @@
 #include "TH2F.h"
 #include "TProfile.h"
 
-#include "core/Detector.h"
 #include "core/module/Module.hpp"
 #include "objects/Cluster.h"
 #include "objects/Pixel.h"