Skip to content

Allow to define specific HTTP and ZMQ ports #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tiagocoutinho wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow to define specific HTTP and ZMQ ports #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions include/EigerCamera.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class LIBEIGER Camera : public HwMaxImageSizeCallbackGen, public EventCallbackGe
enum Status { Initializing, Ready, Armed, Exposure, Fault };
enum CompressionType {NoCompression,LZ4,BSLZ4};

Camera(const std::string& detector_ip);
Camera(const std::string& host, int http_port=80, int stream_port=9999);
~Camera();

void initialize();
Expand Down Expand Up @@ -159,7 +159,8 @@ class LIBEIGER Camera : public HwMaxImageSizeCallbackGen, public EventCallbackGe
void deleteMemoryFiles();
void disarm();

const std::string& getDetectorIp() const;
const std::string& getDetectorHost() const;
int getDetectorStreamPort() const;

private:
friend class Interface;
Expand Down Expand Up @@ -249,7 +250,9 @@ class LIBEIGER Camera : public HwMaxImageSizeCallbackGen, public EventCallbackGe
double m_readout_time;
double m_x_pixelsize, m_y_pixelsize;
Cond m_cond;
std::string m_detector_ip;
std::string m_detector_host;
int m_detector_http_port;
int m_detector_stream_port;
double m_min_frame_time;
CompressionType m_compression_type;
};
Expand Down
2 changes: 1 addition & 1 deletion sip/EigerCamera.sip
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace Eiger
enum Status { Initializing, Ready, Armed, Exposure, Fault };
enum CompressionType {NoCompression,LZ4,BSLZ4};

Camera(const std::string& detector_ip);
Camera(const std::string& detector_ip, int http_port = 80, int stream_port = 9999);
~Camera();

void initialize();
Expand Down
22 changes: 16 additions & 6 deletions src/EigerCamera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class Camera::InitCallback : public Callback
//-----------------------------------------------------------------------------
/// Ctor
//-----------------------------------------------------------------------------
Camera::Camera(const std::string& detector_ip) ///< [in] Ip address of the detector server
Camera::Camera(const std::string& host, int http_port, int stream_port) ///< [in] Ip address of the detector server
: m_frames_triggered(0),
m_frames_acquired(0),
m_latency_time(0.),
Expand All @@ -110,12 +110,16 @@ Camera::Camera(const std::string& detector_ip) ///< [in] Ip address of the dete
m_trigger_state(IDLE),
m_armed(false),
m_serie_id(0),
m_requests(new Requests(detector_ip)),
m_exp_time(1.),
m_detector_ip(detector_ip)
m_detector_host(host),
m_detector_http_port(http_port),
m_detector_stream_port(stream_port)
{
DEB_CONSTRUCTOR();
DEB_PARAM() << DEB_VAR1(detector_ip);
DEB_PARAM() << DEB_VAR1(host);

std::string http_address = host + ":" + std::to_string(http_port);
m_requests = new Requests(http_address);

// Detect EigerAPI version
std::string api_version = m_requests->get_api_version();
Expand Down Expand Up @@ -1170,7 +1174,13 @@ void Camera::disarm()
sendCommand(Requests::DISARM);
}

const std::string& Camera::getDetectorIp() const
const std::string& Camera::getDetectorHost() const
{
return m_detector_ip;
return m_detector_host;
}

int Camera::getDetectorStreamPort() const
{
return m_detector_stream_port;
}

3 changes: 2 additions & 1 deletion src/EigerStream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,8 @@ void Stream::_ZmqThread::_run_sequence()

char stream_endpoint[256];
snprintf(stream_endpoint,sizeof(stream_endpoint),
"tcp://%s:9999",cam.getDetectorIp().c_str());
"tcp://%s:%d",cam.getDetectorHost().c_str(),
cam.getDetectorStreamPort());
if(zmq_connect(stream_socket,stream_endpoint) != 0) {
char error_buffer[256];
const char *error_msg = strerror_r(errno,error_buffer,sizeof(error_buffer));
Expand Down