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

added namespaces to MuPixTelescope Loader and fixed small cout error

parent 8a9a8aa1
......@@ -54,7 +54,7 @@ void EventLoaderMuPixTelescope::initialise() {
LOG(INFO) << "File found" << endl;
string file = (m_inputDirectory + "/" + entry->d_name);
LOG(INFO) << "reading " << file;
m_blockFile = new BlockFile(file);
m_blockFile = new mudaq::BlockFile(file);
if(!m_blockFile->open_read()) {
LOG(ERROR) << "File cannot be read" << endl;
return;
......@@ -76,7 +76,7 @@ StatusCode EventLoaderMuPixTelescope::run(std::shared_ptr<Clipboard> clipboard)
LOG(DEBUG) << "Detector with name " << detectorName;
}
map<string, std::shared_ptr<PixelVector>> dataContainers;
TelescopeFrame tf;
mudaq::TelescopeFrame tf;
double frame_start = std::numeric_limits<double>::max();
double frame_end = std::numeric_limits<double>::min();
......@@ -85,7 +85,7 @@ StatusCode EventLoaderMuPixTelescope::run(std::shared_ptr<Clipboard> clipboard)
else {
LOG(DEBUG) << "Found " << tf.num_hits() << " in event";
for(uint i = 0; i < tf.num_hits(); ++i) {
RawHit h = tf.get_hit(i);
mudaq::RawHit h = tf.get_hit(i);
if(h.tag() == 0x4)
h = tf.get_hit(i, 66);
double px_timestamp = 8 * static_cast<double>(((tf.timestamp() >> 2) & 0xFFFFF700) + h.timestamp_raw());
......@@ -114,7 +114,7 @@ StatusCode EventLoaderMuPixTelescope::run(std::shared_ptr<Clipboard> clipboard)
}
// Store current frame time and the length of the event:
LOG(DEBUG) << "Frame with " tf.num_hits() << " hits, time: " << Units::display(frame_start, {"ns", "us", "s"})
LOG(DEBUG) << "Frame with " << tf.num_hits() << " hits, time: " << Units::display(frame_start, {"ns", "us", "s"})
<< ", length: " << Units::display((frame_end - frame_start), {"ns", "us", "s"});
clipboard->putEvent(std::make_shared<Event>(frame_start, frame_end));
......
......@@ -48,8 +48,8 @@ namespace corryvreckan {
bool m_isSorted;
bool m_ts2IsGray;
int m_runNumber;
BlockFile* m_blockFile;
TelescopeFrame m_tf;
mudaq::BlockFile* m_blockFile;
mudaq::TelescopeFrame m_tf;
// Histograms
TH2F* hHitMap;
......
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