- fixed a bug in amorstat which resulted in bad scan axis to be sent

- added GetSoftVar to scan module. - Made sps moddule give up only after three tries to get command through - Added build script
2000-09-07 10:09:38 +00:00
parent 1552604aa6
commit 63f8406f52
18 changed files with 192 additions and 38 deletions
--- a/doc/programmer/center.tex
+++ b/doc/programmer/center.tex
@@ -31,6 +31,10 @@ $\langle$fitinter {\footnotesize ?}$\rangle\equiv$
 \mbox{}\verb@                            -2 when right FWHM could not be found@\\
 \mbox{}\verb@                             1 on success@\\
 \mbox{}\verb@  */@\\
+\mbox{}\verb@  int CalculateFitFromData(pFit self, float fAxis[], long lSum[], @\\
+\mbox{}\verb@                           int iLen);@\\
+\mbox{}\verb@  void GetFitResults(pFit self, float *fNewCenter, float *fStdDev,@\\
+\mbox{}\verb@                    float *FWHM, float *fMax);@\\
 \mbox{}\verb@  int DriveCenter(pFit self, SConnection *pCon, SicsInterp *pSics);@\\
 \mbox{}\verb@/*-------------------------------------------------------------------------*/@\\
 \mbox{}\verb@  int FitFactory(SConnection *pCon,SicsInterp *pSics, void *pData,@\\
--- a/doc/programmer/choco.tex
+++ b/doc/programmer/choco.tex
@@ -1,8 +1,9 @@
 \subsection{Chopper Controller}
-Yet another way to deal with a controller has beenn devised for
+Yet another way to deal with a controller has been devised for
 SICS. This uses the concept of a general controller which can have
 parameters enquired and set. Furthermore it may have parameters which
-may be driven like a motor through  a special adapter. This scheme is
+may be driven like a motor or environment controller  through  special
+adapters . This scheme is
 used for the chopper controller for FOCUS.
 \begin{itemize}
 \item A driver for a particular controller which allows to set and get 
@@ -11,6 +12,7 @@ parameters.
 \item An adapter object which allows to drive special parameters in a general 
 controller. Such adapter objects can be configured for each drivable parameter
 in a controller. 
+\item An adapter to an environment controller driver.
 \end{itemize}
 The test case for this way of doing things is a controller for running 
 choppers. This is why it gets the name.
@@ -85,7 +87,7 @@ fValue. The last is floating point which covers the frequent
 occurence of numeric values. 
 \item[SetPar2] The same as SetPar but uses test string as input for
 parameter setting. 
-\item[GetPar] retrieves the parameter parname formatted as test. The
+\item[GetPar] retrieves the parameter parname formatted as text. The
 value is put into the buffer pBuffer. iBufLen is the maximum number of
 bytes permissable for pBuffer.
 \item[CheckPar] When parameters are driven a means is needed to find
@@ -180,7 +182,7 @@ $\langle$chocodata {\footnotesize ?}$\rangle\equiv$
 It consists just of the standard SICS object descriptor and a pointer
 to the driver.

-\subsubsection{The Drive Adapter}
+\subsubsection{The Drive And Environment Adapters}
 Most of the work of the drive adaptor is hidden in the functions
 implementing the drivable interface. Thus the interface to the
 DriveAdapter is fairly simple:
@@ -199,6 +201,8 @@ $\langle$adapter {\footnotesize ?}$\rangle\equiv$
 \mbox{}\verb@   int CHAdapterAction(SConnection *pCon, SicsInterp *pSics, @\\
 \mbox{}\verb@                        void *pData,@\\
 \mbox{}\verb@                        int argc, char *argv[]);@\\
+\mbox{}\verb@@\\
+\mbox{}\verb@   pEVDriver MakeControllerEnvironmentDriver(int argc, char *argv[]);@\\
 \mbox{}\verb@               @\\
 \mbox{}\verb@@$\diamond$
 \end{list}
@@ -215,6 +219,8 @@ creating a drive adapter.
 \item[CHAdapterAction] is the SICS interpreter function for
 representing the object in SICS. Just a single action is supported:
 request the value of the parameter. 
+\item[MakeControllerEnvironmentDriver] creates an environment control
+driver for a parameter in a general controller object. 
 \end{description}

 The data structure for the drive adapter is slightly more interesting:
@@ -253,8 +259,30 @@ $\langle$adadata {\footnotesize ?}$\rangle\equiv$
 this adapter.
 \end{description}

+This is the data structure  for the private part of the environment
+controller driver:
 \begin{flushleft} \small
 \begin{minipage}{\linewidth} \label{scrap6}
+$\langle$evada {\footnotesize ?}$\rangle\equiv$
+\vspace{-1ex}
+\begin{list}{}{} \item
+\mbox{}\verb@@\\
+\mbox{}\verb@   typedef struct __CHEV {@\\
+\mbox{}\verb@                          char *pParName;@\\
+\mbox{}\verb@                          pCodri pDriv;@\\
+\mbox{}\verb@                          int iLastError;@\\
+\mbox{}\verb@                         }CHev, *pCHev;@\\
+\mbox{}\verb@@$\diamond$
+\end{list}
+\vspace{-1ex}
+\footnotesize\addtolength{\baselineskip}{-1ex}
+\begin{list}{}{\setlength{\itemsep}{-\parsep}\setlength{\itemindent}{-\leftmargin}}
+\item Macro referenced in scrap ?.
+\end{list}
+\end{minipage}\\[4ex]
+\end{flushleft}
+\begin{flushleft} \small
+\begin{minipage}{\linewidth} \label{scrap7}
 \verb@"codri.h"@ {\footnotesize ? }$\equiv$
 \vspace{-1ex}
 \begin{list}{}{} \item
@@ -281,7 +309,7 @@ this adapter.
 \end{minipage}\\[4ex]
 \end{flushleft}
 \begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap7}
