- Many fixes to accomodate a nitty picky TRICS wishlist

- Added a log facility to scan which includes a variable which is logged but
  not driven during a scan.
- Fixed normal beam operation

scanvar.h

@@ -21,6 +21,7 @@
                    float      fStep;
                    float      *fData;
                    int        dataList;
+                   int logVar;
                   }VarEntry, *pVarEntry;
 
 /*---------------------------------------------------------------------*/
@@ -34,13 +35,22 @@
   * @param start The start position from which to scan
   * @param step The step width with which to scan.
   * @return A pointer to a new scan variable object on success, NULL
-  * else
+  * else NULL
   */
   pVarEntry MakeScanVar(SicsInterp *pSics, SConnection *pCon, char
                         *name, float start, float step);
+  /*
+   * Make a variable which is logged during the scan
+   * @param pSics The SICS interpreter to search for the variable
+   * @param pCon A connection to report problems to
+   * @param name The name of the variable to log
+  * @return A pointer to a new scan variable object on success, NULL
+  * else NULL
+  */
+  pVarEntry MakeLogVar(SicsInterp *pSics, SConnection *pCon, char *name);                      
   /**
     * InitScanVar clears the list of scan points
-    * @param pvar The scna variable to clear
+    * @param pvar The scan variable to clear
     */
   void InitScanVar(pVarEntry pVar);
   /**
@@ -66,6 +76,14 @@
     * @return The step width for the scan.
     */
   float ScanVarStep(pVarEntry pVar);
+  /**
+   * check if the scan is possible, i.e the scan variable does
+   * not violate the limits in the scan
+   * @param pVar The scan variable to check
+   * @param pCon The connection to report errors to
+   * @return 1 when OK, 0 when the limits are violated.
+   */ 
+  int CheckScanVar(pVarEntry pVar, SConnection *pCon, int np);
   /**
     * StartScanVar starts the scan variable to drive to the next
     * position.
@@ -96,5 +114,8 @@
     * @param np The number of slots in fData.
     */
   void CopyScanVar(pVarEntry pVar, float *fData, int np);
-
+  /**
+   * enquires if a variable is a logged variable or a proper scan variable
+   */
+  int isLogVar(pVarEntry pVar);
 #endif