Commit Graph

273 Commits

Author SHA1 Message Date
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
rivers
abc5122198 Obsolete
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8857 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-05-01 18:51:04 +00:00
rivers
a95be7ec9f Removed, obsolute
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8856 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-05-01 18:48:22 +00:00
rivers
8a31bd168a Fixed line terminators
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8844 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-04-29 21:52:53 +00:00
rivers
8ab869a4af Changed FileNumber logic with help from Tim Mooney so that it does not write value to driver when readback occurs
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8843 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-04-29 21:51:42 +00:00
hammonds
9bf6eefb0a Add in to support Perkin Elmer cameras.
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8806 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-04-21 03:24:09 +00:00
rivers
79b426853e Added support for color (GainRed, GainBlue, GainGreen)
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8754 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-04-13 19:23:06 +00:00
rivers
05a56182a6 Added support for color (GainRed, GainBlue, GainGreen); restrict ColorMode to allowed values
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8753 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-04-13 19:22:22 +00:00
rivers
3087d291fa Changed comment
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8712 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-04-06 21:19:04 +00:00
rivers
ef6ee48400 Added Abort_RBV
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8711 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-04-06 21:18:07 +00:00
rivers
8e6b51f6e2 Added NumErased and Abort; other changes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8702 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-28 03:12:18 +00:00
rivers
013e0730fe Added Abort and NumErased_RBV
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8700 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-28 03:08:14 +00:00
rivers
92cd636d50 Added mar345
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8694 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-27 17:59:49 +00:00
rivers
2828c7f5a6 New file for mar345 detector
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8693 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-27 17:58:53 +00:00
rivers
e5f077ba5a Fixed problem with logic in initial value of FileNumber; this had broken when fixing asyn device support
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8692 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-27 17:57:13 +00:00
rivers
d506c733c3 Changed Acquire_RBV from longin to bi, added descriptive state names
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8691 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-27 17:55:08 +00:00
rivers
4c7ff6cda9 Changes for white balance controls
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8685 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-24 23:10:29 +00:00
rivers
763219ba5d Significant changes in logic to get it to work
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8684 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-24 23:09:35 +00:00
rivers
60580289f8 New file to allow control of upper and lower part of white balance separately
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8679 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-24 12:37:44 +00:00