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

1715 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mark Rivers
f4f28bdba1 Merge pull request #50 from pheest/master 
Only call SetVSAmplitude if the camera supports it. (Issue #49)
 2022-02-10 06:40:38 -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
Mark Rivers
6f3a1f440d Merge pull request #44 from sudilav/master 
Update to correct WITH rather than USE
 2021-10-25 09:08:23 -05:00
sudilav
e17010bca8 Update to correct WITH rather than USE 
Updating as USE is old and WITH is the only way to get it to compile successfully if you have compiled ADCore with GraphicsMagick. Also modified the findstring method of confirming the target architecture as it could spit out multiple variations of windows-x64 or wind32-x86 such as -static, -mingw for instance.
 2021-10-25 15:03:14 +01:00
Mark Rivers
c7b8075c9c Merge pull request #42 from pheest/master 
Corrected pixel index misunderstanding.
 2021-08-25 11:00:16 -04: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
Mark Rivers
92dab36a11 Merge pull request #40 from dls-controls/fix/temperatureControl 
Fixed logic from < to >
 2020-03-20 06:44:02 -05:00
Tom Trafford
5d3277e549 Fixed logic from < to > 2020-03-20 09:29:25 +00:00
Mark Rivers
22abc2a3c4 Merge pull request #39 from dls-controls/fix/temperatureControl 
Added check in constructor before setting temperature
 2020-03-19 12:57:59 -05:00
Tom Trafford
1b58f21f6d Added check in constructor before setting temperature 2020-03-19 08:48:17 +00:00
Mark Rivers
112ab065de Merge pull request #37 from dls-controls/fix/destructor-hanging 
Added check in desctructor to see if it had errored
 2020-03-16 17:01:07 -05:00
Tom Trafford
557cbf8f00 Added check in desctructor to see if it had errored 2020-03-16 11:20:55 +00:00
Mark Rivers
4b803b4585 Merge pull request #34 from dls-controls/fix/wait-for-acquire 
Now set ADAcquire parameter to 1 after detector acquisition has started
 2020-03-10 07:25:43 -05:00
Mark Rivers
4027f3656f Add ref 2020-03-05 10:14:40 -06:00
Mark Rivers
bcce3518fe Improve st.cmd 2020-03-05 10:14:17 -06: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
f38dbf0012 Clean up 2020-02-14 08:49:15 -06:00
Mark Rivers
5215cbccae Improved tables, removed unneeded columns, fixed lists 2020-02-13 05:49:23 -06: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
8c826b3217 Updated documentation to point to github.io 2019-12-05 16:49:30 -06:00
Mark Rivers
6c4d6d98d3 Note for R2-9 2019-12-05 11:37:26 -06:00
Mark Rivers
94a2307982 Changed title; fixed error with br 2019-12-05 09:30:01 -06:00
Mark Rivers
fe4ba31347 Notes for R2-9 2019-12-05 09:29:15 -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
Mark Rivers
c0acd78f50 Merge pull request #26 from pheest/master 
Added capability for CCD multi-track use.
 2019-12-02 10:57:40 -06:00
Mark Rivers
01bdd4e95a Converted tables from raw html to flat-table; fixed links 2019-12-02 08:52:42 -06:00
Mark Rivers
250a1f5ad3 Merge pull request #22 from stuwilkins/add_sphinx_docs 
Initial version of Andor docs converted to Sphinx.
 2019-12-01 17:43:26 -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
Mark Rivers
4bbfb42864 Merge pull request #27 from mp49/master 
Updated R2-5 release notes
 2019-11-22 15:16:43 -06:00
Matt Pearson
985e0c201c Updated R2-5 release notes 
Added notes about the change to default behavior to the camera shutter and PreAmpGain, and how to retain previous behavior.
 2019-11-22 15:11:51 -05:00