Commit Graph
750 Commits
Author SHA1 Message Date
rivers 2c19de1c0c Added LDUpdateExperiments
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16953 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-10-01 14:59:35 +00:00
rivers 567312550c Add FileFileName
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16949 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-30 20:55:04 +00:00
rivers 68dbf4aed0 Many changes to support new Series commands for HS detectors
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16948 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-29 19:45:24 +00:00
rivers debe7cea98 Add GateMode, ReadoutMode, SeriesFileTemplate, SeriesFileDigits
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16947 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-29 19:44:56 +00:00
rivers 299de80b4d New records and new enums to support new Series commands for HS detectors
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16946 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-29 19:44:24 +00:00
rivers d90f407fd2 Added background records
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16941 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-26 23:38:50 +00:00
rivers dea12ede2a Added background records
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16940 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-26 23:38:40 +00:00
rivers 3dac3c4f10 Changes for background
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16939 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-26 23:38:01 +00:00
rivers 1917748e5c Many changes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16938 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-26 19:54:51 +00:00
rivers 666f4f7b46 New file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16937 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-26 19:54:37 +00:00
rivers 2883a48505 Add ReadyToRun, LFFileName
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16936 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-26 19:54:20 +00:00
rivers d212f9b7b1 Add more intensifier stuff
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16934 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-25 15:30:38 +00:00
rivers 1d4f8dc422 Add Aux I/O; fix some typos
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16933 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-25 15:30:07 +00:00
rivers 664051c83d Add Aux I/O; fix some typos
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16932 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-25 15:30:03 +00:00
rivers 55fe3d19df Added more intensifier parameters
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16928 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-25 01:59:02 +00:00
rivers 274b4c486e Added 13LF2:
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16927 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-25 01:58:28 +00:00
rivers 5bf5b59f75 Additional intensifier parameters, etc.
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16926 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-25 01:57:51 +00:00
rivers b330c9f15e Added synchro params
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16896 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-19 11:33:10 +00:00
rivers 4cce154f2d Added GateWidth
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16895 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-19 11:32:44 +00:00
rivers a9ecbc0229 Changed gain from to LFGain, menu
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16876 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-15 16:38:32 +00:00
rivers 4d2a61d73f Added image intensifier records
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16874 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-15 16:36:41 +00:00
rivers a12dcd81d8 Added EpicsTSSec_RBV and EpicsTSNsec_RBV records
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16873 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-15 16:36:05 +00:00
rivers 4f5f4c8b77 Added call to updateTimeStamp
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16860 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-15 15:44:37 +00:00
rivers 5be77b2965 New file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16832 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-11 01:54:47 +00:00
rivers f42fef5fc6 New file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16831 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-11 01:50:58 +00:00
rivers f08f4db733 Added LightField
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16818 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2013-09-02 18:33:16 +00:00
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