Commit 09a25a60 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Completely get rid of parameters class. Yes.

parent 37fc0fe0
Pipeline #213716 passed with stage
in 3 minutes and 16 seconds
......@@ -7,7 +7,7 @@ using namespace std;
ATLASpixEventLoader::ATLASpixEventLoader(Configuration config, std::vector<Detector*> detectors)
: Algorithm(std::move(config), std::move(detectors)) {}
void ATLASpixEventLoader::initialise(Parameters* par) {
void ATLASpixEventLoader::initialise() {
// File structure is RunX/ATLASpix/data.dat
......
......@@ -24,7 +24,7 @@ namespace corryvreckan {
~ATLASpixEventLoader() {}
// Functions
void initialise(Parameters*);
void initialise();
StatusCode run(Clipboard* clipboard);
void finalise();
......
......@@ -27,7 +27,7 @@ Alignment::Alignment(Configuration config, std::vector<Detector*> detectors)
LOG(INFO) << "Aligning detector \"" << detectorToAlign << "\"";
}
void Alignment::initialise(Parameters* par) {}
void Alignment::initialise() {}
// During run, just pick up tracks and save them till the end
StatusCode Alignment::run(Clipboard* clipboard) {
......
......@@ -19,7 +19,7 @@ namespace corryvreckan {
~Alignment() {}
// Functions
void initialise(Parameters*);
void initialise();
StatusCode run(Clipboard* clipboard);
void finalise();
......
......@@ -14,7 +14,7 @@ BasicTracking::BasicTracking(Configuration config, std::vector<Detector*> detect
excludeDUT = m_config.get<bool>("excludeDUT", true);
}
void BasicTracking::initialise(Parameters* par) {
void BasicTracking::initialise() {
// Set up histograms
trackChi2 = new TH1F("trackChi2", "trackChi2", 150, 0, 150);
......
......@@ -19,7 +19,7 @@ namespace corryvreckan {
~BasicTracking() {}
// Functions
void initialise(Parameters*);
void initialise();
StatusCode run(Clipboard* clipboard);
void finalise();
......
......@@ -8,7 +8,7 @@ CLICpixEventLoader::CLICpixEventLoader(Configuration config, std::vector<Detecto
m_filename = "";
}
void CLICpixEventLoader::initialise(Parameters* par) {
void CLICpixEventLoader::initialise() {
// File structure is RunX/CLICpix/RunX.dat
......
......@@ -23,7 +23,7 @@ namespace corryvreckan {
~CLICpixEventLoader() {}
// Functions
void initialise(Parameters*);
void initialise();
StatusCode run(Clipboard* clipboard);
void finalise();
......
......@@ -6,7 +6,7 @@ using namespace std;
Clicpix2Correlator::Clicpix2Correlator(Configuration config, std::vector<Detector*> detectors)
: Algorithm(std::move(config), std::move(detectors)) {}
void Clicpix2Correlator::initialise(Parameters* par) {
void Clicpix2Correlator::initialise() {
// Get the DUT ID
dutID = m_config.get<std::string>("DUT");
......
......@@ -20,7 +20,7 @@ namespace corryvreckan {
~Clicpix2Correlator() {}
// Functions
void initialise(Parameters*);
void initialise();
StatusCode run(Clipboard* clipboard);
void finalise();
......
......@@ -6,7 +6,7 @@ using namespace std;
Clicpix2EventLoader::Clicpix2EventLoader(Configuration config, std::vector<Detector*> detectors)
: Algorithm(std::move(config), std::move(detectors)) {}
void Clicpix2EventLoader::initialise(Parameters* par) {
void Clicpix2EventLoader::initialise() {
// File structure is RunX/CLICpix2/data.csv
......
......@@ -24,7 +24,7 @@ namespace corryvreckan {
~Clicpix2EventLoader() {}
// Functions
void initialise(Parameters*);
void initialise();
StatusCode run(Clipboard* clipboard);
void finalise();
......
......@@ -20,7 +20,7 @@ template <typename T> std::string convertToString(T number) {
return ss.str();
}
void ClicpixAnalysis::initialise(Parameters* par) {
void ClicpixAnalysis::initialise() {
// Initialise member variables
m_eventNumber = 0;
......
......@@ -17,7 +17,7 @@ namespace corryvreckan {
~ClicpixAnalysis() {}
// Functions
void initialise(Parameters*);
void initialise();
StatusCode run(Clipboard* clipboard);
void finalise();
bool checkMasked(double, double);
......
......@@ -12,7 +12,7 @@ DUTAnalysis::DUTAnalysis(Configuration config, std::vector<Detector*> detectors)
m_DUT = m_config.get<std::string>("DUT");
}
void DUTAnalysis::initialise(Parameters* par) {
void DUTAnalysis::initialise() {
// Initialise single histograms
tracksVersusTime = new TH1F("tracksVersusTime", "tracksVersusTime", 300000, 0, 300);
......
......@@ -16,7 +16,7 @@ namespace corryvreckan {
~DUTAnalysis() {}
// Functions
void initialise(Parameters*);
void initialise();
StatusCode run(Clipboard* clipboard);
void finalise();
......
......@@ -8,7 +8,7 @@ DataDump::DataDump(Configuration config, std::vector<Detector*> detectors)
m_detector = m_config.get<std::string>("detector", "DeviceToDumpData");
}
void DataDump::initialise(Parameters* par) {
void DataDump::initialise() {
// Initialise member variables
m_eventNumber = 0;
}
......
......@@ -23,7 +23,7 @@ namespace corryvreckan {
~DataDump() {}
// Functions
void initialise(Parameters*);
void initialise();
StatusCode run(Clipboard* clipboard);
void finalise();
......
......@@ -31,7 +31,7 @@ FileReader::FileReader(Configuration config, std::vector<Detector*> detectors)
*/
void FileReader::initialise(Parameters* par) {
void FileReader::initialise() {
// Decide what objects will be read in
if(m_readPixels)
......
......@@ -15,7 +15,7 @@ namespace corryvreckan {
~FileReader() {}
// Functions
void initialise(Parameters*);
void initialise();
StatusCode run(Clipboard* clipboard);
void finalise();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment