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

325 Commits

Author SHA1 Message Date
rivers
8522ef1e4f Add QueueUse PVs, complement to QueueFree 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15287 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-09-30 00:15:05 +00:00
rivers
5678481f67 Added PSL.template 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15283 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-09-29 22:09:18 +00:00
rivers
b805210161 New PVs from Tom Cobb: MinX_RBV, etc. 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15282 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-09-29 22:09:01 +00:00
rivers
6100b7ce1a Rename 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15281 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-09-29 22:07:54 +00:00
rivers
7e7293c798 Added NumColChunks, NumFramesChunks,NumFramesFlush, change CompressType to Compressions 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15274 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-09-29 19:37:38 +00:00
rivers
4f67d8eace Changes from Ulrik Pederson: added NumColChunks, NumFrameChunks, NumFramesFlush; renamed CompressType to Compression 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15273 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-09-29 16:14:19 +00:00
rivers
a1bbc43452 Set NumPoints to NCHANS; thanks to Tom Cobb 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15269 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-09-29 15:37:47 +00:00
rivers
db0434345a Removed PINI=YES from input records, since they have SCAN=I/O Intr 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15266 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-09-28 21:39:54 +00:00
rivers
45af346b58 Added comment explaining function 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15234 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-09-25 20:32:53 +00:00
rivers
17895e3785 Removed duplicate records 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15018 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-08-17 23:38:31 +00:00
rivers
9e1288961c Added PoolUsedBuffers 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14965 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-08-16 05:00:11 +00:00
rivers
fcaa45b370 Added PoolUsedBuffers 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14964 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-08-16 04:59:52 +00:00
rivers
08d1910d1e Removed FifoFill, was added by mistake 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14962 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-08-16 04:38:20 +00:00
rivers
2709e59f95 Added Queue and Pool records to monitor buffer usage 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14954 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-08-16 01:39:56 +00:00
rivers
d0cb5c9d40 Added Pool records to monitor memory pool usage 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14953 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-08-16 01:39:09 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
rivers
74cfa9d4ef Added TriggerEvent, TriggerOverlap, TriggerDelay 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14304 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2011-12-18 20:10:25 +00:00
rivers
356ef7273f Removed FileFormat, obsolete; added TriggerDelay, TriggerEvent, TriggerOverlap, TriggerSoftware 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14294 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2011-12-16 00:13:15 +00:00
rivers
2c58a771a9 Changed GainMenu strings to be more informative; added temperature and humidity records; added TVX version record; disabled records from ADBase.template that are not used for Pilatus; all changes from Matt Pearson at DLS 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14287 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2011-12-12 20:57:05 +00:00
rivers
49aba0d0ff Renamed RecursiveSum to Average, since that's what it is; added new filter type=Sum; always process FilterType if NumFilter changes so it reloads coefficients 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14241 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2011-12-03 18:41:07 +00:00
rivers
1b19fd038f Add AutoResetFilter, FilterCallbacks 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14238 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2011-12-03 15:09:32 +00:00