From 83092333427f600e474178b86aba9d4c7ac49c82 Mon Sep 17 00:00:00 2001
From: rivers <rivers@dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b>
Date: Fri, 14 Nov 2008 23:32:52 +0000
Subject: [PATCH] Changes for R1-3

git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7824 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
---
 documentation/areaDetector.html             | 84 ++++++++++++++++++---
 documentation/areaDetectorReleaseNotes.html | 42 ++++++++++-
 2 files changed, 116 insertions(+), 10 deletions(-)

diff --git a/documentation/areaDetector.html b/documentation/areaDetector.html
index 0f6e37f..11388a1 100755
--- a/documentation/areaDetector.html
+++ b/documentation/areaDetector.html
@@ -31,16 +31,17 @@
     <li>High-speed, high-resolution CCD cameras. These use GigE and Firewire interfaces.</li>
   </ul>
   <p>
-    From <a href="http://www.adsc-xray.com/">ADSC</a> </p>
+    From <a href="http://www.adsc-xray.com/">ADSC</a>
+  </p>
   <ul>
-    <li>Large CCD detectors for x-ray diffraction.  This support is from Lewis Muir of IMCA-CAT
-      at the APS. </li>
+    <li>Large CCD detectors for x-ray diffraction. This support is from Lewis Muir of
+      IMCA-CAT at the APS. </li>
   </ul>
   <p>
-    From <a href="http://www.mar-usa.com/">MAR</a> (coming soon)</p>
+    From <a href="http://www.mar-usa.com/">MAR</a></p>
   <ul>
-    <li>MAR-165 CCD camera.</li>
-    <li>MAR-345 online image plate reader</li>
+    <li>MarCCD detectors</li>
+    <li>MAR-345 online image plate reader (coming soon)</li>
   </ul>
   <p>
     From <a href="http://www.roperscientific.com/">Roper</a> (coming soon)</p>
@@ -56,7 +57,7 @@
       WinView, not the SMART software.</li>
   </ul>
   <p>
-    Please email any comments and bug reports to <a href="mailto:%20rivers@cars.uchicago.edu">
+    Please email any comments and bug reports to <a href="mailto:rivers@cars.uchicago.edu">
       Mark Rivers</a> who is responsible for coordinating development and releases.</p>
   <h2>
     Where to find it</h2>
@@ -83,6 +84,20 @@
         <th>
           Known Problems</th>
       </tr>
+      <tr>
+        <td>
+          1-3</td>
+        <td>
+          15-Nov-2008</td>
+        <td>
+          <a href="http://cars.uchicago.edu/software/pub/areaDetectorR1-3.tgz">areaDetectorR1-3.tgz</a></td>
+        <td>
+          <a href="areaDetectorDoc.html">areaDetectorDoc</a></td>
+        <td>
+          <a href="areaDetectorReleaseNotes.html">Release notes</a></td>
+        <td>
+          See release notes</td>
+      </tr>
       <tr>
         <td>
           1-2</td>
@@ -141,6 +156,57 @@
         <th>
           Required for</th>
       </tr>
+      <tr>
+        <td rowspan="6">
+          1-3</td>
+        <td>
+          EPICS base</td>
+        <td>
+          3.14.10</td>
+        <td>
+          Base support. 3.14.8.2 also works, but the bug in epicsRingPointer can be a problem
+          on multi-processor Linux systems.</td>
+      </tr>
+      <tr>
+        <td>
+          asyn</td>
+        <td>
+          4-10</td>
+        <td>
+          Socket and interface support</td>
+      </tr>
+      <tr>
+        <td>
+          calc</td>
+        <td>
+          2-6-7</td>
+        <td>
+          scalcout record, needed by sscan database and useful for other databases</td>
+      </tr>
+      <tr>
+        <td>
+          sscan</td>
+        <td>
+          2-6-2</td>
+        <td>
+          sscan and busy records</td>
+      </tr>
+      <tr>
+        <td>
+          mca</td>
+        <td>
+          6-10</td>
+        <td>
+          mca record for getting time sequence of ROI counts</td>
+      </tr>
+      <tr>
+        <td>
+          autosave</td>
+        <td>
+          4-4</td>
+        <td>
+          Save/restore</td>
+      </tr>
       <tr>
         <td rowspan="6">
           1-2</td>
@@ -149,8 +215,8 @@
         <td>
           3.14.10</td>
         <td>
-          Base support.  3.14.8.2 also works, but the bug in epicsRingPointer can be a problem on multi-processor
-          Linux systems.</td>
+          Base support. 3.14.8.2 also works, but the bug in epicsRingPointer can be a problem
+          on multi-processor Linux systems.</td>
       </tr>
       <tr>
         <td>
diff --git a/documentation/areaDetectorReleaseNotes.html b/documentation/areaDetectorReleaseNotes.html
index b5c0905..b7ac84b 100755
--- a/documentation/areaDetectorReleaseNotes.html
+++ b/documentation/areaDetectorReleaseNotes.html
@@ -5,12 +5,52 @@
 <body>
   <h1 style="text-align: center">
     areaDetector Release Notes</h1>
+  <h2 style="text-align: center">
+    Release 1-3 (15-November-2008)</h2>
+  <ul>
+    <li>Added a driver for MarCCD detectors. Compared to the previous support in the "ccd"
+      module, this driver uses the faster Version 1 protocol for the Mar server. It also
+      makes the detector data available via callbacks (by reading the TIFF files as soon
+      as they are written). This allows detector data to be displayed with EPICS clients,
+      and for ROI calculations.</li>
+    <li>Added support for shutter control. Supports shutters that are driven directly
+      from the detector hardware, as well as shutters controlled by EPICS records. Shutter
+      support is implemented for the MarCCD, Pilatus, and simulation detectors.</li>
+    <li>Added new methods for shutter support to the detector base class ADDriver.cpp
+      <ul>
+        <li>ADDriver::setShutter()</li>
+        <li>ADDriver::writeInt32</li>
+      </ul>
+    </li>
+    <li>Added new enums in ADStdDriverParams.h
+      <ul>
+        <li>ADFrameType_t</li>
+        <li>ADShutterMode_t</li>
+      </ul>
+    </li>
+    <li>Added new parameters in ADStdDriverParams.h
+      <ul>
+        <li>ADShutterControl (replaces ADShutter)</li>
+        <li>ADShutterControlEPICS</li>
+        <li>ADShutterStatus</li>
+        <li>ADShutterMode</li>
+        <li>ADShutterOpenDelay</li>
+        <li>ADShutterCloseDelay</li>
+        <li>ADTimeRemaining</li>
+        <li>ADNumImagesCounter</li>
+        <li>ADArrayCallbacks</li>
+      </ul>
+      ADArrayCallbacks can be set to 0 to disable callbacks with detector data. For the
+      MarCCD and Pilatus detectors setting this to 0 will disable reading the disk files
+      after collection. This can be used to reduce overhead when EPICS is being used just
+      for control, rather than to access the data. </li>
+  </ul>
   <h2 style="text-align: center">
     Release 1-2 (24-October-2008)</h2>
   <ul>
     <li>Major update to documentation</li>
     <li>Significant enhancement to ROI plugin. Added net counts, ROI highlighting.</li>
-    <li>Added driver for Pilatus detectors.  This has undergone limited testing.</li>
+    <li>Added driver for Pilatus detectors. This has undergone limited testing.</li>
     <li>Added driver for ADSC detectors (done by Lewis Muir, IMCA-CAT)</li>
     <li>Removed separate readback parameters in drivers and template files</li>
     <li>Changed from mbbi/mbbo records to bi/bo records where possible now that the asynInt32