Commit Graph

1091 Commits

Author SHA1 Message Date
rivers 69efbbe843 Test program to illustrate bug (?) in Andor SDK
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14434 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-07 17:01:07 +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 11adfb3a43 Removed unused shutdownCCD() function
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14423 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 20:09:59 +00:00
rivers fe927f7686 Many changes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14422 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 20:09:11 +00:00
rivers 0f4893d8c9 Added iocAndor
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14421 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 20:08:30 +00:00
rivers 5acf039a4a Added notes on new Andor driver and Nexus plugin bug fixes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14420 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 20:08:12 +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 dc2a6451b2 Added comment about my changes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14417 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 18:14:44 +00:00
rivers 6028fb346b Changes to build with different DBD file on windows-x64 so only that arch does not use the GraphicsMagick plugin due to name confict on SetImage functions
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14416 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 18:06:54 +00:00
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 ca4bd90af5 Added line to load NDStdArrays.template for 16-bit waveforms as well are 32-bit
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14414 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 17:23:48 +00:00
rivers 7ff49703b2 New version of EPICS base
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14413 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 02:45:14 +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 205bce7a94 Decrease stack size from 500000 to 100000, which is the minimum that works on windows-x64
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14409 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 00:38:03 +00:00
rivers c3fc852968 New arguments in andorCCDConfig command
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14406 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-01 18:05:28 +00:00
rivers 335f834ea1 Andor medm screenshot
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14405 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-01 18:03:51 +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 83ec7cb0a7 Updated and reformatted with VS2008
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14378 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-23 21:06:34 +00:00
rivers 5d56cc3742 Reformatted with VS2008
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14377 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-23 21:05:39 +00:00
rivers 851a645316 Added Andor; reformatted with VS2008
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14376 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-23 21:04:54 +00:00
rivers 15ec3f0ea1 Set stack size to 100000, were getting stack overflow crashes with default stack size
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14373 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-13 00:15:30 +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 0ead0ef3cb New file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14370 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-12 23:16:42 +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 ec6b957d85 New file for Andor CCD
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14363 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-12 23:07:23 +00:00