Rename DataOutput -> TreeWiterDUT

src/modules/DataOutput/CMakeLists.txt → src/modules/TreeWriterDUT/CMakeLists.txt

 # Define module and return the generated name as MODULE_NAME
-CORRYVRECKAN_GLOBAL_MODULE(MODULE_NAME)
+CORRYVRECKAN_DUT_MODULE(MODULE_NAME)
 
 # Add source files to library
 CORRYVRECKAN_MODULE_SOURCES(${MODULE_NAME}
-    DataOutput.cpp
-    # ADD SOURCE FILES HERE...
+    TreeWriterDUT.cpp
 )
 
 # Provide standard install target

src/modules/DataOutput/DataOutput.cpp → src/modules/TreeWriterDUT/TreeWriterDUT.cpp

-#include "DataOutput.h"
+#include "TreeWriterDUT.h"
 #include <vector>
 
 using namespace corryvreckan;
 using namespace std;
 
-DataOutput::DataOutput(Configuration config, std::vector<std::shared_ptr<Detector>> detectors)
-    : Module(std::move(config), std::move(detectors)) {
+TreeWriterDUT::TreeWriterDUT(Configuration config, std::shared_ptr<Detector> detector)
+    : Module(std::move(config), detector), m_detector(detector) {
 
     m_fileName = m_config.get<std::string>("fileName", "outputTuples.root");
     m_treeName = m_config.get<std::string>("treeName", "tree");
@@ -29,8 +29,8 @@ DataOutput::DataOutput(Configuration config, std::vector<std::shared_ptr<Detecto
 
  */
 
-void DataOutput::initialise() {
-    LOG(DEBUG) << "Initialised DataOutput";
+void TreeWriterDUT::initialise() {
+    LOG(DEBUG) << "Initialised TreeWriterDUT";
 
     // Create output file and directories
     m_outputFile = new TFile(m_fileName.c_str(), "RECREATE");
@@ -55,16 +55,12 @@ void DataOutput::initialise() {
     m_outputTree->Branch("intercepts", &v_intercepts);
 }
 
-StatusCode DataOutput::run(Clipboard* clipboard) {
+StatusCode TreeWriterDUT::run(Clipboard* clipboard) {
     // Counter for cluster event ID
     eventID++;
 
-    // Get the DUT
-    auto DUT = get_dut();
+    // Clear data vectors before storing the cluster information for this event
     v_intercepts.clear();
-
-    // Clear data vectors before storing the cluster information for
-    // this event
     v_clusterSizeX.clear();
     v_clusterSizeY.clear();
     v_clusterEventID.clear();
@@ -98,10 +94,10 @@ StatusCode DataOutput::run(Clipboard* clipboard) {
         LOG(DEBUG) << "Found track with associated cluster";
 
         // Get track intercept with DUT in global coordinates
-        trackIntercept = DUT->getIntercept(track);
+        trackIntercept = m_detector->getIntercept(track);
 
         // Calculate the intercept in local coordinates
-        trackInterceptLocal = DUT->globalToLocal(trackIntercept);
+        trackInterceptLocal = m_detector->globalToLocal(trackIntercept);
         v_intercepts.push_back(trackInterceptLocal);
 
         Cluster* cluster = associatedClusters.front();
@@ -161,15 +157,13 @@ StatusCode DataOutput::run(Clipboard* clipboard) {
     return Success;
 }
 
-void DataOutput::finalise() {
+void TreeWriterDUT::finalise() {
     LOG(DEBUG) << "Finalise";
-    // DUT angles for output
-    auto DUT = get_dut();
     auto directory = m_outputFile->mkdir("Directory");
     directory->cd();
     LOG(STATUS) << filledEvents << " events written to file " << m_fileName;
 
-    auto orientation = DUT->rotation();
+    auto orientation = m_detector->rotation();
     directory->WriteObject(&orientation, "DUTorientation");
 
     // Writing out outputfile

src/modules/DataOutput/DataOutput.h → src/modules/TreeWriterDUT/TreeWriterDUT.h

-#ifndef DATAOUTPUT_H
-#define DATAOUTPUT_H 1
+#ifndef TreeWriterDUT_H
+#define TreeWriterDUT_H 1
 
 #include <Math/Point3D.h>
 #include <Math/Vector3D.h>
@@ -13,19 +13,21 @@
 namespace corryvreckan {
     /** @ingroup Modules
      */
-    class DataOutput : public Module {
+    class TreeWriterDUT : public Module {
 
     public:
         // Constructors and destructors
-        DataOutput(Configuration config, std::vector<std::shared_ptr<Detector>> detectors);
-        ~DataOutput() {}
+        TreeWriterDUT(Configuration config, std::shared_ptr<Detector> detector);
+        ~TreeWriterDUT() {}
 
         // Functions
         void initialise();
         StatusCode run(Clipboard* clipboard);
         void finalise();
 
-        // Member variables
+    private:
+        std::shared_ptr<Detector> m_detector;
+
         int numPixels;
         int eventID;
         int filledEvents;
@@ -54,4 +56,4 @@ namespace corryvreckan {
         std::string m_treeName;
     };
 } // namespace corryvreckan
-#endif // DATAOUTPUT_H
+#endif // TreeWriterDUT_H