lin-epics-modules/ADAndor
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,376 Commits 2 Branches 10 Tags
3c9dfd5358e894de23b73c7dcefbcde30c77bc02
Commit Graph

724 Commits

Author SHA1 Message Date
rivers
3c9dfd5358 Move epicsExport include to allow building dynamically on Windows 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16769 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2013-08-27 22:49:34 +00:00
rivers
ab1aa86803 Added LIB_LIBS to build dynamically on Windows 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16768 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2013-08-27 22:48:59 +00:00
gebhardt
3493f973ea Modified ADApp/Makefile and all Src/Makefiles to allow the removal of a detector from the build. Also, The ioc applications can also be removed from the build, leaving only the detector libraries. The settings for these options are in configure/CONFIG_SITE. 
Moved USE_GRAPHICSMAGICK from configure/RELEASE to configure/CONFIG_SITE.

Added andor3.template to DB/Makefile.

git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16419 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2013-05-01 22:35:31 +00:00
mooney
c1009e884b converted from adl with CSS 3.1.2 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16217 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2013-04-15 16:41:55 +00:00
mooney
218be19fe0 caQtDM display files 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16216 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2013-04-15 16:39:18 +00:00
rivers
35e429e144 Removed field with SCAN=TRSCAN in PSResetTimer record 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16125 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2013-03-26 21:18:21 +00:00
rivers
21457e00d9 Add sseq_settings.req 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16076 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2013-03-11 15:59:11 +00:00
rivers
76cf36b888 Added CbfTemplateFile and HeaderString 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16071 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2013-03-09 00:08:55 +00:00
rivers
a469010286 Added CbfTemplateFile and HeaderString 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16069 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2013-03-09 00:07:08 +00:00
rivers
6c4d063034 Added HeaderString 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16068 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2013-03-09 00:06:42 +00:00
rivers
21c6f7e298 Add PSTimeStampType and PSResetTimer 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15974 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2013-02-19 18:49:22 +00:00
rivers
256584cd1d Added TimeStampType and ResetTimer; thanks to Jason Abernathy from Univ. of Victoria for these 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15937 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2013-02-17 15:22:05 +00:00
rivers
ede01d49b3 Set AutoSave=0 by default, previously it was enabled which could cause errors or lots of files fast! 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15860 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2013-01-07 22:55:28 +00:00
rivers
90b346e8c2 Change processing of POOL records from 0.1 second to 1 second, and make them FLNK from a single record that is scanned 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15854 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2013-01-05 00:04:19 +00:00
rivers
a541a251d5 Change PoolUserBuffers processing from CP to FLNK 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15853 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2013-01-05 00:03:23 +00:00
rivers
3186daf754 Fixed problems with asynPrint formats 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15799 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-12-21 23:09:03 +00:00
rivers
fca2cbffd8 Replaced cout with asynPrint; exception errors now print name of function 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15793 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-12-21 17:34:26 +00:00
rivers
15361513ac Cleaned up: moved most #include statements to andorCCD.cpp 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15792 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-12-21 17:33:14 +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
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
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
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
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
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
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
rivers
bfad3e2045 Added Andor3.adl 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15426 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-10-31 18:24:32 +00:00
rivers
0bb5d945f9 New file 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15425 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-10-31 18:15:29 +00:00
rivers
a02c92c634 New file 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15424 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-10-31 18:15:09 +00:00
rivers
4a8717ba8c Added BoundaryThreshold 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15356 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
 2012-10-05 17:41:13 +00:00