diff --git a/documentation/MarCCDDoc.html b/documentation/MarCCDDoc.html index 039cb96..3fad2c3 100755 --- a/documentation/MarCCDDoc.html +++ b/documentation/MarCCDDoc.html @@ -1,6 +1,9 @@ - + + areaDetector MarCCD driver +
@@ -652,7 +655,7 @@ marCCDConfig(const char *portName, const char *marCCDPort,

The following is an example st.cmd startup script:

- 
< envPaths
+  
< envPaths
 errlogInit(20000)
 
 dbLoadDatabase("$(AREA_DETECTOR)/dbd/marCCDApp.dbd")
diff --git a/documentation/NDPluginColorConvert.html b/documentation/NDPluginColorConvert.html
index 63b1c7f..c13cad0 100755
--- a/documentation/NDPluginColorConvert.html
+++ b/documentation/NDPluginColorConvert.html
@@ -1,6 +1,9 @@
-
+
+
 
   areaDetector Plugin NDPluginColorConvert
+  
 
 
   

@@ -44,7 +47,7 @@ public:
                              const char **pptypeName, size_t *psize);
 
     /* These methods are just for this class */
-    template < typename epicstype > void convertColor(NDArray *pArray);
+    template <typename epicstype> void convertColor(NDArray *pArray);
 };
 ...
 }
diff --git a/documentation/NDPluginFile.html b/documentation/NDPluginFile.html
index aece6b2..f73545e 100755
--- a/documentation/NDPluginFile.html
+++ b/documentation/NDPluginFile.html
@@ -1,6 +1,9 @@
-a
+
+
 
   areaDetector Plugin NDPluginFile
+  
 
 
   

@@ -189,7 +192,7 @@ variables:
   

   
    
     
  • dimensions: numArrays is the number of arrays in the file. It will be 1 for files
-      collected in Single mode, and is normally > 1 for files collected in Capture or
+      collected in Single mode, and is normally >1 for files collected in Capture or
       Stream mode. For each array dim0 is the slowest varying dimension, dim1 the next
       slowest, etc.
    • 
     
  • variables: There are 3 variables in the netCDF file. uniqueId is the unique ID
diff --git a/documentation/NDPluginROI.html b/documentation/NDPluginROI.html
index 1280805..e835565 100755
--- a/documentation/NDPluginROI.html
+++ b/documentation/NDPluginROI.html
@@ -1,6 +1,9 @@
-
+
+
 
   areaDetector Plugin NDPluginROI
+  
 
 
   
    
@@ -17,7 +20,6 @@
     Contents
   
   
    
@@ -82,7 +84,7 @@ public:
   
-        
@@ -129,14 +131,14 @@ public:
   
    
     NDPluginROI.h defines the following parameters that are specific to each individual
     ROI in the plugin. The EPICS database NDROIN.template provide access to these parameters,
-    listed in the following table. The pasynUser->addr is used to control which ROI
+    listed in the following table. The pasynUser->addr is used to control which ROI
     is being addressed. Note that to reduce the width of this table the enum names have
     been split into 2 lines, but these are just a single name, for example NDPluginROIName.
   
    
     
       
    
+        
           Parameter Definitions in NDPluginROI.h and EPICS Record Definitions in NDROI.template
       
    
       
    
   
    
-        
@@ -195,7 +197,7 @@ public:
           bi
-        
@@ -573,7 +575,7 @@ public:
           longin
-        
@@ -685,7 +687,7 @@ public:
           ai
-        
diff --git a/documentation/NDPluginStdArrays.html b/documentation/NDPluginStdArrays.html
index 5bf8718..c6d79ad 100755
--- a/documentation/NDPluginStdArrays.html
+++ b/documentation/NDPluginStdArrays.html
@@ -1,6 +1,9 @@
-
+
+areaDetector Plugin NDPluginStdArrays
+  
    
diff --git a/documentation/RoperDoc.html b/documentation/RoperDoc.html
index 76962ec..f66c787 100755
--- a/documentation/RoperDoc.html
+++ b/documentation/RoperDoc.html
@@ -1,6 +1,9 @@
-
+
+
 
   areaDetector Roper driver
+  
 
 
   
    
@@ -385,7 +388,7 @@ roperConfig(const char *portName, int maxBuffers, size_t maxMemory);
   
    
     The following is an example st.cmd startup script:
   
    
-  
    < envPaths
+  
    < envPaths
 errlogInit(20000)
 
 dbLoadDatabase("$(AREA_DETECTOR)/dbd/roperApp.dbd")
diff --git a/documentation/adscDoc.html b/documentation/adscDoc.html
index 33b3bed..bcb0883 100644
--- a/documentation/adscDoc.html
+++ b/documentation/adscDoc.html
@@ -1,6 +1,6 @@
-
-
+
+
 
   areaDetector ADSC driver
   