+\begin{minipage}{\linewidth} \label{scrap8}
 \verb@"choco.h"@ {\footnotesize ? }$\equiv$
 \vspace{-1ex}
 \begin{list}{}{} \item
@@ -308,7 +336,7 @@ this adapter.
 \end{minipage}\\[4ex]
 \end{flushleft}
 \begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap8}
+\begin{minipage}{\linewidth} \label{scrap9}
 \verb@"chadapter.h"@ {\footnotesize ? }$\equiv$
 \vspace{-1ex}
 \begin{list}{}{} \item
@@ -327,6 +355,7 @@ this adapter.
 \mbox{}\verb@@$\langle$adapter {\footnotesize ?}$\rangle$\verb@@\\
 \mbox{}\verb@#ifdef CHADAINTERNAL@\\
 \mbox{}\verb@@$\langle$adadata {\footnotesize ?}$\rangle$\verb@@\\
+\mbox{}\verb@@$\langle$evada {\footnotesize ?}$\rangle$\verb@@\\
 \mbox{}\verb@#endif@\\
 \mbox{}\verb@#endif@\\
 \mbox{}\verb@@$\diamond$
--- a/doc/programmer/event.tex
+++ b/doc/programmer/event.tex
@@ -47,6 +47,7 @@ $\langle$VE {\footnotesize ?}$\rangle\equiv$
 \mbox{}\verb@#define REFLECTIONDONE 9@\\
 \mbox{}\verb@#define COUNTSTART     10@\\
 \mbox{}\verb@#define COUNTEND       11@\\
+\mbox{}\verb@#define FILELOADED     12@\\
 \mbox{}\verb@@$\diamond$
 \end{list}
 \vspace{-1ex}
