Commit Graph

1147 Commits

Author SHA1 Message Date
rivers
d513b750eb Added AcquireSequence
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14657 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-04-06 21:15:10 +00:00
rivers
71610e648e Added PINI=YES to AutoResetFilter and FilterCallbacks
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14649 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-30 20:13:18 +00:00
rivers
af2952a2a5 Commented out ARCH for linux-x86_64
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14632 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-27 15:19:06 +00:00
rivers
7c5d900f0e Notes about changed to NDFileTIFF plugin, added SampleFormat TIFF tag
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14623 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-21 16:22:37 +00:00
mwpearson
fdb94a65e3 areaDetector: added an Aborted state to the DetectorState_RBV record. Modified the simulation driver to use this Aborted state when an acqusition is aborted, instead of using the Error state.
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14604 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-09 11:07:54 +00:00
rivers
9a19171889 Improved Doxygen documentation
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14601 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-07 00:18:26 +00:00
rivers
3170b74d6c Fixed link to PDF file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14600 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-07 00:17:41 +00:00
rivers
441fee7413 Update now that it is working
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14599 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-06 23:57:13 +00:00
rivers
affcf234df Put in path to config files for Linux
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14597 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-06 22:24:05 +00:00
rivers
ec8b13fc55 Added commented out lines for tests on Linux; change so all archs use DBD file without GraphicsMagick because of name conflict with SetImage()
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14596 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-06 22:22:53 +00:00
rivers
b745a27e3d Fix a couple of problems with lock(); change to GetTemperatureF, i.e. floating point temperature
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14595 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-06 22:21:42 +00:00
rivers
c5f3c62470 Minor changes to build on Linux
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14594 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-06 22:19:57 +00:00
rivers
e15c449fbd Minor changes to build on Linux
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14593 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-06 22:19:46 +00:00
rivers
d433efdb3d New test file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14592 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-06 22:19:20 +00:00
rivers
55b750d5dd We cannot use GraphicsMagick on Linux either
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14591 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-06 20:59:23 +00:00
rivers
8bd1403ccd Replace with the previous andorCCDAppWIN64Include.dbd file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14590 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-06 20:58:36 +00:00
rivers
581367aa83 Updates for R1-8
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14587 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-06 18:46:17 +00:00
rivers
13a683d889 Note on GigE support in Perkin Elmer
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14586 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-06 18:45:05 +00:00
rivers
fc59fa4a51 Updates for GigE detectors, other changes for R1-8
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14585 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-06 18:44:32 +00:00
rivers
d2e6ba0d10 New path to asynPortDriver
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14584 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-06 18:43:59 +00:00
rivers
029e1f0a13 Switch from GetOldestImage to GetImages to fix problem saving files in Fast Kinetics mode
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14575 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-06 00:39:22 +00:00
rivers
a060ee36ba Use fast ADC, fixes problems with slow acquisitions
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14574 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-06 00:38:52 +00:00
rivers
23aa822983 Fix fixes for Linux; switch from GetOldestImage to GetImages to fix problem saving files in Fast Kinetics mode
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14573 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-06 00:38:20 +00:00
rivers
1c22ec9be8 Removed PSPacketSize; now read-only
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14572 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-06 00:36:47 +00:00
rivers
046a995a1f Removed PSPacketSize record, it is now read-only
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14571 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-06 00:35:19 +00:00
rivers
24e6613341 Removed PSPacketSize record, it is now read-only
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14570 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-06 00:35:04 +00:00
rivers
70bff5cf22 Changed documentation on PacketSize
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14507 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-29 23:33:45 +00:00
rivers
0da5144ead Changed documentation on PacketSize
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14506 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-29 23:33:29 +00:00
rivers
f643ecd481 Added PSPacketSize docmentation; reformatted with VS2008
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14503 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-29 19:21:00 +00:00
rivers
9a1d720a49 Added note about PacketSize for Prosilica
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14502 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-29 19:19:32 +00:00
rivers
8c052867a6 Added PSPacketSize; made new GigE area of display
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14500 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-29 18:55:50 +00:00
rivers
227708c0a4 Added PSPacketSize
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14499 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-29 18:55:13 +00:00
rivers
f70501adc6 Inserted commented out lines for FKTest.c
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14489 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-15 21:53:29 +00:00
rivers
eab5005f2f New test file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14488 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-15 21:52:44 +00:00
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