Commit Graph

1113 Commits

Author SHA1 Message Date
rivers
8e17fd9cd8 Changed mca.adl to NDTimeSeries.adl; added NDTimeSeriesAll.adl
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14483 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-14 20:27:19 +00:00
rivers
cd6ef8599e Minor formatting change
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14482 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-14 20:26:38 +00:00
rivers
24db04d327 Added NDTimeSeriesAll related display
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14481 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-14 20:26:14 +00:00
rivers
084bfa742f New file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14480 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-14 20:25:44 +00:00
rivers
70d16ff571 Added NDTimeSeriesAll.adl screen shot
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14479 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-14 20:25:07 +00:00
rivers
0f3e9a1d32 New file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14478 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-14 20:24:30 +00:00
rivers
6c2f19cd6d Documented new Time Series records, removed references to MCA module
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14477 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-14 18:43:06 +00:00
rivers
7f6b6c274b Changes in NDPluginStats, removed mca module dependence
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14476 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-14 18:42:05 +00:00
rivers
c06ef7ae36 Removed mca dependence in R1-8
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14475 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-12 17:53:35 +00:00
rivers
04fe02260d Added time-series and changed layout
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14474 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-12 17:53:06 +00:00
rivers
5ae61c257f New file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14473 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-12 17:52:42 +00:00
rivers
d096815505 Obsolete
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14472 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-12 17:52:07 +00:00
rivers
a6c48fbf34 Remove MCA records; pass NCHANS to NDStats.template, needed for new time-series support
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14471 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-12 17:44:41 +00:00
rivers
87049d74cd Removed MCA, no longer needed
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14470 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-12 17:43:25 +00:00
rivers
acff97bb60 Removed mcaSupport.dbd, no longer needed
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14469 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-12 17:42:49 +00:00
rivers
1a3236e571 Changes for Fast Kintetics mode
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14468 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-12 17:42:18 +00:00
rivers
f050bb7a22 Added new time-series PVs; changed layout
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14463 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-12 17:37:40 +00:00
rivers
9a063f82dc New file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14462 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-12 17:37:03 +00:00
rivers
ae8ab311d2 Added time-series records
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14461 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-12 17:36:41 +00:00
rivers
38088cbc58 Added time-series records
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14460 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-12 17:36:25 +00:00
rivers
9fddfd6b28 Fixed problem with triggerMode, it was always being set ATInternal; minor fix to debugging output
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14436 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-07 17:02:17 +00:00
rivers
9ff027cda4 Commented out lines to build accumTest
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14435 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-07 17:01:30 +00:00
rivers
69efbbe843 Test program to illustrate bug (?) in Andor SDK
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14434 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-07 17:01:07 +00:00
rivers
e0d1031692 Added SDK version and Device driver version to report() function
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14433 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-06 21:50:07 +00:00
rivers
befc5af5aa Added documentation comments
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14424 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 20:10:18 +00:00
rivers
11adfb3a43 Removed unused shutdownCCD() function
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14423 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 20:09:59 +00:00
rivers
fe927f7686 Many changes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14422 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 20:09:11 +00:00
rivers
0f4893d8c9 Added iocAndor
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14421 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 20:08:30 +00:00
rivers
5acf039a4a Added notes on new Andor driver and Nexus plugin bug fixes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14420 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 20:08:12 +00:00
rivers
7886be93c7 Added comments about my changes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14418 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 18:14:54 +00:00
rivers
dc2a6451b2 Added comment about my changes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14417 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 18:14:44 +00:00
rivers
6028fb346b Changes to build with different DBD file on windows-x64 so only that arch does not use the GraphicsMagick plugin due to name confict on SetImage functions
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14416 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 18:06:54 +00:00
rivers
8fa85adc64 New file for windows-x64
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14415 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 18:05:46 +00:00
rivers
ca4bd90af5 Added line to load NDStdArrays.template for 16-bit waveforms as well are 32-bit
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14414 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 17:23:48 +00:00
rivers
7ff49703b2 New version of EPICS base
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14413 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 02:45:14 +00:00
rivers
225fc07a73 Use STATIC_BUILD=NO on Linux, because Andor's only has a shareable version of their library
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14412 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 00:47:55 +00:00
rivers
8b30d060da Changes to build on 64-bit Linux and Windows
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14411 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 00:47:09 +00:00
rivers
a2371d088f Removed throw from declaration of checkStatus, leads to warnings on Windows, and discouraged as bad style by many
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14410 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 00:46:20 +00:00
rivers
205bce7a94 Decrease stack size from 500000 to 100000, which is the minimum that works on windows-x64
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14409 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 00:38:03 +00:00
rivers
c3fc852968 New arguments in andorCCDConfig command
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14406 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-01 18:05:28 +00:00
rivers
335f834ea1 Andor medm screenshot
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14405 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-01 18:03:51 +00:00
rivers
8940d5800e Added DataType, replaced AcquireTimeActual with AcquireTime_RBV, etc.
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14404 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-01 18:03:13 +00:00
rivers
699b2619d7 Removed AcquireTimeActual, etc. record, use RBV; added Gain and DataType records; removed support for TEXT from NDFileFormate
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14403 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-01 18:02:06 +00:00
rivers
4fd0496524 Moved file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14402 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-01 18:00:03 +00:00
rivers
db4a34a5b5 Added support for NDDataType
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14401 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-01 17:59:52 +00:00
rivers
be7e27464e Moved to documentation directory
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14400 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-01 17:58:23 +00:00
rivers
dd19192d74 Added Andor in front of name
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14399 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-01 17:57:34 +00:00
rivers
81498e9661 Remove spaces from file name
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14398 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-01 17:56:28 +00:00
rivers
3d2a768d9b New file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14397 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-01 16:36:37 +00:00
rivers
ec66f2e0b3 Removed AcquireTimeActual, etc. parameters, use RBV instead; remove shutter private variables, not needed; remove data array, not needed; add desired values of AcquireTime, etc. to store desired values even when SDK changes them; added setupShutter function; print AndorCapabilities in report function; removed support for saving as TEXT file; change order of reading image and saving to disk
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14396 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-01 16:36:05 +00:00