Commit Graph

165 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
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
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
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
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
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
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
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
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
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
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
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
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
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
rivers
ca55952e42 Added PINI to FEATURE and FEATURE_CTRL; minor formatting changes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8670 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-21 19:22:43 +00:00
rivers
1b83707253 Added Format 7 color code records
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8669 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-21 19:20:38 +00:00
rivers
9108d0320a New template file for Format 7 color codes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8668 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-21 19:19:35 +00:00
rivers
f219d1036d Fixed error
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8631 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-15 15:16:13 +00:00
rivers
5383d31985 New file for Firewire settings
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8630 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-15 15:15:12 +00:00
rivers
ad97768ae2 New file for firewireWinDCAM support
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8623 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-14 19:58:30 +00:00
rivers
a31dc45d2f Added PortName_RBV record
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8293 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-27 18:41:22 +00:00
rivers
0f366d8e47 Changed PortName_RBV record to talk to driver
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8292 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-27 18:29:31 +00:00
rivers
0fca755b7a New file for save/restore for Prosilica
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8247 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-24 20:37:04 +00:00