Commit Graph

23 Commits

Author SHA1 Message Date
rivers
fca2cbffd8 Replaced cout with asynPrint; exception errors now print name of function
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15793 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-21 17:34:26 +00:00
rivers
e47cc1df85 Minor changes to avoid compiler warnings
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15599 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-03 22:02:24 +00:00
rivers
a68cbf93e6 Minor changes to avoid compiler warnings
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15527 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-28 18:40:02 +00:00
rivers
0adff6b17a Added support for FITS file format
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14757 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-06-14 19:12:02 +00:00
rivers
8bedd10ef5 Improved handling ADC speed and pre-amp gain, using new asynEnum interface in asyn
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14733 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-05-10 19:08:02 +00:00
rivers
9a19171889 Improved Doxygen documentation
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14601 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-07 00:18:26 +00:00
rivers
b745a27e3d Fix a couple of problems with lock(); change to GetTemperatureF, i.e. floating point temperature
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14595 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-06 22:21:42 +00:00
rivers
23aa822983 Fix fixes for Linux; switch from GetOldestImage to GetImages to fix problem saving files in Fast Kinetics mode
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14573 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-06 00:38:20 +00:00
rivers
1a3236e571 Changes for Fast Kintetics mode
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14468 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-12 17:42:18 +00:00
rivers
9fddfd6b28 Fixed problem with triggerMode, it was always being set ATInternal; minor fix to debugging output
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14436 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-07 17:02:17 +00:00
rivers
e0d1031692 Added SDK version and Device driver version to report() function
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14433 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-06 21:50:07 +00:00
rivers
befc5af5aa Added documentation comments
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14424 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 20:10:18 +00:00
rivers
7886be93c7 Added comments about my changes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14418 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 18:14:54 +00:00
rivers
8b30d060da Changes to build on 64-bit Linux and Windows
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14411 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 00:47:09 +00:00
rivers
db4a34a5b5 Added support for NDDataType
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14401 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-01 17:59:52 +00:00
rivers
ec66f2e0b3 Removed AcquireTimeActual, etc. parameters, use RBV instead; remove shutter private variables, not needed; remove data array, not needed; add desired values of AcquireTime, etc. to store desired values even when SDK changes them; added setupShutter function; print AndorCapabilities in report function; removed support for saving as TEXT file; change order of reading image and saving to disk
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14396 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-01 16:36:05 +00:00
rivers
a546eaabb6 Support array callbacks; Removed readInt32; support TemperatureActual; many other changes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14390 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-31 15:29:11 +00:00
rivers
af001a2407 Removed maxSizeX and maxSizeY from constructor, added installPath
Removed Fast Kinetics parameters, added AccumulatePeriod and Actual acquisition time parameters
Removed readFloat64, initializeCCD, runAtInitialization, and shutdowCCD methods
Added SetupAcquisition and report methods
Removed parameters from saveDataFrame method
Removed many private variables (mRunning, mXBinning, etc.
Significantly simplified code
Not yet working!


git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14384 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-27 04:14:41 +00:00
rivers
6e48c27551 Added priority and stackSize arguments to constructor; it was crashing with stack overflow on Windows, and all other drivers allow specifying the stack size, so this one should too
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14372 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-13 00:14:49 +00:00
rivers
f44d54903c Changed ACTInKinetics from int to double; reformatted some asynPrint statements
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14366 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-12 23:10:54 +00:00
rivers
b20e35ddc9 Removed AndorFileFormat, just use NDFileFormat; changed some variable types to at_32 to work on 32 and 64 bits systems; added support for WIN32
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14349 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-09 15:40:39 +00:00
rivers
29b5a16f1c Moved iocsh registration code into driver; renamed AndorCCD.h to andorCCD.h
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14339 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-04 19:15:52 +00:00
rivers
a850a9638a New driver for Andor CCDs from Matt Pearson at Diamond Light Source
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14335 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-04 00:08:09 +00:00