Commit Graph
238 Commits
Author SHA1 Message Date
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
rivers 8db4c91e99 Added firewireVideoFormats
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8674 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-21 19:34:59 +00:00
rivers fb71d15a86 Moved video format controls to new file, firewireVideoFormats.adl
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8673 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-21 19:34:06 +00:00
rivers dbff8c8969 New screen for Firewire video formats, modes, rates, color codes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8672 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-21 19:32:37 +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 0d7c75869d Added image2 for Firewire, for 16-bit mode
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8643 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-18 01:39:21 +00:00
rivers aed8b9b5d9 Update
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8634 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-15 15:25:20 +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 12cafe4f99 Added Firewire for Windows controls
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8626 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-14 20:09:00 +00:00
rivers 9c46dd6c82 New file to control Firewire-specific features
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8625 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-14 20:08:02 +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 d188b2edff Changed scan PVs from (P)(R) to just (P)
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8306 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-29 23:13:09 +00:00
rivers 2c2c68166f Added plugin related displays
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8305 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-28 19:30:47 +00:00
rivers 466dbce118 Added parameters for plugin related displays
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8304 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-28 19:29:50 +00:00
rivers 89f7953ffc Added related displays for plugins to More menu
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8299 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-28 18:41:44 +00:00
rivers 60a5034bb4 Added plugin parameters in call to marCCD.adl
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8298 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-28 18:40:41 +00:00
rivers c4583398c0 Added PortName_RBV
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8294 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-27 18:47:06 +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
rivers dffc415890 Added BayerPattern_RBV
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8246 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-24 20:30:26 +00:00
rivers c614161cb2 Added BayerPattern
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8245 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-24 20:29:23 +00:00
rivers ecf862e067 Finish adding I/O control widgets
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8214 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-20 00:08:01 +00:00
rivers 7bdae6b2d4 Fix some minor bugs
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8211 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-19 23:51:49 +00:00
rivers 33521c9929 Added new widgets for sync and digital I/O
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8208 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-17 00:19:29 +00:00
rivers e9397fbeff Added new records for sync and digital I/O; limit color mode to valid values
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8207 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-17 00:18:14 +00:00
rivers eacb274255 Removed abusy record, now use busy record from busy module
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8170 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-14 19:36:06 +00:00
rivers 210ad7cdcd Added third dimension
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8108 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-12-24 21:29:45 +00:00
rivers 8cdb9cc032 Added new plugin PVs (Dim2, colorMode)
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8107 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-12-24 21:25:51 +00:00
rivers 3beee79e95 Added links to ColorConvert plugin
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8106 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-12-24 21:14:16 +00:00
rivers 4f2ce201c5 New file for color conversion plugin
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8105 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-12-24 21:13:29 +00:00
rivers 7b1be86e57 Restrict DataType choices to valid ones
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8104 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-12-24 21:12:31 +00:00
rivers 149f0e398f Added Z PVs for 3-D data
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8103 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-12-24 21:11:54 +00:00