lin-epics-modules/ADAndor
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,623 Commits 2 Branches 10 Tags
5daf4e2e74b2b59cd80d4b878529732644a00d30
Commit Graph
90 Commits
Author SHA1 Message Date
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 141bab2124 Changed DRIVERS_REVISION from 5 to 6 2017-09-27 10:48:52 -05:00
Mark Rivers a61e494e92 Fixed screen for larger version of ADAttrFile.adl 2017-07-03 15:46:45 -05:00
Mark Rivers f330cccd41 Add XML2_INCLUDE 2017-04-30 15:36:57 -05:00
Mark Rivers 335e1c0ae1 Change from using TinyXml to libxml2 2017-04-22 11:43:37 -05:00
Mark Rivers 15c81d2242 Change from using TinyXml to libxml2 2017-04-22 11:42:45 -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 9aab9bbddf Changed AShutter choice names to be closer to their documentation 2017-01-09 12:27:02 -06:00
Mark Rivers 0d3b9d244b Added EMGain PVs 2017-01-09 12:26:19 -06:00
Mark Rivers 18ca996943 Added more AndorShutterMode choices 2017-01-09 12:25:01 -06:00
Mark Rivers 1627ed5fbb Added EMGain and ReadoutMode PVs 2017-01-09 12:23:39 -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 23b828168a New shutter modes 2017-01-09 08:38:44 -06:00
Mark Rivers 27ff6f008e Support for EPICS shutter 2017-01-09 08:38:21 -06:00
Mark Rivers 156fbd251b New shutter modes 2017-01-09 08:37:57 -06:00
Mark Rivers d73ef8e0b4 Added SerialNumber, FirmwareVersion, SDKVersion, DriverVersion, and ADCoreVersion 2017-01-03 17:52:52 -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
Mark Rivers 9d014865a7 Removed lines that disabled ReverseX and ReverseY because these are now implemented 2017-01-03 17:48:44 -06:00
Hinko Kocevar 39db9c7edf Add support for detector serial number. 2016-11-09 09:52:18 +01:00
Hinko Kocevar eb3ff72721 Modified OPI to support readout mode selection. 2016-07-14 15:51:50 +02:00
Hinko Kocevar 962518fc5b Add support for Full Vertical Binning readout mode. 2016-07-13 17:00:17 +02:00
Mark RiversandGitHub 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
Mark Rivers 14b6cac39d Merge in EMGain support 2016-07-13 07:24:06 -05:00
Hinko Kocevar 4a566875fd Provide descriptive error message for not supported features. 2016-07-13 11:10:26 +02:00
Hinko Kocevar 2d102d67dd Check for shutter support before calling SetShutter(). 
In order to avoid signaling error if SetShutter() call in setupShutter()
would fail.
 2016-07-13 11:06:08 +02:00
Hinko Kocevar c7b253b037 Do not segfault if camera initialization fails in constructor. 
Move allocation of enum string before calling Andor SDK init.
mInitOK is used to avoid divide by zero in setupAcquisition().
 2016-07-13 10:43:10 +02:00
Mark Rivers f4b38716f2 Merge branch 'master' of github.com:areaDetector/ADAndor 2016-07-12 16:55:41 -05:00
Mark Rivers 5ac3d236b0 Fixed bug in setupAcquisition when setting minX and minY based on binning; there was an incorrect factor of 2 present 2016-07-12 16:53:12 -05:00
Matthew Pearson 5ca26492e6 Add the ability to set the BaselineClamp setting in the Andor SDK. 2016-06-23 12:00:48 -04:00
Mark Rivers a32342a2e3 Enforce minimum values of ADShutterCloseDelay and ADShutterOpenDelay based on query to SDK 2016-01-12 14:28:58 -06:00
timmmooney 48e35cc8b2 new display-file translations 2015-06-25 14:09:16 -05:00
timmmooney 7e263afd13 new display-file translations 2015-04-03 14:56:21 -05:00
Mark Rivers 823a73fc73 include ADBase_settings.req and NDFile_settings.req 2015-03-29 17:34:56 -05:00
Mark Rivers e7bab3ad69 Added includes for ADBase.template and NDFile.template 2015-03-19 12:58:18 -05:00
Matthew Moore 83c32e2100 Fixed Tabs to spaces 2015-03-18 08:50:15 -05:00
Matthew Moore c8956e7dea adding flipper to adl 2015-03-17 14:38:57 -05:00
Matthew Moore 1c5e6fe119 Added support for flipper mirrors 2015-03-17 14:29:07 -05:00
Mark Rivers 33a9799b3d Fixed problem building dynamically on win32-x86 2014-11-18 14:19:49 -06:00
Mark Rivers 177b89f498 Fixed problem with dynamic builds on Windows; fixed to enable Shamrock on Linux 2014-11-18 14:09:19 -06:00
Mark Rivers b0c6d0c2f0 Add required include files for Linux; fix compiler warnings 2014-11-18 12:43:09 -06:00
Mark Rivers a302de5424 Library renamed to lowercase on win32-x86; build shamrock on Linux, now have required library 2014-11-18 12:42:37 -06:00
Mark Rivers b51710ea6c Improved documentation for Doxygen 2014-09-14 17:11:10 -05:00
Mark Rivers 12ad9ac033 Fix for building dynamically on Windows 2014-05-28 11:34:45 -05:00
Mark Rivers ca9bef5e1e Use Shamock library on 64-bit Windows now that I found the correct library file 2014-04-16 12:50:44 -05:00
Mark Rivers 1556fb5865 Build Shamrock library on 64-bit Windows now that I found the correct library file 2014-04-16 12:49:45 -05:00
Mark Rivers 7e8af98608 Minor changes to avoid compiler warnings and fixes to comments 2014-04-15 15:30:36 -05:00
Mark Rivers f532f30b0c Fixed comments 2014-04-15 15:29:51 -05:00