diff --git a/documentation/areaDetector.html b/documentation/areaDetector.html
index 73d3b1a..8d7c7a4 100755
--- a/documentation/areaDetector.html
+++ b/documentation/areaDetector.html
@@ -1,6 +1,9 @@
-
+
+
 
   areaDetector: EPICS software for area detectors
+  
 
 
   
    
diff --git a/documentation/areaDetectorReleaseNotes.html b/documentation/areaDetectorReleaseNotes.html
index 020e52b..9d8caef 100755
--- a/documentation/areaDetectorReleaseNotes.html
+++ b/documentation/areaDetectorReleaseNotes.html
@@ -1,6 +1,9 @@
-
+
+
 
   areaDetectorReleaseNotes.html
+  
 
 
   
    
@@ -98,7 +101,7 @@
       
      
         
    • Renamed the pasynUser member to pasynUserSelf. This avoids a name conflict with
           the local variable pasynUser used in many derived classes. Unfortunately this requires
-          changes to derived class code where this->pasynUser was used.
      • 
+          changes to derived class code where this->pasynUser was used.
       
    
     
     
  • Added simulation code to ADSC driver. This allows it to be built and tested on
diff --git a/documentation/pilatusDoc.html b/documentation/pilatusDoc.html
index a0390ba..394b337 100755
--- a/documentation/pilatusDoc.html
+++ b/documentation/pilatusDoc.html
@@ -1,6 +1,9 @@
-
+
+
 
   areaDetector Pilatus driver
+  
 
 
   
    
@@ -19,11 +22,10 @@
     
  • Introduction
    • 
     
  • Implementation of standard driver parameters
    • 
     
  • Pilatus specific parameters
    • 
-    
  • Unsupported standard driver parameters
    • 
-    
  • Screenshots
    • 
-    
  • Configuring
    • 
-    
  • Performance measurements 
    • 
-    
  • Hardware notes 
    • 
+    
  • MEDM screens
    • 
+    
  • Configuration
    • 
+    
  • Performance measurements 
    • 
+    
  • Hardware notes 
    • 
     
  • Restrictions 
    • 
   
   
    
@@ -116,7 +118,7 @@
           $(P$(R)ExposurePeriod
         
    
+          Trigger modes when NumImages >1.
@@ -384,10 +386,10 @@ badX2,badY2 replacementX2,replacementY2
           for spatial non-uniformity in the response of the detector. It should be collected
           with a spatially uniform intensity on the detector at roughly the same energy as
           the measurements being corrected. When the flat field file is read, the average
-          pixel value (averageFlatField) is computed using all pixels with intensities >
-          PilatusMinFlatField. All pixels with intensity < PilatusMinFlatField in the flat
-          field are replaced with averageFlatField. When images are collected before the NDArray
-          callbacks are performed the following per-pixel correction is applied:
+          pixel value (averageFlatField) is computed using all pixels with intensities >PilatusMinFlatField.
+          All pixels with intensity <PilatusMinFlatField in the flat field are replaced
+          with averageFlatField. When images are collected before the NDArray callbacks are
+          performed the following per-pixel correction is applied:
           
    ImageData[i] = 
     (averageFlatField * 
     ImageData[i])/flatField[i];
@@ -527,7 +529,7 @@ pilatusDetectorConfig(const char *portName, const char *camserverPort,
   
    
     The following is an example st.cmd startup script:
   
    
-  
    < envPaths
+  
    < envPaths
 errlogInit(20000)
 
 dbLoadDatabase("$(AREA_DETECTOR)/dbd/pilatusDetectorApp.dbd")
@@ -608,7 +610,7 @@ iocInit()
 create_monitor_set("auto_settings.req", 30,"P=13PIL1:,D=cam1:")
 
 
    
-  
    
+  
    
     MEDM screens
    
   
    
     The following show the MEDM screens that are used to control the Pilatus debtector.
@@ -681,7 +683,7 @@ create_monitor_set("auto_settings.req", 30,"P=13PIL1:,D=cam1:")
     
    
       asynOctet.adl
    
     pilatusAsynOctet.png
-  
    
+  
    
     SPEC interface
    
   
    
     At the GSECARS beamlines (13-ID-C and 13-BM-C) at the APS we use SPEC to control
@@ -799,7 +801,7 @@ def epics_pilatus_count '{
             #p "image collection done"
         }
 
-        if( (sc_done==TRUE) && (img_done==TRUE)) break;
+        if( (sc_done==TRUE) && (img_done==TRUE)) break;
         sleep(0.01)
      }
 
