Commit 15e868c1 authored by Alejandro Homs Puron's avatar Alejandro Homs Puron Committed by operator for beamline
Browse files

Cosmetics: homogenize EigerCamera.h indentation

parent f2e3e6b2
...@@ -48,23 +48,21 @@ namespace eigerapi ...@@ -48,23 +48,21 @@ namespace eigerapi
namespace lima namespace lima
{ {
namespace Eiger namespace Eiger
{ {
class SavingCtrlObj;
class Stream; class SavingCtrlObj;
/******************************************************************* class Stream;
/*******************************************************************
* \class Camera * \class Camera
* \brief object controlling the Eiger camera via EigerAPI * \brief object controlling the Eiger camera via EigerAPI
*******************************************************************/ *******************************************************************/
class LIBEIGER Camera : public HwMaxImageSizeCallbackGen, public EventCallbackGen class LIBEIGER Camera : public HwMaxImageSizeCallbackGen, public EventCallbackGen
{ {
DEB_CLASS_NAMESPC(DebModCamera, "Camera", "Eiger"); DEB_CLASS_NAMESPC(DebModCamera, "Camera", "Eiger");
friend class Interface;
friend class SavingCtrlObj;
friend class Stream;
public: public:
enum ApiGeneration { Eiger1, Eiger2 }; enum ApiGeneration { Eiger1, Eiger2 };
enum Status { Ready, Initialising, Exposure, Readout, Fault }; enum Status { Ready, Initialising, Exposure, Readout, Fault };
enum CompressionType {NoCompression,LZ4,BSLZ4}; enum CompressionType {NoCompression,LZ4,BSLZ4};
...@@ -111,7 +109,7 @@ namespace lima ...@@ -111,7 +109,7 @@ namespace lima
Camera::Status getStatus(); Camera::Status getStatus();
std::string getCamStatus(); std::string getCamStatus();
// void reset(); //void reset();
// -- Eiger specific // -- Eiger specific
void getApiGeneration(ApiGeneration&); void getApiGeneration(ApiGeneration&);
...@@ -144,6 +142,7 @@ namespace lima ...@@ -144,6 +142,7 @@ namespace lima
void setDetectorDistance(double); void setDetectorDistance(double);
void getDetectorDistance(double&); void getDetectorDistance(double&);
void getDataCollectionDate(std::string&); void getDataCollectionDate(std::string&);
void getSoftwareVersion(std::string&); void getSoftwareVersion(std::string&);
void getCompression(bool&); void getCompression(bool&);
...@@ -155,7 +154,12 @@ namespace lima ...@@ -155,7 +154,12 @@ namespace lima
void disarm(); void disarm();
const std::string& getDetectorIp() const; const std::string& getDetectorIp() const;
private: private:
friend class Interface;
friend class SavingCtrlObj;
friend class Stream;
enum InternalStatus {IDLE,RUNNING,ERROR}; enum InternalStatus {IDLE,RUNNING,ERROR};
class AcqCallback; class AcqCallback;
friend class AcqCallback; friend class AcqCallback;
...@@ -170,7 +174,6 @@ namespace lima ...@@ -170,7 +174,6 @@ namespace lima
T val; T val;
Cache() = default; Cache() = default;
Cache(T v) : val(v) {} Cache(T v) : val(v) {}
operator T&() { return val; } operator T&() { return val; }
...@@ -214,8 +217,9 @@ namespace lima ...@@ -214,8 +217,9 @@ namespace lima
Cond m_cond; Cond m_cond;
std::string m_detector_ip; std::string m_detector_ip;
double m_min_frame_time; double m_min_frame_time;
}; };
} // namespace Eiger
} // namespace Eiger
} // namespace lima } // namespace lima
......
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