Commit Graph
291 Commits
Author SHA1 Message Date
hammonds f3859905d8 Add to TriggerMode options.
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9327 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-18 16:43:30 +00:00
hammonds d35a5617c1 Add in for PerkinElmer Control.
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9326 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-18 16:41:51 +00:00
hammonds cb0792714a Add in save restore request file.
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9323 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-18 02:41:27 +00:00
rivers c5ee630c05 Renamed from PerkinElmer_settings.template
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9312 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-17 22:27:52 +00:00
rivers 439ab06bd3 Renamed to PerkinElmer.template
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9311 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-17 22:22:35 +00:00
rivers a586e8084f Changed DATA_TYPE to ROI_DATA_TYPE to avoid conflict with NDPluginBase.template
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9305 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-17 17:12:08 +00:00
rivers 61f3f393b1 Changed ImageSize to ArraySize
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9294 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-17 02:09:40 +00:00
rivers 6baf0083e6 Changed PVAttributesFile to NDAttributesFile
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9293 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-17 02:08:24 +00:00
rivers 6fae79380a Changed PVAttributesFile to NDAttributesFile; changed ImageCounter to ArrayCounter, ImageSize to ArraySize
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9292 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-17 02:07:39 +00:00
rivers 722dec33f6 Changed PVAttributesFile to NDAttributesFile
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9291 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-17 02:02:50 +00:00
rivers f890863b70 Changed PVAttributesFile to NDAttributesFile; changed ImageCounter to ArrayCounter, ImageSize to ArraySize, ImageRate to ArrayRate; added ArraySize_Z
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9290 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-17 01:59:24 +00:00
rivers ff5331a2fc Changed ImageSize to ArraySize
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9289 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-17 01:57:07 +00:00
rivers 22402021ea Changed PVAttributesFile to NDAttributesFile
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9288 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-17 01:56:18 +00:00
rivers 1ed114bb5f Changed PVAttributesFile to NDAttributesFile; changed ImageCounter to ArrayCounter, ImageSize to ArraySize, ImageRate to ArrayRate; added ArraySize_Z
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9287 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-17 01:54:00 +00:00
rivers 1e0208528a Added multiple file plugin related displays
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9271 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-14 18:30:55 +00:00
rivers 2e3836d6dc Replaced by a version derived from the latest NDPluginFile.adl, simply add Template file widgets
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9270 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-14 18:28:54 +00:00
rivers b31945324f Added multiple file formats for all detectors
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9269 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-14 18:27:48 +00:00
rivers ea7a584153 Replaced with file format-specific displays
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9268 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-14 18:26:52 +00:00
rivers d2c68b61fc New file, replaced NDPluginFile.adl
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9267 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-14 18:24:26 +00:00
rivers 53ff2b2867 Added Nexus file support for simDetector
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9255 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-13 02:35:48 +00:00
rivers df13b98964 Removed records that duplicate NDFile.template
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9250 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-13 02:29:30 +00:00
hammonds c4171fc15b Add req file for Nexus plugin
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9226 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-11 19:47:02 +00:00
hammonds 36792f3794 Add display for NDFileNexus
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9224 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-11 19:25:09 +00:00
hammonds 46d7a1eb84 Add template file for Nexus writer.
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9223 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-11 19:23:47 +00:00
rivers 6f35b57882 Changed PV_ATTRIBUTES_FILE to ND_ATTRIBUTES_FILE
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9220 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-11 03:52:40 +00:00
rivers 388f464349 Added triggerMode
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9196 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-07 15:17:28 +00:00
hammonds 7f87b19ca9 Add in files to support the pvCam interface.
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9193 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-05 15:50:07 +00:00
hammonds 3f87116c62 Add in files to support pvCam interface.
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9192 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-05 15:48:57 +00:00
rivers 5a674b410c Added TwoTheta
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9183 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-04 18:36:01 +00:00
rivers 3582d505aa Replaced MarReadStatus with ReadStatus
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9182 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-04 18:35:09 +00:00
rivers 688c912e22 Renamed ADSC external software trigger PVs to generic names.
Removed related display button to generic areaDetector MEDM screen.


git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9181 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-04 18:33:54 +00:00
rivers ed373e2538 Removed MarReadStatus, replaced with ReadStatus in ADBase.template; added TwoTheta
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9179 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-04 18:30:31 +00:00
rivers 3baf03d64c Renamed ADSC external software trigger PVs to generic names
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9178 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-04 18:29:04 +00:00
rivers 509a7eef1e Added TwoTheta, removed MarReadStatus.SCAN
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9177 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-04 18:25:35 +00:00
rivers f803ab315a Added ReadStatus.SCAN
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9176 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-08-04 18:25:00 +00:00
rivers ccc3b92063 Added TIFF and JPEG file plugins to all drivers
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9137 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-07-27 19:13:04 +00:00
rivers 4b1aef8b13 Added PVAttributes file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9134 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-07-27 18:25:16 +00:00
rivers 3c959db3d8 Added PVAttributes file and PluginType
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9133 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-07-27 18:23:46 +00:00
rivers 543e943cf7 Added PluginType_RBV
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9113 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-07-26 16:08:30 +00:00
rivers 482e28a0ca Added Initializing state
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9112 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-07-26 16:07:43 +00:00
rivers c4aeadcbe8 Added JPEGQuality and PVAttributes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9096 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-07-24 18:30:43 +00:00
rivers bdb6bc6c20 Added PVAttributesFile
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9095 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-07-24 16:48:37 +00:00
rivers 420e3cc9be Added Temperature
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8971 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-06-17 21:32:51 +00:00
rivers eab0618d9d Added Image 2 to simDetector plugins
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8961 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-05-28 18:02:58 +00:00
rivers 286e351062 Changed SIZE macro to TYPE, removed hardcoded Int prefix
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8960 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-05-28 17:52:42 +00:00
rivers a6575fa193 Added specific file plugins for simDetector and Prosilica
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8937 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-05-12 13:08:49 +00:00
rivers 01ef3ac65f Made file format undefined, set in actual file I/O templates
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8934 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-05-12 13:04:18 +00:00
rivers 143f1727ea New file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8933 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-05-12 13:02:59 +00:00
rivers 356657172c New file for JPEG file I/O
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8932 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-05-12 13:02:08 +00:00
rivers 5236e448f1 Renamed drvInfo fields IMAGE_SIZE_xxx to ARRAY_SIZE_xxx and IMAGE_COUNTER to ARRAY_COUNTER
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8866 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-05-01 21:28:42 +00:00