Skip to content

GitLab

Commit b0ad6b40 authored by Sebastien Petitdemange's avatar Sebastien Petitdemange
Browse files

First working version of hardware saving with Pilatus

parent 181c9dea
Hide whitespace changes
Inline Side-by-side
pilatus @ a3434f09
Compare f62bc46b...a3434f09
Subproject commit f62bc46bb4dbca5be759cc3901277e3521ca5bee
Subproject commit a3434f09aaf3d1a623fe1e563b3100f7172bc4a4
control/include/CtBuffer.h
View file @ b0ad6b40
......@@ -89,6 +89,8 @@ namespace lima {
void getDataFromHwFrameInfo(Data&,const HwFrameInfoType&,
int readBlockLen=1);
static void transformHwFrameInfoToData(Data&,const HwFrameInfoType&,
int readBlockLen=1);
private:
class _DataDestroyCallback;
friend class _DataDestroyCallback;
......
control/include/CtSaving.h
View file @ b0ad6b40
......@@ -92,7 +92,6 @@ namespace lima {
FileFormat fileFormat; ///< the saving format (EDF,CBF...)
SavingMode savingMode; ///< saving mode (automatic,manual...)
OverwritePolicy overwritePolicy; ///< how you the saving react it find existing filename
ManagedMode managedMode; ///< two option either harware (manage by SDK,hardware) or software (Lima core)
std::string indexFormat; ///< ie: %.4d if you want 4 digits
long framesPerFile; ///< the number of images save in one files
long nbframes;
......@@ -193,7 +192,7 @@ namespace lima {
class Stream;
class LIMACORE_API SaveContainer
{
{
DEB_CLASS_NAMESPC(DebModControl,"Saving Container","Control");
public:
SaveContainer(Stream& stream);
......@@ -221,7 +220,7 @@ namespace lima {
protected:
virtual bool _open(const std::string &filename,
std::ios_base::openmode flags) = 0;
std::ios_base::openmode flags) = 0;
virtual void _close() = 0;
virtual void _writeFile(Data &data,
CtSaving::HeaderMap &aHeader,
......@@ -345,133 +344,137 @@ namespace lima {
bool m_has_hwsaving;
HwSavingCtrlObj* m_hwsaving;
_NewFrameSaveCBK* m_new_frame_save_cbk;
Stream& getStream(int stream_idx)
{ bool stream_ok = (stream_idx >= 0) && (stream_idx < m_nb_stream);
return stream_ok ? *m_stream[stream_idx] : getStreamExc(stream_idx); }
const Stream& getStream(int stream_idx) const
{ bool stream_ok = (stream_idx >= 0) && (stream_idx < m_nb_stream);
return stream_ok ? *m_stream[stream_idx] : getStreamExc(stream_idx); }
Stream& getStreamExc(int stream_idx) const;
SavingMode getAcqSavingMode() const
{ return getStream(0).getParameters(Acq).savingMode; }
ManagedMode getManagedMode() const
{ return getStream(0).getParameters(Acq).managedMode; }
// --- from control
void getSaveCounters(int& first_to_save, int& last_to_save)
{ AutoMutex lock(m_cond.mutex());
first_to_save = last_to_save = -1;
FrameMap::const_iterator it, end = m_frame_datas.end();
for (it = m_frame_datas.begin(); it != end; ++it) {
if (it->first > last_to_save)
last_to_save = it->first;
if ((first_to_save == -1) || (it->first < first_to_save))
first_to_save = it->first;
ManagedMode m_managed_mode; ///< two option either harware (manage by SDK,hardware) or software (Lima core)
std::string m_specific_hardware_format;
Stream& getStream(int stream_idx)
{ bool stream_ok = (stream_idx >= 0) && (stream_idx < m_nb_stream);
return stream_ok ? *m_stream[stream_idx] : getStreamExc(stream_idx); }
const Stream& getStream(int stream_idx) const
{ bool stream_ok = (stream_idx >= 0) && (stream_idx < m_nb_stream);
return stream_ok ? *m_stream[stream_idx] : getStreamExc(stream_idx); }
Stream& getStreamExc(int stream_idx) const;
SavingMode getAcqSavingMode() const
{ return getStream(0).getParameters(Acq).savingMode; }
ManagedMode getManagedMode() const
{ return m_managed_mode; }
// --- from control
void getSaveCounters(int& first_to_save, int& last_to_save)
{ AutoMutex lock(m_cond.mutex());
first_to_save = last_to_save = -1;
FrameMap::const_iterator it, end = m_frame_datas.end();
for (it = m_frame_datas.begin(); it != end; ++it) {
if (it->first > last_to_save)
last_to_save = it->first;
if ((first_to_save == -1) || (it->first < first_to_save))
first_to_save = it->first;
}
}
}
// --- internal call
void _prepare();
void _getCommonHeader(HeaderMap&);
void _takeHeader(FrameHeaderMap::iterator&, HeaderMap& header,
bool keep_in_map);
void _getTaskList(TaskType type, long frame_nr, const HeaderMap& header,
TaskList& task_list);
void _postTaskList(Data&, const TaskList&);
void _compressionFinished(Data&, Stream&);
void _saveFinished(Data&, Stream&);
void _setSavingError(CtControl::ErrorCode);
void _updateParameters();
void _synchronousSaving(Data&,HeaderMap&);
bool _controlIsFault();
bool _newFrameWrite(int);
// --- internal call
void _prepare();
void _getCommonHeader(HeaderMap&);
void _takeHeader(FrameHeaderMap::iterator&, HeaderMap& header,
bool keep_in_map);
void _getTaskList(TaskType type, long frame_nr, const HeaderMap& header,
TaskList& task_list);
void _postTaskList(Data&, const TaskList&);
void _compressionFinished(Data&, Stream&);
void _saveFinished(Data&, Stream&);
void _setSavingError(CtControl::ErrorCode);
void _updateParameters();
void _synchronousSaving(Data&,HeaderMap&);
bool _controlIsFault();
bool _newFrameWrite(int);
bool _checkHwFileFormat(const std::string&) const;
void _ReadImage(Data&,int framenb);
};
inline std::ostream& operator<<(std::ostream &os,const CtSaving::Parameters &params)
{
const char *aFileFormatHumanPt;
switch(params.fileFormat)
{
case CtSaving::EDF:
aFileFormatHumanPt = "EDF";break;
case CtSaving::CBFFormat:
aFileFormatHumanPt = "CBF";break;
case CtSaving::NXS:
aFileFormatHumanPt = "NXS";break;
case CtSaving::FITS:
aFileFormatHumanPt = "FITS";break;
case CtSaving::EDFGZ:
aFileFormatHumanPt = "EDF gzip";break;
default:
aFileFormatHumanPt = "RAW";break;
}
const char *aSavingModeHumanPt;
switch(params.savingMode)
{
case CtSaving::AutoFrame:
aSavingModeHumanPt = "Auto frame";break;
case CtSaving::AutoHeader:
aSavingModeHumanPt = "Auto header";break;
default: // Manual
aSavingModeHumanPt = "Manual";break;
}
const char *anOverwritePolicyHumanPt;
switch(params.overwritePolicy)
{
case CtSaving::Overwrite:
anOverwritePolicyHumanPt = "Overwrite";break;
case CtSaving::Append:
anOverwritePolicyHumanPt = "Append";break;
default: // Abort
{
const char *aFileFormatHumanPt;
switch(params.fileFormat)
{
case CtSaving::EDF:
aFileFormatHumanPt = "EDF";break;
case CtSaving::CBFFormat:
aFileFormatHumanPt = "CBF";break;
case CtSaving::NXS:
aFileFormatHumanPt = "NXS";break;
case CtSaving::FITS:
aFileFormatHumanPt = "FITS";break;
case CtSaving::EDFGZ:
aFileFormatHumanPt = "EDF gzip";break;
default:
aFileFormatHumanPt = "RAW";break;
}
const char *aSavingModeHumanPt;
switch(params.savingMode)
{
case CtSaving::AutoFrame:
aSavingModeHumanPt = "Auto frame";break;
case CtSaving::AutoHeader:
aSavingModeHumanPt = "Auto header";break;
default: // Manual
aSavingModeHumanPt = "Manual";break;
}
const char *anOverwritePolicyHumanPt;
switch(params.overwritePolicy)
{
case CtSaving::Overwrite:
anOverwritePolicyHumanPt = "Overwrite";break;
case CtSaving::Append:
anOverwritePolicyHumanPt = "Append";break;
default: // Abort
anOverwritePolicyHumanPt = "Abort";break;
}
os << "<"
<< "directory=" << params.directory << ", "
<< "prefix=" << params.prefix << ", "
<< "suffix=" << params.suffix << ", "
<< "nextNumber=" << params.nextNumber << ", "
<< "fileFormat=" << params.fileFormat << "," << aFileFormatHumanPt << ", "
<< "savingMode=" << params.savingMode << "," << aSavingModeHumanPt << ", "
<< "overwritePolicy=" << params.overwritePolicy << "," << anOverwritePolicyHumanPt << ", "
<< "framesPerFile=" << params.framesPerFile << ", "
<< "nbframes=" << params.nbframes
<< ">";
return os;
}
}
os << "<"
<< "directory=" << params.directory << ", "
<< "prefix=" << params.prefix << ", "
<< "suffix=" << params.suffix << ", "
<< "nextNumber=" << params.nextNumber << ", "
<< "fileFormat=" << params.fileFormat << "," << aFileFormatHumanPt << ", "
<< "savingMode=" << params.savingMode << "," << aSavingModeHumanPt << ", "
<< "overwritePolicy=" << params.overwritePolicy << "," << anOverwritePolicyHumanPt << ", "
<< "framesPerFile=" << params.framesPerFile << ", "
<< "nbframes=" << params.nbframes
<< ">";
return os;
}
inline bool operator ==(const CtSaving::Parameters& a,
const CtSaving::Parameters& b)
{
return ((a.directory == b.directory) &&
(a.prefix == b.prefix) &&
(a.suffix == b.suffix) &&
(a.imageType == b.imageType) &&
(a.nextNumber == b.nextNumber) &&
(a.fileFormat == b.fileFormat) &&
(a.savingMode == b.savingMode) &&
(a.overwritePolicy == b.overwritePolicy) &&
(a.indexFormat == b.indexFormat) &&
(a.framesPerFile == b.framesPerFile) &&
(a.nbframes == b.nbframes));
}
{
return ((a.directory == b.directory) &&
(a.prefix == b.prefix) &&
(a.suffix == b.suffix) &&
(a.imageType == b.imageType) &&
(a.nextNumber == b.nextNumber) &&
(a.fileFormat == b.fileFormat) &&
(a.savingMode == b.savingMode) &&
(a.overwritePolicy == b.overwritePolicy) &&
(a.indexFormat == b.indexFormat) &&
(a.framesPerFile == b.framesPerFile) &&
(a.nbframes == b.nbframes));
}
inline std::ostream& operator<<(std::ostream &os,const CtSaving::HeaderMap &header)
{
os << "< ";
for(CtSaving::HeaderMap::const_iterator i = header.begin();
i != header.end();++i)
os << "(" << i->first << "," << i->second << ") ";
os << ">";
return os;
}
{
os << "< ";
for(CtSaving::HeaderMap::const_iterator i = header.begin();
i != header.end();++i)
os << "(" << i->first << "," << i->second << ") ";
os << ">";
return os;
}
inline std::ostream& operator<<(std::ostream &os,const CtSaving::HeaderValue &value)
{
os << "< (" << value.first << "," << value.second << ") >";
......
control/sip/CtSaving.sip
View file @ b0ad6b40
......@@ -197,6 +197,8 @@ using namespace lima;
void getFramePerFile(unsigned long& frames_per_file /Out/,
int stream_idx=0) const;
void setManagedMode(ManagedMode mode);
void getManagedMode(ManagedMode &mode /Out/) const;
// --- common headers
void resetCommonHeader();
......
control/src/CtBuffer.cpp
View file @ b0ad6b40
......@@ -256,9 +256,9 @@ void CtBuffer::setup(CtControl *ct)
m_hw_buffer_cb->releaseAll();
}
void CtBuffer::getDataFromHwFrameInfo(Data &fdata,
const HwFrameInfoType& frame_info,
int readBlockLen)
void CtBuffer::transformHwFrameInfoToData(Data &fdata,
const HwFrameInfoType& frame_info,
int readBlockLen)
{
DEB_STATIC_FUNCT();
DEB_PARAM() << DEB_VAR2(frame_info, readBlockLen);
......@@ -302,12 +302,20 @@ void CtBuffer::getDataFromHwFrameInfo(Data &fdata,
fdata.setBuffer(fbuf);
fbuf->unref();
}
void CtBuffer::getDataFromHwFrameInfo(Data &fdata,
const HwFrameInfoType& frame_info,
int readBlockLen)
{
DEB_MEMBER_FUNCT();
transformHwFrameInfoToData(fdata,frame_info,readBlockLen);
// Manage Buffer callback
if(m_hw_buffer_cb)
{
m_hw_buffer_cb->map(frame_info.frame_ptr);
fbuf->callback = m_data_destroy_callback;
fdata.buffer->callback = m_data_destroy_callback;
}
DEB_RETURN() << DEB_VAR1(fdata);
}
......
control/src/CtControl.cpp
View file @ b0ad6b40
......@@ -244,6 +244,11 @@ void CtControl::prepareAcq()
DEB_TRACE() << "Prepare Accumulation if needed";
m_ct_accumulation->prepare();
DEB_TRACE() << "Prepare Saving if needed";
m_ct_saving->_prepare();
m_autosave= m_ct_saving->hasAutoSaveMode();
m_ready= true;
DEB_TRACE() << "Prepare Hardware for Acquisition";
m_hw->prepareAcq();
......@@ -283,10 +288,6 @@ void CtControl::prepareAcq()
else
m_op_ext->setEndSinkTaskCallback(NULL);
m_ct_saving->_prepare();
m_autosave= m_ct_saving->hasAutoSaveMode();
m_ready= true;
#ifdef WITH_SPS_IMAGE
m_display_active_flag = m_ct_sps_image->isActive();
if(m_display_active_flag)
......@@ -302,6 +303,19 @@ void CtControl::prepareAcq()
m_images_buffer.clear();
m_ct_video->_prepareAcq();
m_ct_event->_prepareAcq();
//Check that no software operation is done if Hardware saving is activated
CtSaving::ManagedMode savingManagedMode;
m_ct_saving->getManagedMode(savingManagedMode);
if(savingManagedMode == CtSaving::Hardware &&
(m_op_int_active ||
m_op_ext_link_task_active ||
m_op_ext_sink_task_active ||
#ifdef WITH_SPS_IMAGE
m_display_active_flag ||
#endif
m_ct_video->isActive()))
THROW_CTL_ERROR(Error) << "Can't have any software operation if Hardware saving is active";
}
void CtControl::startAcq()
......@@ -472,7 +486,18 @@ void CtControl::ReadImage(Data &aReturnData,long frameNumber,
else
{
aLock.unlock();
ReadBaseImage(aReturnData,frameNumber,readBlockLen); // todo change when external op activated
CtSaving::ManagedMode savingManagedMode;
m_ct_saving->getManagedMode(savingManagedMode);
if(savingManagedMode == CtSaving::Hardware)
{
if (readBlockLen != 1)
THROW_CTL_ERROR(NotSupported) << "Cannot read more than one frame "
<< "at a time with Hardware Saving";
m_ct_saving->_ReadImage(aReturnData,frameNumber);
}
else
ReadBaseImage(aReturnData,frameNumber,readBlockLen);
}
DEB_RETURN() << DEB_VAR1(aReturnData);
......
control/src/CtSaving.cpp
View file @ b0ad6b40
......@@ -35,6 +35,7 @@
#include "CtSaving.h"
#include "CtSaving_Edf.h"
#include "CtAcquisition.h"
#include "CtBuffer.h"
#ifdef WITH_NXS_SAVING
#include "CtSaving_Nxs.h"
......@@ -141,7 +142,7 @@ private:
*/
CtSaving::Parameters::Parameters()
: nextNumber(0), fileFormat(RAW), savingMode(Manual),
overwritePolicy(Abort),managedMode(Software),
overwritePolicy(Abort),
indexFormat("%04d"),framesPerFile(1)
{
}
......@@ -383,7 +384,7 @@ public:
m_saving(ct_saving)
{
}
bool newFrameWrite(int frame_id)
bool newFrameWritten(int frame_id)
{
return m_saving._newFrameWrite(frame_id);
}
......@@ -398,7 +399,8 @@ CtSaving::CtSaving(CtControl &aCtrl) :
m_ready_flag(true),
m_need_compression(false),
m_nb_save_cbk(0),
m_end_cbk(NULL)
m_end_cbk(NULL),
m_managed_mode(Software)
{
DEB_CONSTRUCTOR();
......@@ -610,6 +612,70 @@ void CtSaving::getFormat(FileFormat& format, int stream_idx) const
DEB_RETURN() << DEB_VAR1(format);
}
/** @brief return a list of hardware possible saving format
*/
void CtSaving::getHardwareFormatList(std::list<std::string> &format_list) const
{
DEB_MEMBER_FUNCT();
if(!m_has_hwsaving)
THROW_CTL_ERROR(NotSupported) << "No hardware saving for this camera";
m_hwsaving->getPossibleSaveFormat(format_list);
}
void CtSaving::setHardwareFormat(const std::string &format)
{
DEB_MEMBER_FUNCT();
if(!m_has_hwsaving)
THROW_CTL_ERROR(NotSupported) << "No hardware saving for this camera";
bool found = _checkHwFileFormat(format);
if(!found)
{
THROW_CTL_ERROR(NotSupported) <<
"Hardware does not support" << DEB_VAR1(format);
}
m_specific_hardware_format = format;
}
bool CtSaving::_checkHwFileFormat(const std::string &format) const
{
std::list<std::string> format_list;
m_hwsaving->getPossibleSaveFormat(format_list);
bool found = false;
for(std::list<std::string>::const_iterator i = format_list.begin();
!found && i != format_list.end();++i)
found = *i == format;
return found;
}
void CtSaving::_ReadImage(Data &image,int frameNumber)
{
DEB_MEMBER_FUNCT();
if(m_hwsaving->getCapabilities() & HwSavingCtrlObj::MANUAL_READ)
{
HwFrameInfoType frame;
m_hwsaving->readFrame(frame,frameNumber);
CtBuffer::transformHwFrameInfoToData(image,frame);
}
else
THROW_CTL_ERROR(NotSupported) << "Image read is not supported for this hardware";
}
void CtSaving::getHardwareFormat(std::string &format) const
{
DEB_MEMBER_FUNCT();
if(!m_has_hwsaving)
THROW_CTL_ERROR(NotSupported) << "No hardware saving for this camera";
format = m_specific_hardware_format;
}
/** @brief set the saving mode for a saving stream
*/
void CtSaving::setSavingMode(SavingMode mode)
......@@ -709,13 +775,21 @@ void CtSaving::setManagedMode(CtSaving::ManagedMode mode)
THROW_CTL_ERROR(InvalidValue) << DEB_VAR1(mode) << "Not supported";
AutoMutex aLock(m_cond.mutex());
for (int s = 0; s < m_nb_stream; ++s)
if(mode == Hardware)
{
Stream& stream = getStream(s);
Parameters pars = stream.getParameters(Auto);
pars.managedMode = mode;
stream.setParameters(pars);
if(!m_has_hwsaving)
THROW_CTL_ERROR(NotSupported) << "Hardware saving is not supported";
int hw_cap = m_hwsaving->getCapabilities();
if(hw_cap & HwSavingCtrlObj::COMMON_HEADER)
m_hwsaving->setCommonHeader(m_common_header);
else if(!m_common_header.empty())
{
THROW_CTL_ERROR(Error) << "Hardware saving do not manage common header"
<< ", clear it first";
}
}
m_managed_mode = mode;
}
void CtSaving::getManagedMode(CtSaving::ManagedMode &mode) const
......@@ -723,9 +797,7 @@ void CtSaving::getManagedMode(CtSaving::ManagedMode &mode) const
DEB_MEMBER_FUNCT();
AutoMutex aLock(m_cond.mutex());
const Stream& stream = getStream(0);
const Parameters& pars = stream.getParameters(Auto);
mode = pars.managedMode;
mode = m_managed_mode;
}
void CtSaving::_getTaskList(TaskType type, long frame_nr,
......@@ -758,9 +830,7 @@ void CtSaving::resetCommonHeader()
AutoMutex aLock(m_cond.mutex());
ManagedMode managed_mode = getManagedMode();
if(managed_mode == Software)
m_common_header.clear();
else
if(managed_mode == Hardware)
{
int hw_cap = m_hwsaving->getCapabilities();
if(hw_cap & HwSavingCtrlObj::COMMON_HEADER)
......@@ -768,6 +838,7 @@ void CtSaving::resetCommonHeader()
else
THROW_CTL_ERROR(NotSupported) << "Common header is not supported";
}
m_common_header.clear();
}
/** @brief set the common header.
This is the header which will be write for all frame for this acquisition
......@@ -779,9 +850,7 @@ void CtSaving::setCommonHeader(const HeaderMap &header)
AutoMutex aLock(m_cond.mutex());
ManagedMode managed_mode = getManagedMode();
if(managed_mode == Software)
m_common_header = header;
else
if(managed_mode == Hardware)
{
int hw_cap = m_hwsaving->getCapabilities();
if(hw_cap & HwSavingCtrlObj::COMMON_HEADER)
......@@ -789,6 +858,7 @@ void CtSaving::setCommonHeader(const HeaderMap &header)
else
THROW_CTL_ERROR(NotSupported) << "Common header is not supported";
}
m_common_header = header;
}
/** @brief replace/add field in the common header
*/
......@@ -1394,21 +1464,58 @@ void CtSaving::_prepare()
DEB_TRACE() << "No auto save activated";
AutoMutex aLock(m_cond.mutex());
if(m_managed_mode == Software)
{
m_need_compression = false;
//prepare all the active streams
for (int s = 0; s < m_nb_stream; ++s) {
Stream& stream = getStream(s);
if (stream.isActive()) {
stream.prepare();
if (stream.needCompression())
m_need_compression = true;
}
}
m_need_compression = false;
m_nb_save_cbk = 0;
m_nb_compression_cbk.clear();
//prepare all the active streams
for (int s = 0; s < m_nb_stream; ++s) {
Stream& stream = getStream(s);
if (stream.isActive()) {
stream.prepare();
if (stream.needCompression())
m_need_compression = true;
if(m_has_hwsaving)