Commit Graph

568 Commits

Author SHA1 Message Date
rivers
8fa85adc64 New file for windows-x64
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14415 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 18:05:46 +00:00
rivers
225fc07a73 Use STATIC_BUILD=NO on Linux, because Andor's only has a shareable version of their library
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14412 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 00:47:55 +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
a2371d088f Removed throw from declaration of checkStatus, leads to warnings on Windows, and discouraged as bad style by many
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14410 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 00:46:20 +00:00
rivers
8940d5800e Added DataType, replaced AcquireTimeActual with AcquireTime_RBV, etc.
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14404 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-01 18:03:13 +00:00
rivers
699b2619d7 Removed AcquireTimeActual, etc. record, use RBV; added Gain and DataType records; removed support for TEXT from NDFileFormate
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14403 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-01 18:02:06 +00:00
rivers
4fd0496524 Moved file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14402 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-01 18:00:03 +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
be7e27464e Moved to documentation directory
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14400 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-01 17:58:23 +00:00
rivers
dd19192d74 Added Andor in front of name
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14399 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-01 17:57:34 +00:00
rivers
81498e9661 Remove spaces from file name
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14398 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-01 17:56:28 +00:00
rivers
3d2a768d9b New file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14397 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-01 16:36:37 +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
b764f274d9 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
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14395 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-01 16:33:17 +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
d802707c2c Removed readInt32, no longer needed
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14389 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-31 15:23:25 +00:00
rivers
0797777311 Added TemperatureActual record
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14388 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-31 15:22:41 +00:00
rivers
38b288c65b Added Temperature
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14387 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-31 15:22:16 +00:00
rivers
3676c83cfc Many changes for deleted and added PVs
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14385 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-27 04:16:06 +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
14afba1ac6 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.


git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14383 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-27 04:12:43 +00:00
rivers
aa6d2e6f11 Removed Fast Kinetics PVs, use normal ADBase PVs instead; replaced AndorACTInKinetics with AndorAccumulatePeriod; removed AndorImageMode
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14382 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-27 03:59:44 +00:00
rivers
60fe771045 Removed Fast Kinetics PVs, use normal ADBase PVs instead; replaced AndorACTInKinetics with AndorAccumulatePeriod; removed AndorImageMode, add FastKinetcis to ADImageMode as last option instead; change Cooler to PINI=YES
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14381 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-27 03:58:48 +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
6920133e7e Added Andor
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14368 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-12 23:12:00 +00:00
rivers
2ce62279d9 Many changes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14367 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-12 23:11:38 +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
f76b16ee29 Added AndorCooler
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14365 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-12 23:09:16 +00:00
rivers
fa5ee7cd6f Changed FK integer records from ao to longout; added FileFormat_RBV
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14364 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-12 23:08:49 +00:00
rivers
b7478cbd22 New file for Andor detectors
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14355 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-09 15:49:14 +00:00
rivers
1ab8e40cf9 Changed UCHAR to CHAR
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14352 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-09 15:45:56 +00:00
rivers
50d78f2159 New version from DLS; removed AndorFileFormat, just use NDFileFormat; changed case of some enum strings
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14351 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-09 15:45:12 +00:00
rivers
7860254f05 New file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14350 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-09 15:41:45 +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
9566392b6b Removed AndorFileFormat, just use NDFileFormat; changed mData from long 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@14348 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-09 15:38:41 +00:00
rivers
7ecf9f0edf Renamed library to be andor on both 32 and 64-bit systems
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14347 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-09 15:37:22 +00:00
rivers
2983ea538d New file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14342 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-04 23:42:10 +00:00
rivers
ca4b671f8a Fixed mistake
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14340 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-04 19:16:12 +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
74e9699d40 Remove unistd.h; not needed and does not work on Windows
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14338 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-04 19:14:44 +00:00
rivers
bc5ccd397a Use commonDriverMakefile; add support for Windows; use andorCCDAppInclude.dbd; change Andor to lowercase andor
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14337 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-04 19:14:11 +00:00
rivers
8e74c04a6f Obsolete, put in main driver
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14336 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-04 19:11:49 +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
rivers
30b9f8d744 Removed extraneous text box
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14332 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2011-12-22 19:12:17 +00:00
rivers
2613dcec14 Changed handling of load and save correction files
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14329 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2011-12-22 19:04:38 +00:00
rivers
8a6fbdcb48 Reorganized; added GainFile
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14325 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2011-12-22 19:01:29 +00:00
rivers
85fab83910 Changed loading gain files, changed some record types from mbbo/mbbii to bo/bi; added new GainFile PV
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14324 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2011-12-22 19:00:42 +00:00
rivers
c036b5fa48 Changed layout to horizontal; many other changes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14321 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2011-12-22 00:31:57 +00:00
rivers
f2480e9739 Added UseOffset, UseGain, UsePixelCorrection; changed SkipPulses to SkipFrames
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14318 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2011-12-22 00:26:05 +00:00
rivers
e785768bb8 Removed PE_Status and PE_SyncMode records; many other small changes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14317 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2011-12-22 00:25:06 +00:00