Skip to content

Commit

Permalink
Merge branch 'roi_overflow' into 'master'
Browse files Browse the repository at this point in the history 
Roi overflow

See merge request limagroup/lima!202
  • Loading branch information
@claustre
claustre committed Aug 12, 2021
2 parents 7ee1f1c + 232959d commit bd5a313
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 212 deletions.
2 changes: 1 addition & 1 deletion applications/tango/python
Submodule python updated 4 files
+0 −1 Lima/Server/LimaCCDs.py
+9 −2 Lima/Server/plugins/Bpm.py
+23 −1 Lima/Server/plugins/RoiCollection.py
+25 −0 Lima/Server/plugins/RoiCounter.py
1 change: 1 addition & 0 deletions common/include/lima/OrderedMap.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <vector>
#include <map>
#include <algorithm>
#include <stdexcept>

namespace lima {

Expand Down
213 changes: 4 additions & 209 deletions control/software_operation/include/lima/SoftOpId.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,19 +379,6 @@ namespace lima
SoftOpRoiCounter();
virtual ~SoftOpRoiCounter();

#ifdef USE_DEPRECATED
/** Old way to manage roi's counters
* they are now deprecated,
* please use the new set of methods.
* will be removed in version 2.
*/
void add(const std::list<Roi> &rois);
void set(const std::list<Roi> &rois);
void get(std::list<Roi>&) const;
void del(const std::list<int> &roiIds);
void readCounters(int from,std::list<RoiIdAndResults> &result) const;
#endif
/** New methods set */
void updateRois(const std::list<RoiNameAndRoi>&);
void updateArcRois(const std::list<RoiNameAndArcRoi>&);

Expand All @@ -411,7 +398,6 @@ namespace lima

void removeRois(const std::list<std::string>& names);
void clearAllRois(); /* clear all roi */
/** end of new set */

void clearCounterStatus();
int getCounterStatus() const;
Expand All @@ -422,6 +408,9 @@ namespace lima
void getBufferSize(int &size) const;

/*override*/ bool isActive() const { return !m_task_manager.empty(); }

void getOverflowThreshold(unsigned long long& threshold);
void setOverflowThreshold(unsigned long long threshold);

protected:
virtual bool addTo(TaskMgr&,int stage);
Expand All @@ -445,6 +434,7 @@ namespace lima
int m_history_size;
Data m_mask;
mutable Cond m_cond;
unsigned long long m_overflow_threshold;
};

template <SoftOpRoiCounter::SoftTask::type type, class R>
Expand Down Expand Up @@ -479,85 +469,6 @@ namespace lima
roi = ArcRoi(x,y,r1,r2,a1,a2);
}

#ifdef USE_DEPRECATED
#define ROI_WARNING
#ifdef WIN32
#pragma message ("deprecated use new methods set")
#else
#warning deprecated use new methods set
#endif
inline void SoftOpRoiCounter::add(const std::list<Roi> &rois)
{
ROI_WARNING;
int nb_rois = m_task_manager.size();
std::list<RoiNameAndRoi> local_rois;
std::list<Roi>::const_iterator i, end = rois.end();
for (i = rois.begin(); i != end; ++i, ++nb_rois)
{
RoiNameAndRoi roiname_roi(m_task_manager.getCompatName(nb_rois), *i);
local_rois.push_back(roiname_roi);
}
updateRois(local_rois);
}
inline void SoftOpRoiCounter::set(const std::list<Roi> &rois)
{
clearAllRois();
add(rois);
}
inline void SoftOpRoiCounter::get(std::list<Roi> &rois) const
{
ROI_WARNING;
DEB_MEMBER_FUNCT();
AutoMutex aLock(m_cond.mutex());

std::list<RoiNameAndRoi> names_rois;
getRois(names_rois);
if (int(names_rois.size()) != int(m_task_manager.size()))
THROW_CTL_ERROR(InvalidValue) << "You can't mixed old and new methods set";

std::vector<Roi> v_rois;
v_rois.resize(names_rois.size());
for(std::list<RoiNameAndRoi>::iterator i = names_rois.begin();
i != names_rois.end(); ++i)
{
int roi_id;
if(!m_task_manager.getCompatId(i->first, roi_id))
THROW_CTL_ERROR(InvalidValue) << "You can't mixed old and new methods set";
v_rois[roi_id] = i->second;
}
for(std::vector<Roi>::iterator i = v_rois.begin();
i != v_rois.end();++i)
rois.push_back(*i);
}
inline void SoftOpRoiCounter::del(const std::list<int> &roiIds)
{
ROI_WARNING;
AutoMutex aLock(m_cond.mutex());
std::list<std::string> rois_names;
for(std::list<int>::const_iterator i = roiIds.begin();
i != roiIds.end();++i)
rois_names.push_back(m_task_manager.getCompatName(*i));
removeRois(rois_names);
}
inline void SoftOpRoiCounter::readCounters(int from,
std::list<RoiIdAndResults> &result) const
{
ROI_WARNING;
DEB_MEMBER_FUNCT();
std::list<RoiNameAndResults> tmp_result;
readCounters(from,tmp_result);
for(std::list<RoiNameAndResults>::iterator i = tmp_result.begin();
i != tmp_result.end();++i)
{
int roi_id;
if(!m_task_manager.getCompatId(i->first, roi_id))
THROW_CTL_ERROR(InvalidValue) << "You can't mixed old and new methods set";
result.push_back(RoiIdAndResults(roi_id,i->second));
}
}
#endif


