lin-epics-modules/ADAndor
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,325 Commits 2 Branches 10 Tags
fca2cbffd8d29ee24dbdabe9ea34acb671fb98af
Commit Graph

708 Commits

Author SHA1 Message Date
rivers
d513b750eb Added AcquireSequence 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14657 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-04-06 21:15:10 +00:00
rivers
71610e648e Added PINI=YES to AutoResetFilter and FilterCallbacks 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14649 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-03-30 20:13:18 +00:00
mwpearson
fdb94a65e3 areaDetector: added an Aborted state to the DetectorState_RBV record. Modified the simulation driver to use this Aborted state when an acqusition is aborted, instead of using the Error state. 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14604 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-03-09 11:07:54 +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
ec8b13fc55 Added commented out lines for tests on Linux; change so all archs use DBD file without GraphicsMagick because of name conflict with SetImage() 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14596 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-03-06 22:22:53 +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
c5f3c62470 Minor changes to build on Linux 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14594 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-03-06 22:19:57 +00:00
rivers
e15c449fbd Minor changes to build on Linux 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14593 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-03-06 22:19:46 +00:00
rivers
d433efdb3d New test file 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14592 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-03-06 22:19:20 +00:00
rivers
55b750d5dd We cannot use GraphicsMagick on Linux either 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14591 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-03-06 20:59:23 +00:00
rivers
8bd1403ccd Replace with the previous andorCCDAppWIN64Include.dbd file 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14590 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-03-06 20:58:36 +00:00
rivers
029e1f0a13 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@14575 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-03-06 00:39:22 +00:00
rivers
a060ee36ba Use fast ADC, fixes problems with slow acquisitions 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14574 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-03-06 00:38:52 +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
1c22ec9be8 Removed PSPacketSize; now read-only 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14572 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-03-06 00:36:47 +00:00
rivers
046a995a1f Removed PSPacketSize record, it is now read-only 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14571 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-03-06 00:35:19 +00:00
rivers
24e6613341 Removed PSPacketSize record, it is now read-only 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14570 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-03-06 00:35:04 +00:00
rivers
8c052867a6 Added PSPacketSize; made new GigE area of display 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14500 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-02-29 18:55:50 +00:00
rivers
227708c0a4 Added PSPacketSize 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14499 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-02-29 18:55:13 +00:00
rivers
f70501adc6 Inserted commented out lines for FKTest.c 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14489 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-02-15 21:53:29 +00:00
rivers
eab5005f2f New test file 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14488 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-02-15 21:52:44 +00:00
rivers
8e17fd9cd8 Changed mca.adl to NDTimeSeries.adl; added NDTimeSeriesAll.adl 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14483 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-02-14 20:27:19 +00:00
rivers
cd6ef8599e Minor formatting change 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14482 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-02-14 20:26:38 +00:00
rivers
24db04d327 Added NDTimeSeriesAll related display 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14481 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-02-14 20:26:14 +00:00
rivers
084bfa742f New file 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14480 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-02-14 20:25:44 +00:00
rivers
acff97bb60 Removed mcaSupport.dbd, no longer needed 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14469 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-02-12 17:42:49 +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
f050bb7a22 Added new time-series PVs; changed layout 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14463 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-02-12 17:37:40 +00:00
rivers
9a063f82dc New file 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14462 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-02-12 17:37:03 +00:00
rivers
ae8ab311d2 Added time-series records 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14461 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-02-12 17:36:41 +00:00
rivers
38088cbc58 Added time-series records 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14460 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-02-12 17:36:25 +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
9ff027cda4 Commented out lines to build accumTest 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14435 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-02-07 17:01:30 +00:00
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
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
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