lin-epics-modules/ADAndor
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,729 Commits 2 Branches 10 Tags
sinq
Commit Graph

146 Commits

Author SHA1 Message Date
Mark Rivers
672e5c1357 Make Shamrock support optional because it does not work on recent Linux systems 2025-02-18 17:08:20 -06:00
James Souter
9a077b0704 use new updateTimeStamps method 2023-11-17 09:17:23 +00:00
James Souter
2c4265d493 base frame timestamp off epicsTS 2023-11-16 10:10:02 +00:00
Will Smith
558fcc0b89 Revert "changed line endings" 
This reverts commit 7c55466343.
 2023-03-02 16:31:21 +00:00
Will Smith
dc6463c7e7 changes required to wait before setting Busy 2023-03-02 16:31:07 +00:00
Will Smith
7c55466343 changed line endings 2023-03-02 16:29:22 +00:00
Will Smith
262f15bd87 undoing 2023-03-02 16:27:54 +00:00
Will Smith
d88206e027 wait for the ADStatus to change, allow other threads to change 2023-03-01 14:05:11 +00:00
Mark Rivers
71ba531999 Fix logic waiting for camera actually being done 2023-02-28 09:02:22 -06:00
Mark Rivers
440176e7c0 Wait for the status thread to set ADStatus to something other than ADStatusAcquire in the dataTask before finishing an acquisition 2023-02-24 16:06:47 -06:00
Heesterman, Peter J
96aef8af8f Only call SetVSAmplitude if the camera supports it. (Issue #49) 2022-02-10 08:38:22 +00:00
Mark Rivers
ccad8dc0b9 Build test programs 2022-02-02 20:41:05 -06:00
Heesterman, Peter J
7dce622ee3 Corrected pixel index misunderstanding. 
areaDetector uses 0-based indexes, whereas the Andor API uses 1-based indexes.
 2021-08-25 14:55:24 +01:00
Mark Rivers
546f31c29f Change and to && to compiler on Windows 2020-03-23 17:42:24 -05:00
Tom Trafford
5d3277e549 Fixed logic from < to > 2020-03-20 09:29:25 +00:00
Tom Trafford
1b58f21f6d Added check in constructor before setting temperature 2020-03-19 08:48:17 +00:00
Tom Trafford
557cbf8f00 Added check in desctructor to see if it had errored 2020-03-16 11:20:55 +00:00
Benjamin Bradnick
d7987f5e83 Merge branch 'master' of https://github.com/areaDetector/ADAndor into fix/wait-for-acquire 2020-03-05 08:59:31 +00:00
Mark Rivers
bf9421a514 Merge pull request #31 from dls-controls/fix/temperature-control 
Temperature parameter is set on startup to current temperature. Inval…
 2020-03-04 13:15:09 -06:00
Mark Rivers
30d52f7843 Merge pull request #35 from dls-controls/fix/catch-ADCSpeed-error 
Catch exception thrown while changing ADCSpeed during acquisition
 2020-03-04 13:10:46 -06:00
Benjamin Bradnick
ee79be3f5a Re-added comment for dataTask event 2020-02-26 14:12:54 +00:00
Tom Trafford
0284160349 Catch exception thrown while changing ADCSpeed during acquisition 2020-02-26 09:25:25 +00:00
Benjamin Bradnick
30bc883ea5 Re-add setting status to asynError when starting acquisition throws exception 2020-02-21 09:09:38 +00:00
Benjamin Bradnick
d2320b8b76 Acquisition setup and start now occur in writeInt32 2020-02-21 09:03:40 +00:00
Benjamin Bradnick
323eece01c Cleaned up comments 2020-02-20 13:19:40 +00:00
Benjamin Bradnick
45b8b8af12 Revert "Now set ADAcquire parameter to 1 after detector acquisition has started" 
This reverts commit 86153c20ca.
 2020-02-20 13:15:44 +00:00
Benjamin Bradnick
86153c20ca Now set ADAcquire parameter to 1 after detector acquisition has started 2020-02-19 15:54:51 +00:00
Benjamin Bradnick
6b60c8c07d Temperature parameter is set on startup to current temperature. Invalid temperatures no longer update the parameter. 2020-02-17 16:38:31 +00:00
Mark Rivers
47183c09d7 Add bob conversion 2020-01-25 11:37:24 -06:00
Mark Rivers
2eb495df73 Add bob 2020-01-25 11:37:04 -06:00
Mark Rivers
157143f018 Add op directory 2020-01-25 11:36:52 -06:00
Mark Rivers
591bbca85d Fixed bug with ADShutterMode; setupShutter was not being called when ADShutterMode changed 2019-12-05 09:28:47 -06:00
Heesterman, Peter J
9d60dfbc1f Added call to mMultiTrack.storeTrackAttributes(pArray->pAttributeList) in order to store the attributes. 
Also, removed unnecessary use of NUM_ANDOR_DET_PARAMS and NUM_SR_PARAMS.
 2019-11-28 12:06:03 +00:00
Heesterman, Peter J
5e34010855 Added capability for CCD multi-track use. 
This is typically used in spectroscopy applications.

Also, there was an issue that the dataTask thread was unable to exit, preventing clean shut-down when the user types 'exit'.
 2019-11-20 11:14:21 +00:00
Mark Rivers
087d9c1352 Fixed number of arguments parameter in iocshFuncDef, was 7 increased to 8 2019-11-11 06:48:35 -06:00
Mark Rivers
73757f9661 Change from epicsInt32 to at_32 to compile on 64-bit Windows 2018-12-19 17:57:28 -06:00
Hinko Kocevar
7641988b51 use device serial number to select the camera (0 for any camera) 2018-12-18 15:23:38 +01:00
Mark Rivers
a0787d23c2 Add cameraID to constructor to select which camera in a multiple camera system; select camera 2018-12-04 17:04:19 -06:00
Mark Rivers
a39a033940 Add cameraID to constructor to select which camera in a multiple camera system 2018-12-04 17:04:06 -06:00
JerryJia
a0860fed15 missing comma in addprefix function 
USR_INCLUDES += $(addprefix -I, $(XML2_INCLUDE))
 2018-08-04 02:51:52 +08:00
Mark Rivers
02ee37f819 R2-8 2018-07-01 18:12:29 -05:00
Mark Rivers
e0d9cc34be Use addprefix to add -I 2018-07-01 08:59:00 -05:00
Mark Rivers
ee3a307bf4 Added NumQueuedArrays, ADBuffers 2018-07-01 08:58:13 -05:00
Mark Rivers
fe1cbc9798 Updated conversions with improved medm adl files 2018-01-31 12:19:32 -06:00
Mark Rivers
6ff8eb8563 Fixed size and datatype of text and text update widgets 2018-01-31 12:18:33 -06:00
Mark Rivers
63d055e10c New file for OPI conversions 2018-01-31 12:09:52 -06:00
Mark Rivers
31062a1fd4 Changed DRIVER_REVISION from 6 to 7 2018-01-31 12:00:10 -06:00
Hinko Kocevar
97893329be Check for error from SDK. 2018-01-29 16:27:46 +01:00
Mark Rivers
22531574ff Must use different Andor header files on Windows and Linux 2018-01-04 16:16:24 -06:00
Mark Rivers
5290b0b07a Merge pull request #15 from mpdunning/master 
Add support for Frame Transfer Mode, Vertical Shift Speed
 2017-12-13 09:08:50 -06:00