Commit 87a7495d authored by Laurent Claustre's avatar Laurent Claustre

Merge branch '16-generate-conda-packages' into 'master'

16 generate conda packages

See merge request !2
parents e148a266 735ba784
......@@ -3,31 +3,26 @@
#
# Copyright (C) : 2009-2017
# European Synchrotron Radiation Facility
# CS40220 38043 Grenoble Cedex 9
# CS40220 38043 Grenoble Cedex 9
# FRANCE
#
#
# Contact: lima@esrf.fr
#
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
#
# This software is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
############################################################################
set(NAME "andor")
if(UNIX)
set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--add-needed")
endif()
set(${NAME}_srcs src/AndorCamera.cpp src/AndorInterface.cpp
src/AndorDetInfoCtrlObj.cpp src/AndorSyncCtrlObj.cpp
src/AndorBinCtrlObj.cpp src/AndorShutterCtrlObj.cpp
......
......@@ -77,8 +77,6 @@
#include <ostream>
#include <string>
using namespace std;
namespace lima
{
......@@ -226,17 +224,17 @@ namespace lima
void getAdcSpeed(int& index);
void getAdcSpeedInMhz(float& speed);
void getAdcSpeedMaxIndex(int &max_index);
void getAdcSpeedPaireString(int index, string& paire);
void getAdcSpeedPaireString(int index, std::string& paire);
void initVsSpeed();
void setVsSpeed(int vss);
void getVsSpeed(int& vss);
void getVsSpeedMaxIndex(int& max_index);
void getVsSpeedString(int index, string& speed);
void getVsSpeedString(int index, std::string& speed);
void initPGain();
void setPGain(int gain);
void getPGain(int& gain);
void getPGainMaxIndex(int& max_index);
void getPGainString(int index, string& pgain);
void getPGainString(int index, std::string& pgain);
void setFastExtTrigger(bool flag);
void getFastExtTrigger(bool& flag);
void setShutterLevel(int level);
......@@ -286,15 +284,15 @@ namespace lima
bool m_shutter_state;
//- camera stuff
string m_detector_model;
string m_detector_type;
std::string m_detector_model;
std::string m_detector_type;
int m_detector_serial;
FanMode m_fan_mode;
HighCapacityMode m_high_capacity;
BaselineClamp m_baseline_clamp;
//- andor SDK stuff
string m_config_path;
std::string m_config_path;
int m_camera_number;
at_32 m_camera_handle;
AndorCapabilities m_camera_capabilities;
......@@ -326,7 +324,7 @@ namespace lima
bool m_cooler;
int m_read_mode;
int m_acq_mode;
map<TrigMode, int> m_trig_mode_maps;
std::map<TrigMode, int> m_trig_mode_maps;
float m_exp_time;
float m_exp_time_max;
float m_kin_time;
......@@ -335,9 +333,9 @@ namespace lima
#else
int m_ring_buffer_size;
#endif
map<int, string> m_andor_type_maps;
map<int, string> m_adcspeed_maps;
map<int, string> m_vsspeed_maps;
std::map<int, std::string> m_andor_type_maps;
std::map<int, std::string> m_adcspeed_maps;
std::map<int, std::string> m_vsspeed_maps;
};
} // namespace Andor
} // namespace lima
......
......@@ -64,15 +64,15 @@ namespace lima
void setAdcSpeed(int index);
void getAdcSpeed(int& index);
void getAdcSpeedMaxIndex(int& max_index){m_cam.getAdcSpeedMaxIndex(max_index);};
void getAdcSpeedPaireString(int index, string& pgain){m_cam.getAdcSpeedPaireString(index, pgain);};
void getAdcSpeedPaireString(int index, std::string& pgain){m_cam.getAdcSpeedPaireString(index, pgain);};
void setVsSpeed(int index);
void getVsSpeed(int& index);
void getVsSpeedMaxIndex(int& max_index){m_cam.getVsSpeedMaxIndex(max_index);};
void getVsSpeedString(int index, string& speed){m_cam.getVsSpeedString(index, speed);};
void getVsSpeedString(int index, std::string& speed){m_cam.getVsSpeedString(index, speed);};
void setPGain(int index);
void getPGain(int& index);
void getPGainMaxIndex(int& max_index) {m_cam.getPGainMaxIndex(max_index);};
void getPGainString(int index, string& pgain){m_cam.getPGainString(index, pgain);};
void getPGainString(int index, std::string& pgain){m_cam.getPGainString(index, pgain);};
void setFastExtTrigger(bool flag);
void getFastExtTrigger(bool& flag);
void setShutterLevel(int level);
......
......@@ -30,7 +30,6 @@
using namespace lima;
using namespace lima::Andor;
using namespace std;
//---------------------------
//- utility function
......@@ -552,7 +551,7 @@ void Camera::setImageType(ImageType type)
//-----------------------------------------------------
// @brief return the detector type
//-----------------------------------------------------
void Camera::getDetectorType(string& type)
void Camera::getDetectorType(std::string& type)
{
DEB_MEMBER_FUNCT();
......@@ -562,10 +561,10 @@ void Camera::getDetectorType(string& type)
//-----------------------------------------------------
// @brief return the detector model
//-----------------------------------------------------
void Camera::getDetectorModel(string& type)
void Camera::getDetectorModel(std::string& type)
{
DEB_MEMBER_FUNCT();
stringstream ss;
std::stringstream ss;
ss << ", S/N. "<< m_detector_serial;
type = m_detector_model + ss.str();
}
......@@ -1102,7 +1101,7 @@ void Camera::initAdcSpeed()
if (m_adc_speeds[is].speed > speedMax) {
speedMax= m_adc_speeds[is].speed;
m_adc_speed_max_index= is;
stringstream ss;
std::stringstream ss;
ss << "ADC" << m_adc_speeds[is].adc << "_" << m_adc_speeds[is].speed << "MHZ";
m_adcspeed_maps[is] = ss.str();
}
......@@ -1173,7 +1172,7 @@ void Camera::getAdcSpeedMaxIndex(int& max_index)
// @param index
//
//-----------------------------------------------------
void Camera::getAdcSpeedPaireString(int index,string& paire)
void Camera::getAdcSpeedPaireString(int index, std::string& paire)
{
int is;
......@@ -1185,7 +1184,7 @@ void Camera::getAdcSpeedPaireString(int index,string& paire)
{
is = index;
}
stringstream ss;
std::stringstream ss;
ss << "ADC" << m_adc_speeds[is].adc << "_" << m_adc_speeds[is].speed << "MHZ";
paire = ss.str();
}
......@@ -1211,7 +1210,7 @@ void Camera::initVsSpeed()
for (ivss=0; ivss<m_vss_number; ivss++)
{
THROW_IF_NOT_SUCCESS(GetVSSpeed(ivss, &m_vsspeeds[ivss]), "Cannot get VSS value");
stringstream ss;
std::stringstream ss;
ss << m_vsspeeds[ivss] << "USEC";
m_vsspeed_maps[ivss] = ss.str();
}
......@@ -1266,7 +1265,7 @@ void Camera::getVsSpeed(int& index)
// @param vss index
//
//-----------------------------------------------------
void Camera::getVsSpeedString(int index, string& speed)
void Camera::getVsSpeedString(int index, std::string& speed)
{
DEB_MEMBER_FUNCT();
speed = m_vsspeed_maps[index];
......@@ -1357,10 +1356,10 @@ void Camera::getPGainMaxIndex(int& max_index)
max_index = m_gain_number;
}
void Camera::getPGainString(int index, string& pgain)
void Camera::getPGainString(int index, std::string& pgain)
{
DEB_MEMBER_FUNCT();
stringstream ss;
std::stringstream ss;
ss << "X" << m_preamp_gains[index];
pgain = ss.str();
}
......@@ -1648,7 +1647,7 @@ void Camera::getCoolingStatus(std::string& status)
// @param framBufferSize size of the internal circular buffer
//
//-----------------------------------------------------
void Camera::setSpooling(bool flag, SpoolingMethod method, string path, int frameBufferSize)
void Camera::setSpooling(bool flag, SpoolingMethod method, std::string path, int frameBufferSize)
{
DEB_MEMBER_FUNCT();
......
Markdown is supported
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