Change algorithm interface, do not pass clipboard but list of detectors

src/algorithms/ATLASpixEventLoader.cpp

@@ -4,8 +4,8 @@
 using namespace corryvreckan;
 using namespace std;
 
-ATLASpixEventLoader::ATLASpixEventLoader(Configuration config, Clipboard* clipboard)
-    : Algorithm(std::move(config), clipboard) {}
+ATLASpixEventLoader::ATLASpixEventLoader(Configuration config, std::vector<Detector*> detectors)
+    : Algorithm(std::move(config), std::move(detectors)) {}
 
 void ATLASpixEventLoader::initialise(Parameters* par) {
 

src/algorithms/ATLASpixEventLoader.h

@@ -20,12 +20,12 @@ namespace corryvreckan {
 
     public:
         // Constructors and destructors
-        ATLASpixEventLoader(Configuration config, Clipboard* clipboard);
+        ATLASpixEventLoader(Configuration config, std::vector<Detector*> detectors);
         ~ATLASpixEventLoader() {}
 
         // Functions
         void initialise(Parameters*);
-        StatusCode run(Clipboard*);
+        StatusCode run(Clipboard* clipboard);
         void finalise();
 
         // Histograms for several devices

src/algorithms/Alignment.cpp

@@ -5,7 +5,8 @@
 using namespace corryvreckan;
 using namespace std;
 
-Alignment::Alignment(Configuration config, Clipboard* clipboard) : Algorithm(std::move(config), clipboard) {
+Alignment::Alignment(Configuration config, std::vector<Detector*> detectors)
+    : Algorithm(std::move(config), std::move(detectors)) {
     m_numberOfTracksForAlignment = 20000;
     nIterations = 3;
 }

src/algorithms/Alignment.h

@@ -15,12 +15,12 @@ namespace corryvreckan {
 
     public:
         // Constructors and destructors
-        Alignment(Configuration config, Clipboard* clipboard);
+        Alignment(Configuration config, std::vector<Detector*> detectors);
         ~Alignment() {}
 
         // Functions
         void initialise(Parameters*);
-        StatusCode run(Clipboard*);
+        StatusCode run(Clipboard* clipboard);
         void finalise();
 
         // Member variables

src/algorithms/BasicTracking.cpp

@@ -5,7 +5,8 @@
 using namespace corryvreckan;
 using namespace std;
 
-BasicTracking::BasicTracking(Configuration config, Clipboard* clipboard) : Algorithm(std::move(config), clipboard) {
+BasicTracking::BasicTracking(Configuration config, std::vector<Detector*> detectors)
+    : Algorithm(std::move(config), std::move(detectors)) {
     // Default values for cuts
     timingCut = 200. / 1000000000.; // 200 ns
     spatialCut = 0.2;               // 200 um

src/algorithms/BasicTracking.h

@@ -15,12 +15,12 @@ namespace corryvreckan {
 
     public:
         // Constructors and destructors
-        BasicTracking(Configuration config, Clipboard* clipboard);
+        BasicTracking(Configuration config, std::vector<Detector*> detectors);
         ~BasicTracking() {}
 
         // Functions
         void initialise(Parameters*);
-        StatusCode run(Clipboard*);
+        StatusCode run(Clipboard* clipboard);
         void finalise();
 
         //  Cluster* getNearestCluster(Cluster*, map<Cluster*, bool>, Clusters*);

src/algorithms/CLICpixEventLoader.cpp

@@ -3,8 +3,8 @@
 using namespace corryvreckan;
 using namespace std;
 
-CLICpixEventLoader::CLICpixEventLoader(Configuration config, Clipboard* clipboard)
-    : Algorithm(std::move(config), clipboard) {
+CLICpixEventLoader::CLICpixEventLoader(Configuration config, std::vector<Detector*> detectors)
+    : Algorithm(std::move(config), std::move(detectors)) {
     m_filename = "";
 }
 

src/algorithms/CLICpixEventLoader.h

@@ -19,12 +19,12 @@ namespace corryvreckan {
 
     public:
         // Constructors and destructors
-        CLICpixEventLoader(Configuration config, Clipboard* clipboard);
+        CLICpixEventLoader(Configuration config, std::vector<Detector*> detectors);
         ~CLICpixEventLoader() {}
 
         // Functions
         void initialise(Parameters*);
-        StatusCode run(Clipboard*);
+        StatusCode run(Clipboard* clipboard);
         void finalise();
 
         // Member variables

src/algorithms/Clicpix2Correlator.cpp

@@ -3,8 +3,8 @@
 using namespace corryvreckan;
 using namespace std;
 
-Clicpix2Correlator::Clicpix2Correlator(Configuration config, Clipboard* clipboard)
-    : Algorithm(std::move(config), clipboard) {}
+Clicpix2Correlator::Clicpix2Correlator(Configuration config, std::vector<Detector*> detectors)
+    : Algorithm(std::move(config), std::move(detectors)) {}
 
 template <typename T> std::string makeString(T number) {
     std::ostringstream ss;

src/algorithms/Clicpix2Correlator.h

@@ -16,12 +16,12 @@ namespace corryvreckan {
 
     public:
         // Constructors and destructors
-        Clicpix2Correlator(Configuration config, Clipboard* clipboard);
+        Clicpix2Correlator(Configuration config, std::vector<Detector*> detectors);
         ~Clicpix2Correlator() {}
 
         // Functions
         void initialise(Parameters*);
-        StatusCode run(Clipboard*);
+        StatusCode run(Clipboard* clipboard);
         void finalise();
 
         // Member variables

src/algorithms/Clicpix2EventLoader.cpp

@@ -3,8 +3,8 @@
 using namespace corryvreckan;
 using namespace std;
 
-Clicpix2EventLoader::Clicpix2EventLoader(Configuration config, Clipboard* clipboard)
-    : Algorithm(std::move(config), clipboard) {}
+Clicpix2EventLoader::Clicpix2EventLoader(Configuration config, std::vector<Detector*> detectors)
+    : Algorithm(std::move(config), std::move(detectors)) {}
 
 void Clicpix2EventLoader::initialise(Parameters* par) {
 

src/algorithms/Clicpix2EventLoader.h

@@ -20,12 +20,12 @@ namespace corryvreckan {
 
     public:
         // Constructors and destructors
-        Clicpix2EventLoader(Configuration config, Clipboard* clipboard);
+        Clicpix2EventLoader(Configuration config, std::vector<Detector*> detectors);
         ~Clicpix2EventLoader() {}
 
         // Functions
         void initialise(Parameters*);
-        StatusCode run(Clipboard*);
+        StatusCode run(Clipboard* clipboard);
         void finalise();
 
         // Histograms for several devices

src/algorithms/ClicpixAnalysis.cpp

@@ -6,7 +6,8 @@
 using namespace corryvreckan;
 using namespace std;
 
-ClicpixAnalysis::ClicpixAnalysis(Configuration config, Clipboard* clipboard) : Algorithm(std::move(config), clipboard) {
+ClicpixAnalysis::ClicpixAnalysis(Configuration config, std::vector<Detector*> detectors)
+    : Algorithm(std::move(config), std::move(detectors)) {
 
     m_associationCut = m_config.get<double>("associationCut", 0.05); // 100 um
     m_proximityCut = m_config.get<double>("proximityCut", 0.0005);   // 125 um

src/algorithms/ClicpixAnalysis.h

@@ -13,12 +13,12 @@ namespace corryvreckan {
 
     public:
         // Constructors and destructors
-        ClicpixAnalysis(Configuration config, Clipboard* clipboard);
+        ClicpixAnalysis(Configuration config, std::vector<Detector*> detectors);
         ~ClicpixAnalysis() {}
 
         // Functions
         void initialise(Parameters*);
-        StatusCode run(Clipboard*);
+        StatusCode run(Clipboard* clipboard);
         void finalise();
         bool checkMasked(double, double);
         void fillClusterHistos(Clusters*);

src/algorithms/DUTAnalysis.cpp

@@ -6,7 +6,8 @@
 
 using namespace corryvreckan;
 
-DUTAnalysis::DUTAnalysis(Configuration config, Clipboard* clipboard) : Algorithm(std::move(config), clipboard) {
+DUTAnalysis::DUTAnalysis(Configuration config, std::vector<Detector*> detectors)
+    : Algorithm(std::move(config), std::move(detectors)) {
     m_digitalPowerPulsing = false;
 }
 

src/algorithms/DUTAnalysis.h

@@ -12,12 +12,12 @@ namespace corryvreckan {
 
     public:
         // Constructors and destructors
-        DUTAnalysis(Configuration config, Clipboard* clipboard);
+        DUTAnalysis(Configuration config, std::vector<Detector*> detectors);
         ~DUTAnalysis() {}
 
         // Functions
         void initialise(Parameters*);
-        StatusCode run(Clipboard*);
+        StatusCode run(Clipboard* clipboard);
         void finalise();
 
         // Histograms

src/algorithms/DataDump.cpp

@@ -3,7 +3,8 @@
 using namespace corryvreckan;
 using namespace std;
 
-DataDump::DataDump(Configuration config, Clipboard* clipboard) : Algorithm(std::move(config), clipboard) {
+DataDump::DataDump(Configuration config, std::vector<Detector*> detectors)
+    : Algorithm(std::move(config), std::move(detectors)) {
     m_detector = m_config.get<std::string>("detector", "DeviceToDumpData");
 }
 

src/algorithms/DataDump.h

@@ -19,12 +19,12 @@ namespace corryvreckan {
 
     public:
         // Constructors and destructors
-        DataDump(Configuration config, Clipboard* clipboard);
+        DataDump(Configuration config, std::vector<Detector*> detectors);
         ~DataDump() {}
 
         // Functions
         void initialise(Parameters*);
-        StatusCode run(Clipboard*);
+        StatusCode run(Clipboard* clipboard);
         void finalise();
 
         // Member variables

src/algorithms/FileReader.cpp

@@ -3,7 +3,8 @@
 using namespace corryvreckan;
 using namespace std;
 
-FileReader::FileReader(Configuration config, Clipboard* clipboard) : Algorithm(std::move(config), clipboard) {
+FileReader::FileReader(Configuration config, std::vector<Detector*> detectors)
+    : Algorithm(std::move(config), std::move(detectors)) {
     m_onlyDUT = false;
     m_readPixels = true;
     m_readClusters = false;

src/algorithms/FileReader.h

@@ -11,12 +11,12 @@ namespace corryvreckan {
 
     public:
         // Constructors and destructors
-        FileReader(Configuration config, Clipboard* clipboard);
+        FileReader(Configuration config, std::vector<Detector*> detectors);
         ~FileReader() {}
 
         // Functions
         void initialise(Parameters*);
-        StatusCode run(Clipboard*);
+        StatusCode run(Clipboard* clipboard);
         void finalise();
 
         // Member variables