Commit Graph

1322 Commits

Author SHA1 Message Date
rivers
7aaaffad02 New file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15782 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-20 23:09:52 +00:00
rivers
7f0b9a1365 Must remove, not allowed to redistribute
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15781 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-20 23:07:09 +00:00
rivers
d50d8d903a Changed to have USE_GRAPHICSMAGICK=NO on all platforms because the SetImage conflict leads to run-time crashes on Linux
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15775 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-19 23:35:35 +00:00
rivers
2aadc6e8dd Added note about TIFF and JPEG libraries on Linux
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15770 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-19 19:29:01 +00:00
rivers
5e2d558375 Build with GraphicsMagick by default
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15761 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-18 23:40:41 +00:00
rivers
398d09231c Change order for clarity, and may because the previous order did not do dbd file right?
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15758 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-18 23:37:30 +00:00
rivers
963cc61d0c Cleaned up; made andor be PROD_SYS_LIB on Linux so can do STATIC_BUILD; set new variable USE_GRAPHICSMAGICK=NO on windows-x64 because of function name conflict
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15738 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-18 18:52:01 +00:00
rivers
90f63d7efb Removed DLLs not allowed to redistribute and move Windows files to os/ directories
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15737 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-18 18:48:55 +00:00
rivers
e8ec15be6a Not needed and not allowed to redistribute
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15736 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-18 18:48:17 +00:00
rivers
f8b31d378a Move os os/windows-x64
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15735 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-18 18:40:23 +00:00
rivers
ed7a78aa4f Move to os/win32-x86
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15734 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-18 18:39:38 +00:00
rivers
47d18789ba New version with Auto[X,Y,Z]
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15723 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-14 23:33:47 +00:00
rivers
af9c1b3c0c Added AutoSize[X,Y,Z]
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15722 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-14 23:33:20 +00:00
rivers
1005298c92 Notes about new features in NDPluginStats and NDPluginROI
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15721 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-14 23:03:59 +00:00
rivers
cce563cd23 Added AutoSize[X,Y,Z]
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15720 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-14 22:55:26 +00:00
rivers
4645f43fa2 Added AutoSize[X,Y,Z]
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15719 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-14 22:55:02 +00:00
rivers
0a4e49af84 Added AutoSize[X,Y,Z]
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15718 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-14 22:54:45 +00:00
rivers
61c1804d8c New version of ASYN, areaDetector; add USE_GRAPHICSMAGICK flag
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15705 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-13 20:22:09 +00:00
rivers
55c2856f82 Changes to work with new commonDriverMakefile
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15704 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-13 20:18:44 +00:00
rivers
2a0f88680b Now built dynamically
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15703 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-13 20:12:44 +00:00
rivers
f3659cc40a Updates for new archs and new development computers
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15665 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-13 00:50:14 +00:00
rivers
996bf16083 Notes about USE_GRAPHICSMAGICK and NDPluginDriver fix
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15664 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-13 00:48:05 +00:00
rivers
bb0ccd322f New note about lock problems on some detectors for R1-9
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15602 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-03 22:05:46 +00:00
rivers
e47cc1df85 Minor changes to avoid compiler warnings
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15599 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-03 22:02:24 +00:00
rivers
962ad7401b Minor rewording
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15579 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-29 23:05:47 +00:00
rivers
decf373dc1 Added note about changing Nexus from 4-2-1 to 4-3-0
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15577 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-29 23:01:10 +00:00
rivers
395f0dd298 New note on andorCCD
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15563 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-28 23:46:44 +00:00
rivers
7ca64530d6 Updates for R1-9
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15546 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-28 19:11:14 +00:00
rivers
a68cbf93e6 Minor changes to avoid compiler warnings
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15527 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-28 18:40:02 +00:00
rivers
99a60af3c8 Added Andor3 (sCMOS) cameras
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15489 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-24 20:20:29 +00:00
rivers
95b016fc35 Notes fro R1-9
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15488 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-24 20:19:17 +00:00
rivers
3e8f2d3ec8 Update for Andor3 (sCMOS)
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15487 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-24 20:12:33 +00:00
rivers
7008f8920b Added iocAndor3
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15486 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-24 20:11:59 +00:00
rivers
2732da7fbb Update for R1-9 and andor3
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15485 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-24 20:11:40 +00:00
rivers
2beb1debf1 New file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15484 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-24 20:10:57 +00:00
rivers
395f62dee5 New file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15483 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-24 20:10:42 +00:00
rivers
00c3c04f76 Changes for new features
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15475 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-24 14:54:24 +00:00
rivers
3142f31926 Added PoolUsedMem.SCAN for pool polling rate
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15474 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-24 14:52:54 +00:00
rivers
e0a4cc85fc Changed default scan rate for pool polling from 0.1 second to 1 second
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15473 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-24 14:52:24 +00:00
rivers
b08574bbaf Added NoiseFilter
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15472 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-24 14:51:36 +00:00
rivers
9ac08d994f Added UInt32 to DataType; added NoiseFilter; added TransferRate
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15471 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-24 14:51:10 +00:00
rivers
a3f5381bfd Many additions
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15444 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-08 00:01:34 +00:00
rivers
8510fda948 Removed strings and values from all mbbo and mbbi records, now come from driver via asynEnum interface; added FanSpeed, ReadoutTime, ReadoutRate, Overlap, PreAmpGain
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15440 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-06 00:43:49 +00:00
rivers
589c24a289 Added PreAmpGain, ReadoutRate, Overlap, FanSpeed
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15439 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-06 00:41:30 +00:00
rivers
c104bc6497 Added SerialNumber, FirmwareVersion, SoftwareVersion, ControllerID
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15436 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-01 23:33:44 +00:00
rivers
7e98ea22ca Fixed typo
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15435 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-01 23:32:57 +00:00
rivers
2dd658d809 Added new records: SoftwareTrigger, SerialNumber, FirmwareVersion, SoftwareVersion, ControllerID
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15434 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-01 23:32:25 +00:00
rivers
6a38912b24 Added A3Binning
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15431 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-01 15:23:21 +00:00
rivers
1dfddb75d7 Added A3Binning
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15430 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-01 15:22:57 +00:00
rivers
a6b83aa950 New file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15427 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-10-31 18:24:49 +00:00