class LIMACORE_API SoftOpRoi2Spectrum : public SoftOpBaseClass
{
DEB_CLASS_NAMESPC(DebModControl,"SoftwareOperation","SoftOpRoi2Spectrum");
Expand All @@ -573,22 +484,6 @@ namespace lima
SoftOpRoi2Spectrum();
virtual ~SoftOpRoi2Spectrum();

#ifdef USE_DEPRECATED
/** Old way to manage roi2spectrum counters
* they are now deprecated,
* please use the new set of methods.
* will be removed in version 2.
*/
void add(const std::list<Roi> &rois);
void set(const std::list<Roi> &rois);
void get(std::list<Roi>&) const;
void del(const std::list<int> &roiIds);
void readCounters(int from,std::list<RoiIdAndResults> &result) const;
void createImage(int roiId,int &from,Data &aData) const;

void getRoiMode(std::list<int>&) const;
void setRoiMode(int roiId,int mode);
#endif
/** New methods set */
void updateRois(const std::list<RoiNameAndRoi>&);
void getRois(std::list<RoiNameAndRoi>&) const;
Expand Down Expand Up @@ -635,106 +530,6 @@ namespace lima
//Data m_mask;
mutable Cond m_cond;
};
#ifdef USE_DEPRECATED
inline void SoftOpRoi2Spectrum::add(const std::list<Roi> &rois)
{
ROI_WARNING;
int nb_rois = m_task_manager.size();
std::list<RoiNameAndRoi> local_rois;
for(std::list<Roi>::const_iterator i = rois.begin();
i != rois.end();++i,++nb_rois)
{
RoiNameAndRoi roiname_roi(m_task_manager.getCompatName(nb_rois), *i);
local_rois.push_back(roiname_roi);
}
updateRois(local_rois);
}
inline void SoftOpRoi2Spectrum::set(const std::list<Roi> &rois)
{
clearAllRois();
add(rois);
}
inline void SoftOpRoi2Spectrum::get(std::list<Roi> &rois) const
{
ROI_WARNING;
DEB_MEMBER_FUNCT();
std::vector<Roi> v_rois;
v_rois.resize(m_task_manager.size());
for(NameMapConstIterator i = m_task_manager.begin();
i != m_task_manager.end();++i)
{
int roi_id;
if(!m_task_manager.getCompatId(i->first, roi_id))
THROW_CTL_ERROR(InvalidValue) << "You can't mixed old and new methods set";
int x,y,width,height;
i->second.second->getRoi(x,y,width,height);
v_rois[roi_id] = Roi(x,y,width,height);
}
for(std::vector<Roi>::iterator i = v_rois.begin();
i != v_rois.end();++i)
rois.push_back(*i);
}
inline void SoftOpRoi2Spectrum::del(const std::list<int> &roiIds)
{
ROI_WARNING;
std::list<std::string> rois_names;
for(std::list<int>::const_iterator i = roiIds.begin();
i != roiIds.end();++i)
rois_names.push_back(m_task_manager.getCompatName(*i));
removeRois(rois_names);
}
inline void SoftOpRoi2Spectrum::readCounters(int from,
std::list<RoiIdAndResults> &result) const
{
ROI_WARNING;
DEB_MEMBER_FUNCT();
std::list<RoiNameAndResults> tmp_result;
readCounters(from,tmp_result);
for(std::list<RoiNameAndResults>::iterator i = tmp_result.begin();
i != tmp_result.end();++i)
{
int roi_id;
if(!m_task_manager.getCompatId(i->first, roi_id))
THROW_CTL_ERROR(InvalidValue) << "You can't mixed old and new methods set";
result.push_back(RoiIdAndResults(roi_id,i->second));
}
}

