Commit 735ba784 authored by Samuel Debionne's avatar Samuel Debionne

Fix the missing std namespace name

parent cf317bbb
...@@ -77,8 +77,6 @@ ...@@ -77,8 +77,6 @@
#include <ostream> #include <ostream>
#include <string> #include <string>
using namespace std;
namespace lima namespace lima
{ {
...@@ -226,17 +224,17 @@ namespace lima ...@@ -226,17 +224,17 @@ namespace lima
void getAdcSpeed(int& index); void getAdcSpeed(int& index);
void getAdcSpeedInMhz(float& speed); void getAdcSpeedInMhz(float& speed);
void getAdcSpeedMaxIndex(int &max_index); void getAdcSpeedMaxIndex(int &max_index);
void getAdcSpeedPaireString(int index, string& paire); void getAdcSpeedPaireString(int index, std::string& paire);
void initVsSpeed(); void initVsSpeed();
void setVsSpeed(int vss); void setVsSpeed(int vss);
void getVsSpeed(int& vss); void getVsSpeed(int& vss);
void getVsSpeedMaxIndex(int& max_index); void getVsSpeedMaxIndex(int& max_index);
void getVsSpeedString(int index, string& speed); void getVsSpeedString(int index, std::string& speed);
void initPGain(); void initPGain();
void setPGain(int gain); void setPGain(int gain);
void getPGain(int& gain); void getPGain(int& gain);
void getPGainMaxIndex(int& max_index); void getPGainMaxIndex(int& max_index);
void getPGainString(int index, string& pgain); void getPGainString(int index, std::string& pgain);
void setFastExtTrigger(bool flag); void setFastExtTrigger(bool flag);
void getFastExtTrigger(bool& flag); void getFastExtTrigger(bool& flag);
void setShutterLevel(int level); void setShutterLevel(int level);
...@@ -286,15 +284,15 @@ namespace lima ...@@ -286,15 +284,15 @@ namespace lima
bool m_shutter_state; bool m_shutter_state;
//- camera stuff //- camera stuff
string m_detector_model; std::string m_detector_model;
string m_detector_type; std::string m_detector_type;
int m_detector_serial; int m_detector_serial;
FanMode m_fan_mode; FanMode m_fan_mode;
HighCapacityMode m_high_capacity; HighCapacityMode m_high_capacity;
BaselineClamp m_baseline_clamp; BaselineClamp m_baseline_clamp;
//- andor SDK stuff //- andor SDK stuff
string m_config_path; std::string m_config_path;
int m_camera_number; int m_camera_number;
at_32 m_camera_handle; at_32 m_camera_handle;
AndorCapabilities m_camera_capabilities; AndorCapabilities m_camera_capabilities;
...@@ -326,7 +324,7 @@ namespace lima ...@@ -326,7 +324,7 @@ namespace lima
bool m_cooler; bool m_cooler;
int m_read_mode; int m_read_mode;
int m_acq_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;
float m_exp_time_max; float m_exp_time_max;
float m_kin_time; float m_kin_time;
...@@ -335,9 +333,9 @@ namespace lima ...@@ -335,9 +333,9 @@ namespace lima
#else #else
int m_ring_buffer_size; int m_ring_buffer_size;
#endif #endif
map<int, string> m_andor_type_maps; std::map<int, std::string> m_andor_type_maps;
map<int, string> m_adcspeed_maps; std::map<int, std::string> m_adcspeed_maps;
map<int, string> m_vsspeed_maps; std::map<int, std::string> m_vsspeed_maps;
}; };
} // namespace Andor } // namespace Andor
} // namespace lima } // namespace lima
......
...@@ -64,15 +64,15 @@ namespace lima ...@@ -64,15 +64,15 @@ namespace lima
void setAdcSpeed(int index); void setAdcSpeed(int index);
void getAdcSpeed(int& index); void getAdcSpeed(int& index);
void getAdcSpeedMaxIndex(int& max_index){m_cam.getAdcSpeedMaxIndex(max_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 setVsSpeed(int index);
void getVsSpeed(int& index); void getVsSpeed(int& index);
void getVsSpeedMaxIndex(int& max_index){m_cam.getVsSpeedMaxIndex(max_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 setPGain(int index);
void getPGain(int& index); void getPGain(int& index);
void getPGainMaxIndex(int& max_index) {m_cam.getPGainMaxIndex(max_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 setFastExtTrigger(bool flag);
void getFastExtTrigger(bool& flag); void getFastExtTrigger(bool& flag);
void setShutterLevel(int level); void setShutterLevel(int level);
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
using namespace lima; using namespace lima;
using namespace lima::Andor; using namespace lima::Andor;
using namespace std;
//--------------------------- //---------------------------
//- utility function //- utility function
...@@ -552,7 +551,7 @@ void Camera::setImageType(ImageType type) ...@@ -552,7 +551,7 @@ void Camera::setImageType(ImageType type)
//----------------------------------------------------- //-----------------------------------------------------
// @brief return the detector type // @brief return the detector type
//----------------------------------------------------- //-----------------------------------------------------
void Camera::getDetectorType(string& type) void Camera::getDetectorType(std::string& type)
{ {
DEB_MEMBER_FUNCT(); DEB_MEMBER_FUNCT();
...@@ -562,10 +561,10 @@ void Camera::getDetectorType(string& type) ...@@ -562,10 +561,10 @@ void Camera::getDetectorType(string& type)
//----------------------------------------------------- //-----------------------------------------------------
// @brief return the detector model // @brief return the detector model
//----------------------------------------------------- //-----------------------------------------------------
void Camera::getDetectorModel(string& type) void Camera::getDetectorModel(std::string& type)
{ {
DEB_MEMBER_FUNCT(); DEB_MEMBER_FUNCT();
stringstream ss; std::stringstream ss;
ss << ", S/N. "<< m_detector_serial; ss << ", S/N. "<< m_detector_serial;
type = m_detector_model + ss.str(); type = m_detector_model + ss.str();
} }
...@@ -1102,7 +1101,7 @@ void Camera::initAdcSpeed() ...@@ -1102,7 +1101,7 @@ void Camera::initAdcSpeed()
if (m_adc_speeds[is].speed > speedMax) { if (m_adc_speeds[is].speed > speedMax) {
speedMax= m_adc_speeds[is].speed; speedMax= m_adc_speeds[is].speed;
m_adc_speed_max_index= is; m_adc_speed_max_index= is;
stringstream ss; std::stringstream ss;
ss << "ADC" << m_adc_speeds[is].adc << "_" << m_adc_speeds[is].speed << "MHZ"; ss << "ADC" << m_adc_speeds[is].adc << "_" << m_adc_speeds[is].speed << "MHZ";
m_adcspeed_maps[is] = ss.str(); m_adcspeed_maps[is] = ss.str();
} }
...@@ -1173,7 +1172,7 @@ void Camera::getAdcSpeedMaxIndex(int& max_index) ...@@ -1173,7 +1172,7 @@ void Camera::getAdcSpeedMaxIndex(int& max_index)
// @param index // @param index
// //
//----------------------------------------------------- //-----------------------------------------------------
void Camera::getAdcSpeedPaireString(int index,string& paire) void Camera::getAdcSpeedPaireString(int index, std::string& paire)
{ {
int is; int is;
...@@ -1185,7 +1184,7 @@ void Camera::getAdcSpeedPaireString(int index,string& paire) ...@@ -1185,7 +1184,7 @@ void Camera::getAdcSpeedPaireString(int index,string& paire)
{ {
is = index; is = index;
} }
stringstream ss; std::stringstream ss;
ss << "ADC" << m_adc_speeds[is].adc << "_" << m_adc_speeds[is].speed << "MHZ"; ss << "ADC" << m_adc_speeds[is].adc << "_" << m_adc_speeds[is].speed << "MHZ";
paire = ss.str(); paire = ss.str();
} }
...@@ -1211,7 +1210,7 @@ void Camera::initVsSpeed() ...@@ -1211,7 +1210,7 @@ void Camera::initVsSpeed()
for (ivss=0; ivss<m_vss_number; ivss++) for (ivss=0; ivss<m_vss_number; ivss++)
{ {
THROW_IF_NOT_SUCCESS(GetVSSpeed(ivss, &m_vsspeeds[ivss]), "Cannot get VSS value"); THROW_IF_NOT_SUCCESS(GetVSSpeed(ivss, &m_vsspeeds[ivss]), "Cannot get VSS value");
stringstream ss; std::stringstream ss;
ss << m_vsspeeds[ivss] << "USEC"; ss << m_vsspeeds[ivss] << "USEC";
m_vsspeed_maps[ivss] = ss.str(); m_vsspeed_maps[ivss] = ss.str();
} }
...@@ -1266,7 +1265,7 @@ void Camera::getVsSpeed(int& index) ...@@ -1266,7 +1265,7 @@ void Camera::getVsSpeed(int& index)
// @param vss index // @param vss index
// //
//----------------------------------------------------- //-----------------------------------------------------
void Camera::getVsSpeedString(int index, string& speed) void Camera::getVsSpeedString(int index, std::string& speed)
{ {
DEB_MEMBER_FUNCT(); DEB_MEMBER_FUNCT();
speed = m_vsspeed_maps[index]; speed = m_vsspeed_maps[index];
...@@ -1357,10 +1356,10 @@ void Camera::getPGainMaxIndex(int& max_index) ...@@ -1357,10 +1356,10 @@ void Camera::getPGainMaxIndex(int& max_index)
max_index = m_gain_number; max_index = m_gain_number;
} }
void Camera::getPGainString(int index, string& pgain) void Camera::getPGainString(int index, std::string& pgain)
{ {
DEB_MEMBER_FUNCT(); DEB_MEMBER_FUNCT();
stringstream ss; std::stringstream ss;
ss << "X" << m_preamp_gains[index]; ss << "X" << m_preamp_gains[index];
pgain = ss.str(); pgain = ss.str();
} }
...@@ -1648,7 +1647,7 @@ void Camera::getCoolingStatus(std::string& status) ...@@ -1648,7 +1647,7 @@ void Camera::getCoolingStatus(std::string& status)
// @param framBufferSize size of the internal circular buffer // @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(); 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