Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
Lima-camera-andor
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
LimaGroup
Lima-camera-andor
Commits
e7d03374
Commit
e7d03374
authored
Dec 16, 2015
by
Laurent Claustre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for mt-safe in error exception handling
parent
ac965455
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
336 additions
and
444 deletions
+336
-444
include/AndorCamera.h
include/AndorCamera.h
+2
-7
src/AndorCamera.cpp
src/AndorCamera.cpp
+334
-437
No files found.
include/AndorCamera.h
View file @
e7d03374
...
...
@@ -203,13 +203,11 @@ namespace lima
void
reset
();
// -- andor specific
void
_mapAndorError
();
bool
andorError
(
unsigned
int
code
);
void
initialiseController
();
void
initAdcSpeed
();
void
setAdcSpeed
(
int
adc
);
void
getAdcSpeed
(
int
&
adc
);
void
getAdcSpeedInMhz
(
float
&
adc
);
void
getAdcSpeedInMhz
(
float
&
adc
);
void
initVsSpeed
();
void
setVsSpeed
(
int
vss
);
void
getVsSpeed
(
int
&
vss
);
...
...
@@ -269,8 +267,6 @@ namespace lima
int
m_camera_number
;
at_32
m_camera_handle
;
AndorCapabilities
m_camera_capabilities
;
string
m_camera_error_str
;
int
m_camera_error
;
struct
Adc
{
...
...
@@ -304,12 +300,11 @@ namespace lima
float
m_exp_time_max
;
float
m_kin_time
;
#if defined(WIN32)
long
m_ring_buffer_size
;
long
m_ring_buffer_size
;
#else
int
m_ring_buffer_size
;
#endif
map
<
int
,
string
>
m_andor_type_maps
;
map
<
int
,
string
>
m_andor_error_maps
;
};
}
// namespace Andor
}
// namespace lima
...
...
src/AndorCamera.cpp
View file @
e7d03374
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment