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

626 Commits

Author SHA1 Message Date
rivers
d9e9039b68 Increased height because NDPluginBase now has queue statistics 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14943 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-08-15 22:14:48 +00:00
rivers
c3cc40dcd9 New file 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14891 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-07-20 23:30:42 +00:00
rivers
b2040bdb6f New file that syncs ROI to the full detector 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14890 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-07-20 23:30:13 +00:00
rivers
6b871c3d11 New file 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14889 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-07-20 23:28:53 +00:00
rivers
d7d6f54fdf Added TriggerMode 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14888 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-07-20 23:28:24 +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
fbb1aa73b2 Added FITS file format 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14756 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-06-14 19:09:38 +00:00
rivers
d549bef860 New file 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14755 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-06-13 21:24:12 +00:00
rivers
53b529ec23 New file 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14754 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-06-13 21:23:57 +00:00
rivers
2f3fbdfb54 Replaced Gain (ao) with AndorPreAmpGain (mbbo) 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14737 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-05-10 19:11:16 +00:00
rivers
791a84e830 Added AndorPreAmpGain 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14736 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-05-10 19:10:19 +00:00
rivers
8c9c7fd3b6 Remove mbbo/mbbi choices for AndorCCDSpeed, now computed at run-time; added AndorPreAmpGain, because that needs to be an mbbo as well 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14735 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-05-10 19:09:53 +00:00
rivers
76bd080e3c New file for PSL detectors 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14734 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-05-10 19:08:32 +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
af2d5f8b5b 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@14732 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-05-10 19:07:22 +00:00
rivers
24ea1b5b79 Fixed typo for value of FrameType=DblCorrelation, should be 3, was 2 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14723 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-05-01 19:45:38 +00:00
jemian
d1440990a7 archaic 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14670 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-04-16 15:57:50 +00:00
mwpearson
51d45dfe65 pilatus driver and template: fixed thread polling for Th, as it wasn't working for 2M or 6M detectors. Added a 2s delay when aborting an acquisition, which seems to be needed to allow camserver time to clean up in some modes. Improved error reporting for multi frame acqusitions, when callbacks are turned off. Fixed a race condition to ensure we don't miss a stopEvent if we are doing a successful read from camserver. Added an automatic stop when getting a timeout from camserver, if we got no response (this prevents camserver and the pilatus driver getting out of sync.) Fixed race conditions that meant we occasionally read back the wrong ADStatus at the end of an exposure. Fixed a race condition in pilatusTask, that can cause a problem reading ADStatus if we sent a start and a stop in quick succession (before the pilatusTask thread had time to run). Added support for setting cbf_template_file. Turned off auto reconnect on the Asyn port, to force a IOC reboot if camserver if has been restarted. Fixed logic for setting the threshold, if we have auto apply turned off. Modified the pilatus driver to take advantage of the new aborted state, ie. replaced some of the ADErrors with ADStatusAborted. 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14660 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-04-07 12:24:52 +00:00
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