Commit 6e255ad6 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Always read inputDirectory from the configuration

parent 5b6a6de2
......@@ -15,7 +15,7 @@ void CLICpixEventLoader::initialise(Parameters* par) {
// File structure is RunX/CLICpix/RunX.dat
// Take input directory from global parameters
string inputDirectory = parameters->inputDirectory + "/CLICpix";
string inputDirectory = m_config.get<std::string>("inputDirectory") + "/CLICpix";
// Open the root directory
DIR* directory = opendir(inputDirectory.c_str());
......
......@@ -19,7 +19,7 @@ void DataDump::initialise(Parameters* par) {
StatusCode DataDump::run(Clipboard* clipboard) {
// Take input directory from global parameters
string inputDirectory = parameters->inputDirectory + "/" + m_detector;
string inputDirectory = m_config.get<std::string>("inputDirectory") + "/" + m_detector;
// File structure is RunX/ChipID/files.dat
......
......@@ -36,7 +36,7 @@ void Timepix1EventLoader::initialise(Parameters* par) {
parameters = par;
// Take input directory from global parameters
m_inputDirectory = parameters->inputDirectory;
m_inputDirectory = m_config.get<std::string>("inputDirectory");
// Each input directory contains a series of .txt files. Each of these
// contains several events (frames) with different times
......
......@@ -13,7 +13,6 @@ Parameters::Parameters() {
histogramFile = "outputHistograms.root";
dutMaskFile = "defaultMask.dat";
inputDirectory = "";
currentTime = 0.; // seconds
}
......
......@@ -49,7 +49,6 @@ namespace corryvreckan {
}
// Member variables
std::string inputDirectory;
std::string histogramFile;
std::string dutMaskFile;
std::vector<std::string> detectors;
......
Supports Markdown
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