Skip to content
Snippets Groups Projects
Commit 1c1a92a2 authored by vargheseg's avatar vargheseg
Browse files

Support new D_fct::write signature

parent a91fe2be
No related branches found
No related tags found
No related merge requests found
...@@ -73,7 +73,7 @@ namespace ChimeraTK { ...@@ -73,7 +73,7 @@ namespace ChimeraTK {
void setMacroPulseNumberSource(boost::shared_ptr<ChimeraTK::NDRegisterAccessor<int64_t>> macroPulseNumberSource); 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>> _processArray;
boost::shared_ptr<ChimeraTK::NDRegisterAccessor<float>> _startAccessor; boost::shared_ptr<ChimeraTK::NDRegisterAccessor<float>> _startAccessor;
......
...@@ -80,7 +80,7 @@ namespace ChimeraTK { ...@@ -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 // 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 // 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 // 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 { ...@@ -89,7 +89,7 @@ namespace ChimeraTK {
usleep(1000); usleep(1000);
efp_->lock(); efp_->lock();
if(!modified) return; if(!modified) return;
D_spectrum::write(fptr); D_spectrum::write(s);
} }
void DoocsSpectrum::updateDoocsBuffer(TransferElementID transferElementId) { void DoocsSpectrum::updateDoocsBuffer(TransferElementID transferElementId) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment