reflect recent changes in documentation

README.md

@@ -26,11 +26,11 @@ the server and pulls the data to the client computer.
 
   - *README.md*         this documentation 
   - *mchpa.py*          client program 
-  - *redPoscidaq.py*    a simple oscilloscope and daq client using the mcpha server
+  - *redPdaq.py*        client for data-acquisition using the mcpha server
   - *examples/*         recorded spectra
   - *examples/peakFitter.py* code to find and fit peaks in spectum data
   - *read_npy.py*       a simple example to read waveforms saved in *.npy* format
-  - *redP_mimocorb.py*  runs *redPoscdaq* as a client of the buffer manager *mimoCoRB*
+  - *redP_mimocorb.py*  runs *redPdaq* as a client of the buffer manager *mimoCoRB*
   - *run_daq.py*        script to strat the *mimoCoRB* application
   - *setup.yaml*        coniguration script defining the *mimoCoRB* application
   - *modules/* and *config/* contain code and configuration files for the *redP_mimoCoRB* application
@@ -50,8 +50,8 @@ the server and pulls the data to the client computer.
 ## Credit:
 
 *mcpha.py* is a fork of the sub-directory *projects/mcpha* in a project by
-Pavel Demin, [red-pitaya-notes](https://pavel-demin.github.io/red-pitaya-notes), *redPoscdaq.py* represents an
-extension of the oscilloscope class enabling fast restart and data export.  
+Pavel Demin, [red-pitaya-notes](https://pavel-demin.github.io/red-pitaya-notes),
+*redPaq.py* represents an extension of the oscilloscope class enabling fast restart and data export.  
 
 
 ## Multi-Channel Pulse-Height Analyzer for the RedPitaya FPGA board
@@ -100,25 +100,26 @@ of the *matplotlib*window to mark regions to zoom in for a detailed inspection o
 
 ## Oscilloscope and data recorder
 
-The script *redPosci.py* relies on the same server and FPGA image as the pulse-height analyzer.
-The *oscilloscope* and *generator* tabs provide the same functionality as in *mcpha.py*.
-In addition, however,  there is a button "*Start DAQ*" to run the oscilloscope in data acquisition
-mode, i.e. continuously. A subset of the data is shown in the oscilloscope display, together with
-information on the trigger rate and the transferred data volume. A configurable user-defined function
-may also be called to analyse and store the recorded waveforms. 
+The script *redPdaaq.py* relies on the same server and FPGA image as the pulse-height analyzer,
+providing the same functionality as *mcpha.py*. In addition, however, there is a button
+"*Start DAQ*" in the oscilloscope tab to run the oscilloscope in data acquisition mode,
+i.e. continuously. A subset of the data is shown in the oscilloscope display, together with
+information on the trigger rate and the transferred data volume. A configurable user-defined
+function may also be called to analyse and store the recorded waveforms. 
 It is possible to transfer data over a one-Gbit network from the RedPitaya with a rate of 50 MB/s
 or about 500 waveforms/s.
 
-Two examples of call-back functions callable by redPoscdaq are provided with the package
+An examples of call-back functions callable from within redPdaq is provided with the package
 
   - redP_consumer()            
       calculates and displays statistics on trigger rate and data volume
 
-  - redP_mimocorb()            
-      provides an interface to the buffer manager *mimiCoRB* for more advanced data analysis tasks
-      requiring multiple processes running in parallel. A simple *mimoCoRB* setup is also provided
-      and can be started by *./run_daq setup.yaml*; modules and configuration files for a pulse-height
-      analysis of signals are contained in the subdirectories *modules/* and *config/*, respectively. 
+
+*redP_mimocorb.py* is script called  as sub-process within the *mimiCoRB* frame-work
+for more advanced data analysis tasks requiring multiple processes running in parallel.
+A *mimoCoRB* setup-file is also provided and can be started by *./run_daq setup.yaml*;
+modules and configuration files for a pulse-height analysis of tecorded signals are
+contained in the subdirectories *modules/* and *config/*, respectively. 
 
 
 ## Installation
@@ -139,11 +140,11 @@ On the client computer, download the client software:
   - change directory to the installation directory and start the graphical interface of the client
     software via `python3 mcpha.py` on the command line. 
  
-The application program *mcpha.py* takes care of initializing the processes on the RedPitaya board 
-through the server process, initiates data transfers from the RedPitaya board to 
-the client computer and provides several tabs to visualize data, generate test data and 
+The application programs *mcpha.py* or *redPdaq.py* take care of initializing the processes on the
+RedPitaya board through the server process, initiate data transfers from the RedPitaya board to 
+the client computer and provide several tabs to visualize data, generate test pulses and 
 to store the acquired spectra. 
- 
+
 
 ### Network connection to the RedPitaya Board