inline void SoftOpRoi2Spectrum::createImage(int roiId, int& from,
Data& aData) const
{
ROI_WARNING;
createImage(m_task_manager.getCompatName(roiId), from, aData);
}

inline void SoftOpRoi2Spectrum::getRoiMode(std::list<int>& modes) const
{
ROI_WARNING;
DEB_MEMBER_FUNCT();
std::vector<int> v_modes;
v_modes.resize(m_task_manager.size());
for(NameMapConstIterator i = m_task_manager.begin();
i != m_task_manager.end();++i)
{
int roi_id;
if(!m_task_manager.getCompatId(i->first, roi_id))
THROW_CTL_ERROR(InvalidValue) << "You can't mixed old and new methods set";
v_modes.push_back(i->second.second->getMode());
}
for(std::vector<int>::iterator i = v_modes.begin();
i != v_modes.end();++i)
modes.push_back(*i);
}

inline void SoftOpRoi2Spectrum::setRoiMode(int roiId, int mode)
{
ROI_WARNING;
RoiNameAndMode name_mode(m_task_manager.getCompatName(roiId), mode);
std::list<RoiNameAndMode> rois_modes(&name_mode, &name_mode + 1);
setRoiModes(rois_modes);
}
#endif


class LIMACORE_API SoftOpSoftRoi : public SoftOpBaseClass
{
Expand Down
3 changes: 3 additions & 0 deletions control/software_operation/sip/SoftOpId.sip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1000,6 +1000,9 @@ using namespace lima;

void setBufferSize(int size);
void getBufferSize(int &size /Out/) const;

void getOverflowThreshold(unsigned long long& threshold /Out/);
void setOverflowThreshold(unsigned long long threshold);
};

class SoftOpRoi2Spectrum
Expand Down
17 changes: 16 additions & 1 deletion control/software_operation/src/SoftOpId.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,8 @@ bool SoftOpMask::addTo(TaskMgr &aMgr,int stage)

SoftOpRoiCounter::SoftOpRoiCounter() :
SoftOpBaseClass(),
m_history_size(DEFAULT_HISTORY_SIZE)
m_history_size(DEFAULT_HISTORY_SIZE),
m_overflow_threshold(0)
{
m_task_manager.setCompatFormat("roi_%d");
}
Expand Down Expand Up @@ -433,6 +434,20 @@ void SoftOpRoiCounter::_get_or_create(const std::string& roi_name,
aCounterTaskPt = i->second.second;
}
}

void SoftOpRoiCounter::getOverflowThreshold(unsigned long long& threshold)
{
threshold = m_overflow_threshold;
}

void SoftOpRoiCounter::setOverflowThreshold(unsigned long long threshold)
{
AutoMutex aLock(m_cond.mutex());
for(auto &i : m_task_manager)
i.second.first->setOverflowThreshold(threshold);

m_overflow_threshold = threshold;
}
//-------------------- ROI TO SPECTRUM --------------------

SoftOpRoi2Spectrum::SoftOpRoi2Spectrum() :
Expand Down
2 changes: 1 addition & 1 deletion third-party/Processlib
Submodule Processlib updated 6 files
+6 −0 tasks/include/processlib/RoiCollection.h
+10 −2 tasks/include/processlib/RoiCounter.h
+4 −0 tasks/sip/RoiCollection.sip
+3 −0 tasks/sip/RoiCounter.sip
+127 −80 tasks/src/RoiCollection.cpp
+86 −2 tasks/src/RoiCounter.cpp

0 comments on commit bd5a313

Please sign in to comment.