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

1176 Commits

This Branch
This Branch
All Branches
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
0967a32c75 Changed R1-8b_eta1 to R1-8_beta6 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14919 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-07-30 13:59:58 +00:00
rivers
bc3a5990a7 Added note about memory leak on Perkin Elmer optical frame grabbers when averaging 2^N frames 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14918 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-07-30 13:59:07 +00:00
rivers
39d9862648 New version of asyn 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14910 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-07-25 14:38:43 +00:00
rivers
8512251ce7 Update for R1-8 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14909 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-07-25 14:38:20 +00:00
rivers
74f518b61e Added note about MinX for Prosilica; reformatted 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14901 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-07-20 23:41:04 +00:00
rivers
10ef354514 Fixed link 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14900 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-07-20 23:39:22 +00:00
rivers
470bc5e087 New version 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14899 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-07-20 23:38:39 +00:00
rivers
1ed514903b New version 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14898 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-07-20 23:38:10 +00:00
rivers
e530ebbf84 New file 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14897 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-07-20 23:37:36 +00:00
rivers
6de183de30 Added CALC directory for SSEQ 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14896 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-07-20 23:36:54 +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
8dd322dbb8 Updates for Perkin Elmer shutter in R1-8 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14659 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-04-06 21:23:20 +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
rivers
af2952a2a5 Commented out ARCH for linux-x86_64 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14632 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-03-27 15:19:06 +00:00
rivers
7c5d900f0e Notes about changed to NDFileTIFF plugin, added SampleFormat TIFF tag 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14623 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-03-21 16:22:37 +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
3170b74d6c Fixed link to PDF file 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14600 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-03-07 00:17:41 +00:00
rivers
441fee7413 Update now that it is working 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14599 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-03-06 23:57:13 +00:00
rivers
affcf234df Put in path to config files for Linux 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14597 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-03-06 22:24:05 +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
581367aa83 Updates for R1-8 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14587 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-03-06 18:46:17 +00:00
rivers
13a683d889 Note on GigE support in Perkin Elmer 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14586 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-03-06 18:45:05 +00:00
rivers
fc59fa4a51 Updates for GigE detectors, other changes for R1-8 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14585 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-03-06 18:44:32 +00:00
rivers
d2e6ba0d10 New path to asynPortDriver 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14584 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-03-06 18:43:59 +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