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

66 Commits

Author SHA1 Message Date
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
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
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
02ee37f819 R2-8 2018-07-01 18:12:29 -05:00
Mark Rivers
31062a1fd4 Changed DRIVER_REVISION from 6 to 7 2018-01-31 12:00:10 -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
Michael Dunning
6d2be9f6b0 Add try/catch block for call to SetBaselineClamp() 2017-12-12 12:17:41 -08:00
Michael Dunning
81138d5a18 Add support for Vertical Shift Period 2017-12-12 12:17:29 -08:00
Michael Dunning
afc7109cd2 Add support for Frame Transfer Mode 2017-12-12 12:16:55 -08:00
Mark Rivers
dcb85833a3 Remove unlock() and lock() around call to doCallbacksGenericPointer; not needed and can cause problems 2017-11-04 13:03:15 -05:00
Mark Rivers
141bab2124 Changed DRIVERS_REVISION from 5 to 6 2017-09-27 10:48:52 -05:00
Mark Rivers
335e1c0ae1 Change from using TinyXml to libxml2 2017-04-22 11:43:37 -05:00
Mark Rivers
c2bbe5f114 Changed AShutter choice names to be closer to their documentation 2017-01-09 12:27:22 -06:00
Mark Rivers
7e6156906b Merge branch 'master' into epics_shutter 2017-01-09 10:29:44 -06:00
Mark Rivers
a632aff600 Merge Hinko's addition of AndorReadoutMode 2017-01-09 10:20:52 -06:00
Mark Rivers
27ff6f008e Support for EPICS shutter 2017-01-09 08:38:21 -06:00
Mark Rivers
6d7790e6a4 Fixed bug with AndorPreAmpGain; previously it was not actually calling SetPreAmpGain() in their SDK. 
Implemented ReverseX and ReverseY via call to SetImageFlip().
Implemented SerialNumber, FirmwareVersion, SDKVersion, DriverVersion, and ADCoreVersion which were added in ADCore R2-6.
 2017-01-03 17:49:15 -06:00
Hinko Kocevar
39db9c7edf Add support for detector serial number. 2016-11-09 09:52:18 +01:00
Hinko Kocevar
962518fc5b Add support for Full Vertical Binning readout mode. 2016-07-13 17:00:17 +02:00
Mark Rivers
30de0dd746 Merge pull request #7 from hinxx/init-no-segfault 
Do not segfault if camera initialization fails in constructor.

I am merging this pull request.  Note that I have merged a previous pull request for EMGain support #6 into master.  The RELEASE.md file for R2-5 is now:
R2-5 (July XXX, 2016)
----
* Added support for Electron Multiplying (EM) Gain.  Thanks to Mike Dunning for this.
* Add ability to set the BaselineClamp in the Andor SDK.  Thanks to Matt Pearson for this.
* Enforce minimum values of ADShutterOpenDelay and ADShutterCloseDelay based on query of SDK.
* Fix bug when setting MinX and MinY with binning.  There was an incorrect factor of 2 present.
  Thanks to Hinko Kocevar for this fix.

@hinxx you will need to update your master because of the previous merges.
 2016-07-13 07:34:04 -05:00