--- a/doc/programmer/hkl.tex
+++ b/doc/programmer/hkl.tex
@@ -18,6 +18,7 @@ $\langle$hkldat {\footnotesize ?}$\rangle\equiv$
 \mbox{}\verb@   typedef struct __HKL {@\\
 \mbox{}\verb@                         pObjectDescriptor pDes;@\\
 \mbox{}\verb@                         double fUB[9];@\\
+\mbox{}\verb@                         MATRIX UBinv;@\\
 \mbox{}\verb@                         double fLambda;@\\
 \mbox{}\verb@                         int iManual;@\\
 \mbox{}\verb@                         double fLastHKL[5];@\\
--- a/doc/programmer/nconman.tex
+++ b/doc/programmer/nconman.tex
@@ -133,13 +133,17 @@ $\langle$condat {\footnotesize ?}$\rangle\equiv$
 \mbox{}\verb@                                  int iTelnet;@\\
 \mbox{}\verb@                                  int iOutput;                                @\\
 \mbox{}\verb@                                  int iFiles;@\\
-\mbox{}\verb@                                  int (*write)(SConnection *pCon,@\\
+\mbox{}\verb@                                  int (*write)(struct __SConnection *pCon,@\\
 \mbox{}\verb@                                      char *pMessage, int iCode);@\\
+\mbox{}\verb@                                  mkChannel *pDataSock;@\\
+\mbox{}\verb@                                  char      *pDataComp;@\\
+\mbox{}\verb@                                  int       iDataPort;@\\
 \mbox{}\verb@@\\
 \mbox{}\verb@                                  /* execution context */@\\
 \mbox{}\verb@                                  int eInterrupt;@\\
 \mbox{}\verb@                                  int iUserRights;@\\
 \mbox{}\verb@                                  int inUse;@\\
+\mbox{}\verb@                                  int iDummy;@\\
 \mbox{}\verb@                                  int iGrab;@\\
 \mbox{}\verb@                                  int iErrCode;@\\
 \mbox{}\verb@                                  SicsInterp *pSics;@\\
@@ -235,12 +239,14 @@ $\langle$conint {\footnotesize ?}$\rangle\equiv$
 \mbox{}\verb@   void SCSignalFunction(void *pCon, int iSignal, void *pSigData);@\\
 \mbox{}\verb@/* ***************************** I/O **************************************  */@\\
 \mbox{}\verb@  int SCAddLogFile(SConnection *self, char *name);@\\
+\mbox{}\verb@  int SCDelLogFile(SConnection *pCon, int iFile);@\\
 \mbox{}\verb@  void SCSetOutputClass(SConnection *self, int iClass);@\\
 \mbox{}\verb@  int SCWrite(SConnection *self, char *pBuffer, int iOut);@\\
 \mbox{}\verb@  int SCRead(SConnection *self, char *pBuffer, int iBufLen);   @\\
 \mbox{}\verb@  int SCPrompt(SConnection *pCon, char *pPrompt, char *pResult, int iLen);@\\
 \mbox{}\verb@  int SCSendOK(SConnection *self);@\\
 \mbox{}\verb@  int SCnoSock(SConnection *pCon);@\\
+\mbox{}\verb@  int SCWriteUUencoded(SConnection *pCon, char *pName, void *iData, int iLen);@\\
 \mbox{}\verb@/*************************   CallBack *********************************** */@\\
 \mbox{}\verb@   int SCRegister(SConnection *pCon, SicsInterp *pSics,@\\
 \mbox{}\verb@                            void *pInter, long lID);@\\
--- a/doc/programmer/optimise.tex
+++ b/doc/programmer/optimise.tex
@@ -141,6 +141,8 @@ The interface to this object looks like this:
 \mbox{}\verb@#define SCANABORT  -4@\\
 \mbox{}\verb@#define SYSERROR   -5@\\
 \mbox{}\verb@#define DRIVEERROR -6@\\
+\mbox{}\verb@#define VARREDO    -7@\\
+\mbox{}\verb@@\\
 \mbox{}\verb@@\\
 \mbox{}\verb@  void OptimiserClear(pOptimise self);@\\
 \mbox{}\verb@  int  OptimiserAdd(pOptimise self,@\\
--- a/doc/programmer/scan.tex
+++ b/doc/programmer/scan.tex
@@ -200,6 +200,8 @@ $\langle$scaninter {\footnotesize ?}$\rangle\equiv$
 \mbox{}\verb@  @\\
 \mbox{}\verb@    int GetScanCounts(pScanData self, long *lData, int iDataLen);@\\
 \mbox{}\verb@    int GetScanVar(pScanData self, int iWhich, float *fData, int iDataLen);@\\
+\mbox{}\verb@    int GetSoftScanVar(pScanData self, int iWhich, float *fData, int iDataLen);@\\
+\mbox{}\verb@@\\
 \mbox{}\verb@    int GetScanVarName(pScanData self, int iWhich, @\\
 \mbox{}\verb@                       char *pName, int iLength);@\\
 \mbox{}\verb@    int GetScanVarStep(pScanData self, int iWhich, @\\
@@ -262,6 +264,9 @@ standard scans.
 scan. Max iDatLen entries will be copied into lData.
 \item[GetScanVar] retrieves the scan positions for the scan variable
 number i. Max iDatLen entries get copied into fData.
+\item[GetSoftScanVar] retrieves the scan positions for the scan variable
+number i. The soft positions are retrieved, not the hard position stored
+ during the scan.
 \item[GetScanVarName] retrieves the name of scan variable i. 
 \item[GetScanVarStep] gets the step of the scan variable i.
 \item[GetScanMonitor] allows to retrieve the monitor counts collected
--- a/doc/programmer/velo.tex
+++ b/doc/programmer/velo.tex
@@ -170,7 +170,7 @@ $\langle$protos2 {\footnotesize ?}$\rangle\equiv$
 \vspace{-1ex}
 \begin{list}{}{} \item
 \mbox{}\verb@@\\
-\mbox{}\verb@\*@\\
+\mbox{}\verb@/*@\\
 \mbox{}\verb@    int VSSetRotation(pVelSel self, SConnection *pCon, float fNew);@\\
 \mbox{}\verb@    int VSSetTilt(pVelSel self, SConnection *pCon, float FNewTilt);@\\
 \mbox{}\verb@*/@\\
--- a/doc/programmer/velodorn.tex
+++ b/doc/programmer/velodorn.tex
@@ -38,10 +38,25 @@ certain speed has been reached, the command to set the desired
 rotation speed can be sent. The necessary mode dependent switching is
 done in the DornierStat function.  

-
-
 \begin{flushleft} \small
 \begin{minipage}{\linewidth} \label{scrap1}
+$\langle$dh {\footnotesize ?}$\rangle\equiv$
+\vspace{-1ex}
+\begin{list}{}{} \item
+\mbox{}\verb@@\\
+\mbox{}\verb@   int GetDornierStatus(void **pData, pDornierStatus pDornier);@\\
+\mbox{}\verb@   int DornierSend(void **pData, char *pCommand, char *pReply, int iLen);@\\
+\mbox{}\verb@@$\diamond$
+\end{list}
+\vspace{-1ex}
+\footnotesize\addtolength{\baselineskip}{-1ex}
+\begin{list}{}{\setlength{\itemsep}{-\parsep}\setlength{\itemindent}{-\leftmargin}}
+\item Macro referenced in scrap ?.
+\end{list}
+\end{minipage}\\[4ex]
+\end{flushleft}
+\begin{flushleft} \small
+\begin{minipage}{\linewidth} \label{scrap2}
 \verb@"velodorn.h"@ {\footnotesize ? }$\equiv$
 \vspace{-1ex}
 \begin{list}{}{} \item