962518fc5b
Add support for Full Vertical Binning readout mode.
2016-07-13 17:00:17 +02:00
c9b4965341
Merge pull request #1 from areaDetector/master
...
update to upstream
2016-07-13 15:03:27 +02:00
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
0097e178fa
Cleaned up R2-5 release notes
2016-07-13 07:26:26 -05:00
14b6cac39d
Merge in EMGain support
2016-07-13 07:24:06 -05:00
4a566875fd
Provide descriptive error message for not supported features.
2016-07-13 11:10:26 +02:00
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
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
cbaf6021fc
Updates for R2-5
2016-07-12 18:44:09 -05:00
4b7ba8a030
Merge branch 'mpdunning-master'
2016-07-12 18:41:49 -05:00
03a1468ac5
Notes for R2-5
2016-07-12 17:03:14 -05:00
f4b38716f2
Merge branch 'master' of github.com:areaDetector/ADAndor
2016-07-12 16:55:41 -05:00
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
b121171b14
documentation/andorDoc.html: add documentation for baseline clamp option.
2016-06-23 12:04:26 -04:00
5ca26492e6
Add the ability to set the BaselineClamp setting in the Andor SDK.
2016-06-23 12:00:48 -04:00
ebdef4d560
documentation/andorDoc.html: we also have FITS as an Andor file saving option.
2016-06-23 11:59:49 -04:00
a32342a2e3
Enforce minimum values of ADShutterCloseDelay and ADShutterOpenDelay based on query to SDK
2016-01-12 14:28:58 -06:00
21c589149d
Removed _TOP, not needed and would require changes to st.cmd
2015-09-24 12:54:23 -05:00
4bea4d9b16
Changed to use relative path to top of module
2015-09-18 12:07:29 -05:00
4fc5132efb
Reverted previous change, files moved back from ADExample to ADCore
2015-09-15 11:50:19 -05:00
95d3df00d5
Reverted previous change, files moved back from ADExample to ADCore
2015-09-15 11:49:58 -05:00
23b4d0e800
R2-4 notes
2015-09-08 14:49:37 -05:00
2b818f819f
Moved commonPlugins.cmd from ADCore/iocBoot to ADExample/iocBoot
2015-09-08 14:46:43 -05:00
32db7aea69
Moved commonDriverMakefile from ADCore/ADApp to ADExample/exampleApp
2015-09-08 14:45:54 -05:00
04284014a2
Merge pull request #5 from timmmooney/master
...
new display-file translations
2015-06-28 09:55:53 -05:00
48e35cc8b2
new display-file translations
2015-06-25 14:09:16 -05:00
8058ba364b
Changed release date
2015-04-16 12:14:14 -05:00
e21217aa95
Merge pull request #4 from timmmooney/master
...
new display-file translations
2015-04-07 06:08:02 -05:00
7e263afd13
new display-file translations
2015-04-03 14:56:21 -05:00
a19537a290
Notes for R2-3
2015-03-29 17:46:11 -05:00
93ed9a142b
Remove settings that are included from other files
2015-03-29 17:37:00 -05:00
823a73fc73
include ADBase_settings.req and NDFile_settings.req
2015-03-29 17:34:56 -05:00
13fbaf475d
Changes for ADCore R2-2
2015-03-19 12:59:03 -05:00
e7bab3ad69
Added includes for ADBase.template and NDFile.template
2015-03-19 12:58:18 -05:00
c54d5b1b25
Merge pull request #3 from mdmoo1978/master
...
Adding support for flipper mirror (input & output)
2015-03-19 09:34:57 -05:00
83c32e2100
Fixed Tabs to spaces
2015-03-18 08:50:15 -05:00
c8956e7dea
adding flipper to adl
2015-03-17 14:38:57 -05:00
1c5e6fe119
Added support for flipper mirrors
2015-03-17 14:29:07 -05:00
24f1c1f6ed
Changed comment and actual command for andorCCDConfig
2015-03-13 14:04:48 -05:00
9d743336d2
Added comment explaining shamrockConfig syntax
2015-03-13 09:29:41 -05:00
a38389bcdc
New version from SDK 2.99.3
2015-03-12 14:03:53 -05:00
651bc35407
Fixed typo
2015-03-12 13:51:34 -05:00
8dde91e3c8
Added notes for R2-3
2015-03-12 13:51:03 -05:00
3acff712d1
Removed statement that Shamrock is only supported on Windows, no longer true
2015-03-12 13:50:29 -05:00
a38a5b6888
Fixed comment that incorrectly said Shamrock was not supported on Linux
2015-03-12 13:49:30 -05:00
c807e883a9
New library version 2.99.3
2015-03-12 13:41:46 -05:00
75615df782
Tagged R2-2
2015-03-12 13:21:51 -05:00
69ea868a1b
Changed name of shamrock library
2014-12-03 16:27:52 -06:00
83523d98e9
Changed name of shamrock library
2014-12-03 16:27:38 -06:00
cc8fdab270
Changed name of shamrock library
2014-12-03 16:27:09 -06:00
Hinko Kocevar