Commit a947d191 authored by Lennart Huth's avatar Lennart Huth
Browse files

Merge branch 'fix_skip_time_evdefm26' into 'master'

EventDefinitionM26: fix skip time (comparison in ns)

See merge request !425
parents e74ae5ab a9bfc971
Pipeline #2613153 passed with stages
in 17 minutes and 46 seconds
......@@ -31,7 +31,6 @@ EventDefinitionM26::EventDefinitionM26(Configuration& config, std::vector<std::s
timeshift_ = config_.get<double>("time_shift");
shift_triggers_ = config_.get<int>("shift_triggers");
skip_time_ = config_.get<double>("skip_time");
skip_time_ps_ = static_cast<double>(Units::convert(skip_time_, "ps"));
config_.setDefault<std::string>("eudaq_loglevel", "ERROR");
// Set EUDAQ log level to desired value:
......@@ -135,7 +134,7 @@ unsigned EventDefinitionM26::get_next_event_with_det(const eudaq::FileReaderUP&
LOG(DEBUG) << "Pivot magic, begin: " << Units::display(begin, {"ns", "us", "ms"})
<< ", end: " << Units::display(end, {"ns", "us", "ms"})
<< ", duration = " << Units::display(begin + end, {"ns", "us"});
} else if(det == "tlu" && begin < skip_time_ps_) {
} else if(det == "tlu" && begin < skip_time_) {
LOG(TRACE) << "Event time below skip time: " << Units::display(begin, {"ns", "us", "ms", "s"}) << "vs. "
<< Units::display(skip_time_, {"ns", "us", "ms", "s"});
......
......@@ -53,7 +53,6 @@ namespace corryvreckan {
long double timeshift_{};
int shift_triggers_{};
double skip_time_{};
double skip_time_ps_{};
// EUDAQ2 readers for all required files
eudaq::FileReaderUP readerTime_;
eudaq::FileReaderUP readerDuration_;
......
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