@@ -819,7 +821,7 @@ def user_getcounts '{
         S[iroi] = epics_get(PILATUS_ROI_PV)
 
 
    
-  
    
+  
    
     Performance measurements
    
   
    
     The following measurements were done to demonstrate the performance that can be
@@ -880,8 +882,8 @@ def user_getcounts '{
       single-exposure mode. The trajectory scanning mode is thus more than 50 times faster
       to execute the identical SPEC scan.
   
-  
    
-  
    
+  
    
+    Hardware notes
    
   
    
     Trigger pulses
    
   
    
diff --git a/documentation/pluginDoc.html b/documentation/pluginDoc.html
index cfeb83f..37c1936 100755
--- a/documentation/pluginDoc.html
+++ b/documentation/pluginDoc.html
@@ -1,6 +1,9 @@
-
+
+
 
   areaDetector Plugins
+  
 
 
   
    
@@ -61,7 +64,7 @@
       be saving the entire detector), and plugged into a particular ROI, where it would
       just save a portion of the detector. Similarly the NDPluginColorConvert plugin is
       also a source of NDArray data callbacks. A pipeline of plugins can be constructed,
-      for example NDPluginColorConvert -> NDPluginROI -> NDPluginStdArrays. Each stage
+      for example NDPluginColorConvert->NDPluginROI->NDPluginStdArrays. Each stage
       of this pipeline can be executing in its own thread, and on modern multi-core processors
       each can be executing on its own core.
   
@@ -134,7 +137,7 @@ public:
   
    
     
       
    
+        
           Parameter Definitions in NDPluginROI.h and EPICS Record Definitions in NDROIN.template
       
    
       
    
       
    
       
    
+        
           ROI definition
       
    
       
    
       
    
       
    
+        
           ROI statistics
       
    
       
    
       
    
       
    
+        
           ROI histogram
       
    
       
    
 
   
 
 
   
           Controls the exposure period in seconds. It applies only in Internal or External
-          Trigger modes when NumImages > 1.
       
    
       
    
         
@@ -134,7 +136,7 @@
         
           Controls the acquisition. Setting this to 1 starts image acquisition. The driver
           sets the record to 0 when acquisition is complete. This means an entire acquisition
-          series if NImages > 1. Setting this to 0 aborts an acquisition. If the driver
+          series if NImages >1. Setting this to 0 aborts an acquisition. If the driver
           was currently acquiring imges then this record will cause the "Stop" and "K" (Kill)
           commands to be sent to camserver.
       
    
-        
@@ -154,7 +157,7 @@ public:
           EPICS record type
-        
@@ -199,7 +202,7 @@ public:
           longin
-        
@@ -322,7 +325,7 @@ public:
           longin
-        
@@ -477,7 +480,7 @@ public:
           ai
-        
diff --git a/documentation/prosilicaDoc.html b/documentation/prosilicaDoc.html
index 8f4efb8..1dcd987 100755
--- a/documentation/prosilicaDoc.html
+++ b/documentation/prosilicaDoc.html
@@ -1,6 +1,9 @@
-
+
+areaDetector Prosilica driver
+  
    
@@ -17,13 +20,10 @@
     Contents
   
-  
    
-    Prosilica Driver
    
+  
    
+    Overview
    
   
    
     This is a driver for Gigabit Ethernet and Firewire cameras from 
       Prosilica. It inherits from ADDriver and implements nearly all of the parameters
@@ -91,7 +91,7 @@
   
    
     
       
    
+        
           Parameter Definitions in NDPluginDriver.h and EPICS Record Definitions in NDPluginBase.template
       
    
       
    
       
    
       
    
+        
           asyn NDArray driver doing callbacks
       
    
       
    
       
    
       
    
+        
           Callback enable, minimum time, and statistics
       
    
       
    
       
    
       
    
+        
           Information about last NDArray callback data
       
    
       
    
       
    
       
    
+        
           Debugging control
       
    
       
    
 
   
 
 
   
    
-        
@@ -111,7 +111,7 @@
           EPICS record type
-        
@@ -458,7 +458,7 @@
           ai
-        
diff --git a/documentation/simDetectorDoc.html b/documentation/simDetectorDoc.html
index 7d98317..65cb46e 100755
--- a/documentation/simDetectorDoc.html
+++ b/documentation/simDetectorDoc.html
@@ -1,6 +1,9 @@
-
+
+areaDetector Simulation driver
+  
    

    
     
       
    
+        
           Parameter Definitions in prosilica.cpp and EPICS Record Definitions in prosilica.template
       
    
       
    
       
    
       
    
+        
           Trigger and I/O Control
       
    
       
    
       
    
       
    
+        
           Statistics Information