 rivers
|
b2040bdb6f
|
New file that syncs ROI to the full detector
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14890 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2012-07-20 23:30:13 +00:00 |
|
|
rivers
|
6b871c3d11
|
New file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14889 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2012-07-20 23:28:53 +00:00 |
|
|
rivers
|
d7d6f54fdf
|
Added TriggerMode
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14888 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2012-07-20 23:28:24 +00:00 |
|
|
rivers
|
fbb1aa73b2
|
Added FITS file format
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14756 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2012-06-14 19:09:38 +00:00 |
|
|
rivers
|
791a84e830
|
Added AndorPreAmpGain
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14736 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2012-05-10 19:10:19 +00:00 |
|
|
rivers
|
8c9c7fd3b6
|
Remove mbbo/mbbi choices for AndorCCDSpeed, now computed at run-time; added AndorPreAmpGain, because that needs to be an mbbo as well
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14735 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2012-05-10 19:09:53 +00:00 |
|
|
rivers
|
76bd080e3c
|
New file for PSL detectors
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14734 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2012-05-10 19:08:32 +00:00 |
|
|
rivers
|
24ea1b5b79
|
Fixed typo for value of FrameType=DblCorrelation, should be 3, was 2
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14723 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2012-05-01 19:45:38 +00:00 |
|
|
mwpearson
|
51d45dfe65
|
pilatus driver and template: fixed thread polling for Th, as it wasn't working for 2M or 6M detectors. Added a 2s delay when aborting an acquisition, which seems to be needed to allow camserver time to clean up in some modes. Improved error reporting for multi frame acqusitions, when callbacks are turned off. Fixed a race condition to ensure we don't miss a stopEvent if we are doing a successful read from camserver. Added an automatic stop when getting a timeout from camserver, if we got no response (this prevents camserver and the pilatus driver getting out of sync.) Fixed race conditions that meant we occasionally read back the wrong ADStatus at the end of an exposure. Fixed a race condition in pilatusTask, that can cause a problem reading ADStatus if we sent a start and a stop in quick succession (before the pilatusTask thread had time to run). Added support for setting cbf_template_file. Turned off auto reconnect on the Asyn port, to force a IOC reboot if camserver if has been restarted. Fixed logic for setting the threshold, if we have auto apply turned off. Modified the pilatus driver to take advantage of the new aborted state, ie. replaced some of the ADErrors with ADStatusAborted.
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14660 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2012-04-07 12:24:52 +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 |
|
|
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
|
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
|
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
|
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
|
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
|
0797777311
|
Added TemperatureActual record
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14388 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2012-01-31 15:22:41 +00:00 |
|
|
rivers
|
38b288c65b
|
Added Temperature
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14387 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2012-01-31 15:22:16 +00:00 |
|
|
rivers
|
aa6d2e6f11
|
Removed Fast Kinetics PVs, use normal ADBase PVs instead; replaced AndorACTInKinetics with AndorAccumulatePeriod; removed AndorImageMode
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14382 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2012-01-27 03:59:44 +00:00 |
|
|
rivers
|
60fe771045
|
Removed Fast Kinetics PVs, use normal ADBase PVs instead; replaced AndorACTInKinetics with AndorAccumulatePeriod; removed AndorImageMode, add FastKinetcis to ADImageMode as last option instead; change Cooler to PINI=YES
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14381 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2012-01-27 03:58:48 +00:00 |
|
|
rivers
|
f76b16ee29
|
Added AndorCooler
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14365 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2012-01-12 23:09:16 +00:00 |
|
|
rivers
|
fa5ee7cd6f
|
Changed FK integer records from ao to longout; added FileFormat_RBV
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14364 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2012-01-12 23:08:49 +00:00 |
|
|
rivers
|
1ab8e40cf9
|
Changed UCHAR to CHAR
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14352 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2012-01-09 15:45:56 +00:00 |
|
|
rivers
|
50d78f2159
|
New version from DLS; removed AndorFileFormat, just use NDFileFormat; changed case of some enum strings
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14351 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2012-01-09 15:45:12 +00:00 |
|
|
rivers
|
7860254f05
|
New file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14350 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2012-01-09 15:41:45 +00:00 |
|
|
rivers
|
8a6fbdcb48
|
Reorganized; added GainFile
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14325 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-12-22 19:01:29 +00:00 |
|
|
rivers
|
85fab83910
|
Changed loading gain files, changed some record types from mbbo/mbbii to bo/bi; added new GainFile PV
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14324 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-12-22 19:00:42 +00:00 |
|
|
rivers
|
f2480e9739
|
Added UseOffset, UseGain, UsePixelCorrection; changed SkipPulses to SkipFrames
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14318 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-12-22 00:26:05 +00:00 |
|
|
rivers
|
e785768bb8
|
Removed PE_Status and PE_SyncMode records; many other small changes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14317 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-12-22 00:25:06 +00:00 |
|
|
rivers
|
74cfa9d4ef
|
Added TriggerEvent, TriggerOverlap, TriggerDelay
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14304 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-12-18 20:10:25 +00:00 |
|
|
rivers
|
356ef7273f
|
Removed FileFormat, obsolete; added TriggerDelay, TriggerEvent, TriggerOverlap, TriggerSoftware
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14294 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-12-16 00:13:15 +00:00 |
|
|
rivers
|
2c58a771a9
|
Changed GainMenu strings to be more informative; added temperature and humidity records; added TVX version record; disabled records from ADBase.template that are not used for Pilatus; all changes from Matt Pearson at DLS
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14287 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-12-12 20:57:05 +00:00 |
|
|
rivers
|
49aba0d0ff
|
Renamed RecursiveSum to Average, since that's what it is; added new filter type=Sum; always process FilterType if NumFilter changes so it reloads coefficients
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14241 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-12-03 18:41:07 +00:00 |
|
|
rivers
|
1b19fd038f
|
Add AutoResetFilter, FilterCallbacks
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14238 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-12-03 15:09:32 +00:00 |
|
|
rivers
|
2587734c60
|
Added Average to ImageMode record choices
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14209 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-12-02 00:33:47 +00:00 |
|
|
rivers
|
a199c66c02
|
Added new AutoResetFilter and FilterCallbacks records
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14208 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-12-02 00:32:55 +00:00 |
|
|
rivers
|
656115ac39
|
Added WriteStatus and WriteMessage PVs to display error messages on write or open errors
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14207 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-12-02 00:32:13 +00:00 |
|
|
rivers
|
53049b36a6
|
Added PENumFrameBuffers, PENumOffsetFrames, PENumGainFrames, PEGain
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14169 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-11-30 17:03:13 +00:00 |
|
|
rivers
|
7c83d0a76b
|
Improved support for offset and gain corrections; made AcquireGain and AcquireOffset be busy records so clients can wait; added currentOffsetFrame and currentGainFrame for progress indicator
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14168 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-11-30 17:01:53 +00:00 |
|
|
rivers
|
1df65e4740
|
Set default values of all filter coefficients for recursive average with scale of 1.0; fixed problem with DTYP of filter coefficient readbacks
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@13763 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-09-24 17:49:04 +00:00 |
|
|
rivers
|
845140eb88
|
Added READOUT_TIME
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@13552 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-08-29 21:20:21 +00:00 |
|
|
rivers
|
c6ebe88207
|
Added READOUT_TIME
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@13551 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-08-29 21:20:17 +00:00 |
|
|
rivers
|
8552d3039d
|
Added NDFileHDF5.template
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@13397 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-08-09 14:57:54 +00:00 |
|
|
rivers
|
73d61ac0c3
|
Renamed ImageType to SimMode
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@13367 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-08-08 15:11:16 +00:00 |
|
|
rivers
|
6289fb6fe6
|
Renamed ImageType to SimMode; removed unneeded fields from ColorMode
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@13366 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-08-08 15:11:00 +00:00 |
|
|
rivers
|
f1fd758686
|
Added PSByteRate
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@13362 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-08-07 16:30:39 +00:00 |
|
|
rivers
|
4772ed8713
|
Added new record PSByteRate and PSByteRate_RBV to control and read StreamBytesPerSecond
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@13361 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-08-07 16:30:15 +00:00 |
|
|
rivers
|
89e1ff871a
|
Added GapFill, ThresholdAutoApply
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@13190 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-07-19 20:09:47 +00:00 |
|
|
rivers
|
a5ba82b2cf
|
Added GapFill, ThresholdApply, ThresholdAutoApply
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@13189 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
|
2011-07-19 20:09:27 +00:00 |
|