Commit Graph

164 Commits

Author SHA1 Message Date
rivers
d3253f4e97 Changed IMAGE macro to I
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7831 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-16 16:14:53 +00:00
rivers
426dea0a76 Removed plugin related PVs, those are now in NDPluginFile.adl
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7830 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-16 16:13:51 +00:00
rivers
6458a1deec Renamed NDFile.adl to NDPluginFile.adl
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7829 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-16 16:10:47 +00:00
rivers
4ff44a851b Removed file PVs, those are now in NDFile.adl
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7828 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-16 16:09:25 +00:00
rivers
d8d4fe3e0c Previously called NDFile.adl, but that is now a new file without the plugin PVs
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7827 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-16 16:07:59 +00:00
rivers
17868d12d1 Updated shutter
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7820 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-14 23:24:16 +00:00
rivers
3238302dee Added MarReadStatus PVs to poll status
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7819 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-14 23:21:50 +00:00
rivers
d39321051b Added MarReadStatus.SCAN
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7817 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-14 23:11:32 +00:00
rivers
f970c082ea Added MarReadStatus and MarState_RBV records
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7816 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-14 23:09:51 +00:00
rivers
ab90af634f Added FrameShift and ancillary records; removed ReadFiles
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7782 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-11 21:31:17 +00:00
rivers
9b6a344dc4 Added FrameShift and ancillary records
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7781 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-11 21:31:16 +00:00
rivers
fb3f771f4e Added shutter records and ArrayCallbacks
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7780 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-11 21:31:15 +00:00
rivers
474017d847 Added ArrayCallbacks; many changes to shutter records
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7779 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-11 21:30:29 +00:00
rivers
9b7fcccd9f Many enhancements
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7775 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-11 21:23:28 +00:00
rivers
571c00f5d9 Added status fields
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7774 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-11 21:22:38 +00:00
rivers
600032f0a0 Reformatted
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7773 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-11 21:21:46 +00:00
rivers
4e878dd0b1 Enhancements to shutter PVs; added ArrayCallbacks and NumImagesCounter_RBV PVs
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7772 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-11 21:20:37 +00:00
rivers
e2ea4b136b New file for marCCD
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7771 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-11 21:17:41 +00:00
rivers
1797fe7229 Added more PVs
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7760 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-07 14:00:57 +00:00
rivers
060f019953 Numerous changes for status, file type, etc.
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7759 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-07 14:00:05 +00:00
rivers
dbcd2556e3 Added NumImagesCounter_RBV
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7758 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-07 13:58:36 +00:00
rivers
d52f356d07 Many changes for status, shutter, etc.
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7757 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-07 13:57:25 +00:00
rivers
80c78c9791 New file for EPICS shutter control
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7756 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-07 13:53:31 +00:00
rivers
4d1a392063 Added marCCD
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7748 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-01 23:13:44 +00:00
rivers
99cf3f4ab2 Renamed TimeRemaining to TimeRemaining_RBV
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7747 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-01 23:11:58 +00:00
rivers
0bc4da7229 New file for marCCD
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7746 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-01 23:11:07 +00:00
rivers
de260384a4 Changed ImageType to FrameType/FrameType_RBV, changed TimeRemaining to TimeRemaining_RBV
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7745 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-01 23:09:36 +00:00
rivers
59ff9dbfe9 New file for marCCD
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7744 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-01 22:59:28 +00:00
rivers
827819ee80 Different versions of ADBase.template for testing
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7687 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-09-30 14:52:10 +00:00
rivers
e03bdc5fec Changed to use new abusy record with asyn device support
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7686 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-09-30 14:50:40 +00:00
rivers
33ceaafddb Added scan record for simulator detector
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7677 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-09-24 21:07:14 +00:00
rivers
ba65058a5d Database changes from Tim M. to fix problems with busy record hanging
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7676 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-09-24 21:05:35 +00:00
rivers
c6f26bd761 Added IMAGE and ROI macro arguments; added more related displays
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7589 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-09-05 20:00:48 +00:00
rivers
cfbfa0606d Changed from using ImageMode to TriggerMode for acquisition mode; changed MinFlatField from ao to longout
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7586 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-09-05 19:53:37 +00:00
rivers
e54bb0248a Added Name_RBV
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7585 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-09-05 19:52:08 +00:00
rivers
325300b788 Updated combined ROIs menus
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7569 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-29 18:42:29 +00:00
rivers
e4ca19f718 Added Name, rearranged
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7568 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-29 18:41:25 +00:00
rivers
22dedfa8b7 Added full ROI to each menu, changed labels
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7567 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-29 18:40:24 +00:00
rivers
402a33f87f Added combined ROIs
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7566 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-29 18:39:01 +00:00
rivers
c14fd40024 Minor change
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7565 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-29 18:38:32 +00:00
rivers
918fd780c0 Made status display line smaller so more can be seen
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7553 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-26 20:07:14 +00:00
rivers
7d157f28e8 Removed waveform callback time
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7549 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-26 19:28:40 +00:00
rivers
2f2366865a Added mca records for on-the-fly scans
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7548 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-26 19:27:20 +00:00
rivers
9007d60353 Fixed Highlight menu
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7542 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-25 21:56:29 +00:00
rivers
e7bee8e5b2 Added Use and ComputeStatistics fields, other changes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7541 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-25 21:54:57 +00:00
rivers
10885ca014 Added Highlight
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7540 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-25 21:53:33 +00:00
rivers
1751831dfa Bug fix
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7539 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-25 21:50:20 +00:00
rivers
4ac8da9c40 Added Pilatus detecotr
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7524 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-23 14:55:02 +00:00
rivers
84f0242b4b New file for Pilatus detector
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7523 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-23 14:53:33 +00:00
rivers
a215b407c2 New file for 8 ROIs at once
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7522 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-23 14:52:49 +00:00