From 1c1a92a268c6fc4aa1c52c4b0a56469b79748cc7 Mon Sep 17 00:00:00 2001
From: vargheseg <19566373+vargheseg@users.noreply.github.com>
Date: Wed, 6 May 2020 10:33:04 +0200
Subject: [PATCH] Support new D_fct::write signature
---
include/DoocsSpectrum.h | 2 +-
src/DoocsSpectrum.cc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/DoocsSpectrum.h b/include/DoocsSpectrum.h
index b768510..bb88c63 100644
--- a/include/DoocsSpectrum.h
+++ b/include/DoocsSpectrum.h
@@ -73,7 +73,7 @@ namespace ChimeraTK {
void setMacroPulseNumberSource(boost::shared_ptr<ChimeraTK::NDRegisterAccessor<int64_t>> macroPulseNumberSource);
- void write(std::fstream& fptr) override;
+ void write(std::ostream& s) override;
boost::shared_ptr<ChimeraTK::NDRegisterAccessor<float>> _processArray;
boost::shared_ptr<ChimeraTK::NDRegisterAccessor<float>> _startAccessor;
diff --git a/src/DoocsSpectrum.cc b/src/DoocsSpectrum.cc
index 46fd5bb..8776ee9 100644
--- a/src/DoocsSpectrum.cc
+++ b/src/DoocsSpectrum.cc
@@ -80,7 +80,7 @@ namespace ChimeraTK {
}
}
- void DoocsSpectrum::write(std::fstream& fptr) {
+ void DoocsSpectrum::write(std::ostream& s) {
// DOOCS is normally keeping the location lock until everything is written for that location: all D_spectrum and all
// other properties. This can take too long (like seconds), which leads to noticable freezes of the UI. As a
// work-around we release the lock here, wait some time and acquire the lock again. Since this happens in a separate
@@ -89,7 +89,7 @@ namespace ChimeraTK {
usleep(1000);
efp_->lock();
if(!modified) return;
- D_spectrum::write(fptr);
+ D_spectrum::write(s);
}
void DoocsSpectrum::updateDoocsBuffer(TransferElementID transferElementId) {
--
GitLab