Commit Graph

1611 Commits

Author SHA1 Message Date
Mark Rivers
7511cd9214 Fixed release date of R2-5 R2-5 2017-02-19 15:25:13 -06:00
Mark Rivers
0a4b166047 New version for R2-5 2017-01-09 12:40:14 -06:00
Mark Rivers
a3a7759753 Changes for R2-5; minor reformatting 2017-01-09 12:39:59 -06:00
Mark Rivers
7ad2637810 Added note about EPICS shutter control for R2-5 2017-01-09 12:29:55 -06: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
cb2249ab64 Made win32-x86-static default ARCH; added dllPath.bat to TARGETS 2017-01-03 17:53:39 -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
Mark Rivers
6f87f27a48 Notes for R2-5 2017-01-03 17:48:01 -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
Hinko Kočevar
c9b4965341 Merge pull request #1 from areaDetector/master
update to upstream
2016-07-13 15:03:27 +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
Mark Rivers
0097e178fa Cleaned up R2-5 release notes 2016-07-13 07:26:26 -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
cbaf6021fc Updates for R2-5 2016-07-12 18:44:09 -05:00
Mark Rivers
4b7ba8a030 Merge branch 'mpdunning-master' 2016-07-12 18:41:49 -05:00
Mark Rivers
03a1468ac5 Notes for R2-5 2016-07-12 17:03:14 -05: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
b121171b14 documentation/andorDoc.html: add documentation for baseline clamp option. 2016-06-23 12:04:26 -04:00
Matthew Pearson
5ca26492e6 Add the ability to set the BaselineClamp setting in the Andor SDK. 2016-06-23 12:00:48 -04:00
Matthew Pearson
ebdef4d560 documentation/andorDoc.html: we also have FITS as an Andor file saving option. 2016-06-23 11:59:49 -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
Mark Rivers
21c589149d Removed _TOP, not needed and would require changes to st.cmd 2015-09-24 12:54:23 -05:00
Mark Rivers
4bea4d9b16 Changed to use relative path to top of module 2015-09-18 12:07:29 -05:00
Mark Rivers
4fc5132efb Reverted previous change, files moved back from ADExample to ADCore R2-4 2015-09-15 11:50:19 -05:00
Mark Rivers
95d3df00d5 Reverted previous change, files moved back from ADExample to ADCore 2015-09-15 11:49:58 -05:00
Mark Rivers
23b4d0e800 R2-4 notes 2015-09-08 14:49:37 -05:00
Mark Rivers
2b818f819f Moved commonPlugins.cmd from ADCore/iocBoot to ADExample/iocBoot 2015-09-08 14:46:43 -05:00
Mark Rivers
32db7aea69 Moved commonDriverMakefile from ADCore/ADApp to ADExample/exampleApp 2015-09-08 14:45:54 -05:00
Mark Rivers
04284014a2 Merge pull request #5 from timmmooney/master
new display-file translations
2015-06-28 09:55:53 -05:00
timmmooney
48e35cc8b2 new display-file translations 2015-06-25 14:09:16 -05:00
Mark Rivers
8058ba364b Changed release date R2-3 2015-04-16 12:14:14 -05:00
Mark Rivers
e21217aa95 Merge pull request #4 from timmmooney/master
new display-file translations
2015-04-07 06:08:02 -05:00
timmmooney
7e263afd13 new display-file translations 2015-04-03 14:56:21 -05:00