diff --git a/A1931.c b/A1931.c
deleted file mode 100644
index b9585513..00000000
--- a/A1931.c
+++ /dev/null
@@ -1,344 +0,0 @@
-/*-------------------------------------------------------------------------
-  This is the implementation file for a driver for the Risoe A1931a 
-  temperature controller. This driver controls the device through a GPIB 
-  interface.
-  
-  copyright: see file COPYRIGHT
-
-   Mark Koennecke, February 2003
- -------------------------------------------------------------------------*/
-#include <string.h>
-#include <stdio.h>
-#include <time.h>
-#include <math.h>
-#include <assert.h>
-#include <unistd.h>
-#include "fortify.h"
-#include "sics.h"
-#include "obpar.h"
-#include "evcontroller.h"
-#include "evcontroller.i"
-#include "evdriver.i"  
-#include "gpibcontroller.h"
-#include "A1931.h"
-
-/*========================== private data structure ====================*/
-typedef struct {
-  int sensor;   /* the control sensor */
-  pGPIB gpib;   /* the GPIB interface to use in order to talk to the thing*/
-  int gpibAddress; /* address on bus */
-  int devID;    /* deviceID of the controller on the GPIB */
-  char errorBuffer[132]; /* a buffer for error messages from the thing*/
-  char commandLine[132]; /* buffer to keep the offending command line */
-  int errorCode; /* error indicator */
-}A1931, *pA1931;
-/*============================ defines ================================*/
-#define COMMERROR -300
-#define A1931ERROR -301
-#define FILEERROR   -302
-/*====================================================================*/
-static char *A1931comm(pEVDriver pData, char *command){
-  char buffer[256], *pPtr;
-  int status;
-  pA1931 self = NULL;
-  Tcl_DString reply;
-
-  self = (pA1931)pData->pPrivate;
-  assert(self);
-  
-  /*
-    send 
-  */
-  strncpy(buffer,command,250);
-  strcat(buffer,"\n");
-  status = GPIBsend(self->gpib,self->devID,buffer,(int)strlen(buffer));
-  if(status < 0){
-    self->errorCode = COMMERROR;
-    GPIBerrorDescription(self->gpib,status,self->errorBuffer,131);
-    return NULL;
-  }
-
-  /*
-    read until > is found
-  */
-  Tcl_DStringInit(&reply);
-  while(1){
-    pPtr = GPIBreadTillTerm(self->gpib,self->devID,10);
-    if(strstr(pPtr,"GPIB READ ERROR")  != NULL){
-      free(pPtr);
-      self->errorCode = COMMERROR;
-      Tcl_DStringFree(&reply);
-      return NULL;
-    } else {
-      Tcl_DStringAppend(&reply,pPtr,-1);
-      if(strchr(pPtr,'>') != NULL){
-	/*
-	  finished
-	*/
-	free(pPtr);
-	break;
-      }
-      free(pPtr);
-    }
-  }
-  pPtr = NULL;
-  pPtr = strdup(Tcl_DStringValue(&reply));
-  Tcl_DStringFree(&reply);
-  if(pPtr[0] == '#'){
-    /*
-      error
-    */
-    self->errorCode = A1931ERROR;
-    strncpy(self->errorBuffer,pPtr,131);
-    free(pPtr);
-    return NULL;
-  }
-  return pPtr;
-}
-/*--------------------------------------------------------------------*/
-static int A1931command(pEVDriver pData, char *command, char *replyBuffer,
-		 int replyBufferLen){
-  pA1931 self = NULL;
-  char *pReply = NULL;
-
-  self = (pA1931)pData->pPrivate;
-  assert(self);
-
-  pReply = A1931comm(pData,command);
-  if(pReply != NULL){
-    strncpy(replyBuffer,pReply,replyBufferLen);
-    free(pReply);
-    return 1;
-  } else {
-    strncpy(replyBuffer,self->errorBuffer,replyBufferLen);
-    return 0;
-  }
-}
-/*====================================================================*/
-static int A1931Init(pEVDriver pData){
-  pA1931 self = NULL;
-
-  self = (pA1931)pData->pPrivate;
-  assert(self);
-
-  self->devID = GPIBattach(self->gpib,0,self->gpibAddress,0,13,0,0); 
-  if(self->devID < 0){
-    return 0;
-  }
-  return 1;
-}
-/*====================================================================*/
-static int A1931Close(pEVDriver pData){
- pA1931 self = NULL;
-
-  self = (pA1931)pData->pPrivate;
-  assert(self);
-
-  GPIBdetach(self->gpib,self->devID);
-  self->devID = 0;
-  return 1;
-}
-/*===================================================================*/
-static int A1931Get(pEVDriver pData,float *fPos){
-  pA1931 self = NULL;
-  char buffer[132], command[50];
-  int status;
-
-  self = (pA1931)pData->pPrivate;
-  assert(self);
-
-  sprintf(command,"?TEMP%1.1d",self->sensor);
-  status = A1931command(pData,command,buffer,131);
-  if(!status){
-    return 0;
-  }
-  sscanf(buffer,"%f",fPos);
-  return 1;
-}
-/*=====================================================================*/
-static int A1931Set(pEVDriver pData, float fNew){
-  pA1931 self = NULL;
-  char buffer[132], command[50];
-  int status;
-
-  self = (pA1931)pData->pPrivate;
-  assert(self);
-
-  sprintf(command,"SET%1.1d=%f",self->sensor,fNew);
-  status = A1931command(pData,command,buffer,131);
-  if(!status){
-    return 0;
-  }
-  return 1;
-}
-/*====================================================================*/
-static int A1931error(pEVDriver pData, int *iCode, char *errBuff, int bufLen){
-  pA1931 self = NULL;
-  char pError[256];
-
-  self = (pA1931)pData->pPrivate;
-  assert(self);
-
-  *iCode = self->errorCode;
-  sprintf(pError,"ERROR: %s",self->errorBuffer);
-  strncpy(errBuff,pError,bufLen);
-  return 1;
-}
-/*====================================================================*/
-static int A1931fix(pEVDriver pData, int iCode){
-  pA1931 self = NULL;
-  char pError[256];
-
-  self = (pA1931)pData->pPrivate;
-  assert(self);
-
-  if(iCode == COMMERROR){
-    GPIBclear(self->gpib,self->devID);
-    return DEVREDO;
-  } 
-  return DEVFAULT;
-}
-/*=====================================================================*/
-pEVDriver CreateA1931Driver(int argc, char *argv[]){
-  pEVDriver self = NULL;
-  pA1931 priv = NULL;
-
-  if(argc < 2){
-    return NULL;
-  }
-
-  /*
-    allocate space 
-  */
-  self = CreateEVDriver(argc,argv);
-  priv = (pA1931)malloc(sizeof(A1931));
-  if(self == NULL || priv == NULL){
-    return NULL;
-  }
-  memset(priv,0,sizeof(A1931));
-  self->pPrivate = priv;
-  self->KillPrivate = free;
-
-  /*
-    initialize
-  */
-  priv->gpib = (pGPIB)FindCommandData(pServ->pSics,argv[0],"GPIB");
-  if(!priv->gpib){
-    DeleteEVDriver(self);
-    return NULL;
-  }
-  priv->sensor = 1;
-  priv->gpibAddress = atoi(argv[1]);
-
-  /*
-    initialize function pointers
-  */
-  self->Send =  A1931command;
-  self->Init = A1931Init;
-  self->Close = A1931Close;
-  self->GetValue = A1931Get;
-  self->SetValue = A1931Set;
-  self->GetError = A1931error;
-  self->TryFixIt = A1931fix;
-
-  return self;
-}
-/*=======================================================================*/
-static int downloadFile(pA1931 self, FILE *fd){
-  char buffer[132], *pPtr;
-  int status;
-
-  while(1){
-    if(fgets(buffer,130,fd) == NULL){
-      self->errorCode = FILEERROR;
-      strcpy(self->errorBuffer,"Failed to read from file");
-      return 0;
-    }
-    if(strstr(buffer,"$END") != NULL){
-      break;
-    }
-    status = GPIBsend(self->gpib,self->devID,buffer,(int)strlen(buffer));
-    if(status < 0){
-      self->errorCode = COMMERROR;
-      GPIBerrorDescription(self->gpib,status,self->errorBuffer,131);
-      return 0;
-    }
-    pPtr = GPIBreadTillTerm(self->gpib,self->devID,10);
-    if(pPtr[0] == '#'){
-      self->errorCode = A1931ERROR;
-      strncpy(self->errorBuffer,pPtr,131);
-      strncpy(self->commandLine,buffer,131);
-      free(pPtr);
-      return 0;
-    }
-    free(pPtr);
-    usleep(50);
-  }
-  return 1;
-}
-/*=======================================================================*/
-int A1931Action(SConnection *pCon, SicsInterp *pSics, void *pData,
-		int argc, char *argv[]){
-  pEVControl pEV = NULL;
-  pA1931 self = NULL;
-  char buffer[256];
-  char error[132];
-  FILE *fd = NULL;
-  int status, iCode;
-
-  pEV = (pEVControl)pData;
-  assert(pEV);
-  self = (pA1931)pEV->pDriv->pPrivate;
-  assert(self);
-
-  if(argc > 1){
-    strtolower(argv[1]);
-    if(strcmp(argv[1],"sensor") == 0){
-      if(argc > 2){
-	/* set case */
-	if(!SCMatchRights(pCon,usUser)){
-	  return 0;
-	}
-	self->sensor = atoi(argv[2]);
-	SCSendOK(pCon);
-	return 1;
-      } else {
-	/* get case */
-	sprintf(buffer,"%s.sensor = %d",argv[0],self->sensor);
-	SCWrite(pCon,buffer,eValue);
-	return 1;
-      }
-    }else if(strcmp(argv[1],"list") == 0){
-      sprintf(buffer,"%s.sensor = %d",argv[0],self->sensor);
-      SCWrite(pCon,buffer,eValue);
-      return EVControlWrapper(pCon,pSics,pData,argc,argv);
-    } else if(strcmp(argv[1],"file") == 0){
-      if(!SCMatchRights(pCon,usUser)){
-	return 0;
-      }
-      if(argc < 3){
-	SCWrite(pCon,"ERROR: need filename argument",eError);
-	return 0;
-      }
-      fd = fopen(argv[2],"r");
-      if(fd == NULL){
-	sprintf(buffer,"ERROR: failed to open %s", argv[2]);
-	SCWrite(pCon,buffer,eError);
-	return 0;
-      }
-      status = downloadFile(self,fd);
-      fclose(fd);
-      if(!status){
-	A1931error(pEV->pDriv,&iCode,error,131);
-	sprintf(buffer,"%s while transfering file", error);
-	SCWrite(pCon,buffer,eError);
-	sprintf(buffer,"Offending command: %s",self->commandLine);
-	SCWrite(pCon,buffer,eError);
-	return 0;
-      }
-      SCSendOK(pCon);
-      return 1;
-    }
-  } 
-  return EVControlWrapper(pCon,pSics,pData,argc,argv);
-}
diff --git a/A1931.h b/A1931.h
deleted file mode 100644
index 954813f7..00000000
--- a/A1931.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*-------------------------------------------------------------------------
-  This is the header file for a driver for the Risoe A1931a temperature
-  controller. This driver controls the device through a GPIB interface.
-  
-  copyright: see file COPYRIGHT
-
-   Mark Koennecke, February 2003
-   -------------------------------------------------------------------------*/
-#ifndef A1931A
-#define A19131A
-
-#include "sics.h"
-
-pEVDriver CreateA1931Driver(int argc, char *argv[]);
-
-int A1931Action(SConnection *pCon, SicsInterp *pSics, void *pData,
-		int argc, char *argv[]);
-
-
-#endif
diff --git a/amor2t.c b/amor2t.c
deleted file mode 100644
index 96bf3b7f..00000000
--- a/amor2t.c
+++ /dev/null
@@ -1,996 +0,0 @@
-/*---------------------------------------------------------------------------
-                                A M O R 2 T
-
-  A class for controlling the two theta movement of the reflectometer
-  AMOR at SINQ. It is not clear if this class may be useful for other
-  reflectometers, too. At AMOR the two theta movement of the detector is 
-  realized by translating the detector along x and z. Also it can be 
-  tilted in omega. Furthermore the height of two diaphragms has to be
-  adjusted when moving two theta as well. In polarizing mode the analyzer
-  mirror has to be moved as well.
-
-  copyright: see copyright.h
-
-  Mark Koennecke, September 1999
-
-  Bugs fixed, analyzer included for A2T. Then there is a second thing:
-  aoz2t which allows to scan the analyzer in two-theta during alignment
-  of the instrument. As all the parameters are already held in the a2t 
-  structures this extra was added into this module. 
-
-  Mark Koennecke, May-June 2000 
----------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <assert.h>
-#include <math.h>
-#include "fortify.h"
-#include <tcl.h>
-#include "sics.h"
-#include "motor.h"
-#include "obpar.h"
-
-#define DEBUG 1
-
-#define MAXMOT 13
-#define MAXPAR 13
-
-#include "amor2t.i"
-#include "amor2t.h"
-
-/*
-  Defines for accessing various motors and variables. Definition of motor: see
-  annotated AMOR drawing. 
-*/
-
-/* monochromator omega */
-#define MOTMOM 0
-/* sample omega */
-#define MOTSOM 1
-/* detector height movement */
-#define MOTCOZ 2
-/* detector movement along main axis */
-#define MOTCOX 3
-/* sample holder height movement */
-#define MOTSTZ 4
-/* whole sample table height movement */
-#define MOTSOZ 5
-/* lift for diaphragm 4*/ 
-#define MOTD4B 6
-/* lift for diaphragm 5 */
-#define MOTD5B 7
-/* detector omega movement */
-#define MOTCOM 8
-/* lift for analyzer */
-#define MOTAOZ 9
-/* analyzer omega */
-#define MOTAOM 10
-/* detector 2 movement */
-#define MOTC3Z  11
-
-
-/*======================================================================
-   The core of it all: The calculation of the settings for the various 
-   motors.
-========================================================================*/
-   static int CalculateAMORE(pAmor2T self, SConnection *pCon, float fNew)
-   {
-      float fMOM, fSOM, fSTZ, fSOZ, fAOM, fAOZ, fC3Z, fconstAOM;
-      double fAngle, fX, fZ, fZ2, fBase, fPIR;
-      float fCOZ, fCOX, fCOM;
-      int iRet;
-#ifdef DEBUG
-      char pBueffel[132];
-#endif
-
-      /* get the necessary angles first */
-      iRet = MotorGetSoftPosition(self->aEngine[MOTMOM],pCon,&fMOM);
-      if(iRet != 1)
-      {
-        return iRet;
-      }
-      iRet = MotorGetSoftPosition(self->aEngine[MOTSOM],pCon,&fSOM);
-      if(iRet != 1)
-      {
-        return iRet;
-      }
-      iRet = MotorGetSoftPosition(self->aEngine[MOTSTZ],pCon,&fSTZ);
-      if(iRet != 1)
-      {
-        return iRet;
-      }
-      iRet = MotorGetSoftPosition(self->aEngine[MOTSOZ],pCon,&fSOZ);
-      if(iRet != 1)
-      {
-        return iRet;
-      }
-
-      /* calculate base height of sample table */
-      fBase = fSOZ + ObVal(self->aParameter,PARDH);
-      fPIR = 180. / 3.1415926;
-      
-      /* calculation for detector */
-      fAngle = fNew - 2*fMOM;
-      if(fAngle < 0)
-      {
-         fAngle = fAngle + 360.;
-      }
-      fAngle /= fPIR;  
-      fX = ObVal(self->aParameter,PARDS)*cos(fAngle);
-      fZ = ObVal(self->aParameter,PARDS)*sin(fAngle);
-      self->toStart[0].pMot = self->aEngine[MOTCOX];
-      strcpy(self->toStart[0].pName,self->aEngine[MOTCOX]->name);
-      self->toStart[0].fTarget = fX - ObVal(self->aParameter,PARDS);
-      self->toStart[1].pMot = self->aEngine[MOTCOZ];
-      strcpy(self->toStart[1].pName,self->aEngine[MOTCOZ]->name);
-      self->toStart[1].fTarget = fZ + fBase  - 
-                       ObVal(self->aParameter,PARDDH);
-      self->toStart[2].pMot = self->aEngine[MOTCOM];
-      strcpy(self->toStart[2].pName,self->aEngine[MOTCOM]->name);
-      self->toStart[2].fTarget = fNew - 2*fMOM;
-      self->iStart = 3;
-
-      /* calculation for diaphragm 4 */
-      fZ = ObVal(self->aParameter,PARDD4) * sin(fAngle);
-      self->toStart[3].pMot = self->aEngine[MOTD4B];
-      strcpy(self->toStart[3].pName,self->aEngine[MOTD4B]->name);
-      self->toStart[3].fTarget = fBase + fZ - 
-                                 ObVal(self->aParameter,PARD4H);
-      self->iStart = 4;
-
-      /* calculation for diaphragm 5 */
-      fZ = ObVal(self->aParameter,PARDD5) * sin(fAngle);
-      self->toStart[4].pMot = self->aEngine[MOTD5B];
-      strcpy(self->toStart[4].pName,self->aEngine[MOTD5B]->name);
-      self->toStart[4].fTarget = fBase + fZ - 
-                                 ObVal(self->aParameter,PARD5H);
-      self->iStart = 5;
-#ifdef DEBUG
-      sprintf(pBueffel,"2T    COZ    COX    COM    D4B    D5B    ");
-      SCWrite(pCon,pBueffel,eValue);
-      sprintf(pBueffel,"%6.2f %6.2f %6.2f %6.2f %6.2f %6.2f",
-             fNew, self->toStart[1].fTarget, self->toStart[0].fTarget,
-             self->toStart[2].fTarget, self->toStart[3].fTarget,
-             self->toStart[4].fTarget);
-      SCWrite(pCon,pBueffel,eValue);         
-#endif
-
-      if(ObVal(self->aParameter,ANAFLAG) > 0)
-      {
-        /* the analyzer height */
-        fZ = ObVal(self->aParameter,PARADIS)*sin(fAngle); 
-        fAOZ = fBase + fZ - ObVal(self->aParameter,PARANA);
-        self->toStart[5].pMot = self->aEngine[MOTAOZ];
-        strcpy(self->toStart[5].pName,self->aEngine[MOTAOZ]->name);
-        self->toStart[5].fTarget = fAOZ;
-        self->iStart = 6;
-
-        /* analyzer omega */
-        self->toStart[6].pMot = self->aEngine[MOTAOM];
-        strcpy(self->toStart[6].pName,self->aEngine[MOTAOM]->name);
-        self->toStart[6].fTarget = fNew/2. 
-             + ObVal(self->aParameter,PARAOM);
-        self->iStart = 7;
-
-        /* C3Z */
-        fZ2 = (ObVal(self->aParameter,PARDS) - ObVal(self->aParameter,
-                 PARADIS))*sin(fAngle + (fNew/fPIR) );
-                
-        self->toStart[7].pMot = self->aEngine[MOTC3Z];
-        strcpy(self->toStart[7].pName,self->aEngine[MOTC3Z]->name);
-        self->toStart[7].fTarget = fBase + fZ + fZ2 - 
-                    ObVal(self->aParameter,PARDDD) - 
-              self->toStart[1].fTarget; 
-        self->iStart = 8;
-#ifdef DEBUG
-        sprintf(pBueffel,"2T     AOZ    AOM    C3Z");
-        SCWrite(pCon,pBueffel,eValue);
-        sprintf(pBueffel,"%6.2f %6.2f %6.2f %6.2f",
-             fNew, self->toStart[5].fTarget, self->toStart[6].fTarget,
-             self->toStart[7].fTarget);
-        SCWrite(pCon,pBueffel,eValue);         
-#endif
-       
-      }      
-      return 1; 
-   }
-/*=======================================================================
-  Calculations for Analyzer two theta 
-=========================================================================*/
-   static int CalculateANA2T(pAmor2T self, SConnection *pCon, float fNew)
-   {
-      double fBase, fPIR;
-      float fAOZ, fIncident, fSOM, fMOM, fDiffracted, fDistance, fX, fZ;
-      int iRet;
-#ifdef DEBUG
-      char pBueffel[132];
-#endif
-
-      /* calculate base height of analyzer table */
-      iRet = MotorGetSoftPosition(self->aEngine[MOTSOZ],pCon,&fAOZ);
-      if(iRet != 1)
-      {
-        return iRet;
-      }
-      fBase = fAOZ + ObVal(self->aParameter,PARANA);
-      fPIR = 180. / 3.1415926;
-
-      /* Calculate the incident angle at the analyzer */
-      iRet = MotorGetSoftPosition(self->aEngine[MOTSOM],pCon,&fSOM);
-      if(iRet != 1)
-      {
-        return iRet;
-      }
-      iRet = MotorGetSoftPosition(self->aEngine[MOTMOM],pCon,&fMOM);
-      if(iRet != 1)
-      {
-        return iRet;
-      }
-      fIncident = fMOM + 2. * fSOM;
-           
-      /* calculate the angle of the diffracted beam against the
-         horizon  at the analyzer.  
-
-         fDiffracted = fIncident - 2. * AOM.  
-        
-         There is a problem here. We should read AOM in order to get the 
-         value. However in the context of an omega - two-theta scan on AOM
-         and ana2t, it is fNew. 
-      */
-      fDiffracted = fIncident - fNew;
-
-      
-      /* calculation for detector */
-      fDiffracted /= fPIR;  
-      fDistance = ObVal(self->aParameter,PARDS) - 
-            ObVal(self->aParameter, PARANA);
-      fX = fDistance*cos(fDiffracted);
-      fZ = fDistance*sin(fDiffracted);
-      self->toStart[0].pMot = self->aEngine[MOTCOX];
-      strcpy(self->toStart[0].pName,self->aEngine[MOTCOX]->name);
-      self->toStart[0].fTarget = fX - fDistance;
-
-      self->toStart[1].pMot = self->aEngine[MOTCOZ];
-      strcpy(self->toStart[1].pName,self->aEngine[MOTCOZ]->name);
-      self->toStart[1].fTarget = fZ + fBase  - 
-                       ObVal(self->aParameter,PARDDH);
-
-      self->toStart[2].pMot = self->aEngine[MOTCOM];
-      strcpy(self->toStart[2].pName,self->aEngine[MOTCOM]->name);
-      self->toStart[2].fTarget = -fDiffracted*fPIR;
-      self->iStart = 3;
-
-      /* calculation for diaphragm 5 */
-      fZ = ObVal(self->aParameter,PARDD5) * sin(fDiffracted);
-      self->toStart[3].pMot = self->aEngine[MOTD5B];
-      strcpy(self->toStart[3].pName,self->aEngine[MOTD5B]->name);
-      self->toStart[3].fTarget = fBase + fZ - 
-                                 ObVal(self->aParameter,PARD5H);
-      self->iStart = 4;
-
-#ifdef DEBUG
-      sprintf(pBueffel,"2T    COX    COZ   COM   D5B    ");
-      SCWrite(pCon,pBueffel,eValue);
-      sprintf(pBueffel,"%6.2f %6.2f %6.2f %6.2f %6.2f ",
-             fNew, self->toStart[0].fTarget, self->toStart[1].fTarget,
-             self->toStart[2].fTarget,self->toStart[3].fTarget);
-      SCWrite(pCon,pBueffel,eValue);         
-#endif
-
-      return 1; 
-   }
-/*========================================================================
-   Definition of interface functions.
-=========================================================================*/
-   static long A2TSetValue(void *pData, SConnection *pCon, float fNew)
-   {
-      int i, iRet;
-      pIDrivable pDriv = NULL;
-      pAmor2T self = (pAmor2T) pData;
-
-      assert(self);
-
-      /* calculation */
-      iRet = CalculateAMORE(self,pCon,fNew);
-      if(iRet != 1)
-      {
-        return iRet;
-      }
-     
-      /* start them all */
-      for(i = 0; i < self->iStart; i++)
-      {
-        pDriv = self->toStart[i].pMot->pDescriptor->GetInterface(
-                                            self->toStart[i].pMot,DRIVEID);
-        if(pDriv != NULL)
-	{
-           iRet = pDriv->SetValue(self->toStart[i].pMot,pCon,
-                                  self->toStart[i].fTarget);
-           if(iRet != OKOK)
-	   {
-              return iRet;
-           }        
-        }        
-      }
-      return OKOK;
-   } 
-/*--------------------------------------------------------------------*/
-   static long ANA2TSetValue(void *pData, SConnection *pCon, float fNew)
-   {
-      int i, iRet;
-      pIDrivable pDriv = NULL;
-      pAmor2T self = (pAmor2T) pData;
-
-      assert(self);
-
-      /* calculation */
-      iRet = CalculateANA2T(self,pCon,fNew);
-      if(iRet != 1)
-      {
-        return iRet;
-      }
-     
-      /* start them all */
-      for(i = 0; i < self->iStart; i++)
-      {
-        pDriv = self->toStart[i].pMot->pDescriptor->GetInterface(
-                                            self->toStart[i].pMot,DRIVEID);
-        if(pDriv != NULL)
-	{
-           iRet = pDriv->SetValue(self->toStart[i].pMot,pCon,
-                                  self->toStart[i].fTarget);
-           if(iRet != OKOK)
-	   {
-              return iRet;
-           }        
-        }        
-      }
-      return OKOK;
-   } 
-/*-------------------------------------------------------------------------*/
-   static int A2THalt(void *pData)
-   {
-      int i, iRet;
-      pIDrivable pDriv = NULL;
-      pAmor2T self = (pAmor2T) pData;
-
-      assert(self);
-
-      /* stop them all */
-      for(i = 0; i < self->iStart; i++)
-      {
-        pDriv = self->toStart[i].pMot->pDescriptor->GetInterface(
-                                            self->toStart[i].pMot,DRIVEID);
-        if(pDriv != NULL)
-	{
-           iRet = pDriv->Halt(self->toStart[i].pMot);
-        }        
-      }
-      return OKOK;
-   }
-/*-----------------------------------------------------------------------*/
-   static int A2TCheck(void *pData, float fNew, char *error, int iErrLen)
-   {
-      int i, iRet;
-      pIDrivable pDriv = NULL;
-      pAmor2T self = (pAmor2T) pData;
-      SConnection *pDumCon = NULL;
-
-
-      assert(self);
-      pDumCon = SCCreateDummyConnection(pServ->pSics);
-      assert(pDumCon);
-
-      /* calculation */
-      iRet = CalculateAMORE(self,pDumCon,fNew);
-      SCDeleteConnection(pDumCon);
-      if(iRet != 1)
-      {
-        return iRet;
-      }
-     
-      /* check them all */
-      for(i = 0; i < self->iStart; i++)
-      {
-        pDriv = self->toStart[i].pMot->pDescriptor->GetInterface(
-                                            self->toStart[i].pMot,DRIVEID);
-        if(pDriv != NULL)
-	{
-           iRet = pDriv->CheckLimits(self->toStart[i].pMot,
-                                     self->toStart[i].fTarget,
-                                     error,iErrLen);
-           if(iRet != 1)
-	   {
-              return iRet;
-           }        
-        }        
-      }
-      return 1;
-   } 
-/*-------------------------------------------------------------------*/
-   static int ANA2TCheck(void *pData, float fNew, char *error, int iErrLen)
-   {
-      int i, iRet;
-      pIDrivable pDriv = NULL;
-      pAmor2T self = (pAmor2T) pData;
-      SConnection *pDumCon = NULL;
-
-
-      assert(self);
-      pDumCon = SCCreateDummyConnection(pServ->pSics);
-      assert(pDumCon);
-
-      /* calculation */
-      iRet = CalculateANA2T(self,pDumCon,fNew);
-      SCDeleteConnection(pDumCon);
-      if(iRet != 1)
-      {
-        return iRet;
-      }
-     
-      /* check them all */
-      for(i = 0; i < self->iStart; i++)
-      {
-        pDriv = self->toStart[i].pMot->pDescriptor->GetInterface(
-                                            self->toStart[i].pMot,DRIVEID);
-        if(pDriv != NULL)
-	{
-           iRet = pDriv->CheckLimits(self->toStart[i].pMot,
-                                     self->toStart[i].fTarget,
-                                     error,iErrLen);
-           if(iRet != 1)
-	   {
-              return iRet;
-           }        
-        }        
-      }
-      return 1;
-   } 
-/*------------------------------------------------------------------------*/
-   static int A2TStatus(void *pData, SConnection *pCon)
-   {
-      int i, iRet;
-      pIDrivable pDriv = NULL;
-      pAmor2T self = (pAmor2T) pData;
-
-      assert(self);
-
-      /* check them all */
-      for(i = 0; i < self->iStart; i++)
-      {
-        pDriv = self->toStart[i].pMot->pDescriptor->GetInterface(
-                                            self->toStart[i].pMot,DRIVEID);
-        if(pDriv != NULL)
-	{
-           iRet = pDriv->CheckStatus(self->toStart[i].pMot,pCon);
-           if( (iRet != OKOK) && (iRet != HWIdle) )
-	   {
-              return iRet;
-           }        
-        }        
-      }
-      return iRet;
-   } 
-/*------------------------------------------------------------------------*/
-   static float A2TGetValue(void *pData, SConnection *pCon)
-   {
-     float fVal, fMOM, fResult;
-     int iRet;
-     pAmor2T self = (pAmor2T) pData;
- 
-     assert(self);
-
-     /* get COM */
-     iRet = MotorGetSoftPosition(self->aEngine[MOTCOM], pCon, &fVal);
-     if(!iRet)
-     {
-       return -9999.99;
-     }
-     /* get MOM */
-     iRet = MotorGetSoftPosition(self->aEngine[MOTMOM], pCon, &fMOM);
-     if(!iRet)
-     {
-       return -9999.99;
-     }
-    
-     /* retrocalculate 2 theta */
-     fResult =  fVal + 2*fMOM;
-     return fResult;
-   }
-/*------------------------------------------------------------------------*/
-   static float ANA2TGetValue(void *pData, SConnection *pCon)
-   {
-     float fVal, fMOM, fResult;
-     int iRet;
-     pAmor2T self = (pAmor2T) pData;
- 
-     assert(self);
-
-     /* get AOM */
-     iRet = MotorGetSoftPosition(self->aEngine[MOTAOM], pCon, &fVal);
-     if(!iRet)
-     {
-       return -9999.99;
-     }
-
-     return 2. * fVal;
-
-   }
-/*-----------------------------------------------------------------------*/
-   static void *A2TGetInterface(void *pData, int iID)
-   {
-     pAmor2T self = (pAmor2T) pData;
- 
-     assert(self);
-     if(iID == DRIVEID)
-     {
-       return self->pDriv;
-     }    
-     return NULL;
-   }
-/*------------------------------------------------------------------------*/
-   static int A2TSave(void *pData, char *name, FILE *fd)
-   {
-     int i;
-     pAmor2T self = (pAmor2T) pData;
- 
-     assert(self);
-
-     fprintf(fd,"%s detectord %f \n", name, ObVal(self->aParameter,PARDS));
-     fprintf(fd,"%s sampleh %f \n", name, ObVal(self->aParameter,PARDH));
-     fprintf(fd,"%s d4d %f \n", name, ObVal(self->aParameter,PARDD4));
-     fprintf(fd,"%s d5d %f \n", name, ObVal(self->aParameter,PARDD5));
-     fprintf(fd,"%s interrupt %f \n", name, ObVal(self->aParameter,PARINT));
-     fprintf(fd,"%s detectorh %f \n", name, ObVal(self->aParameter,PARDDH));
-     fprintf(fd,"%s d4h %f \n", name, ObVal(self->aParameter,PARD4H));
-     fprintf(fd,"%s d5h %f \n", name, ObVal(self->aParameter,PARD5H));
-     fprintf(fd,"%s anah %f \n", name, ObVal(self->aParameter,PARANA));
-     fprintf(fd,"%s anad %f \n", name, ObVal(self->aParameter,PARADIS));
-     fprintf(fd,"%s anaflag %f \n", name, ObVal(self->aParameter,ANAFLAG));
-     fprintf(fd,"%s c2h %f \n", name, ObVal(self->aParameter,PARDDD));
-     fprintf(fd,"%s aomconst %f \n", name, ObVal(self->aParameter,PARAOM));
-     return 1;
-   }
-/*------------------------------------------------------------------------*/
-   static void A2TList(pAmor2T self, SConnection *pCon, char *name)
-   {
-      char pBueffel[132];
-      Tcl_DString tString;
-
-      assert(pCon);
-      assert(self);
- 
-      Tcl_DStringInit(&tString);
-      sprintf(pBueffel,
-            "%s.detectord %f \n", name, ObVal(self->aParameter,PARDS));
-      Tcl_DStringAppend(&tString,pBueffel,-1);
-          sprintf(pBueffel,
-            "%s.sampleh %f \n", name, ObVal(self->aParameter,PARDH));
-      Tcl_DStringAppend(&tString,pBueffel,-1);
-      sprintf(pBueffel,
-            "%s.d4d %f \n", name, ObVal(self->aParameter,PARDD4));
-      Tcl_DStringAppend(&tString,pBueffel,-1);
-      sprintf(pBueffel,
-            "%s.d5d %f \n", name, ObVal(self->aParameter,PARDD5));
-      Tcl_DStringAppend(&tString,pBueffel,-1);
-      sprintf(pBueffel,
-            "%s.interrupt %f \n", name, ObVal(self->aParameter,PARINT));
-      Tcl_DStringAppend(&tString,pBueffel,-1);
-      sprintf(pBueffel,
-            "%s.detectorh %f \n", name, ObVal(self->aParameter,PARDDH));
-      Tcl_DStringAppend(&tString,pBueffel,-1);
-      sprintf(pBueffel,
-            "%s.d4h %f \n", name, ObVal(self->aParameter,PARD4H));
-      Tcl_DStringAppend(&tString,pBueffel,-1);
-      sprintf(pBueffel,
-            "%s.d5h %f \n", name, ObVal(self->aParameter,PARD5H));
-      Tcl_DStringAppend(&tString,pBueffel,-1);
-      sprintf(pBueffel,
-            "%s.anah %f \n", name, ObVal(self->aParameter,PARANA));
-      Tcl_DStringAppend(&tString,pBueffel,-1);
-      sprintf(pBueffel,
-            "%s.anad %f \n", name, ObVal(self->aParameter,PARADIS));
-      Tcl_DStringAppend(&tString,pBueffel,-1);
-      sprintf(pBueffel,
-            "%s.anaflag %f \n", name, ObVal(self->aParameter,ANAFLAG));
-      Tcl_DStringAppend(&tString,pBueffel,-1);
-      sprintf(pBueffel,
-            "%s.c2h %f \n", name, ObVal(self->aParameter,PARDDD));
-      Tcl_DStringAppend(&tString,pBueffel,-1);
-      sprintf(pBueffel,
-            "%s.aomconst %f \n", name, ObVal(self->aParameter,PARAOM));
-      Tcl_DStringAppend(&tString,pBueffel,-1);
-      SCWrite(pCon,Tcl_DStringValue(&tString),eValue);
-      Tcl_DStringFree(&tString);  
-   }
-/*------------------------------------------------------------------------*/
-   static void A2TKill(void *pData)
-   {
-     pAmor2T self = (pAmor2T) pData;
- 
-     if(self == NULL)
-        return;
-
-     if(self->pDes)
-        DeleteDescriptor(self->pDes);
-
-     if(self->pDriv)
-       free(self->pDriv);
-
-     if(self->aParameter)
-        ObParDelete(self->aParameter);
-
-     free(self);
-   }
-/*--------------------------------------------------------------------------
-  Initialization: All is done from the Factory function. This takes an Tcl
-  array as parameter which is supposed to hold the names of all motors.
-  This must fail if one of the motors cannot be accessed. 
---------------------------------------------------------------------------*/
-   int Amor2TFactory(SConnection *pCon, SicsInterp *pSics, void *pData,
-                     int argc, char *argv[])
-   {
-       pAmor2T pNew, pAOM = NULL;
-       int i, iRet;
-       char pBueffel[512];
-       char *pMot = NULL;
-
-       if(argc < 4)
-       {
-          SCWrite(pCon,
-            "ERROR: Insufficient number of arguments to Amor2tFactory",
-             eError);
-          return 0;
-       }
-
-       /* allocate space ..............*/
-       pNew = (pAmor2T)malloc(sizeof(Amor2T));
-       if(!pNew)
-       {
-          SCWrite(pCon,"ERROR: out of memory in Amor2TFactory",eError);
-          return 0;
-       }
-       memset(pNew,0,sizeof(Amor2T));
-       pNew->pDes = CreateDescriptor("Amor2T");
-       pNew->aParameter = ObParCreate(MAXPAR);
-       pNew->pDriv = CreateDrivableInterface();
-       if( (!pNew->pDes) || (!pNew->aParameter) || (!pNew->pDriv) )
-       {
-          SCWrite(pCon,"ERROR: out of memory in Amor2TFactory",eError);
-          A2TKill(pNew);
-          return 0;
-       }
-
-       /* find the motors*/
-       pMot = Tcl_GetVar2(pSics->pTcl,argv[2],"mom",TCL_GLOBAL_ONLY);
-       if(!pMot)
-       {
-          SCWrite(pCon,"ERROR: no value for mom motr found",eError);
-          A2TKill(pNew);
-          return 0;
-       }       
-       pNew->aEngine[MOTMOM] = FindMotor(pSics,pMot);
-       if(!pNew->aEngine[MOTMOM])
-       {
-          sprintf(pBueffel,"ERROR: motor %s NOT found!", pMot);
-          SCWrite(pCon,pBueffel,eError);
-          A2TKill(pNew);
-          return 0;
-       }
-
-       pMot = Tcl_GetVar2(pSics->pTcl,argv[2],"som",TCL_GLOBAL_ONLY);
-       if(!pMot)
-       {
-          SCWrite(pCon,"ERROR: no value for som motor found",eError);
-          A2TKill(pNew);
-          return 0;
-       }       
-       pNew->aEngine[MOTSOM] = FindMotor(pSics,pMot);
-       if(!pNew->aEngine[MOTSOM])
-       {
-          sprintf(pBueffel,"ERROR: motor %s NOT found!", pMot);
-          SCWrite(pCon,pBueffel,eError);
-          A2TKill(pNew);
-          return 0;
-       }
-
-       pMot = Tcl_GetVar2(pSics->pTcl,argv[2],"coz",TCL_GLOBAL_ONLY);
-       if(!pMot)
-       {
-          SCWrite(pCon,"ERROR: no value for coz motor found",eError);
-          A2TKill(pNew);
-          return 0;
-       }       
-       pNew->aEngine[MOTCOZ] = FindMotor(pSics,pMot);
-       if(!pNew->aEngine[MOTCOZ])
-       {
-          sprintf(pBueffel,"ERROR: motor %s NOT found!", pMot);
-          SCWrite(pCon,pBueffel,eError);
-          A2TKill(pNew);
-          return 0;
-       }
-
-       pMot = Tcl_GetVar2(pSics->pTcl,argv[2],"cox",TCL_GLOBAL_ONLY);
-       if(!pMot)
-       {
-          SCWrite(pCon,"ERROR: no value for cox motor found",eError);
-          A2TKill(pNew);
-          return 0;
-       }       
-       pNew->aEngine[MOTCOX] = FindMotor(pSics,pMot);
-       if(!pNew->aEngine[MOTCOX])
-       {
-          sprintf(pBueffel,"ERROR: motor %s NOT found!", pMot);
-          SCWrite(pCon,pBueffel,eError);
-          A2TKill(pNew);
-          return 0;
-       }
-
-       pMot = Tcl_GetVar2(pSics->pTcl,argv[2],"stz",TCL_GLOBAL_ONLY);
-       if(!pMot)
-       {
-          SCWrite(pCon,"ERROR: no value for stz motor found",eError);
-          A2TKill(pNew);
-          return 0;
-       }       
-       pNew->aEngine[MOTSTZ] = FindMotor(pSics,pMot);
-       if(!pNew->aEngine[MOTSTZ])
-       {
-          sprintf(pBueffel,"ERROR: motor %s NOT found!", pMot);
-          SCWrite(pCon,pBueffel,eError);
-          A2TKill(pNew);
-          return 0;
-       }
-
-       pMot = Tcl_GetVar2(pSics->pTcl,argv[2],"soz",TCL_GLOBAL_ONLY);
-       if(!pMot)
-       {
-          SCWrite(pCon,"ERROR: no value for soz motor found",eError);
-          A2TKill(pNew);
-          return 0;
-       }       
-       pNew->aEngine[MOTSOZ] = FindMotor(pSics,pMot);
-       if(!pNew->aEngine[MOTSOZ])
-       {
-          sprintf(pBueffel,"ERROR: motor %s NOT found!", pMot);
-          SCWrite(pCon,pBueffel,eError);
-          A2TKill(pNew);
-          return 0;
-       }
-
-       pMot = Tcl_GetVar2(pSics->pTcl,argv[2],"d4b",TCL_GLOBAL_ONLY);
-       if(!pMot)
-       {
-          SCWrite(pCon,"ERROR: no value for d4b motor found",eError);
-          A2TKill(pNew);
-          return 0;
-       }       
-       pNew->aEngine[MOTD4B] = FindMotor(pSics,pMot);
-       if(!pNew->aEngine[MOTD4B])
-       {
-          sprintf(pBueffel,"ERROR: motor %s NOT found!", pMot);
-          SCWrite(pCon,pBueffel,eError);
-          A2TKill(pNew);
-          return 0;
-       }
-
-       pMot = Tcl_GetVar2(pSics->pTcl,argv[2],"d5b",TCL_GLOBAL_ONLY);
-       if(!pMot)
-       {
-          SCWrite(pCon,"ERROR: no value for d5b motor found",eError);
-          A2TKill(pNew);
-          return 0;
-       }       
-       pNew->aEngine[MOTD5B] = FindMotor(pSics,pMot);
-       if(!pNew->aEngine[MOTD5B])
-       {
-          sprintf(pBueffel,"ERROR: motor %s NOT found!", pMot);
-          SCWrite(pCon,pBueffel,eError);
-          A2TKill(pNew);
-          return 0;
-       }
-
-       pMot = Tcl_GetVar2(pSics->pTcl,argv[2],"com",TCL_GLOBAL_ONLY);
-       if(!pMot)
-       {
-          SCWrite(pCon,"ERROR: no value for com motor found",eError);
-          A2TKill(pNew);
-          return 0;
-       }       
-       pNew->aEngine[MOTCOM] = FindMotor(pSics,pMot);
-       if(!pNew->aEngine[MOTCOM])
-       {
-          sprintf(pBueffel,"ERROR: motor %s NOT found!", pMot);
-          SCWrite(pCon,pBueffel,eError);
-          A2TKill(pNew);
-          return 0;
-       }
-
-       pMot = Tcl_GetVar2(pSics->pTcl,argv[2],"aoz",TCL_GLOBAL_ONLY);
-       if(!pMot)
-       {
-          SCWrite(pCon,"ERROR: no value for aoz motor found",eError);
-          A2TKill(pNew);
-          return 0;
-       }       
-       pNew->aEngine[MOTAOZ] = FindMotor(pSics,pMot);
-       if(!pNew->aEngine[MOTAOZ])
-       {
-          sprintf(pBueffel,"ERROR: motor %s NOT found!", pMot);
-          SCWrite(pCon,pBueffel,eError);
-          A2TKill(pNew);
-          return 0;
-       }
-
-       pMot = Tcl_GetVar2(pSics->pTcl,argv[2],"aom",TCL_GLOBAL_ONLY);
-       if(!pMot)
-       {
-          SCWrite(pCon,"ERROR: no value for aom motor found",eError);
-          A2TKill(pNew);
-          return 0;
-       }       
-       pNew->aEngine[MOTAOM] = FindMotor(pSics,pMot);
-       if(!pNew->aEngine[MOTAOM])
-       {
-          sprintf(pBueffel,"ERROR: motor %s NOT found!", pMot);
-          SCWrite(pCon,pBueffel,eError);
-          A2TKill(pNew);
-          return 0;
-       }
-
-       pMot = Tcl_GetVar2(pSics->pTcl,argv[2],"c3z",TCL_GLOBAL_ONLY);
-       if(!pMot)
-       {
-          SCWrite(pCon,"ERROR: no value for c3z motor found",eError);
-          A2TKill(pNew);
-          return 0;
-       }       
-       pNew->aEngine[MOTC3Z] = FindMotor(pSics,pMot);
-       if(!pNew->aEngine[MOTC3Z])
-       {
-          sprintf(pBueffel,"ERROR: motor %s NOT found!", pMot);
-          SCWrite(pCon,pBueffel,eError);
-          A2TKill(pNew);
-          return 0;
-       }
-
-
-       /* initialize parameters */
-       ObParInit(pNew->aParameter,PARDS,"detectord",1400.,usMugger);
-       ObParInit(pNew->aParameter,PARDH,"sampleh",50.,usMugger);
-       ObParInit(pNew->aParameter,PARDD4,"d4d",100.,usMugger);
-       ObParInit(pNew->aParameter,PARDD5,"d5d",200.,usMugger);
-       ObParInit(pNew->aParameter,PARINT,"interrupt",0.,usMugger);
-       ObParInit(pNew->aParameter,PARDDH,"detectorh",40.,usMugger);
-       ObParInit(pNew->aParameter,PARD4H,"d4h",40.,usMugger);
-       ObParInit(pNew->aParameter,PARD5H,"d5h",400.,usMugger);
-       ObParInit(pNew->aParameter,PARANA,"anah",400.,usMugger);
-       ObParInit(pNew->aParameter,PARADIS,"anad",600.,usMugger);
-       ObParInit(pNew->aParameter,ANAFLAG,"anaflag",-1.,usMugger);
-       ObParInit(pNew->aParameter,PARDDD,"c2h",100.,usMugger);
-       ObParInit(pNew->aParameter,PARAOM,"aomconst",3.,usMugger);
-
-
-       /* initialize interfaces */
-       pNew->pDes->GetInterface = A2TGetInterface;
-       pNew->pDes->SaveStatus =   A2TSave;
-       pNew->pDriv->Halt = A2THalt;
-       pNew->pDriv->CheckLimits = A2TCheck;
-       pNew->pDriv->SetValue = A2TSetValue;
-       pNew->pDriv->CheckStatus = A2TStatus;
-       pNew->pDriv->GetValue = A2TGetValue;
-
-       /* copy data structure for second command for aom2t */
-       pAOM = (pAmor2T)malloc(sizeof(Amor2T));
-       if(!pAOM)
-       {
-          A2TKill(pNew);
-          SCWrite(pCon,"ERROR: out of memory in Amor2TFactory",eError);
-          return 0;
-       }
-       memcpy(pAOM,pNew,sizeof(Amor2T));
-       pAOM->pDriv = CreateDrivableInterface();
-       pAOM->pDes = CreateDescriptor("Amor2T");
-       if(!pAOM->pDriv || !pAOM->pDes )
-       {
-          A2TKill(pNew);
-          SCWrite(pCon,"ERROR: out of memory in Amor2TFactory",eError);
-          return 0;
-       }
-       
-       /* set modified interface functions */
-       pAOM->pDes->GetInterface = A2TGetInterface;
-       pAOM->pDriv->Halt = A2THalt;
-       pAOM->pDriv->CheckLimits = ANA2TCheck;
-       pAOM->pDriv->SetValue = ANA2TSetValue;
-       pAOM->pDriv->GetValue = ANA2TGetValue;
-       pAOM->pDriv->CheckStatus = A2TStatus;
-
-
-       /* install commands */
-       iRet = AddCommand(pSics,argv[1],
-                        Amor2TAction,A2TKill,pNew);
-       if(!iRet)
-       {
-         sprintf(pBueffel,"ERROR: duplicate command %s NOT created",
-                 argv[1]);
-         SCWrite(pCon,pBueffel,eError);
-         A2TKill(pNew);
-         return 0;
-       }
-       iRet = AddCommand(pSics,argv[3],
-                        Amor2TAction,free,pAOM);
-       if(!iRet)
-       {
-         sprintf(pBueffel,"ERROR: duplicate command %s NOT created",
-                 argv[1]);
-         SCWrite(pCon,pBueffel,eError);
-         A2TKill(pNew);
-         return 0;
-       }
-       return 1;
-   }
-/*----------------------------------------------------------------------*/
-   int Amor2TAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-                    int argc, char *argv[])
-   {
-      pAmor2T self = (pAmor2T)pData;
-      char pBueffel[256];
-      float fVal;
-      double dVal;
-      ObPar *pPar = NULL;
-      int iRet;
-
-      assert(self);
-
-      if(argc > 1)
-      {
-         strtolower(argv[1]);
-         /* deal with list */
-         if(strcmp(argv[1],"list") == 0)
-	 {
-            A2TList(self,pCon,argv[0]);
-            return 1;
-         }
-         /* otherwise it should be a parameter command */
-         if(argc >= 3)
-	 {
-           iRet = Tcl_GetDouble(pSics->pTcl,argv[2],&dVal);
-           if(iRet != TCL_OK)
-	   {
-             sprintf(pBueffel,"ERROR: failed to convert %s to number",
-             argv[2]);
-             SCWrite(pCon,pBueffel,eError);
-             return 0;
-           }
-           iRet = ObParSet(self->aParameter,argv[0],argv[1],(float)dVal,pCon);
-           if(iRet)
-	   {
-             SCSendOK(pCon);
-           }
-           return iRet;
-         }
-         else
-	 {
-           pPar = ObParFind(self->aParameter,argv[1]);
-           if(!pPar)
-	   {
-             sprintf(pBueffel,"ERROR: parameter %s NOT found",argv[1]);
-             SCWrite(pCon,pBueffel,eError);
-             return 0;
-           }
-           sprintf(pBueffel,"%s.%s = %f",argv[0],pPar->name, pPar->fVal);
-           SCWrite(pCon,pBueffel,eValue);
-           return 1;
-         }
-      }
-      else
-      {
-        fVal = self->pDriv->GetValue(self,pCon);
-        sprintf(pBueffel," %s = %f", argv[0], fVal);
-        SCWrite(pCon,pBueffel,eValue);
-        return 1;
-      }
-   }
-
-
-
diff --git a/amor2t.h b/amor2t.h
deleted file mode 100644
index 6e243cb0..00000000
--- a/amor2t.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/*-------------------------------------------------------------------------
-                     A m o r 2 T
- A class for controlling the two theta movement of a reflectometer. 
- Especially the AMOR reflectometer at SINQ. For details see the file 
- amor2t.tex. DO NOT TOUCH! This file is automatically created from amor2t.w
- with nuweb.
-
- Mark Koennecke, September 1999
----------------------------------------------------------------------------*/
-#ifndef AMOR2T
-#define AMOR2T
-
-   typedef struct __AMOR2T *pAmor2T;
-
-   int Amor2TFactory(SConnection *pCon, SicsInterp *pSics, void *pData,
-                     int argc, char *argv[]);
-   int Amor2TAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-                     int argc, char *argv[]);
-   void Amor2TKill(void *pData);                 
-
-#endif 
diff --git a/amor2t.i b/amor2t.i
deleted file mode 100644
index 2bcf2ae0..00000000
--- a/amor2t.i
+++ /dev/null
@@ -1,55 +0,0 @@
-
-/*--------------------------------------------------------------------------
-                       A m o r 2 T . i
-  Internal data structure definitions for Amor2T. For details see amor2t.tex.
-  DO NOT TOUCH! This file is automatically created from amor2t.w.
-
-  Mark Koennecke, September 1999
-----------------------------------------------------------------------------*/
-
-/* distance detector sample */
-#define PARDS  0
-/* constant height of sample: height = PARDH + MOTSOZ + MOTSTZ */
-#define PARDH  1
-/* distance diaphragm 4 - sample */
-#define PARDD4 2
-/* distance to diaphragm 5 */
-#define PARDD5 3
-/* interrupt to issue when a motor fails on this */
-#define PARINT 4
-/* base height of counter station */
-#define PARDDH 5
-/* height of D4 */
-#define PARD4H 6
-/* height of D5 */
-#define PARD5H 7
-/* base height of analyzer */
-#define PARANA 8
-/* distance of analyzer from sample */
-#define PARADIS 9
-/* flag analyzer calculation on/off */
-#define ANAFLAG 10
-/* constant for second detector */
-#define PARDDD 11
-/* constant part of AOM */
-#define PARAOM 12
-
-
-   typedef struct {
-                    pMotor pMot;
-                    char pName[80];
-                    float fTarget;
-                  }MotEntry, *pMotEntry;
-
-
-
-  typedef struct __AMOR2T {
-                            pObjectDescriptor pDes;
-                            pIDrivable        pDriv;
-                            pMotor            aEngine[MAXMOT];
-                            MotEntry          toStart[MAXMOT];
-                            int               iStart;
-                            ObPar             *aParameter;
-                          }Amor2T;
-
-
diff --git a/amor2t.tex b/amor2t.tex
deleted file mode 100644
index c458706b..00000000
--- a/amor2t.tex
+++ /dev/null
@@ -1,204 +0,0 @@
-\subsection{AMOR Two Theta}
-AMOR is SINQ's new reflectometer. It has the peculiar feature that the
-two theta movement of the detector is expressed in translations along
-the reflectometer base axis and the detector height. Additionally the
-detector is tilted. The height of two diaphragms has to be adjusted as
-well. And, in polarizing mode, the analyzer has to be operated as
-well. Quite a complicated movement. I fear this module may only be
-useful for AMOR, but may be, other reflectometers may profit as well. 
-This object implements this complex movement as a virtual motor. 
-
-The following formulas are used for the necessary calculations:
-\begin{eqnarray}
-delta height & = & h_{s} - \sin \alpha \\
-delta x      & = & |x_{c} - x_{s}| - R \cos \alpha \\
-omega        & = & -2 MOM + 2 SOM \\
-\end{eqnarray} 
-with 
-\begin{eqnarray}
-h_{s} & = & \tan(2MOM)|x_{c} - x_{s}| \\
-R & = & \sqrt{hs^{2} - |x_{c} - x_{s}|^{2}} \\
-\alpha & = & ATT - 2SOM \\
-\beta & = & 180 - 90 - 2MOM \\
-MOM & = & polarizer \omega \\
-SOM & = & sample \omega   \\
-x_{c} & = & counter position \\
-x_{s} & = & sample position\\
-\end{eqnarray}
-The same equations hold true for the calculations of the diaphragm
-heights, just replace the distances. The equations for the analyzer
-are not yet known. 
-
-Due to this complicated movement this module needs to know about a lot
-of motors and a lot of parameters. The distances of the various
-components need to be modified at run time in order to allow for
-configuration changes. These are not motorized but must be entered
-manually. 
-
-\subsubsection{Data Structures}
-Consequently data structures are complex. The first data structure
-used is an entry in an array of motors to start:
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap1}
-$\langle$putput {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@   typedef struct {@\\
-\mbox{}\verb@                    pMotor pMot;@\\
-\mbox{}\verb@                    char pName[80];@\\
-\mbox{}\verb@                    float fTarget;@\\
-\mbox{}\verb@                  }MotEntry, *pMotEntry;@\\
-\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{description}
-\item[pMot] is a pointer to the motors data structure.
-\item[pName] is the name of the motor to start.
-\item[fTarget] is the target value for the motor.
-\end{description}
-
-The next data structure is the class data structure for amor2t:
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap2}
-$\langle$amoredata {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@  typedef struct __AMOR2T {@\\
-\mbox{}\verb@                            pObjectDescriptor pDes;@\\
-\mbox{}\verb@                            pIDrivable        pDriv;@\\
-\mbox{}\verb@                            pMotor            aEngine[MAXMOT];@\\
-\mbox{}\verb@                            MotEntry          toStart[MAXMOT];@\\
-\mbox{}\verb@                            int               iStart;@\\
-\mbox{}\verb@                            ObPar             *aParameter;@\\
-\mbox{}\verb@                          }Amor2T;@\\
-\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{description}
-\item[pDes] The standard SICS object descriptor.
-\item[pDriv] The drivable interface. The functions defined for the
-drivable interface implement most of the work of this class.
-\item[aEngine] An array of pointers to the motor data structures this
-class has to deal with. The proper initialization of this is taken
-care of during the initialization of the object. 
-\item[toStart] An array of motors to start when all calculations have
-been performed.
-\item[iStart] The number of valid entries in toStart.
-\item[aParameter] An array of parameters for this object.
-\end{description}
-
-\subsubsection{The Interface}
-The interface to this module is quite primitive. Most of the
-functionality is hidden in the drivable interface. So there are only
-functions for interacting with the interpreter.
-
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap3}
-$\langle$amorinterface {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@   typedef struct __AMOR2T *pAmor2T;@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@   int Amor2TFactory(SConnection *pCon, SicsInterp *pSics, void *pData,@\\
-\mbox{}\verb@                     int argc, char *argv[]);@\\
-\mbox{}\verb@   int Amor2TAction(SConnection *pCon, SicsInterp *pSics, void *pData,@\\
-\mbox{}\verb@                     int argc, char *argv[]);@\\
-\mbox{}\verb@   void Amor2TKill(void *pData);                 @\\
-\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{scrap4}
-\verb@"amor2t.i"@ {\footnotesize ? }$\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@/*--------------------------------------------------------------------------@\\
-\mbox{}\verb@                       A m o r 2 T . i@\\
-\mbox{}\verb@  Internal data structure definitions for Amor2T. For details see amor2t.tex.@\\
-\mbox{}\verb@  DO NOT TOUCH! This file is automatically created from amor2t.w.@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  Mark Koennecke, September 1999@\\
-\mbox{}\verb@----------------------------------------------------------------------------*/@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@/* distance detector sample */@\\
-\mbox{}\verb@#define PARDS  0@\\
-\mbox{}\verb@/* constant height of sample: height = PARDH + MOTSOZ + MOTSTZ */@\\
-\mbox{}\verb@#define PARDH  1@\\
-\mbox{}\verb@/* distance diaphragm 4 - sample */@\\
-\mbox{}\verb@#define PARDD4 2@\\
-\mbox{}\verb@/* distance to diaphragm 5 */@\\
-\mbox{}\verb@#define PARDD5 3@\\
-\mbox{}\verb@/* interrupt to issue when a motor fails on this */@\\
-\mbox{}\verb@#define PARINT 4@\\
-\mbox{}\verb@/* base height of counter station */@\\
-\mbox{}\verb@#define PARDDH 5@\\
-\mbox{}\verb@/* height of D4 */@\\
-\mbox{}\verb@#define PARD4H 6@\\
-\mbox{}\verb@/* height of D5 */@\\
-\mbox{}\verb@#define PARD5H 7@\\
-\mbox{}\verb@/* base height of analyzer */@\\
-\mbox{}\verb@#define PARANA 8@\\
-\mbox{}\verb@/* distance of analyzer from sample */@\\
-\mbox{}\verb@#define PARADIS 9@\\
-\mbox{}\verb@/* flag analyzer calculation on/off */@\\
-\mbox{}\verb@#define ANAFLAG 10@\\
-\mbox{}\verb@/* constant for second detector */@\\
-\mbox{}\verb@#define PARDDD 11@\\
-\mbox{}\verb@/* constant part of AOM */@\\
-\mbox{}\verb@#define PARAOM 12@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@@$\langle$putput {\footnotesize ?}$\rangle$\verb@@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@@$\langle$amoredata {\footnotesize ?}$\rangle$\verb@@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@@$\diamond$
-\end{list}
-\vspace{-2ex}
-\end{minipage}\\[4ex]
-\end{flushleft}
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap5}
-\verb@"amor2t.h"@ {\footnotesize ? }$\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@/*-------------------------------------------------------------------------@\\
-\mbox{}\verb@                     A m o r 2 T@\\
-\mbox{}\verb@ A class for controlling the two theta movement of a reflectometer. @\\
-\mbox{}\verb@ Especially the AMOR reflectometer at SINQ. For details see the file @\\
-\mbox{}\verb@ amor2t.tex. DO NOT TOUCH! This file is automatically created from amor2t.w@\\
-\mbox{}\verb@ with nuweb.@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@ Mark Koennecke, September 1999@\\
-\mbox{}\verb@---------------------------------------------------------------------------*/@\\
-\mbox{}\verb@#ifndef AMOR2T@\\
-\mbox{}\verb@#define AMOR2T@\\
-\mbox{}\verb@@$\langle$amorinterface {\footnotesize ?}$\rangle$\verb@@\\
-\mbox{}\verb@#endif @\\
-\mbox{}\verb@@$\diamond$
-\end{list}
-\vspace{-2ex}
-\end{minipage}\\[4ex]
-\end{flushleft}
diff --git a/amor2t.w b/amor2t.w
deleted file mode 100644
index 9c28a7f5..00000000
--- a/amor2t.w
+++ /dev/null
@@ -1,150 +0,0 @@
-\subsection{AMOR Two Theta}
-AMOR is SINQ's new reflectometer. It has the peculiar feature that the
-two theta movement of the detector is expressed in translations along
-the reflectometer base axis and the detector height. Additionally the
-detector is tilted. The height of two diaphragms has to be adjusted as
-well. And, in polarizing mode, the analyzer has to be operated as
-well. Quite a complicated movement. I fear this module may only be
-useful for AMOR, but may be, other reflectometers may profit as well. 
-This object implements this complex movement as a virtual motor. 
-
-The following formulas are used for the necessary calculations:
-\begin{eqnarray}
-delta height & = & h_{s} - \sin \alpha \\
-delta x      & = & |x_{c} - x_{s}| - R \cos \alpha \\
-omega        & = & -2 MOM + 2 SOM \\
-\end{eqnarray} 
-with 
-\begin{eqnarray}
-h_{s} & = & \tan(2MOM)|x_{c} - x_{s}| \\
-R & = & \sqrt{hs^{2} - |x_{c} - x_{s}|^{2}} \\
-\alpha & = & ATT - 2SOM \\
-\beta & = & 180 - 90 - 2MOM \\
-MOM & = & polarizer \omega \\
-SOM & = & sample \omega   \\
-x_{c} & = & counter position \\
-x_{s} & = & sample position\\
-\end{eqnarray}
-The same equations hold true for the calculations of the diaphragm
-heights, just replace the distances. The equations for the analyzer
-are not yet known. 
-
-Due to this complicated movement this module needs to know about a lot
-of motors and a lot of parameters. The distances of the various
-components need to be modified at run time in order to allow for
-configuration changes. These are not motorized but must be entered
-manually. 
-
-\subsubsection{Data Structures}
-Consequently data structures are complex. The first data structure
-used is an entry in an array of motors to start:
-@d putput @{
-   typedef struct {
-                    pMotor pMot;
-                    char pName[80];
-                    float fTarget;
-                  }MotEntry, *pMotEntry;
-@}
-\begin{description}
-\item[pMot] is a pointer to the motors data structure.
-\item[pName] is the name of the motor to start.
-\item[fTarget] is the target value for the motor.
-\end{description}
-
-The next data structure is the class data structure for amor2t:
-@d amoredata @{
-  typedef struct __AMOR2T {
-                            pObjectDescriptor pDes;
-                            pIDrivable        pDriv;
-                            pMotor            aEngine[MAXMOT];
-                            MotEntry          toStart[MAXMOT];
-                            int               iStart;
-                            ObPar             *aParameter;
-                          }Amor2T;
-@} 
-\begin{description}
-\item[pDes] The standard SICS object descriptor.
-\item[pDriv] The drivable interface. The functions defined for the
-drivable interface implement most of the work of this class.
-\item[aEngine] An array of pointers to the motor data structures this
-class has to deal with. The proper initialization of this is taken
-care of during the initialization of the object. 
-\item[toStart] An array of motors to start when all calculations have
-been performed.
-\item[iStart] The number of valid entries in toStart.
-\item[aParameter] An array of parameters for this object.
-\end{description}
-
-\subsubsection{The Interface}
-The interface to this module is quite primitive. Most of the
-functionality is hidden in the drivable interface. So there are only
-functions for interacting with the interpreter.
-
-@d amorinterface @{
-   typedef struct __AMOR2T *pAmor2T;
-
-   int Amor2TFactory(SConnection *pCon, SicsInterp *pSics, void *pData,
-                     int argc, char *argv[]);
-   int Amor2TAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-                     int argc, char *argv[]);
-   void Amor2TKill(void *pData);                 
-@}
-
-@o amor2t.i @{
-/*--------------------------------------------------------------------------
-                       A m o r 2 T . i
-  Internal data structure definitions for Amor2T. For details see amor2t.tex.
-  DO NOT TOUCH! This file is automatically created from amor2t.w.
-
-  Mark Koennecke, September 1999
-----------------------------------------------------------------------------*/
-
-/* distance detector sample */
-#define PARDS  0
-/* constant height of sample: height = PARDH + MOTSOZ + MOTSTZ */
-#define PARDH  1
-/* distance diaphragm 4 - sample */
-#define PARDD4 2
-/* distance to diaphragm 5 */
-#define PARDD5 3
-/* interrupt to issue when a motor fails on this */
-#define PARINT 4
-/* base height of counter station */
-#define PARDDH 5
-/* height of D4 */
-#define PARD4H 6
-/* height of D5 */
-#define PARD5H 7
-/* base height of analyzer */
-#define PARANA 8
-/* distance of analyzer from sample */
-#define PARADIS 9
-/* flag analyzer calculation on/off */
-#define ANAFLAG 10
-/* constant for second detector */
-#define PARDDD 11
-/* constant part of AOM */
-#define PARAOM 12
-
-@<putput@>
-
-@<amoredata@>
-
-@}
-
-@o amor2t.h @{
-/*-------------------------------------------------------------------------
-                     A m o r 2 T
- A class for controlling the two theta movement of a reflectometer. 
- Especially the AMOR reflectometer at SINQ. For details see the file 
- amor2t.tex. DO NOT TOUCH! This file is automatically created from amor2t.w
- with nuweb.
-
- Mark Koennecke, September 1999
----------------------------------------------------------------------------*/
-#ifndef AMOR2T
-#define AMOR2T
-@<amorinterface@>
-#endif 
-@}
-
diff --git a/amorscan.c b/amorscan.c
deleted file mode 100644
index 7f556e46..00000000
--- a/amorscan.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*-------------------------------------------------------------------------
-                             A M O R S C A N
-
- An adaption of the general scan routine to deal with special issues at
- the reflectometer AMOR at SINQ.
-
- copyright: see copyright.h
- 
- Mark Koennecke, September 1999
---------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <assert.h>
-#include "fortify.h"
-#include "sics.h"
-#include "scan.h"
-#include "scan.i"
-#include "HistMem.h"
-#include "nxamor.h"
-#include "amorscan.h"
-
-/*--------------------------------------------------------------------*/ 
-  static int AmorHeader(pScanData self)
-  {
-     return WriteAmorHeader(self->pFile, self->pCon);
-  }
-/*--------------------------------------------------------------------*/
-  static int AmorPoints(pScanData self, int iP)
-  {
-    /* write only at last scan point */
-    if((iP+1) >= self->iNP)
-    {
-        return WriteAmorScan(self->pFile,self->pCon,self);
-    }
-  } 
-/*--------------------------------------------------------------------*/
-  static int AmorCollect(pScanData self, int iP)
-  {
-     pVarEntry pVar = NULL;
-     void *pDings;
-     int i, iRet, status;
-     float fVal;
-     char pStatus[512], pItem[20];
-     char pHead[512];
-     CountEntry sCount;
-
-     assert(self);
-     assert(self->pCon);
-     
-     /* prepare output header */
-     sprintf(pHead,"%-5.5s","NP");
-     sprintf(pStatus,"%-5d",iP);
- 
-     /* loop over all scan variables */
-     status = 1;
-     for(i = 0; i < self->iScanVar; i++)
-     {
-        DynarGet(self->pScanVar,i,&pDings);
-        pVar = (pVarEntry)pDings;
-        if(pVar)
-        {
-           fVal = pVar->pInter->GetValue(pVar->pObject,self->pCon);
-           pVar->fData[iP] = fVal;
-           sprintf(pItem,"%-10.10s",pVar->Name);
-           strcat(pHead,pItem);
-           sprintf(pItem,"%-10.3f",fVal);
-           strcat(pStatus,pItem);
-        }
-     }
-  
-     /* store counter data */
-     /* monitors */
-     for(i = 1; i < 10; i++)
-     {
-        sCount.Monitors[i-1] = GetMonitor((pCounter)self->pCounterData,i,
-                                        self->pCon);
-     }
-     if( self->iChannel != 0 && self->iChannel != -10 )
-     {
-       sCount.Monitors[self->iChannel - 1] = 
-           GetCounts((pCounter)self->pCounterData,
-                                                   self->pCon);     
-     }
-     /* counter1 */
-     strcat(pHead,"Counter1      ");
-     sCount.lCount = GetCounts((pCounter)self->pCounterData,self->pCon);
-     sprintf(pItem,"%-15d",sCount.lCount);
-     strcat(pStatus,pItem);
-
-     /*
-           WARNING
-           Assignements have to be checked when the Schlumpfes are
-           ready putting the counter box together.
-     */
-
-     /* counter2 */
-     strcat(pHead,"Counter2      ");
-     sCount.Monitors[0] = GetMonitor((pCounter)self->pCounterData,
-                                    1,self->pCon);
-     sprintf(pItem,"%-15d",sCount.Monitors[0]);
-     strcat(pStatus,pItem);
-
-     /* monitors */
-     sCount.Monitors[3] = GetMonitor((pCounter)self->pCounterData,
-                                     2,self->pCon);
-     sCount.Monitors[4] = GetMonitor((pCounter)self->pCounterData,
-                                     3,self->pCon);
-
-     /* get time */
-     sCount.fTime = GetCountTime((pCounter)self->pCounterData,
-                                 self->pCon);
-     strcat(pHead,"Monitor1    ");
-     sprintf(pItem,"%-12d",sCount.Monitors[3]);
-     strcat(pStatus,pItem);
-     strcat(pHead,"Monitor2    ");
-     sprintf(pItem,"%-12d",sCount.Monitors[4]);
-     strcat(pStatus,pItem);
-     strcat(pHead,"Time  ");
-     sprintf(pItem,"%-6.1f",sCount.fTime);
-     strcat(pStatus,pItem);
-
-     /* write progress */
-     strcat(pHead,"\n");
-     strcat(pStatus,"\n");
-     SCWrite(self->pCon,pHead,eWarning);
-     SCWrite(self->pCon,pStatus,eWarning);
-     
-     /* stow away */
-     DynarReplace(self->pCounts,self->iCounts,&sCount,sizeof(CountEntry));
-     self->iCounts++;
-     return 1;
-  }
-/*-----------------------------------------------------------------------*/
-  int ConfigureAmor(pScanData self)
-  {
-      self->WriteHeader = AmorHeader;
-      self->WriteScanPoints = AmorPoints;
-      self->CollectScanData = AmorCollect;
-      strcpy(self->ext,".hdf");
-      return 1; 
-  }
diff --git a/amorscan.h b/amorscan.h
deleted file mode 100644
index d97195f4..00000000
--- a/amorscan.h
+++ /dev/null
@@ -1,15 +0,0 @@
-
-/*-----------------------------------------------------------------------
-                          A M O R S C A N
-  Adaption of the scan command to do things specific to the
-  reflectometer AMOR at SINQ.
-
-  Mark Koennecke, September 1999
------------------------------------------------------------------------*/
-#ifndef AMORSCAN
-#define AMORSCAN
-
-   int ConfigureAmor(pScanData pScan);
-
-#endif
-
diff --git a/amorscan.w b/amorscan.w
deleted file mode 100644
index b52be00d..00000000
--- a/amorscan.w
+++ /dev/null
@@ -1,57 +0,0 @@
-\subsection{Amor Scan}
-This is a special adaption of the general scan routines for the
-reflectometer AMOR at SINQ. It works by replacing the configurable
-routines in the general scan command with special ones, suited to the
-reflectometers purpose. There are several adaptions to the standard
-scan command:
-\begin{itemize}
-\item Data is written to NeXus files instead of ASCII files.
-\item There are two counters to keep track of. 
-\item Furthermore stubs are provided for dealing with spin flippers.
-\end{itemize}
-
-In order to keep track of counters and monitors the following
-convention has been devised:
-\begin{itemize}
-\item GetCounts gets the main detector.
-\item GetMonitor 0 the second detector
-\item GetMonitor 1 the first detector other spin
-\item GetMonitor 2 the second detector other spin
-\item GetMonitor 3 the first monitor
-\item GetMonitor 4 the second monitor
-\end{itemize}
-Thus the monitor channels are used to keep the additional counter
-information. 
-
-This module provides only one external function:
-@d amorscan @{
-   int ConfigureAmor(pScanData pScan);
-@}
-which configures the variable fields and function pointers in pScan to
-functions defined in this module. These then do the right thing. This
-module is also an example of how the scan command can be configured to do
-tricks based on the syntax and  hooks defined in scan.*. 
-
- 
-@o amorscan.h @{
-/*-----------------------------------------------------------------------
-                          A M O R S C A N
-  Adaption of the scan command to do things specific to the
-  reflectometer AMOR at SINQ.
-
-  Mark Koennecke, September 1999
------------------------------------------------------------------------*/
-#ifndef AMORSCAN
-#define AMORSCAN
-@<amorscan@>
-#endif
-
-@}
-
-
-
-
-
-
-
-
diff --git a/amorstat.c b/amorstat.c
deleted file mode 100644
index fb422b91..00000000
--- a/amorstat.c
+++ /dev/null
@@ -1,919 +0,0 @@
-/*--------------------------------------------------------------------------
-                             A M O R S T A T U S
-
- The implementation file for the amor status display facilitator module. The 
- reflectometer AMOR needs some advanced feautures for its status display.
- These needs are taken care of here.
-
- copyright: see copyright.h
-
- Mark Koennecke, September 1999
-
- As AMOR's histogram memory becomes too big in tof mode to transfer it
- for status information the collapse and subsample functionalities have 
- been moved to the histogram memory. This code had to be modified to
- call SINQHMProject directly.
-
- Mark Koennecke, August 2001
- --------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <assert.h>
-#include <stdio.h>
-#include <tcl.h>
-#include "fortify.h"
-#include "sics.h"
-#include "counter.h"
-#include "stringdict.h"
-#include "HistMem.h"
-#include "HistMem.i"
-#include "HistDriv.i"
-#include "hardsup/sinqhm.h"
-#include "sinqhmdriv.i"
-#include "scan.h"
-#include "lld.h"
-#include "amorstat.i"
-#include "amorstat.h"
-/*-------------------------------------------------------------------------
-   A static which determines if we are in TOF or scan mode. 
-*/
-  static int iTOF = 0;
-  static pHistMem pHMHM = NULL;
-/*-------------------------------------------------------------------------*/
-   static int HMCountStartCallback(int iEvent, void *pEvent, void *pUser)
-   {
-       SConnection *pCon = (SConnection *)pUser;
-       const float *fTime = NULL;
-       int *iTime = NULL;
-       int iLength, iRet, i;
-
-       assert(pCon);
-
-       if(iEvent == COUNTSTART)
-       {
-           /* send current time binning */
-           iTOF = 1;
-           fTime = GetHistTimeBin(pHMHM,&iLength);
-           iTime = (int *)malloc((iLength+1)*sizeof(int));
-           if( (!fTime) || (!iTime))
-	   {
-             return 0;
-           }
-           iTime[0] = htonl(iLength);
-           for(i = 0 ; i < iLength; i++)
-	   {
-             iTime[i+1] = htonl((int)((fTime[i]/10.)*65536.));
-           }
-           /* send new time binning to all clients */
-           SCWrite(pCon,"TOFClear",eError);
-           SCWriteUUencoded(pCon,"arrowaxis_time",iTime, 
-                               (iLength+1)*sizeof(int));
-           free(iTime);
-       }
-       return 1;
-   }
-/*-------------------------------------------------------------------------*/
-   static int ScanStartCallback(int iEvent, void *pEvent, void *pUser)
-   {
-       float *fAxis = NULL;
-       int *iAxis = NULL;
-       int iLength, iRet, i;
-       char pBueffel[80], pName[40];
-       SConnection *pCon = (SConnection *)pUser;
-       pScanData  pScan = (pScanData)pEvent;
-
-       assert(pCon);
-       assert(pScan);
-       
-
-       if(iEvent == SCANSTART)
-       {
-           iTOF = 0;
-           /* send current axis  */
-           iLength = GetScanNP(pScan);
-           fAxis = (float *)malloc((iLength+1)*sizeof(float));
-           iAxis = (int *)malloc((iLength+1)*sizeof(int));
-           if( (!fAxis) || (!iAxis))
-	   {
-             return 0;
-           }
-           iAxis[0] = htonl(iLength);
-           GetSoftScanVar(pScan,0,fAxis,iLength);
-           GetScanVarName(pScan,0,pName,39);
-           sprintf(pBueffel,"arrowaxis_%s",pName);
-           for(i = 0 ; i < iLength; i++)
-	   {
-             iAxis[i+1] = htonl((int)(fAxis[i]*65536.));
-           }
-           /* send new axis to client */
-           SCWrite(pCon,"SCANClear",eError);
-           SCWriteUUencoded(pCon,pBueffel,iAxis, 
-                               (iLength+1)*sizeof(int));
-           free(iAxis);
-           free(fAxis);
-       }
-       return 1;
-   }
-/*------------------------------------------------------------------------*/
-   static int ScanPointCallback(int iEvent, void *pEvent, void *pUser)
-   {
-       long *lData = NULL;
-       int *iData = NULL;
-       int iLength, iRet, i;
-       SConnection *pCon = (SConnection *)pUser;
-       pScanData  pScan = (pScanData)pEvent;
-
-       assert(pCon);
-       assert(pScan);
-       
-
-       if( (iEvent == SCANPOINT) || (iEvent == SCANEND) )
-       {
-           /* send current data  */
-           iTOF = 0;
-           iLength = GetScanNP(pScan);
-           lData = (long *)malloc((iLength+1)*sizeof(long));
-           iData = (int *)malloc((iLength+1)*sizeof(int));
-           if( (!lData) || (!iData))
-	   {
-             return 0;
-           }
-           iData[0] = htonl(iLength);
-           GetScanCounts(pScan,lData,iLength);
-           for(i = 0 ; i < iLength; i++)
-	   {
-             iData[i+1] = htonl((int)(lData[i]));
-           }
-           /* send counts to client */
-           SCWriteUUencoded(pCon,"arrow_spinupup",iData, 
-                               (iLength+1)*sizeof(int));
-           /* send counts for other detector */
-           GetScanMonitor(pScan,2,lData,iLength);
-           for(i = 0 ; i < iLength; i++)
-	   {
-             iData[i+1] = htonl((int)(lData[i]));
-           }
-           SCWriteUUencoded(pCon,"arrow_spinuplo",iData, 
-                               (iLength+1)*sizeof(int));
-           /* to do: check for polarization and send spinlo */
-          free(iData);
-          free(lData);
-       }
-       return 1;
-   }
-/*------------------------------------------------------------------------*/
-   static int SendLoadedData(pAmorStat self, SConnection *pCon)
-   {
-      int i, iRet, *iData = NULL;
-      char pBueffel[80];
-      UserData ud;
-
-      SCWrite(pCon,"loaded_CLEAR",eValue);
-      iRet = LLDnodePtr2First(self->iUserList);
-      while(iRet != 0)
-      {
-        LLDnodeDataTo(self->iUserList,&ud);
-        iData = (int *)malloc((ud.iNP*2 + 1)*sizeof(int));
-        if(!iData)
-	{
-           return 0;
-        }
-        iData[0] = htonl(ud.iNP);
-        for(i = 0; i < ud.iNP; i++)
-	{
-           iData[i+1] = htonl((int)(ud.fX[i]*65536));
-           iData[i+1+ud.iNP] = htonl((int)(ud.fY[i]*65536));
-        }
-        sprintf(pBueffel,"loaded_%s",ud.name);
-        SCWriteUUencoded(pCon,pBueffel,iData,(ud.iNP*2+1)*sizeof(int));
-        iRet = LLDnodePtr2Next(self->iUserList);
-      }
-   }   
-/*------------------------------------------------------------------------*/
-   static int LoadCallback(int iEvent, void *pEvent, void *pUser)
-   {
-      pAmorStat pAS = NULL;
-      SConnection *pCon = NULL;
-  
-      if(iEvent == FILELOADED)
-      {
-        pAS = (pAmorStat)pEvent;
-        pCon = (SConnection *)pUser;
-        assert(pAS);
-        assert(pCon);
-        SendLoadedData(pAS,pCon);       
-      }     
-      return 1;
-   }
-/*-------------------------------------------------------------------------*/
-   static void ClearUserData(pAmorStat self)
-   {
-       int iRet;
-       UserData ud;
-
-       iRet = LLDnodePtr2First(self->iUserList);
-       while(iRet != 0)
-       {
-          LLDnodeDataTo(self->iUserList,&ud);
-          if(ud.fX != NULL)
-                free(ud.fX);
-          if(ud.fY != NULL)
-                free(ud.fY);
-          if(ud.name != NULL)
-                free(ud.name);
-          iRet = LLDnodePtr2Next(self->iUserList);
-       }
-       LLDdelete(self->iUserList);
-       self->iUserList = LLDcreate(sizeof(UserData));
-   }      
-/*----------------------------------------------------------------------*/
-   void KillAmorStatus(void *pData)
-   {
-      pAmorStat self = (pAmorStat)pData;
-
-      if(!self)
-         return;
-
-      if(self->iUserList >= 0)
-      {
-        ClearUserData(self);
-        LLDdelete(self->iUserList);         
-      }
-      if(self->pDes)
-         DeleteDescriptor(self->pDes);
-      if(self->pCall)
-         DeleteCallBackInterface(self->pCall);
-      free(self);
-   }
-/*------------------------------------------------------------------*/ 
-   int AmorStatusFactory(SConnection *pCon, SicsInterp *pSics, 
-                         void *pData, int argc, char *argv[])
-   {
-      pAmorStat pNew = NULL;
-      CommandList *pCom = NULL;
-      char pBueffel[256];
-      int iRet;
-
-      /* check number of arguments */
-      if(argc < 4)
-      {
-         sprintf(pBueffel,"ERROR: insufficient number of arguments to %s",
-                 argv[0]);
-         SCWrite(pCon,pBueffel,eError);
-         return 0;
-      }
-
-      /* allocate a new data structure */
-      pNew = (pAmorStat)malloc(sizeof(AmorStat));
-      if(!pNew)
-      {
-        sprintf(pBueffel,"ERROR: out of memory in %s",argv[0]);
-        SCWrite(pCon,pBueffel,eError);
-        return 0;
-      }
-      memset(pNew,0,sizeof(AmorStat));
-      pNew->pDes = CreateDescriptor("AmorStatus");
-      pNew->iUserList = LLDcreate(sizeof(UserData));
-      pNew->pCall = CreateCallBackInterface();
-      if( (!pNew->pDes) || (pNew->iUserList < 0) || (!pNew->pCall) )
-      {
-        sprintf(pBueffel,"ERROR: out of memory in %s",argv[0]);
-        SCWrite(pCon,pBueffel,eError);
-        KillAmorStatus(pNew);
-        return 0;
-      }
-
-      /*  to locate the HM and the scan object */
-      pCom = FindCommand(pSics,argv[2]);
-      if(pCom)
-      {
-         if(pCom->pData)
-	 {
-           if(!iHasType(pCom->pData,"ScanObject"))
-	   {
-             sprintf(pBueffel,"ERROR: %s is NO scan object",argv[2]);
-             SCWrite(pCon,pBueffel,eError);
-             KillAmorStatus(pNew);
-             return 0;
-           }
-         }
-         else
-	 {
-             sprintf(pBueffel,"ERROR: %s is NO scan object",argv[2]);
-             SCWrite(pCon,pBueffel,eError);
-             KillAmorStatus(pNew);
-             return 0;
-         }
-      }
-      else
-      {
-          sprintf(pBueffel,"ERROR: %s NOT found",argv[2]);
-          SCWrite(pCon,pBueffel,eError);
-          KillAmorStatus(pNew);
-          return 0;
-      }
-      pNew->pScan = (pScanData)pCom->pData;
-      pCom = FindCommand(pSics,argv[3]);
-      if(pCom)
-      {
-         if(pCom->pData)
-	 {
-           if(!iHasType(pCom->pData,"HistMem"))
-	   {
-             sprintf(pBueffel,"ERROR: %s is NO histogram memory object",
-                     argv[3]);
-             SCWrite(pCon,pBueffel,eError);
-             KillAmorStatus(pNew);
-             return 0;
-           }
-         }
-         else
-	 {
-             sprintf(pBueffel,"ERROR: %s is NO histogram memory  object",
-                     argv[3]);
-             SCWrite(pCon,pBueffel,eError);
-             KillAmorStatus(pNew);
-             return 0;
-         }
-      }
-      else
-      {
-          sprintf(pBueffel,"ERROR: %s NOT found",argv[3]);
-          SCWrite(pCon,pBueffel,eError);
-          KillAmorStatus(pNew);
-          return 0;
-      }
-      pNew->pHM = (pHistMem)pCom->pData;
-      pHMHM = (pHistMem)pCom->pData;
-
-       /* install command */
-       iRet = AddCommand(pSics,argv[1],
-                        AmorStatusAction,KillAmorStatus,pNew);
-       if(!iRet)
-       {
-         sprintf(pBueffel,"ERROR: duplicate command %s NOT created",
-                 argv[1]);
-         SCWrite(pCon,pBueffel,eError);
-         KillAmorStatus(pNew);
-         return 0;
-       }
-      
-
-      return 1;
-   }
-/*------------------------------------------------------------------*/
-   static int RegisterInterest(pAmorStat self, SConnection *pCon)
-   {
-       long lID;
-       pDummy pDum = NULL;
-       pICallBack pCall = NULL;
-
-       assert(self);
-       assert(pCon);
-
-       /* Register all the callbacks. Dependent on the state of 
-          iTOF invoke the apropriate callbacks in order to force
-          an initial update.
-       */
-       /* file load callback */
-       lID = RegisterCallback(self->pCall, FILELOADED, LoadCallback,
-                                  pCon, NULL);
-       SCRegister(pCon,pServ->pSics, self->pCall,lID);
-       SendLoadedData(self,pCon);
-
-       /* scan object */
-       pDum = (pDummy)self->pScan;
-       pCall = pDum->pDescriptor->GetInterface(pDum,CALLBACKINTERFACE);
-       if(pCall)
-       {
-           lID = RegisterCallback(pCall,SCANSTART,ScanStartCallback,
-                                   pCon, NULL);
-           SCRegister(pCon,pServ->pSics,pCall,lID);
-           lID = RegisterCallback(pCall,SCANPOINT,ScanPointCallback,
-                                   pCon, NULL);
-           SCRegister(pCon,pServ->pSics,pCall,lID);
-           lID = RegisterCallback(pCall,SCANEND,ScanPointCallback,
-                                   pCon, NULL);
-           SCRegister(pCon,pServ->pSics,pCall,lID);
-           if(iTOF == 0)
-	   {
-              ScanStartCallback(SCANSTART,pDum,pCon);
-              ScanPointCallback(SCANPOINT,pDum,pCon);
-           }
-       }
-       pDum = (pDummy)self->pHM;
-       pCall = pDum->pDescriptor->GetInterface(pDum,CALLBACKINTERFACE);
-       if(pCall)
-       {
-           lID = RegisterCallback(pCall,COUNTSTART,HMCountStartCallback,
-                                   pCon, NULL);
-           SCRegister(pCon,pServ->pSics,pCall,lID);
-           if(iTOF == 1)
-	   {
-              HMCountStartCallback(COUNTSTART,pDum,pCon);
-           }
-       }
-       return 1;
-   }
-/*-----------------------------------------------------------------*/
-   static int FileLoad(pAmorStat self, SConnection *pCon, 
-                      char *name, double dScale)
-   {
-      char pBueffel[256], pDummy[50];
-      FILE *fd = NULL;
-      UserData ud;
-      int iNP, i;
-      float fDummy;
-      
-      /* open the file */
-      fd = fopen(name,"r");
-      if(!fd)
-      {
-        sprintf(pBueffel,"ERROR: cannot open %s for reading",name);
-        SCWrite(pCon,pBueffel,eError);
-        return 0;
-      }
-      
-      /* skip first line */
-      if(fgets(pBueffel,255,fd) == NULL)
-      {
-         SCWrite(pCon,"ERROR: premature end of file",eError);
-         fclose(fd);
-         return 0;
-      }
-
-      /* read number of points in second line */
-      if(fgets(pBueffel,255,fd) == NULL)
-      {
-         SCWrite(pCon,"ERROR: premature end of file",eError);
-         fclose(fd);
-         return 0;
-      }
-      sscanf(pBueffel,"%s %d",pDummy, &iNP);
-      /* allocate data */
-      ud.iNP = iNP;
-      ud.fX = (float *)malloc(iNP*sizeof(float));
-      ud.fY = (float *)malloc(iNP*sizeof(float));
-      ud.name = strdup(name);
-
-      /* skip two lines */
-      if(fgets(pBueffel,255,fd) == NULL)
-      {
-         SCWrite(pCon,"ERROR: premature end of file",eError);
-         fclose(fd);
-         return 0;
-      }
-      if(fgets(pBueffel,255,fd) == NULL)
-      {
-         SCWrite(pCon,"ERROR: premature end of file",eError);
-         fclose(fd);
-         return 0;
-      }
-
-      /* loop reading data */
-      for(i = 0; i < iNP; i++)
-      {
-         if(fgets(pBueffel,255,fd) == NULL)
-         {
-           SCWrite(pCon,"WARNING: premature end of file",eError);
-           break;
-         }
-         sscanf(pBueffel," %f %f %f",&ud.fX[i],&fDummy, &ud.fY[i]);
-         ud.fY[i] *= dScale;
-      }
-      fclose(fd);
-
-      /* enter ud into list */
-      LLDnodeInsertFrom(self->iUserList,&ud);  
-
-      return 1;
-   }
-/*-----------------------------------------------------------------
-   Collapse creates a 2D image from the detector by summing all time
-   channels together in any given detector.
-*/
-
-   static int Collapse(pAmorStat self, SConnection *pCon)
-   {
-     HistInt *lData = NULL;
-     int i, i2, i3, iDim[MAXDIM], iIdx, iSum, status, length;
-     int *iImage = NULL, *iPtr;
-     pSINQHM pHist;
-     SinqHMDriv *pTata;
-     int iMax = -999999;
-
-     /* get size of our problem */
-     GetHistDim(self->pHM,iDim,&i3);
-     /* assert(i3 == 3); */
-
-     /* allocate some data */
-     length = 2 + iDim[0]*iDim[1];
-     iImage = (int *)malloc(length*sizeof(int));
-     if(iImage == NULL)
-     {
-       SCWrite(pCon,"ERROR: failed to allocate memory in Collapse",eError);
-       return 0;
-     }
-     memset(iImage,0,(2 + iDim[0]*iDim[1])*sizeof(int));
-
-     /* first two numbers are the dimension of the image */
-     iImage[0] = htonl(iDim[0]);
-     iImage[1] = htonl(iDim[1]);
-
-
-     if(isSINQHMDriv(self->pHM->pDriv))
-     {
-       /*
-        send a Project request to the histogram memory
-       */
-       pTata = (SinqHMDriv *)self->pHM->pDriv->pPriv;
-       pHist = (pSINQHM)pTata->pMaster;
-       /*
-          The 3 in the following call has to be identical to
-          PROJECT__COLL in sinqhm_def.h
-       */
-       status = SINQHMProject(pHist, 3, 0, iDim[0],
-                     0, iDim[1], iImage+2, (length-2)*sizeof(int));
-       /*
-         Byte swapping
-       */
-       for(i = 2; i < length; i++)
-       {
-	 /*
-	 if(iImage[i] > iMax){
-	   iMax = iImage[i];
-         }
-	 */
-	 iImage[i] = htonl(iImage[i]); 
-       }
-       /*
-       printf("Collapsed maximum: %d\n",iMax);
-       */
-       if(status != 1) 
-       {
-	 SCWrite(pCon,"ERROR: histogram memory refused to Collapse",eError);
-         return 0;
-       }
-     } 
-     else
-     {
-       /*
-        we are in simulation and just create some random numbers
-       */
-	for(i = 0; i < iDim[0]; i++)
-	{
-	    for(i2 = 0; i2 < iDim[1]; i2++)
-	    {
-	       iIdx = i*iDim[1] + i2;
-	       iImage[iIdx+2] = htonl(random()); 
-               /* iImage[iIdx+2] = htonl(77);*/
-	    }
-	}
-     }
-
-     /* send image */
-     SCWriteUUencoded(pCon,"arrow_image",iImage,
-                ((iDim[0]*iDim[1])+2)*sizeof(int));
-     free(iImage);
-     return 1;
-   }
-/*-----------------------------------------------------------------
-  SendSingleTOF sends single detector data for TOF mode
-*/
-
-   static int  SendSingleTOF(pAmorStat self, SConnection *pCon)
-   {
-     HistInt *lData = NULL;
-     int i, i2, i3, iDim[MAXDIM], iIdx, iSum, status, length, nTime;
-     pSINQHM pHist;
-     SinqHMDriv *pTata;
-     int iMax = -999999;
-     const float *timebin;
-     HistInt *iData = NULL;
-     int iStart;
-
-     /* get size of our problem */
-     GetHistDim(self->pHM,iDim,&i3);
-     
-     /* allocate some data */
-     timebin = GetHistTimeBin(self->pHM, &nTime);
-     if(nTime < 2) {
-       return 1;
-     }
-
-     length = 1 + 2*nTime;
-     iData = (HistInt *)malloc(length*sizeof(HistInt));
-     if(iData == NULL){
-       SCWrite(pCon,"ERROR: failed to allocate memory in SendSingleTOF",
-	       eError);
-       return 0;
-     }
-     memset(iData,0,length*sizeof(int));
-
-     /* first number is the length of each single histogram */
-     iData[0] = htonl(nTime); 
-
-
-     if(isSINQHMDriv(self->pHM->pDriv))
-     {
-       iStart = iDim[0]*iDim[1]*nTime;
-       GetHistogramDirect(self->pHM,pCon,0,iStart,
-			  iStart + 2*nTime,&iData[1],2*nTime*sizeof(HistInt));
-       for(i = 1; i < length; i++)
-       {
-         iData[i] = htonl(iData[i]);
-       }
-     } 
-     else
-     {
-       /*
-        we are in simulation and just create some random numbers
-       */
-	for(i = 1; i < length; i++)
-	{
-	  iData[i] = htonl(random());           
-	}
-     }
-
-     /* 
-	send, with a little trick to do two histograms.  
-     */
-     SCWriteUUencoded(pCon,"SING1",iData,
-                (nTime+1)*sizeof(int));
-     iData[nTime] = htonl(nTime);
-     SCWriteUUencoded(pCon,"SING2",&iData[nTime],
-                (nTime+1)*sizeof(int));
-     free(iData);
-     return 1;
-   }
-/*-------------------------------------------------------------------
-    SubSample sums histogram data in the area defined by the rectangle
-    x1,y1 x2, y2. Summing is along the time axis.
-*/
-   static int SubSample(pAmorStat self, SConnection *pCon,
-                        char *name, int x1, int x2, int y1, int y2)
-  {
-    int iDim[MAXDIM], i, i2, i3, *iSum = NULL, iLang, *iPtr;
-    HistInt *lData = NULL;
-    int iLimit, status, nTime; 
-    char pBueffel[132];
-    pSINQHM pHist;
-     SinqHMDriv *pTata;
-     const float *fTime;
-
-    /* get histogram dimensions */
-     GetHistDim(self->pHM,iDim,&i3);
-     fTime = GetHistTimeBin(self->pHM,&nTime);
-     iDim[i3] = nTime;
-     i3++;
-     assert(i3 == 3);
-
-     /* check limits */ 
-     if(x2 < x1){
-       i = x1;
-       x1 = x2;
-       x2 = i +1;
-     }
-     if(y2 < y1){
-       i = y1;
-       y1 = y2;
-       y2 = i + 1;
-     }
-
-     iLimit = 0;
-     if( x1 > iDim[0])
-     {
-          iLimit = 1;
-          x1 = iDim[0] - 1;
-     }
-     if(x1 < 0) 
-     {
-          iLimit = 1;
-          x1 = 0;  
-     }
-     if( x2 > iDim[0])
-     {
-          iLimit = 2;
-          x2 = iDim[0] - 1;
-     }
-     if(x2 < 0) 
-     {
-          iLimit = 2;
-          x2 = 0;  
-     }
-     if( y1 > iDim[1])
-     {
-          iLimit = 3;
-          y1 = iDim[1] - 1;
-     }
-     if(y1 < 0) 
-     {
-          iLimit = 3;
-          y1 = 0;  
-     }
-     if( y2 > iDim[1])
-     {
-          iLimit = 4;
-          y2 = iDim[1] - 1;
-     }
-     if(y2 < 0) 
-     {
-          iLimit = 4;
-          y2 = 0;  
-     }
-     if(iLimit != 0)
-     {
-        switch(iLimit)
-	{
-	   case 1:
-              strcpy(pBueffel,"WARNING: limit violation on x1");
-              break;
-	   case 2:
-              strcpy(pBueffel,"WARNING: limit violation on x2");
-              break;
-	   case 3:
-              strcpy(pBueffel,"WARNING: limit violation on y1");
-              break;
-	   case 4:
-              strcpy(pBueffel,"WARNING: limit violation on y2");
-              break;
-        }
-        SCWrite(pCon,pBueffel,eWarning);
-     }
-
-     /* allocate space for result */
-     iSum = (int *)malloc((iDim[2]+1)*sizeof(int));
-     if(!iSum)
-     {
-       SCWrite(pCon,"ERROR: out of memory in SubSample",eError);
-       return 0;
-     }
-     memset(iSum,0,(iDim[2]+1)*sizeof(int));
-
-     iSum[0] = htonl(iDim[2]);
-     if(isSINQHMDriv(self->pHM->pDriv))
-     {
-       /*
-        send project message to histogram memory
-       */
-       pTata = (SinqHMDriv *)self->pHM->pDriv->pPriv;
-       pHist = (pSINQHM)pTata->pMaster;
-       status = SINQHMProject(pHist, 4, x1, x2-x1,
-                     y1, y2-y1, iSum+1, iDim[2]*sizeof(int));
-       /*
-         convert to network byte order 
-       */
-       for(i = 1; i < iDim[2]+1; i++)
-       {
-	 iSum[i] = htonl(iSum[i]);
-       }
-       if(status != 1) 
-       {
-	 SCWrite(pCon,"ERROR: histogram memory refused to SubSample",eError);
-         return 0;
-       }
-     }
-     else
-     {
-	/* do  acouple of random numbers! */
-	for(i = 1; i < iDim[2]+1; i++)
-	{
-	   iSum[i] = htonl(random());
-	}
-     }
-
-     /* send */
-     sprintf(pBueffel,"arrowsum_%s",name);
-     SCWriteUUencoded(pCon,pBueffel,iSum,(iDim[2]+1)*sizeof(int));
-    
-     free(iSum);
-     return 1;
-   }
-/*------------------------------------------------------------------*/ 
-   int AmorStatusAction(SConnection *pCon, SicsInterp *pSics, 
-                         void *pData, int argc, char *argv[])
-   {
-      pAmorStat self = (pAmorStat)pData;
-      char pBueffel[512];
-      double dScale;
-      int iRet;
-      int x1, x2, y1, y2;
-
-      assert(self);
-
-      if(argc < 2)
-      {
-         sprintf(pBueffel,"ERROR: need argument to %s",argv[0]);
-         SCWrite(pCon,pBueffel,eError);
-         return 0;
-      }
-
-      strtolower(argv[1]);
-      if(strcmp(argv[1],"interest") == 0)
-      {
-         RegisterInterest(self,pCon);
-         SCSendOK(pCon);
-         return 1;
-      }      
-      else if(strcmp(argv[1],"load") == 0)
-      {
-        if(argc < 4)
-	{
-          sprintf(pBueffel,
-             "ERROR: need filename and scale argument to %s load",
-              argv[0]);
-          SCWrite(pCon,pBueffel,eError);
-          return 0;
-        }
-        iRet = Tcl_GetDouble(pSics->pTcl,argv[3],&dScale);
-        if(iRet != TCL_OK)
-	{
-          sprintf(pBueffel,"ERROR: cannot convert %s to scale factor",
-                  argv[3]);
-          SCWrite(pCon,pBueffel,eError);
-          return 0;    
-        }         
-        FileLoad(self,pCon,argv[2],dScale);
-        InvokeCallBack(self->pCall, FILELOADED,self);        
-        SCSendOK(pCon);
-      }
-      else if(strcmp(argv[1],"collapse") == 0)
-      {
-        iRet = Collapse(self,pCon);
-        if(iRet)
-	{
-          SCSendOK(pCon);
-        }
-        return iRet;
-      }
-      else if(strcmp(argv[1],"sample") == 0)
-      {
-        if(argc < 7)
-	{
-          SCWrite(pCon,"ERROR: insufficent number of arguments to sample",
-                  eError);
-          return 0;
-        }
-        iRet = Tcl_GetInt(pSics->pTcl,argv[3],&x1);
-        if(iRet != TCL_OK)
-	{
-           sprintf(pBueffel,"ERROR: cannot convert %s to int", argv[3]);
-           SCWrite(pCon,pBueffel,eError);
-           return 0;
-        }
-        iRet = Tcl_GetInt(pSics->pTcl,argv[6],&y2);
-        if(iRet != TCL_OK)
-	{
-           sprintf(pBueffel,"ERROR: cannot convert %s to int", argv[6]);
-           SCWrite(pCon,pBueffel,eError);
-           return 0;
-        }
-        iRet = Tcl_GetInt(pSics->pTcl,argv[4],&x2);
-        if(iRet != TCL_OK)
-	{
-           sprintf(pBueffel,"ERROR: cannot convert %s to int", argv[4]);
-           SCWrite(pCon,pBueffel,eError);
-           return 0;
-        }
-        iRet = Tcl_GetInt(pSics->pTcl,argv[5],&y1);
-        if(iRet != TCL_OK)
-	{
-           sprintf(pBueffel,"ERROR: cannot convert %s to int", argv[5]);
-           SCWrite(pCon,pBueffel,eError);
-           return 0;
-        }
-        iRet = SubSample(self,pCon,argv[2],x1,x2,y1,y2);
-        if(iRet)
-          SCSendOK(pCon);
-        return iRet;
-      }
-      else if(strcmp(argv[1],"singletof") == 0)
-      {
-	return SendSingleTOF(self,pCon);
-      }
-      else if(strcmp(argv[1],"sendloaded") == 0)
-      {
-          SendLoadedData(self,pCon);
-          return 1;
-      }
-      else if(strcmp(argv[1],"clear") == 0)
-      {
-         ClearUserData(self);
-         InvokeCallBack(self->pCall, FILELOADED,self);        
-         SCSendOK(pCon);
-      }
-      else if(strcmp(argv[1],"tofmode") == 0)
-      {
-	HMCountStartCallback(COUNTSTART,NULL,pCon);
-	return 1;
-      }
-      else
-      {
-	sprintf(pBueffel,"ERROR: %s nor recognized as subcommand to %s",
-                argv[1], argv[2]);
-	SCWrite(pCon,pBueffel,eError);
-        return 0;
-      }
-      return 1;
-   }
-
-
diff --git a/amorstat.h b/amorstat.h
deleted file mode 100644
index 6665cec2..00000000
--- a/amorstat.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*------------------------------------------------------------------------
-                          A M O R S T A T U S
-
-  Public definitions for the AMOR status display 
-  facilitator object. DO NOT CHANGE. This file is automatically
-  created from amorstat.w.
-
-  Mark Koennecke, September 1999
----------------------------------------------------------------------*/
-#ifndef AMORSTATUS
-#define AMORSTATUS
-
- int AmorStatusFactory(SConnection *pCon, SicsInterp *pSics, void *pData,
-                      int argc, char *argv[]);
- int AmorStatusAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-                      int argc, char *argv[]);
- void KillAmorStatus(void *pData);
-
-#endif
-
diff --git a/amorstat.i b/amorstat.i
deleted file mode 100644
index 5a24a644..00000000
--- a/amorstat.i
+++ /dev/null
@@ -1,29 +0,0 @@
-
-/*------------------------------------------------------------------------
-                          A M O R S T A T U S
-
-  Internal data structure definitions for the AMOR status display 
-  facilitator object. DO NOT CHANGE. This file is automatically
-  created from amorstat.w.
-
-  Mark Koennecke, September 1999
----------------------------------------------------------------------*/
-
-/*---------------------------------------------------------------------*/
-   typedef struct {
-                     float *fX, *fY;
-                     int iNP;
-                     char *name;
-                  }UserData, *pUserData;                     
-/*---------------------------------------------------------------------*/
-   typedef struct __AMORSTAT {
-                              pObjectDescriptor pDes;
-                              pICallBack pCall;
-                              int iUserList;
-                              pScanData pScan;
-                              pHistMem  pHM;
-                              int iTOF;
-                             }AmorStat, *pAmorStat;
-                
-
- 
diff --git a/amorstat.tex b/amorstat.tex
deleted file mode 100644
index 8d295337..00000000
--- a/amorstat.tex
+++ /dev/null
@@ -1,138 +0,0 @@
-\subsection{Amor Status Display Support}
-The reflectometer AMOR has a few unique status display requirements:
-\begin{itemize}
-\item In scan mode up to four detector counts curves must be shown for
-the two counters in spin-up or spin-down mode. This needs to be
-updated after each scan point.
-\item Additionally user defined curves may need to be displayed.
-\item The usual helper information muste be displayed. 
-\item In TOF mode it must be possible to define a region on the
-detector whose summed counts are displayed versus the time
-binning. This must be sent on request. 
-\end{itemize}
-In order to cover all this a special object within SICS is required
-which deals with all this and packages information in a status display
-compliant way.  
-
-In order to do this the amorstatus object registers callbacks both
-with the histogram memory and the scan object. These callback
-functions are then responsible for updating the status displays. In
-order for amorstatus to be able to do this, the client must register
-itself with a special command.  
-
-In order to achieve all this some data structures are needed:
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap1}
-$\langle$asdata {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@/*---------------------------------------------------------------------*/@\\
-\mbox{}\verb@   typedef struct {@\\
-\mbox{}\verb@                     float *fX, *fY;@\\
-\mbox{}\verb@                     int iNP;@\\
-\mbox{}\verb@                     char *name;@\\
-\mbox{}\verb@                  }UserData, *pUserData;                     @\\
-\mbox{}\verb@/*---------------------------------------------------------------------*/@\\
-\mbox{}\verb@   typedef struct __AMORSTAT {@\\
-\mbox{}\verb@                              pObjectDescriptor pDes;@\\
-\mbox{}\verb@                              pICallBack pCall;@\\
-\mbox{}\verb@                              int iUserList;@\\
-\mbox{}\verb@                              pScanData pScan;@\\
-\mbox{}\verb@                              pHistMem  pHM;@\\
-\mbox{}\verb@                              int iTOF;@\\
-\mbox{}\verb@                             }AmorStat, *pAmorStat;@\\
-\mbox{}\verb@                @\\
-\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}
-The fourth data structure is the amor status object data structure. It
-has the following fields:
-\begin{description}
-\item[pDes] The standard SICS object descriptor.
-\item[pCall] The callback interface.
-\item[iUserList] A list of user data loaded data.
-\item[pScan] A pointer to the scan object.
-\item[pHM] A pointer to the histogram memory.
-\item[iTOF] A flag which is true if we are taking measurements in TOF
-mode. 
-\end{description} 
-
-In terms of a function interface this object has not much to
-offer. Its main purpose is really as an interface to the status
-display clients and thus it is configured through the interpreter
-interface function. No need for other SICS objects to access it.
-
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap2}
-$\langle$asinter {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@ int AmorStatusFactory(SConnection *pCon, SicsInterp *pSics, void *pData,@\\
-\mbox{}\verb@                      int argc, char *argv[]);@\\
-\mbox{}\verb@ int AmorStatusAction(SConnection *pCon, SicsInterp *pSics, void *pData,@\\
-\mbox{}\verb@                      int argc, char *argv[]);@\\
-\mbox{}\verb@ void KillAmorStatus(void *pData);@\\
-\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{scrap3}
-\verb@"amorstat.i"@ {\footnotesize ? }$\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@/*------------------------------------------------------------------------@\\
-\mbox{}\verb@                          A M O R S T A T U S@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  Internal data structure definitions for the AMOR status display @\\
-\mbox{}\verb@  facilitator object. DO NOT CHANGE. This file is automatically@\\
-\mbox{}\verb@  created from amorstat.w.@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  Mark Koennecke, September 1999@\\
-\mbox{}\verb@---------------------------------------------------------------------*/@\\
-\mbox{}\verb@@$\langle$asdata {\footnotesize ?}$\rangle$\verb@@\\
-\mbox{}\verb@ @\\
-\mbox{}\verb@@$\diamond$
-\end{list}
-\vspace{-2ex}
-\end{minipage}\\[4ex]
-\end{flushleft}
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap4}
-\verb@"amorstat.h"@ {\footnotesize ? }$\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@/*------------------------------------------------------------------------@\\
-\mbox{}\verb@                          A M O R S T A T U S@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  Public definitions for the AMOR status display @\\
-\mbox{}\verb@  facilitator object. DO NOT CHANGE. This file is automatically@\\
-\mbox{}\verb@  created from amorstat.w.@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  Mark Koennecke, September 1999@\\
-\mbox{}\verb@---------------------------------------------------------------------*/@\\
-\mbox{}\verb@#ifndef AMORSTATUS@\\
-\mbox{}\verb@#define AMORSTATUS@\\
-\mbox{}\verb@@$\langle$asinter {\footnotesize ?}$\rangle$\verb@@\\
-\mbox{}\verb@#endif@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@@$\diamond$
-\end{list}
-\vspace{-2ex}
-\end{minipage}\\[4ex]
-\end{flushleft}
diff --git a/amorstat.w b/amorstat.w
deleted file mode 100644
index a8653d7b..00000000
--- a/amorstat.w
+++ /dev/null
@@ -1,102 +0,0 @@
-\subsection{Amor Status Display Support}
-The reflectometer AMOR has a few unique status display requirements:
-\begin{itemize}
-\item In scan mode up to four detector counts curves must be shown for
-the two counters in spin-up or spin-down mode. This needs to be
-updated after each scan point.
-\item Additionally user defined curves may need to be displayed.
-\item The usual helper information muste be displayed. 
-\item In TOF mode it must be possible to define a region on the
-detector whose summed counts are displayed versus the time
-binning. This must be sent on request. 
-\end{itemize}
-In order to cover all this a special object within SICS is required
-which deals with all this and packages information in a status display
-compliant way.  
-
-In order to do this the amorstatus object registers callbacks both
-with the histogram memory and the scan object. These callback
-functions are then responsible for updating the status displays. In
-order for amorstatus to be able to do this, the client must register
-itself with a special command.  
-
-In order to achieve all this some data structures are needed:
-@d asdata @{
-/*---------------------------------------------------------------------*/
-   typedef struct {
-                     float *fX, *fY;
-                     int iNP;
-                     char *name;
-                  }UserData, *pUserData;                     
-/*---------------------------------------------------------------------*/
-   typedef struct __AMORSTAT {
-                              pObjectDescriptor pDes;
-                              pICallBack pCall;
-                              int iUserList;
-                              pScanData pScan;
-                              pHistMem  pHM;
-                              int iTOF;
-                             }AmorStat, *pAmorStat;
-                
-@}
-
-
-The fourth data structure is the amor status object data structure. It
-has the following fields:
-\begin{description}
-\item[pDes] The standard SICS object descriptor.
-\item[pCall] The callback interface.
-\item[iUserList] A list of user data loaded data.
-\item[pScan] A pointer to the scan object.
-\item[pHM] A pointer to the histogram memory.
-\item[iTOF] A flag which is true if we are taking measurements in TOF
-mode. 
-\end{description} 
-
-In terms of a function interface this object has not much to
-offer. Its main purpose is really as an interface to the status
-display clients and thus it is configured through the interpreter
-interface function. No need for other SICS objects to access it.
-
-@d asinter @{
- int AmorStatusFactory(SConnection *pCon, SicsInterp *pSics, void *pData,
-                      int argc, char *argv[]);
- int AmorStatusAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-                      int argc, char *argv[]);
- void KillAmorStatus(void *pData);
-@}
-
-
-@o amorstat.i @{
-/*------------------------------------------------------------------------
-                          A M O R S T A T U S
-
-  Internal data structure definitions for the AMOR status display 
-  facilitator object. DO NOT CHANGE. This file is automatically
-  created from amorstat.w.
-
-  Mark Koennecke, September 1999
----------------------------------------------------------------------*/
-@<asdata@>
- 
-@}
-
-@o amorstat.h @{
-/*------------------------------------------------------------------------
-                          A M O R S T A T U S
-
-  Public definitions for the AMOR status display 
-  facilitator object. DO NOT CHANGE. This file is automatically
-  created from amorstat.w.
-
-  Mark Koennecke, September 1999
----------------------------------------------------------------------*/
-#ifndef AMORSTATUS
-#define AMORSTATUS
-@<asinter@>
-#endif
-
-@}
-
-
-
diff --git a/bruker.c b/bruker.c
deleted file mode 100644
index 0c413dbe..00000000
--- a/bruker.c
+++ /dev/null
@@ -1,999 +0,0 @@
-/*-------------------------------------------------------------------------
-                       B r u k e r
-                      
-    An environment control driver and an additonal wrapper function for
-    controlling a Bruker B-EC-1 magnet controller. This controller can 
-    either control a current or control the current through an external hall 
-    sensor mesuring the magnetic field. In both cases both values: the field 
-    and the current must be readable.
-    
-    copyright: see copyright.h
-    
-    Mark Koennecke, October 1998                   
----------------------------------------------------------------------------*/
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <tcl.h>
-#include <math.h>
-#include <assert.h>
-#include "fortify.h"
-#include "sics.h"
-#include "obpar.h"
-#include "evcontroller.h"
-#include "evcontroller.i"
-#include "evdriver.i"  
-#include "hardsup/serialsinq.h"
-#include "hardsup/el734_errcodes.h"
-#include "hardsup/el734fix.h"
-#include "bruker.h"
-
-/*
-#define debug 1
-*/
-/*-----------------------------------------------------------------------
-             The Bruker Data Structure 
-*/             
-  typedef struct {
-                   void *pData;
-                   char *pHost;
-                   int iPort;
-                   int iChannel;
-                   int iMode;
-                   int iLastError;
-                  } BrukerDriv, *pBrukerDriv;
-/*-----------------------------------------------------------------------
-  A couple of defines for Bruker modes and special error conditions
-*/
-#define FIELD 100
-#define CURRENT 200
-
-/* errors */
-#define NOFUNC -1601
-#define BADARG -1602
-#define NOACCESS -1603
-#define BADRANGE -1604
-#define ERRPENDING -1605
-#define NOPOWER    -1606
-#define NOTFIELD   -1607
-#define BADINTERN   -1608 
-#define NOCONN      -1609
-#define BTIMEOUT     -1610
-#define NOPOLUNIT   -1620
-
-/* polarity */
-#define PPLUS 0
-#define PMINUS 1
-#define PBUSY 3
-
-/* rmtrail.c */
-extern char *rmtrail(char *p);
-
-/*---------------------------------------------------------------------------
-   This Bruker thing has a lot of internal error conditions and a few nasty
-   habits. Such as to lock up after an error ocurred until the error is reset.
-   Or to switch the power off, when a current above the limit is requested
-   after setting a bad value for the magnetic field. These problems can be
-   detected by analysing the return values from the Bruker. Usually the Bruker
-   returns the command given to the user plus additional values if requested.
-   On an error a string of the type E0n is appended to the command echo with
-   n being a small integer. In order to handle this all commands to the Bruker
-   are processed through this special function which takes care of the error
-   handling.
-*/
-  static int BrukerCommand(pBrukerDriv self, char *pCommand, 
-                           char *pReplyBuffer, int iReplyLen)
-  {
-     int iTest, iCode;
-     char *pPtr;
-     
-     assert(self);
-     assert(iReplyLen > 20); /* so small a buffer will hide errors */
-     
-     if(self->pData == NULL)
-     {
-       self->iLastError = NOCONN;
-       return 0;
-     }
-     
-     /* send the command to the Bruker */
-     rmtrail(pCommand);
-     iTest = SerialWriteRead(&(self->pData), pCommand,pReplyBuffer, iReplyLen);
-#ifdef debug
-     printf("Comm: %s , Reply %s\n",pCommand,pReplyBuffer);
-#endif      
-     if(iTest != 1) /* communication error */
-     {
-         self->iLastError = iTest;
-         return 0;
-     }     
-     
-     /* identify timeout */
-     if(strstr(pReplyBuffer,"?TMO") != NULL)
-     {
-        self->iLastError = BTIMEOUT;
-        return 0;
-     }
-     
-     /* try to find a E0 response indicating a Bruker error */
-     if( (pPtr = strstr(pReplyBuffer,"E0")) == NULL)
-     {
-        return 1;
-     }  
-     
-     /* decode the error */
-     sscanf(pPtr+1,"%x",&iCode);
-     switch(iCode)
-     {
-        case 1:
-             self->iLastError = NOFUNC;
-             break;
-        case 2:
-             self->iLastError = BADARG;
-             break;
-        case 4:
-             self->iLastError = NOACCESS;
-             break;
-        case 5:
-             self->iLastError = BADRANGE;
-             break;
-        case 7:
-             self->iLastError = ERRPENDING;
-             break;
-        case 9:
-             self->iLastError = NOPOWER;
-             break;
-        case 10:
-             self->iLastError = NOTFIELD;
-             break;
-        default:
-             self->iLastError = BADINTERN;
-             break;                         
-     }
-     return 0;
-  }          
-/*-------------------------------------------------------------------------*/
-  int BrukerReadField(pEVControl pEva, float *fField)
-  {
-     pBrukerDriv self = NULL;
-     int iRet;
-     char pBueffel[80];
-     char pCommand[6];
-     char *pPtr,*pSign;
-     int iSign = 1;
-     float fVal;
-     
-     self = (pBrukerDriv)pEva->pDriv->pPrivate;
-     assert(self);
-
-     if(self->pData == NULL)
-     {
-       self->iLastError = NOCONN;
-       return 0;
-     }
-     
-     strcpy(pCommand,"FIE/");
-     iRet = BrukerCommand(self,pCommand,pBueffel,79);
-     if(!iRet)
-     {
-       *fField = -99;
-       return 0;
-     }
-     
-     pPtr = pBueffel+4; /* skip over echo */
-     /* deal with obstructing sign */
-     if( (pSign = strchr(pPtr,'+')) != NULL)
-     {
-       *pSign = ' ';
-       iSign = 1;
-     }
-     if( (pSign = strchr(pPtr,'-')) != NULL)
-     {
-       *pSign = ' ';
-       iSign = -1;
-     }
-     sscanf(pPtr,"%f",&fVal);
-     *fField = iSign * fVal;
-     return 1;
-  }   
-/*-------------------------------------------------------------------------*/
-  int BrukerReadCurrent(pEVControl pEva, float *fField)
-  {
-     pBrukerDriv self = NULL;
-     int iRet, iSign = 1;
-     char pBueffel[80];
-     char pCommand[6];
-     char *pPtr, *pSign = NULL;
-     float fVal;
-     
-     self = (pBrukerDriv)pEva->pDriv->pPrivate;
-     assert(self);
-
-     if(self->pData == NULL)
-     {
-       self->iLastError = NOCONN;
-       return 0;
-     }
-     
-     strcpy(pCommand,"CHN/");
-     iRet = BrukerCommand(self,pCommand,pBueffel,79);
-     if(!iRet)
-     {
-       *fField = -99;
-       return 0;
-     }
-     
-     pPtr = pBueffel+4; /* skip over echo */
-     /* deal with obstructing sign */
-     if( (pSign = strchr(pPtr,'+')) != NULL)
-     {
-       *pSign = ' ';
-       iSign = 1;
-     }
-     if( (pSign = strchr(pPtr,'-')) != NULL)
-     {
-       *pSign = ' ';
-       iSign = -1;
-     }
-     sscanf(pPtr,"%f",&fVal);
-     *fField = iSign * fVal;
-     return 1;
-  }   
-/*-------------------------------------------------------------------------*/
-  static int BrukerGet(pEVDriver pEva, float *fValue)
-  {
-     pBrukerDriv self = NULL;
-     int iRet, iSign = 1;
-     char pBueffel[80];
-     char pCommand[6];
-     char *pPtr, *pSign = NULL;
-     float fVal;
-     
-     self = (pBrukerDriv)pEva->pPrivate;
-     assert(self);
-
-     if(self->pData == NULL)
-     {
-       self->iLastError = NOCONN;
-       return 0;
-     }
-     
-     if(self->iMode == FIELD)
-     {
-        strcpy(pCommand,"CUF/");
-        iRet = BrukerCommand(self,pCommand,pBueffel,79);
-     }
-     else if(self->iMode == CURRENT)
-     {
-        strcpy(pCommand,"CUR/");
-        iRet = BrukerCommand(self,pCommand,pBueffel,79);
-     }
-     else
-     {
-        /* programming error */
-        assert(1);
-     }
-     
-     if(!iRet)
-     {
-       *fValue = -99;
-       return 0;
-     }
-     
-     pPtr = pBueffel+4; /* skip over echo */
-     /* deal with obstructing sign */
-     if( (pSign = strchr(pPtr,'+')) != NULL)
-     {
-       *pSign = ' ';
-       iSign = 1;
-     }
-     if( (pSign = strchr(pPtr,'-')) != NULL)
-     {
-       *pSign = ' ';
-       iSign = -1;
-     }
-     sscanf(pPtr,"%f",&fVal);
-     *fValue = iSign * fVal;
-     return 1;
-  }
-/*-------------------------------------------------------------------------*/
-  static int BrukerRun(pEVDriver pEva, float fVal)
-  {
-     pBrukerDriv self = NULL;
-     int iRet;
-     char pBueffel[80];
-     char pCommand[40];
-     char *pPtr;
-     
-     self = (pBrukerDriv)pEva->pPrivate;
-     assert(self);
-     
-     if(self->pData == NULL)
-     {
-       self->iLastError = NOCONN;
-       return 0;
-     }
-
-     if(self->iMode == FIELD)
-     {
-        sprintf(pCommand,"PTF=%-6.2f",fVal);
-        iRet = BrukerCommand(self,pCommand,pBueffel,79);
-     }
-     else if(self->iMode == CURRENT)
-     {
-        sprintf(pCommand,"PNT=%-6.2f",fVal);
-        iRet = BrukerCommand(self,pCommand,pBueffel,79);
-     }
-     else
-     {
-        /* programming error */
-        assert(1);
-     }
-     
-     if(!iRet)
-     {
-       return 0;
-     }
-     return 1;
-  }
-/*------------------------------------------------------------------------*/
-  static int BrukerError(pEVDriver pEva, int *iCode, char *pError, 
-                         int iErrLen)
-  {
-     pBrukerDriv self = NULL;
-
-     self = (pBrukerDriv)pEva->pPrivate;
-     assert(self);
-
-     *iCode = self->iLastError;
-     switch(*iCode)
-     {
-        case NOFUNC:
-              strncpy(pError,
-                  "Function not supported",
-                  iErrLen);
-              break;
-        case BADINTERN:
-        case BADARG:
-              strncpy(pError,
-                  "Programming problem, reset Controller & contact Programmer",
-                  iErrLen);
-              break;
-        case NOTFIELD:
-             strncpy(pError,"Bruker not switched to field mode",iErrLen);
-             break;
-        case BADRANGE:
-             strncpy(pError,"Requested value out of range",iErrLen);
-             break;
-        case NOACCESS:
-             strncpy(pError,"No Access, check key position at Controller",
-                     iErrLen);
-             break;                       
-        case ERRPENDING:
-             strncpy(pError,"Error condition pending in Bruker Controller",
-                     iErrLen);
-             break;
-        case NOPOWER:
-             strncpy(pError,
-               "Power OFF as consequence of some error in Bruker Controller",
-               iErrLen);
-             break;
-        case NOCONN:
-             strncpy(pError,"No Connection to Bruker Controller",iErrLen);
-             break;     
-        case BTIMEOUT:
-             strncpy(pError,"Timeout at serial port",iErrLen);
-             break;     
-        case NOPOLUNIT:
-             strncpy(pError,"No polarity switching unit, try setting negative current",
-                     iErrLen);
-             break;             
-        default:
-             SerialError(*iCode,pError,iErrLen);
-             break;                                
-     }
-     return 1;    
-  }           
-/*---------------------------------------------------------------------------*/
-  static int BrukerSend(pEVDriver pEva, char *pCommand, char *pReply,
-                        int iReplyLen)
-  {
-     pBrukerDriv self = NULL;
-     int iRet;
-
-     self = (pBrukerDriv)pEva->pPrivate;
-     assert(self);
-
-     if(self->pData == NULL)
-     {
-       self->iLastError = NOCONN;
-       return 0;
-     }
-
-
-     iRet = SerialWriteRead(&(self->pData),pCommand, pReply, iReplyLen);
-     if(iRet != 1)
-     {
-        self->iLastError = iRet;
-        return 0;
-     }
-     return 1;
-  } 
-/*--------------------------------------------------------------------------*/
-  static int BrukerInit(pEVDriver pEva)
-  {
-     pBrukerDriv self = NULL;
-     int iRet;
-     char pBueffel[80], pCommand[20];
-
-     self = (pBrukerDriv)pEva->pPrivate;
-     assert(self);
-
-     /* open port connection */
-     self->pData = NULL;
-     iRet = SerialOpen(&(self->pData),self->pHost, self->iPort, self->iChannel);
-     if(iRet != 1)
-     {
-       self->iLastError = iRet;
-       return 0;
-     }       
-     /* configure serial port terminators */
-     SerialSendTerm(&(self->pData),"\r");
-     SerialATerm(&(self->pData),"1\r\n");
-     
-     /* set power on  */
-     strcpy(pCommand,"DCP=1");
-     iRet = SerialWriteRead(&(self->pData),pCommand,pBueffel,80);
-     if(iRet != 1)
-     {
-       self->iLastError = iRet;
-       return 0;
-     }       
-
-     /* switch to current mode as default init mode */
-     self->iMode = CURRENT;
-     strcpy(pCommand,"EXT=0");
-     iRet = SerialWriteRead(&(self->pData),pCommand,pBueffel,80);
-     if(iRet != 1)
-     {
-       self->iLastError = iRet;
-       return 0;
-     }       
-     return 1;      
-  }
-/*-------------------------------------------------------------------------*/
-  static int BrukerClose(pEVDriver pEva)
-  {
-     pBrukerDriv self = NULL;
-
-     self = (pBrukerDriv)pEva->pPrivate;
-     assert(self);
-
-     SerialClose(&(self->pData));
-     self->pData = 0;
-       
-     return 1;  
-  }
-/*---------------------------------------------------------------------------*/
-  static int BrukerFix(pEVDriver self, int iError)
-  {
-     pBrukerDriv pMe = NULL;
-     int iRet;
-     char pCommand[20], pBueffel[80];
-     
-     assert(self);
-     pMe = (pBrukerDriv )self->pPrivate;
-     assert(pMe);
-
-        switch(iError)
-        {
-            /* network errors */
-            case EL734__BAD_FLUSH:
-            case EL734__BAD_RECV:
-            case EL734__BAD_RECV_NET:
-            case EL734__BAD_RECV_UNKN:
-            case EL734__BAD_RECVLEN:
-            case EL734__BAD_RECV1:
-            case EL734__BAD_RECV1_PIPE:
-            case EL734__BAD_RNG:
-            case EL734__BAD_SEND:
-            case EL734__BAD_SEND_PIPE:
-            case EL734__BAD_SEND_NET:
-            case EL734__BAD_SEND_UNKN:
-            case EL734__BAD_SENDLEN:
-                      BrukerClose(self);
-                      iRet = BrukerInit(self);
-                      if(iRet)
-                      {
-                        return DEVREDO;
-                      }                 
-                      else
-                      {
-                        return DEVFAULT;
-                      }                 
-                      break;
-            case EL734__FORCED_CLOSED:
-            case NOCONN:
-                      iRet = BrukerInit(self);
-                      if(iRet)
-                      {
-                        return DEVREDO;
-                      }                 
-                      else
-                      {
-                        return DEVFAULT;
-                      }                 
-                      break;
-            /* fixable Bruker Errors */
-            case ERRPENDING:
-                      strcpy(pCommand,"RST=0");
-                      iRet = BrukerCommand(pMe,pCommand, pBueffel,79);
-                      if(iRet)
-                      {
-                        return DEVREDO;
-                      }                 
-                      else
-                      {
-                        return DEVFAULT;
-                      }                 
-                      break;
-            case NOPOWER:
-                      strcpy(pCommand,"RST=0");
-                      iRet = BrukerCommand(pMe,pCommand, pBueffel,79);
-                      strcpy(pCommand,"DCP=1");
-                      iRet = BrukerCommand(pMe,pCommand, pBueffel,79);
-                      if(iRet)
-                      {
-                        return DEVREDO;
-                      }                 
-                      else
-                      {
-                        return DEVFAULT;
-                      }                 
-                      break;
-            case NOTFIELD:
-                      strcpy(pCommand,"EXT=2");
-                      iRet = BrukerCommand(pMe,pCommand, pBueffel,79);
-                      if(iRet)
-                      {
-                        return DEVREDO;
-                      }                 
-                      else
-                      {
-                        return DEVFAULT;
-                      }                 
-                      break;
-            /* handable protocoll errors */
-            case EL734__BAD_TMO:
-            case BTIMEOUT:
-            case NOFUNC:
-                      return DEVREDO;
-                      break;
-            default:
-                      return DEVFAULT;
-                      break;                       
-        }
-        return DEVFAULT;
-  }
-/*------------------------------------------------------------------------*/
-  void KillBruker(void *pData)
-  {
-     pBrukerDriv pMe = NULL;
-     
-     pMe = (pBrukerDriv)pData;
-     assert(pMe);
-     
-     if(pMe->pHost)
-     {
-        free(pMe->pHost);
-     }
-     free(pMe);
-  }  
-/*------------------------------------------------------------------------*/
-  pEVDriver CreateBrukerDriver(int argc, char *argv[])
-  {
-     pEVDriver pNew = NULL;
-     pBrukerDriv pSim = NULL;
-     
-     /* check for arguments */
-     if(argc < 3)
-     {
-       return NULL;
-     }
-     
-     pNew = CreateEVDriver(argc,argv);
-     pSim = (pBrukerDriv)malloc(sizeof(BrukerDriv));
-     memset(pSim,0,sizeof(BrukerDriv));
-     if(!pNew || !pSim)
-     {
-       return NULL;
-     }
-     pNew->pPrivate = pSim;
-     pNew->KillPrivate = KillBruker;
-     
-     /* initalise pBrukerDriver */
-     pSim->iLastError = 0;
-     pSim->pHost = strdup(argv[0]);
-     pSim->iPort = atoi(argv[1]);
-     pSim->iChannel = atoi(argv[2]);
-     
-     
-     /* initialise function pointers */
-     pNew->SetValue = BrukerRun;
-     pNew->GetValue = BrukerGet;
-     pNew->Send     = BrukerSend;
-     pNew->GetError = BrukerError;
-     pNew->TryFixIt = BrukerFix;
-     pNew->Init     = BrukerInit;
-     pNew->Close    = BrukerClose;
-     
-     return pNew; 
-  }	
-/*-------------------------------------------------------------------------*/
-  int BrukerSetMode(pEVControl pEva, SConnection *pCon, int iMode)
-  {
-     pBrukerDriv self = NULL;
-     int iRet;
-     char pBueffel[80];
-     char pCommand[6];
-     char *pPtr;
-     
-     self = (pBrukerDriv)pEva->pDriv->pPrivate;
-     assert(self);
-
-     if(self->pData == NULL)
-     {
-       self->iLastError = NOCONN;
-       return 0;
-     }
-     
-     if(iMode == CURRENT)
-     {
-         strcpy(pCommand,"EXT=0");
-     }
-     else if(iMode == FIELD)
-     {
-         strcpy(pCommand,"EXT=2");
-     }    
-     else
-     {
-       SCWrite(pCon,"ERROR: Internal: invalid mode for Bruker given",eError);
-       return 0;
-     }
-     iRet = BrukerCommand(self,pCommand,pBueffel,79);
-     if(!iRet)
-     {
-       strcpy(pBueffel,"ERROR:");
-       BrukerError(pEva->pDriv,&iRet,(pBueffel+7),70);
-       SCWrite(pCon,pBueffel,eError);
-       return 0;
-     }
-     self->iMode = iMode;
-     return 1;
-  }   
-/*-------------------------------------------------------------------------*/
-  int BrukerGetPolarity(pEVControl pEva, SConnection *pCon, int *iMode)
-  {
-     pBrukerDriv self = NULL;
-     int iRet;
-     char pBueffel[80];
-     char pCommand[6];
-     char *pPtr;
-     
-     self = (pBrukerDriv)pEva->pDriv->pPrivate;
-     assert(self);
-
-     if(self->pData == NULL)
-     {
-       self->iLastError = NOCONN;
-       return 0;
-     }
-     strcpy(pCommand,"POL/");
-     iRet = BrukerCommand(self,pCommand,pBueffel,79);
-     if(!iRet)
-     {
-       strcpy(pBueffel,"ERROR:");
-       BrukerError(pEva->pDriv,&iRet,(pBueffel+7),70);
-       SCWrite(pCon,pBueffel,eError);
-       return 0;
-     }
-     pPtr = pBueffel+4;
-     sscanf(pPtr,"%d",iMode);
-     return 1;
-  }   
-/*------------------------------------------------------------------------*/
-  int BrukerSetPolarity(pEVControl pEva, SConnection *pCon, int iMode)
-  {
-     pBrukerDriv self = NULL;
-     int iRet;
-     char pBueffel[80];
-     char pCommand[6];
-     char *pPtr;
-     
-     self = (pBrukerDriv)pEva->pDriv->pPrivate;
-     assert(self);
-
-     if(self->pData == NULL)
-     {
-       self->iLastError = NOCONN;
-       return 0;
-     }
-     
-     if(iMode == PPLUS)
-     {
-        strcpy(pCommand,"POL=0");
-     }
-     else if(iMode == PMINUS)
-     {
-       strcpy(pCommand,"POL=1");
-     }    
-     else
-     {
-        assert(1); /* programming error */
-     }
-
-     iRet = BrukerCommand(self,pCommand,pBueffel,79);
-     if( (strstr(pBueffel,"POL=0E01") != NULL) || 
-        (strstr(pBueffel,"POL=1E01") != NULL) )
-     {
-        self->iLastError = NOPOLUNIT;
-        iRet = 0;
-     }
-     if(!iRet)
-     {
-       strcpy(pBueffel,"ERROR:");
-       BrukerError(pEva->pDriv,&iRet,(pBueffel+6),70);
-       SCWrite(pCon,pBueffel,eError);
-       return 0;
-     }
-     return 1;
-  }   
-/*--------------------------------------------------------------------------
-  handle Bruker specific commands:
-  - polarity   for switching polarity
-  - field      for reading field
-  - current    for reading current
-  - mode       for setting and retrieving the current control mode
-  - list       append our own stuff to the rest
-  in all other cases fall back and call EVControllerWrapper to handle it or
-  eventually throw an error.
-*/  
-  int BrukerAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-                   int argc, char *argv[])
-  {
-  
-     pEVControl self = NULL;
-     int iRet, iMode;
-     char pBueffel[256];
-     pBrukerDriv pMe = NULL;
-     float fVal;
-     
-     self = (pEVControl)pData;
-     assert(self);
-     pMe = (pBrukerDriv)self->pDriv->pPrivate;
-     assert(pMe);
-
-     if(argc > 1)
-     {
-        strtolower(argv[1]);
-/*------ polarity */        
-        if(strcmp(argv[1],"polarity") == 0)
-        {
-           if(argc > 2) /* set case */
-           {
-             strtolower(argv[2]);
-             if(strcmp(argv[2],"plus") == 0)
-             {
-               iMode = PPLUS;
-             }
-             else if(strcmp(argv[2],"minus") == 0)
-             {
-               iMode = PMINUS;
-             }
-             else
-             {
-               sprintf(pBueffel,"ERROR: %s is no knwon polarity mode", argv[2]);
-               SCWrite(pCon,pBueffel,eError);
-               return 0;
-             }
-             /* check permission */
-             if(!SCMatchRights(pCon,usUser))
-             {
-                return 0;
-             }
-             /* do it */
-             iRet = BrukerSetPolarity(self,pCon,iMode);
-             if(iRet)
-             {
-               SCSendOK(pCon);
-               return 1;
-             }
-             else
-             {
-                return 0;
-             }
-           }  
-           else /* get case */
-           {
-             iRet = BrukerGetPolarity(self,pCon,&iMode);
-             if(iRet)
-             {
-               if(iMode == PPLUS)
-               {
-                 sprintf(pBueffel,"%s.polarity = plus",argv[0]);
-               }
-               else if (iMode == PMINUS)
-               {
-                 sprintf(pBueffel,"%s.polarity = minus",argv[0]);
-               }
-               else
-               {
-                  assert(1); /* programming problem */
-               }
-               SCWrite(pCon,pBueffel,eValue);
-               return 1;
-             }
-           }
-        }
-/*-------- control mode */       
-        else if(strcmp(argv[1],"mode") == 0)
-        {
-           if(argc > 2) /* set case */
-           {
-             strtolower(argv[2]);
-             if(strcmp(argv[2],"field") == 0)
-             {
-               iMode = FIELD;
-             }
-             else if(strcmp(argv[2],"current") == 0)
-             {
-               iMode = CURRENT;
-             }
-             else
-             {
-               sprintf(pBueffel,"ERROR: %s is no known control mode", argv[2]);
-               SCWrite(pCon,pBueffel,eError);
-               return 0;
-             }
-             /* check permission */
-             if(!SCMatchRights(pCon,usUser))
-             {
-                return 0;
-             }
-             /* do it */
-             iRet = BrukerSetMode(self,pCon,iMode);
-             if(iRet)
-             {
-               SCSendOK(pCon);
-               return 1;
-             }
-             else
-             {
-               return 0;
-             }
-           }
-           else /* get case */
-           {
-               if(pMe->iMode == FIELD)
-               {
-                 sprintf(pBueffel,"%s.mode = field",argv[0]);
-               }
-               else if (pMe->iMode == CURRENT)
-               {
-                 sprintf(pBueffel,"%s.mode = current",argv[0]);
-               }
-               else
-               {
-                  assert(1); /* programming problem */
-               }
-               SCWrite(pCon,pBueffel,eValue);
-               return 1;
-           }
-        }
-/*-----------field */
-        else if(strcmp(argv[1],"field") == 0)
-        {
-          iRet = BrukerReadField(self,&fVal);
-          if(!iRet)
-          {
-            strcpy(pBueffel,"ERROR: ");
-            self->pDriv->GetError(self->pDriv,&iMode,pBueffel+7,240);
-            SCWrite(pCon,pBueffel,eError);
-            return 0;
-          }
-          sprintf(pBueffel,"%s.field = %f Tesla",argv[0],fVal);
-          SCWrite(pCon,pBueffel,eValue);
-          return 1;
-       }     
-/*----------- current */
-        else if(strcmp(argv[1],"current") == 0)
-        {
-          iRet = BrukerReadCurrent(self,&fVal);
-          if(!iRet)
-          {
-            strcpy(pBueffel,"ERROR: ");
-            self->pDriv->GetError(self->pDriv,&iMode,pBueffel+7,240);
-            SCWrite(pCon,pBueffel,eError);
-            return 0;
-          }
-          sprintf(pBueffel,"%s.current = %f A",argv[0],fVal);
-          SCWrite(pCon,pBueffel,eValue);
-          return 1;
-        }        
-/*--------- list */
-        else if(strcmp(argv[1],"list") == 0)
-        {
-            /* print generals first */
-            EVControlWrapper(pCon,pSics,pData,argc,argv);
-            /* print our add on stuff */
-            iRet = BrukerReadCurrent(self,&fVal);
-            if(!iRet)
-            {
-              strcpy(pBueffel,"ERROR: ");
-              self->pDriv->GetError(self->pDriv,&iMode,pBueffel+7,240);
-              SCWrite(pCon,pBueffel,eError);
-            }
-            else
-            {
-              sprintf(pBueffel,"%s.current = %f A",argv[0],fVal);
-              SCWrite(pCon,pBueffel,eValue);
-            }
-            iRet = BrukerReadField(self,&fVal);
-            if(!iRet)
-            {
-              strcpy(pBueffel,"ERROR: ");
-              self->pDriv->GetError(self->pDriv,&iMode,pBueffel+7,240);
-              SCWrite(pCon,pBueffel,eError);
-            }
-            else
-            {
-               sprintf(pBueffel,"%s.field = %f Tesla",argv[0],fVal);
-               SCWrite(pCon,pBueffel,eValue);
-            }            
-            if(pMe->iMode == FIELD)
-            {
-               sprintf(pBueffel,"%s.mode = field",argv[0]);
-            }
-            else if (pMe->iMode == CURRENT)
-            {
-               sprintf(pBueffel,"%s.mode = current",argv[0]);
-            }
-            else
-            {
-              sprintf(pBueffel,"ERROR: Programming error");
-            }
-            SCWrite(pCon,pBueffel,eValue);
-            iRet = BrukerGetPolarity(self,pCon,&iMode);
-            if(iRet)
-            {
-               if(iMode == PPLUS)
-               {
-                 sprintf(pBueffel,"%s.polarity = plus",argv[0]);
-               }
-               else if (iMode == PMINUS)
-               {
-                 sprintf(pBueffel,"%s.polarity = minus",argv[0]);
-               }
-               else if(iMode == PBUSY)
-               {
-                 sprintf(pBueffel,"%s.polarity = busy",argv[0]);
-               }
-               else
-               {
-                 sprintf(pBueffel,"ERROR: Programming problem");
-               }
-               SCWrite(pCon,pBueffel,eValue);
-            }
-            else
-            {
-              SCWrite(pCon,"ERROR: cannot read polarity",eError);
-            }
-            return 1;   
-        }    
-        else
-        {
-           return EVControlWrapper(pCon,pSics,pData,argc,argv);
-        }      
-     }     
-     return EVControlWrapper(pCon,pSics,pData,argc,argv); 
-  }
diff --git a/bruker.h b/bruker.h
deleted file mode 100644
index bfa26a29..00000000
--- a/bruker.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*-------------------------------------------------------------------------
-                       B r u k e r
-                      
-    An environment control driver and an additonal wrapper function for
-    controlling a Bruker B-EC-1 magnet controller. This controller can 
-    either control a current or control the current through an external hall 
-    sensor mesuring the magnetic field. In both cases both values: the field 
-    and the current must be readable.
-    
-    copyright: see copyright.h
-    
-    Mark Koennecke, October 1998                   
----------------------------------------------------------------------------*/
-#ifndef BRUKERMAGNET
-#define BRUKERMAGNET
-
-    pEVDriver CreateBrukerDriver(int argc, char *argv[]);
-    
-    int BrukerReadField(pEVControl self, float *fField);
-    int BrukerReadCurrent(pEVControl self, float *fCurrent);
-    
-    int BrukerAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-                     int argc, char *argv[]);
-    
-#endif    
diff --git a/bruker.w b/bruker.w
deleted file mode 100644
index 2a96bcb9..00000000
--- a/bruker.w
+++ /dev/null
@@ -1,64 +0,0 @@
-\subsubsection{Bruker Magnet Controller B-EC-1}
-SANS is using a Bruker magnet controller. This controller is integrated
-into SICS as a derivate of an environment controller.  The Bruker controller 
-can be operated in two modes: in the first the  current is controlled,
-in the  second the current
-is controlled by an external hall sensor giving the magnetic field. Whatever
-is the controlling sensor, the magnetic field and the current need to be
-read. Furthermore this device supports switching the polarity. All this is
-achieved with a special driver and an additional wrapper function for
-handling extra commands. All this is implemented in the file bruker.h
-and bruker.c. The functions defined are:
-
-\begin{verbatim}
-    pEVDriver CreateBrukerDriver(int argc, char *argv[]);
-    
-    int BrukerReadField(pEVControl self, float *fField);
-    int BrukerReadCurrent(pEVControl self, float *fCurrent);
-    
-    int BrukerAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-                     int argc, char *argv[]);
-  
-\end{verbatim}
-
-\begin{description}
-\item[CreateBrukerDriver] creates a driver for the bruker magnet
-controller.
-\item[BrukerReadField] reads the current magnetic field.
-\item[BrukerReadCurrent] reads the current current in Ampere.
-\item[BrukerAction] a special SICS interpreter wrapper function  for
-the Bruker Magnet. This function handles the few special Bruker
-commands and passes everything else to the standard environment
-controller handler function. 
-\end{description}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/buffer.c b/buffer.c
deleted file mode 100644
index 998d1b39..00000000
--- a/buffer.c
+++ /dev/null
@@ -1,584 +0,0 @@
-/*--------------------------------------------------------------------------
- 		   L N S   R \"U N B U F F E R
- 		   
-
-	Mark Koennecke,    January 1997
-
-	Copyright:
-
-	Labor fuer Neutronenstreuung
-	Paul Scherrer Institut
-	CH-5423 Villigen-PSI
-
-
-        The authors hereby grant permission to use, copy, modify, distribute,
-        and license this software and its documentation for any purpose, provided
-        that existing copyright notices are retained in all copies and that this
-        notice is included verbatim in any distributions. No written agreement,
-        license, or royalty fee is required for any of the authorized uses.
-        Modifications to this software may be copyrighted by their authors
-        and need not follow the licensing terms described here, provided that
-        the new terms are clearly indicated on the first page of each file where
-        they apply.
-
-        IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-        FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-        ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-        DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-        POSSIBILITY OF SUCH DAMAGE.
-
-        THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-        INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-        IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-        NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-        MODIFICATIONS.
-----------------------------------------------------------------------------*/
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <tcl.h>
-#include "fortify.h"
-#include "lld.h"
-#include "lld_blob.h"
-#include "lld_str.h"
-#include "conman.h"
-#include "obdes.h"
-#include "buffer.h"
-#include "fupa.h"
-#include "splitter.h"
-#include "ruli.h"
-/*-------------------------------------------------------------------------*/
-  static int SaveBuffer(void *pData, char *name, FILE *fd)
-  {
-     pRuenBuffer self = NULL;
-     int iRet;
-     char *pPtr = NULL;
-    
-     assert(fd);
-     assert(pData);
-    
-     self = (pRuenBuffer)pData;
-     fprintf(fd,"#  RuenBuffer %s\n",name);
-     fprintf(fd,"Buf new %s\n",name); 
-     iRet = LLDnodePtr2First(self->iLineList);
-     while(iRet != 0)
-     {
-        pPtr = (char *)LLDnodePtr(self->iLineList);
-        fprintf(fd,"%s append %s\n",name,pPtr);
-        iRet = LLDnodePtr2Next(self->iLineList);
-     }
-     return 1;
-  }
-
-/*--------------------------------------------------------------------------*/
-  pRuenBuffer CreateRuenBuffer(char *name)
-  {
-     pRuenBuffer pNew = NULL;
-     
-     pNew = (pRuenBuffer)malloc(sizeof(RuenBuffer));
-     if(!pNew)
-     {
-       return NULL;
-     }
-     pNew->pDes = CreateDescriptor("SicsRuenBuffer");
-     if(!pNew->pDes)
-     {
-       free(pNew);
-       return NULL;
-     }
-     
-     pNew->name = strdup(name);
-     Fortify_CheckAllMemory();
-     pNew->iLineList = LLDblobCreate();
-     if(pNew->iLineList == -1)
-     {
-       DeleteDescriptor(pNew->pDes);
-       free(pNew->name);
-       free(pNew);
-       return NULL;
-     }
-     pNew->pDes->SaveStatus = SaveBuffer;
-     return pNew;
-  }
-/*--------------------------------------------------------------------------*/
-  static void DeleteLineBuffer(int iList)
-  {
-    int iRet;
-    char *pPtr;
-    
-    iRet = LLDnodePtr2First(iList);
-    while(iRet != 0)
-    {
-      pPtr = (char *)LLDnodePtr(iList);
-      free(pPtr);
-      iRet = LLDnodePtr2Next(iList);
-    }
-    LLDdelete(iList);
-  }
-/*-------------------------------------------------------------------------*/  
-  void DeleteRuenBuffer(void *self)
-  {
-    int iRet;
-    pRuenBuffer pOld = (pRuenBuffer)self;
-    
-    assert(pOld);
-    /* delete line buffer */
-    DeleteLineBuffer(pOld->iLineList);
-    if(pOld->name)
-    {
-      free(pOld->name);
-    }
-    if(pOld->pDes)
-    {
-      DeleteDescriptor(pOld->pDes);
-    }
-    free(pOld);
-  }
-/*--------------------------------------------------------------------------*/
- pRuenBuffer CopyRuenBuffer(pRuenBuffer pOld, char *name)
- {
-   pRuenBuffer pNew = NULL;
-   int iRet;
-   char *pPtr;
-   
-   pNew = CreateRuenBuffer(name);
-   if(!pNew)
-   {
-     return NULL;
-   }
-
-   /* copy list*/
-   iRet = LLDnodePtr2First(pOld->iLineList);
-   while(iRet != 0)
-   {
-      pPtr = (char *)LLDnodePtr(pOld->iLineList);
-      LLDstringAdd(pNew->iLineList,pPtr);
-      iRet = LLDnodePtr2Next(pOld->iLineList);
-   }
-   return pNew; 
- }
-/*-------------------------------------------------------------------------*/
-  int BufferAppendLine(pRuenBuffer self, char *line)
-  {
-     assert(self);
-     
-     return LLDstringAppend(self->iLineList,line);
-  }
-/*------------------------------------------------------------------------*/
-  int BufferDel(pRuenBuffer self, int i)
-  {
-    int iNum;
-    int iRet;
- 
-    assert(self);
-    
-    iRet = LLDnodePtr2First(self->iLineList);
-    iNum = 0;
-    while(iRet != 0)
-    {
-       if(iNum == i)
-       {
-         LLDstringDelete(self->iLineList);
-         return 1;
-       }
-       iNum++;
-       iRet = LLDnodePtr2Next(self->iLineList);
-    }
-    return 0;
-  }
-/*------------------------------------------------------------------------*/
-  int BufferInsertAfter(pRuenBuffer self, int i, char *line)
-  {
-    int iNum;
-    int iRet;
- 
-    assert(self);
-    
-    iRet = LLDnodePtr2First(self->iLineList);
-    iNum = 0;
-    while(iRet != 0)
-    {
-       if(iNum == i)
-       {
-         LLDstringInsert(self->iLineList, line);
-         return 1;
-       }
-       iNum++;
-       iRet = LLDnodePtr2Next(self->iLineList);
-    }
-    return 0;
-  }
-/*------------------------------------------------------------------------*/
-  int BufferPrint(pRuenBuffer self, SConnection *pCon)
-  {
-   int iRet;
-   char *pPtr = NULL;
-   char pBueffel[512];
-   int iCount = 1;
-
-   iRet = LLDnodePtr2First(self->iLineList);
-   sprintf(pBueffel,"Listing for Bueffer %s",self->name);
-   SCWrite(pCon,pBueffel,eValue);
-   while(iRet != 0)
-   {
-      pPtr = (char *)LLDnodePtr(self->iLineList);
-      sprintf(pBueffel,"[%d] %s",iCount,pPtr);
-      SCWrite(pCon,pBueffel,eValue);
-      iRet = LLDnodePtr2Next(self->iLineList);
-      iCount++;
-   }
-   return 1; 
-  }    
-
-/*------------------------------------------------------------------------*/
-  extern char *StrReplace(char *str, char *old, char *pNew);
-  /* realised in Strrepl.c
-  */
-  
-  int BufferReplace(pRuenBuffer self, char *pattern, char *pReplace)
-  {
-   int iRet;
-   char *pPtr = NULL;
-   char pBueffel[1024];
-   char *pRet;
-
-   iRet = LLDnodePtr2First(self->iLineList);
-   while(iRet != 0)
-   {
-      pPtr = (char *)LLDnodePtr(self->iLineList);
-      strcpy(pBueffel,pPtr);
-      pRet = NULL;
-      pRet = StrReplace(pBueffel,pattern,pReplace);
-      if(pRet)
-      {
-        LLDstringDelete(self->iLineList);
-        iRet = LLDnodePtr2Next(self->iLineList);
-        LLDnodePtr2Prev(self->iLineList);
-        if(iRet)
-        {
-          LLDstringInsert(self->iLineList,pBueffel);
-        }
-        else
-        {
-          LLDstringAppend(self->iLineList,pBueffel);
-        }
-      }
-         iRet = LLDnodePtr2Next(self->iLineList);
-   }
-   return 1; 
-  }    
-/*-----------------------------------------------------------------------*/
-   int BufferRun(pRuenBuffer self, SConnection *pCon, SicsInterp *pSics)
-   {
-     int iRet;
-     char *pPtr = NULL;
-     int iInt, iRes;
-     
-     iRes = 1;
-     iRet = LLDnodePtr2First(self->iLineList);
-     while(iRet != 0)
-     {
-        pPtr = (char *)LLDnodePtr(self->iLineList);
-        iInt = InterpExecute(pSics,pCon,pPtr);
-        if(!iInt)
-        {
-          iRes = 0;
-        }
-        iRet = LLDnodePtr2Next(self->iLineList);
-     }
-     return iRes;
-   }  
-/*------------------------------------------------------------------------*/
-   int BufferSave(pRuenBuffer self, char *file)
-   {
-     int iRet;
-     char *pPtr = NULL;
-     FILE *fd = NULL;
-
-     fd = fopen(file,"w");
-     if(fd == NULL)
-     {
-       return 0;
-     }       
-     iRet = LLDnodePtr2First(self->iLineList);
-     while(iRet != 0)
-     {
-        pPtr = (char *)LLDnodePtr(self->iLineList);
-        fprintf(fd,"%s\n",pPtr);
-        iRet = LLDnodePtr2Next(self->iLineList);
-     }
-     fclose(fd);
-     return 1;
-   }   
-/*------------------------------------------------------------------------*/
-   int BufferLoad(pRuenBuffer self, char *file)
-   {
-     int iRet;
-     char *pPtr = NULL;
-     FILE *fd = NULL;
-     char pBueffel[256];
-
-     fd = fopen(file,"r");
-     if(fd == NULL)
-     {
-       return 0;
-     }       
-     
-     pPtr = fgets(pBueffel,255,fd);
-     while(pPtr != NULL)
-     {
-        LLDstringAppend(self->iLineList,pBueffel);
-        pPtr = fgets(pBueffel,255,fd);
-     }
-     
-     fclose(fd);
-     return 1;
-   }   
-   
-/*------------------------------------------------------------------------*/
-  pRuenBuffer FindRuenBuffer(SicsInterp *pSics, char *name)
-  {
-    pRuenBuffer pBuf = NULL;
-    CommandList *pCom = NULL;
-    
-    pCom = FindCommand(pSics,name);
-    if(!pCom)
-    {
-      return NULL;
-    }
-    pBuf = (pRuenBuffer)pCom->pData;
-    if(!pBuf)
-    {
-      return NULL;
-    }
-    if(!pBuf->pDes)
-    {
-      return NULL;
-    }
-    if(strcmp(pBuf->pDes->name,"SicsRuenBuffer") != 0)
-    {
-      return NULL;
-    }
-    return pBuf;
-  }    
-/*-------------------------------------------------------------------------*/
- int InitBufferSys(SConnection *pCon, SicsInterp *pSics, void *pData,
-                   int argc, char *argv[])
- {
-     pRuenStack pStack = NULL;
-
-     pStack = CreateRuenStack();
-     if(!pStack)
-     {
-       SCWrite(pCon,"ERROR: No memory to create Ruen-Stack",eError);
-       return 0;
-     }
-     AddCommand(pSics,"Buf",BufferCommand,NULL,NULL);
-     AddCommand(pSics,"Stack",RuenStackAction,DeleteRuenStack,pStack);
-     return 1;
- } 
-/*------------------------------------------------------------------------*/
- int BufferCommand(SConnection *pCon, SicsInterp *pSics, void *pData,
-                   int argc, char *argv[])
- {
-   int iRet, iRet2;
-   char pBueffel[512];
-   char **argx;
-   FuPaResult PaRes;
-   pRuenBuffer pBuf = NULL;
-   FuncTemplate BufferTemplate[] = {
-                                      {"new",1,{FUPATEXT} },
-                                      {"del",1,{FUPATEXT} },
-                                      {"copy",2,{FUPATEXT, FUPATEXT}},
-                                      };
-
-   assert(pCon);
-   assert(pSics); 
-  
-   /* minimum user to use this */
-   if(!SCMatchRights(pCon,usUser))
-   {
-         return 0;
-    }                                 
-                                                                                    /* parse function args */
-   argtolower(argc,argv);
-   argx = &argv[1];
-   iRet = EvaluateFuPa((pFuncTemplate)&BufferTemplate,3,argc-1,argx,&PaRes);
-   if(iRet < 0)
-   {
-      sprintf(pBueffel,"%s",PaRes.pError);
-      SCWrite(pCon,pBueffel,eError);
-      return 0;
-   }
-   
-   switch(iRet)
-   {
-     case 0: /* new */
-             pBuf = CreateRuenBuffer(PaRes.Arg[0].text);
-             if(!pBuf)
-             {
-               SCWrite(pCon, "ERROR: Out of memory allocating buffer",eError);
-               return 0;
-             }
-             iRet2 = AddCommand(pSics,pBuf->name,BufferAction,DeleteRuenBuffer,
-                        (void *)pBuf);
-             if(!iRet2)
-             {
-                sprintf(pBueffel,"ERROR: duplicate command %s not created",pBuf->name);
-                SCWrite(pCon,pBueffel,eError);
-                DeleteRuenBuffer((void *)pBuf);
-                return 0;
-             }
-             return 1;
-             break;
-     case 1: /* del */
-             return RemoveCommand(pSics,PaRes.Arg[0].text);
-             break;
-     case 2: /* copy */
-             pBuf = FindRuenBuffer(pSics,PaRes.Arg[0].text);
-             if(!pBuf)
-             {
-               sprintf(pBueffel,"ERROR: Buffer %s not found",
-                       PaRes.Arg[0].text);
-               SCWrite(pCon,pBueffel,eError);
-               return 0;
-             }
-             pBuf = CopyRuenBuffer(pBuf,PaRes.Arg[1].text);
-             if(!pBuf)
-             {
-               sprintf(pBueffel,"ERROR: creating buffer %s ",
-                       PaRes.Arg[1].text);
-               SCWrite(pCon,pBueffel,eError);
-               return 0;
-             }
-             iRet2 = AddCommand(pSics,pBuf->name,BufferAction,DeleteRuenBuffer,
-                        (void *)pBuf);
-             if(!iRet2)
-             {
-                sprintf(pBueffel,"ERROR: duplicate command %s not created",pBuf->name);
-                SCWrite(pCon,pBueffel,eError);
-                DeleteRuenBuffer((void *)pBuf);
-                return 0;
-             }
-
-             return 1;
-             break;
-     default:
-             assert(0);
-             break;       
-             
-   }
-   assert(0);
- }
-/*-------------------------------------------------------------------------*/
- int BufferAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-                   int argc, char *argv[])
- {
-   int iRet, iRet2;
-   char pBueffel[512];
-   char **argx;
-   FuPaResult PaRes;
-   pRuenBuffer pBuf = NULL;
-   FuncTemplate BufferTemplate[] = {
-                                      {"append",0,{FUPATEXT} },
-                                      {"del",1,{FUPAINT} },
-                                      {"ins",1,{FUPAINT}},
-                                      {"save",1,{FUPATEXT}},
-                                      {"load",1,{FUPATEXT}},
-                                      {"subst",2,{FUPATEXT,FUPATEXT}},
-                                      {"print",0,{0,0}},
-                                      {"run",0,{0,0}},
-                                      NULL
-                                    };
-
-   assert(pCon);
-   assert(pSics); 
-   pBuf = (pRuenBuffer)pData;
-   assert(pBuf);
-    
-                                      
-    /* You need to be user in order to do this */
-    if(!SCMatchRights(pCon,usUser))
-    {
-         return 0;
-    }                                                                                                      
-   /* parse function args */
-   argx = &argv[1];
-   strtolower(argx[0]);
-   iRet = EvaluateFuPa((pFuncTemplate)&BufferTemplate,8,argc-1,argx,&PaRes);
-   if(iRet < 0)
-   {
-      sprintf(pBueffel,"%s",PaRes.pError);
-      SCWrite(pCon,pBueffel,eError);
-      return 0;
-   }
-   
-   switch(iRet)
-   {
-     case 0: /* append */
-             argx = &argv[2];
-             Arg2Text(argc-2,argx,pBueffel,511);
-             BufferAppendLine(pBuf,pBueffel);
-             SCSendOK(pCon);
-             return 1;
-             break;
-     case 1: /* del */
-             iRet2 = BufferDel(pBuf,PaRes.Arg[0].iVal);
-             if(iRet2)
-               SCSendOK(pCon);
-             break;
-     case 2: /* ins */
-             argx = &argv[3];
-             Arg2Text(argc-3,argx,pBueffel,511);
-             iRet2 = BufferInsertAfter(pBuf,PaRes.Arg[0].iVal,pBueffel);
-             if(iRet2)
-                SCSendOK(pCon);
-             return iRet2;   
-             break;
-     case 3: /* save */
-             iRet2 = BufferSave(pBuf,PaRes.Arg[0].text);
-             if(!iRet2)
-             {
-               sprintf(pBueffel,"ERROR: cannot open %s for writing",
-                       PaRes.Arg[0].text);
-               SCWrite(pCon,pBueffel,eError);
-               return 0;
-             }
-             else
-             {
-               SCSendOK(pCon);
-               return 1;
-             }
-             break;
-     case 4: /* load */
-             iRet2 = BufferLoad(pBuf,PaRes.Arg[0].text);
-             if(!iRet2)
-             {
-               sprintf(pBueffel,"ERROR: cannot open %s for reading ",
-                       PaRes.Arg[0].text);
-               SCWrite(pCon,pBueffel,eError);
-               return 0;
-             }
-             else
-             {
-               SCSendOK(pCon);
-               return 1;
-             }
-             break;
-     case 5: /* subst */
-             iRet2 = BufferReplace(pBuf,PaRes.Arg[0].text,PaRes.Arg[1].text);
-             if(iRet2)
-                SCSendOK(pCon);
-             break;
-     case 6: /* print */
-             return BufferPrint(pBuf,pCon);
-             break; 
-     case 7: /* run */
-             return BufferRun(pBuf,pCon,pSics);                      
-     default:
-            assert(0);                   
-   }
-   return 1;
- }
-
diff --git a/buffer.h b/buffer.h
deleted file mode 100644
index 785c487b..00000000
--- a/buffer.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*---------------------------------------------------------------------------
-
-		T H E   L N S    R \" U N B U F F E R
-		
-	The LNS has devised a special scheme to operate an instrument
-	via R\"un sequeneces and buffers. A R\"unbuffer is a series of
-	commands which are collected in a buffer. This buffer is
-	implemented here. A buffer can be added to, printed loaded from 
-	a file etc. and can be executed. 
-	
-	The next schem is the R\"unlist which is a stack of R\"unbuffers.
-	That list can be exeuted as well. It gets a buffer from the 
-	bottom of the stack and executes it and does so until the stack
-	is empty. While this is happening you are able to add other
-	buffers to the top of the stack. This schem is implemented in module
-	ruli.
-	
-	So, here is all necessary to deal with an individual buffer.
-	For Lists A. Reitsma's lld package will be used. This package
-	identifies a list by an integer handle.
-	
-	Mark Koennecke, January 1996
-	
-	copyright: see implementation file
-----------------------------------------------------------------------------*/
-#ifndef RUENBUFFER
-#define RUENBUFFER
-
-  typedef struct {
-                   pObjectDescriptor pDes; /* needed */
-                   char *name;             /* BufferName */
-                   int iLineList;          /* Handle to the Line List */
-                   } RuenBuffer, *pRuenBuffer;
-                 
-/*--------------------- live & death ----------------------------------- */  
-  pRuenBuffer CreateRuenBuffer(char *name);
-  void        DeleteRuenBuffer(void *pSelf);
-  pRuenBuffer CopyRuenBuffer(pRuenBuffer pOld, char *NewName);
-  
-/*--------------------- operations --------------------------------------*/
-
- int BufferAppendLine(pRuenBuffer self, char *line);
- int BufferDel(pRuenBuffer self, int iLine);
- /*
-    deletes line iLine from the RuenBuffer self
- 
--------------------------------------------------------------------------*/ 
- int BufferInsertAfter(pRuenBuffer self, int iLine, char *line);
- /*
-    inserts line line AFTER line number iLine in the RuenBuffer self
-------------------------------------------------------------------------- */
- int BufferPrint(pRuenBuffer self, SConnection *pCon);
- /* 
-   lists the contents of the RuenBuffer on the Connection pCon
------------------------------------------------------------------------- */ 
- int BufferReplace(pRuenBuffer self, char *pattern, char *pReplace);
- /*
-   replaces all occurences of the string pattern in the whole RuenBuffer
-   by the replacement string pReplace.
-------------------------------------------------------------------------- */  
- int BufferRun(pRuenBuffer self, SConnection *pCon, SicsInterp *pSics);
- /*
-    executes the lines of the Ruenbuffer one by one. 
-    Returns 1 on success, 0 on error.
-------------------------------------------------------------------------- */   
- int BufferSave(pRuenBuffer self, char *file);
- /*
-   writes the contents of Ruenbuffer self to the file specified by
-   file. 
-    Returns 1 on success, 0 on error.
---------------------------------------------------------------------------*/   
- int BufferLoad(pRuenBuffer self, char *file);  
- /*
-   reads the contents of file into the RuenBuffer self. 
-    Returns 1 on success, 0 on error.
-  */   
-/* ------------------------ object functions ----------------------------*/
-  int InitBufferSys(SConnection *pCon, SicsInterp *pSics, void *pData,
-                    int argc, char *argv[]);
-  int BufferCommand(SConnection *pCon, SicsInterp *pSics, void *pData,
-                    int argc, char *argv[]);
-  int BufferAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-                    int argc, char *argv[]);
-                                       
-/* ----------------------- utility --------------------------------------*/
-  pRuenBuffer FindRuenBuffer(SicsInterp *pSics, char *name);
-   /*
-      similar to FindCommand in SCinter.h. But checks the object found if
-      it is a RuenBuffer.
-      Returns NULL if no RuenBuffer with this name could be found.
-      Returns a pointer to the RuenBuffer, when a RuenBuffer of this
-      name could be found in the interpreter pSics
-----------------------------------------------------------------------------*/      
-#endif	
diff --git a/choco.c b/choco.c
index f8902f00..c4db12ab 100644
--- a/choco.c
+++ b/choco.c
@@ -12,6 +12,7 @@
 #include <assert.h>
 #include "fortify.h"
 #include "sics.h"
+#include "site.h"
 #define CHOCOINTERNAL
 #include "choco.h"
 
@@ -174,9 +175,6 @@
 */
 
 extern pCodri MakeSimChopper(void);
-extern pCodri MakeDoChoDriver(char *pHost, int iPort, int iChannel, 
-                              int iSingle);
-extern pCodri MakeCookerDriver(char *pHost, int iPort, int iChannel);
 /*-----------------------------------------------------------------------*/
   int ChocoFactory(SConnection *pCon, SicsInterp *pSics, void *pData,
                   int argc, char *argv[])
@@ -187,6 +185,7 @@ extern pCodri MakeCookerDriver(char *pHost, int iPort, int iChannel);
       char pBueffel[132];
       int iRet, iPort, iChannel;
       int iSingle = 0;
+      pSite site = NULL;
 
       if(argc < 3)
       {
@@ -206,78 +205,20 @@ extern pCodri MakeCookerDriver(char *pHost, int iPort, int iChannel);
       {
         pDriv = MakeSimChopper();
       }
-      else if(strcmp(argv[2],"docho") == 0)
-      {
-         if(argc < 6)
-	 {
-           SCWrite(pCon,
-  "ERROR: Insufficient number of arguments to install Dornier Chopper driver",
-           eError);
-           return 0;    
-         }
-         iRet = Tcl_GetInt(pSics->pTcl,argv[4],&iPort);
-         if(iRet != TCL_OK)
-	 {
-           sprintf(pBueffel,"ERROR: expected integer as port number, got %s",
-                   argv[4]);
-           SCWrite(pCon,pBueffel,eError);
-           return 0;
-         }
-         iRet = Tcl_GetInt(pSics->pTcl,argv[5],&iChannel);
-         if(iRet != TCL_OK)
-	 {
-           sprintf(pBueffel,"ERROR: expected integer as channel number, got %s",
-                   argv[4]);
-           SCWrite(pCon,pBueffel,eError);
-           return 0;
-         }
-         if(argc > 6)
-         {
-           iRet = Tcl_GetInt(pSics->pTcl,argv[6],&iSingle);
-           if(iRet != TCL_OK)
-	   {
-              sprintf(pBueffel,
-                 "ERROR: expected integer as single flag, got %s",
-                  argv[6]);
-              SCWrite(pCon,pBueffel,eError);
-              return 0;
-           }
-         }
-         pDriv = MakeDoChoDriver(argv[3],iPort,iChannel,iSingle);
-      }
-      else if(strcmp(argv[2],"sanscook") == 0)
-      {
-         if(argc < 6)
-	 {
-           SCWrite(pCon,
-  "ERROR: Insufficient number of arguments to install SANS Cooker driver",
-           eError);
-           return 0;    
-         }
-         iRet = Tcl_GetInt(pSics->pTcl,argv[4],&iPort);
-         if(iRet != TCL_OK)
-	 {
-           sprintf(pBueffel,"ERROR: expected integer as port number, got %s",
-                   argv[4]);
-           SCWrite(pCon,pBueffel,eError);
-           return 0;
-         }
-         iRet = Tcl_GetInt(pSics->pTcl,argv[5],&iChannel);
-         if(iRet != TCL_OK)
-	 {
-           sprintf(pBueffel,"ERROR: expected integer as channel number, got %s",
-                   argv[4]);
-           SCWrite(pCon,pBueffel,eError);
-           return 0;
-         }
-         pDriv = MakeCookerDriver(argv[3],iPort,iChannel);
-      }
       else
       {
-        sprintf(pBueffel,"ERROR: Driver %s NOT supported for MakeController",
+	site = getSite();
+	if(site != NULL){
+	  pDriv = site->CreateControllerDriver(pCon,argc-2,&argv[2]);
+	} else {
+	  pDriv = NULL;
+	}
+	if(pDriv == NULL){
+	  sprintf(pBueffel,"ERROR: Driver %s NOT supported for MakeController",
                 argv[2]);
-        SCWrite(pCon,pBueffel,eError);
-        return 0;
+	  SCWrite(pCon,pBueffel,eError);
+	  return 0;
+	}
       }
       if( (pNew == NULL) || (pDes == NULL) || (pDriv == NULL) )
       {
diff --git a/countdriv.c b/countdriv.c
index bf421fa0..1bbe47f5 100644
--- a/countdriv.c
+++ b/countdriv.c
@@ -43,9 +43,6 @@
 #include <string.h>
 #include "sics.h"
 #include "countdriv.h"
-#include "hardsup/sinq_prototypes.h"
-#include "hardsup/el737_def.h"
-#include "hardsup/el737fix.h"
 
 /*-------------------------------------------------------------------------*/
    pCounterDriver CreateCounterDriver(char *name, char *type)
@@ -92,661 +89,13 @@
     }
     if(self->pData)
     {
-      free(self->pData);
+      if(self->KillPrivate != NULL)
+      {
+        self->KillPrivate(self);
+      } else {
+	free(self->pData);
+      }
     }
     free(self);
   }  
-/*----------------------------- EL737 ------------------------------------*/
-   typedef struct {
-                   char *host;
-                   int iPort;
-                   int iChannel;
-                   void *pData;
-                   int finishCount;
-                   } EL737st;
-/*------------------------------------------------------------------------*/
-  static int EL737GetStatus(struct __COUNTER *self, float *fControl)
-  {
-    int iRet;
-    int iC1, iC2, iC3,iC4,iRS;
-    float fTime;
-    EL737st *pEL737;
-    
-    assert(self);
-    pEL737 = (EL737st *)self->pData;
-    assert(pEL737);
-    iRet = EL737_GetStatus(&pEL737->pData,&iC1,&iC2,&iC3,&iC4,&fTime,&iRS);
-    if(self->eMode == eTimer)
-    {
-      *fControl = fTime;
-    }
-    else
-    {
-      *fControl = iC1;
-    }
-    /* store time */
-    self->fTime = fTime;
-    
-    if(iRet != 1)
-    {
-      return HWFault;
-    }
-    self->lCounts[0] = iC2;
-    self->lCounts[1] = iC1;
-    self->lCounts[2] = iC3;
-    self->lCounts[3] = iC4;
-    
-    /* get extra counters for 8-fold counter boxes */
-    iRet = EL737_GetStatusExtra(&pEL737->pData,&iC1,&iC2,&iC3,&iC4);
-    self->lCounts[4] = iC1;
-    self->lCounts[5] = iC2;
-    self->lCounts[6] = iC3;
-    self->lCounts[7] = iC4;
-    if(iRS == 0)
-    {
-      pEL737->finishCount++;
-      if(pEL737->finishCount >= 2)
-      {
-	return HWIdle;
-      }
-      else
-      {
-	return HWBusy;
-      }
-    }
-    else if((iRS == 1) || (iRS == 2)) 
-    {
-      pEL737->finishCount = 0;
-      return HWBusy;
-    }
-    else if( (iRS == 5) || (iRS == 6))
-    {
-      pEL737->finishCount = 0;
-      return HWNoBeam;
-    }
-    else
-    {
-      pEL737->finishCount = 0;
-      return HWPause;
-    }
-  }
-#ifdef NONINTF
-  extern float nintf(float f);
-#endif    
-/*-------------------------------------------------------------------------*/
-  static int EL737Start(struct __COUNTER *self)
-  {
-    int iRet, iRS;
-    EL737st *pEL737;
-    
-    assert(self);
-    pEL737 = (EL737st *)self->pData;
-    assert(pEL737);
-    
-    
-    self->fTime = 0.;
-    
-    if(self->eMode == ePreset)
-    {
-      iRet = EL737_StartCnt(&pEL737->pData,(int)nintf(self->fPreset),&iRS);
-      if(iRet == 1)
-      {
-	pEL737->finishCount = 0;
-        return OKOK;
-      }
-      else
-      { 
-        return HWFault;
-      }
-    }
-    else if(self->eMode == eTimer)
-    {
-       iRet = EL737_StartTime(&pEL737->pData,self->fPreset,&iRS);
-       if(iRet == 1)
-       {
-	 pEL737->finishCount = 0;
-         return OKOK;
-       }
-       else
-       {
-         return HWFault;
-       }
-    }
-    return 0;
-  }
-/*-------------------------------------------------------------------------*/
-  static int EL737Pause(struct __COUNTER *self)
-  {
-    int iRet, iRS;
-    EL737st *pEL737;
-    
-    assert(self);
-    pEL737 = (EL737st *)self->pData;
-    assert(pEL737);
-    
-    
-      iRet = EL737_Pause(&pEL737->pData,&iRS);
-      if(iRet == 1)
-      {
-        return OKOK;
-      }
-      else
-      { 
-        return HWFault;
-      }
-      return 0;
-  }
-/*-------------------------------------------------------------------------*/
-  static int EL737Continue(struct __COUNTER *self)
-  {
-    int iRet, iRS;
-    EL737st *pEL737;
-    
-    assert(self);
-    pEL737 = (EL737st *)self->pData;
-    assert(pEL737);
-    
-    
-      iRet = EL737_Continue(&pEL737->pData,&iRS);
-      if(iRet == 1)
-      {
-        return OKOK;
-      }
-      else
-      { 
-        return HWFault;
-      }
-      return 0;
-  }
-/*--------------------------------------------------------------------------*/
-  static int EL737Halt(struct __COUNTER *self)
-  {
-    int iRet, iC1, iC2, iC3, iC4,iRS;
-    float fPreset;
-    EL737st *pEL737;
-    
-    assert(self);
-    pEL737 = (EL737st *)self->pData;
-    assert(pEL737);
-    
-    
-    
-    iRet = EL737_Stop(&pEL737->pData,&iC1, &iC2,&iC3,&iC4,&fPreset,&iRS);
-    if(iRet == 1)
-    {
-      self->lCounts[0] = iC2;
-      self->lCounts[1] = iC1;
-      self->lCounts[2] = iC3;
-      self->lCounts[3] = iC4;
-      return OKOK;
-    }
-    return HWFault;
-  }  
-/*--------------------------------------------------------------------------*/
-  static int EL737ReadValues(struct __COUNTER *self)
-  {
-    int iRet;
-    int iC1, iC2, iC3,iC4,iRS;
-    float fTime;
-    EL737st *pEL737;
-    
-    assert(self);
-    pEL737 = (EL737st *)self->pData;
-    assert(pEL737);
-    
-    
-    iRet = EL737_GetStatus(&pEL737->pData,&iC1,&iC2,&iC3,&iC4,&fTime,&iRS);
-    if(iRet != 1)
-    {
-      return HWFault;
-    }
-    self->fTime = fTime;
-    
-    self->lCounts[0] = iC2;
-    self->lCounts[1] = iC1;
-    self->lCounts[2] = iC3;
-    self->lCounts[3] = iC4;
-    /* get extra counters for 8-fold counter boxes */
-    iRet = EL737_GetStatusExtra(&pEL737->pData,&iC1,&iC2,&iC3,&iC4);
-    self->lCounts[4] = iC1;
-    self->lCounts[5] = iC2;
-    self->lCounts[6] = iC3;
-    self->lCounts[7] = iC4;
-
-     return OKOK;
-  }
-/*---------------------------------------------------------------------------
-
-	EL737Error2Text converts between an EL734 error code to text
------------------------------------------------------------------------------*/
-	static void EL737Error2Text(char *pBuffer, int iErr)
-	{
-		switch(iErr)
-		{
-			case EL737__BAD_ADR:
-				strcpy(pBuffer,"EL737__BAD_ADR");
-				break;
-			case EL737__BAD_OVFL:
-				strcpy(pBuffer,"EL737__BAD_OVFL");
-				break;
-			case EL737__BAD_BSY:
-				strcpy(pBuffer,"EL737__BAD_BSY");
-				break;
-			case EL737__BAD_SNTX:
-				strcpy(pBuffer,"EL737__BAD_SNTX");
-				break;
-			case EL737__BAD_CONNECT:
-				strcpy(pBuffer,"EL737__BAD_CONNECT");
-				break;
-			case EL737__BAD_FLUSH:
-				strcpy(pBuffer,"EL737__BAD_FLUSH");
-				break;
-			case EL737__BAD_DEV:
-				strcpy(pBuffer,"EL734__BAD_DEV");
-				break;
-			case EL737__BAD_ID:
-				strcpy(pBuffer,"EL737__BAD_ID");
-				break;
-			case EL737__BAD_ILLG:
-				strcpy(pBuffer,"EL737__BAD_ILLG");
-				break;
-			case EL737__BAD_LOC:
-				strcpy(pBuffer,"EL737__BAD_LOC");
-				break;
-			case EL737__BAD_MALLOC:
-				strcpy(pBuffer,"EL737__BAD_MALLOC");
-				break;
-			case EL737__BAD_NOT_BCD:
-				strcpy(pBuffer,"EL737__BAD_NOT_BCD");
-				break;
-			case EL737__BAD_OFL:
-				strcpy(pBuffer,"EL737__BAD_OFL");
-				break;
-			case EL737__BAD_PAR:
-				strcpy(pBuffer,"EL737__BAD_PAR");
-				break;
-			
-			case EL737__BAD_RECV:
-				strcpy(pBuffer,"EL737__BAD_RECV");
-				break;
-			case EL737__BAD_RECV_NET:
-				strcpy(pBuffer,"EL737__BAD_RECV_NET");
-				break;
-			case EL737__BAD_RECV_PIPE:
-				strcpy(pBuffer,"EL737__BAD_RECV_PIPE");
-				break;
-			case EL737__BAD_RECV_UNKN:
-				strcpy(pBuffer,"EL737__BAD_RECV_UNKN");
-				break;
-			case EL737__BAD_RECVLEN:
-				strcpy(pBuffer,"EL737__BAD_RECVLEN");
-				break;
-			case EL737__BAD_RECV1:
-				strcpy(pBuffer,"EL737__BAD_RECV1");
-				break;
-			case EL737__BAD_RECV1_NET:
-				strcpy(pBuffer,"EL737__BAD_RECV1_NET");
-				break;
-			case EL737__BAD_RECV1_PIPE:
-				strcpy(pBuffer,"EL737__BAD_RECV1_PIPE");
-				break;
-			case EL737__BAD_RNG:
-				strcpy(pBuffer,"EL737__BAD_RNG");
-				break;
-			case EL737__BAD_SEND:
-				strcpy(pBuffer,"EL737__BAD_SEND");
-				break;
-			case EL737__BAD_SEND_PIPE:
-				strcpy(pBuffer,"EL737__BAD_SEND_PIPE");
-				break;
-			case EL737__BAD_SEND_NET:
-				strcpy(pBuffer,"EL737__BAD_SEND_NET");
-				break;
-			case EL737__BAD_SEND_UNKN:
-				strcpy(pBuffer,"EL737__BAD_SEND_UNKN");
-				break;
-			case EL737__BAD_SENDLEN:
-				strcpy(pBuffer,"EL737__BAD_SENDLEN");
-				break;
-			case EL737__BAD_SOCKET:
-				strcpy(pBuffer,"EL737__BAD_SOCKET");
-				break;
-			case EL737__BAD_TMO:
-				strcpy(pBuffer,"EL737__BAD_TMO");
-				break;
-		        case EL737__FORCED_CLOSED:
-		                strcpy(pBuffer,"EL737__FORCED_CLOSED");
-		                break;		
-		        case EL737__BAD_ASYNSRV:
-		                strcpy(pBuffer,"EL737__BAD_ASYNSRV");
-		                break;		
-			default:
-				sprintf(pBuffer,"Unknown EL737 error %d", iErr);
-				break;	
-		}
-	}
-    
-/*--------------------------------------------------------------------------*/
-  static int EL737GetError(struct __COUNTER *self, int *iCode,
-                            char *error, int iErrLen)
-  {
-    char *pErr = NULL;
-    int iC1, iC2, iC3;
-    char pBueffel[256];
-
-    if(self->iErrorCode == UNKNOWNPAR)
-    {
-      strncpy(error,"unknown internal parameter code",iErrLen);
-      *iCode = self->iErrorCode;
-      self->iErrorCode = 0;
-      return 1;
-    }
-    else if(self->iErrorCode == BADCOUNTER)
-    {
-      strncpy(error,"monitor cannot be selected",iErrLen);
-      *iCode = self->iErrorCode;
-      self->iErrorCode = 0;
-      return 1;
-    }
-  		
-    EL737_ErrInfo(&pErr,&iC1,&iC2, &iC3);
-    EL737Error2Text(pBueffel,iC1);
-
-    strncpy(error,pBueffel,iErrLen);
-    *iCode = iC1;
-    return 1; 
-  }
-/*--------------------------------------------------------------------------*/
- static int EL737TryAndFixIt(struct __COUNTER *self, int iCode)
- {
-    EL737st *pEL737;
-    int iRet;
-    char pCommand[50], pReply[50];
-    
-    assert(self);
-    pEL737 = (EL737st *)self->pData;
-    assert(pEL737);
-
-   switch(iCode)
-   {
-     case EL737__BAD_ILLG:
-     case EL737__BAD_ADR:
-     case EL737__BAD_PAR:
-     case EL737__BAD_TMO:
-     case EL737__BAD_REPLY:
-     case EL737__BAD_SNTX:
-     case EL737__BAD_OVFL:
-              return COREDO;
-              break;
-     case EL737__BAD_BSY:
-              strcpy(pCommand,"S \r");
-              iRet = EL737_SendCmnd(&pEL737->pData,pCommand,pReply,49);
-              if(iRet < 0)
-              {
-                 return COTERM;
-              }   
-              else
-	      {
-                 return COREDO;
-              }
-              break;
-     case EL737__BAD_LOC:
-              strcpy(pCommand,"rmt 1\r");
-              iRet = EL737_SendCmnd(&pEL737->pData,pCommand,pReply,49);
-              if(iRet < 0)
-              {
-                 return COTERM;
-              }   
-              strcpy(pCommand,"echo 2\r");
-              iRet = EL737_SendCmnd(&pEL737->pData,pCommand,pReply,49);
-              if(iRet < 0)
-              {
-                 return COTERM;
-              }   
-              strcpy(pCommand,"ra\r");
-              iRet = EL737_SendCmnd(&pEL737->pData,pCommand,pReply,49);
-              if(iRet < 0)
-              {
-                 return COTERM;
-              }   
-              return COREDO;
-              break;
-     case EL737__BAD_DEV:
-     case EL737__BAD_ID:
-     case EL737__BAD_NOT_BCD:
-     case UNKNOWNPAR:
-     case BADCOUNTER:
-             return COTERM;
-             break;
-     case EL737__FORCED_CLOSED:
-           iRet = EL737_Open(&pEL737->pData,pEL737->host, pEL737->iPort,
-                             pEL737->iChannel);
-           if(iRet == 1)
-           {
-             return COREDO;
-           }
-           else
-           {
-             return COTERM;
-           }
-           break;
-     case EL737__BAD_OFL:
-           EL737_Close(&pEL737->pData,0);
-           iRet = EL737_Open(&pEL737->pData,pEL737->host, pEL737->iPort,
-                             pEL737->iChannel);
-           if(iRet == 1)
-           {
-             return COREDO;
-           }
-           else
-           {
-             return COTERM;
-           }
-           break;
-/*     case EL737__BAD_ASYNSRV:
-           EL737_Close(&pEL737->pData,1);
-           return COREDO;
-*/     default:
-           /* try to reopen connection */
-           
-           EL737_Close(&pEL737->pData,1);
-           iRet = EL737_Open(&pEL737->pData,pEL737->host, pEL737->iPort,
-                             pEL737->iChannel);
-           if(iRet == 1)
-           {
-             return COREDO;
-           }
-           else
-           {
-             return COTERM;
-           }
-           break;
-   } 
-   return COTERM;
- }  
-/*-------------------------------------------------------------------------*/
- static int EL737Set(struct __COUNTER *self, char *name, int iCter, 
-                      float fVal)
- {
-    int iRet;
-    EL737st *pEL737;
-    char pCommand[80],pReply[80];
-    
-    assert(self);
-    pEL737 = (EL737st *)self->pData;
-    assert(pEL737);
-    
-    if(strcmp(name,"threshold") == 0)
-    {
-       sprintf(pCommand,"DL %1.1d %f\r",iCter,fVal);
-       iRet = EL737_SendCmnd(&pEL737->pData,pCommand,pReply,79);
-       if(iRet == 1)
-       {
-         if(pCommand[0] == '?')
-	 {
-           self->iErrorCode = BADCOUNTER;
-           return HWFault;
-         }
-       }
-       else
-       {
-          return HWFault;
-       }    
-       sprintf(pCommand,"DR %1.1d \r",iCter);
-       iRet = EL737_SendCmnd(&pEL737->pData,pCommand,pReply,79);
-       if(iRet == 1)
-       {
-         if(pCommand[0] == '?')
-	 {
-           self->iErrorCode = BADCOUNTER;
-           return HWFault;
-         }
-         return OKOK;
-       }
-       else
-       {
-         return HWFault;
-       }
-    } 
-    else
-    {
-      self->iErrorCode = UNKNOWNPAR;
-      return HWFault;
-    }
- }
-/*-------------------------------------------------------------------------*/
- static int EL737Get(struct __COUNTER *self, char *name, int iCter, 
-                      float *fVal)
- {
-    int iRet;
-    EL737st *pEL737;
-    char pCommand[80],pReply[80];
-    
-    assert(self);
-    pEL737 = (EL737st *)self->pData;
-    assert(pEL737);
-    
-    if(strcmp(name,"threshold") == 0)
-    {
-       sprintf(pCommand,"DL %1.1d\r",iCter);
-       iRet = EL737_SendCmnd(&pEL737->pData,pCommand,pReply,79);
-       if(iRet == 1)
-       {
-         if(pReply[0] == '?')
-	 {
-           self->iErrorCode = BADCOUNTER;
-           return HWFault;
-         }
-         sscanf(pReply,"%f",fVal);
-         return OKOK;
-       }
-       else
-       {
-         return HWFault;
-       }
-    } 
-    else
-    {
-      self->iErrorCode = UNKNOWNPAR;
-      return HWFault;
-    }
- }
-/*-------------------------------------------------------------------------*/
- static int EL737Send(struct __COUNTER *self, char *pText, char *pReply,
-                      int iReplyLen)
- {
-    EL737st *pEL737;
-    char pBuffer[256];
-
-    assert(self);
-    pEL737 = (EL737st *)self->pData;
-    assert(pEL737);
-
-    /* ensure a \r at the end of the text */
-    if(strlen(pText) > 254)
-    {
-      strncpy(pReply,"Command to long",iReplyLen);
-      return 1;
-    }
-    strcpy(pBuffer,pText);
-    if(strchr(pBuffer,(int)'\r') == NULL)
-    {
-      strcat(pBuffer,"\r");
-    }
-
-    return EL737_SendCmnd(&pEL737->pData,pBuffer,pReply,iReplyLen);
- }
-/*--------------------------------------------------------------------------*/
-  pCounterDriver NewEL737Counter(char *name, char *host, int iPort, int iChannel)
-  {
-    pCounterDriver pRes = NULL;
-    EL737st *pData = NULL;
-    int iRet;
-    int iC1, iC2, iC3;
-    char *pErr;
-    char pBueffel[132];
-    
-    pRes = CreateCounterDriver(name, "EL737");
-    if(!pRes)
-    {
-      return NULL;
-    } 
-   
-   /* open connection to counter */
-    pData = (EL737st *)malloc(sizeof(EL737st));
-    if(!pData)
-    {
-      DeleteCounterDriver(pRes);
-      return NULL;   
-    }
-    pData->host = strdup(host);
-    pData->iPort = iPort;
-    pData->iChannel = iChannel;
-    pData->pData = NULL;
-    iRet = EL737_Open(&(pData->pData), host,iPort,iChannel);
-    if(iRet != 1)  
-    {
-	EL737_ErrInfo(&pErr,&iC1,&iC2, &iC3);
-        DeleteCounterDriver(pRes);
-        if(pData->host)
-        {
-          free(pData->host);
-        }
-        return NULL;
-    }
-    pRes->pData = (void *)pData;
-   
-   /* assign functions */
-    pRes->GetStatus   = EL737GetStatus;
-    pRes->Start       = EL737Start;
-    pRes->Halt        = EL737Halt;
-    pRes->ReadValues  = EL737ReadValues;
-    pRes->GetError    = EL737GetError;
-    pRes->TryAndFixIt = EL737TryAndFixIt;
-    pRes->Pause       = EL737Pause;
-    pRes->Continue    = EL737Continue;
-    pRes->Set         = EL737Set;
-    pRes->Get         = EL737Get;
-    pRes->Send        = EL737Send;
-    pRes->iNoOfMonitors = 7;
-    pRes->fTime = 0.;
-   
-    return pRes; 
-}
-/*--------------------------------------------------------------------------*/
-  void KillEL737Counter(pCounterDriver self)
-  {
-    EL737st *pEL737 = NULL;
-    
-    assert(self);
-    pEL737 = (EL737st *)self->pData;
-    assert(pEL737);
-    
-    EL737_Close(&pEL737->pData,0);
-    if(pEL737->host)
-    {
-      free(pEL737->host);
-    }
-    DeleteCounterDriver(self);
-  }
 
diff --git a/countdriv.h b/countdriv.h
index 9b0a05e3..79986609 100644
--- a/countdriv.h
+++ b/countdriv.h
@@ -61,6 +61,7 @@
                                int iCter, float *fVal);
                     int (*Send)(struct __COUNTER *self, char *pText,
                                 char *pReply, int iReplyLen);
+                    void (*KillPrivate)(struct __COUNTER *self);
                     void *pData; /* counter specific data goes here, ONLY for
                                     internal driver use!
                                  */
diff --git a/counter.c b/counter.c
index 72e0e849..ff2dc4d1 100644
--- a/counter.c
+++ b/counter.c
@@ -50,7 +50,7 @@
 #include "fupa.h"
 #include "status.h"
 #include "splitter.h"
-#include "ecbcounter.h"
+#include "site.h"
 /*-------------------------------------------------------------------------*/
  /*
      The monitor callback data structure 
@@ -411,22 +411,7 @@
      }
      if(self->pDriv)
      {
-       if(strcmp(self->pDriv->type,"EL737") == 0)
-       {
-          KillEL737Counter(self->pDriv);
-       }
-       else if (strcmp(self->pDriv->type,"SIM") == 0)
-       {
-         KillSIMCounter(self->pDriv);
-       }
-       else if(strcmp(self->pDriv->type,"ecb") == 0)
-       {
-	 KillECBCounter(self->pDriv);
-       }
-       else
-       {
-         assert(0);
-       }
+       DeleteCounterDriver(self->pDriv);
      }
      free(self);
   }
@@ -496,46 +481,35 @@
   {
     pCounter pNew = NULL;
     pCounterDriver pDriv = NULL;
+    float fFail = -1;
     int iRet;
     char pBueffel[256];
-    char **argx;
-    FuPaResult pParse;
-    FuncTemplate MakeTemplate[] = { 
-                                   {"el737",3,{FUPATEXT,FUPAINT,FUPAINT}},
-                                   {"sim",1,{FUPAFLOAT}},
-				   {"ecb",1,{FUPATEXT}}
-                                };  
+    pSite site = NULL;
 
     assert(pCon);
     assert(pSics);
 
-     argtolower(argc,argv);        
-    /* parse function template */     
-    argx = &argv[2]; /* 0 = MakeCounter, 1 = counter name */
-    iRet = EvaluateFuPa((pFuncTemplate)&MakeTemplate,3,argc-2,argx,&pParse);
-    if(iRet < 0) /* I/O error */
-    {
-      sprintf(pBueffel,"%s",pParse.pError);
-      SCWrite(pCon,pBueffel,eError);
+    argtolower(argc,argv);        
+    if(argc < 3){
+      SCWrite(pCon,"ERROR: insuficient number of arguments to MakeCounter",
+	      eError);
       return 0;
     }
-    
-    /* create driver depending on parse result */
-    switch(iRet)
-    {
-      case 0: /* EL737 driver */
-            pDriv = NewEL737Counter(argv[1],pParse.Arg[0].text,
-                                    pParse.Arg[1].iVal,pParse.Arg[2].iVal);
-            break;                        
-      case 1: /* SIM */
-            pDriv = NewSIMCounter(argv[1],pParse.Arg[0].fVal);
-            break;
-      case 2: /* ecb */
-	    pDriv = MakeECBCounter(pParse.Arg[0].text);
-            break;
-      default:
-            assert(0); /* internal error */                              
+    site = getSite();
+    if(site != NULL){
+      pDriv = site->CreateCounterDriver(pCon,argc,argv);
     }
+
+    /*
+      test for simulation driver, which is for everybody
+    */
+    if(strcmp(argv[2],"sim") == 0){
+      if(argc > 3){
+	fFail = atof(argv[3]);
+	pDriv = NewSIMCounter(argv[1],fFail);
+      }
+    }
+
     if(!pDriv)
     {
       sprintf(pBueffel,"ERROR: cannot create requested driver %s",
diff --git a/danu.dat b/danu.dat
index a8179996..d53f5012 100644
--- a/danu.dat
+++ b/danu.dat
@@ -1,3 +1,3 @@
- 286 
+ 288 
 NEVER, EVER modify or delete this file
 You'll risk eternal damnation and a reincarnation as a cockroach!|n
\ No newline at end of file
diff --git a/difrac/CAD4COMM b/difrac/CAD4COMM
deleted file mode 100644
index c262117f..00000000
--- a/difrac/CAD4COMM
+++ /dev/null
@@ -1,728 +0,0 @@
-*$noreference
-!
-!       This is the common block for CAD4
-!       VAX/VMS to PDP11/02 transfer program.
-!
-!       modified: 03-jan-1985 LCB adaption for SBC-21 target processor
-!
-! Logical assignments used in CAD4 system
-!
-!       CAn_term        device name of communication channel with lsi-11
-!       LB0             default device for [1,3n]GONCAn.DAT;1 data files
-!       cad4$nrcsys     default directory specification for .EXE
-!       cad4$error      default task error device
-!       
-! Assumed process name          CAD4?_CAn
-!
-!
-! Filename of GONCAn.DAT file
-!
-	character*22    def_gon_spec
-	parameter       (def_gon_spec='LB0:[1,40]GONCAn.DAT;1')
-	character*18    gon_file_spec
-!
-! Filename of monitor task image
-!
-	character*21    def_mon_spec
-	parameter       (def_mon_spec='CAD4M.TSK')
-	character*22    mon_file_spec
-!
-! Default mother task image name
-!
-	character*18    def_mother_spec
-	parameter       (def_mother_spec='nrccad')
-!
-! Input filenames
-!
-	character*63    mother_file_spec
-	character*63    daughter_file_spec
-!
-! Test send message definitions
-!
-	character*120   message_text
-	integer*1       message_buffer
-	integer*4       message_descr
-	dimension       message_buffer(128),message_descr(2)
-	equivalence     (message_buffer(9),message_text)
-!
-	parameter       (l_unit=6 )     ! Logical unit number for log file
-	logical*1       l_unit_open     ! True if file open
-!
-! Define QIO function codes and modifiers
-!
-	external        tt$v_eightbit,tt$v_noecho,tt$v_passall
-	external        tt$v_nobrdcst,tt$v_escape,tt$v_hostsync
-	external        tt$v_ttsync,tt$v_readsync,tt$v_halfdup
-	external        io$_setmode,io$_ttyreadpall,io$_writelblk
-	external        io$_ttyreadall,io$m_timed,io$m_noecho
-	external        io$m_noformat,io$m_purge
-!
-! Define QIO status codes
-!
-	integer*4       ss$_normal,ss$_badchksum,ss$_bufferovf
-	integer*4       ss$_abort,ss$_timeout,ss$_nodata
-!
-	parameter       (ss$_normal     = #1)   ! Normal return
-	parameter       (ss$_timeout    = #22c) ! Timeout
-!
-! Internal status codes returned in one byte
-!
-	integer*2       result,e_suc,e_tos,e_tol,e_seq
-	integer*2       e_crc,e_typ,e_ovf,e_pnd
-!
-	parameter       (e_suc  = #0)         ! success
-	parameter       (e_tos  = #4)         ! tmo + data
-	parameter       (e_tol  = #8)         ! tmo , no data
-	parameter       (e_seq  = #c)         ! Unexpected sequence number
-	parameter       (e_crc  = #10)        ! CRC error
-	parameter       (e_typ  = #14)        ! Unexpected function code
-	parameter       (e_ovf  = #18)        ! Buffer overflow
-	parameter       (e_pnd  = #1c)        ! Any system service fail.
-!
-	integer*2       m_seq,m_efl,m_fun
-!
-	parameter       (m_seq  = #3)         ! Mask to get seq. bits
-	parameter       (m_efl  = #1c)        ! Mask to get error flag
-	parameter       (m_fun  = #e0)       ! Mask to get function bits
-!
-! Function codes for CAD4_IO routine
-!
-	integer*2       io_func,f_init,f_xfr_asc,f_xfr_mem,f_tr_swr
-	integer*2       f_tr_gon,f_tr_asc,f_req_mem,f_req_asc
-!
-	parameter       (f_init     = #0)     ! Bootstrap 11/02
-	parameter       (f_xfr_asc  = #20)    ! Xfr ASCII buffer to 11/02
-	parameter       (f_xfr_mem  = #40)   ! Xfr code block to 11/02
-	parameter       (f_tr_swr   = #60)   ! Trm. and rec. SWR
-	parameter       (f_tr_gon   = #ff80) ! Trm. and rec. goniometer data
-	parameter       (f_tr_asc   = #ffa0) ! Trm. and rec. ASCII buffer
-	parameter       (f_req_mem  = #ffc0) ! Request code block from 11/02
-	parameter       (f_req_asc  = #ffe0) ! Request ASCII buffer from 11/02
-!
-! Data used by CAD4_IO routine
-!
-	integer*2       io_coswr ! Switch options register from vax to 11/02
-	integer*2       io_cobnr ! No. of calls to 11/02
-	integer*1       io_cohex ! Header from VAX to 11/02
-				 !   bit 0-1 :  seq. no. of the calls to 11/02
-				 !   bit 2-4 :  result code
-				 !   bit 5-7 :  function
-!
-! Flags to define command string options
-!               0       - no option
-!               -1      - negated option
-!               +1      - positive option
-!
-	integer*1       mt_flag,ex_flag
-!
-! Flag for cad4_prompt routine
-!               0       - no error message
-!               1       - command input error
-!               -1      - daughter file cannot be opened
-!               -2      -    "      "     "    "  read
-!
-	integer*1       io_prompt_flag
-!
-! Define baud rate constants for CAD4 terminal
-!
-	integer*2       baud_38400,baud_19200,baud_9600,baud_4800
-	integer*2       baud_2400,baud_1200,baud_600,baud_300
-!
-	parameter       (baud_38400 = 3)
-	parameter       (baud_19200 = 2*baud_38400)
-	parameter       (baud_9600  = 2*baud_19200)
-	parameter       (baud_4800  = 2*baud_9600)
-	parameter       (baud_2400  = 2*baud_4800)
-	parameter       (baud_1200  = 2*baud_2400)
-	parameter       (baud_600   = 2*baud_1200)
-	parameter       (baud_300   = 2*baud_600)
-!
-! Default goniometer parameter (goncan.dat record 8)
-! system constants as will be expected at bottom of LSI target computer
-!
-	integer*2       lsi_bottom      ! LSI memory size (bytes)
-	parameter       (lsi_bottom=#8000)
-	integer*2       sbc_bottom      ! SBC user memory bottom
-	parameter       (sbc_bottom=#ec00)
-	integer*2       lsypar          ! value of LSI syspar address
-	integer*2       sbcp_bottom     ! SBC PLUS memory bottom
-	parameter       (sbcp_bottom=#7F80)
-!
-	integer*2       syspar_def_1,syspar_def_2,syspar_def_3
-	integer*2       syspar_def_4,syspar_def_5,syspar_def_6
-	integer*2       syspar_def_7,syspar_def_8,syspar_def_9
-	integer*2       syspar_def_10,syspar_def_11,syspar_def_12
-	integer*2       syspar_def_13,syspar_def_14,syspar_def_15
-	integer*2       syspar_def_16,syspar_def_17
-!
-	parameter       (syspar_def_1 = #ff-((640-255)/3) )
-				! Photomultiplier hv setting of 640 volts
-	parameter       (syspar_def_2 = #ff-(120/5) )
-				! Lower level setting of 120
-	parameter       (syspar_def_3 = #ff-(750/5) )
-				! Discrimination window setting
-	parameter       (syspar_def_4 = 0)
-	parameter       (syspar_def_5 = 0)
-				! Deadtime correction factor (default 0, I*4)
-	parameter       (syspar_def_6 = baud_300.and.#ff)
-				! CAD4 terminal baudrate setting of ...
-	parameter       (syspar_def_7 = baud_300/#100)
-				! 300 baud default
-	parameter       (syspar_def_8 = 0)
-	parameter       (syspar_def_9 = 18)
-				! System clock speed default = 400 cycles/sec.
-	parameter       (syspar_def_10 = 2)
-				! Default positioning accuracy is 2 steps
-!
-!
-! common for load syspar data
-!
-	integer*2       slave_load_address      !address to load syspar in lsi
-	integer*2       nr_load_byte            !number of bytes to load
-!
-	character*1     bvers_c
-	integer*1       bvers           !bootstrap version character if not 0
-	equivalence (bvers,bvers_c(1:1))
-!
-!
-! 5 Axes gain list
-!
-! output = calculated value*(32.-gain)/32.
-!
-	parameter       (syspar_def_11 = 24)    ! Theta motorgain
-	parameter       (syspar_def_12 = 28)    ! Phi motorgain
-	parameter       (syspar_def_13 = 24)    ! Omega motorgain
-	parameter       (syspar_def_14 = 24)    ! Kappa motorgain
-	parameter       (syspar_def_15 = 24)    ! Dial motorgain
-!
-! System flag word
-!
-!       1       - High voltage sense
-!       4       - Switch limit for phi: present = set
-!       10      - Special collar: present = set
-!       20      - Cryostat: present = set
-!
-	parameter       (syspar_def_16 = 0)     ! System flag word
-!
-	parameter       (syspar_def_17 = (60-10)*3/10 )
-				! Maximum emission allowed of 60 mA
-!
-	integer*2       syspar_def
-	dimension       syspar_def(32)
-!
-! Define syspar values as read from goncan.dat file
-!
-	integer*2       syspar_val
-	dimension       syspar_val(32)
-!
-! Define code for $getdvi system service
-!
-	integer*4       dvi$_devdepend,dvi$_devdepend2
-	integer*4       dvi$_devclass,dvi$_devtype
-	parameter       (dvi$_devclass  = #00000004)
-	parameter       (dvi$_devdepend = #0000000A)
-	parameter       (dvi$_devdepend2= #0000001C)
-	parameter       (dvi$_devtype   = #00000006)
-!
-! Define system services as integer*4 to allow function call
-!
-	integer*4       io_status       ! I/O status code
-	integer*4       exmess_status   !i/o status code memory for exit
-	integer*4       cli$present,cli$get_value,sys$exit,sys$alloc
-	integer*4       sys$assign,sys$qiow,sys$getdvi,sys$dclexh,sys$sndopr
-	integer*4       sys$setprn,sys$getjpi,sys$creprc,sys$getmsg
-!
-! Cad4 buffer format
-!
-!       15                                              0
-!       +-----------------------+
-!       +   header byte         +
-!       +------------------------------------------------+
-!       +  length(high byte)    +   length (low byte)    +
-!       +------------------------------------------------+
-!       !      switch register word or load address      +
-!       +------------------------------------------------+
-!       !      switch register word or load address      +
-!       +------------------------------------------------+
-!       !                                                !
-!       !                       ...                      !
-!
-!       !               256 words data (512. bytes)      !
-!       +------------------------------------------------+
-!       +               CRC (16. bit)                    +
-!       +------------------------------------------------+
-!
-!
-! Define argumensts for cad4_readprompt routine
-!
-	integer*1       prompt_buffer           ! Buffer to save prompt
-	dimension       prompt_buffer(521)      !  send to pdp11/02
-	integer*1       output_buffer           ! Same as Output buffer
-	dimension       output_buffer(521)      !  for cad4_writelogical
-	equivalence     (prompt_buffer(1),output_buffer(1))
-	character*521   output_buffer_c         ! Allow use of ICHAR function
-	equivalence     (prompt_buffer(1),output_buffer_c)
-!
-	integer*4       prompt_size             ! Size of prompt (for QIO)
-	integer*4       output_size             !         "
-	equivalence     (prompt_size,output_size)
-!
-	integer*1       input_buffer            ! Input buffer to read record
-	dimension       input_buffer(521)
-	integer*4       input_size              ! Size of input buff for Qio
-	character*521   input_buffer_c          ! Allow use of ICHAR function
-	equivalence     (input_buffer(1),input_buffer_c)
-!
-! Buffer for input and output are the same
-!
-	equivalence     (input_buffer(1),output_buffer(1))
-!
-! Define  structure of I/O blocks
-!
-	integer*1       prompt_header           ! Header byte of output block
-	integer*1       output_header           !               "
-	equivalence     (prompt_buffer(1),prompt_header)
-	equivalence     (prompt_buffer(1),output_header)
-!
-	integer*2       prompt_length           ! Length send to pdp11/02
-	integer*2       output_length           !               "
-	equivalence     (prompt_buffer(2),prompt_length)
-	equivalence     (prompt_buffer(2),output_length)
-!
-	integer*1       prompt_data             ! Data bytes send to pdp11/02!
-	integer*1       output_data             !               "
-	integer*2       output_data_w           !
-	character*518   output_data_c           !
-	dimension       prompt_data(512+2+2+2)
-	dimension       output_data(512+2+2+2)
-	dimension       output_data_w((512+2+2+2)/2)
-	equivalence     (prompt_buffer(4),output_data_c)
-	equivalence     (prompt_buffer(4),prompt_data(1))
-	equivalence     (prompt_buffer(4),output_data(1))
-	equivalence     (prompt_buffer(4),output_data_w(1))
-!
-	integer*1       input_header            ! Header byte received from 11
-	equivalence     (input_buffer(1),input_header)
-!
-	integer*2       input_length            ! Length received from pdp11/02
-	equivalence     (input_buffer(2),input_length)
-!
-	integer*1       input_data              ! Data read from pdp11/02
-	integer*2       input_data_w            !
-	dimension       input_data(512+2+2+2)
-	dimension       input_data_w((512+2+2+2)/2)
-	equivalence     (input_buffer(4),input_data(1))
-	character*518   input_data_c            !
-	equivalence     (input_buffer(4),input_data_c)
-	equivalence     (input_buffer(4),input_data_w)
-!
-! Define word to compute CRC
-!
-	integer*4       iconst                  !crc-constant
-	parameter       (iconst=#a001)      ! value of constant
-	integer*4       crchar                  !crc-character
-	integer*4       isum                    !to remember received crc
-	integer*4       isum_w                  ! 16 bit CRC
-	integer*1       isum_b                  ! 8 bit (low&high 16 bit CRC)
-	dimension       isum_b(2)
-	equivalence     (isum_w,isum_b)
-!
-! Define item list for $getdvi system service
-!
-	integer*4       item_list_i4            ! Item list for $getdvi
-	integer*2       item_list_i2            !  information
-	integer*1       item_list_i1
-	dimension       item_list_i4(13)        ! 4* 3 + 1 longword
-	dimension       item_list_i2(13*2)
-	dimension       item_list_i1(13*4)
-	equivalence     (item_list_i4,item_list_i2)
-	equivalence     (item_list_i4,item_list_i1)
-!
-! Define item list for $getjpi system service
-!
-	integer*4       getjpi_list_l
-	integer*2       getjpi_list_w
-	dimension       getjpi_list_l(13)
-	dimension       getjpi_list_w(2*13)
-	equivalence     (getjpi_list_l,getjpi_list_w)
-!
-! Define info var from $getjpi
-!
-	character*15    process_name_c
-	integer*1       process_name_b
-	dimension       process_name_b(15)
-	equivalence     (process_name_c(1:1),process_name_b(1))
-	integer*2       process_name_len
-!
-	integer*4       process_uic_l
-	integer*2       process_uic_w
-	dimension       process_uic_w(2)
-	equivalence     (process_uic_l,process_uic_w)
-	integer*2       process_uic_len
-!
-	character*63    process_image_c
-	integer*1       process_image_b
-	dimension       process_image_b(63)
-	equivalence     (process_image_c(1:1),process_image_b(1))
-	integer*2       process_image_len
-!
-	integer*4       process_prio_l
-	integer*2       process_prio_len
-!
-! Define buffer for io$_setmode QIO
-!
-	integer*4       char_buff_i4            ! Item list for $getdvi
-	integer*2       char_buff_i2            !  information
-	integer*1       char_buff_i1
-	dimension       char_buff_i4(3)         ! Three longwords
-	dimension       char_buff_i2(3*2)
-	dimension       char_buff_i1(3*4)
-	equivalence     (char_buff_i4,char_buff_i2)
-	equivalence     (char_buff_i4,char_buff_i1)
-!
-! Define characteristics returned by $getdvi and used for
-!               $qiow (io$_setmode).
-!
-	integer*4       cad4_devclass           ! Device class 
-	integer*4       cad4_devtype            ! Device type
-	integer*4       cad4_devdepend          ! Device characteristics
-	integer*4       cad4_devdepend2         !
-	integer*2       cad4_pagewidth          ! Width of a page
-	integer*1       cad4_pagelength         ! Length of a page
-	equivalence     (char_buff_i1(1),cad4_devclass)
-	equivalence     (char_buff_i1(2),cad4_devtype)
-	equivalence     (char_buff_i2(2),cad4_pagewidth)
-	equivalence     (char_buff_i4(2),cad4_devdepend)
-	equivalence     (char_buff_i4(3),cad4_devdepend2)
-	equivalence     (char_buff_i1(8),cad4_pagelength)
-!
-	integer*4       cad4_devdepend_old      ! Save old characteristics here
-!
-!
-! Define arguments for QIOW system service to cad4
-!
-	integer*4       qio_status              ! Qio status code
-	integer*2       cad4_chan               ! Channel number
-	integer*4       cad4_event_flag         ! Event flag number
-	parameter       (cad4_event_flag=8)     !
-	integer*4       cad4_iosb               ! I/O status
-	integer*2       cad4_iosb_i2            !   words
-	dimension       cad4_iosb(2)            !  quadword
-	dimension       cad4_iosb_i2(4)
-	equivalence     (cad4_iosb,cad4_iosb_i2)
-	integer*4       cad4_l_timo             ! Long time out count
-	parameter       (cad4_l_timo=25)        ! 25 seconds
-	integer*4       cad4_timeout            ! Short timeout count
-	parameter       (cad4_timeout=2)        ! Two seconds
-	integer*4       cad4_terminator         ! Line terminator bit mask
-	dimension       cad4_terminator(2)      !  quadword (short form)
-!
-! Define argument block for declare exit handler directive
-!
-	integer*4       exit_block              ! Exit handler control block
-	dimension       exit_block(4)
-	integer*4       exit_status
-!
-! Define parameters for $assign system service
-!
-	character*10    cad4_term_name          ! Physical name of transfer
-						!  terminal
-	integer*4       cad4_term_len           ! Length of physical
-						!  name string
-!
-!       Variable to save instrument name
-!
-!       ibycan_b        1. byte    : integer CA?: unit number
-!                       2.-4. byte : ASCII device name ('CAn')
-!
-	integer*1       ibycan_b
-	dimension       ibycan_b(4)
-	integer*2       ibycan
-	dimension       ibycan(2)
-	character*4     ibycan_c
-	equivalence     (ibycan_b(1),ibycan_c(1:1))
-	equivalence     (ibycan_b(1),ibycan(1))
-	integer*2       ir5can  !radix-50 name of channel for RSX
-!
-!       Variable to save current process name name and uic
-!
-!       Common block for all I/O routines
-!
-	integer*4       img_io_record   ! Record no. of task image
-	integer*4       img_io_status   ! FORTRAN I/O status code
-!
-!       Define file I/O buffer
-!
-	integer*4       img_io_buffer_l
-	integer*2       img_io_buffer_w
-	integer*1       img_io_buffer_b
-	dimension       img_io_buffer_l(128),img_io_buffer_w(256)
-	equivalence     (img_io_buffer_l,img_io_buffer_w)
-	equivalence     (img_io_buffer_l,img_io_buffer_b)
-!
-!       Define read bookkeeping
-!
-	integer*2       img_io_bsa              ! Base address (bytes)
-	integer*2       img_io_ldz              ! Load size (32. word blocks)
-	integer*2       img_io_xfr              ! Transfer address
-	integer*4       img_io_pointer          ! Pointer
-!
-!
-! common declaration for blank common block
-	integer*2       nswreg          !slave switch register
-	integer*2       iroutf          !routine flag
-	integer*2       incr1           !master increment
-	integer*2       incr2           !slave increment
-	integer*2       npi1            !inverse of scanspeed for master
-	integer*2       npi2            !relative scanspeed for slave
-	integer*2       iscanw          !scanwidth tensor
-	integer*2       motw            !motor selection word
-	integer*2       ishutf          !shutter flag
-	integer*2       ibalf           !balance filter flag
-	integer*2       iattf           !attenuator filter flag
-	integer*2       iresf           !reserve flag
-	integer*2       ierrf           !result error flag
-	integer*2       intfl           !intensity result flag
-	real*4          xrayt           !x-ray time
-	real*4          tthp            !limit value for detector
-	real*4          tthn            !limit value for neg side
-	real*4          aptw            !wanted encoder value for aperture
-	real*4          want            !wanted values for gonio-angles
-	real*4          spare           !spare locs
-	real*4          aptm            !measured encoder value of aperture
-	real*4          cmeas           !measured gonio angles
-	real*4          dump            !intensity dumps
-!
-! cad4-handler offsets
-!
-	integer*2       c4h_swreg
-	integer*2       c4h_routfl
-	integer*2       c4h_errfl
-	integer*2       c4h_intfl
-	integer*2       c4h_tthmxh
-	integer*2       c4h_tthmnh
-	integer*2       c4h_sasysc
-	integer*2       c4h_xrtim
-	integer*2       c4h_mselw
-	integer*2       c4h_nrd
-	integer*2       c4h_nid
-	integer*2       c4h_incr
-	integer*2       c4h_inci
-	integer*2       c4h_dincr
-	integer*2       c4h_nrinc
-	integer*2       c4h_thwh
-	integer*2       c4h_phwh
-	integer*2       c4h_omwh
-	integer*2       c4h_kawh
-	integer*2       c4h_apwh
-	integer*2       c4h_apwl
-	integer*2       c4h_thmh
-	integer*2       c4h_phmh
-	integer*2       c4h_ommh
-	integer*2       c4h_kamh
-	integer*2       c4h_apmh
-	integer*2       c4h_dump0
-!
-	parameter       (c4h_swreg      =1)
-	parameter       (c4h_routfl     =2)
-	parameter       (c4h_errfl      =3)
-	parameter       (c4h_intfl      =4)
-	parameter       (c4h_tthmxh     =5)
-	parameter       (c4h_tthmnh     =7)
-	parameter       (c4h_sasysc     =9)
-	parameter       (c4h_xrtim      =10)
-	parameter       (c4h_mselw      =12)
-	parameter       (c4h_nrd        =13)
-	parameter       (c4h_nid        =14)
-	parameter       (c4h_incr       =12)
-	parameter       (c4h_inci       =0)
-	parameter       (c4h_dincr      =1)
-	parameter       (c4h_nrinc      =2)
-	parameter       (c4h_thwh       =30)
-	parameter       (c4h_phwh       =32)
-	parameter       (c4h_omwh       =34)
-	parameter       (c4h_kawh       =36)
-	parameter       (c4h_apwh       =38)
-	parameter       (c4h_apwl       =39)
-	parameter       (c4h_thmh       =40)
-	parameter       (c4h_phmh       =42)
-	parameter       (c4h_ommh       =44)
-	parameter       (c4h_kamh       =46)
-	parameter       (c4h_apmh       =48)
-	parameter       (c4h_dump0      =50)
-!
-! c4h_routfl function table
-!
-	integer*2       rf_swi
-	integer*2       rf_mea
-	integer*2       rf_col
-	integer*2       rf_poc
-	integer*2       rf_pos
-	integer*2       rf_pof
-	integer*2       rf_sap
-	integer*2       rf_sca
-	integer*2       rf_scd
-	integer*2       rf_res
-	integer*2       routbl(16)
-!
-	parameter       (rf_swi =#0)
-	parameter       (rf_mea =#4)
-	parameter       (rf_col =#8)
-	parameter       (rf_poc =#10)
-	parameter       (rf_pos =#20)
-	parameter       (rf_pof =#40)
-	parameter       (rf_sap =#80)
-	parameter       (rf_sca =#100)
-	parameter       (rf_scd =#200)
-	parameter       (rf_res =#8000)
-!
-	integer*2       rout0,rout1,rout2,rout3,rout4,rout5
-	integer*2       rout6,rout7,rout8,rout9,rout10,rout11
-	integer*2       rout12,rout13,rout14,rout15
-!
-	parameter (rout0 = rf_swi+rf_res)
-	parameter (rout1 = rf_swi+rf_mea+rf_res)
-	parameter (rout2 = rf_swi+rf_col+rf_res)
-	parameter (rout3 = rf_swi+rf_pos+rf_res)
-	parameter (rout4 = rf_swi+rf_pof+rf_res)
-	parameter (rout5 = rf_swi+rf_poc+rf_pof+rf_res)
-	parameter (rout6 = rf_swi+rf_sca+rf_res)
-	parameter (rout7 = rf_swi+rf_sap+rf_sca+rf_res)
-	parameter (rout8 = rf_swi+rf_poc+rf_pof+rf_sap+rf_sca+rf_res)
-	parameter (rout9 = rf_swi+rf_scd+rf_res)
-	parameter (rout10= rf_swi+rf_sap+rf_scd+rf_res)
-	parameter (rout11= rf_swi+rf_poc+rf_pof+rf_sap+rf_scd+rf_res)
-	parameter (rout12= rf_swi+rf_poc+rf_res)
-	parameter (rout13= rf_swi+rf_sap+rf_res)   
-	parameter (rout14= rf_swi+rf_res)       !free
-	parameter (rout15= rf_swi+rf_res)       !free
-!
-! cad4_handler error table
-!
-	integer*2       errtbl(15)
-!
-! cad4_handler intensity error table
-!
-	integer*2       inttbl(15)
-!
-!
-! cad4-handler sasysc table
-!
-	integer*2       sa_att
-	integer*2       sa_shu
-!
-	parameter       (sa_att = #4000)
-	parameter       (sa_shu = #8000)
-!
-	integer*2       satbl(4),sas0,sas1,sas2,sas3
-!
-	parameter       (sas0 = #0)
-	parameter       (sas1 = sa_att)
-	parameter       (sas2 = sa_shu)
-	parameter       (sas3 = sa_att+sa_shu)
-!
-! fortran blank common array for angles
-!
-	integer*2       for_ph
-	integer*2       for_om
-	integer*2       for_ka
-	integer*2       for_th
-!
-	parameter       (for_ph = 1)
-	parameter       (for_om = 2)
-	parameter       (for_ka = 3)
-	parameter       (for_th = 4)
-!
-! number of dumps used
-!
-	integer       ndumps
-!
-	common /cad4_main/nswreg ,iroutf ,incr1  ,incr2  ,npi1   ,
-     1            npi2   ,iscanw ,motw   ,ishutf ,ibalf  ,iattf  ,
-     2            iresf  ,ierrf  ,intfl  ,xrayt  ,tthp   ,tthn   ,
-     3            aptw   ,want(4)        ,spare(6)       ,aptm   ,
-     4            cmeas(4),ndumps,  dump(512)
-!
-!                
-! Common for cad4 ascii buffer in cad4b
-!
-	integer*2       nr_ascii_byte           !number of ascii in BUFA
-	character*1     bufa                    !ascii buffer
-	dimension       bufa(134)
-!
-!
-	common  /mesg/bufa                      !ascii buffer for cad4b
-!
-!
-! Common blocks for integer and logical variables
-!
-	common  /cad4_integer/  io_status,cad4_term_len,
-     1          item_list_i4,char_buff_i4,cad4_devdepend_old,
-     2          exit_block,cad4_chan,cad4_iosb,qio_status,
-     3          cad4_terminator,isum_w,l_unit_open,
-     4          message_buffer,message_descr,
-     5          img_io_buffer_l,img_io_bsa,img_io_ldz,img_io_xfr,
-     6          img_io_record,img_io_pointer,img_io_status,
-     7          getjpi_list_l,process_name_b,process_uic_l,
-     8          process_image_b,process_name_len,process_uic_len,
-     9          process_image_len,process_prio_l,process_prio_len,
-     1          mt_flag,ex_flag,io_prompt_flag,syspar_def,
-     2          slave_load_address,nr_load_byte,nr_ascii_byte,
-     3          bvers
-!
-!
-! Common block for transfer buffer
-!
-	common  /tbuf/output_size,output_buffer,input_size
-
-!
-!
-! Common block for communication channel name and communication values
-!
-	common  /cacomm/ibycan,ir5can,lsypar,io_coswr,io_cobnr,
-     1                  io_cohex
-!
-!
-! Common block for syspar values (shadow of 11/02 lsi_bottom)
-!
-	common  /syspar/syspar_val
-!
-!
-! Common block for character variables
-!
-	common  /cad4_character/        cad4_term_name,
-     1          mother_file_spec,daughter_file_spec,
-     2          gon_file_spec
-!        
-	common /cad4_sysval/ freq, ragmxt
-!
-! cad4-handler motor table
-!
-	integer*2       mottbl(8)       !no,ap,ph,om,ka,th,no,no
-!                                       !converted to
-	data mottbl /0,5,2,3,4,1,0,0/   !no,th,ph,om,ka,ap,no,no
-!
-	data    syspar_def      /syspar_def_1,syspar_def_2,syspar_def_3,
-     1                  syspar_def_4,syspar_def_5,syspar_def_6,
-     2                  syspar_def_7,syspar_def_8,syspar_def_9,
-     3                  syspar_def_10,syspar_def_11,syspar_def_12,
-     4                  syspar_def_13,syspar_def_14,syspar_def_15,
-     5                  syspar_def_16,syspar_def_17,15*0/
-!
-	data    routbl  /rout0,rout1,rout2,rout3,
-     1          rout4,rout5,rout6,rout7,rout8,
-     2          rout9,rout10,rout11,rout12,rout13,
-     3          rout14,rout15/
-!
-	data errtbl /1,2,3,4,5,5,5,0,0,0,0,0,0,0,0/
-!
-	data inttbl /-1,1,0,0,0,0,0,0,0,0,0,0,0,0,0/
-!
-	data satbl/sas0,sas1,sas2,sas3/
-!
-	data ndumps /512/
-!
-!
-!
-*$reference
-
diff --git a/difrac/COMDIF b/difrac/COMDIF
deleted file mode 100644
index 038e02a6..00000000
--- a/difrac/COMDIF
+++ /dev/null
@@ -1,54 +0,0 @@
-      PARAMETER    (NSIZE=200)
-      COMMON /DFMACH/ ISCDEF,ICDDEF,IDTDEF,IDODEF,IDCDEF,IFRDEF,NRC,
-     $                NATTEN,STEPDG,ICADSL,ICADSW
-      CHARACTER       DFTYPE*5,DFMODL*5
-      COMMON /DFMACC/ DFTYPE,DFMODL
-      COMMON /ANGLE/  THETA,PHI,CHI,OMEGA,RTHETA,ROMEGA,RPHI,RCHI,
-     $                DTHETA,DOMEGA,DCHI,THEMAX,THEMIN,PSI,DPSI,PSIMAX,
-     $                PSIMIN,R(3,3),ROLD(3,3),IVALID,WAVE,IROT,DEG,DPHI
-      COMMON /REFLEC/ IH,IK,IL,IH0,IK0,IL0,IHMAX,IKMAX,ILMAX,NREF,
-     $                IOH(NSIZE),IOK(NSIZE),IOL(NSIZE),ITRUE
-      COMMON /SYMTRY/ NSYM,ICENT,LATCEN,LAUENO,NAXIS,
-     $                SGSYMB(10),JHKL(3,24),JRT(3,4,24)
-      COMMON /INTENS/ IHK(10),ILA(10),BCOUNT(10),BBGR1(10),BBGR2(10),
-     $                BTIME(10),BPSI(10),NREFB(10),PRESET,COUNT,BGRD1,
-     $                BGRD2,NATT,AS,BS,CS,PA,PM,QTIME,TMAX,AFRAC,
-     $                ATTEN(6)
-      COMMON /PROFL/  ACOUNT(10*NSIZE),D12,ILOW,IHIGH,IDEL,IWARN,SUM,
-     $                FRAC1,IPRFLG,IAUTO,STEPOF,FRAC,PJUNK(9),NPK
-      COMMON /CUTOFF/ ISYS,SINABS(6),ILN,DELAY,STEP,IUPDWN,ISTOP,
-     $                CJUNK(8)
-      COMMON /CELL/   SR(3,3),SSG(3,3),GI(3,3),AP(3),APS(3),SANGS(3),
-     $                CANGS(3),SANG(3),CANG(3)
-      COMMON /SEGS/   IFSHKL(3,3),NDH(3,3),IHO(8),IKO(8),ILO(8),
-     $                IDH(8,3,3),ISEG,NCOND,ICOND(5),IHS(5),IKS(5),
-     $                ILS(5),IR(5),IS(5),NSEG,NMSEG,IND(3),NUMDH,NSET
-      COMMON /IODEVS/ ITP,ITR,LPT,LPTX,NB,NBLOCK,ISD,IID,
-     $                IBYLEN,IPR,NPR,IIP
-      COMMON /IOUASS/ IOUNIT(10)
-      CHARACTER*132   COUT(20)
-      COMMON /IOUASC/ COUT 
-      COMMON /STAN/   NSTAN,NMSTAN,ISTAN,NN,IHSTAN(6),IKSTAN(6),
-     $                ILSTAN(6),NINTRR,NINTOR,IORNT,REOTOL,NREFOR
-      COMMON /FLAGS/  ITYPE,KQFLAG,KQFLG2,IBSECT,ISCAN,IPRVAL,IUMPTY
-      COMMON /TRANS/  BLINDR(3,3),TMATS(3,3,20),IFSYS(20),IFMODE(20),
-     $                NTMATS
-      COMMON /JUNKS/  JA(8),JB(8),JC(8),JMIN(8),JMAX(8)
-      COMMON /INFREE/ IFREE(20),RFREE(20),ICFLAG
-      CHARACTER OCHAR*100,KI*2,ANS*1
-      COMMON /FREECH/ OCHAR
-      COMMON /POINTR/ KI,ANS
-      CHARACTER IDNAME*40,DSNAME*40,DDNAME*40,STATUS*2,PRNAME*40
-      COMMON /FNAMES/ IDNAME,DSNAME,DDNAME,STATUS,PRNAME
-      COMMON /REGIST/ ISREG(10)
-      COMMON /SCRTCH/ SIGMA(7),SIGSQ(7),LAUE,NUMD,IAXIS
-      CHARACTER       WIN1BF*80
-      COMMON /CWIND1/ WIN1BF(3)
-      COMMON /FWIND1/ IWNCUR
-      DIMENSION PROF(520),CUT(20)
-      EQUIVALENCE (ACOUNT(1),PROF(1)),(CUT(1),ISYS)
-      INTEGER XOPEN,XCLOSE,XMOVE,XDRAW,XCLEAR,XTEXT,XSCROL,XWIN,
-     $        XTDEL  
-      PARAMETER (XOPEN  = 1, XCLOSE = 2, XMOVE  = 3, XDRAW  = 4,
-     $           XCLEAR = 5, XTEXT  = 6, XSCROL = 7, XWIN   = 8,
-     $           XTDEL  = 9)
diff --git a/difrac/IATSIZ b/difrac/IATSIZ
deleted file mode 100644
index 621c222c..00000000
--- a/difrac/IATSIZ
+++ /dev/null
@@ -1,5 +0,0 @@
-C-----------------------------------------------------------------------
-C  Parameters for LSTSQ, FOURR & COFOUR, DATRD2, TABLES and SOLVER
-C-----------------------------------------------------------------------       
-      CHARACTER MNCODE*6
-      PARAMETER (MNCODE = 'PCMSDS')
diff --git a/difrac/Makefile b/difrac/Makefile
deleted file mode 100644
index 54cb1bed..00000000
--- a/difrac/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#---------------------------------------------------------------------------
-# Makefile for the DIFRAC library for SICS.
-#
-# Mark Koennecke, November 1999
-#----------------------------------------------------------------------------
-
-#---------- for Redhat linux
-CC= gcc
-CFLAGS= -C -g -c
-
-#------------ for DigitalUnix
-##CC=cc
-##CFLAGS= -C -g -c
-#----------------------------------------------------------------------------
-
-
-FL     = f77 $(CFLAGS)
-ROOT   = ..
-LIBS   = $(ROOT)\libs
-
-OBJECTS=difini.o \
-          ang180.o angval.o begin.o   \
-          cent8.o  cfind.o  demo1e.o align.o \
-          centre.o mod360.o profil.o range.o  sinmat.o cellls.o \
-          wxw2t.o  angcal.o basinp.o comptn.o orcel2.o inchkl.o \
-          linprf.o lsormt.o mesint.o goloop.o ormat3.o blind.o \
-          params.o pltprf.o pcount.o prtang.o prnbas.o prnint.o \
-          grid.o   sammes.o cellsd.o stdmes.o cntref.o indmes.o \
-          wrbas.o  reindx.o rcpcor.o lotem.o  nexseg.o lister.o \
-          oscil.o  pfind.o  pscan.o  peaksr.o sgprnh.o \
-          difint.o  tcentr.o tfind.o  fndsys.o \
-          dhgen.o  setrow.o creduc.o cinput.o \
-          burger.o  angrw.o bigchi.o \
-          eulkap.o trics.o swrite.o 
-
-GENS    = yesno.o  freefm.o alfnum.o matrix.o \
-          sgroup.o latmod.o sgrmat.o \
-          sglatc.o sglpak.o sgerrs.o sgmtml.o \
-          sgtrcf.o \
-          setiou.o ibmfil.o
-
-all: lib
-
-clean:
-	rm -f *.o
-
-lib: $(OBJECTS) $(GENS)
-	- rm -f libdif.a
-	ar cr libdif.a $(OBJECTS) $(GENS)
-	ranlib libdif.a
-        
-.f.o:
-	$(FL) $*.f
diff --git a/difrac/alfnum.f b/difrac/alfnum.f
deleted file mode 100644
index 79b53c0d..00000000
--- a/difrac/alfnum.f
+++ /dev/null
@@ -1,50 +0,0 @@
-C-----------------------------------------------------------------------
-C              Get an alphanumeric input string.  
-C  In general all alphabetic characters are converted to upper-case, 
-C  but if STRING contains "DONT DO IT" on input no conversion is done.
-C  This is useful to allow the input of file names in case sensitive 
-C  operating systems like UNIX.
-C  All null characters are converted to blanks
-C  The code should be general for ASCII and EBCDIC.
-C  If the first character is a question mark (?) the routine exits to 
-C  the system monitor.
-C-----------------------------------------------------------------------
-      SUBROUTINE ALFNUM (STRING)
-      COMMON /IOUASS/ IOUNIT(12)
-      CHARACTER STRING*(*),NULL*1
-      NULL = CHAR(0)
-      ITR = IOUNIT(5)
-      ITP = IOUNIT(6)
-      IDONT = 0
-      IF (LEN(STRING) .GE. 10 .AND. STRING(1:10) .EQ. 'DONT DO IT') 
-     $    IDONT = 1
-C-----------------------------------------------------------------------
-C  Write the prompt - if any - and get the answer
-C-----------------------------------------------------------------------
-      CALL GWRITE (ITP,'$')
-      STRING = ' '
-      ILEN = LEN(STRING)
-      IF (ILEN .GT. 80) ILEN = 80
-      CALL GETLIN (STRING)
-      IF (STRING(1:1) .EQ. '?') STOP
-      ILEN = LEN(STRING)
-      DO 120 I = 1,ILEN
-        IF (STRING(I:I) .EQ. NULL) STRING(I:I) = ' '
-  120 CONTINUE
-      IF (IDONT .EQ. 0) THEN
-        LITTLA = ICHAR('a')
-        LARGEA = ICHAR('A')
-        LITTLZ = ICHAR('z')
-        IDIFF = LITTLA - LARGEA
-        ILEN = LEN(STRING)
-        DO 130 I = 1,ILEN
-          ITHIS = ICHAR(STRING(I:I))
-          IF (ITHIS .GE. LITTLA .AND. ITHIS .LE. LITTLZ) THEN
-            ITHIS = ITHIS - IDIFF
-            STRING(I:I) = CHAR(ITHIS)
-          ENDIF
-  130   CONTINUE
-      ENDIF
-      RETURN
-10000 FORMAT (A)
-      END
diff --git a/difrac/align.f b/difrac/align.f
deleted file mode 100644
index 65393f9c..00000000
--- a/difrac/align.f
+++ /dev/null
@@ -1,640 +0,0 @@
-C-----------------------------------------------------------------------
-C
-C                    Reflection Alignment routine
-C
-C  The routine has 5 entry points :--
-C
-C    CR aligns the reflection which is already in the detector, or
-C       a single reflection which is set before alignment.
-C    AL firstly reads in h,k,l values and generates symmetry equivalent 
-C       reflections if wanted;
-C       secondly aligns both + and - h,k,l values for use by MM.
-C    AR resumes alignment after AL has been interrupted.
-C    RO reads in reflections as for the first part of AL.
-C    IORNT .EQ. 1 does re-orientation during data collection via the 
-C                 second part of AL.
-C-----------------------------------------------------------------------
-      SUBROUTINE ALIGN
-      INCLUDE 'COMDIF'
-      DIMENSION IBH(10),IBK(10),IBL(10),BTHETA(10),BOMEGA(10),BCHI(10),
-     $          BPHI(10),T4(4),O4(4),C4(4),P4(4)
-      CHARACTER CPM*1
-  100 IF (KI .EQ. 'CR') WRITE (COUT,10000)
-      IF (KI .EQ. 'AL') WRITE (COUT,11000)
-      IF (KI .EQ. 'AR') WRITE (COUT,12000)
-      CALL GWRITE (ITP,' ')
-      DT = IDTDEF
-      DO = IDODEF
-      DC = IDCDEF
-      AFRAC = 0.5
-      PRESET = 1000.
-C-----------------------------------------------------------------------
-C  Read the angle steps DT, DO and DC, counting TIME and AFRAC
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'AL' .OR. KI .EQ. 'CR' .OR. KI. EQ. 'RO') THEN
-        IF (DFMODL .EQ. 'CAD4') THEN
-          WRITE (COUT,12900)
-          CALL FREEFM (ITR)
-          DT = RFREE(1)
-          ISLIT = 10.0*DT + 0.5
-          IF (ISLIT .EQ. 0) ISLIT = 40
-          IF (ISLIT .LT. 10) ISLIT = 10
-          IF (ISLIT .GT. 60) ISLIT = 60 
-        ELSE
-          ISLIT = 0
-          WRITE (COUT,13000) IDTDEF,IDODEF,IDCDEF,IFRDEF
-          CALL FREEFM (ITR)
-          DT = RFREE(1)
-          DO = RFREE(2)
-          DC = RFREE(3)
-          IF (DT .EQ. 0) DT = IDTDEF
-          IF (DO .EQ. 0) DO = IDODEF
-          IF (DC .EQ. 0) DC = IDCDEF
-          DT = DT/IFRDEF
-          DO = DO/IFRDEF
-          DC = DC/IFRDEF
-          WRITE (COUT,14000)
-          CALL FREEFM (ITR)
-          PRESET = RFREE(1)
-          IF (PRESET .EQ. 0.0) PRESET = 1000.
-          WRITE (COUT,15000)
-          CALL FREEFM (ITR)
-          AFRAC = RFREE(1)
-          IF (AFRAC .EQ. 0.) AFRAC = 0.5
-          WRITE (COUT,16000)
-          CALL YESNO ('Y',ANS)
-          IF (ANS .EQ. 'N') GO TO 100
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  For CR, set the reflection if necessary
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'CR') THEN
-        ITRY = 1
-        IHSET = 0
-        WRITE (COUT,17000)
-        CALL YESNO ('Y',ANS)
-        IF (ANS .EQ. 'N') THEN
-  110     WRITE (COUT,18000)
-          CALL FREEFM (ITR)
-          IH = IFREE(1)
-          IK = IFREE(2)
-          IL = IFREE(3)
-          IF (IH .EQ. 0 .AND. IK .EQ. 0 .AND. IL .EQ. 0) THEN
-            KI = ' '
-            RETURN
-          ENDIF
-          IHSET = 1
-          MREF = MREF + 1
-          CALL HKLN (IH,IK,IL,MREF)
-          IPRVAL = 1
-          CALL ANGCAL
-          IF (IVALID .NE. 0) GO TO 110
-          CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICC)
-          IF (ICC .NE. 0) THEN
-            WRITE (COUT,19000)
-            CALL GWRITE (ITP,' ')
-            GO TO 110
-          ENDIF
-        ENDIF
-        IF (IHSET .EQ. 0) THEN
-          WRITE (COUT,20000)
-          CALL FREEFM (ITR)
-          IHNEW = IFREE(1)
-          IKNEW = IFREE(2)
-          ILNEW = IFREE(3)
-          IF (IHNEW .NE. 0 .OR. IKNEW .NE. 0 .OR. ILNEW .NE. 0) THEN
-            IH = IHNEW
-            IK = IKNEW
-            IL = ILNEW
-          ENDIF
-        ENDIF
-        CALL ANGET (RTHETA,ROMEGA,RCHI,RPHI)
-        WRITE (COUT,21000) IH,IK,IL,RTHETA,ROMEGA,RCHI,RPHI
-        CALL GWRITE (ITP,' ')
-        IF (LPT .NE. ITP) WRITE (LPT,21000) 
-     $                    IH,IK,IL,RTHETA,ROMEGA,RCHI,RPHI
-  115   CALL HKLN (IH,IK,IL,MREF)
-        CALL WXW2T (DT,DO,DC,ISLIT)
-        IF (KI .EQ. 'FF') THEN
-          IF (ITRY .EQ. 1) THEN
-            WRITE (COUT,22000) IH,IK,IL
-            CALL GWRITE (ITP,' ')
-            ITRY = 2
-            IPRVAL = 1
-            CALL ANGCAL
-            CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICC)
-            GO TO 115
-          ELSE
-            WRITE (COUT,22100) IH,IK,IL
-            CALL GWRITE (ITP,' ')
-            KI = ' '
-            RETURN
-          ENDIF
-        ENDIF
-        CALL SHUTTR (1)
-        CALL CCTIME (PRESET,CT1)
-        CALL SHUTTR (-1)
-        WRITE (COUT,23000) IH,IK,IL,RTHETA,ROMEGA,RCHI,RPHI,CT1
-        CALL GWRITE (ITP,' ')
-        IF (LPT .NE. ITP) WRITE (LPT,23000) 
-     $                    IH,IK,IL,RTHETA,ROMEGA,RCHI,RPHI,CT1
-        WRITE (COUT,24000)
-        CALL YESNO ('Y',ANS)
-        IF (ANS .EQ. 'Y') THEN
-          WRITE (COUT,25000)
-          CALL FREEFM (ITR)
-          I = IFREE(1)
-          IHK(I)    = IH
-          NREFB(I)  = IK
-          ILA(I)    = IL
-          BCOUNT(I) = RTHETA
-          BBGR1(I)  = ROMEGA
-          BBGR2(I)  = RCHI
-          BTIME(I)  = RPHI
-        ENDIF
-        KI = ' '
-        RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  AR -- Resume AL-type alignment from where it was interrupted.
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'AR') THEN
-        READ (IID,REC=16) (IOH(J),J = 1,80),DT,DO,DC,TIME,AFRAC
-        READ (IID,REC=17) (IOK(J),J = 1,80),NTOT
-        READ (IID,REC=18) (IOL(J),J = 1,80)
-        READ (IID,REC=19) (IOH(J),IOK(J),IOL(J),J = 81,100)
-        IF (DFMODL .EQ. 'CAD4') THEN
-          ISLIT = 10.0*DT + 0.5
-          IF (ISLIT .EQ. 0) ISLIT = 40
-        ENDIF
-        NBLOKO = 250
-        NDONE = 0
-  120   READ (ISD,REC=NBLOKO) 
-     $       (JUNK,I = 1,80),NINBLK,NLIST,IPLUS,NTOT,NBLOKO
-        IF (NINBLK .NE. 0) THEN
-          NBLOKO = NBLOKO + 1
-          NDONE = NDONE + NINBLK
-          GO TO 120
-        ENDIF
-        NBLOKO = NBLOKO - 1
-        READ (ISD,REC=NBLOKO) IBH,IBK,IBL,BTHETA,BOMEGA,BCHI,BPHI,
-     $                        BPSI,NINBLK,NLIST,IPLUS,NTOT,NBLOKO
-        IF (IPLUS .EQ. -1) NLIST = NLIST + 1
-        IPLUS = -IPLUS
-        IH = IPLUS*IOH(NLIST)
-        IK = IPLUS*IOK(NLIST)
-        IL = IPLUS*IOL(NLIST)
-        WRITE (COUT,26000) NDONE,IH,IK,IL
-        CALL GWRITE (ITP,' ')
-        NSTART = NLIST
-      ENDIF
-C-----------------------------------------------------------------------
-C   AL -- First Part  -- Read in a list of h,k,l values & generate 
-C                        symmetry equivs if wanted; 
-C         Second Part -- Align the + and - Friedel reflections
-C   RO -- First part of AL
-C         Second part of AL, when IORNT = 1
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'AL' .OR. KI .EQ. 'RO') THEN
-        CALL ALEDIT (NTOT)
-        IF (NTOT .EQ. 0) THEN
-          KI = ' '
-          RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Write the h,k,l values to file for use with AR and RO
-C-----------------------------------------------------------------------
-        WRITE (IID,REC=16) (IOH(J),J = 1,80),DT,DO,DC,TIME,AFRAC
-        WRITE (IID,REC=17) (IOK(J),J = 1,80),NTOT
-        WRITE (IID,REC=18) (IOL(J),J = 1,80)
-        WRITE (IID,REC=19) (IOH(J),IOK(J),IOL(J),J = 81,100)
-      ENDIF
-      IF (KI .EQ. 'RO') RETURN
-C-----------------------------------------------------------------------
-C  Read in data if IORNT = 1 (RO)
-C-----------------------------------------------------------------------
-      IF (IORNT .EQ. 1) THEN  
-        READ (IID,REC=16) (IOH(J),J = 1,80),DT,DO,DC,TIME,AFRAC
-        READ (IID,REC=17) (IOK(J),J = 1,80),NTOT
-        READ (IID,REC=18) (IOL(J),J = 1,80)
-        READ (IID,REC=19) (IOH(J),IOK(J),IOL(J),J = 81,100)
-        WRITE (LPT,27000) NREF
-      ENDIF
-C-----------------------------------------------------------------------
-C  Get ready for the second part of AL or OR
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'AL' .OR. IORNT .EQ. 1) THEN
-        NBLOKO = 250
-        NINBLK = 0
-        MREF = 0
-        NSTART = 1
-        IPLUS = 1
-        IHSV = IH
-        IKSV = IK
-        ILSV = IL
-      ENDIF
-C-----------------------------------------------------------------------
-C  Do alignment on these reflections (+ and -)
-C-----------------------------------------------------------------------
-      DO 150 NLIST = NSTART,NTOT
-  130   IH = IPLUS*IOH(NLIST)
-        IK = IPLUS*IOK(NLIST)
-        IL = IPLUS*IOL(NLIST)
-        ISTAN = 0
-        DPSI = 0.0
-        ITRY = 1
-        MREF = MREF + 1
-        NTRUE = 0
-        IPRVAL = 0
-        CALL ANGCAL
-        IF (IVALID .NE. 0 .AND. IVALID .NE. 4) GO TO 140
-        IF (DFMODL .EQ. 'CAD4' .AND. THETA .GT. 110.0 .AND.
-     $     (CHI .GT. 270.0 .AND. CHI .LT. 300)) THEN
-          WRITE (LPT,28000) IH,IK,IL
-          GO TO 140
-        ENDIF
-        IF (ITRUE .EQ. 1) THEN
-          T4(1) = THETA
-          T4(2) = 360.0 - THETA
-          T4(3) = THETA
-          T4(4) = 360.0 - THETA
-          O4(1) = OMEGA
-          O4(2) = OMEGA
-          O4(3) = OMEGA
-          O4(4) = OMEGA
-          C4(1) = CHI
-          C4(2) = CHI
-          C4(3) = 360.0 - CHI
-          C4(4) = 360.0 - CHI
-          P34 = 180.0 + PHI
-          IF (P34 .GE. 360.0) P34 = P34 - 360.0
-          P4(1) = PHI
-          P4(2) = PHI
-          P4(3) = P34
-          P4(4) = P34
-        ENDIF
-  135   CALL HKLN (IH,IK,IL,MREF)
-        IF (ITRUE .EQ. 1 .AND. ITRY .EQ. 1) THEN
-          NTRUE = NTRUE + 1
-          THETA = T4(NTRUE)
-          OMEGA = O4(NTRUE)
-          CHI   = C4(NTRUE)
-          PHI   = P4(NTRUE)
-        ENDIF
-        CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICC)
-        IF (ICC .NE. 0) GO TO 140
-        CPM = '+'
-        IF (IPLUS .EQ. -1) CPM = '-'
-        WRITE (LPT,29000) NLIST,CPM,IH,IK,IL,THETA,OMEGA,CHI,PHI
-        CALL WXW2T (DT,DO,DC,ISLIT)
-        IF (KI .EQ. 'FF') THEN
-          IF (ITRY .EQ. 1) THEN
-            WRITE  (LPT,22000) IH,IK,IL
-            WRITE (COUT,22000) IH,IK,IL
-            CALL GWRITE (ITP,' ')
-            ITRY = 2
-            GO TO 135
-          ELSE
-            WRITE  (LPT,22100) IH,IK,IL
-            WRITE (COUT,22100) IH,IK,IL
-            CALL GWRITE (ITP,' ')
-            GO TO 140
-          ENDIF
-        ENDIF
-        CALL SHUTTR (1)
-        CALL CCTIME (PRESET,CT1)
-        CALL SHUTTR (-1)
-        WRITE (LPT,30000) IH,IK,IL,RTHETA,ROMEGA,RCHI,RPHI,CT1
-        IF (ITRUE .EQ. 1) THEN
-          T4(NTRUE) = RTHETA
-          O4(NTRUE) = ROMEGA
-          C4(NTRUE) = RCHI
-          P4(NTRUE) = RPHI
-          IF (NTRUE .LT. 4) THEN
-            ITRY = 1
-            GO TO 135
-          ELSE
-            DO 136 I4 = 1,4
-              IF (T4(I4) .GT. 180.0) T4(I4) = T4(I4) - 360.0
-              IF (O4(I4) .GT. 180.0) O4(I4) = O4(I4) - 360.0
-              IF (C4(I4) .GT. 180.0) C4(I4) = C4(I4) - 360.0
-  136       CONTINUE
-            RTHETA = (T4(1) - T4(2) + T4(3) - T4(4))/4.0
-            ROMEGA = (O4(1) + O4(2) + O4(3) + O4(4))/4.0
-            IF (ROMEGA .LT. 0.0) ROMEGA = ROMEGA + 360.0
-            RCHI   = (C4(1) + C4(2) - C4(3) - C4(4))/4.0
-            IF (RCHI .LT. 0.0) RCHI = RCHI + 360.0
-            RPHI   = P4(1)
-            WRITE ( LPT,22200) RTHETA,ROMEGA,RCHI,RPHI
-            WRITE (COUT,22200) RTHETA,ROMEGA,RCHI,RPHI
-            CALL GWRITE (ITP,' ')
-          ENDIF
-        ENDIF
-        NINBLK = NINBLK + 1
-        IBH(NINBLK)    = IH
-        IBK(NINBLK)    = IK
-        IBL(NINBLK)    = IL
-        BTHETA(NINBLK) = RTHETA
-        BOMEGA(NINBLK) = ROMEGA
-        BCHI(NINBLK)   = RCHI
-        BPHI(NINBLK)   = RPHI
-        BPSI(NINBLK)   = 0.0
-C-----------------------------------------------------------------------
-C  Write the block of alignment data so far
-C-----------------------------------------------------------------------
-        WRITE (ISD,REC=NBLOKO) IBH,IBK,IBL,BTHETA,BOMEGA,BCHI,BPHI,
-     $                         BPSI,NINBLK,NLIST,IPLUS,NTOT,NBLOKO
-        IF (NINBLK .EQ. 10) THEN
-          NBLOKO = NBLOKO + 1
-          NINBLK = 0
-        ENDIF
-  140   CALL KORQ (KQFLAG)
-        IF (KQFLAG .NE. 1) GO TO 160
-        IF (IPLUS .EQ. 1) THEN
-          IPLUS = -1
-          GO TO 130
-        ELSE
-          IPLUS = 1
-        ENDIF
-  150 CONTINUE
-C-----------------------------------------------------------------------
-C  Write guard block on the end
-C-----------------------------------------------------------------------
-  160 IF (NINBLK .GT. 0) NBLOKO = NBLOKO + 1
-      NINBLK = 0
-      WRITE (ISD,REC=NBLOKO) (IOH(I),I = 1,80),NINBLK,NINBLK,NINBLK,
-     $                        NTOT,NBLOKO
-      IF (IORNT .EQ. 1) THEN
-        IH = IHSV
-        IK = IKSV
-        IL = ILSV
-      ENDIF
-      CALL ZERODF
-      KI = ' '
-      RETURN
-10000 FORMAT (10X,' Centre the reflection already in the detector ')
-11000 FORMAT (/10X,' Alignment of Symmetry and Friedel Equivalent',
-     $        ' Reflections'/,'%')
-12000 FORMAT (10X,' Resume alignment from the AL command')
-12900 FORMAT (' Type the horizontal slit width in mms (4.0) ',$)
-13000 FORMAT (' Type the size of steps in 2T,Om,Chi,',
-     $        ' (',I2,',',I2,',',I2,') 1/',I3,'deg ',$)
-14000 FORMAT (' Type the count preset for each step (1000.0) ',$)
-15000 FORMAT (' Fraction of max. count for half-height cutoff (0.5) ',$)
-16000 FORMAT (' All OK (Y) ? ',$)
-17000 FORMAT (' Is the reflection already set (Y) ? ',$)
-18000 FORMAT (' Type h,k,l for the reflection (Exit) ',$)
-19000 FORMAT (3I3,' setting collision.  Try again.')
-20000 FORMAT (' Type h,k,l for use in M2/M3 ',$)
-21000 FORMAT (' Starting Values ',3I4,4F10.3)
-22000 FORMAT (3I4,' ailignment failed on first attempt'/)
-22100 FORMAT (3I4,' ailignment failed on both attempts'/)
-22200 FORMAT ('     Mean Values ',12X,4F10.3/)
-23000 FORMAT ('    Final Values ',3I4,4F10.3,F7.0/)
-24000 FORMAT (' Do you wish to save the angles for M2 or M3 (Y) ? ',$)
-25000 FORMAT (' What is the sequence number of this reflection ? ',$)
-26000 FORMAT (I4,' reflections have been aligned. Resuming at ',3I3/)
-27000 FORMAT (/' Reorientation before Reflection ',I5)
-28000 FORMAT (3I4,' is probably inaccessible on a CAD-4.'/)
-29000 FORMAT (I4,A,' Starting Values ',3I4,4F10.3)
-30000 FORMAT ('         Final Values ',3I4,4F10.3,F7.0/)
-      END
-C-----------------------------------------------------------------------
-C  Routine to generate equivalent reflections (Not Friedel)
-C-----------------------------------------------------------------------
-      SUBROUTINE DEQHKL (NHKL,ILIST)
-      INCLUDE 'COMDIF'
-C-----------------------------------------------------------------------
-C  Work out the reflection details and the unique equivalents
-C-----------------------------------------------------------------------
-      NHKL  = 0
-      NRCEN = 0
-      IEXCL = 0
-      DO 110 K = 1,NSYM
-        IM = 0
-        JS = 0
-        JH     = IH*JRT(1,1,K) + IK*JRT(2,1,K) + IL*JRT(3,1,K)
-        JK     = IH*JRT(1,2,K) + IK*JRT(2,2,K) + IL*JRT(3,2,K)
-        JL     = IH*JRT(1,3,K) + IK*JRT(2,3,K) + IL*JRT(3,3,K)
-        IPHASE = IH*JRT(1,4,K) + IK*JRT(2,4,K) + IL*JRT(3,4,K)
-        IF (MOD(IPHASE,12) .EQ. 0) IPHASE = 0
-        IF (IH .EQ.  JH .AND. IK .EQ.  JK .AND. IL .EQ.  JL) IM = 1
-        IF (IH .EQ. -JH .AND. IK .EQ. -JK .AND. IL .EQ. -JL) JS = 1
-        IF (JS .EQ. 1) NRCEN = 1
-        IF (IM .EQ. 1 .AND. IPHASE .NE. 0) IEXCL = 1
-        IF (ICENT .EQ. 0) JS = 0
-        IF (JS .EQ. 1 .AND. IPHASE .NE. 0) IEXCL = 1
-        IF (NHKL .NE. 0) THEN
-          DO 100 I = 1,NHKL
-            IF (JHKL(1,I) .EQ.  JH .AND.
-     $          JHKL(2,I) .EQ.  JK .AND.
-     $          JHKL(3,I) .EQ.  JL) GO TO 110
-            IF (JHKL(1,I) .EQ. -JH .AND.
-     $          JHKL(2,I) .EQ. -JK .AND.
-     $          JHKL(3,I) .EQ. -JL) GO TO 110
-  100     CONTINUE
-        ENDIF
-        NHKL = NHKL + 1
-        JHKL(1,NHKL) = JH
-        JHKL(2,NHKL) = JK
-        JHKL(3,NHKL) = JL
-  110 CONTINUE
-      IVALID = IEXCL
-      IEXCL = 0
-      IF (LATCEN .NE. 1) THEN
-        IF (LATCEN .EQ. 2) IREM = MOD((IK + IL),2)
-        IF (LATCEN .EQ. 3) IREM = MOD((IH + IL),2)
-        IF (LATCEN .EQ. 4) IREM = MOD((IH + IK),2)
-        IF (LATCEN .EQ. 5) IREM = MOD((IH + IK + IL),2)
-        IF (LATCEN .EQ. 6) THEN
-          IREM = MOD((IH + IK),2)
-          IF (IREM .EQ. 0) IREM = MOD((IH + IL),2)
-        ENDIF
-        IF (LATCEN .EQ. 7) IREM = MOD((-IH + IK + IL),3)
-        IF (IEXCL .EQ. 0) IEXCL = IREM
-      ENDIF
-      IF (IEXCL .NE. 0) THEN
-        IVALID = IVALID + 2
-        RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Print the equivalent indices
-C-----------------------------------------------------------------------
-      IF (ILIST .EQ. 1) THEN
-        WRITE (COUT,10000) ((JHKL(J,K),J = 1,3),K = 1,NHKL)
-        CALL GWRITE (ITP,' ')
-      ENDIF
-      RETURN
-10000 FORMAT (4(5X,3I4))
-      END
-C-----------------------------------------------------------------------
-C  Edit the h,k,l list for the AL or RO commands
-C-----------------------------------------------------------------------
-      SUBROUTINE ALEDIT (NTOT)
-      INCLUDE 'COMDIF'
-      DIMENSION NDEL(100)
-      CHARACTER IOPT*1,LINE*80
-C-----------------------------------------------------------------------
-C  Read in the existing list of h,k,l values and write it to terminal
-C-----------------------------------------------------------------------
-      READ (IID,REC=16) (IOH(J),J = 1,80),DT,DO,DC,TIME,AFRAC
-      READ (IID,REC=17) (IOK(J),J = 1,80),NTOT
-      READ (IID,REC=18) (IOL(J),J = 1,80)
-      READ (IID,REC=19) (IOH(J),IOK(J),IOL(J),J = 81,100)
-  100 IF (NTOT .LE. 0) THEN
-        WRITE (COUT,10000)
-        CALL GWRITE (ITP,' ')
-      ELSE
-        WRITE (COUT,11000) NTOT
-        CALL GWRITE (ITP,' ')
-        NLINE = NTOT/4
-        IF (NTOT - 4*NLINE .NE. 0) NLINE = NLINE + 1
-        I1 = 1
-        I2 = 4
-        DO 110 N = 1,NLINE
-          IF (N .EQ. NLINE) I2 = NTOT
-          WRITE (COUT,12000) (I,IOH(I),IOK(I),IOL(I),I = I1,I2)
-          CALL GWRITE (ITP,' ')
-          I1 = I1 + 4
-          I2 = I2 + 4
-  110   CONTINUE
-      ENDIF
-C-----------------------------------------------------------------------
-C  Get the edit option IOPT
-C-----------------------------------------------------------------------
-      WRITE (COUT,13000)
-      CALL ALFNUM (LINE)
-      IOPT = LINE(1:1)
-      IF (IOPT .EQ. ' ') IOPT = 'U'
-C-----------------------------------------------------------------------
-C  Option E. Exit from AL with 0 reflns
-C-----------------------------------------------------------------------
-      IF (IOPT .EQ. 'E') THEN
-        NTOT = 0
-        RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Option U.  Use the present list and get the TRUANG flag.
-C-----------------------------------------------------------------------
-      IF (IOPT .EQ. 'U') THEN
-        ITRUE = 0
-        WRITE (COUT,14100)
-        CALL YESNO ('N',LINE)
-        ANS = LINE(1:1)
-        IF (ANS .EQ. 'Y') ITRUE = 1
-        RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Options A and N.  Add reflns or use new ones.
-C-----------------------------------------------------------------------
-      IF (IOPT .EQ. 'A' .OR. IOPT .EQ. 'N') THEN
-        IF (IOPT .EQ. 'N') NTOT = 0
-        ISYMOR = 0
-        WRITE (COUT,14000)
-        CALL YESNO ('Y',LINE)
-        ANS = LINE(1:1)
-        IF (ANS .EQ. 'Y') THEN
-          ISYMOR = 1
-          IOUT = -1
-          CALL SPACEG (IOUT,0)
-        ENDIF
-        NPOSS = 100 - NTOT
-        WRITE (COUT,15000) NPOSS
-        CALL GWRITE (ITP,' ')
-  120   WRITE (COUT,16000)
-        CALL FREEFM (ITR)
-        IH = IFREE(1)
-        IK = IFREE(2)
-        IL = IFREE(3)
-        IF (IH .NE. 0 .OR. IK .NE. 0 .OR. IL .NE. 0) THEN
-          IPRVAL = 1
-          CALL ANGCAL
-          IF (IVALID .EQ. 0) THEN
-            IF (ISYMOR .EQ. 1) THEN
-              ILIST = 1
-              CALL DEQHKL (NHKL,ILIST)
-              DO 130 I = 1,NHKL
-                NTOT = NTOT + 1
-                IOH(NTOT) = JHKL(1,I)
-                IOK(NTOT) = JHKL(2,I)
-                IOL(NTOT) = JHKL(3,I)
-                IF (NTOT .EQ. NSIZE/2) THEN
-                  WRITE (COUT,17000)
-                  CALL GWRITE (ITP,' ')
-                  GO TO 100
-                ENDIF
-  130         CONTINUE
-            ELSE
-              NTOT = NTOT + 1
-              IOH(NTOT) = IH
-              IOK(NTOT) = IK
-              IOL(NTOT) = IL
-            ENDIF
-          ENDIF 
-          GO TO 120
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  Option D.  Delete reflections from the list
-C-----------------------------------------------------------------------
-      IF (IOPT .EQ. 'D') THEN
-        DO 140 I = 1,100
-          NDEL(I) = 0
-  140   CONTINUE
-  150   WRITE (COUT,18000)
-        CALL FREEFM (ITR)
-        IH = IFREE(1)
-        IK = IFREE(2)
-        IL = IFREE(3)
-        IF (IH .NE. 0 .OR. IK .NE. 0 .OR. IL .NE. 0) THEN
-          DO 160 N = 1,NTOT
-            IF (IH .EQ. IOH(N) .AND. IK .EQ. IOK(N) .AND. 
-     $          IL .EQ. IOL(N)) THEN
-              NDEL(N) = 1
-              GO TO 150
-            ENDIF
-  160     CONTINUE
-          WRITE (COUT,19000) IH,IK,IL
-          CALL GWRITE (ITP,' ')
-          GO TO 150
-        ELSE
-C-----------------------------------------------------------------------
-C  Form the new list 
-C-----------------------------------------------------------------------
-          NEW = 0
-          DO 170 N = 1,NTOT
-            IF (NDEL(N) .EQ. 0) THEN
-              NEW = NEW + 1
-              IOH(NEW) = IOH(N)
-              IOK(NEW) = IOK(N)
-              IOL(NEW) = IOL(N)
-            ENDIF
-  170     CONTINUE
-          NTOT = NEW
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  List the existing list and get new option
-C-----------------------------------------------------------------------
-      GO TO 100
-10000 FORMAT (' There are no reflections in the AL/RO list.')
-11000 FORMAT (' The following',I4,' reflections are in the AL/RO list')
-12000 FORMAT (4(I3,'.',3I4,3X))
-13000 FORMAT (' The following options are available :--'/
-     $        '  U. Use the existing AL/RO list;'/
-     $        '  A. Add reflections to the existing AL/RO list;'/
-     $        '  D. Delete reflections from the existing AL/RO list;'/
-     $        '  N. New AL/RO list.'/
-     $        '  L. List the reflections in the existing AL/RO list;'/
-     $        '  E. Exit from AL/RO.'/
-     $        ' Which option do you want (U) ? ',$)
-14000 FORMAT (' Friedel equivalents are always used.'/
-     $        ' Do you want symmetry equivalents as well (Y) ? ',$)
-14100 FORMAT (' Align 4 equivalent settings for each refln (N) ? ',$)
-15000 FORMAT (' Type h,k,l for up to',I4,' reflections ')
-16000 FORMAT (' h,k,l (End) ',$)
-17000 FORMAT (' No more reflections allowed.')
-18000 FORMAT (' Type h,k,l for the reflection to be deleted (End) ',$)
-19000 FORMAT (3I4,' not found. Try again please.')
-      END
diff --git a/difrac/ang180.f b/difrac/ang180.f
deleted file mode 100644
index 4d4a8f06..00000000
--- a/difrac/ang180.f
+++ /dev/null
@@ -1,8 +0,0 @@
-C-----------------------------------------------------------------------
-C  Make the negative of an angle in mathematical form
-C-----------------------------------------------------------------------
-      SUBROUTINE ANG180 (ANG)
-      IF (ANG .LE. 180.0) ANG = -ANG
-      IF (ANG .GT. 180.0) ANG = 360.0-ANG
-      RETURN
-      END
diff --git a/difrac/ang360.f b/difrac/ang360.f
deleted file mode 100644
index c030cbe7..00000000
--- a/difrac/ang360.f
+++ /dev/null
@@ -1,13 +0,0 @@
-C-----------------------------------------------------------------------
-C  Routine to make the difference between ANG and EXPCT small
-C-----------------------------------------------------------------------
-      SUBROUTINE ANG360 (ANG,EXPCT)
-  100 D = EXPCT - ANG
-      ISIGN = 1
-      IF (D .LT. 0.) ISIGN = -1
-      IF (ABS(D) .GE. 180.0) THEN
-        ANG = ANG + ISIGN*360.0
-        GO TO 100
-      ENDIF
-      RETURN
-      END
diff --git a/difrac/angcal.f b/difrac/angcal.f
deleted file mode 100644
index 63a2caa6..00000000
--- a/difrac/angcal.f
+++ /dev/null
@@ -1,285 +0,0 @@
-C-----------------------------------------------------------------------
-C  Subroutine to calculate 2Theta,      chi,phi when Dpsi=0
-C                      and 2Theta,omega,chi,phi otherwise
-C  IVALID = 32 if 2theta .ge. 180.0
-C           16 if low temp. and chi is not in +/- 90 range
-C            8 if reflection is 0,0,0,      or
-C            4 if not within 2Theta limits, or
-C            2 if lattice or specific absence, or
-C            1 if translation absence.
-C  IROT=1   if rotation is not possible
-C-----------------------------------------------------------------------
-      SUBROUTINE ANGCAL
-      INCLUDE 'COMDIF'
-      DIMENSION Q(3,3),VEC(3)
-      CHARACTER INTFLT*3
-      RAD = 1.0/DEG
-      SM4 = 2.0*SIN(THEMIN*RAD*0.5)
-      SM4 = SM4*SM4
-      SS4 = 2.0*SIN(THEMAX*RAD*0.5)
-      SS4 = SS4*SS4
-      IROT = 0
-      IVALID = 0
-C-----------------------------------------------------------------------
-C  If called by RA allow for fractional h,k,l values
-C-----------------------------------------------------------------------
-      INTFLT = 'INT'
-      IF ((KI .EQ. 'RA' .OR. KI .EQ. 'SR' .OR. KI .EQ. 'MS') .AND.
-     $    (ABS(RFREE(1) - IH) .GT. 0.0001 .OR.
-     $     ABS(RFREE(2) - IK) .GT. 0.0001 .OR.
-     $     ABS(RFREE(3) - IL) .GT. 0.0001)) INTFLT = 'FLT'
-      IF (INTFLT .EQ. 'INT') THEN
-        RH = IH
-        RK = IK
-        RL = IL
-      ELSE
-        RH = RFREE(1)
-        RK = RFREE(2)
-        RL = RFREE(3)
-      ENDIF
-      IF (INTFLT .EQ. 'INT') THEN
-C-----------------------------------------------------------------------
-C  Test for the 0,0,0 reflection
-C-----------------------------------------------------------------------
-        IF (IH .EQ. 0 .AND. IK .EQ. 0 .AND. IL .EQ. 0) THEN
-          IVALID = 8
-          IF (IPRVAL .NE. 0) THEN
-            WRITE (COUT,10000)
-            CALL GWRITE (ITP,' ')
-          ENDIF
-          RETURN
-        ENDIF
-C-----------------------------------------------------------------------
-C  Test for translation and lattice absences
-C-----------------------------------------------------------------------
-        IF (KI .NE. 'IE') CALL DEQHKL (NHKL,0)
-        IF (IVALID .NE. 0 .AND. IPRVAL .NE. 0) THEN
-          WRITE (COUT,11000) IH,IK,IL
-          CALL GWRITE (ITP,' ')
-        ENDIF
-C-----------------------------------------------------------------------
-C  Tests for typed in specific absence conditions (NCOND .GT. 0)
-C  If only the direction is of interest (NN), bypass these tests.
-C-----------------------------------------------------------------------
-        IF (NCOND .GT. 0 .AND. NN .NE. -1) THEN
-          DO 100 J = 1,NCOND
-            JCOND = ICOND(J)
-            IF ((JCOND .EQ. 1 .AND. IH .EQ. 0 .AND. IK .EQ. 0) .OR.
-     $          (JCOND .EQ. 2 .AND. IH .EQ. 0 .AND. IL .EQ. 0) .OR.
-     $          (JCOND .EQ. 3 .AND. IK .EQ. 0 .AND. IL .EQ. 0) .OR.
-     $          (JCOND .EQ. 4 .AND. IH .EQ. 0) .OR.
-     $          (JCOND .EQ. 5 .AND. IK .EQ. 0) .OR.
-     $          (JCOND .EQ. 6 .AND. IL .EQ. 0) .OR. 
-     $           JCOND .EQ. 7) THEN
-              LHS = IABS(IH*IHS(J) + IK*IKS(J) + IL*ILS(J))
-              M = IR(J)
-              IF (MOD(LHS,M) .NE. IS(J)) THEN
-                IVALID = 2
-                IF (IPRVAL .NE. 0) THEN
-                  WRITE (COUT,12000) IH,IK,IL
-                  CALL GWRITE (ITP,' ')
-                ENDIF
-              ENDIF
-            ENDIF
-  100     CONTINUE
-        ENDIF
-      ENDIF
-      SUM = 0.0
-      DO 110 I = 1,3
-        VEC(I) = R(I,1)*RH + R(I,2)*RK + R(I,3)*RL
-        SUM = SUM + VEC(I)*VEC(I)
-  110 CONTINUE
-C-----------------------------------------------------------------------
-C  Calculate Theta from SINABS to avoid segment problems
-C  Test for 2Theta limits, if not a reference reflection and print
-C  error message if not the UM command.
-C-----------------------------------------------------------------------
-      SINMAX = RH*RH*SINABS(1) + RK*RK*SINABS(2) + RL*RL*SINABS(3) +
-     $         RH*RK*SINABS(4) + RH*RL*SINABS(5) + RK*RL*SINABS(6)
-      IF (ISTAN .EQ. 0 .AND. NN .NE. -1) THEN
-        IF (IUMPTY .EQ. 0 .AND. SINMAX .GE. 4.0) THEN
-          IF (INTFLT .EQ. 'INT') THEN
-            WRITE (COUT,13000) IH,IK,IL
-          ELSE
-            WRITE (COUT,13100) RH,RK,RL
-          ENDIF
-          CALL GWRITE (ITP,' ')
-          IVALID = 32
-          RETURN
-        ENDIF
-        IF (SINMAX .LT. SM4 .OR. SINMAX .GT. SS4) THEN
-          IVALID = 4
-          IF (IPRVAL .NE. 0) THEN
-            IF (INTFLT .EQ. 'INT') THEN
-              WRITE (COUT,14000) IH,IK,IL
-            ELSE
-              WRITE (COUT,14100) RH,RK,RL
-            ENDIF
-            CALL GWRITE (ITP,' ')
-          ENDIF
-        ENDIF
-      ENDIF
-      CALL CALANG (VEC)
-      CALL CHICOL
-C-----------------------------------------------------------------------
-C  Rotation about scattering vector.   Omega,Chi,Phi for a given Psi
-C-----------------------------------------------------------------------
-C Modified MK. Make PSI calculation all the time and add 180 to PSI
-C This is because TRICS seems to have a PSI rotation by 180 degree
-C hidden in its setup. This may be WRONG!
-C      IF (ISTAN .EQ. 0 .AND. DPSI .NE. 0) THEN
-C
-       IF(.TRUE.) THEN
-          PSIDUM = PSI + 180
-          IF(PSIDUM .GT. 360) PSIDUM = PSIDUM - 360.
-          CHO = CHI*RAD
-          PHO = PHI*RAD
-C          PSO = PSI*RAD
-          PSO = PSIDUM*RAD
-          Q(3,1) =  SIN(PSO)*SIN(PHO) - COS(PSO)*SIN(CHO)*COS(PHO)
-          Q(3,2) = -SIN(PSO)*COS(PHO) - COS(PSO)*SIN(CHO)*SIN(PHO)
-          Q(3,3) =  COS(PSO)*COS(CHO)
-          Q(1,3) =  SIN(CHO)
-          Q(2,3) =  SIN(PSO)*COS(CHO)
-          OMEGA = DEG*ATAN2(-Q(2,3), Q(1,3))
-          PHI   = DEG*ATAN2(-Q(3,2),-Q(3,1))
-          CHI   = DEG*ATAN2(SQRT(Q(3,1)*Q(3,1) + Q(3,2)*Q(3,2)),Q(3,3))
-          IF (OMEGA .LT. 0) OMEGA = OMEGA + 360.0
-          IF (PHI   .LT. 0) PHI   = PHI   + 360.0
-          IF (OMEGA .LT. 270.0 .AND. OMEGA .GT. 90.0) THEN
-            PHI   = PHI + 180.0
-            CHI   = 360.0 - CHI
-            OMEGA = 180.0 + OMEGA
-          ENDIF
-          IF (PHI   .GE. 360.0) PHI   = PHI   - 360.0
-          IF (OMEGA .GE. 360.0) OMEGA = OMEGA - 360.0
-          CALL OMGCOL 
-          IF (IROT .EQ. 0) CALL CHICOL
-      ENDIF
-      CALL MOD360 (OMEGA)
-      CALL MOD360 (CHI)
-      CALL ANGCHECK(THETA,OMEGA,CHI,PHI,IVALID)
-      IF(IVALID .GE. 4) IROT = 1      
-      RETURN
-10000 FORMAT (' Reflection 0,0,0 is invalid.')
-11000 FORMAT (' Reflection',3I4,' is a systematic absence')
-12000 FORMAT (' Reflection',3I4,' is a specified absence')
-13000 FORMAT (' Reflection',3I4,' has 2theta .ge. 180.  Impossible!')
-13100 FORMAT (' Reflection',3F8.3,' has 2theta .ge. 180.  Impossible!')
-14000 FORMAT (' Reflection',3I4,' is outside the 2theta limits ')
-14100 FORMAT (' Reflection',3F8.3,' is outside the 2theta limits ')
-      END
-C-----------------------------------------------------------------------
-C  Calculate 2Theta, Chi, Phi for the Omega=0 position
-C  If chi .gt. 89.999 (cos**2(89.999) = 3.0E-10) chi is set to 90.0
-C-----------------------------------------------------------------------
-      SUBROUTINE CALANG (VEC)
-      INCLUDE 'COMDIF'
-      DIMENSION VEC(3)
-      BOT = ABS(VEC(1))
-      CEN = ABS(VEC(2))
-      TOP = ABS(VEC(3))
-      IF (BOT .EQ. 0.0) THEN
-        PHI = 90.0
-      ELSE
-        PHI = ATAN2(CEN,BOT)*DEG
-      ENDIF
-      SUM = SUM - TOP*TOP
-      IF (SUM .LT. 3.0E-10) THEN
-        CHI = 90.0
-      ELSE
-        CHI = ATAN2(TOP,SQRT(SUM))*DEG
-      ENDIF
-      IF (VEC(3) .LT. 0.0) CHI = 360.0 - CHI
-      IF (VEC(1) .LT. 0.0) THEN
-        IF (VEC(2) .LT. 0.0) THEN
-          PHI = 180.0 + PHI
-        ELSE
-          PHI = 180.0 - PHI
-        ENDIF
-      ELSE
-        IF (VEC(2) .LT. 0.0) PHI = 360.0 - PHI
-      ENDIF
-      IF (CHI .EQ. 90.0 .OR. CHI .EQ. 270.0) PHI = 0.0
-      SINSQ = 0.25*(SUM + TOP*TOP)
-      IF (SINSQ .GE. 0.999999) THEN
-        THETA = 180.0
-      ELSE
-        THETA = 2.0*DEG*ATAN(SQRT(SINSQ/(1.0 - SINSQ)))
-      ENDIF
-      OMEGA = 0.0
-C-----------------------------------------------------------------------
-C  Bisecting or parallel mode  IBSECT = 0/1 (forced 0)
-C-----------------------------------------------------------------------
-      IF (IBSECT .EQ. 1) THEN
-        PHI = PHI + 90.0
-        IF (PHI .GE. 360.0) PHI = PHI - 360.0
-        OMEGA = CHI + 270.0
-        IF (OMEGA .GE. 360.0) OMEGA = OMEGA - 360.0
-        CHI = 90.0
-        CALL OMGCOL
-        IF (IROT .EQ. 0) CALL CHICOL
-      ENDIF
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  Test if rotation is possible without omega collisions.
-C  Limits are set for 4 possible collisions as follows :--
-C  a. Chi ring with front of tube housing;
-C  b. Chi ring with rear of tube housing;
-C  c. Chi ring with front of detector mount;
-C  d. Chi ring with rear of detector mount attenuator housing.
-C  For a. and d. omega is in the range 0 to 90, and
-C  for b. and c. omega is in the range 270 to 360.
-C  The chi ring has an angular half width DELCHI = 16degs.
-C  The angular restrictions for a., b., c. and d. are
-C  DELA = 13,  DELB = 31,  DELC = 5, DELD = 33,  each plus DELCHI.
-C  If chi is in the range 53 to 117, i.e. in a position where the phi
-C  base could be caught between the front of the tube housing and the
-C  detector mount, DELCHI must be increased by 3 for a. and 6 for c. 
-C  The limits are conservative, but will need to be changed for
-C  different instruments.
-C-----------------------------------------------------------------------
-      SUBROUTINE OMGCOL
-      INCLUDE 'COMDIF'
-      DELCHI =  16.0
-      DELA   =  13.0
-      DELB   =  31.0
-      DELC   =   5.0
-      DELD   =  33.0
-      CHIBOT =  53.0
-      CHITOP = 117.0
-      IROT = 0
-      THET = 0.5*THETA
-      IF (OMEGA .LT. 90.0) THEN
-        OMEGAD = OMEGA
-        T1 = 90.0 - DELA - DELCHI - THET
-        IF (CHI .GT. CHIBOT .AND. CHI .LT. CHITOP) T1 = T1 - 3.0
-        T2 = 90.0 - DELD - DELCHI + THET
-      ELSE
-        OMEGAD = 360.0 - OMEGA
-        T1 = 90.0 - DELB - DELCHI + THET
-        T2 = 90.0 - DELC - DELCHI - THET
-        IF (CHI .GT. CHIBOT .AND. CHI .LT. CHITOP) T2 = T2 - 6.0
-      ENDIF
-      IF (OMEGAD .GE. T1 .OR. OMEGAD .GE. T2) IROT = 1
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  Sample routine to ensure that the range of CHI is restricted when 
-C  there is a cryostat on the instrument.
-C  It is assumed that 2thetamax is set realistically to ensure that 
-C  there will be no OMEGA collisions with the cryostat. 
-C  CHI is restricted to the range +/- 90
-C-----------------------------------------------------------------------
-      SUBROUTINE CHICOL
-      INCLUDE 'COMDIF'
-      IF (ILN .EQ. 1) THEN
-        IF (CHI .GE. 270.0 .OR. CHI .LE. 90.0) THEN
-          IVALID = 0
-        ELSE
-          IVALID = 16
-        ENDIF
-      ENDIF
-      RETURN
-      END
diff --git a/difrac/angl.f b/difrac/angl.f
deleted file mode 100644
index ffcbf9be..00000000
--- a/difrac/angl.f
+++ /dev/null
@@ -1,14 +0,0 @@
-C-----------------------------------------------------------------------
-C  Calculate the angle between two Cartesian vectors
-C-----------------------------------------------------------------------
-      SUBROUTINE ANGL (X1,Y1,Z1,X2,Y2,Z2,ANGLE)
-      SPROD = X1*X2 + Y1*Y2 + Z1*Z2
-      SMOD = (X1*X1 + Y1*Y1 + Z1*Z1)*(X2*X2 + Y2*Y2 + Z2*Z2)
-      COSIN = SPROD/SQRT(SMOD)
-      IF (COSIN .GE.  1) COSIN =  1
-      IF (COSIN .LT. -1) COSIN = -1
-      ANGLE = ACOS(COSIN)
-      ANGLE = ANGLE*180/3.141593
-      RETURN
-      END
-
\ No newline at end of file
diff --git a/difrac/angrw.f b/difrac/angrw.f
deleted file mode 100644
index d81c759c..00000000
--- a/difrac/angrw.f
+++ /dev/null
@@ -1,76 +0,0 @@
-C-----------------------------------------------------------------------
-C  Routine to read or write the alignment angles from IDATA.DA
-C 
-C  The call is   CALL ANGRW (IRDWRT,NANG,NUM,NRECS,IOFF)  where
-C     IRDWRT is 0/1 for read or write;
-C     NANG   is the number of angles to be used;
-C     NUM    is the number of reflections;
-C     NRECS  is the record number to start the operation;
-C     IOFF   is the offset in the ACOUNT array.
-C  The ACOUNT array is equivalenced to the angle arrays as :--
-C      DIMENSION THETAS(NSIZE),OMEGAS(NSIZE),CHIS(NSIZE),PHIS(NSIZE),
-C     $          ICNT(NSIZE),
-C     $          THETAP(NSIZE),OMEGAP(NSIZE),CHIP(NSIZE),PHIP(NSIZE)
-C      EQUIVALENCE (ACOUNT(        1),THETAS(1)),
-C     $            (ACOUNT(  NSIZE*1),OMEGAS(1)),
-C     $            (ACOUNT(2*NSIZE+1),CHIS(1)),
-C     $            (ACOUNT(3*NSIZE+1),PHIS(1)),
-C     $            (ACOUNT(4*NSIZE+1),ICNT(1)),
-C     $            (ACOUNT(5*NSIZE+1),THETAP(1)),
-C     $            (ACOUNT(6*NSIZE+1),OMEGAP(1)),
-C     $            (ACOUNT(7*NSIZE+1),CHIP(1)),
-C     $            (ACOUNT(8*NSIZE+1),PHIP(1))
-C-----------------------------------------------------------------------
-      SUBROUTINE ANGRW (IRDWRT,NANG,NUM,NRECS,IOFF)
-      INCLUDE 'COMDIF'
-C-----------------------------------------------------------------------
-C  Calculate the ACOUNT address offset and number of reads or writes
-C-----------------------------------------------------------------------
-      NOFF = 0
-      IF (IOFF .EQ. 1) NOFF = 5*NSIZE
-      NRW = (NSIZE + 79)/80
-      NADD = NOFF
-      NREC = NRECS
-C-----------------------------------------------------------------------
-C  Read data from the file
-C-----------------------------------------------------------------------
-      IF (IRDWRT .EQ. 0) THEN
-        DO 110 N = 1,NANG
-          NADD1 = NADD + 1
-          NADD2 = NADD + 80
-          DO 100 J = 1,NRW
-            IF (N .EQ. 1 .AND. J .EQ. 1) THEN
-              READ (ISD,REC=NREC) NUM,(ACOUNT(I),I = NADD1,NADD2)
-            ELSE
-              READ (ISD,REC=NREC) (ACOUNT(I),I = NADD1,NADD2)
-            ENDIF
-            NREC = NREC + 1
-            NADD1 = NADD2 + 1
-            NADD2 = NADD2 + 80
-            IF (NADD2 .GT. NADD+NSIZE) NADD2 = NADD + NSIZE
-  100     CONTINUE
-          NADD = NADD + NSIZE
-  110   CONTINUE
-C-----------------------------------------------------------------------
-C  Write data to the file
-C-----------------------------------------------------------------------
-      ELSE
-        DO 130 N = 1,NANG
-          NADD1 = NADD + 1
-          NADD2 = NADD + 80
-          DO 120 J = 1,NRW
-            IF (N .EQ. 1 .AND. J .EQ. 1) THEN
-              WRITE (ISD,REC=NREC) NUM,(ACOUNT(I),I = NADD1,NADD2)
-            ELSE
-              WRITE (ISD,REC=NREC) (ACOUNT(I),I = NADD1,NADD2)
-            ENDIF
-            NREC = NREC + 1
-            NADD1 = NADD2 + 1
-            NADD2 = NADD2 + 80
-            IF (NADD2 .GT. NADD+NSIZE) NADD2 = NADD + NSIZE
-  120     CONTINUE
-          NADD = NADD + NSIZE
-  130   CONTINUE
-      ENDIF
-      RETURN
-      END
diff --git a/difrac/angval.f b/difrac/angval.f
deleted file mode 100644
index 574df1aa..00000000
--- a/difrac/angval.f
+++ /dev/null
@@ -1,20 +0,0 @@
-C-----------------------------------------------------------------------
-C  This subroutine initializes the diffractometer angles.  It is assumed
-C  that the encoders only show the fractional part of each angle and
-C  therefore the integer part must be fixed.  This is done by reading 
-C  the encoders and if the fractional parts have not changed since they
-C  were written to the file when the routine was stopped, it is assumed 
-C  that the integer parts are OK. If not the integer parts are read 
-C  from the terminal
-C-----------------------------------------------------------------------
-      SUBROUTINE ANGVAL
-      INCLUDE 'COMDIF'
-C-----------------------------------------------------------------------
-C  Find out if there is a diffractometer attached (debug purposes)
-C-----------------------------------------------------------------------
-C     WRITE (ITP,10000)
-C     CALL YESNO ('Y',ANS)
-      CALL INTON
-      RETURN
-10000 FORMAT (' Is there a diffractometer on the computer (Y) ? ',$)
-      END
diff --git a/difrac/basinp.f b/difrac/basinp.f
deleted file mode 100644
index f587f663..00000000
--- a/difrac/basinp.f
+++ /dev/null
@@ -1,722 +0,0 @@
-C-----------------------------------------------------------------------
-C  Read in all Basic Data from the terminal commands
-C-----------------------------------------------------------------------
-      SUBROUTINE BASINP
-      INCLUDE 'COMDIF'
-      CHARACTER KISAVE*2
-C-----------------------------------------------------------------------
-C  Select data to be read from keys with the value in KI 
-C   If KI = 'BD' then all basic data must be typed in.
-C   The following keys are allowed :--
-C     AD BD  CZ  DH  FR  LA  M2  M3  MM  OM  PS  RO  RR  SD  SE  TM  TP  
-C
-C  If M2, M3 or MM reset the indices corresponding to 2thetamax
-C
-C  BD -- All Basic Data
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'BD') THEN
-        WRITE (COUT,10000)
-        CALL YESNO ('Y',ANS)
-        IF (ANS .EQ. 'N') THEN
-          KI = ' '
-          RETURN
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  AD -- Attenuator Data
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'AD' .OR. KI .EQ. 'BD') THEN
-        IF (NATTEN .EQ. 0) THEN
-          WRITE (COUT,12000)
-        ELSE
-          WRITE (COUT,12100) (ATTEN(I),I=1,NATTEN+1)
-        ENDIF
-        CALL GWRITE (ITP,' ')
-        WRITE (COUT,12200)
-        CALL YESNO ('Y',ANS)
-        IF (ANS .EQ. 'Y') THEN
-          WRITE (COUT,12300)
-          CALL FREEFM (ITR)
-          NATTEN = 0
-          ATTEN(1) = 1.0
-          DO 100, I = 1,6
-            IF (RFREE(I) .GT. 1.0) THEN
-              NATTEN = NATTEN + 1
-              ATTEN(NATTEN+1) = RFREE(I)
-            ENDIF
-  100     CONTINUE
-        ENDIF
-        IF (KI .EQ. 'AD') THEN
-          KI = ' '
-          RETURN
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  LA -- Wavelength.  When a new wavelength is to be used, the R matrix,
-C                     SINABS and IH,K,LMAX must all be changed
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'LA' .OR. KI .EQ. 'BD') THEN
-        WRITE (COUT,11000) WAVE
-        CALL FREEFM (ITR)
-        OWAVE = WAVE
-        IF (RFREE(1) .NE. 0.0) WAVE = RFREE(1)
-        WAVFAC = WAVE/OWAVE
-        IF (KI .EQ. 'LA') THEN
-          DO 110 I = 1,3
-            SINABS(I)   = WAVFAC*WAVFAC*SINABS(I)
-            SINABS(I+3) = WAVFAC*WAVFAC*SINABS(I+3)
-            DO 110 J = 1,3
-              R(I,J) = WAVFAC*R(I,J)
-  110     CONTINUE
-          S = 2.0*SIN((THEMAX*0.5)/DEG)
-          IHMAX = 1.0+S/(APS(1)*SANGS(2)*SANG(3)*WAVE)
-          IKMAX = 1.0+S/(APS(2)*SANGS(3)*SANG(1)*WAVE)
-          ILMAX = 1.0+S/(APS(3)*SANGS(1)*SANG(2)*WAVE)
-          KI = ' '
-          CALL WRBAS
-          RETURN
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  OM -- Orientation Matrix
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'OM' .OR. KI .EQ. 'BD') THEN
-        IF (KI .EQ. 'OM') THEN
-          WRITE (COUT,11000) WAVE
-          CALL FREEFM (ITR)
-          IF (RFREE(1) .NE. 0.0) WAVE = RFREE(1)
-        ENDIF
-        WRITE (COUT,13000)
-        CALL GWRITE (ITP,' ')
-        DO 120 I = 1,3
-          WRITE (COUT,13100)
-          CALL FREEFM (ITR)
-          R(I,1) = RFREE(1)
-          R(I,2) = RFREE(2)
-          R(I,3) = RFREE(3)
-  120   CONTINUE
-        DO 130 I = 1,3
-          DO 130 J = 1,3
-            R(I,J) = R(I,J)*WAVE
-  130   CONTINUE
-        KISAVE = KI
-        KI = 'OM'
-        CALL ORMAT3
-        KI = KISAVE
-        CALL WRBAS
-      ENDIF
-C-----------------------------------------------------------------------
-C  CZ -- Circle Zero Corrections
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'CZ' .OR. KI .EQ. 'BD') THEN
-        WRITE (COUT,14000) DTHETA,DOMEGA,DCHI,DPHI
-        CALL FREEFM (ITR)
-        DTHETA = RFREE(1)
-        DOMEGA = RFREE(2)
-        DCHI   = RFREE(3)
-        DPHI   = RFREE(4)
-        IF (KI .NE. 'BD') THEN
-          KI = ' '
-          CALL WRBAS
-          RETURN
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  RO -- Re-Orientation reflections for use during GO
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'RO' .OR. KI .EQ. 'BD') THEN
-        WRITE (COUT,15000)
-        CALL YESNO ('N',ANS)
-        NINTOR = 0
-        REOTOL = 10.0
-        IF (ANS .EQ. 'N') THEN
-          CALL WRBAS
-        ELSE
-          WRITE (COUT,15100)
-          CALL FREEFM (ITR)
-          NINTOR = IFREE(1)
-          IF (NINTOR .EQ. 0) NINTOR = 500
-          WRITE (COUT,15200)
-          CALL FREEFM (ITR)
-          REOTOL = RFREE(1)
-          IF (REOTOL .EQ. 0.0) REOTOL = 0.1
-          CALL WRBAS
-          CALL ALIGN
-        ENDIF
-        KI = ' '
-      ENDIF
-C-----------------------------------------------------------------------
-C  RR -- Reference Reflections
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'RR' .OR. KI .EQ. 'BD') THEN
-        WRITE (COUT,16000)
-        CALL YESNO ('Y',ANS)
-        IF (ANS. EQ. 'Y') THEN
-          WRITE (COUT,16100)
-          CALL FREEFM (ITR)
-          NSTAN  = 0
-          NINTRR = IFREE(1)
-          IF (NINTRR .EQ. 0) NINTRR = 100
-          WRITE (COUT,19000)
-          CALL GWRITE (ITP,' ')
-  140     WRITE (COUT,19100)
-          CALL FREEFM (ITR)
-          IF (IFREE(1) .NE. 0 .OR. IFREE(2) .NE. 0 .OR.
-     $        IFREE(3) .NE. 0) THEN
-            NSTAN = NSTAN + 1
-            IHSTAN(NSTAN) = IFREE(1)
-            IKSTAN(NSTAN) = IFREE(2)
-            ILSTAN(NSTAN) = IFREE(3)
-            GO TO 140
-          ENDIF
-        ELSE
-          NSTAN = 0
-          NINTRR = 0
-        ENDIF
-        IF (KI .NE. 'BD') THEN
-          KI = ' '
-          CALL WRBAS
-          RETURN
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  TM -- 2Theta min and max
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'TM' .OR. KI .EQ. 'OM' .OR. KI .EQ. 'BD' .OR.
-     $    KI .EQ. 'M2' .OR. KI .EQ. 'M3' .OR. KI .EQ. 'MM' .OR.
-     $    KI .EQ. 'TO') THEN
-        IF (KI .EQ. 'TM' .OR. KI .EQ. 'OM' .OR. KI .EQ. 'BD' .OR.
-     $      THEMAX .LT. 1.0) THEN
-          WRITE (COUT,21000) THEMIN,THEMAX
-          CALL FREEFM (ITR)
-          IF (RFREE(1) .NE. 0.0) THEMIN = RFREE(1)
-          IF (RFREE(2) .NE. 0.0) THEMAX = RFREE(2)
-          IF (ITYPE .GE. 0 .AND. ITYPE .LE. 3) THEN
-            NPTS = (AS + BS*TAN(0.5*THEMAX/DEG) + CS)*STEPDG + 0.5
-            IF (NPTS .GT. 499) THEN 
-               WRITE (COUT,22000)
-               CALL GWRITE (ITP,' ')
-            ENDIF 
-          ENDIF
-        ENDIF
-C-----------------------------------------------------------------------
-C  Optionally retain old matrix for M2, M3 or MM
-C-----------------------------------------------------------------------
-        IF (KI .EQ. 'M2' .OR. KI .EQ. 'M3' .OR. KI .EQ. 'MM' .OR.
-     $      KI .EQ. 'TO') THEN
-          WRITE (COUT,24000)
-          CALL YESNO ('Y',ANS)
-          IF (ANS .EQ. 'N') THEN
-            DO 145 I = 1,3
-              DO 145 J = 1,3
-                R(I,J) = ROLD(I,J)
-  145       CONTINUE
-          ELSE
-            DO 148 I = 1,3
-              DO 148 J = 1,3
-                R(I,J) = R(I,J)/WAVE
-  148       CONTINUE
-          ENDIF
-          CALL GETPAR
-          DO 146 I = 1,3
-            SANG(I)  = SIN(CANG(I)/DEG)
-            CANG(I)  = COS(CANG(I)/DEG)
-            SANGS(I) = SIN(CANGS(I)/DEG)
-            CANGS(I) = COS(CANGS(I)/DEG)
-  146     CONTINUE
-          DO 147 I = 1,3
-            DO 147 J = 1,3
-              R(I,J) = R(I,J)*WAVE
-  147     CONTINUE
-        ENDIF
-C-----------------------------------------------------------------------
-C  Set new h,k,l max values
-C-----------------------------------------------------------------------
-        S = 2.0*SIN((THEMAX*0.5)/DEG)
-        IHMAX = 1.0 + S/(APS(1)*SANGS(2)*SANG(3)*WAVE)
-        IKMAX = 1.0 + S/(APS(2)*SANGS(3)*SANG(1)*WAVE)
-        ILMAX = 1.0 + S/(APS(3)*SANGS(1)*SANG(2)*WAVE)
-        IF (KI .EQ. 'OM') ANS = 'Y'
-        IF (KI .NE. 'TM' .AND. KI .NE. 'BD' .AND. ANS .EQ. 'Y') 
-     $      CALL SYSPNT
-        IF (KI .NE. 'BD') THEN
-          KI = ' '
-          CALL WRBAS
-          RETURN
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  SE -- Systematic Extinction Conditions
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'SE' .OR. KI .EQ. 'BD') THEN
-        WRITE (COUT,25000)
-        CALL FREEFM (ITR)
-        NCOND = IFREE(1)
-        IF (NCOND .NE. 0) THEN
-          WRITE (COUT,28000)
-          CALL GWRITE (ITP,' ')
-          DO 150 J = 1,NCOND
-            WRITE (COUT,13100)
-            CALL FREEFM (ITR)
-            ICOND(J) = IFREE(1)
-            IHS(J) = IFREE(2)
-            IKS(J) = IFREE(3)
-            ILS(J) = IFREE(4)
-            IR(J) = IFREE(5)
-            IS(J) = IFREE(6)
-  150     CONTINUE
-        ENDIF
-        IF (KI .NE. 'BD') THEN
-          KI = ' '
-          CALL WRBAS
-          RETURN
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  SD -- Scan Control Data
-C
-C   Values of ITYPE on input & during running and IBSECT & ISCAN
-C
-C                                ITYPE
-C       Type of Operation     Input Running IBSECT3  ISCAN
-C
-C  Theta/2Theta b/P/b scan      0       0      0       0
-C  Omega b/P/b scan             1       2      0       0
-C  Compton or T.D.S.            2       0      0       1
-C  Theta/2Theta Precision scan  3       1      0       3
-C  Omega        Precision scan  4       3      0       4
-C  Peak Top Theta backgrounds   5       5      0       0
-C  Peak Top Omega backgrounds   6       6      0       0
-C  Economized Peak Top Theta    7       7      0       0
-C  Economized Peak Top Omega    8       8      0       0
-C
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'SD' .OR. KI .EQ. 'BD') THEN
-        WRITE (COUT,30000)
-        CALL FREEFM (ITR)
-        ITYPE = IFREE(1)
-        WRITE (COUT,30100) AS,BS,CS
-        CALL FREEFM (ITR)
-        IF (RFREE(1) .NE. 0.0) AS = RFREE(1)
-        IF (RFREE(2) .NE. 0.0) BS = RFREE(2)
-        IF (RFREE(3) .NE. 0.0) CS = RFREE(3)
-        IPRFLG = 1
-        IF (ITYPE .LT. 4) THEN
-          WRITE (COUT,31000)
-          CALL FREEFM (ITR)
-          IPRFLG = IFREE(1)
-        ENDIF
-        ISCAN = 0
-        IBSECT = 0
-        ITEMP = ITYPE
-        IF (ITYPE .EQ. 1) ITEMP = 2
-C        IF (ITYPE .EQ. 2) THEN
-C          ITEMP  = 0
-C          ISCAN = 1
-C        ENDIF
-        IF (ITYPE .EQ. 2) THEN
-          ITEMP  = 1
-          ISCAN = 3
-        ENDIF
-        IF (ITYPE .EQ. 3) THEN
-          ITEMP  = 3
-          ISCAN = 4
-        ENDIF
-        IF (ITYPE .GE. 4) ITEMP = ITYPE + 1
-        ITYPE = ITEMP
-        IBSECT = 0
-C       WRITE (COUT,32000)
-C       CALL FREEFM (ITR)
-C       IBSECT = IFREE(1)
-        IF (ITYPE .LT. 4) THEN
-C          WRITE (COUT,33000)
-C          CALL FREEFM (ITR)
-C          SPEED = RFREE(1)
-C          IF (SPEED .EQ. 0.0) SPEED = 4.0
-        ENDIF
-C---------------------------------------------------------------------
-C Step and Preset for TRICS
-C-------------------------------------------------------------------
-        OLDDSTEP = STEP
-        OLDPRE = PRESET
-        WRITE(COUT,33500)STEP,PRESET
-        CALL FREEFM(ITR)
-        STEP = RFREE(1)
-        PRESET = RFREE(2)
-        IF(STEP .LE. 0.)STEP = OLDSTEP
-        IF(PRESET .LE. 0)PRESET = OLDPRE
-        IF(STEP .LE. 0.)STEP = 0.02
-        IF(PRESET .LE. 0)PRESET = 10000
-C-----------------------------------------------------------------------
-C  Horizontal aperture width for CAD-4 data collection
-C-----------------------------------------------------------------------
-        IF (DFMODL .EQ. 'CAD4') THEN
-          CADSL = ICADSL/10.0
-          WRITE (COUT,33100) CADSL
-          CALL FREEFM (ITR)
-          IF (RFREE(1) .EQ. 0.0) RFREE(1) = CADSL
-          ICADSL = 10*RFREE(1) + 0.5
-          WRITE (COUT,33200)
-          CALL YESNO ('Y',ANS)
-          ICADSW = 1
-          IF (ANS .EQ. 'N') ICADSW = 0
-        ENDIF
-        STEPOF = 0.5
-        IF (IPRFLG .EQ. 0) THEN
-          WRITE (COUT,34000)
-          CALL FREEFM (ITR)
-          STEPOF = RFREE(1)
-          IF (STEPOF .EQ. 0) STEPOF = 0.5
-        ENDIF
-        IF (ITYPE .GE. 0 .AND. ITYPE .LE. 3) THEN
-          NPTS = (AS + BS*TAN(0.5*THEMAX/DEG) + CS)*STEPDG + 0.5
-          IF (NPTS .GT. 499) THEN
-             WRITE (COUT,22000)
-             CALL GWRITE (ITP,' ')
-          ENDIF 
-        ENDIF
-        IF (KI .NE. 'BD') THEN
-          KI = ' '
-          CALL WRBAS
-          RETURN
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  TP -- Time and Precision control data
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'TP' .OR. KI .EQ. 'BD') THEN
-        WRITE (COUT,35000)
-        CALL GWRITE (ITP,' ')
-        I = ITYPE
-        IF (ISCAN .EQ. 1) THEN
-          WRITE (COUT,37000)
-          CALL FREEFM (ITR)
-          FRAC = RFREE(1)
-          TMAX = RFREE(2)
-          PA = RFREE(3)
-          PM = RFREE(4)
-        ELSE
-          IF (I .EQ. 0 .OR. I .EQ. 2 .OR. I .EQ. 5 .OR. I .EQ. 6) THEN
-            WRITE (COUT,36000)
-            CALL FREEFM (ITR)
-            FRAC = RFREE(1)
-            IF (FRAC .EQ. 0.0) FRAC = 0.1
-            IF (I .EQ. 5 .OR. I .EQ. 6) THEN
-              WRITE (COUT,35900)
-              CALL FREEFM (ITR)
-              PRESET = RFREE(1)
-              IF (PRESET .EQ. 0.0) PRESET = 1000.0
-            ENDIF
-          ELSE IF (I .EQ. 1 .OR. I .EQ. 3) THEN
-            WRITE (COUT,36000)
-            CALL FREEFM (ITR)
-            FRAC = RFREE(1)
-            IF (FRAC .EQ. 0.0) FRAC = 0.1
-            WRITE (COUT,37100)
-            CALL FREEFM (ITR)
-            TMAX = RFREE(1)
-            IF (TMAX .EQ. 0.0) TMAX = 240.0
-            WRITE (COUT,37200)
-            CALL FREEFM (ITR)
-            PA = RFREE(1)
-            IF (PA .EQ. 0.0) PA = 0.02
-            WRITE (COUT,37300)
-            CALL FREEFM (ITR)
-            PM = RFREE(1)
-            IF (PM .EQ. 0.0) PM = 0.10
-          ELSE IF (I .EQ. 7 .OR. I .EQ. 8) THEN
-            WRITE (COUT,38000)
-            CALL FREEFM (ITR)
-            FRAC = RFREE(1)
-            TMAX = RFREE(2)
-            PA = RFREE(3)
-          ENDIF
-        ENDIF
-        IF (KI .NE. 'BD') THEN
-          KI = ' '
-          CALL WRBAS
-          RETURN
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  DH -- DH Matrix Data
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'DH' .OR. KI .EQ. 'BD') THEN
-        WRITE (COUT,40000)
-        CALL FREEFM (ITR)
-        NSEG = IFREE(1)
-        NMSEG = 1
-        WRITE (COUT,42000)
-        CALL GWRITE (ITP,' ')
-        DO 160 J = 1,NSEG
-          WRITE (COUT,13100)
-          CALL FREEFM (ITR)
-          IHO(J) = IFREE(1)
-          IKO(J) = IFREE(2)
-          ILO(J) = IFREE(3)
-          IDH(J,1,1) = IFREE(4)
-          IDH(J,2,1) = IFREE(5)
-          IDH(J,3,1) = IFREE(6)
-          IDH(J,1,2) = IFREE(7)
-          IDH(J,2,2) = IFREE(8)
-          IDH(J,3,2) = IFREE(9)
-          IDH(J,1,3) = IFREE(10)
-          IDH(J,2,3) = IFREE(11)
-          IDH(J,3,3) = IFREE(12)
-  160   CONTINUE
-C-----------------------------------------------------------------------
-C  Read the B.Z. limits for COMPTON or TDS
-C-----------------------------------------------------------------------
-        IF (ISCAN .EQ. 1) THEN
-          WRITE (COUT,44000)
-          CALL GWRITE (ITP,' ')
-           DO 170 J = 1,NSEG
-            WRITE (COUT,13100)
-            CALL FREEFM (ITR)
-            JA(J) = IFREE(1)
-            JB(J) = IFREE(2)
-            JC(J) = IFREE(3)
-            JMIN(J) = IFREE(4)
-            JMAX(J) = IFREE(5)
-  170     CONTINUE
-        ENDIF
-        IF (KI .EQ. 'DH') CALL SYSPNT
-        IF (KI .NE. 'BD') THEN
-          KI = ' '
-          RETURN
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  Psi Scan Data
-C-----------------------------------------------------------------------
-      IF (KI .EQ.'PS' .OR. KI .EQ. 'BD') THEN
-        WRITE (COUT,47000)
-        CALL FREEFM (ITR)
-        DPSI = RFREE(1)
-        PSIMIN = RFREE(2)
-        PSIMAX = RFREE(3)
-        IF (KI .NE. 'BD') THEN
-          KI = ' '
-          RETURN
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  FR -- First Reflection Data
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'FR' .OR. KI .EQ. 'BD') THEN
-        WRITE (COUT,49000)
-        CALL FREEFM (ITR)
-        IND(1) = IFREE(1)
-        IND(2) = IFREE(2)
-        IND(3) = IFREE(3)
-        WRITE (COUT,52000)
-        CALL FREEFM (ITR)
-        NREF = IFREE(1)
-        NMSEG = IFREE(2)
-        WRITE (COUT,53000)
-        CALL FREEFM (ITR)
-        NBLOCK = IFREE(1)
-        KI = ' '
-      ENDIF
-      RETURN
-10000 FORMAT (' Basic Data Input (Y) ',$)
-11000 FORMAT (' Type the wavelength (',F7.5,') ',$)
-12000 FORMAT (' There are no attenuators at present.')
-12100 FORMAT (' The current attenuator coefficients are'/6F8.3)
-12200 FORMAT (' Do you wish to change this (Y) ? ',$)
-12300 FORMAT (' Type the new values ',$)
-13000 FORMAT (' Type the Orientation Matrix on 3 lines.'/)
-13100 FORMAT (' > ',$)
-14000 FORMAT (' The current 2Theta, Omega, Chi and PHI zeroes are :--',
-     $        /4F7.3/,
-     $        ' Type the new values ',$)
-15000 FORMAT (' Perform re-orientation during data collection (N) ? ',$)
-15100 FORMAT (' Type the re-orientation frequency (500) ',$)
-15200 FORMAT (' Type the re-orientation angular tolerance (0.1) ',$)
-16000 FORMAT (' Measure reference reflections during data collection',
-     $        ' (Y) ? ',$)
-16100 FORMAT (' Type the measurement frequency (100) ',$)
-19000 FORMAT (' Type up to 6 sets of h,k,l values.')
-19100 FORMAT (' h,k,l > ',$)
-21000 FORMAT (' Type 2Thetamin and 2Thetamax (',F4.1,F6.1,') ',$)
-22000 FORMAT (' **WARNING** More than 500 profile points possible.'/
-     $        ' Reduce either 2theta(max), or the scan parameters',
-     $        ' AS and/or CS.')
-24000 FORMAT (' You can keep the new matrix or retain the old one.'/
-     $        ' Do you wish to keep the new matrix (Y) ? ',$)
-25000 FORMAT (' Systematic Extinction Conditions'/
-     $        ' Type the number of conditions ',$)
-28000 FORMAT (' For each condition type the following :--'/
-     $        ' A reflection class number 1 to 7,'/
-     $        ' 1=00l  2=0k0  3=h00  4=0kl  5=h0l  6=hk0  7=hkl'/
-     $        ' followed by the coefficients A to E of an equation'/
-     $        '           Ah + Bk + Cl  =  Dn + E'/
-     $        ' which is the condition for h,k,l to be present.')
-30000 FORMAT (' Scan data : Scan type, As,Bs,Cs, Profile flag.'//
-     $  ' Scan type: 0 2Theta,             1 Omega,'/
-     $  '            2 2Theta precision,   3 Omega precision,'/
-     $  '            4 2Theta peak top,    5 Omega peak top,'/
-     $  '            6 2Theta econ. pktop, 7 Omega econ. pk top;'/
-     $  ' Type the scan type (0) ',$)
-30100 FORMAT (' Reflection width in degs is  As + Bs*tan(theta) + Cs'/
-     $        ' Type the new As, Bs, Cs (',3F6.3,') ',$)
-31000 FORMAT (' Profile flag   0/1  for DO/DONT-DO profile analysis.'/
-     $        ' Type the flag (0) ',$)
-C32000 FORMAT (' Bisecting (0) or Parallel (1) mode ',$)
-33000 FORMAT (' Scan speed in deg/min 2theta or omega (4) ',$)
-33500 FORMAT (' Scan step in deg (',F8.3,
-     &   ') and Scan Preset (',F12.3,') ',
-     &   $)
-33100 FORMAT (' Horizontal aperture width in mms (',F4.1,') ',$)
-33200 FORMAT (' Try -,-,- refln if high-angle scan problems (Y) ? ',$)
-34000 FORMAT (' Fraction of A & C to step off for profile analysis',
-     $        ' (0.5) ',$)
-35000 FORMAT (' Time and Precision Parameters')
-35900 FORMAT (' Type the peak-top measuring preset (1000.0) ',$)
-36000 FORMAT (' Type the Background fraction (0.1) ',$)
-37000 FORMAT (' Type Bkfrac,Qtime,PresetMax,Pa,Pm ',$)
-37100 FORMAT (' Type the maximum preset/reflection (240) ',$)
-37200 FORMAT (' Type the precision desired (0.02) ',$)
-37300 FORMAT (' Type the minimum precision acceptable (0.10) ',$)
-38000 FORMAT (' Max Counts, Sample & Max Time (secs) ',$)
-40000 FORMAT (' Segment Data (DH Matrices)'/
-     $        ' Type the number of segments ',$)
-42000 FORMAT (' For each segment type the 12 integer values'/
-     $        '  HOO KOO LOO D11 D21 D31 D12 D22 D32 D13 D23 D33')
-44000 FORMAT (' B.Z. Limits for each segment'/
-     $        ' JA,JB,JC,Jmin,Jmax ',$)
-47000 FORMAT (' Psi Data: Dpsi,Psimin,Psimax')
-49000 FORMAT (' First Reflection Data'/
-     $        ' Type h,k,l for the reflection ',$)
-52000 FORMAT (' Type the Reflection and Segment numbers ',$)
-53000 FORMAT (' Type the Data record number ',$)
-      END
-C-----------------------------------------------------------------------
-C Get the crystal system pointer for an absolute matrix
-C-----------------------------------------------------------------------
-      SUBROUTINE SYSPNT
-      INCLUDE 'COMDIF'
-      WRITE (COUT,10000)
-      CALL GWRITE (ITP,' ')
-      IF (LAUENO .NE. 0) THEN
-        ISYS = LAUENO
-        IF (LAUENO .GE.  4 .AND. LAUENO .LE.  5) ISYS = 4
-        IF (LAUENO .GE.  6 .AND. LAUENO .LE.  7) ISYS = 6
-        IF (LAUENO .GE.  8 .AND. LAUENO .LE. 12) ISYS = 5
-        IF (LAUENO .GE. 13 .AND. LAUENO .LE. 14) ISYS = 7
-      ELSE
-        CALL SYSANG (AP,SANG,CANG,ISYS,KI)
-      ENDIF
-      ISYSAN = ISYS
-      IF (ISYS .GT. 7) ISYS = 2
-      WRITE (COUT,11000) ISYS
-      CALL FREEFM (ITR)
-      IF (IFREE(1) .NE. 0) ISYS = IFREE(1)
-      IF (ISYS .EQ. 2) THEN
-        IF (LAUENO .NE. 0) THEN
-          ISYS = NAXIS + 7
-        ELSE
-          ISYS = ISYSAN
-        ENDIF
-      ENDIF
-      CALL SINMAT
-      RETURN
-10000 FORMAT (' Select a number for the cell geometry to be used'/
-     $        ' Triclinic    1     Monoclinic    2'/
-     $        ' Orthorhombic 3     Tetragonal    4'/
-     $        ' Hexagonal    5     Rhombohedral  6     Cubic  7')
-11000 FORMAT (' Type your selection (',I1,') ',$)
-      END
-C-----------------------------------------------------------------------
-C
-C  Decide on the crystal system based on the cell-edges and angles
-C  The routine looks for differences between cell-edges which are less
-C  than a tolerance based on the cell-edge/500.0; and differnces
-C  between 90.0 and the cell angles which are less than TOLANG
-C  ICTE is the count of cell edges  which are equal within TOLIJ;
-C  ICTA is the count of cell angles which are equal to 90 within TOLANG
-C-----------------------------------------------------------------------
-      SUBROUTINE SYSANG (ABC,SANG,CANG,ISYS,KI)
-      DIMENSION ABC(3),SANG(3),CANG(3),ANG(3),
-     $          DEIJ(3),DAI(3),TOLEI(3),TOLEIJ(3)
-      CHARACTER KI*2
-      RMULT = 1.0
-      IF (KI .EQ. 'OP') RMULT = 3.0
-      TOLANG = 0.1*RMULT
-C-----------------------------------------------------------------------
-C  Make the angles from their sines and cosines; the 90 differences DA,
-C  and the cell-edge tolerances.
-C-----------------------------------------------------------------------
-      DO 100 I = 1,3
-        ANG(I) = 57.2958*ATAN2(SANG(I),CANG(I))
-        DAI(I) = ABS(90.0 - ANG(I))
-        TOLEI(I) = ABC(I)/500.0
-  100 CONTINUE
-C-----------------------------------------------------------------------
-C  Make the cell-edge differences and their tolerances
-C-----------------------------------------------------------------------
-      K = 0
-      DO 110 I = 1,2
-        DO 110 J = I+1,3
-          K = K + 1
-          DEIJ(K) = ABS(ABC(I) - ABC(J))
-          TOLEIJ(K) = RMULT*SQRT(TOLEI(I)*TOLEI(I) + TOLEI(J)*TOLEI(J))
-  110 CONTINUE
-C-----------------------------------------------------------------------
-C  Count the agreements etween cell-edges and angles
-C-----------------------------------------------------------------------
-      ICTE = 0
-      ICTA = 0
-      DO 120 I = 1,3
-        IF (DEIJ(I) .LT. TOLEIJ(I)) ICTE = ICTE + 1
-        IF (DAI(I)  .LT. TOLANG)    ICTA = ICTA + 1
-  120 CONTINUE
-C-----------------------------------------------------------------------
-C  Set ISYS according to ICTE and ICTA
-C-----------------------------------------------------------------------
-      ISYS = 0
-C-----------------------------------------------------------------------
-C  ICTE = 0 and ICTA = 0 -- Triclinic
-C-----------------------------------------------------------------------
-      IF (ICTE .EQ. 0 .AND. ICTA .EQ. 0) ISYS = 1
-C-----------------------------------------------------------------------
-C  ICTE = 0 and ICTA = 2 -- Monoclinic
-C-----------------------------------------------------------------------
-  130 IF (ICTE .EQ. 0 .AND. ICTA .EQ. 2) THEN
-        IF (DAI(1) .GT. TOLANG) ISYS =  8
-        IF (DAI(2) .GT. TOLANG) ISYS =  9
-        IF (DAI(3) .GT. TOLANG) ISYS = 10
-      ENDIF
-C-----------------------------------------------------------------------
-C  ICTE = 0 and ICTA = 3 -- Orthorhombic
-C-----------------------------------------------------------------------
-      IF (ICTE .EQ. 0 .AND. ICTA .EQ. 3) ISYS = 3
-C-----------------------------------------------------------------------
-C  ICTE = 1 and ICTA = 3 -- Tetragonal
-C-----------------------------------------------------------------------
-      IF (ICTE .EQ. 1 .AND. ICTA .EQ. 3) ISYS = 4
-C-----------------------------------------------------------------------
-C  ICTE = 1 and ICTA = 2 -- Hexagonal (maybe monoclinic)
-C-----------------------------------------------------------------------
-      IF (ICTE .EQ. 1 .AND. ICTA .EQ. 2) THEN
-        IF (ABS(120.0 - ANG(3)) .LT. TOLANG) THEN
-          ISYS = 5
-        ELSE
-          ICTE = 0
-          GO TO 130
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  ICTE = 3 and ICTA = 0 -- Rhombohedral
-C-----------------------------------------------------------------------
-      IF (ICTE .EQ. 3 .AND. ICTA .EQ. 0) ISYS = 6
-C-----------------------------------------------------------------------
-C  ICTE = 3 and ICTA = 3 -- Cubic
-C-----------------------------------------------------------------------
-      IF (ICTE .EQ. 3 .AND. ICTA .EQ. 3) ISYS = 7
-C-----------------------------------------------------------------------
-C  Safety - just in case !
-C-----------------------------------------------------------------------
-      IF (ISYS .EQ. 0) ISYS = 1
-      RETURN
-      END
diff --git a/difrac/begin.f b/difrac/begin.f
deleted file mode 100644
index a26b7876..00000000
--- a/difrac/begin.f
+++ /dev/null
@@ -1,436 +0,0 @@
-C-----------------------------------------------------------------------
-C  This subroutine reads the info necessary to start the data collection
-C  at the start of data collection and at each new segment 
-C  Modified to give output to ITP-->SICS, MK
-C-----------------------------------------------------------------------
-      SUBROUTINE BEGIN
-      INCLUDE 'COMDIF'
-      DIMENSION INDX(3),ISET(25),DHC(3,3),JUNKP(200),FDH(3,3),
-     $          FDHI(3,3)
-      EQUIVALENCE (ACOUNT(301),JUNKP(1))
-      IRES = 0
-  100 IF (ISEG .EQ. 0) THEN
-        IF (IAUTO .NE. 1) THEN
-C-----------------------------------------------------------------------
-C  GO entry point
-C-----------------------------------------------------------------------
-          WRITE (COUT,10000)
-          CALL YESNO ('Y',ANS)
-          IF (ANS .EQ. 'N') THEN
-            KI = ' '
-            RETURN
-          ENDIF
-C-----------------------------------------------------------------------
-C  Save the Basic Data in the first 3 blocks of the IDATA file
-C-----------------------------------------------------------------------
-          CALL WRBAS
-          IF (ILN .EQ. 1) THEN
-            WRITE (COUT,11000)
-            CALL YESNO ('Y',ANS)
-            IF (ANS .EQ. 'N') ILN = 0
-          ENDIF
-C-----------------------------------------------------------------------
-C  Is this run manual?
-C-----------------------------------------------------------------------
-          IF (IKO(5) .NE. -777) THEN
-            WRITE (COUT,12000)
-            CALL YESNO ('Y',ANS)
-            IF (ANS .EQ. 'Y') THEN
-              NB = 1
-              GO TO 200
-            ENDIF
-          ENDIF
-C-----------------------------------------------------------------------
-C  Was the last automatic run stopped by K or Q ?
-C-----------------------------------------------------------------------
-          IKO(5) = -777
-          IAUTO = 1
-          CALL WRBAS
-C-----------------------------------------------------------------------
-C  IHO(5) = 0/1 Normal sequence/Pointer mode
-C  IHO(6) = Sequence number of the present set in the Pointer mode
-C  IHO(7) = 0/1 Do not/Do measure the translation-element absences
-C  IHO(8),IKO(8),ILO(8) = Indices of current reflection
-C  IKO(5) = -777 if DH matrices were NOT typed in
-C  IKO(6) = 0/1 Acentric/Centric Space-group
-C-----------------------------------------------------------------------
-          IHO(5) = 0
-          ZERO = 0
-          SAVE = NBLOCK
-          READ  (IID,REC=9) IRES,IND,NSET,IPOINT,IHO(5)
-          WRITE (IID,REC=9) ZERO
-          NBLOCK = SAVE
-C-----------------------------------------------------------------------
-C  Propose an automatic restart
-C-----------------------------------------------------------------------
-          IF (IRES .EQ. 1) THEN
-            WRITE (COUT,13000)
-            CALL YESNO ('Y',ANS)
-            IF (ANS .EQ. 'Y') GO TO 170
-          ENDIF
-C-----------------------------------------------------------------------
-C  Call the space-group generation routines
-C-----------------------------------------------------------------------
-          IOUT = -1
-          CALL SPACEG (IOUT,1)
-        ENDIF
-C-----------------------------------------------------------------------
-C  The information written by the space-group routines is :--
-C             LATCEN   Lattice-centering code
-C                  1=P  2=A  3=B  4=C  5=I  6=F  7=R
-C             NSYM     Number of matrices generated
-C             JRT      The matrices generated 
-C             IPOINT   The number of set pointers entered
-C             ICENT    0/1 Acentric/Centric
-C             JUNKP    The set pointers
-C             LAUENO   The Laue group code
-C       1=-1,  2=2/m,    3=mmm,    4=4/m,   5=4/mmm,  6=R-3R,  7=R-3mR
-C       8=-3,  9=-31m,  10=-3m1,  11=6/m,  12=6/mmm,  13=m3,  14=m3m
-C-----------------------------------------------------------------------
-        NUMDH = NSEG
-        IPOINT = NSET
-        IKO(6) = ICENT
-C-----------------------------------------------------------------------
-C  Constrain the orientation matrix according to the Laue group
-C-----------------------------------------------------------------------
-        IF (                    LAUENO .GE. 13) ISYS = 7
-        IF (LAUENO .GE. 8 .AND. LAUENO .LT. 13) ISYS = 5
-        IF (LAUENO .GE. 6 .AND. LAUENO .LT.  8) ISYS = 6
-        IF (LAUENO .LT. 6) THEN
-          ISYS = LAUENO
-          IF (LAUENO .EQ. 5) ISYS = 4
-          IF (LAUENO .EQ. 2) ISYS = 7 + NAXIS
-        ENDIF
-        CALL SINMAT
-C-----------------------------------------------------------------------
-C  Propose a package deal.  
-C  Start at Refln 1, Segment 1, Set 1, at Record 20
-C-----------------------------------------------------------------------
-        WRITE (COUT,14000)
-        CALL YESNO ('Y',ANS)
-        IF (ANS .EQ. 'Y') THEN
-          NREF = 1
-          NMSEG = 1
-          NSET = 1
-          IPOINT = 1
-          NBLOCK = 20
-          IND(1) = 0
-          IND(2) = 0
-          IND(3) = 0
-        ELSE
-C-----------------------------------------------------------------------
-C  Get detailed information from the terminal
-C-----------------------------------------------------------------------
-          WRITE (COUT,15000)
-          CALL FREEFM (ITR)
-          IND(1) = IFREE(1)
-          IND(2) = IFREE(2)
-          IND(3) = IFREE(3)
-          WRITE (COUT,16000)
-          CALL FREEFM (ITR)
-          NREF = IFREE(1)
-C-----------------------------------------------------------------------
-C  Pointer mode
-C-----------------------------------------------------------------------
-          IF (IHO(5) .NE. 0) THEN
-  110       WRITE (COUT,17000)
-            CALL FREEFM (ITR)
-            ITEMP1 = IFREE(1)
-            IF (ITEMP1 .LT. 0) THEN
-              WRITE (COUT,18000)
-              CALL GWRITE (ITP,' ')
-              GO TO 110
-            ENDIF
-            WRITE (COUT,19000)
-            CALL FREEFM (ITR)
-            NMSEG  = IFREE(1)
-C      write (6,99991) itemp1,ipoint
-C99991 format (' itemp1,ipoint',2i5)
-            IF (ITEMP1 .LT. IPOINT) IPOINT = ITEMP1
-          ELSE
-C-----------------------------------------------------------------------
-C  Normal sequence 1,-1,2,-2....
-C-----------------------------------------------------------------------
-            WRITE (COUT,20000)
-            CALL FREEFM (ITR)
-            NSET  = IFREE(1)
-            NMSEG = IFREE(2)
-          ENDIF
-          WRITE (COUT,21000)
-          CALL FREEFM (ITR)
-          NBLOCK = IFREE(1)
-C-----------------------------------------------------------------------
-C  Find the equivalent in Set 1 of the starting reflection
-C-----------------------------------------------------------------------
-          IF (IHO(5) .NE. 0) THEN
-            READ (IID,REC=4) (JUNK,J = 1,52),(JUNKP(J),J = 1,25)
-C      write (6,99992) iho(5),ipoint,junkp(ipoint)
-C99992 format (' iho(5),ipoint,junkp ',3i5)
-            NSET = JUNKP(IPOINT)
-          ENDIF
-          MSET = 1
-          IF (NSET .LT. 0) MSET = -1
-          NSET = NSET*MSET
-          DO 120 I = 1,3
-            DO 120 J = 1,3
-              FDH(I,J) = JRT(I,J,NSET)*MSET
-  120     CONTINUE
-          CALL MATRIX (FDH,FDHI,FDHI,FDHI,'INVERT')
-          DO 130 J = 1,3
-            JUNKP(J) = 0
-            DO 130 I = 1,3
-              JUNKP(J) = JUNKP(J)+IND(I)*FDHI(I,J)
-  130     CONTINUE
-C-----------------------------------------------------------------------
-C  Store its indices in IND
-C-----------------------------------------------------------------------
-          DO 140 I = 1,3
-            IND(I) = JUNKP(I)
-  140     CONTINUE
-          NSET = NSET*MSET
-        ENDIF
-C-----------------------------------------------------------------------
-C  Are there lattice-mode absences ?
-C  NCOND = -1 if lattice absences are to be applied
-C        =  0 if no lattice absences 
-C        >  0 if specified absences (SE) to be applied
-C-----------------------------------------------------------------------
-        NCOND = 0
-        IF (LATCEN .NE. 1) THEN 
-          WRITE (COUT,22000)
-          CALL YESNO ('N',ANS)
-          IF (ANS .EQ. 'N') NCOND = -1
-        ENDIF
-C-----------------------------------------------------------------------
-C  Are there translation elements and if so, are they to be measured ?
-C-----------------------------------------------------------------------
-        DO 150 M = 1,NSYM
-          DO 150 I = 1,3
-            IF (JRT(I,4,M) .NE. 0) THEN
-              IHO(7) = 0
-              WRITE (COUT,23000)
-              CALL YESNO ('Y',ANS)
-              IF (ANS .EQ. 'N') IHO(7) = 1
-              GO TO 160
-            ENDIF
-  150   CONTINUE
-        IHO(7) = 0
-  160   WRITE (COUT,24000)
-        CALL YESNO ('Y',ANS)
-        IF (ANS .EQ. 'N') THEN
-          KI = ' '
-          RETURN
-        ENDIF
-C-----------------------------------------------------------------------
-C  Attach the profile file to unit 7 if wanted
-C-----------------------------------------------------------------------
-  170   CALL RSW (9,J)
-        IF (J .EQ. 1) THEN
-          WRITE (COUT,25000)
-          PRNAME = 'DONT DO IT'//' '
-          CALL ALFNUM (PRNAME)
-          IF (PRNAME .EQ. ' ') PRNAME = 'PROFL7.DAT'
-          IDREC = 32*IBYLEN
-          IPR = IOUNIT(7)
-          STATUS = 'DU'
-          CALL IBMFIL (PRNAME,IPR,IDREC,STATUS,IERR)
-          CALL LENFIL (IPR,NPR)
-        ENDIF
-C-----------------------------------------------------------------------
-C  Everything is now known, start here in the automatic mode
-C-----------------------------------------------------------------------
-        READ (IID,REC=4) LATCEN,NUMDH,(IHO(I),IKO(I),ILO(I),
-     $                 ((IDH(I,J,M),J = 1,3),M = 1,3),I = 1,4),NSYM,
-     $                   LSET,ISET,LAUENO,NAXIS,ICENT
-        READ (IID,REC=5) (((JRT(I,J,K),I = 1,3),J = 1,4),K =  1, 6)
-        READ (IID,REC=6) (((JRT(I,J,K),I = 1,3),J = 1,4),K =  7,12)
-        READ (IID,REC=7) (((JRT(I,J,K),I = 1,3),J = 1,4),K = 13,18)
-        READ (IID,REC=8) (((JRT(I,J,K),I = 1,3),J = 1,4),K = 19,24)
-        NSEG = NUMDH
-        MSET = 1
-C-----------------------------------------------------------------------
-C  Pointer mode
-C-----------------------------------------------------------------------
-        IF (IHO(5) .NE. 0) THEN
-          IF (NMSEG .GT. NSEG) THEN
-            NMSEG = 1
-            IPOINT = IPOINT+1
-          ENDIF
-          NSET = ISET(IPOINT)
-          IHO(6) = IPOINT
-        ENDIF
-        IF (NSET .LE. 0) THEN
-          MSET = -1
-          NSET = -NSET
-        ENDIF
-        DO 180 I = 1,3
-          DO 180 J = 1,3
-            IDH(8,I,J) = JRT(I,J,NSET)*MSET
-  180   CONTINUE
-        NSET = NSET*MSET
-C-----------------------------------------------------------------------
-C  Start here in the Manual Mode.  Set record pointer NB to 1 and 
-C  re-orientation reflection counter NREFOR to NREF
-C-----------------------------------------------------------------------
-        NB = 1
-        NREFOR = NREF
-      ENDIF
-C-----------------------------------------------------------------------
-C Sequence to set new segment parameters
-C-----------------------------------------------------------------------
-  200 IF (IAUTO .EQ. 1) THEN
-C-----------------------------------------------------------------------
-C  Calculate and output the data collection info in the automatic mode
-C-----------------------------------------------------------------------
-        DO 210 M = 1,3
-          DO 210 J = 1,3
-            DHC(J,M) = 0
-            DO 210 I = 1,3
-              DHC(J,M) = DHC(J,M)+IDH(NMSEG,I,M)*IDH(8,I,J)
-  210   CONTINUE
-        NG = NMSEG
-        INH = IHO(NG)*IDH(8,1,1)+IKO(NG)*IDH(8,2,1)+ILO(NG)*IDH(8,3,1)
-        INK = IHO(NG)*IDH(8,1,2)+IKO(NG)*IDH(8,2,2)+ILO(NG)*IDH(8,3,2)
-        INL = IHO(NG)*IDH(8,1,3)+IKO(NG)*IDH(8,2,3)+ILO(NG)*IDH(8,3,3)
-        WRITE (COUT,26000) NSET,NMSEG,INH,INK,INL,DHC
-        CALL GWRITE(ITP,' ')
-      ENDIF
-C-----------------------------------------------------------------------
-C  Select the new segment
-C-----------------------------------------------------------------------
-      ISEG = 0
-      DO 220 I = 1,3
-        DO 220 J = 1,3
-          NDH(I,J) = IDH(NMSEG,I,J)
-  220 CONTINUE
-C-----------------------------------------------------------------------
-C  Find the starting reflection
-C-----------------------------------------------------------------------
-      IH0 = IHO(NMSEG)
-      IK0 = IKO(NMSEG)
-      IL0 = ILO(NMSEG)
-      IF (IND(1) .EQ. 0 .AND. IND(2) .EQ. 0 .AND. IND(3) .EQ. 0) THEN
-        IND(1) = IH0
-        IND(2) = IK0
-        IND(3) = IL0
-      ENDIF
-C-----------------------------------------------------------------------
-C  Invert the current segment
-C-----------------------------------------------------------------------
-      DO 230 I = 1,3
-        DO 230 J = 1,3
-          FDH(I,J) = NDH(I,J)
-  230 CONTINUE
-      CALL MATRIX (FDH,FDHI,FDHI,FDHI,'INVERT')
-      DO 240 I = 1,3
-        INDX(I) = FDHI(I,1)*(IND(1) - IH0) +
-     $            FDHI(I,2)*(IND(2) - IK0) +
-     $            FDHI(I,3)*(IND(3) - IL0)
-        IF (INDX(I) .GE. 0) INDX(I) = INDX(I) + 0.5
-        IF (INDX(I) .LT. 0) INDX(I) = INDX(I) - 0.5
-  240 CONTINUE
-C-----------------------------------------------------------------------
-C  Calculate the starting reflection matrix
-C-----------------------------------------------------------------------
-      IFSHKL(1,1) = NDH(1,1)*INDX(1) + IH0
-      IFSHKL(2,1) = NDH(2,1)*INDX(1) + IK0
-      IFSHKL(3,1) = NDH(3,1)*INDX(1) + IL0
-      DO 250 I = 1,3
-        IFSHKL(I,2) = NDH(I,2)*INDX(2) + IFSHKL(I,1)
-        IFSHKL(I,3) = NDH(I,3)*INDX(3) + IFSHKL(I,2)
-  250 CONTINUE
-      IH = IFSHKL(1,3)
-      IK = IFSHKL(2,3)
-      IL = IFSHKL(3,3)
-C-----------------------------------------------------------------------
-C  Set IUPDWN for incrementing the indices
-C    IUPDWN = 1 if INDX(2) is even
-C    IUPDWN =-1 if INDX(2) is odd
-C-----------------------------------------------------------------------
-      I = INDX(2)
-      IF (I .LT. 0) I = -I
-      I = I-2*(I/2)
-      IUPDWN = 1
-      IF (I .NE. 0) IUPDWN = -1
-      ISTOP = 0
-      IF (IH .EQ. IFSHKL(1,2) .AND. IK .EQ. IFSHKL(2,2) .AND.
-     $    IL .EQ. IFSHKL(3,2) .AND. IUPDWN .EQ. -1) ISTOP = 1
-C-----------------------------------------------------------------------
-C  Find the indices of the 1st refln in the current set for printing
-C-----------------------------------------------------------------------
-      IF (IAUTO .EQ. 1) THEN
-        IHO(8) = IH
-        IKO(8) = IK
-        ILO(8) = IL
-        ITEMP1 = IH*IDH(8,1,1) + IK*IDH(8,2,1) + IL*IDH(8,3,1)
-        ITEMP2 = IH*IDH(8,1,2) + IK*IDH(8,2,2) + IL*IDH(8,3,2)
-        ITEMP3 = IH*IDH(8,1,3) + IK*IDH(8,2,3) + IL*IDH(8,3,3)
-        IH = ITEMP1
-        IK = ITEMP2
-        IL = ITEMP3
-      ENDIF
-C-----------------------------------------------------------------------
-C  If Psi rotation is asked for, check if it is rrrreally wanted!
-C-----------------------------------------------------------------------
-      IF (DPSI .NE. 0.0) THEN
-        WRITE (COUT,27000)
-        CALL YESNO ('N',ANS)
-        IF (ANS .EQ. 'N') DPSI = 0.0
-      ENDIF
-C-----------------------------------------------------------------------
-C  Write all this to IDATA just for safety
-C-----------------------------------------------------------------------
-      CALL WRBAS
-C-----------------------------------------------------------------------
-C  Do re-orientation if wanted, but not at the very start
-C-----------------------------------------------------------------------
-      IF (NINTOR .NE. 0 .AND. NREF .NE. 0) THEN
-        NDIFF = NREF - NREFOR
-        I = NDIFF - NINTOR*(NDIFF/NINTOR)
-        IF (I .EQ. 0) THEN
-          IORNT = 1
-          CALL ALIGN
-          CALL LSORMT
-        ENDIF
-        IORNT = 0
-      ENDIF
-C-----------------------------------------------------------------------
-C  Measure standards in STDMES and then data proper
-C-----------------------------------------------------------------------
-      CALL STDMES
-      IF (KQFLAG .EQ. 1) THEN
-        CALL GOLOOP
-        IF (KI .EQ. 'GO') GO TO 100
-C-----------------------------------------------------------------------
-C  This is the return to KEYS
-C-----------------------------------------------------------------------
-      ELSE
-        KI = ' '
-      ENDIF
-      RETURN
-10000 FORMAT (' Start Data Collection (Y) ? ',$)
-11000 FORMAT (' Is this a Low-Temperature run (Y) ? ',$)
-12000 FORMAT (' Use the DH matrices already typed in (Y) ? ',$)
-13000 FORMAT (' Is this an Automatic Restart (Y) ? ',$)
-14000 FORMAT (' Start at Reflection 1, Segment 1, Set 1, Record 20',
-     $        ' (Y) ? ',$)
-15000 FORMAT (' Type the indices of the Starting Reflection ',$)
-16000 FORMAT (' Type the reflection number ',$)
-17000 FORMAT (' Type the sequence number of the starting set ',$)
-18000 FORMAT (' The sequence number cannot be negative.'/
-     $        ' The sequence number is the position of the starting',
-     $        ' set in the'/
-     $        ' previously typed in list of set numbers.')
-19000 FORMAT (' Type the segment number ',$)
-20000 FORMAT (' Type the set and segment numbers ',$)
-21000 FORMAT (' Type the Idata record number ',$)
-22000 FORMAT (' Measure the lattice-mode absences (N) ? ',$)
-23000 FORMAT (' Measure the Translation-element absences (Y) ? ',$)
-24000 FORMAT (' Force the shutter open now if necessary.'/
-     $        ' Is everything OK (Y) ? ',$)
-25000 FORMAT (' Type the name of the profile file (PROFL7.DAT) ',$)
-26000 FORMAT (///' Set ',I3,4X,'Segment ',I2,4X,'Matrix',
-     $        3I3,4X,3(3F3.0,2X))
-27000 FORMAT (' Psi rotation is turned on.',
-     $        '  Do you really want it (N) ? ',$)
-      END
diff --git a/difrac/bigchi.f b/difrac/bigchi.f
deleted file mode 100644
index 24fdc4ae..00000000
--- a/difrac/bigchi.f
+++ /dev/null
@@ -1,146 +0,0 @@
-C-----------------------------------------------------------------------
-C
-C  Find Reflections with Chi Values .GT. CHIMIN which are suitable for 
-C  Psi Rotation, particularly on Kappa geometry machines
-C  
-C  The routine does the following :--
-C   1. Finds the exact indices for the Euler angles 
-C      theta = THTMAX,  omega = 0,  chi = 90,  phi = 0.
-C   2. Finds the exact, i.e fractional, min/max values of h,k,l for
-C      theta = THTMAX,  omega = 0,  chi = 80, phi = 0 to 350 in steps 
-C      of 10 degrees.
-C   3. Searches from theta = 0 to THTMAX in steps of 0.01 in sin(theta),
-C      for reflections with chi greater than CHIMIN, using h,k,l limits
-C      which are proportional to those found at THTMAX in step 2.
-C
-C-----------------------------------------------------------------------
-      SUBROUTINE BIGCHI
-      INCLUDE 'COMDIF'
-      DIMENSION RHKL(3),RMNMXH(2,3),MNMXH(2,3),X(3),RM1(3,3)
-      EQUIVALENCE (RHKL(1),RH),(RHKL(2),RK),(RHKL(3),RL),
-     $            (MNMXH(1,1),MINH),(MNMXH(2,1),MAXH),
-     $            (MNMXH(1,2),MINK),(MNMXH(2,2),MAXK),
-     $            (MNMXH(1,3),MINL),(MNMXH(2,3),MAXL),
-     $            (X(1),X1),(X(2),X2),(X(3),X3)
-C-----------------------------------------------------------------------
-C  Get CHIMIN and THTMAX 
-C-----------------------------------------------------------------------
-      WRITE (COUT,10000)
-      CALL FREEFM (ITR)
-      CHIMIN = RFREE(1)
-      IF (CHIMIN .EQ. 0.0) CHIMIN = 80.0
-      WRITE (COUT,11000) THEMAX
-      CALL FREEFM (ITR)
-      THTMAX = RFREE(1)
-      IF (THTMAX .EQ. 0.0) THTMAX = THEMAX
-C-----------------------------------------------------------------------
-C  Calculate h,k,l for THTMAX,0,90,0
-C-----------------------------------------------------------------------
-      CALL MATRIX (R,RM1,RM1,RM1,'INVERT')
-      THETA = 0.5*THTMAX/DEG
-      OMEGA =  0.0
-      CHI   = 90.0/DEG
-      PHI   =  0.0
-      CALL ANGTOH (RH,RK,RL,RM1)
-      WRITE (COUT,12000) THTMAX,RH,RK,RL,CHIMIN
-      CALL GWRITE (ITP,' ')
-      WRITE (LPT,12000) THTMAX,RH,RK,RL,CHIMIN
-C-----------------------------------------------------------------------
-C  Find the min and max h,k and l at theta = 90 and chi = 80 for 
-C  phi from 0 to 350 in steps of 10deg
-C-----------------------------------------------------------------------
-      DO 100 I = 1,3
-        RMNMXH(1,I) =  10000
-        RMNMXH(2,I) = -10000
-  100 CONTINUE
-      THETA = 90.0/DEG
-      OMEGA =  0.0
-      CHI   = CHIMIN/DEG
-      DO 110 IPHI = 0,350,10
-        PHI = IPHI/DEG
-        CALL ANGTOH (RH,RK,RL,RM1)
-        DO 105 I = 1,3
-          IF (RHKL(I) .LT. RMNMXH(1,I)) RMNMXH(1,I) = RHKL(I)
-          IF (RHKL(I) .GT. RMNMXH(2,I)) RMNMXH(2,I) = RHKL(I)
-  105   CONTINUE
-  110 CONTINUE
-C-----------------------------------------------------------------------
-C  Loop over the min/max indices for shells of 0.01 sin(theta) from
-C  theta 0.0 to THTMAX/2.0
-C-----------------------------------------------------------------------
-      IHSAVE = IH
-      IKSAVE = IK
-      ILSAVE = IL
-      STMIN2 = 0.0
-      STMAX = SIN(0.5*THTMAX/DEG)
-      NTHETA = 1.0 + STMAX/0.01
-      DO 150 N = 1,NTHETA
-        SMAX = N*0.01
-        IF (SMAX .GT. STMAX) SMAX = STMAX
-        DO 115 J = 1,3
-          DO 115 I = 1,2
-            TEMP = SMAX*RMNMXH(I,J)
-            ROUND = 0.5
-            IF (TEMP .LT. 0.0) ROUND = -0.5
-            MNMXH(I,J) = TEMP + ROUND
-  115   CONTINUE
-        STMAX2 = 4.0*SMAX*SMAX
-        OMEGA = 0.0
-        DO 140 JH = MINH,MAXH
-          DO 130 JK = MINK,MAXK
-            DO 120 JL = MINL,MAXL
-              IF (JH .NE. 0 .OR. JK .NE. 0 .OR. JL .NE. 0) THEN
-                X1 = JH*R(1,1) + JK*R(1,2) + JL*R(1,3)
-                X2 = JH*R(2,1) + JK*R(2,2) + JL*R(2,3)
-                X3 = JH*R(3,1) + JK*R(3,2) + JL*R(3,3)
-                SUM = X1*X1 + X2*X2 + X3*X3
-                STHT2 = SUM
-                IF (STHT2 .GE. STMIN2 .AND. STHT2 .LT. STMAX2) THEN
-                  IPRVAL = 0
-                  IH = JH
-                  IK = JK
-                  IL = JL
-                  CALL DEQHKL (NHKL,0)
-                  IF (IVALID .EQ. 0) THEN
-                    CALL CALANG (X)
-                    IF (CHI .GT. CHIMIN) THEN
-                      WRITE (LPT,13000) JH,JK,JL,THETA,OMEGA,CHI,PHI
-                      WRITE (COUT,13000) JH,JK,JL,THETA,OMEGA,CHI,PHI
-                      CALL GWRITE (ITP,' ')
-                    ENDIF
-                  ENDIF
-                ENDIF
-              ENDIF
-  120       CONTINUE
-  130     CONTINUE
-  140   CONTINUE
-        STMIN2 = STMAX2
-  150 CONTINUE
-      IH = IHSAVE
-      IK = IKSAVE
-      IL = ILSAVE
-      KI = ' '
-      RETURN
-10000 FORMAT (/10X,'Search for Reflections with High Chi Values'//
-     $        ' Type the minimum acceptable chi value (80) ',$)
-11000 FORMAT (' Type 2theta(max) (',F5.1,') ',$)
-12000 FORMAT (' h,k,l for 2theta',F8.3,', Chi 90 ',3F8.3/
-     $        ' Reflections with chi greater than',F8.3/
-     $        '   h   k   l   2theta    omega    chi      phi')
-13000 FORMAT (3I4,4F9.3)
-      END
-C-----------------------------------------------------------------------
-C  Subroutine to compute h,k,l from Euler angles with omega = 0
-C-----------------------------------------------------------------------
-      SUBROUTINE ANGTOH (RH,RK,RL,RM1)
-      INCLUDE 'COMDIF'
-      DIMENSION RM1(3,3)
-      TEMP = 2.0*SIN(THETA)
-      X1 = TEMP*COS(CHI)*COS(PHI)
-      X2 = TEMP*COS(CHI)*SIN(PHI)
-      X3 = TEMP*SIN(CHI)
-      RH = RM1(1,1)*X1 + RM1(1,2)*X2 + RM1(1,3)*X3
-      RK = RM1(2,1)*X1 + RM1(2,2)*X2 + RM1(2,3)*X3
-      RL = RM1(3,1)*X1 + RM1(3,2)*X2 + RM1(3,3)*X3
-      RETURN
-      END
diff --git a/difrac/blind.f b/difrac/blind.f
deleted file mode 100644
index 3f0430e7..00000000
--- a/difrac/blind.f
+++ /dev/null
@@ -1,727 +0,0 @@
-C--------------------------------------------------------------------
-C                    Index Reflections found by OC
-C
-C  The algorithm used is that described by R.A.Jacobsen in the
-C  program BLIND (Bravais Lattice and INdex Determination), which is
-C  described in Ames Lab Report IS-3469,  September 1974.
-C
-C  Adapted by P.S.White and E.J.Gabe  April, 92.
-C--------------------------------------------------------------------
-      SUBROUTINE BLIND
-      INCLUDE 'COMDIF'
-      DIMENSION XX(NSIZE),YY(NSIZE),ZZ(NSIZE)
-      WRITE (COUT,10000)
-      CALL FREEFM (ITR)
-      ISELEC = IFREE(1)
-      IF (ISELEC .EQ. 0) THEN
-         ISELEC = 1
-      ELSE IF (ISELEC .EQ. 2) THEN
-         CALL EDLIST
-         WRITE (COUT,11000)
-         CALL YESNO ('Y',ANS)
-         IF (ANS .EQ. 'Y') ISELEC = 1
-      ENDIF
-      IF (ISELEC .EQ. 1) THEN
-         IVALID = 0
-         DD = 0.080
-         DJ = 0.0
-         MJ = 0
-C--------------------------------------------------------------------
-C  Input the data and prepare the working X, Y, Zs.
-C--------------------------------------------------------------------
-         CALL PRPXYZ (XX,YY,ZZ,LMT)
-C--------------------------------------------------------------------
-C  Do the indexing and reduction to a minimum cell
-C--------------------------------------------------------------------
-         IF (IVALID .EQ. 0) THEN
-           CALL INDRED (LMT,XX,YY,ZZ,DD,DJ,MJ)
-           IF (IVALID .EQ. 0) CALL LISTER
-         ENDIF
-      ENDIF
-      KI = ' '
-      RETURN
-10000 FORMAT (' Index Reflections and derive an Orientation Matrix'/
-     $        ' 1) Index reflections in the list from PK '/
-     $        ' 2) List and edit the reflections'/
-     $        ' 3) Cancel'//
-     $        ' Enter option (1) ',$)
-11000 FORMAT (' Do you want to index the reflections (Y) ? ',$)
-      END
-C--------------------------------------------------------------------
-C  Do the actual indexing
-C--------------------------------------------------------------------
-      SUBROUTINE INDRED (LMT,XX,YY,ZZ,DD,DJ,MJ)
-      INCLUDE 'COMDIF'
-      DIMENSION B(3,3)
-      DIMENSION XX(NSIZE),YY(NSIZE),ZZ(NSIZE),
-     $          XH(3,NSIZE),A(3,3),JH(3,NSIZE)
-      EQUIVALENCE (BLINDR,B)
-      IZ = IABS(MJ)
-  100 DO 110 J = 1,3
-        B(1,J) = XX(J)
-        B(2,J) = YY(J)
-        B(3,J) = ZZ(J)
-  110 CONTINUE
-      CALL INVERT (B,A,D)
-      DO 120 J = 1,3
-        DO 120 I = 1,LMT
-          XH(J,I) = A(J,1)*XX(I) + A(J,2)*YY(I) + A(J,3)*ZZ(I)
-  120 CONTINUE
-      MM = 0
-      CALL TRYIND (XH,LMT,DD,IZ)
-      IF (DD .EQ. 0.100) THEN
-        DD = -0.010
-        GO TO 100
-      ENDIF
-      CALL COMPB (XX,YY,ZZ,B,XH,LMT)
-      CALL REDCL1 (B,A)
-      DO 140 I = 4,LMT
-         DO 130 J = 1,3
-            XH(J,I) = A(J,1)*XX(I) + A(J,2)*YY(I) + A(J,3)*ZZ(I)
-            IF (XH(J,I) .LT. 0.0) LB = XH(J,I) - 0.5
-            IF (XH(J,I) .GE. 0.0) LB = XH(J,I) + 0.5
-            IF (ABS(XH(J,I) - LB) .GT. DD) MM = 1
-            JH(J,I) = LB
-  130    CONTINUE
-  140 CONTINUE
-      IF (MM .EQ. 1) GO TO 100
-      IF (MJ .LT. 0) THEN
-         CALL INVERT (B,A,D)
-         IF ((DJ + 0.1) .GT. (1.0/ABS(D)) .AND.
-     $       (DJ - 0.1) .LT. (1.0/ABS(D))) GO TO 100
-      ENDIF
-      CALL CALCEL (B,A,D)
-      WRITE (COUT,10000)
-      CALL GWRITE (ITP,' ')
-      DO 150 I = 4,LMT,4
-        WRITE (COUT,11000) (JH(1,J),JH(2,J),JH(3,J),J = I,I+3)
-        CALL GWRITE (ITP,' ')
-  150 CONTINUE
-      WRITE (COUT,12000)
-      CALL GWRITE (ITP,' ')
-      WRITE (COUT,13000) ((B(I,J),J = 1,3),I = 1,3)
-      CALL GWRITE (ITP,' ')
-      RETURN
-10000 FORMAT (/4('   h   k   l    '))
-11000 FORMAT (4(3I4,4X))
-12000 FORMAT (/' Orientation Matrix:')
-13000 FORMAT (3F10.6/3F10.6/3F10.6/)
-      END
-C--------------------------------------------------------------------
-C  Reduce the cell via REDCL2
-C--------------------------------------------------------------------
-      SUBROUTINE REDCL1 (B,A)
-      INCLUDE 'COMDIF'
-      DIMENSION    B(3,3),A(3,3),W(4),AB(3,3),V(6),L(7)
-      W(1) = 1.0E9
-      W(2) = W(1)
-      W(3) = W(1)
-      W(4) = W(1)
-      CALL INVERT (B,AB,D)
-      CALL REDCL2 (AB,V,L)
-      DO 120 I = 1,3
-        DO 110 J = 1,3
-          IF (V(I) .LT. W(J)) THEN
-            DO 100 K = 3,J,-1
-              W(K+1) = W(K)
-              L(K+1) = L(K)
-  100       CONTINUE
-            W(J) = V(I)
-            L(J) = I
-           GO TO 120
-          ENDIF
-  110   CONTINUE
-  120 CONTINUE
-      DO 130 I = 1,3
-         A(3,I) = AB(L(1),I)
-         A(1,I) = AB(L(2),I)
-         A(2,I) = AB(L(3),I)
-  130 CONTINUE
-      W(4) = V(5)
-      V(5) = V(6)
-      V(6) = W(4)
-      IF (V(L(1) + L(2) + 1) .GT. 0.0) THEN
-        DO 140 I = 1,3
-          A(1,I) = -A(1,I)
-          V(L(1) + L(2) + 1) = -V(L(1) + L(2) + 1)
-          V(L(2) + L(3) + 1) = -V(L(2) + L(3) + 1)
-  140   CONTINUE
-      ENDIF
-      IF (V(L(3) + L(1) + 1) .GT. 0.0) THEN
-        DO 150 I = 1,3
-          A(2,I) = -A(2,I)
-          V(L(3) + L(1) + 1) = -V(L(3) + L(1) + 1)
-          V(L(2) + L(3) + 1) = -V(L(2) + L(3) + 1)
-  150   CONTINUE
-      ENDIF
-      CALL INVERT (A,B,D)
-      IF (D .GE. 0.0) RETURN
-      DO 170 I = 1,3
-        DO 160 J = 1,3
-          A(I,J) = -A(I,J)
-          B(I,J) = -B(I,J)
-  160   CONTINUE
-  170 CONTINUE
-      RETURN
-      END
-C--------------------------------------------------------------------
-C  Form a reduced set of cell vectors
-C--------------------------------------------------------------------
-      SUBROUTINE REDCL2 (AB,V,L)
-      INCLUDE 'COMDIF'
-      DIMENSION AB(3,3),V(6),L(7)
-  100 DO 110 J = 1,6
-        V(J) = 0.0
-  110 CONTINUE
-      DO 130 J = 1,3
-        M = J + 1
-        IF (M .GT. 3) M = M - 3
-        DO 120 I = 1,3
-          V(J) = V(J) + AB(J,I)*AB(J,I)
-          V(J+3) = V(J+3) + AB(J,I)*AB(M,I)
-  120   CONTINUE
-  130 CONTINUE
-      DO 140 J = 1,3
-        M = J + 1
-        IF (M .GT. 3) M = M - 3
-        IF (V(J+3) .LT. 0.0) THEN
-          L(J)   = (V(J+3)/V(J) - 0.498)
-          L(J+3) = (V(J+3)/V(M) - 0.498)
-        ELSE
-          L(J)   = (V(J+3)/V(J) + 0.498)
-          L(J+3) = (V(J+3)/V(M) + 0.498)
-        ENDIF
-  140 CONTINUE
-      L(7) = 0
-      DO 150 J = 1,6
-        IF (IABS(L(J)) .GT. L(7)) THEN
-          L(7) = IABS(L(J))
-          K = J
-        ENDIF
-  150 CONTINUE
-      IF (L(7) .EQ. 0) RETURN
-      IF (K .LT. 4) THEN
-        DO 160 J = 1,3
-          M = K + 1
-          IF (M .GT. 3) M = M - 3
-          AB(M,J) = AB(M,J) - AB(K,J)*L(K)
-  160   CONTINUE
-      ELSE
-        DO 170 J = 1,3
-          M = K - 2
-          IF (M .GT. 3) M = M - 3
-          AB(K-3,J) = AB(K-3,J) - AB(M,J)*L(K)
-  170   CONTINUE
-      ENDIF
-      GO TO 100
-      END
-C--------------------------------------------------------------------
-C  Actually do the indexing at last.  
-C  Return with IVALID = 0 means success,
-C--------------------------------------------------------------------
-      SUBROUTINE TRYIND (FH,LMT,DD,IZ)
-      INCLUDE 'COMDIF'
-      DIMENSION LA(NSIZE),LL(3,NSIZE),FH(3,NSIZE)
-      INTEGER HH(3,NSIZE),S1,S2,S3,HA,HB,HC,DA
-      NI = 512
-      DO 110 J = 1,LMT
-        DO 100 I = 1,3
-          HH(I,J) = FH(I,J) * NI
-  100   CONTINUE
-  110 CONTINUE
-      HA = HH(1,LMT)
-      HB = HH(2,LMT)
-      HC = HH(3,LMT)
-  120 DD = DD + 0.020
-      WRITE (COUT,10000) DD
-      CALL GWRITE (ITP,' ')
-      IF (DD .GE. 0.50) THEN
-        WRITE (COUT,11000)
-        CALL GWRITE (ITP,' ')
-        DO 130 J = 1,LMT
-           WRITE (COUT,12000) (FH(I,J),I=1,3)
-           CALL GWRITE (ITP,' ')
-  130   CONTINUE
-        IVALID = 1
-        RETURN
-      ENDIF
-      IZ = IZ + 1
-      DA = DD*NI
-      KKA = 0
-      DO 280 MM = 1,10
-        DO 270 KKK = 1,MM+1
-          K = KKK - 1
-          S1 = K * HA
-          DO 260 LLL = 1,MM+1
-            L = LLL - 1
-            S2 = L * HB
-            DO 250 MMM = 1,MM+1
-              M = MMM - 1
-              IF (K .EQ. MM .OR. L .EQ. MM .OR. M .EQ. MM) THEN
-                S3 = M * HC
-  140           IF (ITOLDD(S1+S2+S3,LB,DA) .EQ. 0) THEN
-                  LA(1) = K
-                  LA(2) = L
-                  LA(3) = M
-                  N = 2
-                  LA(LMT) = LB
-                  GO TO 180
-                ENDIF
-  150           IF (L .NE. 0 .AND. ITOLDD(S1-S2+S3,LB,DA) .EQ. 0) THEN
-                  LA(1) = K
-                  LA(2) = -L
-                  LA(3) = M
-                  N = 3
-                  LA(LMT) = LB
-                  GO TO 180
-                ENDIF
-  160           IF (K .EQ. 0) GO TO 250
-                IF (M .NE. 0 .AND. ITOLDD(S1+S2-S3,LB,DA) .EQ. 0) THEN
-                  LA(1) = K
-                  LA(2) = L
-                  LA(3) = -M
-                  N = 4
-                  LA(LMT) = LB
-                  GO TO 180
-                ENDIF
-  170           N = 5
-                IF (L .EQ. 0 .OR. M .EQ. 0 .OR.
-     $              ITOLDD(S1-S2-S3,LB,DA) .NE. 0) GO TO 240
-                LA(1) = K
-                LA(2) = -L
-                LA(3) = -M
-                N = 5
-                LA(LMT) = LB
-  180           DO 190 J = LMT-1,4,-1
-                  IF (ITOLDD(LA(1)*HH(1,J) +
-     $                       LA(2)*HH(2,J) +
-     $                       LA(3)*HH(3,J),LB,DA) .NE. 0) GO TO 240
-                  LA(J) = LB
-  190           CONTINUE
-                KKA = KKA + 1
-                DO 200 J = 1,LMT
-                  LL(KKA,J) = LA(J)
-  200           CONTINUE
-                IF (KKA .EQ. 1) GO TO 240
-                M1 = LL(1,1)*LL(2,2) - LL(1,2)*LL(2,1)
-                M2 = LL(1,1)*LL(2,3) - LL(1,3)*LL(2,1)
-                M3 = LL(1,2)*LL(2,3) - LL(1,3)*LL(2,2)
-                IF (KKA .NE. 2) THEN
-                  ID = M1*LL(3,3) - M2*LL(3,2) + M3*LL(3,1)
-                  IF (ID .NE. 0) THEN
-                    DO 230 J = 1,LMT
-                      DO 220 I = 1,3
-                        FH(I,J) = LL(I,J)
-  220                 CONTINUE
-  230               CONTINUE
-                    RETURN
-                  ENDIF
-                  KKA = 2
-                ENDIF
-                IF (M1 .EQ. 0 .AND. M2 .EQ. 0 .AND. M3 .EQ. 0) KKA = 1
-  240           GO TO (140,150,160,170,250),N
-              ENDIF
-  250       CONTINUE
-  260     CONTINUE
-  270   CONTINUE
-  280 CONTINUE
-      GO TO 120
-10000 FORMAT (' Error Limit = ',F4.2)
-11000 FORMAT (' Non-Integer Indices:')
-12000 FORMAT (5X,3F10.4)
-      END
-C--------------------------------------------------------------------
-C  Find if the tentative index is within the tolerance DD
-C--------------------------------------------------------------------
-      FUNCTION ITOLDD (IS,LB,IDD)
-      LB = (IS + 256)/512
-      IF (IS .LT. 0) LB = (IS - 256)/512
-      ITOLDD = 1
-      IF (IABS(IS - 512*LB) .LT. IDD) ITOLDD = 0
-      RETURN
-      END
-C--------------------------------------------------------------------
-C  Compute a B matrix from the X and H matrices.
-C--------------------------------------------------------------------
-      SUBROUTINE COMPB (XX,YY,ZZ,B,HH,LMT)
-      INCLUDE 'COMDIF'
-      DIMENSION XX(NSIZE),YY(NSIZE),ZZ(NSIZE),
-     $          HH(3,NSIZE),A(3,3),B(3,3),AI(3,3)
-      DO 120 I = 1,3
-        DO 110 J = 1,3
-          A(I,J) = 0.0
-          B(I,J) = 0.0
-          DO 100 K = 1,LMT
-            B(I,J) = B(I,J) + HH(I,K)*HH(J,K)
-  100     CONTINUE
-  110   CONTINUE
-  120 CONTINUE
-      DO 140 I = 1,3
-        DO 130 K = 1,LMT
-          A(1,I) = A(1,I) + XX(K)*HH(I,K)
-          A(2,I) = A(2,I) + YY(K)*HH(I,K)
-          A(3,I) = A(3,I) + ZZ(K)*HH(I,K)
-  130   CONTINUE
-  140 CONTINUE
-      CALL INVERT (B,AI,D)
-      DO 170 I = 1,3
-        DO 160 J = 1,3
-          B(I,J) = 0.0
-          DO 150 K = 1,3
-            B(I,J) = B(I,J) + A(I,K)*AI(K,J)
-  150     CONTINUE
-  160   CONTINUE
-  170 CONTINUE
-      RETURN
-      END
-C--------------------------------------------------------------------
-C  Calculate and output the cell etc.
-C--------------------------------------------------------------------
-      SUBROUTINE CALCEL (B,AI,D)
-      INCLUDE 'COMDIF'
-      DIMENSION B(3,3),AI(3,3)
-      CALL INVERT (B,AI,D)
-      VOL = 1.0/D
-      A2  = AI(1,1)*AI(1,1) + AI(1,2)*AI(1,2) + AI(1,3)*AI(1,3)
-      B2  = AI(2,1)*AI(2,1) + AI(2,2)*AI(2,2) + AI(2,3)*AI(2,3)
-      C2  = AI(3,1)*AI(3,1) + AI(3,2)*AI(3,2) + AI(3,3)*AI(3,3)
-      DAB = AI(1,1)*AI(2,1) + AI(1,2)*AI(2,2) + AI(1,3)*AI(2,3)
-      DAC = AI(1,1)*AI(3,1) + AI(1,2)*AI(3,2) + AI(1,3)*AI(3,3)
-      DBC = AI(2,1)*AI(3,1) + AI(2,2)*AI(3,2) + AI(2,3)*AI(3,3)
-      D1 = SQRT(A2)
-      D2 = SQRT(B2)
-      D3 = SQRT(C2)
-      D4 = DBC/(D2*D3)
-      D5 = DAC/(D1*D3)
-      D6 = DAB/(D1*D2)
-      D4 = DEG*ATAN(SQRT(1-D4*D4)/D4)
-      IF (D4 .LT. 0.0) D4 = D4 + 180.0
-      D5 = DEG*ATAN(SQRT(1-D5*D5)/D5)
-      IF (D5 .LT. 0.0) D5 = D5 + 180.0
-      D6 = DEG*ATAN(SQRT(1-D6*D6)/D6)
-      IF (D6 .LT. 0.0) D6 = D6 + 180.0
-      WRITE (COUT,10000) D1,D2,D3,D4,D5,D6,VOL
-      CALL GWRITE (ITP,' ')
-      RETURN
-10000 FORMAT (/' Cell Dimensions:'/
-     $          ' a',F8.3,',  b',F8.3,',  c',F8.3/
-     $          ' alpha',F7.2,',  beta',F7.2,',  gamma',F7.2,
-     $          '.   Volume = ',F8.2)
-      END
-C--------------------------------------------------------------------
-C  Get the input angles and form the XX, YY and ZZ arrays.
-C  LMT is the number of input reflections.
-C--------------------------------------------------------------------
-      SUBROUTINE PRPXYZ (XX,YY,ZZ,LMT)
-      INCLUDE 'COMDIF'
-      DIMENSION XX(NSIZE),YY(NSIZE),ZZ(NSIZE),THETAS(NSIZE),
-     $          OMEGAS(NSIZE),CHIS(NSIZE),PHIS(NSIZE),ICNTS(NSIZE)
-      EQUIVALENCE (ACOUNT(        1),THETAS(1)),
-     $            (ACOUNT(  NSIZE+1),OMEGAS(1)),
-     $            (ACOUNT(2*NSIZE+1),CHIS(1)),
-     $            (ACOUNT(3*NSIZE+1),PHIS(1)),
-     $            (ACOUNT(4*NSIZE+1),ICNTS(1))
-      CALL ANGRW (0,5,NTOT,140,0)
-      LMT = 0
-      DO 100 I = 1,NTOT
-        IF (ICNTS(I) .GT. 0) THEN
-           LMT = LMT + 1
-           THETA = THETAS(I)/(2.0*DEG)
-           OMEGA = OMEGAS(I)/DEG
-           CHI   = CHIS(I)/DEG
-           PHI   = PHIS(I)/DEG
-           HM = 2.0 * SIN(THETA)/WAVE
-           XX(LMT) = HM*(COS(CHI)*COS(PHI)*COS(OMEGA) -
-     $                            SIN(PHI)*SIN(OMEGA))
-           YY(LMT) = HM*(COS(CHI)*SIN(PHI)*COS(OMEGA) +
-     $                            COS(PHI)*SIN(OMEGA))
-           ZZ(LMT) = HM*SIN(CHI)*COS(OMEGA)
-        ENDIF
-  100 CONTINUE
-      CALL SRCH3 (LMT,XX,YY,ZZ)
-      RETURN
-      END
-C--------------------------------------------------------------------
-C  Sort the input list and search for the 3 shortest non-coplanar
-C  vectors.
-C--------------------------------------------------------------------
-      SUBROUTINE SRCH3 (LMT,XX,YY,ZZ)
-      INCLUDE 'COMDIF'
-      DIMENSION XX(NSIZE),YY(NSIZE),ZZ(NSIZE),
-     $          XA(NSIZE),YA(NSIZE),ZA(NSIZE),A(3,3),B(3,3),
-     $          W(NSIZE+1),VV(6),L(NSIZE+1),LL(7)
-      VSTART = 0.5
-      VEND   = 0.05
-      DO 100 I = 1,NSIZE+1
-        W(I) = 1.0E9
-        L(I) = 0
-  100 CONTINUE
-      DO 130 I = 1,LMT
-        HM = XX(I)*XX(I) + YY(I)*YY(I) + ZZ(I)*ZZ(I)
-        DO 120 J = 1,LMT
-          IF (HM .LT. W(J)) THEN
-            DO 110 K = LMT,J,-1
-              W(K+1) = W(K)
-              L(K+1) = L(K)
-  110       CONTINUE
-            W(J) = HM
-            L(J) = I
-            GO TO 130
-          ENDIF
-  120   CONTINUE
-  130 CONTINUE
-      VMIN = VSTART
-  135 DO 140 J = 1,LMT
-        XA(J) = XX(L(J))
-        YA(J) = YY(L(J))
-        ZA(J) = ZZ(L(J))
-  140 CONTINUE
-C--------------------------------------------------------------------
-C              Search for a reasonable first cell.
-C  The actual volume of the cells selected is D, the determinant of
-C  the 3 vectors L formed by XA, YA, ZA.  The maximum volume such a
-C  cell can have is V = L1*L2*L3.  If D/V > VMIN (0.5) the cell of
-C  L1, L2 and L3 is a reasonable starting point.  If not, swap out
-C  either L2 or L3, depending on which makes the smaller angle with
-C  L1, with vectors (reflections) sequentially lower in the list.
-C--------------------------------------------------------------------
-      EL1 = SQRT(XA(1)*XA(1) + YA(1)*YA(1) + ZA(1)*ZA(1))
-      K = 3
-150   K = K + 1
-      IF (K .GT. LMT) THEN
-        VMIN = 0.5*VMIN
-        IF (VMIN .LT. VEND) THEN
-          WRITE (COUT,10000)
-          CALL GWRITE (ITP,' ')
-          IVALID = 1
-          RETURN
-        ELSE
-          GO TO 135
-        ENDIF
-      ENDIF
-      DO 160 I = 1,3
-        B(I,1) = XA(I)
-        B(I,2) = YA(I)
-        B(I,3) = ZA(I)
-  160 CONTINUE
-      CALL INVERT (B,A,D)
-      EL2 = SQRT(XA(2)*XA(2) + YA(2)*YA(2) + ZA(2)*ZA(2))
-      EL3 = SQRT(XA(3)*XA(3) + YA(3)*YA(3) + ZA(3)*ZA(3))
-      VMAX = EL1*El2*EL3
-      IF (ABS(D)/VMAX .LT. VMIN) THEN
-        COS12 = (XA(1)*XA(2) + YA(1)*YA(2) + ZA(1)*ZA(2))/(EL1*EL2)
-        COS13 = (XA(1)*XA(3) + YA(1)*YA(3) + ZA(1)*ZA(3))/(EL1*EL3)
-        IF (ABS(COS12) .GT. ABS(COS13)) THEN
-          HM = XA(K)
-          XA(K) = XA(2)
-          XA(2) = XA(3)
-          XA(3) = HM
-          HM = YA(K)
-          YA(K) = YA(2)
-          YA(2) = YA(3)
-          YA(3) = HM
-          HM = ZA(K)
-          ZA(K) = ZA(2)
-          ZA(2) = ZA(3)
-          ZA(3) = HM
-          M = L(K)
-          L(K) = L(2)
-          L(2) = M
-        ELSE
-          HM = XA(K)
-          XA(K) = XA(3)
-          XA(3) = HM
-          HM = YA(K)
-          YA(K) = YA(3)
-          YA(3) = HM
-          HM = ZA(K)
-          ZA(K) = ZA(3)
-          ZA(3) = HM
-          M = L(K)
-          L(K) = L(3)
-          L(3) = M
-        ENDIF
-        GO TO 150
-      ENDIF
-      CALL REDCL2 (B,VV,LL)
-      DO 170 I = LMT,1,-1
-        XX(I+3) = XX(I)
-        YY(I+3) = YY(I)
-        ZZ(I+3) = ZZ(I)
-  170 CONTINUE
-      DO 180 I = 1,3
-        XX(I) = B(I,1)
-        YY(I) = B(I,2)
-        ZZ(I) = B(I,3)
-  180 CONTINUE
-      LMT = LMT + 3
-      RETURN
-10000 FORMAT (' The reflections are essentially coplanar and',
-     $        ' indexing would be unreliable.'/
-     $        ' Collect more peaks and try again.')
-      END
-C--------------------------------------------------------------------
-C  Invert matrix A to AI.  Determinant is D.
-C--------------------------------------------------------------------
-      SUBROUTINE INVERT (A,AI,D)
-      DIMENSION A(3,3),AI(3,3)
-      D = A(1,1)*(A(2,2)*A(3,3) - A(2,3)*A(3,2)) -
-     $    A(1,2)*(A(2,1)*A(3,3) - A(2,3)*A(3,1)) +
-     $    A(1,3)*(A(2,1)*A(3,2) - A(2,2)*A(3,1))
-      IF (D .NE. 0.0) CALL MATRIX (A,AI,AI,AI,'INVERT')
-      RETURN
-      END
-C--------------------------------------------------------------------
-C EDLIST  Edit the reflection list
-C--------------------------------------------------------------------
-      SUBROUTINE EDLIST
-      INCLUDE 'COMDIF'
-      CHARACTER FLAG*1,REFNAM*40,LINE*80
-      DIMENSION THETAS(NSIZE),
-     $          OMEGAS(NSIZE),CHIS(NSIZE),PHIS(NSIZE),ICNTS(NSIZE)
-      EQUIVALENCE (ACOUNT(        1),THETAS(1)),
-     $            (ACOUNT(  NSIZE+1),OMEGAS(1)),
-     $            (ACOUNT(2*NSIZE+1),CHIS(1)),
-     $            (ACOUNT(3*NSIZE+1),PHIS(1)),
-     $            (ACOUNT(4*NSIZE+1),ICNTS(1))
-C--------------------------------------------------------------------
-C Read in the reflection list
-C--------------------------------------------------------------------
-      CALL ANGRW (0,5,NTOT,140,0)
-C--------------------------------------------------------------------
-C Do the editing here
-C--------------------------------------------------------------------
-      WRITE (COUT,10000) NTOT
-      CALL GWRITE (ITP,' ')
-   90 WRITE (COUT,11000)
-      CALL GWRITE (ITP,' ')
-  100 WRITE (COUT,12000)
-      CALL ALFNUM (LINE)
-      ANS = LINE(1:1)
-      IF (ANS .NE. 'L' .AND. ANS .NE. 'D' .AND. ANS .NE. 'R' .AND.
-     $    ANS .NE. 'A' .AND. ANS .NE. 'F' .AND. ANS .NE. 'E') 
-     $    GO TO 90
-C--------------------------------------------------------------------
-C  List the reflections in use
-C--------------------------------------------------------------------
-      IF (ANS .EQ. 'L') THEN
-        IF (NTOT .GT. 0) THEN
-          WRITE (COUT,13000)
-          CALL GWRITE (ITP,' ')
-          DO 110, I = 1,NTOT
-            FLAG =  ' '
-            IF (ICNTS(I) .LE. 0) FLAG = '*'
-            WRITE (COUT,14000) I,THETAS(I),OMEGAS(I),CHIS(I),
-     $                         PHIS(I),ICNTS(I),FLAG
-            CALL GWRITE (ITP,' ')
-110       CONTINUE
-        ELSE
-          WRITE (COUT,15000)
-          CALL GWRITE (ITP,' ')
-        ENDIF
-C--------------------------------------------------------------------
-C  Delete a reflection, i.e. make the count negative
-C--------------------------------------------------------------------
-      ELSE IF (ANS .EQ. 'D') THEN
-        WRITE (COUT,16000)
-        CALL FREEFM (ITR)
-        INDX = IFREE(1)
-        IF (INDX .GE. 1 .AND. INDX .LE. NTOT) THEN
-          IF (ICNTS(INDX) .GT. 0) ICNTS(INDX) = -ICNTS(INDX)
-          WRITE (COUT,17000) INDX
-          CALL GWRITE (ITP,' ')
-        ENDIF
-C--------------------------------------------------------------------
-C  Reinsert a deleted reflection
-C--------------------------------------------------------------------
-      ELSE IF (ANS .EQ. 'R') THEN
-        WRITE (COUT,16000)
-        CALL FREEFM (ITR)
-        INDX = IFREE(1)
-        IF (INDX .GE. 1 .AND. INDX .LE. NTOT) THEN
-          IF (ICNTS(INDX) .LT. 0) ICNTS(INDX) = -ICNTS(INDX)
-          WRITE (COUT,18000) INDX
-          CALL GWRITE (ITP,' ')
-        ENDIF
-C--------------------------------------------------------------------
-C  Add a reflection
-C--------------------------------------------------------------------
-      ELSE IF (ANS .EQ. 'A') THEN
-        WRITE (COUT,19000)
-        CALL YESNO ('N',ANS)
-  120   WRITE (COUT,20000)
-        CALL FREEFM (ITR)
-        IF (RFREE(1) .NE. 0) THEN
-          NTOT = NTOT + 1
-          THETAS(NTOT) = RFREE(1)
-          IF (ANS .EQ. 'N') THEN
-            OMEGAS(NTOT) = RFREE(2)
-          ELSE
-            OMEGAS(NTOT) = RFREE(2) - 0.5*RFREE(1)
-          ENDIF
-          CHIS(NTOT)   = RFREE(3)
-          PHIS(NTOT)   = RFREE(4)
-          ICNTS(NTOT)  = 1000
-          GO TO 120
-        ENDIF
-C--------------------------------------------------------------------
-C  Read reflections from the file REFL.DAT
-C--------------------------------------------------------------------
-      ELSE IF (ANS .EQ. 'F') THEN
-        WRITE (COUT,18900)
-        REFNAM = 'DONT DO IT'//' '
-        CALL ALFNUM (REFNAM)
-        IF (REFNAM .EQ. ' ') REFNAM = 'REFL.DAT'//' '
-        WRITE (COUT,19000)
-        CALL YESNO ('N',ANS)
-        IREFL = IOUNIT(10)
-        CALL IBMFIL (REFNAM,IREFL,80,'SU',IERR)
-        NTOT = 0
-        DO 130 I = 1,NSIZE
-          READ (IREFL,21000,END = 140) OCHAR
-          CALL FREEFM (1000)
-          NTOT = NTOT + 1
-          THETAS(NTOT) = RFREE(1)
-          IF (ANS .EQ. 'N') THEN
-            OMEGAS(NTOT) = RFREE(2)
-          ELSE
-            OMEGAS(NTOT) = RFREE(2) - 0.5*RFREE(1)
-          ENDIF
-          CHIS(NTOT)   = RFREE(3)
-          PHIS(NTOT)   = RFREE(4)
-          ICNTS(NTOT)  = 1000
-  130   CONTINUE
-  140   CALL IBMFIL (REFNAM,-IREFL,80,'SU',IERR)
-        DO 150 J = 40,1,-1
-          IF (REFNAM(J:J) .NE. ' ') GO TO 160
-  150   CONTINUE
-  160   WRITE (COUT,22000) NTOT,REFNAM(1:J)
-        CALL GWRITE (ITP,' ')
-C--------------------------------------------------------------------
-C  Write the reflections to file and exit
-C--------------------------------------------------------------------
-      ELSE IF (ANS .EQ. 'E') THEN
-        CALL ANGRW (1,5,NTOT,140,0)
-        RETURN
-      ENDIF
-      GO TO 100
-10000 FORMAT (' There are ',I4,' peaks in the list')
-11000 FORMAT (' (L) List the reflections;'/
-     $        ' (D) Delete a reflection;'/
-     $        ' (R) Reinsert a reflection;'/
-     $        ' (A) Add a reflection;'/
-     $        ' (F) Read reflections from a file;'/
-     $        ' (E) Exit.')
-12000 FORMAT ( ' Command (L,D,R,A,F,E) ',$)
-13000 FORMAT ('  N    Theta    Omega    Chi     Phi      Int'/)
-14000 FORMAT (' ',I2,1X,4(F8.2),2X,I8,5X,A)
-15000 FORMAT (' There are no reflections in the list')
-16000 FORMAT (' Input reflection number: ')
-17000 FORMAT (' Reflection ',I2,' marked unused')
-18000 FORMAT (' Reflection ',I2,' marked used')
-18900 FORMAT (' Type the reflection file name (REFL.DAT) ',$)
-19000 FORMAT (' Subtract theta from the omega value (N) ? ',$)
-20000 FORMAT (' Type 2theta, omega, chi, phi  ',$)
-21000 FORMAT (A)
-22000 FORMAT (I4,' reflections have been read from ',A)
-      END
diff --git a/difrac/burger.f b/difrac/burger.f
deleted file mode 100644
index e47da3b1..00000000
--- a/difrac/burger.f
+++ /dev/null
@@ -1,174 +0,0 @@
-C-----------------------------------------------------------------------
-C  Buerger reduction
-C-----------------------------------------------------------------------
-      SUBROUTINE BURGER (IOUT,A,ANG,IND)
-      CHARACTER COUT*132
-      COMMON /IOUASC/ COUT(20)
-      REAL IND(3,3)
-      DIMENSION AA(3,3),A(3),ANG(3)
-      DATA INUM/0/
-      RAD = 3.14159/180.0
-C-----------------------------------------------------------------------
-C  Form the matrix of dot products
-C-----------------------------------------------------------------------
-      DO 100 I = 1,3
-        DO 100 J = 1,3
-          IF (I .EQ. J) AA(I,J) = A(I)*A(I)
-          IF (I .NE. J) AA(I,J) = A(I)*A(J)*COS(ANG(6 - I - J)*RAD)
-  100 CONTINUE
-C-----------------------------------------------------------------------
-C  Look for shorter translations in cell faces
-C-----------------------------------------------------------------------
-  110 NUM = 0
-      DO 170 I = 1,3
-        DO 160 J = 1,3
-          IF (J .NE. I) THEN
-            IS = 1
-            IF (AA(I,J) .GT. 0) IS = -1
-            IS1 = IS
-            VMIN = 0
-  120       V = AA(I,J)*2*IS1 + AA(J,J)*IS1**2
-            IF (V .LT. VMIN) THEN
-              VMIN = V
-              IS1 = IS1 + IS
-              GO TO 120
-            ENDIF
-C-----------------------------------------------------------------------
-C  Did we find a shorter translation?
-C-----------------------------------------------------------------------
-            IS1 = IS1 - IS
-            IF (IS1 .NE. 0) THEN
-C-----------------------------------------------------------------------
-C  Yes, we did. Accept it as a cell edge
-C-----------------------------------------------------------------------
-              NUM = NUM + 1
-              INUM = INUM + 1
-C-----------------------------------------------------------------------
-C  Transform the old-new indices
-C-----------------------------------------------------------------------
-              DO 140 K = 1,3
-                IND(I,K) = IND(I,K) + IS1*IND(J,K)
-  140         CONTINUE
-C-----------------------------------------------------------------------
-C  Modify the matrix of dot products
-C-----------------------------------------------------------------------
-              AA(I,I) = AA(I,I) + AA(I,J)*2*IS1 + AA(J,J)*IS1**2
-              AA(I,J) = AA(I,J) + IS1*AA(J,J)
-              AA(J,I) = AA(I,J)
-              K = 6 - I - J
-              AA(I,K) = AA(I,K) + IS1*AA(J,K)
-              AA(K,I) = AA(I,K)
-            ENDIF
-          ENDIF
-  160   CONTINUE
-  170 CONTINUE
-C-----------------------------------------------------------------------
-C  Look for more transformations
-C-----------------------------------------------------------------------
-      IF (NUM .GE. 1) GO TO 110
-C-----------------------------------------------------------------------
-C  Are the cross-terms of a same sign?
-C-----------------------------------------------------------------------
-  180 VAR = ABS(AA(1,2)) + ABS(AA(1,3)) + ABS(AA(2,3))
-      IF (ABS(ABS(AA(1,2)+AA(1,3)+AA(2,3))-VAR) .GT. 0.0001*VAR) THEN
-C-----------------------------------------------------------------------
-C  No, find the odd sign
-C-----------------------------------------------------------------------
-        ISIGN = 1
-        IF (AA(1,2)*AA(1,3)*AA(2,3) .LT. 0) ISIGN = -1
-C-----------------------------------------------------------------------
-C  Reverse two vectors to make the cell triacute or triobtuse
-C-----------------------------------------------------------------------
-        DO 200 I = 1,2
-          K = I + 1
-          DO 190 J = K,3
-            IF (AA(I,J)*ISIGN .GT. 0.0) GO TO 210
-  190     CONTINUE
-  200   CONTINUE
-  210   K = 6 - I - J
-C-----------------------------------------------------------------------
-C  Modify the indices and the dot products
-C-----------------------------------------------------------------------
-        DO 220 II = 1,3
-          IND(I,II) = -IND(I,II)
-          IND(J,II) = -IND(J,II)
-  220   CONTINUE
-        AA(K,J) = -AA(K,J)
-        AA(J,K) = -AA(J,K)
-        AA(K,I) = -AA(K,I)
-        AA(I,K) = -AA(I,K)
-      ENDIF
-C-----------------------------------------------------------------------
-C  Order the diagonal terms in increasing values
-C-----------------------------------------------------------------------
-      INUM = 0
-  240 NUM = 0
-      DO 280 I = 1,2
-        IF ((AA(I,I) - AA(I+1,I+1)) .GT. 0.0) THEN
-          NUM = NUM + 1
-          INUM = INUM + 1
-          DO 250 J = 1,3
-            SAVE = AA(I,J)
-            AA(I,J) = AA(I + 1,J)
-            AA(I + 1,J) = SAVE
-  250     CONTINUE
-          DO 260 J = 1,3
-            SAVE = AA(J,I)
-            AA(J,I) = AA(J,I + 1)
-            AA(J,I + 1) = SAVE
-  260     CONTINUE
-          DO 270 K = 1,3
-            SAVE = IND(I,K)
-            IND(I,K) = IND(I + 1,K)
-            IND(I + 1,K) = SAVE
-  270     CONTINUE
-        ENDIF
-  280 CONTINUE
-      IF (NUM .NE. 0) GO TO 240
-C-----------------------------------------------------------------------
-C If the cell is left-handed, reverse all axes
-C-----------------------------------------------------------------------
-      IF (MOD(INUM,2) .NE. 0) THEN
-        DO 290 I = 1,3
-          DO 290 J = 1,3
-C-----------------------------------------------------------------------
-C If 111 is shorter than c, call it c and re-reduce the cell
-C-----------------------------------------------------------------------
-            IND(I,J) = -IND(I,J)
-  290   CONTINUE
-      ENDIF
-      IF (AA(1,1)+AA(2,2) .LT. -2*(AA(1,2)+AA(1,3)+AA(2,3))) THEN
-        AA(3,3) = AA(3,3) + 2*AA(3,1) + AA(1,1)
-        AA(3,1) = AA(3,1) + AA(1,1)
-        AA(1,3) = AA(3,1)
-        AA(3,2) = AA(3,2) + AA(1,2)
-        AA(2,3) = AA(3,2)
-        AA(3,3) = AA(3,3) + 2*AA(3,2) + AA(2,2)
-        AA(3,2) = AA(3,2) + AA(2,2)
-        AA(2,3) = AA(3,2)
-        AA(3,1) = AA(3,1) + AA(1,2)
-        AA(1,3) = AA(3,1)
-        DO 310 J = 1,3
-          IND(3,J) = IND(1,J) + IND(2,J) + IND(3,J)
-  310   CONTINUE
-        GO TO 180
-      ENDIF
-C-----------------------------------------------------------------------
-C  Get the Niggli cell parameters
-C-----------------------------------------------------------------------
-      DO 330 I = 1,3
-        A(I) = SQRT(AA(I,I))
-  330 CONTINUE
-      DO 340 I = 1,3
-        J = MOD(I,3) + 1
-        K = MOD(J,3) + 1
-        ANG(I) = ACOS(AA(J,K)/(A(J)*A(K)))/RAD
-  340 CONTINUE
-      WRITE (COUT,10000) A,ANG
-      CALL GWRITE (IOUT,' ')
-      WRITE (COUT,11000) ((IND(I,J),J = 1,3),I = 1,3)
-      CALL GWRITE (IOUT,' ')
-      RETURN
-10000 FORMAT (/' The Shortest Non-coplanar Translations '/10X,6F10.3)
-11000 FORMAT (' The Old-to-New Cell Matrix'/(10X,3F6.1))
-      END
diff --git a/difrac/cad4io.f b/difrac/cad4io.f
deleted file mode 100644
index 95f220e0..00000000
--- a/difrac/cad4io.f
+++ /dev/null
@@ -1,517 +0,0 @@
-!
-!       This is a set of FORTRAN subroutines for PDP11/02 and
-!               VAX/VMS CAD4 application.
-!
-!                                       H. Lenk         8-Jun-1983
-	Subroutine cad4_io (io_func,io_pre,io_post0,io_post1,io_post2,
-     1          io_post3,io_post4,io_post5,io_post6,io_post7)
-!
-!       Subroutine for protocol I/O with LSI 11
-!
-!       io_func (byte)  - function code from VAX to 11/02
-!       io_pre  (addr)  - address of pre-processing routine
-!       io_postn(addr)  - address of post-processing routine n 
-!                         depending on function bits in input_header
-!                         (received from 11/02)
-!
-	integer*2       head02          !input header in word mode
-!
-	include 'CAD4COMM'  !Include common block
-!
-!    input:
-!       io_coswr (word) - switch options register from vax to 11/02
-!       io_cobnr (word) - no. of calls to 11/02
-!       io_cohex (byte) - header from VAX to 11/02
-!
-!       IO_COHEX is copied into OUTPUT_HEADER byte
-!
-!  Prepare for next protocol message:
-!    a) previous result is assumed to be successfull
-!    b) block number of protocol message is one higher than previous one
-!
-	result = e_suc
-	io_cobnr = io_cobnr + 1
-!
-  10    continue
-!  Define header of protocol message
-!                  bit 0-1 :    seq. no. of the calls to LSI-11
-!                  bit 2-4 :    result code
-!                  bit 5-7 :    function
-!       
-	  io_cohex = io_func + result + iand(io_cobnr,m_seq)
-!
-!  Call pre processing routine to fill the output_buffer
-!
-	  call io_pre
-!
-!  Move transmit header to transfer buffer
-!
-	  output_header = io_cohex
-!
-!  Transfer buffer to LSI-11 and wait for answer
-!
-	  call  cad4_readprompt (result)
-!
-!  Check for succesfull reception of answer
-!
-	if (result .ne. e_suc) go to 10
-!
-!  Check if LSI-11 was able to interprete our transmitted data well
-!
-	  head02 = input_header           !integer*2 header for IAND's
-	  if (iand(head02,m_efl) .eq. e_suc) go to 30
-!
-!  Now we are disappointed but check if LSI-11 wants a new start
-!
-	if (iand(head02,m_efl+m_fun).ne.
-     1          iand(#ff,f_req_mem+e_typ)) goto 10
-!
-!
-!       If seq. no. correct
-!
-30      if (iand(io_cobnr,m_seq).eq.iand(head02,m_seq)) go to 40
-!
-!       Transfer sequence error
-!
-	result = e_seq
-	go to 10
-!
-!       Select the post processing routine
-!
-40      n = iand(head02,m_fun) / #20
-!
-!       write (l_unit,10010) n
-10010   format(' cad4_io        : received function dispatch = ',z2)
-!
-	go to (100,101,102,103,104,105,106,107) n+1
-100     call io_post0(result)
-	go to 200
-101     call io_post1(result)
-	go to 200
-102     call io_post2(result)
-	go to 200
-103     call io_post3(result)
-	go to 200
-104     call io_post4(result)
-	go to 200
-105     call io_post5(result)
-	go to 200
-106     call io_post6(result)
-	go to 200
-107     call io_post7(result)
-!
-!       Check post processing error and eventual
-!       initialization of 11/02
-!
-200     if (result .eq. e_typ) then
-	  if (io_func .eq. f_init) result = e_suc
-	  goto 10
-	else
-	  if (result .ne. e_suc) goto 10
-	end if
-	return
-	end
-!
-!
-	subroutine cad4_load_syspar
-!
-!       Pre processing routine to copy syspar values from syspar_val
-!       to output buffer
-!
-	include 'CAD4COMM'
-!
-! Copy syspar data to output_buffer
-!
-	do i=1,((nr_load_byte+1)/2)
-	   output_data_w(i+1) = syspar_val(i)
-	end do
-!
-! Set load address
-!
-	output_data_w(1) = slave_load_address
-!
-! Set output length
-!
-	output_length = nr_load_byte + 2
-!
-	return
-	end
-!
-!
-	Subroutine      cad4_send_oper4 (text)
-!
-! Routine to send message to operator
-!        
-	character*(*)   text            ! Input string
-!
-	include 'CAD4COMM'          ! Include common block
-!
-	print *,text
-	return
-	end
-!
-!
-	Subroutine      cad4_get_instrument
-!
-! Subroutine to insert ASCII instrument name and logical*1
-! unit number to CAD4 instrument into fortran common block
-!
-!       modified: 03-jan-1985 LCB Adaption for SBC-21 (Falcon processor)
-!
-! A process name of 'CAD4?_CAn' is required !!!!!!
-!
-	include 'CAD4COMM'  ! Include common block
-!
-	ibycan_c(2:4) = 'CA0'           ! Set default
-	ibycan_b(1)   = 0               ! name and unit
-!
-!  For now assume a Falcon by setting UIC = #40
-!
-	process_uic_w(1) = #40
-!
-	if ((process_uic_w(1).and.#40).ne.0) then
-	  lsypar = sbc_bottom - #40
-	else
-	  lsypar = lsi_bottom - #40
-	end if
-	if ((process_uic_w(1).and.#20).ne.0) then
-	  lsypar = sbcp_bottom - #40
-	end if
-!
-!       write (l_unit,10020) ibycan_c(2:4), ibycan_b(1)
-10020   format (' Instrument name =  ',a3,'   Unit = ',i3)
-!
-	return
-	end
-!
-!
-	Subroutine      cad4_ini_terminal       ! Initialize terminal
-!
-      CHARACTER PORT*4   
-      COMMON /CADCON/ ALPHA,APMIN,APMAX,MAXVAR,MINVAR,
-     $                IHOLE,IVSLIT,IHSLIT,INEG45,IPOS45,IUPHAF,ILOHAF,
-     $                VUTHT,VUOME,VUCHI,VUPHI,IPORT,IBAUD
-	include 'CAD4COMM'          ! Include common block
-!
-	cad4_terminator(1) = 0                  ! Short form
-	cad4_terminator(2) = 0                  ! No terminator characters
-!
-      PORT = 'COM'//CHAR(IPORT+48)        
-	call io_init (PORT,IBAUD,8,'n',1)
-	write (l_unit,10060) PORT,IBAUD
-10060   format (' Port ',A,': set to 'I5,',8,n,1')
-!
-	return
-	end
-!
-	Subroutine      cad4_exit_handler(exit_status)  ! Exit handler
-!
-	include 'CAD4COMM'          ! Include common block
-!
-!
-!       if (l_unit_open) close (unit=l_unit)    ! Close Log file if open
-	l_unit_open = .false.                   ! Set false
-!
-	exit_status = exit_status
-	return                          ! Return
-	end
-!
-!
-	Subroutine      cad4_reset_terminal ! Routine to reset cad4 terminal
-!
-	include 'CAD4COMM'          ! Include common block
-!
-	qio_status = io_done ()
-!
-!       de-allocate cad4 communication channel
-!
-	return                          ! Return to caller
-	end
-!
-!
-	Subroutine      cad4_readprompt(result)
-!
-! Arguments used :
-!       
-!       prompt_buffer           ! Buffer to save prompt
-!       prompt_length           ! No of data bytes to send
-!       input_buffer            ! Input buffer to read record
-!
-	include 'CAD4COMM'          ! Include common block
-!
-! First compute checksum and insert it at the end of output buffer
-! (compute total prompt size)
-!
-	call    cad4_prepare_output
-!
-!       write (l_unit,10010) (prompt_buffer(l),l=1,prompt_size)
-10010   format (' ttyreadpall - Prompt = ',20(z4,1x))
-!       write (l_unit,10020) prompt_header
-10020   format ('             - Header = ',z4)
-!       write (l_unit,10030) prompt_length
-10030   format ('             - Length = ',z7)
-!       write (l_unit,10035) isum_w
-10035   format ('             - CRC    = ',z8,'   sending header')
-!
-! Perform QIO to send prompt and read header
-!
-!       qio_status = sys$qiow (%val(cad4_efn),%val(cad4_chan),
-!    1                          %val(io_funct),cad4_iosb,,,
-!    2                          %ref(input_buffer),     ! p1 = input buffer
-!    3                          %val(1),                ! p2 = input size
-!    4                          %val(cad4_l_timo),      ! p3 = timeout count
-!    5                          %ref(cad4_terminator(1)), ! p4 = term. mask
-!    6                          %val(%loc(prompt_buffer)), ! p5 = prompt buffer
-!    7                          %val(prompt_size) )     ! p6 = prompt b. size
-!
-	qui_status = io_prompt (cad4_iosb,
-     $                          input_buffer,
-     $                          1,
-     $                          cad4_l_timo,
-     $                          prompt_buffer,
-     $                          prompt_size)
-!
-	if (iand(cad4_iosb_i2(1),1) .eq. 1) then
-!
-! Now read length and crc or data bytes from PDP11/02
-!
-	    cad4_iosb(1) = 0                    ! Be sure length and
-	    cad4_iosb(2) = 0                    !  io-status is zero
-!
-!         qio_status = sys$qiow (%val(cad4_efn),%val(cad4_chan),
-!    1                          %val(io_funct),cad4_iosb,,,
-!    2                          %ref(input_buffer(2)),  ! p1 = input buffer
-!    3                          %val(4),                ! p2 = input size
-!    4                          %val(cad4_timeout),     ! p3 = timeout count
-!    5                          %ref(cad4_terminator(1)),,) ! p4 = term. mask
-!
-!
-	  qio_status = io_read (cad4_iosb,
-     $                          input_buffer(2),
-     $                          4,
-     $                          cad4_timeout)
-!
-!         write (l_unit,10040) input_header
-10040     format ('             - InpHdr = ',z4)
-!         write (l_unit,10050) input_length
-10050     format ('             - InpLen = ',z7)
-!
-	  input_size = 4
-	  if((iand(cad4_iosb_i2(1),1) .eq. 1) .and.
-     $                   input_length .ne. 0) then
-!
-! Now read data bytes from PDP11/02
-!
-	    cad4_iosb(1) = 0                    ! Be sure length and
-	    cad4_iosb(2) = 0                    !  io-status is zero
-!
-	    input_size = input_length   !(n-2)Data bytes and checksum
-	    if(input_size.lt.0.or.input_size .gt. 516)input_size=516
-!
-!           qio_status = sys$qiow (%val(cad4_efn),%val(cad4_chan),
-!    1                          %val(io_funct),cad4_iosb,,,
-!    2                          %ref(input_buffer(6)),  ! p1 = input buffer
-!    3                          %val(input_size),       ! p2 = input size
-!    4                          %val(cad4_timeout),     ! p3 = timeout count
-!    5                          %ref(cad4_terminator(1)),,) ! p4 = term. mask
-!
-	    qio_status = io_read (cad4_iosb,
-     $                          input_buffer(6),
-     $                          input_size,
-     $                          cad4_timeout)
-!
-	  end if
-	end if
-!
-! Check CRC and set up return status
-!
-	call cad4_check_crc (result)
-!
-!       write (l_unit,10070) (input_buffer(l),l=1,10)
-10070   format ('             - Input  = ',10(z4,1x))
-!       write (l_unit,10080) qio_status,cad4_iosb
-10080   format ('             - IOSB   = ',z8,2x,z8,2x,z8)
-!
-	return
-	end                     
-!
-	Subroutine      cad4_prepare_output
-!
-	include 'CAD4COMM'          ! Include common block
-!
-! Prepare output buffer for output
-!       1. set output_size to to no of bytes output in QIO
-!       2. computes 16. bit CRC and store it at end of buffer
-!       3. clear iosb
-!
-!
-! 1. Set output_size
-!
-	output_size = 1 + 2 + output_length + 2 ! Header byte
-						! No. of data bytes (word)
-						!  n data bytes
-						! 16 bit CRC
-!
-! 2. Compute CRC
-!
-	isum_w = 0                              ! First use 16 bit sum
-	do l = 1, output_length + 3
-	    crchar=ichar(output_buffer_c(l:l))
-	    crchar=iand(crchar,#ff)
-	    isum_w = ieor (isum_w,crchar)
-	    do m = 1, 8
-		if (iand(isum_w,1) .eq. 1) then
-		  isum_w = isum_w/2
-		  isum_w = ieor (isum_w,iconst)
-		else
-		  isum_w = isum_w / 2
-		end if
-	    end do
-	end do
-!
-	output_buffer(output_length+3+1) = isum_b(1)    ! Copy CRC to
-	output_buffer(output_length+3+2) = isum_b(2)    !  end of buffer
-!
-! 3. Clear IOSB
-!
-	cad4_iosb(1) = 0                        ! Be sure length and
-	cad4_iosb(2) = 0                        !  io-status is zero
-!
-	return
-	end
-!
-!
-	Subroutine      cad4_check_crc (result)
-!
-	include 'CAD4COMM'          ! Include common block
-!
-! Check answer from cad4
-!
-!       input:  cad4_iosb       - I/O status block
-!               input_buffer    - input data and CRC
-!
-!       output: cad4_iosb       
-!
-!       1. word         2. word   result
-!
-!       ss$_xxxxxx      0        e_pnd          system service failed
-!       ss$_normal      0        e_tol          no data within timeout seconds
-!       ss$_normal      icnt     e_tos          not enough data to meet protcol
-!                                               icnt = no. of bytes received
-!       ss$_normal      rcnt     e_ovf          buffer ovf but trans. not. fin.
-!                                               rcnt = no. of rec. bytes is max
-!       ss$_normal      pcnt     e_crc          enough data rec. but CRC error
-!                                               pcnt = hd.byte + length + data
-!       ss$_normal      pcnt     e_suc          success
-!
-!
-!
-!       qio_status = cad4_iosb_i2(1)            ! Copy status code
-!
-! Here if no timeout or any other error
-!
-	if (cad4_iosb_i2(1) .ne. 0) then
-!
-!
-	  if(cad4_iosb_i2(2).eq.input_size)then
-!
-! Subtract CRC
-!
-	    if (input_length.lt.0 .or. input_length.gt.516)
-     1                  input_length = 516      !protect memory
-	    isum_b(1) = input_buffer(input_length+3+1)
-	    isum_b(2) = input_buffer(input_length+3+2)
-	    isum = isum_w       !save received crc
-!
-!
-!       Check checksum of received data
-!
-	    isum_w = 0                          ! First use 16 bit sum
-	    do l = 1, input_length + 3
-	      crchar=ichar(input_buffer_c(l:l))
-	      crchar=iand(crchar,#ff)
-	      isum_w = ieor (isum_w,crchar)
-	      do m = 1, 8
-		if (iand(isum_w,1) .eq. 1) then
-		  isum_w = isum_w / 2
-		  isum_w = ieor (isum_w,iconst)
-		else
-		  isum_w = isum_w / 2
-		end if
-	      end do
-	    end do
-!
-!           write (l_unit,10010) isum_w, isum
-10010       format (13x,'- Computed Sum = ',z8,' Received CRC = ',z8)
-!
-!       Set status code into third word of IOSB
-!
-	    if (isum_w.eq.isum) then
-	      result = e_suc
-	    else
-	      result = e_crc
-	    end if
-	  else
-	    result=e_ovf
-	  end if
-!
-! Here if any qio error except timeout
-!
-	else
-	  if (qio_status.ne.ss$_timeout) then
-	    result = e_pnd
-!
-! Here if timeout
-!
-	  else
-	    cad4_iosb_i2(1) = ss$_normal        ! Set success in first word
-	    if (cad4_iosb_i2(2).eq.0) then
-	      result = e_tol                    ! No data for zero byte count
-	    else
-	      result = e_tos                    ! Not enoght data received
-	    end if
-!
-	  end if
-	end if
-	qio_status = cad4_iosb_i2(1)            ! Copy status code!
-!
-!       write (l_unit,10020) result
-10020   format (13x,'- Result = ',z4)
-!
-	return
-	end
-!
-	Subroutine      cad4_open_log_file
-!
-	include 'CAD4COMM'          ! Include common block
-!
-	l_unit_open = .true.                         ! File open flag
-	return
-	end
-!
-	Subroutine      cad4_post_dummy(result)
-!
-!       Post proc. routine - just to meet standard call sequence
-!
-	include 'CAD4COMM'
-	result = result
-	return
-	end
-!
-	Subroutine      cad4_pre_dummy
-!
-!       Pre proc. routine - just to meet standard call sequence
-!
-	include 'CAD4COMM'
-	output_length = 0
-	return
-	end
-!
-	Subroutine      cad4_type_error(result)
-!
-!       Post proc. routine
-!
-	include 'CAD4COMM'
-	result = e_typ
-	return
-	end
diff --git a/difrac/cad4l.f b/difrac/cad4l.f
deleted file mode 100644
index f2184395..00000000
--- a/difrac/cad4l.f
+++ /dev/null
@@ -1,454 +0,0 @@
-	program CAD4L
-!
-!       Program to load 11/02 or Falcon or Falcon+ from PC
-!
-	external        cad4_pre_dummy,cad4_type_error,cad4_post_dummy
-	external        cad4_load_syspar,cad4_restart_load,cad4_prompt
-	external        cad4_check_type
-!
-      COMMON /CADCON/ ALPHA,APMIN,APMAX,MAXVAR,MINVAR,
-     $                IHOLE,IVSLIT,IHSLIT,INEG45,IPOS45,IUPHAF,ILOHAF,
-     $                VUTHT,VUOME,VUCHI,VUPHI,IPORT,IBAUD
-      include 'CAD4COMM'    ! include common block                    
-!
-! First open log file
-!
-	call cad4_open_log_file
-!
-! Get instument number from process name and save it into common block
-!
-	call cad4_get_instrument
-!
-! Initialize terminal connected to 11/02
-!
-	call cad4_read_gon_file (1)
-	call cad4_ini_terminal
-!
-! Initialize block number (count io transfers)
-!
-	io_cobnr = 0
-!
-! Initialize 11/02
-!
-	call cad4_io (f_init,cad4_pre_dummy,cad4_type_error,
-     1          cad4_type_error,cad4_type_error,cad4_type_error,
-     2          cad4_type_error,cad4_type_error,cad4_check_type,
-     3          cad4_type_error)
-!
-! Select normal preprocessing routine
-!
-	io_prompt_flag = 0
-!
-! Read the goniometer ini file and write info into common block
-!
-	call cad4_read_gon_file (2)
-!
-! Transmit syspar values to 11/02
-!
-	slave_load_address = lsypar
-	nr_load_byte = 64               !load 32 words to lsypar
-	call cad4_io (f_xfr_mem,cad4_load_syspar,cad4_type_error,
-     1          cad4_type_error,cad4_type_error,cad4_type_error,
-     2          cad4_type_error,cad4_type_error,cad4_restart_load,
-     3          cad4_post_dummy)
-!
-! Define the proper file for the slave computer
-!
-	mon_file_spec(1:22) = 'LSI_11.EXE'
-	if (bvers_c .eq. 'C') mon_file_spec(1:22) = 'FALCON.EXE'
-	if (bvers_c .eq. 'E') mon_file_spec(1:22) = 'FALCNP.EXE'
-!
-! LOAD THE SLAVE COMPUTER
-!
-	call cad4_load_lsi(mon_file_spec,load_error)
-!
-! START THE MOTHER TASK
-!
-	mother_file_spec = def_mother_spec
-	call cad4_start_mother
-!
-	stop
-	end
-!
-!
-	Subroutine cad4_read_gon_file (ISWT)
-C-----------------------------------------------------------------------
-C  Read the CAD-4 Goniometer constants file (goniom.ini) for the
-C  relevant system parameter values in SYSPAR_VAL.
-C-----------------------------------------------------------------------
-      COMMON /CADCON/ ALPHA,APMIN,APMAX,MAXVAR,MINVAR,
-     $                IHOLE,IVSLIT,IHSLIT,INEG45,IPOS45,IUPHAF,ILOHAF,
-     $                VUTHT,VUOME,VUCHI,VUPHI,IPORT,IBAUD
-      COMMON /INFREE/ IFREE(20),RFREE(20),ICFLAG
-      COMMON /FREECH/ OCHAR
-      CHARACTER OCHAR*100,CKEY*6
-	include 'CAD4COMM'          ! include common block
-C-----------------------------------------------------------------------
-C  Attach goniom.ini to unit 9
-C-----------------------------------------------------------------------
-      OPEN (UNIT=9, ACCESS='SEQUENTIAL', FILE='goniom.ini',
-     $      STATUS='OLD', ERR=20)
-C-----------------------------------------------------------------------
-C  Set the SYSPAR_VAL values to SYSPAR_DEF for safety
-C-----------------------------------------------------------------------
-      IF (ISWT .EQ. 2) THEN
-	DO 90 I = 1,32
-	  SYSPAR_VAL(I) = SYSPAR_DEF(I)
-   90   CONTINUE
-C-----------------------------------------------------------------------
-C  Set the invariant SYSPAR_VAL parameters to local values
-C-----------------------------------------------------------------------
-	SYSPAR_VAL( 7) =  6
-	SYSPAR_VAL( 8) =  0
-	SYSPAR_VAL( 9) = 18
-	SYSPAR_VAL(10) =  2
-	SYSPAR_VAL(16) =  0
-      ENDIF
-C-----------------------------------------------------------------------
-C  Read a value from goniom.ini.  Ignore lines starting with /
-C-----------------------------------------------------------------------
-  100 READ (9,11000,END=200) OCHAR
-11000 FORMAT (A)
-      IF (OCHAR(1:1) .EQ. '/') GO TO 100
-      CKEY = OCHAR(1:6)
-      IF (CKEY .EQ. 'Dfmodl') GO TO 100
-      OCHAR(1:6) = ' '
-      CALL FREEFM (1000)
-      IVAL = IFREE(1)
-C-----------------------------------------------------------------------
-C  Get the Port and Baudrate
-C-----------------------------------------------------------------------
-      IF (ISWT .EQ. 1) THEN
-	IF (CKEY .EQ. 'Port  ') THEN
-	  IPORT = IVAL
-	ELSE IF (CKEY .EQ. 'Baud  ') THEN
-	  IBAUD = IVAL
-	ENDIF
-C-----------------------------------------------------------------------
-C  Get SYSPAR values for CAD4L routine
-C-----------------------------------------------------------------------
-      ELSE
-	IF (CKEY .EQ. 'Hivolt') THEN
-	  SYSPAR_VAL(1) = 255 - (IVAL - 255)/3
-	ELSE IF (CKEY .EQ. 'Lolevl') THEN
-	  SYSPAR_VAL(2) = 255 - IVAL/5
-	ELSE IF (CKEY .EQ. 'Window') THEN
-	  SYSPAR_VAL(3) = 255 - IVAL/5
-	ELSE IF (CKEY .EQ. 'Deadtm') THEN
-	  I45 = 9105330*RFREE(1)/5.3
-	  I4 = I45/32768
-	  SYSPAR_VAL(4) = I4
-	  SYSPAR_VAL(5) = I45 - I4*32768
-	ELSE IF (CKEY .EQ. 'Termbd') THEN
-	  IVAL = 3*38400/IVAL
-	  SYSPAR_VAL(6) = IAND(IVAL,255)
-	ELSE IF (CKEY .EQ. 'Thgain') THEN
-	  SYSPAR_VAL(11) = IVAL
-	ELSE IF (CKEY .EQ. 'Phgain') THEN
-	  SYSPAR_VAL(12) = IVAL
-	ELSE IF (CKEY .EQ. 'Omgain') THEN
-	  SYSPAR_VAL(13) = IVAL
-	ELSE IF (CKEY .EQ. 'Kagain') THEN
-	  SYSPAR_VAL(14) = IVAL
-	ELSE IF (CKEY .EQ. 'Digain') THEN
-	  SYSPAR_VAL(15) = IVAL
-	ELSE IF (CKEY .EQ. 'Milamp') THEN
-	  SYSPAR_VAL(17) = (3*(IVAL - 10))/10
-	ENDIF
-      ENDIF
-      GO TO 100
-  200 CLOSE (UNIT = 9)
-      RETURN
-!
-! On error load default values for syspar
-!
-20      do 30 i=1,32
-	   syspar_val(I) = syspar_def(I)
-30      continue
-	return
-	end
-!
-!
-	Subroutine      cad4_restart_load
-!
-! Subroutine to restart load detached process
-!
-!       1.      reset communication terminal
-!       2.      create detached process
-!       3.      exit current process
-!
-	include 'CAD4COMM'          ! Include common block
-!       character*120   error_mess
-!
-!
-! 1.  reset communication terminal
-!
-	call cad4_reset_terminal
-!
-! 2. Create detached process
-!
-!       process_name_c(5:5) = 'E'
-!       exmess_status = sys$creprc (,process_image_c,,,
-!    1                          'E_err_'//ibycan_c(2:4),,,
-!    2                          process_name_c,
-!    3                          %val(process_prio_l),
-!    4                          %val(process_uic_l),,)
-!       if (.not.exmess_status) then
-!           call cad4_send_oper4 (' Cannot create new load process')
-!           io_status = sys$getmsg (%val(exmess_status),i,error_mess,,)
-!           if (.not.io_status) call lib$signal(%val(io_status))
-!           call cad4_send_oper4 (error_mess(1:i))
-!       end if
-!
-! 3. Exit current process
-!
-!       call sys$exit (%val(exmess_status))
-	stop
-	end
-!
-!
-	Subroutine      cad4_start_mother
-!
-! Subroutine to start detached process with mother image name
-!       modified: 03-jan-1985 LCB Flag SBC target processor in uic spec
-!
-!       1.      reset communication terminal
-!       2.      create detached process
-!       3.      exit current process
-!
-	include 'CAD4COMM'          ! Include common block
-!       character*120   error_mess
-!
-! 1. reset communication terminal
-!
-	call cad4_reset_terminal
-!
-!
-! 2. Create detached process
-!
-	if (bvers_c.eq.'C') then
-	  process_uic_w(1) = process_uic_w(1).or. #40
-	else
-	  process_uic_w(1) = process_uic_w(1).and. #ffbf
-	end if
-	process_name_c(1:6)='NRCCAD'
-!       exmess_status = sys$creprc (,mother_file_spec,,,
-!    1                          'M_err_'//ibycan_c(2:4),,,
-!    2                          process_name_c,
-!    3                          %val(process_prio_l),
-!    4                          %val(process_uic_l),,)
-!       if (.not.exmess_status) then
-!           call cad4_send_oper4 (' Cannot create mother process')
-!           io_status = sys$getmsg (%val(exmess_status),i,error_mess,,)
-!           if (.not.io_status) call lib$signal(%val(io_status))
-!           call cad4_send_oper4 (error_mess(1:i))
-!       end if
-!
-! 3. Exit current process
-!
-!       call sys$exit (%val(exmess_status))
-	stop
-	end
-!
-!
-	Subroutine      cad4_load_lsi (filename,ierr)
-!
-! Subroutine to load LSI via terminal line
-!       modified: 03-jan-85 LCB Enable load of complete disc blocks
-!
-!               filename        ASCII filename string
-!               ierr            0 - success
-!                              -1 - file open error
-!                              -2 - read error
-!
-	character*(*)   filename
-	integer         io_incr
-!
-	external        cad4_codx,cad4_type_error,cad4_restart_load
-	external        cad4_post_dummy
-	include 'CAD4COMM'  ! Include Instrument common block
-!
-!
-! First open task image file
-!
-	open (access='direct',
-     1  form='unformatted',file=filename,
-     2  recl=512,status='old',unit=1,err=20,
-     3  iostat=img_io_status)
-!
-	write (l_unit,10010) filename(1:30)
-10010   format (' cad4_load_lsi : task image filename = ',a30)
-!
-! Read first record to get base address, load size and transfer
-!               address of task image file
-!
-	img_io_record = 1               ! First record has length in bytes
-	read (1,rec=img_io_record,
-     1          iostat=img_io_status,err=30) img_io_buffer_l
-	img_io_bsa = img_io_buffer_w(#8/2 + 1)  ! Get base address
-	img_io_ldz = img_io_buffer_w(#e/2 + 1)  ! Load size (in 32. word blocks)
-	img_io_xfr = img_io_buffer_w(#e8/2 + 1) ! Transfer address
-	write (l_unit,10020) img_io_bsa, img_io_ldz, img_io_xfr
-10020   format ('               : base address = ',z6,/,
-     1          '                 load size    = ',z6,
-     2          ' 32-word-blocks',/,
-     2          '                 XFR address  = ',z6)
-!
-! Reset buffer pointer and record number for read 
-!
-	img_io_pointer = 256            ! Offset 256 to force read
-	img_io_record  = 3              ! Skip LUN block
-	if (bvers_c .eq. char(0)) then
-	  io_incr = 2
-	else
-	  io_incr = 8
-	end if
-!
-10      if (img_io_pointer.ge.256.and.img_io_ldz.gt.0) then
-	    read (1,rec=img_io_record,
-     1                  iostat=img_io_status,err=30) img_io_buffer_l
-	    write (l_unit,10030) img_io_record
-10030       format ('               : record ',i3,' read from disk')
-	    img_io_record  = img_io_record + 1  ! Inc. record no.
-	    img_io_pointer = 0                  ! Reset pointer
-	end if
-!
-	call cad4_io (f_xfr_mem,cad4_codx,
-     1          cad4_type_error,cad4_type_error,cad4_type_error,
-     2          cad4_type_error,cad4_type_error,cad4_type_error,
-     3          cad4_restart_load,cad4_post_dummy)
-!
-	img_io_ldz      = img_io_ldz - io_incr  ! Dec. no. of 32 word blocks
-	img_io_pointer  = img_io_pointer + io_incr*32 ! Adjust pointer (words)
-	img_io_bsa      = img_io_bsa + io_incr*32*2     ! Base address (bytes)
-!
-	if (img_io_ldz.ge.(1-io_incr)) goto 10          ! Loop
-!
-! Here if normal end
-!
-	close (unit=1)                  ! Close task image file
-	ierr = 0
-	return
-!
-! Here if unable to open task image file
-!
-20      ierr = -1
-	    write (l_unit,10040) img_io_status
-10040       format (' File open error : ',i5)
-	return
-!
-! Here if read error
-!
-30      ierr = -2
-	close(unit=1)
-	    write (l_unit,10050) img_io_status
-10050       format (' File read error : ',i5)
-	return
-	end
-!
-	Subroutine      cad4_check_type (result)
-!
-! Postprocessing routine for IO call in initialze 11/02
-!       output: bvers  !bootstrap version character
-!               lsypar !address of lsi system parameters
-!
-	include 'CAD4COMM'  ! Include common block
-!
-!       check if bootstrap version is returned
-!
-!  input_length .eq. 0                      means LSI_11 interface
-!               .ne. 0 and bvers_c .eq. 'C' means Falcon interface
-!               .ne. 0 and bvers_c .eq. 'E' means Falcon+ interface
-      if(input_length .le. 0) then
-	lsypar = lsi_bottom - #40
-	bvers_c = char(0)
-      else
-	bvers = input_data(1)
-	if (bvers_c .eq. 'C') lsypar = sbc_bottom - #40
-	if (bvers_c .eq. 'E') lsypar = sbcp_bottom - #40
-      endif
-	write (l_unit,10000) bvers_c, lsypar
-10000   format(' Cad4_Check_Type: Prom version - ',z4/
-     $         '                  lsypar -       ',z8)
-	return
-	end
-!
-	Subroutine      cad4_codx
-!
-! Preprocessing routine for IO call in cad4_load_lsi
-!       modified: 03-jan-1985 LCB to enable load of complete blocks
-!
-	include 'CAD4COMM'  ! Include common block
-!
-	if (img_io_ldz.gt.0) then               ! Normal memory block
-	  if (bvers_c .eq. char(0)) then
-	    if (img_io_ldz.eq.1) then
-	      len = 1*32                        ! Last 32. word block
-	    else
-	      len = 2*32                        ! All other blocks
-	    end if
-	  else
-	    if (img_io_ldz.ge.8) then           !complete block?
-	      len = 8*32                        !yes!
-	    else
-	      len = img_io_ldz*32               !last 32 word blocks
-	    end if
-	  end if
-!
-	  do i = 1, len
-	    output_data_w(i+1) = img_io_buffer_w(i+img_io_pointer)
-	  end do
-!
-	  output_data_w(1) = img_io_bsa         ! Set load address
-	  output_length    = len*2 + 2          ! Length (bytes)
-!
-	else
-	  output_data_w(1) = img_io_xfr         ! Set start address
-	  output_length    = 2                  ! One word
-	end if
-!
-	return
-	end
-!
-!               
-	subroutine cad4_prompt
-!
-!       Pre processing routine to set up a prompt message
-!       to be printed on 11/02 CAD4 terminal
-!
-	include 'CAD4COMM'
-	n = 6
-!
-	if (io_prompt_flag .ne. 0) then
-	   if (io_prompt_flag .gt. 0) then
-!
-! Put command error into buffer
-!
-		output_buffer(6)  = #0d       ! write CR
-		output_buffer(7)  = #0a       ! write LF
-		output_buffer_c (8:27) = 'C4L -- command-error'
-		n = 28
-	   else
-!
-! Put i/o error into buffer
-!
-		output_buffer(6)  = #0d       ! write CR
-		output_buffer(7)  = #0a       ! write LF
-		output_buffer_c (8:23) = 'C4L -- i/o-error'             
-		n = 24
-	   end if
-	end if
-!
-! Put 'C4L>' prompt into buffer
-!
-	output_buffer(n)   = #0d       ! write CR
-	output_buffer(n+1) = #0a      ! write LF
-	output_buffer_c (n+2:n+5) = 'C4L>'
-!
-	output_length = n+2
-	return
-	end             
-
-!
-
-
diff --git a/difrac/cad4l.mak b/difrac/cad4l.mak
deleted file mode 100644
index 906c843f..00000000
--- a/difrac/cad4l.mak
+++ /dev/null
@@ -1,14 +0,0 @@
-CFLAGS = -FPc -Od -c -Lr -Gs -Gt 512 -W2
-FL     = c:\fortran\bin\fl $(CFLAGS)
-ROOT   = ..
-LIBS   = $(ROOT)\libs
-
-OBJECTS= cad4l.obj cad4io.obj qio.obj freefm.obj gwrite.obj setiou.obj
-
-EXEC   = cad4l.exe
-
-$(EXEC): $(OBJECTS)
-        link @cad4l.ovl
-
-.for.obj:
-        $(FL) $<
diff --git a/difrac/cartc.f b/difrac/cartc.f
deleted file mode 100644
index aa50c982..00000000
--- a/difrac/cartc.f
+++ /dev/null
@@ -1,18 +0,0 @@
-C-----------------------------------------------------------------------
-C  This subroutine calculates the Cartesian coordinates of a reflection
-C-----------------------------------------------------------------------
-      SUBROUTINE CARTC (XP,YP,ZP)
-      INCLUDE 'COMDIF'
-      CO = COS((OMEGA)/DEG)
-      SO = SIN((OMEGA)/DEG)
-      CC = COS((CHI)/DEG)
-      SC = SIN((CHI)/DEG)
-      CP = COS((PHI)/DEG)
-      SP = SIN((PHI)/DEG)
-      ENGTH = 2*SIN((THETA/2)/DEG)
-      XP = ENGTH*(CO*CC*CP - SO*SP)
-      YP = ENGTH*(CO*CC*SP + SO*CP)
-      ZP = ENGTH*CO*SC
-      RETURN
-      END
-
\ No newline at end of file
diff --git a/difrac/cellls.f b/difrac/cellls.f
deleted file mode 100644
index c42c5ef6..00000000
--- a/difrac/cellls.f
+++ /dev/null
@@ -1,628 +0,0 @@
-C-----------------------------------------------------------------------
-C
-C        Constrained Cell Parameter Least Squares on Theta Data. 
-C        Adapted from the routine CELLLS of the NRCVAX package. 
-C
-C          E.J.Gabe  Chemistry Division, N.R.C., Ottawa Canada
-C
-C  2theta data is taken from the file ORIENT.DA,  which must have been
-C  written by the AL command.
-C
-C-----------------------------------------------------------------------
-      SUBROUTINE CELLLS
-      INCLUDE 'COMDIF'
-      DIMENSION IBH(10),IBK(10),IBL(10),BTHETA(10),BOMEGA(10),BCHI(10),
-     $          BPHI(10),QOBS(NSIZE)
-      EQUIVALENCE (IHK(1),IBH(1)),(NREFB(1),IBK(1)),(ILA(1),IBL(1)),
-     $            (BCOUNT(1),BTHETA(1)),(BBGR1(1),BOMEGA(1)),
-     $            (BBGR2(1),BCHI(1)),(BTIME(1),BPHI(1)),
-     $            (ACOUNT(1),QOBS(1))
-C-----------------------------------------------------------------------
-C  File data input.  Skip reflections flagged bad in MM (Psi .ne. 0)
-C-----------------------------------------------------------------------
-      WRITE (COUT,10000)
-      CALL GWRITE (ITP,' ')
-      IOUT = -1
-      CALL SPACEG (IOUT,0)
-      LAUE = LAUENO
-      IAXIS = NAXIS
-      IF (LAUENO .EQ.  4 .OR.  LAUENO .EQ.  5) LAUE = 4
-      IF (LAUENO .EQ.  6 .OR.  LAUENO .EQ.  7) LAUE = 7
-      IF (LAUENO .GE.  8 .AND. LAUENO .LE. 12) LAUE = 6
-      IF (LAUENO .EQ. 13 .OR.  LAUENO .EQ. 14) LAUE = 5
-      NUMD = 0
-      NBLOKO = 250
-  100 READ (ISD,REC=NBLOKO) IBH,IBK,IBL,BTHETA,(JUNK, I = 41,70),
-     $                      BPSI,NBL
-      NBLOKO = NBLOKO + 1
-      IF (NBL .NE. 0) THEN
-	DO 110 NB = 1,NBL
-	  IF (BPSI(NB) .EQ. 0) THEN
-	    NUMD = NUMD + 1
-	    S = 2.0*SIN(0.5*BTHETA(NB)/DEG)/WAVE
-	    QOBS(NUMD) = S*S
-	    IOH(NUMD)  = IBH(NB)
-	    IOK(NUMD)  = IBK(NB)
-	    IOL(NUMD)  = IBL(NB)
-	  ENDIF
-  110   CONTINUE
-	GO TO 100
-      ENDIF
-C-----------------------------------------------------------------------
-C  Do the least squares
-C-----------------------------------------------------------------------
-      IF (NUMD .GE. 6) THEN
-	WRITE (LPT,11000) WAVE,NUMD
-	CALL CLSTSQ
-      ELSE
-	WRITE (COUT,12000)
-	CALL GWRITE (ITP,' ')
-      ENDIF
-      KI = ' '
-      RETURN
-10000 FORMAT (/10X,'Constrained Cell Dimension Least-Squares'/)
-11000 FORMAT (/' Wavelength',F10.6,';  ',I6,' reflections.')
-12000 FORMAT (' Less than 6 reflections. Quit')
-      END
-C-----------------------------------------------------------------------
-c  General least-squares of lattice parameters
-C-----------------------------------------------------------------------
-      SUBROUTINE CLSTSQ
-      INCLUDE 'COMDIF'
-      DIMENSION AI(6),SIG(7,7),PAR(6),QOBS(NSIZE)
-      EQUIVALENCE (ACOUNT(1),QOBS(1))
-      EQUIVALENCE (PAR(1),ASO),(PAR(2),BSO),(PAR(3),CSO),
-     $            (PAR(4),ALPHA),(PAR(5),BETA),(PAR(6),GAMMA)
-      DATA ASIG,BSIG,CSIG,DSIG,ESIG,FSIG/6*0.0/,
-     $     AA,AB,AC,ADD,AE,AF/6*0.0/,DETERM/1.0/,AI/6*0.0/
-C-----------------------------------------------------------------------
-C  Select the appropriate number of parameters to calculate
-C-----------------------------------------------------------------------
-      WC = 1
-      N = 2
-      IF (LAUE .EQ. 1) N = 6
-      IF (LAUE .EQ. 2) N = 4
-      IF (LAUE .EQ. 3) N = 3
-      IF (LAUE .EQ. 5) N = 1
-      L = N
-C-----------------------------------------------------------------------
-C  Initialize arrays
-C-----------------------------------------------------------------------
-      DO 110 J = 1,7
-	DO 100 K = 1,7
-	  SIG(J,K) = 0.0
-  100   CONTINUE
-	SIGSQ(J) = 0.0
-	SIGMA(J) = 0.0
-  110 CONTINUE
-C-----------------------------------------------------------------------
-C  Accumulate the sums and make the coeficients of the theta equation
-C-----------------------------------------------------------------------
-      DO 140 II = 1,NUMD
-	I = II
-	IF (IOH(I) .NE. 0 .OR. IOK(I) .NE. 0 .OR. IOL(I) .NE. 0) THEN
-	  M = L
-	  CALL ETAI (AI,I)
-	  N = M
-	  BI = QOBS(I)
-	  DO 130 J = 1,N
-	    DO 120 K = 1,N
-	      SIG(J,K) = AI(J)*AI(K)*WC + SIG(J,K)
-  120       CONTINUE
-	    SIGMA(J) = SIGMA(J) + WC*BI*AI(J)
-  130     CONTINUE
-	ENDIF
-  140 CONTINUE
-      IF (N .EQ. 1) THEN
-	SIGMA(1) = SIGMA(1)/SIG(1,1)
-	SIG(1,1) = 1.0/SIG(1,1)
-      ELSE
-	NN = N - 1
-	DO 150 J = 1,NN
-	  JJ = J + 1
-	  DO 150 K = JJ,N
-	    SIG(K,J) = SIG(J,K)
-  150   CONTINUE
-	CALL CMATIN (SIG,N,SIGMA,1,DETERM)
-      ENDIF
-      IF (DETERM .EQ. 0.0) THEN
-	 WRITE (COUT,10000)
-	 CALL GWRITE (ITP,' ')
-      ENDIF 
-C-----------------------------------------------------------------------
-C  Make the sums for the esds
-C-----------------------------------------------------------------------
-      SUMWV = 0.0
-      SUMW  = 0.0
-      DO 170 II = 1,NUMD
-	I = II
-	IF (IOH(I) .NE. 0 .OR. IOK(I) .NE. 0 .OR. IOL(I) .NE. 0) THEN
-	  T3 = 0.0
-	  CALL ETAI(AI,I)
-	  DO 160 K = 1,N
-	    T3 = T3 + AI(K)*SIGMA(K)
-  160     CONTINUE
-	  VI = T3 - QOBS(I)
-	  RWGHT = 1
-	  SUMWV = SUMWV + RWGHT*VI*VI
-	  SUMW = SUMW + RWGHT
-	ENDIF
-  170 CONTINUE
-C-----------------------------------------------------------------------
-C  Sigma squared
-C-----------------------------------------------------------------------
-      DO 180 I = 1,N
-	SIGSQ(I) = SUMWV*SIG(I,I)/SUMW
-  180 CONTINUE
-C-----------------------------------------------------------------------
-C  Calculate a, b, c, alpha, beta, gamma according to the Laue code
-C
-C  Triclinic
-C-----------------------------------------------------------------------
-      IF (LAUE .EQ. 1) THEN
-	AF   = SIGMA(6)
-	AE   = SIGMA(5)
-	ADD  = SIGMA(4)
-	FSIG = SIGSQ(6)
-	ESIG = SIGSQ(5)
-	DSIG = SIGSQ(4)
-      ENDIF
-C-----------------------------------------------------------------------
-C  Monoclinic - a, b or c unique
-C-----------------------------------------------------------------------
-      IF (LAUE .EQ. 2) THEN
-	IF (IAXIS .EQ. 1) THEN
-	  AF   = SIGMA(4)
-	  FSIG = SIGSQ(4)
-	ENDIF
-	IF (IAXIS .EQ. 2) THEN
-	  AE   = SIGMA(4)
-	  ESIG = SIGSQ(4)
-	ENDIF
-	IF (IAXIS .EQ. 3) THEN
-	  ADD  = SIGMA(4)
-	  DSIG = SIGSQ(4)
-	ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  Triclinic, monoclinic or orthorhombic
-C-----------------------------------------------------------------------
-      IF (LAUE .EQ. 1 .OR. LAUE .EQ. 2 .OR. LAUE .EQ. 3) THEN
-	AC   = SIGMA(3)
-	AB   = SIGMA(2)
-	AA   = SIGMA(1)
-	CSIG = SIGSQ(3)
-	BSIG = SIGSQ(2)
-	ASIG = SIGSQ(1)
-      ENDIF
-C-----------------------------------------------------------------------
-C  Tetragonal
-C-----------------------------------------------------------------------
-      IF (LAUE .EQ. 4) THEN
-	AA   = SIGMA(1)
-	AB   = AA
-	AC   = SIGMA(2)
-	ASIG = SIGSQ(1)
-	BSIG = ASIG
-	CSIG = SIGSQ(2)
-      ENDIF
-C-----------------------------------------------------------------------
-C  Hexagonal and rhombohedral with hexagonal axes
-C-----------------------------------------------------------------------
-      IF (LAUE .EQ. 6) THEN
-	AA   = SIGMA(1)
-	AB   = AA
-	ADD  = AA/2.0
-	AC   = SIGMA(2)
-	ASIG = SIGSQ(1)
-	BSIG = ASIG
-	DSIG = ASIG/2.0
-	CSIG = SIGSQ(2)
-      ENDIF
-C-----------------------------------------------------------------------
-C  Rhombohedral with rhombohedral axes
-C-----------------------------------------------------------------------
-      IF (LAUE .EQ. 7) THEN
-	ADD  = SIGMA(2)
-	AE   = ADD
-	AF   = ADD
-	DSIG = SIGSQ(2)
-	ESIG = DSIG
-	FSIG = DSIG
-      ENDIF
-C-----------------------------------------------------------------------
-C  Rhombohedral or cubic
-C-----------------------------------------------------------------------
-      IF (LAUE .EQ. 5 .OR. LAUE .EQ. 7) THEN      
-	AA   = SIGMA(1)
-	AB   = AA
-	AC   = AA
-	ASIG = SIGSQ(1)
-	BSIG = ASIG
-	CSIG = ASIG
-      ENDIF
-C-----------------------------------------------------------------------
-C  Now the actual cell parameters
-C-----------------------------------------------------------------------
-      VK  = 1.0/SQRT(AA*AB*AC - AA*AF*AF - AB*AE*AE - AC*ADD*ADD  + 
-     $          2.0*AF*AE*ADD)
-      ABC  = AB*AC - AF*AF
-      AAC  = AA*AC - AE*AE
-      AAB  = AA*AB - ADD*ADD
-      ASO  = VK*SQRT(ABC)
-      BSO  = VK*SQRT(AAC)
-      CSO  = VK*SQRT(AAB)
-      ARG1 = AE*ADD - AA*AF
-      ARG2 = AAC*AAB
-      ARG2 = SQRT(ARG2 - ARG1*ARG1)
-      CALL CATAN2 (ARG2,ARG1,ANSWER)
-      ALPHA = ANSWER*DEG
-      ARG1  = ADD*AF - AB*AE
-      ARG2  = AAB*ABC
-      ARG2  = SQRT(ARG2 - ARG1*ARG1)
-      CALL CATAN2 (ARG2,ARG1,ANSWER)
-      BETA  = ANSWER*DEG
-      ARG1  = AF*AE - AC*ADD
-      ARG2  = ABC*AAC
-      ARG2  = SQRT(ARG2 - ARG1*ARG1)
-      CALL CATAN2 (ARG2,ARG1,ANSWER)
-      GAMMA  = ANSWER*DEG
-      SALPHA = SIN(ALPHA/DEG)
-      SBETA  = SIN(BETA/DEG)
-      SGAMMA = SIN(GAMMA/DEG)
-C-----------------------------------------------------------------------
-C  Determine the standard errors using the quantities derived from the
-C  least-squares (AA to AF) and their variances
-C
-C  Variances of the direct cell parameters a, b and c
-C-----------------------------------------------------------------------
-      V2  = AA*AB*AC - AA*AF*AF - AB*AE*AE - AC*ADD*ADD + 2.0*ADD*AE*AF
-      V   = SQRT(V2)
-      V3  = V2*V
-      TA2 = AB*AC - AF*AF
-      TB2 = AA*AC - AE*AE
-      TC2 = AA*AB - ADD*ADD
-      TA  = SQRT(TA2)
-      TB  = SQRT(TB2)
-      TC  = SQRT(TC2)
-C-----------------------------------------------------------------------
-C  Variance of a
-C-----------------------------------------------------------------------
-      TEM  = TA2*TA/(2.0*V3)
-      PASO = TEM*TEM*ASIG
-      TEM  = (V2*AC - TA2*TB2)/(2.0*TA*V3)
-      PASO = PASO + TEM*TEM*BSIG
-      TEM  = (V2*AB - TA2*TC2)/(2.0*TA*V3)
-      PASO = PASO + TEM*TEM*CSIG
-      TEM  = TA*(AE*AF - AC*ADD)/V3
-      PASO = PASO + TEM*TEM*DSIG
-      TEM  = TA*(ADD*AF - AB*AE)/V3
-      PASO = PASO + TEM*TEM*ESIG
-      TEM  = (AF*V2 + TA2*(ADD*AE - AA*AF))/(TA*V3)
-      PASO = PASO + TEM*TEM*FSIG
-      PASO = SQRT(PASO)
-C-----------------------------------------------------------------------
-C  Variance of b
-C-----------------------------------------------------------------------
-      TEM  = (AC*V2 - TB2*TA2)/(2.0*TB*V3)
-      PBSO = TEM*TEM*ASIG
-      TEM  = TB2*TB/(2.0*V3)
-      PBSO = PBSO + TEM*TEM*BSIG
-      TEM  = (AA*V2 - TB2*TC2)/(2.0*TB*V3)
-      PBSO = PBSO + TEM*TEM*CSIG
-      TEM  = TB*(AE*AF - AC*ADD)/V3
-      PBSO = PBSO + TEM*TEM*DSIG
-      TEM  = (AE*V2 + TB2*(ADD*AF - AB*AE))/(TB*V3)
-      PBSO = PBSO + TEM*TEM*ESIG
-      TEM  = TB*(ADD*AE - AA*AF)/V3
-      PBSO = PBSO + TEM*TEM*FSIG
-      PBSO = SQRT(PBSO)
-C-----------------------------------------------------------------------
-C  Variance of c
-C-----------------------------------------------------------------------
-      TEM  = (AB*V2 - TC2*TA2)/(2.0*TC*V3)
-      PCSO = TEM*TEM*ASIG
-      TEM  = (AA*V2 - TC2*TB2)/(2.0*TC*V3)
-      PCSO = PCSO + TEM*TEM*BSIG
-      TEM  = TC2*TC/(2.0*V3)
-      PCSO = PCSO + TEM*TEM*CSIG
-      TEM  = (ADD*V2 + TC2*(AE*AF - AC*ADD))/(TC*V3)
-      PCSO = PCSO + TEM*TEM*DSIG
-      TEM  = TC*(ADD*AF - AB*AE)/V3
-      PCSO = PCSO + TEM*TEM*ESIG
-      TEM  = TC*(ADD*AE - AA*AF)/V3
-      PCSO = PCSO + TEM*TEM*FSIG
-      PCSO = SQRT(PCSO)
-C-----------------------------------------------------------------------
-C  Variances of alpha, beta and gamma from their cosines
-C
-C  Variance of alpha
-C-----------------------------------------------------------------------
-      IF (LAUE .EQ. 1 .OR. LAUE .EQ. 2 .OR. LAUE .EQ. 7) THEN
-	BOT2 = (AA*AC - AE*AE)*(AA*AB - ADD*ADD)
-	BOT  = SQRT(BOT2)
-	FAC  = (AE*ADD - AA*AF)/(2.0*BOT)
-	TEM  = (AF*BOT + FAC*(2.0*AA*AB*AC-AB*AE*AE-AC*ADD*ADD))/BOT2
-	PALPHA = TEM*TEM*ASIG
-	TEM    = FAC*(AA*AA*AC - AA*AE*AE)/BOT2
-	PALPHA = PALPHA + TEM*TEM*BSIG
-	TEM    = FAC*(AA*AA*AB - AA*ADD*ADD)/BOT2
-	PALPHA = PALPHA + TEM*TEM*CSIG
-	TEM    = (BOT*AE - 2.0*FAC*(ADD*AE*AE - AA*AC*ADD))/BOT2
-	PALPHA = PALPHA + TEM*TEM*DSIG
-	TEM    = (ADD*BOT - FAC*2.0*(ADD*ADD*AE - AA*AB*AE))/BOT2
-	PALPHA = PALPHA + TEM*TEM*ESIG
-	PALPHA = PALPHA + AA*AA*FSIG/BOT2
-	PALPHA = DEG*SQRT(PALPHA/(SALPHA*SALPHA))
-      ENDIF
-C-----------------------------------------------------------------------
-C  Variance of beta
-C-----------------------------------------------------------------------
-      IF (LAUE .EQ. 1 .OR. LAUE .EQ. 2) THEN
-	BOT2  = (AB*AC - AF*AF)*(AA*AB - ADD*ADD)
-	BOT   = SQRT(BOT2)
-	FAC   = (ADD*AF - AB*AE)/(2.0*BOT)
-	TEM   = FAC*(AB*AB*AC - AB*AF*AF)/BOT2
-	PBETA = TEM*TEM*ASIG
-	TEM   = (BOT*AE + FAC*(2.0*AA*AB*AC-AA*AF*AF-AC*ADD*ADD))/BOT2
-	PBETA = PBETA + TEM*TEM*BSIG
-	TEM   = FAC*(AA*AB*AB - AB*ADD*ADD)/BOT2
-	PBETA = PBETA + TEM*TEM*CSIG
-	TEM   = (BOT*AF - FAC*2.0*(ADD*AF*AF - AB*AC*ADD))/BOT2
-	PBETA = PBETA + TEM*TEM*DSIG
-	PBETA = PBETA + AB*AB*ESIG/BOT2
-	TEM   = (BOT*ADD - FAC*2.0*(AF*ADD*ADD - AA*AB*AF))/BOT2
-	PBETA = PBETA + TEM*TEM*FSIG
-	PBETA = DEG*SQRT(PBETA/(SBETA*SBETA))
-	PGAMMA = 0.0
-C-----------------------------------------------------------------------
-C  Variance of gamma
-C-----------------------------------------------------------------------
-	BOT2   = (AA*AC - AE*AE)*(AB*AC - AF*AF)
-	BOT    = SQRT(BOT2)
-	FAC    = (AE*AF - AC*ADD)/(2.0*BOT)
-	TEM    = FAC*(AB*AC*AC - AC*AF*AF)/BOT2
-	PGAMMA = TEM*TEM*ASIG
-	TEM    = FAC*(AA*AC*AC - AC*AE*AE)/BOT2
-	PGAMMA = PGAMMA + TEM*TEM*BSIG
-	TEM    = (ADD*BOT + FAC*(2.0*AA*AB*AC-AB*AE*AE-AA*AF*AF))/BOT2
-	PGAMMA = PGAMMA + TEM*TEM*CSIG
-	PGAMMA = PGAMMA + AC*AC*DSIG/BOT2
-	TEM    = (AF*BOT - FAC*2.0*(AE*AF*AF - AB*AC*AE))/BOT2
-	PGAMMA = PGAMMA + TEM*TEM*ESIG
-	TEM    = (AE*BOT - FAC*2.0*(AE*AE*AF - AA*AC*AF))/BOT2
-	PGAMMA = PGAMMA + TEM*TEM*FSIG
-	PGAMMA = DEG*SQRT(PGAMMA/(SGAMMA*SGAMMA))
-      ENDIF
-      CALL DEVLST (PAR)
-      WRITE (LPT,11000) ASO,  PASO,  BSO, PBSO, CSO,  PCSO,
-     $                  ALPHA,PALPHA,BETA,PBETA,GAMMA,PGAMMA
-      RETURN
-10000 FORMAT (10X,' Singular Matrix')
-11000 FORMAT (/18X,' Cell        Errors '/
-     $         8X,'a     ',F12.6,F13.7/
-     $         8X,'b     ',F12.6,F13.7/
-     $         8X,'c     ',F12.6,F13.7/
-     $         8X,'Alpha ',F9.3,4X,F9.4/
-     $         8X,'Beta  ',F9.3,4X,F9.4/
-     $         8X,'Gamma ',F9.3,4X,F9.4/)
-      END
-C-----------------------------------------------------------------------
-C  Determine the AI values from h, k and l
-C-----------------------------------------------------------------------
-      SUBROUTINE ETAI (AI,I)
-      INCLUDE 'COMDIF'
-      DIMENSION AI(6)
-C-----------------------------------------------------------------------
-C  Triclinic
-C-----------------------------------------------------------------------
-      IF (LAUE .EQ. 1) THEN
-	AI(6) = 2*IOK(I)*IOL(I)
-	AI(5) = 2*IOH(I)*IOL(I)
-	AI(4) = 2*IOH(I)*IOK(I)
-      ENDIF
-C-----------------------------------------------------------------------
-C  Monoclinic
-C-----------------------------------------------------------------------
-      IF (LAUE .EQ. 2) THEN
-	IF (IAXIS .EQ. 1) AI(4) = 2*IOK(I)*IOL(I)
-	IF (IAXIS .EQ. 2) AI(4) = 2*IOH(I)*IOL(I)
-	IF (IAXIS .EQ. 3) AI(4) = 2*IOH(I)*IOK(I)
-      ENDIF
-C-----------------------------------------------------------------------
-C  Triclinic, monoclinic or orthorhombic
-C-----------------------------------------------------------------------
-      IF (LAUE .LE. 3) THEN
-	AI(3) =   IOL(I)*IOL(I)
-	AI(2) =   IOK(I)*IOK(I)
-	AI(1) =   IOH(I)*IOH(I)
-	RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Tetragonal
-C-----------------------------------------------------------------------
-      IF (LAUE .EQ. 4) THEn
-	AI(2) = IOL(I)*IOL(I)
-	AI(1) = IOH(I)*IOH(I) + IOK(I)*IOK(I)
-	RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Hexagonal and rhombohedral with hexagonal axes
-C-----------------------------------------------------------------------
-      IF (LAUE .EQ. 6) THEN
-	AI(2) = IOL(I)*IOL(I)
-	AI(1) = IOH(I)*IOH(I) + IOK(I)*IOK(I) + IOH(I)*IOK(I)
-	RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Rhombohedral with rhombohedral axes
-C-----------------------------------------------------------------------
-      IF (LAUE .EQ. 7)
-     $    AI(2) = 2*(IOH(I)*IOK(I) + IOH(I)*IOL(I) + IOK(I)*IOL(I))
-C-----------------------------------------------------------------------
-C  Rhombohedral or cubic
-C-----------------------------------------------------------------------
-      IF (LAUE .EQ. 5 .OR. LAUE .EQ. 7) 
-     $    AI(1) =    IOH(I)*IOH(I) + IOK(I)*IOK(I) + IOL(I)*IOL(I)
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  List the obs and calc data in the input form
-C-----------------------------------------------------------------------
-      SUBROUTINE DEVLST (PAR)
-      INCLUDE 'COMDIF'
-      DIMENSION PAR(6),REC(6),Q(6),QOBS(NSIZE)
-      EQUIVALENCE (ACOUNT(1),QOBS(1))
-C-----------------------------------------------------------------------
-C  Make the reciprocal cell, (Int. Tab. Vol. II, p.106.
-C-----------------------------------------------------------------------
-      PAR4 = PAR(4)/DEG
-      PAR5 = PAR(5)/DEG
-      PAR6 = PAR(6)/DEG
-      SUM  = (PAR4 + PAR5 + PAR6)/2.0
-      XPRSS = SIN(SUM)*SIN(SUM - PAR4)*SIN(SUM - PAR5)*SIN(SUM - PAR6)
-      VOL   = 2.0*PAR(1)*PAR(2)*PAR(3)*SQRT(XPRSS)
-      REC(1) = PAR(2)*PAR(3)*SIN(PAR4)/VOL
-      REC(2) = PAR(3)*PAR(1)*SIN(PAR5)/VOL
-      REC(3) = PAR(1)*PAR(2)*SIN(PAR6)/VOL
-      REC(4) = (COS(PAR5)*COS(PAR6) - COS(PAR4))/(SIN(PAR5)*SIN(PAR6))
-      REC(5) = (COS(PAR6)*COS(PAR4) - COS(PAR5))/(SIN(PAR6)*SIN(PAR4))
-      REC(6) = (COS(PAR4)*COS(PAR5) - COS(PAR6))/(SIN(PAR4)*SIN(PAR5))
-C-----------------------------------------------------------------------
-C  Calculate the metric tensor Q
-C-----------------------------------------------------------------------
-      Q(1) = REC(1)*REC(1)
-      Q(2) = REC(2)*REC(2)
-      Q(3) = REC(3)*REC(3)
-      Q(4) = REC(2)*REC(3)*REC(4)
-      Q(5) = REC(3)*REC(1)*REC(5)
-      Q(6) = REC(1)*REC(2)*REC(6)
-C-----------------------------------------------------------------------
-C  Derive the Obs and Calc data
-C-----------------------------------------------------------------------
-      DO 100 I = 1, NUMD
-	QCALC = IOH(I)*IOH(I)*Q(1) +   IOK(I)*IOK(I)*Q(2) +
-     $          IOL(I)*IOL(I)*Q(3) + 2*IOK(I)*IOL(I)*Q(4) +
-     $        2*IOL(I)*IOH(I)*Q(5) + 2*IOH(I)*IOK(I)*Q(6)
-	THOBS = 2.0*DEG*ACOS(SQRT(1.0 - (QOBS(I)*WAVE*WAVE/4.)))
-	THCAL = 2.0*DEG*ACOS(SQRT(1.0 - (QCALC  *WAVE*WAVE/4.)))
-  100 CONTINUE
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  Find atan(A/B) and put the answer C in the 0 to 180 range
-C-----------------------------------------------------------------------
-      SUBROUTINE CATAN2 (A,B,C)
-      PI = 3.141592654
-      C  = PI/2.0
-      IF (B .NE. 0) THEN
-	C = ATAN(ABS(A/B))
-	IF (B .LT. 0) C = PI - C
-      ENDIF
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  Matrix inversion with accompanying solution of linear equations
-C-----------------------------------------------------------------------
-      SUBROUTINE CMATIN (A,N,B,M,DETERM)
-      DIMENSION IPIVOT(7),A(7,7),B(7,1),INDEX(7,2),PIVOT(7)
-      EQUIVALENCE (IROW,JROW),(ICOLUM,JCOLUM),(AMAX,T,SWAP)
-      I = 1
-      EPS = .0000000001
-      DETERM = 1.0
-      DO 100 J = 1,N
-	IPIVOT(J) = 0
-  100 CONTINUE
-C-----------------------------------------------------------------------
-C  Search for the pivot element
-C-----------------------------------------------------------------------
-      DO 200 I = 1,N
-	AMAX = 0.0
-	DO 120 J = 1,N
-	  IF (IPIVOT(J) .NE. 1) THEN
-	    DO 110 K = 1,N
-	      IF (IPIVOT(K) .GT. 1) RETURN
-	      IF (IPIVOT(K) .LT. 1) THEN
-		IF (ABS(AMAX) .LT. ABS(A(J,K))) THEN
-		  IROW = J
-		  ICOLUM = K
-		  AMAX = A(J,K)
-		ENDIF
-	      ENDIF
-  110       CONTINUE
-	  ENDIF
-  120   CONTINUE
-	IPIVOT(ICOLUM) = IPIVOT(ICOLUM) + 1
-C-----------------------------------------------------------------------
-C  Interchange rows to put the pivot element on the main diagonal
-C-----------------------------------------------------------------------
-	IF (IROW .NE. ICOLUM) THEN
-	  DETERM =  - DETERM
-	  DO 130 L = 1,N
-	    SWAP = A(IROW,L)
-	    A(IROW,L) = A(ICOLUM,L)
-	    A(ICOLUM,L) = SWAP
-  130     CONTINUE
-	  IF (M .GT. 0) THEN
-	    DO 140 L = 1,M
-	      SWAP = B(IROW,L)
-	      B(IROW,L) = B(ICOLUM,L)
-	      B(ICOLUM,L) = SWAP
-  140       CONTINUE
-	  ENDIF
-	ENDIF
-	INDEX(I,1) = IROW
-	INDEX(I,2) = ICOLUM
-	PIVOT(I) = A(ICOLUM,ICOLUM)
-	IF (ABS(PIVOT(I)) .LE. EPS) THEN
-	  DETERM = 0.0
-	  RETURN
-	ENDIF
-	DETERM = DETERM*PIVOT(I)
-C-----------------------------------------------------------------------
-C  Divide the pivot row by the pivot element
-C-----------------------------------------------------------------------
-	A(ICOLUM,ICOLUM) = 1.0
-	DO 150 L = 1,N
-	  A(ICOLUM,L) = A(ICOLUM,L)/PIVOT(I)
-  150   CONTINUE
-	IF (M .GT. 0) THEN
-	  DO 160 L = 1,M
-	    B(ICOLUM,L) = B(ICOLUM,L)/PIVOT(I)
-  160     CONTINUE
-	ENDIF
-C-----------------------------------------------------------------------
-C  Reduce non-pivot rows
-C-----------------------------------------------------------------------
-	DO 200 L1 = 1,N
-	  IF (L1 .NE. ICOLUM) THEN
-	    T = A(L1,ICOLUM)
-	    A(L1,ICOLUM) = 0.0
-	    DO 170 L = 1,N
-	      A(L1,L) = A(L1,L) - A(ICOLUM,L)*T
-  170       CONTINUE
-	    IF (M .GT. 0) THEN
-	      DO 180 L = 1,M
-		B(L1,L) = B(L1,L) - B(ICOLUM,L)*T
-  180         CONTINUE
-	    ENDIF
-	  ENDIF
-  200 CONTINUE
-C-----------------------------------------------------------------------
-C  Interchange columns
-C-----------------------------------------------------------------------
-      DO 220 I = 1,N
-	L = N + 1 - I
-	IF (INDEX(L,1) .NE. INDEX(L,2)) THEN
-	  JROW = INDEX(L,1)
-	  JCOLUM = INDEX(L,2)
-	  DO 210 K = 1,N
-	    SWAP = A(K,JROW)
-	    A(K,JROW) = A(K,JCOLUM)
-	    A(K,JCOLUM) = SWAP
-  210     CONTINUE
-	ENDIF
-  220 CONTINUE
-      RETURN
-      END
-
diff --git a/difrac/cellsd.f b/difrac/cellsd.f
deleted file mode 100644
index e4f8a7a1..00000000
--- a/difrac/cellsd.f
+++ /dev/null
@@ -1,123 +0,0 @@
-C-----------------------------------------------------------------------
-C  subroutine to calculate the s.d.'s of the cell parameters from the
-C  s.d.'s of the orientation matrix
-C-----------------------------------------------------------------------
-      SUBROUTINE CELLSD
-      INCLUDE 'COMDIF'
-      DIMENSION RT(3,3),ANGS(3),ANG(3),RS(3,3),SRT(3,3)
-      DIMENSION SAS(3),SANS(3),SAN(3),SA(3)
-      DO 100 I = 1,3
-        DO 100 J = 1,3
-          R(I,J) = R(I,J)/WAVE
-  100 CONTINUE
-C-----------------------------------------------------------------------
-C   Real and reciprocal angles passed from LSORMT in CANG and CANGS 
-C-----------------------------------------------------------------------
-      DO 110 J = 1,3
-        ANG(J)   = CANG(J)
-        ANGS(J)  = CANGS(J)
-        SANG(J)  = SIN(CANG(J)/DEG)
-        CANG(J)  = COS(CANG(J)/DEG)
-        SANGS(J) = SIN(CANGS(J)/DEG)
-        CANGS(J) = COS(CANGS(J)/DEG)
-  110 CONTINUE
-      DO 120 I = 1,3
-        DO 120 J = 1,3
-          RS(I,J) = R(I,J)*R(I,J)
-          SR(I,J) = SR(I,J)*SR(I,J)
-  120 CONTINUE
-C-----------------------------------------------------------------------
-C  Use the RT array for the S matrix
-C-----------------------------------------------------------------------
-      DO 130 I = 1,3
-        DO 130 J = 1,3
-          SRT(I,J) = SR(J,I)
-  130 CONTINUE
-      CALL MATRIX (SRT,RS,RT,RT,'MATMUL')
-      SSG(1,1) = 4.0*RT(1,1)
-      SSG(2,2) = 4.0*RT(2,2)
-      SSG(3,3) = 4.0*RT(3,3)
-      SSG(1,2) = RT(1,2) + RT(2,1)
-      SSG(1,3) = RT(1,3) + RT(3,1)
-      SSG(2,3) = RT(2,3) + RT(3,2)
-      DO 140 J = 1,3
-        SANG(J)  = SANG(J)*SANG(J)
-        SANGS(J) = SANGS(J)*SANGS(J)
-        CANG(J)  = CANG(J)*CANG(J)
-        CANGS(J) = CANGS(J)*CANGS(J)
-        AP(J)    = AP(J)*AP(J)
-        APS(J)   = APS(J)*APS(J)
-        SAS(J)   = SSG(J,J)/(4.0*GI(J,J))
-  140 CONTINUE
-      XA = SAS(2)*GI(2,3)*GI(2,3)/APS(2)
-      YA = SAS(3)*GI(2,3)*GI(2,3)/APS(3)
-      ZA = APS(2)*APS(3)*SANGS(1)
-      SANS(1) = (SSG(2,3) + XA + YA)/ZA
-      XA = SAS(1)*GI(1,3)*GI(1,3)/APS(1)
-      YA = SAS(3)*GI(1,3)*GI(1,3)/APS(3)
-      ZA = APS(1)*APS(3)*SANGS(2)
-      SANS(2) = (SSG(1,3) + XA + YA)/ZA
-      XA = SAS(1)*GI(1,2)*GI(1,2)/APS(1)
-      YA = SAS(2)*GI(1,2)*GI(1,2)/APS(2)
-      ZA = APS(1)*APS(2)*SANGS(3)
-      SANS(3) = (SSG(1,2) + XA + YA)/ZA
-      XA = SANS(1) + SANS(2)*CANG(3) + SANS(3)*CANG(2)
-      YA = SANG(2)*SANGS(3)
-      SAN(1) = XA/YA
-      XA = SANS(1)*CANG(3) + SANS(2) + SANS(3)*CANG(1)
-      YA = SANG(3)*SANGS(1)
-      SAN(2) = XA/YA
-      XA = SANS(1)*CANG(2) + SANS(2)*CANG(1) + SANS(3)
-      YA = SANG(1)*SANGS(2)
-      SAN(3) = XA/YA
-      XA = SAS(1)/APS(1)
-      YA = SANS(2)*CANGS(2)/SANGS(2)
-      ZA = SAN(3)*CANG(3)/SANG(3)
-      SA(1) = AP(1)*(XA + YA + ZA)
-      XA = SAS(2)/APS(2)
-      YA = SANS(3)*CANGS(3)/SANGS(3)
-      ZA = SAN(1)*CANG(1)/SANG(1)
-      SA(2) = AP(2)*(XA + YA + ZA)
-      XA = SAS(3)/APS(3)
-      YA = SANS(1)*CANGS(1)/SANGS(1)
-      ZA = SAN(2)*CANG(2)/SANG(2)
-      SA(3) = AP(3)*(XA + YA + ZA)
-C-----------------------------------------------------------------------
-C  Form the s.d.'s from the variances
-C-----------------------------------------------------------------------
-      DO 150 J = 1,3
-        SA(J)   = SQRT(SA(J))
-        SAS(J)  = SQRT(SAS(J))
-        SAN(J)  = DEG*SQRT(SAN(J))
-        SANS(J) = DEG*SQRT(SANS(J))
-  150 CONTINUE
-C-----------------------------------------------------------------------
-C  Store the R-matrix times the wavelength
-C-----------------------------------------------------------------------
-      DO 160 I = 1,3
-        DO 160 J = 1,3
-          R(I,J) = R(I,J)*WAVE
-  160 CONTINUE
-C-----------------------------------------------------------------------
-C Put the correct values of the cell parameters in COMMON
-C-----------------------------------------------------------------------
-      DO 170 J = 1,3
-        SANG(J)  = SIN(ANG(J)/DEG)
-        CANG(J)  = COS(ANG(J)/DEG)
-        SANGS(J) = SIN(ANGS(J)/DEG)
-        CANGS(J) = COS(ANGS(J)/DEG)
-        APS(J)   = SQRT(APS(J))
-        AP(J)    = SQRT(AP(J))
-  170 CONTINUE
-      WRITE (LPT,10000) AP(1),AP(2),AP(3),ANG(1),ANG(2),ANG(3),
-     $                  SA(1), SA(2), SA(3), SAN(1), SAN(2), SAN(3)
-      WRITE (LPT,11000) APS(1),APS(2),APS(3),ANGS(1),ANGS(2),ANGS(3),
-     $                  SAS(1),SAS(2),SAS(3),SANS(1),SANS(2),SANS(3)
-      RETURN
-10000 FORMAT (/,'     Real Cell'/
-     $     3X,'a', 11X,'b', 11X,'c', 9X,'alpha', 6X, 'beta', 5X,'gamma'/
-     $        3(F9.5,3X),3(F7.3,3X)/3(F9.5,3X),3(F7.3,3X))
-11000 FORMAT (/,'     Reciprocal Cell'/
-     $     3X,'a*',10X,'b*',10X,'c*',8X,'alpha*',5X, 'beta*',4X,'gamma*'/
-     $        ,3(1X,F8.6,3X),3(F7.3,3X)/3(1X,F8.6,3X),3(F7.3,3X))
-      END
diff --git a/difrac/cent8.f b/difrac/cent8.f
deleted file mode 100644
index 03f34af7..00000000
--- a/difrac/cent8.f
+++ /dev/null
@@ -1,405 +0,0 @@
-C-----------------------------------------------------------------------
-C               8-Reflection Centring Routine   July.80
-C  The treatment follows INT TAB V.4. pp. 282
-C  For the CAD-4 the treatment is the same as described in the CAD-4
-C  Manual as corrected in the note by Y. Le Page
-C-----------------------------------------------------------------------
-      SUBROUTINE CENT8
-      INCLUDE 'COMDIF'
-      DIMENSION T8(8),D8(8),A8(8),P8(8)
-      DATA RA/57.2958/
-      INTEGER INTERRUPT
-      REAL MPRESET
-  100 WRITE (COUT,10000)
-      CALL YESNO ('Y',ANS)
-      IF (ANS .EQ. 'N') THEN
-        KI = ' '
-        RETURN
-      ENDIF
-      IF (DFMODL .EQ. 'CAD4') THEN
-        WRITE (COUT,14900)
-        DT = RFREE(1)
-        ISLIT = 10.0*DT + 0.5
-        IF (ISLIT .EQ. 0) ISLIT = 40
-        IF (ISLIT .LT. 10) ISLIT = 10
-        IF (ISLIT .GT. 60) ISLIT = 60
-      ELSE
-        ISLIT = 0
-        WRITE (COUT,15000) IFRDEF,IDTDEF,IDODEF,IDCDEF
-        CALL FREEFM (ITR)
-        DT = RFREE(1)
-        DO = RFREE(2)
-        DC = RFREE(3)
-        IF (DT .EQ. 0) DT = IDTDEF
-        IF (DO .EQ. 0) DO = IDODEF
-        IF (DC .EQ. 0) DC = IDCDEF
-  110   DT = DT/IFRDEF
-        DO = DO/IFRDEF
-        DC = DC/IFRDEF
-        WRITE (COUT,16000)
-        CALL FREEFM (ITR)
-        MPRESET = RFREE(1)
-        IF (MPRESET .EQ. 0) MPRESET = 1000.0
-        WRITE (COUT,18000)
-        CALL FREEFM (ITR)
-        AFRAC = RFREE(1)
-        IF (AFRAC .EQ. 0) AFRAC = 0.5
-      ENDIF
-      DO 115 I = 1,10
-        IHK(I)   = 0
-        NREFB(I) = 0
-        ILA(I)   = 0
-  115 CONTINUE
-C-----------------------------------------------------------------------
-C  Get the reflections to be used
-C-----------------------------------------------------------------------
-      WRITE (COUT,19000)
-      CALL GWRITE (ITP,' ')
-      I = 0
-      IREFS = 0
-  120 WRITE (COUT,34000)
-      CALL FREEFM (ITR)
-      IH = IFREE(1)
-      IK = IFREE(2)
-      IL = IFREE(3)
-      IF (IH .NE. 0 .OR. IK .NE. 0 .OR. IL .NE. 0) THEN
-        ISTAN = 0
-        DPSI = 0
-        MREF = 0
-        IPRVAL = 1
-        CALL ANGCAL
-        IF (IVALID .EQ. 0) THEN
-          I = I + 1
-          IHK(I)   = IH
-          NREFB(I) = IK
-          ILA(I)   = IL
-          IREFS = I
-        ENDIF
-        GO TO 120
-      ENDIF
-      IF (I .EQ. 0) THEN
-        KI = ' '
-        RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Set the first reflection as a check.  (Probably unnecessary now)
-C-----------------------------------------------------------------------
-      IH = IHK(1)
-      IK = NREFB(1)
-      IL = ILA(1)
-      IPRVAL = 0
-      CALL ANGCAL
-      CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICC)
-      CALL SHUTTR (1)
-C      WRITE (COUT,22000)
-C      CALL YESNO ('Y',ANS)
-C      IF (ANS .EQ. 'N') GO TO 100
-C-----------------------------------------------------------------------
-C  Make and store the 8 angular combinations in T8,D8,A8,P8
-C-----------------------------------------------------------------------
-      DO 200 J = 1,IREFS
-        IH = IHK(J)
-        IK = NREFB(J)
-        IL = ILA(J)
-        IPRVAL = 0
-        IF (DFMODL .NE. 'CAD4') THEN
-          CALL ANGCAL
-          TNEG = -THETA
-          CALL MOD360 (TNEG)
-          CNEG = -CHI
-          CALL MOD360 (CNEG)
-          PNEG = 180.0 + PHI
-          CALL MOD360 (PNEG)
-          T8(1) = THETA
-          T8(2) = THETA
-          T8(3) = TNEG
-          T8(4) = TNEG
-          T8(5) = THETA
-          T8(6) = THETA
-          T8(7) = TNEG
-          T8(8) = TNEG
-          DO 130 I = 1,8
-            D8(I) = OMEGA
-  130     CONTINUE
-          OMNEG = -OMEGA
-          CALL MOD360(OMNEG)
-          DO 140 I = 3,6
-            D8(I) = OMNEG
-  140     CONTINUE
-          A8(1) = CHI
-          A8(2) = CNEG
-          A8(7) = CNEG
-          A8(8) = CHI
-          CNEG = 180.0 + CNEG
-          CALL MOD360 (CNEG)
-          A8(4) = CNEG
-          A8(5) = CNEG
-          CNEG = 180 + CHI
-          CALL MOD360 (CNEG)
-          A8(3) = CNEG
-          A8(6) = CNEG
-          P8(1) = PHI
-          P8(2) = PNEG
-          P8(3) = PHI
-          P8(4) = PNEG
-          P8(5) = PNEG
-          P8(6) = PHI
-          P8(7) = PNEG
-          P8(8) = PHI
-C-----------------------------------------------------------------------
-C  For CAD-4 :--
-C  Work out the 8 settings, as in CAD-4 manual, with the arcs of the
-C  goniometer head are horizontal and vertical - heaven knows why!!
-C-----------------------------------------------------------------------
-        ELSE
-          DPSI = 0
-          ISTAN = 0
-          CALL ANGCAL
-          PSI = 360.0 - PHI
-C-----------------------------------------------------------------------
-C  Rotate psi by -phi to get required position.  This is approximate
-C  but good enough for alignment to start
-C-----------------------------------------------------------------------
-          DPSI = 10.0
-          CALL ANGCAL
-C-----------------------------------------------------------------------
-C  Generate positions 1, 2, 3 and 4 from this
-C-----------------------------------------------------------------------
-          TNEG = -THETA
-          CALL MOD360 (TNEG)
-          T8(1) =  THETA
-          T8(2) =  TNEG
-          T8(3) =  THETA
-          T8(4) =  TNEG
-          D8(1) =  OMEGA
-          D8(2) =  OMEGA
-          OMEGA = -OMEGA
-          CALL MOD360 (OMEGA)
-          D8(3) =  OMEGA
-          D8(4) =  OMEGA
-          A8(1) =  CHI
-          A8(2) =  CHI
-          A8(3) =  180.0 - CHI
-          CALL MOD360 (A8(3))
-          A8(4) =  A8(3)
-          P8(1) =  PHI
-          P8(2) =  PHI
-          PHI = 180.0 + PHI
-          CALL MOD360(PHI)
-          P8(3) =  PHI
-          P8(4) =  PHI
-C-----------------------------------------------------------------------
-C  Calculate the position at Phi = 90 and take the settings at 
-C  180 + Phi and -Chi from there to generate settings 5, 6, 7 and 8
-C-----------------------------------------------------------------------
-          PSI = PSI - 90.0
-          CALL MOD360 (PSI)
-          CALL ANGCAL
-          T8(5) =  THETA
-          T8(6) =  TNEG
-          T8(7) =  THETA
-          T8(8) =  TNEG
-          D8(5) =  OMEGA
-          D8(6) =  OMEGA
-          OMEGA = -OMEGA
-          CALL MOD360 (OMEGA)
-          D8(7) =  OMEGA
-          D8(8) =  OMEGA
-          CHI = -CHI
-          CALL MOD360 (CHI)
-          A8(5) = CHI
-          A8(6) = CHI
-          CHI = 180.0 - CHI
-          CALL MOD360 (CHI)
-          A8(7) = CHI
-          A8(8) = CHI
-          PHI = 180.0 + PHI
-          CALl MOD360 (PHI)
-          P8(5) = PHI
-          P8(6) = PHI
-          PHI = - PHI
-          CALl MOD360 (PHI)
-          P8(7) = PHI
-          P8(8) = PHI
-C        write (cout,99999) (i,t8(i),d8(i),a8(i),p8(i), i=1,8)
-C99999 format (i3,4f10.3)
-C        call gwrite (itp,' ')
-        ENDIF
-C-----------------------------------------------------------------------
-C  Set the 8 different settings, align them and store the results
-C  in T8,D8,A8 AND P8.
-C-----------------------------------------------------------------------
-        TT0 = 0
-        OM0 = 0
-        CH0 = 0
-        MREF = 0
-        CALL SHUTTR (1)
-        DO 150 I = 1,8
-  145     ITRY = 1
-          THETA = T8(I)
-          OMEGA = D8(I)
-          CHI   = A8(I)
-          PHI   = P8(I)
-          MREF  = MREF + 1
-          CALL HKLN (IH,IK,IL,MREF)
-          CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICC)
-          IF (ICC .NE. 0) THEN
-            WRITE (COUT,23000) MREF,IH,IK,IL
-            CALL GWRITE (ITP,' ')
-            GO TO 200
-          ENDIF
-          WRITE (COUT,24000) IH,IK,IL,THETA,OMEGA,CHI,PHI
-          CALL GWRITE (ITP,' ')
-          WRITE (LPT,24000) IH,IK,IL,THETA,OMEGA,CHI,PHI
-          CALL WXW2T (DT,DO,DC,ISLIT)
-          CALL SHUTTR (1)
-          CALL CCTIME (MPRESET,COUNT)
-          CALL KORQ(INTERRUPT)
-          IF(INTERRUPT .NE. 1) THEN
-             WRITE(COUT,37000)
-             RETURN
-          ENDIF
-          CALL SHUTTR (-1)
-          IF (KI .EQ. 'FF') THEN
-            IF (ITRY .EQ. 1) THEN
-              WRITE  (LPT,25000) MREF,IH,IK,IL
-              WRITE (COUT,25000) MREF,IH,IK,IL
-              CALL GWRITE (ITP,' ')
-              ITRY = 2
-              GO TO 145
-            ELSE IF (ITRY .EQ. 2) THEN
-              WRITE  (LPT,25100) MREF,IH,IK,IL
-              WRITE (COUT,25100) MREF,IH,IK,IL
-              CALL GWRITE (ITP,' ')
-              GO TO 200
-            ENDIF
-          ENDIF
-          WRITE (COUT,26000) RTHETA,ROMEGA,RCHI,RPHI,COUNT
-          CALL GWRITE (ITP,' ')
-          WRITE (LPT,26000) RTHETA,ROMEGA,RCHI,RPHI,COUNT
-          T8(I) = RTHETA
-          D8(I) = ROMEGA
-          A8(I) = RCHI
-          P8(I) = RPHI
-  150   CONTINUE
-        CALL SHUTTR (-1)
-C-----------------------------------------------------------------------
-C  Analyse the results for CAD4 or all others
-C-----------------------------------------------------------------------
-        DO 160 I = 1,8
-          IF (T8(I) .GE. 180.0) T8(I) = T8(I) - 360.0
-          TT0 = TT0 + T8(I)
-          IF (D8(I) .GE. 180.0) D8(I) = D8(I) - 360.0
-          OM0 = OM0 + D8(I)
-          CH0 = CH0 + A8(I)
-  160   CONTINUE
-        EXPCT = 0.
-        CALL ANG360(TT0,EXPCT)
-        TT0 = TT0/8.0
-        CALL ANG360(OM0,EXPCT)
-        OM0 = OM0/8.0
-        CALL ANG360(CH0,EXPCT)
-        CH0 = CH0/8.0
-        WRITE (COUT,28000) TT0,OM0,CH0
-        CALL GWRITE (ITP,' ')
-        WRITE (LPT,28000) TT0,OM0,CH0
-C-----------------------------------------------------------------------
-C  Get the true values of the angles
-C-----------------------------------------------------------------------
-        IF (DFMODL .NE. 'CAD4') THEN
-          TT0 = T8(1)+T8(2)+T8(5)+T8(6)-T8(3)-T8(4)-T8(7)-T8(8)
-          EXPCT = 8*T8(1)
-          CALL ANG360(TT0,EXPCT)
-          OM0 = D8(1)+D8(2)+D8(7)+D8(8)-D8(3)-D8(4)-D8(5)-D8(6)
-          EXPCT = 8*D8(1)
-          CALL ANG360(OM0,EXPCT)
-          CH0 = A8(1)+A8(3)+A8(6)+A8(8)-A8(2)-A8(4)-A8(5)-A8(7)
-          EXPCT = 8*A8(1)
-          CALL ANG360(CH0,EXPCT)
-          TT0 = TT0/8.0
-          OM0 = OM0/8.0
-          CALL MOD360 (OM0)
-          CH0 = CH0/8.0
-C          BCOUNT(J-1) = TT0
-C          BBGR1(J-1)  = OM0
-C          BBGR2(J-1)  = CH0
-C          BTIME(J-1)  = PHI
-          WRITE (COUT,29000) TT0,OM0,CH0,PHI
-          CALL GWRITE (ITP,' ')
-          WRITE (LPT,29000) TT0,OM0,CH0,PHI
-          CHXL = A8(1)+A8(2)+A8(3)+A8(4)-A8(5)-A8(6)-A8(7)-A8(8)
-          EXPCT = 0.
-          CALL ANG360(CHXL,EXPCT)
-          CHC = A8(1)+A8(2)+A8(5)+A8(6)-A8(3)-A8(4)-A8(7)-A8(8)
-          CALL ANG360(CHC,EXPCT)
-          CHXL = CHXL/8.0
-          CHC = CHC/8.0
-          WRITE (COUT,30000) CHXL,CHC
-          CALL GWRITE (ITP,' ')
-          WRITE (LPT,30000) CHXL,CHC
-        ELSE
-          OM0 = (D8(1)-D8(2)+D8(3)-D8(4)+D8(5)-D8(6)+D8(7)-D8(8))/8.0
-          CH0 = (A8(1)-A8(2)+A8(3)-A8(4)+A8(5)-A8(6)+A8(7)-A8(8))/8.0
-          DMON  = 5.4*CH0*SIN(0.5*T8(1)/RA)
-          VER   = 216.5*TAN(DMON/RA)
-          HOR   = 3.78*OM0
-          DETEC = 3.02*(TT0 - OM0)
-          WRITE (COUT,35000) DETEC,HOR,VER,DMON
-          CALL GWRITE (ITP,' ')
-          WRITE (LPT,35000) DETEC,HOR,VER,DMON
-          TT0  = (T8(1)-T8(2)+T8(3)-T8(4)+T8(5)-T8(6)+T8(7)-T8(8))/8.0
-          OMET = (D8(1)+D8(2)-D8(3)-D8(4)-A8(5)-A8(6)+A8(7)+A8(8))/8.0
-          CHIT = (A8(1)+A8(2)-A8(3)-A8(4)-D8(5)-D8(6)+D8(7)+D8(8))/8.0
-          CHSIGN = 1.0
-          IF (A8(1) .GT. 180.0) CHSIGN = -1.0
-          CHIT = CHSIGN*(90.0 + CHIT)
-          CALL MOD360 (CHIT)
-          PHIT = 0.0
-          WRITE (COUT,36000) TT0,OMET,CHIT,PHIT
-          CALL GWRITE (ITP,'%')
-          WRITE (LPT,36000) TT0,OMET,CHIT,PHIT
-        ENDIF
-  200 CONTINUE
-      KI =  ' '
-      RETURN
-10000 FORMAT (' 8 Reflection Centring (Y) ? ',$)
-C12000 FORMAT (' *** WARNING --- Remove the low temp. arm *** ',/,
-C     $        ' Type the Source-to-Crystal distance (',I3,'mm) ',$)
-C14000 FORMAT (' Type the Crystal-to-Detector distance (',I3,'mm) ',$)
-14900 FORMAT (' Type the horizontal slit width in mms (4.0) ',$)
-15000 FORMAT (' Type the  2T,Om,Ch step size in 1/',I3,'th',
-     $        ' (',I2,',',I2,',',I2,') ',$)
-16000 FORMAT (' Type the count preset per step (1000.0) ',$)
-18000 FORMAT (' Type the max count cutoff fraction (0.5) ',$)
-19000 FORMAT (' Type h,k,l for reflections to be used (End) ')
-C22000 FORMAT (' The 1st reflection is set.  Is everything OK (Y) ? ',$)
-23000 FORMAT (' Setting',I2,', Collision.  Cannot complete',3I4)
-24000 FORMAT (' Starting values ',3I4,4F10.3)
-25000 FORMAT (' Setting',I2,' of',3I4,' failed on first attempt.')
-25100 FORMAT (' Setting',I2,' of',3I4,' failed.  Cannot complete')
-26000 FORMAT ('    Final values ',12X,4F10.3,F8.0)
-28000 FORMAT (' Zero Values of TT,OM,CH ',3F8.3)
-29000 FORMAT (' True values of TT,OM,CH ',3F8.3,' (at Phi',F8.3,')')
-30000 FORMAT (' Delta-chi Crystal ',F8.3,5X,'Delta-chi Counter ',
-     $         F8.3//)
-C31000 FORMAT (' SXT ',F10.3,' SXO',F10.3,' CXT',F10.3)
-C32000 FORMAT (' SYT ',F10.3,' SYO',F10.3,' CYT',F10.3//)
-34000 FORMAT (' Next h,k,l (End) ',$)
-35000 FORMAT (' Offsets: Det',F7.3,'mm, Hor',F7.3,'mm, ',
-     $                  'Ver',F7.3,'mm, Mon',F7.3,'deg.')
-36000 FORMAT (' True 2Theta     Omega     Chi       Phi'/2X,4F10.3/)
-37000 FORMAT (' Operation interrupted by user')
-      END
-C-----------------------------------------------------------------------
-C  Routine to make the difference between ANG and EXPCT small
-C-----------------------------------------------------------------------
-      SUBROUTINE ANG360 (ANG,EXPCT)
-  100 D = EXPCT - ANG
-      ISIGN = 1
-      IF (D .LT. 0.) ISIGN = -1
-      IF (ABS(D) .GE. 180.0) THEN
-        ANG = ANG + ISIGN*360.0
-        GO TO 100
-      ENDIF
-      RETURN
-      END
diff --git a/difrac/centre.f b/difrac/centre.f
deleted file mode 100644
index 893bcea8..00000000
--- a/difrac/centre.f
+++ /dev/null
@@ -1,507 +0,0 @@
-C-----------------------------------------------------------------------
-C  Routine to align one circle by accumulating a distribution
-C   of intensity values against degrees & then
-C   finding the median of the distribution.
-C
-C  Modifications: Mark Koennecke, April 2000
-C  Added code for doing PH optimizations as well.
-C  Added code for monitoring the centering process as well.
-C  When a peak is not found, drive back to start and give an FP error 
-C  code instead of an FF. Then the alignement of another circle
-C  might resolve the issue.
-C-----------------------------------------------------------------------
-      SUBROUTINE CENTRE (DX,ANG,ISLIT)
-      INCLUDE 'COMDIF'
-      DIMENSION XA(100),YA(100),AN(4),ST(4),ANG(4)
-      CHARACTER ANGLE(4)*6
-      DATA ANGLE/'2theta','Omega','Chi','PH'/
-      INTEGER IRUPT
-C
-      external range    ! Prevent use of intrinsic function under GNU G77
-C
-      NATT = 0
-C------- a debug flag! Set to 0 for no debug output
-      IDEBUG = 1
-C-----------------------------------------------------------------------
-C  If CAD-4 call the scan fitting version of the routine
-C-----------------------------------------------------------------------
-      IF (DFMODL .EQ. 'CAD4') THEN
-        CALL CADCEN (ISLIT)
-        NATT = 0
-        CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,IERR)
-        ANG(1) = THETA
-        ANG(2) = OMEGA
-        ANG(3) = CHI
-        ANG(4) = PHI
-        RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Get the starting values for the angles & set up the working ranges
-C-----------------------------------------------------------------------
-  100 CALL ANGET (ST(1),ST(2),ST(3),ST(4))
-      IF (KI .EQ. 'ST') N = 1
-      IF (KI .EQ. 'SO') N = 2
-      IF (KI .EQ. 'SC') N = 3
-      IF (KI .EQ. 'SP') N = 4
-      ICHI = 0
-      IF (ST(3) .GE. 350.0 .OR. ST(3) .LE. 10.0) ICHI = 1
-      IPHI = 0
-      IF (ST(4) .GE. 350.0 .OR. ST(4) .LE. 10.0) IPHI = 1
-      IA = 0
-      ISTEP = -1
-      I = 50
-      MAX = -1000000
-      MIN =  1000000
-C-----------------------------------------------------------------------
-C  Step forwards or backwards on the appropriate circle, count & store
-C-----------------------------------------------------------------------
-  110 D1 = DX*(I - 50)
-      IF (N .EQ. 1) D2 = -0.5*D1
-      IF (N .EQ. 2) D2 =  0.5*D1
-      DO 120 J = 1,4
-        AN(J) = ST(J)
-  120 CONTINUE
-      AN(N) = AN(N) + D1
-      CALL MOD360 (AN(N))
-      IF (N .EQ. 1) THEN
-        AN(2) = AN(2) + D2
-        CALL MOD360 (AN(2))
-      ENDIF
-      IF (N .EQ. 2) THEN
-        AN(1) = AN(1) + D2
-        CALL MOD360 (AN(1))
-      ENDIF
-      IF (N .EQ. 3) AN(4) = ST(4)
-      CALL ANGSET (AN(1),AN(2),AN(3),AN(4),IA,IC)
-      IF (IC .NE. 0) THEN
-        WRITE (COUT,10000)
-        CALL GWRITE (ITP,' ')
-        KI = 'FF'
-        RETURN
-      ENDIF
-      CALL CCTIME (PRESET,COUNT)
-      IF(IDEBUG .EQ. 1)THEN
-        WRITE(COUT,20000),AN(1),AN(2),AN(3),AN(4),COUNT
-20000   FORMAT('TH = ',F8.2,' OM = ',F8.2,' CH = ',F8.2,' PH = ', F8.2,
-     &        ' CTS = ', F8.2)
-      ENDIF 
-      CALL KORQ(IRUPT)
-      IF(IRUPT .NE. 1) THEN
-        WRITE (COUT,10000)
-        CALL GWRITE (ITP,' ')
-        KI = 'FF'
-        RETURN
-      ENDIF
-      CALL ANGET (AN(1),AN(2),AN(3),AN(4))
-      CALL RANGE (ICHI,IPHI,AN)
-      XA(I) = AN(N)
-      IF (COUNT .LT. 1) THEN
-        YA(I) = 0
-        GO TO 110
-      ENDIF
-      YA(I) = COUNT
-      IF (COUNT .GT. MAX) THEN
-        MAX = COUNT
-        IMAX = I
-      ENDIF
-      IF (COUNT .LT. MIN) MIN = COUNT
-      IF (COUNT .GT. AFRAC*MAX) THEN
-        I = I + ISTEP
-        IF (I .GE. 1 .AND. I .LE. 100) GO TO 110
-      ENDIF
-C-----------------------------------------------------------------------
-C  Sort out what happened on the low angle side (ISTEP = -1)
-C
-C  There are 4 situations to take care of on the low angle side.
-C  1. The peak is at the low angle extremity.  Move and try again.
-C  2. There is no significant low angle peak.
-C  3. The peak behaves normally and the peak straddles the centre of
-C     the search range, i.e. I = 50 is in the peak.
-C  1. The peak is at the low angle extremity.  Move and try again.
-C-----------------------------------------------------------------------
-      IF (ISTEP .EQ. -1) THEN
-        ILOW = I
-C-----------------------------------------------------------------------
-C  Case 1. Peak is at the low angle extremity.  Start again.
-C-----------------------------------------------------------------------
-        IF (IMAX .EQ. 1 .AND. AFRAC*MAX .GT. MIN) GO TO 100
-C-----------------------------------------------------------------------
-C  Cases 2 and 3.  No significant peak or normal peak.
-C                  In either case do the high angle side.
-C-----------------------------------------------------------------------
-        IF (I .LT. 1 .OR. YA(50) .GE. AFRAC*MAX) THEN
-          ISTEP = 1
-          NBOT = I
-          I = 51
-          GO TO 110
-        ENDIF
-C-----------------------------------------------------------------------
-C  Case 4. Peak is all on low angle side.
-C          ILOW is where the peak ended, find where it started.
-C-----------------------------------------------------------------------
-        IF (YA(50) .LT. AFRAC*MAX) THEN
-          DO 130 ISRCH = 1,50
-            JSRCH = 51-ISRCH
-            IF (YA(JSRCH) .GT. AFRAC*MAX) THEN
-              NTOP = JSRCH
-              NBOT = ILOW
-              GO TO 200
-            ENDIF
-  130     CONTINUE
-          NTOP = JSRCH
-          NBOT = ILOW
-          GO TO 200
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  Sort out what happened on the high angle side.  (ISTEP = 1)
-C
-C  Again there are 4 cases to take care of
-C  1.  The peak is at the high angle extremity.  Move and try again.
-C  2.  There is no significant high angle peak.  This can only occur
-C      after case 1 on the low side, i.e. there is no peak at all.
-C  3.  It is a normal peak continuing from the low angle case 2.
-C  4.  Peak is all on the high angle side.
-C      IHIGH is where the peak ended, find where it started.
-C-----------------------------------------------------------------------
-      IF (ISTEP .EQ. 1) THEN
-        IHIGH = I
-C-----------------------------------------------------------------------
-C  Case 1. Peak is at the high angle extremity.  Start again.
-C-----------------------------------------------------------------------
-        IF (IMAX .EQ. 100 .AND. AFRAC*MAX .GT. MIN) GO TO 100
-C-----------------------------------------------------------------------
-C  Case 2. There is no significant peak.
-C
-C  Modified: Drive back to start positions. So that other circle centering
-C  will not fail.
-C  Modified error code to give an FP in order to decide between 
-C  interrupt and bad peak.
-C  Mark Koennecke, April 2000
-C-----------------------------------------------------------------------
-        IF (ILOW .LT. 1 .OR. IHIGH .GT. 100) THEN
-          WRITE (COUT,11000) ANGLE(N),ILOW,IHIGH
-          CALL GWRITE (ITP,' ')
-          KI = 'FP'
-          CALL ANGSET(ST(1),ST(2),ST(3),ST(4),IA,IC)
-          RETURN
-        ENDIF
-C-----------------------------------------------------------------------
-C  Case 3.  Normal peak.
-C-----------------------------------------------------------------------
-        IF (YA(50) .GE. AFRAC*MAX) THEN
-          NTOP = I - 1
-C-----------------------------------------------------------------------
-C  Case 4.  Peak is all on the high angle side.
-C-----------------------------------------------------------------------
-        ELSE
-          DO 140 ISRCH = 50,100
-            IF (YA(ISRCH) .GT. AFRAC*MAX) THEN
-              NTOP = IHIGH - 1
-              NBOT = ISRCH - 1
-              GO TO 200
-            ENDIF
-  140     CONTINUE
-          NTOP = IHIGH - 1
-          NBOT = ISRCH - 1
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  Find the median of the distribution
-C-----------------------------------------------------------------------
-  200 AREA = 0.0
-      IF (NBOT .LT. 1 .OR. NTOP .GT. 100 .OR. MAX .LE. 25) THEN
-      WRITE (COUT,11000) ANGLE(N),NBOT,NTOP,MAX
-        CALL GWRITE (ITP,' ')
-        KI = 'FF'
-        RETURN
-      ENDIF
-      DO 210 I = NBOT,NTOP
-        AREA = AREA + (XA(I+1) - XA(I))*(YA(I+1) + YA(I))*0.25
-  210 CONTINUE
-      S = 0.0
-      DO 220 I = NBOT,NTOP
-        S = S + (XA(I+1) - XA(I))*(YA(I+1) + YA(I))*0.5
-        IF (S .GT. AREA) GO TO 230
-  220 CONTINUE
-  230 S = S - 0.5*(XA(I+1) - XA(I))*(YA(I+1) + YA(I))
-C-----------------------------------------------------------------------
-C  The centre is now in the Ith strip
-C-----------------------------------------------------------------------
-      DA = AREA - S
-C-----------------------------------------------------------------------
-C  Get the slope of the Ith strip & solve for X at AREA/2
-C-----------------------------------------------------------------------
-      IF (YA(I+1) .EQ. YA(I)) THEN
-        XCENT = XA(I) + DA/YA(I)
-      ELSE
-        S = (YA(I+1) - YA(I))/(XA(I+1) - XA(I))
-        IF ((YA(I)*YA(I) + 2.0*S*DA) .LE. 0) THEN
-          WRITE (COUT,12000)
-     $           NBOT,NTOP,I,(XA(III),YA(III),III = NBOT,NTOP)
-          CALL GWRITE (ITP,' ')
-          KI = 'FF'
-          RETURN
-        ENDIF
-        DISC = SQRT(YA(I)*YA(I) + 2.0*S*DA)
-        XCENT = XA(I) + (DISC - YA(I))/S
-      ENDIF
-C-----------------------------------------------------------------------
-C  Put the answer in the correct range
-C  N = 1 2THETA;   N = 2 Omega;   N = 3 Chi;   N = 4 Phi.
-C-----------------------------------------------------------------------
-      IF (N .EQ. 1) THEN
-        DA = XCENT - ST(1)
-        ST(1) = XCENT
-        ST(2) = ST(2) - 0.5*DA
-        CALL MOD360 (ST(2))
-        ANG(2) = ST(2)
-C-----------------------------------------------------------------------
-C  OMEGA range
-C-----------------------------------------------------------------------
-      ELSE IF (N .EQ. 2) THEN
-        DA = ST(2) + 180
-        IF (DA .GE. 360) DA = DA - 360
-        DA = XCENT - DA
-        ST(1) = ST(1) + 0.5*DA
-        CALL MOD360 (ST(1))
-        XCENT = XCENT - 180.0
-        CALL MOD360 (XCENT)
-        ST(N) = XCENT
-C-----------------------------------------------------------------------
-C  CHI range
-C-----------------------------------------------------------------------
-      ELSE IF (N .EQ. 3) THEN
-        XCENT = XCENT - ICHI*180.0
-        CALL MOD360 (XCENT)
-        ST(N) = XCENT
-C-----------------------------------------------------------------------
-C  PHI range
-C-----------------------------------------------------------------------
-      ELSE IF (N .EQ. 4) THEN
-        XCENT = XCENT - IPHI*180.0
-        CALL MOD360 (XCENT)
-        ST(N) = XCENT
-      ENDIF
-C-----------------------------------------------------------------------
-C  Set angles to the max values
-C-----------------------------------------------------------------------
-      CALL ANGSET (ST(1),ST(2),ST(3),ST(4),IA,IC)
-      ANG(N) = ST(N)
-      IF (N .NE. 4) ANG(4) = ST(4)
-      KI = ' '
-      RETURN
-10000 FORMAT (' Real Collision in routine CENTRE')
-11000 FORMAT (' Alignment Failure on ',A,'.  NBOT, NTOP',2I4,' MAX',I6)
-12000 FORMAT (3I6,/,(10F10.4))
-      END
-C
-C-----------------------------------------------------------------------
-C  Subroutine to do a fine (1) or coarse (0) centreing on a specified 
-C  circle for the CAD4 using the routine GENSCN.
-C  Different for the 2theta circle.
-C-----------------------------------------------------------------------
-      SUBROUTINE CADCEN (ISLIT)
-      INCLUDE 'COMDIF'
-      ICPSMX = 25000
-C-----------------------------------------------------------------------
-C  Set the attenuator if necessary
-C-----------------------------------------------------------------------
-      TIME = 1.0
-      CALL CCTIME (TIME,COUNT)
-      IF (COUNT .GT. ICPSMX .AND. NATT .EQ. 0) THEN
-        NATT = 1
-        COUNT = COUNT/ATTEN(2)
-        CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,IERR)
-      ENDIF
-C-----------------------------------------------------------------------
-C  2Theta circle (and chi)
-C  After the initial omega/2theta scan, this completes the alignment 
-C  for a CAD-4 machine
-C    1. Scans with the + 45deg slit;
-C    2. Scans with the - 45deg slit;
-C    3. Works out the 2theta & chi corrections via EULKAP.
-C-----------------------------------------------------------------------
-C      write (lpt,99999) ki,theta,omega,chi,phi
-C99999 format (' Before ',a,2x,4f8.3)
-      IF (KI .EQ. 'ST') THEN
-        SSPEED = 10
-        IF (COUNT .LT. 2000) SSPEED = 5.0
-        IF (COUNT .LT. 1000) SSPEED = 2.5
-        IF (COUNT .LT.  400) SSPEED = 1.0
-        ICIRCLE = 1
-        NPTS = 50
-        WIDTH = 2.5
-        STEP = WIDTH/NPTS
-        ISLIT = 3
-        CALL GENSCN (ICIRCLE,SSPEED,STEP,NPTS,ISLIT,ICOL)
-        CALL PFIT (NPTS,BEST)
-        ISLIT = 0
-        IF (KI .EQ. 'FF') GO TO 200
-        FIRST = BEST*STEP
-        CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,IERR)
-        ISLIT = 4
-        CALL GENSCN (ICIRCLE,SSPEED,STEP,NPTS,ISLIT,ICOL)
-        CALL PFIT (NPTS,BEST)
-        ISLIT = 0
-        IF (KI .EQ. 'FF') GO TO 200
-        SECOND = STEP*BEST
-        DELTAC = 0.5*(FIRST - SECOND)/(2.0*SIN(0.5*THETA/DEG))
-        CHI = CHI - DELTAC
-        ISLIT = 0
-        IF (ABS(DELTAC) .GE. 1.0) ISLIT = 1
-        THETA = THETA + 0.5*(FIRST + SECOND)
-        OMEGA = OMEGA - 0.25*(FIRST + SECOND)
-      ENDIF
-C-----------------------------------------------------------------------
-C  Omega circle
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'SO') THEN
-        ICIRCLE = 2
-        NPTS = 50
-        STEP = 1.0/NPTS
-        SSPEED = 5
-  120   CALL GENSCN (ICIRCLE,SSPEED,STEP,NPTS,ISLIT,ICOL)
-        CALL PFIT (NPTS,BEST)
-        IF (KI .EQ. 'BO' .OR. KI .EQ. 'TO') THEN
-          IF (KI .EQ. 'BO') OFF = -0.5
-          IF (KI .EQ. 'TO') OFF =  0.5
-          OMEGA = OMEGA + OFF
-          KI = 'SO'
-          CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-          GO TO 120
-        ENDIF
-        IF (KI .EQ. 'FF') GO TO 200
-        OMEGA = OMEGA + STEP*BEST
-      ENDIF
-C-----------------------------------------------------------------------
-C  Chi (Kappa) circle
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'SC') THEN
-        ICIRCLE = 3
-        NPTS = 50
-        STEP = 5.0/NPTS
-        SSPEED = 20
-        CALL GENSCN (ICIRCLE,SSPEED,STEP,NPTS,ISLIT,ICOL)
-        CALL PFIT (NPTS,BEST)
-        IF (KI .EQ. 'FF') RETURN
-        OMEGA = OMEGA + THETA/2.0
-        CALL EULKAP (0,OMEGA,CHI,PHI,OMK,RKA,PHIK,ICOL)
-        RKA = RKA + STEP*BEST
-        CALL EULKAP (1,OMEGA,CHI,PHI,OMK,RKA,PHIK,ICOL)
-        OMEGA = OMEGA - THETA/2.0
-      ENDIF
-C-----------------------------------------------------------------------
-C  Phi  circle
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'SP') THEN
-        ICIRCLE = 4
-        NPTS = 50
-        STEP = 4.0/NPTS
-        SSPEED = 10
-  130   CALL GENSCN (ICIRCLE,SSPEED,STEP,NPTS,ISLIT,ICOL)
-        CALL PFIT (NPTS,BEST)
-        IF (KI .EQ. 'BO' .OR. KI .EQ. 'TO') THEN
-          IF (KI .EQ. 'BO') OFF = -2.0
-          IF (KI .EQ. 'TO') OFF =  2.0
-          PHI = PHI + OFF
-          KI = 'SP'
-          CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-          GO TO 130
-        ENDIF
-        IF (KI .EQ. 'FF') GO TO 200
-        PHI = PHI + STEP*BEST
-      ENDIF
-C-----------------------------------------------------------------------
-C  Omega/2theta circles
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'WT') THEN
-        ICIRCLE = 5
-        NPTS = 50
-        STEP = 4.0/NPTS
-        SSPEED = 20
-  140   CALL GENSCN (ICIRCLE,SSPEED,STEP,NPTS,ISLIT,ICOL)
-        CALL PFIT (NPTS,BEST)
-        IF (KI .EQ. 'BO' .OR. KI .EQ. 'TO') THEN
-          IF (KI .EQ. 'BO') OFF = -2.0
-          IF (KI .EQ. 'TO') OFF =  2.0
-          THETA = THETA + OFF
-          OMEGA = OMEGA + 0.5*OFF
-          KI = 'WT'
-          CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-          GO TO 140
-        ENDIF
-        IF (KI .EQ. 'FF') RETURN
-        THETA = THETA + STEP*BEST
-      ENDIF
-  200 CONTINUE
-C      write (LPT,99998) ki,theta,omega,chi,phi
-C99998 format (' After  ',a,2x,4f8.3)
-      RETURN
-      END
-C
-C-----------------------------------------------------------------------
-C  Subroutine to find the centroid of the ACOUNT distribution
-C-----------------------------------------------------------------------
-      SUBROUTINE PFIT (NPTS,BEST)
-      INCLUDE 'COMDIF'
-      DIMENSION TCOUNT(NSIZE)
-      EQUIVALENCE (ACOUNT(9*NSIZE+1), TCOUNT(1))
-C-----------------------------------------------------------------------
-C  Find the maximum point
-C-----------------------------------------------------------------------
-      MAX = 0
-      SUM = 0.0
-      DO 100 I = 1,NPTS
-        IF (TCOUNT(I) .GT. MAX) THEN
-          MAX = TCOUNT(I)
-          IMAX = I
-        ENDIF
-        SUM = SUM + TCOUNT(I)
-  100 CONTINUE     
-      IF (MAX .LE. 10) THEN
-        KI = 'FF'
-        GO TO 200
-      ENDIF
-C-----------------------------------------------------------------------
-C  Find the half-height points on either side
-C-----------------------------------------------------------------------
-      DO 110 I = IMAX,1,-1
-        IF (TCOUNT(I) .LT. MAX/2) THEN
-          NBOT = I
-          GO TO 120
-        ENDIF
-  110 CONTINUE
-      KI = 'BO'
-      BEST = IMAX - NPTS/2
-      GO TO 200
-  120 DO 130 I = IMAX,NPTS
-        IF (TCOUNT(I) .LT. MAX/2) THEN
-          NTOP = I
-          GO TO 140
-        ENDIF
-  130 CONTINUE
-      KI = 'TO'
-      BEST = IMAX - NPTS/2
-      GO TO 200
-C-----------------------------------------------------------------------
-C  Find the point of half sum between NBOT and NTOP
-C-----------------------------------------------------------------------
- 140  SUM = 0.0
-      DO 150 I = NBOT,NTOP
-        SUM = SUM + TCOUNT(I)
-  150 CONTINUE
-      HALF = 0.0
-      DO 160 I = NBOT,NTOP
-        HALF = HALF + TCOUNT(I)
-        IF (HALF .GT. SUM/2.0) GO TO 170
-  160 CONTINUE
-  170 FRACX = (SUM/2.0 - HALF + TCOUNT(I))/TCOUNT(I)
-      BEST = I - 1 + FRACX - NPTS/2 - 0.5
-  200 CONTINUE
-C      IF (KI .EQ. 'FF' .OR. KI .EQ. 'TO' .OR. KI .EQ. 'BO') THEN
-C        write (LPT,99999) KI,imax,max,nbot,ntop,(tcount(i),i=1,50)
-C      ENDIF
-C99999 format (' imax,max,nbot,ntop',A,4i6/(10f7.0))
-      RETURN
-      END
diff --git a/difrac/cfind.f b/difrac/cfind.f
deleted file mode 100644
index beed4b8d..00000000
--- a/difrac/cfind.f
+++ /dev/null
@@ -1,63 +0,0 @@
-C-----------------------------------------------------------------------
-C  Subroutine to find the coarse centre for Chi
-C-----------------------------------------------------------------------
-      SUBROUTINE CFIND (TIM,MAXCOUNT)
-      INCLUDE 'COMDIF'
-      REAL MAXCOUNT, MCOUNT
-      DIMENSION TCOUNT(NSIZE)
-      EQUIVALENCE (ACOUNT(9*NSIZE+1),TCOUNT(1))
-      ICPSMX = 25000
-      STEPM  = 0.02
-      SENSE  = -1.0
-      CSTEP  = 1.5
-      NPTS   = 10
-      NRUN = 0
-  100 IF (CHI .LT.   0) CHI = CHI + 360
-      IF (CHI .GE. 360) CHI = CHI - 360
-      CHI = CHI + NPTS*CSTEP/2
-      CHISV = CHI
-  110 CALL ANGSET (THETA,OMEGA,CHISV,PHI,NATT,ICOL)
-      ICOUNT = 0
-      MCOUNT = 0
-      DO 120 I = 1,NPTS
-        CALL CCTIME (TIM,TCOUNT(I))
-        CALL KORQ (IFLAG1)
-        IF (IFLAG1 .NE. 1) THEN
-          KI = 'O4'
-          RETURN
-        ENDIF
-        IF (TCOUNT(I)/TIM .GT. ICPSMX .AND. NATT .LT. NATTEN) THEN
-          NATT = NATT + 1
-          GO TO 110
-        ENDIF
-        IF (TCOUNT(I) .GT. MCOUNT) THEN
-          MCOUNT = TCOUNT(I)
-          ICOUNT = I
-        ENDIF
-        CHI = CHI + SENSE*CSTEP
-        IF (CHI .LT.   0) CHI = CHI + 360
-        IF (CHI .GE. 360) CHI = CHI - 360
-        CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-  120 CONTINUE
-      MAXCOUNT = REAL(MCOUNT)
-      IF (ICOUNT .EQ. 1) THEN
-C
-C try the other direction, but only once otherwise we get into an 
-C endless loop
-C
-        IF(NRUN .GT. 0) THEN
-           MAXCOUNT = 0.
-           RETURN
-        ENDIF
-        SENSE = -SENSE
-        CHI = CHISV + 9*SENSE*CSTEP
-        NRUN = NRUN + 1
-        GO TO 100
-      ELSE IF (ICOUNT .EQ. 20) THEN
-        CHI = CHISV - 3*SENSE*CSTEP
-        GO TO 100
-      ENDIF
-C      CHI = CHI + (ICOUNT - 12.25)*SENSE*CSTEP
-      CHI = CHISV + ICOUNT*SENSE*CSTEP
-      RETURN
-      END
diff --git a/difrac/cinput.f b/difrac/cinput.f
deleted file mode 100644
index c0c73884..00000000
--- a/difrac/cinput.f
+++ /dev/null
@@ -1,56 +0,0 @@
-C-----------------------------------------------------------------------
-C  Input from the existing cell
-C-----------------------------------------------------------------------
-      SUBROUTINE CINPUT (IOUT,PRIM,ANPRIM,TRANSF)
-      INCLUDE 'COMDIF'
-      DIMENSION A(3),ALP(3),SYS(7),TRANS(3,3,7),AA(3,3),PRIM(3),
-     $          ANPRIM(3),TRANSF(3,3),H(3,3)
-      CHARACTER CATMOD*1,SYS*1,LINE*80
-      DATA SYS/'P','A','B','C','I','F','R'/
-      DATA TRANS/ 1, 0, 0,   0, 1, 0,   0, 0, 1,   1, 0, 0,   0,.5,.5,
-     $            0, 0, 1,  .5, 0,.5,   0, 1, 0,   0, 0, 1,  .5,.5, 0,
-     $            0, 1, 0,   0, 0, 1,  .5,.5,.5,   0, 1, 0,   0, 0, 1,
-     $           .5,.5, 0,   0,.5,.5,  .5, 0,.5,
-     $            .666667,  .333333, .333333,
-     $           -.333333,  .333333, .333333,
-     $           -.333333, -.666667, .333333/
-      RADEG = 180./3.141593
-      DO 100 I = 1,3
-        A(I) = AP(I)
-        ALP(I) = RADEG*ATAN2(SANG(I),CANG(I))
-  100 CONTINUE
-  110 WRITE (COUT,10000)
-      CALL ALFNUM (LINE)
-      CATMOD = LINE(1:1)
-      IF (CATMOD .EQ. ' ') CATMOD = 'P'
-      READ (CATMOD,11000) ATMOD
-      WRITE (COUT,12000) A,ALP,CATMOD
-      CALL GWRITE (IOUT,' ')
-      DO 120 I = 1,7
-        IF (CATMOD .EQ. SYS(I)) GO TO 130
-  120 CONTINUE
-      GO TO 110
-C----------------------------------------------------------------------- 
-C  CRAP is a dummy floating argument
-C-----------------------------------------------------------------------
-  130 CALL MATRIX(A,ALP,AA,CRAP,'ORTHOG')
-      DO 140 N = 1,3
-        CALL MATRIX(AA,TRANS(1,N,I),H(1,N),CRAP,'MATVEC')
-  140 CONTINUE
-      DO 150 N = 1,3
-        CALL MATRIX(AA,TRANS(1,N,I),PRIM(N),CRAP,'LENGTH')
-        J = MOD(N,3) + 1
-        K = 6 - N - J
-        CALL MATRIX(H(1,J),H(1,K),COSNG,CRAP,'SCALPR')
-        ANPRIM(N) = ACOS(COSNG)*RADEG
-  150 CONTINUE
-      DO 160 N = 1,3
-        DO 160 NN = 1,3
-          TRANSF(NN,N) = TRANS(N,NN,I)
-  160 CONTINUE
-      CALL BURGER(IOUT,PRIM,ANPRIM,TRANSF)
-      RETURN
-10000 FORMAT (' Lattice Type (P) ? ',$)
-11000 FORMAT (A1)
-12000 FORMAT (' Input Cell:',F8.3,5F10.3/12X,'Lattice Type ',A)
-      END
diff --git a/difrac/cntref.f b/difrac/cntref.f
deleted file mode 100644
index 40f1528f..00000000
--- a/difrac/cntref.f
+++ /dev/null
@@ -1,88 +0,0 @@
-C-----------------------------------------------------------------------
-C  Subroutine to count the number of reflections in a segment
-C-----------------------------------------------------------------------
-      SUBROUTINE CNTREF
-      INCLUDE 'COMDIF'
-      DIMENSION INDX(3),FDH(3,3),FDHI(3,3),ISET(25)
-      WRITE (COUT,10000)
-      CALL GWRITE (ITP,' ')
-      IOUT = -1
-      CALL SPACEG (IOUT,1)
-C-----------------------------------------------------------------------
-C  Ensure no rotation and set segment flag
-C-----------------------------------------------------------------------
-      DPSI = 0.0
-      ISEG = 0
-      IPRVAL = 0
-      IUMPTY = 1
-C-----------------------------------------------------------------------
-C  Get segment data and calculate segment parameters
-C-----------------------------------------------------------------------
-      DO 180 JSEG = 1,NSEG
-        DO 110 I = 1,3
-          DO 110 J = 1,3
-            NDH(I,J) = IDH(JSEG,I,J)
-  110   CONTINUE
-        IND(1) = IHO(JSEG)
-        IND(2) = IKO(JSEG)
-        IND(3) = ILO(JSEG)
-        HO = IND(1)
-        KO = IND(2)
-        LO = IND(3)
-        DO 120 I = 1,3
-          DO 120 J = 1,3
-            FDH(I,J) = NDH(I,J)
-  120   CONTINUE
-        CALL MATRIX (FDH,FDHI,FDHI,FDHI,'INVERT')
-        DO 140 I = 1,3
-          INDX(I) = FDHI(I,1)*(IND(1)-HO) + FDHI(I,2)*(IND(2)-KO) +
-     $              FDHI(I,3)*(IND(3)-LO)
-          IF (INDX(I) .GE. 0) THEN
-            INDX(I) = INDX(I) + 0.5
-          ELSE
-            INDX(I) = INDX(I) - 0.5
-          ENDIF
-  140   CONTINUE
-        IFSHKL(1,1) = NDH(1,1)*INDX(1) + IND(1)
-        IFSHKL(2,1) = NDH(2,1)*INDX(1) + IND(2)
-        IFSHKL(3,1) = NDH(3,1)*INDX(1) + IND(3)
-        DO 150 I = 1,3
-          IFSHKL(I,2) = NDH(I,2)*INDX(2) + IFSHKL(I,1)
-          IFSHKL(I,3) = NDH(I,3)*INDX(3) + IFSHKL(I,2)
-  150   CONTINUE
-        IH = IFSHKL(1,3)
-        IK = IFSHKL(2,3)
-        IL = IFSHKL(3,3)
-        IUPDWN = 1
-C-----------------------------------------------------------------------
-C  Set the standards flag for ANGCAL
-C-----------------------------------------------------------------------
-        ISTAN = 0
-        NN = 0
-        NCOUNT = 0
-C-----------------------------------------------------------------------
-C  Calculate the angle values and count the valid reflections
-C-----------------------------------------------------------------------
-  160   IPRVAL = 0
-        CALL ANGCAL
-        IF (IVALID .EQ. 0) THEN
-          IF (ISCAN .EQ. 1) THEN
-            IBZ = 1
-            CALL COMPTN (IBZ)
-            IF (IBZ .EQ. 3) GO TO 170
-          ENDIF
-          NCOUNT = NCOUNT + 1
-          CALL HKLN (IH,IK,IL,NCOUNT)
-        ENDIF
-  170   CALL INCHKL
-        IF (ISEG .EQ. 0) GO TO 160
-        WRITE (COUT,11000) JSEG,NCOUNT
-        CALL GWRITE (ITP,' ')
-        WRITE (LPT,11000) JSEG,NCOUNT
-  180 CONTINUE
-      IUMPTY = 0
-      KI = ' '
-      RETURN
-10000 FORMAT (' Count the number of reflections in each segment')
-11000 FORMAT (' DH Segment',I2,' contains',I6,' reflections')
-      END
diff --git a/difrac/comptn.f b/difrac/comptn.f
deleted file mode 100644
index 3084b82a..00000000
--- a/difrac/comptn.f
+++ /dev/null
@@ -1,69 +0,0 @@
-C-----------------------------------------------------------------------
-C  Count for a given time at a point within a defined Brillouin zone
-C-----------------------------------------------------------------------
-      SUBROUTINE COMPTN(IBZ)
-      INCLUDE 'COMDIF'
-      IF (IBZ .EQ. 1) THEN
-C-----------------------------------------------------------------------
-C  Test if point within B.Z. limits.  Return with IBZ=3 for invalid 
-C-----------------------------------------------------------------------
-        JTEMP = IH*JA(NMSEG) + IK*JB(NMSEG) + IL*JC(NMSEG)
-        JMN = JMIN(NMSEG)
-        JMX = JMAX(NMSEG)
-        IF (JTEMP .LT. JMN .OR. JTEMP .GT. JMX) IBZ = 3
-        RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Point measurement
-C-----------------------------------------------------------------------
-      NATT = 0
-C-----------------------------------------------------------------------
-C  Count for 1 sec to set correct attenuator
-C  No attenuator at TRICS, commented out, MK
-C-----------------------------------------------------------------------
-C      ATIME = 1000.0
-C      CALL CTIME (ATIME,ATCOUN)
-C      IF (ATCOUN .GT. 10000.0) THEN
-C        NATT = NATT + 1
-C        IF (NATT .LT. 6) THEN
-C          CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-C          IF (ICOL .NE. 0) THEN
-C            WRITE (COUT,10000) IH,IK,IL
-C            CALL GWRITE (ITP,' ')
-C            RETURN
-C          ENDIF
-C        ENDIF
-C      ENDIF
-C-----------------------------------------------------------------------
-C  QTIME,TMAX 
-C-----------------------------------------------------------------------
-      SAVEQ = QTIME
-      STMAX = TMAX
-      QTIME = QTIME
-      TMAX  = TMAX
-C-----------------------------------------------------------------------
-C  Sample count at point to find suitable counting time, then measure
-C-----------------------------------------------------------------------
-      CALL CCTIME (QTIME,ENQ)
-      COUNT = ENQ
-      ENQD = ENQ - 2.0*SQRT(ENQ)
-      IF (ENQD .LE. 0.0) ENQD = ENQ
-      F = ((100.0/PA)**2)/ENQD
-      PRESET = QTIME*F
-      IF (PRESET .GT. QTIME) THEN
-        IF (PRESET .GT. PRESET) PRESET = TMAX
-        TIMED = PRESET - QTIME
-        CALL CCTIME (TIMED,EN)
-      ELSE
-        PRESET = QTIME
-        EN = 0
-      ENDIF
-      COUNT = COUNT + EN
-      BGRD1 = 0.0
-      BGRD2 = 0.0
-      PSI = 0.0
-      QTIME = SAVEQ
-      TMAX = STMAX
-      RETURN
-10000 FORMAT (3I4,' Collision')
-      END
diff --git a/difrac/creduc.f b/difrac/creduc.f
deleted file mode 100644
index dff8b3f4..00000000
--- a/difrac/creduc.f
+++ /dev/null
@@ -1,340 +0,0 @@
-C-----------------------------------------------------------------------
-C  This program finds the conventional representation of a lattice
-C  input as cell parameters and a lattice type, assuming that metric
-C  relations in the lattice correspond to lattice symmetry.
-C  Pseudo-symmetry in the primitive lattice is also detected.
-C  See: Le Page, Y. (1982). J. Appl. Cryst., 15,255-259.
-C  Sept. 1986  Fortran 77  +  three-fold axes    YLP.
-C-----------------------------------------------------------------------
-      SUBROUTINE CREDUC (KI)
-      COMMON /GEOM/   AA(3,3),AINV(3,3),TRANS(3,3),RH(3,20),HH(3,20),
-     $                AANG(20),PH(3,20),PMESH(3,2,20),NERPAX(20),N2,N3,
-     $                EXPER
-      COMMON /IOUASS/ IOUNIT(10)
-      CHARACTER COUT*132
-      COMMON /IOUASC/ COUT(20)
-      COMMON /IODEVS/ ITP,ITR,LPT,LPTX,LNCNT,PGCNT,ICD,IRE,IBYLEN,
-     $                IPR,NPR,IIP
-      COMMON /INFREE/ IFREE(20),RFREE(20),ICFLAG
-      DIMENSION P(3),H(3),IP(3),IR(3),HX(3,37),DHX(3,37),CELL(3),
-     $          CELANG(3),SHORT(4,4),IPAD(20),VPROD(3),DIRECT(3),
-     $          RECIP(3)
-      CHARACTER KI*2
-C----------------------------------------------------------------------
-C  The 37 acceptable index combinations of 0, +/- 1 or 2
-C----------------------------------------------------------------------
-      DATA ITOT/37/
-      DATA DHX/  1, 0, 0,   0, 1, 0,   0, 0, 1,   1, 1, 0,   1, 0, 1,
-     $           0, 1, 1,   1,-1, 0,   1, 0,-1,   0, 1,-1,   1, 1, 1,
-     $           1, 1,-1,   1,-1, 1,  -1, 1, 1,   2, 1, 0,   2, 0, 1,
-     $           2,-1, 0,   2, 0,-1,   0, 2, 1,   1, 2, 0,   0, 2,-1,
-     $          -1, 2, 0,   1, 0, 2,   0, 1, 2,  -1, 0, 2,   0,-1, 2,
-     $           2, 1, 1,   2, 1,-1,   2,-1, 1,  -2, 1, 1,   1, 2, 1,
-     $           1, 2,-1,   1,-2, 1,  -1, 2, 1,   1, 1, 2,   1, 1,-2,
-     $           1,-1, 2,  -1, 1, 2/
-      INP  = -1
-      IOUT = ITP
-      WRITE (COUT,18000)
-      CALL FREEFM (ITR)
-      EXPER = RFREE(1)
-      IF (EXPER .EQ. 0.0) EXPER = 0.01
-C----------------------------------------------------------------------
-C  Get the input cell and bring back the Buerger cell parameters
-C  and the input -> Buerger cell parameters
-C----------------------------------------------------------------------
-  100 CALL CINPUT (IOUT,CELL,CELANG,TRANS)
-      WRITE (COUT,13000)
-      CALL GWRITE (IOUT,' ')
-      WRITE (COUT,14000)
-      CALL GWRITE (IOUT,' ')
-C-----------------------------------------------------------------------
-C  Describe the Buerger direct and reciprocal cells by their cartesian
-C  coordinates AA and AINV. CRAP is a dummy floating argument
-C-----------------------------------------------------------------------
-      CALL MATRIX (CELL,CELANG,AA,CRAP,'ORTHOG')
-      CALL MATRIX (AA,AINV,CRAP,CRAP,'INVERT')
-C----------------------------------------------------------------------
-C  Default angular tolerance: 3 degrees
-C----------------------------------------------------------------------
-      ANGMAX = TAN(3.0/57.2958)**2
-C-----------------------------------------------------------------------
-C  Find the twofold axes:
-C  Generate all unique combinations of 0, 1 and 2
-C  Get the direction cosines of the possible rows
-C-----------------------------------------------------------------------
-      DO 110 IT = 1,ITOT
-        CALL MATRIX (AA,DHX(1,IT),HX(1,IT),CRAP,'MATVEC')
-  110 CONTINUE
-C-----------------------------------------------------------------------
-C  Get direction cosines for the normal to the possible planes in turn
-C-----------------------------------------------------------------------
-      N2 = 0
-      DO 140 IT = 1,ITOT
-        CALL MATRIX (DHX(1,IT),AINV,P,CRAP,'VECMAT')
-C-----------------------------------------------------------------------
-C  Select the rows in turn
-C-----------------------------------------------------------------------
-        DO 130 L = 1,ITOT
-C-----------------------------------------------------------------------
-C  Calculate the multiplicity of the cell defined by the mesh on the
-C  plane and the translation along the row
-C-----------------------------------------------------------------------
-          MULT = ABS(DHX(1,L)*DHX(1,IT)  + DHX(2,L)*DHX(2,IT) +
-     $               DHX(3,L)*DHX(3,IT)) + 0.1
-          IF (MULT .EQ. 1 .OR. MULT .EQ. 2) THEN
-C-----------------------------------------------------------------------
-C  Calculate the angle between the row and the normal to the plane
-C-----------------------------------------------------------------------
-            ANG = ((P(1)*HX(2,L) - P(2)*HX(1,L))**2 +
-     $             (P(2)*HX(3,L) - P(3)*HX(2,L))**2 +
-     $             (P(3)*HX(1,L) - P(1)*HX(3,L))**2)
-            IF (ANG .LE. ANGMAX) THEN
-              N2 = N2 + 1
-              DO 120 NX = 1,3
-                PH(NX,N2) = DHX(NX,IT)
-                HH(NX,N2) = HX (NX,L)
-                RH(NX,N2) = DHX(NX,L)
-  120         CONTINUE
-              AANG(N2)  = ANG
-              NERPAX(N2) = 2
-            ENDIF
-          ENDIF
-  130   CONTINUE
-  140 CONTINUE
-      N3 = N2
-C-----------------------------------------------------------------------
-C  Order the rows on the angle with the normal to the plane
-C-----------------------------------------------------------------------
-      IF (N2 .LT. 2) GO TO 250
-      DO 170 I = 1,N2 - 1
-        ANMAX = AANG(I)
-        MAX = I
-        DO 160 J = I + 1,N2
-          IF (AANG(J) .LT. ANMAX) THEN
-            ANMAX = AANG(J)
-            MAX = J
-          ENDIF
-  160   CONTINUE
-        CALL MATRIX (RH(1,I),RH(1,MAX),CRAP,CRAP,'INTRCH')
-        CALL MATRIX (PH(1,I),PH(1,MAX),CRAP,CRAP,'INTRCH')
-        CALL MATRIX (HH(1,I),HH(1,MAX),CRAP,CRAP,'INTRCH')
-        AANG(MAX) = AANG(I)
-        AANG(I) = ANMAX
-  170 CONTINUE
-C-----------------------------------------------------------------------
-C  Find the kind of axis: find a family of coplanar twofold axes
-C-----------------------------------------------------------------------
-      IF (N2 .LT. 3) GO TO 250
-      DO 220 I = 1,N2 - 1
-        IPAD(1) = I
-        DO 210 J = I + 1,N2
-          IPAD(2) = J
-          NUMAX = 2
-          DO 180 K = 1,N2
-            IF (K .NE. I .AND. K .NE. J) THEN
-              CALL MATRIX (RH(1,I),RH(1,J),RH(1,K),DET,'DETERM')
-              IF (ABS(DET) .LE. 0.01) THEN
-                IF (K .LT. J) GO TO 210
-                NUMAX = NUMAX + 1
-                IPAD (NUMAX) = K
-              ENDIF
-            ENDIF
-  180     CONTINUE
-C-----------------------------------------------------------------------
-C  Now find a twofold axis perpendicular to this plane
-C-----------------------------------------------------------------------
-          DO 190 K = 1,N2
-            CALL MATRIX (PH(1,K),RH(1,I),SCAL,CRAP,'SCALPR')
-            IF (ABS(SCAL) .LE. 0.01) THEN
-              CALL MATRIX (PH(1,K),RH(1,J),SCAL,CRAP,'SCALPR')
-              IF (ABS(SCAL) .LE. 0.01) THEN
-C-----------------------------------------------------------------------
-C  Found one: its maximum order is NUMAX, the number of perpend. axes
-C-----------------------------------------------------------------------
-                NERPAX(K) = NUMAX
-                IF (NUMAX .LE. 2) NERPAX(K) = 2
-                GO TO 210
-              ENDIF
-            ENDIF
-  190     CONTINUE
-C-----------------------------------------------------------------------
-C  Three coplanar axes were found, but no perpendicular one:
-C  this is likely to be a threefold axis.
-C-----------------------------------------------------------------------
-          IF (NUMAX .GT. 2) THEN
-            CALL MATRIX (HH(1,I),HH(1,J),VPROD ,CRAP,'VECPRD')
-            CALL MATRIX (VPROD  ,AA     ,RECIP ,CRAP,'VECMAT')
-            CALL MATRIX (RECIP  ,RECIP  ,CRAP  ,CRAP,'COPRIM')
-            CALL MATRIX (RECIP  ,AINV   ,P     ,CRAP,'VECMAT')
-            CALL MATRIX (AINV   ,VPROD  ,DIRECT,CRAP,'MATVEC')
-            CALL MATRIX (DIRECT ,DIRECT ,CRAP  ,CRAP,'COPRIM')
-            CALL MATRIX (AA     ,DIRECT ,H     ,CRAP,'MATVEC')
-            CALL MATRIX (DIRECT ,RECIP  ,SCAL  ,CRAP,'SCALPR')
-            MULT = ABS(SCAL) + 0.1
-            ANG = ((P(1)*H(2) - P(2)*H(1))**2 +
-     $             (P(2)*H(3) - P(3)*H(2))**2 +
-     $             (P(3)*H(1) - P(1)*H(3))**2)/(MULT*MULT)
-            IF (ANG .LE. ANGMAX) THEN
-C-----------------------------------------------------------------------
-C  All seems to be ok, save the results
-C-----------------------------------------------------------------------
-              N3 = N3 + 1
-              DO 200 NX = 1,3
-                PH(NX,N3) = RECIP(NX)
-                RH(NX,N3) = DIRECT(NX)
-                HH(NX,N3) = H(NX)
-  200         CONTINUE
-              AANG(N3)  = ANG
-              NERPAX(N3) = NUMAX
-              IF (NUMAX .EQ. 0) NERPAX(N3) = 2
-            ENDIF
-          ENDIF
-  210   CONTINUE
-  220 CONTINUE
-C-----------------------------------------------------------------------
-C  Order the threefold axes on the angle with the plane
-C-----------------------------------------------------------------------
-      IF (N3 - N2 .GE. 2) THEN
-        DO 240 I = N3,N3 - 1,-1
-          ANMAX = AANG(I)
-          MAX = I
-          DO 230 J = I + 1,N3
-            IF (AANG(J) .LT. ANMAX) THEN
-              ANMAX = AANG(J)
-              MAX = J
-            ENDIF
-  230     CONTINUE
-          CALL MATRIX (RH(1,I),RH(1,MAX),CRAP,CRAP,'INTRCH')
-          CALL MATRIX (PH(1,I),PH(1,MAX),CRAP,CRAP,'INTRCH')
-          CALL MATRIX (HH(1,I),HH(1,MAX),CRAP,CRAP,'INTRCH')
-          SAVE = NERPAX(I)
-          NERPAX(I) = NERPAX(MAX)
-          NERPAX(MAX) = NERPAX(I)
-          AANG(MAX) = AANG(I)
-          AANG(I) = ANMAX
-  240   CONTINUE
-      ENDIF
-C-----------------------------------------------------------------------
-C  Get 2 primitive translations for the perpendicular plane
-C-----------------------------------------------------------------------
-  250 DO 380 IT = 1,N3
-        NMESH = 1
-        DO 260 I = 1,ITOT
-          CALL MATRIX (DHX(1,I),PH(1,IT),SCAL,CRAP,'SCALPR')
-          IF (ABS(SCAL) .LE. 0.01) THEN
-            NMESH2 = I
-            IF (NMESH .EQ. 1) NMESH1 = I
-            IF (NMESH .EQ. 2) GO TO 270
-            NMESH = NMESH + 1
-          ENDIF
-  260   CONTINUE
-  270   DO 280 I = 1,3
-          SHORT(I,1) = DHX(I,NMESH1)
-          SHORT(I,2) = DHX(I,NMESH2)
-  280   CONTINUE
-C-----------------------------------------------------------------------
-C  Get the 2 shortest translations in the plane: generate mesh diagonals
-C-----------------------------------------------------------------------
-  290   DO 300 I = 1,3
-          SHORT(I,3) = SHORT(I,1) + SHORT(I,2)
-          SHORT(I,4) = SHORT(I,1) - SHORT(I,2)
-  300   CONTINUE
-        DO 310 I = 1,4
-          CALL MATRIX (AA,SHORT(1,I),SHORT(4,I),CRAP,'LENGTH')
-  310   CONTINUE
-C-----------------------------------------------------------------------
-C  Rank their lengths
-C-----------------------------------------------------------------------
-        ISWTCH = 0
-        DO 340 I = 1,2
-          DO 330 J = 2,4
-            IF (SHORT(4,J) .LT. SHORT(4,I)) THEN
-              DO 320 K = 1,4
-                SAVE = SHORT(K,I)
-                SHORT(K,I) = SHORT(K,J)
-                SHORT(K,J) = SAVE
-  320         CONTINUE
-              ISWTCH = 1
-            ENDIF
-  330     CONTINUE
-  340   CONTINUE
-C-----------------------------------------------------------------------
-C  Finished when no more interchanges
-C-----------------------------------------------------------------------
-        IF (ISWTCH .EQ. 1) GO TO 290
-C-----------------------------------------------------------------------
-C  Make sure the angle is not acute
-C-----------------------------------------------------------------------
-        CALL MATRIX (AA,SHORT(1,1),SHORT(1,3),CRAP,'MATVEC')
-        CALL MATRIX (AA,SHORT(1,2),SHORT(1,4),CRAP,'MATVEC')
-        CALL MATRIX (SHORT(1,3),SHORT(1,4),SCAL,CRAP,'SCALPR')
-        IF (SCAL .GE. 0.0) THEN
-          DO 350 IAX = 1,3
-            SHORT(IAX,2) = -SHORT(IAX,2)
-  350     CONTINUE
-        ENDIF
-C-----------------------------------------------------------------------
-C  Make sure the reference system is right-handed
-C-----------------------------------------------------------------------
-        IS = 1
-        CALL MATRIX (RH(1,IT),PH(1,IT),SCAL,CRAP,'SCALPR')
-        IF (SCAL .LT. 0.) IS = -1
-        IS1 = 1
-        CALL MATRIX (SHORT(1,1),SHORT(1,2),RH(1,IT),DET,'DETERM')
-        IF (DET .LT. 0.) IS1 = -1
-C-----------------------------------------------------------------------
-C  This is a potential symmetry axis, we print and save the values
-C-----------------------------------------------------------------------
-        DO 370 NX = 1,3
-          RH(NX,IT) = IS1*RH(NX,IT)
-          HH(NX,IT) = IS1*HH(NX,IT)
-          PH(NX,IT) = IS*IS1*PH(NX,IT)
-          IP(NX) = PH(NX,IT)
-          IR(NX) = RH(NX,IT)
-          DO 370 NY = 1,2
-            PMESH (NX,NY,IT) = IS1 * SHORT (NX,NY)
-  370   CONTINUE
-        AANG(IT) = ATAN(SQRT(AANG(IT)))*180.0/3.1415927
-        MULT = IR(1)*IP(1) + IR(2)*IP(2) + IR(3)*IP(3)
-        WRITE (COUT,15000) IR,IP,MULT,AANG(IT),NERPAX(IT)
-        CALL GWRITE (IOUT,' ')
-  380 CONTINUE
-C-----------------------------------------------------------------------
-C  Fill the next slot
-C-----------------------------------------------------------------------
-      DO 390 I = 1,3
-        RH(I,N3 + 1) = 0.0
-        PH(I,N3 + 1) = 0.0 
-        PMESH(I,1,N3 + 1) = 0.0
-        PMESH(I,2,N3 + 1) = 0.0
-  390 CONTINUE
-      PMESH(1,1,N3 + 1) = 1.0
-      PMESH(2,2,N3 + 1) = 1.0
-      RH(3,N3 + 1) = 1.0
-      PH(3,N3 + 1) = 1.0
-C-----------------------------------------------------------------------
-C  Find the crystal system
-C-----------------------------------------------------------------------
-      WRITE (COUT,16000)
-      CALL GWRITE (IOUT,' ')
-      NPSUDO = N2
-      CALL FNDSYS (IOUT,HH,NPSUDO)
-      IF (INP .GT. 0 .OR. IOUT .NE. ITP) THEN
-         WRITE (COUT,17000)
-         CALL GWRITE (IOUT,' ')
-      ENDIF
-      KI = ' '
-      RETURN
- 9000 FORMAT (/10X,'CREDUC -- The NRCVAX Cell Reduction Routine'/'%')
-10000 FORMAT (' Input from the terminal or a file (T) ? ',$)
-11000 FORMAT (' Output to terminal or lineprinter-file (T) ? ',$)
-13000 FORMAT (/15X,'Possible 2-fold Axes:'/
-     $        14X,'Rows',20X,'Products',9X,'Kind')
-14000 FORMAT (7X,'Direct',6X,'Reciprocal',7X,'Dot',4X,'Vector',4X,
-     $        'of Axis')
-15000 FORMAT (2X,3I4,2X,3I4,I10,F10.3,7X,I3)
-16000 FORMAT (/)
-17000 FORMAT (//)
-18000 FORMAT (' Type the Allowable Tolerance on True Cell Angles',
-     $        ' (0.01deg) ',$)
-      END
diff --git a/difrac/demo1e.f b/difrac/demo1e.f
deleted file mode 100644
index 2dcac1e6..00000000
--- a/difrac/demo1e.f
+++ /dev/null
@@ -1,138 +0,0 @@
-C-----------------------------------------------------------------------
-C  Subroutine to demonstrate the operations of the diffractometer.
-C-----------------------------------------------------------------------
-      SUBROUTINE DEMO1E
-      INCLUDE 'COMDIF'
-C-----------------------------------------------------------------------
-C  Print the header and wait 3 seconds
-C-----------------------------------------------------------------------
-      WRITE (COUT,10000)
-      CALL GWRITE (ITP,' ')
-      DELAY = 3.0
-C-----------------------------------------------------------------------
-C  Move 2Theta
-C-----------------------------------------------------------------------
-      CALL CCTIME (DELAY,COUNT)
-      CALL ANGET (THETA,OMEGA,CHI,PHI)
-      THETA = THETA + 20.0
-      CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-C-----------------------------------------------------------------------
-C  Move Omega
-C-----------------------------------------------------------------------
-      WRITE (COUT,11000)
-      CALL GWRITE (ITP,' ')
-      CALL CCTIME (DELAY,COUNT)
-      OMEGA = OMEGA - 20.0
-      CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-C-----------------------------------------------------------------------
-C  Move Chi
-C-----------------------------------------------------------------------
-      WRITE (COUT,12000)
-      CALL GWRITE (ITP,' ')
-      CALL CCTIME (DELAY,COUNT)
-      CHI = CHI + 20.0
-      IF (CHI .GE. 360.0) CHI = CHI - 360.0
-      CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-C-----------------------------------------------------------------------
-C  Move Phi
-C-----------------------------------------------------------------------
-      WRITE (COUT,13000)
-      CALL GWRITE (ITP,' ')
-      CALL CCTIME (DELAY,COUNT)
-      PHI = PHI + 30.0
-      IF (PHI .GE. 360.0) PHI = PHI - 360.0
-      CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-C-----------------------------------------------------------------------
-C  Move all circles
-C-----------------------------------------------------------------------
-      WRITE (COUT,14000)
-      CALL GWRITE (ITP,' ')
-      CALL CCTIME(DELAY,COUNT)
-      THETA = THETA - 20.0
-      OMEGA = OMEGA + 20.0
-      CHI = CHI - 20.0
-      PHI = PHI - 30.0
-      CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-C-----------------------------------------------------------------------
-C  Operate the shutter
-C-----------------------------------------------------------------------
-      WRITE (COUT,15000)
-      CALL GWRITE (ITP,' ')
-      DO 110 I = 1,10
-        DO 100 J = 1,100
-          DJUNK = SQRT(1.0)
-  100   CONTINUE
-  110 CALL SHUTTR (1)
-C-----------------------------------------------------------------------
-C  Operate the attenuator
-C-----------------------------------------------------------------------
-      WRITE (COUT,16000)
-      CALL GWRITE (ITP,' ')
-      DO 120 NAT = 1,6
-        IAT = MOD(NAT,6)
-        CALL ANGSET (THETA,OMEGA,CHI,PHI,IAT,ICOL)
-  120 CONTINUE
-C-----------------------------------------------------------------------
-C  Count for 5 seconds
-C-----------------------------------------------------------------------
-      WRITE (COUT,17000)
-      CALL GWRITE (ITP,' ')
-      DELAY = 5.0
-      DO 140 I = 1,5
-        DO 130 J = 1,100
-          DJUNK = SQRT(1.0)
-  130   CONTINUE
-        CALL CCTIME (DELAY,COUNT)
-  140 CONTINUE
-      CALL SHUTTR (-1)
-C-----------------------------------------------------------------------
-C  Header for line profile done by LINPRF
-C-----------------------------------------------------------------------
-      WRITE (COUT,18000)
-      CALL GWRITE (ITP,' ')
-      DO 150 I = 1,300
-        DJUNK = SQRT(1.0)
-  150 CONTINUE
-      CALL LINPRF
-      WRITE (COUT,20000)
-      CALL GWRITE (ITP,' ')
-      CALL INDMES
-      WRITE (COUT,21000)
-      CALL GWRITE (ITP,' ')
-      LPT = ISTAN
-      WRITE (COUT,22000)
-      CALL GWRITE (ITP,' ')
-      KI = ' '
-      RETURN
-10000 FORMAT (///,10X,'Demonstration of the National Research Council',
-     $        ' Diffractometer',///,
-     $         6X,'An automatic diffractometer measures the X-ray',
-     $           ' diffraction intensities',/,
-     $           ' of crystals using a scintillation counter.',/,
-     $           ' Its computer controls 4 angles.',/,
-     $           ' Please watch the instrument, it will operate',/,
-     $        3X,'-- The 2-Theta Circle')
-11000 FORMAT (3X,'-- The Omega Circle')
-12000 FORMAT (3X,'-- The Chi Circle')
-13000 FORMAT (3X,'-- The Phi Circle')
-14000 FORMAT (' One at a time or all together.')
-15000 FORMAT (' It also controls a shutter')
-16000 FORMAT (' and an attenuator to protect the counter from',
-     $        ' excessive radiation.')
-17000 FORMAT (' It can also count the x-ray quanta entering the',
-     $        ' scintillation counter.',/,
-     $        ' If you now watch the oscilloscope display on the',
-     $        ' top of the cabinet,',/,
-     $        ' it will count for 5 seconds.')
-18000 FORMAT (//'  These elementary operations (angles, shutter,',
-     $        ' attenuator, timed count)',/,
-     $        ' are now combined to make a line-profile analysis:')
-20000 FORMAT (///,'  It is now going to scan through the peak while',
-     $        ' counting, then subtract',/,
-     $        ' two background measurements to derive the integrated',
-     $        ' intensity under the peak.')
-21000 FORMAT (//,'  An actual experiment involves the measurement',
-     $        ' of thousands of intensities.',/,
-     $        ' Typically, it lasts for 1-2 weeks, day and night.')
-22000 FORMAT (//////////////////)
-      END
diff --git a/difrac/dhgen.f b/difrac/dhgen.f
deleted file mode 100644
index a994efbd..00000000
--- a/difrac/dhgen.f
+++ /dev/null
@@ -1,215 +0,0 @@
-C-----------------------------------------------------------------------
-C  Subroutine to generate and print the DH matrices
-C-----------------------------------------------------------------------
-      SUBROUTINE DHGEN
-      INCLUDE 'COMDIF'
-      DIMENSION IDHM(3,4,4),IDHC(3,4),ISET(25),IDHN(4,14),JDHM(3,4,16),
-     $          INDH(14),JDHN(4),JUNK(8)
-      EQUIVALENCE (JUNK(1),D12),  (JUNK(2),ILOW), (JUNK(3),IHIGH),
-     $            (JUNK(4),IDEL), (JUNK(5),IWARN),(JUNK(6),SUM),
-     $            (JUNK(7),FRAC1),(JUNK(8),IPRFLG)
-C-----------------------------------------------------------------------
-C  The 16 possible DH matrices
-C-----------------------------------------------------------------------
-      DATA JDHM / 0,0,0,    1,0,0,  0,1,0,  0,0,1, 
-     $           -1,0,1,   -1,0,0,  0,1,0,  0,0,1,
-     $           -1,1,0,   -1,0,0,  0,1,0,  0,0,-1, 
-     $            0,1,-1,   1,0,0,  0,1,0,  0,0,-1,
-     $            0,0,0,    1,0,0,  1,1,0,  0,0,1, 
-     $            0,0,0,    1,0,0,  1,1,0,  1,1,1,
-     $            1,2,0,    0,1,0,  1,1,0,  1,1,1,
-     $            1,2,0,    0,1,0,  1,1,0,  0,0,1,
-     $            0,1,1,    0,1,0,  1,1,0,  0,0,1, 
-     $            1,1,-1,   1,0,0,  1,1,0,  0,0,-1,
-     $            0,1,1,    0,1,0, -1,1,0,  0,0,1, 
-     $            1,2,0,    1,1,0,  0,1,0,  0,0,1,
-     $            0,0,0,    1,0,0,  1,0,-1, 1,1,1, 
-     $            1,1,0,    1,0,-1, 0,0,-1, 1,1,1,
-     $            0,-1,-2,  1,0,0,  1,0,-1,-1,-1,-1, 
-     $            1,0,-2,   1,0,-1, 0,0,-1,-1,-1,-1/
-      DATA INDH/4,2,1,2,1,4,2,3,2,2,2,1,2,1/
-C-----------------------------------------------------------------------
-C                   -1            2/m           mmm           4/m
-C                  4/mmm          R-3           R-3m          -3
-C                  -31m          -3m1           6/m           6/mmm
-C                   m3            m3m
-C-----------------------------------------------------------------------
-      DATA IDHN/ 1, 2, 3, 4,   1, 2, 0, 0,   1, 0, 0, 0,   5,12, 0, 0, 
-     $           5, 0, 0, 0,  13,14,15,16,  13,14, 0, 0,   5,12,11, 0,
-     $           5, 9, 0, 0,   5,10, 0, 0,   5, 8, 0, 0,   5, 0, 0, 0,
-     $           6, 7, 0, 0,   6, 0, 0, 0/
-C-----------------------------------------------------------------------
-C  Select the proper segment information
-C-----------------------------------------------------------------------
-      NUMDH = INDH(LAUENO)
-      DO 100 I = 1,4
-        JDHN(I) = IDHN(I,LAUENO)
-  100 CONTINUE
-C-----------------------------------------------------------------------
-C  Output the independent set
-C-----------------------------------------------------------------------
-      DO 120 N = 1,NUMDH
-        DO 120 I = 1,3
-          DO 120 J = 1,4
-            M = JDHN(N)
-            IDHM(I,J,N) = JDHM(I,J,M)
-  120 CONTINUE
-      IF (LAUENO .EQ. 2) THEN
-        DO 130 N = 1,NUMDH
-          DO 130 J = 1,4
-            SAVE = IDHM(2,J,N)
-            IDHM(2,J,N) = IDHM(NAXIS,J,N)
-            IDHM(NAXIS,J,N) = SAVE
-  130   CONTINUE
-      ENDIF
-C-----------------------------------------------------------------------
-C  If in Automatic Alignment mode, skip the questions (???)
-C-----------------------------------------------------------------------
-C      140 IF (KI .EQ. 'O2') GO TO 260                          
-C-----------------------------------------------------------------------
-C  Do DH stuff in GO mode only
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'GO') THEN
-C-----------------------------------------------------------------------
-C  Any changes to the DH sequences ?
-C-----------------------------------------------------------------------
-        WRITE (COUT,9000)
-        CALL YESNO ('N',ANS)
-        IF (ANS .EQ. 'Y') THEN
-  140     WRITE (COUT,10000)
-          CALL GWRITE (ITP,' ')
-          WRITE (COUT,11000) (L,((IDHM(I,J,L),I=1,3),J=1,4),L=1,NUMDH)
-          CALL GWRITE (ITP,' ')
-C-----------------------------------------------------------------------
-C  Alter the order of the DH vectors ?
-C-----------------------------------------------------------------------
-          WRITE (COUT,12000)
-          CALL YESNO ('N',ANS)
-          IF (ANS .EQ. 'Y') THEN
-            WRITE (COUT,13000)
-            CALL FREEFM (ITR)
-            NSET = IFREE(1)
-            NSMIN = NSET
-            NSMAX = NSET
-            IF (NSET .EQ. 0) THEN
-              NSMIN = 1
-              NSMAX = NUMDH
-            ENDIF
-  150       WRITE (COUT,15000)
-            CALL FREEFM (ITR)
-            I1 = IFREE(1)
-            I2 = IFREE(2)
-            I3 = IFREE(3)
-            IF (I1*I2*I3 .NE. 6) GO TO 150
-            DO 160 NSET = NSMIN,NSMAX
-              DO 160 I = 1,3
-                SAVE1 = IDHM(I,I1+1,NSET)
-                SAVE2 = IDHM(I,I2+1,NSET)
-                SAVE3 = IDHM(I,I3+1,NSET)
-                IDHM(I,2,NSET) = SAVE1
-                IDHM(I,3,NSET) = SAVE2
-                IDHM(I,4,NSET) = SAVE3
-  160       CONTINUE
-            GO TO 140
-          ENDIF
-C-----------------------------------------------------------------------
-C  Print the DH matrices for the various sets
-C-----------------------------------------------------------------------
-          NSET = 0
-          WRITE (COUT,17000)
-          CALL YESNO ('N',ANS)
-          IF (ANS .EQ. 'Y') THEN
-            WRITE (LPT,19000)
-C-----------------------------------------------------------------------
-C  Calculate the symmetry-related matrices and print them
-C-----------------------------------------------------------------------
-            DO 190 M = 1,NSYM
-              DO 190 L = 1,NUMDH
-                LDH = JDHN(L)
-                DO 180 K = 1,4
-                  DO 180 J = 1,3
-                    IDHC(J,K) = 0
-                    DO 180 I = 1,3
-                      IDHC(J,K) = IDHC(J,K)+IDHM(I,K,L)*JRT(I,J,M)
-  180           CONTINUE
-                WRITE (LPT,21000) M,L,IDHC
-  190       CONTINUE
-          ENDIF
-C-----------------------------------------------------------------------
-C  Propose the pointer mode
-C-----------------------------------------------------------------------
-          WRITE (COUT,22000)
-          CALL YESNO ('Y',ANS)
-          NSET = 0
-          IF (ANS .EQ. 'N') THEN
-  200       WRITE (COUT,23000)
-            CALL FREEFM (ITR)
-            DO 210 I = 1,12
-              ISET(I) = IFREE(I)
-  210       CONTINUE
-            DO 220 I = 13,25
-              ISET(I) = 0
-  220       CONTINUE
-            WRITE (COUT,23100)
-            CALL YESNO ('N',ANS)
-            IF (ANS .EQ. 'Y') THEN
-              WRITE (COUT,23200)
-              CALL FREEFM (ITR)
-              DO 230 I = 1,13
-                ISET(I+12) = IFREE(I)
-  230         CONTINUE
-            ENDIF
-C-----------------------------------------------------------------------
-C  Find the number of pointers typed
-C-----------------------------------------------------------------------
-            DO 240 NSET = 1,25
-              IF (ISET(NSET) .EQ. 0) GO TO 250
-  240       CONTINUE
-            NSET = NSET + 1
-  250       NSET = NSET - 1
-C-----------------------------------------------------------------------
-C  Output them
-C-----------------------------------------------------------------------
-            WRITE (COUT,24000) (ISET(I),I = 1,NSET)
-            CALL GWRITE (ITP,' ')
-            WRITE (COUT,25000)
-            CALL YESNO ('Y',ANS)
-            IF (ANS .EQ. 'N') GO TO 200
-            WRITE (LPT,26000)
-            WRITE (LPT,24000) (ISET(I),I = 1,NSET)
-            IHO(5) = 1
-          ENDIF
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  Write all this information on the IDATA file
-C-----------------------------------------------------------------------
-  260 WRITE (IID,REC=4) LATCEN,NUMDH,IDHM,NSYM,
-     $                  NSET,ISET,LAUENO,NAXIS,ICENT
-      WRITE (IID,REC=5) (((JRT(I,J,K),I = 1,3),J = 1,4),K =  1, 6)
-      WRITE (IID,REC=6) (((JRT(I,J,K),I = 1,3),J = 1,4),K =  7,12)
-      WRITE (IID,REC=7) (((JRT(I,J,K),I = 1,3),J = 1,4),K = 13,18)
-      WRITE (IID,REC=8) (((JRT(I,J,K),I = 1,3),J = 1,4),K = 19,24)
-      RETURN
- 9000 FORMAT (' Do you wish to change the order of data-collection', 
-     $        ' (N) ? ',$)
-10000 FORMAT (/' DH Segment',15X,'Slow',16X,'Fast'/
-     $        28X,'1',9X,'2',9X,'3')
-11000 FORMAT (5X,I3,5X,3I3,'/',3I3,'/',3I3,'/',3I3)
-12000 FORMAT (' Do you wish to alter the h,k,l collection order', 
-     $        ' (N) ? ',$)
-13000 FORMAT (' In which segment (All) ? ',$)
-15000 FORMAT (' Type the order of collection, slowest first.',/,
-     $        '(e.g. 3,1,2 means 3 slowest and 2 fastest) ',$)
-17000 FORMAT (' Do you wish to print the DH matrices (N) ? ',$)
-19000 FORMAT (6X,'Set #   Segment #    St Ref       Slow',18X,'Fast',/)
-21000 FORMAT (2I10,5X,4(3I3,2X))
-22000 FORMAT (' Do you wish to collect the sets in the order',
-     $        ' 1,-1,2,-2,... (Y) ? ',$)
-23000 FORMAT (' Type a sequence of up to 12 set numbers on one line')
-23100 FORMAT (' Any more set numbers to type (N) ? ',$)
-23200 FORMAT (' Type up to another 13 set numbers on one line')
-24000 FORMAT (12I5,/,13I5)
-25000 FORMAT (' Is this sequence OK (Y) ? ',$)
-26000 FORMAT (///' The sequence of DH sets for data collection is :--')
-      END
diff --git a/difrac/dif.asc b/difrac/dif.asc
deleted file mode 100644
index 5e3a9995..00000000
Binary files a/difrac/dif.asc and /dev/null differ
diff --git a/difrac/dif.mak b/difrac/dif.mak
deleted file mode 100644
index 918c34d5..00000000
--- a/difrac/dif.mak
+++ /dev/null
@@ -1,34 +0,0 @@
-CFLAGS = -FPc -Od -c -Lr -Gs -Gt 512 -W2 
-FL     =  c:\fortran\bin\fl $(CFLAGS)
-ROOT   = ..
-LIBS   = $(ROOT)\libs
-
-OBJECTS= difrac.obj \
-          ang180.obj ang360.obj angval.obj begin.obj   \
-          cent8.obj  cfind.obj  demo1e.obj align.obj \
-          centre.obj mod360.obj profil.obj range.obj  sinmat.obj cellls.obj \
-          wxw2t.obj  angcal.obj basinp.obj comptn.obj orcel2.obj inchkl.obj \
-          linprf.obj lsormt.obj mesint.obj goloop.obj ormat3.obj blind.obj \
-          params.obj pltprf.obj pcount.obj prtang.obj prnbas.obj prnint.obj \
-          grid.obj   sammes.obj cellsd.obj stdmes.obj cntref.obj indmes.obj \
-          wrbas.obj  reindx.obj rcpcor.obj lotem.obj  nexseg.obj lister.obj \
-          oscil.obj  pfind.obj  pscan.obj  peaksr.obj sgprnh.obj \
-          setop.obj  tcentr.obj tfind.obj  fndsys.obj \
-          dhgen.obj  setrow.obj ralf.obj   creduc.obj cinput.obj \
-          pcdraw.obj burger.obj prompt.obj angrw.obj bigchi.obj \
-          eulkap.obj cad4io.obj qio.obj
-
-GENS    = yesno.obj  freefm.obj alfnum.obj matrix.obj \
-          sgroup.obj latmod.obj sgrmat.obj \
-          sglatc.obj sglpak.obj sgerrs.obj sgmtml.obj \
-          sgtrcf.obj \
-          setiou.obj ibmfil.obj
-
-EXEC    = difrac.exe
-
-$(EXEC): $(OBJECTS) $(GENS)
-        link @dif.ovl
-
-
-.for.obj:
-        $(FL) $<
diff --git a/difrac/dif.wpd b/difrac/dif.wpd
deleted file mode 100644
index b757dbeb..00000000
Binary files a/difrac/dif.wpd and /dev/null differ
diff --git a/difrac/difini.f b/difrac/difini.f
deleted file mode 100644
index 84ea49b8..00000000
--- a/difrac/difini.f
+++ /dev/null
@@ -1,248 +0,0 @@
-C-----------------------------------------------------------------------
-C 
-C    Diffractometer Control Routine for NRC Picker or Rigaku AFC6
-C                       E.J.Gabe and P.S White
-C            Chemistry Department , UNC, Chapel Hill, NC, USA
-C
-C  This routine is based on the original NRC Picker routine for the PDP8
-C                E.J. Gabe, Y. Le Page & D.F. Grant
-C           Chemistry Division, N.R.C., Ottawa, Canada.
-C
-C  The original code has been cleaned up and brought to F77 standard.
-C
-C  Transformed into a Subroutine for initialization for SICS by 
-C  Mark Koennecke, November 1999
-C
-C      Key              Function
-C
-C           *** Terminal Data Input Commands *** 
-C
-C       AD Attenuator Data: number and values. 
-C       BD all Basic Data (CZ DH FR LA OM OR PS RR SD SE TM TP) 
-C       CZ Correct angle Zero values. 
-C       FR First Reflection to be measured. 
-C       LA LAmbda for the wavelength in use, usually alpha1. 
-C       LN Liquid Nitrogen option - specific to cryosystem. 
-C       OM Orientation Matrix. 
-C       PS PSi rotation data. 
-C       RO re-Orientation Reflections: frequency and h,k,ls. 
-C       RR Reference Reflections: frequency and h,k,ls. 
-C       SD Scan Data: type, width, speed, profile control. 
-C       SE Systematic Extinctions. 
-C       SG Space-Group symbol. 
-C       TM 2Theta Min and max values. 
-C       TP Time and Precision parameters for intensity measurement. 
-C
-C           *** Crystal Alignment Commands *** 
-C
-C       AL ALign reflections and their symmetry equivalents for MM. 
-C       AR Align Resumption after interruption. 
-C       A8 Align the 8 alternate settings of one reflection. 
-C       CH CHoose reflections from the PK list for use with M2/M3. 
-C       CR Centre the Reflection which is already in the detector. 
-C       LC 2theta Least-squares Cell with symmetry constrained cell. 
-C       MM Matrix from Many reflections by least-squares on AL data. 
-C       M2 Matrix from 2 indexed reflections and a unit cell. 
-C       M3 Matrix from 3 indexed reflections. 
-C       OC Orient a Crystal, i.e. index the peaks from PK. 
-C       PK PeaK search in 2Theta, Chi, Phi for use with OC. 
-C       RC Reduce a unit Cell. 
-C       RP Rotate Phi 360degs, centre and save any peaks found. 
-C       RS ReSet the cell and matrix with the results from RC. 
-C
-C           *** Intensity Data Collection *** 
-C
-C       GO Start of intensity data collection. 
-C       K  Kill operation at the end of the current reflection. 
-C       Q  Quit after the next set of reference reflections.
-C
-C           *** Angle Setting and Intensity Measurement *** 
-C
-C       GS Grid Search measurement in 2theta, omega or chi. 
-C       IE Intensity measurement for Equivalent reflections. 
-C       IM Intensity Measurement of the reflection in the detector. 
-C       IP Intensity measurement in Psi for empirical absorption. 
-C       IR Intensity measurement for specified Reflections. 
-C       LP Line Profile plot on the printer. 
-C       SA Set All angles to specified values. 
-C       SC Set    Chi to the specified value. 
-C       SH SHutter open or close as a flip/flop. 
-C       SO Set  Omega to the specified value. 
-C       SP Set    Phi to the specified value. 
-C       SR Set Reflection: h,k,l,psi. 
-C       ST Set 2Theta to the specified value. 
-C       TC Timed Counts. 
-C       ZE ZEro the instrument Angles.
-C
-C           *** Photograph Setup Commands *** 
-C
-C       PL Photograph in the Laue mode. 
-C       PO Photograph in the Oscillation mode (same as OS). 
-C       PR Photograph in the Rotation mode.
-C
-C           *** General System Commands *** 
-C       AH Angles to H,k,l (same as IX). 
-C       AI Ascii Intensity data file conversion. 
-C       AP Ascii Profile data file conversion. 
-C       BC Big Chi search for psi rotation. 
-C       BI Big Intensity search in the IDATA.DA file. 
-C       EX EXit the program saving the basic data on IDATA.DA. 
-C       HA H,k,l to Angles (same as RA). 
-C       PA Print Angle settings. 
-C       PD Print Data of all forms. 
-C       Q  Quit the program directly. 
-C       RB Read the Basic data from the IDATA.DA file. 
-C       SW SWitch register flags setting. 
-C       UM (UMpty) Count unique reflections within theta limits. 
-C       WB Write the Basic data to the IDATA.DA file.
-C
-C  The program uses 2 main files:--
-C   1. On unit IID the file IDATA.DA contains all the permanent 
-C      information for a data collection:
-C   2. ON unit ISD the file ORIENT.DA is really a scratch file for 
-C      use with the crystal orientation routines
-C
-C  Both files are 'direct-access' with records of length 85 4-byte
-C  variables.
-C
-C  The file IDATA.DA contains the following information:--
-C      Record #            Information
-C       1,2,3       All the basic info for a particular data collection;
-C      4 to 8       All symmetry info from SGROUP;
-C         9         Automatic restart info for use after interruption;
-C     16 to 19      Alignment data for ALIGN;
-C     20 and up     Intensity data, 10 reflns per record.
-C
-C  There is a 9-bit switch register which can be changed with the SW
-C  command or during operation by typing any digit from 1 to 9.
-C  The switches control the following :--
-C
-C   1.  0 normal screen display; 1 profile display. 
-C   2.  0 display raw profile data; 1 display smoothed data.
-C   3.  0 dont print profiles;   1 print profiles on printer.
-C   4.  0 print intensity data;  1 do not print intensity data.
-C   5.  0 print standards data;  1 do not print standards.
-C   6.  0 no action; 1 add 20 points to profile tolerance.
-C   7.  0 no action; 1 add 10 points to profile tolerance.
-C   8.  0 no action; 1 add  5 points to profile tolerance.
-C   9.  0 no action; 1 write profiles to unit 7.
-C
-C  Common to match the CREDUC Common /GEOM/
-C-----------------------------------------------------------------------
-      SUBROUTINE DIFINI
-      INCLUDE 'COMDIF'
-      COMMON /CADCON/ ALPHA,APMIN,APMAX,MAXVAR,MINVAR,
-     $                IHOLE,IVSLIT,IHSLIT,INEG45,IPOS45,IUPHAF,ILOHAF,
-     $                VUTHT,VUOME,VUCHI,VUPHI,IPORT,IBAUD
-      COMMON /GEOM/   GJUNK(370)
-      CALL INIDATA
-      IDH(1,1,1) = 1
-      IDH(1,2,2) = 1
-      IDH(1,3,3) = 1
-      NOTEND = 0
-      IKO(5) = -777
-      ALPHA = 50.0
-C-----------------------------------------------------------------------
-C  Get the I/O unit numbers with SETIOU
-C-----------------------------------------------------------------------
-      CALL SETIOU (IID,ISD,LPT,ITR,ITP,IBYLEN)
-      CALL WNSET (3)
-C-----------------------------------------------------------------------
-C  Check that the angles did not change since the last time the
-C  program was stopped.
-C-----------------------------------------------------------------------
-      CALL ANGVAL
-      DFMODL = 'TRICS'
-      DFTYPE = 'TRICS'
-      WRITE (COUT,10000) DFMODL
-      CALL GWRITE (ITP,' ')
-      LPT = ITP
-C-----------------------------------------------------------------------
-C  Open the Idata file (IID) and the scratch file (ISD)
-C  If either file does not exist, create it.
-C-----------------------------------------------------------------------
-      DO 100 I = 1,85
-        ACOUNT(I) = 0.0
-  100 CONTINUE
-      IDREC = 85*IBYLEN
-      STATUS = 'OD'
-      IDNAME = 'IDATA.DA'
-      LENID = 700
-      CALL IBMFIL (IDNAME,IID,IDREC,STATUS,IERR)
-      IF (IERR .NE. 0) THEN
-        STATUS = 'DN'
-        CALL IBMFIL (IDNAME,IID,IDREC,STATUS,IERR)
-        KI = 'W2'
-        CALL WRBAS
-        KI = ' '
-        DO 110 I = 4,20
-          WRITE (IID,REC=I) (NOTEND,J = 1,85)
-  110   CONTINUE
-        STATUS = 'DO'
-        CALL IBMFIL (IDNAME,-IID,IDREC,STATUS,IERR)
-        CALL IBMFIL (IDNAME, IID,IDREC,STATUS,IERR)
-      ELSE
-        KI = 'AN'
-        CALL WRBAS
-      ENDIF
-      STATUS = 'OD'
-      DSNAME = 'ORIENT.DA'
-      LENSD = 300
-      CALL IBMFIL (DSNAME,ISD,IDREC,STATUS,IERR)
-      IF (IERR .NE. 0) THEN
-        WRITE (COUT,11000) DSNAME(1:9)
-        CALL GWRITE (ITP,' ')
-        STATUS = 'DN'
-        CALL IBMFIL (DSNAME,ISD,IDREC,STATUS,IERR)
-        DO 120 I = 1,300
-          WRITE (ISD,REC=I) (NOTEND,J = 1,85)
-  120   CONTINUE
-        STATUS = 'OD'
-        CALL IBMFIL (DSNAME,-ISD,IDREC,STATUS,IERR)
-        CALL IBMFIL (DSNAME, ISD,IDREC,STATUS,IERR)
-      ENDIF
-10000 FORMAT (/,10X,'Diffractometer Routine for TRICS ',A /)
-11000 FORMAT (' There is no file ',A,'.  It will be created.')
-      RETURN
-      END
-C----------------------------------------------------------------------
-      SUBROUTINE WNSET(I)
-      INTEGER I
-      RETURN
-      END
-C----------------------------------------------------------------------
-      SUBROUTINE WNEND
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  Block Data routine to initialize the COMMONs
-C-----------------------------------------------------------------------
-      SUBROUTINE INIDATA
-      INCLUDE 'COMDIF'
-      DATA ISCDEF,ICDDEF/150,250/,IDTDEF,IDODEF,IDCDEF/4,2,10/,
-     $     IFRDEF/100/,NRC/-1/,STEPDG/100.0/,ICADSL/60/,NATTEN/0/,
-     $     ATTEN/1.0,1.88,3.54,6.66,12.52,170.4/
-      DATA KQFLG2/0/,IUPDWN/1/,IUMPTY/0/,IAUTO,NSET/0,1/,SGSYMB/10*0.0/,
-     $     DEG/57.2958/
-      DATA R/0.070932,0,0, 0,0.070932,0, 0,0,0.070932/, 
-     $     DTHETA,DOMEGA,DCHI/0.,0.,0./,NAXIS/2/,
-     $     THEMIN,THEMAX/2.0,100.0/, AS,BS,CS/1.0,0.7,1.0/,
-     $     DPSI,PSIMIN,PSIMAX/3*0.0/, 
-     $     TIME,QTIME,TMAX/1000,1000,100000/,
-     $     PA,PM/2*1.0/, IHMAX,IKMAX,ILMAX/3*22/, WAVE/0.70932/, 
-     $     NCOND/0/,ICOND,IHS,IKS,ILS,IR,IS/30*0/,
-     $     SPEED/4.0/, STEPOF/0.5/, IORNT/0/,NINTOR/0/
-      DATA NSTAN/1/,NINTRR/100/,IHSTAN,IKSTAN,ILSTAN/4,17*0/,ISTAN/0/,
-     $     NSEG/1/,NMSEG/1/,NMSTAN/1/, NREF/0/, NBLOCK/20/,
-     $     IHO,IKO,ILO/24*0/, IND/3*0/, ITYPE/0/, JMIN,JMAX/16*0/, 
-     $     AP/3*10.0/,APS/3*0.1/,
-     $     CANGS/3*0.0/,SANGS/3*1.0/,CANG/3*0.0/,SANG/3*1.0/,
-     $     RTHETA,ROMEGA,RCHI,RPHI/4*0.0/, IH,IK,IL/1,2,3/
-      DATA IDH/72*0/, IBSECT,ISCAN/2*0/, FRAC/0.1/, IPRFLG/0/,
-     $     ISYS/1/, SINABS/3*0.00503135,3*0.0/, ILN/0/, DELAY/100/
-      DATA COUT/20*' '/,IWNCUR/0/,ISREG/1,1,1,0,0,0,0,0,1,0/
-      DATA STEP/0.02/,PRESET/15000./DPHI/0./
-      RETURN
-      END
-
-
diff --git a/difrac/difint.f b/difrac/difint.f
deleted file mode 100644
index e40a6932..00000000
--- a/difrac/difint.f
+++ /dev/null
@@ -1,724 +0,0 @@
-C-----------------------------------------------------------------------
-C           This is the Command interpreting subroutine
-C 
-C    Each 2-letter command in KI is associated with a unique call or 
-C  set of calls.  Having made the call the particular 2-letter sequence
-C  will not make any further calls and will be cleared at the end of 
-C  the call.
-C    When routines change the value of KI, which some do, the new value 
-C  is always unique and will always cause action further down in SETOP.
-C
-C-----------------------------------------------------------------------
-      SUBROUTINE DIFINT(COMMAND, LEN)
-      INTEGER COMMAND(256), LEN
-      INCLUDE 'COMDIF'
-      CHARACTER STRING*80
-
-      KI(1:1) = CHAR(COMMAND(1))
-      KI(2:2) = CHAR(COMMAND(2))
-C----------------------------------------------------------------------
-C  Disabling some unsupported commands for TRICS
-C----------------------------------------------------------------------
-      IF(KI .EQ. 'AD' .OR. KI .EQ. 'LT' .OR. KI .EQ. 'SH' .OR. 
-     $ KI .EQ. 'IN' .OR. KI .EQ.  'NR' .OR.
-     $ KI .EQ.  'EK' .OR. KI .EQ. 'FI' .OR. KI .EQ. 'KE' .OR. 
-     $ KI .EQ. 'MR' .OR. KI .EQ. 'MS')THEN
-         WRITE(COUT,23000)
-         CALL GWRITE(ITP,' ')
-         RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  The program runs in two modes, full screen and windowed.
-C  The following routines require the use of the windowed mode
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'GO' .OR. KI .EQ. 'IP' .OR.
-     $    KI .EQ. 'IR' .OR. KI .EQ. 'IE' .OR. KI .EQ. 'IM') THEN
-         IF (IWNCUR .EQ. 3) CALL WNSET (2)
-      ENDIF
-C-----------------------------------------------------------------------
-C  These routines require full screen mode, any others should work
-C  in either mode so we are not flipping screens all the time
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'AL' .OR. KI .EQ. 'A8' .OR. KI .EQ. 'RO' .OR.
-     $    KI .EQ. 'OC' .OR. KI .EQ. 'SD' .OR. KI .EQ. 'AR' .OR.
-     $    KI .EQ. 'PK' .OR. KI .EQ. 'RC' .OR. KI .EQ. 'PD' .OR.
-     $    KI .EQ. 'RP' .OR. KI .EQ. 'BD' .OR. KI .EQ. 'CH' .OR.
-     $    KI .EQ. 'GS' .OR. KI .EQ. 'CR' .OR. KI .EQ. 'LC' .OR.
-     $    KI .EQ. 'LP' .OR. KI .EQ. 'M2' .OR. KI .EQ. 'M3' .OR.
-     $    KI .EQ. 'MM' .OR. KI .EQ. 'RS' .OR. KI .EQ. 'BC' .OR.
-     $    KI .EQ. 'NR' .OR. KI .EQ. 'TO' .OR.
-     $    KI .EQ. 'MR' .OR. KI .EQ. 'MS' .OR. KI .EQ. 'FI') THEN
-         IF (IWNCUR .NE. 3) CALL WNSET (3)
-      ENDIF
-C-----------------------------------------------------------------------
-C  This routine reads commands from the terminal and sets a flag to 
-C  indicate whether the command may inhibit an automatic restart of
-C  data collection, if appropriate.
-C  All control of the program flow is via the variable KI.
-C-----------------------------------------------------------------------
-      IF (KI .NE. ' ') THEN
-        IMENU = 0
-      ELSE
-        IF (IMENU .EQ. 0) THEN
-          WRITE (COUT,11000)
-          CALL YESNO ('N',ANS)
-        ELSE
-          IMENU = 0
-          ANS = 'Y'
-        ENDIF
-        IF (ANS .EQ. 'Y') THEN
-          IWNOLD = IWNCUR
-          IF (IWNCUR .NE. 3) CALL WNSET (3)
-          WRITE (COUT,12000)
-          CALL GWRITE (ITP,' ')
-          IF (DFMODL .EQ. 'CAD4') THEN
-            WRITE (COUT,12100)
-            CALL GWRITE (ITP,' ')
-          ENDIF
-          WRITE (COUT,12200)
-          CALL FREEFM (ITR)
-          I = IFREE(1)
-          CALL GWRITE (ITP,' ')
-          IF (I .EQ. 0 .OR. I .EQ. 1) THEN
-            WRITE (COUT,13000)
-            CALL GWRITE (ITP,' ')
-            IF (I .EQ. 0) THEN
-              WRITE (COUT,14000)
-              CALL ALFNUM (STRING)
-              ANS = STRING(1:1)
-            ENDIF
-          ENDIF
-          IF (I .EQ. 0 .OR. I .EQ. 2) THEN
-            WRITE (COUT,15000)
-            CALL GWRITE (ITP,' ')
-            IF (I .EQ. 0) THEN
-              WRITE (COUT,14000)
-              CALL ALFNUM (STRING)
-              ANS = STRING(1:1)
-            ENDIF
-          ENDIF
-          IF (I .EQ. 0 .OR. I .EQ. 3) THEN
-            WRITE (COUT,16000)
-            CALL GWRITE (ITP,' ')
-            IF (I .EQ. 0) THEN
-              WRITE (COUT,14000)
-              CALL ALFNUM (STRING)
-              ANS = STRING(1:1)
-            ENDIF
-          ENDIF
-          IF (I .EQ. 0 .OR. I .EQ. 4) THEN
-            WRITE (COUT,17000)
-            CALL GWRITE (ITP,' ')
-            IF (I .EQ. 0) THEN
-              WRITE (COUT,14000)
-              CALL ALFNUM (STRING)
-              ANS = STRING(1:1)
-            ENDIF
-          ENDIF
-          IF (I .EQ. 0 .OR. I .EQ. 5) THEN
-            WRITE (COUT,18000)
-            CALL GWRITE (ITP,' ')
-            IF (I .EQ. 0) THEN
-              WRITE (COUT,14000)
-              CALL ALFNUM (STRING)
-              ANS = STRING(1:1)
-            ENDIF
-          ENDIF
-          IF (I .EQ. 0 .OR. I .EQ. 6) THEN
-            WRITE (COUT,19000)
-            CALL GWRITE (ITP,' ')
-            WRITE (COUT,20000)
-            CALL GWRITE (ITP,' ')
-            IF (I .EQ. 0) THEN
-              WRITE (COUT,14000)
-              CALL ALFNUM (STRING)
-              ANS = STRING(1:1)
-            ENDIF
-          ENDIF
-          IF (DFMODL .EQ. 'CAD4' .AND. (I .EQ. 0 .OR. I .EQ. 7)) THEN
-            WRITE (COUT,20100)
-            CALL GWRITE (ITP,' ')
-            IF (I .EQ. 0) THEN
-              WRITE (COUT,14000)
-              CALL ALFNUM (STRING)
-              ANS = STRING(1:1)
-            ENDIF
-          ENDIF
-        ENDIF
-        RETURN
-      ENDIF
-      IF (KI .EQ. 'RI') KI = 'RB'
-      JAUTO = 0
-      IF (KI .EQ. 'AD') CALL BASINP
-      IF (KI .EQ. 'AL' .OR. KI .EQ. 'AR') CALL ALIGN
-      IF (KI .EQ. 'AP') CALL PROFAS
-      IF (KI .EQ. 'A8') CALL CENT8
-      IF (KI .EQ. 'BI') CALL PRNINT
-      IF (KI .EQ. 'CR') CALL ALIGN
-      IF (KI .EQ. 'CZ') CALL BASINP
-      IF (KI .EQ. 'DE') CALL DEMO1E
-      IF (KI .EQ. 'GO') THEN
-        ISEG = 0
-        IAUTO = 0
-        CALL BEGIN
-      ENDIF
-      IF (KI .EQ. 'GS') CALL GRID
-      IF (KI .EQ. 'AI') CALL IDTOAS
-      IF (KI .EQ. 'IE') CALL INDMES
-      IF (KI .EQ. 'IM') CALL INDMES
-      IF (KI .EQ. 'IN') CALL ANGINI
-      IF (KI .EQ. 'IR') CALL INDMES
-      IF (KI .EQ. 'IP') CALL INDMES
-      IF (KI .EQ. 'AH') KI = 'IX'
-      IF (KI .EQ. 'IX') CALL RCPCOR
-      IF (KI .EQ. 'LP') CALL LINPRF
-      IF (KI .EQ. 'MM') THEN
-        CALL LSORMT
-        IF (KI .NE. ' ') CALL BASINP
-      ENDIF
-      IF (KI .EQ. 'M2') THEN
-        CALL ORCEL2
-        IF (KI .NE. ' ') CALL BASINP
-      ENDIF
-      IF (KI .EQ. 'M3') THEN
-        CALL ORMAT3
-        IF (KI .NE. ' ') CALL BASINP
-      ENDIF
-      IF (KI .EQ. 'TO') THEN
-        CALL TRANSF
-        IF (KI .NE. ' ') CALL BASINP
-      ENDIF
-      IF (KI .EQ. 'LC') CALL CELLLS
-      IF (KI .EQ. 'OM') CALL BASINP
-      IF (KI .EQ. 'PO') KI = 'OS'
-      IF (KI .EQ. 'OS') CALL OSCIL
-      IF (KI .EQ. 'PA') CALL PRTANG
-      IF (KI .EQ. 'PD') CALL PRNBAS
-      IF (KI .EQ. 'PL') CALL SETROW
-      IF (KI .EQ. 'PR') CALL SETROW
-      IF (KI .EQ. 'HA') KI = 'RA'
-      IF (KI .EQ. 'P9') CALL PHI90 
-      IF (KI .EQ. 'RA') CALL ORMAT3
-      IF (KI .EQ. 'RB') CALL WRBAS
-      IF (KI .EQ. 'RP') CALL PSCAN (JUNK,JUNK)
-      IF (KI .EQ. 'SA') CALL INDMES
-      IF (KI .EQ. 'SC') CALL INDMES
-      IF (KI .EQ. 'SH') THEN
-        CALL SHUTTR (0)
-        KI = ' '
-      ENDIF
-      IF (KI .EQ. 'SW') CALL SWITCH
-      IF (KI .EQ. 'SO') CALL INDMES
-      IF (KI .EQ. 'SP') CALL INDMES
-      IF (KI .EQ. 'SR') CALL INDMES
-      IF (DFMODL .EQ. 'CAD4') THEN
-        IF (KI .EQ. 'EK' .OR. KI .EQ. 'KE') CALL EKKE
-        IF (KI .EQ. 'MS') CALL INDMES
-        IF (KI .EQ. 'MR') CALL RCPCOR
-        IF (KI .EQ. 'FI') CALL FACEIN
-      ENDIF
-      IF (KI .EQ. 'ST') CALL INDMES
-      IF (KI .EQ. 'TC') CALL PCOUNT
-      IF (KI .EQ. 'UM') CALL CNTREF
-      IF (KI .EQ. 'VM') CALL VUMICR
-      IF (KI .EQ. 'WB') CALL WRBAS
-      IF (KI .EQ. 'HO' .OR. KI .EQ. 'ZE') THEN
-        CALL ZERODF
-        KI = ' '
-      ENDIF
-      IF (KI .EQ. 'NR') CALL SETNRC
-C-----------------------------------------------------------------------
-C  If the command has not yet been executed, no auto restart is
-C  possible
-C-----------------------------------------------------------------------
-      IF (KI .NE. ' ') JAUTO = 1
-      IF (KI .EQ. 'BD') CALL BASINP
-      IF (KI .EQ. 'CH') CALL REINDX
-      IF (KI .EQ. 'DH') THEN
-        IKO(5) = 0
-        CALL BASINP
-      ENDIF
-      IF (KI .EQ. 'FR') CALL BASINP
-      IF (KI .EQ. 'LA') CALL BASINP
-      IF (KI .EQ. 'LT') CALL LOTEM
-      IF (KI .EQ. 'OC') CALL BLIND
-      IF (KI .EQ. 'PK') CALL PEAKSR
-      IF (KI .EQ. 'PS') CALL BASINP
-      IF (KI .EQ. 'RC') CALL CREDUC (KI)
-      IF (KI .EQ. 'RO') CALL BASINP
-      IF (KI .EQ. 'BC') CALL BIGCHI
-      IF (KI .EQ. 'RR') CALL BASINP
-      IF (KI .EQ. 'RS') CALL REINDX
-      IF (KI .EQ. 'SD') CALL BASINP
-      IF (KI .EQ. 'SE') CALL BASINP
-      IF (KI .EQ. 'SG') THEN
-        IOUT = ITP 
-        CALL SPACEG (IOUT,1)
-      ENDIF
-      IF (KI .EQ. 'TM') CALL BASINP
-      IF (KI .EQ. 'TP') CALL BASINP
-C-----------------------------------------------------------------------
-C  If the KI code is in the first 60 codes, then no automatic restart.
-C-----------------------------------------------------------------------
-      IF (JAUTO .NE. 0) THEN
-        NSAVE = NBLOCK
-        ZERO = 0
-        WRITE (IID,REC=9) ZERO
-        NBLOCK = NSAVE
-      ENDIF
-      IF (KI .NE. ' ') THEN
-        WRITE (COUT,22000) KI
-        CALL GWRITE (ITP,' ')
-        KI = ' '
-        IMENU = 1
-        RETURN
-      ENDIF
-      RETURN
-10000 FORMAT (' Command ',$)
-11000 FORMAT (' Unacceptable command. Do you want the menus (N) ? ',$)
-12000 FORMAT (/' The following help menus are available :--'/
-     $         '  1.  Terminal Data Input Commands;'/
-     $         '  2.  Crystal Alignment Commands;'/
-     $         '  3.  Intensity Data Collection;'/
-     $         '  4.  Angle Setting and Intensity Measurement;'/
-     $         '  5.  Photograph Setup Commands;'/
-     $         '  6.  General System Commands.')
-12100 FORMAT ( '  7.  Kappa Geometry (CAD-4) Commands.')
-12200 FORMAT (' Which do you want (All) ? ',$)
-13000 FORMAT (/10X,'*** Terminal Data Input Commands ***'/
-     $'   AD Attenuator Data: number and values.'/
-     $'   BD all Basic Data (CZ DH FR LA OM OR PS RR SD SE TM TP)'/
-     $'   CZ Correct angle Zero values.'/
-     $'   FR First Reflection to be measured.'/
-     $'   LA LAmbda for the wavelength in use, usually alpha1.'/
-     $'   LT Liquid Nitrogen option - specific to cryosystem.'/
-     $'   OM Orientation Matrix.'/
-     $'   PS PSi rotation data.'/
-     $'   RO re-Orientation Reflections: frequency and h,k,ls.'/
-     $'   RR Reference Reflections: frequency and h,k,ls.'/
-     $'   SD Scan Data: type, width, speed, profile control.'/
-     $'   SE Systematic Extinctions.'/
-     $'   SG Space-Group symbol.'/
-     $'   TM 2Theta Min and max values.'/
-     $'   TP Time and Precision parameters for intensity measurement.'/)
-14000 FORMAT (' Type <CR> when ready to proceed.')
-15000 FORMAT (/10X,'*** Crystal Alignment Commands ***'/
-     $'   AL ALign reflections and their symmetry equivalents for MM.'/
-     $'   AR Align Resumption after interruption.'/
-     $'   A8 Align the 8 alternate settings of one reflection.'/
-     $'   CH CHoose reflections from the PK list for use with M2/M3.'/
-     $'   CR Centre the Reflection which is already in the detector.'/
-     $'   LC 2theta Least-squares Cell with symmetry constrained cell.'/
-     $'   MM Matrix from Many reflections by least-squares on AL data.'/
-     $'   M2 Matrix from 2 indexed reflections and a unit cell.'/
-     $'   M3 Matrix from 3 indexed reflections.'/
-     $'   OC Orient a Crystal, i.e. index the peaks from PK.'/
-     $'   PK PeaK search in 2Theta, Chi, Phi for use with OC.'/
-     $'   RC Reduce a unit Cell.'/
-     $'   RP Rotate Phi 360degs, centre and save any peaks found.'/
-     $'   RS ReSet the cell and matrix with the results from RC.'/
-     $'   TO Transform the Orientation matrix.'/)
-16000 FORMAT (/10X,'*** Intensity Data Collection ***'/
-     $'   GO Start of intensity data collection.'/
-     $'   K  Kill operation at the end of the current reflection.'/
-     $'   Q  Quit after the next set of reference reflections.'/)
-17000 FORMAT (/5X,'*** Angle Setting and Intensity Measurement ***'/
-     $'   GS Grid Search measurement in 2theta, omega or chi.'/
-     $'   IE Intensity measurement for Equivalent reflections.'/
-     $'   IM Intensity Measurement of the reflection in the detector.'/
-     $'   IP Intensity measurement in Psi for empirical absorption.'/
-     $'   IR Intensity measurement for specified Reflections.'/
-     $'   LP Line Profile plot on the printer.'/
-     $'   SA Set All angles to specified values.'/
-     $'   SC Set    Chi to the specified value.'/
-     $'   SH SHutter open or close as a flip/flop.'/
-     $'   SO Set  Omega to the specified value.'/
-     $'   SP Set    Phi to the specified value.'/
-     $'   SR Set Reflection: h,k,l,psi.'/
-     $'   ST Set 2Theta to the specified value.'/
-     $'   TC Timed Counts.'/
-     $'   ZE ZEro the instrument Angles.'/)
-18000 FORMAT (/10X,'*** Photograph Setup Commands ***'/
-     $'   PL Photograph in the Laue mode.'/
-     $'   PO Photograph in the Oscillation mode (same as OS).'/
-     $'   PR Photograph in the Rotation mode.'/)
-19000 FORMAT (/10X,'*** General System Commands ***'/
-     $'   AH Angles to H,k,l (same as IX).'/
-     $'   AI Ascii Intensity data file conversion.'/
-     $'   AP Ascii Profile data file conversion.'/
-     $'   BC Big Chi search for psi rotation.'/
-     $'   BI Big Intensity search in the IDATA.DA file.'/
-     $'   EX EXit the program saving the basic data on IDATA.DA.'/
-     $'   HA H,k,l to Angles (same as RA).')
-20000 FORMAT (
-     $'   IN INitialize integer parts of present angles (NRC only).'/
-     $'   NR set the NRC program flag.'/
-     $'   P9 Rotate Phi by 90 degrees for crystal centering.'/
-     $'   PA Print Angle settings.'/
-     $'   PD Print Data of all forms.'/
-     $'   Q  Quit the program directly.'/
-     $'   RB Read the Basic data from the IDATA.DA file.'/
-     $'   SW SWitch register flags setting.'/
-     $'   UM (UMpty) Count unique reflections within theta limits.'/
-     $'   VM View crystal with Microscope.'/ 
-     $'   WB Write the Basic data to the IDATA.DA file.'/)
-20100 FORMAT (/10X,'*** For Kappa geometry (CAD-4) ***'/
-     $'   EK Euler to Kappa angle conversion.'/
-     $'   KE Kappa to Euler angle conversion.'/
-     $'   MR emulate CAD-4 MICROR command.'/
-     $'   MS emulate CAD-4 MICROS command.')
-21000 FORMAT (' EX was typed. Are you sure you wish to exit (Y) ? ',$)
-22000 FORMAT (' The command ',A,' is invalid. Type <CR> for the menus.')
-23000 FORMAT ('ERROR: Unsupported command ignored by difrac subsystem') 
-      END
-C-----------------------------------------------------------------------
-C  Subroutine to open and close the X-ray shutter
-C  This routine is called via 'SH' or direct from other routines.
-C  The argument IDO has the following values :--
-C    -1  Close the shutter
-C     0  Reverse the sense of the shutter.  The sense is held in SENSE
-C     1  Open the shutter
-C     2  ??
-C    99  Called from GOLOOP at the start of data-collection; 
-C        Opens the shutter and sets DOIT = 'NO'
-C        to prevent shutter operation during data-collection.
-C   -99  Called from GOLOOP at the end of data-collection; 
-C        Closes the shutter and sets DOIT = 'YES'
-C        to allow normal shutter operation.
-C
-C  This version is for Rigaku diffractometers,but should work (surely?)
-C  for all instruments with trivial modification.
-C-----------------------------------------------------------------------
-      SUBROUTINE SHUTTR (IDO)
-      CHARACTER SENSE*4,COUT(20)*132,DOIT*4
-      COMMON /IOUASC/ COUT
-      DATA SENSE/'CLOS'/,ICLOSE,IOPEN/0,1/,DOIT/'YES '/
-      INF = 0
-      IF (DOIT .EQ. 'YES ') THEN
-        IF (IDO .EQ.-1 .OR. IDO .EQ. -99) THEN
-          IF (SENSE .EQ. 'OPEN') THEN
-            CALL SHUTR (ICLOSE,INF)
-            IF (INF .NE. 0) GO TO 100
-            SENSE = 'CLOS' 
-          ENDIF
-        ELSE IF (IDO .EQ. 0) THEN
-          IF (SENSE .EQ. 'OPEN') THEN
-            CALL SHUTR (ICLOSE,INF)
-            IF (INF .NE. 0) GO TO 100
-            SENSE = 'CLOS'
-          ELSE
-            CALL SHUTR (IOPEN,INF)
-            IF (INF .NE. 0) GO TO 100
-            SENSE = 'OPEN'
-          ENDIF
-        ELSE IF (IDO .EQ. 1 .OR. IDO .EQ. 99) THEN
-          IF (SENSE .EQ. 'CLOS') THEN
-            CALL SHUTR (IOPEN,INF)
-            IF (INF .NE. 0) GO TO 100
-            SENSE = 'OPEN'
-          ENDIF
-        ELSE IF (IDO .EQ. 2) THEN
-          IF (SENSE .EQ. 'OPEN') CALL SHUTR (IOPEN,INF)
-          IF (SENSE .EQ. 'CLOS') CALL SHUTR (ICLOSE,INF)
-        ENDIF
-      ELSE
-        IF (IDO .EQ. -99) THEN
-          CALL SHUTR (ICLOSE,INF)
-          IF (INF .NE. 0) GO TO 100
-          SENSE = 'CLOS'
-        ENDIF
-      ENDIF
-      IF (IDO .EQ.  99) DOIT = 'NO  '
-      IF (IDO .EQ. -99) DOIT = 'YES '
-      RETURN
-  100 WRITE (COUT,10000)
-      CALL GWRITE (ITP,' ')
-      RETURN
-10000 FORMAT (' Shutter Error.')
-      END
-C-----------------------------------------------------------------------
-C  Subroutine to initialize the integer values of the angles
-C-----------------------------------------------------------------------
-      SUBROUTINE ANGINI
-      INCLUDE 'COMDIF'
-      WRITE (COUT,10000)
-      CALL YESNO ('Y',ANS)
-      IF (ANS .EQ. 'Y') THEN
-        WRITE (COUT,11000)
-        CALL FREEFM (ITR)
-        RTHETA = RFREE(1)
-        ROMEGA = RFREE(2)
-        RCHI   = RFREE(3)
-        RPHI   = RFREE(4)
-        CALL INITL (RTHETA,ROMEGA,RCHI,RPHI)
-        KI = ' '
-      ENDIF
-      RETURN
-10000 FORMAT (' Initialize the integer parts of the angle (Y) ? ',$)
-11000 FORMAT (' Type the integers for 2theta,omega,chi,phi ',$)
-      END
-C-----------------------------------------------------------------------
-C  Subroutine to call the space group symbol interpreting routines
-C  If IOUT   .LT. -1 the symbol is not asked for
-C  If IOUT   .LT. 0  there is no printed output from SGROUP
-C  If IDHFLG .EQ. 1  the DH matrices are generated
-C-----------------------------------------------------------------------
-      SUBROUTINE SPACEG (IOUT,IDHFLG)
-      INCLUDE 'COMDIF'
-      DIMENSION CEN(3,4),GARB(500),ISET(25)
-      EQUIVALENCE (ACOUNT(1),GARB(1))
-      CHARACTER STRING*10
-      IF (IOUT .EQ. -2) THEN
-        IOUT = -1
-        GO TO 130
-      ENDIF
-  100 IF (SGSYMB(1) .EQ. 0.0 .AND. SGSYMB(2) .EQ. 0.0) THEN
-        WRITE (COUT,10000)
-      ELSE
-        WRITE (STRING,11000) SGSYMB
-        DO 110 I = 10,1,-1
-          IF (STRING(I:I) .NE. ' ') GO TO 120
-  110   CONTINUE
-  120   WRITE (COUT,12000) STRING(1:I)
-      ENDIF
-      CALL ALFNUM (STRING)
-      IF (STRING .NE. ' ') READ (STRING,11000) SGSYMB
-  130 IERR = ITP 
-      CALL SGROUP (SGSYMB,LAUENO,NAXIS,ICENT,LATCEN,NSYM,NPOL,JRT,
-     $             CEN,NCV,IOUT,IERR,GARB)
-      IF (NAXIS .GE. 4) GO TO 100
-      IF (IDHFLG .EQ. 1) THEN
-        SAVE = NBLOCK
-        CALL DHGEN
-        NBLOCK = SAVE
-C-----------------------------------------------------------------------
-C  Read the DH segment data from the IDATA file
-C-----------------------------------------------------------------------
-        READ (IID,REC=4) LATCEN,NSEG,(IHO(I),IKO(I),ILO(I),((IDH(I,J,M),
-     $                   J = 1,3),M = 1,3),I = 1,4),
-     $                   NSYM,NSET,ISET,LAUENO,NAXIS,ICENT
-      ENDIF
-      IF (KI .EQ. 'SG') KI = ' '
-      RETURN
-10000 FORMAT (' Type the space-group symbol ')
-11000 FORMAT (10A1)
-12000 FORMAT (' Type the space-group symbol (',A,') ')
-      END
-C-----------------------------------------------------------------------
-C  Subroutine to set switches
-C-----------------------------------------------------------------------
-      SUBROUTINE SWITCH
-      INCLUDE 'COMDIF'
-      CHARACTER STRING*20
-      WRITE (COUT,10000) (ISREG(I),I=1,10)
-      CALL ALFNUM (STRING)
-      IF (STRING .NE. ' ') THEN
-        DO 100 I = 1,LEN(STRING)
-          IASCII = ICHAR (STRING(I:I))
-          IF (IASCII .GE. 48 .AND. IASCII .LE. 57) THEN
-            ISWTCH = IASCII - 48 + 1
-            IF (ISREG(ISWTCH) .EQ. 0) THEN
-              ISREG(ISWTCH) = 1
-            ELSE
-              ISREG(ISWTCH) = 0
-            ENDIF
-          ENDIF
-  100   CONTINUE
-      ENDIF
-      WRITE (COUT,11000) (ISREG(I),I=1,10)
-      CALL GWRITE (ITP,' ')
-      KI = ' '
-      RETURN
-10000 FORMAT (' The current settings are: 0 1 2 3 4 5 6 7 8 9'/
-     $        '                          ',10I2/
-     $        ' Input switches to change (none): ')
-11000 FORMAT (' The  new settings are:    0 1 2 3 4 5 6 7 8 9'/
-     $        '                          ',10I2)
-      END
-C----------------------------------------------------------------------
-C  Set the NRC flag +1 if Chi(0) is at the bottom of the chi circle,
-C                   -1 if Chi(0) is at the top.
-C  Assuming the instrument itself is defined in a right-handed way.
-C----------------------------------------------------------------------
-      SUBROUTINE SETNRC
-      INCLUDE 'COMDIF'
-      WRITE (COUT,10000) NRC
-      CALL FREEFM (ITR)
-      IF (IFREE(1) .NE. 0) NRC = IFREE(1)
-      RETURN
-10000 FORMAT (' The current value of the NRC flag is',I3/
-     $        ' Type the new value (Current) ',$)
-      END
-C-----------------------------------------------------------------------
-C  Convert Euler angles to Kappa (KI = 'EK') or vice-versa (KI = 'KE')
-C-----------------------------------------------------------------------
-      SUBROUTINE EKKE
-      INCLUDE 'COMDIF'
-      COMMON /CADCON/ ALPHA,APMIN,APMAX,MAXVAR,MINVAR,
-     $                IHOLE,IVSLIT,IHSLIT,INEG45,IPOS45,IUPHAF,ILOHAF,
-     $                VUTHT,VUOME,VUCHI,VUPHI,IPORT,IBAUD
-      PARAMETER (RA = 57.2958)
-      SALPHA = SIN(ALPHA/RA)
-      CALPHA = COS(ALPHA/RA)
-      ISTATUS = 0
-C-----------------------------------------------------------------------
-C  KI = 'EK'  Euler to Kappa
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'EK') THEN
-        WRITE (COUT,10000) THETA,OMEGA,CHI,PHI
-        CALL FREEFM (ITR)
-        IF (RFREE(1) .EQ. 0.0 .AND. RFREE(2) .EQ. 0.0 .AND.
-     $      RFREE(3) .EQ. 0.0) THEN
-          THE = THETA
-          OME = OMEGA
-          CHE = CHI
-          PHE = PHI
-        ELSE
-          THE = RFREE(1)
-          OME = RFREE(2)
-          CHE = RFREE(3)
-          PHE = RFREE(4)
-        ENDIF
-        THE = THE/2.0
-        SCO2 = SIN(ONE80(CHE)/(2.0*RA))
-        BOT  = SALPHA*SALPHA - SCO2*SCO2
-        IF (BOT .LT. 0.0) THEN
-          ISTATUS = 1
-          KI = ' '
-          RETURN
-        ENDIF
-        RKAO2 = ATAN(SCO2/SQRT(BOT))
-        RKA   = ONE80(2.0*RA*RKAO2)
-        DELTA = RA*ATAN(CALPHA*SIN(RKAO2)/COS(RKAO2))
-        OMK   = ONE80(OME - DELTA) + THE
-        PHK   = ONE80(PHE - DELTA)
-        WRITE (COUT,11000) THE,OMK,RKA,PHK
-C-----------------------------------------------------------------------
-C  KI = 'KE'  Kappa to Euler 
-C-----------------------------------------------------------------------
-      ELSE
-        WRITE (COUT,12000)
-        CALL FREEFM (ITR)
-        THE = RFREE(1)
-        OMK = RFREE(2)
-        RKA = RFREE(3)
-        PHK = RFREE(4)
-        OMK = OMK - THE
-        THE = THE + THE
-        RKAO2 = RKA/(2.0*RA)
-        CHE   = ONE80(2.0*RA*ASIN(SALPHA*SIN(RKAO2)))
-        DELTA = RA*ATAN(CALPHA*SIN(RKAO2)/COS(RKAO2))
-        OME   = ONE80(OMK + DELTA)
-        PHE   = ONE80(PHK + DELTA)
-        WRITE (COUT,13000) THE,OME,CHE,PHE
-      ENDIF
-      CALL GWRITE (ITP,' ')
-      KI = ' '
-      RETURN
-10000 FORMAT (' The present Euler angles are 2T,O,C,P',4F8.3,/
-     $        ' Type the angles to convert (Present) ',$)
-11000 FORMAT (' The 4 Kappa angles T,O,K,P are  ',4F8.3)
-12000 FORMAT (' Type the 4 Kappa angles T,O,K,P ',$)
-13000 FORMAT (' The 4 Euler angles 2T,O,C,P are ',4F8.3)
-      END
-C-----------------------------------------------------------------------
-C  Set the diffractometer to a convenient microscope viewing position
-C-----------------------------------------------------------------------
-      SUBROUTINE VUMICR
-      INCLUDE 'COMDIF'
-      NATT = 0
-      CALL VUPOS (THETA,OMEGA,CHI,PHI)
-      CALL SHUTTR (-99)
-      CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,IERR)
-      IF (IERR .NE. 0) THEN
-        WRITE (COUT,10000)
-        CALL GWRITE (ITP,' ')
-      ENDIF
-      KI = ' '
-      RETURN
-10000 FORMAT (' Setting collision during VM')
-      END
-C-----------------------------------------------------------------------
-C  Rotate the crystal 90 degrees in phi for centering operations
-C-----------------------------------------------------------------------
-      SUBROUTINE PHI90
-      INCLUDE 'COMDIF'
-      CALL ANGET (THETA,OMEGA,CHI,PHI)
-      PHI = PHI + 90.0
-      CALL MOD360 (PHI)
-      CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,IERR)
-      KI = ' '
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  Transform the orientation matrix
-C-----------------------------------------------------------------------
-      SUBROUTINE TRANSF
-      INCLUDE 'COMDIF'
-      DIMENSION HOLD(3,3),HNEW(3,3),HNEWI(3,3),RNEW(3,3)
-      WRITE (COUT,10000)
-      CALL GWRITE (ITP,' ')
-      DO 100 I = 1,3
-   90   WRITE (COUT,11000) I
-        CALL FREEFM (ITR)
-        HOLD(1,I) = IFREE(1)
-        HOLD(2,I) = IFREE(2)
-        HOLD(3,I) = IFREE(3)
-        HNEW(1,I) = IFREE(4)
-        HNEW(2,I) = IFREE(5)
-        HNEW(3,I) = IFREE(6)
-        IF ((HOLD(1,I) .EQ. 0.0 .AND. HOLD(2,I) .EQ. 0.0 .AND.
-     $       HOLD(3,I) .EQ. 0.0) .OR.
-     $      (HNEW(1,I) .EQ. 0.0 .AND. HNEW(2,I) .EQ. 0.0 .AND.
-     $       HNEW(3,I) .EQ. 0.0)) THEN
-          WRITE (COUT,11100) 
-          CALL GWRITE (ITP,' ')
-          GO TO 90
-        ENDIF
-  100 CONTINUE
-C-----------------------------------------------------------------------
-C  Invert the IHNEW matrix and form  RNEW = R.IHOLD.(IHNEW)-1
-C-----------------------------------------------------------------------
-      CALL MATRIX (HNEW,HNEWI,HNEWI,HNEWI,'INVERT')
-      CALL MATRIX (R,HOLD,RNEW,RJUNK,'MATMUL')
-      CALL MATRIX (RNEW,HNEWI,RNEW,RJUNK,'MATMUL')
-C-----------------------------------------------------------------------
-C  Print the new matrix and parameters
-C-----------------------------------------------------------------------
-      DO 110 I = 1,3
-        DO 110 J = 1,3
-          ROLD(I,J) = R(I,J)/WAVE
-          R(I,J) = RNEW(I,J)
-          RNEW(I,J) = RNEW(I,J)/WAVE
-  110 CONTINUE
-C-----------------------------------------------------------------------
-C  Evaluate the determinant to decide if right or left handed
-C-----------------------------------------------------------------------
-        DET = R(1,1)*(R(2,2)*R(3,3) - R(2,3)*R(3,2)) -
-     $        R(1,2)*(R(2,1)*R(3,3) - R(2,3)*R(3,1)) +
-     $        R(1,3)*(R(2,1)*R(3,2) - R(2,2)*R(3,1))
-        IF (NRC*DET .EQ. 0) THEN
-          WRITE (COUT,12000)
-          KI = ' '
-        ELSE IF (NRC*DET .GT. 0) THEN
-          WRITE (COUT,13000) KI,((RNEW(I,J),J = 1,3),I = 1,3)
-        ELSE
-          WRITE (COUT,14000) KI,((RNEW(I,J),J = 1,3),I = 1,3)
-        ENDIF
-        CALL GWRITE (ITP,' ')
-        CALL GETPAR
-        DO 120 I = 1,3
-          AP(I) = AP(I)*WAVE
-  120   CONTINUE
-        WRITE (COUT,15000) AP,CANG
-        CALL GWRITE (ITP,' ')
-      RETURN
-10000 FORMAT (10X,' Transform the Orientation Matrix'/
-     $        ' Type in old and new h,k,l values for 3 reflections')
-11000 FORMAT (' Type old and new h,k,l for reflection',I2,'  ',$)
-11100 FORMAT (' 0,0,0 indices not allowed.  Try again.')
-12000 FORMAT (' The determinant of the matrix is 0.')
-13000 FORMAT (' New RIGHT-handed Orientation Matrix from ',A2/(3F12.8))
-14000 FORMAT (' New LEFT-handed Orientation Matrix from ',A2/(3F12.8))
-15000 FORMAT (' New Unit Cell ',3F9.4,3F9.3)
-      END
diff --git a/difrac/difrac.f b/difrac/difrac.f
deleted file mode 100644
index b8cc35fc..00000000
--- a/difrac/difrac.f
+++ /dev/null
@@ -1,245 +0,0 @@
-C-----------------------------------------------------------------------
-C 
-C    Diffractometer Control Routine for NRC Picker or Rigaku AFC6
-C                       E.J.Gabe and P.S White
-C            Chemistry Department , UNC, Chapel Hill, NC, USA
-C
-C  This routine is based on the original NRC Picker routine for the PDP8
-C                E.J. Gabe, Y. Le Page & D.F. Grant
-C           Chemistry Division, N.R.C., Ottawa, Canada.
-C
-C  The original code has been cleaned up and brought to F77 standard.
-C
-C      Key              Function
-C
-C           *** Terminal Data Input Commands *** 
-C
-C       AD Attenuator Data: number and values. 
-C       BD all Basic Data (CZ DH FR LA OM OR PS RR SD SE TM TP) 
-C       CZ Correct angle Zero values. 
-C       FR First Reflection to be measured. 
-C       LA LAmbda for the wavelength in use, usually alpha1. 
-C       LN Liquid Nitrogen option - specific to cryosystem. 
-C       OM Orientation Matrix. 
-C       PS PSi rotation data. 
-C       RO re-Orientation Reflections: frequency and h,k,ls. 
-C       RR Reference Reflections: frequency and h,k,ls. 
-C       SD Scan Data: type, width, speed, profile control. 
-C       SE Systematic Extinctions. 
-C       SG Space-Group symbol. 
-C       TM 2Theta Min and max values. 
-C       TP Time and Precision parameters for intensity measurement. 
-C
-C           *** Crystal Alignment Commands *** 
-C
-C       AL ALign reflections and their symmetry equivalents for MM. 
-C       AR Align Resumption after interruption. 
-C       A8 Align the 8 alternate settings of one reflection. 
-C       CH CHoose reflections from the PK list for use with M2/M3. 
-C       CR Centre the Reflection which is already in the detector. 
-C       LC 2theta Least-squares Cell with symmetry constrained cell. 
-C       MM Matrix from Many reflections by least-squares on AL data. 
-C       M2 Matrix from 2 indexed reflections and a unit cell. 
-C       M3 Matrix from 3 indexed reflections. 
-C       OC Orient a Crystal, i.e. index the peaks from PK. 
-C       PK PeaK search in 2Theta, Chi, Phi for use with OC. 
-C       RC Reduce a unit Cell. 
-C       RP Rotate Phi 360degs, centre and save any peaks found. 
-C       RS ReSet the cell and matrix with the results from RC. 
-C
-C           *** Intensity Data Collection *** 
-C
-C       GO Start of intensity data collection. 
-C       K  Kill operation at the end of the current reflection. 
-C       Q  Quit after the next set of reference reflections.
-C
-C           *** Angle Setting and Intensity Measurement *** 
-C
-C       GS Grid Search measurement in 2theta, omega or chi. 
-C       IE Intensity measurement for Equivalent reflections. 
-C       IM Intensity Measurement of the reflection in the detector. 
-C       IP Intensity measurement in Psi for empirical absorption. 
-C       IR Intensity measurement for specified Reflections. 
-C       LP Line Profile plot on the printer. 
-C       SA Set All angles to specified values. 
-C       SC Set    Chi to the specified value. 
-C       SH SHutter open or close as a flip/flop. 
-C       SO Set  Omega to the specified value. 
-C       SP Set    Phi to the specified value. 
-C       SR Set Reflection: h,k,l,psi. 
-C       ST Set 2Theta to the specified value. 
-C       TC Timed Counts. 
-C       ZE ZEro the instrument Angles.
-C
-C           *** Photograph Setup Commands *** 
-C
-C       PL Photograph in the Laue mode. 
-C       PO Photograph in the Oscillation mode (same as OS). 
-C       PR Photograph in the Rotation mode.
-C
-C           *** General System Commands *** 
-C       AH Angles to H,k,l (same as IX). 
-C       AI Ascii Intensity data file conversion. 
-C       AP Ascii Profile data file conversion. 
-C       BC Big Chi search for psi rotation. 
-C       BI Big Intensity search in the IDATA.DA file. 
-C       EX EXit the program saving the basic data on IDATA.DA. 
-C       HA H,k,l to Angles (same as RA). 
-C       PA Print Angle settings. 
-C       PD Print Data of all forms. 
-C       Q  Quit the program directly. 
-C       RB Read the Basic data from the IDATA.DA file. 
-C       SW SWitch register flags setting. 
-C       UM (UMpty) Count unique reflections within theta limits. 
-C       WB Write the Basic data to the IDATA.DA file.
-C
-C  The program uses 2 main files:--
-C   1. On unit IID the file IDATA.DA contains all the permanent 
-C      information for a data collection:
-C   2. ON unit ISD the file ORIENT.DA is really a scratch file for 
-C      use with the crystal orientation routines
-C
-C  Both files are 'direct-access' with records of length 85 4-byte
-C  variables.
-C
-C  The file IDATA.DA contains the following information:--
-C      Record #            Information
-C       1,2,3       All the basic info for a particular data collection;
-C      4 to 8       All symmetry info from SGROUP;
-C         9         Automatic restart info for use after interruption;
-C     16 to 19      Alignment data for ALIGN;
-C     20 and up     Intensity data, 10 reflns per record.
-C
-C  There is a 9-bit switch register which can be changed with the SW
-C  command or during operation by typing any digit from 1 to 9.
-C  The switches control the following :--
-C
-C   1.  0 normal screen display; 1 profile display. 
-C   2.  0 display raw profile data; 1 display smoothed data.
-C   3.  0 dont print profiles;   1 print profiles on printer.
-C   4.  0 print intensity data;  1 do not print intensity data.
-C   5.  0 print standards data;  1 do not print standards.
-C   6.  0 no action; 1 add 20 points to profile tolerance.
-C   7.  0 no action; 1 add 10 points to profile tolerance.
-C   8.  0 no action; 1 add  5 points to profile tolerance.
-C   9.  0 no action; 1 write profiles to unit 7.
-C
-C  Common to match the CREDUC Common /GEOM/
-C-----------------------------------------------------------------------
-      INCLUDE 'COMDIF'
-      COMMON /CADCON/ ALPHA,APMIN,APMAX,MAXVAR,MINVAR,
-     $                IHOLE,IVSLIT,IHSLIT,INEG45,IPOS45,IUPHAF,ILOHAF,
-     $                VUTHT,VUOME,VUCHI,VUPHI,IPORT,IBAUD
-      COMMON /GEOM/   GJUNK(370)
-      IDH(1,1,1) = 1
-      IDH(1,2,2) = 1
-      IDH(1,3,3) = 1
-      NOTEND = 0
-      IKO(5) = -777
-      ALPHA = 50.0
-C-----------------------------------------------------------------------
-C  Get the I/O unit numbers with SETIOU
-C-----------------------------------------------------------------------
-      CALL SETIOU (IID,ISD,LPT,ITR,ITP,IBYLEN)
-      CALL WNSET (3)
-C-----------------------------------------------------------------------
-C  Check that the angles did not change since the last time the
-C  program was stopped.
-C-----------------------------------------------------------------------
-      CALL ANGVAL
-      WRITE (COUT,10000) DFMODL
-      CALL GWRITE (ITP,' ')
-      WRITE (COUT,12000)
-      CALL ALFNUM (ANS)
-      IF (ANS .EQ. 'F' .OR. ANS .EQ. 'f') THEN
-        OPEN (LPT, FILE = 'printer.out', STATUS = 'UNKNOWN')
-        WRITE (COUT,13000)
-        CALL GWRITE (ITP,' ')
-      ELSE IF (ANS .EQ. 'S' .OR. ANS .EQ. 's') THEN
-        LPT = ITP
-      ELSE
-        OPEN (LPT, FILE = 'LPT1', STATUS = 'UNKNOWN')
-      ENDIF
-C-----------------------------------------------------------------------
-C  Open the Idata file (IID) and the scratch file (ISD)
-C  If either file does not exist, create it.
-C-----------------------------------------------------------------------
-      DO 100 I = 1,85
-        ACOUNT(I) = 0.0
-  100 CONTINUE
-      IDREC = 85*IBYLEN
-      STATUS = 'OD'
-      IDNAME = 'IDATA.DA'
-      LENID = 700
-      CALL IBMFIL (IDNAME,IID,IDREC,STATUS,IERR)
-      IF (IERR .NE. 0) THEN
-        STATUS = 'DN'
-        CALL IBMFIL (IDNAME,IID,IDREC,STATUS,IERR)
-        KI = 'W2'
-        CALL WRBAS
-        KI = ' '
-        DO 110 I = 4,20
-          WRITE (IID,REC=I) (NOTEND,J = 1,85)
-  110   CONTINUE
-        STATUS = 'DO'
-        CALL IBMFIL (IDNAME,-IID,IDREC,STATUS,IERR)
-        CALL IBMFIL (IDNAME, IID,IDREC,STATUS,IERR)
-      ELSE
-        KI = 'AN'
-        CALL WRBAS
-      ENDIF
-      STATUS = 'OD'
-      DSNAME = 'ORIENT.DA'
-      LENSD = 300
-      CALL IBMFIL (DSNAME,ISD,IDREC,STATUS,IERR)
-      IF (IERR .NE. 0) THEN
-        WRITE (COUT,11000) DSNAME(1:9)
-        CALL GWRITE (ITP,' ')
-        STATUS = 'DN'
-        CALL IBMFIL (DSNAME,ISD,IDREC,STATUS,IERR)
-        DO 120 I = 1,300
-          WRITE (ISD,REC=I) (NOTEND,J = 1,85)
-  120   CONTINUE
-        STATUS = 'OD'
-        CALL IBMFIL (DSNAME,-ISD,IDREC,STATUS,IERR)
-        CALL IBMFIL (DSNAME, ISD,IDREC,STATUS,IERR)
-      ENDIF
-C-----------------------------------------------------------------------
-C  All commands are read and interpreted in the routine SETOP using 
-C  2-letter codes only.
-C-----------------------------------------------------------------------
-  200 CALL SETOP
-      GO TO 200
-10000 FORMAT (/,10X,'Diffractometer Routine for Enraf-Nonius ',A /)
-11000 FORMAT (' There is no file ',A,'.  It will be created.')
-12000 FORMAT (' Send output to Printer or File (P) ')
-13000 FORMAT (' Printer output will be sent to the file PRINTER.OUT')
-      END
-C-----------------------------------------------------------------------
-C  Block Data routine to initialize the COMMONs
-C-----------------------------------------------------------------------
-      BLOCK DATA
-      INCLUDE 'COMDIF'
-      DATA ISCDEF,ICDDEF/150,250/,IDTDEF,IDODEF,IDCDEF/4,2,10/,
-     $     IFRDEF/100/,NRC/-1/,STEPDG/100.0/,ICADSL/60/,NATTEN/0/,
-     $     ATTEN/1.0,1.88,3.54,6.66,12.52,170.4/
-      DATA KQFLG2/0/,IUPDWN/1/,IUMPTY/0/,IAUTO,NSET/0,1/,SGSYMB/10*0.0/,
-     $     DEG/57.2958/
-      DATA R/0.070932,0,0, 0,0.070932,0, 0,0,0.070932/, 
-     $     DTHETA,DOMEGA,DCHI/3*0/,NAXIS/2/,
-     $     THEMIN,THEMAX/2.0,100.0/, AS,BS,CS/1.0,0.7,1.0/,
-     $     DPSI,PSIMIN,PSIMAX/3*0.0/, TIME,QTIME,TMAX/10,0.5,10/,
-     $     PA,PM/2*1.0/, IHMAX,IKMAX,ILMAX/3*22/, WAVE/0.70932/, 
-     $     NCOND/0/,ICOND,IHS,IKS,ILS,IR,IS/30*0/,
-     $     SPEED/4.0/, STEPOF/0.5/, IORNT/0/,NINTOR/0/
-      DATA NSTAN/1/,NINTRR/100/,IHSTAN,IKSTAN,ILSTAN/4,17*0/,ISTAN/0/,
-     $     NSEG/1/,NMSEG/1/,NMSTAN/1/, NREF/0/, NBLOCK/20/,
-     $     IHO,IKO,ILO/24*0/, IND/3*0/, ITYPE/0/, JMIN,JMAX/16*0/, 
-     $     AP/3*10.0/,APS/3*0.1/,
-     $     CANGS/3*0.0/,SANGS/3*1.0/,CANG/3*0.0/,SANG/3*1.0/,
-     $     RTHETA,ROMEGA,RCHI,RPHI/4*0.0/, IH,IK,IL/1,2,3/
-      DATA IDH/72*0/, IBSECT,ISCAN/2*0/, FRAC/0.1/, IPRFLG/0/,
-     $     ISYS/1/, SINABS/3*0.00503135,3*0.0/, ILN/0/, DELAY/100/
-      DATA COUT/20*' '/,IWNCUR/0/,ISREG/1,1,1,7*0/
-      END
-
diff --git a/difrac/eulkap.f b/difrac/eulkap.f
deleted file mode 100644
index 7864579d..00000000
--- a/difrac/eulkap.f
+++ /dev/null
@@ -1,50 +0,0 @@
-C-----------------------------------------------------------------------
-C  Convert Euler angles to Kappa (IEK = 0) or vice-versa (IEK = 1)
-C-----------------------------------------------------------------------
-      SUBROUTINE EULKAP (IEK,OME,CHE,PHE,OMK,RKA,PHK,ISTTUS)
-      COMMON /CADCON/ ALPHA,APMIN,APMAX,MAXVAR,MINVAR,
-     $                IHOLE,IVSLIT,IHSLIT,INEG45,IPOS45,IUPHAF,ILOHAF,
-     $                VUTHT,VUOME,VUCHI,VUPHI,IPORT,IBAUD
-      PARAMETER (RA = 57.2958)
-C      ALPHA  = 49.98907
-C      ALPHA  = ALPHA/RA
-      SALPHA = SIN(ALPHA/RA)
-      CALPHA = COS(ALPHA/RA)
-      ISTTUS = 0
-C-----------------------------------------------------------------------
-C  IEK = 0  Euler to Kappa
-C-----------------------------------------------------------------------
-      IF (IEK .EQ. 0) THEN
-        SCO2 = SIN(ONE80(CHE)/(2.0*RA))
-        BOT  = SALPHA*SALPHA - SCO2*SCO2
-        IF (BOT .LE. 0.0) THEN
-          ISTTUS = 1
-          RETURN
-        ENDIF
-        RKAO2 = ATAN(SCO2/SQRT(BOT))
-        RKA   = ONE80(2.0*RA*RKAO2)
-        DELTA = RA*ATAN(CALPHA*SIN(RKAO2)/COS(RKAO2))
-        OMK   = ONE80(OME - DELTA)
-        PHK   = ONE80(PHE - DELTA)
-C-----------------------------------------------------------------------
-C  IEK = 1  Kappa to Euler 
-C-----------------------------------------------------------------------
-      ELSE
-        RKAO2 = RKA/(2.0*RA)
-        CHE   = ONE80(2.0*RA*ASIN(SALPHA*SIN(RKAO2)))
-        DELTA = RA*ATAN(CALPHA*SIN(RKAO2)/COS(RKAO2))
-        OME   = ONE80(OMK + DELTA)
-        PHE   = ONE80(PHK + DELTA)
-      ENDIF
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  Function to put angles in the range -180 to 180
-C-----------------------------------------------------------------------
-      REAL FUNCTION ONE80 (X)
-      XX = X
-      IF (X .LT. -180.00) XX = X + 360.00
-      IF (X .GT.  180.00) XX = X - 360.00
-      ONE80 = XX
-      RETURN
-      END
diff --git a/difrac/fndsys.f b/difrac/fndsys.f
deleted file mode 100644
index 25dc4bc1..00000000
--- a/difrac/fndsys.f
+++ /dev/null
@@ -1,399 +0,0 @@
-C-----------------------------------------------------------------------
-C  Find the crystal system
-C-----------------------------------------------------------------------
-      SUBROUTINE FNDSYS (IOUT,DIRCOS,NPSUDO)
-      REAL LATIC,MAT
-      CHARACTER*6 SYSTEM,PSUDO,T2
-      CHARACTER*4 T1,T3,CMODE
-      CHARACTER*132 COUT(20)
-      COMMON /IODEVS/ ITP,ITR,LPT,LPTX,NB,NBLOCK,ISD,IID,
-     $                IBYLEN,IPR,NPR,IIP
-      COMMON /IOUASC/ COUT 
-      COMMON /GEOM/   AA(3,3),AINV(3,3),TRANS(3,3),RH(3,20),HH(3,20),
-     $                AANG(20),PH(3,20),PMESH(3,2,20),PERPAX(20),N2,N3,
-     $                EXPER
-      COMMON /TRANS/  BLINDR(3,3),TMATS(3,3,20),IFSYS(20),IFMODE(20),
-     $                NTMATS
-      DIMENSION LATIC(3,9,5),NDIR(5),NAMBI(5),NIND(5),TOT(2),ENGTH(3,2)
-      DIMENSION VEC(3,3,2),MAT(3,3,2),ALP(3),PSUDO(2,2)
-      DIMENSION CUBIC(3,9),HEXAG(3,7),RHOMB(3,4),TETRAG(3,5)
-      DIMENSION ORTHO(3,3),NAXES(3,2,5),MATCH(20),DIRCOS(3,20)
-      DIMENSION SYSTEM(2,7),ATM1(3,3),ATM2(3,3),TEST(3),RESULT(3)
-      DIMENSION T1(3),T2(3),T3(3)
-      EQUIVALENCE (LATIC(1,1,1),CUBIC(1,1)),(LATIC(1,1,2),HEXAG(1,1))
-      EQUIVALENCE (LATIC(1,1,3),RHOMB(1,1)),(LATIC(1,1,4),TETRAG(1,1))
-      EQUIVALENCE (LATIC(1,1,5),ORTHO(1,1))
-C-----------------------------------------------------------------------
-C  The number of even-order axes, of orientation ambiguities,
-C  of symmetry-unrelated axes
-C-----------------------------------------------------------------------
-      DATA NDIR/9,7,3,5,3/,NAMBI/0,1,0,1,0/,NIND/2,3,1,2,1/
-C-----------------------------------------------------------------------
-C  The possible conventional axes
-C-----------------------------------------------------------------------
-      DATA NAXES/1,3,4, 0,0,0,   1,5,3, 2,6,3,   1,2,4, 0,0,0,
-     $           1,4,2, 5,3,2,   1,2,3, 0,0,0/
-C-----------------------------------------------------------------------
-C  The direction cosines of the even-order axes in the system
-C-----------------------------------------------------------------------
-      DATA CUBIC / 1.0,   0,   0,   .707,.707,   0,     0,   1,   0,
-     $               0,   0,   1,   .707,   0,.707,     0,.707,.707,
-     $            .707,-.707,  0,   .707,   0,-.707,    0,.707,-.707/
-      DATA HEXAG /  .5,-.866,0,  .866, -.5,0,  0,0,1,
-     $            .866,   .5,0,    .5,.866,0,  0,1,0,  1,0,0/
-      DATA RHOMB /  .5,-.866,0,    .5,.866,0, -1,0,0,  0,0,1/
-      DATA TETRAG/   1,0,0,  0,0,1,  .707,.707,0,  0,1,0,  .707,-.707,0/
-      DATA ORTHO /   1,0,0,  0,1,0,  0,0,1/
-      DATA ACCEPT/.06/,TEST/.666667,.333333,.333333/
-      DATA PSUDO/' Metri','cally ','     P','seudo '/
-      DATA SYSTEM/'      ',' Cubic','   Hex','agonal','   Hex','agonal',
-     $            '  Tetr','agonal','Orthor','hombic','  Mono','clinic',
-     $            '   Tri','clinic'/
-      DATA T1 /'a   ','b   ','c   '/,T2/'Alpha ','Beta  ','Gamma '/
-      DATA T3 /'a*  ','b*  ','c*  '/
-      NTMATS = 0
-  100 IF (NPSUDO .LT. 3) GO TO 390
-C-----------------------------------------------------------------------
-C  Consider the C,H,R,T and O systems
-C-----------------------------------------------------------------------
-      ISYS = 1
-C-----------------------------------------------------------------------
-C  Consider rows in turn and call them primary
-C-----------------------------------------------------------------------
-  110 IPRIM = 1
-C-----------------------------------------------------------------------
-C  If not enough rows are left, no solution can be found, skip
-C-----------------------------------------------------------------------
-  120 IF (NPSUDO .LT. IPRIM + NDIR(ISYS) - 1) GO TO 240
-C-----------------------------------------------------------------------
-C  Consider symmetry-unrelated primary axes to be matched with
-C  the primary row
-C-----------------------------------------------------------------------
-      IFIRST = 1
-C-----------------------------------------------------------------------
-C  Pick up a secondary row
-C-----------------------------------------------------------------------
-  130 ISEC = IPRIM + 1
-C-----------------------------------------------------------------------
-C  If not enough rows are left, skip
-C-----------------------------------------------------------------------
-  140 IF (NPSUDO .LT. ISEC + NDIR(ISYS) - 2) GO TO 230
-C-----------------------------------------------------------------------
-C  Get the angle between the two selected rows
-C-----------------------------------------------------------------------
-      CALL MATRIX(DIRCOS(1,IPRIM),DIRCOS(1,ISEC),PRODOB,CRAP,'SCALPR')
-C-----------------------------------------------------------------------
-C  Pick up a secondary even-order axis
-C-----------------------------------------------------------------------
-      ITWO = 1
-  150 IF (ITWO .EQ. IFIRST) GO TO 220
-C-----------------------------------------------------------------------
-C  Calculate the angle between the primary and secondary axes
-C-----------------------------------------------------------------------
-      CALL MATRIX(LATIC(1,IFIRST,ISYS),LATIC(1,ITWO,ISYS),PROCAL,CRAP,
-     $           'SCALPR')
-C-----------------------------------------------------------------------
-C  Try to match the obs and calc angles
-C-----------------------------------------------------------------------
-      IF (PRODOB*PROCAL .GE. 0.) GO TO 170
-      DO 160 I = 1,3
-        RH(I,ISEC) = -RH(I,ISEC)
-        DIRCOS(I,ISEC) = -DIRCOS(I,ISEC)
-  160 CONTINUE
-      PRODOB = -PRODOB
-  170 IF (ABS(PRODOB - PROCAL) .GT. ACCEPT) GO TO 220
-C-----------------------------------------------------------------------
-C  The angles match, try to associate an obs row with each axis in
-C  the system
-C-----------------------------------------------------------------------
-      DO 210 IANY = 1,NDIR(ISYS)
-C-----------------------------------------------------------------------
-C  Get the hand of IFIRST, ITWO, IANY
-C-----------------------------------------------------------------------
-        CALL MATRIX(LATIC(1,IFIRST,ISYS),LATIC(1,ITWO,ISYS),
-     $              LATIC(1,IANY,ISYS),HAND1,'DETERM')
-C-----------------------------------------------------------------------
-C  Calculate angle of try axis with primary and secondary axes
-C-----------------------------------------------------------------------
-        CALL MATRIX(LATIC(1,IFIRST,ISYS),LATIC(1,IANY,ISYS),PROC1,CRAP,
-     $              'SCALPR')
-        CALL MATRIX(LATIC(1,ITWO,ISYS),LATIC(1,IANY,ISYS),PROC2,CRAP,
-     $              'SCALPR')
-C-----------------------------------------------------------------------
-C  Now find a row that could match this axis
-C-----------------------------------------------------------------------
-        DO 200 ITRY = 1,NPSUDO
-          IS = 1
-C-----------------------------------------------------------------------
-C  Get the hand of IPRIM, ISEC, ITRY
-C-----------------------------------------------------------------------
-          CALL MATRIX(DIRCOS(1,IPRIM),DIRCOS(1,ISEC),DIRCOS(1,ITRY),
-     $                HAND2,'DETERM')
-          CALL MATRIX(DIRCOS(1,ITRY),DIRCOS(1,IPRIM),PROD1,CRAP,
-     $                'SCALPR')
-          CALL MATRIX(DIRCOS(1,ITRY),DIRCOS(1,ISEC),PROD2,CRAP,'SCALPR')
-  180     IF (ABS(PROC1 - IS*PROD1) .GT. ACCEPT) GO TO 190
-          IF (ABS(PROC2 - IS*PROD2) .GT. ACCEPT) GO TO 190
-          IF (ABS(HAND2 - IS*HAND1) .GT. .1) GO TO 190
-C-----------------------------------------------------------------------
-C  This row is OK, remember it
-C-----------------------------------------------------------------------
-          MATCH(IANY) = ITRY*IS
-          GO TO 210
-  190     IF (IS .EQ. -1) GO TO 200
-          IS = -1
-          GO TO 180
-  200   CONTINUE
-        GO TO 220
-  210 CONTINUE
-C-----------------------------------------------------------------------
-C  We were able to associate a row with each axis in the system
-C-----------------------------------------------------------------------
-      GO TO 250
-  220 ITWO = ITWO + 1
-      IF (ITWO .LE. NDIR(ISYS)) GO TO 150
-      ISEC = ISEC + 1
-      IF (ISEC .LE. NPSUDO) GO TO 140
-  230 IFIRST = IFIRST + 1
-      IF (IFIRST .LE. NIND(ISYS)) GO TO 130
-      IPRIM = IPRIM + 1
-      IF (IPRIM .LE. NPSUDO) GO TO 120
-  240 ISYS = ISYS + 1
-      IF (ISYS .LE. 5) GO TO 110
-      GO TO 390
-C-----------------------------------------------------------------------
-C  Find the worst-fitting row
-C-----------------------------------------------------------------------
-  250 MATMAX = 0
-      DO 260 I = 1,NDIR(ISYS)
-        IF (ABS(MATCH(I)) .GT. MATMAX) MATMAX = ABS(MATCH(I))
-  260 CONTINUE
-C-----------------------------------------------------------------------
-C  Does it fit within experimental accuracy?
-C-----------------------------------------------------------------------
-      IP = 2
-      IF (AANG(MATMAX) .LT. EXPER) IP = 1
-C-----------------------------------------------------------------------
-C  Find the conventional reference axes among the symmetry axes
-C-----------------------------------------------------------------------
-      I = 1
-  270 J = 1
-  280 IAX = NAXES(J,I,ISYS)
-      IF (IAX .LE. NDIR(ISYS)) GO TO 300
-C-----------------------------------------------------------------------
-C  Rhombohedral, find the three-fold axis
-C-----------------------------------------------------------------------
-      DO 290 I1 = N2 + 1, N3
-        CALL MATRIX(DIRCOS(1,MATCH(1)),DIRCOS(1,MATCH(2)),DIRCOS(1,I1),
-     $              DET2,'DETERM')
-        ISG = 1
-        IF (DET2 .LT. 0.) ISG = -1
-        IF (ABS(ABS(DET2) - 0.866).GT.0.1) GO TO 290
-        MATCH(IAX) = I1 * ISG
-        GO TO 300
-  290 CONTINUE
-C-----------------------------------------------------------------------
-C  No three-fold axis, next combination of twofolds
-C-----------------------------------------------------------------------
-      GO TO 220
-  300 NAX = IABS(MATCH(IAX))
-      IS = 1
-      IF (MATCH(IAX) .LT. 0) IS = -1
-C-----------------------------------------------------------------------
-C  Store the direction cosines and the primitive indices of the
-C  conventional axes
-C-----------------------------------------------------------------------
-      DO 310 K = 1,3
-        VEC(K,J,I) = IS*DIRCOS(K,NAX)
-        MAT(K,J,I) = IS*RH(K,NAX)
-  310 CONTINUE
-C-----------------------------------------------------------------------
-C  Get the length of the conventional cell edges
-C-----------------------------------------------------------------------
-      CALL MATRIX(AA,MAT(1,J,I),ENGTH(J,I),CRAP,'LENGTH')
-      J = J + 1
-      IF (J .LE. 3) GO TO 280
-      I = I + 1
-      IF (I .LE. NAMBI(ISYS) + 1) GO TO 270
-C-----------------------------------------------------------------------
-C  Keep the solution with the shortest cell edges
-C-----------------------------------------------------------------------
-      TOT(2) = 1.E6
-      DO 320 I = 1,NAMBI(ISYS) + 1
-        TOT(I) = 0
-        DO 320 J = 1,3
-          TOT(I) = TOT(I) + ENGTH(J,I)
-  320 CONTINUE
-      I = 1
-      IF (TOT(2) .LT. TOT(1)) I = 2
-C-----------------------------------------------------------------------
-C  Rank the orthorhombic axes a<b<c
-C-----------------------------------------------------------------------
-      IF (ISYS .EQ. 5) GO TO 480
-C-----------------------------------------------------------------------
-C  Put the rhombohedral lattice in obverse setting
-C-----------------------------------------------------------------------
-      IF (ISYS .NE. 3) GO TO 370
-      DO 360 JJ = 1,2
-        CALL MATRIX(MAT(1,1,I),ATM1,CRAP,CRAP,'TRNSPS')
-        CALL MATRIX(TEST,ATM1,RESULT,CRAP,'VMMULT')
-        DO 330 J = 1,3
-          ITEST = ABS(RESULT(J)) + .1
-          IF (ABS(ITEST - ABS(RESULT(J))) .GT. .1) GO TO 340
-  330   CONTINUE
-        GO TO 370
-  340   DO 350 JA = 1,2
-          DO 350 J = 1,3
-            MAT(J,JA,I) = -MAT(J,JA,I)
-  350   CONTINUE
-  360 CONTINUE
-      GO TO 220
-C-----------------------------------------------------------------------
-C  Get the cell angles
-C-----------------------------------------------------------------------
-  370 DO 380 J = 1,3
-        L = MOD(J,3) + 1
-        CALL MATRIX(VEC(1,L,I),VEC(1,6 - J - L,I),SCAL,CRAP,'SCALPR')
-        ALP(J) = (180./3.141593)*ACOS(SCAL)
-  380 CONTINUE
-C-----------------------------------------------------------------------
-C  Get the lattice type of the conventional cell
-C-----------------------------------------------------------------------
-      CALL LATMOD (MAT(1,1,I),MODE)
-C-----------------------------------------------------------------------
-C  Output system and lattice type
-C-----------------------------------------------------------------------
-      NTMATS = NTMATS + 1
-      WRITE (COUT,10000) NTMATS,(PSUDO(K,IP),K = 1,2),
-     $                  (SYSTEM(K,ISYS),K = 1,2),MODE,AANG(MATMAX)
-      CALL GWRITE (IOUT,' ')
-      WRITE (LPT,10000) NTMATS,(PSUDO(K,IP),K = 1,2),
-     $                 (SYSTEM(K,ISYS),K = 1,2),MODE,AANG(MATMAX)
-C-----------------------------------------------------------------------
-C  Get the original axes of the conventional cell
-C-----------------------------------------------------------------------
-      CALL MATRIX(MAT(1,1,I),ATM1,CRAP,CRAP,'TRNSPS')
-      CALL MATRIX(ATM1,TRANS,ATM2,CRAP,'MATMUL')
-C-----------------------------------------------------------------------
-C  Get the original indices of the conventional reciprocal axes
-C-----------------------------------------------------------------------
-      CALL MATRIX(ATM2,ATM1,CRAP,CRAP,'INVERT')
-C-----------------------------------------------------------------------
-C  Output the original indices of conventional axes,
-C  cell edges and angles
-C-----------------------------------------------------------------------
-      WRITE (COUT,11000) (T1(J),(ATM2(J,K),K = 1,3),ENGTH(J,I),T2(J),
-     $                    ALP(J),T3(J),(ATM1(K,J),K = 1,3),J = 1,3)
-      CALL GWRITE (IOUT,' ')
-      WRITE (LPT,11000) (T1(J),(ATM2(J,K),K = 1,3),ENGTH(J,I),T2(J),
-     $                   ALP(J),T3(J),(ATM1(K,J),K = 1,3),J = 1,3)
-C-----------------------------------------------------------------------
-C  Save the transformation matrix, and  system & lattice mode pointers
-C  for use in LISTER at the end of OC
-C  The system pointer here and for use in LISTER translate as :--
-C    System      Cub Hex HexR Tet Ort Mon Tri   Mode P A B C I F R
-C  ISYS (FNDSYS)   1   2    3   4   5   6   7 
-C  ISYS (LISTER)   7   5    6   4   3   2   1        1 2 3 4 5 6 7
-C-----------------------------------------------------------------------
-      DO 385 J = 1,3
-        DO 385 K = 1,3
-          TMATS(J,K,NTMATS) = ATM1(K,J)
-  385 CONTINUE
-      IF (ISYS .EQ. 1) ISYSF = 7
-      IF (ISYS .EQ. 2) ISYSF = 5
-      IF (ISYS .EQ. 3) ISYSF = 6
-      IF (ISYS .EQ. 4) ISYSF = 4
-      IF (ISYS .EQ. 5) ISYSF = 3
-      IF (ISYS .EQ. 6) ISYSF = 2
-      IF (ISYS .EQ. 7) ISYSF = 1
-      IFSYS(NTMATS) = ISYSF
-      WRITE (CMODE,'(A4)') MODE
-      IF (CMODE .EQ. 'P') IMODE = 1
-      IF (CMODE .EQ. 'A') IMODE = 2
-      IF (CMODE .EQ. 'B') IMODE = 3
-      IF (CMODE .EQ. 'C') IMODE = 4
-      IF (CMODE .EQ. 'I') IMODE = 5
-      IF (CMODE .EQ. 'F') IMODE = 6
-      IF (CMODE .EQ. 'R') IMODE = 7
-      IFMODE(NTMATS) = IMODE
-C-----------------------------------------------------------------------
-C  Give up the search if an exact solution has been found
-C-----------------------------------------------------------------------
-      IF (IP .EQ. 1) RETURN
-      NPSUDO = MATMAX - 1
-C-----------------------------------------------------------------------
-C  Monoclinic + triclinic are treated separately because their
-C  conventional axes are not determined by symmetry
-C-----------------------------------------------------------------------
-      IF (ISYS .EQ. 6) GO TO 390
-C-----------------------------------------------------------------------
-C  Resume the search for a better solution
-C-----------------------------------------------------------------------
-      GO TO 100
-C-----------------------------------------------------------------------
-C  The monoclinic case
-C-----------------------------------------------------------------------
-  390 IF (NPSUDO .LT. 1) GO TO 450
-      ISYS = 6
-      IF (NPSUDO .GT. 2) NPSUDO = 2
-      N = NPSUDO
-      MATMAX = N
-      IP = 2
-      IF (AANG(N) .LT. EXPER) IP = 1
-      CALL MATRIX (PMESH(1,1,N),MAT(1,1,1),CRAP,CRAP,'COPVEC')
-      CALL MATRIX (RH(1,N),MAT(1,2,1),CRAP,CRAP,'COPVEC')
-      CALL MATRIX (PMESH(1,2,N),MAT(1,3,1),CRAP,CRAP,'COPVEC')
-      CALL MATRIX (MAT(1,1,1),MAT(1,2,1),MAT(1,3,1),DET2,'DETERM')
-      IF (DET2 .GT. 0.) GO TO 410
-      DO 400 I1 = 1,3
-        MAT (I1,2,1) = -MAT (I1,2,1)
-  400 CONTINUE
-  410 DO 420 KA = 1,3
-        CALL MATRIX (AA,MAT(1,KA,1),VEC(1,KA,1),CRAP,'MATVEC')
-        CALL MATRIX (AA,MAT(1,KA,1),ENGTH(KA,1),CRAP,'LENGTH')
-  420 CONTINUE
-      I = 1
-      GO TO 370
-C-----------------------------------------------------------------------
-C-----triclinic
-C-----------------------------------------------------------------------
-  450 ISYS = 7
-      IP = 1
-      I = 1
-      MATMAX = 20
-      AANG(20) = 0
-      DO 470 N = 1,3
-        DO 460 J = 1,3
-          MAT(J,N,1) = 0
-          MAT(N,N,1) = 1
-  460   CONTINUE
-        CALL MATRIX(AA,MAT(1,N,1),VEC(1,N,1),CRAP,'MATVEC')
-        CALL MATRIX(AA,MAT(1,N,1),ENGTH(N,1),CRAP,'LENGTH')
-  470 CONTINUE
-      GO TO 370
-C-----------------------------------------------------------------------
-C  Rank a<b<c in orthorhombic
-C-----------------------------------------------------------------------
-  480 IPERM = 0
-      DO 500 J = 1,2
-        IF (ENGTH(J,I) .LE. ENGTH(J + 1,I)) GO TO 500
-        IPERM = 1
-        SAVE = ENGTH(J,I)
-        ENGTH(J,I) = ENGTH(J + 1,I)
-        ENGTH(J + 1,I) = SAVE
-        DO 490 KA = 1,3
-          SAVE = MAT(KA,J,I)
-          MAT(KA,J,I) = MAT(KA,J + 1,I)
-          MAT(KA,J + 1,I) = SAVE
-          SAVE = VEC(KA,J,I)
-          VEC(KA,J,I) = VEC(KA,J + 1,I)
-          VEC(KA,J + 1,I) = SAVE
-          MAT(KA,5 - 2*J,I) = -MAT(KA,5 - 2*J,I)
-          VEC(KA,5 - 2*J,I) = -VEC(KA,5 - 2*J,I)
-  490   CONTINUE
-  500 CONTINUE
-      IF (IPERM .NE. 0) GO TO 480
-      GO TO 370
-10000 FORMAT ('  #',I2,5X,2A6,2A6,1X,A1,'    Max Delta',F10.3)
-11000 FORMAT (1X,A4,3F5.1,F10.4,2X,A6,F10.3,2X,A4,3F8.3)
-      END
diff --git a/difrac/freefm.f b/difrac/freefm.f
deleted file mode 100644
index 119f3c0f..00000000
--- a/difrac/freefm.f
+++ /dev/null
@@ -1,262 +0,0 @@
-C-----------------------------------------------------------------------
-C
-C            Free format numeric input routine for NRCVAX
-C
-C  Routine to get 20 reals and 20 integers from free form input.
-C  The routine works in two stages from a character input string.
-C  First commas are removed from the string and substituted with blanks,
-C  redundant blanks are removed and only numeric characters allowed.
-C  The division / is retained and fractions are interpreted later.
-C  Second, the cleaned up string is interpreted to give the numbers.
-C
-C  Normal input is from the terminal with IUNIT = ITR, but IUNIT can
-C  also be the unit number for a file.
-C
-C  If IUNIT .GE. 1000 then it is assumed that the input string is
-C  already in OCHAR and no read is performed.
-C
-C  If IUNIT .GE. 2000 no read is performed and IUNIT is returned as
-C  a 0 if no error or 1 if an error is detected.
-C
-C  If the input unit is ITR (the terminal) and the first character is
-C  a question mark (?) the routine exits to the system monitor.
-C
-C  The routine can also interpret fractions e.g 5/4 = 1.25 and E format
-C
-C-----------------------------------------------------------------------
-      SUBROUTINE FREEFM (IUNIT)
-      COMMON /IOUASS/ IOUNIT(12)
-      CHARACTER*100 COUT(20)
-      COMMON /IOUASC/ COUT 
-      COMMON /INFREE/ IFREE(20),RFREE(20),ICFLAG
-      COMMON /FREECH/ OCHAR
-      CHARACTER OCHAR*100,NCHAR*100,LAST*1,THIS*1,COMMA*1,BLANK*1,
-     $          NUMS*17,CZERO*1
-      DATA COMMA/','/,BLANK/' '/,NUMS/' 0123456789.,+-/E'/,CZERO/'0'/
-      IZERO = ICHAR(CZERO)
-      ITR    = IOUNIT(5)
-      ITP    = IOUNIT(6)
-      IBYLEN = IOUNIT(12)
-C-----------------------------------------------------------------------
-C  If IUNIT .lt. 1000 it is the input unit number
-C  If it is between 1000 and 2000 the string OCHAR has already been read
-C  and it is merely to be interpreted.
-C  If IUNIT .ge. 2000 an error flag may be returned in IUNIT.
-C-----------------------------------------------------------------------
-      IF (IUNIT .LT. 1000) THEN
-        IREAD = IUNIT
-      ELSE
-        IERROR = 0
-        GO TO 105
-      ENDIF
-C-----------------------------------------------------------------------
-C  Read a character string.  Only 80 for IBM terminals !!!
-C-----------------------------------------------------------------------
-  100 IF (IUNIT .EQ. ITR) CALL GWRITE (ITP,'$')
-      OCHAR = ' '
-      IF (IREAD .EQ. ITR) THEN
-         CALL GETLIN (OCHAR)
-      ELSE 
-         READ (IREAD,10000,END=250) OCHAR(1:80)
-      ENDIF 
-      IF (IREAD .EQ. ITR .AND. OCHAR(1:1) .EQ. '?') STOP
-C-----------------------------------------------------------------------
-C  Find the last non-blank character
-C-----------------------------------------------------------------------
-  105 ICFLAG = 1
-        DO 110 I = 1,100
-        J = 101 - I
-        IF (OCHAR(J:J) .NE. BLANK) GO TO 120
-  110   CONTINUE
-      ICFLAG = 0
-  120 IF (OCHAR(J:J) .NE. COMMA) THEN
-        J = J + 1
-        OCHAR(J:J) = COMMA
-      ENDIF
-      LEN = J
-C-----------------------------------------------------------------------
-C  Check for valid characters.  0 to 9 . , + - blank or E
-C-----------------------------------------------------------------------
-      DO 140 I = 1,LEN
-        DO 130 J = 1,17
-          IF (OCHAR(I:I) .EQ. NUMS(J:J)) GO TO 140
-  130   CONTINUE
-      IF (IUNIT .GE. 2000) THEN
-        OCHAR(I:I) = BLANK
-        GO TO 140
-      ENDIF
-C-----------------------------------------------------------------------
-C  Get a corrected input string
-C-----------------------------------------------------------------------
-      WRITE (COUT,11000)
-      GO TO 100
-  140 CONTINUE
-C-----------------------------------------------------------------------
-C  Clean up the string
-C-----------------------------------------------------------------------
-      NCHAR = ' '
-      LAST = COMMA
-      NNEW = 1
-      DO 150 NOLD = 1,LEN
-      THIS = OCHAR(NOLD:NOLD)
-      IF (THIS .EQ. '+') THEN
-        IF (LAST .NE. COMMA .AND. LAST .NE. BLANK) THEN
-          NCHAR(NNEW:NNEW) = BLANK
-          NNEW = NNEW + 1
-        ENDIF
-        GO TO 150
-      ENDIF
-      IF (THIS .EQ. '-') THEN
-        IF (LAST .NE. COMMA .AND. LAST .NE. BLANK) THEN
-          NCHAR(NNEW:NNEW) = BLANK
-          NNEW = NNEW + 1
-        ENDIF
-        NCHAR(NNEW:NNEW) = THIS
-        NNEW = NNEW + 1
-        GO TO 150
-      ENDIF
-C-----------------------------------------------------------------------
-C  Treat the case not a comma or blank
-C-----------------------------------------------------------------------
-      IF (THIS .NE. BLANK .AND. THIS .NE. COMMA) THEN
-        NCHAR(NNEW:NNEW) = THIS
-        NNEW = NNEW + 1
-      ENDIF
-C-----------------------------------------------------------------------
-C  Treat the case of this character is a comma
-C-----------------------------------------------------------------------
-      IF (THIS .EQ. COMMA) THEN
-        IF (LAST .EQ. COMMA .OR. LAST .EQ. BLANK) THEN
-          NCHAR(NNEW:NNEW) = '0'
-          NNEW = NNEW + 1
-          NCHAR(NNEW:NNEW) = BLANK
-          NNEW = NNEW + 1
-        ENDIF
-        IF (LAST .NE. COMMA .AND. LAST .NE. BLANK) THEN
-          NCHAR(NNEW:NNEW) = BLANK
-          NNEW = NNEW + 1
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  Treat the case of this character is a blank
-C-----------------------------------------------------------------------
-      IF (THIS .EQ. BLANK) THEN
-        IF (LAST .NE. BLANK .AND. LAST .NE. COMMA) THEN
-          NCHAR(NNEW:NNEW) = BLANK
-          NNEW = NNEW + 1
-        ENDIF
-      ENDIF
-      LAST = THIS
-  150 CONTINUE
-C-----------------------------------------------------------------------
-C  Now extract the 20 pairs of values
-C-----------------------------------------------------------------------
-      DO 200 I = 1,20
-        IFREE(I) = 0
-  200   RFREE(I) = 0.0
-      IPT = 0
-      IFIELD = 0
-      IDIV = 0
-  210 ISIGN = 1
-      NUM = 0
-      DEC = 1.0
-      IDEC = 0
-      IC = 0
-  220 IPT = IPT + 1
-      IF (IPT .GT. NNEW) THEN
-        IF (IUNIT .GE. 2000) IUNIT = IERROR
-        RETURN
-      ENDIF
-      THIS = NCHAR(IPT:IPT)
-      IF (THIS .EQ. ' ') GO TO 230
-      IF (THIS .EQ. '/') THEN
-        IDIV = 1
-        GO TO 230
-      ENDIF
-      IF (THIS .EQ. 'E') THEN
-        IDIV = 3
-        GO TO 230
-      ENDIF
-      IF (THIS .EQ. '-') THEN
-        IF (IC .NE. 0) THEN
-          WRITE (COUT,12000)
-          IF (IUNIT .GE. 2000) GO TO 240
-          GO TO 100
-        ENDIF
-        ISIGN = -1
-        GO TO 220
-      ENDIF
-      IF (THIS .EQ. '.') THEN
-        IF (IDEC .EQ. 1) THEN
-          WRITE (COUT,13000)
-          IF (IUNIT .GE. 2000) GO TO 240
-          GO TO 100
-        ENDIF
-        IDEC = 1
-        GO TO 220
-      ENDIF
-      IC = ICHAR(THIS) - IZERO
-      NUM = 10*NUM + IC
-      IF (NUM .GT. 2147483647) THEN
-        WRITE (COUT,14000)
-        IF (IUNIT .GE. 2000) GO TO 240
-        GO TO 100
-      ENDIF
-      IF (IDEC .NE. 0) DEC = 10.0*DEC
-      GO TO 220
-C-----------------------------------------------------------------------
-C  Work out the number and put it away
-C-----------------------------------------------------------------------
-  230 NUM = ISIGN*NUM
-      RNUM = NUM/DEC
-      IF (IDIV .EQ. 1) THEN
-        TOP = NUM
-        IDIV = 2
-        GO TO 210
-      ENDIF
-      IF (IDIV .EQ. 2) THEN
-        BOT = NUM
-        RNUM = TOP/BOT
-        NUM = RNUM
-        IDIV = 0
-      ENDIF
-      IF (IDIV .EQ. 3) THEN
-        TOP = RNUM
-        IDIV = 4
-        GO TO 210
-      ENDIF
-      IF (IDIV .EQ. 4) THEN
-        BOT = 10.0**NUM
-        RNUM = TOP*BOT
-        IDIV = 0
-      ENDIF
-      IFIELD = IFIELD + 1
-      IFREE(IFIELD) = RNUM
-      IF (IDEC .EQ. 0) IFREE(IFIELD) = NUM
-      RFREE(IFIELD) = RNUM
-      GO TO 210
-C-----------------------------------------------------------------------
-C  Set the error flag for REFIN calls
-C-----------------------------------------------------------------------
-  240 WRITE (COUT,10000) OCHAR(1:LEN)
-      CALL GWRITE (ITP,' ')
-      IERROR = 1
-      IUNIT = IERROR
-      RETURN
-  250 CALL SETIOU (JUNK,JUNK,JUNK,ITR,ITP,IBYLEN)
-      IF (IREAD .EQ. ITR) THEN
-        OCHAR = ' '
-        REWIND IREAD
-        GO TO 105
-      ELSE
-        WRITE (COUT,15000) IREAD
-        CALL GWRITE (ITP,' ')
-        STOP
-      ENDIF
-10000 FORMAT (A)
-11000 FORMAT (' TYPO -- Numeric characters only. Try again please.')
-12000 FORMAT (' TYPO -- Minus sign incorrect. Try again please.')
-13000 FORMAT (' TYPO -- Too many decimal points. Try again please.')
-14000 FORMAT (' TYPO -- Too many digits in number. Try again please.')
-15000 FORMAT (' Unexpected EOF on Unit',I3,'.  Job Aborted.'/'%')
-      END
diff --git a/difrac/goloop.f b/difrac/goloop.f
deleted file mode 100644
index b50b3543..00000000
--- a/difrac/goloop.f
+++ /dev/null
@@ -1,433 +0,0 @@
-C-----------------------------------------------------------------------
-C  This subroutine controls the sequence of reflections to be measured
-C  from the knowledge of the data collection parameters
-C-----------------------------------------------------------------------
-      SUBROUTINE GOLOOP
-      INCLUDE 'COMDIF'
-      DIMENSION ENREFB(10)
-      EQUIVALENCE (NREFB(1),ENREFB(1))
-      CHARACTER KQ*1
-C-----------------------------------------------------------------------
-C  Start of the measuring cycle
-C  ISEG   = 1 if end of segment from INCHKL
-C  KQFLG2 = 0 if K or 2 if Q stops.  1 if OK.
-C  NBETWN is the count of reflections between stds.
-C  IORNT is the flag to cause re-orientation every NINTOR reflns.
-C        If NINTOR = 0, i.e. no re-orientation IORNT is always 0.
-C  ICADFL is the flag to say the CAD4 is measuring +++ or ---
-C-----------------------------------------------------------------------
-      KQFLG2 = 1
-      NBETWN = 0
-      IORNT = 0
-      ICADFL = 0
-      CALL SHUTTR (99)
-C-----------------------------------------------------------------------
-C  In automatic mode get the first refln.  Then calculate angles.
-C-----------------------------------------------------------------------
-      IF (IAUTO .EQ. 1) THEN
-        IH = IHO(8)
-        IK = IKO(8)
-        IL = ILO(8)
-      ENDIF
-  100 IPRVAL = 0
-      IUMPTY = 1
-      CALL ANGCAL
-      IUMPTY = 0
-C-----------------------------------------------------------------------
-C  Check for cryostat chi collision       (IVALID = 16),
-C            the 0,0,0 refln              (IVALID =  8),
-C            2theta outside limits        (IVALID =  4),
-C            lattice or specific absence  (IVALID =  2),
-C            translation absence          (IVALID =  1).
-C  Translation absence         flag IHO(7) = 0 if to be measured,
-C  lattice or specific absence flag NCOND  = 0 if to be measured.
-C  If IROT = 1 hereit means rotation is not allowed in the parallel mode
-C-----------------------------------------------------------------------
-      IF (IVALID .LT. 3 .AND. IROT .EQ. 0) THEN
-        ILATAB = IVALID/2
-        ITRNAB = IVALID - 2*ILATAB
-        IF ((ILATAB .EQ. 0 .OR. NCOND  .EQ. 0) .AND.
-     $      (ITRNAB .EQ. 0 .OR. IHO(7) .EQ. 0)) GO TO 110
-      ENDIF
-      CALL INCHKL
-      IF (ISEG .NE. 1) GO TO 100
-C-----------------------------------------------------------------------
-C  Save the current indices
-C-----------------------------------------------------------------------
-  110 IND(1) = IH
-      IND(2) = IK
-      IND(3) = IL
-C-----------------------------------------------------------------------
-C  Save the indices when in the automatic mode.
-C-----------------------------------------------------------------------
-      IF (IAUTO .EQ. 1 .AND. ICADFL .EQ. 0) THEN
-        IHO(8) = IH
-        IKO(8) = IK
-        ILO(8) = IL
-        JH = IH*IDH(8,1,1) + IK*IDH(8,2,1) + IL*IDH(8,3,1)
-        JK = IH*IDH(8,1,2) + IK*IDH(8,2,2) + IL*IDH(8,3,2)
-        JL = IH*IDH(8,1,3) + IK*IDH(8,2,3) + IL*IDH(8,3,3)
-        IH = JH
-        IK = JK
-        IL = JL
-      ENDIF
-C-----------------------------------------------------------------------
-C  Test for K or Q stops. KQFLAG = 0 for K; 1 for OK; 2 for Q.
-C-----------------------------------------------------------------------
-      CALL KORQ (KQFLAG)
-C-----------------------------------------------------------------------
-C  If not K-stop, measure reflection or standards if necessary.
-C-----------------------------------------------------------------------
-      IF (KQFLAG .GT. 0) THEN
-        IF (KQFLAG .EQ. 2) KQFLG2 = 2
-C-----------------------------------------------------------------------
-C  No K was typed.  End of segment (ISEG .NE. 0) ?
-C-----------------------------------------------------------------------
-        IF (ISEG .NE. 0) THEN
-          NMSEG = NMSEG + 1
-          IH = 0
-          IK = 0
-          IL = 0
-          CALL STDMES
-          IF (KQFLAG .EQ. 1) KQFLAG = KQFLG2
-        ELSE
-C-----------------------------------------------------------------------
-C  Not end of segment.  Normal reflection, but is it time for stds?
-C-----------------------------------------------------------------------
-          IF (NBETWN .NE. NINTRR) THEN
-C-----------------------------------------------------------------------
-C No.  Is it time for re-orientation ?  Save KQFLAG
-C-----------------------------------------------------------------------
-            IF (IORNT .EQ. 1) THEN
-              CALL ALIGN 
-C-----------------------------------------------------------------------
-C  Was K or Q typed during ALIGN ?
-C-----------------------------------------------------------------------
-              IF (KQFLAG .EQ. 0) THEN
-                IORNT = 0
-                GO TO 200
-              ELSE 
-                IF (KQFLAG .EQ. 2) KQFLG2 = 2
-                CALL LSORMT
-                IORNT = 0
-                CALL STDMES
-C-----------------------------------------------------------------------
-C  Was K or Q typed during STDMES ?
-C-----------------------------------------------------------------------
-                IF (KQFLAG .NE. 1) GO TO 200
-                IF (KQFLG2 .EQ. 2) THEN
-                  KQFLAG = KQFLG2
-                  GO TO 200
-                ENDIF
-              ENDIF
-            ENDIF
-          ELSE
-C-----------------------------------------------------------------------
-C  Time for stds.  Was Q typed ?  KQFLAG .EQ. 2 means Q
-C  Save KQFLAG because KORQ will be called again in STDMES.
-C-----------------------------------------------------------------------
-            IF (KQFLAG .EQ. 2 .OR. KQFLG2 .EQ. 2) THEN
-              KQFLG2 = 2
-              CALL STDMES
-              IF (KQFLAG .EQ. 1) KQFLAG = KQFLG2
-              GO TO 200
-            ELSE
-              CALL STDMES
-              NBETWN = 0
-C-----------------------------------------------------------------------
-C  Was K or Q typed during STDMES ?
-C-----------------------------------------------------------------------
-              IF (KQFLAG .NE. 1) GO TO 200
-C-----------------------------------------------------------------------
-C No.  Is it time for re-orientation ?  Save KQFLAG
-C-----------------------------------------------------------------------
-              IF (IORNT .EQ. 1) THEN
-                KQFLG2 = KQFLAG
-                CALL ALIGN 
-C-----------------------------------------------------------------------
-C  Was K or Q typed during ALIGN ?
-C-----------------------------------------------------------------------
-                IF (KQFLAG .EQ. 0) THEN
-                  IORNT = 0
-                  GO TO 200
-                ELSE 
-                  IF (KQFLAG .EQ. 2) KQFLG2 = 2
-                  CALL LSORMT
-                  IORNT = 0
-                  CALL STDMES
-C-----------------------------------------------------------------------
-C  Was K or Q typed during STDMES ?
-C-----------------------------------------------------------------------
-                  IF (KQFLAG .NE. 1) GO TO 200
-                  IF (KQFLG2 .EQ. 2) THEN
-                    KQFLAG = KQFLG2
-                    GO TO 200
-                  ENDIF
-                ENDIF
-              ENDIF
-            ENDIF
-          ENDIF
-C-----------------------------------------------------------------------
-C  This is really the start of intensity measurement
-C  First test if rotation is required and allowed (IROT = 0).
-C-----------------------------------------------------------------------
-  120     PSI = 0.0
-          IF (ABS(DPSI) .GT. 0.0001) THEN
-            PSI  = PSIMIN
-            TPSI = PSIMIN
-            IF (TPSI .GE. 180.0) TPSI = TPSI - 360.0
-          ENDIF
-  130     PSISAV = PSI
-          IF (PSI .NE. 0.0) PSI = 360.0 - PSI
-          IPRVAL = 0
-          IUMPTY = 1
-          CALL ANGCAL
-          IUMPTY = 0
-          PSI = PSISAV
-          IF (IROT .NE. 0) GO TO 160
-C-----------------------------------------------------------------------
-C  For Compton or TDS, test if the point is within the Brillouin Zone
-C-----------------------------------------------------------------------
-          IF (ISCAN .EQ. 1) THEN
-            IBZ = 1
-            CALL COMPTN (IBZ)
-            IF (IBZ .EQ. 3) GO TO 170
-          ENDIF
-C-----------------------------------------------------------------------
-C  Set the display
-C-----------------------------------------------------------------------
-          NSENT = NREF
-          CALL HKLN (IH,IK,IL,NSENT)
-C-----------------------------------------------------------------------
-C  Measure the reflection
-C-----------------------------------------------------------------------
-          IMESR = 0
-C-----------------------------------------------------------------------
-C  Compton or TDS measurements
-C-----------------------------------------------------------------------
-  140     IF (ISCAN .EQ. 1) THEN
-            IBZ = 2
-            CALL COMPTN(IBZ)
-            GO TO 150
-          ENDIF
-C-----------------------------------------------------------------------
-C  SAMMES  -- Measure reflection for Precision mode measurements
-C  MESINT -- For ALL other measuring modes
-C-----------------------------------------------------------------------
-          IF (ISCAN .EQ. 3 .OR. ISCAN .EQ. 4) THEN
-            CALL SAMMES (ITIME,ICC)
-          ELSE
-            CALL MESINT (IROFL,ICC)
-          ENDIF
-          IF (ICC .GE. 4) THEN
-            NBETWN = NINTRR
-            ICC = ICC - 4
-          ENDIF
-          IF (ICC .EQ. 2) THEN
-            WRITE (COUT,10000) IH,IK,IL
-            CALL GWRITE (ITP,' ') 
-            GO TO 160
-          ENDIF
-C-----------------------------------------------------------------------
-C  Do the profile analysis, whether wanted or not.
-C-----------------------------------------------------------------------
-          CALL PROFIL
-          IF (IWARN .EQ. 2) IMESR = IMESR + 1
-          IF (IMESR .EQ. 1 .AND. IWARN .EQ. 2) GO TO 140
-C-----------------------------------------------------------------------
-C  With the CAD4 only the next sequence can force the -,-,- rfln to be
-C  measured if there is a high-angle scan problem with the +,+,+
-C  ICADFL = 0 for +,+,+  OR  1 for -,-,-
-C  ICADSW = 1 if this switching is to be done  OR  0 if not.
-C
-C  To test refln sequences with no instrument, disable the next test
-C-----------------------------------------------------------------------
-  150     IF (DFMODL .EQ. 'CAD4' .AND. IDEL .LT. 10) THEN
-            IF (ICADFL .EQ. 0) THEN
-              IF (ICADSW .EQ. 1) THEN
-                IH = -IH
-                IK = -IK
-                IL = -IL
-                ICADFL = 1
-                WRITE (LPT,10100) IH,IK,IL
-10100 FORMAT (' Trying ',3I4)
-                WRITE (COUT,10100) IH,IK,IL
-                CALL GWRITE (ITP,' ')
-                GO TO 100
-              ENDIF
-            ELSE
-              ICADFL = 0
-              GO TO 160
-            ENDIF
-          ENDIF
-C-----------------------------------------------------------------------
-C  Pack h & k and l & Natt  (See basinp.f (SD) for ITYPE and ISCAN)
-C-----------------------------------------------------------------------
-          IHK(NB) = (IH + 500)*1000 + IK + 500
-          ILA(NB) = (IL + 500)*1000 + NATT
-C-----------------------------------------------------------------------
-C  Switch h,k,l if -,-,- measured with CAD4
-C-----------------------------------------------------------------------
-          IF (ICADFL .EQ. 1) THEN
-            IH = -IH
-            IK = -IK
-            IL = -IL
-            ICADFL = 0
-          ENDIF
-          BCOUNT(NB) = COUNT
-          IF (IPRFLG .EQ. 0) BCOUNT(NB) = SUM
-          BBGR1(NB) = BGRD1
-          BBGR2(NB) = BGRD2
-          BTIME(NB) = PRESET
-          IF (IPRFLG .EQ. 0) THEN
-            IF (ISCAN .EQ. 3 .OR. ISCAN .EQ. 4) THEN
-              BTIME(NB) = FRAC1 + 10*ITIME
-            ELSE
-              BTIME(NB) = FRAC1
-            ENDIF
-          ENDIF
-          ENREFB(NB) = NREF
-          IF (ISCAN .EQ. 3 .OR. ISCAN .EQ. 4) ENREFB(NB) = PRESET
-          BPSI(NB) = PSI
-C-----------------------------------------------------------------------
-C Write a block of intensity data to file, if 10 reflns done.
-C Close and reopen the file because a system crash could result in
-C data loss if we don't do this.
-C-----------------------------------------------------------------------
-          IF (NB .EQ. 10) THEN
-            WRITE (IID,REC=NBLOCK) IHK,ILA,BCOUNT,BBGR1,BBGR2,BTIME,
-     $                             ENREFB,BPSI
-            NBLOCK = NBLOCK + 1
-            NB = 0
-            IDREC = 85*IBYLEN
-            STATUS = 'OD'
-            CALL IBMFIL (IDNAME,-IID,IDREC,STATUS,IERR)
-            CALL IBMFIL (IDNAME, IID,IDREC,STATUS,IERR)
-          ENDIF
-          NB = NB + 1
-          NBETWN = NBETWN + 1
-          IF (NINTOR .NE. 0 .AND. IORNT .EQ. 0) THEN
-            NDIFF = NREF - NREFOR + 1
-            I = NDIFF - NINTOR*(NDIFF/NINTOR)
-            IF (I .EQ. 0) IORNT = 1
-          ENDIF
-          NREF = NREF + 1
-C-----------------------------------------------------------------------
-C  Do Psi rotation, if required.
-C-----------------------------------------------------------------------
-  160     IF (ABS(DPSI) .GT. 0.0001) THEN
-            TPSI = TPSI + DPSI
-             PSI =  PSI + DPSI
-            IF (PSI .GE. 360.0) PSI = PSI - 360.0
-            IF (TPSI .LE. PSIMAX) GO TO 130
-            PSI = PSIMIN
-          ENDIF
-C-----------------------------------------------------------------------
-C  Get the equivalent indices in set 1
-C-----------------------------------------------------------------------
-  170     IF (IAUTO .EQ. 1) THEN
-            IH = IHO(8)
-            IK = IKO(8)
-            IL = ILO(8)
-          ENDIF
-C-----------------------------------------------------------------------
-C  Increment the indices.  ISEG = 1 at end of segment.
-C-----------------------------------------------------------------------
-          CALL INCHKL
-          IF (ISEG .EQ. 1) GO TO 110
-          GO TO 100
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  Fill up last record if K or Q stops, or end of segment.
-C-----------------------------------------------------------------------
-  200 NBL = NB
-      KQFLG2 = 1
-      IF (NBL .NE. 1) THEN
-        DO 210 NB = NBL,10
-          IHK(NB) = 599599
-          ILA(NB) = 599001
-          BCOUNT(NB) = 0.0
-          BBGR1(NB) = 0.0
-          BBGR2(NB) = 0.0
-          BTIME(NB) = 0.0
-          ENREFB(NB) = 0
-          BPSI(NB) = 0.0
-  210   CONTINUE
-        WRITE (IID,REC=NBLOCK) IHK,ILA,BCOUNT,BBGR1,BBGR2,BTIME,ENREFB,
-     $                         BPSI
-        NBLOCK = NBLOCK + 1
-        NB = 1
-      ENDIF
-C-----------------------------------------------------------------------
-C  Look after K-stop and Q-stop.  May coincide with end of segment.
-C  Write restart information on the IDATA file
-C---------------------------------------------------------------
-      CALL SHUTTR (-99)
-      IF (KQFLAG .NE. 1) THEN
-        KQ = 'Q'
-        IF (KQFLAG .EQ. 0) KQ = 'K'
-C------ modified: MK: output to terminal --> SICS
-        WRITE (COUT,11000) KQ,IH,IK,IL,NREF,NSET,NMSEG,NBLOCK
-        CALL GWRITE(IPT,' ')
-        IF (ISEG .NE. 0) THEN
-          IND(1) = 0
-          IND(2) = 0
-          IND(3) = 0
-          WRITE (LPT, 12000) NBLOCK
-          WRITE (COUT,12000) NBLOCK
-          CALL GWRITE (ITP,' ') 
-        ENDIF
-        IF (IAUTO .EQ. 1) THEN
-          SAVE = NBLOCK
-          IRES = 1
-          WRITE (IID,REC=9) IRES,IHO(8),IKO(8),ILO(8),NSET,IHO(6),IHO(5)
-          NBLOCK = SAVE
-        ENDIF
-        KI = 'W2'
-        CALL WRBAS
-        KI = ' '
-        RETURN
-      ELSE
-C-----------------------------------------------------------------------
-C  It is the end of a segment and maybe the end of data collection.
-C-----------------------------------------------------------------------
-        IND(1) = 0
-        IND(2) = 0
-        IND(3) = 0
-        WRITE (LPT, 12000) NBLOCK
-        WRITE (COUT,12000) NBLOCK
-        CALL GWRITE (ITP,' ') 
-        IF (NMSEG .LE. NSEG) THEN
-          KI = 'GO'
-          RETURN
-        ENDIF
-C-----------------------------------------------------------------------
-C  Check if it is the end of data collection in automatic mode ?
-C-----------------------------------------------------------------------
-        IF (IAUTO .EQ. 1) THEN
-C-----------------------------------------------------------------------
-C  Get the next set parameters in the automatic mode
-C-----------------------------------------------------------------------
-          CALL NEXSEG
-          IF (NSET .NE. 0) THEN
-            KI = 'GO'
-            RETURN
-          ELSE
-            IAUTO = 0
-          ENDIF
-        ENDIF
-        CALL SHUTTR (-99)
-C------- modified: MK --> IO to SICS instead of LPT
-        WRITE (COUT,13000)
-        CALL GWRITE(ITP,' ')
-        KI = ' '
-        RETURN
-      ENDIF
-10000 FORMAT (3I4,' Scan Collision in GOLOOP')
-11000 FORMAT (10X,A1,'-stop. Restart at'/
-     $        3I4,', number',I5,' in set',I3,' segment',I2,
-     $        ' at Idata Record',I4)
-12000 FORMAT (10X,'End of Segment. Start next data at Record',I4)
-13000 FORMAT (10X,'End of Data Collection ---- HURRAY !!')
-      END
diff --git a/difrac/goniom.ini b/difrac/goniom.ini
deleted file mode 100644
index 4a9c89ab..00000000
--- a/difrac/goniom.ini
+++ /dev/null
@@ -1,39 +0,0 @@
-/  The first value is the machine model code.  
-/  Present values can be  CAD4  R-6S  145D  or other if wanted
-Dfmodl CAD4
-/  The next 2 values are the COM port number and baudrate
-Port   1
-Baud   9600
-/  The next 11 values are those printed by CASPAR in the E-N program,
-/  except for Termbd
-Hivolt 774
-Lolevl 300
-Window 700
-Deadtm 2.0
-Termbd 9600
-Thgain 18
-Phgain 26
-Omgain 20
-Kagain 24
-Digain 24
-Milamp 40
-/  The next 12 values are those from GCONST, except that the angle Alpha
-/  is given in degrees.  ( CON2 = cos(Alpha) )
-Alpha  49.977
-Apmax  5.9
-Apmin  1.3
-/  The next 9 values for dial settings are octal.
-Maxvar 2443
-Minvar 277
-Upperh 3731
-Lowerh 3477
-Negsl  3001
-Possl  3135
-Vslit  3315
-Hslit  77
-Hole   2570 
-/  The next 4 values are the Euler angles for microscope viewing
-Vutht  293.0
-Vuome  223.0
-Vuchi  315.0
-Vuphi  355.0
diff --git a/difrac/grid.f b/difrac/grid.f
deleted file mode 100644
index 39b949a0..00000000
--- a/difrac/grid.f
+++ /dev/null
@@ -1,195 +0,0 @@
-C-----------------------------------------------------------------------
-C  dimensional grid of points.
-C  The grid is specified by from 1 to 3 start & end angles,
-C  2Theta, Omega & Chi and the step size in each.
-C  If the step size for any angle is zero that angle is not varied.
-C  The counting-time/step is also needed.
-C-----------------------------------------------------------------------
-      SUBROUTINE GRID
-      INCLUDE 'COMDIF'
-      CHARACTER ANGLES(3)*8
-      DIMENSION ANG(3),ANSTRT(3),ANSTOP(3),ANSTEP(3),NNN(3),ICOUNT(500)
-      EQUIVALENCE (ACOUNT(1),ICOUNT(1))
-      DATA ANGLES/'2THETA  ',' OMEGA  ','   CHI  '/
-      NATT = 0
-C-----------------------------------------------------------------------
-C  Verify command GD and then read grid specifications
-C-----------------------------------------------------------------------
-      WRITE (COUT,10000)
-      CALL YESNO ('Y',ANS)
-      IF (ANS .EQ. 'N') THEN
-        KI = ' '
-        RETURN
-      ENDIF
-      WRITE (COUT,12000)
-      CALL GWRITE (ITP,' ')
-      DO 100 I = 1,3
-        WRITE (COUT,13000) ANGLES(I)
-        CALL FREEFM (ITR)
-        ANSTRT(I) = RFREE(1)
-        ANSTOP(I) = RFREE(2)
-        CALL MOD360 (ANSTRT(I))
-        CALL MOD360 (ANSTOP(I))
-        ANSTEP(I) = RFREE(3)
-        ANSTEP(I) = ANSTEP(I)
-  100 CONTINUE
-      WRITE (COUT,15000)
-      CALL FREEFM (ITR)
-      TIMSTP = RFREE(1)
-      IF (TIMSTP .EQ. 0) TIMSTP = 100.0
-C-----------------------------------------------------------------------
-C  Work out the heading
-C-----------------------------------------------------------------------
-      CALL ANGET (THETA,OMEGA,CHI,PHI)
-      ANG(1) = THETA
-      ANG(2) = OMEGA
-      ANG(3) = CHI
-      OMOFF = 0.0
-      DO 110 I = 1,3
-        IF (ANSTEP(I) .EQ. 0) THEN
-          ANSTRT(I) = ANG(I)
-          ANSTOP(I) = ANG(I)
-          NNN(I) = 0
-        ELSE
-          DEL1 = ANSTOP(I) - ANSTRT(I)
-          IF (DEL1 .GT. 0.0) THEN
-            DEL2 = DEL1 - 360.0
-          ELSE
-            DEL2 = DEL1 + 360.0
-          ENDIF
-          IF (ABS(DEL2) .LT. ABS(DEL1)) DEL1 = DEL2
-          IF (DEL1 .LT. 0.0) ANSTEP(I) = -ABS(ANSTEP(I))
-          NNN(I) = DEL1/ANSTEP(I) + 1.5
-        ENDIF
-        ANG(I) = ANSTRT(I)
-        IF (I .EQ. 1) OMOFF = 0.5*(ANG(1) - THETA)
-        IF (I .EQ. 2) ANG(2) = ANG(2) - OMOFF
-  110 CONTINUE
-C-----------------------------------------------------------------------
-C  Work out the grid loop control and grid header print.
-C  The grid is such that if :--
-C      theta is stepped it is always fastest, then omega, then chi.
-C  IFIRST, ISECND or ITHIRD   1 means theta, 2 omega, 3 chi.
-C  NFIRST, NSECND or NTHIRD  are the number of steps on that axis.
-C-----------------------------------------------------------------------
-      IFIRST = 0
-      ISECND = 0
-      ITHIRD = 0
-      NFIRST = 1
-      NSECND = 1
-      NTHIRD = 1
-C-----------------------------------------------------------------------
-C  Theta variation
-C-----------------------------------------------------------------------
-      IF (ANSTEP(1) .NE. 0.0) THEN
-        IFIRST = 1
-        NFIRST = NNN(1)
-      ENDIF
-C-----------------------------------------------------------------------
-C  Omega variation
-C-----------------------------------------------------------------------
-      IF (ANSTEP(2) .NE. 0.0) THEN
-        IF (NFIRST .EQ. 1) THEN
-          NFIRST = NNN(2)
-          IFIRST = 2
-        ELSE
-          NSECND = NNN(2)
-          ISECND = 2
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  Chi variation
-C-----------------------------------------------------------------------
-      IF (ANSTEP(3) .NE. 0.0) THEN
-        IF (NSECND .EQ. 1) THEN
-          IF (NFIRST .EQ. 1) THEN
-            NFIRST = NNN(3)
-            IFIRST = 3
-          ELSE
-            NSECND = NNN(3)
-            ISECND = 3
-          ENDIF
-        ELSE
-          NTHIRD = NNN(3)
-          ITHIRD = 3
-        ENDIF
-      ENDIF
-      WRITE (COUT,16000) 
-     $       ANGLES(IFIRST),ANSTRT(IFIRST),NFIRST,ANSTOP(IFIRST)
-      CALL GWRITE (ITP,' ')
-      IF (ISECND .NE. 0) THEN
-         WRITE (COUT,16100) ANGLES(ISECND),ANSTRT(ISECND),NSECND,
-     $                      ANSTOP(ISECND)
-         CALL GWRITE (ITP,' ')
-      ENDIF 
-      IF (ITHIRD .NE. 0) THEN
-         WRITE (COUT,16200) ANGLES(ITHIRD),ANSTRT(ITHIRD),NTHIRD,
-     $                      ANSTOP(ITHIRD)
-         CALL GWRITE (ITP,' ')
-      ENDIF 
-C-----------------------------------------------------------------------
-C  Now scan the grid in the correct order
-C-----------------------------------------------------------------------
-      IF (NSECND .EQ. 0) NSECND = 1
-      IF (NTHIRD .EQ. 0) NTHIRD = 1
-      CALL SHUTTR (99)
-      DO 140 N3 = 1,NTHIRD
-        ANG2SV = ANG(2)
-        DO 130 N2 = 1,NSECND
-          DO 120 N1 = 1,NFIRST
-            CALL ANGSET (ANG(1),ANG(2),ANG(3),PHI,0,ICOL)
-            IF (ICOL .NE. 0) THEN
-              WRITE (COUT,18000)
-              CALL GWRITE (ITP,' ')
-              CALL ANGSET (THETA,OMEGA,CHI,PHI,0,ICOL)
-              KI = ' '
-              RETURN
-            ENDIF
-            CALL CCTIME (TIMSTP,COUNT)
-            ICOUNT(N1) = COUNT
-            ANG(IFIRST) = ANG(IFIRST) + ANSTEP(IFIRST)
-            CALL MOD360 (ANG(IFIRST))
-            IF (IFIRST .EQ. 1) THEN
-              ANG(2) = ANG(2) - 0.5*ANSTEP(1)
-              CALL MOD360 (ANG(2))
-            ENDIF
-  120     CONTINUE
-          WRITE (COUT,19000) (ICOUNT(I),I = 1,NFIRST)
-          CALL GWRITE (ITP,' ')
-          ANG(IFIRST) = ANSTRT(IFIRST)
-          IF (ISECND .NE. 0) THEN
-            ANG2SV = ANG2SV + ANSTEP(ISECND)
-            ANG(ISECND) = ANG2SV
-            CALL MOD360 (ANG(ISECND))
-          ENDIF
-  130   CONTINUE
-        IF (ISECND .NE. 0) ANG(ISECND) = ANSTRT(ISECND)
-        IF (ITHIRD .NE. 0) THEN
-          ANG(ITHIRD) = ANG(ITHIRD) + ANSTEP(ITHIRD)
-          CALL MOD360 (ANG(ITHIRD))
-        ENDIF
-        IF (ITHIRD .EQ. 3 .AND. N3 .LT. NTHIRD) THEN  
-           WRITE (COUT,17000) ANG(ITHIRD)
-           CALL GWRITE (ITP,' ')
-        ENDIF 
-  140 CONTINUE
-      CALL SHUTTR (-99)
-      CALL ANGSET (THETA,OMEGA,CHI,PHI,0,ICOL)
-      KI = ' '
-      RETURN
-10000 FORMAT (' Sample an Angular Grid (Y) ? ',$)
-12000 FORMAT (' Type the grid specs.'/
-     $        ' A response of <CR> is interpreted as no variation of',
-     $        ' of that axis.'/)
-13000 FORMAT (' Type start, end & step for ',A,' ',$)
-15000 FORMAT (' Counting preset per step (1000) ',$)
-16000 FORMAT (1X,A,' ACROSS page, from',F8.3,' in',I3,
-     $        ' steps, to ',F8.3)
-16100 FORMAT (1X,A,'   DOWN page, from',F8.3,' in',I3,
-     $        ' steps, to ',F8.3)
-16200 FORMAT (1X,A,'    SECTIONS, from',F8.3,' in',I3,
-     $        ' steps, to ',F8.3)
-17000 FORMAT (' Chi Incremented to ',F8.3)
-18000 FORMAT (' Collision')
-19000 FORMAT (10I7)
-      END
diff --git a/difrac/gwrite.f b/difrac/gwrite.f
deleted file mode 100644
index 48f3c319..00000000
--- a/difrac/gwrite.f
+++ /dev/null
@@ -1,115 +0,0 @@
-C-----------------------------------------------------------------------
-C  Routines to perform consol I/O 
-C-----------------------------------------------------------------------
-      SUBROUTINE GWRITE (IDEV,DOLLAR)
-      CHARACTER  DOLLAR*(*)
-      CHARACTER*132 COUT
-      COMMON /IOUASC/ COUT(20)
-      COMMON /IOUASS/ IOUNIT(10)
-      CHARACTER CR*1,LF*1,CRLF*2,STATUS*2
-      CR = CHAR(13)
-      LF = CHAR(10)
-      CRLF(1:1) = CR
-      CRLF(2:2) = LF
-      ITP = IOUNIT(6) 
-C-----------------------------------------------------------------------
-C  First find out how many lines to output 
-C-----------------------------------------------------------------------
-      DO 100 I = 20,1,-1
-         IF (COUT(I) .NE. ' ') GO TO 110
-  100 CONTINUE
-C-----------------------------------------------------------------------
-C  Must be just a blank line.  Only here for safety - should not happen.
-C-----------------------------------------------------------------------
-      I = 1
-  110 NLINES = I
-      IF (COUT(NLINES)(1:1) .EQ. '%') COUT(NLINES)(1:1) = ' '
-C-----------------------------------------------------------------------
-C  If the unit is not ITP then just do straight output to the device 
-C-----------------------------------------------------------------------
-      IF (IDEV .NE. ITP) THEN
-         IF (NLINES .GT. 1) THEN
-            DO 120 I = 1,NLINES-1
-               WRITE (IDEV,10200) COUT(I)(1:LINELN(COUT(I)))
-  120       CONTINUE
-         ENDIF
-         IF (DOLLAR .EQ. '$') THEN
-            WRITE (IDEV,10000) COUT(NLINES)(1:LINELN(COUT(I)))
-         ELSE IF (DOLLAR .EQ. '%') THEN
-            WRITE (IDEV,10100) COUT(NLINES)(1:LINELN(COUT(I)))
-         ELSE
-            WRITE (IDEV,10200) COUT(NLINES)(1:LINELN(COUT(I)))
-         ENDIF
-      ELSE
-C-----------------------------------------------------------------------
-C  Unit is ITP.  Output in Windows compatible form.
-C-----------------------------------------------------------------------
-         IF (NLINES .GT. 1) THEN
-            DO 130 I = 1,NLINES-1
-               CALL WNTEXT (COUT(I)(1:LINELN(COUT(I))))
-               CALL SCROLL 
-  130       CONTINUE
-         ENDIF
-         CALL WNTEXT (COUT(NLINES)(1:LINELN(COUT(NLINES))))
-         IF (DOLLAR .EQ. '$') THEN
-            CALL WNTEXT (' ')
-         ELSE
-            IF (DOLLAR .NE. '%') CALL SCROLL 
-         ENDIF 
-      ENDIF
-C-----------------------------------------------------------------------
-C  Blank out COUT in case some compilers dont
-C-----------------------------------------------------------------------
-      DO 140 I = 1,20
-        COUT(I) = ' '
-  140 CONTINUE
-      RETURN
-10000 FORMAT (A,' ',$)
-10100 FORMAT (A,$)
-10200 FORMAT (A)
-      END 
-C-----------------------------------------------------------------------
-C  Function to return the length of a character string 
-C-----------------------------------------------------------------------
-      INTEGER FUNCTION LINELN (STRING)
-      CHARACTER STRING*(*)
-      DO 10 I = LEN(STRING),1,-1
-         IF (STRING(I:I) .NE. ' ') GO TO 20
-10    CONTINUE
-      I = 0
-20    LINELN = I
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C   GETLIN  Read a line of input from the keyboard 
-C-----------------------------------------------------------------------
-      SUBROUTINE GETLIN (STRING)
-      COMMON /IOUASS/ IOUNIT(10)
-      CHARACTER STRING*(*)
-      ITR = IOUNIT(5)
-      READ (ITR,10000) STRING
-10000 FORMAT (A)
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  WNTEXT  Output text to a window
-C-----------------------------------------------------------------------
-      SUBROUTINE WNTEXT (STRING)
-      COMMON /IOUASS/ IOUNIT(10)
-      CHARACTER STRING*(*)
-      ITP = IOUNIT(6)
-      WRITE (ITP,10000) STRING
-10000 FORMAT (A,$)
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  SCROLL Output a new-line
-C-----------------------------------------------------------------------
-      SUBROUTINE SCROLL
-      COMMON /IOUASS/ IOUNIT(10)
-      ITP = IOUNIT(6)
-      WRITE (ITP,10000)
-10000 FORMAT (1X)
-      RETURN
-      END
-
diff --git a/difrac/ibmfil.f b/difrac/ibmfil.f
deleted file mode 100644
index b770d693..00000000
--- a/difrac/ibmfil.f
+++ /dev/null
@@ -1,184 +0,0 @@
-C-----------------------------------------------------------------------
-C
-C  Subroutine IBMFIL to OPEN and CLOSE all files for the NRCVAX system 
-C
-C  The need for this routine was caused by the inability of Unix and
-C  MS/DOS to interpret global symbols transparently during OPEN and
-C  CLOSE statements.  NRCVAX only uses one such symbol GROUPS, which 
-C  must be expanded before attempting to open the actual files involved.
-C 
-C  The routine essentially performs a straight OPEN or CLOSE function,
-C  once the actual file-name is known.
-C  The specification of the RECL parameter for SEQUENTIAL files is
-C  NOT standard F77 and is included only for writing plot files.
-C
-C  The calling sequence is as follows :--
-C
-C    CALL IBMFIL (ACTUAL,IUNIT,IBMREC,ST,IERR)
-C
-C  The parameters are :--
-C   ACTUAL - the actual file name as in all sensible computers
-C   IUNIT  - the unit number; negative to CLOSE file
-C   IBMREC - the record length for all files.   Non-standard F77
-C            Only required for direct-access files.
-C   ST     - a 2-character STATUS/ACCESS code made up as follows,
-C        For OPEN statements :
-C            N, O, U or T for NEW, OLD, UNKNOWN or SCRATCH
-C            S or D for SEQUENTIAL or DIRECT.
-C            F can be specified for UNformatted files, which are then
-C              assumed to be Sequential.
-C            L is used only in the VAX to specify 
-C              CARRIAGECONTROL = 'LIST'
-C            If blanks are used the defaults are U and S.
-C            Files are assumed to be Formatted for S & Unformatted for D
-C        For CLOSE statements :
-C            As above except,
-C            DE means delete the file after closing
-C   IERR   - Error flag returned. 0 for OK.
-C
-C-----------------------------------------------------------------------
-      SUBROUTINE IBMFIL (ACTUAL,IUNIT,IBMREC,STT,IERR)
-      INCLUDE 'IATSIZ'
-      CHARACTER ACTUAL*(*),STT*(*),ST*2,SA*2,STATUS*8,
-     $          FORM*12,ACCESS*12,CARRIJ*8,WORK*128
-      DIMENSION STUFF(100)
-      ST(1:2) = STT(1:2)
-      IERR = 0
-      LENGTH = IBMREC
-C-----------------------------------------------------------------------
-C  Is the call for an OPEN or CLOSE function ?
-C-----------------------------------------------------------------------
-      IF (IUNIT .LT. 0) THEN
-C-----------------------------------------------------------------------
-C                    ****  It is a CLOSE  ****
-C
-C  For Sun machines find the end of direct-access files and rewrite the 
-C  last record to prevent the file being truncated.
-C-----------------------------------------------------------------------
-        STATUS = 'KEEP'
-        IUNIT = -IUNIT
-        IF (ST .EQ. 'DE') THEN
-          STATUS = 'DELETE'
-        ELSE
-C          IF (MNCODE .EQ. 'UNXSUN' .OR. MNCODE .EQ. 'UNXSGI') THEN
-          IF (MNCODE .EQ. 'UNXSUN') THEN
-            INQUIRE (UNIT = IUNIT, ACCESS = ACCESS, RECL = LENSUN)
-            IF (ACCESS(1:3) .EQ. 'DIR') THEN
-              IVLEN = 4
-              IF (MNCODE .EQ. 'UNXSGI') IVLEN = 1
-              CALL LENFIL (IUNIT,LASTBL)
-              LENVAR = LENSUN/IVLEN
-              READ  (IUNIT,REC = LASTBL) (STUFF(J),J = 1,LENVAR)
-              WRITE (IUNIT,REC = LASTBL) (STUFF(J),J = 1,LENVAR)
-            ENDIF
-          ENDIF
-        ENDIF
-        CLOSE (UNIT = IUNIT, STATUS = STATUS)
-        RETURN
-      ELSE
-C-----------------------------------------------------------------------
-C                      ****  It is an OPEN  ****
-C
-C  For Unix and MS/DOS machines get the full name from the ACTUAL name.
-C  This allows names to be expanded across sub-directories if the ACTUAL
-C  name is GROUPS.  In UNIX this should have a SETENV statement in 
-C  .cshrc to expand the name to the full local name.
-C
-C  *** The call to GETENV should be uncommented for Unix machines ***
-C
-C-----------------------------------------------------------------------
-        LENAME = LEN(ACTUAL)
-        DO 120 I = 1,LENAME
-          J = LENAME + 1 - I
-          IF (ACTUAL(J:J) .NE. ' ') GO TO 130
-  120   CONTINUE
-  130   LENAME = J
-        WORK = ACTUAL
-        IF (MNCODE .NE. 'VAXVMS') then
-          IF (MNCODE .EQ. 'PCMSDS') THEN
-c
-c                 Avoid a compiler problem with '\'. char(92) is '\'!
-c
-CCC         IF (ACTUAL .EQ. 'GROUPS') WORK = '\NRCVAX\GROUPS.DAT'
-            IF (ACTUAL .EQ. 'GROUPS') 
-     +        WORK = char(92) // 'NRCVAX' // char(92) // 'GROUPS.DAT'
-C          ELSE
-C            IF (ACTUAL .EQ. 'GROUPS')
-C     $          CALL GETENV (ACTUAL(1:LENAME),WORK)
-          ENDIF
-        ENDIF
-C-----------------------------------------------------------------------
-C  The ST code can be in any form of 
-C     N, O, U, T or blank  with  D, S, F, L or blank  in any order.
-C-----------------------------------------------------------------------
-        SA = ST
-        FORM = 'FORMATTED'
-        IF (ST(1:1) .EQ. 'F' .OR. ST(2:2) .EQ. 'F') THEN
-          FORM = 'UNFORMATTED'
-          IF (ST(1:1) .EQ. 'F') ST(1:1) = ' '
-          IF (ST(2:2) .EQ. 'F') ST(2:2) = ' '
-        ENDIF
-        CARRIJ = 'FORTRAN'
-        IF (ST(1:1) .EQ. 'L' .OR. ST(2:2) .EQ. 'L') THEN
-          CARRIJ = 'LIST'
-          IF (ST(1:1) .EQ. 'L') ST(1:1) = ' '
-          IF (ST(2:2) .EQ. 'L') ST(2:2) = ' '
-        ENDIF
-        IF (ST .EQ. 'DN') SA = 'ND'
-        IF (ST .EQ. 'DO') SA = 'OD'
-        IF (ST .EQ. 'ST') SA = 'TS'
-        IF (ST .EQ. 'DT') SA = 'TD'
-        IF (ST .EQ. ' N' .OR. ST .EQ. 'N ' .OR. ST .EQ. 'SN') SA = 'NS'
-        IF (ST .EQ. ' O' .OR. ST .EQ. 'O ' .OR. ST .EQ. 'SO') SA = 'OS'
-        IF (ST .EQ. ' D' .OR. ST .EQ. 'D ' .OR. ST .EQ. 'DU') SA = 'UD'
-        IF (ST .EQ. '  ' .OR. ST .EQ. ' S' .OR. ST .EQ. 'S ' .OR.
-     $      ST .EQ. ' U' .OR. ST .EQ. 'U ' .OR. ST .EQ. 'SU') SA = 'US'
-        STATUS = 'UNKNOWN'
-        IF (SA(1:1) .EQ. 'N') STATUS = 'NEW'
-        IF (SA(1:1) .EQ. 'O') STATUS = 'OLD'
-        IF (SA(1:1) .EQ. 'T') STATUS = 'SCRATCH'
-        ACCESS = 'SEQUENTIAL'
-        IF (SA(2:2) .EQ. 'D') THEN
-          ACCESS = 'DIRECT'
-          FORM   = 'UNFORMATTED'
-        ENDIF
-C-----------------------------------------------------------------------
-C  Open the file at last.  Safeguard the record length for VAX
-C  The first OPEN statement (for the VAX) must be commented out in
-C  versions for other computers
-C-----------------------------------------------------------------------
-        IF (LENGTH .EQ. 0) LENGTH = 80
-        IF (MNCODE .EQ. 'VAXVMS') THEN
-C          OPEN (UNIT   = IUNIT,  FILE = WORK, STATUS = STATUS,
-C     $          ACCESS = ACCESS, FORM = FORM, RECL   = LENGTH,
-C     $          CARRIAGECONTROL = CARRIJ,     ERR    = 200)
-          CONTINUE
-        ELSE
-          IF (STATUS .NE. 'SCRATCH') THEN
-            IF (ACCESS .EQ. 'DIRECT') THEN
-              OPEN (UNIT   = IUNIT,  FILE = WORK, STATUS = STATUS,
-     $              ACCESS = ACCESS, FORM = FORM, RECL   = LENGTH,
-     $              ERR    = 200)
-            ELSE
-              OPEN (UNIT   = IUNIT,  FILE = WORK, STATUS = STATUS,
-     $              ACCESS = ACCESS, FORM = FORM, ERR    = 200)
-            ENDIF
-          ELSE
-            IF (ACCESS .EQ. 'DIRECT') THEN
-              OPEN (UNIT   = IUNIT,  STATUS = STATUS,
-     $              ACCESS = ACCESS, FORM = FORM, RECL   = LENGTH,
-     $              ERR    = 200)
-            ELSE
-              OPEN (UNIT   = IUNIT,  STATUS = STATUS,
-     $              ACCESS = ACCESS, FORM = FORM, ERR    = 200)
-            ENDIF
-          ENDIF
-        ENDIF
-        RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Some sort of error was made.  Go back and try again probably.
-C-----------------------------------------------------------------------
-  200 IERR = 1
-      RETURN
-      END
diff --git a/difrac/iedevs.f b/difrac/iedevs.f
deleted file mode 100644
index b1f56073..00000000
--- a/difrac/iedevs.f
+++ /dev/null
@@ -1,49 +0,0 @@
-C-----------------------------------------------------------------------
-C  Setup permitted device types:
-C  ITERM is the generic type and ITERM2 is a specific device.
-C  Note that values for ITERM2 can be duplicated as long as ITERM
-C  is different.  In particular the values of ITERM2 for the PC
-C  refer to specific video modes and should not be changed.
-C
-C  Feel free to add to this list.
-C-----------------------------------------------------------------------
-      INTEGER TEK,    T4010,  T4663,  VT340,  T4107,
-     $                QMSTEK, LN03TK, W99GT,
-     $        HPGL,
-     $        POSTSC,
-     $        PC,     CGA,    HERC,   EGAM,    EGA,
-     $                MCGA,   VGAM,   VGA,
-     $        X11,
-     $        RASTER, EPSON,  PROPRT, PRINTX, IMAGEW
-      PARAMETER (TEK    =  1,  HPGL  =  2,  POSTSC =  3, PC     =  4,
-     $           RASTER =  5,  X11   =  6)
-      PARAMETER (T4010  = 11,  T4663 = 12,  VT340 = 13,  T4107  = 14,
-     $           QMSTEK = 15,  LN03TK = 16, W99GT = 17)
-      PARAMETER (CGA    =  6,  HERC   =  8, EGAM  = 15,  EGA    = 16,
-     $           MCGA   = 17,  VGAM   = 17, VGA   = 18)
-      PARAMETER (EPSON  = 51,  PROPRT = 52, PRINTX = 53, IMAGEW = 54)
-C-----------------------------------------------------------------------
-C  The following common block defines the current devices and their
-C  resolutions.  This block is for EDRAW internal use only
-C-----------------------------------------------------------------------
-      INTEGER ITERM,  ITERM2, ITSAV1, ITSAV2,
-     $        EDXRES, EDYRES, EDFCOL, EDBCOL,
-     $        EDDASH, EDIX,   EDIY,   EDTSIZ
-      REAL    PCXMUL, PCYMUL
-      COMMON /EDEVS/ ITERM,  ITERM2, ITSAV1, ITSAV2,
-     $               EDXRES, EDYRES, EDFCOL, EDBCOL,
-     $               EDDASH, EDIX,   EDIY,   EDTSIZ,
-     $               PCXMUL, PCYMUL
-      CHARACTER*12    TERMTP, TERMGR, PRINTR, PRINTP, PLOTR,  PLOTP
-      COMMON /IEDEVC/ TERMTP, TERMGR, PRINTR, PRINTP, PLOTR,  PLOTP
-C-----------------------------------------------------------------------
-C  The following defines the codes for CXDRAW.
-C  NOTE:  If you change these you must also change the definitions in
-C         CXDRAW.C
-C-----------------------------------------------------------------------
-      INTEGER     XOPEN,  XCLOSE, XMOVE,  XDRAW,  XDRAWD, XCLEAR,
-     $            XWRITE, XFLUSH, XFGCOL, XBGCOL, XCROSS, XCHSIZ
-      PARAMETER ( XOPEN  = 1, XCLOSE = 2, XMOVE  = 3, XDRAW  = 4,
-     $            XDRAWD = 5, XCLEAR = 6, XWRITE = 7, XFLUSH = 8,
-     $            XFGCOL = 9, XBGCOL = 10,XCROSS = 11,XCHSIZ = 12)
-
\ No newline at end of file
diff --git a/difrac/inchkl.f b/difrac/inchkl.f
deleted file mode 100644
index 6d0df4be..00000000
--- a/difrac/inchkl.f
+++ /dev/null
@@ -1,81 +0,0 @@
-C-----------------------------------------------------------------------
-C  Subroutine to increment the indices with the DH segment scheme.
-C  Incrementing is done up one row of h2 and down the next row of h2,
-C  on each level of h1.
-C  IUPDWN = 1 at the start of each level of h1
-C  ISEG = 0 if the next refln is OK, = 1 if the end of segment.
-C-----------------------------------------------------------------------
-      SUBROUTINE INCHKL
-      INCLUDE 'COMDIF'
-      INTEGER IHSAVE,IKSAVE,ILSAVE
-      ISEG = 0
-      IH = IH + NDH(1,3)*IUPDWN
-      IK = IK + NDH(2,3)*IUPDWN
-      IL = IL + NDH(3,3)*IUPDWN
-      IX = IABS(IH)
-      IY = IABS(IK)
-      IZ = IABS(IL)
-C-----------------------------------------------------------------------
-C  IUPDWN = 1  Increment h3 up towards IHMAX,IKMAX,ILMAX
-C-----------------------------------------------------------------------
-      IF (IUPDWN .GT. 0) THEN
-        IF (IX.LT.IHMAX .AND. IY.LT.IKMAX .AND. IZ.LT.ILMAX) RETURN
-C-----------------------------------------------------------------------
-C  H3 going up has run out. Prepare for going down
-C-----------------------------------------------------------------------
-        IHSAVE = IH + NDH(1,2)
-        IKSAVE = IK + NDH(2,2)
-        ILSAVE = IL + NDH(3,2)
-      ELSE
-C-----------------------------------------------------------------------
-C  IUPDWN = -1  Increment h3 down towards FSTHKL(I,2)
-C-----------------------------------------------------------------------
-        IF (ISTOP .NE. 1) THEN
-          ISTOP = 0
-          IF (IH .NE. IFSHKL(1,2) .OR. IK .NE. IFSHKL(2,2) .OR. 
-     $        IL .NE. IFSHKL(3,2)) RETURN
-          ISTOP = 1
-          RETURN
-        ENDIF
-        ISTOP = 0
-C-----------------------------------------------------------------------
-C  H3 going down has run out. Prepare for going up.
-C-----------------------------------------------------------------------
-        IHSAVE = IFSHKL(1,2) + NDH(1,2)
-        IKSAVE = IFSHKL(2,2) + NDH(2,2)
-        ILSAVE = IFSHKL(3,2) + NDH(3,2)
-      ENDIF
-      IUPDWN = -IUPDWN
-      DO 100 I = 1,3
-        IFSHKL(I,2) = IFSHKL(I,2) + NDH(I,2)
-        IFSHKL(I,3) = IFSHKL(I,2)
-  100 CONTINUE
-      IX = IABS(IFSHKL(1,3))
-      IY = IABS(IFSHKL(2,3))
-      IZ = IABS(IFSHKL(3,3))
-C-----------------------------------------------------------------------
-C  Start of new level of h1. Set IUPDWN = 1
-C-----------------------------------------------------------------------
-      IF (IX .GE. IHMAX .OR. IY .GE. IKMAX .OR. IZ .GE. ILMAX) THEN
-        IUPDWN = 1
-        DO 120 I = 1,3
-          IFSHKL(I,1) = IFSHKL(I,1) + NDH(I,1)
-          IFSHKL(I,2) = IFSHKL(I,1)
-          IFSHKL(I,3) = IFSHKL(I,2)
-  120   CONTINUE
-        IHSAVE = IFSHKL(1,3)
-        IKSAVE = IFSHKL(2,3)
-        ILSAVE = IFSHKL(3,3)
-        IX = IABS(IHSAVE)
-        IY = IABS(IKSAVE)
-        IZ = IABS(ILSAVE)
-        IF (IX .GE. IHMAX .OR. IY .GE. IKMAX .OR. IZ .GE. ILMAX) THEN
-          ISEG = 1
-          RETURN
-        ENDIF
-      ENDIF
-      IH = IHSAVE
-      IK = IKSAVE
-      IL = ILSAVE
-      RETURN
-      END
diff --git a/difrac/indmes.f b/difrac/indmes.f
deleted file mode 100644
index d33b3335..00000000
--- a/difrac/indmes.f
+++ /dev/null
@@ -1,466 +0,0 @@
-C-----------------------------------------------------------------------
-C  Subroutine for the following functions
-C    1.  To set and measure a given hkl reflection  IR
-C    2.  To set only a given hkl reflection         SR
-C    3.  To measure only a given hkl reflection     IM
-C    4.  To move the circles to given angles        SA (& ST,SO,SC,SP)
-C    5.  Perform Psi scans                          IP
-C-----------------------------------------------------------------------
-      SUBROUTINE INDMES
-      INCLUDE 'COMDIF'
-      CHARACTER ITF*1,IT(NSIZE)*1,PSNAME*40
-      REAL RW(3,3)
-      NJREF = NREF
-      NATT = 0
-      PSI = 0.0
-C-----------------------------------------------------------------------
-C  Set up for the DE function
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'DE') THEN
-        CALL HKLN (IH,IK,IL,NJREF)
-        CALL ANGET (THETA,OMEGA,CHI,PHI)
-        CALL MESRIT
-        CALL ANGSET (THETA,OMEGA,CHI,PHI,0,ICOL)
-        RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Default values for IH,IK,IL and write the appropriate header
-C-----------------------------------------------------------------------
-      IH = 0
-      IK = 0
-      IL = 0
-      NIREF = 0
-      IF (KI .EQ. 'IR') THEN
-         WRITE (COUT,10000)
-         CALL GWRITE (ITP,' ')
-      ENDIF
-      IF (KI .EQ. 'IE') THEN
-         WRITE (COUT,11000)
-         CALL YESNO ('Y',ANS)
-         IF (ANS .EQ. 'N') THEN
-           KI = ' '
-           RETURN
-         ENDIF
-      ENDIF
-      IF (KI .EQ. 'SR') THEN
-         WRITE (COUT,14000)
-         CALL GWRITE (ITP,' ')
-      ENDIF
-      IF (KI .EQ. 'MS') THEN
-         WRITE (COUT,14100)
-         CALL GWRITE (ITP,' ')
-      ENDIF
-      IF (KI .EQ. 'IM') THEN
-         WRITE (COUT,15000)
-         CALL GWRITE (ITP,' ')
-      ENDIF
-      IF (KI .EQ. 'SA') THEN
-         WRITE (COUT,24000)
-         CALL GWRITE (ITP,'$')
-      ENDIF
-      IF (KI .EQ. 'ST') THEN
-         WRITE (COUT,28000)
-         CALL GWRITE (ITP,'$')
-      ENDIF
-      IF (KI .EQ. 'SO') THEN
-         WRITE (COUT,29000)
-         CALL GWRITE (ITP,'$')
-      ENDIF
-      IF (KI .EQ. 'SC') THEN
-         WRITE (COUT,30000)
-         CALL GWRITE (ITP,'$')
-      ENDIF
-      IF (KI .EQ. 'SP') THEN
-         WRITE (COUT,31000)
-         CALL GWRITE (ITP,'$')
-      ENDIF
-C-----------------------------------------------------------------------
-C  The SA function angle input
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'SA') THEN
-        CALL ANGET (THETA,OMEGA,CHI,PHI)
-        CALL FREEFM (ITR)
-        THETA = RFREE(1)
-        OMEGA = RFREE(2)
-        CHI   = RFREE(3)
-        PHI   = RFREE(4)
-        NJREF = -NJREF
-        CALL SETIT (NJREF)
-        RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  The ST, SO, SC, SP functions angle input
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'ST' .OR. KI .EQ. 'SO' .OR.
-     $    KI .EQ. 'SC' .OR. KI .EQ. 'SP') THEN
-        CALL ANGET (THETA,OMEGA,CHI,PHI)
-        CALL FREEFM (ITR)
-        IF (KI .EQ. 'ST' )THETA = RFREE(1)
-        IF (KI .EQ. 'SO') OMEGA = RFREE(1)
-        IF (KI .EQ. 'SC') CHI   = RFREE(1)
-        IF (KI .EQ. 'SP') PHI   = RFREE(1)
-        NJREF = -NJREF
-        CALL SETIT (NJREF)
-        RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Only the IM, IR, IE and SR functions are left at this point.  Do IM.
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'IM' ) THEN
-        WRITE (COUT,13000)
-        CALL FREEFM (ITR)
-        IH = IFREE(1)
-        IK = IFREE(2)
-        IL = IFREE(3)
-        CALL HKLN (IH,IK,IL, NJREF)
-        CALL ANGET (THETA,OMEGA,CHI,PHI)
-        CALL MESRIT
-        CALL ANGSET (THETA,OMEGA,CHI,PHI,0,ICC)
-        KI = ' '
-        RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Input instruction for the IE function
-C-----------------------------------------------------------------------
-      IOUT = -1
-      IF (KI .EQ. 'IE') THEN
-        CALL SPACEG (IOUT,0)
-        WRITE (COUT,17000)
-      ENDIF
-C-----------------------------------------------------------------------
-C  Input instruction for the SR AND IR functions
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'SR' .OR. KI .EQ. 'MS') THEN
-        WRITE (COUT,18000)
-      ENDIF
-      IF (KI .EQ. 'IR') THEN
-        IF (SGSYMB(1) .EQ. 0.0 .AND. SGSYMB(2) .EQ. 0.0)
-     $      CALL SPACEG (IOUT,0)
-        WRITE (COUT,16000)
-      ENDIF
-C-----------------------------------------------------------------------
-C  Set up the IP instruction and CURVES.DAT
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'IP') THEN
-        WRITE (COUT,33000)
-        IIP = LPT
-        CALL YESNO ('Y',ANS)
-        IF (ANS .EQ. 'Y') THEN
-           IIP = IOUNIT(8)
-           PSNAME = 'CURVES.DAT'
-           CALL IBMFIL (PSNAME,IIP,80,'US',IERR)
-           WRITE (IIP,34000) WAVE
-           DO 100 I = 1,3
-              DO 110 J = 1,3
-                 RW(I,J) = R(I,J)/WAVE
-  110         CONTINUE
-              WRITE (IIP,35000) (RW(I,J),J=1,3)
-  100      CONTINUE
-        ENDIF
-        DPSI = 10
-        PSIMIN = 0.0
-        PSIMAX = 360.0
-        WRITE (COUT,17000)
-      ENDIF
-      CALL GWRITE (ITP,' ')
-C-----------------------------------------------------------------------
-C  Interpret the free-form input for SR, IR and IE
-C-----------------------------------------------------------------------
-  150 WRITE (COUT,32000)
-      CALL ALFNUM (OCHAR)
-      DO 160 J = 1,100
-        I = 101 - J
-        ANS = OCHAR(I:I)
-        IF (ANS .NE. ' ') THEN
-          ITF = '+'
-          IF (ANS .EQ. '-') ITF = '-'
-          IF (ANS .EQ. '-' .OR. ANS .EQ. '+') OCHAR(I:I) = ' '
-          GO TO 170
-        ENDIF
-  160 CONTINUE
-  170 CALL FREEFM (1000)
-      IH = IFREE(1)
-      IK = IFREE(2)
-      IL = IFREE(3)
-C-----------------------------------------------------------------------
-C  SR Function - Set the display and then the reflection
-C  MS Function for the CAD4 only
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'SR' .OR. KI .EQ. 'MS') THEN
-        CALL HKLN (IH,IK,IL,NJREF)
-        ISTAN = 0
-        DPSISV = DPSI
-        DPSI = 180.
-        IPRVAL = 1
-        CALL ANGCAL
-        DPSI = DPSISV
-        IF (IVALID .EQ. 32) THEN
-          KI = ' '
-          RETURN
-        ENDIF
-        IF (IVALID .NE. 0) THEN
-          WRITE (COUT,19000)
-          CALL YESNO ('N',ANS)
-          IF (ANS .EQ. 'N') THEN
-            KI = ' '
-            RETURN
-          ENDIF
-        ENDIF
-        IF (KI .EQ. 'MS') OMEGA = OMEGA + 90.0 - 0.5*THETA
-        IF (ITF .EQ. '-') THETA = 360.0 - THETA
-        CALL SETIT (NJREF)
-        RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Store the h,k,l values for the IR and IE functions
-C-----------------------------------------------------------------------
-      IF (IH .NE. 0 .OR. IK .NE. 0 .OR. IL .NE. 0) THEN
-        ILIST = 0
-        IF (KI .EQ. 'IE') ILIST = 1
-        IPRVAL = 1
-        CALL ANGCAL
-        IF (IVALID .EQ. 32) GO TO 150
-        IF (IVALID .NE. 0) THEN
-          WRITE (COUT,19100)
-          CALL YESNO ('N',ANS)
-          IF (ANS .EQ. 'N') GO TO 150
-        ENDIF
-        CALL DEQHKL (NHKL,ILIST)
-        NIREF = NIREF + 1
-        IOH(NIREF) = IH
-        IOK(NIREF) = IK
-        IOL(NIREF) = IL
-        IT(NIREF) = ITF
-        IF (NIREF .EQ. NSIZE) THEN
-          WRITE (COUT,18500)
-          CALL GWRITE (ITP,' ')
-          GO TO 180
-        ENDIF
-        GO TO 150
-      ENDIF
-C-----------------------------------------------------------------------
-C  IR and IE Functions
-C-----------------------------------------------------------------------
-  180 DO 220 I = 1,NIREF
-        IH = IOH(I)
-        IK = IOK(I)
-        IL = IOL(I)
-        ITF = IT(I)
-        JHKL(1,1) = IH
-        JHKL(2,1) = IK
-        JHKL(3,1) = IL
-        NHKL = 1
-        ILIST = 0
-        IPRVAL = 0
-        IF (KI .EQ. 'IE') CALL DEQHKL (NHKL,ILIST)
-        DO 210 J = 1,NHKL
-          IH = JHKL(1,J)
-          IK = JHKL(2,J)
-          IL = JHKL(3,J)
-          PSI = 0.0
-C-----------------------------------------------------------------------
-C  Set the display
-C-----------------------------------------------------------------------
-          CALL HKLN (IH,IK,IL,NJREF)
-          ISTAN = 0
-C-----------------------------------------------------------------------
-C  Test if psi rotation is required
-C-----------------------------------------------------------------------
-          IF (ABS(DPSI) .GT. 0.0001) THEN
-            TPSI = PSIMIN
-            IF (TPSI .GE. 180.0) TPSI = TPSI - 360.0
-            PSI  = PSIMIN
-          ENDIF
-C-----------------------------------------------------------------------
-C  Calculate angles for given h,k,l and psi.  Why is Psi reversed ???
-C       Psi has to be reversed for the absorp calculation to work
-C       could have something to do with the handedness of the NRC
-C       Picker.
-C-----------------------------------------------------------------------
-  200     PSISAV = PSI
-          PSI = 360.0 - PSI
-          IPRVAL = 0
-          CALL ANGCAL
-          IF (ITF .EQ. '-') THETA = 360.0 - THETA
-          PSI = PSISAV
-C-----------------------------------------------------------------------
-C  If ANGCAL found rotation is possible set the circles and measure
-C-----------------------------------------------------------------------
-          IF (IROT .EQ. 0) THEN
-            CALL MESRIT
-          ELSE
-            WRITE (COUT,25000) IH,IK,IL,PSI
-            CALL GWRITE (ITP,' ')
-          ENDIF
-          CALL KORQ (KQFLAG)
-          IF (KQFLAG .EQ. 1) THEN
-C-----------------------------------------------------------------------
-C  Increment the psi value for rotation
-C-----------------------------------------------------------------------
-            IF (ABS(DPSI) .GT. 0.0001) THEN
-              TPSI = TPSI + DPSI
-              PSI  =  PSI + DPSI
-              IF (PSI .GE. 360.0) PSI = PSI - 360.0
-              IF (TPSI .LE. PSIMAX) GO TO 200
-            ENDIF
-          ENDIF
-C-----------------------------------------------------------------------
-C  Return circles to omega=0 and peak centre before exit
-C-----------------------------------------------------------------------
-          ICC = 0
-          PSI = 0.0
-          SDPSI = DPSI
-          DPSI = 0.0
-          IPRVAL = 0
-          CALL ANGCAL
-          IF (ITF .EQ. '-') THETA = 360.0 - THETA
-          DPSI = SDPSI
-          CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICC)
-          IF (ICC .NE. 0)   THEN
-            WRITE (COUT,26000)
-            CALL GWRITE (ITP,' ')
-            KI = ' '
-            RETURN
-          ENDIF
-C          CALL KORQ (KQFLAG)
-          IF (KQFLAG .NE. 1) THEN
-            KI = ' '
-            RETURN
-          ENDIF
-  210   CONTINUE
-  220 CONTINUE
-      IF (KI .EQ. 'IP') THEN
-        IF (IIP .NE. LPT)
-     $      CALL IBMFIL (PSNAME,-IIP,80,'US',IERR)
-      ENDIF
-      KI = ' '
-      RETURN
-10000 FORMAT (' Intensity Measurements for Individual Reflections')
-11000 FORMAT (' Intensity Measurements for Equivalent Reflections',
-     $        ' (Y) ? ',$)
-13000 FORMAT (' Type h,k,l for label ',$)
-14000 FORMAT (' Set One Reflection')
-14100 FORMAT (' Set a Crystal Face for absorption measurements')
-15000 FORMAT (' Measure the Reflection which is now in the Detector')
-16000 FORMAT (' Type h,k,l and +/- 2Theta sense (+) for up to 50',
-     $        ' reflections. CR = End.')
-17000 FORMAT (' Type h,k,l for up to 50 reflections. CR = End.')
-18000 FORMAT (' Type h,k,l and +/- 2theta sense (+) ',$)
-18500 FORMAT (' No more reflections allowed.')
-19000 FORMAT (' Do you want to set it anyway (N) ? ',$)
-19100 FORMAT (' Do you want to measure it anyway (N) ? ',$)
-20000 FORMAT (3I4,5F8.3)
-24000 FORMAT (' Type 2Theta,Omega,Chi,Phi (0) ',$)
-25000 FORMAT (3I4,' Rotation to Psi',F7.2,' is NOT possible.')
-26000 FORMAT (' Setting Collision')
-28000 FORMAT (' Type 2-Theta ',$)
-29000 FORMAT (' Type Omega ',$)
-30000 FORMAT (' Type Chi ',$)
-31000 FORMAT (' Type Phi ',$)
-32000 FORMAT (' Next h,k,l (End) > ',$)
-33000 FORMAT (' Collect Psi scan data'/
-     $        ' Do you want to write data to CURVES.DAT (Y) ? ')
-34000 FORMAT (1X,F8.5)
-35000 FORMAT (1X,3F10.6)
-      END
-C-----------------------------------------------------------------------
-C  Measure the reflection
-C-----------------------------------------------------------------------
-      SUBROUTINE MESRIT
-      INCLUDE 'COMDIF'
-      ITIME = 1
-      IF (ISCAN .EQ. 3 .OR.  ISCAN .EQ. 4) THEN
-        CALL SAMMES (ITIME,ICC)
-      ELSE
-        CALL MESINT (IROFL,ICC)
-      ENDIF
-      IF (ICC .EQ. 2) THEN
-        WRITE (COUT,10000)
-        CALL GWRITE (ITP,' ')
-        RETURN
-      ENDIF
-      CALL PROFIL
-      IBGRD1 = BGRD1
-      IBGRD2 = BGRD2
-      ISUM   = SUM
-      ICOUNT = COUNT
-      ATT = ATTEN(NATT+1)
-      IF (IPRFLG .EQ. 0) THEN
-        if(FRAC1 .GT. 0.01) THEN
-           PEAK = ATT*(SUM - (0.5*(BGRD1 + BGRD2)/FRAC1)*NPK)
-        ELSE
-           PEAK = 0.
-        END IF
-        IPEAK  = PEAK
-        IF (KI .EQ. 'DE') THEN
-           WRITE (COUT,11000)
-           CALL GWRITE (ITP,' ')
-        ENDIF
-        IF (LPT .NE. ITP)
-     $  WRITE (LPT,12000) IH,IK,IL,THETA,FRAC1,NATT,
-     $                    IBGRD1,ISUM,IBGRD2,PSI,IPEAK,ITIME
-        WRITE (COUT,12000) IH,IK,IL,THETA,FRAC1,NATT,
-     $                    IBGRD1,ISUM,IBGRD2,PSI,IPEAK,ITIME
-        CALL GWRITE (ITP,' ')
-      ELSE
-        FFRAC = FRAC
-        IF (ITYPE .EQ. 7 .OR. ITYPE .EQ. 8) THEN
-          IP = PRESET
-          BB = 1000*(PRESET - IP)
-          FFRAC = BB/IP
-        ENDIF
-        PEAK = ATT*(COUNT - 0.5*(BGRD1 + BGRD2)/FFRAC)
-        IPEAK  = PEAK
-        IF (LPT .NE. ITP)
-     $  WRITE (LPT,12000) IH,IK,IL,THETA,PRESET,NATT,
-     $                    IBGRD1,ICOUNT,IBGRD2,PSI,IPEAK,ITIME
-        WRITE (COUT,12000) IH,IK,IL,THETA,TIME,NATT,
-     $                    IBGRD1,ICOUNT,IBGRD2,PSI,IPEAK,ITIME
-        CALL GWRITE (ITP,' ')
-      ENDIF
-      IF (KI .EQ. 'IP') THEN
-        WRITE (IIP,13000) IH,IK,IL,THETA,OMEGA,CHI,PHI,PSI,
-     $                    IPEAK
-      ENDIF
-      RETURN
-10000 FORMAT (' Scan Collision')
-11000 FORMAT (/,3X, ' h   k   l   2-Theta Time',
-     $            '   Att Bkg  Peak   Bkg   Psi  Inet ')
-12000 FORMAT (3I4,F7.2,F7.3,1X,I1,I5,I7,I5,F7.2,I7,I4)
-13000 FORMAT (3I4,5F8.2,I8)
-      END
-C-----------------------------------------------------------------------
-C  Set the display and the circles
-C-----------------------------------------------------------------------
-      SUBROUTINE SETIT (NJREF)
-      INCLUDE 'COMDIF'
-      IF (NJREF .LT. 0) THEN
-        RH = IH
-        RK = IK
-        RL = IL
-        NJREF = -NJREF
-      ELSE
-        RH = RFREE(1)
-        RK = RFREE(2)
-        RL = RFREE(3)
-      ENDIF
-      IF (ABS(RH - IH) .GT. 0.0001 .OR.
-     $    ABS(RK - IK) .GT. 0.0001 .OR.
-     $    ABS(RL - IL) .GT. 0.0001) THEN
-        WRITE (COUT,10100) RH,RK,RL,THETA,OMEGA,CHI,PHI,PSI
-      ELSE
-        WRITE (COUT,10000) IH,IK,IL,THETA,OMEGA,CHI,PHI,PSI
-      ENDIF
-      CALL GWRITE (ITP,' ')
-      CALL HKLN (IH,IK,IL,NJREF)
-      CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICC)
-      IF (ICC .NE. 0) THEN
-        WRITE (COUT,11000)
-        CALL GWRITE (ITP,' ')
-      ENDIF
-      KI = ' '
-      RETURN
-10000 FORMAT (3I4,5F8.3)
-10100 FORMAT (8F8.3)
-11000 FORMAT (' Setting Collision')
-      END
diff --git a/difrac/keyget.f b/difrac/keyget.f
deleted file mode 100644
index f8e53dee..00000000
--- a/difrac/keyget.f
+++ /dev/null
@@ -1,28 +0,0 @@
-C-----------------------------------------------------------------------
-C  Function KEYSIN -- MS Fortran specific
-C-----------------------------------------------------------------------
-      INTEGER FUNCTION KEYSIN (STRING)
-      CHARACTER  STRING*(*)
-C-----------------------------------------------------------------------
-C   Do some housekeeping
-C-----------------------------------------------------------------------
-      MAX = LEN(STRING)
-      STRING = ' '
-      INDEX = 0
-C-----------------------------------------------------------------------
-C   Loop until we get nothing back
-C-----------------------------------------------------------------------
-10    IC = KEYIN ()
-      IF (IC .NE. 0) THEN
-	INDEX = INDEX + 1
-	STRING(INDEX:INDEX) = CHAR(IC)
-	IF (INDEX .GE. MAX) THEN
-	  KEYSIN = MAX
-	  RETURN
-	ENDIF
-	GO TO 10
-      ENDIF
-      KEYSIN = INDEX
-      RETURN
-      END
-
\ No newline at end of file
diff --git a/difrac/latmod.f b/difrac/latmod.f
deleted file mode 100644
index da56bc8e..00000000
--- a/difrac/latmod.f
+++ /dev/null
@@ -1,37 +0,0 @@
-C-----------------------------------------------------------------------
-C  Get the lattice mode of the conventional cell
-C-----------------------------------------------------------------------
-      SUBROUTINE LATMOD (LAT,MODE)
-      REAL LAT
-      DIMENSION LAT(3,3),M(3)
-      CHARACTER*1 CMODE
-      CALL MATRIX(LAT(1,1),LAT(1,2),LAT(1,3),DET,'DETERM')
-      IDET = ABS(DET) + .1
-      CMODE = ' '
-      IF (IDET .EQ. 1) CMODE = 'P'
-      IF (IDET .EQ. 3) CMODE = 'R'
-      IF (IDET .EQ. 4) CMODE = 'F'
-      IF (IDET .NE. 2) GO TO 130
-        DO 120 I = 1,2
-        M(1) = MOD(I,2)
-          DO 120 J = 1,2
-          M(2) = MOD(J,2)
-            DO 120 K = 1,2
-            M(3) = MOD(K,2)
-            IF (M(1) + M(2) + M(3) .LT. 2) GO TO 120
-              DO 110 L = 1,3
-              ISUM = 0
-                DO 100 N = 1,3
-  100           ISUM = ISUM + M(N)*ABS(LAT(L,N)) + 0.1
-              IF (MOD(ISUM,2) .NE. 0) GO TO 120
-  110         CONTINUE
-            CMODE = 'I'
-            IF (M(1) .EQ. 0) CMODE = 'A'
-            IF (M(2) .EQ. 0) CMODE = 'B'
-            IF (M(3) .EQ. 0) CMODE = 'C'
-            GO TO 130
-  120       CONTINUE
-  130 READ (CMODE,10000) MODE
-      RETURN
-10000 FORMAT (A1)
-      END
diff --git a/difrac/linprf.f b/difrac/linprf.f
deleted file mode 100644
index 2f9e03c5..00000000
--- a/difrac/linprf.f
+++ /dev/null
@@ -1,151 +0,0 @@
-C-----------------------------------------------------------------------
-C  Subroutine to make a line profile using a theta/2theta or omega scan
-C  The reflection is assumed to be in the centre of the detector at the
-C  start of the procedure
-C  There can be a maximum of 100 steps
-C-----------------------------------------------------------------------
-      SUBROUTINE LINPRF
-      INCLUDE 'COMDIF'
-      CHARACTER BEGIN*2
-      DATA ITYP,NPTS,NPTSA,CSTEP,TSTEP/0,10,10,0.05,1000./
-      IF (KI .EQ. 'DE') THEN
-        ISTAN = LPT
-        LPT = ITP  
-      ENDIF
-      WRITE (COUT,10000)
-      CALL YESNO ('Y',ANS)
-      IF (ANS .EQ. 'N') THEN
-        KI = ' '
-        RETURN
-      ENDIF
-      WRITE (COUT,13000)
-      CALL FREEFM (ITR)
-      ITYP = IFREE(1)
-  120 WRITE (COUT,15000) NPTS,NPTSA
-      CALL FREEFM (ITR)
-      IF (IFREE(1) .NE. 0) NPTS  = IFREE(1)
-      IF (IFREE(2) .NE. 0) NPTSA = IFREE(2)
-      WRITE (COUT,15100) CSTEP,TSTEP
-      CALL FREEFM (ITR)
-      IF (RFREE(1) .NE. 0.0) CSTEP  = RFREE(1)
-      IF (RFREE(2) .NE. 0.0) TSTEP = RFREE(2)
-      IF(TSTEP .LE. 0)TSTEP = 1000.
-      IF (TSTEP .LT. 0.01 ) THEN
-        WRITE (COUT,11000)
-        CALL GWRITE (ITP,' ')
-        GO TO 120
-      ENDIF
-C-----------------------------------------------------------------------
-C  Get current angle values
-C-----------------------------------------------------------------------
-      CALL ANGET(THETA,OMEGA,CHI,PHI)
-      DEL = NPTS*CSTEP
-      NPTS = NPTS + NPTSA
-      IF (ITYP .EQ. 0) THEN
-        ANG1 = THETA - DEL
-        ANG2 = OMEGA 
-        START = ANG1
-      ELSE
-        ANG1 = THETA
-        ANG2 = OMEGA - DEL
-        START = ANG2
-      ENDIF
-      NATT = 0
-      IF (KI .NE. 'DE' .AND. NATTEN .GT. 0) THEN
-        WRITE (COUT,17000)
-        CALL FREEFM (ITR)
-        NATT = IFREE(1)
-        IF (NATT .GT. NATTEN) NATT = NATTEN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Offset the scan from the peak centre
-C-----------------------------------------------------------------------
-      CALL ANGSET (ANG1,ANG2,CHI,PHI,NATT,ICOL)
-      IF (ICOL .NE. 0) THEN
-        WRITE (COUT,26000)
-        CALL GWRITE (ITP,' ')
-        KI = ' '
-        RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Loop to count and step through the reflection
-C-----------------------------------------------------------------------
-      CALL SHUTTR (99)
-      DO 240 J = 1,NPTS
-        CALL CCTIME (TSTEP,COUNT)
-        ACOUNT(J) = COUNT
-        IF (ITYP .EQ. 0) ANG1 = ANG1 + CSTEP
-        IF (ITYP .NE. 0) ANG2 = ANG2 + CSTEP
-        CALL ANGSET (ANG1,ANG2,CHI,PHI,NATT,ICOL)
-        IF (ICOL .NE. 0) THEN
-          WRITE (COUT,26000)
-          CALL GWRITE (ITP,' ')
-          CALL SHUTTR (-99)
-          KI = ' '
-          RETURN
-        ENDIF
-  240 CONTINUE
-      CALL SHUTTR (-99)
-      END = ANG1 - CSTEP
-      IF (ITYP .NE. 0) END = ANG2 - CSTEP
-C-----------------------------------------------------------------------
-C  Set the circles back to the peak
-C-----------------------------------------------------------------------
-      NATT = 0
-      CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-      IF (ICOL .NE. 0) THEN
-        WRITE (COUT,26000)
-        CALL GWRITE (ITP,' ')
-        KI = ' '
-        RETURN
-      ENDIF
-      SUM = 0.
-      DO 300 I = 1,NPTS
-        SUM = SUM + ACOUNT(I)
-  300 CONTINUE
-      IF (KI .EQ. 'DE') THEN
-         WRITE (COUT,19000)
-         CALL GWRITE (LPT,' ')
-      ENDIF 
-      WRITE (COUT,20000) IH,IK,IL,THETA,OMEGA,CHI,PHI,SUM
-      CALL GWRITE (LPT,' ')
-      IF (ITYP .EQ. 0) THEN
-         WRITE (COUT,21000)
-      ELSE 
-         WRITE (COUT,22000)
-      ENDIF 
-      CALL GWRITE (LPT,' ')
-      IF (END .GE. 360.) END = END - 360.0
-      WRITE (COUT,23000) START,END,NPTS,TSTEP,CSTEP
-      CALL GWRITE (LPT,' ')
-      WRITE (COUT,24000) (ACOUNT(J),J = 1,NPTS)
-      CALL GWRITE (LPT,' ')
-      IF (KI .EQ. 'DE') THEN
-         WRITE (COUT,25000)
-         CALL GWRITE (ITP,' ')
-      ENDIF
-C-----------------------------------------------------------------------
-C  Call PLTPRF to form a plot of the profile on LPT
-C-----------------------------------------------------------------------
-      BEGIN = KI
-      CALL PLTPRF (ACOUNT,NPTS,BEGIN) 
-      KI = ' '
-      RETURN
-10000 FORMAT (' Plot a Line Profile on the Printer (Y) ? ',$)
-11000 FORMAT (' There is something WRONG. Please try again.')
-13000 FORMAT (' Scan type: Theta/2Theta or Omega, 0 or 1 ',$)
-15000 FORMAT (' Type the no. of pts before & after the peak,'
-     $        ,'(',I2,',',I2,') ',$)
-15100 FORMAT (' Type the step size in degs and the preset/step',
-     $        ' (',F4.2,',',F4.2,') ',$)
-17000 FORMAT (' Which attenuator do you wish to use (0) ? ',$)
-19000 FORMAT (//,4X,'Indices',21X,'2Theta   Omega   Chi     Phi')
-20000 FORMAT (//3I4,' Angle Settings: ',4F8.3,'  Total Counts ',F8.0)
-21000 FORMAT (' Theta/2Theta Scan')
-22000 FORMAT (' Omega Scan')
-23000 FORMAT (1H+,20X,' Begins at',F8.3,' Ends at',F8.3,I4,' Points,',
-     $        ' Time/point ',F8.3,' secs, Step Size ',F5.2)
-24000 FORMAT (10F7.0)
-25000 FORMAT (/' A normalized plot of these measurements looks like'/)
-26000 FORMAT (' Collision')
-      END
diff --git a/difrac/list.dat b/difrac/list.dat
deleted file mode 100644
index 35361d30..00000000
--- a/difrac/list.dat
+++ /dev/null
@@ -1,80 +0,0 @@
-To sock 12 :                   2theta     Omega      Chi       Phi       INT
-To sock 12 :              1     10.00      0.00     90.00    268.00     4428.
-To sock 12 :              2     10.00      0.00    110.00    268.00     4508.
-To sock 12 :              3     10.00      0.00    130.00    268.00     4359.
-To sock 12 :              4     10.00      0.00    150.00    268.00     4519.
-To sock 12 :              5     10.00      0.00    170.00    268.00     4389.
-To sock 12 :              6     10.00      0.00    190.00    268.00     4511.
-To sock 12 :              7     10.00      0.00    210.00    268.00     4458.
-To sock 12 :              8     15.00    360.00     90.00    268.00     2061.
-To sock 12 :              9     15.00    360.00    110.00    268.00     2456.
-To sock 12 :             10     15.00    360.00    110.00    140.00      299.
-To sock 12 :             11     15.00    360.00    130.00    268.00     2063.
-To sock 12 :             12     15.00    360.00    150.00    268.00     2097.
-To sock 12 :             13     15.00    360.00    170.00    268.00     2153.
-To sock 12 :             14     15.00    360.00    190.00    268.00     2174.
-To sock 12 :             15     15.00    360.00    210.00    268.00     2124.
-To sock 12 :             16     20.00    360.00     90.00    268.00     1493.
-To sock 12 :             17     20.00    360.00    110.00    268.00     1476.
-To sock 12 :             18     20.00    360.00    130.00    268.00     1486.
-To sock 12 :             19     20.00    360.00    150.00    268.00     1559.
-To sock 12 :             20     20.00    360.00    170.00    268.00     1470.
-To sock 12 :             21     20.00    360.00    190.00    268.00     1466.
-To sock 12 :             22     20.00    360.00    210.00    268.00     1545.
-To sock 12 :             23     25.00    359.99     90.00    268.00     1162.
-To sock 12 :             24     25.00    360.00    110.00    268.00     1136.
-To sock 12 :             25     25.00    360.00    130.00    268.00     1127.
-To sock 12 :             26     25.00    360.00    150.00    268.00     1223.
-To sock 12 :             27     25.00    360.00    170.00    268.00     1178.
-To sock 12 :             28     25.00    360.00    190.00    268.00     1181.
-To sock 12 :             29     25.00    360.00    210.00    268.00     1187.
-To sock 12 :             30     30.00      0.00     90.00    268.00      916.
-To sock 12 :             31     30.00      0.00    110.00    268.00      952.
-To sock 12 :             32     30.00      0.00    130.00    268.00     1629.
-To sock 12 :             33     30.00      0.00    130.00    182.00      361.
-To sock 12 :             34     30.00      0.00    130.00    132.00       75.
-To sock 12 :             35     30.00      0.00    130.00    124.00      229.
-To sock 12 :             36     30.00      0.00    150.00    268.00     1053.
-To sock 12 :             37     30.00      0.00    170.00    268.00     1086.
-To sock 12 :             38     30.00      0.00    170.00    206.00       59.
-To sock 12 :             39     30.00      0.00    170.00     98.00       35.
-To sock 12 :             40     30.00      0.00    190.00    268.00     1032.
-To sock 12 :   40 new peaks found before the end of the search.
-To sock 12 : 
-To sock 12 :  Peak   1 Coarse Setting     10.000     0.001    90.000   268.000
-To sock 12 :           Approximate         9.309     0.347    91.125   268.500
-To sock 12 :  Alignment Failure on Omega .  NBOT, NTOP   0  78 MAX
-To sock 12 :  Peak   2 Coarse Setting     10.000     0.001   110.000   268.000
-To sock 12 :           Approximate         9.570     0.216   110.500   269.000
-To sock 12 :  Alignment Failure on Omega .  NBOT, NTOP   0  92 MAX
-To sock 12 :  Peak   3 Coarse Setting     10.000     0.001   130.000   268.000
-To sock 12 :  Alignment Failure on Omega .  NBOT, NTOP   0  51 MAX
-To sock 12 :  Peak   4 Coarse Setting     10.000     0.001   150.000   268.000
-To sock 12 :           Approximate         9.500     0.251   153.188   267.563
-To sock 12 :  Alignment Failure on Omega .  NBOT, NTOP   0  82 MAX
-To sock 12 :  Peak   5 Coarse Setting     10.000     0.001   170.000   268.000
-To sock 12 :  Peak   6 Coarse Setting     10.000     0.001   190.000   268.000
-To sock 12 :           Approximate         9.230     0.386   190.750   268.563
-To sock 12 :  Alignment Failure on Omega .  NBOT, NTOP   0 101 MAX
-To sock 12 :  Peak   7 Coarse Setting     10.000     0.001   210.000   268.000
-To sock 12 :           Approximate         9.430     0.286   210.063   270.500
-To sock 12 :  Alignment Failure on Omega .  NBOT, NTOP   0  92 MAX
-To sock 12 :  Peak   8 Coarse Setting     15.000   359.998    90.000   268.000
-To sock 12 :  Peak   9 Coarse Setting     15.000   359.998   110.000   268.000
-To sock 12 :  Peak  10 Coarse Setting     15.000   359.998   110.000   140.000
-To sock 12 :           Approximate        16.809   359.094   111.438   141.375
-To sock 12 :           Final Values       16.378   359.259   110.066   141.375      1167
-To sock 12 :  Peak  11 Coarse Setting     15.000   359.998   130.000   268.000
-To sock 12 :  Peak  12 Coarse Setting     15.000   359.998   150.000   268.000
-To sock 12 :  Peak  13 Coarse Setting     15.000   359.998   170.000   268.000
-To sock 12 :  Peak  14 Coarse Setting     15.000   359.998   190.000   268.000
-To sock 12 :  Peak  15 Coarse Setting     15.000   359.998   210.000   268.000
-To sock 12 :  Peak  16 Coarse Setting     20.000   359.997    90.000   268.000
-To sock 12 :  Peak  17 Coarse Setting     20.000   359.997   110.000   268.000
-To sock 12 :  Peak  18 Coarse Setting     20.000   359.997   130.000   268.000
-To sock 12 :  Peak  19 Coarse Setting     20.000   359.997   150.000   268.000
-To sock 12 :  Peak  20 Coarse Setting     20.000   359.997   170.000   268.000
-To sock 12 :  Peak  21 Coarse Setting     20.000   359.997   190.000   268.000
-To sock 12 :  Peak  22 Coarse Setting     20.000   359.997   210.000   268.000
-To sock 12 :  Peak  23 Coarse Setting     25.002   359.995    90.000   268.000
-To sock 12 :  Peak  24 Coarse Setting     25.000   359.996   110.000   268.000
diff --git a/difrac/lister.f b/difrac/lister.f
deleted file mode 100644
index e293ecb7..00000000
--- a/difrac/lister.f
+++ /dev/null
@@ -1,257 +0,0 @@
-C-----------------------------------------------------------------------
-C  Use one of the transformation matrices from CREDUC to make a new
-C  orientation matrix (RNEW) and list the old and new indices of 
-C  peaks found by the OC command.
-C-----------------------------------------------------------------------
-      SUBROUTINE LISTER
-      INCLUDE 'COMDIF'
-      DIMENSION RNEW(3,3),IRNEW(3,3),IROLD(3,3),RSAVE(3,3),
-     $          THETAS(NSIZE),OMEGAS(NSIZE),CHIS(NSIZE),PHIS(NSIZE),
-     $          ICNTS(NSIZE),ROLDI(3,3),RNEWI(3,3),XA(3),HOLD(3),
-     $          HNEW(3),APSAVE(3),COSAVE(3),SISAVE(3),ANG(3),
-     $          IBH(10),IBK(10),IBL(10),BTHETA(10),BOMEGA(10),
-     $          BCHI(10),BPHI(10)
-      CHARACTER FLAG*1,OLDNEW*1,STRING*14,FSTRIN*10,CMODE(7)*1,
-     $          CSYMB(7)*8
-      EQUIVALENCE (ACOUNT(        1),THETAS(1)),
-     $            (ACOUNT(  NSIZE+1),OMEGAS(1)),
-     $            (ACOUNT(2*NSIZE+1),CHIS(1)),  
-     $            (ACOUNT(3*NSIZE+1),PHIS(1)),
-     $            (ACOUNT(4*NSIZE+1),ICNTS(1))
-      EQUIVALENCE (IHK(1),IBH(1)),(NREFB(1),IBK(1)),(ILA(1),IBL(1)),
-     $            (BCOUNT(1),BTHETA(1)),(BBGR1(1),BOMEGA(1)),
-     $            (BBGR2(1),BCHI(1)),(BTIME(1),BPHI(1))
-      DATA CMODE/'P','A','B','C','I','F','R'/,
-     $     CSYMB/'-1','2/m','m m m','4/m','6/m','-3','m 3'/
-C-----------------------------------------------------------------------
-C  Save the old cell and R matrix in case of trouble
-C  Extract the cell params from the matrix from BLIND and put in place
-C  for CREDUC to use.
-C-----------------------------------------------------------------------
-      DO 100 I = 1,3
-        APSAVE(I) = AP(I)
-        COSAVE(I) = CANG(I)
-        SISAVE(I) = SANG(I)
-        DO 100 J = 1,3
-          RSAVE(I,J) = R(I,J)
-          RNEW(J,I) = BLINDR(I,J)
-  100 CONTINUE
-      CALL MATRIX (RNEW,BLINDR,ROLDI,ROLDI,'MATMUL')
-      CALL MATRIX (ROLDI,RNEW,RNEW,RNEW,'INVERT')
-      CALL PARAMS (RNEW,AP,ANG)
-      DO 105 I = 1,3
-        CANG(I) = COS(ANG(I)/DEG)
-        SANG(I) = SIN(ANG(I)/DEG)
-        DO 105 J = 1,3
-          BLINDR(I,J) = BLINDR(I,J)*WAVE
-          R(I,J) = BLINDR(I,J)
-  105 CONTINUE
-C-----------------------------------------------------------------------
-C  Reduce the cell obtained by BLIND
-C-----------------------------------------------------------------------
-      WRITE (COUT,9000)
-      CALL GWRITE (ITP,' ')
-      CALL CREDUC (KI)
-C-----------------------------------------------------------------------
-C  If there are two or more transformations from CREDUC, find out 
-C  which to use 
-C-----------------------------------------------------------------------
-      INEW = 1
-      IF (NTMATS .GT. 1) THEN
-        WRITE (COUT,10000)
-        CALL FREEFM (ITR)
-        INEW = IFREE(1)
-        IF (INEW .EQ. 0) INEW = 1
-      ENDIF
-      DO 110 I = 1,3
-        DO 110 J = 1,3
-          ROLD(I,J) = TMATS(I,J,INEW)
-  110 CONTINUE
-      ISYSF = IFSYS(INEW)
-      IMODE = IFMODE(INEW)
-C-----------------------------------------------------------------------
-C  Get the old and new indices needed to generate the new orientation
-C  matrix and cell.  Make sure the old indices (ROLD) are integers.
-C-----------------------------------------------------------------------
-      DO 130 IT = 1,6
-        DO 120 I = 1,3
-          DO 120 J = 1,3
-            IRNEW(I,J) = 0
-            IF (I .EQ. J) IRNEW(I,J) = IT
-            ROUND = 0.00001
-            IF (ROLD(I,J) .LT. 0.0) ROUND = -0.00001
-            IROLD(I,J) = IT*ROLD(I,J) + ROUND
-            IF (ABS(IT*ROLD(I,J) - IROLD(I,J)) .GT. 0.001) GO TO 130
-  120   CONTINUE
-        GO TO 140
-  130 CONTINUE 
-C-----------------------------------------------------------------------
-C  IRNEW now has the new index values to use for reorientation
-C  Calculate the angles needed with the old indices and matrix and
-C  then calculate the new R matrix with ORMAT3
-C-----------------------------------------------------------------------
-  140 DO 150 I = 1,3
-        IH = IROLD(I,1)
-        IK = IROLD(I,2)
-        IL = IROLD(I,3)
-        NN = -1
-        IPRVAL = 0
-        CALL ANGCAL
-        IHK(I)    = IRNEW(I,1)
-        NREFB(I)  = IRNEW(I,2)
-        ILA(I)    = IRNEW(I,3)
-        BCOUNT(I) = THETA
-        BBGR1(I)  = OMEGA
-        BBGR2(I)  = CHI
-        BTIME(I)  = PHI
-  150 CONTINUE
-      KI = 'OP'
-      CALL ORMAT3
-      DO 160 I = 1,3
-        DO 160 J = 1,3
-          RNEW(I,J) = R(I,J)
-  160 CONTINUE
-      CALL MATRIX (BLINDR,ROLDI,RJUNK,RJUNK,'INVERT')
-      CALL MATRIX (RNEW,RNEWI,RJUNK,RJUNK,'INVERT')
-C-----------------------------------------------------------------------
-C  Read the angles found by OC and calculate the old and new indices
-C-----------------------------------------------------------------------
-      CALL ANGRW (0,5,NREFS,140,0)
-      WRITE (LPT,13000)
-      NINBLK = 0
-      NBLOCK = 250
-      DO 200 N = 1,NREFS
-        ST = 2.0*SIN(0.5*THETAS(N)/DEG)
-        CO = COS(OMEGAS(N)/DEG)
-        SO = SIN(OMEGAS(N)/DEG)
-        CC = COS(CHIS(N)/DEG) 
-        SC = SIN(CHIS(N)/DEG)
-        CP = COS(PHIS(N)/DEG)
-        SP = SIN(PHIS(N)/DEG)
-        XA(1) = ST*(CO*CC*CP - SO*SP)
-        XA(2) = ST*(CO*CC*SP + SO*CP)
-        XA(3) = ST*CO*SC
-        CALL MATRIX (ROLDI,XA,HOLD,RJUNK,'MVMULT')
-        CALL MATRIX (RNEWI,XA,HNEW,RJUNK,'MVMULT')
-        FLAG = ' '
-        IF (ICNTS(N) .LE. 0) FLAG = '*'
-        WRITE (LPT,11000) N,HOLD,THETAS(N),OMEGAS(N),CHIS(N),PHIS(N),
-     $                    HNEW,FLAG
-        NINBLK = NINBLK + 1
-        IF (HNEW(1) .GE. 0.0) THEN
-          IHNEW = HNEW(1) + 0.5
-        ELSE
-          IHNEW = HNEW(1) - 0.5
-        ENDIF
-        IF (HNEW(2) .GE. 0.0) THEN
-          IKNEW = HNEW(2) + 0.5
-        ELSE
-          IKNEW = HNEW(2) - 0.5
-        ENDIF
-        IF (HNEW(3) .GE. 0.0) THEN
-          ILNEW = HNEW(3) + 0.5
-        ELSE
-          ILNEW = HNEW(3) - 0.5
-        ENDIF
-        I = 0
-        IF (ICNTS(N) .LE. 0) I = 1
-        IBH(NINBLK) = IHNEW
-        IBK(NINBLK) = IKNEW
-        IBL(NINBLK) = ILNEW
-        BTHETA(NINBLK) = THETAS(N)
-        BOMEGA(NINBLK) = OMEGAS(N)
-        BCHI(NINBLK)   = CHIS(N)
-        BPHI(NINBLK)   = PHIS(N)
-        BPSI(NINBLK)   = I
-        IF (NINBLK .EQ. 10) THEN
-          WRITE (ISD,REC=NBLOCK) 
-     $           IBH,IBK,IBL,BTHETA,BOMEGA,BCHI,BPHI,BPSI,NINBLK
-          NINBLK = 0
-          NBLOCK = NBLOCK + 1
-        ENDIF
-  200 CONTINUE
-      IF (NINBLK .GT. 0) THEN
-        WRITE (ISD,REC=NBLOCK) 
-     $         IBH,IBK,IBL,BTHETA,BOMEGA,BCHI,BPHI,BPSI,NINBLK
-        NBLOCK = NBLOCK + 1
-      ENDIF
-      NINBLK = 0
-      WRITE (ISD,REC=NBLOCK) (NINBLK,I = 1,81)
-      OLDNEW = 'N'
-      WRITE (COUT,14000)
-      CALL YESNO ('N',OLDNEW)
-      IF (OLDNEW .EQ. 'Y') THEN
-        KI = 'OP'
-        CALL LSORMT
-        ST = 2.0*SIN(0.5*THEMAX/DEG)
-        IHMAX = 1.0 + ST/(APS(1)*SANGS(2)*SANG(3)*WAVE)
-        IKMAX = 1.0 + ST/(APS(2)*SANGS(3)*SANG(1)*WAVE)
-        ILMAX = 1.0 + ST/(APS(3)*SANGS(1)*SANG(2)*WAVE)
-        CALL SYSANG (AP,SANG,CANG,ISYS,KI)
-        IF (ISYS .EQ.  1) STRING = 'P -1'
-        IF (ISYS .EQ.  8) STRING = 'P 2/m 1 1'
-        IF (ISYS .EQ.  9) STRING = 'P 2/m'
-        IF (ISYS .EQ. 10) STRING = 'P 1 1 2/m'
-        IF (ISYS .EQ.  3) STRING = 'P m m m'
-        IF (ISYS .EQ.  4) STRING = 'P 4/m'
-        IF (ISYS .EQ.  5) STRING = 'P 6/m or P -3'
-        IF (ISYS .EQ.  6) STRING = 'R -3 R'
-        IF (ISYS .EQ.  7) STRING = 'P m 3'
-        FSTRIN = CMODE(IMODE)//' '
-        FSTRIN(3:10) = CSYMB(ISYSF)
-        IF (ISYSF .EQ. 6) ISYSF = 5
-        WRITE (COUT,15000) FSTRIN,STRING
-15000 FORMAT (' Space-group choices are as follows :--'/
-     $        ' 1. The safest space-group based on cell-reduction ', A/
-     $        ' 2. The safest space-group based on cell lengths   ', A/
-     $        ' 3. Any other space-group.'/
-     $        ' Which do you want (1) ',$)
-16000 FORMAT (' Type the space-group symbol ',$)
-        CALL FREEFM (ITR)
-        IF (IFREE(1) .LT. 2) THEN
-          STRING = FSTRIN//' '
-          ISYS = ISYSF
-        ELSE IF (IFREE(1) .EQ. 2) THEN
-          IF (STRING(6:9) .EQ. ' or ') THEN
-            WRITE (COUT,16100) STRING
-16100 FORMAT (' The space-group symbol CANNOT be both ',A/
-     $        ' Please type the correct symbol ',$)
-            CALL ALFNUM (STRING)
-          ENDIF
-        ELSE IF (IFREE(1) .EQ. 3) THEN
-          WRITE (COUT,16000)
-          CALL ALFNUM (STRING)
-        ENDIF
-        DO 205 I = 3,10
-          IF (STRING(I:I) .GE. 'a' .AND. STRING(I:I) .LE. 'z')
-     $        STRING(I:I) = CHAR(ICHAR(STRING(I:I)) - 32)
-  205   CONTINUE
-        READ (STRING,'(10A1)') SGSYMB
-        CALL SPACEG (-2,1)
-        CALL SINMAT
-        IND(1) = IHO(1)
-        IND(2) = IKO(1)
-        IND(3) = ILO(1)
-        NREF = 1
-        NSET = 1
-        NMSEG = 1
-        NBLOCK = 20
-        CALL WRBAS
-      ELSE
-        DO 210 I = 1,3
-          AP(I) = APSAVE(I)
-          CANG(I) = COSAVE(I)
-          SANG(I) = SISAVE(I)
-          DO 210 J = 1,3
-            R(I,J) = RSAVE(I,J)
-  210   CONTINUE
-      ENDIF
-      RETURN
- 9000 FORMAT (/,'      Cell Reduction Step'/'%')
-10000 FORMAT (' Which transformation do you wish to use (1) ? ',$)
-11000 FORMAT (I4,2X,3F6.2,3X,4F7.2,3X,3F6.2,1X,A)
-13000 FORMAT ('   N    hold  kold  lold    2theta  omega    chi    phi',
-     $           '     hnew  knew  lnew')
-14000 FORMAT (/' Do you want to replace the old matrix with this',
-     $        ' new matrix (N) ? ',$)
-      END
diff --git a/difrac/lotem.f b/difrac/lotem.f
deleted file mode 100644
index 81dcfd1d..00000000
--- a/difrac/lotem.f
+++ /dev/null
@@ -1,24 +0,0 @@
-C-----------------------------------------------------------------------  
-C  Set the delay time to wait after the LN Dewar has been filled to
-C  allow the temperature to reach equilibrium.
-C-----------------------------------------------------------------------  
-      SUBROUTINE LOTEM
-      INCLUDE 'COMDIF'
-      EQUIVALENCE (SINABS(1),CUT(2))
-      WRITE (COUT,10000)
-      CALL YESNO ('Y',ANS)
-      ILN = 0
-      IF (ANS .EQ. 'Y') THEN
-        ILN = 1
-        WRITE (COUT,11000)
-        CALL FREEFM (ITR)
-        DELAY = RFREE(1)
-        IF (DELAY .LT. 0.1) DELAY = 20.0
-      ENDIF
-      KI = ' '
-      RETURN
-10000 FORMAT (' Is this a Low-temperature Experiment (Y) ? ',$)
-11000 FORMAT (' Type the delay in minutes, between the end of',
-     $        ' filling the LN Dewar',/,
-     $        ' and the restart of data collection (20) ',$)
-      END
diff --git a/difrac/lsormt.f b/difrac/lsormt.f
deleted file mode 100644
index 71d4dd7f..00000000
--- a/difrac/lsormt.f
+++ /dev/null
@@ -1,547 +0,0 @@
-C-----------------------------------------------------------------------
-C       Linear Least Squares Derivation of Orientation Matrix
-C
-C  The routine is called from the terminal with the MM command, or
-C  internally from re-orientation during data-collection with OZ.
-C
-C  The data is obtained from ORIENT.DA beginning at record 250.
-C  There are 10 reflections per record 
-C     h    k    l  2theta omega  chi   phi       in the arrays 
-C    IHK,NREFB,ILA,BCOUNT,BBGR1,BBGR2,BTIME,BPSI 
-C  The 81st variable NBL is the number of reflections in the record.
-C  If NBL = 10 the block is full, if not it is the last record.
-C
-C-----------------------------------------------------------------------
-      SUBROUTINE LSORMT
-      INCLUDE 'COMDIF'
-      DIMENSION RHX(3,3),RHH(3,3),IHI(3),XOBS(3),XCNEW(3),XCOLD(3),
-     $          RHHI(3,3),DEL(3),RNEW(3,3),
-     $          IBH(10),IBK(10),IBL(10),BTHETA(10),BOMEGA(10),BCHI(10),
-     $          BPHI(10)
-      CHARACTER ANS0*1
-      MARK = 0
-      AVEANG = 0.0
-      DO 100 I = 1,3
-        DO 100 J = 1,3
-          ROLD(I,J) = R(I,J)/WAVE
-  100 CONTINUE
-      ANS0 = 'N'
-      DO 110 I = 1,3
-        DO 110 J = 1,3
-          RHX(I,J) = 0.0
-          RHH(I,J) = 0.0
-  110 CONTINUE
-      IF (IORNT .EQ. 1) THEN
-        IHSV = IH
-        IKSV = IK
-        ILSV = IL
-        NBSV = NB
-        GO TO 200
-      ENDIF
-      IF (KI .EQ. 'OP') GO TO 200
-      WRITE (COUT,10000)
-      CALL GWRITE (ITP,' ')
-      WRITE (COUT,13000) WAVE
-      CALL FREEFM (ITR)
-      IF (RFREE(1) .NE. 0.0) WAVE = RFREE(1)
-C-----------------------------------------------------------------------
-C  Read from the terminal or from the Idata file
-C-----------------------------------------------------------------------
-      WRITE (COUT,15000)
-      CALL YESNO ('N',ANS)
-      IF (ANS .EQ. 'Y') THEN
-        CALL TERMRD
-      ENDIF
-C-----------------------------------------------------------------------
-C  Print the current MM data if wanted
-C-----------------------------------------------------------------------
-  115 WRITE (COUT,16000)
-      CALL FREEFM (ITR)
-      IOPSHN = IFREE(1)
-      IF (IOPSHN .EQ. 0)  IOPSHN = 3
-      IF (IOPSHN .EQ. 4) THEN
-        KI = ' '
-        RETURN
-      ENDIF
-      IF (IOPSHN .EQ. 1) LLIST = LPT
-      IF (IOPSHN .EQ. 2) THEN
-        LLIST = IOUNIT(10)
-        CALL IBMFIL ('MMDATA.DA',LLIST,80,'SU',IERR)
-        WRITE (LLIST,16100) WAVE
-      ENDIF
-      IF (IOPSHN .EQ. 1 .OR. IOPSHN .EQ. 2) THEN
-        NBLOKO = 250
-  120   READ (ISD,REC=NBLOKO) IBH,IBK,IBL,BTHETA,BOMEGA,BCHI,BPHI,
-     $                        BPSI,NBL
-        NBLOKO = NBLOKO + 1
-        IF (NBL .NE. 0) THEN
-          DO 130 I = 1,NBL
-            IDR = BPSI(I) + 0.1
-            WRITE (LLIST,17000) IBH(I),IBK(I),IBL(I),BTHETA(I),
-     $                          BOMEGA(I),BCHI(I),BPHI(I),IDR
-  130     CONTINUE
-          GO TO 120
-        ENDIF
-        IF (IOPSHN .EQ. 2) CALL IBMFIL ('MMDATA.DA',-LLIST,80,'SU',IERR)
-        GO TO 115
-      ENDIF
-C-----------------------------------------------------------------------
-C  Routine to Delete(1) or Restore(0) reflections from LS
-C-----------------------------------------------------------------------
-      WRITE (COUT,19000)
-      CALL GWRITE (ITP,' ')
-  140 WRITE (COUT,29000)
-      CALL FREEFM (ITR)
-      JHD = IFREE(1)
-      KD  = IFREE(2)
-      LD  = IFREE(3)
-      IDR = IFREE(4)
-C-----------------------------------------------------------------------
-C  Find the reflection to be changed
-C-----------------------------------------------------------------------
-      IF (JHD .NE. 0 .OR. KD .NE. 0 .OR. LD .NE. 0) THEN
-        NBLOKO = 250
-  150   READ (ISD,REC=NBLOKO) IBH,IBK,IBL,BTHETA,BOMEGA,BCHI,
-     $                        BPHI,BPSI,NBL
-        NBLOKO = NBLOKO + 1
-        IF (NBL .EQ. 0) GO TO 140
-C-----------------------------------------------------------------------
-C  Find the reflection, change its status, write back and get the next
-C-----------------------------------------------------------------------
-        DO 160 NB = 1,NBL
-          IF (IBH(NB) .EQ. JHD .AND. IBK(NB) .EQ. KD .AND.
-     $        IBL(NB) .EQ. LD) THEN
-            BPSI(NB) = IDR
-            NBLOKO = NBLOKO-1
-            WRITE (ISD,REC=NBLOKO) IBH,IBK,IBL,BTHETA,BOMEGA,BCHI,
-     $                             BPHI,BPSI,NBL
-            NBLOKO = NBLOKO + 1
-            GO TO 140
-          ENDIF
-  160   CONTINUE
-        GO TO 150
-      ENDIF
-C-----------------------------------------------------------------------
-C  Insert new reflections
-C-----------------------------------------------------------------------
-      WRITE (COUT,23000)
-      CALL YESNO ('N',ANS)
-      IF (ANS .EQ. 'Y') THEN
-        NBLOKO = 250
-  170   READ (ISD,REC=NBLOKO) (JUNK,I = 1,80),NBL
-        NBLOKO = NBLOKO + 1
-        IF (NBL .NE. 0) GO TO 170
-        NBLOKO = NBLOKO - 1
-        WRITE (COUT,24000) NBLOKO
-        CALL GWRITE (ITP,' ')
-        CALL TERMRD
-      ENDIF
-C-----------------------------------------------------------------------
-C  Get the zero values of omega and chi and possibly use them
-C-----------------------------------------------------------------------
-      CALL WCZERO (ZOMEGA,ZCHI)
-      WRITE (COUT,24100)
-      CALL YESNO ('Y',ANS0)
-      IF (ANS0 .EQ. 'Y') THEN
-        DOMEGA = DOMEGA + ZOMEGA
-        DCHI   = DCHI   + ZCHI
-        WRITE (COUT,24200) DOMEGA,DCHI
-        CALL GWRITE (ITP,' ')
-      ENDIF
-C-----------------------------------------------------------------------
-C  Start of the Least Squares Procedure
-C  Data is read from the file twice
-C    MARK =  0  when making and solving the normal equations
-C    MARK = -1 when forming the deltas for the e.s.d.'s
-C-----------------------------------------------------------------------
-  200 NRF = 0
-      NBLOKO = 250
-      IF (MARK .EQ. -1) WRITE (LPT,25000)
-  210 READ (ISD,REC=NBLOKO) IBH,IBK,IBL,BTHETA,BOMEGA,BCHI,
-     $                      BPHI,BPSI,NBL
-      NBLOKO = NBLOKO + 1
-      IF (NBL .NE. 0) THEN
-        DO 250 NB = 1,NBL
-          IF (BPSI(NB) .EQ. 0.0) THEN
-            NRF = NRF + 1
-            IHI(1) = IBH(NB)
-            IHI(2) = IBK(NB)
-            IHI(3) = IBL(NB)
-            TH = 2.0*SIN(0.5*BTHETA(NB)/DEG)/WAVE
-            IF (ANS0 .EQ. 'Y') THEN
-              BOMEGA(NB) = BOMEGA(NB) - ZOMEGA
-              BCHI(NB)   = BCHI(NB)   - ZCHI
-            ENDIF
-            CCH = COS(BCHI(NB)/DEG)
-            SCH = SIN(BCHI(NB)/DEG)
-            COM = COS(BOMEGA(NB)/DEG)
-            SOM = SIN(BOMEGA(NB)/DEG)
-            CPH = COS((BPHI(NB))/DEG)
-            SPH = SIN((BPHI(NB))/DEG)
-            XOBS(1) = TH*(CCH*CPH*COM - SOM*SPH)
-            XOBS(2) = TH*(CCH*SPH*COM + SOM*CPH)
-            XOBS(3) = TH*SCH*COM
-C-----------------------------------------------------------------------
-C  MARK =  0  Form the RHH and RHX elements
-C  MARK = -1  For IORNT = 1, i.e. re-orientation, 
-C             form the calcd values of X with the old and new matrices; 
-C             then form the differences and hence the angular deviation.
-C             For IORNT = 0, i.e. normal MM,
-C             form the calcd value of X at the observed phi,
-C             and then the differences between the obs and calcd X and
-C             then the angular deviation.
-C-----------------------------------------------------------------------
-            IF (MARK .EQ. 0) THEN
-              DO 220 I = 1,3
-                DO 220 J = 1,3
-                  RHH(I,J) = RHH(I,J) + IHI(I)*IHI(J)
-                  RHX(I,J) = RHX(I,J) + IHI(I)*XOBS(J)
-  220         CONTINUE
-            ELSE
-              IH = IHI(1)
-              IK = IHI(2)
-              IL = IHI(3)
-              DO 230 I = 1,3
-                XCOLD(I) = 0.0
-                XCNEW(I) = 0.0
-                DO 230 J = 1,3
-                  XCNEW(I) = XCNEW(I) + RNEW(I,J)*IHI(J)
-                  XCOLD(I) = XCOLD(I) + ROLD(I,J)*IHI(J)
-  230         CONTINUE
-              PHI = BPHI(NB)
-              CALL ANGPHI (XCNEW)
-C-----------------------------------------------------------------------
-C  Work out the sums for the average angular deviation 
-C  Keep or re-orientation, keep the new R matrix if AVEANG .gt. REOTOL
-C-----------------------------------------------------------------------
-              TOP = 0.0
-              BOT = 0.0
-              DO 240 I = 1,3
-                IF (IORNT .EQ. 1) THEN 
-                  DELTA = XCOLD(I) - XCNEW(I)
-                ELSE
-                  DELTA = XOBS(I) - XCNEW(I)
-                ENDIF
-                DELTA = DELTA*DELTA
-                DEL(I) = DEL(I) + DELTA
-                TOP = TOP + DELTA
-                BOT = BOT + XCNEW(I)*XCNEW(I)  
-  240         CONTINUE
-              ANGLE = DEG*RATAN2(SQRT(TOP),SQRT(BOT))
-              AVEANG = AVEANG + ANGLE
-C-----------------------------------------------------------------------
-C  Write the results for this reflection
-C-----------------------------------------------------------------------
-              OMG = OMEGA
-              IF (OMG .GT. 359.995) OMG = 0.0
-              WRITE (LPT,26000)             
-     $               IHI,BTHETA(NB),BOMEGA(NB),BCHI(NB),BPHI(NB),
-     $               THETA,OMG,CHI,PHI,ANGLE
-            ENDIF
-          ENDIF
-  250   CONTINUE
-        IF (ANS0 .EQ. 'Y' .AND. MARK .EQ. -1) THEN
-          NBLOKO = NBLOKO - 1
-          WRITE (ISD,REC=NBLOKO) IBH,IBK,IBL,BTHETA,BOMEGA,BCHI,
-     $                           BPHI,BPSI,NBL
-          NBLOKO = NBLOKO + 1
-        ENDIF
-        GO TO 210
-      ENDIF
-C-----------------------------------------------------------------------
-C  Solve for R matrix elements
-C-----------------------------------------------------------------------
-      IF (MARK .EQ. 0) THEN
-        CALL MATRIX (RHH,RHHI,RHHI,RHHI,'INVERT')
-        DO 270 I = 1,3
-          DO 260 J = 1,3
-            R(I,J) = 0.0
-            DO 260 KK = 1,3
-              R(I,J) = R(I,J) + RHHI(J,KK)*RHX(KK,I)
-  260     CONTINUE
-  270   CONTINUE
-        DET = R(1,1)*(R(2,2)*R(3,3) - R(2,3)*R(3,2)) -
-     $        R(1,2)*(R(2,1)*R(3,3) - R(2,3)*R(3,1)) +
-     $        R(1,3)*(R(2,1)*R(3,2) - R(2,2)*R(3,1))
-        IF (NRC*DET .GT. 0) THEN
-          WRITE (LPT,27000) NRF
-        ELSE
-          WRITE (LPT,28000) NRF
-        ENDIF
-C-----------------------------------------------------------------------
-C  Extract the real and reciprocal cell parameters
-C-----------------------------------------------------------------------
-        CALL GETPAR
-C-----------------------------------------------------------------------
-C  Clear the esds array
-C-----------------------------------------------------------------------
-        DO 290 J = 1,3
-          DEL(J) = 0.0
-  290   CONTINUE
-C-----------------------------------------------------------------------
-C  Store new R matrix times Wavelength
-C-----------------------------------------------------------------------
-        DO 300 I = 1,3
-          DO 300 J = 1,3
-            RNEW(I,J) = R(I,J)
-            R(I,J) = R(I,J)*WAVE
-  300   CONTINUE
-        MARK = MARK - 1
-        GO TO 200
-      ENDIF
-C-----------------------------------------------------------------------
-C  S.D.'s of the R matrix elements from the diagonal elements of the 
-C  inverted (RHHI) matrix.
-C  Print the matrix and its e.s.ds
-C-----------------------------------------------------------------------
-      DO 310 I = 1,3
-        DO 310 J = 1,3
-          SR(I,J) = SQRT(RHHI(J,J)*DEL(I)/(NRF - 3))
-  310 CONTINUE
-        WRITE (LPT,28100) ((RNEW(I,J),J=1,3),(SR(I,J),J=1,3),I = 1,3)
-C-----------------------------------------------------------------------
-C  Call CELLSD to find the s.d.'s of the cell parameters
-C-----------------------------------------------------------------------
-      CALL CELLSD
-      IF (IORNT .EQ. 1) THEN
-        AVEANG = AVEANG/NRF
-        IH = IHSV
-        IK = IKSV
-        IL = ILSV
-        NB = NBSV
-        IF (AVEANG .LT. REOTOL) THEN
-          WRITE (COUT,30000) AVEANG
-          CALL GWRITE (ITP,' ')
-          WRITE (LPT,30000) AVEANG
-          DO 320 I = 1,3
-            DO 320 J = 1,3
-              R(I,J) = ROLD(I,J)*WAVE
-  320     CONTINUE
-          RETURN
-        ELSE
-          WRITE (COUT,31000) AVEANG
-          CALL GWRITE (ITP,' ')
-          WRITE (LPT,31000) AVEANG
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  Calculate the SINABS matrix
-C-----------------------------------------------------------------------
-      IF (KI .NE. 'MM' .AND. KI .NE. 'OP') THEN
-        ISYS = 1
-        CALL SINMAT
-      ENDIF
-      RETURN
-10000 FORMAT (20X,' Least Squares Orientation Matrix')
-13000 FORMAT (' Reflection data can be on file or from the terminal.'/ 
-     $        ' Wavelength (',F7.5,') ',$)
-14000 FORMAT (/10X,' Reflections in the Alignment List')
-15000 FORMAT (' Read the data from the terminal (N) ? ',$)
-16000 FORMAT (' The following options are available :--'/
-     $        ' 1. List the MM data on the printer for editting, or'/
-     $        ' 2. Write the MM data to the ASCII file MMDATA.DA, or'/
-     $        ' 3. Proceed to the next step, or'/
-     $        ' 4. Exit from MM.'/
-     $        ' Which do you want (3) ? ',$)
-16100 FORMAT (' MM data from DIFRAC'/F10.6)
-17000 FORMAT (3I4,4F8.3,I3)
-19000 FORMAT (' Reflections may be deleted or restored to the list',
-     $        ' by typing :--',/,
-     $        ' h,k,l,1 for Delete  or h,k,l,0 for Restore (End)')
-23000 FORMAT (' Do you wish to insert reflections (N) ? ',$)
-24100 FORMAT (' Do you want to include these zero values (Y) ? ',$)
-24200 FORMAT (' The new zeroes for Omega and Chi are',2F7.3)
-24000 FORMAT (' First non-written record: ',I4)
-25000 FORMAT (/,22X,'Observed',22X,'Calculated',10X,'Angular'/
-     $        '   h   k   l 2Theta  Omega    Chi    Phi  ',
-     $                    ' 2Theta  Omega    Chi    Phi ',
-     $                    'Deviation')
-26000 FORMAT (3I4,4F7.2,2X,4F7.2,F8.3)
-26100 FORMAT (I4,2X,3I4,4F8.3)
-27000 FORMAT (/' Right-handed Orientation Matrix from ',I4,
-     $        ' Reflections')
-28000 FORMAT (/' Left-handed Orientation Matrix from ',I4,
-     $        ' Reflections')
-28100 FORMAT (/9X,'Orientation Matrix',30X,'E.S.Ds'/(3F12.8,6X,3F12.8))
-29000 FORMAT (' > ',$)
-30000 FORMAT (' The angular deviation is',F6.3,'.  The old matrix will',
-     $        ' be retained.')
-31000 FORMAT (' The angular deviation is',F6.3,'.  The new matrix will',
-     $        ' be used.')
-      END
-C-----------------------------------------------------------------------
-C  Routine to find the zeroes of omega and chi from the alignment data
-C  ZOMEGA is the average value of omega;
-C  ZCHI   is half the average value of chi for pairs of +++/--- reflns 
-C-----------------------------------------------------------------------
-      SUBROUTINE WCZERO (ZOMEGA,ZCHI)
-      INCLUDE 'COMDIF'
-      DIMENSION IBH(10),IBK(10),IBL(10),BTHETA(10),BOMEGA(10),BCHI(10),
-     $          BPHI(10)
-C      EQUIVALENCE (IHK(1),IBH(1)),(NREFB(1),IBK(1)),(ILA(1),IBL(1)),
-C     $            (BCOUNT(1),BTHETA(1)),(BBGR1(1),BOMEGA(1)),
-C     $            (BBGR2(1),BCHI(1)),(BTIME(1),BPHI(1))
-      SUMOME = 0.0
-      SUMCHI = 0.0
-      NOMEGA = 0
-      NCHI   = 0
-      NBLOKO = 250
-      IH1 = 0
-      IK1 = 0
-      IL1 = 0
-      CHI1 = 999.0
-  100 READ (ISD,REC=NBLOKO) IBH,IBK,IBL,BTHETA,BOMEGA,BCHI,BPHI,
-     $                      BPSI,NBL
-      IF (NBL .NE. 0) THEN
-        DO 110 NB = 1,NBL
-          IF (BPSI(NB) .EQ. 0.0) THEN
-            WOMEGA = BOMEGA(NB)
-            IF (WOMEGA .GT. 180.0) WOMEGA = WOMEGA - 360.0
-            SUMOME = SUMOME + WOMEGA
-            NOMEGA = NOMEGA + 1
-            IH2 = IBH(NB)
-            IK2 = IBK(NB)
-            IL2 = IBL(NB)
-            CHI2 = BCHI(NB)
-            IF (IH1 .EQ. -IH2 .AND. 
-     $          IK1 .EQ. -IK2 .AND. 
-     $          IL1 .EQ. -IL2) THEN
-              CHI12 = CHI1 + CHI2
-              IF (CHI12 .GT. 350.0) CHI12 = CHI12 - 360.0
-              IF (CHI12 .GT. 350.0) CHI12 = CHI12 - 360.0
-              SUMCHI = SUMCHI + CHI12
-              NCHI = NCHI + 1
-            ENDIF
-            IH1 = IH2
-            IK1 = IK2
-            IL1 = IL2
-            CHI1 = CHI2
-          ENDIF
-  110   CONTINUE
-        NBLOKO = NBLOKO + 1
-        GO TO 100
-      ENDIF
-      ZOMEGA = SUMOME/NOMEGA
-      ZCHI = 0.0
-      IF (NCHI .NE. 0) ZCHI = 0.5*SUMCHI/NCHI
-      WRITE (COUT,10000) ZOMEGA,NOMEGA,ZCHI,NCHI
-      CALL GWRITE (ITP,' ')
-      WRITE (LPT,10000) ZOMEGA,NOMEGA,ZCHI,NCHI
-      RETURN
-10000 FORMAT (' Omega(0) is',F7.3,' from',I4,' reflections.'/
-     $        ' Chi(0)   is',F7.3,' from',I4,' +/- pairs.')
-      END
-C-----------------------------------------------------------------------
-C  Get reflection angle input from the terminal
-C-----------------------------------------------------------------------
-      SUBROUTINE TERMRD
-      INCLUDE 'COMDIF'
-      DIMENSION IBH(10),IBK(10),IBL(10),BTHETA(10),BOMEGA(10),BCHI(10),
-     $          BPHI(10)
-C      EQUIVALENCE (IHK(1),IBH(1)),(NREFB(1),IBK(1)),(ILA(1),IBL(1)),
-C     $            (BCOUNT(1),BTHETA(1)),(BBGR1(1),BOMEGA(1)),
-C     $            (BBGR2(1),BCHI(1)),(BTIME(1),BPHI(1))
-      NBLOKO = 250
-      WRITE (COUT,10000)
-      CALL GWRITE (ITP,' ')
-  100 NBL = 0
-      DO 110 I = 1,10
-        WRITE (COUT,11000)
-        CALL FREEFM (ITR)
-        IH = IFREE(1)
-        IK = IFREE(2)
-        IL = IFREE(3)
-        IF (IH .EQ. 0 .AND. IK .EQ. 0 .AND. IL .EQ. 0) GO TO 120
-        IBH(I) = IH
-        IBK(I) = IK
-        IBL(I) = IL
-        BTHETA(I)  = RFREE(4)
-        BOMEGA(I)  = RFREE(5)
-        BCHI(I)    = RFREE(6)
-        BPHI(I)    = RFREE(7)
-        BPSI(I)    = 0.
-        NBL = NBL + 1
-  110 CONTINUE
-  120 WRITE (ISD,REC=NBLOKO) IBH,IBK,IBL,BTHETA,BOMEGA,BCHI,
-     $                       BPHI,BPSI,NBL
-      NBLOKO = NBLOKO + 1
-      IF (NBL .EQ. 10) GO TO 100
-      NBL = 0
-      WRITE (ISD,REC=NBLOKO) IBH,IBK,IBL,BTHETA,BOMEGA,BCHI,
-     $                       BPHI,BPSI,NBL
-      RETURN
-10000 FORMAT (' Type h,k,l,2theta,omega,chi,phi for each refln. (End)')
-11000 FORMAT (' > ',$)
-      END
-C-----------------------------------------------------------------------
-C  Calculate chi and omega for a given phi value
-C-----------------------------------------------------------------------
-      SUBROUTINE ANGPHI (XC)
-      INCLUDE 'COMDIF'
-      DIMENSION  XC(3)
-      CP = COS(PHI/DEG)
-      SP = SIN(PHI/DEG)
-      TOPC = XC(3)
-      BOTC = CP*XC(1) + SP*XC(2)
-      CHI = DEG*RATAN2(TOPC,BOTC)
-      TOPO = CP*XC(2) - SP*XC(1)
-      IF (CHI .EQ. 0.0) THEN
-        OMEGA = 0.0
-      ELSE
-        BOTO = XC(3)/SIN(CHI/DEG)
-        OMEGA = DEG*RATAN2(TOPO,BOTO)
-      ENDIF
-      TH = 0.5*WAVE*SQRT(XC(1)*XC(1) + XC(2)*XC(2) + XC(3)*XC(3))
-      THETA = 2.0*DEG*ATAN(TH/SQRT(1.0 - TH*TH))
-      TH = 2.0*TH/WAVE
-      CC = COS(CHI/DEG)
-      SC = SIN(CHI/DEG)
-      CO = COS(OMEGA/DEG)
-      SO = SIN(OMEGA/DEG)
-      XC(1) = TH*(CC*CP*CO - SO*SP)
-      XC(2) = TH*(CC*SP*CO + SO*CP)
-      XC(3) = TH*SC*CO
-      CALL MOD360 (CHI)
-      CALL MOD360 (OMEGA)
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  Get around stupid Microsoft compiler problems
-C-----------------------------------------------------------------------
-      FUNCTION RATAN2 (TOP,BOT)                                        
-      RA = 57.2958
-      IF (BOT .EQ. 0) THEN
-        X = 90.0/RA
-        IF (TOP .LT. 0.0) X = 270.0/RA
-      ELSE
-        X = ATAN2(TOP,BOT)
-      ENDIF
-      RATAN2 = X
-      RETURN
-      END
-
-C-----------------------------------------------------------------------
-C  Extract the real and reciprocal cell parameters
-C-----------------------------------------------------------------------
-      SUBROUTINE GETPAR
-      INCLUDE 'COMDIF'
-      DIMENSION RT(3,3)
-      DO 100 I = 1,3
-        DO 100 J = 1,3
-          RT(I,J) = R(J,I)
-  100 CONTINUE
-      CALL MATRIX (RT,R,GI,GI,'MATMUL')
-C-----------------------------------------------------------------------
-C  Use CANGS array for reciprocal angles
-C-----------------------------------------------------------------------
-      CALL PARAMS (GI,APS,CANGS)
-C-----------------------------------------------------------------------
-C  Use RT array for metric tensor G
-C-----------------------------------------------------------------------
-      CALL MATRIX (GI,RT,RT,RT,'INVERT')
-C-----------------------------------------------------------------------
-C  Use CANG array for real angles
-C-----------------------------------------------------------------------
-      CALL PARAMS (RT,AP,CANG)
-      RETURN
-      END
diff --git a/difrac/matrix.f b/difrac/matrix.f
deleted file mode 100644
index f6475bbf..00000000
--- a/difrac/matrix.f
+++ /dev/null
@@ -1,234 +0,0 @@
-C-----------------------------------------------------------------------
-C  Library of matrix operations for crystal geometry
-C-----------------------------------------------------------------------
-      SUBROUTINE MATRIX(A,B,C,D,IWHAT)
-      COMMON /IOUASS/ IOUNIT(12)
-      CHARACTER COUT*132
-      COMMON /IOUASC/ COUT(20)
-      CHARACTER*6 IWHAT
-      DIMENSION A(3,3),B(3,3),C(3,3),D(3,3),E(3,3),V(3)
-      DATA RA/57.29578/
-      IF (IWHAT .EQ. 'INVERT') GO TO 100
-      IF (IWHAT .EQ. 'MATMUL') GO TO 120
-      IF (IWHAT .EQ. 'MATVEC') GO TO 150
-      IF (IWHAT .EQ. 'VECMAT') GO TO 180
-      IF (IWHAT .EQ. 'SCALPR') GO TO 210
-      IF (IWHAT .EQ. 'LENGTH') GO TO 230
-      IF (IWHAT .EQ. 'ORTHOG') GO TO 250
-      IF (IWHAT .EQ. 'DETERM') GO TO 270
-      IF (IWHAT .EQ. 'MVMULT') GO TO 290
-      IF (IWHAT .EQ. 'VMMULT') GO TO 320
-      IF (IWHAT .EQ. 'TRNSPS') GO TO 340
-      IF (IWHAT .EQ. 'SYMOPR') GO TO 370
-      IF (IWHAT .EQ. 'VECPRD') GO TO 400
-      IF (IWHAT .EQ. 'COPRIM') GO TO 410
-      IF (IWHAT .EQ. 'INTRCH') GO TO 440
-      IF (IWHAT .EQ. 'SUMVEC') GO TO 460
-      IF (IWHAT .EQ. 'DIFVEC') GO TO 480
-      IF (IWHAT .EQ. 'COPVEC') GO TO 500
-      ITP = IOUNIT(6)
-      WRITE (COUT,10000) IWHAT
-      CALL GWRITE (ITP,' ')
-      STOP
-C-----------------------------------------------------------------------
-C  Invert 3x3 matrix A, put the result in B
-C-----------------------------------------------------------------------
-  100 E(1,1) =   A(2,2)*A(3,3) - A(2,3)*A(3,2)
-      E(2,1) = -(A(2,1)*A(3,3) - A(2,3)*A(3,1))
-      E(3,1) =   A(2,1)*A(3,2) - A(2,2)*A(3,1)
-      E(1,2) = -(A(1,2)*A(3,3) - A(1,3)*A(3,2))
-      E(2,2) =   A(1,1)*A(3,3) - A(1,3)*A(3,1)
-      E(3,2) = -(A(1,1)*A(3,2) - A(1,2)*A(3,1))
-      E(1,3) =   A(1,2)*A(2,3) - A(1,3)*A(2,2)
-      E(2,3) = -(A(1,1)*A(2,3) - A(1,3)*A(2,1))
-      E(3,3) =   A(1,1)*A(2,2) - A(1,2)*A(2,1)
-      DMAT   =   A(1,1)*E(1,1) + A(1,2)*E(2,1) + A(1,3)*E(3,1)
-        DO 115 I=1,3
-          DO 110 J = 1,3
-  110     B(I,J) = E(I,J)/DMAT
-  115     CONTINUE
-      GO TO 520
-C-----------------------------------------------------------------------
-C  Multiply 3x3 matrices A and B, store result in C
-C-----------------------------------------------------------------------
-  120   DO 135 I = 1,3
-          DO 132 J = 1,3
-          E(I,J) = 0.0
-            DO 130 K = 1,3
-  130       E(I,J) = E(I,J) + A(I,K)*B(K,J)
-  132       CONTINUE
-  135       CONTINUE
-        DO 145 I = 1,3
-          DO 140 J = 1,3
-  140     C(I,J) = E(I,J)
-  145   CONTINUE
-      GO TO 520
-C-----------------------------------------------------------------------
-C  Multiply matrix A by vector B, store dir. cosines of result in C
-C-----------------------------------------------------------------------
-  150   DO 165 I = 1,3
-        V(I) = 0.
-          DO 160 J = 1,3
-  160     V(I) = V(I) + A(I,J)*B(J,1)
-  165   CONTINUE
-      IF(V(1)**2 + V(2)**2 +V(3)**2 .GT. 0) THEN
-         VMOD = SQRT(V(1)**2 + V(2)**2 + V(3)**2)
-      ELSE
-         VMOD = 1
-      ENDIF
-        DO 170 I = 1,3
-  170   C(I,1) = V(I)/VMOD
-      GO TO 520
-C-----------------------------------------------------------------------
-C  Multiply vector A by matrix B, store dir. cosines of result in C
-C-----------------------------------------------------------------------
-  180   DO 195 I = 1,3
-        V(I) = 0.
-          DO 190 J = 1,3
-  190     V(I) = V(I) + B(J,I)*A(J,1)
-  195   CONTINUE
-      VMOD = SQRT(V(1)**2 + V(2)**2 + V(3)**2)
-        DO 200 I = 1,3
-  200   C(I,1) = V(I)/VMOD
-      GO TO 520
-C-----------------------------------------------------------------------
-C  Scalar product of vectors A and B
-C-----------------------------------------------------------------------
-  210 S = 0
-        DO 220 I = 1,3
-  220   S = S + A(I,1)*B(I,1)
-      C(1,1) = S
-      GO TO 520
-C-----------------------------------------------------------------------
-C  length of vector B when A is the metric matrix
-C-----------------------------------------------------------------------
-  230   DO 245 I = 1,3
-        V(I) = 0.
-          DO 240 J = 1,3
-  240     V(I) = V(I) + A(I,J)*B(J,1)
-  245   CONTINUE
-      C(1,1) = SQRT(V(1)**2 + V(2)**2 + V(3)**2)
-      GO TO 520
-C-----------------------------------------------------------------------
-C  Get the metric matrix C corresponding to cell edges A & angles B
-C-----------------------------------------------------------------------
-  250 COSGAS = (COS(B(1,1)/RA)*COS(B(2,1)/RA) - COS(B(3,1)/RA))
-      COSGAS = COSGAS/(SIN(B(1,1)/RA)*SIN(B(2,1)/RA))
-      SINGAS = SQRT(1.0 - COSGAS**2)
-      E(1,1) =  A(1,1)*SIN(B(2,1)/RA)*SINGAS
-      E(1,2) =  0
-      E(1,3) =  0
-      E(2,1) = -A(1,1)*SIN(B(2,1)/RA)*COSGAS
-      E(2,2) =  A(2,1)*SIN(B(1,1)/RA)
-      E(2,3) =  0
-      E(3,1) =  A(1,1)*COS(B(2,1)/RA)
-      E(3,2) =  A(2,1)*COS(B(1,1)/RA)
-      E(3,3) =  A(3,1)
-        DO 265 I = 1,3
-          DO 260 J = 1,3
-  260     C(I,J) = E(I,J)
-  265     CONTINUE
-      GO TO 520
-C-----------------------------------------------------------------------
-C  Calculate the determinant D of the vectors A,B,C
-C-----------------------------------------------------------------------
-  270 DET = 0.
-        DO 280 I = 1,3
-        J = I + 1
-        IF (J .EQ. 4) J = 1
-        K = 6 - I - J
-  280   DET = DET + A(I,1)*(B(J,1)*C(K,1) - B(K,1)*C(J,1))
-      D(1,1) = DET
-      GO TO 520
-C-----------------------------------------------------------------------
-C  Multiply matrix A by vector B, store result in C
-C-----------------------------------------------------------------------
-  290   DO 305 I = 1,3
-        E(I,1) = 0
-          DO 300 J = 1,3
-  300     E(I,1) = E(I,1) + A(I,J)*B(J,1)
-  305   CONTINUE
-        DO 310 I = 1,3
-  310   C(I,1) = E(I,1)
-      GO TO 520
-C-----------------------------------------------------------------------
-C  Multiply vector A by matrix B, store result in C
-C-----------------------------------------------------------------------
-  320   DO 335 I = 1,3
-        C(I,1) = 0.
-          DO 330 J = 1,3
-  330     C(I,1) = C(I,1) + A(J,1)*B(J,I)
-  335   CONTINUE
-      GO TO 520
-C-----------------------------------------------------------------------
-Ctranspose matrix A and put it in B
-C-----------------------------------------------------------------------
-  340   DO 355 I = 1,3
-          DO 350 J = 1,3
-  350     E(I,J) = A(J,I)
-  355   CONTINUE
-        DO 365 I = 1,3
-          DO 360 J = 1,3
-  360     B(I,J) = E(I,J)
-  365   CONTINUE
-      GO TO 520
-C-----------------------------------------------------------------------
-C  Get the symmetry-equivalent of an atom
-C-----------------------------------------------------------------------
-  370   DO 390 I = 1,3
-        C(I,1) = 0.
-          DO 380 J = 1,3
-  380     C(I,1) = C(I,1) + A(I,J)*B(J,1)
-        J = 4
-  390   C(I,1) = C(I,1) + A(I,J)/12.
-      GO TO 520
-C-----------------------------------------------------------------------
-C  Vector product C = A x B
-C-----------------------------------------------------------------------
-  400 C(1,1) = A(2,1)*B(3,1) - A(3,1)*B(2,1)
-      C(2,1) = A(3,1)*B(1,1) - A(1,1)*B(3,1)
-      C(3,1) = A(1,1)*B(2,1) - A(2,1)*B(1,1)
-      GO TO 520
-C-----------------------------------------------------------------------
-C  Make coprime integers (the smallest non-zero integer will be 1)
-C-----------------------------------------------------------------------
-  410 SMALL = 2.
-        DO 420 I = 1,3
-        IF (ABS(A(I,1)) .LE. 0.1 .OR. ABS(A(I,1)) .GE. SMALL) GO TO 420
-        SMALL = ABS(A(I,1))
-  420   CONTINUE
-        DO 430 I = 1,3
-        INDEX = A(I,1)/SMALL + 0.5
-        IF (A(I,1) .LT. 0.) INDEX = A(I,1)/SMALL - 0.5
-  430   B(I,1) = INDEX
-      GO TO 520
-C-----------------------------------------------------------------------
-C  Interchange two vectors A and B
-C-----------------------------------------------------------------------
-  440   DO 450 I = 1,3
-        SAVE = A(I,1)
-        A(I,1) = B(I,1)
-  450   B(I,1) = SAVE
-      GO TO 520
-C-----------------------------------------------------------------------
-C  Sum of vectors C = A + B
-C-----------------------------------------------------------------------
-  460   DO 470 I = 1,3
-  470   C(I,1) = A(I,1) + B(I,1)
-      GO TO 520
-C-----------------------------------------------------------------------
-C  Vector difference C = A - B
-C-----------------------------------------------------------------------
-  480   DO 490 I = 1,3
-  490   C(I,1) = A(I,1) - B(I,1)
-      GO TO 520
-C-----------------------------------------------------------------------
-C  Vector copy B = A
-C-----------------------------------------------------------------------
-  500   DO 510 I = 1,3
-  510   B(I,1) = A(I,1)
-      GO TO 520
-  520 RETURN
-10000 FORMAT(' Matrix operation ',A6,' is not programmed')
-      END
-
diff --git a/difrac/mesint.f b/difrac/mesint.f
deleted file mode 100644
index 5ddf9799..00000000
--- a/difrac/mesint.f
+++ /dev/null
@@ -1,407 +0,0 @@
-C-----------------------------------------------------------------------
-C  Subroutine to measure a reflection by :--
-C    Theta/2Theta scan  (ITYPE=0)     or     Omega scan (ITYPE=1)
-C
-C    IROFL = 1 Count-rate Overflow;     ICC = 2 indicates a Collision
-C
-C  Modified for doing step scans at TRICS. 
-C  IO to COUT instead LPT for SICS 
-C  Mark Koennecke, November 1999
-C-----------------------------------------------------------------------
-      SUBROUTINE MESINT (IROFL,ICC)
-      INCLUDE 'COMDIF'
-      INTEGER IHTAGS(4), IRUPT
-      REAL SPRESET
-      ICPSMX = 45000
-      IF (DFMODL .EQ. 'CAD4') ICPSMX = 25000
-C-----------------------------------------------------------------------
-C Reset the liquid nitrogen loading flag
-C-----------------------------------------------------------------------
-      IFILN = 0
-      SPRESET = PRESET
-  100 STIME = PRESET
-      ICS = 0
-      IROFL = 0
-      NATT = 0
-      IWARN = 0
-      ISIGN = 1
-      IF (THETA .LT. 0.0 .OR. THETA .GT. 180.0) ISIGN = -1
-C---- Modified MK: there is no alpha1 alpha2 separation with neutrons
-C      D12 = BS*ABS(TAN(0.5*THETA/DEG))
-      D12 = 0.
-C---- end of modification
-      TTIME = 0.20*PRESET
-  110 CALL SHUTTR (1)
-      IF (NATTEN .GT. 0) THEN
-	CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-	IF (ICOL .NE. 0) THEN
-	  ICC = 2
-	  CALL FILLN2 (IFILN,NFLG)
-	  IF (NFLG .EQ. 1) GO TO 100
-          PRESET = SPRESET
-	  RETURN
-	ENDIF
-  120   CALL CCTIME (TTIME,COUNT)
-	IF (COUNT/TTIME .GE. ICPSMX) THEN
-	  NATT = NATT + 1
-	  CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-	  IF (NATT .LT. NATTEN) GO TO 120
-	ENDIF
-      ENDIF
-      IF ((ITYPE+1)/2 .EQ. 4) STIME = QTIME
-      IF (ITYPE .GE. 4) GO TO 160
-      IF (ITYPE .EQ. 0 .OR. ITYPE .EQ. 1) THEN
-	DEL1 = AS + D12 + CS
-	ANG1 = THETA - ISIGN*AS
-	ANG2 = OMEGA
-      ELSE
-	DEL1 = AS + D12/2 + CS
-	ANG1 = THETA + ISIGN*D12/3
-	ANG2 = OMEGA - ISIGN*(AS + D12/6)
-      ENDIF
-C-----------------------------------------------------------------------
-C  Offset to low angle side of reflection
-C-----------------------------------------------------------------------
-      ICC = 0
-  130 CALL ANGSET (ANG1,ANG2,CHI,PHI,NATT,ICOL)
-      IF (ICOL .NE. 0) THEN
-	ICC = 2
-	CALL FILLN2 (IFILN,NFLG)
-	IF (NFLG .EQ. 1) GO TO 100
-          PRESET = SPRESET
-	RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Measure the low angle background for BGDTIM
-C-----------------------------------------------------------------------
-      BGDTIM = FRAC*PRESET
-      CALL CCTIME (BGDTIM,BGRD1)
-C-----------------------------------------------------------------------
-C  Do the scan:
-C         ITYPE        Type of scan  0 -- theta/2-theta  b-p-b
-C                                    1 -- theta/2-theta  precision
-C                                    2 -- omega          b-p-b
-C                                    3 -- omega          precision
-C         DEL1         Range of the scan (2-theta for types 0 & 1)
-C         ACOUNT       Array of profile points with sum in ACOUNT(1)
-C         TIME         Return value of scan time in secs
-C         SPEED        Scan speed in degs/min.
-C         NPPTS        No of points in returned profile
-C         IERR         Error code 0 -- OK
-C                                 1 -- Ratemeter overflow
-C                                 2 -- Really bad!
-C-----------------------------------------------------------------------
-      SDEL1 = ISIGN*DEL1
-      CALL TSCAN (ITYPE,SDEL1,ACOUNT(1),PRESET,STEP,NPPTS,IERR)
-      CALL KORQ(IRUPT)
-      IF(IRUPT .NE. 1)THEN
-           WRITE(COUT,11000)
-           CALL GWRITE(ITP,' ')
-           PRESET = SPRESET
-           RETURN
-      ENDIF
-      MAX = 1
-      IEND = 10*NSIZE
-      DO 135 I = 2,NPPTS
-	IF (MAX .LT. ACOUNT(I)) MAX = ACOUNT(I)
-	ACOUNT(IEND - I) = ACOUNT(I)
-  135 CONTINUE
-C-----------------------------------------------------------------------
-C  For the CAD-4 at -ve 2theta the profile is delivered backwards.
-C-----------------------------------------------------------------------
-      IF (DFMODL .EQ. 'CAD4' .AND. 
-     $    (THETA .LT. 0.0 .OR. THETA .GT. 180.0)) THEN
-	J = IEND - NPPTS - 2
-	DO 138 I = 2,NPPTS
-	  ACOUNT(I) = ACOUNT(J + I)
-  138   CONTINUE
-      ENDIF
-C      WRITE (COUT,99999) MAX,NPPTS,TIME
-C      CALL GWRITE (ITP,' ')
-C99999 FORMAT (I6,I4,F8.3)
-C-----------------------------------------------------------------------
-C  For the CAD-4 at high 2theta and chi near 90 there can be no profile,
-C  because the interface detects a potential collision.
-C  Then TIME = 0, and the profile analysis should not be done IDEL < 10
-C-----------------------------------------------------------------------
-      IF (DFMODL .EQ. 'CAD4') THEN
-	RTIME = ABS(60*DEL1/SPEED)        
-	IF (TIME .LT. RTIME/3) THEN
-	  WRITE (LPT,12200) IH,IK,IL
-	  WRITE (COUT,12200) IH,IK,IL
-	  CALL GWRITE (ITP,' ')
-	  IDEL = 5
-	  GO TO 150
-	ENDIF
-      ENDIF
-      IF (MAX*NPPTS/PRESET .GT. ICPSMX) IROFL = 1
-      IF (IERR .GE. 2) THEN
-	 WRITE (LPT,16000) IH,IK,IL
-	 WRITE (COUT,16000) IH,IK,IL
-	 CALL GWRITE (ITP,' ')
-	 CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-	 GO TO 110
-      ENDIF
-C-----------------------------------------------------------------------
-C  Test for low angle count too high near direct beam
-C-----------------------------------------------------------------------
-      IF (IROFL .NE. 0 .AND. PRESET .LT. 10) THEN
-	WRITE (COUT,12000) IH,IK,IL
-        CALL GWRITE(ITP,' ')
-	GO TO 150
-      ENDIF
-C-----------------------------------------------------------------------
-C  Plot the last reflection if SR2 is ON
-C  For details of the profile plotting see PROFIL
-C-----------------------------------------------------------------------
-      ISTEP = 1000.0/DEL1
-      IDEL = NPPTS + 1
-C-----------------------------------------------------------------------
-C  Test for -ve 2theta scan problem with SIERAY 145D
-C-----------------------------------------------------------------------
-      IF (IDEL .LT. 10) THEN
-	WRITE (COUT,12100) IH,IK,IL
-	CALL GWRITE (ITP,' ')
-	GO TO 150
-      ENDIF
-C-----------------------------------------------------------------------
-C  Possibly draw the raw data profile
-C-----------------------------------------------------------------------
-      CALL RSW (0,I)
-      IF (I .EQ. 1) THEN
-	DO 140 I = 1,4
-	   IHTAGS(I) = 0
-  140   CONTINUE
-	IHTAGS(2) = AS*STEPDG
-	CALL PTPREP (NPPTS,ACOUNT(2),IHTAGS)
-      ENDIF
-C-----------------------------------------------------------------------
-C  Check that the scan time is reasonably close to the calculated value
-C-----------------------------------------------------------------------
-      COUNT = ACOUNT(1)
-      IF (ICOL .NE. 0) THEN
-	ICS = ICS + 1
-	IF (ICS .LT. 2) GO TO 130
-	ICC = 2
-	CALL FILLN2 (IFILN,NFLG)
-	IF (NFLG .EQ. 1) GO TO 100
-        PRESET = SPRESET
-	RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Change the attenuator if necessary and try again.
-C-----------------------------------------------------------------------
-      IF (IROFL .NE. 0) THEN
-	IF (NATTEN .GT. 0 .AND. NATT .LT. NATTEN) THEN
-	  NATT = NATT + 1
-	  GO TO 130
-	ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  The scan is OK.
-C  Correct the low angle background to the time FRAC*TIME, measure the
-C  high angle background and then return.
-C-----------------------------------------------------------------------
-      I = BGRD1*PRESET*FRAC/BGDTIM + 0.5
-      BGRD1 = I
-      BGDTIM = PRESET*FRAC
-      CALL CCTIME (BGDTIM,BGRD2)
-      IF (BGRD1 + BGRD2 .GT. 4.0*COUNT) THEN
-         WRITE (COUT,11000) IH,IK,IL
-         CALL GWRITE(ITP,' ')
-      ENDIF
-      CALL FILLN2 (IFILN,NFLG)
-      IF (NFLG .EQ. 1) GO TO 100
-      PRESET = SPRESET
-      RETURN
-C-----------------------------------------------------------------------
-C  Return if there are counting problems
-C-----------------------------------------------------------------------
-  150 COUNT = 2
-      SUM = 2
-      BGRD1 = 1
-      BGRD2 = 1
-      FRAC = 0.1
-      PRESET = SPRESET
-      NATT = 0
-      ICC = 0
-      IROFL = 0
-      IWARN = 1
-      CALL FILLN2 (IFILN,NFLG)
-      IF (NFLG .EQ. 1) GO TO 100
-      RETURN
-C-----------------------------------------------------------------------
-C  Set up peak top counting for appropriate angles
-C-----------------------------------------------------------------------
-  160 IF (ITYPE .EQ. 4 .OR. ITYPE .EQ. 6) THEN
-	ANG1 = THETA - AS
-	ANG2 = OMEGA
-	ANG3 = THETA + BS*TAN(0.5*THETA/DEG) + CS
-	ANG4 = OMEGA
-	PRESET= STIME
-      ELSE
-	ANG1 = THETA
-	ANG2 = OMEGA - AS
-	ANG3 = THETA
-	ANG4 = OMEGA + CS
-      ENDIF
-  170 CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-      IF (ICOL .NE. 0) THEN
-	WRITE (COUT,13000) IH,IK,IL
-        CALL GWRITE(ITP,' ')
-	GO TO 150
-      ENDIF
-C-----------------------------------------------------------------------
-C  Count at peak for time TIME
-C-----------------------------------------------------------------------
-  420 CALL CCTIME (PRESET,COUNT)
-C      C = COUNT/PRESET
-      IF (C .GE. ICPSMX .AND. NATTEN .GT. 0 .AND. NATT .LT. NATTEN) THEN
-	NATT = NATT + 1
-	GO TO 170
-      ENDIF
-C-----------------------------------------------------------------------
-C  Drive to high angle background position and count
-C-----------------------------------------------------------------------
-      CALL ANGSET (ANG3,ANG4,CHI,PHI,NATT,ICOL)
-      IF (ICOL .NE. 0) THEN
-	WRITE (COUT,13000) IH,IK,IL
-        CALL GWRITE(ITP,' ')
-	GO TO 150
-      ENDIF
-C-----------------------------------------------------------------------
-C  Measure the backgrounds
-C-----------------------------------------------------------------------
-      IF (ITYPE .EQ. 5 .OR. ITYPE .EQ. 6) THEN
-	BGDTIM = FRAC*PRESET
-	CALL CCTIME (BGDTIM,BGRD2)
-	CALL ANGSET (ANG1,ANG2,CHI,PHI,NATT,ICOL)
-	CALL CCTIME (BGDTIM,BGRD1)
-	IF (BGRD1 + BGRD2 .GT. 4.0*COUNT) THEN
-           WRITE (COUT,11000) IH,IK,IL
-           CALL GWRITE(LPT,' ')
-        ENDIF
-	CALL FILLN2 (IFILN,NFLG)
-        PRESET = SPRESET
-	IF (NFLG .EQ. 1) GO TO 100
-	RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Sample background on high side
-C-----------------------------------------------------------------------
-      PRESET = STIME*0.5
-      CALL CCTIME (PRESET,BGRD2)
-C-----------------------------------------------------------------------
-C  Evaluate rough Peak/Background ratio and Time required to
-C   accumulate a preset number FRAC of counts on the peak.
-C-----------------------------------------------------------------------
-      RRAT = COUNT/(2*BGRD2 + 1.0)
-      IF (RRAT .LT. 1.05) RRAT = 1.05
-      RTIM = FRAC*STIME/(COUNT + 1.0)
-C-----------------------------------------------------------------------
-C  Optimum time splitting and required total time
-C-----------------------------------------------------------------------
-      OPT = (RRAT - SQRT(RRAT))/(RRAT - 1.0)
-      TOT = RTIM/OPT
-      IF (TOT .GT. TMAX) TOT = TMAX
-      IBCT = (TOT*(1.0 - OPT) + 1.0)/2.0
-      IPCT = (TOT*OPT) + 1
-C-----------------------------------------------------------------------
-C  Finish measurement of high background
-C-----------------------------------------------------------------------
-      BCT = (IBCT - (STIME/2.0))
-      IF (BCT .GT. 0.) THEN
-	CALL CCTIME (BCT,BKG2)
-	BGRD2 = BGRD2 + BKG2
-	BCT = IBCT
-	ICC = 0
-      ELSE
-	BCT = STIME/2.0
-      ENDIF
-      PCT = IPCT - STIME
-      IF (PCT .GT. 0.) THEN
-	CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-	IF (ICOL .NE. 0) THEN
-	  ICC = 2
-	  CALL FILLN2 (IFILN,NFLG)
-          PRESET = SPRESET
-	  IF (NFLG .EQ. 1) GO TO 100
-	  RETURN
-	ENDIF
-	PPCT = PCT
-	PCT = IPCT
-	CALL CCTIME (PPCT,PC)
-	COUNT = COUNT + PC
-      ELSE
-	PCT = STIME
-      ENDIF
-      CALL ANGSET (ANG1,ANG2,CHI,PHI,NATT,ICOL)
-      IF (ICOL .NE. 0) THEN
-	ICC = 2
-	CALL FILLN2 (IFILN,NFLG)
-        PRESET = SPRESET
-	IF (NFLG .EQ. 1) GO TO 100
-	RETURN
-      ENDIF
-      PRESET = BCT
-      CALL CCTIME (PRESET,BGRD1)
-      PRESET = PCT + BCT
-      CALL FILLN2 (IFILN,NFLG)
-      IF (NFLG .EQ. 1) GO TO 100
-      PRESET = SPRESET
-      RETURN
-10000 FORMAT (' Clock Problems in reflection ',3I4)
-11000 FORMAT (' Trouble Warning in reflection ',3I4)
-12000 FORMAT (' Low Angle Problem in ',3I4)
-12100 FORMAT (' Scan problem in ',3I4)
-12200 FORMAT (' Potential CAD4 scan collision in',3I4)
-13000 FORMAT (' Collision in reflection ',3I4)
-16000 FORMAT (' Scan error in ',3I4,' Trying again')
-      END
-C-----------------------------------------------------------------------
-C  Finish the measurement, with or without low temperature.
-C-----------------------------------------------------------------------
-      SUBROUTINE FILLN2 (IFILN,NFLG)
-      INCLUDE 'COMDIF'
-      NFLG = 0
-      IF (ILN .EQ. 0) THEN
-	CALL SHUTTR (-1)
-	RETURN
-      ENDIF
-      DUM1 = 1.0/16.0
-      DUM2 = 0.5
-      CALL ONEBEP (DUM1,DUM2)
-      IF (DUM2 .GT. 1) THEN
-	TMIN = 0
-	WRITE (COUT,10000)
-	CALL GWRITE (ITP,' ')
-  100   TIM1 = 1500
-	CALL CCTIME (TIM1,CONT)
-	DUM1 = 1.0/16.0
-	DUM2 = 0.5
-	CALL ONEBEP (DUM1,DUM2)
-	IF (DUM2 .GE. 1.0) THEN
-	  TMIN = TMIN + 0.25
-	  GO TO 100
-	ENDIF
-	WRITE (COUT,11000) IH,IK,IL,NREF,TMIN,DELAY
-	CALL GWRITE (ITP,' ')
-	TMIN = DELAY*6000
-	IF (TMIN .LE. 1) TMIN = 1
-	CALL CCTIME (TMIN,DUM2)
-	IFILN = 1
-	NFLG = 1
-      ENDIF
-      IF (IFILN .NE. 0) ICC = ICC + 4
-      CALL SHUTTR (-1)
-      RETURN
-10000 FORMAT (' Liquid Nitrogen fillup. Waiting...')
-11000 FORMAT (' Liquid Nitrogen Tank now full',/,
-     $        ' Reflection',3I3,' # ',I5,'.  Filling lasted',F6.2,
-     $        ' minutes.',/,
-     $        ' Now starting a ',F5.2,' minutes delay before',
-     $        ' resuming data collection.')
-      END
-
-
-
diff --git a/difrac/mod360.f b/difrac/mod360.f
deleted file mode 100644
index 55e9b128..00000000
--- a/difrac/mod360.f
+++ /dev/null
@@ -1,8 +0,0 @@
-C-----------------------------------------------------------------------
-C  Subroutine to put angle in 0 to 359.999 range
-C-----------------------------------------------------------------------
-      SUBROUTINE MOD360 (ANG)
-      IF (ANG .GE. 360.0) ANG = ANG - 360.0
-      IF (ANG .LT.   0.0) ANG = ANG + 360.0
-      RETURN
-      END
diff --git a/difrac/nexseg.f b/difrac/nexseg.f
deleted file mode 100644
index 690eeec6..00000000
--- a/difrac/nexseg.f
+++ /dev/null
@@ -1,58 +0,0 @@
-C-----------------------------------------------------------------------
-C  This subroutine gets the next DH set for automatic data collection
-C-----------------------------------------------------------------------
-      SUBROUTINE NEXSEG
-      INCLUDE 'COMDIF'
-      DIMENSION ISET(25)
-      IUPDWN = 1
-      READ (IID,REC=4) ICENT,NUMDH,(SCRAP,I = 1,48),NSYM,LSET,ISET
-C-----------------------------------------------------------------------
-C  IHO(5) = 1 means pointer mode, i.e. typed in DH matrices.
-C-----------------------------------------------------------------------
-      IF (IHO(5) .EQ. 1) THEN
-        IHO(6) = IHO(6) + 1
-        NHO = IHO(6)
-        IF (NHO .GT. 25) THEN
-          NSET = 0
-          RETURN
-        ENDIF
-        NSET = ISET(NHO)
-        IF (NSET .EQ. 0) RETURN
-        NMSEG = 1
-        MSET = 1
-        IF (NSET .LT. 0) MSET = -1
-        IF (NSET .LT. 0) NSET = -NSET
-        DO 100 I = 1,3
-          DO 100 J = 1,3
-            IDH(8,I,J) = JRT(I,J,NSET)*MSET
-  100   CONTINUE
-        NSET = NSET*MSET
-C-----------------------------------------------------------------------
-C  Normal sequence of sets.  NSYM is the max no. of sets (+/-).
-C  If end of data collection set NSET = 0
-C-----------------------------------------------------------------------
-      ELSE
-        IF (NSET .EQ. -NSYM) THEN
-          NSET = 0
-          RETURN
-C-----------------------------------------------------------------------
-C  If a + set make it -; if a - set get the next + set.
-C-----------------------------------------------------------------------
-        ELSE IF (NSET .GE. 0) THEN
-          NSET = -NSET
-          NMSEG = 1
-          DO 110 I = 1,3
-            DO 110 J = 1,3
-              IDH(8,I,J) = -IDH(8,I,J)
-  110     CONTINUE
-        ELSE
-          NSET = 1 - NSET
-          DO 120 I = 1,3
-            DO 120 J = 1,3
-              IDH(8,I,J) = JRT(I,J,NSET)
-  120     CONTINUE
-          NMSEG = 1
-        ENDIF
-      ENDIF
-      RETURN
-      END
diff --git a/difrac/orcel2.f b/difrac/orcel2.f
deleted file mode 100644
index e9a6d0cf..00000000
--- a/difrac/orcel2.f
+++ /dev/null
@@ -1,318 +0,0 @@
-C-----------------------------------------------------------------------
-C  Subroutine to calculate the orientation matrix from the cell
-C  parameters and two non-collinear reflections.
-C-----------------------------------------------------------------------
-      SUBROUTINE ORCEL2
-      INCLUDE 'COMDIF'
-      DIMENSION JH(2),JK(2),JL(2),OM(2),CH(2),PH(2),ANG(3),T(3,3),
-     $          XP(2),YP(2),ZP(2),SC(3,3),SPH(3,3),SCT(3,3),RO(3,3)
-      EQUIVALENCE(NREFB(7),ANG(1))
-      IF (KI .EQ. 'OC') THEN
-        ANG(1) = CANG(1)
-        ANG(2) = CANG(2)
-        ANG(3) = CANG(3)
-        GO TO 130
-      ENDIF
-      IF (KI .NE. 'RO' .AND. KI .NE. 'O4') THEN
-        WRITE (COUT,10000)
-        CALL YESNO ('Y',ANS)
-        IF (ANS .EQ. 'N') THEN
-          KI = ' '
-          RETURN
-        ENDIF
-        DO 90 I = 1,3
-          DO 90 J = 1,3
-            ROLD(I,J) = R(I,J)/WAVE
-   90   CONTINUE
-C-----------------------------------------------------------------------
-C  Read Wavelength, Cell parameters and data for the 2 reflections
-C-----------------------------------------------------------------------
-   95   WRITE (COUT,13000) WAVE
-        CALL FREEFM (ITR)
-        IF (RFREE(1) .NE. 0.) WAVE = RFREE(1)
-        WRITE (COUT,15000)
-        CALL FREEFM (ITR)
-        AP(1) = RFREE(1)
-        AP(2) = RFREE(2)
-        AP(3) = RFREE(3)
-        ANG(1) = RFREE(4)
-        ANG(2) = RFREE(5)
-        ANG(3) = RFREE(6)
-        WRITE (COUT,16000) WAVE,AP,ANG
-        CALL YESNO ('Y',ANS)
-        IF (ANS .EQ. 'N') GO TO 95
-        WRITE (COUT,17000)
-        CALL YESNO ('N',ANS)
-C-----------------------------------------------------------------------
-C  Typed input.  Test it for h=k=l=0; collinear h,k,ls; collinear angles
-C-----------------------------------------------------------------------
-        IF (ANS .EQ. 'Y') THEN
-   96     WRITE (COUT,22000)
-          CALL GWRITE (ITP,' ')
-          DO 100 J = 1,2
-   97       WRITE (COUT,26000) J
-            CALL FREEFM (ITR)
-            IHK(J)   = IFREE(1)
-            NREFB(J) = IFREE(2)
-            ILA(J)   = IFREE(3)
-            IF (IFREE(1) .EQ. 0 .AND.
-     $          IFREE(2) .EQ. 0 .AND.
-     $          IFREE(3) .EQ. 0) THEN
-              WRITE (COUT,16100)
-              CALL GWRITE (ITP,' ')
-              GO TO 97
-            ENDIF
-            BBGR1(J) = RFREE(4)
-            BBGR2(J) = RFREE(5)
-            BTIME(J) = RFREE(6)
-  100     CONTINUE
-          TOP = IHK(1)*IHK(2) + NREFB(1)*NREFB(2) + ILA(1)*ILA(2)
-          BOT = IHK(1)*IHK(1) + NREFB(1)*NREFB(1) + ILA(1)*ILA(1) +
-     $          IHK(2)*IHK(2) + NREFB(2)*NREFB(2) + ILA(2)*ILA(2)
-          TOP = ABS(TOP/SQRT(BOT))
-          IF (TOP .GT. 0.999) THEN
-            WRITE (COUT,16200)
-            CALL GWRITE (ITP,' ')
-            GO TO 96
-          ENDIF
-          DO 105 I = 1,2
-            OM(I) = BBGR1(I) - DOMEGA
-            CALL MOD360 (OM(I))
-            CH(I) = BBGR2(I) - DCHI
-            CALL MOD360 (CH(I))
-            PH(I) = BTIME(I)
-            XP(I) = COS(CH(I)/DEG)*COS(PH(I)/DEG)*COS(OM(I)/DEG) -
-     $              SIN(OM(I)/DEG)*SIN(PH(I)/DEG)
-            YP(I) = COS(OM(I)/DEG)*COS(CH(I)/DEG)*SIN(PH(I)/DEG) +
-     $              SIN(OM(I)/DEG)*COS(PH(I)/DEG)
-            ZP(I) = NRC*COS(OM(I)/DEG)*SIN(CH(I)/DEG)
-  105     CONTINUE
-          TOP = XP(1)*XP(2) + YP(1)*YP(2) + ZP(1)*ZP(2)
-          IF (TOP .GT. 0.999) THEN
-            WRITE (COUT,16210)
-            CALL GWRITE (ITP,' ')
-            GO TO 96
-          ENDIF
-          WRITE (COUT,16300) (IHK(J),NREFB(J),ILA(J),
-     $                        BBGR1(J),BBGR2(J),BTIME(J),J = 1,2)
-          CALL YESNO ('Y',ANS)
-          IF (ANS .EQ. 'N') GO TO 96
-        ELSE
-          WRITE (COUT,19000) 
-     $        IHK(1), NREFB(1), ILA(1), BBGR1(1), BBGR2(1), BTIME(1),
-     $        IHK(2), NREFB(2), ILA(2), BBGR1(2), BBGR2(2), BTIME(2)
-          CALL YESNO ('Y',ANS)
-          IF (ANS .EQ. 'Y') THEN
-            WRITE (COUT,20000)
-            CALL FREEFM (ITR)
-            IHK(1)   = IFREE(1)
-            NREFB(1) = IFREE(2)
-            ILA(1)   = IFREE(3)
-            IHK(2)   = IFREE(4)
-            NREFB(2) = IFREE(5)
-            ILA(2)   = IFREE(6)
-          ENDIF
-        ENDIF
-      ENDIF
-      DO 110 I = 1,3
-        CANG(I) = COS(ANG(I)/DEG)
-        SANG(I) = SIN(ANG(I)/DEG)
-  110 CONTINUE
-  130 DO 140 J = 1,2
-        JH(J) = IHK(J)
-        JK(J) = NREFB(J)
-        JL(J) = ILA(J)
-        OM(J) = BBGR1(J) - DOMEGA
-        CALL MOD360 (OM(J))
-        CH(J) = BBGR2(J) - DCHI
-        CALL MOD360 (CH(J))
-        PH(J) = BTIME(J)
-  140 CONTINUE
-C-----------------------------------------------------------------------
-C  Calculate reciprocal cell dimensions
-C-----------------------------------------------------------------------
-      CANGS(1) = ((CANG(2)*CANG(3)) - CANG(1))/(SANG(2)*SANG(3))
-      CANGS(2) = ((CANG(1)*CANG(3)) - CANG(2))/(SANG(1)*SANG(3))
-      CANGS(3) = ((CANG(1)*CANG(2)) - CANG(3))/(SANG(1)*SANG(2))
-      DO 150 I = 1,3
-        SANGS(I) = SQRT(1.0-CANGS(I)**2)
-  150 CONTINUE
-      APS(1) = 1.0/(AP(1)*SANGS(2)*SANG(3))
-      APS(2) = 1.0/(AP(2)*SANGS(1)*SANG(3))
-      APS(3) = 1.0/(AP(3)*SANGS(1)*SANG(2))
-C-----------------------------------------------------------------------
-C  T-matrix
-C-----------------------------------------------------------------------
-      T(1,1) = APS(1)
-      T(1,2) = APS(2)*CANGS(3)
-      T(1,3) = APS(3)*CANGS(2)
-      T(2,1) = 0.0
-      T(2,2) =  APS(2)*SANGS(3)
-      T(2,3) = -APS(3)*SANGS(2)*CANG(1)
-      T(3,3) = 1.0/AP(3)
-      T(3,1) = 0.0
-      T(3,2) = 0.0
-C-----------------------------------------------------------------------
-C  Form X,Y,Z for H1C and H2C vectors
-C-----------------------------------------------------------------------
-      DO 160 I = 1,2
-        XP(I) = T(1,1)*JH(I) + T(1,2)*JK(I) + T(1,3)*JL(I)
-        YP(I) =                T(2,2)*JK(I) + T(2,3)*JL(I)
-        ZP(I) =                               T(3,3)*JL(I)
-  160 CONTINUE
-      MARK = 0
-C-----------------------------------------------------------------------
-C  Call ORCELS to form the SC matrix
-C-----------------------------------------------------------------------
-      CALL ORCELS (XP,YP,ZP,SC,MARK)
-      IF (MARK .NE. 0) RETURN
-C-----------------------------------------------------------------------
-C Form X,Y,Z, for U1PHI and U2PHI vectors
-C----------------------------------------------------------------------- 
-        DO 170 I = 1,2
-          XP(I) = COS(CH(I)/DEG)*COS(PH(I)/DEG)*COS(OM(I)/DEG) -
-     $            SIN(OM(I)/DEG)*SIN(PH(I)/DEG)
-          YP(I) = COS(OM(I)/DEG)*COS(CH(I)/DEG)*SIN(PH(I)/DEG) +
-     $            SIN(OM(I)/DEG)*COS(PH(I)/DEG)
-          ZP(I) = NRC*COS(OM(I)/DEG)*SIN(CH(I)/DEG)
-  170   CONTINUE
-      MARK = 0
-C-----------------------------------------------------------------------
-C  Call ORCELS to form the SPH matrix
-C-----------------------------------------------------------------------
-      CALL ORCELS (XP,YP,ZP,SPH,MARK)
-      IF (MARK .NE. 0) RETURN
-      DO 180 I = 1,3
-        DO 180 J = 1,3
-          SCT(J,I) = SC(I,J)
-  180 CONTINUE
-C-----------------------------------------------------------------------
-C  Form the RO and R matrices
-C-----------------------------------------------------------------------
-      CALL MATRIX (SPH,SCT,RO,RO,'MATMUL')
-      CALL MATRIX (RO,T,R,R,'MATMUL')
-C-----------------------------------------------------------------------
-C The R matrix is truly right handed, change for NRC diffractometer
-C-----------------------------------------------------------------------
-      DO 190 J = 1,3
-        R(3,J) = NRC*R(3,J)
-  190 CONTINUE
-      IF (KI .EQ. 'M2') THEN
-        WRITE (COUT,24000)
-        CALL GWRITE (ITP,' ')
-        WRITE (COUT,25000) ((R(I,J),J = 1,3),I = 1,3)
-        CALL GWRITE (ITP,' ')
-        WRITE (LPT,24000)
-        WRITE (LPT,25000) ((R(I,J),J = 1,3),I = 1,3)
-      ENDIF
-C-----------------------------------------------------------------------
-C  Store R matrix times Wavelength
-C-----------------------------------------------------------------------
-      DO 200 I = 1,3
-        DO 200 J = 1,3
-          R(I,J) = R(I,J)*WAVE
-  200 CONTINUE
-C-----------------------------------------------------------------------
-C  Calculate symmetry matrix SINABS.  Done for M2 in BASINP only if the
-C  new matrix is retained.
-C-----------------------------------------------------------------------
-      IF (KI .NE. 'M2') THEN
-        ISYS = 1
-        CALL SINMAT
-      ENDIF
-      RETURN
-10000 FORMAT (' Orientation Matrix from Cell + 2 Non-Collinear',
-     $        ' Reflections (Y) ',$)
-13000 FORMAT (' Type the wavelength (',F7.5,') ',$)
-15000 FORMAT (' Type a,b,c,alpha,beta,gamma ',$)
-16000 FORMAT (' The input values are :--  Wavelength',F8.5/
-     $        ' Cell Parameters',3F9.4,3F9.3/
-     $        ' Is this correct (Y) ? ',$)
-16100 FORMAT (' The reflection 0,0,0 is invalid.  Try again.')
-16200 FORMAT (' The reflection indices typed are collinear. Try again.')
-16210 FORMAT (' The reflection angles typed are collinear. Try again.')
-16300 FORMAT (' The input values are :--',2(/3I4,3F9.3)/
-     $        ' Is this correct (Y) ? ',$)
-17000 FORMAT (' Are angles to be typed (N) ? ',$)
-19000 FORMAT (' The two reflections being used are ',2(/3I4,3F8.3)/
-     $        ' Do you wish to edit the reflection indices (Y) ? ')
-20000 FORMAT (' Type the new h1,k1,l1 and h2,k2,l2  ',$)
-22000 FORMAT (' Type h,k,l, Omega, Chi, Phi for 2 non-collinear',
-     $        ' reflections')
-24000 FORMAT (/' Orientation Matrix from M2')
-25000 FORMAT (3F12.8)
-26000 FORMAT (' Reflection,',I2,' > ',$)
-      END
-C-----------------------------------------------------------------------
-C  Subroutine to calculate the S matrices for ORCEL2
-C-----------------------------------------------------------------------
-      SUBROUTINE ORCELS (XP,YP,ZP,SC,MARK)
-      COMMON /IODEVS/ ITP,ITR,LPT,LPTX,NB,NBLOCK,ISD,IID,
-     $                IBYLEN,IPR,NPR,IIP
-      CHARACTER*132 COUT(20)
-      COMMON /IOUASC/ COUT 
-      DIMENSION XP(3),YP(3),ZP(3),SC(3,3),AL(4),AM(4),AN(4)
-      MARK = 0
-      DEN = SQRT(XP(1)*XP(1) + YP(1)*YP(1) + ZP(1)*ZP(1))
-      AL(1) = XP(1)/DEN
-      AM(1) = YP(1)/DEN
-      AN(1) = ZP(1)/DEN
-      DEN = SQRT(XP(2)*XP(2) + YP(2)*YP(2) + ZP(2)*ZP(2))
-      AL(4) = XP(2)/DEN
-      AM(4) = YP(2)/DEN
-      AN(4) = ZP(2)/DEN
-      BL = AM(1)*AN(4) - AM(4)*AN(1)
-      BM = AL(4)*AN(1) - AL(1)*AN(4)
-      BN = AL(1)*AM(4) - AL(4)*AM(1)
-      DEN = SQRT(BL*BL + BM*BM + BN*BN)
-      AL(3) = -BL/DEN
-      AM(3) = -BM/DEN
-      AN(3) = -BN/DEN
-      DEN = AL(1)*AM(3) - AM(1)*AL(3)
-      DIS = ABS(DEN)
-      AL(2) = 1.0
-      AM(2) = 0.0
-      AN(2) = 0.0
-      IF (DIS .GT. 0.0) THEN
-        ALN = (AM(1)*AN(3) - AM(3)*AN(1))/DEN
-        AMN = (AL(3)*AN(1) - AL(1)*AN(3))/DEN
-        SUM = SQRT(1.0 + ALN*ALN + AMN*AMN)
-        AN(2) = 1.0/SUM
-        AL(2) = AN(2)*ALN
-        AM(2) = AN(2)*AMN
-      ELSE
-        DEN = AL(1)*AN(3) - AL(3)*AN(1)
-        DIS = ABS(DEN)
-        IF (DIS .GT. 0.0) THEN
-          ALM = (AN(1)*AM(3) - AM(1)*AN(3))/DEN
-          ANM = (AL(3)*AM(1) - AL(1)*AM(3))/DEN
-          SUM = SQRT(1.0 + ALM*ALM + ANM*ANM)
-          AM(2) = 1.0/SUM
-          AL(2) = AM(2)*ALM
-          AN(2) = AM(2)*ANM
-        ENDIF
-      ENDIF
-      DO 100 I = 1,3
-        SC(1,I) = AL(I)
-        SC(2,I) = AM(I)
-        SC(3,I) = AN(I)
-  100 CONTINUE
-      DET = SC(1,1)*(SC(2,2)*SC(3,3) - SC(2,3)*SC(3,2)) - 
-     $      SC(1,2)*(SC(2,1)*SC(3,3) - SC(2,3)*SC(3,1)) +
-     $      SC(1,3)*(SC(2,1)*SC(3,2) - SC(2,2)*SC(3,1))
-C-----------------------------------------------------------------------
-C  To ensure both matrices are right handed
-C-----------------------------------------------------------------------
-      IF (DET .EQ. 0) THEN
-        MARK = 1
-        WRITE (COUT,10000)
-        CALL GWRITE (ITP,' ')
-      ENDIF
-      IF (DET .LT. 0.0) THEN
-        DO 110 I = 1,3
-          SC(I,2) = -SC(I,2)
-  110   CONTINUE
-      ENDIF
-      RETURN
-10000 FORMAT (' Determinant = 0')
-      END
diff --git a/difrac/ormat3.f b/difrac/ormat3.f
deleted file mode 100644
index f03e201d..00000000
--- a/difrac/ormat3.f
+++ /dev/null
@@ -1,211 +0,0 @@
-C-----------------------------------------------------------------------
-C  Subroutine to calculate the orientation matrix from three
-C   non-collinear reflections forming a right-handed system.
-C-----------------------------------------------------------------------
-      SUBROUTINE ORMAT3
-      INCLUDE 'COMDIF'
-      DIMENSION TH(3),OM(3),CH(3),PH(3),THE(3,3),HM(3,3),HMI(3,3),
-     $          ANGS(3)
-      CHARACTER INTFLT*3
-      IF (KI .EQ. 'M3') THEN
-        WRITE (COUT,10000)
-        CALL YESNO ('Y',ANS)
-        IF (ANS .EQ. 'N') THEN
-          KI = ' '
-        ENDIF
-      ENDIF
-      DO 90 I = 1,3
-        DO 90 J = 1,3
-          ROLD(I,J) = R(I,J)/WAVE
-   90 CONTINUE
-C-----------------------------------------------------------------------
-C  Part 1:  Read in wavelength and data for the 3 reflections and then
-C           form the H matrix.   Used by M3 and RS and OP (LISTER)
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'M3' .OR. KI .EQ. 'RS' .OR. KI .EQ. 'OP') THEN
-        IF (KI .NE. 'OP') THEN
-          WRITE (COUT,11000) WAVE
-          CALL FREEFM (ITR) 
-          WAV = RFREE(1)
-          IF (WAV .NE. 0) WAVE = WAV
-        ENDIF
-        ANS = 'N'
-        IF (KI .EQ. 'M3') THEN
-          WRITE (COUT,12000)
-          CALL YESNO ('N',ANS)
-          IF (KI .EQ. 'M3' .AND. ANS .EQ. 'N') THEN
-            WRITE (COUT, 12100)
-            CALL GWRITE (ITP, ' ')
-          ENDIF
-        ENDIF
-        IF (ANS .EQ. 'N') THEN
-          DO 100 J = 1,3
-            HM(1,J) = IHK(J)
-            HM(2,J) = NREFB(J)
-            HM(3,J) = ILA(J)
-            TH(J) = BCOUNT(J)
-            OM(J) = BBGR1(J)
-            CALL MOD360 (OM(J))
-            CH(J) = BBGR2(J)
-            CALL MOD360 (CH(J))
-            PH(J) = BTIME(J)
-            IF (KI .EQ. 'M3') THEN
-              WRITE (COUT,12200) IHK(J),NREFB(J),ILA(J),BCOUNT(J),
-     $                           BBGR1(J),BBGR2(J),BTIME(J)
-              CALL GWRITE (ITP,' ')
-            ENDIF
-  100     CONTINUE
-        ELSE
-          WRITE (COUT,13000)
-          CALL GWRITE (ITP,' ')
-          DO 110 J = 1,3
-            WRITE (COUT,14000)
-            CALL FREEFM (ITR)
-            HM(1,J) = RFREE(1)
-            HM(2,J) = RFREE(2)
-            HM(3,J) = RFREE(3)
-            TH(J) = RFREE(4)
-            OM(J) = RFREE(5)
-            CH(J) = RFREE(6)
-            PH(J) = RFREE(7)
-            TH(J) = TH(J)
-            OM(J) = OM(J)
-            CALL MOD360 (OM(J))
-            CH(J) = CH(J)
-            CALL MOD360 (CH(J))
-  110     CONTINUE
-        ENDIF
-C-----------------------------------------------------------------------
-C  Calculate the elements of the THETA matrix
-C-----------------------------------------------------------------------
-        DO 120 J = 1,3
-          SLTEMP = 2.0*SIN((0.5*TH(J))/DEG)/WAVE
-          THE(1,J) = (COS(OM(J)/DEG)*COS(CH(J)/DEG)*COS(PH(J)/DEG) -
-     $                SIN(OM(J)/DEG)*SIN(PH(J)/DEG))*SLTEMP
-          THE(2,J) = (COS(OM(J)/DEG)*COS(CH(J)/DEG)*SIN(PH(J)/DEG) +
-     $                SIN(OM(J)/DEG)*COS(PH(J)/DEG))*SLTEMP
-          THE(3,J) = (COS(OM(J)/DEG)*SIN(CH(J)/DEG))*SLTEMP
-  120   CONTINUE
-C-----------------------------------------------------------------------
-C  Invert the H matrix and form the R matrix
-C-----------------------------------------------------------------------
-        CALL MATRIX (HM,HMI,HMI,HMI,'INVERT')
-        CALL MATRIX (THE,HMI,R,R,'MATMUL')
-C-----------------------------------------------------------------------
-C  Evaluate the determinant to decide if right or left handed
-C-----------------------------------------------------------------------
-        DET = R(1,1)*(R(2,2)*R(3,3) - R(2,3)*R(3,2)) -
-     $        R(1,2)*(R(2,1)*R(3,3) - R(2,3)*R(3,1)) +
-     $        R(1,3)*(R(2,1)*R(3,2) - R(2,2)*R(3,1))
-        IF (NRC*DET .EQ. 0) THEN
-          WRITE (LPT,15000)
-          KI = ' '
-          RETURN
-        ENDIF
-        IF (NRC*DET .GT. 0) THEN
-          WRITE (LPT,16000) KI,((R(I,J),J = 1,3),I = 1,3)
-        ELSE
-          WRITE (LPT,17000) KI,((R(I,J),J = 1,3),I = 1,3)
-        ENDIF
-      ENDIF
-      IF (KI .EQ. 'OM') THEN
-        DO 130 I = 1,3
-          DO 130 J = 1,3
-            R(I,J) = R(I,J)/WAVE
-  130   CONTINUE
-      ENDIF
-C-----------------------------------------------------------------------
-C  Get the real and reciprocal cell parameters
-C-----------------------------------------------------------------------
-      IF (KI .NE. 'RA') THEN
-        CALL GETPAR
-        WRITE (LPT,18000) APS,CANGS
-        WRITE (LPT,19000) AP,CANG
-C-----------------------------------------------------------------------
-C  Calculate SANG, CANG, SANGS and CANGS for COMMON and put R right
-C-----------------------------------------------------------------------
-        DO 160 I = 1,3
-          SANG(I)  = SIN(CANG(I)/DEG)
-          CANG(I)  = COS(CANG(I)/DEG)
-          SANGS(I) = SIN(CANGS(I)/DEG)
-          CANGS(I) = COS(CANGS(I)/DEG)
-          DO 160 J = 1,3
-            R(I,J) = R(I,J)*WAVE
-  160   CONTINUE
-C-----------------------------------------------------------------------
-C  Calculate the symmetry matrix SINABS, unless called from LISTER (OP)
-C  or M3 when it will be done only if the new matrix is retained.
-C-----------------------------------------------------------------------
-        ISYS = 1
-        IF (KI .NE. 'OP' .AND. KI .NE. 'M3') CALL SINMAT
-        IF (KI .NE. 'M3') KI = ' '
-        RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  RA calculates angles for given h,k,l values                    RA
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'RA') THEN
-        DPSI = 0.0
-  200   WRITE (COUT,20000)
-        CALL FREEFM (ITR)
-        IH = IFREE(1)
-        IK = IFREE(2)
-        IL = IFREE(3)
-        RH = RFREE(1)
-        RK = RFREE(2)
-        RL = RFREE(3)
-        INTFLT = 'INT'
-        IF (ABS(RH - IH) .GT. 0.0001 .OR. 
-     $      ABS(RK - IK) .GT. 0.0001 .OR. 
-     $      ABS(RL - IL) .GT. 0.0001) INTFLT = 'FLT'
-        IF (INTFLT .EQ. 'INT' .AND.
-     $      IH .EQ. 0 .AND. IK .EQ. 0 .AND. IL .EQ. 0) THEN
-          KI = ' '
-          RETURN
-        ENDIF
-        PSI = RFREE(4)
-C-----------------------------------------------------------------------
-C  Give a value to DPSI for ANGCAL calculation to proceed for PSI .NE. 0
-C-----------------------------------------------------------------------
-        IF (ABS(PSI) .GT. 0.0001) DPSI = 10.0
-        ISTAN = 0
-        IPRVAL = 1
-        CALL ANGCAL
-        IF (IROT .NE. 0) THEN
-          IF (INTFLT .EQ. 'INT') THEN
-            WRITE (COUT,22000) IH,IK,IL,PSI
-          ELSE
-            WRITE (COUT,22100) RH,RK,RL,PSI
-          ENDIF
-          CALL GWRITE (ITP,' ')
-        ENDIF 
-        IF (IVALID .EQ. 0 .AND. IROT .EQ. 0) THEN 
-          IF (INTFLT .EQ. 'INT') THEN
-            WRITE (COUT,23000) IH,IK,IL,THETA,OMEGA,CHI,PHI,PSI
-          ELSE
-            WRITE (COUT,23100) RH,RK,RL,THETA,OMEGA,CHI,PHI,PSI
-          ENDIF
-          CALL GWRITE (ITP,' ')
-        ENDIF 
-        GO TO 200
-      ENDIF
-10000 FORMAT (' Orientation Matrix from 3 Reflections (Y) ? ',$)
-11000 FORMAT (' Type the Wavelength (',F7.5,') ',$)
-12000 FORMAT (' Are the angles to be typed (N) ? ',$)
-12100 FORMAT (' The three reflections being used are')
-12200 FORMAT (3I4,4F8.3)
-13000 FORMAT (' Type h,k,l,2Theta,Omega,Chi,Phi ')
-14000 FORMAT (' > ',$)
-15000 FORMAT (' The determinant of the matrix is 0.')
-16000 FORMAT (/'  RIGHT-handed Orientation Matrix from ',A2/(3F12.8))
-17000 FORMAT (/'  LEFT-handed Orientation Matrix from ',A2/(3F12.8))
-18000 FORMAT (/' a* ',F8.5,' b* ',F8.5,' c* ',F8.5,
-     $        ' Alf* ',F7.3,' Bet* ',F7.3,' Gam* ',F7.3)
-19000 FORMAT (' a  ',F8.5,' b  ',F8.5,' c  ',F8.5,
-     $        ' Alf  ',F7.3,' Bet  ',F7.3,' Gam  ',F7.3/)
-20000 FORMAT (' Type h,k,l,Psi (End) ',$)
-22000 FORMAT (3I4,' Psi ',F7.3,' Rotation not possible')
-22100 FORMAT (3F8.3,' Psi ',F7.3,' Rotation not possible')
-23000 FORMAT (3I4,5F8.3)
-23100 FORMAT (8F8.3)
-      END
diff --git a/difrac/oscil.f b/difrac/oscil.f
deleted file mode 100644
index 6644ae2b..00000000
--- a/difrac/oscil.f
+++ /dev/null
@@ -1,93 +0,0 @@
-C-----------------------------------------------------------------------
-C  This subroutine performs a wide omega scan for photographic purposes
-C-----------------------------------------------------------------------
-      SUBROUTINE OSCIL
-      INCLUDE 'COMDIF'
-      CON = IFRDEF
-      WRITE (COUT,10000)
-      CALL YESNO ('Y',ANS)
-      IF (ANS .EQ. 'N') THEN
-        KI = ' '
-        RETURN
-      ENDIF
-      WRITE (COUT,11000)
-      CALL FREEFM (ITR)
-      OLIM1 = RFREE(1)
-      OLIM2 = RFREE(2)
-      WRITE (COUT,12000)
-      CALL FREEFM (ITR)
-      OSTIM = RFREE(1)
-      WRITE ( COUT,13000)
-      CALL FREEFM (ITR)
-      NOSTIM = IFREE(1)
-      IF (NOSTIM .EQ. 0) NOSTIM = 1
-      NO = NOSTIM
-C-----------------------------------------------------------------------
-C  Get the scan range assuming that 180 is the maximum
-C-----------------------------------------------------------------------
-      OLI1 = AMOD(OLIM1,360.)
-      OLI2 = AMOD(OLIM2,360.)
-      IF (OLI2 .LE. OLI1) THEN
-        SAVE = OLI1
-        OLI1 = OLI2
-        OLI2 = SAVE
-      ENDIF
-      OLI3 = OLI1 + 360.0
-      IF ((OLI2 - OLI1) .GE. 180.0) THEN
-        OLI1 = OLI2
-        OLI2 = OLI3
-      ENDIF
-      RANGE = AMOD((OLI2-OLI1),360.0)
-      IRANGE = RANGE + 1
-      MSTEP = (RANGE - IRANGE)*CON
-      TOSTEP = CON*RANGE
-      TOTIME = OSTIM
-      TISTEP = OSTIM
-      IF (TISTEP .LT. 0.01) TISTEP = 0.01
-      DO 150 NT = 1,NO
-        CALL ANGET (THETA,OMEGA,CHI,PHI)
-        OLIC = OLI1
-        CALL ANGSET (THETA,OLI1,CHI,PHI,NATT,ICOL)
-        IF (ICOL .NE. 0) THEN
-          WRITE (COUT,14000)
-          CALL GWRITE (ITP,' ')
-          CALL SHUTTR (-1)
-          KI = ' '
-          RETURN
-        ENDIF
-        DO 140 I = 1,IRANGE
-          NSTEP = MSTEP
-          IF ((IRANGE-I) .GT. 0) NSTEP = CON
-          DO 130 J = 1,NSTEP
-            OLIC = OLIC + 1.0/CON
-            CALL MOD360 (OLIC)
-            CALL ANGSET (THETA,OLIC,CHI,PHI,NATT,ICOL)
-            IF (ICOL .NE. 0) THEN
-              WRITE (COUT,14000)
-              CALL GWRITE (ITP,' ')
-              CALL SHUTTR (-1)
-              KI = ' '
-              RETURN
-            ENDIF
-            CALL CCTIME (TISTEP,COUNT)
-            CALL KORQ (KQFLAG)
-            IF (KQFLAG .NE. 1) THEN
-              WRITE (COUT,15000)
-              CALL GWRITE (ITP,' ')
-              CALL SHUTTR (-1)
-              KI = ' '
-              RETURN
-            ENDIF
-  130     CONTINUE
-  140   CONTINUE
-  150 CONTINUE
-      CALL SHUTTR (-1)
-      KI = ' '
-      RETURN
-10000 FORMAT (' Oscillation Picture (Y) ? ',$)
-11000 FORMAT (' Type the omega scan limits ',$)
-12000 FORMAT (' Type the count preset',$)
-13000 FORMAT (' Type the number of repeats (1) ',$)
-14000 FORMAT (' Collision Stop')
-15000 FORMAT (' K-stop')
-      END
diff --git a/difrac/params.f b/difrac/params.f
deleted file mode 100644
index 43360dd0..00000000
--- a/difrac/params.f
+++ /dev/null
@@ -1,21 +0,0 @@
-C-----------------------------------------------------------------------
-C  To extract real or reciprocal cell parameters from the metric
-C  tensor G into ABC and ANG
-C-----------------------------------------------------------------------
-      SUBROUTINE PARAMS (G,ABC,ANG)
-      DIMENSION G(3,3),ABC(3),ANG(3)
-      DEG = 57.2958
-      DO 100 I = 1,3
-        ABC(I) = SQRT(G(I,I))
-  100 CONTINUE
-      P = G(2,3)/(ABC(2)*ABC(3))
-      Q = SQRT(1.0 - P*P)
-      ANG(1) = DEG*ATAN2(Q,P)
-      P = G(1,3)/(ABC(1)*ABC(3))
-      Q = SQRT(1.0 - P*P)
-      ANG(2) = DEG*ATAN2(Q,P)
-      P = G(1,2)/(ABC(1)*ABC(2))
-      Q = SQRT(1.0 - P*P)
-      ANG(3) = DEG*ATAN2(Q,P)
-      RETURN
-      END
diff --git a/difrac/pcdraw.f b/difrac/pcdraw.f
deleted file mode 100644
index b6e48a47..00000000
--- a/difrac/pcdraw.f
+++ /dev/null
@@ -1,330 +0,0 @@
-C-----------------------------------------------------------------------
-C   PCDRAW  -- PC Graphics package using the library supplied with 
-C              MS FORTRAN version 5.0
-C
-C   Version for DIFRAC.  Supports a graphics window as well as two
-C   text windows, one for commands and the other for use by HKLN 
-C-----------------------------------------------------------------------
-      include 'fgraph.fi'
-      SUBROUTINE PCDRAW (IFUNC,IX,IY,IZ,STRING)
-      include 'fgraph.fd'
-      include 'COMDIF'
-      integer  ifunc, ix, iy, iz
-      character string*(*)
-C-----------------------------------------------------------------------
-C  Definitions for the graphics package, these may not be standard
-C  Fortran 
-C-----------------------------------------------------------------------
-      integer*2            result,
-     $                     irt(3),ict(3),irb(3),icb(3), 
-     $                     RED,BLUE,WHITE,CYAN,
-     $                     irow,icol 
-      common /pclocl/      irt,ict,irb,icb,ntextw
-      record /videoconfig/ screen
-      double precision wx,wy
-      record /wxycoord/ wprev 
-      record /rccoord/  cursor,cursor2,tcoords  
-      logical first
-      data first /.true./
-      data RED,BLUE,WHITE,CYAN/4,1,15,3/
-C-----------------------------------------------------------------------
-C  XOPEN  Initialise the display 
-C-----------------------------------------------------------------------
-      if (IFUNC .eq. XOPEN) then
-C-----------------------------------------------------------------------
-C -- Find the graphics mode
-C-----------------------------------------------------------------------
-	 call getvideoconfig (screen)
-	 select case (screen.adapter)
-	   case ($CGA)
-	      result = setvideomode ($HRESBW)
-	      termgr = 'CGA' 
-	   case ($OCGA)
-	      result = setvideomode ($ORESCOLOR)
-	      termgr = 'OCGA'
-	   case ($EGA,$OEGA)
-	      if (screen.monitor .eq. $MONO) then
-		 result = setvideomode (ERESNOCOLOR)
-		 termgr = 'EGAM'
-	      else
-		 result = setvideomode ($ERESCOLOR)
-		 termgr = 'EGA'
-	      endif
-	   case ($HGC)
-	      result = setvideomode ($HERCMONO)
-	      termgr = 'HERC'
-	   case ($MCGA)
-	      result = setvideomode ($VRES2COLOR)
-	      termgr = 'MCGA'
-	   case ($VGA,$OVGA)
-	      result = setvideomode ($VRES16COLOR)
-	      termgr = 'VGA'
-	   case DEFAULT
-	      result = 0
-	 end select
-	 if (result .eq. 0) STOP 'ERROR: Unsupported graphics adaptor'
-C-----------------------------------------------------------------------
-C -- Now we can find out some dimensions
-C-----------------------------------------------------------------------
-	 call getvideoconfig (screen)
-	 edxres = screen.numxpixels
-	 edyres = screen.numypixels
-	 nrows  = screen.numtextrows
-	 ncols  = screen.numtextcols
-C-----------------------------------------------------------------------
-C -- And setup the default colour scheme
-C-----------------------------------------------------------------------
-	 result = setbkcolor ($BLUE)
-	 result = setcolor (WHITE)
-	 call clearscreen ($GCLEARSCREEN)
-C-----------------------------------------------------------------------
-C -- For now define text window 1 as the top three lines of the screen
-C-----------------------------------------------------------------------
-	 irt(1) = 1
-	 irb(1) = 3
-	 ict(1) = 1
-	 icb(1) = ncols
-	 call settextwindow (irt(1),ict(1),irb(1),icb(1))
-	 call clearscreen ($GWINDOW)
-	 call settextwindow (irt(1),ict(1),irb(1)+1,icb(1))
-	 do 100 i = 2,79
-	    win1bf(1)(i:i) = char(205)
-	    win1bf(3)(i:i) = char(205)
-100      continue
-	 win1bf(2) = ' '
-	 win1bf(1)(1:1) = char(201)
-	 win1bf(1)(ncols:ncols) = char(187)
-	 win1bf(2)(1:1) = char(186)
-	 win1bf(2)(ncols:ncols) = char(186)
-	 win1bf(3)(1:1) = char(200)
-	 win1bf(3)(ncols:ncols) = char(188)
-	 win1bf(2)(3:14) = 'D I F R A C '
-	 do 110 i = 1,3
-	    call settextposition (i,1,cursor)
-	    call outtext (win1bf(i))
-110      continue 
-C-----------------------------------------------------------------------
-C    And setup the constants for a second text window which is the
-C    normal command window 
-C-----------------------------------------------------------------------
-	 irt(2) = nrows - 6
-	 irb(2) = nrows
-	 ict(2) = 1
-	 icb(2) = ncols
-	 call settextwindow (irt(2),ict(2),irb(2),icb(2))
-	 call settextposition (1,1,cursor)
-	 ntextw = 2 
-C-----------------------------------------------------------------------
-C    And then window 3 which is a full screen window.
-C-----------------------------------------------------------------------
-	 irt(3) = 4
-	 irb(3) = nrows
-	 ict(3) = 1
-	 ict(3) = ncols 
-C-----------------------------------------------------------------------
-C -- And the graphics window as the top righthand corner of the 
-C    screen on a scale of 4096 along the x-axis and 60% of the screen.
-C-----------------------------------------------------------------------
-	 xt = 0.0
-	 ypix = edyres/float(nrows)
-	 yt = 3.0 *  ypix + 1
-	 yb = edyres - (7.0 * ypix + 1)
-	 xb = (yb - yt) * edxres/edyres
-	 call setviewport (xt,yt,xb,yb)
-	 result = setwindow (.TRUE.,-205.0,-154.0,4300.0,3225.0)
-	 result =  setcolor (BLUE)
-C         call clearscreen ($GVIEWPORT)
-C-----------------------------------------------------------------------
-C  XMOVE  Move the graphics cursor to x,y 
-C-----------------------------------------------------------------------
-      else if (IFUNC .eq. XMOVE) then
-	 wx = ix
-	 wy = iy
-	 call moveto_w (wx,wy,wprev) 
-C-----------------------------------------------------------------------
-C  XDRAW  Draw a line 
-C-----------------------------------------------------------------------
-      else if (IFUNC .eq. XDRAW) then
-	 wx = ix
-	 wy = iy
-	 result = lineto_w (wx,wy) 
-C-----------------------------------------------------------------------
-C  XCLOSE Return to normal text mode 
-C-----------------------------------------------------------------------
-      else if (IFUNC .eq. XCLOSE) then
-	 result = setvideomode ($DEFAULTMODE)
-C-----------------------------------------------------------------------
-C  XCLEAR Clear the graphics viewport 
-C-----------------------------------------------------------------------
-      else if (IFUNC .eq. XCLEAR) then
-	 result = setcolor (BLUE)
-	 call gettextposition (cursor2)
-	 call settextwindow (irt(1),ict(1),irb(1)+1,icb(1))
-	 call clearscreen ($GWINDOW)
-	 do 120 i = 1,3
-	    call settextposition (i,1,cursor)
-	    call outtext (win1bf(i))
-120      continue 
-	 call displa (theta,omega,chi,phi)
-	 call settextwindow (irt(2),ict(2),irb(2),icb(2))
-	 irow = cursor2.row
-	 icol = cursor2.col
-	 call settextposition (irow,icol,cursor2)
-	 result = rectangle_w ($GFILLINTERIOR,-205.0,-154.0,
-     $                                        4300.0,3225.0)
-	 result = setcolor (WHITE)
-	 result = rectangle_w ($GBORDER,-205.0,-154.0,
-     $                                        4300.0,3225.0)
-	 ntextw = 2
-C-----------------------------------------------------------------------
-C  XTEXT  Output text to the current text window
-C-----------------------------------------------------------------------
-      else if (IFUNC .EQ. XTEXT) then
-	 call outtext (string)
-C-----------------------------------------------------------------------
-C  XSCROL Scroll text in the current window 
-C-----------------------------------------------------------------------
-      else if (IFUNC .EQ. XSCROL) then
-	 call gettextposition (tcoords)
-	 irow = tcoords.row + 1
-	 icol = 1 
-	 mxlins = irb(ntextw) - irt(ntextw) + 1
-	 if (irow .gt. mxlins) then
-	    call scrolltextwindow ($GSCROLLUP)
-	    irow = mxlins 
-	 endif 
-	 call settextposition (irow,icol,tcoords)
-C-----------------------------------------------------------------------
-C  XTDEL Delete a character 
-C-----------------------------------------------------------------------
-      else if (IFUNC .EQ. XTDEL) then
-	 call gettextposition (tcoords)
-	 irow = tcoords.row
-	 icol = tcoords.col - 1
-	 if (icol .ge. 1) then
-	    call settextposition (irow,icol,tcoords)
-	    call outtext (' ')
-	    call settextposition (irow,icol,tcoords)
-	 endif 
-C-----------------------------------------------------------------------
-C  XWIN   Set current text window  
-C-----------------------------------------------------------------------
-      else if (IFUNC .EQ. XWIN) then 
-	 if (ix .ge. 1 .and. ix .le. 3) then 
-	    call settextwindow (irt(ix),ict(ix),irb(ix),icb(ix))
-	    if (iy .eq. XCLEAR) call clearscreen ($GWINDOW)
-	    ntextw = ix 
-	 endif 
-      endif
-      return
-      end
-C-----------------------------------------------------------------------
-C  WNTEXT  Simple routine to output text the the current window 
-C-----------------------------------------------------------------------
-      SUBROUTINE WNTEXT (STRING)
-      INCLUDE 'COMDIF'
-      CHARACTER STRING*(*)
-      INTEGER IX,IY,IZ
-      DATA IX,IY,IZ/1,0,0/
-      CALL PCDRAW (XTEXT,IX,IY,IZ,STRING)
-      RETURN
-      END 
-C-----------------------------------------------------------------------
-C  WNCDEL  Delete a character from the screen 
-C-----------------------------------------------------------------------
-      SUBROUTINE WNCDEL
-      INCLUDE 'COMDIF'
-      CALL PCDRAW (XTDEL,0,0,0,'Delete')
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  WNSET   Routine to set the current text window
-C          Assumes:  1 -- Top left hand window
-C                    2 -- Text window along bottom
-C                    3 -- Full Screen
-C-----------------------------------------------------------------------
-      SUBROUTINE WNSET (I)
-      INCLUDE 'COMDIF'
-      LOGICAL FIRST
-      DATA FIRST/.TRUE./
-      IF (FIRST) THEN
-	 CALL PCDRAW (XOPEN,0,0,0,'PCDRAW')
-	 FIRST = .FALSE.
-      ENDIF
-      IF (I .EQ. 2 .AND. IWNCUR .NE. 3) THEN
-	 CALL PCDRAW (XWIN,2,0,0,ANS)
-      ELSE IF (I .EQ. 2 .AND. IWNCUR .EQ. 3) THEN
-	 CALL PCDRAW (XWIN,3,XCLEAR,0,ANS)
-	 CALL PCDRAW (XWIN,2,XCLEAR,0,ANS)
-	 CALL PCDRAW (XCLEAR,0,0,0,ANS)
-      ELSE IF (I .EQ. 3) THEN
-	 CALL PCDRAW (XWIN,3,XCLEAR,0,ANS)
-      ELSE
-	 CALL PCDRAW (XWIN,I,0,0,ANS)
-      ENDIF
-      IWNCUR = I
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  WNEND  Tidy up for quitting 
-C-----------------------------------------------------------------------
-      SUBROUTINE WNEND
-      INCLUDE 'COMDIF'
-      CALL PCDRAW (XCLOSE,0,0,0,'WNEND')
-      RETURN
-      END 
-C-----------------------------------------------------------------------
-C  SCROLL Scroll text in current window 
-C-----------------------------------------------------------------------
-      SUBROUTINE SCROLL
-      INCLUDE 'COMDIF' 
-      CHARACTER STRING
-      DATA IX,IY,IZ/0,0,0/,STRING/' '/
-      CALL PCDRAW (XSCROL,IX,IY,IZ,STRING)
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  DISPLA Display current angle settings
-C-----------------------------------------------------------------------
-      SUBROUTINE DISPLA (ZT,ZO,ZC,ZP)
-      include 'fgraph.fd'
-      INCLUDE 'COMDIF'
-      character buffer*76
-      integer*2            result,
-     $                     irt(3),ict(3),irb(3),icb(3)
-      record /rccoord/     cursor,old
-      common /pclocl/      irt,ict,irb,icb,ntextw
-      nw = ntextw
-      icount = acount(1)
-      call gettextposition (old)
-      call settextwindow (irt(1),ict(1),irb(1),icb(1))
-      call settextposition (2,2,cursor)
-      write (buffer,10000) ih,ik,il,zt,zo,zc,zp,nref,icount
-10000 format (3i4,'    ',4f8.2,'      Nref',I5,'  Int',i8)
-      call outtext (buffer(1:76))
-      call settextwindow (irt(nw),ict(nw),irb(nw),icb(nw))
-      call settextposition (old.row,old.col,cursor)
-      return
-      end
-C-----------------------------------------------------------------------
-C  DISPLC Display current count settings
-C-----------------------------------------------------------------------
-      SUBROUTINE DISPLC (ICOUNT)
-      include 'fgraph.fd'
-      INCLUDE 'COMDIF'
-      character buffer*64
-      integer*2            result,
-     $                     irt(3),ict(3),irb(3),icb(3)
-      record /rccoord/     cursor,old
-      common /pclocl/      irt,ict,irb,icb,ntextw
-      nw = ntextw
-      call gettextposition (old)
-      call settextwindow (irt(1),ict(1),irb(1),icb(1))
-      call settextposition (2,54,cursor)
-      write (buffer,10000) nref,icount
-10000 format ('  Nref',I5,'  Int',i8)
-      call outtext (buffer(1:24))
-      call settextwindow (irt(nw),ict(nw),irb(nw),icb(nw))
-      call settextposition (old.row,old.col,cursor)
-      return
-      end
diff --git a/difrac/pcount.f b/difrac/pcount.f
deleted file mode 100644
index fd022812..00000000
--- a/difrac/pcount.f
+++ /dev/null
@@ -1,149 +0,0 @@
-C-----------------------------------------------------------------------
-C  Subroutine to take a count for a given time
-C-----------------------------------------------------------------------
-      SUBROUTINE PCOUNT
-      INCLUDE 'COMDIF'
-      DIMENSION C(20),IDEV(20),IFREQ(4),FREQ(4)
-      REAL MPRESET
-      CHARACTER TAG(20)*1
-      DATA TAG/20*' '/
-      WRITE (COUT,10000)
-      CALL YESNO ('Y',ANS)
-      IF (ANS .EQ. 'N') THEN
-        KI = ' '
-        RETURN
-      ENDIF
-      IF (NATTEN .NE. 0) THEN
-        WRITE (COUT,11000)
-      ELSE
-        WRITE (COUT,12000)
-      ENDIF
-      CALL FREEFM (ITR)
-      MPRESET = RFREE(1)
-      IF (MPRESET .EQ. 0.0) MPRESET = 1000.0
-      JFLAG = 0
-      IF (NATT .NE. IFREE(2)) THEN
-        JFLAG = 1
-        NATT = IFREE(2)
-      ENDIF
-      IF (NATT .GT. NATTEN) NATT = NATTEN
-      WRITE (COUT,14000)
-      CALL YESNO ('N',ANS)
-C-----------------------------------------------------------------------
-C  Get current angle values
-C-----------------------------------------------------------------------
-C     CALL ANGET (THETA,OMEGA,CHI,PHI)
-      ICC = 0
-C-----------------------------------------------------------------------
-C  Use ANGSET to set the attenuator
-C-----------------------------------------------------------------------
-      IF (JFLAG .EQ. 1) CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-      IF (ICOL .NE. 0) THEN
-        WRITE (COUT,13000)
-        CALL GWRITE (ITP,' ')
-        KI = ' '
-        RETURN
-      ENDIF
-      CALL SHUTTR (99)
-C-----------------------------------------------------------------------
-C  Single count only
-C-----------------------------------------------------------------------
-      IF (ANS .EQ. 'N') THEN
-        CALL CCTIME (MPRESET,COUNT)
-        IF (NATTEN .NE. 0) THEN
-          WRITE (COUT,15000) MPRESET,NATT,COUNT
-          CALL GWRITE (ITP,' ')
-        ELSE
-          WRITE (COUT,16000) MPRESET,COUNT
-          CALL GWRITE (ITP,' ')
-        ENDIF
-        CALL SHUTTR (-99)
-        KI = ' '
-        RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Repetitive counting, deriving counter preformance statistics.
-C-----------------------------------------------------------------------
-  100 DO 110 I = 1,4
-        IFREQ(I) = 0
-  110 CONTINUE
-      BIGTIM = MPRESET * 5.
-      WRITE (LPT,17000) BIGTIM
-      CALL CCTIME (BIGTIM,COUNT)
-      COUNT = COUNT*MPRESET/BIGTIM
-      SIGM  = SQRT(COUNT)
-      AVC   = COUNT + 0.5
-      IF (NATTEN .NE. 0) THEN
-        WRITE (LPT,18000) MPRESET,NATT,AVC,SIGM
-      ELSE
-        WRITE (LPT,19000) MPRESET,AVC,SIGM
-      ENDIF
-      WRITE (LPT,20000)
-      DO 150 N = 1,50
-        DO 120 I = 1,10
-          CALL CCTIME (MPRESET,COUNT)
-          C(I) = COUNT
-  120   CONTINUE
-        DO 130 I = 1,10
-          IDEV(I) = C(I) - AVC
-  130   CONTINUE
-        DO 140 I = 1,10
-          TAG(I) = ' '
-          IF (ABS(IDEV(I)) .GT. 0.674*SIGM) IFREQ(1) = IFREQ(1) + 1
-          IF (ABS(IDEV(I)) .GT.       SIGM) THEN
-            TAG(I) = 'A'
-            IFREQ(2) = IFREQ(2) + 1
-          ENDIF
-          IF (ABS(IDEV(I)) .GT.    2.*SIGM) THEN
-            TAG(I) = 'B'
-            IFREQ(3) = IFREQ(3) + 1
-          ENDIF
-          IF (ABS(IDEV(I)) .GT.    3.*SIGM) THEN
-            TAG(I) = 'C'
-            IFREQ(4) = IFREQ(4) + 1
-          ENDIF
-  140   CONTINUE
-        WRITE (LPT,21000) (IDEV(I),TAG(I),I = 1,10)
-        CALL KORQ (KQFLAG)
-        IF (KQFLAG .NE. 1) GO TO 155
-  150 CONTINUE
-      I = 50
-  155 BOT = 0.1*N
-      DO 160 I = 1,4
-        FREQ(I) = IFREQ(I)/BOT
-  160 CONTINUE
-      WRITE (LPT,22000) FREQ
-      WRITE (COUT,23000)
-      CALL YESNO ('N',ANS)
-      IF (ANS .EQ. 'Y') GO TO 100
-      CALL SHUTTR (-99)
-      KI = ' '
-      RETURN
-10000 FORMAT (' Timed Count at a Point (Y) ? ',$)
-11000 FORMAT (' Type the Count Preset and the attenuator',
-     $        ' number (1000.0,0) ',$)
-12000 FORMAT (' Type the Count Preset  (1000.0) ',$)
-13000 FORMAT (' Setting Collision')
-14000 FORMAT (' Do you wish to repeat the counting for a stability',
-     $        ' test (N) ? ',$)
-15000 FORMAT (' Time ',F8.3,', Attenuator',I2,', Count ',F7.0)
-16000 FORMAT (' Time ',F8.3,', Count ',F7.0)
-17000 FORMAT (' A count is taken for',F7.2,'secs to establish a',
-     $        ' reasonable mean.'/
-     $        ' Counts are then repeated 500 times and a statistical',
-     $        ' summary printed.'/)
-18000 FORMAT (/,' Time ',F6.2,', Attn.',I2,', Mean Count ',F7.0,
-     $        ' Sigma(Mean)',F7.1)
-19000 FORMAT (/,' Time ',F6.2,',  Mean Count ',F7.0,
-     $        ' Sigma(Mean)',F7.1)
-20000 FORMAT (' The deviations from the Mean Count are printed',
-     $        ' followed by A, B or C,',/,
-     $        ' if the deviation is more than 1, 2 or 3 Sigma(Mean).')
-21000 FORMAT (1X,10(I6,A1))
-22000 FORMAT (/' Distribution of Counts  Observed  Theoretical'/
-     $         '   .GT. 0.674*Sigma      ',F5.1,'%      50.0%'/
-     $         '   .GT. 1.000*Sigma      ',F5.1,'%      31.7%'/ 
-     $         '   .GT. 2.000*Sigma      ',F5.1,'%       4.6%'/
-     $         '   .GT. 3.000*Sigma      ',F5.1,'%       0.3%'/)
-23000 FORMAT (' Do you want to repeat the procedure (N) ? ',$)
-      END
diff --git a/difrac/peaksr.f b/difrac/peaksr.f
deleted file mode 100644
index cab7b200..00000000
--- a/difrac/peaksr.f
+++ /dev/null
@@ -1,209 +0,0 @@
-C----------------------------------------------------------------------
-C  Search for peaks to use with Index (OC)
-C----------------------------------------------------------------------
-      SUBROUTINE PEAKSR
-      INCLUDE 'COMDIF'
-      DIMENSION PHIP(40),THETAS(NSIZE),OMEGS(NSIZE),CHIS(NSIZE),
-     $          PHIS(NSIZE),ITIMS(NSIZE)
-      REAL SPRESET
-      EQUIVALENCE (ACOUNT(        1),THETAS(1)),
-     $            (ACOUNT(  NSIZE+1),OMEGS(1)),
-     $            (ACOUNT(2*NSIZE+1),CHIS(1)),  
-     $            (ACOUNT(3*NSIZE+1),PHIS(1)),
-     $            (ACOUNT(4*NSIZE+1),ITIMS(1)),
-     $            (BCOUNT(  1),PHIP(1))
-      NATT = 0
-      NSTORE = 1
-      NTOT = 0
-      SPRESET = 10000
-C----------------------------------------------------------------------
-C  Write the header and find out if this is new search
-C----------------------------------------------------------------------
-      WRITE (COUT,9000)
-      CALL YESNO ('Y',ANS)
-C----------------------------------------------------------------------
-C  If the answer is yes, then do a straight search;
-C  if the answer is no, then there are 4 possibilities :--
-C     1) Recentre the existing peaks only;
-C     2) Do nothing and exit;
-C     3) Continue searching adding more peaks to the list and then
-C        centre the new ones only;
-C     4) As 3), but recentre the old peaks as well.
-C----------------------------------------------------------------------
-      IF (ANS .EQ. 'N') THEN
-        CALL ANGRW (0,1,NTOT,160,0)
-C----------------------------------------------------------------------
-C  Search for more peaks ?
-C----------------------------------------------------------------------
-        WRITE (COUT,10000) NTOT
-        CALL YESNO ('Y',ANS)
-        IF (ANS .EQ. 'N') THEN
-C----------------------------------------------------------------------
-C  Recentre existing peaks ?
-C----------------------------------------------------------------------
-          WRITE (COUT,11000)
-          CALL YESNO ('Y',ANS)
-          IF (ANS .EQ. 'Y') CALL TCENTR (NSTORE)
-          KI = ' '
-          RETURN
-C----------------------------------------------------------------------
-C  Centre all peaks or just the new peaks 
-C----------------------------------------------------------------------
-        ELSE
-          WRITE (COUT,11100)
-          CALL YESNO ('Y',ANS)
-          IF (ANS .EQ. 'N') NSTORE = NTOT + 1
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  2theta min, max and step
-C-----------------------------------------------------------------------
-      WRITE (COUT,12000)
-      CALL FREEFM (ITR)
-      TTMIN = RFREE(1)
-      TTMAX = RFREE(2)
-      TTSTEP = RFREE(3)
-      IF (TTMIN .EQ. 0.0) TTMIN = 10.0
-      IF (TTMAX .LT. TTMIN) TTMAX = TTMIN + 20.0
-      IF (TTSTEP .EQ. 0.0)  TTSTEP = 4.0
-C-----------------------------------------------------------------------
-C  Chi min, max and step
-C-----------------------------------------------------------------------
-      WRITE (COUT,13000)
-      CALL FREEFM (ITR)
-      CHMIN = RFREE(1)
-      CHMAX = RFREE(2)
-      CHSTEP = RFREE(3)
-      IF (CHMIN .EQ. 0.0 .AND. CHMAX .EQ. 0.0) THEN
-         CHMIN = 220.0
-         CHMAX = 140.0
-      ENDIF
-      IF (CHSTEP .EQ. 0.0) CHSTEP = 10.0
-C-----------------------------------------------------------------------
-C  How many peaks to search for
-C-----------------------------------------------------------------------
-      WRITE (COUT,14000)
-      CALL FREEFM (ITR)
-      MAXPKS = IFREE(1)
-      IF (MAXPKS .EQ. 0) MAXPKS = 20
-      MAXPKS = NTOT + MAXPKS
-C----------------------------------------------------------------------
-C Preset for searching ?
-C---------------------------------------------------------------------
-      WRITE (COUT,13500)
-      CALL FREEFM (ITR)
-      SPRESET = RFREE(1)
-      IF(SPRESET .LE. 0.)SPRESET = 10000
-C-----------------------------------------------------------------------
-C  Is everything OK ?
-C-----------------------------------------------------------------------
-      WRITE (COUT,14100)
-      CALL YESNO ('Y',ANS)
-      IF (ANS .EQ. 'N') THEN
-        KI = ' '
-        RETURN
-      ENDIF
-C----------------------------------------------------------------------
-C  Use PSCAN to find MAXPKS peaks
-C----------------------------------------------------------------------
-      WTHETA = TTMIN
-      WOMEGA = 0.0
-      WCHI   = CHMIN
-      WPHI   = 270.
-      NATT = 0
-      WRITE (COUT,14900)
-      CALL GWRITE (ITP,' ')
-      WRITE (LPT,14900)
-  100 CALL ANGSET (WTHETA,WOMEGA,WCHI,WPHI,NATT,ICOL)
-      CALL PSCAN (NMAX,NTOT,SPRESET)
-C----------------------------------------------------------------------
-C  Save the peaks we found on disk
-C----------------------------------------------------------------------
-      CALL ANGRW (0,5,JUNK,160,0)
-      NMAX = NMAX + NTOT
-      IF (NMAX .GT. NSIZE) NMAX = NSIZE
-      NMIN = NTOT + 1
-C----------------------------------------------------------------------
-C  Add peaks found by this PSCAN
-C----------------------------------------------------------------------
-      J = 0
-      IF (NMIN .LE. NMAX) THEN
-        DO 110 I = NMIN,NMAX
-          J = J + 1
-          THETAS(I) = RTHETA
-          OMEGS(I)  = ROMEGA
-          CHIS(I)   = RCHI
-          PHIS(I)   = PHIP(J)
-          ITIMS(I)  = 100
-  110   CONTINUE
-        NTOT = NMAX
-C----------------------------------------------------------------------
-C  And write them out just in case
-C----------------------------------------------------------------------
-        CALL ANGRW (1,5,NTOT,160,0)
-      ENDIF
-C----------------------------------------------------------------------
-C  Check for K or Q flag setting
-C----------------------------------------------------------------------
-      CALL KORQ (KQFLAG)
-      IF (KQFLAG .NE. 1) THEN
-        WRITE (COUT,15000) NTOT
-        CALL GWRITE (ITP,' ')
-        GO TO 120
-      ENDIF
-C----------------------------------------------------------------------
-C  If we have too few peaks change angles and look for more
-C----------------------------------------------------------------------
-      IF (NTOT .LT. MAXPKS) THEN
-        IF (WCHI .GE. CHMAX) THEN
-          WCHI = CHMIN
-          IF (WTHETA .GE. TTMAX) THEN
-            WRITE (COUT,16000) NTOT
-            CALL GWRITE (ITP,' ')
-            WRITE (LPT,16000) NTOT
-            GO TO 120
-          ENDIF
-          WTHETA = WTHETA + TTSTEP
-        ELSE
-          WCHI = WCHI + CHSTEP
-        ENDIF
-        CALL ANGET (RTHETA,ROMEGA,RCHI,RPHI)
-        WPHI = RPHI
-        GO TO 100
-      ENDIF
-      NFOUND = NTOT - NSTORE + 1
-      WRITE (COUT,17000) NFOUND
-      CALL GWRITE (ITP,' ')
-      WRITE (LPT,17000) NFOUND
-C----------------------------------------------------------------------
-C  We have finished searching for one reason or another
-C----------------------------------------------------------------------
-120   IF (NTOT .GT. 0) THEN
-        CALL ANGRW (1,4,NTOT,160,0)
-C----------------------------------------------------------------------
-C  CAll TCENTR to center the peaks and return
-C----------------------------------------------------------------------
-        CALL TCENTR (NSTORE)
-      ENDIF
-      KI = ' '
-      RETURN
- 9000 FORMAT (' Routine to Search for Reflection Positions'//
-     $        ' Is this a new search (Y) ',$)
-10000 FORMAT (' There are ',I2,' old positions in the list'/
-     $        ' Do you want to search for more (Y) ',$)
-11000 FORMAT (' Do you want to re-centre the old positions (Y) ',$)
-11100 FORMAT (' New positions will be added to the list as they are',
-     $        ' found.'/
-     $        ' Re-centre the old positions before',
-     $        ' centreing the new ones (Y) ? ',$)
-12000 FORMAT (' 2-theta search: min, max, step (10,30,4) ',$)
-13000 FORMAT (' Chi search (allowed range 270 to 90):'/ 
-     $        ' min, max, step (220,140,10) ',$)
-13500 FORMAT('  Counter preset during search (10000): ',$)
-14000 FORMAT (' How many peaks do you want to find (20) ? ',$)
-14100 FORMAT (' Is everything OK (Y) ? ',$)
-14900 FORMAT (/18X,'2theta',5X,'Omega',6X,'Chi',7X,'Phi',7X,'INT')
-15000 FORMAT (' User interrupt after ',I2,' peaks found')
-16000 FORMAT (' Search for complete range. ',I2,' peaks found.')
-17000 FORMAT (I4,' new peaks found before the end of the search.')
-      END
diff --git a/difrac/pfind.f b/difrac/pfind.f
deleted file mode 100644
index d7630ed9..00000000
--- a/difrac/pfind.f
+++ /dev/null
@@ -1,55 +0,0 @@
-C-----------------------------------------------------------------------
-C  Get the coarse value of Phi for PCENTR
-C-----------------------------------------------------------------------
-      SUBROUTINE PFIND (TIM,MAXCOUNT)
-      INCLUDE 'COMDIF'
-      REAL MAXCOUNT, MCOUNT
-      DIMENSION PCOUNT(NSIZE)
-      EQUIVALENCE (ACOUNT(9*NSIZE + 1), PCOUNT(1))
-C-----------------------------------------------------------------------
-C  If offset by 2.5 deg and do 20 0.25 deg steps then we should find
-C  the maximum.
-C-----------------------------------------------------------------------
-      STEPM = 0.05
-      PSTEP = 0.25
-      NPTS = 20
-      NATT = 0
-C-----------------------------------------------------------------------
-C  Offset phi to the start of the scan
-C-----------------------------------------------------------------------
-  100 POFFS = PSTEP*10.0
-      PHI = PHI - POFFS
-      IF (PHI .LT.   0.0) PHI = PHI + 360.0
-      IF (PHI .GE. 360.0) PHI = PHI - 360.0
-      PHIOFF = PHI 
-      CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-C-----------------------------------------------------------------------
-C  Find the max intensity either by step and count or by doing a scan,
-C  depending on the type of diffractometer
-C-----------------------------------------------------------------------
-      ICOUNT = 0
-      MCOUNT = 0
-      DO 110 I = 1,NPTS
-        CALL CCTIME (TIM,PCOUNT(I))
-        CALL KORQ (IFLAG1)
-        IF (IFLAG1 .NE. 1) THEN
-          KI = 'O4'
-          RETURN
-        ENDIF
-        IF (PCOUNT(I) .GT. MCOUNT) THEN
-          MCOUNT = PCOUNT(I)
-          ICOUNT = I
-        ENDIF
-        PHI = PHI + PSTEP
-        IF (PHI .LT.   0.0) PHI = PHI + 360.0
-        IF (PHI .GE. 360.0) PHI = PHI - 360.0
-        CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-  110 CONTINUE
-      MAXCOUNT = REAL(MCOUNT)
-      IF (ICOUNT .EQ. 1 .OR. ICOUNT .EQ. NPTS) THEN
-         TIM = -5.0
-         RETURN 
-      ENDIF
-      PHI = PHIOFF + (ICOUNT - 1)*PSTEP
-      RETURN
-      END
diff --git a/difrac/pltprf.f b/difrac/pltprf.f
deleted file mode 100644
index 4bf6dc4f..00000000
--- a/difrac/pltprf.f
+++ /dev/null
@@ -1,144 +0,0 @@
-C-----------------------------------------------------------------------
-C  Subroutine to plot a line profile on LPT
-C  Redirected output to Screen for SICS: MK
-C-----------------------------------------------------------------------
-      SUBROUTINE PLTPRF (ACOUNT,NPTS,BEGIN)
-      COMMON /IODEVS/ ITP,ITR,LPT,LPTX,NB,NBLOCK,ISD,IID,IBYLEN,
-     $                IPR,NPR,IIP
-      CHARACTER*132 COUT(20)
-      COMMON /IOUASC/ COUT 
-      CHARACTER BEGIN*2,BL(121)*1,BLANK*1,SPACE*1,AST*1,MARK*1
-      CHARACTER ANS*1
-      DIMENSION ACOUNT(121),IX(121),IAL(21)
-      BLANK = ' '
-      SPACE = '+'
-      AST = '*'
-      MARK = '^'
-      IF (BEGIN .NE. 'DE') THEN
-        WRITE (COUT,10000)
-        CALL YESNO ('Y',ANS)
-        IF (ANS .EQ. 'N') RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Put intensities in descending order
-C-----------------------------------------------------------------------
-        DO 100 J = 1,NPTS
-          IX(J) = J
-  100 CONTINUE
-      MPTS = NPTS-1
-      DO 120 J = 1,MPTS
-        BIG = 0
-        DO 110 I = J,NPTS
-          IF (ACOUNT(I) .GT. BIG) THEN
-            BIG = ACOUNT(I)
-            ISAVE = IX(I)
-            JBIG = I
-          ENDIF
-  110   CONTINUE
-        IX(JBIG) = IX(J)
-        ACOUNT(JBIG) = ACOUNT(J)
-        ACOUNT(J) = BIG
-        IX(J) = ISAVE
-  120 CONTINUE
-C-----------------------------------------------------------------------
-C  Scale to 50 max or 10(ACOUNT(1)/10) if ACOUNT(1) < 40
-C-----------------------------------------------------------------------
-      SMAX = 50.0
-      JLOOP = 6
-      SCALE = ACOUNT(1)
-      IF (SCALE .LE. 40.0) THEN
-        J =  1 + SCALE/10
-        SCALE = 10*J
-        JLOOP = J + 1
-      ENDIF
-      DO 130 J = 1,NPTS
-        ACOUNT(J) = ACOUNT(J)*SMAX/SCALE
-  130 CONTINUE
-C-----------------------------------------------------------------------
-C  Fix length of angle axis
-C-----------------------------------------------------------------------
-      NINT = 2
-      IF (NPTS .GT. 35) NINT = 1
-      WRITE (LPT,11000)
-C-----------------------------------------------------------------------
-C  Write the tenth lines
-C-----------------------------------------------------------------------
-      INOW = 50
-      DO 200 JLINE = 1,JLOOP
-        DO 150 J = 1,121
-          BL(J) = BLANK
-  150   CONTINUE
-        JK = 1
-        DO 160 J = 1,NPTS
-          ICOUNT = INT(ACOUNT(J) +0.5)
-          IF (INOW .EQ. ICOUNT) THEN
-            JT = NINT*(IX(J)-1)+1
-            BL(JT) = AST
-            IF (JT .GT. JK) JK = JT
-          ENDIF
-  160   CONTINUE
-        WRITE (LPT,12000) INOW,(BL(J),J = 1,JK)
-C----------------------------------------------------------------------
-C  Write the intermediate lines
-C-----------------------------------------------------------------------
-        IF (JLINE .NE. 6) THEN
-          DO 190 JINT = 1,9
-            INOW = INOW-1
-            DO 170 I = 1,121
-              BL(I) = BLANK
-  170       CONTINUE
-            JK = 1
-            DO 180 J = 1,NPTS
-              ICOUNT = INT(ACOUNT(J) + 0.5)
-              IF (INOW .EQ. ICOUNT) THEN
-                JT = NINT*(IX(J)-1)+1
-                BL(JT) = AST
-                IF (JT .GT. JK) JK = JT
-              ENDIF
-  180       CONTINUE
-            WRITE (COUT,13000) (BL(J),J = 1,JK)
-            CALL GWRITE(ITP,' ')
-  190     CONTINUE
-        INOW = INOW - 1
-        ENDIF
-  200 CONTINUE
-C-----------------------------------------------------------------------
-C  Write the angle axis
-C-----------------------------------------------------------------------
-      DO 210 J = 1,121
-        BL(J) = BLANK
-  210 CONTINUE
-      DO 220 J = 1,121,NINT
-        BL(J) = SPACE
-  220 CONTINUE
-      JINT = NINT*5
-      DO 230 J = 1,121,JINT
-        BL(J) = MARK
-  230 CONTINUE
-      JK = NPTS*NINT
-      WRITE (COUT,14000) (BL(J),J = 1,JK)
-      CALL GWRITE(ITP,' ')
-      MPTS = 1+(NPTS/5)
-      NUM = 0
-      DO 240 J = 1,MPTS
-        IAL(J) = NUM
-        NUM = NUM+5
-  240 CONTINUE
-      IF (NPTS .LE. 35) THEN
-        WRITE (COUT,15000) (IAL(J),J = 1,MPTS)
-        CALL GWRITE(ITP,' ')
-      ELSE
-        WRITE (COUT,16000) (IAL(J),J = 1,MPTS)
-        CALL GWRITE(ITP,' ')
-      ENDIF
-      RETURN
-10000 FORMAT (' Plot Line Profile on LPT (Y) ? ',$)
-11000 FORMAT (/)
-12000 FORMAT (1X,I2,'>',121A1)
-13000 FORMAT (3X,'+',121A1)
-14000 FORMAT (3X,'.',121A1)
-15000 FORMAT (1X,16(I3,7X))
-16000 FORMAT (1X,21(I3,2X))
-      END
-
-
diff --git a/difrac/prnbas.f b/difrac/prnbas.f
deleted file mode 100644
index dcb45401..00000000
--- a/difrac/prnbas.f
+++ /dev/null
@@ -1,291 +0,0 @@
-C-----------------------------------------------------------------------
-C  Routine to print the Basic Data or Intensity Data on LPT
-C-----------------------------------------------------------------------
-      SUBROUTINE PRNBAS
-      INCLUDE 'COMDIF'
-      DIMENSION RW(3,3),ANG(3)
-      CHARACTER CPROF*4,STRING*10
-      WRITE (COUT,10000)
-      CALL ALFNUM (STRING)
-      ANS = STRING(1:1)
-      KZ = -1
-      IF (ANS .EQ. ' ' .OR. ANS .EQ. '0') KZ = 0
-      IF (ANS .EQ. '1') KZ = 1
-      IF (ANS .EQ. '2') KZ = 2
-      IF (ANS .EQ. '3') KZ = 3
-      IF (KZ .EQ. -1) THEN
-        KI = ' '
-        RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Call to PRNINT to print Intensity Data
-C-----------------------------------------------------------------------
-      IF (KZ .EQ. 2 .OR. KZ .EQ. 3) THEN
-        KI = ANS
-        CALL PRNINT
-        KI = ' '
-        RETURN
-      ENDIF
-      IOUT = ITP
-      IF (KZ .EQ. 1) IOUT = LPT
-C-----------------------------------------------------------------------
-C  Print the space-group symbol, wavelength and unit cell
-C-----------------------------------------------------------------------
-      WRITE (STRING,11000) SGSYMB
-      WRITE (COUT,11100) STRING,WAVE
-      CALL GWRITE (IOUT,' ')
-      DO 100 I = 1,3
-        ANG(I) = DEG*ATAN2(SANG(I),CANG(I))
-  100 CONTINUE
-C-----------------------------------------------------------------------
-C  Matrix and cell data
-C-----------------------------------------------------------------------
-      DO 110 I = 1,3
-        DO 110 J = 1,3
-          RW(I,J) = R(I,J)/WAVE
-  110 CONTINUE
-      WRITE (COUT,13000)
-      CALL GWRITE (IOUT,' ')
-      WRITE (COUT,13100) (RW(1,J),J = 1,3),(SINABS(J),J = 1,3)
-      CALL GWRITE (IOUT,' ')
-      WRITE (COUT,13100) (RW(2,J),J = 1,3),(SINABS(J),J = 4,6)
-      CALL GWRITE (IOUT,' ')
-      WRITE (COUT,13100) (RW(3,J),J = 1,3)
-      CALL GWRITE (IOUT,' ')
-      WRITE (COUT,14000) AP,ANG
-      CALL GWRITE (IOUT,' ')
-C-----------------------------------------------------------------------
-C  CZ data
-C-----------------------------------------------------------------------
-      WRITE (COUT,15000) DTHETA,DOMEGA,DCHI
-      CALL GWRITE (IOUT,' ')
-C-----------------------------------------------------------------------
-C  Attenuator Data
-C-----------------------------------------------------------------------
-      IF (NATTEN .EQ. 0) THEN
-        WRITE (COUT,15100)
-      ELSE
-        WRITE (COUT,15200) (ATTEN(J),J = 1,NATTEN+1)
-      ENDIF
-      CALL GWRITE (IOUT,' ')
-C-----------------------------------------------------------------------
-C  Psi data
-C-----------------------------------------------------------------------
-      IF (DPSI .EQ. 0) THEN
-        WRITE (COUT,15300)
-      ELSE
-        WRITE (COUT,15400) PSIMIN,PSIMAX,DPSI
-      ENDIF
-      CALL GWRITE (IOUT,' ')
-C-----------------------------------------------------------------------
-C  Reference Reflection data
-C-----------------------------------------------------------------------
-      IF (NSTAN .EQ. 0) THEN
-        WRITE (COUT,15900)
-        CALL GWRITE (IOUT,' ')
-      ELSE
-        WRITE (COUT,16000) NSTAN,NINTRR
-        CALL GWRITE (IOUT,' ')
-        DO 310 J = 1, NSTAN
-          WRITE (COUT,17000)IHSTAN(J),IKSTAN(J),ILSTAN(J)
-          CALL GWRITE (IOUT,' ')
- 310    CONTINUE  
-      ENDIF
-C-----------------------------------------------------------------------
-C  Re-Orientation data
-C-----------------------------------------------------------------------
-      IF (NINTOR .EQ. 0) THEN
-        WRITE (COUT,18000)
-      ELSE
-        WRITE (COUT,19000) NINTOR,REOTOL
-      ENDIF
-      CALL GWRITE (IOUT,' ')
-      READ (IID,REC = 16) (IOH(I),I = 1,80)
-      READ (IID,REC = 17) (IOK(I),I = 1,80),NTOT
-      READ (IID,REC = 18) (IOL(I),I = 1,80)
-      I = NTOT + NTOT
-      IF (NTOT .GT. 0) THEN
-        WRITE (COUT,16900) I
-        CALL GWRITE (IOUT,' ')
-        DO 320 I = 1, NTOT
-           WRITE (COUT,17000)IOH(I),IOK(I),IOL(I)
-           CALL GWRITE (IOUT,' ')
- 320    CONTINUE   
-      ENDIF
-C-----------------------------------------------------------------------
-C  Pause to allow users to read the screen
-C-----------------------------------------------------------------------
-      WRITE (COUT,20000)
-      CALL ALFNUM (STRING)
-      ANS = STRING(1:1)
-C-----------------------------------------------------------------------
-C  Theta min/max and h,k,l max data
-C-----------------------------------------------------------------------
-      WRITE (COUT,21000) THEMIN,THEMAX,IHMAX,IKMAX,ILMAX
-      CALL GWRITE (IOUT,' ')
-C-----------------------------------------------------------------------
-C  SE data
-C-----------------------------------------------------------------------
-      IF (NCOND .LE. 0) THEN
-        WRITE (COUT,22000)
-        CALL GWRITE (IOUT,' ')
-      ELSE
-        WRITE (COUT,23000)
-        CALL GWRITE (IOUT,' ')
-        DO 140 J = 1,NCOND
-          WRITE (COUT,24000) ICOND(J),IHS(J),IKS(J),ILS(J),IR(J),IS(J)
-          CALL GWRITE (IOUT,' ')
-  140   CONTINUE
-      ENDIF
-C-----------------------------------------------------------------------
-C  SD data
-C-----------------------------------------------------------------------
-      IF (ISCAN .EQ. 1) THEN
-        WRITE (COUT,25000)
-        CALL GWRITE (IOUT,' ')
-      ELSE
-        CPROF = 'No p'
-        IF (IPRFLG .EQ. 0) CPROF = '   P'
-        IF (ITYPE .EQ. 0) THEN
-          WRITE (COUT,26000) CPROF
-          CALL GWRITE (IOUT,' ')
-        ENDIF
-        IF (ITYPE .EQ. 2) THEN
-          WRITE (COUT,27000) CPROF
-          CALL GWRITE (IOUT,' ')
-        ENDIF
-        IF (ITYPE .EQ. 1) THEN
-          WRITE (COUT,28000) CPROF
-          CALL GWRITE (IOUT,' ')
-        ENDIF
-        IF (ITYPE .EQ. 3) THEN
-          WRITE (COUT,29000) CPROF
-          CALL GWRITE (IOUT,' ')
-        ENDIF
-        IF (ITYPE .EQ. 5) THEN
-          WRITE (COUT,30000)
-          CALL GWRITE (IOUT,' ')
-        ENDIF
-        IF (ITYPE .EQ. 6) THEN
-          WRITE (COUT,31000)
-          CALL GWRITE (IOUT,' ')
-        ENDIF
-        IF (ITYPE .EQ. 7) THEN
-          WRITE (COUT,32000)
-          CALL GWRITE (IOUT,' ')
-        ENDIF
-        IF (ITYPE .EQ. 8) THEN
-          WRITE (COUT,33000)
-          CALL GWRITE (IOUT,' ')
-        ENDIF
-      ENDIF
-C      IF (ITYPE .LE. 3) THEN
-C        IF (IBSECT .EQ. 1) THEN
-C          WRITE (COUT,34000) SPEED
-C          CALL GWRITE (IOUT,' ')
-C        ELSE
-C          WRITE (COUT,35000) SPEED
-C          CALL GWRITE (IOUT,' ')
-C        ENDIF
-C      ENDIF                      
-      WRITE (COUT,36000) AS,BS,CS
-      CALL GWRITE (IOUT,' ')
-      WRITE (COUT,37000) FRAC,TMAX,PA,PM
-      CALL GWRITE (IOUT,' ')
-      WRITE(COUT,37100),STEP, PRESET
-      CALL GWRITE (IOUT,' ')
-C-----------------------------------------------------------------------
-C  DH data
-C-----------------------------------------------------------------------
-      WRITE (COUT,38000) NSEG
-      CALL GWRITE (IOUT,' ')
-      DO 150 J = 1,NSEG
-        WRITE (COUT,39000) IHO(J),    IKO(J),    ILO(J),
-     $                     IDH(J,1,1),IDH(J,2,1),IDH(J,3,1),
-     $                     IDH(J,1,2),IDH(J,2,2),IDH(J,3,2),
-     $                     IDH(J,1,3),IDH(J,2,3),IDH(J,3,3)
-        CALL GWRITE (IOUT,' ')
-  150 CONTINUE
-C-----------------------------------------------------------------------
-C  Compton scattering data (not active EJG April 94)
-C-----------------------------------------------------------------------
-      IF (ISCAN .EQ. 1) THEN
-        WRITE (COUT,40000)
-        CALL GWRITE (IOUT,' ')
-        DO 160 J = 1,NSEG
-          WRITE (COUT,39000) JA(J),JB(J),JC(J),JMIN(J),JMAX(J)
-          CALL GWRITE (IOUT,' ')
-  160   CONTINUE
-      ENDIF
-C-----------------------------------------------------------------------
-C  Current GO data
-C-----------------------------------------------------------------------
-      IF (NSET .LE. 0) READ (IID,REC=9) JUNK,JUNK,JUNK,JUNK,NSET
-      WRITE (COUT,43000) IND,NREF,NSET,NMSEG,NBLOCK
-      CALL GWRITE (IOUT,' ')
-      IF (ILN .EQ. 1) THEN
-        WRITE (COUT,44000) DELAY
-        CALL GWRITE (IOUT,' ')
-      ENDIF
-      KI = ' '
-      RETURN
-10000 FORMAT (10X,' Print Data on Terminal or LPT'/
-     $        ' Options are :--  0  Print Basic Data on Terminal'/
-     $        '                  1  Print Basic Data on LPT'/
-     $        '                  2  Print Intensity Data on Terminal'/
-     $        '                  3  Print Intensity Data on LPT'/
-     $        ' Type your choice (0) ',$)
-11000 FORMAT (10A1)
-11100 FORMAT (' Space-group ',A,'   Wavelength ',F10.5)
-13000 FORMAT (10X,'Orientation Matrix',26X,'Theta Matrix')
-13100 FORMAT (3F12.8,5X,3F12.8)
-14000 FORMAT (' Cell    ',3F9.4,5X,3F9.3)
-15000 FORMAT (' D2theta ',F6.3,'   Domega ',F6.3,'   Dchi ',F6.3)
-15100 FORMAT (' No attenuators.')
-15200 FORMAT (' Attenuator factors ',6F8.3)
-15300 FORMAT (' No Psi rotation')
-15400 FORMAT (' Psi rotation from',F7.2,' to',F7.2,' in steps of',F6.2)
-15900 FORMAT (' No reference reflection measurements')
-16000 FORMAT (I3,' reference reflections measured every',I4,
-     $           ' reflections')
-16900 FORMAT (I4,' Alignment/Re-orientation Reflections',
-     $        ' (including Friedel equivalents)')
-17000 FORMAT (4(3I4,3X))
-18000 FORMAT (' No Re-orientation during data-collection.')
-19000 FORMAT (' Re-orientation every',I4,' reflections.'/
-     $        ' Angular tolerance for new matrix acceptance',F7.3)
-20000 FORMAT (/' Type <CR> when ready to proceed.')
-21000 FORMAT (' 2Theta Limits:  Min',F7.3,';  Max',F8.3,'.',
-     $        '  Hmax',I3,', Kmax',I3,', Lmax',I3,'.')
-     $        
-22000 FORMAT (' There are NO Explicit Absence Conditions')
-23000 FORMAT (' The Explicit Absence Conditions are :--')
-24000 FORMAT (' Type',I3,' -- ',
-     $        I4,'*h +',I2,'*k +',I2,'*l = ',I2,'*n +',I2)
-30000 FORMAT (' Peak Top Counting - 2Theta range')
-31000 FORMAT (' Peak Top Counting - Omega range')
-32000 FORMAT (' Economized Peak Top - 2Theta range')
-33000 FORMAT (' Economized Peak Top - Omega range')
-26000 FORMAT (' Omega/2Theta Scan.  ',A,'rofile analysis.')
-27000 FORMAT (' Omega Scan.  ',A,'rofile analysis.')
-28000 FORMAT (' Omega/2Theta Scan with Precision Control.  ',A,
-     $         'rofile analysis.')
-29000 FORMAT (' Omega Scan with Precision Control.  ',A,
-     $         'rofile analysis.')
-25000 FORMAT (' Compton or TDS Measurements')
-35000 FORMAT (' Bisecting Geometry.   Scan speed ',F8.3,'deg/min')
-34000 FORMAT (' Parallel Geometry.   Scan speed ',F8.3,'deg/min')
-36000 FORMAT (' Scan Parameters:   ',
-     $               F6.3,' + ',F6.3,'*tan(theta) + ',F6.3)
-37000 FORMAT (' Time/Precision Params:  ',
-     $        ' Bkfrac',F6.3,'; Tmax ',F6.1,', PA ',F6.2,', PM ',F6.2)
-37100 FORMAT('  Stepwidth: ',F8.3,' Counter Preset: ', F12.2)
-38000 FORMAT (' Segment Data (DH Matrices)  ',I2,' segment(s)')
-39000 FORMAT (12I4)
-40000 FORMAT (' Brillouin Zone Data for each segment',/,
-     $        ' JA  JB  JC JMN JMX')
-43000 FORMAT (' Next reflection: ',3I4,', #',I5,', set',I3,
-     $        ', segment',I2,', at record ',I4)
-44000 FORMAT (' This is a low-temperature experiment.'/
-     $        ' The waiting time after a refill is',F6.2,' minutes.')
-      END
diff --git a/difrac/prnint.f b/difrac/prnint.f
deleted file mode 100644
index 909bc28a..00000000
--- a/difrac/prnint.f
+++ /dev/null
@@ -1,423 +0,0 @@
-C-----------------------------------------------------------------------
-C         Routine to print intensity data from the IDATA file 
-C
-C  The data is listed on the terminal if KI = '2', or
-C                             LPT     if KI = '3'.
-C
-C  For the BI command, the 25 reflections which are in the 2theta 
-C  range and have the highest Inet/Sigma(Inet) are saved, sorted and 
-C  printed.
-C
-C  2theta values are calculated from the R matrix in COMMON.
-C-----------------------------------------------------------------------
-      SUBROUTINE PRNINT
-      INCLUDE 'COMDIF'
-      PARAMETER (NSIG = 50)
-      DIMENSION VEC(3),ENREFB(10),
-     $          IHSIG(NSIG),IKSIG(NSIG),ILSIG(NSIG),
-     $          INSIG(NSIG),RDSIG(NSIG),THSIG(NSIG)
-C      EQUIVALENCE (ACOUNT(  1),IHSIG(1)),(ACOUNT( 51),IKSIG(1)),
-C     $            (ACOUNT(101),ILSIG(1)),(ACOUNT(151),INSIG(1)),
-C     $            (ACOUNT(201),RDSIG(1)),(ACOUNT(251),THSIG(1)),
-C     $            (NREFB(1),ENREFB(1))
-      DATA MOST/25/
-      IF (KI .EQ. 'BI') THEN
-        WRITE (COUT,10000) MOST
-        CALL YESNO ('Y',ANS)
-        IF (ANS .EQ. 'N') THEN
-          KI = ' '
-          RETURN
-        ENDIF
-      ENDIF
-      IP = 0
-      IF (KI .EQ. '2') IOUT = ITP
-      IF (KI .EQ. '3') IOUT = LPT
-      NSAVE = NBLOCK
-      IF (NATTEN .GT. 0 .AND. KI .NE. 'BI') THEN
-        DO 100 I = 1,NATTEN+1
-          J = I - 1
-          WRITE (COUT,12000) J,ATTEN(I)
-          CALL GWRITE (IOUT,' ')
-  100   CONTINUE
-      ENDIF
-      IF (KI .EQ.'BI') THEN
-        WRITE (COUT,13000)
-        SIGMIN = 100000.0
-      ELSE
-        WRITE (COUT,14000)
-      ENDIF
-      CALL FREEFM (ITR)
-      TPMIN = RFREE(1)
-      TPMAX = RFREE(2)
-      SIGRAT = RFREE(3)
-      IRRFLG = 0
-      IF (TPMIN .EQ. 0 .AND. TPMAX .EQ. 0) THEN
-        TPMIN = THEMIN
-        TPMAX = THEMAX
-        SIGRAT = -100000.0
-        IRRFLG = 1
-      ENDIF
-      CALL LENFIL (IID,LASTBL)
-  110 WRITE (COUT,15000) LASTBL
-      CALL FREEFM (ITR)
-      NBEGIN = IFREE(1)
-      IF (NBEGIN .LT. 20) NBEGIN = 20
-      NEND   = IFREE(2)
-      IF (NEND .EQ. 0) NEND = NBEGIN
-      IF (NEND .GT. LASTBL) NEND = LASTBL
-      IALL = 0
-      IF (NEND .EQ. LASTBL) IALL = 1
-      IF (KI .EQ. 'BI') WRITE (LPT,17000)
-      NBLOCK = NBEGIN
-      ISAVE = 0
-C-----------------------------------------------------------------------
-C  Read the specified blocks of intensity data
-C-----------------------------------------------------------------------
-      DO 150 J = NBEGIN,NEND
-        READ (IID,REC=NBLOCK) 
-     $         IHK,ILA,BCOUNT,BBGR1,BBGR2,BTIME,ENREFB,BPSI
-        NBLOCK = NBLOCK + 1
-C-----------------------------------------------------------------------
-C Unpack indices and NATT
-C-----------------------------------------------------------------------
-        DO 140 NB = 1,10
-          ITEMP = IHK(NB)/1000
-          IH = ITEMP - 500
-          IK = IHK(NB) - 500 - 1000*ITEMP
-          ITEMP = ILA(NB)/1000
-          IL = ITEMP - 500
-          IA = ILA(NB) - 1000*ITEMP
-          IF (IH .EQ. 99) THEN
-            THET2 = 0.0
-            GO TO 140
-          ENDIF
-C-----------------------------------------------------------------------
-C Calculate the 2theta value
-C-----------------------------------------------------------------------
-          SUM = 0.0
-          DO 120 I = 1,3
-            VEC(I) = R(I,1)*IH + R(I,2)*IK + R(I,3)*IL
-            SUM = SUM + VEC(I)*VEC(I)
-  120     CONTINUE
-          SINSQ = 0.25*SUM
-          IF (SINSQ .GE. 1.0) THEN
-            NBLOCK = NBLOCK - 1
-            WRITE (COUT,17100) NBLOCK,IH,IK,IL
-            CALL GWRITE (ITP,' ')
-            GO TO 110
-          ENDIF
-          THET2 = 2.0*DEG*ATAN(SQRT(SINSQ/(1.0 - SINSQ)))
-          IF (KI .EQ. 'BI') THEN
-            IF (THET2 .LT. TPMIN) GO TO 140
-          ELSE
-            IF (BPSI(NB) .LT. 900.0 .OR.
-     $         (BPSI(NB) .GE. 900.0 .AND. IRRFLG .EQ. 0)) THEN
-              IF (THET2 .LT. TPMIN .OR. THET2 .GT. TPMAX) GO TO 140
-            ENDIF
-          ENDIF
-C-----------------------------------------------------------------------
-C  Correct for Precision mode (ITYPE = 3 or 4)
-C  Allow for Precision mode with Profile Analysis
-C-----------------------------------------------------------------------
-          RATIO = FRAC
-          NTIMES = 1
-          IF (ITYPE .EQ. 3 .OR. ITYPE .EQ. 4) THEN
-            NTIMES = BTIME(NB)
-            RATIO = FRAC
-            IF (IPRFLG .EQ. 0) NTIMES = ENREFB(NB)
-          ENDIF
-          IF (ITYPE .EQ. 7 .OR. ITYPE .EQ. 8) THEN
-            IRAT = BTIME(NB)
-            RATIO = 1000*(BTIME(NB) - IRAT)/IRAT
-          ENDIF
-          IF (IPRFLG .EQ. 0 .AND. BPSI(NB) .LT. 900) RATIO = BTIME(NB)
-          RATIO = 1.0/(RATIO + RATIO)
-          BAKGND = BBGR1(NB) + BBGR2(NB)
-          INET = BCOUNT(NB) - RATIO*BAKGND
-          RESD = INET/SQRT(BCOUNT(NB) + RATIO*RATIO*BAKGND)
-          AT = ATTEN(IA+1)
-          INET = AT*INET/NTIMES
-          IF (KI .EQ. 'BI') THEN
-            IF (BPSI(NB) .LT. 900.0) THEN
-              IF (ISAVE .LT. NSIG) THEN
-                ISAVE = ISAVE + 1
-                IHSIG(ISAVE) = IH
-                IKSIG(ISAVE) = IK
-                ILSIG(ISAVE) = IL
-                INSIG(ISAVE) = INET
-                RDSIG(ISAVE) = RESD
-                THSIG(ISAVE) = THET2
-                IF (RESD .LT. SIGMIN) THEN
-                  SIGMIN = RESD
-                  IMIN = ISAVE
-                ENDIF
-              ELSE
-                IF (RESD .GT. SIGMIN) THEN
-                  IHSIG(IMIN) = IH
-                  IKSIG(IMIN) = IK
-                  ILSIG(IMIN) = IL
-                  INSIG(IMIN) = INET
-                  RDSIG(IMIN) = RESD
-                  THSIG(IMIN) = THET2
-                  SIGMIN = 100000.0
-                  DO 130 I = 1,NSIG
-                    IF (RDSIG(I) .LT. SIGMIN) THEN
-                      SIGMIN = RDSIG(I)
-                      IMIN = I
-                    ENDIF
-  130             CONTINUE
-                ENDIF
-              ENDIF
-            ENDIF
-            GO TO 140
-          ENDIF
-C-----------------------------------------------------------------------
-C  Reflection data print for the PD command.
-C  Sort out the reference reflections from the rest
-C-----------------------------------------------------------------------
-          IF (RESD .GE. SIGRAT) THEN
-            IF (BPSI(NB) .LT. 900.0) THEN
-              IF (IP .NE. 0) THEN
-                IF (KI .EQ. '3') THEN
-                  WRITE (COUT,18000)
-                  CALL GWRITE (IOUT,' ')
-                ENDIF
-                IP = 0
-              ENDIF
-              WRITE (COUT,19000) IH,IK,IL,THET2,BTIME(NB),IA,
-     $                           BBGR1(NB),BCOUNT(NB),BBGR2(NB),
-     $                           BPSI(NB),INET,RESD
-              CALL GWRITE (IOUT,' ')
-            ELSE
-              IP = 0
-              DO 135 I = 1,NSTAN
-                IF (IH .EQ. IHSTAN(I) .AND. 
-     $              IK .EQ. IKSTAN(I) .AND.
-     $              IL .EQ. ILSTAN(I)) IP = I - 1
-  135         CONTINUE              
-              IF (IP .EQ. 0) THEN
-                IF (KI .EQ. '3') THEN
-                  WRITE (COUT,18000)
-                  CALL GWRITE (IOUT,' ')
-                ENDIF
-              ENDIF
-              IP = IP + 1
-              WRITE (COUT,20000) IP,IH,IK,IL,THET2,BTIME(NB),IA,
-     $                           BBGR1(NB),BCOUNT(NB),BBGR2(NB),
-     $                           INET,RESD
-              CALL GWRITE (IOUT,' ')
-            ENDIF
-          ENDIF
-  140   CONTINUE
-  150 CONTINUE
-C-----------------------------------------------------------------------
-C  Sort and print for the BI command
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'BI') THEN
-        CALL SORTIS (RDSIG(1),ISAVE,IHSIG(1),IKSIG(1),ILSIG(1),INSIG(1),
-     $               THSIG(1))
-        ISIG = MOST
-        IF (ISAVE .LT. MOST) ISIG = ISAVE
-        DO 160 I = 1,ISIG
-          WRITE (LPT,21000) IHSIG(I),IKSIG(I),ILSIG(I),
-     $                      THSIG(I),INSIG(I),RDSIG(I)
-  160   CONTINUE
-      ENDIF
-      IF (IALL .EQ. 0) THEN
-        IF (KI .EQ. 'BI') THEN
-          WRITE (COUT,22000)
-        ELSE
-          WRITE (COUT,23000)
-        ENDIF
-        CALL YESNO ('N',ANS)
-        IF (ANS .EQ. 'Y') GO TO 110
-      ENDIF
-      NBLOCK = NSAVE
-      KI = ' '
-      RETURN
-10000 FORMAT (' Search for the',I3,' biggest Inet/Sigma(Inet) (Y) ? ',$)
-12000 FORMAT (5X,' Attenuator(',I1,') ',F7.2)
-13000 FORMAT (' Type 2thetamin ',$)
-14000 FORMAT (/' Reflns can be selected on 2theta and Inet/Sig(Inet)'/
-     $        ' Type 2thetamin, 2thetamax and min(I/sigI)',
-     $        ' (All Reflns)  ',$)
-15000 FORMAT (' Intensity data is in records 20 to',I5/
-     $        ' Type the range of records to be examined  ',$)
-16000 FORMAT (/' Records',I4,' to',I4,' will be used.')
-17000 FORMAT ('     h   k   l  2Theta    Inet  I/SigI')
-17100 FORMAT (3I4,' in record',I5,' is incompatible with',
-     $        ' the current orientation matrix.'/
-     $        ' Please try again.')
-18000 FORMAT ('%')
-19000 FORMAT (3X,   3(I3,1X),2(F7.3,1X),I1,F5.0,F7.0,F5.0,F8.3,I8,F8.2)
-20000 FORMAT (2X,I1,3(I3,1X),2(F7.3,1X),I1,F5.0,F7.0,F5.0,8X,I8,F8.2)
-21000 FORMAT (3X,3(I3,1X),F7.2,I8,F8.2)
-22000 FORMAT (' Do you want to search more records (N) ? ',$)
-23000 FORMAT (' Do you want to print more records (N) ? ',$)
-      END
-C-----------------------------------------------------------------------
-C  Sort the largest Inet/Sigma(Inet) values
-C-----------------------------------------------------------------------
-      SUBROUTINE SORTIS (RIOS,MOST,LH,LK,LL,LI,RT)
-      DIMENSION RIOS(1), LH(1), LK(1), LL(1), LI(1), RT(1)
-      M = 2
-  100 INTVL = MOST/M
-      IF (INTVL .EQ. 0) INTVL = 1
-      IFIN = MOST - INTVL
-  110 MARK = 0
-      DO 120 I = 1,IFIN
-        J = I+INTVL
-        IF (RIOS(I) .LT. RIOS(J)) THEN
-          TEMP    = RIOS(I)
-          RIOS(I) = RIOS(J)
-          RIOS(J) = TEMP
-          ITEM  = LH(I)
-          LH(I) = LH(J)
-          LH(J) = ITEM
-          ITEM  = LK(I)
-          LK(I) = LK(J)
-          LK(J) = ITEM
-          ITEM  = LL(I)
-          LL(I) = LL(J)
-          LL(J) = ITEM
-          ITEM  = LI(I)
-          LI(I) = LI(J)
-          LI(J) = ITEM
-          TEMP  = RT(I)
-          RT(I) = RT(J)
-          RT(J) = TEMP
-          MARK = 1
-        ENDIF
-  120 CONTINUE
-      IF (MARK .EQ. 1) GO TO 110
-      IF (INTVL .NE. 1) THEN 
-        M = 2*M
-        GO TO 100
-      ENDIF
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  Subroutine to find the length of a direct-access file
-C-----------------------------------------------------------------------
-      SUBROUTINE LENFIL (IUNIT,LASTBL)
-      DIMENSION ISTEP(4)
-      DATA ISTEP/1000,100,10,1/
-      NRSAVE = 0
-      DO 120 I = 1,4
-        IDEL = ISTEP(I)
-        NOFF = NRSAVE
-        N1 =  1
-        N2 = 10
-        IF (I .EQ. 1) N2 = 1000
-        DO 100 N = N1,N2
-          NREC = NOFF + N*IDEL
-          READ (IUNIT, REC = NREC, IOSTAT = IERR) RJUNK
-          IF (IERR .NE. 0) GO TO 110
-          NRSAVE = NREC
-  100   CONTINUE
-  110   IF (I .EQ. 4) THEN
-          LASTBL = NREC - 1
-          RETURN
-        ENDIF
-  120 CONTINUE
-      END
-C-----------------------------------------------------------------------
-C
-C  Convert the intensity data on the direct-access IDATA.DA file, into 
-C  a formatted ASCII file suitable for transmission to or processing by 
-C  other computers.
-C
-C  The contents and format of the ASCII file are :--
-C       h,k,l, Ia, Ib1, Ipeak, Ib2, Time, Nref, Ipsi
-C      ( 3I4,  I2,  I6,   I7,   I6, F9.5,   I6,   I5)  where
-C    Ia    is the attenuator index  (0 to 5),
-C    Ib1   is the low angle background,
-C    Ipeak is the total peak count,
-C    Ib2   is the high angle background,
-C    Time  is (time for 1 background) / (Time for peak),  i.e. FRAC
-C          for normal scans, or
-C          10*number of scans + FRAC for controlled precision modes,
-C    Nref  is the reflection sequence number,
-C    Ipsi  is the psi value, usually 0, 999 for standards.
-C    
-C-----------------------------------------------------------------------
-      SUBROUTINE IDTOAS
-      INCLUDE 'COMDIF'
-      DIMENSION ENREFB(10)
-      EQUIVALENCE(NREFB(1),ENREFB(1))
-      CHARACTER FILEF*40,DEFNAM*10,MORE
-      DEFNAM = 'IDATA.ASC '
-C-----------------------------------------------------------------------
-C  Print the header and connect the file IFM, the formatted ASCII file
-C-----------------------------------------------------------------------
-      IFM = IOUNIT(9)
-  100 WRITE (COUT,10000) DEFNAM
-      FILEF(1:10) = 'DONT DO IT'
-      CALL ALFNUM (FILEF)
-      IF (FILEF .EQ. ' ') FILEF = DEFNAM//' '
-      CALL IBMFIL (FILEF,IFM,IBMREC,'SU',IERR)
-      IF (IERR .NE. 0) GO TO 100
-C-----------------------------------------------------------------------
-C  Find the intensity data record numbers to process
-C-----------------------------------------------------------------------
-      CALL LENFIL (IID,LASTBL)
-      WRITE (COUT,11000) LASTBL
-      CALL YESNO ('Y',ANS)
-  110 IF (ANS .EQ. 'Y') THEN
-        ILAST = 1
-        NBEGIN = 20
-        NEND = LASTBL
-      ELSE
-        WRITE (COUT,12000)
-        CALL FREEFM (ITR)
-        NBEGIN = IFREE(1)
-        NEND = IFREE(2)
-        IF (NEND .EQ. 0) NEND = NBEGIN
-        ILAST = 0
-        IF (NEND .EQ. LASTBL) ILAST = 1
-      ENDIF
-C-----------------------------------------------------------------------
-C  Write the data needed by DATRD2 etc from record 1
-C-----------------------------------------------------------------------
-      WRITE (IFM,12900) THEMAX,DFTYPE,DFMODL,FRAC
-C-----------------------------------------------------------------------
-C  Process the valid data in the selected intensity data records
-C-----------------------------------------------------------------------
-      DO 130 I = NBEGIN,NEND
-        READ (IID,REC = I) IHK,ILA,BCOUNT,BBGR1,BBGR2,BTIME,ENREFB,BPSI
-        DO 120 J = 1,10
-          IF (IHK(J) .NE. 599599) THEN
-            IH = IHK(J)/1000 - 500
-            IK = IHK(J) - 1000*(IH + 500) - 500
-            IL = ILA(J)/1000 - 500
-            IA = ILA(J) - 1000*(IL + 500)
-            IB1   = BBGR1(J)
-            IPEAK = BCOUNT(J)
-            IB2   = BBGR2(J)
-            TIME  = BTIME(J)
-            NREF  = ENREFB(J)
-            IPSI  = BPSI(J)
-            WRITE (IFM,13000) IH,IK,IL,IA,IB1,IPEAK,IB2,TIME,NREF,IPSI
-          ENDIF
-  120   CONTINUE
-  130 CONTINUE
-C-----------------------------------------------------------------------
-C  Any more to processing ?
-C-----------------------------------------------------------------------
-      IF (ILAST .EQ. 0) THEN
-        WRITE (COUT,14000)
-        CALL YESNO ('N',MORE)
-        IF (MORE .EQ. 'Y') GO TO 110
-      ENDIF
-      CALL IBMFIL (FILEF,-IFM,IBMREC,'SU',IERR)
-      KI = ' '
-      RETURN
-10000 FORMAT (/10X,'Convert the IDATA File to ASCII'/
-     $        ' Type the Output ASCII Filename (',A,') ',$)
-11000 FORMAT (' Valid data is in records 20 to',I5,'. Transform it all',
-     $        ' (Y) ? ',$)
-12000 FORMAT (' Type the First and Last record to be transferred ',$)
-12900 FORMAT (F8.3,1X,2A4,F8.4)
-13000 FORMAT (3I4,I2,I6,I7,I6,F9.5,I6,I5)
-14000 FORMAT (' Do you wish to transfer more records (N) ? ',$)
-      END
diff --git a/difrac/profil.f b/difrac/profil.f
deleted file mode 100644
index 47f9bf1c..00000000
--- a/difrac/profil.f
+++ /dev/null
@@ -1,475 +0,0 @@
-C-----------------------------------------------------------------------
-C  Subroutine to find peak limits in the profile
-C-----------------------------------------------------------------------
-      SUBROUTINE PROFIL
-      INCLUDE 'COMDIF'
-      DIMENSION SMOOTH(500),IHTAGS(4),ID(500)
-C-----------------------------------------------------------------------
-C
-C   Explanation of symbols used for Profile Analysis
-C
-C    PLIM       Probability lower limit.  Arbitrarily 0.01
-C    A12        Ratio of Int(alpha1)/Int(alpha2) (1.8)
-C    NWIND      No. of profile points in the test window. (6)
-C    IDEL       No. of pts in the profile + 1
-C    COUNT      Sum of all profile points
-C    FRAC       Ratio of 0.5*Background time/Peak time
-C    SIGLIM     Inet significance limit
-C    CON        No. of profile pts per degree scan (STEPDG).  This
-C               gives a power of two steps for all speeds.
-C    SPEED      Scan speed in degs per min.
-C    D12        Alpha1 to Alpha2 seperation in degrees
-C    ITYPE      Scan type indicator. 0 or 1 2Theta; 2 or 3 Omega
-C    AS         Scan before Alpha1 in degrees
-C    CS         Scan after  Alpha2 in degrees
-C    ACOUNT(I)  Array of profile intensity values
-C    IWARN      Warning flag from the measuring routine. 0 = OK.
-C    IPRFLG     Profile analysis indicator. 0 = Do; 1 = Dont.
-C    BGRD1      Low angle background, taken for FRAC*Peak-time
-C    BGRD2      High angle background, as BGRD1.
-C    RSW        PDP8E Read switch register routine.
-C               RSW(N,J) Reads 1-bit switch N into J
-C    STEPOF     Fraction of As (and Cs) to step off from Alpha1
-C               (and Alpha2) before starting the profile analysis
-C
-C-----------------------------------------------------------------------
-      DATA PLIM/0.01/,A12/1.8/
-      IF ((IPRFLG .NE. 0 .AND. KI(1:1) .NE. 'G') .OR.
-     $    IDEL .LT. 10) RETURN
-C-----------------------------------------------------------------------
-C  Results are sent to the printer for either :--
-C    1. Individual measurements, i.e. not part of GO; or
-C    2. Part of GO and Switch 4 is set to 1.
-C-----------------------------------------------------------------------
-      IF (KI(1:1) .EQ. 'G') THEN
-        CALL RSW (4,ILPT)
-      ELSE
-        ILPT = 0
-      ENDIF
-      A1 = A12/(A12 + 1.0)
-      A2 = 1.0 - A1
-      NWIND = 6
-      ILOW = 1
-      NP = IDEL - 1
-      IHIGH = NP
-      SUM = COUNT
-      FRAC1 = FRAC
-      SIGLIM = 2.0
-      CON = STEPDG
-      RD12 = CON*D12
-      IF (ITYPE .EQ. 2 .OR. ITYPE .EQ. 3) RD12 = RD12*0.5
-      NXPTS = 1000.0/((AS + CS)*CON + RD12)
-      ID12 = RD12 + 0.5
-      ITOL = CON*(AS + CS)/8.0
-      MAXI = 0
-C-----------------------------------------------------------------------
-C  Do not try to process peak top measurements
-C-----------------------------------------------------------------------
-      IF (ITYPE .GE. 4) RETURN
-      CMAX = 0
-      DO 100 I = 1,NP
-        ACT = ACOUNT(I+1)
-        IF (CMAX .LT. ACT) CMAX = ACT
-  100 ACOUNT(I) = ACT
-C-----------------------------------------------------------------------
-C  Smooth the profile (5-point average)
-C-----------------------------------------------------------------------
-      SMOOTH(1) = (ACOUNT(1) + ACOUNT(2) + ACOUNT(3))/3.0
-      SMOOTH(2) = (3.0*SMOOTH(1) + ACOUNT(4))/4.0
-      DO 110 I = 3,NP-2
-        SMOOTH(I) = (ACOUNT(I-2) + ACOUNT(I-1) + ACOUNT(I) +
-     $               ACOUNT(I+1) + ACOUNT(I+2))/5.0
-  110 CONTINUE
-      SMOOTH(NP-1) = (SMOOTH(NP-2)*5 - ACOUNT(NP-4))/4.0
-      SMOOTH(NP) = (4.0*SMOOTH(NP-1) - ACOUNT(NP-3))/3.0
-C-----------------------------------------------------------------------
-C  Test if peak is OK from MESINT or profile not needed
-C-----------------------------------------------------------------------
-      IF (IWARN .NE. 0) GO TO 240
-C-----------------------------------------------------------------------
-C  Work out Inet and sigma(Inet)
-C-----------------------------------------------------------------------
-      BTOT = (BGRD1 + BGRD2)/(FRAC + FRAC)
-      BKN = BTOT/NP
-      TOP = COUNT - BTOT
-      BOT = SQRT(COUNT + BTOT/(FRAC + FRAC))
-C-----------------------------------------------------------------------
-C  If GO mode and no profile analysis print results for non-standards
-C-----------------------------------------------------------------------
-      IF (IPRFLG .NE. 0 .AND. KI(1:1) .EQ. 'G') THEN
-        IF (ISTAN .EQ. 0) THEN
-          ITOP = TOP + 0.5
-          IBOT = BOT + 0.5
-          IF (TOP .LE. SIGLIM*BOT) THEN
-            IF (ILPT .EQ. 0) WRITE (LPT,10000)  IH,IK,IL,ITOP,IBOT,NREF
-            WRITE (COUT,10000) IH,IK,IL,ITOP,IBOT,NREF
-          ELSE
-            IF (NATT .NE. 0) THEN
-              IF (ILPT .EQ. 0) 
-     $        WRITE (LPT,15100)  IH,IK,IL,NATT,ITOP,IBOT,NREF
-              WRITE (COUT,15100) IH,IK,IL,NATT,ITOP,IBOT,NREF
-            ELSE
-              IF (ILPT .EQ. 0) 
-     $        WRITE (LPT,15200)  IH,IK,IL,ITOP,IBOT,NREF
-              WRITE (COUT,15200) IH,IK,IL,ITOP,IBOT,NREF
-            ENDIF
-          ENDIF
-          CALL GWRITE (ITP,' ')
-          GO TO 240
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  Test if peak is considered significant and print if not
-C-----------------------------------------------------------------------
-      IF (TOP .LE. SIGLIM*BOT) IWARN = 1
-      IF (IWARN .NE. 0) THEN
-        ITOP = TOP + 0.5
-        IBOT = BOT + 0.5
-        IF (ILPT .EQ. 0) WRITE (LPT,10000) IH,IK,IL,ITOP,IBOT,NREF
-        WRITE (COUT,10000) IH,IK,IL,ITOP,IBOT,NREF
-        CALL GWRITE (ITP,' ')
-      ENDIF
-      IF (IWARN .NE. 0) GO TO 240
-C-----------------------------------------------------------------------
-C  Profile is OK and significant.  Print smoothed profile if Demo
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'DE') THEN
-        WRITE (COUT,11000)
-        CALL GWRITE (ITP,' ')
-        WRITE (COUT,12000) (SMOOTH(J),J = 1,NP)
-        CALL GWRITE (ITP,' ')
-      ENDIF
-C-----------------------------------------------------------------------
-C  Test that there are no funny bumps in the profile, by ensuring that
-C  the max of the peak is near the correct position.
-C  MAXA is the calculated position of the alpha peak
-C  MAXI is the intensity weighted maximum
-C-----------------------------------------------------------------------
-      MAXA = AS*CON + RD12*A2 + 0.5
-      SUMI = 0
-      SUMNI = 0
-      DO 120 N = 1,NP
-        D = SMOOTH(N) - BKN
-        SUMI = SUMI + D
-        SUMNI = SUMNI + N*D
-  120 CONTINUE
-      MAXI = 0.5 + SUMNI/SUMI
-C-----------------------------------------------------------------------
-C  Allow for a variable acceptance window
-C-----------------------------------------------------------------------
-      CALL RSW(8,I)
-       ITOL =  5*I + ITOL
-      CALL RSW(7,I)
-       ITOL = 10*I + ITOL
-      CALL RSW(6,I)
-       ITOL = 20*I + ITOL
-      IF (ABS(MAXI-MAXA) .GT. ITOL) THEN
-        IF (TOP .GT. 2.0*SIGLIM*BOT) THEN
-          IWARN = 2
-          WRITE (COUT,14000) IH,IK,IL,MAXI,MAXA,BGRD1,COUNT,BGRD2
-          CALL GWRITE (ITP,' ')
-          IF (ILPT .EQ. 0) 
-     $        WRITE (LPT,14000) IH,IK,IL,MAXI,MAXA,BGRD1,COUNT,BGRD2
-        ELSE
-          WRITE (COUT,14100) IH,IK,IL,MAXI,MAXA,BGRD1,COUNT,BGRD2
-          CALL GWRITE (ITP,' ')
-          IF (ILPT .EQ. 0) 
-     $        WRITE (LPT,14100) IH,IK,IL,MAXI,MAXA,BGRD1,COUNT,BGRD2
-        ENDIF
-        GO TO 240
-      ENDIF
-C-----------------------------------------------------------------------
-C  The profile is suitable for analysis to find the limits
-C  J1 is the beginning of the low angle search
-C  J2 is the beginning of the high angle search
-C-----------------------------------------------------------------------
-C      J1 = MAXI - STEPOF*CON*AS - A2*ID12
-C      J2 = MAXI + STEPOF*CON*CS + A1*ID12
-      J1 = MAXI - ((STEPOF*AS)/STEP) - A2*ID12
-      J2 = MAXI + ((STEPOF*CS)/STEP) + A1*ID12
-      IF (J1 .LE. NWIND .OR. J2 .GE. NP-NWIND) THEN
-        ILOW = 1
-        IHIGH = NP
-        GO TO 210
-      ENDIF
-C-----------------------------------------------------------------------
-C  Find the low angle limit by moving down from J1
-C  Set the window width to 0.67*0.67*CNT/5
-C  Find how many of the next NWIND values are in the window and if more
-C  than half are in the window, switch on the detector PROB.
-C-----------------------------------------------------------------------
-      J = J1
-      LIM = J - 1
-      IFLAG = 0
-      PROB = 1
-      DO 160 I = NWIND,LIM
-        CNT = SMOOTH(J)
-        W = 0.08978*CNT
-        SUM = 0
-        DO 150 KK = J-NWIND,J-1
-          DIFF = CNT - SMOOTH(KK)
-          DC = DIFF*DIFF
-          IF (DC .LT. W) SUM = SUM + 1
-  150   CONTINUE
-        IF (SUM .GE. NWIND/2) IFLAG = 1
-        IF (IFLAG .NE. 0) THEN
-           PROB = PROB*(NWIND - SUM)/NWIND
-           IF (PROB .LE. PLIM) GO TO 170
-        ENDIF
-        J = J - 1
-  160 CONTINUE
-  170 ILOW = J-NWIND
-      IF (ILOW .LE. 0) ILOW = 1
-C-----------------------------------------------------------------------
-C  Do the same for the high angle side
-C-----------------------------------------------------------------------
-      J = J2
-      LIM = J + 1
-      IFLAG = 0
-      PROB = 1
-      DO 190 I = LIM,IDEL-NWIND
-        CNT = SMOOTH(J)
-        W = 0.08978*CNT
-        SUM = 0
-        DO 180 KK = J+1,J+NWIND
-          DIFF = CNT - SMOOTH(KK)
-          DC = DIFF*DIFF
-          IF (DC .LT. W) SUM = SUM + 1
-  180   CONTINUE
-        IF (SUM .GE. NWIND/2) IFLAG = 1
-        IF (IFLAG .NE. 0) THEN
-           PROB = PROB*(NWIND - SUM)/NWIND
-           IF (PROB .LE. PLIM) GO TO 200
-        ENDIF
-        J = J + 1
-  190 CONTINUE
-  200 IHIGH = J + NWIND
-      IF (IHIGH .GT. NP) IHIGH = NP
-C-----------------------------------------------------------------------
-C  Now work out the net count & esd for profile between
-C  ILOW & IHIGH, using BGRD1 & BGRD2 plus pts between 1 to ILOW
-C  and IHIGH to NP for the background
-C  Revised EJG Aug 94 to allow for sloping backgrounds better
-C-----------------------------------------------------------------------
-  210 NPK = IHIGH - ILOW + 1
-      B1 = BGRD1
-      IF (ILOW .GT. 1) THEN
-        DO 220 I = 1,ILOW-1
-          B1 = B1 + ACOUNT(I)
-  220   CONTINUE
-      ENDIF
-      FRAC1 = (FRAC*NP + ILOW - 1)/NPK
-      PEAK = 0.0
-      DO 225 I = ILOW,IHIGH
-        PEAK = PEAK + ACOUNT(I)
-  225 CONTINUE
-      B2 = BGRD2
-      IF (IHIGH .LT. NP) THEN
-        DO 230 I = IHIGH+1,NP
-          B2 = B2 + ACOUNT(I)
-  230   CONTINUE
-      ENDIF
-      FRAC2 = (FRAC*NP + NP - IHIGH)/NPK
-      BTOT = 0.5*(B1/FRAC1 + B2/FRAC2)
-      TOP1 = PEAK - BTOT
-      BOT1 = SQRT(PEAK + 0.25*(B1/(FRAC1*FRAC1) + B2/(FRAC2*FRAC2)))
-      FRAC1 = 0.5*(FRAC1 + FRAC2)
-      BGRD1 = BTOT*FRAC1
-      SUM   = PEAK
-      BGRD2 = BGRD1
-C-----------------------------------------------------------------------
-C  Print Inet and sigma(Inet) for non-standards in GO mode
-C-----------------------------------------------------------------------
-      IF (KI(1:1) .EQ. 'G' .AND. ISTAN .EQ. 0) THEN
-        ITOP = TOP1 + 0.5
-        IBOT = BOT1 + 0.5
-        IF (TOP .LE. SIGLIM*BOT) THEN
-          IF (ILPT .EQ. 0) WRITE (LPT,10000)  IH,IK,IL,ITOP,IBOT,NREF
-          WRITE (COUT,10000) IH,IK,IL,ITOP,IBOT,NREF
-        ELSE
-          IF (NATT .NE. 0) THEN
-            IF (ILPT .EQ. 0) 
-     $      WRITE (LPT,15100)  IH,IK,IL,NATT,ITOP,IBOT,NREF
-            WRITE (COUT,15100) IH,IK,IL,NATT,ITOP,IBOT,NREF
-          ELSE
-            IF (ILPT .EQ. 0) 
-     $      WRITE (LPT,15200)  IH,IK,IL,ITOP,IBOT,NREF
-            WRITE (COUT,15200) IH,IK,IL,ITOP,IBOT,NREF
-          ENDIF
-        ENDIF
-        CALL GWRITE (ITP,' ')
-      ENDIF
-  240 CALL RSW(9,JSW)
-C------- always write profile at TRICS!
-C      IF (JSW .NE. 0 .and. istan .ne. 0) CALL PRFWRT (NP)
-      CALL PRFWRT (NP)
-C-----------------------------------------------------------------------
-C  Prepare the profile for display on the c.r.t. if wanted
-C  Code below here is not needed for profile analysis
-C  The display is 10-bits * 10-bits
-C  If this reflection is to be plotted, the scaling is done in the
-C    display routine itself as the profile is developed.
-C  If the last reflection is to be plotted, the scaling is done here
-C    and an origin offset is added.  Scaling is to a max of 1000 in each
-C    direction and the packing is 
-C       4096*scaled-counts + scaled-width + 4096*1024
-C  The marks are shifted by 100 points.
-C
-C SR 0 = 0 for normal display; = 1 for profile display
-C-----------------------------------------------------------------------
-      CALL RSW (1,I)
-      IF (I .NE. 0) THEN
-C-----------------------------------------------------------------------
-C  SR 1 = 0 not this time; = 1 for last reflection
-C-----------------------------------------------------------------------
-        N = NXPTS
-C-----------------------------------------------------------------------
-C SR 2 = 0 for raw counts; = 1 for smoothed counts
-C-----------------------------------------------------------------------
-          CALL RSW (2,J)
-C-----------------------------------------------------------------------
-C  Insert marks at ILOW,IHIGH and ALPHA1 obs and calc positions
-C-----------------------------------------------------------------------
-        IHTAGS(1) = AS * CON
-        IHTAGS(2) = AS * CON
-        IF (IWARN .NE. 1) IHTAGS(1) = MAXI - A2*ID12  
-        IHTAGS(3) = ILOW
-        IHTAGS(4) = IHIGH
-        IF (J .NE. 0) THEN
-           CALL PTPREP (NP,SMOOTH,IHTAGS)
-        ELSE
-           CALL PTPREP (NP,ACOUNT,IHTAGS)
-        ENDIF 
-      ENDIF
-      CALL RSW (3,J)
-      IF (J .EQ. 1) THEN
-C-----------------------------------------------------------------------
-C  Dump the difference profile for Ladge
-C-----------------------------------------------------------------------
-C      ic = 0
-C      do 1000 i = 1,np
-C        j = acount(i) + 0.5
-C        id(i) = j - ic
-C        ic = j
-C 1000 continue
-C         WRITE (LPT,17100) (id(I),I=1,NP)
-C17100 format (10(3x,z4))
-         WRITE (LPT,17000) (acount(I),I=1,NP)
-         WRITE (LPT,17000) (SMOOTH(I),I=1,NP)
-      ENDIF 
-      RETURN
-10000 FORMAT (3I4,2X,I7,'(',I4,') ',I5,' **')
-11000 FORMAT (/,' The Profile counts are:')
-12000 FORMAT (1X,10F7.0)
-14000 FORMAT (3I4,' Max Profile',I4,', Alpha',I5,3F7.0)
-14100 FORMAT (3I4,' Max Profile',I4,', Alpha',I4,3F7.0,' Weak Peak')
-15000 FORMAT (3I4,F5.0,F7.0,F5.0,3I4,5F7.0/1X,F5.0,F8.4,2F6.0)
-15100 FORMAT (3I4,I2,I7,'(',I4,') ',I5)
-15200 FORMAT (3I4,2X,I7,'(',I4,') ',I5)
-17000 FORMAT (1X,10F7.0)
-      END
-C-----------------------------------------------------------------------
-C  Write a profile on unit 7 (32 4-byte variables per record) :--
-C  Each reflection is written as several records.
-C  Record 1:
-C     Bytes     Symbol                  Contents
-C    1 to 12   IH IK IL       h, k, l   4 bytes each
-C   13 to 16    NP2           number of pts in profile + 1000*std #
-C   17 to 20    ILOW          the point number on the low angle side
-C                             1 if no analysis
-C   21 to 24    IHIGH         the point number on the high angle side
-C                             NP if no analysis
-C   25 to 28    FRAC1         b/P time ratio (0.1 if no analysis)
-C   29 to 32    IB1           Low angle background
-C   31 to 36    ICOUNT        Sum of all NP profile points
-C   37 to 40    IB2           High angle background
-C   41 to 28    44 profile points  - 32000   (2 bytes each)
-C
-C  Record 2 on:
-C    1 to 128   64 profile points
-C-----------------------------------------------------------------------
-      SUBROUTINE PRFWRT (NP)
-      INCLUDE 'COMDIF'
-      INTEGER*2 IPTS(500)
-      EQUIVALENCE (ACOUNT(501),IPTS(1))
-      NP2 = NP2 + 1000*NN
-      IB1    = BGRD1
-      ICOUNT = COUNT
-      IB2    = BGRD2
-      NREC = (NP + 20 + 63)/64 - 1
-      DO 100 I = 1,NP
-        IPTS(I) = ACOUNT(I) - 32000
-  100 CONTINUE
-      IPR = IOUNIT(7)
-      IDREC = 32*IBYLEN
-      STATUS = 'DO'
-      CALL IBMFIL (PRNAME, IPR,IDREC,STATUS,IERR)
-      NPR = NPR + 1
-      WRITE (IPR,REC=NPR) IH,IK,IL,NP2,ILOW,IHIGH,FRAC1,IB1,ICOUNT,IB2,
-     $                   (IPTS(J),J=1,44)
-      IF (NREC .NE. 0) THEN
-        J1 = 45
-        DO 110 I = 1,NREC
-          J2 = J1 + 63
-          NPR = NPR + 1
-          WRITE (IPR,REC=NPR) (IPTS(J),J=J1,J2)
-          J1 = J2 + 1
-  110   CONTINUE
-      ENDIF       
-      CALL IBMFIL (PRNAME,-IPR,IDREC,STATUS,IERR)
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  Routine to write the binary stored profiles to an ASCII file
-C  The format of the ASCII file for each reflection is :--
-C  Line 1
-C  h,k,l, Npts, Ilow, Ihigh, Frac, Ib1, Icount, Ib2
-C     ( 3I4, 3I5, F8.5, I6, I7, I6)
-C  NREC lines  of IPTS (10I6)
-C-----------------------------------------------------------------------
-      SUBROUTINE PROFAS
-      INCLUDE 'COMDIF'
-      DIMENSION JPTS(500)
-      INTEGER*2 IPTS(500)
-      CHARACTER ASPROF*40
-      EQUIVALENCE (ACOUNT(501),IPTS(1)),(ACOUNT(1001),JPTS(1))
-      IPR = IOUNIT(7)
-      IDREC = 32*IBYLEN
-      CALL IBMFIL (PRNAME, IPR,IDREC,'DO',IERR)
-      IAS = IOUNIT(8)
-      WRITE (COUT,10000)
-      ASPROF = 'DONT DO IT'//' '
-      CALL ALFNUM (ASPROF)
-      IF (ASPROF .EQ. ' ') ASPROF = 'PROFL7.ASC'
-      CALL IBMFIL (ASPROF, IAS,IDREC,'SU',IERR)
-      NPR = 0
-  100 NPR = NPR + 1
-      READ (IPR,REC=NPR,IOSTAT=I) 
-     $      IH,IK,IL,NP2,ILOW,IHIGH,FRAC,IB1,ICOUNT,IB2,(IPTS(J),J=1,52)
-      IF (I .EQ. 0) THEN
-        NP = NP2 - 1000*(NP2/1000)
-        NREC = (NP + 20 + 63)/64 - 1
-        IF (NREC .GT. 0) THEN
-          J1 = 45
-          DO 110 I = 1,NREC
-            J2 = J1 + 63
-            NPR = NPR + 1
-            READ (IPR,REC=NPR) (IPTS(J),J=J1,J2)
-            J1 = J2 + 1
-  110     CONTINUE
-        ENDIF
-        DO 120 I = 1,NP
-          JPTS(I) = IPTS(I) + 32000
-  120   CONTINUE
-        WRITE (IAS,11000) IH,IK,IL,NP2,ILOW,IHIGH,FRAC,IB1,ICOUNT,IB2
-        WRITE (IAS,12000) (JPTS(I),I=1,NP)
-        GO TO 100
-      ENDIF
-      CALL IBMFIL (PRNAME,-IPR,IDREC,'DO',IERR)
-      CALL IBMFIL (ASPROF,-IAS,IDREC,'SU',IERR)
-      KI = ' '
-      RETURN
-10000 FORMAT (' Type the name of the ASCII file (PROFL7.ASC) ',$)
-11000 FORMAT (3I4,3I5,F8.5,I6,I7,I6)
-12000 FORMAT (10I6)
-      END
diff --git a/difrac/prompt.f b/difrac/prompt.f
deleted file mode 100644
index 3c67c6c8..00000000
--- a/difrac/prompt.f
+++ /dev/null
@@ -1,157 +0,0 @@
-C-----------------------------------------------------------------------
-C  Routines to perform consol I/O
-C-----------------------------------------------------------------------
-      SUBROUTINE GWRITE (IDEV,DOLLAR)
-      CHARACTER  DOLLAR*(*)
-      CHARACTER*132 COUT(20)
-      COMMON /IOUASC/ COUT
-      COMMON /IOUASS/ IOUNIT(10)
-      CHARACTER CR*1,LF*1,CRLF*2
-      CR = CHAR(13)
-      LF = CHAR(10)
-      CRLF(1:1) = CR
-      CRLF(2:2) = LF
-      ITP = IOUNIT(6)
-C-----------------------------------------------------------------------
-C  First find out how many lines to output
-C-----------------------------------------------------------------------
-      DO 10 I = 20,1,-1
-         IF (COUT(I) .NE. ' ') GO TO 20
-10    CONTINUE
-C-----------------------------------------------------------------------
-C  Nothing to print -- assume that we must want to output a blank line
-C-----------------------------------------------------------------------
-      I = 1
-20    NLINES = I
-C-----------------------------------------------------------------------
-C  If the unit is not ITP then just do straight output to the device
-C-----------------------------------------------------------------------
-      IF (IDEV .NE. ITP) THEN
-         IF (NLINES .GT. 1) THEN
-            DO 30 I = 1,NLINES-1
-               WRITE (IDEV,10000) COUT(I)(1:LINELN(COUT(I)))
-30          CONTINUE
-         ENDIF
-         IF (DOLLAR .EQ. '$') THEN
-            WRITE (IDEV,10100) COUT(NLINES)(1:LINELN(COUT(I)))
-         ELSE
-            WRITE (IDEV,10000) COUT(NLINES)(1:LINELN(COUT(I)))
-         ENDIF
-      ELSE
-         DO 40 I = 1,NLINES-1
-            CALL WNTEXT (COUT(I)(1:LINELN(COUT(I))))
-            CALL SCROLL
-40       CONTINUE
-         IF (COUT(NLINES)(1:1) .NE. '%') 
-     $            CALL WNTEXT (COUT(NLINES)(1:LINELN(COUT(NLINES))))
-         IF (DOLLAR .EQ. '$') THEN
-            CALL WNTEXT (' ')
-         ELSE
-            CALL SCROLL
-         ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  Just in case we will blank out COUT
-C-----------------------------------------------------------------------
-      DO 50 I = 1,20
-         COUT(I) = ' '
-50    CONTINUE
-      RETURN
-10000 FORMAT (A)
-10100 FORMAT (A,' ',$)
-      END
-C-----------------------------------------------------------------------
-C  Function to return the length of a character string
-C-----------------------------------------------------------------------
-      INTEGER FUNCTION LINELN (STRING)
-      CHARACTER STRING*(*)
-      DO 10 I = LEN(STRING),1,-1
-         IF (STRING(I:I) .NE. ' ') GO TO 20
-10    CONTINUE
-      I = 1
-20    LINELN = I
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C   GETLIN  Read a line of input from the keyboard
-C-----------------------------------------------------------------------
-      SUBROUTINE GETLIN (STRING)
-      CHARACTER  STRING*(*)
-      INTEGER    KEYGET
-C-----------------------------------------------------------------------
-C   Do some housekeeping
-C-----------------------------------------------------------------------
-      MAX = LEN(STRING)
-      STRING = ' '
-      INDEX = 0
-C-----------------------------------------------------------------------
-C   Loop until we find either <cr> or control-C
-C-----------------------------------------------------------------------
-10    IC = KEYGET ()
-C-----------------------------------------------------------------------
-C  Control C
-C-----------------------------------------------------------------------
-      IF (IC .EQ. 3) THEN
-         STOP
-C-----------------------------------------------------------------------
-C  Return -- line complete
-C-----------------------------------------------------------------------
-      ELSE IF (IC .EQ. 13) THEN
-         CALL SCROLL
-         RETURN
-C-----------------------------------------------------------------------
-C  Backspace or Delete
-C-----------------------------------------------------------------------
-      ELSE IF (IC .EQ. 8 .OR. IC .EQ. 16) THEN
-         IF (INDEX .GE. 1) THEN
-            CALL WNCDEL
-            STRING(INDEX:INDEX) = ' '
-            INDEX = INDEX - 1
-         ENDIF
-         GO TO 10
-C-----------------------------------------------------------------------
-C  Some other control character
-C-----------------------------------------------------------------------
-      ELSE IF (IC .LE. 31) THEN
-         GO TO 10
-C-----------------------------------------------------------------------
-C  Something we want!
-C-----------------------------------------------------------------------
-      ELSE
-         INDEX = INDEX + 1
-         STRING(INDEX:INDEX) = CHAR(IC)
-         CALL WNTEXT (STRING(INDEX:INDEX))
-      ENDIF
-C-----------------------------------------------------------------------
-C  Handle the case of more input than string length by eating characters
-C  while waiting for <return>.  Backspace is handled correctly.
-C-----------------------------------------------------------------------
-      IF (INDEX .GE. MAX) THEN
-20       IC = KEYGET ()
-         IF (IC .EQ. 8 .OR. IC .EQ. 16) THEN
-            CALL WNCDEL
-            STRING(INDEX:INDEX) = ' '
-            INDEX = INDEX - 1
-            GO TO 10
-         ENDIF
-         IF (IC .NE. 13) GO TO 20
-         CALL SCROLL
-         RETURN
-      ENDIF
-      GO TO 10
-      END
-C-----------------------------------------------------------------------
-C  Function KEYGET -- MS Fortran specific
-C-----------------------------------------------------------------------
-C     INCLUDE 'FLIB.FI'
-C     FUNCTION KEYGET
-C     INCLUDE 'FLIB.FD'
-C     RECORD /REGS$INFO/ INREGS, OUTREGS
-C     INREGS.BREGS.AH = 8
-C     CALL INTDOSQQ (INREGS,OUTREGS)
-C     KEYGET = OUTREGS.BREGS.AL
-C     RETURN
-C     END
-C-----------------------------------------------------------------------
-C  Function KEYSIN -- MS Fortran specific
-C-----------------------------------------------------------------------
diff --git a/difrac/prtang.f b/difrac/prtang.f
deleted file mode 100644
index 3aeb71e4..00000000
--- a/difrac/prtang.f
+++ /dev/null
@@ -1,12 +0,0 @@
-C-----------------------------------------------------------------------
-C  Subroutine to print the current angle values
-C-----------------------------------------------------------------------
-      SUBROUTINE PRTANG
-      INCLUDE 'COMDIF'
-      CALL ANGET (RTHETA,ROMEGA,RCHI,RPHI)
-      WRITE (COUT,10000) IH,IK,IL,RTHETA,ROMEGA,RCHI,RPHI
-      CALL GWRITE (ITP,' ')
-      KI = ' '
-      RETURN
-10000 FORMAT (' Current values are ',3I4,4F8.3)
-      END
diff --git a/difrac/pscan.f b/difrac/pscan.f
deleted file mode 100644
index fc514554..00000000
--- a/difrac/pscan.f
+++ /dev/null
@@ -1,86 +0,0 @@
-C-----------------------------------------------------------------------
-C  This subroutine scans Phi from 0 to 360 and extracts possible peaks
-C-----------------------------------------------------------------------
-      SUBROUTINE PSCAN (NMAX,NTOT,SPRESET)
-      INCLUDE 'COMDIF'
-      DIMENSION PHIP(40),PCOUNT(40)
-      EQUIVALENCE (BCOUNT(1),PHIP(1))
-      NMAX = 0
-      KI = ' '
-      N5= 5*NSIZE
-C-----------------------------------------------------------------------
-C  Start Phi, high speed, + sense
-C-----------------------------------------------------------------------
-      ACOUNT(N5) = 0
-      CALL ANGET (RTHETA,ROMEGA,RCHI,RPHI)
-      CALL RPSCAN (NPTS,ICOL,SPRESET)
-      IF (ICOL .NE. 0) THEN
-         WRITE (COUT,10000)
-         CALL GWRITE (ITP,' ')
-         IF (KI .EQ. 'RP') KI = ' '
-         RETURN
-      ENDIF 
-C-----------------------------------------------------------------------
-C  Look for peaks in the profile: if a given count is more than 4 sigmas
-C  above the average of the 3 counts before and the 3 counts after it,
-C  it is a probably a peak.  This may be a little weak -- try 8 sigmas
-C  for now.
-C-----------------------------------------------------------------------
-      I = NPTS 
-      DO 110 J = 1,I 
-        INDZ = MOD((J + I - 4),I) + 1
-        SUM = 0
-        DO 100 KA = 1,7
-          IF (KA .NE. 4) SUM = SUM + ACOUNT(INDZ)
-          INDZ = INDZ + 1
-          IF (INDZ .GT. I) INDZ = 1
-  100   CONTINUE
-        AVECT = SUM/6.0
-        THRESH = AVECT + 4.0*SQRT(AVECT/6.0 + ACOUNT(J))
-        IF (ACOUNT(J) .GT. THRESH) THEN
-          NMAX = NMAX + 1
-          PHIP(NMAX) = ACOUNT(J+N5)
-          PCOUNT(NMAX) = ACOUNT(J)
-        ENDIF
-  110 CONTINUE
-C-----------------------------------------------------------------------
-C  Eliminate duplicate peaks
-C-----------------------------------------------------------------------
-      IPFLAG = 0
-      IF (NMAX .GT. 1) THEN
-        DO 120 I = 1,NMAX-1
-          IF (ABS(PHIP(I) - PHIP(I+1)) .LT. 2.5) THEN
-            IPFLAG = 1
-            IF (PCOUNT(I) .LT. PCOUNT(I+1)) THEN
-              PCOUNT(I) = - PCOUNT(I)
-            ELSE
-              PCOUNT(I+1) = - PCOUNT(I+1)
-            ENDIF
-          ENDIF
-  120   CONTINUE
-        IF (IPFLAG .NE. 0) THEN
-          J = 0
-          DO 130 I = 1,NMAX
-            IF (PCOUNT(I) .GT. 0) THEN
-              J = J + 1
-              PCOUNT(J) = PCOUNT(I)
-              PHIP(J) = PHIP(I)
-            ENDIF
-  130     CONTINUE
-          NMAX = J
-        ENDIF
-      ENDIF
-      IF (NMAX .GT. 0) THEN
-        NPEAK = NTOT
-        DO 140 I = 1,NMAX
-         NPEAK = NPEAK + 1
-          WRITE (COUT,11000) NPEAK,RTHETA,ROMEGA,RCHI,PHIP(I),PCOUNT(I)
-          CALL GWRITE (ITP,' ')
-          WRITE (LPT,11000) NPEAK,RTHETA,ROMEGA,RCHI,PHIP(I),PCOUNT(I)
-  140   CONTINUE
-      ENDIF
-      IF (KI .EQ. 'RP') KI = ' '
-      RETURN
-10000 FORMAT (1X,' Scan error in PSCAN')
-11000 FORMAT (10X,I4,4F10.2,F10.0)
-      END
diff --git a/difrac/qio.f b/difrac/qio.f
deleted file mode 100644
index ac823968..00000000
--- a/difrac/qio.f
+++ /dev/null
@@ -1,204 +0,0 @@
-      INTERFACE TO INTEGER*2 FUNCTION SIOBAUD [c,alias:'_SioBaud']
-     $                                      (Port, BaudCode)
-         INTEGER*2 Port [value]
-         INTEGER*2 BaudCode [value]
-      END
-
-      INTERFACE TO INTEGER*2 FUNCTION SIODONE [c,alias:'_SioDone']
-     $                                      (Port)
-         INTEGER*2 Port [value]
-      END
-
-      INTERFACE TO INTEGER*2 FUNCTION SIOERROR [c,alias:'_SioError']
-     $                                       (Code)
-         INTEGER*2 Code [value]
-      END
-
-      INTERFACE TO INTEGER*2 FUNCTION SIOGETC [c,alias:'_SioGetc']
-     $                                      (Port, TimeOut)
-         INTEGER*2 Port [value]
-         INTEGER*2 TimeOut [value]
-      END
-
-      INTERFACE TO INTEGER*2 FUNCTION SIOPARMS [c,alias:'_SioParms']
-     $                        (Port, Parity, StopBits, WordLength)
-         INTEGER*2 Port [value]
-         INTEGER*2 Parity [value]
-         INTEGER*2 StopBits [value]
-         INTEGER*2 WordLength [value]
-      END
-
-      INTERFACE TO INTEGER*2 FUNCTION SIOPUTC [c,alias:'_SioPutc']
-     $                                      (Port, Byte)
-         INTEGER*2 Port [value]
-         CHARACTER*1 Byte [value]
-      END
-
-      INTERFACE TO INTEGER*2 FUNCTION SIORESET [c,alias:'_SioReset']
-     $                                      (Port, BaudCode)
-         INTEGER*2 Port [value]
-         INTEGER*2 BaudCode [value]
-      END
-
-      INTERFACE TO INTEGER*2 FUNCTION SIORXBUF [c,alias:'_SioRxBuf']
-     $                                      (Port, Buffer, Size)
-         INTEGER*2 Port [value]
-         INTEGER*1 Buffer [reference]
-         INTEGER*2 Size [value]
-      END
-
-      INTERFACE TO INTEGER*2 FUNCTION SIORXFLUSH 
-     $               [c,alias:'_SioRxFlush'] (Port)
-         INTEGER*2 Port [value]
-      END
-
-      INTERFACE TO INTEGER*2 FUNCTION SIORXQUE [c,alias:'_SioRxQue']
-     $                                        (Port)
-         INTEGER*2 Port [value]
-      END
-!
-!
-!  Routines to simulate VAX QIOs
-!
-      integer function io_init (cport, speed, width, parity, bits)
-      integer*2 SioRxBuf, SioReset, SioParms, SioError, SioRxFlush
-      character cport*(*), parity*(*)
-      integer   speed, width, bits
-      integer*2 prty, dwidth, dbits, dspeed, rc
-      integer*1 RxBuffer(1024)
-      integer*2 Port
-      common /QioConst/ Port
-      common /QioBuf/ RxBuffer
-
-      Port = 0
-      if (cport(1:3) .eq. 'COM' .or. cport(1:3) .eq. 'com') then
-         if (len(cport) .ge. 4) then
-            if (cport(4:4) .eq. '2') Port = 1
-         endif
-      endif
-
-      prty = 0
-      if (parity(1:1) .eq. 'o' .or. parity(1:1) .eq. 'O') prty = 1
-      if (parity(1:1) .eq. 'e' .or. parity(1:1) .eq. 'E') prty = 3
-
-      dbits = 0
-      if (bits .eq. 2) dbits = 1
-
-      dwidth = 3
-      if (width .eq. 7) dwidth = 2
-
-      dspeed = 5
-      if (speed .eq. 19200) dspeed = 6
-      if (speed .eq.  4800) dspeed = 4
-      if (speed .eq.  2400) dspeed = 3
-      if (speed .eq.  1200) dspeed = 2
-      if (speed .eq.   300) dspeed = 0
-
-      rc = SioRxBuf (Port, RxBuffer(1), 7)
-      if (rc .lt. 0)  i = SioError (rc)
-      rc = SioParms (Port, prty, dbits, dwidth)
-      if (rc .lt. 0)  i = SioError (rc)
-      rc = SioReset (Port, dspeed)
-      if (rc .lt. 0)  i = SioError (rc)
-      rc = SioRxFlush (Port)
-
-      io_init = 1
-      return
-      end
-
-      integer function io_done ()
-      integer*2  SioDone, rc
-      integer*2 Port
-      common /QioConst/ Port
-
-      rc = SioDone (Port)
-
-      io_done = 1
-      return
-      end
-
-
-      integer function io_read (iosb, in_buff, in_size, itime)
-      integer in_size, itime
-      integer*2 iosb(4)
-      integer*1 in_buff(*)
-      integer*2  SioGetc, j
-      integer*2 Port
-      common /QioConst/ Port
-
-      M_time = itime * 18
-      L_time = M_time/in_size
-      if (L_time .le. 0) L_time = 5
-      J_time = 0
-
-      do 100 i = 1, in_size
-110      j = SioGetc (Port, L_time)
-         if (j .eq. -1) then
-            J_time = J_time + L_time
-            if (J_Time .gt. M_time) go to 500
-            go to 110
-         endif
-         in_buff(i) = iand (j, #ff)
-100   continue
-      iosb(1) = 1
-      iosb(2) = in_size
-      io_read = 1
-      return
-500   continue
-      iosb(1) = 0
-      iosb(2) = i - 1
-      io_read = #22c
-      return
-      end
-
-
-      integer function io_prompt (iosb, in_buff, in_size, itime,
-     $                            out_buf, out_size)
-      integer in_size, itime, out_size
-      integer*2 iosb(4)
-      integer*1 in_buff(*), out_buf(*)
-      integer*2  SioGetc, SioPutc, SioRxFlush, j
-      integer*2 Port
-      common /QioConst/ Port
-
-      j = SioRxFlush (Port)
-      do 50 i = 1, out_size
-         jc = out_buf(i)
-         j = SioPutc (Port, char(jc))
-50    continue
-
-      M_time = itime * 18
-      L_time = M_time/in_size
-      if (L_time .le. 0) L_time = 5
-      J_time = 0
-
-      do 100 i = 1, in_size
-110      j = SioGetc (Port, L_time)
-         if (j .eq. -1) then
-            J_time = J_time + L_time
-            if (J_Time .gt. M_time) go to 500
-            go to 110
-         endif
-         in_buff(i) = iand (j, #ff)
-100   continue
-      iosb(1) = 1
-      iosb(2) = in_size
-      io_read = 1
-      return
-500   continue
-      iosb(1) = 0
-      iosb(2) = i - 1
-      io_prompt = #22c
-      return
-      end
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/difrac/ralf.f b/difrac/ralf.f
deleted file mode 100644
index f9a1cf44..00000000
--- a/difrac/ralf.f
+++ /dev/null
@@ -1,1121 +0,0 @@
-C-----------------------------------------------------------------------
-C  RALF Routines for the CAD4L with standard Enraf Nonius LSI/11
-C       interface.
-C
-C  Peter S. White   February 1994
-C
-C-----------------------------------------------------------------------
-      SUBROUTINE HKLN (I1, I2, I3, I4)
-      J1 = I1
-      J2 = I2
-      J3 = I3
-      J4 = I4
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  INTON This routine must be called before any others and may be 
-C        used to initialise the diffractometer
-C-----------------------------------------------------------------------
-      SUBROUTINE INTON
-      COMMON /CADCON/ ALPHA,APMIN,APMAX,MAXVAR,MINVAR,
-     $                IHOLE,IVSLIT,IHSLIT,INEG45,IPOS45,IUPHAF,ILOHAF,
-     $                VUTHT,VUOME,VUCHI,VUPHI,IPORT,IBAUD
-      PARAMETER (STDGR =(128.0 * 4096.0)/360.0)
-      LOGICAL FIRST
-      INCLUDE 'COMDIF'
-      INCLUDE 'CAD4COMM'
-      DATA FIRST/.TRUE./
-      IF (FIRST) THEN
-         STEPDG = 91.0222
-         IFRDEF = 100
-         IDTDEF = 4
-         IDODEF = 2
-         NATTEN = 1
-         NRC    = 1
-         DFTYPE = 'NONI'
-         CALL DIFGON
-C-----------------------------------------------------------------------
-C  Set the CAD4 common block to starting values
-C-----------------------------------------------------------------------
-         iroutf = 0
-         incr1  = 0
-         incr2  = 0
-         npi1   = 0
-         npi2   = 0
-         iscanw = 0
-         motw   = 0
-         ishutf = 0
-         ibalf  = 0
-         iattf  = 0
-         iresf  = 0
-         ierrf  = 0
-         intfl  = 0
-         xrayt  = 0.0
-         do 100 i = 1,4
-            want(i)  = 0.0
-            cmeas(i) = 0.0
-100      continue
-         thpos =  78.0
-         thneg = -49.0
-         tthp   =  aint(-2.0 * THPOS * STDGR)
-         tthn   =  aint( 2.0 * (THPOS - THNEG) * STDGR)
-         aptw   = 0.0
-         aptm   = 0.0
-         call cad4_get_instrument
-         call cad4_ini_terminal
-         io_cobnr = 0
-         freq = 400
-      ENDIF
-C      CALL ZERODF
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  INTOFF -- clean up the interface
-C-----------------------------------------------------------------------
-      SUBROUTINE INTOFF
-      irc = io_done()
-      return
-      end
-C-----------------------------------------------------------------------
-C  ZERODF In case of an error this routine returns the diffractometer
-C         to a known state
-C-----------------------------------------------------------------------
-      SUBROUTINE ZERODF
-      INCLUDE 'CAD4COMM'
-      ishutf = 0
-      iattf  = 0
-      do 100 i = 1,4
-100      want(i) = 0.0
-      iroutf = 5
-      call lsi (1)
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  CTIME  Count for a fixed time
-C-----------------------------------------------------------------------
-      SUBROUTINE CTIME (XTIME, XCOUNT)
-      INCLUDE 'COMDIF'
-      include 'cad4comm'
-      call setslt (icadsl,icol)
-      iroutf = 6
-      ibalf = 0
-      ishutf = 1
-      incr1  = 0
-      incr2  = 2
-      npi1   = int(xtime * freq)
-      npi2   = 0
-      motw   = 0
-      iscanw = 1
-      call lsi (1)
-      xcount = 0
-      do 100 i = 1,ndumps
-        xcount = xcount + dump(i)
-100   continue
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  ANGET  Read the angles
-C-----------------------------------------------------------------------
-      SUBROUTINE ANGET (WTWOTH, WOMEGA, WCHI, WPHI)
-      include 'COMDIF'
-      include 'cad4comm'
-      iroutf = 1
-      call lsi (1)
-      call mtokap (cmeas(for_th),wtwoth)
-      call mtokap (cmeas(for_om),wkom)
-      call mtokap (cmeas(for_ka),wkappa)
-      call mtokap (cmeas(for_ph),wkphi)
-      call eulkap (1,womega,wchi,wphi,wkom,wkappa,wkphi,istatus)
-      womega = womega - wtwoth
-      wtwoth = 2 * wtwoth
-      wtwoth = wtwoth - dtheta
-      womega = womega - domega
-      wchi   = wchi   - dchi
-      if (wtwoth .lt. 0.0) wtwoth = wtwoth + 360.00
-      if (womega .lt. 0.0) womega = womega + 360.00
-      if (wchi   .lt. 0.0) wchi   = wchi   + 360.00
-      if (wphi   .lt. 0.0) wphi   = wphi   + 360.00
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  ANGSET Set the angles
-C-----------------------------------------------------------------------
-      SUBROUTINE ANGSET (WTHETA, WOMEGA, WCHI, WPHI, NATTW, ICOL)
-      include 'COMDIF'
-      include 'cad4comm'
-      ishutf = 0
-      if (nattw .gt. 0) then
-        iattf = 1
-      else
-        iattf = 0
-      endif
-      atheta = wtheta + dtheta
-      aomega = womega + domega
-      achi   = wchi   + dchi
-      if (atheta .gt. 180.00) atheta = atheta - 360.00
-      if (aomega .gt. 180.00) aomega = aomega - 360.00
-      atheta = atheta/2.0
-      aomega = aomega + atheta
-      call eulkap (0,aomega,achi,wphi,wkom,wkappa,wkphi,istatus)
-      if (istatus .ne. 0) then
-        icol = istatus
-        return
-      endif
-      call kaptom (atheta,  want(for_th))
-      call kaptom (wkom,   want(for_om))
-      call kaptom (wkappa, want(for_ka))
-      call kaptom (wkphi,  want(for_ph))
-      iroutf = 5
-      call lsi (1)
-      icol = 0
-      call displa (wtheta,womega,wchi,wphi)
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  Convert encoders to degrees
-C-----------------------------------------------------------------------
-      SUBROUTINE MTOKAP (ENCODR, ANGLE)
-      PARAMETER (DGRST = 360.0/(128.0 * 4096.0))
-      ANGLE = DGRST * ENCODR
-      if (angle .gt. 180.0) angle = angle - 360.0
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  Convert degrees to encoder steps--check the range
-C-----------------------------------------------------------------------
-      SUBROUTINE KAPTOM (ANGLE,ENCODR)
-      PARAMETER (STDGR = (128.0 * 4096.0)/360.0)
-      TANGLE = ANGLE
-      IF (TANGLE .GT. 180.0) TANGLE = TANGLE - 360.0
-      ENCODR = AINT (TANGLE * STDGR)
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  SHUTR  Open or close the shutter
-C         IOC = 1 open, 2 close
-C         INF = 0 OK
-C-----------------------------------------------------------------------
-      SUBROUTINE SHUTR (IOC, INF)
-      INCLUDE 'CAD4COMM'
-      INF = 0
-      IF (IOC .EQ. 1) THEN
-         ISHUTF = 1
-      ELSE
-         ISHUTF = 0
-      ENDIF
-      IROUTF = 0
-      CALL LSI (1)
-      IF (IERRF .NE. 0) INF = 1
-      RETURN
-      END
-
-      SUBROUTINE ONEBEP(R1,R2)
-      CHARACTER CTRLG*1
-      A1 = R1
-      A2 = R2
-      CTRLG = CHAR(7)
-C     WRITE (6,10000) CTRLG
-10000 FORMAT (1H+,A,$)
-      RETURN
-      END
-
-C-----------------------------------------------------------------------
-C  KORQ -- Read the keyboard buffer
-C          If it contains K|k|Q|q return: 0 = K
-C                                         1 = nothing found
-C                                         2 = Q
-C
-C          KORQ will toggle the switch registers 1-9,0 if the numeric
-C          keys are found in the buffer.
-C-----------------------------------------------------------------------
-      SUBROUTINE KORQ (I1)
-      INCLUDE 'COMDIF'
-      CHARACTER STRING*80
-      LOGICAL SWFND,SAVED,SWCALL
-      DATA SAVED/.FALSE./
-      SWFND = .FALSE.
-C-----------------------------------------------------------------------
-C  First check if we are making a regular call after a K or Q has been
-C  found from a call from RSW.
-C-----------------------------------------------------------------------
-      IF (SAVED .AND. I1 .NE. -9999) THEN
-         SAVED = .FALSE.
-         I1 = ISAVED
-         RETURN
-      ENDIF
-      SWCALL = .FALSE.
-      IF (I1 .EQ. -9999) SWCALL = .TRUE.
-      ANS = ' '
-C-----------------------------------------------------------------------
-C  For now dummy out the call to keysin and return 0 characters
-C-----------------------------------------------------------------------
-      NCHARS = 0
-      NCHARS = KEYSIN (STRING)
-      I1 = 1
-      DO 10 I = 1,NCHARS
-         IASCII = ICHAR (STRING(I:I))
-         IF (IASCII .EQ. 3) STOP
-         IF (IASCII .EQ. 75 .OR. IASCII .EQ. 107) ANS = 'K'
-         IF (IASCII .EQ. 81 .OR. IASCII .EQ. 113) ANS = 'Q'
-         IF (ANS .EQ. 'K' .OR. ANS .EQ. 'k') I1 = 0
-         IF (ANS .EQ. 'Q' .OR. ANS .EQ. 'q') I1 = 2
-         IF (IASCII .GE. 48 .AND. IASCII .LE. 57) THEN
-            SWFND = .TRUE.
-            ISWTCH = IASCII - 48 + 1
-            IF (ISREG(ISWTCH) .EQ. 0) THEN
-               ISREG(ISWTCH) = 1
-            ELSE
-               ISREG(ISWTCH) = 0
-            ENDIF
-         ENDIF
-10    CONTINUE
-      IF (SWCALL .AND. I1 .NE. 1) THEN
-         ISAVED = I1
-         SAVED = .TRUE.
-      ENDIF
-C      IF (SWFND) THEN
-C         WRITE (WIN1BF(13),10000) (ISREG(I),I=1,10)
-C      ENDIF
-10000 FORMAT (10X,10I2)
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  RSW  Read the switch register
-C-----------------------------------------------------------------------
-      SUBROUTINE RSW (N,IVALUE)
-      INCLUDE 'COMDIF'
-C-----------------------------------------------------------------------
-C  Update the switches just in case.  II = -9999 is a flag to tell
-C  KORQ to protect any K or Q characters.
-C-----------------------------------------------------------------------
-      II = -9999
-      CALL KORQ (II)
-C-----------------------------------------------------------------------
-C  And get the current value.
-C-----------------------------------------------------------------------
-      IF (N .LT. 0 .OR. N .GT. 9) RETURN
-      IVALUE = ISREG(N+1)
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C Initialise the Program
-C-----------------------------------------------------------------------
-      SUBROUTINE INITL(R1,R2,R3,R4)
-      A1 = R1
-      A2 = R2
-      A3 = R3
-      A4 = R4
-      RETURN
-      END
-C--------------------------------------------------------------------
-C  Routine to perform scans.
-C       ITYPE     Scan type --  0 or 2  Omega/2-theta
-C                               1 or 3  Omega
-C       SCNANG    Angle to scan in degrees.  This should be the
-C                 2theta range for an omega-2theta scan and the
-C                 omega range for an omega scan.
-C       ACOUNT    Returns total intensity in ACOUNT(1) and profile
-C                 in ACOUNT(2)-ACOUNT(NPPTS+1)
-C       TIME      Total scan time in secs
-C       SPEED     Scan speed in degs/min.
-C       NPPTS     Number of points in the profile on output
-C       IERR      Error code  0 -- O.K.
-C                             1 -- Collision
-C                             2 or more really bad!
-C--------------------------------------------------------------------
-      SUBROUTINE TSCAN (ITYPE,SCNANG,ACOUNT,TIME,SPEED,NPPTS,IERR)
-      COMMON /DFMACH/ ISCDEF,ICDDEF,IDTDEF,IDODEF,IDCDEF,IFRDEF,NRC,
-     $                NATTEN,STEPDG,ICADSL,ICADSW
-      DIMENSION ACOUNT(*)
-      include 'cad4comm'
-C--------------------------------------------------------------------
-C  Version 0.50  Supports itype = 0 or 2 omega-2theta and
-C                                 1 or 3 omega
-C                in both cases IANGLE is omega at the end of the scan
-C
-C--------------------------------------------------------------------
-      IERR = 0
-C--------------------------------------------------------------------
-C  The diffractometer should have been positioned at the beginning
-C  position for the scan.
-C
-C  Omega/2-Theta scan 
-C  Speed is passed in terms of 2-theta but E-N needs omega speed
-C     1 encoder step = 360/(128 * 4096) = 0.00068664 deg
-C    16 steps        = 0.01098 deg (equals 8 omega steps)
-C--------------------------------------------------------------------
-      CALL SETSLT (ICADSL,ICOL)
-      isense = 1
-      if (scnang .lt. 0.0) then
-        isense = -1
-        scnang = - scnang
-      endif
-      IF (ITYPE .EQ. 0 .OR. ITYPE .EQ. 1) THEN
-         MODE = 0
-         if (speed .le. 16.48) then
-           npi   = nint(0.5 + 16.48*2/speed)
-           incr1 = isense
-         else
-           npi   = 1
-           incr1 = isense*nint(0.5 + speed/(2*16.48))
-         endif
-         npi2  = 6
-         scang = scnang/2.0
-         iscanw = 8
-C--------------------------------------------------------------------
-C  Omega scan
-C--------------------------------------------------------------------
-      ELSE IF (ITYPE .EQ. 2 .OR. ITYPE .EQ. 3) THEN
-         MODE = 2
-         if (speed .le. 16.48) then
-           npi   = nint(0.5 + 16.48/speed)
-           incr1 = isense
-         else
-           npi   = 1
-           incr1 = isense*nint(0.5 + speed/(16.48))
-         endif
-         npi2  = 0
-         scang = scnang
-         iscanw = 16
-      ELSE
-         IERR = 2
-         RETURN
-      ENDIF
-C--------------------------------------------------------------------
-C  Setup complete -- do the scan
-C--------------------------------------------------------------------
-      call mtokap (float(iscanw), stpsiz)
-      nppts = int (scang/stpsiz)
-      call kaptom (float(ndumps * iscanw), scang)
-      incr2 = incr1
-      npi1  = npi
-      iresf = 0
-C--------------------------------------------------------------------
-C  Set  MOTW = 3 + 5*64 Omega master, theta slave
-C--------------------------------------------------------------------
-      IBALF = 0
-      MOTW  = 323
-      time = xrayt
-      iroutf = 6
-      call lsi (nppts)
-      acount(1) = 0.0
-      do 200 i = 1,nppts
-         acount(i+1) = dump(i)
-         acount(1) = acount(1) + dump(i)
-200   continue
-      time = (xrayt - time) / freq
-      return
-      end
-
-C--------------------------------------------------------------------
-C  Routine to display a peak profile in the current graphics window.
-C  The arguments are:
-C
-C  NHIST     The number of points to be plotted
-C  HIST      An array of points
-C  IHTAGS(4) The calculated peak position, the experimental position,
-C            low background limit and high background limit.
-C--------------------------------------------------------------------
-      SUBROUTINE PTPREP (NHIST,HIST,IHTAGS)
-      INCLUDE 'COMDIF'
-      INTEGER   IHTAGS(4)
-      REAL      HIST(*)
-      INTEGER   IX,IY,IZ
-      CHARACTER STRING*80
-      DATA IX,IY,IZ/0,0,0/
-      CALL PCDRAW (XCLEAR,IX,IY,IZ,STRING)
-      MAX = 1
-      MIN = 999999
-      IF (NHIST .LE. 1) THEN
-         WRITE (LPT,10000) NHIST
-10000    FORMAT (1X,' Invalid value for NHIST: ',I10)
-         RETURN
-      ENDIF
-      DO 10 I = 1,NHIST
-         IF (HIST(I) .GT. MAX) MAX = HIST(I)
-         IF (HIST(I) .LT. MIN) MIN = HIST(I)
-10    CONTINUE
-      XSCALE = 4096.0/NHIST
-      DO 20 I = 1,NHIST
-         IY = HIST(I)
-         IY = IY*3072.0/MAX
-         IX = I * XSCALE
-         IF (IY .LT. 0 .OR. IY .GT. 3072 .OR.
-     $       IX .LT. 1 .OR. IX .GT. 4096) THEN
-            WRITE (LPT,10100) IX,IY
-10100       FORMAT (1X,'Error plotting point ',I10,',',I10)
-            RETURN
-         ENDIF
-         CALL PCDRAW (XMOVE, IX,IY,IZ,STRING)
-         CALL PCDRAW (XDRAW, IX,IY,IZ,STRING)
-20    CONTINUE
-C-------------------------------------------------------------------
-C  Now put in the indicators.
-C-------------------------------------------------------------------
-      DO 30 I = 1,4
-         IHTAGS(I) = IHTAGS(I) * XSCALE
-30    CONTINUE
-      IF (IHTAGS(1) .GT. 0) THEN
-         CALL PCDRAW (XMOVE, IHTAGS(1),100,IZ,STRING)
-         CALL PCDRAW (XDRAW, IHTAGS(1),300,IZ,STRING)
-      ENDIF
-      IF (IHTAGS(2) .GT. 0) THEN
-         CALL PCDRAW (XMOVE, IHTAGS(2),400,IZ,STRING)
-         CALL PCDRAW (XDRAW, IHTAGS(2),600,IZ,STRING)
-      ENDIF
-      IF (IHTAGS(3) .GT. 0) THEN
-         CALL PCDRAW (XMOVE, IHTAGS(3),100,IZ,STRING)
-         CALL PCDRAW (XDRAW, IHTAGS(3),300,IZ,STRING)
-      ENDIF
-      IF (IHTAGS(4) .GT. 0) THEN
-         CALL PCDRAW (XMOVE, IHTAGS(4),100,IZ,STRING)
-         CALL PCDRAW (XDRAW, IHTAGS(4),300,IZ,STRING)
-      ENDIF
-      RETURN
-      END
-C-------------------------------------------------------------------
-C     RPSCAN  Ralf support for PSCAN routine
-C-------------------------------------------------------------------
-      SUBROUTINE RPSCAN (NPTS,ICOL)
-      INCLUDE 'COMDIF'
-      INCLUDE 'CAD4COMM'
-      ICOL = 0
-      NATTN = 0
-      CALL SETSLT (0,ICOL)
-C-------------------------------------------------------------------
-C     Get the current angles and decide which direction to scan
-C-------------------------------------------------------------------
-      CALL ANGET (WTH,WOM,WCHI,WPHI)
-      IF (WPHI .GT. 180.0) WPHI = WPHI - 360.00
-      IF (WPHI .LE. 0) THEN
-         WPHI    = -90.00
-         TARGET  =  90.00
-         IDIR   = 1
-      ELSE
-         WPHI    =  90.00
-         TARGET  = -90.00
-         IDIR   = -1
-      ENDIF
-C-------------------------------------------------------------------
-C     Move PHI to the correct starting position
-C-------------------------------------------------------------------
-      CALL ANGSET (WTH,WOM,WCHI,WPHI,NATTN,ICOL)
-C-------------------------------------------------------------------
-C     Now do the scan
-C-------------------------------------------------------------------
-      INCR1 = 10 * IDIR
-      INCR2 = 0
-      IRESF = 0
-      NPI1  = 1
-      MOTW  = 2
-      STEPW = 2.0
-      CALL KAPTOM (STEPW,ENCST)
-      ISCANW = INT(ENCST + 0.5)/IABS(INCR1)
-      NPTS = 90
-      IROUTF = 6
-      CALL LSI (NPTS)
-      PHIST = WPHI - STEPW/2.0
-      IF (IDIR .LT. 1) PHIST = -WPHI - STEPW/2.0
-C-----------------------------------------------------------------------
-C  Nonius (in their wisdom) always return the profile in ascending
-C  phi.
-C-----------------------------------------------------------------------
-      DO 100 I = 1,NPTS
-        ACOUNT(I) = DUMP(I)
-        ACOUNT(5*NSIZE + I) = PHIST + I*STEPW
-100   CONTINUE
-      RETURN
-      END
-C-------------------------------------------------------------------------
-      SUBROUTINE MAXPOINT (IAXIS,WIDTH,STEPS,ANGLE)
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  GENSCN Routine to perform a scan of a given motor
-C         ICIRCL  1 -- 2-theta       ISLIT   0 -- Nothing       
-C                 2 -- omega                 1 -- Vertical
-C                 3 -- kappa                 2 -- Horizontal
-C                 4 -- phi                   3 -- +45 deg
-C                                            4 -- -45 deg
-C                                            5 -- Upper 1/2 circle
-C                                            6 -- Lower 1/2 circle
-C                                     10 to 59 -- horiz. aperture in mms
-C         SPEED Speed in degrees per minute
-C         STEP  Step width in degrees, NPTS number of steps
-C         ICOL  0 -- OK
-C-----------------------------------------------------------------------
-      SUBROUTINE GENSCN (ICIRCL, WSPEED, WSTEP, NPTS, ISLIT, ICOL)
-      include 'COMDIF'
-      include 'cad4comm'
-      icol = 0
-      call setslt (islit,icol)
-C-----------------------------------------------------------------------
-C  Get current positions
-C-----------------------------------------------------------------------
-      ishutf = 0
-      iroutf = 1
-      call lsi (1)
-      call mtokap (cmeas(for_th),wtwoth)
-      call mtokap (cmeas(for_om),wkom)
-      call mtokap (cmeas(for_ka),wkappa)
-      call mtokap (cmeas(for_ph),wkphi)
-C-----------------------------------------------------------------------
-C  Offset required angle
-C-----------------------------------------------------------------------
-      imult = 1
-      tstep = wstep
-      if (icircl .eq. 1) then
-        tstep  = wstep/2.0
-        wtwoth = wtwoth - tstep*npts/2 - tstep/2
-      else if (icircl .eq. 2) then
-        wkom = wkom - tstep*npts/2 - tstep/2
-      else if (icircl .eq. 3) then
-        wkappa = wkappa - tstep*npts/2 - tstep/2
-      else if (icircl .eq. 4) then
-        wkphi = wkphi - tstep*npts/2 - tstep/2
-      else if (icircl .eq. 5) then
-        tstep  = wstep/2.0
-        wtwoth = wtwoth - tstep*npts/2 - tstep/2
-        wkom = wkom - tstep*npts/2 - tstep/2
-        imult = 2
-      endif
-      call kaptom (wtwoth, want(for_th))
-      call kaptom (wkom,   want(for_om))
-      call kaptom (wkappa, want(for_ka))
-      call kaptom (wkphi,  want(for_ph))
-      ishutf = 0
-      iroutf = 5
-      call lsi (1)
-C-----------------------------------------------------------------------
-C  Now we are at the begining of the scan
-C-----------------------------------------------------------------------
-      isense = 1
-      if (tstep .lt. 0.0) isense = -1
-      nattn = 0
-      incr2 = 0
-      iresf = 0
-      npi2  = 0
-      if (wspeed .le. 16.48) then
-         incr1 = isense
-         npi1  = int((imult*16.48)/wspeed + 0.5)
-      else
-         npi1  = 1
-         incr1 = isense*int(wspeed/(imult*16.48) + 0.5)
-      endif
-      stepw = abs(tstep)
-      if (icircl .eq. 1) then
-         motw = 5
-      else if (icircl .eq. 2) then
-         motw = 3
-      else if (icircl .eq. 3) then
-         motw = 4
-      else if (icircl .eq. 4) then
-         motw = 2
-      else if (icircl .eq. 5) then
-         motw = 323
-         incr2 = incr1
-         npi2 = 6
-      else
-         icol = -1
-         return
-      endif
-      call kaptom (stepw,encst)
-      iscanw = int(encst + 0.5)/iabs(incr1)
-      npoints = npts
-      ishutf = 1
-      iroutf = 6
-      call lsi (npoints)
-      i1 = 9*NSIZE + 1
-      i2 = 9*NSIZE + npoints
-      j = 0
-      do 100 i = i1,i2
-         j = j + 1
-         acount(i) = dump(j)
-100   continue
-      return
-      end
-C-----------------------------------------------------------------------
-C  SETSLT -- Set the slits
-C-----------------------------------------------------------------------
-      subroutine setslt (islt,icol)
-      COMMON /CADCON/ ALPHA,APMIN,APMAX,MAXVAR,MINVAR,
-     $                IHOLE,IVSLIT,IHSLIT,INEG45,IPOS45,IUPHAF,ILOHAF,
-     $                VUTHT,VUOME,VUCHI,VUPHI,IPORT,IBAUD
-      include 'cad4comm'
-      icol = 0
-      ishutf = 0
-      if (islit .lt. 0) then
-        icol = -1
-        return
-      endif
-      aptwsv = aptw
-      if (islt .eq. 0) aptw = IHOLE
-      if (islt .eq. 1) aptw = IVSLIT
-      if (islt .eq. 2) aptw = IHSLIT
-      if (islt .eq. 3) aptw = INEG45
-      if (islt .eq. 4) aptw = IPOS45
-      if (islt .eq. 5) aptw = IUPHAF
-      if (islt .eq. 6) aptw = ILOHAF
-      if (islt .ge. 10) then
-        slsize = float(islt)/10.0
-        if (slsize .lt. APMIN) slsize = APMIN
-        if (slsize .gt. APMAX) slsize = APMAX
-        aptw = (MAXVAR - MINVAR) * (slsize - APMIN)/(APMAX - APMIN) 
-        aptw = aptw + MINVAR
-      endif
-      if (abs(aptm - aptw) .lt.1.5) return
-      if (aptw .ne. aptwsv) then
-        iroutf = 13
-        call lsi (0)
-      endif
-      return
-      end
-C-----------------------------------------------------------------------
-C  LSI  Cad specific routine to initiate transfer to the interface
-C       If doing multple transfers use xrayt from the first one to
-C       improve accuracy of the scan time estimate.
-C-----------------------------------------------------------------------
-      subroutine lsi (length)
-      include 'cad4comm'
-      nreturn = length
-      if (nreturn .lt. 1) nreturn = 1
-      call disap (4,nreturn)      
-      if (nreturn .gt. 96) then
-         xrayts = xrayt
-         lcount = 0
-         ltemp  = nreturn
-100      ltemp = ltemp - 96
-         lcount = lcount + 1
-         iroutf = 4096 + lcount*4*96
-         call disap (4,ltemp)
-         if (ltemp .gt. 96) go to 100
-         xrayt = xrayts
-      endif
-      return
-      end
-C-----------------------------------------------------------------------
-C  For now we only need support the old DISAP type 4
-C-----------------------------------------------------------------------
-      subroutine disap (mode, length)
-      external cad4_transm_gonio, cad4_recv_gonio, cad4_type_error,
-     $         cad4_start_load
-      include 'CAD4COMM'
-      if (mode .eq. 4) then
-         ndumps = length
-         call cad4_io (f_tr_gon, cad4_transm_gonio, cad4_recv_gonio,
-     $              cad4_type_error, cad4_type_error, cad4_type_error, 
-     $              cad4_type_error, cad4_type_error, cad4_start_load,
-     $              cad4_type_error)
-      endif
-      return
-      end
-C-----------------------------------------------------------------------
-C  Cad4_start_load: The interface needs to be reloaded so quit!
-C-----------------------------------------------------------------------
-      subroutine cad4_start_load (result)
-      include 'CAD4COMM'
-      call cad4_reset_terminal
-      stop
-      end
-C-----------------------------------------------------------------------
-C  Cad4_set_swreg:  Copy switch register to buffer
-C-----------------------------------------------------------------------
-      subroutine cad4_set_swreg
-      include 'CAD4COMM'
-      output_data_w(1) = io_coswr
-      output_length = 2
-      return
-      end
-C-----------------------------------------------------------------------
-C  Cad4_get_swreg:  Copy pocket terminal switch register to host
-C-----------------------------------------------------------------------
-      subroutine cad4_get_swreg
-      include 'CAD4COMM'
-      nswreg = input_data_w(1)
-      return
-      end
-C-----------------------------------------------------------------------
-C  Cad4_recv_gonio:  Copy results returned from the LSI
-C-----------------------------------------------------------------------
-      subroutine cad4_recv_gonio (result)
-      integer*2  i, nrd
-      include 'CAD4COMM'
-C-----------------------------------------------------------------------
-C  Get the interface switch register
-C-----------------------------------------------------------------------
-      nswreg = input_data_w(c4h_swreg)
-C-----------------------------------------------------------------------
-C  Convert input error bits to an error number
-C-----------------------------------------------------------------------
-      call bitcon (c4h_errfl, errtbl, ierrf)      
-C-----------------------------------------------------------------------
-C  Convert accumulated exposure time to a real
-C-----------------------------------------------------------------------
-      call input_double (c4h_xrtim, xrayt)      
-C-----------------------------------------------------------------------
-C  Convert encoder readings
-C-----------------------------------------------------------------------
-      call input_double (c4h_thmh, cmeas(for_th))
-      call input_double (c4h_phmh, cmeas(for_ph))
-      call input_double (c4h_ommh, cmeas(for_om))
-      call input_double (c4h_kamh, cmeas(for_ka))
-      call input_double (c4h_apmh, aptm)
-C-----------------------------------------------------------------------
-C  And finally any profile points
-C-----------------------------------------------------------------------
-      nd      = 1
-      nend    = ndumps
-      if (iroutf .gt. 4096) then
-         nd = (iroutf - 4096)/4 + 1
-      endif
-      if (nend .gt. 96) nend = 96
-      do 100 i = 1,nend
-         nrd = (i - 1)*2 + c4h_dump0
-         call input_double (nrd, dump(nd))
-         nd = nd + 1
-100   continue
-      return
-      end
-C-----------------------------------------------------------------------
-C  Input_double: convert LSI double integers to floating point
-C-----------------------------------------------------------------------
-      subroutine input_double (c4h_label, f_value)                                                
-      integer*2 c4h_label
-      real      f_value
-C-----------------------------------------------------------------------
-C  Equivalence integer with pairs of short integers
-C-----------------------------------------------------------------------
-      integer*4 long
-      integer*2 short(2)
-      equivalence (long, short(1))
-      include 'CAD4COMM'
-      short(2) = input_data_w(c4h_label)
-      short(1) = input_data_w(c4h_label + 1)
-      f_value  = float (long)
-      return
-      end
-C-----------------------------------------------------------------------
-C  Bitcon:  Convert most significant bit set to a number
-C-----------------------------------------------------------------------
-      subroutine bitcon (c4h_label, tabel, iresult)
-      integer*2 c4h_label, tabel(15), iresult
-      integer*2 itcnt, itval, inval
-      include 'CAD4COMM'
-      iresult = 0
-      inval = input_data_w(c4h_label)
-      if (inval .gt. 0) then
-         itcnt = 15
-         itval = #4000
-100      continue
-         if (tabel(itcnt) .ne. 0) then
-            if (iand(inval, itval) .ne. 0) iresult = tabel(itcnt)
-         endif
-         itval = itval/2
-         itcnt = itcnt - 1
-         if (itval .ne. 0 .and. iresult .ne. 0) go to 100
-      endif
-      return
-      end
-C-----------------------------------------------------------------------
-C  Cad4_transm_gonio:  Setup buffer for transmission to LSI
-C-----------------------------------------------------------------------
-      subroutine cad4_transm_gonio
-      integer*2 nsa, nba, nmast, nslav, mselw
-      include 'CAD4COMM'
-C-----------------------------------------------------------------------
-C  Outtput switch register
-C-----------------------------------------------------------------------
-      output_data_w(c4h_swreg) = io_coswr
-C-----------------------------------------------------------------------
-C  Route flag
-C-----------------------------------------------------------------------
-      if (iroutf .lt. 4096) then
-         output_data_w(c4h_routfl) = routbl (iand(iroutf, #0f) + 1)
-      else
-         output_data_w(c4h_routfl) = iroutf
-      endif
-C-----------------------------------------------------------------------
-C  Two theta limit values
-C-----------------------------------------------------------------------
-      call output_double ((tthp*16.0), c4h_tthmxh)
-      call output_double ((tthn*16.0), c4h_tthmnh)
-C-----------------------------------------------------------------------
-C  Shutter and attenuator go in one word
-C-----------------------------------------------------------------------
-      nsa = ishutf * 2
-      nsa = ior(nsa, iattf)
-      nsa = iand (nsa, #03)
-      nsa = satbl (nsa + 1)
-C-----------------------------------------------------------------------
-C  Set function comes from IBALF
-C-----------------------------------------------------------------------
-      nba = iand (ibalf, #03)
-      if (nba .eq. 3) then
-         nba = (ibalf - nba)/4
-         nba = iand (nba, (not (satbl(3))))
-         nsa = nsa + nba
-      endif
-      output_data_w(c4h_sasysc) = nsa
-C-----------------------------------------------------------------------
-C  Output cumulative exposure time
-C-----------------------------------------------------------------------
-      call output_double (xrayt, c4h_xrtim)
-C-----------------------------------------------------------------------
-C  Motor selection word
-C-----------------------------------------------------------------------
-      nmast = iand (motw, #07) + 1
-      nslav = iand (motw, #01C0)/#0040 + 1
-      output_data_w(c4h_mselw) = mottbl(nmast) + mottbl(nslav)*#0008
-C-----------------------------------------------------------------------
-C  Number of dumps required
-C-----------------------------------------------------------------------
-      if (incr1 .lt. 0) then
-         output_data_w(c4h_nrd) = -ndumps
-      else
-         output_data_w(c4h_nrd) = ndumps
-      endif
-C-----------------------------------------------------------------------
-C  Calculate master and slave increment words
-C-----------------------------------------------------------------------
-      mselw = nmast - 1
-      call setinc (mselw)
-      mselw = 1 - nslav
-      call setinc (mselw)
-C-----------------------------------------------------------------------
-C  Wanted goniometer and aperature settings
-C-----------------------------------------------------------------------
-      call output_double (want(for_th), c4h_thwh)
-      call output_double (want(for_ph), c4h_phwh)
-      call output_double (want(for_om), c4h_omwh)
-      call output_double (want(for_ka), c4h_kawh)
-      call output_double (aptw, c4h_apwh)
-C-----------------------------------------------------------------------
-C  Set output buffer length
-C-----------------------------------------------------------------------
-      output_length = c4h_apwl * 2
-      return
-      end
-C-----------------------------------------------------------------------
-C  Output_double:  convert real to double integer
-C-----------------------------------------------------------------------
-      subroutine output_double (f_value, c4h_label)
-      real      f_value
-      integer*2 c4h_label
-      integer*4 long
-      integer*2 short(2)
-      equivalence (long, short(1))
-      include 'CAD4COMM'
-      long = int(f_value)
-      output_data_w(c4h_label) = short(2)
-      output_data_w(c4h_label + 1) = short(1)
-      return
-      end
-C-----------------------------------------------------------------------
-C  Setinc:  routine to output increment values for master axis if the
-C           selection word is positive ot the slave axis if negative
-C-----------------------------------------------------------------------
-      subroutine setinc (aselw)
-      integer*2 aselw, iabaw, aoffs, nid, inci, dincr, nrinc
-      include 'CAD4COMM'
-C-----------------------------------------------------------------------
-C  calculate increment values
-C-----------------------------------------------------------------------
-      call increm (aselw, nid, inci, dincr, nrinc)
-C-----------------------------------------------------------------------
-C  and copy them to the output buffer
-C-----------------------------------------------------------------------
-      output_data_w (c4h_nid) = nid
-      iabaw = iabs (aselw) + 1
-      aoffs = mottbl(iabaw)*3 + c4h_incr
-      if (mottbl(iabaw) .ne. 0) then
-         output_data_w (c4h_inci + aoffs) = inci
-         output_data_w (c4h_dincr + aoffs) = dincr
-         output_data_w (c4h_nrinc + aoffs) = nrinc
-      endif
-      return
-      end
-C-----------------------------------------------------------------------
-C  Increm:  calculate increment values
-C-----------------------------------------------------------------------
-      subroutine increm (aselw, nid, inci, dincr, nrinc)
-      integer*2  aselw, nid, inci, dincr, nrinc
-      real       fincr
-      include 'CAD4COMM'
-      ifact = 4
-      if (iroutf .ge. 9 .and. iroutf .le. 11) ifact = 2
-      nid = iscanw * npi1
-      if (aselw .ne. 0) then
-         if (npi1 .ne. 0) then
-            if (aselw .le. 0) then
-               fincr = float(incr1 * npi2 * ifact)/float(npi1 * 6)
-            else
-               fincr = float(incr1 * ifact)/float(npi1)
-            endif
-         else
-            fincr = 0.0
-         endif
-         if (abs(fincr) .gt. (1.0/32768.0)) then
-            nrinc = int(1.0/abs(fincr))
-            if (nrinc .lt. 1) nrinc = 1
-         else
-            nrinc = 32767
-         endif
-         inci = int(fincr * float(nrinc))
-         if ((fincr * float(nrinc) - float(inci)) .lt. 0.0) 
-     $                                           inci = inci - 1
-         dincr = int((fincr * float(nrinc) - float(inci)) * 32768.0)
-      endif
-      return
-      end
-C-----------------------------------------------------------------------
-C  Set the microscope viewing position (CAD-4 version)
-C-----------------------------------------------------------------------
-      SUBROUTINE VUPOS (VTH,VOM,VCH,VPH)
-      COMMON /CADCON/ ALPHA,APMIN,APMAX,MAXVAR,MINVAR,
-     $                IHOLE,IVSLIT,IHSLIT,INEG45,IPOS45,IUPHAF,ILOHAF,
-     $                VUTHT,VUOME,VUCHI,VUPHI,IPORT,IBAUD
-      VTH = VUTHT
-      VOM = VUOME
-      VCH = VUCHI
-      VPH = VUPHI
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  Read the CAD-4 Goniometer constants file (goniom.ini) for the
-C  constants needed by DIFRAC in /CADCON/ 
-C-----------------------------------------------------------------------
-      SUBROUTINE DIFGON
-      COMMON /CADCON/ ALPHA,APMIN,APMAX,MAXVAR,MINVAR,
-     $                IHOLE,IVSLIT,IHSLIT,INEG45,IPOS45,IUPHAF,ILOHAF,
-     $                VUTHT,VUOME,VUCHI,VUPHI,IPORT,IBAUD
-      CHARACTER DFTYPE*4,DFMODL*4
-      COMMON /DFMACC/ DFTYPE,DFMODL
-      COMMON /INFREE/ IFREE(20),RFREE(20),ICFLAG
-      CHARACTER COUT(20)*132,OCHAR*100,CKEY*6
-      COMMON /IOUASC/ COUT
-      COMMON /FREECH/ OCHAR
-C-----------------------------------------------------------------------
-C  Set the values to sensible defaults.  Values from IHSLIT to IUPHAP
-C  are decimal numbers with the same digits as the octal numbers which 
-C  are the true values.
-C-----------------------------------------------------------------------
-      DFMODL = 'CAD4'
-      ALPHA  = 49.99
-      APMIN  = 1.3
-      APMAX  = 5.9
-      IHSLIT =   77
-      MINVAR =  277
-      MAXVAR = 2443
-      IHOLE  = 2570
-      INEG45 = 3001
-      IPOS45 = 3135
-      IVSLIT = 3315
-      ILOHAF = 3477
-      IUPHAF = 3731
-C-----------------------------------------------------------------------
-C  Attach goniom.ini to unit 9
-C-----------------------------------------------------------------------
-      OPEN (UNIT=9, ACCESS='SEQUENTIAL', FILE='goniom.ini',
-     $      STATUS='OLD', ERR=110)
-C-----------------------------------------------------------------------
-C  Read values from goniom.ini.  Ignore lines starting with /
-C-----------------------------------------------------------------------
-  100 READ (9,11000,END=200) OCHAR
-11000 FORMAT (A)
-      IF (OCHAR(1:1) .EQ. '/') GO TO 100
-      CKEY = OCHAR(1:6)
-      IDONE = 0
-      IF (CKEY .EQ. 'Dfmodl') THEN
-        IF (OCHAR(9:9) .NE. ' ') I = 9
-        IF (OCHAR(8:8) .NE. ' ') I = 8
-        IF (OCHAR(7:7) .NE. ' ') I = 7
-        DFMODL = OCHAR(I:I+3)
-        GO TO 100
-      ENDIF
-      OCHAR(1:6) = ' '
-      CALL FREEFM (1000)
-      IVAL = IFREE(1)
-C-----------------------------------------------------------------------
-C  Get COMMON /CADCON/ values for DIFRAC
-C-----------------------------------------------------------------------
-      IF (CKEY .EQ. 'Port  ') THEN
-        IPORT = IVAL
-        IDONE = 1
-      ELSE IF (CKEY .EQ. 'Baud  ') THEN
-        IBAUD = IVAL
-        IDONE = 1
-      ELSE IF (CKEY .EQ. 'Alpha ') THEN
-        ALPHA = RFREE(1)
-        IDONE = 1
-      ELSE IF (CKEY .EQ. 'Apmax ') THEN
-        APMAX = RFREE(1)
-        IDONE = 1
-      ELSE IF (CKEY .EQ. 'Apmin ') THEN
-        APMIN = RFREE(1)
-        IDONE = 1
-      ELSE IF (CKEY .EQ. 'Vutht ') THEN
-        VUTHT = RFREE(1)
-        IDONE = 1
-      ELSE IF (CKEY .EQ. 'Vuome ') THEN
-        VUOME = RFREE(1)
-        IDONE = 1
-      ELSE IF (CKEY .EQ. 'Vuchi ') THEN
-        VUCHI = RFREE(1)
-        IDONE = 1
-      ELSE IF (CKEY .EQ. 'Vuphi ') THEN
-        VUPHI = RFREE(1)
-        IDONE = 1
-      ENDIF
-      IF (IDONE .EQ. 0) THEN
-        IVAL = IFREE(1)
-        CALL OCTDEC (IVAL)
-        IF (CKEY .EQ. 'Maxvar') THEN
-          MAXVAR = IVAL
-        ELSE IF (CKEY .EQ. 'Minvar') THEN
-          MINVAR = IVAL
-        ELSE IF (CKEY .EQ. 'Upperh') THEN
-          IUPHAF = IVAL
-        ELSE IF (CKEY .EQ. 'Lowerh') THEN
-          ILOHAF = IVAL
-        ELSE IF (CKEY .EQ. 'Negsl ') THEN
-          INEG45 = IVAL
-        ELSE IF (CKEY .EQ. 'Possl ') THEN
-          IPOS45 = IVAL
-        ELSE IF (CKEY .EQ. 'Vslit ') THEN
-          IVSLIT = IVAL
-        ELSE IF (CKEY .EQ. 'Hslit ') THEN
-          IHSLIT = IVAL
-        ELSE IF (CKEY .EQ. 'Hole  ') THEN
-          IHOLE = IVAL
-        ENDIF
-      ENDIF
-      GO TO 100
-C-----------------------------------------------------------------------
-C  There was an error opening goniom.ini.  Do something about it.
-C-----------------------------------------------------------------------
-  110 WRITE (COUT,10000)
-      CALL GWRITE (ITP,' ')
-10000 FORMAT (' Error opening CAD-4 goniometer constants file',
-     $        ' goniom.ini.'/
-     $        ' Exit from DIFRAC, check the file and try again.')
-      RETURN
-  200 CLOSE (UNIT = 9)
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  Convert a decimal number to the decimal equivalent of the octal 
-C  number with the same digits.
-C  e.g. 123(10) --> 123(8) --> 83(10)
-C-----------------------------------------------------------------------
-      SUBROUTINE OCTDEC (IVAL)
-      IWORK = IVAL
-      IMULT = 1
-      IVAL = 0
-  100 ITEMP = IWORK/10
-      IDIGIT = IWORK - 10*ITEMP
-      IVAL= IVAL + IDIGIT*IMULT
-      IMULT = IMULT*8
-      IWORK = ITEMP
-      IF (IWORK .NE. 0) GO TO 100
-      RETURN
-      END
diff --git a/difrac/range.f b/difrac/range.f
deleted file mode 100644
index feee6d66..00000000
--- a/difrac/range.f
+++ /dev/null
@@ -1,13 +0,0 @@
-C-----------------------------------------------------------------------
-C  Subroutine to put Omega, Chi & Phi into the correct range
-C-----------------------------------------------------------------------
-      SUBROUTINE RANGE (ICHI,IPHI,A)
-      DIMENSION A(4)
-      A(2) = A(2) + 180.0
-      A(3) = A(3) + 180.0*ICHI
-      A(4) = A(4) + 180.0*IPHI
-      IF (A(2) .GE. 360.0) A(2) = A(2) - 360.0
-      IF (A(3) .GE. 360.0) A(3) = A(3) - 360.0
-      IF (A(4) .GE. 360.0) A(4) = A(4) - 360.0
-      RETURN
-      END
diff --git a/difrac/rcpcor.f b/difrac/rcpcor.f
deleted file mode 100644
index 50cf7957..00000000
--- a/difrac/rcpcor.f
+++ /dev/null
@@ -1,125 +0,0 @@
-C-----------------------------------------------------------------------
-C  This subroutine calculates the reciprocal coordinates of a reflection
-C  Called by 3 commands :--
-C  AH - to convert Euler angles to h,k,l
-C  MR - to convert direct beam Euler angles to h,k,l
-C  FI - to convert face indexing Euler angles to h,k,l
-C-----------------------------------------------------------------------
-      SUBROUTINE RCPCOR
-      INCLUDE 'COMDIF'
-      DIMENSION RM1(3,3),XA(3),HA(3)
-      CHARACTER STRING*80
-      IF (KI .EQ. 'AH') THEN
-        WRITE (COUT,10000)
-        CALL GWRITE (ITP,' ')
-      ENDIF
-      CALL MATRIX (R,RM1,RJUNK,RJUNK,'INVERT')
-  100 IF (KI .EQ. 'MR') THEN
-        CALL ANGET (THETAS,OMEGS,CHIS,PHIS)
-        OMEGS = OMEGS - 90.0 + 0.5*THETAS
-      ELSE IF (KI .EQ. 'FI') THEN
-        THETAS = THETA
-        OMEGS  = OMEGA
-        CHIS   = CHI
-        PHIS   = PHI
-      ELSE
-        WRITE (COUT,11000)
-        CALL FREEFM (ITR)
-        IF (RFREE(1) .EQ. 0) THEN
-          KI = ' '
-          RETURN 
-        ENDIF
-        THETAS = RFREE(1)
-        OMEGS  = RFREE(2)
-        CHIS   = RFREE(3)
-        PHIS   = RFREE(4)
-      ENDIF
-      CO = COS(OMEGS/DEG)
-      SO = SIN(OMEGS/DEG)
-      CC = COS(CHIS/DEG)
-      SC = SIN(CHIS/DEG)
-      CP = COS(PHIS/DEG)
-      SP = SIN(PHIS/DEG)
-      ESS = 2.0*SIN(THETAS/(2.0*DEG))
-      XA(1) = ESS*(CO*CC*CP - SO*SP)
-      XA(2) = ESS*(CO*CC*SP + SO*CP)
-      XA(3) = ESS*CO*SC
-      CALL MATRIX (RM1,XA,HA,RJUNK,'MVMULT')
-      WRITE (COUT,12000) HA
-      CALL GWRITE (ITP,' ')
-      IF (KI .EQ. 'MR') KI = ' '
-      IF (KI .EQ. 'MR' .OR. KI .EQ. 'FI') RETURN
-      GO TO 100
-10000 FORMAT (' Calculate Reciprocal Coordinates ')
-11000 FORMAT (' Type the reflection angles (End) ',$)
-12000 FORMAT (5X,' Reciprocal Coordinates (h,k,l)',3F10.3)
-      END
-C-----------------------------------------------------------------------
-C  Index faces for ABSORP when they are set so that the face normal is 
-C  in the equator plane and normal to the microscope viewing direction
-C  at the Kappa angles -45, 78, kappa (-60 start), phi (0 start)
-C-----------------------------------------------------------------------
-      SUBROUTINE FACEIN
-      CHARACTER STRING*80 
-      INCLUDE 'COMDIF'
-      DATA ISENSE/-1/
-      NATT = 0
-      ICOL = 0
-C-----------------------------------------------------------------------
-C  Set the microscope to the initial viewing position and print message
-C  The viewing position Kappa angles are -45, 78, -60, 0  
-C  The Euler equivalent is used below.
-C-----------------------------------------------------------------------
-      THETA = -90.0
-      OMEGA = 102.63
-      CHI   = -45.0
-      PHI   = -20.37
-      CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-      WRITE (COUT,10000) 
-      CALL GWRITE (ITP,' ')
-C-----------------------------------------------------------------------
-C  Get the adjusted angles and transform them
-C-----------------------------------------------------------------------
-  100 WRITE (COUT,11000)
-      CALL ALFNUM (STRING)
-      ANS = STRING(1:1)
-C      write (cout,99990)
-C99990 format (' Type omk, kap, phk for face ',$)
-C      call freefm (itr)
-C      omk = rfree(1)
-C      if (omk .eq. 0) omk = 78.0
-C      rka = rfree(2)
-C      phk = rfree(3)
-C      call eulkap (1,omega,chi,phi,omk,rka,phk,isttus)
-C99991 format (i3,7f8.2)
-      CALL ANGET (THETA,OMEGA,CHI,PHI)
-      CALL EULKAP (0,OMEGA,CHI,PHI,OMK,RKA,PHK,ISTTUS)
-C      i = 2
-C      write (COUT,99991) i,theta,omega,chi,phi,omk,rka,phk
-C      call gwrite (itp, ' ')
-C      OMK = OMK - 135.0
-      IRL = 1
-      IF (ANS .EQ. 'L') IRL = 0
-      OMK = OMK - IRL*180.0
-      CALL EULKAP (1,OMEGA,CHI,PHI,OMK,RKA,PHK,ISTTUS)
-      THETA = 20.0
-C      i = 3
-C      write (COUT,99991) i,theta,omega,chi,phi,omk,rka,phk
-C      call gwrite (itp, ' ')
-      CALL RCPCOR
-      WRITE (COUT,12000)
-      CALL YESNO ('Y',ANS)
-      IF (ANS .EQ. 'Y') GO TO 100
-      KI = ' '
-      RETURN
-10000 FORMAT (/20X,'  CAD-4 Face Indexing'/
-     $        '   Adjust Kappa and Phi with the pocket terminal,',
-     $        ' so that the face-normal is'/
-     $        ' a. Horizontal,'/
-     $        ' b. Normal to the view direction, pointing right',
-     $           ' or left.')
-11000 FORMAT (' When the face is set correctly, type R or L to',
-     $        ' indicate whether'/
-     $        ' the normal is pointing to the Right or Left (R) ',$)
-12000 FORMAT (/' Index another face (Y) ? ',$)
-      END      
diff --git a/difrac/readme.dif b/difrac/readme.dif
deleted file mode 100644
index 78a0d90f..00000000
--- a/difrac/readme.dif
+++ /dev/null
@@ -1,128 +0,0 @@
-
-
-
-
-                     Installation Instructions for DIFRAC on a PC
-                     --------------------------------------------
-
-
-        The diskette supplied contains all files necessary to run and maintain 
-      the DIFRAC programs on a PC controlling the diffractometer.  These are
-
-         1.  CAD4L.EXE   --  the program to load the interface (CAD4 only).
-         2.  DIFRAC.EXE  --  the program to control the instrument;
-
-        The PC should be configured so that 
-      a. communication between the computer and the instrument is via COM1:, 
-      b. a printer is attached to LPT1: and
-      c. graphics is supported with a standard VGA (640x480) card.
-
-        The file GONIOM.INI contains constants needed by program to define the
-      diffractometer model, the microscope viewing position, the COM port number and
-      baud-rate and, in the case of the CAD4, other constants which define slit
-      positions, voltages etc. This file is plain ASCII and commented to facilitate
-      editting.
-
-
-      1.  CAD4L  (CAD-4 only)
-          -----
-         This is the analogue of the routine of the same name in the original
-      Enraf-Nonius control system.  It loads the binary interface code and some of
-      the instrumental constants.
-
-         There are three versions of the binary interface code.  
-
-      a. interfaces with Falcon  computers require the file FALCON.EXE;
-      b. interfaces with LS-11   computers require the file LSI_11.EXE;
-      c. interfaces with Falcon+ computers require the file FALCNP.EXE.
-
-      The routine CAD4L.EXE loads the appropriate file together with the interface
-      resident constants from the file goniom.ini.
-
-         The instrumental constants in the file GONIOM.INI should be editted so that
-      it contains values appropriate to the instrument in use.  These values should
-      be obtained from the original CAD-4 control routine with the CASPAR and GCONST
-      commands.
-
-        Files Needed :-- CAD4L.EXE, LSI_11.EXE or FALCON.EXE or FALCNP.EXE,
-                         GONIOM.INI.
-    
-
-      2.  DIFRAC
-          ------
-         This is the instrument control routine which carries out all
-      crystallographic operations and controls the diffractometer via the interface
-      computer.  It too needs the file goniom.ini in order to obtain other
-      instrumental constants.  The routine uses the file IDATA.DA to hold all data,
-      and if it does not exist when the routine is started it will be created and
-      sensible defaults will be supplied for most parameters.
-
-        Files Needed :-- DIFRAC.EXE, GONIOM.INI, probably IDATA.DA.
-
-
-
-
-
-        Setup Procedure
-        ---------------
-      1. Create a working subdirectory and copy all files from the diskettes into this
-         subdirectory.
-
-      2. Non-CAD-4 machines
-         Connect a serial line between COM1: and the instrument interface.
-         Edit the file goniom.ini to ensure that it contains at least the correct values
-         for Dfmodl, Port, Baud, Vutht, Vuome, Vuchi and Vuphi.
-
-      2. CAD-4 Only
-         Before disconnecting the main PDP-11 or VAX computer from the serial line to
-         the interface, run the E-N control routine to obtain the instrumental 
-         constants for the particular instrument.  Edit the file GONIOM.INI to 
-         reflect these constants as well as Dfmodl, Port, Baud, Vutht, Vuome, Vuchi and 
-         Vuphi.
-
-         Disconnect the main computer from the interface serial line and connect the 
-         line to COM1:.  The connection needs only a straight-through (null-modem)
-         cable (2 to 2, 3 to 3 etc).
-
-         Run CAD4L to load the interface.  
-         It should not be necessary to perform this step every time the 
-         diffractometer is used.  It maybe necessary to turn the interface power off 
-         and on again after a few seconds in order to get CAD4L to run properly.  The 
-         interface baud-rate is set to 9600 and the routine reports as the 46 blocks 
-         are loaded.  If the interface has been loaded correctly, the pocket 
-         terminal should be active and displaying the string DIFRAC.  Check that
-         the values for HV, LL etc are those from the goniom.ini file.
-
-      3. Run DIFRAC to drive the diffractometer.
-         See the writeup for a description of the commands.
-         When DIFRAC (and CAD4L) is started a header screen appears from the 
-         shareware used to control communication with the serial port.  Follow the
-         simple instructions and the screen will clear as the routine is run.
-
-
-        Files on Diskettes
-        ------------------
-      1. CAD4L.EXE, LSI_11.EXE, FALCON.EXE, FALCNP.EXE, DIFRAC.EXE, GONIOM.INI.
-         Library files GONIO6.LIB and PCL4.LIB.
-         CAD4L.MAK and CAD4L.OVL to rebuild CAD4L, and DIF.MAK and DIF.OVL 
-         to rebuild DIFRAC, if necessary with Microsoft Fortran.
-
-      2. All source files *.FOR for CAD4L and DIFRAC.  The writeup in ASCII form
-         as DIF.ASC and in Word-Perfect 6.1 form as DIF.WPD.
-         This file README.DIF.
-
-         It would probably be a good idea to copy all files before using them for any
-      other purpose.
-
-        In Case of Difficulties
-        -----------------------
-        Only 3 problems have been encountered with these programs. 
-      1. The cable between the PC and the interface is not a null-modem.
-      2. The cable is not connected to the COM1: port.
-      3. CAD4L seems to load correctly, but incorrect HV, LL etc values appear in
-         the pocket terminal.
-
-        The first 2 problems can be solved by ensuring that the correct cable is
-      connected to the correct port.  The third problem occurred in CAD4L and 
-      has been fixed.  If difficulties of this type are experienced contact 
-      Eric Gabe (e-mail gabe@sg1.chem.nrc.ca).
diff --git a/difrac/reindx.f b/difrac/reindx.f
deleted file mode 100644
index b20be589..00000000
--- a/difrac/reindx.f
+++ /dev/null
@@ -1,105 +0,0 @@
-C-----------------------------------------------------------------------
-C  This subroutine either :--
-C  1. for RS, finds the direct cell by reindexing 3 reflections;
-C  2. for CH, chooses reflections from the PK list to use with M2 or M3.
-C-----------------------------------------------------------------------
-      SUBROUTINE REINDX
-      INCLUDE 'COMDIF'
-      DIMENSION IOLD(3,3),INEW(3,3),INDICS(3)
-      DIMENSION THETAS(NSIZE),OMEGAS(NSIZE),CHIS(NSIZE),PHIS(NSIZE)
-      EQUIVALENCE (ACOUNT(        1),THETAS(1)),
-     $            (ACOUNT(  NSIZE*1),OMEGAS(1)),
-     $            (ACOUNT(2*NSIZE+1),CHIS(1)),
-     $            (ACOUNT(3*NSIZE+1),PHIS(1))
-      IF (KI .EQ. 'RS') THEN
-        WRITE (COUT,10000)
-        CALL YESNO ('Y',ANS)
-        IF (ANS .EQ. 'Y') THEN
-          DO 110 I = 1,3
-  100       WRITE (COUT,11000) I
-            CALL FREEFM (ITR)
-            IOLD(I,1) = IFREE(1)
-            IOLD(I,2) = IFREE(2)
-            IOLD(I,3) = IFREE(3)
-            INEW(I,1) = IFREE(4)
-            INEW(I,2) = IFREE(5)
-            INEW(I,3) = IFREE(6)
-            NN = -1
-            ISTAN = 0
-            IH = IOLD(I,1)
-            IK = IOLD(I,2)
-            IL = IOLD(I,3)
-            IF ((IH .EQ. 0 .AND. IK .EQ. 0 .AND. IL .EQ. 0) .OR.
-     $          (INEW(I,1) .EQ. 0 .AND. INEW(I,2) .EQ. 0 .AND. 
-     $           INEW(I,3) .EQ. 0)) THEN
-              WRITE (COUT,11100)
-              CALL GWRITE (ITP,' ')
-              GO TO 100
-            ENDIF
-            IPRVAL = 1
-            CALL ANGCAL
-            IF (IVALID .NE. 0) THEN
-              WRITE (COUT,12000)
-              CALL YESNO ('Y',ANS)
-              IF (ANS .EQ. 'N') GO TO 100
-            ENDIF
-            WRITE (COUT,13000) 
-     $            (IOLD(I,KK),KK = 1,3),THETA,OMEGA,CHI,PHI,
-     $            (INEW(I,KK),KK = 1,3)
-            CALL GWRITE (ITP,' ')
-            IHK(I)    = INEW(I,1)
-            NREFB(I)  = INEW(I,2)
-            ILA(I)    = INEW(I,3)
-            BCOUNT(I) = THETA
-            BBGR1(I)  = OMEGA
-            BBGR2(I)  = CHI
-            BTIME(I)  = PHI
-  110     CONTINUE
-          CALL ORMAT3
-        ENDIF
-C-----------------------------------------------------------------------
-C  Choose PK reflections for M2 or M3
-C-----------------------------------------------------------------------
-      ELSE IF (KI .EQ. 'CH') THEN
-        WRITE (COUT,14000)
-        CALL YESNO ('Y',ANS)
-        IF (ANS .EQ. 'Y') THEN
-          WRITE (COUT,15000)
-          CALL GWRITE (ITP,' ')
-C-----------------------------------------------------------------------
-C  Bring in the peaks from PK
-C-----------------------------------------------------------------------
-          READ (ISD, REC=140) NGOOD
-          CALL ANGRW (0,4,NGOOD,140,0)
-          DO 120 I = 1,3
-            WRITE (COUT,16000) I
-            CALL FREEFM (ITR)
-            IOC = IFREE(1)
-            INDICS(1) = IFREE(2)
-            INDICS(2) = IFREE(3)
-            INDICS(3) = IFREE(4)
-            IF (IOC .EQ. 0) THEN
-              KI = ' '
-              RETURN
-            ENDIF
-            IHK(I)   = INDICS(1)
-            NREFB(I) = INDICS(2)
-            ILA(I)   = INDICS(3)
-            BCOUNT(I) = THETAS(IOC)
-            BBGR1(I) = OMEGAS(IOC)
-            BBGR2(I) = CHIS(IOC)
-            BTIME(I) = PHIS(IOC)
-  120     CONTINUE
-        ENDIF
-      ENDIF
-      KI = ' '
-      RETURN
-10000 FORMAT (' Reindex 3 Reflections (Y) ? ',$)
-11000 FORMAT (' Reflection',I3,'. Type OLD indices then NEW indices ',$)
-11100 FORMAT (' 0,0,0 indices not allowed.  Try again.')
-12000 FORMAT (' The OLD indices are Invalid. Use them anyway (Y) ? ',$)
-13000 FORMAT (2X,3I3,4F8.2,' New indices  ',3I3)
-14000 FORMAT (' Choose reflections from OC for M2 or M3 (Y) ? ',$)
-15000 FORMAT (' Sequence number in OC and indices')
-16000 FORMAT (' Reflection ',I1,' ',$)
-      END
diff --git a/difrac/sammes.f b/difrac/sammes.f
deleted file mode 100644
index 1499533f..00000000
--- a/difrac/sammes.f
+++ /dev/null
@@ -1,116 +0,0 @@
-C-----------------------------------------------------------------------
-C
-C  Subroutine to measure intensities to controlled precision.
-C
-C  A sample scan is taken and from the results a decision is made 
-C  on the further course of action to obtain a specified precision.
-C  A precision PA is defined as sigma(Inet)/Inet.  Then :--
-C   1.  If Inet < 2sigma(Inet) no further measurement is done;
-C   2.  If precision PA has been acheived, no further measurement;
-C   3.  If PA has not been acheived, THEN
-C      a. if PA can be acheived in a time less than TMAX, then the 
-C         necessary further scans are done,
-C      b. if PA cannot be acheived in TMAX, but a minimum precision PM
-C         can be if all of TMAX is used, then this is done,
-C      c. if PM cannot be acheived in TMAX, then no further measurement. 
-C  The algorithm is described in D.F.Grant,  Acta Cryst. 1973, A29, 217.
-C
-C  On return :--
-C    the peak count is in COUNT, the backgrounds in BGRD1 & BGRD2,
-C    total number of scans in ITIME and attenuator number in NATT.
-C
-C-----------------------------------------------------------------------
-      SUBROUTINE SAMMES (ITIME,ICC)
-      COMMON/PREC/PCOUNT(500)
-      INCLUDE 'COMDIF'
-C-----------------------------------------------------------------------
-C  Do the sample scan
-C-----------------------------------------------------------------------
-      CALL MESINT (IROFL,ICC)
-      ITIME = 1
-      NPPTS = IDEL
-      TOTIME = PRESET
-      PK = COUNT
-      B1 = BGRD1
-      B2 = BGRD2
-      DO 100 N = 1,NPPTS + 10
-        PCOUNT(N) = ACOUNT(N)
-  100 CONTINUE
-      CALL PROFIL
-      TEMP = FRAC
-      IF (IPRFLG .EQ. 0) TEMP = FRAC1
-C-----------------------------------------------------------------------
-C  Analysis of the sample counts.
-C  If the net count is < 2sigma(Inet)  RETURN
-C-----------------------------------------------------------------------
-      IF(TEMP .GT. 0) THEN
-           FACT = 1.0/(TEMP*2.0)
-      ELSE
-           FACT = 1.
-      ENDIF
-      ENQ = COUNT - (BGRD1 + BGRD2)*FACT
-      ENQD = ENQ - (2.0*SQRT(COUNT + (BGRD1 + BGRD2)*FACT*FACT))
-      IF (ENQD .LE. 0.0) RETURN
-C-----------------------------------------------------------------------
-C  How many scans will be needed to attain precision PA ?
-C-----------------------------------------------------------------------
-      NF = (COUNT + (BGRD1 + BGRD2)*FACT*FACT)/(ENQD*ENQD*PA*PA) + 0.5
-      IF (NF .LE. 1) THEN
-        RETURN
-      ELSE
-        TEMP = NF*PRESET
-        IF (TEMP .LE. TMAX) THEN
-          DO 120 I = 2,NF
-            CALL MESINT (IROFL,ICC)
-            DO 110 N = 1,NPPTS + 10
-              PCOUNT(N) = PCOUNT(N) + ACOUNT(N)
-  110       CONTINUE
-            TOTIME = TOTIME + PRESET
-            PK = PK + COUNT
-            B1 = B1 + BGRD1
-            B2 = B2 + BGRD2
-            CALL KORQ (KQFLAG)
-            IF (KQFLAG .EQ. 0) GO TO 200
-  120     CONTINUE
-          GO TO 200
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  PA cannot be acheived in TMAX. 
-C  How many scans will be needed to attain precision PM ?
-C-----------------------------------------------------------------------
-      NF = (COUNT + (BGRD1 + BGRD2)*FACT*FACT)/(ENQ*ENQ*PM*PM) + 0.5
-      IF (NF .LE. 1) THEN
-        RETURN
-      ELSE
-        TEMP = NF*PRESET
-        IF (TEMP .LE. TMAX) THEN
-          NF = TMAX/PRESET + 0.5
-          DO 140 I = 2,NF
-            CALL MESINT (IROFL,ICC)
-            DO 130 N = 1,NPPTS + 10
-              PCOUNT(N) = PCOUNT(N) + ACOUNT(N)
-  130       CONTINUE
-            TOTIME = TOTIME + PRESET
-            PK = PK + COUNT
-            B1 = B1 + BGRD1
-            B2 = B2 + BGRD2
-            CALL KORQ (KQFLAG)
-            IF (KQFLAG .EQ. 0) GO TO 200
-  140     CONTINUE
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  This is the end of all scans
-C-----------------------------------------------------------------------
-  200 COUNT = PK
-      BGRD1 = B1
-      BGRD2 = B2
-      PRESET = TOTIME
-      ITIME = NF
-      DO 210 N = 1,NPPTS + 10
-        ACOUNT(N) = PCOUNT(N)
-  210 CONTINUE
-      RETURN
-      END
-
diff --git a/difrac/setiou.f b/difrac/setiou.f
deleted file mode 100644
index fddfc5b9..00000000
--- a/difrac/setiou.f
+++ /dev/null
@@ -1,87 +0,0 @@
-C-----------------------------------------------------------------------
-C
-C                         Subroutine SETIOU
-C
-C     This subroutine sets the unit numbers for the commonly used I/O
-C  units and the RECL multiplier for direct-access OPEN statements
-C  for the NRCVAX Structure Package.  It is called by all the
-C  routines of the package and therefore by changing the numbers
-C  assigned, all the I/O units can be changed for different operating
-C  systems.  The assignments are as follows for VAX VMS :--
-C
-C   IOUNIT    Value   General System File or      General System
-C    Array                   Device                    Symbol
-C
-C      1        1      Crystal Data File                ICD
-C      2        2      Reflection Data File             IRE
-C      3        3      Line-printer Output File         LPT
-C      4        4              --
-C      5        5      Terminal Input                   ITR
-C      6        6      Terminal Output                  ITP
-C      7        7              --
-C      8        8              --
-C      9        9              --
-C     10       10              --
-C
-C  The values of the 5 general symbols are set by the subroutine and
-C  assigned to the general system symbol.
-C
-C  The 5 other values are set, but are not automatically assigned to a
-C  symbol generally used by the system.  These are units 4,7,8,9 & 10.
-C
-C  To change the values, alter the numbers assigned to IOUNIT(i).
-C  Ensure that there are no duplicate assignments.
-C
-C  The RECL length multiplier, IBYLEN, is the number used to get the
-C  RECL parameter of OPEN statements for direct-access files to the
-C  correct value.
-C  For the VAX it is 1, i.e. the record-length is specified as
-C  the number of 4-byte variables/record.  For other systems it may be
-C  necessary to change the length to bytes, in which case the value
-C  should be 4.
-C
-C  The values in IOUNIT are used in all free form input
-C
-C-----------------------------------------------------------------------
-      SUBROUTINE SETIOU (ICD,IRE,LPT,ITR,ITP,IBYLEN)
-      INCLUDE 'IATSIZ'
-      COMMON /IOUASS/ IOUNIT(12)
-C-----------------------------------------------------------------------
-C  Setup for the various machines and compilers
-C-----------------------------------------------------------------------
-      IF (MNCODE .EQ. 'VAXVMS') THEN
-        IBYLEN = 1
-      ELSE
-        IBYLEN = 4
-      ENDIF
-C-----------------------------------------------------------------------
-C  First the 5 general units (for ICD, IRE, LPT, ITR and ITP
-C-----------------------------------------------------------------------
-      IOUNIT( 1) =  1
-      IOUNIT( 2) =  2
-      IOUNIT( 3) =  3
-      IOUNIT( 5) =  5
-      IOUNIT( 6) =  6
-C-----------------------------------------------------------------------
-C  Now the remaining less general units
-C-----------------------------------------------------------------------
-      IOUNIT( 4) =  4
-      IOUNIT( 7) =  7
-      IOUNIT( 8) =  8
-      IOUNIT( 9) =  9
-      IOUNIT(10) = 10
-C-----------------------------------------------------------------------
-C  Save the value of IBYLEN
-C-----------------------------------------------------------------------
-      IOUNIT(12) = IBYLEN
-C-----------------------------------------------------------------------
-C  Assign the General System units to save having to do it in each
-C  system routine
-C-----------------------------------------------------------------------
-      ICD = IOUNIT(1)
-      IRE = IOUNIT(2)
-      LPT = IOUNIT(3)
-      ITR = IOUNIT(5)
-      ITP = IOUNIT(6)
-      RETURN
-      END
diff --git a/difrac/setop.f b/difrac/setop.f
deleted file mode 100644
index 0b36b1c9..00000000
--- a/difrac/setop.f
+++ /dev/null
@@ -1,724 +0,0 @@
-C-----------------------------------------------------------------------
-C           This is the Command interpreting subroutine
-C 
-C    Each 2-letter command in KI is associated with a unique call or 
-C  set of calls.  Having made the call the particular 2-letter sequence
-C  will not make any further calls and will be cleared at the end of 
-C  the call.
-C    When routines change the value of KI, which some do, the new value 
-C  is always unique and will always cause action further down in SETOP.
-C
-C-----------------------------------------------------------------------
-      SUBROUTINE SETOP
-      INCLUDE 'COMDIF'
-      CHARACTER STRING*80
-  100 WRITE (COUT,10000)
-      CALL ALFNUM (STRING)
-      KI = STRING(1:2)
-      IF (KI .EQ. 'Q') THEN
-         CALL WNEND
-         STOP
-      ENDIF 
-C-----------------------------------------------------------------------
-C  The program runs in two modes, full screen and windowed.
-C  The following routines require the use of the windowed mode
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'GO' .OR. KI .EQ. 'IP' .OR.
-     $    KI .EQ. 'IR' .OR. KI .EQ. 'IE' .OR. KI .EQ. 'IM') THEN
-         IF (IWNCUR .EQ. 3) CALL WNSET (2)
-      ENDIF
-C-----------------------------------------------------------------------
-C  These routines require full screen mode, any others should work
-C  in either mode so we are not flipping screens all the time
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'AL' .OR. KI .EQ. 'A8' .OR. KI .EQ. 'RO' .OR.
-     $    KI .EQ. 'OC' .OR. KI .EQ. 'SD' .OR. KI .EQ. 'AR' .OR.
-     $    KI .EQ. 'PK' .OR. KI .EQ. 'RC' .OR. KI .EQ. 'PD' .OR.
-     $    KI .EQ. 'RP' .OR. KI .EQ. 'BD' .OR. KI .EQ. 'CH' .OR.
-     $    KI .EQ. 'GS' .OR. KI .EQ. 'CR' .OR. KI .EQ. 'LC' .OR.
-     $    KI .EQ. 'LP' .OR. KI .EQ. 'M2' .OR. KI .EQ. 'M3' .OR.
-     $    KI .EQ. 'MM' .OR. KI .EQ. 'RS' .OR. KI .EQ. 'BC' .OR.
-     $    KI .EQ. 'NR' .OR. KI .EQ. 'TO' .OR.
-     $    KI .EQ. 'MR' .OR. KI .EQ. 'MS' .OR. KI .EQ. 'FI') THEN
-         IF (IWNCUR .NE. 3) CALL WNSET (3)
-      ENDIF
-C-----------------------------------------------------------------------
-C  This routine reads commands from the terminal and sets a flag to 
-C  indicate whether the command may inhibit an automatic restart of
-C  data collection, if appropriate.
-C  All control of the program flow is via the variable KI.
-C-----------------------------------------------------------------------
-      IF (KI .NE. ' ') THEN
-        IMENU = 0
-      ELSE
-        IF (IMENU .EQ. 0) THEN
-          WRITE (COUT,11000)
-          CALL YESNO ('N',ANS)
-        ELSE
-          IMENU = 0
-          ANS = 'Y'
-        ENDIF
-        IF (ANS .EQ. 'Y') THEN
-          IWNOLD = IWNCUR
-          IF (IWNCUR .NE. 3) CALL WNSET (3)
-          WRITE (COUT,12000)
-          CALL GWRITE (ITP,' ')
-          IF (DFMODL .EQ. 'CAD4') THEN
-            WRITE (COUT,12100)
-            CALL GWRITE (ITP,' ')
-          ENDIF
-          WRITE (COUT,12200)
-          CALL FREEFM (ITR)
-          I = IFREE(1)
-          CALL GWRITE (ITP,' ')
-          IF (I .EQ. 0 .OR. I .EQ. 1) THEN
-            WRITE (COUT,13000)
-            CALL GWRITE (ITP,' ')
-            IF (I .EQ. 0) THEN
-              WRITE (COUT,14000)
-              CALL ALFNUM (STRING)
-              ANS = STRING(1:1)
-            ENDIF
-          ENDIF
-          IF (I .EQ. 0 .OR. I .EQ. 2) THEN
-            WRITE (COUT,15000)
-            CALL GWRITE (ITP,' ')
-            IF (I .EQ. 0) THEN
-              WRITE (COUT,14000)
-              CALL ALFNUM (STRING)
-              ANS = STRING(1:1)
-            ENDIF
-          ENDIF
-          IF (I .EQ. 0 .OR. I .EQ. 3) THEN
-            WRITE (COUT,16000)
-            CALL GWRITE (ITP,' ')
-            IF (I .EQ. 0) THEN
-              WRITE (COUT,14000)
-              CALL ALFNUM (STRING)
-              ANS = STRING(1:1)
-            ENDIF
-          ENDIF
-          IF (I .EQ. 0 .OR. I .EQ. 4) THEN
-            WRITE (COUT,17000)
-            CALL GWRITE (ITP,' ')
-            IF (I .EQ. 0) THEN
-              WRITE (COUT,14000)
-              CALL ALFNUM (STRING)
-              ANS = STRING(1:1)
-            ENDIF
-          ENDIF
-          IF (I .EQ. 0 .OR. I .EQ. 5) THEN
-            WRITE (COUT,18000)
-            CALL GWRITE (ITP,' ')
-            IF (I .EQ. 0) THEN
-              WRITE (COUT,14000)
-              CALL ALFNUM (STRING)
-              ANS = STRING(1:1)
-            ENDIF
-          ENDIF
-          IF (I .EQ. 0 .OR. I .EQ. 6) THEN
-            WRITE (COUT,19000)
-            CALL GWRITE (ITP,' ')
-            WRITE (COUT,20000)
-            CALL GWRITE (ITP,' ')
-            IF (I .EQ. 0) THEN
-              WRITE (COUT,14000)
-              CALL ALFNUM (STRING)
-              ANS = STRING(1:1)
-            ENDIF
-          ENDIF
-          IF (DFMODL .EQ. 'CAD4' .AND. (I .EQ. 0 .OR. I .EQ. 7)) THEN
-            WRITE (COUT,20100)
-            CALL GWRITE (ITP,' ')
-            IF (I .EQ. 0) THEN
-              WRITE (COUT,14000)
-              CALL ALFNUM (STRING)
-              ANS = STRING(1:1)
-            ENDIF
-          ENDIF
-        ENDIF
-        GO TO 100
-      ENDIF
-      IF (KI .EQ. 'RI') KI = 'RB'
-      JAUTO = 0
-      IF (KI .EQ. 'AD') CALL BASINP
-      IF (KI .EQ. 'AL' .OR. KI .EQ. 'AR') CALL ALIGN
-      IF (KI .EQ. 'AP') CALL PROFAS
-      IF (KI .EQ. 'A8') CALL CENT8
-      IF (KI .EQ. 'BI') CALL PRNINT
-      IF (KI .EQ. 'CR') CALL ALIGN
-      IF (KI .EQ. 'CZ') CALL BASINP
-      IF (KI .EQ. 'DE') CALL DEMO1E
-      IF (KI .EQ. 'EX') THEN
-        WRITE (COUT,21000)
-        CALL YESNO ('Y',ANS)
-        IF (ANS .EQ. 'Y') THEN
-          CALL WRBAS
-          CALL WNEND 
-          STOP
-        ENDIF
-      ENDIF
-      IF (KI .EQ. 'GO') THEN
-        ISEG = 0
-        IAUTO = 0
-        CALL BEGIN
-      ENDIF
-      IF (KI .EQ. 'GS') CALL GRID
-      IF (KI .EQ. 'AI') CALL IDTOAS
-      IF (KI .EQ. 'IE') CALL INDMES
-      IF (KI .EQ. 'IM') CALL INDMES
-      IF (KI .EQ. 'IN') CALL ANGINI
-      IF (KI .EQ. 'IR') CALL INDMES
-      IF (KI .EQ. 'IP') CALL INDMES
-      IF (KI .EQ. 'AH') KI = 'IX'
-      IF (KI .EQ. 'IX') CALL RCPCOR
-      IF (KI .EQ. 'LP') CALL LINPRF
-      IF (KI .EQ. 'MM') THEN
-        CALL LSORMT
-        IF (KI .NE. ' ') CALL BASINP
-      ENDIF
-      IF (KI .EQ. 'M2') THEN
-        CALL ORCEL2
-        IF (KI .NE. ' ') CALL BASINP
-      ENDIF
-      IF (KI .EQ. 'M3') THEN
-        CALL ORMAT3
-        IF (KI .NE. ' ') CALL BASINP
-      ENDIF
-      IF (KI .EQ. 'TO') THEN
-        CALL TRANSF
-        IF (KI .NE. ' ') CALL BASINP
-      ENDIF
-      IF (KI .EQ. 'LC') CALL CELLLS
-      IF (KI .EQ. 'OM') CALL BASINP
-      IF (KI .EQ. 'PO') KI = 'OS'
-      IF (KI .EQ. 'OS') CALL OSCIL
-      IF (KI .EQ. 'PA') CALL PRTANG
-      IF (KI .EQ. 'PD') CALL PRNBAS
-      IF (KI .EQ. 'PL') CALL SETROW
-      IF (KI .EQ. 'PR') CALL SETROW
-      IF (KI .EQ. 'HA') KI = 'RA'
-      IF (KI .EQ. 'P9') CALL PHI90 
-      IF (KI .EQ. 'RA') CALL ORMAT3
-      IF (KI .EQ. 'RB') CALL WRBAS
-      IF (KI .EQ. 'RP') CALL PSCAN (JUNK,JUNK)
-      IF (KI .EQ. 'SA') CALL INDMES
-      IF (KI .EQ. 'SC') CALL INDMES
-      IF (KI .EQ. 'SH') THEN
-        CALL SHUTTR (0)
-        KI = ' '
-      ENDIF
-      IF (KI .EQ. 'SW') CALL SWITCH
-      IF (KI .EQ. 'SO') CALL INDMES
-      IF (KI .EQ. 'SP') CALL INDMES
-      IF (KI .EQ. 'SR') CALL INDMES
-      IF (DFMODL .EQ. 'CAD4') THEN
-        IF (KI .EQ. 'EK' .OR. KI .EQ. 'KE') CALL EKKE
-        IF (KI .EQ. 'MS') CALL INDMES
-        IF (KI .EQ. 'MR') CALL RCPCOR
-        IF (KI .EQ. 'FI') CALL FACEIN
-      ENDIF
-      IF (KI .EQ. 'ST') CALL INDMES
-      IF (KI .EQ. 'TC') CALL PCOUNT
-      IF (KI .EQ. 'UM') CALL CNTREF
-      IF (KI .EQ. 'VM') CALL VUMICR
-      IF (KI .EQ. 'WB') CALL WRBAS
-      IF (KI .EQ. 'HO' .OR. KI .EQ. 'ZE') THEN
-        CALL ZERODF
-        KI = ' '
-      ENDIF
-      IF (KI .EQ. 'NR') CALL SETNRC
-C-----------------------------------------------------------------------
-C  If the command has not yet been executed, no auto restart is
-C  possible
-C-----------------------------------------------------------------------
-      IF (KI .NE. ' ') JAUTO = 1
-      IF (KI .EQ. 'BD') CALL BASINP
-      IF (KI .EQ. 'CH') CALL REINDX
-      IF (KI .EQ. 'DH') THEN
-        IKO(5) = 0
-        CALL BASINP
-      ENDIF
-      IF (KI .EQ. 'FR') CALL BASINP
-      IF (KI .EQ. 'LA') CALL BASINP
-      IF (KI .EQ. 'LT') CALL LOTEM
-      IF (KI .EQ. 'OC') CALL BLIND
-      IF (KI .EQ. 'PK') CALL PEAKSR
-      IF (KI .EQ. 'PS') CALL BASINP
-      IF (KI .EQ. 'RC') CALL CREDUC (KI)
-      IF (KI .EQ. 'RO') CALL BASINP
-      IF (KI .EQ. 'BC') CALL BIGCHI
-      IF (KI .EQ. 'RR') CALL BASINP
-      IF (KI .EQ. 'RS') CALL REINDX
-      IF (KI .EQ. 'SD') CALL BASINP
-      IF (KI .EQ. 'SE') CALL BASINP
-      IF (KI .EQ. 'SG') THEN
-        IOUT = ITP 
-        CALL SPACEG (IOUT,1)
-      ENDIF
-      IF (KI .EQ. 'TM') CALL BASINP
-      IF (KI .EQ. 'TP') CALL BASINP
-C-----------------------------------------------------------------------
-C  If the KI code is in the first 60 codes, then no automatic restart.
-C-----------------------------------------------------------------------
-      IF (JAUTO .NE. 0) THEN
-        NSAVE = NBLOCK
-        ZERO = 0
-        WRITE (IID,REC=9) ZERO
-        NBLOCK = NSAVE
-      ENDIF
-      IF (KI .NE. ' ') THEN
-        WRITE (COUT,22000) KI
-        CALL GWRITE (ITP,' ')
-        KI = ' '
-        IMENU = 1
-        GO TO 100
-      ENDIF
-      RETURN
-10000 FORMAT (' Command ',$)
-11000 FORMAT (' Unacceptable command. Do you want the menus (N) ? ',$)
-12000 FORMAT (/' The following help menus are available :--'/
-     $         '  1.  Terminal Data Input Commands;'/
-     $         '  2.  Crystal Alignment Commands;'/
-     $         '  3.  Intensity Data Collection;'/
-     $         '  4.  Angle Setting and Intensity Measurement;'/
-     $         '  5.  Photograph Setup Commands;'/
-     $         '  6.  General System Commands.')
-12100 FORMAT ( '  7.  Kappa Geometry (CAD-4) Commands.')
-12200 FORMAT (' Which do you want (All) ? ',$)
-13000 FORMAT (/10X,'*** Terminal Data Input Commands ***'/
-     $'   AD Attenuator Data: number and values.'/
-     $'   BD all Basic Data (CZ DH FR LA OM OR PS RR SD SE TM TP)'/
-     $'   CZ Correct angle Zero values.'/
-     $'   FR First Reflection to be measured.'/
-     $'   LA LAmbda for the wavelength in use, usually alpha1.'/
-     $'   LT Liquid Nitrogen option - specific to cryosystem.'/
-     $'   OM Orientation Matrix.'/
-     $'   PS PSi rotation data.'/
-     $'   RO re-Orientation Reflections: frequency and h,k,ls.'/
-     $'   RR Reference Reflections: frequency and h,k,ls.'/
-     $'   SD Scan Data: type, width, speed, profile control.'/
-     $'   SE Systematic Extinctions.'/
-     $'   SG Space-Group symbol.'/
-     $'   TM 2Theta Min and max values.'/
-     $'   TP Time and Precision parameters for intensity measurement.'/)
-14000 FORMAT (' Type <CR> when ready to proceed.')
-15000 FORMAT (/10X,'*** Crystal Alignment Commands ***'/
-     $'   AL ALign reflections and their symmetry equivalents for MM.'/
-     $'   AR Align Resumption after interruption.'/
-     $'   A8 Align the 8 alternate settings of one reflection.'/
-     $'   CH CHoose reflections from the PK list for use with M2/M3.'/
-     $'   CR Centre the Reflection which is already in the detector.'/
-     $'   LC 2theta Least-squares Cell with symmetry constrained cell.'/
-     $'   MM Matrix from Many reflections by least-squares on AL data.'/
-     $'   M2 Matrix from 2 indexed reflections and a unit cell.'/
-     $'   M3 Matrix from 3 indexed reflections.'/
-     $'   OC Orient a Crystal, i.e. index the peaks from PK.'/
-     $'   PK PeaK search in 2Theta, Chi, Phi for use with OC.'/
-     $'   RC Reduce a unit Cell.'/
-     $'   RP Rotate Phi 360degs, centre and save any peaks found.'/
-     $'   RS ReSet the cell and matrix with the results from RC.'/
-     $'   TO Transform the Orientation matrix.'/)
-16000 FORMAT (/10X,'*** Intensity Data Collection ***'/
-     $'   GO Start of intensity data collection.'/
-     $'   K  Kill operation at the end of the current reflection.'/
-     $'   Q  Quit after the next set of reference reflections.'/)
-17000 FORMAT (/5X,'*** Angle Setting and Intensity Measurement ***'/
-     $'   GS Grid Search measurement in 2theta, omega or chi.'/
-     $'   IE Intensity measurement for Equivalent reflections.'/
-     $'   IM Intensity Measurement of the reflection in the detector.'/
-     $'   IP Intensity measurement in Psi for empirical absorption.'/
-     $'   IR Intensity measurement for specified Reflections.'/
-     $'   LP Line Profile plot on the printer.'/
-     $'   SA Set All angles to specified values.'/
-     $'   SC Set    Chi to the specified value.'/
-     $'   SH SHutter open or close as a flip/flop.'/
-     $'   SO Set  Omega to the specified value.'/
-     $'   SP Set    Phi to the specified value.'/
-     $'   SR Set Reflection: h,k,l,psi.'/
-     $'   ST Set 2Theta to the specified value.'/
-     $'   TC Timed Counts.'/
-     $'   ZE ZEro the instrument Angles.'/)
-18000 FORMAT (/10X,'*** Photograph Setup Commands ***'/
-     $'   PL Photograph in the Laue mode.'/
-     $'   PO Photograph in the Oscillation mode (same as OS).'/
-     $'   PR Photograph in the Rotation mode.'/)
-19000 FORMAT (/10X,'*** General System Commands ***'/
-     $'   AH Angles to H,k,l (same as IX).'/
-     $'   AI Ascii Intensity data file conversion.'/
-     $'   AP Ascii Profile data file conversion.'/
-     $'   BC Big Chi search for psi rotation.'/
-     $'   BI Big Intensity search in the IDATA.DA file.'/
-     $'   EX EXit the program saving the basic data on IDATA.DA.'/
-     $'   HA H,k,l to Angles (same as RA).')
-20000 FORMAT (
-     $'   IN INitialize integer parts of present angles (NRC only).'/
-     $'   NR set the NRC program flag.'/
-     $'   P9 Rotate Phi by 90 degrees for crystal centering.'/
-     $'   PA Print Angle settings.'/
-     $'   PD Print Data of all forms.'/
-     $'   Q  Quit the program directly.'/
-     $'   RB Read the Basic data from the IDATA.DA file.'/
-     $'   SW SWitch register flags setting.'/
-     $'   UM (UMpty) Count unique reflections within theta limits.'/
-     $'   VM View crystal with Microscope.'/ 
-     $'   WB Write the Basic data to the IDATA.DA file.'/)
-20100 FORMAT (/10X,'*** For Kappa geometry (CAD-4) ***'/
-     $'   EK Euler to Kappa angle conversion.'/
-     $'   KE Kappa to Euler angle conversion.'/
-     $'   MR emulate CAD-4 MICROR command.'/
-     $'   MS emulate CAD-4 MICROS command.')
-21000 FORMAT (' EX was typed. Are you sure you wish to exit (Y) ? ',$)
-22000 FORMAT (' The command ',A,' is invalid. Type <CR> for the menus.')
-      END
-C-----------------------------------------------------------------------
-C  Subroutine to open and close the X-ray shutter
-C  This routine is called via 'SH' or direct from other routines.
-C  The argument IDO has the following values :--
-C    -1  Close the shutter
-C     0  Reverse the sense of the shutter.  The sense is held in SENSE
-C     1  Open the shutter
-C     2  ??
-C    99  Called from GOLOOP at the start of data-collection; 
-C        Opens the shutter and sets DOIT = 'NO'
-C        to prevent shutter operation during data-collection.
-C   -99  Called from GOLOOP at the end of data-collection; 
-C        Closes the shutter and sets DOIT = 'YES'
-C        to allow normal shutter operation.
-C
-C  This version is for Rigaku diffractometers,but should work (surely?)
-C  for all instruments with trivial modification.
-C-----------------------------------------------------------------------
-      SUBROUTINE SHUTTR (IDO)
-      CHARACTER SENSE*4,COUT(20)*132,DOIT*4
-      COMMON /IOUASC/ COUT
-      DATA SENSE/'CLOS'/,ICLOSE,IOPEN/0,1/,DOIT/'YES '/
-      INF = 0
-      IF (DOIT .EQ. 'YES ') THEN
-        IF (IDO .EQ.-1 .OR. IDO .EQ. -99) THEN
-          IF (SENSE .EQ. 'OPEN') THEN
-            CALL SHUTR (ICLOSE,INF)
-            IF (INF .NE. 0) GO TO 100
-            SENSE = 'CLOS' 
-          ENDIF
-        ELSE IF (IDO .EQ. 0) THEN
-          IF (SENSE .EQ. 'OPEN') THEN
-            CALL SHUTR (ICLOSE,INF)
-            IF (INF .NE. 0) GO TO 100
-            SENSE = 'CLOS'
-          ELSE
-            CALL SHUTR (IOPEN,INF)
-            IF (INF .NE. 0) GO TO 100
-            SENSE = 'OPEN'
-          ENDIF
-        ELSE IF (IDO .EQ. 1 .OR. IDO .EQ. 99) THEN
-          IF (SENSE .EQ. 'CLOS') THEN
-            CALL SHUTR (IOPEN,INF)
-            IF (INF .NE. 0) GO TO 100
-            SENSE = 'OPEN'
-          ENDIF
-        ELSE IF (IDO .EQ. 2) THEN
-          IF (SENSE .EQ. 'OPEN') CALL SHUTR (IOPEN,INF)
-          IF (SENSE .EQ. 'CLOS') CALL SHUTR (ICLOSE,INF)
-        ENDIF
-      ELSE
-        IF (IDO .EQ. -99) THEN
-          CALL SHUTR (ICLOSE,INF)
-          IF (INF .NE. 0) GO TO 100
-          SENSE = 'CLOS'
-        ENDIF
-      ENDIF
-      IF (IDO .EQ.  99) DOIT = 'NO  '
-      IF (IDO .EQ. -99) DOIT = 'YES '
-      RETURN
-  100 WRITE (COUT,10000)
-      CALL GWRITE (ITP,' ')
-      RETURN
-10000 FORMAT (' Shutter Error.')
-      END
-C-----------------------------------------------------------------------
-C  Subroutine to initialize the integer values of the angles
-C-----------------------------------------------------------------------
-      SUBROUTINE ANGINI
-      INCLUDE 'COMDIF'
-      WRITE (COUT,10000)
-      CALL YESNO ('Y',ANS)
-      IF (ANS .EQ. 'Y') THEN
-        WRITE (COUT,11000)
-        CALL FREEFM (ITR)
-        RTHETA = RFREE(1)
-        ROMEGA = RFREE(2)
-        RCHI   = RFREE(3)
-        RPHI   = RFREE(4)
-        CALL INITL (RTHETA,ROMEGA,RCHI,RPHI)
-        KI = ' '
-      ENDIF
-      RETURN
-10000 FORMAT (' Initialize the integer parts of the angle (Y) ? ',$)
-11000 FORMAT (' Type the integers for 2theta,omega,chi,phi ',$)
-      END
-C-----------------------------------------------------------------------
-C  Subroutine to call the space group symbol interpreting routines
-C  If IOUT   .LT. -1 the symbol is not asked for
-C  If IOUT   .LT. 0  there is no printed output from SGROUP
-C  If IDHFLG .EQ. 1  the DH matrices are generated
-C-----------------------------------------------------------------------
-      SUBROUTINE SPACEG (IOUT,IDHFLG)
-      INCLUDE 'COMDIF'
-      DIMENSION CEN(3,4),GARB(500),ISET(25)
-      EQUIVALENCE (ACOUNT(1),GARB(1))
-      CHARACTER STRING*10
-      IF (IOUT .EQ. -2) THEN
-        IOUT = -1
-        GO TO 130
-      ENDIF
-  100 IF (SGSYMB(1) .EQ. 0.0 .AND. SGSYMB(2) .EQ. 0.0) THEN
-        WRITE (COUT,10000)
-      ELSE
-        WRITE (STRING,11000) SGSYMB
-        DO 110 I = 10,1,-1
-          IF (STRING(I:I) .NE. ' ') GO TO 120
-  110   CONTINUE
-  120   WRITE (COUT,12000) STRING(1:I)
-      ENDIF
-      CALL ALFNUM (STRING)
-      IF (STRING .NE. ' ') READ (STRING,11000) SGSYMB
-  130 IERR = ITP 
-      CALL SGROUP (SGSYMB,LAUENO,NAXIS,ICENT,LATCEN,NSYM,NPOL,JRT,
-     $             CEN,NCV,IOUT,IERR,GARB)
-      IF (NAXIS .GE. 4) GO TO 100
-      IF (IDHFLG .EQ. 1) THEN
-        SAVE = NBLOCK
-        CALL DHGEN
-        NBLOCK = SAVE
-C-----------------------------------------------------------------------
-C  Read the DH segment data from the IDATA file
-C-----------------------------------------------------------------------
-        READ (IID,REC=4) LATCEN,NSEG,(IHO(I),IKO(I),ILO(I),((IDH(I,J,M),
-     $                   J = 1,3),M = 1,3),I = 1,4),
-     $                   NSYM,NSET,ISET,LAUENO,NAXIS,ICENT
-      ENDIF
-      IF (KI .EQ. 'SG') KI = ' '
-      RETURN
-10000 FORMAT (' Type the space-group symbol ')
-11000 FORMAT (10A1)
-12000 FORMAT (' Type the space-group symbol (',A,') ')
-      END
-C-----------------------------------------------------------------------
-C  Subroutine to set switches
-C-----------------------------------------------------------------------
-      SUBROUTINE SWITCH
-      INCLUDE 'COMDIF'
-      CHARACTER STRING*20
-      WRITE (COUT,10000) (ISREG(I),I=1,10)
-      CALL ALFNUM (STRING)
-      IF (STRING .NE. ' ') THEN
-        DO 100 I = 1,LEN(STRING)
-          IASCII = ICHAR (STRING(I:I))
-          IF (IASCII .GE. 48 .AND. IASCII .LE. 57) THEN
-            ISWTCH = IASCII - 48 + 1
-            IF (ISREG(ISWTCH) .EQ. 0) THEN
-              ISREG(ISWTCH) = 1
-            ELSE
-              ISREG(ISWTCH) = 0
-            ENDIF
-          ENDIF
-  100   CONTINUE
-      ENDIF
-      WRITE (COUT,11000) (ISREG(I),I=1,10)
-      CALL GWRITE (ITP,' ')
-      KI = ' '
-      RETURN
-10000 FORMAT (' The current settings are: 0 1 2 3 4 5 6 7 8 9'/
-     $        '                          ',10I2/
-     $        ' Input switches to change (none): ')
-11000 FORMAT (' The  new settings are:    0 1 2 3 4 5 6 7 8 9'/
-     $        '                          ',10I2)
-      END
-C----------------------------------------------------------------------
-C  Set the NRC flag +1 if Chi(0) is at the bottom of the chi circle,
-C                   -1 if Chi(0) is at the top.
-C  Assuming the instrument itself is defined in a right-handed way.
-C----------------------------------------------------------------------
-      SUBROUTINE SETNRC
-      INCLUDE 'COMDIF'
-      WRITE (COUT,10000) NRC
-      CALL FREEFM (ITR)
-      IF (IFREE(1) .NE. 0) NRC = IFREE(1)
-      RETURN
-10000 FORMAT (' The current value of the NRC flag is',I3/
-     $        ' Type the new value (Current) ',$)
-      END
-C-----------------------------------------------------------------------
-C  Convert Euler angles to Kappa (KI = 'EK') or vice-versa (KI = 'KE')
-C-----------------------------------------------------------------------
-      SUBROUTINE EKKE
-      INCLUDE 'COMDIF'
-      COMMON /CADCON/ ALPHA,APMIN,APMAX,MAXVAR,MINVAR,
-     $                IHOLE,IVSLIT,IHSLIT,INEG45,IPOS45,IUPHAF,ILOHAF,
-     $                VUTHT,VUOME,VUCHI,VUPHI,IPORT,IBAUD
-      PARAMETER (RA = 57.2958)
-      SALPHA = SIN(ALPHA/RA)
-      CALPHA = COS(ALPHA/RA)
-      ISTATUS = 0
-C-----------------------------------------------------------------------
-C  KI = 'EK'  Euler to Kappa
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'EK') THEN
-        WRITE (COUT,10000) THETA,OMEGA,CHI,PHI
-        CALL FREEFM (ITR)
-        IF (RFREE(1) .EQ. 0.0 .AND. RFREE(2) .EQ. 0.0 .AND.
-     $      RFREE(3) .EQ. 0.0) THEN
-          THE = THETA
-          OME = OMEGA
-          CHE = CHI
-          PHE = PHI
-        ELSE
-          THE = RFREE(1)
-          OME = RFREE(2)
-          CHE = RFREE(3)
-          PHE = RFREE(4)
-        ENDIF
-        THE = THE/2.0
-        SCO2 = SIN(ONE80(CHE)/(2.0*RA))
-        BOT  = SALPHA*SALPHA - SCO2*SCO2
-        IF (BOT .LT. 0.0) THEN
-          ISTATUS = 1
-          KI = ' '
-          RETURN
-        ENDIF
-        RKAO2 = ATAN(SCO2/SQRT(BOT))
-        RKA   = ONE80(2.0*RA*RKAO2)
-        DELTA = RA*ATAN(CALPHA*SIN(RKAO2)/COS(RKAO2))
-        OMK   = ONE80(OME - DELTA) + THE
-        PHK   = ONE80(PHE - DELTA)
-        WRITE (COUT,11000) THE,OMK,RKA,PHK
-C-----------------------------------------------------------------------
-C  KI = 'KE'  Kappa to Euler 
-C-----------------------------------------------------------------------
-      ELSE
-        WRITE (COUT,12000)
-        CALL FREEFM (ITR)
-        THE = RFREE(1)
-        OMK = RFREE(2)
-        RKA = RFREE(3)
-        PHK = RFREE(4)
-        OMK = OMK - THE
-        THE = THE + THE
-        RKAO2 = RKA/(2.0*RA)
-        CHE   = ONE80(2.0*RA*ASIN(SALPHA*SIN(RKAO2)))
-        DELTA = RA*ATAN(CALPHA*SIN(RKAO2)/COS(RKAO2))
-        OME   = ONE80(OMK + DELTA)
-        PHE   = ONE80(PHK + DELTA)
-        WRITE (COUT,13000) THE,OME,CHE,PHE
-      ENDIF
-      CALL GWRITE (ITP,' ')
-      KI = ' '
-      RETURN
-10000 FORMAT (' The present Euler angles are 2T,O,C,P',4F8.3,/
-     $        ' Type the angles to convert (Present) ',$)
-11000 FORMAT (' The 4 Kappa angles T,O,K,P are  ',4F8.3)
-12000 FORMAT (' Type the 4 Kappa angles T,O,K,P ',$)
-13000 FORMAT (' The 4 Euler angles 2T,O,C,P are ',4F8.3)
-      END
-C-----------------------------------------------------------------------
-C  Set the diffractometer to a convenient microscope viewing position
-C-----------------------------------------------------------------------
-      SUBROUTINE VUMICR
-      INCLUDE 'COMDIF'
-      NATT = 0
-      CALL VUPOS (THETA,OMEGA,CHI,PHI)
-      CALL SHUTTR (-99)
-      CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,IERR)
-      IF (IERR .NE. 0) THEN
-        WRITE (COUT,10000)
-        CALL GWRITE (ITP,' ')
-      ENDIF
-      KI = ' '
-      RETURN
-10000 FORMAT (' Setting collision during VM')
-      END
-C-----------------------------------------------------------------------
-C  Rotate the crystal 90 degrees in phi for centering operations
-C-----------------------------------------------------------------------
-      SUBROUTINE PHI90
-      INCLUDE 'COMDIF'
-      CALL ANGET (THETA,OMEGA,CHI,PHI)
-      PHI = PHI + 90.0
-      CALL MOD360 (PHI)
-      CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,IERR)
-      KI = ' '
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  Transform the orientation matrix
-C-----------------------------------------------------------------------
-      SUBROUTINE TRANSF
-      INCLUDE 'COMDIF'
-      DIMENSION HOLD(3,3),HNEW(3,3),HNEWI(3,3),RNEW(3,3)
-      WRITE (COUT,10000)
-      CALL GWRITE (ITP,' ')
-      DO 100 I = 1,3
-   90   WRITE (COUT,11000) I
-        CALL FREEFM (ITR)
-        HOLD(1,I) = IFREE(1)
-        HOLD(2,I) = IFREE(2)
-        HOLD(3,I) = IFREE(3)
-        HNEW(1,I) = IFREE(4)
-        HNEW(2,I) = IFREE(5)
-        HNEW(3,I) = IFREE(6)
-        IF ((HOLD(1,I) .EQ. 0.0 .AND. HOLD(2,I) .EQ. 0.0 .AND.
-     $       HOLD(3,I) .EQ. 0.0) .OR.
-     $      (HNEW(1,I) .EQ. 0.0 .AND. HNEW(2,I) .EQ. 0.0 .AND.
-     $       HNEW(3,I) .EQ. 0.0)) THEN
-          WRITE (COUT,11100) 
-          CALL GWRITE (ITP,' ')
-          GO TO 90
-        ENDIF
-  100 CONTINUE
-C-----------------------------------------------------------------------
-C  Invert the IHNEW matrix and form  RNEW = R.IHOLD.(IHNEW)-1
-C-----------------------------------------------------------------------
-      CALL MATRIX (HNEW,HNEWI,HNEWI,HNEWI,'INVERT')
-      CALL MATRIX (R,HOLD,RNEW,RJUNK,'MATMUL')
-      CALL MATRIX (RNEW,HNEWI,RNEW,RJUNK,'MATMUL')
-C-----------------------------------------------------------------------
-C  Print the new matrix and parameters
-C-----------------------------------------------------------------------
-      DO 110 I = 1,3
-        DO 110 J = 1,3
-          ROLD(I,J) = R(I,J)/WAVE
-          R(I,J) = RNEW(I,J)
-          RNEW(I,J) = RNEW(I,J)/WAVE
-  110 CONTINUE
-C-----------------------------------------------------------------------
-C  Evaluate the determinant to decide if right or left handed
-C-----------------------------------------------------------------------
-        DET = R(1,1)*(R(2,2)*R(3,3) - R(2,3)*R(3,2)) -
-     $        R(1,2)*(R(2,1)*R(3,3) - R(2,3)*R(3,1)) +
-     $        R(1,3)*(R(2,1)*R(3,2) - R(2,2)*R(3,1))
-        IF (NRC*DET .EQ. 0) THEN
-          WRITE (COUT,12000)
-          KI = ' '
-        ELSE IF (NRC*DET .GT. 0) THEN
-          WRITE (COUT,13000) KI,((RNEW(I,J),J = 1,3),I = 1,3)
-        ELSE
-          WRITE (COUT,14000) KI,((RNEW(I,J),J = 1,3),I = 1,3)
-        ENDIF
-        CALL GWRITE (ITP,' ')
-        CALL GETPAR
-        DO 120 I = 1,3
-          AP(I) = AP(I)*WAVE
-  120   CONTINUE
-        WRITE (COUT,15000) AP,CANG
-        CALL GWRITE (ITP,' ')
-      RETURN
-10000 FORMAT (10X,' Transform the Orientation Matrix'/
-     $        ' Type in old and new h,k,l values for 3 reflections')
-11000 FORMAT (' Type old and new h,k,l for reflection',I2,'  ',$)
-11100 FORMAT (' 0,0,0 indices not allowed.  Try again.')
-12000 FORMAT (' The determinant of the matrix is 0.')
-13000 FORMAT (' New RIGHT-handed Orientation Matrix from ',A2/(3F12.8))
-14000 FORMAT (' New LEFT-handed Orientation Matrix from ',A2/(3F12.8))
-15000 FORMAT (' New Unit Cell ',3F9.4,3F9.3)
-      END
diff --git a/difrac/setrow.f b/difrac/setrow.f
deleted file mode 100644
index e318a1e5..00000000
--- a/difrac/setrow.f
+++ /dev/null
@@ -1,184 +0,0 @@
-C-----------------------------------------------------------------------
-C  Subroutine to set a specified direct lattice row:--
-C       Along the Omega rotation axis      (PR)    or 
-C       Along the x-ray beam               (PL).
-C-----------------------------------------------------------------------
-      SUBROUTINE SETROW
-      INCLUDE 'COMDIF'
-      DIMENSION HKL(3),DICOS(3),RM1(3,3),VEC(3)
-      IF (KI .EQ. 'PL') THEN
-        WRITE (COUT,10000)
-      ELSE
-        WRITE (COUT,11000)
-      ENDIF
-      CALL YESNO ('Y',ANS)
-      IF (ANS .EQ. 'N') THEN
-        KI = ' '
-        RETURN
-      ENDIF
-      WRITE (COUT,12000)
-      CALL FREEFM (ITR)
-      IH = IFREE(1)
-      IK = IFREE(2)
-      IL = IFREE(3)
-      HKL(1) = IH
-      HKL(2) = IK
-      HKL(3) = IL
-C-----------------------------------------------------------------------
-C  The inverse transpose of the UB matrix of Busing and Levy (here R)
-C  allows Direct rather than Reciprocal rows to be set.
-C-----------------------------------------------------------------------
-  100 CALL MATRIX (R,RM1,CRAP,CRAP,'INVERT')
-      CALL MATRIX (HKL,RM1,DICOS,CRAP,'VECMAT')
-      PHI = ATAN(DICOS(2)/DICOS(1))*DEG
-      IF (DICOS(1) .LT. 0) PHI = PHI + 180.0
-      CALL MOD360 (PHI)
-      CHI = ASIN(DICOS(3))*DEG
-C-----------------------------------------------------------------------
-C  Bring the positive end of the row up (CHI = CHI + 90)
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'PR') THEN
-        CALL MATRIX (HKL,RM1,VEC,CRAP,'VMMULT')
-        PER = WAVE*SQRT(VEC(1)*VEC(1) + VEC(2)*VEC(2)+ VEC(3)*VEC(3))
-        WRITE (COUT,13000) PER
-        CALL FREEFM (ITR)
-        DIST = RFREE(1)
-        IF (DIST .NE. 0.) THEN
-          WRITE (COUT,14000)
-          CALL GWRITE (ITP,' ')
-          DO 110 N = 1,10
-            DSIN = N*WAVE/PER
-            IF (DSIN .LE. 0.71) THEN
-              VEL = DIST*TAN(ASIN(DSIN))
-              VEL = VEL*2
-              WRITE (COUT,15000) N,VEL
-              CALL GWRITE (ITP,' ')
-            ENDIF
-  110     CONTINUE
-        ENDIF
-        THETA = 0.0
-        OMEGA = 0.0
-        CHI = CHI + 90.0
-        CALL MOD360(CHI)
-        ICC = 0
-        WRITE (COUT,16000) THETA,OMEGA,CHI,PHI
-        CALL GWRITE (ITP,' ')
-        CALL ANGSET (THETA,OMEGA,CHI,PHI,0,ICOL)
-        IF (ICOL .NE. 0) THEN
-          WRITE (COUT,17000)
-          CALL GWRITE (ITP,' ')
-        ENDIF
-        KI = ' '
-        RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Set up for Laue photos  PL
-C  A direct lattice row is set along the direct beam by :--
-C  setting CHI = 90, PHI = PHI + 90 and  OMEGA = CHI, but because of
-C  restrictions on the OMEGA motion, OMEGA may not be greater than OLIM.
-C  This means that the original CHI must be within OLIM degrees of the 
-C  OMEGA axis
-C-----------------------------------------------------------------------
-      CALL MOD360 (CHI)
-      OLIM = 47.0
-      IF (CHI .GE. 180-OLIM .AND. CHI .LE. 180+OLIM) THEN
-        WRITE (COUT,18000)
-        CALL YESNO ('Y',ANS)
-        IF (ANS .EQ. 'Y') THEN
-          IH = -IH
-          IK = -IK
-          IL = -IL
-          GO TO 100
-        ENDIF
-        KI = ' '
-        RETURN
-      ENDIF
-      IF (CHI .GT. OLIM .AND. CHI .LT. 360-OLIM) THEN
-        WRITE (COUT,19000)
-        CALL GWRITE (ITP,' ')
-        KI = ' '
-        RETURN
-      ENDIF
-      OMEGA = CHI
-      CHI = 90.0
-      PHI = PHI + 90.0
-      CALL MOD360 (PHI)
-      THETA = 0.0
-      WRITE (COUT,20000) IH,IK,IL,THETA,OMEGA,CHI,PHI
-      CALL YESNO ('Y',ANS)
-      IF (ANS .EQ. 'N') THEN
-        KI = ' '
-        RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Find the azimuths of given reciprocal vectors
-C-----------------------------------------------------------------------
-      ICC = 0
-      CALL ANGSET (THETA,OMEGA,CHI,PHI,0,ICOL)
-      IF (ICOL .EQ. 0) THEN
-        WRITE (COUT,17000)
-        CALL GWRITE (ITP,' ')
-        KI = ' '
-        RETURN
-      ENDIF
-C-----------------------------------------------------------------------
-C  Direction cosines of the line along the vertical
-C-----------------------------------------------------------------------
-      XU = COS((PHI)/DEG)
-      YU = SIN((PHI)/DEG)
-      ZU = 0.
-C-----------------------------------------------------------------------
-C  Direction cosines of the line along the diffraction vector
-C-----------------------------------------------------------------------
-      XD = COS((90.0 - OMEGA)/DEG)*COS((90.0 + PHI)/DEG)
-      YD = COS((90.0 - OMEGA)/DEG)*SIN((90.0 + PHI)/DEG)
-      ZD = SIN((90.0 - OMEGA)/DEG)
-      WRITE (COUT,21000)
-      CALL YESNO ('Y',ANS)
-      IF (ANS .EQ. 'N') THEN
-        KI = ' '
-        RETURN
-      ENDIF
-      WRITE (COUT,22000)
-      CALL GWRITE (ITP,' ')
-  120 WRITE (COUT,23000)
-      CALL FREEFM (ITR)
-      IH = IFREE(1)
-      IK = IFREE(2)
-      IL = IFREE(3)
-      HKL(1) = IH
-      HKL(2) = IK
-      HKL(3) = IL
-      CALL MATRIX (R,HKL,DICOS,CRAP,'MATVEC')
-      SU = XU*DICOS(1) + YU*DICOS(2) + ZU*DICOS(3)
-      SD = XD*DICOS(1) + YD*DICOS(2) + ZD*DICOS(3)
-      SN = SQRT(SU*SU + SD*SD)
-      ANG = ACOS(SU/SN)*DEG
-      IF (SD .LT. 0) ANG = -ANG
-      WRITE (COUT,24000) ANG
-      CALL YESNO ('Y',ANS)
-      IF (ANS .EQ. 'Y') GO TO 120
-      KI = ' '
-      RETURN
-10000 FORMAT (' Set for a Laue Pattern along a given row (Y) ? ',$)
-11000 FORMAT (' Set a Direct Lattice Row upwards along the Omega',
-     $        ' Rotation Axis',/,
-     $        ' Confirm (Y) ',$)
-12000 FORMAT (' Type the indices of the row ',$)
-13000 FORMAT (' The Periodicity for a Primitive Lattice is ',F10.3,
-     $        ' Angstroms',/,
-     $        ' Type the Crystal-to-Film Distance in mms ',$)
-14000 FORMAT (' Separation in mm between the + and - nth levels')
-15000 FORMAT (5X,I2,F10.1)
-16000 FORMAT (' Setting angles ',4F10.3)
-17000 FORMAT (' Setting Collisions.  The row cannot be set')
-18000 FORMAT (' hkl CANNOT be set, but -h-k-l can. OK (Y) ? ',$)
-19000 FORMAT (' The setting is NOT feasible')
-20000 FORMAT (' Setting angles for row',3I4,4F10.3,/,
-     $        ' Set it (Y) ? ',$)
-21000 FORMAT (' Are you interested in the azimuth for given reciprocal',
-     $        ' vectors. (Y) ? ',$)
-22000 FORMAT (' Origin of azimuths UP, + toward diffraction vector.')
-23000 FORMAT (' Type the h k l  ',$)
-24000 FORMAT (20X,'Azimuth ',F10.1,' degrees. More vectors (Y) ? ',$)
-      END
diff --git a/difrac/sgerrs.f b/difrac/sgerrs.f
deleted file mode 100644
index 70873338..00000000
--- a/difrac/sgerrs.f
+++ /dev/null
@@ -1,40 +0,0 @@
-C-----------------------------------------------------------------------
-C  Space group routine error message printing
-C-----------------------------------------------------------------------
-      SUBROUTINE SGERRS (SGP,IER,LPTX)
-      CHARACTER COUT*132
-      COMMON /IOUASC/ COUT(20)
-      DIMENSION SGP(10)
-      CHARACTER*52 ERRMSG(25),ERR1(12),ERR2(13)
-      EQUIVALENCE (ERRMSG(1),ERR1(1)),(ERRMSG(13),ERR2(1))
-      DATA ERR1 /'Either a 5-axis anywhere or a 3-axis in field 4     ',
-     $           'Less than 2 operator fields were found              ',
-     $           'Lattice operator was not a P, A, B, C, I, F or R    ',
-     $           'Rhombohedral lattice without a 3-axis               ',
-     $           'Minus sign does not precede 1, 2, 3, 4 or 6         ',
-     $           'Lattice subroutine found an error                   ',
-     $           '1st operator in a field was a space. Impossible     ',
-     $           'Index for COMPUTED GO TO is out of range            ',
-     $           'An a-glide mirror normal to a                       ',
-     $           'A b-glide mirror normal  to b                       ',
-     $           'A c-glide mirror normal  to c                       ',
-     $           'd-glide in a primitive lattice                      '/
-      DATA ERR2 /'A 4-axis not in the 2nd operator field              ',
-     $           'A 6-axis not in the 2nd operator field              ',
-     $           'More than 24 matrices needed to define the group    ',
-     $           'More than 24 matrices needed to define the group    ',
-     $           'Improper construction of a rotation operator        ',
-     $           'No mirror following a /                             ',
-     $           'A translation conflict between operators            ',
-     $           'The 2bar operator is not allowed                    ',
-     $           '3 fields are legal only in r lattices and m3 cubic  ',
-     $           'Syntax error. Expected I-43d at this point          ',
-     $           '                                                    ',
-     $           'A or B centered tetragonal?  Impossible!!!!!        ',
-     $           'No delimiter blanks in symbol.  Try again.          '/
-      WRITE (COUT,10000) IER,SGP,ERRMSG(IER+1)
-      CALL GWRITE (LPTX,' ')
-      RETURN
-10000 FORMAT (' Error no.',I3,' in processing space group symbol ',
-     $        10A1/1X,A52)
-      END
diff --git a/difrac/sglatc.f b/difrac/sglatc.f
deleted file mode 100644
index 549c2734..00000000
--- a/difrac/sglatc.f
+++ /dev/null
@@ -1,656 +0,0 @@
-C-----------------------------------------------------------------------
-C  Space group lattice and operator interpretation
-C-----------------------------------------------------------------------
-      SUBROUTINE SGLATC (K,L,D,LCENT,NCENT,LAUENO,NAXIS,LPT,IER,I209,ID)
-      DIMENSION D(3,3),L(4,4)
-      JUNK = LCENT
-      JUNK = LPT
-C-----------------------------------------------------------------------
-C  Now let us determine the Laue group and unique axis if monoclinic
-C-----------------------------------------------------------------------
-      IF ( K-3 ) 100,180,190
-  100 CONTINUE
-C-----------------------------------------------------------------------
-C  Only 2 fields were read
-C-----------------------------------------------------------------------
-      IF ( L(1,2) .EQ. 17 ) GO TO 120
-      IF ( L(1,2) .EQ. 14 ) GO TO 130
-      IF ( L(1,2) .EQ. 15 ) GO TO 140
-      IF ( L(1,2) .EQ. 12 ) GO TO 170
-C-----------------------------------------------------------------------
-C  2/m, b-axis unique
-C-----------------------------------------------------------------------
-      IM = 2
-      GO TO 350
-  110 CONTINUE
-C-----------------------------------------------------------------------
-C  We have something like P 6n 1 *
-C-----------------------------------------------------------------------
-      IF (L(1,4) .NE. 12) GO TO 460
-  120 CONTINUE
-C-----------------------------------------------------------------------
-C  6/m
-C-----------------------------------------------------------------------
-      LAUENO = 11
-      GO TO 620
-  130 CONTINUE
-C-----------------------------------------------------------------------
-C  3bar
-C-----------------------------------------------------------------------
-      LAUENO = 8
-      GO TO 620
-  140 CONTINUE
-C-----------------------------------------------------------------------
-C  4/m
-C-----------------------------------------------------------------------
-      LAUENO = 4
-C-----------------------------------------------------------------------
-C  Is it I-centered or F-centered?
-C-----------------------------------------------------------------------
-      IF (LCENT .GE. 5) GO TO 150
-C-----------------------------------------------------------------------
-C  Is it C-centered?
-C-----------------------------------------------------------------------
-      IF (LCENT .EQ. 4) GO TO 160
-C-----------------------------------------------------------------------
-C  No.  Is there an n-glide normal to c?
-C-----------------------------------------------------------------------
-      IF (L(3,2) .EQ. 10) GO TO 520
-      IF (L(4,2) .EQ. 10) D(2,3) = 0.5
-C-----------------------------------------------------------------------
-C  No. OK, let's get on with this.
-C-----------------------------------------------------------------------
-      GO TO 620
-  150 CONTINUE
-C-----------------------------------------------------------------------
-C  Is there either an a-glide or a d-glide normal to c?
-C-----------------------------------------------------------------------
-      IF (L(4,2) .NE. 4 .AND. L(4,2) .NE. 11) GO TO 530
-C-----------------------------------------------------------------------
-C  Yes.
-C-----------------------------------------------------------------------
-      D(1,3) = 0.75
-      IF (LCENT .EQ. 5) D(2,3) = 0.25
-      GO TO 620
-  160 CONTINUE
-C-----------------------------------------------------------------------
-C  C-centered 4/m tetragonal
-C  If there is no a-glide normal to c we are through
-C-----------------------------------------------------------------------
-      IF (L(3,2) .NE. 4 .AND. L(4,2) .NE. 4) GO TO 620
-      D(1,3) = 0.25
-      D(2,3) = 0.25
-      IF (L(4,2) .EQ. 4) D(2,3) = 0.75
-      GO TO 620
-  170 CONTINUE
-C-----------------------------------------------------------------------
-C  1bar
-C-----------------------------------------------------------------------
-      LAUENO = 1
-      GO TO 620
-  180 CONTINUE
-C-----------------------------------------------------------------------
-C  3 fields were read.  Must be m3 cubic. (R3R has been taken care of)
-C-----------------------------------------------------------------------
-      IF (L(1,3) .NE. 14) IER = 20
-      IF (IER .GT. 0) GO TO 630
-      LAUENO = 13
-C-----------------------------------------------------------------------
-C  Set the b-axis translation flag if a 21 along a
-C-----------------------------------------------------------------------
-      IF (L(2,2) .EQ. 12) D(2,1) = 0.5
-C-----------------------------------------------------------------------
-C  Set the c-axis translation flag if an a-glide normal to c
-C-----------------------------------------------------------------------
-      IF (L(1,2) .EQ. 3 .OR. L(1,2) .EQ. 4) D(3,3) = 0.5
-      GO TO 610
-C-----------------------------------------------------------------------
-C  Four fields were read
-C-----------------------------------------------------------------------
-  190 IF (L(1,3) .EQ. 14) GO TO 390
-C-----------------------------------------------------------------------
-C  It is not cubic
-C-----------------------------------------------------------------------
-      IF (L(1,2) .EQ. 17) GO TO 450
-C-----------------------------------------------------------------------
-C  It is not hexagonal
-C-----------------------------------------------------------------------
-      IF (L(1,2) .EQ. 14) GO TO 470
-C-----------------------------------------------------------------------
-C  It is not trigonal
-C-----------------------------------------------------------------------
-      IF (L(1,2) .EQ. 15) GO TO 480
-C-----------------------------------------------------------------------
-C  It is not tetragonal
-C-----------------------------------------------------------------------
-      IF (L(1,2) .EQ. 12) GO TO 340
-      IF (L(1,3) .EQ. 12) GO TO 360
-C-----------------------------------------------------------------------
-C  It may be orthorhombic
-C-----------------------------------------------------------------------
-  200 CONTINUE
-C-----------------------------------------------------------------------
-C  It is orthorhombic
-C-----------------------------------------------------------------------
-      LAUENO = 3
-C-----------------------------------------------------------------------
-C  Set up counts of the various types of mirrors.
-C-----------------------------------------------------------------------
-      IM = 0
-      IR = 0
-      IA = 0
-      IB = 0
-      IC = 0
-      ID = 0
-      I21 = 0
-C-----------------------------------------------------------------------
-C  Do we have a 2-axis along a
-C-----------------------------------------------------------------------
-      IF (L(1,2) .NE. 13) GO TO 210
-C-----------------------------------------------------------------------
-C  Yes, is it a 21?
-C-----------------------------------------------------------------------
-      IF (L(2,2) .NE. 12) GO TO 220
-      D(1,2) = 0.5
-      D(1,3) = 0.5
-      I21 = 4
-      GO TO 220
-  210 CONTINUE
-      IR = 1
-      IF (L(1,2) .EQ. 9) IM = 4
-      IF (L(1,2) .EQ. 3) IB = 1
-      IF (L(1,2) .EQ. 2) IC = 1
-      IF (L(1,2) .EQ. 11) ID = 1
-      IF (L(1,3) .EQ. 4 .OR. L(1,3) .EQ. 10) D(1,1) = 0.5
-      IF (L(1,4) .EQ. 4 .OR. L(1,4) .EQ. 10) D(1,1) = D(1,1) + 0.5
-  220 CONTINUE
-C-----------------------------------------------------------------------
-C  Do we have a 2-axis along b
-C-----------------------------------------------------------------------
-      IF (L(1,3) .NE. 13) GO TO 230
-C-----------------------------------------------------------------------
-C  Yes, is it a 21?
-C-----------------------------------------------------------------------
-      IF (L(2,3) .NE. 12) GO TO 240
-      D(2,1) = 0.5
-      D(2,3) = 0.5
-      I21 = I21 + 2
-      GO TO 240
-  230 CONTINUE
-      IR = IR + 1
-      IF (L(1,3) .EQ. 9) IM = IM + 2
-      IF (L(1,3) .EQ. 4) IA = 1
-      IF (L(1,3) .EQ. 2) IC = IC + 1
-      IF (L(1,3) .EQ. 11) ID = ID + 1
-      IF (L(1,2) .EQ. 3 .OR. L(1,2) .EQ. 10) D(2,2) = 0.5
-      IF (L(1,4) .EQ. 3 .OR. L(1,4) .EQ. 10) D(2,2) = D(2,2) + 0.5
-  240 CONTINUE
-C-----------------------------------------------------------------------
-C  Do we have a 2-axis along c
-C-----------------------------------------------------------------------
-      IF (L(1,4) .NE. 13) GO TO 250
-C-----------------------------------------------------------------------
-C  Yes, is it a 21?
-C-----------------------------------------------------------------------
-      IF (L(2,4) .NE. 12) GO TO 260
-      D(3,1) = 0.5
-      D(3,2) = 0.5
-      I21 = I21 + 1
-      GO TO 260
-  250 CONTINUE
-      IR = IR + 1
-      IF (L(1,4) .EQ. 9) IM = IM + 1
-      IF (L(1,4) .EQ. 4) IA = IA + 1
-      IF (L(1,4) .EQ. 3) IB = IB + 1
-      IF (L(1,4) .EQ. 11) ID = ID + 1
-      IF (L(1,2) .EQ. 2 .OR. L(1,2) .EQ. 10) D(3,3) = 0.5
-      IF (L(1,3) .EQ. 2 .OR. L(1,3) .EQ. 10) D(3,3) = D(3,3) + 0.5
-  260 CONTINUE
-C-----------------------------------------------------------------------
-C  If there are 3 mirrors check for centering, Which may alter the 
-C  origin location
-C-----------------------------------------------------------------------
-      IF (IR .EQ. 3) GO TO 300
-C-----------------------------------------------------------------------
-C  Less than 3 mirrors. Set up the 2-axes locations
-C-----------------------------------------------------------------------
-      IF (I21 .EQ. 4 .OR. I21 .EQ. 5 .OR. I21 .EQ. 7) D(1,2) = 0.0
-      IF (I21 .EQ. 6 .OR. I21 .EQ. 7) D(1,3) = 0.0
-      IF (I21 .EQ. 3) D(2,1) = 0.0
-      IF (I21 .EQ. 2 .OR. I21 .EQ. 6 .OR. I21 .EQ. 7) D(2,3) = 0.0
-      IF (I21 .EQ. 1 .OR. I21 .EQ. 3 .OR. I21 .EQ. 7) D(3,1) = 0.0
-      IF (I21 .EQ. 5) D(3,2) = 0.0
-      IF (IM .LE. 0) GO TO 620
-      IF (IM .EQ. 1 .AND. (I21 .EQ. 4 .OR. I21 .EQ. 2)) GO TO 270
-      IF (IM .EQ. 2 .AND. (I21 .EQ. 4 .OR. I21 .EQ. 1)) GO TO 280
-      IF (IM .EQ. 4 .AND. (I21 .EQ. 2 .OR. I21 .EQ. 1)) GO TO 290
-      GO TO 620
-  270 CONTINUE
-      IF (D(3,3) .EQ. 0.0) GO TO 620
-      D(3,3) = 0.0
-      D(3,2) = D(3,2) + 0.5
-      GO TO 620
-  280 CONTINUE
-      IF (D(2,2) .EQ. 0.0) GO TO 620
-      D(2,2) = 0.0
-      D(2,1) = D(2,1) + 0.5
-      GO TO 620
-  290 CONTINUE
-      IF (D(1,1) .EQ. 0.0) GO TO 620
-      D(1,1) = 0.0
-      D(1,3) = D(1,3) + 0.5
-      GO TO 620
-  300 CONTINUE
-C-----------------------------------------------------------------------
-C  3 mirrors present.  Is the lattice centered?
-C-----------------------------------------------------------------------
-      IF (LCENT .EQ. 1) GO TO 620
-C-----------------------------------------------------------------------
-C  Yes.  Is it A-centered?
-C-----------------------------------------------------------------------
-      IF (LCENT .EQ. 2) GO TO 310
-C-----------------------------------------------------------------------
-C  No.   Is it B-centered?
-C-----------------------------------------------------------------------
-      IF (LCENT .EQ. 3) GO TO 320
-C-----------------------------------------------------------------------
-C  No.   Is it C-centered?
-C-----------------------------------------------------------------------
-      IF (LCENT .EQ. 4) GO TO 330
-C-----------------------------------------------------------------------
-C  No.   Is it I-centered?
-C-----------------------------------------------------------------------
-      IF (LCENT .NE. 5) GO TO 620
-C-----------------------------------------------------------------------
-C  Yes.  If only 1 glide plane, shift the mirrors by I
-C-----------------------------------------------------------------------
-      IF (IA + IB + IC .NE. 1) GO TO 620
-      D(1,1) = D(1,1) + 0.5
-      D(2,2) = D(2,2) + 0.5
-      D(3,3) = D(3,3) + 0.5
-      GO TO 620
-  310 CONTINUE
-C-----------------------------------------------------------------------
-C  An A-centered lattice.
-C  If only one b or c glide present relocate the mirrors by A
-C-----------------------------------------------------------------------
-      IF (IB + IC .NE. 1) GO TO 620
-      IF (IA .EQ. 2) GO TO 620
-      D(2,2) = D(2,2) + 0.5
-      D(3,3) = D(3,3) + 0.5
-      GO TO 620
-  320 CONTINUE
-C-----------------------------------------------------------------------
-C  A B-centered lattice
-C-----------------------------------------------------------------------
-      IF (IA + IC .NE. 1) GO TO 620
-      IF (IB .EQ. 2) GO TO 620
-      D(1,1) = D(1,1) + 0.5
-      D(3,3) = D(3,3) + 0.5
-      GO TO 620
-  330 CONTINUE
-C-----------------------------------------------------------------------
-C  A C-centered lattice
-C-----------------------------------------------------------------------
-      IF (IA + IB .NE. 1) GO TO 620
-      IF (IC .EQ. 2) GO TO 620
-      D(1,1) = D(1,1) + 0.5
-      D(2,2) = D(2,2) + 0.5
-      GO TO 620
-  340 IF (L(1,3) .EQ. 12) GO TO 370
-C-----------------------------------------------------------------------
-C  It is not c-axis unique monoclinic
-C-----------------------------------------------------------------------
-      IF (L(1,4) .NE. 12) GO TO 200
-      IM = 3
-  350 CONTINUE
-C-----------------------------------------------------------------------
-C  It is b-axis unique monoclinic. (full symbol used)
-C-----------------------------------------------------------------------
-      LAUENO = 2
-      NAXIS = 2
-      IA = 4
-      IC = 2
-      NA = 1
-      NB = 2
-      NC = 3
-      GO TO 380
-  360 IF (L(1,4) .NE. 12) GO TO 200
-C-----------------------------------------------------------------------
-C  It is a-axis unique monoclinic
-C-----------------------------------------------------------------------
-      LAUENO = 2
-      NAXIS = 1
-      IA = 3
-      IC = 2
-      NA = 2
-      NB = 1
-      NC = 3
-      IM = 2
-      GO TO 380
-  370 IF (L(1,4) .EQ. 12) GO TO 170
-C-----------------------------------------------------------------------
-C  It is c-axis unique monoclinic
-C-----------------------------------------------------------------------
-      LAUENO = 2
-      NAXIS = 3
-      IA = 4
-      IC = 3
-      NA = 1
-      NB = 3
-      NC = 2
-      IM = 4
-  380 CONTINUE
-      IF (L(2,IM) .EQ. 12) D(NB,NAXIS) = 0.5
-      IF (L(3,IM) .EQ. IA .OR. L(3,IM) .EQ. 10) D(NA,NAXIS) = 0.5
-      IF (L(3,IM) .EQ. IC .OR. L(3,IM) .EQ. 10) D(NC,NAXIS) = 0.5
-      IF (L(4,IM) .EQ. IA .OR. L(4,IM) .EQ. 10) D(NA,NAXIS) = 0.5
-      IF (L(4,IM) .EQ. IC .OR. L(4,IM) .EQ. 10) D(NC,NAXIS) = 0.5
-      GO TO 620
-  390 CONTINUE
-C-----------------------------------------------------------------------
-C  It is m3m cubic
-C-----------------------------------------------------------------------
-      LAUENO = 14
-C-----------------------------------------------------------------------
-C  Set the c-axis translation flag if an a-glide normal to c
-C-----------------------------------------------------------------------
-      IF (L(1,2) .EQ. 3 .OR. L(1,2) .EQ. 4) D(3,3) = 0.5
-C-----------------------------------------------------------------------
-C  Is a 4n-axis specified
-C-----------------------------------------------------------------------
-      IF (L(1,2) .NE. 15) GO TO 610
-C-----------------------------------------------------------------------
-C  Yes.  Is it 4bar?
-C-----------------------------------------------------------------------
-      IF (L(2,2) .EQ. 3) GO TO 400
-C-----------------------------------------------------------------------
-C  No.  Is it a 4?
-C-----------------------------------------------------------------------
-      IF (L(2,2) .LT. 12) GO TO 610
-      IF (L(2,2) .GT. 14) GO TO 610
-C-----------------------------------------------------------------------
-C  No. Is it a 41?
-C-----------------------------------------------------------------------
-      IF (L(2,2) .EQ. 12) GO TO 410
-C-----------------------------------------------------------------------
-C  No. Is it a 42?
-C-----------------------------------------------------------------------
-      IF (L(2,2) .EQ. 13) GO TO 420
-C-----------------------------------------------------------------------
-C  No.  It must be a 43  (P 43 3 2)
-C-----------------------------------------------------------------------
-      IF (LCENT .EQ. 6) GO TO 430
-      D(1,3) = 0.75
-      D(2,3) = 0.25
-      GO TO 610
-  400 CONTINUE
-C-----------------------------------------------------------------------
-C  4b.  Is it 4b 3 m
-C-----------------------------------------------------------------------
-      IF (L(1,4) .EQ. 9) GO TO 610
-C-----------------------------------------------------------------------
-C  No.  Is it 4b 3 d?
-C-----------------------------------------------------------------------
-      IF (L(1,4) .EQ. 11) GO TO 440
-C-----------------------------------------------------------------------
-C  No.
-C-----------------------------------------------------------------------
-      D(1,3) = 0.5
-      D(2,3) = 0.5
-      D(3,3) = 0.5
-      GO TO 610
-  410 CONTINUE
-C-----------------------------------------------------------------------
-C  41-axis. Is it F 41 3 2?
-C-----------------------------------------------------------------------
-      IF (LCENT .EQ. 6) GO TO 430
-C-----------------------------------------------------------------------
-C  No. It is either P 41 3 2 or I 41 3 2
-C-----------------------------------------------------------------------
-      D(1,3) =  0.25
-      D(2,3) = -0.25
-      GO TO 610
-  420 CONTINUE
-C-----------------------------------------------------------------------
-C  P 42 3 2
-C-----------------------------------------------------------------------
-      D(1,3) = 0.5
-      D(2,3) = 0.5
-      GO TO 610
-  430 CONTINUE
-C-----------------------------------------------------------------------
-C  F 41 3 2
-C-----------------------------------------------------------------------
-      D(1,3) = 0.25
-      D(2,3) = 0.25
-      GO TO 610
-  440 CONTINUE
-C-----------------------------------------------------------------------
-C  I 4b 3 d we hope
-C-----------------------------------------------------------------------
-      IF (LCENT .NE. 5) IER = 21
-      IF (IER .GT. 0) GO TO 630
-      D(1,3) = 0.75
-      D(2,3) = 0.25
-      D(3,3) = 0.75
-      GO TO 610
-  450 CONTINUE
-      IF (L(1,3) .EQ. 12) GO TO 110
-  460 CONTINUE
-C-----------------------------------------------------------------------
-C  It is hexagonal 6/mmm
-C-----------------------------------------------------------------------
-      LAUENO = 12
-      GO TO 620
-  470 CONTINUE
-C-----------------------------------------------------------------------
-C  It is trigonal p3**
-C-----------------------------------------------------------------------
-      IF (L(1,3) .EQ. 12) GO TO 600
-      IF (L(1,4) .NE. 12) GO TO 460
-C-----------------------------------------------------------------------
-C  It is trigonal 3m1
-C-----------------------------------------------------------------------
-      LAUENO = 9
-      GO TO 620
-  480 CONTINUE
-C-----------------------------------------------------------------------
-C  It is tetragonal 4/mmm
-C-----------------------------------------------------------------------
-      LAUENO = 5
-C-----------------------------------------------------------------------
-C  If there is an n-glide normal to c put any mirror normal to a at 1/4
-C-----------------------------------------------------------------------
-      IF (L(3,2) .EQ. 10 .OR. L(4,2) .EQ. 10) D(1,1) = 0.5
-C-----------------------------------------------------------------------
-C  If there is an a-glide normal to c, put any mirror normal to (110)
-C  at 1/4
-C-----------------------------------------------------------------------
-      IF (L(3,2) .EQ. 4 .OR. L(4,2) .EQ. 4) D(2,2) = 0.25
-C-----------------------------------------------------------------------
-C  If there is a 21 along b, move it and place it at x=1/4
-C-----------------------------------------------------------------------
-      IF (L(1,3) .EQ. 13 .AND. L(2,3) .EQ. 12) D(1,2) = 0.5
-C-----------------------------------------------------------------------
-C  If there is a 21 along (110), move it and place it at x=1/4
-C  If there is either a b- or n-glide normal to the a-axis
-C  shift the mirror by 1/4 along the a-axis
-C-----------------------------------------------------------------------
-      IF (L(1,3) .EQ. 3 .OR. L(1,3) .EQ. 10) D(1,1) = D(1,1) + 0.5
-C-----------------------------------------------------------------------
-C  If there is either a b- or n-glide normal to (110)
-C  shift the mirror by 1/4 along the a-axis
-C-----------------------------------------------------------------------
-      IF (L(1,4) .EQ. 3 .OR. L(1,4) .EQ. 10) D(2,2) = D(2,2) + 0.25
-C-----------------------------------------------------------------------
-C  Set the z location for 2-axes along (110)
-C-----------------------------------------------------------------------
-      IF (L(2,2) .GT. 11 .AND. L(2,2) .LT. 15 .AND. L(2,3) .NE. 12)
-     $     D(3,1) = -(L(2,2) - 11)/4.0
-C-----------------------------------------------------------------------
-C  Set the z-translation for 21-axes along (110)
-C-----------------------------------------------------------------------
-      IF (L(1,4) .EQ. 13 .AND. L(2,4) .NE. 12) GO TO 490
-      IF (L(2,2) .GT. 11 .AND. L(2,2) .LT. 15)
-     $     D(3,1) = (L(2,2) - 11)/4.0
-  490 CONTINUE
-C-----------------------------------------------------------------------
-C  Set the z-translation for 21-axes along b
-C-----------------------------------------------------------------------
-      IF (L(1,3) .EQ. 13 .AND. L(2,3) .NE. 12) GO TO 500
-      IF (L(2,2) .GT. 11 .AND. L(2,2) .LT. 15)
-     $     D(3,2) = (L(2,2) - 11)/4.0
-  500 CONTINUE
-C-----------------------------------------------------------------------
-C  Place the d in F 4* d * at y=7/8
-C-----------------------------------------------------------------------
-      IF (L(1,3) + L(3,2) .EQ. 11 .AND. LCENT .EQ. 6) D(2,1) = 0.75
-C-----------------------------------------------------------------------
-C  Set position of m in F 4** * * at x=1/8 if there is a c along (110)
-C-----------------------------------------------------------------------
-      IF (L(1,4) .EQ. 2 .AND. LCENT .EQ. 6) D(1,1) = 0.5
-C-----------------------------------------------------------------------
-C  Is this a 4bar?
-C-----------------------------------------------------------------------
-      IF (L(2,2) .EQ. 3) GO TO 560
-C-----------------------------------------------------------------------
-C  Is the lattice primitive?
-C-----------------------------------------------------------------------
-      IF (LCENT .GT. 1) GO TO 530
-C-----------------------------------------------------------------------
-C  Yes.  Do we have a n-glide normal to c?
-C-----------------------------------------------------------------------
-      IF (L(3,2) .EQ. 10 .OR. L(4,2) .EQ. 10) GO TO 520
-C-----------------------------------------------------------------------
-C  No.  Do we have a 21 along b?
-C-----------------------------------------------------------------------
-      IF (L(1,3) .EQ. 13 .AND. L(2,3) .EQ. 12) GO TO 510
-C-----------------------------------------------------------------------
-C  No. Do we have a n-glide normal to a?
-C-----------------------------------------------------------------------
-      IF (L(1,3) .NE. 10) GO TO 620
-      IF (L(2,2) .LE.  0) GO TO 620
-      IF (L(2,2) .GT. 15) GO TO 620
-  510 CONTINUE
-      D(1,3) = 0.5
-      D(2,3) = 0.5
-      GO TO 620
-  520 CONTINUE
-C-----------------------------------------------------------------------
-C  P 4n/n * *
-C-----------------------------------------------------------------------
-      D(1,3) = 0.5
-      GO TO 620
-  530 CONTINUE
-C-----------------------------------------------------------------------
-C  Is the lattice I or F-centered?
-C-----------------------------------------------------------------------
-      IF (LCENT .LT. 5) GO TO 550
-C-----------------------------------------------------------------------
-C  Yes. If there is a c along (110) place the d at y=1/4
-C-----------------------------------------------------------------------
-      IF (L(1,4) .EQ. 2) D(2,1) = D(2,1) + 0.5
-C-----------------------------------------------------------------------
-C  Is this I 41/a * * or F 41/d * * ?
-C-----------------------------------------------------------------------
-      IF (L(4,2) .NE. 4 .AND. L(4,2) .NE. 11) GO TO 540
-C-----------------------------------------------------------------------
-C  Yes.
-C-----------------------------------------------------------------------
-      D(1,3) = 0.25
-      IF (LCENT .EQ. 5) D(2,3) = 0.75
-      GO TO 620
-  540 CONTINUE
-C-----------------------------------------------------------------------
-C  Is there a 41 present?
-C-----------------------------------------------------------------------
-      IF (L(2,2) .NE. 12) GO TO 620
-C-----------------------------------------------------------------------
-C  Yes. If F-centered go to 580
-C-----------------------------------------------------------------------
-      IF (LCENT .EQ. 6) GO TO 580
-      D(2,3) = 0.5
-C-----------------------------------------------------------------------
-C  Set the b-axis translation flags for I 41 2 2
-C-----------------------------------------------------------------------
-      GO TO 570
-  550 CONTINUE
-C-----------------------------------------------------------------------
-C  Is the lattice C-centered?
-C-----------------------------------------------------------------------
-      IF (LCENT .NE. 4) IER = 23
-      IF (IER .GT. 0) GO TO 630
-C-----------------------------------------------------------------------
-C  C-centered.  An a normal to c
-C-----------------------------------------------------------------------
-      IF (L(3,2) .EQ. 4 .OR. L(4,2) .EQ. 4) GO TO 590
-      IF (D(1,1) .EQ. 0.0) D(1,1) = 2.0*D(2,2)
-C-----------------------------------------------------------------------
-C  Is there a 21 on the diagonal?
-C-----------------------------------------------------------------------
-      IF (L(1,4) .EQ. 13 .AND. L(2,4) .EQ. 12) GO TO 520
-      IF (L(2,2) .LE. 0) GO TO 620
-C-----------------------------------------------------------------------
-C  Is there a n-glide normal to (110)?
-C-----------------------------------------------------------------------
-      IF (L(1,4) .NE. 10) GO TO 620
-      IF (L(2,2) .GT. 15) GO TO 620
-      D(1,1) = D(1,1) - 2.0*D(2,2)
-      GO TO 520
-  560 CONTINUE
-C-----------------------------------------------------------------------
-C  Account for translations due to diagonal symmetry operation
-C  If F 4b d 2 we want the 2 at z=1/8
-C-----------------------------------------------------------------------
-      IF (L(1,3) .EQ. 11 .AND. LCENT .EQ. 6) D(3,1) = 0.25
-C-----------------------------------------------------------------------
-C  If * 4b * 21 we want the mirror at x=1/4
-C-----------------------------------------------------------------------
-      IF (L(1,4) .EQ. 13 .AND. L(2,4) .EQ. 12) D(1,1) = 0.5
-C-----------------------------------------------------------------------
-C  If there is a c- or a n-glide along (110) set the 2-axis at z=1/4
-C-----------------------------------------------------------------------
-      IF (L(1,4) .EQ. 2 .OR. L(1,4) .EQ. 10) D(3,2) = 0.5
-C-----------------------------------------------------------------------
-C  If there is a b- or a n-glide along (110) set the 2 at x=1/4
-C-----------------------------------------------------------------------
-      IF (L(1,4) .EQ. 3 .OR. L(1,4) .EQ. 10) D(1,2) = 0.5
-      IF (L(1,4) .NE. 11) GO TO 620
-  570 CONTINUE
-      IF (LCENT .EQ. 5) D(1,2) = 0.5
-      D(3,2) = 0.75
-      GO TO 620
-  580 CONTINUE
-C-----------------------------------------------------------------------
-C  F 41 * *
-C-----------------------------------------------------------------------
-      D(1,3) = 0.25
-      D(2,3) = 0.75
-      GO TO 620
-  590 CONTINUE
-C-----------------------------------------------------------------------
-C  C 4*/a * *
-C-----------------------------------------------------------------------
-      D(1,3) = 0.25
-      D(2,3) = 0.25
-      IF (L(1,4) .EQ. 3 .OR. L(1,4) .EQ. 10) D(1,1) = 0.5
-      GO TO 620
-  600 CONTINUE
-C-----------------------------------------------------------------------
-C  It is trigonal 31*
-C-----------------------------------------------------------------------
-      IF (L(1,4) .EQ. 12) GO TO 130
-C-----------------------------------------------------------------------
-C  It is trigonal 31m
-C-----------------------------------------------------------------------
-      LAUENO = 10
-      GO TO 620
-  610 CONTINUE
-      I209 = 1
-  620 CONTINUE
-      RETURN
-  630 CONTINUE
-      IF (IER .EQ. 0) IER = 5
-      RETURN
-      END
diff --git a/difrac/sglpak.f b/difrac/sglpak.f
deleted file mode 100644
index 5a19100e..00000000
--- a/difrac/sglpak.f
+++ /dev/null
@@ -1,11 +0,0 @@
-C-----------------------------------------------------------------------
-C  Convert to standard working notation
-C-----------------------------------------------------------------------
-      SUBROUTINE SGLPAK (L,IER)
-      DIMENSION L(4)
-      IF ( L(2) .LT. 12 ) IER = 4
-      IF (L(2) .GT. 17) IER = 4
-      L(1) = L(2)
-      L(2) = 3
-      RETURN
-      END
diff --git a/difrac/sgmtml.f b/difrac/sgmtml.f
deleted file mode 100644
index 5814ca03..00000000
--- a/difrac/sgmtml.f
+++ /dev/null
@@ -1,23 +0,0 @@
-C-----------------------------------------------------------------------
-C  4*4 matrix multiply for the space group routine
-C-----------------------------------------------------------------------
-      SUBROUTINE SGMTML (X,I,Y,J,Z,K)
-      DIMENSION X(5,4,24),Y(5,4,24),Z(5,4,24)
-        DO 100 L = 1,4
-          DO 100 M = 1,4
-          Z(L,M,K) = 0.0
-            DO 100 N = 1,4
-            Z(L,M,K) = Z(L,M,K) + Y(L,N,J)*X(N,M,I)
-  100       CONTINUE
-      Z(1,4,K) = AMOD(5.0 + Z(1,4,K),1.0)
-      Z(2,4,K) = AMOD(5.0 + Z(2,4,K),1.0)
-      Z(3,4,K) = AMOD(5.0 + Z(3,4,K),1.0)
-      Z(5,1,K) =  81*(2*Z(1,1,K) +   3*Z(1,2,K) +  4*Z(1,3,K)) +
-     $             9*(2*Z(2,1,K) +   3*Z(2,2,K) +  4*Z(2,3,K)) +
-     $                2*Z(3,1,K) +   3*Z(3,2,K) +  4*Z(3,3,K)
-      Z(5,2,K) =   1728*Z(1,4,K) + 144*Z(2,4,K) + 12*Z(3,4,K)
-      Z(5,3,K) = 0.0
-      Z(5,4,K) = 0.0
-      CONTINUE
-      RETURN
-      END
diff --git a/difrac/sgprnh.f b/difrac/sgprnh.f
deleted file mode 100644
index 422970dc..00000000
--- a/difrac/sgprnh.f
+++ /dev/null
@@ -1,125 +0,0 @@
-C-----------------------------------------------------------------------
-C  Space group routine printing
-C-----------------------------------------------------------------------
-      SUBROUTINE SGPRNT (SPG,JRT,LAUENO,NAXIS,NCENT,LCENT,NSYM,NPOL,CEN,
-     $                   NCV,LPT)
-      CHARACTER COUT*132
-      COMMON /IOUASC/ COUT(20)
-      DIMENSION SPG(10),JRT(3,4,25),CEN(3,4),NCVT(7),CENV(3,6),NSYS(14)
-      CHARACTER*3 POLAR(8)
-      CHARACTER*4 LTYP(3,7),SYST(3,8),LAUE(2,14)
-      CHARACTER*1 NAX(3),NC(2)
-      CHARACTER CHKL(3)*2,CTEM*4,OUTL(3)*20
-      DATA CHKL/'+h','+k','+l'/
-      DATA LTYP/'  Pr','imit','ive ',
-     $          ' A-C','ente','red ',' B-C','ente','red ',
-     $          ' C-C','ente','red ',' I-C','ente','red ',
-     $          ' F-C','ente','red ',' R-C','ente','red '/
-      DATA SYST/'Tric','lini','c   ','Mono','clin','ic  ',
-     $          'Orth','orho','mbic','Tetr','agon','al  ',
-     $          'Rhom','bohe','dral','Trig','onal','    ',
-     $          'Hexa','gona','l   ','Cubi','c   ','    '/
-      DATA LAUE/'1bar','    ','2/m ','    ','mmm ','    ','4/m ','    ',
-     $          '4/mm','m   ','3bar','    ','3bar',' M  ','3bar','    ',
-     $          '3bar','m 1 ','3bar','1 m ','6/m ','    ','6/mm','m   ',
-     $          'M 3 ','    ','M 3 ','M   '/
-      DATA POLAR/'x','y','x y','z','x z','y z','xyz','111'/
-      DATA NAX/'a','b','c'/
-      DATA NSYS/1,2,3,4,4,5,5,6,6,6,7,7,8,8/
-      DATA NC/'A',' '/
-      DATA NCVT/1,2,2,2,2,4,3/
-      DATA CENV/  0,0.5,0.5,  0.5,0,0.5,  0.5,0.5,0,  0.5,0.5,0.5,
-     $      0.3333333,0.6666667,0.6666667,0.6666667,0.3333333,0.3333333/
-      NCV = NCVT(LCENT)
-      MULT = NCV*NSYM*(NCENT + 1)
-      LSYS = NSYS(LAUENO)
-      DO 90 I = 1,3
-        CEN(I,1) = 0.0
-        OUTL(I) = ' '
-   90 CONTINUE
-      IF (NCV .LE. 1) GO TO 110
-      J = LCENT - 1
-      IF (LCENT .EQ. 6) J = 1
-      IF (LCENT .EQ. 7) J = 5
-        DO 100 I = 2,NCV
-        CEN(1,I) = CENV(1,J)
-        CEN(2,I) = CENV(2,J)
-        CEN(3,I) = CENV(3,J)
-        J = J + 1
-  100   CONTINUE
-  110 CONTINUE
-      NPX = 1
-      NPY = 2
-      NPZ = 4
-      NPXYZ = 0
-      NPYXZ = 1
-        DO 120 I = 1,NSYM
-        IF (JRT(1,1,I) .LE. 0) NPX = 0
-        IF (JRT(2,2,I) .LE. 0) NPY = 0
-        IF (JRT(3,3,I) .LE. 0) NPZ = 0
-        IF (JRT(1,3,I) .GT. 0) NPXYZ = 8
-        IF (JRT(1,3,I) .LT. 0) NPYXZ = 0
-  120   CONTINUE
-      NPOL = (NPX + NPY + NPZ + NPXYZ*NPYXZ)*(1 - NCENT)
-      IF (LPT .LT. 0) RETURN
-      WRITE (COUT,10000) SPG,NC(NCENT + 1),
-     $                  LTYP(1,LCENT),LTYP(2,LCENT),LTYP(3,LCENT),
-     $                  SYST(1,LSYS),SYST(2,LSYS),SYST(3,LSYS),
-     $                  LAUE(1,LAUENO),LAUE(2,LAUENO),MULT
-      CALL GWRITE (LPT,' ')
-      IF (NAXIS .GT. 0) THEN
-        WRITE (COUT,11000) NAX(NAXIS)
-        CALL GWRITE (LPT,' ')
-      ENDIF
-      IF (NPOL  .GT. 0) THEN
-        WRITE (COUT,12000) POLAR(NPOL)
-        CALL GWRITE (LPT,' ')
-      ENDIF
-      WRITE (COUT,13000)
-      CALL GWRITE (LPT,' ')
-      KI = 0
-      KL = 2
-      IF (LAUENO .GT. 5) KL = 3
-      DO 140 I = 1,NSYM
-        KI = KI + 1
-        DO 135 J = 1,3
-          L = 1
-          CTEM = ' ' 
-          DO 130 K = 1,3
-            IF (JRT(K,J,I) .NE. 0) THEN
-              CTEM(L:L+1) = CHKL(K)
-              IF (JRT(K,J,I) .EQ. -1) CTEM(L:L) = '-'
-              L = L + 2
-            ENDIF
-  130     CONTINUE
-          IF (CTEM(1:1) .EQ. '+') CTEM(1:1) = ' '
-          MC = L - 1
-          M = 1 + 6*(J - 1) + 4 - MC
-          OUTL(KI)(M:M+MC-1) = CTEM(1:MC)
-  135   CONTINUE
-        IF (KI .EQ. KL) THEN
-          WRITE (COUT,15000) (OUTL(K),K = 1,KL)
-          CALL GWRITE (LPT,' ')
-          KI = 0
-          DO 137 K = 1,3
-            OUTL(K) = ' '
-  137     CONTINUE
-        ENDIF
-  140 CONTINUE
-      IF (LAUENO .EQ. 1) THEN
-        WRITE (COUT,15000) (OUTL(I),I = 1,3)
-        CALL GWRITE (LPT,' ')
-      ENDIF
-      WRITE (COUT,14000)
-      CALL GWRITE (LPT,' ')
-      RETURN
-10000 FORMAT (/' Space Group ',10A1/
-     $        '  The Space Group is ',A1,'Centric',6A4,
-     $        '  Laue Symmetry ',2A4/
-     $        '  Multiplicity of a General Site is',I4)
-11000 FORMAT ('  The Unique Axis is ',A1)
-12000 FORMAT ('  The location of the origin is arbitrary in ',A3)
-13000 FORMAT (/' Space-group Equivalent Reflections are:')
-14000 FORMAT (' Friedel Reflections are the -,-,- of these.'/'%')
-15000 FORMAT (5X,3(A20,3X))
-      END
diff --git a/difrac/sgrmat.f b/difrac/sgrmat.f
deleted file mode 100644
index 8fa5c7d7..00000000
--- a/difrac/sgrmat.f
+++ /dev/null
@@ -1,30 +0,0 @@
-C-----------------------------------------------------------------------
-C  Space group routine setup of the r-matrix
-C-----------------------------------------------------------------------
-      SUBROUTINE SGRMAT (RT,A,B,C,D,E,F,G,H,O)
-      INTEGER A,B,C,D,E,F,G,H,O
-      DIMENSION RT(5,4)
-      RT(1,1) = A
-      RT(1,2) = B
-      RT(1,3) = C
-      RT(1,4) = 0.0
-      RT(2,1) = D
-      RT(2,2) = E
-      RT(2,3) = F
-      RT(2,4) = 0.0
-      RT(3,1) = G
-      RT(3,2) = H
-      RT(3,3) = O
-      RT(3,4) = 0.0
-      RT(4,1) = 0.0
-      RT(4,2) = 0.0
-      RT(4,3) = 0.0
-      RT(4,4) = 1.0
-      RT(5,1) = 81*(2*RT(1,1) + 3*RT(1,2) + 4*RT(1,3)) +
-     $           9*(2*RT(2,1) + 3*RT(2,2) + 4*RT(2,3)) +
-     $              2*RT(3,1) + 3*RT(3,2) + 4*RT(3,3)
-      RT(5,2) = 1728*RT(1,4) + 144*RT(2,4) + 12*RT(3,4)
-      RT(5,3) = 10.0
-      RT(5,4) = 20.
-      RETURN
-      END
diff --git a/difrac/sgroup.f b/difrac/sgroup.f
deleted file mode 100644
index a75238bb..00000000
--- a/difrac/sgroup.f
+++ /dev/null
@@ -1,561 +0,0 @@
-C-----------------------------------------------------------------------
-C        Main Routine for the Space Group Symbol Interpreter
-C
-C         Adapted from the LASL routine by Allen C. Larson
-C-----------------------------------------------------------------------
-      SUBROUTINE SGROUP (SPG,LAUENO,NAXIS,NCENT,LCENT,NSYM,NPOL,JRT,
-     $                   CEN,NCV,LPT,LPTX,RT)
-C-----------------------------------------------------------------------
-C  This subroutine interprets the Hermann-Mauguin space group symbol.
-C
-C  Data in the calling sequence are
-C       SGP    Input. Ten words containing the space group symbol 10A1
-C   **NOTE**   Vol. A of Int Tab uses different symbols for cubic
-C   2-July-87  space groups with -3 axes,
-C              i.e. P n -3 n instead of P n 3 n.
-C              The routine changes the symbol to the old form for
-C              interpretation, but prints the new form.
-C       LAUENO Output.  The Laue group number
-C               1 = 1bar,  2 = 2/m,    3 = mmm,  4 = 4/m,  5 = 4/mm, 
-C               6 = R3R,   7 = R3mR,   8 = 3,    9 = 31m, 10 = 3m1, 
-C              11 = 6/m,  12 = 6/mmm, 13 = m3,  14 = m3m
-C       NAXIS  Output. Unique axis in monoclinic space groups.
-C              Set to 4 on error exits
-C       NCENT  Output.  1bar flag  (0/1) for (acentric/centric)
-C       LCENT  Output.  Lattice centering number
-C              1=P, 2=A, 3=B, 4=C, 5=I, 6=F and 7=R
-C       NSYM   Output.  The number of matrices generated (24 max),
-C              NCV*(NCENT+1)*NSYM = 192 (max)
-C       JRT    Output.  The NSYM (3,4,NSYM) matrices
-C       CEN    Output.  The lattice centering vectors
-C       NCV    Output.  The number of lattice centering vectors
-C       LPT    Output listing device for normal output.
-C              If .lt. 0 no listing will be produced
-C       LPTX   Output listing device for error listings
-C              If .lt. 0 no listing will be produced
-C       RT     scratch array of 500 words needed by SGROUP
-C-----------------------------------------------------------------------
-      DIMENSION SPG(10),JRT(3,4,24),CEN(3,4)
-      DIMENSION RT(5,4,25),D(3,3),L(4,4),LCEN(7)
-      CHARACTER*1 CHR(25),CHAR
-      CHARACTER*10 CSPG
-C-----------------------------------------------------------------------
-C               C B A P F I R
-C-----------------------------------------------------------------------
-      DATA LCEN/4,3,2,1,6,5,7/
-C-----------------------------------------------------------------------
-C                1   2   3   4   5   6   7   8   9  10  11  12  13  14
-C               15  16  17  18  19  20  21
-C-----------------------------------------------------------------------
-      DATA CHR/' ','C','B','A','P','F','I','R','M','N','D','1','2','3',
-     $         '4','5','6','-','/','H','.','0','0','0','0'/
-      DO 100 I = 1,4
-        DO 100 J = 1,4
-          L(J,I) = 0
-  100 CONTINUE
-      WRITE (CSPG,10000) SPG
-C-----------------------------------------------------------------------
-C  Check that there are blanks in the symbol, so that it has at least a
-C  sporting chance of being interpreted correctly
-C-----------------------------------------------------------------------
-      DO 1012 I = 1,10
-        J = 11 - I
-        IF (CSPG(J:J) .NE. ' ') THEN
-          DO 1010 K = 2,J
-            IF (CSPG(K:K) .EQ. ' ') GO TO 1014
- 1010     CONTINUE
-        ENDIF
- 1012 CONTINUE
-      IER = 24
-      GO TO 710
-C-----------------------------------------------------------------------
-C  Change the symbol for the cubic cases.  EJG   2-July-87
-C  If the -3 symbol is preceded by a second kind symmetry element,
-C  m, n, a, b, c or d then change -3 to 3
-C-----------------------------------------------------------------------
- 1014 DO 104 J = 1,9
-        IF (CSPG(J:J + 1) .EQ. '-3') THEN
-          DO 102 JJ = 1,J - 1
-            K = J - JJ
-            CHAR = CSPG(K:K)
-            IF (CHAR .EQ. ' ') GO TO 102
-            IF (CHAR .EQ. 'M' .OR. CHAR .EQ. 'N' .OR.
-     $          CHAR .EQ. 'D' .OR. CHAR .EQ. 'A' .OR.
-     $          CHAR .EQ. 'B' .OR. CHAR .EQ. 'C') THEN
-              CSPG(J:9) = CSPG(J + 1:10)
-              CSPG(10:10) = ' '
-              GO TO 106
-            ENDIF
-  102     CONTINUE
-        ENDIF
-  104 CONTINUE
-  106 K = 0
-      M = 0
-      IER = 0
-      NCENT = 0
-      LAUENO = 0
-      NAXIS = 0
-      IERX = 0
-      N = 0
-C-----------------------------------------------------------------------
-C  Break the space group symbol into the 4 fields as numerical values
-C  for manipulation
-C-----------------------------------------------------------------------
-        DO 140 J = 1,10
-          DO 110 I = 1,21
-          IF (CSPG(J:J) .EQ. CHR(I)) GO TO 120
-  110     CONTINUE
-        GO TO 140
-  120   IF (K + M + I .EQ. 1) GO TO 140
-        IF (I .EQ. 1) GO TO 130
-        IF (M .EQ. 0) K = K + 1
-        M = M + 1
-        L(M,K) = I
-        IF (I .LT. 12) GO TO 130
-        IF (M - 4) 140,130,130
-  130   CONTINUE
-        M = 0
-        IF (K .GT. 3) GO TO 150
-  140   CONTINUE
-C-----------------------------------------------------------------------
-C  If only 1 field was found, there is an error. Go to 710
-C-----------------------------------------------------------------------
-  150 IF (K .LE. 1) IER = 1
-      IF (IER .GT. 0) GO TO 710
-C-----------------------------------------------------------------------
-C  If the first character was not  P, A, B, C, F, I or R  Error.
-C-----------------------------------------------------------------------
-      IF (L(1,1) .GT. 8) IER = 2
-      IF (IER .GT. 0) GO TO 710
-C-----------------------------------------------------------------------
-C  Convert the -n notation to the nb(ar) notation
-C-----------------------------------------------------------------------
-      IF (L(1,2) .EQ. 18) CALL SGLPAK (L(1,2),IER)
-      IF (IER .GT. 0) GO TO 710
-      IF (L(1,3) .EQ. 18) CALL SGLPAK (L(1,3),IER)
-      IF (IER .GT. 0) GO TO 710
-      IF (L(1,4) .EQ. 18) CALL SGLPAK (L(1,4),IER)
-      IF (IER .GT. 0) GO TO 710
-C-----------------------------------------------------------------------
-C  Set the matrix count N to 2
-C-----------------------------------------------------------------------
-      N = 2
-C-----------------------------------------------------------------------
-C  Set the translation flags
-C-----------------------------------------------------------------------
-      D(1,1) = 0.0
-      D(1,2) = 0.0
-      D(1,3) = 0.0
-      D(2,1) = 0.0
-      D(2,2) = 0.0
-      D(2,3) = 0.0
-      D(3,1) = 0.0
-      D(3,2) = 0.0
-      D(3,3) = 0.0
-C-----------------------------------------------------------------------
-C  Set the lattice centering flag. 1=P, 2=A, 3=B, 4=C, 5=I, 6=F, 7=R
-C-----------------------------------------------------------------------
-      LCENT = L(1,1) - 1
-      LCENT = LCEN(LCENT)
-      IF (LCENT .NE. 7) GO TO 170
-C-----------------------------------------------------------------------
-C  Rhombohedral lattice. Make sure that there is a 3-axis.
-C-----------------------------------------------------------------------
-      IF (L(1,2) .NE. 14) IER = 3
-      IF (IER .GT. 0) GO TO 710
-      IF (L(1,K) .EQ. 8) GO TO 160
-C-----------------------------------------------------------------------
-C  Hexagonal axes. Retain R centering and set LAUENO to 8 or 9
-C-----------------------------------------------------------------------
-      IF (L(1,K) .EQ. 20) K = K - 1
-      LAUENO = K + 6
-      GO TO 190
-  160 CONTINUE
-C-----------------------------------------------------------------------
-C Rhombohedral axes. Delete R centering and set LAUENO to 6 or 7
-C-----------------------------------------------------------------------
-      LCENT = 1
-      K = K - 1
-      LAUENO = K + 4
-      GO TO 180
-  170 CONTINUE
-C-----------------------------------------------------------------------
-C  Call SGLATC to determine LAUENO and some preliminary data
-C-----------------------------------------------------------------------
-      IER = 0
-      I209 = 0
-      CALL SGLATC (K,L,D,LCENT,NCENT,LAUENO,NAXIS,LPT,IER,I209,ID)
-      IF (IER .GT. 0) GO TO 710
-      IF (I209 .EQ. 0) GO TO 190
-  180 CONTINUE
-C-----------------------------------------------------------------------
-C  Cubic or rhombohedral cell. Insert the 3-fold axis
-C-----------------------------------------------------------------------
-      CALL SGRMAT (RT(1,1,2),0,1,0,0,0,1,1,0,0)
-      CALL SGRMAT (RT(1,1,3),0,0,1,1,0,0,0,1,0)
-      N = 4
-  190 CONTINUE
-      CALL SGRMAT (RT,1,0,0,0,1,0,0,0,1)
-C-----------------------------------------------------------------------
-C  Decode the last 3 fields of the symbol
-C-----------------------------------------------------------------------
-        DO 680 M = 2,K
-        IF (L(1,M) .EQ. 0) IER = 6
-        IF (IER .GT. 0) GO TO 710
-        I = IABS(L(1,M) - 5)
-  200   IF (I .LE. 0 .OR. I .GT. 15) IER = 7
-        IF (IER .GT. 0) GO TO 710
-        NXI = N
-C-----------------------------------------------------------------------
-C                A   B   C   M   N   D   1   2   3   4   5   6   -   /
-C                H
-C-----------------------------------------------------------------------
-        GO TO (210,210,210,210,210,330,390,400,500,520,710,540,560,560,
-     $         560),I
-  210   CONTINUE
-C-----------------------------------------------------------------------
-C  A mirror is needed
-C                    A   B   C  axis
-C-----------------------------------------------------------------------
-        GO TO (710,220,240,260),M
-  220   CONTINUE
-        IF (LAUENO .GT. 3) GO TO 270
-        IF (K .EQ. 2) GO TO 250
-  230   CONTINUE
-        IF (I .EQ. 1) IER = 8
-        IF (IER .GT. 0) GO TO 710
-C-----------------------------------------------------------------------
-C  An A-axis mirror
-C-----------------------------------------------------------------------
-        CALL SGRMAT (RT(1,1,N),-1,0,0,0,1,0,0,0,1)
-        RT(1,4,N) = D(1,1)
-        IF (I .EQ. 2 .OR. I .EQ. 5) RT(2,4,N) = 0.5
-        IF (I .EQ. 3 .OR. I .EQ. 5) RT(3,4,N) = 0.5
-        GO TO 560
-  240   IF (L(1,2) .EQ. 14 .OR. L(1,2) .EQ. 17) GO TO 310
-C-----------------------------------------------------------------------
-C  It is not trigonal or hexagonal
-C-----------------------------------------------------------------------
-        IF (L(1,2) .EQ. 15) GO TO 230
-C-----------------------------------------------------------------------
-C  It is not tetragonal
-C-----------------------------------------------------------------------
-  250   CONTINUE
-        IF (I .EQ. 2) IER = 9
-        IF (IER .GT. 0) GO TO 710
-C-----------------------------------------------------------------------
-C  A B-axis mirror
-C-----------------------------------------------------------------------
-        CALL SGRMAT (RT(1,1,N),1,0,0,0,-1,0,0,0,1)
-        RT(2,4,N) = D(2,2)
-        IF (I .EQ. 1 .OR. I .EQ. 5) RT(1,4,N) = 0.5
-        IF (I .EQ. 3 .OR. I .EQ. 5) RT(3,4,N) = 0.5
-        GO TO 560
-  260   IF (L(1,3) .EQ. 14 .OR. L(1,2) .EQ. 15) GO TO 280
-C-----------------------------------------------------------------------
-C  It is not cubic or tetragonal
-C-----------------------------------------------------------------------
-        IF (L(1,2) .EQ. 14 .OR. L(1,2) .EQ. 17) GO TO 280
-C-----------------------------------------------------------------------
-C  It is not trigonal or hexagonal
-C-----------------------------------------------------------------------
-  270   CONTINUE
-        IF (I .EQ. 3) IER = 10
-        IF (IER .GT. 0) GO TO 710
-C-----------------------------------------------------------------------
-C  A C-axis mirror
-C-----------------------------------------------------------------------
-        CALL SGRMAT (RT(1,1,N),1,0,0,0,1,0,0,0,-1)
-        RT(3,4,N) = D(3,3)
-        IF (I .EQ. 1 .OR. I .EQ. 5) RT(1,4,N) = 0.5
-        IF (I .EQ. 2 .OR. I .EQ. 5) RT(2,4,N) = 0.5
-        IF (M .NE. 2 .OR. L(1,2) .NE. 17) GO TO 560
-C-----------------------------------------------------------------------
-C  If this is a 63-axis, the mirror is at 1/4
-C-----------------------------------------------------------------------
-        IF (L(2,2) .EQ. 14) RT(3,4,N) = 0.5
-        GO TO 560
-  280   CONTINUE
-C-----------------------------------------------------------------------
-C  A diagonal mirrror perpendicular to -110
-C-----------------------------------------------------------------------
-        CALL SGRMAT (RT(1,1,N),0,1,0,1,0,0,0,0,1)
-        RT(1,4,N) =  D(2,2)
-        RT(2,4,N) = -D(2,2)
-        IF (I .EQ. 3 .OR. I .EQ. 5) RT(3,4,N) = 0.5
-        IF (LAUENO .EQ. 7 .AND. I .EQ. 3) GO TO 290
-        IF (I .EQ. 3 .OR. I .EQ. 4) GO TO 560
-  290   CONTINUE
-        IF (LCENT .EQ. 6 .OR. LCENT .EQ. 4) GO TO 300
-        RT(1,4,N) = 0.5 + RT(1,4,N)
-        RT(2,4,N) = 0.5 + RT(2,4,N)
-        GO TO 560
-  300   CONTINUE
-C-----------------------------------------------------------------------
-C  Either F- or C-centered tetragonal. Glides are 1/4,1/4
-C-----------------------------------------------------------------------
-        RT(1,4,N) = 0.25 + RT(1,4,N)
-        RT(2,4,N) = 0.25 + RT(2,4,N)
-        GO TO 560
-  310   CONTINUE
-        IF (LAUENO .EQ. 7) GO TO 280
-C-----------------------------------------------------------------------
-C  Mirror normal to (1000) in hex cell
-C-----------------------------------------------------------------------
-        CALL SGRMAT (RT(1,1,N),-1,1,0,0,1,0,0,0,1)
-        IF (I .EQ. 3) RT(3,4,N) = 0.5
-  320   CONTINUE
-        GO TO 560
-C-----------------------------------------------------------------------
-C  D type mirror
-C-----------------------------------------------------------------------
-  330   CONTINUE
-        IF (LCENT .LE. 1) IER = 11
-        IF (IER .GT. 0) GO TO 710
-        GO TO (710,340,350,360),M
-  340   IF (LAUENO .GT. 3) GO TO 370
-        IF (K .EQ. 2) GO TO 350
-        CALL SGRMAT (RT(1,1,N),-1,0,0,0,1,0,0,0,1)
-        IF (ID .EQ. 2) RT(1,4,N) = 0.25
-        RT(2,4,N) = 0.25
-        RT(3,4,N) = 0.25
-        GO TO 560
-  350   CONTINUE
-        CALL SGRMAT (RT(1,1,N),1,0,0,0,-1,0,0,0,1)
-        RT(1,4,N) = 0.25
-        IF (ID .EQ. 2) RT(2,4,N) = 0.25
-        IF (LAUENO .EQ. 5) RT(2,4,N) = D(2,1)
-        RT(3,4,N) = 0.25
-        GO TO 560
-  360   IF (L(1,2) .EQ. 15 .OR. L(1,3) .EQ. 14) GO TO 380
-C-----------------------------------------------------------------------
-C  It is not tetragonal or cubic
-C-----------------------------------------------------------------------
-  370   CONTINUE
-        CALL SGRMAT (RT(1,1,N),1,0,0,0,1,0,0,0,-1)
-        RT(1,4,N) = 0.25
-        RT(2,4,N) = 0.25
-        IF (ID .EQ. 2) RT(3,4,N) = 0.25
-        GO TO 560
-  380   CONTINUE
-C-----------------------------------------------------------------------
-C  Cubic or tetragonal. D-glide along diagonal
-C-----------------------------------------------------------------------
-        CALL SGRMAT (RT(1,1,N),0,1,0,1,0,0,0,0,1)
-        RT(1,4,N) = 0.25
-        RT(2,4,N) = 0.25
-        RT(3,4,N) = 0.25
-        IF (L(1,3) .NE. 13) GO TO 320
-        RT(1,4,N) = 0.0
-        RT(2,4,N) = 0.5
-        GO TO 560
-C-----------------------------------------------------------------------
-C  1 fold rotation
-C-----------------------------------------------------------------------
-  390   IF (L(2,M) .NE. 3) GO TO 680
-C-----------------------------------------------------------------------
-C  A center of symmetry
-C-----------------------------------------------------------------------
-        NCENT = 1
-        GO TO 680
-C-----------------------------------------------------------------------
-C  2 fold rotation axis
-C-----------------------------------------------------------------------
-  400   CONTINUE
-C-----------------------------------------------------------------------
-C  Do not allow a -2 axis.
-C-----------------------------------------------------------------------
-        IF (L(2,M) .EQ. 3) IER = 19
-        IF (IER .GT. 0) GO TO 710
-        GO TO (710,410,420,440),M
-  410   IF (K .EQ. 2) GO TO 430
-        CONTINUE
-C-----------------------------------------------------------------------
-C  Rotation about the a-axis. (orthogonal cell)
-C-----------------------------------------------------------------------
-        CALL SGRMAT (RT(1,1,N),1,0,0,0,-1,0,0,0,-1)
-        RT(2,4,N) = D(2,1)
-        RT(3,4,N) = D(3,1)
-        IF (IABS(L(2,M) - 13) .EQ. 1) RT(1,4,N) = 0.5
-        GO TO 560
-  420   CONTINUE
-        IF (L(1,2) .EQ. 14) GO TO 460
-        IF (L(1,2) .EQ. 17) GO TO 450
-C-----------------------------------------------------------------------
-C  It is not a hexagonal or trigonal space group
-C-----------------------------------------------------------------------
-  430   CONTINUE
-C-----------------------------------------------------------------------
-C  Rotation about the b-axis
-C-----------------------------------------------------------------------
-        CALL SGRMAT (RT(1,1,N),-1,0,0,0,1,0,0,0,-1)
-        RT(1,4,N) = D(1,2)
-        RT(3,4,N) = D(3,2)
-        IF (L(2,M) .EQ. 12) RT(2,4,N) = 0.5
-        GO TO 560
-  440   IF (L(1,2) .GE. 14) GO TO 490
-        IF (L(1,3) .EQ. 14) GO TO 490
-        CONTINUE
-        CALL SGRMAT (RT(1,1,N),-1,0,0,0,-1,0,0,0,1)
-        RT(1,4,N) = D(1,3)
-        RT(2,4,N) = D(2,3)
-        IF (IABS(L(2,M) - 13) .EQ. 1) RT(3,4,N) = 0.5
-        IF (L(2,M) .EQ. 16) RT(3,4,N) = 0.5
-        GO TO 560
-  450   CONTINUE
-        IF (L(1,4) .EQ. 12) GO TO 460
-C-----------------------------------------------------------------------
-C  2-axis normal to (-2110). Used for the P 6n22 groups
-C-----------------------------------------------------------------------
-        CALL SGRMAT (RT(1,1,N),1,-1,0,0,-1,0,0,0,-1)
-        GO TO 560
-  460   CONTINUE
-        IF (LAUENO .EQ. 7) GO TO 480
-  470   CONTINUE
-C-----------------------------------------------------------------------
-C  2-axis along to (11-20) trigonal  and (110) tetragonal
-C  Used for the P 3n21 groups
-C-----------------------------------------------------------------------
-        CALL SGRMAT (RT(1,1,N),0,1,0,1,0,0,0,0,-1)
-        RT(1,4,N) = D(2,1)
-        IF (L(2,M) .EQ. 12) RT(1,4,N) = RT(1,4,N) + 0.5
-        RT(2,4,N) = -D(2,1)
-        RT(3,4,N) =  D(3,1)
-        GO TO 560
-  480   CONTINUE
-C-----------------------------------------------------------------------
-C  2-axis normal to (110)
-C-----------------------------------------------------------------------
-        CALL SGRMAT (RT(1,1,N),0,-1,0,-1,0,0,0,0,-1)
-        GO TO 560
-  490   CONTINUE
-        IF (L(1,2) .EQ. 15) GO TO 470
-C-----------------------------------------------------------------------
-C  2-axis normal to (10-10)
-C-----------------------------------------------------------------------
-        CALL SGRMAT (RT(1,1,N),1,0,0,1,-1,0,0,0,-1)
-        GO TO 560
-C-----------------------------------------------------------------------
-C  3 fold rotation
-C-----------------------------------------------------------------------
-  500   GO TO (710,510,390,710),M
-  510   CONTINUE
-        IF (LAUENO .LE. 7) GO TO 390
-        CALL SGRMAT (RT(1,1,N),0,-1,0,1,-1,0,0,0,1)
-        IF (L(2,M) .EQ. 12) RT(3,4,N) = 0.33333333
-        IF (L(2,M) .EQ. 13) RT(3,4,N) = 0.66666667
-        IF (L(2,2) .EQ. 3) NCENT = 1
-        GO TO 560
-  520   CONTINUE
-C-----------------------------------------------------------------------
-C  4 fold axis
-C-----------------------------------------------------------------------
-        IF (M .NE. 2) IER = 12
-        IF (IER .GT. 0) GO TO 710
-        IF (L(2,2) .EQ. 3) GO TO 530
-        CALL SGRMAT (RT(1,1,N),0,-1,0,1,0,0,0,0,1)
-        RT(1,4,N) = D(1,3)
-        RT(2,4,N) = D(2,3)
-        IF (L(2,2) .EQ. 12) RT(3,4,N) = 0.25
-        IF (L(2,2) .EQ. 13) RT(3,4,N) = 0.5
-        IF (L(2,2) .EQ. 14) RT(3,4,N) = 0.75
-        GO TO 560
-  530   CONTINUE
-        CALL SGRMAT (RT(1,1,N),0,1,0,-1,0,0,0,0,-1)
-        RT(1,4,N) = D(1,3)
-        RT(2,4,N) = D(2,3)
-        RT(3,4,N) = D(3,3)
-        GO TO 560
-  540   CONTINUE
-C-----------------------------------------------------------------------
-C  6-axis
-C-----------------------------------------------------------------------
-        IF (M .NE. 2) IER = 13
-        IF (IER .GT. 0) GO TO 710
-        IF (L(2,2) .EQ. 3) GO TO 550
-        CALL SGRMAT (RT(1,1,N),1,-1,0,1,0,0,0,0,1)
-        IF (L(2,2) .GT. 11 .AND. L(2,2) .LT. 18)
-     $       RT(3,4,N) = (L(2,2) - 11)/6.0
-        GO TO 560
-  550   CONTINUE
-        CALL SGRMAT (RT(1,1,N),-1,1,0,-1,0,0,0,0,-1)
-        IF (L(1,3) .EQ. 2 .OR. L(1,4) .EQ. 2) RT(3,4,N) = 0.5
-  560   CONTINUE
-        RT(1,4,N) = AMOD(RT(1,4,N) + 5.0,1.0)
-        RT(2,4,N) = AMOD(RT(2,4,N) + 5.0,1.0)
-        RT(3,4,N) = AMOD(RT(3,4,N) + 5.0,1.0)
-        RT(5,2,N) = 1728*RT(1,4,N) + 144*RT(2,4,N) + 12*RT(3,4,N)
-          DO 580 M2 = 1,N - 1
-          IF (RT(5,1,M2) .EQ.  RT(5,1,N)) GO TO 570
-          IF (RT(5,1,M2) .NE. -RT(5,1,N)) GO TO 580
-          NCENT = 1
-  570     CONTINUE
-          IF (RT(5,2,N) .NE. RT(5,2,M2)) GO TO 670
-          GO TO 680
-  580     CONTINUE
-        N = N + 1
-        IF (N .GT. 25) IER = 14
-        IF (IER .GT. 0) GO TO 710
-  590   CONTINUE
-        IDENT = 0
-        NXL = N - 1
-        IF (NXL .LT. NXI) GO TO 640
-          DO 630 NX = NXI,NXL
-            DO 620 M1 = 2,NX
-            CALL SGMTML (RT,M1,RT,NX,RT,N)
-              DO 610 M2 = 1,N - 1
-              IF ( RT(5,1,N) .EQ. RT(5,1,M2)) GO TO 600
-              IF (-RT(5,1,N) .NE. RT(5,1,M2)) GO TO 610
-              NCENT = 1
-  600         CONTINUE
-              GO TO 620
-  610         CONTINUE
-            N = N + 1
-            IF (N .GT. 25) IER = 15
-            IF (IER .GT. 0) GO TO 710
-  620       CONTINUE
-          IF (N - 1 .EQ. NXL) GO TO 640
-  630     CONTINUE
-        NXI = NXL + 1
-        GO TO 590
-  640   CONTINUE
-        IF (L(1,M) .LT. 12) GO TO 680
-C-----------------------------------------------------------------------
-C  Search for a / to indicate a mirror perpendicular to this axis
-C-----------------------------------------------------------------------
-        IF (L(2,M) .EQ. 3) GO TO 680
-          DO 650 I = 2,3
-          IF (L(I,M) .EQ. 0) GO TO 680
-          IF (L(I,M) .EQ. 19) GO TO 660
-          IF (L(I,M) .LT. 12) IER = 16
-          IF (IER .GT. 0) GO TO 710
-  650     CONTINUE
-        GO TO 680
-  660   IF (L(I + 1,M) .LE. 1) IER = 17
-        IF (IER .GT. 0) GO TO 710
-        I = IABS(L(I + 1,M) - 5)
-        GO TO 200
-  670   CONTINUE
-        CALL SGTRCF (M,RT,N,M2,LCENT,LAUENO,IER,LPTX)
-        IF (IER .GT. 0) IERX = IER
-        IER = 0
-  680   CONTINUE
-      NSYM = N - 1
-        DO 700 I = 1,3
-          DO 700 K = 1,NSYM
-            DO 690 J = 1,3
-            JRT(I,J,K) = RT(I,J,K)
-  690       CONTINUE
-          JRT(I,4,K) = 12*RT(I,4,K) + 144.1
-          JRT(I,4,K) = JRT(I,4,K) - 12*(JRT(I,4,K)/12)
-  700     CONTINUE
-      CALL SGPRNT (SPG,JRT,LAUENO,NAXIS,NCENT,LCENT,NSYM,NPOL,CEN,
-     $             NCV,LPT)
-      IF (IERX .EQ. 0) RETURN
-      IER = IERX
-  710 CONTINUE
-      IF (LPTX .GE. 0) CALL SGERRS (SPG,IER,LPTX)
-      NAXIS = 4
-      RETURN
-10000 FORMAT (10A1)
-      END
diff --git a/difrac/sgtrcf.f b/difrac/sgtrcf.f
deleted file mode 100644
index 49c13c8f..00000000
--- a/difrac/sgtrcf.f
+++ /dev/null
@@ -1,68 +0,0 @@
-C-----------------------------------------------------------------------
-C  Space group routine check of operators
-C-----------------------------------------------------------------------
-      SUBROUTINE SGTRCF (M,RT,N,M2,LCENT,LAUENO,IER,LPT)
-      CHARACTER COUT*132
-      COMMON /IOUASC/ COUT(20)
-      DIMENSION RT(5,4,24)
-      DIMENSION ICENV(3,5),NCVT(7),JCVT(7)
-      DATA ICENV/0,0,0,0,6,6,6,0,6,6,6,0,6,6,6/
-      DATA NCVT/1,2,3,4,5,4,1/
-      DATA JCVT/1,1,2,3,4,1,1/
-      IER = 0
-      IRN = RT(5,2,N)
-      IRM = RT(5,2,M2)
-      IRX = MOD((IRN/144 + IRM/144),12)
-      IRY = MOD((IRN/12  + IRM/12),12)
-      IRZ = MOD(IRN + IRM,12)
-      NCV = NCVT(LCENT)
-      JCV = JCVT(LCENT)
-        DO 120 ICV = 1,NCV,JCV
-        IRX1 = MOD(IRX + ICENV(1,ICV),12)
-        IRY1 = MOD(IRY + ICENV(2,ICV),12)
-        IRZ1 = MOD(IRZ + ICENV(3,ICV),12)
-C-----------------------------------------------------------------------
-C  Does this pair make a 1bar?
-C-----------------------------------------------------------------------
-        M2Z = M2
-        IF (RT(5,1,N) + RT(5,1,M2) .EQ. 0) M2Z = 1
-C-----------------------------------------------------------------------
-C  No.
-C-----------------------------------------------------------------------
-        IF (RT(3,3,N) + RT(3,3,M2Z) .LE. 0) IRZ1 = 0
-C-----------------------------------------------------------------------
-C  Is this an operator operating along the face diagonal?
-C-----------------------------------------------------------------------
-        IF (LAUENO .LE. 3 .OR. M .NE. 4) GO TO 100
-C-----------------------------------------------------------------------
-C  Yes.
-C-----------------------------------------------------------------------
-        IRX1 = MOD(IRX1 + IRY1,12)
-        IRY1 = 0
-        GO TO 110
-  100   CONTINUE
-C-----------------------------------------------------------------------
-C  No.
-C-----------------------------------------------------------------------
-        IF (RT(1,1,N) + RT(1,1,M2Z) .LE. 0) IRX1 = 0
-        IF (RT(2,2,N) + RT(2,2,M2Z) .LE. 0) IRY1 = 0
-  110   CONTINUE
-        TOTTR = 144*IRX1 + 12*IRY1 + IRZ1
-        IF (TOTTR .EQ. 0) RETURN
-  120   CONTINUE
-      CONTINUE
-      IF (LPT .GE. 0) THEN
-        WRITE (COUT,10000) RT(5,2,N),RT(5,2,M2),
-     $                     TOTTR,IRX,IRY,IRZ,RT(5,1,N),RT(5,1,M2)
-        CALL GWRITE (LPT,' ')
-      ENDIF
-      IER = 18
-      IF (LPT .GE. 0) THEN
-        WRITE (COUT,11000) M,N,M2
-      CALL GWRITE (LPT,' ')
-      ENDIF
-      RETURN
-10000 FORMAT (3F10.1,3I5,2F10.1)
-11000 FORMAT (' Operator',I2,' generates matrix',I3,' which has a',
-     $        ' translation conflict',2I3)
-      END
diff --git a/difrac/sinmat.f b/difrac/sinmat.f
deleted file mode 100644
index 0d93c597..00000000
--- a/difrac/sinmat.f
+++ /dev/null
@@ -1,87 +0,0 @@
-C-----------------------------------------------------------------------
-C  Make a symmetry constrained matrix for calculating Sin(Theta) 
-C
-C  Constrain the DUM array for the appropriate Crystal System
-C  If ISYS = 1  triclinic, no constraints;
-C            2  is a dummy;
-C            3  orthorhombic;
-C            4  tetragonal;
-C            5  hexagonal;
-C            6  rhombohedral;
-C            7  cubic;
-C       8,9,10  monoclinic,  a,b,c axes unique.
-C-----------------------------------------------------------------------
-      SUBROUTINE SINMAT
-      INCLUDE 'COMDIF'
-      DIMENSION DUM(6)
-      IF (ISYS .LT. 1 .OR. ISYS .GT. 10) ISYS = 1
-      DO 100 I = 1,3
-        DUM(I)   = APS(I)
-        DUM(I+3) = CANGS(I)
-  100 CONTINUE
-      TEMP = WAVE*WAVE
-C-----------------------------------------------------------------------
-C  Orthorhombic, tetragonal, hexagonal, cubic   alpha, beta, gamma.
-C-----------------------------------------------------------------------
-      IF ((ISYS .GE. 3 .AND. ISYS .LE. 5) .OR. ISYS .EQ. 7) THEN
-        DO 110 I = 4,6
-          DUM(I) = 0
-  110   CONTINUE
-      ENDIF
-C-----------------------------------------------------------------------
-C  Tetragonal, hexagonal  a, a, c
-C-----------------------------------------------------------------------
-      IF (ISYS .EQ. 4 .OR. ISYS .EQ. 5) THEN
-        DUM(1) = (DUM(1)+DUM(2))/2
-        DUM(2) = DUM(1)
-      ENDIF
-C-----------------------------------------------------------------------
-C  Hexagonal  gamma
-C-----------------------------------------------------------------------
-      IF (ISYS .EQ. 5) DUM(6) = 0.5
-C-----------------------------------------------------------------------
-C  Rhombohedral, cubic  a, a, a
-C-----------------------------------------------------------------------
-      IF (ISYS .EQ. 6 .OR. ISYS .EQ. 7) THEN
-        DUM(1) = (DUM(1)+DUM(2)+DUM(3))/3
-        DUM(2) = DUM(1)
-        DUM(3) = DUM(1)
-      ENDIF
-C-----------------------------------------------------------------------
-C  Rhombohedral  alpha, alpha, alpha
-C-----------------------------------------------------------------------
-      IF (ISYS .EQ. 6) THEN
-        DUM(4) = (DUM(4)+DUM(5)+DUM(6))/3
-        DUM(5) = DUM(4)
-        DUM(6) = DUM(4)
-      ENDIF
-C-----------------------------------------------------------------------
-C  Monoclinic (a unique)   beta, gamma
-C-----------------------------------------------------------------------
-      IF (ISYS .EQ. 8) THEN
-        DUM(5) = 0
-        DUM(6) = 0
-C-----------------------------------------------------------------------
-C  Monoclinic (b unique)   alpha, gamma
-C-----------------------------------------------------------------------
-      ELSE IF (ISYS .EQ. 9) THEN
-        DUM(4) = 0
-        DUM(6) = 0
-C-----------------------------------------------------------------------
-C  Monoclinic (c unique)   alpha, beta
-C-----------------------------------------------------------------------
-      ELSE IF (ISYS .EQ. 10) THEN
-        DUM(4) = 0
-        DUM(5) = 0
-      ENDIF
-C-----------------------------------------------------------------------
-C  Calculate the symmetry constrained matrix SINABS
-C-----------------------------------------------------------------------
-      SINABS(1) = TEMP*DUM(1)*DUM(1)
-      SINABS(2) = TEMP*DUM(2)*DUM(2)
-      SINABS(3) = TEMP*DUM(3)*DUM(3)
-      SINABS(4) = TEMP*2*DUM(1)*DUM(2)*DUM(6)
-      SINABS(5) = TEMP*2*DUM(1)*DUM(3)*DUM(5)
-      SINABS(6) = TEMP*2*DUM(2)*DUM(3)*DUM(4)
-      RETURN
-      END
diff --git a/difrac/stdmes.f b/difrac/stdmes.f
deleted file mode 100644
index eece02bc..00000000
--- a/difrac/stdmes.f
+++ /dev/null
@@ -1,168 +0,0 @@
-C-----------------------------------------------------------------------
-C  Subroutine to Measure Standard Refletions
-C  Modified to output to ITP for SICS MK
-C-----------------------------------------------------------------------
-      SUBROUTINE STDMES
-      INCLUDE 'COMDIF'
-      DIMENSION ENREFB(10)
-      EQUIVALENCE (NREFB(1),ENREFB(1))
-      IF (NSTAN .EQ. 0) THEN
-        KQFLAG = 1
-        RETURN
-      ENDIF
-      CALL RSW (5,ILPT)
-C-----------------------------------------------------------------------
-C  Set the standards flag
-C-----------------------------------------------------------------------
-  100 ISTAN = 1
-      IF (ILPT .EQ. 0) THEN
-        IF (NMSEG .LE. NSEG) THEN
-          WRITE (COT,10000) IH,IK,IL,NREF,NSET,NMSEG,NBLOCK
-        ELSE
-          WRITE (COUT,10100) NSET,NREF,NBLOCK
-        ENDIF
-        CALL GWRITE(ITP,' ')
-      ENDIF
-C-----------------------------------------------------------------------
-C  Loop to measure NSTAN standards
-C-----------------------------------------------------------------------
-      JH = IH
-      JK = IK
-      JL = IL
-      DO 120 NN = 1,NSTAN
-        IH = IHSTAN(NN)
-        IK = IKSTAN(NN)
-        IL = ILSTAN(NN)
-C-----------------------------------------------------------------------
-C  Calculate angles, set the display, set the circles and measure
-C-----------------------------------------------------------------------
-        IPRVAL = 0
-        CALL ANGCAL
-        CALL HKLN (IHSTAN(NN),IKSTAN(NN),ILSTAN(NN),NREF)
-  110   IF (ISCAN .EQ. 3 .OR. ISCAN .EQ. 4) THEN
-          CALL SAMMES (ITIME,ICC)
-          IF (ICC .EQ. 2) THEN
-            WRITE (COUT,12000) IHSTAN(NN),IKSTAN(NN),ILSTAN(NN)
-            CALL GWRITE(ITP,' ')
-            GO TO 120
-          ENDIF
-        ELSE
-          CALL MESINT (IROFL,ICC)
-          IF (ICC .GE. 4) GO TO 100
-          IF (ICC .EQ. 2) THEN
-            WRITE (COUT,12000) IHSTAN(NN),IKSTAN(NN),ILSTAN(NN)
-            CALL GWRITE(ITP,' ')
-            GO TO 120
-          ENDIF
-          IF (IROFL .NE. 0) GO TO 110
-        ENDIF
-C-----------------------------------------------------------------------
-C  Pack h&k and l&natt, put psi=999.0 to denote standard
-C-----------------------------------------------------------------------
-        IHK(NB) = (IHSTAN(NN) + 500)*1000 + IKSTAN(NN) + 500
-        ILA(NB) = (ILSTAN(NN) + 500)*1000 + NATT
-        BCOUNT(NB) = COUNT
-        BBGR1(NB) = BGRD1
-        BBGR2(NB) = BGRD2
-        BTIME(NB) = PRESET
-        IF (IPRFLG .EQ. 0) THEN
-          IF (ISCAN .EQ. 3 .OR. ISCAN .EQ. 4) THEN
-            BTIME(NB) = 10*ITIME + FRAC
-          ELSE
-            BTIME(NB) = FRAC
-          ENDIF
-        ENDIF
-        ENREFB(NB) = NREF
-        BPSI(NB) = 999.0
-C-----------------------------------------------------------------------
-C  Write a block of intensity data to file
-C-----------------------------------------------------------------------
-        IF (NB .GE. 10) THEN
-          WRITE (IID,REC=NBLOCK) IHK,ILA,BCOUNT,BBGR1,BBGR2,BTIME,
-     $                           ENREFB,BPSI
-          NBLOCK = NBLOCK + 1
-          NB = 0
-        ENDIF
-        NB = NB+1
-C-----------------------------------------------------------------------
-C  Sort out which attenuators to apply and write standard on terminal
-C-----------------------------------------------------------------------
-        ATT = ATTEN(NATT+1)
-        IF (ITYPE .EQ. 7 .OR. ITYPE .EQ. 8) THEN
-          IPCT = PRESET
-          IBCT = (PRESET - IPCT)*2000
-          PCOUNT = COUNT/IPCT - (BGRD1 + BGRD2)/IBCT
-          SIG = SQRT(COUNT/(IPCT*IPCT) + (BGRD1 + BGRD2)/(IBCT*IBCT))
-          PCOUNT = PCOUNT*ATT/IPCT
-          SIG = SIG*ATT/IPCT
-          PCT = IPCT
-          IF (ILPT .EQ. 0) THEN 
-            WRITE (COUT,16000) 
-     $                     NN,IHSTAN(NN),IKSTAN(NN),ILSTAN(NN),
-     $                     THETA,PCT,NATT,BGRD1,COUNT,BGRD2,PCOUNT,SIG
-            CALL GWRITE(ITP,' ')
-          ENDIF 
-        ELSE
-          PCOUNT = COUNT - (BGRD1 + BGRD2)/(2.0*FRAC)
-          PCOUNT = PCOUNT*ATT
-          IF (ILPT .EQ. 0) THEN 
-             WRITE (COUT,13000) 
-     $                     NN,IHSTAN(NN),IKSTAN(NN),ILSTAN(NN),
-     $                     THETA,TIME,NATT,BGRD1,COUNT,BGRD2,PCOUNT
-             CALL GWRITE(ITP,' ')
-          ENDIF
-          SIG = SQRT(COUNT + (BGRD1 + BGRD2)/(4.0*FRAC*FRAC))
-          ICOUNT = COUNT + 0.5
-          ISIG = SIG + 0.5
-          IF (NATT .NE. 0) THEN
-            WRITE (COUT,14000) IHSTAN(NN),IKSTAN(NN),ILSTAN(NN),NATT,
-     $                         ICOUNT,ISIG,NN
-          ELSE
-            WRITE (COUT,14100) IHSTAN(NN),IKSTAN(NN),ILSTAN(NN),
-     $                         ICOUNT,ISIG,NN
-          ENDIF
-          CALL GWRITE (ITP,' ')
-          IATT = NATT + 10
-C-----------------------------------------------------------------------
-C  Write the profile on the screen
-C-----------------------------------------------------------------------
-          CALL PROFIL
-C-----------------------------------------------------------------------
-C  Test for K or Q stop
-C-----------------------------------------------------------------------
-        ENDIF
-        CALL KORQ (KQFLAG)
-        IF (KQFLAG .EQ. 0) THEN
-          ISTAN = 0
-          KI = 'G3'
-          RETURN
-        ENDIF
-        KQFLGS = 1
-        IF (KQFLAG .EQ. 2) KQFLGS = 2
-  120 CONTINUE
-C----------------------------------------------------------------------- 
-C  Reset standards flag and return with a disguised call to GOLOOP
-C-----------------------------------------------------------------------
-      ISTAN = 0
-      IH = JH
-      IK = JK
-      IL = JL
-      KI = 'G3'
-      IF(KQFLGS .NE. 0) THEN
-          KQFLAG = KQFLGS
-      ELSE
-          KQFLAG = 1
-      ENDIF
-      RETURN
-10000 FORMAT (/20X,'Reference Reflection Measurement '/
-     $        ' Next reflection:',3I4,', # ',I4,', Set',I3,
-     $        ', Segment ',I2,', Record ',I4)
-10100 FORMAT (/20X,'Reference Reflection Measurement at end of set',I3/
-     $        ' Restart at reflection #',I6,', segment 1, record',I5)
-11000 FORMAT (3I4,' Setting Collision')
-12000 FORMAT (3I4,' Scan Collision ')
-13000 FORMAT (2X,I1,3(I3,1X),2(F7.3,1X),I1,F5.0,F7.0,F5.0,10X,F7.0)
-14000 FORMAT (3I4,I2,I7,'(',I4,')',I2)
-14100 FORMAT (3I4,2X,I7,'(',I4,')',I2)
-16000 FORMAT (2X,I1,3(I3,1X),2(F7.3,1X),I1,F5.0,F7.0,F5.0,10X,2F8.2)
-      END
diff --git a/difrac/swrite.f b/difrac/swrite.f
deleted file mode 100644
index ae9daa7c..00000000
--- a/difrac/swrite.f
+++ /dev/null
@@ -1,109 +0,0 @@
-C-----------------------------------------------------------------------
-C  Routines to perform consol I/O 
-C-----------------------------------------------------------------------
-      SUBROUTINE GWRITE (IDEV,DOLLAR)
-      CHARACTER  DOLLAR*(*)
-      CHARACTER*132 COUT
-      INTEGER LINE(132), IL, LEN
-      COMMON /IOUASC/ COUT(20)
-      COMMON /IOUASS/ IOUNIT(10)
-      CHARACTER CR*1,LF*1,CRLF*2,STATUS*2
-      CR = CHAR(13)
-      LF = CHAR(10)
-      CRLF(1:1) = CR
-      CRLF(2:2) = LF
-      ITP = IOUNIT(6) 
-C-----------------------------------------------------------------------
-C  First find out how many lines to output 
-C-----------------------------------------------------------------------
-      DO 100 I = 20,1,-1
-         IF (COUT(I) .NE. ' ') GO TO 110
-  100 CONTINUE
-C-----------------------------------------------------------------------
-C  Must be just a blank line.  Only here for safety - should not happen.
-C-----------------------------------------------------------------------
-      I = 1
-  110 NLINES = I
-      IF (COUT(NLINES)(1:1) .EQ. '%') COUT(NLINES)(1:1) = ' '
-C-----------------------------------------------------------------------
-C  If the unit is not ITP then just do straight output to the device 
-C-----------------------------------------------------------------------
-      IF (IDEV .NE. ITP) THEN
-         IF (NLINES .GT. 1) THEN
-            DO 120 I = 1,NLINES-1
-               WRITE (IDEV,10200) COUT(I)(1:LINELN(COUT(I)))
-  120       CONTINUE
-         ENDIF
-         IF (DOLLAR .EQ. '$') THEN
-            WRITE (IDEV,10000) COUT(NLINES)(1:LINELN(COUT(I)))
-         ELSE IF (DOLLAR .EQ. '%') THEN
-            WRITE (IDEV,10100) COUT(NLINES)(1:LINELN(COUT(I)))
-         ELSE
-            WRITE (IDEV,10200) COUT(NLINES)(1:LINELN(COUT(I)))
-         ENDIF
-      ELSE
-C-----------------------------------------------------------------------
-C  Unit is ITP.  Output in SICS compatible form.
-C-----------------------------------------------------------------------
-         IF (NLINES .GE. 1) THEN
-            DO 130 I = 1,NLINES
-               LEN = LINELN(COUT(I))
-               DO 200, IL = 1, LINELN(COUT(I))
-                 LINE(IL) = ICHAR(COUT(I)(IL:IL))
-  200          CONTINUE
-               CALL SICSWRITE(LINE,LEN)    
-  130       CONTINUE
-         ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  Blank out COUT in case some compilers dont
-C-----------------------------------------------------------------------
-      DO 140 I = 1,20
-        COUT(I) = ' '
-  140 CONTINUE
-      RETURN
-10000 FORMAT (A,' ',$)
-10100 FORMAT (A,$)
-10200 FORMAT (A)
-      END 
-C-----------------------------------------------------------------------
-C  Function to return the length of a character string 
-C-----------------------------------------------------------------------
-      INTEGER FUNCTION LINELN (STRING)
-      CHARACTER STRING*(*)
-      DO 10 I = LEN(STRING),1,-1
-         IF (STRING(I:I) .NE. ' ') GO TO 20
-10    CONTINUE
-      I = 0
-20    LINELN = I
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C   GETLIN  Read a line of input from the keyboard 
-C-----------------------------------------------------------------------
-      SUBROUTINE GETLIN (STRING)
-      COMMON /IOUASS/ IOUNIT(10)
-      CHARACTER STRING*(*)
-      INTEGER LINE(132), LEN, I
-      CALL SICSGETLINE(LINE,LEN)
-      DO 100, I = 1, LEN
-        STRING(I:I) = CHAR(LINE(I))
- 100  CONTINUE   
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  WNTEXT  Output text to a window
-C-----------------------------------------------------------------------
-      SUBROUTINE WNTEXT (STRING)
-      COMMON /IOUASS/ IOUNIT(10)
-      CHARACTER STRING*(*)
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  SCROLL Output a new-line
-C-----------------------------------------------------------------------
-      SUBROUTINE SCROLL
-      COMMON /IOUASS/ IOUNIT(10)
-      RETURN
-      END
-
diff --git a/difrac/sysang.f b/difrac/sysang.f
deleted file mode 100644
index ba6de485..00000000
--- a/difrac/sysang.f
+++ /dev/null
@@ -1,74 +0,0 @@
-C-----------------------------------------------------------------------
-C  Decide on the crystal system based on the cell edges and angles
-C-----------------------------------------------------------------------
-      SUBROUTINE ANGSYS (ABC,SANG,CANG,ISYS)
-      DIMENSION ABC(3),SANG(3),CANG(3),ANG(3)
-      EQUIVALENCE (ABC(1),A), (ABC(2),B), (ABC(3),C),
-     $            (ANG(1),AL),(ANG(2),BE),(ANG(3),GA)
-      DATA RA/57.2958/,TAN/0.1/,TED/0.01/
-C-----------------------------------------------------------------------
-C  Make the angles from their sines and cosines
-C-----------------------------------------------------------------------
-      DO 100 I = 1,3
-        ANG(I) = RA*ATAN2(SANG(I),CANG(I))
-  100 CONTINUE
-      ISYS = 0
-      IF (AMOD(AL - BE) .GT. TAN) THEN
-C-----------------------------------------------------------------------
-C  Monoclinic or triclinic ?
-C-----------------------------------------------------------------------
-        IF (AMOD(AL - GA) .GT. TAN) THEN
-C-----------------------------------------------------------------------
-C  Triclinic
-C-----------------------------------------------------------------------
-          ISYS = 1
-        ELSE
-C-----------------------------------------------------------------------
-C  Monoclinic
-C-----------------------------------------------------------------------
-          ISYS = 2
-        ENDIF
-      ELSE
-C-----------------------------------------------------------------------
-C  Cubic, rhombohedral, hexagonal, tetragonal, or orthorhombic
-C-----------------------------------------------------------------------
-        IF (AMOD(AL - GA) .GT. TAN) THEN
-C-----------------------------------------------------------------------
-C  Hexagonal
-C-----------------------------------------------------------------------
-          ISYS = 5
-        ELSE
-          IF(AMOD(AL - 90.0) .GT. TAN) THEN
-C-----------------------------------------------------------------------
-C  Rhombohedral
-C-----------------------------------------------------------------------
-            ISYS = 6
-          ELSE
-            IF (AMOD(A - B) .GT. TED) THEN
-C-----------------------------------------------------------------------
-C  Orthorhombic
-C-----------------------------------------------------------------------
-              ISYS = 3
-            ELSE
-              IF (AMOD(B - C) .GT. TED) THEN
-C-----------------------------------------------------------------------
-C  Tetragonal
-C-----------------------------------------------------------------------
-                ISYS = 4
-C-----------------------------------------------------------------------
-C  Cubic
-C-----------------------------------------------------------------------
-              ELSE
-                ISYS = 7
-              ENDIF
-            ENDIF
-          ENDIF
-        ENDIF
-      ENDIF
-C-----------------------------------------------------------------------
-C  Just in case !!
-C-----------------------------------------------------------------------
-      IF (ISYS .EQ. 0) ISYS = 1
-      RETURN
-      END
-
\ No newline at end of file
diff --git a/difrac/tcentr.f b/difrac/tcentr.f
deleted file mode 100644
index fb545541..00000000
--- a/difrac/tcentr.f
+++ /dev/null
@@ -1,190 +0,0 @@
-C-----------------------------------------------------------------------
-C  This subroutine controls the automatic alignment of reflections
-C-----------------------------------------------------------------------
-      SUBROUTINE TCENTR (NSTORE)
-      INCLUDE 'COMDIF'
-      DIMENSION THETAS(NSIZE), OMEGS(NSIZE), CHIS(NSIZE),PHIS(NSIZE),
-     $           ITIMS(NSIZE),THETAP(NSIZE),OMEGP(NSIZE),CHIP(NSIZE),
-     $            PHIP(NSIZE)
-      CHARACTER WHICH*6
-      EQUIVALENCE (ACOUNT(        1),THETAS(1)),
-     $            (ACOUNT(  NSIZE+1),OMEGS(1)),
-     $            (ACOUNT(2*NSIZE+1),CHIS(1)),
-     $            (ACOUNT(3*NSIZE+1),PHIS(1)),
-     $            (ACOUNT(4*NSIZE+1),ITIMS(1)),
-     $            (ACOUNT(5*NSIZE+1),THETAP(1)),
-     $            (ACOUNT(6*NSIZE+1),OMEGP(1)),
-     $            (ACOUNT(7*NSIZE+1),CHIP(1)),
-     $            (ACOUNT(8*NSIZE+1),PHIP(1))
-      REAL CURCTS,MAXCTS
-      WIDTH = 1.25
-C-----------------------------------------------------------------------
-C  Read the peaks from disk
-C-----------------------------------------------------------------------
-      CALL ANGRW (0,4,NMAX,160,0)
-C-----------------------------------------------------------------------
-C  Save the current angles for later
-C-----------------------------------------------------------------------
-      DO 100 J = 1,NMAX
-        THETAP(J) = THETAS(J)
-        OMEGP(J)  = OMEGS(J)
-        PHIP(J)   = PHIS(J)
-        CHIP(J)   = CHIS(J)
-  100 CONTINUE
-C-----------------------------------------------------------------------
-C  Centre the NSTORE to NMAX positions
-C-----------------------------------------------------------------------
-      NGOOD = NSTORE - 1
-      DO 210 J = NSTORE,NMAX
-C-----------------------------------------------------------------------
-C  Check if a K or a Q was typed on the terminal
-C-----------------------------------------------------------------------
-        CALL KORQ (IFLAG1)
-        IF (IFLAG1 .NE. 1) THEN
-          KI = 'O4'
-          RETURN
-        ENDIF
-        RTHETA = THETAS(J)
-        ROMEGA = OMEGS(J)
-        RCHI = CHIS(J)
-        RPHI = PHIS(J)
-        WRITE (COUT,10000) J,RTHETA,ROMEGA,RCHI,RPHI
-        CALL GWRITE (ITP,' ')
-        WRITE (LPT,10000) J,RTHETA,ROMEGA,RCHI,RPHI
-        CALL ANGSET (RTHETA,ROMEGA,RCHI,RPHI,NATT,ICOL)
-        THETA = RTHETA
-        OMEGA = ROMEGA
-        CHI = RCHI
-        PHI = RPHI
-C-----------------------------------------------------------------------
-C  Set the angles at the approximate position of the peak and adjust
-C  Phi, Chi and 2Theta to get maximum intensity in the detector.
-C  Sietronics interface works via MAXPOINT; CAD4 via CADCEN
-C-----------------------------------------------------------------------
-C CAD-4 and Sietronics deleted for clarity: Mark Koennecke
-        CALL SHUTTR (99)
-C-----------------------------------------------------------------------
-C  All other machines for the moment
-C  Modified: Mark Koennecke for TRICS
-C  Do initial search. But use the results of the searches
-C  only if they improved the countrate.
-C-----------------------------------------------------------------------
-          CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-          CALL CCTIME (PRESET,CURCTS)
-C----- first two theta          
-          RTIM = PRESET
-          CALL TFIND(RTIM,MAXCTS)
-          IF(MAXCTS .LT. CURCTS) THEN
-            THETA = RTHETA
-            OMEGA    = ROMEGA
-          ELSE
-            CURCTS = MAXCTS
-          ENDIF
-          CALL KORQ (IFLAG1)
-          IF (IFLAG1 .NE. 1) THEN
-            KI = 'O4'
-            RETURN
-          ENDIF
-C----- now phi
-          RTIM = PRESET
-          CALL PFIND(RTIM,MAXCTS)
-          IF(MAXCTS .LT. CURCTS) THEN
-            PHI = RPHI
-          ELSE
-            CURCTS = MAXCTS
-          ENDIF
-          CALL KORQ (IFLAG1)
-          IF (IFLAG1 .NE. 1) THEN
-            KI = 'O4'
-            RETURN
-          ENDIF
-C------ finally phi
-          RTIM = PRESET
-          CALL CFIND(RTIM,MAXCTS)
-          IF(MAXCTS .LT. CURCTS) THEN
-           CHI  = RCHI
-          ELSE
-            CURCTS = MAXCTS
-          ENDIF
-          CALL KORQ (IFLAG1)
-          IF (IFLAG1 .NE. 1) THEN
-            KI = 'O4'
-            RETURN
-          ENDIF
-C------- end of pre centering
-        WRITE (COUT,11000) THETA,OMEGA,CHI,PHI
-        CALL GWRITE (ITP,' ')
-        WRITE (LPT,11000) THETA,OMEGA,CHI,PHI
-        CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-C-----------------------------------------------------------------------
-C  Save the tweaked positions to make life a little easier later
-C-----------------------------------------------------------------------
-        THETAP(J) = THETA
-        OMEGP(J)  = OMEGA
-        CHIP(J)   = CHI
-        PHIP(J)   = PHI
-        CALL ANGRW (1,4,NMAX,160,1)
-C-----------------------------------------------------------------------
-C  Now proceed with the conventional alignment with defaults appropriate
-C  to fully open windows
-C  The steps are adapted to the 2-Theta angle. 
-C-----------------------------------------------------------------------
-        AFRAC = 0.5
-        CON = IFRDEF
-        CON = 10.0/(IFRDEF*THETA)
-        DT = 10.0*CON
-        DO =  5.0*CON
-        DC = 50.0*CON
-        IF(PRESET .LT. 1000) PRESET = 1000.0
-C        IF (TIME .LT. 0.10) TIME = 0.10
-C        IF (TIME .GT. 3.0) GO TO 200
-        NATT = 0
-        IF (CHI .LT.   0.0) CHI = CHI + 360.0
-        IF (CHI .GT. 360.0) CHI = CHI - 360.0
-        IF (PHI .LT.   0.0) PHI = PHI + 360.0
-        IF (PHI .GT. 360.0) PHI = PHI - 360.0
-        CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-        ISLIT = 0
-        IF (DFMODL .EQ. 'CAD4') ISLIT = 40
-        CALL WXW2T (DT,DO,DC,ISLIT)
-        COUNT = 0
-        ITIMS(J) = 0
-        IF (KI .EQ. 'FF') GO TO 200
-C-----------------------------------------------------------------------
-C  Position on the peak and count for standard preset
-C-----------------------------------------------------------------------
-        CALL ANGSET (RTHETA,ROMEGA,RCHI,RPHI,NATT,ICOL)
-        CALL SHUTTR (99)
-        CALL CCTIME (PRESET,COUNT)
-        ICOUNT = COUNT
-C-----------------------------------------------------------------------
-C  Do not save a weak count
-C-----------------------------------------------------------------------
-        IF (ICOUNT .LT. 100) GO TO 200
-        WRITE (COUT,12000) RTHETA,ROMEGA,RCHI,RPHI,ICOUNT
-        CALL GWRITE (ITP,' ')
-        WRITE (LPT,12000) RTHETA,ROMEGA,RCHI,RPHI,ICOUNT
-C-----------------------------------------------------------------------
-C  If the alignment was successful, remember it
-C-----------------------------------------------------------------------
-        THETAP(J) = RTHETA
-        OMEGP(J)  = ROMEGA
-        CHIP(J)   = RCHI
-        PHIP(J)   = RPHI
-        CALL ANGRW (1,4,NMAX,160,1)
-        NGOOD = NGOOD + 1
-        THETAS(NGOOD) = RTHETA
-        OMEGS(NGOOD)  = ROMEGA
-        CHIS(NGOOD)   = RCHI
-        PHIS(NGOOD)   = RPHI
-        ITIMS(NGOOD)  = COUNT
-        CALL ANGRW (1,5,NGOOD,140,0)
-  200   CALL SHUTTR (-99)
-  210 CONTINUE
-      KI = 'O4'
-      RETURN
-10000 FORMAT (/' Peak',I4,' Coarse Setting ',4F10.3)
-11000 FORMAT (   '          Approximate    ',4F10.3)
-12000 FORMAT (   '          Final Values   ',4F10.3,I10)
-13000 FORMAT (' Coarse centering failure in ',A)
-      END
diff --git a/difrac/tfind.f b/difrac/tfind.f
deleted file mode 100644
index bf27a702..00000000
--- a/difrac/tfind.f
+++ /dev/null
@@ -1,59 +0,0 @@
-C-----------------------------------------------------------------------
-C  Find the Coarse setting for 2-Theta
-C-----------------------------------------------------------------------
-      SUBROUTINE TFIND (TIM, MAXCOUNT)
-      INCLUDE 'COMDIF'
-      REAL MAXCOUNT, MCOUNT
-      DIMENSION TCOUNT(NSIZE)
-      EQUIVALENCE (ACOUNT(9*NSIZE+1),TCOUNT(1))
-      STEPM = 0.01
-      SENSE = -1.0
-      TSTEP = 0.25
-      NATT = 0
-      NPTS = 10
-      NRUN = 0
-100   THEOFF = THETA
-      OMEOFF = OMEGA
-      CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-      ICOUNT = 0
-      MCOUNT = 0
-      DO 110 I = 1,NPTS
-        CALL CCTIME (TIM,TCOUNT(I))
-        CALL KORQ (IFLAG1)
-        IF (IFLAG1 .NE. 1) THEN
-          KI = 'O4'
-          RETURN
-        ENDIF
-        IF (TCOUNT(I) .GT. MCOUNT) THEN
-          MCOUNT = TCOUNT(I)
-          ICOUNT = I
-        ENDIF
-        THETA = THETA + SENSE*TSTEP
-        OMEGA = OMEGA - SENSE*TSTEP*0.5
-        CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
-  110 CONTINUE
-      MAXCOUNT = MCOUNT
-      IF (ICOUNT .EQ. 1) THEN
-C 
-C try, the other direction. But only once as checked by NRUN
-C otherwise we end in an endless loop.
-C
-        IF (NRUN .GT. 0) THEN
-           MAXCOUNT = 0.
-           RETURN
-        ENDIF
-        SENSE = -SENSE
-        THETA = THEOFF + 9.0*SENSE*TSTEP
-        OMEGA = OMEOFF - 9.0*SENSE*TSTEP/2
-        NRUN = NRUN + 1
-        GO TO 100
-      ENDIF
-      IF (ICOUNT .EQ. 10) THEN
-        THETA = THEOFF - 3.0*SENSE*TSTEP
-        OMEGA = OMEOFF + 3.0*SENSE*TSTEP/2
-        GO TO 100
-      ENDIF
-      THETA = THEOFF + ICOUNT*SENSE*TSTEP
-      OMEGA = OMEOFF - ICOUNT*SENSE*TSTEP/2
-      RETURN
-      END
diff --git a/difrac/trics.f b/difrac/trics.f
deleted file mode 100644
index 2e03d00e..00000000
--- a/difrac/trics.f
+++ /dev/null
@@ -1,354 +0,0 @@
-C-----------------------------------------------------------------------
-C  RALF Routines for TRICS running SICS
-C       interface.
-C
-C  Mark Koennecke, November 1999
-C
-C-----------------------------------------------------------------------
-      SUBROUTINE HKLN (I1, I2, I3, I4)
-      J1 = I1
-      J2 = I2
-      J3 = I3
-      J4 = I4
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  INTON This routine must be called before any others and may be 
-C        used to initialise the diffractometer
-C-----------------------------------------------------------------------
-      SUBROUTINE INTON
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  INTOFF -- clean up the interface
-C-----------------------------------------------------------------------
-      SUBROUTINE INTOFF
-      return
-      end
-C-----------------------------------------------------------------------
-C  ZERODF In case of an error this routine returns the diffractometer
-C         to a known state
-C-----------------------------------------------------------------------
-      SUBROUTINE ZERODF
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  CTIME  Count for a fixed time
-C-----------------------------------------------------------------------
-      SUBROUTINE CCTIME (XTIME, XCOUNT)
-      REAL XTIME, XCOUNT
-      INCLUDE 'COMDIF'
-      call setslt (icadsl,icol)
-      CALL SICSCOUNT(XTIME,XCOUNT)
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  ANGET  Read the angles
-C-----------------------------------------------------------------------
-      SUBROUTINE ANGET (WTWOTH, WOMEGA, WCHI, WPHI)
-      include 'COMDIF'
-      CALL SICSANGET(WTWOTH,WOMEGA,WCHI,WPHI)
-      wtwoth = wtwoth - dtheta
-      womega = womega - wtwoth/2. - domega 
-      wchi   = wchi   - dchi
-      wphi   = wphi   - dphi
-      if (wtwoth .lt. 0.0) wtwoth = wtwoth + 360.00
-      if (womega .lt. 0.0) womega = womega + 360.00
-      if (wchi   .lt. 0.0) wchi   = wchi   + 360.00
-      if (wphi   .lt. 0.0) wphi   = wphi   + 360.00
-      RETURN
-      END
-C----------------------------------------------------------------------
-C ANGCHECK check the angles against hardware or software limits
-C----------------------------------------------------------------------- 
-      SUBROUTINE ANGCHECK (WTHETA, WOMEGA, WCHI, WPHI, INVALID)
-      include 'COMDIF'
-      atheta = wtheta + dtheta
-      aomega = womega + domega + wtheta/2.0
-      achi   = wchi   + dchi
-      aphi   = wphi   + dphi  
-      if (atheta .gt. 180.00) atheta = atheta - 360.00
-      if (aomega .gt. 180.00) aomega = aomega - 360.00
-      IF(ACHI .LT. 0)ACHI = ACHI + 360.
-      IF(APHI .GT. 360.)APHI = APHI - 360.
-      IF(APHI .LT. 0) APHI = APHI + 360.
-      CALL SICSANGCHECK(ATHETA,AOMEGA,ACHI,APHI,INVALID)
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  ANGSET Set the angles
-C-----------------------------------------------------------------------
-      SUBROUTINE ANGSET (WTHETA, WOMEGA, WCHI, WPHI, NATTW, ICOL)
-      include 'COMDIF'
-      ishutf = 0
-      if (nattw .gt. 0) then
-        iattf = 1
-      else
-        iattf = 0
-      endif
-      atheta = wtheta + dtheta
-      aomega = womega + wtheta/2. + domega
-      achi   = wchi   + dchi
-      aphi   = wphi   + dphi  
-      if (atheta .gt. 180.00) atheta = atheta - 360.00
-      if (aomega .gt. 180.00) aomega = aomega - 360.00
-      IF(ACHI .LT. 0)ACHI = ACHI + 360.
-      IF(APHI .GT. 360.)APHI = APHI - 360.
-      IF(APHI .LT. 0) APHI = APHI + 360.
-      CALL SICSANGSET(ATHETA,AOMEGA,ACHI,APHI,ICOL)
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  SHUTR  Open or close the shutter
-C         IOC = 1 open, 2 close
-C         INF = 0 OK
-C-----------------------------------------------------------------------
-      SUBROUTINE SHUTR (IOC, INF)
-      INF = 0
-      IF (IOC .EQ. 1) THEN
-         ISHUTF = 1
-      ELSE
-         ISHUTF = 0
-      ENDIF
-      RETURN
-      END
-
-      SUBROUTINE ONEBEP(R1,R2)
-      CHARACTER CTRLG*1
-      RETURN
-      END
-
-C-----------------------------------------------------------------------
-C  KORQ -- Read the keyboard buffer
-C          If it contains K|k|Q|q return: 0 = K
-C                                         1 = nothing found
-C                                         2 = Q
-C
-C          KORQ will toggle the switch registers 1-9,0 if the numeric
-C          keys are found in the buffer.
-C-----------------------------------------------------------------------
-      SUBROUTINE KORQ (I1)
-      INCLUDE 'COMDIF'
-      CHARACTER STRING*80
-      LOGICAL SWFND,SAVED,SWCALL
-      DATA SAVED/.FALSE./
-      SWFND = .FALSE.
-C-----------------------------------------------------------------------
-C  First check if we are making a regular call after a K or Q has been
-C  found from a call from RSW.
-C-----------------------------------------------------------------------
-      CALL CHECKINT(I1) 
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  RSW  Read the switch register
-C-----------------------------------------------------------------------
-      SUBROUTINE RSW (N,IVALUE)
-      INCLUDE 'COMDIF'
-      IVALUE = ISREG(N)
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C Initialise the Program
-C-----------------------------------------------------------------------
-      SUBROUTINE INITL(R1,R2,R3,R4)
-      A1 = R1
-      A2 = R2
-      A3 = R3
-      A4 = R4
-      RETURN
-      END
-C--------------------------------------------------------------------
-C  Routine to perform scans.
-C       ITYPE     Scan type --  0 or 2  Omega/2-theta
-C                               1 or 3  Omega
-C       SCNANG    Angle to scan in degrees.  This should be the
-C                 2theta range for an omega-2theta scan and the
-C                 omega range for an omega scan.
-C       ACOUNT    Returns total intensity in ACOUNT(1) and profile
-C                 in ACOUNT(2)-ACOUNT(NPPTS+1)
-C       TIME      Total scan time in secs
-C       SPEED     Scan speed in degs/min.
-C       NPPTS     Number of points in the profile on output
-C       IERR      Error code  0 -- O.K.
-C                             1 -- Collision
-C                             2 or more really bad!
-C--------------------------------------------------------------------
-      SUBROUTINE TSCAN (ITYPE,SCNANG,ACOUNT,PRESET,STEP,NPPTS,IERR)
-      COMMON /DFMACH/ ISCDEF,ICDDEF,IDTDEF,IDODEF,IDCDEF,IFRDEF,NRC,
-     $                NATTEN,STEPDG,ICADSL,ICADSW
-      DIMENSION ACOUNT(*)
-      REAL THSTART, OMSTART, CHI, PHI, TH, OM
-      INTEGER ICOL, IT
-C--------------------------------------------------------------------
-C  Version 0.50  Supports itype = 0 or 1 omega-2theta and
-C                                 2 or 3 omega
-C                in both cases IANGLE is omega at the end of the scan
-C
-C  Version 0.6   Modified to be a generic routine using ANGSET and
-C                CTIME for doing the scans. This ammounts to a simple
-C                step scan. This is the only useful thing for TRICS
-C                at SINQ.
-C                PRESET is the preset for counting. 
-C                STEP is the scan step width.
-C--------------------------------------------------------------------
-      IERR = 0
-C--------------------------------------------------------------------
-C  The diffractometer should have been positioned at the beginning
-C  position for the scan.
-C--------------------------------------------------------------------
-      CALL SETSLT (ICADSL,ICOL)
-      isense = 1
-      if (scnang .lt. 0.0) then
-        isense = -1
-        scnang = - scnang
-      endif
-      NPPTS = INT(SCNANG/STEP)
-      CALL ANGET(THSTART,OMSTART,CHI,PHI)
-      IF (ITYPE .EQ. 0 .OR. ITYPE .EQ. 1) THEN
-         MODE = 0
-C--------------------------------------------------------------------
-C  Omega scan
-C--------------------------------------------------------------------
-      ELSE IF (ITYPE .EQ. 2 .OR. ITYPE .EQ. 3) THEN
-         MODE = 2
-      ELSE
-         IERR = 2
-         RETURN
-      ENDIF
-C--------------------------------------------------------------------
-C  Setup complete -- do the scan
-C--------------------------------------------------------------------
-      ACOUNT(1) = 0.
-      DO 200, I = 1, NPPTS
-C----- position 
-        IF(MODE .EQ. 0) THEN
-          TH = THSTART + ISENSE*I*STEP
-          OM = 0
-        ELSE IF(MODE .EQ. 2)THEN
-          TH = THSTART
-          OM = OMSTART + ISENSE*I*STEP
-        ENDIF   
-        CALL ANGSET(TH,OM,CHI,PHI,1,ICOL)
-        IF(ICOL .GT. 0)THEN
-          IERR = 2
-          RETURN
-        ENDIF
-C----- count
-        CALL CCTIME(PRESET,COUNT)
-        CALL KORQ(IT)
-        IF(IT .NE. 1)THEN
-           IERR = 2
-           RETURN
-        ENDIF
-        ACOUNT(I+1) = COUNT
-        ACOUNT(1) = ACOUNT(1) + COUNT
- 200  CONTINUE   
-      return
-      end
-C--------------------------------------------------------------------
-C  Routine to display a peak profile in the current graphics window.
-C  The arguments are:
-C
-C  NHIST     The number of points to be plotted
-C  HIST      An array of points
-C  IHTAGS(4) The calculated peak position, the experimental position,
-C            low background limit and high background limit.
-C--------------------------------------------------------------------
-      SUBROUTINE PTPREP (NHIST,HIST,IHTAGS)
-      INTEGER   IHTAGS(4)
-      REAL      HIST(*)
-      INTEGER   IX,IY,IZ
-      CHARACTER STRING*80
-      RETURN
-      END
-C-------------------------------------------------------------------
-C     RPSCAN  Ralf support for PSCAN routine
-C PHI scan from -90 to 90 with a step of 2.
-C-------------------------------------------------------------------
-      SUBROUTINE RPSCAN (NPTS,ICOL,SPRESET)
-      INCLUDE 'COMDIF'
-      INTEGER IDIR,I,IT
-      REAL WTH,WOM,WCHI,WPHI, STEP, PHI,SPRESET
-      STEP = 2.
-C-------------------------------------------------------------------
-C     Get the current angles and decide which direction to scan
-C-------------------------------------------------------------------
-      CALL ANGET (WTH,WOM,WCHI,WPHI)
-C------------------------------------------------------------------
-C have the scan go always from 270 - 90 region as TRICS may have 
-C restrictions around 0.
-C------------------------------------------------------------------ 
-      WPHI    = 270.00
-      TARGET  =  90.00
-      IDIR   = -1
-      NPTS = 90
-C-------------------------------------------------------------------
-C     Now do the scan
-C-------------------------------------------------------------------
-      ACOUNT(1) = 0.
-      DO 200, I = 1, NPTS
-C----- position 
-        PHI = WPHI + I*IDIR*STEP
-        CALL ANGSET(WTH,WOM,WCHI,PHI,1,ICOL)
-        IF(ICOL .GT. 0)THEN
-          IERR = 2
-          RETURN
-        ENDIF
-C----- count
-        CALL CCTIME(SPRESET,COUNT)
-        CALL KORQ(IT)
-        IF(IT .NE. 1)THEN
-           IERR = 2
-           RETURN
-        ENDIF
-        ACOUNT(I) = COUNT
-        ACOUNT(5*NSIZE+I) = PHI
- 200  CONTINUE   
-      RETURN
-      END
-C-------------------------------------------------------------------
-C special to some strange diffractometer, just keep the linker happy
-C-------------------------------------------------------------------
-      SUBROUTINE MAXPOINT (IAXIS,WIDTH,STEPS,ANGLE)
-      RETURN
-      END
-C-----------------------------------------------------------------------
-C  GENSCN Routine to perform a scan of a given motor
-C         ICIRCL  1 -- 2-theta       ISLIT   0 -- Nothing       
-C                 2 -- omega                 1 -- Vertical
-C                 3 -- kappa                 2 -- Horizontal
-C                 4 -- phi                   3 -- +45 deg
-C                                            4 -- -45 deg
-C                                            5 -- Upper 1/2 circle
-C                                            6 -- Lower 1/2 circle
-C                                     10 to 59 -- horiz. aperture in mms
-C         SPEED Speed in degrees per minute
-C         STEP  Step width in degrees, NPTS number of steps
-C         ICOL  0 -- OK
-C         GENSCN is also only valid for CAD4
-C-----------------------------------------------------------------------
-      SUBROUTINE GENSCN (ICIRCL, WSPEED, WSTEP, NPTS, ISLIT, ICOL)
-      return
-      end
-C-----------------------------------------------------------------------
-C  SETSLT -- Set the slits
-C cannot set slits at TRICS: NOT motorized
-C-----------------------------------------------------------------------
-      subroutine setslt (islt,icol)
-      return
-      end
-C-----------------------------------------------------------------------
-C  Set the microscope viewing position (CAD-4 version)
-C-----------------------------------------------------------------------
-      SUBROUTINE VUPOS (VTH,VOM,VCH,VPH)
-      CALL ANGSET(VTH,VOM,VCH,VPH,1,1)
-      RETURN
-      END
-
-
-
-
-
-
-
diff --git a/difrac/wrbas.f b/difrac/wrbas.f
deleted file mode 100644
index c9ac029a..00000000
--- a/difrac/wrbas.f
+++ /dev/null
@@ -1,77 +0,0 @@
-C-----------------------------------------------------------------------
-C   Routine to read and write the basic data to and from IDATA.DA
-C-----------------------------------------------------------------------
-      SUBROUTINE WRBAS
-      INCLUDE 'COMDIF'
-C-----------------------------------------------------------------------
-C  If called from ANGVAL or RB read from IDATA
-C  If called from RB, read from IDATA after confirming
-C  As of 18-Jun-94 record 1 has 84 variables,
-C                  record 2     85     "      (5-Oct-95)
-C                  record 3     85     "
-C-----------------------------------------------------------------------
-      IF (KI .EQ. 'AN' .OR. KI .EQ. 'RB') THEN
-        IF (KI .EQ. 'RB') THEN
-          WRITE (COUT,10000)
-          CALL YESNO ('Y',ANS)
-          IF (ANS .EQ. 'N') THEN
-            KI = ' '
-            RETURN
-          ENDIF
-        ENDIF
-        READ (IID,REC=1) R,WAVE,DCHI,DOMEGA,DTHETA,THEMIN,THEMAX,
-     $                   AS,BS,CS,DPSI,PSIMIN,PSIMAX,PRESET,QTIME,
-     $                   TMAX,PA,PM,IHMAX,IKMAX,ILMAX,NCOND,ICOND,
-     $                   IHS,IKS,ILS,IR,IS,STEP,STEPOF,
-     $                   DFTYPE,DFMODL,NSTAN,NINTRR,
-     $                   IHSTAN,IKSTAN,ILSTAN
-        READ (IID,REC=2) NSEG,NMSEG,
-     $                   NREF,NMSTAN,NBLOCK,IHO,IKO,ILO,IND,ITYPE,
-     $                   AP,APS,CANGS,SANGS,CANG,SANG,JMIN,JMAX,
-     $                   RTHETA,ROMEGA,RCHI,RPHI,IH,IK,IL,
-     $                   NINTOR,REOTOL,NATTEN,ATTEN,ICADSL,ICADSW
-        READ (IID,REC=3) IDH,ISCAN,FRAC,IBSECT,IPRFLG,ISYS,SINABS,
-     $                   ILN,DELAY
-        READ (IID,REC=10) SGSYMB
-        IF (KI .EQ. 'RB') KI = ' '
-      ELSE
-C-----------------------------------------------------------------------
-C  If called from GOLOOP, or WB, or creating file, write to IDATA 
-C  If called from WB, write to IDATA after confirming
-C-----------------------------------------------------------------------
-        IF (KI .EQ. 'WB') THEN
-          WRITE (COUT,11000)
-          CALL YESNO ('Y',ANS)
-          IF (ANS .EQ. 'N') THEN
-            KI = ' '
-            RETURN
-          ENDIF
-        ENDIF
-        CALL ANGET (RTHETA,ROMEGA,RCHI,RPHI)
-        WRITE (IID,REC=1) R,WAVE,DCHI,DOMEGA,DTHETA,THEMIN,THEMAX,
-     $                    AS,BS,CS,DPSI,PSIMIN,PSIMAX,PRESET,QTIME,
-     $                    TMAX,PA,PM,IHMAX,IKMAX,ILMAX,NCOND,ICOND,
-     $                    IHS,IKS,ILS,IR,IS,STEP,STEPOF,
-     $                    DFTYPE,DFMODL,NSTAN,NINTRR,
-     $                    IHSTAN,IKSTAN,ILSTAN
-        WRITE (IID,REC=2) NSEG,NMSEG,
-     $                    NREF,NMSTAN,NBLOCK,IHO,IKO,ILO,IND,ITYPE,
-     $                    AP,APS,CANGS,SANGS,CANG,SANG,JMIN,JMAX,
-     $                    RTHETA,ROMEGA,RCHI,RPHI,IH,IK,IL,
-     $                    NINTOR,REOTOL,NATTEN,ATTEN,ICADSL,ICADSW
-        WRITE (IID,REC=3) IDH,ISCAN,FRAC,IBSECT,IPRFLG,ISYS,SINABS,
-     $                    ILN,DELAY
-        WRITE (IID,REC=10) SGSYMB
-C-----------------------------------------------------------------------
-C  Now force an update of the directory by closing and reopening IID 
-C-----------------------------------------------------------------------
-        IDREC = 85*IBYLEN
-        STATUS = 'OD'
-        CALL IBMFIL (IDNAME,-IID,IDREC,STATUS,IERR)
-        CALL IBMFIL (IDNAME, IID,IDREC,STATUS,IERR)
-        IF (KI .EQ. 'WB') KI = ' '
-      ENDIF
-      RETURN
-10000 FORMAT (' Read the Basic Data (Y) ? ',$)
-11000 FORMAT (' Write the Basic Data (Y) ? ',$)
-      END
diff --git a/difrac/wxw2t.f b/difrac/wxw2t.f
deleted file mode 100644
index d392eb6c..00000000
--- a/difrac/wxw2t.f
+++ /dev/null
@@ -1,85 +0,0 @@
-C-----------------------------------------------------------------------
-C  Routine to align a reflection as follows :--
-C  1. For Euler 4-circle machines.
-C     Centre omega, omega/2theta, chi, omega, 2omega/-theta.
-C  2. For Kappa machines.
-C     Centre omega/2theta, theta(-45slit), theta(+45slit)
-C-----------------------------------------------------------------------
-      SUBROUTINE WXW2T (DT,DO,DC,ISLIT)
-      INCLUDE 'COMDIF'
-      DIMENSION ANG(4)
-      CALL SHUTTR (99)
-C----- a fixed value for PHI alignement, MK   
-      DP = .1  
-C----- debug message: MK   
-      WRITE(COUT,22)DT, DO, DC
- 22   FORMAT('STEP OM: ',F8.2,' Step TH: ',F8.2,' Step CH: ',F8.2)
-      CALL GWRITE(ITP,' ')
-C-----------------------------------------------------------------------
-C  For the CAD-4 centering is as follows :--
-C    1. an omega/2theta scan with the 4mm variable slit,
-C    2. a) a 2theta scan with the negative 45deg slit,
-C       b) a 2theta scan with the positive 45deg slit.
-C       c) the best 2theta and chi values are then calculated.
-C-----------------------------------------------------------------------
-      IF (DFMODL .EQ. 'CAD4') THEN
-        KI = 'WT'
-        CALL CENTRE (DT,ANG,ISLIT)
-        IF (KI .EQ. 'FF') GO TO 100
-        KI = 'ST'
-        CALL CENTRE (DT,ANG,0)
-        IF (KI .EQ. 'FF') GO TO 100
-      ELSE
-C-----------------------------------------------------------------------
-C  Align Omega
-C-----------------------------------------------------------------------
-        KI = 'SO'
-        CALL CENTRE (DO,ANG,0)
-        IF (KI .EQ. 'FF') GO TO 100
-C-----------------------------------------------------------------------
-C  Align 2Theta the first time (Insert 7-May-81)
-C-----------------------------------------------------------------------
-        KI = 'ST'
-        CALL CENTRE (DT,ANG,0)
-        IF (KI .EQ. 'FF') GO TO 100
-C-----------------------------------------------------------------------
-C  Align Chi
-C-----------------------------------------------------------------------
-        KI = 'SC'
-        CALL CENTRE (DC,ANG,0)
-        IF (KI .EQ. 'FF') GO TO 100
-C-----------------------------------------------------------------------
-C  Align Phi
-C----------------------------------------------------------------------
-       KI = 'SP'
-       CALL CENTRE(DP,ANG,0)
-       IF (KI .EQ. 'FF') GO TO 100
-C-----------------------------------------------------------------------
-C  Omega again
-C-----------------------------------------------------------------------
-        KI = 'SO'
-        CALL CENTRE (DO,ANG,0)
-        IF (KI .EQ. 'FF') GO TO 100
-        IF (KI .EQ. 'FP') GO TO 100
-C-----------------------------------------------------------------------
-C  Align 2Theta
-C----------------------------------------------------------------------
-        KI = 'ST'
-        CALL CENTRE (DT,ANG,0)
-        IF (KI .EQ. 'FF') GO TO 100
-        IF (KI .EQ. 'FP') GO TO 100
-      ENDIF
-C-----------------------------------------------------------------------
-C  The answers are passed in BPSI in COMMON
-C-----------------------------------------------------------------------
-      RTHETA = ANG(1)
-      ROMEGA = ANG(2)
-      RCHI = ANG(3)
-      RPHI = ANG(4)
-      THETA = RTHETA
-      OMEGA = ROMEGA
-      CHI   = RCHI
-      PHI   = RPHI
-  100 CALL SHUTTR (-99)
-      RETURN
-      END
diff --git a/difrac/yesno.f b/difrac/yesno.f
deleted file mode 100644
index 068f6550..00000000
--- a/difrac/yesno.f
+++ /dev/null
@@ -1,48 +0,0 @@
-C-----------------------------------------------------------------------
-C  Routine YESNO to get Yes/No (Y or N) answers to questions.
-C  It is called with two parameters :--
-C   1. DEFOLT  is set to 'Y', 'N'  or '$' by the caller depending
-C      on the expected default;
-C   2. ANSWER  is the value of the returned answer.
-C 
-C  Responses are filtered so that only blank, null (i.e. CR ), Y, y, 
-C  N or n are acceptable answers at the terminal. 
-C  If DEFOLT is set to '$' the typed answer must be Y, y, N or n, 
-C  no default is allowed.
-C  If the character typed is a question mark the routine exits to the
-C  system monitor.
-C
-C  Version modified to support non-Fortran screen I/O 
-C-----------------------------------------------------------------------
-      SUBROUTINE YESNO (DEFOLT,ANS)
-      COMMON /IOUASS/ IOUNIT(12)
-      CHARACTER*132 COUT(20)
-      COMMON /IOUASC/ COUT
-      CHARACTER DEFOLT*1,ANS*1,LINE*80
-      ITR = IOUNIT(5)
-      ITP = IOUNIT(6)
-C-----------------------------------------------------------------------
-C  This code gets round IBM VM/CMS limitations
-C-----------------------------------------------------------------------
-  100 CALL GWRITE (ITP,'$')
-      CALL GETLIN (LINE)
-      ANS=LINE(1:1)
-      IF (ANS .EQ. '?') STOP
-      IF (ANS .EQ. 'y') ANS = 'Y'
-      IF (ANS .EQ. 'n') ANS = 'N'
-      IF ((DEFOLT .EQ. 'Y' .OR. DEFOLT .EQ. 'N') .AND. ANS .EQ. ' ')
-     $     ANS = DEFOLT
-      IF (ANS .EQ. 'Y' .OR. ANS .EQ. 'N') RETURN
-      IF (DEFOLT .EQ. '$') THEN
-        WRITE (COUT,11000)
-        GO TO 100
-      ELSE
-        WRITE (COUT,12000)
-        GO TO 100
-      ENDIF
-10000 FORMAT (A)
-11000 FORMAT (' The typed response must be Y, y, N or n. Try again',
-     $        ' please.')
-12000 FORMAT (' The typed response must be Y, y, N, n or <CR>.',
-     $        ' Try again please.')
-      END
diff --git a/dilludriv.c b/dilludriv.c
deleted file mode 100644
index 800f332e..00000000
--- a/dilludriv.c
+++ /dev/null
@@ -1,272 +0,0 @@
-/*--------------------------------------------------------------------------
-			     D I L L U D R I V
-
-     This file contains the implementation of a driver for the Oxford 
-     Instruments dillution cryostat using the CC0-510/AVSI temperature
-     controller.
-
-  
-      Mark Koennecke, October 1997
-
-       Copyright: see copyright.h
-----------------------------------------------------------------------------*/
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <math.h>
-#include <assert.h>
-#include "fortify.h"
-#include "conman.h"
-#include "servlog.h"
-#include "fortify.h"
-
-  typedef struct __EVDriver  *pEVDriver;
-
-#include "evdriver.i"  
-#include "hardsup/dillutil.h"
-#include "hardsup/el734_def.h"
-#include "hardsup/el734fix.h"
-#include "dilludriv.h"      
-      
-/*-----------------------------------------------------------------------*/
-  typedef struct {
-                   pDILLU pData;
-                   char *pHost;
-                   int iPort;
-                   int iChannel;
-                   int iLastError;
-                   char *pTranslationFile;
-                  } DILLUDriv, *pDILLUDriv;
-/*----------------------------------------------------------------------------*/
-  static int GetDILLUPos(pEVDriver  self, float *fPos)
-  {
-     pDILLUDriv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pDILLUDriv)self->pPrivate;
-     assert(pMe);
-   
-     iRet = DILLU_Read(&pMe->pData,fPos);     
-     if(iRet != 1 )
-     {
-       pMe->iLastError = iRet;
-       return 0;
-     }
-     if( (*fPos < 0) || (*fPos > 1000) )
-     {
-       *fPos = -999.;
-       return 0;
-     }
-     return 1;
-  } 
-/*----------------------------------------------------------------------------*/
-  static int DILLURun(pEVDriver self, float fVal)
-  {
-     pDILLUDriv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pDILLUDriv )self->pPrivate;
-     assert(pMe);
-
-     iRet  = DILLU_Set(&pMe->pData,fVal);
-     if(iRet != 1)
-     {
-       pMe->iLastError = iRet;
-       return 0;
-     }
-     return 1;
- }
-/*--------------------------------------------------------------------------*/
-  static int DILLUError(pEVDriver self, int *iCode, char *error, int iErrLen)
-  {
-     pDILLUDriv pMe = NULL;
-     
-     assert(self);
-     pMe = (pDILLUDriv)self->pPrivate;
-     assert(pMe);
-
-     *iCode = pMe->iLastError;
-     DILLU_Error2Text(&pMe->pData,pMe->iLastError,error,iErrLen);    
-    
-    return 1;
-  }
-/*--------------------------------------------------------------------------*/
-  static int DILLUSend(pEVDriver self, char *pCommand, char *pReply, int iLen)
-  {
-     pDILLUDriv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pDILLUDriv )self->pPrivate;
-     assert(pMe);
-
-     iRet  = DILLU_Send(&pMe->pData,pCommand, pReply,iLen);
-     if(iRet != 1)
-     {
-       pMe->iLastError = iRet;
-       return 0;
-     }
-     return 1;
-
-  }  
-/*--------------------------------------------------------------------------*/
-  static int DILLUInit(pEVDriver self)
-  {
-     pDILLUDriv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pDILLUDriv )self->pPrivate;
-     assert(pMe);
-
-     pMe->pData = NULL;
-     iRet = DILLU_Open(&pMe->pData, pMe->pHost, pMe->iPort, pMe->iChannel,
-                       0,pMe->pTranslationFile);
-     if(iRet != 1)
-     {
-         pMe->iLastError = iRet;
-         return 0;
-     }
-     DILLU_Config(&pMe->pData, 1000);
-     return 1;
-  }  
-/*--------------------------------------------------------------------------*/
-  static int DILLUClose(pEVDriver self)
-  {
-     pDILLUDriv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pDILLUDriv )self->pPrivate;
-     assert(pMe);
-
-     DILLU_Close(&pMe->pData);
-     return 1;
-  }  
-/*---------------------------------------------------------------------------*/
-  static int DILLUFix(pEVDriver self, int iError)
-  {
-     pDILLUDriv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pDILLUDriv )self->pPrivate;
-     assert(pMe);
-
-        switch(iError)
-        {
-            /* network errors */
-            case EL734__BAD_FLUSH:
-            case EL734__BAD_RECV:
-            case EL734__BAD_RECV_NET:
-            case EL734__BAD_RECV_UNKN:
-            case EL734__BAD_RECVLEN:
-            case EL734__BAD_RECV1:
-            case EL734__BAD_RECV1_PIPE:
-            case EL734__BAD_RNG:
-            case EL734__BAD_SEND:
-            case EL734__BAD_SEND_PIPE:
-            case EL734__BAD_SEND_NET:
-            case EL734__BAD_SEND_UNKN:
-            case EL734__BAD_SENDLEN:
-                      DILLUClose(self);
-                      iRet = DILLUInit(self);
-                      if(iRet)
-                      {
-                        return DEVREDO;
-                      }                 
-                      else
-                      {
-                        return DEVFAULT;
-                      }                 
-                      break;
-            /* handable protocoll errors */
-            case EL734__BAD_TMO:
-                      return DEVREDO;
-                      break;
-            case DILLU__NODILLFILE:
-            case DILLU__ERRORTABLE:
-            case DILLU__READONLY:
-            case DILLU__OUTOFRANGE:
-            case DILLU__BADMALLOC:          
-            case DILLU__FILENOTFOUND:
-                      return DEVFAULT;
-            case DILLU__BADREAD:
-            case DILLU__SILLYANSWER:
-                       return DEVREDO;                                        
-            default:
-                      return DEVFAULT;
-                      break;                       
-        }
-        return DEVFAULT;
-  }
-     
-/*--------------------------------------------------------------------------*/
-  static int DILLUHalt(pEVDriver *self)
-  {
-     assert(self);
-     
-     return 1;
-  }
-/*------------------------------------------------------------------------*/
-  void KillDILLU(void *pData)
-  {
-     pDILLUDriv pMe = NULL;
-     
-     pMe = (pDILLUDriv)pData;
-     assert(pMe);
-     
-     if(pMe->pHost)
-     {
-        free(pMe->pHost);
-     }
-     if(pMe->pTranslationFile)
-     {
-       free(pMe->pTranslationFile);
-     }
-     free(pMe);
-  }  
-/*------------------------------------------------------------------------*/
-  pEVDriver CreateDILLUDriv(int argc, char *argv[])
-  {
-     pEVDriver pNew = NULL;
-     pDILLUDriv pSim = NULL;
-     
-     /* check for arguments */
-     if(argc < 3)
-     {
-       return NULL;
-     }
-     
-     pNew = CreateEVDriver(argc,argv);
-     pSim = (pDILLUDriv)malloc(sizeof(DILLUDriv));
-     memset(pSim,0,sizeof(DILLUDriv));
-     if(!pNew || !pSim)
-     {
-       return NULL;
-     }
-     pNew->pPrivate = pSim;
-     pNew->KillPrivate = KillDILLU;
-     
-     /* initalise pDILLUDriver */
-     pSim->iLastError = 0;
-     pSim->pHost = strdup(argv[0]);
-     pSim->iPort = atoi(argv[1]);
-     pSim->iChannel = atoi(argv[2]);
-     pSim->pTranslationFile = strdup(argv[3]);
-     
-     
-     /* initialise function pointers */
-     pNew->SetValue = DILLURun;
-     pNew->GetValue = GetDILLUPos;
-     pNew->Send     = DILLUSend;
-     pNew->GetError = DILLUError;
-     pNew->TryFixIt = DILLUFix;
-     pNew->Init     = DILLUInit;
-     pNew->Close    = DILLUClose;
-     
-     return pNew; 
-  }	
-  
\ No newline at end of file
diff --git a/dilludriv.h b/dilludriv.h
deleted file mode 100644
index 19e0b43c..00000000
--- a/dilludriv.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*------------------------------------------------------------------------
-                      D I L L U D R I V
-                      
-   A SICS driver for thedillution cryostat using the CCO-510/AVSI
-   controller.
-   
-   Mark Koennecke, October 1997
-   
-   copyright: see copyright.h
----------------------------------------------------------------------------*/
-#ifndef DILLUDRIV
-#define DILLUDRIV
-      pEVDriver CreateDILLUDriv(int argc, char *argv[]);
-      
-#endif                       
\ No newline at end of file
diff --git a/dmc.c b/dmc.c
deleted file mode 100644
index 31614cff..00000000
--- a/dmc.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-------------------------------------------------------------------------
-                                D M C  
-
-  this modules purpose is solely to initialise the commands specific to
-  the powder diffractometer DMC.
-
-   Mark Koenencke, March 1997
-   
-       Copyright:
-
-       Labor fuer Neutronenstreuung
-       Paul Scherrer Institut
-       CH-5423 Villigen-PSI
-
-
-      The authors hereby grant permission to use, copy, modify, distribute,
-      and license this software and its documentation for any purpose, provided
-      that existing copyright notices are retained in all copies and that this
-      notice is included verbatim in any distributions. No written agreement,
-      license, or royalty fee is required for any of the authorized uses.
-      Modifications to this software may be copyrighted by their authors
-      and need not follow the licensing terms described here, provided that
-      the new terms are clearly indicated on the first page of each file where
-      they apply.
-
-      IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-      FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-      ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-      DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-      POSSIBILITY OF SUCH DAMAGE.
-
-      THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-      INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-      FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-      IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-      NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-      MODIFICATIONS.
-----------------------------------------------------------------------------*/
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-#include "fortify.h"
-#include "conman.h"
-#include "obdes.h"
-#include "napi.h"
-#include "nxdata.h"
-#include "dmc.h"
-
- int InitDmc(SConnection *pCon, SicsInterp *pSics, void *pData, 
-             int argc, char *argv[])
- {
-     AddCommand(pSics,"StoreData",SNStoreDMC,NULL,NULL);
-     return 1;
- }            
diff --git a/dmc.h b/dmc.h
deleted file mode 100644
index aee4fb39..00000000
--- a/dmc.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-/*-------------------------------------------------------------------------
-                                D M C  
-
-  this modules purpose is solely to initialise the commands specific to
-  the powder diffractometer DMC.
-
-   Mark Koenencke, March 1997
-   
-   copyright: see implementation file.
-
---------------------------------------------------------------------------*/
-#ifndef SICSDMC
-#define SICSDMC
-
- int InitDmc(SConnection *pCon, SicsInterp *pSics, void *pData, 
-             int argc, char *argv[]);
-
-#endif
diff --git a/dmc.tex b/dmc.tex
deleted file mode 100644
index 8e52573b..00000000
--- a/dmc.tex
+++ /dev/null
@@ -1,48 +0,0 @@
-\subsection{DMC module}
-This module initialises all DMC specific commands. Currently there is only
-one: StoreData. This does not do much, it is just here as a container for
-things to come.
-
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap1}
-$\langle$Protos {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@ int InitDmc(SConnection *pCon, SicsInterp *pSics, void *pData, @\\
-\mbox{}\verb@             int argc, char *argv[]);@\\
-\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@"dmc.h"@ {\footnotesize ? }$\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@/*-------------------------------------------------------------------------@\\
-\mbox{}\verb@                                D M C  @\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  this modules purpose is solely to initialise the commands specific to@\\
-\mbox{}\verb@  the powder diffractometer DMC.@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@   Mark Koenencke, March 1997@\\
-\mbox{}\verb@   @\\
-\mbox{}\verb@   copyright: see implementation file.@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@--------------------------------------------------------------------------*/@\\
-\mbox{}\verb@#ifndef SICSDMC@\\
-\mbox{}\verb@#define SICSDMC@\\
-\mbox{}\verb@@$\langle$Protos {\footnotesize ?}$\rangle$\verb@@\\
-\mbox{}\verb@#endif@\\
-\mbox{}\verb@@$\diamond$
-\end{list}
-\vspace{-2ex}
-\end{minipage}\\[4ex]
-\end{flushleft}
diff --git a/dmc.w b/dmc.w
deleted file mode 100644
index 347b6824..00000000
--- a/dmc.w
+++ /dev/null
@@ -1,27 +0,0 @@
-\subsection{DMC module}
-This module initialises all DMC specific commands. Currently there is only
-one: StoreData. This does not do much, it is just here as a container for
-things to come.
-
-@d Protos @{
- int InitDmc(SConnection *pCon, SicsInterp *pSics, void *pData, 
-             int argc, char *argv[]);
-@}
-
-@o dmc.h @{
-/*-------------------------------------------------------------------------
- 	 			D M C  
-
-  this modules purpose is solely to initialise the commands specific to
-  the powder diffractometer DMC.
-
-   Mark Koenencke, March 1997
-   
-   copyright: see implementation file.
-
---------------------------------------------------------------------------*/
-#ifndef SICSDMC
-#define SICSDMC
-@< Protos @>
-#endif
-@}  
\ No newline at end of file
diff --git a/docho.c b/docho.c
deleted file mode 100644
index 6a0dd96b..00000000
--- a/docho.c
+++ /dev/null
@@ -1,747 +0,0 @@
-/*--------------------------------------------------------------------------
-                            D o C h o
-
-
-  A SICS driver for a Dornier Chopper Control System accessed through a 
-  RS-232 interface connected to a Macintosh PC running the SerialPortServer
-  terminal server program. There are two choppers which ususally run at fixed
-  speed ratios against each other. There ia also a phase difference between
-  the two choppers. And lots of machine surveillance parameters.
-
-  This driver is used by the generic chopper or device controller as described
-  in choco.tex. 
-
-
-  Mark Koennecke, January 1999
-
-  Modified to support a single chopper only,
-
-  Uwe Filges, Mark Koennecke; November 2001
---------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <assert.h>
-#include <time.h>
-#include "fortify.h"
-#include "sics.h"
-#include "stringdict.h"
-#include "hardsup/serialsinq.h"
-#include "hardsup/el734_errcodes.h"
-#include "hardsup/el734fix.h"
-#include "codri.h"
-
-/*-----------------------------------------------------------------------
-  A private data structure for this Dornier chopper
--------------------------------------------------------------------------*/
-  typedef struct {
-                   char *pHost;
-                   int  iPort;
-                   int iChannel;
-                   void *pData;
-                   int iRefreshIntervall;
-                   pStringDict pPar;
-                   time_t tRefresh;
-                   int iStop;
-                   long lTask;
-                   int iError;
-                   int iBusy;
-                   float fRatio;
-                   int iSingle;
-                   char pError[80]; 
-                  } DoCho, *pDoCho;
-/*
-  pHost, iPort and iChannel combined are the adress of the chopper
-  controller at the  Macintosh terminal server. pData is the serial 
-  port connection data structure needed and managed by the SerialIO
-  functions.
-
-  As the communication with the Dornier Chopper System is very slow the
-  parameter list of this driver will only be updated a predefined time
-  intervalls. In between buffered values will be returned for requests.
-  The buffered parameters are held in the string dictioanry pPar. 
-  iRefreshIntervall is the time between refreshs. tRefresh is the time for
-  the next refresh. iBusy is  flag which indicates, that it was tried to 
-  modify a variable. This will only be reflected with the next status update.
-  In between DoChoCheckPar might conclude, that the chopper is already
-  done. iBusy is meant to stop that. It is set when a parameter is changed
-  and cleared bu the status message code. DoChoCheckPar checks for it.
-
-  Refreshing will be performed by a special SICS task which will be 
-  started when the driver is initialized. In order to stop this task when
-  need arises the parameter iStop can be set to true.
-
-  iError is the last error reported on this device. If no error: 0
-
-  fRatio is the target value for the chopper ratio. In contrast to the
-  other parameters, its target value cannot be extracted from the chopper
-  status message.
-
-  iSingle is a flag which is true if only a single chopper is controlled
-  through this driver. This supports the POLDI single choper case.
-
-*/
-/*----------------------------------------------------------------------
-  ERROR CODES:
-*/
-#define UNDRIVABLE -8002
-#define UNKNOWNPAR -8003 
-#define PARERROR   -8004
-#define BADSYNC    -8005
-#define BADSTOP    -8006
-#define CHOPERROR  -8007
-
-extern char *trim(char *pTrim); /* trim.c */
-
-/*----------------------------------------------------------------------*/
-static void SplitChopperReply(pCodri self, char *prefix, char *pBueffel)
-{
-     char pToken[30], pValue[20], pEntry[80];
-     char *pPtr, *pTok, *pVal;
-     int iCount, iRet;
-     pDoCho pPriv = NULL;
-
-     pPriv = (pDoCho)self->pPrivate;
-
-     /* decompose pBueffel and store into string dictionary */
-      pPtr = strtok(pBueffel,";");
-      while(pPtr != NULL)
-      {
-        iCount = sscanf(pPtr,"%s %s",pToken,pValue);
-        if(iCount == 2)
-	{
-            pTok = trim(pToken);
-            pVal = trim(pValue);
-	    pEntry[0] = '\0';
-            sprintf(pEntry,"%s.%s",prefix,pTok);
-            iRet = StringDictUpdate(pPriv->pPar,pEntry,pVal);
-            if(!iRet)
-            {
-                StringDictAddPair(pPriv->pPar,pEntry,pVal);
-                strcat(self->pParList,pEntry);
-                strcat(self->pParList,",");
-	    }
-	}
-	else
-	{
-	   /* this fixes a bug with oversized messages in dphas */
-	   if(strstr(pPtr,"dphas") != NULL)
-	   {
-	       sprintf(pEntry,"%s.dphas",prefix);
-	       iRet = StringDictUpdate(pPriv->pPar,
-	                        pEntry,pPtr+5);
-               if(!iRet)
-               {
-                  StringDictAddPair(pPriv->pPar,pEntry,
-                                    pPtr+5);
-                  strcat(self->pParList,pEntry);
-                  strcat(self->pParList,",");
-	       }
-	   }
-	}
-        pPtr = strtok(NULL,";");
-      }
-}
-/*-------------------------------------------------------------------------
-  Well, DoChoStatus sends a status request to the Dornier chopper control
-  system. There is a gotcha, you need three reads to get the full information.
-  Then the answer is parsed and decomposed into parameter content for the
-  string dictionary. The single status components are separated by ;.  
--------------------------------------------------------------------------*/
-
-  static int DoChoStatus(pCodri self)
-  {
-      int iRet, iCount, iCode;
-      char pBueffel[1024], pToken[30], pValue[20];
-      char *pPtr, *pTok, *pVal;
-      pDoCho pPriv = NULL;
-
-      assert(self);
-      pPriv = (pDoCho)self->pPrivate;
-      assert(pPriv);
-      pPriv->iBusy = 0;
-      pPriv->iError = 0;
-
-
-      /* first send, command, returns the echo */
-      iRet = SerialWriteRead(&(pPriv->pData),"asyst 1",pBueffel,1023);
-      if(iRet < 0)
-      {
-         pPriv->iError = iRet;
-         return 0;
-      }
-
-      /* next send: reads first chopper line */
-      iRet = SerialWriteRead(&(pPriv->pData),"",pBueffel,1023);
-      if(iRet < 0)
-      {
-         pPriv->iError = iRet;
-         return 0;
-      }
-      SplitChopperReply(self,"chopper1",pBueffel);
-
-      if(!pPriv->iSingle)
-      {
-	/* second send: get next second chopper line */
-	iRet = SerialWriteRead(&(pPriv->pData),"",pBueffel,1023);
-	if(iRet < 0)
-	{
-	   pPriv->iError = iRet;
-	   return 0;
-	}
-        SplitChopperReply(self,"chopper2",pBueffel);
-      }
-      
-
-      return 1;
-  }
-/*-------------------------------------------------------------------------*/
-  static int DoChoTask(void *pData)
-  {
-      pCodri self = NULL;
-      pDoCho pPriv = NULL;
-      int iCode, iRet;
-      char pDummy[60];
-
-      self = (pCodri)pData;
-      assert(self);
-      pPriv = (pDoCho)self->pPrivate;
-      assert(pPriv);
-
-      /* check for stop */
-      if(pPriv->iStop)
-         return 0;
-
-
-      /* check if it is time to run a status request */
-      if(time(NULL) > pPriv->tRefresh)
-      {
-	/* try, fix error */
-	if(pPriv->iError != 0)
-	{
-	  self->GetError(self,&iCode,pDummy,59);
-	  iRet = self->TryFixIt(self,iCode);
-	  if(iRet == CHFAIL)
-	  {
-            pPriv->tRefresh = time(NULL) + pPriv->iRefreshIntervall;
-	    return 1;
-	  }
-	}
-        /* do it */
-        DoChoStatus(self);
-        pPriv->tRefresh = time(NULL) + pPriv->iRefreshIntervall;
-      }
-      return 1;
-  }  
-/*------------------------------------------------------------------------*/
-  static void DoChoKill(void *pData)
-  {
-     pCodri self = NULL;
-     pDoCho pPriv = NULL;
-
-     self = (pCodri)pData;
-     if(!self)
-       return;
-     pPriv = (pDoCho)self->pPrivate;
-     if(!pPriv)
-       return;
-
-
-    if(pPriv->pData)
-    {
-      SerialClose(&(pPriv->pData));
-      pPriv->pData = NULL;
-    }
-
-    if(pPriv->pHost)
-      free(pPriv->pHost);
-    if(pPriv->pPar)
-      DeleteStringDict(pPriv->pPar);
-
-    free(pPriv); 
-  } 
-/*-------------------------------------------------------------------------*/
-  static int DoChoInit(pCodri self)
-  {
-     pDoCho pPriv = NULL;
-     int iRet;
-
-     assert(self);
-     pPriv = (pDoCho)self->pPrivate;
-     assert(pPriv);
-     pPriv->iError = 0;
-
-     /* first open the connection to the serial port server and channel */
-     iRet = SerialOpen(&(pPriv->pData),pPriv->pHost,pPriv->iPort,
-                       pPriv->iChannel);
-     if(iRet <= 0)
-     {
-       pPriv->iError = iRet;
-       return 0;
-     }
-     /* configure the connection */
-     SerialConfig(&(pPriv->pData),10000);
-     SerialATerm(&(pPriv->pData),"1\r\n");
-     SerialSendTerm(&(pPriv->pData),"\r");
-
-     pPriv->iStop = 0;
-     pPriv->tRefresh = 0; /* force a status request when first run */
-     
-     /* start the update task */
-     if(pPriv->lTask == 0)
-     {
-	 pPriv->lTask = TaskRegister(pServ->pTasker,
-				      DoChoTask,
-				      NULL,
-				      NULL,
-				      self,
-				      1);                             
-     }
-     return 1;     
-  } 
-/*------------------------------------------------------------------------*/
-  static int DoChoClose(pCodri self)
-  {
-     pDoCho pPriv = NULL;
-     int iRet;
-     long lVal;
-
-     assert(self);
-     pPriv = (pDoCho)self->pPrivate;
-     assert(pPriv);
-
-     if(pPriv->pData)
-     {
-       SerialClose(&(pPriv->pData));
-       pPriv->pData = NULL;
-     }
-     return 1;
-  }
-/*------------------------------------------------------------------------*/
-  static int DoChoDelete(pCodri self)
-  {
-     pDoCho pPriv = NULL;
-
-     assert(self);
-     pPriv = (pDoCho)self->pPrivate;
-     assert(pPriv);
-
-     if(pPriv->pData)
-       {
-	 SerialClose(&(pPriv->pData));
-	 pPriv->pData = NULL;
-       }
-
-     if(pPriv->pHost)
-       free(pPriv->pHost);
-     if(pPriv->pPar)
-       DeleteStringDict(pPriv->pPar);
-
-     free(pPriv); 
-
-     return 1;
-  }
-/*--------------------------------------------------------------------------*/
-  static int DoChoSetPar2(pCodri self, char *parname, char *pValue)
-  {
-     pDoCho pPriv = NULL;
-     char pCommand[80], pReply[132];
-     char pState[20];
-     int iRet;
-
-     assert(self);
-     pPriv = (pDoCho)self->pPrivate;
-     assert(pPriv);
-
-     /* deal with our four parameters */
-     if(strcmp(parname,"chopper1.nspee") == 0)
-     {
-         sprintf(pCommand,"nspee 1 %s",pValue);
-     }
-     else if(strcmp(parname,"chopper2.nspee") == 0)
-     {
-         iRet = StringDictGet(pPriv->pPar,"chopper2.state",pState,19);
-         if(iRet && strstr(pState,"async") != NULL )
-	 {
-           sprintf(pCommand,"nspee 2 %s",pValue);
-         }
-         else
-	 {
-           pPriv->iError = BADSYNC;
-           return 0;
-         }
-     }
-     else if(strcmp(parname,"chopper2.nphas") == 0)
-     {
-         sprintf(pCommand,"nphas 2 %s",pValue);
-     }
-     else if(strcmp(parname,"chopper2.ratio") == 0)
-     {
-        sprintf(pCommand,"ratio 2 %s",pValue);
-     }
-     else
-     {
-       pPriv->iError = UNDRIVABLE;
-       return 0;
-     }
-
-     iRet = SerialWriteRead(&(pPriv->pData),pCommand,pReply,131);
-     if(iRet != 1)
-     {
-        pPriv->iError = iRet;
-        return 0;
-     } 
-     if(strstr(pReply,"error") != NULL)
-     {
-       pPriv->iError = CHOPERROR;
-       strncpy(pPriv->pError,pReply,79);
-       return 0;
-     }
-     else
-     {
-       pPriv->iError = 0;
-     }
-     pPriv->iBusy = 1;
-     return 1;
-  }
-/*-------------------------------------------------------------------------*/
-  static int DoChoHalt(pCodri self)
-  {
-     pDoCho pPriv = NULL;
-
-     assert(self);
-     pPriv = (pDoCho)self->pPrivate;
-     assert(pPriv);
-
-     /* 
-        there is no documented way to stop the Dornier chopper 
-        system. This at least makes SICS happy.
-     */
-     pPriv->iError = BADSTOP;
-     pPriv->iBusy = 0;
-     return 1; 
-  }
-/*---------------------------------------------------------------------------*/
-  static int DoChoSetPar(pCodri self, char *parname, float fValue)
-  {
-      char pValue[50];
-      pDoCho pPriv = NULL;
-
-      assert(self);
-      pPriv = (pDoCho)self->pPrivate;
-      assert(pPriv);
-
-      if(strstr(parname,"nspee") != NULL)
-      {
-         sprintf(pValue,"%d",(int)fValue);
-      }
-      else if(strstr(parname,"ratio") != NULL)
-      {
-         sprintf(pValue,"%d",(int)fValue);
-         pPriv->fRatio = (int)fValue;
-      }
-      else if(strcmp(parname,"updateintervall") == 0)
-      {
-         sprintf(pValue,"%d",(int)fValue);
-         StringDictUpdate(pPriv->pPar,"updateintervall",pValue);
-         pPriv->iRefreshIntervall = (int)fValue;
-         return 1;
-      }
-      else
-      {
-        sprintf(pValue,"%f",fValue);
-      }
-      return DoChoSetPar2(self,parname, pValue);
-  }
-/*----------------------------------------------------------------------*/
-  static int DoChoGetPar(pCodri self, char *parname, 
-                         char *pBuffer, int iBufLen)
-  {
-     pDoCho pPriv = NULL;
-     int iRet;
-
-     assert(self);
-     pPriv = (pDoCho)self->pPrivate;
-     assert(pPriv);
-
-     if(pPriv->iError != 0)
-     {
-       self->GetError(self,&iRet,pBuffer,iBufLen);
-       return 0;
-     }  
-
-     iRet = StringDictGet(pPriv->pPar,parname,pBuffer,iBufLen);
-     if(!iRet)
-     {
-        pPriv->iError = UNKNOWNPAR;
-        return 0;
-     }
-     return 1;
-  }
-/*-----------------------------------------------------------------------*/
-  static int DoChoCheckPar(pCodri self, char *parname)
-  {
-     pDoCho pPriv = NULL;
-     char pVal1[20], pVal2[20];
-     float fTarget, fIst, fDelta;
-     int iRet;
-
-     assert(self);
-     pPriv = (pDoCho)self->pPrivate;
-     assert(pPriv);
-
-     /* check the busy flag first */
-     if(pPriv->iBusy)
-        return HWBusy;
-
-     /* was there an error in the status show? */
-     if(pPriv->iError != 0)
-     {
-       return HWFault;
-     }
-
-     /* updateintervall is always HWIdle */
-     if(strcmp(parname,"updateintervall") == 0)
-     {
-       return HWIdle;
-     }
-
-     /* OK, got a new status let us check the parameter */
-     /* chopper 1 speed */
-     if(strcmp(parname,"chopper1.nspee") == 0)
-     {
-        iRet = StringDictGet(pPriv->pPar,"chopper1.nspee",pVal1,19);
-        iRet += StringDictGet(pPriv->pPar,"chopper1.aspee",pVal2,19);
-        if(iRet != 2)
-	{
-          pPriv->iError = PARERROR;
-          return HWFault;
-        }
-        sscanf(pVal1,"%f",&fTarget);
-        sscanf(pVal2,"%f",&fIst);
-        fDelta = fTarget - fIst;
-        if(fDelta < 0.0)
-           fDelta = -fDelta;
-        if(fDelta > 50)
-        {
-           return HWBusy;
-        }        
-        else
-	{
-           return HWIdle;
-        }
-     }     
-     /* chopper 2 speed */
-     if(strcmp(parname,"chopper2.nspee") == 0)
-     {
-        iRet = StringDictGet(pPriv->pPar,"chopper2.nspee",pVal1,19);
-        iRet += StringDictGet(pPriv->pPar,"chopper2.aspee",pVal2,19);
-        if(iRet != 2)
-	{
-          pPriv->iError = PARERROR;
-          return HWFault;
-        }
-        sscanf(pVal1,"%f",&fTarget);
-        sscanf(pVal2,"%f",&fIst);
-        fDelta = fTarget - fIst;
-        if(fDelta < 0.0)
-           fDelta = -fDelta;
-        if(fDelta > 5.)
-        {
-           return HWBusy;
-        }        
-        else
-	{
-           return HWIdle;
-        }
-     }     
-
-     /* phase */
-     if(strcmp(parname,"chopper2.nphas") == 0)
-     {
-       iRet = StringDictGet(pPriv->pPar,"chopper2.dphas",pVal1,19);
-       sscanf(pVal1,"%f",&fDelta);
-       if(fDelta < 0.)
-          fDelta = - fDelta;
-       if(fDelta > 0.3)
-       {
-          return HWBusy;
-       }
-       else
-       {
-          return HWIdle;
-       }
-     }
-
-     /* ratio */
-     if(strcmp(parname,"chopper2.ratio") == 0)
-     {
-       iRet = StringDictGet(pPriv->pPar,"chopper2.ratio",pVal1,19);
-       sscanf(pVal1,"%f",&fIst);
-       fDelta = fIst - pPriv->fRatio;
-       if(fDelta < 0.)
-          fDelta = - fDelta;
-       if(fDelta > 0.3)
-       {
-          return HWBusy;
-       }
-       else
-       {
-          return HWIdle;
-       }
-     }    
-     pPriv->iError = UNKNOWNPAR;
-     return HWFault;
-  }  
-/*-------------------------------------------------------------------------*/
-  static int DoChoError(pCodri self, int *iCode, char *pError, int iLen)
-  {
-     pDoCho pPriv = NULL;
-
-     assert(self);
-     pPriv = (pDoCho)self->pPrivate;
-     assert(pPriv);
-
-     *iCode = pPriv->iError;
-     switch(pPriv->iError)
-     {
-          case UNDRIVABLE:
-               strncpy(pError,"Parameter is not drivable",iLen);
-               break;
-	  case UNKNOWNPAR:
-               strncpy(pError,"Parameter is unknown",iLen);
-               break;
-	  case PARERROR:
-               strncpy(pError,"Internal parameter error",iLen);
-               break;
-	  case BADSYNC:
-               strncpy(pError,"Cannot drive slave chopper",iLen);
-               break;
-	  case CHOPERROR:
-               strncpy(pError,pPriv->pError,iLen);
-               break;
-          case BADSTOP:
-               strncpy(pError,
-                "User called STOP. WARNING: chopper is still untamed!",
-                iLen);
-               break;
-	  default:
-               SerialError(pPriv->iError,pError,iLen);
-               break;
-     }
-     pPriv->iError = 0;     
-     return 1;
-  }
-/*------------------------------------------------------------------------*/
-  static int DoChoFix(pCodri self, int iCode)
-  {
-     pDoCho pPriv = NULL;
-     int iRet;
-
-     assert(self);
-     pPriv = (pDoCho)self->pPrivate;
-     assert(pPriv);
-
-     switch(iCode)
-     {
-	 /* network errors */
-	 case EL734__BAD_FLUSH:
-	 case EL734__BAD_RECV:
-	 case EL734__BAD_RECV_NET:
-	 case EL734__BAD_RECV_UNKN:
-	 case EL734__BAD_RECVLEN:
-	 case EL734__BAD_RECV1:
-	 case EL734__BAD_RECV1_PIPE:
-	 case EL734__BAD_RNG:
-	 case EL734__BAD_SEND:
-	 case EL734__BAD_SEND_PIPE:
-	 case EL734__BAD_SEND_NET:
-	 case EL734__BAD_SEND_UNKN:
-	 case EL734__BAD_SENDLEN:
-         case NOCONNECTION:
-                   SerialForceClose(&(pPriv->pData));
-                   pPriv->pData = NULL;
-                   iRet = SerialOpen(&(pPriv->pData),pPriv->pHost,
-                                     pPriv->iPort,pPriv->iChannel);
-		   if(iRet == 1 )
-		   {
-		     return CHREDO;
-		   }                 
-		   else
-		   {
-		     return CHFAIL;
-		   }                 
-		   break;
-	 case EL734__FORCED_CLOSED:
-		   iRet = DoChoInit(self);
-		   if(iRet)
-		   {
-		     return CHREDO;
-		   }                 
-		   else
-		   {
-		     return CHFAIL;
-		   }                 
-		   break;
-	 default:
-		   return CHFAIL;
-		   break;                       
-     }
-     return CHFAIL;
- }
-/*-------------------------------------------------------------------------*/
- pCodri MakeDoChoDriver(char *pHost, int iPort, int iChannel, int iSingle)
- {
-      pCodri pNew = NULL;
-      pDoCho pPriv = NULL;
-      char *pText;
-
-      /* allocate memory */
-      pText = (char *)malloc(4096*sizeof(char));
-      pNew = (pCodri)malloc(sizeof(Codri));
-      pPriv = (pDoCho)malloc(sizeof(DoCho));
-      if( !pText || !pNew || !pPriv)
-      {
-        return NULL;
-      }
-      memset(pText,0,4096);
-      memset(pNew,0,sizeof(Codri));
-      memset(pPriv,0,sizeof(DoCho));
-
-     /* initialize private data structure */
-     pPriv->pHost = strdup(pHost);
-     pPriv->iPort = iPort;
-     pPriv->iChannel = iChannel;
-     pPriv->pData = NULL;
-     pPriv->iRefreshIntervall = 60;
-     pPriv->pPar = CreateStringDict();
-     pPriv->tRefresh = time(NULL);
-     pPriv->iSingle = iSingle;
-     if(!pPriv->pPar)
-     {
-        free(pText);
-        free(pNew);
-        free(pPriv);
-        return NULL;
-     }
-
-     /* install codri */
-     pNew->Init      =  DoChoInit;
-     pNew->Close     =  DoChoClose;
-     pNew->Delete    =  DoChoDelete;
-     pNew->SetPar    =  DoChoSetPar;
-     pNew->SetPar2   =  DoChoSetPar2;
-     pNew->GetPar    =  DoChoGetPar;
-     pNew->CheckPar  =  DoChoCheckPar;
-     pNew->GetError  =  DoChoError;
-     pNew->TryFixIt  =  DoChoFix;
-     pNew->Halt      =  DoChoHalt;
-     pNew->pParList  =  pText;
-     strcpy(pNew->pParList,"updateintervall,");
-     StringDictAddPair(pPriv->pPar,"updateintervall","60");
-     pNew->pPrivate = pPriv;
-
-     return pNew;
- }
-
-
-
-
diff --git a/dummy/dummy.c b/dummy/dummy.c
new file mode 100644
index 00000000..a86124d9
--- /dev/null
+++ b/dummy/dummy.c
@@ -0,0 +1,102 @@
+/*------------------------------------------------------------------------
+                                  D U M M Y
+
+ This is an empty site interface for SICS. Can be used as a starting
+ point for own site specific stuff.
+
+ copyright: see file COPYRIGHT
+
+ Mark Koennecke, June 2003
+ -----------------------------------------------------------------------*/
+#include <stdlib.h>
+#include <assert.h>
+#include <fortify.h>
+#include <sics.h>
+#include <motor.h>
+#include <tcl.h>
+#include <site.h>
+
+static pSite siteDummy = NULL;
+
+/*----------------------------------------------------------------------*/
+static void AddDummyCommands(SicsInterp *pInter){
+}
+/*---------------------------------------------------------------------*/
+static void RemoveDummyCommands(SicsInterp *pSics){
+}
+/*-------------------------------------------------------------------*/
+static pMotor CreateDummyMotor(SConnection *pCon, int argc, char *argv[]){
+  pMotor pNew = NULL;
+  return pNew;
+}
+/*-------------------------------------------------------------------*/
+static pCounterDriver CreateDummyCounterDriver(SConnection *pCon,
+					     int argc,
+					     char *argv[]){
+  pCounterDriver pNew = NULL;
+  return pNew;
+}
+/*-------------------------------------------------------------------*/
+static HistDriver *CreateDummyHistMem(char *name, pStringDict pOptions){
+  HistDriver *pNew = NULL;
+  
+  return pNew;
+}
+/*-------------------------------------------------------------------*/
+static pVelSelDriv CreateDummyVelSelDriv(char *name, char *array, 
+				       Tcl_Interp *pTcl){
+  pVelSelDriv pNew = NULL;
+  return pNew;
+}
+/*-------------------------------------------------------------------*/
+static pCodri CreateDummyController(SConnection *pCon,int argc, char *argv[]){
+  pCodri pNew = NULL;
+  return pNew;
+}
+/*------------------------------------------------------------------*/
+static pEVControl InstallDummyEnvironmentController(SicsInterp *pSics,
+						  SConnection *pCon,
+						 int argc, char *argv[]){
+  pEVControl pNew = NULL;
+  pEVDriver pDriv = NULL;
+
+  return pNew;
+}
+/*-----------------------------------------------------------------*/
+static int ConfigureDummyScan(pScanData self, char *option){
+  return 0;
+}
+/*--------------------------------------------------------------------*/
+static void KillDummySite(void *site){
+  free(site);
+  siteDummy = NULL;
+}
+/*---------------------------------------------------------------------
+  The scheme here goes along the lines of the singleton design pattern
+  ---------------------------------------------------------------------*/
+pSite getSite(void){
+  if(siteDummy == NULL){
+    siteDummy = (pSite)malloc(sizeof(Site));
+    /*
+      we  cannot go on if we do not even have enough memory to allocate
+      the site data structure
+    */
+    assert(siteDummy); 
+    /*
+      initializing function pointers
+    */
+    siteDummy->AddSiteCommands = AddDummyCommands;
+    siteDummy->RemoveSiteCommands = RemoveDummyCommands;
+    siteDummy->CreateMotor = CreateDummyMotor;
+    siteDummy->CreateCounterDriver = CreateDummyCounterDriver;
+    siteDummy->CreateHistogramMemoryDriver = CreateDummyHistMem; 
+    siteDummy->CreateVelocitySelector = CreateDummyVelSelDriv;
+    siteDummy->CreateControllerDriver = CreateDummyController;
+    siteDummy->InstallEnvironmentController = 
+          InstallDummyEnvironmentController;
+    siteDummy->ConfigureScan = ConfigureDummyScan;
+    siteDummy->KillSite = KillDummySite;
+  }
+  return siteDummy;
+}
+
diff --git a/dummy/make_gen b/dummy/make_gen
new file mode 100644
index 00000000..67c39a6e
--- /dev/null
+++ b/dummy/make_gen
@@ -0,0 +1,18 @@
+#-------------------------------------------------------------------------
+# common part of the makefile for the Dummy specific parts of SICS
+#
+# Mark Koennecke, June 2003
+#-------------------------------------------------------------------------
+.SUFFIXES: 
+.SUFFIXES: .c .o .f
+
+OBJ=dummy.o
+
+libpsi.a: $(OBJ)
+	- rm libdummy.a
+	ar cr libdummy.a $(OBJ)
+	ranlib libdummy.a
+
+clean:
+	- rm *.a
+	- rm *.o
\ No newline at end of file
diff --git a/hardsup/makefile_alpha b/dummy/makefile_alpha_dummy
similarity index 69%
rename from hardsup/makefile_alpha
rename to dummy/makefile_alpha_dummy
index 7cd80b92..dbca2ef0 100644
--- a/hardsup/makefile_alpha
+++ b/dummy/makefile_alpha_dummy
@@ -1,15 +1,14 @@
 #---------------------------------------------------------------------------
-# Makefile for the SINQ hardware support library
+# Makefile for the Dummy specific part of SICS
 # machine-dependent part for Tru64 Unix
 #
-# Mark Koennecke, November 1996
-# Markus Zolliker, March 2003
+# Mark Koennecke, June 2003
 #--------------------------------------------------------------------------
 # the following line only for fortified version
 #DFORTIFY=-DFORTIFY
 #==========================================================================
 
 CC       = cc
-CFLAGS   = -std1 -g $(DFORTIFY) -I$(SRC).. -I$(SRC).
+CFLAGS   = -std1 -g $(DFORTIFY) -I.. 
 
 include make_gen
diff --git a/ecb.c b/ecb.c
deleted file mode 100644
index 2ec1cae1..00000000
--- a/ecb.c
+++ /dev/null
@@ -1,496 +0,0 @@
-/*-----------------------------------------------------------------------
-  The ECB is a rack controller from Risoe based on a Z80 processor. 
-  This module provides some functions for communicating with such a
-  device. This is the implementation file. 
-
-  WARNING: This contains code which may be endian dependent!
-
-  copyright: see file COPYRIGHT
-
-  Mark Koennecke, January 2002, with some bits taken from the original 
-  tascom code.
-  -------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <assert.h>
-#include <errno.h>
-#include <tcl.h>
-#include <unistd.h>
-#include "fortify.h"
-#include "sics.h"
-#include "ecb.h"
-#include "ecb.i"
-/*------------- private defines and error codes ------------------------*/
-#define ACKN ('\6') /* Acknowledge character */
-#define READ_BYTES  3
-#define WRITE_BYTES 4
-#define DMAREAD     5
-#define ECB_BYTES 65536L
-
-typedef union           /* Used to swap bytes in 'address' and 'byte_count' */
-  {
-    unsigned short word;
-    struct
-      { 
-        unsigned char msb;      /* Most significant byte */
-        unsigned char lsb;      /* Least significant byte */
-      }b;
-  }Swap;
-/* ------- error codes */
-#define ECBILLEGALFUNC -100
-#define ECBOVERFLOW    -101
-
-/*----------------------------------------------------------------------*/
-static int ecbSendFunc(pECB self, int func){
-  unsigned char function, response;
-  int count, status;
-
-  /*
-    send function code
-  */
-  function = (unsigned char)func;
-  count = 1;
-  status = GPIBsend(self->gpib,self->ecbDeviceID,&function,count);
-  if(status < 0){
-    self->lastError = status;
-    return 0;
-  }
-
-  /*
-    read acknowledge byte
-  */
-  status = GPIBread(self->gpib,self->ecbDeviceID,&response,count);
-  if(status < 0){
-    self->lastError = status;
-    return 0;
-  }
-  if(response != ACKN){
-    self->lastError = ECBILLEGALFUNC;
-    return 0;
-  }
-  return 1;
-}
-/*-----------------------------------------------------------------------*/
-int ecbExecute(pECB self, int func, Z80_reg in, Z80_reg *out){
-  int count, status;
-
-  assert(self != NULL);
-  assert(self->gpib != NULL);
-  self->lastError = 0;
-
-  /*
-    send function code
-  */
-  status = ecbSendFunc(self,func);
-  if(status <= 0){
-    return status;
-  }
-
-  /*
-    send input register 
-  */
-  count = 4;
-  status = GPIBsend(self->gpib,self->ecbDeviceID, &in, count);
-  if(status < 0){
-    self->lastError = status;
-    return 0;
-  }
-
-  /*
-    read result register
-  */
-  status = GPIBread(self->gpib,self->ecbDeviceID, out, count);
-  if(status < 0){
-    self->lastError = status;
-    return 0;
-  }
-
-  return 1;  
-}
-/*----------------------------------------------------------------------*/
-static int ecbPrepareIO(pECB self, int func, unsigned short address,
-			unsigned short byteCount){
-  Swap save, adr, count;
-  int status, bytes;
-
-  if(byteCount > ECB_BYTES){
-    self->lastError = ECBOVERFLOW;
-    return 0;
-  }
-
-  /*
-    Swap address and byteCount?? This may be a portability issue!
-    This may not be necessary on some platforms
-  */
-  save.word = address;            /* Swap address bytes */
-  adr.b.lsb = save.b.msb;
-  adr.b.msb = save.b.lsb;
-  save.word = byteCount;     /* Swap byte count bytes */
-  count.b.lsb = save.b.msb;
-  count.b.msb = save.b.lsb;
-
-  status = ecbSendFunc(self,func);
-  if(status <= 0){
-    return status;
-  }
-
-  /*
-    send address 
-  */
-  bytes = 2;
-  status = GPIBsend(self->gpib,self->ecbDeviceID,&adr,bytes);
-  if(status < 0){
-    self->lastError = status;
-    return 0;
-  }
-
-  /*
-    send byte count
-  */
-  status = GPIBsend(self->gpib,self->ecbDeviceID,&count,bytes);
-  if(status < 0){
-    self->lastError = status;
-    return 0;
-  }
-
-  return 1;
-}
-/*-----------------------------------------------------------------------*/
-int ecbRead(pECB self, unsigned short address, 
-	    void *buffer, int byteCount){
-
-  int status, count;
-
-  assert(self != NULL);
-  assert(self->gpib != NULL);
-  self->lastError = 0;
-
-  status = ecbPrepareIO(self,READ_BYTES,address,(unsigned short)byteCount);
-  if(status <= 0){
-    return 0;
-  }
-
-  /*
-    actual read
-  */
-  status = GPIBread(self->gpib,self->ecbDeviceID, buffer, byteCount);
-  if(status  < 0){
-    self->lastError = status;
-    return 0;
-  }
-
-  return 1;
-}
-/*----------------------------------------------------------------------*/
-int ecbDMARead(pECB self, unsigned short address, void *buffer, 
-	       unsigned short byteCount){
-  int status, count;
-
-  assert(self != NULL);
-  assert(self->gpib != NULL);
-  self->lastError = 0;
-
-  status = ecbPrepareIO(self,DMAREAD,address,(unsigned short)byteCount);
-  if(status <= 0){
-    return 0;
-  }
-
-  usleep(20*1000);
-
-  /*
-    actual read
-  */
-  status = GPIBread(self->gpib,self->ecbDeviceID, buffer, byteCount);
-  if(status  < 0){
-    self->lastError = status;
-    return 0;
-  }
-
-  return 1;
-}
-/*----------------------------------------------------------------------*/
-int ecbWrite(pECB self, unsigned short address, 
-	    void *buffer, int byteCount){
-
-  int status, count;
-
-  assert(self != NULL);
-  assert(self->gpib != NULL);
-  self->lastError = 0;
-
-  status = ecbPrepareIO(self,WRITE_BYTES,address,(unsigned short)byteCount);
-  if(status <= 0){
-    return 0;
-  }
-
-  /*
-    actual read
-  */
-  status = GPIBsend(self->gpib,self->ecbDeviceID, buffer, byteCount);
-  if(status  < 0){
-    self->lastError = status;
-    return 0;
-  }
-
-  return 1;
-}
-/*-----------------------------------------------------------------------*/
-void ecbErrorDescription(pECB self, char *buffer, int maxBuffer){
-  int positive;
-
-  switch(self->lastError){
-  case ECBILLEGALFUNC:
-    strncpy(buffer,"Illegal ECB function called",maxBuffer);
-    return;
-  case ECBOVERFLOW:
-    strncpy(buffer,
-     "You tried to copy more then 64K onto the poor ECB, REFUSED!",
-	    maxBuffer);
-    return;
-  }
-
-  /*
-    GPIB error codes
-  */
-  GPIBerrorDescription(self->gpib,self->lastError,buffer, maxBuffer);
-}
-/*----------------------------------------------------------------------*/
-void ecbClear(pECB self){
-  GPIBclear(self->gpib, self->ecbDeviceID);
-}
-/*-----------------------------------------------------------------------*/
-int fixECBError(pECB self){
-  int pos;
-
-  switch(self->lastError){
-  case ECBILLEGALFUNC:
-  case ECBOVERFLOW:
-    return HWFault;
-  }
-
-  /*
-    GPIB error
-  */
-  pos = -self->lastError;
-  switch(pos){
-  case GPIBEABO:
-    return HWRedo;
-  default:
-    return HWFault;
-  }
-}
-/*------------------------------------------------------------------------*/
-int ECBAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-	      int argc, char *argv[]){
-  pECB self = (pECB)pData;
-  Z80_reg in, out;
-  char pBuffer[80], pError[132];
-  int status, iVal, func;
-
-  assert(self != NULL);
-
-  /*
-    Only managers will be allowed to wrestle directly with ECB
-    controllers.
-  */
-  if(!SCinMacro(pCon)){
-    if(!SCMatchRights(pCon,usMugger)){
-      return 0;
-    }
-  }
-
-  if(argc < 2){
-    SCWrite(pCon,"ERROR: keyword required for ECB",eError);
-    return 0;
-  }
-
-  strtolower(argv[1]);
-  if(strcmp(argv[1],"func") == 0){
-    if(argc < 7){
-      SCWrite(pCon,"ERROR: require function code and four register values",
-	      eError);
-      return 0;
-    }
-    status = Tcl_GetInt(pSics->pTcl, argv[2],&func);
-    if(status != TCL_OK){
-      SCWrite(pCon,"ERROR: failed to convert argument to int",eError);
-      return 0;
-    }
-    status = Tcl_GetInt(pSics->pTcl, argv[3],&iVal);
-    if(status != TCL_OK){
-      SCWrite(pCon,"ERROR: failed to convert argument to int",eError);
-      return 0;
-    }
-    in.d = (unsigned char)iVal;
-    status = Tcl_GetInt(pSics->pTcl, argv[4],&iVal);
-    if(status != TCL_OK){
-      SCWrite(pCon,"ERROR: failed to convert argument to int",eError);
-      return 0;
-    }
-    in.e = (unsigned char)iVal;
-    status = Tcl_GetInt(pSics->pTcl, argv[5],&iVal);
-    if(status != TCL_OK){
-      SCWrite(pCon,"ERROR: failed to convert argument to int",eError);
-      return 0;
-    }
-    in.b = (unsigned char)iVal;
-    status = Tcl_GetInt(pSics->pTcl, argv[6],&iVal);
-    if(status != TCL_OK){
-      SCWrite(pCon,"ERROR: failed to convert argument to int",eError);
-      return 0;
-    }
-    in.c = (unsigned char)iVal;
-
-    status = ecbExecute(self,func,in,&out);
-    if(status != 1){
-      ecbErrorDescription(self,pBuffer,79);
-      sprintf(pError,"ERROR: %s", pBuffer);
-      SCWrite(pCon,pError,eError);
-      return 0;
-    }
-    sprintf(pBuffer,"%d %d %d %d",
-	    out.d, out.e, out.b, out.c);
-    SCWrite(pCon,pBuffer,eValue);
-    return 1;
-  } else if(strcmp(argv[1],"clear") == 0){
-    ecbClear(self);
-    SCSendOK(pCon);
-    return 1;
-  }else if(strcmp(argv[1],"toint")== 0){
-    sprintf(pBuffer,"%d",argv[2][0]);
-    SCWrite(pCon,pBuffer,eValue);
-  } else {
-    SCWrite(pCon,"ERROR: ECB does not understand keyword", eError);
-    return 0;
-  }
-}
-/*---------------------------------------------------------------------*/
-int ecbAssignEncoder(pECB self, int encoder, int motorNumber){
-
-  if(encoder <= 0 || encoder > 3){
-    return 0;
-  }
-
-  self->encoder[encoder-1] = motorNumber;
-  self->encoderDirty = 1;
-  return 1;
-}
-/*----------------------------------------------------------------------*/
-int ecbLoadEncoder(pECB self){
-  Z80_reg in, out;
-  int status;
-
-  if(self->encoderDirty != 1){
-    /*
-      no need to do it if no change 
-    */
-    return 1;
-  }
-
-  if(self->encoder[0] != 0){
-    in.d = self->encoder[0];
-  }else {
-    in.d = 0;
-  }
-  if(self->encoder[1] != 0){
-    in.e = self->encoder[1];
-  }else {
-    in.e = 0;
-  }
-  if(self->encoder[2] != 0){
-    in.b = self->encoder[2];
-  }else {
-    in.b = 0;
-  }
-  in.c = 1;
-
-  status = ecbExecute(self,152,in,&out);
-  return status;
-}
-/*-----------------------------------------------------------------------*/
-void ECBKill(void *pData){
-  pECB self = (pECB)pData;
-  
-  if(self == NULL){
-    return;
-  }
-
-  /*
-    Detaching here may be dangerous: If the GPIB has been deleted first, 
-    this makes a core dump. Best is the GPIB keeps a list of attached
-    things and cleans them itself.
-    
-    GPIBdetach(self->gpib,self->ecbDeviceID);
-  */  
-  if(self->pDes){
-    DeleteDescriptor(self->pDes);
-  }
-  free(self);
-}
-/*----------------------------------------------------------------------
-MakeECB name gpibcontroller boardNo gpib-address
-  -----------------------------------------------------------------------*/
-int MakeECB(SConnection *pCon, SicsInterp *pSics, void *pData,
-	    int argc, char *argv[]){
-  pECB self = NULL;
-  int address, status, boardNo;
-  pGPIB gpib = NULL;
-  char pError[132];
-
-  /*
-    we need a name, the GPIB controller and an address on the GPIB bus for 
-    the ECB  as arguments
-  */
-  if(argc < 5){
-    SCWrite(pCon,"ERROR: insufficient arguments to MakeECB",eError);
-    return 0;
-  }
-  gpib = FindCommandData(pSics,argv[2],"GPIB");
-  if(gpib == NULL){
-    sprintf(pError,"ERROR: no GPIB controller %s found", argv[2]);
-    SCWrite(pCon,pError,eError);
-    return 0;
-  }
-  status = Tcl_GetInt(pSics->pTcl,argv[3], &boardNo);
-  if(status != TCL_OK){
-    sprintf(pError,"ERROR: failed to convert %s to integer",argv[3]);
-    SCWrite(pCon,pError,eError);
-    return 0;
-  }
-  status = Tcl_GetInt(pSics->pTcl,argv[4], &address);
-  if(status != TCL_OK){
-    sprintf(pError,"ERROR: failed to convert %s to integer",argv[4]);
-    SCWrite(pCon,pError,eError);
-    return 0;
-  }
-  if(address < 0 || address > 30){
-    SCWrite(pCon,"ERROR: invalid GPIB address specified",eError);
-    return 0;
-  }
-
-  self = (pECB)malloc(sizeof(ECB));
-  if(self == NULL){
-    SCWrite(pCon,"ERROR: no memory to allocate ECB",eError);
-    return 0;
-  }
-  memset(self,0,sizeof(ECB));
-  self->pDes = CreateDescriptor("ECB");
-  if(self->pDes == NULL){
-    SCWrite(pCon,"ERROR: no memory to allocate ECB",eError);
-    return 0;
-  }
-  self->gpib = gpib;
-  self->boardNumber = boardNo;
-  self->ecbAddress = address;
-  self->ecbDeviceID =GPIBattach(self->gpib,self->boardNumber, 
-				self->ecbAddress,0,
-				13,0,1);
-  if(self->ecbDeviceID <= 0){
-    SCWrite(pCon,"ERROR: failed to initialize ECB connection",
-	    eError);
-    ECBKill(self);
-    return 0;
-  }
-  AddCommand(pSics,argv[1],ECBAction,ECBKill,self);
-  return 1;
-}
-
diff --git a/ecb.h b/ecb.h
deleted file mode 100644
index dd5b861e..00000000
--- a/ecb.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-/*-----------------------------------------------------------------------
-  The ECB is a rack controller from Risoe based on a Z80 processor. 
-  This module provides some functions for communicating with such a
-  device.
-
-  WARNING: This contains code which may be endian dependent!
-
-  copyright: see file COPYRIGHT
-
-  Mark Koennecke, January 2002, with some bits taken out of the
-  original tascom code.
-------------------------------------------------------------------------*/
-#ifndef ECBCON
-#define ECBCON
-#include "gpibcontroller.h"
-
-
-typedef struct {
-    unsigned char d;            /* D register in Z80 */
-    unsigned char e;            /* E register in Z80 */
-    unsigned char b;            /* B register in Z80 */
-    unsigned char c;            /* C register in Z80 */
-  } Z80_reg;
-
-/*-----------------------------------------------------------------------*/
-
-        typedef struct __ECB *pECB;
-
-        int ecbExecute(pECB self, int func, Z80_reg in, Z80_reg *out);
-        int ecbRead(pECB self, unsigned short address, 
-                    void *buffer, int byteCount);
-        int ecbWrite(pECB self, unsigned short address, 
-                    void *buffer, int byteCount);
-        int ecbDMARead(pECB self, unsigned short address, void *buffer,
-                        unsigned short byteCount);
-        void ecbClear(pECB self);
-        int fixECBError(pECB self);
-        void ecbErrorDescription(pECB self, char *buffer,
-                                 int maxBytes);
-        int ecbAssignEncoder(pECB self, int encoder, int motorNumber);
-        int ecbLoadEncoder(pECB self);
-
-
-
-
-
-/*-----------------------------------------------------------------------*/
-
-        int MakeECB(SConnection *pCon, SicsInterp *pSics,
-                    void *pData,
-                    int ragc, char *argv[]);
-
-
-/*----------------------------------------------------------------------
-  for byte packing. result must be an 32 bit integer
-----------------------------------------------------------------------*/
-typedef union                   /* Used to extract and load data to Z80 regs. */{
-    unsigned int result;
-    struct
-      { 
-        unsigned char byt0;     /* Least significant byte */
-        unsigned char byt1;
-        unsigned char byt2;
-        unsigned char byt3;     /* Most significant byte */
-      }b;
-}Ecb_pack;
-
-#endif
diff --git a/ecb.i b/ecb.i
deleted file mode 100644
index 6853f58f..00000000
--- a/ecb.i
+++ /dev/null
@@ -1,23 +0,0 @@
-
-/*-----------------------------------------------------------------------
-  The ECB is a rack controller from Risoe based on a Z80 processor. 
-  This module provides some functions for communicating with such a
-  device. This is an internal data structure definition file.
-
-  copyright: see file COPYRIGHT
-
-  Mark Koennecke, January 2002, with some bits taken out of the
-  original tascom code.
-------------------------------------------------------------------------*/
-
-        struct __ECB {
-                        pObjectDescriptor pDes;
-                        pGPIB gpib;
-                        int boardNumber;
-                        int ecbAddress;
-                        int ecbDeviceID;
-                        int lastError;
-                        int encoder[3];
-                        int encoderDirty;
-                        }ECB;
-
diff --git a/ecb.w b/ecb.w
deleted file mode 100644
index ae471d98..00000000
--- a/ecb.w
+++ /dev/null
@@ -1,173 +0,0 @@
-\subsection{The ECB Controller}
-The ECB Controller is an electronic device created by the Risoe
-neutron scattering institute. At its base is a Z80 8-bit
-processor. This Z80 processor can perform certain functions such as
-controlling count operations, running a motor etc. To this purpose
-further electronic widgets are connected to the Z80's backplane. At
-the other end is a GPIB controller which allows to discuss with the
-Z80. 
-
-This module now implements three basic functionalities of the ECB:
-\begin{itemize}
-\item Execute a function 
-\item Read some memory
-\item Write some memory
-\end{itemize}
-
-This module also takes care of the encoder assignment for the ECB. The
-ECB can  have up to three encoders which can be assigned to motors. As
-a single motor driver does not know about the assignments of the other
-motors, the task of encoder assignement is handled in this module. 
-
-WARNING: this module contains code which may be endian dependend!
-
-In order to do this we need the following data structure:
-@d ecbdat @{
-	struct __ECB {
-			pObjectDescriptor pDes;
-			pGPIB gpib;
-			int boardNumber;
-			int ecbAddress;
-			int ecbDeviceID;
-			int lastError;
-                        int encoder[3];
-			int encoderDirty;
-			}ECB;
-@}
-The fields:
-\begin{description}
-\item[pDes] The standard SICS object descriptor.
-\item[gpib] The GPIB controller used for accessing the ECB.
-\item[boardNumber] The GPIB board number in the NI driver.
-\item[ecbAddress] The GPIB address of the ECB controller.
-\item[ecbDeviceID] The device ID assigned to the ECB when the ECB has
-been attached to. 
-\item[lastError] The last error which occurred.
-\item[encoder] An array holding the motor numbers assigned to the
-three encoder.
-\item[encoderDirty] is a flag which is set to true if a download of
-the encoder assignments is necessary.
-\end{description}
-
-A function in the ECB is executed by sending a function number first,
-followed by the content of the Z80 4 registers. In order to do this a
-data structure is required for these registers:
- 
-@d z80 @{
-typedef struct {
-    unsigned char d;            /* D register in Z80 */
-    unsigned char e;            /* E register in Z80 */
-    unsigned char b;            /* B register in Z80 */
-    unsigned char c;            /* C register in Z80 */
-  } Z80_reg;
-@}
-
-The function interface then looks like:
-
-@d ecbfunc @{
-	typedef struct __ECB *pECB;
-
-	int ecbExecute(pECB self, int func, Z80_reg in, Z80_reg *out);
-	int ecbRead(pECB self, unsigned short address, 
-		    void *buffer, int byteCount);
-	int ecbWrite(pECB self, unsigned short address, 
-		    void *buffer, int byteCount);
-	int ecbDMARead(pECB self, unsigned short address, void *buffer,
-			unsigned short byteCount);
-        void ecbClear(pECB self);
-	int fixECBError(pECB self);
-	void ecbErrorDescription(pECB self, char *buffer,
-                                 int maxBytes);
-	int ecbAssignEncoder(pECB self, int encoder, int motorNumber);
-	int ecbLoadEncoder(pECB self);
-
-
-
-
-@}
-\begin{description}
-\item[ecbExecute] tries to execute the ECB function func. The input register
-content is in in, on success the outpt registers are stored in out.
-\item[ecbRead] reads byteCount bytes from the ECB address address into
-buffer. Please note that address in this contest is an address in the
-ECB's memory space and not the GPIB address.
-\item[ecbDMARead] reads byteCount bytes from the ECB DMA address address into
-buffer. Please note that address in this contest is an address in the
-ECB's memory space and not the GPIB address.
-\item[ecbWrite] writes byteCount bytes from buffer to the ECB address
-address. Please note that address in this contest is an address in the
-ECB's memory space and not the GPIB address.
-\item[ecbClear] tries to clear the ECB interface.
-\item[fixECBError] tries to fix the last ECB error.
-\item[ecbErrorDescription] retrieves a text description of the last
-ECB problem. Max maxBytes of description are copied into buffer.
-\item[assignEncoder] assigns an encoder to a motor number.
-\item[loadEncoder] downloads the encoder assignment to the ECB if necessary. 
-\end{description}
-
-
-There is also an interface to the SICS interpreter for the ECB. This
-can be useful for debugging and testing and as a tool for scriptingy
-auxiliary equipment controlled through the ECB. The interface to the
-SICS interpreter for the ECB is represented through the ECB Factory
-function:
-@d ecbint @{
-	int MakeECB(SConnection *pCon, SicsInterp *pSics,
-		    void *pData,
-		    int ragc, char *argv[]);
-@} 
-
-@o ecb.h @{
-/*-----------------------------------------------------------------------
-  The ECB is a rack controller from Risoe based on a Z80 processor. 
-  This module provides some functions for communicating with such a
-  device.
-
-  WARNING: This contains code which may be endian dependent!
-
-  copyright: see file COPYRIGHT
-
-  Mark Koennecke, January 2002, with some bits taken out of the
-  original tascom code.
-------------------------------------------------------------------------*/
-#ifndef ECBCON
-#define ECBCON
-#include "gpibcontroller.h"
-
-@<z80@>
-/*-----------------------------------------------------------------------*/
-@<ecbfunc@>
-/*-----------------------------------------------------------------------*/
-@<ecbint@>
-
-/*----------------------------------------------------------------------
-  for byte packing. result must be an 32 bit integer
-----------------------------------------------------------------------*/
-typedef union                   /* Used to extract and load data to Z80 regs. */{
-    unsigned int result;
-    struct
-      { 
-        unsigned char byt0;     /* Least significant byte */
-        unsigned char byt1;
-        unsigned char byt2;
-        unsigned char byt3;     /* Most significant byte */
-      }b;
-}Ecb_pack;
-
-#endif
-@}
-
-@o ecb.i @{
-/*-----------------------------------------------------------------------
-  The ECB is a rack controller from Risoe based on a Z80 processor. 
-  This module provides some functions for communicating with such a
-  device. This is an internal data structure definition file.
-
-  copyright: see file COPYRIGHT
-
-  Mark Koennecke, January 2002, with some bits taken out of the
-  original tascom code.
-------------------------------------------------------------------------*/
-@<ecbdat@>
-@}
-
diff --git a/ecbcounter.c b/ecbcounter.c
index 9f12dda1..b5d21d95 100644
--- a/ecbcounter.c
+++ b/ecbcounter.c
@@ -14,7 +14,7 @@
 #include "fortify.h"
 #include "sics.h"
 #include "status.h"
-#include "ecb.h"
+#include "psi/ecb.h"
 #include "countdriv.h"
 
 /*------------------ our private data structure ------------------------*/
@@ -579,11 +579,8 @@ pCounterDriver MakeECBCounter(char *ecb){
   self->Set         = ECBSet;
   self->Get         = ECBGet;
   self->Send        = ECBSend;
+  self->KillPrivate = NULL;
 
   self->pData = pPriv;
   return self;
 }
-/*=====================================================================*/
-void KillECBCounter(struct __COUNTER *self){
-  DeleteCounterDriver(self);
-}
diff --git a/ecbdriv.c b/ecbdriv.c
deleted file mode 100644
index 11b31b09..00000000
--- a/ecbdriv.c
+++ /dev/null
@@ -1,1261 +0,0 @@
-/*------------------------------------------------------------------------
-  this is a motor driver for the Risoe motor controllers within the
-  ECB system. The motor is controlled through functions invoked in the
-  Z80 processor of the ECB system which is connected through a GPIB
-  bus to the wider world. This driver has to do a lot of extra things:
-  - it has to convert from physical values to motor steps.
-  - Quite a few parameters, such as ramping parameters,
-    have to be downloaded to the ECB
-  - Risoe motors may have a virtual encoder or a real encoder. 
-  - The motor may have to control air cushions as well.
-  - Tricky backlash handling. Backlash handling ensures that a position is
-    always arrived at from a defined direction. If backlash is applied
-    a restart flag is set in ECBRunTo. ECBGetStatus checks for that and
-    causes the motor to drive back to the position actually desired. 
-
-  This driver support only P2048a motor controllers, as these are the
-  only ones which seem to have arrived at PSI. The P1648 and Tridynamic 
-  things are not supported. 
-
-  Multiplexed motors: Originally the ECB supported 24 motors. This did 
-  prove to be not enough. Therefore another device called P2234e was 
-  introduced which allowed to run 8 motors from one controller port. In this 
-  case the motor parameters have to be copied to the ECB before 
-  driving the motor. Multiplexing is selected through the parameter MULT.
-  MULT 0 means no multiplexing, MULT > 0 makes MULT the number of the 
-  motor in the multiplexer. MULT is now also used to flag a download of
-  parameters to the ECB. In such a case  MULT is -1. 
- 
-
-  Some of this code was taken from the tascom driver for the ECB.
-
-  copyright: see file COPYRIGHT
-
-  Mark Koennecke, January 2003
-  
---------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <assert.h>
-#include <errno.h>
-#include <tcl.h>
-#include <math.h>
-#include <unistd.h>
-#include "fortify.h"
-#include "sics.h"
-#include "motor.h"
-#include "obpar.h"
-#include "splitter.h"
-#include "ecb.h"
-
-/*------------------------------------------------------------------------
-Parameter indexes in ObPar array and meanings
--------------------------------------------------------------------------*/
-#define ENCODER     0    /* encoder number, 0 if no encoder */
-#define CONTROL     1    /* control signals, > 1 means required. */
-#define RANGE       2    /* 0 = slow, 1 = fast */
-#define MULT        3    /* 0 = not multiplexed, > 0 multiplex motor number*/
-#define MULTCHAN   16    /* multiplexer channel */
-#define ACCTIME     4    /* acceleration time: 500, 1000 or 2000 milSecs */
-#define ROTDIR      5    /* rotation direction */
-#define STARTSPEED  6    /* start speed: 100-500 steps/s */
-#define MAXSPEED    7    /* maximum speed: 100-2000 steps/sec */
-#define SLOWAUTO    8    /* slow speed in auto mode */
-#define SLOWMAN     9    /* slow speed in manual mode */
-#define DELAY      10    /* start delay 0 - 2500 millSecs */
-#define OFFSET     11    /* encoder offset */
-#define TOLERANCE  12    /* tolerance in steps */
-#define STEPS2DEG  13    /* conversion factor motor steps to Degree */
-#define DEG2STEP   14    /* conversion factor from degree to encoder digits */
-#define BACKLASH   15    /* motor backlash */
-#define PORT       17    /* ECB port when multiplexed */
-
-#define MAXPAR 19 /* 1 extra for the sentinel, do not forget to initialize! */
-
-/*------------------------------ ECB defines -------------------------*/
-#define MAX_ENCODER 40
-#define FENCOR 167 /* read encoder */
-#define MOREAD 145 /* read motor steps */
-#define MOPARA 140 /* motor parameter */
-#define MOCLOA 146
-#define ABS(x) (x < 0 ? -(x) : (x))    
-#define MOSTEP 141
-#define MOSTAT 144
-
-/********************* t-error codes *************************************/
-#define COMMERROR    -300
-#define ECBMANUELL   -301
-#define ECBINUSE     -302
-#define UNIDENTIFIED -303
-#define ECBINHIBIT   -304
-#define ECBRUNNING   -305
-#define ECBSTART     -306
-#define ECBLIMIT     -307
-#define ECBREADERROR -308
-/*================== The Driver data structure ============================*/
-  typedef struct __ECBMotorDriv {
-                           /* general motor driver interface 
-                              fields. REQUIRED!
-                           */
-                           float fUpper; /* upper limit */
-                           float fLower; /* lower limit */
-                           char *name;
-                           int   (*GetPosition)(void *self,float *fPos);
-                           int   (*RunTo)(void *self, float fNewVal);
-                           int   (*GetStatus)(void *self);
-                           void  (*GetError)(void *self, int *iCode, 
-					     char *buffer, int iBufLen);
-                           int   (*TryAndFixIt)(void *self,int iError, 
-						float fNew);
-                           int   (*Halt)(void *self);
-                           int   (*GetDriverPar)(void *self, char *name, 
-                                  float *value);
-                           int    (*SetDriverPar)(void *self,SConnection *pCon,
-                                   char *name, float newValue);
-                           void   (*ListDriverPar)(void *self, char *motorName,
-                                  SConnection *pCon);
-                           
-                           
-                           /* ECB specific fields */
-                           pECB ecb; /* ECB controller for everything */
-                           int   ecbIndex; /* motor index in ECB */ 
-                           int errorCode;
-                           int restart;   /* flag if we have to restart
-					     because of backlash
-					     compensation
-					  */
-                           float restartTarget; /* target to restart to */
-                           ObPar driverPar[MAXPAR]; /* parameters */
-  } ECBMOTDriv, *pECBMotDriv;
-/*=======================================================================
-  Reading the motor position means reading the encoder if such a thing
-  is present or the counted motor steps (Pseudo Encoder) if not.
-  If the ECB answers us, the value has to be converted to physical
-  values. 
-  ----------------------------------------------------------------------*/
-static int readEncoder(pECBMotDriv self, long *digits){
-  int status;
-  Z80_reg in, out;
-  Ecb_pack data;
-
-  in.c = (unsigned char)ObVal(self->driverPar,ENCODER) + MAX_ENCODER;
-  status = ecbExecute(self->ecb,FENCOR,in,&out);
-  if(!status){
-    self->errorCode = COMMERROR;
-    return status;
-  }
-
-  /* pack bytes */
-  data.b.byt3 = 0;
-  data.b.byt2 = out.b;
-  data.b.byt1 = out.d;
-  data.b.byt0 = out.e;
-  if(out.c != 1){
-    *digits = -data.result;
-  } else {
-    *digits = data.result;
-  }
-  return OKOK;
-}
-/*---------------------------------------------------------------------*/
-static int readPseudoEncoder(pECBMotDriv self, long *digits){
-  int status;
-  Z80_reg in, out;
-  Ecb_pack data;
-
-  in.c = (unsigned char)self->ecbIndex;
-  status = ecbExecute(self->ecb,MOREAD,in,&out);
-  if(!status){
-    self->errorCode = COMMERROR;
-    return status;
-  }
-
-  /* pack bytes */
-  data.b.byt3 = 0;
-  data.b.byt2 = out.b;
-  data.b.byt1 = out.d;
-  data.b.byt0 = out.e;
-  if(out.c != 1){
-    *digits = -data.result;
-  } else {
-    *digits = data.result;
-  }
-  return OKOK;
-}
-/*----------------------------------------------------------------------*/
-int ECBMOTGetPos(void *pData, float *fPos){
-  pECBMotDriv self = (pECBMotDriv)pData;
-  long digits  = 0;
-  int status;
-  double step2degree;
-
-  assert(self);
-  self->errorCode = 0;
-
-  if((int)ObVal(self->driverPar,ENCODER) > 0){
-    status = readEncoder(self, &digits);
-    *fPos = digits/ObVal(self->driverPar,DEG2STEP) - 
-      ObVal(self->driverPar,OFFSET);
-    return status;
-  } else {
-    status = readPseudoEncoder(self, &digits);
-  }
-  step2degree = ObVal(self->driverPar,STEPS2DEG);
-  if(step2degree == 0.0){
-    step2degree = 1.;
-  }
-  *fPos = (float)( (double)digits/step2degree);
-
-  return status;
-}
-/*========================================================================
-In order to start a motor we need to do a couple of steps:
- - check if the motors parameters have been changed or it is a multiplexed
-   motor. In each case download the motor parameters.
- - the direction of the motor has to be determined, the speed to be 
-   selected etc.
- - Then the motor can be started. 
- ------------------------------------------------------------------------*/
-static int mustDownload(pECBMotDriv self){
-  int multi;
-
-  multi = (int)rint(ObVal(self->driverPar,MULT));
-  if(multi > 0 || multi < 0) {
-    return 1;
-  } else {
-    return 0;
-  }
-}
-/*--------------------------------------------------------------------*/
-static int checkMotorResult(pECBMotDriv self, Z80_reg out){
-  /*
-    checks the return values from a motor function invocation
-    and sets error codes in case of problems.
-  */
-  if(out.c == '\0'){
-    switch(out.b){
-    case 128:
-      self->errorCode = ECBMANUELL;
-      break;
-    case 64:
-      self->errorCode = ECBINHIBIT;
-      break;
-    case 32:
-      self->errorCode = ECBRUNNING;
-      break;
-    case 1:
-      self->errorCode = ECBSTART;
-      break;
-    case 16:
-      self->errorCode = ECBLIMIT;
-      break;
-    case 4:
-      self->errorCode = ECBINUSE;
-      break;
-    default:
-      self->errorCode = UNIDENTIFIED;
-      break;
-    }
-    return 0;
-  } else {
-    return 1;
-  }
-}
-/*---------------------------------------------------------------------*/
-static int loadAcceleration(pECBMotDriv self){
-  unsigned char parameter;
-  Z80_reg in, out;
-  int accel, status;
-
-  accel = (int)rint(ObVal(self->driverPar,ACCTIME));
-  if(accel == 500){
-    parameter = 1;
-  }else if(accel == 1000){
-    parameter = 2;
-  }else if(accel == 2000){
-    parameter = 3;
-  } else {
-    parameter = 0;
-  }
-  /*
-    apply rotation direction mask
-  */
-  if(ObVal(self->driverPar,ROTDIR) < 0){
-    parameter += 128;
-  }
-  in.c = (unsigned char)self->ecbIndex;
-  in.b = 7;
-  in.e = parameter;
-  in.d = 0;
-  out.d = out.e = out.b = out.c = 0;
-  status = ecbExecute(self->ecb,MOPARA,in,&out);  
-  if(!status){
-    self->errorCode = COMMERROR;
-    return 0;
-  }    
-
-  if(!checkMotorResult(self, out)){
-    return 0;
-  }
-
-  return 1;
-}
-/*--------------------------- speed tables ------------------------------*/
-#define SPEED_TAB3      64                     /* Size of speed table */
-const unsigned int low_2048[SPEED_TAB3] = {
-		      1,  2,  3,  4,  5,  6,  8, 10, 12, 14,
-		     16, 20, 24, 28, 32, 36, 40, 44, 48, 56,
-		     64, 72, 80, 88, 96,104,112,120,128,136,
-		    144,152,160,168,176,184,192,200,208,216,
-		    224,236,248,260,272,284,296,308,320,332,
-		    344,356,368,380,392,404,416,428,440,452,
-		    464,476,488,500 };
-
-#define SPEED_TAB4      96                     /* Size of speed table */
-const unsigned int high_2048[SPEED_TAB4] = {
-		   11,    15,    20,    27,    36,    47,    59,    74,
-		   93,   107,   124,   143,   165,   190,   213,   239,
-		  268,   298,   331,   368,   405,   446,   491,   536,
-		  585,   632,   683,   731,   783,   827,   873,   922,
-		  974,  1028,  1085,  1146,  1211,  1278,  1349,  1424,
-		 1503,  1587,  1675,  1720,  1820,  1913,  2014,  2123,
-		 2237,  2360,  2483,  2620,  2755,  2905,  3058,  3221,
-		 3384,  3575,  3756,  3945,  4150,  4370,  4600,  4800,
-		 5000,  5250,  5533,  5822,  6120,  6440,  6770,  7090,
-		 7450,  7800,  8130,  8500,  8900,  9320,  9730, 10200,
-		10700, 11200, 11700, 12200, 12800, 13300, 13900, 14500,
-		15100, 15800, 16700, 17300, 18000, 18600, 19300, 20000 };
-/*---------------------------------------------------------------------*/
-static unsigned char getSpeedIndex(float value, 
-				   int range, int *actualValue ){
-  unsigned char index;
-  const unsigned int *table;
-  int length;
-
-  if(range == 0){
-    table = low_2048;
-    length = SPEED_TAB3;
-  } else {
-    table = high_2048;
-    length = SPEED_TAB4;
-  }
-
-  for(index = 0; index < length-1; index++){
-    if(table[index] >= value){
-      break;
-    }
-  }
-  *actualValue = table[index];
-  return index;
-}
-/*--------------------------------------------------------------------*/
-static int loadSpeed(pECBMotDriv self, float value, int code){
-  unsigned char parameter;
-  Z80_reg in, out;
-  int accel, status, actual;
-
-  parameter = getSpeedIndex(value, (int)rint(ObVal(self->driverPar,RANGE)),
-			    &actual);
-
-  in.c = (unsigned char)self->ecbIndex;
-  in.b = code;
-  in.e = parameter;
-  status = ecbExecute(self->ecb,MOPARA,in,&out);  
-  if(!status){
-    self->errorCode = COMMERROR;
-    return 0;
-  }    
-  if(!checkMotorResult(self, out)){
-    return 0;
-  }
-  return 1;
-}
-/*-------------------------------------------------------------------*/
-static int loadDelay(pECBMotDriv self){
-  int parameter;
-  Z80_reg in, out;
-  int accel, status;
-  unsigned char control;
-
-  parameter = (int)rint(ObVal(self->driverPar,DELAY));
-  control = (unsigned char)rint(ObVal(self->driverPar,CONTROL));
-  if(control & 3){
-    parameter = 5;
-  } else{
-    parameter/= 10;
-  }
-  in.c = (unsigned char)self->ecbIndex;
-  in.b = 8;
-  in.e = parameter;
-  status = ecbExecute(self->ecb,MOPARA,in,&out);  
-  if(!status){
-    self->errorCode = COMMERROR;
-    return 0;
-  }    
-
-  if(!checkMotorResult(self, out)){
-    return 0;
-  }
-
-  return 1;
-}
-/*---------------------------------------------------------------------*/
-static int loadMulti(pECBMotDriv self){
-  int multi, mult_chan;
-  Z80_reg in, out;
-  int status;
-
-  multi = rint(ObVal(self->driverPar,MULT));
-  if(multi <= 0){
-    return 1;  /* not multiplexed */
-  }
-
-  mult_chan = (unsigned char)rint(ObVal(self->driverPar,MULTCHAN)); 
-  in.b = -1; /* SET_PORT */
-  in.d = (unsigned char)(multi + (mult_chan << 4));
-  in.e = (unsigned char)rint(ObVal(self->driverPar,PORT));
-  in.c = self->ecbIndex;
-  status = ecbExecute(self->ecb,MOPARA,in,&out);
-  if(status != 1){
-    self->errorCode = COMMERROR;
-    return 0;
-  }
-  return 1;
-}
-/*------------------------------------------------------------------*/
-static int loadOffset(pECBMotDriv self, float offset){
-  Z80_reg in, out;
-  int status;
-  Ecb_pack data;
-
-  /*
-    ignored
-  */
-  if(ObVal(self->driverPar,ENCODER) <=.0){
-    return 1;
-  }
-  
-  data.result = offset * ObVal(self->driverPar,STEPS2DEG);
-  in.b = data.b.byt2;
-  in.d = data.b.byt1;
-  in.e = data.b.byt0;
-  in.c = (unsigned char)rint(ObVal(self->driverPar,ENCODER));
-
-  status = ecbExecute(self->ecb,168,in,&out);
-  if(status == 1){
-    self->driverPar[OFFSET].fVal = offset;
-  } else {
-    self->errorCode = COMMERROR;
-  }
-  return status;
-}
-/*---------------------------------------------------------------------
-  This loads the gearing parameters for the CRT display. This should 
-  not have any influence on the running of the motor
-  ------------------------------------------------------------------------*/
-static double To_ten(int v) {
-  double vv;
-
-  
-    vv = 1.0;
-  if (v == 1)
-    vv = 10.0;
-  if (v == 2)
-    vv = 100.0;
-  if (v == 3)
-    vv = 1000.0;
-  if (v == 4)
-    vv = 10000.0;
-  if (v == 5)
-    vv = 100000.0;
-  if (v == 6)
-    vv = 1000000.0;
-  if (v == 7)
-    vv = 10000000.0;
-  return (vv);
-}
-/*----------------------------------------------------------------------*/
-static int loadGearing(pECBMotDriv self){
-  int status;
-  double dgear;
-  int gdec, dec = 0, ratio;
-  Ecb_pack data;
-  Z80_reg in, out;
-
-  in.c = self->ecbIndex;
-  dgear = (double) ObVal(self->driverPar,STEPS2DEG);;
-
-  /* Calculate decimals in display and gearing ratio for the ECB system*/
-  gdec =  (int) (1.0 +  (log10(dgear - .01)));
-  if (dec < gdec)
-    dec = gdec;  /* Display does not work with decimals < gdec */
-  ratio = (long) (0.5 + dgear*To_ten(6 + 1 - dec));
-   
-  data.result  = ratio;
-  in.b = data.b.byt2;
-  in.d = data.b.byt1;
-  in.e = data.b.byt0;
-  status = ecbExecute(self->ecb,174,in,&out);
-  if(status != 1){
-    self->errorCode = COMMERROR;
-  }
-  
-  if(ObVal(self->driverPar,ENCODER) == 0){
-    in.b = self->ecbIndex;
-  } else {
-    in.b = 1;
-    in.e = (unsigned char)ObVal(self->driverPar,ENCODER);
-  }
-  in.d = 0;
-  in.e = dec;
-  status = ecbExecute(self->ecb,173,in,&out);
-  if(status != 1){
-    self->errorCode = COMMERROR;
-  }
-
-  return 1;
-}
-/*----------------------------------------------------------------------*/
-static int downloadECBParam(pECBMotDriv self){
-  int status, parameter;
-  unsigned char func_code;
-  Z80_reg in, out;
-
-  /*
-     We assume that all parameters have useful values.  It is the task of
-     SetDriverPar to ensure just that!
-  */
-  if(status = loadAcceleration(self) <= 0){
-    return 0;
-  }
-
-  if(status = loadSpeed(self,ObVal(self->driverPar,STARTSPEED),6) <= 0){
-    return 0;
-  }
-
-  if(status = loadSpeed(self,ObVal(self->driverPar,MAXSPEED),5) <= 0){
-    return 0;
-  }
-
-  if(status = loadSpeed(self,ObVal(self->driverPar,SLOWAUTO),4) <= 0){
-    return 0;
-  }
-
-  if(status = loadSpeed(self,ObVal(self->driverPar,SLOWMAN),10) <= 0){
-    return 0;
-  }
-
-  if(status = loadDelay(self) <= 0){
-    return 0;
-  }
-
-  if(status = loadMulti(self) <= 0){
-    return 0;
-  }
-
-  if(status = ecbLoadEncoder(self->ecb) <= 0){
-    return 0;
-  }
-
-  if(status = loadOffset(self,ObVal(self->driverPar,OFFSET)) <= 0){
-    return 0;
-  }
-  
-
-  /*
-    It would be good practice to read the parameters written back
-    in order to check them. This does not seem to be supported with the
-    ECB system though.
-  */ 
-  if(ObVal(self->driverPar,MULT) < 0.){
-    self->driverPar[MULT].fVal = .0;
-  }
-
-  if(status = loadGearing(self) <= 0){
-    return 0;
-  }
-
-  return 1;
-}
-/*--------------------------------------------------------------------*/
-int degree2Step(pECBMotDriv self, float degree)
-{
-  double steps;
-
-  steps = degree*ObVal(self->driverPar,STEPS2DEG);
-  if (ObVal(self->driverPar,ENCODER) > .0)
-    steps = steps*ObVal(self->driverPar,DEG2STEP);
-  if(degree < 0){
-    steps = - steps;
-  } 
-  return ((int) steps);
-}
-/*----------------------------------------------------------------------
-  controlMotor enables or disables the motor, according to flag enable.
-  This is also used to switch on air cushions and the like.
- ------------------------------------------------------------------------*/
-static int controlMotor(pECBMotDriv self, int enable){
-  int status, delay, control;
-  Z80_reg in, out;
-
-  /*
-    nothing to do if we are not in control
-  */
-  control = (int)rint(ObVal(self->driverPar,CONTROL));
-  if(!(control & 1)){
-    return 1;
-  }
-
-  delay = (int)rint(ObVal(self->driverPar,DELAY));
-  if(enable == 1){
-    /*
-      enabling
-    */
-    in.e = 12; /* 8 + 4 */
-    in.b = 11; /* set control signal */
-    in.c = (unsigned char)self->ecbIndex;
-    status = ecbExecute(self->ecb,MOPARA,in,&out);
-    if(status != 1){
-      self->errorCode = COMMERROR;
-      return 0;
-    }
-    /*
-      wait for air cushions to settle
-    */
-    usleep(delay);
-    return 1;
-  }else {
-    /*
-      disable motor
-    */
-    in.e =  8;
-    in.b = 11; /* set control signal */
-    in.c = self->ecbIndex;
-    status = ecbExecute(self->ecb,MOPARA,in,&out);
-    if(status != 1){
-      self->errorCode = COMMERROR;
-      return 0;
-    }
-    usleep(delay);
-    in.e =  0;
-    in.b = 11; /* set control signal */
-    in.c = -self->ecbIndex;
-    status = ecbExecute(self->ecb,MOPARA,in,&out);
-    if(status != 1){
-      self->errorCode = COMMERROR;
-      return 0;
-    }
-    usleep(delay);
-    return 1;
-  }
-}
-/*-----------------------------------------------------------------------*/
-static int ECBRunTo(void *pData, float newPosition){
-  pECBMotDriv self = (pECBMotDriv)pData;
-  long digits  = 0;
-  int status;
-  float oldValue, diff, steps2degree, backlash;
-  Ecb_pack data;
-  Z80_reg in, out;
-
-  assert(self);
-
-  if(mustDownload(self)){
-    status = downloadECBParam(self);
-    if(!status){
-      return 0;
-    }
-  }
-
-  /*
-    read old position
-  */
-  status = ECBMOTGetPos(self,&oldValue);
-  if(status != 1){
-    return status;
-  }
-
-  /*
-    do not start if there
-  */
-  diff = newPosition - oldValue;
-  steps2degree= ObVal(self->driverPar,STEPS2DEG);
-  if(ABS(diff) <= .5/steps2degree + ObVal(self->driverPar,TOLERANCE)){
-    return OKOK;
-  }
-
-  /*
-    save restartTarget for backlash handling
-  */
-  self->restartTarget =  newPosition;
-
-  /*
-    enable and push up airy cushions
-  */
-  status = controlMotor(self,1);
-  if(status != 1){
-    return status;
-  }
-
-
-  /*
-    write control data
-  */
-  in.d = 0;
-  if(diff > .0){
-    in.d |= 32; /* positive direction */
-  }
-  in.d |= 16;  /* interrupts */
-  if(rint(ObVal(self->driverPar,RANGE)) == 1.){
-    in.d |= 64;  /* fast speed */
-  }
-  in.c = (unsigned char)self->ecbIndex;
-  status = ecbExecute(self->ecb,MOCLOA,in,&out);
-  if(status != 1){
-    self->errorCode = COMMERROR;
-    return 0;
-  }
-
-  /*
-    calculate steps 
-  */
-  self->restart = 0;
-  backlash = ObVal(self->driverPar,BACKLASH);
-  if(diff < 0){
-    diff = -diff;
-    if(backlash > 0.){
-      diff += backlash;
-      self->restart = 1;
-    }
-  } else {
-    if(backlash < 0.){
-      diff -= backlash;
-      self->restart = 1;
-    }
-  }
-  data.result = degree2Step(self,diff);
-
-  /* 
-     finally start the motor 
-  */
-  in.b = data.b.byt2;
-  in.d = data.b.byt1;
-  in.e = data.b.byt0;
-  in.c = (unsigned char)self->ecbIndex;
-  status = ecbExecute(self->ecb,MOSTEP,in,&out);
-  if(status != 1){
-    self->errorCode = COMMERROR;
-    return 0;
-  }
-
-  if(!checkMotorResult(self, out)){
-    return 0;
-  }
-
-  return OKOK;
-}
-/*=======================================================================*/
-static int checkStatusResponse(pECBMotDriv self, Z80_reg out){
-  
-  if(out.c == '\0'){
-    if(out.b & 4) {
-      self->errorCode = ECBINUSE;
-    }  else {
-      self->errorCode = ECBREADERROR;
-    }
-    return HWFault;
-  }  
-
-  if(out.b & 128){
-    self->errorCode = ECBMANUELL;
-    return HWFault;
-  } else if(out.b & 32){
-    return HWBusy;
-  } else if(out.b & 16){
-    self->errorCode = ECBLIMIT;
-    return HWFault;
-  }
-  return HWIdle;
-}
-/*----------------------------------------------------------------------*/
-static int ECBGetStatus(void *pData){
-  pECBMotDriv self = (pECBMotDriv)pData;
-  Z80_reg in, out;
-  int status, result;
-
-  assert(self);
-
-  in.c = (unsigned char)self->ecbIndex;
-  in.b = 12;
-  status = ecbExecute(self->ecb,MOSTAT,in,&out);
-  if(status != 1){
-    self->errorCode = COMMERROR;
-    return HWFault;
-  }
-
-  result = checkStatusResponse(self,out);
-  if(result == HWFault || result == HWIdle){
-    /*
-      run down airy cushions ........
-    */
-    controlMotor(self,0);
-  }
-
-  /*
-    take care of backlash.....
-  */
-  if(result == HWIdle && self->restart == 1){
-    self->restart = 0;
-    ECBRunTo(self,self->restartTarget);
-    return HWBusy;
-  }
-
-  return result;
-} 
-/*======================================================================*/
-static void ECBGetError(void *pData, int *iCode, char *buffer, int bufferlen){
-  pECBMotDriv self = (pECBMotDriv)pData;
-  char pBueffel[132];
-
-  assert(self);
-  
-  *iCode = self->errorCode;
-  switch(self->errorCode){
-  case COMMERROR:
-    strncpy(buffer,"communication problem with ECB",bufferlen);
-    break;
-  case ECBMANUELL:
-    strncpy(buffer,"ECB is in manual mode, trying to switch...",bufferlen);
-    break;
-  case ECBINUSE:
-    strncpy(buffer,"Power supply is in use",bufferlen);
-    break;
-  case ECBINHIBIT:
-    strncpy(buffer,"motor is inhibited",bufferlen);
-    break;
-  case ECBRUNNING:
-    strncpy(buffer,"motor is running",bufferlen);
-    break;
-  case ECBSTART:
-    strncpy(buffer,"failed to start motor",bufferlen);
-    break;
-  case ECBLIMIT:
-    strncpy(buffer,"hit limit switch",bufferlen);
-    break;
-  default:
-    strncpy(buffer,"unidentified error code",bufferlen);
-    break;
-  }
-}
-/*=======================================================================*/
-static int ECBTryAndFixIt(void *pData, int iCode, float fNew){
-  pECBMotDriv self = (pECBMotDriv)pData;
-  int result;
-  Z80_reg in, out;
-
-  assert(self);
-  
-  switch(iCode){
-  case ECBMANUELL:
-    in.d = 1 ;
-    ecbExecute(self->ecb,162,in,&out);
-    result = MOTREDO;
-    break;
-  case COMMERROR:
-    ecbClear(self->ecb);
-    result = MOTREDO;
-    break;
-  default:
-    result = MOTFAIL;
-    break;
-  }
-  return result;
-}
-/*========================================================================*/
-static int ECBHalt(void *pData){
-  pECBMotDriv self = (pECBMotDriv)pData;
-  Z80_reg in, out;
-  unsigned char par = 2;
-
-  assert(self);
-
-  if(rint(ObVal(self->driverPar,RANGE)) == 1){
-    par |= 64;
-  }
-
-  in.b = 9;
-  in.e = par;
-  in.c = (unsigned char)self->ecbIndex;
-  ecbExecute(self->ecb,MOPARA,in,&out);
-  self->restart = 0;
-  return 1;
-}
-/*=======================================================================*/
-static int ECBGetDriverPar(void *pData,char *name,  float *value){
-  pECBMotDriv self = (pECBMotDriv)pData;
-  ObPar *par = NULL;
-
-  assert(self);
-
-  par = ObParFind(self->driverPar,name);
-  if(par != NULL){
-    *value = par->fVal;
-    return 1;
-  } else {
-    return 0;
-  }
-}
-/*=====================================================================*/
-static float fixAccTime(float newValue){
-  float corrected, min, diff;
-  int val, possibleValues[4] = { 500, 1000, 2000, 5000}, i;
-
-  val = (int)rint(newValue);
-  min = 9999999.99;
-  for(i = 0; i < 4; i++){
-    diff = val - possibleValues[i];
-    if(ABS(diff) < min){
-      min = ABS(diff);
-      corrected = possibleValues[i];
-    }
-  }
-  return corrected;
-}
-/*--------------------------------------------------------------------*/
-static void setDownloadFlag(pECBMotDriv self, int parNumber){
-  int mustDownload;
-
-  switch(parNumber){
-  case CONTROL:
-  case MULT:
-  case MULTCHAN:
-  case ACCTIME:
-  case ROTDIR:
-  case STARTSPEED:
-  case MAXSPEED:
-  case SLOWAUTO:
-  case SLOWMAN:
-  case DELAY:
-    mustDownload = 1;
-    break;
-  default:
-    mustDownload = 0;
-    break;
-  }
-  
-  if(mustDownload && (self->driverPar[MULT].fVal == 0)){
-    self->driverPar[MULT].fVal = -1.0;
-  }
-}
-/*--------------------------------------------------------------------*/
-static int putMotorPosition(pECBMotDriv self, float newValue){
-  Z80_reg in,out;
-  Ecb_pack data;
-  float oldPos;
-  int status;
-
-  if(ABS(ObVal(self->driverPar,ENCODER)) > .1){
-    status = ECBMOTGetPos(self,&oldPos);
-    if(status != 1){
-      return status;
-    }
-    return loadOffset(self,oldPos - newValue);
-  } else {
-    data.result = newValue*ObVal(self->driverPar,STEPS2DEG);
-    in.b = data.b.byt2;
-    in.d = data.b.byt1;
-    in.e = data.b.byt0;
-    in.c = (unsigned char)self->ecbIndex;
-    status = ecbExecute(self->ecb,142,in,&out);
-    if(status != 1){
-      self->errorCode = COMMERROR;
-      return 0;
-    }
-    if(!checkMotorResult(self, out)){
-      return 0;
-    }
-  }
-
-  return 1;
-}
-/*---------------------------------------------------------------------*/
-static int ECBSetDriverPar(void *pData, SConnection *pCon,  char *name,
-			   float newValue){
-  pECBMotDriv self = (pECBMotDriv)pData;
-  int parNumber, speedNumber, actualSpeed, status;
-  char pBueffel[256];
-  float correctedValue;
-
-  assert(self);
-
-
-  /*
-    only managers shall edit these parameters....
-  */
-  if(!SCMatchRights(pCon,usMugger)){
-    return 0;
-  }
-
-  /*
-    this is rather a command and forces a parameter download
-    to the ECB
-  */
-  if(strcmp(name,"download") == 0){
-    status = downloadECBParam(self);
-    if(status != 1){
-      ECBGetError(self,&actualSpeed, pBueffel,254);
-      SCWrite(pCon,pBueffel,eError);
-      return status;
-    }
-  }
-
-  /*
-    this is another command and assigns a position to the current
-    motor place
-  */
-  if(strcmp(name,"putpos") == 0){
-    status = putMotorPosition(self,newValue);
-    if(status != 1){
-      ECBGetError(self,&actualSpeed, pBueffel,254);
-      SCWrite(pCon,pBueffel,eError);
-      return status;
-    }
-  }
-
-  /*
-    get the parameter number
-  */
-  parNumber = ObParIndex(self->driverPar,name);
-  if(parNumber < 0){
-    return 0;
-  }
-  
-  /*
-    make these parameters right, at least as far as we can .......
-  */
-  switch(parNumber){
-  case ACCTIME:
-    correctedValue = fixAccTime(newValue);
-    break;
-  case STARTSPEED:
-    getSpeedIndex(rint(newValue),1,&actualSpeed);
-    correctedValue = actualSpeed;
-    if(correctedValue < 10){
-      correctedValue = 10;
-    }
-    if(correctedValue > 4400){
-      correctedValue = 4400;
-    }
-    break;
-  case MAXSPEED:
-    getSpeedIndex(rint(newValue),1,&actualSpeed);
-    correctedValue = actualSpeed;
-    break;
-  case SLOWAUTO:
-  case SLOWMAN:
-    getSpeedIndex(rint(newValue),0,&actualSpeed);
-    correctedValue = actualSpeed;
-    if(correctedValue > 500){
-      correctedValue = 500;
-    }
-    break;
-  case DELAY:
-    correctedValue = newValue;
-    if(correctedValue > 2500){
-      correctedValue = 2500;
-    }
-    break; 
-  case RANGE:
-    correctedValue = newValue;
-    if(correctedValue != 0.0 && correctedValue != 1.0){
-      correctedValue = .0; /* slow by default! */
-    }
-    break;
-  case ENCODER:
-    if(newValue < 0. || newValue > 3.){
-      SCWrite(pCon,"ERROR: encoder numbers can only be 0 - 3", eError);
-      return 0;
-    } else if(newValue == 0){
-      correctedValue = newValue;
-    } else {
-      ecbAssignEncoder(self->ecb,(int)newValue, self->ecbIndex);
-      correctedValue = newValue;
-    }
-    break;
-  case STEPS2DEG:
-  case DEG2STEP:
-    if(ABS(newValue) < .1){
-      correctedValue = 1.;
-    } else {
-      correctedValue = newValue;
-    }
-    break;
-  case OFFSET:
-    correctedValue = newValue;
-    break;
-  default:
-    correctedValue = newValue;
-    break;
-  }
-  
-  if(ABS(correctedValue - newValue) > 0.){
-    sprintf(pBueffel,"WARNING: Illegal value %6.2f verbosely coerced to %6.2f",
-	    newValue,correctedValue);
-    SCWrite(pCon,pBueffel,eWarning);
-  }
-
-  ObParSet(self->driverPar,self->name,name,correctedValue,pCon);
-
-  setDownloadFlag(self,parNumber);
-
-  return 1;
-}
-/*=========================================================================*/
-static void ECBListPar(void *pData, char *motorName, SConnection *pCon){
-  pECBMotDriv self = (pECBMotDriv)pData;
-  char pBueffel[256];
-  int i;
-
-  assert(self);
-
-  for(i = 0; i < MAXPAR-1; i++){
-    sprintf(pBueffel,"%s.%s = %f",
-	    motorName,self->driverPar[i].name,
-	    self->driverPar[i].fVal);
-    SCWrite(pCon,pBueffel,eValue);
-  }
-}
-/*========================================================================*/
-static int interpretArguments(pECBMotDriv self, SConnection *pCon,
-			      int argc, char *argv[]){
-  char pBueffel[256];
-  TokenList *pList, *pCurrent;
-
-  pList = SplitArguments(argc,argv);
-  if(!pList || argc < 4){
-    SCWrite(pCon,"ERROR: no  arguments to CreateECBMotor",eError);
-    return 0;
-  }
-  pCurrent = pList;
-
-  /*
-    first should be the name of the ECB to use 
-  */
-  if(pCurrent->Type != eText){
-    sprintf(pBueffel,"ERROR: expected EDB name, got: %s",
-	    pCurrent->text);
-    DeleteTokenList(pList);
-    return 0;
-  }
-  self->ecb = (pECB)FindCommandData(pServ->pSics,pCurrent->text,"ECB");
-  if(!self->ecb){
-    sprintf(pBueffel,"ERROR: %s is no ECB controller",pCurrent->text);
-    SCWrite(pCon,pBueffel,eError);
-    DeleteTokenList(pList);
-    return 0;
-  }
-
-  /*
-    next the motor number 
-  */
-  pCurrent = pCurrent->pNext;
-  if(pCurrent->Type != eInt){
-    sprintf(pBueffel,"ERROR: expected int motor number, got %s",
-	    pCurrent->text);
-    SCWrite(pCon,pBueffel,eError);
-    DeleteTokenList(pList);
-    return 0;
-  }
-  self->ecbIndex = pCurrent->iVal;
-
-  /*
-    next the limits
-  */
-  pCurrent = pCurrent->pNext;
-  if(pCurrent->Type != eFloat){
-    sprintf(pBueffel,"ERROR: expected float type limit, got %s",
-	    pCurrent->text);
-    SCWrite(pCon,pBueffel,eError);
-    DeleteTokenList(pList);
-    return 0;
-  }
-  self->fLower = pCurrent->fVal;
-  pCurrent = pCurrent->pNext;
-  if(pCurrent->Type != eFloat){
-    sprintf(pBueffel,"ERROR: expected float type limit, got %s",
-	    pCurrent->text);
-    SCWrite(pCon,pBueffel,eError);
-    DeleteTokenList(pList);
-    return 0;
-  }
-  self->fUpper = pCurrent->fVal;
-  DeleteTokenList(pList);
-
-  return 1;
-}
-/*-----------------------------------------------------------------------*/
-static void initializeParameters(pECBMotDriv self){
-  ObParInit(self->driverPar,ENCODER,"encoder",0,usMugger);
-  ObParInit(self->driverPar,CONTROL,"control",0,usMugger);
-  ObParInit(self->driverPar,RANGE,"range",1,usMugger);
-  ObParInit(self->driverPar,MULT,"multi",0,usMugger);
-  ObParInit(self->driverPar,MULTCHAN,"multchan",0,usMugger);
-  ObParInit(self->driverPar,ACCTIME,"acceleration",500,usMugger);
-  ObParInit(self->driverPar,ROTDIR,"rotation_dir",1,usMugger);
-  ObParInit(self->driverPar,STARTSPEED,"startspeed",100,usMugger);
-  ObParInit(self->driverPar,MAXSPEED,"maxspeed",2000,usMugger);
-  ObParInit(self->driverPar,SLOWAUTO,"auto",100,usMugger);
-  ObParInit(self->driverPar,SLOWMAN,"manuell",100,usMugger);
-  ObParInit(self->driverPar,DELAY,"delay",50,usMugger);
-  ObParInit(self->driverPar,OFFSET,"offset",0,usMugger);
-  ObParInit(self->driverPar,TOLERANCE,"dtolerance",0.,usMugger);
-  ObParInit(self->driverPar,STEPS2DEG,"step2deg",1,usMugger);
-  ObParInit(self->driverPar,DEG2STEP,"step2dig",0,usMugger);
-  ObParInit(self->driverPar,BACKLASH,"backlash",0,usMugger);
-  ObParInit(self->driverPar,PORT,"port",0,usMugger);
-  ObParInit(self->driverPar,MAXPAR-1,"tueet",-100,-100); /* sentinel! */
-}
-/*------------------------------------------------------------------------*/
-MotorDriver *CreateECBMotor(SConnection *pCon, int argc, char *argv[]){
-  pECBMotDriv self = NULL;
-
-  self = (pECBMotDriv)malloc(sizeof(ECBMOTDriv));
-  if(self == NULL){
-    return NULL;
-  }
-  memset(self,0,sizeof(ECBMOTDriv));
-
-  if(!interpretArguments(self,pCon,argc,argv)){
-    free(self);
-    return 0;
-  }
-
-  initializeParameters(self);
-
-  /*
-    set function pointers
-  */
-  self->GetPosition = ECBMOTGetPos;
-  self->RunTo = ECBRunTo;
-  self->GetStatus = ECBGetStatus;
-  self->GetError = ECBGetError;
-  self->TryAndFixIt = ECBTryAndFixIt;
-  self->Halt = ECBHalt;
-  self->GetDriverPar = ECBGetDriverPar;
-  self->SetDriverPar = ECBSetDriverPar;
-  self->ListDriverPar = ECBListPar;
- 
-  self->errorCode = 0;
-  return (MotorDriver *)self;
-}
-/*=======================================================================*/
-void KillECBMotor(void *pDriver){
-  int i;
-  pECBMotDriv self = (pECBMotDriv)pDriver;
-
-  for(i = 0; i < MAXPAR; i++){
-    if(self->driverPar[i].name != NULL){
-      free(self->driverPar[i].name);
-    }
-  }
-  free(self);
-}
diff --git a/ecbdriv.h b/ecbdriv.h
deleted file mode 100644
index eda63b58..00000000
--- a/ecbdriv.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*------------------------------------------------------------------------
-  this is a motor driver for the Risoe motor controllers within the
-  ECB system. The motor is controlled through functions invoked in the
-  Z80 processor of the ECB system which is connected through a GPIB
-  bus to the wider world. This driver has to do a lot of extra things:
-  - it has to convert from physical values to motor steps.
-  - Quite a few parameters, such as ramping parameters,
-    have to be downloaded to the ECB
-  - Risoe motors may have a virtual encoder or a real encoder. 
-  - The motor may have to control air cushions as well.
-  - Tricky backlash handling. Backlash handling ensures that a position is
-    always arrived at from a defined direction. If backlash is applied
-    a restart flag is set in ECBRunTo. ECBGetStatus checks for that and
-    causes the motor to drive back to the position actually desired. 
-
-  This driver support only P2048a motor controllers, as these are the
-  only ones which seem to have arrived at PSI. The P1648 and Tridynamic 
-  things are not supported. 
-
-  Multiplexed motors: Originally the ECB supported 24 motors. This did 
-  prove to be not enough. Therefore another device called P2234e was 
-  introduced which allowed to run 8 motors from one controller port. In this 
-  case the motor parameters have to be copied to the ECB before 
-  driving the motor. Multiplexing is selected through the parameter MULT.
-  MULT 0 means no multiplexing, MULT > 0 makes MULT the number of the 
-  motor in the multiplexer. MULT is now also used to flag a download of
-  parameters to the ECB. In such a case  MULT is -1. 
- 
-
-  Some of this code was taken from the tascom driver for the ECB.
-
-  copyright: see file COPYRIGHT
-
-  Mark Koennecke, January 2003
-  
---------------------------------------------------------------------------*/
-#ifndef ECBDRIV
-#define ECBDRIV
-
-MotorDriver *CreateECBMotor(SConnection *pCon, int argc, char *argv[]);
-void        KillECBMotor(void *driver);
-
-#endif
-
- 
diff --git a/el734dc.c b/el734dc.c
deleted file mode 100644
index c5677963..00000000
--- a/el734dc.c
+++ /dev/null
@@ -1,907 +0,0 @@
-/*-------------------------------------------------------------------------
-	A motor driver for EL734 DC  motors as used at SinQ
-	
-
-	Mark Koennecke,    November 1996
-	
-	Original code foe EL734 stepper, modified for DC motors, the
-	11-June-1997 Mark Koennecke
-
-	Copyright:
-
-	Labor fuer Neutronenstreuung
-	Paul Scherrer Institut
-	CH-5423 Villigen-PSI
-
-
-        The authors hereby grant permission to use, copy, modify, distribute,
-        and license this software and its documentation for any purpose, provided
-        that existing copyright notices are retained in all copies and that this
-        notice is included verbatim in any distributions. No written agreement,
-        license, or royalty fee is required for any of the authorized uses.
-        Modifications to this software may be copyrighted by their authors
-        and need not follow the licensing terms described here, provided that
-        the new terms are clearly indicated on the first page of each file where
-        they apply.
-
-        IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-        FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-        ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-        DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-        POSSIBILITY OF SUCH DAMAGE.
-
-        THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-        INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-        IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-        NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-        MODIFICATIONS.
-------------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <assert.h>
-#include <string.h>
-#include "fortify.h"
-#include "Scommon.h"
-#include "SCinter.h"
-#include "conman.h"
-#include "modriv.h"
-#include "hardsup/sinq_prototypes.h"
-#include "hardsup/rs232c_def.h"
-#include "hardsup/el734_def.h"
-#include "hardsup/el734fix.h"
-#include "bit.h"
-#include "splitter.h"
-#include "servlog.h"
-
- static int EL734EncodeMSR(char *text, int iLen,
-                           int iMSR, int iOMSR, int iFP, int iFR);
-
- static int EL734AnalyzeMSR(int iMSR, int iOMSR);
- 
-/* addional error codes for Status-things */
-#define MSRBUSY -40
-#define MSRONLIMIT -41
-#define MSRRUNFAULT -42
-#define MSRPOSFAULT -43
-#define MSRDEADCUSHION -44
-#define MSRHALT -45
-#define MSRSTOP -46
-#define MSROK -47
-#define MSRREF -48
-#define MSRFAULT -49
-                           
-/* --------------------------------------------------------------------------*/
-  static int GetPos(void *self, float *fData)
-  {
-     EL734Driv *pDriv;
-     float fPos;
-     int iRet, iMSR, iOMSR, iFRC,iFPC, iSS;
-     
-     assert(self);
-     
-     pDriv = (EL734Driv *)self;
-     iRet = EL734_GetStatus(&(pDriv->EL734struct),
-                            &iMSR,
-                            &iOMSR,
-                            &iFPC,
-                            &iFRC,
-                            &iSS,
-                            &fPos);
-     if(iMSR != 0)
-     {
-       pDriv->iMSR = iMSR;
-     }                       
-    *fData = fPos;
-     if(iRet != 1)
-     {
-       return HWFault;
-     }
-     else
-     return OKOK;
-     
-  }
-/*--------------------------------------------------------------------------*/
-  static int Run(void *self, float fNew)
-  {
-     EL734Driv *pDriv;
-     int iRet;
-     
-     assert(self);
-     
-     pDriv = (EL734Driv *)self;
-     iRet = EL734_MoveNoWait (&(pDriv->EL734struct), fNew);
-     if(iRet == 1)
-     {
-       return OKOK;
-     }             
-     else
-     {
-       return HWFault;
-     }    
-  }  
-
-/*---------------------------------------------------------------------------
-
-	EL734Error2Text converts between an EL734 error code to text
------------------------------------------------------------------------------*/
-	static void EL734Error2Text(char *pBuffer, int iErr)
-	{
-	        strcpy(pBuffer,"ERROR: HW:");
-		switch(iErr)
-		{
-			case EL734__BAD_ADR:
-				strcat(pBuffer,"EL734__BAD_ADR");
-				break;
-			case EL734__BAD_BIND:
-				strcat(pBuffer,"EL734__BAD_BIND");
-				break;
-			case EL734__BAD_CMD:
-				strcat(pBuffer,"EL734__BAD_CMD");
-				break;
-			case EL734__BAD_CONNECT:
-				strcat(pBuffer,"EL734__BAD_CONNECT");
-				break;
-			case EL734__BAD_FLUSH:
-				strcat(pBuffer,"EL734__BAD_FLUSH");
-				break;
-			case EL734__BAD_HOST:
-				strcat(pBuffer,"EL734__BAD_HOST");
-				break;
-			case EL734__BAD_ID:
-				strcat(pBuffer,"EL734__BAD_ID");
-				break;
-			case EL734__BAD_ILLG:
-				strcat(pBuffer,"EL734__BAD_ILLG");
-				break;
-			case EL734__BAD_LOC:
-				strcat(pBuffer,"EL734__BAD_LOC");
-				break;
-			case EL734__BAD_MALLOC:
-				strcat(pBuffer,"EL734__BAD_MALLOC");
-				break;
-			case EL734__BAD_NOT_BCD:
-				strcat(pBuffer,"EL734__BAD_NOT_BCD");
-				break;
-			case EL734__BAD_OFL:
-				strcat(pBuffer,"EL734__BAD_OFL");
-				break;
-			case EL734__BAD_PAR:
-				strcat(pBuffer,"EL734__BAD_PAR");
-				break;
-			
-			case EL734__BAD_RECV:
-				strcat(pBuffer,"EL734__BAD_RECV");
-				break;
-			case EL734__BAD_RECV_NET:
-				strcat(pBuffer,"EL734__BAD_RECV_NET");
-				break;
-			case EL734__BAD_RECV_PIPE:
-				strcat(pBuffer,"EL734__BAD_RECV_PIPE");
-				break;
-			case EL734__BAD_RECV_UNKN:
-				strcat(pBuffer,"EL734__BAD_RECV_UNKN");
-				break;
-			case EL734__BAD_RECVLEN:
-				strcat(pBuffer,"EL734__BAD_RECVLEN");
-				break;
-			case EL734__BAD_RECV1:
-				strcat(pBuffer,"EL734__BAD_RECV1");
-				break;
-			case EL734__BAD_RECV1_NET:
-				strcat(pBuffer,"EL734__BAD_RECV1_NET");
-				break;
-			case EL734__BAD_RECV1_PIPE:
-				strcat(pBuffer,"EL734__BAD_RECV1_PIPE");
-				break;
-			case EL734__BAD_RNG:
-				strcat(pBuffer,"EL734__BAD_RNG");
-				break;
-			case EL734__BAD_SEND:
-				strcat(pBuffer,"EL734__BAD_SEND");
-				break;
-			case EL734__BAD_SEND_PIPE:
-				strcat(pBuffer,"EL734__BAD_SEND_PIPE");
-				break;
-			case EL734__BAD_SEND_NET:
-				strcat(pBuffer,"EL734__BAD_SEND_NET");
-				break;
-			case EL734__BAD_SEND_UNKN:
-				strcat(pBuffer,"EL734__BAD_SEND_UNKN");
-				break;
-			case EL734__BAD_SENDLEN:
-				strcat(pBuffer,"EL734__BAD_SENDLEN");
-				break;
-			case EL734__BAD_SOCKET:
-				strcat(pBuffer,"EL734__BAD_SOCKET");
-				break;
-			case EL734__BAD_TMO:
-				strcat(pBuffer,"EL734__BAD_TMO");
-				break;
-		        case EL734__FORCED_CLOSED:
-				strcat(pBuffer,"EL734__FORCED_CLOSED");
-				break;
-			case EL734__BAD_STP:
-			        strcat(pBuffer,"EL734__BAD_STP");
-			        break;	
-		        case EL734__EMERG_STOP:
-		                strcat(pBuffer,"EL734__EMERG_STOP");
-		                break; 		
-		        case EL734__NOT_OPEN:
-		                strcat(pBuffer,"EL734__NOT_OPEN");
-		                break; 		
-			case EL734__BAD_ASYNSRV:
-			        strcat(pBuffer,"EL734__BAD_ASYNSRV");
-			        break;	
-			default:
-				sprintf(pBuffer,"Unknown EL734 error %d", iErr);
-				break;	
-		}
-	}
-	
-/*-------------------------------------------------------------------------*/
-  static void GetErr(void *self, int *iCode, char *buffer, int iBufLen)
-  {
-     EL734Driv *pDriv;
-     char pBueffel[512];
-     int iMSR, iOMSR, iSS;
-     int iRet, iFPC, iFRC;
-     int iErr;
-     float fPos;
-     char *pErr;
-     
-     assert(self);
-     
-     /* get EL734 error codes */
-     pDriv = (EL734Driv *)self;
-     EL734_ErrInfo(&pErr,&iMSR,&iOMSR, &iSS);
-     if(iMSR != 0)
-     {
-            EL734Error2Text(pBueffel,iMSR);
-            strncpy(buffer,pBueffel,(iBufLen-1));
-            *iCode = iMSR;
-            return;
-     }
-     else
-     {  /* check status flag for addional errors */
-       iRet = EL734_GetStatus(&(pDriv->EL734struct),
-                            &iMSR,
-                            &iOMSR,
-                            &iFPC,
-                            &iFRC,
-                            &iSS,
-                            &fPos);
-        if(iRet != 1)
-        {   /* failure on this one, this has to be handled */
-            EL734_ErrInfo(&pErr,&iMSR,&iOMSR, &iSS);
-            EL734Error2Text(pBueffel,iMSR);
-            strncpy(buffer,pBueffel,(iBufLen-1));
-            *iCode = iMSR;
-            return;
-        
-        }
-        else
-        { 
-          /* we really come down to looking at status flags */
-          *iCode = EL734EncodeMSR(buffer,iBufLen,iMSR, iOMSR,iFPC,iFRC);
-        }
-     }
-  }  
-/* ------------------------------------------------------------------------
-   Types of errors possible on EL734:
-   
-   Network error: Try reopening connection and redo command.
-
-   Than there are problems which might have to do with a dodgy RS232,
-   resend command may help
-   
-   Some things cannot be fixed.
-*/
-
-  static int  FixError(void *self, int iError, float fNew)
-  {
-      EL734Driv *pDriv;
-      int iRet;
-      char pBueffel[512];
-      int iMSR, iOMSR, iSS;
-      float fPos;
-      
-      assert(self);
-      pDriv = (EL734Driv *)self;
-      sprintf(pBueffel,"EL734 : %s %d %d %d Problem:",pDriv->hostname,
-              pDriv->iPort, pDriv->iChannel, pDriv->iMotor);
-              
-      /* get & check MSR flags */        
-                   
-
-      /* check for codes */
-      switch(iError)
-      {
-        case 0: /* no error at all */
-               return MOTOK;
-        case EL734__BAD_ID:  /* ID */
-        case EL734__BAD_ADR:  /* ADR */
-        case EL734__BAD_CMD:   /* CMD */
-        case EL734__BAD_ILLG:   /* ILLG */
-        case EL734__BAD_PAR:  /* PAR */
-        case EL734__BAD_TMO:
-        	SICSLogWrite(pBueffel,eHWError);
-        	SICSLogWrite("BAD Command or dodgy RS-232",eHWError);
-        	return MOTREDO;
-        case EL734__EMERG_STOP:
-                return MOTFAIL;
-        case EL734__BAD_RNG: /* RNG */
-        case MSRONLIMIT: 
-                SICSLogWrite(pBueffel,eHWError);
-                SICSLogWrite("Out of Range",eHWError);
-                return MOTFAIL;
-        case EL734__BAD_STP:
-                return MOTFAIL;
-                break;        
-        case MSRBUSY:
-                return MOTREDO;
-        case MSRRUNFAULT:
-                SICSLogWrite(pBueffel,eHWError);
-                SICSLogWrite("------ RUN Fault in Controller ---- ",eHWError);
-                return MOTFAIL;
-        case MSRPOSFAULT:
-                SICSLogWrite(pBueffel,eHWError);
-                SICSLogWrite("------ POS Fault in Controller ---- ",eHWError);
-                return MOTFAIL;
-        case MSRDEADCUSHION:
-                SICSLogWrite(pBueffel,eHWError);
-                SICSLogWrite("------ Air cushion Fault in Controller ---- ",eHWError);
-                return MOTFAIL;
-        case MSRFAULT:
-                return MOTFAIL;        
-        case MSRHALT:
-        case MSRSTOP:
-                return MOTFAIL;
-        case EL734__FORCED_CLOSED:
-        case EL734__NOT_OPEN:
-               iRet = EL734_Open(&(pDriv->EL734struct),pDriv->hostname,
-                                  pDriv->iPort,pDriv->iChannel, 
-                                  pDriv->iMotor,"DCMC EL734");
-               if(iRet != 1)
-               {
-                  return MOTFAIL;
-               }                 
-               else
-               {   
-                  return MOTREDO;                     
-               } 
-               break;                 
-        case EL734__BAD_LOC:   /* LO2 */
-        case EL734__BAD_OFL:
-               EL734_Close(&(pDriv->EL734struct),0);
-               iRet = EL734_Open(&(pDriv->EL734struct),pDriv->hostname,
-                                  pDriv->iPort,pDriv->iChannel, 
-                                  pDriv->iMotor,"DCMC EL734");
-               if(iRet != 1)
-               {
-                  return MOTFAIL;
-               }                 
-               else
-               {   
-                  return MOTREDO;                     
-               } 
-               break;
-/*        case EL734__BAD_ASYNSRV:
-                EL734_Close(&(pDriv->EL734struct),1);
-                return MOTREDO;
-                break;                        
-*/        default:
-               SICSLogWrite(pBueffel,eHWError);
-               SICSLogWrite("Network problem, trying to reopen",eHWError);
-               EL734_Close(&(pDriv->EL734struct),1);
-               iRet = EL734_Open(&(pDriv->EL734struct),pDriv->hostname,
-                                  pDriv->iPort,pDriv->iChannel, 
-                                  pDriv->iMotor,"DCMC EL734");
-               if(iRet != 1)
-               {
-                  return MOTFAIL;
-               }                 
-               else
-               {   
-                  return MOTREDO;                     
-               } 
-      }
-  
-  }
-/*--------------------------------------------------------------------------*/
-  static int Halt(void *self)
-  {
-    EL734Driv *pDriv;
-    int iRet;
-    char pBueffel[80];
-    
-    assert(self);
-    pDriv = (EL734Driv *)self;
-    iRet = EL734_Stop(&(pDriv->EL734struct));
-    if(iRet != 1)
-    {
-      return OKOK;
-    }
-    return HWFault;
-  }  
-/*--------------------------------------------------------------------------*/
-  static int  GetStat(void *self)
-  {
-     EL734Driv *pDriv;
-     float fPos;
-     int iRet, iMSR, iOMSR, iFRC,iFPC, iSS;
-     int eRet;
-     int iTest;
-     char pBueffel[80];
-     
-     assert(self);
-     
-     pDriv = (EL734Driv *)self;
-     iRet = EL734_GetStatus(&(pDriv->EL734struct),
-                            &iMSR,
-                            &iOMSR,
-                            &iFPC,
-                            &iFRC,
-                            &iSS,
-                            &fPos);
-    if(iRet != 1)
-    {
-      return HWFault;
-    }
-
-    if(iMSR != 0)
-    {
-      pDriv->iMSR = iMSR;
-    }
-
-    iTest = EL734AnalyzeMSR(iMSR,iOMSR);
-    switch(iTest)
-    {
-         case MSRDEADCUSHION:
-         case MSRONLIMIT:
-         case MSRREF:
-         case MSRHALT:
-         case MSRSTOP:
-               return HWFault;
-               break;
-         case MSRRUNFAULT:
-         case MSRPOSFAULT:
-              return HWPosFault;
-              break;
-         case MSRBUSY:
-              return HWBusy;
-              break; 
-         case MSRFAULT:
-              return HWWarn;
-              break;         
-         default:
-              return HWIdle;
-              break; 
-    }
-    
-  }
-
-/*---------------------------------------------------------------------------*/
-  static EL734Driv *MakeEL734DC(char *hostname, int iPort, int iChannel,
-                         int iMotor)
-  {
-     EL734Driv *pDriv = NULL;
-
-     int iError;
-     char pBueffel[80];
-     char *pErr;
-     int iRet;
-     int iDummy;
-     
-     /* create a new struct */
-     pDriv = (EL734Driv *)malloc(sizeof(EL734Driv));
-     if(!pDriv)
-     {
-        return NULL;
-     }
-     memset(pDriv,0,sizeof(EL734Driv));
-     
-     /* fill in some of the data entered */
-     pDriv->hostname = strdup(hostname);
-     pDriv->iPort = iPort;
-     pDriv->iChannel = iChannel;
-     pDriv->iMotor = iMotor;
-     pDriv->name = strdup("EL734");
-     
-     /* try opening the motor */
-     iRet = EL734_Open(&(pDriv->EL734struct), hostname,iPort,
-                       iChannel,iMotor,"DCMC EL734");
-     if(iRet != 1)
-     {
-       EL734_ErrInfo(&pErr,&iError,&iRet, &iDummy);
-       KillEL734((void *)pDriv);
-       return NULL;
-     }  
-     
-     /* now get the limits */
-     EL734_GetLimits(&(pDriv->EL734struct),&(pDriv->fLower),
-                     &(pDriv->fUpper));
-                                                          
-     
-     /* initialise the function pointers */
-        pDriv->GetPosition = GetPos;     
-        pDriv->RunTo = Run;
-        pDriv->GetError = GetErr;
-        pDriv->GetStatus = GetStat;
-        pDriv->Halt     = Halt;
-        pDriv->TryAndFixIt = FixError;        
-        
-                     
-     return pDriv;         
-  } 	
-/*--------------------------------------------------------------------------
-  interpreting the driver parameters is up to the driver, this below
-  inplements just this
- */
-  MotorDriver *CreateEL734DC(SConnection *pCon, int argc, char *argv[])
-  {
-     EL734Driv *pDriv = NULL;
-     TokenList *pList = NULL;
-     TokenList *pCurrent;
-     char *hostname;
-     int iPort, iChannel, iMotor;
-     char pBueffel[512];
-  
-     assert(pCon);
-  
-     /* split arguments */
-     pList = SplitArguments(argc,argv);
-     if(!pList)
-     {
-       SCWrite(pCon,"Error parsing arguments",eError);
-       return NULL;
-     }   
-     
-     /* first must be hostname */
-     pCurrent = pList;
-     if(pCurrent->Type != eText)
-     {
-       sprintf(pBueffel,"EL734DC: Expected hostname but got --> %s <--",
-               pCurrent->text);
-       SCWrite(pCon,pBueffel,eError);
-       DeleteTokenList(pList);
-       return NULL;
-     }
-     hostname = pCurrent->text;
-     
-     /* next should be port */
-     pCurrent = pCurrent->pNext;
-     if(!pCurrent)
-     {
-       SCWrite(pCon,"EL734DC: Insufficient number of arguments",eError);
-       DeleteTokenList(pList);
-       return NULL;
-     }
-     if(pCurrent->Type != eInt)
-     {
-       sprintf(pBueffel,"EL734DC: Expected Integer as Port number, got --> %s <--",
-               pCurrent->text);
-       SCWrite(pCon,pBueffel,eError);        
-       DeleteTokenList(pList);
-       return NULL;
-     }
-     iPort = pCurrent->iVal;
-
-     
-     /* next should be Channel number */
-     pCurrent = pCurrent->pNext;
-     if(!pCurrent)
-     {
-       SCWrite(pCon,"EL734DC: Insufficient number of arguments",eError);
-       DeleteTokenList(pList);
-       return NULL;
-     }
-     if(pCurrent->Type != eInt)
-     {
-       sprintf(pBueffel,"EL734DC: Expected Integer as channel number, got --> %s <--",
-               pCurrent->text);
-       SCWrite(pCon,pBueffel,eError);        
-       DeleteTokenList(pList);
-       return NULL;
-     }
-     iChannel = pCurrent->iVal;
-     
-     /* finally motor number */
-     pCurrent = pCurrent->pNext;
-     if(!pCurrent)
-     {
-       
-       SCWrite(pCon,"EL734DC: Insufficient number of arguments",eError);
-       DeleteTokenList(pList);
-       return NULL;
-     }
-     if(pCurrent->Type != eInt)
-     {
-       sprintf(pBueffel,"EL734DC: Expected Integer as motor number, got --> %s <--",
-               pCurrent->text);
-       SCWrite(pCon,pBueffel,eError);        
-       DeleteTokenList(pList);
-       return NULL;
-     }
-     iMotor = pCurrent->iVal;
-     
-     
-     /* finally initialize driver */
-     pDriv = MakeEL734DC(hostname,iPort,iChannel,iMotor);
-     if(!pDriv)
-     {
-       SCWrite(pCon,"EL734DC: error opening motor, check adress",eError);
-       pDriv = NULL;  
-     }
-     
-     /* clean up */
-     DeleteTokenList(pList);
-     return (MotorDriver *)pDriv;
-  }
-/*-------------------------------------------------------------------------
-  Stolen from David and modified to return an integer error code as well
-*/
-  static int EL734EncodeMSR (char *text,  int text_len,
-				int msr,
-				int ored_msr,
-				int fp_cntr,
-				int fr_cntr) {
-    int	    len;
-    char    my_text[132];
-    char    my_text_0[32];
-    int iRet = 0;
-
-    if (msr == 0) {
-      ored_msr = ored_msr & ~(MSR__BUSY);	    /* Zero "Busy" bit */
-      if (ored_msr == MSR__OK) {
-        StrJoin (text, text_len, "Status, MSR = Idle. Positioned OK.", "");
-      }else {
-        if ((ored_msr & MSR__OK) != 0) {
-          StrJoin (text, text_len, "Status, MSR = Idle. Positioned OK. ", "");
-        }else {
-          StrJoin (text, text_len, "Status, MSR = Idle. ", "");
-	}
-	if ((ored_msr & MSR__REF_OK) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Ref. Pos'n OK. ");
-	}
-	if ((ored_msr & MSR__LIM_ERR) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Limit Switch Problem. ");
-	  iRet = MSRONLIMIT;
-	}
-	if ((ored_msr & MSR__AC_FAIL) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Air-Cushion Error. ");
-	  iRet = MSRDEADCUSHION;
-	}
-	if ((ored_msr & MSR__REF_FAIL) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Ref. Pos'n Fail. ");
-	}
-	if ((ored_msr & MSR__POS_FAIL) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Pos'n Fail. ");
-	  iRet = MSRPOSFAULT;
-	}
-	if ((ored_msr & MSR__POS_FAULT) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  if (fp_cntr == 1) {
-	    StrJoin (text, text_len, my_text, "1 Pos'n Fault. ");
-	  }else {
-	    sprintf (my_text_0, "%d Pos'n Faults. ", fp_cntr);
-	    StrJoin (text, text_len, my_text, my_text_0);
-	  }
-	}
-	if ((ored_msr & MSR__RUN_FAIL) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Run Fail. ");
-	  iRet = MSRRUNFAULT;
-	}
-	if ((ored_msr & MSR__RUN_FAULT) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  if (fr_cntr == 1) {
-	    StrJoin (text, text_len, my_text, "1 Run Fault. ");
-	  }else {
-	    sprintf (my_text_0, "%d Run Faults. ", fr_cntr);
-	    StrJoin (text, text_len, my_text, my_text_0);
-	  }
-	}
-	if ((ored_msr & MSR__HALT) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Halt. ");
-	  iRet = MSRHALT;
-	}
-	if ((ored_msr & MSR__HI_LIM) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Hit HiLim. ");
-	  iRet = MSRONLIMIT;
-	}
-	if ((ored_msr & MSR__LO_LIM) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Hit LoLim. ");
-	  iRet = MSRONLIMIT;
-	}
-	if ((ored_msr & MSR__STOPPED) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Stopped. ");
-	  iRet = MSRSTOP;
-	}
-      }
-    }else if ((msr & ~(0x2fff)) != 0) {
-      StrJoin (text, text_len, "Status, MSR = ??", "");
-    }else {
-      sprintf (my_text, "%#x ", msr);
-      StrJoin (text, text_len, "Status, MSR = ", my_text);
-      if ((msr & MSR__LIM_ERR) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Limit Switch Problem/");
-        iRet = MSRONLIMIT;
-      }
-      if ((msr & MSR__AC_FAIL) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Air-Cushion Error/");
-        iRet = MSRDEADCUSHION;
-      }
-      if ((msr & MSR__REF_FAIL) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Ref. Pos'n Fail/");
-      }
-      if ((msr & MSR__POS_FAIL) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Pos'n Fail/");
-        iRet = MSRPOSFAULT;
-      }
-      if ((msr & MSR__POS_FAULT) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Pos'n Fault/");
-      }
-      if ((msr & MSR__RUN_FAIL)	!= 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Run Fail/");
-        iRet = MSRRUNFAULT;
-      }
-      if ((msr & MSR__RUN_FAULT) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Run Fault/");
-      }
-      if ((msr & MSR__HALT) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Halt/");
-        iRet = MSRHALT;
-      }
-      if ((msr & MSR__HI_LIM) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Hit HiLim/");
-        iRet = MSRONLIMIT;
-      }
-      if ((msr & MSR__LO_LIM) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Hit LoLim/");
-        iRet = MSRONLIMIT;
-      }
-      if ((msr & MSR__STOPPED) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Stopped/");
-        iRet = MSRSTOP;
-      }
-      if ((msr & MSR__REF_OK) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Ref. Pos'n OK/");
-      }
-      if ((msr & MSR__OK) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "OK/");
-      }
-      if ((msr & MSR__BUSY) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Busy/");
-      }
-      len = strlen (text);
-      text[len-1] = '\0';
-    }
-    return iRet;
-  }
-/*-------------------------------------------------------------------------*/
-  static int EL734AnalyzeMSR(int msr,int ored_msr)
-  {
-    int iRet = 0;
-
-  /* this means the motor is done */
-    if (msr == 0) {
-      ored_msr = ored_msr & ~(MSR__BUSY);	    /* Zero "Busy" bit */
-      if (ored_msr == MSR__OK) {
-        iRet = MSROK;
-      }else {
-        if ((ored_msr & MSR__OK) != 0) {
-           iRet = MSROK;
-        }else {
-           iRet = MSROK;
- 	}
-	if ((ored_msr & MSR__REF_OK) != 0) {
-	   iRet = MSROK;
-	}
-	if ((ored_msr & MSR__LIM_ERR) != 0) {
-	  return MSRONLIMIT;
-	}
-	if ((ored_msr & MSR__AC_FAIL) != 0) {
-	  return MSRDEADCUSHION;
-	}
-	if ((ored_msr & MSR__REF_FAIL) != 0) {
-	  iRet = MSRREF;
-	}
-	if ((ored_msr & MSR__POS_FAIL) != 0) {
-	  return MSRPOSFAULT;
-	}
-	if ((ored_msr & MSR__POS_FAULT) != 0) {
-          iRet = MSRFAULT;
-	}
-	if ((ored_msr & MSR__RUN_FAIL) != 0) {
-	  return MSRRUNFAULT;
-	}
-	if ((ored_msr & MSR__RUN_FAULT) != 0) {
-          iRet = MSRFAULT;
-	}
-	if ((ored_msr & MSR__HALT) != 0) {
-	  return MSRHALT;
-	}
-	if ((ored_msr & MSR__HI_LIM) != 0) {
-	  return MSRONLIMIT;
-	}
-	if ((ored_msr & MSR__LO_LIM) != 0) {
-	  return MSRONLIMIT;
-	}
-	if ((ored_msr & MSR__STOPPED) != 0) {
-	  return MSRSTOP;
-	}
-      }
-      /* the motor is still fighting along */
-    }else if ((msr & ~(0x2fff)) != 0) {
-      iRet = MSROK;
-    }else {
-      if ((msr & MSR__LIM_ERR) != 0) {
-        return MSRONLIMIT;
-      }
-      if ((msr & MSR__AC_FAIL) != 0) {
-        return MSRDEADCUSHION;
-      }
-      if ((msr & MSR__REF_FAIL) != 0) {
-        iRet = MSRREF;
-      }
-      if ((msr & MSR__POS_FAIL) != 0) {
-        return MSRPOSFAULT;
-      }
-      if ((msr & MSR__POS_FAULT) != 0) {
-        iRet = MSRFAULT;
-      }
-      if ((msr & MSR__RUN_FAIL)	!= 0) {
-        return MSRRUNFAULT;
-      }
-      if ((msr & MSR__RUN_FAULT) != 0) {
-        iRet = MSRFAULT;
-      }
-      if ((msr & MSR__HALT) != 0) {
-        return MSRHALT;
-      }
-      if ((msr & MSR__HI_LIM) != 0) {
-        return MSRONLIMIT;
-      }
-      if ((msr & MSR__LO_LIM) != 0) {
-        return MSRONLIMIT;
-      }
-      if ((msr & MSR__STOPPED) != 0) {
-        return MSRSTOP;
-      }
-      if ((msr & MSR__REF_OK) != 0) {
-        iRet = MSROK;
-      }
-      if ((msr & MSR__OK) != 0) {
-        iRet = MSROK;
-      }
-      if ((msr & MSR__BUSY) != 0) {
-        iRet = MSRBUSY;
-      }
-    }
-    return iRet;
-  }
-
-
diff --git a/el734driv.c b/el734driv.c
deleted file mode 100644
index 10835d86..00000000
--- a/el734driv.c
+++ /dev/null
@@ -1,923 +0,0 @@
-/*--------------------------------------------------------------------------
-	A motor driver for EL734 type motors as used at SinQ
-	
-
-	Mark Koennecke,    November 1996
-
-	Copyright:
-
-	Labor fuer Neutronenstreuung
-	Paul Scherrer Institut
-	CH-5423 Villigen-PSI
-
-
-        The authors hereby grant permission to use, copy, modify, distribute,
-        and license this software and its documentation for any purpose, provided
-        that existing copyright notices are retained in all copies and that this
-        notice is included verbatim in any distributions. No written agreement,
-        license, or royalty fee is required for any of the authorized uses.
-        Modifications to this software may be copyrighted by their authors
-        and need not follow the licensing terms described here, provided that
-        the new terms are clearly indicated on the first page of each file where
-        they apply.
-
-        IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-        FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-        ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-        DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-        POSSIBILITY OF SUCH DAMAGE.
-
-        THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-        INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-        IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-        NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-        MODIFICATIONS.
-------------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <assert.h>
-#include <string.h>
-#include "fortify.h"
-#include "sics.h"
-#include "modriv.h"
-#include "hardsup/sinq_prototypes.h"
-#include "hardsup/rs232c_def.h"
-#include "hardsup/el734_def.h"
-#include "hardsup/el734fix.h"
-#include "bit.h"
-#include "splitter.h"
-
-
-
- static int EL734EncodeMSR(char *text, int iLen,
-                           int iMSR, int iOMSR, int iFP, int iFR);
-
- static int EL734AnalyzeMSR(int iMSR, int iOMSR);
- 
-/* addional error codes for Status-things */
-#define MSRBUSY -40
-#define MSRONLIMIT -41
-#define MSRRUNFAULT -42
-#define MSRPOSFAULT -43
-#define MSRDEADCUSHION -44
-#define MSRHALT -45
-#define MSRSTOP -46
-#define MSROK -47
-#define MSRREF -48
-#define MSRFAULT -49
-/* --------------------------------------------------------------------------*/
-  static int GetPos(void *self, float *fData)
-  {
-     EL734Driv *pDriv;
-     float fPos;
-     int iRet, iMSR, iOMSR, iFRC,iFPC, iSS;
-     
-     assert(self);
-     
-     pDriv = (EL734Driv *)self;
-     iRet = EL734_GetStatus(&(pDriv->EL734struct),
-                            &iMSR,
-                            &iOMSR,
-                            &iFPC,
-                            &iFRC,
-                            &iSS,
-                            &fPos);
-     if(iMSR != 0)
-     {
-       pDriv->iMSR = iMSR;
-     }                       
-    *fData = fPos;
-     if(iRet != 1)
-     {
-       return HWFault;
-     }
-     else
-     return OKOK;
-     
-  }
-/*--------------------------------------------------------------------------*/
-  static int Run(void *self, float fNew)
-  {
-     EL734Driv *pDriv;
-     int iRet;
-     
-     assert(self);
-     
-     pDriv = (EL734Driv *)self;
-     iRet = EL734_MoveNoWait (&(pDriv->EL734struct), fNew);
-     if(iRet == 1)
-     {
-       return OKOK;
-     }             
-     else
-     {
-       return HWFault;
-     }    
-  }  
-
-/*---------------------------------------------------------------------------
-
-	EL734Error2Text converts between an EL734 error code to text
------------------------------------------------------------------------------*/
- extern char EL734_IllgText[256]; 
-
-	static void EL734Error2Text(char *pBuffer, int iErr)
-	{
-	        strcpy(pBuffer,"ERROR: HW:");
-		switch(iErr)
-		{
-			case EL734__BAD_ADR:
-				strcat(pBuffer,"EL734__BAD_ADR");
-				break;
-			case EL734__BAD_BIND:
-				strcat(pBuffer,"EL734__BAD_BIND");
-				break;
-			case EL734__BAD_CMD:
-				strcat(pBuffer,"EL734__BAD_CMD");
-				break;
-			case EL734__BAD_CONNECT:
-				strcat(pBuffer,"EL734__BAD_CONNECT");
-				break;
-			case EL734__BAD_FLUSH:
-				strcat(pBuffer,"EL734__BAD_FLUSH");
-				break;
-			case EL734__BAD_HOST:
-				strcat(pBuffer,"EL734__BAD_HOST");
-				break;
-			case EL734__BAD_ID:
-				strcat(pBuffer,"EL734__BAD_ID");
-				break;
-			case EL734__BAD_ILLG:
-				strcat(pBuffer,"EL734__BAD_ILLG ");
-				
-                                strcat(pBuffer,EL734_IllgText);
-                                
-				break;
-			case EL734__BAD_LOC:
-				strcat(pBuffer,"EL734__BAD_LOC");
-				break;
-			case EL734__BAD_MALLOC:
-				strcat(pBuffer,"EL734__BAD_MALLOC");
-				break;
-			case EL734__BAD_NOT_BCD:
-				strcat(pBuffer,"EL734__BAD_NOT_BCD");
-				break;
-			case EL734__BAD_OFL:
-				strcat(pBuffer,"EL734__BAD_OFL");
-				break;
-			case EL734__BAD_PAR:
-				strcat(pBuffer,"EL734__BAD_PAR");
-				break;
-			
-			case EL734__BAD_RECV:
-				strcat(pBuffer,"EL734__BAD_RECV");
-				break;
-			case EL734__BAD_RECV_NET:
-				strcat(pBuffer,"EL734__BAD_RECV_NET");
-				break;
-			case EL734__BAD_RECV_PIPE:
-				strcat(pBuffer,"EL734__BAD_RECV_PIPE");
-				break;
-			case EL734__BAD_RECV_UNKN:
-				strcat(pBuffer,"EL734__BAD_RECV_UNKN");
-				break;
-			case EL734__BAD_RECVLEN:
-				strcat(pBuffer,"EL734__BAD_RECVLEN");
-				break;
-			case EL734__BAD_RECV1:
-				strcat(pBuffer,"EL734__BAD_RECV1");
-				break;
-			case EL734__BAD_RECV1_NET:
-				strcat(pBuffer,"EL734__BAD_RECV1_NET");
-				break;
-			case EL734__BAD_RECV1_PIPE:
-				strcat(pBuffer,"EL734__BAD_RECV1_PIPE");
-				break;
-			case EL734__BAD_RNG:
-				strcat(pBuffer,"EL734__BAD_RNG");
-				break;
-			case EL734__BAD_SEND:
-				strcat(pBuffer,"EL734__BAD_SEND");
-				break;
-			case EL734__BAD_SEND_PIPE:
-				strcat(pBuffer,"EL734__BAD_SEND_PIPE");
-				break;
-			case EL734__BAD_SEND_NET:
-				strcat(pBuffer,"EL734__BAD_SEND_NET");
-				break;
-			case EL734__BAD_SEND_UNKN:
-				strcat(pBuffer,"EL734__BAD_SEND_UNKN");
-				break;
-			case EL734__BAD_SENDLEN:
-				strcat(pBuffer,"EL734__BAD_SENDLEN");
-				break;
-			case EL734__BAD_SOCKET:
-				strcat(pBuffer,"EL734__BAD_SOCKET");
-				break;
-			case EL734__BAD_TMO:
-				strcat(pBuffer,"EL734__BAD_TMO");
-				break;
-		        case EL734__FORCED_CLOSED:
-				strcat(pBuffer,"EL734__FORCED_CLOSED");
-				break;
-		        case EL734__BAD_STP:
-		                strcat(pBuffer,"EL734__BAD_STP");
-		                break; 		
-		        case EL734__EMERG_STOP:
-		                strcat(pBuffer,"EL734__EMERG_STOP");
-		                break; 		
-		        case EL734__NOT_OPEN:
-		                strcat(pBuffer,"EL734__NOT_OPEN");
-		                break; 		
-		        case EL734__BAD_ASYNSRV:
-		                strcat(pBuffer,"EL734__BAD_ASYNSRV");
-		                break; 		
-			default:
-				sprintf(pBuffer,"Unknown EL734 error %d",iErr);
-				break;	
-		}
-	}
-	
-/*-------------------------------------------------------------------------*/
-  static void GetErr(void *self, int *iCode, char *buffer, int iBufLen)
-  {
-     EL734Driv *pDriv;
-     char pBueffel[512];
-     int iMSR, iOMSR, iSS;
-     int iRet, iFPC, iFRC;
-     int iErr;
-     float fPos;
-     char *pErr;
-     
-     assert(self);
-     
-     /* get EL734 error codes */
-     pDriv = (EL734Driv *)self;
-     EL734_ErrInfo(&pErr,&iMSR,&iOMSR, &iSS);
-     if(iMSR != 0)
-     {
-            EL734Error2Text(pBueffel,iMSR);
-            strncpy(buffer,pBueffel,(iBufLen-1));
-            *iCode = iMSR;
-            return;
-     }
-     else
-     {  /* check status flag for addional errors */
-       iRet = EL734_GetStatus(&(pDriv->EL734struct),
-                            &iMSR,
-                            &iOMSR,
-                            &iFPC,
-                            &iFRC,
-                            &iSS,
-                            &fPos);
-        if(iRet != 1)
-        {   /* failure on this one, this has to be handled */
-            EL734_ErrInfo(&pErr,&iMSR,&iOMSR, &iSS);
-            EL734Error2Text(pBueffel,iMSR);
-            strncpy(buffer,pBueffel,(iBufLen-1));
-            *iCode = iMSR;
-            return;
-        
-        }
-        else
-        { 
-          /* we really come down to looking at status flags */
-          *iCode = EL734EncodeMSR(buffer,iBufLen,iMSR, iOMSR,iFPC,iFRC);
-        }
-     }
-  }  
-/* ------------------------------------------------------------------------
-   Types of errors possible on EL734:
-   
-   Network error: Try reopening connection and redo command.
-
-   Than there are problems which might have to do with a dodgy RS232,
-   resend command may help
-   
-   Some things cannot be fixed.
-*/
-   
-  static int  FixError(void *self, int iError, float fNew)
-  {
-      EL734Driv *pDriv;
-      int iRet;
-      char pBueffel[512];
-      int iMSR, iOMSR, iSS;
-      float fPos;
-      
-      assert(self);
-      pDriv = (EL734Driv *)self;
-      sprintf(pBueffel,"EL734 : %s %d %d %d Problem:",pDriv->hostname,
-              pDriv->iPort, pDriv->iChannel, pDriv->iMotor);
-              
-      /* get & check MSR flags */        
-                   
-
-      /* check for codes */
-      switch(iError)
-      {
-        case 0: /* no error at all */
-               return MOTOK;
-        case EL734__BAD_ID:  /* ID */
-        case EL734__BAD_ADR:  /* ADR */
-        case EL734__BAD_CMD:   /* CMD */
-        case EL734__BAD_ILLG:   /* ILLG */
-        case EL734__BAD_PAR:  /* PAR */
-        case EL734__BAD_TMO: /* timeout */
-        	SICSLogWrite(pBueffel,eHWError);
-        	SICSLogWrite("BAD Command or dodgy RS-232",eHWError);
-        	return MOTREDO;
-        case EL734__EMERG_STOP:
-                return MOTFAIL;
-        case EL734__BAD_STP: /* motor disabled by switch */
-                return MOTFAIL;
-                break;
-        case EL734__BAD_RNG: /* RNG */
-        case MSRONLIMIT: 
-                SICSLogWrite(pBueffel,eHWError);
-                SICSLogWrite("Out of Range",eHWError);
-                return MOTFAIL;
-        case MSRBUSY:
-                return MOTREDO;
-        case MSRRUNFAULT:
-                SICSLogWrite(pBueffel,eHWError);
-                SICSLogWrite("------ RUN Fault in Controller ---- ",eHWError);
-                return MOTFAIL;
-        case MSRPOSFAULT:
-                SICSLogWrite(pBueffel,eHWError);
-                SICSLogWrite("------ POS Fault in Controller ---- ",eHWError);
-                return MOTFAIL;
-        case MSRDEADCUSHION:
-                SICSLogWrite(pBueffel,eHWError);
-                SICSLogWrite("------ Air cushion Fault in Controller ---- ",eHWError);
-                return MOTFAIL;
-        case MSRFAULT:
-                return MOTFAIL;        
-        case MSRHALT:
-        case MSRSTOP:
-                return MOTFAIL;
-        case EL734__FORCED_CLOSED:
-        case EL734__NOT_OPEN:
-               iRet = EL734_Open(&(pDriv->EL734struct),pDriv->hostname,
-                                  pDriv->iPort,pDriv->iChannel, 
-                                  pDriv->iMotor,"STPMC EL734");
-               if(iRet != 1)
-               {
-                  return MOTFAIL;
-               }                 
-               else
-               {   
-                  return MOTREDO;                     
-               } 
-               break;                
-        case EL734__BAD_OFL:
-        case EL734__BAD_LOC:   /* LOocal mode */
-               EL734_Close(&(pDriv->EL734struct),0);
-               iRet = EL734_Open(&(pDriv->EL734struct),pDriv->hostname,
-                                  pDriv->iPort,pDriv->iChannel, 
-                                  pDriv->iMotor,"STPMC EL734");
-               if(iRet != 1)
-               {
-                  return MOTFAIL;
-               }                 
-               else
-               {   
-                  return MOTREDO;                     
-               } 
-               break;
-/*        case EL734__BAD_ASYNSRV:                       
-               EL734_Close(&(pDriv->EL734struct),1);
-               return MOTREDO;
-*/
-        default:
-               SICSLogWrite(pBueffel,eHWError);
-               SICSLogWrite("Network problem, trying to reopen",eHWError);
-               EL734_Close(&(pDriv->EL734struct),1);
-               iRet = EL734_Open(&(pDriv->EL734struct),pDriv->hostname,
-                                  pDriv->iPort,pDriv->iChannel, 
-                                  pDriv->iMotor,"STPMC EL734");
-               if(iRet != 1)
-               {
-                  return MOTFAIL;
-               }                 
-               else
-               {   
-                  return MOTREDO;                     
-               } 
-      }
-  
-  }
-/*--------------------------------------------------------------------------*/
-  static int Halt(void *self)
-  {
-    EL734Driv *pDriv;
-    int iRet;
-    char pBueffel[80];
-    
-    assert(self);
-    pDriv = (EL734Driv *)self;
-    iRet = EL734_Stop(&(pDriv->EL734struct));
-    if(iRet == 1)
-    {
-      return OKOK;
-    }
-    return HWFault;
-  }  
-/*--------------------------------------------------------------------------*/
-  static int  GetStat(void *self)
-  {
-     EL734Driv *pDriv;
-     float fPos;
-     int iRet, iMSR, iOMSR, iFRC,iFPC, iSS;
-     int eRet;
-     int iTest;
-     char pBueffel[80];
-     
-     assert(self);
-     
-     pDriv = (EL734Driv *)self;
-     iRet = EL734_GetStatus(&(pDriv->EL734struct),
-                            &iMSR,
-                            &iOMSR,
-                            &iFPC,
-                            &iFRC,
-                            &iSS,
-                            &fPos);
-    if(iRet != 1)
-    {
-      return HWFault;
-    }
-
-    if(iMSR != 0)
-    {
-      pDriv->iMSR = iMSR;
-    }
-
-    iTest = EL734AnalyzeMSR(iMSR,iOMSR);
-    switch(iTest)
-    {
-         case MSRDEADCUSHION:
-         case MSRONLIMIT:
-         case MSRREF:
-         case MSRHALT:
-         case MSRSTOP:
-               return HWFault;
-               break;
-         case MSRRUNFAULT:
-         case MSRPOSFAULT:
-              return HWPosFault;
-              break;
-         case MSRBUSY:
-              return HWBusy;
-              break; 
-         case MSRFAULT:
-              return HWWarn;
-              break;         
-         default:
-              return HWIdle;
-              break; 
-    }
-  }
-
-/*---------------------------------------------------------------------------*/
-  static EL734Driv *MakeEL734(char *hostname, int iPort, int iChannel,
-                         int iMotor)
-  {
-     EL734Driv *pDriv = NULL;
-
-     int iError;
-     char pBueffel[80];
-     char *pErr;
-     int iRet;
-     int iDummy;
-     
-     /* create a new struct */
-     pDriv = (EL734Driv *)malloc(sizeof(EL734Driv));
-     if(!pDriv)
-     {
-        return NULL;
-     }
-     memset(pDriv,0,sizeof(EL734Driv));
-     
-     /* fill in some of the data entered */
-     pDriv->hostname = strdup(hostname);
-     pDriv->iPort = iPort;
-     pDriv->iChannel = iChannel;
-     pDriv->iMotor = iMotor;
-     pDriv->name = strdup("EL734");
-     
-     /* try opening the motor */
-     iRet = EL734_Open(&(pDriv->EL734struct), hostname,iPort,
-                       iChannel,iMotor,"STPMC EL734");
-     if(iRet != 1)
-     {
-       EL734_ErrInfo(&pErr,&iError,&iRet, &iDummy);
-       KillEL734((void *)pDriv);
-       return NULL;
-     }  
-     
-     /* now get the limits */
-     EL734_GetLimits(&(pDriv->EL734struct),&(pDriv->fLower),
-                     &(pDriv->fUpper));
-                                                          
-     
-     /* initialise the function pointers */
-        pDriv->GetPosition = GetPos;     
-        pDriv->RunTo = Run;
-        pDriv->GetError = GetErr;
-        pDriv->GetStatus = GetStat;
-        pDriv->Halt     = Halt;
-        pDriv->TryAndFixIt = FixError;        
-        
-                     
-     return pDriv;         
-  } 	
-/*--------------------------------------------------------------------------*/
-  void KillEL734(void *self)
-  {
-     EL734Driv *pDriv;
-     
-     assert(self);
-     pDriv = (EL734Driv *)self;
-     
-     EL734_Close(&(pDriv->EL734struct),0);
-     if(pDriv->hostname)
-       free(pDriv->hostname);
-     if(pDriv->name)
-        free(pDriv->name);
-     free(pDriv);
-
-  }
-
-/*--------------------------------------------------------------------------
-  interpreting the driver parameters is up to the driver, this below
-  inplements just this
- */
-  MotorDriver *CreateEL734(SConnection *pCon, int argc, char *argv[])
-  {
-     EL734Driv *pDriv = NULL;
-     TokenList *pList = NULL;
-     TokenList *pCurrent;
-     char *hostname;
-     int iPort, iChannel, iMotor;
-     char pBueffel[512];
-  
-     assert(pCon);
-  
-     /* split arguments */
-     pList = SplitArguments(argc,argv);
-     if(!pList)
-     {
-       SCWrite(pCon,"Error parsing arguments",eError);
-       return NULL;
-     }   
-     
-     /* first must be hostname */
-     pCurrent = pList;
-     if(pCurrent->Type != eText)
-     {
-       sprintf(pBueffel,"EL734: Expected hostname but got --> %s <--",
-               pCurrent->text);
-       SCWrite(pCon,pBueffel,eError);
-       DeleteTokenList(pList);
-       return NULL;
-     }
-     hostname = pCurrent->text;
-     
-     /* next should be port */
-     pCurrent = pCurrent->pNext;
-     if(!pCurrent)
-     {
-       SCWrite(pCon,"EL734: Insufficient number of arguments",eError);
-       DeleteTokenList(pList);
-       return NULL;
-     }
-     if(pCurrent->Type != eInt)
-     {
-       sprintf(pBueffel,"EL734: Expected Integer as Port number, got --> %s <--",
-               pCurrent->text);
-       SCWrite(pCon,pBueffel,eError);        
-       DeleteTokenList(pList);
-       return NULL;
-     }
-     iPort = pCurrent->iVal;
-
-     
-     /* next should be Channel number */
-     pCurrent = pCurrent->pNext;
-     if(!pCurrent)
-     {
-       SCWrite(pCon,"EL734: Insufficient number of arguments",eError);
-       DeleteTokenList(pList);
-       return NULL;
-     }
-     if(pCurrent->Type != eInt)
-     {
-       sprintf(pBueffel,"EL734: Expected Integer as channel number, got --> %s <--",
-               pCurrent->text);
-       SCWrite(pCon,pBueffel,eError);        
-       DeleteTokenList(pList);
-       return NULL;
-     }
-     iChannel = pCurrent->iVal;
-     
-     /* finally motor number */
-     pCurrent = pCurrent->pNext;
-     if(!pCurrent)
-     {
-       
-       SCWrite(pCon,"EL734: Insufficient number of arguments",eError);
-       DeleteTokenList(pList);
-       return NULL;
-     }
-     if(pCurrent->Type != eInt)
-     {
-       sprintf(pBueffel,"EL734: Expected Integer as motor number, got --> %s <--",
-               pCurrent->text);
-       SCWrite(pCon,pBueffel,eError);        
-       DeleteTokenList(pList);
-       return NULL;
-     }
-     iMotor = pCurrent->iVal;
-     
-     
-     /* finally initialize driver */
-     pDriv = MakeEL734(hostname,iPort,iChannel,iMotor);
-     if(!pDriv)
-     {
-       SCWrite(pCon,"EL734: error opening motor, check adress",eError);
-       pDriv = NULL;  
-     }
-     
-     /* clean up */
-     DeleteTokenList(pList);
-     return (MotorDriver *)pDriv;
-  }
-/*-------------------------------------------------------------------------
-  Stolen from David and modified to return an integer error code as well
-*/
-  static int EL734EncodeMSR (char *text,  int text_len,
-				int msr,
-				int ored_msr,
-				int fp_cntr,
-				int fr_cntr) {
-    int	    len;
-    char    my_text[132];
-    char    my_text_0[32];
-    int iRet = 0;
-
-    if (msr == 0) {
-      ored_msr = ored_msr & ~(MSR__BUSY);	    /* Zero "Busy" bit */
-      if (ored_msr == MSR__OK) {
-        StrJoin (text, text_len, "Status, MSR = Idle. Positioned OK.", "");
-      }else {
-        if ((ored_msr & MSR__OK) != 0) {
-          StrJoin (text, text_len, "Status, MSR = Idle. Positioned OK. ", "");
-        }else {
-          StrJoin (text, text_len, "Status, MSR = Idle. ", "");
-	}
-	if ((ored_msr & MSR__REF_OK) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Ref. Pos'n OK. ");
-	}
-	if ((ored_msr & MSR__LIM_ERR) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Limit Switch Problem. ");
-	  iRet = MSRONLIMIT;
-	}
-	if ((ored_msr & MSR__AC_FAIL) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Air-Cushion Error. ");
-	  iRet = MSRDEADCUSHION;
-	}
-	if ((ored_msr & MSR__REF_FAIL) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Ref. Pos'n Fail. ");
-	}
-	if ((ored_msr & MSR__POS_FAIL) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Pos'n Fail. ");
-	  iRet = MSRPOSFAULT;
-	}
-	if ((ored_msr & MSR__POS_FAULT) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  if (fp_cntr == 1) {
-	    StrJoin (text, text_len, my_text, "1 Pos'n Fault. ");
-	  }else {
-	    sprintf (my_text_0, "%d Pos'n Faults. ", fp_cntr);
-	    StrJoin (text, text_len, my_text, my_text_0);
-	  }
-	}
-	if ((ored_msr & MSR__RUN_FAIL) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Run Fail. ");
-	  iRet = MSRRUNFAULT;
-	}
-	if ((ored_msr & MSR__RUN_FAULT) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  if (fr_cntr == 1) {
-	    StrJoin (text, text_len, my_text, "1 Run Fault. ");
-	  }else {
-	    sprintf (my_text_0, "%d Run Faults. ", fr_cntr);
-	    StrJoin (text, text_len, my_text, my_text_0);
-	  }
-	}
-	if ((ored_msr & MSR__HALT) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Halt. ");
-	  iRet = MSRHALT;
-	}
-	if ((ored_msr & MSR__HI_LIM) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Hit HiLim. ");
-	  iRet = MSRONLIMIT;
-	}
-	if ((ored_msr & MSR__LO_LIM) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Hit LoLim. ");
-	  iRet = MSRONLIMIT;
-	}
-	if ((ored_msr & MSR__STOPPED) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Stopped. ");
-	  iRet = MSRSTOP;
-	}
-      }
-    }else if ((msr & ~(0x2fff)) != 0) {
-      StrJoin (text, text_len, "Status, MSR = ??", "");
-    }else {
-      sprintf (my_text, "%#x ", msr);
-      StrJoin (text, text_len, "Status, MSR = ", my_text);
-      if ((msr & MSR__LIM_ERR) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Limit Switch Problem/");
-        iRet = MSRONLIMIT;
-      }
-      if ((msr & MSR__AC_FAIL) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Air-Cushion Error/");
-        iRet = MSRDEADCUSHION;
-      }
-      if ((msr & MSR__REF_FAIL) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Ref. Pos'n Fail/");
-      }
-      if ((msr & MSR__POS_FAIL) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Pos'n Fail/");
-        iRet = MSRPOSFAULT;
-      }
-      if ((msr & MSR__POS_FAULT) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Pos'n Fault/");
-      }
-      if ((msr & MSR__RUN_FAIL)	!= 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Run Fail/");
-        iRet = MSRRUNFAULT;
-      }
-      if ((msr & MSR__RUN_FAULT) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Run Fault/");
-      }
-      if ((msr & MSR__HALT) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Halt/");
-        iRet = MSRHALT;
-      }
-      if ((msr & MSR__HI_LIM) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Hit HiLim/");
-        iRet = MSRONLIMIT;
-      }
-      if ((msr & MSR__LO_LIM) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Hit LoLim/");
-        iRet = MSRONLIMIT;
-      }
-      if ((msr & MSR__STOPPED) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Stopped/");
-        iRet = MSRSTOP;
-      }
-      if ((msr & MSR__REF_OK) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Ref. Pos'n OK/");
-      }
-      if ((msr & MSR__OK) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "OK/");
-      }
-      if ((msr & MSR__BUSY) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Busy/");
-      }
-      len = strlen (text);
-      text[len-1] = '\0';
-    }
-    return iRet;
-  }
-/*-------------------------------------------------------------------------*/
-  static int EL734AnalyzeMSR(int msr,int ored_msr)
-  {
-    int iRet = 0;
-
-  /* this means the motor is done */
-    if (msr == 0) {
-      ored_msr = ored_msr & ~(MSR__BUSY);	    /* Zero "Busy" bit */
-      if (ored_msr == MSR__OK) {
-        iRet = MSROK;
-      }else {
-        if ((ored_msr & MSR__OK) != 0) {
-           iRet = MSROK;
-        }else {
-           iRet = MSROK;
- 	}
-	if ((ored_msr & MSR__REF_OK) != 0) {
-	   iRet = MSROK;
-	}
-	if ((ored_msr & MSR__LIM_ERR) != 0) {
-	  return MSRONLIMIT;
-	}
-	if ((ored_msr & MSR__AC_FAIL) != 0) {
-	  return MSRDEADCUSHION;
-	}
-	if ((ored_msr & MSR__REF_FAIL) != 0) {
-	  iRet = MSRREF;
-	}
-	if ((ored_msr & MSR__POS_FAIL) != 0) {
-	  return MSRPOSFAULT;
-	}
-	if ((ored_msr & MSR__POS_FAULT) != 0) {
-          iRet = MSRFAULT;
-	}
-	if ((ored_msr & MSR__RUN_FAIL) != 0) {
-	  return MSRRUNFAULT;
-	}
-	if ((ored_msr & MSR__RUN_FAULT) != 0) {
-          iRet = MSRFAULT;
-	}
-	if ((ored_msr & MSR__HALT) != 0) {
-	  return MSRHALT;
-	}
-	if ((ored_msr & MSR__HI_LIM) != 0) {
-	  return MSRONLIMIT;
-	}
-	if ((ored_msr & MSR__LO_LIM) != 0) {
-	  return MSRONLIMIT;
-	}
-	if ((ored_msr & MSR__STOPPED) != 0) {
-	  return MSRSTOP;
-	}
-      }
-      /* the motor is still fighting along */
-    }else if ((msr & ~(0x2fff)) != 0) {
-      iRet = MSROK;
-    }else {
-      if ((msr & MSR__LIM_ERR) != 0) {
-        return MSRONLIMIT;
-      }
-      if ((msr & MSR__AC_FAIL) != 0) {
-        return MSRDEADCUSHION;
-      }
-      if ((msr & MSR__REF_FAIL) != 0) {
-        iRet = MSRREF;
-      }
-      if ((msr & MSR__POS_FAIL) != 0) {
-        return MSRPOSFAULT;
-      }
-      if ((msr & MSR__POS_FAULT) != 0) {
-        iRet = MSRFAULT;
-      }
-      if ((msr & MSR__RUN_FAIL)	!= 0) {
-        return MSRRUNFAULT;
-      }
-      if ((msr & MSR__RUN_FAULT) != 0) {
-        iRet = MSRFAULT;
-      }
-      if ((msr & MSR__HALT) != 0) {
-        return MSRHALT;
-      }
-      if ((msr & MSR__HI_LIM) != 0) {
-        return MSRONLIMIT;
-      }
-      if ((msr & MSR__LO_LIM) != 0) {
-        return MSRONLIMIT;
-      }
-      if ((msr & MSR__STOPPED) != 0) {
-        return MSRSTOP;
-      }
-      if ((msr & MSR__REF_OK) != 0) {
-        iRet = MSROK;
-      }
-      if ((msr & MSR__OK) != 0) {
-        iRet = MSROK;
-      }
-      if ((msr & MSR__BUSY) != 0) {
-        iRet = MSRBUSY;
-      }
-    }
-    return iRet;
-  }
-
-
diff --git a/el755driv.c b/el755driv.c
deleted file mode 100644
index fa54f040..00000000
--- a/el755driv.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/*--------------------------------------------------------------------------
-                     E L 7 5 5 D R I V
-
- This file contains the implementation for the EL755 magnet controller
- driver.
-
- Mark Koennecke, November 1999 
-
- Copyright: see copyright.h
-----------------------------------------------------------------------------*/
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <math.h>
-#include <assert.h>
-#include "fortify.h"
-#include "conman.h"
-#include "servlog.h"
-#include "fortify.h"
-
-  typedef struct __EVDriver  *pEVDriver;
-
-#include "evdriver.i"  
-#include "hardsup/el755_def.h"
-#include "hardsup/el755_errcodes.h"
-#include "hardsup/sinq_prototypes.h"
-
-/*-----------------------------------------------------------------------*/
-  typedef struct {
-                   void *pData;
-                   char *pHost;
-                   int iPort;
-                   int iChannel;
-                   int iIndex;
-                   int iLastError;
-                  } EL755Driv, *pEL755Driv;
-
-/*---------------------------------------------------------------------------*/
-  static int GetEL755Pos(pEVDriver  self, float *fPos)
-  {
-     pEL755Driv pMe = NULL;
-     int iRet;
-     float fSoll;
-     
-     assert(self);
-     pMe = (pEL755Driv)self->pPrivate;
-     assert(pMe);
-
-     iRet = EL755_GetCurrents(&(pMe->pData),&fSoll,fPos);
-     if(iRet != 1)
-     {
-        return 0;
-     }
-     return 1;
-  } 
-/*----------------------------------------------------------------------------*/
-  static int EL755Run(pEVDriver self, float fVal)
-  {
-     pEL755Driv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pEL755Driv )self->pPrivate;
-     assert(pMe);
-
-     iRet = EL755_SetCurrent(&(pMe->pData),fVal);
-     if(iRet != 1)
-     {
-       return 0;
-     } 
-     return 1;
- }
-/*--------------------------------------------------------------------------*/
-  static int EL755Error(pEVDriver self, int *iCode, char *error, int iErrLen)
-  {
-     pEL755Driv pMe = NULL;
-     char *pPtr = NULL;
-     int i1, i2;
-     char pBueffel[132];
-     
-     assert(self);
-     pMe = (pEL755Driv)self->pPrivate;
-     assert(pMe);
-
-     /* retrieve error */
-     EL755_ErrInfo(&pPtr,iCode,&i1,&i2);
-     switch(*iCode)
-     {
-          case EL755__TURNED_OFF:
-              strncpy(error,"EL755__TURNED_OF",iErrLen);
-              break;
-          case EL755__TOO_MANY:
-              strncpy(error,"EL755__TO_MANY",iErrLen);
-              break;
-          case EL755__TOO_LARGE:
-              strncpy(error,"EL755__TOO_LARGE",iErrLen);
-              break;
-          case EL755__OVFLOW:
-              strncpy(error,"EL755_OVFLOW",iErrLen);
-              break;
-          case EL755__OUT_OF_RANGE:
-              strncpy(error,"EL755_OUT_OF_RANGE",iErrLen);
-              break;
-          case EL755__OFFLINE:
-              strncpy(error,"EL755_OFFLINE",iErrLen);
-              break;
-          case EL755__NO_SOCKET:
-              strncpy(error,"EL755__NO_SOCKET",iErrLen);
-              break;
-          case EL755__NOT_OPEN:
-              strncpy(error,"EL755__NOT_OPEN",iErrLen);
-              break;
-          case EL755__FORCED_CLOSED:
-              strncpy(error,"EL755__FORCED_CLOSED",iErrLen);
-              break;
-          case EL755__BAD_TMO:
-              strncpy(error,"EL755__BAD_TMO",iErrLen);
-              break;
-          case EL755__BAD_SOCKET:
-              strncpy(error,"EL755__BAD_SOCKET",iErrLen);
-              break;
-          case EL755__BAD_PAR:
-              strncpy(error,"EL755__BAD_PAR",iErrLen);
-              break;
-          case EL755__BAD_OFL:
-              strncpy(error,"EL755__BAD_OFL",iErrLen);
-              break;
-          case EL755__BAD_MALLOC:
-              strncpy(error,"EL755__BAD_MALLOC",iErrLen);
-              break;
-          case EL755__BAD_ILLG:
-              strncpy(error,"EL755__BAD_ILLG",iErrLen);
-              break;
-          case EL755__BAD_DEV:
-              strncpy(error,"EL755__BAD_DEV",iErrLen);
-              break;
-          case EL755__BAD_CMD:
-              strncpy(error,"EL755__BAD_CMD",iErrLen);
-              break;
-          case EL755__BAD_ASYNSRV:
-              strncpy(error,"EL755__BAD_ASYNSRV",iErrLen);
-              break;
-          default: 
-              sprintf(pBueffel,"Unknown error %d found",*iCode);
-              strncpy(error,pBueffel,iErrLen);
-              break;
-     }
-    
-    return 1;
-  }
-/*-----------------------------------------------------------------------*/
-  int EL755_Send(void **handle, char *pCom, char *reply, int iLen);
-  /*
-   * added to el755_utility by M.K.
-   */ 
-/*--------------------------------------------------------------------------*/
-  static int EL755Send(pEVDriver self, char *pCommand, char *pReply, int iLen)
-  {
-     pEL755Driv pMe = NULL;
-     char *pPtr = NULL;
-     char pBueffel[132];
-     int iRet;    
- 
-     assert(self);
-     pMe = (pEL755Driv)self->pPrivate;
-     assert(pMe);
-    
-     if(strlen(pCommand) > 130)
-          return 0;
-
-     /* make sure that we have a \r at the end */
-     strcpy(pBueffel,pCommand);
-     if(strrchr(pBueffel,(int)'\r') == NULL)
-     {
-         strcat(pBueffel,"\r");
-     } 
-
-     return EL755_Send(&(pMe->pData),pBueffel,pReply,iLen);
-  }  
-/*--------------------------------------------------------------------------*/
-  static int EL755Init(pEVDriver self)
-  {
-     pEL755Driv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pEL755Driv )self->pPrivate;
-     assert(pMe);
-
-     pMe->pData = NULL;
-     iRet = EL755_Open(&(pMe->pData),pMe->pHost,pMe->iPort,pMe->iChannel,
-            pMe->iIndex);
-     return iRet;
-  }  
-/*--------------------------------------------------------------------------*/
-  static int EL755Close(pEVDriver self)
-  {
-     pEL755Driv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pEL755Driv )self->pPrivate;
-     assert(pMe);
-
-     EL755_Close(&(pMe->pData),0);
-     return 1;
-  }  
-/*---------------------------------------------------------------------------*/
-  static int EL755Fix(pEVDriver self, int iError)
-  {
-     pEL755Driv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pEL755Driv )self->pPrivate;
-     assert(pMe);
-
-     switch(iError)
-     {
-          case EL755__TURNED_OFF:
-          case EL755__TOO_MANY:
-          case EL755__TOO_LARGE:
-          case EL755__OUT_OF_RANGE:
-          case EL755__BAD_PAR:
-          case EL755__BAD_SOCKET:
-          case EL755__BAD_MALLOC:
-          case EL755__BAD_DEV:
-          case EL755__BAD_CMD:
-          case EL755__BAD_ASYNSRV:
-              return DEVFAULT;
-              break;
-          case EL755__OVFLOW:
-          case EL755__BAD_TMO:
-          case EL755__BAD_ILLG:
-              return DEVREDO;
-              break;
-          case EL755__OFFLINE:
-          case EL755__BAD_OFL:
-              EL755_PutOnline(&(pMe->pData),2);
-              return DEVREDO;
-              break;
-          case EL755__NO_SOCKET:
-          case EL755__NOT_OPEN:
-          case EL755__FORCED_CLOSED:
-              EL755_Open(&(pMe->pData),pMe->pHost,pMe->iPort,
-                    pMe->iChannel,pMe->iIndex);
-              return DEVREDO;
-              break;
-          default: 
-              return DEVFAULT;
-              break;
-     }
-
-  }
-     
-/*--------------------------------------------------------------------------*/
-  static int EL755Halt(pEVDriver *self)
-  {
-     assert(self);
-     
-     return 1;
-  }
-/*------------------------------------------------------------------------*/
-  void KillEL755(void *pData)
-  {
-     pEL755Driv pMe = NULL;
-     
-     pMe = (pEL755Driv)pData;
-     assert(pMe);
-     
-     if(pMe->pHost)
-     {
-        free(pMe->pHost);
-     }
-     free(pMe);
-  }  
-/*------------------------------------------------------------------------*/
-  pEVDriver CreateEL755Driv(int argc, char *argv[])
-  {
-     pEVDriver pNew = NULL;
-     pEL755Driv pSim = NULL;
-     
-     /* check for arguments */
-     if(argc < 4)
-     {
-       return NULL;
-     }
-     
-     pNew = CreateEVDriver(argc,argv);
-     pSim = (pEL755Driv)malloc(sizeof(EL755Driv));
-     memset(pSim,0,sizeof(EL755Driv));
-     if(!pNew || !pSim)
-     {
-       return NULL;
-     }
-     pNew->pPrivate = pSim;
-     pNew->KillPrivate = KillEL755;
-     
-     pSim->iLastError = 0;
-     pSim->pHost = strdup(argv[0]);
-     pSim->iPort = atoi(argv[1]);
-     pSim->iChannel = atoi(argv[2]);
-     pSim->iIndex = atoi(argv[3]);
-     
-     /* initialise function pointers */
-     pNew->SetValue = EL755Run;
-     pNew->GetValue = GetEL755Pos;
-     pNew->Send     = EL755Send;
-     pNew->GetError = EL755Error;
-     pNew->TryFixIt = EL755Fix;
-     pNew->Init     = EL755Init;
-     pNew->Close    = EL755Close;
-     
-     return pNew; 
-  }	
-  
-
-
diff --git a/el755driv.h b/el755driv.h
deleted file mode 100644
index 22ec7471..00000000
--- a/el755driv.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*------------------------------------------------------------------------
-                      E L 7 5 5 D R I V
-  
-  A environment control driver for the EL755 magnet 
-  controller.
-
-  Mark Koennecke, November 1999 
-   
-   copyright: see copyright.h
----------------------------------------------------------------------------*/
-#ifndef EL755DRIV
-#define EL755DRIV
-      pEVDriver CreateEL755Driv(int argc, char *argv[]);
-
-#endif                       
diff --git a/eurodriv.c b/eurodriv.c
index c0f34181..270dbb55 100644
--- a/eurodriv.c
+++ b/eurodriv.c
@@ -25,9 +25,9 @@
   typedef struct __EVDriver  *pEVDriver;
 
 #include "evdriver.i"  
-#include "hardsup/el734_def.h"
-#include "hardsup/el734fix.h"
-#include "hardsup/serialsinq.h"
+#include "psi/hardsup/el734_def.h"
+#include "psi/hardsup/el734fix.h"
+#include "psi/hardsup/serialsinq.h"
 #include "eurodriv.h"      
 
 #define INVALIDANSWER -1005      
diff --git a/evcontroller.c b/evcontroller.c
index 584f3a3b..e3b3714d 100644
--- a/evcontroller.c
+++ b/evcontroller.c
@@ -54,23 +54,10 @@
 #include "evcontroller.i"
 #include "evdriver.i"
 #include "simev.h"
-#include "itc4.h"
-#include "dilludriv.h"
 #include "tclev.h"
-#include "bruker.h"
-#include "ltc11.h"
-#include "eurodriv.h"
-#include "el755driv.h"
-#include "A1931.h"
-#include "tecsdriv.h"
 #include "chadapter.h"
 #include "status.h"
-
-/*
-  from  slsmagnet.c
-*/
-extern pEVDriver CreateSLSDriv(int argc, char *argv[]);
-
+#include "site.h"
 /*--------------------- Functions needed to implement interfaces -----------*/
   static long EVIDrive(void *pData, SConnection *pCon, float fVal)
   {
@@ -1173,6 +1160,7 @@ extern pEVDriver CreateSLSDriv(int argc, char *argv[]);
       char pBueffel[512],pError[132];
       int iRet;
       CommandList *pCom = NULL;
+      pSite site = NULL;
       
       assert(pSics);
       assert(pCon);
@@ -1229,7 +1217,8 @@ extern pEVDriver CreateSLSDriv(int argc, char *argv[]);
         pCom = FindCommand(pSics,argv[2]);
         if(pCom)
         {
-          sprintf(pBueffel,"ERROR: environment device %s already installed, delete first",
+          sprintf(pBueffel,
+          "ERROR: environment device %s already installed, delete first",
                   argv[2]);
           SCWrite(pCon,pBueffel,eError);
           return 0;        
@@ -1241,216 +1230,11 @@ extern pEVDriver CreateSLSDriv(int argc, char *argv[]);
             pDriv = CreateSIMEVDriver(argc-4,&argv[4]);
             if(!pDriv)
             {
-               SCWrite(pCon,"ERROR: failed to create Environment Device driver",eError);
-               return 0;
-            }
-            
-        }
-        else if(strcmp(argv[3],"tecs") == 0) /* TECS temperature server */
-        {
-            /* Create a driver */
-            pDriv = CreateTecsDriver(argc-4,&argv[4]);
-            if(!pDriv)
-            {
-               SCWrite(pCon,"ERROR: failed to create TECS device driver",eError);
-               return 0;
-            }
-            /* got a driver, initialise everything */
-            pNew = CreateEVController(pDriv,argv[2],&iRet);
-            if(!pNew)
-            {
-               SCWrite(pCon,"ERROR: failed to initialize Tecs",eError);
-               SCWrite(pCon,"ERROR creating Environment Controller",eError);
-               return 0;
-            }
-            if(!iRet)
-            {
-              SCWrite(pCon,"ERROR: problem initialising Environment controller",
-              eError);
-              pDriv->GetError(pDriv,&iRet,pError,131);
-              sprintf(pBueffel,"HW reported: %s",pError);
-              SCWrite(pCon,pBueffel,eError);
-            }
-            /* set a few parameters */
-            EVCSetPar(pNew,"upperlimit",300.0,pCon);
-            EVCSetPar(pNew,"lowerlimit",1.0,pCon);
-            /* install command */
-            iRet = AddCommand(pSics,argv[2],TecsWrapper,DeleteEVController,
-                   pNew);
-            if(!iRet)
-            {
-              sprintf(pBueffel,"ERROR: duplicate command %s not created",argv[2]);
-              DeleteEVController((void *)pNew);
-              SCWrite(pCon,pBueffel,eError);
-              return 0;
-            }
-            EVRegisterController(FindEMON(pSics),argv[2],pNew, pCon);           
-            SCSendOK(pCon);           
-            return 1;           
-        }
-        else if(strcmp(argv[3],"itc4") == 0) /* ITC4 driver */
-        {
-            /* Create a driver */
-            pDriv = CreateITC4Driver(argc-4,&argv[4]);
-            if(!pDriv)
-            {
-               SCWrite(pCon,"ERROR: failed to create ITC4 device driver",eError);
-               return 0;
-            }
-            /* got a driver, initialise everything */
-            pNew = CreateEVController(pDriv,argv[2],&iRet);
-            if(!pNew)
-            {
-               SCWrite(pCon,"ERROR creating Environment Controller",eError);
-               return 0;
-            }
-            if(!iRet)
-            {
-              SCWrite(pCon,"ERROR: problem initialising Environment controller",
-              eError);
-              pDriv->GetError(pDriv,&iRet,pError,131);
-              sprintf(pBueffel,"HW reported: %s",pError);
-              SCWrite(pCon,pBueffel,eError);
-            }
-            /* set a few parameters */
-            EVCSetPar(pNew,"upperlimit",300.0,pCon);
-            EVCSetPar(pNew,"lowerlimit",1.0,pCon);
-            /* install command */
-            iRet = AddCommand(pSics,argv[2],ITC4Wrapper,DeleteEVController,
-                   pNew);
-            if(!iRet)
-            {
-              sprintf(pBueffel,"ERROR: duplicate command %s not created",argv[2]);
-              DeleteEVController((void *)pNew);
-              SCWrite(pCon,pBueffel,eError);
-              return 0;
-            }
-            EVRegisterController(FindEMON(pSics),argv[2],pNew, pCon);           
-            SCSendOK(pCon);           
-            return 1;           
-        }
-        else if(strcmp(argv[3],"bruker") == 0) /* Bruker Magnet Controller driver */
-        {
-            /* Create a driver */
-            pDriv = CreateBrukerDriver(argc-4,&argv[4]);
-            if(!pDriv)
-            {
-               SCWrite(pCon,"ERROR: failed to create Bruker Controller device driver",eError);
-               return 0;
-            }
-            /* got a driver, initialise everything */
-            pNew = CreateEVController(pDriv,argv[2],&iRet);
-            if(!pNew)
-            {
-               SCWrite(pCon,"ERROR creating Environment Controller",eError);
-               return 0;
-            }
-            if(!iRet)
-            {
-              SCWrite(pCon,"ERROR: problem initialising Environment controller",
-              eError);
-              pDriv->GetError(pDriv,&iRet,pError,131);
-              sprintf(pBueffel,"HW reported: %s",pError);
-              SCWrite(pCon,pBueffel,eError);
-            }
-
-            /* set a few parameters */
-            EVCSetPar(pNew,"upperlimit",45.0,pCon);
-            EVCSetPar(pNew,"lowerlimit",0.0,pCon);
-            /* install command */
-            iRet = AddCommand(pSics,argv[2],BrukerAction,DeleteEVController,
-                   pNew);
-            if(!iRet)
-            {
-              sprintf(pBueffel,"ERROR: duplicate command %s not created",argv[2]);
-              DeleteEVController((void *)pNew);
-              SCWrite(pCon,pBueffel,eError);
-              return 0;
-            }
-            EVRegisterController(FindEMON(pSics),argv[2],pNew, pCon);           
-            SCSendOK(pCon);           
-            return 1;           
-        }
-        else if(strcmp(argv[3],"ltc11") == 0) 
-                    /* Neocera LTC-11 temperature controller*/
-        {
-            /* Create a driver */
-            pDriv = CreateLTC11Driver(argc-4,&argv[4]);
-            if(!pDriv)
-            {
-               SCWrite(pCon,"ERROR: failed to create LTC-11 device driver",eError);
-               return 0;
-            }
-            /* got a driver, initialise everything */
-            pNew = CreateEVController(pDriv,argv[2],&iRet);
-            if(!pNew)
-            {
-               SCWrite(pCon,"ERROR creating Environment Controller",eError);
-               return 0;
-            }
-            if(!iRet)
-            {
-              SCWrite(pCon,"ERROR: problem initialising Environment controller",
-              eError);
-              pDriv->GetError(pDriv,&iRet,pError,131);
-              sprintf(pBueffel,"HW reported: %s",pError);
-              SCWrite(pCon,pBueffel,eError);
-            }
-            /* set a few parameters */
-            EVCSetPar(pNew,"upperlimit",500.,pCon);
-            EVCSetPar(pNew,"lowerlimit",1.5,pCon);
-            /* install command */
-            iRet = AddCommand(pSics,argv[2],LTC11Action,DeleteEVController,
-                   pNew);
-            if(!iRet)
-            {
-              sprintf(pBueffel,"ERROR: duplicate command %s not created",argv[2]);
-              DeleteEVController((void *)pNew);
-              SCWrite(pCon,pBueffel,eError);
-              return 0;
-            }
-            EVRegisterController(FindEMON(pSics),argv[2],pNew, pCon);           
-            SCSendOK(pCon);           
-            return 1;
-        }else if(strcmp(argv[3],"a1931") == 0) 
-                    /* Risoe A1931 temperature controller*/
-        {
-            /* Create a driver */
-            pDriv = CreateA1931Driver(argc-4,&argv[4]);
-            if(!pDriv)
-            {
-               SCWrite(pCon,"ERROR: failed to create A1931 device driver",
+               SCWrite(pCon,
+		       "ERROR: failed to create Environment Device driver",
 		       eError);
                return 0;
             }
-            /* got a driver, initialise everything */
-            pNew = CreateEVController(pDriv,argv[2],&iRet);
-            if(!pNew)
-            {
-               SCWrite(pCon,"ERROR creating Environment Controller",eError);
-               return 0;
-            }
-            if(!iRet)
-            {
-              SCWrite(pCon,"ERROR: problem initialising Environment controller",
-              eError);
-              pDriv->GetError(pDriv,&iRet,pError,131);
-              sprintf(pBueffel,"HW reported: %s",pError);
-              SCWrite(pCon,pBueffel,eError);
-            }
-            /* install command */
-            iRet = AddCommand(pSics,argv[2],A1931Action,DeleteEVController,
-                   pNew);
-            if(!iRet)
-            {
-              sprintf(pBueffel,"ERROR: duplicate command %s not created",argv[2]);
-              DeleteEVController((void *)pNew);
-              SCWrite(pCon,pBueffel,eError);
-              return 0;
-            }
-            EVRegisterController(FindEMON(pSics),argv[2],pNew, pCon);
-            SCSendOK(pCon);           
-            return 1;           
         }
         else if(strcmp(argv[3],"tcl") == 0) /* Tcl driver */
         {
@@ -1478,11 +1262,13 @@ extern pEVDriver CreateSLSDriv(int argc, char *argv[]);
               SCWrite(pCon,pBueffel,eError);
             }
             /* install command */
-            iRet = AddCommand(pSics,argv[2],TclEnvironmentWrapper,DeleteEVController,
+            iRet = AddCommand(pSics,argv[2],TclEnvironmentWrapper,
+			      DeleteEVController,
                    pNew);
             if(!iRet)
             {
-              sprintf(pBueffel,"ERROR: duplicate command %s not created",argv[2]);
+              sprintf(pBueffel,"ERROR: duplicate command %s not created",
+		      argv[2]);
               DeleteEVController((void *)pNew);
               SCWrite(pCon,pBueffel,eError);
               return 0;
@@ -1495,22 +1281,6 @@ extern pEVDriver CreateSLSDriv(int argc, char *argv[]);
                              ObVal(pNew->pParam,UPLIMIT));
             UpdateTclVariable(pNew->pDriv,"lowerlimit",
                              ObVal(pNew->pParam,LOWLIMIT));
-                             
-            /* register controller for monitoring */
-            EVRegisterController(FindEMON(pSics),argv[2],pNew, pCon);           
-            SCSendOK(pCon);           
-            return 1;           
-        }
-        else if(strcmp(argv[3],"dillu") == 0) /* dillution driver */
-        {
-            /* Create a driver */
-            pDriv = CreateDILLUDriv(argc-4,&argv[4]);
-            if(!pDriv)
-            {
-               SCWrite(pCon,
-                 "ERROR: failed to create Dillution device driver",eError);
-               return 0;
-            }
         }
         else if(strcmp(argv[3],"gencon") == 0) /* general controller */
         {
@@ -1524,87 +1294,20 @@ extern pEVDriver CreateSLSDriv(int argc, char *argv[]);
                return 0;
             }
         }
-        else if(strcmp(argv[3],"euro") == 0) /* dillution driver */
-        {
-            /* Create a driver */
-            pDriv = CreateEURODriv(argc-4,&argv[4]);
-            if(!pDriv)
-            {
-               SCWrite(pCon,
-                "ERROR: failed to create Eurotherm device driver",eError);
-               return 0;
-            }
-        }
-        else if(strcmp(argv[3],"psi-dsp") == 0) /* PSI-DSP magnet driver */
-        {
-            /* Create a driver */
-            pDriv = CreateSLSDriv(argc-4,&argv[4]);
-            if(!pDriv)
-            {
-               SCWrite(pCon,
-                "ERROR: failed to create PSI-DSP device driver",eError);
-               return 0;
-            }
-        }
-        else if(strcmp(argv[3],"el755") == 0) /* EL755 magnet  driver */
-        {
-            /* Create a driver */
-            pDriv = CreateEL755Driv(argc-4,&argv[4]);
-            if(!pDriv)
-            {
-               SCWrite(pCon,
-                "ERROR: failed to create EL755 device driver",eError);
-               return 0;
-            }
-        }
         else
         {
-          sprintf(pBueffel,"ERROR: %s not recognized as a valid driver type",
-                  argv[3]);
-          SCWrite(pCon,pBueffel,eError);
-          return 0;        
-        }
-        /* got a driver, initialise everything */
-        pNew = CreateEVController(pDriv,argv[2],&iRet);
-        if(!pNew)
-        {
-          SCWrite(pCon,"ERROR creating Environment Controller",eError);
-          return 0;
-        }
-        if(!iRet)
-        {
-          SCWrite(pCon,"ERROR: problem initialising Environment controller",
-              eError);
-          pDriv->GetError(pDriv,&iRet,pError,131);
-          sprintf(pBueffel,"HW reported: %s",pError);
-          SCWrite(pCon,pBueffel,eError);
-        }
-        
-        /* set a few parameters */
-        if(strcmp(argv[3],"euro") == 0)
-	{
-           EVCSetPar(pNew,"upperlimit",750.0,pCon);
-           EVCSetPar(pNew,"lowerlimit",15.0,pCon);
-        }
-        else if(strcmp(argv[3],"el755") == 0)
-	{
-           EVCSetPar(pNew,"upperlimit",10.,pCon);
-           EVCSetPar(pNew,"lowerlimit",-10.,pCon);
-        }
-        else
-        {
-           EVCSetPar(pNew,"upperlimit",4.0,pCon);
-           EVCSetPar(pNew,"lowerlimit",0.05,pCon);
-        }
-        /* install command */
-        iRet = AddCommand(pSics,argv[2],EVControlWrapper,DeleteEVController,
-                   pNew);
-        if(!iRet)
-        {
-            sprintf(pBueffel,"ERROR: duplicate command %s not created",argv[2]);
-            DeleteEVController((void *)pNew);
-            SCWrite(pCon,pBueffel,eError);
-            return 0;
+          site = getSite();
+	  if(site != NULL){
+	    pNew = site->InstallEnvironmentController(pSics,pCon,argc,argv);
+	  } else {
+	    pNew = NULL;
+	  }
+	  if(pNew == NULL){
+	    sprintf(pBueffel,"ERROR: %s not recognized as a valid driver type",
+		    argv[3]);
+	    SCWrite(pCon,pBueffel,eError);
+	    return 0;
+	  }        
         }
         EVRegisterController(FindEMON(pSics),argv[2],pNew, pCon);           
         SCSendOK(pCon);           
diff --git a/faverage.c b/faverage.c
deleted file mode 100644
index 5cb03a39..00000000
--- a/faverage.c
+++ /dev/null
@@ -1,557 +0,0 @@
-/*---------------------------------------------------------------------------
-                     F o c u s A v e r a g e r
-   
-  A little averager for FOCUS data. Used by the FOCUS status display.
-  
-  copyright: see copyright.h
-  
-  Mark Koennecke, October 1998
-
-  Updated for additional detector banks
-
-  Mark Koennecke, March 2000
-
-  Added focusraw command for retrieving single detector banks in support
-  of the colour mapping part of the FOCUS status display.
-
-  Mark Koennecke, July 2001  
----------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <assert.h>
-#include <tcl.h>
-#include <time.h>
-#include "fortify.h"
-#include "sics.h"
-#include "sicsvar.h"
-#include "counter.h"
-#include "HistMem.h"
-#include "fomerge.h"
-#include "faverage.h"
-
-/*
-#define DEB 1
-*/
-/*-------------------------------------------------------------------------*/
-  typedef struct __FocusAverager {
-                                  pObjectDescriptor pDes;
-                                  pHistMem          pHistogram1;
-                                  pHistMem          pHistogram2;
-                                  pHistMem          pHistogram3;
-                                 } FocusAverager, *pFocusAverager;
-
-/*------------------------------------------------------------------------*/
-
-  HistInt *CheckBank(pFocusAverager self, SConnection *pCon,  
-              int iLength, int iBank); 
-
-  static void KillFA(void *pData)
-  {
-     pFocusAverager self = NULL;
-     
-     self = (pFocusAverager)pData;
-     if(!self)
-        return;
-        
-     if(self->pDes)
-        DeleteDescriptor(self->pDes);
-     free(self);      
-  }
-/*-------------------------------------------------------------------------*/
-   int FocusAverageDo(SConnection *pCon, SicsInterp *pSics, void *pData,
-                    int argc, char *argv[])
-   {
-      pFocusAverager self = NULL;
-      int *iData = NULL;
-      const float *fTimeBin = NULL;
-      float fVal;
-      int iLength, iStart, iEnd, iNum, i,ii, iTest, iBufLen, iRet, iVal;
-      char pBueffel[256];
-      HistInt *hiData = NULL, *hiPtr;
-      time_t tStart, tEnd;
-      int iBank = MIDDLE; 
-      pSicsVariable var1 = NULL;
-      pSicsVariable var2 = NULL;
-      pSicsVariable var3 = NULL;
-      int lbank, mbank, ubank;     
-
-      self = (pFocusAverager)pData;
-      assert(self);
-      assert(pCon);
-      assert(pSics);
-      
-      /* we need two parameters: start and end of averaging */
-      if(argc < 3)
-      {
-        SCWrite(pCon,
-        "ERROR: insufficient number of parameters for FocusAverage",
-        eError);
-        return 0;
-      }  
-      iRet = Tcl_GetInt(pSics->pTcl,argv[1],&iStart);
-      if(iRet != TCL_OK)
-      {
-         sprintf(pBueffel,"ERROR: cannot convert %d to integer",argv[1]);
-         SCWrite(pCon,pBueffel,eError);
-         return 0;
-      }
-      iRet = Tcl_GetInt(pSics->pTcl,argv[2],&iEnd);
-      if(iRet != TCL_OK)
-      {
-         sprintf(pBueffel,"ERROR: cannot convert %d to integer",argv[2]);
-         SCWrite(pCon,pBueffel,eError);
-         return 0;
-      }
-
-      /* another parameter, if available describes the detector bank
-       */
-      if(argc > 3)
-      {
-        iRet = Tcl_GetInt(pSics->pTcl,argv[3],&iBank);
-        if(iRet != TCL_OK)
-        {
-           sprintf(pBueffel,"ERROR: cannot convert %d to integer",argv[3]);
-           SCWrite(pCon,pBueffel,eError);
-           return 0;
-        }
-      }    
-
-      /* how much to do: correct parameters? */  
-      iNum = iEnd - iStart;
-      if(iNum < 0)
-      {
-         SCWrite(pCon,"ERROR: invalid parameters given to FocusAverage",
-                 eError);
-         return 0;        
-      } 
-      /* may be only one histogram requested */
-      if(iNum == 0)
-         iNum = 1;
-      if(iStart < 0)
-      {
-         SCWrite(pCon,"ERROR: invalid parameters given to FocusAverage",
-                 eError);
-         return 0;        
-      } 
-
-#ifdef DEB
-      printf("Starting averaging ...\n");
-      fflush(stdout);
-      tStart = time(NULL);
-#endif     
-      
-      /* do work! first retrieve time binning data */
-
-      var2 = FindVariable(pServ->pSics,"mbank");
-      if(var2)
-      {
-        VarGetInt(var2,&mbank);
-      } else {
-        SCWrite(pCon,"ERROR: mbank value not found!",eError);
-      } 
-      if(mbank==1)
-      {
-         fTimeBin = GetHistTimeBin(self->pHistogram2,&iLength);  
-      }
-      else
-	{
-        var1 = FindVariable(pServ->pSics,"lbank");
-        if(var1)
-        {
-           VarGetInt(var1,&lbank);
-        } else {
-           SCWrite(pCon,"ERROR: lbank value not found!",eError);
-        }  
-        if(lbank==1)
-          { 
-            fTimeBin = GetHistTimeBin(self->pHistogram1,&iLength);           
-          }
-          else
-          { 
-            fTimeBin = GetHistTimeBin(self->pHistogram3,&iLength);
-          }
-      }   
-      assert(fTimeBin);
-      if(iLength <= 0)
-      {
-         SCWrite(pCon,"ERROR: histogram memory inproperly configured",eError);
-         return 0;
-      }
-      /* allocate result data */
-      iBufLen = (iLength *2 +1)*sizeof(int);
-      iData = (int *)malloc(iBufLen); 
-      memset(iData,0,iBufLen);
-
-      /* get histogram length */
-      i = getFMdim(iBank);
-      /* correct iEnd to maximum allowed */
-      iTest = i;
-      if(iEnd > iTest -1)
-      {
-        iEnd = iTest - 1;
-        iNum = iEnd - iStart;
-        if(iNum <= 0)
-           iNum = 1;
-      }
-           
-#ifdef DEB
-      printf("Getting histogram....\n");
-      fflush(stdout);
-#endif
-      
-      hiData = CheckBank(self,pCon,iLength,iBank);      
-       
-#ifdef DEB
-      tEnd = time(NULL);
-      printf("Histogram received in %d seconds\n", tStart - tEnd);
-      fflush(stdout);
-#endif  
-      
-      if(hiData == NULL)
-      {
-	SCWrite(pCon,"ERROR: BAD Configuration",eError);
-        free(iData);
-	return 0;
-      }
-     
-      /* first int: length of things to come */
-      iData[0] = htonl(iLength);
-      /* sum up */    
-      for(i = iStart; i < iEnd; i++)
-      {
-         hiPtr = hiData + i*iLength;
-         for(ii = 0; ii < iLength; ii++)
-         {
-           iData[ii+1] += hiPtr[ii];
-         }
-      }  
-      /* average */
-      for(i = 1; i < iLength + 1; i++)
-      {
-         fVal = (float)iData[i]/(float)iNum;
-         fVal *= 65536.;
-         iData[i] = htonl((int)fVal);
-      }  
-      /* make time binning fixed point */
-      for(i = 0; i < iLength; i++)
-      {
-         fVal = fTimeBin[i]/10.;
-         fVal *= 65536.;
-         iData[iLength+1+i] = htonl((int)fVal);
-      }
-#ifdef DEB
-      printf("Sending averaged data....\n");
-      fflush(stdout);
-#endif      
-      /* finally send out uuencoded */
-      SCWriteUUencoded(pCon,"FocusAverage",iData,iBufLen);
-      if(iData)
-        free(iData);
-#ifdef DEB
-      printf("Averaging finished\n");
-      fflush(stdout);
-#endif          
-      return 1;
-   }                                              
-     
-/*-------------------------------------------------------------------------*/
-   static int FocusRaw(SConnection *pCon, SicsInterp *pSics, void *pData,
-                    int argc, char *argv[])
-   {
-      pFocusAverager self = NULL;
-      int *iData = NULL;
-      int iLength, noTimebin, iRet, i;
-      char pBueffel[256];
-      const float *timeBin;
-      HistInt *hiData = NULL, *hiPtr;
-      int iBank = MIDDLE;      
-      pSicsVariable var1 = NULL;
-      pSicsVariable var2 = NULL;
-      pSicsVariable var3 = NULL;
-      int lbank, mbank, ubank;  
-
-      self = (pFocusAverager)pData;
-      assert(self);
-      assert(pCon);
-      assert(pSics);
-      
-
-      /* we need one parameter, the bank to read */   
-      if(argc < 2)
-      {
-        SCWrite(pCon,
-        "ERROR: insufficient number of parameters for FocusRaw",
-        eError);
-        return 0;
-      }  
-      iRet = Tcl_GetInt(pSics->pTcl,argv[1],&iBank);
-      if(iRet != TCL_OK)
-      {
-         sprintf(pBueffel,"ERROR: cannot convert %d to integer",argv[1]);
-         SCWrite(pCon,pBueffel,eError);
-         return 0;
-      }
-      var2 = FindVariable(pServ->pSics,"mbank");
-      if(var2)
-      {
-        VarGetInt(var2,&mbank);
-      } else {
-        SCWrite(pCon,"ERROR: mbank value not found!",eError);
-      } 
-      if(var2)
-      {
-         timeBin = GetHistTimeBin(self->pHistogram2,&iLength);  
-      }
-      else
-	{
-        var1 = FindVariable(pServ->pSics,"lbank");
-        if(var1)
-        {
-           VarGetInt(var1,&lbank);
-        } else {
-           SCWrite(pCon,"ERROR: lbank value not found!",eError);
-        }  
-        if(var1)
-          { 
-            timeBin = GetHistTimeBin(self->pHistogram1,&iLength);           
-          }
-          else
-          { 
-            timeBin = GetHistTimeBin(self->pHistogram3,&iLength);
-          }
-      }   
-      assert(timeBin);      
-      hiData = CheckBank(self, pCon, iLength, iBank);
-      
-      /* get histogram length */
-      iLength = getFMdim(iBank);
-      noTimebin = getFMdim(TIMEBIN);
-      /* write dimension info*/
-      sprintf(pBueffel,"focusrawdim = %d = %d", iLength, noTimebin);   
-      SCWrite(pCon,pBueffel,eValue);
-
-      /* allocate space */   
-      iData = (int *)malloc((iLength*noTimebin+1)*sizeof(int));
-      if(iData == NULL)
-      {
-         SCWrite(pCon,"ERROR: out of memory in FocusRaw",eError);
-         return 0;
-      }
-      memset(iData,0,noTimebin*iLength*sizeof(int));
-
-      /* first int: length of things to come */
-      iData[0] = htonl(iLength*noTimebin);
-      /* network byte order for everything */
-      for(i = 0; i < noTimebin*iLength; i++)
-      {
-          iData[i+1] = htonl(hiData[i]);
-      }      
-      /* send away, zipped */
-      SCWriteZipped(pCon,"focusraw",iData,(iLength*noTimebin+1)*sizeof(int));
-
-      free(iData);
-      return 1;
-   }                                              
-/*-------------------------------------------------------------------------*/
-  int  MakeFA(SConnection *pCon, SicsInterp *pSics, void *pData,
-              int argc, char *argv[])
-  {
-     pFocusAverager pNew = NULL;
-     CommandList *pCom = NULL;
-     pDummy pDum = NULL;
-     char pBueffel[256];
-     int iRet;
-     pSicsVariable var1 = NULL;
-     pSicsVariable var2 = NULL;
-     pSicsVariable var3 = NULL;
-     int lbank, mbank, ubank;   
-
-     assert(pCon);
-     assert(pSics);
-     
-     /* we need two parameters: the name for the averager and the histogram 
-        memory
-     */
-     if(argc < 3)
-     {
-       SCWrite(pCon,"ERROR: Insufficient number of parameters to MakeFA",
-               eError);
-       return 0;
-     }
-      
-     /* find histogram memory */
-     pCom = FindCommand(pSics,argv[2]);
-     if(!pCom)
-     {
-        sprintf(pBueffel,"ERROR: histogram memory %s NOT found!", argv[2]);
-        SCWrite(pCon,pBueffel,eError);
-        return 0;
-     }   
-     pDum = (pDummy)pCom->pData;
-     if(!pDum)
-     {
-        sprintf(pBueffel,"ERROR: histogram memory %s INVALID!", argv[2]);
-        SCWrite(pCon,pBueffel,eError);
-        return 0;
-     }
-     if(strcmp(pDum->pDescriptor->name,"HMcontrol") != 0)
-     {
-        sprintf(pBueffel,"ERROR: %s is NO histogram control object!", argv[2]);
-        SCWrite(pCon,pBueffel,eError);
-        return 0;
-     }
-     
-     /* we got what we need: set things up */
-     pNew = (pFocusAverager)malloc(sizeof(FocusAverager));
-     if(!pNew)
-     {
-        SCWrite(pCon,"ERROR: out of memory in MakeFA",eError);
-        return 0;
-     }
-     memset(pNew,0,sizeof(FocusAverager));
-     
-     pNew->pDes = CreateDescriptor("FocusAverager");
-     if(!pNew->pDes)
-     {
-        SCWrite(pCon,"ERROR: out of memory in MakeFA",eError);
-        return 0;
-     }
-     var2 = FindVariable(pServ->pSics,"mbank");
-     if(var2)
-       {
-          VarGetInt(var2,&mbank);
-       } else {
-          SCWrite(pCon,"ERROR: mbank value not found!",eError);
-       }
-     if(mbank==1)
-       {
-         pCom = FindCommand(pSics,"hm2");
-         pDum = (pDummy)pCom->pData;
-         pNew->pHistogram2 = (pHistMem)pDum;
-       }
-     var1 = FindVariable(pServ->pSics,"lbank");
-     if(var1)
-       {
-         VarGetInt(var1,&lbank);
-       } else {
-         SCWrite(pCon,"ERROR: lbank value not found!",eError);
-       }
-     if(lbank==1)
-       {
-         pCom = FindCommand(pSics,"hm1");
-         pDum = (pDummy)pCom->pData;
-         pNew->pHistogram1 = (pHistMem)pDum;
-       }
-     var3 = FindVariable(pServ->pSics,"ubank");
-     if(var3)
-       {
-         VarGetInt(var3,&ubank);
-       } else {
-         SCWrite(pCon,"ERROR: ubank value not found!",eError);
-       }
-     if(ubank==1)
-       {
-         pCom = FindCommand(pSics,"hm3");
-         pDum = (pDummy)pCom->pData;
-         pNew->pHistogram3 = (pHistMem)pDum;
-       }
-     iRet = AddCommand(pSics,argv[1],FocusAverageDo, KillFA, pNew);
-     if(!iRet)
-     {
-        sprintf(pBueffel,"ERROR: duplicate command %s not created", argv[1]);
-        SCWrite(pCon,pBueffel,eError);
-        KillFA(pNew);
-        return 0;
-     }
-     iRet = AddCommand(pSics,"focusraw",FocusRaw, NULL, pNew);
-     if(!iRet)
-     {
-        sprintf(pBueffel,"ERROR: duplicate command focusraw not created");
-        SCWrite(pCon,pBueffel,eError);
-        return 0;
-     }
-     return 1;
-  }   
-
-HistInt *CheckBank(pFocusAverager self, SConnection *pCon, 
-              int iLength, int iBank)
-{
-  
-  pSicsVariable var1 = NULL;
-  pSicsVariable var2 = NULL;
-  pSicsVariable var3 = NULL;
-  HistInt *lData = NULL;
-  HistInt *mData = NULL;
-  HistInt *uData = NULL;
-  HistInt *mergData = NULL;
-  int lbank, mbank, ubank;  
-  
-  if (iBank==2) 
-  {
-     var2 = FindVariable(pServ->pSics,"mbank");
-     if(var2)
-       {
-         VarGetInt(var2,&mbank);
-       } else {
-         SCWrite(pCon,"ERROR: mbank value not found!",eError);
-       }
-     if(mbank==1)
-       {
-         mData = GetHistogramPointer(self->pHistogram2,pCon);
-         if(mData == NULL)
-	   {
-	     return NULL;
-	   }
-         setFMDataPointer(mData, iLength,2);
-         mData = getFMBankPointer(2);
-         return mData;
-       }
-  }
-  if (iBank==3) 
-  { 
-     var1 = FindVariable(pServ->pSics,"lbank");
-     if(var1)
-       {
-         VarGetInt(var1,&lbank);
-       } else {
-         SCWrite(pCon,"ERROR: lbank value not found!",eError);
-       }
-       if(lbank==1)
-       {
-         lData = GetHistogramPointer(self->pHistogram1,pCon);
-         if(lData == NULL)
-         {
-           return NULL;
-         }
-         setFMDataPointer(lData, iLength, 3);
-         lData = getFMBankPointer(3);
-         return lData;
-       }
-  } 
-  if (iBank==1) 
-  { 
-    var3 = FindVariable(pServ->pSics,"ubank");
-    if(var3)
-      {
-        VarGetInt(var3,&ubank);
-      } else {
-        SCWrite(pCon,"ERROR: ubank value not found!",eError);
-      }
-    if(ubank==1)
-      {
-        uData = GetHistogramPointer(self->pHistogram3,pCon);
-        if(uData == NULL)
-          {
-            return NULL;
-          }
-        setFMDataPointer(uData, iLength, 1);
-        uData = getFMBankPointer(1);
-        return uData;
-      }
-  }
-  if (iBank==4) 
-    {
-       setFMDataPointer(mergData, iLength,4);
-       mergData = getFMBankPointer(4);
-       return mergData;    
-    }
-}
diff --git a/faverage.h b/faverage.h
deleted file mode 100644
index 220beb10..00000000
--- a/faverage.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*-----------------------------------------------------------------------
-                F o c u s A v e r a g e
-
-  An averager for FOCUS data.  See faverage.tex for more details.
-
-  Mark Koennecke, October 1998
-
---------------------------------------------------------------------------*/
-#ifndef FOCUSAVERAGE
-#define FOCUSAVERAGE
-
-    int MakeFA(SConnection *pCon, SicsInterp *pSics, void *pData,
-               int argc, char *argv[]);
-
-    int FocusAverageDo(SConnection *pCon, SicsInterp *pSics, void *pData,
-               int argc, char *argv[]);
-
-
-#endif
-
diff --git a/faverage.tex b/faverage.tex
deleted file mode 100644
index b3372776..00000000
--- a/faverage.tex
+++ /dev/null
@@ -1,70 +0,0 @@
-\subsection{The FOCUS Averager}
-This is a special object for the instrument FOCUS and its Status display
-client. In the FOCUS status display the averaged data from a number of
-detectors is displayed. Thus there is already a reduced form of data. The
-actual raw data would be 150*1024*4 bytes of data and possibly more. Rather
-then transporting all this data to the status display client at regular
-intervalls it was choosen to implement this averaging process at the server
-and only send the reduced form to the status display client. Which is two
-arrays of floating point data 1024 items long. This little object implements this
-averager. 
-
-As all SICS objects this object has a little data structure:
-\begin{verbatim}
-  typedef struct __FocusAverager {
-                                  pObjectDescriptor pDes;
-                                  pHistMem          pHist;
-                                 } FocusAverager;
-\end{verbatim}  
-
-The two fields are the standard object descriptor and a pointer to the
-histogram memory object holding the data. 
-
-The interface is minimal: it consists just of the factory function for
-installing this object into SICS and the actual function doing the
-averaging in the interpreter.
-
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap1}
-$\langle$faint {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@    int MakeFA(SConnection *pCon, SicsInterp *pSics, void *pData,@\\
-\mbox{}\verb@               int argc, char *argv[]);@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@    int FocusAverageDo(SConnection *pCon, SicsInterp *pSics, void *pData,@\\
-\mbox{}\verb@               int argc, char *argv[]);@\\
-\mbox{}\verb@@\\
-\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@"faverage.h"@ {\footnotesize ? }$\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@/*-----------------------------------------------------------------------@\\
-\mbox{}\verb@                F o c u s A v e r a g e@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  An averager for FOCUS data.  See faverage.tex for more details.@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  Mark Koennecke, October 1998@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@--------------------------------------------------------------------------*/@\\
-\mbox{}\verb@#ifndef FOCUSAVERAGE@\\
-\mbox{}\verb@#define FOCUSAVERAGE@\\
-\mbox{}\verb@@$\langle$faint {\footnotesize ?}$\rangle$\verb@@\\
-\mbox{}\verb@#endif@\\
-\mbox{}\verb@@$\diamond$
-\end{list}
-\vspace{-2ex}
-\end{minipage}\\[4ex]
-\end{flushleft}
diff --git a/faverage.w b/faverage.w
deleted file mode 100644
index 808f56d8..00000000
--- a/faverage.w
+++ /dev/null
@@ -1,50 +0,0 @@
-\subsection{The FOCUS Averager}
-This is a special object for the instrument FOCUS and its Status display
-client. In the FOCUS status display the averaged data from a number of
-detectors is displayed. Thus there is already a reduced form of data. The
-actual raw data would be 150*1024*4 bytes of data and possibly more. Rather
-then transporting all this data to the status display client at regular
-intervalls it was choosen to implement this averaging process at the server
-and only send the reduced form to the status display client. Which is two
-arrays of floating point data 1024 items long. This little object implements this
-averager. 
-
-As all SICS objects this object has a little data structure:
-\begin{verbatim}
-  typedef struct __FocusAverager {
-                                  pObjectDescriptor pDes;
-                                  pHistMem          pHist;
-                                 } FocusAverager;
-\end{verbatim}  
-
-The two fields are the standard object descriptor and a pointer to the
-histogram memory object holding the data. 
-
-The interface is minimal: it consists just of the factory function for
-installing this object into SICS and the actual function doing the
-averaging in the interpreter.
-
-@d faint @{
-    int MakeFA(SConnection *pCon, SicsInterp *pSics, void *pData,
-               int argc, char *argv[]);
-
-    int FocusAverageDo(SConnection *pCon, SicsInterp *pSics, void *pData,
-               int argc, char *argv[]);
-
-@} 
-
-@o faverage.h @{
-/*-----------------------------------------------------------------------
-                F o c u s A v e r a g e
-
-  An averager for FOCUS data.  See faverage.tex for more details.
-
-  Mark Koennecke, October 1998
-
---------------------------------------------------------------------------*/
-#ifndef FOCUSAVERAGE
-#define FOCUSAVERAGE
-@<faint@>
-#endif
-@}
-
diff --git a/fowrite.c b/fowrite.c
deleted file mode 100644
index 14f9cba0..00000000
--- a/fowrite.c
+++ /dev/null
@@ -1,1195 +0,0 @@
-/*---------------------------------------------------------------------------
-                             F O W R I T E
-                             
-   FOCUS data writing object.
-   
-   copyright: see copyright.h
-   
-   Mark Koennecke, November 1998
-   
-   Added code for three detector banks.
-
-   Mark Koennecke, March 2000
------------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <assert.h>
-#include <time.h>
-#include <tcl.h>
-/* avoid irritating compiler warning M.Z.08.2001 */
-#undef VOID
-#include "fortify.h"
-#include "sics.h"
-#include "event.h"
-#include "counter.h"
-#include "HistMem.h"
-#include "nxdict.h"
-#include "nxutil.h"
-#include "motor.h"
-#include "selector.h"
-#include "fowrite.h"
-#include "scan.h"
-#include "sicsvar.h"
-#include "fitcenter.h"
-#include "hmcontrol.h"
-#include "fomerge.h"
-
-/* histogram memory names */
-#define HM1 "hm1"
-#define HM2 "hm2"
-#define HM3 "hm3"
-
-
-/* the name of the SICS chopper controller object */
-#define CHOPPERNAME "choco" 
-
-/*--------- the internal data structure ------------------------------------*/
-  typedef struct {
-                   pObjectDescriptor pDes;
-                   pHistMem pHistogram1, pHistogram2, pHistogram3;
-                   int iNew;
-                   time_t tUpdate;
-                   int iInterval;
-                   int iEnd;
-                   SConnection *pCon; 
-                   pCounter pCount; 
-                   char *pFile;
-                   char *pDictFile;
-                   pFit pFitter;
-                   float fElastic;
-                   pICallBack pCall;
-                   int iUpper, iMiddle, iLower; 
-                   /* detector availability flags */
-                  } FoWrite, *pFoWrite;
-/* ------------------- forward declaration of task function --------------*/
-
-  static int FoTask(void *pData);                  
-  static void FoUpdate(pFoWrite self, SConnection *pCon);
-
-
-/*------------------ The Countstart Callback Function ----------------------*/
-   static int Countstartcallback(int iEvent, void *pEventData, void *pUser)
-   {
-      pFoWrite self = NULL;
-      
-      if(iEvent == COUNTSTART)
-      {
-         self = (pFoWrite)pUser;
-         assert(self);
-         self->iNew = 1;
-         self->iEnd = 0;
-         self->tUpdate = time(NULL);
-         self->pCon = (SConnection *)pEventData;
-         TaskRegister(pServ->pTasker,FoTask,NULL,NULL,self,1);
-         return 1;
-      }
-      return 1;
-   }               
-/*------------------ The Countend Callback Function ----------------------*/
-   static int Countendcallback(int iEvent, void *pEventData, void *pUser)
-   {
-      pFoWrite self = NULL;
-      
-      if(iEvent == COUNTEND)
-      {
-         self = (pFoWrite)pUser;
-         assert(self);
-         self->tUpdate = time(NULL);
-         self->iEnd = 1;
-         /*
-         FoUpdate(self,self->pCon);
-         */
-         return 1;
-      }
-      return 1;
-   }               
-/*-----------------------------------------------------------------------*/
-  static void SNError(void *pData, char *text)
-  {
-     SConnection *pCon;
-     
-     assert(pData);
-     pCon = (SConnection *)pData;
-     SCWrite(pCon,text,eError);
-  }   
-/*------------------------------------------------------------------------*/
-  static void WriteSelector(NXhandle pFile, NXdict pDict, SConnection *pCon)
-  {
-     pSicsSelector pSel = NULL;
-     char *pName = NULL;
-     CommandList *pCom = NULL;
-     pDummy pDum = NULL;
-     float fTh, fTTH, fB1, fB2;
-     int iRet;
-     
-     pCom = FindCommand(pServ->pSics,"mono");
-     if(!pCom)
-     {
-        SCWrite(pCon,"ERROR: no monochromator found",eError);
-        return ;
-     }
-     pSel = (pSicsSelector)pCom->pData;
-     if(!pSel)
-     {
-        SCWrite(pCon,"ERROR: no monochromator found",eError);
-        return ;
-     }
-     pDum = (pDummy)pSel;
-     if(strcmp(pDum->pDescriptor->name,"CrystalSelector") != 0)
-     {
-        SCWrite(pCon,"ERROR: monochromator is invalid",eError);
-        return ;
-     }
-     
-     NXDputalias(pFile,pDict,"mname",MonoGetType(pSel));
-     iRet = GetMonoPositions(pSel,pCon,&fTh, &fTTH, &fB1, &fB2);
-     if(!iRet)
-     {
-       SCWrite(pCon,"ERROR: Problem reading monochromator positions",eError);
-       SCWrite(pCon,"ERROR: monochromator data missing in file",eError);
-       return; 
-     }  
-     NXDputalias(pFile,pDict,"mtheta",&fTh);
-     NXDputalias(pFile,pDict,"mttheta",&fTTH);
-     SNXSPutDrivable(pServ->pSics,pCon, pFile,pDict,"lambda","mlambda");
-     SNXSPutDrivable(pServ->pSics,pCon, pFile,pDict,"qi","menergy");
-  }  
-/*----------------------------------------------------------------------*/
-  static float CalculateElastic(pFoWrite self, SConnection *pCon)
-  {
-      pIDrivable pDriv;
-      pSicsVariable pVar;
-      CommandList *pCom = NULL;
-      float fLambda, fDist, fResult;
-
-      pCom = FindCommand(pServ->pSics,"lambda");
-      if(!pCom)
-          return 0.;
-      pDriv = GetDrivableInterface(pCom->pData);
-      if(!pDriv)
-          return 0.;
-      fLambda = pDriv->GetValue(pCom->pData,pCon);
-      pVar = FindVariable(pServ->pSics,"sampledist");
-      if(!pVar)
-          return 0.;
-      fDist = pVar->fVal;
-      pVar = FindVariable(pServ->pSics,"detectordist");
-      if(!pVar)
-          return 0.;
-      fDist += pVar->fVal;
-      fResult =  252.78*fLambda*(fDist/1000.);
-      return fResult;
-  }
-/*-------------------------------------------------------------------------
-   FoStart writes all the fixed data items, creates a new file etc.
-   A complete file is obtained after FoStart plus a call to FoUpdate
-*/   
-  static int FoStart(pFoWrite self, SConnection *pCon)
-  {
-     NXhandle pFile = NULL;
-     NXdict   pDict = NULL; 
-     pSicsVariable var1 = NULL;
-     pSicsVariable var2 = NULL;
-     int lbank, mbank;     
-     int iStat, iLength, i;
-     char pBueffel[512];
-     CounterMode eMode;
-     float fVal, *fArray;
-     const float *fTime;
-     float *fTime2 = NULL;
-     char pBuffer[50];     
-     
-     /* get a filename */
-     if(self->pFile)
-        free(self->pFile);
-        
-     self->pFile = SNXMakeFileName(pServ->pSics,pCon);
-     if(!self->pFile)
-     {
-       SCWrite(pCon,"ERROR: Extra severe: failed to create data file name",
-               eError);
-       return 0;
-     }
-     
-     /* create a Nexus file */
-     NXopen(self->pFile,NXACC_CREATE,&pFile);
-     if(!pFile)
-     {
-         SCWrite(pCon,"ERROR: cannot create data file ",eError);
-         return 0;
-     }
-     
-     /* tell Uwe User what we are doing */
-     sprintf(pBueffel,"Writing %s ......",self->pFile);
-     SCWrite(pCon,pBueffel,eWarning);
-     
-     /* write globals */
-     SNXSPutGlobals(pFile,self->pFile,"FOCUS",pCon);
-     
-     /* open nxdict and configure nxdict parameters */
-     iStat = NXDinitfromfile(self->pDictFile,&pDict);
-     if(iStat != NX_OK)
-     {
-        sprintf(pBueffel,"ERROR: failed to open dictionary file %s",
-                self->pDictFile);
-        SCWrite(pCon,pBueffel,eError);
-        SCWrite(pCon,"ERROR: Aborting data file writing",eError);
-        SCWrite(pCon,"ERROR: This is a SERIOUS problem!",eError);
-        SCWrite(pCon,"ERROR: DATA NOT WRITTEN",eError);
-        NXclose(&pFile);
-        return 0;        
-     }
-
-     /* put permanent data */
-     SNXSPutVariable(pServ->pSics,pCon,pFile,pDict,"etitle","title");       
-     SNXFormatTime(pBueffel,511);
-
-     /* entry & instrument stuff */
-     NXDputalias(pFile,pDict,"estart",pBueffel);
-     SNXSPutVariable(pServ->pSics,pCon,pFile,pDict,"iname","instrument"); 
-     NXDputalias(pFile,pDict,"sname","SINQ, PSI, Switzerland");
-     NXDputalias(pFile,pDict,"stype","continous spallation source");
-
-     /* disk chopper */
-     NXDputalias(pFile,pDict,"cname","Dornier disk chopper");
-
-     /* be-filter */
-     NXDputalias(pFile,pDict,"bname","BE-filter");
-     SNXSPutVariable(pServ->pSics,pCon,pFile,pDict,"bstatus","bestatus"); 
-
-     /* flight path */
-     SNXSPutVariable(pServ->pSics,pCon,pFile,pDict,"fltype","flightpath"); 
-     SNXSPutVariable(pServ->pSics,pCon,pFile,pDict,"fllength","flightpathlength"); 
-
-     /* monochromator */
-     WriteSelector(pFile,pDict,pCon);  
-
-     /* fermi chupper */
-     SNXSPutVariable(pServ->pSics,pCon,pFile,pDict,"fcname","ferminame"); 
-     SNXSPutVariable(pServ->pSics,pCon,pFile,pDict,"fcdist","fermidist"); 
-
-     /* counting data */
-
-      var2 = FindVariable(pServ->pSics,"mbank");
-      if(var2)
-      {
-        VarGetInt(var2,&mbank);
-      } else {
-        SCWrite(pCon,"ERROR: mbank value not found!",eError);
-      } 
-      if(var2)
-      {
-         eMode = GetHistCountMode(self->pHistogram2);
-         fTime = GetHistTimeBin(self->pHistogram2,&iLength);
-         fVal = GetHistPreset(self->pHistogram2); 
-      }
-      else
-      {
-        var1 = FindVariable(pServ->pSics,"lbank");
-        if(var1)
-        {
-           VarGetInt(var1,&lbank);
-        } else {
-           SCWrite(pCon,"ERROR: lbank value not found!",eError);
-        } 
-        if(var1)
-          {
-            eMode = GetHistCountMode(self->pHistogram1);
-            fTime = GetHistTimeBin(self->pHistogram1,&iLength);
-            fVal = GetHistPreset(self->pHistogram1);    
-          }
-          else
-          {
-            eMode = GetHistCountMode(self->pHistogram3);
-            fTime = GetHistTimeBin(self->pHistogram3,&iLength);
-            fVal = GetHistPreset(self->pHistogram3);
-          }
-      }   
-
-     if(eMode == eTimer)
-     {
-       strcpy(pBueffel,"timer");
-     }           
-     else
-     {
-        strcpy(pBueffel,"monitor");
-     }
-     NXDputalias(pFile,pDict,"cnmode",pBueffel);
-     NXDputalias(pFile,pDict,"cnpreset",&fVal);
-     
-     /* detector banks */
-     fTime2 = (float *)malloc(iLength*sizeof(float));
-     if(fTime2)
-     {
-       for(i = 0; i < iLength; i++)
-       {
-          fTime2[i] = fTime[i]/10.;
-       }
-       sprintf(pBueffel,"%d",iLength);
-       NXDupdate(pDict,"timebin",pBueffel);
-       if(self->iMiddle)
-       {
-           NXDupdate(pDict,"bank","bank1");
-           NXDputalias(pFile,pDict,"dtime",fTime2);
-       }
-       if(self->iUpper)
-       {
-           NXDupdate(pDict,"bank","upperbank");
-           NXDputalias(pFile,pDict,"dtime",fTime2);
-       }
-       if(self->iLower)
-       {
-           NXDupdate(pDict,"bank","lowerbank");
-           NXDputalias(pFile,pDict,"dtime",fTime2);
-       }
-       if( (self->iLower || self->iUpper) && self->iMiddle)
-       {
-           NXDupdate(pDict,"bank","merged");
-           NXDputalias(pFile,pDict,"dtime",fTime2);
-       }
-       NXDupdate(pDict,"bank","bank1");
-
-
-       /* calculate theoretical position of elastic peak */
-       fVal = CalculateElastic(self,pCon);
-       self->fElastic = (fVal - fTime2[0]) / (fTime2[1] - fTime2[0]);
-       free(fTime2);
-       fTime2 = NULL;
-     }
-     else
-     {
-       SCWrite(pCon,"ERROR: out of memory while writing time binning",
-               eError);
-     }
-
-     SNXSPutVariable(pServ->pSics,pCon,pFile,pDict,"ddist","detectordist"); 
-
-     /* theta arrays */
-     if(self->iMiddle)
-     {
-       NXDupdate(pDict,"bank","bank1");
-       iLength = 150;
-       sprintf(pBuffer,"%d",iLength);
-       NXDupdate(pDict,"noofdetectors",pBuffer);              
-       fArray = getFMBankTheta(MIDDLE);
-       NXDputalias(pFile,pDict,"dtheta",fArray);
-     }
-     if(self->iLower)
-     {
-       NXDupdate(pDict,"bank","lowerbank");
-       iLength = 115;
-       sprintf(pBuffer,"%d",iLength);
-       NXDupdate(pDict,"noofdetectors",pBuffer);              
-       fArray = getFMBankTheta(LOWER);
-       NXDputalias(pFile,pDict,"dtheta",fArray);
-     }
-     if(self->iUpper)
-     {
-       NXDupdate(pDict,"bank","upperbank");
-       iLength = 110;
-       sprintf(pBuffer,"%d",iLength);
-       NXDupdate(pDict,"noofdetectors",pBuffer);              
-       fArray = getFMBankTheta(UPPER);
-       NXDputalias(pFile,pDict,"dtheta",fArray);
-     }
-     if(self->iMiddle && ( self->iLower || self->iUpper) )
-     {
-       NXDupdate(pDict,"bank","merged");
-       iLength = 375;
-       sprintf(pBuffer,"%d",iLength);
-       NXDupdate(pDict,"noofdetectors",pBuffer);              
-       fArray = getFMBankTheta(MERGED);
-       NXDputalias(pFile,pDict,"dtheta",fArray);
-     }
-
-     NXDupdate(pDict,"bank","bank1");
-     SNXSPutVariable(pServ->pSics,pCon,pFile,pDict,"ddelay","delay"); 
-     
-     
-     /* sample info */
-     SNXSPutVariable(pServ->pSics,pCon,pFile,pDict,"saname","sample"); 
-     SNXSPutVariable(pServ->pSics,pCon,pFile,pDict,"senvir","environment"); 
-     SNXSPutVariable(pServ->pSics,pCon,pFile,pDict,"sdist","sampledist"); 
-     SNXSPutVariable(pServ->pSics,pCon,pFile,pDict,"saangle","sampleangle"); 
-     
-     /* close everything */
-     NXclose(&pFile);
-     NXDclose(pDict,NULL);
-
- }
-/*---------------------------------------------------------------------------*/
-  static void FoUpdate(pFoWrite self, SConnection *pCon)
-  {
-      char pBueffel[512];
-      int iInt, iStat, iTime, i,ii, j, iDet, iIndex;
-      pSicsVariable var1 = NULL;
-      pSicsVariable var2 = NULL;
-      pSicsVariable var3 = NULL;
-      int lbank, mbank, ubank;
-      long lVal; 
-      float fVal;
-      const float *fTime;
-      NXhandle pFile = NULL;
-      NXdict   pDict;
-      HistInt *lData = NULL; 
-      HistInt *mData = NULL; 
-      HistInt *uData = NULL;
-      int *iSum = NULL;
-      float *fAxis = NULL;
-      long *lSum = NULL;
-      float fCenter, fStdDev, fFWHM;
-      
-      /* open everything again */
-     NXopen(self->pFile,NXACC_RDWR,&pFile);
-     if(!pFile)
-     {
-         SCWrite(pCon,"ERROR: cannot reopen data file ",eError);
-         return;
-     }
-     iStat = NXDinitfromfile(self->pDictFile,&pDict);
-     if(iStat != NX_OK)
-     {
-        sprintf(pBueffel,"ERROR: failed to open dictionary file %s",
-                self->pDictFile);
-        SCWrite(pCon,pBueffel,eError);
-        SCWrite(pCon,"ERROR: Aborting data file writing",eError);
-        SCWrite(pCon,"ERROR: This is a SERIOUS problem!",eError);
-        SCWrite(pCon,"ERROR: DATA NOT WRITTEN",eError);
-        NXclose(&pFile);
-        return;
-      }
-      
-     /* tell the user that something is happening */
-     sprintf(pBueffel,"Updating %s",self->pFile);
-     SCWrite(pCon,pBueffel,eWarning);
-      
-      /* do the end time */
-     SNXFormatTime(pBueffel,511);
-     NXDputalias(pFile,pDict,"eend",pBueffel);
-                
-     /* chopper speeds */
-     SNXSPutDrivable(pServ->pSics,pCon,pFile,pDict,"diskspeed","crot"); 
-     SNXSPutDrivable(pServ->pSics,pCon,pFile,pDict,"fermispeed","fcrot"); 
-     SNXSPutDrivable(pServ->pSics,pCon,pFile,pDict,"phase","fcphase"); 
-     SNXSPutDrivable(pServ->pSics,pCon,pFile,pDict,"ratio","cratio"); 
-     
-     /* counter data */  
-      var2 = FindVariable(pServ->pSics,"mbank");
-      if(var2)
-      {
-        VarGetInt(var2,&mbank);
-      } else {
-        SCWrite(pCon,"ERROR: mbank value not found!",eError);
-      } 
-      if(var2)
-      {
-         fVal = GetHistCountTime(self->pHistogram2,pCon);
-         NXDputalias(pFile,pDict,"cntime",&fVal);
-         lVal = GetHistMonitor(self->pHistogram2,1,pCon);
-         NXDputalias(pFile,pDict,"cnmon1",&lVal);
-         lVal = GetHistMonitor(self->pHistogram2,0,pCon);
-         NXDputalias(pFile,pDict,"cnmon2",&lVal);
-         lVal = GetHistMonitor(self->pHistogram2,4,pCon);
-         NXDputalias(pFile,pDict,"cnmon3",&lVal);
-         fTime = GetHistTimeBin(self->pHistogram2,&iInt);  
-      }
-      else
-	{
-        var1 = FindVariable(pServ->pSics,"lbank");
-        if(var1)
-        {
-           VarGetInt(var1,&lbank);
-        } else {
-           SCWrite(pCon,"ERROR: lbank value not found!",eError);
-        }  
-        if(var1)
-          {
-            fVal = GetHistCountTime(self->pHistogram1,pCon);
-            NXDputalias(pFile,pDict,"cntime",&fVal);
-            lVal = GetHistMonitor(self->pHistogram1,1,pCon);
-            NXDputalias(pFile,pDict,"cnmon1",&lVal);
-            lVal = GetHistMonitor(self->pHistogram1,0,pCon);
-            NXDputalias(pFile,pDict,"cnmon2",&lVal);
-            lVal = GetHistMonitor(self->pHistogram1,4,pCon);
-            NXDputalias(pFile,pDict,"cnmon3",&lVal);
-            fTime = GetHistTimeBin(self->pHistogram1,&iInt);
-          }
-          else
-          {
-            fVal = GetHistCountTime(self->pHistogram3,pCon);
-            NXDputalias(pFile,pDict,"cntime",&fVal);
-            lVal = GetHistMonitor(self->pHistogram3,1,pCon);
-            NXDputalias(pFile,pDict,"cnmon1",&lVal);
-            lVal = GetHistMonitor(self->pHistogram3,0,pCon);
-            NXDputalias(pFile,pDict,"cnmon2",&lVal);
-            lVal = GetHistMonitor(self->pHistogram3,4,pCon);
-            NXDputalias(pFile,pDict,"cnmon3",&lVal);
-            fTime = GetHistTimeBin(self->pHistogram3,&iInt); 
-          }
-      }   
-
-     /* histogram with three detector banks */     
-     iTime = iInt;
-     sprintf(pBueffel,"%d",iInt);
-     NXDupdate(pDict,"timebin",pBueffel);
-     var1 = FindVariable(pServ->pSics,"lbank");
-     if(var1)
-     {
-        VarGetInt(var1,&lbank);
-     } else {
-        SCWrite(pCon,"ERROR: lbank value not found!",eError);
-     } 
-     if (var1) 
-     {
-         lData = GetHistogramPointer(self->pHistogram1,pCon);  
-         if(!lData)
-         {
-            SCWrite(pCon,"ERROR: failed to find Histogram Memory Data (lower bank)",eError);
-            NXclose(&pFile);
-            NXDclose(pDict,NULL);
-            return;
-          }
-     }
-     if (var2) 
-     {
-        mData = GetHistogramPointer(self->pHistogram2,pCon);
-        if(!mData)
-        {
-           SCWrite(pCon,"ERROR: failed to find Histogram Memory Data (middle bank)",eError);
-           NXclose(&pFile);
-           NXDclose(pDict,NULL);
-           return;
-        }
-     }
-     var3 = FindVariable(pServ->pSics,"ubank");
-        if(var3)
-        {
-           VarGetInt(var3,&ubank);
-        } else {
-           SCWrite(pCon,"ERROR: ubank value not found!",eError);
-        }  
-     if (var3) 
-     {
-        uData = GetHistogramPointer(self->pHistogram3,pCon);
-        if(!uData)
-        {
-           SCWrite(pCon,"ERROR: failed to find Histogram Memory Data (upper bank)",eError);
-           NXclose(&pFile);
-           NXDclose(pDict,NULL);
-           return;
-        }
-     }
-     setFMDataPointer(lData,iTime,3);
-     setFMDataPointer(mData,iTime,1);
-     setFMDataPointer(uData,iTime,2);
-     /* middle bank */
-     if(self->iMiddle)
-     {
-       NXDupdate(pDict,"bank","bank1");
-       iDet = 150;
-       sprintf(pBueffel,"%d",iDet);
-       NXDupdate(pDict,"noofdetectors",pBueffel);
-       mData = getFMBankPointer(MIDDLE);
-       NXDputalias(pFile,pDict,"dcounts",mData);
-       /* summed counts for each detector */
-       iSum = (int *)malloc(iDet*sizeof(int));
-       if(iSum)
-       {
-           memset(iSum,0,iDet*sizeof(int));
-           for(i = 0; i < iDet; i++)
-	   {
-              iIndex = i * iTime;
-              for(j = 0; j < iTime; j++)
-	      {
-                 iSum[i] += mData[iIndex+j];
-              } 
-            }
-            NXDputalias(pFile,pDict,"dsums",iSum);
-            free(iSum);
-         }
-         else
-         {
-             SCWrite(pCon,"WARNING: out of memory, failed to do sums",
-                     eWarning);
-          }
-     }
-     if(self->iUpper)
-     {
-       NXDupdate(pDict,"bank","upperbank");
-       iDet = 110;
-       sprintf(pBueffel,"%d",iDet);
-       NXDupdate(pDict,"noofdetectors",pBueffel);
-       uData = getFMBankPointer(UPPER);
-       NXDputalias(pFile,pDict,"dcounts",uData);
-       /* summed counts for each detector */
-       iSum = (int *)malloc(iDet*sizeof(int));
-       if(iSum)
-       {
-           memset(iSum,0,iDet*sizeof(int));
-           for(i = 0; i < iDet; i++)
-	   {
-              iIndex = i * iTime;
-              for(j = 0; j < iTime; j++)
-	      {
-                 iSum[i] += uData[iIndex+j];
-              } 
-            }           
-            NXDputalias(pFile,pDict,"dsums",iSum);
-            free(iSum);
-         }
-         else
-         {
-             SCWrite(pCon,"WARNING: out of memory, failed to do sums",
-                     eWarning);
-          }
-     }
-     if(self->iLower)
-     {
-       NXDupdate(pDict,"bank","lowerbank");
-       iDet = 115;
-       sprintf(pBueffel,"%d",iDet);
-       NXDupdate(pDict,"noofdetectors",pBueffel);
-       lData = getFMBankPointer(LOWER);
-       NXDputalias(pFile,pDict,"dcounts",lData);
-       /* summed counts for each detector */
-       iSum = (int *)malloc(iDet*sizeof(int));
-       if(iSum)
-       {
-           memset(iSum,0,iDet*sizeof(int));
-           for(i = 0; i < iDet; i++)
-	   {
-              iIndex = i * iTime;
-              for(j = 0; j < iTime; j++)
-	      {
-                 iSum[i] += lData[iIndex+j];
-              } 
-            }
-            NXDputalias(pFile,pDict,"dsums",iSum);
-            free(iSum);
-         }
-         else
-         {
-             SCWrite(pCon,"WARNING: out of memory, failed to do sums",
-                     eWarning);
-         }
-         /*
-         now get and write tof_monitor
-         */
-       
-         lData = (HistInt *)malloc(iTime*sizeof(HistInt));
-         if(!lData)
-         {
-            SCWrite(pCon,"ERROR: out of memory while writing tof-monitor",
-                  eError);
-         }
-         else
-         {
-         memset(lData,0,iTime*sizeof(HistInt));
-	 GetHistogramDirect(self->pHistogram1,pCon,0,115*iTime,
-			    116*iTime, lData, iTime*sizeof(HistInt));
-	 NXDputalias(pFile,pDict,"tofmon",lData);
-        }         
-     }
-     /* merged data */
-     if( (self->iUpper || self->iLower) && self->iMiddle)
-     {
-       NXDupdate(pDict,"bank","merged");
-       iDet = 375;
-       sprintf(pBueffel,"%d",iDet);
-       NXDupdate(pDict,"noofdetectors",pBueffel);
-       lData = getFMBankPointer(MERGED);
-       NXDputalias(pFile,pDict,"dcounts",lData);
-       /* summed counts for each detector */
-       iSum = (int *)malloc(iDet*sizeof(int));
-       if(iSum)
-       {
-           memset(iSum,0,iDet*sizeof(int));
-           for(i = 0; i < iDet; i++)
-	   {
-              iIndex = i * iTime;
-              for(j = 0; j < iTime; j++)
-	      {
-                 iSum[i] += lData[iIndex+j];
-              } 
-            }
-            NXDputalias(pFile,pDict,"dsums",iSum);
-            free(iSum);
-         }
-         else
-         {
-             SCWrite(pCon,"WARNING: out of memory, failed to do sums",
-                     eWarning);
-          }
-     }
-
-     
-     /* calculate elastic peak position */
-     NXDupdate(pDict,"bank","bank1");
-     mData = getFMBankPointer(MIDDLE);
-     if(mData)
-     {
-        lSum = (long *)malloc(iTime *sizeof(long));
-        fAxis = (float *)malloc(iTime *sizeof(float));
-        if( lSum && fAxis)
-        {
-           memset(lSum,0,iTime*sizeof(long));
-           memset(fAxis,0,iTime*sizeof(float));
-           for(i = 5; i < iDet - 5; i++)
-	   {
-             iIndex = i * iTime;
-             for(j = 0; j < iTime; j++)
-	     {
-                lSum[j] += mData[iIndex+j];
-             } 
-          }
-          for(i = 0; i < iTime; i++)
-	  {
-              fAxis[i] = (float)i;
-          }
-          iStat = CalculateFitFromData(self->pFitter,fAxis,lSum,iTime);
-          if(iStat != 1)
-	  {
-              SCWrite(pCon,"WARNING: problem locating elastic peak",eWarning);
-          }
-          GetFitResults(self->pFitter,&fCenter,&fStdDev,&fFWHM,&fVal);
-          fVal = fCenter - self->fElastic;
-          if(fVal < 0.)
-              fVal = - fVal;
-           /* bad value, leave at theoretical value */
-           if(fVal > 10.)
-	   {
-               SCWrite(pCon,
-           "WARNING: bad fit result, using theoretical elastic peak position",
-                eWarning);
-            }
-            else
-	    {
-              self->fElastic = fCenter;
-            }
-            free(lSum);
-            free(fAxis);
-         }          
-         else
-         {
-           SCWrite(pCon,"WARNING: out of memory, failed to do sums",eWarning);
-         }
-     }
-     sprintf(pBueffel,"Elastic peak found at detector: %f",self->fElastic);
-     SCWrite(pCon,pBueffel,eWarning);
-     NXDputalias(pFile,pDict,"delastic",&self->fElastic);
-
-
-     /* sample temperature */
-     SNXSPutEVVar(pFile,pDict,"temperature",pCon,"stemp",NULL);
-            
-
-     /* close everything */
-     NXclose(&pFile);
-     NXDclose(pDict,NULL);
-      
-  }                                              
-/*-------------------------------------------------------------------------
-  FoLink sets all the links for the NXdata vGroup. Had to be separate because
-  at least one update is necessary before this can be done.
-*/
-  static void FoLink(pFoWrite self, SConnection *pCon)
-  {
-     NXhandle pFile;
-     NXdict   pDict;
-     int iStat;
-     char pBueffel[512];
-     
-       /* open everything again */
-     NXopen(self->pFile,NXACC_RDWR,&pFile);
-     if(!pFile)
-     {
-         SCWrite(pCon,"ERROR: cannot reopen data file ",eError);
-         return;
-     }
-     iStat = NXDinitfromfile(self->pDictFile,&pDict);
-     if(iStat != NX_OK)
-     {
-        sprintf(pBueffel,"ERROR: failed to open dictionary file %s",
-                self->pDictFile);
-        SCWrite(pCon,pBueffel,eError);
-        SCWrite(pCon,"ERROR: Aborting data file writing",eError);
-        SCWrite(pCon,"ERROR: This is a SERIOUS problem!",eError);
-        SCWrite(pCon,"ERROR: DATA NOT WRITTEN",eError);
-        NXclose(&pFile);
-        return;
-      }
-
-      if( (self->iUpper || self->iLower) && self->iMiddle)
-      {  
-         NXDupdate(pDict,"bank","merged");  
-         NXDaliaslink(pFile,pDict,"dana","dcounts");
-         NXDaliaslink(pFile,pDict,"dana","dtime");
-         NXDaliaslink(pFile,pDict,"dana","dtheta"); 
-         NXDaliaslink(pFile,pDict,"dana","cnmon1"); 
-      }     
-     
-      if(self->iUpper)
-      {  
-         NXDupdate(pDict,"bank","upperbank");  
-         NXDaliaslink(pFile,pDict,"dana","dcounts");
-         NXDaliaslink(pFile,pDict,"dana","dtime");
-         NXDaliaslink(pFile,pDict,"dana","dtheta"); 
-         NXDaliaslink(pFile,pDict,"dana","cnmon1"); 
-      }     
-      if(self->iMiddle)
-      {  
-         NXDupdate(pDict,"bank","bank1");  
-         NXDaliaslink(pFile,pDict,"dana","dcounts");
-         NXDaliaslink(pFile,pDict,"dana","dtime");
-         NXDaliaslink(pFile,pDict,"dana","dtheta"); 
-         NXDaliaslink(pFile,pDict,"dana","cnmon1"); 
-      }     
-      if(self->iLower)
-      {  
-         NXDupdate(pDict,"bank","lowerbank");  
-         NXDaliaslink(pFile,pDict,"dana","dcounts");
-         NXDaliaslink(pFile,pDict,"dana","dtime");
-         NXDaliaslink(pFile,pDict,"dana","dtheta"); 
-         NXDaliaslink(pFile,pDict,"dana","cnmon1"); 
-      }     
-
-
-      /* close everything */
-     NXclose(&pFile);
-     NXDclose(pDict,NULL);
-     self->iNew = 0;
-  }  
-/*---------------------------------------------------------------------------
-  This is the task function for updating the data file any now and then
-  automatically
-*/
- static int FoTask(void *pData)
- {
-    pFoWrite self = NULL;
-    int iWrite, iRet;
-    
-    self = (pFoWrite)pData;
-    if(!self)
-      return 0;
-      
-    /* figure out if we need to write */
-    iWrite = 0;
-    iRet = 1;
-    /* first case: update intervall */
-    if(time(NULL) >= self->tUpdate)
-    {
-       self->tUpdate = time(NULL) + self->iInterval;
-       iWrite = 1;
-       iRet = 1;
-    }  
-    if(self->iEnd)
-    {
-       self->tUpdate = 0;
-       iWrite = 0;
-       iRet = 0;
-       FoUpdate(self,self->pCon);
-    }
-    
-    if(iWrite)
-    {
-       if(self->iNew)
-       {
-          FoStart(self,self->pCon);
-          FoUpdate(self,self->pCon);
-          FoLink(self,self->pCon);
-       }
-       else
-       {
-          FoUpdate(self,self->pCon);
-       }
-    }
-    return iRet;
- }     
-/*------------------------------------------------------------------------*/
-  static void KillFoWrite(void *pData)
-  {
-     pFoWrite self = NULL;
-     
-     self = (pFoWrite)pData;
-     if(!self)
-        return;
-        
-     if(self->pDes)
-        DeleteDescriptor(self->pDes);
-     
-     if(self->pDictFile)
-        free(self->pDictFile);
-        
-     if(self->pFile)
-        free(self->pFile);      
-
-     if(self->pFitter)
-       DeleteFitCenter(self->pFitter);
-
-     /* free fomerge */
-      killFM();
-        
-     free(self);     
-  } 
-/*-----------------------------------------------------------------------*/
-  int FoInstall(SConnection *pCon, SicsInterp *pSics, void *pData,
-                  int argc, char *argv[])
-  {
-      CommandList *pCom = NULL;
-      char pBueffel[512];
-      pFoWrite pNew = NULL;
-      pICallBack pCall = NULL;
-      pDummy pDum;
-      pHMcontrol pHMC = NULL;
-
-      /* check arguments */
-      if(argc < 4 )
-      {
-         SCWrite(pCon,"ERROR: Insufficient number of arguments to FoInstall",
-                 eError);
-         return 0;        
-      }
-      
-      /* allocate data structure */
-      pNew = (pFoWrite)malloc(sizeof(FoWrite));
-      if(!pNew)
-      {
-         SCWrite(pCon,"ERROR: out of memory in FoInstall",eError);
-         return 0;
-      }
-      memset(pNew,0,sizeof(FoWrite));
-      pNew->pDes = CreateDescriptor("FocusWrite");
-      pNew->pCall = CreateCallBackInterface();
-      pNew->pFitter = CreateFitCenter(NULL);
-      if( (!pNew->pDes) || (!pNew->pFitter) )
-      {
-         SCWrite(pCon,"ERROR: out of memory in FoInstall",eError);
-         free(pNew);
-         return 0;
-      }
-      pNew->pDictFile = strdup(argv[2]);
-      pNew->iInterval = 20*60;
-
-      pHMC = FindCommandData(pSics,argv[1],"HMcontrol");
-      if(!pHMC){
-	SCWrite(pCon,"ERROR: no histogram memory control found!",eError);
-	free(pNew);
-	return 0;
-      }
-
-       /* find things in interpreter */
-      pCom = FindCommand(pSics,"hm1"); 
-      if(!pCom)
-      {
-        SCWrite(pCon,"ERROR: Histogram memory for lower detector bank NOT found",eError);
-	pNew->pHistogram1 = NULL;
-      } else
-      { 
-        pNew->pHistogram1 = (pHistMem)pCom->pData; 
-        pNew->iLower =1;
-      } 
-         
-
-      pCom = FindCommand(pSics,HM2);
-      if(pCom)
-      {
-        pNew->pHistogram2 = (pHistMem)pCom->pData;
-        pNew->iMiddle =1; 
-      }
-      else
-      {
-         SCWrite(pCon,"ERROR: Histogram memory for middle detector bank NOT found",eError);
-         pNew->pHistogram2 = NULL;
-      }
-      
-      pCom = FindCommand(pSics,HM3);
-      if(pCom)
-      {
-         pNew->pHistogram3 = (pHistMem)pCom->pData; 
-         pNew->iUpper =1; 
-      }
-      else
-      {
-        SCWrite(pCon,"ERROR: Histogram memory for upper detector bank NOT found",eError);
-        pNew->pHistogram3 = NULL;
-      }     
-
-      if(!initializeFM(argv[3]))
-      {
-         SCWrite(pCon,"ERROR: bad merge data file",eError);
-         return 0;
-      }
-      
-      pCom = FindCommand(pSics,"counter");
-      if(pCom)
-      {
-         pNew->pCount = (pCounter)pCom->pData;
-      }
-
-      RegisterCallback(pHMC->pCall,COUNTSTART,Countstartcallback,pNew,NULL);
-      RegisterCallback(pHMC->pCall,COUNTEND,Countendcallback,pNew,NULL);      
-
-      /* install command */
-      AddCommand(pSics,"StoreFocus",FoAction,KillFoWrite,pNew);
-      return 1;       
- }                
-/*-------------------------------------------------------------------------*/
- int FoAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-              int argc, char *argv[])
- {
-    int iRet, iVal;
-    pFoWrite self = NULL;
-    char pBueffel[512];
-     
-    if(argc < 1)
-    {
-       SCWrite(pCon,"ERROR: Insufficient number of arguments to StoreFocus",
-               eError);
-       return 0;        
-    }
-    self = (pFoWrite)pData;
-    assert(self);
-    
-    strtolower(argv[1]);
-    if(strcmp(argv[1],"start") == 0)
-    {
-       FoStart(self,pCon);
-       FoUpdate(self,pCon);
-       FoLink(self,pCon);
-       return 1;
-    }
-    else if(strcmp(argv[1],"update") == 0)
-    {
-      if((self->iNew) || (!self->pFile))
-      {
-        FoStart(self,pCon);
-        FoUpdate(self,pCon);
-        FoLink(self,pCon);
-      }
-      else
-      {
-        FoUpdate(self,pCon);
-      }
-      return 1; 
-    }
-    else if(strcmp(argv[1],"getfile") == 0)
-    {
-        sprintf(pBueffel,"storefocus.file = %s",self->pFile);
-        SCWrite(pCon,pBueffel,eValue);
-        return 1;
-    }
-    else if(strcmp(argv[1],"interval") == 0)
-    {
-       if(argc > 2) /* set value */
-       {
-          if(!SCMatchRights(pCon,usUser))  
-          {
-            return 0;
-          }   
-          iRet = Tcl_GetInt(pSics->pTcl,argv[2],&iVal);
-          if(iRet != TCL_OK)
-          {
-             sprintf(pBueffel,"ERROR: cannot convert --> %s <-- to number ",argv[2]);
-             SCWrite(pCon,pBueffel,eError);
-             return 0;
-          }
-          self->iInterval = iVal*60; /* go to seconds from minutes*/
-          SCSendOK(pCon);
-          return 1;
-       }
-       else /* read the value */ 
-       {
-          sprintf(pBueffel,"storefocus.interval = %d",self->iInterval/60);
-          SCWrite(pCon,pBueffel,eValue);
-          return 1;
-       }
-    }
-    else if(strcmp(argv[1],"middle") == 0)
-    {
-       if(argc > 2) /* set value */
-       {
-          if(!SCMatchRights(pCon,usMugger))  
-          {
-            return 0;
-          }   
-          iRet = Tcl_GetInt(pSics->pTcl,argv[2],&iVal);
-          if(iRet != TCL_OK)
-          {
-             sprintf(pBueffel,"ERROR: cannot convert --> %s <-- to number ",
-                     argv[2]);
-             SCWrite(pCon,pBueffel,eError);
-             return 0;
-          }
-          if(iVal < 0) iVal = 0;
-          self->iMiddle = iVal;
-          setFMconfiguration(self->iUpper,self->iMiddle,self->iLower);
-          SCSendOK(pCon);
-          return 1;
-       }
-       else /* read the value */ 
-       {
-          sprintf(pBueffel,"storefocus.middle = %d",self->iMiddle);
-          SCWrite(pCon,pBueffel,eValue);
-          return 1;
-       }
-    }
-    else if(strcmp(argv[1],"lower") == 0)
-    {
-       if(argc > 2) /* set value */
-       {
-          if(!SCMatchRights(pCon,usMugger))  
-          {
-            return 0;
-          }   
-          iRet = Tcl_GetInt(pSics->pTcl,argv[2],&iVal);
-          if(iRet != TCL_OK)
-          {
-             sprintf(pBueffel,"ERROR: cannot convert --> %s <-- to number ",
-                     argv[2]);
-             SCWrite(pCon,pBueffel,eError);
-             return 0;
-          }
-          if(iVal < 0) iVal = 0;
-          self->iLower = iVal;
-          setFMconfiguration(self->iUpper,self->iMiddle,self->iLower);
-          SCSendOK(pCon);
-          return 1;
-       }
-       else /* read the value */ 
-       {
-          sprintf(pBueffel,"storefocus.lower = %d",self->iLower);
-          SCWrite(pCon,pBueffel,eValue);
-          return 1;
-       }
-    }
-    else if(strcmp(argv[1],"upper") == 0)
-    {
-       if(argc > 2) /* set value */
-       {
-          if(!SCMatchRights(pCon,usMugger))  
-          {
-            return 0;
-          }   
-          iRet = Tcl_GetInt(pSics->pTcl,argv[2],&iVal);
-          if(iRet != TCL_OK)
-          {
-             sprintf(pBueffel,"ERROR: cannot convert --> %s <-- to number ",
-                     argv[2]);
-             SCWrite(pCon,pBueffel,eError);
-             return 0;
-          }
-          if(iVal < 0) iVal = 0;
-          self->iUpper = iVal;
-          setFMconfiguration(self->iUpper,self->iMiddle,self->iLower);
-          SCSendOK(pCon);
-          return 1;
-       }
-       else /* read the value */ 
-       {
-          sprintf(pBueffel,"storefocus.upper = %d",self->iUpper);
-          SCWrite(pCon,pBueffel,eValue);
-          return 1;
-       }
-    }
-    SCWrite(pCon,"ERROR: subcommand to storefocus not recognized",eError);
-    return 0;
- }              
diff --git a/fowrite.h b/fowrite.h
deleted file mode 100644
index fdf4ac0d..00000000
--- a/fowrite.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------------------------------------------------
-                               F O W R I T E
-                            
-    fowrite is an object for writing FOCUS data files. 
-    
-    copyright: see copyright.h
-    
-    Mark Koennecke, November 1998
-----------------------------------------------------------------------------*/
-#ifndef FOWRITE
-#define FOWRITE
-
-   int FoInstall(SConnection *pCon, SicsInterp *pSics,
-                 void *pData, int argc, char *argv[]);
-                 
-
-   int FoAction(SConnection *pCon, SicsInterp *pSics,
-                 void *pData, int argc, char *argv[]);
-                 
-#endif
-                               
\ No newline at end of file
diff --git a/hardsup/Makefile b/hardsup/Makefile
deleted file mode 100644
index 018b381c..00000000
--- a/hardsup/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#---------------------------------------------------------------------------
-# Makefile for the SINQ hardware support library
-#
-# Mark Koennecke, November 1996
-#--------------------------------------------------------------------------
-.SUFFIXES:
-.SUFFIXES: .c .o
-OBJ=   el734_utility.o asynsrv_utility.o stredit.o \
-     strjoin.o failinet.o geterrno.o  el737_utility.o  sinqhm.o serialsinq.o \
-     itc4util.o dillutil.o table.o el755_utility.o el755_errorlog.o \
-     makeprint.o StrMatch.o
-
-#---------- for Redhat linux
-#CC= gcc
-#CFLAGS= -I$SINQDIR/linux/include -I. -I../ -DLINUX   -g -c
-#------------ for DigitalUnix
-CC=cc
-CFLAGS= -I. -I../ -std1 -g -c
-#CFLAGS= -I/data/koenneck/include -I. -I../   -std1 -g -c
-#------------ for DigitalUnix with Fortify
-#CC=cc
-#CFLAGS= -DFORTIFY -I. -I../   -std1 -g -c
-
-#------------ for CYGNUS toolchain on Win32
-## CC=gcc
-## CFLAGS= -I. -I../ -DCYGNUS -g -c
-
-.c.o:
-	$(CC) $(CFLAGS) $*.c
-
-hlib: $(OBJ)
-	- rm -f libhlib.a
-	ar cr libhlib.a $(OBJ)
-	ranlib libhlib.a
-
-clean:
-	rm -f *.o
-	rm -f *.a
-
-
-
-
-
-
diff --git a/hardsup/README b/hardsup/README
deleted file mode 100644
index 71597518..00000000
--- a/hardsup/README
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	This directory contains support files for the SINQ drivers.
-
-	All of the code; David Maden.
diff --git a/hardsup/StrMatch.c b/hardsup/StrMatch.c
deleted file mode 100755
index 6134a05c..00000000
--- a/hardsup/StrMatch.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#define	    ident	"1A01"
-#ifdef VAXC
-#module	    StrMatch	ident
-#endif
-#ifdef __DECC
-#pragma	    module	    StrMatch	ident
-#endif
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     Department ASQ				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...LIB.SINQ]StrMatch.C
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Nov 1999
-**
-**  To compile this module, use:
-
-	$ import tasmad
-	$ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-	$ cc /debug /noopt /obj=[]StrMatch -
-			tasmad_disk:[mad.lib.sinq]StrMatch +
-			sinq_c_tlb/lib
-
-**  To include this module in SINQ.OLB, use:
-
-  $ import tasmad
-  $ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-  $
-  $ define/group sinq_olb mad_lib:sinq_dbg.olb
-  $ @tasmad_disk:[mad.lib.sinq]sinq_olb StrMatch debug
-  $
-  $ define/group sinq_olb mad_lib:sinq.olb
-  $ @tasmad_disk:[mad.lib.sinq]sinq_olb StrMatch 
-**
-** Updates:
-**  1A01 12-Nov-1999 DM.	Initial version.
-**============================================================================
-** The following entry points are included in this module:
-**
-**-------------------------------------------------------------------------
-**    #include <sinq_prototypes.h>
-**
-**    char *StrMatch (&str_a, &str_b, min_len)
-**	    -------
-**  Input Args:
-**	char *str_a	    - Pointer to first  string to be compared.
-**	char *str_b	    - Pointer to second string to be compared.
-**	int   min_len	    - The minimum allowed match length.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return value:
-**	True (non-zero) if the 2 strings match.
-**  Global variables modified:
-**	none
-**  Routines called:
-**	None
-**  Description:
-**	The routine compares 2 strings, str_a and str_b, ignoring case.
-**	The length of str_a must be less than or equal to the length of str_b.
-**	The length of str_a must be at least min_len.
-**-------------------------------------------------------------------------
-**			Global Definitions
-*/
-#include    <ctype.h>
-
-#define	    NIL	    '\0'
-/*
-**====================================================================
-*/
-/*
-**====================================================================
-**		StrMatch	- compare two strings.
-*/
-  int	StrMatch (
-/*	========
-*/		    char    *str_a,
-		    char    *str_b,
-		    int	     min_len) {
-
-    int	    i = 0;
-
-    while ((tolower(str_a[i]) == tolower(str_b[i])) && (str_a[i] != '\0')) i++;
-
-    return ((str_a[i] == '\0') && (i >= min_len));
-  }
-/*-------------------------------------------------- End of StrMatch.C =======*/
diff --git a/hardsup/asynsrv_def.h b/hardsup/asynsrv_def.h
deleted file mode 100644
index ccaed197..00000000
--- a/hardsup/asynsrv_def.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef	    _asynsrv_def_
-#define	    _asynsrv_def_
-/*------------------------------------------------ AsynSrv_DEF.H Ident V01N
-*/
-#ifndef OffsetOf
-#define OffsetOf(type, identifier)  ((size_t)(&((type*) NULL)->identifier))
-#endif
-
-#ifndef	    _asynsrv_errcodes_
-#define	    _asynsrv_errcodes_
-#include    <asynsrv_errcodes.h>
-#endif
-
-#define AsynSrv_MAX_LINK	8
-		    /*
-		    ** Structures needed by AsynSrv_Utility.
-		    */
-  struct AsynSrv__info {
-    int	    skt;	    /* The socket number of the connection */
-    char    host[20];	    /* The name of RS-232-C server */
-    int	    port;	    /* The TCP/IP port number of server */
-    int	    chan;	    /* The RS-232-C channel number on server */
-    int	    msg_id;
-    int	    protocol_code;  /* Flag to identify the server's protocol level */
-    char    protocol_id[4]; /* ASCII version of server's protocol level */
-    int	    cmnd_hdr_len;   /* Header length for command strings */
-    char    cmnd_fmt[8];    /* "sprintf" format for cmnd header conversion */
-    int	    rply_hdr_len;   /* Header length for response strings */
-    char    rply_fmt[8];    /* "sscanf" format for rply header conversion */
-    char    chan_char[4];   /* ASCII encoded version of chan */
-    char    tmo[4];	    /* ASCII encoded time-out (deci-secs) */
-    char    eot[4];	    /* Expected terminators */
-    int	    max_replies;    /* Binary version of #replies in response */
-    int	    n_replies;	    /* # of last response returned to caller */
-    void  (*idleHandler) (int, int);	/* MZ. handler called when waiting ..
-					** .. on a response */
-  };
-
-  struct AsynSrv_HostPortSkt {
-    char    host[30];
-    int	    port;
-    int	    skt;
-    int	    protocol_code;
-    char    protocol_id[4];
-    int	    cmnd_hdr_len;
-    int	    rply_hdr_len;
-    int	    usage_cnt;
-    int	    status;
-    };
-/*------------------------------------------------ End of AsynSrv_DEF.H --*/
-#endif		/* _asynsrv_def_ */
diff --git a/hardsup/asynsrv_errcodes.h b/hardsup/asynsrv_errcodes.h
deleted file mode 100644
index 493e6083..00000000
--- a/hardsup/asynsrv_errcodes.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-**			TAS_SRC:[LIB]ASYNSRV_ERRCODES.H
-**
-** Include file generated from ASYNSRV_ERRCODES.OBJ
-**
-**              29-AUG-2000 09:49:15.56
-*/
-
-#define	    ASYNSRV__NO_ROOM              0x86480CC
-#define	    ASYNSRV__FORCED_CLOSED        0x86480C4
-#define	    ASYNSRV__BAD_SOCKET           0x86480BC
-#define	    ASYNSRV__BAD_SEND_UNKN        0x86480B4
-#define	    ASYNSRV__BAD_SEND_PIPE        0x86480AC
-#define	    ASYNSRV__BAD_SEND_NET         0x86480A4
-#define	    ASYNSRV__BAD_SEND_LEN         0x864809C
-#define	    ASYNSRV__BAD_SEND             0x8648094
-#define	    ASYNSRV__BAD_REPLY            0x864808C
-#define	    ASYNSRV__BAD_RECV1_PIPE       0x8648084
-#define	    ASYNSRV__BAD_RECV1_NET        0x864807C
-#define	    ASYNSRV__BAD_RECV1            0x8648074
-#define	    ASYNSRV__BAD_RECV_UNKN        0x864806C
-#define	    ASYNSRV__BAD_RECV_PIPE        0x8648064
-#define	    ASYNSRV__BAD_RECV_NET         0x864805C
-#define	    ASYNSRV__BAD_RECV_LEN         0x8648054
-#define	    ASYNSRV__BAD_RECV             0x864804C
-#define	    ASYNSRV__BAD_PROT_LVL         0x8648044
-#define	    ASYNSRV__BAD_PAR              0x864803C
-#define	    ASYNSRV__BAD_NOT_BCD          0x8648034
-#define	    ASYNSRV__BAD_HOST             0x864802C
-#define	    ASYNSRV__BAD_FLUSH            0x8648024
-#define	    ASYNSRV__BAD_CONNECT          0x864801C
-#define	    ASYNSRV__BAD_CMND_LEN         0x8648014
-#define	    ASYNSRV__BAD_BIND             0x864800C
-#define	    ASYNSRV__FACILITY             0x864
diff --git a/hardsup/asynsrv_mark.c b/hardsup/asynsrv_mark.c
deleted file mode 100644
index 59273502..00000000
--- a/hardsup/asynsrv_mark.c
+++ /dev/null
@@ -1,1465 +0,0 @@
-#define	    ident	"1B06"
-#ifdef VAXC
-#module	    AsynSrv_Utility	ident
-#endif
-#ifdef __DECC
-#pragma	    module	    AsynSrv_Utility	ident
-#endif
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     Department ASQ				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...LIB.SINQ]AsynSrv_Utility.C
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Mar 1996
-**
-**  To compile this module, use:
-
-	$ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-	$ cc /debug /noopt /obj=[]AsynSrv_Utility -
-			lnsa01::tasmad_disk:[mad.psi.lib.sinq]AsynSrv_Utility +
-			sinq_c_tlb/lib
-
-**  To include this module in SINQ.OLB, use:
-
-  $ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-  $
-  $ define/group sinq_olb mad_lib:sinq_dbg.olb
-  $ @lnsa01::tasmad_disk:[mad.psi.lib.sinq]sinq_olb AsynSrv_Utility debug
-  $
-  $ define/group sinq_olb mad_lib:sinq.olb
-  $ @lnsa01::tasmad_disk:[mad.psi.lib.sinq]sinq_olb AsynSrv_Utility
-**
-** Updates:
-**  1A01 21-Mar-1996 DM.	Initial version.
-**  1B01 12-Sep-1996 DM.	Allow host name to be in dot format too.
-**  1B02  5-May-1997 DM.	Set 5 sec time-out on "connect" on VMS systems.
-**============================================================================
-** The entry points included in this module are described below. Prototypes
-** can be defined via:
-**
-**    #include <sinq_prototypes.h>
-**
-**	AsynSrv_Close	    - Close a connection to an RS-232-C Server.
-**	AsynSrv_Config	    - Configure an open AsynSrv_Utility connection.
-**	AsynSrv_ConfigDflt  - Set defaults for AsynSrv_Open.
-**	AsynSrv_ErrInfo	    - Return detailed status from last operation.
-**	AsynSrv_GetReply    - Get next reply from a reply buffer.
-**	AsynSrv_Open	    - Open a connection  to an RS-232-C Server.
-**	AsynSrv_SendCmnds   - Send commands to a channel of an RS-232-C Server.
-**---------------------------------------------------------------------
-**    int AsynSrv_Close (&asyn_info, force_flag)
-**	  -------------
-**  Input Args:
-**	int   force_flag - if non-zero, all connections using the same socket
-**			   will also be marked as force-closed (socket number
-**			   set to -1) and the connection will really be
-**			   closed. This is needed for error recovery operations.
-**  Output Args:
-**	none
-**  Modified Args:
-**	struct AsynSrv__info *asyn_info  - a structure holding skt, host and
-**					   port of the connection. On return
-*					   skt = 0.
-**  Return status:
-**	True if no problems detected, otherwise False and AsynSrv_errcode
-**	is set to indicate the nature of the problem as follows:
-**	  AsynSrv__BAD_PAR  = -29 --> skt does not match with host/port.
-**  Routines called:
-**	Socket library, "close".
-**  Description:
-**	The routine decrements the usage count on the connection to host/port.
-**	If the counter is still >0, the routine simply returns.
-**	If the counter is now 0, the routine sends a "-001" message to the
-**	server to inform it that we are about to close the link, waits for a
-**	possible 4 bytes of response and then closes the TCP/IP connection.
-**---------------------------------------------------------------------
-**    int AsynSrv_Config (&asyn_info, &par_id, par_val, ...)
-**	  --------------
-**  Input Args:
-**	char*   par_id	- Text string identifying the next argument (see below).
-**			    NULL indicates the end of the argument list.
-**	<??>	par_val	- The value to set for the argument. The type of the
-**			    argument can depend on par_id.
-**  Output Args:
-**	none
-**  Modified Args:
-**	struct AsynSrv__info  *asyn_info  - the structure used in the call to
-**				AsynSrv_Open. It is used to hold the config
-**				info for the connection.
-**  Return status:
-**	True if no problems detected, otherwise False and AsynSrv_errcode
-**	is set to indicate the nature of the problem as follows:
-**	  AsynSrv__BAD_PAR  = -29 --> Unrecognised par_id or msecTmo < 100 or
-**					msecTmo > 999'999 or bad eot or ..
-**  Routines called:
-**	None
-**  Description:
-**	AsynSrv_Config may be used for setting values of parameters for
-**	use in subsequent calls to AsynSrv_SendCmnds. Defaults for these
-**	parameters are set via a call to AsynSrv_ConfigDflt, prior to
-**	calling AsynSrv_Open. Values which may be taken by par_id (warning --
-**	par_id is case-sensitive) and the corresponding variable type of
-**	par_val are:
-**
-**	  "msecTmo"  int   	 The time-out response for commands sent
-**				   to a serial channel on the server. The
-**				   valid range is 100 to 999'999.
-**	  "eot"     char*  	 The expected terminators in responses to
-**				    commands sent to a serial channel on the
-**				    server. The first character specifies the
-**				    number of terminators (max=3).
-**---------------------------------------------------------------------
-**    int AsynSrv_ConfigDflt (&par_id, par_val, ...)
-**	  ------------------
-**  Input Args:
-**	char*   par_id	- Text string identifying the next argument (see below).
-**			    NULL indicates the end of the argument list.
-**	<??>	par_val	- The value to set for the argument. The type of the
-**			    argument can depend on par_id.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and AsynSrv_errcode
-**	is set to indicate the nature of the problem as follows:
-**	  AsynSrv__BAD_PAR  = -29 --> Unrecognised par_id or msecTmo < 100 or
-**					msecTmo > 999'999 or bad eot or ..
-**  Routines called:
-**	None
-**  Description:
-**	AsynSrv_ConfigDflt may be used for setting default values of parameters
-**	for use in subsequent calls to AsynSrv_Open. Values which may be taken
-**	by par_id (warning -- par_id is case-sensitive) and the corresponding
-**	variable type of par_val are:
-**
-**	  "TmoC"     int   	 The time-out in seconds to be used when
-**				   opening a connection to a server. This
-**				   value is only effective on VMS systems. For
-**				   UNIX systems, the systemwide default (usually
-**				   75 secs) cannot be changed. The initial
-**				   setting for "TmoC" is 5 secs.
-**	  "msecTmo"  int   	 The time-out response for commands sent
-**				   to a serial channel on the server. The
-**				   valid range is 100 to 999'999. The initial
-**				   setting for "msecTmo" is 10'000 msec.
-**	  "eot"     char*  	 The expected terminators in responses to
-**				    commands sent to a serial channel on the
-**				    server. The first character specifies the
-**				    number of terminators (max=3). The initial
-**				    setting for "eot" is "1\r".
-**-------------------------------------------------------------------------
-**    void AsynSrv_ErrInfo (&entry_txt_ptr, &errcode, &my_errno, &vaxc_errno)
-**	   ---------------
-**  Input Args:
-**	None
-**  Output Args:
-**	char **entry_txt_ptr - Pointer to a text string giving the call stack
-**				at the time that the error was detected.
-**	int  *errcode	 - An internal error code indicating the detected error.
-**	int  *my_errno	 - Saved value of errno.
-**	int  *vaxc_errno - Saved value of vaxc$errno (OpenVMS only).
-**  Modified Args:
-**	none
-**  Return status:
-**	none
-**  Routines called:
-**	none
-**  Description:
-**	Returns detailed status of the last operation. Once an error has been
-**	detected, the error status is frozen until this routine has been called.
-**-------------------------------------------------------------------------
-**    char *AsynSrv_GetReply (&asyn_info, &rcve_buff, &last_rply)
-**	    ----------------
-**  Input Args:
-**	struct RS__RespStruct *rcve_buff    - address of receive buffer used
-**					      in last call to AsynSrv_SendCmnds.
-**	char		      *last_rply    - Address of last reply processed
-**					      or NULL.
-**  Output Args:
-**	none
-**  Modified Args:
-**	struct AsynSrv__info  *asyn_info  - the structure used in the call to
-**				AsynSrv_Open. It is used to hold status info
-**				between calls to this routine.
-**  Return status:
-**	Address of next reply in the buffer or NULL if no more. Note that this
-**	is a pointer to the reply and not to the head of the reply structure.
-**	The terminator byte found is therefore at index [-1] from this address.
-**  Routines called:
-**	none
-**  Description:
-**	AsynSrv_GetReply unpacks the replies in the response packet from the
-**	RS232C server which is an argument in the call to AsynSrv_SendCmnds.
-**	If the routine is called with last_rply = NULL, a pointer to the
-**	first reply is returned. On calling AsynSrv_GetReply again with
-**	last_rply set to this address, one receives the address of the second
-**	reply and so on, until NULL is returned, indicating that all responses
-**	have been exhausted.
-**  Warning:
-**	AsynSrv_GetReply keeps count of the number of responses it returns.
-**	Responses must therefore be processed in order.
-**-------------------------------------------------------------------------
-**    int AsynSrv_Open (&asyn_info)
-**	  ------------
-**  Input Args:
-**	asyn_info->host	- Name of host offering the RS-232-C service. The name
-**			    can be either symbolic or numeric, e.g.
-**			    "lnsw02.psi.ch" or "129.129.90.18".
-**	asyn_info->port	- Number of TCP/IP port of TCP/IP server.
-**  Output Args:
-**	none
-**  Modified Args:
-**	struct AsynSrv__info *asyn_info  - a structure holding skt, host and
-**					   port of the connection. On return
-**					   skt = socket number of connection.
-**					   Set to 0 if error.
-**  Return status:
-**	If non-zero, no problems detected and asyn_info->skt is the socket to
-**		use for communicating with the server. Otherwise, a problem
-**		was detected and AsynSrv_errcode may be set as follows
-**		to indicate the nature of the problem:
-**	  AsynSrv__BAD_HOST    =  -6 --> Call to "gethostbyname" failed to get
-**					network addr of host.
-**	  AsynSrv__BAD_SOCKET  =  -7 --> Call to "socket" failed.
-**	  AsynSrv__BAD_BIND    =  -8 --> Call to "bind" failed.
-**	  AsynSrv__BAD_CONNECT =  -9 --> Call to "connect" failed.
-**	  AsynSrv__BAD_PAR     =  -29 --> Bad parameter found. Probably
-**					    asyn_info->port or asyn_info->chan
-**					    are out of range.
-**	  AsynSrv__NO_ROOM     =  -40 --> Host/port table full or Active-link
-**					    table full.
-**  Routines called:
-**	Socket library routine "open".
-**  Description:
-**	The routine maintains a list of hosts/ports to which it has open
-**	sockets. If an entry is found in the list, the socket is returned
-**	and the usage count of this connection is incremented. If no entry
-**	is found in the list, a connection to the host is established and
-**	entered into the list.
-**	The routine also maintains a table of active links so that the
-**	"force-close" function can be performed. The link is added to this
-**	table too.
-**-------------------------------------------------------------------------
-**    int AsynSrv_SendCmnds (&asyn_info, &send_buff, &rcve_buff, ...)
-**	  -----------------
-**  Input Args:
-**	struct AsynSrv__info  *asyn_info  - the structure used in the call to
-**				AsynSrv_Open. It contains settings required
-**				for setting up and sending send_buff.
-**	char	* ...	- A list of commands, terminated by NULL, for
-**			    sending to the channel on the server. The commands
-**			    must have any necessary \r characters included.
-**  Output Args:
-**	struct RS__RespStruct *rcve_buff  - a buffer to receive the response
-**				from the server.
-**  Modified Args:
-**	struct RS__MsgStruct  *send_buff  - a buffer for holding the commands
-**				for sending to the server.
-**  Return status:
-**	True if no problems detected, otherwise False and errcode (see
-**	AsynSrv_ErrInfo) is set to indicate the nature of the problem.
-**	AsynSrv_errcode may be set as follows:
-**	    AsynSrv__BAD_SENDLEN = -12 --> Too much to send; either too many
-**					    commands or too long. The buffer
-**					    is 232 bytes long and each command
-**					    has a 2-byte header.
-**	  Errors -13 to -16 are related to network errors whilst sending the
-**	  message buffer to the server:
-**	    AsynSrv__BAD_SEND	 = -13 --> Network problem - server has
-**					    probably abended.
-**	    AsynSrv__BAD_SEND_PIPE = -14 --> Network pipe broken - probably same
-**					    cause as AsynSrv__BAD_SEND.
-**	    AsynSrv__BAD_SEND_NET  = -15 --> Some other network problem. "errno"
-**					    may be helpful.
-**	    AsynSrv__BAD_SEND_UNKN = -16 --> Some other network problem happened
-**					    resulting in the message not
-**					    getting sent completely. "errno" is
-**					    probably not helpful in this case.
-**	    Errors AsynSrv__BAD_RECV, AsynSrv__BAD_RECV_PIPE, AsynSrv__BAD_RECV_NET
-**		and AsynSrv__BAD_RECV_UNKN (-17 to -20) are related to network
-**		errors whilst receiving the 4-byte response header. They are
-**		analogous to AsynSrv__BAD_SEND to AsynSrv__BAD_SEND_UNKN.
-**	    AsynSrv__BAD_NOT_BCD = -21 --> The 4-byte response header is not an
-**					  ASCII coded decimal integer.
-**	    AsynSrv__BAD_RECVLEN = -22 --> The body of the response would be too
-**					  big to fit in the input buffer. The
-**					  buffer is ??? bytes long and each
-**					  response has a 5-byte header and a
-**					  trailing zero-byte. The response
-**					  is flushed.
-**	    AsynSrv__BAD_FLUSH   = -23 --> Some network error was detected
-**					  during flushing. This is an "or"
-**					  of errors AsynSrv__BAD_RECV to
-**					  AsynSrv__BAD_RECV_UNKN.
-**	    AsynSrv__FORCED_CLOSED = -32 --> The connection to the motor has been
-**					   forcefully closed. See below.
-**	    AsynSrv__BAD_REPLY   = -34 --> The n_rply field of the response was
-**					either non-numeric or <0, indicating
-**					that the Terminal Server detected an
-**					error. The reply is added to the
-**					routine call stack for debug purposes.
-**				
-**	    Errors AsynSrv__BAD_RECV1, AsynSrv__BAD_RECV1_PIPE and
-**		AsynSrv__BAD_RECV1_NET (-24 to -26) are related to network
-**		errors whilst receiving the body of the response. They are
-**		equivalent to errors AsynSrv__BAD_RECV, to AsynSrv__BAD_RECV_NET.
-**
-**	    AsynSrv__FORCED_CLOSED occurs if AsynSrv_Close has been called
-**		for another device on the same server and the 'force_flag'
-**		was set (see AsynSrv_Close). The caller should call
-**		AsynSrv_Close and then AsynSrv_Open to re-establish a
-**		connection to the server.
-**  Routines called:
-**	Socket library routines send and recv.
-**  Description:
-**	The list of commands is assembled into a message buffer with appropriate
-**	header information and sent off to the server. The response is then
-**	awaited and read in when it arrives.
-**
-**    For any of the following errors:
-**		AsynSrv__BAD_SEND		(Note: AsynSrv__BAD_SENDLEN and 
-**		AsynSrv__BAD_SEND_PIPE	AsynSrv__BAD_RECVLEN do not cause a close
-**		AsynSrv__BAD_SEND_NET
-**		AsynSrv__BAD_SEND_UNKN
-**		AsynSrv__BAD_RECV
-**		AsynSrv__BAD_RECV_PIPE
-**		AsynSrv__BAD_RECV_NET
-**		AsynSrv__BAD_RECV_UNKN
-**		AsynSrv__BAD_NOT_BCD
-**		AsynSrv__BAD_FLUSH
-**		AsynSrv__BAD_RECV1
-**		AsynSrv__BAD_RECV1_PIPE
-**		AsynSrv__BAD_RECV1_NET
-**    the network link to the server is force-closed via a call to AsynSrv_Close.
-**    Once the error has been corrected, the link can be re-opened via a
-**    call to AsynSrv_Open. As a result of the force-close, other active handles
-**    will need to be released via a call to AsynSrv_Close before AsynSrv_Open is
-**    called.
-**
-**    Note: neither of the errors AsynSrv__BAD_SENDLEN, AsynSrv__BAD_RECVLEN
-**	    nor AsynSrv__BAD_REPLY cause the link to be closed.
-**============================================================================*/
-/*
-**---------------------------------------------------------------------------
-**					Global Definitions
-*/
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <stdarg.h>
-#include    <errno.h>
-#include    <signal.h>
-#include    <netdb.h>
-#include    <sys/socket.h>
-#include    <netinet/in.h>
-#include    <arpa/inet.h>
-#include "fortify.h"
-#include    <string.h>
-
-#ifdef	__VMS
-#include    <ucx$inetdef.h>
-#include    <unixio.h>
-#else
-#include    <unistd.h>
-#endif
-/*-----------------------------------------------------------------*/
-#include    <asynsrv_def.h>
-#include    <rs232c_def.h>
-#include    <sinq_prototypes.h>
-
-#define True	1
-#define False	0
-
-#define MAX_OPEN    64
-/*--------------------------------------------------------------------------
-**					Global Variables
-*/
-  static int	AsynSrv_call_depth = 0;
-  static char	AsynSrv_routine[5][64];
-  static int	AsynSrv_errcode = 0;
-  static int	AsynSrv_errno, AsynSrv_vaxc_errno;
-  static int	AsynSrv_connect_tmo = 5;	    /* Time-out on "connect" */
-  static int	AsynSrv_msec_tmo = 10000;	    /* Time-out for responses */
-  static char	AsynSrv_eot[] = {'1', '\r', '\0','\0'};	/* Terminators */
-/*
-**	The following is the list of open connections (= number of
-**	active sockets).
-*/
-  static int			    AsynSrv_n_cnct = 0;
-  static struct AsynSrv_HostPortSkt AsynSrv_HPS_list[AsynSrv_MAX_LINK];
-/*
-**	The following is the list of active calls to AsynSrv_Open.
-*/
-  static int		       AsynSrv_n_active = 0;
-  static struct AsynSrv__info *AsynSrv_active[MAX_OPEN];
-/*
-**---------------------------------------------------------------------------
-**		AsynSrv_Close:  Close a connection to an RS-232-C server.
-*/
-  int	AsynSrv_Close (
-/*	=============
-*/		struct AsynSrv__info	*asyn_info,
-		int			 force_flag) {
-
-    int			    i, j, k, my_skt;
-    char		    buff[4];
-		/*-----------------------------------------------
-		*/
-    if (asyn_info == NULL) return True;	    /* Just return if nothing to do! */
-    my_skt = asyn_info->skt;
-    if (my_skt <= 0) return True;	    /* Just return if nothing to do! */
-		/*-----------------------------------------------
-		** Pre-set the routinename (in case of error)
-		*/
-    if (AsynSrv_errcode == 0 && AsynSrv_call_depth < 5) {
-      strcpy (AsynSrv_routine[AsynSrv_call_depth], "AsynSrv_Close");
-      AsynSrv_call_depth++;
-    }
-		/*------------------------------------------------------
-		** Start by finding the table entry for this connection
-		*/
-    for (i = 0; i < AsynSrv_n_cnct; i++) {
-      if (AsynSrv_HPS_list[i].skt  != my_skt)  continue;
-      if (AsynSrv_HPS_list[i].port != asyn_info->port) continue;
-      if (strcmp (AsynSrv_HPS_list[i].host, asyn_info->host) == 0) break;
-    }
-    if (i >= AsynSrv_n_cnct) {		    /* Did we find the entry? */
-      AsynSrv_errcode = AsynSrv__BAD_PAR;   /* No! */
-      return False;
-    }
-		/*------------------------------------------------------
-		** Now find the table entry for the AsynSrvOpen call.
-		*/  
-    for (j = 0; j < AsynSrv_n_active; j++) {
-      if ((AsynSrv_active[j] == asyn_info) &&
-	  (AsynSrv_active[j]->skt == my_skt)) {
-	break;
-      }
-    }
-    if (j >= AsynSrv_n_active) {	    /* Did we find the entry? */
-      AsynSrv_errcode = AsynSrv__BAD_PAR;   /* No! */
-      return False;
-    }
-		/*------------------------------------------------------
-		**  i is the index for the connection table entry.
-		**  j is the index for the caller's AsynSrvOpen call entry.
-		*/
-    if (AsynSrv_HPS_list[i].usage_cnt <= 0) {	/* Is the connection active? */
-      AsynSrv_errcode = AsynSrv__BAD_PAR;	/* No		    */
-      return False;
-    }
-		/*------------------------------------------------------
-		** For the caller, simply set his socket number to zero,
-		** mark the AsynSrvOpen entry as free and decrease the
-		** usage count (the entries will be compressed later).
-		*/
-    AsynSrv_active[j]->skt = 0;		/* Mark the close .. */
-    AsynSrv_active[j] = NULL;		/* .. and flag entry to be removed. */
-    AsynSrv_HPS_list[i].usage_cnt--;	/* Decrease usage count */
-		/*------------------------------------------------------
-		** If this is a force-close, go through all AsynSrv_Open
-		** entries looking for a socket match, mark them as
-		** free and decrease usage count.
-		*/
-    if (force_flag) {
-      for (k = 0; k < AsynSrv_n_active; k++) {
-	if (AsynSrv_active[k] != NULL) {
-	  if (AsynSrv_active[k]->skt == my_skt) {
-	    AsynSrv_active[k]->skt = -1;	/* Mark the force-close */
-	    AsynSrv_active[k] = NULL;		/* Mark entry to be removed */
-	    AsynSrv_HPS_list[i].usage_cnt--;	/* Decrease usage count */
-	  }
-	}
-      }
-      if (AsynSrv_HPS_list[i].usage_cnt != 0) { /* Use count should now be .. */
-	AsynSrv_errcode = AsynSrv__BAD_PAR;     /* .. zero or there's a bug.  */
-	return False;
-      }
-    }
-		/*------------------------------------------------------
-		** Compress the list of AsynSrv_Open entries
-		*/
-    j = 0;
-    for (k = 0; k < AsynSrv_n_active; k++) {
-      if (AsynSrv_active[k] != NULL) {
-	AsynSrv_active[j] = AsynSrv_active[k];
-	j++;
-      }
-    }
-    for (k = j; k < AsynSrv_n_active; k++) AsynSrv_active[k] = NULL;
-    AsynSrv_n_active = j;
-		/*------------------------------------------------------
-		** If the link is now idle, really close it and compress
-		** the connection table entry out of the list.
-		*/
-    if (AsynSrv_HPS_list[i].usage_cnt == 0) {
-      send (my_skt, "-001", 4, 0);	/* Tell the TCP/IP server that ..
-					** .. we are about to quit.
-					*/
-      recv (my_skt, buff, sizeof (buff), 0);   /* And wait for his ack */
-      close (my_skt);
-      for (j = i; j < AsynSrv_n_cnct; j++) {
-        memcpy ((char *) &AsynSrv_HPS_list[j], (char *) &AsynSrv_HPS_list[j+1],
-			    sizeof (AsynSrv_HPS_list[0]));
-      }
-      AsynSrv_HPS_list[AsynSrv_n_cnct].skt = 0; /* Invalidate the free entry */
-      AsynSrv_n_cnct--;
-    }
-    AsynSrv_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		AsynSrv_Config:  Configure an open connection.
-*/
-  int	AsynSrv_Config (
-/*	==============
-*/		    struct AsynSrv__info    *asyn_info,
-		    ...) {
-
-    char	buff[16];
-    va_list	ap;		    /* Pointer to variable args */
-    char       *txt_ptr;
-    int		intval;
-			/*
-			** Pre-set the routinename (in case of error)
-			*/
-    if (AsynSrv_errcode == 0 && AsynSrv_call_depth < 5) {
-      strcpy (AsynSrv_routine[AsynSrv_call_depth], "AsynSrv_Config");
-      AsynSrv_call_depth++;
-    }
-
-    va_start (ap, asyn_info);		/* Set up var arg machinery */
-    txt_ptr = va_arg (ap, char *);	/* Get pntr to first parameter ident */
-    while (txt_ptr != NULL) {
-      if (strcmp (txt_ptr, "msecTmo") == 0) {
-	intval = va_arg (ap, int);
-	if ((intval < 100) || (intval > 999999)) {
-	  AsynSrv_errcode = AsynSrv__BAD_PAR;
-	  return False;
-	}
-	sprintf (buff, "%04d", intval/100);	/* Convert to ASCII as ..
-						** .. deci-secs */
-	memcpy (asyn_info->tmo, buff, 4);
-      }else if (strcmp (txt_ptr, "eot") == 0) {
-	txt_ptr = va_arg (ap, char *);
-	if (txt_ptr == NULL) {
-	  AsynSrv_errcode = AsynSrv__BAD_PAR;
-	  return False;
-	}
-	memcpy (asyn_info->eot, "\0\0\0\0", 4);
-	switch (txt_ptr[0]) {
-	 case '3': asyn_info->eot[3] = txt_ptr[3];
-	 case '2': asyn_info->eot[2] = txt_ptr[2];
-	 case '1': asyn_info->eot[1] = txt_ptr[1];
-	 case '0':
-	    asyn_info->eot[0] = txt_ptr[0];
-	    break;
-	 default: 
-	    AsynSrv_errcode = AsynSrv__BAD_PAR;
-	    return False;
-	}
-      }else {
-	AsynSrv_errcode = AsynSrv__BAD_PAR;
-	return False;
-      }
-      txt_ptr = va_arg (ap, char *);	/* Get pntr to next parameter ident */
-    }
-
-    AsynSrv_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		AsynSrv_ConfigDflt:  Set default values in AsynSrv_Utility
-**				     which will be used to initialise
-**				     structures in AsynSrv_Open.
-*/
-  int	AsynSrv_ConfigDflt (
-/*	==================
-*/		    char    *par_id,
-		    ...) {
-    int		i;
-    char	buff[4];
-    va_list	ap;		    /* Pointer to variable args */
-    char       *txt_ptr;
-    int		intval;
-			/*
-			** Pre-set the routinename (in case of error)
-			*/
-    if (AsynSrv_errcode == 0 && AsynSrv_call_depth < 5) {
-      strcpy (AsynSrv_routine[AsynSrv_call_depth], "AsynSrv_ConfigDflt");
-      AsynSrv_call_depth++;
-    }
-
-    va_start (ap, par_id);		/* Set up var arg machinery */
-    txt_ptr = par_id;			/* Point to first arg */
-    while (txt_ptr != NULL) {
-      if (strcmp (txt_ptr, "tmoC") == 0) {
-	intval = va_arg (ap, int);
-	if ((intval < 1) || (intval > 3600)) {
-	  AsynSrv_errcode = AsynSrv__BAD_PAR;
-	  return False;
-	}
-	AsynSrv_connect_tmo = intval;
-      }else if (strcmp (txt_ptr, "msecTmo") == 0) {
-	intval = va_arg (ap, int);
-	if ((intval < 100) || (intval > 999900)) {
-	  AsynSrv_errcode = AsynSrv__BAD_PAR;
-	  return False;
-	}
-	AsynSrv_msec_tmo = intval;
-      }else if (strcmp (txt_ptr, "eot") == 0) {
-	txt_ptr = va_arg (ap, char *);
-	if (txt_ptr == NULL) {
-	  AsynSrv_errcode = AsynSrv__BAD_PAR;
-	  return False;
-	}
-	switch (txt_ptr[0]) {
-	 case '3': AsynSrv_eot[3] = txt_ptr[3];
-	 case '2': AsynSrv_eot[2] = txt_ptr[2];
-	 case '1': AsynSrv_eot[1] = txt_ptr[1];
-	 case '0':
-	    AsynSrv_eot[0] = txt_ptr[0];
-	    break;
-	 default: 
-	    AsynSrv_errcode = AsynSrv__BAD_PAR;
-	    return False;
-	}
-	switch (txt_ptr[0]) {
-	 case '0': AsynSrv_eot[1] = '\0';
-	 case '1': AsynSrv_eot[2] = '\0';
-	 case '2': AsynSrv_eot[3] = '\0';
-	}
-      }else {
-	AsynSrv_errcode = AsynSrv__BAD_PAR;
-	return False;
-      }
-      txt_ptr = va_arg (ap, char *);	/* Get pntr to next parameter ident */
-    }
-
-    AsynSrv_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		AsynSrv_ErrInfo:  Return detailed status from last operation.
-*/
-  void	AsynSrv_ErrInfo (
-/*	===============
-*/		char	**entry_txt,
-		int	*errcode,
-		int	*my_errno,
-		int	*vaxc_errno) {
-
-    int		i, j, k;
-    char	buff[80];
-
-    if (AsynSrv_call_depth <= 0) {
-      strcpy (AsynSrv_routine[0], "AsynSrv_no_error_detected");
-      *errcode	  = 0;
-      *my_errno	  = 0;
-      *vaxc_errno = 0;
-    }else {
-      if (AsynSrv_call_depth > 1) {		    /* Concatenate the names */
-	for (i = 1; i < AsynSrv_call_depth; i++) {
-	  strcat (AsynSrv_routine[0], "/");
-	  StrJoin (AsynSrv_routine[0], sizeof (AsynSrv_routine),
-			    AsynSrv_routine[0], AsynSrv_routine[i]);
-	}
-      }
-      *errcode	  = AsynSrv_errcode;
-      *my_errno	  = AsynSrv_errno;
-      *vaxc_errno = AsynSrv_vaxc_errno;
-      switch (AsynSrv_errcode) {
-	case AsynSrv__BAD_HOST:	     strcpy (buff, "/AsynSrv__BAD_HOST"); break;
-	case AsynSrv__BAD_SOCKET:    strcpy (buff, "/AsynSrv__BAD_SOCKET"); break;
-	case AsynSrv__BAD_BIND:	     strcpy (buff, "/AsynSrv__BAD_BIND"); break;
-	case AsynSrv__BAD_CONNECT:   strcpy (buff, "/AsynSrv__BAD_CONNECT"); break;
-	case AsynSrv__BAD_SENDLEN:   strcpy (buff, "/AsynSrv__BAD_SENDLEN"); break;
-	case AsynSrv__BAD_SEND:	     strcpy (buff, "/AsynSrv__BAD_SEND"); break;
-	case AsynSrv__BAD_SEND_PIPE: strcpy (buff, "/AsynSrv__BAD_SEND_PIPE"); break;
-	case AsynSrv__BAD_SEND_NET:  strcpy (buff, "/AsynSrv__BAD_SEND_NET"); break;
-	case AsynSrv__BAD_SEND_UNKN: strcpy (buff, "/AsynSrv__BAD_SEND_UNKN"); break;
-	case AsynSrv__BAD_RECV:	     strcpy (buff, "/AsynSrv__BAD_RECV"); break;
-	case AsynSrv__BAD_RECV_PIPE: strcpy (buff, "/AsynSrv__BAD_RECV_PIPE"); break;
-	case AsynSrv__BAD_RECV_NET:  strcpy (buff, "/AsynSrv__BAD_RECV_NET"); break;
-	case AsynSrv__BAD_RECV_UNKN: strcpy (buff, "/AsynSrv__BAD_RECV_UNKN"); break;
-	case AsynSrv__BAD_NOT_BCD:   strcpy (buff, "/AsynSrv__BAD_NOT_BCD"); break;
-	case AsynSrv__BAD_RECVLEN:   strcpy (buff, "/AsynSrv__BAD_RECVLEN"); break;
-	case AsynSrv__BAD_FLUSH:     strcpy (buff, "/AsynSrv__BAD_FLUSH"); break;
-	case AsynSrv__BAD_RECV1:     strcpy (buff, "/AsynSrv__BAD_RECV1"); break;
-	case AsynSrv__BAD_RECV1_PIPE:strcpy (buff, "/AsynSrv__BAD_RECV1_PIPE"); break;
-	case AsynSrv__BAD_RECV1_NET: strcpy (buff, "/AsynSrv__BAD_RECV1_NET"); break;
-	case AsynSrv__BAD_PAR:	     strcpy (buff, "/AsynSrv__BAD_PAR"); break;
-	case AsynSrv__FORCED_CLOSED: strcpy (buff, "/AsynSrv__FORCED_CLOSED"); break;
-	case AsynSrv__BAD_REPLY:     strcpy (buff, "/AsynSrv__BAD_REPLY"); break;
-	case AsynSrv__BAD_CMND_LEN:  strcpy (buff, "/AsynSrv__BAD_CMND_LEN"); break;
-	case AsynSrv__BAD_PROT_LVL:  strcpy (buff, "/AsynSrv__BAD_PROT_LVL"); break;
-	case AsynSrv__NO_ROOM:	     strcpy (buff, "/AsynSrv__NO_ROOM"); break;
-	default: sprintf (buff, "/AsynSrv__unkn_err_code: %d", AsynSrv_errcode);
-      }
-      StrJoin (AsynSrv_routine[0], sizeof(AsynSrv_routine),
-			    AsynSrv_routine[0], buff);
-    }
-    *entry_txt = AsynSrv_routine[0];
-    AsynSrv_call_depth = 0;
-    AsynSrv_errcode = 0;
-  }
-/*
-**---------------------------------------------------------------------------
-**		AsynSrv_GetReply:  Get next reply from a reply buffer.
-*/
-  char	*AsynSrv_GetReply (
-/*	 ================
-*/		struct AsynSrv__info	*asyn_info,
-		struct RS__RespStruct	*rcve_buff,
-		char			*last_rply) {
-
-    char    *pntr = NULL;
-    int	     i, rply_len;
-
-    if (last_rply == NULL) {		/* Start with first reply? */
-					/* Yes */
-      asyn_info->n_replies = 1;
-      if (asyn_info->max_replies > 0) {
-	pntr = rcve_buff->u.rplys;
-	pntr = pntr + 1 + asyn_info->rply_hdr_len;
-      }
-    }else {				/* No - get next reply */
-      if (asyn_info->n_replies < asyn_info->max_replies) { /* If there is one */
-	i = sscanf ((last_rply - asyn_info->rply_hdr_len - 1),
-		asyn_info->rply_fmt, &rply_len);
-	if ((i == 1) && (rply_len >= 0)) {
-	  pntr = last_rply + rply_len + asyn_info->rply_hdr_len;
-	}
-      }
-    }
-    return pntr;
-  }
-/*
-**---------------------------------------------------------------------------
-**		AsynSrv_Open:  Open a connection to an RS-232-C Server.
-*/
-  int	AsynSrv_Open (
-/*	============
-*/		struct AsynSrv__info	*asyn_info) {
-
-    int			    i, status;
-    int			    my_skt;
-    char		    old_time_out[4];
-    union {
-      char  chars[4];
-      int   val;
-    } time_out;
-    char		    buff[128];
-    struct RS__MsgStruct    s_buff;
-    struct RS__RespStruct   r_buff;
-    unsigned int	    oto_len, oto_status;
-    struct hostent	   *rmt_hostent;
-    struct in_addr	   *rmt_inet_addr_pntr;
-    struct in_addr	    rmt_inet_addr;
-    int			    rmt_sockname_len;
-    struct sockaddr_in	    lcl_sockname;
-    struct sockaddr_in	    rmt_sockname;
-
-    char		*errtxt_ptr;
-    int			 errcode, my_errno, my_vaxc_errno;
-/*--------------------------------------------------------
-*/
-    asyn_info->skt = 0;
-/*--------------------------------------------------------
-**			Initialise the error info stack and pre-set the
-**			routine name (in case of error).
-*/
-    AsynSrv_errcode = AsynSrv_errno = AsynSrv_vaxc_errno = 0;
-    strcpy (AsynSrv_routine[0], "AsynSrv_Open");
-    AsynSrv_call_depth = 1;
-/*--------------------------------------------------------
-**		Is there room for a new AsynSrv_Open table entry?
-*/
-    if (AsynSrv_n_active >= MAX_OPEN) {
-      AsynSrv_errcode = AsynSrv__NO_ROOM;	/* There isn't! */
-      return False;
-    }
-/*--------------------------------------------------------
-**		See if a table entry for this connection already exists.
-*/
-    for (i = 0; i < AsynSrv_n_cnct; i++) {
-      if (AsynSrv_HPS_list[i].port != asyn_info->port) continue;
-      if (strcmp (AsynSrv_HPS_list[i].host, asyn_info->host) == 0) break;
-    }
-    if (i < AsynSrv_n_cnct) {		    /* Did we find an entry? */
-      AsynSrv_call_depth--;		    /* Yes */
-      AsynSrv_HPS_list[i].usage_cnt++;	    /* Up the usage count and .. */
-      AsynSrv_active[AsynSrv_n_active] =    /* .. remember the open and .. */
-		asyn_info;
-      AsynSrv_n_active++;
-      asyn_info->skt =			    /* .. return the socket. */
-		AsynSrv_HPS_list[i].skt;
-      if (asyn_info->chan < 0)	 asyn_info->chan = 0;
-      if (asyn_info->chan > 255) asyn_info->chan = 0;
-      sprintf (buff, "%04d", asyn_info->chan);	/* Convert channel # to ASCII */
-      memcpy (asyn_info->chan_char, buff, sizeof (asyn_info->chan_char));
-
-      asyn_info->protocol_code = AsynSrv_HPS_list[i].protocol_code;
-      memcpy (asyn_info->protocol_id,
-		AsynSrv_HPS_list[i].protocol_id,
-		sizeof (asyn_info->protocol_id));
-      asyn_info->cmnd_hdr_len = AsynSrv_HPS_list[i].cmnd_hdr_len;
-      sprintf (asyn_info->cmnd_fmt, "%%0%dd", asyn_info->cmnd_hdr_len);
-      asyn_info->rply_hdr_len = AsynSrv_HPS_list[i].rply_hdr_len;
-      sprintf (asyn_info->rply_fmt, "%%%dd", asyn_info->rply_hdr_len);
-
-      sprintf (buff, "%04d", AsynSrv_msec_tmo/100);  /* Set dflt time-out ..
-						     ** ..(deci-secs) */
-      memcpy (asyn_info->tmo, buff, sizeof (asyn_info->tmo));
-
-      memcpy (asyn_info->eot,	    /* Set dflt terminator(s) */
-		AsynSrv_eot, sizeof (asyn_info->eot));
-
-      asyn_info->max_replies = asyn_info->n_replies = 0;
-      return True;
-    }
-/*--------------------------------------------------------
-**		There is no existing connection. Is there room for
-**		a new connection entry?
-*/
-    if (AsynSrv_n_cnct >= AsynSrv_MAX_LINK) {
-      AsynSrv_errcode = AsynSrv__NO_ROOM;	/* There isn't! */
-      return False;
-    }
-/*--------------------------------------------------------
-**		But, before going any further, do some quick checks on
-**		values in asyn_info.
-*/
-    if ((asyn_info->port <= 0) ||
-	(asyn_info->port > 65535)) {
-      AsynSrv_errcode = AsynSrv__BAD_PAR;	/* Something is bad! */
-      return False;
-    }
-    if (asyn_info->chan < 0)   asyn_info->chan = 0;
-    if (asyn_info->chan > 255) asyn_info->chan = 0;
-/*--------------------------------------------------------
-**		Set up a new connection.
-*/
-    StrJoin (AsynSrv_HPS_list[AsynSrv_n_cnct].host,
-		sizeof (AsynSrv_HPS_list[AsynSrv_n_cnct].host),
-		asyn_info->host, "");
-    AsynSrv_HPS_list[AsynSrv_n_cnct].port = asyn_info->port;
-		/*---------------------------
-		** Get the Internet address of the server.
-		*/
-    rmt_inet_addr.s_addr = inet_addr (asyn_info->host);
-    if (rmt_inet_addr.s_addr != -1) {
-      rmt_inet_addr_pntr = &rmt_inet_addr;
-    }else {
-      rmt_hostent = gethostbyname (asyn_info->host);
-      if (rmt_hostent == NULL) {
-	AsynSrv_errcode = AsynSrv__BAD_HOST;
-	GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno); /* Save errno info */
-	fprintf (stderr, "\nAsynSrv_Open/gethostbyname: Failed to get Internet "
-		    "address of \"%s\".\n", asyn_info->host);
-	return False;
-      }
-      rmt_inet_addr_pntr = (struct in_addr *) rmt_hostent->h_addr_list[0];
-    }
-		/*---------------------------
-		** Create a TCP/IP socket for connecting to server and bind it.
-		*/
-    my_skt = socket (AF_INET, SOCK_STREAM, 0);
-    if (my_skt <= 0) {
-      AsynSrv_errcode = AsynSrv__BAD_SOCKET;
-      GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno);  /* Save the errno info */
-      fprintf (stderr, "\nAsynSrv_Open/socket: Failed to create a socket.\n");
-      return False;
-    }
-    lcl_sockname.sin_family = AF_INET;
-    lcl_sockname.sin_port   = htons (0);
-    lcl_sockname.sin_addr.s_addr = 0;
-    status = bind (my_skt, (struct sockaddr *) &lcl_sockname,
-					sizeof (lcl_sockname));
-    if (status == -1) {
-      close (my_skt);
-      AsynSrv_errcode = AsynSrv__BAD_BIND;
-      GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno);  /* Save the errno info */
-      fprintf (stderr, "\nAsynSrv_Open/bind: Failed to bind socket.\n");
-      return False;
-    }
-		/*---------------------------
-		** Set short time-out (VMS systems only)
-		*/
-#ifdef	__VMS
-    oto_len = sizeof (old_time_out);	/* Save current time-out first */ 
-    oto_status = getsockopt (my_skt, IPPROTO_TCP, UCX$C_TCP_PROBE_IDLE,
-			    old_time_out, &oto_len);
-
-    if (oto_status == 0) {
-      time_out.val = AsynSrv_connect_tmo;		/* Set new time-out */
-      status = setsockopt (my_skt, IPPROTO_TCP, UCX$C_TCP_PROBE_IDLE,
-			    time_out.chars, sizeof (time_out));
-    }
-#endif
-		/*---------------------------
-		** Connect to RS-232-C Server.
-		*/
-    rmt_sockname_len = sizeof (rmt_sockname);
-    rmt_sockname.sin_family	 = AF_INET;
-    rmt_sockname.sin_port	 = htons (asyn_info->port);
-    rmt_sockname.sin_addr.s_addr = rmt_inet_addr_pntr->s_addr;
-    status = connect (my_skt, (struct sockaddr *) &rmt_sockname,
-				    sizeof (rmt_sockname));
-    if (status != 0) {
-      close (my_skt);
-      AsynSrv_errcode = AsynSrv__BAD_CONNECT;
-      GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno);  /* Save the errno info */
-      fprintf (stderr,
-		    "\nAsynSrv_Open/connect: Failed to connect to server.\n");
-      perror ("AsynSrv_Open");
-      return False;
-    }
-		/*---------------------------
-		** Restore time-out (VMS only)
-		*/
-#ifdef	__VMS
-    if (oto_status == 0) {
-      setsockopt (my_skt, IPPROTO_TCP, UCX$C_TCP_PROBE_IDLE,
-			    old_time_out, oto_len);
-    }
-#endif
-		/*---------------------------------------------------
-		** Setup the defaults in the AsynSrv__info data structure.
-		*/
-    asyn_info->skt = my_skt;	    /* Return socket number to caller */
-
-    asyn_info->protocol_code = 0;   /* Ensure protocol_code set to "unknown" */
-    memcpy (asyn_info->protocol_id, "\0\0\0\0",
-			    sizeof (asyn_info->protocol_id));
-    asyn_info->cmnd_hdr_len = 4;
-    strcpy (asyn_info->cmnd_fmt, "%04d");
-    asyn_info->rply_hdr_len = 4;
-    strcpy (asyn_info->rply_fmt, "%4d");
-
-    sprintf (buff, "%04d", asyn_info->chan);	/* Convert channel # to ASCII */
-    memcpy (asyn_info->chan_char, buff, sizeof (asyn_info->chan_char));
-
-    sprintf (buff, "%04d", AsynSrv_msec_tmo/100);   /* Set dflt time-out ..
-						    ** .. (deci-secs) */
-    memcpy (asyn_info->tmo, buff, sizeof (asyn_info->tmo));
-
-    memcpy (asyn_info->eot, AsynSrv_eot, sizeof (asyn_info->eot)); /* Set ..
-						** .. dflt terminator(s) */
-    asyn_info->max_replies = 0;
-    asyn_info->n_replies = 0;
-		/*
-		** Send a null command buffer to the server. This should give
-		** a "protocol mismatch" error response and from this we can get
-		** the actual protocol level supported by the server.
-		*/
-    status = AsynSrv_SendCmnds (asyn_info, &s_buff, &r_buff, NULL);
-    if (!status && (AsynSrv_errcode == AsynSrv__BAD_PROT_LVL)) {
-		    /*
-		    ** As expected, we got a "protocol mismatch" error.
-		    ** Save the server's protocol level for future use.
-		    */
-      memcpy (asyn_info->protocol_id, r_buff.s_pcol_lvl,
-		    sizeof (r_buff.s_pcol_lvl));
-      if (strncmp (r_buff.s_pcol_lvl, RS__PROTOCOL_ID_V01B,
-			strlen (RS__PROTOCOL_ID_V01B)) == 0) {
-	asyn_info->protocol_code = RS__PROTOCOL_CODE_V01B;
-	asyn_info->cmnd_hdr_len = 4;
-	strcpy (asyn_info->cmnd_fmt, "%04d");
-	asyn_info->rply_hdr_len = 4;
-	strcpy (asyn_info->rply_fmt, "%4d");
-      }else if (strncmp (r_buff.s_pcol_lvl, RS__PROTOCOL_ID,
-			strlen (RS__PROTOCOL_ID)) == 0) {
-	asyn_info->protocol_code = RS__PROTOCOL_CODE;
-	asyn_info->cmnd_hdr_len = 2;
-	strcpy (asyn_info->cmnd_fmt, "%02d");
-	asyn_info->rply_hdr_len = 2;
-	strcpy (asyn_info->rply_fmt, "%2d");
-      }else {
-	close (my_skt);
-	asyn_info->skt = 0;
-	fprintf (stderr,
-	    "\nAsynSrv_Open: Server protocol level is unrecognised.\n"
-	    "       Server level is \"%4s\"\n", r_buff.s_pcol_lvl);
-	return False;
-      }
-    }else {
-      close (my_skt);
-      asyn_info->skt = 0;
-      AsynSrv_errcode = AsynSrv__BAD_PROT_LVL;
-      fprintf (stderr,
-	"\nAsynSrv_Open: Problem getting protocol level of Server!\n");
-      return False;
-    }
-		/*---------------------------------------------------
-		** Complete the setup of the connection table entry
-		*/
-    AsynSrv_HPS_list[AsynSrv_n_cnct].skt = my_skt;
-    AsynSrv_HPS_list[AsynSrv_n_cnct].protocol_code = asyn_info->protocol_code;
-    memcpy (AsynSrv_HPS_list[AsynSrv_n_cnct].protocol_id,
-		asyn_info->protocol_id, sizeof (asyn_info->protocol_id));
-    AsynSrv_HPS_list[AsynSrv_n_cnct].cmnd_hdr_len = asyn_info->cmnd_hdr_len;
-    AsynSrv_HPS_list[AsynSrv_n_cnct].rply_hdr_len = asyn_info->rply_hdr_len;
-    AsynSrv_HPS_list[AsynSrv_n_cnct].usage_cnt = 1;
-    AsynSrv_n_cnct++;
-
-    AsynSrv_active[AsynSrv_n_active] =	    /* Remember the open in case .. */
-		asyn_info;		    /* .. there's a force-exit */
-    AsynSrv_n_active++;
-
-    AsynSrv_errcode = AsynSrv_errno = AsynSrv_vaxc_errno = 0;
-    AsynSrv_call_depth = 0;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		AsynSrv_Force:  Open a connection to an RS-232-C Server.
-**                              Thereby insisting on an own socket.
-*/
-  int	AsynSrv_Force (
-/*	============
-*/		struct AsynSrv__info	*asyn_info) {
-
-    int			    i, status;
-    int			    my_skt;
-    char		    old_time_out[4];
-    union {
-      char  chars[4];
-      int   val;
-    } time_out;
-    char		    buff[128];
-    struct RS__MsgStruct    s_buff;
-    struct RS__RespStruct   r_buff;
-    unsigned int	    oto_len, oto_status;
-    struct hostent	   *rmt_hostent;
-    struct in_addr	   *rmt_inet_addr_pntr;
-    struct in_addr	    rmt_inet_addr;
-    int			    rmt_sockname_len;
-    struct sockaddr_in	    lcl_sockname;
-    struct sockaddr_in	    rmt_sockname;
-
-    char		*errtxt_ptr;
-    int			 errcode, my_errno, my_vaxc_errno;
-/*--------------------------------------------------------
-*/
-    asyn_info->skt = 0;
-/*--------------------------------------------------------
-**			Initialise the error info stack and pre-set the
-**			routine name (in case of error).
-*/
-    AsynSrv_errcode = AsynSrv_errno = AsynSrv_vaxc_errno = 0;
-    strcpy (AsynSrv_routine[0], "AsynSrv_Open");
-    AsynSrv_call_depth = 1;
-/*--------------------------------------------------------
-**		But, before going any further, do some quick checks on
-**		values in asyn_info.
-*/
-    if ((asyn_info->port <= 0) ||
-	(asyn_info->port > 65535)) {
-      AsynSrv_errcode = AsynSrv__BAD_PAR;	/* Something is bad! */
-      return False;
-    }
-    if (asyn_info->chan < 0)   asyn_info->chan = 0;
-    if (asyn_info->chan > 255) asyn_info->chan = 0;
-/*--------------------------------------------------------
-**		Set up a new connection.
-*/
-		/*---------------------------
-		** Get the Internet address of the server.
-		*/
-    rmt_inet_addr.s_addr = inet_addr (asyn_info->host);
-    if (rmt_inet_addr.s_addr != -1) {
-      rmt_inet_addr_pntr = &rmt_inet_addr;
-    }else {
-      rmt_hostent = gethostbyname (asyn_info->host);
-      if (rmt_hostent == NULL) {
-	AsynSrv_errcode = AsynSrv__BAD_HOST;
-	GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno); /* Save errno info */
-	fprintf (stderr, "\nAsynSrv_Open/gethostbyname: Failed to get Internet "
-		    "address of \"%s\".\n", asyn_info->host);
-	return False;
-      }
-      rmt_inet_addr_pntr = (struct in_addr *) rmt_hostent->h_addr_list[0];
-    }
-		/*---------------------------
-		** Create a TCP/IP socket for connecting to server and bind it.
-		*/
-    my_skt = socket (AF_INET, SOCK_STREAM, 0);
-    if (my_skt <= 0) {
-      AsynSrv_errcode = AsynSrv__BAD_SOCKET;
-      GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno);  /* Save the errno info */
-      fprintf (stderr, "\nAsynSrv_Open/socket: Failed to create a socket.\n");
-      return False;
-    }
-    lcl_sockname.sin_family = AF_INET;
-    lcl_sockname.sin_port   = htons (0);
-    lcl_sockname.sin_addr.s_addr = 0;
-    status = bind (my_skt, (struct sockaddr *) &lcl_sockname,
-					sizeof (lcl_sockname));
-    if (status == -1) {
-      close (my_skt);
-      AsynSrv_errcode = AsynSrv__BAD_BIND;
-      GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno);  /* Save the errno info */
-      fprintf (stderr, "\nAsynSrv_Open/bind: Failed to bind socket.\n");
-      return False;
-    }
-		/*---------------------------
-		** Set short time-out (VMS systems only)
-		*/
-#ifdef	__VMS
-    oto_len = sizeof (old_time_out);	/* Save current time-out first */ 
-    oto_status = getsockopt (my_skt, IPPROTO_TCP, UCX$C_TCP_PROBE_IDLE,
-			    old_time_out, &oto_len);
-
-    if (oto_status == 0) {
-      time_out.val = AsynSrv_connect_tmo;		/* Set new time-out */
-      status = setsockopt (my_skt, IPPROTO_TCP, UCX$C_TCP_PROBE_IDLE,
-			    time_out.chars, sizeof (time_out));
-    }
-#endif
-		/*---------------------------
-		** Connect to RS-232-C Server.
-		*/
-    rmt_sockname_len = sizeof (rmt_sockname);
-    rmt_sockname.sin_family	 = AF_INET;
-    rmt_sockname.sin_port	 = htons (asyn_info->port);
-    rmt_sockname.sin_addr.s_addr = rmt_inet_addr_pntr->s_addr;
-    status = connect (my_skt, (struct sockaddr *) &rmt_sockname,
-				    sizeof (rmt_sockname));
-    if (status != 0) {
-      close (my_skt);
-      AsynSrv_errcode = AsynSrv__BAD_CONNECT;
-      GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno);  /* Save the errno info */
-      fprintf (stderr,
-		    "\nAsynSrv_Open/connect: Failed to connect to server.\n");
-      perror ("AsynSrv_Open");
-      return False;
-    }
-		/*---------------------------
-		** Restore time-out (VMS only)
-		*/
-#ifdef	__VMS
-    if (oto_status == 0) {
-      setsockopt (my_skt, IPPROTO_TCP, UCX$C_TCP_PROBE_IDLE,
-			    old_time_out, oto_len);
-    }
-#endif
-		/*---------------------------------------------------
-		** Setup the defaults in the AsynSrv__info data structure.
-		*/
-    asyn_info->skt = my_skt;	    /* Return socket number to caller */
-
-    asyn_info->protocol_code = 0;   /* Ensure protocol_code set to "unknown" */
-    memcpy (asyn_info->protocol_id, "\0\0\0\0",
-			    sizeof (asyn_info->protocol_id));
-    asyn_info->cmnd_hdr_len = 4;
-    strcpy (asyn_info->cmnd_fmt, "%04d");
-    asyn_info->rply_hdr_len = 4;
-    strcpy (asyn_info->rply_fmt, "%4d");
-
-    sprintf (buff, "%04d", asyn_info->chan);	/* Convert channel # to ASCII */
-    memcpy (asyn_info->chan_char, buff, sizeof (asyn_info->chan_char));
-
-    sprintf (buff, "%04d", AsynSrv_msec_tmo/100);   /* Set dflt time-out ..
-						    ** .. (deci-secs) */
-    memcpy (asyn_info->tmo, buff, sizeof (asyn_info->tmo));
-
-    memcpy (asyn_info->eot, AsynSrv_eot, sizeof (asyn_info->eot)); /* Set ..
-						** .. dflt terminator(s) */
-    asyn_info->max_replies = 0;
-    asyn_info->n_replies = 0;
-		/*
-		** Send a null command buffer to the server. This should give
-		** a "protocol mismatch" error response and from this we can get
-		** the actual protocol level supported by the server.
-		*/
-    status = AsynSrv_SendCmnds (asyn_info, &s_buff, &r_buff, NULL);
-    if (!status && (AsynSrv_errcode == AsynSrv__BAD_PROT_LVL)) {
-		    /*
-		    ** As expected, we got a "protocol mismatch" error.
-		    ** Save the server's protocol level for future use.
-		    */
-      memcpy (asyn_info->protocol_id, r_buff.s_pcol_lvl,
-		    sizeof (r_buff.s_pcol_lvl));
-      if (strncmp (r_buff.s_pcol_lvl, RS__PROTOCOL_ID_V01B,
-			strlen (RS__PROTOCOL_ID_V01B)) == 0) {
-	asyn_info->protocol_code = RS__PROTOCOL_CODE_V01B;
-	asyn_info->cmnd_hdr_len = 4;
-	strcpy (asyn_info->cmnd_fmt, "%04d");
-	asyn_info->rply_hdr_len = 4;
-	strcpy (asyn_info->rply_fmt, "%4d");
-      }else if (strncmp (r_buff.s_pcol_lvl, RS__PROTOCOL_ID,
-			strlen (RS__PROTOCOL_ID)) == 0) {
-	asyn_info->protocol_code = RS__PROTOCOL_CODE;
-	asyn_info->cmnd_hdr_len = 2;
-	strcpy (asyn_info->cmnd_fmt, "%02d");
-	asyn_info->rply_hdr_len = 2;
-	strcpy (asyn_info->rply_fmt, "%2d");
-      }else {
-	close (my_skt);
-	asyn_info->skt = 0;
-	fprintf (stderr,
-	    "\nAsynSrv_Open: Server protocol level is unrecognised.\n"
-	    "       Server level is \"%4s\"\n", r_buff.s_pcol_lvl);
-	return False;
-      }
-    }else {
-      close (my_skt);
-      asyn_info->skt = 0;
-      AsynSrv_errcode = AsynSrv__BAD_PROT_LVL;
-      fprintf (stderr,
-	"\nAsynSrv_Open: Problem getting protocol level of Server!\n");
-      return False;
-    }
-    AsynSrv_errcode = AsynSrv_errno = AsynSrv_vaxc_errno = 0;
-    AsynSrv_call_depth = 0;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		AsynSrv_SendCmnds:  Send commands to RS232C server.
-*/
-  int	AsynSrv_SendCmnds (
-/*	=================
-*/		struct AsynSrv__info	*asyn_info,
-		struct RS__MsgStruct	*send_buff,
-		struct RS__RespStruct	*rcve_buff,
-		...) {		/* Now we have list of commands -
-				**   char *txt   = pntr to cmnd strng
-				** Terminate list with *txt = NULL.
-				*/
-    int			i, status, c_len, size, max_size, ncmnds;
-    int			bytes_to_come, bytes_left;
-    char		*nxt_byte_ptr;
-    char		err_text[80];
-    char		text[20];
-    va_list		ap;		/* Pointer to variable args */
-    char		*txt_ptr;
-    char		*cmnd_lst_ptr;
-		    /*----------------------------------------------
-		    ** Pre-set the routine name (in case of error)
-		    */
-    if (AsynSrv_errcode == 0 && AsynSrv_call_depth < 5) {
-      strcpy (AsynSrv_routine[AsynSrv_call_depth], "AsynSrv_SendCmnds");
-      AsynSrv_call_depth++;
-    }
-		    /*----------------------------------------------
-		    ** Do nothing if no connection - the connection gets
-		    ** closed if an error is detected. The connection may
-		    ** also be marked to have been forcefully closed.
-		    */
-    if (asyn_info->skt <= 0) {
-      memset (rcve_buff->msg_size,
-		    '0', sizeof (rcve_buff->msg_size));
-      if ((AsynSrv_errcode == 0) && (asyn_info->skt < 0)) {
-	AsynSrv_errcode = AsynSrv__FORCED_CLOSED;
-      }
-      return False;
-    }
-		    /*----------------------------------------------
-		    ** Build message for server from the list of commands.
-		    */
-    asyn_info->max_replies = asyn_info->n_replies = 0;
-
-    asyn_info->msg_id++;		/* Set up an incrementing message id */
-    if (asyn_info->msg_id > 9999) asyn_info->msg_id = 1;
-    sprintf (send_buff->msg_id, "%04d", asyn_info->msg_id);
-
-    memcpy (send_buff->c_pcol_lvl, asyn_info->protocol_id,
-		sizeof (send_buff->c_pcol_lvl));
-
-    memcpy (send_buff->serial_port, asyn_info->chan_char,
-		sizeof (send_buff->serial_port));
-
-    memcpy (send_buff->tmo, asyn_info->tmo, sizeof (send_buff->tmo));
-
-    memcpy (send_buff->terms, asyn_info->eot, sizeof (send_buff->terms));
-
-    memcpy (send_buff->n_cmnds, "0000", sizeof (send_buff->n_cmnds));
-
-    va_start (ap, rcve_buff);		/* Set up var arg machinery */
-
-    txt_ptr = va_arg (ap, char *);	/* Get pntr to next cmnd string */
-    ncmnds = 0;
-    cmnd_lst_ptr = &send_buff->cmnds[0];
-    bytes_left = sizeof (*send_buff) -
-			    OffsetOf (struct RS__MsgStruct, cmnds[0]);
-
-    while (txt_ptr != NULL) {
-      c_len = strlen (txt_ptr);
-      size = asyn_info->cmnd_hdr_len + c_len;
-      if (size > bytes_left) {
-	AsynSrv_errcode = AsynSrv__BAD_SENDLEN;		/* Too much to send */
-	fprintf (stderr, "\nAsynSrv_SendCmnds/send: too much to send"
-				" - request ignored.\n");
-	memset (rcve_buff->msg_size, '0', sizeof (rcve_buff->msg_size));
-	return False;
-      }else {
-	sprintf (cmnd_lst_ptr, asyn_info->cmnd_fmt, c_len);
-	if (cmnd_lst_ptr[asyn_info->cmnd_hdr_len] != '\0') {
-	  AsynSrv_errcode = AsynSrv__BAD_CMND_LEN;
-	  fprintf (stderr, "\nAsynSrv_SendCmnds/send: command too long -"
-				" - request ignored.\n");
-	  memset (rcve_buff->msg_size, '0', sizeof (rcve_buff->msg_size));
-	  return False;
-	}
-	cmnd_lst_ptr += asyn_info->cmnd_hdr_len;
-	strcpy (cmnd_lst_ptr, txt_ptr);
-	cmnd_lst_ptr += c_len;
-	ncmnds++;
-        bytes_left = bytes_left - size;
-	txt_ptr = va_arg (ap, char *);
-      }
-    }
-    sprintf (text, "%04d", ncmnds);
-    memcpy (send_buff->n_cmnds, text, sizeof (send_buff->n_cmnds));
-
-    size = cmnd_lst_ptr - send_buff->msg_id;
-    size = (size + 3) & (~3);	/* Round up to multiple of 4 */
-    sprintf (text, "%04d", size);
-    memcpy (send_buff->msg_size, text, sizeof (send_buff->msg_size));
-
-    size += sizeof (send_buff->msg_size);
-    status = send (asyn_info->skt,
-			(char *) send_buff, size, 0);
-    if (status != size) {
-      GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno);
-      if (status == 0) {
-	AsynSrv_errcode = AsynSrv__BAD_SEND;	/* Server exited (probably) */
-	fprintf (stderr, "\nAsynSrv_SendCmnds/send: probable network problem");
-      }else if (status == -1) {
-	if (AsynSrv_errno == EPIPE) {
-	  AsynSrv_errcode = AsynSrv__BAD_SEND_PIPE;	/* Server exited (probably) */
-	  fprintf (stderr, "\nAsynSrv_SendCmnds/send: broken network pipe");
-	}else {
-	  AsynSrv_errcode = AsynSrv__BAD_SEND_NET; /* It's some other net problem */
-	  perror ("AsynSrv_SendCmnds/send");
-	}
-      }else {
-	AsynSrv_errcode = AsynSrv__BAD_SEND_UNKN;		/* TCP/IP problems */
-	fprintf (stderr, "\nAsynSrv_SendCmnds/send: probable TCP/IP problem");
-      }
-      AsynSrv_Close (asyn_info, True);   /* Force close TCP/IP connection */
-      fprintf (stderr, " - link to server force-closed.\n");
-      return False;
-    }
-
-    size = sizeof (rcve_buff->msg_size);
-    status = recv (asyn_info->skt, rcve_buff->msg_size, size, 0);
-    if (status != size) {
-      GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno);
-      if (status == 0) {
-	AsynSrv_errcode = AsynSrv__BAD_RECV;   	/* Server exited (probably) */
-	fprintf (stderr, "\nAsynSrv_SendCmnds/recv: probable network problem");
-      }else if (status == -1) {
-	if (AsynSrv_errno == EPIPE) {
-	  AsynSrv_errcode = AsynSrv__BAD_RECV_PIPE;	/* Server exited (probably) */
-	  fprintf (stderr, "\nAsynSrv_SendCmnds/recv: broken network pipe");
-	}else {
-	  AsynSrv_errcode = AsynSrv__BAD_RECV_NET;  /* It's some other net problem */
-	  perror ("AsynSrv_SendCmnds/recv");
-	}
-      }else {
-	AsynSrv_errcode = AsynSrv__BAD_RECV_UNKN;		/* TCP/IP problems */
-	fprintf (stderr, "\nAsynSrv_SendCmnds/recv: probable TCP/IP problem");
-      }
-      AsynSrv_Close (asyn_info, True);   /* Force close TCP/IP connection */
-      fprintf (stderr, " - link to server force-closed.\n");
-      return False;
-    }
-    if (sscanf (rcve_buff->msg_size, "%4d", &bytes_to_come) != 1) {
-      AsynSrv_errcode = AsynSrv__BAD_NOT_BCD;  /* Header not an ASCII BCD integer */
-      AsynSrv_Close (asyn_info, True);   /* Force close TCP/IP connection */
-      fprintf (stderr, "\nAsynSrv_SendCmnds/recv: non-BCD byte count"
-			    " - link to server force-closed.\n");
-      return False;
-    }
-    max_size = sizeof (*rcve_buff) - size;
-    if (bytes_to_come > max_size) {
-      AsynSrv_errcode = AsynSrv__BAD_RECVLEN;
-      fprintf (stderr, "\nAsynSrv_SendCmnds/recv: pending message length too big"
-			    " - flushing ...\n");
-      nxt_byte_ptr = &rcve_buff->msg_size[size];
-      while (bytes_to_come > 0) {	/* Flush out the incoming message */
-	bytes_left = bytes_to_come;
-	if (bytes_left > max_size) bytes_left = max_size;
-	status = recv (asyn_info->skt, nxt_byte_ptr, bytes_left, 0);
-	if (status <= 0) {
-	  AsynSrv_errcode = AsynSrv__BAD_FLUSH; /* TCP/IP problem during flush */
-	  GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno);
-	  AsynSrv_Close (asyn_info, True);   /* Force close TCP/IP connection */
-	  fprintf (stderr, "\nAsynSrv_SendCmnds/recv: network problem during"
-		    " flush.\nLink to server force-closed.\n");
-	  return False;
-	}
-	bytes_to_come = bytes_to_come - status;
-      }
-      fprintf (stderr, "\n flushed OK.\n");
-      memset (rcve_buff->msg_size, '0', sizeof (rcve_buff->msg_size));
-      return False;
-    }else {
-      nxt_byte_ptr = &rcve_buff->msg_size[size];
-      bytes_left = bytes_to_come;
-      while (bytes_left > 0) {		/* Read the rest of the response */
-	status = recv (asyn_info->skt, nxt_byte_ptr, bytes_left, 0);
-	if (status <= 0) {
-	  GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno);
-	  if (status == 0) {
-	    AsynSrv_errcode = AsynSrv__BAD_RECV1; /* Server exited (probably) */
-	    fprintf (stderr, "\nAsynSrv_SendCmnds/recv/1: probable network "
-				    "problem");
-	  }else {
-	    if (AsynSrv_errno == EPIPE) {
-	      AsynSrv_errcode = AsynSrv__BAD_RECV1_PIPE; /* Server exited (probably) */
-	      fprintf (stderr, "\nAsynSrv_SendCmnds/recv/1: broken network pipe");
-	    }else {
-	      AsynSrv_errcode = AsynSrv__BAD_RECV1_NET; /* It's some other net fault */
-	      perror ("AsynSrv_SendCmnds/recv/1");
-	    }
-	  }
-	  AsynSrv_Close (asyn_info, True); /* Force close TCP/IP connection */
-	  fprintf (stderr, " - link to server force-closed.\n");
-	  return False;
-        }
-	bytes_left   = bytes_left   - status;
-	nxt_byte_ptr = nxt_byte_ptr + status;
-      }
-      if (strncmp (asyn_info->protocol_id, rcve_buff->s_pcol_lvl,
-	    sizeof (rcve_buff->s_pcol_lvl)) != 0) {
-	AsynSrv_errcode = AsynSrv__BAD_PROT_LVL;   /* Protocol level is bad */
-	return False;
-      }
-      if ((sscanf (rcve_buff->n_rply, "%4d", &asyn_info->max_replies) != 1) ||
-	  (asyn_info->max_replies < 0)) {
-	AsynSrv_errcode = AsynSrv__BAD_REPLY;   /* Reply is bad */
-	if (AsynSrv_call_depth < 5) {	    /* Add reply to routine stack */
-	  bytes_to_come = bytes_to_come + 4;
-	  if (bytes_to_come >= sizeof (AsynSrv_routine[0]))
-		bytes_to_come = sizeof (AsynSrv_routine[0]) - 1;
-	  for (i=0; i<bytes_to_come; i++) {
-	    if (rcve_buff->msg_size[i] == '\0')
-		    rcve_buff->msg_size[i] = '.';
-	  }
-	  rcve_buff->msg_size[bytes_to_come] = '\0';
-	  strcpy (AsynSrv_routine[AsynSrv_call_depth], rcve_buff->msg_size);
-	  AsynSrv_call_depth++;
-	}
-	return False;
-      }
-    }
-    AsynSrv_call_depth--;
-    return True;
-  }
-/*-------------------------------------------- End of AsynSrv_Utility.C -----*/
diff --git a/hardsup/asynsrv_utility.c b/hardsup/asynsrv_utility.c
deleted file mode 100644
index 2214adfe..00000000
--- a/hardsup/asynsrv_utility.c
+++ /dev/null
@@ -1,2121 +0,0 @@
-#define	    ident	"1C06"
-#ifdef VAXC
-#module	    AsynSrv_Utility	ident
-#endif
-#ifdef __DECC
-#pragma	    module	    AsynSrv_Utility	ident
-#endif
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     Department ASQ				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...LIB.SINQ]AsynSrv_Utility.C
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Mar 1996
-**
-**  To compile this module, use:
-
-	$ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-	$ cc /debug /noopt /obj=[]AsynSrv_Utility -
-			lnsa01::tasmad_disk:[mad.psi.lib.sinq]AsynSrv_Utility +
-			sinq_c_tlb/lib
-
-**  To include this module in SINQ.OLB, use:
-
-  $ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-  $
-  $ define/group sinq_olb mad_lib:sinq_dbg.olb
-  $ @lnsa01::tasmad_disk:[mad.psi.lib.sinq]sinq_olb AsynSrv_Utility debug
-  $
-  $ define/group sinq_olb mad_lib:sinq.olb
-  $ @lnsa01::tasmad_disk:[mad.psi.lib.sinq]sinq_olb AsynSrv_Utility
-**
-** Updates:
-**  1A01 21-Mar-1996 DM.	Initial version.
-**  1B01 12-Sep-1996 DM.	Allow host name to be in dot format too.
-**  1B02  5-May-1997 DM.	Set 5 sec time-out on "connect" on VMS systems.
-**  1B07 11-Mar-1998 DM.	Allow range of msecTmo to be 0 - 999999 (it was
-**				    100 - 999999).
-**  1C01 21-Mar-2000 MZ.        Introduced idleHandler
-**  1C02 30-Mar-2000 DM.        Add trace and flush facilities.
-**  1C06 30-Aug-2000 DM.        Add AsynSrv_GetLenTerm.
-**============================================================================
-** The entry points included in this module are described below. Prototypes
-** can be defined via:
-**
-**    #include <sinq_prototypes.h>
-**
-**	AsynSrv_ChanClose   - Send a "CLOSE CHAN" request to RS-232-C Server.
-**	AsynSrv_Close	    - Close a connection to an RS-232-C Server.
-**	AsynSrv_Config	    - Configure an open AsynSrv_Utility connection.
-**	AsynSrv_ConfigDflt  - Set defaults for AsynSrv_Open.
-**	AsynSrv_ErrInfo	    - Return detailed status from last operation.
-**	AsynSrv_Flush       - Send a "FLUSH" request to an RS-232-C Server.
-**	AsynSrv_GetLenTerm  - Get length and terminator of a reply.
-**	AsynSrv_GetReply    - Get next reply from a reply buffer.
-**	AsynSrv_Open	    - Open a connection  to an RS-232-C Server.
-**	AsynSrv_OpenNew	    - Same as AsynSrv_Open but forces the opening
-**				of a new socket.
-**	AsynSrv_SendCmnds   - Send commands to a channel of an RS-232-C Server.
-**	AsynSrv_SendCmndsBig - Similar to AsynSrv_SendCmnds but with user
-**				defined buffer sizes.
-**	AsynSrv_Trace       - Send a "TRACE ON" or "TRACE OFF" request to
-**				an RS-232-C Server.
-**	AsynSrv_Trace_Write - Send a "TRACE WRITE" request to RS-232-C Server.
-**  Other entry points which are private (i.e. not in <sinq_prototypes.h>):
-**	AsynSrv_SendSpecCmnd - Send a "special" command to an RS-232-C Server.
-**---------------------------------------------------------------------
-**    int AsynSrv_ChanClose (&asyn_info)
-**	  -----------------
-**  Input Args:
-**	struct AsynSrv__info  *asyn_info  - the structure used in the call to
-**				AsynSrv_Open. It contains settings required
-**				for setting up and sending send_buff.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and errcode (see
-**	AsynSrv_ErrInfo) is set to indicate the nature of the problem.
-**	See AsynSrv_SendSpecCmnd for possible error codes.
-**  Routines called:
-**	AsynSrv_SendSpecCmnd
-**  Description:
-**	AsynSrv_SendSpecCmnd is called to send the 4-byte "special" 
-**	command "-006" to the server to cause it to close its serial ports.
-**---------------------------------------------------------------------
-**    int AsynSrv_Close (&asyn_info, force_flag)
-**	  -------------
-**  Input Args:
-**	int   force_flag - if non-zero, all connections using the same socket
-**			   will also be marked as force-closed (socket number
-**			   set to -1) and the connection will really be
-**			   closed. This is needed for error recovery operations.
-**  Output Args:
-**	none
-**  Modified Args:
-**	struct AsynSrv__info *asyn_info  - a structure holding skt, host and
-**					   port of the connection. On return
-*					   skt = 0.
-**  Return status:
-**	True if no problems detected, otherwise False and AsynSrv_errcode
-**	is set to indicate the nature of the problem as follows:
-**	  ASYNSRV__BAD_PAR  --> skt does not match with host/port.
-**  Routines called:
-**	Socket library, "close".
-**  Description:
-**	The routine decrements the usage count on the connection to host/port.
-**	If the counter is still >0, the routine simply returns.
-**	If the counter is now 0, the routine sends a "-001" message to the
-**	server to inform it that we are about to close the link, waits for a
-**	possible 4 bytes of response and then closes the TCP/IP connection.
-**---------------------------------------------------------------------
-**    int AsynSrv_Config (&asyn_info, &par_id, par_val, ...)
-**	  --------------
-**  Input Args:
-**	char*   par_id	- Text string identifying the next argument (see below).
-**			    NULL indicates the end of the argument list.
-**	<??>	par_val	- The value to set for the argument. The type of the
-**			    argument can depend on par_id.
-**  Output Args:
-**	none
-**  Modified Args:
-**	struct AsynSrv__info  *asyn_info  - the structure used in the call to
-**				AsynSrv_Open. It is used to hold the config
-**				info for the connection.
-**  Return status:
-**	True if no problems detected, otherwise False and AsynSrv_errcode
-**	is set to indicate the nature of the problem as follows:
-**	  ASYNSRV__BAD_PAR  --> Unrecognised par_id or msecTmo < 0 or
-**					msecTmo > 999'999 or bad eot or ..
-**  Routines called:
-**	None
-**  Description:
-**	AsynSrv_Config may be used for setting values of parameters for
-**	use in subsequent calls to AsynSrv_SendCmnds. Defaults for these
-**	parameters are set via a call to AsynSrv_ConfigDflt, prior to
-**	calling AsynSrv_Open. Values which may be taken by par_id (warning --
-**	par_id is case-sensitive) and the corresponding variable type of
-**	par_val are:
-**
-**	  "msecTmo"  int   	 The time-out response for commands sent
-**				   to a serial channel on the server. The
-**				   valid range is 0 to 999'999.
-**	  "eot"     char*  	 The expected terminators in responses to
-**				    commands sent to a serial channel on the
-**				    server. The first character specifies the
-**				    number of terminators (max=3).
-**        "idleHdl" void (*hdl) (int msecTmo, int socket)            MZ.
-**                               A handler which is called in AsynSrv_SendCmds
-**                               before receiving the response. The handler
-**                               should contain a call to "select ()" and return
-**                               on a read event on the socket passed as
-**                               argument, or after the timeout specified
-**                               has expired.
-**---------------------------------------------------------------------
-**    int AsynSrv_ConfigDflt (&par_id, par_val, ...)
-**	  ------------------
-**  Input Args:
-**	char*   par_id	- Text string identifying the next argument (see below).
-**			    NULL indicates the end of the argument list.
-**	<??>	par_val	- The value to set for the argument. The type of the
-**			    argument can depend on par_id.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and AsynSrv_errcode
-**	is set to indicate the nature of the problem as follows:
-**	  ASYNSRV__BAD_PAR  --> Unrecognised par_id or msecTmo < 0 or
-**					msecTmo > 999'999 or bad eot or ..
-**  Routines called:
-**	None
-**  Description:
-**	AsynSrv_ConfigDflt may be used for setting default values of parameters
-**	for use in subsequent calls to AsynSrv_Open. Values which may be taken
-**	by par_id (warning -- par_id is case-sensitive) and the corresponding
-**	variable type of par_val are:
-**
-**	  "TmoC"     int   	 The time-out in seconds to be used when
-**				   opening a connection to a server. This
-**				   value is only effective on VMS systems. For
-**				   UNIX systems, the systemwide default (usually
-**				   75 secs) cannot be changed. The initial
-**				   setting for "TmoC" is 5 secs.
-**	  "msecTmo"  int   	 The time-out response for commands sent
-**				   to a serial channel on the server. The
-**				   valid range is 0 to 999'999. The initial
-**				   setting for "msecTmo" is 10'000 msec.
-**	  "eot"     char*  	 The expected terminators in responses to
-**				    commands sent to a serial channel on the
-**				    server. The first character specifies the
-**				    number of terminators (max=3). The initial
-**				    setting for "eot" is "1\r".
-**-------------------------------------------------------------------------
-**    void AsynSrv_ErrInfo (&entry_txt_ptr, &errcode, &my_errno, &vaxc_errno)
-**	   ---------------
-**  Input Args:
-**	None
-**  Output Args:
-**	char **entry_txt_ptr - Pointer to a text string giving the call stack
-**				at the time that the error was detected.
-**	int  *errcode	 - An internal error code indicating the detected error.
-**	int  *my_errno	 - Saved value of errno.
-**	int  *vaxc_errno - Saved value of vaxc$errno (OpenVMS only).
-**  Modified Args:
-**	none
-**  Return status:
-**	none
-**  Routines called:
-**	none
-**  Description:
-**	Returns detailed status of the last operation. Once an error has been
-**	detected, the error status is frozen until this routine has been called.
-**-------------------------------------------------------------------------
-**    int AsynSrv_Flush (&asyn_info)
-**	  -------------
-**  Input Args:
-**	struct AsynSrv__info  *asyn_info  - the structure used in the call to
-**				AsynSrv_Open. It contains settings required
-**				for setting up and sending send_buff.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	Same as AsynSrv_ChanClose
-**  Routines called:
-**	Same as AsynSrv_ChanClose
-**  Description:
-**	AsynSrv_SendSpecCmnd is called to send the 4-byte "special" 
-**	command "-004" to the server to cause it to close its serial ports.
-**-------------------------------------------------------------------------
-**    int   AsynSrv_GetLenTerm (&asyn_info, &rcve_buff, &rply, *len, &term)
-**	    ------------------
-**  Input Args:
-**	struct AsynSrv__info  *asyn_info  - the structure used in the call to
-**				AsynSrv_Open. It is used to hold status info
-**				between calls to this routine.
-**	struct RS__RespStruct *rcve_buff  - address of receive buffer used
-**					      in last call to AsynSrv_SendCmnds.
-**	char		      *rply	  - address of a reply in rcve_buff as
-**					      returned by AsynSrv_GetReply.
-**  Output Args:
-**	int		      *len	  - address of location to receive the
-**					      length of the reply.
-**	char		      *term	  - address of location to receive the
-**					      terminator of the reply.
-**  Modified Args:
-**	none
-**  Return status:
-**	True if everything seems to be OK. Otherwise, False.
-**  Routines called:
-**	none
-**  Description:
-**	AsynSrv_GetLenTerm simply converts the length of the reply as saved
-**	in rply[-hdr_size-1] from ASCII to binary, subtracts 2 from it (to
-**	allow for the terminator byte and the null termination character) and
-**	returns it to the caller. *term is set to the value of the character
-**	at location rply[-1].
-**-------------------------------------------------------------------------
-**    char *AsynSrv_GetReply (&asyn_info, &rcve_buff, &last_rply)
-**	    ----------------
-**  Input Args:
-**	struct RS__RespStruct *rcve_buff    - address of receive buffer used
-**					      in last call to AsynSrv_SendCmnds.
-**	char		      *last_rply    - Address of last reply processed
-**					      or NULL.
-**  Output Args:
-**	none
-**  Modified Args:
-**	struct AsynSrv__info  *asyn_info  - the structure used in the call to
-**				AsynSrv_Open. It is used to hold status info
-**				between calls to this routine.
-**  Return status:
-**	Address of next reply in the buffer or NULL if no more. Note that this
-**	is a pointer to the reply and not to the head of the reply structure.
-**	The terminator byte found is therefore at index [-1] from this address.
-**  Routines called:
-**	none
-**  Description:
-**	AsynSrv_GetReply unpacks the replies in the response packet from the
-**	RS232C server which is an argument in the call to AsynSrv_SendCmnds.
-**	If the routine is called with last_rply = NULL, a pointer to the
-**	first reply is returned. On calling AsynSrv_GetReply again with
-**	last_rply set to this address, one receives the address of the second
-**	reply and so on, until NULL is returned, indicating that all responses
-**	have been exhausted.
-**  Warning:
-**	AsynSrv_GetReply keeps count of the number of responses it returns.
-**	Responses must therefore be processed in order.
-**-------------------------------------------------------------------------
-**    int AsynSrv_Open (&asyn_info)
-**	  ------------
-**  Input Args:
-**	struct AsynSrv__info *asyn_info
-**	  asyn_info->host - Name of host offering the RS-232-C service. The name
-**			    can be either symbolic or numeric, e.g.
-**			    "lnsw02.psi.ch" or "129.129.90.18".
-**	  asyn_info->port - Number of TCP/IP port of TCP/IP server.
-**	  asyn_info->chan - Number of RS-232-C channel to be used.
-**  Output Args:
-**	none
-**  Modified Args:
-**	struct AsynSrv__info *asyn_info  - a structure holding skt, host and
-**					   port of the connection. On return
-**					   skt = socket number of connection.
-**					   Set to 0 if error.
-**  Return status:
-**	If non-zero, no problems detected and asyn_info->skt is the socket to
-**		use for communicating with the server. Otherwise, a problem
-**		was detected and AsynSrv_errcode may be set as follows
-**		to indicate the nature of the problem:
-**	  ASYNSRV__BAD_HOST    --> Call to "gethostbyname" failed to get
-**					network addr of host.
-**	  ASYNSRV__BAD_SOCKET  --> Call to "socket" failed.
-**	  ASYNSRV__BAD_BIND    --> Call to "bind" failed.
-**	  ASYNSRV__BAD_CONNECT --> Call to "connect" failed.
-**	  ASYNSRV__BAD_PAR     --> Bad parameter found. Probably
-**					    asyn_info->port or asyn_info->chan
-**					    are out of range.
-**	  BAD_PROT_LVL	       --> Server protocol level is not valid.
-**	  ASYNSRV__NO_ROOM     --> Host/port table full or Active-link
-**					    table full.
-**  Routines called:
-**	Socket library routine "open".
-**  Description:
-**	The routine maintains a list of hosts/ports to which it has open
-**	sockets. If an entry is found in the list, the socket is returned
-**	and the usage count of this connection is incremented. If no entry
-**	is found in the list, a connection to the host is established and
-**	entered into the list.
-**	The routine also maintains a table of active links so that the
-**	"force-close" function can be performed. The link is added to this
-**	table too.
-**-------------------------------------------------------------------------
-**    int AsynSrv_OpenNew (&asyn_info)
-**	  ---------------
-**  Input Args:
-**	struct AsynSrv__info *asyn_info
-**	  asyn_info->host - Name of host offering the RS-232-C service. The name
-**			    can be either symbolic or numeric, e.g.
-**			    "lnsw02.psi.ch" or "129.129.90.18".
-**	  asyn_info->port - Number of TCP/IP port of TCP/IP server.
-**	  asyn_info->chan - Number of RS-232-C channel to be used.
-**  Output Args:
-**	none
-**  Modified Args:
-**	struct AsynSrv__info *asyn_info  - a structure holding skt, host and
-**					   port of the connection. On return
-**					   skt = socket number of connection.
-**					   Set to 0 if error.
-**  Return status:
-**	See AsynSrv_Open
-**  Routines called:
-**	See AsynSrv_Open
-**  Description:
-**	This routine is the same as AsynSrv_Open but forces the opening
-**	of a new socket. The socket will be marked to ensure that no other
-**	connections share this connection.
-**-------------------------------------------------------------------------
-**    int AsynSrv_SendCmnds (&asyn_info, &send_buff, &rcve_buff, ...)
-**	  -----------------
-**  Input Args:
-**	struct AsynSrv__info  *asyn_info  - the structure used in the call to
-**				AsynSrv_Open. It contains settings required
-**				for setting up and sending send_buff.
-**	char	* ...	- A list of commands, terminated by NULL, for
-**			    sending to the channel on the server. The commands
-**			    must have any necessary \r characters included.
-**  Output Args:
-**	struct RS__RespStruct *rcve_buff  - a buffer to receive the response
-**				from the server.
-**  Modified Args:
-**	struct RS__MsgStruct  *send_buff  - a buffer for holding the commands
-**				for sending to the server.
-**  Return status:
-**	True if no problems detected, otherwise False and errcode (see
-**	AsynSrv_ErrInfo) is set to indicate the nature of the problem.
-**	AsynSrv_errcode may be set as follows:
-**	    ASYNSRV__BAD_SEND_LEN --> Too much to send; either too many
-**					    commands or too long. The buffer
-**					    is 232 bytes long and each command
-**					    has a 2-byte header.
-**	    ASYNSRV__BAD_CMND_LEN --> A command is too long - it's length cannot
-**					be encoded into the command header field
-**	  The next 4 errors are related to network errors whilst sending the
-**	  message buffer to the server:
-**	    ASYNSRV__BAD_SEND	   --> Network problem - server has
-**					    probably abended.
-**	    ASYNSRV__BAD_SEND_PIPE --> Network pipe broken - probably same
-**					    cause as ASYNSRV__BAD_SEND.
-**	    ASYNSRV__BAD_SEND_NET  --> Some other network problem. "errno"
-**					    may be helpful.
-**	    ASYNSRV__BAD_SEND_UNKN --> Some other network problem happened
-**					    resulting in the message not
-**					    getting sent completely. "errno" is
-**					    probably not helpful in this case.
-**	    ASYNSRV__BAD_RECV	    \	These are network errors whilst
-**	    ASYNSRV__BAD_RECV_PIPE   >	receiving the 4-byte response header.
-**	    ASYNSRV__BAD_RECV_NET   /	They are analogous to ASYNSRV__BAD_SEND
-**	    ASYNSRV__BAD_RECV_UNKN /	... ASYNSRV__BAD_SEND_UNKN.
-**	    ASYNSRV__BAD_NOT_BCD   --> The 4-byte response header is not an
-**					  ASCII coded decimal integer.
-**	    ASYNSRV__BAD_RECV_LEN  --> The body of the response would be too
-**					  big to fit in the input buffer. The
-**					  buffer is ??? bytes long and each
-**					  response has a 5-byte header and a
-**					  trailing zero-byte. The response
-**					  is flushed.
-**	    ASYNSRV__BAD_FLUSH     --> Some network error was detected
-**					  during flushing. This is an "or"
-**					  of errors ASYNSRV__BAD_RECV to
-**					  ASYNSRV__BAD_RECV_UNKN.
-**	    ASYNSRV__FORCED_CLOSED --> The connection to the channel has been
-**					   forcefully closed. See below.
-**	    ASYNSRV__BAD_REPLY     --> The n_rply field of the response was
-**					either non-numeric or <0, indicating
-**					that the Terminal Server detected an
-**					error. The reply is added to the
-**					routine call stack for debug purposes.
-**				
-**	    ASYNSRV__BAD_RECV1	   \   These are network errors whilst receiving
-**	    ASYNSRV__BAD_RECV1_PIPE >	the body of the response. They are
-**	    ASYNSRV__BAD_RECV1_NET /	equivalent to ASYNSRV__BAD_RECV,
-**					ASYNSRV__BAD_RECV_PIPE and
-**					ASYNSRV__BAD_RECV_NET.
-**	    ASYNSRV__FORCED_CLOSED occurs if AsynSrv_Close has been called
-**		for another device on the same server and the 'force_flag'
-**		was set (see AsynSrv_Close). The caller should call
-**		AsynSrv_Close and then AsynSrv_Open to re-establish a
-**		connection to the server.
-**  Routines called:
-**	Socket library routines send and recv.
-**  Description:
-**	The list of commands is assembled into a message buffer with appropriate
-**	header information and sent off to the server. The response is then
-**	awaited and read in when it arrives.
-**
-**    For any of the following errors:
-**	ASYNSRV__BAD_SEND		(Note: ASYNSRV__BAD_SEND_LEN and 
-**	ASYNSRV__BAD_SEND_PIPE		       ASYNSRV__BAD_RECV_LEN and
-**	ASYNSRV__BAD_SEND_NET		       ASYNSRV__BAD_REPLY
-**	ASYNSRV__BAD_SEND_UNKN		   do not cause a close)
-**	ASYNSRV__BAD_RECV
-**	ASYNSRV__BAD_RECV_PIPE
-**	ASYNSRV__BAD_RECV_NET
-**	ASYNSRV__BAD_RECV_UNKN
-**	ASYNSRV__BAD_NOT_BCD
-**	ASYNSRV__BAD_FLUSH
-**	ASYNSRV__BAD_RECV1
-**	ASYNSRV__BAD_RECV1_PIPE
-**	ASYNSRV__BAD_RECV1_NET
-**    the network link to the server is force-closed via a call to
-**    AsynSrv_Close. Once the error has been corrected, the link can be
-**    re-opened via a call to AsynSrv_Open. As a result of the force-close,
-**    other active handles will need to be released via a call to
-**    AsynSrv_Close before AsynSrv_Open is called.
-**-------------------------------------------------------------------------
-**    int AsynSrv_SendCmndsBig (&asyn_info, &send_buff, send_buff_size,
-**	  --------------------		    &rcve_buff, rcve_buff_size, ...)
-**  Input Args:
-**	struct AsynSrv__info  *asyn_info  - the structure used in the call to
-**				AsynSrv_Open. It contains settings required
-**				for setting up and sending send_buff.
-**	int	send_buff_size	- The size of *send_buff in bytes.
-**	int	rcve_buff_size	- The size of *rcve_buff in bytes.
-**	int	*c_len \    - a list of argument pairs specifying the commands
-**	char	*cmd    >     to be sent. The list is terminated by
-**	...	       /      c_len == NULL. If *c_len > 0, it specifies the
-**			      number of bytes in the command. Otherwise, *cmd
-**			      is assumed to be a zero-terminated string.
-**			      The *cmd string must include any terminator
-**			      byte(s) but, if *c_len > 0, it does not need to
-**			      be zero-terminated.
-**  Output Args:
-**	struct RS__RespStruct *rcve_buff  - a buffer to receive the response
-**				from the server. Note that this structure must
-**				be extended to size rcve_buff_size by the use
-**				of suitable unions.
-**  Modified Args:
-**	struct RS__MsgStruct  *send_buff  - a buffer for holding the commands
-**				for sending to the server. Note that this
-**				structure must be extended to size
-**				send_buff_size by the use of suitable unions.
-**  Return status:
-**	Same as AsynSrv_SendCmnds with the addition of error code:
-**	    ASYNSRV__BAD_SEND_PAR --> Either send_buff_size or rcve_buff_size
-**					is less than 64.
-**  Routines called:
-**	Socket library routines send and recv.
-**  Description:
-**	The procedure is similar to AsynSrv_SendCmnds except that the commands
-**	are specified by a pair of arguments (to allow for the binary
-**	transmission of zeros) and the send and receive structures are assumed
-**	to have been extended to the sizes specified by suitable declarations
-**	in the calling module.
-**-------------------------------------------------------------------------
-**    int AsynSrv_SendSpecCmnd (&asyn_info, &cmnd)
-**	  -------------------
-**  Input Args:
-**	struct AsynSrv__info  *asyn_info  - the structure used in the call to
-**				AsynSrv_Open. It contains settings required
-**				for setting up and sending send_buff.
-**	char	*cmnd    - the 4-byte special command to be sent.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and errcode (see
-**	AsynSrv_ErrInfo) is set to indicate the nature of the problem.
-**	AsynSrv_errcode may be set as follows:
-**	  The next 4 errors are related to network errors whilst sending the
-**	  4-byte message buffer to the server:
-**	    ASYNSRV__BAD_SEND	   --> Network problem - server has
-**					    probably abended.
-**	    ASYNSRV__BAD_SEND_PIPE --> Network pipe broken - probably same
-**					    cause as ASYNSRV__BAD_SEND.
-**	    ASYNSRV__BAD_SEND_NET  --> Some other network problem. "errno"
-**					    may be helpful.
-**	    ASYNSRV__BAD_SEND_UNKN --> Some other network problem happened
-**					    resulting in the message not
-**					    getting sent completely. "errno" is
-**					    probably not helpful in this case.
-**	    ASYNSRV__BAD_RECV	    \	These are network errors whilst
-**	    ASYNSRV__BAD_RECV_PIPE   >	receiving the 4-byte response.
-**	    ASYNSRV__BAD_RECV_NET   /	They are analogous to ASYNSRV__BAD_SEND
-**	    ASYNSRV__BAD_RECV_UNKN /	... ASYNSRV__BAD_SEND_UNKN.
-**	    ASYNSRV__BAD_NOT_BCD   --> The 4-byte response header is not an
-**					  echo of the 4 bytes which were sent.
-**	    ASYNSRV__FORCED_CLOSED --> The connection to the channel has been
-**					   forcefully closed. See below.
-**	    ASYNSRV__FORCED_CLOSED occurs if AsynSrv_Close has been called
-**		for another device on the same server and the 'force_flag'
-**		was set (see AsynSrv_Close). The caller should call
-**		AsynSrv_Close and then AsynSrv_Open to re-establish a
-**		connection to the server.
-**  Routines called:
-**	Socket library routines send and recv.
-**  Description:
-**    AsynSrv_SendSpecCmnd sends the 4-byte "special" command, cmnd, to the
-**    server and reads the response. The response should be an echo of the
-**    command which was sent.
-**   Note:
-**    For any of the following errors:
-**	ASYNSRV__BAD_SEND	
-**	ASYNSRV__BAD_SEND_PIPE	
-**	ASYNSRV__BAD_SEND_NET	
-**	ASYNSRV__BAD_SEND_UNKN	
-**	ASYNSRV__BAD_RECV
-**	ASYNSRV__BAD_RECV_PIPE
-**	ASYNSRV__BAD_RECV_NET
-**	ASYNSRV__BAD_RECV_UNKN
-**	ASYNSRV__BAD_NOT_BCD
-**    the network link to the server is force-closed via a call to
-**    AsynSrv_Close. Once the error has been corrected, the link can be
-**    re-opened via a call to AsynSrv_Open. As a result of the force-close,
-**    other active handles will need to be released via a call to
-**    AsynSrv_Close before AsynSrv_Open is called.
-**-------------------------------------------------------------------------
-**    int AsynSrv_Trace (&asyn_info, state)
-**	  -------------
-**  Input Args:
-**	struct AsynSrv__info  *asyn_info  - the structure used in the call to
-**				AsynSrv_Open. It contains settings required
-**				for setting up and sending send_buff.
-**	int    state	- True/False to turn tracing on/off.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	Same as AsynSrv_ChanClose
-**  Routines called:
-**	Same as AsynSrv_ChanClose
-**  Description:
-**	AsynSrv_SendSpecCmnd is called to send a 4-byte "special" command
-**	to the server. The command is "-002" to turn on tracing and "-003"
-**	to turn off tracing.
-
-**  Description:
-**	To turn on  tracing, the 4-byte message "-002" is sent to the server.
-**	To turn off tracing, the 4-byte message "-003" is sent to the server.
-**	The server is expected to respond by echoing the message.
-**
-**-------------------------------------------------------------------------
-**    int AsynSrv_Trace_Write (&asyn_info)
-**	  -------------------
-**  Input Args:
-**	struct AsynSrv__info  *asyn_info  - the structure used in the call to
-**				AsynSrv_Open. It contains settings required
-**				for setting up and sending send_buff.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	Same as AsynSrv_ChanClose
-**  Routines called:
-**	Same as AsynSrv_ChanClose
-**  Description:
-**	AsynSrv_SendSpecCmnd is called to send the 4-byte "special" 
-**	command "-005" to the server to cause it to write its trace
-**	buffer to disk.
-**============================================================================*/
-/*
-**---------------------------------------------------------------------------
-**					Global Definitions
-*/
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <stdarg.h>
-#include    <errno.h>
-#include    <signal.h>
-#include    <netdb.h>
-#include    <sys/socket.h>
-#include    <netinet/in.h>
-#include    <arpa/inet.h>
-
-#include    <string.h>
-
-#ifdef	__VMS
-#pragma	    nostandard	 /* The "$" characters in ucx$inetdef.h give trouble! */
-#include    <ucx$inetdef.h>
-#include    <unixio.h>
-#else
-#include    <unistd.h>
-#endif
-/*-----------------------------------------------------------------*/
-#include    <asynsrv_def.h>
-#include    <rs232c_def.h>
-#include    <sinq_prototypes.h>
-
-#define True	1
-#define False	0
-
-#define MAX_OPEN    64
-
-  int	AsynSrv_SendSpecCmnd (	    /* A prototype for a local routine */
-		struct AsynSrv__info	*asyn_info,
-		char			*cmnd);
-/*--------------------------------------------------------------------------
-**					Global Variables
-*/
-  static int	AsynSrv_call_depth = 0;
-  static char	AsynSrv_routine[5][64];
-  static int	AsynSrv_errcode = 0;
-  static int	AsynSrv_errno, AsynSrv_vaxc_errno;
-  static int	AsynSrv_connect_tmo = 5;	    /* Time-out on "connect" */
-  static int	AsynSrv_msec_tmo = 10000;	    /* Time-out for responses */
-  static char	AsynSrv_eot[] = {'1', '\r', '\0','\0'};	/* Terminators */
-/*
-**	The following is the list of open connections (= number of
-**	active sockets).
-*/
-  static int			    AsynSrv_n_cnct = 0;
-  static struct AsynSrv_HostPortSkt AsynSrv_HPS_list[AsynSrv_MAX_LINK];
-/*
-**	The following is the list of active calls to AsynSrv_Open.
-*/
-  static int		       AsynSrv_n_active = 0;
-  static struct AsynSrv__info *AsynSrv_active[MAX_OPEN];
-/*
-**---------------------------------------------------------------------------
-**		AsynSrv_ChanClose:  Send a "CLOSE CHAN" request to
-**					RS232C server.
-*/
-  int	AsynSrv_ChanClose (
-/*	=================
-*/		struct AsynSrv__info	*asyn_info) {
-
-    int			status;
-    char		cmnd[8], rply[8];
-		    /*----------------------------------------------
-		    ** Pre-set the routine name (in case of error)
-		    */
-    if (AsynSrv_errcode == 0 && AsynSrv_call_depth < 5) {
-      strcpy (AsynSrv_routine[AsynSrv_call_depth], "AsynSrv_ChanClose");
-      AsynSrv_call_depth++;
-    }
-		    /*----------------------------------------------
-		    ** Do nothing if no connection - the connection gets
-		    ** closed if an error is detected. The connection may
-		    ** also be marked to have been forcefully closed.
-		    */
-    if (asyn_info->skt <= 0) {
-      if ((AsynSrv_errcode == 0) && (asyn_info->skt < 0)) {
-	AsynSrv_errcode = ASYNSRV__FORCED_CLOSED;
-      }
-      return False;
-    }
-		    /*----------------------------------------------
-		    ** Send message and get reply.
-		    */
-    status = AsynSrv_SendSpecCmnd (asyn_info, "-006");
-
-    if (AsynSrv_errcode == 0) AsynSrv_call_depth--;
-    return status;
-  }
-/*
-**---------------------------------------------------------------------------
-**		AsynSrv_Close:  Close a connection to an RS-232-C server.
-*/
-  int	AsynSrv_Close (
-/*	=============
-*/		struct AsynSrv__info	*asyn_info,
-		int			 force_flag) {
-
-    int			    i, j, k, my_skt;
-    char		    buff[4];
-		/*-----------------------------------------------
-		*/
-    if (asyn_info == NULL) return True;	    /* Just return if nothing to do! */
-    my_skt = asyn_info->skt;
-    if (my_skt <= 0) return True;	    /* Just return if nothing to do! */
-		/*-----------------------------------------------
-		** Pre-set the routinename (in case of error)
-		*/
-    if (AsynSrv_errcode == 0 && AsynSrv_call_depth < 5) {
-      strcpy (AsynSrv_routine[AsynSrv_call_depth], "AsynSrv_Close");
-      AsynSrv_call_depth++;
-    }
-		/*------------------------------------------------------
-		** Start by finding the table entry for this connection
-		*/
-    for (i = 0; i < AsynSrv_n_cnct; i++) {
-      if (AsynSrv_HPS_list[i].skt  != my_skt)  continue;
-      if (AsynSrv_HPS_list[i].port != asyn_info->port) continue;
-      if (strcmp (AsynSrv_HPS_list[i].host, asyn_info->host) == 0) break;
-    }
-    if (i >= AsynSrv_n_cnct) {		    /* Did we find the entry? */
-      AsynSrv_errcode = ASYNSRV__BAD_PAR;   /* No! */
-      return False;
-    }
-		/*------------------------------------------------------
-		** Now find the table entry for the AsynSrvOpen call.
-		*/  
-    for (j = 0; j < AsynSrv_n_active; j++) {
-      if ((AsynSrv_active[j] == asyn_info) &&
-	  (AsynSrv_active[j]->skt == my_skt)) {
-	break;
-      }
-    }
-    if (j >= AsynSrv_n_active) {	    /* Did we find the entry? */
-      AsynSrv_errcode = ASYNSRV__BAD_PAR;   /* No! */
-      return False;
-    }
-		/*------------------------------------------------------
-		**  i is the index for the connection table entry.
-		**  j is the index for the caller's AsynSrvOpen call entry.
-		*/
-    if (AsynSrv_HPS_list[i].usage_cnt <= 0) {	/* Is the connection active? */
-      AsynSrv_errcode = ASYNSRV__BAD_PAR;	/* No		    */
-      return False;
-    }
-		/*------------------------------------------------------
-		** For the caller, simply set his socket number to zero,
-		** mark the AsynSrvOpen entry as free and decrease the
-		** usage count (the entries will be compressed later).
-		*/
-    AsynSrv_active[j]->skt = 0;		/* Mark the close .. */
-    AsynSrv_active[j] = NULL;		/* .. and flag entry to be removed. */
-    AsynSrv_HPS_list[i].usage_cnt--;	/* Decrease usage count */
-		/*------------------------------------------------------
-		** If this is a force-close, go through all AsynSrv_Open
-		** entries looking for a socket match, mark them as
-		** free and decrease usage count.
-		*/
-    if (force_flag != 0) {
-      for (k = 0; k < AsynSrv_n_active; k++) {
-	if (AsynSrv_active[k] != NULL) {
-	  if (AsynSrv_active[k]->skt == my_skt) {
-	    AsynSrv_active[k]->skt = -1;	/* Mark the force-close */
-	    AsynSrv_active[k] = NULL;		/* Mark entry to be removed */
-	    AsynSrv_HPS_list[i].usage_cnt--;	/* Decrease usage count */
-	  }
-	}
-      }
-      if (AsynSrv_HPS_list[i].usage_cnt != 0) { /* Use count should now be .. */
-	AsynSrv_errcode = ASYNSRV__BAD_PAR;     /* .. zero or there's a bug.  */
-	return False;
-      }
-    }
-		/*------------------------------------------------------
-		** Compress the list of AsynSrv_Open entries
-		*/
-    j = 0;
-    for (k = 0; k < AsynSrv_n_active; k++) {
-      if (AsynSrv_active[k] != NULL) {
-	AsynSrv_active[j] = AsynSrv_active[k];
-	j++;
-      }
-    }
-    for (k = j; k < AsynSrv_n_active; k++) AsynSrv_active[k] = NULL;
-    AsynSrv_n_active = j;
-		/*------------------------------------------------------
-		** If the link is now idle, really close it and compress
-		** the connection table entry out of the list.
-		*/
-    if (AsynSrv_HPS_list[i].usage_cnt == 0) {
-      send (my_skt, "-001", 4, 0);	/* Tell the TCP/IP server that ..
-					** .. we are about to quit.
-					*/
-      recv (my_skt, buff, sizeof (buff), 0);   /* And wait for his ack */
-      close (my_skt);
-      for (j = i; j < AsynSrv_n_cnct; j++) {
-        memcpy ((char *) &AsynSrv_HPS_list[j], (char *) &AsynSrv_HPS_list[j+1],
-			    sizeof (AsynSrv_HPS_list[0]));
-      }
-      AsynSrv_HPS_list[AsynSrv_n_cnct].skt = 0; /* Invalidate the free entry */
-      AsynSrv_n_cnct--;
-    }
-    if (AsynSrv_errcode == 0) AsynSrv_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		AsynSrv_Config:  Configure an open connection.
-*/
-  int	AsynSrv_Config (
-/*	==============
-*/		    struct AsynSrv__info    *asyn_info,
-		    ...) {
-
-    char	buff[16], my_eot[4];
-    va_list	ap;		    /* Pointer to variable args */
-    char       *txt_ptr;
-    int		intval;
-    typedef void (*IdleHandler)(int,int);
-                        /*
-			** Pre-set the routinename (in case of error)
-			*/
-    if (AsynSrv_errcode == 0 && AsynSrv_call_depth < 5) {
-      strcpy (AsynSrv_routine[AsynSrv_call_depth], "AsynSrv_Config");
-      AsynSrv_call_depth++;
-    }
-
-    va_start (ap, asyn_info);		/* Set up var arg machinery */
-    txt_ptr = va_arg (ap, char *);	/* Get pntr to first parameter ident */
-    while (txt_ptr != NULL) {
-      if (strcmp (txt_ptr, "msecTmo") == 0) {
-	intval = va_arg (ap, int);
-	if ((intval < 0) || (intval > 999999)) {
-	  AsynSrv_errcode = ASYNSRV__BAD_PAR;
-	  return False;
-	}
-	sprintf (buff, "%04d", intval/100);	/* Convert to ASCII as ..
-						** .. deci-secs */
-	memcpy (asyn_info->tmo, buff, 4);
-      }else if (strcmp (txt_ptr, "eot") == 0) {
-	txt_ptr = va_arg (ap, char *);
-	if (txt_ptr == NULL) {
-	  AsynSrv_errcode = ASYNSRV__BAD_PAR;
-	  return False;
-	}
-	memcpy (my_eot, "\0\0\0\0", 4);
-	switch (txt_ptr[0]) {
-	 case '3': my_eot[3] = txt_ptr[3];
-	 case '2': my_eot[2] = txt_ptr[2];
-	 case '1': my_eot[1] = txt_ptr[1];
-	 case '0':
-	    my_eot[0] = txt_ptr[0];
-	    break;
-	 default: 
-	    AsynSrv_errcode = ASYNSRV__BAD_PAR;
-	    return False;
-	}
-	memcpy (asyn_info->eot, my_eot, 4);
-      }else if (strcmp (txt_ptr, "idleHdl") == 0) { /* MZ. */
-	asyn_info->idleHandler = va_arg (ap, IdleHandler);
-      }else {
-	AsynSrv_errcode = ASYNSRV__BAD_PAR;
-	return False;
-      }
-      txt_ptr = va_arg (ap, char *);	/* Get pntr to next parameter ident */
-    }
-
-    if (AsynSrv_errcode == 0) AsynSrv_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		AsynSrv_ConfigDflt:  Set default values in AsynSrv_Utility
-**				     which will be used to initialise
-**				     structures in AsynSrv_Open.
-*/
-  int	AsynSrv_ConfigDflt (
-/*	==================
-*/		    char    *par_id,
-		    ...) {
-    int		i;
-    char	buff[4];
-    va_list	ap;		    /* Pointer to variable args */
-    char       *txt_ptr;
-    int		intval;
-			/*
-			** Pre-set the routinename (in case of error)
-			*/
-    if (AsynSrv_errcode == 0 && AsynSrv_call_depth < 5) {
-      strcpy (AsynSrv_routine[AsynSrv_call_depth], "AsynSrv_ConfigDflt");
-      AsynSrv_call_depth++;
-    }
-
-    va_start (ap, par_id);		/* Set up var arg machinery */
-    txt_ptr = par_id;			/* Point to first arg */
-    while (txt_ptr != NULL) {
-      if (strcmp (txt_ptr, "tmoC") == 0) {
-	intval = va_arg (ap, int);
-	if ((intval < 1) || (intval > 3600)) {
-	  AsynSrv_errcode = ASYNSRV__BAD_PAR;
-	  return False;
-	}
-	AsynSrv_connect_tmo = intval;
-      }else if (strcmp (txt_ptr, "msecTmo") == 0) {
-	intval = va_arg (ap, int);
-	if ((intval < 0) || (intval > 999999)) {
-	  AsynSrv_errcode = ASYNSRV__BAD_PAR;
-	  return False;
-	}
-	AsynSrv_msec_tmo = intval;
-      }else if (strcmp (txt_ptr, "eot") == 0) {
-	txt_ptr = va_arg (ap, char *);
-	if (txt_ptr == NULL) {
-	  AsynSrv_errcode = ASYNSRV__BAD_PAR;
-	  return False;
-	}
-	switch (txt_ptr[0]) {
-	 case '3': AsynSrv_eot[3] = txt_ptr[3];
-	 case '2': AsynSrv_eot[2] = txt_ptr[2];
-	 case '1': AsynSrv_eot[1] = txt_ptr[1];
-	 case '0':
-	    AsynSrv_eot[0] = txt_ptr[0];
-	    break;
-	 default: 
-	    AsynSrv_errcode = ASYNSRV__BAD_PAR;
-	    return False;
-	}
-	switch (txt_ptr[0]) {
-	 case '0': AsynSrv_eot[1] = '\0';
-	 case '1': AsynSrv_eot[2] = '\0';
-	 case '2': AsynSrv_eot[3] = '\0';
-	}
-      }else {
-	AsynSrv_errcode = ASYNSRV__BAD_PAR;
-	return False;
-      }
-      txt_ptr = va_arg (ap, char *);	/* Get pntr to next parameter ident */
-    }
-
-    if (AsynSrv_errcode == 0) AsynSrv_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		AsynSrv_ErrInfo:  Return detailed status from last operation.
-*/
-  void	AsynSrv_ErrInfo (
-/*	===============
-*/		char	**entry_txt,
-		int	*errcode,
-		int	*my_errno,
-		int	*vaxc_errno) {
-
-    int		i, j, k;
-    char	buff[80];
-
-    if (AsynSrv_call_depth <= 0) {
-      strcpy (AsynSrv_routine[0], "AsynSrv_no_error_detected");
-      *errcode	  = 0;
-      *my_errno	  = 0;
-      *vaxc_errno = 0;
-    }else {
-      if (AsynSrv_call_depth > 1) {		    /* Concatenate the names */
-	for (i = 1; i < AsynSrv_call_depth; i++) {
-	  strcat (AsynSrv_routine[0], "/");
-	  StrJoin (AsynSrv_routine[0], sizeof (AsynSrv_routine),
-			    AsynSrv_routine[0], AsynSrv_routine[i]);
-	}
-      }
-      *errcode	  = AsynSrv_errcode;
-      *my_errno	  = AsynSrv_errno;
-      *vaxc_errno = AsynSrv_vaxc_errno;
-      switch (AsynSrv_errcode) {
-	case ASYNSRV__BAD_BIND:	     strcpy (buff, "/ASYNSRV__BAD_BIND"); break;
-	case ASYNSRV__BAD_CMND_LEN:  strcpy (buff, "/ASYNSRV__BAD_CMND_LEN"); break;
-	case ASYNSRV__BAD_CONNECT:   strcpy (buff, "/ASYNSRV__BAD_CONNECT"); break;
-	case ASYNSRV__BAD_FLUSH:     strcpy (buff, "/ASYNSRV__BAD_FLUSH"); break;
-	case ASYNSRV__BAD_HOST:	     strcpy (buff, "/ASYNSRV__BAD_HOST"); break;
-	case ASYNSRV__BAD_NOT_BCD:   strcpy (buff, "/ASYNSRV__BAD_NOT_BCD"); break;
-	case ASYNSRV__BAD_PAR:	     strcpy (buff, "/ASYNSRV__BAD_PAR"); break;
-	case ASYNSRV__BAD_PROT_LVL:  strcpy (buff, "/ASYNSRV__BAD_PROT_LVL"); break;
-	case ASYNSRV__BAD_RECV:	     strcpy (buff, "/ASYNSRV__BAD_RECV"); break;
-	case ASYNSRV__BAD_RECV_LEN:  strcpy (buff, "/ASYNSRV__BAD_RECV_LEN"); break;
-	case ASYNSRV__BAD_RECV_NET:  strcpy (buff, "/ASYNSRV__BAD_RECV_NET"); break;
-	case ASYNSRV__BAD_RECV_PIPE: strcpy (buff, "/ASYNSRV__BAD_RECV_PIPE"); break;
-	case ASYNSRV__BAD_RECV_UNKN: strcpy (buff, "/ASYNSRV__BAD_RECV_UNKN"); break;
-	case ASYNSRV__BAD_RECV1:     strcpy (buff, "/ASYNSRV__BAD_RECV1"); break;
-	case ASYNSRV__BAD_RECV1_NET: strcpy (buff, "/ASYNSRV__BAD_RECV1_NET"); break;
-	case ASYNSRV__BAD_RECV1_PIPE:strcpy (buff, "/ASYNSRV__BAD_RECV1_PIPE"); break;
-	case ASYNSRV__BAD_REPLY:     strcpy (buff, "/ASYNSRV__BAD_REPLY"); break;
-	case ASYNSRV__BAD_SEND:	     strcpy (buff, "/ASYNSRV__BAD_SEND"); break;
-	case ASYNSRV__BAD_SEND_LEN:  strcpy (buff, "/ASYNSRV__BAD_SEND_LEN"); break;
-	case ASYNSRV__BAD_SEND_NET:  strcpy (buff, "/ASYNSRV__BAD_SEND_NET"); break;
-	case ASYNSRV__BAD_SEND_PIPE: strcpy (buff, "/ASYNSRV__BAD_SEND_PIPE"); break;
-	case ASYNSRV__BAD_SEND_UNKN: strcpy (buff, "/ASYNSRV__BAD_SEND_UNKN"); break;
-	case ASYNSRV__BAD_SOCKET:    strcpy (buff, "/ASYNSRV__BAD_SOCKET"); break;
-	case ASYNSRV__FORCED_CLOSED: strcpy (buff, "/ASYNSRV__FORCED_CLOSED"); break;
-	case ASYNSRV__NO_ROOM:	     strcpy (buff, "/ASYNSRV__NO_ROOM"); break;
-	default: sprintf (buff, "/ASYNSRV__unkn_err_code: %d", AsynSrv_errcode);
-      }
-      StrJoin (AsynSrv_routine[0], sizeof(AsynSrv_routine),
-			    AsynSrv_routine[0], buff);
-    }
-    *entry_txt = AsynSrv_routine[0];
-    AsynSrv_call_depth = 0;
-    AsynSrv_errcode = 0;
-  }
-/*
-**---------------------------------------------------------------------------
-**		AsynSrv_Flush:  Send a Flush command to RS232C server.
-*/
-  int	AsynSrv_Flush (
-/*	=============
-*/		struct AsynSrv__info	*asyn_info) {
-
-    int			status;
-    char		cmnd[8], rply[8];
-		    /*----------------------------------------------
-		    ** Pre-set the routine name (in case of error)
-		    */
-    if (AsynSrv_errcode == 0 && AsynSrv_call_depth < 5) {
-      strcpy (AsynSrv_routine[AsynSrv_call_depth], "AsynSrv_Flush");
-      AsynSrv_call_depth++;
-    }
-		    /*----------------------------------------------
-		    ** Do nothing if no connection - the connection gets
-		    ** closed if an error is detected. The connection may
-		    ** also be marked to have been forcefully closed.
-		    */
-    if (asyn_info->skt <= 0) {
-      if ((AsynSrv_errcode == 0) && (asyn_info->skt < 0)) {
-	AsynSrv_errcode = ASYNSRV__FORCED_CLOSED;
-      }
-      return False;
-    }
-		    /*----------------------------------------------
-		    ** Send message and get reply.
-		    */
-    status = AsynSrv_SendSpecCmnd (asyn_info, "-004");
-
-    if (AsynSrv_errcode == 0) AsynSrv_call_depth--;
-    return status;
-  }
-/*
-**---------------------------------------------------------------------------
-**		AsynSrv_GetLenTerm:  Get length and terminator of given
-**				     reply from reply buffer.
-*/
-  int	AsynSrv_GetLenTerm (
-/*	==================
-*/	    struct AsynSrv__info    *asyn_info,
-	    struct RS__RespStruct   *rcve_buff,
-	    char		    *rply,	/* In: Addr of a reply as got ..
-						**     .. got from _GetReply */
-	    int			    *len,	/* Out: The returned length */
-	    char		    *term) {	/* Out: The returned t'nator */
-
-    int	     i;
-
-    i = sscanf ((rply - asyn_info->rply_hdr_len - 1), asyn_info->rply_fmt, len);
-    *len = (i == 1) ? (*len - 2) : 0;
-    *term = *(rply - 1);
-
-    if (i != 1) return False;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		AsynSrv_GetReply:  Get next reply from a reply buffer.
-*/
-  char	*AsynSrv_GetReply (
-/*	 ================
-*/		struct AsynSrv__info	*asyn_info,
-		struct RS__RespStruct	*rcve_buff,
-		char			*last_rply) {
-
-    char    *pntr = NULL;
-    int	     i, rply_len;
-
-    if (last_rply == NULL) {		/* Start with first reply? */
-					/* Yes */
-      asyn_info->n_replies = 1;
-      if (asyn_info->max_replies > 0) {
-	pntr = rcve_buff->u.rplys;
-	pntr = pntr + 1 + asyn_info->rply_hdr_len;
-      }
-    }else {				/* No - get next reply */
-      if (asyn_info->n_replies < asyn_info->max_replies) { /* If there is one */
-	i = sscanf ((last_rply - asyn_info->rply_hdr_len - 1),
-		asyn_info->rply_fmt, &rply_len);
-	if ((i == 1) && (rply_len >= 0)) {
-	  pntr = last_rply + rply_len + asyn_info->rply_hdr_len;
-	}
-      }
-    }
-    return pntr;
-  }
-/*
-**---------------------------------------------------------------------------
-**		AsynSrv_Open:  Open a connection to an RS-232-C Server.
-*/
-  int	AsynSrv_Open (
-/*	============
-*/		struct AsynSrv__info	*asyn_info) {
-
-    int			    i, status;
-    int			    my_skt;
-    char		    old_time_out[4];
-    union {
-      char  chars[4];
-      int   val;
-    } time_out;
-    char		    buff[128];
-    struct RS__MsgStruct    s_buff;
-    struct RS__RespStruct   r_buff;
-    unsigned int	    oto_len, oto_status;
-    struct hostent	   *rmt_hostent;
-    struct in_addr	   *rmt_inet_addr_pntr;
-    struct in_addr	    rmt_inet_addr;
-    int			    rmt_sockname_len;
-    struct sockaddr_in	    lcl_sockname;
-    struct sockaddr_in	    rmt_sockname;
-
-    char		*errtxt_ptr;
-    int			 errcode, my_errno, my_vaxc_errno;
-/*--------------------------------------------------------
-*/
-    asyn_info->skt = 0;
-/*--------------------------------------------------------
-**			Initialise the error info stack and pre-set the
-**			routine name (in case of error).
-*/
-    AsynSrv_errcode = AsynSrv_errno = AsynSrv_vaxc_errno = 0;
-    strcpy (AsynSrv_routine[0], "AsynSrv_Open");
-    AsynSrv_call_depth = 1;
-/*--------------------------------------------------------
-**		Is there room for a new AsynSrv_Open table entry?
-*/
-    if (AsynSrv_n_active >= MAX_OPEN) {
-      AsynSrv_errcode = ASYNSRV__NO_ROOM;	/* There isn't! */
-      return False;
-    }
-/*--------------------------------------------------------
-**		See if a table entry for this connection already exists.
-*/
-    for (i = 0; i < AsynSrv_n_cnct; i++) {
-      if (AsynSrv_HPS_list[i].status != 0) continue;
-      if (AsynSrv_HPS_list[i].port != asyn_info->port) continue;
-      if (strcmp (AsynSrv_HPS_list[i].host, asyn_info->host) == 0) break;
-    }
-    if (i < AsynSrv_n_cnct) {		    /* Did we find an entry? */
-					    /* Yes */
-      AsynSrv_HPS_list[i].usage_cnt++;	    /* Up the usage count and .. */
-      AsynSrv_active[AsynSrv_n_active] =    /* .. remember the open and .. */
-		asyn_info;
-      AsynSrv_n_active++;
-      asyn_info->skt =			    /* .. return the socket. */
-		AsynSrv_HPS_list[i].skt;
-      if (asyn_info->chan < 0)	 asyn_info->chan = 0;
-      if (asyn_info->chan > 255) asyn_info->chan = 0;
-      sprintf (buff, "%04d", asyn_info->chan);	/* Convert channel # to ASCII */
-      memcpy (asyn_info->chan_char, buff, sizeof (asyn_info->chan_char));
-
-      asyn_info->protocol_code = AsynSrv_HPS_list[i].protocol_code;
-      memcpy (asyn_info->protocol_id,
-		AsynSrv_HPS_list[i].protocol_id,
-		sizeof (asyn_info->protocol_id));
-      asyn_info->cmnd_hdr_len = AsynSrv_HPS_list[i].cmnd_hdr_len;
-      sprintf (asyn_info->cmnd_fmt, "%%0%dd", asyn_info->cmnd_hdr_len);
-      asyn_info->rply_hdr_len = AsynSrv_HPS_list[i].rply_hdr_len;
-      sprintf (asyn_info->rply_fmt, "%%%dd", asyn_info->rply_hdr_len);
-
-      sprintf (buff, "%04d", AsynSrv_msec_tmo/100);  /* Set dflt time-out ..
-						     ** ..(deci-secs) */
-      memcpy (asyn_info->tmo, buff, sizeof (asyn_info->tmo));
-
-      memcpy (asyn_info->eot,	    /* Set dflt terminator(s) */
-		AsynSrv_eot, sizeof (asyn_info->eot));
-
-      asyn_info->max_replies = asyn_info->n_replies = 0;
-      asyn_info->idleHandler = NULL;
-      AsynSrv_call_depth--;
-      return True;
-    }
-/*--------------------------------------------------------
-**		There is no existing connection. Open a new one.
-*/
-    status = AsynSrv_OpenNew (asyn_info);
-    if (!status) return False;
-/*--------------------------------------------------------
-**		Allow the entry to be shared (i.e. status = 0)
-*/
-    AsynSrv_HPS_list[AsynSrv_n_cnct-1].status = 0;
-/*--------------------------------------------------------
-*/
-    AsynSrv_errcode = AsynSrv_errno = AsynSrv_vaxc_errno = 0;
-    AsynSrv_call_depth = 0;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		AsynSrv_OpenNew:  Open a new connection to an RS-232-C Server.
-*/
-  int	AsynSrv_OpenNew (
-/*	===============
-*/		struct AsynSrv__info	*asyn_info) {
-
-    int			    i, status;
-    int			    my_skt;
-    char		    old_time_out[4];
-    union {
-      char  chars[4];
-      int   val;
-    } time_out;
-    char		    buff[128];
-    struct RS__MsgStruct    s_buff;
-    struct RS__RespStruct   r_buff;
-    unsigned int	    oto_len, oto_status;
-    struct hostent	   *rmt_hostent;
-    struct in_addr	   *rmt_inet_addr_pntr;
-    struct in_addr	    rmt_inet_addr;
-    int			    rmt_sockname_len;
-    struct sockaddr_in	    lcl_sockname;
-    struct sockaddr_in	    rmt_sockname;
-
-    char		*errtxt_ptr;
-    int			 errcode, my_errno, my_vaxc_errno;
-/*--------------------------------------------------------
-*/
-    asyn_info->skt = 0;
-/*--------------------------------------------------------
-**			Initialise the error info stack and pre-set the
-**			routine name (in case of error).
-*/
-    AsynSrv_errcode = AsynSrv_errno = AsynSrv_vaxc_errno = 0;
-    if ((AsynSrv_call_depth == 1) &&
-	(strcmp (AsynSrv_routine[0], "AsynSrv_Open") == 0)) {
-      strcpy (AsynSrv_routine[1], "AsynSrv_OpenNew");
-      AsynSrv_call_depth = 2;
-    }else {
-      strcpy (AsynSrv_routine[0], "AsynSrv_OpenNew");
-      AsynSrv_call_depth = 1;
-    }
-/*--------------------------------------------------------
-**		Is there room for a new AsynSrv_Open table entry?
-*/
-    if (AsynSrv_n_active >= MAX_OPEN) {
-      AsynSrv_errcode = ASYNSRV__NO_ROOM;	/* There isn't! */
-      return False;
-    }
-/*--------------------------------------------------------
-**		Is there room for a new connection entry?
-*/
-    if (AsynSrv_n_cnct >= AsynSrv_MAX_LINK) {
-      AsynSrv_errcode = ASYNSRV__NO_ROOM;	/* There isn't! */
-      return False;
-    }
-/*--------------------------------------------------------
-**		There's room for a new connection but, before going any
-**		further, do some quick checks on values in asyn_info.
-*/
-    if ((asyn_info->port <=    0) ||
-	(asyn_info->port > 65535) ||
-        (asyn_info->chan <     0) ||
-	(asyn_info->chan >   255)) {
-      AsynSrv_errcode = ASYNSRV__BAD_PAR;	/* Something is bad! */
-      return False;
-    }
-/*--------------------------------------------------------
-**		Set up a new connection.
-*/
-    StrJoin (AsynSrv_HPS_list[AsynSrv_n_cnct].host,
-		sizeof (AsynSrv_HPS_list[AsynSrv_n_cnct].host),
-		asyn_info->host, "");
-    AsynSrv_HPS_list[AsynSrv_n_cnct].port = asyn_info->port;
-		/*---------------------------
-		** Get the Internet address of the server.
-		*/
-    rmt_inet_addr.s_addr = inet_addr (asyn_info->host);
-    if (rmt_inet_addr.s_addr != -1) {
-      rmt_inet_addr_pntr = &rmt_inet_addr;
-    }else {
-      rmt_hostent = gethostbyname (asyn_info->host);
-      if (rmt_hostent == NULL) {
-	AsynSrv_errcode = ASYNSRV__BAD_HOST;
-	GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno); /* Save errno info */
-	fprintf (stderr, "\nAsynSrv_OpenNew/gethostbyname: Failed to get Internet "
-		    "address of \"%s\".\n", asyn_info->host);
-	return False;
-      }
-      rmt_inet_addr_pntr = (struct in_addr *) rmt_hostent->h_addr_list[0];
-    }
-		/*---------------------------
-		** Create a TCP/IP socket for connecting to server and bind it.
-		*/
-    my_skt = socket (AF_INET, SOCK_STREAM, 0);
-    if (my_skt <= 0) {
-      AsynSrv_errcode = ASYNSRV__BAD_SOCKET;
-      GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno);  /* Save the errno info */
-      fprintf (stderr, "\nAsynSrv_OpenNew/socket: Failed to create a socket.\n");
-      return False;
-    }
-    lcl_sockname.sin_family = AF_INET;
-    lcl_sockname.sin_port   = htons (0);
-    lcl_sockname.sin_addr.s_addr = 0;
-    status = bind (my_skt, (struct sockaddr *) &lcl_sockname,
-					sizeof (lcl_sockname));
-    if (status == -1) {
-      close (my_skt);
-      AsynSrv_errcode = ASYNSRV__BAD_BIND;
-      GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno);  /* Save the errno info */
-      fprintf (stderr, "\nAsynSrv_OpenNew/bind: Failed to bind socket.\n");
-      return False;
-    }
-		/*---------------------------
-		** Set short time-out (VMS systems only)
-		*/
-#ifdef	__VMS
-    oto_len = sizeof (old_time_out);	/* Save current time-out first */ 
-    oto_status = getsockopt (my_skt, IPPROTO_TCP, UCX$C_TCP_PROBE_IDLE,
-			    old_time_out, &oto_len);
-
-    if (oto_status == 0) {
-      time_out.val = AsynSrv_connect_tmo;		/* Set new time-out */
-      status = setsockopt (my_skt, IPPROTO_TCP, UCX$C_TCP_PROBE_IDLE,
-			    time_out.chars, sizeof (time_out));
-    }
-#endif
-		/*---------------------------
-		** Connect to RS-232-C Server.
-		*/
-    rmt_sockname_len = sizeof (rmt_sockname);
-    rmt_sockname.sin_family	 = AF_INET;
-    rmt_sockname.sin_port	 = htons (asyn_info->port);
-    rmt_sockname.sin_addr.s_addr = rmt_inet_addr_pntr->s_addr;
-    status = connect (my_skt, (struct sockaddr *) &rmt_sockname,
-				    sizeof (rmt_sockname));
-    if (status != 0) {
-      close (my_skt);
-      AsynSrv_errcode = ASYNSRV__BAD_CONNECT;
-      GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno);  /* Save the errno info */
-      fprintf (stderr,
-		    "\nAsynSrv_OpenNew/connect: Failed to connect to server.\n");
-      perror ("AsynSrv_OpenNew");
-      return False;
-    }
-		/*---------------------------
-		** Restore time-out (VMS only)
-		*/
-#ifdef	__VMS
-    if (oto_status == 0) {
-      setsockopt (my_skt, IPPROTO_TCP, UCX$C_TCP_PROBE_IDLE,
-			    old_time_out, oto_len);
-    }
-#endif
-		/*---------------------------------------------------
-		** Setup the defaults in the AsynSrv__info data structure.
-		*/
-    asyn_info->skt = my_skt;	    /* Return socket number to caller */
-
-    asyn_info->protocol_code = 0;   /* Ensure protocol_code set to "unknown" */
-    memcpy (asyn_info->protocol_id, "\0\0\0\0",
-			    sizeof (asyn_info->protocol_id));
-    asyn_info->cmnd_hdr_len = 4;
-    strcpy (asyn_info->cmnd_fmt, "%04d");
-    asyn_info->rply_hdr_len = 4;
-    strcpy (asyn_info->rply_fmt, "%4d");
-
-    sprintf (buff, "%04d", asyn_info->chan);	/* Convert channel # to ASCII */
-    memcpy (asyn_info->chan_char, buff, sizeof (asyn_info->chan_char));
-
-    sprintf (buff, "%04d", AsynSrv_msec_tmo/100);   /* Set dflt time-out ..
-						    ** .. (deci-secs) */
-    memcpy (asyn_info->tmo, buff, sizeof (asyn_info->tmo));
-
-    memcpy (asyn_info->eot, AsynSrv_eot, sizeof (asyn_info->eot)); /* Set ..
-						** .. dflt terminator(s) */
-    asyn_info->max_replies = 0;
-    asyn_info->n_replies = 0;
-    asyn_info->idleHandler = NULL;
-		/*
-		** Send a null command buffer to the server. This should give
-		** a "protocol mismatch" error response and from this we can get
-		** the actual protocol level supported by the server.
-		*/
-    status = AsynSrv_SendCmnds (asyn_info, &s_buff, &r_buff, NULL);
-    if (!status && (AsynSrv_errcode == ASYNSRV__BAD_PROT_LVL)) {
-		    /*
-		    ** As expected, we got a "protocol mismatch" error.
-		    ** Save the server's protocol level for future use.
-		    */
-      memcpy (asyn_info->protocol_id, r_buff.s_pcol_lvl,
-		    sizeof (r_buff.s_pcol_lvl));
-      if (strncmp (r_buff.s_pcol_lvl, RS__PROTOCOL_ID_V01B,
-			strlen (RS__PROTOCOL_ID_V01B)) == 0) {
-	asyn_info->protocol_code = RS__PROTOCOL_CODE_V01B;
-	asyn_info->cmnd_hdr_len = 4;
-	strcpy (asyn_info->cmnd_fmt, "%04d");
-	asyn_info->rply_hdr_len = 4;
-	strcpy (asyn_info->rply_fmt, "%4d");
-      }else if (strncmp (r_buff.s_pcol_lvl, RS__PROTOCOL_ID,
-			strlen (RS__PROTOCOL_ID)) == 0) {
-	asyn_info->protocol_code = RS__PROTOCOL_CODE;
-	asyn_info->cmnd_hdr_len = 2;
-	strcpy (asyn_info->cmnd_fmt, "%02d");
-	asyn_info->rply_hdr_len = 2;
-	strcpy (asyn_info->rply_fmt, "%2d");
-      }else {
-	close (my_skt);
-	asyn_info->skt = 0;
-	fprintf (stderr,
-	    "\nAsynSrv_OpenNew: Server protocol level is unrecognised.\n"
-	    "       Server level is \"%4s\"\n", r_buff.s_pcol_lvl);
-	return False;
-      }
-    }else {
-      close (my_skt);
-      asyn_info->skt = 0;
-      AsynSrv_errcode = ASYNSRV__BAD_PROT_LVL;
-      fprintf (stderr,
-	"\nAsynSrv_OpenNew: Problem getting protocol level of Server!\n");
-      return False;
-    }
-		/*---------------------------------------------------
-		** Complete the setup of the connection table entry
-		*/
-    AsynSrv_HPS_list[AsynSrv_n_cnct].skt = my_skt;
-    AsynSrv_HPS_list[AsynSrv_n_cnct].protocol_code = asyn_info->protocol_code;
-    memcpy (AsynSrv_HPS_list[AsynSrv_n_cnct].protocol_id,
-		asyn_info->protocol_id, sizeof (asyn_info->protocol_id));
-    AsynSrv_HPS_list[AsynSrv_n_cnct].cmnd_hdr_len = asyn_info->cmnd_hdr_len;
-    AsynSrv_HPS_list[AsynSrv_n_cnct].rply_hdr_len = asyn_info->rply_hdr_len;
-    AsynSrv_HPS_list[AsynSrv_n_cnct].usage_cnt = 1;
-    AsynSrv_HPS_list[AsynSrv_n_cnct].status = 1;
-    AsynSrv_n_cnct++;
-
-    AsynSrv_active[AsynSrv_n_active] =	    /* Remember the open in case .. */
-		asyn_info;		    /* .. there's a force-exit */
-    AsynSrv_n_active++;
-
-    AsynSrv_errcode = AsynSrv_errno = AsynSrv_vaxc_errno = 0;
-    AsynSrv_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		AsynSrv_SendCmnds:  Send commands to RS232C server.
-*/
-  int	AsynSrv_SendCmnds (
-/*	=================
-*/		struct AsynSrv__info	*asyn_info,
-		struct RS__MsgStruct	*send_buff,
-		struct RS__RespStruct	*rcve_buff,
-		...) {		/* Now we have list of commands -
-				**   char *txt   = pntr to cmnd strng
-				** Terminate list with *txt = NULL.
-				*/
-    int			i, status, c_len, size, max_size, ncmnds;
-    int			bytes_to_come, bytes_left;
-    char		*nxt_byte_ptr;
-    char		err_text[80];
-    char		text[20];
-    va_list		ap;		/* Pointer to variable args */
-    char		*txt_ptr;
-    char		*cmnd_lst_ptr;
-		    /*----------------------------------------------
-		    ** Pre-set the routine name (in case of error)
-		    */
-    if (AsynSrv_errcode == 0 && AsynSrv_call_depth < 5) {
-      strcpy (AsynSrv_routine[AsynSrv_call_depth], "AsynSrv_SendCmnds");
-      AsynSrv_call_depth++;
-    }
-		    /*----------------------------------------------
-		    ** Do nothing if no connection - the connection gets
-		    ** closed if an error is detected. The connection may
-		    ** also be marked to have been forcefully closed.
-		    */
-    if (asyn_info->skt <= 0) {
-      memset (rcve_buff->msg_size,
-		    '0', sizeof (rcve_buff->msg_size));
-      if ((AsynSrv_errcode == 0) && (asyn_info->skt < 0)) {
-	AsynSrv_errcode = ASYNSRV__FORCED_CLOSED;
-      }
-      return False;
-    }
-		    /*----------------------------------------------
-		    ** Build message for server from the list of commands.
-		    */
-    asyn_info->max_replies = asyn_info->n_replies = 0;
-
-    asyn_info->msg_id++;		/* Set up an incrementing message id */
-    if (asyn_info->msg_id > 9999) asyn_info->msg_id = 1;
-    sprintf (send_buff->msg_id, "%04d", asyn_info->msg_id);
-
-    memcpy (send_buff->c_pcol_lvl, asyn_info->protocol_id,
-		sizeof (send_buff->c_pcol_lvl));
-
-    memcpy (send_buff->serial_port, asyn_info->chan_char,
-		sizeof (send_buff->serial_port));
-
-    memcpy (send_buff->tmo, asyn_info->tmo, sizeof (send_buff->tmo));
-
-    memcpy (send_buff->terms, asyn_info->eot, sizeof (send_buff->terms));
-
-    memcpy (send_buff->n_cmnds, "0000", sizeof (send_buff->n_cmnds));
-
-    va_start (ap, rcve_buff);		/* Set up var arg machinery */
-
-    txt_ptr = va_arg (ap, char *);	/* Get pntr to next cmnd string */
-    ncmnds = 0;
-    cmnd_lst_ptr = &send_buff->cmnds[0];
-    bytes_left = sizeof (*send_buff) -
-			    OffsetOf (struct RS__MsgStruct, cmnds[0]);
-
-    while (txt_ptr != NULL) {
-      c_len = strlen (txt_ptr);
-      size = asyn_info->cmnd_hdr_len + c_len;
-      if (size > bytes_left) {
-	AsynSrv_errcode = ASYNSRV__BAD_SEND_LEN;	/* Too much to send */
-	fprintf (stderr, "\nAsynSrv_SendCmnds/send: too much to send"
-				" - request ignored.\n");
-	memset (rcve_buff->msg_size, '0', sizeof (rcve_buff->msg_size));
-	return False;
-      }else {
-	sprintf (cmnd_lst_ptr, asyn_info->cmnd_fmt, c_len);
-	if (cmnd_lst_ptr[asyn_info->cmnd_hdr_len] != '\0') {
-	  AsynSrv_errcode = ASYNSRV__BAD_CMND_LEN;
-	  fprintf (stderr, "\nAsynSrv_SendCmnds/send: command too long -"
-				" - request ignored.\n");
-	  memset (rcve_buff->msg_size, '0', sizeof (rcve_buff->msg_size));
-	  return False;
-	}
-	cmnd_lst_ptr += asyn_info->cmnd_hdr_len;
-	strcpy (cmnd_lst_ptr, txt_ptr);
-	cmnd_lst_ptr += c_len;
-	ncmnds++;
-        bytes_left = bytes_left - size;
-	txt_ptr = va_arg (ap, char *);
-      }
-    }
-    sprintf (text, "%04d", ncmnds);
-    memcpy (send_buff->n_cmnds, text, sizeof (send_buff->n_cmnds));
-
-    size = cmnd_lst_ptr - send_buff->msg_id;
-    size = (size + 3) & (~3);	/* Round up to multiple of 4 */
-    sprintf (text, "%04d", size);
-    memcpy (send_buff->msg_size, text, sizeof (send_buff->msg_size));
-
-    size += sizeof (send_buff->msg_size);
-    status = send (asyn_info->skt,
-			(char *) send_buff, size, 0);
-    if (status != size) {
-      GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno);
-      if (status == 0) {
-	AsynSrv_errcode = ASYNSRV__BAD_SEND;	/* Server exited (probably) */
-	fprintf (stderr, "\nAsynSrv_SendCmnds/send: probable network problem");
-      }else if (status == -1) {
-	if (AsynSrv_errno == EPIPE) {
-	  AsynSrv_errcode = ASYNSRV__BAD_SEND_PIPE;	/* Server exited (probably) */
-	  fprintf (stderr, "\nAsynSrv_SendCmnds/send: broken network pipe");
-	}else {
-	  AsynSrv_errcode = ASYNSRV__BAD_SEND_NET; /* It's some other net problem */
-	  perror ("AsynSrv_SendCmnds/send");
-	}
-      }else {
-	AsynSrv_errcode = ASYNSRV__BAD_SEND_UNKN;		/* TCP/IP problems */
-	fprintf (stderr, "\nAsynSrv_SendCmnds/send: probable TCP/IP problem");
-      }
-      AsynSrv_Close (asyn_info, True);   /* Force close TCP/IP connection */
-      fprintf (stderr, " - link to server force-closed.\n");
-      return False;
-    }
-
-    if (asyn_info->idleHandler != NULL) {   /* MZ. */
-      sscanf(asyn_info->tmo, "%4d", &i);    /* Decode timeout from ASCII ..
-					    ** .. encoded deci-sec */
-      asyn_info->idleHandler (i*150, asyn_info->skt);	/* Wait for an event ..
-					    ** .. on asyn_info->skt or a ..
-					    ** .. timeout of 1.5*tmo */
-    }
-
-    size = sizeof (rcve_buff->msg_size);
-    status = recv (asyn_info->skt, rcve_buff->msg_size, size, 0);
-    if (status != size) {
-      GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno);
-      if (status == 0) {
-	AsynSrv_errcode = ASYNSRV__BAD_RECV;   	/* Server exited (probably) */
-	fprintf (stderr, "\nAsynSrv_SendCmnds/recv: probable network problem");
-      }else if (status == -1) {
-	if (AsynSrv_errno == EPIPE) {
-	  AsynSrv_errcode = ASYNSRV__BAD_RECV_PIPE;	/* Server exited (probably) */
-	  fprintf (stderr, "\nAsynSrv_SendCmnds/recv: broken network pipe");
-	}else {
-	  AsynSrv_errcode = ASYNSRV__BAD_RECV_NET;  /* It's some other net problem */
-	  perror ("AsynSrv_SendCmnds/recv");
-	}
-      }else {
-	AsynSrv_errcode = ASYNSRV__BAD_RECV_UNKN;		/* TCP/IP problems */
-	fprintf (stderr, "\nAsynSrv_SendCmnds/recv: probable TCP/IP problem");
-      }
-      AsynSrv_Close (asyn_info, True);   /* Force close TCP/IP connection */
-      fprintf (stderr, " - link to server force-closed.\n");
-      return False;
-    }
-    if (sscanf (rcve_buff->msg_size, "%4d", &bytes_to_come) != 1) {
-      AsynSrv_errcode = ASYNSRV__BAD_NOT_BCD;  /* Header not an ASCII BCD integer */
-      AsynSrv_Close (asyn_info, True);   /* Force close TCP/IP connection */
-      fprintf (stderr, "\nAsynSrv_SendCmnds/recv: non-BCD byte count"
-			    " - link to server force-closed.\n");
-      return False;
-    }
-    max_size = sizeof (*rcve_buff) - size;
-    if (bytes_to_come > max_size) {
-      AsynSrv_errcode = ASYNSRV__BAD_RECV_LEN;
-      fprintf (stderr, "\nAsynSrv_SendCmnds/recv: pending message length too big"
-			    " - flushing ...\n");
-      nxt_byte_ptr = &rcve_buff->msg_size[size];
-      while (bytes_to_come > 0) {	/* Flush out the incoming message */
-	bytes_left = bytes_to_come;
-	if (bytes_left > max_size) bytes_left = max_size;
-	status = recv (asyn_info->skt, nxt_byte_ptr, bytes_left, 0);
-	if (status <= 0) {
-	  AsynSrv_errcode = ASYNSRV__BAD_FLUSH; /* TCP/IP problem during flush */
-	  GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno);
-	  AsynSrv_Close (asyn_info, True);   /* Force close TCP/IP connection */
-	  fprintf (stderr, "\nAsynSrv_SendCmnds/recv: network problem during"
-		    " flush.\nLink to server force-closed.\n");
-	  return False;
-	}
-	bytes_to_come = bytes_to_come - status;
-      }
-      fprintf (stderr, "\n flushed OK.\n");
-      memset (rcve_buff->msg_size, '0', sizeof (rcve_buff->msg_size));
-      return False;
-    }else {
-      nxt_byte_ptr = &rcve_buff->msg_size[size];
-      bytes_left = bytes_to_come;
-      while (bytes_left > 0) {		/* Read the rest of the response */
-	status = recv (asyn_info->skt, nxt_byte_ptr, bytes_left, 0);
-	if (status <= 0) {
-	  GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno);
-	  if (status == 0) {
-	    AsynSrv_errcode = ASYNSRV__BAD_RECV1; /* Server exited (probably) */
-	    fprintf (stderr, "\nAsynSrv_SendCmnds/recv/1: probable network "
-				    "problem");
-	  }else {
-	    if (AsynSrv_errno == EPIPE) {
-	      AsynSrv_errcode = ASYNSRV__BAD_RECV1_PIPE; /* Server exited (probably) */
-	      fprintf (stderr, "\nAsynSrv_SendCmnds/recv/1: broken network pipe");
-	    }else {
-	      AsynSrv_errcode = ASYNSRV__BAD_RECV1_NET; /* It's some other net fault */
-	      perror ("AsynSrv_SendCmnds/recv/1");
-	    }
-	  }
-	  AsynSrv_Close (asyn_info, True); /* Force close TCP/IP connection */
-	  fprintf (stderr, " - link to server force-closed.\n");
-	  return False;
-        }
-	bytes_left   = bytes_left   - status;
-	nxt_byte_ptr = nxt_byte_ptr + status;
-      }
-      if (strncmp (asyn_info->protocol_id, rcve_buff->s_pcol_lvl,
-	    sizeof (rcve_buff->s_pcol_lvl)) != 0) {
-	AsynSrv_errcode = ASYNSRV__BAD_PROT_LVL;   /* Protocol level is bad */
-	return False;
-      }
-      if ((sscanf (rcve_buff->n_rply, "%4d", &asyn_info->max_replies) != 1) ||
-	  (asyn_info->max_replies < 0)) {
-	AsynSrv_errcode = ASYNSRV__BAD_REPLY;   /* Reply is bad */
-	if (AsynSrv_call_depth < 5) {	    /* Add reply to routine stack */
-	  bytes_to_come = bytes_to_come + 4;
-	  if (bytes_to_come >= sizeof (AsynSrv_routine[0]))
-		bytes_to_come = sizeof (AsynSrv_routine[0]) - 1;
-	  for (i=0; i<bytes_to_come; i++) {
-	    if (rcve_buff->msg_size[i] == '\0')
-		    rcve_buff->msg_size[i] = '.';
-	  }
-	  rcve_buff->msg_size[bytes_to_come] = '\0';
-	  strcpy (AsynSrv_routine[AsynSrv_call_depth], rcve_buff->msg_size);
-	  AsynSrv_call_depth++;
-	}
-	return False;
-      }
-    }
-    if (AsynSrv_errcode == 0) AsynSrv_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		AsynSrv_SendCmndsBig:  Same as AsynSrv_SendCmnds but with
-**					user defined buffer sizes.
-*/
-  int	AsynSrv_SendCmndsBig (
-/*	====================
-*/		struct AsynSrv__info	*asyn_info,
-		struct RS__MsgStruct	*send_buff,
-		int			 send_buff_size,
-		struct RS__RespStruct	*rcve_buff,
-		int			 rcve_buff_size,
-		...) {		/* Now we have list of commands -
-				**   char *txt   = pntr to cmnd strng
-				** Terminate list with *txt = NULL.
-				*/
-    int			i, status, size, max_size, ncmnds;
-    int			bytes_to_come, bytes_left;
-    char		*nxt_byte_ptr;
-    char		err_text[80];
-    char		text[20];
-    va_list		ap;		/* Pointer to variable args */
-    int			*c_len, s_len;
-    char		*txt_ptr;
-    char		*cmnd_lst_ptr;
-		    /*----------------------------------------------
-		    ** Pre-set the routine name (in case of error)
-		    */
-    if (AsynSrv_errcode == 0 && AsynSrv_call_depth < 5) {
-      strcpy (AsynSrv_routine[AsynSrv_call_depth], "AsynSrv_SendCmndsBig");
-      AsynSrv_call_depth++;
-    }
-		    /*----------------------------------------------
-		    ** Do nothing if no connection - the connection gets
-		    ** closed if an error is detected. The connection may
-		    ** also be marked to have been forcefully closed.
-		    */
-    if (asyn_info->skt <= 0) {
-      memset (rcve_buff->msg_size,
-		    '0', sizeof (rcve_buff->msg_size));
-      if ((AsynSrv_errcode == 0) && (asyn_info->skt < 0)) {
-	AsynSrv_errcode = ASYNSRV__FORCED_CLOSED;
-      }
-      return False;
-    }
-		    /*----------------------------------------------
-		    ** Build message for server from the list of commands.
-		    */
-    if (send_buff_size < 64 || rcve_buff_size < 64) {
-      AsynSrv_errcode = ASYNSRV__BAD_PAR; return False;}
-
-    asyn_info->max_replies = asyn_info->n_replies = 0;
-
-    asyn_info->msg_id++;		/* Set up an incrementing message id */
-    if (asyn_info->msg_id > 9999) asyn_info->msg_id = 1;
-    sprintf (send_buff->msg_id, "%04d", asyn_info->msg_id);
-
-    memcpy (send_buff->c_pcol_lvl, asyn_info->protocol_id,
-		sizeof (send_buff->c_pcol_lvl));
-
-    memcpy (send_buff->serial_port, asyn_info->chan_char,
-		sizeof (send_buff->serial_port));
-
-    memcpy (send_buff->tmo, asyn_info->tmo, sizeof (send_buff->tmo));
-
-    memcpy (send_buff->terms, asyn_info->eot, sizeof (send_buff->terms));
-
-    memcpy (send_buff->n_cmnds, "0000", sizeof (send_buff->n_cmnds));
-
-    va_start (ap, rcve_buff_size);		/* Set up var arg machinery */
-
-    c_len = va_arg (ap, int *);	    /* Get pntr to length of next cmnd string */
-    ncmnds = 0;
-    cmnd_lst_ptr = &send_buff->cmnds[0];
-    bytes_left = send_buff_size -
-			    OffsetOf (struct RS__MsgStruct, cmnds[0]);
-
-    while (c_len != NULL) {
-      txt_ptr = va_arg (ap, char *);
-      s_len = *c_len;
-      if (s_len <= 0) s_len = strlen (txt_ptr);
-      size = asyn_info->cmnd_hdr_len + s_len;
-      if (size > bytes_left) {
-	AsynSrv_errcode = ASYNSRV__BAD_SEND_LEN;	/* Too much to send */
-	fprintf (stderr, "\nAsynSrv_SendCmndsBig/send: too much to send"
-				" - request ignored.\n");
-	memset (rcve_buff->msg_size, '0', sizeof (rcve_buff->msg_size));
-	return False;
-      }
-      sprintf (cmnd_lst_ptr, asyn_info->cmnd_fmt, s_len);
-      if (cmnd_lst_ptr[asyn_info->cmnd_hdr_len] != '\0') {
-	AsynSrv_errcode = ASYNSRV__BAD_CMND_LEN;
-	fprintf (stderr, "\nAsynSrv_SendCmndsBig/send: command too long -"
-				" - request ignored.\n");
-	memset (rcve_buff->msg_size, '0', sizeof (rcve_buff->msg_size));
-	return False;
-      }
-      cmnd_lst_ptr += asyn_info->cmnd_hdr_len;
-      memcpy (cmnd_lst_ptr, txt_ptr, s_len);
-      cmnd_lst_ptr += s_len;
-      ncmnds++;
-      bytes_left = bytes_left - size;
-      c_len = va_arg (ap, int *);
-    }
-    sprintf (text, "%04d", ncmnds);
-    memcpy (send_buff->n_cmnds, text, sizeof (send_buff->n_cmnds));
-
-    size = cmnd_lst_ptr - send_buff->msg_id;
-    size = (size + 3) & (~3);	/* Round up to multiple of 4 */
-    sprintf (text, "%04d", size);
-    memcpy (send_buff->msg_size, text, sizeof (send_buff->msg_size));
-
-    size += sizeof (send_buff->msg_size);
-    status = send (asyn_info->skt,
-			(char *) send_buff, size, 0);
-    if (status != size) {
-      GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno);
-      if (status == 0) {
-	AsynSrv_errcode = ASYNSRV__BAD_SEND;	/* Server exited (probably) */
-	fprintf (stderr, "\nAsynSrv_SendCmndsBig/send: probable network problem");
-      }else if (status == -1) {
-	if (AsynSrv_errno == EPIPE) {
-	  AsynSrv_errcode = ASYNSRV__BAD_SEND_PIPE;	/* Server exited (probably) */
-	  fprintf (stderr, "\nAsynSrv_SendCmndsBig/send: broken network pipe");
-	}else {
-	  AsynSrv_errcode = ASYNSRV__BAD_SEND_NET; /* It's some other net problem */
-	  perror ("AsynSrv_SendCmndsBig/send");
-	}
-      }else {
-	AsynSrv_errcode = ASYNSRV__BAD_SEND_UNKN;		/* TCP/IP problems */
-	fprintf (stderr, "\nAsynSrv_SendCmndsBig/send: probable TCP/IP problem");
-      }
-      AsynSrv_Close (asyn_info, True);   /* Force close TCP/IP connection */
-      fprintf (stderr, " - link to server force-closed.\n");
-      return False;
-    }
-
-    size = sizeof (rcve_buff->msg_size);
-    status = recv (asyn_info->skt, rcve_buff->msg_size, size, 0);
-    if (status != size) {
-      GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno);
-      if (status == 0) {
-	AsynSrv_errcode = ASYNSRV__BAD_RECV;   	/* Server exited (probably) */
-	fprintf (stderr, "\nAsynSrv_SendCmndsBig/recv: probable network problem");
-      }else if (status == -1) {
-	if (AsynSrv_errno == EPIPE) {
-	  AsynSrv_errcode = ASYNSRV__BAD_RECV_PIPE;	/* Server exited (probably) */
-	  fprintf (stderr, "\nAsynSrv_SendCmndsBig/recv: broken network pipe");
-	}else {
-	  AsynSrv_errcode = ASYNSRV__BAD_RECV_NET;  /* It's some other net problem */
-	  perror ("AsynSrv_SendCmndsBig/recv");
-	}
-      }else {
-	AsynSrv_errcode = ASYNSRV__BAD_RECV_UNKN;		/* TCP/IP problems */
-	fprintf (stderr, "\nAsynSrv_SendCmndsBig/recv: probable TCP/IP problem");
-      }
-      AsynSrv_Close (asyn_info, True);   /* Force close TCP/IP connection */
-      fprintf (stderr, " - link to server force-closed.\n");
-      return False;
-    }
-    if (sscanf (rcve_buff->msg_size, "%4d", &bytes_to_come) != 1) {
-      AsynSrv_errcode = ASYNSRV__BAD_NOT_BCD;  /* Header not an ASCII BCD integer */
-      AsynSrv_Close (asyn_info, True);   /* Force close TCP/IP connection */
-      fprintf (stderr, "\nAsynSrv_SendCmndsBig/recv: non-BCD byte count"
-			    " - link to server force-closed.\n");
-      return False;
-    }
-    max_size = rcve_buff_size - size;
-    if (bytes_to_come > max_size) {
-      AsynSrv_errcode = ASYNSRV__BAD_RECV_LEN;
-      fprintf (stderr, "\nAsynSrv_SendCmndsBig/recv: pending message length "
-			    "too big - flushing ...\n");
-      nxt_byte_ptr = &rcve_buff->msg_size[size];
-      while (bytes_to_come > 0) {	/* Flush out the incoming message */
-	bytes_left = bytes_to_come;
-	if (bytes_left > max_size) bytes_left = max_size;
-	status = recv (asyn_info->skt, nxt_byte_ptr, bytes_left, 0);
-	if (status <= 0) {
-	  AsynSrv_errcode = ASYNSRV__BAD_FLUSH; /* TCP/IP problem during flush */
-	  GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno);
-	  AsynSrv_Close (asyn_info, True);   /* Force close TCP/IP connection */
-	  fprintf (stderr, "\nAsynSrv_SendCmndsBig/recv: network problem during"
-		    " flush.\nLink to server force-closed.\n");
-	  return False;
-	}
-	bytes_to_come = bytes_to_come - status;
-      }
-      fprintf (stderr, "\n flushed OK.\n");
-      memset (rcve_buff->msg_size, '0', sizeof (rcve_buff->msg_size));
-      return False;
-    }else {
-      nxt_byte_ptr = &rcve_buff->msg_size[size];
-      bytes_left = bytes_to_come;
-      while (bytes_left > 0) {		/* Read the rest of the response */
-	status = recv (asyn_info->skt, nxt_byte_ptr, bytes_left, 0);
-	if (status <= 0) {
-	  GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno);
-	  if (status == 0) {
-	    AsynSrv_errcode = ASYNSRV__BAD_RECV1; /* Server exited (probably) */
-	    fprintf (stderr, "\nAsynSrv_SendCmndsBig/recv/1: probable network "
-				    "problem");
-	  }else {
-	    if (AsynSrv_errno == EPIPE) {
-	      AsynSrv_errcode = ASYNSRV__BAD_RECV1_PIPE; /* Server exited (probably) */
-	      fprintf (stderr, "\nAsynSrv_SendCmndsBig/recv/1: broken network pipe");
-	    }else {
-	      AsynSrv_errcode = ASYNSRV__BAD_RECV1_NET; /* It's some other net fault */
-	      perror ("AsynSrv_SendCmndsBig/recv/1");
-	    }
-	  }
-	  AsynSrv_Close (asyn_info, True); /* Force close TCP/IP connection */
-	  fprintf (stderr, " - link to server force-closed.\n");
-	  return False;
-        }
-	bytes_left   = bytes_left   - status;
-	nxt_byte_ptr = nxt_byte_ptr + status;
-      }
-      if (strncmp (asyn_info->protocol_id, rcve_buff->s_pcol_lvl,
-	    sizeof (rcve_buff->s_pcol_lvl)) != 0) {
-	AsynSrv_errcode = ASYNSRV__BAD_PROT_LVL;   /* Protocol level is bad */
-	return False;
-      }
-      if ((sscanf (rcve_buff->n_rply, "%4d", &asyn_info->max_replies) != 1) ||
-	  (asyn_info->max_replies < 0)) {
-	AsynSrv_errcode = ASYNSRV__BAD_REPLY;   /* Reply is bad */
-	if (AsynSrv_call_depth < 5) {	    /* Add reply to routine stack */
-	  bytes_to_come = bytes_to_come + 4;
-	  if (bytes_to_come >= sizeof (AsynSrv_routine[0]))
-		bytes_to_come = sizeof (AsynSrv_routine[0]) - 1;
-	  for (i=0; i<bytes_to_come; i++) {
-	    if (rcve_buff->msg_size[i] == '\0')
-		    rcve_buff->msg_size[i] = '.';
-	  }
-	  rcve_buff->msg_size[bytes_to_come] = '\0';
-	  strcpy (AsynSrv_routine[AsynSrv_call_depth], rcve_buff->msg_size);
-	  AsynSrv_call_depth++;
-	}
-	return False;
-      }
-    }
-    if (AsynSrv_errcode == 0) AsynSrv_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		AsynSrv_SendSpecCmnd:  Send a "special" command to an
-**					RS232C server.
-*/
-  int	AsynSrv_SendSpecCmnd (
-/*	====================
-*/		struct AsynSrv__info	*asyn_info,
-		char			*cmnd) {
-
-    int			status;
-    char		rply[8];
-		    /*----------------------------------------------
-		    ** Pre-set the routine name (in case of error)
-		    */
-    if (AsynSrv_errcode == 0 && AsynSrv_call_depth < 5) {
-      strcpy (AsynSrv_routine[AsynSrv_call_depth], "AsynSrv_SendSpecCmnd");
-      AsynSrv_call_depth++;
-    }
-		    /*----------------------------------------------
-		    ** Do nothing if no connection - the connection gets
-		    ** closed if an error is detected. The connection may
-		    ** also be marked to have been forcefully closed.
-		    */
-    if (asyn_info->skt <= 0) {
-      if ((AsynSrv_errcode == 0) && (asyn_info->skt < 0)) {
-	AsynSrv_errcode = ASYNSRV__FORCED_CLOSED;
-      }
-      return False;
-    }
-		    /*----------------------------------------------
-		    ** Send the message to the server.
-		    */
-    status = send (asyn_info->skt, cmnd, 4, 0);
-    if (status != 4) {
-      GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno);
-      if (status == 0) {
-	AsynSrv_errcode = ASYNSRV__BAD_SEND;	/* Server exited (probably) */
-	fprintf (stderr, "\nAsynSrv_SendSpecCmnd/send: probable network problem");
-      }else if (status == -1) {
-	if (AsynSrv_errno == EPIPE) {
-	  AsynSrv_errcode = ASYNSRV__BAD_SEND_PIPE;	/* Server exited (probably) */
-	  fprintf (stderr, "\nAsynSrv_SendSpecCmnd/send: broken network pipe");
-	}else {
-	  AsynSrv_errcode = ASYNSRV__BAD_SEND_NET; /* It's some other net problem */
-	  perror ("AsynSrv_SendSpecCmnd/send");
-	}
-      }else {
-	AsynSrv_errcode = ASYNSRV__BAD_SEND_UNKN;		/* TCP/IP problems */
-	fprintf (stderr, "\nAsynSrv_SendSpecCmnd/send: probable TCP/IP problem");
-      }
-      AsynSrv_Close (asyn_info, True);   /* Force close TCP/IP connection */
-      fprintf (stderr, " - link to server force-closed.\n");
-      return False;
-    }
-
-    status = recv (asyn_info->skt, rply, 4, 0);
-    if (status != 4) {
-      GetErrno (&AsynSrv_errno, &AsynSrv_vaxc_errno);
-      if (status == 0) {
-	AsynSrv_errcode = ASYNSRV__BAD_RECV;   	/* Server exited (probably) */
-	fprintf (stderr, "\nAsynSrv_SendSpecCmnd/recv: probable network problem");
-      }else if (status == -1) {
-	if (AsynSrv_errno == EPIPE) {
-	  AsynSrv_errcode = ASYNSRV__BAD_RECV_PIPE;	/* Server exited (probably) */
-	  fprintf (stderr, "\nAsynSrv_SendSpecCmnd/recv: broken network pipe");
-	}else {
-	  AsynSrv_errcode = ASYNSRV__BAD_RECV_NET;  /* It's some other net problem */
-	  perror ("AsynSrv_SendSpecCmnd/recv");
-	}
-      }else {
-	AsynSrv_errcode = ASYNSRV__BAD_RECV_UNKN;		/* TCP/IP problems */
-	fprintf (stderr, "\nAsynSrv_SendSpecCmnd/recv: probable TCP/IP problem");
-      }
-      AsynSrv_Close (asyn_info, True);   /* Force close TCP/IP connection */
-      fprintf (stderr, " - link to server force-closed.\n");
-      return False;
-    }
-    if (memcmp (cmnd, rply, 4) != 0) {
-      AsynSrv_errcode = ASYNSRV__BAD_NOT_BCD;  /* Message not echoed OK */
-      AsynSrv_Close (asyn_info, True);   /* Force close TCP/IP connection */
-      fprintf (stderr, "\nAsynSrv_SendSpecCmnd/recv: command not echoed correctly"
-			    " - link to server force-closed.\n");
-      return False;
-    }
-    if (AsynSrv_errcode == 0) AsynSrv_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		AsynSrv_Trace:  Send a "TRACE" request to RS232C server.
-*/
-  int	AsynSrv_Trace (
-/*	=============
-*/		struct AsynSrv__info	*asyn_info,
-		int			 state) {
-
-    int			status;
-    char		cmnd[8], rply[8];
-		    /*----------------------------------------------
-		    ** Pre-set the routine name (in case of error)
-		    */
-    if (AsynSrv_errcode == 0 && AsynSrv_call_depth < 5) {
-      strcpy (AsynSrv_routine[AsynSrv_call_depth], "AsynSrv_Trace");
-      AsynSrv_call_depth++;
-    }
-		    /*----------------------------------------------
-		    ** Do nothing if no connection - the connection gets
-		    ** closed if an error is detected. The connection may
-		    ** also be marked to have been forcefully closed.
-		    */
-    if (asyn_info->skt <= 0) {
-      if ((AsynSrv_errcode == 0) && (asyn_info->skt < 0)) {
-	AsynSrv_errcode = ASYNSRV__FORCED_CLOSED;
-      }
-      return False;
-    }
-		    /*----------------------------------------------
-		    ** Select message for server according to value of state.
-		    */
-    if (state) {
-      strcpy (cmnd, "-002");
-    }else {
-      strcpy (cmnd, "-003");
-    }
-		    /*----------------------------------------------
-		    ** Send message and get reply.
-		    */
-    status = AsynSrv_SendSpecCmnd (asyn_info, cmnd);
-
-    if (AsynSrv_errcode == 0) AsynSrv_call_depth--;
-    return status;
-  }
-/*
-**---------------------------------------------------------------------------
-**		AsynSrv_Trace_Write:  Send a Trace_Write command to
-**					RS232C server.
-*/
-  int	AsynSrv_Trace_Write (
-/*	===================
-*/		struct AsynSrv__info	*asyn_info) {
-
-    int			status;
-    char		cmnd[8], rply[8];
-		    /*----------------------------------------------
-		    ** Pre-set the routine name (in case of error)
-		    */
-    if (AsynSrv_errcode == 0 && AsynSrv_call_depth < 5) {
-      strcpy (AsynSrv_routine[AsynSrv_call_depth], "AsynSrv_Trace_Write");
-      AsynSrv_call_depth++;
-    }
-		    /*----------------------------------------------
-		    ** Do nothing if no connection - the connection gets
-		    ** closed if an error is detected. The connection may
-		    ** also be marked to have been forcefully closed.
-		    */
-    if (asyn_info->skt <= 0) {
-      if ((AsynSrv_errcode == 0) && (asyn_info->skt < 0)) {
-	AsynSrv_errcode = ASYNSRV__FORCED_CLOSED;
-      }
-      return False;
-    }
-		    /*----------------------------------------------
-		    ** Send message and get reply.
-		    */
-    status = AsynSrv_SendSpecCmnd (asyn_info, "-005");
-
-    if (AsynSrv_errcode == 0) AsynSrv_call_depth--;
-    return status;
-  }
-/*-------------------------------------------- End of AsynSrv_Utility.C -----*/
diff --git a/hardsup/c_interfaces.c b/hardsup/c_interfaces.c
deleted file mode 100644
index a514c64d..00000000
--- a/hardsup/c_interfaces.c
+++ /dev/null
@@ -1,472 +0,0 @@
-#define	    ident	"1A05"
-#ifdef VAXC
-#module	    C_INTERFACES	ident
-#endif
-#ifdef __DECC
-#pragma	    module	    C_INTERFACES	ident
-#endif
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     Computing Section                        |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...LIB.SINQ]C_INTERFACES.C
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Nov 1993
-**
-**  C_INTERFACES.C provides some routines which make it easier for C programs
-**  to call some of the Fortran routines in SINQ.OLB.
-**
-**  To include this module in SINQ.OLB, use:
-
-  $ import tasmad
-  $ define/job sinq_c_tlb mad_lib:sinq_c_tlb.tlb
-  $ define/job sinq_olb   mad_lib:sinq.olb
-  $ @lnsa09::tasmad_disk:[mad.psi.lib.sinq]sinq_olb c_interfaces debug
-  $
-  $ define/job sinq_olb   mad_lib:sinq.olb
-  $ @lnsa09::tasmad_disk:[mad.psi.lib.sinq]sinq_olb c_interfaces
-
-**
-** Updates:
-**  1A01 16-Nov-1993 DM.	Initial version.
-**  1A02 24-Nov-1994 DM.	Make compatible with DEC C (as opposed to VAX C)
-**  1A03 28-Nov-1994 DM.	Add the TT_PORT_... entry points.
-**====================================================================
-** The following entry pointd are included:
-**  C_log_arr_get	: interface routine from C to LOG_ARR_GET.
-**  C_log_flt_get	: interface routine from C to LOG_FLT_GET.
-**  C_log_int_get	: interface routine from C to LOG_INT_GET.
-**  C_log_str_get	: interface routine from C to LOG_STR_GET.
-**
-**  C_str_edit		: interface routine to STR_EDIT.
-**
-**  C_tt_port_connect	: interface routine to TT_PORT_CONNECT.
-**  C_tt_port_disconnect: interface routine to TT_PORT_DISCONNECT.
-**  C_tt_port_io	: interface routine to TT_PORT_IO.
-**  C_tt_port_config	: interface routine to TT_PORT_CONFIG.
-**====================================================================
-**			Global Definitions
-*/
-#ifdef VAXC
-#include    stdio
-#include    descrip
-#include    string
-#include    sinq_prototypes
-#else
-#include    <stdio.h>
-#include    <sys/descrip.h>
-#include    <sys/string.h>
-#include    <sinq_prototypes.h>
-#endif
-/*--------------------------------------------------------------------------
-**			Global Variables
-*/
-    extern int				C_gbl_status = 0;
-    extern struct dsc$descriptor_s	C_name_desc = {0,
-						     DSC$K_DTYPE_T,
-						     DSC$K_CLASS_S,
-						     0};
-/*--------------------------------------------------------------------------
-**				Old-style prototypes of routines which we are
-**				bridging to.
-*/
-    int	    log_arr_get ();
-    int	    log_int_get ();
-    int	    log_flt_get ();
-    int	    log_str_get ();
-
-    int	    str_edit ();
-
-    int	    tt_port_connect ();
-    int	    tt_port_disconnect ();
-    int	    tt_port_io ();
-    int	    tt_port_config ();
-/*--------------------------------------------------------------------------*/
-  int C_log_arr_get (char *name, int arr_size, int *value, int indx) {
-/*    =============
-**
-**	    This routine is useful for calling LOG_ARR_GET from a C program.
-**
-**  Inputs:
-**	name	    - a pointer to the zero-terminated logical name.
-**	arr_size    - the number of elements in the array value.
-**	indx	    - the index of the logical name.
-**  Outputs:
-**	value	    - an array of size arr_size set to the values converted
-**			    to binary.
-**  Return status:
-**	the return status of the function is zero (false) if LOG_ARR_GET
-**	    returns an error (even) condition code.
-**  Global variables:
-**	C_gbl_status  - set to the VAX/VMS return status of LOG_ARR_GET.
-**	C_name_desc   - set up as a string descriptor for name. It can
-**		    be used to generate an error message if return status == 0.
-*/
-    C_name_desc.dsc$w_length  = strlen (name);
-    C_name_desc.dsc$a_pointer = name;
-
-    C_gbl_status = log_arr_get (&C_name_desc, &arr_size, value, &indx);
-
-    return (C_gbl_status & 1);
-  }
-/*--------------------------------------------------------------------------*/
-  int C_log_int_get (char *name, long int *value, int indx) {
-/*    =============
-**
-**	    This routine is useful for calling LOG_INT_GET from a C program.
-**
-**  Inputs:
-**	name	    - a pointer to the zero-terminated logical name.
-**	indx	    - the index of the logical name.
-**  Outputs:
-**	value	    - the value of the logical converted to binary.
-**  Return status:
-**	the return status of the function is zero (false) if LOG_INT_GET
-**	    returns an error (even) condition code.
-**  Global variables:
-**	C_gbl_status  - set to the VAX/VMS return status of LOG_INT_GET.
-**	C_name_desc   - set up as a string descriptor for name. It can
-**		    be used to generate an error message if return status == 0.
-*/
-    C_name_desc.dsc$w_length  = strlen (name);
-    C_name_desc.dsc$a_pointer = name;
-
-    C_gbl_status = log_int_get (&C_name_desc, value, &indx);
-
-    return (C_gbl_status & 1);
-  }
-/*--------------------------------------------------------------------------*/
-  int C_log_flt_get (char *name, float *value, int indx) {
-/*    =============
-**
-**	    This routine is useful for calling LOG_FLT_GET from a C program.
-**
-**  Inputs:
-**	name	    - a pointer to the zero-terminated logical name.
-**	indx	    - the index of the logical name.
-**  Outputs:
-**	value	    - the value of the logical converted to binary.
-**  Return status:
-**	the return status of the function is zero (false) if LOG_FLT_GET
-**	    returns an error (even) condition code.
-**  Global variables:
-**	C_gbl_status  - set to the VAX/VMS return status of LOG_FLT_GET.
-**	C_name_desc   - set up as a string descriptor for name. It can
-**		    be used to generate an error message if return status == 0.
-*/
-    C_name_desc.dsc$w_length  = strlen (name);
-    C_name_desc.dsc$a_pointer = name;
-
-    C_gbl_status = log_flt_get (&C_name_desc, value, &indx);
-
-    return (C_gbl_status & 1);
-  }
-/*--------------------------------------------------------------------------*/
-  int C_log_str_get (char *name, char *value, int val_size, int indx) {
-/*    =============
-**
-**	    This routine is useful for calling LOG_STR_GET from a C program.
-**
-**  Inputs:
-**	name	    - a pointer to the zero-terminated logical name.
-**	val_size    - the size of the value string.
-**	indx	    - the index of the logical name.
-**  Outputs:
-**	value	    - zero-terminated string giving the value of the logical.
-**			Trailing space characters will have been stripped.
-**  Return status:
-**	the return status of the function is zero (false) if LOG_STR_GET
-**	    returns an error (even) condition code.
-**  Global variables:
-**	C_gbl_status  - set to the VAX/VMS return status of LOG_STR_GET.
-**	C_name_desc   - set up as a string descriptor for name. It can
-**		    be used to generate an error message if return status == 0.
-*/
-    struct dsc$descriptor_s	my_val_desc =	{0,
-						 DSC$K_DTYPE_T,
-						 DSC$K_CLASS_S,
-						 0};
-
-    C_name_desc.dsc$w_length  = strlen (name);
-    C_name_desc.dsc$a_pointer = name;
-
-    my_val_desc.dsc$w_length  = val_size - 1;
-    my_val_desc.dsc$a_pointer = value;
-
-    C_gbl_status = log_str_get (&C_name_desc, &my_val_desc, &indx);
-    value[val_size - 1] = 0;	/* Zero-terminate the string */
-
-    if (C_gbl_status & 1) {	/* If success, strip trailing spaces */
-      while ((strlen (value) > 0) && (value[strlen (value) - 1] == ' ')) {
-        value[strlen (value) - 1] = 0;
-      }
-    }
-    return (C_gbl_status & 1);
-  }
-/*--------------------------------------------------------------------------*/
-  int C_str_edit (char *out, char *in, char *ctrl, int *length) {
-/*    ==========
-**
-**	    This routine is useful for calling STR_EDIT from a C program.
-**
-**  Inputs:
-**	in	    - the string to be edited.
-**	ctrl	    - the string specifying what editing is to be done.
-**  Outputs:
-**	out	    - the edited string. The maximum size of this string must
-**			be specified as input parameter *length. The string
-**			will be zero terminated on return.
-**  Modified:
-**	*length	    - an integer specifying, on input, the length of "out" in
-**		      bytes. This must include room for the zero termination.
-**		      On return, length will be set to the number of characters
-**		      copied to "out" (not counting the zero termination byte).
-**  Return status:
-**	the return status of the function is zero (false) if STR_EDIT
-**	    returns an error (even) condition code.
-**  Global variables:
-**	C_gbl_status  - set to the VAX/VMS return status of STR_EDIT.
-*/
-    struct dsc$descriptor_s	out_desc =	{0,
-						 DSC$K_DTYPE_T,
-						 DSC$K_CLASS_S,
-						 0};
-    struct dsc$descriptor_s	in_desc =	{0,
-						 DSC$K_DTYPE_T,
-						 DSC$K_CLASS_S,
-						 0};
-    struct dsc$descriptor_s	ctrl_desc =	{0,
-						 DSC$K_DTYPE_T,
-						 DSC$K_CLASS_S,
-						 0};
-
-    out_desc.dsc$w_length  = *length - 1;
-    out_desc.dsc$a_pointer = out;
-
-    in_desc.dsc$w_length  = strlen (in);
-    in_desc.dsc$a_pointer = in;
-
-    ctrl_desc.dsc$w_length  = strlen (ctrl);
-    ctrl_desc.dsc$a_pointer = ctrl;
-
-    C_gbl_status = str_edit (&out_desc, &in_desc, &ctrl_desc, length);
-    if (*length >= 0) {	/* zero-terminate the output string */
-      out[*length] = '\0';
-    }else {
-      out[0] = '\0';
-    }
-
-    return (C_gbl_status & 1);
-  }
-/*--------------------------------------------------------------------------*/
-  int C_tt_port_connect (int *hndl, int *chan, char *lognam, char *pwd) {
-/*    =================
-**
-**	    This routine is useful for calling TT_PORT_CONNECT from a C program.
-**
-**  Inputs:
-**	lognam	    - a zero-terminated string specifying a logical name which
-**		      defines the RS-232-C port to be connected. See description
-**		      of TT_PORT_CONNECT for full details.
-**	pwd	    - a zero-terminated string specifying an optional password.
-**		      This is the password associated with a terminal server
-**		      service. See description of TT_PORT_CONNECT for full
-**		      details. Specify NULL if no password.
-**  Outputs:
-**	hndl	    - an integer handle identifying the connection. It will be
-**		      the address of a dynamically allocated data structure.
-**	chan	    - an integer (actually only 16 bit) giving the I/O channel
-**		      associated with the connection. This can be used in QIO
-**		      system calls to the terminal driver.
-**  Return status:
-**	the return status of the function is zero (false) if TT_PORT_CONNECT
-**	    returns an error (even) condition code.
-**  Global variables:
-**	C_gbl_status  - set to the VAX/VMS return status of TT_PORT_CONNECT.
-*/
-    struct dsc$descriptor_s		lognam_desc = {0,
-						     DSC$K_DTYPE_T,
-						     DSC$K_CLASS_S,
-						     0};
-    struct dsc$descriptor_s		pwd_desc = {0,
-						     DSC$K_DTYPE_T,
-						     DSC$K_CLASS_S,
-						     0};
-    lognam_desc.dsc$w_length  = strlen (lognam);
-    lognam_desc.dsc$a_pointer = lognam;
-
-    if (pwd != NULL) {
-      pwd_desc.dsc$w_length  = strlen (pwd);
-      pwd_desc.dsc$a_pointer = pwd;
-      C_gbl_status = tt_port_connect (
-				hndl, chan, &lognam_desc, &pwd_desc);
-    }else {
-      C_gbl_status = tt_port_connect (hndl, chan, &lognam_desc, NULL);
-    }
-
-    return (C_gbl_status & 1);
-  }
-/*--------------------------------------------------------------------------*/
-  int C_tt_port_disconnect (int *hndl) {
-/*    ====================
-**
-**	 This routine is useful for calling TT_PORT_DISCONNECT from a C program.
-**
-**  Inputs:
-**	hndl	    - the integer handle identifying the connection as returned
-**		      by C_tt_port_connect. It is the address of a dynamically
-**		      allocated data structure which will also be released
-**		      after the connection has been closed.
-**  Return status:
-**	the return status of the function is zero (false) if TT_PORT_DISCONNECT
-**	    returns an error (even) condition code.
-**  Global variables:
-**	C_gbl_status  - set to the VAX/VMS return status of TT_PORT_DISCONNECT.
-*/
-    C_gbl_status = tt_port_disconnect (hndl);
-
-    return (C_gbl_status & 1);
-  }
-/*--------------------------------------------------------------------------*/
-  int C_tt_port_io (
-/*    ============
-*/		    int *hndl,
-		    char *rqst,
-		    char *term,
-		    char *answ,
-		    int *answ_len,	/* Attention -- Read/Write argument!! */
-		    int flush,
-		    int tmo) {
-/*
-**	    This routine is useful for calling TT_PORT_IO from a C program.
-**	    Refer to the DELTAT.OLB description of TT_PORT_IO to clarify any
-**	    uncertainties in the following description. Note that all arguments
-**	    must be present (there is no portable method in C of getting the
-**	    number of arguments in the call!).
-**  Inputs:
-**	hndl	    - the integer handle identifying the connection as returned
-**		      by C_tt_port_connect.
-**	rqst	    - an optional zero-terminated string specifying a character
-**		      string to be sent to the port. Specify NULL to not send
-**		      any characters to the port.
-**	term	    - an optional zero-terminated string specifying a list of
-**		      terminating characters for input read from the port.
-**		      Specify NULL to terminate input on an exact character cnt.
-**	flush	    - an integer specifying if the type-ahead buffer should be
-**		      flushed before the operation. If non-zero, the buffer
-**		      is flushed.
-**	tmo	    - an integer (recommended value = 2) specifying a read
-**		      time-out in seconds. Zero or negative indicates infinity.
-**  Outputs:
-**	answ	    - an optional string buffer to receive characters read from
-**		      the port. If answ is not NULL, answ_len must also be
-**		      not NULL. On return, answ will be zero terminated. The
-**		      terminating character, if any (there is no terminating
-**		      char if the buffer overflows) and if there is room in
-**		      the buffer, will follow the zero character. No padding is
-**		      done. If answ is NULL, no characters are read from the
-**		      port.
-**  Modify:
-**	answ_len    - an integer specifying, on input, the length of answ in
-**		      bytes. This must include room for the zero termination.
-**		      On return, answ_len will be set to the number of
-**		      characters read (not counting the zero termination byte or
-**		      any terminating character).
-**  Return status:
-**	the return status of the function is zero (false) if TT_PORT_IO
-**	    returns an error (even) condition code.
-**  Global variables:
-**	C_gbl_status  - set to the VAX/VMS return status of TT_PORT_IO.
-*/
-    struct dsc$descriptor_s		rqst_desc = {0,
-						     DSC$K_DTYPE_T,
-						     DSC$K_CLASS_S,
-						     0};
-    struct dsc$descriptor_s		term_desc = {0,
-						     DSC$K_DTYPE_T,
-						     DSC$K_CLASS_S,
-						     0};
-    struct dsc$descriptor_s		answ_desc = {0,
-						     DSC$K_DTYPE_T,
-						     DSC$K_CLASS_S,
-						     0};
-    char    *my_rqst = NULL;
-    char    *my_term = NULL;
-    char    *my_answ = NULL;
-
-    int	    my_answ_len = 0;
-    int	    my_flush	= 1;
-    int	    my_tmo	= 2;
-
-    my_tmo = tmo;
-    if (my_tmo < 0) my_tmo = 0;
-    my_flush = flush;
-    if (my_flush != 0) my_flush = 1;
-    if (answ != NULL) {
-      if (answ_len == 0) {
-	printf ("C_tt_port_io -- argument error.\n");
-	printf ("                %s\n",
-			"answ_len must be present if answ is present.");
-	C_gbl_status = FALSE;
-	return FALSE;
-      }
-      answ_desc.dsc$w_length  = *answ_len - 1;
-      answ_desc.dsc$a_pointer = answ;
-    }
-    if (term != NULL) {
-      term_desc.dsc$w_length  = strlen (term);
-      term_desc.dsc$a_pointer = term;
-    }
-    if (rqst != NULL) {
-      rqst_desc.dsc$w_length  = strlen (rqst);
-      rqst_desc.dsc$a_pointer = rqst;
-    }
-    C_gbl_status = tt_port_io (hndl, &rqst_desc, &term_desc,
-				 &answ_desc, &my_answ_len, &my_flush, &my_tmo);
-    if (answ_desc.dsc$w_length > 0) {	/* Process any input string */
-      if (answ_desc.dsc$w_length > my_answ_len) {   /* Room for terminator? */
-        answ[my_answ_len+1] = answ[my_answ_len];    /* Yes, so move it.	*/
-      }
-      answ[my_answ_len] = '\0';	    /* Put in null terminator */
-      *answ_len = my_answ_len;	    /* Return value to caller */
-    }
-
-    return (C_gbl_status & 1);
-  }
-/*--------------------------------------------------------------------------*/
-  int C_tt_port_config (
-/*    ================
-*/		    int *hndl,
-		    int mask) {
-/*
-**	    This routine is useful for calling TT_PORT_CONFIG from a C program.
-**	    Refer to the DELTAT.OLB description of TT_PORT_CONFIG to clarify any
-**	    uncertainties in the following description.
-**  Inputs:
-**	hndl	    - the integer handle identifying the connection as returned
-**		      by C_tt_port_connect.
-**	mask	    - an integer specifying the configuration options. Set bits
-**			TT_PORT__NO_RETRY = 0x0001 to suppress retries on error
-**			TT_PORT__NO_SIG   = 0x0002 to suppress signals on error
-**  Outputs:
-**	None
-**  Modify:
-**	None
-**  Return status:
-**	always non-zero (true).
-**  Global variables:
-**	C_gbl_status  - set to the VAX/VMS return status of TT_PORT_CONFIG.
-*/
-    C_gbl_status = tt_port_config (hndl, &mask);
-
-    return (C_gbl_status & 1);
-  }
-/*=========================================== End of C_INTERFACES.C ========*/
diff --git a/hardsup/dillutil.c b/hardsup/dillutil.c
deleted file mode 100644
index c9e8c490..00000000
--- a/hardsup/dillutil.c
+++ /dev/null
@@ -1,481 +0,0 @@
-/*--------------------------------------------------------------------------
-
-                         D I L U T I L
-                       
-     A few utility functions for dealing with a Dillution emperature controller
-     CC0-510/AVSI
-     within the SINQ setup: host -- TCP/IP -- MAC --- RS-232.
-     
-     Mark Koennecke, October 1997
-
-       Copyright: see copyrigh.h
-----------------------------------------------------------------------------*/
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-#include "serialsinq.h"
-#include "dillutil.h"
-
-#ifdef FORTIFY
-#include "../fortify.h"
-#endif
-
-/* 
-#define debug 1
-*/
-/*-------------------------------------------------------------------------*/
-
-  int DILLU_Open(pDILLU *pData, char *pHost, int iPort, int iChannel, 
-                int iMode, char *pTransFile)
-  {
-     int iRet;
-     char pCommand[80];
-     char pReply[132];
-     pDILLU self = NULL;
-     pSTable pTable = NULL;
-     FILE *fd = NULL;
-     
-     /* check translation file first */
-     fd = fopen(pTransFile,"r");
-     if(!fd)
-     {
-       return DILLU__FILENOTFOUND;
-     }
-     fgets(pReply, 131,fd);
-     if(strstr(pReply,"DILLUTION") == NULL)
-     {
-       fclose(fd);
-       return DILLU__NODILLFILE;
-     }
-     
-     pTable = CreateTable(fd);
-     fclose(fd);
-     if(!pTable)
-     {
-       return DILLU__ERRORTABLE;
-     }
-     
-     /* allocate a new data structure */
-     self = (pDILLU)malloc(sizeof(DILLU));
-     if(self == NULL)
-     {
-       return DILLU__BADMALLOC;
-     }
-     
-     *pData = self;
-     self->pTranstable = pTable;
-     
-     iRet = SerialOpen(&self->pData, pHost, iPort, iChannel);
-     if(iRet != 1)
-     {
-        return iRet;
-     }
-
-     /* set an lengthy timeout for the configuration in order to
-        prevent problems.
-      */  
-     iRet = SerialConfig(&self->pData, 100);
-     if(iRet != 1)
-     {
-       return iRet;
-     }
-     
-      self->iReadOnly = iMode; 
-      if(!self->iReadOnly)
-      {
-        /* switch to remote operation */
-/*         iRet = SerialWriteRead(&self->pData,"C1\r\n",pReply,131);
-         if(iRet != 1)
-         { 
-           return iRet;
-         }
-*/             
-     }
-     return 1;
-  }  
-/*--------------------------------------------------------------------------*/
-  void DILLU_Close(pDILLU *pData)
-  {
-    char pReply[132];
-    int iRet;
-    pDILLU self;
-
-     self = *pData;
-
-     if(!self)
-       return;
-    
-    /* switch to local operation */
-    iRet = SerialWriteRead(&self->pData,"C0\r\n",pReply,131);
-    /* ignore errors on this one, the thing may be down */
-    
-    /* close connection */
-    SerialClose(&self->pData);
-    
-    /* free memory */
-    free(self);
-    *pData = NULL;
-  }  
-/*--------------------------------------------------------------------------*/
-  int DILLU_Config(pDILLU *pData, int iTmo)
-  {
-    int iRet;
-    char pReply[132];
-    char pCommand[10];
-    pDILLU self;
-
-     self = *pData;
-     
-     /* first timeout */
-     if(iTmo > 0)
-     {
-       iRet = SerialConfig(&self->pData, iTmo);
-       if(iRet < 0)
-       {
-	 return iRet;
-       }
-     }
-     return 1;
-  }  
-/*--------------------------------------------------------------------------*/
-  int DILLU_Send(pDILLU *pData, char *pCommand, char *pReply, int iLen)
-  {
-     pDILLU self;
-
-     self = *pData;
-
-     /* make sure, that there is a \r at the end of the command */
-     if(strchr(pCommand,(int)'\r') == NULL)
-     {
-       strcat(pCommand,"\r\n");
-     }
-     return SerialWriteRead(&self->pData,pCommand,pReply,iLen);
-  }  
-/*--------------------------------------------------------------------------*/
-  int DILLU_Read(pDILLU *pData, float *fVal)
-  {
-    char pCommand[10], pReply[132];
-    int iRet;
-    float fRead = -9999.;
-    float fOhm;
-    pDILLU self;
-
-     self = *pData;
-
-
-     /* send D command */
-     sprintf(pCommand,"D\r\n");
-     iRet = SerialWriteRead(&self->pData,pCommand,pReply,131);
-     if(iRet != 1)
-     {
-       return iRet;
-     }    
-   
-     /* read ohms */
-     iRet = sscanf(pReply,"%f",&fOhm);
-     if(iRet != 1)
-     {
-       return DILLU__BADREAD;
-     }
-     if(fOhm > 9999890.)
-     {
-       return DILLU__SILLYANSWER;
-     }
-
-     /* convert to K */
-     iRet = InterpolateVal2(self->pTranstable,fOhm,&fRead);
-     *fVal = fRead;
-     return 1;
-  }
-/*-------------------------------------------------------------------------*/
-  int DILLU_Set(pDILLU *pData, float fVal)
-  {
-     char pCommand[50], pReply[132];
-     int iRet, i,iRange, iExec;
-     const float fPrecision = 0.0001;
-     float fSet, fRead, fOhms, tmax, fTemp;
-     pDILLU self;
-
-     self = *pData;
-
-     if(self->iReadOnly)
-     {
-       return DILLU__READONLY;
-     }
-     
-     /* send D command to read current value*/
-     sprintf(pCommand,"D\r\n");
-     iRet = SerialWriteRead(&self->pData,pCommand,pReply,131);
-     if(iRet != 1)
-     {
-       return iRet;
-     }    
-   
-     /* read ohms */
-     iRet = sscanf(pReply,"%f",&fRead);
-     if(iRet != 1)
-     {
-       return DILLU__BADREAD;
-     }
-     if(fRead > 9999890.)
-     {
-       return DILLU__SILLYANSWER;
-     }
-     
-     
-     /* convert new set value to ohms */
-     iRet = InterpolateVal1(self->pTranstable,fVal,&fOhms);
-     if(!iRet)
-     {
-       return DILLU__OUTOFRANGE;
-     }
-
-     /* set to remote operation */
-#ifdef debug
-     printf("C1\n");
-#endif 
-     iRet = SerialWriteRead(&self->pData,"C1\r\n",pReply,131);
-     if(iRet != 1)
-     { 
-        return iRet;
-     }
-     
-     /* set heater power */
-     strcpy(pCommand,"G3\r");
-     if(fOhms > 1125)
-     {
-       strcpy(pCommand,"G2\r");
-     }
-     if(fOhms > 4000)
-       strcpy(pCommand,"G1\r");
-#ifdef debug
-     printf("A9\n");
-#endif         
-     iRet = SerialWriteRead(&self->pData,"A9\r",pReply,131);
-     if(iRet != 1)
-     {
-       return iRet;
-     }
-#ifdef debug
-     printf("%s\n",pCommand);
-#endif               
-     iRet = SerialWriteRead(&self->pData,pCommand,pReply,131);
-     if(iRet != 1)
-     {
-       return iRet;
-     }    
-     
-     /* Integrator time constant */
-     strcpy(pCommand,"G2\r");
-     if(fOhms > 200)
-        strcpy(pCommand,"G1\r");
-     if(fOhms > 2000)
-        strcpy(pCommand,"G0\r");
-     strcpy(pCommand,"G7\r");   
-     if(fOhms > 400.)
-     {
-       strcpy(pCommand,"G6\r");
-     }
-#ifdef debug
-     printf("A4\n");
-#endif     
-     iRet = SerialWriteRead(&self->pData,"A4\r",pReply,131);
-     if(iRet != 1)
-     {
-       return iRet;
-     }
-#ifdef debug
-     printf("%s\n",pCommand);
-#endif              
-     iRet = SerialWriteRead(&self->pData,pCommand,pReply,131);
-     if(iRet != 1)
-     {
-       return iRet;
-     }    
-     
-     /* derivator time constant */
-     if(fOhms > 1000.)
-     {
-       strcpy(pCommand,"G1\r");
-     }
-     else
-     {
-      strcpy(pCommand,"G2\r");
-     }
-#ifdef debug
-     printf("A5\n");
-#endif          
-     iRet = SerialWriteRead(&self->pData,"A5\r",pReply,131);
-     if(iRet != 1)
-     {
-       return iRet;
-     } 
-#ifdef debug
-     printf("%s\n",pCommand);
-     iRet = 1;
-#endif             
-     iRet = SerialWriteRead(&self->pData,pCommand,pReply,131);
-     if(iRet != 1)
-     {
-       return iRet;
-     }    
-
-     /* proportional gain */
-     if(fOhms > 500.)
-     {
-       strcpy(pCommand,"G3\r");
-     }
-     if(fOhms > 1000)
-     {
-       strcpy(pCommand,"G2\r");
-     }
-     if(fOhms > 2000)
-     {
-       strcpy(pCommand,"G1\r");
-     }
-#ifdef debug
-     printf("A6\n");
-#endif     
-     iRet = SerialWriteRead(&self->pData,"A6\r",pReply,131);
-     if(iRet != 1)
-     {
-       return iRet;
-     } 
-#ifdef debug
-     printf("%s\n",pCommand);
-#endif            
-     iRet = SerialWriteRead(&self->pData,pCommand,pReply,131);
-     if(iRet != 1)
-     {
-       return iRet;
-     }    
-     
-    /* range calculation a la Elsenhans */
-    iRange = 1;
-    fTemp = fOhms*10000.;
-    if( (fRead > 1.9) || (fOhms > 1.9) )
-    {
-       iRange = 2;
-       fTemp = fOhms*1000.;
-    }
-    if( (fRead > 19) || (fOhms > 19) )
-    {
-       iRange = 3;
-       fTemp = fOhms*100.;
-    }
-    if( (fRead > 190) || (fOhms > 190) )
-    {
-       iRange = 4;
-       fTemp = fOhms*10.;
-    }
-    if( (fRead > 750) || (fOhms > 750) )
-    {
-       iRange = 5;
-       fTemp = fOhms;
-    }
-    if( (fRead > 19000) || (fOhms > 19000) )
-    {
-       iRange = 6;
-       fTemp = fOhms/10.;
-    }
-    if( (fRead > 190000) || (fOhms > 190000) )
-    {
-       iRange = 7;
-       fTemp = fOhms/100.;
-    }
-    
-     sprintf(pCommand,"R%1.1d\r",iRange);
-#ifdef debug
-     printf("%s\n",pCommand);
-#endif          
-     iRet = SerialWriteRead(&self->pData,pCommand,pReply,131); 
-     if(iRet != 1)
-     {
-       return iRet;
-     }    
-    
-    
-     /* finally set temperature */
-#ifdef debug
-     printf("Set Val befor hex: %d\n",(int)fTemp);
-#endif     
-     sprintf(pCommand,"G%4.4X\r",(int)fTemp);     
-#ifdef debug
-     printf("A3\n");
-#endif     
-     iRet = SerialWriteRead(&self->pData,"A3\r",pReply,131);
-     if(iRet != 1)
-     {
-       return iRet;
-     }
-#ifdef debug
-     printf("%s\n",pCommand);
-#endif              
-     iRet = SerialWriteRead(&self->pData,pCommand,pReply,131);
-     if(iRet != 1)
-     {
-       return iRet;
-     }    
-
-     /* unset remote operation, so that users may mess everything up
-        from the panel 
-     */
-#ifdef debug
-     printf("C1\n");
-#endif     
-     iRet = SerialWriteRead(&self->pData,"C0\r\n",pReply,131);
-     if(iRet != 1)
-     { 
-        return iRet;
-     }
-     
-     return 1;
-  }
-/*-------------------------------------------------------------------------*/
-  void DILLU_Error2Text(pDILLU *pData,int iCode, char *pError, int iLen)
-  {
-     char pBueffel[512];
-     pDILLU self;
-
-     self = *pData;
-     
-     switch(iCode)
-     {
-       case DILLU__FILENOTFOUND:
-            strncpy(pError,"Translation Table file not found",iLen);
-            return;
-            break;
-       case DILLU__NODILLFILE:
-            strncpy(pError,"Translation Table file is not DILLU",iLen);
-            return;
-            break;
-       case DILLU__ERRORTABLE:
-            strncpy(pError,"Translation Table could not be created",iLen);
-            return;
-            break;
-       case DILLU__BADREAD:
-            strncpy(pError,"Message corrupted",iLen);
-            return;
-            break;
-       case DILLU__SILLYANSWER:
-            strncpy(pError,"Message corrupted",iLen);
-            return;
-            break;
-       case DILLU__BADMALLOC:
-            strncpy(pError,"Out of memory in Open_DILLU",iLen);
-            return;
-            break;
-       case DILLU__READONLY:
-            strncpy(pError,"DILLU is read-only",iLen);
-            return;
-            break;
-       case DILLU__OUTOFRANGE:
-            strncpy(pError,"Requested value is out of range",iLen);
-            return;
-            break;
-       default:
-            SerialError(iCode,pError,iLen);
-            break;     
-     }
-  }
diff --git a/hardsup/dillutil.h b/hardsup/dillutil.h
deleted file mode 100644
index b1ac9c33..00000000
--- a/hardsup/dillutil.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*---------------------------------------------------------------------------
-                         D I L U U T I L
-                         
-  A few utility functions for talking to Dillution temperature controller
-  CCO-510/ AVSI via the SINQ setup: TCP/IP--MAC--RS-232--DILLU.
-  
-  This controller is weird in that way, that is accepts temperatures as 
-  resistance values in Ohms. Therefore a translation table is required
-  in order to convert from Kelvin to Ohms.
-  
-  Mark Koennecke, October 1997
-  
-----------------------------------------------------------------------------*/
-#ifndef SINQDILLU
-#define SINQDILLU
-#include <stdio.h>
-#include "table.h"
-
-/*----------------------- ERRORCODES--------------------------------------
-  Most functions return a negative error code on failure. Error codes 
-  defined are those defined for serialsinq plus a few additional ones:
-*/
-#define DILLU__FILENOTFOUND -710
-#define DILLU__NODILLFILE  -711
-#define DILLU__ERRORTABLE   -712
-#define DILLU__BADREAD      -713
-#define DILLU__SILLYANSWER  -714
-#define DILLU__READONLY     -715
-#define DILLU__OUTOFRANGE   -716
-#define DILLU__BADMALLOC    -717
-#define DILLU__NODILLUFOUND  -711
-/*------------------------------------------------------------------------*/
-  typedef struct __DILLU {
-                           void *pData;
-                           pSTable pTranstable;        
-                           int iReadOnly;
-                           } DILLU; 
-
-  typedef struct __DILLU *pDILLU;
-
-/*-----------------------------------------------------------------------*/
-  int DILLU_Open(pDILLU *pData,char *pHost, int iPort, int iChannel, 
-                 int iMode, char *pTransFile);
-  /***** creates an DILLU  datastructure and opens a connection to the ITCL4
-         controller. Input Parameters are:
-                 the hostname
-                 the port number
-                 the RS-232 channel number on the Mac.
-                 iMode: 1 for ReadOnly, 0 for normal mode
-                 pTransFile: name and path of the temperature ohms
-                             trnslation file.
-                             
-          Return values are 1 for success, a negative error code on
-          failure.
-
-  */       
-                 
-  void   DILLU_Close(pDILLU *pData);
-  /****** close a connection to an DILLU controller and frees its
-          data structure. The only parameter is a pointer to the data 
-          structure for this controller. This pointer will be invalid after
-          this call.
-  */          
-
-  int DILLU_Config(pDILLU *pData, int iTmo); 
-   /***** configure some aspects of a DILLU temperature controller.
-          The parameter are:
-                    - a pointer to the data structure for the controller as 
-                      returned by Open_DILLU
-                    - a value for the connection timeout
-          The function returns 1 on success, a negative error code on 
-          failure.
-    */
-    
-    int DILLU_Send(pDILLU *pData, char *pCommand, char *pReply, int iLen);
-    /******* send a the command in pCommand to the DILLU controller.
-             A possible reply is returned in the buffer pReply.
-             Maximum iLen characters are copied to pReply.
-             The first parameter is a pointer to a DILLU data structure
-             as returned by Open_DILLU.
-             
-             Return values are 1 for success, a negative error code on
-             failure.
-     */
-     
-     int DILLU_Read(pDILLU *pData, float *fVal);
-     /******  
-              Reads the current temperature at the controller
- 
-              Return values are 1 for success, a negative error code on
-              failure.
-     */
-
-      int DILLU_Set(pDILLU *pData, float fVal);
-      /****** sets a new preset temperature in the DILL temperature
-              controller. Parameters are:
-              - a pointer to a DILLU data structure as returned by Open_DILLU.
-              - the new preset value.
-
-              Return values are 1 for success, a negative error code on
-              failure.
-      */
-
-      void DILLU_Error2Text(pDILLU *pData, int iCode, char *pError, int iLen);      
-                             
-#endif  
-                       
-		
diff --git a/hardsup/el734_def.h b/hardsup/el734_def.h
deleted file mode 100644
index f3a64379..00000000
--- a/hardsup/el734_def.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef	    _el734_def_
-#define	    _el734_def_
-/*------------------------------------------------ EL734_DEF.H Ident V01R
-*/
-#include    <asynsrv_def.h>
-#include    <rs232c_def.h>
-#include    <sinq_defs.h>
-
-#ifndef OffsetOf
-#define OffsetOf(type, identifier)  ((size_t)(&((type*) NULL)->identifier))
-#endif
-
-#ifndef	    _EL734_errcodes_
-#define	    _EL734_errcodes_
-#include    <el734_errcodes.h>
-#endif
-
-#define MAX_MOT		12
-
-enum	EL734_Requests	  {FULL__STATUS,
-			   SHORT__STATUS};
-/*
-**	Structure to which the EL734_Open handle points.
-*/
-  struct EL734info {
-	struct AsynSrv__info	asyn_info; /* Contains skt, host, port & chan */
-	int			motor;
-	int			ored_msr, fp_cntr, fr_cntr;
-	struct RS__MsgStruct    to_host;
-	struct RS__RespStruct   from_host;
-  };
-/*
-**	Structure holding everything that is known about a VME Motor Controller.
-**	It is also the structure of replies from the Server.
-*/
-  struct Motor_State {
-	int	motor;		/* Motor number	*/
-	int	exists;		/* True if Motor exists	    */
-	int	msr;		/* MSR - Motor Status Register	*/
-	int	ored_msr;	/* Cumulated MSR	*/
-	int	fp_cntr;	/* Counter for *FP reports	*/
-	int	fr_cntr;	/* Counter for *FR reports	*/
-	int	ss;		/* SS - Status Flags Register	*/
-	char	pos_real[16];	/* U  - Position as read (degrees)   */
-	char    name[16];	/* MN		*/
-	int	dec_pt;		/* A  - # of decimal places	*/
-	int	enc_factor[2];	/* FD - Encoder scaling factors	(numer/denom) */
-	int	mot_factor[2];	/* FM - Motor   scaling factors (numer/denom) */
-	char	inertia_tol[16];/* D  - Inertia tol'nce (sec) (Schleppfehler) */
-	int	ramp;		/* E  - Start/stop ramp (kHz/sec)   */
-	int	loop_mode;	/* F  - Open loop/Closed loop (0/1) */
-	int	slow_hz;	/* G  - Start/stop frequency (Mot-S/sec)    */
-	char	lims[2][16];	/* H  - Lower/Upper limits  */
-	int	fast_hz;	/* J  - Top speed (Mot-S/sec)  */
-	int	ref_mode;	/* K  - Reference mode	*/
-	int	backlash;	/* L  - Backlash par (Mot-S) (Spielausgleich) */
-	int	pos_tol;	/* M  - Position tolerance (Enc-Steps)	*/
-	char	ref_param[16];	/* Q  - Parameter for "Goto Reference"	*/
-	int	is_sided;	/* T  - One-sided operation flag (0 = no)   */
-	char	null_pt[16];	/* V  - Null point  */
-	int	ac_par;		/* W  - Air-cushion dependency	*/
-	int	enc_circ;	/* Z  - circumference of encoder (Enc-Steps) */
-	int	stat_pos;	/* SP -	# of positionings */
-	int	stat_pos_flt;	/* ST -	# of positioning faults (recovered) */
-	int	stat_pos_fail;	/* SR -	# of positioning fails (abandoned) */
-	int	stat_cush_fail;	/* SA -	# of air-cushion fails */
-	char	set_real[16];	/* P  - Position as set  (degrees)  */
-	int	ac_state;	/* AC - Air-cushion state (0 = down)	*/
-	int	out;		/* SO - State of Output Signal	*/
-	int	in;		/* RI - State of Input  Signal	*/
-  };
-/*------------------------------------------------ End of EL734_DEF.H --*/
-#endif		/* _el734_def_ */
diff --git a/hardsup/el734_errcodes.h b/hardsup/el734_errcodes.h
deleted file mode 100644
index 1a04d812..00000000
--- a/hardsup/el734_errcodes.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-**			TAS_SRC:[LIB]EL734_ERRCODES.H
-**
-** Include file generated from EL734_ERRCODES.OBJ
-**
-**              29-AUG-2000 09:49:19.60
-*/
-
-#define	    EL734__VFY_ERR                0x865809C
-#define	    EL734__NO_SOCKET              0x8658094
-#define	    EL734__NOT_OPEN               0x865808C
-#define	    EL734__FORCED_CLOSED          0x8658084
-#define	    EL734__EMERG_STOP             0x865807C
-#define	    EL734__BAD_TMO                0x8658074
-#define	    EL734__BAD_STP                0x865806C
-#define	    EL734__BAD_SOCKET             0x8658064
-#define	    EL734__BAD_RNG                0x865805C
-#define	    EL734__BAD_PAR                0x8658054
-#define	    EL734__BAD_OVFL               0x865804C
-#define	    EL734__BAD_OFL                0x8658044
-#define	    EL734__BAD_MALLOC             0x865803C
-#define	    EL734__BAD_LOC                0x8658034
-#define	    EL734__BAD_ILLG               0x865802C
-#define	    EL734__BAD_DEV                0x8658024
-#define	    EL734__BAD_CMD                0x865801C
-#define	    EL734__BAD_ASYNSRV            0x8658014
-#define	    EL734__BAD_ADR                0x865800C
-#define	    EL734__FACILITY               0x865
diff --git a/hardsup/el734_utility.c b/hardsup/el734_utility.c
deleted file mode 100644
index 53efe510..00000000
--- a/hardsup/el734_utility.c
+++ /dev/null
@@ -1,2638 +0,0 @@
-#define	    ident	"1D08"
-#ifdef VAXC
-#module	    EL734_Utility	ident
-#endif
-#ifdef __DECC
-#pragma	    module	    EL734_Utility	ident
-#endif
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     Department ASQ				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...LIB.SINQ]EL734_Utility.C
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Nov 1995
-**
-**  To compile this module, use:
-
-	$ import tasmad
-	$ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-	$ cc /debug /noopt /obj=[]EL734_Utility -
-			tasmad_disk:[mad.psi.lib.sinq]EL734_Utility + -
-			sinq_c_tlb/lib
-
-**  To include this module in SINQ.OLB, use:
-
-  $ import tasmad
-  $ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-  $
-  $ define/group sinq_olb mad_lib:sinq_dbg.olb
-  $ @tasmad_disk:[mad.lib.sinq]sinq_olb EL734_Utility debug
-  $
-  $ define/group sinq_olb mad_lib:sinq.olb
-  $ @tasmad_disk:[mad.lib.sinq]sinq_olb EL734_Utility
-**
-** Updates:
-**  1A01  2-Nov-1995 DM.	Initial version.
-**  1B01 21-Mar-1996 DM.	Move from DELTAT.OLB to SINQ.OLB.
-**  1C01  3-Mar-1997 DM.	Add "Forced-close" capability.
-**  1C02 14-Apr-1997 DM.	Add EL734__BAD_STP to EL734_MoveNoWait.
-**  1C11 18-Jun-1998 DM.	Modify EL734_GetZeroPoint.
-**  1D01  4-Aug-1998 DM.	Put messages into a .MSG file.
-**============================================================================
-** The entry points included in this module are described below. Prototypes
-** can be defined via:
-**
-**    #include <sinq_prototypes.h>
-**
-**	EL734_AddCallStack	- Add a routine name to the call stack.
-**	EL734_Close		- Close a connection to a motor.
-**	EL734_Config		- Configure a connection to a motor.
-**	EL734_EncodeMSR		- Encode the MSR status into text.
-**	EL734_EncodeSS		- Encode the SS flags into text.
-**	EL734_ErrInfo		- Return detailed status from last operation.
-**	EL734_GetAirCush	- Get W and AC register values.
-**	EL734_GetEncGearing	- Get FD register values.
-**	EL734_GetId		- Get ID register value.
-**	EL734_GetLimits		- Get H register values.
-**	EL734_GetMotorGearing	- Get FM register values.
-**	EL734_GetNullPoint	- Get V register value.
-**	EL734_GetPosition	- Get U register value = current position.
-**	EL734_GetPrecision	- Get A register value.
-**	EL734_GetRefMode	- Get K register value.
-**	EL734_GetRefParam	- Get Q register value.
-**	EL734_GetSpeeds		- Get G, J and E register values.
-**	EL734_GetStatus		- Get MSR/SS/U register values.
-**	EL734_GetZeroPoint	- Get zero-point of motor.
-**	EL734_MoveNoWait	- Move motor and don't wait for completion.
-**	EL734_MoveWait		- Move motor and wait for completion.
-**	EL734_Open		- Open a connection to a motor.
-**	EL734_PutOffline	- Put the EL734 off-line.
-**	EL734_PutOnline		- Put the EL734 on-line.
-**	EL734_SendCmnd		- Send a command to RS232C server.
-**	EL734_SetAirCush	- Set the air-cushion (AC register).
-**	EL734_SetErrcode	- Set up EL734_errcode.
-**	EL734_SetHighSpeed	- Set the max speed (J register).
-**	EL734_SetLowSpeed	- Set the start/stop speed (G register).
-**	EL734_SetRamp		- Set the start/stop ramp (E register).
-**	EL734_Stop		- Send a stop command to motor.
-**	EL734_WaitIdle		- Wait till MSR goes to zero.
-**	EL734_ZeroStatus	- Zero the "ored-MSR" and fault counters.
-**---------------------------------------------------------------------
-**    int EL734_AddCallStack (&handle, &name)
-**	  ------------------
-**			    Add a routine name to the call stack (internal use).
-**  Input Args:
-**	struct EL734info *handle  - The pointer to the structure returned by
-**				    EL734_Open.
-**	char  *name	- The name to be added to the call stack.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	False if an error is detected, otherwise True.
-**  Routines called:
-**	none
-**  Description:
-**	If an error has already occurred (EL734_errcode != 0), the routine
-**	simply returns False. Otherwise, *name is added to the call stack.
-**	Then *handle is checked.
-**	If NULL, error EL734__NOT_OPEN is set and False is returned.
-**	Otherwise, the connection's TCP/IP socket number is checked.
-**	If zero, error EL734__NO_SOCKET is set and False is returned.
-**	If negative, error EL734__FORCED_CLOSE is set and False is returned.
-**	Otherwise, True is returned.
-**---------------------------------------------------------------------
-**    int EL734_Close (&handle, int force_flag)
-**	  -----------
-**			    Close a connection to a motor.
-**  Input Args:
-**	int    force_flag - if non-zero, all connections using the same socket
-**			    will also be closed (this gets AsynSrv_Close to
-**			    actually close the socket and is needed for error
-**			    recovery operations).
-**  Output Args:
-**	none
-**  Modified Args:
-**	void **handle	- The pointer to the structure returned by EL734_Open.
-**			  On return, the pointer is set to NULL.
-**  Return status:
-**	True always (error returns from close and free are not checked).
-**  Routines called:
-**	AsynSrv_Close
-**  Description:
-**	The routine calls AsynSrv_Close to close the connection to the RS232C
-**	server. If 'force_flag' is non-zero, all other connections to the
-**	RS232C server which use the same socket will also be closed.
-**
-**	The 'force_flag' can be useful in error recovery situations. The AsynSrv
-**	utility operates by only opening a socket for each separate combination
-**	of host/port. Hence, if several connections are open to the
-**	motors on an EL734, then calling EL734_Close doesn't actually close
-**	the socket until all connections have been closed. In the situation
-**	where an error has been detected on a motor, it is often desirable to
-**	close and re-open the socket as part of the recovery procedure. Calling
-**	EL734_Close with 'force_flag' non-zero will force the socket to be
-**	closed and will mark all connections using this socket so that they
-**	will be informed of the event when they next call an EL734_utility
-**	routine.
-**
-**	Note:	The force-close action is effected by the AsynSrv package. A
-**		force-close will thus also close any connections to other
-**		RS-232-C devices (e.g. EL737 neutron cntr) on the same server.
-**-------------------------------------------------------------------------
-**   int  EL734_Config (&handle, &par_id, par_val, ...)
-**	  ------------
-**			    Configure a connection to a motor.
-**  Input Args:
-**	char*	par_id	- Text string identifying the next argument (see below).
-**			    NULL indicates the end of the argument list.
-**	<??>	par_val - The value to set for the argument. The type of the
-**			    argument can depend on par_id.
-**  Output Args:
-**	none
-**  Modified Args:
-**	void **handle	- The pointer to the structure returned by EL734_Open.
-**			  It is used to hold the config info for the connection.
-**  Return status:
-**	True if no problems detected, otherwise False and EL734_errcode
-**	is set to indicate the nature of the problem as follows:
-**	    EL734__BAD_PAR --> Unrecognised par_id or msecTmo < 100 or
-**					msecTmo > 999'999 or bad eot or ..
-**  Routines called:
-**	none
-**  Description:
-**	The routine sets values in the EL734info data structure. Values which
-**	may be taken by par_id (warning -- par_id is case-sensitive) and the
-**	corresponding variable type of par_val are:
-**
-**	    "msecTmo"	int	The time-out response for commands sent to
-**				    the EL734. The valid range is 100 to
-**				    999'999. Default is 10'000.
-**	    "eot"	char*	The expected terminators in responses to
-**				    commands sent to the EL734. The first
-**				    character specifies the number of
-**				    terminators (max=3). Default is "1\r".
-**	    "motor"	int	The index of the motor in the range 1-12 to be
-**				    associated with this connection.
-**	    "chan"	int	The RS-232-C channel number of the EL734
-**				    controller associated with this connection.
-**-------------------------------------------------------------------------
-**  char  *EL734_EncodeMSR (&text, text_len, msr, ored_msr, fp_cntr, fr_cntr)
-**	   ---------------
-**			    Encode the MSR status into text.
-**  Input Args:
-**	int	text_len    - The size of text.
-**	int	msr	    - The current MSR.
-**	int	ored_msr    - The 'ored' MSR to be encoded.
-**	int	fp_cntr	    - The counter of *FP faults.
-**	int	fr_cntr	    - The counter of *FR faults.
-**  Output Args:
-**	char	*text	    - The resulting text string is stored here.
-**  Modified Args:
-**	none
-**  Return status:
-**	A pointer to "text".
-**  Routines called:
-**	none
-**  Description:
-**	The routine makes an intelligible message out of the MSR input data.
-**-------------------------------------------------------------------------
-**  char  *EL734_EncodeSS (&text, text_len, ss)
-**	   --------------
-**			    Encode the SS flags into text.
-**  Input Args:
-**	int	text_len    - The size of text.
-**	int	ss	    - The value of SS register.
-**  Output Args:
-**	char	*text	    - The resulting text string is stored here.
-**  Modified Args:
-**	none
-**  Return status:
-**	A pointer to "text".
-**  Routines called:
-**	none
-**  Description:
-**	The routine makes an intelligible message out of the input SS data.
-**-------------------------------------------------------------------------
-**    void EL734_ErrInfo (&entry_txt_ptr, &errcode, &my_errno, &vaxc_errno)
-**	   -------------
-**			    Return detailed status from last operation.
-**  Input Args:
-**	None
-**  Output Args:
-**	char **entry_txt_ptr - Pointer to a text string giving the call stack
-**				at the time that the error was detected.
-**	int  *errcode	 - An internal error code indicating the detected error.
-**	int  *my_errno	 - Saved value of errno.
-**	int  *vaxc_errno - Saved value of vaxc$errno (OpenVMS only).
-**  Modified Args:
-**	none
-**  Return status:
-**	none
-**  Routines called:
-**	none
-**  Description:
-**	Returns detailed status of the last operation. Once an error has been
-**	detected, the error status is frozen until this routine has been called.
-**-------------------------------------------------------------------------
-**    int EL734_GetAirCush (&handle, &present, &state)
-**	  ----------------
-**				    Get W and AC register values.
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL734_Open.
-**  Output Args:
-**	int *present	- The W register. If non-zero, motor has an air-cushion.
-**	int *state	- The AC register. If non-zero, air-cushion is up.
-**  Description:
-**	The routine is the same as EL734_GetEncGearing except that it issues
-**	a "W" command and then an "AC" command instead of an "FD" command to
-**	the controller.
-**-------------------------------------------------------------------------
-**    int EL734_GetEncGearing (&handle, &numerator, &denominator)
-**	  -------------------
-**				    Get FD register values.
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL734_Open.
-**  Output Args:
-**	int *numerator	    - The encoder gearing numerator.
-**	int *denominator    - The encoder gearing denominator.
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and EL734_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	EL734_GetEncGearing are (other values may be set by the called
-**	routines):
-**	    EL734__BAD_TMO, BAD_LOC, BAD_CMD, BAD_OFL,
-**		BAD_ADR, EMERG_STOP	--> see EL734_Open.
-**	    EL734__BAD_ILLG --> the response was probably not 2 integers.
-**				This could happen if there is noise on the
-**				RS232C connection to the EL734.
-**	If an error is detected, *numerator and *denominator are set to 0.
-**  Routines called:
-**	EL734_AddCallStack, AsynSrv_SendCmnds, AsynSrv_GetReply
-**  Description:
-**	The routine issues an "FD" command to the controller and analyses
-**	the result. The two parameters of the "FD" command are the numerator
-**	and denominator respectively.
-**-------------------------------------------------------------------------
-**    int EL734_GetId (&handle, &id_txt, id_len)
-**	  -----------
-**			    Get ID register value.
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL734_Open.
-**	int    id_len	- The size of the <id_txt> buffer in bytes.
-**  Output Args:
-**	char  *id_txt	- The EL734 identifier ("ID" parameter).
-**  Description:
-**	The routine is the same as EL734_GetEncGearing except that it issues
-**	an "ID" command instead of an "H" command to the controller.
-**-------------------------------------------------------------------------
-**    int EL734_GetLimits (&handle, &lo, &hi)
-**	  ---------------
-**			    Get H register values.
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL734_Open.
-**  Output Args:
-**	float *lo	- The lower  software limit.
-**	float *hi	- The higher software limit.
-**  Description:
-**	The routine is the same as EL734_GetEncGearing except that it issues
-**	an "H" command instead of an "FD" command to the controller.
-**-------------------------------------------------------------------------
-**    int EL734_GetMotorGearing (&handle, &numerator, &denominator)
-**	  ---------------------
-**			    Get FM register values.
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL734_Open.
-**  Output Args:
-**	int *numerator	    - The motor gearing numerator.
-**	int *denominator    - The motor gearing denominator.
-**  Description:
-**	The routine is the same as EL734_GetEncGearing except that it issues
-**	an "FM" command instead of an "FD" command to the controller. The
-**	two parameters of the "FM" command are the numerator and denominator
-**	respectively.
-**-------------------------------------------------------------------------
-**    int EL734_GetNullPoint (&handle, &null_pt)
-**	  ------------------
-**			    Get V register value.
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL734_Open.
-**  Output Args:
-**	int *null_pt	- The null point ("V" parameter) of the EL734.
-**  Description:
-**	The routine is the same as EL734_GetEncGearing except that it issues
-**	a "V" command instead of an "FD" command to the controller.
-**-------------------------------------------------------------------------
-**    int EL734_GetPosition (&handle, &ist_posit)
-**	  -----------------
-**			    Get U register value = current position.
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL734_Open.
-**  Output Args:
-**	float *ist_posit - The current position (U command) of the motor.
-**  Description:
-**	The routine is the same as EL734_GetEncGearing except that it issues
-**	a "U" command instead of an "FD" command to the controller.
-**-------------------------------------------------------------------------
-**    int EL734_GetPrecision (&handle, &n_dec)
-**	  ------------------
-**			    Get A register value.
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL734_Open.
-**  Output Args:
-**	int   *n_dec	- The precision ("A" parameter) of the EL734.
-**  Description:
-**	The routine is the same as EL734_GetEncGearing except that it issues
-**	a "A" command instead of an "FD" command to the controller.
-**-------------------------------------------------------------------------
-**    int EL734_GetRefMode (&handle, &mode)
-**	  ----------------
-**			    Get K register value.
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL734_Open.
-**  Output Args:
-**	int   *mode	- The reference seek mode ("K" parameter) of the EL734.
-**  Description:
-**	The routine is the same as EL734_GetEncGearing except that it issues
-**	a "K" command instead of an "FD" command to the controller.
-**-------------------------------------------------------------------------
-**    int EL734_GetRefParam (&handle, &param)
-**	  -----------------
-**			    Get Q register value.
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL734_Open.
-**  Output Args:
-**	float *param	- The reference seek param ("Q" parameter) of the EL734.
-**  Description:
-**	The routine is the same as EL734_GetEncGearing except that it issues
-**	a "Q" command instead of an "FD" command to the controller.
-**-------------------------------------------------------------------------
-**    int EL734_GetSpeeds (&handle, &lo, &hi, &ramp)
-**	  ---------------
-**			    Get G, J and E register values.
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL734_Open.
-**  Output Args:
-**	int   *lo	- The start/stop speed (G register). Units = Steps/sec.
-**	int   *hi	- The maximum speed (J register). Units = Steps/sec.
-**	int   *ramp	- The start/stop ramp (E register). Units = kHz/sec.
-**  Description:
-**	The routine is the same as EL734_GetEncGearing except that it issues
-**	a "G", "J" and "E" commands instead of an "FD" command to the
-**	controller.
-**-------------------------------------------------------------------------
-**    int EL734_GetStatus (&handle, &msr, &ored_msr, &fp_cntr, &fr_cntr,
-**	  ---------------		    &ss, &ist_posit)
-**			    Get MSR/SS/U register values.
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL734_Open.
-**  Output Args:
-**	int   *msr	- The MSR register.
-**	int   *ored_msr	- The 'ored'-MSR register. This gets zeroed every time
-**			    a 'positioning' command is executed.
-**	int   *fp_cntr	- A counter of the 'Position Faults' (*FP). This gets
-**			    zeroed whenever ored_msr is zeroed.
-**	int   *fr_cntr	- A counter of the 'Run Faults' (*FR). This gets
-**			    zeroed whenever ored_msr is zeroed.
-**	int   *ss	- The SS register. This will be -1 if the motor is busy.
-**	float *ist_posit - The current position (U command) of the motor.
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and EL734_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	EL734_GetStatus are (other values may be set by the called routines):
-**	    EL734__BAD_TMO, BAD_LOC, BAD_CMD, BAD_OFL,
-**		BAD_ADR, EMERG_STOP	--> see EL734_Open.
-**	    EL734__BAD_ILLG --> one of the responses could probably not
-**				be decoded. This could happen if there is noise
-**				on the RS232C connection to the EL734.
-**	If an error is detected, ist_posit is set to 0.0 and all other
-**	arguments to -1.
-**  Routines called:
-**	EL734_AddCallStack, AsynSrv_SendCmnds, AsynSrv_GetReply
-**  Description:
-**	The routine issues an "MSR", "SS" and "U" command to the controller and
-**	analyses the result. A count is kept of each time the *FP and *FR bits
-**	are found to be set and an inclusive-or value of MSR is maintained.
-**-------------------------------------------------------------------------
-**    int EL734_GetZeroPoint (&handle, &zero_pt)
-**	  ------------------
-**			    Get zero-point of motor.
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL734_Open.
-**  Output Args:
-**	float *zero_pt	- The zero point of the EL734.
-**  Return status:
-**	Any of the errors generated by the called routines is possible plus:
-**	    EL734__BAD_OVFL --> The encoder gearing ratio is zero so
-**					the conversion would overflow.
-**  Routines called:
-**	EL734_AddCallStack, EL734_GetEncGearing, EL734_GetNullPoint
-**  Description:
-**	This routine returns the zero point of the motor in the same units
-**	as used by the "P" and "U" commands. In other words, it reads the
-**	"V" parameter and converts it from "encoder-step" units to physical
-**	units using the encoder-gearing parameters.
-**-------------------------------------------------------------------------
-**    int   EL734_MoveNoWait (&handle, soll_posit)
-**	    ----------------
-**			    Move motor and don't wait for completion.
-**  Input Args:
-**	void  **handle	    - The pntr to the structure returned by EL734_Open.
-**	float	soll_posit  - The position to which the motor should move.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and EL734_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	EL734_MoveNoWait are (other values may be set by the called routines):
-**	    EL734__BAD_TMO, BAD_LOC, BAD_CMD, BAD_OFL,
-**		BAD_ADR, EMERG_STOP	--> see EL734_Open.
-**	    EL734__BAD_RNG  --> Destination is out-of-range.
-**	    EL734__BAD_STP  --> Motor is disabled via Hardware "Stop"
-**					signal.
-**	    EL734__BAD_ILLG --> some other response obtained from EL734.
-**					This could happen if there is noise
-**					on the RS232C connection to the EL734.
-**  Routines called:
-**	EL734_AddCallStack, AsynSrv_SendCmnds, AsynSrv_GetReply
-**  Description:
-**	The appropriate "P" command is sent to the motor and the response
-**	checked to check that it has been accepted. The fields "ored_msr",
-**	"fp_cntr" and "fr_cntr" in the handle are cleared, if so.
-**-------------------------------------------------------------------------
-**    int   EL734_MoveWait (&handle, soll_posit, &ored_msr, &fp_cntr, &fr_cntr,
-**	    --------------			    &ist_posit)
-**			    Move motor and wait for completion.
-**  Input Args:
-**	void  **handle	    - The pntr to the structure returned by EL734_Open.
-**	float	soll_posit  - The position to which the motor should move.
-**  Output Args:
-**	int	*ored_msr   \
-**	int	*fp_cntr     \	Same as EL734_WaitIdle.
-**	int	*fr_cntr     /
-**	float	*ist_posit  /
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False. If False, errcode (see
-**	EL734_ErrInfo) will have been set by EL734_MoveNoWait or EL734_WaitIdle.
-**  Routines called:
-**	EL734_AddCallStack, EL734_MoveNoWait, EL734_WaitIdle
-**  Description:
-**	The routine calls EL734_MoveNoWait and, if successful, EL734_WaitIdle.
-**-------------------------------------------------------------------------
-**    int EL734_Open (&handle, host, port, chan, motor, id)
-**	  ----------
-**			    Open a connection to a motor.
-**  Input Args:
-**	char *host	- Name of host offering the TCP/IP service.
-**	int   port	- Number of TCP/IP port of TCP/IP server.
-**	int   chan	- RS-232-C Channel number on the TCP/IP server.
-**	int   motor	- The motor to be driven.
-**	char *id	- The expected ID of the device, normally "STPMC EL734".
-**			    If id is NULL, the device ID is not checked.
-**  Output Args:
-**	void *handle	- A pointer to a structure of type EL734info needed for
-**			   subsequent calls to EL734_... routines. Buffer space
-**			   for the structure is allocated dynamically. It gets
-**			   released via a call to EL734_Close.
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False. If False, EL734_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	EL734_Open are (other values may be set by the called routines):
-**	  EL734__BAD_TMO     --> Time-out error ("?TMO" - this gets
-**					generated by the RS232C server).
-**	  EL734__BAD_LOC     --> EL734 off-line ("?LOC"). This should not
-**					happen on calls to EL734_Open since it
-**					sends an "RMT 1" cmnd.
-**	  EL734__BAD_CMD     --> Command error ("?CMD"). This could be
-**					caused by noise in the RS-232-C
-**					transmission.
-**	  EL734__BAD_OFL     --> Connection to EL734 broken ("?OFL").
-**					This can get generated by RS232C_SRV
-**					if, for example, the connection is via
-**					a terminal server and the terminal
-**					server loses power.
-**	  EL734__BAD_ILLG    --> Some other unrecognised response. This
-**					should never occur, of course!
-**	  EL734__BAD_SOCKET  --> Call to "AsynSrv_Open" failed.
-**	  EL734__BAD_DEV     --> Device has wrong ID
-**	  EL734__BAD_MALLOC  --> Call to "malloc" failed
-**	  EL734__BAD_ADR     --> Bad motor address ("?ADR"). Probably
-**					a non-existent motor has been addressed.
-**	  EL734__EMERG_STOP  --> Emergency stop ("*ES") detected.
-**  Routines called:
-**	AsynSrv_Open, the memory alloc routine "malloc", StrJoin,
-**	EL734_Config, AsynSrv_SendCmnds, AsynSrv_GetReply,
-**	AsynSrv_Close (if an error is detected).
-**  Description:
-**	The routine calls AsynSrv_Open to open a TCP/IP connection to a server
-**	offering the "RS-232-C" service for an EL734 Motor Controller. "RMT 1"
-**	and "ECHO 0" commands are sent to ensure the device is on-line, an "ID"
-**	command is sent (only if 'id' is non-NULL) to ensure that an EL734 is
-**	being addressed and an "MSR <motor>" command is sent to ensure that
-**	the motor exists.
-**    Note:
-**	For all error status returns, there is no open connection to the server
-**	and the handle is set to zero.
-**-------------------------------------------------------------------------
-**    int   EL734_PutOffline (&handle)
-**	    ----------------
-**			    Send "ECHO 1" and "RMT 0" commands to EL734 server.
-**  Input Args:
-**	void   **handle	- The pntr to the structure returned by EL734_Open.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and errcode (see
-**	EL734_ErrInfo) is set to indicate the nature of the problem.
-**	Values of Errcode set by EL734_PutOffline are (other values may be set
-**	by the called routines):
-**	    EL734__BAD_ASYNSRV --> An error occurred in AsynSrv_Utility.
-**					    Call AsynSrv_ErrInfo for more info.
-**	    EL734__BAD_ILLG    --> an unrecognised response. This
-**					should never occur, of course!
-**  Routines called:
-**	EL734_AddCallStack, AsynSrv_SendCmnds, AsynSrv_GetReply
-**  Description:
-**	The routine calls AsynSrv_SendCmnds to execute "RMT 1", "ECHO 1"
-**	and "RMT 0" commands. The replies are checked.
-**-------------------------------------------------------------------------
-**    int   EL734_PutOnline (&handle, echo)
-**	    ---------------
-**			    Send "RMT 1" and "ECHO x" commands to EL734 server.
-**  Input Args:
-**	void   **handle	- The pntr to the structure returned by EL734_Open.
-**	int      echo	- The value for the ECHO command.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and errcode (see
-**	EL734_ErrInfo) is set to indicate the nature of the problem.
-**	Values of Errcode set by EL734_PutOnline are (other values may be set
-**	by the called routines):
-**	    EL734__BAD_PAR --> "echo" is not 0, 1 or 2.
-**	    EL734__BAD_ASYNSRV --> An error occurred in AsynSrv_Utility.
-**					    Call AsynSrv_ErrInfo for more info.
-**	    EL734__BAD_ILLG    --> an unrecognised response. This
-**					should never occur, of course!
-**  Routines called:
-**	EL734_AddCallStack, AsynSrv_SendCmnds, AsynSrv_GetReply
-**  Description:
-**	The routine calls AsynSrv_SendCmnds to execute "RMT 1" and "ECHO x"
-**	commands. The replies are checked.
-**-------------------------------------------------------------------------
-**    int   EL734_SendCmnd (&handle, &cmnd, &rply, rply_size)
-**	    --------------
-**			    Send a command to RS232C server.
-**  Input Args:
-**	void   **handle	- The pntr to the structure returned by EL734_Open.
-**	char	*cmnd	- A command, terminated by NULL, for sending to the
-**			    EL734 counter controller. The command must have
-**			    any necessary \r character included.
-**	int	 rply_size - the size of the <rply> buffer.
-**  Output Args:
-**	char	*rply	- A buffer for receiving the reply.
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and errcode (see
-**	EL734_ErrInfo) is set to indicate the nature of the problem.
-**	Values of Errcode set by EL734_SendCmnd are (other values may be set
-**	by the called routines):
-**	    EL734__BAD_ASYNSRV --> An error occurred in AsynSrv_Utility.
-**					    Call AsynSrv_ErrInfo for more info.
-**  Routines called:
-**	EL734_AddCallStack, AsynSrv_SendCmnds, AsynSrv_GetReply
-**  Description:
-**	The command is passed to AsynSrv_SendCmnds and the reply extracted.
-**-------------------------------------------------------------------------
-**    int EL734_SetAirCush (&handle, state)
-**	  ----------------
-**			    Set AC register value.
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL734_Open.
-**  Input Args:
-**	int   state	- The new state of the AC register. 0	     --> down
-**							    non-zero --> up
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and EL734_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	EL734_SetAirCush are (other values may be set by the called
-**	routines):
-**	    EL734__BAD_TMO, BAD_LOC, BAD_CMD, BAD_OFL,
-**		BAD_ADR, EMERG_STOP	--> see EL734_Open.
-**	    EL734__VFY_ERR --> the value for the AC register returned by the
-**				call to EL734_GetAirCush was not the value which
-**				was sent via the AC command. This could happen
-**				if there is noise on the RS232C connection to
-**				the EL734.
-**  Routines called:
-**	EL734_AddCallStack, AsynSrv_SendCmnds, AsynSrv_GetReply,
-**	EL734_GetAirCush
-**  Description:
-**	The routine issues an "AC" command to the controller to set the air-
-**	cushions of the motor up or down. It then calls EL734_GetAirCush
-**	to check that the air-cushions were set correctly.
-**-------------------------------------------------------------------------
-**    int   EL734_SetErrcode (&info_ptr, &response, &cmnd)
-**	    ----------------
-**			    Set up EL734_errcode (for internal use only)
-**  Input Args:
-**	struct EL734info *info_ptr - The pntr to the structure returned by
-**					EL734_Open.
-**	char		 *response - The response received from a command.
-**	char		 *cmnd	   - The command which was sent.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	The value of EL734_errcode.
-**  Routines called:
-**	AsynSrv_SendCmnds
-**  Description:
-**	The command checks *response for certain keywords. If not recognised,
-**	extra action is undertaken to try to see if the emergency stop state
-**	is active or not.
-**-------------------------------------------------------------------------
-**    int EL734_SetHighSpeed (&handle, hi)
-**	  ------------------
-**			    Set J register value.
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL734_Open.
-**  Input Args:
-**	int   hi	- The maximum speed (J register). Units = Steps/sec.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and EL734_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	EL734_SetHighSpeed are (other values may be set by the called
-**	routines):
-**	    EL734__BAD_TMO, BAD_LOC, BAD_CMD, BAD_OFL,
-**		BAD_ADR, EMERG_STOP	--> see EL734_Open.
-**	    EL734__VFY_ERR --> the value for the J register returned by the call
-**				to EL734_GetSpeeds was not the value which was
-**				sent via the J command. This could happen if
-**				there is noise on the RS232C connection to
-**				the EL734.
-**  Routines called:
-**	EL734_AddCallStack, AsynSrv_SendCmnds, AsynSrv_GetReply, EL734_GetSpeeds
-**  Description:
-**	The routine issues a "J" command to the controller to set the max speed
-**	of the motor. It then calls EL734_GetSpeeds to check that the speed
-**	was set correctly.
-**-------------------------------------------------------------------------
-**    int EL734_SetLowSpeed (&handle, hi)
-**	  -----------------
-**			    Set G register value.
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL734_Open.
-**  Input Args:
-**	int   lo	- The start/stop speed (G register). Units = Steps/sec.
-**  Description:
-**	The routine is identical to the EL734_SetHighSpeed routine except that
-**	a "G" command rather than a "J" command is issued to the controller to
-**	set the start/stop speed.
-**-------------------------------------------------------------------------
-**    int EL734_SetRamp (&handle, ramp)
-**	  -------------
-**			    Set E register value.
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL734_Open.
-**  Input Args:
-**	int   ramp	- The start/stop ramp (E register). Units = kHz/sec.
-**  Description:
-**	The routine is identical to the EL734_SetHighSpeed routine except that
-**	an "E" command rather than a "J" command is issued to the controller to
-**	set the start/stop ramp.
-**-------------------------------------------------------------------------
-**    int EL734_Stop (&handle)
-**	  ----------
-**			    Send a stop command to motor
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL734_Open.
-**  Output Args:
-**	None
-**  Description:
-**	The routine is similar to EL734_GetEncGearing except that it issues
-**	a "Q m" command instead of an "FD" command to the controller and
-**	a null response (rather than parameter values) is expected.
-**-------------------------------------------------------------------------
-**    int   EL734_WaitIdle (&handle, &ored_msr, &fp_cntr, &fr_cntr, &ist_posit)
-**	    --------------
-**			    Wait till MSR goes to zero.
-**  Input Args:
-**	void  **handle	    - The pntr to the structure returned by EL734_Open.
-**  Output Args:
-**	int	*ored_msr   \
-**	int	*fp_cntr     \	Same as EL734_GetStatus.
-**	int	*fr_cntr     /
-**	float	*ist_posit  /
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and Errcode (see
-**	EL734_ErrInfo) will have been set by the called routines to indicate
-**	the nature of the problem.
-**  Routines called:
-**	EL734_AddCallStack, EL734_GetStatus
-**  Description:
-**	Routine EL734_GetStatus is called repeatedly at a predefined frequency
-**	until the MSR__BUSY bit in the MSR register is zero.
-**-------------------------------------------------------------------------
-**    void EL734_ZeroStatus (&handle)
-**	  -----------------
-**			    Zero the "ored-MSR" and fault counters.
-**  Input Args:
-**	void   **handle	- The pntr to the structure returned by EL734_Open.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	none
-**  Routines called:
-**	none
-**  Description:
-**	The "ored-MSR" and fault counters in the handle are zeroed.
-**============================================================================*/
-/*
-**---------------------------------------------------------------------------
-**					Global Definitions
-*/
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <stdarg.h>
-#include    <errno.h>
-#include    <signal.h>
-#include    <netdb.h>
-#include    <sys/socket.h>
-#include    <netinet/in.h>
-
-#include    <string.h>
-
-#ifdef	__VMS
-#include    <unixio.h>
-#else
-#include    <unistd.h>
-#ifdef FORTIFY
-#include    <fortify.h>
-#endif
-#endif
-/*-----------------------------------------------------------------*/
-#include    <rs232c_def.h>
-#include    <asynsrv_def.h>
-#include    <el734_def.h>
-#include    <sinq_prototypes.h>
-
-#define True	1
-#define False	0
-/*--------------------------------------------------------------------------
-**					Global Variables
-*/
-  static int	EL734_call_depth = 0;
-  static char	EL734_routine[5][64];
-  static int	EL734_errcode = 0;
-  static int	EL734_errno, EL734_vaxc_errno;
-	 char	EL734_IllgText[256];
-/*
-**---------------------------------------------------------------------------
-**		EL734_AddCallStack:  Add a routine name to the call stack.
-**				     This allows EL734_ErrInfo to generate a
-**				     trace-back in case of error.
-*/
-  int	EL734_AddCallStack (
-/*	==================
-*/		struct EL734info    *pntr,
-		char		    *name) {
-
-    if (EL734_errcode != 0) return False;
-
-    if (EL734_call_depth < 5) {
-      strcpy (EL734_routine[EL734_call_depth], name);
-      EL734_call_depth++;
-    }
-
-    if (pntr == NULL) {EL734_errcode = EL734__NOT_OPEN; return False;}
-
-    if (pntr->asyn_info.skt <= 0) {
-      memset (pntr->from_host.msg_size,
-		'0', sizeof (pntr->from_host.msg_size));
-      EL734_errcode = (pntr->asyn_info.skt < 0) ? EL734__FORCED_CLOSED
-						: EL734__NO_SOCKET;
-      return False;
-    }
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_Close:  Close a connection to a motor.
-*/
-  int	EL734_Close (
-/*	===========
-*/		void	**handle,
-		int	  force_flag) {
-
-    struct EL734info	*info_ptr;
-    char		buff[4];
-
-    info_ptr = (struct EL734info *) *handle;
-    if (info_ptr == NULL) return True;
-
-    if (info_ptr->asyn_info.skt != 0) {
-      if (info_ptr->asyn_info.skt > 0) {
-	AsynSrv_Close (*handle, force_flag);
-      }
-    }
-    free (*handle);
-    *handle = NULL;
-
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_Config:  Configure a connection to a motor.
-*/
-  int	EL734_Config (
-/*	============
-*/		void	**handle,
-		...) {
-
-    char		 buff[16];
-    va_list		 ap;		/* Pointer to variable args */
-    char		*txt_ptr;
-    int			 intval;
-    struct EL734info	*info_ptr;
-		    /*----------------------------------------------
-		    */
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_Config")) return False;
-		    /*----------------------------------------------
-		    */
-    va_start (ap, handle);	    /* Set up var arg machinery */
-    txt_ptr = va_arg (ap, char *);  /* Get pntr to first parameter ident */
-    while (txt_ptr != NULL) {
-      if (strcmp (txt_ptr, "msecTmo") == 0) {
-	intval = va_arg (ap, int);
-	if ((intval < 100) || (intval > 999999)) {
-	  EL734_errcode = EL734__BAD_PAR;
-	  return False;
-	}
-	sprintf (buff, "%04d", intval/100);	/* Convert to ASCII as ..
-						** .. deci-secs */
-	memcpy (info_ptr->asyn_info.tmo, buff, 4);
-      }else if (strcmp (txt_ptr, "eot") == 0) {
-        txt_ptr = va_arg (ap, char *);
-	if (txt_ptr == NULL) {
-	  EL734_errcode = EL734__BAD_PAR;
-	  return False;
-	}
-	memcpy (info_ptr->asyn_info.eot, "\0\0\0\0", 4);
-	switch (txt_ptr[0]) {
-	 case '3': info_ptr->asyn_info.eot[3] = txt_ptr[3];
-	 case '2': info_ptr->asyn_info.eot[2] = txt_ptr[2];
-	 case '1': info_ptr->asyn_info.eot[1] = txt_ptr[1];
-	 case '0':
-	    info_ptr->asyn_info.eot[0] = txt_ptr[0];
-	    break;
-	 default:
-	    EL734_errcode = EL734__BAD_PAR;
-	    return False;
-	}
-      }else if (strcmp (txt_ptr, "motor") == 0) {
-	intval = va_arg (ap, int);
-	if ((intval < 1) || (intval > 12)) {
-	  EL734_errcode = EL734__BAD_PAR;
-	  return False;
-	}
-	info_ptr->motor = intval;
-      }else if (strcmp (txt_ptr, "chan") == 0) {
-	intval = va_arg (ap, int);
-	if ((intval < 0) || (intval > 255)) {
-	  EL734_errcode = EL734__BAD_PAR;
-	  return False;
-	}
-	info_ptr->asyn_info.chan = intval;
-	sprintf (buff, "%04d", intval);	    /* Convert to ASCII */
-	memcpy (info_ptr->asyn_info.chan_char, buff, 4);
-      }else {
-	EL734_errcode = EL734__BAD_PAR;
-	return False;
-      }
-      txt_ptr = va_arg (ap, char *);	/* Get pntr to next parameter ident */
-    }
-
-    if (EL734_errcode != 0) return False;
-    EL734_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_EncodeMSR:    Encode the MSR status into text.
-*/
-  char	*EL734_EncodeMSR (char *text,  int text_len,
-/*	 ===============
-*/				int msr,
-				int ored_msr,
-				int fp_cntr,
-				int fr_cntr) {
-    int	    len;
-    char    my_text[132];
-    char    my_text_0[32];
-
-    if (msr == 0) {
-      ored_msr = ored_msr & ~(MSR__BUSY);	    /* Zero "Busy" bit */
-      if (ored_msr == MSR__OK) {
-        StrJoin (text, text_len, "Status, MSR = Idle. Positioned OK.", "");
-      }else {
-        if ((ored_msr & MSR__OK) != 0) {
-          StrJoin (text, text_len, "Status, MSR = Idle. Positioned OK. ", "");
-        }else {
-          StrJoin (text, text_len, "Status, MSR = Idle. ", "");
-	}
-	if ((ored_msr & MSR__REF_OK) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Ref. Pos'n OK. ");
-	}
-	if ((ored_msr & MSR__LIM_ERR) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Limit Switch Problem. ");
-	}
-	if ((ored_msr & MSR__AC_FAIL) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Air-Cushion Error. ");
-	}
-	if ((ored_msr & MSR__REF_FAIL) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Ref. Pos'n Fail. ");
-	}
-	if ((ored_msr & MSR__POS_FAIL) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Pos'n Fail. ");
-	}
-	if ((ored_msr & MSR__POS_FAULT) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  if (fp_cntr == 1) {
-	    StrJoin (text, text_len, my_text, "1 Pos'n Fault. ");
-	  }else {
-	    sprintf (my_text_0, "%d Pos'n Faults. ", fp_cntr);
-	    StrJoin (text, text_len, my_text, my_text_0);
-	  }
-	}
-	if ((ored_msr & MSR__RUN_FAIL) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Run Fail. ");
-	}
-	if ((ored_msr & MSR__RUN_FAULT) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  if (fr_cntr == 1) {
-	    StrJoin (text, text_len, my_text, "1 Run Fault. ");
-	  }else {
-	    sprintf (my_text_0, "%d Run Faults. ", fr_cntr);
-	    StrJoin (text, text_len, my_text, my_text_0);
-	  }
-	}
-	if ((ored_msr & MSR__HALT) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Halt. ");
-	}
-	if ((ored_msr & MSR__HI_LIM) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Hit HiLim. ");
-	}
-	if ((ored_msr & MSR__LO_LIM) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Hit LoLim. ");
-	}
-	if ((ored_msr & MSR__STOPPED) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Stopped. ");
-	}
-      }
-    }else if ((msr & ~(0x2fff)) != 0) {
-      StrJoin (text, text_len, "Status, MSR = ??", "");
-    }else {
-      sprintf (my_text, "%#x ", msr);
-      StrJoin (text, text_len, "Status, MSR = ", my_text);
-      if ((msr & MSR__LIM_ERR) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Limit Switch Problem/");
-      }
-      if ((msr & MSR__AC_FAIL) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Air-Cushion Error/");
-      }
-      if ((msr & MSR__REF_FAIL) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Ref. Pos'n Fail/");
-      }
-      if ((msr & MSR__POS_FAIL) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Pos'n Fail/");
-      }
-      if ((msr & MSR__POS_FAULT) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Pos'n Fault/");
-      }
-      if ((msr & MSR__RUN_FAIL)	!= 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Run Fail/");
-      }
-      if ((msr & MSR__RUN_FAULT) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Run Fault/");
-      }
-      if ((msr & MSR__HALT) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Halt/");
-      }
-      if ((msr & MSR__HI_LIM) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Hit HiLim/");
-      }
-      if ((msr & MSR__LO_LIM) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Hit LoLim/");
-      }
-      if ((msr & MSR__STOPPED) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Stopped/");
-      }
-      if ((msr & MSR__REF_OK) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Ref. Pos'n OK/");
-      }
-      if ((msr & MSR__OK) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "OK/");
-      }
-      if ((msr & MSR__BUSY) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Busy/");
-      }
-      len = strlen (text);
-      text[len-1] = '\0';
-    }
-    return text;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_EncodeSS:    Encode the SS flags into text.
-*/
-  char	*EL734_EncodeSS (char *text,  int text_len, int ss) {
-/*	 ==============
-*/
-    int	    len;
-    char    my_text[132];
-    char    my_text_0[32];
-
-    if (ss == 0) {
-      StrJoin (text, text_len, "Flags, SS = 0", "");
-    }else if ((ss & ~(0x3f)) != 0) {
-      StrJoin (text, text_len, "Flags, SS = ??", "");
-    }else {
-      sprintf (my_text, "Flags, SS = 0x%02X ", ss);
-      my_text_0[0] = '\0';
-      if ((ss & 0x20) != 0) strcat (my_text_0, "LSX/");
-      if ((ss & 0x10) != 0) strcat (my_text_0, "LS2/");
-      if ((ss & 0x08) != 0) strcat (my_text_0, "LS1/");
-      if ((ss & 0x04) != 0) strcat (my_text_0, "STP/");
-      if ((ss & 0x02) != 0) strcat (my_text_0, "CCW/");
-      if ((ss & 0x01) != 0) strcat (my_text_0, "HLT/");
-      len = strlen (my_text_0);
-      my_text_0[len-1] = '\0';
-      StrJoin (text, text_len, my_text, my_text_0);
-    }
-    return text;
-  }
-/* 
-**-------------------------------------------------------------------------
-**		EL734_ErrInfo:  Return detailed status from last operation.
-*/
-  void	EL734_ErrInfo (
-/*	=============
-*/		char	**entry_txt,
-		int	*errcode,
-		int	*my_errno,
-		int	*vaxc_errno) {
-
-    int		i;
-    char	buff[80], *txt;
-    int		asyn_errcode, asyn_errno, asyn_vaxerrno;
-    char*	asyn_errtxt;
-
-    if (EL734_call_depth <= 0) {
-      strcpy (EL734_routine[0], "EL734_no_error_detected");
-      *errcode	  = 0;
-      *my_errno	  = 0;
-      *vaxc_errno = 0;
-    }else {
-      if (EL734_call_depth > 1) {		    /* Concatenate the names */
-	for (i = 1; i < EL734_call_depth; i++) {
-	  strcat (EL734_routine[0], "/");
-	  StrJoin (EL734_routine[0], sizeof (EL734_routine),
-			    EL734_routine[0], EL734_routine[i]);
-	}
-      }
-      *errcode	  = EL734_errcode;
-      *my_errno	  = EL734_errno;
-      *vaxc_errno = EL734_vaxc_errno;
-      switch (EL734_errcode) {
-	case EL734__BAD_ADR:	    txt = "/EL734__BAD_ADR"; break;
-	case EL734__BAD_ASYNSRV:    txt = "/EL734__BAD_ASYNSRV"; break;
-	case EL734__BAD_CMD:	    txt = "/EL734__BAD_CMD"; break;
-	case EL734__BAD_DEV:	    txt = "/EL734__BAD_DEV"; break;
-	case EL734__BAD_ILLG:	    txt = "/EL734__BAD_ILLG"; break;
-	case EL734__BAD_LOC:	    txt = "/EL734__BAD_LOC"; break;
-	case EL734__BAD_MALLOC:     txt = "/EL734__BAD_MALLOC"; break;
-	case EL734__BAD_OFL:	    txt = "/EL734__BAD_OFL"; break;
-	case EL734__BAD_OVFL:	    txt = "/EL734__BAD_OVFL"; break;
-	case EL734__BAD_PAR:	    txt = "/EL734__BAD_PAR"; break;
-	case EL734__BAD_RNG:	    txt = "/EL734__BAD_RNG"; break;
-	case EL734__BAD_SOCKET:     txt = "/EL734__BAD_SOCKET"; break;
-	case EL734__BAD_STP:	    txt = "/EL734__BAD_STP"; break;
-	case EL734__BAD_TMO:	    txt = "/EL734__BAD_TMO"; break;
-	case EL734__EMERG_STOP:	    txt = "/EL734__EMERG_STOP"; break;
-	case EL734__FORCED_CLOSED:  txt = "/EL734__FORCED_CLOSED"; break;
-	case EL734__NOT_OPEN:	    txt = "/EL734__NOT_OPEN"; break;
-	case EL734__NO_SOCKET:	    txt = "/EL734__NO_SOCKET"; break;
-	default:
-	 sprintf (buff, "/EL734__unknown_err_code: %d", EL734_errcode);
-	 txt = buff;
-      }
-      StrJoin (EL734_routine[0], sizeof(EL734_routine), EL734_routine[0], txt);
-    }
-    AsynSrv_ErrInfo (&asyn_errtxt, &asyn_errcode, &asyn_errno, &asyn_vaxerrno);
-    if (asyn_errcode != 0) {
-      strcat (EL734_routine[0], "/");
-      StrJoin (EL734_routine[0], sizeof(EL734_routine),
-		    EL734_routine[0], asyn_errtxt);
-    }
-    *entry_txt = EL734_routine[0];
-    EL734_call_depth = 0;
-    EL734_errcode = 0;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_GetAirCush:  Get W and AC register values.
-*/
-  int	EL734_GetAirCush (
-/*	================
-*/		void	**handle,
-		int	 *present,
-		int	 *state) {
-
-    int			 status;
-    struct EL734info	*info_ptr;
-    char		 cmnd0[10], cmnd1[10];
-    char		*rply_ptr, *rply_ptr0, *rply_ptr1;
-		    /*----------------------------------------------
-		    */
-    *present = *state = 0;
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_GetAirCush")) return False;
-		    /*----------------------------------------------
-		    ** Send W and AC cmnds to EL734
-		    */
-    sprintf (cmnd0, "w %d\r", info_ptr->motor);
-    sprintf (cmnd1, "ac %d\r", info_ptr->motor);
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			cmnd0, cmnd1, NULL);
-    if (!status) {
-      *present = *state = 0;
-      EL734_errcode = EL734__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr1 = NULL;
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr0 != NULL) rply_ptr1 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, rply_ptr0);
-      if (rply_ptr0 == NULL) rply_ptr0 = "?no_response";
-      if (rply_ptr1 == NULL) rply_ptr1 = "?no_response";
-
-      if ((sscanf (rply_ptr0, "%d", present) != 1) ||
-	  (sscanf (rply_ptr1, "%d", state) != 1)) {
-	if (*rply_ptr0 == '?') {
-	  rply_ptr = rply_ptr0;
-	}else if (*rply_ptr1 == '?') {
-	  rply_ptr = rply_ptr1;
-	}else {
-	  rply_ptr = "?funny_response";
-	}
-	*present = *state = 0;
-	EL734_SetErrcode (info_ptr, rply_ptr, "W\" or \"AC");
-	return False;
-      }
-    }
-    if (EL734_errcode != 0) return False;
-    EL734_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_GetEncGearing:  Get FD register values.
-*/
-  int	EL734_GetEncGearing (
-/*	===================
-*/		void	**handle,
-		int	 *nominator,
-		int	 *denominator) {
-
-    int			 status;
-    struct EL734info	*info_ptr;
-    char		 cmnd0[10];
-    char		*rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    *nominator = *denominator = 0;
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_GetEncGearing")) return False;
-		    /*----------------------------------------------
-		    ** Send FD cmnd to EL734
-		    */
-    sprintf (cmnd0, "fd %d\r", info_ptr->motor);
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			cmnd0, NULL);
-    if (!status) {
-      *nominator = *denominator = 0;
-      EL734_errcode = EL734__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr0 == NULL) rply_ptr0 = "?no_response";
-      if (sscanf (rply_ptr0, "%d %d", nominator, denominator) == 2) {
-	if (EL734_errcode != 0) return False;
-	EL734_call_depth--;
-	return True;
-      }
-      *nominator = *denominator = 0;
-      EL734_SetErrcode (info_ptr, rply_ptr0, "FD");
-      return False;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_GetId:  Get ID register value.
-*/
-  int	EL734_GetId (
-/*	===========
-*/		void	**handle,
-		char	 *id_txt,
-		int	  id_len) {
-
-    int			status;
-    struct EL734info	*info_ptr;
-    char		*rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    *id_txt = '\0';
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_GetId")) return False;
-		    /*----------------------------------------------
-		    ** Send ID cmnd to EL734
-		    */
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			"id\r", NULL);
-    if (!status) {
-      EL734_errcode = EL734__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if ((rply_ptr0 != NULL) &&
-	  (*rply_ptr0 != '\0') &&
-	  (*rply_ptr0 != '?')) {
-	StrJoin (id_txt, id_len, rply_ptr0, "");
-	if (EL734_errcode != 0) return False;
-	EL734_call_depth--;
-	return True;
-      }
-      if (rply_ptr0 == NULL) rply_ptr0 = "?no_response";
-      EL734_SetErrcode (info_ptr, rply_ptr0, "ID");
-      return False;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_GetLimits:  Get H register values.
-*/
-  int	EL734_GetLimits (
-/*	===============
-*/		void	**handle,
-		float    *lo,
-		float	 *hi) {
-
-    int			 status;
-    struct EL734info	*info_ptr;
-    char		 cmnd0[10];
-    char		*rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    *lo = *hi = 0.0;
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_GetLimits")) return False;
-		    /*----------------------------------------------
-		    ** Send H cmnd to EL734
-		    */
-    sprintf (cmnd0, "h %d\r", info_ptr->motor);
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			cmnd0, NULL);
-    if (!status) {
-      *lo = *hi = 0.0;
-      EL734_errcode = EL734__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr0 == NULL) rply_ptr0 = "?no_response";
-      if (sscanf (rply_ptr0, "%f %f", lo, hi) == 2) {
-	if (EL734_errcode != 0) return False;
-	EL734_call_depth--;
-	return True;
-      }
-      *lo = *hi = 0.0;
-      EL734_SetErrcode (info_ptr, rply_ptr0, "H");
-      return False;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_GetMotorGearing:  Get FM register values.
-*/
-  int	EL734_GetMotorGearing (
-/*	=====================
-*/		void	**handle,
-		int	 *nominator,
-		int	 *denominator) {
-
-    int			 status;
-    struct EL734info	*info_ptr;
-    char		 cmnd0[10];
-    char		*rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    *nominator = *denominator = 0;
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_GetMotorGearing")) return False;
-		    /*----------------------------------------------
-		    ** Send FM cmnd to EL734
-		    */
-    sprintf (cmnd0, "fm %d\r", info_ptr->motor);
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			cmnd0, NULL);
-    if (!status) {
-      *nominator = *denominator = 0;
-      EL734_errcode = EL734__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr0 == NULL) rply_ptr0 = "?no_response";
-      if (sscanf (rply_ptr0, "%d %d", nominator, denominator) == 2) {
-	if (EL734_errcode != 0) return False;
-	EL734_call_depth--;
-	return True;
-      }
-      *nominator = *denominator = 0;
-      EL734_SetErrcode (info_ptr, rply_ptr0, "FM");
-      return False;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_GetNullPoint:  Get V register value.
-*/
-  int	EL734_GetNullPoint (
-/*	==================
-*/		void	**handle,
-		int	 *null_pt) {
-
-    int			 status;
-    struct EL734info	*info_ptr;
-    char		 cmnd0[10];
-    char		*rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    *null_pt = 0;
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_GetNullPoint")) return False;
-		    /*----------------------------------------------
-		    ** Send V cmnd to EL734
-		    */
-    sprintf (cmnd0, "v %d\r", info_ptr->motor);
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			cmnd0, NULL);
-    if (!status) {
-      *null_pt = 0;
-      EL734_errcode = EL734__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr0 == NULL) rply_ptr0 = "?no_response";
-      if (sscanf (rply_ptr0, "%d", null_pt) == 1) {
-	if (EL734_errcode != 0) return False;
-	EL734_call_depth--;
-	return True;
-      }
-      *null_pt = 0;
-      EL734_SetErrcode (info_ptr, rply_ptr0, "V");
-      return False;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_GetPosition:  Get U register value, the current position.
-*/
-  int	EL734_GetPosition (
-/*	=================
-*/		void	**handle,
-		float    *ist_posit) {
-
-    int			 status;
-    struct EL734info	*info_ptr;
-    char		 cmnd0[10];
-    char		*rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    *ist_posit = 0.0;
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_GetPosition")) return False;
-		    /*----------------------------------------------
-		    ** Send U cmnd to EL734
-		    */
-    sprintf (cmnd0, "u %d\r", info_ptr->motor);
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			cmnd0, NULL);
-    if (!status) {
-      *ist_posit = 0.0;
-      EL734_errcode = EL734__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr0 == NULL) rply_ptr0 = "?no_response";
-      if (sscanf (rply_ptr0, "%f", ist_posit) == 1) {
-	if (EL734_errcode != 0) return False;
-	EL734_call_depth--;
-	return True;
-      }
-      *ist_posit = 0.0;
-      EL734_SetErrcode (info_ptr, rply_ptr0, "U");
-      return False;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_GetPrecision:  Get A register value.
-*/
-  int	EL734_GetPrecision (
-/*	==================
-*/		void	**handle,
-		int	 *n_dec) {
-
-    int			    status;
-    struct EL734info	   *info_ptr;
-    char		    cmnd0[10];
-    char		   *rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    *n_dec = 3;
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_GetPrecision")) return False;
-		    /*----------------------------------------------
-		    ** Send A cmnd to EL734
-		    */
-    sprintf (cmnd0, "a %d\r", info_ptr->motor);
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			cmnd0, NULL);
-    if (!status) {
-      *n_dec = 3;
-      EL734_errcode = EL734__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr0 == NULL) rply_ptr0 = "?no_response";
-      if (sscanf (rply_ptr0, "%d", n_dec) == 1) {
-	if (EL734_errcode != 0) return False;
-	EL734_call_depth--;
-	return True;
-      }
-      *n_dec = 3;
-      EL734_SetErrcode (info_ptr, rply_ptr0, "A");
-      return False;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_GetRefMode:  Get K register value.
-*/
-  int	EL734_GetRefMode (
-/*	================
-*/		void	**handle,
-		int	 *mode) {
-
-    int			    status;
-    struct EL734info	   *info_ptr;
-    char		    cmnd0[10];
-    char		   *rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    *mode = 0;
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_GetRefMode")) return False;
-		    /*----------------------------------------------
-		    ** Send K cmnd to EL734
-		    */
-    sprintf (cmnd0, "k %d\r", info_ptr->motor);
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			cmnd0, NULL);
-    if (!status) {
-      *mode = 0;
-      EL734_errcode = EL734__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr0 == NULL) rply_ptr0 = "?no_response";
-      if (sscanf (rply_ptr0, "%d", mode) == 1) {
-	if (EL734_errcode != 0) return False;
-	EL734_call_depth--;
-	return True;
-      }
-      *mode = 0;
-      EL734_SetErrcode (info_ptr, rply_ptr0, "K");
-      return False;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_GetRefParam:  Get Q register value.
-*/
-  int	EL734_GetRefParam (
-/*	=================
-*/		void	**handle,
-		float	 *param) {
-
-    int			    status;
-    struct EL734info	   *info_ptr;
-    char		    cmnd0[10];
-    char		   *rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    *param = 0.0;
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_GetRefParam")) return False;
-		    /*----------------------------------------------
-		    ** Send Q cmnd to EL734
-		    */
-    sprintf (cmnd0, "q %d\r", info_ptr->motor);
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			cmnd0, NULL);
-    if (!status) {
-      *param = 0.0;
-      EL734_errcode = EL734__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr0 == NULL) rply_ptr0 = "?no_response";
-      if (sscanf (rply_ptr0, "%f", param) == 1) {
-	if (EL734_errcode != 0) return False;
-	EL734_call_depth--;
-	return True;
-      }
-      *param = 0.0;
-      EL734_SetErrcode (info_ptr, rply_ptr0, "Q");
-      return False;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_GetSpeeds:  Get G/J/E register values.
-*/
-  int	EL734_GetSpeeds (
-/*	===============
-*/		void	**handle,
-		int      *lo,
-		int      *hi,
-		int      *ramp) {
-
-    int			 status;
-    struct EL734info	*info_ptr;
-    char		 cmnd0[10];
-    char		 cmnd1[10];
-    char		 cmnd2[10];
-    char		*rply_ptr;
-    char		*rply_ptr0;
-    char		*rply_ptr1;
-    char		*rply_ptr2;
-		    /*----------------------------------------------
-		    */
-    *lo = *hi = *ramp = 0;
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_GetSpeeds")) return False;
-		    /*----------------------------------------------
-		    ** Send G, J and E cmnds to EL734
-		    */
-    sprintf (cmnd0, "g %d\r", info_ptr->motor);
-    sprintf (cmnd1, "j %d\r", info_ptr->motor);
-    sprintf (cmnd2, "e %d\r", info_ptr->motor);
-
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			cmnd0, cmnd1, cmnd2, NULL);
-    if (!status) {
-      *lo = *hi = *ramp = 0;
-      EL734_errcode = EL734__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr1 = rply_ptr2 = NULL;
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr0 != NULL) rply_ptr1 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, rply_ptr0);
-      if (rply_ptr1 != NULL) rply_ptr2 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, rply_ptr1);
-
-      if (rply_ptr0 == NULL) rply_ptr0 = "?no_response";
-      if (rply_ptr1 == NULL) rply_ptr1 = "?no_response";
-      if (rply_ptr2 == NULL) rply_ptr2 = "?no_response";
-
-      if ((sscanf (rply_ptr0, "%d", lo) != 1) ||
-	  (sscanf (rply_ptr1, "%d", hi) != 1) ||
-	  (sscanf (rply_ptr2, "%d", ramp) != 1)) {
-	if (*rply_ptr0 == '?') {
-	  rply_ptr = rply_ptr0;
-	}else if (*rply_ptr1 == '?') {
-	  rply_ptr = rply_ptr1;
-	}else if (*rply_ptr2 == '?') {
-	  rply_ptr = rply_ptr2;
-	}else {
-	  rply_ptr = "?funny_response";
-	}
-	*lo = *hi = *ramp = 0;
-	EL734_SetErrcode (info_ptr, rply_ptr, "G\", \"J\" or \"E");
-	return False;
-      }
-    }
-    if (EL734_errcode != 0) return False;
-    EL734_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_GetStatus:  Get MSR/SS/U register values.
-*/
-  int	EL734_GetStatus (
-/*	===============
-*/		void	**handle,
-		int      *msr,
-		int      *ored_msr,
-		int      *fp_cntr,
-		int      *fr_cntr,
-		int      *ss,
-		float    *ist_posit) {
-
-    int			 status;
-    struct EL734info	*info_ptr;
-    char		 cmnd0[10];
-    char		 cmnd1[10];
-    char		 cmnd2[10];
-    char		*rply_ptr;
-    char		*rply_ptr0;
-    char		*rply_ptr1;
-    char		*rply_ptr2;
-		    /*----------------------------------------------
-		    */
-    *msr = *ored_msr = *fp_cntr = *fr_cntr = *ss = -1; *ist_posit = 0.0;
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_GetStatus")) return False;
-		    /*----------------------------------------------
-		    ** Send MSR, SS and U cmnds to EL734
-		    */
-    sprintf (cmnd0, "msr %d\r", info_ptr->motor);
-    sprintf (cmnd1, "ss %d\r",	info_ptr->motor);
-    sprintf (cmnd2, "u %d\r",	info_ptr->motor);
-
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			cmnd0, cmnd1, cmnd2, NULL);
-    if (!status) {
-      *msr = *ored_msr = *fp_cntr = *fr_cntr = *ss = -1; *ist_posit = 0.0;
-      EL734_errcode = EL734__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr1 = rply_ptr2 = NULL;
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr0 != NULL) rply_ptr1 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, rply_ptr0);
-      if (rply_ptr1 != NULL) rply_ptr2 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, rply_ptr1);
-
-      if (rply_ptr0 == NULL) rply_ptr0 = "?no_response";
-      if (rply_ptr1 == NULL) rply_ptr1 = "?no_response";
-      if (rply_ptr2 == NULL) rply_ptr2 = "?no_response";
-
-      if ((sscanf (rply_ptr0, "%x", msr) == 1) &&
-	  (sscanf (rply_ptr2, "%f", ist_posit) == 1)) {
-	info_ptr->ored_msr = info_ptr->ored_msr | *msr;
-	if ((*msr & MSR__POS_FAULT) != 0) info_ptr->fp_cntr++;
-	if ((*msr & MSR__RUN_FAULT) != 0) info_ptr->fr_cntr++;
-	*ored_msr = info_ptr->ored_msr;
-	*fp_cntr  = info_ptr->fp_cntr;
-	*fr_cntr  = info_ptr->fr_cntr;
-			/* Remember: we may get "?BSY" for SS and
-			** this should not be treated as an error!
-			*/
-	if (sscanf (rply_ptr1, "%x", ss) != 1) *ss = -1;
-      }else {
-	if (*rply_ptr0 == '?') {
-	  rply_ptr = rply_ptr0;
-	}else if (*rply_ptr1 == '?') {
-	  rply_ptr = rply_ptr1;
-	}else if (*rply_ptr2 == '?') {
-	  rply_ptr = rply_ptr2;
-	}else {
-	  rply_ptr = "?funny_response";
-	}
-	*msr = *ored_msr = *fp_cntr = *fr_cntr = *ss = -1; *ist_posit = 0.0;
-	EL734_SetErrcode (info_ptr, rply_ptr, "MSR\", \"SS\" or \"U");
-	return False;
-      }
-    }
-    if (EL734_errcode != 0) return False;
-    EL734_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_GetZeroPoint: Get zero point (= converted V register value)
-*/
-  int	EL734_GetZeroPoint (
-/*	==================
-*/		void	**handle,
-		float	 *zero_pt) {
-
-    int			 status, null_pt, nom, denom;
-    struct EL734info	*info_ptr;
-    char		 cmnd0[10];
-    char		*rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    *zero_pt = 0.0;
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_GetZeroPoint")) return False;
-		    /*----------------------------------------------
-		    ** Get V register value.
-		    */
-    status = EL734_GetNullPoint (handle, &null_pt);
-    if (!status) return False;
-
-		    /*----------------------------------------------
-		    ** FD register values.
-		    */
-    status = EL734_GetEncGearing (handle, &nom, &denom);
-    if (!status) return False;
-
-    if (nom == 0) {
-      EL734_errcode = EL734__BAD_OVFL;	/* Encoder gearing ratio is zero */
-      return False;
-    }
-
-    *zero_pt = ((float) denom)/((float) nom);
-    *zero_pt *= (float) null_pt;
-
-    if (EL734_errcode != 0) return False;
-    EL734_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_MoveNoWait:  Move motor and don't wait for completion.
-*/
-  int	EL734_MoveNoWait (
-/*	================
-*/		void	**handle,
-		float     soll_posit) {
-
-    int			 status;
-    struct EL734info	*info_ptr;
-    char		 cmnd0[32];
-    char		*rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_MoveNoWait")) return False;
-		    /*----------------------------------------------
-		    ** Send P cmnd to EL734
-		    */
-    sprintf (cmnd0, "p %d %.3f\r", info_ptr->motor, soll_posit);
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			cmnd0, NULL);
-    if (!status) {
-      EL734_errcode = EL734__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr0 == NULL) rply_ptr0 = "?no_response";
-      if (*rply_ptr0 == '\0' || *rply_ptr0 == '\r' ) {
-			    /*
-			    ** The command was accepted - so zero the statistics
-			    ** fields in the handle and return to caller.
-			    */
-	info_ptr->ored_msr = info_ptr->fp_cntr = info_ptr->fr_cntr = 0;
-	if (EL734_errcode != 0) return False;
-	EL734_call_depth--;
-	return True;
-      }
-      EL734_SetErrcode (info_ptr, rply_ptr0, "P");
-      return False;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_MoveWait:  Move motor and wait for completion.
-*/
-  int	EL734_MoveWait (
-/*	==============
-*/		void	**handle,
-		float     soll_posit,
-		int	 *ored_msr,
-		int	 *fp_cntr,
-		int	 *fr_cntr,
-		float	 *ist_posit) {
-
-    int			 status;
-    struct EL734info	*info_ptr;
-		    /*----------------------------------------------
-		    */
-    *ored_msr = *fp_cntr = *fr_cntr = -1; *ist_posit = 0.0;
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_MoveWait")) return False;
-		    /*----------------------------------------------
-		    ** Start the movement.
-		    */
-    status = EL734_MoveNoWait (handle, soll_posit);
-    if (status) {
-      status = EL734_WaitIdle (handle, ored_msr, fp_cntr, fr_cntr, ist_posit);
-    }
-    if (status && (EL734_errcode == 0)) EL734_call_depth--;
-    if (EL734_errcode != 0) return False;
-    return status;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_Open:  Open a connection to a motor.
-*/
-  int	EL734_Open (
-/*	==========
-*/		void	**handle,
-		char	*host,
-		int	 port,
-		int	 chan,
-		int	 motor,
-		char	*device_id) {
-
-    int			    my_msr, status;
-    struct EL734info	   *my_handle;
-    char		    tmo_save[4];
-    char		    msr_cmnd[20];
-    char		   *rply_ptr;
-    char		   *rply_ptr0;
-    char		   *rply_ptr1;
-    char		   *rply_ptr2;
-    char		   *rply_ptr3;
-/*--------------------------------------------------------
-**			Initialise the error info stack and pre-set the
-**			routine name (in case of error).
-*/
-    EL734_errcode = EL734_errno = EL734_vaxc_errno = 0;
-    strcpy (EL734_routine[0], "EL734_Open");	
-    EL734_call_depth = 1;
-/*--------------------------------------------------------
-**				    Assume trouble
-*/
-    *handle = NULL;
-/*--------------------------------------------------------
-**			    Reserve space for the data we need to store.
-*/
-    my_handle = (struct EL734info *) malloc (sizeof (*my_handle));
-    if (my_handle == NULL) {
-      EL734_errcode = EL734__BAD_MALLOC;	    /* malloc failed!! */
-      return False;
-    }
-/*--------------------------------------------------------
-**				    Set up the connection
-*/
-    StrJoin (my_handle->asyn_info.host, sizeof (my_handle->asyn_info.host),
-			    host, "");
-    my_handle->asyn_info.port = port;
-    my_handle->asyn_info.chan = chan;
-    status = AsynSrv_Open (&my_handle->asyn_info);
-    if (!status) {
-      EL734_errcode = EL734__BAD_SOCKET;
-      GetErrno (&EL734_errno, &EL734_vaxc_errno);   /* Save errno info */
-      fprintf (stderr, "\nEL734_Open/AsynSrv_Open: "
-			"Failed to make connection.\n");
-      free (my_handle);
-      return False;
-    }
-
-    memcpy (tmo_save, my_handle->asyn_info.tmo, 4);	/* Save time-out */
-    EL734_Config ((void *) &my_handle,
-	"msecTmo", 500,		/* Set a short time-out initially since
-				** there should be no reason for the RMT,
-				** ECHO or ID commands to take very long.
-				*/
-	"eot", "1\r",
-	"motor", motor,
-	NULL);
-    my_handle->ored_msr = 0;
-    my_handle->fp_cntr  = 0;
-    my_handle->fr_cntr  = 0;
-	    /*
-	    ** Now ensure the EL734 is on-line. The first "RMT 1" command can
-	    ** fail due to pending characters in the EL734 input buffer causing
-	    ** the "RMT 1" to be corrupted. The response of the EL734 to this
-	    ** command is ignored for this reason (but the AsynSrv_SendCmnds
-	    ** status must be OK otherwise it indicates a network problem).
-	    */
-    status = AsynSrv_SendCmnds (&my_handle->asyn_info,
-			&my_handle->to_host, &my_handle->from_host,
-			"rmt 1\r", NULL);
-    sprintf (msr_cmnd, "msr %d\r", motor);
-    if (status) {
-      if (device_id != NULL) {
-	status = AsynSrv_SendCmnds (&my_handle->asyn_info,
-			&my_handle->to_host, &my_handle->from_host,
-			"rmt 1\r", "echo 0\r", "id\r", msr_cmnd, NULL);
-      }else {
-	status = AsynSrv_SendCmnds (&my_handle->asyn_info,
-			&my_handle->to_host, &my_handle->from_host,
-			"rmt 1\r", "echo 0\r", "echo 0\r", msr_cmnd, NULL);
-      }
-    }
-    memcpy (my_handle->asyn_info.tmo, tmo_save, 4);	/* Restore time-out */
-    if (!status) {
-		    /* Some error occurred in AsynSrv_SendCmnds */
-      EL734_errcode = EL734__BAD_ASYNSRV;
-      AsynSrv_Close (&my_handle->asyn_info, False);
-      free (my_handle);
-      return False;
-    }else {
-		    /* Check the responses carefully. The 3rd response should
-		    ** be the device identifier (if to be checked). The 4th
-		    ** response should be a hex integer.
-		    */
-      rply_ptr1 = rply_ptr2 = rply_ptr3 = NULL;
-      rply_ptr0 = AsynSrv_GetReply (
-		    &my_handle->asyn_info, &my_handle->from_host, NULL);
-      if (rply_ptr0 != NULL) rply_ptr1 = AsynSrv_GetReply (
-		    &my_handle->asyn_info, &my_handle->from_host, rply_ptr0);
-      if (rply_ptr1 != NULL) rply_ptr2 = AsynSrv_GetReply (
-		    &my_handle->asyn_info, &my_handle->from_host, rply_ptr1);
-      if (rply_ptr2 != NULL) rply_ptr3 = AsynSrv_GetReply (
-		    &my_handle->asyn_info, &my_handle->from_host, rply_ptr2);
-
-      if (rply_ptr0 == NULL) rply_ptr0 = "?no_response";
-      if (rply_ptr1 == NULL) rply_ptr1 = "?no_response";
-      if (rply_ptr2 == NULL) rply_ptr2 = "?no_response";
-      if (rply_ptr3 == NULL) rply_ptr3 = "?no_response";
-
-      if (*rply_ptr1 == '?') rply_ptr0 = rply_ptr1;
-      if (*rply_ptr2 == '?') rply_ptr0 = rply_ptr2;
-      if (*rply_ptr3 == '?') rply_ptr0 = rply_ptr3;
-      if (*rply_ptr0 != '?') {
-	if (device_id != NULL) {	/* Check device ID? */
-	  if (*rply_ptr2 == '\0') {	/* Yes. But if response is blank, it
-					** may be because Emergency Stop is set.
-					*/
-	    EL734_SetErrcode (my_handle, rply_ptr2, "ID");
-	    AsynSrv_Close (&my_handle->asyn_info, False);
-	    free (my_handle);
-	    return False;
-	  }else {
-	    if (strncmp (rply_ptr2, device_id, strlen (device_id)) != 0) {
-	      EL734_errcode = EL734__BAD_DEV;	    /* Device has wrong ID */
-	      AsynSrv_Close (&my_handle->asyn_info, False);
-	      free (my_handle);
-	      return False;
-	    }
-	  }
-	}
-	if (sscanf (rply_ptr3, "%x", &my_msr) != 1) {
-						       /* MSR response is bad */
-	  EL734_SetErrcode (my_handle, rply_ptr3, msr_cmnd); /* Check for *ES */
-	  if (EL734_errcode != EL734__EMERG_STOP)
-	    EL734_errcode = EL734__BAD_DEV;
-	  AsynSrv_Close (&my_handle->asyn_info, False);
-	  free (my_handle);
-	  return False;
-	}
-			/*
-			** The connection is complete. Pass the data structure
-			** back to the caller as a handle.
-			*/
-	*handle = my_handle;
-	if (EL734_errcode != 0) return False;
-	EL734_call_depth--;
-	return True;
-      }else {
-	EL734_errcode = EL734__BAD_DEV;
-	if (strcmp (rply_ptr0, "?OFL") == 0) EL734_errcode = EL734__BAD_OFL;
-	if (strcmp (rply_ptr0, "?CMD") == 0) EL734_errcode = EL734__BAD_CMD;
-	if (strcmp (rply_ptr0, "?LOC") == 0) EL734_errcode = EL734__BAD_LOC;
-	if (strcmp (rply_ptr0, "?ADR") == 0) EL734_errcode = EL734__BAD_ADR;
-	if (strcmp (rply_ptr0, "*ES")  == 0) EL734_errcode = EL734__EMERG_STOP;
-	if (strncmp (rply_ptr0, "?TMO", 4) == 0) EL734_errcode = EL734__BAD_TMO;
-	if (EL734_errcode == EL734__BAD_DEV)
-	  fprintf (stderr, " Unrecognised initial response: \"%s\"\n",
-		    rply_ptr0);
-      }
-    }
-    AsynSrv_Close (&my_handle->asyn_info, False);
-    free (my_handle);
-    return False;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_PutOffline:  put the EL734 off-line
-*/
-  int	EL734_PutOffline (
-/*	================
-*/		void	**handle) {
-
-    int			 status;
-    struct EL734info	*info_ptr;
-    char		*rply_ptr0, *rply_ptr1, *rply_ptr2;
-		    /*----------------------------------------------
-		    */
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_PutOffline")) return False;
-		    /*----------------------------------------------
-		    ** The problem which this routine has is that the EL734
-		    ** may already be off-line. The following is, therefore,
-		    ** rather pedantic for most cases which occur in practice.
-		    */
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			"\r", "rmt 1\r", "echo 1\r", "rmt 0\r", NULL);
-    if (!status) {
-      EL734_errcode = EL734__BAD_ASYNSRV; return False;}
-
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			"RMT\r", "", NULL);
-    if (!status) {
-      EL734_errcode = EL734__BAD_ASYNSRV; return False;}
-
-    rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-    rply_ptr1 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, rply_ptr0);
-    if (rply_ptr0 == NULL) rply_ptr0 = "?no_response";
-    if (rply_ptr1 == NULL) rply_ptr1 = "?no_response";
-    if ((strcmp (rply_ptr0, "RMT") == 0) &&
-	(strcmp (rply_ptr1, "\n0") == 0)) {
-      EL734_call_depth--;
-      return True;
-    }
-
-    EL734_SetErrcode (info_ptr, rply_ptr0, "RMT");
-    return False;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_PutOnline:  put the EL734 on-line
-*/
-  int	EL734_PutOnline (
-/*	===============
-*/		void	**handle,
-		int	  echo) {
-
-    int			 status, my_echo;
-    struct EL734info	*info_ptr;
-    char		 cmnd0[10];
-    char		*rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_PutOnline")) return False;
-		    /*----------------------------------------------
-		    */
-    if ((echo != 0) && (echo != 1) && (echo != 2)) {
-      EL734_errcode = EL734__BAD_PAR; return False;
-    }
-		    /*----------------------------------------------
-		    ** The problem which this routine has is that the state
-		    ** of the EL734 is not known. The following is, therefore,
-		    ** rather pedantic for most cases which occur in practice.
-		    */
-    sprintf (cmnd0, "echo %d\r", echo);
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			"\r", "rmt 1\r", cmnd0, NULL);
-    if (!status) {
-      EL734_errcode = EL734__BAD_ASYNSRV;
-      return False;
-    }
-
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			"echo\r", NULL);
-    if (!status) {
-      EL734_errcode = EL734__BAD_ASYNSRV; return False;}
-
-    rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-    if (rply_ptr0 == NULL) rply_ptr0 = "?no_response";
-    if (strcmp (rply_ptr0, "ECHO") == 0) {
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, rply_ptr0);
-      if (rply_ptr0 == NULL) rply_ptr0 = "?no_response";
-    }
-    if ((sscanf (rply_ptr0, "%d", &my_echo) == 1) && (my_echo == echo)) {
-      EL734_call_depth--;
-      return True;
-    }
-
-    EL734_SetErrcode (info_ptr, rply_ptr0, "ECHO");
-    return False;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_SendCmnd - Send a command to RS232C server.
-*/
-  int	EL734_SendCmnd (
-/*	==============
-*/		void    **handle,
-		char	 *cmnd,
-		char	 *rply,
-		int	  rply_size) {
-
-    struct EL734info	*info_ptr;
-    int			 my_status;
-    char		*rply_ptr;
-		    /*----------------------------------------------
-		    */
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_SendCmnd")) return False;
-		    /*----------------------------------------------
-		    ** Send command to EL734.
-		    */
-    my_status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			cmnd, NULL);
-    if (!my_status) {
-      EL734_errcode = EL734__BAD_ASYNSRV; return False;
-    }else {
-      rply_ptr = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr == NULL) rply_ptr = "?no_response";
-      StrJoin (rply, rply_size, rply_ptr, "");
-    }
-
-    if (EL734_errcode != 0) return False;
-    EL734_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_SetAirCush:  Set the air-cushion register (AC register)
-*/
-  int	EL734_SetAirCush (
-/*	================
-*/		void	**handle,
-		int	  state) {
-
-    int			 status, dum1, my_state;
-    struct EL734info	*info_ptr;
-    char		 cmnd0[32];
-    char		*rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_SetAirCush")) return False;
-		    /*----------------------------------------------
-		    ** Send AC cmnd to EL734
-		    */
-    if (state != 0) state = 1;
-    sprintf (cmnd0, "ac %d %d\r", info_ptr->motor, state);
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			cmnd0, NULL);
-    if (!status) {
-      EL734_errcode = EL734__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr0 == NULL) rply_ptr0 = "?no_response";
-      if (*rply_ptr0 == '\0') {
-			    /*
-			    ** The command was accepted - check value is set OK.
-			    */
-	status = EL734_GetAirCush (handle, &dum1, &my_state);
-	if (!status) return False;
-	if (state != my_state) {
-	  EL734_errcode = EL734__VFY_ERR;
-	  return False;
-	}
-	EL734_call_depth--;
-	return True;
-      }
-      EL734_SetErrcode (info_ptr, rply_ptr0, "AC");
-      return False;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_SetErrcode - Set up EL734_errcode
-*/
-  int	EL734_SetErrcode (
-/*	================
-*/		struct EL734info    *info_ptr,
-		char		    *response,
-		char		    *cmnd) {
-
-    int		 status;
-    char	*rply;
-    char	 tmo_save[4];
-    char	 eot_save[4];
-
-    EL734_errcode = EL734__BAD_ILLG;
-    if (strcmp (response, "?OFL") == 0) EL734_errcode = EL734__BAD_OFL;
-    if (strcmp (response, "?CMD") == 0) EL734_errcode = EL734__BAD_CMD;
-    if (strcmp (response, "?LOC") == 0) EL734_errcode = EL734__BAD_LOC;
-    if (strcmp (response, "?ADR") == 0) EL734_errcode = EL734__BAD_ADR;
-    if (strcmp (response, "?RNG") == 0) EL734_errcode = EL734__BAD_RNG;
-    if (strcmp (response, "*ES")  == 0) EL734_errcode = EL734__EMERG_STOP;
-    if (strcmp (response, "*MS" ) == 0) EL734_errcode = EL734__BAD_STP;
-    if (strncmp (response, "?TMO", 4) == 0) EL734_errcode = EL734__BAD_TMO;
-    if (EL734_errcode != EL734__BAD_ILLG) return EL734_errcode;
-		/*
-		** The response is not recognised. Perhaps the emergency stop
-		** signal is set. To check this, it is necessary to turn off
-		** terminator checking since the EL734 prefixes its "*ES"
-		** response with a <Return> character. We also therefore set
-		** a very short time-out.
-		*/
-    memcpy (tmo_save, info_ptr->asyn_info.tmo, 4);  /* Save time-out */
-    memcpy (eot_save, info_ptr->asyn_info.eot, 4);  /* Save terminators */
-    AsynSrv_Config (&info_ptr->asyn_info,
-	"msecTmo", 100,			    /* Set short time-out */
-	"eot", "0",			    /* Set no terminator */
-	NULL);
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			"ID\r", NULL);
-    memcpy (info_ptr->asyn_info.eot, eot_save, 4);  /* Restore terminators */
-    memcpy (info_ptr->asyn_info.tmo, tmo_save, 4);  /* Restore time-out */
-    if (status) {
-      rply = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply == NULL) rply = "?no_response";
-    }else {
-      rply = "?no_response";
-    }
-    if (strstr (rply, "*ES") != NULL) EL734_errcode = EL734__EMERG_STOP;
-
-    if ((EL734_errcode == EL734__BAD_ILLG) && (cmnd != NULL)) {
-      fprintf (stderr, " Unrecognised response to \"%s\" command: \"%s\"\n",
-	    cmnd, response);
-      strcpy (EL734_IllgText, cmnd);
-      strcat (EL734_IllgText, " : ");
-      strcat (EL734_IllgText, response);
-    }
-    return EL734_errcode;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_SetHighSpeed:  Set the max speed (J register)
-*/
-  int	EL734_SetHighSpeed (
-/*	==================
-*/		void	**handle,
-		int	  hi) {
-
-    int			 status, my_lo, my_hi, my_ramp;
-    struct EL734info	*info_ptr;
-    char		 cmnd0[32];
-    char		*rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_SetHighSpeed")) return False;
-		    /*----------------------------------------------
-		    ** Send J cmnd to EL734
-		    */
-    sprintf (cmnd0, "j %d %d\r", info_ptr->motor, hi);
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			cmnd0, NULL);
-    if (!status) {
-      EL734_errcode = EL734__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr0 == NULL) rply_ptr0 = "?no_response";
-      if (*rply_ptr0 == '\0') {
-			    /*
-			    ** The command was accepted - check value is set OK.
-			    */
-	status = EL734_GetSpeeds (handle, &my_lo, &my_hi, &my_ramp);
-	if (!status) return False;
-	if (hi != my_hi) {
-	  EL734_errcode = EL734__VFY_ERR;
-	  return False;
-	}
-	EL734_call_depth--;
-	return True;
-      }
-      EL734_SetErrcode (info_ptr, rply_ptr0, "J");
-      return False;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_SetLowSpeed:  Set the start/stop speed (G register)
-*/
-  int	EL734_SetLowSpeed (
-/*	=================
-*/		void	**handle,
-		int	  lo) {
-
-    int			 status, my_lo, my_hi, my_ramp;
-    struct EL734info	*info_ptr;
-    char		 cmnd0[32];
-    char		*rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_SetLowSpeed")) return False;
-		    /*----------------------------------------------
-		    ** Send G cmnd to EL734
-		    */
-    sprintf (cmnd0, "g %d %d\r", info_ptr->motor, lo);
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			cmnd0, NULL);
-    if (!status) {
-      EL734_errcode = EL734__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr0 == NULL) rply_ptr0 = "?no_response";
-      if (*rply_ptr0 == '\0') {
-			    /*
-			    ** The command was accepted - check value is set OK.
-			    */
-	status = EL734_GetSpeeds (handle, &my_lo, &my_hi, &my_ramp);
-	if (!status) return False;
-	if (lo != my_lo) {
-	  EL734_errcode = EL734__VFY_ERR;
-	  return False;
-	}
-	EL734_call_depth--;
-	return True;
-      }
-      EL734_SetErrcode (info_ptr, rply_ptr0, "G");
-      return False;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_SetRamp:  Set the start/stop ramp (E register)
-*/
-  int	EL734_SetRamp (
-/*	=============
-*/		void	**handle,
-		int	  ramp) {
-
-    int			 status, my_lo, my_hi, my_ramp;
-    struct EL734info	*info_ptr;
-    char		 cmnd0[32];
-    char		*rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_SetRamp")) return False;
-		    /*----------------------------------------------
-		    ** Send E cmnd to EL734
-		    */
-    sprintf (cmnd0, "e %d %d\r", info_ptr->motor, ramp);
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			cmnd0, NULL);
-    if (!status) {
-      EL734_errcode = EL734__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr0 == NULL) rply_ptr0 = "?no_response";
-      if (*rply_ptr0 == '\0') {
-			    /*
-			    ** The command was accepted - check value is set OK.
-			    */
-	status = EL734_GetSpeeds (handle, &my_lo, &my_hi, &my_ramp);
-	if (!status) return False;
-	if (ramp != my_ramp) {
-	  EL734_errcode = EL734__VFY_ERR;
-	  return False;
-	}
-	EL734_call_depth--;
-	return True;
-      }
-      EL734_SetErrcode (info_ptr, rply_ptr0, "E");
-      return False;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_Stop:  Send a stop command to motor.
-*/
-  int	EL734_Stop (
-/*	==========
-*/		void	**handle) {
-
-    int			 status;
-    struct EL734info	*info_ptr;
-    char		 cmnd0[10];
-    char		*rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_Stop")) return False;
-		    /*----------------------------------------------
-		    ** Send S cmnd to EL734
-		    */
-    sprintf (cmnd0, "s %d\r", info_ptr->motor);
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			cmnd0, NULL);
-    if (!status) {
-      EL734_errcode = EL734__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr0 == NULL) rply_ptr0 = "?no_response";
-      if (rply_ptr0[0] == '\0') {
-	if (EL734_errcode != 0) return False;
-	EL734_call_depth--;
-	return True;
-      }
-      EL734_SetErrcode (info_ptr, rply_ptr0, "S");
-      return False;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_WaitIdle:  Wait till MSR goes to zero.
-*/
-  int	EL734_WaitIdle (
-/*	==============
-*/		void	**handle,
-		int      *ored_msr,
-		int      *fp_cntr,
-		int      *fr_cntr,
-		float    *ist_posit) {
-#ifdef __VMS
-#include	<lib$routines.h>
-#define hibernate   lib$wait (0.25)
-#else
-#include    <unistd.h>
-#include    <time.h>
-    struct timespec	delay = {0, 250000000};
-    struct timespec	delay_left;
-    
-#ifdef LINUX    
-#define hibernate   nanosleep(&delay, &delay_left)
-#else
-#define hibernate   nanosleep_d9 (&delay, &delay_left)
-#endif
-
-#endif
-    int			msr, ss;
-    struct EL734info	*info_ptr;
-		    /*----------------------------------------------
-		    */
-    *ored_msr = *fp_cntr = *fr_cntr = -1; *ist_posit = 0.0;
-    info_ptr = (struct EL734info *) *handle;
-
-    if (!EL734_AddCallStack (info_ptr, "EL734_WaitIdle")) return False;
-		    /*----------------------------------------------
-		    ** Poll the motor status till not moving.
-		    */
-    while (EL734_GetStatus (handle,
-		&msr, ored_msr, fp_cntr, fr_cntr, &ss, ist_posit)) {
-      if ((msr & MSR__BUSY) == 0) {
-	if (EL734_errcode != 0) return False;
-	EL734_call_depth--;
-	return True;
-      }
-      hibernate;
-    }
-    return False;   /* Error detected in EL734_GetStatus */
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL734_ZeroStatus:  Zero the "ored-MSR" and fault counters.
-*/
-  void	EL734_ZeroStatus (
-/*	================
-*/		void	**handle) {
-
-    struct EL734info	*info_ptr;
-		    /*
-		    ** Do nothing if no handle!
-		    */
-    info_ptr = (struct EL734info *) *handle;
-    if (info_ptr == NULL) return;
-		    /*
-		    ** Zero the data structure items.
-		    */
-    info_ptr->ored_msr = 0;
-    info_ptr->fp_cntr  = 0;
-    info_ptr->fr_cntr  = 0;
-    memset (info_ptr->from_host.msg_size,
-		    '0', sizeof (info_ptr->from_host.msg_size));
-    return;
-  }
-/*-------------------------------------------- End of EL734_Utility.C =======*/
diff --git a/hardsup/el734fix.h b/hardsup/el734fix.h
deleted file mode 100644
index e14df3a5..00000000
--- a/hardsup/el734fix.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*---------------------------------------------------------------------------
-  Fix file for David renaming lots of el734 error codes.
-  
-  Mark Koennecke, October 1998
-----------------------------------------------------------------------------*/
-#ifndef EL734FIX
-#define EL734FIX
-#include "asynsrv_errcodes.h"
-
-#define EL734__BAD_HOST	 ASYNSRV__BAD_HOST
-#define EL734__BAD_BIND	 ASYNSRV__BAD_BIND
-#define EL734__BAD_SENDLEN   ASYNSRV__BAD_SEND_LEN 
-#define EL734__BAD_SEND	 ASYNSRV__BAD_SEND
-#define EL734__BAD_SEND_PIPE  ASYNSRV__BAD_SEND_PIPE
-#define EL734__BAD_SEND_UNKN ASYNSRV__BAD_SEND_UNKN
-#define EL734__BAD_RECV    ASYNSRV__BAD_RECV
-#define EL734__BAD_RECV_PIPE  ASYNSRV__BAD_RECV_PIPE
-#define EL734__BAD_RECV_NET   ASYNSRV__BAD_RECV_NET
-#define EL734__BAD_SEND_NET   ASYNSRV__BAD_SEND_NET
-#define EL734__BAD_RECV_UNKN  ASYNSRV__BAD_RECV_UNKN
-#define EL734__BAD_NOT_BCD    ASYNSRV__BAD_NOT_BCD
-#define EL734__BAD_RECVLEN    ASYNSRV__BAD_RECV_LEN
-#define EL734__BAD_FLUSH      ASYNSRV__BAD_FLUSH
-#define EL734__BAD_RECV1      ASYNSRV__BAD_RECV1
-#define EL734__BAD_RECV1_PIPE ASYNSRV__BAD_RECV1_PIPE
-#define EL734__BAD_RECV1_NET  ASYNSRV__BAD_RECV1_NET
-#define EL734__BAD_CONNECT ASYNSRV__BAD_CONNECT
-#define EL734__BAD_ID EL734__BAD_DEV
-#endif		/* el734fix */
diff --git a/hardsup/el734tcl.c b/hardsup/el734tcl.c
deleted file mode 100644
index c4dc11a4..00000000
--- a/hardsup/el734tcl.c
+++ /dev/null
@@ -1,644 +0,0 @@
-/*--------------------------------------------------------------------------
-
-	Some code to make EL734 motors as used at SINQ available in TCL.
-	Just a wrapper around David Maden's motor control routines.
-	
-	You are free to use and modify this software for noncommercial
-	usage.
-	
-	No warranties or liabilities of any kind taken by me or my employer
-	
-	Mark Koennecke June 1996
-----------------------------------------------------------------------------*/
-#include "sinq_prototypes.h"
-/* #include <timers.h>*/
-#include <tcl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include "rs232c_def.h"
-#include "el734_def.h"
-
-#define INACTIVE 999.8
-#define MOTACURRACY 0.02
-#define False 0
-#define True 1
-
-	typedef struct
-			{
-				float fUpper; /* upper limit */
-				float fLower; /* Lower Limit */
-				int iFix; /* fixed, unfixed flag */
-				float fSoftZero; /* SW-zero point */
-				float fSoftUpper; /* software upper boundary*/
-				float fSoftLower; /*    "      lower "      */     
-				int iLowFlag, iUpFlag, iZeroFlag; /*activity flags */
-				void *pData;  /* EL734 open struct */
-			} EL734st;
-
-	EXTERN int EL734Action(ClientData pDat, Tcl_Interp *i, int a, char *argv[]);
-	static void EL734Error2Text(char *pBuffer, int errcode);
-
-/*---------------------------------------------------------------------------
-	Tcl has a high niceness level. It deletes a command properly when
-	exiting, reinitializing etc. I use this facility to kill off the
-	motor initialised in EL734.
----------------------------------------------------------------------------*/
-EXTERN void EL734Murder(ClientData pData)
-{
-	EL734st *pTa = (EL734st *)pData;
-	EL734_Close(&(pTa->pData));
-	free(pData); 
-}
-/*----------------------------------------------------------------------------
-	EL734 is the main entry point for this stuff. It connects to a motor
-	and, on success, creates a new command with the name of the motor.
-	Syntax:
-		EL734 name host port channel index
----------------------------------------------------------------------------*/		
-
-int EL734(ClientData clientData, Tcl_Interp *interp, 
-			int argc, char *argv[])
-{
-	int iRet;
-	EL734st *pEL734 = NULL;
-	int iPort, iChannel, iMotor;
-	char *pErr = NULL;
-	char pBueffel[80];
-	
-	/* check arguments */
-	if(argc < 6)
-	{
-	    Tcl_AppendResult(interp,
-	    		" Insufficient arguments: EL734 name host port channel index"
-	     		, (char *) NULL);
-	    return TCL_ERROR;
-	}
-	
-	/* convert arguments */
-	iRet = Tcl_GetInt(interp,argv[3],&iPort);
-	if(iRet == TCL_ERROR)
-	{
-		Tcl_AppendResult(interp,"Need integer value for port",
-				(char *)NULL);
-		return iRet;
-	}
-	
-        iRet = Tcl_GetInt(interp,argv[4],&iChannel);
-        if(iRet == TCL_ERROR)
-        {
-          Tcl_AppendResult(interp,"Need integer value for channel",
-                          (char *)NULL);
-          return iRet;
-	}
-
-        iRet = Tcl_GetInt(interp,argv[5],&iMotor);
-        if(iRet == TCL_ERROR)
-        {
-          Tcl_AppendResult(interp,"Need integer value for motor",
-                          (char *)NULL);
-          return iRet;
-	}
-	
-	/* make a new pointer, initialise EL734st */
-	pEL734 = (EL734st *)malloc(sizeof(EL734st));
-	if(pEL734 ==NULL)
-	{
-		Tcl_AppendResult(interp,"No memory in EL734",NULL);
-		return TCL_ERROR;
-	}
-	pEL734->iFix = False;
-	pEL734->fSoftZero = INACTIVE+1;
-	pEL734->fSoftUpper = INACTIVE+1.;
-	pEL734->fSoftLower = -INACTIVE-1.;
-	pEL734->iZeroFlag = False;
-	pEL734->iLowFlag  = False;
-	pEL734->iUpFlag   = False; 
-
-	/* open the motor, finally */
-	iRet = EL734_Open(&(pEL734->pData), argv[2],iPort,iChannel,iMotor,"STPMC EL734");
-	if(iRet) /* success */
-	{
- 		/* figure out motor limits */
- 		  EL734_GetLimits(&(pEL734->pData),&(pEL734->fLower),
- 		  		  &(pEL734->fUpper));
-		/* handle TCL, create new command: the motor */		
-		  Tcl_CreateCommand(interp,strdup(argv[1]),EL734Action,
-		                   (ClientData)pEL734,EL734Murder);
-		  Tcl_AppendResult(interp,strdup(argv[1]),(char *)NULL);
-		  return TCL_OK;		                      
-	} 
-	else
-	{
-		EL734_ErrInfo(&pErr,&iPort,&iChannel, &iMotor);
-		EL734Error2Text(pBueffel,iPort);
-		Tcl_AppendResult(interp,pBueffel,(char *) NULL);
-		free(pEL734);
-		return TCL_ERROR;
-	}
-}
-/*---------------------------------------------------------------------------
-	CheckPos checks a position and converts it to a real position.
-	Returns TCL_ERROR on mistake, TCL_OK else
----------------------------------------------------------------------------*/
-	static int CheckPos(Tcl_Interp *interp, EL734st *pData,
-	                    float fRequested, float *fDrive)
-	{
-		float fPos;
-		char pBueffel[132];
-		
-	  /* fixed ? */
-	 if(pData->iFix)
-	 {
-	 	Tcl_AppendResult(interp,"Motor fixed",NULL);
-	 	return TCL_ERROR;
-	 }	
-		
-	  /* check against SW-boundaries */
-	  if(pData->iUpFlag)
-	  {
-	  	if(fRequested > pData->fSoftUpper)
-	  	{
-	  		sprintf(pBueffel,
-	  		"Requested position: %f violates SW-boundary %f",
-	  		fRequested, pData->fSoftUpper);
-	  		Tcl_AppendResult(interp,pBueffel,(char *) NULL);
-	  		return TCL_ERROR;                
-	  	}
-	  }
-	  if(pData->iLowFlag)
-	  {
-	  	if(fRequested <  pData->fSoftLower)
-	  	{
-	  		sprintf(pBueffel,
-	  		"Requested position: %f violates SW-boundary %f",
-	  		fRequested, pData->fSoftLower);
-	  		Tcl_AppendResult(interp,pBueffel,(char *) NULL);
-	  		return TCL_ERROR;                
-	  	}
-	  }
-	  
-	  /* correct for zero point */
-	  if(pData->iZeroFlag)
-	  {
-	  	fPos = fRequested - pData->fSoftZero;
-	  }
-	  else
-	  {
-	  	fPos = fRequested;
-	  }
-	  
-	  /* check HW-boundaries */
-	  if( (fPos < pData->fLower) || (fPos > pData->fUpper) )
-          {
-		sprintf(pBueffel," %f outside limits %f %f",
-			fPos,pData->fLower, pData->fUpper);
-		Tcl_AppendResult(interp,"Requested position: ",
-				pBueffel,(char *)NULL);
-		return TCL_ERROR;		
-	  }
-	
-	  *fDrive = fPos;
-	  return TCL_OK;		  	
-		
-     }
-/* -------------------------------------------------------------------------
-	fucking standard library missing functionality!!!!!!!!!!!!!!!!
----------------------------------------------------------------------------*/
-	static float absf(float x)
-	{
-		if(x < .0)
-			return -x;
-		else
-			return x;	
-	}
-     
-/*--------------------------------------------------------------------------
-
-	EL734 Action is the routine where commands send to the motor will 
-	end up.
-	
-	Syntax:
-	motor lim               shows motor limits
-        motor dr val            drives the motor to val
-        motor run val           set the motor in motion, without waiting
-                                for completion 
-        motor pos               shows motor position
-        motor fix               fixes a motor at a position 
-        motor unfix             unfixes a fixed motor
-        motor zero val          set a software zero point
-        motor upper val         sets a software upper limit
-        motor lower val         sets a software lower limit            
-----------------------------------------------------------------------------*/
-EXTERN int EL734Action(ClientData clientData, Tcl_Interp *interp, 
-			int argc, char *argv[])
-{
-	EL734st *pData = (EL734st *)clientData;
-	char pBueffel[80];
-	char *pErr = NULL;
-	int iRet, iMSR, iOMSR, iFPC, iFRC, iSS;
-	float fPos, fNpos;
-	double dPos;
-	int i;
-	struct RS__RplyStruct *pReply = NULL;
-
-
-	/* check parameters */
-	if(argc < 2)
-	{
-		Tcl_AppendResult(interp,
-		"Usage: motor and either dr, pos, hlim slim run zero up lo",(char *)NULL);
-		return TCL_ERROR;
-	}
-	if(pData == NULL)
-	{
-		Tcl_AppendResult(interp,
-		"Motor data lost!!!!!!!!",(char *)NULL);
-		return TCL_ERROR;
-	}
-	
-	/* check for HW-lim */
-	if(strcmp(argv[1],"hlim") == 0)
-	{
-		sprintf(pBueffel," %f %f",pData->fLower,pData->fUpper);
-		Tcl_AppendResult(interp,pBueffel,(char *)NULL);
-		return TCL_OK;
-	}
-
-	/* check for SW-lim */
-	if(strcmp(argv[1],"slim") == 0)
-	{
-		sprintf(pBueffel," %f %f",pData->fSoftLower,pData->fSoftUpper);
-		Tcl_AppendResult(interp,pBueffel,(char *)NULL);
-		return TCL_OK;
-	}
-	
-	/* fix & unfix */
-	if(strcmp(argv[1],"fix") == 0)
-	{
-		pData->iFix = True;
-		return TCL_OK;
-	}
-	if(strcmp(argv[1],"unfix") == 0)
-	{
-		pData->iFix = False;
-		return TCL_OK;
-	}
-	
-	/* reset */
-	if(strcmp(argv[1],"reset")== 0)
-	{
-		pData->iFix = False;
-		pData->iLowFlag = False;
-		pData->iUpFlag = False;
-		pData->iZeroFlag = False;
-		return TCL_OK;
-	}
-	
-	/* check for pos */
-	if(strcmp(argv[1],"pos") == 0)
-	{
-		iRet = EL734_GetStatus(&(pData->pData),
-		                       &iMSR,
-		                       &iOMSR,
-		                       &iFPC,
-		                       &iFRC,
-		                       &iSS,
-		                       &fPos);
-		if(!iRet)
-		{
-			EL734_ErrInfo(&pErr,&iMSR,&iOMSR, &iSS);
-			EL734Error2Text(pBueffel,iMSR);
-			Tcl_AppendResult(interp,pBueffel,(char *) NULL);
-			return TCL_ERROR;
-		}
-		else
-		{
-			if(pData->iZeroFlag)
-			{
-				fPos += pData->fSoftZero;
-			}
-			sprintf(pBueffel," %f",fPos);
-			Tcl_AppendResult(interp,pBueffel,NULL);
-			return TCL_OK;
-		}	
-	}
-
-	/* zero point */
-	if(strcmp(argv[1],"zero") == 0)
-	{
-	        /* check for zero already been defined */
-	        if(pData->iZeroFlag)
-	        {
-			Tcl_AppendResult(interp,
-			"Request to set new zero point rejected.",
-			" Use reset before new definition. ",
-			" I'll get confused otherwise ", 
-			NULL);
-			return TCL_ERROR;
-	        }
-	        
-		/* get the new position */
-		if(argc < 3)
-		{
-			Tcl_AppendResult(interp,
-			"Usage: motor zero val",NULL);
-			return TCL_ERROR;
-		}
-
-		iRet = Tcl_GetDouble(interp,argv[2],&dPos);
-		fNpos = dPos;
-		if(iRet == TCL_ERROR)
-		{
-			Tcl_AppendResult(interp,"Need float value for new zeropint",
-					(char *)NULL);
-			return iRet;
-		}
-		pData->fSoftZero = -fNpos;
-		pData->iZeroFlag = True;
-		return TCL_OK;
-	}
- 
-	/* upper SW-limit   */
-	if(strcmp(argv[1],"up") == 0)
-	{
-		/* get the new position */
-		if(argc < 3)
-		{
-			Tcl_AppendResult(interp,
-			"Usage: motor up val",NULL);
-			return TCL_ERROR;
-		}
-
-		iRet = Tcl_GetDouble(interp,argv[2],&dPos);
-		fNpos = dPos;
-		if(iRet == TCL_ERROR)
-		{
-			Tcl_AppendResult(interp,"Need float value for new upper limit",
-					(char *)NULL);
-			return iRet;
-		}
-		pData->fSoftUpper = fNpos;
-		pData->iUpFlag = True;
-		return TCL_OK;
-	}
-
-	/* lower SW-limit   */
-	if(strcmp(argv[1],"lo") == 0)
-	{
-		/* get the new position */
-		if(argc < 3)
-		{
-			Tcl_AppendResult(interp,
-			"Usage: motor lo val",NULL);
-			return TCL_ERROR;
-		}
-
-		iRet = Tcl_GetDouble(interp,argv[2],&dPos);
-		fNpos = dPos;
-		if(iRet == TCL_ERROR)
-		{
-			Tcl_AppendResult(interp,"Need float value for new lower limit",
-					(char *)NULL);
-			return iRet;
-		}
-		pData->fSoftLower = fNpos;
-		pData->iLowFlag = True;
-		return TCL_OK;
-	}
- 
-
-	
-	/* this is most important: dr for Drive */
-	if(strcmp(argv[1],"dr") == 0)
-	{
-		/* get the new position */
-		if(argc < 3)
-		{
-			Tcl_AppendResult(interp,
-			"Usage: motor dr val",NULL);
-			return TCL_ERROR;
-		}
-
-		iRet = Tcl_GetDouble(interp,argv[2],&dPos);
-		fNpos = dPos;
-		if(iRet == TCL_ERROR)
-		{
-			Tcl_AppendResult(interp,"Need  value to drive to",
-					(char *)NULL);
-			return iRet;
-		}
-		
-		/* check if compatible with limits */
-		if(CheckPos(interp,pData,fNpos,&fPos) == TCL_ERROR)
-			return TCL_ERROR;
-
-		/* finally move */
-		iRet = EL734_MoveWait(&(pData->pData), fPos, &iOMSR, 
-					&iFPC, &iFRC,&fNpos);
-		/* 99.99999999999% of all code is error checking */
-		if(!iRet)
-		{
-			EL734_ErrInfo(&pErr,&iMSR,&iOMSR, &iSS);
-			EL734Error2Text(pBueffel,iMSR);
-			Tcl_AppendResult(interp,pBueffel,(char *) NULL);
-			return TCL_ERROR;
-		}
-		
-		/* check if driving has been done */
-		if(absf(fPos-fNpos) > MOTACURRACY)
-		{
-			Tcl_AppendResult(interp,
-			" Motor error: inacurate driving!",
-			" Probably something serious is wrong ",
-			" Check the fucking hardware ",
-			NULL);
-			return TCL_ERROR;
-		}
-		return TCL_OK;
-	}
-	
-	/* this is most important: run  for Driving without waiting */
-	if(strcmp(argv[1],"run") == 0)
-	{
-		/* get the new position */
-		if(argc < 3)
-		{
-			Tcl_AppendResult(interp,
-			"Usage: motor run val",NULL);
-			return TCL_ERROR;
-		}
-
-		iRet = Tcl_GetDouble(interp,argv[2],&dPos);
-		fNpos = dPos;
-		if(iRet == TCL_ERROR)
-		{
-			Tcl_AppendResult(interp,"Need value to run for",
-					(char *)NULL);
-			return iRet;
-		}
-		
-		/* check if compatible with limits */
-		if(CheckPos(interp,pData,fNpos,&fPos) == TCL_ERROR)
-			return TCL_ERROR;
-
-		/* finally move */
-		iRet = EL734_MoveNoWait (&(pData->pData), fPos);
-
-		/* 99.99999999999% of all code is error checking */
-		if(!iRet)
-		{
-			EL734_ErrInfo(&pErr,&iMSR,&iOMSR, &iSS);
-			EL734Error2Text(pBueffel,iMSR);
-			Tcl_AppendResult(interp,pBueffel,(char *) NULL);
-			return TCL_ERROR;
-		}
-		return TCL_OK;
-	}
-
-	/* the dangerous, undocumented expert command: com:
-	   sends something directly to the motor. All args following
-	   com will be concatenated in one string, closed with \r
-	   and send to the motor . A GetReply will be invoked in order
-	   to yield a return value. Usage by normal motor users strictly
-	   discouraged.
-	 */
-	 if(strcmp(argv[1],"com") == 0)
-	 {
-	 	strcpy(pBueffel,argv[2]);
-	 	for(i = 3; i < argc; i++)
-	 	{
-	 		strcat(pBueffel," ");
-	 		strcat(pBueffel,argv[i]);
-	 	}
-		sprintf(pBueffel,"%s\r",pBueffel);
-	 	iRet = EL734_SendCmnds(&(pData->pData),pBueffel,NULL);
-	 	if(!iRet)
-	 	{
-			EL734_ErrInfo(&pErr,&iMSR,&iOMSR, &iSS);
-			EL734Error2Text(pBueffel,iMSR);
-			Tcl_AppendResult(interp,pBueffel,(char *) NULL);
-			return TCL_ERROR;
-	 	}
-	 	/* fetch reply */
-	 	pReply = (struct RS__RplyStruct *)EL734_GetReply(
-	 	                                  &(pData->pData),NULL);
-	 	while(pReply != NULL)
-	 	{
-	 		Tcl_AppendElement(interp,pReply->rply);
-		 	pReply = (struct RS__RplyStruct *)EL734_GetReply(
-	 	                                  &(pData->pData),pReply);
-	 	}
-	 	return TCL_OK;
-	 }	
-	
-	/* if we end here an unknown command has been sent */	
-	Tcl_AppendResult(interp,
-		"Usage: motor and either dr, run,zero, pos, hlim"
-		"slim up low reset fix unfix",(char *)NULL);
-		return TCL_ERROR;
-}
-/*---------------------------------------------------------------------------
-
-	EL734Error2Text converts between an EL734 error code to text
------------------------------------------------------------------------------*/
-	void EL734Error2Text(char *pBuffer, int iErr)
-	{
-		switch(iErr)
-		{
-			case -28:
-				strcpy(pBuffer,"EL734__BAD_ADR");
-				break;
-			case -8:
-				strcpy(pBuffer,"EL734__BAD_BIND");
-				break;
-			case -30:
-				strcpy(pBuffer,"EL734__BAD_BSY");
-				break;
-			case -3:
-				strcpy(pBuffer,"EL734__BAD_CMD");
-				break;
-			case -9:
-				strcpy(pBuffer,"EL734__BAD_CONNECT");
-				break;
-			case -23:
-				strcpy(pBuffer,"EL734__BAD_FLUSH");
-				break;
-			case -6:
-				strcpy(pBuffer,"EL734__BAD_HOST");
-				break;
-			case -10:
-				strcpy(pBuffer,"EL734__BAD_ID");
-				break;
-			case -5:
-				strcpy(pBuffer,"EL734__BAD_ILLG");
-				break;
-			case -2:
-				strcpy(pBuffer,"EL734__BAD_LOC");
-				break;
-			case -11:
-				strcpy(pBuffer,"EL734__BAD_MALLOC");
-				break;
-			case -21:
-				strcpy(pBuffer,"EL734__BAD_NOT_BCD");
-				break;
-			case -4:
-				strcpy(pBuffer,"EL734__BAD_OFL");
-				break;
-			case -29:
-				strcpy(pBuffer,"EL734__BAD_PAR");
-				break;
-			
-			case -17:
-				strcpy(pBuffer,"EL734__BAD_RECV");
-				break;
-			case -19:
-				strcpy(pBuffer,"EL734__BAD_RECV_NET");
-				break;
-			case -18:
-				strcpy(pBuffer,"EL734__BAD_RECV_PIPE");
-				break;
-			case -20:
-				strcpy(pBuffer,"EL734__BAD_RECV_UNKN");
-				break;
-			case -22:
-				strcpy(pBuffer,"EL734__BAD_RECVLEN");
-				break;
-			case -24:
-				strcpy(pBuffer,"EL734__BAD_RECV1");
-				break;
-			case -26:
-				strcpy(pBuffer,"EL734__BAD_RECV1_NET");
-				break;
-			case -25:
-				strcpy(pBuffer,"EL734__BAD_RECV1_PIPE");
-				break;
-			case -27:
-				strcpy(pBuffer,"EL734__BAD_RNG");
-				break;
-			case -13:
-				strcpy(pBuffer,"EL734__BAD_SEND");
-				break;
-			case -14:
-				strcpy(pBuffer,"EL734__BAD_SEND_PIPE");
-				break;
-			case -15:
-				strcpy(pBuffer,"EL734__BAD_SEND_NET");
-				break;
-			case -16:
-				strcpy(pBuffer,"EL734__BAD_SEND_UNKN");
-				break;
-			case -12:
-				strcpy(pBuffer,"EL734__BAD_SENDLEN");
-				break;
-			case -7:
-				strcpy(pBuffer,"EL734__BAD_SOCKET");
-				break;
-			case -1:
-				strcpy(pBuffer,"EL734__BAD_TMO");
-				break;
-			default:
-				strcpy(pBuffer,"Unknown EL734 error");
-				break;	
-		}
-	}
diff --git a/hardsup/el737_def.h b/hardsup/el737_def.h
deleted file mode 100644
index 997e6f32..00000000
--- a/hardsup/el737_def.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef	    _el737_def_
-#define	    _el737_def_
-/*----------------------------------------- [...LIB.SINQ]EL737_DEF.H Ident V02J
-**	Definitions for the EL737 Neutron Counter
-**
-**	On UNIX systems, this file is located in /public/lib/include
-**	On VMS  systems, this file is a module in mad_lib:sinq_c.tlb
-*/
-#include    <asynsrv_def.h>
-#include    <rs232c_def.h>
-
-#ifndef OffsetOf
-#define OffsetOf(type, identifier)  ((size_t)(&((type*) NULL)->identifier))
-#endif
-
-#ifndef	    _EL737_errcodes_
-#define	    _EL737_errcodes_
-#include    <el737_errcodes.h>
-#endif
-
-enum	EL737_States	  {
-		   UNKNOWN  = -2,
-		   OFFLINE  = -1,
-		   MS	    = 0x0,
-		   PTS	    = 0x1,
-		   PCS	    = 0x2,
-		   LRTS	    = 0x5,
-		   LRCS	    = 0x6,
-		   PTSP	    = 0x9,
-		   PCSP	    = 0xA,
-		   LRTSP    = 0xD,
-		   LRCSP    = 0xE};
-
-enum	EL737_Consts	  {
-		   VMECNT__PRESET_COUNT,
-		   VMECNT__PRESET_TIME,
-
-		   VMECNT__FULL,
-		   VMECNT__SHORT,
-		   VMECNT__INCR};
-/*
-**	Structure to which the EL737_Open handle points.
-*/
-  struct EL737info {
-	struct AsynSrv__info	asyn_info; /* Contains skt, host, port & chan */
-	int			c5, c6, c7, c8;
-	struct RS__MsgStruct    to_host;
-	struct RS__RespStruct   from_host;
-  };
-/*
-**	Structure holding everything that is known about a VME Neutron Counter.
-*/
-  struct Counter_State {
-	int	state;			    /* RS			*/
-	char    timer[16];		    /* RT		\ RA    */
-	int	cntrs[8];		    /* RC 1 ... RC 8    /	*/
-	char    rates[8][16];		    /* RR 1 ... RR 8		*/
-	char    thresh_integ_time[8][16];   /* DI 1 ... DI 8		*/
-	char    rate_integ_time[16];	    /* DT			*/
-	int	analog_indx;		    /* DA			*/
-	int	thresh_indx;		    /* DR			*/
-	char    threshes[8][16];	    /* DL 1  ... DL 8		*/
-	int	mon_preset;		    /* MP			*/
-	char    timer_preset[16];	    /* TP			*/
-  };
-/*----------------------------------------------------- End of EL737_DEF.H --*/
-#endif		/* _el737_def_ */
diff --git a/hardsup/el737_errcodes.h b/hardsup/el737_errcodes.h
deleted file mode 100644
index 600ff028..00000000
--- a/hardsup/el737_errcodes.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-**			TAS_SRC:[LIB]EL737_ERRCODES.H
-**
-** Include file generated from EL737_ERRCODES.OBJ
-**
-**              29-AUG-2000 09:49:21.56
-*/
-
-#define	    EL737__NO_VALUE               0x8668094
-#define	    EL737__NO_SOCKET              0x866808C
-#define	    EL737__NOT_OPEN               0x8668084
-#define	    EL737__FORCED_CLOSED          0x866807C
-#define	    EL737__CNTR_OVFL              0x8668074
-#define	    EL737__BAD_TMO                0x866806C
-#define	    EL737__BAD_SOCKET             0x8668064
-#define	    EL737__BAD_PAR                0x866805C
-#define	    EL737__BAD_OVFL               0x8668054
-#define	    EL737__BAD_OFL                0x866804C
-#define	    EL737__BAD_MALLOC             0x8668044
-#define	    EL737__BAD_LOC                0x866803C
-#define	    EL737__BAD_ILLG               0x8668034
-#define	    EL737__BAD_DEV                0x866802C
-#define	    EL737__BAD_CNTR               0x8668024
-#define	    EL737__BAD_CMD                0x866801C
-#define	    EL737__BAD_BSY                0x8668014
-#define	    EL737__BAD_ASYNSRV            0x866800C
-#define	    EL737__FACILITY               0x866
diff --git a/hardsup/el737_utility.c b/hardsup/el737_utility.c
deleted file mode 100644
index 383ea83f..00000000
--- a/hardsup/el737_utility.c
+++ /dev/null
@@ -1,1742 +0,0 @@
-#define	    ident	"2B03"
-#ifdef VAXC
-#module	    EL737_Utility	ident
-#endif
-#ifdef __DECC
-#pragma	    module	    EL737_Utility	ident
-#endif
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     Department ASQ				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...LIB.SINQ]EL737_Utility.C
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Apr 1996
-**
-**  To compile this module, use:
-
-	$ import tasmad
-	$ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-	$ cc /debug /noopt /obj=[]EL737_Utility -
-			tasmad_disk:[mad.psi.lib.sinq]EL737_Utility + -
-			sinq_c_tlb/lib
-
-**  To include this module in SINQ.OLB, use:
-
-  $ import tasmad
-  $ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-  $
-  $ define/group sinq_olb mad_lib:sinq_dbg.olb
-  $ @tasmad_disk:[mad.lib.sinq]sinq_olb EL737_Utility debug
-  $
-  $ define/group sinq_olb mad_lib:sinq.olb
-  $ @tasmad_disk:[mad.lib.sinq]sinq_olb EL737_Utility
-**
-** Updates:
-**  1A01  2-Nov-1995 DM.	Initial version.
-**  1B01 21-Mar-1996 DM.	Move from DELTAT.OLB to SINQ.OLB.
-**  1C01 16-Jul-1997 DM.	Add code for EL737_Pause
-**  2A01  6-Aug-1997 DM.	Cope with new RA response format (= timer first)
-**				Add EL737_GetLongStatus.
-**  2B01  5-Aug-1998 DM.	Put messages into a .MSG file.
-**  2B02 22-Apr-1999 DM.	Add EL737_GetThresh and EL737_SetThresh.
-**============================================================================
-** The entry points included in this module are described below. Prototypes
-** can be defined via:
-**
-**    #include <sinq_prototypes.h>
-**
-**	EL737_Close		- Close a connection to an EL737 counter.
-**	EL737_Config		- Configure a connection to an EL737 counter.
-**	EL737_Continue		- Continue a measurement with an EL737 counter.
-**	EL737_EnableThresh	- Enable/disable threshold monitoring.
-**	EL737_ErrInfo		- Return detailed status from last operation.
-**	EL737_GetMonIntegTime	- Get Monitor Integration Time (DI register).
-**	EL737_GetRateIntegTime	- Get Rate Integration Time (DT register).
-**	EL737_GetStatus		- Get 4 counters and counter status.
-**	EL737_GetStatusExtra	- Get counters 5 to 8.
-**	EL737_GetThresh		- Get threshold monitoring status.
-**	EL737_Open		- Open a connection to an EL737 counter.
-**	EL737_Pause		- Pause a measurement with an EL737 counter.
-**	EL737_SendCmnd		- Send a command to RS232C server.
-**	EL737_SetErrcode	- Set up EL737_errcode.
-**	EL737_SetThresh		- Set threshold monitoring level.
-**	EL737_StartCnt		- Start a preset cnt measurement with an EL737.
-**	EL737_StartTime		- Start a preset time measurement with an EL737.
-**	EL737_Stop		- Stop a measurement with an EL737 counter.
-**	EL737_StopFast		- Same as EL737_Stop but no registers are returned.
-**	EL737_WaitIdle		- Wait till status goes to zero.
-**---------------------------------------------------------------------
-**    int EL737_Close (&handle, force_flag)
-**	  -----------
-**  Input Args:
-**	int    force_flag - if non-zero, all connections using the same socket
-**			    will also be closed (this gets AsynSrv_Close to
-**			    actually close the socket and is needed for error
-**			    recovery operations).
-**  Output Args:
-**	none
-**  Modified Args:
-**	void **handle	- The pointer to the structure returned by EL737_Open.
-**			  On return, the pointer is set to NULL.
-**  Return status:
-**	True always (error returns from close and free are not checked).
-**  Routines called:
-**	AsynSrv_Close
-**  Description:
-**	The routine calls AsynSrv_Close to close the connection to the RS232C
-**	server. If 'force_flag' is non-zero, all other connections to the
-**	RS232C server which use the same socket will also be closed.
-**
-**	The 'force_flag' can be useful in error recovery situations. The AsynSrv
-**	utility operates by only opening a socket for each separate combination
-**	of host/port. Hence, if several connections are open to a server,
-**	then calling EL737_Close doesn't actually close the socket until all
-**	connections have been closed. In the situation where an error has been
-**	detected, it is often desirable to close and re-open the socket as part
-**	of the recovery procedure. Calling EL737_Close with 'force_flag'
-**	non-zero will force the socket to be closed and will mark all other
-**	connections using this socket so that they will be informed of the
-**	event when they next call try to be used.
-**
-**	Note:	The force-close action is effected by the AsynSrv package. A
-**		force-close will thus also close any connections to other
-**		RS-232-C devices (e.g. EL734 motors) on the same server.
-**-------------------------------------------------------------------------
-**   int  EL737_Config (&handle, &par_id, par_val, ...)
-**	  ------------
-**  Input Args:
-**	char*	par_id  - Text string identifying the next argument (see below).
-**			    NULL indicates the end of the argument list.
-**	<??>	par_val - The value to set for the argument. The type of the
-**			    argument can depend on par_id.
-**  Output Args:
-**	none
-**  Modified Args:
-**	void **handle	- The pointer to the structure returned by EL737_Open.
-**			  It is used to hold the config info for the connection.
-**  Return status:
-**	True if no problems detected, otherwise False and EL737_errcode
-**	is set to indicate the nature of the problem as follows:
-**	    EL737__BAD_PAR --> Unrecognised par_id or msecTmo < 100 or
-**					msecTmo > 999'999 or bad eot or ..
-**  Routines called:
-**	none
-**  Description:
-**	The routine sets values in the EL737info data structure. Values which
-**	may be taken by par_id (warning -- par_id is case-sensitive) and the
-**	corresponding variable type of par_val are:
-**
-**	    "msecTmo"	int	The time-out response for commands sent to
-**				    the EL737. The valid range is 100 to
-**				    999'999. Default is 10'000.
-**	    "eot"	char*	The expected terminators in responses to
-**				    commands sent to the EL737. The first
-**				    character specifies the number of
-**				    terminators (max=3). Default is "1\r".
-**-------------------------------------------------------------------------
-**   int  EL737_Continue (&handle, &status)
-**	  --------------
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL737_Open.
-**  Output Args:
-**	int  *status	- The status (RS) of the counter after the CO cmnd.
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and EL737_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	EL737_Continue are (other values may be set by the called routines):
-**	    EL737__OFL, __BAD_CMD, __BAD_TMO, __BAD_ASYNSRV --> see EL737_Open.
-**	    EL737__BAD_ILLG --> the response to the RS command was probably not
-**				an integer. This could happen if there is noise
-**				on the RS232C connection to the EL737.
-**	If an error is detected, *status is set to 0.
-**  Routines called:
-**	AsynSrv_SendCmnds
-**  Description:
-**	EL737_Continue sends a CO command to the counter to get it to continue
-**	a paused measurement and then an RS command to read its status.
-**-------------------------------------------------------------------------
-**   int  EL737_EnableThresh (&handle, indx)
-**	  ------------------
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL737_Open.
-**	int    indx	- The number of the counter to select as the "active"
-**			    threshold monitoring counter. If (indx == 0),
-**			    threshold monitoring is disabled.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and EL737_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	EL737_EnableThresh are (other values may be set by the called routines):
-**	    EL737__OFL, __BAD_CMD, __BAD_TMO, __BAD_ASYNSRV --> see EL737_Open.
-**	    EL737__BAD_BSY  --> "?2" response received - cntr probably in
-**					wrong state.
-**	    EL737__BAD_PAR  --> Bad parameter. Illegal value for <indx> or "?3"
-**				    or "?4" response received.
-**	    EL737__BAD_ILLG --> the response to the commands was illegal in
-**				some way. This could happen if there is noise
-**				on the RS232C connection to the EL737.
-**  Routines called:
-**	AsynSrv_SendCmnds
-**  Description:
-**	A "DR <indx>" command is sent to select counter <indx> to be the
-**	"active" threshold monitoring counter. A value of 0 causes
-**	threshold monitoring to be disabled in the EL737. The threshold
-**	for the selected counter will not be changed. If it is required
-**	to set a threshold value as well as enabling monitoring, it is
-**	simplest to use EL737_SetThresh.
-**-------------------------------------------------------------------------
-**    void EL737_ErrInfo (&entry_txt_ptr, &errcode, &my_errno, &vaxc_errno)
-**	   -------------
-**  Input Args:
-**	None
-**  Output Args:
-**	char **entry_txt_ptr - Pointer to a text string giving the call stack
-**				at the time that the error was detected.
-**	int  *errcode	 - An internal error code indicating the detected error.
-**	int  *my_errno	 - Saved value of errno.
-**	int  *vaxc_errno - Saved value of vaxc$errno (OpenVMS only).
-**  Modified Args:
-**	none
-**  Return status:
-**	none
-**  Routines called:
-**	none
-**  Description:
-**	Returns detailed status of the last operation. Once an error has been
-**	detected, the error status is frozen until this routine has been called.
-**-------------------------------------------------------------------------
-**    int EL737_GetMonIntegTime (&handle, indx, &mon_integ_time)
-**	  ---------------------
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL737_Open.
-**	int    indx	- The counter whose integ time is wanted.
-**  Output Args:
-**	float *mon_integ_time	- The integration time used for monitoring
-**				    the rate threshold.
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and EL737_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	EL737_GetMonIntegTime are (other values may be set by the called
-**	routines):
-**	    EL737__BAD_TMO, _LOC, _CMD, _OFL, _ADR, _ASYNSRV --> see EL737_Open.
-**	    EL737__BAD_ILLG --> the response was probably not a floating point
-**				number. This could happen if there is noise
-**				on the RS232C connection to the EL737.
-**	If an error is detected, *mon_integ_time is set to 0.1.
-**  Routines called:
-**	AsynSrv_SendCmnds
-**  Description:
-**	The routine issues a "DI <indx>" command to the controller and
-**	analyses the result.
-**-------------------------------------------------------------------------
-**    int EL737_GetRateIntegTime (&handle, &rate_integ_time)
-**	  ----------------------
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL737_Open.
-**  Output Args:
-**	float *rate_integ_time	- The integration time used for calculating
-**				    the rates.
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and EL737_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	EL737_GetRateIntegTime are (other values may be set by the called
-**	routines):
-**	    EL737__BAD_TMO, _LOC, _CMD, _OFL, _ADR, _ASYNSRV --> see EL737_Open.
-**	    EL737__BAD_ILLG --> the response was probably not a floating point
-**				number. This could happen if there is noise
-**				on the RS232C connection to the EL737.
-**	If an error is detected, *rate_integ_time is set to 0.1.
-**  Routines called:
-**	AsynSrv_SendCmnds
-**  Description:
-**	The routine issues a DT command to the controller and
-**	analyses the result.
-**-------------------------------------------------------------------------
-**    int EL737_GetStatus (&handle, &c1, &c2, &c3, &c4, &timer, &rs)
-**	  ---------------
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL737_Open.
-**  Output Args:
-**	int   *c1	- Counter 1 (Monitor).
-**	int   *c2	- Counter 2 (Detector).
-**	int   *c3	- Counter 3.
-**	int   *c4	- Counter 4.
-**	float *timer	- The measured time.
-**	int   *rs	- The counter status (RS command).
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and EL737_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	EL737_GetStatus are (other values may be set by the called routines):
-**	    EL737__BAD_TMO, _LOC, _CMD, _OFL, _ADR, _ASYNSRV --> see EL737_Open.
-**	    EL737__BAD_ILLG --> one of the responses could probably not be
-**				decoded. This could happen if there is noise
-**				on the RS232C connection to the EL737.
-**	If an error is detected, all arguments are set to 0.
-**  Routines called:
-**	AsynSrv_SendCmnds
-**  Description:
-**	The routine issues an RA and RS command to the controller and
-**	analyses the result. If a syntax error is detected in either the RA
-**	or RS response, the routine tries up to 3 times to get a meaningful
-**	reply.
-**-------------------------------------------------------------------------
-**    int EL737_GetStatusExtra (&handle, &c5, &c6, &c7, &c8)
-**	  --------------------
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL737_Open.
-**  Output Args:
-**	int   *c5	- Counter 5.
-**	int   *c6	- Counter 6.
-**	int   *c7	- Counter 7.
-**	int   *c8	- Counter 8.
-**  Modified Args:
-**	none
-**  Return status:
-**	True always.
-**  Routines called:
-**	None
-**  Description:
-**	The routine returns values for the counters 5, 6, 7 and 8 from the
-**	counter's structure. A successful call to any of the routines which
-**	return values for counters 1, 2, 3 and 4 must precede a call to
-**	EL737_GetStatusExtra.
-**-------------------------------------------------------------------------
-**    int EL737_GetThresh (&handle, &indx, &val)
-**	  ---------------
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL737_Open.
-**  Output Args:
-**	int   *indx	- The number of the threshold monitor counter. If =0,
-**			    threshold monitoring is disabled.
-**	float *val	- If *indx != 0, the value of the threshold. Otherwise,
-**			    it is zero.
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and EL737_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	EL737_GetThresh are (other values may be set by the called routines):
-**	    EL737__BAD_TMO, _LOC, _CMD, _OFL, _ADR, _ASYNSRV --> see EL737_Open.
-**	    EL737__BAD_ILLG --> one of the responses could probably not be
-**				decoded. This could happen if there is noise
-**				on the RS232C connection to the EL737.
-**	If an error is detected, all arguments are set to 0.
-**  Routines called:
-**	AsynSrv_SendCmnds
-**  Description:
-**	The routine issues a DR and, if threshold monitoring is enabled,
-**	a "DL <indx>" command to the controller and analyses the responses.
-**-------------------------------------------------------------------------
-**    int EL737_Open (&handle, &host, port, chan)
-**	  ----------
-**  Input Args:
-**	char *host	- Name of host offering the TCP/IP service.
-**	int   port	- Number of TCP/IP port of TCP/IP server.
-**	int   chan	- RS-232-C Channel number on the TCP/IP server.
-**  Output Args:
-**	void *handle	- A pointer to a structure of type EL737info needed for
-**			   subsequent calls to EL737_... routines. Buffer space
-**			   for the structure is allocated dynamically. It gets
-**			   released via a call to EL737_Close.
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False. If False, EL737_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	EL737_Open are (other values may be set by the called routines):
-**	  EL737__BAD_TMO     --> Time-out error ("?TMO" - this gets
-**					generated by the RS232C server).
-**	  EL737__BAD_LOC     --> EL737 off-line ("?OF"). This should not
-**					happen on calls to EL737_Open since it
-**					sends an "RMT 1" cmnd.
-**	  EL737__BAD_CMD     --> Syntax error ("?1"). This could be
-**					caused by noise in the RS-232-C
-**					transmission.
-**	  EL737__BAD_OFL     --> Connection to EL737 broken ("?OFL").
-**					This can get generated by RS232C_SRV
-**					if, for example, the connection is via
-**					a terminal server and the terminal
-**					server loses power.
-**	  EL737__BAD_ILLG    --> Some other unrecognised response. This
-**					should never occur, of course!
-**	  EL737__BAD_DEV     --> Device doesn't seem to be an EL737. The
-**					response to the RA command was bad.
-**	  EL737__BAD_MALLOC  --> Call to "malloc" failed.
-**	  EL737__BAD_ASYNSRV --> Call to AsynSrv_SendCmnds failed. Use
-**					 AsynSrv_ErrInfo to get more details.
-**  Routines called:
-**	AsynSrv_Open, memory allocation routine "malloc" and AsynSrv_SendCmnds.
-**  Description:
-**	The routine opens a TCP/IP connection to a server offering the
-**	"RS-232-C" service for an EL737 Neutron Counter. "RMT 1" and
-**	"ECHO 2" commands are sent to ensure the device is on-line and an RA
-**	command is sent to ensure that an EL737 is being addressed.
-**-------------------------------------------------------------------------
-**    int EL737_Pause (&handle, &status)
-**	  -----------
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL737_Open.
-**  Output Args:
-**	int  *status	- The status (RS) of the counter after the PS cmnd.
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and EL737_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	EL737_Pause are (other values may be set by the called routines):
-**	    EL737__OFL, __BAD_CMD, __BAD_TMO, __BAD_ASYNSRV --> see EL737_Open.
-**	    EL737__BAD_ILLG --> the response to the RS command was probably not
-**				an integer. This could happen if there is noise
-**				on the RS232C connection to the EL737.
-**	If an error is detected, *status is set to 0.
-**  Routines called:
-**	AsynSrv_SendCmnds
-**  Description:
-**	EL737_Pause sends a PS command to the counter to get it to pause
-**	a measurement and then an RS command to read its status.
-**-------------------------------------------------------------------------
-**    int   EL737_SendCmnd (&handle, &cmnd, &rply, rply_size)
-**	    --------------
-**  Input Args:
-**	void   **handle	- The pntr to the structure returned by EL737_Open.
-**	char	*cmnd	- A command, terminated by NULL, for sending to the
-**			    EL737 counter controller. The command must have
-**			    any necessary \r character included.
-**	int	 rply_size - the size of the <rply> buffer.
-**  Output Args:
-**	char	*rply	- A buffer for receiving the reply.
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and errcode (see
-**	EL737_ErrInfo) is set to indicate the nature of the problem.
-**	EL737_errcode may be set as follows:
-**	    EL737__BAD_ASYNSRV --> An error occurred in AsynSrv_Utility.
-**					    Call AsynSrv_ErrInfo for more info.
-**  Routines called:
-**	AsynSrv_SendCmnds
-**  Description:
-**	The command is passed to AsynSrv_SendCmnds and the reply extracted.
-**-------------------------------------------------------------------------
-**    int   EL737_SetErrcode (&info_ptr, &response, &cmnd)
-**	    ----------------
-**			    Set up EL737_errcode (for internal use only)
-**  Input Args:
-**	struct EL737info *info_ptr - The pntr to the structure returned by
-**					EL737_Open.
-**	char		 *response - The response received from a command.
-**	char		 *cmnd	   - The command which was sent.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	The value of EL737_errcode.
-**  Routines called:
-**	none
-**  Description:
-**	The command checks *response for certain keywords and sets EL737_errcode
-**	accordingly.
-**-------------------------------------------------------------------------
-**   int  EL737_SetThresh (&handle, indx, val)
-**	  ---------------
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL737_Open.
-**	int    indx	- The number of the counter whose threshold is to
-**			    be set. If (indx == 0), threshold monitoring is
-**			    disabled and val is not used.
-**	float  val	- The value of the threshold to be set.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and EL737_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	EL737_SetThresh are (other values may be set by the called routines):
-**	    EL737__OFL, __BAD_CMD, __BAD_TMO, __BAD_ASYNSRV --> see EL737_Open.
-**	    EL737__BAD_BSY  --> "?2" response received - cntr probably in
-**					wrong state.
-**	    EL737__BAD_PAR  --> Bad parameter. Illegal value for <indx> or "?3"
-**				    or "?4" response received.
-**	    EL737__BAD_ILLG --> the response to the commands was illegal in
-**				some way. This could happen if there is noise
-**				on the RS232C connection to the EL737.
-**  Routines called:
-**	AsynSrv_SendCmnds, EL737_EnableThresh
-**  Description:
-**   a)	If (indx == 0):	EL737_SetThresh simply calls EL737_EnableThresh to
-**			send a "DR 0" command which will disable threshold
-**			monitoring by the counter.
-**
-**   b)	If (indx != 0):	First of all, a "DL <indx> |<val>|" command is sent
-**			to the counter to set the threshold for counter <indx>
-**			to the absolute value of <val>.
-**			Then, if (val >= 0), EL737_EnableThresh is then called
-**			to select counter <indx> to be the "active" threshold
-**			monitoring counter. Otherwise, the "active" counter
-**			is not changed.
-**-------------------------------------------------------------------------
-**   int  EL737_StartCnt (&handle, count, &status)
-**	  --------------
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL737_Open.
-**	int    count	- The preset-count for the measurement.
-**  Output Args:
-**	int  *status	- The status (RS) of the counter after the MP cmnd.
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and EL737_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	EL737_StartCnt are (other values may be set by the called routines):
-**	    EL737__OFL, __BAD_CMD, __BAD_TMO, __BAD_ASYNSRV --> see EL737_Open.
-**	    EL737__BAD_BSY  --> "?2" response received - cntr probably in
-**					wrong state.
-**	    EL737__BAD_PAR  --> "?3" response received - bad parameter.
-**	    EL737__BAD_ILLG --> the response to the RS command was probably not
-**				an integer. This could happen if there is noise
-**				on the RS232C connection to the EL737.
-**	If an error is detected, *status is set to 0.
-**  Routines called:
-**	AsynSrv_SendCmnds
-**  Description:
-**	EL737_StartCnt sends a MP command to the counter to get it to start
-**	a preset-count measurement and then an RS command to read its status.
-**-------------------------------------------------------------------------
-**   int  EL737_StartTime (&handle, timer, &status)
-**	  ---------------
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL737_Open.
-**	float  timer	- The preset-time for the measurement.
-**  Output Args:
-**	int  *status	- The status (RS) of the counter after the TP cmnd.
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and EL737_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	EL737_StartTime are (other values may be set by the called routines):
-**	    EL737__OFL, __BAD_CMD, __BAD_TMO, __BAD_ASYNSRV --> see EL737_Open.
-**	    EL737__BAD_BSY  --> "?2" response received - cntr probably in
-**					wrong state.
-**	    EL737__BAD_PAR  --> "?3" response received - bad parameter.
-**	    EL737__BAD_ILLG --> the response to the RS command was probably not
-**				an integer. This could happen if there is noise
-**				on the RS232C connection to the EL737.
-**	If an error is detected, *status is set to 0.
-**  Routines called:
-**	AsynSrv_SendCmnds
-**  Description:
-**	EL737_StartTime sends a TP command to the counter to get it to start
-**	a preset-time measurement and then an RS command to read its status.
-**-------------------------------------------------------------------------
-**   int  EL737_Stop (&handle, &c1, &c2, &c3, &c4, &timer, &rs)
-**	  ----------
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL737_Open.
-**  Output Args:
-**	int   *c1	- Counter 1 (Monitor).
-**	int   *c2	- Counter 2 (Detector).
-**	int   *c3	- Counter 3.
-**	int   *c4	- Counter 4.
-**	float *timer	- The measured time.
-**	int   *rs	- The counter status (RS command) after the S cmnd.
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and EL737_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	EL737_Stop are (other values may be set by the called routines):
-**	    EL737__OFL, __BAD_CMD, __BAD_TMO, __BAD_ASYNSRV --> see EL737_Open.
-**	    EL737__BAD_ILLG --> the response to the RA or RS command was
-**				probably not an integer. This could happen if
-**				there is noise on the RS232C connection to the
-**				EL737.
-**	If an error is detected, all output args are set to 0.
-**  Routines called:
-**	AsynSrv_SendCmnds
-**  Description:
-**	EL737_Stop sends an S command to the counter to get it to stop
-**	a measurement. It then calls EL737_GetStatus to read the registers
-**	and status.
-**-------------------------------------------------------------------------
-**   int  EL737_StopFast (&handle)
-**	  --------------
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by EL737_Open.
-**  Output Args:
-**	None
-**  Modified Args:
-**	none
-**  Return status:
-**	See EL737_Stop
-**  Routines called:
-**	AsynSrv_SendCmnds
-**  Description:
-**	EL737_StopFast sends an S command to the counter to get it to stop
-**	a measurement. Unlike EL737_Stop, the registers are not read out.
-**-------------------------------------------------------------------------
-**    int   EL737_WaitIdle (&handle, &c1, &c2, &c3, &c4, &timer)
-**	    --------------
-**  Input Args:
-**	void  **handle	    - The pntr to the structure returned by EL737_Open.
-**  Output Args:
-**	int	*c1	\
-**	int	*c2	 \
-**	int	*c3	  \	Same as EL737_GetStatus.
-**	int	*c4	  /
-**	float	*timer	 /
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and Errcode (see
-**	EL737_ErrInfo) will have been set by the called routines to indicate
-**	the nature of the problem.
-**  Routines called:
-**	EL737_GetStatus
-**  Description:
-**	Routine EL737_GetStatus is called repeatedly at a predefined frequency
-**	until the RS register is zero.
-**============================================================================*/
-/*
-**---------------------------------------------------------------------------
-**					Global Definitions
-*/
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <stdarg.h>
-#include    <math.h>
-#include    <errno.h>
-#include    <signal.h>
-#include    <netdb.h>
-#include    <sys/socket.h>
-#include    <netinet/in.h>
-
-#include    <string.h>
-
-#ifdef	__VMS
-  #include    <unixio.h>
-#else
-  #include    <unistd.h>
-  #ifdef FORTIFY
-    #include    <fortify.h>
-  #endif
-#endif
-/*-----------------------------------------------------------------*/
-#include    <sinq_prototypes.h>
-#include    <el737_def.h>
-#include    <rs232c_def.h>
-
-#define True	1
-#define False	0
-/*--------------------------------------------------------------------------
-**					Global Variables
-*/
-  static int	EL737_call_depth = 0;
-  static char	EL737_routine[5][64];
-  static int	EL737_errcode = 0;
-  static int	EL737_errno, EL737_vaxc_errno;
-/*
-**---------------------------------------------------------------------------
-**		EL737_AddCallStack:  Add a routine name to the call stack.
-**				     This allows EL737_ErrInfo to generate a
-**				     trace-back in case of error.
-*/
-  int	EL737_AddCallStack (
-/*	==================
-*/		struct EL737info    *pntr,
-		char		    *name) {
-
-    if (EL737_errcode != 0) return False;
-
-    if (EL737_call_depth < 5) {
-      strcpy (EL737_routine[EL737_call_depth], name);
-      EL737_call_depth++;
-    }
-
-    if (pntr == NULL) {EL737_errcode = EL737__NOT_OPEN; return False;}
-
-    if (pntr->asyn_info.skt <= 0) {
-      memset (pntr->from_host.msg_size,
-		'0', sizeof (pntr->from_host.msg_size));
-      EL737_errcode = (pntr->asyn_info.skt < 0) ? EL737__FORCED_CLOSED
-						: EL737__NO_SOCKET;
-      return False;
-    }
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL737_Close:  Close a connection to an EL737 counter.
-*/
-  int	EL737_Close (
-/*	===========
-*/		void	**handle,
-		int	  force_flag) {
-
-    struct EL737info	*info_ptr;
-    char		buff[4];
-
-    info_ptr = (struct EL737info *) *handle;
-    if (info_ptr == NULL) return True;
-
-    if (info_ptr->asyn_info.skt != 0) {
-      if (info_ptr->asyn_info.skt > 0) {
-	AsynSrv_Close (*handle, force_flag);
-      }
-    }
-    free (*handle);
-    *handle = NULL;
-
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL737_Config:  Configure a connection to an EL737 counter.
-*/
-  int	EL737_Config (
-/*	============
-*/		void	**handle,
-		...) {
-
-    char		 buff[16];
-    va_list		 ap;		/* Pointer to variable args */
-    char		*txt_ptr;
-    int			 intval;
-    struct EL737info	*info_ptr;
-		    /*----------------------------------------------
-		    */
-    info_ptr = (struct EL737info *) *handle;
-
-    if (!EL737_AddCallStack (info_ptr, "EL737_Config")) return False;
-		    /*----------------------------------------------
-		    */
-    va_start (ap, handle);	    /* Set up var arg machinery */
-    txt_ptr = va_arg (ap, char *);  /* Get pntr to first parameter ident */
-    while (txt_ptr != NULL) {
-      if (strcmp (txt_ptr, "msecTmo") == 0) {
-	intval = va_arg (ap, int);
-	if ((intval < 100) || (intval > 999999)) {
-	  EL737_errcode = EL737__BAD_PAR; return False;
-	}
-	sprintf (buff, "%04d", intval/100);	/* Convert to ASCII as ..
-						** .. deci-secs */
-	memcpy (info_ptr->asyn_info.tmo, buff, 4);
-      }else if (strcmp (txt_ptr, "eot") == 0) {
-	txt_ptr = va_arg (ap, char *);
-	if (txt_ptr == NULL) {
-	  EL737_errcode = EL737__BAD_PAR; return False;
-	}
-	memcpy (info_ptr->asyn_info.eot, "\0\0\0\0", 4);
-	switch (txt_ptr[0]) {
-	 case '3': info_ptr->asyn_info.eot[3] = txt_ptr[3];
-	 case '2': info_ptr->asyn_info.eot[2] = txt_ptr[2];
-	 case '1': info_ptr->asyn_info.eot[1] = txt_ptr[1];
-	 case '0':
-	    info_ptr->asyn_info.eot[0] = txt_ptr[0];
-	    break;
-	 default:
-	    EL737_errcode = EL737__BAD_PAR; return False;
-	}
-      }else {
-	EL737_errcode = EL737__BAD_PAR; return False;
-      }
-      txt_ptr = va_arg (ap, char *);	/* Get pntr to next parameter ident */
-    }
-
-    if (EL737_errcode != 0) return False;
-    EL737_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL737_Continue:  Continue a measurement with an EL737 counter.
-*/
-  int	EL737_Continue (
-/*	==============
-*/		void	**handle,
-		int	*status) {
-
-    int			    my_status;
-    struct EL737info	   *info_ptr;
-    char		   *rply_ptr0, *rply_ptr1;
-		    /*----------------------------------------------
-		    */
-    *status = 0;
-    info_ptr = (struct EL737info *) *handle;
-
-    if (!EL737_AddCallStack (info_ptr, "EL737_Continue")) return False;
-		    /*----------------------------------------------
-		    ** Send CO and RS cmnds to EL737
-		    */
-    my_status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			    &info_ptr->to_host, &info_ptr->from_host,
-			    "CO\r", "RS\r", NULL);
-    if (!my_status) {
-      EL737_errcode = EL737__BAD_ASYNSRV;
-      return False;
-    }
-    rply_ptr1 = NULL;
-    rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-    if (rply_ptr0 != NULL) rply_ptr1 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, rply_ptr0);
-
-    if (rply_ptr0 == NULL) rply_ptr0 = "?";
-    if (rply_ptr1 == NULL) rply_ptr1 = "?";
-    if ( ((*rply_ptr0 == '\0') || (*rply_ptr0 == '\r') ) &&
-        (sscanf (rply_ptr1, "%d", status) == 1)) {
-      if (EL737_errcode != 0) return False;
-      EL737_call_depth--;
-      return True;
-    }
-    *status = 0;
-    EL737_SetErrcode (info_ptr, rply_ptr0, "CO\" or \"RS");
-    return False;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL737_EnableThresh:  Enable/disable Threshold Monitoring.
-*/
-  int	EL737_EnableThresh (
-/*	==================
-*/		void	**handle,
-		int       indx) {
-
-    int			 status;
-    char		 cmnd[20];
-    struct EL737info	*info_ptr;
-    char		*rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    info_ptr = (struct EL737info *) *handle;
-
-    if (!EL737_AddCallStack (info_ptr, "EL737_EnableThresh")) return False;
-
-    if ((indx < 0) || (indx > 8)) {
-      EL737_errcode = EL737__BAD_PAR; return False;
-    }
-		    /*----------------------------------------------
-		    ** Send "DR <indx>" cmnd to EL737 to select the
-		    ** "active" threshold rate counter.
-		    */
-    sprintf (cmnd, "DR %d\r", indx);
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-		    &info_ptr->to_host, &info_ptr->from_host,
-		    cmnd, NULL);
-    if (!status) {
-      EL737_errcode = EL737__BAD_ASYNSRV; return False;
-    }
-    rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-    if (rply_ptr0 == NULL) rply_ptr0 = "?";
-    if ( (*rply_ptr0 == '\0') || (*rply_ptr0 == '\r') ) {
-      EL737_call_depth--;
-      return True;
-    }
-    EL737_SetErrcode (info_ptr, rply_ptr0, cmnd);
-    return False;
-  }
-/*
-** -------------------------------------------------------------------------
-**		EL737_ErrInfo:  Return detailed status from last operation.
-*/
-  void	EL737_ErrInfo (
-/*	=============
-*/		char	**entry_txt,
-		int	*errcode,
-		int	*my_errno,
-		int	*vaxc_errno) {
-
-    int		i;
-    char	buff[80];
-    int		asyn_errcode, asyn_errno, asyn_vaxerrno;
-    char*	asyn_errtxt;
-
-    if (EL737_call_depth <= 0) {
-      strcpy (EL737_routine[0], "EL737_no_error_detected");
-      *errcode	  = 0;
-      *my_errno	  = 0;
-      *vaxc_errno = 0;
-    }else {
-      if (EL737_call_depth > 1) {		    /* Concatenate the names */
-	for (i = 1; i < EL737_call_depth; i++) {
-	  strcat (EL737_routine[0], "/");
-	  StrJoin (EL737_routine[0], sizeof (EL737_routine),
-			    EL737_routine[0], EL737_routine[i]);
-	}
-      }
-      *errcode	  = EL737_errcode;
-      *my_errno	  = EL737_errno;
-      *vaxc_errno = EL737_vaxc_errno;
-      switch (EL737_errcode) {
-	case EL737__BAD_ASYNSRV:    strcpy (buff, "/EL737__BAD_ASYNSRV"); break;
-	case EL737__BAD_BSY:	    strcpy (buff, "/EL737__BAD_BSY"); break;
-	case EL737__BAD_CMD:	    strcpy (buff, "/EL737__BAD_CMD"); break;
-	case EL737__BAD_CNTR:	    strcpy (buff, "/EL737__BAD_CNTR"); break;
-	case EL737__BAD_DEV:	    strcpy (buff, "/EL737__BAD_DEV"); break;
-	case EL737__BAD_ILLG:	    strcpy (buff, "/EL737__BAD_ILLG"); break;
-	case EL737__BAD_LOC:	    strcpy (buff, "/EL737__BAD_LOC"); break;
-	case EL737__BAD_MALLOC:	    strcpy (buff, "/EL737__BAD_MALLOC"); break;
-	case EL737__BAD_OFL:	    strcpy (buff, "/EL737__BAD_OFL"); break;
-	case EL737__BAD_OVFL:	    strcpy (buff, "/EL737__BAD_OVFL"); break;
-	case EL737__BAD_PAR:	    strcpy (buff, "/EL737__BAD_PAR"); break;
-	case EL737__BAD_SOCKET:	    strcpy (buff, "/EL737__BAD_SOCKET"); break;
-	case EL737__BAD_TMO:	    strcpy (buff, "/EL737__BAD_TMO"); break;
-	case EL737__CNTR_OVFL:	    strcpy (buff, "/EL737__CNTR_OVFL"); break;
-	case EL737__FORCED_CLOSED:  strcpy (buff, "/EL737__FORCED_CLOSED"); break;
-	case EL737__NOT_OPEN:	    strcpy (buff, "/EL737__NOT_OPEN"); break;
-	case EL737__NO_SOCKET:	    strcpy (buff, "/EL737__NO_SOCKET"); break;
-	case EL737__NO_VALUE:	    strcpy (buff, "/EL737__NO_VALUE"); break;
-	default: sprintf (buff, "/EL737__unknown_err_code: %d", EL737_errcode);
-      }
-      StrJoin (EL737_routine[0], sizeof(EL737_routine), EL737_routine[0], buff);
-    }
-    AsynSrv_ErrInfo (&asyn_errtxt, &asyn_errcode, &asyn_errno, &asyn_vaxerrno);
-    if (asyn_errcode != 0) {
-      strcat (EL737_routine[0], "/");
-      StrJoin (EL737_routine[0], sizeof(EL737_routine),
-		    EL737_routine[0], asyn_errtxt);
-    }
-    *entry_txt = EL737_routine[0];
-    EL737_call_depth = 0;
-    EL737_errcode = 0;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL737_GetMonIntegTime:  Get DI register value for a counter.
-*/
-  int	EL737_GetMonIntegTime (
-/*	=====================
-*/		void	**handle,
-		int	  indx,
-		float    *mon_integ_time) {
-
-    int			    status;
-    char		    cmnd[20];
-    struct EL737info	   *info_ptr;
-    char		   *rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    *mon_integ_time = 0.1;
-    info_ptr = (struct EL737info *) *handle;
-
-    if (!EL737_AddCallStack (info_ptr, "EL737_GetMonIntegTime")) return False;
-		    /*----------------------------------------------
-		    ** Send "DI <indx>" cmnd to EL737
-		    */
-    sprintf (cmnd, "DI %d\r", indx);
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			cmnd, NULL);
-    if (!status) {
-      EL737_errcode = EL737__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr0 == NULL) rply_ptr0 = "?";
-      if (sscanf (rply_ptr0, "%f", mon_integ_time) == 1) {
-	if (EL737_errcode != 0) return False;
-	EL737_call_depth--;
-	return True;
-      }
-      *mon_integ_time = 0.1;
-      EL737_SetErrcode (info_ptr, rply_ptr0, cmnd);
-      return False;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL737_GetRateIntegTime:  Get DT register value.
-*/
-  int	EL737_GetRateIntegTime (
-/*	======================
-*/		void	**handle,
-		float    *rate_integ_time) {
-
-    int			    status;
-    struct EL737info	   *info_ptr;
-    char		   *rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    *rate_integ_time = 0.1;
-    info_ptr = (struct EL737info *) *handle;
-
-    if (!EL737_AddCallStack (info_ptr, "EL737_GetRateIntegTime")) return False;
-		    /*----------------------------------------------
-		    ** Send DT cmnd to EL737
-		    */
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			"DT\r", NULL);
-    if (!status) {
-      EL737_errcode = EL737__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr0 == NULL) rply_ptr0 = "?";
-      if (sscanf (rply_ptr0, "%f", rate_integ_time) == 1) {
-	if (EL737_errcode != 0) return False;
-	EL737_call_depth--;
-	return True;
-      }
-      EL737_SetErrcode (info_ptr, rply_ptr0, "DT");
-      *rate_integ_time = 0.1;
-      return False;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL737_GetStatus:  Get RA/RS register values.
-*/
-  int	EL737_GetStatus (
-/*	===============
-*/		void	**handle,
-		int      *c1,
-		int      *c2,
-		int      *c3,
-		int      *c4,
-		float    *timer,
-		int	 *rs) {
-
-    int			i, status, nvals;
-    struct EL737info	*info_ptr;
-    char		*rply_ptr, *p_cmnd;
-		    /*----------------------------------------------
-		    */
-    *c1 = *c2 = *c3 = *c4 = *rs = 0; *timer = 0.0;
-    info_ptr = (struct EL737info *) *handle;
-
-    if (!EL737_AddCallStack (info_ptr, "EL737_GetStatus")) return False;
-    info_ptr->c5 = info_ptr->c6 = info_ptr->c7 = info_ptr->c8 = 0;
-		    /*----------------------------------------------
-		    ** Send RA and RS cmnds to EL737. Since this routine gets
-		    ** used such a lot, try up to 3 times if a syntax error in
-		    ** the reply is detected.
-		    */
-    for (i = 0; i < 3; i++) {
-      status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			"RA\r", "RS\r", NULL);
-      if (!status) {EL737_errcode = EL737__BAD_ASYNSRV; return False;}
-      p_cmnd = "RA";
-      rply_ptr = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr != NULL) {
-	nvals = sscanf (rply_ptr, "%f %d %d %d %d %d %d %d %d",
-				timer, c1, c2, c3, c4,
-				&info_ptr->c5, &info_ptr->c6,
-				&info_ptr->c7, &info_ptr->c8);
-	if (nvals != 9) nvals = sscanf (rply_ptr, "%d %d %d %d %f",
-				c1, c2, c3, c4, timer);
-	if (nvals == 5) {
-	  info_ptr->c5 = info_ptr->c6 = info_ptr->c7 = info_ptr->c8 = 0;
-	  nvals = 9;
-	}
-	if (nvals == 9) {
-	  p_cmnd = "RS";
-	  rply_ptr = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, rply_ptr);
-	  if (rply_ptr != NULL) {
-	    if (sscanf (rply_ptr, "%d", rs) == 1) {
-	      EL737_call_depth--;
-	      return True;
-	    }
-	  }
-	}
-      }
-    }
-    if (rply_ptr == NULL) rply_ptr = "?";
-    EL737_SetErrcode (info_ptr, rply_ptr, p_cmnd);
-    *c1 = *c2 = *c3 = *c4 = *rs = 0; *timer = 0.0;
-    return False;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL737_GetStatusExtra:  Get values of extra counters.
-*/
-  int	EL737_GetStatusExtra (
-/*	====================
-*/		void	**handle,
-		int      *c5,
-		int      *c6,
-		int      *c7,
-		int      *c8) {
-
-    struct EL737info	*info_ptr;
-		    /*----------------------------------------------
-		    */
-    *c5 = *c6 = *c7 = *c8 = 0;
-    info_ptr = (struct EL737info *) *handle;
-
-    if (!EL737_AddCallStack (info_ptr, "EL737_GetStatusExtra")) return False;
-
-    *c5 = info_ptr->c5;
-    *c6 = info_ptr->c6;
-    *c7 = info_ptr->c7;
-    *c8 = info_ptr->c8;
-
-    if (EL737_errcode != 0) return False;
-    EL737_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL737_GetThresh:  Get threshold monitoring status.
-*/
-  int	EL737_GetThresh (
-/*	===============
-*/		void	**handle,
-		int      *indx,
-		float	 *val) {
-
-    int			 status, my_indx;
-    float		 my_val;
-    char		 cmnd[20];
-    struct EL737info	*info_ptr;
-    char		*rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    *indx = 0;
-    *val  = 0.0;
-    info_ptr = (struct EL737info *) *handle;
-
-    if (!EL737_AddCallStack (info_ptr, "EL737_GetThresh")) return False;
-		    /*----------------------------------------------
-		    ** Send DR cmnd to EL737 to get the number of the
-		    ** "active" threshold rate counter.
-		    */
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			"DR\r", NULL);
-    if (!status) {
-      EL737_errcode = EL737__BAD_ASYNSRV;
-      return False;
-    }
-    rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-    if (rply_ptr0 == NULL) rply_ptr0 = "?";
-    if ((sscanf (rply_ptr0, "%d", &my_indx) == 1) &&
-	(my_indx >= 0) &&
-	(my_indx <= 8)) {
-      *indx = my_indx;
-      if (my_indx != 0) {
-		    /*----------------------------------------------
-		    ** Now send DL cmnd to EL737 to get the threshold value.
-		    */
-	sprintf (cmnd, "DL %d\r", my_indx);
-	status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			cmnd, NULL);
-	if (!status) {
-	  EL737_errcode = EL737__BAD_ASYNSRV;
-	  return False;
-	}
-	rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-	if (rply_ptr0 == NULL) rply_ptr0 = "?";
-	if (sscanf (rply_ptr0, "%f", &my_val) == 1) {
-	  *val = my_val;
-	  EL737_call_depth--;
-	  return True;
-	}
-      }else {
-	*val = 0.0;
-	EL737_call_depth--;
-	return True;
-      }
-    }
-    EL737_SetErrcode (info_ptr, rply_ptr0, cmnd);
-    return False;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL737_Open:  Open a connection to an EL737 counter.
-*/
-  int	EL737_Open (
-/*	==========
-*/		void	**handle,
-		char	*host,
-		int	 port,
-		int	 chan) {
-
-    int			    status, c1, c2, c3, c4, nvals;
-    float		    timer;
-    struct EL737info	   *my_handle;
-    char		    tmo_save[4];
-    char		   *rply_ptr;
-    char		   *rply_ptr0;
-    char		   *rply_ptr1;
-    char		   *rply_ptr2;
-/*--------------------------------------------------------
-**			Initialise the error info stack and pre-set the
-**			routine name (in case of error).
-*/
-    EL737_errcode = EL737_errno = EL737_vaxc_errno = 0;
-    strcpy (EL737_routine[0], "EL737_Open");	
-    EL737_call_depth = 1;
-/*--------------------------------------------------------
-**				    Assume trouble
-*/
-    *handle = NULL;
-/*--------------------------------------------------------
-**			    Reserve space for the data we need to store.
-*/
-    my_handle = (struct EL737info *) malloc (sizeof (*my_handle));
-    if (my_handle == NULL) {
-      EL737_errcode = EL737__BAD_MALLOC;	    /* malloc failed!! */
-      return False;
-    }
-/*--------------------------------------------------------
-**				    Set up the connection
-*/
-    StrJoin (my_handle->asyn_info.host, sizeof (my_handle->asyn_info.host),
-			    host, "");
-    my_handle->asyn_info.port = port;
-    my_handle->asyn_info.chan = chan;
-    status = AsynSrv_Open (&my_handle->asyn_info);
-    if (!status) {
-      EL737_errcode = EL737__BAD_SOCKET;
-      GetErrno (&EL737_errno, &EL737_vaxc_errno);   /* Save errno info */
-      fprintf (stderr, "\nEL737_Open/AsynSrv_Open: "
-			"Failed to make connection.\n");
-      free (my_handle);
-      return False;
-    }
-
-    memcpy (tmo_save, my_handle->asyn_info.tmo, 4);
-    EL737_Config ((void *) &my_handle,
-	"msecTmo", 500,		/* Set a short time-out initially since
-				** there should be no reason for the RMT,
-				** ECHO or RA commands to take very long
-				*/
-	"eot", "1\r",
-	NULL);
-	    /*
-	    ** Now ensure the EL737 is on-line. The first "RMT 1" command can
-	    ** fail due to pending characters in the EL737 input buffer causing
-	    ** the "RMT 1" to be corrupted. The response of the EL737 to this
-	    ** command is ignored for this reason (but the AsynSrv_SendCmnds
-	    ** status must be OK otherwise it indicates a network problem).
-	    */
-    status = AsynSrv_SendCmnds (&my_handle->asyn_info,
-			&my_handle->to_host, &my_handle->from_host,
-			"RMT 1\r", NULL);
-    if (status) {
-      status = AsynSrv_SendCmnds (&my_handle->asyn_info,
-			&my_handle->to_host, &my_handle->from_host,
-			"RMT 1\r", "ECHO 2\r", "RA\r", NULL);
-    }
-    if (!status) {
-		    /* Some error occurred in AsynSrv_SendCmnds */
-      EL737_errcode = EL737__BAD_ASYNSRV;
-      AsynSrv_Close (&my_handle->asyn_info, False);
-      free (my_handle);
-      return False;
-    }else {
-		    /* Check the responses carefully.
-		    */
-      rply_ptr1 = rply_ptr2 = NULL;
-      rply_ptr0 = AsynSrv_GetReply (
-		    &my_handle->asyn_info, &my_handle->from_host, NULL);
-      if (rply_ptr0 != NULL) rply_ptr1 = AsynSrv_GetReply (
-		    &my_handle->asyn_info, &my_handle->from_host, rply_ptr0);
-      if (rply_ptr1 != NULL) rply_ptr2 = AsynSrv_GetReply (
-		    &my_handle->asyn_info, &my_handle->from_host, rply_ptr1);
-
-      if (rply_ptr0 == NULL) rply_ptr0 = "?";
-      if (rply_ptr1 == NULL) rply_ptr1 = "?";
-      if (rply_ptr2 == NULL) rply_ptr2 = "?";
-
-      if (*rply_ptr1 == '?') rply_ptr0 = rply_ptr1;
-      if (*rply_ptr2 == '?') rply_ptr0 = rply_ptr2;
-      if (*rply_ptr0 != '?') {
-	nvals = sscanf (rply_ptr2, "%f %d %d %d %d %d %d %d %d",
-				&timer, &c1, &c2, &c3, &c4,
-				&my_handle->c5, &my_handle->c6,
-				&my_handle->c7, &my_handle->c8);
-	if (nvals != 9) nvals = sscanf (rply_ptr2, "%d %d %d %d %f",
-				&c1, &c2, &c3, &c4, &timer);
-	if (nvals == 5) {
-	  my_handle->c5 = my_handle->c6 = my_handle->c7 = my_handle->c8 = 0;
-	  nvals = 9;
-	}
-	if (nvals != 9) {
-	  EL737_errcode = EL737__BAD_DEV;	    /* Device is not EL737 */
-	  AsynSrv_Close (&my_handle->asyn_info, False);
-	  free (my_handle);
-	  return False;
-	}
-	memcpy (my_handle->asyn_info.tmo, tmo_save, 4);	 /* Restore time-out */
-			/*
-			** The connection is complete. Pass the data structure
-			** back to the caller as a handle.
-			*/
-	*handle = my_handle;
-	if (EL737_errcode != 0) return False;
-	EL737_call_depth--;
-	return True;
-      }else {
-	EL737_SetErrcode (my_handle, rply_ptr0, "RMT\", \"ECHO\" or \"RA");
-      }
-    }
-    AsynSrv_Close (&my_handle->asyn_info, False);
-    free (my_handle);
-    return False;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL737_Pause:  Pause a measurement with an EL737 counter.
-*/
-  int	EL737_Pause (
-/*	===========
-*/		void	**handle,
-		int	*status) {
-
-    int			    my_status;
-    struct EL737info	   *info_ptr;
-    char		   *rply_ptr0, *rply_ptr1;
-		    /*----------------------------------------------
-		    */
-    *status = 0;
-    info_ptr = (struct EL737info *) *handle;
-
-    if (!EL737_AddCallStack (info_ptr, "EL737_Pause")) return False;
-		    /*----------------------------------------------
-		    ** Send PS and RS cmnds to EL737
-		    */
-    my_status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-		    &info_ptr->to_host, &info_ptr->from_host,
-		    "PS\r", "RS\r", NULL);
-    if (!my_status) {
-      EL737_errcode = EL737__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr1 = NULL;
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr0 != NULL) rply_ptr1 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, rply_ptr0);
-
-      if (rply_ptr0 == NULL) rply_ptr0 = "?";
-      if (rply_ptr1 == NULL) rply_ptr1 = "?";
-      if ( ((*rply_ptr0 == '\0') || (*rply_ptr0 == '\r') )  &&
-          (sscanf (rply_ptr1, "%d", status) == 1)) {
-	if (EL737_errcode != 0) return False;
-	EL737_call_depth--;
-	return True;
-      }
-      EL737_SetErrcode (info_ptr, rply_ptr0, "PS\" or \"RS");
-      *status = 0;
-      return False;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL737_SendCmnd - Send a command to RS232C server.
-*/
-  int	EL737_SendCmnd (
-/*	==============
-*/		void    **handle,
-		char	 *cmnd,
-		char	 *rply,
-		int	  rply_size) {
-
-    struct EL737info	*info_ptr;
-    int			 my_status;
-    char		*rply_ptr;
-		    /*----------------------------------------------
-		    */
-    info_ptr = (struct EL737info *) *handle;
-
-    if (!EL737_AddCallStack (info_ptr, "EL737_SendCmnd")) return False;
-		    /*----------------------------------------------
-		    ** Send command to EL737.
-		    */
-    my_status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			cmnd, NULL);
-    if (!my_status) {
-      EL737_errcode = EL737__BAD_ASYNSRV; return False;
-    }else {
-      rply_ptr = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr == NULL) rply_ptr = "?";
-      StrJoin (rply, rply_size, rply_ptr, "");
-    }
-
-    if (EL737_errcode != 0) return False;
-    EL737_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL737_SetErrcode - Set up EL737_errcode
-*/
-  int	EL737_SetErrcode (
-/*	================
-*/		struct EL737info    *info_ptr,
-		char		    *response,
-		char		    *cmnd) {
-
-    int		 status, s_len;
-    char	*rply;
-    char	 tmo_save[4];
-    char	 eot_save[4];
-
-    EL737_errcode = EL737__BAD_ILLG;
-    if (strcmp (response, "?OF" ) == 0) EL737_errcode = EL737__BAD_LOC;
-    if (strcmp (response, "?OFL") == 0) EL737_errcode = EL737__BAD_OFL;
-    if (strcmp (response, "?OV" ) == 0) EL737_errcode = EL737__BAD_OVFL;
-    if (strcmp (response, "?1"  ) == 0) EL737_errcode = EL737__BAD_CMD;
-    if (strcmp (response, "?2"  ) == 0) EL737_errcode = EL737__BAD_BSY;
-    if (strcmp (response, "?3"  ) == 0) EL737_errcode = EL737__BAD_PAR;
-    if (strcmp (response, "?4"  ) == 0) EL737_errcode = EL737__BAD_CNTR;
-    if (strcmp (response, "?5"  ) == 0) EL737_errcode = EL737__NO_VALUE;
-    if (strcmp (response, "?6"  ) == 0) EL737_errcode = EL737__CNTR_OVFL;
-    if (strncmp (response, "?TMO", 4) == 0) EL737_errcode = EL737__BAD_TMO;
-
-    if ((EL737_errcode == EL737__BAD_ILLG) && (cmnd != NULL)) {
-      s_len = strlen (cmnd);
-      if (cmnd[s_len-1] == '\r') s_len--;
-      fprintf (stderr, " Unrecognised response to \"%.*s\" command: \"%s\"\n",
-	    s_len, cmnd, response);
-    }
-
-    return EL737_errcode;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL737_SetThresh:  Set threshold monitoring level.
-*/
-  int	EL737_SetThresh (
-/*	===============
-*/		void	**handle,
-		int       indx,
-		float	  val) {
-
-    int			 status;
-    char		 cmnd[32];
-    struct EL737info	*info_ptr;
-    char		*rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    info_ptr = (struct EL737info *) *handle;
-
-    if (!EL737_AddCallStack (info_ptr, "EL737_SetThresh")) return False;
-
-    if ((indx < 0) || (indx > 8)) {
-      EL737_errcode = EL737__BAD_PAR; return False;
-    }
-		    /*----------------------------------------------
-		    ** If <indx> is zero, simply call EL737_EnableThresh to
-		    ** disable threshold monitoring by the counter.
-		    */
-    if (indx == 0) {
-      return EL737_EnableThresh (handle, 0);
-    }
-		    /*----------------------------------------------
-		    ** Send "DR <indx> |<val>|" cmnd to EL737 to set the
-		    ** threshold for counter <indx>.
-		    */
-    sprintf (cmnd, "DL %d %.3f\r", indx, fabs (val));
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-		    &info_ptr->to_host, &info_ptr->from_host,
-		    cmnd, NULL);
-    if (!status) {
-      EL737_errcode = EL737__BAD_ASYNSRV; return False;
-    }
-    rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-    if (rply_ptr0 == NULL) rply_ptr0 = "?";
-    if ( (*rply_ptr0 == '\0') || (*rply_ptr0 == '\r') ) {
-      if (val >= 0) return EL737_EnableThresh (handle, indx);
-      EL737_call_depth--;
-      return True;
-    }
-    EL737_SetErrcode (info_ptr, rply_ptr0, cmnd);
-    return False;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL737_StartCnt:  Start a preset cnt measurement with an EL737.
-*/
-  int	EL737_StartCnt (
-/*	==============
-*/		void	**handle,
-		int	 count,
-		int	*status) {
-
-    int			    my_status;
-    char		    cmnd[20];
-    struct EL737info	   *info_ptr;
-    char		   *rply_ptr0, *rply_ptr1;
-		    /*----------------------------------------------
-		    */
-    *status = 0;
-    info_ptr = (struct EL737info *) *handle;
-
-    if (!EL737_AddCallStack (info_ptr, "EL737_StartCnt")) return False;
-		    /*----------------------------------------------
-		    ** Send MP and RS cmnds to EL737
-		    */
-    sprintf (cmnd, "MP %d\r", count);	    /* Encode an appropriate command */
-    my_status = AsynSrv_SendCmnds (&info_ptr->asyn_info,	/* Send it */
-		    &info_ptr->to_host, &info_ptr->from_host,
-		    cmnd, "RS\r", NULL);
-    if (!my_status) {
-      EL737_errcode = EL737__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr1 = NULL;
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr0 != NULL) rply_ptr1 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, rply_ptr0);
-
-      if (rply_ptr0 == NULL) rply_ptr0 = "?";
-      if (rply_ptr1 == NULL) rply_ptr1 = "?";
-      if ( ((*rply_ptr0 == '\0') || (*rply_ptr0 == '\r') ) &&
-          (sscanf (rply_ptr1, "%d", status) == 1)) {
-	if (EL737_errcode != 0) return False;
-	EL737_call_depth--;
-	return True;
-      }
-      EL737_SetErrcode (info_ptr, rply_ptr0, cmnd);
-      *status = 0;
-      return False;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL737_StartTime:  Start a preset time measurement with an EL737.
-*/
-  int	EL737_StartTime (
-/*	===============
-*/		void	**handle,
-		float	 timer,
-		int	*status) {
-
-    int			    my_status;
-    char		    cmnd[20];
-    struct EL737info	   *info_ptr;
-    char		   *rply_ptr0, *rply_ptr1;
-		    /*----------------------------------------------
-		    */
-    *status = 0;
-    info_ptr = (struct EL737info *) *handle;
-
-    if (!EL737_AddCallStack (info_ptr, "EL737_StartTime")) return False;
-		    /*----------------------------------------------
-		    ** Send TP and RS cmnds to EL737
-		    */
-    sprintf (cmnd, "TP %.2f\r", timer);	    /* Encode an appropriate command */
-    my_status = AsynSrv_SendCmnds (&info_ptr->asyn_info,	/* Send it */
-		    &info_ptr->to_host, &info_ptr->from_host,
-		    cmnd, "RS\r", NULL);
-    if (!my_status) {
-      EL737_errcode = EL737__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr1 = NULL;
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr0 != NULL) rply_ptr1 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, rply_ptr0);
-
-      if (rply_ptr0 == NULL) rply_ptr0 = "?";
-      if (rply_ptr1 == NULL) rply_ptr1 = "?";
-      if ( ((*rply_ptr0 == '\0') || (*rply_ptr0 == 'r') ) &&
-          (sscanf (rply_ptr1, "%d", status) == 1)) {
-	if (EL737_errcode != 0) return False;
-	EL737_call_depth--;
-	return True;
-      }
-      EL737_SetErrcode (info_ptr, rply_ptr0, cmnd);
-      *status = 0;
-      return False;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL737_Stop:  stop a measurement with an EL737 counter.
-*/
-  int	EL737_Stop (
-/*	==========
-*/		void	**handle,
-		int      *c1,
-		int      *c2,
-		int      *c3,
-		int      *c4,
-		float    *timer,
-		int	 *rs) {
-
-    int			    my_status, nvals;
-    struct EL737info	   *info_ptr;
-    char		   *rply_ptr0, *rply_ptr1, *rply_ptr2;
-		    /*----------------------------------------------
-		    */
-    *c1 = *c2 = *c3 = *c4 = *rs = 0; *timer = 0.0;
-    info_ptr = (struct EL737info *) *handle;
-
-    if (!EL737_AddCallStack (info_ptr, "EL737_Stop")) return False;
-		    /*----------------------------------------------
-		    ** Send S, RS and RA cmnds to EL737
-		    */
-    my_status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			"S\r", "RS\r", "RA\r", NULL);
-    if (!my_status) {
-      EL737_errcode = EL737__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr1 = rply_ptr2 = NULL;
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr0 != NULL) rply_ptr1 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, rply_ptr0);
-      if (rply_ptr1 != NULL) rply_ptr2 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, rply_ptr1);
-
-      if (rply_ptr0 == NULL) rply_ptr0 = "?";
-      if (rply_ptr1 == NULL) rply_ptr1 = "?";
-      if (rply_ptr2 == NULL) rply_ptr2 = "?";
-
-      nvals = sscanf (rply_ptr2, "%f %d %d %d %d %d %d %d %d",
-				timer, c1, c2, c3, c4,
-				&info_ptr->c5, &info_ptr->c6,
-				&info_ptr->c7, &info_ptr->c8);
-      if (nvals != 9) nvals = sscanf (rply_ptr2, "%d %d %d %d %f",
-				c1, c2, c3, c4, timer);
-      if (nvals == 5) {
-        info_ptr->c5 = info_ptr->c6 = info_ptr->c7 = info_ptr->c8 = 0;
-	nvals = 9;
-      }
-      if ( ((*rply_ptr0 == '\0')  || (*rply_ptr0 == '\r') )&&
-          (sscanf (rply_ptr1, "%d", rs) == 1) &&
-	  (nvals == 9)) {
-	if (EL737_errcode != 0) return False;
-	EL737_call_depth--;
-	return True;
-      }
-      if (*rply_ptr0 != '?') {
-        if (*rply_ptr1 == '?') rply_ptr0 = rply_ptr1;
-        if (*rply_ptr0 == '?') rply_ptr0 = rply_ptr2;
-      }
-      EL737_SetErrcode (info_ptr, rply_ptr0, "S\", \"RS\" or \"RA");
-      *c1 = *c2 = *c3 = *c4 = *rs = 0; *timer = 0.0;
-      return False;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL737_StopFast:  stop a measurement with an EL737 counter.
-*/
-  int	EL737_StopFast (
-/*	==============
-*/		void	**handle) {
-
-    int			    my_status, nvals;
-    struct EL737info	   *info_ptr;
-    char		   *rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    info_ptr = (struct EL737info *) *handle;
-
-    if (!EL737_AddCallStack (info_ptr, "EL737_StopFast")) return False;
-		    /*----------------------------------------------
-		    ** Send S cmnd to EL737
-		    */
-    my_status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			"S\r", NULL);
-    if (!my_status) {
-      EL737_errcode = EL737__BAD_ASYNSRV;
-      return False;
-    }else {
-      rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-
-      if (rply_ptr0 == NULL) rply_ptr0 = "?";
-
-      if ( (*rply_ptr0 == '\0' || (*rply_ptr0 == '\r') ) ) {
-	if (EL737_errcode != 0) return False;
-	EL737_call_depth--;
-	return True;
-      }
-      EL737_SetErrcode (info_ptr, rply_ptr0, "S");
-      return False;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL737_WaitIdle:  Wait till RS goes to zero.
-*/
-  int	EL737_WaitIdle (
-/*	==============
-*/		void	**handle,
-		int      *c1,
-		int      *c2,
-		int      *c3,
-		int      *c4,
-		float    *timer) {
-#ifdef __VMS
-#include	<lib$routines.h>
-#define hibernate   lib$wait (0.25)
-#else
-#include    <unistd.h>
-#include    <time.h>
-    struct timespec	delay = {0, 250000000};
-    struct timespec	delay_left;
-#ifdef LINUX    
-#define hibernate   nanosleep(&delay, &delay_left)
-#else
-#define hibernate   nanosleep_d9 (&delay, &delay_left)
-#endif
-
-#endif
-    int			 my_rs;
-    struct EL737info	*info_ptr;
-		    /*----------------------------------------------
-		    */
-    *c1 = *c2 = *c3 = *c4 = 0; *timer = 0.0;
-    info_ptr = (struct EL737info *) *handle;
-
-    if (!EL737_AddCallStack (info_ptr, "EL737_WaitIdle")) return False;
-		    /*----------------------------------------------
-		    ** Keep reading status till idle.
-		    */
-    while (EL737_GetStatus (handle, c1, c2, c3, c4, timer, &my_rs)) {
-      if (my_rs == 0) {
-	if (EL737_errcode != 0) return False;
-	EL737_call_depth--;
-	return True;
-      }
-      hibernate;
-    }
-    return False;   /* Error detected in EL737_GetStatus */
-  }
-/*-------------------------------------------- End of EL737_Utility.C =======*/
diff --git a/hardsup/el737fix.h b/hardsup/el737fix.h
deleted file mode 100644
index 4c7d0a17..00000000
--- a/hardsup/el737fix.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*---------------------------------------------------------------------------
-  Fix file for David renaming lots of el734 error codes.
-  
-  Mark Koennecke, October 1998
-----------------------------------------------------------------------------*/
-#ifndef EL737FIX
-#define EL737FIX
-#include "asynsrv_errcodes.h"
-
-#define EL737__BAD_HOST	 ASYNSRV__BAD_HOST
-#define EL737__BAD_BIND	 ASYNSRV__BAD_BIND
-#define EL737__BAD_SENDLEN   ASYNSRV__BAD_SEND_LEN 
-#define EL737__BAD_SEND	 ASYNSRV__BAD_SEND
-#define EL737__BAD_SEND_PIPE  ASYNSRV__BAD_SEND_PIPE
-#define EL737__BAD_SEND_UNKN ASYNSRV__BAD_SEND_UNKN
-#define EL737__BAD_RECV    ASYNSRV__BAD_RECV
-#define EL737__BAD_RECV_PIPE  ASYNSRV__BAD_RECV_PIPE
-#define EL737__BAD_RECV_NET   ASYNSRV__BAD_RECV_NET
-#define EL737__BAD_SEND_NET   ASYNSRV__BAD_SEND_NET
-#define EL737__BAD_RECV_UNKN  ASYNSRV__BAD_RECV_UNKN
-#define EL737__BAD_NOT_BCD    ASYNSRV__BAD_NOT_BCD
-#define EL737__BAD_RECVLEN    ASYNSRV__BAD_RECV_LEN
-#define EL737__BAD_FLUSH      ASYNSRV__BAD_FLUSH
-#define EL737__BAD_RECV1      ASYNSRV__BAD_RECV1
-#define EL737__BAD_RECV1_PIPE ASYNSRV__BAD_RECV1_PIPE
-#define EL737__BAD_RECV1_NET  ASYNSRV__BAD_RECV1_NET
-#define EL737__BAD_CONNECT ASYNSRV__BAD_CONNECT
-#define EL737__BAD_ID   -99995 
-#define EL737__BAD_SNTX -99991
-#define EL737__BAD_REPLY -99992
-#define EL737__BAD_ADR -99993
-#define EL737__BAD_RNG -99994
-#endif		/* el734fix */
diff --git a/hardsup/el737tcl.c b/hardsup/el737tcl.c
deleted file mode 100644
index 510b6c97..00000000
--- a/hardsup/el737tcl.c
+++ /dev/null
@@ -1,400 +0,0 @@
-/*--------------------------------------------------------------------------
-
-	Some code to make EL737 COUNTERS  as used at SINQ available in TCL.
-	Just a wrapper around David Maden's COUNTER routines.
-	
-	You are free to use and modify this software for noncommercial
-	usage.
-	
-	No warranties or liabilities of any kind taken by me or my employer
-	
-	Mark Koennecke July 1996
-----------------------------------------------------------------------------*/
-#include "sinq_prototypes.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-/*
-#include <timers.h>
-*/
-#include <tcl.h>
-#include "el737_def.h"
-
-#define True 1
-#define False 0
-
-	typedef struct
-			{
-				void *pData;  /* EL737 open struct */
-			} EL737st;
-
-	EXTERN int EL737Action(ClientData pDat, Tcl_Interp *i, int a, char *argv[]);
-	static void EL737Error2Text(char *pBuffer, int errcode);
-
-/*---------------------------------------------------------------------------
-	Tcl has a high niceness level. It deletes a command properly when
-	exiting, reinitializing etc. I use this facility to kill off the
-	counter initialised in CterEL737.
----------------------------------------------------------------------------*/
-EXTERN void EL737Murder(ClientData pData)
-{
-	EL737st *pTa = (EL737st *)pData;
-	EL737_Close(&(pTa->pData));
-	free(pData); 
-}
-/*----------------------------------------------------------------------------
-	CterEL737 is the main entry point for this stuff. It connects to a counter
-	and, on success, creates a new command with the name of the counter.
-	Syntax:
-		EL737 name host port channel 
----------------------------------------------------------------------------*/		
-
-int CterEL737(ClientData clientData, Tcl_Interp *interp, 
-			int argc, char *argv[])
-{
-	int iRet;
-	EL737st *pEL737 = NULL;
-	int iPort, iChannel, iMotor;
-	char *pErr = NULL;
-	char pBueffel[80];
-	
-	/* check arguments */
-	if(argc < 5)
-	{
-	    Tcl_AppendResult(interp,
-	    		" Insufficient arguments: CterEL737 name host port channel"
-	     		, (char *) NULL);
-	    return TCL_ERROR;
-	}
-	
-	/* convert arguments */
-	iRet = Tcl_GetInt(interp,argv[3],&iPort);
-	if(iRet == TCL_ERROR)
-	{
-		Tcl_AppendResult(interp,"Need integer value for port",
-				(char *)NULL);
-		return iRet;
-	}
-	
-        iRet = Tcl_GetInt(interp,argv[4],&iChannel);
-        if(iRet == TCL_ERROR)
-        {
-          Tcl_AppendResult(interp,"Need integer value for channel",
-                          (char *)NULL);
-          return iRet;
-	}
-
-	/* make a new pointer, initialise EL737st */
-	pEL737 = (EL737st *)malloc(sizeof(EL737st));
-	if(pEL737 ==NULL)
-	{
-		Tcl_AppendResult(interp,"No memory in EL734",NULL);
-		return TCL_ERROR;
-	}
-
-	/* open the rotten Counter, finally */
-	iRet = EL737_Open(&(pEL737->pData), argv[2],iPort,iChannel);
-	if(iRet) /* success */
-	{
-		/* handle TCL, create new command: the Counter */		
-		  Tcl_CreateCommand(interp,strdup(argv[1]),EL737Action,
-		                   (ClientData)pEL737,EL737Murder);
-		  Tcl_AppendResult(interp,strdup(argv[1]),(char *)NULL);
-		  return TCL_OK;		                      
-	} 
-	else
-	{
-		EL737_ErrInfo(&pErr,&iPort,&iChannel, &iMotor);
-		EL737Error2Text(pBueffel,iPort);
-		Tcl_AppendResult(interp,pBueffel,(char *) NULL);
-		free(pEL737);
-		return TCL_ERROR;
-	}
-}
-/*--------------------------------------------------------------------------
-
-	EL737 Action is the routine where commands send to the conter will 
-	end up.
-	
-	Syntax:        timer            starts counter with a preset value
-	counter wait           val      for counts or time and does
-	               monitor          not return before finished
-	               
-                       timer            starts counter with a preset value
-	counter start          val      for counts or time and 
-	               monitor          returns immediatly
-	counter isDone                  returns True, false depending if
-					started run has ended or not
-	counter value                   gets counter values as a little list
-	                                consisting of:   
-	                                { counts monitor time }
-	counter Stop                    forces counter to stop  
-----------------------------------------------------------------------------*/
-EXTERN int EL737Action(ClientData clientData, Tcl_Interp *interp, 
-			int argc, char *argv[])
-{
-	EL737st *pData = (EL737st *)clientData;
-	char pBueffel[132];
-	char pNumBuf[20];
-	char *pErr = NULL;
-	int iC1, iC2, iC3, iC4, iRS, iRet;
-	float fTime;
-	int iFlag = 0;
-	int iMode;
-	double dVal;
-
-	/* obviously we need at least a keyword! */
-	if(argc < 2)
-	{
-		Tcl_AppendResult(interp,"No keyword given",NULL);
-		return TCL_ERROR;  
-	}
-	
-	/* get values out */
-	if(strcmp(argv[1],"value") == 0)
-	{
-		iRet = EL737_GetStatus(&(pData->pData),&iC1, &iC2, &iC3,
-		                      &iC4,&fTime,&iRS);
-		if(!iRet)
-		{                       	
-  			EL737_ErrInfo(&pErr,&iC1,&iC2, &iC3);
-			EL737Error2Text(pBueffel,iC1);
-			Tcl_AppendResult(interp,pBueffel,(char *) NULL);
-			return TCL_ERROR;
-		}
-		sprintf(pNumBuf,"%d",iC2);
-		Tcl_AppendElement(interp,pNumBuf);
-		sprintf(pNumBuf,"%d",iC1);
-		Tcl_AppendElement(interp,pNumBuf);
-		sprintf(pNumBuf,"%f",fTime);
-		Tcl_AppendElement(interp,pNumBuf);
-		return TCL_OK;
-	} 
-
-	/* isDone ? */
-	if(strcmp(argv[1],"isDone") == 0)
-	{
-		iRet = EL737_GetStatus(&(pData->pData),&iC1, &iC2, &iC3,
-		                      &iC4,&fTime,&iRS);
-		if(!iRet)
-		{                       	
-  			EL737_ErrInfo(&pErr,&iC1,&iC2, &iC3);
-			EL737Error2Text(pBueffel,iC1);
-			Tcl_AppendResult(interp,pBueffel,(char *) NULL);
-			return TCL_ERROR;
-		}
-		if(iRS == 0) /* done is true */
-		{
-			sprintf(pNumBuf,"%d",True);
-		}
-		else
-		{
-			sprintf(pNumBuf,"%d",False);
-		}
-		Tcl_AppendResult(interp,pNumBuf,(char *) NULL);
-		return TCL_OK;
-	} 
-	
-	/* actual counting neutrons in two different modes */
-	if(strcmp(argv[1],"wait") == 0)
-	{
-		 iFlag = 2;	
-	}
-	if(strcmp(argv[1],"start") == 0)
-	{
-		 iFlag = 1;
-	}
-	if(iFlag > 0) /* we need to count */
-	{
-		if(argc < 4) /* not enough arguments */
-		{
-			Tcl_AppendResult(interp,"Usage: ",argv[0],argv[1],
-			                 " timer or monitor val",NULL);
-			return TCL_ERROR;
-		}
-		
-		/* timer or monitor preset ? */
-		if(strcmp(argv[2],"timer") == 0)
-		{
-			iMode = 1;
-		}
-		else if (strcmp(argv[2],"monitor") == 0)
-		{
-			iMode = 2;
-		}
-		else
-		{
-			Tcl_AppendResult(interp,"Usage: ",argv[0],argv[1],
-			                 " timer or monitor val",NULL);
-			return TCL_ERROR;			
-		}
-		
-		/* get the preset value */
-		iRet = Tcl_GetDouble(interp,argv[3],&dVal);
-		if(iRet == TCL_ERROR)
-		{
-			return TCL_ERROR;
-		}
-		
-		/* actual start collecting neutrons */
-		if(iMode == 1)
-		{
-			iRet = EL737_StartTime(&(pData->pData),(float)dVal,
-			                       &iRS);
-		}
-		else
-		{
-			iRet = EL737_StartCnt(&(pData->pData),(int)dVal,
-					      &iRS);	
-		}
-		if(!iRet)
-		{                       	
-  			EL737_ErrInfo(&pErr,&iC1,&iC2, &iC3);
-			EL737Error2Text(pBueffel,iC1);
-			Tcl_AppendResult(interp,pBueffel,(char *) NULL);
-			return TCL_ERROR;
-		}		
-	} /* end of count startup code */
-	
-	/* if apropriate: wait */
-	if(iFlag == 2)
-	{
-		iRet = EL737_WaitIdle(&(pData->pData),&iC1, &iC2, &iC3,
-		                        &iC4,&fTime);
-		if(!iRet)
-		{                       	
-  			EL737_ErrInfo(&pErr,&iC1,&iC2, &iC3);
-			EL737Error2Text(pBueffel,iC1);
-			Tcl_AppendResult(interp,pBueffel,(char *) NULL);
-			return TCL_ERROR;
-		}
-		return TCL_OK;
-	}
-	else if(iFlag == 1)
-	{
-		return TCL_OK;
-	}
-	
-	/* the stop command */
-	if(strcmp(argv[1],"stop") == 0)
-	{
-		iRet = EL737_Stop(&(pData->pData),&iC1, &iC2, &iC3,
-		                  &iC4,&fTime,&iRS);
-		if(!iRet)
-		{                       	
-  			EL737_ErrInfo(&pErr,&iC1,&iC2, &iC3);
-			EL737Error2Text(pBueffel,iC1);
-			Tcl_AppendResult(interp,pBueffel,(char *) NULL);
-			return TCL_ERROR;
-		}
-		return TCL_OK;
-	}
-
-	Tcl_AppendResult(interp," obscure command: ",argv[1],
-	                 " not understood by EL737 counter", NULL);
-	return TCL_ERROR;
-}
-/*---------------------------------------------------------------------------
-
-	EL737Error2Text converts between an EL734 error code to text
------------------------------------------------------------------------------*/
-	void EL737Error2Text(char *pBuffer, int iErr)
-	{
-		switch(iErr)
-		{
-			case -28:
-				strcpy(pBuffer,"EL737__BAD_ADR");
-				break;
-			case -8:
-				strcpy(pBuffer,"EL737__BAD_OVFL");
-				break;
-			case -30:
-				strcpy(pBuffer,"EL737__BAD_BSY");
-				break;
-			case -3:
-				strcpy(pBuffer,"EL737__BAD_SNTX");
-				break;
-			case -9:
-				strcpy(pBuffer,"EL737__BAD_CONNECT");
-				break;
-			case -23:
-				strcpy(pBuffer,"EL737__BAD_FLUSH");
-				break;
-			case -6:
-				strcpy(pBuffer,"EL734__BAD_DEV");
-				break;
-			case -10:
-				strcpy(pBuffer,"EL737__BAD_ID");
-				break;
-			case -5:
-				strcpy(pBuffer,"EL737__BAD_ILLG");
-				break;
-			case -2:
-				strcpy(pBuffer,"EL737__BAD_LOC");
-				break;
-			case -11:
-				strcpy(pBuffer,"EL737__BAD_MALLOC");
-				break;
-			case -21:
-				strcpy(pBuffer,"EL737__BAD_NOT_BCD");
-				break;
-			case -4:
-				strcpy(pBuffer,"EL737__BAD_OFL");
-				break;
-			case -29:
-				strcpy(pBuffer,"EL737__BAD_PAR");
-				break;
-			
-			case -17:
-				strcpy(pBuffer,"EL737__BAD_RECV");
-				break;
-			case -19:
-				strcpy(pBuffer,"EL737__BAD_RECV_NET");
-				break;
-			case -18:
-				strcpy(pBuffer,"EL737__BAD_RECV_PIPE");
-				break;
-			case -20:
-				strcpy(pBuffer,"EL737__BAD_RECV_UNKN");
-				break;
-			case -22:
-				strcpy(pBuffer,"EL737__BAD_RECVLEN");
-				break;
-			case -24:
-				strcpy(pBuffer,"EL737__BAD_RECV1");
-				break;
-			case -26:
-				strcpy(pBuffer,"EL737__BAD_RECV1_NET");
-				break;
-			case -25:
-				strcpy(pBuffer,"EL737__BAD_RECV1_PIPE");
-				break;
-			case -27:
-				strcpy(pBuffer,"EL737__BAD_RNG");
-				break;
-			case -13:
-				strcpy(pBuffer,"EL737__BAD_SEND");
-				break;
-			case -14:
-				strcpy(pBuffer,"EL737__BAD_SEND_PIPE");
-				break;
-			case -15:
-				strcpy(pBuffer,"EL737__BAD_SEND_NET");
-				break;
-			case -16:
-				strcpy(pBuffer,"EL737__BAD_SEND_UNKN");
-				break;
-			case -12:
-				strcpy(pBuffer,"EL737__BAD_SENDLEN");
-				break;
-			case -7:
-				strcpy(pBuffer,"EL737__BAD_SOCKET");
-				break;
-			case -1:
-				strcpy(pBuffer,"EL737__BAD_TMO");
-				break;
-			default:
-				strcpy(pBuffer,"Unknown EL737 error");
-				break;	
-		}
-	}
diff --git a/hardsup/el755_def.h b/hardsup/el755_def.h
deleted file mode 100644
index 8cfe339d..00000000
--- a/hardsup/el755_def.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef	    _el755_def_
-#define	    _el755_def_
-/*------------------------------------------------ EL755_DEF.H Ident V01C
-**	Definitions for the EL755 Magnet Power Supply Controller
-**
-**	On UNIX systems, this file is located in /public/lib/include
-**	On VMS  systems, this file is a module in mad_lib:sinq_c.tlb
-*/
-#include    <asynsrv_def.h>
-#include    <rs232c_def.h>
-
-#ifndef OffsetOf
-#define OffsetOf(type, identifier)  ((size_t)(&((type*) NULL)->identifier))
-#endif
-
-#ifndef	    _EL755_errcodes_
-#define	    _EL755_errcodes_
-#include    <el755_errcodes.h>
-#endif
-
-/*
-**	Structure to which the EL755_Open handle points.
-*/
-  struct EL755info {
-	struct AsynSrv__info	asyn_info; /* Contains skt, host, port & chan */
-	int			index;
-	struct RS__MsgStruct    to_host;
-	struct RS__RespStruct   from_host;
-  };
-/*------------------------------------------------ End of EL755_DEF.H --*/
-#endif	    /* _el755_def_ */
diff --git a/hardsup/el755_errcodes.h b/hardsup/el755_errcodes.h
deleted file mode 100644
index 3b9d2367..00000000
--- a/hardsup/el755_errcodes.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-**			TAS_SRC:[LIB]EL755_ERRCODES.H
-**
-** Include file generated from EL755_ERRCODES.OBJ
-**
-**              29-AUG-2000 09:49:23.51
-*/
-
-#define	    EL755__TURNED_OFF             0x8678094
-#define	    EL755__TOO_MANY               0x867808C
-#define	    EL755__TOO_LARGE              0x8678084
-#define	    EL755__OVFLOW                 0x867807C
-#define	    EL755__OUT_OF_RANGE           0x8678074
-#define	    EL755__OFFLINE                0x867806C
-#define	    EL755__NO_SOCKET              0x8678064
-#define	    EL755__NOT_OPEN               0x867805C
-#define	    EL755__FORCED_CLOSED          0x8678054
-#define	    EL755__BAD_TMO                0x867804C
-#define	    EL755__BAD_SOCKET             0x8678044
-#define	    EL755__BAD_PAR                0x867803C
-#define	    EL755__BAD_OFL                0x8678034
-#define	    EL755__BAD_MALLOC             0x867802C
-#define	    EL755__BAD_ILLG               0x8678024
-#define	    EL755__BAD_DEV                0x867801C
-#define	    EL755__BAD_CMD                0x8678014
-#define	    EL755__BAD_ASYNSRV            0x867800C
-#define	    EL755__FACILITY               0x867
diff --git a/hardsup/el755_errorlog.c b/hardsup/el755_errorlog.c
deleted file mode 100644
index 5491d214..00000000
--- a/hardsup/el755_errorlog.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#define	    ident	"1A01"
-#ifdef VAXC
-#module	    EL755_ErrorLog    ident
-#endif
-#ifdef __DECC
-#pragma	    module	    EL755_ErrorLog    ident
-#endif
-
-#include    <stdio.h>
-
-/*
-**--------------------------------------------------------------------------
-**		EL755_ErrorLog:	This routine is called by EL755 routines in
-**				the case of certain errors. It simply prints
-**				to stderr. The user should supply his own
-**				routine if he wishes to log these errors in
-**				some other way.
-*/
-  void	    EL755_ErrorLog (
-/*	    ==============
-*/			char	*routine_name,
-			char	*text) {
-
-    fprintf (stderr, "%s: %s\n", routine_name, text);
-  }
-/*-------------------------------------------- End of EL755_ErrorLog.C =======*/
diff --git a/hardsup/el755_utility.c b/hardsup/el755_utility.c
deleted file mode 100644
index 57cb0212..00000000
--- a/hardsup/el755_utility.c
+++ /dev/null
@@ -1,1445 +0,0 @@
-#define	    ident	"1A04"
-#ifdef VAXC
-#module	    EL755_Utility	ident
-#endif
-#ifdef __DECC
-#pragma	    module	    EL755_Utility	ident
-#endif
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     Department ASQ				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : TAS_SRC:[PSI.LIB.SINQ]EL755_Utility.C
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Sep 1998
-**
-**  To compile this module, use:
-
-	$ import tasmad
-	$ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-	$ cc /debug /noopt /obj=[]EL755_Utility -
-			tas_src:[psi.lib.sinq]EL755_Utility + -
-			sinq_c_tlb/lib
-
-**  To include this module in SINQ.OLB, use:
-
-  $ import tasmad
-  $ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-  $
-  $ define/group sinq_olb mad_lib:sinq_dbg.olb
-  $ @tasmad_disk:[mad.lib.sinq]sinq_olb EL755_Utility debug
-  $
-  $ define/group sinq_olb mad_lib:sinq.olb
-  $ @tasmad_disk:[mad.lib.sinq]sinq_olb EL755_Utility
-**
-** Updates:
-**  1A01  8-Sep-1998 DM.	Initial version.
-**============================================================================
-** The entry points included in this module are described below. Prototypes
-** can be defined via:
-**
-**    #include <sinq_prototypes.h>
-**
-**	EL755_AddCallStack  - Add a routine name to the call stack.
-**	EL755_Close	    - Close a connection to an EL755 controller.
-**	EL755_Config	    - Configure a connection to an EL755 controller.
-**	EL755_ErrInfo	    - Return detailed status from last operation.
-**	EL755_GetCurrents   - Get the actual settings of the EL755 currents.
-**	EL755_Open	    - Open a connection to an EL755 controller.
-**	EL755_PutOffline    - Put the EL755 off-line.
-**	EL755_PutOnline	    - Put the EL755 on-line.
-**	EL755_SendTillSameStr - Repeatedly send a command to EL755 controller
-**				until the same reply is received twice.
-**	EL755_SendTillSameVal - Repeatedly send a command to EL755 controller
-**				until the first token of the reply is the
-**				same fl.pnt. value twice in succession.
-**	EL755_SetCurrent    - Set the EL755 current.
-**---------------------------------------------------------------------
-**    int EL755_AddCallStack (&info_pntr, &name)
-**	  ------------------
-**  Input Args:
-**	struct EL755info *info_pntr - Pointer to structure returned by
-**				EL755_Open. Note that the type of the pointer
-**				is "struct EL755info".
-**	char  *name	- The name of the routine to be added to the call stack.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and EL755_errcode
-**	is set to indicate the nature of the problem as follows:
-**	    EL755__NOT_OPEN	 --> there is no connection open to the EL755,
-**					i.e. info_pntr is NULL.
-**	    EL755__FORCED_CLOSED --> the connection has been force-closed
-**					(probably as a result of an error
-**					on another device on the same host).
-**	    EL755__NO_SOCKET	 --> The connection has no socket - probably
-**					it was closed after a previous error.
-**	Note that EL755_errcode may have been set prior to the call to
-**	EL755_AddCallStack. In this case, the routine simply returns False.
-**  Routines called:
-**	None
-**  Description:
-**	The routine is designed to simplify the building of the call-stack
-**	which is available to the user via EL755_ErrInfo if an error occurs.
-**	It is intended for internal use only.
-**	
-**	If an error has aready occurred prior to the call to EL755_AddCallStack
-**	(i.e. EL755_errcode is non-zero), the routine simply returns False
-**	to prevent redundant information being added to the stack.
-**
-**	Otherwise, the caller's name is added to the stack and basic checks
-**	are made of the EL755info structure.
-**---------------------------------------------------------------------
-**    int EL755_Close (&handle, force_flag)
-**	  -----------
-**  Input Args:
-**	int force_flag	- if non-zero, all connections using the same socket
-**			    will also be closed (this gets AsynSrv_Close to
-**			    actually close the socket and is needed for error
-**			    recovery operations).
-**  Output Args:
-**	none
-**  Modified Args:
-**	void **handle	- The pointer to the structure returned by EL755_Open.
-**			  On return, the pointer is set to NULL.
-**  Return status:
-**	True always (error returns from close and free are not checked).
-**  Routines called:
-**	Socket library, "close" and memory release routine, "free".
-**  Description:
-**	The routine calls AsynSrv_Close to close the connection to the RS232C
-**	server. If 'force_flag' is non-zero, all other connections to the
-**	RS232C server which use the same socket will also be closed.
-**
-**	The 'force_flag' can be useful in error recovery situations. The AsynSrv
-**	utility operates by only opening a socket for each separate combination
-**	of host/port. Hence, if several connections are open to a server,
-**	then calling EL755_Close doesn't actually close the socket until all
-**	connections have been closed. In the situation where an error has been
-**	detected, it is often desirable to close and re-open the socket as part
-**	of the recovery procedure. Calling EL755_Close with 'force_flag'
-**	non-zero will force the socket to be closed and will mark all other
-**	connections using this socket so that they will be informed of the
-**	event when they next call an AsynSrv routine.
-**
-**	Note:	The force-close action is effected by the AsynSrv package. A
-**		force-close will thus also close any connections to other
-**		RS-232-C devices (e.g. EL734 motors) on the same server.
-**-------------------------------------------------------------------------
-**   void EL755_Config (&handle, &par_id, par_val, ...)
-**	  ------------
-**  Input Args:
-**	char*	par_id  - Text string identifying the next argument (see below).
-**			    NULL indicates the end of the argument list.
-**	<??>	par_val - The value to set for the argument. The type of the
-**			    argument can depend on par_id.
-**  Output Args:
-**	none
-**  Modified Args:
-**	void **handle	- The pointer to the structure returned by EL755_Open.
-**			  It is used to hold the config info for the connection.
-**  Return status:
-**	True if no problems detected, otherwise False and EL755_errcode
-**	is set to indicate the nature of the problem. Values of Errcode set by
-**	EL755_Config are (other values may be set by the called routines):
-**	    EL755__BAD_PAR --> Unrecognised par_id or msecTmo < 100 or
-**					msecTmo > 999'999 or bad eot or ..
-**  Routines called:
-**	EL755_AddCallStack
-**  Description:
-**	The routine sets values in the EL755info data structure and may modify
-**	the state of the temperature controller. Values which may be taken by
-**	par_id (par_id is case-insensitive) and the corresponding variable
-**	type of par_val are:
-**
-**	    "msecTmo"	int	The time-out response for commands sent to
-**				    the EL755. The valid range is 100 to
-**				    999'999. Default is 3'000.
-**	    "eot"	char*	The expected terminators in responses to
-**				    commands sent to the EL755. The first
-**				    character specifies the number of
-**				    terminators (max=3). Default is "1\n".
-**	    "index"	int	The DAC index in the range 1 to 8 to be
-**				    referenced via this EL755info structure.
-**-------------------------------------------------------------------------
-**    void EL755_ErrInfo (&entry_txt_ptr, &errcode, &my_errno, &vaxc_errno)
-**	   -------------
-**  Input Args:
-**	None
-**  Output Args:
-**	char **entry_txt_ptr - Pointer to a text string giving the call stack
-**				at the time that the error was detected.
-**	int  *errcode	 - An internal error code indicating the detected error.
-**	int  *my_errno	 - Saved value of errno.
-**	int  *vaxc_errno - Saved value of vaxc$errno (OpenVMS only).
-**  Modified Args:
-**	none
-**  Return status:
-**	none
-**  Routines called:
-**	none
-**  Description:
-**	Returns detailed status of the last operation. Once an error has been
-**	detected, the error status is frozen until this routine has been called.
-**-------------------------------------------------------------------------
-**   int  EL755_GetCurrents (&handle, &soll, &ist)
-**	  -----------------
-**
-**  Input Args:
-**	void **handle     - The pointer to the structure returned by EL755_Open
-**  Output Args:
-**	float *soll	  - the requested current.
-**	float *ist	  - the actual current. This may me different to *soll
-**				since the controller ramps to a new current.
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and EL755_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	EL755_GetCurrents are (other values may be set by the called
-**	routines):
-**	    EL755__BAD_ASYNSRV --> Call to AsynSrv_SendCmnds failed. Use
-**					AsynSrv_ErrInfo to get more details.
-**	    EL755__BAD_ILLG --> The response to the "I" command was probably not
-**				    two numbers. This could happen if there is
-**				    noise on the RS232C connection to the EL755.
-**	    EL755__BAD_TMO  --> Time-out error ("?TMO" - this gets generated
-**				    by the RS232C server).
-**	    EL755__OFFLINE  --> The EL755 is offline ("?OF").
-**	    EL755__TOO_MANY --> The command was repeated too many times
-**					and never received the same response
-**					on 2 consecutive occasions.
-**
-**	If an error is detected, *soll and *ist are undefined.
-**  Routines called:
-**	EL755_AddCallStack, AsynSrv_SendCmnds
-**  Description:
-**	EL755_Getcurrents sends an "I" command to the controller to obtain the
-**	currents. The command is repeated until the "soll" value is twice the
-**	same.
-**   Note: If the power supply is off or not connected (response is
-**	    "?power-supply OFF", then no error is indicated and *soll=*ist=0.0
-**	    is returned.
-**-------------------------------------------------------------------------
-**    int EL755_Open (&handle, host, port, chan, indx)
-**	  ----------
-**  Input Args:
-**	char *host	- Name of host offering the TCP/IP service.
-**	int   port	- Number of TCP/IP port of TCP/IP server.
-**	int   chan	- RS-232-C Channel number on the TCP/IP server.
-**	int   indx	- The DAC index in the range 1 to 8. This selects which
-**			    of the 8 outputs from the EL755 are to be used.
-**  Output Args:
-**	void *handle	- A pointer to a structure of type EL755info needed for
-**			   subsequent calls to EL755_??? routines.
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False. If False, EL755_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	EL755_Open are (other values may be set by the called routines):
-**	  EL755__BAD_MALLOC  --> Call to "malloc" failed
-**	  EL755__BAD_SOCKET  --> Call to AsynSrv_Open failed. Use
-**					 AsynSrv_ErrInfo to get more details.
-**	  EL755__BAD_TMO     --> Time-out error ("?TMO" - this gets
-**					generated by the RS232C server).
-**	  EL755__BAD_OFL     --> Connection to EL755 broken ("?OFL").
-**					This can get generated by RS232C_SRV
-**					if, for example, the connection is via
-**					a terminal server and the terminal
-**					server loses power.
-**	  EL755__BAD_DEV     --> Device doesn't seem to be an EL755. The
-**					response to the "ID\r" command was bad.
-**	  EL755__BAD_ILLG    --> Some other unrecognised response. This
-**					should never occur, of course!
-**	  EL755__BAD_ASYNSRV --> Call to AsynSrv_SendCmnds failed. Use
-**					 AsynSrv_ErrInfo to get more details.
-**  Routines called:
-**	"calloc"	- memory allocation routine.
-**	AsynSrv_Open
-**	AsynSrv_Close	- called if an error detected after connection opened.
-**	EL755_Config
-**	EL755_SendTillSameStr
-**  Description:
-**	The routine opens a TCP/IP connection to a server offering the
-**	"RS-232-C" service for an EL755 Controller. "RMT 1", "ECHO 0" and
-**	"ID" commands are sent to ensure the device is an EL755 controller.
-**-------------------------------------------------------------------------
-**    int   EL755_PutOffline (&handle)
-**	    ----------------
-**			    Send "ECHO 1" and "RMT 0" commands to EL755 server.
-**  Input Args:
-**	void   **handle	- The pntr to the structure returned by EL755_Open.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and errcode (see
-**	EL755_ErrInfo) is set to indicate the nature of the problem.
-**	Values of Errcode set by EL755_PutOffline are (other values may be set
-**	by the called routines):
-**	    EL755__BAD_ASYNSRV --> An error occurred in AsynSrv_Utility.
-**					    Call AsynSrv_ErrInfo for more info.
-**	    EL755__BAD_ILLG    --> an unrecognised response. This
-**					should never occur, of course!
-**  Routines called:
-**	EL755_AddCallStack, AsynSrv_SendCmnds, AsynSrv_GetReply
-**  Description:
-**	The routine calls AsynSrv_SendCmnds to execute "RMT 1", "ECHO 1"
-**	and "RMT 0" commands. The replies are checked.
-**-------------------------------------------------------------------------
-**    int   EL755_PutOnline (&handle, echo)
-**	    ---------------
-**			    Send "RMT 1" and "ECHO x" commands to EL755 server.
-**  Input Args:
-**	void   **handle	- The pntr to the structure returned by EL755_Open.
-**	int      echo	- The value for the ECHO command.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and errcode (see
-**	EL755_ErrInfo) is set to indicate the nature of the problem.
-**	Values of Errcode set by EL755_PutOnline are (other values may be set
-**	by the called routines):
-**	    EL755__BAD_PAR --> "echo" is not 0, 1 or 2.
-**	    EL755__BAD_ASYNSRV --> An error occurred in AsynSrv_Utility.
-**					    Call AsynSrv_ErrInfo for more info.
-**	    EL755__BAD_ILLG    --> an unrecognised response. This
-**					should never occur, of course!
-**  Routines called:
-**	EL755_AddCallStack, AsynSrv_SendCmnds, AsynSrv_GetReply
-**  Description:
-**	The routine calls AsynSrv_SendCmnds to execute "RMT 1" and "ECHO x"
-**	commands. The replies are checked.
-**-------------------------------------------------------------------------
-**    int EL755_SendTillSameStr (&handle, &cmnd, &rply, rply_len)
-**	  ---------------------
-**  Input Args:
-**	char  *cmnd	- The command to be sent (incl. terminators).
-**	int    rply_len	- The size of <rply>.
-**  Output Args:
-**	char  *rply	- The response to <cmnd>.
-**  Modified Args:
-**	void **handle   - The pointer to the structure returned by EL755_Open.
-**  Return status:
-**	True if no problems detected, otherwise False. If False, EL755_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	EL755_SendTillSameStr are (other values may be set by the called routines):
-**	  EL755__BAD_ASYNSRV	--> Call to AsynSrv_SendCmnds failed. Use
-**					AsynSrv_ErrInfo to get more details.
-**	  EL755__BAD_ILLG --> The response to the "I" command was probably not
-**				    two numbers. This could happen if there is
-**				    noise on the RS232C connection to the EL755.
-**	  EL755__BAD_TMO	--> Time-out error ("?TMO" - this gets
-**					generated by the RS232C server).
-**	  EL755__BAD_CMD	--> Bad command ("?syntax failure")
-**	  EL755__BAD_OFL	--> Connection to EL755 broken ("?OFL").
-**					This can get generated by RS232C_SRV
-**					if, for example, the connection is via
-**					a terminal server and the terminal
-**					server loses power.
-**	  EL755__TOO_MANY	--> The command was repeated too many times
-**					and never received the same response
-**					on 2 consecutive occasions.
-**	  EL755__OFFLINE	--> The EL755 is offline ("?OF").
-**  Routines called:
-**	EL755_AddCallStack, EL755_ErrorLog, AsynSrv_SendCmnds, AsynSrv_GetReply
-**  Description:
-**	The routine sends the specified command to the EL755 Controller and
-**	reads the response. The command is repeated up to 5 times until the same
-**	response is received twice in succession.
-**   Note:
-**	The error EL755__TOO_MANY could indicate that <rply> is not big enough
-**	to hold the complete reply.
-**-------------------------------------------------------------------------
-**    int EL755_SendTillSameVal (&handle, &cmnd, &val)
-**	  ---------------------
-**  Input Args:
-**	char  *cmnd	- The command to be sent (incl. terminators).
-**  Output Args:
-**	float *val	- The response to <cmnd>.
-**  Modified Args:
-**	void **handle   - The pointer to the structure returned by EL755_Open.
-**  Return status:
-**	True if no problems detected, otherwise False. If False, EL755_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	EL755_SendTillSameVal are (other values may be set by the called
-**	routines):
-**	  EL755__BAD_ASYNSRV	--> Call to AsynSrv_SendCmnds failed. Use
-**					AsynSrv_ErrInfo to get more details.
-**	  EL755__BAD_ILLG --> The response to the "I" command was probably not
-**				    two numbers. This could happen if there is
-**				    noise on the RS232C connection to the EL755.
-**	  EL755__BAD_TMO	--> Time-out error ("?TMO" - this gets
-**					generated by the RS232C server).
-**	  EL755__BAD_CMD	--> Bad command ("?syntax failure")
-**	  EL755__BAD_OFL	--> Connection to EL755 broken ("?OFL").
-**					This can get generated by RS232C_SRV
-**					if, for example, the connection is via
-**					a terminal server and the terminal
-**					server loses power.
-**	  EL755__TOO_MANY	--> The command was repeated too many times
-**					and never received the same response
-**					on 2 consecutive occasions.
-**	  EL755__OFFLINE	--> The EL755 is offline ("?OF").
-**  Routines called:
-**	EL755_AddCallStack, EL755_ErrorLog, AsynSrv_SendCmnds, AsynSrv_GetReply
-**  Description:
-**	The routine sends the specified command to the EL755 Controller and
-**	reads the response. The command is repeated up to 5 times until the
-**	first token is the same fl.pnt value twice in succession.
-**   Note 1:
-**	The error EL755__TOO_MANY could indicate that <rply> is not big enough
-**	to hold the complete reply.
-**   Note 2: If the power supply is off or not connected (response is
-**	    "?power-supply OFF") then a zero value is returned and the
-**	    return status is True
-**-------------------------------------------------------------------------
-**   int  EL755_SetCurrent (&handle, soll)
-**	  ----------------
-**
-**  Input Args:
-**	void **handle     - The pointer to the structure returned by EL755_Open
-**	float  soll	  - the requested current.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and EL755_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	EL755_SetCurrent are (other values may be set by the called
-**	routines):
-**	    EL755__TURNED_OFF --> The EL755 power supply on this channel is
-**				    turned off ("?power-supply OFF").
-**	    EL755__OUT_OF_RANGE --> The set value is out of
-**					range ("?value out of range").
-**	    EL755__TOO_LARGE --> The set value is too
-**					large ("?current limitation").
-**	    EL755__BAD_ILLG --> the response to the first "I" command was
-**				not null (indicating that the command was
-**				rejected) or the response to the second
-**				"I" command was probably not two numbers.
-**				This could happen if there is noise
-**				on the RS232C connection to the EL755.
-**  Routines called:
-**	EL755_SendTillSameStr, EL755_GetCurrests
-**  Description:
-**	EL755_SetCurrent sends an "I" command to the controller to set the
-**	current for the DAC index selected for the handle. An "I" is sent
-**	to check that the value was sent correctly.
-**   Note: If the power supply is off or not connected (response is
-**	    "?power-supply OFF") and soll == 0.0, then return status is True.
-**============================================================================*/
-/*
-**---------------------------------------------------------------------------
-**					Global Definitions
-*/
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <stdarg.h>
-#include    <errno.h>
-#include    <math.h>
-#include    <signal.h>
-#include    <netdb.h>
-#include    <sys/socket.h>
-#include    <netinet/in.h>
-
-#include    <string.h>
-
-#ifdef	__VMS
-#include    <unixio.h>
-#else
-#include    <unistd.h>
-#endif
-/*-----------------------------------------------------------------*/
-#include    <sinq_prototypes.h>
-#include    <el755_def.h>
-#include    <rs232c_def.h>
-
-#define True	1
-#define False	0
-#define NIL	'\0'
-/*--------------------------------------------------------------------------
-**					Global Variables
-*/
-  static int	EL755_call_depth = 0;
-  static char	EL755_routine[5][64];
-  static int	EL755_errcode = 0;
-  static int	EL755_errno, EL755_vaxc_errno;
-/*
-**---------------------------------------------------------------------------
-**		EL755_AddCallStack:  Add a routine name to the call stack.
-**				     This allows EL755_ErrInfo to generate a
-**				     trace-back in case of error.
-*/
-  int	EL755_AddCallStack (
-/*	==================
-*/		struct EL755info  *pntr,
-		char		  *name) {
-
-    if (EL755_errcode != 0) return False;
-
-    if (EL755_call_depth < 5) {
-      StrJoin (EL755_routine[EL755_call_depth], sizeof (EL755_routine[0]),
-				name, "");
-      EL755_call_depth++;
-    }
-
-    if (pntr == NULL) {EL755_errcode = EL755__NOT_OPEN; return False;}
-
-    if (pntr->asyn_info.skt <= 0) {
-      memset (pntr->from_host.msg_size,
-		'0', sizeof (pntr->from_host.msg_size));
-      EL755_errcode = (pntr->asyn_info.skt < 0) ? EL755__FORCED_CLOSED
-						: EL755__NO_SOCKET;
-      return False;
-    }
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL755_Close:  Close a connection to an EL755 controller.
-*/
-  int	EL755_Close (
-/*	===========
-*/		void	**handle,
-		int	  force_flag) {
-
-    struct EL755info	*info_ptr;
-    char		buff[4];
-
-    info_ptr = (struct EL755info *) *handle;
-    if (info_ptr == NULL) return True;
-
-    if (info_ptr->asyn_info.skt != 0) {
-      if (info_ptr->asyn_info.skt > 0) {
-	AsynSrv_Close (*handle, force_flag);
-      }
-    }
-    free (*handle);
-    *handle = NULL;
-
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL755_Config:  Configure a connection to an EL755 controller.
-*/
-  int	EL755_Config (
-/*	============
-*/		void	**handle,
-		...) {
-
-    struct EL755info	*info_ptr;
-    char		 buff[80], rply[256], my_txt[16];
-    va_list		 ap;		/* Pointer to variable args */
-    char		*txt_ptr;
-    int			 intval, my_txt_l;
-		    /*----------------------------------------------
-		    */
-    info_ptr = (struct EL755info *) *handle;
-
-    if (!EL755_AddCallStack (info_ptr, "EL755_Config")) return False;
-		    /*----------------------------------------------
-		    */
-    va_start (ap, handle);	    /* Set up var arg machinery */
-    txt_ptr = va_arg (ap, char *);  /* Get pntr to first parameter ident */
-    while (txt_ptr != NULL) {
-      my_txt_l = sizeof (my_txt);
-      StrEdit (my_txt, txt_ptr, "lowercase", &my_txt_l);
-	    /*------------------------------------*/
-      if (strcmp (my_txt, "msectmo") == 0) {
-	intval = va_arg (ap, int);
-	if ((intval < 100) || (intval > 999999)) {
-	  EL755_errcode = EL755__BAD_PAR; return False;
-	}
-	sprintf (buff, "%04d", intval/100);	/* Convert to ASCII as ..
-						** .. deci-secs */
-	memcpy (info_ptr->asyn_info.tmo, buff, 4);
-	    /*------------------------------------*/
-      }else if (strcmp (my_txt, "eot") == 0) {
-	txt_ptr = va_arg (ap, char *);
-	if (txt_ptr == NULL) {
-	  EL755_errcode = EL755__BAD_PAR;
-	  return False;
-	}
-	memcpy (info_ptr->asyn_info.eot, "\0\0\0\0", 4);
-	switch (txt_ptr[0]) {
-	 case '3': info_ptr->asyn_info.eot[3] = txt_ptr[3];
-	 case '2': info_ptr->asyn_info.eot[2] = txt_ptr[2];
-	 case '1': info_ptr->asyn_info.eot[1] = txt_ptr[1];
-	 case '0':
-	    info_ptr->asyn_info.eot[0] = txt_ptr[0];
-	    break;
-	 default:
-	    EL755_errcode = EL755__BAD_PAR;
-	    return False;
-	}
-	    /*------------------------------------*/
-      }else if (strcmp (txt_ptr, "index") == 0) {
-	intval = va_arg (ap, int);
-	if ((intval < 1) || (intval > 8)) {
-	  EL755_errcode = EL755__BAD_PAR;
-	  return False;
-	}
-	info_ptr->index = intval;
-	    /*------------------------------------*/
-      }else {
-	EL755_errcode = EL755__BAD_PAR;
-	return False;
-      }
-	    /*------------------------------------*/
-      txt_ptr = va_arg (ap, char *);	/* Get pntr to next parameter ident */
-    }
-
-    if (EL755_errcode == 0) EL755_call_depth--;
-    return True;
-  }
-/* 
-** -------------------------------------------------------------------------
-** EL755_ErrInfo:  Return detailed status from last operation.
-*/
-  void	EL755_ErrInfo (
-/*	=============
-*/		char	**entry_txt,
-		int	*errcode,
-		int	*my_errno,
-		int	*vaxc_errno) {
-
-    int		i, j, k;
-    char	buff[80];
-    int		asyn_errcode, asyn_errno, asyn_vaxerrno;
-    char*	asyn_errtxt;
-
-    if (EL755_call_depth <= 0) {
-      strcpy (EL755_routine[0], "EL755_no_error_detected");
-      *errcode	  = 0;
-      *my_errno	  = 0;
-      *vaxc_errno = 0;
-    }else {
-      if (EL755_call_depth > 1) {			/* Concatenate the names */
-	for (i = 1; i < EL755_call_depth; i++) {
-	  strcat (EL755_routine[0], "/");
-	  StrJoin (EL755_routine[0], sizeof (EL755_routine),
-			    EL755_routine[0], EL755_routine[i]);
-	}
-      }
-      *errcode	  = EL755_errcode;
-      *my_errno	  = EL755_errno;
-      *vaxc_errno = EL755_vaxc_errno;
-      switch (EL755_errcode) {
-	case EL755__BAD_ASYNSRV:    strcpy (buff, "/EL755__BAD_ASYNSRV"); break;
-	case EL755__BAD_CMD:
-	case EL755__BAD_DEV:	    strcpy (buff, "/EL755__BAD_DEV"); break;
-	case EL755__BAD_ILLG:	    strcpy (buff, "/EL755__BAD_ILLG"); break;
-	case EL755__BAD_MALLOC:	    strcpy (buff, "/EL755__BAD_MALLOC"); break;
-	case EL755__BAD_OFL:	    strcpy (buff, "/EL755__BAD_OFL"); break;
-	case EL755__BAD_PAR:	    strcpy (buff, "/EL755__BAD_PAR"); break;
-	case EL755__BAD_SOCKET:	    strcpy (buff, "/EL755__BAD_SOCKET"); break;
-	case EL755__BAD_TMO:	    strcpy (buff, "/EL755__BAD_TMO"); break;
-	case EL755__FORCED_CLOSED:    strcpy (buff, "/EL755__FORCED_CLOSED"); break;
-	case EL755__NOT_OPEN:	    strcpy (buff, "/EL755__NOT_OPEN"); break;
-	case EL755__NO_SOCKET:	    strcpy (buff, "/EL755__NO_SOCKET"); break;
-	case EL755__OFFLINE:	    strcpy (buff, "/EL755__OFFLINE"); break;
-	case EL755__OUT_OF_RANGE:   strcpy (buff, "/EL755__OUT_OF_RANGE"); break;
-	case EL755__OVFLOW:	    strcpy (buff, "/EL755__OVFLOW"); break;
-	case EL755__TOO_LARGE:	    strcpy (buff, "/EL755__TOO_LARGE"); break;
-	case EL755__TOO_MANY:	    strcpy (buff, "/EL755__TOO_MANY"); break;
-	case EL755__TURNED_OFF:	    strcpy (buff, "/EL755__TURNED_OFF"); break;
-	default: sprintf (buff, "/EL755__unknown_err_code: %d", EL755_errcode);
-      }
-      StrJoin (EL755_routine[0], sizeof(EL755_routine), EL755_routine[0], buff);
-    }
-    AsynSrv_ErrInfo (&asyn_errtxt, &asyn_errcode, &asyn_errno, &asyn_vaxerrno);
-    if (asyn_errcode != 0) {
-      strcat (EL755_routine[0], "/");
-      StrJoin (EL755_routine[0], sizeof(EL755_routine),
-		    EL755_routine[0], asyn_errtxt);
-    }
-    *entry_txt = EL755_routine[0];
-    EL755_call_depth = 0;
-    EL755_errcode = 0;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL755_GetCurrents:  Get currents from EL755.
-*/
-  int	EL755_GetCurrents (
-/*	=================
-*/		void		**handle,
-		float		 *soll,
-		float		 *ist) {
-
-    int			    iret;
-    char		    cmnd[32];
-    struct EL755info	   *info_ptr;
-		    /*----------------------------------------------
-		    */
-    *soll = *ist = 0.0;
-    info_ptr = (struct EL755info *) *handle;
-
-    if (!EL755_AddCallStack (info_ptr, "EL755_GetCurrents")) return False;
-		    /*----------------------------------------------
-		    ** Send I command to get EL755 currents. Repeat until
-		    ** first value is same 2 times consecutively.
-		    */
-    sprintf (cmnd, "I %d\r", info_ptr->index);
-    iret = EL755_SendTillTwoVals (handle, cmnd, soll, ist);
-    if (!iret) return False;
-
-    if (EL755_errcode == 0) EL755_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL755_Open:  Open a connection to an EL755 controller.
-*/
-  int	EL755_Open (
-/*	==========
-*/		void	**handle,
-		char	*host,
-		int	 port,
-		int	 chan,
-		int	 indx) {
-
-    int			    status, i;
-    char		    tmo_save[4];
-    char		   *rply_ptr0, *rply_ptr1, *rply_ptr2;
-    struct EL755info	   *my_handle;
-/*--------------------------------------------------------
-**			Initialise the error info stack and pre-set the
-**			routine name (in case of error).
-*/
-    EL755_errcode = EL755_errno = EL755_vaxc_errno = 0;
-    strcpy (EL755_routine[0], "EL755_Open");	
-    EL755_call_depth = 1;
-/*--------------------------------------------------------
-**				    Assume trouble
-*/
-    *handle = NULL;
-/*--------------------------------------------------------
-**			    Reserve space for the data we need to store.
-*/
-    my_handle = (struct EL755info *) calloc (1, sizeof (*my_handle));
-    if (my_handle == NULL) {
-      EL755_errcode = EL755__BAD_MALLOC;	    /* calloc failed!! */
-      return False;
-    }
-/*--------------------------------------------------------
-**				    Set up the connection
-*/
-    StrJoin (my_handle->asyn_info.host, sizeof (my_handle->asyn_info.host),
-			    host, "");
-    my_handle->asyn_info.port = port;
-    my_handle->asyn_info.chan = chan;
-    status = AsynSrv_Open (&my_handle->asyn_info);
-    if (!status) {
-      EL755_errcode = EL755__BAD_SOCKET;
-      GetErrno (&EL755_errno, &EL755_vaxc_errno);   /* Save errno info */
-      EL755_ErrorLog ("EL755_Open/AsynSrv_Open", "Failed to make connection.");
-      free (my_handle);
-      return False;
-    }
-    memcpy (tmo_save, my_handle->asyn_info.tmo, 4);
-    status = EL755_Config ((void *) &my_handle,
-	"msecTmo", 100,		/* Set a short time-out initially since
-				** there should be no reason for the RMT,
-				** ECHO or ID commands to take very long.
-				*/
-	"eot", "1\r",
-	"index", indx,
-	NULL);
-    if (!status) {
-		    /* Some error occurred in EL755_Config - should be impossible!
-		    */
-      AsynSrv_Close (&my_handle->asyn_info, False);
-      free (my_handle);
-      return False;
-    }
-	    /*
-	    ** Now ensure that there's an EL755 connected to the line. The first
-	    ** "RMT 1" command can fail due to pending characters in the EL755
-	    ** input buffer causing the command to be corrupted. The response is
-	    ** ignored for this reason.
-	    */
-    status = AsynSrv_SendCmnds (&my_handle->asyn_info,
-		&my_handle->to_host, &my_handle->from_host,
-		"RMT 1\r",  /* Try to put EL755 on-line */
-		"RMT 1\r",  /* Try again in case type-ahead chars corrupted ..
-			    ** .. the first attempt. */
-		"ECHO 0\r", /* And turn off echoing */
-		NULL);
-    status = AsynSrv_SendCmnds (&my_handle->asyn_info,
-		&my_handle->to_host, &my_handle->from_host,
-		"RMT 1\r",
-		"ECHO 0\r",
-		"ID\r",
-		NULL);
-    if (!status) {
-		    /* Some error occurred in AsynSrv_SendCmnds.
-		    */
-      AsynSrv_Close (&my_handle->asyn_info, False);
-      free (my_handle);
-      EL755_errcode = EL755__BAD_ASYNSRV;
-      return False;
-    }
-
-    rply_ptr0 = AsynSrv_GetReply (&my_handle->asyn_info,
-		    &my_handle->from_host, NULL);
-    rply_ptr1 = AsynSrv_GetReply (&my_handle->asyn_info,
-		    &my_handle->from_host, rply_ptr0);
-    rply_ptr2 = AsynSrv_GetReply (&my_handle->asyn_info,
-		    &my_handle->from_host, rply_ptr1);
-    if ((rply_ptr0 == NULL) || (rply_ptr1 == NULL) || (rply_ptr2 == NULL)) {
-		    /* Some error occurred in AsynSrv_GetReply.
-		    */
-      EL755_AddCallStack (my_handle, "NULL response");
-      AsynSrv_Close (&my_handle->asyn_info, False);
-      EL755_errcode = EL755__BAD_DEV;
-      free (my_handle);
-      return False;
-    }
-    if (rply_ptr0[0] != '\0') {
-      EL755_AddCallStack (my_handle, rply_ptr0);
-      AsynSrv_Close (&my_handle->asyn_info, False);   /* Bad response! */
-      EL755_errcode = EL755__BAD_DEV;
-      free (my_handle);
-      return False;
-    }
-    if (rply_ptr1[0] != '\0') {
-      EL755_AddCallStack (my_handle, rply_ptr1);
-      AsynSrv_Close (&my_handle->asyn_info, False);   /* Bad response! */
-      EL755_errcode = EL755__BAD_DEV;
-      free (my_handle);
-      return False;
-    }
-    if (strncmp (rply_ptr2, "EL755 MAGST", 11) != 0) {
-      EL755_AddCallStack (my_handle, rply_ptr2);
-      AsynSrv_Close (&my_handle->asyn_info, False);   /* Bad response! */
-      EL755_errcode = EL755__BAD_DEV;
-      free (my_handle);
-      return False;
-    }
-					/* The device seems to be an EL755! */
-
-    memcpy (my_handle->asyn_info.tmo, tmo_save, 4); /* Restore time-out */
-			/*
-			** The connection is complete. Pass the data structure
-			** back to the caller as a handle.
-			*/
-    *handle = my_handle;
-    if (EL755_errcode == 0) EL755_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL755_PutOffline:  put the EL755 off-line
-*/
-  int	EL755_PutOffline (
-/*	================
-*/		void	**handle) {
-
-    int			 status;
-    struct EL755info	*info_ptr;
-    char		*rply_ptr0, *rply_ptr1, *rply_ptr2;
-    char		 buff[132];
-		    /*----------------------------------------------
-		    */
-    info_ptr = (struct EL755info *) *handle;
-
-    if (!EL755_AddCallStack (info_ptr, "EL755_PutOffline")) return False;
-		    /*----------------------------------------------
-		    ** The problem which this routine has is that the EL755
-		    ** may already be off-line. The following is, therefore,
-		    ** rather pedantic for most cases which occur in practice.
-		    */
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			"RMT 1\r",
-			"RMT 1\r",
-			"ECHO 1\r",
-			"RMT 0\r",
-			NULL);
-    if (!status) {
-      EL755_errcode = EL755__BAD_ASYNSRV;
-      return False;
-    }
-
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			"RMT\r", "", NULL);
-    if (!status) {
-      EL755_errcode = EL755__BAD_ASYNSRV;
-      return False;
-    }
-
-    rply_ptr0 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-    rply_ptr1 = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, rply_ptr0);
-    if ((rply_ptr0 == NULL) || (rply_ptr1 == NULL)) {
-      EL755_AddCallStack (info_ptr, "NULL response");
-      EL755_errcode = EL755__BAD_ILLG; return False;}
-
-    if ((strcmp (rply_ptr0, "RMT") == 0) &&
-	(strcmp (rply_ptr1, "\n0") == 0)) {
-      EL755_call_depth--;
-      return True;
-    }
-
-    if (strcmp (rply_ptr0, "?OF")  == 0) {
-      EL755_errcode = EL755__OFFLINE;
-    }else if (strcmp (rply_ptr0, "?OFL") == 0) {
-      EL755_errcode = EL755__BAD_OFL;
-    }else if (strcmp (rply_ptr0, "?syntax failure") == 0) {
-      EL755_errcode = EL755__BAD_CMD;
-    }else if (strncmp (rply_ptr0, "?TMO", 4) == 0) {
-      EL755_errcode = EL755__BAD_TMO;
-    }else {
-      sprintf (buff, "Cmnd=\"RMT.\" Rply0=\"%.10s\" Rply1=\"%.10s\"",
-		rply_ptr0, rply_ptr1);
-      MakePrintable (buff, sizeof(buff), buff);
-      EL755_AddCallStack (info_ptr, buff);
-
-      sprintf (buff, "Unrecognised responses to RMT command: \"%s\" \"%s\"",
-			rply_ptr0, rply_ptr1);
-      MakePrintable (buff, sizeof(buff), buff);
-      EL755_ErrorLog (EL755_routine[EL755_call_depth-1], buff);
-
-      EL755_errcode = EL755__BAD_ILLG;
-    }
-    return False;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL755_PutOnline:  put the EL755 on-line
-*/
-  int	EL755_PutOnline (
-/*	===============
-*/		void	**handle,
-		int	  echo) {
-
-    int			 status, my_echo;
-    struct EL755info	*info_ptr;
-    char		 cmnd0[10], buff[132];
-    char		*rply_ptr;
-		    /*----------------------------------------------
-		    */
-    info_ptr = (struct EL755info *) *handle;
-
-    if (!EL755_AddCallStack (info_ptr, "EL755_PutOnline")) return False;
-		    /*----------------------------------------------
-		    */
-    if ((echo != 0) && (echo != 1)) {
-      EL755_errcode = EL755__BAD_PAR; return False;
-    }
-		    /*----------------------------------------------
-		    ** The problem which this routine has is that the state
-		    ** of the EL755 is not known. The following is, therefore,
-		    ** rather pedantic for most cases which occur in practice.
-		    */
-    sprintf (cmnd0, "ECHO %d\r", echo);
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			"RMT 1\r",
-			"RMT 1\r",
-			cmnd0,
-			NULL);
-    if (!status) {
-      EL755_errcode = EL755__BAD_ASYNSRV;
-      return False;
-    }
-
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			&info_ptr->to_host, &info_ptr->from_host,
-			"ECHO\r", NULL);
-    if (!status) {
-      EL755_errcode = EL755__BAD_ASYNSRV;
-      return False;
-    }
-
-    rply_ptr = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-    if (rply_ptr == NULL) {
-      EL755_AddCallStack (info_ptr, "NULL response");
-      EL755_errcode = EL755__BAD_ILLG; return False;}
-
-    if ((echo == 1) && (strcmp (rply_ptr, "ECHO") == 0)) {
-      EL755_call_depth--;
-      return True;
-    }else if ((echo == 0) &&
-	      (sscanf (rply_ptr, "%d", &my_echo) == 1) &&
-	      (my_echo == echo)) {
-      EL755_call_depth--;
-      return True;
-    }
-
-    if (strcmp (rply_ptr, "?OF")  == 0) {
-      EL755_errcode = EL755__OFFLINE;
-    }else if (strcmp (rply_ptr, "?OFL") == 0) {
-      EL755_errcode = EL755__BAD_OFL;
-    }else if (strcmp (rply_ptr, "?syntax failure") == 0) {
-      EL755_errcode = EL755__BAD_CMD;
-    }else if (strncmp (rply_ptr, "?TMO", 4) == 0) {
-      EL755_errcode = EL755__BAD_TMO;
-    }else {
-      sprintf (buff, "Cmnd=\"ECHO.\" Rply=\"%.10s\"", rply_ptr);
-      MakePrintable (buff, sizeof(buff), buff);
-      EL755_AddCallStack (info_ptr, buff);
-
-      sprintf (buff, "Unrecognised response to ECHO command: \"%s\"",
-			rply_ptr);
-      MakePrintable (buff, sizeof(buff), buff);
-      EL755_ErrorLog (EL755_routine[EL755_call_depth-1], buff);
-
-      EL755_errcode = EL755__BAD_ILLG;
-    }
-    return False;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL755_SendTillSameStr:  Repeat a command until we get the same
-**				    response on 2 successive occasions.
-**
-**		    This routine is intended for internal use only!
-**		    If too many retries, EL755_errcode is set to EL755__TOO_MANY.
-*/
-  int	EL755_SendTillSameStr (
-/*	=====================
-*/		void		       **handle,
-		char			*cmnd,
-		char			*rply,
-		int			 rply_len) {
-
-    int			    iret, i, j, n_ovfl;
-    struct EL755info	   *info_ptr;
-    char		   *rply_ptr;
-    char		    buff[132];
-    char		    replies[6][64];
-		    /*----------------------------------------------
-		    */
-    info_ptr = (struct EL755info *) *handle;
-
-    if (!EL755_AddCallStack (info_ptr, "EL755_SendTillSameStr")) return False;
-		    /*----------------------------------------------
-		    ** Send command. Do it in a
-		    ** loop until we get the same response twice to guard
-		    ** against RS-232-C problems with the EL755.
-		    */
-    i = n_ovfl = 0;
-    StrJoin (rply, rply_len, "#", "");
-
-    while (i < 6) {
-      iret = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			    &info_ptr->to_host, &info_ptr->from_host,
-			    cmnd, NULL);
-      if (!iret) {
-	EL755_errcode = EL755__BAD_ASYNSRV; return False;}
-      rply_ptr = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr == NULL) {
-	EL755_AddCallStack (info_ptr, "NULL response");
-	EL755_errcode = EL755__BAD_ILLG; return False;}
-      if (strncmp (rply_ptr, "?TMO", 4)  == 0) {
-	EL755_errcode = EL755__BAD_TMO; return False;}
-      if (strcmp (rply_ptr, "?OF")  == 0) {
-	EL755_errcode = EL755__OFFLINE; return False;}
-      if (strcmp (rply_ptr, "?OFL") == 0) {
-	EL755_errcode = EL755__BAD_OFL; return False;}
-      if (strcmp (rply_ptr, "?syntax failure") == 0) {
-	EL755_errcode = EL755__BAD_CMD; return False;}
-      if (strcmp (rply_ptr, "?OV") == 0) {  /* Check for overflow. This seems
-					    ** to be an EL755 problem which
-					    ** needs fixing. In the meantime,
-					    ** just force a repeat.
-					    */
-	sprintf (buff, "Warning -- \"?OV\" received in response to \"%s\".",
-		    cmnd);
-	MakePrintable (buff, sizeof(buff), buff);
-	EL755_ErrorLog (EL755_routine[EL755_call_depth-1], buff);
-	n_ovfl++;
-	if (n_ovfl > 10) {EL755_errcode = EL755__TOO_MANY; return False;}
-      }else {
-	n_ovfl = 0;
-	if (strncmp (rply, rply_ptr, rply_len) == 0) break;
-	StrJoin (rply, rply_len, rply_ptr, "");
-	MakePrintable (replies[i], sizeof (replies[0]), rply_ptr);
-	i++;
-      }
-    }
-    if (strncmp (rply, rply_ptr, rply_len) != 0) {
-      EL755_errcode = EL755__TOO_MANY;
-      return False;
-    }
-    if (i > 1) {
-      sprintf (buff, "Warning -- %d retries needed for Cmnd = \"%s\".",
-			(i - 1), cmnd);
-      MakePrintable (buff, sizeof(buff), buff);
-      EL755_ErrorLog (EL755_routine[EL755_call_depth-1], buff);
-      for (j = 0; j < i; j++) fprintf (stderr, "  %d: \"%s\"\n", j, replies[j]);
-    }
-
-    if (EL755_errcode != 0) return False;
-    EL755_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL755_SendTillSameVal:  Repeat a command until we get the same
-**				 response value on 2 successive occasions.
-**
-**		    This routine is intended for internal use only!
-**		    If too many retries, EL755_errcode is set to EL755__TOO_MANY.
-*/
-  int	EL755_SendTillSameVal (
-/*	=====================
-*/		void		       **handle,
-		char			*cmnd,
-		float			*val) {
-
-    int			    iret, i, n_ovfl, cnt;
-    struct EL755info	   *info_ptr;
-    float		    last_val;
-    char		   *rply_ptr, *tok;
-    char		    buff[132];
-		    /*----------------------------------------------
-		    */
-    info_ptr = (struct EL755info *) *handle;
-
-    if (!EL755_AddCallStack (info_ptr, "EL755_SendTillSameVal")) return False;
-		    /*----------------------------------------------
-		    ** Send command. Do it in a
-		    ** loop until we get the same response twice to guard
-		    ** against RS-232-C problems with the EL755.
-		    */
-    i = n_ovfl = 0;
-    *val = 9999.999;
-    last_val = *val - 1.0;
-
-    while (i < 6) {
-      iret = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			    &info_ptr->to_host, &info_ptr->from_host,
-			    cmnd, NULL);
-      if (!iret) {
-	EL755_errcode = EL755__BAD_ASYNSRV; return False;}
-
-      rply_ptr = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr == NULL) {
-	EL755_AddCallStack (info_ptr, "NULL response");
-	EL755_errcode = EL755__BAD_ILLG; return False;}
-
-      if (strcmp (rply_ptr, "?OV")  == 0) { /* Check for overflow. This seems
-					    ** to be an EL755 problem which
-					    ** needs fixing. In the meantime,
-					    ** just force a repeat.
-					    */
-	sprintf (buff, "Warning -- \"?OV\" received in response to \"%s\".",
-		    cmnd);
-	MakePrintable (buff, sizeof(buff), buff);
-	EL755_ErrorLog (EL755_routine[EL755_call_depth-1], buff);
-	n_ovfl++;
-	if (n_ovfl > 10) {EL755_errcode = EL755__TOO_MANY; return False;}
-      }else {
-	n_ovfl = 0;
-	if (strcmp (rply_ptr, "?OF")  == 0) {
-	  EL755_errcode = EL755__OFFLINE; return False;}
-	if (strcmp (rply_ptr, "?OFL")  == 0) {
-	  EL755_errcode = EL755__BAD_OFL; return False;}
-	if (strcmp (rply_ptr, "?syntax failure") == 0) {
-	  EL755_errcode = EL755__BAD_CMD; return False;}
-	if (strcmp (rply_ptr, "?power-supply OFF") == 0) { /* If off, return 0 */
-	  *val = 0.0;
-	  EL755_call_depth--; return True;
-	}else {
-	  tok = strtok (rply_ptr, " ");
-	  if ((tok == NULL) ||
-	      (sscanf (tok, "%f%n", val, &cnt) != 1) ||
-	      (cnt != strlen (tok))) {
-	    EL755_AddCallStack (info_ptr, rply_ptr);
-	    EL755_errcode = EL755__BAD_ILLG; return False;
-	  }
-	  if (*val == last_val) break;
-	  last_val = *val;
-	}
-	i++;
-      }
-    }
-    if (last_val != *val) {
-      EL755_errcode = EL755__TOO_MANY; return False;}
-
-    if (i > 1) {
-      sprintf (buff, "Warning -- %d retries needed for Cmnd = \"%s\".",
-			(i - 1), cmnd);
-      MakePrintable (buff, sizeof(buff), buff);
-      EL755_ErrorLog (EL755_routine[EL755_call_depth-1], buff);
-    }
-
-    if (EL755_errcode != 0) return False;
-    EL755_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL755_SendTillTwoVals:  Repeat a command until we get 2 fl.pt.
-**				values and the first is the same on 2
-**				successive occasions.
-**
-**		    This routine is intended for internal use only! It is
-**		    intended to read the Soll- and Ist-currents where the
-**		    Soll-value should be the same but the Ist-value could be
-**		    changing as the power supply ramps to a new value.
-**		    If too many retries, EL755_errcode is set to EL755__TOO_MANY.
-*/
-  int	EL755_SendTillTwoVals (
-/*	=====================
-*/		void		       **handle,
-		char			*cmnd,
-		float			*val0,
-		float			*val1) {
-
-    int			    iret, i, n_ovfl, cnt0, cnt1;
-    struct EL755info	   *info_ptr;
-    float		    last_val;
-    char		   *rply_ptr, *tok0, *tok1;
-    char		    buff[132];
-		    /*----------------------------------------------
-		    */
-    info_ptr = (struct EL755info *) *handle;
-
-    if (!EL755_AddCallStack (info_ptr, "EL755_SendTillTwoVals")) return False;
-		    /*----------------------------------------------
-		    ** Send command. Do it in a
-		    ** loop until we get the same response twice to guard
-		    ** against RS-232-C problems with the EL755.
-		    */
-    i = n_ovfl = 0;
-    *val0 = 9999.999;
-    last_val = *val0 - 1.0;
-
-    while (i < 6) {
-      iret = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			    &info_ptr->to_host, &info_ptr->from_host,
-			    cmnd, NULL);
-      if (!iret) {
-	EL755_errcode = EL755__BAD_ASYNSRV; return False;}
-
-      rply_ptr = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr == NULL) {
-	EL755_AddCallStack (info_ptr, "NULL response");
-	EL755_errcode = EL755__BAD_ILLG; return False;}
-
-      if (strcmp (rply_ptr, "?OV")  == 0) { /* Check for overflow. This seems
-					    ** to be an EL755 problem which
-					    ** needs fixing. In the meantime,
-					    ** just force a repeat.
-					    */
-	sprintf (buff, "Warning -- \"?OV\" received in response to \"%s\".",
-		    cmnd);
-	MakePrintable (buff, sizeof(buff), buff);
-	EL755_ErrorLog (EL755_routine[EL755_call_depth-1], buff);
-	n_ovfl++;
-	if (n_ovfl > 10) {EL755_errcode = EL755__TOO_MANY; return False;}
-      }else {
-	n_ovfl = 0;
-	if (strcmp (rply_ptr, "?OF")  == 0) {
-	  EL755_errcode = EL755__OFFLINE; return False;}
-	if (strcmp (rply_ptr, "?OFL")  == 0) {
-	  EL755_errcode = EL755__BAD_OFL; return False;}
-	if (strcmp (rply_ptr, "?syntax failure") == 0) {
-	  EL755_errcode = EL755__BAD_CMD; return False;}
-	if (strcmp (rply_ptr, "?power-supply OFF") == 0) { /* If off, return 0 */
-	  *val0 = 0.0;
-	  *val1 = 0.0;
-	  EL755_call_depth--; return True;
-	}else {
-	  tok0 = strtok (rply_ptr, " ");
-	  tok1 = strtok (NULL, " ");
-	  if ((tok0 == NULL) ||
-	      (tok1 == NULL) ||
-	      (sscanf (tok0, "%f%n", val0, &cnt0) != 1) ||
-	      (sscanf (tok1, "%f%n", val1, &cnt1) != 1) ||
-	      (cnt0 != strlen (tok0)) ||
-	      (cnt1 != strlen (tok1))) {
-	    EL755_AddCallStack (info_ptr, rply_ptr);
-	    EL755_errcode = EL755__BAD_ILLG; return False;
-	  }
-	  if (*val0 == last_val) break;
-	  last_val = *val0;
-	}
-	i++;
-      }
-    }
-    if (last_val != *val0) {
-      EL755_errcode = EL755__TOO_MANY; return False;}
-
-    if (i > 1) {
-      sprintf (buff, "Warning -- %d retries needed for Cmnd = \"%s\".",
-			(i - 1), cmnd);
-      MakePrintable (buff, sizeof(buff), buff);
-      EL755_ErrorLog (EL755_routine[EL755_call_depth-1], buff);
-    }
-
-    if (EL755_errcode != 0) return False;
-    EL755_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL755_SetCurrent:  Sets current via EL755.
-*/
-  int	EL755_SetCurrent (
-/*	================
-*/		void		**handle,
-		float		  soll) {
-
-    int			    i, iret;
-    float		    my_soll, my_ist;
-    char		    cmnd[32], cmnd0[32], buff[132], buff1[132];
-    struct EL755info	   *info_ptr;
-		    /*----------------------------------------------
-		    */
-    info_ptr = (struct EL755info *) *handle;
-
-    if (!EL755_AddCallStack (info_ptr, "EL755_SetCurrent")) return False;
-		    /*----------------------------------------------
-		    ** Send I command to set EL755 current and I command
-		    ** to read back the set value.
-		    ** Repeat until set value is correct.
-		    */
-    sprintf (cmnd,  "I %d %.4f\r", info_ptr->index, soll);
-    sprintf (cmnd0, "I %d\r",	   info_ptr->index);
-    i = 0;
-    my_soll = soll + 1.0;
-
-    while ((i < 6) && (fabs (soll - my_soll) > 0.01)) {
-      iret = EL755_SendTillSameStr (handle, cmnd, buff, sizeof(buff));
-      if (!iret) return False;
-      if (buff[0] == NIL) {	    /* We should get a null response */
-	iret = EL755_SendTillSameVal (handle, cmnd0, &my_soll);
-	if (!iret) return False;
-      }else if (strcmp (buff, "?value out of range") == 0) {
-	EL755_errcode = EL755__OUT_OF_RANGE; return False;
-      }else if (strcmp (buff, "?current limitation") == 0) {
-	EL755_errcode = EL755__TOO_LARGE; return False;
-      }else if (strcmp (buff, "?power-supply OFF") == 0) {
-	if (soll == 0.0) {  /* Suppress error if trying to set zero and
-			    .. power supply is off! */
-	  if (EL755_errcode != 0) return False;
-	  EL755_call_depth--;
-	  return True;
-	}else {
-	  EL755_errcode = EL755__TURNED_OFF; return False;
-	}
-      }else {
-	sprintf (buff1, "Cmnd=\"%s\" Rply=\"%.10s\"", cmnd, buff);
-	MakePrintable (buff1, sizeof(buff1), buff1);
-	EL755_AddCallStack (info_ptr, buff1);
-	EL755_errcode = EL755__BAD_ILLG;
-	return False;
-      }
-      i++;
-    }
-
-    if (fabs (soll - my_soll) > 0.01) {
-      EL755_errcode = EL755__TOO_MANY; return False;}
-
-    if (i > 1) {
-      sprintf (buff, "Warning -- %d retries needed for Cmnd = \"%s\".",
-			(i - 1), cmnd);
-      MakePrintable (buff, sizeof(buff), buff);
-      EL755_ErrorLog (EL755_routine[EL755_call_depth-1], buff);
-    }
-    if (EL755_errcode != 0) return False;
-    EL755_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		EL755_Send sends a command to the EL755 and gets a reply
-**
-**		    This routine is intended for internal use only!
-*/
-  int	EL755_Send (
-/*	=====================
-*/		void		       **handle,
-		char			*cmnd,
-		char			*rply,
-		int			 rply_len) {
-
-    int			    iret, i, j, n_ovfl;
-    struct EL755info	   *info_ptr;
-    char		   *rply_ptr;
-    char		    buff[132];
-    char		    replies[6][64];
-		    /*----------------------------------------------
-		    */
-    info_ptr = (struct EL755info *) *handle;
-
-    if (!EL755_AddCallStack (info_ptr, "EL755_SendTillSameStr")) return False;
-		    /*----------------------------------------------
-		    ** Send command. 
-		    */
-    i = n_ovfl = 0;
-    StrJoin (rply, rply_len, "#", "");
-
-    
-      iret = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-			    &info_ptr->to_host, &info_ptr->from_host,
-			    cmnd, NULL);
-      if (!iret) {
-	EL755_errcode = EL755__BAD_ASYNSRV; return False;}
-      rply_ptr = AsynSrv_GetReply (
-			&info_ptr->asyn_info, &info_ptr->from_host, NULL);
-      if (rply_ptr == NULL) {
-	EL755_AddCallStack (info_ptr, "NULL response");
-	EL755_errcode = EL755__BAD_ILLG; return False;}
-      if (strncmp (rply_ptr, "?TMO", 4)  == 0) {
-	EL755_errcode = EL755__BAD_TMO; return False;}
-      if (strcmp (rply_ptr, "?OF")  == 0) {
-	EL755_errcode = EL755__OFFLINE; return False;}
-      if (strcmp (rply_ptr, "?OFL") == 0) {
-	EL755_errcode = EL755__BAD_OFL; return False;}
-      if (strcmp (rply_ptr, "?syntax failure") == 0) {
-	EL755_errcode = EL755__BAD_CMD; return False;}
-      if (strcmp (rply_ptr, "?OV") == 0) {  /* Check for overflow. This seems
-					    ** to be an EL755 problem which
-					    ** needs fixing. In the meantime,
-					    ** just force a repeat.
-					    */
-	sprintf (buff, "Warning -- \"?OV\" received in response to \"%s\".",
-		    cmnd);
-	MakePrintable (buff, sizeof(buff), buff);
-	EL755_ErrorLog (EL755_routine[EL755_call_depth-1], buff);
-	n_ovfl++;
-	if (n_ovfl > 10) {EL755_errcode = EL755__TOO_MANY; return False;}
-      }else {
-	n_ovfl = 0;
-	if (strncmp (rply, rply_ptr, rply_len) == 0)
-        {
-           return False;
-        }
-	StrJoin (rply, rply_len, rply_ptr, "");
-	MakePrintable (replies[i], sizeof (replies[0]), rply_ptr);
-	i++;
-      }
-    if (EL755_errcode != 0) return False;
-    EL755_call_depth--;
-    return True;
-  }
-/*-------------------------------------------- End of EL755_Utility.C =======*/
diff --git a/hardsup/err.c b/hardsup/err.c
deleted file mode 100644
index 9ef0fad9..00000000
--- a/hardsup/err.c
+++ /dev/null
@@ -1,105 +0,0 @@
-
-/*---------------------------------------------------------------------------
-
-	EL734Error2Text converts between an EL734 error code to text
------------------------------------------------------------------------------*/
-	void EL734Error2Text(char *pBuffer, int iErr)
-	{
-		switch(iErr)
-		{
-			case -28:
-				strcpy(pBuffer,"EL734__BAD_ADR");
-				break;
-			case -8:
-				strcpy(pBuffer,"EL734__BAD_BIND");
-				break;
-			case -30:
-				strcpy(pBuffer,"EL734__BAD_BSY");
-				break;
-			case -3:
-				strcpy(pBuffer,"EL734__BAD_CMD");
-				break;
-			case -9:
-				strcpy(pBuffer,"EL734__BAD_CONNECT");
-				break;
-			case -23:
-				strcpy(pBuffer,"EL734__BAD_FLUSH");
-				break;
-			case -6:
-				strcpy(pBuffer,"EL734__BAD_HOST");
-				break;
-			case -10:
-				strcpy(pBuffer,"EL734__BAD_ID");
-				break;
-			case -5:
-				strcpy(pBuffer,"EL734__BAD_ILLG");
-				break;
-			case -2:
-				strcpy(pBuffer,"EL734__BAD_LOC");
-				break;
-			case -11:
-				strcpy(pBuffer,"EL734__BAD_MALLOC");
-				break;
-			case -21:
-				strcpy(pBuffer,"EL734__BAD_NOT_BCD");
-				break;
-			case -4:
-				strcpy(pBuffer,"EL734__BAD_OFL");
-				break;
-			case -29:
-				strcpy(pBuffer,"EL734__BAD_PAR");
-				break;
-			
-			case -17:
-				strcpy(pBuffer,"EL734__BAD_RECV");
-				break;
-			case -19:
-				strcpy(pBuffer,"EL734__BAD_RECV_NET");
-				break;
-			case -18:
-				strcpy(pBuffer,"EL734__BAD_RECV_PIPE");
-				break;
-			case -20:
-				strcpy(pBuffer,"EL734__BAD_RECV_UNKN");
-				break;
-			case -22:
-				strcpy(pBuffer,"EL734__BAD_RECVLEN");
-				break;
-			case -24:
-				strcpy(pBuffer,"EL734__BAD_RECV1");
-				break;
-			case -26:
-				strcpy(pBuffer,"EL734__BAD_RECV1_NET");
-				break;
-			case -25:
-				strcpy(pBuffer,"EL734__BAD_RECV1_PIPE");
-				break;
-			case -27:
-				strcpy(pBuffer,"EL734__BAD_RNG");
-				break;
-			case -13:
-				strcpy(pBuffer,"EL734__BAD_SEND");
-				break;
-			case -14:
-				strcpy(pBuffer,"EL734__BAD_SEND_PIPE");
-				break;
-			case -15:
-				strcpy(pBuffer,"EL734__BAD_SEND_NET");
-				break;
-			case -16:
-				strcpy(pBuffer,"EL734__BAD_SEND_UNKN");
-				break;
-			case -12:
-				strcpy(pBuffer,"EL734__BAD_SENDLEN");
-				break;
-			case -7:
-				strcpy(pBuffer,"EL734__BAD_SOCKET");
-				break;
-			case -1:
-				strcpy(pBuffer,"EL734__BAD_TMO");
-				break;
-			default:
-				strcpy(pBuffer,"Unknown EL734 error");
-				break;	
-		}
-	}
diff --git a/hardsup/failinet.c b/hardsup/failinet.c
deleted file mode 100644
index 38c39e8f..00000000
--- a/hardsup/failinet.c
+++ /dev/null
@@ -1,109 +0,0 @@
-#define	    ident	"1B01"
-#ifdef VAXC
-#module	    FailInet	ident
-#endif
-#ifdef __DECC
-#pragma	    module	    FailInet	ident
-#endif
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     Computing Section                        |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...LIB.SINQ]FAILINET.C
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Nov 1995
-**
-**  To compile this module, use:
-
-	$ import tasmad
-	$ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-	$ cc /debug /noopt /obj=[]FailInet -
-			tasmad_disk:[mad.lib.sinq]FailInet +
-			sinq_c_tlb/lib
-
-**  To include this module in SINQ.OLB, use:
-
-  $ import tasmad
-  $ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-  $
-  $ define/group sinq_olb mad_lib:sinq_dbg.olb
-  $ @tasmad_disk:[mad.lib.sinq]sinq_olb FailInet debug
-  $
-  $ define/group sinq_olb mad_lib:sinq.olb
-  $ @tasmad_disk:[mad.lib.sinq]sinq_olb FailInet
-**
-** Updates:
-**  1A01  2-Nov-1995 DM.	Initial version.
-**  1B01 21-Mar-1996 DM.	Move from DELTAT.OLB to SINQ.OLB.
-**============================================================================
-** The following entry points are included:
-**
-    #include <sinq_prototypes.h>
-
-    void FailInet (char *text)
-**	 --------
-**  Input Args:
-**	text		- A text string to be printed.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	none
-**  Global variables modified:
-**	none
-**  Routines called:
-**	GetErrno
-**	perror
-**	exit
-**  Description:
-**	The routine is useful if a fatal TCP/IP error occurs.
-**	The value of errno is printed and then "perror" is called.
-**	Then "exit" is called.
-**============================================================================
-**			Global Definitions
-*/
-#ifdef VAXC
-#include    stdlib
-#include    stdio
-#include    errno
-#include    sinq_prototypes
-#else
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <errno.h>
-#include    <sinq_prototypes.h>
-#endif
-/*--------------------------------------------------------------------------
-**			Global Variables
-*/
-
-/*
-**		FailInet:  Some network failure has occurred.
-*/
-  void FailInet (char *text) {
-/*     ========
-**		    Output the given text and exit the process.
-*/
-    int    my_errno, my_vaxc_errno;
-
-    GetErrno (&my_errno, &my_vaxc_errno);
-    printf ("### Internet Error ###\n");
-#ifdef __VMS
-    printf ("                   ### errno      = %d.\n", my_errno);
-    printf ("                   ### vaxc$errno = %d.\n", my_vaxc_errno);
-#else
-    printf ("                   ### errno = %d.\n", my_errno);
-#endif
-    perror (text);
-    exit (EXIT_FAILURE);
-  }
-/*------------------------------------------------- End of FAILINET.C =======*/
diff --git a/hardsup/geterrno.c b/hardsup/geterrno.c
deleted file mode 100644
index c3edcf18..00000000
--- a/hardsup/geterrno.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#define	    ident	"1B01"
-#ifdef VAXC
-#module	    GetErrno	ident
-#endif
-#ifdef __DECC
-#pragma	    module	    GetErrno	ident
-#endif
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     Computing Section                        |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...LIB.SINQ]GETERRNO.C
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Nov 1995
-**
-**  To compile this module, use:
-
-	$ import tasmad
-	$ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-	$ cc /debug /noopt /obj=[]GetErrno -
-			tasmad_disk:[mad.lib.sinq]GetErrno +
-			sinq_c_tlb/lib
-
-**  To include this module in SINQ.OLB, use:
-
-  $ import tasmad
-  $ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-  $
-  $ define/group sinq_olb mad_lib:sinq_dbg.olb
-  $ @tasmad_disk:[mad.lib.sinq]sinq_olb GetErrno debug
-  $
-  $ define/group sinq_olb mad_lib:sinq.olb
-  $ @tasmad_disk:[mad.lib.sinq]sinq_olb GetErrno
-**
-** Updates:
-**  1A01  2-Nov-1995 DM.	Initial version.
-**  1B01 21-Mar-1996 DM.	Move from DELTAT.OLB to SINQ.OLB.
-**============================================================================
-** The following entry points are included:
-**
-    #include <sinq_prototypes.h>
-
-    void GetErrno (int *his_errno, int *his_vaxc_errno)
-**	 --------
-**  Input Args:
-**	none
-**  Output Args:
-**	his_errno	- value of "errno".
-**	his_vaxc_errno	- on VMS systems only, value of "vaxc$errno". Otherwise
-**			    set to 1.
-**  Modified Args:
-**	none
-**  Return status:
-**	none
-**  Global variables modified:
-**	none
-**  Description:
-**	GetErrno returns a copy of the universal error variable "errno" (and,
-**	on VMS systems, vaxc$errno) to a local variable supplied by the user.
-**	This can occasionally be useful when debugging since the debugger on
-**	VMS can't easily examine them.
-**============================================================================
-**			Global Definitions
-*/
-#ifdef VAXC
-#include    errno
-#else
-#include    <errno.h>
-#endif
-/*--------------------------------------------------------------------------
-**			Global Variables
-*/
-
-/*--------------------------------------------------------------------------
-**		GetErrno:  Make copies of errno and vaxc$errno for debug.
-*/
-  void	GetErrno (int *his_errno, int *his_vaxc_errno) {
-/*      ========
-*/
-    *his_errno = errno;	    /* Make copy of errno   */
-#ifdef __VMS
-    *his_vaxc_errno = vaxc$errno; /* Make copy of vaxc$errno	*/
-#else
-    *his_vaxc_errno = 1;
-#endif
-    return;
-  }
-/*------------------------------------------------- End of GETERRNO.C =======*/
diff --git a/hardsup/itc4util.c b/hardsup/itc4util.c
deleted file mode 100644
index 1dce9f76..00000000
--- a/hardsup/itc4util.c
+++ /dev/null
@@ -1,421 +0,0 @@
-/*--------------------------------------------------------------------------
-
-                         I T C 4 U T I L
-                       
-     A few utility functions for dealing with a ITC4 temperature controller
-     within the SINQ setup: host -- TCP/IP -- MAC --- RS-232.
-     
-     Mark Koennecke, Juli 1997
-
-       Copyright:
-
-       Labor fuer Neutronenstreuung
-       Paul Scherrer Institut
-       CH-5423 Villigen-PSI
-
-
-      The authors hereby grant permission to use, copy, modify, distribute,
-      and license this software and its documentation for any purpose, provided
-      that existing copyright notices are retained in all copies and that this
-      notice is included verbatim in any distributions. No written agreement,
-      license, or royalty fee is required for any of the authorized uses.
-      Modifications to this software may be copyrighted by their authors
-      and need not follow the licensing terms described here, provided that
-      the new terms are clearly indicated on the first page of each file where
-      they apply.
-
-      IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-      FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-      ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-      DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-      POSSIBILITY OF SUCH DAMAGE.
-
-      THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-      INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-      FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-      IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-      NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-      MODIFICATIONS.
-----------------------------------------------------------------------------*/
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-#include "serialsinq.h"
-#include "itc4util.h"
-/*-------------------------------------------------------------------------*/
-
-  int ITC4_Open(pITC4 *pData, char *pHost, int iPort, int iChannel, int iMode)
-  {
-     int iRet;
-     char pCommand[80];
-     char pReply[132];
-     pITC4 self = NULL;
-     
-     self = (pITC4)malloc(sizeof(ITC4));
-     if(self == NULL)
-     {
-       return ITC4__BADMALLOC;
-     }
-     *pData = self;
-     self->iControl = 1;
-     self->iRead    = 1;
-     self->iReadOnly = iMode;
-     self->fDiv = 10.;
-     self->fMult = 10.;
-     
-     iRet = SerialOpen(&self->pData, pHost, iPort, iChannel);
-     if(iRet != 1)
-     {
-        return iRet;
-     }
-
-     /* set an lengthy timeout for the configuration in order to
-        prevent problems.
-      */  
-     iRet = SerialConfig(&self->pData, 100);
-     if(iRet != 1)
-     {
-       return iRet;
-     }
-     
-     /* an identification test has been here, but I had to removed as not all
-        ITC4 controllers at SINQ answer the V command. Some versions of the
-        controller do not recognize it. Sighhhhhhh. I had to put it in again
-        in order to check for ITC-503, but I handle the thing by default as
-        an ITC4 if I do not get a proper response.
-      */  
-      self->i503 = 0;
-      iRet = SerialWriteRead(&self->pData,"V\r\n",pReply,131);
-      if(iRet != 1)
-      {
-         return iRet;
-      }
-      if(strstr(pReply,"ITC503") != NULL)
-      {
-         self->i503 = 1;
-      }   
-         
-      if(!self->iReadOnly)
-      {
-        /* switch to remote and locked operation */
-         iRet = SerialWriteRead(&self->pData,"C3\r\n",pReply,131);
-         if(iRet != 1)
-         { 
-           return iRet;
-         }    
-         if(pReply[0] == '?')
-         {
-           strcpy(self->pAns,pReply);
-           return ITC4__BADCOM;
-         }
-  
-         /* set the control sensor, for this we need to switch A0 first,
-            the do it and switch back
-         */   
-         iRet = SerialWriteRead(&self->pData,"A0\r\n",pReply,131);
-         if(iRet != 1)
-         {
-           return iRet;
-         }    
-         if(pReply[0] == '?')
-         {
-           strcpy(self->pAns,pReply);
-           return ITC4__BADCOM;
-         }
-  
-         sprintf(pCommand,"H%1.1d\r\n",self->iControl);
-         iRet = SerialWriteRead(&self->pData,pCommand,pReply,131);
-         if(iRet != 1)
-         {
-            return iRet;
-         }    
-         if(pReply[0] == '?')
-         {
-            strcpy(self->pAns,pReply);
-            return ITC4__BADCOM;
-         }
-  
-         /* controls to automatic */
-         iRet = SerialWriteRead(&self->pData,"A3\r\n",pReply,131);
-         if(iRet != 1)
-         {
-            return iRet;
-         }    
-         if(pReply[0] == '?')
-         {
-            strcpy(self->pAns,pReply);
-            return ITC4__BADCOM;
-         }
-         /* reset timeout */
-         iRet = SerialConfig(&self->pData, 10);
-         if(iRet != 1)
-         {
-           return iRet;
-         }
-     }
-     return 1;
-  }  
-/*--------------------------------------------------------------------------*/
-  void ITC4_Close(pITC4 *pData)
-  {
-    char pReply[132];
-    int iRet;
-    pITC4 self;
-
-     self = *pData;
-    
-    /* switch to local operation */
-    iRet = SerialWriteRead(&self->pData,"C0\r\n",pReply,131);
-    /* ignore errors on this one, the thing may be down */
-    
-    /* close connection */
-    SerialClose(&self->pData);
-    
-    /* free memory */
-    free(self);
-    *pData = NULL;
-  }  
-/*--------------------------------------------------------------------------*/
-  int ITC4_Config(pITC4 *pData, int iTmo, int iRead, int iControl, 
-                  float fDiv,float fMult)
-  {
-    int iRet;
-    char pReply[132];
-    char pCommand[10];
-    pITC4 self;
-
-     self = *pData;
-     
-     /* first timeout */
-     if(iTmo > 0)
-     {
-       iRet = SerialConfig(&self->pData, iTmo);
-       if(iRet != 1)
-       {
-	 return iRet;
-       }
-     }
-     
-     /* Read Sensor */
-     if( (iRead > 0) && (iRead < 5) && (self->iRead != iRead) )
-     {
-       self->iRead = iRead;
-     }
-
-     /* Control Sensor */
-     if( (iControl > 0) && (iControl < 5) )
-     {
-	/* set the control sensor, for this we need to switch A0 first,
-	    the do it and switch back
-	*/   
-       iRet = SerialWriteRead(&self->pData,"A0\r\n",pReply,131);
-       if(iRet != 1)
-       {
-         return iRet;
-       }    
-       if(pReply[0] == '?')
-       {
-         strcpy(self->pAns,pReply);
-         return ITC4__BADCOM;
-       }
-
-	/* set sensor */
-       sprintf(pCommand,"H%1.1d\r\n",iControl);
-       iRet = SerialWriteRead(&self->pData,pCommand,pReply,131);
-       if(iRet != 1)
-       {
-         return iRet;
-       }    
-       if(pReply[0] == '?')
-       {
-         strcpy(self->pAns,pReply);
-         return ITC4__BADCOM;
-       }
-     
-	/* controls to automatic */
-       iRet = SerialWriteRead(&self->pData,"A3\r\n",pReply,131);
-       if(iRet != 1)
-       {
-         return iRet;
-       }    
-       if(pReply[0] == '?')
-       {
-         strcpy(self->pAns,pReply);
-         return ITC4__BADCOM;
-       }
-     }
-     self->fDiv = fDiv;
-     self->fMult = fMult;
-
-     return 1;
-  }  
-/*--------------------------------------------------------------------------*/
-  int ITC4_Send(pITC4 *pData, char *pCommand, char *pReply, int iLen)
-  {
-     pITC4 self;
-
-     self = *pData;
-
-     /* make sure, that there is a \r at the end of the command */
-     if(strchr(pCommand,(int)'\r') == NULL)
-     {
-       strcat(pCommand,"\r");
-     }
-     return SerialWriteRead(&self->pData,pCommand,pReply,iLen);
-  }  
-/*--------------------------------------------------------------------------*/
-  int ITC4_Read(pITC4 *pData, float *fVal)
-  {
-    char pCommand[10], pReply[132];
-    int iRet;
-    float fRead = -9999999.;
-    pITC4 self;
-
-     self = *pData;
-
-
-     /* format and send R command */
-     sprintf(pCommand,"R%1.1d\r\n",self->iRead);
-     iRet = SerialWriteRead(&self->pData,pCommand,pReply,131);
-     if(iRet != 1)
-     {
-       return iRet;
-     }    
-     if(pReply[0] == '?')
-     {
-       strcpy(self->pAns,pReply);
-       return ITC4__BADCOM;
-     }
-
-     /* analyse reply */
-     if(pReply[0] != 'R')
-     {
-       strcpy(self->pAns,pReply);
-       return ITC4__BADCOM;
-     }
-   
-     iRet = sscanf(&pReply[1],"%f",&fRead);
-     if(iRet != 1)
-     {
-       return ITC4__BADREAD;
-     }
-     if(self->i503)
-     {
-        *fVal = fRead;
-     }
-     else
-     {   
-        *fVal = fRead/self->fDiv;
-     }
-     return 1;
-  }
-/*-------------------------------------------------------------------------*/
-  int ITC4_Set(pITC4 *pData, float fVal)
-  {
-     char pCommand[10], pReply[132];
-     int iRet, i, iRead;
-     const float fPrecision = 0.0001;
-     float fSet, fDelta, fRead, fDum;
-     pITC4 self;
-     int iSet;
-
-     self = *pData;
-
-     if(self->iReadOnly)
-     {
-       return ITC4__READONLY;
-     }
-     
-     /* format command */
-     if(self->i503)
-     {
-        sprintf(pCommand,"T%-7.3f\r\n",fVal);
-     }
-     else
-     {
-        fSet = fVal;
-        iSet = (int)(fSet*self->fMult);
-        sprintf(pCommand,"T%05.5d\r\n",iSet);
-     }   
-     
-     /* try three times: send, read, test, if OK return, else
-        resend. This must be done because the ITC4 tends to loose
-        characters
-     */
-     for(i = 0; i < 3; i++)
-     {  
-        /* send command */  
-        iRet = SerialWriteRead(&self->pData,pCommand,pReply,131);
-        if(iRet != 1)
-        {
-           return iRet;
-        }    
-        if(pReply[0] == '?')
-        {
-          strcpy(self->pAns,pReply);
-          return ITC4__BADCOM;
-        }
-        /* read the set value again */
-        iRead = self->iRead;
-        self->iRead = 0; /* make a R0 */
-        fDum = self->fDiv;
-        self->fDiv = self->fMult;
-        iRet = ITC4_Read(pData,&fRead);
-        self->iRead = iRead;
-        self->fDiv = fDum;
-        if(iRet != 1)
-        {
-          return iRet;
-        }
-        /* check the value read back */
-        if(self->i503)
-        {
-          fDelta = fRead - fVal;
-        }
-        else
-        {
-          fDelta = fRead - fSet;
-        }  
-        if(fDelta < 0)
-           fDelta = -fDelta;
-        if(fDelta < fPrecision)
-        {
-          /* Success, go home */
-          return 1;
-        }   
-     }
-     return ITC4__BADSET;
-  }
-/*-------------------------------------------------------------------------*/
-  void ITC4_ErrorTxt(pITC4 *pData,int iCode, char *pError, int iLen)
-  {
-     char pBueffel[512];
-     pITC4 self;
-
-     self = *pData;
-     
-     switch(iCode)
-     {
-        case ITC4__BADCOM:
-             sprintf(pBueffel,"ITC4: Invalid command or offline, got %s",
-                     self->pAns);
-             strncpy(pError,pBueffel,iLen);
-             break;
-        case ITC4__BADPAR:
-             strncpy(pError,"ITC4: Invalid parameter specified",iLen);
-             break;
-        case ITC4__BADMALLOC:
-             strncpy(pError,"ITC4: Error allocating memory in ITC4",iLen);
-             break;
-        case ITC4__BADREAD:
-             strncpy(pError,"ITC4: Badly formatted answer",iLen);
-             break;
-        case ITC4__BADSET:
-             strncpy(pError,"ITC4: Failed three times to write new set value to ITC4",iLen);
-             break;     
-        default:
-             SerialError(iCode, pError,iLen);
-             break;                    
-     }
-  }
diff --git a/hardsup/itc4util.h b/hardsup/itc4util.h
deleted file mode 100644
index f700c8af..00000000
--- a/hardsup/itc4util.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*---------------------------------------------------------------------------
-                         I T C L 4 U T I L
-                         
-  A few utility functions for talking to a Oxford Instruments ITCL-4
-  temperature controller via the SINQ setup: TCP/IP--MAC--RS-232--
-  ITC-4.
-  
-  Mark Koennecke, Juli 1997
-  
-----------------------------------------------------------------------------*/
-#ifndef SINQITCL4
-#define SINQITCL4
-
-/*----------------------- ERRORCODES--------------------------------------
-  Most functions return a negative error code on failure. Error codes 
-  defined are those defined for serialsinq plus a few additional ones:
-*/
-
-#define ITC4__BADCOM -501 
-/* command not recognized */
-#define ITC4__BADPAR -502 
-/* bad parameter to command */
-#define ITC4__BADMALLOC -503 
-/* error allocating memory */
-#define ITC4__BADREAD  -504
-/* error analysing command string on Read */
-#define ITC4__NOITC  -510
-/* Controller is no ITC-4  */
-#define ITC4__BADSET -530
-/* failed three times to set temperature */
-#define ITC4__READONLY -531
-/*------------------------------------------------------------------------*/
-  typedef struct __ITC4 {
-                            int iRead;
-                            int iControl;
-                            void *pData;
-                            char pAns[80];
-                            float fDiv;
-                            float fMult;
-                            int iReadOnly;
-                            int i503;   /* flag for model 503, understanding float*/
-                           } ITC4; 
-
-  typedef struct __ITC4 *pITC4;
-
-/*-----------------------------------------------------------------------*/
-  int ITC4_Open(pITC4 *pData,char *pHost, int iPort, int iChannel, int iMode);
-  /***** creates an ITC4 datastructure and opens a connection to the ITCL4
-         controller. Input Parameters are:
-                 the hostname
-                 the port number
-                 the RS-232 channel number on the Mac.
-                 iMode: 1 for ReadOnly, 0 for normal mode
-
-          Return values are 1 for success, a negative error code on
-          failure.
-
-  */       
-                 
-  void   ITC4_Close(pITC4 *pData);
-  /****** close a connection to an ITC4controller and frees its
-          data structure. The only parameter is a pointer to the data 
-          structure for this controller. This pointer will be invalid after
-          this call.
-  */          
-
-  int ITC4_Config(pITC4 *pData, int iTmo, int iRead, 
-                  int iControl, float fDiv, float fMult);
-   /***** configure some aspects of a ITC4temperature controller.
-          The parameter are:
-                    - a pointer to the data structure for the controller as 
-                      returned by OpenITCL4
-                    - a value for the connection timeout
-                    - the temperature sensor to use for reading the 
-                      temperature.
-                    - the temperature sensor used by the ITC4controller 
-                      for regulating the temperature.
-                    - the divisor needed to calculate the real temperature
-                      from the sensor.     
-          The function returns 1 on success, a negative error code on 
-          failure.
-    */
-    
-    int ITC4_Send(pITC4 *pData, char *pCommand, char *pReply, int iLen);
-    /******* send a the command in pCommand to the ITC4controller.
-             A possible reply is returned in the buffer pReply.
-             Maximum iLen characters are copied to pReply.
-             The first parameter is a pointer to a ITC4data structure
-             as returned by OpenITCL4.
-             
-             Return values are 1 for success, a negative error code on
-             failure.
-     */
-     
-     int ITC4_Read(pITC4 *pData, float *fVal);
-     /******* reads the current actual temperature of the sensor
-              configured by ConfigITC4for reading. The value is returned
-              in fVal. The first parameter is a pointer to a ITCL4
-              data structure as returned by OpenITCL4.
- 
-              Return values are 1 for success, a negative error code on
-              failure.
-     */
-
-      int ITC4_Set(pITC4 *pData, float fVal);
-      /****** sets a new preset temperature in the ITC4temperature
-              controller. Parameters are:
-              - a pointer to a ITC4data structure as returned by OpenITCL4.
-              - the new preset value.
-
-              Return values are 1 for success, a negative error code on
-              failure.
-      */
-      
-      void  ITC4_ErrorTxt(pITC4 *pData, int iCode, char *pError, int iLen);
-      /******* translates one of the negative error ITC4error codes
-               into text. Maximum iLen bytes will be copied to the
-               buffer pError;
-      */         
-                               
-                             
-#endif  
-                       
-		
diff --git a/hardsup/make_gen b/hardsup/make_gen
deleted file mode 100644
index 32e8a1f5..00000000
--- a/hardsup/make_gen
+++ /dev/null
@@ -1,28 +0,0 @@
-#---------------------------------------------------------------------------
-# Makefile for the SINQ hardware support library
-# included by a machine specific makefile
-#
-# Mark Koennecke, November 1996
-# Markus Zolliker, March 2003
-#--------------------------------------------------------------------------
-.SUFFIXES:
-.SUFFIXES: .c .o
-
-OBJ=   el734_utility.o asynsrv_utility.o stredit.o \
-     strjoin.o failinet.o geterrno.o  el737_utility.o  sinqhm.o serialsinq.o \
-     itc4util.o dillutil.o table.o el755_utility.o el755_errorlog.o \
-     makeprint.o StrMatch.o
-
-libhlib.a: $(OBJ)
-	rm -f libhlib.a
-	ar cr libhlib.a $(OBJ)
-	ranlib libhlib.a
-
-clean:
-	rm -f *.o *.a
-
-
-
-
-
-
diff --git a/hardsup/makefile_linux b/hardsup/makefile_linux
deleted file mode 100644
index 08a262d3..00000000
--- a/hardsup/makefile_linux
+++ /dev/null
@@ -1,15 +0,0 @@
-#---------------------------------------------------------------------------
-# Makefile for the SINQ hardware support library
-# machine-dependent part for Redhat Linux with AFS at PSI
-#
-# Mark Koennecke, November 1996
-# Markus Zolliker, March 2003
-#--------------------------------------------------------------------------
-# the following line only for fortified version
-DFORTIFY=-DFORTIFY
-#==========================================================================
-
-CC       = gcc
-CFLAGS   = -g -DLINUX $(DFORTIFY) -I$(SRC). -I$(SRC).. -I../src
-
-include $(SRC)make_gen
diff --git a/hardsup/makeprint.c b/hardsup/makeprint.c
deleted file mode 100644
index b35188e2..00000000
--- a/hardsup/makeprint.c
+++ /dev/null
@@ -1,276 +0,0 @@
-#define	    ident	"1B02"
-#ifdef VAXC
-#module	    MakePrint	ident
-#endif
-#ifdef __DECC
-#pragma	    module	    MakePrint	ident
-#endif
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     Department ASQ				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...LIB.SINQ]MAKEPRINT.C
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Nov 1995
-**
-**  To compile this module, use:
-
-	$ import tasmad
-	$ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-	$ cc /debug /noopt /obj=[]MakePrint -
-			tasmad_disk:[mad.lib.sinq]MakePrint +
-			sinq_c_tlb/lib
-
-**  To include this module in SINQ.OLB, use:
-
-  $ import tasmad
-  $ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-  $
-  $ define/group sinq_olb mad_lib:sinq_dbg.olb
-  $ @tasmad_disk:[mad.lib.sinq]sinq_olb MakePrint debug
-  $
-  $ define/group sinq_olb mad_lib:sinq.olb
-  $ @tasmad_disk:[mad.lib.sinq]sinq_olb MakePrint
-**
-** Updates:
-**  1A01 30-Nov-1995 DM.	Initial version.
-**  1B01 21-Mar-1996 DM.	Move from DELTAT.OLB to SINQ.OLB.
-**============================================================================
-** The entry points included in this module are described below. Prototypes
-** can be defined via:
-**
-**    #include <sinq_prototypes.h>
-**
-**	MakeCharPrintable  - routine used by MakePrintable and MakeMemPrintable.
-**	MakeMemPrintable   - version of MakePrintable which will handle
-**				buffers containing a NUL character.
-**	MakePrint	   - ensure all characters in a buffer are printable.
-**	MakePrintable	   - extended version of MakePrint.
-**---------------------------------------------------------------------
-**  char  *MakePrint (*text)
-**	   ---------
-**  Input Args:
-**	none
-**  Output Args:
-**	none
-**  Modified Args:
-**	char	*text
-**  Return status:
-**	A pointer to "text".
-**  Routines called:
-**	none
-**  Description:
-**	The routine ensures that all characters in "text" are 7-bit
-**	and then replaces any non-printing character with a ".". A trailing
-**	"\n" or "\r" is removed.
-**---------------------------------------------------------------------------
-**  int   *MakeCharPrintable (*out, out_size, in)
-**	   -----------------
-**  Input Args:
-**	char	in	    -- the character to be converted.
-**	int	out_size    -- the size of the out buffer.
-**  Output Args:
-**	char	*out	    -- buffer to hold the converted text.
-**  Modified Args:
-**	none
-**  Return status:
-**	The number of characters put into the output buffer.
-**  Routines called:
-**	none
-**  Description:
-**	The routine puts a printable version of the character "in" into the
-**	"out" buffer. The printable version is generated as follows:
-**
-**	  a) If the parity bit of a char is set, a "^" is inserted into the
-**	     output buffer, the parity bit of the char is cleared and processed
-**	     further.
-**	  b) If the char is "^", "\^" is inserted into the output buffer.
-**	  c) If the char is "\", "\\" is inserted into the output buffer.
-**	  d) If the char is a standard C-language control char, it gets replaced
-**	     by a recognised backslash escape sequence. The following are
-**	     recognised:
-**			NUL 0x00 --> \0
-**			BEL 0x07 --> \a
-**			BS  0x08 --> \b
-**			HT  0x09 --> \t
-**			LF  0x0a --> \n
-**			VT  0x0b --> \v
-**			FF  0x0c --> \f
-**			CR  0x0d --> \r
-**	  e) If the character is printable (i.e. between " "/0x20 and "~"/0x7e
-**	     inclusive), it is inserted into the output buffer as is.
-**	  f) Anything else gets inserted as "\xxx", where xxx is the octal
-**	     representation of the character.
-**---------------------------------------------------------------------------
-**  char  *MakePrintable (*out, out_size, *in)
-**	   -------------
-**  Input Args:
-**	char	*in	    -- the text to be converted.
-**	int	out_size    -- the size of the out buffer.
-**  Output Args:
-**	char	*out	    -- buffer to hold the converted text.
-**  Modified Args:
-**	none
-**  Return status:
-**	A pointer to "out".
-**  Routines called:
-**	none
-**  Description:
-**	The routine converts characters in the "in" string to a printable
-**	representation using MakeCharPrintable and copies them to "out" until
-**	a null is detected.
-**---------------------------------------------------------------------------
-**  char  *MakeMemPrintable (*out, out_size, *in, in_len)
-**	   ----------------
-**  Input Args:
-**	int	out_size    -- the size of the out buffer.
-**	char	*in	    -- the text to be converted.
-**	int	in_len	    -- the number of characters to be converted.
-**  Output Args:
-**	char	*out	    -- buffer to hold the converted text.
-**  Modified Args:
-**	none
-**  Return status:
-**	A pointer to "out".
-**  Routines called:
-**	none
-**  Description:
-**	The routine is the same as MakePrintable, except that it converts
-**	a given number of characters rather than a null terminated string.
-**============================================================================*/
-/*
-**---------------------------------------------------------------------------
-**					Global Definitions
-*/
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <string.h>
-#ifdef FORTIFY
-  #include    <fortify.h>
-#endif
-
-#include    <sinq_prototypes.h>
-
-#define	    NIL	    ('\0')
-/*--------------------------------------------------------------------------
-**					Global Variables
-*/
-/*
-**--------------------------------------------------------------------------
-**		MakeCharPrintable:  makes a single character printable.
-*/
-  int	MakeCharPrintable (char *out, int out_size, char in) {
-/*      =================
-**
-**		Return value is number of chars put into *out.
-*/
-    char    buff[8], *pntr;
-
-    pntr = buff;
-
-    if ((in & 0x80) != 0) {	/* Parity bit set? */
-      *pntr++ = '^';		/* Yes. Put a '^' in the buffer .. */
-      in = in & 0x7f;		/* .. and remove the parity bit. */
-    }
-
-    switch (in) {
-     case '^':    *pntr++ = '\\'; *pntr++ = '^'; break;
-     case '\\':   *pntr++ = '\\'; *pntr++ = '\\'; break;
-     case '\000': *pntr++ = '\\'; *pntr++ = '0'; break;
-     case '\007': *pntr++ = '\\'; *pntr++ = 'a'; break;
-     case '\010': *pntr++ = '\\'; *pntr++ = 'b'; break;
-     case '\011': *pntr++ = '\\'; *pntr++ = 't'; break;
-     case '\012': *pntr++ = '\\'; *pntr++ = 'n'; break;
-     case '\013': *pntr++ = '\\'; *pntr++ = 'v'; break;
-     case '\014': *pntr++ = '\\'; *pntr++ = 'f'; break;
-     case '\015': *pntr++ = '\\'; *pntr++ = 'r'; break;
-     default:
-      if ((in < ' ') || (in > '~')) {
-	pntr += sprintf (pntr, "\\%03.3o", in);
-      }else {
-	*pntr++ = in;
-      }
-    }
-    out_size = (out_size > (pntr - buff)) ? (pntr - buff) : out_size;
-    memcpy (out, buff, out_size);
-    return out_size;
-  }
-/*
-**--------------------------------------------------------------------------
-**		MakeMemPrintable:  alternative version of MakePrintable.
-*/
-  char  *MakeMemPrintable (
-/*       ================
-*/			char	*out,
-			int	 out_size,
-			char	*in,
-			int	 in_len) {
-
-    int		i;
-    char	*pntr;
-
-    if (out_size <= 0) return out;
-
-    while ((out_size > 1) && (in_len > 0)) {
-      i = MakeCharPrintable (out, (out_size - 1), *in);
-      out += i; out_size -= i;
-      in++; in_len--;
-    }
-    *out = NIL;
-    return out;
-  }
-/*
-**--------------------------------------------------------------------------
-**		MakePrint:  Make all characters in a buffer printable.
-*/
-  char	*MakePrint (char *chr) {
-/*       =========
-*/
-    int		len, i;
-    
-    for (i = 0; chr[i] != NIL; i++) chr[i] &= 0x7F;
-
-    len = strlen (chr);
-    if (len <= 0) return chr;
-
-    if (chr[len-1] == '\r') chr[len-1] = NIL;
-    if (chr[len-1] == '\n') chr[len-1] = NIL;
-
-    for (i = 0; chr[i] != NIL; i++) {
-      if (chr[i] < ' ') chr[i] = '.';
-      if (chr[i] == 0x7F) chr[i] = '.';
-    }
-
-    return chr;
-  }
-/*
-**--------------------------------------------------------------------------
-**		MakePrintable:  improved version of MakePrint.
-*/
-  char  *MakePrintable (
-/*       =============
-*/			char	*out,
-			int	 out_size,
-			char	*in) {
-
-    int		i;
-    char	*pntr;
-
-    if (out_size <= 0) return out;
-
-    while ((out_size > 1) && (*in != NIL)) {
-      i = MakeCharPrintable (out, (out_size - 1), *in);
-      in++; out += i; out_size -= i;
-    }
-    *out = NIL;
-    return out;
-  }
-/*-------------------------------------------- End of MakePrint.C =======*/
diff --git a/hardsup/rs232c_def.h b/hardsup/rs232c_def.h
deleted file mode 100644
index 2753bd1b..00000000
--- a/hardsup/rs232c_def.h
+++ /dev/null
@@ -1,186 +0,0 @@
-#ifndef	    _rs232c_def_
-#define	    _rs232c_def_
-/*------------------------------------------------ RS232C_DEF.H Ident V02G
-**	Definitions for the RS-232-C Server Protocol
-**
-**	On UNIX systems, this file is located in /public/lib/include
-**	On VMS  systems, this file is a module in mad_lib:sinq_c.tlb
-*/
-#define RS__PROTOCOL_ID		"V01A"
-#define RS__PROTOCOL_ID_V01B	"V01B"
-
-#define RS__PROTOCOL_CODE	1 /* Code corresponding to RS__PROTOCOL_ID   */
-#define RS__PROTOCOL_CODE_V01B	2 /* Code corresponding to RS__PROTOCOL_ID_0 */
-
-#ifndef OffsetOf
-#define OffsetOf(type, identifier)  ((size_t)(&((type*) NULL)->identifier))
-#endif
-/*----------------------------------------------------------------------------
-** Structure of Message from Client to Server - everything is sent in ASCII
-**						for LabView's benefit.
-** Name		#bytes         Description
-** ====		======         ===========
-** msg_size	    4	Number of bytes following (rounded up to multiple
-**				    of 4).
-** msg_id	    4	Message ident (an incrementing counter for debugging).
-** c_pcol_lvl	    4	Client-Protocol-Level (should be "V01A").
-** serial_port	    4	Serial port to which commands should be sent. This
-**			    is a small integer).
-** tmo		    4	Time-out in units of 0.1 secs (<0 = "wait for ever").
-** terms	1 + 3	Terminators. The first char gives the number of
-**			    terminators (up to 3) and the following 3 chars
-**			    are valid response terminators, e.g. "1\r\0\0".
-** n_cmnds	    4	Number of commands following.
-** cmnds	  356	The command buffer. This is a concatenated list of
-**			    commands with the structure described below.
-**
-**  Special Cases of msg_size
-**  -------------------------
-**    "-001" ==> the client is just about to close his connection.
-**    "-002" ==> this is a request to the server for him to turn on tracing.
-**		    The reply should be simply an echo of the 4 bytes "-002".
-**    "-003" ==> this is a request to the server for him to turn off tracing.
-**		    The reply should be simply an echo of the 4 bytes "-003".
-**    "-004" ==> this is a request to the server for him to flush his buffers.
-**		    The reply should be simply an echo of the 4 bytes "-004".
-**
-** Structure of a command item in the cmnds buffer.
-**
-** a) RS__PROTOCOL_ID = "V01A"
-**
-**    Name	#bytes         Description
-**    ====	======         ===========
-**    cmnd_len	    2	    The number of bytes following encoded as 2 ASCII
-**			    decimal chars.
-**    cmnd     <cmnd_len>   The command to be sent on Serial Port <serial_port>.
-**			    The string should contain any required terminator
-**			    bytes but should not be zero-terminated (unless
-**			    the zero-byte should be transmitted at the end
-**			    of the command). cmnd_len should count the
-**			    terminator byte.
-**
-**	An example of a command item might be:  "06RMT 1\r"
-**
-** b) RS__PROTOCOL_ID = "V01B"
-**
-**    Name	#bytes         Description
-**    ====	======         ===========
-**    cmnd_len	    4	    The number of bytes following encoded as 4 ASCII
-**			    decimal chars.
-**    cmnd     <cmnd_len>   The command to be sent on Serial Port <serial_port>.
-**			    The string should contain any required terminator
-**			    bytes but should not be zero-terminated (unless
-**			    the zero-byte should be transmitted at the end
-**			    of the command). <cmnd_len> should count the
-**			    terminator byte.
-**
-**	An example of a command item might be:  "0006RMT 1\r"
-**--------------------------------------------------------------------------*/
-  struct RS__MsgStruct {
-		char	msg_size[4];	    /* 4 ASCII decimal chars!! */
-		char	msg_id[4];
-		char	c_pcol_lvl[4];	    /* Client protocol level */
-		char	serial_port[4];
-		char	tmo[4];		    /* Units are 0.1 secs */
-		char	terms[4];
-		char	n_cmnds[4];
-		char	cmnds[356];
-  };
-	/*
-	** The "cmnds" buffer in RS__MsgStruct is a concatenated
-	** list of the following structures.
-	*/
-  struct RS__CmndStruct {
-		char	cmnd_len[2];
-		char	cmnd[1];
-  };
-  struct RS__CmndStruct_V01B {
-		char	cmnd_len[4];
-		char	cmnd[1];
-  };
-/*----------------------------------------------------------------------------
-** Structure of Reply from Server to Client - everything is sent in ASCII
-**					      for LabView's benefit.
-**
-** Name		#bytes         Description
-** ====		======         ===========
-** msg_size	    4	Number of bytes following (rounded up to multiple
-**				    of 4).
-** msg_id	    4	Message ident (this is a copy of the msg_id field
-**			    in the message from Client to Server).
-** s_pcol_lvl	    4	Server-Protocol-Level (should be "V01A" or "V01B").
-** n_rply	    4	Number of replies following. If < 0, an error has
-**			    been detected and sub_status may give additional
-**			    information.
-** rplys	  496	The reply buffer. This is a concatenated list of
-**			    replies with the structure described below.
-** sub_status	   12	A sub-status code. This field overlays the first 12
-**			    bytes of rplys and may provide additional
-**			    information in the case that n_rply < 0.
-**
-** Structure of a reply item in the rplys buffer.
-**
-** a) RS__PROTOCOL_ID = "V01A"
-**
-**    Name	#bytes         Description
-**    ====	======         ===========
-**    rply_len	 2	 The number of bytes following encoded as 2 ASCII
-**			    decimal chars.
-**    term	 1	 The terminating character which was detected at the
-**			    end of the reply. This will be one of the
-**			    characters specified in <terms>.    
-**    rply  <rply_len-1> The zero-terminated reply. This is effectively the
-**			    reply as received with the terminating character
-**			    replaced by '\0'.
-**
-**	An example of a reply item might be:  "08\r12.345\0"
-**
-** b) RS__PROTOCOL_ID = "V01B"
-**
-**    Name	#bytes         Description
-**    ====	======         ===========
-**    rply_len	 4	 The number of bytes following encoded as 4 ASCII
-**			    decimal chars.
-**    term	 1	 The terminating character which was detected at the
-**			    end of the reply. This will be one of the
-**			    characters specified in <terms>.    
-**    rply  <rply_len-1> The zero-terminated reply. This is effectively the
-**			    reply as received with the terminating character
-**			    replaced by '\0'.
-**
-**  An example of a reply item might be:  "0009\r12.3456\0"
-**--------------------------------------------------------------------------*/
-  struct RS__RespStruct {
-		char	msg_size[4];
-		char	msg_id[4];
-		char	s_pcol_lvl[4];	    /* Server protocol level */
-		char	n_rply[4];	    /* Error if < 0 */
-		union {
-		  char    rplys[496];
-		  char    sub_status[12];
-		} u;
-  };
-	/*
-	** The "rplys" buffer in RS__RespStruct is a
-	** concatenated list of the following structures.
-	*/
-  struct RS__RplyStruct {
-		char	rply_len[2];	    /* 2 ASCII decimal chars!!
-					    ** The length includes the
-					    ** terminator, term, and the
-					    ** zero terminator of rply.
-					    */
-		char	term;	    /* The terminating character */
-		char	rply[1];    /* Zero terminated string */
-  };
-  struct RS__RplyStruct_V01B {
-		char	rply_len[4];	    /* 4 ASCII decimal chars!!
-					    ** The length includes the
-					    ** terminator, term, and the
-					    ** zero terminator of rply.
-					    */
-		char	term;	    /* The terminating character */
-		char	rply[1];    /* Zero terminated string */
-  };
-/*------------------------------------------------ End of RS232C_DEF.H --*/
-#endif		/* _rs232c_def_ */
diff --git a/hardsup/serialsinq.c b/hardsup/serialsinq.c
deleted file mode 100644
index 2d40ac72..00000000
--- a/hardsup/serialsinq.c
+++ /dev/null
@@ -1,914 +0,0 @@
-/*-------------------------------------------------------------------------
-                          S E R I A L S I N Q
-   Implementation file of the functions for talking with a RS--232 port
-   on a SINQ terminal server. This code has been adapted from code 
-   provided by David Maden for the EL734 motor controller. A new version 
-   became necessary as the Dornier velocity selector supports a 
-   completely different protocoll than the EL734. The basics, however, are
-   the same.
-   
-   Mark Koennecke, Juli 1997
-
-       Copyright:
-
-       Labor fuer Neutronenstreuung
-       Paul Scherrer Institut
-       CH-5423 Villigen-PSI
-
-
-      The authors hereby grant permission to use, copy, modify, distribute,
-      and license this software and its documentation for any purpose, provided
-      that existing copyright notices are retained in all copies and that this
-      notice is included verbatim in any distributions. No written agreement,
-      license, or royalty fee is required for any of the authorized uses.
-      Modifications to this software may be copyrighted by their authors
-      and need not follow the licensing terms described here, provided that
-      the new terms are clearly indicated on the first page of each file where
-      they apply.
-
-      IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-      FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-      ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-      DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-      POSSIBILITY OF SUCH DAMAGE.
-
-      THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-      INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-      FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-      IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-      NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-      MODIFICATIONS.
-----------------------------------------------------------------------------*/
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <stdio.h>
-#include <sys/time.h>
-#include <unistd.h>
-
-#ifdef FORTIFY
-#include "../fortify.h"
-#endif
-
-#include    <stdarg.h>
-#include    <errno.h>
-#include    <signal.h>
-#include    <netdb.h>
-#include    <sys/socket.h>
-#include    <netinet/in.h>
-
-#include    <string.h>
-
-#ifdef	__VMS
-#include    <unixio.h>
-#else
-#include    <unistd.h>
-#endif
-
-/*-----------------------------------------------------------------*/
-#include    "sinq_prototypes.h"
-#include    "el734_def.h"
-#include    "rs232c_def.h"
-#include    "el734fix.h"
-#include    "serialsinq.h"
-
-#define True	1
-#define False	0
-
-  struct SerialInfo {
-	int			skt;
-	int                     iForce;
-	int			port;
-	int			chan;
-	char			host[20];
-	int			tmo;
-	int			msg_id;
-	int			n_replies, max_replies;
-	char                    pTerms[4];
-	char                    pSendTerm[10];
-	struct RS__MsgStruct    to_host;
-	struct RS__RespStruct   from_host;
-	SerialSleep             pFunc;
-	void                    *pData; 
-        struct AsynSrv__info    sAsync;
-  };
-/*------------------- The default sleep function -----------------------*/
-  static int SerialNccrrrh(void *pData, int iTime)
-  {
-    usleep(50);
-    return 1;
-  }
-
-/*-----------------------------------------------------------------------*/
-  int SerialOpen(void **pData, char *pHost, int iPort, int iChannel)
-  {
-    int			    status;
-    struct SerialInfo	   *my_info;
-    void		   *my_hndl;
-    struct hostent	   *rmt_hostent;
-    struct in_addr	   *rmt_inet_addr_pntr;
-    int			    rmt_sockname_len;
-    struct sockaddr_in	    lcl_sockname;
-    struct sockaddr_in	    rmt_sockname;
-    char		    msr_cmnd[20];
-    struct RS__RplyStruct  *rply_ptr;
-
-    *pData = NULL;
-    
-/*
-** allocate memory first 
-*/
-	*pData = malloc (sizeof (struct SerialInfo));
-	if (*pData == NULL) {
-	  return EL734__BAD_MALLOC;	    /* malloc failed!! */
-	}
-        my_info = *pData;
-        memset(my_info,0,sizeof(struct SerialInfo));
-
-/*
-**-------------------------- Set up the connection
-*/
-    my_info->sAsync.port = iPort;
-    strcpy(my_info->sAsync.host,pHost);
-    my_info->sAsync.chan = iChannel;
-    status = AsynSrv_Open (&(my_info->sAsync));
-    if (status != 1) {
-      return OPENFAILURE;
-    }
-
-    /* intialize  data structures */
-    StrJoin (my_info->host, sizeof (my_info->host), pHost, "");  
-    my_info->skt = my_info->sAsync.skt;
-    my_info->port   = iPort;
-    my_info->chan   = iChannel;
-    my_info->tmo	   = 100;
-    my_info->msg_id = 0;
-    my_info->pFunc = SerialNccrrrh;
-    my_info->pData = NULL;
-    strcpy(my_info->pTerms,"1\r\n\0");
-    my_info->iForce = 0;
-    memset(my_info->pSendTerm,0,9);
-    strcpy(my_info->pSendTerm,"\r\n");
-
-     return 1;
-  }
-/*-----------------------------------------------------------------------*/
-  int SerialForceOpen(void **pData, char *pHost, int iPort, int iChannel)
-  {
-    int			    status;
-    struct SerialInfo	    *my_info;
-    void		   *my_hndl;
-    struct hostent	   *rmt_hostent;
-    struct in_addr	   *rmt_inet_addr_pntr;
-    int			    rmt_sockname_len;
-    struct sockaddr_in	    lcl_sockname;
-    struct sockaddr_in	    rmt_sockname;
-    char		    msr_cmnd[20];
-    struct RS__RplyStruct  *rply_ptr;
-
-    *pData = NULL;
-
-    /* create pData */
-	*pData = malloc (sizeof (struct SerialInfo));
-	if (*pData == NULL) {
-	  return EL734__BAD_MALLOC;	    /* malloc failed!! */
-	}
-        my_info = *pData;
-        memset(my_info,0,sizeof(struct SerialInfo));
-       
-    
-/*
-**-------------------------- Set up the connection
-*/
-    my_info->sAsync.port = iPort;
-    strcpy(my_info->sAsync.host,pHost);
-    my_info->sAsync.chan = iChannel;
-    status = AsynSrv_OpenNew (&(my_info->sAsync));
-    if (status != 1) {
-      return OPENFAILURE;
-    }
-
-    /* intialize  data structures */
-    StrJoin (my_info->host, sizeof (my_info->host), pHost, "");  
-    my_info->skt = my_info->sAsync.skt;
-    my_info->port   = iPort;
-    my_info->chan   = iChannel;
-    my_info->tmo	   = 100;
-    my_info->msg_id = 0;
-    my_info->pFunc = SerialNccrrrh;
-    my_info->pData = NULL;
-    strcpy(my_info->pTerms,"1\r\n\0");
-    my_info->iForce = 1;
-    memset(my_info->pSendTerm,0,9);
-    strcpy(my_info->pSendTerm,"\r\n");
-
-     return 1;
-  }
-/*--------------------------------------------------------------------------*/
-  int SerialConfig(void **pData, int iTmo)
-  {
-    struct SerialInfo *my_info = NULL;
-    
-    my_info = (struct SerialInfo *)*pData;
-    assert(my_info);
-    
-    if(iTmo < 100)
-    {
-      my_info->tmo = 1;
-      return 1;
-    }
-    else
-    {
-      my_info->tmo = iTmo/100; /* convert to deci seconds */
-      if(my_info->tmo > 9999)my_info->tmo = 9999;
-    }
-    return 1;
-  }         
-/*--------------------------------------------------------------------------*/
-  int GetSerialTmo(void **pData)
-  {
-    struct SerialInfo *my_info = NULL;
-    int iTmo;
-    
-    my_info = (struct SerialInfo *)*pData;
-    assert(my_info);
-    
-    iTmo = my_info->tmo*100-99; /* convert back to milli seconds */
-
-    return iTmo;
-  }         
-  int SerialGetTmo(void **pData)
-  {
-    return GetSerialTmo(pData);
-  }
-/*--------------------------------------------------------------------------*/
-  int SerialGetSocket(void **pData)
-  {
-    struct SerialInfo *my_info = NULL;
-    int iTmo;
-    
-    my_info = (struct SerialInfo *)*pData;
-    assert(my_info);
-    
-    return my_info->skt; 
-
-    return 1;
-  }         
-/*--------------------------------------------------------------------------*/
-  int SerialClose(void **pData)
-  {
-
-    struct SerialInfo	*info_ptr;
-    char		buff[4];
-
-    info_ptr = (struct SerialInfo *) *pData;
-    if (info_ptr == NULL) return True;
-
-    if (info_ptr->skt != 0) {
-      AsynSrv_Close (&(info_ptr->sAsync),0);
-      info_ptr->skt = 0;
-    }
-    free (*pData);
-    *pData = NULL;
-    return True;
-  }
-/*--------------------------------------------------------------------------*/
-  int SerialForceClose(void **pData)
-  {
-
-    struct SerialInfo	*info_ptr;
-    char		buff[4];
-
-    info_ptr = (struct SerialInfo *) *pData;
-    if (info_ptr == NULL) return True;
-
-    if (info_ptr->skt != 0) {
-      AsynSrv_Close (&(info_ptr->sAsync),1);
-      info_ptr->skt = 0;
-    }
-    free (*pData);
-    *pData = NULL;
-    return True;
-  }
-/*--------------------------------------------------------------------------*/
-  int SerialATerm(void **pData, char *pTerm)
-  {
-    struct SerialInfo *my_info = NULL;
-    
-    my_info = (struct SerialInfo *)*pData;
-    if(my_info == NULL)
-    {
-      printf("Serious Programming problem: data = NULL\n");
-      return 0;
-    }
-    
-    /* only three characters in this field */
-    if(strlen(pTerm) > 4)
-    {
-      return 0;
-    }
-    memset(my_info->pTerms,0,4);
-    strcpy(my_info->pTerms,pTerm);
-    
-    return 1;
-  }  
-/*--------------------------------------------------------------------------*/
-  int SerialAGetTerm(void **pData, char *pTerm, int iTermLen)
-  {
-    struct SerialInfo *my_info = NULL;
-    
-    my_info = (struct SerialInfo *)*pData;
-    assert(my_info);
-    
-    strncpy(pTerm,my_info->pTerms,iTermLen);
-    
-    return 1;
-  }  
-/*-------------------------------------------------------------------------*/
-  int SerialSendTerm(void **pData, char *pTerm)
-  {
-    struct SerialInfo *my_info = NULL;
-    
-    my_info = (struct SerialInfo *)*pData;
-    assert(my_info);
-    
-    /* only 0 characters in this field */
-    if(strlen(pTerm) > 9)
-    {
-      return 0;
-    }
-    strcpy(my_info->pSendTerm,pTerm);
-    
-    return 1;
-  }  
-  
-/*---------------------------------------------------------------------------*/
-
-  int SerialSend(void **pData, char *pCommand)
-  {
-    struct SerialInfo	*info_ptr;
-    int			status, c_len, size, max_size, ncmnds;
-    int			bytes_to_come, bytes_left;
-    int                 iResult;
-    char		*nxt_byte_ptr;
-    char		err_text[80];
-    char		text[20];
-    char		*txt_ptr;
-    char		*cmnd_lst_ptr;
-    char                *pComCom = NULL;
-
-		    /*
-		    ** Do nothing if no connection - the connection gets
-		    ** closed if an error is detected.
-		    */
-    info_ptr = (struct SerialInfo *) *pData;
-    if (info_ptr == NULL) return NOCONNECTION;
-    if (info_ptr->skt == 0) {
-      memset (info_ptr->from_host.msg_size,
-		    '0', sizeof (info_ptr->from_host.msg_size));
-      return NOCONNECTION;
-    }
-
-    info_ptr->msg_id++;			/* Set up an incrementing message id */
-    if (info_ptr->msg_id > 9999) info_ptr->msg_id = 1;
-    sprintf (info_ptr->to_host.msg_id,	   "%04.4d", info_ptr->msg_id);
-
-    memcpy (info_ptr->to_host.c_pcol_lvl, RS__PROTOCOL_ID_V01B,
-		sizeof (info_ptr->to_host.c_pcol_lvl));
-    sprintf (info_ptr->to_host.serial_port, "%04.4d", info_ptr->chan);
-    sprintf (info_ptr->to_host.tmo,	    "%04d", info_ptr->tmo);
-
-    strncpy(info_ptr->sAsync.eot,info_ptr->pTerms,4);
-    memcpy (info_ptr->to_host.terms, info_ptr->pTerms,
-			sizeof (info_ptr->to_host.terms));
-    memcpy (info_ptr->to_host.n_cmnds, "0000",
-			sizeof (info_ptr->to_host.n_cmnds));
-
-
-    txt_ptr = pCommand;	/* Get pntr to cmnd string */
-    ncmnds = 0;
-    cmnd_lst_ptr = &info_ptr->to_host.cmnds[0];
-    bytes_left = sizeof (info_ptr->to_host) -
-			    OffsetOf (struct RS__MsgStruct, cmnds[0]);
-
-    size = strlen (txt_ptr) + strlen(info_ptr->pSendTerm);
-    if (size > bytes_left) {
-	return EL734__BAD_SENDLEN;		/* Too much to send */
-    }else {
-	strcpy (cmnd_lst_ptr+4, txt_ptr);
-	/* make sure that the string is properly terminated */
-	if((strstr(txt_ptr,info_ptr->pSendTerm) == 0) && 
-	   (strlen(txt_ptr) > 0) )
-	{
-	  strcpy(cmnd_lst_ptr+4+strlen(txt_ptr),info_ptr->pSendTerm);
-	  c_len = strlen(txt_ptr) + strlen(info_ptr->pSendTerm);   
-	}
-	else
-	{
-	    c_len = strlen (txt_ptr);
-	}    
-	sprintf (text, "%04.4d", c_len);
-	memcpy (cmnd_lst_ptr, text, 4);
-	cmnd_lst_ptr = cmnd_lst_ptr + c_len + 4;
-	ncmnds++;
-        bytes_left = bytes_left - size;
-    }
-
-    sprintf (text, "%04.4d", ncmnds);
-    memcpy (info_ptr->to_host.n_cmnds,
-		text, sizeof (info_ptr->to_host.n_cmnds));
-
-    size = cmnd_lst_ptr - info_ptr->to_host.msg_id;
-    size = (size + 3) & (~3);	/* Round up to multiple of 4 */
-    sprintf (text, "%04.4d", size);
-    memcpy (info_ptr->to_host.msg_size, text, 4);
-
-    status = send (info_ptr->skt, (char *) &info_ptr->to_host, size+4, 0);
-    if (status != (size+4)) {
-      if (status == 0) {
-	iResult = EL734__BAD_SEND;		/* Server exited (probably) */
-      }else if (status == -1) {
-	  iResult = EL734__BAD_SEND_PIPE;	/* Server exited (probably) */
-      }
-      AsynSrv_Close (&(info_ptr->sAsync),1);
-      info_ptr->skt = 0;
-      memset (info_ptr->from_host.msg_size,
-		    '0', sizeof (info_ptr->from_host.msg_size));
-      return iResult;
-    }
-    return 1;
-  }
-/*-------------------------------------------------------------------------*/
-  int SerialReceive(void **pData, char *pBuffer, int iBufLen)
-  {
-    struct SerialInfo	*info_ptr;
-    int			status, c_len, size, max_size, ncmnds;
-    int			bytes_to_come, bytes_left;
-    int                 iResult;
-    char		*nxt_byte_ptr;
-    char		err_text[80];
-    char		text[20];
-    char		*txt_ptr;
-    char		*cmnd_lst_ptr;
-    struct RS__RplyStruct_V01B *ptr = NULL;
-    long lMask = 0L;
-    struct timeval tmo = {0,1};
-
-    
-		    /*
-		    ** Do nothing if no connection - the connection gets
-		    ** closed if an error is detected.
-		    */
-    info_ptr = (struct SerialInfo *) *pData;
-    if (info_ptr == NULL) return NOCONNECTION;
-    if (info_ptr->skt == 0) {
-      memset (info_ptr->from_host.msg_size,
-		    '0', sizeof (info_ptr->from_host.msg_size));
-      return NOCONNECTION;
-    }
-
-    /* try with select if there is data */
-/*    lMask = (1 << info_ptr->skt);
-    tmo.tv_usec = 10;
-    status = select((info_ptr->skt +1), (fd_set *)&lMask, NULL,NULL,&tmo);
-    if(status <= 0)
-    {
-       return SELECTFAIL;
-    } 
-*/
-
-    /* try read the message length to come */
-    size = sizeof (info_ptr->from_host.msg_size);
-    status = recv (info_ptr->skt, info_ptr->from_host.msg_size, size, 0);
-    if (status != size) {
-        if(status > 0)
-        {
-	 iResult = EL734__BAD_RECV;   	/* Server exited (probably) */
-        }
-         else if (status == -1) {
-	   iResult = EL734__BAD_RECV_NET;  /* It's some other net problem */
-        }
-        else 
-        { 
-           iResult = EL734__BAD_RECV_NET;
-        }
-        AsynSrv_Close (&(info_ptr->sAsync),1);
-        info_ptr->skt = 0;
-        memset (info_ptr->from_host.msg_size,
-		    '0', sizeof (info_ptr->from_host.msg_size));
-        return iResult;
-    }
-    if (sscanf (info_ptr->from_host.msg_size, "%4d", &bytes_to_come) != 1) {
-      return EL734__BAD_NOT_BCD;	/* Header not an ASCII BCD integer */
-    }
-
-    max_size = sizeof (info_ptr->from_host) -
-		sizeof (info_ptr->from_host.msg_size);
-    if (bytes_to_come > max_size) {
-      iResult = EL734__BAD_RECVLEN;
-      nxt_byte_ptr = &info_ptr->from_host.msg_size[size];
-      while (bytes_to_come > 0) {	/* Flush out the incoming message */
-	bytes_left = bytes_to_come;
-	if (bytes_left > max_size) bytes_left = max_size;
-	status = recv (info_ptr->skt, nxt_byte_ptr, bytes_left, 0);
-	if (status <= 0) {
-	  iResult = EL734__BAD_FLUSH;  /* TCP/IP problem whilst flushing */
-	  AsynSrv_Close (&(info_ptr->sAsync),1);
-	  info_ptr->skt = 0;
-	  memset (info_ptr->from_host.msg_size,
-		    '0', sizeof (info_ptr->from_host.msg_size));
-	  return iResult;
-	}
-	bytes_to_come = bytes_to_come - status;
-      }
-      memset (info_ptr->from_host.msg_size,
-		    '0', sizeof (info_ptr->from_host.msg_size));
-      return iResult;
-    }else {
-      nxt_byte_ptr = &info_ptr->from_host.msg_size[size];
-      bytes_left = bytes_to_come;
-      while (bytes_left > 0) {		/* Read the rest of the response */
-	status = recv (info_ptr->skt, nxt_byte_ptr, bytes_left, 0);
-	if (status <= 0) {
-	  if (status == 0) {
-	    iResult = EL734__BAD_RECV1;	/* Server exited (probably) */
-	  }else {
-	      iResult =  EL734__BAD_RECV1_NET; /* It's some other net fault */
-	  }
-	  AsynSrv_Close (&(info_ptr->sAsync),1);
-	  info_ptr->skt = 0;
-	  return iResult;
-        }
-	bytes_left   = bytes_left   - status;
-	nxt_byte_ptr = nxt_byte_ptr + status;
-      }
-    }
-    /* well, we got data, make it available */
-    if (sscanf (info_ptr->from_host.n_rply, "%4d",
-	    &info_ptr->max_replies) != 1)info_ptr->max_replies = 0;
-    if (info_ptr->max_replies > 0)
-	    ptr = (struct RS__RplyStruct_V01B *) info_ptr->from_host.u.rplys;
-    info_ptr->n_replies = 1;
-    if(ptr)
-    {
-       strncpy(pBuffer, ptr->rply,iBufLen);
-    }
-    else
-    {
-       return NOREPLY;
-    }
-    return True;
-  }
-/*-------------------------------------------------------------------------*/
-  int SerialReceiveWithTerm(void **pData, char *pBuffer, 
-                             int iBufLen, char *cTerm )
-  {
-    struct SerialInfo	*info_ptr;
-    int			status, c_len, size, max_size, ncmnds;
-    int			bytes_to_come, bytes_left;
-    int                 iResult;
-    char		*nxt_byte_ptr;
-    char		err_text[80];
-    char		text[20];
-    char		*txt_ptr;
-    char		*cmnd_lst_ptr;
-    struct RS__RplyStruct_V01B *ptr = NULL;
-    long lMask = 0L;
-    struct timeval tmo = {0,1};
-
-    
-		    /*
-		    ** Do nothing if no connection - the connection gets
-		    ** closed if an error is detected.
-		    */
-    info_ptr = (struct SerialInfo *) *pData;
-    if (info_ptr == NULL) return NOCONNECTION;
-    if (info_ptr->skt == 0) {
-      memset (info_ptr->from_host.msg_size,
-		    '0', sizeof (info_ptr->from_host.msg_size));
-      return NOCONNECTION;
-    }
-
-    /* try with select if there is data */
-/*    lMask = (1 << info_ptr->skt);
-    tmo.tv_usec = 10;
-    status = select((info_ptr->skt +1), (fd_set *)&lMask, NULL,NULL,&tmo);
-    if(status <= 0)
-    {
-       return SELECTFAIL;
-    } 
-*/
-
-    /* try read the message length to come */
-    size = sizeof (info_ptr->from_host.msg_size);
-    status = recv (info_ptr->skt, info_ptr->from_host.msg_size, size, 0);
-    if (status != size) {
-        if(status > 0)
-        {
-	 iResult = EL734__BAD_RECV;   	/* Server exited (probably) */
-        }
-         else if (status == -1) {
-	   iResult = EL734__BAD_RECV_NET;  /* It's some other net problem */
-        }
-        else 
-        { 
-           iResult = EL734__BAD_RECV_NET;
-        }
-        AsynSrv_Close (&(info_ptr->sAsync),1);
-        info_ptr->skt = 0;
-        memset (info_ptr->from_host.msg_size,
-		    '0', sizeof (info_ptr->from_host.msg_size));
-        return iResult;
-    }
-    if (sscanf (info_ptr->from_host.msg_size, "%4d", &bytes_to_come) != 1) {
-      return EL734__BAD_NOT_BCD;	/* Header not an ASCII BCD integer */
-    }
-
-    max_size = sizeof (info_ptr->from_host) -
-		sizeof (info_ptr->from_host.msg_size);
-    if (bytes_to_come > max_size) {
-      iResult = EL734__BAD_RECVLEN;
-      nxt_byte_ptr = &info_ptr->from_host.msg_size[size];
-      while (bytes_to_come > 0) {	/* Flush out the incoming message */
-	bytes_left = bytes_to_come;
-	if (bytes_left > max_size) bytes_left = max_size;
-	status = recv (info_ptr->skt, nxt_byte_ptr, bytes_left, 0);
-	if (status <= 0) {
-	  iResult = EL734__BAD_FLUSH;  /* TCP/IP problem whilst flushing */
-	  AsynSrv_Close (&(info_ptr->sAsync),1);
-	  info_ptr->skt = 0;
-	  memset (info_ptr->from_host.msg_size,
-		    '0', sizeof (info_ptr->from_host.msg_size));
-	  return iResult;
-	}
-	bytes_to_come = bytes_to_come - status;
-      }
-      memset (info_ptr->from_host.msg_size,
-		    '0', sizeof (info_ptr->from_host.msg_size));
-      return iResult;
-    }else {
-      nxt_byte_ptr = &info_ptr->from_host.msg_size[size];
-      bytes_left = bytes_to_come;
-      while (bytes_left > 0) {		/* Read the rest of the response */
-	status = recv (info_ptr->skt, nxt_byte_ptr, bytes_left, 0);
-	if (status <= 0) {
-	  if (status == 0) {
-	    iResult = EL734__BAD_RECV1;	/* Server exited (probably) */
-	  }else {
-	      iResult =  EL734__BAD_RECV1_NET; /* It's some other net fault */
-	  }
-	  AsynSrv_Close (&(info_ptr->sAsync),1);
-	  info_ptr->skt = 0;
-	  return iResult;
-        }
-	bytes_left   = bytes_left   - status;
-	nxt_byte_ptr = nxt_byte_ptr + status;
-      }
-    }
-    /* well, we got data, make it available */
-    if (sscanf (info_ptr->from_host.n_rply, "%4d",
-	    &info_ptr->max_replies) != 1)info_ptr->max_replies = 0;
-    if (info_ptr->max_replies > 0)
-	    ptr = (struct RS__RplyStruct_V01B *) info_ptr->from_host.u.rplys;
-    info_ptr->n_replies = 1;
-    if(ptr)
-    {
-       strncpy(pBuffer, ptr->rply,iBufLen);
-       *cTerm = ptr->term;
-    }
-    else
-    {
-       return NOREPLY;
-    }
-    return True;
-  }
-  
-/*---------------------------------------------------------------------------*/
-	int SerialError(int iErr, char *pBuffer, int iBufLen)
-	{
-		switch(iErr)
-		{
-		        case -320:
-		                 strncpy(pBuffer,"Select failed to find data",iBufLen);
-		                 break;
-		        case -300:
-                        case NOCONNECTION:
-		                strncpy(pBuffer,"Not connected",iBufLen);
-		                break;
-		        case -301:
-		                strncpy(pBuffer,"No reply found", iBufLen);
-		                break;        
-		        case -100:
-		                strncpy(pBuffer,"No reply found", iBufLen);
-		                break;        
-			case EL734__BAD_ADR:
-				strncpy(pBuffer,"SERIAL__BAD_ADR",iBufLen);
-				break;
-			case EL734__BAD_BIND:
-				strncpy(pBuffer,"SERIAL__BAD_BIND",iBufLen);
-				break;
-			case EL734__BAD_CMD:
-				strncpy(pBuffer,"SERIAL__BAD_CMD",iBufLen);
-				break;
-			case EL734__BAD_CONNECT:
-				strncpy(pBuffer,"SERIAL__BAD_CONNECT",iBufLen);
-				break;
-			case EL734__BAD_FLUSH:
-				strncpy(pBuffer,"SERIAL__BAD_FLUSH",iBufLen);
-				break;
-			case EL734__BAD_HOST:
-				strncpy(pBuffer,"SERIAL__BAD_HOST",iBufLen);
-				break;
-			case EL734__BAD_ID:
-				strncpy(pBuffer,"SERIAL__BAD_ID",iBufLen);
-				break;
-			case EL734__BAD_ILLG:
-				strncpy(pBuffer,"SERIAL__BAD_ILLG",iBufLen);
-				break;
-			case EL734__BAD_LOC:
-				strncpy(pBuffer,"SERIAL__BAD_LOC",iBufLen);
-				break;
-			case EL734__BAD_MALLOC:
-				strncpy(pBuffer,"SERIAL__BAD_MALLOC",iBufLen);
-				break;
-			case EL734__BAD_NOT_BCD:
-				strncpy(pBuffer,"SERIAL__BAD_NOT_BCD",iBufLen);
-				break;
-			case EL734__BAD_OFL:
-				strncpy(pBuffer,"SERIAL__BAD_OFL",iBufLen);
-				break;
-			case EL734__BAD_PAR:
-				strncpy(pBuffer,"SERIAL__BAD_PAR",iBufLen);
-				break;
-			
-			case EL734__BAD_RECV:
-				strncpy(pBuffer,"SERIAL__BAD_RECV",iBufLen);
-				break;
-			case EL734__BAD_RECV_NET:
-				strncpy(pBuffer,"SERIAL__BAD_RECV_NET",iBufLen);
-				break;
-			case EL734__BAD_RECV_PIPE:
-				strncpy(pBuffer,"SERIAL__BAD_RECV_PIPE",iBufLen);
-				break;
-			case EL734__BAD_RECV_UNKN:
-				strncpy(pBuffer,"SERIAL__BAD_RECV_UNKN",iBufLen);
-				break;
-			case EL734__BAD_RECVLEN:
-				strncpy(pBuffer,"SERIAL__BAD_RECVLEN",iBufLen);
-				break;
-			case EL734__BAD_RECV1:
-				strncpy(pBuffer,"SERIAL__BAD_RECV1",iBufLen);
-				break;
-			case EL734__BAD_RECV1_NET:
-				strncpy(pBuffer,"SERIAL__BAD_RECV1_NET",iBufLen);
-				break;
-			case EL734__BAD_RECV1_PIPE:
-				strncpy(pBuffer,"SERIAL__BAD_RECV1_PIPE",iBufLen);
-				break;
-			case EL734__BAD_RNG:
-				strncpy(pBuffer,"SERIAL__BAD_RNG",iBufLen);
-				break;
-			case EL734__BAD_SEND:
-				strncpy(pBuffer,"SERIAL__BAD_SEND",iBufLen);
-				break;
-			case EL734__BAD_SEND_PIPE:
-				strncpy(pBuffer,"SERIAL__BAD_SEND_PIPE",iBufLen);
-				break;
-			case EL734__BAD_SEND_NET:
-				strncpy(pBuffer,"SERIAL__BAD_SEND_NET",iBufLen);
-				break;
-			case EL734__BAD_SEND_UNKN:
-				strncpy(pBuffer,"SERIAL__BAD_SEND_UNKN",iBufLen);
-				break;
-			case EL734__BAD_SENDLEN:
-				strncpy(pBuffer,"SERIAL__BAD_SENDLEN",iBufLen);
-				break;
-			case EL734__BAD_SOCKET:
-				strncpy(pBuffer,"SERIAL__BAD_SOCKET",iBufLen);
-				break;
-			case EL734__BAD_TMO:
-				strncpy(pBuffer,"SERIAL__BAD_TMO",iBufLen);
-				break;
-                        case EL734__FORCED_CLOSED:
-                                strncpy(pBuffer,"SERIAL__FORCED_CLOSED",iBufLen);
-                                break;
-                        case OPENFAILURE:
-                                strncpy(pBuffer,
-                     "FAILED to open connection to serial port server", iBufLen);
-                                break;				 
-			default:
-				strcpy(pBuffer,"Unknown SERIAL error");
-				break;	
-		}
-		return 1;
-	}
-/*---------------------------------------------------------------------------*/
-  int SerialWriteRead(void **pData, char *pCommand, 
-                                    char *pBuffer, int iBufLen)
-  {
-  
-       struct SerialInfo *pInfo = NULL;
-       int iRet;
-       time_t tTarget, tCurrent;
-       
-       pInfo = (struct SerialInfo *)*pData;
-       
-       /* write */
-       iRet = SerialSend(pData,pCommand);
-       if(iRet != 1)
-       {
-          SerialError(iRet, pBuffer,iBufLen);
-          return iRet;
-       }
-       
-       /* check for answers for maximum time out */
-       tTarget = tCurrent = time(&tCurrent);
-       tTarget += pInfo->tmo*100 - 90;
-       
-       while(tCurrent < tTarget)
-       {
-         pInfo->pFunc(pInfo->pData, 100);
-         iRet = SerialReceive(pData, pBuffer,iBufLen);
-         if( iRet != 1)
-         {
-            if(iRet != SELECTFAIL)
-            {
-              /* error ! */
-              SerialError(iRet, pBuffer,iBufLen);
-              return iRet;
-            }
-         }
-         else 
-         {
-           return 1; /* there is data read, we are done */
-         }
-         tCurrent = time(&tCurrent);
-       }
-       return TIMEOUT;
-  }            
-/*---------------------------------------------------------------------------*/
-  int SerialNoReply(void **pData, char *pCommand)
-  {
-  
-       struct SerialInfo *pInfo = NULL;
-       int iRet, iOld, i;
-       char pBuffer[30];
-       
-       pInfo = (struct SerialInfo *)*pData;
-       
-       iOld = pInfo->tmo;
-       pInfo->tmo = 0;
-       
-       /* write */
-       iRet = SerialSend(pData,pCommand);
-       if(iRet != 1)
-       {
-          pInfo->tmo = iOld;
-          return iRet;
-       }
-       
-       /* try some time to find a TMO */
-       for(i = 0 ; i < 10; i++)
-       {
-           usleep(50);
-           SerialReceive(pData, pBuffer,29);
-           if(strcmp(pBuffer,"?TMO") == 0)
-           {
-              break;
-           }
-       }
-       if(i > 7)
-       {
-           printf("TMO received after %d cycles \n",i);
-       }
-       pInfo->tmo = iOld;
-       return 1;
-  }            
-/*-------------------------------------------------------------------------*/
-   void SetSerialSleep(void **pData, SerialSleep pFun, void *pUserData)
-   {
-       struct SerialInfo *pInfo = NULL;
-       int iRet;
-       
-       pInfo = (struct SerialInfo *)*pData;
-       pInfo->pFunc = pFun;
-       pInfo->pData = pUserData;       
-   
-   }                       
-      
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/hardsup/serialsinq.h b/hardsup/serialsinq.h
deleted file mode 100644
index 60e5dc8d..00000000
--- a/hardsup/serialsinq.h
+++ /dev/null
@@ -1,56 +0,0 @@
-
-#line 156 "velodorn.w"
-
-/*----------------------------------------------------------------------------
-                      S E R I A L S I N Q
-
-  Utility functions for maintaining a connection to a RS--232 port on a
-  Macintosh computer running the SINQ terminal server application.
-
-  Mark Koennecke, Juli 1997
-
-  copyright: see implementation file
-------------------------------------------------------------------------------*/
-#ifndef SERIALSINQ
-#define SERIALSINQ
-#define NOREPLY -100
-#define NOCONNECTION -121
-#define SELECTFAIL -120
-#define TIMEOUT    -730
-#define INTERRUPTED -132
-#define OPENFAILURE -133
-
-#line 30 "velodorn.w"
-
-   int SerialOpen(void **pData, char *pHost, int iPort, int iChannel);
-   int SerialForceOpen(void **pData, char *pHost, int iPort, int iChannel);
-   int SerialConfig(void **pData, int iTmo);
-   int SerialGetTmo(void **pData);
-   int SerialATerm(void **pData, char *pTerm);
-   int SerialAGetTerm(void **pData, char *pTerm, int iTermLen);
-   int SerialSendTerm(void **pData, char *pTerm);
-   int SerialGetSocket(void **pData);
-   int SerialClose(void **pData);
-   int SerialForceClose(void **pData);
-
-   int SerialSend(void **pData, char *pCommand);
-   int SerialReceive(void **pData, char *pBuffer, int iBufLen);
-   int SerialReceiveWithTerm(void **pData, char *pBuffer, 
-                             int iBufLen,char *cTerm);
-   int SerialError(int iError, char *pError, int iErrLen);
-   int SerialWriteRead(void **pData, char *pCommand, 
-                       char *pBuffer, int iBufLen);
-   int SerialNoReply(void **pData, char *pCommand);                     
-
-#line 175 "velodorn.w"
-
-/*-------------------------- The sleeperette -----------------------------*/
-
-#line 116 "velodorn.w"
-
-   typedef int (*SerialSleep)(void *pData, int iTime);
-   void SetSerialSleep(void **pData, SerialSleep pFunc, void *pUserData);
-
-#line 177 "velodorn.w"
-
-#endif
diff --git a/hardsup/sinq_defs.h b/hardsup/sinq_defs.h
deleted file mode 100644
index c437f8e7..00000000
--- a/hardsup/sinq_defs.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-**			TAS_SRC:[LIB]SINQ_DEFS.H
-**
-** Include file generated from SINQ_DEFS.OBJ
-**
-**              29-AUG-2000 09:49:31.72
-*/
-
-#define	    SS__NORMAL                    0x1
-#define	    SS__WASSET                    0x9
-#define	    SS__ILLEFC                    0xEC
-#define	    SS__UNASEFC                   0x234
-#define	    SEM_BIT                       0x0
-#define	    SEM_PID                       0x4
-#define	    SEM_WFLG                      0x8
-#define	    SEM_IDNT                      0xC
-#define	    SEM_CNT0                      0x1C
-#define	    SEM_CNT1                      0x20
-#define	    SEM_CNT2                      0x24
-#define	    SEM_CNT3                      0x28
-#define	    SEM_SUB_PID                   0x2C
-#define	    SEM_SIZE                      0x40
-#define	    SEM__CAMAC_CSR                0x0
-#define	    SEM__CAMAC_IVG                0x40
-#define	    SEM__CAMAC_GPIB               0x80
-#define	    SEM__CAMAC_3344               0xC0
-#define	    MAP__CAMAC_FIELD_0            0x0
-#define	    MAP__CAMAC_FIELD_1            0x1
-#define	    MAP__CAMAC_FIELD_2            0x2
-#define	    MAP__CAMAC_FIELD_CSR          0x3
-#define	    MAP__CAMAC_SEMAPHORE          0x4
-#define	    MAP__DELTAT_CB                0x5
-#define	    MAP__DELTAT_SCALERS           0x6
-#define	    CAMIF__JCC                    0x1
-#define	    CAMIF__GEC0                   0x3
-#define	    CAMIF__CES                    0x4
-#define	    CAMIF__BIRA                   0x5
-#define	    CAMIF__GEC1                   0x6
-#define	    CAMIF__GEC2                   0x7
-#define	    CAMIF__GEC3                   0x8
-#define	    CAMIF__CCP                    0x9
-#define	    CAMIF__OS9                    0xA
-#define	    CAMIF__KCBD                   0xB
-#define	    CAMIF__VAN                    0xC
-#define	    CAMIF__KVCC                   0xD
-#define	    CAMIF__M_XQ                   0x3
-#define	    CAMIF__X_Q                    0x0
-#define	    CAMIF__X_NOQ                  0x1
-#define	    CAMIF__NOX_Q                  0x2
-#define	    CAMIF__NOX_NOQ                0x3
-#define	    CAMIF__NO_CAMIF               0x4
-#define	    CAMIF__TMOUT                  0x8
-#define	    CAMIF__ILLPAR                 0xC
-#define	    CAMIF__RPTFAIL                0x14
-#define	    CAMIF__SEMTMO                 0x18
-#define	    MSR__BUSY                     0x1
-#define	    MSR__OK                       0x2
-#define	    MSR__REF_OK                   0x4
-#define	    MSR__STOPPED                  0x8
-#define	    MSR__LO_LIM                   0x10
-#define	    MSR__HI_LIM                   0x20
-#define	    MSR__HALT                     0x40
-#define	    MSR__RUN_FAULT                0x80
-#define	    MSR__RUN_FAIL                 0x100
-#define	    MSR__POS_FAULT                0x200
-#define	    MSR__POS_FAIL                 0x400
-#define	    MSR__REF_FAIL                 0x800
-#define	    MSR__AC_FAIL                  0x1000
-#define	    MSR__LIM_ERR                  0x2000
-#define	    SS__HALT                      0x1
-#define	    SS__CCW                       0x2
-#define	    SS__STP                       0x4
-#define	    SS__LS1                       0x8
-#define	    SS__LS2                       0x10
-#define	    SS__LSX                       0x20
-#define	    EL737_STATE_UNKNOWN           0xFFFFFFFE
-#define	    EL737_STATE_OFFLINE           0xFFFFFFFF
-#define	    EL737_STATE_MS                0x0
-#define	    EL737_STATE_PTS               0x1
-#define	    EL737_STATE_PCS               0x2
-#define	    EL737_STATE_LRTS              0x5
-#define	    EL737_STATE_LRCS              0x6
-#define	    EL737_STATE_PTSP              0x9
-#define	    EL737_STATE_PCSP              0xA
-#define	    EL737_STATE_LRTSP             0xD
-#define	    EL737_STATE_LRCSP             0xE
-#define	    SINQHM_CNCT                   0x1
-#define	    SINQHM_CONFIG                 0x2
-#define	    SINQHM_DECONFIG               0x3
-#define	    SINQHM_EXIT                   0x4
-#define	    SINQHM_STATUS                 0x5
-#define	    SINQHM_DBG                    0x6
-#define	    SINQHM_CLOSE                  0x101
-#define	    SINQHM_INH                    0x102
-#define	    SINQHM_IOREG                  0x103
-#define	    SINQHM_READ                   0x104
-#define	    SINQHM_SET_TDC                0x105
-#define	    SINQHM_SHOW                   0x106
-#define	    SINQHM_WRITE                  0x107
-#define	    SINQHM_ZERO                   0x108
-#define	    INH_SET                       0x1
-#define	    INH_CLR                       0x2
-#define	    INH_TST                       0x3
-#define	    IO_SET                        0x1
-#define	    IO_CLR                        0x2
-#define	    IO_PULSE                      0x3
-#define	    TT_PORT__NO_RETRY             0x1
-#define	    TT_PORT__NO_SIG               0x2
diff --git a/hardsup/sinq_prototypes.h b/hardsup/sinq_prototypes.h
deleted file mode 100644
index 2be3165f..00000000
--- a/hardsup/sinq_prototypes.h
+++ /dev/null
@@ -1,674 +0,0 @@
-#ifndef _sinq_prototypes_loaded_
-#define _sinq_prototypes_loaded_
-/*---------------------------------------------- SINQ_PROTOTYPES.H Ident V02T
-**
-**	Prototype header file for entry points in SINQ.OLB
-**
-** Updates:
-**  V01A 21-Mar-1996 DM	    Initial version.
-*/
-#ifdef VAXC
-#include    asynsrv_def
-#include    rs232c_def
-#include    el734_def
-#include    el737_def
-#else
-#include    <asynsrv_def.h>
-#include    <rs232c_def.h>
-#include    <el734_def.h>
-#include    <el737_def.h>
-#endif
-/*---------------------------------------------------------------------*/
-  int	AsynSrv_ChanClose (
-			struct AsynSrv__info  *asyn_info);
-  int	AsynSrv_Close (
-			struct AsynSrv__info *asyn_info,
-			int		      force_flag);
-  int	AsynSrv_Config (
-			struct AsynSrv__info *asyn_info,
-			...);
-  int	AsynSrv_ConfigDflt (
-			char	*par_id,
-			...);
-  void	AsynSrv_ErrInfo (
-			char	**entry_txt,
-			int	 *errcode,
-			int	 *my_errno,
-			int	 *vaxc_errno);
-  int	AsynSrv_Flush (
-			struct AsynSrv__info  *asyn_info);
-  int	AsynSrv_GetLenTerm (
-			struct AsynSrv__info  *asyn_info,
-			struct RS__RespStruct *rcve_buff,
-			char		      *rply,
-			int		      *len,
-			char		      *term);
-  char *AsynSrv_GetReply (
-			struct AsynSrv__info  *asyn_info,
-			struct RS__RespStruct *rcve_buff,
-			char		      *last_rply);
-  int	AsynSrv_Open (
-			struct AsynSrv__info *asyn_info);
-  int	AsynSrv_OpenNew (
-			struct AsynSrv__info *asyn_info);
-  int	AsynSrv_SendCmnds (
-			struct AsynSrv__info  *asyn_info,
-			struct RS__MsgStruct  *send_buff,
-			struct RS__RespStruct *rcve_buff,
-			...);
-  int	AsynSrv_SendCmndsBig (
-			struct AsynSrv__info  *asyn_info,
-			struct RS__MsgStruct  *send_buff,
-			int		       send_buff_size,
-			struct RS__RespStruct *rcve_buff,
-			int		       rcve_buff_size,
-			...);
-  int	AsynSrv_Trace (
-			struct AsynSrv__info  *asyn_info,
-			int		       state);
-  int	AsynSrv_Trace_Write (
-			struct AsynSrv__info  *asyn_info);
-/*---------------------------------------------------------------------*/
-  int	C_log_arr_get (
-			char *name,
-			int arr_size,
-			int *value,
-			int indx);
-  int	C_log_flt_get (
-			char *name,
-			float *value,
-			int indx);
-  int	C_log_int_get (
-			char *name,
-			long int *value,
-			int indx);
-  int	C_log_str_get (
-			char *name,
-			char *value,
-			int val_size,
-			int indx);
-/*---------------------------------------------------------------------*/
-  int	C_str_edit (
-			char *out,
-			char *in,
-			char *ctrl,
-			int  *length);
-/*---------------------------------------------------------------------*/
-  int	C_tt_port_config (
-			int *hndl,
-			int mask);
-  int	C_tt_port_connect (
-			int *hndl,
-			int *chan,
-			char *lognam,
-			char *pwd);
-  int	C_tt_port_disconnect (
-			int *hndl);
-  int	C_tt_port_io (
-			int *hndl,
-			char *rqst,
-			char *term,
-			char *answ,
-			int *answ_len,
-			int flush,
-			int tmo);
-/*---------------------------------------------------------------------*/
-  int	EL734_Close (
-			void	**handle,
-			int	  force_flag);
-  int	EL734_Config (
-			void	**handle,
-			...);
-  char	*EL734_EncodeMSR (
-			char	*text,
-			int	text_len,
-			int	msr,
-			int	ored_msr,
-			int	fp_cntr,
-			int	fr_cntr);
-  char	*EL734_EncodeSS (
-			char	*text,
-			int	text_len,
-			int	ss);
-  void	EL734_ErrInfo (
-			char	**entry_txt,
-			int	 *errcode,
-			int	 *my_errno,
-			int	 *vaxc_errno);
-  int	EL734_GetAirCush (
-			void	**handle,
-			int	 *present,
-			int	 *state);
-  int	EL734_GetEncGearing (
-			void	**handle,
-			int	 *nominator,
-			int	 *denominator);
-  int	EL734_GetId (
-			void	**handle,
-			char	 *id_txt,
-			int	  id_len);
-  int	EL734_GetLimits (
-			void	**handle,
-			float	 *lo,
-			float	 *hi);
-  int	EL734_GetMotorGearing (
-			void	**handle,
-			int	 *nominator,
-			int	 *denominator);
-  int	EL734_GetNullPoint (
-			void	**handle,
-			int	 *null_pt);
-  int	EL734_GetPosition (
-			void	**handle,
-			float    *ist_posit);
-  int	EL734_GetPrecision (
-			void	**handle,
-			int	 *n_dec);
-  int	EL734_GetRefMode (
-			void	**handle,
-			int	 *mode);
-  int	EL734_GetRefParam (
-			void	**handle,
-			float	 *param);
-  int	EL734_GetSpeeds (
-			void	**handle,
-			int	 *lo,
-			int	 *hi,
-			int	 *ramp);
-  int	EL734_GetStatus (
-			void	**handle,
-			int	 *msr,
-			int	 *ored_msr,
-			int	 *fp_cntr,
-			int	 *fr_cntr,
-			int	 *ss,
-			float	 *ist_posit);
-  int	EL734_GetZeroPoint (
-			void	**handle,
-			float	 *zero_pt);
-  int	EL734_MoveNoWait (
-			void	**handle,
-			float	  soll_posit);
-  int	EL734_MoveWait (
-			void	**handle,
-			float	  soll_posit,
-			int	 *ored_msr,
-			int	 *fp_cntr,
-			int	 *fr_cntr,
-			float	 *ist_posit);
-  int	EL734_Open (
-			void	**handle,
-			char	 *host,
-			int	  port,
-			int	  chan,
-			int	  motor,
-			char	 *id);
-  int	EL734_PutOffline (
-			void	**handle);
-  int	EL734_PutOnline (
-			void	**handle,
-			int	  echo);
-  int	EL734_SendCmnd (
-			void	**handle,
-			char	 *cmnd,
-			char	 *rply,
-			int	  rply_size);
-  int	EL734_SetAirCush (
-			void	**handle,
-			int	  state);
-  int	EL734_SetErrcode (
-			struct EL734info    *info_ptr,
-			char		    *response,
-			char		    *cmnd);
-  int	EL734_SetHighSpeed (
-			void	**handle,
-			int	  hi);
-  int	EL734_SetLowSpeed (
-			void	**handle,
-			int	  lo);
-  int	EL734_SetRamp (
-			void	**handle,
-			int	  ramp);
-  int	EL734_Stop (
-			void	**handle);
-  int	EL734_WaitIdle (
-			void	**handle,
-			int	 *ored_msr,
-			int	 *fp_cntr,
-			int	 *fr_cntr,
-			float	 *ist_posit);
-  void	EL734_ZeroStatus (
-			void    **handle);
-/*---------------------------------------------------------------------*/
-  int	EL737_Close (
-			void	**handle,
-			int	  force_flag);
-  int	EL737_Config (
-			void	**handle,
-			...);
-  int	EL737_Continue (
-			void	**handle,
-			int	  *status);
-  int	EL737_EnableThresh (
-			void	**handle,
-			int	  indx);
-  void	EL737_ErrInfo (
-			char	**entry_txt,
-			int	 *errcode,
-			int	 *my_errno,
-			int	 *vaxc_errno);
-  int	EL737_GetMonIntegTime (
-			void	**handle,
-			int	  indx,
-			float	 *mon_integ_time);
-  int	EL737_GetRateIntegTime (
-			void	**handle,
-			float	 *rate_integ_time);
-  void	*EL737_GetReply (
-			void	**handle,
-			void	 *last_rply);
-  int	EL737_GetStatus (
-			void	**handle,
-			int	 *c1,
-			int	 *c2,
-			int	 *c3,
-			int	 *c4,
-			float	 *timer,
-			int	 *rs);
-  int	EL737_GetStatusExtra (
-			void	**handle,
-			int	 *c5,
-			int	 *c6,
-			int	 *c7,
-			int	 *c8);
-  int	EL737_GetThresh (
-			void	**handle,
-			int	 *indx,
-			float	 *val);
-  int	EL737_Open (
-			void	**handle,
-			char	 *host,
-			int	  port,
-			int	  chan);
-  int	EL737_Pause (
-			void	**handle,
-			int	  *status);
-  int	EL737_SendCmnd (
-			void	**handle,
-			char	 *cmnd,
-			char	 *rply,
-			int	  rply_size);
-  int	EL737_SetErrcode (
-			struct EL737info    *info_ptr,
-			char		    *response,
-			char		    *cmnd);
-  int	EL737_SetThresh (
-			void	**handle,
-			int	  indx,
-			float	  val);
-  int	EL737_StartCnt (
-			void	**handle,
-			int	  preset_count,
-			int	  *status);
-  int	EL737_StartTime (
-			void	**handle,
-			float	  preset_time,
-			int	  *status);
-  int	EL737_Stop (
-			void	**handle,
-			int	 *c1,
-			int	 *c2,
-			int	 *c3,
-			int	 *c4,
-			float	 *timer,
-			int	 *status);
-  int	EL737_StopFast (
-			void	**handle);
-  int	EL737_WaitIdle (
-			void	**handle,
-			int	 *c1,
-			int	 *c2,
-			int	 *c3,
-			int	 *c4,
-			float	 *timer);
-/*---------------------------------------------------------------------*/
-  int	EL755_Close (
-			void	**handle,
-			int	  force_flag);
-  int	EL755_Config (
-			void	**handle,
-			...);
-  void	EL755_ErrInfo (
-			char	**entry_txt,
-			int	 *errcode,
-			int	 *my_errno,
-			int	 *vaxc_errno);
-  int	EL755_ErrorLog (
-			char	 *routine_name,
-			char	 *text);
-  int	EL755_GetConstant (
-			void	**handle,
-			float	 *value);
-  int	EL755_GetCurrents (
-			void	**handle,
-			float	 *soll,
-			float	 *ist);
-  int	EL755_GetId (
-			void	**handle,
-			char	 *id_txt,
-			int	  id_len);
-  int	EL755_GetLimit (
-			void	**handle,
-			float	 *value);
-  int	EL755_GetRamp (
-			void	**handle,
-			float	 *value);
-  int	EL755_GetTimeConstant (
-			void	**handle,
-			float	 *value);
-  int	EL755_GetVoltageRange (
-			void	**handle,
-			float	 *value);
-  int	EL755_Open (
-			void	**handle,
-			char	 *host,
-			int	  port,
-			int	  chan,
-			int	  indx);
-  int	EL755_PutOffline (
-			void	**handle);
-  int	EL755_PutOnline (
-			void	**handle,
-			int	  echo);
-  int	EL755_SendTillSameStr (
-			void		       **handle,
-			char			*cmnd,
-			char			*rply,
-			int			 rply_len);
-  int	EL755_SendTillSameVal (
-			void		       **handle,
-			char			*cmnd,
-			float			*val);
-  int	EL755_SendTillTwoVals (
-			void		       **handle,
-			char			*cmnd,
-			float			*val0,
-			float			*val1);
-  int	EL755_SetConstant (
-			void	**handle,
-			float	  value);
-  int	EL755_SetCurrent (
-			void	**handle,
-			float	  soll);
-  int	EL755_SetLimit (
-			void	**handle,
-			float	  value);
-  int	EL755_SetRamp (
-			void	**handle,
-			float	  value);
-  int	EL755_SetTimeConstant (
-			void	**handle,
-			float	  value);
-  int	EL755_SetVoltageRange (
-			void	**handle,
-			float	  value);
-/*---------------------------------------------------------------------*/
-  int	Fluke_Close (
-			void	**handle,
-			int	  force_flag);
-  int	Fluke_Config (
-			void	**handle,
-			...);
-  void	Fluke_ErrInfo (
-			char	**entry_txt,
-			int	 *errcode,
-			int	 *my_errno,
-			int	 *vaxc_errno);
-  int	Fluke_ErrorLog (
-			char	 *routine_name,
-			char	 *text);
-  int	Fluke_Open (
-			void	**handle,
-			char	 *host,
-			int	  port,
-			int	  chan);
-  int	Fluke_Read (
-			void	**handle,
-			float	 *ist);
-  int	Fluke_SendTillSame (
-			void		       **handle,
-			char			*cmnd,
-			char			*rply,
-			int			 rply_len);
-  int	Fluke_SendTillSameVal (
-			void		       **handle,
-			char			*cmnd,
-			float			*val);
-/*---------------------------------------------------------------------*/
-  int	ITC_Close (
-			void	**handle,
-			int	  force_flag);
-  int	ITC_Config (
-			void	**handle,
-			...);
-  int	ITC_Dump_RAM (
-			void	**handle,
-			int	  buff_size,
-			char	 *buff,
-			int	 *dump_len,
-			int	 *n_diffs);
-  void	ITC_ErrInfo (
-			char	**entry_txt,
-			int	 *errcode,
-			int	 *my_errno,
-			int	 *vaxc_errno);
-  int	ITC_GetConfig (
-			void	**handle,
-			...);
-  int	ITC_Load_RAM (
-			void	**handle,
-			int	  load_len,
-			char	 *buff);
-  int	ITC_Load_Table (
-			void	**handle,
-			char	 *buff);
-  int	ITC_Open (
-			void	**handle,
-			char	 *host,
-			int	  port,
-			int	  chan);
-  int	ITC_Read_ITC_Sensor (
-			void	**handle,
-			int	  sensor,
-			float	  factor,
-			float	 *value);
-  int	ITC_Read_LTC11_Sensor (
-			void	**handle,
-			int	  sensor,
-			float	 *value);
-  int	ITC_Read_LTC11_SetPt (
-			void	**handle,
-			float	 *value);
-  int	ITC_ReadAuxTemp (
-			void	**handle,
-			float	 *value);
-  int	ITC_ReadControlTemp (
-			void	**handle,
-			float	 *value);
-  int	ITC_ReadHeaterOp (
-			void	**handle,
-			float	 *op_level,
-			float	 *op_percent);
-  int	ITC_ReadId (
-			void	**handle,
-			char	 *id_txt,
-			int	  id_txt_len,
-			int	 *id_len);
-  int	ITC_ReadPID (
-			void	**handle,
-			float	 *p,
-			float	 *i,
-			float	 *d);
-  int	ITC_ReadSampleTemp (
-			void	**handle,
-			float	 *s_temp);
-  int	ITC_ReadSetPoint (
-			void	**handle,
-			float	 *sp_temp);
-  int	ITC_ReadStatus (
-			void	**handle,
-			char	 *status_txt,
-			int	  status_txt_len,
-			int	 *status_len,
-			int	 *auto_state,
-			int	 *remote_state);
-  int	ITC_SendTillAckOk (
-			void		       **handle,
-			struct RS__MsgStruct	*to_host,
-			struct RS__RespStruct	*from_host,
-			char			*cmnd);
-  int	ITC_SendTillSame (
-			void		       **handle,
-			struct RS__MsgStruct	*to_host,
-			struct RS__RespStruct	*from_host,
-			char			*cmnd,
-			char			*rply,
-			int			 rply_len);
-  int	ITC_SendTillSameLen (
-			void		       **handle,
-			struct RS__MsgStruct	*to_host,
-			struct RS__RespStruct	*from_host,
-			char			*cmnd,
-			char			*rply,
-			int			 rply_len);
-  int	ITC_SendTillSameLenAckOK (
-			void		       **handle,
-			struct RS__MsgStruct	*to_host,
-			struct RS__RespStruct	*from_host,
-			char			*cmnd,
-			char			*rply,
-			int			 rply_len);
-  int	ITC_SetControlTemp (
-			void	**handle,
-			float	  s_temp);
-  int	ITC_SetHeatLevel (
-			void	**handle,
-			float	  heat_percent);
-  int	ITC_ErrorLog (
-			char	 *routine_name,
-			char	 *text);
-/*---------------------------------------------------------------------*/
-  int	SPS_Close (
-			void	**handle,
-			int	  force_flag);
-  int	SPS_Config (
-			void	**handle,
-			...);
-  void	SPS_ErrInfo (
-			char	**entry_txt,
-			int	 *errcode,
-			int	 *my_errno,
-			int	 *vaxc_errno);
-  int	SPS_ErrorLog (
-			char	 *routine_name,
-			char	 *text);
-  int	SPS_GetStatus (
-			void		**handle,
-			unsigned char	 *status_vals,
-			int		  n_status_vals,
-			int		 *adc_vals,
-			int		  n_adc_vals);
-  int	SPS_Open (
-			void	**handle,
-			char	 *host,
-			int	  port,
-			int	  chan);
-  int	SPS_SendTillSame (
-			void		       **handle,
-			struct RS__MsgStruct	*to_host,
-			struct RS__RespStruct	*from_host,
-			char			*cmnd,
-			char			*rply,
-			int			 rply_len);
-  int	SPS_SendTillSameLen (
-			void		       **handle,
-			struct RS__MsgStruct	*to_host,
-			struct RS__RespStruct	*from_host,
-			char			*cmnd,
-			char			*rply,
-			int			 rply_len);
-/*---------------------------------------------------------------------*/
-  int	VelSel_Close (
-			void	**handle,
-			int	  force_flag);
-  void	VelSel_Config (
-			void	**handle,
-			int	  msec_tmo,
-			char	 *eot_str);
-  void	VelSel_ErrInfo (
-			char	**entry_txt,
-			int	 *errcode,
-			int	 *my_errno,
-			int	 *vaxc_errno);
-  void	*VelSel_GetReply (
-			void	**handle,
-			void	 *last_rply);
-  int	VelSel_GetStatus (
-			void	**handle,
-			char	 *status_str,
-			int	  status_str_len);
-  int	VelSel_Open (
-			void	**handle,
-			char	 *host,
-			int	  port,
-			int	  chan);
-  int	VelSel_SendCmnd (
-			void	**handle,
-			char	 *cmnd,
-			char	 *rply,
-			int	  rply_size);
-/*---------------------------------------------------------------------*/
-  void	FailInet (
-			char *text);
-  void	GetErrno (
-			int *his_errno,
-			int *his_vaxc_errno);
-  int	MakeCharPrintable (
-			char    *out,
-			int	 out_size,
-			char	 in);
-  char	*MakePrint (
-			char    *text);
-  char	*MakePrintable (
-			char    *out,
-			int	 out_size,
-			char	*in);
-  void	*Map_to_ACS ();
-  char	*StrEdit (
-			char *out,
-			char *in,
-			char *ctrl,
-			int  *ln);
-  char	*StrJoin (
-			char    *result,
-			int      result_size,
-			char    *str_a,
-			char    *str_b);
-  int	StrMatch (
-			char *str_a,
-			char *str_b,
-			int   min_len);
-  int	Get_TASMAD_Info (
-			char	*file_name,
-			int	*nItems,
-			...);
-  int	Get_TASMAD_Info_Filename (
-			char	*file_name,
-			char	*buf,
-			int	*bufSize);
-  int	Update_TASMAD_Info (
-			char	*file_name,
-			int	*nItems,
-			...);
-/*--------------------------------------------- End of SINQ_PROTOTYPES.H --*/
-#endif	    /* _sinq_prototypes_loaded_ */
diff --git a/hardsup/sinqhm.c b/hardsup/sinqhm.c
deleted file mode 100644
index 2130591e..00000000
--- a/hardsup/sinqhm.c
+++ /dev/null
@@ -1,1770 +0,0 @@
-/*-------------------------------------------------------------------------
-			S I N Q H M
-		
-  Implementation file for the SINQ histogram memory utility functions.
-  
-  David Maden, Mark Koennecke, April 1997
-  
-  Updated for TOF support: Mark Koennecke, December 1998
- 
-  Added Project for AMOR:  Mark Koennecke, August 2001
-  
-       Copyright:
-
-       Labor fuer Neutronenstreuung
-       Paul Scherrer Institut
-       CH-5423 Villigen-PSI
-
-
-      The authors hereby grant permission to use, copy, modify, distribute,
-      and license this software and its documentation for any purpose, provided
-      that existing copyright notices are retained in all copies and that this
-      notice is included verbatim in any distributions. No written agreement,
-      license, or royalty fee is required for any of the authorized uses.
-      Modifications to this software may be copyrighted by their authors
-      and need not follow the licensing terms described here, provided that
-      the new terms are clearly indicated on the first page of each file where
-      they apply.
-
-      IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-      FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-      ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-      DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-      POSSIBILITY OF SUCH DAMAGE.
-
-      THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-      INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-      FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-      IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-      NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-      MODIFICATIONS.
-----------------------------------------------------------------------------*/
-#include    <errno.h>
-#include    <netdb.h>
-#include    <stdio.h>
-#include    <stdlib.h>
-#include    <time.h>
-#include    <netinet/in.h>
-#include    <arpa/inet.h>
-#include    <ctype.h>
-#include    <math.h>
-#include    <sys/socket.h>
-#include    <string.h>
-#include    <sys/types.h>
-#include    <assert.h>
-
-#ifdef FORTIFY
-#include   "fortify.h"
-#endif
-
-#include   "sinqhm.h"
-#include   "sinqhm.i"
-
-/* missing in some network stuff?? */
-
-#ifndef MSG_WAITALL
-#define MSG_WAITALL 0
-#endif
-
-/* this may be a cludge for a missing prototype on Digital Unix */
-extern int close(int fp);
-
-/*-----------------------------------------------------------------------*/
-  static int SendDAQCommand(pSINQHM self, int iCommand, int *iDaq)
-  {
-     struct req_buff_struct Req_buff;
-     struct rply_buff_struct           Rply_buff;
-     int status, iRet;
-
-     assert(self);
-     assert(self->iClientSocket);
-     
-     /* prepare a message */ 
-     Req_buff.bigend = htonl (0x12345678);
-     Req_buff.cmnd   = htonl (SQHM_DAQ);
-     Req_buff.u.daq.sub_cmnd = htonl (iCommand);
-
-     /* send the message */
-     status = send (self->iClientSocket, (char *) &Req_buff, sizeof (Req_buff), 0);
-     if (status == -1) 
-     {
-        return SEND_ERROR;
-     }
-     if (status != sizeof (Req_buff)) 
-     {
-        return SEND_ERROR;
-     }
-
-     /* get a response */
-     status = recv (self->iClientSocket, (char *) &Rply_buff, 
-                    sizeof (Rply_buff), MSG_WAITALL);
-
-     /* check various error conditions */
-     if (status == -1) 
-     {
-        return RECEIVE_ERROR;
-     }   
-     if (status != sizeof (Rply_buff)) 
-     {
-        return INSUFFICIENT_DATA;
-     }
-     if(ntohl (Rply_buff.bigend) != 0x12345678) 
-     {
-        return BYTE_ORDER_CHAOS;
-     }
-     if((iRet = ntohl (Rply_buff.status)) != KER__SUCCESS) 
-     {
-        return SOFTWARE_ERROR;
-     }   
-     
-     *iDaq = ntohs (Rply_buff.u.daq.daq_now);
-     
-     /* success */
-     return 1;          
-  }
-/*-----------------------------------------------------------------------*/
-  static int SendDAQStatus(pSINQHM self, 
-                           struct rply_buff_struct *pReply)
-  {
-     struct req_buff_struct Req_buff;
-     int status, iRet;
-
-     assert(self);
-
-     if(!self->iClientSocket)
-     {
-       return 0;
-     }     
-     
-     /* prepare a message */ 
-     Req_buff.bigend = htonl (0x12345678);
-     Req_buff.cmnd   = htonl (SQHM_STATUS);
-
-     /* send the message */
-     status = send (self->iClientSocket, (char *) &Req_buff, sizeof (Req_buff), 0);
-     if (status == -1) 
-     {
-        return SEND_ERROR;
-     }
-     if (status != sizeof (Req_buff)) 
-     {
-        return SEND_ERROR;
-     }
-
-     /* get a response */
-     status = recv (self->iClientSocket, (char *) pReply, 
-                    sizeof (struct rply_buff_struct), MSG_WAITALL);
-
-     /* check various error conditions */
-     if (status == -1) 
-     {
-        return RECEIVE_ERROR;
-     }   
-     if (status != sizeof (struct rply_buff_struct)) 
-     {
-        return INSUFFICIENT_DATA;
-     }
-     if(ntohl (pReply->bigend) != 0x12345678) 
-     {
-        return BYTE_ORDER_CHAOS;
-     }
-     if((iRet = ntohl (pReply->status)) != KER__SUCCESS) 
-     {
-        return SOFTWARE_ERROR;
-     }   
-
-     /* success */
-     return 1;          
-  }
-
-/*-------------------------------------------------------------------------*/
-  pSINQHM CreateSINQHM(char *pHMComputer, int iMasterPort)
-  {
-     pSINQHM pNew = NULL;
-     
-     /* new memory */
-     pNew = (pSINQHM)malloc(sizeof(SINQHM));
-     if(!pNew)
-     {
-       return NULL;
-     }
-     memset(pNew,0,sizeof(SINQHM));
-     
-     pNew->pHMComputer = strdup(pHMComputer);
-     pNew->iMasterPort = iMasterPort;
-  
-     return pNew;
-  } 
-/*-----------------------------------------------------------------------*/
- pSINQHM CopySINQHM(pSINQHM self)
- {
-   pSINQHM pNew = NULL;
-
-   assert(self);
-   
-   pNew = CreateSINQHM(self->pHMComputer,self->iMasterPort);
-   if(!pNew)
-   {
-     return NULL;
-   }
-   pNew->iBinWidth = self->iBinWidth;
-   pNew->iPacket = self->iPacket;
-   pNew->iRank = self->iRank;
-   pNew->iLength = self->iLength;
-   return pNew;   
- }
-/*-------------------------------------------------------------------------*/
- void SINQHMSetPar(pSINQHM self, int iRank, int iLength, int iBin)
- {
-   assert(self);
-   
-   self->iRank = iRank;
-   self->iLength = iLength;
-   self->iBinWidth = iBin;
- } 
-/*-------------------------------------------------------------------------*/
-  void DeleteSINQHM(pSINQHM self)
-  {
-     int i;     
-
-     assert(self);
-
-     if(self->pHMComputer)
-     {
-        free(self->pHMComputer);
-     }
-
-     for(i = 0; i < self->iBanks; i++)
-     {
-        if(self->pBank[i].iEdges)
-	{
-           free(self->pBank[i].iEdges);
-        }
-     }
-
-     /* make sure a possible clients connection gets murdered */
-     if(self->iClientSocket)
-     {
-       SINQHMCloseDAQ(self);
-     }
-     free(self);
-  }
-/*------------------------------------------------------------------------*/
-  int SINQHMConfigure(pSINQHM self, int iMode, int iRank, int iLength,
-                      int iBinWidth, int iLowBin, int iCompress)
-  {
-     int status, iRet;
-     struct req_buff_struct            Req_buff;
-     struct rply_buff_struct           Rply_buff;
-         
-     assert(self);
-  
-     /* branch specially for TOF flight mode */
-     if( (iMode >= SQHM__TOF) && (iMode < SQHM__HM_PSD) )
-     {
-       self->iBinWidth = iBinWidth;
-       return SINQHMTimeBin(self,iMode);
-     }
-  
-     /* fill in the request data structure */
-     Req_buff.bigend = htonl (0x12345678);
-     Req_buff.cmnd   = htonl (SQHM_CONFIG);
-     Req_buff.u.cnfg.mode     = htonl (iMode);
-     Req_buff.u.cnfg.u.hm_dig.n_hists  = htonl (iRank);
-     printf("%d\n", ntohl(Req_buff.u.cnfg.u.hm_dig.n_hists));
-     Req_buff.u.cnfg.u.hm_dig.lo_bin   = htonl (iLowBin);
-     Req_buff.u.cnfg.u.hm_dig.num_bins = htonl (iLength);
-     Req_buff.u.cnfg.u.hm_dig.bytes_per_bin   = htonl (iBinWidth);
-     Req_buff.u.cnfg.u.hm_dig.compress = htonl (iCompress);
-     
-     /* try, get a connection to master server */
-     status = OpenMasterConnection(self);
-     if(status < 0)
-     {
-       return status;
-     }               
-     
-     /* send request  */
-     status = send(self->iMasterSocket,(char *)&Req_buff, sizeof(Req_buff),0);
-     if(status == -1)
-     {
-       return SEND_ERROR;
-     }                 
-     
-     /* get a reply */
-     iRet = GetMasterReply(self,&Rply_buff,sizeof(Rply_buff));
-     if(iRet < 0)
-     {
-       /* try close the socket */
-       close(self->iMasterSocket);
-       self->iMasterSocket = 0;
-       return iRet;
-     }
-     else
-     {
-       /* configure successful, keep the data */
-       self->iBinWidth = iBinWidth;
-       self->iLength   = iLength;
-       self->iRank     = iRank;
-       
-       /* close the socket */ 
-       status = close(self->iMasterSocket);
-       self->iMasterSocket = 0;
-       if((status != 0) && (errno != ECONNRESET))
-       {
-         return CLOSE_ERROR;
-       }
-     }
-     return 1; /* success, finally */
-  }                    
-/*------------------------------------------------------------------------*/
-  int SINQHMConfigurePSD(pSINQHM self, int iMode, 
-                         int xSize, int xOff, int xFac,
-                         int ySize, int yOff, int yFac,
-                         int iBinWidth, 
-                         float *iEdges, int iEdgeLength)
-  {
-     int status, iRet;
-     struct req_buff_struct            Req_buff;
-     struct rply_buff_struct           Rply_buff;
-     int iLength, i, iDelay;
-     unsigned int iExtra;
-     char *pBuffer = NULL, *pPtr;
-     struct tof_edge_arr tea;
-     int iTeaLength;
-     struct tof_bank toba;
-       
-     assert(self);
-
-     /* set up detector bank information. This code supports only
-        one detector bank as of now. Which is appropriate for the
-        detector at hand.
-     */
-     self->iBinWidth = iBinWidth;
-     SINQHMDefineBank(self,0,0,xSize*ySize,
-                                   iEdges,iEdgeLength);
-     
-     /* figure out how long we are going to be*/
-     iLength = 36 + self->iBanks*sizeof(struct tof_bank);
-     for(i = 0; i < self->iBanks; i++)
-     {
-       iLength += 8 + self->pBank[i].iEdgeLength*sizeof(SQint32);
-     }
-     if(iLength < 64)
-         iLength = 64;
-     /* allocate send buffer */
-     pBuffer = (char *)malloc(iLength*sizeof(char));
-     if(!pBuffer)
-     {
-       return HIST_BAD_ALLOC;
-     }    
-     memset(pBuffer,0,iLength);
-  
-     /* do the message header */
-     iExtra = iLength - sizeof(Req_buff);
-     if(iExtra < 0)
-        iExtra = 0;
-     iDelay = self->pBank[0].iEdges[0];   
-     Req_buff.bigend = htonl (0x12345678);
-     Req_buff.cmnd   = htonl (SQHM_CONFIG);
-     Req_buff.u.cnfg.mode = htonl (iMode);
-     Req_buff.u.cnfg.u.psd.n_extra_bytes = htonl (iExtra);
-     Req_buff.u.cnfg.u.psd.n_edges	  = htons (1);
-     Req_buff.u.cnfg.u.psd.n_banks	  = htons (1);
-     Req_buff.u.cnfg.u.psd.xOffset	  = htons (xOff);
-     Req_buff.u.cnfg.u.psd.yOffset	  = htons (yOff);
-     Req_buff.u.cnfg.u.psd.xFactor	  = htons (xFac);
-     Req_buff.u.cnfg.u.psd.yFactor	  = htons (yFac);
-     Req_buff.u.cnfg.u.psd.xSize	  = htons (xSize);
-     Req_buff.u.cnfg.u.psd.ySize	  = htons (ySize);
-     Req_buff.u.cnfg.u.psd.preset_delay    = htonl((int)iEdges[0]);
-     memcpy(pBuffer,&Req_buff,36);
-     pPtr = pBuffer + 36;
-
-     /* do the edge thingies */
-     for(i = 0; i < self->iBanks; i++)
-     {
-        tea.n_bins = htonl(self->pBank[i].iEdgeLength-1);
-        if(self->pBank[i].iEdgeLength == 2)
-        {
-           tea.flag = htonl(0);
-        }
-        else
-        {
-           tea.flag = htonl(1);
-        }
-        tea.edges = self->pBank[i].iEdges;
-        memcpy(pPtr,&tea,8);
-        pPtr += 8;
-        iTeaLength = self->pBank[i].iEdgeLength*4;
-        memcpy(pPtr,self->pBank[i].iEdges,iTeaLength);    
-        pPtr += iTeaLength;
-     }
-     
-     /* do the swiss bank structures */
-     for(i = 0; i < self->iBanks; i++)
-     {
-        toba.first = htons(self->pBank[i].iStart);
-        toba.n_cntrs = htons(self->pBank[i].iEnd);
-        toba.edge_indx = htons(i);
-        toba.bytes_per_bin = htons(self->iBinWidth);
-        memcpy(pPtr,&toba,sizeof(struct tof_bank));
-        pPtr += sizeof(struct tof_bank); 
-     }
-   
-     /* all packed up neat and nicely, send it */
-     /* try, get a connection to master server */
-     status = OpenMasterConnection(self);
-     if(status < 0)
-     {
-       if(pBuffer)
-         free(pBuffer);
-       return status;
-     }               
-     
-     /* send request  */
-     status = send(self->iMasterSocket,pBuffer,iLength ,0);
-     if(pBuffer)
-     {
-        free(pBuffer);
-     } 
-     if(status == -1)
-     {
-       return SEND_ERROR;
-     }                 
-     
-     /* get a reply */
-     iRet = GetMasterReply(self,&Rply_buff,sizeof(Rply_buff));
-     if(iRet < 0)
-     {
-       /* try close the socket */
-       close(self->iMasterSocket);
-       self->iMasterSocket = 0;
-       return iRet;
-     }
-     else
-     {
-       /* close the socket */ 
-       status = close(self->iMasterSocket);
-       self->iMasterSocket = 0;
-       if((status != 0) && (errno != ECONNRESET))
-       {
-         return CLOSE_ERROR;
-       }
-     }
-     return 1; /* success, finally */
-  }                    
-/*------------------------------------------------------------------------*/
-  int SINQHMDeconfigure(pSINQHM self, int iHarsh)
-  {
-     int status, iRet;
-     struct req_buff_struct            Req_buff;
-     struct rply_buff_struct           Rply_buff;
-         
-     assert(self);
-     if( (iHarsh != 0) && (iHarsh != 1) )
-     {
-       return INVALID_HARSH;
-     } 
-  
-     /* fill in the request data structure */
-     Req_buff.bigend = htonl (0x12345678);
-     Req_buff.cmnd   = htonl (SQHM_DECONFIG);
-     Req_buff.u.decnfg.sub_code = htonl(iHarsh);       
-     
-     /* try, get a connection to master server */
-     status = OpenMasterConnection(self);
-     if(status < 0)
-     {
-       return status;
-     }               
-     
-     /* send request  */
-     status = send(self->iMasterSocket,(char *)&Req_buff, sizeof(Req_buff),0);
-     if(status == -1)
-     {
-       return SEND_ERROR;
-     }                 
-     
-     /* get a reply */
-     iRet = GetMasterReply(self,&Rply_buff,sizeof(Rply_buff));
-     if(iRet < 0)
-     {
-       close(self->iMasterSocket);
-       self->iMasterSocket = 0;
-       return iRet;
-     }
-     else
-     {
-       status = close(self->iMasterSocket);
-       self->iMasterSocket = 0;
-       if((status != 0) && (errno != ECONNRESET))
-       {
-         return CLOSE_ERROR;
-       }
-     }
-     return 1; /* success, finally */
-  }                    
-/*------------------------------------------------------------------------*/
-  int SINQHMGetStatus(pSINQHM self, int *iMode,int *iDaq,
-                       int *iRank, int *iBinWidth,
-                      int *iLength, int *iClients)
-  {
-     int status, iRet;
-     short sDaq, sFill;
-     struct req_buff_struct            Req_buff;
-     struct rply_buff_struct           Rply_buff;
-         
-     assert(self);
-  
-  
-     status = 0;
-     if(self->iClientSocket)
-     {
-       status = SendDAQStatus(self,&Rply_buff);
-     }
-     else
-     {
-         /* fill in the request data structure */
-         Req_buff.bigend = htonl (0x12345678);
-         Req_buff.cmnd   = htonl (SQHM_STATUS);
-     
-         /* try, get a connection to master server */
-         status = OpenMasterConnection(self);
-         if(status < 0)
-         {
-             return status;
-         }               
-     
-         /* send request  */
-         status = send(self->iMasterSocket,(char *)&Req_buff, sizeof(Req_buff),0);
-         if(status == -1)
-         {
-             return SEND_ERROR;
-         }                 
-     
-         /* get a reply */
-         iRet = GetMasterReply(self,&Rply_buff,sizeof(Rply_buff));
-         if(iRet < 0)
-         {
-           close(self->iMasterSocket);
-           self->iMasterSocket = 0;
-           return iRet;
-         }
-         else
-         {
-           status = 1;
-           /* close the socket and go */
-           iRet = close(self->iMasterSocket);
-           self->iMasterSocket = 0;
-           if((iRet != 0) && (errno != ECONNRESET))
-           {
-             return CLOSE_ERROR;
-           }
-         }  
-     }
-         
-     if(status)
-     {
-       /* transfer results */
-       *iMode = ntohl(Rply_buff.u.status.cfg_state);
-       if((sDaq = ntohs(Rply_buff.u.status.daq_now)) == 0) /* DAQ active */
-       {
-         *iDaq = 1;
-       }  
-       else
-       {
-         sFill = ntohs(Rply_buff.u.status.filler_mask);
-         if(sFill & sDaq)
-         {
-            /* filler is not running */ 
-           *iDaq = 0;
-         }  
-         else
-         {
-            /* inhibited by some mean client */
-            *iDaq = 2;
-         }
-       }
-       *iRank = ntohs(Rply_buff.u.status.n_hists);
-       *iLength = ntohl(Rply_buff.u.status.num_bins);
-       *iBinWidth = Rply_buff.u.status.bytes_per_bin;
-       *iClients =  Rply_buff.u.status.act_srvrs;
-     }
-     return 1; /* success, finally */
-  }                    
-/*------------------------------------------------------------------------*/
-  int SINQHMDebug(pSINQHM self, int iLevel)
-  {
-     int status, iRet;
-     struct req_buff_struct            Req_buff;
-     struct rply_buff_struct           Rply_buff;
-         
-     assert(self);
-  
-     /* fill in the request data structure */
-     Req_buff.bigend = htonl (0x12345678);
-     Req_buff.cmnd   = htonl (SQHM_DBG);
-     Req_buff.u.dbg.mask = htonl(iLevel);       
-     
-     /* try, get a connection to master server */
-     status = OpenMasterConnection(self);
-     if(status < 0)
-     {
-       return status;
-     }               
-     
-     /* send request  */
-     status = send(self->iMasterSocket,(char *)&Req_buff, sizeof(Req_buff),0);
-     if(status == -1)
-     {
-       return SEND_ERROR;
-     }                 
-     
-     /* get a reply */
-     iRet = GetMasterReply(self,&Rply_buff,sizeof(Rply_buff));
-     if(iRet < 0)
-     {
-       close(self->iMasterSocket);
-       self->iMasterSocket = 0;
-       return iRet;
-     }
-     else
-     {
-       status = close(self->iMasterSocket);
-       self->iMasterSocket = 0;
-       if((status != 0) && (errno != ECONNRESET))
-       {
-         return CLOSE_ERROR;
-       }
-     }
-     return 1; /* success, finally */
-  }                    
-/*------------------------------------------------------------------------*/
-  int SINQHMKill(pSINQHM self)
-  {
-     int status, iRet;
-     struct req_buff_struct            Req_buff;
-     struct rply_buff_struct           Rply_buff;
-         
-     assert(self);
-  
-     /* fill in the request data structure */
-     Req_buff.bigend = htonl (0x12345678);
-     Req_buff.cmnd   = htonl (SQHM_EXIT);
-     
-     /* try, get a connection to master server */
-     status = OpenMasterConnection(self);
-     if(status < 0)
-     {
-       return status;
-     }               
-     
-     /* send request  */
-     status = send(self->iMasterSocket,(char *)&Req_buff, sizeof(Req_buff),0);
-     if(status == -1)
-     {
-       return SEND_ERROR;
-     }                 
-     
-     /* get a reply */
-     iRet = GetMasterReply(self,&Rply_buff,sizeof(Rply_buff));
-     if(iRet < 0)
-     {
-       close(self->iMasterSocket);
-       self->iMasterSocket = 0;
-       return iRet;
-     }
-     else
-     {
-       status = close(self->iMasterSocket);
-       self->iMasterSocket = 0;
-       if((status != 0) && (errno != ECONNRESET))
-       {
-         return CLOSE_ERROR;
-       }
-     }
-     return 1; /* success, finally */
-  }                    
-
-/*====================== DAQ functions ==================================*/
-  int SINQHMOpenDAQ(pSINQHM self)
-  {
-     int status, iRet, iPacket;
-     struct sockaddr_in	lcl_sockname;
-     struct sockaddr_in	rmt_sockname;
-     struct hostent      *rmt_hostent;
-     struct in_addr      *rmt_inet_addr_pntr;
-     struct req_buff_struct            Req_buff;
-     struct rply_buff_struct           Rply_buff;
-         
-     assert(self);
-  
-     /* fill in the request data structure */
-     Req_buff.bigend = htonl (0x12345678);
-     Req_buff.cmnd   = htonl (SQHM_CNCT);
-     Req_buff.u.cnct.max_pkt = htonl (8192);
-     Req_buff.u.cnct.strt_mode = htonl (0);
-                
-     
-     /* try, get a connection to master server */
-     status = OpenMasterConnection(self);
-     if(status < 0)
-     {
-       return status;
-     }               
-     
-     /* send request  */
-     status = send(self->iMasterSocket,(char *)&Req_buff, sizeof(Req_buff),0);
-     if(status == -1)
-     {
-       return SEND_ERROR;
-     }                 
-     
-     /* get a reply */
-     iRet = GetMasterReply(self,&Rply_buff,sizeof(Rply_buff));
-     status = close(self->iMasterSocket);
-     self->iMasterSocket = 0;
-     if(iRet < 0)
-     {
-       return iRet;
-     }
-     if(status != 0)
-     {
-       return CLOSE_ERROR;       
-     }
-    
-     /* read the port and packet size to use */
-     self->iClientPort  = ntohl (Rply_buff.u.cnct.port);
-     iPacket = ntohl (Rply_buff.u.cnct.pkt_size);
-     self->iPacket = iPacket;
-
-     /* now we are ready to open the connection to our very own histogram
-        memory slave server
-     */
-     
-     /* first a socket */
-     self->iClientSocket = socket (AF_INET, SOCK_STREAM, 0);
-     if(self->iClientSocket == -1) 
-     {
-       return SOCKET_ERROR;
-     }
-
-     /* now try a bind */ 
-     lcl_sockname.sin_family = AF_INET;
-     lcl_sockname.sin_port   = htons (0);
-     lcl_sockname.sin_addr.s_addr = 0;
-     status = bind (self->iClientSocket, (struct sockaddr *) &lcl_sockname,
-                    sizeof (lcl_sockname));
-     if (status == -1) 
-     {
-       self->iClientSocket = 0;
-       return BIND_ERROR;
-     }
-
-     /* get hostname (again). This is double work (has happened in 
-     OpenMasterConnection before) but I decided for this in order to
-     avoid carrying that extra adress pointer needed for connect around.
-     */
-     rmt_hostent = gethostbyname (self->pHMComputer);
-     if (rmt_hostent == NULL) {
-         /* this should never happen, as we got it recently in 
-         OpenMasterConnection
-         */
-         return HMCOMPUTER_NOT_FOUND;
-     }
-     rmt_inet_addr_pntr = (struct in_addr *) rmt_hostent->h_addr_list[0];
-
-     /* and connect */
-     rmt_sockname.sin_family	 = AF_INET;
-     rmt_sockname.sin_port	 = htons (self->iClientPort);
-     rmt_sockname.sin_addr.s_addr = rmt_inet_addr_pntr->s_addr;
-     status = connect (self->iClientSocket, (struct sockaddr *) &rmt_sockname,
-						    sizeof (rmt_sockname));
-     if (status == -1) 
-     {
-        self->iClientSocket = 0;
-        return CONNECT_ERROR;
-     }
-     
-     /* done! Surprise! Everything  worked! */
-     return 1;
-  }
-/*------------------------------------------------------------------------*/
-  int SINQHMCloseDAQ(pSINQHM self)
-  {
-     struct req_buff_struct Req_buff;
-     int status, iRet;
-
-     assert(self);
-     if(self->iClientSocket <= 0)
-     {
-        /* already colsed */
-        return 1;
-     }        
-
-     iRet = 1;
-     
-     /* send close message, this helps the master to clean up */
-     Req_buff.bigend = htonl (0x12345678);
-     Req_buff.cmnd = htonl (SQHM_CLOSE);
-     status = send (self->iClientSocket, (char *) &Req_buff, sizeof (Req_buff), 0);
-     if (status == -1) 
-     {
-        iRet = SEND_ERROR;
-     }
-     if (status != sizeof (Req_buff)) 
-     {
-        iRet = SEND_ERROR;
-     }
-     status = close (self->iClientSocket);
-     if (status != 0) 
-     {
-        iRet = CLOSE_ERROR;
-     }
-     self->iClientSocket = 0;
-     self->iClientPort = 0;
-     return iRet;
-  }
-/*-----------------------------------------------------------------------*/
-  int SINQHMStartDAQ(pSINQHM self)
-  {
-     int status, iDaq;
-     
-     assert(self);
-     
-     status = SendDAQCommand(self,DAQ__GO,&iDaq);
-     if(status < 0) /* error */
-     {
-       return status;
-     }
-     if(iDaq != 0)
-     {
-       return DAQ_INHIBIT;
-     }
-     return 1;
-  }
-/*-----------------------------------------------------------------------*/
-  int SINQHMStopDAQ(pSINQHM self)
-  {
-     int status, iDaq;
-     
-     assert(self);
-     
-     status = SendDAQCommand(self,DAQ__STOP,&iDaq);
-     if(status < 0) /* error */
-     {
-       return status;
-     }
-     if(iDaq == 0)
-     {
-       return DAQ_NOTSTOPPED;
-     }
-     return 1;
-  }
-
-/*-----------------------------------------------------------------------*/
-  int SINQHMContinueDAQ(pSINQHM self)
-  {
-     int status, iDaq;
-     
-     assert(self);
-     
-     status = SendDAQCommand(self,DAQ__CLR,&iDaq);
-     if(status < 0) /* error */
-     {
-       return status;
-     }
-     if(iDaq != 0)
-     {
-       return DAQ_INHIBIT;
-     }
-     return 1;
-  }
-/*-----------------------------------------------------------------------*/
-  int SINQHMInhibitDAQ(pSINQHM self)
-  {
-     int status, iDaq;
-     
-     assert(self);
-     
-     status = SendDAQCommand(self,DAQ__INH,&iDaq);
-     if(status < 0) /* error */
-     {
-       return status;
-     }
-     if(iDaq == 0)
-     {
-       return DAQ_NOTSTOPPED;
-     }
-     return 1;
-
-  }
-/*-----------------------------------------------------------------------*/
-  int SINQHMWrite(pSINQHM self, int iNum, int iStart, int iEnd, void *pData)
-  {
-     long lBytes2Go,lBins, i;
-     int status, iRet;
-     struct req_buff_struct            Req_buff;
-     struct rply_buff_struct           Rply_buff;
-     SQint16 *p16;
-     SQint32 *p32;    
-     char *pPtr;
-         
-     assert(self);
-     
-     /* calculate number of bins */
-     lBins = iEnd;
-
-     /* take care of byte order first */
-     if (0x12345678 != ntohl (0x12345678)) 
-     {	
-     /* Swap bytes, if necessary */
-	  switch (self->iBinWidth) 
-	  {
-	   case 1:
-	    break;
-	   case 2:
-	    p16 = (SQint16 *) pData;
-	    for (i=0; i < lBins; i++) 
-	    {
-	         p16[i] = htons (p16[i]);
-	    }     
-	    break;
-	   case 4:
-	    p32 = (SQint32 *) pData;
-	    for (i=0; i < lBins; i++) 
-	    {
-	       p32[i] = htonl (p32[i]);
-	    }   
-	    break;
-	  }
-	}
-
-        /* initialize the Request data */
-	Req_buff.bigend = htonl (0x12345678);
-	Req_buff.cmnd   = htonl (SQHM_WRITE);
-	Req_buff.u.write.n_bins  = htonl (lBins);
-	Req_buff.u.write.first_bin = htonl (iStart);
-	Req_buff.u.write.bytes_per_bin  = htonl (self->iBinWidth);
-	Req_buff.u.write.hist_no = htonl (iNum);
-
-        /* send the message */
-        status = send (self->iClientSocket, (char *) &Req_buff, sizeof (Req_buff), 0);
-        if (status == -1) 
-        {
-          return SEND_ERROR;
-        }
-        if (status != sizeof (Req_buff)) 
-        {
-           return SEND_ERROR;
-        }
-
-        /* send data */
-	lBytes2Go = lBins  * self->iBinWidth;
-	pPtr = (char *)pData;
-	while (lBytes2Go > 0) 
-	{
-	  i = (lBytes2Go > self->iPacket) ? self->iPacket : lBytes2Go;
-	  status = send (self->iClientSocket, (char *) pPtr, i, 0);
-	  if (status <= 0) 
-	  {
-            return SEND_ERROR;
-	  }
-	  lBytes2Go -= status;
-	  pPtr += status;
-	}
-
-        /* get status */
-        status = recv (self->iClientSocket, (char *) &Rply_buff, 
-                  sizeof (Rply_buff), MSG_WAITALL);
-
-        /* check various error conditions */
-        if (status == -1) 
-        {
-           return RECEIVE_ERROR;
-        }   
-        if (status != sizeof (Rply_buff)) 
-        {
-           return INSUFFICIENT_DATA;
-        }  
-        if(ntohl (Rply_buff.bigend) != 0x12345678) 
-        {
-           return BYTE_ORDER_CHAOS;
-        }
-        if((iRet = ntohl (Rply_buff.status)) == KER__BAD_VALUE) 
-        {
-           return HIST_BAD_VALUE;
-        }   
-        if(iRet != KER__SUCCESS)
-        {
-           return HIST_BAD_CODE;
-        }
-        /* success */
-        return 1;
-  }
-/*-----------------------------------------------------------------------*/
-  int SINQHMRead(pSINQHM self, int iNum, int iStart, int iEnd, 
-                 void *pData, int iDataLen)
-  {
-     long lBins2Get, lSpace,iNoBins, i;
-     int status, iRet;
-     struct req_buff_struct            Req_buff;
-     struct rply_buff_struct           Rply_buff;
-     SQint16 *p16;
-     SQint32 *p32;    
-     char *pPtr;
-     char pBuffer[8192]; 
-
-     assert(self);
-
-     /* initialize the Request data */
-     Req_buff.bigend = htonl (0x12345678);
-     Req_buff.cmnd   = htonl (SQHM_READ);
-     Req_buff.u.read.n_bins  = htonl (iEnd-iStart);
-     Req_buff.u.read.first_bin = htonl (iStart);
-     Req_buff.u.read.hist_no = htonl (iNum);
-
-     /* send the message */
-     status = send (self->iClientSocket, (char *) &Req_buff, 
-                   sizeof (Req_buff), 0);
-     if (status == -1) 
-     {
-        return SEND_ERROR;
-     }
-     if (status != sizeof (Req_buff)) 
-     {
-        return SEND_ERROR;
-     }
-
-     /* wait for an answer */
-     status = recv (self->iClientSocket, (char *) &Rply_buff, 
-                    sizeof (Rply_buff), MSG_WAITALL);
-
-     /* check various error conditions */
-     if (status == -1) 
-     {
-         return RECEIVE_ERROR;
-     }   
-     if (status != sizeof (Rply_buff)) 
-     {
-         return INSUFFICIENT_DATA;
-     }  
-     if(ntohl (Rply_buff.bigend) != 0x12345678) 
-     {
-         return BYTE_ORDER_CHAOS;
-     }
-     iRet = ntohl(Rply_buff.status);
-     if(iRet != KER__SUCCESS)
-     {
-         return HIST_BAD_CODE;
-     }
-     
-     /* calculate the size of things to come */
-     lBins2Get = ntohl(Rply_buff.u.read.n_bins) * ntohl(Rply_buff.u.read.bytes_per_bin);
-
-     /* read data */
-     pPtr = (char *)pData;
-     lSpace = iDataLen;  
-     iNoBins = ntohl(Rply_buff.u.read.n_bins);       
-     while (lBins2Get > 0) 
-     {
-       if(lBins2Get > self->iPacket) 
-       {
-         i = self->iPacket; 
-       }
-       else
-       {
-         i = lBins2Get;
-       }  
-       status = recv (self->iClientSocket, pBuffer, 
-                      i, 0);
-       if (status == -1)
-       {
-         return SEND_ERROR;
-       } 
-       lBins2Get -= status;
-       if((lSpace - status) > 0)
-       {
-          memcpy(pPtr,pBuffer,status);
-          lSpace -= status;
-          pPtr += status;
-       } 
-       else
-       {
-          if(lSpace > 0)
-          {
-            memcpy(pPtr,pBuffer,lSpace);
-            lSpace = 0;
-          }  
-       }
-    }
-    
-    /* swap bytes if necessary */
-    if ((self->iBinWidth > 0) && (Rply_buff.bigend != 0x12345678)) 
-    {
-      switch (self->iBinWidth) 
-      {	    /* Byte swapping is necessary */
-        case 2:
-        /* Not sure how to do this - this might be wrong! */
-        p16 = (SQint16 *) pData;
-	for (i = 0; i < iNoBins; i++) 
-	{
-	  p16[i] = ntohs (p16[i]);
-        }
-        break;
-       case 4:
-        p32 = (SQint32 *) pData;
-	for (i = 0; i < iNoBins; i++) 
-	{
-          p32[i] = ntohl(p32[i]);
-        }
-        break;
-      }
-    }
-    /* done */
-    return 1;
-  }
-/*-----------------------------------------------------------------------*/
-  int SINQHMProject(pSINQHM self, int code, int xStart, int nx,
-		    int yStart, int ny, 
-                 void *pData, int iDataLen)
-  {
-     long lBins2Get, lSpace,iNoBins, i;
-     int status, iRet;
-     struct req_buff_struct            Req_buff;
-     struct rply_buff_struct           Rply_buff;
-     SQint16 *p16;
-     SQint32 *p32;    
-     char *pPtr;
-     char pBuffer[8192]; 
-
-     assert(self);
-
-     /* initialize the Request data */
-     Req_buff.bigend = htonl (0x12345678);
-     Req_buff.cmnd   = htonl (SQHM_PROJECT);
-     Req_buff.u.project.sub_code = htonl (code);
-
-     Req_buff.u.project.x_lo     = htonl (xStart);
-     Req_buff.u.project.nx	= htonl (nx);
-     Req_buff.u.project.y_lo     = htonl (yStart);
-     Req_buff.u.project.ny	= htonl (ny);
-     Req_buff.u.project.nhist    = htonl (1);
-
-     /* send the message */
-     status = send (self->iClientSocket, (char *) &Req_buff, 
-                   sizeof (Req_buff), 0);
-     if (status == -1) 
-     {
-        return SEND_ERROR;
-     }
-     if (status != sizeof (Req_buff)) 
-     {
-        return SEND_ERROR;
-     }
-
-     /* wait for an answer */
-     status = recv (self->iClientSocket, (char *) &Rply_buff, 
-                    sizeof (Rply_buff), MSG_WAITALL);
-
-     /* check various error conditions */
-     if (status == -1) 
-     {
-         return RECEIVE_ERROR;
-     }   
-     if (status != sizeof (Rply_buff)) 
-     {
-         return INSUFFICIENT_DATA;
-     }  
-     if(ntohl (Rply_buff.bigend) != 0x12345678) 
-     {
-         return BYTE_ORDER_CHAOS;
-     }
-     iRet = ntohl(Rply_buff.status);
-     if(iRet != KER__SUCCESS)
-     {
-         return HIST_BAD_CODE;
-     }
-     
-     /* calculate the size of things to come */
-     lBins2Get = ntohl(Rply_buff.u.project.n_bins) * 
-       ntohl(Rply_buff.u.project.bytes_per_bin);
-
-     /* read data */
-     pPtr = (char *)pData;
-     lSpace = iDataLen;  
-     iNoBins = ntohl(Rply_buff.u.project.n_bins);       
-     while (lBins2Get > 0) 
-     {
-       if(lBins2Get > self->iPacket) 
-       {
-         i = self->iPacket; 
-       }
-       else
-       {
-         i = lBins2Get;
-       }  
-       status = recv (self->iClientSocket, pBuffer, 
-                      i, 0);
-       if (status == -1)
-       {
-         return SEND_ERROR;
-       } 
-       lBins2Get -= status;
-       if((lSpace - status) > 0)
-       {
-          memcpy(pPtr,pBuffer,status);
-          lSpace -= status;
-          pPtr += status;
-       } 
-       else
-       {
-          if(lSpace > 0)
-          {
-            memcpy(pPtr,pBuffer,lSpace);
-            lSpace = 0;
-          }  
-       }
-    }
-    
-    /* swap bytes if necessary */
-    iNoBins = iDataLen/self->iBinWidth;       
-    if ((self->iBinWidth > 0) && (Rply_buff.bigend != 0x12345678)) 
-    {
-      switch (self->iBinWidth) 
-      {	    /* Byte swapping is necessary */
-        case 2:
-        /* Not sure how to do this - this might be wrong! */
-        p16 = (SQint16 *) pData;
-	for (i = 0; i < iNoBins; i++) 
-	{
-	  p16[i] = ntohs (p16[i]);
-        }
-        break;
-       case 4:
-        p32 = (SQint32 *) pData;
-	for (i = 0; i < iNoBins; i++) 
-	{
-          p32[i] = ntohl(p32[i]);
-        }
-        break;
-      }
-    }
-    /* done */
-    return 1;
-  }
-/*------------------------------------------------------------------------
-  This is the old version, using a master socjet, delete if the other version
-  with client socket works alright.
-*/
-  int SINQHMZero2(pSINQHM self, int iNumber, int iStart, int iEnd)
-  {
-     int status, iRet;
-     struct req_buff_struct            Req_buff;
-     struct rply_buff_struct           Rply_buff;
-         
-     assert(self);
-  
-     /* fill in the request data structure */
-     Req_buff.bigend = htonl (0x12345678);
-     Req_buff.cmnd   = htonl (SQHM_ZERO);
-     Req_buff.u.zero.hist_no = htonl (iNumber);
-     Req_buff.u.zero.first_bin = htonl (iStart);
-     Req_buff.u.zero.n_bins  = htonl (iEnd);
-     
-     /* try, get a connection to master server */
-     status = OpenMasterConnection(self);
-     if(status < 0)
-     {
-       return status;
-     }               
-     
-     /* send request  */
-     status = send(self->iMasterSocket,(char *)&Req_buff, sizeof(Req_buff),0);
-     if(status == -1)
-     {
-       return SEND_ERROR;
-     }                 
-     
-     /* get a reply */
-     iRet = GetMasterReply(self,&Rply_buff,sizeof(Rply_buff));
-     if(iRet < 0)
-     {
-       close(self->iMasterSocket);
-       self->iMasterSocket = 0;
-       return iRet;
-     }
-     else
-     {
-       status = close(self->iMasterSocket);
-       self->iMasterSocket = 0;
-       if((status != 0) && (errno != ECONNRESET))
-       {
-         return CLOSE_ERROR;
-       }
-     }
-     return 1; /* success, finally */
-  }                    
-/*-----------------------------------------------------------------------*/
-  int SINQHMZero(pSINQHM self, int iNumber, int iStart, int iEnd)
-  {
-     int status, iRet;
-     struct req_buff_struct            Req_buff;
-     struct rply_buff_struct           Rply_buff;
-         
-     assert(self);
-  
-     /* fill in the request data structure */
-     Req_buff.bigend = htonl (0x12345678);
-     Req_buff.cmnd   = htonl (SQHM_ZERO);
-     Req_buff.u.zero.hist_no = htonl (iNumber);
-     Req_buff.u.zero.first_bin = htonl (iStart);
-     Req_buff.u.zero.n_bins  = htonl (iEnd);
-     
-     /* send request  */
-     status = send(self->iClientSocket,(char *)&Req_buff, sizeof(Req_buff),0);
-     if(status == -1)
-     {
-       return SEND_ERROR;
-     }                 
-     if(status != sizeof(Req_buff))
-     {
-       return SEND_ERROR;
-     }
-
-     /* get a reply */
-     iRet = recv(self->iClientSocket,(char *)&Rply_buff,sizeof(Rply_buff), 
-		 MSG_WAITALL);
-     if(iRet < 0)
-     {
-       return RECEIVE_ERROR;
-     }
-     if(iRet != sizeof(Rply_buff))
-     {
-       return INSUFFICIENT_DATA;
-     }
-     if(ntohl (Rply_buff.bigend) != 0x12345678) 
-     {
-         return BYTE_ORDER_CHAOS;
-     }
-     iRet = ntohl(Rply_buff.status);
-     if(iRet != KER__SUCCESS)
-     {
-         return HIST_BAD_CODE;
-     }
-     return 1; /* success, finally */
-  }                    
-
-/*------------------------------------------------------------------------*/
-  static int OpenMasterConnection(pSINQHM self)
-  {
-    struct hostent      *rmt_hostent;
-    struct sockaddr_in  lcl_sockname;
-    int rmt_sockname_len;
-    struct sockaddr_in  rmt_sockname;
-    struct in_addr      *rmt_inet_addr_pntr;
-    int status;    
-        
-             
-    /* get hostname */
-    rmt_hostent = gethostbyname (self->pHMComputer);
-    if (rmt_hostent == NULL) {
-        return HMCOMPUTER_NOT_FOUND;
-    }
-    rmt_inet_addr_pntr = (struct in_addr *) rmt_hostent->h_addr_list[0];
-       
-    
-    /* try, open socket */
-    self->iMasterSocket = socket (AF_INET, SOCK_STREAM, 0);
-    if (self->iMasterSocket == -1)
-    {
-      return SOCKET_ERROR;
-    }
-
-    /* bind it */
-    lcl_sockname.sin_family = AF_INET;
-    lcl_sockname.sin_port = htons(0);
-    lcl_sockname.sin_addr.s_addr = 0;
-    status = bind (self->iMasterSocket, (struct sockaddr *) &lcl_sockname,
-					sizeof (lcl_sockname));
-    if (status == -1) 
-    {
-       return BIND_ERROR;
-    }
-
-    /* try to connect */
-    rmt_sockname_len = sizeof (rmt_sockname);
-    rmt_sockname.sin_family	 = AF_INET;
-    rmt_sockname.sin_port	 = htons (self->iMasterPort);
-    rmt_sockname.sin_addr.s_addr = rmt_inet_addr_pntr->s_addr;
-    status = connect (self->iMasterSocket, (struct sockaddr *) &rmt_sockname,
-				    sizeof (rmt_sockname));
-    if (status == -1) {
-       return CONNECT_ERROR;
-    }
-    
-    /* Success */
-    return 1;
-  }
-/*------------------------------------------------------------------------*/
-   static int GetMasterReply(pSINQHM self, struct rply_buff_struct *reply,
-                                int iBufLen)
-   {
-
-    int	    status;
-   
-    assert(self->iMasterSocket);
-
-    /* get reply structure */
-    status = recv (self->iMasterSocket, (char *) reply, 
-                   iBufLen, MSG_WAITALL);
-    if (status == -1) {
-       return RECEIVE_ERROR;
-    } else if (status != iBufLen) {
-      return INSUFFICIENT_DATA;
-    }
-    
-    /* check endedness */
-    if (ntohl (reply->bigend) != 0x12345678) {
-      return BYTE_ORDER_CHAOS;
-    }
-    
-    /* check histogram memory status codes */
-    status = ntohl (reply->status);
-    if (status == KER__SUCCESS) {
-      return 1;
-    }else if (status == KER__BAD_CREATE) {
-      return HIST_BAD_CREATE;
-    }else if (status == KER__BAD_STATE) {
-      return HIST_BAD_STATE;
-    }else if (status == KER__BAD_VALUE) {
-      return HIST_BAD_VALUE;
-    }else if (status == KER__BAD_RECV) {
-      return HIST_BAD_RECV;
-    }else if (status == KER__BAD_ALLOC) {
-      return HIST_BAD_ALLOC;
-    }else {
-      return HIST_BAD_CODE;
-    }
-    /* not reached, usually */
-    return HIST_BAD_CODE;
-   }                             
-/*-------------------------------------------------------------------------*/
-  int SINQHMError2Text(int iErr, char *pBuffer, int iBufLen)
-  {
-     /* the trivial case */
-     if(iErr > 0)
-     {
-        strncpy(pBuffer,"No error ocurred",iBufLen);
-       return 0;    
-     }
-
-     switch(iErr)
-     {
-        case HMCOMPUTER_NOT_FOUND:
-              strncpy(pBuffer,
-                     "No name server entry for histogram memory computer",
-                      iBufLen);
-              break;
-        case SOCKET_ERROR:
-              strncpy(pBuffer,
-                      "Insufficient system resources for socket creation",
-                      iBufLen);
-              break;
-        case BIND_ERROR:
-              strncpy(pBuffer,
-                      "Cannot bind",
-                      iBufLen);
-              break;
-        case CONNECT_ERROR:
-              strncpy(pBuffer,
-                     "Cannot connect, probably port number wrong",
-                     iBufLen);
-              break;                     
-         case RECEIVE_ERROR:
-              strncpy(pBuffer,
-                      "Error receiving data", iBufLen);
-              break;
-         case INSUFFICIENT_DATA:
-              strncpy(pBuffer,
-                      "Not enough bytes received from host, network trouble",
-                      iBufLen);
-              break;                     
-         case BYTE_ORDER_CHAOS:
-              strncpy(pBuffer,
-                      "Reply not in network byte order",
-                      iBufLen);
-              break;
-         case HIST_BAD_CREATE:
-              strncpy(pBuffer,
-                      "Master histogram server failed to spawn child",
-                      iBufLen);
-              break;
-         case HIST_BAD_VALUE:
-              strncpy(pBuffer,
-                      "Invalid parameter detected",
-                      iBufLen);
-              break;
-         case HIST_BAD_STATE:
-              strncpy(pBuffer,
-                      "Histogram memory NOT configured",
-                      iBufLen);
-              break;
-         case HIST_BAD_RECV:
-              strncpy(pBuffer,
-                      "Histogram server failed to read command",
-                      iBufLen);
-              break;
-         case HIST_BAD_ALLOC:
-              strncpy(pBuffer,
-                      "Histogram memory out of memory!",
-                      iBufLen);
-              break;
-         case HIST_BAD_CODE:
-              strncpy(pBuffer,
-                      "Unknown or corrupted status code sent from master server",
-                      iBufLen);
-              break;
-         case SEND_ERROR:
-              strncpy(pBuffer,
-                      "Error sending data",
-                      iBufLen);
-              break;
-         case CLOSE_ERROR:
-              strncpy(pBuffer,
-                      "Error closing connection",
-                      iBufLen);
-              break;
-         case INVALID_HARSH:
-              strncpy(pBuffer,
-                      "Invalid parameter for harshness",
-                      iBufLen);
-              break; 
-         case SOFTWARE_ERROR:
-              strncpy(pBuffer,
-                      "Internal error or software error at histogram memory computer, consult a hacker", 
-                      iBufLen);
-              break;
-         case DAQ_INHIBIT:
-              strncpy(pBuffer,
-                      "Data aquisition inhibited by some client",
-                      iBufLen);
-              break;
-         case DAQ_NOTSTOPPED:
-              strncpy(pBuffer,
-                      "Data aquisition not stopped, suggests SW or network problem",
-                       iBufLen);
-              break;
-                                                                                                                                                                                    
-         default:
-               strncpy(pBuffer,
-                      "Unknown error code",iBufLen);
-     }
-     return 1;
-  }   		
-/*-------------------------------------------------------------------------
-  SINQHM needs an additional top bin defining the upper edge of the
-  histogram. So, for a 512 bin array, 513 bins are needed. The additional
-  bin is created in the code below. This explains the strange arithmetic with
-  EdgeLength and the code at the end of the for loop
-*/  
-  int SINQHMDefineBank(pSINQHM self, int iBankNumber, int iStart, int iEnd,
-                       float *iEdges, int iEdgeLength)
-  {
-     pSBank pWork = NULL;
-     int i, iDelay, iDiff;
-     
-     assert(self);
-     assert(iBankNumber >= 0);
-     assert(iBankNumber < MAXBANK);
-     assert(iEdgeLength >= 1);
-     assert(iStart >= 0);
-     assert(iEnd >= iStart);
-
-     if(iBankNumber >= self->iBanks)
-     {
-       self->iBanks = iBankNumber +1;
-     }
-     pWork = &(self->pBank[iBankNumber]);
-     if(pWork->iEdges != NULL)
-     {
-        free(pWork->iEdges);     
-        pWork->iEdges = NULL;
-     }   
-     iDelay = (int)iEdges[0];
-     pWork->iStart = iStart;
-     pWork->iEnd = iEnd;
-     pWork->iEdgeLength = iEdgeLength;
-     if(iEdgeLength == 2)
-     { /* 
-          fixed binwidth: two values required: start stop in
-          edge[0], edge[1]
-       */
-       pWork->iFlag = 0;
-       pWork->iDelay = iDelay;
-       pWork->iEdges = (unsigned int *)malloc(2*sizeof(unsigned int));
-       if(!pWork->iEdges)
-       {
-	 return HIST_BAD_ALLOC;
-       }
-       pWork->iEdges[0] = htonl((unsigned int)iEdges[0]);
-       pWork->iEdges[1] = htonl((unsigned int)(iEdges[1] - iDelay));
-       return 1;
-     }
-
-     /*
-       normal case: create the bin boundaries
-     */
-     pWork->iFlag = 1;
-     pWork->iEdgeLength++;
-     iEdgeLength++;
-     pWork->iEdges = (unsigned int *)malloc(iEdgeLength * 
-                                        sizeof(unsigned int));
-     if(!pWork->iEdges)
-     {
-       return HIST_BAD_ALLOC;
-     }
-     pWork->iDelay = iDelay;
-     for(i = 0; i < iEdgeLength-1; i++)
-     {
-       pWork->iEdges[i] = htonl((unsigned int)(iEdges[i]-iDelay));
-     }
-     iDiff = iEdges[1] - iEdges[0];
-     pWork->iEdges[iEdgeLength-1] = htonl(iEdges[iEdgeLength-2] 
-                                          + iDiff - iDelay); 
-     return 1;
-  } 
-/*-----------------------------------------------------------------------*/
-	    struct tof {
-	      uint	n_extra_bytes;
-	      usint	n_edges;
-	      usint	n_banks;
-	      uint	preset_delay;
-	      struct tof_edge_arr   edge_0;
-	      struct tof_bank	    bank_0;
-	    };
-                      
-/*------------------------------------------------------------------------*/
-  int SINQHMTimeBin(pSINQHM self,int iMode)
-  {
-     int status, iRet;
-     struct req_buff_struct            Req_buff;
-     struct rply_buff_struct           Rply_buff;
-     int iLength, i, iDelay;
-     unsigned int iExtra;
-     char *pBuffer = NULL, *pPtr;
-     struct tof_edge_arr tea;
-     int iTeaLength;
-     struct tof_bank toba;
-     struct tof tofi;
-       
-     assert(self);
-     
-     /* figure out how long we are going to be*/
-     iLength = 24 + self->iBanks*sizeof(struct tof_bank);
-     for(i = 0; i < self->iBanks; i++)
-     {
-       iLength += 8 + self->pBank[i].iEdgeLength*sizeof(SQint32);
-     }
-     if(iLength < 64)
-         iLength = 64;
-     /* allocate send buffer */
-     pBuffer = (char *)malloc(iLength*sizeof(char));
-     if(!pBuffer)
-     {
-       return HIST_BAD_ALLOC;
-     }    
-     memset(pBuffer,0,iLength);
-  
-     /* do the message header */
-     iExtra = iLength - 64;
-     if(iExtra < 0)
-        iExtra = 0;
-     iDelay = self->pBank[0].iEdges[0];   
-     Req_buff.bigend = htonl (0x12345678);
-     Req_buff.cmnd   = htonl (SQHM_CONFIG);
-     Req_buff.u.cnfg.mode = htonl (iMode);
-     memcpy(pBuffer,&Req_buff,12);
-     pPtr = pBuffer + 12;
-   
-     tofi.n_extra_bytes = htonl(iExtra);
-     tofi.n_edges =       htons(self->iBanks);       
-     tofi.n_banks =       htons(self->iBanks);
-     tofi.preset_delay =  htonl(self->pBank[0].iDelay);
-     memcpy(pPtr,&tofi,12);
-     pPtr += 12;       
-     
-     /* do the edge thingies */
-     for(i = 0; i < self->iBanks; i++)
-     {
-        tea.n_bins = htonl(self->pBank[i].iEdgeLength-1);
-        if(self->pBank[i].iEdgeLength == 2)
-        {
-           tea.flag = htonl(0);
-        }
-        else
-        {
-           tea.flag = htonl(1);
-        }
-        tea.edges = self->pBank[i].iEdges;
-        memcpy(pPtr,&tea,8);
-        pPtr += 8;
-        iTeaLength = self->pBank[i].iEdgeLength*4;
-        memcpy(pPtr,self->pBank[i].iEdges,iTeaLength);    
-        pPtr += iTeaLength;
-     }
-     
-     /* do the swiss bank structures */
-     for(i = 0; i < self->iBanks; i++)
-     {
-        toba.first = htons(self->pBank[i].iStart);
-        toba.n_cntrs = htons(self->pBank[i].iEnd);
-        toba.edge_indx = htons(i);
-        toba.bytes_per_bin = htons(self->iBinWidth);
-        memcpy(pPtr,&toba,sizeof(struct tof_bank));
-        pPtr += sizeof(struct tof_bank); 
-     }
-   
-     /* all packed up neat and nicely, send it */
-     /* try, get a connection to master server */
-     status = OpenMasterConnection(self);
-     if(status < 0)
-     {
-       if(pBuffer)
-         free(pBuffer);
-       return status;
-     }               
-     
-     /* send request  */
-     status = send(self->iMasterSocket,pBuffer,iLength ,0);
-     if(pBuffer)
-     {
-        free(pBuffer);
-     } 
-     if(status == -1)
-     {
-       return SEND_ERROR;
-     }                 
-     
-     /* get a reply */
-     iRet = GetMasterReply(self,&Rply_buff,sizeof(Rply_buff));
-     if(iRet < 0)
-     {
-       /* try close the socket */
-       close(self->iMasterSocket);
-       self->iMasterSocket = 0;
-       return iRet;
-     }
-     else
-     {
-       /* close the socket */ 
-       status = close(self->iMasterSocket);
-       self->iMasterSocket = 0;
-       if((status != 0) && (errno != ECONNRESET))
-       {
-         return CLOSE_ERROR;
-       }
-     }
-     return 1; /* success, finally */
-  }
diff --git a/hardsup/sinqhm.h b/hardsup/sinqhm.h
deleted file mode 100644
index ad692a16..00000000
--- a/hardsup/sinqhm.h
+++ /dev/null
@@ -1,107 +0,0 @@
-
-#line 363 "sinqhm.w"
-
-/*---------------------------------------------------------------------------
-                               S I N Q H M
-  Some utility functions for interfacing to the SINQ histogram memory
-  server.
-
-  David Maden, Mark Koennecke, April 1997
-
-  copyright: see implementation file.
------------------------------------------------------------------------------*/
-#ifndef SINQHMUTILITY
-#define SINQHMUTILITY
-#include "sinqhm_def.h"
-
-  typedef struct __SINQHM *pSINQHM;
-/*------------------------------ Error codes -----------------------------*/
-
-#line 341 "sinqhm.w"
-
-#define HMCOMPUTER_NOT_FOUND -2
-#define SOCKET_ERROR         -3
-#define BIND_ERROR           -4
-#define CONNECT_ERROR        -5
-#define RECEIVE_ERROR        -6
-#define INSUFFICIENT_DATA    -7
-#define BYTE_ORDER_CHAOS     -8
-#define HIST_BAD_CREATE      -9
-#define HIST_BAD_STATE       -10
-#define HIST_BAD_VALUE       -11
-#define HIST_BAD_RECV        -12
-#define HIST_BAD_ALLOC       -13
-#define HIST_BAD_CODE        -14
-#define SEND_ERROR           -15
-#define CLOSE_ERROR          -16
-#define INVALID_HARSH        -17
-#define SOFTWARE_ERROR       -18
-#define DAQ_INHIBIT          -19
-#define DAQ_NOTSTOPPED       -20
-
-#line 379 "sinqhm.w"
-
-
-/*------------------------------ Prototypes ------------------------------*/
-
-#line 118 "sinqhm.w"
-
-  pSINQHM CreateSINQHM(char *pHMComputer, int iMasterPort);
-  pSINQHM CopySINQHM(pSINQHM self);
-  void    DeleteSINQHM(pSINQHM self); 
-  void SINQHMSetPar(pSINQHM self, int iRank, int iLength, int iBinWidth);
-  void SINQHMSetPSD(pSINQHM self, int xSize, int xOff, int xFac,
-                    int ySize, int yOff, int yFac);
-
-#line 142 "sinqhm.w"
-
-  int SINQHMError2Text(int iErr, char *pBuffer, int iBufLen);
-
-#line 155 "sinqhm.w"
-
-  int SINQHMConfigure(pSINQHM self, int iMode, int iRank, int iLength, 
-                      int iBinWidth, int iLowBin, int iCompress);
-  int SINQHMConfigurePSD(pSINQHM self, int iMode,
-                         int xSize, int xOff, int xFac,
-                         int ySize, int yOff, int yFac,
-                         int iBinWidth, 
-                         float *iEdges, int iEdgeLength);
-
-  int SINQHMDeconfigure(pSINQHM self, int iHarsh);
-  int SINQHMGetStatus(pSINQHM self,int *iMode,  int *iDaq,
-                      int *iRank, int *iBinWidth,
-                      int *iLength, int *iClients);
-  int SINQHMDebug(pSINQHM self, int iLevel);
-  int SINQHMKill(pSINQHM self);
-  
-
-#line 261 "sinqhm.w"
-
-   int SINQHMOpenDAQ(pSINQHM self);
-   int SINQHMCloseDAQ(pSINQHM self);
-
-   int SINQHMStartDAQ(pSINQHM self);
-   int SINQHMStopDAQ(pSINQHM  self);
-   int SINQHMInhibitDAQ(pSINQHM self);
-   int SINQHMContinueDAQ(pSINQHM self);
-  
-   int SINQHMWrite(pSINQHM self, int iNum, int iStart, int iEnd, 
-                   void *pData);
-   long SINQHMSize(pSINQHM self, int iNum, int iStart, int iEnd);
-   int SINQHMRead(pSINQHM self, int iNum, int iStart, int iEnd, 
-                  void *pData, int iDataLen); 
-   int SINQHMProject(pSINQHM self, int code, int xStart, int nx,
-                     int yStart, int ny, void *pData, int iDataLen);
-   int SINQHMZero(pSINQHM self, int iNum, int iStart, int iEnd);
-
-#line 382 "sinqhm.w"
-
-
-#line 232 "sinqhm.w"
-
-   int SINQHMDefineBank(pSINQHM self, int iBankNumber, int iStart, int iEnd,
-                        float *iEdges, int iEdgeLength);
-
-#line 383 "sinqhm.w"
-
-#endif
diff --git a/hardsup/sinqhm.i b/hardsup/sinqhm.i
deleted file mode 100644
index 785f1d73..00000000
--- a/hardsup/sinqhm.i
+++ /dev/null
@@ -1,54 +0,0 @@
-
-/*---------------------------------------------------------------------------
-
-  Internal header file for the SINQ histogram memory utility functions.
-
-  David Maden, Mark Koennecke April 1997
-----------------------------------------------------------------------------*/
-#ifndef SINQHMINTERNAL
-#define SINQHMINTERNAL
-#define MAXBANK 1
-
-    typedef struct __SBANK {
-                            int iStart;
-                            int iEnd;
-                            int iFlag;
-                            int iEdgeLength;
-                            int iDelay;
-                            unsigned int *iEdges;
-                           } SBank, *pSBank;
-
-
-   typedef struct __SINQHM {
-                            char *pHMComputer;
-                            int  iMasterPort;
-                            int  iMasterSocket;
-                            int  iClientPort;
-                            int  iClientSocket;
-                            int  iBinWidth;
-                            int  iLength;
-                            int  iRank;
-                            int  iPacket;
-                            int  iBanks;
-                            int xSize, ySize;
-                            int  xOff, xFac;
-                            int  yOff, yFac;
-                            SBank pBank[MAXBANK];
-                           } SINQHM;
-
-/*---------------------------- Type definitions, machine dependent--------*/
-  typedef short int   SQint16; /* 16 bit integer */
-  typedef int         SQint32; /* 32 bit integer */
-
-
-
-   static int OpenMasterConnection(pSINQHM self);
-   static int GetMasterReply(pSINQHM self, struct rply_buff_struct *reply,
-                             int iBufLen);
-   static int SendDAQCommand(pSINQHM self, int iCommand, int *iDaq);
-
-
-   static int SINQHMTimeBin(pSINQHM self, int iMode);
-
-#endif
-
diff --git a/hardsup/sinqhm.tex b/hardsup/sinqhm.tex
deleted file mode 100644
index f0a95d54..00000000
--- a/hardsup/sinqhm.tex
+++ /dev/null
@@ -1,618 +0,0 @@
-\documentstyle{report}
-
-\setlength{\oddsidemargin}{0in}
-\setlength{\evensidemargin}{0in}
-\setlength{\topmargin}{0in}
-\addtolength{\topmargin}{-\headheight}
-\addtolength{\topmargin}{-\headsep}
-\setlength{\textheight}{8.9in}
-\setlength{\textwidth}{6.5in}
-\setlength{\marginparwidth}{0.5in}
- 
-\title{SINQHM-Utility\\ Utility functions for the \\
- SINQ Histogram memory}
-\author{David Maden, Mark K\"onnecke, April 1997}
-
-\begin{document}
-\maketitle
-\clearpage
-
-\chapter{Introduction}
-This file describes some Utility functions for interfacing with the SinQ
-histogram memory server. This device is described in great detail elsewhere
-(D. Maden: The SINQ Histogram Memory, Feb. 1997). 
-All the real time processing
-for this HM is done by an on-board computer in a VME crate. This on board
-computer also runs TCP/IP and a server program which allows for
-configuration and communication with the HM. 
-For configuration an
-connection to the main server is installed which handles the configuration
-requests. For starting data collection and retrieval of information a second
-connection is needed. This is obtained by sending a request to the main
-server on the on board computer. This main server will than spawn a second
-process on the on board computer which is dedicated to serving our requests.
-The mainserver sends  a packet containing the new port number our secondary
-server is listening to. Than the driver can connect to this secondary server
-in order to exchange data. According to this scheme the utility functions
-divide into two groups: Master Server commands and data aquisition commands.
-
-\section{Code organisation} 
-The code dealing with the SINQ histogram memory is organised in four
-files: sinqhm.w, the literate programming file which creates sinqhm.i and
-sinqhm.h as well as the LateX documentation for the interface, sinqhm.i is
-an internal header file and contains typedefs and function definitions for
-relevant for the implementation of the utility functions only. sinqhm.h
-defines the public interface functions. sinqhm.c finally is the source file
-which implements the utilities.
-
-\section{The SINQHM data structure}
-In order to transport the necessary status information around, each function
-will take a pointer to the data structure defined below as first parameter.
-For TOF mode it is necessary to store some imformation per detector bank.
-This information is kept in a bank data structure:
-
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap1}
-$\langle$SBank {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@    typedef struct __SBANK {@\\
-\mbox{}\verb@                            int iStart;@\\
-\mbox{}\verb@                            int iEnd;@\\
-\mbox{}\verb@                            int iFlag;@\\
-\mbox{}\verb@                            int iEdgeLength;@\\
-\mbox{}\verb@                            int iDelay;@\\
-\mbox{}\verb@                            unsigned int *iEdges;@\\
-\mbox{}\verb@                           } SBank, *pSBank;@\\
-\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}
-The fields are:
-\begin{description}
-\item[iStart] The number of the detector with which this bank starts.
-\item[iEnd] The number of the last detector for this bank.
-\item[iFlag] A flag which indicates if the bank has a fixed bin widths. 0
-denotes fixed bin width, 1 variable time binning.
-\item[iEdgeLength] is the length of the edge array.
-\item[iEdges] is an array of integer values describing the lower edges of
-the bins. Its content depends on the value of iFlag. With a equally spaced
-time binning (iFlag = 0) is is sufficient to give values for the first two
-bins. If the time binning varies, nBins+1 values are necessary describing
-the lower edges of all time bins.
-\end{description}
-
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap2}
-$\langle$SType {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@   typedef struct __SINQHM {@\\
-\mbox{}\verb@                            char *pHMComputer;@\\
-\mbox{}\verb@                            int  iMasterPort;@\\
-\mbox{}\verb@                            int  iMasterSocket;@\\
-\mbox{}\verb@                            int  iClientPort;@\\
-\mbox{}\verb@                            int  iClientSocket;@\\
-\mbox{}\verb@                            int  iBinWidth;@\\
-\mbox{}\verb@                            int  iLength;@\\
-\mbox{}\verb@                            int  iRank;@\\
-\mbox{}\verb@                            int  iPacket;@\\
-\mbox{}\verb@                            int  iBanks;@\\
-\mbox{}\verb@                            int xSize, ySize;@\\
-\mbox{}\verb@                            int  xOff, xFac;@\\
-\mbox{}\verb@                            int  yOff, yFac;@\\
-\mbox{}\verb@                            SBank pBank[MAXBANK];@\\
-\mbox{}\verb@                           } SINQHM;@\\
-\mbox{}\verb@@$\diamond$
-\end{list}
-\vspace{-1ex}
-\footnotesize\addtolength{\baselineskip}{-1ex}
-\begin{list}{}{\setlength{\itemsep}{-\parsep}\setlength{\itemindent}{-\leftmargin}}
-\item Macro defined by scraps ?, ?.
-\item Macro referenced in scrap ?.
-\end{list}
-\end{minipage}\\[4ex]
-\end{flushleft}
-The first item in this structure is the name of the histogram memory
-computer, the second the port number at which the master server is
-listening. iClientPort defines a port for data communication. If no such
-port is open, this value will be 0. iStatus is a status flag. iBanks is the
-number of detector banks defined. pSBank is an array of bank data structures
-describing the detector banks. 
-xOff, xFac and yOff and yFac are the offset and factor values needed for
-the PSD calculation for TRICS and AMOR. In order to
-maintain this data structure two functions are defined:
-
-\section{Byte swapping}
-These utility functions preform byte swapping as needed. In order for this
-to work please make sure that the following typedefs represent the correct
-types for your compiler and computer.
-
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap3}
-$\langle$SType {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@/*---------------------------- Type definitions, machine dependent--------*/@\\
-\mbox{}\verb@  typedef short int   SQint16; /* 16 bit integer */@\\
-\mbox{}\verb@  typedef int         SQint32; /* 32 bit integer */@\\
-\mbox{}\verb@@$\diamond$
-\end{list}
-\vspace{-1ex}
-\footnotesize\addtolength{\baselineskip}{-1ex}
-\begin{list}{}{\setlength{\itemsep}{-\parsep}\setlength{\itemindent}{-\leftmargin}}
-\item Macro defined by scraps ?, ?.
-\item Macro referenced in scrap ?.
-\end{list}
-\end{minipage}\\[4ex]
-\end{flushleft}
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap4}
-$\langle$Protos {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@  pSINQHM CreateSINQHM(char *pHMComputer, int iMasterPort);@\\
-\mbox{}\verb@  pSINQHM CopySINQHM(pSINQHM self);@\\
-\mbox{}\verb@  void    DeleteSINQHM(pSINQHM self); @\\
-\mbox{}\verb@  void SINQHMSetPar(pSINQHM self, int iRank, int iLength, int iBinWidth);@\\
-\mbox{}\verb@  void SINQHMSetPSD(pSINQHM self, int xSize, int xOff, int xFac,@\\
-\mbox{}\verb@                    int ySize, int yOff, int yFac);@\\
-\mbox{}\verb@@$\diamond$
-\end{list}
-\vspace{-1ex}
-\footnotesize\addtolength{\baselineskip}{-1ex}
-\begin{list}{}{\setlength{\itemsep}{-\parsep}\setlength{\itemindent}{-\leftmargin}}
-\item Macro defined by scraps ?, ?, ?, ?.
-\item Macro referenced in scrap ?.
-\end{list}
-\end{minipage}\\[4ex]
-\end{flushleft}
-The first function creates a new SINQHM data structure and initialises the
-fields with the parameters given. Their meanings correspond to those
-mentioned above for the description of the data structure. DeleteSINQHM
-frees all memory associated with a SINQHM structure given by self. The
-pointer to self is invalid ever afterwards.
-CopySINQHM creates a copy of the SINQHM structure passed in with self.
-SINQHMSetPar sets time of flight parameters.
-SINQHMSetPSD defines PSD parameters for TRICS/AMOR type detectors. 
-
-\section{SINQHM error handling}
-If not denoted otherwise all public SINQHM functions return an integer 1 on
-success. In the more common case of failure, a negative error code is
-returned. This error code can be transformed into a human readable form by a
-call to:
-
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap5}
-$\langle$Protos {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@  int SINQHMError2Text(int iErr, char *pBuffer, int iBufLen);@\\
-\mbox{}\verb@@$\diamond$
-\end{list}
-\vspace{-1ex}
-\footnotesize\addtolength{\baselineskip}{-1ex}
-\begin{list}{}{\setlength{\itemsep}{-\parsep}\setlength{\itemindent}{-\leftmargin}}
-\item Macro defined by scraps ?, ?, ?, ?.
-\item Macro referenced in scrap ?.
-\end{list}
-\end{minipage}\\[4ex]
-\end{flushleft}
-This function takes as first parameter the error code, as second a pointer
-to a text buffer for the error message and as third parameter the length of
-the buffer. Maximum iBufLen characters will be copied to pBuffer. 
-
-\section{Master Server command functions}
-These functions mainly serve to configure the histogram memory and to obtain
-socket-id's for client data aquisition servers. The following functions are
-needed:
-
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap6}
-$\langle$Protos {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@  int SINQHMConfigure(pSINQHM self, int iMode, int iRank, int iLength, @\\
-\mbox{}\verb@                      int iBinWidth, int iLowBin, int iCompress);@\\
-\mbox{}\verb@  int SINQHMConfigurePSD(pSINQHM self, int iMode,@\\
-\mbox{}\verb@                         int xSize, int xOff, int xFac,@\\
-\mbox{}\verb@                         int ySize, int yOff, int yFac,@\\
-\mbox{}\verb@                         int iBinWidth, @\\
-\mbox{}\verb@                         float *iEdges, int iEdgeLength);@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  int SINQHMDeconfigure(pSINQHM self, int iHarsh);@\\
-\mbox{}\verb@  int SINQHMGetStatus(pSINQHM self,int *iMode,  int *iDaq,@\\
-\mbox{}\verb@                      int *iRank, int *iBinWidth,@\\
-\mbox{}\verb@                      int *iLength, int *iClients);@\\
-\mbox{}\verb@  int SINQHMDebug(pSINQHM self, int iLevel);@\\
-\mbox{}\verb@  int SINQHMKill(pSINQHM self);@\\
-\mbox{}\verb@  @\\
-\mbox{}\verb@@$\diamond$
-\end{list}
-\vspace{-1ex}
-\footnotesize\addtolength{\baselineskip}{-1ex}
-\begin{list}{}{\setlength{\itemsep}{-\parsep}\setlength{\itemindent}{-\leftmargin}}
-\item Macro defined by scraps ?, ?, ?, ?.
-\item Macro referenced in scrap ?.
-\end{list}
-\end{minipage}\\[4ex]
-\end{flushleft}
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap7}
-$\langle$IProtos {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@@$\diamond$
-\end{list}
-\vspace{-1ex}
-\footnotesize\addtolength{\baselineskip}{-1ex}
-\begin{list}{}{\setlength{\itemsep}{-\parsep}\setlength{\itemindent}{-\leftmargin}}
-\item Macro defined by scraps ?, ?.
-\item Macro referenced in scrap ?.
-\end{list}
-\end{minipage}\\[4ex]
-\end{flushleft}
-SINQHMConfigure configures the master server for data aquisition. Besides
-the pointer to a SINQHM structure it takes the following parameters:
- iMode is the combination of mode and submode bits as defined in
-sinqhm_defs.h.  iLength is the length of
-the histograms. iBinWidth is the size of the histogram memory bins in bytes.
-Currently the values 1,2 and 4 are allowed. iClients is the number of active
-clients at the histogram memory computer. iRank is the number of histograms.
-iLowBin is the start of the histogram memory. Usually this is 0, but someone
-may choose to strat at a different memory location. iCompress is for
-compression. All data will be right shifted by iCompress bits before
-storage. To my knowledge this feature is currently not implemented.
-
-SINQHMConfigurePSD configures a TRICS/AMOR type detector. The parameters are:
-\begin{description}
-\item[self] The histogram memory data structure.
-\item[iMode] The actual histogram mode with all submask bits.
-\item[xSize] The x size of the detector.
-\item[xOff] The offset in x for the detector position decoding.
-\item[xFac] The factor used in decoding the x detector position. 
-\item[ySize] The y size of the detector.
-\item[yOff] The offset in y for the detector position decoding.
-\item[yFac] The factor used in decoding the y detector position.
-\item[iBinWidth] The binwidth of the histograms.
-\item[iEdges] An array holding the time binning edges.
-\item[iEdgeLength] The length of iEdges.  
-\end{description}
-
-SINQHMDeconfigure deconfigures the histogram memory. This is necessary prior
-to reconfiguration. The only parameter iHarsh defines how brutal the master
-server is with this. There may still be clients active at the histogram
-memory. If iHarsh is 0, SINQHMDeconfig returns an error in this case. If
-iHarsh is 1, the clients will be killed and the master server returns to a
-virgin state.
-
-SINQHMGetStatus allows to query the state of the master server. Parameters
-have the same meaning as given with SINQHMConfigure. Except of course
-iClients which is the number of currently active clients at the histogram
-memory. iDaq show the status of data aquisition: 0 denotes stopped, 1
-denotes running and 2 denotes inhibited. 
-
-SINQHMDebug sets the debug level of the histogram memory server. That server
-may print messages to its Com 1 port. This command configures the amount of
-information available at this channel. This function is of no use for normal
-users.
-
-SINQHMKill stops the histogram memory master server and all its children.
-WARNING: After this call a manual restart of the histogram memory master
-server or a reboot of the histogram memory computer has to be performed. 
-Do not use this function unless you are a SINQ histogram memory guru. 
-
-\section{TOF bin description functions}
-Configuring the TOF binning of the histogram memory requires two steps. In
-the first step you define the binning of all required banks. Then in a
-second step, this data is packed up and forwarded to the histogram memory.
-Thus the following functions are required:
-
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap8}
-$\langle$TOFProto {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@   int SINQHMDefineBank(pSINQHM self, int iBankNumber, int iStart, int iEnd,@\\
-\mbox{}\verb@                        float *iEdges, int iEdgeLength);@\\
-\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{scrap9}
-$\langle$TOFintern {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@   static int SINQHMTimeBin(pSINQHM self, int iMode);@\\
-\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}
-SINQHDefineBank defines the time binning for a single detector bank.
-iBankNumber defines the number of the detector bank to define. iStart and
-iEnd select  the range of detectors beloning to this detector bank. iEdges
-is the array of time binnings. iEdgeLength is the length of the edges array. 
-
-SINQHMTimeBin actually sends the new time binning to the histogram memory.
-SINQHMTimeBin is a static internal function.
-
- 
-
-\section{Data aquisition functions}
-These functions allow to do data aquisition and retrieve or set histograms.
-Data aquisition is fairly involved. In order for data aquisition to happen
-the histogram memory internal filler process must be running. This is
-controlled by the StartDAQ/StopDAQ pair. However, any client can inhibit
-data processing. This feature is targeted towards clients monitoring
-environment devices. Such clients thus can pause data aquisition in order to
-allow environment variables to get in the defined range again. This is
-controlled by the InhibitDAQ/ContinueDAQ pair of functions. Please note,
-that after starting a new data aquisition session the inhibit flag is
-cleared by default. 
-
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap10}
-$\langle$Protos {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@   int SINQHMOpenDAQ(pSINQHM self);@\\
-\mbox{}\verb@   int SINQHMCloseDAQ(pSINQHM self);@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@   int SINQHMStartDAQ(pSINQHM self);@\\
-\mbox{}\verb@   int SINQHMStopDAQ(pSINQHM  self);@\\
-\mbox{}\verb@   int SINQHMInhibitDAQ(pSINQHM self);@\\
-\mbox{}\verb@   int SINQHMContinueDAQ(pSINQHM self);@\\
-\mbox{}\verb@  @\\
-\mbox{}\verb@   int SINQHMWrite(pSINQHM self, int iNum, int iStart, int iEnd, @\\
-\mbox{}\verb@                   void *pData);@\\
-\mbox{}\verb@   long SINQHMSize(pSINQHM self, int iNum, int iStart, int iEnd);@\\
-\mbox{}\verb@   int SINQHMRead(pSINQHM self, int iNum, int iStart, int iEnd, @\\
-\mbox{}\verb@                  void *pData, int iDataLen); @\\
-\mbox{}\verb@   int SINQHMProject(pSINQHM self, int code, int xStart, int nx,@\\
-\mbox{}\verb@                     int yStart, int ny, void *pData, int iDataLen);@\\
-\mbox{}\verb@   int SINQHMZero(pSINQHM self, int iNum, int iStart, int iEnd);@\\
-\mbox{}\verb@@$\diamond$
-\end{list}
-\vspace{-1ex}
-\footnotesize\addtolength{\baselineskip}{-1ex}
-\begin{list}{}{\setlength{\itemsep}{-\parsep}\setlength{\itemindent}{-\leftmargin}}
-\item Macro defined by scraps ?, ?, ?, ?.
-\item Macro referenced in scrap ?.
-\end{list}
-\end{minipage}\\[4ex]
-\end{flushleft}
-SINQHMOpenDAQ must be the first call and will create the slave server in the
-histogram memory server which is than responsible for answereing our further
-requests. Without this call any other call will return an error! 
-
-SINQHMCloseDAQ closes a data aquisition session.
-
-SINQHMStartDAQ starts data aquisition.
-
-SINQHMInhibitDAQ causes data aquisition to pause.
-
-SINQHMContinueDAQ causes a paused data aquisition to continue.
- 
-SINQHMStopDAQ stops data aquisition. 
- 
-SINQHMWrite is used to initialise the histograms in the histogram memory to
-a specific value. The histogram to write is selected by iNum. If iNum is -1
-the whole histogram memory area is written. iStart and iEnd define a subset
-of the histogram to write. pData is a pointer to a data area which is going
-to be copied to the histogram memory.
-
-SINQHMSize returns the necessary size in bytes for a buffer large enough to
-hold all the data requested with the following read parameters.
-
-SINQHMRead reads histograms. The parameters iNum, iStart and iEnd have the
-same meaning as with SINQHMWrite. Maximum iDataLen bytes of data are copied
-to the memory area pointed to by pData.
-
-SINQHMProject requests a projection of the data from the histogram memory. This
- is currently only implemented for AMOR because histograms can get so large
- at this instrument that a transfer for processing would take to long. The
- parameters are:
-\begin{description}
-\item[code] The operation code for project. Can be PROJECT__COLL for 
- collapsing all time channels onto a 2D array and PROJECT__SAMPLE for
- summing a rectangular region of the histogram memory in time.
-\item[xStart, nx] start value in x and number of detectors to sum in x direction
-\item[yStart,ny]start value in y and number of detectors to sum in y direction
-\item[pData] a pointer to a data array large enough for holding the projected
- data.
-\item[iDataLen] The length of pData.
-\end{description}
-
-SINQHMZero clears the  histogram iNum from iStart to iEnd to 0. 
-A recommended call prior
-to any serious data aquisition.
-
-\section{Further internal routines}
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap11}
-$\langle$IProtos {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@   static int OpenMasterConnection(pSINQHM self);@\\
-\mbox{}\verb@   static int GetMasterReply(pSINQHM self, struct rply_buff_struct *reply,@\\
-\mbox{}\verb@                             int iBufLen);@\\
-\mbox{}\verb@   static int SendDAQCommand(pSINQHM self, int iCommand, int *iDaq);@\\
-\mbox{}\verb@@$\diamond$
-\end{list}
-\vspace{-1ex}
-\footnotesize\addtolength{\baselineskip}{-1ex}
-\begin{list}{}{\setlength{\itemsep}{-\parsep}\setlength{\itemindent}{-\leftmargin}}
-\item Macro defined by scraps ?, ?.
-\item Macro referenced in scrap ?.
-\end{list}
-\end{minipage}\\[4ex]
-\end{flushleft}
-OpenMasterCoonection tries to open a connection to the SINQ histogram memory
-master server ready to send data.
-
-GetMasterReply collects the reply from the master server.
-
-SendDAQCommand sends iCommand to the client server. Returns the current
-status of the data aquisition flag in iDaq for further analysis. 
-
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap12}
-$\langle$ErrCode {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@#define HMCOMPUTER_NOT_FOUND -2@\\
-\mbox{}\verb@#define SOCKET_ERROR         -3@\\
-\mbox{}\verb@#define BIND_ERROR           -4@\\
-\mbox{}\verb@#define CONNECT_ERROR        -5@\\
-\mbox{}\verb@#define RECEIVE_ERROR        -6@\\
-\mbox{}\verb@#define INSUFFICIENT_DATA    -7@\\
-\mbox{}\verb@#define BYTE_ORDER_CHAOS     -8@\\
-\mbox{}\verb@#define HIST_BAD_CREATE      -9@\\
-\mbox{}\verb@#define HIST_BAD_STATE       -10@\\
-\mbox{}\verb@#define HIST_BAD_VALUE       -11@\\
-\mbox{}\verb@#define HIST_BAD_RECV        -12@\\
-\mbox{}\verb@#define HIST_BAD_ALLOC       -13@\\
-\mbox{}\verb@#define HIST_BAD_CODE        -14@\\
-\mbox{}\verb@#define SEND_ERROR           -15@\\
-\mbox{}\verb@#define CLOSE_ERROR          -16@\\
-\mbox{}\verb@#define INVALID_HARSH        -17@\\
-\mbox{}\verb@#define SOFTWARE_ERROR       -18@\\
-\mbox{}\verb@#define DAQ_INHIBIT          -19@\\
-\mbox{}\verb@#define DAQ_NOTSTOPPED       -20@\\
-\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{scrap13}
-\verb@"sinqhm.h"@ {\footnotesize ? }$\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@/*---------------------------------------------------------------------------@\\
-\mbox{}\verb@                               S I N Q H M@\\
-\mbox{}\verb@  Some utility functions for interfacing to the SINQ histogram memory@\\
-\mbox{}\verb@  server.@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  David Maden, Mark Koennecke, April 1997@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  copyright: see implementation file.@\\
-\mbox{}\verb@-----------------------------------------------------------------------------*/@\\
-\mbox{}\verb@#ifndef SINQHMUTILITY@\\
-\mbox{}\verb@#define SINQHMUTILITY@\\
-\mbox{}\verb@#include "sinqhm_def.h"@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  typedef struct __SINQHM *pSINQHM;@\\
-\mbox{}\verb@/*------------------------------ Error codes -----------------------------*/@\\
-\mbox{}\verb@@$\langle$ErrCode {\footnotesize ?}$\rangle$\verb@@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@/*------------------------------ Prototypes ------------------------------*/@\\
-\mbox{}\verb@@$\langle$Protos {\footnotesize ?, \ldots\ }$\rangle$\verb@@\\
-\mbox{}\verb@@$\langle$TOFProto {\footnotesize ?}$\rangle$\verb@@\\
-\mbox{}\verb@#endif@\\
-\mbox{}\verb@@$\diamond$
-\end{list}
-\vspace{-2ex}
-\end{minipage}\\[4ex]
-\end{flushleft}
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap14}
-\verb@"sinqhm.i"@ {\footnotesize ? }$\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@/*---------------------------------------------------------------------------@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  Internal header file for the SINQ histogram memory utility functions.@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  David Maden, Mark Koennecke April 1997@\\
-\mbox{}\verb@----------------------------------------------------------------------------*/@\\
-\mbox{}\verb@#ifndef SINQHMINTERNAL@\\
-\mbox{}\verb@#define SINQHMINTERNAL@\\
-\mbox{}\verb@#define MAXBANK 1@\\
-\mbox{}\verb@@$\langle$SBank {\footnotesize ?}$\rangle$\verb@@\\
-\mbox{}\verb@@$\langle$SType {\footnotesize ?, \ldots\ }$\rangle$\verb@@\\
-\mbox{}\verb@@$\langle$IProtos {\footnotesize ?, \ldots\ }$\rangle$\verb@@\\
-\mbox{}\verb@@$\langle$TOFintern {\footnotesize ?}$\rangle$\verb@@\\
-\mbox{}\verb@#endif@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@@$\diamond$
-\end{list}
-\vspace{-2ex}
-\end{minipage}\\[4ex]
-\end{flushleft}
-\chapter{The SINQ histogram memory Tcl wrapper}
-In order to allow for status displays via Tcl/TK, for debugging and general
-availability a Tcl wrapper for the SINQ histogram memory functions has been
-devised. It works similar to the widget commands as used for TK. On startup
-the extra command SINQHM is available. The syntax is: \\ 
-\leftline{SINQHM name computer port }\\
-This command will create another command called name which symbolises a
-connection to the histogram memory at computer listening to port. The new
-object created is a control object. This control object understands the
-commands listed below. Each command has to be prepended with the name you
-specified in the call to SINQHM.
-\begin{itemize}
-\item {\bf config iMode iOver iRank iLength iBinWidth} configures a histogram
-memory. 
-\item {\bf status} return a status message of the HM.
-\item {\bf deconfig iHarsh} deconfigures the HM.
-\item {\bf debug iLevel} sets internal debug level.
-\item {\bf exit} do not use this! Kills the HM.
-\item {\bf DAQ name } creates a data aquisition client named name.
-\item {\bf delDAQ name} kills the data aquisition client named name.
-\end{itemize}
-
-After the last call there exists a new command name which represents a data
-aquisition client, capabale of reading and writing data. This DAQ client
-understands the commands listed below. Again, each command has to prepended
-with the name given in the DAQ command above.
-\begin{itemize}
-\item {\bf read iNum iStart iEnd arname} reads histogram iNum from 
-iStart to iEnd. The data will be stored in the array arname.
-\item {\bf write iNum iStart iEnd data} writes data to the histogram iNum
-from iStart iEnd bins. data must be an Tcl-array with indexes from 0 to
-iEnd which contains the values to write. 
-\item {\bf zero} zeroes the histogram memory.
-\item {\bf start} starts data aquisition.
-\item {\bf stop} stops data aquisition.
-\item {\bf inhibit} inhibits data aquisition.
-\item {\bf continue} continues an inhibited data aquisition session.
-\end{itemize}
-    
- 
-
-\end{document}
\ No newline at end of file
diff --git a/hardsup/sinqhm.w b/hardsup/sinqhm.w
deleted file mode 100644
index 0d2cf067..00000000
--- a/hardsup/sinqhm.w
+++ /dev/null
@@ -1,446 +0,0 @@
-\documentstyle{report}
-
-\setlength{\oddsidemargin}{0in}
-\setlength{\evensidemargin}{0in}
-\setlength{\topmargin}{0in}
-\addtolength{\topmargin}{-\headheight}
-\addtolength{\topmargin}{-\headsep}
-\setlength{\textheight}{8.9in}
-\setlength{\textwidth}{6.5in}
-\setlength{\marginparwidth}{0.5in}
- 
-\title{SINQHM-Utility\\ Utility functions for the \\
- SINQ Histogram memory}
-\author{David Maden, Mark K\"onnecke, April 1997}
-
-\begin{document}
-\maketitle
-\clearpage
-
-\chapter{Introduction}
-This file describes some Utility functions for interfacing with the SinQ
-histogram memory server. This device is described in great detail elsewhere
-(D. Maden: The SINQ Histogram Memory, Feb. 1997). 
-All the real time processing
-for this HM is done by an on-board computer in a VME crate. This on board
-computer also runs TCP/IP and a server program which allows for
-configuration and communication with the HM. 
-For configuration an
-connection to the main server is installed which handles the configuration
-requests. For starting data collection and retrieval of information a second
-connection is needed. This is obtained by sending a request to the main
-server on the on board computer. This main server will than spawn a second
-process on the on board computer which is dedicated to serving our requests.
-The mainserver sends  a packet containing the new port number our secondary
-server is listening to. Than the driver can connect to this secondary server
-in order to exchange data. According to this scheme the utility functions
-divide into two groups: Master Server commands and data aquisition commands.
-
-\section{Code organisation} 
-The code dealing with the SINQ histogram memory is organised in four
-files: sinqhm.w, the literate programming file which creates sinqhm.i and
-sinqhm.h as well as the LateX documentation for the interface, sinqhm.i is
-an internal header file and contains typedefs and function definitions for
-relevant for the implementation of the utility functions only. sinqhm.h
-defines the public interface functions. sinqhm.c finally is the source file
-which implements the utilities.
-
-\section{The SINQHM data structure}
-In order to transport the necessary status information around, each function
-will take a pointer to the data structure defined below as first parameter.
-For TOF mode it is necessary to store some imformation per detector bank.
-This information is kept in a bank data structure:
-
-@d  SBank @{
-    typedef struct __SBANK {
-                            int iStart;
-                            int iEnd;
-                            int iFlag;
-                            int iEdgeLength;
-                            int iDelay;
-                            unsigned int *iEdges;
-                           } SBank, *pSBank;
-@}
-The fields are:
-\begin{description}
-\item[iStart] The number of the detector with which this bank starts.
-\item[iEnd] The number of the last detector for this bank.
-\item[iFlag] A flag which indicates if the bank has a fixed bin widths. 0
-denotes fixed bin width, 1 variable time binning.
-\item[iEdgeLength] is the length of the edge array.
-\item[iEdges] is an array of integer values describing the lower edges of
-the bins. Its content depends on the value of iFlag. With a equally spaced
-time binning (iFlag = 0) is is sufficient to give values for the first two
-bins. If the time binning varies, nBins+1 values are necessary describing
-the lower edges of all time bins.
-\end{description}
-
-@d SType @{
-   typedef struct __SINQHM {
-                            char *pHMComputer;
-                            int  iMasterPort;
-                            int  iMasterSocket;
-                            int  iClientPort;
-                            int  iClientSocket;
-                            int  iBinWidth;
-                            int  iLength;
-                            int  iRank;
-                            int  iPacket;
-                            int  iBanks;
-                            int xSize, ySize;
-                            int  xOff, xFac;
-                            int  yOff, yFac;
-                            SBank pBank[MAXBANK];
-                           } SINQHM;
-@}
- 
-The first item in this structure is the name of the histogram memory
-computer, the second the port number at which the master server is
-listening. iClientPort defines a port for data communication. If no such
-port is open, this value will be 0. iStatus is a status flag. iBanks is the
-number of detector banks defined. pSBank is an array of bank data structures
-describing the detector banks. 
-xOff, xFac and yOff and yFac are the offset and factor values needed for
-the PSD calculation for TRICS and AMOR. In order to
-maintain this data structure two functions are defined:
-
-\section{Byte swapping}
-These utility functions preform byte swapping as needed. In order for this
-to work please make sure that the following typedefs represent the correct
-types for your compiler and computer.
-
-@d SType @{
-/*---------------------------- Type definitions, machine dependent--------*/
-  typedef short int   SQint16; /* 16 bit integer */
-  typedef int         SQint32; /* 32 bit integer */
-@} 
-
-@d Protos @{
-  pSINQHM CreateSINQHM(char *pHMComputer, int iMasterPort);
-  pSINQHM CopySINQHM(pSINQHM self);
-  void    DeleteSINQHM(pSINQHM self); 
-  void SINQHMSetPar(pSINQHM self, int iRank, int iLength, int iBinWidth);
-  void SINQHMSetPSD(pSINQHM self, int xSize, int xOff, int xFac,
-                    int ySize, int yOff, int yFac);
-@}
-
-The first function creates a new SINQHM data structure and initialises the
-fields with the parameters given. Their meanings correspond to those
-mentioned above for the description of the data structure. DeleteSINQHM
-frees all memory associated with a SINQHM structure given by self. The
-pointer to self is invalid ever afterwards.
-CopySINQHM creates a copy of the SINQHM structure passed in with self.
-SINQHMSetPar sets time of flight parameters.
-SINQHMSetPSD defines PSD parameters for TRICS/AMOR type detectors. 
-
-\section{SINQHM error handling}
-If not denoted otherwise all public SINQHM functions return an integer 1 on
-success. In the more common case of failure, a negative error code is
-returned. This error code can be transformed into a human readable form by a
-call to:
-
-@d Protos @{
-  int SINQHMError2Text(int iErr, char *pBuffer, int iBufLen);
-@}
-
-This function takes as first parameter the error code, as second a pointer
-to a text buffer for the error message and as third parameter the length of
-the buffer. Maximum iBufLen characters will be copied to pBuffer. 
-
-\section{Master Server command functions}
-These functions mainly serve to configure the histogram memory and to obtain
-socket-id's for client data aquisition servers. The following functions are
-needed:
-
-@d Protos @{
-  int SINQHMConfigure(pSINQHM self, int iMode, int iRank, int iLength, 
-                      int iBinWidth, int iLowBin, int iCompress);
-  int SINQHMConfigurePSD(pSINQHM self, int iMode,
-                         int xSize, int xOff, int xFac,
-                         int ySize, int yOff, int yFac,
-                         int iBinWidth, 
-                         float *iEdges, int iEdgeLength);
-
-  int SINQHMDeconfigure(pSINQHM self, int iHarsh);
-  int SINQHMGetStatus(pSINQHM self,int *iMode,  int *iDaq,
-                      int *iRank, int *iBinWidth,
-                      int *iLength, int *iClients);
-  int SINQHMDebug(pSINQHM self, int iLevel);
-  int SINQHMKill(pSINQHM self);
-  
-@}
-
-@d IProtos @{
-@}
-
-SINQHMConfigure configures the master server for data aquisition. Besides
-the pointer to a SINQHM structure it takes the following parameters:
- iMode is the combination of mode and submode bits as defined in
-sinqhm_defs.h.  iLength is the length of
-the histograms. iBinWidth is the size of the histogram memory bins in bytes.
-Currently the values 1,2 and 4 are allowed. iClients is the number of active
-clients at the histogram memory computer. iRank is the number of histograms.
-iLowBin is the start of the histogram memory. Usually this is 0, but someone
-may choose to strat at a different memory location. iCompress is for
-compression. All data will be right shifted by iCompress bits before
-storage. To my knowledge this feature is currently not implemented.
-
-SINQHMConfigurePSD configures a TRICS/AMOR type detector. The parameters are:
-\begin{description}
-\item[self] The histogram memory data structure.
-\item[iMode] The actual histogram mode with all submask bits.
-\item[xSize] The x size of the detector.
-\item[xOff] The offset in x for the detector position decoding.
-\item[xFac] The factor used in decoding the x detector position. 
-\item[ySize] The y size of the detector.
-\item[yOff] The offset in y for the detector position decoding.
-\item[yFac] The factor used in decoding the y detector position.
-\item[iBinWidth] The binwidth of the histograms.
-\item[iEdges] An array holding the time binning edges.
-\item[iEdgeLength] The length of iEdges.  
-\end{description}
-
-SINQHMDeconfigure deconfigures the histogram memory. This is necessary prior
-to reconfiguration. The only parameter iHarsh defines how brutal the master
-server is with this. There may still be clients active at the histogram
-memory. If iHarsh is 0, SINQHMDeconfig returns an error in this case. If
-iHarsh is 1, the clients will be killed and the master server returns to a
-virgin state.
-
-SINQHMGetStatus allows to query the state of the master server. Parameters
-have the same meaning as given with SINQHMConfigure. Except of course
-iClients which is the number of currently active clients at the histogram
-memory. iDaq show the status of data aquisition: 0 denotes stopped, 1
-denotes running and 2 denotes inhibited. 
-
-SINQHMDebug sets the debug level of the histogram memory server. That server
-may print messages to its Com 1 port. This command configures the amount of
-information available at this channel. This function is of no use for normal
-users.
-
-SINQHMKill stops the histogram memory master server and all its children.
-WARNING: After this call a manual restart of the histogram memory master
-server or a reboot of the histogram memory computer has to be performed. 
-Do not use this function unless you are a SINQ histogram memory guru. 
-
-\section{TOF bin description functions}
-Configuring the TOF binning of the histogram memory requires two steps. In
-the first step you define the binning of all required banks. Then in a
-second step, this data is packed up and forwarded to the histogram memory.
-Thus the following functions are required:
-
-@d TOFProto @{
-   int SINQHMDefineBank(pSINQHM self, int iBankNumber, int iStart, int iEnd,
-                        float *iEdges, int iEdgeLength);
-@}
-@d TOFintern @{
-   static int SINQHMTimeBin(pSINQHM self, int iMode);
-@}
-SINQHDefineBank defines the time binning for a single detector bank.
-iBankNumber defines the number of the detector bank to define. iStart and
-iEnd select  the range of detectors beloning to this detector bank. iEdges
-is the array of time binnings. iEdgeLength is the length of the edges array. 
-
-SINQHMTimeBin actually sends the new time binning to the histogram memory.
-SINQHMTimeBin is a static internal function.
-
- 
-
-\section{Data aquisition functions}
-These functions allow to do data aquisition and retrieve or set histograms.
-Data aquisition is fairly involved. In order for data aquisition to happen
-the histogram memory internal filler process must be running. This is
-controlled by the StartDAQ/StopDAQ pair. However, any client can inhibit
-data processing. This feature is targeted towards clients monitoring
-environment devices. Such clients thus can pause data aquisition in order to
-allow environment variables to get in the defined range again. This is
-controlled by the InhibitDAQ/ContinueDAQ pair of functions. Please note,
-that after starting a new data aquisition session the inhibit flag is
-cleared by default. 
-
-@d Protos @{
-   int SINQHMOpenDAQ(pSINQHM self);
-   int SINQHMCloseDAQ(pSINQHM self);
-
-   int SINQHMStartDAQ(pSINQHM self);
-   int SINQHMStopDAQ(pSINQHM  self);
-   int SINQHMInhibitDAQ(pSINQHM self);
-   int SINQHMContinueDAQ(pSINQHM self);
-  
-   int SINQHMWrite(pSINQHM self, int iNum, int iStart, int iEnd, 
-                   void *pData);
-   long SINQHMSize(pSINQHM self, int iNum, int iStart, int iEnd);
-   int SINQHMRead(pSINQHM self, int iNum, int iStart, int iEnd, 
-                  void *pData, int iDataLen); 
-   int SINQHMProject(pSINQHM self, int code, int xStart, int nx,
-                     int yStart, int ny, void *pData, int iDataLen);
-   int SINQHMZero(pSINQHM self, int iNum, int iStart, int iEnd);
-@} 
-
-SINQHMOpenDAQ must be the first call and will create the slave server in the
-histogram memory server which is than responsible for answereing our further
-requests. Without this call any other call will return an error! 
-
-SINQHMCloseDAQ closes a data aquisition session.
-
-SINQHMStartDAQ starts data aquisition.
-
-SINQHMInhibitDAQ causes data aquisition to pause.
-
-SINQHMContinueDAQ causes a paused data aquisition to continue.
- 
-SINQHMStopDAQ stops data aquisition. 
- 
-SINQHMWrite is used to initialise the histograms in the histogram memory to
-a specific value. The histogram to write is selected by iNum. If iNum is -1
-the whole histogram memory area is written. iStart and iEnd define a subset
-of the histogram to write. pData is a pointer to a data area which is going
-to be copied to the histogram memory.
-
-SINQHMSize returns the necessary size in bytes for a buffer large enough to
-hold all the data requested with the following read parameters.
-
-SINQHMRead reads histograms. The parameters iNum, iStart and iEnd have the
-same meaning as with SINQHMWrite. Maximum iDataLen bytes of data are copied
-to the memory area pointed to by pData.
-
-SINQHMProject requests a projection of the data from the histogram memory. This
- is currently only implemented for AMOR because histograms can get so large
- at this instrument that a transfer for processing would take to long. The
- parameters are:
-\begin{description}
-\item[code] The operation code for project. Can be PROJECT__COLL for 
- collapsing all time channels onto a 2D array and PROJECT__SAMPLE for
- summing a rectangular region of the histogram memory in time.
-\item[xStart, nx] start value in x and number of detectors to sum in x direction
-\item[yStart,ny]start value in y and number of detectors to sum in y direction
-\item[pData] a pointer to a data array large enough for holding the projected
- data.
-\item[iDataLen] The length of pData.
-\end{description}
-
-SINQHMZero clears the  histogram iNum from iStart to iEnd to 0. 
-A recommended call prior
-to any serious data aquisition.
-
-\section{Further internal routines}
-@d IProtos @{
-   static int OpenMasterConnection(pSINQHM self);
-   static int GetMasterReply(pSINQHM self, struct rply_buff_struct *reply,
-                             int iBufLen);
-   static int SendDAQCommand(pSINQHM self, int iCommand, int *iDaq);
-@}
-OpenMasterCoonection tries to open a connection to the SINQ histogram memory
-master server ready to send data.
-
-GetMasterReply collects the reply from the master server.
-
-SendDAQCommand sends iCommand to the client server. Returns the current
-status of the data aquisition flag in iDaq for further analysis. 
-
-@d ErrCode @{
-#define HMCOMPUTER_NOT_FOUND -2
-#define SOCKET_ERROR         -3
-#define BIND_ERROR           -4
-#define CONNECT_ERROR        -5
-#define RECEIVE_ERROR        -6
-#define INSUFFICIENT_DATA    -7
-#define BYTE_ORDER_CHAOS     -8
-#define HIST_BAD_CREATE      -9
-#define HIST_BAD_STATE       -10
-#define HIST_BAD_VALUE       -11
-#define HIST_BAD_RECV        -12
-#define HIST_BAD_ALLOC       -13
-#define HIST_BAD_CODE        -14
-#define SEND_ERROR           -15
-#define CLOSE_ERROR          -16
-#define INVALID_HARSH        -17
-#define SOFTWARE_ERROR       -18
-#define DAQ_INHIBIT          -19
-#define DAQ_NOTSTOPPED       -20
-@}
-
-@o sinqhm.h -d @{
-/*---------------------------------------------------------------------------
-	                       S I N Q H M
-  Some utility functions for interfacing to the SINQ histogram memory
-  server.
-
-  David Maden, Mark Koennecke, April 1997
-
-  copyright: see implementation file.
------------------------------------------------------------------------------*/
-#ifndef SINQHMUTILITY
-#define SINQHMUTILITY
-#include "sinqhm_def.h"
-
-  typedef struct __SINQHM *pSINQHM;
-/*------------------------------ Error codes -----------------------------*/
-@< ErrCode @>
-
-/*------------------------------ Prototypes ------------------------------*/
-@< Protos @>
-@< TOFProto @>
-#endif
-@}
-
-@o sinqhm.i @{
-/*---------------------------------------------------------------------------
-
-  Internal header file for the SINQ histogram memory utility functions.
-
-  David Maden, Mark Koennecke April 1997
-----------------------------------------------------------------------------*/
-#ifndef SINQHMINTERNAL
-#define SINQHMINTERNAL
-#define MAXBANK 1
-@< SBank @>
-@< SType @>
-@< IProtos @>
-@< TOFintern @>
-#endif
-
-@}
-
-\chapter{The SINQ histogram memory Tcl wrapper}
-In order to allow for status displays via Tcl/TK, for debugging and general
-availability a Tcl wrapper for the SINQ histogram memory functions has been
-devised. It works similar to the widget commands as used for TK. On startup
-the extra command SINQHM is available. The syntax is: \\ 
-\leftline{SINQHM name computer port }\\
-This command will create another command called name which symbolises a
-connection to the histogram memory at computer listening to port. The new
-object created is a control object. This control object understands the
-commands listed below. Each command has to be prepended with the name you
-specified in the call to SINQHM.
-\begin{itemize}
-\item {\bf config iMode iOver iRank iLength iBinWidth} configures a histogram
-memory. 
-\item {\bf status} return a status message of the HM.
-\item {\bf deconfig iHarsh} deconfigures the HM.
-\item {\bf debug iLevel} sets internal debug level.
-\item {\bf exit} do not use this! Kills the HM.
-\item {\bf DAQ name } creates a data aquisition client named name.
-\item {\bf delDAQ name} kills the data aquisition client named name.
-\end{itemize}
-
-After the last call there exists a new command name which represents a data
-aquisition client, capabale of reading and writing data. This DAQ client
-understands the commands listed below. Again, each command has to prepended
-with the name given in the DAQ command above.
-\begin{itemize}
-\item {\bf read iNum iStart iEnd arname} reads histogram iNum from 
-iStart to iEnd. The data will be stored in the array arname.
-\item {\bf write iNum iStart iEnd data} writes data to the histogram iNum
-from iStart iEnd bins. data must be an Tcl-array with indexes from 0 to
-iEnd which contains the values to write. 
-\item {\bf zero} zeroes the histogram memory.
-\item {\bf start} starts data aquisition.
-\item {\bf stop} stops data aquisition.
-\item {\bf inhibit} inhibits data aquisition.
-\item {\bf continue} continues an inhibited data aquisition session.
-\end{itemize}
-    
- 
-
-\end{document}
\ No newline at end of file
diff --git a/hardsup/sinqhm_def.h b/hardsup/sinqhm_def.h
deleted file mode 100644
index 6b17b2ed..00000000
--- a/hardsup/sinqhm_def.h
+++ /dev/null
@@ -1,483 +0,0 @@
-/*=================================================== [...SinqHM]SinqHM_def.h
-**
-**	Definition Include file for SinqHM_SRV and its clients.
-**
-**------------------------------------------------------------------------------
-*/
-#define	    SINQHM_DEF_ID	"V03C"
-
-#ifdef __alpha
-#ifndef __vms
-#pragma	    pack  1
-#endif
-#endif
-/*------------------------------------------------------------------------------
-*/
-#ifndef OffsetOf
-#define OffsetOf(type, identifier)  ((size_t)(&((type*) NULL)->identifier))
-#endif
-/*------------------------------------------------------------------------------
-**                      Define some defaults.
-*/
-#define PORT_BASE	2400	/* The Internet Port for Server Requests    */
-#define	MAX_CLIENTS	8	/* The maximum number of active clients   */
-#define MAX_TOF_CNTR	1024	/* The maximum number of individual counters ..
-				** which can be handled in TOF mode */
-#define MAX_PSD_CNTR    1048576 /* maximum number of PSD elements */
-#define MAX_TOF_NBINS	32768	/* The maximum number of bins in a TOF histog */
-#define MAX_TOF_EDGE	16	/* The maximum number of TOF edge arrays */
-#define VMIO_BASE_ADDR	0x1900	/* VME address of a (possible) VMIO10 module */
-#define	IDENT_MSGE_LEN	256	/* Length of Ident info for SQHM_IDENT */
-
-#define	    uchar   unsigned char
-#define	    usint   unsigned short int
-#define	    uint    unsigned int
-/*------------------------------------------------------------------------------
-**                      Define some status values (similar to VAXeln).
-*/
-#define KER__SUCCESS	  1
-#define KER__BAD_CREATE	 -2
-#define KER__BAD_STATE	 -4
-#define KER__BAD_VALUE	 -6
-#define KER__EXIT_SIGNAL -10
-#define KER__BAD_RECV	 -14
-#define KER__BAD_ALLOC	 -16
-
-#ifndef True
-#define	True	1
-#endif
-
-#ifndef False
-#define	False	0
-#endif
-
-#ifndef NIL
-#define	NIL	'\0'
-#endif
-/*------------------------------------------------------------------------------
-**                      Define command verbs to SinqHM.
-*/
-#define SQHM_CNCT	0x01
-#define SQHM_CLOSE	0x02
-#define SQHM_CONFIG	0x03
-#define SQHM_DAQ	0x04
-#define SQHM_DBG	0x05
-#define SQHM_DECONFIG	0x06
-#define SQHM_EXIT	0x07
-#define SQHM_IDENT	0x0e
-#define SQHM_PROJECT	0x0d
-#define SQHM_READ	0x08
-#define SQHM_SELECT	0x09
-#define SQHM_STATUS	0x0a
-#define SQHM_WRITE	0x0b
-#define SQHM_ZERO	0x0c
-	    /*
-	    ** Define the various operation modes
-	    */
-#define SQHM__TRANS	0x1000	/* Transparent mode */
-#define SQHM__HM_DIG	0x2000	/* Hist mode (with digitised read-out) */
-#define SQHM__TOF	0x3000	/* Time-of-Flight mode */
-#define SQHM__HM_PSD	0x4000	/* Hist mode (with Pos-sens-detect read-out) */
-#define SQHM__HRPT	0x5000	/* Hist mode for HRPT */
-	    /*
-	    ** Define the various sub-mode bits of the operation modes
-	    */
-#define SQHM__SUB_MODE_MSK 0xff	/* Mask for extracting "sub-mode" bits */
-#define SQHM__DEBUG	0x01	/* Debug flag - FILLER will suspend itself ..
-				** .. after starting to allow debugging */
-#define SQHM__UD	0x02	/* Use Up/Down bit information */
-
-#define SQHM__BO_MSK	0x18	/* Mask for extracting "bin-overflow" bits */
-#define SQHM__BO_IGN	0x00	/* Ignore bin-overflows (bin-contents wrap) */
-#define SQHM__BO_SMAX	0x08	/* On bin-overflow, stop at maximum */
-#define SQHM__BO_CNT	0x10	/* Keep counts of overflow bins */
-
-#define SQHM__STROBO	0x20	/* Use strobo-bit information */
-#define SQHM__REFLECT	0x40	/* Reflect histograms */
-#define SQHM__NO_STAT	0x80	/* Suppress status info from "Filler" */
-	    /*
-	    ** ----------------------------------------------------------
-	    **		    SQHM_DAQ sub-function codes
-	    */
-#define DAQ__EXIT	0xffffffff
-#define DAQ__CLR	0x01
-#define DAQ__GO		0x02
-#define DAQ__INH	0x03
-#define DAQ__STOP	0x04
-#define DAQ__TST	0x05
-	    /*
-	    ** ----------------------------------------------------------
-	    **		    SQHM_PROJECT sub-codes
-	    */
-#define PROJECT__ON_Y	0x0001	/* Project onto y-axis */
-#define PROJECT__1_DIM	0x0002	/* Make projection of a 1-dim histogram */
-#define PROJECT__COLL   0x0003  /* collapse PSD on one time channel */
-#define PROJECT__SAMPLE 0x0004  /* sum a rectangular part of the PSD
-                                   detector in time
-				*/
-	    /*
-	    ** ----------------------------------------------------------
-	    **		    Definition of bits in <flag> of TOF edge-array
-	    */
-#define FLAG__VAR_BIN	0x01	/* Bin span of histogram is variable */
-	    /*
-	    ** ----------------------------------------------------------
-	    **		  Definition of bits in <flags> of SQHM_STATUS response
-	    */
-#define STATUS_FLAGS__PF	0x8000	/* PF  - Power Fail */
-#define STATUS_FLAGS__SWC	0x4000	/* SWC - Status Word Changed */
-#define STATUS_FLAGS__NRL	0x2000	/* NRL - Neutron Rate Low */
-#define STATUS_FLAGS__DAQ	0x1000	/* DAQ on -- set if Hdr Mask Bits are
-				    ** correct so that data acq is active */
-#define STATUS_FLAGS__SYNC3	0x0800	/* Ext Synch Bit #3 */
-#define STATUS_FLAGS__SYNC2	0x0400	/* Ext Synch Bit #2 */
-#define STATUS_FLAGS__SYNC1	0x0200	/* Ext Synch Bit #1 */
-#define STATUS_FLAGS__SYNC0	0x0100	/* Ext Synch Bit #0 */
-#define STATUS_FLAGS__UD	0x0080	/* UD  - Up/Down */
-#define STATUS_FLAGS__GU	0x0040	/* GU  - Gummi (i.e. Strobo) */
-	    /*
-	    ** ----------------------------------------------------------
-	    */
-#define N_HISTS_MAX	64	    /* Maximum number of histograms supported */
-#define N_BINS_MAX	0x00ffff    /* Maximum histogram bin number permitted */
-#define N_TOTAL_BYTES	0x400000    /* Maximum total bytes of histogram */
-/*
-**------------------------------------------------------------------------------
-**				Definitions of Filler states in HRPT mode
-*/
-#define	HRPT__SRCH_FRAME    1
-#define	HRPT__READ_FRAME    2
-/*
-**------------------------------------------------------------------------------
-**				Definitions for the LWL Datagrams
-*/
-#define	LWL_HDR_TYPE_MASK   (0x1f000000)    /* Mask for extracting main dgrm ..
-					    ** .. hdr command-type bits */
-#define	LWL_HDR_PF_MASK	   (0x80000000)	/* Mask for extr Power Fail bit */
-#define	LWL_HDR_SWC_MASK   (0x40000000)	/* Mask for extr Status Word Chng bit */
-#define	LWL_HDR_NRL_MASK   (0x20000000)	/* Mask for extr Neutron Rate Low bit */
-#define LWL_HDR_SYNC3_MASK (0x00800000)	/* Mask for one of ext synch bits */
-#define LWL_HDR_SYNC2_MASK (0x00400000)	/* Mask for one of ext synch bits */
-#define LWL_HDR_SYNC1_MASK (0x00200000)	/* Mask for one of ext synch bits */
-#define LWL_HDR_SYNC0_MASK (0x00100000)	/* Mask for one of ext synch bits */
-#define	LWL_HDR_UD_MASK	   LWL_HDR_SYNC1_MASK /* Mask for Up/Down bit */
-#define	LWL_HDR_GU_MASK	   LWL_HDR_SYNC0_MASK /* Mask for GU bit */
-#define LWL_HDR_BA_MASK	   (0x00f00000)	/* Mask for TSI Binning Addr */
-#define LWL_HDR_TS_MASK	   (0x000fffff)	/* Mask for TSI Time Stamp */
-
-#define	LWL_FIFO_EMPTY	(0x1e000000)	/* FIFO Empty */
-
-#define	LWL_TSI_TR	(0x1f000000)  /* Time-Status-Info Transp-Mode */
-#define	LWL_TSI_HM_NC	(0x1f000000)  /* Time-Status-Info Hist-Mode+No-Coinc */
-#define	LWL_TSI_HM_C	(0x0e000000)  /* Time-Status-Info Hist-Mode+Coinc */
-#define	LWL_TSI_TOF	(0x1f000000)  /* Time-Status-Info TOF-Mode */
-#define	LWL_TSI_SM_NC   (0x1f000000)  /* Time-Status-Info Strobo-Mode+No-Coin */
-#define	LWL_TSI_SM_C	(0x0e000000)  /* Time-Status-Info Strobo-Mode+Coinc */
-#define LWL_TSI_DT_MSK	(0x000fffff)  /* Mask for Dead-Time in TSI */
-#define LWL_TSI_DTS_MSK	(0x000fffff)  /* Mask for Delay-Time-to-Start in TSI */
-
-#define	LWL_TR_C1	(0x00000001)	/* Transp. Mode Chan 1 */
-#define	LWL_TR_C2	(0x00000002)	/* Transp. Mode Chan 2 */
-#define	LWL_TR_C3	(0x00000003)	/* Transp. Mode Chan 3 */
-#define	LWL_TR_C4	(0x00000004)	/* Transp. Mode Chan 4 */
-#define	LWL_TR_C5	(0x00000005)	/* Transp. Mode Chan 5 */
-#define	LWL_TR_C6	(0x00000006)	/* Transp. Mode Chan 6 */
-#define	LWL_TR_C7	(0x00000007)	/* Transp. Mode Chan 7 */
-#define	LWL_TR_C8	(0x00000008)	/* Transp. Mode Chan 8 */
-#define	LWL_TR_C9	(0x00000009)	/* Transp. Mode Chan 9 */
-
-#define	LWL_HM_NC	(0x10000000)	/* Hist-Mode/No-Coinc 0 chan dgrm hdr */
-#define LWL_HM_NC_C1	(0x11000000)	/* Hist-Mode/No-Coinc 1 chan dgrm hdr */
-#define LWL_HM_NC_C2	(0x12000000)	/* Hist-Mode/No-Coinc 2 chan dgrm hdr */
-#define LWL_HM_NC_C3	(0x13000000)	/* Hist-Mode/No-Coinc 3 chan dgrm hdr */
-#define LWL_HM_NC_C4	(0x14000000)	/* Hist-Mode/No-Coinc 4 chan dgrm hdr */
-#define LWL_HM_NC_C5	(0x15000000)	/* Hist-Mode/No-Coinc 5 chan dgrm hdr */
-#define LWL_HM_NC_C6	(0x16000000)	/* Hist-Mode/No-Coinc 6 chan dgrm hdr */
-#define LWL_HM_NC_C7	(0x17000000)	/* Hist-Mode/No-Coinc 7 chan dgrm hdr */
-#define LWL_HM_NC_C8	(0x18000000)	/* Hist-Mode/No-Coinc 8 chan dgrm hdr */
-#define LWL_HM_NC_C9	(0x19000000)	/* Hist-Mode/No-Coinc 9 chan dgrm hdr */
-
-#define	LWL_HM_CO	(0x10000000)	/* Hist-Mode+Coinc 0 chan dgrm hdr */
-#define LWL_HM_CO_C2	(0x12000000)	/* Hist-Mode+Coinc 2 chan dgrm hdr */
-#define LWL_HM_CO_C3	(0x13000000)	/* Hist-Mode+Coinc 3 chan dgrm hdr */
-#define LWL_HM_CO_C4	(0x14000000)	/* Hist-Mode+Coinc 4 chan dgrm hdr */
-#define LWL_HM_CO_C5	(0x15000000)	/* Hist-Mode+Coinc 5 chan dgrm hdr */
-#define LWL_HM_CO_C6	(0x16000000)	/* Hist-Mode+Coinc 6 chan dgrm hdr */
-#define LWL_HM_CO_C7	(0x17000000)	/* Hist-Mode+Coinc 7 chan dgrm hdr */
-#define LWL_HM_CO_C8	(0x18000000)	/* Hist-Mode+Coinc 8 chan dgrm hdr */
-#define LWL_HM_CO_C9	(0x19000000)	/* Hist-Mode+Coinc 9 chan dgrm hdr */
-
-#define LWL_TOF_C1	(0x01000000)	/* TOF-Mode 1 chan dgrm hdr */
-#define LWL_TOF_C2	(0x02000000)	/* TOF-Mode 2 chan dgrm hdr */
-#define LWL_TOF_C3	(0x03000000)	/* TOF-Mode 3 chan dgrm hdr */
-#define LWL_TOF_C4	(0x04000000)	/* TOF-Mode 4 chan dgrm hdr */
-#define LWL_TOF_C5	(0x05000000)	/* TOF-Mode 5 chan dgrm hdr */
-#define LWL_TOF_C6	(0x06000000)	/* TOF-Mode 6 chan dgrm hdr */
-#define LWL_TOF_C7	(0x07000000)	/* TOF-Mode 7 chan dgrm hdr */
-#define LWL_TOF_C8	(0x08000000)	/* TOF-Mode 8 chan dgrm hdr */
-#define LWL_TOF_C9	(0x09000000)	/* TOF-Mode 9 chan dgrm hdr */
-
-#define LWL_PSD_TSI      0x0E000000     /* PSD-Mode TSI datagram */
-#define LWL_PSD_DATA     0x12000000     /* PSD-mode data datagram */ 
-#define LWL_PSD_PWF      0x20000000     /* PSD-mode Power Fail bit */
-#define LWL_PSD_TIME     0x000fffff     /* PSD-mode time stamp extraction
-                                           mask */
-#define LWL_PSD_FLASH_MASK 0x00ff       /* mask for flash count     */
-#define LWL_PSD_XORF       0x2000       /* mask for TDC-XORF bit */
-#define LWL_PSD_CONF       0x0100       /* mask for TDC-CONF flag */
-
-#define	LWL_SM_NC	(0x10000000)  /* Strobo-Mode/No-Coinc 0 chan dgrm hdr */
-#define LWL_SM_NC_C1	(0x11000000)  /* Strobo-Mode/No-Coinc 1 chan dgrm hdr */
-#define LWL_SM_NC_C2	(0x12000000)  /* Strobo-Mode/No-Coinc 2 chan dgrm hdr */
-#define LWL_SM_NC_C3	(0x13000000)  /* Strobo-Mode/No-Coinc 3 chan dgrm hdr */
-#define LWL_SM_NC_C4	(0x14000000)  /* Strobo-Mode/No-Coinc 4 chan dgrm hdr */
-#define LWL_SM_NC_C5	(0x15000000)  /* Strobo-Mode/No-Coinc 5 chan dgrm hdr */
-#define LWL_SM_NC_C6	(0x16000000)  /* Strobo-Mode/No-Coinc 6 chan dgrm hdr */
-#define LWL_SM_NC_C7	(0x17000000)  /* Strobo-Mode/No-Coinc 7 chan dgrm hdr */
-#define LWL_SM_NC_C8	(0x18000000)  /* Strobo-Mode/No-Coinc 8 chan dgrm hdr */
-#define LWL_SM_NC_C9	(0x19000000)  /* Strobo-Mode/No-Coinc 9 chan dgrm hdr */
-
-#define	LWL_SM_CO	(0x10000000)  /* Strobo-Mode + Coinc 0 chan dgrm hdr */
-#define LWL_SM_CO_C1	(0x11000000)  /* Strobo-Mode + Coinc 1 chan dgrm hdr */
-#define LWL_SM_CO_C2	(0x12000000)  /* Strobo-Mode + Coinc 2 chan dgrm hdr */
-#define LWL_SM_CO_C3	(0x13000000)  /* Strobo-Mode + Coinc 3 chan dgrm hdr */
-#define LWL_SM_CO_C4	(0x14000000)  /* Strobo-Mode + Coinc 4 chan dgrm hdr */
-#define LWL_SM_CO_C5	(0x15000000)  /* Strobo-Mode + Coinc 5 chan dgrm hdr */
-#define LWL_SM_CO_C6	(0x16000000)  /* Strobo-Mode + Coinc 6 chan dgrm hdr */
-#define LWL_SM_CO_C7	(0x17000000)  /* Strobo-Mode + Coinc 7 chan dgrm hdr */
-#define LWL_SM_CO_C8	(0x18000000)  /* Strobo-Mode + Coinc 8 chan dgrm hdr */
-#define LWL_SM_CO_C9	(0x19000000)  /* Strobo-Mode + Coinc 9 chan dgrm hdr */
-
-#define LWL_TSI_MODE_MASK   (0x000e)	/* Mask for mode in Time Status Info */
-#define LWL_TSI_MODE_TR     (0x0000)	/* TSI Transparent-Mode */
-#define LWL_TSI_MODE_HM	    (0x0002)	/* TSI Hist-Mode */
-#define LWL_TSI_MODE_TOF    (0x0004)	/* TSI TOF-Mode */
-#define LWL_TSI_MODE_SM1    (0x0006)	/* TSI Strobo-Mode 1 - time-stamp coded */
-#define LWL_TSI_MODE_TR_UD  (0x0008)	/* TSI Transparent-Mode Up-Down */
-#define LWL_TSI_MODE_HM_UD  (0x000a)	/* TSI Hist-Mode Up-Down */
-#define LWL_TSI_MODE_TOF_UD (0x000c)	/* TSI TOF-Mode Up-Down */
-#define LWL_TSI_MODE_SM2    (0x000e)	/* TSI Strobo-Mode 2 - h/w coded */
-/*
-**------------------------------------------------------------------------------
-**				Define structure of a TOF histogram data item.
-*/
-    struct tof_histog {
-      int	cntr_nmbr;	/* Counter number */
-      uint	lo_edge;	/* Low edge of first bin (20-bit value) */
-      uint	hi_edge;	/* Top edge of last  bin (20-bit value) */
-      usint	flag;		/* Bit mask giving info on histog -- may be
-				** used to help optimise the code */
-      usint	bytes_per_bin;	/* Number of bytes in each histogram bin */
-      uint	n_bins;		/* Number of bins in histogram */
-      uint	cnt_early_up;	/* Count of early events (pol'n up) */
-      uint	cnt_late_up;	/* Count of late events (pol'n up) */
-      uint	cnt_early_down;	/* Count of early events (pol'n down) */
-      uint	cnt_late_down;	/* Count of late events (pol'n down) */
-      uint     *bin_edge;	/* Pointer to array of bin edges */
-      union {			/* Pointer to histogram array */
-        uchar	  *b_bin_data;	/*  .. pointer if it's  8-bit bins */
-        usint	  *w_bin_data;	/*  .. pointer if it's 16-bit bins */
-        uint	  *l_bin_data;	/*  .. pointer if it's 32-bit bins */
-      } u;
-    };
-
-/*		Define a TOF 'edge-info' structure. This structure is created
-**		as a result of a TOF 'edge-array' in a SQHM__TOF config cmnd.
-*/
-    struct tof_edge_info {
-      uint	n_bins;		/* Number of bins in histogram */
-      uint	flag;		/* Flag bits defining type of histo */
-      uint	bin_span;	/* Time spanned by a histogram bin (20-bit
-				**  value) if bin width is constant. Otherwise
-				**  it is zero. */
-      uint	hi_edge;	/* Top edge of last  bin (20-bit value) */
-      uint	edges[2];	/* Array of edge data (20-bit values). There
-				**  are actually (n_bins+1) items in the array
-				**  and give the bottom edges of the bin */
-    };
-
-/*		Define structure of a TOF 'edge-array' in SQHM__TOF config cmnd
-*/
-    struct tof_edge_arr {
-      uint	n_bins;		/* Number of bins in histogram */
-      uint	flag;		/* Flag (0/1) for fixed/variable bin size */
-      uint	*edges;	/* Array of bottom edges (20-bit values) */
-    };
-
-/*		Define structure of a TOF 'bank' in SQHM__TOF config command
-*/
-    struct tof_bank {
-      usint	first;		/* Number of first counter in bank */
-      usint	n_cntrs;	/* Number of counters in bank */
-      usint	edge_indx;	/* Index of edge array */
-      usint	bytes_per_bin;	/* Number of bytes per bin */
-    };
-/*
-**------------------------------------------------------------------------------
-**				Define command structure.
-*/
-    struct req_buff_struct {			/* For messages to SinqHM */
-      uint		bigend;
-      uint		cmnd;
-      union {
-        char		filler[56];
-
-	struct {uint	max_pkt,
-			strt_mode;}	cnct;
-
-	struct {uint     mode;
-	  union {
-	    struct {
-	      uint   n_buffs;
-	      uint   n_bytes;
-	    } trans;
-	    struct {
-	      uint   n_hists;
-	      uint   lo_bin;
-	      uint   num_bins;
-	      uint   bytes_per_bin;
-	      uint   compress;
-	    } hm_dig;
-	    struct {
-	      uint	n_extra_bytes;
-	      usint	n_edges;
-	      usint	n_banks;
-	      uint	preset_delay;
-	      struct tof_edge_arr   edge_0;
-	      struct tof_bank	    bank_0;
-	    } tof;
-	    struct {
-	      uint	n_extra_bytes;
-	      usint	n_edges;
-	      usint	n_banks;
-	      uint	preset_delay;
-              usint       xFactor;
-              usint       yFactor;
-              usint       xOffset;
-              usint       yOffset;
-              usint       xSize;
-              usint       ySize;
-	      struct tof_edge_arr   edge_0;
-	      struct tof_bank	    bank_0;
-	    } psd;
-	  } u;
-	}				cnfg;
-
-	struct {uint	mask;}		dbg;
-
-	struct {uint	sub_code;}	decnfg;
-
-	struct {uint	sub_cmnd;}	daq;
-
-	struct {uint	sub_code, 
-			x_lo,
-			nx,
-			y_lo,
-			ny,
-			xdim,
-			nhist;}		project;
-
-	struct {uint	hist_no,
-			first_bin,
-			n_bins;}	read;
-
-	struct {uint	hist_no;}	select;
-
-	struct {uint	hist_no,
-			first_bin,
-			n_bins,
-			bytes_per_bin;}	write;
-
-	struct {uint	hist_no,
-			first_bin,
-			n_bins;}	zero;
-      } u;
-    };
-/*
-**------------------------------------------------------------------------------
-**				Define status response structure.
-*/
-    struct rply_buff_struct {	    /* For messages from SinqHM */
-      uint		bigend;
-      uint		status;
-      uint		sub_status;
-      union {
-        char		    message[52];
-
-	struct {uint	    port;
-		uint	    pkt_size;
-		uint	    hm_mode;
-		uint	    n_hists;
-		uint	    num_bins;
-		uint	    bytes_per_bin;
-		uint	    curr_hist;
-		uint	    max_block;
-		uint	    total_bytes;
-		uint	    lo_cntr;
-		uint	    lo_bin;
-		uint	    compress;
-		uint	    up_time;}		cnct;
-
-	struct {usint   daq_now;
-		usint   daq_was;
-		usint   filler_mask;
-		usint   server_mask;}	daq;
-
-	struct {uint	n_extra_bytes;
-		uint	up_time;
-		usint	offset_vxWorks_ident;
-		usint	offset_vxWorks_date;
-		usint	offset_instr;
-		usint	offset_def_ident;
-		usint	offset_sinqhm_main_ident;
-		usint	offset_sinqhm_main_date;
-		usint	offset_sinqhm_server_ident;
-		usint	offset_sinqhm_server_date;
-		usint	offset_sinqhm_filler_ident;
-		usint	offset_sinqhm_filler_date;
-		usint	offset_sinqhm_routines_ident;
-		usint	offset_sinqhm_routines_date;}	ident;
-
-	struct {uint	    n_bins;
-		uint	    bytes_per_bin;
-		uint	    cnts_lo;
-		uint	    cnts_hi;}		project;
-
-	struct {uint	    first_bin;
-		uint	    n_bins;
-		uint	    bytes_per_bin;
-		uint	    cnts_lo;
-		uint	    cnts_hi;}		read;
-
-	struct {uint	    cfg_state;
-		usint	    n_hists, curr_hist;
-		uint	    num_bins;
-		uint	    max_n_hists;
-		uint	    max_num_bins;
-		uchar	    max_srvrs, act_srvrs, bytes_per_bin, compress;
-		usint	    daq_now, filler_mask;
-		uint	    max_block;
-		usint	    tsi_status, flags;
-		union {
-		  uint	    dead_time;
-		  uint	    dts;
-		  uint	    both;
-			}   dt_or_dts;
-		uint	    num_bad_events;
-		uint	    up_time;}		status;
-      } u;
-    };
-/*
-**------------------------------------------------------------------------------
-**				Define structure of message to SinqHM-filler.
-*/
-    struct msg_to_filler_struct {	/* For messages to SinqHM-filler */
-      union {
-        char		    message[32];   /* Ensure buffer is 32 bytes total */
-	struct {
-	    uint	cmnd;
-	    uint	index;
-	    usint	new_mask;} uu;
-      } u;
-    };
-/*======================================================= End of SinqHM_def.h */
diff --git a/hardsup/stredit.c b/hardsup/stredit.c
deleted file mode 100644
index 27b61c4e..00000000
--- a/hardsup/stredit.c
+++ /dev/null
@@ -1,415 +0,0 @@
-#define	    ident	"1B03"
-#ifdef VAXC
-#module	    StrEdit	ident
-#endif
-#ifdef __DECC
-#pragma	    module	    StrEdit	ident
-#endif
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     Department ASQ				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...LIB.SINQ]StrEdit.C
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Jan 1996
-**
-**  To compile this module, use:
-
-	$ import tasmad
-	$ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-	$ cc /debug /noopt /obj=[]StrEdit -
-			tasmad_disk:[mad.lib.sinq]StrEdit +
-			sinq_c_tlb/lib
-
-**  To include this module in SINQ.OLB, use:
-
-  $ import tasmad
-  $ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-  $
-  $ define/group sinq_olb mad_lib:sinq_dbg.olb
-  $ @tasmad_disk:[mad.lib.sinq]sinq_olb StrEdit debug
-  $
-  $ define/group sinq_olb mad_lib:sinq.olb
-  $ @tasmad_disk:[mad.lib.sinq]sinq_olb StrEdit
-**
-** Updates:
-**  1A01 19-Jan-1996 DM.	Initial version.
-**  1B01 21-Mar-1996 DM.	Move from DELTAT.OLB to SINQ.OLB.
-**============================================================================
-** The following entry points are included in this module:
-**
-**-------------------------------------------------------------------------
-**    #include <sinq_prototypes.h>
-**
-**    char *StrEdit (char *out, char *in, char *ctrl, int *ln)
-**	    -------
-**  Input Args:
-**	in	    - the string to be edited.
-**	ctrl	    - the string specifying what is to be done. See Description
-**			below.
-**  Output Args:
-**	out	    - the edited string. The maximum size of this string must
-**			be specified as input parameter *ln. The string
-**			will be zero terminated on return.
-**  Modified Args:
-**	*ln	    - an integer specifying, on input, the length of "out" in
-**		      bytes. This must include room for the zero termination.
-**		      On return, ln will be set to the number of characters
-**		      copied to "out" (not counting the zero termination byte).
-**  Return value:
-**	If an error is detected, the return value is a NULL pointer. Otherwise
-**	it is a pointer to the resulting string (i.e. "out").
-**  Global variables:
-**	none
-**  Routines called:
-**	none
-**  Description:
-**    StrEdit (out, in, ctrl, ln)  - This routine is intended to mimic the
-**		OpenVMS DCL lexical function F$EDIT.
-**
-**		It first processes the string "in" to convert any C-style
-**		escape sequences introduced by a '\' character. Recognised
-**		escape sequences are:
-**		    \a    --> \007 BEL
-**		    \b    --> \010 BS  (backspace)
-**		    \f    --> \014 FF  (formfeed)
-**		    \n    --> \012 LF  (linefeed)
-**		    \r    --> \015 CR  (carriage return)
-**		    \t    --> \011 HT  (horizontal tab)
-**		    \v    --> \013 VT  (vertical tab)
-**		    \\    --> \
-**		    \'    --> '
-**		    \"    --> "
-**		    \?    --> ?
-**		    \xhh  --> hh are an arbitrary number of hex digits.
-**		    \nnn  --> nnn are up to 3 octal digits.
-**		Any unrecognised escape sequence will be left unchanged.
-**
-**		The resulting string is then edited according to the
-**		keywords specified in the control string "ctrl". The result
-**		will be written to string "out". The "out" argument may be
-**		the same as "in".
-**
-**		On entry, "ln" specifies the size of "out" in bytes, including
-**		space for a null terminating byte. On return, it is set to the
-**		length of the result (not counting the zero-terminator).
-**
-**		The following control strings are recognised:
-**
-**		    COLLAPSE	- Removes all spaces and tabs from the string.
-**		    COMPRESS	- Replaces multiple spaces and tabs with a
-**				    single space.
-**		    LOWERCASE	- Makes the string lower case.
-**		    TRIM	- Removes leading and trailing spaces and tabs
-**				    from the string.
-**		    UNCOMMENT	- Removes comments from the string.
-**		    UPCASE	- Makes the string upper case.
-**
-**		All keywords must be specified in full. They may be separated
-**		by white-space or commas and be in upper or lower case.
-**
-**		If the input string contains non-escaped double quotes ("),
-**		then the editing functions are not applied to substrings within
-**		these quotes ("), there must be an even number of such quotes
-**		and the quotes are not copied to the resulting string. On the
-**		other hand, escaped double quotes (\") are treated as normal
-**		characters.
-**
-**  Return Status:
-**   StrEdit returns a pointer to "out". If any errors are detected (e.g. an
-**   odd number of quotes), string editing is abandoned and a null pointer
-**   is returned.
-**
-**  Example:
-**	    strcpy (in, "   asdfg    \"hello   there\"  folks   ");
-**	    len = sizeof (in);
-**	    printf ("\"%s\"\n", StrEdit (in, in, "trim upcase compress", &len));
-**   will generate
-**          "ASDFG hello   there FOLKS"
-**-------------------------------------------------------------------------
-**			Global Definitions
-*/
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <ctype.h>
-#include    <string.h>
-#include    <sinq_prototypes.h>
-
-#define NIL	'\0'
-#define	True	1
-#define	False	0
-#define QUOTE	((char) (('\"' ^ 0xff) & 0xff))
-/*
-**====================================================================
-*/
-/*
-**====================================================================
-*/
-/*--------------------------------------------------------------------------
-**			Global Variables
-*/
-/*
-**---------------------------------------------------------------------------
-**		StrEdit	- edit a string.
-**			    Note: strncat is used exclusively rather than
-**				  strncpy to be sure result is always
-**				  null terminated.
-*/
-  char	*StrEdit (
-/*	 =======
-*/		    char    *out,
-		    char    *in,
-		    char    *ctrl,
-		    int	    *ln) {
-
-    int	    i, j, k, l, m, len, inxt, out_size;
-    char    my_ctrl[80];
-    char    *tok_nxt, *my_in, *my_out, *my_tmp, *nxt;
-    int	    do_collapse,  do_compress, do_lowercase, do_trim;
-    int	    do_uncomment, do_upcase;
-
-    out_size = *ln;
-    if (out_size < 1) {*ln = 0; return NULL;}	/* Can't do anything!! */
-
-    if (strlen (in) <= 0) {
-      *out = NIL; *ln = 0; return out;	/* Nothing to do!! */
-    }
-	/*
-	** Scan ctrl looking to see what has to be done. Do this by first
-	** taking a copy of it (in case it is declared "const" in the calling
-	** routine, convert to lowercase and split into tokens at any space,
-	** tab or comma.
-	*/
-    len = strlen (ctrl);
-    if (len >= sizeof (my_ctrl)) {
-      *out = NIL; *ln = 0; return NULL;
-    }
-    for (i = 0; i <= len; i++) my_ctrl[i] = tolower (ctrl[i]);
-
-    do_collapse = do_compress = do_lowercase = do_trim = do_uncomment =
-		    do_upcase = False;
-    tok_nxt = strtok (my_ctrl, ", \t\f\v\n");
-    while (tok_nxt != NULL) {
-      if (strcmp (tok_nxt, "collapse") == 0) {
-	do_collapse  = True;
-      }else if (strcmp (tok_nxt, "compress") == 0) {
-	do_compress  = True;
-      }else if (strcmp (tok_nxt, "lowercase") == 0) {
-	do_lowercase = True;
-      }else if (strcmp (tok_nxt, "trim") == 0) {
-	do_trim	     = True;
-      }else if (strcmp (tok_nxt, "uncomment") == 0) {
-	do_uncomment = True;
-      }else if (strcmp (tok_nxt, "upcase") == 0) {
-	do_upcase    = True;
-      }else {
-	*out = NIL; *ln = 0; return NULL;	    /* Illegal ctrl verb */
-      }
-      tok_nxt = strtok (NULL, ", \t\f\v\n");
-    }
-
-    len = strlen (in) + 1;
-    my_in = malloc (len);	    /* Get some working space */
-    if (my_in == NULL) {
-      *out = NIL; *ln = 0; return NULL;
-    }
-	/*
-	** Copy "in" to the "my_in" working space, processing any '\' escape
-	** sequences as we go. Note that, since "my_in" is big enough to hold
-	** "in" and the escape sequence processing can only shorten the length
-	** of "in", there's no need to check for an overflow of "my_in". Any
-	** non-escaped double quotes are converted to something special so
-	** that they can be recognised at the editing stage.
-	*/
-    nxt = my_in;
-    while (*in != '\0') {
-      if (*in == '\\') {		/* Look for escape sequence */
-        in++;
-	switch (*in) {
-	 case 'a':  case 'A': *nxt++ = '\007'; in++; break;
-	 case 'b':  case 'B': *nxt++ = '\010'; in++; break;
-	 case 'f':  case 'F': *nxt++ = '\014'; in++; break;
-	 case 'n':  case 'N': *nxt++ = '\012'; in++; break;
-	 case 'r':  case 'R': *nxt++ = '\015'; in++; break;
-	 case 't':  case 'T': *nxt++ = '\011'; in++; break;
-	 case 'v':  case 'V': *nxt++ = '\013'; in++; break;
-	 case '\\': *nxt++ = '\\'; in++; break;
-	 case '\'': *nxt++ = '\''; in++; break;
-	 case '\"': *nxt++ = '\"'; in++; break;
-	 case '\?': *nxt++ = '\?'; in++; break;
-	 case 'x': case 'X':
-	    in++;
-	    i = strspn (in, "0123456789abcdefABCDEF");
-	    if (i > 0) {
-	      *nxt++ = strtol (in, &in, 16); break;
-	    }else {
-	      *nxt++ = '\\'; break;
-	    }
-	 case '0':          
-	 case '1':
-	 case '2':
-	 case '3':
-	 case '4':
-	 case '5':
-	 case '6':
-	 case '7': 
-	    i = strspn (in, "01234567");
-	    if (i > 3) {
-	      sscanf (in, "%3o", &j);
-	      *nxt++ = j;
-	      in += 3;
-	      break;
-	    }else if (i > 0) {
-	      sscanf (in, "%o", &j);
-	      *nxt++ = j;
-	      in += i;
-	      break;
-	    }else {
-	      *nxt++ = '\\'; 
-	      break;
-	    }
-	 default:
-	    *nxt++ = '\\';	/* Invalid esc sequ - just copy it */
-	}
-      }else if (*in == '\"') {		/* Look for non-escaped double quotes */
-	*nxt++ = QUOTE; *in++;		/* Make it something unlikely */
-      }else {
-	*nxt++ = *in++;
-      }
-    }
-    *nxt = '\0';
-
-    my_out = malloc (len);	    /* Get some working space */
-    if (my_out == NULL) {
-      free (my_in); *out = NIL; *ln = 0; return NULL;
-    }
-    *my_out = NIL;
-
-    my_tmp = malloc (len);	    /* Get some working space */
-    if (my_tmp == NULL) {
-      free (my_out); free (my_in);
-      *out = NIL; *ln = 0; return NULL;
-    }
-    *my_tmp = NIL;
-    *out = NIL;
-	/*
-	** Ensure "in" has an even number of non-escaped quotes. Return if not.
-	*/
-    i = 0;
-    for (j = 0; my_in[j] != NIL; j++) if (my_in[j] == QUOTE) i++;
-    if ((i & 1) == 1) {
-      free (my_tmp);
-      free (my_out);
-      free (my_in);
-      *ln = strlen (out);
-      return NULL;
-    }
-	/*
-	** Scan through "in", substring by substring, to
-	** handle quotation marks correctly.
-	*/
-    inxt = 0;
-    while (my_in[inxt] != NIL) {
-      if (my_in[inxt] == QUOTE) {	    /* Is there a quoted string next? */
-	nxt = strchr (&my_in[inxt+1], QUOTE);   /* Yes, find matching quote. */
-        j = nxt - &my_in[inxt+1];
-	memcpy (my_tmp, &my_in[inxt+1], j);  /* Make copy of it */
-	my_tmp[j] = NIL;
-	inxt = inxt + j + 2;
-      }else {
-	nxt = strchr (&my_in[inxt], QUOTE);	/* Not a quoted string; ..
-						** .. find next non-escaped ..
-						** .. quote.
-						*/
-        if (nxt != NULL) {
-	  j = nxt - my_in - inxt;
-	}else {
-	  j = strlen (&my_in[inxt]);
-	}
-	memcpy (my_tmp, &my_in[inxt], j);   /* Make copy for us to work on */
-	my_tmp[j] = NIL;
-	inxt = inxt + j;
-	    /*
-	    ** For collapse and compress, start by turning all white space
-	    ** chars to spaces.
-	    */
-	if (do_collapse || do_compress) {
-	  for (k = 0; my_tmp[k] != NIL; k++) {
-	    if (my_tmp[k] == '\t') my_tmp[k] = ' ';
-	    if (my_tmp[k] == '\f') my_tmp[k] = ' ';
-	    if (my_tmp[k] == '\v') my_tmp[k] = ' ';
-	    if (my_tmp[k] == '\n') my_tmp[k] = ' ';
-	  }
-	  if (do_collapse) {
-	    l = 0;
-	    for (k = 0; my_tmp[k] != NIL; k++) {
-	      if (my_tmp[k] != ' ') {
-		my_tmp[l] = my_tmp[k];
-		l++;
-	      }
-	    }
-	    my_tmp[l] = NIL;
-	  }else if (do_compress) {
-	    for (k = 0; my_tmp[k] != NIL; k++) {
-	      if (my_tmp[k] == ' ') {
-		l = strspn (&my_tmp[k], " ");
-		if (l > 1) {
-		  for (m = 0; my_tmp[k+l+m] != NIL; m++) {
-		    my_tmp[k+m+1] = my_tmp[k+l+m];
-		  }
-		  my_tmp[k+m+1] = NIL;
-		}
-	      }
-	    }
-	  }
-	}
-	if (do_lowercase) {
-	  for (k = 0; my_tmp[k] != NIL; k++) my_tmp[k] = _tolower (my_tmp[k]);
-	}
-	if (do_upcase) {
-	  for (k = 0; my_tmp[k] != NIL; k++) my_tmp[k] = _toupper (my_tmp[k]);
-	}
-	if (do_uncomment) {
-	  nxt = strchr (my_tmp, '!');
-	  if (nxt != NULL) {
-	    *nxt = NIL;		    /* Truncate the string at the "!" */
-	    my_in[inxt] = NIL;	    /* Stop processing loop too */
-	  }
-	}
-      }
-      StrJoin (out, out_size, my_out, my_tmp);
-      strcpy (my_out, out);
-    }
-
-    if (do_trim) {
-      i = strspn (my_out, " ");
-      if (i == strlen (my_out)) {   /* If all spaces, result is a null string */
-        *out = NIL;
-      }else {
-        for (j = strlen (my_out); my_out[j-1] == ' '; j--);
-	my_out[j] = NIL;
-      }
-      strcpy (out, &my_out[i]);
-    }
-    free (my_tmp);
-    free (my_out);
-    free (my_in);
-    *ln = strlen (out);
-	/*
-	** Undo any encoded escape characters.
-	*/
-    for (i = 0; out[i] != NIL; i++) {
-      if (out[i] == ~'\"') out[i] = '\"';
-    }
-
-    return out;
-  }
-/*-------------------------------------------------- End of StrEdit.C -------*/
diff --git a/hardsup/strjoin.c b/hardsup/strjoin.c
deleted file mode 100644
index 88a8b721..00000000
--- a/hardsup/strjoin.c
+++ /dev/null
@@ -1,142 +0,0 @@
-#define	    ident	"1B03"
-#ifdef VAXC
-#module	    StrJoin	ident
-#endif
-#ifdef __DECC
-#pragma	    module	    StrJoin	ident
-#endif
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     Department ASQ				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...LIB.SINQ]STRJOIN.C
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Nov 1995
-**
-**  To compile this module, use:
-
-	$ import tasmad
-	$ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-	$ cc /debug /noopt /obj=[]StrEdit -
-			tasmad_disk:[mad.lib.sinq]StrEdit +
-			sinq_c_tlb/lib
-
-**  To include this module in SINQ.OLB, use:
-
-  $ import tasmad
-  $ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-  $
-  $ define/group sinq_olb mad_lib:sinq_dbg.olb
-  $ @tasmad_disk:[mad.lib.sinq]sinq_olb StrEdit debug
-  $
-  $ define/group sinq_olb mad_lib:sinq.olb
-  $ @tasmad_disk:[mad.lib.sinq]sinq_olb StrEdit
-**
-** Updates:
-**  1A01  2-Nov-1995 DM.	Initial version.
-**  1B01 21-Mar-1996 DM.	Move from DELTAT.OLB to SINQ.OLB.
-**  1B03 28-May-1997 DM.	Allow result string to be either of source
-**				 strings.
-**============================================================================
-** The following entry points are included in this module:
-**
-**-------------------------------------------------------------------------
-**    #include <sinq_prototypes.h>
-**
-**    char *StrJoin (&result, result_size, &str_a, &str_b)
-**	    -------
-**  Input Args:
-**	int   result_size   - max size of "result". The resultant string will
-**				have a max length of (result_size - 1) to allow
-**				for the zero terminator
-**	char *str_a	    - Pointer to first  string to be joined.
-**	char *str_b	    - Pointer to second string to be joined.
-**  Output Args:
-**	char *result	    - Pointer to resulting string.
-**  Modified Args:
-**	none
-**  Return value:
-**	Pointer to resulting string.
-**  Global variables modified:
-**	none
-**  Routines called:
-**	None
-**  Description:
-**	The routine joins 2 strings, checking for total string length and
-**	ensuring the result will be zero terminated. The "result" arg may be
-**	the same as "str_a" or "str_b".
-**-------------------------------------------------------------------------
-**			Global Definitions
-*/
-#include    <string.h>
-
-#define	    NIL	    '\0'
-/*
-**====================================================================
-*/
-/*
-**====================================================================
-**		StrJoin	- join 2 strings.
-**			    Note: strncat is used exclusively rather than
-**				  strncpy to be sure result is always
-**				  null terminated.
-*/
-  char	*StrJoin (
-/*	 =======
-*/		    char    *result,
-		    int	    result_size,
-		    char    *str_a,
-		    char    *str_b) {
-
-    int	    i, size, size_a, size_b;
-
-    size = result_size - 1;
-
-    if (size < 0) return result;
-
-    if (result == str_a) {		/* Are the result and str_a the same? */
-      size_a = strlen (str_a);		/* Yes */
-      if (size_a > size) {		/* Check sizes anyway. */
-	result[size] = NIL;		/* Truncate str_a. No room for str_b! */
-      }else {
-	size = size - strlen (result);	/* And append str_b */
-	if (size > 0) {
-	  strncat (result, str_b, size);
-	}
-      }
-    }else if (result == str_b) {	/* Are the result and str_b the same? */
-      size_a = strlen (str_a);		/* Yes, this is a bit complicated! */
-      size_b = strlen (str_b);
-      if (size_a >= size) {	    /* If str_a completely fills result, .. */
-	result[0] = NIL;	    /* .. then just copy in str_a */
-	strncat (result, str_a, size);
-      }else {
-			    /*
-			    ** Otherwise, str_b must first be moved to
-			    ** make room for str_a and then str_a must
-			    ** be put at the front of the result.
-			    */
-	if ((size_a + size_b) > size) size_b = size - size_a;
-	result[size_a+size_b] = NIL;
-	for (i = (size_b-1); i >= 0; i--) {
-	  result[size_a+i] = str_b[i];
-	}
-	memcpy (result, str_a, size_a);
-      }
-    }else {			   /* Result is neither str_a nor str_b so .. */
-      result[0] = NIL;			/* .. str_a needs to be copied */
-      strncat (result, str_a, size);
-      size = size - strlen (result);		    /* And str_a appended */
-      if (size > 0) strncat (result, str_b, size);
-    }
-    return result;
-  }
-/*-------------------------------------------------- End of STRJOIN.C =======*/
diff --git a/hardsup/table.c b/hardsup/table.c
deleted file mode 100644
index 41e1b9c0..00000000
--- a/hardsup/table.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*-------------------------------------------------------------------------
-    Implementation file for translation table.
-    
-    Mark Koennecke, October 1997
-  
-    copyright: see copyright.h
----------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include "table.h"
-
-/*-------------------------------------------------------------------------*/
-   typedef struct __SicsTable {
-                               float *fVal1;
-                               float *fVal2;
-                               int iLength;
-                              } STable;
-/*-------------------------------------------------------------------------*/    
-  pSTable CreateTable(FILE *fd)
-  {
-    pSTable pNew = NULL;
-    long lStart, lEnd, lData, i;
-    char *pBuffer = NULL, *pEnd = NULL, *pEndLine, *pPtr;
-    int iLength, iRet;
-    float fVal1, fVal2;
-    
-    assert(fd);
-    
-    /* find length of file, create a buffer and read it in */
-    lStart = ftell(fd);
-    fseek(fd,0L,SEEK_END);
-    lEnd = ftell(fd);
-    lData = lEnd - lStart;
-    pBuffer = (char *)malloc(lData*sizeof(char));
-    if(!pBuffer)
-    {
-     return NULL;
-    }
-    fseek(fd,lStart,SEEK_SET);
-    fread(pBuffer,sizeof(char),lData,fd);
-    
-    /* find number of lines */
-    for(i = 0, iLength = 0; i < lData; i++)
-    {
-       if(pBuffer[i] == '\n')
-       {
-         iLength++;
-       }
-    } 
-    
-    /* allocate the table structure */
-    pNew = (pSTable)malloc(sizeof(STable));
-    if(!pNew)
-    {
-      free(pBuffer);
-      return NULL;
-    }
-    pNew->iLength = iLength;
-    pNew->fVal1 = (float *)malloc(sizeof(float)*iLength);
-    pNew->fVal2 = (float *)malloc(sizeof(float)*iLength);
-    if( (!pNew->fVal1) || (!pNew->fVal2))
-    {
-      free(pBuffer);
-      free(pNew);
-      return NULL;
-    }
-    memset(pNew->fVal1,0,iLength*sizeof(float));
-    memset(pNew->fVal2,0,iLength*sizeof(float));
-    
-    /* dodge through the file reading pairs until end */
-    pPtr = pBuffer;
-    pEnd =  pBuffer + lData;
-    pEndLine = pBuffer;
-    i = 0;
-    while(pEndLine < pEnd)
-    {
-      if(*pEndLine == '\n')
-      {
-        *pEndLine = '\0';
-        iRet = sscanf(pPtr,"%f %f",&fVal1, &fVal2);
-        if(iRet == 2)
-        {
-          pNew->fVal1[i] = fVal1;
-          pNew->fVal2[i] = fVal2;
-          i++;
-        }
-        pEndLine++;
-        pPtr = pEndLine;
-      }
-      else
-      {
-        pEndLine++;
-      }
-    }
-    
-    free(pBuffer);
-    return pNew;
-  }
-/*--------------------------------------------------------------------------*/
-   void DeleteTable(pSTable self)
-   {
-     if(self->fVal1)
-     {
-       free(self->fVal1);
-     }
-     if(self->fVal2)
-     {
-       free(self->fVal2);
-     }
-     free(self);
-   }  
-/*--------------------------------------------------------------------------*/
-   int InterpolateVal1(pSTable self, float fKey, float *fResult)
-   {
-     float fFrac;
-     int i1,i;
-     
-     assert(self);
-     assert(self->fVal1);
-     assert(self->fVal2);
-     
-     /* search the entry point */
-     for(i = 0; i < self->iLength; i++)
-     {
-       if(self->fVal1[i] >= fKey)
-       {
-         i1 = i;
-         break;
-       }
-     }
-     if(i1 >= self->iLength)
-     {
-       return 0;
-     }
-
-     /* interpolate */
-     fFrac = (fKey - self->fVal1[i1 -1]) 
-             / (self->fVal1[i1] - self->fVal1[i1 - 1]);
-     *fResult = self->fVal2[i1-1] 
-                + fFrac*(self->fVal2[i1] - self->fVal2[i1 -1]);    
-     return 1;           
-   }   
-/*---------------------------------------------------------------------------*/
-   int InterpolateVal2(pSTable self, float fKey, float *fResult)
-   {
-     float fFrac;
-     int i1,i;
-     
-     assert(self);
-     assert(self->fVal1);
-     assert(self->fVal2);
-     
-     /* search the entry point */
-     for(i = 0; i < self->iLength; i++)
-     {
-       if(self->fVal2[i] <= fKey)
-       {
-         i1 = i;
-         break;
-       }
-     }
-     if(i1 >= self->iLength)
-     {
-       return 0;
-     }
-
-     /* interpolate */
-     fFrac = (fKey - self->fVal2[i1 -1]) 
-             / (self->fVal2[i1] - self->fVal2[i1 - 1]);
-     *fResult = self->fVal1[i1-1] 
-                + fFrac*(self->fVal1[i1] - self->fVal1[i1 -1]);    
-     return 1;           
-   }   
-   
diff --git a/hardsup/table.h b/hardsup/table.h
deleted file mode 100644
index 7d98b299..00000000
--- a/hardsup/table.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*---------------------------------------------------------------------------
-  A general purpose translation table and interpolation module.
-  Interpolation tables are read from a file, which is meant to
-  contain pairs of val1 val2 per line. 
-  
-  
-  Mark Koennecke, October 1997
-  
-  copyright: see copyright.h
-
------------------------------------------------------------------------------*/  
-#ifndef SICSTABLE
-#define SICSTABLE
-  typedef struct __SicsTable *pSTable;
-  
-/*------------------------- live & death ----------------------------------*/
-    pSTable CreateTable(FILE *fd);
-    /* 
-       creates a new table from a given file. The file is meant to have 
-       been positioned to the first entry for the table in the file. 
-       This leaves the caller free to examine a header, if any.
-    */    
-    void    DeleteTable(pSTable self);
-/*------------------------- Interpolation --------------------------------*/
-   int InterpolateVal1(pSTable pTable, float fKey, float *fResult);
-   /*
-      Returns a result from the second column for a key from the
-      first column.
-    */      
-   int InterpolateVal2(pSTable pTable, float fKey, float *fResult);    
-   /*
-      Returns a result from the first column for a key from the
-      second column.
-    */      
-#endif 
diff --git a/hardsup/velsel_def.h b/hardsup/velsel_def.h
deleted file mode 100644
index 276eb65b..00000000
--- a/hardsup/velsel_def.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef	    _velsel_def_
-#define	    _velsel_def_
-/*------------------------------------------------ VelSel_DEF.H Ident V01B
-*/
-#include    <asynsrv_def.h>
-#include    <rs232c_def.h>
-
-#ifndef OffsetOf
-#define OffsetOf(type, identifier)  ((size_t)(&((type*) NULL)->identifier))
-#endif
-
-enum	VelSel_Errors	  {VELSEL__BAD_TMO	 = -1,
-			   VELSEL__BAD_CMD	 = -3,
-			   VELSEL__BAD_OFL	 = -4,
-			   VELSEL__BAD_ILLG	 = -5,
-			   VELSEL__BAD_HOST	 = -6,
-			   VELSEL__BAD_SOCKET	 = -7,
-			   VELSEL__BAD_BIND	 = -8,
-			   VELSEL__BAD_CONNECT	 = -9,
-			   VELSEL__BAD_DEV	 = -10,
-			   VELSEL__BAD_MALLOC	 = -11,
-			   VELSEL__BAD_SENDLEN    = -12,
-			   VELSEL__BAD_SEND	 = -13,
-			   VELSEL__BAD_SEND_PIPE  = -14,
-			   VELSEL__BAD_SEND_NET   = -15,
-			   VELSEL__BAD_SEND_UNKN  = -16,
-			   VELSEL__BAD_RECV       = -17,
-			   VELSEL__BAD_RECV_PIPE  = -18,
-			   VELSEL__BAD_RECV_NET   = -19,
-			   VELSEL__BAD_RECV_UNKN  = -20,
-			   VELSEL__BAD_NOT_BCD    = -21,
-			   VELSEL__BAD_RECVLEN    = -22,
-			   VELSEL__BAD_FLUSH      = -23,
-			   VELSEL__BAD_RECV1      = -24,
-			   VELSEL__BAD_RECV1_PIPE = -25,
-			   VELSEL__BAD_RECV1_NET  = -26,
-			   VELSEL__BAD_PAR	 = -29,
-			   VELSEL__BAD_BSY	 = -30,
-			   VELSEL__BAD_OPEN	 = -31,
-			   VELSEL__FORCED_CLOSED	 = -32,
-			   VELSEL__BAD_STP	 = -33,
-			   VELSEL__NOT_OPEN	 = -35,
-			   VELSEL__BAD_ASYNSRV	 = -36,
-			   VELSEL__BAD_REPLY	 = -34};
-/*
-**	Structure to which the VelSel_Open handle points.
-*/
-  struct VelSel_info {
-	struct AsynSrv__info	asyn_info; /* Contains skt, host, port & chan */
-	int			tmo;
-	char			eot[4];
-	int			msg_id;
-	int			n_replies, max_replies;
-	struct RS__MsgStruct    to_host;
-	struct RS__RespStruct   from_host;
-  };
-/*------------------------------------------------ End of VelSel_DEF.H --*/
-#endif		/* _velsel_def_ */
diff --git a/hardsup/velsel_utility.c b/hardsup/velsel_utility.c
deleted file mode 100644
index 3b277b00..00000000
--- a/hardsup/velsel_utility.c
+++ /dev/null
@@ -1,928 +0,0 @@
-#define	    ident	"1A01"
-#ifdef VAXC
-#module	    VelSel_Utility	ident
-#endif
-#ifdef __DECC
-#pragma	    module	    VelSel_Utility	ident
-#endif
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     Department ASQ				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...LIB.SINQ]VelSel_Utility.C
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : June 1997
-**
-**  To compile this module, use:
-
-	$ import tasmad
-	$ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-	$ cc /debug /noopt /obj=[]VelSel_Utility -
-			tasmad_disk:[mad.psi.lib.sinq]VelSel_Utility + -
-			sinq_c_tlb/lib
-
-**  To include this module in SINQ.OLB, use:
-
-  $ import tasmad
-  $ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-  $
-  $ define/group sinq_olb mad_lib:sinq_dbg.olb
-  $ @tasmad_disk:[mad.lib.sinq]sinq_olb VelSel_Utility debug
-  $
-  $ define/group sinq_olb mad_lib:sinq.olb
-  $ @tasmad_disk:[mad.lib.sinq]sinq_olb VelSel_Utility
-**
-** Updates:
-**  1A01 13-Jun-1997 DM.	Initial version.
-**============================================================================
-** The entry points included in this module are described below. Prototypes
-** can be defined via:
-**
-**    #include <sinq_prototypes.h>
-**
-**	VelSel_Close	    - Close a connection to a Velocity Selector.
-**	VelSel_Config	    - Configure a connection to a Velocity Selector.
-**	VelSel_ErrInfo	    - Return detailed status from last operation.
-**	VelSel_GetReply	    - Get next reply from a reply buffer.
-**	VelSel_GetStatus    - Get "???" response.
-**	VelSel_Open	    - Open a connection to a Velocity Selector.
-**	VelSel_SendCmnds    - Send commands to RS232C server.
-**---------------------------------------------------------------------
-**    int VelSel_Close (&handle, int force_flag)
-**	  ------------
-**  Input Args:
-**	int    force_flag - if non-zero, all connections using the same socket
-**			    will also be closed (this gets AsynSrv_Close to
-**			    actually close the socket and is needed for error
-**			    recovery operations).
-**  Output Args:
-**	none
-**  Modified Args:
-**	void **handle	- The pointer to the structure returned by VelSel_Open.
-**			  On return, the pointer is set to NULL.
-**  Return status:
-**	True always (error returns from close and free are not checked).
-**  Routines called:
-**	AsynSrv_Close
-**  Description:
-**	The routine calls AsynSrv_Close to close the connection to the RS232C
-**	server. If 'force_flag' is non-zero, all other connections to the
-**	RS232C server which use the same socket will also be closed.
-**
-**	The 'force_flag' can be useful in error recovery situations. The AsynSrv
-**	utility operates by only opening a socket for each separate combination
-**	of host/port. Hence, if several connections are open to the server,
-**	then calling VelSel_Close doesn't actually close the socket until all
-**	connections have been closed. In the situation
-**	where an error has been detected, it is often desirable to
-**	close and re-open the socket as part of the recovery procedure. Calling
-**	VelSel_Close with 'force_flag' non-zero will force the socket to be
-**	closed and will mark all connections using this socket so that they
-**	will be informed of the event when they next call any AsynSrv
-**	dependent routine.
-**
-**	Note:	The force-close action is effected by the AsynSrv package. A
-**		force-close will thus also close any connections to other
-**		RS-232-C devices (e.g. EL737 neutron cntr) on the same server.
-**-------------------------------------------------------------------------
-**   void VelSel_Config (&handle, msec_tmo, eot_str)
-**	  -------------
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by VelSel_Open.
-**	int    msec_tmo	- The time-out for responses. Dflt = 10000.
-**	char  *eot_str	- A string of up to 3 characters specifying terminating
-**			    characters for input.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	none
-**  Routines called:
-**	none
-**  Description:
-**	The routine sets values in the VelSel_info data structure.
-**-------------------------------------------------------------------------
-**    void VelSel_ErrInfo (&entry_txt_ptr, &errcode, &my_errno, &vaxc_errno)
-**	   --------------
-**  Input Args:
-**	None
-**  Output Args:
-**	char **entry_txt_ptr - Pointer to a text string giving the call stack
-**				at the time that the error was detected.
-**	int  *errcode	 - An internal error code indicating the detected error.
-**	int  *my_errno	 - Saved value of errno.
-**	int  *vaxc_errno - Saved value of vaxc$errno (OpenVMS only).
-**  Modified Args:
-**	none
-**  Return status:
-**	none
-**  Routines called:
-**	none
-**  Description:
-**	Returns detailed status of the last operation. Once an error has been
-**	detected, the error status is frozen until this routine has been called.
-**-------------------------------------------------------------------------
-**    void  *VelSel_GetReply (&handle, last_rply)
-**	     ---------------
-**  Input Args:
-**	void **handle	    - The pntr to the structure returned by VelSel_Open.
-**	void  *last_rply    - Address of last reply processed or NULL.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	Address of next reply structure in the buffer or NULL if no more.
-**  Routines called:
-**	none
-**  Description:
-**    VelSel_GetReply is a utility routine mainly intended for internal use
-**    by the VelSel_Utility package. It unpacks the replies in the response
-**    packet from the RS232C server.
-**
-**    Having received a response from the server to a sequence of commands,
-**    VelSel_GetReply is called with last_rply = NULL. The return value is
-**    a pointer to the first reply sub-structure in the response. On calling
-**    VelSel_GetReply again with last_rply set to this address, one receives
-**    the address of the second reply sub-structure and so on, until NULL
-**    is returned when all responses have been exhausted. The structure of
-**    a reply sub-structure is RS__RplyStruct.
-**-------------------------------------------------------------------------
-**    int VelSel_GetStatus (&handle, &status_str, status_str_len)
-**	  ----------------
-**  Input Args:
-**	void **handle	- The pointer to the structure returned by VelSel_Open.
-**	int    status_str_len	- The length of status_str.
-**  Output Args:
-**	char  *status_str	- Pointer to a buffer to save the status.
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and VelSel_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	VelSel_GetStatus are (other values may be set by the called routines):
-**	    VELSEL__BAD_TMO, _LOC, _CMD, _OFL, _ADR --> see VelSel_Open.
-**	    VELSEL__BAD_ILLG = -5 --> one of the responses could probably not be
-**				decoded. This could happen if there is noise
-**				on the RS232C connection to the Velocity
-**				Selector.
-**	If an error is detected, ist_posit is set to 0.0 and all other
-**	arguments to -1.
-**  Routines called:
-**	VelSel_SendCmnds
-**  Description:
-**	The routine issues a "???" command to the Velocity Selector and
-**	analyses the result.
-**-------------------------------------------------------------------------
-**    int VelSel_Open (&handle, host, port, chan, id)
-**	  -----------
-**  Input Args:
-**	char *host	- Name of host offering the TCP/IP service.
-**	int   port	- Number of TCP/IP port of TCP/IP server.
-**	int   chan	- RS-232-C Channel number on the TCP/IP server.
-**	char *id	- The expected ID of the device, normally "????".
-**			    If id is NULL, the device ID is not checked.
-**  Output Args:
-**	void *handle	- A pointer to a structure of type VelSel_info needed
-**			   for subsequent calls to VelSel_... routines. Buffer
-**			   space for the structure is allocated dynamically.
-**			   It gets released via a call to VelSel_Close.
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False. If False, VelSel_ErrInfo
-**	can be called to identify the problem. Values of Errcode set by
-**	VelSel_Open are (other values may be set by the called routines):
-**	  VELSEL__BAD_TMO     =  -1 --> Time-out error ("?TMO" - this gets
-**					generated by the RS232C server).
-**	  VELSEL__BAD_LOC     =  -2 --> Off-line ("?LOC"). This should not
-**					happen on calls to VelSel_Open since it
-**					sends an "RMT 1" cmnd.
-**	  VELSEL__BAD_CMD     =  -3 --> Command error ("?CMD"). This could be
-**					caused by noise in the RS-232-C
-**					transmission.
-**	  VELSEL__BAD_OFL     =  -4 --> Connection broken ("?OFL").
-**					This can get generated by RS232C_SRV
-**					if, for example, the connection is via
-**					a terminal server and the terminal
-**					server loses power.
-**	  VELSEL__BAD_ILLG    =  -5 --> Some other unrecognised response. This
-**					should never occur, of course!
-**	  VELSEL__BAD_HOST    =  -6 --> Call to "gethostbyname" failed to get
-**					network addr of host.
-**	  VELSEL__BAD_SOCKET  =  -7 --> Call to "socket" failed.
-**	  VELSEL__BAD_BIND    =  -8 --> Call to "bind" failed.
-**	  VELSEL__BAD_CONNECT =  -9 --> Call to "connect" failed.
-**	  VELSEL__BAD_DEV     = -10 --> Bad cmnd response - is device a VelSel?
-**	  VELSEL__BAD_MALLOC  = -11 --> Call to "malloc" failed
-**  Routines called:
-**	AsynSrv_open, the memory alloc routine "malloc" and VelSel_SendCmnds.
-**  Description:
-**	The routine calls AsynSrv_open to open a TCP/IP connection to a server
-**	offering the "RS-232-C" service for a Velocity Selector. "RMT 1"
-**	and "ECHO 0" commands are sent to ensure the device is on-line.
-**-------------------------------------------------------------------------
-**    int   VelSel_SendCmnds (&handle, ...)
-**	    ----------------
-**  Input Args:
-**	void   **handle	- The pntr to the structure returned by VelSel_Open.
-**	char	* ...	- A list of commands, terminated by NULL, for
-**			    sending to the Velocity Selector. The commands must
-**			    have any necessary \r characters included.
-**  Output Args:
-**	none
-**  Modified Args:
-**	none
-**  Return status:
-**	True if no problems detected, otherwise False and errcode (see
-**	VelSel_ErrInfo) is set to indicate the nature of the problem.
-**	VelSel_errcode may be set as follows:
-**	    VELSEL__BAD_SENDLEN = -12 --> Too much to send; either too many
-**					    commands or too long. The buffer
-**					    is 232 bytes long and each command
-**					    has a 2-byte header.
-**	  Errors -13 to -16 are related to network errors whilst sending the
-**	  message buffer to the server:
-**	    VELSEL__BAD_SEND	 = -13 --> Network problem - server has
-**					    probably abended.
-**	    VELSEL__BAD_SEND_PIPE = -14 --> Network pipe broken - probably same
-**					    cause as VELSEL__BAD_SEND.
-**	    VELSEL__BAD_SEND_NET  = -15 --> Some other network problem. "errno"
-**					    may be helpful.
-**	    VELSEL__BAD_SEND_UNKN = -16 --> Some other network problem happened
-**					    resulting in the message not
-**					    getting sent completely. "errno" is
-**					    probably not helpful in this case.
-**	    Errors VELSEL__BAD_RECV, VELSEL__BAD_RECV_PIPE, VELSEL__BAD_RECV_NET
-**		and VELSEL__BAD_RECV_UNKN (-17 to -20) are related to network
-**		errors whilst receiving the 4-byte response header. They are
-**		analogous to VELSEL__BAD_SEND to VELSEL__BAD_SEND_UNKN.
-**	    VELSEL__BAD_NOT_BCD = -21 --> The 4-byte response header is not an
-**					  ASCII coded decimal integer.
-**	    VELSEL__BAD_RECVLEN = -22 --> The body of the response would be too
-**					  big to fit in the input buffer. The
-**					  buffer is 244 bytes long and each
-**					  response has a 3-byte header and a
-**					  trailing zero-byte. The response
-**					  is flushed.
-**	    VELSEL__BAD_FLUSH   = -23 --> Some network error was detected
-**					  during flushing. This is an "or"
-**					  of errors VELSEL__BAD_RECV to
-**					  VELSEL__BAD_RECV_UNKN.
-**	    VELSEL__FORCED_CLOSED = -32 --> The connection to the Velocity
-**					   Selector has been forcefully
-**					   closed. See below.
-**	    VELSEL__BAD_REPLY   = -34 --> The n_rply field of the response was
-**					either non-numeric or <0, indicating
-**					that the Terminal Server detected an
-**					error. The reply is added to the
-**					routine call stack for debug purposes.
-**				
-**	    Errors VELSEL__BAD_RECV1, VELSEL__BAD_RECV1_PIPE and
-**		VELSEL__BAD_RECV1_NET (-24 to -26) are related to network
-**		errors whilst receiving the body of the response. They are
-**		equivalent to errors VELSEL__BAD_RECV, to VELSEL__BAD_RECV_NET.
-**
-**	    VELSEL__FORCED_CLOSED occurs if AsynSrv_Close has been called (e.g.
-**		via a call to VelSel_Close) for another device on the same
-**		server and the 'force_flag' was set (see VelSel_Close). The
-**		caller should call VelSel_Close and then VelSel_Open to
-**		re-establish a connection to the Velocity Selector.
-**  Routines called:
-**	Socket library routines send and recv.
-**  Description:
-**	The list of commands is assembled into a message buffer with appropriate
-**	header information and sent off to the server. The response is then
-**	awaited and read in when it arrives.
-**
-**    For any of the following errors:
-**		VELSEL__BAD_SEND		(Note: VELSEL__BAD_SENDLEN and 
-**		VELSEL__BAD_SEND_PIPE	VELSEL__BAD_RECVLEN do not cause a close
-**		VELSEL__BAD_SEND_NET
-**		VELSEL__BAD_SEND_UNKN
-**		VELSEL__BAD_RECV
-**		VELSEL__BAD_RECV_PIPE
-**		VELSEL__BAD_RECV_NET
-**		VELSEL__BAD_RECV_UNKN
-**		VELSEL__BAD_NOT_BCD
-**		VELSEL__BAD_FLUSH
-**		VELSEL__BAD_RECV1
-**		VELSEL__BAD_RECV1_PIPE
-**		VELSEL__BAD_RECV1_NET
-**    the network link to the server is force-closed via a call to VelSel_Close.
-**    Once the error has been corrected, the link can be re-opened via a
-**    call to VelSel_Open. As a result of the force-close, other active handles
-**    will need to be released via a call to VelSel_Close before VelSel_Open is
-**    called.
-**
-**    Note: neither of the errors VELSEL__BAD_SENDLEN, VELSEL__BAD_RECVLEN
-**	    nor VELSEL__BAD_REPLY cause the link to be closed.
-**============================================================================*/
-/*
-**---------------------------------------------------------------------------
-**					Global Definitions
-*/
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <stdarg.h>
-#include    <errno.h>
-#include    <signal.h>
-#include    <netdb.h>
-#include    <sys/socket.h>
-#include    <netinet/in.h>
-
-#include    <string.h>
-
-#ifdef	__VMS
-#include    <unixio.h>
-#else
-#include    <unistd.h>
-#endif
-/*-----------------------------------------------------------------*/
-#include    <rs232c_def.h>
-#include    <asynsrv_def.h>
-#include    <VelSel_def.h>
-#include    <sinq_prototypes.h>
-
-#define True	1
-#define False	0
-/*--------------------------------------------------------------------------
-**					Global Variables
-*/
-  static int	VelSel_call_depth = 0;
-  static char	VelSel_routine[5][64];
-  static int	VelSel_errcode = 0;
-  static int	VelSel_errno, VelSel_vaxc_errno;
-/*
-**---------------------------------------------------------------------------
-**		VelSel_Close:  Close a connection to a Velocity Selector.
-*/
-  int	VelSel_Close (
-/*	===========
-*/		void	**handle,
-		int	  force_flag) {
-
-    struct VelSel_info	*info_ptr;
-    char		buff[4];
-
-    info_ptr = (struct VelSel_info *) *handle;
-    if (info_ptr == NULL) return True;
-
-    if (info_ptr->asyn_info.skt != 0) {
-      if (info_ptr->asyn_info.skt > 0) {
-	AsynSrv_Close (*handle, force_flag);
-      }
-    }
-    free (*handle);
-    *handle = NULL;
-
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		VelSel_Config:  Configure a connection to a Velocity Selector.
-*/
-  void	VelSel_Config (
-/*	============
-*/		void	**handle,
-		int       msec_tmo,
-		char	 *eot_str) {
-
-    int			 i;
-    struct VelSel_info	*info_ptr;
-
-    info_ptr = (struct VelSel_info *) *handle;
-    if (info_ptr == NULL) return;
-		/*-------------------------
-		** Set up the time-out
-		*/
-    if (msec_tmo < 0) {
-      info_ptr->tmo = -1;
-    }else {
-      info_ptr->tmo = (msec_tmo + 99)/100;	/* Convert to deci-secs	*/
-      if (info_ptr->tmo > 9999) info_ptr->tmo = 9999;
-    }
-		/*---------------------------------
-		** Set up the end-of-text string
-		*/
-    if (eot_str != NULL) {
-      for (i = 0; i < sizeof (info_ptr->eot); i++) info_ptr->eot[i] = '\0';
-
-      for (i = 0; i < sizeof (info_ptr->eot); i++) {
-	if (eot_str[i] == '\0') break;
-	info_ptr->eot[i+1] = eot_str[i];
-      }
-      info_ptr->eot[0] = '0' + i;
-    }
-    return;
-  }
-/*
-** -------------------------------------------------------------------------
-**		VelSel_ErrInfo:  Return detailed status from last operation.
-*/
-  void	VelSel_ErrInfo (
-/*	=============
-*/		char	**entry_txt,
-		int	*errcode,
-		int	*my_errno,
-		int	*vaxc_errno) {
-
-    int		i;
-    char	buff[80];
-    int		asyn_errcode, asyn_errno, asyn_vaxerrno;
-    char*	asyn_errtxt;
-
-    if (VelSel_call_depth <= 0) {
-      strcpy (VelSel_routine[0], "VelSel_no_error_detected");
-      *errcode	  = 0;
-      *my_errno	  = 0;
-      *vaxc_errno = 0;
-    }else {
-      if (VelSel_call_depth > 1) {		    /* Concatenate the names */
-	for (i = 1; i < VelSel_call_depth; i++) {
-	  strcat (VelSel_routine[0], "/");
-	  StrJoin (VelSel_routine[0], sizeof (VelSel_routine),
-			    VelSel_routine[0], VelSel_routine[i]);
-	}
-      }
-      *errcode	  = VelSel_errcode;
-      *my_errno	  = VelSel_errno;
-      *vaxc_errno = VelSel_vaxc_errno;
-      switch (VelSel_errcode) {
-	case VELSEL__BAD_TMO:	    strcpy (buff, "/VELSEL__BAD_TMO"); break;
-	case VELSEL__BAD_CMD:	    strcpy (buff, "/VELSEL__BAD_CMD"); break;
-	case VELSEL__BAD_OFL:	    strcpy (buff, "/VELSEL__BAD_OFL"); break;
-	case VELSEL__BAD_ILLG:	    strcpy (buff, "/VELSEL__BAD_ILLG"); break;
-	case VELSEL__BAD_HOST:	    strcpy (buff, "/VELSEL__BAD_HOST"); break;
-	case VELSEL__BAD_SOCKET:     strcpy (buff, "/VELSEL__BAD_SOCKET"); break;
-	case VELSEL__BAD_BIND:	    strcpy (buff, "/VELSEL__BAD_BIND"); break;
-	case VELSEL__BAD_CONNECT:    strcpy (buff, "/VELSEL__BAD_CONNECT"); break;
-	case VELSEL__BAD_DEV:	    strcpy (buff, "/VELSEL__BAD_DEV"); break;
-	case VELSEL__BAD_MALLOC:     strcpy (buff, "/VELSEL__BAD_MALLOC"); break;
-	case VELSEL__BAD_SENDLEN:    strcpy (buff, "/VELSEL__BAD_SENDLEN"); break;
-	case VELSEL__BAD_SEND:	    strcpy (buff, "/VELSEL__BAD_SEND"); break;
-	case VELSEL__BAD_SEND_PIPE:  strcpy (buff, "/VELSEL__BAD_SEND_PIPE"); break;
-	case VELSEL__BAD_SEND_NET:   strcpy (buff, "/VELSEL__BAD_SEND_NET"); break;
-	case VELSEL__BAD_SEND_UNKN:  strcpy (buff, "/VELSEL__BAD_SEND_UNKN"); break;
-	case VELSEL__BAD_RECV:	    strcpy (buff, "/VELSEL__BAD_RECV"); break;
-	case VELSEL__BAD_RECV_PIPE:  strcpy (buff, "/VELSEL__BAD_RECV_PIPE"); break;
-	case VELSEL__BAD_RECV_NET:   strcpy (buff, "/VELSEL__BAD_RECV_NET"); break;
-	case VELSEL__BAD_RECV_UNKN:  strcpy (buff, "/VELSEL__BAD_RECV_UNKN"); break;
-	case VELSEL__BAD_NOT_BCD:    strcpy (buff, "/VELSEL__BAD_NOT_BCD"); break;
-	case VELSEL__BAD_RECVLEN:    strcpy (buff, "/VELSEL__BAD_RECVLEN"); break;
-	case VELSEL__BAD_FLUSH:	    strcpy (buff, "/VELSEL__BAD_FLUSH"); break;
-	case VELSEL__BAD_RECV1:	    strcpy (buff, "/VELSEL__BAD_RECV1"); break;
-	case VELSEL__BAD_RECV1_PIPE: strcpy (buff, "/VELSEL__BAD_RECV1_PIPE"); break;
-	case VELSEL__BAD_RECV1_NET:  strcpy (buff, "/VELSEL__BAD_RECV1_NET"); break;
-	case VELSEL__BAD_PAR:	    strcpy (buff, "/VELSEL__BAD_PAR"); break;
-	case VELSEL__BAD_BSY:	    strcpy (buff, "/VELSEL__BAD_BSY"); break;
-	case VELSEL__BAD_OPEN:	    strcpy (buff, "/VELSEL__BAD_OPEN"); break;
-	case VELSEL__FORCED_CLOSED:  strcpy (buff, "/VELSEL__FORCED_CLOSED"); break;
-	case VELSEL__BAD_STP:	    strcpy (buff, "/VELSEL__BAD_STP"); break;
-	case VELSEL__BAD_REPLY:	    strcpy (buff, "/VELSEL__BAD_REPLY"); break;
-	default: sprintf (buff, "/VELSEL__unknown_err_code: %d", VelSel_errcode);
-      }
-      StrJoin (VelSel_routine[0], sizeof(VelSel_routine), VelSel_routine[0], buff);
-    }
-    AsynSrv_ErrInfo (&asyn_errtxt, &asyn_errcode, &asyn_errno, &asyn_vaxerrno);
-    if (asyn_errcode != 0) {
-      strcat (VelSel_routine[0], "/");
-      StrJoin (VelSel_routine[0], sizeof(VelSel_routine),
-		    VelSel_routine[0], asyn_errtxt);
-    }
-    *entry_txt = VelSel_routine[0];
-    VelSel_call_depth = 0;
-    VelSel_errcode = 0;
-  }
-/*
-**---------------------------------------------------------------------------
-**		VelSel_GetReply    - Get next reply from a reply buffer.
-*/
-  void	*VelSel_GetReply (
-/*	 ==============
-*/		void	**handle,	/* Pointer to structure containing
-					** message to pull apart */
-		void	*last_rply) {	/* Starting point */
-
-    int			     rply_len;
-    struct RS__RplyStruct   *ptr;
-    struct VelSel_info	    *my_info_ptr;
-    struct RS__RplyStruct   *my_last_rply;
-
-    ptr = NULL;
-    my_info_ptr  = (struct VelSel_info *) *handle;
-    my_last_rply = (struct RS__RplyStruct *) last_rply;
-
-    if (my_last_rply == NULL) {		/* Start with first reply? */
-					/* Yes */
-      if (sscanf (my_info_ptr->from_host.n_rply, "%4d",
-	    &my_info_ptr->max_replies) != 1) my_info_ptr->max_replies = 0;
-      if (my_info_ptr->max_replies > 0)
-	    ptr = (struct RS__RplyStruct *) my_info_ptr->from_host.u.rplys;
-      my_info_ptr->n_replies = 1;
-    }else {
-      my_info_ptr->n_replies++;
-      if (my_info_ptr->n_replies <= my_info_ptr->max_replies) {
-        if (sscanf (my_last_rply->rply_len, "%2d", &rply_len) == 1) {
-	  ptr =
-	    (struct RS__RplyStruct *) ((char *) my_last_rply + rply_len + 2);
-	}
-      }
-    }
-    return (void *) ptr;
-  }
-/*
-**---------------------------------------------------------------------------
-**		VelSel_GetStatus:  Get "???" response from Vel Selector
-*/
-  int	VelSel_GetStatus (
-/*	===============
-*/		void	**handle,
-		char     *status_str,
-		int       status_str_len) {
-
-    int			status;
-    struct VelSel_info	*info_ptr;
-    struct RS__RplyStruct  *rply_ptr;
-    struct RS__RplyStruct  *rply_ptr0;
-		    /*----------------------------------------------
-		    */
-    status_str[0] = '\0';
-		    /*----------------------------------------------
-		    ** Pre-set the routine name (in case of error)
-		    */
-    if (VelSel_errcode == 0 && VelSel_call_depth < 5) {
-      strcpy (VelSel_routine[VelSel_call_depth], "VelSel_GetStatus");
-      VelSel_call_depth++;
-    }
-		    /*----------------------------------------------
-		    ** Do nothing if no connection - the connection gets
-		    ** closed if an error is detected.
-		    */
-    info_ptr = (struct VelSel_info *) *handle;
-    if (info_ptr == NULL) {
-      return False;
-    }
-    if (info_ptr->asyn_info.skt <= 0) {
-      memset (info_ptr->from_host.msg_size,
-		    '0', sizeof (info_ptr->from_host.msg_size));
-      if ((VelSel_errcode == 0) && (info_ptr->asyn_info.skt < 0)) {
-	VelSel_errcode = VELSEL__FORCED_CLOSED;
-      }
-      return False;
-    }
-		    /*----------------------------------------------
-		    ** Send "???" command to Velocity Selector
-		    */
-    status = VelSel_SendCmnds (handle, "???", NULL);
-    if (!status) {
-			/* Error in VelSel_SendCmnds */
-      return False;
-    }else {
-      rply_ptr0 = VelSel_GetReply (handle, NULL);
-      if (rply_ptr0 == NULL) rply_ptr0 = (struct RS__RplyStruct *) "06\rNULL";
-      StrJoin (status_str, status_str_len, rply_ptr0->rply, "");
-    }
-    VelSel_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		VelSel_Open:  Open a connection to a Velocity Selector.
-*/
-  int	VelSel_Open (
-/*	==========
-*/		void	**handle,
-		char	*host,
-		int	 port,
-		int	 chan) {
-
-    int			    status;
-    struct VelSel_info	   *my_handle;
-    struct RS__RplyStruct  *rply_ptr;
-    struct RS__RplyStruct  *rply_ptr0;
-    struct RS__RplyStruct  *rply_ptr1;
-    struct RS__RplyStruct  *rply_ptr2;
-    struct RS__RplyStruct  *rply_ptr3;
-/*--------------------------------------------------------
-**			Initialise the error info stack and pre-set the
-**			routine name (in case of error).
-*/
-    VelSel_errcode = VelSel_errno = VelSel_vaxc_errno = 0;
-    strcpy (VelSel_routine[0], "VelSel_Open");	
-    VelSel_call_depth = 1;
-/*--------------------------------------------------------
-**				    Assume trouble
-*/
-    *handle = NULL;
-/*--------------------------------------------------------
-**			    Reserve space for the data we need to store.
-*/
-    my_handle = (struct VelSel_info *) malloc (sizeof (*my_handle));
-    if (my_handle == NULL) {
-      VelSel_errcode = VELSEL__BAD_MALLOC;	    /* malloc failed!! */
-      return False;
-    }
-/*--------------------------------------------------------
-**				    Set up the connection
-*/
-    StrJoin (my_handle->asyn_info.host, sizeof (my_handle->asyn_info.host),
-			    host, "");
-    my_handle->asyn_info.port = port;
-    my_handle->asyn_info.chan = chan;
-    status = AsynSrv_Open (&my_handle->asyn_info);
-    if (!status) {
-      VelSel_errcode = VELSEL__BAD_SOCKET;
-      GetErrno (&VelSel_errno, &VelSel_vaxc_errno);   /* Save errno info */
-      fprintf (stderr, "\nVelSel_Open/AsynSrv_Open: "
-			"Failed to make connection.\n");
-      free (my_handle);
-      return False;
-    }
-
-    my_handle->tmo    = 25;	/* Set a short time-out initially since
-				** there should be no reason for the REM
-				** command to take very long
-				*/
-    strcpy (my_handle->eot, "1\n\0\0");
-    my_handle->msg_id	= 0;
-	    /*
-	    ** Now ensure the VelSel is on-line. The first "REM" command can
-	    ** fail due to pending characters in the VelSel input buffer causing
-	    ** the "REM" to be corrupted. The response of the VelSel to this
-	    ** command is ignored for this reason (but the VelSel_SendCmnds
-	    ** status must be OK otherwise it indicates a network problem).
-	    */
-    status = VelSel_SendCmnds ((void *) &my_handle, "REM", NULL);
-    if (status) {
-      status = VelSel_SendCmnds ((void *) &my_handle, "REM", NULL);
-    }
-    if (!status) {
-		    /* Some error occurred in VelSel_SendCmnds - Errcode will
-		    ** have been set up there.
-		    */
-      AsynSrv_Close (&my_handle->asyn_info, False);
-      free (my_handle);
-      return False;
-    }
-		    /*
-		    ** Check the responses carefully.
-		    */
-    rply_ptr0 = VelSel_GetReply ((void *) &my_handle, NULL);
-
-    if (rply_ptr0 == NULL) rply_ptr0 = (struct RS__RplyStruct *) "06\rNULL";
-    if (rply_ptr0->rply[0] == '?') {
-      VelSel_errcode = VELSEL__BAD_DEV;	    /* Error response - not a VelSel? */
-      AsynSrv_Close (&my_handle->asyn_info, False);
-      free (my_handle);
-      return False;
-    }
-			/*
-			** The connection is complete. Pass the data structure
-			** back to the caller as a handle.
-			*/
-    my_handle->tmo = 100;	    /* Default time-out is 10 secs */
-    *handle = my_handle;
-    VelSel_call_depth--;
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		VelSel_SendCmnds - Send commands to RS232C server.
-*/
-  int	VelSel_SendCmnds (
-/*	================
-*/		void    **handle,
-		...) {			/* Now we have list of commands -
-					**   char *txt   = pntr to cmnd strng
-					** Terminate list with *txt = NULL.
-					*/
-    struct VelSel_info	*info_ptr;
-    int			i, status, c_len, size, max_size, ncmnds;
-    int			bytes_to_come, bytes_left;
-    char		*nxt_byte_ptr;
-    char		err_text[80];
-    char		text[20];
-    va_list		ap;		/* Pointer to variable args */
-    char		*txt_ptr;
-    char		*cmnd_lst_ptr;
-		    /*----------------------------------------------
-		    ** Pre-set the routine name (in case of error)
-		    */
-    if (VelSel_errcode == 0 && VelSel_call_depth < 5) {
-      strcpy (VelSel_routine[VelSel_call_depth], "VelSel_SendCmnds");
-      VelSel_call_depth++;
-    }
-		    /*----------------------------------------------
-		    ** Do nothing if no connection - the connection gets
-		    ** closed if an error is detected. The connection may
-		    ** also be marked to have been forcefully closed.
-		    */
-    info_ptr = (struct VelSel_info *) *handle;
-    if (info_ptr == NULL) {
-      return False;
-    }
-    if (info_ptr->asyn_info.skt <= 0) {
-      memset (info_ptr->from_host.msg_size,
-		    '0', sizeof (info_ptr->from_host.msg_size));
-      if ((VelSel_errcode == 0) && (info_ptr->asyn_info.skt < 0)) {
-	VelSel_errcode = VELSEL__FORCED_CLOSED;
-      }
-      return False;
-    }
-		    /*----------------------------------------------
-		    ** Build message for Vel Selector from the list of commands.
-		    */
-    info_ptr->n_replies = info_ptr->max_replies = 0;
-
-    info_ptr->msg_id++;			/* Set up an incrementing message id */
-    if (info_ptr->msg_id > 9999) info_ptr->msg_id = 1;
-    sprintf (info_ptr->to_host.msg_id,	   "%04.4d", info_ptr->msg_id);
-
-    memcpy (info_ptr->to_host.c_pcol_lvl, RS__PROTOCOL_ID,
-		sizeof (info_ptr->to_host.c_pcol_lvl));
-    sprintf (info_ptr->to_host.serial_port, "%04.4d", info_ptr->asyn_info.chan);
-    sprintf (info_ptr->to_host.tmo,	    "%04.4d", info_ptr->tmo);
-
-    memcpy (info_ptr->to_host.terms, info_ptr->eot,
-			sizeof (info_ptr->to_host.terms));
-    memcpy (info_ptr->to_host.n_cmnds, "0000",
-			sizeof (info_ptr->to_host.n_cmnds));
-
-    va_start (ap, handle);		/* Set up var arg machinery */
-
-    txt_ptr = va_arg (ap, char *);	/* Get pntr to next cmnd string */
-    ncmnds = 0;
-    cmnd_lst_ptr = &info_ptr->to_host.cmnds[0];
-    bytes_left = sizeof (info_ptr->to_host) -
-			    OffsetOf (struct RS__MsgStruct, cmnds[0]);
-
-    while (txt_ptr != NULL) {
-      size = 2 + strlen (txt_ptr);
-      if (size > bytes_left) {
-	VelSel_errcode = VELSEL__BAD_SENDLEN;		/* Too much to send */
-	fprintf (stderr, "\nVelSel_SendCmnds/send: too much to send"
-				" - request ignored.\n");
-	memset (info_ptr->from_host.msg_size,
-		    '0', sizeof (info_ptr->from_host.msg_size));
-	return False;
-      }else {
-	strcpy (cmnd_lst_ptr+2, txt_ptr);
-	c_len = strlen (txt_ptr);
-	sprintf (text, "%02.2d", c_len);
-	memcpy (cmnd_lst_ptr, text, 2);
-	cmnd_lst_ptr = cmnd_lst_ptr + c_len + 2;
-	ncmnds++;
-        bytes_left = bytes_left - size;
-	txt_ptr = va_arg (ap, char *);
-      }
-    }
-    sprintf (text, "%04.4d", ncmnds);
-    memcpy (info_ptr->to_host.n_cmnds,
-		text, sizeof (info_ptr->to_host.n_cmnds));
-
-    size = cmnd_lst_ptr - info_ptr->to_host.msg_id;
-    size = (size + 3) & (~3);	/* Round up to multiple of 4 */
-    sprintf (text, "%04.4d", size);
-    memcpy (info_ptr->to_host.msg_size, text, 4);
-
-    status = send (info_ptr->asyn_info.skt,
-			(char *) &info_ptr->to_host, size+4, 0);
-    if (status != (size+4)) {
-      GetErrno (&VelSel_errno, &VelSel_vaxc_errno);
-      if (status == 0) {
-	VelSel_errcode = VELSEL__BAD_SEND;	/* Server exited (probably) */
-	fprintf (stderr, "\nVelSel_SendCmnds/send: probable network problem");
-      }else if (status == -1) {
-	if (VelSel_errno == EPIPE) {
-	  VelSel_errcode = VELSEL__BAD_SEND_PIPE;	/* Server exited (probably) */
-	  fprintf (stderr, "\nVelSel_SendCmnds/send: broken network pipe");
-	}else {
-	  VelSel_errcode = VELSEL__BAD_SEND_NET; /* It's some other net problem */
-	  perror ("VelSel_SendCmnds/send");
-	}
-      }else {
-	VelSel_errcode = VELSEL__BAD_SEND_UNKN;		/* TCP/IP problems */
-	fprintf (stderr, "\nVelSel_SendCmnds/send: probable TCP/IP problem");
-      }
-      VelSel_Close (handle, True);   /* Force close TCP/IP connection */
-      fprintf (stderr, " - link to server force-closed.\n");
-      return False;
-    }
-
-    size = sizeof (info_ptr->from_host.msg_size);
-    status = recv (info_ptr->asyn_info.skt,
-			info_ptr->from_host.msg_size, size, 0);
-    if (status != size) {
-      GetErrno (&VelSel_errno, &VelSel_vaxc_errno);
-      if (status == 0) {
-	VelSel_errcode = VELSEL__BAD_RECV;   	/* Server exited (probably) */
-	fprintf (stderr, "\nVelSel_SendCmnds/recv: probable network problem");
-      }else if (status == -1) {
-	if (VelSel_errno == EPIPE) {
-	  VelSel_errcode = VELSEL__BAD_RECV_PIPE;	/* Server exited (probably) */
-	  fprintf (stderr, "\nVelSel_SendCmnds/recv: broken network pipe");
-	}else {
-	  VelSel_errcode = VELSEL__BAD_RECV_NET;  /* It's some other net problem */
-	  perror ("VelSel_SendCmnds/recv");
-	}
-      }else {
-	VelSel_errcode = VELSEL__BAD_RECV_UNKN;		/* TCP/IP problems */
-	fprintf (stderr, "\nVelSel_SendCmnds/recv: probable TCP/IP problem");
-      }
-      VelSel_Close (handle, True);   /* Force close TCP/IP connection */
-      fprintf (stderr, " - link to server force-closed.\n");
-      return False;
-    }
-    if (sscanf (info_ptr->from_host.msg_size, "%4d", &bytes_to_come) != 1) {
-      VelSel_errcode = VELSEL__BAD_NOT_BCD;  /* Header not an ASCII BCD integer */
-      VelSel_Close (handle, True);   /* Force close TCP/IP connection */
-      fprintf (stderr, "\nVelSel_SendCmnds/recv: non-BCD byte count"
-			    " - link to server force-closed.\n");
-      return False;
-    }
-    max_size = sizeof (info_ptr->from_host) -
-		sizeof (info_ptr->from_host.msg_size);
-    if (bytes_to_come > max_size) {
-      VelSel_errcode = VELSEL__BAD_RECVLEN;
-      fprintf (stderr, "\nVelSel_SendCmnds/recv: pending message length too big"
-			    " - flushing ...\n");
-      nxt_byte_ptr = &info_ptr->from_host.msg_size[size];
-      while (bytes_to_come > 0) {	/* Flush out the incoming message */
-	bytes_left = bytes_to_come;
-	if (bytes_left > max_size) bytes_left = max_size;
-	status = recv (info_ptr->asyn_info.skt, nxt_byte_ptr, bytes_left, 0);
-	if (status <= 0) {
-	  VelSel_errcode = VELSEL__BAD_FLUSH;  /* TCP/IP problem whilst flushing */
-	  GetErrno (&VelSel_errno, &VelSel_vaxc_errno);
-	  VelSel_Close (handle, True);	/* Force close TCP/IP connection */
-	  fprintf (stderr, "\nVelSel_SendCmnds/recv: network problem during"
-		    " flush.\nLink to server force-closed.\n");
-	  return False;
-	}
-	bytes_to_come = bytes_to_come - status;
-      }
-      fprintf (stderr, "\n flushed OK.\n");
-      memset (info_ptr->from_host.msg_size,
-		    '0', sizeof (info_ptr->from_host.msg_size));
-      return False;
-    }else {
-      nxt_byte_ptr = &info_ptr->from_host.msg_size[size];
-      bytes_left = bytes_to_come;
-      while (bytes_left > 0) {		/* Read the rest of the response */
-	status = recv (info_ptr->asyn_info.skt, nxt_byte_ptr, bytes_left, 0);
-	if (status <= 0) {
-	  GetErrno (&VelSel_errno, &VelSel_vaxc_errno);
-	  if (status == 0) {
-	    VelSel_errcode = VELSEL__BAD_RECV1;	/* Server exited (probably) */
-	    fprintf (stderr, "\nVelSel_SendCmnds/recv/1: probable network "
-				    "problem");
-	  }else {
-	    if (VelSel_errno == EPIPE) {
-	      VelSel_errcode = VELSEL__BAD_RECV1_PIPE; /* Server exited (probably) */
-	      fprintf (stderr, "\nVelSel_SendCmnds/recv/1: broken network pipe");
-	    }else {
-	      VelSel_errcode = VELSEL__BAD_RECV1_NET; /* It's some other net fault */
-	      perror ("VelSel_SendCmnds/recv/1");
-	    }
-	  }
-	  VelSel_Close (handle, True);	/* Force close TCP/IP connection */
-	  fprintf (stderr, " - link to server force-closed.\n");
-	  return False;
-        }
-	bytes_left   = bytes_left   - status;
-	nxt_byte_ptr = nxt_byte_ptr + status;
-      }
-      if ((sscanf (info_ptr->from_host.n_rply, "%4d",
-		&info_ptr->max_replies) != 1) ||
-	  (info_ptr->max_replies < 0)) {
-	VelSel_errcode = VELSEL__BAD_REPLY;   /* Reply is bad */
-	if (VelSel_call_depth < 5) {	    /* Add reply to routine stack */
-	  bytes_to_come = bytes_to_come + 4;
-	  if (bytes_to_come >= sizeof (VelSel_routine[0]))
-		bytes_to_come = sizeof (VelSel_routine[0]) - 1;
-	  for (i=0; i<bytes_to_come; i++) {
-	    if (info_ptr->from_host.msg_size[i] == '\0')
-		    info_ptr->from_host.msg_size[i] = '.';
-	  }
-	  info_ptr->from_host.msg_size[bytes_to_come] = '\0';
-	  strcpy (VelSel_routine[VelSel_call_depth],
-		    info_ptr->from_host.msg_size);
-	  VelSel_call_depth++;
-	}
-	return False;
-      }
-    }
-    VelSel_call_depth--;
-    return True;
-  }
-/*-------------------------------------------- End of VelSel_Utility.C =======*/
diff --git a/histmem.c b/histmem.c
index f94a316c..6f492749 100644
--- a/histmem.c
+++ b/histmem.c
@@ -60,12 +60,11 @@
 #include "HistDriv.i"
 #include "HistMem.i"
 #include "histsim.h"
-#include "hardsup/sinqhm.h"
-#include "sinqhmdriv.i"
+#include "psi/hardsup/sinqhm.h"
 #include "dynstring.h"
 #include "event.h"
 #include "status.h"
-#include "tdchm.h"
+#include "site.h"
 /*
 #define LOADDEBUG 1
 */
@@ -385,7 +384,8 @@
   pHistMem CreateHistMemory(char *driver)
   {
      pHistMem pNew = NULL;
-     
+     pSite site = NULL;
+
      /* make memory */
      pNew = (pHistMem)malloc(sizeof(HistMem));
      if(!pNew)
@@ -442,16 +442,18 @@
      if(strcmp(driver,"sim") == 0)
      {
         pNew->pDriv = CreateSIMHM(pNew->pOption);
-     }
-     else if(strcmp(driver,"sinqhm") == 0)
+     } 
+     else
      {
-       pNew->pDriv = CreateSINQDriver(pNew->pOption);
+       site = getSite();
+       if(site != NULL)
+       {
+	 pNew->pDriv = site->CreateHistogramMemoryDriver(driver,
+							 pNew->pOption);
+       }
      }
-     else if(strcmp(driver,"tdc") == 0)
-     {
-       pNew->pDriv = MakeTDCHM(pNew->pOption);
-     }
-     else /* no driver found */
+
+     if(pNew->pDriv == NULL)
      {
         DeleteDescriptor(pNew->pDes);
         DeleteStringDict(pNew->pOption);
diff --git a/histsim.c b/histsim.c
index c2846244..c1b0703a 100644
--- a/histsim.c
+++ b/histsim.c
@@ -217,7 +217,7 @@
     pCounterDriver pDriv;
     
     pDriv = (pCounterDriver)self->pPriv;
-    KillSIMCounter(pDriv);
+    DeleteCounterDriver(pDriv);
     return 1;
  } 
 /*------------------------------------------------------------------------*/
diff --git a/hkl.c b/hkl.c
index 1b889f99..3fce290e 100644
--- a/hkl.c
+++ b/hkl.c
@@ -30,7 +30,7 @@
 #include "matrix/matrix.h"
 #include "hkl.h"
 #include "hkl.i"
-
+#include "splitter.h"
 /*
   the space we leave in omega in order to allow for a scan to be done 
 */
@@ -1140,29 +1140,6 @@ ente:
      return 1;
   }
 /*--------------------------------------------------------------------------*/
-  int isNumeric(char *pText)
-  {
-    int i, ii, iGood;
-    static char pNum[13] = {"1234567890.+-"};
-    
-    for(i = 0; i < strlen(pText); i++)
-    {
-      for(ii = 0; ii < 13; ii++)
-      {
-        iGood = 0;
-        if(pText[i] == pNum[ii])
-        {
-          iGood = 1;
-          break;
-        }
-      }
-      if(!iGood)
-      {
-          return 0;
-      }
-    }    
-    return 1;
-  }  
                                   
 /*--------------------------------------------------------------------------*/
   static int GetCommandData(int argc, char *argv[], float fHKL[3], 
diff --git a/itc4.c b/itc4.c
deleted file mode 100644
index 35dbfca0..00000000
--- a/itc4.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/*---------------------------------------------------------------------------
-                      I T C 4
-	
-  This is the implementation for a ITC4 object derived from an more general
-  environment controller.
-  
-  Mark Koennecke, August 1997
-  
-       Copyright:
-
-       Labor fuer Neutronenstreuung
-       Paul Scherrer Institut
-       CH-5423 Villigen-PSI
-
-
-      The authors hereby grant permission to use, copy, modify, distribute,
-      and license this software and its documentation for any purpose, provided
-      that existing copyright notices are retained in all copies and that this
-      notice is included verbatim in any distributions. No written agreement,
-      license, or royalty fee is required for any of the authorized uses.
-      Modifications to this software may be copyrighted by their authors
-      and need not follow the licensing terms described here, provided that
-      the new terms are clearly indicated on the first page of each file where
-      they apply.
-
-      IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-      FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-      ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-      DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-      POSSIBILITY OF SUCH DAMAGE.
-
-      THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-      INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-      FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-      IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-      NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-      MODIFICATIONS.
-----------------------------------------------------------------------------*/
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <tcl.h>
-#include "fortify.h"
-#include "sics.h"
-#include "splitter.h"
-#include "obpar.h"
-#include "devexec.h"
-#include "nserver.h"
-#include "interrupt.h"
-#include "emon.h"
-#include "evcontroller.h"
-#include "evcontroller.i"
-#include "itc4.h"
-
-/*---------------------------------------------------------------------------*/
-  int ITC4SetPar(pEVControl self, char *name, float fNew, SConnection *pCon)
-  {
-    int iRet;
-     
-     /* check authorsisation */
-     if(!SCMatchRights(pCon,usUser))
-     {
-       SCWrite(pCon,"ERROR: you are not authorised to change this parameter",
-               eError);
-       return 0;        
-     }
-     
-     /* just catch those three names which we understand */
-     if(strcmp(name,"sensor") == 0)
-     {
-       iRet = SetSensorITC4(self->pDriv,(int)fNew);
-       if(!iRet)
-       {
-         SCWrite(pCon,"ERROR: value out of range",eError);
-         return 0;
-       }
-       iRet = ConfigITC4(self->pDriv);
-       if(iRet != 1)
-       {
-          SCWrite(pCon,"ERROR: ITC4 configuration failed! ",eError);
-          SCWrite(pCon,"INFO: Probably comm problem, Retry!",eError);
-          return 0;
-       }
-       SCSendOK(pCon);
-       return 1;
-     }
-     else if(strcmp(name,"control") == 0)
-     {
-       iRet = SetControlITC4(self->pDriv,(int)fNew);
-       if(!iRet)
-       {
-         SCWrite(pCon,"ERROR: value out of range",eError);
-         return 0;
-       }
-       iRet = ConfigITC4(self->pDriv);
-       if(iRet != 1)
-       {
-          SCWrite(pCon,"ERROR: ITC4 configuration failed! ",eError);
-          SCWrite(pCon,"INFO: Probably comm problem, Retry!",eError);
-          return 0;
-       }
-       SCSendOK(pCon);
-       return 1;
-     }
-     else if(strcmp(name,"timeout") == 0)
-     {
-       iRet = SetTMOITC4(self->pDriv,(int)fNew);
-       if(!iRet)
-       {
-         SCWrite(pCon,"ERROR: value out of range",eError);
-         return 0;
-       }
-       iRet = ConfigITC4(self->pDriv);
-       if(iRet != 1)
-       {
-          SCWrite(pCon,"ERROR: ITC4 configuration failed! ",eError);
-          SCWrite(pCon,"INFO: Probably comm problem, Retry!",eError);
-          return 0;
-       }
-       SCSendOK(pCon);
-       return 1;
-     }
-     else if(strcmp(name,"divisor") == 0)
-     {
-       iRet = SetDivisorITC4(self->pDriv,fNew);
-       if(!iRet)
-       {
-         SCWrite(pCon,"ERROR: value out of range",eError);
-         return 0;
-       }
-       iRet = ConfigITC4(self->pDriv);
-       if(iRet != 1)
-       {
-          SCWrite(pCon,"ERROR: ITC4 configuration failed! ",eError);
-          SCWrite(pCon,"INFO: Probably comm problem, Retry!",eError);
-          return 0;
-       }
-       SCSendOK(pCon);
-       return 1;
-     }
-     else if(strcmp(name,"multiplicator") == 0)
-     {
-       iRet = SetMultITC4(self->pDriv,fNew);
-       if(!iRet)
-       {
-         SCWrite(pCon,"ERROR: value out of range",eError);
-         return 0;
-       }
-       iRet = ConfigITC4(self->pDriv);
-       if(iRet != 1)
-       {
-          SCWrite(pCon,"ERROR: ITC4 configuration failed! ",eError);
-          SCWrite(pCon,"INFO: Probably comm problem, Retry!",eError);
-          return 0;
-       }
-       SCSendOK(pCon);
-       return 1;
-     }
-     else
-         return EVCSetPar(self,name,fNew,pCon);
-  }
-/*--------------------------------------------------------------------------*/
-  int ITC4GetPar(pEVControl self, char *name, float *fNew)
-  {
-    int iRet;
-    float fDiv;
-     
-     /* just catch those two names which we understand */
-     if(strcmp(name,"sensor") == 0)
-     {
-       iRet = GetSensorITC4(self->pDriv);
-       *fNew = (float)iRet;
-       return 1;
-     }
-     else if(strcmp(name,"control") == 0)
-     {
-       iRet = GetControlITC4(self->pDriv);
-       *fNew = (float)iRet;
-       return 1;
-     }
-     else if(strcmp(name,"timeout") == 0)
-     {
-       iRet = GetTMOITC4(self->pDriv);
-       *fNew = (float)iRet;
-       return 1;
-     }
-     else if(strcmp(name,"divisor") == 0)
-     {
-       fDiv = GetDivisorITC4(self->pDriv);
-       *fNew = fDiv;
-       return 1;
-     }
-     else if(strcmp(name,"multiplicator") == 0)
-     {
-       fDiv = GetMultITC4(self->pDriv);
-       *fNew = fDiv;
-       return 1;
-     }
-     else
-          return EVCGetPar(self,name,fNew);
-  }
-/*---------------------------------------------------------------------------*/
-  int ITCList(pEVControl self, SConnection *pCon)
-  {
-    char pBueffel[132];
-    int iRet;
-    
-    iRet = EVCList(self,pCon);
-    sprintf(pBueffel,"%s.sensor = %d\n",self->pName,
-            GetSensorITC4(self->pDriv));
-    SCWrite(pCon,pBueffel,eValue);
-    sprintf(pBueffel,"%s.control = %d\n",self->pName,
-            GetControlITC4(self->pDriv));
-    SCWrite(pCon,pBueffel,eValue);
-    sprintf(pBueffel,"%s.timeout  = %d\n",self->pName,
-            GetTMOITC4(self->pDriv));
-    SCWrite(pCon,pBueffel,eValue);
-    sprintf(pBueffel,"%s.divisor  = %f\n",self->pName,
-            GetDivisorITC4(self->pDriv));
-    SCWrite(pCon,pBueffel,eValue);
-    sprintf(pBueffel,"%s.multiplicator  = %f\n",self->pName,
-            GetMultITC4(self->pDriv));
-    SCWrite(pCon,pBueffel,eValue);
-    return iRet;        
-  }
-/*-------------------------------------------------------------------------*/
-  int ITC4Wrapper(SConnection *pCon, SicsInterp *pSics, void *pData,
-                  int argc, char *argv[])
-  {
-    pEVControl self = NULL;
-    char pBueffel[256];
-    int iRet;
-    double fNum;
-    float fVal;
-    
-    self = (pEVControl)pData;
-    assert(self);
-    assert(pCon);
-    assert(pSics);
-    
-    if(argc < 2)
-    {
-      return EVControlWrapper(pCon,pSics,pData,argc,argv);
-    }
-    
-    strtolower(argv[1]);
-    if((strcmp(argv[1],"sensor") == 0) || (strcmp(argv[1],"control") == 0) ||
-       (strcmp(argv[1],"timeout") == 0) || (strcmp(argv[1],"divisor") == 0) ||
-       (strcmp(argv[1],"multiplicator") == 0) )
-    {
-       if(argc > 2) /* set case */
-       {
-         iRet = Tcl_GetDouble(pSics->pTcl,argv[2],&fNum);
-         if(iRet != TCL_OK)
-         {
-           sprintf(pBueffel,"ERROR: expected number, got %s",argv[2]);
-           SCWrite(pCon,pBueffel,eError);
-           return 0;
-         }  
-         return ITC4SetPar(self,argv[1],(float)fNum,pCon);
-       }
-       else /* get case */
-       {
-          iRet = ITC4GetPar(self,argv[1],&fVal);
-          sprintf(pBueffel,"%s.%s = %f\n",self->pName,
-                  argv[1],fVal);
-          SCWrite(pCon,pBueffel,eValue);
-          return 1;
-       }
-    }
-    else if(strcmp(argv[1],"list") == 0)
-    { 
-      return ITCList(self,pCon);
-    }
-    else
-    {
-      return EVControlWrapper(pCon,pSics,pData,argc,argv);
-    }
-    /* not reached */
-    return 0; 
-  }  
diff --git a/itc4.h b/itc4.h
deleted file mode 100644
index 1068ef3d..00000000
--- a/itc4.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-/*-------------------------------------------------------------------------
-                             ITC 4
- 
-  Support for Oxford Instruments ITC4 Temperature controllers for SICS.
-  The meaning and working of the functions defined is as desribed for a
-  general environment controller.
-
-  Mark Koennecke, Juli 1997
-
-  copyright: see implementation file.
-
------------------------------------------------------------------------------*/
-#ifndef SICSITC4
-#define SICSITC4
-/*------------------------- The Driver ------------------------------------*/
-
-   pEVDriver CreateITC4Driver(int argc, char *argv[]);
-   int       ConfigITC4(pEVDriver self);
-   int       SetSensorITC4(pEVDriver self, int iSensor);
-   int       SetControlITC4(pEVDriver self, int iSensor);
-   int       GetSensorITC4(pEVDriver self);
-   int       GetControlITC4(pEVDriver self);
-   int       SetDivisorITC4(pEVDriver self, float iSensor);
-   float       GetDivisorITC4(pEVDriver self);
-   int       SetMultITC4(pEVDriver self, float iSensor);
-   float       GetMultITC4(pEVDriver self);
-   int       SetTMOITC4(pEVDriver self, int iSensor);
-   int       GetTMOITC4(pEVDriver self);
-
-
-/*------------------------- The ITC4 object ------------------------------*/
-
-     int ITC4Wrapper(SConnection *pCon, SicsInterp *pSics, void *pData,
-                     int argc, char *argv[]);
-     int ITC4SetPar(pEVControl self, char *name, float fNew, 
-                   SConnection *pCon);
-     int ITC4GetPar(pEVControl self, char *name, float *fVal);
-     int ITCList(pEVControl self, SConnection *pCon);
-
-
-#endif 
- 
diff --git a/itc4.w b/itc4.w
deleted file mode 100644
index 98d83f9e..00000000
--- a/itc4.w
+++ /dev/null
@@ -1,74 +0,0 @@
-\subsubsection{Oxford Instruments ITC4 Temperature Controllers}
-SINQ makes heavy use of Oxford Instruments ITC4 temperature controllers. In
-order to support them the following software components had to be defined in
-addition to the basic environmet controller interfaces:
-\begin{itemize}
-\item ITC4driver, naturally. 
-\item A ITC4-controller object as derivation of environment controller. ITC4
-'s allow you to select a sensor which you read as your standard sensor and a
-sensor which is used for automatic control. The ITC4 controller object adds
-just that additional functionality to the statndard environment controller. 
-\end{itemize}
-The additional data, the selection of sensors, will be kept in the driver.
-This serves  also an example for implementing inheritance without C++.
-
-The driver interface:
-@d itcd @{
-   pEVDriver CreateITC4Driver(int argc, char *argv[]);
-   int       ConfigITC4(pEVDriver self);
-   int       SetSensorITC4(pEVDriver self, int iSensor);
-   int       SetControlITC4(pEVDriver self, int iSensor);
-   int       GetSensorITC4(pEVDriver self);
-   int       GetControlITC4(pEVDriver self);
-   int       SetDivisorITC4(pEVDriver self, float iSensor);
-   float       GetDivisorITC4(pEVDriver self);
-   int       SetMultITC4(pEVDriver self, float iSensor);
-   float       GetMultITC4(pEVDriver self);
-   int       SetTMOITC4(pEVDriver self, int iSensor);
-   int       GetTMOITC4(pEVDriver self);
-
-@}
-
-The ConfigITC4 is special. It has to be called to commit changes to the
-driver read and control parameters. 
-
-The ITC4 object interface:
-@d itco @{
-     int ITC4Wrapper(SConnection *pCon, SicsInterp *pSics, void *pData,
-                     int argc, char *argv[]);
-     int ITC4SetPar(pEVControl self, char *name, float fNew, 
-                   SConnection *pCon);
-     int ITC4GetPar(pEVControl self, char *name, float *fVal);
-     int ITCList(pEVControl self, SConnection *pCon);
-@}
-
-The functions defined are: new parameter handling functions, with just
-support for the two extra parameters added and a new Wrapper function for
-SICS. The meaning of all these functions, their parameters and return values
-are identical to those defined for an environment controller. Additionally,
-the standard environment controller functions will work as described. The
-functions described above are just needed to implement the extra parameters.
-
-@o itc4.h @{
-/*-------------------------------------------------------------------------
-                             ITC 4
- 
-  Support for Oxford Instruments ITC4 Temperature controllers for SICS.
-  The meaning and working of the functions defined is as desribed for a
-  general environment controller.
-
-  Mark Koennecke, Juli 1997
-
-  copyright: see implementation file.
-
------------------------------------------------------------------------------*/
-#ifndef SICSITC4
-#define SICSITC4
-/*------------------------- The Driver ------------------------------------*/
-@<itcd@>
-/*------------------------- The ITC4 object ------------------------------*/
-@<itco@>
-
-#endif 
- 
-@}
diff --git a/itc4driv.c b/itc4driv.c
deleted file mode 100644
index 37c654fe..00000000
--- a/itc4driv.c
+++ /dev/null
@@ -1,470 +0,0 @@
-/*--------------------------------------------------------------------------
-			     I T C 4 D R I V
-
-     This file contains the implementation of a driver for the Oxford 
-     Instruments ITC4 Temperature controller.
-
-  
-      Mark Koennecke, Juli 1997
-
-       Copyright:
-
-       Labor fuer Neutronenstreuung
-       Paul Scherrer Institut
-       CH-5423 Villigen-PSI
-
-
-      The authors hereby grant permission to use, copy, modify, distribute,
-      and license this software and its documentation for any purpose, provided
-      that existing copyright notices are retained in all copies and that this
-      notice is included verbatim in any distributions. No written agreement,
-      license, or royalty fee is required for any of the authorized uses.
-      Modifications to this software may be copyrighted by their authors
-      and need not follow the licensing terms described here, provided that
-      the new terms are clearly indicated on the first page of each file where
-      they apply.
-
-      IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-      FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-      ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-      DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-      POSSIBILITY OF SUCH DAMAGE.
-
-      THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-      INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-      FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-      IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-      NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-      MODIFICATIONS.
-----------------------------------------------------------------------------*/
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <math.h>
-#include <assert.h>
-#include "fortify.h"
-#include "conman.h"
-#include "servlog.h"
-#include "fortify.h"
-
-  typedef struct __EVDriver  *pEVDriver;
-
-#include "evdriver.i"  
-#include "hardsup/itc4util.h"
-#include "hardsup/el734_def.h"
-#include "hardsup/el734fix.h"
-#define SHITTYVALUE -777
-/*------------------------- The Driver ------------------------------------*/
-
-   pEVDriver CreateITC4Driver(int argc, char *argv[]);
-      int       ConfigITC4(pEVDriver self);
-      
-      
-/*-----------------------------------------------------------------------*/
-  typedef struct {
-                   pITC4 pData;
-                   char *pHost;
-                   int iPort;
-                   int iChannel;
-                   int iControl;
-                   float fDiv;
-                   float fMult;
-                   int iRead;
-                   int iTmo;
-                   int iLastError;
-                  } ITC4Driv, *pITC4Driv;
-/*----------------------------------------------------------------------------*/
-  static int GetITC4Pos(pEVDriver  self, float *fPos)
-  {
-     pITC4Driv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pITC4Driv)self->pPrivate;
-     assert(pMe);
-   
-     iRet = ITC4_Read(&pMe->pData,fPos);     
-     if(iRet != 1 )
-     {
-       pMe->iLastError = iRet;
-       return 0;
-     }
-     if( (*fPos < 0) || (*fPos > 10000) )
-     {
-       *fPos = -999.;
-       pMe->iLastError = SHITTYVALUE;
-       return 0;
-     }
-     return 1;
-  } 
-/*----------------------------------------------------------------------------*/
-  static int ITC4Run(pEVDriver self, float fVal)
-  {
-     pITC4Driv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pITC4Driv )self->pPrivate;
-     assert(pMe);
-
-     iRet  = ITC4_Set(&pMe->pData,fVal);
-     if(iRet != 1)
-     {
-       pMe->iLastError = iRet;
-       return 0;
-     }
-     return 1;
- }
-/*--------------------------------------------------------------------------*/
-  static int ITC4Error(pEVDriver self, int *iCode, char *error, int iErrLen)
-  {
-     pITC4Driv pMe = NULL;
-     
-     assert(self);
-     pMe = (pITC4Driv)self->pPrivate;
-     assert(pMe);
-
-     *iCode = pMe->iLastError;
-     if(pMe->iLastError == SHITTYVALUE)
-     {
-       strncpy(error,"Invalid temperature returned form ITC4, check sensor",iErrLen);
-     }
-     else
-     {
-        ITC4_ErrorTxt(&pMe->pData,pMe->iLastError,error,iErrLen);    
-     }
-    return 1;
-  }
-/*--------------------------------------------------------------------------*/
-  static int ITC4Send(pEVDriver self, char *pCommand, char *pReply, int iLen)
-  {
-     pITC4Driv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pITC4Driv )self->pPrivate;
-     assert(pMe);
-
-     iRet  = ITC4_Send(&pMe->pData,pCommand, pReply,iLen);
-     if(iRet != 1)
-     {
-       pMe->iLastError = iRet;
-       return 0;
-     }
-     return 1;
-
-  }  
-/*--------------------------------------------------------------------------*/
-  static int ITC4Init(pEVDriver self)
-  {
-     pITC4Driv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pITC4Driv )self->pPrivate;
-     assert(pMe);
-
-     pMe->pData = NULL;
-     iRet = ITC4_Open(&pMe->pData, pMe->pHost, pMe->iPort, pMe->iChannel,0);
-     if(iRet != 1)
-     {
-       if(iRet == ITC4__NOITC)
-       {
-         return -1;
-       }
-       else
-       {
-         pMe->iLastError = iRet;
-         return 0;
-       }  
-     }
-     return 1;
-  }  
-/*--------------------------------------------------------------------------*/
-  static int ITC4Close(pEVDriver self)
-  {
-     pITC4Driv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pITC4Driv )self->pPrivate;
-     assert(pMe);
-
-     ITC4_Close(&pMe->pData);
-     return 1;
-  }  
-/*---------------------------------------------------------------------------*/
-  static int ITC4Fix(pEVDriver self, int iError)
-  {
-     pITC4Driv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pITC4Driv )self->pPrivate;
-     assert(pMe);
-
-        switch(iError)
-        {
-            /* network errors */
-            case EL734__BAD_FLUSH:
-            case EL734__BAD_RECV:
-            case EL734__BAD_RECV_NET:
-            case EL734__BAD_RECV_UNKN:
-            case EL734__BAD_RECVLEN:
-            case EL734__BAD_RECV1:
-            case EL734__BAD_RECV1_PIPE:
-            case EL734__BAD_RNG:
-            case EL734__BAD_SEND:
-            case EL734__BAD_SEND_PIPE:
-            case EL734__BAD_SEND_NET:
-            case EL734__BAD_SEND_UNKN:
-            case EL734__BAD_SENDLEN:
-                      ITC4Close(self);
-                      iRet = ITC4Init(self);
-                      if(iRet)
-                      {
-                        return DEVREDO;
-                      }                 
-                      else
-                      {
-                        return DEVFAULT;
-                      }                 
-                      break;
-            /* handable protocoll errors */
-            case EL734__BAD_TMO:
-                      return DEVREDO;
-                      break;
-            case -501: /* Bad_COM */
-                      return DEVREDO;
-            case -504: /* Badly formatted */
-                      return DEVREDO;                              
-            default:
-                      return DEVFAULT;
-                      break;                       
-        }
-        return DEVFAULT;
-  }
-     
-/*--------------------------------------------------------------------------*/
-  static int ITC4Halt(pEVDriver *self)
-  {
-     assert(self);
-     
-     return 1;
-  }
-/*------------------------------------------------------------------------*/
-  void KillITC4(void *pData)
-  {
-     pITC4Driv pMe = NULL;
-     
-     pMe = (pITC4Driv)pData;
-     assert(pMe);
-     
-     if(pMe->pHost)
-     {
-        free(pMe->pHost);
-     }
-     free(pMe);
-  }  
-/*------------------------------------------------------------------------*/
-  pEVDriver CreateITC4Driver(int argc, char *argv[])
-  {
-     pEVDriver pNew = NULL;
-     pITC4Driv pSim = NULL;
-     
-     /* check for arguments */
-     if(argc < 3)
-     {
-       return NULL;
-     }
-     
-     pNew = CreateEVDriver(argc,argv);
-     pSim = (pITC4Driv)malloc(sizeof(ITC4Driv));
-     memset(pSim,0,sizeof(ITC4Driv));
-     if(!pNew || !pSim)
-     {
-       return NULL;
-     }
-     pNew->pPrivate = pSim;
-     pNew->KillPrivate = KillITC4;
-     
-     /* initalise pITC4Driver */
-     pSim->iControl = 1;
-     pSim->iRead = 1;
-     pSim->iLastError = 0;
-     pSim->iTmo = 10;
-     pSim->fDiv = 10.;
-     pSim->fMult = 10;
-     pSim->pHost = strdup(argv[0]);
-     pSim->iPort = atoi(argv[1]);
-     pSim->iChannel = atoi(argv[2]);
-     
-     
-     /* initialise function pointers */
-     pNew->SetValue = ITC4Run;
-     pNew->GetValue = GetITC4Pos;
-     pNew->Send     = ITC4Send;
-     pNew->GetError = ITC4Error;
-     pNew->TryFixIt = ITC4Fix;
-     pNew->Init     = ITC4Init;
-     pNew->Close    = ITC4Close;
-     
-     return pNew; 
-  }	
-/*--------------------------------------------------------------------------*/
-  int ConfigITC4(pEVDriver self)
-  {
-     pITC4Driv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pITC4Driv )self->pPrivate;
-     assert(pMe);
-
-     iRet = ITC4_Config(&pMe->pData, pMe->iTmo, pMe->iRead, 
-                        pMe->iControl,pMe->fDiv,pMe->fMult);
-     if(iRet < 0)
-     {
-       pMe->iLastError = iRet;
-       return 0;
-     }
-     return 1;
-  }
-/*-------------------------------------------------------------------------*/
-  int SetSensorITC4(pEVDriver self, int iSensor)
-  {
-     pITC4Driv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pITC4Driv )self->pPrivate;
-     assert(pMe);
-
-     if( (iSensor < 1) || (iSensor > 4) )
-     {
-        return 0;
-     } 
-     pMe->iRead = iSensor;
-     return 1;
-  }
-/*-------------------------------------------------------------------------*/
-  int SetControlITC4(pEVDriver self, int iSensor)
-  {
-     pITC4Driv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pITC4Driv )self->pPrivate;
-     assert(pMe);
-
-     if( (iSensor < 1) || (iSensor > 4) )
-     {
-        return 0;
-     } 
-     pMe->iControl = iSensor;
-     return 1;
-  }
-/*-------------------------------------------------------------------------*/
-  int SetTMOITC4(pEVDriver self, int iSensor)
-  {
-     pITC4Driv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pITC4Driv )self->pPrivate;
-     assert(pMe);
-
-     if(iSensor < 10)
-     {
-        return 0;
-     } 
-     pMe->iTmo = iSensor;
-     return 1;
-  }
-/*-------------------------------------------------------------------------*/
-  int GetControlITC4(pEVDriver self)
-  {
-     pITC4Driv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pITC4Driv )self->pPrivate;
-     assert(pMe);
-
-     return pMe->iControl;
-  }
-/*-------------------------------------------------------------------------*/
-  int GetSensorITC4(pEVDriver self)
-  {
-     pITC4Driv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pITC4Driv )self->pPrivate;
-     assert(pMe);
-
-     return pMe->iRead;
-  }
-/*-------------------------------------------------------------------------*/
-  int GetTMOITC4(pEVDriver self)
-  {
-     pITC4Driv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pITC4Driv )self->pPrivate;
-     assert(pMe);
-
-     return pMe->iTmo;
-  }
-/*-------------------------------------------------------------------------*/
-  float GetDivisorITC4(pEVDriver self)
-  {
-     pITC4Driv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pITC4Driv )self->pPrivate;
-     assert(pMe);
-
-     return pMe->fDiv;
-  }
-/*--------------------------------------------------------------------------*/
-  int SetDivisorITC4(pEVDriver self, float fDiv)
-  {
-     pITC4Driv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pITC4Driv )self->pPrivate;
-     assert(pMe);
-
-     pMe->fDiv = fDiv;
-     return 1;
-  }
-/*-------------------------------------------------------------------------*/
-  float GetMultITC4(pEVDriver self)
-  {
-     pITC4Driv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pITC4Driv )self->pPrivate;
-     assert(pMe);
-
-     return pMe->fMult;
-  }
-/*--------------------------------------------------------------------------*/
-  int SetMultITC4(pEVDriver self, float fDiv)
-  {
-     pITC4Driv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pITC4Driv )self->pPrivate;
-     assert(pMe);
-
-     pMe->fMult = fDiv;
-     return 1;
-  }
-  
\ No newline at end of file
diff --git a/ltc11.c b/ltc11.c
deleted file mode 100644
index 95929b54..00000000
--- a/ltc11.c
+++ /dev/null
@@ -1,828 +0,0 @@
-/*-------------------------------------------------------------------------
-                           L T C 1 1
-    an environment control device driver for a Neocera LTC-11 temperature
-    controller.                        
-    
-    copyright: see copyright.h
-    
-    Mark Koennecke, November 1998                   
----------------------------------------------------------------------------*/
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <tcl.h>
-#include <math.h>
-#include <assert.h>
-#include "fortify.h"
-#include "sics.h"
-#include "obpar.h"
-#include "evcontroller.h"
-#include "evcontroller.i"
-#include "evdriver.i"  
-#include "hardsup/serialsinq.h"
-#include "hardsup/el734_errcodes.h"
-#include "hardsup/el734fix.h"
-#include "ltc11.h"
-
-/*
-#define debug 1
-*/
-/*-----------------------------------------------------------------------
-             The LTC11 Data Structure 
-*/             
-  typedef struct {
-                   void *pData;
-                   char *pHost;
-                   int iPort;
-                   int iChannel;
-                   int iMode;
-                   int iSensor;
-                   int iControlHeat;
-                   int iControlAnalog;
-                   int iLastError;
-                   time_t lastRequest;
-                   float fLast;
-                  } LTC11Driv, *pLTC11Driv;
-/*-----------------------------------------------------------------------
-  A couple of defines for LTC11 modes and special error conditions
-*/
-#define ANALOG 2
-#define HEATER 1
-#define MISERABLE 3
-
-/* errors */
-#define BADSTATE -920
-#define NOCONN   -921
-#define BADANSWER -923
-#define BADCONFIRM -924
-/*-----------------------------------------------------------------------*/
-  static void LTC11Unlock(pLTC11Driv self)
-  {
-      SerialNoReply(&(self->pData),"SLLOCK 0;");
-  }
-
-/*-------------------------------------------------------------------------
-  The LTC11 can either control a heater or an analog output. It is a common
-  task to figure out which mode is active. If the value returned from QOUT
-  is 3, no sensor is defined, if it is 6 it is in monitor mode, in both cases
-  control is NOT there.
-*/
- int LTC11GetMode(pEVDriver pEva, int *iMode)
- {
-    pLTC11Driv self = NULL;
-    int iRet, iiMode;
-    char pBueffel[80];
-    
-    self = (pLTC11Driv)pEva->pPrivate;
-    assert(self);
-    
-     if(self->pData == NULL)
-     {
-       self->iLastError = NOCONN;
-       return 0;
-     }
-    
-     /* query the state, it can be in an invalid mode */
-     iRet = SerialWriteRead(&(self->pData),"QISTATE?;",pBueffel,79);
-     LTC11Unlock(self);
-     if(iRet !=  1)
-     {
-        self->iLastError = iRet;
-        return 0;
-     }
-     if(strcmp(pBueffel,"?TMO") == 0)
-     {
-       self->iLastError = TIMEOUT;
-       return 0;
-     }
-     if(sscanf(pBueffel,"%d",&iiMode) != 1)
-     {
-       self->iLastError = EL734__BAD_ILLG;
-       return 0;
-     }
-     if( (iiMode != 1) && (iiMode != 2) )
-     {
-        self->iLastError = BADSTATE;
-        *iMode = MISERABLE;
-        return 0;
-     } 
-     
-     /* check the sensor in heater mode */
-     iRet = SerialWriteRead(&(self->pData),"QOUT?1;",pBueffel,79);
-     LTC11Unlock(self);
-     if(iRet !=  1)
-     {
-        self->iLastError = iRet;
-        return 0;
-     }
-     if(strcmp(pBueffel,"?TMO") == 0)
-     {
-       self->iLastError = TIMEOUT;
-       return 0;
-     }
-     if(sscanf(pBueffel,"%d",&iiMode) != 1)
-     {
-       self->iLastError = EL734__BAD_ILLG;
-       return 0;
-     }
-     if( (iiMode != 3) && (iiMode != 6 ) )
-     {
-            *iMode = HEATER;
-            self->iControlHeat = iiMode;
-            return 1;
-     } 
-
-     /* check the sensor in analog mode */
-     iRet = SerialWriteRead(&(self->pData),"QOUT?2;",pBueffel,79);
-     LTC11Unlock(self);
-     if(iRet !=  1)
-     {
-        self->iLastError = iRet;
-        return 0;
-     }
-     if(strcmp(pBueffel,"?TMO") == 0)
-     {
-       self->iLastError = TIMEOUT;
-       return 0;
-     }
-     if(sscanf(pBueffel,"%d",&iiMode) != 1)
-     {
-       self->iLastError = EL734__BAD_ILLG;
-       return 0;
-     }
-     if( (iiMode != 3) && (iiMode != 6 ) )
-     {
-            *iMode = ANALOG;
-            self->iControlAnalog = iiMode;
-            return 1;
-     } 
-     /* if we are here something is very bad */
-     self->iLastError = BADSTATE;
-     return 0;
- }   
-/*-----------------------------------------------------------------------
-  iMode below 10 will be interpreted as heater control, above 10 as analog
-  control.
-*/  
-  int LTC11SetMode(pEVDriver pEva, int iMode)
-  {
-    pLTC11Driv self = NULL;
-    int iRet, iiMode;
-    char pBueffel[80], pCommand[20];
-    
-     self = (pLTC11Driv)pEva->pPrivate;
-     assert(self);
-    
-     if(self->pData == NULL)
-     {
-       self->iLastError = NOCONN;
-       return 0;
-     }
- 
-     if(iMode < 10) /* heater mode */
-     {
-        sprintf(pCommand,"SHCONT%1.1d;",iMode);
-        iRet = SerialNoReply(&(self->pData),pCommand);
-        LTC11Unlock(self);
-        if(iRet != 1)
-        {
-          self->iLastError = iRet;
-          return 0;
-        }
-        return 1;
-     }    
-     else
-     {
-       iMode -= 10;
-        sprintf(pCommand,"SACONT%1.1d;",iMode);
-        iRet = SerialNoReply(&(self->pData),pCommand);
-        LTC11Unlock(self);
-        if(iRet != 1)
-        {
-          self->iLastError = iRet;
-          return 0;
-        }
-        return 1;
-     }
-     /* should not get here */
-     self->iLastError = BADSTATE;
-     return 0;   
-  }
-/*-------------------------------------------------------------------------*/
-  static int LTC11Get(pEVDriver pEva, float *fValue)
-  {
-     pLTC11Driv self = NULL;
-     int iRet;
-     char pBueffel[80];
-     char pCommand[46];
-     char c;
-     float fVal;
-     
-     self = (pLTC11Driv)pEva->pPrivate;
-     assert(self);
-
-     if(self->pData == NULL)
-     {
-       self->iLastError = NOCONN;
-       return 0;
-     }
-     
-     if(time(NULL) < self->lastRequest)
-     {
-       *fValue = self->fLast;
-       return 1;
-     } 
-     else
-     {
-        self->lastRequest = time(NULL) + 5; /* buffer 5 seconds */
-     }
-     sprintf(pCommand,"QSAMP?%1.1d;",self->iSensor);
-     iRet = SerialWriteRead(&(self->pData),pCommand,pBueffel,79);
-     LTC11Unlock(self);
-     if(iRet != 1)
-     {
-       self->iLastError = iRet;
-       return 0;
-     }
-     if(strcmp(pBueffel,"?TMO") == 0)
-     {
-       self->iLastError = TIMEOUT;
-       return 0;
-     }
-     iRet = sscanf(pBueffel,"%f%c",fValue,&c);
-     if(iRet != 2)
-     {
-        self->iLastError = BADANSWER;
-        return 0;
-     }
-     if( (c != 'K') && (c != 'C') && (c != 'F') && (c != 'N') 
-         && (c != 'V') && (c != 'O') )
-     {
-        self->iLastError = BADANSWER;
-        return 0;
-     }    
-     self->fLast = *fValue;
-     return 1;    
-  }
-/*-------------------------------------------------------------------------*/
-  static int LTC11Run(pEVDriver pEva, float fVal)
-  {
-     pLTC11Driv self = NULL;
-     int iRet, iMode;
-     char pBueffel[80];
-     char pCommand[40];
-     float fTest = 0.0, fDelta;
-     
-     self = (pLTC11Driv)pEva->pPrivate;
-     assert(self);
-     
-     if(self->pData == NULL)
-     {
-       self->iLastError = NOCONN;
-       return 0;
-     }
-
-     /* find our operation mode */
-     iRet = LTC11GetMode(pEva,&iMode);
-     if( (iRet < 1) || (iMode == MISERABLE) )
-     {
-        return 0;
-     } 
-    
-     /* format command */
-     sprintf(pCommand,"SETP %d,%f;",iMode, fVal);
-     
-     /* send command */
-     iRet = SerialNoReply(&(self->pData),pCommand);
-     if(iRet != 1)
-     {
-       self->iLastError = iRet;
-       LTC11Unlock(self);
-       return 0;
-     }
-  
-     /* read back */
-     sprintf(pCommand,"QSETP?%d;", iMode);
-     iRet = SerialWriteRead(&(self->pData),pCommand,pBueffel,79);       
-     LTC11Unlock(self);
-     if(iRet != 1)
-     {
-       self->iLastError = iRet;
-       return 0;
-     }
-
-     /* check confirmation */
-     if(strcmp(pBueffel,"?TMO") == 0)
-     {
-       self->iLastError = TIMEOUT;
-       return 0;
-     }
-     sscanf(pBueffel,"%f",&fTest);
-     fDelta = fVal - fTest;
-     if(fDelta < 0.0)
-        fDelta = -fDelta;
-     
-     if(fDelta > 0.1)
-     {
-       self->iLastError = BADCONFIRM;
-       return 0;
-     }   
-
-     return 1;
-  }
-/*------------------------------------------------------------------------*/
-  static int LTC11Error(pEVDriver pEva, int *iCode, char *pError, 
-                         int iErrLen)
-  {
-     pLTC11Driv self = NULL;
-
-     self = (pLTC11Driv)pEva->pPrivate;
-     assert(self);
-
-     *iCode = self->iLastError;
-     switch(*iCode)
-     {
-        case NOCONN:
-             strncpy(pError,"No Connection to Bruker Controller",iErrLen);
-             break;     
-        case MISERABLE:
-        case BADSTATE:
-             strncpy(pError,"The LTC-11 is in a very bad state",iErrLen);
-             break;
-        case BADANSWER:
-             strncpy(pError,"The LTC-11 returned a bad reply",iErrLen);
-             break; 
-        case BADCONFIRM:
-             strncpy(pError,"The LTC-11 did not accept the new set point",iErrLen);
-             break; 
-        case TIMEOUT:
-             strncpy(pError,"Timeout receiving data from LTC-11",iErrLen);
-             break;     
-        default:
-             SerialError(*iCode,pError,iErrLen);
-             break;                                
-     }
-     return 1;    
-  }           
-/*---------------------------------------------------------------------------*/
-  static int LTC11Send(pEVDriver pEva, char *pCommand, char *pReply,
-                        int iReplyLen)
-  {
-     pLTC11Driv self = NULL;
-     int iRet;
-
-     self = (pLTC11Driv)pEva->pPrivate;
-     assert(self);
-
-     if(self->pData == NULL)
-     {
-       self->iLastError = NOCONN;
-       return 0;
-     }
-
-
-     iRet = SerialWriteRead(&(self->pData),pCommand, pReply, iReplyLen);
-     if(iRet != 1)
-     {
-        self->iLastError = iRet;
-        return 0;
-     }
-     return 1;
-  } 
-/*--------------------------------------------------------------------------*/
-  static int LTC11Init(pEVDriver pEva)
-  {
-     pLTC11Driv self = NULL;
-     int iRet;
-     char pBueffel[80], pCommand[20];
-
-     self = (pLTC11Driv)pEva->pPrivate;
-     assert(self);
-
-     /* open port connection */
-     self->pData = NULL;
-     iRet = SerialOpen(&(self->pData),self->pHost, self->iPort, self->iChannel);
-     if(iRet != 1)
-     {
-       self->iLastError = iRet;
-       return 0;
-     }       
-     /* configure serial port terminators */
-     SerialSendTerm(&(self->pData),";");
-     SerialATerm(&(self->pData),"1;");
-     SerialConfig(&(self->pData),30000);
-
-     self->iSensor = 1;
-     
-     /* initialize control sensors to unknown, then call GetMode
-        to get real values 
-     */    
-     self->iControlHeat = 6;
-     self->iControlAnalog = 6;
-     LTC11GetMode(pEva,&iRet);
-  
-     return 1;      
-  }
-/*-------------------------------------------------------------------------*/
-  static int LTC11Close(pEVDriver pEva)
-  {
-     pLTC11Driv self = NULL;
-
-     self = (pLTC11Driv)pEva->pPrivate;
-     assert(self);
-
-     SerialClose(&(self->pData));
-     self->pData = 0;
-       
-     return 1;  
-  }
-/*---------------------------------------------------------------------------*/
-  static int LTC11Fix(pEVDriver self, int iError)
-  {
-     pLTC11Driv pMe = NULL;
-     int iRet;
-     char pCommand[20], pBueffel[80];
-     
-     assert(self);
-     pMe = (pLTC11Driv )self->pPrivate;
-     assert(pMe);
-
-        switch(iError)
-        {
-            /* network errors */
-            case EL734__BAD_FLUSH:
-            case EL734__BAD_RECV:
-            case EL734__BAD_RECV_NET:
-            case EL734__BAD_RECV_UNKN:
-            case EL734__BAD_RECVLEN:
-            case EL734__BAD_RECV1:
-            case EL734__BAD_RECV1_PIPE:
-            case EL734__BAD_RNG:
-            case EL734__BAD_SEND:
-            case EL734__BAD_SEND_PIPE:
-            case EL734__BAD_SEND_NET:
-            case EL734__BAD_SEND_UNKN:
-            case EL734__BAD_SENDLEN:
-                      LTC11Close(self);
-                      iRet = LTC11Init(self);
-                      if(iRet)
-                      {
-                        return DEVREDO;
-                      }                 
-                      else
-                      {
-                        return DEVFAULT;
-                      }                 
-                      break;
-            case EL734__FORCED_CLOSED:
-            case NOCONN:
-                      iRet = LTC11Init(self);
-                      if(iRet)
-                      {
-                        return DEVREDO;
-                      }                 
-                      else
-                      {
-                        return DEVFAULT;
-                      }                 
-                      break;
-            /* fixable LTC11 Errors */
-            case MISERABLE:
-            case BADSTATE:
-                      iRet = SerialNoReply(&(pMe->pData),"SCONT;");
-                      LTC11Unlock(pMe);
-                      return DEVREDO;
-                      break;
-            case BADANSWER:
-            case BADCONFIRM:
-            case TIMEOUT:
-                      return DEVREDO;
-                      break;          
-            default:
-                      return DEVFAULT;
-                      break;                       
-        }
-        return DEVFAULT;
-  }
-/*------------------------------------------------------------------------*/
-  void KillLTC11(void *pData)
-  {
-     pLTC11Driv pMe = NULL;
-     
-     pMe = (pLTC11Driv)pData;
-     assert(pMe);
-     
-     if(pMe->pHost)
-     {
-        free(pMe->pHost);
-     }
-     free(pMe);
-  }  
-/*------------------------------------------------------------------------*/
-  pEVDriver CreateLTC11Driver(int argc, char *argv[])
-  {
-     pEVDriver pNew = NULL;
-     pLTC11Driv pSim = NULL;
-     
-     /* check for arguments */
-     if(argc < 3)
-     {
-       return NULL;
-     }
-     
-     pNew = CreateEVDriver(argc,argv);
-     pSim = (pLTC11Driv)malloc(sizeof(LTC11Driv));
-     memset(pSim,0,sizeof(LTC11Driv));
-     if(!pNew || !pSim)
-     {
-       return NULL;
-     }
-     pNew->pPrivate = pSim;
-     pNew->KillPrivate = KillLTC11;
-     
-     /* initalise LTC11Driver */
-     pSim->iLastError = 0;
-     pSim->pHost = strdup(argv[0]);
-     pSim->iPort = atoi(argv[1]);
-     pSim->iChannel = atoi(argv[2]);
-     
-     
-     /* initialise function pointers */
-     pNew->SetValue = LTC11Run;
-     pNew->GetValue = LTC11Get;
-     pNew->Send     = LTC11Send;
-     pNew->GetError = LTC11Error;
-     pNew->TryFixIt = LTC11Fix;
-     pNew->Init     = LTC11Init;
-     pNew->Close    = LTC11Close;
-     
-     return pNew; 
-  }	
-/*------------------------------------------------------------------------*/
-  static int LTC11AssignControl(pEVDriver pEva, int iMode, int iSensor)
-  {
-     pLTC11Driv self = NULL;
-     int iRet, iRead = 0;
-     char pBueffel[80], pCommand[50];
-
-     self = (pLTC11Driv)pEva->pPrivate;
-     assert(self);
-     assert( (iMode == HEATER) || (iMode == ANALOG) );
-     
-     if(!self->pData)
-     {
-       self->iLastError = NOCONN;
-       return 0;
-     }
-     sprintf(pCommand,"SOSEN %d,%d;",iMode,iSensor);
-     iRet = SerialNoReply(&(self->pData),pCommand);
-     if(iRet != 1)
-     {
-        self->iLastError = iRet;
-        return 0;
-     }
-     sprintf(pCommand,"QOUT?%d;",iMode);
-     iRet = SerialWriteRead(&(self->pData),pCommand,pBueffel,79);
-     LTC11Unlock(self);
-     if(strcmp(pBueffel,"?TMO") == 0)
-     {
-       self->iLastError = TIMEOUT;
-       return 0;
-     }
-     sscanf(pBueffel,"%d;",&iRead);
-     if(iRead != iSensor)
-     {
-       self->iLastError = BADCONFIRM;
-       return 0;
-     }
-     if(iMode == ANALOG)
-     {
-       self->iControlAnalog = iSensor;
-     }
-     else
-     {
-       self->iControlHeat = iSensor;
-     }
-     /* switch back to control mode */
-     SerialNoReply(&(self->pData),"SCONT;");
-     return 1;
-  }  
-/*--------------------------------------------------------------------------
-  handle LTC11 specific commands:
-  - sensor           requests or sets read sensor
-  - mode             requests or sets operation mode
-  - controlheat      requests or sets sensor for heater control
-  - controlanalog    requests or sets sensor for analog control
-  in all other cases fall back and call EVControllerWrapper to handle it or
-  eventually throw an error.
-*/  
-  int LTC11Action(SConnection *pCon, SicsInterp *pSics, void *pData,
-                   int argc, char *argv[])
-  {
-  
-     pEVControl self = NULL;
-     int iRet, iMode;
-     char pBueffel[256], pError[132];
-     pLTC11Driv pMe = NULL;
-     float fVal;
-     
-     self = (pEVControl)pData;
-     assert(self);
-     pMe = (pLTC11Driv)self->pDriv->pPrivate;
-     assert(pMe);
-
-     if(argc > 1)
-     {
-        strtolower(argv[1]);
-/*------ sensor */        
-        if(strcmp(argv[1],"sensor") == 0)
-        {
-           if(argc > 2) /* set case */
-           {
-             /* check permission */
-             if(!SCMatchRights(pCon,usUser))
-             {
-                return 0;
-             }
-             iRet = Tcl_GetInt(pSics->pTcl,argv[2],&iMode);
-             if(iRet != TCL_OK)
-             {
-               sprintf(pBueffel,"ERROR: needed integer, got %s",
-                       argv[2]);
-               SCWrite(pCon,pBueffel,eError);
-               return 0;        
-             }
-             pMe->iSensor = iMode;
-             SCSendOK(pCon);
-             return 1;
-           }  
-           else /* get case */
-           {
-              sprintf(pBueffel,"%s.sensor = %d", argv[0],pMe->iSensor);
-              SCWrite(pCon,pBueffel,eValue);
-              return 1;
-           }
-        }
-/*------ controlanalog */        
-        if(strcmp(argv[1],"controlanalog") == 0)
-        {
-           if(argc > 2) /* set case */
-           {
-             /* check permission */
-             if(!SCMatchRights(pCon,usUser))
-             {
-                return 0;
-             }
-             iRet = Tcl_GetInt(pSics->pTcl,argv[2],&iMode);
-             if(iRet != TCL_OK)
-             {
-               sprintf(pBueffel,"ERROR: needed integer, got %s",
-                       argv[2]);
-               SCWrite(pCon,pBueffel,eError);
-               return 0;        
-             }
-             iRet = LTC11AssignControl(self->pDriv,ANALOG,iMode);
-             if(iRet != 1)
-             {
-                self->pDriv->GetError(self->pDriv,&iMode,pError,131);
-                sprintf(pBueffel,"ERROR: failed to set sensor: %s",pError);
-                SCWrite(pCon,pBueffel,eError);
-                return 0;
-             }
-             SCSendOK(pCon);
-             return 1;
-           }  
-           else /* get case */
-           {
-              sprintf(pBueffel,"%s.controlanalog = %d", argv[0],pMe->iControlAnalog);
-              SCWrite(pCon,pBueffel,eValue);
-              return 1;
-           }
-        }
-/*------ controlheat */        
-        if(strcmp(argv[1],"controlheat") == 0)
-        {
-           if(argc > 2) /* set case */
-           {
-             /* check permission */
-             if(!SCMatchRights(pCon,usUser))
-             {
-                return 0;
-             }
-             iRet = Tcl_GetInt(pSics->pTcl,argv[2],&iMode);
-             if(iRet != TCL_OK)
-             {
-               sprintf(pBueffel,"ERROR: needed integer, got %s",
-                       argv[2]);
-               SCWrite(pCon,pBueffel,eError);
-               return 0;        
-             }
-             iRet = LTC11AssignControl(self->pDriv,HEATER,iMode);
-             if(iRet != 1)
-             {
-                self->pDriv->GetError(self->pDriv,&iMode,pError,131);
-                sprintf(pBueffel,"ERROR: failed to set sensor: %s",pError);
-                SCWrite(pCon,pBueffel,eError);
-                return 0;
-             }
-             SCSendOK(pCon);
-             return 1;
-           }  
-           else /* get case */
-           {
-              sprintf(pBueffel,"%s.controlheat = %d", argv[0],pMe->iControlHeat);
-              SCWrite(pCon,pBueffel,eValue);
-              return 1;
-           }
-        }
-/*-------- mode */       
-        else if(strcmp(argv[1],"mode") == 0)
-        {
-           if(argc > 2) /* set case */
-           {
-             /* check permission */
-             if(!SCMatchRights(pCon,usUser))
-             {
-                return 0;
-             }
-             iRet = Tcl_GetInt(pSics->pTcl,argv[2],&iMode);
-             if(iRet != TCL_OK)
-             {
-               sprintf(pBueffel,"ERROR: needed integer, got %s",
-                       argv[2]);
-               SCWrite(pCon,pBueffel,eError);
-               return 0;        
-             }
-             iRet = LTC11SetMode(self->pDriv,iMode);
-             if(iRet != 1)
-             {
-                self->pDriv->GetError(self->pDriv,&iMode,pError,131);
-                sprintf(pBueffel,"ERROR: failed to set mode %s",pError);
-                SCWrite(pCon,pBueffel,eError);
-                return 0;
-             }
-             else
-             {
-               SCSendOK(pCon);
-               return 1;
-             }
-           }
-           else /* get case */
-           {
-             iRet = LTC11GetMode(self->pDriv,&iMode);
-             if(iRet != 1)
-             {
-                self->pDriv->GetError(self->pDriv,&iMode,pError,131);
-                sprintf(pBueffel,"ERROR: failed to get mode %s",pError);
-                SCWrite(pCon,pBueffel,eError);
-                return 0;
-             }
-             if(iMode == ANALOG)
-             {
-               sprintf(pBueffel,"%s.mode = Analog Control", argv[0]);
-             }
-             else
-             {
-               sprintf(pBueffel,"%s.mode = Heater Control", argv[0]);
-             }
-             SCWrite(pCon,pBueffel,eValue);
-             return 1;
-           }
-        }
-/*--------- list */
-        else if(strcmp(argv[1],"list") == 0)
-        {
-            /* print generals first */
-            EVControlWrapper(pCon,pSics,pData,argc,argv);
-            /* print our add on stuff */
-            sprintf(pBueffel,"%s.sensor = %d",argv[0],pMe->iSensor);
-            SCWrite(pCon,pBueffel,eValue);
-            sprintf(pBueffel,"%s.controlanalog = %d",argv[0],pMe->iControlAnalog);
-            SCWrite(pCon,pBueffel,eValue);
-            sprintf(pBueffel,"%s.controlheat = %d",argv[0],pMe->iControlHeat);
-            SCWrite(pCon,pBueffel,eValue);
-            iRet = LTC11GetMode(self->pDriv,&iMode);
-            if(iRet != 1)
-            {
-               self->pDriv->GetError(self->pDriv,&iMode,pError,131);
-               sprintf(pBueffel,"ERROR: failed to get mode %s",pError);
-               SCWrite(pCon,pBueffel,eError);
-            }
-            if(iMode == ANALOG)
-            {
-              sprintf(pBueffel,"%s.mode = Analog Control", argv[0]);
-            }
-            else
-            {
-              sprintf(pBueffel,"%s.mode = Heater Control", argv[0]);
-            }
-            SCWrite(pCon,pBueffel,eValue);
-            return 1;   
-        }    
-        else
-        {
-           return EVControlWrapper(pCon,pSics,pData,argc,argv);
-        }      
-     }     
-     return EVControlWrapper(pCon,pSics,pData,argc,argv); 
-  }
diff --git a/ltc11.h b/ltc11.h
deleted file mode 100644
index 4b8ed779..00000000
--- a/ltc11.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*-------------------------------------------------------------------------
-                         L T C 1 1
-                      
-    An environment control driver and an additonal wrapper function for
-    controlling a Neocera LTC-11 temperature controller. This controller can be 
-    in two states: control via a heater channel or control via a analaog 
-    channel.
-    
-    copyright: see copyright.h
-    
-    Mark Koennecke, November 1998                   
----------------------------------------------------------------------------*/
-#ifndef LTC11
-#define LTC11
-
-    pEVDriver CreateLTC11Driver(int argc, char *argv[]);
-    
-    int LTC11GetMode(pEVDriver self, int *iMode);
-    int LTC11SetMode(pEVDriver self, int iMode);
-    
-    int LTC11Action(SConnection *pCon, SicsInterp *pSics, void *pData,
-                     int argc, char *argv[]);
-    
-#endif    
diff --git a/macro.c b/macro.c
index 33460618..9641091c 100644
--- a/macro.c
+++ b/macro.c
@@ -873,3 +873,13 @@
     SCWrite(pCon,"TRANSACTIONFINISHED",eError);
     return iRet;
  }
+
+
+
+
+
+
+
+
+
+
diff --git a/make_gen b/make_gen
index 2a22935b..8083f39c 100644
--- a/make_gen
+++ b/make_gen
@@ -11,30 +11,29 @@ SOBJ =  network.o ifile.o conman.o SCinter.o splitter.o passwd.o \
        sicsexit.o  costa.o task.o $(FORTIFYOBJ)\
        macro.o ofac.o obpar.o obdes.o drive.o status.o intserv.o \
        devexec.o mumo.o mumoconf.o selector.o selvar.o fupa.o lld.o \
-       lld_blob.o buffer.o strrepl.o ruli.o lin2ang.o fomerge.o\
+       lld_blob.o  strrepl.o lin2ang.o fomerge.o\
        script.o o2t.o  alias.o napi.o nxdata.o stringdict.o sdynar.o\
-       histmem.o histdriv.o histsim.o sinqhmdriv.o interface.o callback.o \
+       histmem.o histdriv.o histsim.o  interface.o callback.o \
         event.o emon.o evcontroller.o evdriver.o simev.o perfmon.o \
-       danu.o itc4driv.o itc4.o nxdict.o nxsans.o varlog.o stptok.o nread.o \
-       dilludriv.o scan.o fitcenter.o telnet.o token.o scontroller.o serial.o \
-       tclev.o hkl.o integrate.o optimise.o dynstring.o nextrics.o nxutil.o \
-       mesure.o uubuffer.o serialwait.o commandlog.o sps.o udpquieck.o \
-       sanswave.o faverage.o bruker.o rmtrail.o fowrite.o ltc11.o \
-       simchop.o choco.o chadapter.o docho.o trim.o eurodriv.o scaldate.o \
-       hklscan.o xytable.o amor2t.o nxamor.o amorscan.o amorstat.o \
-       circular.o el755driv.o maximize.o sicscron.o tecsdriv.o sanscook.o \
-       tasinit.o tasutil.o t_rlp.o t_conv.o d_sign.o d_mod.o \
-       tasdrive.o tasscan.o synchronize.o definealias.o swmotor.o t_update.o \
-       hmcontrol.o userscan.o slsmagnet.o rs232controller.o lomax.o \
-       polterwrite.o fourlib.o motreg.o motreglist.o anticollider.o \
-       s_rnge.o sig_die.o gpibcontroller.o $(NIOBJ) ecb.o ecbdriv.o \
-       ecbcounter.o hmdata.o tdchm.o nxscript.o A1931.o frame.o \
+       danu.o  nxdict.o varlog.o stptok.o nread.o \
+       scan.o fitcenter.o telnet.o token.o  \
+       tclev.o hkl.o integrate.o optimise.o dynstring.o nxutil.o \
+       mesure.o uubuffer.o  commandlog.o udpquieck.o \
+       rmtrail.o  \
+       simchop.o choco.o chadapter.o  trim.o scaldate.o \
+       hklscan.o xytable.o   \
+       circular.o  maximize.o sicscron.o  \
+       t_rlp.o t_conv.o d_sign.o d_mod.o \
+       synchronize.o definealias.o t_update.o \
+       hmcontrol.o userscan.o  rs232controller.o lomax.o \
+       fourlib.o motreg.o motreglist.o anticollider.o \
+       s_rnge.o sig_die.o gpibcontroller.o $(NIOBJ) \
+       hmdata.o  nxscript.o  \
        tclintimpl.o sicsdata.o
  
-MOTOROBJ = motor.o el734driv.o simdriv.o el734dc.o pipiezo.o pimotor.o
+MOTOROBJ = motor.o  simdriv.o  
 COUNTEROBJ =  countdriv.o simcter.o counter.o
-DMCOBJ     =  dmc.o
-VELOOBJ    = velo.o velosim.o velodorn.o velodornier.o
+VELOOBJ    = velo.o velosim.o 
 
 .SUFFIXES:
 .SUFFIXES: .tcl .htm .c .o
@@ -46,31 +45,34 @@ VELOOBJ    = velo.o velosim.o velodorn.o velodornier.o
 
 all:    $(BINTARGET)/SICServer
  
-full:	matrix/libmatrix.a hardsup/libhlib.a tecs/libtecsl.a \
-	$(BINTARGET)/SICServer
+full:	matrix/libmatrix.a psi/hardsup/libhlib.a psi/tecs/libtecsl.a \
+	psi/libpsi.a $(BINTARGET)/SICServer
 
 $(BINTARGET)/SICServer: $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) \
-                        $(DMCOBJ) $(VELOOBJ) $(DIFIL) $(EXTRA) \
+                        $(VELOOBJ) $(DIFIL) $(EXTRA) \
                         $(SUBLIBS)
 	$(CC) -g  -o SICServer \
-	         $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) $(DMCOBJ) \
+	         $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) \
         	 $(VELOOBJ) $(DIFOBJ) $(EXTRA) $(LIBS)
 	cp SICServer $(BINTARGET)/
 
 matrix/libmatrix.a:
 	cd matrix; make $(MFLAGS) libmatrix.a
 
-hardsup/libhlib.a:
-	cd hardsup; make $(MFLAGS) libhlib.a
+psi/hardsup/libhlib.a:
+	cd psi/hardsup; make $(MFLAGS) libhlib.a
 
-tecs/libtecsl.a:
-	cd tecs; make $(MFLAGS) libtecsl.a
+psi/tecs/libtecsl.a:
+	cd psi/tecs; make $(MFLAGS) libtecsl.a
 
+psi/libpsi.a:
+	cd psi; make $(MFLAGS) libpsi.a
 clean:
 	rm -f *.o SICServer $(BINTARGET)/SICServer
-	cd hardsup; make $(MFLAGS) clean
+	cd psi/hardsup; make $(MFLAGS) clean
 	cd matrix; make $(MFLAGS) clean
-	cd tecs; make $(MFLAGS) clean
+	cd psi/tecs; make $(MFLAGS) clean
+	cd psi; make $(MFLAGS) clean
 
 Dbg.o:  Dbg.c
 	cc -g  -I/data/koenneck/include -c Dbg.c
diff --git a/make_gen_dummy b/make_gen_dummy
new file mode 100644
index 00000000..4b6f3814
--- /dev/null
+++ b/make_gen_dummy
@@ -0,0 +1,77 @@
+#----------------------------------------------------------------------------
+# Makefile for SICS (machine-independent part)
+#
+# Mark Koennecke 1996-2001
+# Markus Zolliker March 2003
+#---------------------------------------------------------------------------
+
+COBJ = Sclient.o network.o ifile.o   intcli.o $(FORTIFYOBJ)  
+SOBJ =  network.o ifile.o conman.o SCinter.o splitter.o passwd.o \
+       servlog.o sicvar.o nserver.o SICSmain.o \
+       sicsexit.o  costa.o task.o $(FORTIFYOBJ)\
+       macro.o ofac.o obpar.o obdes.o drive.o status.o intserv.o \
+       devexec.o mumo.o mumoconf.o selector.o selvar.o fupa.o lld.o \
+       lld_blob.o  strrepl.o lin2ang.o fomerge.o\
+       script.o o2t.o  alias.o napi.o nxdata.o stringdict.o sdynar.o\
+       histmem.o histdriv.o histsim.o  interface.o callback.o \
+        event.o emon.o evcontroller.o evdriver.o simev.o perfmon.o \
+       danu.o  nxdict.o varlog.o stptok.o nread.o \
+       scan.o fitcenter.o telnet.o token.o  \
+       tclev.o hkl.o integrate.o optimise.o dynstring.o nxutil.o \
+       mesure.o uubuffer.o  commandlog.o udpquieck.o \
+       rmtrail.o  \
+       simchop.o choco.o chadapter.o  trim.o scaldate.o \
+       hklscan.o xytable.o   \
+       circular.o  maximize.o sicscron.o   \
+       t_rlp.o t_conv.o d_sign.o d_mod.o \
+       synchronize.o definealias.o t_update.o \
+       hmcontrol.o userscan.o  rs232controller.o lomax.o \
+       fourlib.o motreg.o motreglist.o anticollider.o \
+       s_rnge.o sig_die.o gpibcontroller.o $(NIOBJ) \
+       hmdata.o  nxscript.o  \
+       tclintimpl.o sicsdata.o
+ 
+MOTOROBJ = motor.o  simdriv.o  
+COUNTEROBJ =  countdriv.o simcter.o counter.o
+VELOOBJ    = velo.o velosim.o 
+
+.SUFFIXES:
+.SUFFIXES: .tcl .htm .c .o
+
+# the following lines are not compatible with GNUmake using VPATH
+# they are not needed, as they are defined by default
+#.c.o:
+#	$(CC) $(CFLAGS) -c $*.c
+
+all:    $(BINTARGET)/SICServer
+ 
+full:	matrix/libmatrix.a dummy/libdummy.a $(BINTARGET)/SICServer
+
+$(BINTARGET)/SICServer: $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) \
+                        $(VELOOBJ) $(DIFIL) $(EXTRA) \
+                        $(SUBLIBS)
+	$(CC) -g  -o SICServer \
+	         $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) \
+        	 $(VELOOBJ) $(DIFOBJ) $(EXTRA) $(LIBS)
+	cp SICServer $(BINTARGET)/
+
+matrix/libmatrix.a:
+	cd matrix; make $(MFLAGS) libmatrix.a
+
+dummy/libdummy.a:
+	cd dummy; make $(MFLAGS) 
+clean:
+	rm -f *.o SICServer $(BINTARGET)/SICServer
+	cd matrix; make $(MFLAGS) clean
+	cd dummy; make $(MFLAGS) clean
+
+Dbg.o:  Dbg.c
+	cc -g  -I/data/koenneck/include -c Dbg.c
+Dbg_cmd.o:  Dbg_cmd.c
+
+
+
+
+
+
+
diff --git a/makefile_alpha b/makefile_alpha
index d8bf4302..46c25b57 100644
--- a/makefile_alpha
+++ b/makefile_alpha
@@ -28,12 +28,12 @@ MFLAGS= -f makefile_alpha
 HDFROOT=/data/lnslib
 
 CC       = cc
-CFLAGS = -I$(HDFROOT)/include $(DFORTIFY) -DHDF4 -DHDF5 -I$(SRC)hardsup  -g \
-           -std1 -warnprotos
+CFLAGS = -I$(HDFROOT)/include -I. $(DFORTIFY) -DHDF4 -DHDF5 -Ipsi/hardsup \
+	 -g -std1 -warnprotos
 BINTARGET = bin
 EXTRA=
-LIBS = -L$(HDFROOT)/lib -Lhardsup -lhlib -Lmatrix -lmatrix -Ltecs \
-       -ltecsl -ltcl8.0 -lfor $(HDFROOT)/lib/libhdf5.a  \
+LIBS = -L$(HDFROOT)/lib -Lpsi/hardsup  -Lmatrix -lmatrix -Lpsi/tecs \
+       -Lpsi -lpsi -lhlib -ltecsl -ltcl8.0 -lfor $(HDFROOT)/lib/libhdf5.a  \
        $(HDFROOT)/lib/libmfhdf.a $(HDFROOT)/lib/libdf.a \
        $(HDFROOT)/lib/libjpeg.a -lz  -lm -ll -lc 
 
diff --git a/makefile_alpha_dummy b/makefile_alpha_dummy
new file mode 100644
index 00000000..13996a4e
--- /dev/null
+++ b/makefile_alpha_dummy
@@ -0,0 +1,44 @@
+#---------------------------------------------------------------------------
+# Makefile for SICS
+# machine-dependent part for Tru64 Unix
+#
+# Mark Koennecke 1996-2001
+# Markus Zolliker, March 2003
+#==========================================================================
+# the following lines only for fortified version
+#DFORTIFY=-DFORTIFY
+#FORTIFYOBJ=strdup.o fortify.o
+#==========================================================================
+# assign if the National Instrument GPIB driver is available
+#NI= -DHAVENI
+#NIOBJ= nigpib.o
+#NILIB=-lgpibenet
+#==========================================================================
+# comment or uncomment if a difrac version is required
+# Do not forget to remove or add comments to ofac.c as well if changes
+# were made here.
+ 
+#DIFOBJ=difrac.o  -Ldifrac -ldif 
+#DIFIL= difrac.o
+#---------------------------------------------------------------------------
+
+#----------------select proper Makefile
+MFLAGS= -f makefile_alpha_dummy
+
+HDFROOT=/data/lnslib
+
+CC       = cc
+CFLAGS = -I$(HDFROOT)/include -I. $(DFORTIFY) -DHDF4 -DHDF5  \
+	 -g -std1 -warnprotos
+BINTARGET = bin
+EXTRA=
+LIBS = -L$(HDFROOT)/lib   -Lmatrix -lmatrix  \
+       -Ldummy -ldummy  -ltcl8.0 -lfor $(HDFROOT)/lib/libhdf5.a  \
+       $(HDFROOT)/lib/libmfhdf.a $(HDFROOT)/lib/libdf.a \
+       $(HDFROOT)/lib/libjpeg.a -lz  -lm -ll -lc 
+
+include make_gen_dummy
+
+
+
+
diff --git a/makefile_linux b/makefile_linux
index 7f7d8bcf..298c4b65 100644
--- a/makefile_linux
+++ b/makefile_linux
@@ -22,6 +22,9 @@ FORTIFYOBJ=strdup.o fortify.o
 #DIFIL= difrac.o
 #==========================================================================
 
+#----------------select proper Makefile
+MFLAGS= -f makefile_linux
+
 CC       = gcc
 CFLAGS = -I$(HDFROOT)/include -DHDF4 -DHDF5 $(NI) -I$(SRC)hardsup \
        -fwritable-strings -DCYGNUS -DNONINTF -g $(DFORTIFY)
diff --git a/modriv.h b/modriv.h
index cfd746c8..21006eb9 100644
--- a/modriv.h
+++ b/modriv.h
@@ -34,39 +34,11 @@
                                    char *name, float newValue);
                            void   (*ListDriverPar)(void *self, char *motorName,
                                   SConnection *pCon);
+                           void   (*KillPrivate)(void *self);
                            } MotorDriver;
                              
  /* the first fields above HAVE to be IDENTICAL to those below */                                
 
-  typedef struct __MoDriv {
-                           /* general motor driver interface 
-                              fields. REQUIRED!
-                           */
-                           float fUpper; /* upper limit */
-                           float fLower; /* lower limit */
-                           char *name;
-                           int   (*GetPosition)(void *self,float *fPos);
-                           int   (*RunTo)(void *self, float fNewVal);
-                           int   (*GetStatus)(void *self);
-                           void  (*GetError)(void *self, int *iCode, char *buffer, int iBufLen);
-                           int   (*TryAndFixIt)(void *self,int iError, float fNew);
-                           int   (*Halt)(void *self);
-                           int   (*GetDriverPar)(void *self, char *name, 
-                                  float *value);
-                           int    (*SetDriverPar)(void *self,SConnection *pCon,
-                                   char *name, float newValue);
-                           void   (*ListDriverPar)(void *self, char *motorName,
-                                  SConnection *pCon);
-                           
-                           
-                           /* EL-734 specific fields */
-                           int iPort;
-                           char *hostname;
-                           int iChannel;
-                           int iMotor;
-                           void *EL734struct;
-                           int iMSR;
-                          } EL734Driv;
 
   typedef struct ___MoSDriv {
                            /* general motor driver interface 
@@ -87,6 +59,7 @@
                                    char *name, float newValue);
                            void   (*ListDriverPar)(void *self, char *motorName,
                                   SConnection *pCon);
+                           void   (*KillPrivate)(void *self);
                            
                            /* Simulation  specific fields */
                            float fFailure; /* percent random failures*/
@@ -96,11 +69,6 @@
                           } SIMDriv;
 
     
-/*--------------------------- EL734 -----------------------------------*/                                
-  MotorDriver *CreateEL734(SConnection *pCon, int argc, char *argv[]);
-  MotorDriver *CreateEL734DC(SConnection *pCon, int argc, char *argv[]);
-  void         KillEL734(void *pData);
-
 /* ----------------------- Simulation -----------------------------------*/
   MotorDriver *CreateSIM(SConnection *pCon, int argc, char *argv[]);
   void         KillSIM(void *pData);
diff --git a/motor.c b/motor.c
index 778b55fb..e1d47dac 100644
--- a/motor.c
+++ b/motor.c
@@ -10,9 +10,6 @@
      endscript facility added: Mark Koennecke, August 2002 
      Modified to support driver parameters, Mark Koennecke, January 2003
 
-     TODO: currently motor drivers have to be installed in MakeMotor
-     and remembered in KillMotor. Sort this some day!
-
      Copyright:
 
      Labor fuer Neutronenstreuung
@@ -55,8 +52,7 @@
 #include "splitter.h"
 #include "status.h"
 #include "servlog.h"
-#include "ecbdriv.h"
-
+#include "site.h"
 /*-------------------------------------------------------------------------
    some lokal defines
 */
@@ -449,26 +445,15 @@ extern void KillPiPiezo(void *pData);
      
      /* kill driver */
      if(pM->drivername)
-     {   /* edit here to include more drivers */ 
-       if(strcmp(pM->drivername,"EL734") == 0)
-       {   
-           KillEL734((void *)pM->pDriver);
-       }
-       else if(strcmp(pM->drivername,"EL734DC") == 0)
-       {   
-           KillEL734((void *)pM->pDriver);
-       }
-       else if(strcmp(pM->drivername,"SIM") == 0)
+     {  
+       if(pM->pDriver->KillPrivate != NULL)
        {
-         KillSIM((void *)pM->pDriver);
-       }
-       else if(strcmp(pM->drivername,"PIPIEZO") == 0)
-       {
-         KillPiPiezo((void *)pM->pDriver);
-       }
-       else if(strcmp(pM->drivername,"ECB") == 0)
-       {
-         KillECBMotor( (void *)pM->pDriver);
+	 pM->pDriver->KillPrivate(pM->pDriver);
+	 if(pM->pDriver->name != NULL)
+	 {
+	   free(pM->pDriver->name);
+         }
+	 free(pM->pDriver);
        }
        free(pM->drivername);
      }
@@ -888,7 +873,8 @@ extern MotorDriver *MakePiPiezo(Tcl_Interp *pTcl, char *pArray);
       char pBueffel[512];
       int iD, iRet;
       Tcl_Interp *pTcl = (Tcl_Interp *)pSics->pTcl;
-      
+      pSite site = NULL;
+
       assert(pCon);
       assert(pSics);
       
@@ -902,58 +888,7 @@ extern MotorDriver *MakePiPiezo(Tcl_Interp *pTcl, char *pArray);
       /* create the driver */
       strtolower(argv[2]);
       strtolower(argv[1]);
-      if(strcmp(argv[2],"el734") == 0)
-      {
-         iD = argc - 3;
-         pDriver = CreateEL734(pCon,iD,&argv[3]);
-         if(!pDriver)
-         {
-          return 0;
-         }
-         /* create the motor */
-         pNew  = MotorInit("EL734",argv[1],pDriver);
-         if(!pNew)
-         {
-           sprintf(pBueffel,"Failure to create motor %s",argv[1]);
-           SCWrite(pCon,pBueffel,eError);
-           return 0; 
-         }
-      }
-      else if(strcmp(argv[2],"ecb") == 0)
-      {
-         iD = argc - 3;
-         pDriver = CreateECBMotor(pCon,iD,&argv[3]);
-         if(!pDriver)
-         {
-          return 0;
-         }
-         /* create the motor */
-         pNew  = MotorInit("ECB",argv[1],pDriver);
-         if(!pNew)
-         {
-           sprintf(pBueffel,"Failure to create motor %s",argv[1]);
-           SCWrite(pCon,pBueffel,eError);
-           return 0; 
-         }
-      }
-      else if(strcmp(argv[2],"el734dc") == 0)
-      {
-         iD = argc - 3;
-         pDriver = CreateEL734DC(pCon,iD,&argv[3]);
-         if(!pDriver)
-         {
-          return 0;
-         }
-         /* create the motor */
-         pNew  = MotorInit("EL734DC",argv[1],pDriver);
-         if(!pNew)
-         {
-           sprintf(pBueffel,"Failure to create motor %s",argv[1]);
-           SCWrite(pCon,pBueffel,eError);
-           return 0; 
-         }
-      }
-      else if (strcmp(argv[2],"sim") == 0)
+      if (strcmp(argv[2],"sim") == 0)
       {
          iD = argc - 3;
          pDriver = CreateSIM(pCon,iD,&argv[3]);
@@ -972,30 +907,20 @@ extern MotorDriver *MakePiPiezo(Tcl_Interp *pTcl, char *pArray);
 	 pNew->ParArray[HLOW].iCode = usUser;
 	 pNew->ParArray[HUPP].iCode = usUser;
       }
-      else if (strcmp(argv[2],"pipiezo") == 0)
-      {
-         pDriver = MakePiPiezo(pSics->pTcl,argv[3]);
-         if(!pDriver)
-         {
-             
-              SCWrite(pCon,pTcl->result,eError);
-              return 0;
-         }
-         /* create the motor */
-         pNew  = MotorInit("PIPIEZO",argv[1],pDriver);
-         if(!pNew)
-         {
-           sprintf(pBueffel,"Failure to create motor %s",argv[1]);
-           SCWrite(pCon,pBueffel,eError);
-           return 0; 
-         }
-      }
       else 
       {
-         sprintf(pBueffel,"Motor Type %s not recognized for motor %s",
-                 argv[2],argv[1]);
-         SCWrite(pCon,pBueffel,eError);
-         return 0; 
+	 site = getSite();
+	 if(site != NULL)
+	 {
+	    pNew = site->CreateMotor(pCon,argc-1,&argv[1]);
+	 }
+         if(pNew == NULL)
+	 {
+	   sprintf(pBueffel,"Motor Type %s not recognized for motor %s",
+		   argv[2],argv[1]);
+	   SCWrite(pCon,pBueffel,eError);
+	   return 0;
+	 } 
       }
       
       /* create the interpreter command */
diff --git a/motor/Makefile b/motor/Makefile
deleted file mode 100644
index 45253ce6..00000000
--- a/motor/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-#--------------------------------------------------------------------------
-# Makefile for Davids motor test program.
-#
-# Mark Koennecke, October 1998
-#--------------------------------------------------------------------------
-BINTARGET=$(HOME)/bin/sics
-
-OBJ=el734_test.o makeprint.o
-CFLAGS= -I../hardsup  -c
-LFLAGS=  -L../hardsup -lhlib -lX11 -lm
-
-.c.o:
-	cc $(CFLAGS) $*.c
-
-all: $(OBJ)
-	cc -o el734_test $(OBJ) $(LFLAGS) 
-	- cp el734_test $(BINTARGET)
-clean:                    
-	- rm el734_test
-	- rm *.o
- 
\ No newline at end of file
diff --git a/motor/el734_test.c b/motor/el734_test.c
deleted file mode 100644
index faf1d20d..00000000
--- a/motor/el734_test.c
+++ /dev/null
@@ -1,3900 +0,0 @@
-#define	    ident	    "1E07"
-#define	    Active_Motor   1
-
-#ifdef __DECC
-#pragma	    module	    EL734_TEST	ident
-#endif
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     SINQ Project				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Link_options - Here is the Linker Option File
-**!$!
-**!$! To build on LNSA09 ...
-**!$!   $  build_cc_select :== decc
-**!$!	$  import tasmad
-**!$!	$  def/job deltat_c_tlb sinq_c_tlb
-**!$!   $  bui tas_src:[utils]el734_test debug
-**!$!
-**!$! To build on PSICLC ...
-**!$!	$ build_cc_select :== decc
-**!$!	$ set default usr_scroot:[maden]
-**!$!	$ copy lnsa09::ud0:[maden.motor]el734_test.c     []
-**!$!	$ copy lnsa09::tasmad_disk:[mad.lib]sinq_dbg.olb []
-**!$!	$ copy lnsa09::tasmad_disk:[mad.lib]sinq_c.tlb []
-**!$!	$ def/job sinq_olb   usr_scroot:[maden]sinq_dbg.olb
-**!$!	$ def/job sinq_c_tlb usr_scroot:[maden]sinq_c.tlb
-**!$!	$ def/job deltat_c_tlb sinq_c_tlb
-**!$!	$ bui el734_test debug
-**!$!
-**!$	if p1 .eqs. "DEBUG" then dbg1 := /debug
-**!$	if p1 .eqs. "DEBUG" then dbg2 := _dbg
-**!$	link 'dbg1'/exe=el734_test'dbg2'.exe sys$input/options
-**!	    el734_test
-**!	    sinq_olb/lib
-**!	    sys$share:decw$xmlibshr12/share
-**!	    sys$share:decw$xtlibshrr5/share
-**!	    sys$share:decw$xlibshr/share
-**!$	purge/nolog el734_test'dbg2'.exe
-**!$	set prot=w:re el734_test'dbg2'.exe
-**!$	my_dir = f$element (0, "]", f$environment ("procedure")) + "]"
-**!$	write sys$output "Exec file is ''my_dir'EL734_TEST''DBG2'.EXE
-**!$	exit
-**!$!
-** Link_options_end
-**
-**	Building on Alpha OSF/1:
-**
-**	    cc -std1 -g -o ~/motor/el734_test -I/public/lib/include	\
-**			-transitive_link -L/public/lib -ldeltat		\
-**			-lrt -lXm -lXt -lX11 -lXext -lm			\
-**			~/motor/el734_test.c
-**	or
-**	    alias makep /usr/opt/posix/usr/bin/make	<-- Posix Vn of "make"
-**	    makep -f ~/motor/motor.make ~/motor/el734_test
-**
-**	To run the program, one might need to set the environment variable:
-**
-**	    setenv LD_LIBRARY_PATH /public/lib
-**
-**	if the -soname option was not specified to ld when the deltat shared
-**	library was build.
-**
-** Resources and Flags	    File:	decw$user_defaults:SinQ_rc.dat
-** -------------------		    or	$HOME/SinQ_rc
-**
-**  Resource	    Flag    Default	    Description
-**  --------	    ----    -------	    -----------
-**  -		    -name   el734_test   Name to use when looking up the
-**					      resources. The default is the
-**					      image file name.
-**  ...
-**  A value given via -name will be converted to lowercase before being used.
-**+
-**---------------------------------------------------------------------------
-** Module Name  . . . . . . . . : [...MOTOR]EL734_TEST.C
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Nov 1995
-**
-** Purpose
-** =======
-**	EL734_TEST is a test program for the EL734 Motor Controller.
-** Use:
-** ===
-**  1) On VMS, define a foreign command, e.g.
-**
-**	    $ el734_test :== $psi_public:[exe_axp]el734_test.exe
-**
-**     On Unix systems, ensure el734_test is in a suitable PATH directory.
-**
-**  2) Issue commands of the form:
-**
-**	    el734_test -host lnsp22 -chan 5 -m 6 -p 25.0
-**
-**	where
-**	    -host specifies the name of the computer to which the EL734 is
-**			    attached. This computer must be running the
-**			    RS232C_SRV program or equivalent.
-**	    -chan specifies the serial channel number to which the EL734 is
-**			    attached.
-**	    -m	  specifies the motor number to be driven and
-**	    -p	  specifies that a positioning command is to be executed.
-**
-**	For a full list of options, issue the command:
-**
-**	    el734_test -help
-**
-** Updates:
-**  1A01 25-Nov-1994 DM.	Initial version.
-**  1C01 12-Sep-1996 DM.	Use SINQ.OLB and SINQ_C.TLB on VMS.
-**  1D01  6-Nov-1996 DM.	Add EC command to SAVE command list.
-**  1E01  8-May-1997 DM.	Add RESTORE and NO_RESTORE to LOAD command list.
-**-
-**====================================================================
-*/
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <signal.h>
-#include    <ctype.h>
-
-#include    <time.h>
-
-#ifdef  __VMS
-#include    <sys/unixio.h>
-#else
-#include    <unistd.h>
-#endif
-
-#include    <X11/Intrinsic.h>
-/*
-**====================================================================
-*/
-
-#include    <sinq_prototypes.h>
-#include    <el734_def.h>
-/*
-
-**--------------------------------------------------------------------------
-**			Define global structures and constants.
-*/
-#define NIL	'\0'
-#ifndef True
-#define True	1
-#define False	0
-#endif
-/*
-**		    Define the file idents for stdin, stdout and stderr
-*/
-#define	STDIN	0
-#define	STDOUT	1
-#define	STDERR	2
-
-#define	N_ELEMENTS(arg)	    (sizeof (arg)/sizeof (arg[0]))
-/*-------------------------------------------------------------
-**			Global Variables
-*/
-  static int	C_gbl_status;	    /*  Return status from C_... routines */
-  static int	Ctrl_C_has_happened;
-  void	       *Hndl = NULL;
-
-  static XrmOptionDescRec OpTable_0[] = {
-      {"-name",	    ".name",		XrmoptionSepArg, (XPointer) NULL},
-      {"-?",	    ".el734HelpItem",	XrmoptionSepArg, (XPointer) NULL},
-      {"-?cmd",	    ".el734HelpCmd",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-?msg",	    ".el734HelpMsg",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-?par",	    ".el734HelpPar",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-?res",	    ".el734HelpRes",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-chan",	    ".el734Chan",	XrmoptionSepArg, (XPointer) NULL},
-      {"-f",	    ".el734Frequency",	XrmoptionSepArg, (XPointer) NULL},
-      {"-fb",	    ".el734Fb",		XrmoptionNoArg,	 (XPointer) "-1"},
-      {"-ff",	    ".el734Ff",		XrmoptionNoArg,	 (XPointer) "-1"},
-      {"-frequency",".el734Frequency",	XrmoptionSepArg, (XPointer) NULL},
-      {"-help",	    ".el734Help",	XrmoptionNoArg,	 (XPointer) "1"},
-      {"-hi",	    ".el734High",	XrmoptionSepArg, (XPointer) NULL},
-      {"-high",	    ".el734High",	XrmoptionSepArg, (XPointer) NULL},
-      {"-host",	    ".el734Host",	XrmoptionSepArg, (XPointer) NULL},
-      {"-hunt",	    ".el734Hunt",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-id",	    ".el734Id",		XrmoptionSepArg, (XPointer) NULL},
-      {"-limits",   ".el734Limits",	XrmoptionSepArg, (XPointer) NULL},
-      {"-lo",	    ".el734Low",	XrmoptionSepArg, (XPointer) NULL},
-      {"-load",	    ".el734Load",	XrmoptionSepArg, (XPointer) NULL},
-      {"-low",	    ".el734Low",	XrmoptionSepArg, (XPointer) NULL},
-      {"-m",	    ".el734Motor",	XrmoptionSepArg, (XPointer) NULL},
-      {"-motor",    ".el734Motor",	XrmoptionSepArg, (XPointer) NULL},
-      {"-n",	    ".el734N",		XrmoptionSepArg, (XPointer) NULL},
-      {"-p",	    ".el734Position",	XrmoptionSepArg, (XPointer) NULL},
-      {"-port",	    ".el734Port",	XrmoptionSepArg, (XPointer) NULL},
-      {"-position", ".el734Position",	XrmoptionSepArg, (XPointer) NULL},
-      {"-random",   ".el734Random",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-ref",	    ".el734Ref",	XrmoptionNoArg,	 (XPointer) "1"},
-      {"-rndm",	    ".el734Random",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-s",	    ".el734Stop",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-save",	    ".el734Save",	XrmoptionSepArg, (XPointer) NULL},
-      {"-saw",	    ".el734Saw",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-sb",	    ".el734Sb",		XrmoptionNoArg,	 (XPointer) "-1"},
-      {"-scan",	    ".el734Scan",	XrmoptionNoArg,  (XPointer) "-1"},
-      {"-seed",	    ".el734Seed",	XrmoptionSepArg, (XPointer) NULL},
-      {"-sf",	    ".el734Sf",		XrmoptionNoArg,	 (XPointer) "-1"},
-      {"-step",	    ".el734Step",	XrmoptionSepArg, (XPointer) NULL},
-      {"-stop",	    ".el734Stop",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-tmo",	    ".el734Tmo",	XrmoptionSepArg, (XPointer) NULL},
-      {"-ur@",	    ".el734SetPos",	XrmoptionSepArg, (XPointer) NULL},
-      {"-verbose",  ".el734Verbose",	XrmoptionSepArg, (XPointer) NULL},
-      {"-wait",	    ".el734Wait",	XrmoptionSepArg, (XPointer) NULL},
-    };
-  char		    El734_host[20];
-  int		    El734_port;		/* TCP/IP Port number for socket */
-  int		    El734_chan;		/* Asynch channel number */
-  char		    El734_id0[20];	/* The 1st EL734 identifier string */
-  char		    El734_id1[20];	/* The 2nd EL734 identifier string */
-  int		    Check_EL734_id;
-  int		    Motor;		/* Motor number */
-  int		    Enc_typ;
-  int		    Enc_num;
-  int		    Enc_par;
-  int		    N_moves;
-  float		    Lo_arg,	    Hi_arg;
-  int		    Lo_arg_present, Hi_arg_present;
-  int		    Do_help, Do_posit, Do_rndm, Do_saw, Do_scan, Do_step;
-  int		    Do_ref, Do_hunt, Do_ff, Do_fb, Do_sf, Do_sb, Do_stop;
-  int		    Do_save,  Do_load;
-  int		    Do_limits, Do_setpos;
-  float		    Lim_arg_lo,	Lim_arg_hi, Ist_arg;
-  float		    Tmo, Tmo_ref;
-  unsigned int	    Seed;
-  int		    Seed_present;
-  int		    Verbose;
-  int		    Wait_time, Frequency;
-  float		    Soll_posit;
-  float		    Step;
-  char		    Save_file[80];
-  char		    Load_file[80];
-
-  int		    Dec_pt = 3;
-  int		    Enc_fact_0,	    Enc_fact_1;
-  int		    Mot_fact_0,	    Mot_fact_1;
-  float		    Inertia_tol;
-  int		    Ramp;
-  int		    Loop_mode;
-  int		    Slow_hz;
-  float		    Lo,		    Hi;
-  char		    Ctrl_id[32];
-  int		    Fast_hz;
-  int		    Ref_mode;
-  int		    Backlash;
-  int		    Pos_tol;
-  char		    Mot_mem[16];
-  char		    Mot_name[16];
-  float		    Ref_param;
-  int		    Is_sided;
-  int		    Null_pt;
-  int		    Ac_par;
-  int		    Enc_circ;
-  int		    Stat_pos;
-  int		    Stat_pos_flt;
-  int		    Stat_pos_fail;
-  int		    Stat_cush_fail;
-  float		    Ist_pos;
-  int		    Prop;
-  int		    Integ;
-  int		    Deriv;
-
-  char		    *Errstack;
-  int		    Errcode, Errno, Vaxc_errno;
-/*
-**--------------------------------------------------------------------------
-**		PrintErrInfo:  print out error information.
-*/
-  void	PrintErrInfo (char *text) {
-/*      ============
-*/
-
-    EL734_ErrInfo (&Errstack, &Errcode, &Errno, &Vaxc_errno);
-    fprintf (stderr, "\n\007"
-		" Error return from %s\n"
-		"  Errstack = \"%s\"\n"
-		"  Errcode = %d   Errno = %d   Vaxc$errno = %d\n",
-		text, Errstack, Errcode, Errno, Vaxc_errno);
-    switch (Errcode) {
-     case EL734__BAD_ADR:
-      fprintf (stderr, "  Address error\n"); break;
-     case EL734__BAD_CMD:
-      fprintf (stderr, "  Command error\n"); break;
-     case EL734__BAD_ILLG:
-      fprintf (stderr, "  Illegal response\n"); break;
-     case EL734__BAD_LOC:
-      fprintf (stderr, "  EL734 is in manual mode.\n"); break;
-     case EL734__BAD_MALLOC:
-      fprintf (stderr, "  Call to \"malloc\" failed\n"); perror (text); break;
-     case EL734__BAD_OFL:
-      fprintf (stderr, "  Connection to asynch port lost\n"); break;
-     case EL734__BAD_OVFL:
-      fprintf (stderr, "  Overflow: may be due to bad encoder gearing factor\n"); break;
-     case EL734__BAD_PAR:
-      fprintf (stderr, "  Illegal parameter specified\n"); break;
-     case EL734__BAD_RNG:
-      fprintf (stderr, "  Attempted to exceed lower or upper limit\n"); break;
-     case EL734__BAD_SOCKET:
-      fprintf (stderr, "  Call to \"AsynSrv_Open\" failed\n"); perror (text); break;
-     case EL734__BAD_STP:
-      fprintf (stderr, "  Motor is disabled: \"Stop\" signal is active!");
-      break;
-     case EL734__BAD_TMO:
-      fprintf (stderr, "  Time-out of EL734 response.\n");
-      break;
-     default: if ((Errno != 0) || (Vaxc_errno != 0)) perror (text);
-    }
-    return;
-  }
-/*
-**--------------------------------------------------------------------------
-**		GetKHVQZ:  read the K, H, V, Q and Zero-point parameters
-*/
-  int	GetKHVQZ (
-/*      ========
-*/		    int	    *k,
-		    float   *lo,
-		    float   *hi,
-		    int	    *v,
-		    float   *q,
-		    float   *z) {
-
-    int	    status;
-
-    status = EL734_GetRefMode (&Hndl, k);
-    if (!status) {
-      printf ("\n\007");
-      printf ("Bad status from EL734_GetRefMode.\n");
-      return False;
-    }
-
-    status = EL734_GetLimits (&Hndl, lo, hi);
-    if (!status) {
-      printf ("\n\007");
-      printf ("Bad status from EL734_GetLimits.\n");
-      return False;
-    }
-
-    status = EL734_GetNullPoint (&Hndl, v);
-    if (!status) {
-      printf ("\n\007");
-      printf ("Bad status from EL734_GetZeroPoint.\n");
-      return False;
-    }
-
-    status = EL734_GetRefParam (&Hndl, q);
-    if (!status) {
-      printf ("\n\007");
-      printf ("Bad status from EL734_GetRefParam.\n");
-      return False;
-    }
-
-    status = EL734_GetZeroPoint (&Hndl, z);
-    if (!status) {
-      printf ("\n\007");
-      printf ("Bad status from EL734_GetZeroPoint.\n");
-      return False;
-    }
-
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		My_WaitIdle:  Wait till MSR goes to zero or <Ctrl-C>
-**				This routine is similar to EL734_WaitIdle
-**				with the extra verbose argument and a test
-**				for <Ctrl-C>.
-*/
-  int	My_WaitIdle (
-/*	===========
-*/		void	**handle,
-		int      verbose,	/* Width of <posit> display field */
-		int      *ored_msr,
-		int      *fp_cntr,
-		int      *fr_cntr,
-		float    *ist_posit) {
-#ifdef __VMS
-#include	<lib$routines.h>
-#define hibernate   lib$wait (0.25)
-#else
-#include    <unistd.h>
-#include    <time.h>
-    struct timespec	delay = {0, 250000000};
-    struct timespec	delay_left;
-#define hibernate   nanosleep_d9 (&delay, &delay_left)
-#endif
-    int			i, msr, ss, s_stat;
-    int			my_verbose;
-    float		last_posit;
-    char		buff[64];
-
-    my_verbose = verbose;
-    if (my_verbose*2 > sizeof (buff)) my_verbose = sizeof (buff)/2;
-    if (my_verbose > 0) {
-      s_stat = EL734_GetStatus (handle,
-		    &msr, ored_msr, fp_cntr, fr_cntr, &ss, ist_posit);
-      if (!s_stat) {
-	PrintErrInfo ("My_WaitIdle/EL734_GetStatus");
-	return False;
-      }
-      last_posit = *ist_posit;
-      sprintf (buff, "%*.*f", my_verbose, Dec_pt, last_posit);
-      printf (buff); fflush (NULL);
-      for (i=0; i<my_verbose; i++) buff[i] = '\010';  /* Pad with BS */
-    }
-    while (EL734_GetStatus (handle,
-		&msr, ored_msr, fp_cntr, fr_cntr, &ss, ist_posit)) {
-      if ((my_verbose > 0) && (*ist_posit != last_posit)) {
-	last_posit = *ist_posit;
-        sprintf (&buff[my_verbose], "%*.*f", my_verbose, Dec_pt, last_posit);
-	printf (buff); fflush (NULL);
-      }
-      if ((msr & MSR__BUSY) == 0) return True;
-      hibernate;
-      if (Ctrl_C_has_happened) return False;
-    }
-    PrintErrInfo ("My_WaitIdle/EL734_GetStatus");   /* Error detected in
-						    ** EL734_GetStatus */
-    return False;
-  }
-/*
-**--------------------------------------------------------------------------
-**		LoadCheckTwoInteger:  routine to check that a command specifying
-**				      two integers set correctly.
-*/
-  int	LoadCheckTwoInteger (char *cmnd) {
-/*      ===================
-*/
-    int	    status, len;
-    char    my_cmnd[80], rd_cmnd[40], buff[40];
-    char    *cmnd_tok, *motor_tok, *par0_tok, *par1_tok, *rd0_tok, *rd1_tok;
-
-    StrJoin (my_cmnd, sizeof (my_cmnd), cmnd, "");  /* Make a copy of cmnd */
-    len = strlen (my_cmnd);
-    if (my_cmnd[len-1] == '\r') my_cmnd[len-1] = NIL;
-
-    cmnd_tok  = strtok (my_cmnd, " ");
-    motor_tok = strtok (NULL, " ");
-    par0_tok = strtok (NULL, " ");
-    par1_tok = strtok (NULL, " ");
-    if ((cmnd_tok == NULL) || (motor_tok == NULL) ||
-	(par0_tok == NULL) || (par1_tok == NULL)) {
-      printf ("\007Software problem in LoadCheckTwoInteger\n");
-      return False;
-    }
-    StrJoin (buff, sizeof (buff), cmnd_tok, " ");
-    StrJoin (rd_cmnd, sizeof (rd_cmnd), buff, motor_tok);
-    len = strlen (rd_cmnd);
-    rd_cmnd[len]   = '\r';
-    rd_cmnd[len+1] = NIL;
-    status = EL734_SendCmnd (&Hndl, rd_cmnd, buff, sizeof (buff));
-    if (status) {
-      rd0_tok = strtok (buff, " ");
-      rd1_tok = strtok (NULL, " ");
-      if ((rd0_tok == NULL) ||
-	  (rd1_tok == NULL) ||
-	  (strcmp (par0_tok, rd0_tok) != 0) ||
-	  (strcmp (par1_tok, rd1_tok) != 0)) {
-	if (rd0_tok == NULL) rd0_tok = "";
-	if (rd1_tok == NULL) rd1_tok = "";
-	printf ("\007Verify error for command \"%s %s %s %s\"\n",
-			    cmnd_tok, motor_tok, par0_tok, par1_tok);
-	printf ("Values set in EL734 controller are \"%s %s\"\n"
-		  "                    They should be \"%s %s\"\n",
-			rd0_tok, rd1_tok, par0_tok, par1_tok);
-	return False;
-      }else {
-	return True;	    /* The parameter has been set correctly! */
-      }
-    }else {
-      printf ("\007LoadCheckTwoInteger -- error from EL734_SendCmnd\n");
-      printf ("Command being checked was \"%s %s %s %s\"\n",
-		    cmnd_tok, motor_tok, par0_tok, par1_tok);
-      return False;
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**		LoadCheckTwoFloat:  routine to check that a command specifying
-**				      two real values set correctly.
-*/
-  int	LoadCheckTwoFloat (char *cmnd, int n_dec) {
-/*      =================
-*/
-    int	    status, len;
-    char    my_cmnd[80], rd_cmnd[40], buff[40], par0[40], par1[40];
-    char    *cmnd_tok, *motor_tok, *par0_tok, *par1_tok, *rd0_tok, *rd1_tok;
-    char    *whole_tok, *frac_tok;
-
-    StrJoin (my_cmnd, sizeof (my_cmnd), cmnd, "");  /* Make a copy of cmnd */
-    len = strlen (my_cmnd);
-    if (my_cmnd[len-1] == '\r') my_cmnd[len-1] = NIL;
-
-    cmnd_tok  = strtok (my_cmnd, " ");
-    motor_tok = strtok (NULL, " ");
-    par0_tok = strtok (NULL, " ");
-    par1_tok = strtok (NULL, " ");
-    if ((cmnd_tok == NULL) || (motor_tok == NULL) ||
-	(par0_tok == NULL) || (par1_tok == NULL)) {
-      printf ("\007Software problem in LoadCheckTwoFloat\n");
-      return False;
-    }
-		/*---------------------------------------------------
-		** Check that the number of decimal places in the first set
-		** parameter agrees with the setting of the EL734.
-		*/
-    StrJoin (par0, sizeof (par0), par0_tok, "");
-    whole_tok = strtok (par0, ".");
-    frac_tok  = strtok (NULL, ".");
-    if (frac_tok == NULL) {	    /* Check for a decimal point */
-      len = strlen (whole_tok);	    /* None there, so put in a ".0" */
-      frac_tok = whole_tok + len + 1;
-      frac_tok[0] = '0';
-      frac_tok[1] = NIL;
-    }
-    len = strlen (frac_tok);
-    if (len > n_dec) {		/* Param has too many decimal places */
-				/* Try to remove trailing zeros */
-      while ((len >= 0) && (frac_tok[len-1] == '0')) {
-	len = len - 1;
-	frac_tok[len] = NIL;
-	if (len == n_dec) break;
-      }
-      if (len != n_dec) {
-	printf ("Don't expect the parameter to verify correctly.\n"
-		"You have specified too many decimal places!\n");
-      }
-    }else if (len < n_dec) {	/* Param has too few decimal places */
-      while (len < n_dec) {	/* Pad with zeros */
-	frac_tok[len] = '0';
-	len = len + 1;
-	frac_tok[len] = NIL;
-      }
-    }
-    len = strlen (whole_tok);	/* Re-join the parts of param again */
-    whole_tok[len] = '.';
-		/*---------------------------------------------------
-		** Check that the number of decimal places in the second set
-		** parameter agrees with the setting of the EL734.
-		*/
-    StrJoin (par1, sizeof (par1), par1_tok, "");
-    whole_tok = strtok (par1, ".");
-    frac_tok  = strtok (NULL, ".");
-    if (frac_tok == NULL) {	    /* Check for a decimal point */
-      len = strlen (whole_tok);	    /* None there, so put in a ".0" */
-      frac_tok = whole_tok + len + 1;
-      frac_tok[0] = '0';
-      frac_tok[1] = NIL;
-    }
-    len = strlen (frac_tok);
-    if (len > n_dec) {		/* Param has too many decimal places */
-				/* Try to remove trailing zeros */
-      while ((len >= 0) && (frac_tok[len-1] == '0')) {
-	len = len - 1;
-	frac_tok[len] = NIL;
-	if (len == n_dec) break;
-      }
-      if (len != n_dec) {
-	printf ("Don't expect the parameter to verify correctly.\n"
-		"You have specified too many decimal places!\n");
-      }
-    }else if (len < n_dec) {	/* Param has too few decimal places */
-      while (len < n_dec) {	/* Pad with zeros */
-	frac_tok[len] = '0';
-	len = len + 1;
-	frac_tok[len] = NIL;
-      }
-    }
-    len = strlen (whole_tok);	/* Re-join the parts of param again */
-    whole_tok[len] = '.';
-		/*	    End of checking number of decimal places
-		**---------------------------------------------------
-		*/
-    StrJoin (buff, sizeof (buff), cmnd_tok, " ");
-    StrJoin (rd_cmnd, sizeof (rd_cmnd), buff, motor_tok);
-    len = strlen (rd_cmnd);
-    rd_cmnd[len]   = '\r';
-    rd_cmnd[len+1] = NIL;
-    status = EL734_SendCmnd (&Hndl, rd_cmnd, buff, sizeof (buff));
-    if (status) {
-      rd0_tok = strtok (buff, " ");
-      rd1_tok = strtok (NULL, " ");
-      if ((rd0_tok == NULL) ||
-	  (rd1_tok == NULL) ||
-	  (strcmp (par0, rd0_tok) != 0) ||
-	  (strcmp (par1, rd1_tok) != 0)) {
-	if (rd0_tok == NULL) rd0_tok = "";
-	if (rd1_tok == NULL) rd1_tok = "";
-	printf ("\007Verify error for command \"%s %s %s %s\"\n",
-			    cmnd_tok, motor_tok, par0, par1);
-	printf ("Value set in EL734 controller is \"%s %s\"\n"
-		  "                    It should be \"%s %s\"\n",
-			    rd0_tok, rd1_tok, par0, par1);
-	return False;
-      }else {
-	return True;	    /* The parameter has been set correctly! */
-      }
-    }else {
-      printf ("\007LoadCheckTwoFloat -- error from EL734_SendCmnd\n");
-      printf ("Command being checked was \"%s %s %s %s\"\n",
-		    cmnd_tok, motor_tok, par0, par1);
-      return False;
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**		LoadFloatJuggle:  routine to try to get around an EL734 problem.
-**
-**			The problem is that the EL734 does not at the moment
-**			handle binary <--> float conversion correctly.
-*/
-  int	LoadFloatJuggle (
-/*      ===============
-*/		    char *cmnd,	    /* The command to be issued */
-		    char *motor,    /* The motor index being loaded */
-		    char *param,    /* The desired parameter */
-		    int   n_dec) {  /* The number of decimal places */
-/*
-**	    It is assumed that all parameters are consistent (especially
-**	    param and n_dec) since this is an internal routine and that
-**	    they are not terminated with <CR>.
-*/
-    int	    status, i, incr0, incr1, incr2;
-    char    set_cmnd[80], read_cmnd[40], my_par[40], buff[40];
-    char   *rd_tok;
-
-    printf ("Trying to juggle the \"%s\" parameter of Motor %s"
-		" to be %s ..\n  .. ", cmnd, motor, param);
-
-    sprintf (read_cmnd, "%s %s\r", cmnd, motor); /* Prepare the param rd cmnd */
-		/*
-		** Find indices of last 3 chars to be incremented
-		*/
-    incr0 = strlen (param);
-    incr0--;			/* incr0 now indexes the last digit of param */
-
-    if (!isdigit (param[incr0])) incr0--;  /* Be careful not to increment .. */
-					   /* .. a decimal point! */
-    incr1 = incr0 - 1;
-    if (!isdigit (param[incr1])) incr1--;  /* Be careful not to increment .. */
-					   /* .. a decimal point! */
-    incr2 = incr1 - 1;
-    if (!isdigit (param[incr2])) incr2--;  /* Be careful not to increment .. */
-					   /* .. a decimal point! */
-    if ((!isdigit (param[incr0])) ||
-	(!isdigit (param[incr1])) ||
-	(!isdigit (param[incr2]))) {
-      printf ("LoadFloatJuggle: software problem with decimal point\n"
-	      "      The routine probably needs to be enhanced!\n");
-      return False;
-    }
-	    /*----------------------------------------------------------------
-	    ** First try incrementing the last digit of the set value of the
-	    ** parameter 5 times.
-	    */
-    StrJoin (my_par, sizeof (my_par), param, "");   /* Make a copy of param */
-
-    for (i = 0; i < 5; i++) {
-      if (my_par[incr0] != '9') {    /* Check for carry to next digit */
-        my_par[incr0]++;
-      }else {
-	my_par[incr0] = '0';
-	if (my_par[incr1] != '9') {
-	  my_par[incr1]++;
-	}else {
-	  my_par[incr1] = '0';
-	  if (my_par[incr2] != '9') {
-	    my_par[incr2]++;
-	  }else {
-	    my_par[incr2] = '0';
-	  }
-	}
-      }
-
-      printf ("%s .. ", my_par);
-      sprintf (set_cmnd, "%s %s %s\r", cmnd, motor, my_par);
-
-      status = EL734_SendCmnd (&Hndl, set_cmnd, buff, sizeof (buff));
-      if (status) status = EL734_SendCmnd (&Hndl, read_cmnd, buff, sizeof (buff));
-      if (!status) {
-	printf ("\nError with \"%s %s %s\"\n"
-	        "Abandoning parameter juggle!\n", cmnd, motor, my_par);
-	return False;
-      }
-      rd_tok = strtok (buff, " ");    /* Skip leading spaces */
-      if (strcmp (param, rd_tok) == 0) {
-	printf ("\n  Success. Parameter as sent was %s\n"
-	          "           Parameter as read is  %s\n", my_par, param);
-	return True;
-      }
-    }
-	    /*----------------------------------------------------------------
-	    ** Now try decrementing the last digit of the set value of the
-	    ** parameter 5 times.
-	    */
-    StrJoin (my_par, sizeof (my_par), param, "");   /* Make a copy of param */
-
-    for (i = 0; i < 5; i++) {
-      if (my_par[incr0] != '0') {    /* Check for carry to next digit */
-        my_par[incr0]--;
-      }else {
-	my_par[incr0] = '9';
-	if (my_par[incr1] != '0') {
-	  my_par[incr1]--;
-	}else {
-	  my_par[incr1] = '9';
-	  if (my_par[incr2] != '0') {
-	    my_par[incr2]--;
-	  }else {
-	    my_par[incr2] = '9';
-	  }
-	}
-      }
-
-      printf ("%s .. ", my_par);
-      sprintf (set_cmnd, "%s %s %s\r", cmnd, motor, my_par);
-
-      status = EL734_SendCmnd (&Hndl, set_cmnd, buff, sizeof (buff));
-      if (status) status = EL734_SendCmnd (&Hndl, read_cmnd, buff, sizeof (buff));
-      if (!status) {
-	printf ("\nError with \"%s %s %s\"\n"
-	        "Abandoning parameter juggle!\n", cmnd, motor, my_par);
-	return False;
-      }
-      rd_tok = strtok (buff, " ");    /* Skip leading spaces */
-      if (strcmp (param, rd_tok) == 0) {
-	printf ("\n  Success. Parameter as sent was %s\n"
-	          "           Parameter as read is  %s\n", my_par, param);
-	return True;
-      }
-    }
-	/*
-	** Failed - go back to original setting
-	*/
-    sprintf (set_cmnd, "%s %s %s\r", cmnd, motor, param);
-    status = EL734_SendCmnd (&Hndl, set_cmnd, buff, sizeof (buff));
-    if (status) status = EL734_SendCmnd (&Hndl, read_cmnd, buff, sizeof (buff));
-    if (status) {
-      rd_tok = strtok (buff, " ");
-      printf ("\n  Failed. Parameter value is set to %s\n", rd_tok);
-    }else {
-      printf ("\n  Failed. Parameter value is unknown due to error\n");
-    }
-    return False;
-  }
-/*
-**--------------------------------------------------------------------------
-**		LoadIntJuggle:  routine to try to get around an EL734 problem.
-**
-**			The problem is that some integer parameters (e.g. E)
-**			do not set correctly.
-*/
-  int	LoadIntJuggle (
-/*      =============
-*/		    char *cmnd,	    /* The command to be issued */
-		    char *motor,    /* The motor index being loaded */
-		    char *param) {  /* The desired parameter */
-/*
-**	    It is assumed that the parameters are trimmed (especially
-**	    param) and are not terminated with <CR>.
-*/
-    int	    status, i, my_par;
-    char    set_cmnd[80], read_cmnd[40], buff[40];
-    char   *rd_tok;
-
-    printf ("Trying to juggle the \"%s\" parameter of Motor %s"
-		" to be %s ..\n  .. ", cmnd, motor, param);
-
-    sprintf (read_cmnd, "%s %s\r", cmnd, motor); /* Prepare the param rd cmnd */
-
-	    /*----------------------------------------------------------------
-	    ** First try incrementing the parameter 5 times.
-	    */
-    sscanf (param, "%d", &my_par);	/* Gen binary value of param */
-
-    for (i = 0; i < 5; i++) {
-      my_par++;
-
-      printf ("%d .. ", my_par);
-      sprintf (set_cmnd, "%s %s %d\r", cmnd, motor, my_par);
-
-      status = EL734_SendCmnd (&Hndl, set_cmnd, buff, sizeof (buff));
-      if (status) status = EL734_SendCmnd (&Hndl, read_cmnd, buff, sizeof (buff));
-      if (!status) {
-	printf ("\nError with \"%s %s %d\"\n"
-	        "Abandoning parameter juggle!\n", cmnd, motor, my_par);
-	return False;
-      }
-      rd_tok = strtok (buff, " ");    /* Skip leading spaces */
-      if (strcmp (param, rd_tok) == 0) {
-	printf ("\n  Success. Parameter as sent was %d\n"
-	          "           Parameter as read is  %s\n", my_par, param);
-	return True;
-      }
-    }
-	    /*----------------------------------------------------------------
-	    ** Now try decrementing the last digit of the set value of the
-	    ** parameter 5 times.
-	    */
-    sscanf (param, "%d", &my_par);	/* Gen binary value of param */
-
-    for (i = 0; i < 5; i++) {
-      my_par--;
-
-      printf ("%d .. ", my_par);
-      sprintf (set_cmnd, "%s %s %d\r", cmnd, motor, my_par);
-
-      status = EL734_SendCmnd (&Hndl, set_cmnd, buff, sizeof (buff));
-      if (status) status = EL734_SendCmnd (&Hndl, read_cmnd, buff, sizeof (buff));
-      if (!status) {
-	printf ("\nError with \"%s %s %d\"\n"
-	        "Abandoning parameter juggle!\n", cmnd, motor, my_par);
-	return False;
-      }
-      rd_tok = strtok (buff, " ");    /* Skip leading spaces */
-      if (strcmp (param, rd_tok) == 0) {
-	printf ("\n  Success. Parameter as sent was %d\n"
-	          "           Parameter as read is  %s\n", my_par, param);
-	return True;
-      }
-    }
-	/*
-	** Failed - go back to original setting
-	*/
-    sprintf (set_cmnd, "%s %s %s\r", cmnd, motor, param);
-    status = EL734_SendCmnd (&Hndl, set_cmnd, buff, sizeof (buff));
-    if (status) status = EL734_SendCmnd (&Hndl, read_cmnd, buff, sizeof (buff));
-    if (status) {
-      rd_tok = strtok (buff, " ");
-      printf ("\n  Failed. Parameter value is set to %s\n", rd_tok);
-    }else {
-      printf ("\n  Failed. Parameter value is unknown due to error\n");
-    }
-    return False;
-  }
-/*
-**--------------------------------------------------------------------------
-**		LoadCheckOneInteger:  routine to check that a command specifying
-**				      a single integer set correctly.
-*/
-  int	LoadCheckOneInteger (char *cmnd) {
-/*      ===================
-*/
-    int	    status, len;
-    char    my_cmnd[80], rd_cmnd[40], buff[40];
-    char    *cmnd_tok, *motor_tok, *param_tok, *rd_tok;
-
-    StrJoin (my_cmnd, sizeof (my_cmnd), cmnd, "");  /* Make a copy of cmnd */
-    len = strlen (my_cmnd);
-    if (my_cmnd[len-1] == '\r') my_cmnd[len-1] = NIL;
-
-    cmnd_tok  = strtok (my_cmnd, " ");
-    motor_tok = strtok (NULL, " ");
-    param_tok = strtok (NULL, " ");
-    if ((cmnd_tok == NULL) || (motor_tok == NULL) || (param_tok == NULL)) {
-      printf ("\007Software problem in LoadCheckOneInteger\n");
-      return False;
-    }
-    StrJoin (buff, sizeof (buff), cmnd_tok, " ");
-    StrJoin (rd_cmnd, sizeof (rd_cmnd), buff, motor_tok);
-    len = strlen (rd_cmnd);
-    rd_cmnd[len]   = '\r';
-    rd_cmnd[len+1] = NIL;
-    status = EL734_SendCmnd (&Hndl, rd_cmnd, buff, sizeof (buff));
-    if (status) {
-      rd_tok = strtok (buff, " ");
-      if ((rd_tok == NULL) ||
-	  (strcmp (param_tok, rd_tok) != 0)) {
-	if (rd_tok == NULL) rd_tok = "";
-	printf ("\007Verify error for command \"%s %s %s\"\n",
-			    cmnd_tok, motor_tok, param_tok);
-	printf ("Value set in EL734 controller is \"%s\"\n"
-		  "                    It should be \"%s\"\n",
-			    rd_tok, param_tok);
-	status = LoadIntJuggle (cmnd_tok, motor_tok, param_tok);
-	return status;
-      }else {
-	return True;	    /* The parameter has been set correctly! */
-      }
-    }else {
-      printf ("\007LoadCheckOneInteger -- error from EL734_SendCmnd\n");
-      printf ("Command being checked was \"%s %s %s\"\n",
-		    cmnd_tok, motor_tok, param_tok);
-      return False;
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**		LoadCheckOneFloat:  routine to check that a command specifying
-**				      a single real value set correctly.
-*/
-  int	LoadCheckOneFloat (char *cmnd, int n_dec) {
-/*      =================
-*/
-    int	    status, len, n_dec_ok;
-    char    my_cmnd[80], rd_cmnd[40], buff[40], param[40];
-    char    *cmnd_tok, *motor_tok, *param_tok, *rd_tok;
-    char    *whole_tok, *frac_tok;
-
-    StrJoin (my_cmnd, sizeof (my_cmnd), cmnd, "");  /* Make a copy of cmnd */
-    len = strlen (my_cmnd);
-    if (my_cmnd[len-1] == '\r') my_cmnd[len-1] = NIL;
-
-    cmnd_tok  = strtok (my_cmnd, " ");
-    motor_tok = strtok (NULL, " ");
-    param_tok = strtok (NULL, " ");
-    if ((cmnd_tok == NULL) || (motor_tok == NULL) || (param_tok == NULL)) {
-      printf ("\007Software problem in LoadCheckOneFloat\n");
-      return False;
-    }
-		/*
-		** Check that the number of decimal places in the set parameter
-		** agrees with the setting of the EL734.
-		*/
-    n_dec_ok = True;	    /* Assume it will be OK */
-    StrJoin (param, sizeof (param), param_tok, "");
-    whole_tok = strtok (param, ".");
-    frac_tok  = strtok (NULL, ".");
-    if (frac_tok == NULL) {	    /* Check for a decimal point */
-      len = strlen (whole_tok);	    /* None there, so put in a ".0" */
-      frac_tok = whole_tok + len + 1;
-      frac_tok[0] = '0';
-      frac_tok[1] = NIL;
-    }
-    len = strlen (frac_tok);
-    if (len > n_dec) {		/* Param has too many decimal places */
-				/* Try to remove trailing zeros */
-      while ((len >= 0) && (frac_tok[len-1] == '0')) {
-	len = len - 1;
-	frac_tok[len] = NIL;
-	if (len == n_dec) break;
-      }
-      if (len != n_dec) {
-	printf ("Don't expect the parameter to verify correctly.\n"
-		"You have specified too many decimal places!\n");
-	n_dec_ok = False;	    /* Remember it (to suppress retries) */
-      }
-    }else if (len < n_dec) {	/* Param has too few decimal places */
-      while (len < n_dec) {	/* Pad with zeros */
-	frac_tok[len] = '0';
-	len = len + 1;
-	frac_tok[len] = NIL;
-      }
-    }
-    len = strlen (whole_tok);	/* Re-join the parts of param again */
-    whole_tok[len] = '.';
-
-    StrJoin (buff, sizeof (buff), cmnd_tok, " ");
-    StrJoin (rd_cmnd, sizeof (rd_cmnd), buff, motor_tok);
-    len = strlen (rd_cmnd);
-    rd_cmnd[len]   = '\r';
-    rd_cmnd[len+1] = NIL;
-    status = EL734_SendCmnd (&Hndl, rd_cmnd, buff, sizeof (buff));
-    if (status) {
-      rd_tok = strtok (buff, " ");
-      if ((rd_tok == NULL) ||
-	    (strcmp (param, rd_tok) != 0)) {
-	if (rd_tok == NULL) rd_tok = "";
-	printf ("\007Verify error for command \"%s %s %s\"\n",
-			    cmnd_tok, motor_tok, param);
-	printf ("Value set in EL734 controller is \"%s\"\n"
-		  "                    It should be \"%s\"\n",
-			    rd_tok, param);
-	if (n_dec_ok) {
-	  status = LoadFloatJuggle (cmnd_tok, motor_tok, param, n_dec);
-	}
-	return status;
-      }else {
-	return True;	    /* The parameter has been set correctly! */
-      }
-    }else {
-      printf ("\007LoadCheckOneFloat -- error from EL734_SendCmnd\n");
-      printf ("Command being checked was \"%s %s %s\"\n",
-		    cmnd_tok, motor_tok, param);
-      return False;
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoStop:  Send a STOP command to the motor. If <Ctrl-C> has
-**			    been detected, assume that this is an emergency
-**			    stop and do fewer tests.
-*/
-  int	DoStop () {
-/*      ======
-*/
-    int	    status, no_errors, i,	len,	 act_len;
-    int	    msr,    ored_msr,  fp_cntr, fr_cntr, ss;
-    char    recd[132], buff[132], cmnd[80];
-    float   f_tmp;
-
-    no_errors = True;
-
-    if (!Ctrl_C_has_happened) {
-      EL734_ZeroStatus (&Hndl);
-      printf ("Sending STOP command to motor %d ...", Motor);
-    }else {
-      printf ("\n\007<Ctrl-C> detected: Sending STOP command to motor %d ...",
-		    Motor);
-    }
-
-    status = EL734_Stop (&Hndl);
-    if (!status) no_errors = False;
-
-    if (no_errors) {
-      if (Ctrl_C_has_happened) {
-	printf (" OK.\n");
-	return True;
-      }else {
-	printf ("\nWwaiting for motor to become idle ... ");
-	status = My_WaitIdle (&Hndl, Verbose,
-		    &ored_msr, &fp_cntr, &fr_cntr, &Ist_pos);
-	if (!status) {
-	  if (Ctrl_C_has_happened) {
-	    printf ("\n\007   <Ctrl-C> detected: Wait-for-idle abandoned!\n");
-	  }else {
-	    printf ("\n\007   Error return status from My_WaitIdle!\n");
-	  }
-	  return False;
-	}
-	if ((ored_msr & MSR__STOPPED) == 0) {
-	  printf ("\n\007   Warning -- MSR STOP bit is not set!\n");
-	  return False;
-	}
-	if ((ored_msr & (~MSR__STOPPED)) != 0) {
-	  printf ("\n\007     ... unexpected MSR obtained!\n");
-	  printf ("    %s\n", EL734_EncodeMSR (buff, sizeof (buff),
-				    0, ored_msr, fp_cntr, fr_cntr));
-	  return False;
-	}
-	printf (" OK.\n");
-      }
-      return True;
-    }else {
-      printf ("\n\007   STOP command not accepted!\n");
-      return False;
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoLimits:  Set the lower and upper software limits
-*/
-  int	DoLimits (
-/*      ========
-*/		    float   lo,
-		    float   hi) {
-
-    int	    status, no_errors, i,	len,	 act_len;
-    int	    msr,    ored_msr,  fp_cntr, fr_cntr, ss;
-    char    recd[132], buff[132], cmnd[80];
-    float   f_tmp;
-
-    no_errors = False;
-
-    printf ("Sending command \"h %d %.*f %.*f\" ...",
-			Motor, Dec_pt, lo, Dec_pt, hi);
-
-    sprintf (cmnd, "h %d %.*f %.*f\r", Motor, Dec_pt, lo, Dec_pt, hi);
-    status = EL734_SendCmnd (&Hndl, cmnd, buff, sizeof (buff));
-    if (status && (buff[0] == NIL)) no_errors = True;
-
-    if (no_errors) {
-      printf (" OK.\n");
-      return True;
-    }else {
-      printf ("\n\007   Command not accepted!\n");
-      return False;
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**	DoSimpleMove:  Send a simple move command to the motor and wait for idle
-*/
-  int	DoSimpleMove (
-/*      ============
-*/		    char *a_cmnd,
-		    int	  test_status) {
-
-    int	    status, i,	len,	 act_len;
-    int	    msr,    ored_msr,  fp_cntr, fr_cntr, ss;
-    char    recd[132], buff[132], cmnd[80];
-    float   f_tmp;
-    char    *etxt;
-
-    EL734_ZeroStatus (&Hndl);
-
-    sprintf (cmnd, a_cmnd, Motor);
-    printf ("Sending \"%s\" command ...", cmnd);
-
-    i = strlen (cmnd);
-    cmnd[i]   = '\r';
-    cmnd[i+1] = NIL;
-    status = EL734_SendCmnd (&Hndl, cmnd, buff, sizeof (buff));
-    if (!status) {
-      PrintErrInfo ("EL734_SendCmnd");
-      return False;
-    }
-
-    if (buff[0] != NIL) {
-      printf ("\007 response was \"%s\".\n", buff);
-      etxt = "Unrecognised response!";
-      if (strcmp (buff, "?BSY") == 0) etxt = "Motor busy!";
-      if (strcmp (buff, "?CMD") == 0) etxt = "Bad command!";
-      if (strcmp (buff, "?LOC") == 0) etxt = "Controller is in manual mode!";
-      if (strcmp (buff, "?ADR") == 0) etxt = "Bad motor number!";
-      if (strcmp (buff, "?RNG") == 0) etxt = "Range error! Check low/high limits.";
-      if (strcmp (buff, "*MS")  == 0)
-	etxt = "Motor is disabled: \"Stop\" signal is active!";
-      if (strcmp (buff, "*ES")  == 0)
-	etxt = "Motor is disabled: \"Emergency Stop\" signal is active!";
-      if (strncmp (buff, "?TMO", 4) == 0)
-	etxt = "Time-out! You should check the cables, perhaps.";
-      printf ("%s\n", etxt);
-      return False;
-    }
-
-    printf ("\nWaiting for motor to become idle ..."); fflush (NULL);
-    status = My_WaitIdle (&Hndl, Verbose,
-		    &ored_msr, &fp_cntr, &fr_cntr, &Ist_pos);
-    if (!status) {
-      if (Ctrl_C_has_happened) DoStop ();
-      return False;
-    }
-    if (test_status && ((ored_msr & (~MSR__BUSY)) != MSR__OK)) {
-      printf ("\n\007     ... unexpected MSR obtained!\n");
-      printf ("    %s\n", EL734_EncodeMSR (buff, sizeof (buff),
-				    0, ored_msr, fp_cntr, fr_cntr));
-      return False;
-    }
-    printf (" OK.\nPosition = %.*f\n", Dec_pt, Ist_pos);
-    return True;
-  }
-/*
-**--------------------------------------------------------------------------
-**	   DoSimpleSet:  Send a parameter set command to the motor and
-**			    check for null response.
-*/
-  int	DoSimpleSet (
-/*      ===========
-*/		    char *a_cmnd) {
-
-    int	    status, i;
-    char    cmnd[80], buff[40];
-
-    sprintf (cmnd, a_cmnd, Motor);
-    printf ("Sending \"%s\" command ...", cmnd);
-    i = strlen (cmnd);
-    cmnd[i]   = '\r';
-    cmnd[i+1] = NIL;
-
-    status = EL734_SendCmnd (&Hndl, cmnd, buff, sizeof (buff));
-    if (status && (buff[0] == NIL)) {
-      printf (" OK.\n");
-      return True;
-    }else if (!status) {
-      printf ("\n\007");
-      PrintErrInfo ("EL734_SendCmnd");
-      return False;
-    }else {
-      printf ("\n\007Error response from the motor: \"%s\"!\n", buff);
-      return False;
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoSetPos:  Set the current position
-*/
-  int	DoSetPos (float	ist) {
-/*      ========
-*/
-
-    int	    status;
-    char    cmnd[80];
-
-    sprintf (cmnd, "UU %%d %.*f", Dec_pt, ist);
-    status = DoSimpleSet (cmnd);
-    if (status) printf ("Position set to %.*f\n", Dec_pt, ist);
-    return status;
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoRef:  Perform a Reference Seek
-*/
-  int	DoRef (
-/*      =====
-*/		float	*shift) {
-
-    int	    status, no_restore, i,	len,	 act_len;
-    int	    msr,    ored_msr,  fp_cntr, fr_cntr, ss;
-    char    recd[132], buff[132], cmnd[80];
-    int	    k, v;
-    float   lo, hi, q, zero_pt, targ;
-    float   f_tmp;
-/*-----------------------------------------------------------------
-**					     Absolute encoder?
-*/
-    status = GetKHVQZ (&k, &lo, &hi, &v, &q, &zero_pt);
-    if (!status) return status;
-
-    if (k == 0) {
-      printf ("\n\007Absolute encoder, K = 0, "
-	      "\"-ref\" option is not meaningful!\n");
-      return False;
-    }else {
-      printf ("Performing reference point seek.\n");
-      sprintf (recd, "%.*f", Dec_pt, zero_pt);
-      if (k == -1 || k == -11) {
-	printf ("Reference point = %s (lower limit switch) ...", recd);
-      }else if (k == 1 || k == 11) {
-	printf ("Reference point = %s (upper limit switch) ...", recd);
-      }else if (k == 2 || k == 12) {
-	printf ("Reference point = %s (separate limit switch) ...", recd);
-      }else {
-	printf ("Reference point = %s (reference mode = %d (unrecognised)) ...",
-			recd, k);
-      }
-    }
-/*---------------------------------------------------------------*/
-    *shift = 0.0;
-
-    status = EL734_GetStatus (&Hndl,
-		&msr, &ored_msr, &fp_cntr, &fr_cntr, &ss, &Ist_pos);
-    if ((!status) || (msr == -1)) {
-      printf ("\n\007");
-      printf ("Bad status from EL734_GetStatus.\n"
-	         "    ... failed to do reference seek.\n");
-      return False;
-    }
-    EL734_ZeroStatus (&Hndl);
-
-    sprintf (cmnd, "rf %d\r", Motor);		    /* Start reference seek */
-    status = EL734_SendCmnd (&Hndl, cmnd, buff, sizeof (buff));
-    if (!status) {
-      printf ("\n\007"
-		"   ... failed to initiate reference seek.\n");
-      PrintErrInfo ("EL734_SendCmnd");
-      return False;
-    }else {
-      if (buff[0] != NIL) {
-	printf ("\n\007"
-		"   ... error response when initiating reference seek:"
-		" \"%s\".\n"
-		" Operation abandoned.\n", buff);
-	return False;
-      }
-    }
-    status = My_WaitIdle (&Hndl, Verbose,
-		    &ored_msr, &fp_cntr, &fr_cntr, &Ist_pos);
-    if (!status) {
-      if (Ctrl_C_has_happened) {
-	DoStop ();
-      }else {
-	PrintErrInfo ("My_WaitIdle");
-      }
-      return False;
-    }
-    if ((ored_msr & MSR__REF_OK) != 0) {
-      printf (" OK.\n");
-    }else {
-      if ((ored_msr & MSR__REF_FAIL) != 0) {
-	printf ("\007 failed!\n");
-      }else {
-	printf ("\007 unexpected MSR obtained!\n");
-      }
-      printf ("   %s\n", EL734_EncodeMSR (recd, sizeof (recd),
-			0, ored_msr, fp_cntr, fr_cntr));
-      return False;
-    }
-
-    *shift = Ist_pos - zero_pt;
-    sprintf (recd, "%.*f", Dec_pt, *shift);
-    printf ("Position = %.*f,  Zero-point error = %s\n", Dec_pt, Ist_pos, recd);
-    sscanf (recd, "%f", &f_tmp);
-    if (f_tmp != 0.0) {
-      sprintf (recd, "%.*f", Dec_pt, zero_pt);
-      printf ("\007Setting current position to be %s\n", recd);
-      status = DoSetPos (zero_pt);
-      if (!status) return False;
-    }
-    if ((zero_pt < lo) || (zero_pt > hi)) {	/* Move into range? */
-      if (zero_pt < lo) targ = lo;			/* Yes */
-      if (zero_pt > lo) targ = hi;
-      printf ("Moving into low-high range ...\n");
-      sprintf (cmnd, "P %%d %.*f", Dec_pt, targ);
-      status = DoSimpleMove (cmnd, True);
-    }
-    return True;
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoFF:  Send a FF command to the motor
-*/
-  int	DoFF () {
-/*      ====
-*/
-    int	    status;
-    char    cmnd[32];
-
-    if (Frequency > 0) {
-      sprintf (cmnd, "FF %%d %d", Frequency);
-    }else {
-      strcpy (cmnd, "FF %d");
-    }
-    status = DoSimpleMove (cmnd, True);
-    return status;
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoFB:  Send a FB command to the motor
-*/
-  int	DoFB () {
-/*      ====
-*/
-    int	    status;
-    char    cmnd[32];
-
-    if (Frequency > 0) {
-      sprintf (cmnd, "FB %%d %d", Frequency);
-    }else {
-      strcpy (cmnd, "FB %d");
-    }
-    status = DoSimpleMove (cmnd, True);
-    return status;
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoSF:  Send a SF command to the motor
-*/
-  int	DoSF () {
-/*      ====
-*/
-    int	    status;
-    char    cmnd[32];
-
-    if (Frequency > 0) {
-      sprintf (cmnd, "SF %%d %d", Frequency);
-    }else {
-      strcpy (cmnd, "SF %d");
-    }
-    status = DoSimpleMove (cmnd, True);
-    return status;
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoSB:  Send a SB command to the motor
-*/
-  int	DoSB () {
-/*      ====
-*/
-    int	    status;
-    char    cmnd[32];
-
-    if (Frequency > 0) {
-      sprintf (cmnd, "SB %%d %d", Frequency);
-    }else {
-      strcpy (cmnd, "SB %d");
-    }
-    status = DoSimpleMove (cmnd, True);
-    return status;
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoHunt:  hunt for the motor's reference point.
-*/
-  int	DoHunt () {
-/*      ======
-*/
-    int	    status;
-    int	    k;
-    float   lo, hi, q, shift, zero;
-    int	    v;
-    int	    msr, ored_msr, fp_cntr, fr_cntr, ss;
-    float   step, targ, f_tmp;
-    char    cmnd[20];
-
-    status = GetKHVQZ (&k, &lo, &hi, &v, &q, &zero);
-    if (!status) return status;
-/*-----------------------------------------------------------------
-**					     Absolute encoder    */
-    if (k == 0) {
-      printf ("\n\007Absolute encoder, K = 0, "
-	      "-hunt option is not meaningful!\n");
-      return False;
-/*-----------------------------------------------------------------
-**					     Lo-Lim is Ref Pt	 */
-    }else if ((k == -1) || (k == -11)) {
-      printf ("Reference point = %.*f (low limit switch)\n", Dec_pt, zero);
-      if (q <= 0) {
-	printf ("\n\007Q = %.*f. This is inconsistent with K = %d!\n",
-				    Dec_pt, q, k);
-	return False;
-      }
-      status = DoSimpleSet ("H %d -8000 8000");
-      if (!status) return status;
-
-      status = DoSetPos (0.0);
-      if (!status) return status;
-
-      status = DoSimpleMove ("FB %d", False); /* Do FB but don't test MSR at end */
-      if (!status) return status;
-
-      DoLimits (lo, hi);	/* Reset lo/hi limits */
-
-      status = EL734_GetStatus (&Hndl,
-		&msr, &ored_msr, &fp_cntr, &fr_cntr, &ss, &Ist_pos);
-      if (msr == -1) {
-	printf ("\n\007Bad status from EL734_GetStatus!");
-	return False;
-      }
-
-      if ((ored_msr & MSR__LO_LIM) == 0) {
-	printf ("\n\007Low-limit switch was not reached!");
-	return False;
-      }
-
-      status = DoSetPos (zero);
-      if (!status) return status;
-
-      if ((ss & SS__LSX) != 0) {
-	printf ("\n\007Reference-point is still active!");
-	return False;
-      }
-
-      status = DoRef (&shift);
-      return status;
-/*-----------------------------------------------------------------
-**					     Hi-Lim is Ref Pt	 */
-    }else if ((k ==  1) || (k ==  11)) {
-      printf ("Reference point = %.*f (high limit switch)\n", Dec_pt, zero);
-      if (q <= 0) {
-	printf ("\n\007Q = %.*f. This is inconsistent with K = %d!\n",
-					    Dec_pt, q, k);
-	return False;
-      }
-      status = DoSimpleSet ("H %d -8000 8000");
-      if (!status) return status;
-
-      status = DoSetPos (0.0);
-      if (!status) return status;
-
-      status = DoSimpleMove ("FF %d", False); /* Do FF but don't test MSR at end */
-      if (!status) return status;
-
-      DoLimits (lo, hi);	/* Reset lo/hi limits */
-
-      status = EL734_GetStatus (&Hndl,
-		&msr, &ored_msr, &fp_cntr, &fr_cntr, &ss, &Ist_pos);
-      if (msr == -1) {
-	printf ("\n\007Bad status from EL734_GetStatus!");
-	return False;
-      }
-
-      if ((ored_msr & MSR__HI_LIM) == 0) {
-	printf ("\n\007High-limit switch was not reached!");
-	return False;
-      }
-
-      status = DoSetPos (zero);
-      if (!status) return status;
-
-      if ((ss & SS__LSX) != 0) {
-	printf ("\n\007Reference-point is still active!");
-	return False;
-      }
-
-      status = DoRef (&shift);
-      return status;
-/*-----------------------------------------------------------------
-**					     Separate Ref Pt	 */
-    }else if ((k ==  2) || (k ==  12)) {
-      printf ("Reference point = %.*f (separate switch)\n", Dec_pt, zero);
-      if (q == 0.0) {
-	printf ("\n\007Q = %.*f. This is inconsistent with K = %d!\n",
-					    Dec_pt, q, k);
-	return False;
-      }else {
-	sprintf (cmnd, "%.*f", Dec_pt, q);  /* Check Q param is not too small */
-	sscanf (cmnd, "%f", &f_tmp);
-	if (f_tmp == 0.0) {
-	  printf ("\n\007Q = %f. This is too small!\n", q);
-	  return False;
-	}
-      }
-      status = DoSimpleSet ("H %d -8000 8000");
-      if (!status) return status;
-
-      sprintf (cmnd, "P %%d %.*f", Dec_pt, (zero - (q/2.0)));
-      printf ("Moving to start position.\n");
-      status = DoSimpleMove (cmnd, False);
-
-      status = DoSetPos (0.0);
-      if (!status) {
-	DoLimits (lo, hi);
-	return status;
-      }
-
-      step = 0.95 * q;
-      targ = 0.0;
-      printf ("Low-to-High distance = %.*f\n", Dec_pt, (hi - lo));
-      printf ("Step size = %.*f\n", Dec_pt, step);
-      if (step > 0) {
-	printf ("Stepping to low-limit switch looking for ref-point ...\n");
-      }else {
-	printf ("Stepping to high-limit switch looking for ref-point ...\n");
-      }
-      fflush (NULL);
-      status = EL734_GetStatus (&Hndl,
-		&msr, &ored_msr, &fp_cntr, &fr_cntr, &ss, &Ist_pos);
-      while (status &&
-	     ((ored_msr & MSR__LO_LIM) == 0) &&
-	     ((ored_msr & MSR__HI_LIM) == 0) &&
-	     ((ss & SS__LSX) == 0)) {
-        targ = targ - step;
-	sprintf (cmnd, "P %%d %.*f", Dec_pt, targ);
-	status = DoSimpleMove (cmnd, False);
-        if (!status) {
-	  if (Ctrl_C_has_happened) {
-	    DoStop ();
-	  }else {
-	    PrintErrInfo ("DoSimpleMove");
-	  }
-	  DoLimits (lo, hi);
-	  return False;
-	}
-	status = EL734_GetStatus (&Hndl,
-		&msr, &ored_msr, &fp_cntr, &fr_cntr, &ss, &Ist_pos);
-      }
-      if (!status) return False;
-      if ((ored_msr & (MSR__LO_LIM | MSR__HI_LIM)) != 0) {
-        printf ("Got to limit switch. Ref-point not found. "
-		"Returning to Start.\n"); fflush (NULL);
-	status = DoSimpleMove ("P %d 0.0", False);
-        if (!status) {
-	  if (Ctrl_C_has_happened) {
-	    DoStop ();
-	  }else {
-	    PrintErrInfo ("DoSimpleMove");
-	  }
-	  DoLimits (lo, hi);
-	  return False;
-	}
-	targ = 0.0;
-	if (step > 0) {
-	  printf ("Stepping to high-limit switch looking for ref-point ...\n");
-	}else {
-	  printf ("Stepping to low-limit switch looking for ref-point ...\n");
-	}
-	status = EL734_GetStatus (&Hndl,
-		&msr, &ored_msr, &fp_cntr, &fr_cntr, &ss, &Ist_pos);
-	while (status &&
-	       ((ored_msr & MSR__LO_LIM) == 0) &&
-	       ((ored_msr & MSR__HI_LIM) == 0) &&
-	       ((ss & SS__LSX) == 0)) {
-	  targ = targ + step;
-	  sprintf (cmnd, "P %%d %.*f", Dec_pt, targ);
-	  status = DoSimpleMove (cmnd, False);
-          if (!status) {
-	    if (Ctrl_C_has_happened) {
-	      DoStop ();
-	    }else {
-	      PrintErrInfo ("DoSimpleMove");
-	    }
-	    DoLimits (lo, hi);
-	    return False;
-	  }
-	  status = EL734_GetStatus (&Hndl,
-		&msr, &ored_msr, &fp_cntr, &fr_cntr, &ss, &Ist_pos);
-	}
-	if (!status) return False;
-	if ((ored_msr & (MSR__LO_LIM | MSR__HI_LIM)) != 0) {
-	  printf ("\n\007Got to limit switch. Ref-point not found!\n");
-	  printf ("Hunt operation abandoned.\n");
-	  DoLimits (lo, hi);
-	  if (step > 0) DoSetPos (hi); else DoSetPos (lo);
-	  return False;
-	}
-      }
-      DoLimits (lo, hi);	    /* Reset lo/hi limits */
-      if ((ss & SS__LSX) == 0) {
-        printf ("\n\007Ref-point not found!\n");
-	DoLimits (lo, hi);
-	return False;
-      }
-      status = DoRef (&shift);
-      return status;
-    }else {
-      printf ("\n\007Reference Mode, K = %d. Unrecognised value!\n", k);
-      return False;
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoSave:  Get all parameter settings of motor.
-*/
-  int	DoSave () {
-/*      ======
-*/
-    int			 status, no_errors;
-    char		 buff[80];
-    int			 msr,      ored_msr,  fp_cntr, fr_cntr, ss;
-    int			 air_cush, inp_state, act_mot;
-    FILE		*lun;
-    time_t		 time_now;
-    struct EL734info	*info_ptr;
-
-    char    cmnd00[10], cmnd01[10], cmnd02[10], cmnd03[10], cmnd04[10];
-    char    cmnd05[10], cmnd06[10], cmnd07[10], cmnd08[10], cmnd09[10];
-    char    cmnd10[10], cmnd11[10], cmnd12[10], cmnd13[10], cmnd14[10];
-    char    cmnd15[10], cmnd16[10], cmnd17[10], cmnd18[10], cmnd19[10];
-    char    cmnd20[10], cmnd21[10], cmnd22[10], cmnd23[10], cmnd24[10];
-    char    cmnd25[10], cmnd26[10], cmnd27[10], cmnd28[10], cmnd29[10];
-    char    cmnd30[10], cmnd31[10];
-
-    char    *rptr00, *rptr01, *rptr02, *rptr03, *rptr04;
-    char    *rptr05, *rptr06, *rptr07, *rptr08, *rptr09;
-    char    *rptr10, *rptr11, *rptr12, *rptr13, *rptr14;
-    char    *rptr15, *rptr16, *rptr17, *rptr18, *rptr19;
-    char    *rptr20, *rptr21, *rptr22, *rptr23, *rptr24;
-    char    *rptr25, *rptr26, *rptr27, *rptr28, *rptr29;
-    char    *rptr30, *rptr31;
-
-    int	no_EC_cmnd = True;
-    int	no_A_cmnd  = True;
-    int	no_FD_cmnd = True;
-    int	no_FM_cmnd = True;
-    int	no_D_cmnd  = True;
-    int	no_E_cmnd  = True;
-    int	no_F_cmnd  = True;
-    int	no_G_cmnd  = True;
-    int	no_H_cmnd  = True;
-    int	no_J_cmnd  = True;
-    int	no_K_cmnd  = True;
-    int	no_L_cmnd  = True;
-    int	no_M_cmnd  = True;
-    int	no_Q_cmnd  = True;
-    int	no_T_cmnd  = True;
-    int	no_V_cmnd  = True;
-    int	no_W_cmnd  = True;
-    int	no_Z_cmnd  = True;
-    int	no_SP_cmnd = True;
-    int	no_ST_cmnd = True;
-    int	no_SR_cmnd = True;
-    int	no_SA_cmnd = True;
-    int	no_AC_cmnd = True;
-    int	no_RI_cmnd = True;
-    int	no_AM_cmnd = True;
-    int	no_EP_cmnd = True;
-    int	no_KP_cmnd = True;
-    int	no_KI_cmnd = True;
-    int	no_KD_cmnd = True;
-
-    if ((strcmp (Save_file, "-") == 0) ||
-	(strcmp (Save_file, "=") == 0)) {	/* Use standard output? */
-      lun = stdout;				/* Yes */
-    }else {
-      lun = fopen (Save_file, "w");
-      if (lun == NULL) return False;
-      printf ("Writing motor parameters to file %s ...", Save_file);
-    }
-    time_now = time (NULL);
-    fprintf (lun, "! EL734 Status at %s", asctime (localtime (&time_now)));
-    fprintf (lun, "! ============\n");
-
-    sprintf (cmnd00, "id\r");
-    sprintf (cmnd01, "mn %d\r", Motor);
-    sprintf (cmnd02, "mem %d\r", Motor);
-    sprintf (cmnd03, "ec %d\r", Motor);
-    sprintf (cmnd04, "a %d\r", Motor);
-    sprintf (cmnd05, "fd %d\r", Motor);
-    sprintf (cmnd06, "fm %d\r", Motor);
-    sprintf (cmnd07, "d %d\r", Motor);
-    sprintf (cmnd08, "e %d\r", Motor);
-    sprintf (cmnd09, "f %d\r", Motor);
-    sprintf (cmnd10, "g %d\r", Motor);
-    sprintf (cmnd11, "h %d\r", Motor);
-    sprintf (cmnd12, "j %d\r", Motor);
-    sprintf (cmnd13, "k %d\r", Motor);
-    sprintf (cmnd14, "l %d\r", Motor);
-    sprintf (cmnd15, "m %d\r", Motor);
-    sprintf (cmnd16, "q %d\r", Motor);
-    sprintf (cmnd17, "t %d\r", Motor);
-    sprintf (cmnd18, "v %d\r", Motor);
-    sprintf (cmnd19, "w %d\r", Motor);
-    sprintf (cmnd20, "z %d\r", Motor);
-    sprintf (cmnd21, "sp %d\r", Motor);
-    sprintf (cmnd22, "st %d\r", Motor);
-    sprintf (cmnd23, "sr %d\r", Motor);
-    sprintf (cmnd24, "sa %d\r", Motor);
-    sprintf (cmnd25, "ac %d\r", Motor);
-    sprintf (cmnd26, "ri %d\r", Motor);
-    sprintf (cmnd27, "am\r");
-    sprintf (cmnd28, "ep %d\r", Motor);
-    sprintf (cmnd29, "kp %d\r", Motor);
-    sprintf (cmnd30, "ki %d\r", Motor);
-    sprintf (cmnd31, "kd %d\r", Motor);
-
-    no_errors = True;
-
-    info_ptr = (struct EL734info *) Hndl;
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-		&info_ptr->to_host, &info_ptr->from_host,
-		cmnd00, cmnd01, cmnd02, cmnd03, cmnd04, cmnd05, cmnd06, 
-		cmnd07, cmnd08, cmnd09, cmnd10, cmnd11, cmnd12, cmnd13, 
-		cmnd14, cmnd15, cmnd16, cmnd17, cmnd18, cmnd19, cmnd20, 
-		cmnd21, cmnd22, cmnd23, cmnd24, cmnd25, cmnd26, cmnd27,
-		cmnd28, cmnd29, cmnd30, cmnd31, NULL);
-    if (status) {
-      rptr00 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, NULL);
-      rptr01 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr00);
-      rptr02 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr01);
-      rptr03 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr02);
-      rptr04 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr03);
-      rptr05 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr04);
-      rptr06 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr05);
-      rptr07 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr06);
-      rptr08 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr07);
-      rptr09 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr08);
-      rptr10 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr09);
-      rptr11 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr10);
-      rptr12 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr11);
-      rptr13 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr12);
-      rptr14 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr13);
-      rptr15 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr14);
-      rptr16 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr15);
-      rptr17 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr16);
-      rptr18 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr17);
-      rptr19 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr18);
-      rptr20 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr19);
-      rptr21 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr20);
-      rptr22 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr21);
-      rptr23 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr22);
-      rptr24 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr23);
-      rptr25 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr24);
-      rptr26 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr25);
-      rptr27 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr26);
-      rptr28 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr27);
-      rptr29 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr28);
-      rptr30 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr29);
-      rptr31 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr30);
-      if ((rptr00 == NULL) || (rptr01 == NULL) || (rptr02 == NULL) || 
-	  (rptr03 == NULL) || (rptr04 == NULL) || (rptr05 == NULL) || 
-	  (rptr06 == NULL) || (rptr07 == NULL) || (rptr08 == NULL) || 
-	  (rptr09 == NULL) || (rptr10 == NULL) || (rptr11 == NULL) || 
-	  (rptr12 == NULL) || (rptr13 == NULL) || (rptr14 == NULL) || 
-	  (rptr15 == NULL) || (rptr16 == NULL) || (rptr17 == NULL) || 
-	  (rptr18 == NULL) || (rptr19 == NULL) || (rptr20 == NULL) || 
-	  (rptr21 == NULL) || (rptr22 == NULL) || (rptr23 == NULL) || 
-	  (rptr24 == NULL) || (rptr25 == NULL) || (rptr26 == NULL) ||
-	  (rptr27 == NULL) || (rptr28 == NULL) || (rptr29 == NULL) ||
-	  (rptr30 == NULL) || (rptr31 == NULL)) {
-	no_errors = False;
-      }else {
-        StrJoin (Ctrl_id,  sizeof (Ctrl_id),  rptr00, "");
-        StrJoin (Mot_name, sizeof (Mot_name), rptr01, "");
-        StrJoin (Mot_mem,  sizeof (Mot_mem),  rptr02, "");
-	if (sscanf (rptr03, "%d %d", &Enc_typ, &Enc_num) == 2)
-	    no_EC_cmnd = False;
-	if (sscanf (rptr04, "%d", &Dec_pt) == 1) no_A_cmnd  = False;
-	if (sscanf (rptr05, "%d %d", &Enc_fact_0, &Enc_fact_1) == 2)
-	    no_FD_cmnd = False;
-	if (sscanf (rptr06, "%d %d", &Mot_fact_0, &Mot_fact_1) == 2)
-	    no_FM_cmnd = False;
-	if (sscanf (rptr07, "%f", &Inertia_tol) == 1) no_D_cmnd = False;
-	if (sscanf (rptr08, "%d", &Ramp) == 1) no_E_cmnd = False;
-	if (sscanf (rptr09, "%d", &Loop_mode) == 1) no_F_cmnd = False;
-	if (sscanf (rptr10, "%d", &Slow_hz) == 1) no_G_cmnd = False;
-	if (sscanf (rptr11, "%f %f", &Lo, &Hi) == 2) no_H_cmnd = False;
-	if (sscanf (rptr12, "%d", &Fast_hz) == 1) no_J_cmnd = False;
-	if (sscanf (rptr13, "%d", &Ref_mode) == 1) no_K_cmnd = False;
-	if (sscanf (rptr14, "%d", &Backlash) == 1) no_L_cmnd = False;
-	if (sscanf (rptr15, "%d", &Pos_tol) == 1) no_M_cmnd = False;
-	if (sscanf (rptr16, "%f", &Ref_param) == 1) no_Q_cmnd = False;
-	if (sscanf (rptr17, "%d", &Is_sided) == 1) no_T_cmnd = False;
-	if (sscanf (rptr18, "%d", &Null_pt) == 1) no_V_cmnd = False;
-	if (sscanf (rptr19, "%d", &Ac_par) == 1) no_W_cmnd = False;
-	if (sscanf (rptr20, "%d", &Enc_circ) == 1) no_Z_cmnd = False;
-	if (sscanf (rptr21, "%d", &Stat_pos) == 1) no_SP_cmnd = False;
-	if (sscanf (rptr22, "%d", &Stat_pos_flt) == 1) no_ST_cmnd = False;
-	if (sscanf (rptr23, "%d", &Stat_pos_fail) == 1)
-	    no_SR_cmnd = False;
-	if (sscanf (rptr24, "%d", &Stat_cush_fail) == 1)
-	    no_SA_cmnd = False;
-	if (sscanf (rptr25, "%d", &air_cush) == 1) no_AC_cmnd = False;
-	if (sscanf (rptr26, "%d", &inp_state) == 1) no_RI_cmnd = False;
-	if (sscanf (rptr27, "%x", &act_mot) == 1) no_AM_cmnd = False;
-	if (sscanf (rptr28, "%d", &Enc_par) == 1) no_EP_cmnd = False;
-	if (sscanf (rptr29, "%d", &Prop) == 1) no_KP_cmnd = False;
-	if (sscanf (rptr30, "%d", &Integ) == 1) no_KI_cmnd = False;
-	if (sscanf (rptr31, "%d", &Deriv) == 1) no_KD_cmnd = False;
-      }
-    }else {
-      no_errors = False;
-    }
-    if (no_errors) {
-      EL734_GetStatus (&Hndl,
-		&msr, &ored_msr, &fp_cntr, &fr_cntr, &ss, &Ist_pos);
-      if (msr == -1) no_errors = False;
-    }
-    if (no_errors) goto ds_do;
-      printf ("\007");
-      fprintf (lun, "!\n");
-      fprintf (lun, "! Failed to get status of motor\n");
-      if (lun != stdout) {
-	fclose (lun);
-	printf ("\007error detected.\n");
-      }
-      return False;
-ds_do:
-    if (no_K_cmnd) {
-      fprintf (lun, "!\n"
-	"! EL734 ID = \"%s\"\n"
-	"! Server \"%s\"\n"
-	"! Port    %5d\n"
-	"! Channel %5d\n"
-	"! Motor   %5d\n",
-	    Ctrl_id, El734_host, El734_port, El734_chan, Motor);
-    }else {
-      fprintf (lun, "!\n"
-	"! Reference mode information:                 EL734 ID = \"%s\"\n"
-	"!     K = -11 = LoLim + Index is ref. pt.     Server \"%s\"\n"
-	"!          -1 = LoLim is ref. pt.             Port    %5d\n"
-	"!           0 = Abs encoder                   Channel %5d\n"
-	"!           1 = HiLim is ref. pt.             Motor   %5d\n"
-	"!           2 = Separate ref. pt.\n"
-	"!          11 = HiLim + Index is ref. pt.\n"
-	"!          12 = Separate + Index ref. pt.\n",
-	    Ctrl_id, El734_host, El734_port, El734_chan, Motor);
-    }
-    fprintf (lun, "!\n");
-    if (!no_SP_cmnd) fprintf (lun, "! # of positionings,         SP = %d\n",
-				Stat_pos);
-    if (!no_ST_cmnd) fprintf (lun, "! # of positioning faults,   ST = %d\n",
-				Stat_pos_flt);
-    if (!no_SR_cmnd) fprintf (lun, "! # of positioning failures, SR = %d\n",
-				Stat_pos_fail);
-    if (!no_SA_cmnd) fprintf (lun, "! # of air-cushion failures, SA = %d\n",
-				Stat_cush_fail);
-    fprintf (lun, "! %s", EL734_EncodeMSR (buff, sizeof (buff),
-				    msr, ored_msr, fp_cntr, fr_cntr));
-    fprintf (lun, "     %s\n", EL734_EncodeSS (buff, sizeof (buff), ss));
-    if (!no_W_cmnd) {
-      if (Ac_par == 0) {
-        switch (air_cush) {
-         case 0:  break;	/* Don't mention air cushions in this case! */
-	 case 1:  fprintf (lun, "! Air-cushion status is \"on\".\n"); break;
-	 default: fprintf (lun, "! Air-cushion status = %d.\n", air_cush);
-	}
-      }else {
-	switch (air_cush) {
-	 case 0:  fprintf (lun, "! Air-cushion is \"down\"\n"); break;
-	 case 1:  fprintf (lun, "! Air-cushion is \"up\"\n"); break;
-	 default: fprintf (lun, "! Air-cushion status = %d.\n", air_cush);
-	}
-      }
-    }
-    if (!no_RI_cmnd) {
-      switch (inp_state) {
-       case 0:	fprintf (lun, "! Input status is \"off\".\n"); break;
-       case 1:	fprintf (lun, "! Input status is \"on.\"\n"); break;
-       default:	fprintf (lun, "! Input status = %d.\n", inp_state);
-      }
-    }
-    if (!no_AM_cmnd) {
-      if (act_mot != 0) {
-	fprintf (lun, "! Active motor status = 0x%03X\n", act_mot);
-      }else {
-	fprintf (lun, "! No motors are active.\n");
-      }
-    }
-    fprintf (lun, "!\n");
-    if (Mot_name[0] == NIL) {
-      sprintf (buff, " mn  %%d  ...............");
-    }else {
-      sprintf (buff, " mn  %%d  %s", Mot_name);
-    }
-    fprintf (lun, "%-32s! %s\n", buff, "Motor name");
-    if (!no_EC_cmnd) {
-      sprintf (buff, " ec  %%d  0 0");
-      fprintf (lun, "%-32s! %s\n", buff, "Zero the encoder mapping");
-      sprintf (buff, " ec  %%d  %s", rptr03);
-      fprintf (lun, "%-32s! %s\n", buff, "Encoder mapping (type/number)");
-    }
-    if (!no_EP_cmnd) {
-      sprintf (buff, " ep  %%d  %s", rptr28);
-      fprintf (lun, "%-32s! %s\n", buff, "Encoder magic parameter");
-    }
-    if (!no_A_cmnd) {
-      sprintf (buff, " a   %%d  %s",	rptr04);
-      fprintf (lun, "%-32s! %s\n", buff, "Precision");
-    }
-    if (!no_FD_cmnd) {
-      sprintf (buff, " fd  %%d  %s",	rptr05);
-      fprintf (lun, "%-32s! %s\n", buff, "Encoder gearing (numer/denom)");
-    }
-    if (!no_FM_cmnd) {
-      sprintf (buff, " fm  %%d  %s",	rptr06);
-      fprintf (lun, "%-32s! %s\n", buff, "Motor   gearing (numer/denom)");
-    }
-    if (!no_D_cmnd) {
-      sprintf (buff, " d   %%d  %s",	rptr07);
-      fprintf (lun, "%-32s! %s\n", buff, "Inertia tolerance");
-    }
-    if (!no_E_cmnd) {
-      sprintf (buff, " e   %%d  %s",	rptr08);
-      fprintf (lun, "%-32s! %s\n", buff, "Start/stop ramp (kHz/sec)");
-    }
-    if (!no_F_cmnd) {
-      sprintf (buff, " f   %%d  %s",	rptr09);
-      fprintf (lun, "%-32s! %s\n", buff, "Open loop/Closed loop (0/1)");
-    }
-    if (!no_G_cmnd) {
-      sprintf (buff, " g   %%d  %s",	rptr10);
-      fprintf (lun, "%-32s! %s\n", buff, "Start/stop frequency (Mot-S/sec)");
-    }
-    if (!no_H_cmnd) {
-      sprintf (buff, " h   %%d  %s",	rptr11);
-      fprintf (lun, "%-32s! %s\n", buff, "Low/High Software Limits");
-    }
-    if (!no_J_cmnd) {
-      sprintf (buff, " j   %%d  %s",	rptr12);
-      fprintf (lun, "%-32s! %s\n", buff, "Top speed (Mot-S/sec)");
-    }
-    if (!no_K_cmnd) {
-      sprintf (buff, " k   %%d  %s",	rptr13);
-      fprintf (lun, "%-32s! %s\n", buff, "Reference mode");
-    }
-    if (!no_L_cmnd) {
-      sprintf (buff, " l   %%d  %s",	rptr14);
-      fprintf (lun, "%-32s! %s\n", buff, "Backlash/Spielausgleich (Mot-S)");
-    }
-    if (!no_M_cmnd) {
-      sprintf (buff, " m   %%d  %s",	rptr15);
-      fprintf (lun, "%-32s! %s\n", buff, "Position tolerance (Enc-Steps)");
-    }
-    if (!no_Q_cmnd) {
-      sprintf (buff, " q   %%d  %s",	rptr16);
-      fprintf (lun, "%-32s! %s\n", buff, "Reference switch width");
-    }
-    if (!no_T_cmnd) {
-      sprintf (buff, " t   %%d  %s",	rptr17);
-      fprintf (lun, "%-32s! %s\n", buff, "One-sided operation flag (0 = no)");
-    }
-    if (!no_V_cmnd) {
-      sprintf (buff, " v   %%d  %s",	rptr18);
-      fprintf (lun, "%-32s! %s\n", buff, "Null point");
-    }
-    if (!no_W_cmnd) {
-      sprintf (buff, " w   %%d  %s",	rptr19);
-      fprintf (lun, "%-32s! %s\n", buff, "Air-cushion dependency");
-    }
-    if (!no_Z_cmnd) {
-      sprintf (buff, " z   %%d  %s",	rptr20);
-      fprintf (lun, "%-32s! %s\n", buff, "Circumf. of encoder (Enc-Steps)");
-    }
-    if (!no_KP_cmnd) {
-      sprintf (buff, " kp  %%d  %s",	rptr29);
-      fprintf (lun, "%-32s! %s\n", buff, "Proportional");
-    }
-    if (!no_KI_cmnd) {
-      sprintf (buff, " ki  %%d  %s",	rptr30);
-      fprintf (lun, "%-32s! %s\n", buff, "Integral");
-    }
-    if (!no_KD_cmnd) {
-      sprintf (buff, " kd  %%d  %s",	rptr31);
-      fprintf (lun, "%-32s! %s\n", buff, "Differential");
-    }
-    if (Mot_mem[0] == NIL) {
-      sprintf (buff, " mem %%d  ...............");
-    }else {
-      sprintf (buff, " mem %%d  %s", Mot_mem);
-    }
-    fprintf (lun, "%-32s! %s\n", buff, "User data register");
-
-    if (Ref_mode != 0) {
-      fprintf (lun, "%-32s! %s\n", " restore", "Incr. encoder"
-			" - specify position restore");
-    }
-
-    fprintf (lun, "!\n");
-    fprintf (lun, "! Current position is %.*f\n", Dec_pt, Ist_pos);
-    fprintf (lun, "!\n");
-    if (lun != stdout) {
-      fclose (lun);
-      chmod (Save_file, 0644);
-      printf (" OK.\n");
-    }
-    return True;
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoLoad:  Load parameter settings from a file.
-*/
-  int	DoLoad () {
-/*      ======
-*/
-    int	    status, go_on, no_errors, no_restore, i, len,  act_len;
-    int	    msr, ored_msr, fp_cntr, fr_cntr, ss;
-    FILE    *lun;
-    char    recd[132], buff[132], cmnd[80], cmnd_prnt[80];
-		/*
-		** Setting motor parameters usually causes the current
-		** position to get lost. Read it now so that it can be
-		** restored at the end if required.
-		*/
-    printf ("The current position, ");
-    status = EL734_GetPrecision (&Hndl, &Dec_pt);
-    if (status) {
-      EL734_GetStatus (&Hndl,
-		&msr, &ored_msr, &fp_cntr, &fr_cntr, &ss, &Ist_pos);
-      if (msr == -1) status = False;
-    }
-    if (!status) {
-      printf ("\n     ... failed to get current position.\n");
-      return False;
-    }else {
-      printf ("%.*f, can be restored at end of load operation if\n"
-	"a \"RESTORE\" command is given. Executing a \"U\" or a \"UU\""
-			" or any motion command\n"
-	"will cancel the effect of a \"RESTORE\" command.\n",
-		    Dec_pt, Ist_pos);
-      no_restore = True;
-    }
-
-    if ((strcmp (Load_file, "-") == 0) ||
-	(strcmp (Load_file, "=") == 0)) {	/* Use standard input? */
-      lun = stdin;				/* Yes */
-      printf ("Getting motor parameters from standard input ...\n> ");
-    }else {
-      lun = fopen (Load_file, "r");
-      if (lun == NULL) {
-        printf ("\007Error opening file %s ... load failed.\n", Load_file);
-	return False;
-      }
-      printf ("Getting motor parameters from file %s ...\n", Load_file);
-    }
-
-    go_on = True;
-    no_errors  = True;
-
-    while (go_on && (fgets (recd, sizeof (recd), lun) != NULL)) {
-      len = strlen (recd);
-      if (len <= 1) {
-	if (lun == stdin) {printf ("> "); fflush (NULL);}
-        continue;
-      }
-      if (recd[len-1] != '\n') {
-	recd[20] = NIL;
-        printf ("\007   Record not terminated by \"\\n\". "
-			    "It is probably too long!\n"
-		"   The record starts thus: %s ...\n"
-		"   It has been skipped.\n", recd);
-	if (lun == stdin) {printf ("> "); fflush (NULL);}
-	continue;
-      }
-      recd[len-1] = NIL;	/* Remove the terminating "\n" */
-	    /*
-	    ** Strip off any trailing stuff (but keep it around so that we
-	    ** can print it out). "Trailing stuff" is anything after a "!".
-	    */
-      act_len = strcspn (recd, "!");
-      len = sizeof (buff);
-      StrEdit (buff, recd, "trim compress uncomment", &len);
-	    /*
-	    ** If the remainder is just white-space, do nothing.
-	    */
-      if (len <= 0) {
-        if (lun == stdin) {printf ("> "); fflush (NULL);}
-	continue;
-      }
-      if (strlen (buff) >= sizeof (cmnd)) {
-	recd[20] = NIL;
-        printf ("\007   Record has a dubious format!!\n"
-		"   The record starts thus: %s ...\n"
-		"   It has been skipped.\n", recd);
-	if (lun == stdin) {printf ("> "); fflush (NULL);}
-	continue;
-      }
-      if (sprintf (cmnd, buff, Motor) >= sizeof (cmnd)) {
-	fprintf (stderr,
-		"\007   Record has generated a command which is too long.\n"
-		"   This may have corrupted the program. To be safe,\n"
-		"   we are now going to do an emergency exit. Bye.\n");
-	exit (False);
-      }
-      if ((lun != stdin) && (len > 0)) {    /* Show user what's going on */
-	strcpy (cmnd_prnt, cmnd);
-	MakePrint (cmnd_prnt);
-        printf ("%-32s%s\n", cmnd_prnt, &recd[act_len]);
-      }
-      len = sizeof (cmnd);
-      StrEdit (cmnd, cmnd, "upcase compress", &len);
-      if (strncmp (cmnd, "EXIT", 4) == 0) {
-        go_on = False;
-	continue;
-      }else if (strncmp (cmnd, "QUIT", 4) == 0) {
-        go_on = False;
-	continue;
-      }else if (strncmp (cmnd, "NO_RESTORE", 10) == 0) {
-        no_restore = True;
-	printf ("The restore operation has been suppressed via "
-		    "the \"NO_RESTORE\" command.\n");
-      }else if (strncmp (cmnd, "RESTORE", 7) == 0) {
-        no_restore = False;
-	printf ("The restore operation has been requested via "
-		    "the \"RESTORE\" command.\n");
-      }else if (strncmp (cmnd, "WAIT", 4) == 0) {
-	status = My_WaitIdle (&Hndl, Verbose,
-			&ored_msr, &fp_cntr, &fr_cntr, &Ist_pos);
-	if (!status) {
-	  go_on = no_errors = False;
-	  if (Ctrl_C_has_happened) DoStop ();
-	  continue;
-	}else {
-	  if ((ored_msr & ~(MSR__BUSY | MSR__OK)) != 0) {
-	    printf ("! %s\n", EL734_EncodeMSR (buff, sizeof (buff),
-				    0, ored_msr, fp_cntr, fr_cntr));
-	  }
-	}
-      }else {
-	len = strlen (cmnd);
-	if (len == 2 && cmnd[0] == '\\' && cmnd[1] == 'R') len = 0;
-	if (len == 2 && cmnd[0] == '\\' && cmnd[1] == '0') {
-	  cmnd[0] = NIL;	/* Null command */
-	}else {
-	  cmnd[len] = '\r';	/* Terminate command with a <Return> */
-	  cmnd[len+1] = NIL;
-	}
-	status = EL734_SendCmnd (&Hndl, cmnd, buff, sizeof (buff));
-	if (!status) {
-	  go_on = no_errors = False;
-	  continue;
-	}else {
-	  if (buff[0] == NIL) {
-	    len = sizeof (cmnd);
-	    if ((strncmp (cmnd, "U ",  2) == 0) ||
-		(strncmp (cmnd, "UU ", 3) == 0) ||
-		(strncmp (cmnd, "P ",  2) == 0) ||
-		(strncmp (cmnd, "PD ", 3) == 0) ||
-		(strncmp (cmnd, "PR ", 3) == 0) ||
-		(strncmp (cmnd, "R ",  2) == 0) ||
-		(strncmp (cmnd, "FF ", 3) == 0) ||
-		(strncmp (cmnd, "FB ", 3) == 0) ||
-		(strncmp (cmnd, "SF ", 3) == 0) ||
-		(strncmp (cmnd, "SB ", 3) == 0)) {
-	      no_restore = True;
-	    }else if ((strncmp (cmnd, "A ",  2) == 0) ||
-		      (strncmp (cmnd, "E ",  2) == 0) ||
-		      (strncmp (cmnd, "EP ", 3) == 0) ||
-		      (strncmp (cmnd, "F ",  2) == 0) ||
-		      (strncmp (cmnd, "G ",  2) == 0) ||
-		      (strncmp (cmnd, "J ",  2) == 0) ||
-		      (strncmp (cmnd, "K ",  2) == 0) ||
-		      (strncmp (cmnd, "L ",  2) == 0) ||
-		      (strncmp (cmnd, "M ",  2) == 0) ||
-		      (strncmp (cmnd, "T ",  2) == 0) ||
-		      (strncmp (cmnd, "V ",  2) == 0) ||
-		      (strncmp (cmnd, "W ",  2) == 0) ||
-		      (strncmp (cmnd, "Z ",  2) == 0)) {
-	      LoadCheckOneInteger (cmnd);
-	      if (strncmp (cmnd, "A ",  2) == 0) {
-		status = EL734_GetPrecision (&Hndl, &i);
-		if (status) Dec_pt = i;
-	      }
-	    }else if ((strncmp (cmnd, "EC ", 3) == 0) ||
-		      (strncmp (cmnd, "FD ", 3) == 0) ||
-		      (strncmp (cmnd, "FM ", 3) == 0)) {
-	      LoadCheckTwoInteger (cmnd);
-	    }else if ((strncmp (cmnd, "D ",  2) == 0)) {
-	      LoadCheckOneFloat (cmnd, 1);   /* D cmnd only has 1 Dec Place */
-	    }else if ((strncmp (cmnd, "Q ",  2) == 0)) {
-	      LoadCheckOneFloat (cmnd, Dec_pt);
-	    }else if ((strncmp (cmnd, "H ",  2) == 0)) {
-	      LoadCheckTwoFloat (cmnd, Dec_pt);
-	    }
-	  }else {
-	    if (buff[0] == '?') {
-	      printf ("%s\n", buff);
-	      if (lun != stdin) {		/* If input from file .. */
-		go_on = no_errors = False;	/* .. quit */
-		continue;
-	      }
-	    }else {
-	      if (strncmp (cmnd, "MSR ", 4) == 0) {
-		sscanf (buff, "%x", &ored_msr);
-		printf ("%s ! %s\n", buff,
-				EL734_EncodeMSR (buff, sizeof (buff),
-				    ored_msr, ored_msr, 0, 0));
-	      }else if (strncmp (cmnd, "SS ", 3) == 0) {
-		sscanf (buff, "%x", &ss);
-		printf ("%s ! %s\n", buff,
-				EL734_EncodeSS (buff, sizeof (buff), ss));
-	      }else {
-		printf ("%s\n", buff);
-	      }
-	    }
-	  }
-	}
-      }
-      if (lun == stdin) {printf ("> "); fflush (NULL);}
-    }
-		/*
-		** Restore the current motor position.
-		*/
-    if (no_errors && !no_restore) {
-      EL734_GetPrecision (&Hndl, &Dec_pt);
-      printf ("Restoring %.*f as current motor position ...\n",
-		    Dec_pt, Ist_pos);
-      sprintf (cmnd, "uu %d %.*f\r", Motor, Dec_pt, Ist_pos);
-      status = EL734_SendCmnd (&Hndl, cmnd, buff, sizeof(buff));
-      if (status) {
-	if (buff[0] != NIL) {
-	  no_errors = False;
-	}
-      }else {
-	no_errors = False;
-      }
-    }
-    if (lun != stdin) fclose (lun);
-    if (no_errors) {
-      printf ("\"load\" completed.\n");
-      EL734_GetStatus (&Hndl,
-		&msr, &ored_msr, &fp_cntr, &fr_cntr, &ss, &Ist_pos);
-      printf ("The motor position is %.*f\n", Dec_pt, Ist_pos);
-    }else {
-      printf ("\007Failed to load motor parameters.\n");
-    }
-    return no_errors;
-  }
-/*
-**---------------------------------------------------------------------------
-**			DoWait - wait (if necessary)
-*/
-  void	DoWait (
-/*	======
-*/		int	print_flag) {
-
-    int		my_wait, irand;
-    float	my_rand;
-
-    if (Wait_time == 0) return;
-
-    if (Wait_time > 0) {
-      if (print_flag) printf (" waiting %d secs ...", Wait_time);
-      sleep (Wait_time);
-      if (print_flag) printf ("\n");
-      return;
-    }
-
-    my_wait = -Wait_time;
-
-    irand = rand () & 0x7FFF;
-    my_rand = ((float) irand)/32768.0;
-
-    my_rand = my_rand * ((float) (my_wait));
-    irand = (int) (my_rand + 1);
-    if (print_flag) printf (" waiting %d secs ...", irand);
-    sleep (irand);
-    if (print_flag) printf ("\n");
-  }
-/*
-**--------------------------------------------------------------------------
-**		PrintUsage: Auxilliary routine for ShowUsage and ShowItemUsage
-*/
-  int	PrintUsage (char **txt, int n_recd) {
-/*	==========
-*/
-    int	    i = 0;
-    int	    ans;
-
-    printf ("\n");
-    while (i < n_recd) {
-      printf ("%s\n", txt[i]);
-      i++;
-      if ((i % 24 == 0) && isatty (STDOUT)) {
-	printf ("More? ");
-	ans = getchar ();
-	if ((ans == EOF) || (toupper (ans) == 'Q')) return False;
-      }
-    }
-    printf ("\n");
-  }
-/*
-**--------------------------------------------------------------------------
-**		ShowUsage:  A simple help routine.
-*/
-  void	ShowUsage (int level) {
-/*      =========
-*/
-    char    *short_help_txt[] = {
-"\007To get help on running the program issue the command:",
-"",
-"       el734_test -help"};
-
-    char    *help_txt[] = {
-" Usage:  el734_test [options ...]",
-"",
-" Valid options are:",
-"    -help                     Generates this help text.",
-"    -?         <option>       Get detailed help on <option>.",
-"    -?cmd                     Gives list of EL734 commands.",
-"    -?msg                     Gives list of EL734 messages.",
-"    -?par                     Gives list of EL734 parameters.",
-"    -?res                     Get list of Xlib resources.",
-"    -chan      <channel>      Specify channel number of EL734.",
-"    -f         <freq>         Abbreviation for \"-frequency\".",
-"    -fb                       Fast backward to low  software limit.",
-"    -ff                       Fast forward  to high software limit.",
-"    -frequency <freq>         Frequency for -fb, -ff, -sb or -sf operation.",
-"    -hi        <high-limit>   Abbreviation for \"-high\".",
-"    -high      <high-limit>   Specify high limit for -saw, -scan and -rndm.",
-"    -host      <host-name>    Specify name of TCP/IP server.",
-"    -hunt                     Hunt for reference point then do \"-ref\".",
-"    -id        <device-id>    Specify expected EL734 identifier.",
-"    -limits    <lo>/<hi>      Set the Lo/Hi software limits.",
-"    -lo        <low-limit>    Abbreviation for \"-low\".",
-"    -load      <file>         Read file and set motor params.",
-"    -low       <low-limit>    Specify low limit for -saw, -scan and -rndm.",
-"    -m         <index>        Abbreviation for \"-motor\".",
-"    -motor     <index>        Specify motor number (1 .. 12)",
-"    -n         <n-moves>      Specify number of moves to make.",
-"    -p         <target>       Abbreviation for \"-position\".",
-"    -port      <port-number>  Specify port number of TCP/IP server.",
-"    -position  <target>       Position the motor.",
-"    -random                   Perform <n-moves> random moves.",
-"    -ref                      Perform reference seek.",
-"    -rndm                     Abbreviation for \"-random\".",
-"    -s                        Abbreviation for \"-stop\".",
-"    -save      <file>         Read motor parameters and save to file.",
-"    -saw                      Perform <n-moves> moves between <low-limit>",
-"                              and <high-limit>.",
-"    -sb                       Slow backward to low software limit.",
-"    -scan                     Perform <n-moves> equal moves from <low-limit>",
-"                              to <high-limit>.",
-"    -seed      <seed-value>   Specify random number seed.",
-"    -sf                       Slow forward to high software limit.",
-"    -step      <step-size>    Perform an incremental move.",
-"    -stop                     Stop the motor moving.",
-"    -tmo       <secs>         Specify time-out to wait for response.",
-"    -ur@       <pos>          Set the current position to be <pos>.",
-"    -verbose   <wid>          Specify \"verbosity\". Dflt = 10.",
-"    -wait      <secs>         Specify wait time between moves.",
-"",
-" No default is allowed for -host, -chan or -motor, i.e. values for",
-" these parameters must be supplied either via a resource file or on the",
-" command line. If <file> is specified as \"-\" or \"=\", standard input or",
-" output will be used rather than a file.",
-"",
-" When the program starts, the EL734 identifier will be used to ensure that",
-" an EL734 is being addressed. The identifier string must start with the",
-" characters \"STPMC EL734\" or \"DCMC EL734\". Specifying \"ignore\" for",
-" <device-id> will suppress the ID check.",
-"",
-" The positioning options, i.e. -position, -step, -ref, -hunt, -random, -saw,",
-" -scan, -ff, -fb, -sf and -sb are mutually exclusive. If neither a positioning",
-" option nor a -save, -load, -stop, -ur@ nor -limits option has been specified,",
-" \"-save -\" will be assumed.",
-"",
-" Regardless of the order of options on the command line, -load will be done",
-" before any positioning commands and -save will be done last.",
-"",
-" A motor movement can be interrupted by hitting <Ctrl-C>."};
-
-    if (level == 0) {	    /* Level 0 is called after an error is detected */
-      if (Do_help) return;
-      PrintUsage (short_help_txt, N_ELEMENTS (short_help_txt));
-    }else {
-      PrintUsage (help_txt, N_ELEMENTS (help_txt));
-    }
-    return;
-  }
-/*
-**--------------------------------------------------------------------------
-**		ShowItemUsage:  give more detailed help.
-*/
-  void	ShowItemUsage (char *item) {
-/*      =============
-*/
-    char    my_item[40];
-    char    *cmd_txt[] = {
-"The EL734 recognises the following commands:",
-" AM        - read active motor status (hex integer)",
-" U         - read current position of all motors",
-" U   m [r] - read or set current position (note: \"U m r\" also",
-"              modifies the limit parameters)",
-" UD  m     - read current position as hex integer",
-" UU  m [r] - read or set current position (note: \"UU m r\" does",
-"              not modify the limit parameters)",
-" P   m r   - drive motor to new target position",
-" P   m     - read target position",
-" PD  m [h] - read or set current position as hex integer",
-" PR  m i   - drive motor \"i\" steps",
-" N   m     - free motor from limit switch",
-" S   [m]   - stop specified motor or all motors",
-" R   m     - reference search and set current position to",
-"              reference point if successful",
-" RF  m     - reference search but do not set current",
-"              position to reference point",
-" FF  m [i] - fast forward  to high limit with ramp. Frequency = <i>",
-" FB  m [i] - fast backward to low  limit with ramp. Frequency = <i>",
-" SF  m [i] - slow forward  to high limit without ramp. Frequency = <i>",
-" SB  m [i] - slow backward to low  limit without ramp. Frequency = <i>",
-" AC  m [i] - read or change air-cushion status (0/1 = down/up)",
-" SO  m [i] - read or change status of output signal",
-" RI  [m]   - read or change status of input signal",
-" MSR m     - read and clear motor status register",
-" SS  m     - read status flag register",
-" DE  m     - set all parameters of motor to default",
-" ECHO [i]  - read or set echo mode (0/1/2 = off/on/off-with-*-messages)",
-" RMT [i]   - read or set controller manual status (0/1 = manual/remote)",
-" %         - stop all motors and reset all parameters of all motors",
-"              to default",
-" ?         - provide help information",
-" ?C        - provide list of commands",
-" ?P        - provide list of parameters",
-" ?M        - provide list of messages"};
-
-    char    *msg_txt[] = {
-"The following messages may be generated by the EL734:",
-"",
-" ?ADR   Address error",
-" ?BSY   Motor busy",
-" ?CMD   Command error",
-" ?LOC   Local mode",
-" ?PAR   Parameter error",
-" ?RNG   Range error",
-"",
-" *ACE   0x1000  Aircushion error",
-" *FP    0x0200  Position fault",
-" *FR    0x0080  Run fault",
-" *MB    0x0001  Motor busy",
-" *MF    0x0400  Position failure",
-" *MH    0x0040  Stop on HALT",
-" *ML    0x0010  Stop on low limit switch",
-" *MP    0x0002  Position ready",
-" *MR    0x0100  Run failure",
-" *MS    0x0008  Stop on STOP switch or command",
-" *MU    0x0020  Stop on upper limit switch",
-" *NF    0x2000  Failed to free end stop",
-" *RF    0x0800  Reference failure",
-" *RP    0x0004  Reference position ready",
-"",
-" The \"*\" messages are interrupts. The equivalent bits in the",
-" MSR register is indicated by the hex values shown.",
-""};
-    char    *par_txt[] = {
-"",
-"The EL734 has the following parameters:",
-" A   m [i]     - # digits after decimal point",
-" FD  m [i1 i2] - encoder gearing ratio (numer/denom)",
-" FM  m [i1 i2] - motor   gearing ratio (numer/denom)",
-" D   m [r]     - inertia tolerance",
-" E   m [i]     - start/stop ramp (kHz/sec)",
-" EC  m [i1 i2] - encoder mapping (type/number) (step motors)",
-" EP  m [i]     - encoder magic parameter (step motors)",
-" F   m [i]     - open loop/closed loop (0/1)",
-" G   m [i]     - start/stop frequency (motor-steps/sec) (step motors)",
-" H   m [r1 r2] - low/high software limits",
-" ID            - controller identifier",
-" J   m [i]     - top speed (motor-steps/sec)",
-" K   m [i]     - reference mode (step motors)",
-" KP  m [i]     - proportional PID parameter (DC motors)",
-" KI  m [i]     - integral     PID parameter (DC motors)",
-" KD  m [i]     - derivative   PID parameter (DC motors)",
-" L   m [i]     - backlash/spielausgleich (motor-steps) (step motors)",
-" M   m [i]     - position tolerance (encoder-steps)",
-" MEM m [txt]   - 15 character memory register",
-" MN  m [txt]   - 15 character motor name",
-" Q   m [r]     - reference switch width (step motors)",
-" T   m [i]     - one-sided operation flag (0 = no) (step motors)",
-" V   m [i]     - null point",
-" W   m [i]     - air-cushion dependency (step motors)",
-" Z   m [i]     - circumf. of encoder (encoder-Steps) (step motors)",
-" SP  m [i]     - # of positionings",
-" ST  m [i]     - # of positioning faults",
-" SR  m [i]     - # of positioning failures",
-" SA  m [i]     - # of air-cushion failures",
-" SN  [CLR]     - # of parameter resets",
-" SW  [CLR]     - # of watchdog  resets"};
-
-    char    *res_txt[] = {
-"The correspondence between options and resource names is as follows:",
-"",
-"    Option            Equivalent resource name",
-"    ======            ========================",
-"    -?                  *el734HelpItem",
-"    -?cmd               *el734HelpCmd",
-"    -?msg               *el734HelpMsg",
-"    -?par               *el734HelpPar",
-"    -?res               *el734HelpRes",
-"    -chan               *el734Chan",
-"    -f                  *el734Frequency",
-"    -fb                 *el734Fb",
-"    -ff                 *el734Ff",
-"    -frequency          *el734Frequency",
-"    -help               *el734Help",
-"    -hi                 *el734High",
-"    -high               *el734High",
-"    -host               *el734Host",
-"    -hunt               *el734Hunt",
-"    -id                 *el734Id",
-"    -limits             *el734Limits",
-"    -lo                 *el734Low",
-"    -load               *el734Load",
-"    -low                *el734Low",
-"    -m                  *el734Motor",
-"    -motor              *el734Motor",
-"    -n                  *el734N",
-"    -p                  *el734Position",
-"    -port               *el734Port",
-"    -position           *el734Position",
-"    -random             *el734Random",
-"    -ref                *el734Ref",
-"    -rndm               *el734Random",
-"    -s                  *el734Stop",
-"    -save               *el734Save",
-"    -saw                *el734Saw",
-"    -sb                 *el734Sb",
-"    -scan               *el734Scan",
-"    -seed               *el734Seed",
-"    -sf                 *el734Sf",
-"    -step               *el734Step",
-"    -stop               *el734Stop",
-"    -tmo                *el734Tmo",
-"    -ur@                *el734SetPos",
-"    -verbose            *el734Verbose",
-"    -wait               *el734Wait"};
-
-    char    *chan_txt[] = {
-"Usage of \"-chan <chan>\"",
-"   <chan> specifies the RS-232-C channel to which the EL734 is",
-"          attached on the server. It is usually a small integer.",
-"          There is no default."};
-
-    char    *f_txt[] = {
-"Usage of \"-f <freq>\"",
-"   <freq> specifies the frequency to be used in an -fb, -ff, -sb or -sf",
-"          command. The default is to use the J register value for the -fb",
-"          and -ff commands and the G register value for the -sb and -sf",
-"          commands."};
-
-    char    *fb_txt[] = {
-"Usage of \"-fb\"   (Fast Backward)",
-"   An FB command is issued to the motor. The motor moves with ramp to the",
-"   lower software limit. The top speed is either <freq> or, if no -frequency",
-"   option has been specified, the value of the J register."};
-
-    char    *ff_txt[] = {
-"Usage of \"-ff\"   (Fast Forward)",
-"   An FF command is issued to the motor. The motor moves with ramp to the",
-"   upper software limit. The top speed is either <freq> or, if no -frequency",
-"   option has been specified, the value of the J register."};
-
-    char    *frequency_txt[] = {
-"Usage of \"-frequency <freq>\"",
-"   <freq> specifies the frequency to be used in an -fb, -ff, -sb or -sf",
-"          command. The default is to use the J register value for the -fb",
-"          and -ff commands and the G register value for the -sb and -sf",
-"          commands."};
-
-    char    *hi_txt[] = {
-"Usage of \"-hi <high-limit>\"",
-"   <high-limit> specifies the upper limit to be used in -saw, -scan and -rndm",
-"                operations. It defaults to the upper software limit of the",
-"                motor (H register value)."};
-
-    char    *high_txt[] = {
-"   <high-limit> specifies the upper limit to be used in -saw, -scan and -rndm",
-"                operations. It defaults to the upper software limit of the",
-"                motor (H register value)."};
-
-    char    *host_txt[] = {
-"Usage of \"-host <host-name>\"",
-"   <host-name> specifies the name of the RS-232-C server computer to which the",
-"               EL734 is connected. There is no default."};
-
-    char    *hunt_txt[] = {
-"Usage of \"-hunt\"",
-"   The program will hunt for the the motor's reference point and then carry",
-"   out a reference positioning operation. The method used for the search",
-"   depends on the value of the K register."};
-
-    char    *id_txt[] = {
-"Usage of \"-id <device-id>\"",
-"   <device-id> specifies the expected response from the EL734 to the \"ID\"",
-"               command. When this program first starts, it issues an ID",
-"               command to check that it is connected to an EL734. By default,",
-"               the response is expected to start with \"STPMC EL734\" or",
-"               \"DCMC EL734\". By specifying <device-id> to be \"ignore\",",
-"               the identifier check is suppressed."};
-
-    char    *limits_txt[] = {
-"Usage of \"-limits <lo>/<hi>\"",
-"   <lo>/<hi> specify the lower and upper software limits (H register values)",
-"             for the motor. These values are set in the EL734 controller."};
-
-    char    *lo_txt[] = {
-"Usage of \"-lo <low-limit>\"",
-"   <low-limit> specifies the lower limit to be used in -saw, -scan and -rndm",
-"               operations. It defaults to the lower software limit of the",
-"               motor (H register value)."};
-
-    char    *load_txt[] = {
-"Usage of \"-load <file>\"",
-"   The file <file> is read record by record. Any \"%d\" token in a record",
-"   is replaced with the motor index and sent as a command to the EL734.",
-"   This is the opposite of the \"-save\" option. It is used for setting",
-"   a motor's parameters to the values saved in the \"-save\" file.",
-"",
-"   If <file> is specified as \"-\" or \"=\", commands are read from 'standard",
-"   input'. In this case, the \"-load\" option can be used interactively."};
-
-    char    *low_txt[] = {
-"Usage of \"-low <low-limit>\"",
-"   <low-limit> specifies the lower limit to be used in -saw, -scan and -rndm",
-"               operations. It defaults to the lower software limit of the",
-"               motor (H register value)."};
-
-    char    *m_txt[] = {
-"Usage of \"-m <index>\"",
-"   <index> is the number of the motor to be used. It is an integer in the",
-"           range 1 to 12. There is no default."};
-
-    char    *motor_txt[] = {
-"Usage of \"-motor <index>\"",
-"   <index> is the number of the motor to be used. It is an integer in the",
-"           range 1 to 12. There is no default."};
-
-    char    *n_txt[] = {
-"Usage of \"-n <n-moves>\"",
-"   <n-moves> specifies the number of times the motor should be moved in",
-"             a -saw, -scan or -random option. The default is 5."};
-
-    char    *p_txt[] = {
-"Usage of \"-p <target>\"",
-"   The motor will move to the location specified by <target>. The program",
-"   will wait until the motor becomes idle. If the -verbose parameter is non-",
-"   zero, the changing motor position will be reported on the screen."};
-
-    char    *port_txt[] = {
-"Usage of \"-port <port-number>\"",
-"   <port-number> specifies the TCP/IP port number of the RS-232-C server",
-"                 when listening for connections. The default is 4000."};
-
-    char    *position_txt[] = {
-"Usage of \"-position <target>\"",
-"   The motor will move to the location specified by <target>. The program",
-"   will wait until the motor becomes idle. If the -verbose parameter is non-",
-"   zero, the changing motor position will be reported on the screen."};
-
-    char    *random_txt[] = {
-"Usage of \"-random\"",
-"   The motor will be positioned <n-moves> times to random target positions",
-"   in the range <low-limit> to <high-limit>. After each move, the program waits",
-"   for a time specified by the -wait option before starting the next move."};
-
-    char    *ref_txt[] = {
-"Usage of \"-ref\"",
-"   A reference positioning operation is started via the RF command. If",
-"   successful, the displacement between the motor position and the zero",
-"   position is displayed. This represents a shift in the motor position",
-"   since the last time a -ref option was performed. The position of the motor",
-"   is then set to the zero position. Finally, if the zero position is outside",
-"   the software limits, the motor is driven to the nearest software limit."};
-
-    char    *rndm_txt[] = {
-"Usage of \"-rndm\"",
-"   The motor will be positioned <n-moves> times to random target positions",
-"   in the range <low-limit> to <high-limit>. After each move, the program waits",
-"   for a time specified by the -wait option before starting the next move."};
-
-    char    *s_txt[] = {
-"Usage of \"-s\"",
-"   A \"Stop\" command is issued to the motor."};
-
-    char    *save_txt[] = {
-"Usage of \"-save <file>\"",
-"   The motor's parameters will be read and saved in file <file>. If <file>",
-"   is specified as \"-\" or \"=\", the list of parameters will be written",
-"   to 'standard output'."};
-
-    char    *saw_txt[] = {
-"Usage of \"-saw\"",
-"   The motor will be positioned <n-moves> times alternately to <low-limit>",
-"   and <high-limit>. After each move, the program waits for a time specified",
-"   by the -wait option before starting the next move."};
-
-    char    *sb_txt[] = {
-"Usage of \"-sb\"   (Slow Backward)",
-"   An SB command is issued to the motor. The motor moves without ramp to the",
-"   lower software limit. The speed is either <freq> or, if no -frequency",
-"   option has been specified, the value of the G register."};
-
-    char    *scan_txt[] = {
-"Usage of \"-scan\"",
-"   The motor will be scanned from <low-limit> to <high-limit> in <n-moves>",
-"   steps. After each move, the program waits for a time specified by the",
-"   -wait option before starting the next move."};
-
-    char    *seed_txt[] = {
-"Usage of \"-seed <seed-value>\"",
-"   <seed-value> specifies a seed for the random number generator. By default,",
-"                the seen is generated from the time-of-day clock."};
-
-    char    *sf_txt[] = {
-"Usage of \"-sf\"   (Slow Forward)",
-"   An SF command is issued to the motor. The motor moves without ramp to the",
-"   upper software limit. The speed is either <freq> or, if no -frequency",
-"   option has been specified, the value of the G register."};
-
-    char    *step_txt[] = {
-"Usage of \"-step <step-size>\"",
-"   The motor will be moved a distance of <step-size> from its current position."};
-
-    char    *stop_txt[] = {
-"Usage of \"-stop\"",
-"   A \"Stop\" command is issued to the motor."};
-
-    char    *tmo_txt[] = {
-"Usage of \"-tmo <secs>\"",
-"   <secs> specifies the time-out in seconds to be used in waiting for responses",
-"          from the EL734. The default is normally 1 second unless a -ref or",
-"          -hunt option has been specified, in which case it is 30 secs."};
-
-    char    *u_r_at_txt[] = {
-"Usage of \"-ur@ <pos>\"",
-"   \"ur@\" should be read as \"You are at\". The current position of the",
-"   motor will be forced to be <pos> via a UU command."};
-
-    char    *verbose_txt[] = {
-"Usage of \"-verbose <wid>\"",
-"   Whenever the motor is being moved, an updating display of the actual motor",
-"   position can be generated on the display in a field of width <wid>. The",
-"   default is 10. If <wid> is specified to be 0, the updating display is",
-"   suppressed."};
-
-    char    *wait_txt[] = {
-"Usage of \"-wait <secs>\"",
-"   <secs> specifies a wait time in seconds between moves for the -rndm, -scan",
-"          and -saw options. If <secs> is zero, no wait is performed. If",
-"          <secs> is negative, a random wait between 1 and -<secs> seconds",
-"          is performed."};
-
-
-    if (item[0] != '-') {
-      StrJoin (my_item, sizeof (my_item), "-", item);
-    }else {
-      StrJoin (my_item, sizeof (my_item), item, "");
-    }
-    if (strcmp (my_item, "-?cmd") == 0) {
-      PrintUsage (cmd_txt, N_ELEMENTS (cmd_txt));
-    }else if (strcmp (my_item, "-?msg") == 0) {
-      PrintUsage (msg_txt, N_ELEMENTS (msg_txt));
-    }else if (strcmp (my_item, "-?par") == 0) {
-      PrintUsage (par_txt, N_ELEMENTS (par_txt));
-    }else if (strcmp (my_item, "-?res") == 0) {
-      PrintUsage (res_txt, N_ELEMENTS (res_txt));
-    }else if (strcmp (my_item, "-chan") == 0) {
-      PrintUsage (chan_txt, N_ELEMENTS (chan_txt));
-    }else if (strcmp (my_item, "-f") == 0) {
-      PrintUsage (f_txt, N_ELEMENTS (f_txt));
-    }else if (strcmp (my_item, "-fb") == 0) {
-      PrintUsage (fb_txt, N_ELEMENTS (fb_txt));
-    }else if (strcmp (my_item, "-ff") == 0) {
-      PrintUsage (ff_txt, N_ELEMENTS (ff_txt));
-    }else if (strcmp (my_item, "-frequency") == 0) {
-      PrintUsage (frequency_txt, N_ELEMENTS (frequency_txt));
-    }else if (strcmp (my_item, "-hi") == 0) {
-      PrintUsage (hi_txt, N_ELEMENTS (hi_txt));
-    }else if (strcmp (my_item, "-high") == 0) {
-      PrintUsage (high_txt, N_ELEMENTS (high_txt));
-    }else if (strcmp (my_item, "-host") == 0) {
-      PrintUsage (host_txt, N_ELEMENTS (host_txt));
-    }else if (strcmp (my_item, "-hunt") == 0) {
-      PrintUsage (hunt_txt, N_ELEMENTS (hunt_txt));
-    }else if (strcmp (my_item, "-id") == 0) {
-      PrintUsage (id_txt, N_ELEMENTS (id_txt));
-    }else if (strcmp (my_item, "-limits") == 0) {
-      PrintUsage (limits_txt, N_ELEMENTS (limits_txt));
-    }else if (strcmp (my_item, "-lo") == 0) {
-      PrintUsage (lo_txt, N_ELEMENTS (lo_txt));
-    }else if (strcmp (my_item, "-load") == 0) {
-      PrintUsage (load_txt, N_ELEMENTS (load_txt));
-    }else if (strcmp (my_item, "-low") == 0) {
-      PrintUsage (low_txt, N_ELEMENTS (low_txt));
-    }else if (strcmp (my_item, "-m") == 0) {
-      PrintUsage (m_txt, N_ELEMENTS (m_txt));
-    }else if (strcmp (my_item, "-motor") == 0) {
-      PrintUsage (motor_txt, N_ELEMENTS (motor_txt));
-    }else if (strcmp (my_item, "-n") == 0) {
-      PrintUsage (n_txt, N_ELEMENTS (n_txt));
-    }else if (strcmp (my_item, "-port") == 0) {
-      PrintUsage (port_txt, N_ELEMENTS (port_txt));
-    }else if (strcmp (my_item, "-p") == 0) {
-      PrintUsage (p_txt, N_ELEMENTS (p_txt));
-    }else if (strcmp (my_item, "-position") == 0) {
-      PrintUsage (position_txt, N_ELEMENTS (position_txt));
-    }else if (strcmp (my_item, "-random") == 0) {
-      PrintUsage (random_txt, N_ELEMENTS (random_txt));
-    }else if (strcmp (my_item, "-rndm") == 0) {
-      PrintUsage (rndm_txt, N_ELEMENTS (rndm_txt));
-    }else if (strcmp (my_item, "-ref") == 0) {
-      PrintUsage (ref_txt, N_ELEMENTS (ref_txt));
-    }else if (strcmp (my_item, "-save") == 0) {
-      PrintUsage (save_txt, N_ELEMENTS (save_txt));
-    }else if (strcmp (my_item, "-saw") == 0) {
-      PrintUsage (saw_txt, N_ELEMENTS (saw_txt));
-    }else if (strcmp (my_item, "-s") == 0) {
-      PrintUsage (s_txt, N_ELEMENTS (s_txt));
-    }else if (strcmp (my_item, "-sb") == 0) {
-      PrintUsage (sb_txt, N_ELEMENTS (sb_txt));
-    }else if (strcmp (my_item, "-scan") == 0) {
-      PrintUsage (scan_txt, N_ELEMENTS (scan_txt));
-    }else if (strcmp (my_item, "-seed") == 0) {
-      PrintUsage (seed_txt, N_ELEMENTS (seed_txt));
-    }else if (strcmp (my_item, "-sf") == 0) {
-      PrintUsage (sf_txt, N_ELEMENTS (sf_txt));
-    }else if (strcmp (my_item, "-step") == 0) {
-      PrintUsage (step_txt, N_ELEMENTS (step_txt));
-    }else if (strcmp (my_item, "-stop") == 0) {
-      PrintUsage (stop_txt, N_ELEMENTS (stop_txt));
-    }else if (strcmp (my_item, "-tmo") == 0) {
-      PrintUsage (tmo_txt, N_ELEMENTS (tmo_txt));
-    }else if (strcmp (my_item, "-ur@") == 0) {
-      PrintUsage (u_r_at_txt, N_ELEMENTS (u_r_at_txt));
-    }else if (strcmp (my_item, "-verbose") == 0) {
-      PrintUsage (verbose_txt, N_ELEMENTS (verbose_txt));
-    }else if (strcmp (my_item, "-wait") == 0) {
-      PrintUsage (wait_txt, N_ELEMENTS (wait_txt));
-    }else {
-      printf ("\n"
-	"Usage of \"%s\":\n"
-	" \n"
-	"   Sorry, this is either an invalid help item or it still\n"
-	"   needs to be programmed!\n\n", my_item);
-    }
-    return;
-  }
-/*
-**---------------------------------------------------------------------------
-**			SetupXrmDatabase    - setup Resource Manager Database
-*/
-  int	SetupXrmDatabase (
-/*	================
-*/			XrmDatabase	*db,
-			char		*name[],
-			int		*argc,
-			char		*argv[]) {
-
-    static char	our_name[80]  = "Unknown";  /* This holds the program name */
-    static char lkup_name[80] = "Unknown";  /* Name for looking in database */
-
-    int		status, i, first = True;
-    char	text[80];
-    char	full_nm0[80];
-    char	full_nm1[80];
-    char	*p_fil[] = {0,0,0,0,0,0,0,0,0,0};
-    char	*my_name;
-    char	*my_name_last;
-
-    char	*name_type;
-    XrmValue	name_value;
-
-    XrmDatabase cmnd_line_db = NULL;
-    XrmDatabase	lcl_db	     = NULL;
-  /*-----------------------------------------------------
-  ** This routine merges some resource databases with options specified on
-  ** the command line. Resources can then be looked up using XrmGetResource.
-  ** This is a bit like the X-toolkit routine XtAppInitialize does for the
-  ** extraction of resources by XtGetApplicationResources.
-  ** 
-  ** I can't help but think that there's a simpler way of doing this but I
-  ** can't find it in the X manuals. Basically, the problem arises with wanting
-  ** to avoid the calling program being associated with an X-display, i.e. it
-  ** is intended for use by "command-line oriented" programs. All the nice,
-  ** easy-to-use resource/command-line setup routines in Xlib or Xtlib seem to
-  ** assume one is going to use a display -- not surprising, I suppose,
-  ** since the concept of Xlib is for writing window based applications!
-  **
-  ** Anyway, the point is that the following way turns out to be lacking
-  ** when it gets tested in anger.
-  */
-    status = True;		/* Assume success	*/
-
-    our_name[0] = NIL;
-	/*
-	** Make a list of the databases to be merged, highest priority first.
-	*/
-#ifdef  __VMS
-    p_fil[0] = "decw$user_defaults:SinQ_rc.dat";
-    p_fil[1] = "decw$group_defaults:SinQ_rc.dat";
-    p_fil[2] = "decw$system_defaults:SinQ_rc.dat";
-    p_fil[3] = "decw$user_defaults:decw$xdefaults.dat";
-    p_fil[4] = "decw$group_defaults:decw$xdefaults.dat";
-    p_fil[5] = "decw$system_defaults:decw$xdefaults.dat";
-    p_fil[6] = NULL;
-    if (*argc > 0) {	     /* Find out what we are called - parse file nm */
-      my_name = strstr (argv[0], "]");	/* Find end of directory, i.e. "]" */
-      my_name++;			/* Skip over "]" */
-      if (my_name[0] == '[') {		/* Handle possible concealed device */
-        my_name = strstr (my_name, "]");
-	my_name++;
-      }
-      i = sizeof (our_name);
-      StrEdit (our_name, my_name, "lowercase", &i);	    /* Copy the rest */
-      strtok (our_name, ".");		/* Close it off at "." */
-    }
-#else
-    p_fil[0] = StrJoin (full_nm0, sizeof (full_nm0),
-			    getenv ("HOME"), "/SinQ_rc");
-    p_fil[1] = "/usr/lib/X11/app-defaults/SinQ_rc";
-    p_fil[2] = StrJoin (full_nm1, sizeof (full_nm1),
-			    getenv ("HOME"), "/.Xdefaults");
-    p_fil[3] = "/usr/lib/X11/app-defaults/Xdefaults";
-    p_fil[4] = NULL;
-    if (*argc > 0) {	      /* Find out what we are called - parse file nm  */
-			      /* Find end of directories */
-      my_name = argv[0] - 1;
-      while (my_name != NULL) {
-        my_name_last = my_name;
-	my_name_last++;
-	my_name = strstr (my_name_last, "/");
-      }
-      StrJoin (our_name, sizeof (our_name), my_name_last, "");
-    }
-#endif
-    printf ("My name is \"%s\"\n", our_name);
-	/*
-	**  Initialise and combine all databases
-	*/
-    XrmInitialize ();
-    for (i = 0; i < XtNumber (p_fil); i++) {
-      if (p_fil[i] == NULL) break;
-      status = XrmCombineFileDatabase (p_fil[i], &lcl_db, False);
-      if (status != 0) {
-        if (first) {
-	  printf ("Resource database created from file %s.\n", p_fil[i]);
-	}else {
-	  printf ("File %s merged into resource database.\n", p_fil[i]);
-	}
-	first = False;
-      }
-    }
-	/*----------------------------------------------------------------
-	**  See if there's anything specified on cmnd line, incl "name".
-	*/
-    XrmParseCommand (&cmnd_line_db,
-			OpTable_0, XtNumber(OpTable_0), our_name, argc, argv);
-    if (cmnd_line_db != NULL) {
-	    /*
-	    ** There was at least 1 item on cmnd line. Process the line.
-	    ** If -name was specified, adopt it.
-	    */
-      status = XrmGetResource (cmnd_line_db,  /* See if a name was specified  */
-			    StrJoin (text, sizeof (text), our_name, ".name"),
-			    "ProgramName.Values",
-			    &name_type, &name_value);
-      if (status) {
-	i = sizeof (lkup_name);
-	StrEdit (lkup_name, name_value.addr, "lowercase", &i);
-	printf ("Option list name is \"%s\"\n", lkup_name);
-      }else {
-        strcpy (lkup_name, our_name);
-      }
-	    /*
-	    ** Loop over all items in OpTable_0 and merge them into database,
-	    ** taking care of any possible name changes.
-	    */
-      for (i = 0; i < XtNumber (OpTable_0); i++) {
-	if (strcmp (OpTable_0[i].option, "-name") == 0) continue;
-        status = XrmGetResource (cmnd_line_db,
-				StrJoin (text, sizeof (text),
-				    our_name, OpTable_0[i].specifier),
-				"ProgramName.Values",
-				&name_type, &name_value);
-	if (status) {
-	  StrJoin (text, sizeof (text), lkup_name, OpTable_0[i].specifier);
-	  XrmPutResource (&lcl_db, text, "String", &name_value);
-	}
-      }
-    }
-/*----------------------------------------------------------------
-*/
-    *name = lkup_name;
-    *db = lcl_db;
-    if (lcl_db == NULL) printf ("\007Warning -- no resource database found.\n");
-
-    XrmDestroyDatabase (cmnd_line_db);
-/*
-**    XrmPutFileDatabase (lcl_db, "el734_test.db");
-*/
-    return status;
-  }
-/*
-**---------------------------------------------------------------------------
-**			GetCheckResources - get and check our resources
-*/
-  int	GetCheckResources (
-/*	=================
-*/			    XrmDatabase	*db,
-			    char	*appName) {
-
-    int			status, len;
-    char		buff[80];
-    char		*type;
-    XrmValue		value;
-    time_t		time_now;
-    float		tmp_secs;
-/*----------------------------------------------------------	-help	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Help"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_help = (status) ? True : False;
-    if (Do_help) {
-      ShowUsage (1);
-      exit (EXIT_SUCCESS);
-    }
-/*----------------------------------------------------------	-?	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734HelpItem"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_help = (status) ? True : False;
-    if (Do_help) {
-      len = sizeof (buff);
-      StrEdit (buff, value.addr, "trim lowercase", &len);
-      ShowItemUsage (buff);
-      exit (EXIT_SUCCESS);
-    }
-/*----------------------------------------------------------	-?cmd	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734HelpCmd"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_help = (status) ? True : False;
-    if (Do_help) {
-      strcpy (buff, "-?cmd");
-      ShowItemUsage (buff);
-      exit (EXIT_SUCCESS);
-    }
-/*----------------------------------------------------------	-?msg	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734HelpMsg"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_help = (status) ? True : False;
-    if (Do_help) {
-      strcpy (buff, "-?msg");
-      ShowItemUsage (buff);
-      exit (EXIT_SUCCESS);
-    }
-/*----------------------------------------------------------	-?par	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734HelpPar"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_help = (status) ? True : False;
-    if (Do_help) {
-      strcpy (buff, "-?par");
-      ShowItemUsage (buff);
-      exit (EXIT_SUCCESS);
-    }
-/*----------------------------------------------------------	-?res	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734HelpRes"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_help = (status) ? True : False;
-    if (Do_help) {
-      strcpy (buff, "-?res");
-      ShowItemUsage (buff);
-      exit (EXIT_SUCCESS);
-    }
-/*----------------------------------------------------------	-host	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Host"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      printf ("No server specified via the -host option. "
-			"No default allowed!\n");
-      ShowUsage (0);
-      return False;
-    }else {
-      StrJoin (El734_host, sizeof (El734_host), value.addr, "");
-      printf ("Using Internet host \"%s\".\n", El734_host);
-    }
-/*----------------------------------------------------------	-port	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Port"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%d", &El734_port) != 1)) {
-      El734_port = 4000;
-      printf ("Using the default TCP/IP port number of %d.\n", El734_port);
-    }else {
-      printf ("TCP/IP  port  number = %d\n", El734_port);
-    }
-/*----------------------------------------------------------	-chan	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Chan"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%d", &El734_chan) != 1)) {
-      printf ("No RS-232-C channel specified via the -chan option. "
-			"No default allowed!\n");
-      ShowUsage (0);
-      return False;
-    }else {
-      printf ("RS-232-C channel number = %d\n", El734_chan);
-    }
-/*----------------------------------------------------------	-motor	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Motor"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%d", &Motor) != 1)) {
-      printf ("No motor specified via the -m option. "
-			"No default allowed!\n");
-      ShowUsage (0);
-      return False;
-    }else {
-      printf ("Using Motor Number %d.\n", Motor);
-    }
-/*----------------------------------------------------------	-tmo	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Tmo"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%f", &Tmo) != 1)) {
-      Tmo = 1.0;	/* If no explicit -tmo, use 1 secs by default but .. */
-      Tmo_ref = 30.0;	/*	.. use 30 secs for -ref */
-    }else {
-      Tmo_ref = Tmo;  /* If explicit -tmo, assume user wants it for -ref too */
-    }
-/*----------------------------------------------------------	-verbose  */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Verbose"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%d", &Verbose) != 1))
-	    Verbose = 10;
-/*----------------------------------------------------------	-wait	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Wait"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%f", &tmp_secs) != 1)) tmp_secs = 0.0;
-    Wait_time = (int) tmp_secs;
-/*----------------------------------------------------------	-low	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Low"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%f", &Lo_arg) != 1)) {
-      Lo_arg = Lo;
-      Lo_arg_present = False;
-    }else {
-      Lo_arg_present = True;
-    }
-/*----------------------------------------------------------	-high	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734High"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%f", &Hi_arg) != 1)) {
-      Hi_arg = Hi;
-      Hi_arg_present = False;
-    }else {
-      Hi_arg_present = True;
-    }
-/*----------------------------------------------------------	-seed	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Seed"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%u", &Seed) != 1)) {
-      time_now = time (NULL);	    /* Get a half-ways random number */
-      Seed = (int) time_now;
-      srand (Seed);
-      Seed_present = False;
-    }else {
-      srand (Seed);
-      printf ("Random number seed = %u.\n", Seed);
-      Seed_present = True;
-    }
-/*----------------------------------------------------------	-n	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734N"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (status) {
-      if ((sscanf (value.addr, "%d", &N_moves) != 1) || (N_moves == 0)) {
-	N_moves = 5;
-	printf ("\007Bad \"-n\" parameter: \"%s\"\n"
-		  "It should be a non-zero integer.\n", value.addr);
-	return False;
-      }
-    }else {
-      N_moves = 5;
-    }
-/*----------------------------------------------------------	-frequency */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Frequency"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (status) {
-      if ((sscanf (value.addr, "%d", &Frequency) != 1) || (Frequency <= 0)) {
-	Frequency = -1;
-	printf ("\007Bad \"-frequency\" parameter: \"%s\"\n"
-		  "It should be a positive integer.\n", value.addr);
-	return False;
-      }
-    }else {
-      Frequency = -1;
-    }
-/*----------------------------------------------------------	-limits	*/
-    Do_limits = False;
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Limits"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (status) {
-      if ((sscanf (value.addr, "%f/%f", &Lim_arg_lo, &Lim_arg_hi) == 2) &&
-	  (Lim_arg_lo < Lim_arg_hi)) {
-	Do_limits = True;
-      }else {
-	printf ("\007Bad \"-limits\" parameter: \"%s\"\n"
-		  "It should be specified as \"<lo>/<hi>\".\n", value.addr);
-	ShowUsage (0);
-	return False;
-      }
-    }
-/*----------------------------------------------------------	-ur@	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734SetPos"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_setpos = ((status) && 
-	         (sscanf (value.addr, "%f", &Ist_arg) == 1)) ?
-		    True : False;
-    if (status && !Do_setpos) {
-      printf ("\n"
-	"-ur@ option must be specified as \"<pos>\"\n"
-	"\"%s\" is invalid.\n", value.addr);
-      ShowUsage (0);
-      return False;
-    }
-/*----------------------------------------------------------	-save	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Save"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_save = (status && (sscanf (value.addr, "%79s", Save_file) == 1)) ?
-	True : False;
-/*----------------------------------------------------------	-load	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Load"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_load = (status && (sscanf (value.addr, "%79s", Load_file) == 1)) ?
-	True : False;
-/*----------------------------------------------------------	-id	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Id"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Check_EL734_id = True;
-    if (!status) {
-      strcpy (El734_id0, "STPMC EL734");
-      strcpy (El734_id1, "DCMC EL734");
-    }else {
-      StrJoin (El734_id0, sizeof (El734_id0), value.addr, "");
-      El734_id1[0] = NIL;
-      len = sizeof (El734_id0);
-      StrEdit (El734_id0, El734_id0, "upcase", &len);
-      if (strcmp (El734_id0, "IGNORE") == 0) Check_EL734_id = False;
-    }
-/*----------------------------------------------------------	-stop	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Stop"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_stop = (status) ? True : False;
-/*----------------------------------------------------------	-position   */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Position"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_posit = (status && (sscanf (value.addr, "%f", &Soll_posit) == 1)) ?
-	True : False;
-/*----------------------------------------------------------	-ff	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Ff"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_ff = (status) ? True : False;
-/*----------------------------------------------------------	-fb	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Fb"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_fb = (status) ? True : False;
-/*----------------------------------------------------------	-sf	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Sf"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_sf = (status) ? True : False;
-/*----------------------------------------------------------	-sb	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Sb"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_sb = (status) ? True : False;
-/*----------------------------------------------------------	-random	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Random"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_rndm = (status) ? True : False;
-    if (Do_rndm) {
-      if (!Seed_present) printf ("Using \"randomised\" random number seed.\n");
-    }
-/*----------------------------------------------------------	-saw	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Saw"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_saw = (status) ? True : False;
-/*----------------------------------------------------------	-ref	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Ref"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_ref = (status) ? True : False;
-/*----------------------------------------------------------	-hunt	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Hunt"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_hunt = (status) ? True : False;
-/*----------------------------------------------------------	-scan	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Scan"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_scan = (status) ? True : False;
-/*----------------------------------------------------------	-step	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Step"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_step = (status && (sscanf (value.addr, "%f", &Step) == 1)) ?
-	True : False;
-/*--------------------- Check that no more than 1 position option is present */
-    status = 0;
-    if (Do_stop)  status++;
-    if (Do_posit) status++;
-    if (Do_step)  status++;
-    if (Do_ff)    status++;
-    if (Do_fb)    status++;
-    if (Do_sf)    status++;
-    if (Do_sb)    status++;
-    if (Do_rndm)  status++;
-    if (Do_saw)   status++;
-    if (Do_ref)   status++;
-    if (Do_hunt)  status++;
-    if (Do_scan)  status++;
-    if (status > 1) {
-      printf ("\n"
-	    "The positioning options are mutually exclusive!\n"
-	    "The following cannot be used together:\n");
-      if (Do_stop)  printf ("    -stop\n");
-      if (Do_posit) printf ("    -position\n");
-      if (Do_step)  printf ("    -step\n");
-      if (Do_fb)    printf ("    -fb\n");
-      if (Do_ff)    printf ("    -ff\n");
-      if (Do_hunt)  printf ("    -hunt\n");
-      if (Do_ref)   printf ("    -ref\n");
-      if (Do_rndm)  printf ("    -random\n");
-      if (Do_saw)   printf ("    -saw\n");
-      if (Do_scan)  printf ("    -scan\n");
-      if (Do_sb)    printf ("    -sb\n");
-      if (Do_sf)    printf ("    -sf\n");
-      ShowUsage (0);
-      return False;
-    }
-    if (!(Do_stop | Do_posit | Do_ff  | Do_fb   | Do_sf     | Do_sb	|
-	  Do_rndm | Do_saw   | Do_ref | Do_step | Do_limits | Do_setpos |
-	  Do_load | Do_hunt  | Do_scan) &&
-	!Do_save) {
-      Do_save = True;
-      strcpy (Save_file, "-");
-    }
-    return True;
-  }
-/*
-**--------------------------------------------------------------------------
-**		CtrlC_Handler:  Signal handler to detect <Ctrl-C> on keyboard.
-*/
-  void	CtrlC_Handler (int sigint) {
-/*      =============
-*/
-    Ctrl_C_has_happened = True;
-  }
-/*
-**==========================================================================
-**			Main line program
-**			------------------
-*/
-  int	main (int argc, char **argv) {
-/*      ============================
-*/
-    char	    buff[80], text0[80], text1[80];
-    int		    buff_len;
-    int		    status, errcode, errno, vaxc_errno, i, len, nmoves;
-    char	    *errName;
-    time_t	    time_now;
-    int		    msec_tmo;
-
-    int		    msr, ored_msr, fp_cntr, fr_cntr, ss, irand;
-    float	    ist_posit, posit, my_rand, f_tmp, shift;
-
-    XrmDatabase		my_db;
-    char		*appName;
-/*-----------------------------------------------------------------------*/
-    time_now = time (NULL);
-    printf ("EL734 Motor Controller Test Program 1, Ident %s.\n", ident);
-    printf ("Started at %s", asctime (localtime (&time_now)));
-	/*-------------------------------------------------------------
-	**	Setup the resource database and look up the resources.
-	*/
-    SetupXrmDatabase (&my_db, &appName, &argc, argv);
-    if (argc > 1) {
-      if (argc > 2) {
-	printf ("\nThe following arguments were not used:\n\n     ");
-	for (i = 1; i < argc; i++) {
-	  printf ("\"%s\" ", argv[i]);
-	}
-      }else {
-        printf ("\nArgument \"%s\" was not used.", argv[1]);
-      }
-      printf ("\n");
-      ShowUsage (0);
-      return False;
-    }
-    status = GetCheckResources (&my_db, appName);
-    if (!status) return False;
-		    /*
-		    ** Declare a signal handler to catch <Ctrl-C> so that we
-		    ** can exit cleanly.
-		    */
-    Ctrl_C_has_happened = False;
-    signal (SIGINT, CtrlC_Handler);
-
-    status = EL734_Open (&Hndl,
-		    El734_host, El734_port, El734_chan, Motor, NULL);
-    if (!status) {
-      printf ("Error opening connection to server.\n");
-      PrintErrInfo ("EL734_Open");
-      return False;
-    }
-
-    if (Check_EL734_id) {
-      status = EL734_GetId (&Hndl, buff, sizeof (buff));
-      if (!status) {
-	printf ("Error getting controller ID string.\n");
-	PrintErrInfo ("EL734_GetId");
-	return False;
-      }
-      len = sizeof (buff);
-      StrEdit (buff, buff, "upcase", &len);
-      if ((strncmp (buff, El734_id0, strlen (El734_id0)) != 0) &&
-	  (strncmp (buff, El734_id1, strlen (El734_id1)) != 0)) {
-	printf ("Controller ID mismatch.\n   The controller ID is \"%s\".\n",
-			buff);
-	if (El734_id1[0] == NIL) {
-	  printf ("   It should be \"%s\".\n", El734_id0);
-	}else {
-	  printf ("   It should be either \"%s ...\".\n"
-		  "                    or \"%s ...\".\n", El734_id0, El734_id1);
-	}
-	return False;
-      }
-    }
-
-    if (Do_ref || Do_hunt) {
-      msec_tmo = (int) (Tmo_ref * 1000.0);
-      printf ("Time-out is %.1f secs.\n", Tmo_ref);
-    }else {
-      msec_tmo = (int) (Tmo * 1000.0);
-    }
-    EL734_Config (&Hndl,	    /* Configure the connection */
-	    "msecTmo", msec_tmo,
-	    "eot",     "1\r",
-	    NULL);
-/*---------------------------------------------------
-**		    Ensure -stop has top priority!
-*/
-    if (Do_stop) {
-      status = DoStop ();
-      if (!status) {
-	PrintErrInfo ("DoStop");
-	EL734_Close (&Hndl, False);
-	return False;
-      }
-    }
-/*---------------------------------------------------*/
-    EL734_GetStatus (&Hndl,
-		    &msr, &ored_msr, &fp_cntr, &fr_cntr, &ss, &ist_posit);
-    if (msr == -1) {
-      PrintErrInfo ("EL734_GetStatus");
-      EL734_Close (&Hndl, False);
-      return False;
-    }
-    status = EL734_GetPrecision (&Hndl, &Dec_pt);
-    if (!status) {
-      PrintErrInfo ("EL734_GetPrecision");
-      EL734_Close (&Hndl, False);
-      return False;
-    }else {
-      printf ("%s\n%s\nPosition = %.*f\n",
-		EL734_EncodeMSR (text0, sizeof (text0),
-				    msr, ored_msr, fp_cntr, fr_cntr),
-		EL734_EncodeSS  (text1, sizeof (text1), ss),
-		Dec_pt, ist_posit);
-    }
-/*---------------------------------------------------
-**		    -load has to be done first (well, after -stop)!
-*/
-    if (Do_load) {
-      status = DoLoad ();
-      if (!status) {
-	PrintErrInfo ("DoLoad");
-	EL734_Close (&Hndl, False);
-	return False;
-      }
-    }
-/*---------------------------------------------------
-**		    -limits can be done now!
-*/
-    if (Do_limits) {
-      status = DoLimits (Lim_arg_lo, Lim_arg_hi);
-      if (!status) {
-	PrintErrInfo ("DoLimits");
-	EL734_Close (&Hndl, False);
-	return False;
-      }
-    }
-/*---------------------------------------------------
-**		    -ur@ (you-are-at) can be done now!
-*/
-    if (Do_setpos) {
-      status = DoSetPos (Ist_arg);
-      if (!status) {
-	PrintErrInfo ("DoSetPos");
-	EL734_Close (&Hndl, False);
-	return False;
-      }
-    }
-/*---------------------------------------------------
-**		    -position	move to a given position
-*/
-    if (Do_posit) {
-      printf ("Moving to %.*f ... ", Dec_pt, Soll_posit); fflush (NULL);
-      status = EL734_MoveNoWait (&Hndl, Soll_posit);
-      if (!status) {
-	PrintErrInfo ("EL734_MoveNoWait");
-	return False;
-      }
-      status = My_WaitIdle (&Hndl, Verbose,
-				&ored_msr, &fp_cntr, &fr_cntr, &ist_posit);
-      if (!status) {
-	if (Ctrl_C_has_happened) {
-	  DoStop ();
-	}else {
-	  PrintErrInfo ("My_WaitIdle");
-	}
-	return False;
-      }else {
-	if ((ored_msr & ~(MSR__BUSY | MSR__OK)) != 0) {
-	  printf ("\007??\n    Position = %.*f\n    %s\n", Dec_pt, ist_posit,
-			EL734_EncodeMSR (text0, sizeof (text0),
-			0, ored_msr, fp_cntr, fr_cntr));
-	}else {
-	  printf (" OK\n");
-	}
-      }
-    }
-/*---------------------------------------------------
-**		    -step	move a single step
-*/
-    if (Do_step) {
-      Soll_posit = ist_posit + Step;
-      printf ("Step size = %.*f\nMoving to %.*f ... ", 
-	Dec_pt, Step, Dec_pt, Soll_posit);
-      fflush (NULL);
-      status = EL734_MoveNoWait (&Hndl, Soll_posit);
-      if (!status) {
-	PrintErrInfo ("EL734_MoveNoWait");
-	return False;
-      }
-      status = My_WaitIdle (&Hndl, Verbose,
-				&ored_msr, &fp_cntr, &fr_cntr, &ist_posit);
-      if (!status) {
-	if (Ctrl_C_has_happened) {
-	  DoStop ();
-	}else {
-	  PrintErrInfo ("My_WaitIdle");
-	}
-	return False;
-      }else {
-	if ((ored_msr & ~(MSR__BUSY | MSR__OK)) != 0) {
-	  printf ("\007??\n    Position = %.*f\n    %s\n", Dec_pt, ist_posit,
-			EL734_EncodeMSR (text0, sizeof (text0),
-			0, ored_msr, fp_cntr, fr_cntr));
-	}else {
-	  printf (" OK\n");
-	}
-      }
-    }
-/*---------------------------------------------------
-**		    -ref	reference Point Seek
-*/
-    if (Do_ref) {
-      DoRef (&shift);
-    }
-/*---------------------------------------------------
-**		    -saw, -random or -scan
-*/
-    if (Do_saw || Do_rndm || Do_scan) {
-      status = EL734_GetLimits (&Hndl, &Lo, &Hi);
-      if (!status) {
-	  PrintErrInfo ("EL734_GetLimits");
-	  EL734_Close (&Hndl, False);
-	  return False;
-      }
-      printf ("Low and High Software Limits are %.*f and %.*f\n",
-				Dec_pt, Lo, Dec_pt, Hi);
-      if (!Lo_arg_present) Lo_arg = Lo;
-      if (!Hi_arg_present) Hi_arg = Hi;
-      if (Lo_arg < Lo) Lo_arg = Lo;
-      if (Hi_arg > Hi) Hi_arg = Hi;
-      if (Lo_arg > Hi_arg) {
-	f_tmp = Lo_arg; Lo_arg = Hi_arg; Hi_arg = f_tmp;
-      }
-      if (Do_saw) {				/*-----------------------------
-						**  See-Saw Moves
-						*/
-	nmoves = (N_moves >= 0) ? N_moves : -N_moves;
-	if (N_moves >= 0) {
-	  posit = Lo_arg;
-	  printf ("Performing %d moves between %.*f and %.*f.\n",
-			nmoves, Dec_pt, Lo_arg, Dec_pt, Hi_arg);
-	}else {
-	  posit = Hi_arg;
-	  printf ("Performing %d moves between %.*f and %.*f.\n",
-			nmoves, Dec_pt, Hi_arg, Dec_pt, Lo_arg);
-	}
-	if (Wait_time > 0) {
-	  printf ("Wait time between moves = %d secs.\n", Wait_time);
-	}else if (Wait_time < 0) {
-	  printf ("Random wait time between moves = %d secs.\n", -Wait_time);
-	}
-	for (i = 0; i <= nmoves; i++) {
-	  printf ("%d: Moving to %.*f ... ", i, Dec_pt, posit); fflush (NULL);
-	  status = EL734_MoveNoWait (&Hndl, posit);
-	  if (!status) {
-	    PrintErrInfo ("EL734_MoveNoWait");
-	    return False;
-	  }
-	  status = My_WaitIdle (&Hndl, Verbose,
-				&ored_msr, &fp_cntr, &fr_cntr, &ist_posit);
-	  if (!status) {
-	    if (Ctrl_C_has_happened) {
-	      DoStop ();
-	    }else {
-	      PrintErrInfo ("My_WaitIdle");
-	    }
-	    return False;
-	  }
-	  if ((ored_msr & ~(MSR__BUSY | MSR__OK)) != 0) {
-	    printf ("\007??\n"
-			"    Position = %.*f\n    %s\n", Dec_pt, ist_posit,
-			EL734_EncodeMSR (text0, sizeof (text0),
-				    0, ored_msr, fp_cntr, fr_cntr));
-	    if ((ored_msr & MSR__OK) == 0) return False;
-	  }else {
-	    if ((Wait_time == 0) || (i == N_moves)) printf (" OK.\n");
-	  }
-	  if (i != nmoves) DoWait (True);
-	  posit = (posit == Hi_arg) ? Lo_arg : Hi_arg;
-	}
-      }else if (Do_rndm) {			/*-----------------------------
-						**  Random Moves
-						*/
-	nmoves = (N_moves >= 0) ? N_moves : -N_moves;
-	printf ("Performing %d random moves between %.*f and %.*f.\n",
-			nmoves, Dec_pt, Lo_arg, Dec_pt, Hi_arg);
-	if (Wait_time > 0) {
-	  printf ("Wait time between moves = %d secs.\n", Wait_time);
-	}else if (Wait_time < 0) {
-	  printf ("Random wait time between moves = %d secs.\n", -Wait_time);
-	}
-	for (i = 1; i <= nmoves; i++) {
-	  irand = rand () & 0x7FFF;
-	  my_rand = ((float) irand)/32768.0;
-	  posit = Lo_arg + my_rand * (Hi_arg - Lo_arg);
-	  printf ("%d: Moving to %.*f ... ", i, Dec_pt, posit); fflush (NULL);
-
-	  status = EL734_MoveNoWait (&Hndl, posit);
-	  if (!status) {
-	    PrintErrInfo ("EL734_MoveNoWait");
-	    return False;
-	  }
-	  status = My_WaitIdle (&Hndl, Verbose,
-				&ored_msr, &fp_cntr, &fr_cntr, &ist_posit);
-	  if (!status) {
-	    if (Ctrl_C_has_happened) {
-	      DoStop ();
-	    }else {
-	      PrintErrInfo ("My_WaitIdle");
-	    }
-	    return False;
-	  }
-	  if ((ored_msr & ~(MSR__BUSY | MSR__OK)) != 0) {
-	    printf ("\007??\n"
-			"    Position = %.*f\n    %s\n", Dec_pt, ist_posit,
-			EL734_EncodeMSR (text0, sizeof (text0),
-				    0, ored_msr, fp_cntr, fr_cntr));
-	    if ((ored_msr & MSR__OK) == 0) return False;
-	  }else {
-	    if ((Wait_time == 0) || (i == N_moves)) printf (" OK.\n");
-	  }
-	  if (i != nmoves) DoWait (True);
-	}
-      }else if (Do_scan) {	    /*----------------------------------------
-				    **  Incremental motion
-				    */
-	if (N_moves == 0) N_moves = 5;
-	nmoves = (N_moves >= 0) ? N_moves : -N_moves;
-	Step = (Hi_arg - Lo_arg)/N_moves;
-	printf ("Step size = %.*f\n", Dec_pt, Step);
-	if (Step > 0) {
-	  posit = Lo_arg;
-	  printf ("Performing %d steps between %.*f and %.*f.\n",
-			nmoves, Dec_pt, Lo_arg, Dec_pt, Hi_arg);
-	}else {
-	  posit = Hi_arg;
-	  printf ("Performing %d steps between %.*f and %.*f.\n",
-			nmoves, Dec_pt, Hi_arg, Dec_pt, Lo_arg);
-	}
-	if (Wait_time > 0) {
-	  printf ("Wait time between steps = %d secs.\n", Wait_time);
-	}else if (Wait_time < 0) {
-	  printf ("Random wait time between steps = %d secs.\n", -Wait_time);
-	}
-	for (i = 0; i <= nmoves; i++) {
-	  printf ("%d: Moving to %.*f ... ", i, Dec_pt, posit); fflush (NULL);
-	  status = EL734_MoveNoWait (&Hndl, posit);
-	  if (!status) {
-	    PrintErrInfo ("EL734_MoveNoWait");
-	    return False;
-	  }
-	  status = My_WaitIdle (&Hndl, Verbose,
-				&ored_msr, &fp_cntr, &fr_cntr, &ist_posit);
-	  if (!status) {
-	    if (Ctrl_C_has_happened) {
-	      DoStop ();
-	    }else {
-	      PrintErrInfo ("My_WaitIdle");
-	    }
-	    return False;
-	  }
-	  if ((ored_msr & ~(MSR__BUSY | MSR__OK)) != 0) {
-	    printf ("\007??\n"
-			"    Position = %.*f\n    %s\n", Dec_pt, ist_posit,
-			EL734_EncodeMSR (text0, sizeof (text0),
-				    0, ored_msr, fp_cntr, fr_cntr));
-	    if ((ored_msr & MSR__OK) == 0) return False;
-	  }else {
-	    if (Wait_time == 0) printf (" OK.\n");
-	  }
-	  posit = posit + Step;
-	  if (i != nmoves) DoWait (True);
-	}
-	if (Wait_time != 0) printf (" OK.\n");
-      }
-    }
-/*---------------------------------------------------
-**		    -ff, -fb, -sf or -sb
-*/
-    if (Do_ff || Do_fb || Do_sf || Do_sb || Do_hunt) {
-      status = EL734_GetLimits (&Hndl, &Lo, &Hi);
-      if (!status) {
-	PrintErrInfo ("EL734_GetLimits");
-	EL734_Close (&Hndl, False);
-	return False;
-      }
-
-      if (Do_fb || Do_sb) printf ("Low Software Limit is %.*f\n", Dec_pt, Lo);
-      if (Do_ff || Do_sf) printf ("High Software Limit is %.*f\n", Dec_pt, Hi);
-      if (Do_hunt) printf ("Software Limits are %.*f and %.*f\n",
-				    Dec_pt, Lo, Dec_pt, Hi);
-
-      if (Do_ff) status = DoFF ();
-      if (Do_fb) status = DoFB ();
-      if (Do_sf) status = DoSF ();
-      if (Do_sb) status = DoSB ();
-      if (Do_hunt) status = DoHunt ();
-    }
-/*---------------------------------------------------*/
-    if (Do_save) {
-      status = DoSave ();
-      if (!status) {
-	PrintErrInfo ("DoSave");
-	EL734_Close (&Hndl, False);
-	return False;
-      }
-    }
-/*---------------------------------------------------*/
-    status = EL734_Close (&Hndl, False);
-    return True;
-  }
-/*------------------------------------------------- End of EL734_TEST.C */
diff --git a/motor/makeprint.c b/motor/makeprint.c
deleted file mode 100644
index d155498c..00000000
--- a/motor/makeprint.c
+++ /dev/null
@@ -1,203 +0,0 @@
-#define	    ident	"1B02"
-#ifdef VAXC
-#module	    MakePrint	ident
-#endif
-#ifdef __DECC
-#pragma	    module	    MakePrint	ident
-#endif
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     Department ASQ				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...LIB.SINQ]MAKEPRINT.C
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Nov 1995
-**
-**  To compile this module, use:
-
-	$ import tasmad
-	$ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-	$ cc /debug /noopt /obj=[]MakePrint -
-			tasmad_disk:[mad.lib.sinq]MakePrint +
-			sinq_c_tlb/lib
-
-**  To include this module in SINQ.OLB, use:
-
-  $ import tasmad
-  $ define/group sinq_c_tlb mad_lib:sinq_c.tlb
-  $
-  $ define/group sinq_olb mad_lib:sinq_dbg.olb
-  $ @tasmad_disk:[mad.lib.sinq]sinq_olb MakePrint debug
-  $
-  $ define/group sinq_olb mad_lib:sinq.olb
-  $ @tasmad_disk:[mad.lib.sinq]sinq_olb MakePrint
-**
-** Updates:
-**  1A01 30-Nov-1995 DM.	Initial version.
-**  1B01 21-Mar-1996 DM.	Move from DELTAT.OLB to SINQ.OLB.
-**============================================================================
-** The entry points included in this module are described below. Prototypes
-** can be defined via:
-**
-**    #include <sinq_prototypes.h>
-**
-**	MakePrint	    - ensure all characters in a buffer are printable.
-**	MakePrintable	    - extended version of MakePrint.
-**---------------------------------------------------------------------
-**  char  *MakePrint (*text)
-**	   ---------
-**  Input Args:
-**	none
-**  Output Args:
-**	none
-**  Modified Args:
-**	char	*text
-**  Return status:
-**	A pointer to "text".
-**  Routines called:
-**	none
-**  Description:
-**	The routine ensures that all characters in "text" are 7-bit
-**	and then replaces any non-printing character with a ".". A trailing
-**	"\n" or "\r" is removed.
-**---------------------------------------------------------------------------
-**  char  *MakePrintable (*out, out_size, *in)
-**	   -------------
-**  Input Args:
-**	char	*in	    -- the text to be converted.
-**	int	out_size    -- the size of the out buffer.
-**  Output Args:
-**	char	*out	    -- buffer to hold the converted text.
-**  Modified Args:
-**	none
-**  Return status:
-**	A pointer to "out".
-**  Routines called:
-**	none
-**  Description:
-**	The routine copies all the characters in "in" to "out", ensuring that
-**	"out" only contains printable characters.
-**	If the parity bit of a char is set, the char is prefixed with "^",
-**	any "^" chars get replaced by "\^".
-**	Then, if the result is non-printable, it is replaced by "\" and its
-**	octal value. Standard C-language control chars get replaced with
-**	the corresponding printable string, e.g. <LF> is "\n". Any "\" is
-**	replaced by "\\".
-**============================================================================*/
-/*
-**---------------------------------------------------------------------------
-**					Global Definitions
-*/
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <string.h>
-
-#include    <sinq_prototypes.h>
-
-#define	    NIL	    ('\0')
-/*--------------------------------------------------------------------------
-**					Global Variables
-*/
-/*
-**--------------------------------------------------------------------------
-**		MakePrint:  Make all characters in a buffer printable.
-*/
-  char	*MakePrint (char *chr) {
-/*       =========
-*/
-    int		len, i;
-    
-    for (i = 0; chr[i] != NIL; i++) chr[i] &= 0x7F;
-
-    len = strlen (chr);
-    if (len <= 0) return chr;
-
-    if (chr[len-1] == '\r') chr[len-1] = NIL;
-    if (chr[len-1] == '\n') chr[len-1] = NIL;
-
-    for (i = 0; chr[i] != NIL; i++) {
-      if (chr[i] < ' ') chr[i] = '.';
-      if (chr[i] == 0x7F) chr[i] = '.';
-    }
-
-    return chr;
-  }
-/*
-**--------------------------------------------------------------------------
-**		MakePrintable:  improved version of MakePrint.
-*/
-  char  *MakePrintable (char *out, int out_size, char *in) {
-/*       =============
-*/
-    int		len, i, j;
-    char	*my_tmp1, *my_tmp2;
-
-    len = strlen (in);
-
-    my_tmp1 = malloc (5 * len + 1);	/* Get plenty of working space */
-    if (my_tmp1 == NULL) {
-      out[0] = NIL; return out;
-    }
-
-    my_tmp2 = malloc (5 * len + 1);
-    if (my_tmp2 == NULL) {
-      free (my_tmp1); out[0] = NIL; return out;
-    }
-		    /*
-		    ** Process the parity bits, "\" and "^" first.
-		    */
-    i = 0; j = 0;
-    while (in[i] != NIL) {
-      if ((in[i] & 0x80) != 0) {
-        my_tmp1[j] = '^'; j++;
-	my_tmp1[j] = in[i] & 0x7f;
-      }else if (in[i] == '\\') {
-	my_tmp1[j] = '\\'; j++;
-	my_tmp1[j] = '\\';
-      }else if (in[i] == '^') {
-	my_tmp1[j] = '\\'; j++;
-	my_tmp1[j] = '^';
-      }else {
-        my_tmp1[j] = in[i];
-      }
-      i++; j++;
-    }
-    my_tmp1[j] = NIL;
-		    /*
-		    ** Now do the non-printing stuff.
-		    */
-    i = 0; j = 0;
-    while (my_tmp1[i] != NIL) {
-      if ((my_tmp1[i] < ' ') || (my_tmp1[i] == 0x7f)) {
-	my_tmp2[j] = '\\', j++;
-        switch (my_tmp1[i]) {
-	 case '\007': my_tmp2[j] = 'a'; break;
-	 case '\010': my_tmp2[j] = 'b'; break;
-	 case '\011': my_tmp2[j] = 't'; break;
-	 case '\012': my_tmp2[j] = 'n'; break;
-	 case '\013': my_tmp2[j] = 'v'; break;
-	 case '\014': my_tmp2[j] = 'f'; break;
-	 case '\015': my_tmp2[j] = 'r'; break;
-	 default: sprintf (&my_tmp2[j], "%3o", my_tmp1[i]); j += 2; break;
-	}
-      }else {
-        my_tmp2[j] = my_tmp1[i];
-      }
-      i++; j++;
-    }
-    my_tmp2[j] = NIL;
-
-    StrJoin (out, out_size, my_tmp2, "");
-
-    free (my_tmp1); free (my_tmp2);
-    return out;
-  }
-/*-------------------------------------------- End of MakePrint.C =======*/
diff --git a/motor/test.dat b/motor/test.dat
deleted file mode 100644
index 7ea4a707..00000000
--- a/motor/test.dat
+++ /dev/null
@@ -1,45 +0,0 @@
-! EL734 Status at Fri Oct 16 11:14:22 1998
-! ============
-!
-! Reference mode information:                 EL734 ID = "STPMC EL734 V2.0 FFF"
-!     K = -11 = LoLim + Index is ref. pt.     Server "lnsp19.psi.ch"
-!          -1 = LoLim is ref. pt.             Port     4000
-!           0 = Abs encoder                   Channel     2
-!           1 = HiLim is ref. pt.             Motor       1
-!           2 = Separate ref. pt.
-!          11 = HiLim + Index is ref. pt.
-!          12 = Separate + Index ref. pt.
-!
-! # of positionings,         SP = 110
-! # of positioning faults,   ST = 191
-! # of positioning failures, SR = 25
-! # of air-cushion failures, SA = 0
-! Status, MSR = Idle.      Flags, SS = 0x02 CCW
-! Input status is "off".
-! No motors are active.
-!
- mn  %d  ...............        ! Motor name
- ec  %d  0 0                    ! Zero the encoder mapping
- ec  %d  2 1                    ! Encoder mapping (type/number)
- ep  %d  1                      ! Encoder magic parameter
- a   %d  2                      ! Precision
- fd  %d  256 1                  ! Encoder gearing (numer/denom)
- fm  %d  1000 1                 ! Motor   gearing (numer/denom)
- d   %d   0.5                   ! Inertia tolerance
- e   %d  10                     ! Start/stop ramp (kHz/sec)
- f   %d  1                      ! Open loop/Closed loop (0/1)
- g   %d  1000                   ! Start/stop frequency (Mot-S/sec)
- h   %d  -180.70  359.30        ! Low/High Software Limits
- j   %d  3000                   ! Top speed (Mot-S/sec)
- k   %d  0                      ! Reference mode
- l   %d  0                      ! Backlash/Spielausgleich (Mot-S)
- m   %d  1                      ! Position tolerance (Enc-Steps)
- q   %d   0.00                  ! Reference switch width
- t   %d  0                      ! One-sided operation flag (0 = no)
- v   %d  -46445                 ! Null point
- w   %d  0                      ! Air-cushion dependency
- z   %d  0                      ! Circumf. of encoder (Enc-Steps)
- mem %d  ...............        ! User data register
-!
-! Current position is 22.04
-!
diff --git a/nextrics.c b/nextrics.c
deleted file mode 100644
index 6aa9bc22..00000000
--- a/nextrics.c
+++ /dev/null
@@ -1,1535 +0,0 @@
-/*-------------------------------------------------------------------------
-
-                           N E X T R I C S
-                           
-   NeXus file writing for the four circle diffractometer TRICS at Sinq, PSI.
-   
-   This object uses the NXDICT-API. A further speciality is that objects
-   which are constantly written are kept in  cache. This means, on 
-   initialisation pointers to all relevant objects which have to be stored with
-   a data frame are searched and kept in the objects data structure.
-   
-   copyright: see copyright.h
-   
-   Mark Koennecke, April 1998
-
-   Revised: Mark Koennecke, October 2000
-   Revised: Mark Koennecke, July 2001
-----------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <assert.h>
-#include <time.h>
-#include "fortify.h"
-#include "sics.h"
-#include "sicsvar.h"
-#include "motor.h"
-#include "countdriv.h"
-#include "counter.h"
-#include "HistMem.h"
-#include "danu.h"
-#include "nxdict.h"
-#include "nxutil.h"
-#include "hkl.h"
-#include "udpquieck.h"
-#include "nextrics.h"
-
-
-#define DET1X 256  /* x -length of detector 1 */ 
-#define DET1Y 128  /* y-length of detector 1 */
-#define DET1XS 2   /* pixel size in x of detector 1 */
-#define DET1YS 2   /* pixel size in y of detector 1 */
-#define DET1DESC "EMBL PSD"
-#define DET2X 256  /* x -length of detector 1 */ 
-#define DET2Y 128  /* y-length of detector 1 */
-#define DET2XS 2   /* pixel size in x of detector 1 */
-#define DET2YS 2   /* pixel size in y of detector 1 */
-#define DET2DESC "EMBL PSD"
-#define DET3X 256  /* x -length of detector 1 */ 
-#define DET3Y 128  /* y-length of detector 1 */
-#define DET3XS 2   /* pixel size in x of detector 1 */
-#define DET3YS 2   /* pixel size in y of detector 1 */
-#define DET3DESC "EMBL PSD"
-#define DETAMAX 256 /* maximum length of pixelsize array */
-
-/* histogram memory names */
-#define HM1 "hm1"
-#define HM2 "hm2"
-#define HM3 "hm3"
-
-/*
- offset variable names
-*/
-#define HM2OFF "hm2off"
-#define HM3OFF "hm3off"
-#define HM1OFF "hm1off"
-
-/*
-name of hkl object holding crystallographic information
-*/
-#define HKLNAME "hkl"
-
-/*------------------------ the data structure ----------------------------*/
-  typedef struct __NexTrics {
-                              pObjectDescriptor pDes;
-                              char *pCurrentFile;
-                              char *pFileRoot;
-                              pDataNumber pDanu;
-                              NXdict pDict;
-                              pHistMem pHistogram1, pHistogram2, pHistogram3;
-                              int iFirst;
-                              int iFrameNum;
-                              pICallBack pCall;
-                              float hm2Off, hm3Off, hm1off;
-                              pHKL pCrystal;
-                              int iHDF5;
-                              pCounter pCount;
-                            } NexTrics;
-
-/* event type */
-#define NEWFRAME 1166                              
-/*----------------------------------------------------------------------*/
-  pNexTrics CreateNexTrics(pDataNumber pNum, char *pRoot, char *pDict,
-                           SicsInterp *pSics)
-  {
-    pNexTrics pNew = NULL;
-    int iRet;
-    CommandList *pCom = NULL;
-    pSicsVariable pVar = NULL;
-    
-    /* allocate memory */
-    pNew = (pNexTrics)malloc(sizeof(NexTrics));
-    if(!pNew)
-    {
-      return NULL;
-    }
-    memset(pNew,0,sizeof(NexTrics));
-    
-    /* new object descriptor and callback interface */
-    pNew->pDes = CreateDescriptor(HM1);
-    pNew->pCall = CreateCallBackInterface();
-    if(!pNew->pDes || !pNew->pCall)
-    {
-      free(pNew);
-      return NULL;
-    }    
-    
-    /* initialize dictionary */
-    iRet = NXDinitfromfile(pDict,&pNew->pDict);
-    if(iRet != NX_OK)
-    {
-       DeleteNexTrics(pNew);
-       return NULL;
-    }
-    if(strstr(pDict,"5") != NULL)
-    {
-      pNew->iHDF5 = 1;
-    }
-    pNew->pFileRoot = strdup(pRoot);
-    pNew->pDanu = pNum;
-    
-    /* find things in interpreter */
-    pCom = FindCommand(pSics,HM1);
-    if(pCom)
-    {
-       pNew->pHistogram1 = (pHistMem)pCom->pData;
-    }
-    else
-    {
-	pNew->pHistogram1 = NULL;
-    }
-
-    pCom = FindCommand(pSics,HM2);
-    if(pCom)
-    {
-        pNew->pHistogram2 = (pHistMem)pCom->pData;
-    }
-    else
-    {
-        pNew->pHistogram2 = NULL;
-    }
-    pCom = FindCommand(pSics,HM3);
-    if(pCom)
-    {
-        pNew->pHistogram3 = (pHistMem)pCom->pData;
-    }
-    else
-    {
-        pNew->pHistogram3 = NULL;
-    }
-    pCom = FindCommand(pSics,HKLNAME);
-    if(pCom)
-    {
-      pNew->pCrystal = (pHKL)pCom->pData;
-    }
-    else
-    {
-      pNew->pCrystal = NULL;
-    }
-    pCom = FindCommand(pSics,"counter");
-    if(pCom)
-    {
-      pNew->pCount = (pCounter)pCom->pData;
-    }
-    else
-    {
-      pNew->pCrystal = NULL;
-    }
-    pNew->iFirst = 1;
-    pNew->iFrameNum = 0;
- 
-    pVar = FindVariable(pSics,HM1OFF);
-    if(pVar)
-    {
-      pNew->hm1off = pVar->fVal;
-    }
-    else
-    {
-      pNew->hm1off = 0;
-    }
-    pVar = FindVariable(pSics,HM2OFF);
-    if(pVar)
-    {
-      pNew->hm2Off = pVar->fVal;
-    }
-    else
-    {
-      pNew->hm2Off = +45.;
-    }
-    pVar = FindVariable(pSics,HM3OFF);
-    if(pVar)
-    {
-      pNew->hm3Off = pVar->fVal;
-    }
-    else
-    {
-      pNew->hm3Off = 90.;
-    }
-    
-    
-    return pNew;
-  }                         
-/*-------------------------------------------------------------------------*/
-  void DeleteNexTrics(void *pData)
-  {
-     pNexTrics self = NULL;
-     
-     self = (pNexTrics)pData;
-     if(!self)
-        return;
-        
-     if(self->pDes)
-        DeleteDescriptor(self->pDes);
-        
-     if(self->pCurrentFile)
-         free(self->pCurrentFile);
-         
-     if(self->pFileRoot)
-         free(self->pFileRoot);
-       
-     if(self->pDict)
-        NXDclose(self->pDict,NULL);
-
-     if(self->pCall)
-        DeleteCallBackInterface(self->pCall);
-        
-     free(self);                 
-  }  
-/*---------------------- a neXus error handler ---------------------------*/
-  static void SNError(void *pData, char *text)
-  {
-     SConnection *pCon;
-     
-     assert(pData);
-     pCon = (SConnection *)pData;
-     SCWrite(pCon,text,eError);
-  }
-/*--------------------------------------------------------------------------*/
-  int NexTricsFactory(SConnection *pCon, SicsInterp *pSics, void *pData,
-                      int argc, char *argv[])
-  {
-        pNexTrics pNew = NULL;
-        pDataNumber pDanu = NULL;
-        CommandList *pCom;
-        char pBueffel[512];
-        int iRet;
-        pDummy pDum;
-        
-        if(argc < 4)
-        {
-           SCWrite(pCon,
-               "ERROR: Insufficient number of arguments to NexTricsFactory",eError);
-           return 0;    
-        }
-        
-        /* first item must be the name of a datanumber variable */
-        pCom = FindCommand(pSics,argv[1]);
-        if(pCom)
-        {
-          pDanu = (pDataNumber)pCom->pData;
-        }
-        if( (!pCom) || (!pDanu))
-        {
-           SCWrite(pCon,"ERROR: DataNumber object NOT found",eError);
-           return 0;
-        }
-        pDum = (pDummy)pDanu;
-        if(strcmp(pDum->pDescriptor->name,"DataNumber") != 0)
-        {
-          sprintf(pBueffel,"ERROR: %s is no DataNumber object",argv[1]);
-          SCWrite(pCon,pBueffel,eError);
-          return 0;
-        }
-        
-        /* install an error handler */
-       NXMSetError((void *)pCon,SNError); 
-    
-       pNew = CreateNexTrics(pDanu,argv[2],argv[3],pSics);
-       if(!pNew)
-       {
-         SCWrite(pCon,"ERROR: cannot create nexTrics, invalid dictionary file",eError);
-         SCWrite(pCon,"ERROR:  or system objects missing.",eError);
-         return 0;
-       }      
-       
-       /* create the command */
-       iRet = AddCommand(pSics,"nxtrics",NexTricsAction,DeleteNexTrics,
-                         pNew);
-       if(!iRet)
-       {
-          SCWrite(pCon,"ERROR: duplicate command nxtrics not created",eError);
-       }                  
-       return iRet;
-  }
-/*-------------------------------------------------------------------------*/
-  static int DumpData(pNexTrics self, SConnection *pCon, NXhandle hfil, 
-                      int iFrameNum)
-  {
-     int iRet;
-     char pBueffel[512];
-     CounterMode eMode;
-     HistInt lData[DET1X*DET1Y], i, lVal;
-     int32 iVal,lBeam;
-     float fVal, fTTheta, fTime = 0.;
-     pMotor pMot;
-
-     /* write motors */
-     SNXSPutMotor(pServ->pSics,pCon,hfil,self->pDict,
-                  "framechi","CHI");     
-     SNXSPutMotor(pServ->pSics,pCon,hfil,self->pDict,
-                  "framephi","PHI");     
-     SNXSPutMotor(pServ->pSics,pCon,hfil,self->pDict,
-                  "frameomega","OM");     
-     /* 
-      read two theta
-     */
-      pMot = FindMotor(pServ->pSics,"stt");
-      if(!pMot)
-      {
-        sprintf(pBueffel,"WARNING: cannot find motor stt");
-        SCWrite(pCon,pBueffel,eWarning);
-        return 0;
-      }  
-      
-      /* get the position */
-      iRet = MotorGetSoftPosition(pMot,pCon,&fTTheta);
-
-
-     /* write frame time */
-     SNXFormatTime(pBueffel,512);
-     iRet = NXDputalias(hfil,self->pDict,"etime",pBueffel);
-     if(iRet != NX_OK)
-     {
-       SCWrite(pCon,"ERROR: cannot write frame time",eError);
-     }
-     
-     /* write counting parameters */
-     if(self->pHistogram1 != NULL)
-     {
-        eMode = GetHistCountMode(self->pHistogram1);
-        fVal = GetHistPreset(self->pHistogram1);
-        lVal = GetHistMonitor(self->pHistogram1,1,pCon);
-        lBeam = GetHistMonitor(self->pHistogram1,4,pCon);
-     }
-     if(self->pHistogram2 != NULL)
-     {
-        eMode = GetHistCountMode(self->pHistogram2);
-        fVal = GetHistPreset(self->pHistogram2);
-        lVal = GetHistMonitor(self->pHistogram2,1,pCon);
-        lBeam = GetHistMonitor(self->pHistogram2,4,pCon);
-     }
-     if(self->pHistogram3 != NULL)
-     {
-        eMode = GetHistCountMode(self->pHistogram3);
-        fVal = GetHistPreset(self->pHistogram3);
-        lVal = GetHistMonitor(self->pHistogram3,1,pCon);
-        lBeam = GetHistMonitor(self->pHistogram3,4,pCon);
-     }
-     if(self->pCount != NULL)
-     {
-       eMode = GetCounterMode(self->pCount);
-       fVal = GetCounterPreset(self->pCount);
-       lVal = GetMonitor(self->pCount,1,pCon);
-       fTime = GetCountTime(self->pCount,pCon);
-       lBeam = GetMonitor(self->pCount,4,pCon);
-     }
-     if(eMode == eTimer)
-     {
-       strcpy(pBueffel,"Timer");
-     }
-     else
-     {
-       strcpy(pBueffel,"Monitor");
-     }
-     NXDputalias(hfil,self->pDict,"framemode",pBueffel);     
-     NXDputalias(hfil,self->pDict,"framepreset",&fVal);
-     iVal = (int32)lVal;
-     NXDputalias(hfil,self->pDict,"framemonitor",&iVal);
-     iVal = (int32)lBeam;
-     NXDputalias(hfil,self->pDict,"sinqmonitor",&iVal);
-     NXDputalias(hfil,self->pDict,"cctime",&fTime);
-     
-     /* write detector1 histogram */
-     if(self->pHistogram1 != NULL)
-     {
-	 strcpy(pBueffel,"detector1");
-	 NXDupdate(self->pDict,"dnumber",pBueffel);
-	 SNXSPutMotor(pServ->pSics,pCon,hfil,self->pDict,
-		      "frametilt","DG1");     
-	 GetHistogram(self->pHistogram1,pCon,0,0,DET1X*DET1Y,lData,
-		      DET1X*DET1Y*sizeof(HistInt));
-	 NXDputalias(hfil,self->pDict,"framecounts",lData);
-
-	 /*
-	 NXDopenalias(hfil,self->pDict,"framecounts");
-	 NXputdata(hfil,lData);
-	 NXsetdimname(hfil,0,"frame_x");
-	 NXsetdimname(hfil,1,"frame_y");
-	 NXclosedata(hfil);
-	 */
-
-	 fVal = fTTheta + self->hm1off;
-	 NXDputalias(hfil,self->pDict,"frame2theta",&fVal);
-
-	 /* the NXdata links */
-	 NXDaliaslink(hfil,self->pDict,"frame","detectorx");
-	 NXDaliaslink(hfil,self->pDict,"frame","detectory");
-	 NXDaliaslink(hfil,self->pDict,"frame","framecounts");
-     }
-     /*
-       do detector 2 histogram
-     */     
-     if(self->pHistogram2 != NULL)
-     {
-	 strcpy(pBueffel,"detector2");
-	 NXDupdate(self->pDict,"dnumber",pBueffel);
-         SNXSPutMotor(pServ->pSics,pCon,hfil,self->pDict,
-                  "frametilt","DG2");     
-	 GetHistogram(self->pHistogram2,pCon,0,0,DET2X*DET2Y,lData,
-		      DET2X*DET2Y*sizeof(HistInt));
-	 NXDputalias(hfil,self->pDict,"framecounts",lData);
-
-         /* code for reducing object number  in HDF-4
-	 NXDopenalias(hfil,self->pDict,"framecounts");
-	 NXputdata(hfil,lData);
-	 NXsetdimname(hfil,0,"frame_x");
-	 NXsetdimname(hfil,1,"frame_y");
-	 NXclosedata(hfil);
-         */
-
-         fVal = fTTheta + self->hm2Off;
-         NXDputalias(hfil,self->pDict,"frame2theta",&fVal);
-
-	 /* the NXdata links */
-	 NXDaliaslink(hfil,self->pDict,"frame","detectorx");
-	 NXDaliaslink(hfil,self->pDict,"frame","detectory");
-	 NXDaliaslink(hfil,self->pDict,"frame","framecounts");
-     }
-     /*
-       do detector 3 histogram
-     */     
-     if(self->pHistogram3 != NULL)
-     {
-	 strcpy(pBueffel,"detector3");
-	 NXDupdate(self->pDict,"dnumber",pBueffel);
-         SNXSPutMotor(pServ->pSics,pCon,hfil,self->pDict,
-                  "frametilt","DG3");     
-	 GetHistogram(self->pHistogram3,pCon,0,0,DET3X*DET3Y,lData,
-		      DET3X*DET3Y*sizeof(HistInt));
-
-	 NXDputalias(hfil,self->pDict,"framecounts",lData);
-
-         /* code for reducing object numbers in HDF-4
-	 NXDopenalias(hfil,self->pDict,"framecounts");
-	 NXputdata(hfil,lData);
-	 NXsetdimname(hfil,0,"frame_x");
-	 NXsetdimname(hfil,1,"frame_y");
-	 NXclosedata(hfil);
-         */
-
-
-         fVal = fTTheta + self->hm3Off;
-         NXDputalias(hfil,self->pDict,"frame2theta",&fVal);
-
-	 /* the NXdata links */
-	 NXDaliaslink(hfil,self->pDict,"frame","detectorx");
-	 NXDaliaslink(hfil,self->pDict,"frame","detectory");
-	 NXDaliaslink(hfil,self->pDict,"frame","framecounts");
-     }
-
-
-     /* temperature */
-     SNXSPutEVVar(hfil,self->pDict,"temperature",
-                  pCon,
-                  "frametemp",
-                  "framestdev");   
-     
-     /* close and done */
-     sprintf(pBueffel,"Frame %d succesfully written",iFrameNum-1);
-     SCWrite(pCon,pBueffel,eStatus);
-     
-     return 1;
- }
-/*--------------------------------------------------------------------------*/
-  static int  WriteFirstFrame(pNexTrics self, SConnection *pCon)
-  {
-     char pBueffel[1024];
-     NXhandle hfil;
-     int iRet, iYear, i;
-     pSicsVariable pVar;
-     char *pText;
-     CommandList *pCom = NULL;
-     pHKL pCryst = NULL;
-     float fVal, fPix[DETAMAX];
-     float fHKL[3], fUB[9];
-     
-     iRet = NXopen(self->pCurrentFile,NXACC_RDWR,&hfil);
-     if(iRet != NX_OK)
-     {
-       sprintf(pBueffel,"ERROR: cannot open %s",self->pCurrentFile);
-       SCWrite(pCon,pBueffel,eError);
-       return 0;
-     }       
-  
-     /* make sure: first frame */
-     NXDupdate(self->pDict,"framename","frame0000");
-     self->iFrameNum = 0;
-
-     /* title */
-     pVar = NULL;
-     pVar = FindVariable(pServ->pSics,"title");
-     if(pVar)
-     {
-        pText = pVar->text;
-     }
-     else
-     {
-        SCWrite(pCon,"ERROR: Variable title not found ",eError);
-        pText = pBueffel;
-     }
-     iRet = NXDputalias(hfil,self->pDict,"etitle",pText);
-     if(iRet != NX_OK)
-     {
-       SCWrite(pCon,"ERROR: failed to write title",eError);
-     }
-     
-     /* start time */
-     SNXFormatTime(pBueffel,1023);
-     iRet = NXDputalias(hfil,self->pDict,"etime",pBueffel);
-     if(iRet != NX_OK)
-     {
-       SCWrite(pCon,"ERROR: failed to write start time",eError);
-     }
-     
-     /* source info */
-     strcpy(pBueffel,"SINQ at Paul Scherrer Institut, Villigen");
-     iRet = NXDputalias(hfil,self->pDict,"sname",pBueffel);
-     if(iRet != NX_OK)
-     {
-       SCWrite(pCon,"ERROR: failed to write source name",eError);
-     }
-     strcpy(pBueffel,"Spallation Neutron Source");
-     iRet = NXDputalias(hfil,self->pDict,"stype",pBueffel);
-     if(iRet != NX_OK)
-     {
-       SCWrite(pCon,"ERROR: failed to write source type",eError);
-     }
-     
-     /* instrument name */
-     strcpy(pBueffel,"TRICS at SINQ, Paul Scherrer Institut, Switzerland"); 
-     iRet = NXDputalias(hfil,self->pDict,"iname0",pBueffel);
-     if(iRet != NX_OK)
-     {
-       SCWrite(pCon,"ERROR: failed to write instrument name",eError);
-     }
-     
-     
-     /* Monochromator */
-     pVar = NULL;
-     strcpy(pBueffel,"UNKNOWN");
-     pVar = FindVariable(pServ->pSics,"monodescription");
-     if(pVar)
-     {
-        pText = pVar->text;
-     }
-     else
-     {
-        SCWrite(pCon,"ERROR: Variable monodescription not found ",eError);
-        pText = pBueffel;
-     }
-     iRet = NXDputalias(hfil,self->pDict,"monodes",pText);
-     if(iRet != NX_OK)
-     {
-       SCWrite(pCon,"ERROR: failed to write monodescription",eError);
-     }
-
-     /* lambda */
-     if(self->pCrystal != NULL)
-     {
-        GetLambda(self->pCrystal,&fVal);
-        iRet = NXDputalias(hfil,self->pDict,"monolambda",&fVal);
-        if(iRet != NX_OK)
-        {
-             SCWrite(pCon,"ERROR: failed to write lambda",eError);
-        }
-     }
-     
-     /* two theta */
-     pVar = NULL;
-     strcpy(pBueffel,"UNKNOWN");
-     pVar = FindVariable(pServ->pSics,"mono2theta");
-     if(pVar)
-     {
-        fVal = pVar->fVal;
-     }
-     else
-     {
-        SCWrite(pCon,"ERROR: Variable mono2theta not found ",eError);
-        fVal = -2188.99;
-     }
-     iRet = NXDputalias(hfil,self->pDict,"mono2theta",&fVal);
-     if(iRet != NX_OK)
-     {
-       SCWrite(pCon,"ERROR: failed to write monochromator 2 Theta",eError);
-     }
-     /* theta, needs work when lift operational */
-     SNXSPutMotor(pServ->pSics,pCon,hfil,self->pDict,
-                  "monotheta","MUCA");     
-     
-     
-     /* detector data 
-        first set detector variables in dictionary 
-        This is the first detector. 
-     */
-     if(self->pHistogram1 != NULL)
-     {
-	strcpy(pBueffel,"detector1");
-	NXDupdate(self->pDict,"dnumber",pBueffel);
-	sprintf(pBueffel,"%d",DET1X);
-	NXDupdate(self->pDict,"framedim1",pBueffel);
-	sprintf(pBueffel,"%d",DET1Y);
-	NXDupdate(self->pDict,"framedim2",pBueffel);
-	strcpy(pBueffel,DET1DESC);
-	iRet = NXDputalias(hfil,self->pDict,"ddescription",pBueffel);
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"ERROR: failed to write detector1 description",eError);
-	}
-	for(i = 0; i < DET1X; i++)
-	{
-	  fPix[i] = i * DET1XS;
-	}
-	iRet = NXDputalias(hfil,self->pDict,"detectorx",fPix);
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"ERROR: failed to write detector1 x-axis description",eError);
-	}
-	for(i = 0; i < DET1Y; i++)
-	{
-	  fPix[i] = i * DET1YS;
-	}
-	iRet = NXDputalias(hfil,self->pDict,"detectory",fPix);
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"ERROR: failed to write detector1 y-axis description",eError);
-	}
-	pVar = NULL;
-	pVar = FindVariable(pServ->pSics,"det1zerox");
-	if(pVar)
-	{
-	   fVal = pVar->fVal;
-	}
-	else
-	{
-	   SCWrite(pCon,"ERROR: Variable detector x zero point not found ",eError);
-	   fVal = -2188.99;
-	}
-	iRet = NXDputalias(hfil,self->pDict,"detzerox",&fVal);
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"ERROR: failed to write detecor x zero point",eError);
-	}
-	pVar = NULL;
-	pVar = FindVariable(pServ->pSics,"det1zeroy");
-	if(pVar)
-	{
-	   fVal = pVar->fVal;
-	}
-	else
-	{
-	   SCWrite(pCon,"ERROR: Variable detector y zero point not found ",eError);
-	   fVal = -2188.99;
-	}
-	iRet = NXDputalias(hfil,self->pDict,"detzeroy",&fVal);
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"ERROR: failed to write detecor y zero point",eError);
-	}
-	pVar = NULL;
-	pVar = FindVariable(pServ->pSics,"detdist1");
-	if(pVar)
-	{
-	   fVal = pVar->fVal;
-	}
-	else
-	{
-	   SCWrite(pCon,"ERROR: Variable detector distance not found ",eError);
-	   fVal = -2188.99;
-	}
-	iRet = NXDputalias(hfil,self->pDict,"detdist",&fVal);
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"ERROR: failed to write detecor y zero point",eError);
-	}
-	iRet = 1;
-	iRet = NXDputalias(hfil,self->pDict,"detvalid",&iRet);
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"ERROR: failed to write frame validity",eError);
-	}
-     }
-     /* 
-       second frame, but only if present
-     */
-     if(self->pHistogram2 != NULL)
-     {
-        strcpy(pBueffel,"detector2");
-        NXDupdate(self->pDict,"dnumber",pBueffel);
-        sprintf(pBueffel,"%d",DET2X);
-        NXDupdate(self->pDict,"framedim1",pBueffel);
-        sprintf(pBueffel,"%d",DET2Y);
-        NXDupdate(self->pDict,"framedim2",pBueffel);
-        strcpy(pBueffel,DET2DESC);
-        iRet = NXDputalias(hfil,self->pDict,"ddescription",pBueffel);
-        if(iRet != NX_OK)
-        {
-          SCWrite(pCon,"ERROR: failed to write detector2 description",eError);
-        }
-        for(i = 0; i < DET2X; i++)
-        {
-           fPix[i] = i * DET2XS;
-        }
-        iRet = NXDputalias(hfil,self->pDict,"detectorx",fPix);
-        if(iRet != NX_OK)
-        {
-            SCWrite(pCon,"ERROR: failed to write detector2 x-axis description",
-                          eError);
-        }
-        for(i = 0; i < DET2Y; i++)
-        {
-           fPix[i] = i * DET2YS;
-        }
-        iRet = NXDputalias(hfil,self->pDict,"detectory",fPix);
-        if(iRet != NX_OK)
-        {
-           SCWrite(pCon,"ERROR: failed to write detector1 y-axis description",
-                   eError);
-        }
-        pVar = NULL;
-        pVar = FindVariable(pServ->pSics,"det2zerox");
-        if(pVar)
-        {
-           fVal = pVar->fVal;
-        }
-        else
-        {
-             SCWrite(pCon,"ERROR: Variable detector x zero point not found ",
-                    eError);
-             fVal = -2188.99;
-        }
-        iRet = NXDputalias(hfil,self->pDict,"detzerox",&fVal);
-        if(iRet != NX_OK)
-        {
-           SCWrite(pCon,"ERROR: failed to write detecor x zero point",
-           eError);
-        }
-        pVar = NULL;
-        pVar = FindVariable(pServ->pSics,"det2zeroy");
-        if(pVar)
-        {
-            fVal = pVar->fVal;
-        }
-        else
-        {
-            SCWrite(pCon,"ERROR: Variable detector2 y zero point not found ",
-                    eError);
-            fVal = -2188.99;
-         }
-         iRet = NXDputalias(hfil,self->pDict,"detzeroy",&fVal);
-         if(iRet != NX_OK)
-         {
-             SCWrite(pCon,"ERROR: failed to write detecor y zero point",
-                     eError);
-         }
-         pVar = NULL;
-         pVar = FindVariable(pServ->pSics,"detdist2");
-         if(pVar)
-         {
-            fVal = pVar->fVal;
-         }
-         else
-         {
-            SCWrite(pCon,"ERROR: Variable detector distance not found ",
-                    eError);
-            fVal = -2188.99;
-         }
-         iRet = NXDputalias(hfil,self->pDict,"detdist",&fVal);
-         if(iRet != NX_OK)
-         {
-             SCWrite(pCon,"ERROR: failed to write detecor2 y distance",
-                     eError);
-         }
-         iRet = 1;
-         iRet = NXDputalias(hfil,self->pDict,"detvalid",&iRet);
-         if(iRet != NX_OK)
-         {
-            SCWrite(pCon,"ERROR: failed to write frame validity",eError);
-         }
-     }     
-     /* 
-       third detector, but only if present
-     */
-     if(self->pHistogram3 != NULL)
-     {
-        strcpy(pBueffel,"detector3");
-        NXDupdate(self->pDict,"dnumber",pBueffel);
-        sprintf(pBueffel,"%d",DET3X);
-        NXDupdate(self->pDict,"framedim1",pBueffel);
-        sprintf(pBueffel,"%d",DET3Y);
-        NXDupdate(self->pDict,"framedim2",pBueffel);
-        strcpy(pBueffel,DET3DESC);
-        iRet = NXDputalias(hfil,self->pDict,"ddescription",pBueffel);
-        if(iRet != NX_OK)
-        {
-          SCWrite(pCon,"ERROR: failed to write detector3 description",eError);
-        }
-        for(i = 0; i < DET3X; i++)
-        {
-           fPix[i] = i * DET3XS;
-        }
-        iRet = NXDputalias(hfil,self->pDict,"detectorx",fPix);
-        if(iRet != NX_OK)
-        {
-            SCWrite(pCon,"ERROR: failed to write detector2 x-axis description",
-                          eError);
-        }
-        for(i = 0; i < DET3Y; i++)
-        {
-           fPix[i] = i * DET3YS;
-        }
-        iRet = NXDputalias(hfil,self->pDict,"detectory",fPix);
-        if(iRet != NX_OK)
-        {
-           SCWrite(pCon,"ERROR: failed to write detector1 y-axis description",
-                   eError);
-        }
-        pVar = NULL;
-        pVar = FindVariable(pServ->pSics,"det3zerox");
-        if(pVar)
-        {
-           fVal = pVar->fVal;
-        }
-        else
-        {
-             SCWrite(pCon,"ERROR: Variable detector 3 x zero point not found ",
-                    eError);
-             fVal = -2188.99;
-        }
-        iRet = NXDputalias(hfil,self->pDict,"detzerox",&fVal);
-        if(iRet != NX_OK)
-        {
-           SCWrite(pCon,"ERROR: failed to write detecor x zero point",
-           eError);
-        }
-        pVar = NULL;
-        pVar = FindVariable(pServ->pSics,"det3zeroy");
-        if(pVar)
-        {
-            fVal = pVar->fVal;
-        }
-        else
-        {
-            SCWrite(pCon,"ERROR: Variable detector 3 y zero point not found ",
-                    eError);
-            fVal = -2188.99;
-         }
-         iRet = NXDputalias(hfil,self->pDict,"detzeroy",&fVal);
-         if(iRet != NX_OK)
-         {
-             SCWrite(pCon,"ERROR: failed to write detecor y zero point",
-                     eError);
-         }
-         pVar = NULL;
-         pVar = FindVariable(pServ->pSics,"detdist3");
-         if(pVar)
-         {
-            fVal = pVar->fVal;
-         }
-         else
-         {
-            SCWrite(pCon,"ERROR: Variable detector 3 distance not found ",
-                    eError);
-            fVal = -2188.99;
-         }
-         iRet = NXDputalias(hfil,self->pDict,"detdist",&fVal);
-         if(iRet != NX_OK)
-         {
-             SCWrite(pCon,"ERROR: failed to write detecor 3 y distance",
-                     eError);
-         }
-         iRet = 1;
-         iRet = NXDputalias(hfil,self->pDict,"detvalid",&iRet);
-         if(iRet != NX_OK)
-         {
-            SCWrite(pCon,"ERROR: failed to write frame validity",eError);
-         }
-     }     
-     
-     /* do sample information */
-     strcpy(pBueffel,"UNKNOWN");
-     pVar = FindVariable(pServ->pSics,"sample");
-     if(pVar)
-     {
-        pText = pVar->text;
-     }
-     else
-     {
-        SCWrite(pCon,"ERROR: Variable sample not found ",eError);
-        pText = pBueffel;
-     }
-     iRet = NXDputalias(hfil,self->pDict,"samplename",pText);
-     if(iRet != NX_OK)
-     {
-       SCWrite(pCon,"ERROR: failed to write sample name",eError);
-     }
-     if(self->pCrystal != NULL)
-     {
-       GetUB(self->pCrystal,fUB);
-       iRet = NXDputalias(hfil,self->pDict,"sampleub",fUB);
-       if(iRet != NX_OK)
-       {
-	 SCWrite(pCon,"ERROR: failed to write sample UB",eError);
-       }
-       GetCurrentHKL(self->pCrystal,fHKL);
-       iRet = NXDputalias(hfil,self->pDict,"samplehkl",fHKL);
-       if(iRet != NX_OK)
-       {
-	 SCWrite(pCon,"ERROR: failed to write HKL",eError);
-       }
-     }
-   
-     /* put the frame number */
-     iRet = 0;
-     iRet = NXDputalias(hfil,self->pDict,"fnum",&iRet);
-     if(iRet != NX_OK)
-     {
-       SCWrite(pCon,"ERROR: failed to write initial frame number",eError);
-     }
-
-     /* write actual data */
-     iRet = DumpData(self,pCon,hfil,1);
-
-     /* put the frame number */
-     iRet = 1;
-     iRet = NXDputalias(hfil,self->pDict,"fnum",&iRet);
-     if(iRet != NX_OK)
-     {
-       SCWrite(pCon,"ERROR: failed to write initial frame number",eError);
-     }
-     self->iFrameNum = 1;
-     InvokeCallBack(self->pCall, NEWFRAME,&(self->iFrameNum));  
-     
-     self->iFirst = 0;
-     
-     /* close the file and go */
-     NXclose(&hfil);
-     SendQuieck(QUIECK,self->pCurrentFile);
-     return iRet;
-  }  
-/*-------------------------------------------------------------------------*/
-  static int ContinueFile(pNexTrics self, SConnection *pCon)
-  {
-     int iFrameNum, iRet;
-     char pBueffel[1024];
-     float fVal;
-     NXhandle hfil;
-     
-     assert(self);
-     assert(pCon);
-     assert(self->iFirst == 0);
-     
-     /* let's start by opening the file*/
-     iRet = NXopen(self->pCurrentFile,NXACC_RDWR,&hfil); 
-     if(iRet != NX_OK)
-     {
-       sprintf(pBueffel,"ERROR: cannot reopen %s, NO data written",
-               self->pCurrentFile);
-       SCWrite(pCon,pBueffel,eError);  
-       return 0;      
-     }
-     
-     /* read the frame number, set the framename for further reading, 
-        increment and write back again
-     */
-     iRet = NXDgetalias(hfil,self->pDict,"fnum",&iFrameNum);
-     if(iRet != NX_OK)
-     {
-       SCWrite(pCon,"EERROR: cannot read old framenumber, NO data written",eError);
-       return 0;
-     }
-     sprintf(pBueffel,"frame%4.4d", iFrameNum);
-     NXDupdate(self->pDict,"framename",pBueffel);
-     iFrameNum++;
-     self->iFrameNum++;
-     InvokeCallBack(self->pCall, NEWFRAME,&(self->iFrameNum));  
-     iRet = NXDputalias(hfil,self->pDict,"fnum",&iFrameNum);
-     if(iRet != NX_OK)
-     {
-       SCWrite(pCon,"ERROR: cannot write new framenumber, NO data written",eError);
-       return 0;
-     }
-
-     /* put in links to duplicates: entry */
-     iRet = NXDaliaslink(hfil,self->pDict,"entry","etitle0");  
-     if(iRet != NX_OK)
-     {
-       SCWrite(pCon,"WARNING: cannot link against title",eWarning);
-     }
-     
-     /* links to instrument */
-     iRet = NXDaliaslink(hfil,self->pDict,"inst0","iname0");  
-     if(iRet != NX_OK)
-     {
-       SCWrite(pCon,"WARNING: cannot link against instrument name",eWarning);
-     }
-     iRet = NXDaliaslink(hfil,self->pDict,"inst0","source0");  
-     if(iRet != NX_OK)
-     {
-       SCWrite(pCon,"WARNING: cannot link against source group",eWarning);
-     }
-     iRet = NXDaliaslink(hfil,self->pDict,"inst0","mono0");  
-     if(iRet != NX_OK)
-     {
-       SCWrite(pCon,"WARNING: cannot link against monochromator group",eWarning);
-     }
-     
-     /*    
-       links in detector group 
-       detector 1
-       */
-     if(self->pHistogram1 != NULL)
-     {
-	strcpy(pBueffel,"detector1");
-	NXDupdate(self->pDict,"dnumber",pBueffel);
-	iRet = NXDaliaslink(hfil,self->pDict,"det1","ddescription");  
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"WARNING: cannot link against detector description",eWarning);
-	}
-	iRet = NXDaliaslink(hfil,self->pDict,"det1","detectorx");  
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"WARNING: cannot link against detector x-axis",eWarning);
-	}
-	iRet = NXDaliaslink(hfil,self->pDict,"det1","detectory");  
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"WARNING: cannot link against detector y-axis",eWarning);
-	}
-	iRet = NXDaliaslink(hfil,self->pDict,"det1","detzerox");  
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"WARNING: cannot link against detector x zero ",eWarning);
-	}
-	iRet = NXDaliaslink(hfil,self->pDict,"det1","detzeroy");  
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"WARNING: cannot link against detector y zero",eWarning);
-	}
-	iRet = NXDaliaslink(hfil,self->pDict,"det1","detdist");  
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"WARNING: cannot link against detector distance",
-                 eWarning);
-	}
-	iRet = 1;
-	iRet = NXDputalias(hfil,self->pDict,"detvalid",&iRet);
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"ERROR: failed to write frame validity",eError);
-	}
-     }
-     /*
-      links in detector group, detector 2
-     */
-     if(self->pHistogram2)
-     {
-	strcpy(pBueffel,"detector2");
-	NXDupdate(self->pDict,"dnumber",pBueffel);
-	iRet = NXDaliaslink(hfil,self->pDict,"det1","ddescription");  
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"WARNING: cannot link against detector description",
-                       eWarning);
-	}
-	iRet = NXDaliaslink(hfil,self->pDict,"det1","detectorx");  
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"WARNING: cannot link against detector x-axis",
-                  eWarning);
-	}
-	iRet = NXDaliaslink(hfil,self->pDict,"det1","detectory");  
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"WARNING: cannot link against detector y-axis",
-                  eWarning);
-	}
-	iRet = NXDaliaslink(hfil,self->pDict,"det1","detzerox");  
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"WARNING: cannot link against detector x zero ",
-                 eWarning);
-	}
-	iRet = NXDaliaslink(hfil,self->pDict,"det1","detzeroy");  
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"WARNING: cannot link against detector y zero",
-                  eWarning);
-	}
-	iRet = NXDaliaslink(hfil,self->pDict,"det1","detdist");  
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"WARNING: cannot link against detector distance",
-                  eWarning);
-	}
-	iRet = 1;
-	iRet = NXDputalias(hfil,self->pDict,"detvalid",&iRet);
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"ERROR: failed to write frame validity",eError);
-	}
-     }     
-
-     /*
-      links in detector group, detector 3
-     */
-     if(self->pHistogram3)
-     {
-	strcpy(pBueffel,"detector3");
-	NXDupdate(self->pDict,"dnumber",pBueffel);
-	iRet = NXDaliaslink(hfil,self->pDict,"det1","ddescription");  
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"WARNING: cannot link against detector description",
-                       eWarning);
-	}
-	iRet = NXDaliaslink(hfil,self->pDict,"det1","detectorx");  
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"WARNING: cannot link against detector x-axis",
-                  eWarning);
-	}
-	iRet = NXDaliaslink(hfil,self->pDict,"det1","detectory");  
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"WARNING: cannot link against detector y-axis",
-                  eWarning);
-	}
-	iRet = NXDaliaslink(hfil,self->pDict,"det1","detzerox");  
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"WARNING: cannot link against detector x zero ",
-                 eWarning);
-	}
-	iRet = NXDaliaslink(hfil,self->pDict,"det1","detzeroy");  
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"WARNING: cannot link against detector y zero",
-                  eWarning);
-	}
-	iRet = NXDaliaslink(hfil,self->pDict,"det1","detdist");  
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"WARNING: cannot link against detector distance",
-                  eWarning);
-	}
-	iRet = 1;
-	iRet = NXDputalias(hfil,self->pDict,"detvalid",&iRet);
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"ERROR: failed to write frame validity",eError);
-	}
-     }     
-
-     
-     /* links in sample group */
-     iRet = NXDaliaslink(hfil,self->pDict,"samplev","samplename");  
-     if(iRet != NX_OK)
-     {
-       SCWrite(pCon,"WARNING: cannot link against sample name",eWarning);
-     }
-     if(self->pCrystal != NULL)
-     {
-	iRet = NXDaliaslink(hfil,self->pDict,"samplev","sampleub");  
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"WARNING: cannot link against sample UB",eWarning);
-	}
-	iRet = NXDaliaslink(hfil,self->pDict,"samplev","samplehkl");  
-	if(iRet != NX_OK)
-	{
-	  SCWrite(pCon,"WARNING: cannot link against sample HKL",eWarning);
-	}
-     }
-     
-     /* write actual data */
-     iRet = DumpData(self,pCon,hfil,iFrameNum);
-
-     /* close the file and go */
-     NXclose(&hfil);
-     SendQuieck(QUIECK,self->pCurrentFile);
-     return iRet;
-  
-  }
-/*--------------------------------------------------------------------------*/
-  int StartFile(pNexTrics self, SConnection *pCon)
-  {
-     char pBueffel[1024];
-     NXhandle hfil;
-     int iRet, iYear, i;
-     pSicsVariable pVar;
-     char *pText;
-     CommandList *pCom = NULL;
-     pHKL pCryst = NULL;
-     float fVal, fPix[DETAMAX];
-     
-     /* make a filename and open it */
-     if(self->pCurrentFile)
-        free(self->pCurrentFile);
-     iRet  = IncrementDataNumber(self->pDanu,&iYear);
-     sprintf(pBueffel,"%s/trics%5.5d%4.4d.hdf",self->pFileRoot,iRet, iYear);
-     self->pCurrentFile = strdup(pBueffel);   
-     if(self->iHDF5)
-     {
-       iRet = NXopen(self->pCurrentFile,NXACC_CREATE5,&hfil);
-     }
-     else
-     {
-       iRet = NXopen(self->pCurrentFile,NXACC_CREATE,&hfil);
-     }
-     if(iRet != NX_OK)
-     {
-       sprintf(pBueffel,"ERROR: cannot open %s",self->pCurrentFile);
-       SCWrite(pCon,pBueffel,eError);
-       return 0;
-     }       
-  
-     /* tell user what we are doing */
-     sprintf(pBueffel,"Initialising file %s ......", self->pCurrentFile);
-     SCWrite(pCon,pBueffel,eWarning);
-     
-     
-     /* Write header data */
-     SNXSPutGlobals(hfil,self->pCurrentFile,
-                    "TRICS at SinQ, Paul Scherrer Institut, Switzerland",
-                    pCon);
-
-     self->iFirst = 1;
-     self->iFrameNum = 0;
-     InvokeCallBack(self->pCall, NEWFRAME,&(self->iFrameNum));  
-     
-     /* close the file and go */
-     NXclose(&hfil);
-     return 1;
-  }  
-/*-------------------------------------------------------------------------*/
-  int ReopenFile(pNexTrics self, char *filename)
-  {
-     char pBueffel[1024];
-     NXhandle hfil;
-     int iRet, iFrameNum;
-     
-     assert(self);
-     
-     /* concat with data root and check for existence */
-     sprintf(pBueffel,"%s/%s",self->pFileRoot,filename);
-     iRet = NXopen(pBueffel,NXACC_RDWR,&hfil);
-     if(iRet != NX_OK)
-     {
-       return 0;
-     }
-     else
-     {
-       if(self->pCurrentFile)
-            free(self->pCurrentFile);
-       self->pCurrentFile = strdup(pBueffel);     
-     }
-
-     /* check the framenumber, if already data written */
-     iRet = NXDgetalias(hfil,self->pDict,"fnum",&iFrameNum);
-     if(iRet != NX_OK)
-     {
-       self->iFirst = 1;
-     }
-     else
-     {
-       self->iFirst = 0;
-     }
-     self->iFrameNum = iFrameNum;
-     InvokeCallBack(self->pCall, NEWFRAME,&(self->iFrameNum));  
-     return 1;
-  }
-/*--------------------------------------------------------------------------*/
-  int DumpFrame(pNexTrics self, SConnection *pCon)
-  {
-     int iRet;
-     
-     assert(self);
-     assert(pCon);
-     
-     if(self->iFirst == 1)
-     {
-        iRet = WriteFirstFrame(self,pCon);
-     }
-     else
-     {
-       iRet = ContinueFile(self,pCon);
-     }     
-
-     return iRet;     
-  }  
-/*-------------------------------------------------------------------------*/
-  static int FrameInterest(int iEvent, void *pEvent, void *pUser)
-  {
-     SConnection *pCon = NULL;
-     int *iFrame;
-     char pBueffel[512];
-     
-     if(iEvent != NEWFRAME)
-     {
-       return 0;
-     }
-     
-     pCon = (SConnection *)pUser;
-     iFrame  = (int *)pEvent;
-     assert(pCon);
-     sprintf(pBueffel,"framenumber = %d",*iFrame);
-     SCWrite(pCon,pBueffel,eWarning);
-     return 1;        
-  }  
-/*-------------------------------------------------------------------------
-  NexusGetFrame opens a TRICS NeXus file and retrieves a frame for the
-  specified detector from it. This is a special feature for the 
-  status display.
-  ---------------------------------------------------------------------------*/
-  static int NexusGetFrame(SConnection *pCon, pNexTrics self, 
-                           int iDetector, int iFrame)
-  {
-      char pBueffel[132];
-      int iRet;
-      NXhandle hfil;
-      HistInt *lData = NULL;
-
-      /* do a few range checks */
-      if(iDetector < 1 || iDetector > 3)
-      {
-	sprintf(pBueffel,"ERROR: unknown detector %d requested",iDetector);
-        return 0; 
-      }
-      if(iFrame < 0 || iFrame >= self->iFrameNum)
-      {
-	sprintf(pBueffel,"ERROR: farme %d not yet written",iDetector);
-        return 0; 
-      }
-
-      /* open file */
-      iRet = NXopen(self->pCurrentFile,NXACC_READ,&hfil);
-      if(iRet != NX_OK)
-      {
-        sprintf(pBueffel,"ERROR: cannot open %s",self->pCurrentFile);
-        SCWrite(pCon,pBueffel,eError);
-        return 0;
-      }       
-
-      /* open groups */
-      sprintf(pBueffel,"frame%4.4d",iFrame);
-      iRet = NXopengroup(hfil,pBueffel,"NXentry");
-      if(iRet != NX_OK)
-      {
-	  sprintf(pBueffel,"ERROR: frame %d not found in %s",iFrame, 
-		  self->pCurrentFile);
-          SCWrite(pCon,pBueffel,eError);
-          NXclose(&hfil);
-          return 0;
-      }
-      sprintf(pBueffel,"detector%1.1d",iDetector);
-      iRet = NXopengroup(hfil,pBueffel,"NXdata");
-      if(iRet != NX_OK)
-      {
-	  sprintf(pBueffel,"ERROR: detector %d not found in %s",iFrame, 
-		  self->pCurrentFile);
-          SCWrite(pCon,pBueffel,eError);
-          NXclose(&hfil);
-          return 0;
-      }
-      iRet = NXopendata(hfil,"counts");
-      if(iRet != NX_OK)
-      {
-          SCWrite(pCon,"ERROR: no counts found, file corrupted",eError);
-          NXclose(&hfil);
-          return 0;
-      }
-
-      /* read data */
-      lData = (HistInt *)malloc(DET1X*DET1Y*sizeof(HistInt));
-      if(!lData)
-      {
-	SCWrite(pCon,"ERROR: out of memory in NexusGetFrame",eError);
-        NXclose(&hfil);
-        return 0;
-      }   
-      memset(lData,0,DET1X*DET1Y*sizeof(HistInt));
-      iRet = NXgetdata(hfil,lData);
-      if(iRet != NX_OK)
-      {
-          SCWrite(pCon,"ERROR: failed to read data",eError);
-          NXclose(&hfil);
-          return 0;
-      }
-
-      /* send it */
-      sprintf(pBueffel,"detector%1.1d",iDetector);
-      SCWriteZipped(pCon,pBueffel,lData,DET1X*DET1Y*sizeof(HistInt));
-
-      /* clean up */
-      NXclose(&hfil);
-      free(lData);
-      return 1;
-  } 
-/*---------------------------------------------------------------------------*/
-  int NexTricsAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-                     int argc, char *argv[])
-  {
-      pNexTrics self;
-      char pBueffel[1024];
-      int iRet, iDet, iFrame;
-      long lID;
-      
-      self = (pNexTrics)pData;
-      assert(self);
-      assert(pCon);
-      
-      /* check for subcommands */
-      if(argc < 2)
-      {
-        sprintf(pBueffel,"ERROR: no subcommand found for %s",argv[0]);
-        SCWrite(pCon,pBueffel,eError);
-        return 0;
-      }
-
-       /* install an error handler */
-       NXMSetError((void *)pCon,SNError); 
-      
-      strtolower(argv[1]);
-      if(strcmp(argv[1],"start") == 0)
-      {
-         if(!SCMatchRights(pCon,usUser))
-         {
-           return 0;
-         }
-         iRet = StartFile(self,pCon);
-         if(iRet)
-         {
-           SCSendOK(pCon);
-         }
-         return iRet;
-      }
-      else if(strcmp(argv[1],"file") == 0)
-      {
-        sprintf(pBueffel,"Currently writing to: %s",self->pCurrentFile);
-        SCWrite(pCon,pBueffel,eValue);
-        return 1; 
-      }
-      else if(strcmp(argv[1],"oldframe") == 0)
-      {
-        if(argc < 4)
-	{
-	  SCWrite(pCon,"ERROR: insufficient number of arguments to oldframe",
-          eError);
-          return 0;
-        }
-        iDet = atoi(argv[2]);
-        iFrame = atoi(argv[3]);
-        iRet = NexusGetFrame(pCon,self,iDet, iFrame);
-        return 1; 
-      }
-      else if(strcmp(argv[1],"interest") == 0)
-      {
-        lID = RegisterCallback(self->pCall, NEWFRAME, FrameInterest,
-                                                    pCon, NULL);
-        SCRegister(pCon,pSics, self->pCall,lID);
-        SCSendOK(pCon);
-        return 1; 
-      }
-      else if(strcmp(argv[1],"framenum") == 0)
-      {
-        sprintf(pBueffel,"framenumber = %d",self->iFrameNum);
-        SCWrite(pCon,pBueffel,eValue);
-        return 1; 
-      }
-      else if(strcmp(argv[1],"dumpframe") == 0)
-      {
-         if(!SCMatchRights(pCon,usUser))
-         {
-           return 0;
-         }
-         iRet = DumpFrame(self,pCon);
-         if(iRet)
-         {
-           SCSendOK(pCon);
-         }
-         return iRet;
-      }
-      else if(strcmp(argv[1],"reopen") == 0)
-      {
-         if(!SCMatchRights(pCon,usUser))
-         {
-           return 0;
-         }
-         if(argc < 3)
-         {
-           SCWrite(pCon,"ERROR: expected filename as parameter for reopen",eError);
-           return 0;
-         }
-         iRet = ReopenFile(self,argv[2]);
-         if(iRet)
-         {
-           SCSendOK(pCon);
-         }
-         return iRet;
-      }
-      sprintf(pBueffel,"ERROR: subcommand %s not recognized",argv[1]);
-      SCWrite(pCon,pBueffel,eError);
-      return 0;
-  }                                                                   
-
-
diff --git a/nextrics.h b/nextrics.h
deleted file mode 100644
index 9287c09a..00000000
--- a/nextrics.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-/*----------------------------------------------------------------------------
-                           N E X T R I C S
- 
-  An object for writing NeXus data files for the four ciclre diffractometer
-  TRICS at PSI. Can be used as basis for writing files for other four
-  circles equiped with a PSD as well.
-
-  copyright: see copyright.h
-
-  Mark Koennecke, April 1998
-------------------------------------------------------------------------------*/
-#ifndef NEXTRICS
-#define NEXTRICS
-
-    typedef struct __NexTrics *pNexTrics;
-
-/*----------------------------- live & death -----------------------------*/
-  pNexTrics CreateNexTrics(pDataNumber pNum, char *pRoot, char *pDict,
-                           SicsInterp *pSics);
-  void      DeleteNexTrics(void *pData);
-
-  int NexTricsFactory(SConnection *pCon, SicsInterp *pSics, void *pData,
-                      int argc, char *argv[]);
-/*----------------------------- interaction ------------------------------*/
-
-  int StartFile(pNexTrics self, SConnection *pCon);
- 
-  int ReopenFile(pNexTrics self, char *filename);
-
-  int DumpFrame(pNexTrics self, SConnection *pCon);
-
-  int NexTricsAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-                      int argc, char *argv[]);
- 
-
-#endif
diff --git a/nserver.c b/nserver.c
index 6d5b9d89..53d6a43f 100644
--- a/nserver.c
+++ b/nserver.c
@@ -33,6 +33,7 @@
 #include "nread.h"
 #include "ofac.h"
 #include "telnet.h"
+#include "site.h"
 #include "nserver.h"
 
   int ServerSetupInterrupt(int iPort, pNetRead pNet, pTaskMan pTasker);
@@ -290,6 +291,7 @@
     char pBueffel[512];
     char *pText = NULL;
     SConnection *pCon = NULL;
+    pSite site = NULL;
 
     /* clear all pending bullshit */
     ClearExecutor(self->pExecutor);
@@ -359,6 +361,15 @@
     /* close the List system */
     LLDsystemClose();
 
+    /*
+      kill the site data structure
+    */
+    site = getSite();
+    if(site != NULL)
+    {
+      site->KillSite(site);
+    }
+
     /* make fortify print his findings */
      Fortify_DumpAllMemory(iFortifyScope);
      Fortify_LeaveScope();
diff --git a/nxamor.c b/nxamor.c
deleted file mode 100644
index 93cefbae..00000000
--- a/nxamor.c
+++ /dev/null
@@ -1,835 +0,0 @@
-/*--------------------------------------------------------------------------
-         
-                             N X A M O R
-
-  Routines for writing NeXus files for the reflectometer AMOR at PSI.
-
-  copyright: see copyright.h
-
-
-  Mark Koennecke, September 1999
-  Updated, Mark Koennecke, August 2001
-  Updated to store TOF-monitor, Mark Koennecke, September 2002
---------------------------------------------------------------------------*/
- 
-#include <stdlib.h>
-#include <assert.h>
-#include "fortify.h"
-#include "sics.h"
-#include "nxdict.h"
-#include "nxutil.h"
-#include "scan.h"
-#include "scan.i"
-#include "HistMem.h"
-#include "counter.h"
-#include "nxamor.h"
-#include "obpar.h"
-#include "motor.h"
-#include "status.h"
-
-#define MAXMOT 13 /* must be same as in amor2t.c */
-#include "amor2t.i"
-#include "amor2t.h"
-
-/* some defines for some names */
-#define AMORDICT "amor.dic"
-#define INSTNAME "AMOR at SINQ, PSI"
-#define SOURCENAME "Spallation source SINQ"
-#define SOURCETYPE "Continous flux spallation source"
-#define CHOPPERNAME "Dornier Chopper System"
-
-/*
-  The rough size of each detector chunk to write in TOF mode
-  (currently 16MB)
-#define TOFBLOCK 8192000
-*/
-#define TOFBLOCK 16384000
-
-/*
-  a pointer to amor2t which we need for a couple of parameters
-*/
-pAmor2T pAmor = NULL;
-
-/*
-  if to save psd data in TOF mode or not. This is in order to save time
-  when measureing TOF with a single detector only.
-*/
-
-static int psdSave = 1;
-
-/*------------------------------------------------------------------------*/
-  static void WriteDiaphragm(NXhandle hfil, NXdict hdict, int i, 
-                             SConnection *pCon)
-  {
-    char pThing[30];
-
-
-    sprintf(pThing,"d%1.1dt",i);
-    SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,pThing,pThing);
-    sprintf(pThing,"d%1.1db",i);
-    SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,pThing,pThing);
-    sprintf(pThing,"d%1.1dl",i);
-    SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,pThing,pThing);
-    sprintf(pThing,"d%1.1dr",i);
-    SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,pThing,pThing);
-  }
-/*----------------------------------------------------------------------*/
-  int WriteAmorHeader(char *file, SConnection *pCon)
-  {
-       NXhandle hfil;
-       NXdict hdict;
-       int iRet;
-       char pBueffel[512], pThing[80];
-       CounterMode eMode;
-       CommandList *pCom = NULL;
-       float fVal;
-
-       /* open files */
-       NXsetcache(TOFBLOCK);
-       iRet = NXopen(file,NXACC_CREATE5,&hfil);
-       if(iRet != NX_OK)
-       {
-	   sprintf(pBueffel,"ERROR: cannot open file %s for writing",file);
-           SCWrite(pCon,pBueffel,eError);
-           return 0;
-       }
-       iRet = NXDinitfromfile(AMORDICT,&hdict);
-       if(iRet != NX_OK)
-       {
-	   sprintf(pBueffel,"ERROR: cannot open dictionary file %s",AMORDICT);
-           SCWrite(pCon,pBueffel,eError);
-           return 0;
-       }
- 
-       /* put some global information */
-       SNXSPutGlobals(hfil,file,"AMOR",pCon);
-       SNXSPutVariable(pServ->pSics,pCon,hfil, hdict,"etitle","title");
-       SNXFormatTime(pBueffel,512);
-       NXDputalias(hfil,hdict,"estart",pBueffel);
-
-       /* instrument vGroup */
-       NXDputalias(hfil,hdict,"iname",INSTNAME);
-
-       /* source */
-       NXDputalias(hfil,hdict,"sname",SOURCENAME);
-       NXDputalias(hfil,hdict,"stype",SOURCETYPE);
-
-       /* chopper */
-       NXDputalias(hfil,hdict,"cname",CHOPPERNAME);
-       SNXSPutVariable(pServ->pSics,pCon,hfil, hdict,"crot",
-                       "chopperrotation");
-
-       /* frame overlap mirror */
-       SNXSPutVariable(pServ->pSics,pCon,hfil, hdict,"fomname",
-                       "fomname");
-       SNXSPutVariable(pServ->pSics,pCon,hfil, hdict,"fodist",
-                       "fomdist");
-       SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,"fomh","ftz");
-       SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,"fomom","fom");
-
-       /* first Diaphragm */
-       WriteDiaphragm(hfil,hdict,1,pCon);
-       sprintf(pThing,"d%1.1ddist",1);
-       SNXSPutVariable(pServ->pSics,pCon,hfil, hdict,pThing,pThing);
-
-       /* polarizing, monochromating mirror */
-       SNXSPutVariable(pServ->pSics,pCon,hfil, hdict,"polname",
-                       "polname");
-       SNXSPutVariable(pServ->pSics,pCon,hfil, hdict,"poldist",
-                       "poldist");
-       SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,"polz","moz");
-       SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,"polom","mom");
-       SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,"poly","mty");
-       SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,"polzom","mtz");
-
-       /* second Diaphragm */
-       WriteDiaphragm(hfil,hdict,2,pCon);
-       sprintf(pThing,"d%1.1ddist",2);
-       SNXSPutVariable(pServ->pSics,pCon,hfil, hdict,pThing,pThing);
-
-       /* third Diaphragm */
-       WriteDiaphragm(hfil,hdict,3,pCon);
-       sprintf(pThing,"d%1.1ddist",3);
-       SNXSPutVariable(pServ->pSics,pCon,hfil, hdict,pThing,pThing);
-
-       /* sample table */
-       SNXSPutVariable(pServ->pSics,pCon,hfil, hdict,"saname",
-                       "sample");
-       SNXSPutVariable(pServ->pSics,pCon,hfil, hdict,"stdist",
-                       "sampledist");
-       SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,"somheight","stz");
-       SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,"schi","sch");
-       SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,"somega","som");
-       SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,"stheight","soz");
-       fVal = ObVal(pAmor->aParameter,PARDH);
-       NXDputalias(hfil,hdict,"baseheight",&fVal);
-       
-
-       /* fourth Diaphragm */
-       WriteDiaphragm(hfil,hdict,4,pCon);
-       fVal = ObVal(pAmor->aParameter,PARDD4);
-       NXDputalias(hfil,hdict,"d4dist",&fVal);
-       fVal = ObVal(pAmor->aParameter,PARD4H);
-       NXDputalias(hfil,hdict,"d4base",&fVal);
-      
-       /* analyzer */
-       SNXSPutVariable(pServ->pSics,pCon,hfil, hdict,"anname",
-                       "ananame");
-       SNXSPutVariable(pServ->pSics,pCon,hfil, hdict,"andist",
-                       "anadist");
-       SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,"anoz","atz");
-       SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,"anom","aom");
-       SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,"antz","aoz");
-       fVal = ObVal(pAmor->aParameter,PARADIS);
-       NXDputalias(hfil,hdict,"adis",&fVal);
-       fVal = ObVal(pAmor->aParameter,PARANA);
-       NXDputalias(hfil,hdict,"abase",&fVal);
-
-
-       /* fifth Diaphragm!!!!!!!!! */
-       WriteDiaphragm(hfil,hdict,5,pCon);
-       fVal = ObVal(pAmor->aParameter,PARDD5);
-       NXDputalias(hfil,hdict,"d5dist",&fVal);
-       fVal = ObVal(pAmor->aParameter,PARD5H);
-       NXDputalias(hfil,hdict,"d5base",&fVal);
-       
-       /* counting data */
-       pCom = FindCommand(pServ->pSics,"counter");
-       if(pCom)
-       {
-         if(pCom->pData)
-	 {
-            eMode = GetCounterMode((pCounter)pCom->pData);
-            if(eMode == eTimer)
-            {
-              strcpy(pBueffel,"timer");
-            }           
-            else
-            {
-              strcpy(pBueffel,"monitor");
-            }
-            NXDputalias(hfil,hdict,"cnmode",pBueffel);
-            fVal = GetCounterPreset((pCounter)pCom->pData);
-            NXDputalias(hfil,hdict,"cnpreset",&fVal);
-	 }       
-       }
-       else
-       {
-           SCWrite(pCon,"WARNING: failed to find counter!",eWarning);
-       }
-       NXclose(&hfil);
-       NXDclose(hdict,NULL);
-
-       return 1;      
-  }
-/*------------------------------------------------------------------------*/
-  int WriteAmorScan(char *file, SConnection *pCon, pScanData pScan)
-  {
-       NXhandle hfil;
-       NXdict hdict;
-       int iRet, i;
-       char pBueffel[512], pDefinition[1024];
-       CommandList *pCom = NULL;
-       float fVal;
-       float *fAxis = NULL;
-       long *lData  = NULL;
-       int  *iData  = NULL;
-
-       /* open files */
-       iRet = NXopen(file,NXACC_RDWR,&hfil);
-       if(iRet != NX_OK)
-       {
-	   sprintf(pBueffel,"ERROR: cannot open file %s for writing",file);
-           SCWrite(pCon,pBueffel,eError);
-           return 0;
-       }
-       iRet = NXDinitfromfile(AMORDICT,&hdict);
-       if(iRet != NX_OK)
-       {
-	   sprintf(pBueffel,"ERROR: cannot open dictionary file %s",AMORDICT);
-           SCWrite(pCon,pBueffel,eError);
-           return 0;
-       }
-
-
-       /* allocate memory for writing scan data */
-       fAxis = (float *)malloc(pScan->iNP*sizeof(float));       
-       lData = (long *)malloc(pScan->iNP*sizeof(long));
-       iData = (int *)malloc(pScan->iNP*sizeof(int));
-       if( (!fAxis) || (!lData) || (!iData) )
-       {
-          SCWrite(pCon,"ERROR: out of memory in WriteAmorScan",eError);
-          return 0;
-       }       
-       memset(fAxis,0,pScan->iNP*sizeof(float));
-       memset(lData,0,pScan->iNP*sizeof(long));
-       memset(iData,0,pScan->iNP*sizeof(int));
-
-       /* write scan variables */
-       for(i = 0; i < pScan->iScanVar; i++)
-       {
-	 /* build definition string */
-          NXDget(hdict,"scanroot",pBueffel, 512);
-          strcpy(pDefinition,pBueffel);
-          strcat(pDefinition,"  ");
-          GetScanVarName(pScan,i,pBueffel,512);
-          strcat(pDefinition,pBueffel);
-          sprintf(pBueffel," -rank 1 -dim {%d} ", pScan->iNP);
-          strcat(pDefinition,pBueffel);
-          if(i == 0)
-          {
-            strcat(pDefinition," -attr {axis,1}");
-          }
-          /* get data and write */
-          GetScanVar(pScan,i,fAxis,pScan->iNP);
-          NXDputdef(hfil,hdict,pDefinition,fAxis);
-          if(i == 0)
-          {
-             NXDget(hdict,"sdana",pBueffel,512);
-             NXDdeflink(hfil,hdict,pBueffel,pDefinition);
-          }
-       }
-
-       /* 
-          Write counted data: Here there is a convention which has to be
-          valid in amorscan as well:  GetCounts gets the main detector.
-          GetMonitor 0 the second detector, GetMonitor 1 the first detector
-          other spin, GetMonitor 2, the second detector the other spin,
-          getMonitor 3, the first monitor, getMonitor 4 the second monitor
-        */
-       sprintf(pBueffel,"%d",pScan->iNP);
-       NXDupdate(hdict,"scanlength",pBueffel);
-       GetScanCounts(pScan,lData,pScan->iNP);
-       for(i = 0; i < pScan->iNP; i++)
-       {
-          iData[i] = (int)lData[i];
-       }
-       NXDputalias(hfil,hdict, "spinupup",iData);
-       NXDaliaslink(hfil,hdict,"sdana","spinupup");
-       GetScanMonitor(pScan,0,lData,pScan->iNP);
-       for(i = 0; i < pScan->iNP; i++)
-       {
-          iData[i] = (int)lData[i];
-       }
-       NXDputalias(hfil,hdict, "spinuplo",iData);
-       NXDaliaslink(hfil,hdict,"sdana","spinuplo");
-
-       /* monitors */
-       GetScanMonitor(pScan,3,lData,pScan->iNP);
-       for(i = 0; i < pScan->iNP; i++)
-       {
-          iData[i] = (int)lData[i];
-       }
-       NXDputalias(hfil,hdict, "smonitor1",iData);
-       GetScanMonitor(pScan,4,lData,pScan->iNP);
-       for(i = 0; i < pScan->iNP; i++)
-       {
-          iData[i] = (int)lData[i];
-       }
-       NXDputalias(hfil,hdict, "smonitor2",iData);
-
-       /* to be added: polarizing mode, possibly coz, cox, com etc. */
-              
-       /* a few motors which may or may not be useful */
-       SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,"sdetx","cox");
-       SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,"sdetom","com");
-       SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,"sdetheight","coz");
-       
-       /* close and go */
-       NXclose(&hfil);
-       NXDclose(hdict,NULL);
-       free(fAxis);
-       free(lData);
-       free(iData); 
-
-       return 1;      
-  }
-/*-----------------------------------------------------------------------
-  WriteTOFDetector writes the histogram memory data in TOF mode. As 
-  the histogram memory can become quite large at AMOR, the data is
-  read and stored in chunks if it is to big. All this is handled
-  in this routine.
-  -------------------------------------------------------------------------*/
-static int WriteTOFDetector(char *name, pHistMem pHM, int *iDim,
-                            NXhandle hfil, NXdict hdict, 
-                            SConnection *pCon)
-{
-  int iLength, nChunk, chunkSize, iChunk[3], i, iStart[3], nTime, iRet;
-  HistInt *lData = NULL;
-  char pBueffel[132];
-  const float *fTime;
-
-  fTime = GetHistTimeBin(pHM,&nTime);
-  iDim[2] = nTime;
-  iLength = iDim[0]*iDim[1]*iDim[2];
-  if( (iLength*4) < TOFBLOCK)
-  {
-     sprintf(pBueffel," -chunk {%d,%d,%d} ",iDim[0], iDim[1], iDim[2]);
-     NXDupdate(hdict,"chunk",pBueffel);
-     lData = (HistInt *)malloc(iLength*sizeof(HistInt));
-     if(!lData)
-     {
-	 SCWrite(pCon,
-		    "ERROR: out of memory, failed to write histogram",eError);
-	 SCSetInterrupt(pCon,eAbortBatch);
-		 return 0;
-      }
-      memset(lData,0,iLength*sizeof(HistInt));
-      iRet = GetHistogramDirect(pHM,pCon, 
-		 0,0,iLength,lData,iLength*sizeof(HistInt));
-      if(!iRet)
-      {
-	SCWrite(pCon,"ERROR: failed to read Hm data",eError);
-	SCSetInterrupt(pCon,eAbortBatch);
-	free(lData);
-	return 0;
-      }
-      NXDputalias(hfil,hdict,name,lData);
-      NXDputalias(hfil,hdict,"detchunk",iDim);
-      NXDaliaslink(hfil,hdict,"dana",name);
-  }
-  else
-  {
-    /*
-      implement chunked writing. We strive to write layers in Y. The 
-      number of chunks needs to fulfill three conditions then:
-      - multiple of xSize* timeBin;
-      - close to TOFBLOCK in size
-      - divide Y without remainder. 
-    */
-    iChunk[0] = iDim[0];
-    iChunk[2] = iDim[2];
-    iChunk[1] = 1;
-    chunkSize = iDim[0]*iDim[2];
-    for(i = 1; i < 64; i++)
-    {
-      if( (iDim[1] % i) == 0)
-      {
-	if(i*chunkSize*sizeof(HistInt) < TOFBLOCK)
-	{
-	  iChunk[1] = i;
-        }
-      }
-    }
-    sprintf(pBueffel,"Segmented TOF data in %d chunks",iDim[1]/iChunk[1]);
-    SCWrite(pCon,pBueffel,eWarning);
-    /*
-       now we have a chunkSize, lets go and write!
-    */
-    NXDputalias(hfil,hdict,"detchunk",iChunk);
-    chunkSize = iChunk[1]*iChunk[0]*iChunk[2];
-    sprintf(pBueffel," -chunk {%d,%d,%d} ",iChunk[0], iChunk[1], iChunk[2]);
-    NXDupdate(hdict,"chunk",pBueffel);
-    lData = (HistInt *)malloc(chunkSize*sizeof(HistInt));
-    if(!lData)
-    {
-      SCWrite(pCon,"ERROR: out of memory while writing TOF data",
-	      eError);
-      SCSetInterrupt(pCon,eAbortBatch);
-      return 0;
-    }
-    NXDopenalias(hfil,hdict,name);
-    for(i = 0; i < iDim[1]/iChunk[1]; i++)
-    {
-      memset(lData,0,chunkSize*sizeof(HistInt));
-      iRet = GetHistogramDirect(pHM,pCon, 
-		 0,i*chunkSize,(i+1)*chunkSize,lData,
-			 chunkSize*sizeof(HistInt));
-      if(!iRet)
-      {
-	SCWrite(pCon,"ERROR: failed to read HM data",eError);
-	SCSetInterrupt(pCon,eAbortBatch);
-	free(lData);
-	return 0;
-      }
-      /*
-	yield a little in order to allow other clients to receive a
-        response. Also allow for interrupting.
-      */
-      SicsWait(2);
-      if(SCGetInterrupt(pCon) != eContinue)
-      {
-	SCWrite(pCon,
-		"ERROR: dataset writing interrupted, data probably corrupted",
-		eError);
-	return 0;
-      }
-
-      iStart[0] = 0;
-      iStart[1] = i*iChunk[1];
-      iStart[2] = 0;
-      NXputslab(hfil,lData,iStart, iChunk);
-      sprintf(pBueffel,"Wrote chunk %d", i);
-      SCWrite(pCon,pBueffel,eWarning);
-      /*
-	yield a little in order to allow other clients to receive a
-        response. Also allow for interrupting.
-      */
-      SicsWait(2);
-      if(SCGetInterrupt(pCon) != eContinue)
-      {
-	SCWrite(pCon,
-		"ERROR: dataset writing interrupted, data probably corrupted",
-		eError);
-	return 0;
-      }
-    }
-    /*
-     close groups till root
-    */
-    NXclosedata(hfil);
-    NXclosegroup(hfil);
-    NXclosegroup(hfil);
-    NXclosegroup(hfil);
-
-    /*
-      make link
-    */
-    NXDaliaslink(hfil,hdict,"dana",name);
-    NXDaliaslink(hfil,hdict,"dana","detchunk");
-
-  }
-    if(lData)
-      free(lData);
-    return 1;
-}
-/*-----------------------------------------------------------------------*/
-  int WriteAmorTOF(char *file, SConnection *pCon, pHistMem pHM)
-  {
-       NXhandle hfil;
-       NXdict hdict;
-       int iRet, i, iLength;
-       char pBueffel[512];
-       float fVal, *fAxis = NULL, *fTime2 = NULL;
-       CommandList *pCom = NULL;
-       const float *fTime;
-       HistInt *lData = NULL, lVal;
-       int detxsize, detysize, iDim[MAXDIM]; 
-
-
-       /* open files */
-       iRet = NXopen(file,NXACC_RDWR,&hfil);
-       if(iRet != NX_OK)
-       {
-	   sprintf(pBueffel,"ERROR: cannot open file %s for writing",file);
-           SCWrite(pCon,pBueffel,eError);
-           return 0;
-       }
-       iRet = NXDinitfromfile(AMORDICT,&hdict);
-       if(iRet != NX_OK)
-       {
-	   sprintf(pBueffel,"ERROR: cannot open dictionary file %s",AMORDICT);
-           SCWrite(pCon,pBueffel,eError);
-           return 0;
-       }
-
-
-       /* a few motors which may or may not be useful */
-       SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,"detx","cox");
-       SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,"detom","com");
-       SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,"detheight","coz");
-       
-       /* write counter related stuff */
-       pCom = FindCommand(pServ->pSics,"counter");
-       if(pCom)
-       {
-         if(pCom->pData)
-	 {
-            fVal = GetCountTime((pCounter)pCom->pData,pCon);
-            NXDputalias(hfil,hdict,"cntime",&fVal);
-
-            /* the assignment of monitors has to be checked once
-               the Schlumpf is done
-	    */
-            lVal = GetMonitor((pCounter)pCom->pData,2, pCon);
-            NXDputalias(hfil,hdict,"cnmon1",&lVal);
-            lVal = GetMonitor((pCounter)pCom->pData,3, pCon);
-            NXDputalias(hfil,hdict,"cnmon2",&lVal);
-	 }       
-       }
-       else
-       {
-           SCWrite(pCon,"WARNING: failed to find counter!",eWarning);
-       }
-
-       /*
-          find dimensions of detector
-       */      
-       GetHistDim(pHM,iDim,&iLength);
-       detxsize = iDim[0];
-       detysize = iDim[1];       
-       /* update detector size */
-       sprintf(pBueffel,"%d",detxsize);
-       NXDupdate(hdict,"detxsize",pBueffel);
-       sprintf(pBueffel,"%d",detysize);
-       NXDupdate(hdict,"detysize",pBueffel);
-
-
-       /* write two axis */
-       if(detxsize > detysize)
-	 iLength = detxsize;
-       else
-	 iLength = detysize;
-
-       fAxis = (float *)malloc(iLength*sizeof(float));
-       if(!fAxis)
-       {
-         SCWrite(pCon,"ERROR: out of memory in WriteAmorTOF",eError);
-         return 0;
-       }
-       for(i = 0; i < detxsize; i++)
-       {
-          fAxis[i] = (float)i;
-       }
-       NXDputalias(hfil,hdict,"detxx",fAxis);
-       for(i = 0; i < detysize; i++)
-       {
-          fAxis[i] = (float)i;
-       }
-       NXDputalias(hfil,hdict,"dety",fAxis);
-       NXDaliaslink(hfil,hdict,"dana","detxx");
-       NXDaliaslink(hfil,hdict,"dana","dety");
-       free(fAxis);
-
-
-       /* add height and distances */
-       fVal = ObVal(pAmor->aParameter,PARDS);
-       NXDputalias(hfil,hdict,"detdist",&fVal);
-       fVal = ObVal(pAmor->aParameter,PARDDH);
-       NXDputalias(hfil,hdict,"detbase",&fVal);
-
-
-       /* deal with time binning */
-       fTime = GetHistTimeBin(pHM,&iLength);
-       iDim[2] = iLength;
-       fTime2 = (float *)malloc(iLength*sizeof(float));
-       if(fTime2)
-       {
-           for(i = 0; i < iLength; i++)
-           {
-               fTime2[i] = fTime[i]/10.;
-           }
-           sprintf(pBueffel,"%d",iLength);
-           NXDupdate(hdict,"timebin",pBueffel);
-           NXDputalias(hfil,hdict,"dettime",fTime2);
-  	   NXDputalias(hfil,hdict,"singletime",fTime2);
-           NXDaliaslink(hfil,hdict,"dana","dettime");
-           free(fTime2);
-           fTime2 = NULL;
-       }
-       else
-       {
-          SCWrite(pCon,"ERROR: out of memory while writing time binning",
-                  eError);
-	  SCSetInterrupt(pCon,eAbortBatch);
-	  NXclose(&hfil);
-	  NXDclose(hdict,NULL);
-	  return 0;
-       }
-
-       /* finally get histogram */
-       if(iDim[2] == 2) /* 2D data, no time binning on this detector */
-       {
-          iLength = detxsize*detysize;
-	  lData = (HistInt *)malloc(iLength*sizeof(HistInt));
-	  if(!lData)
-	  {
-	      SCWrite(pCon,
-		 "ERROR: out of memory, failed to write histogram",eError);
-	      NXclose(&hfil);
-	      NXDclose(hdict,NULL);
-	      SCSetInterrupt(pCon,eAbortBatch);
-	      return 0;
-	  }
-	  memset(lData,0,iLength*sizeof(HistInt));
-	  iRet = GetHistogram(pHM,pCon, 0,0,iLength,
-			      lData,iLength*sizeof(HistInt));
-	  if(!iRet)
-	  {
-	    SCWrite(pCon,"ERROR: failed to read HM", eError);
-	    SCSetInterrupt(pCon,eAbortBatch);
-	    NXclose(&hfil);
-	    NXDclose(hdict,NULL);
-	    return 0;
-          }
-	  NXDputalias(hfil,hdict,"spinup2d",lData);
-          NXDaliaslink(hfil,hdict,"dana","spinup2d");
-       }
-       else
-       {
-	 if(psdSave){
-	   iRet = WriteTOFDetector("spinup",pHM, iDim,hfil,hdict,pCon);
-	   if(!iRet)
-	   {
-	     NXclose(&hfil);
-	     NXDclose(hdict,NULL);
-	     return 0;
-           }
-	 } else {
-	   SCWrite(pCon,"PSD writing supressed!",eWarning);
-         }
-#define MAXSINGLE 3
-          /*
-            now get and write single detectors
-	  */
-          iLength = iDim[0]*iDim[1]*iDim[2];
-          lData = (HistInt *)malloc(MAXSINGLE*iDim[2]*sizeof(HistInt));
-	  if(!lData)
-	  {
-            SCWrite(pCon,"ERROR: out of memory while writing single detectors",
-                  eError);
-	    SCSetInterrupt(pCon,eAbortBatch);
-	    NXclose(&hfil);
-	    NXDclose(hdict,NULL);
-	    return 0;
-          }
-	  else
-	  {
-            memset(lData,0,MAXSINGLE*iDim[2]*sizeof(HistInt));
-	    iRet = GetHistogramDirect(pHM,pCon,0,iLength,
-			       iLength + MAXSINGLE*iDim[2], 
-                             lData, MAXSINGLE*iDim[2]*sizeof(HistInt));
-	    if(!iRet)
-	    {
-	      SCWrite(pCon,"ERROR: failed to read single detector HM data",
-		      eError);
-	      SCSetInterrupt(pCon,eAbortBatch);
-	      free(lData);
-	      NXclose(&hfil);
-	      NXDclose(hdict,NULL);
-	      return 0;
-            }
-	    NXDputalias(hfil,hdict,"singleup",lData);
-            NXDaliaslink(hfil,hdict,"singledana","singleup");
-            NXDaliaslink(hfil,hdict,"singledana","singletime");
-	    /*
-	      the TOF monitor
-	    */
-	    NXDputalias(hfil,hdict,"singletofmon",lData+2*iDim[2]);
-            NXDaliaslink(hfil,hdict,"dana","singletofmon");
-            NXDaliaslink(hfil,hdict,"singledana","singletofmon");
-          }
-       }
-
-       /* to do: add polarizing code */
-
-       if(lData)
-           free(lData);
-
-       NXclose(&hfil);
-       NXDclose(hdict,NULL);
-
-       return 1;      
-  }
-/*-----------------------------------------------------------------------*/
-  static pHistMem pMeme = NULL;
-
-  int AmorStore(SConnection *pCon, SicsInterp *pSics, void *pData, 
-                int argc, char *argv[])
-  {
-     char pBueffel[512], *pFile = NULL;
-     int iRet, iFlag;
-     Status oldStatus;
-     
-     /* 
-	if arguments, check for psdsave
-     */
-     if(argc > 1){
-       strtolower(argv[1]);
-       if(strcmp(argv[1],"psdsave") == 0){
-	 if(argc > 2){
-	   psdSave = atof(argv[2]);
-	   SCSendOK(pCon);
-	   return 1;
-	 } else {
-	   sprintf(pBueffel,"storeamor.psdSave  = %d",psdSave);
-	   SCWrite(pCon,pBueffel,eValue);
-	   return 1;
-	 }
-       }
-     }
-
-
-     pFile = SNXMakeFileName(pSics,pCon);
-     sprintf(pBueffel,"Writing file %s .....",pFile);
-     SCWrite(pCon,pBueffel,eWarning);
-     
-     oldStatus = GetStatus();
-     SetStatus(eWriting);
-     LockDeviceExecutor(pServ->pExecutor);
-     iRet =  WriteAmorHeader(pFile,pCon);
-     if(iRet)
-     {
-        iRet = WriteAmorTOF(pFile,pCon,pMeme);
-     }
-     SetStatus(oldStatus);
-     UnlockDeviceExecutor(pServ->pExecutor);
-     free(pFile);
-     SCSendOK(pCon);
-     return iRet;
-  }      
-/*---------------------------------------------------------------------*/
-  int AmorStoreMake(SConnection *pCon, SicsInterp *pSics, void *pData, 
-                int argc, char *argv[])
-  {
-     CommandList *pCom = NULL;
-     char pBueffel[512];
-     int iRet;
-
-     if(argc < 3)
-     {
-        SCWrite(pCon,
-         "ERROR: insufficient number of arguments to AmorStoreMake",
-          eError);
-        return 0;
-     }
-
-     /* we need a parameter which is the name of the histogram memory*/
-     pCom = FindCommand(pServ->pSics,argv[1]);
-     if(!pCom)
-     {
-       sprintf(pBueffel,"ERROR: Histogram memory %s NOT found", argv[1]);
-       SCWrite(pCon,pBueffel,eError);
-       return 0;
-     }
-     if(!pCom->pData)
-     {
-       sprintf(pBueffel,"ERROR: Histogram memory %s NOT found", argv[1]);
-       SCWrite(pCon,pBueffel,eError);
-       return 0;
-     }
-     pMeme = (pHistMem)pCom->pData;
-
-     /* we need another  parameter which is the name of the 
-        2theta calculation module
-     */
-     pCom = FindCommand(pServ->pSics,argv[2]);
-     if(!pCom)
-     {
-       sprintf(pBueffel,"ERROR: amor2T module %s NOT found", argv[2]);
-       SCWrite(pCon,pBueffel,eError);
-       return 0;
-     }
-     if(!pCom->pData)
-     {
-       sprintf(pBueffel,"ERROR: amor2t module %s NOT found", argv[2]);
-       SCWrite(pCon,pBueffel,eError);
-       return 0;
-     }
-     pAmor = (pAmor2T)pCom->pData;
-
-
-     /* install command */
-     iRet = AddCommand(pSics,"storeamor",
-                        AmorStore,NULL,NULL);
-     if(!iRet)
-     {
-         sprintf(pBueffel,"ERROR: duplicate command amorstore NOT created");
-         SCWrite(pCon,pBueffel,eError);
-         return 0;
-     }
-     return 1;
-  }      
-
-
-
diff --git a/nxamor.h b/nxamor.h
deleted file mode 100644
index ac115ffd..00000000
--- a/nxamor.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-/*------------------------------------------------------------------------
-                              N X A M O R
-
- Some routines for writing NeXus files for the reflectometer AMOR at
- SINQ.
- 
- copyright: see copyright.h
-
- Mark Koennecke, September 1999
-----------------------------------------------------------------------*/
-#ifndef NXAMOR
-#define NXAMOR
-
-   int WriteAmorHeader(char *file, SConnection *pCon);
-
-   int WriteAmorScan(char *file, SConnection *pCon, pScanData pScan);
-
-   int WriteAmorTOF(char *file, SConnection *pCon, pHistMem pHM);
-
-   int AmorStore(SConnection *pCon, SicsInterp *pSics, void *pData,
-                 int argc, char *argv[]);
-   int AmorStoreMake(SConnection *pCon, SicsInterp *pSics, void *pData,
-                 int argc, char *argv[]);
-
-
-#endif
diff --git a/nxamor.tex b/nxamor.tex
deleted file mode 100644
index 3a3cb33e..00000000
--- a/nxamor.tex
+++ /dev/null
@@ -1,69 +0,0 @@
-\subsection{AMOR NeXus Routines}
-This module implements a few functions for writing NeXus data files
-for the  reflectoemter AMOR at SINQ, PSI. Nothing very exciting here:
-this is mostly boring repetetive code. Three functions are defined:
-
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap1}
-$\langle$namor {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@   int WriteAmorHeader(char *file, SConnection *pCon);@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@   int WriteAmorScan(char *file, SConnection *pCon, pScanData pScan);@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@   int WriteAmorTOF(char *file, SConnection *pCon, pHistMem pHM);@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@   int AmorStore(SConnection *pCon, SicsInterp *pSics, void *pData,@\\
-\mbox{}\verb@                 int argc, char *argv[]);@\\
-\mbox{}\verb@   int AmorStoreMake(SConnection *pCon, SicsInterp *pSics, void *pData,@\\
-\mbox{}\verb@                 int argc, char *argv[]);@\\
-\mbox{}\verb@@\\
-\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{description}
-\item[WriteAmorHeader] writes all the AMOR header information and the
-zillions of motors. 
-\item[WriteAmorScan] writes data when AMOR was operated in scanning
-mode.
-\item[WriteAmorTOF] writes AMOR data when used with the PSD in
-time-of-flight mode.
-\item[AmorStore] the command function implementing  the storeamor 
- command.
-\item[AmorStoreMake] the initialization function which creates the
- storeamor command.
-\end{description}
-
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap2}
-\verb@"nxamor.h"@ {\footnotesize ? }$\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@/*------------------------------------------------------------------------@\\
-\mbox{}\verb@                              N X A M O R@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@ Some routines for writing NeXus files for the reflectometer AMOR at@\\
-\mbox{}\verb@ SINQ.@\\
-\mbox{}\verb@ @\\
-\mbox{}\verb@ copyright: see copyright.h@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@ Mark Koennecke, September 1999@\\
-\mbox{}\verb@----------------------------------------------------------------------*/@\\
-\mbox{}\verb@#ifndef NXAMOR@\\
-\mbox{}\verb@#define NXAMOR@\\
-\mbox{}\verb@@$\langle$namor {\footnotesize ?}$\rangle$\verb@@\\
-\mbox{}\verb@#endif@\\
-\mbox{}\verb@@$\diamond$
-\end{list}
-\vspace{-2ex}
-\end{minipage}\\[4ex]
-\end{flushleft}
diff --git a/nxamor.w b/nxamor.w
deleted file mode 100644
index 5feab3a5..00000000
--- a/nxamor.w
+++ /dev/null
@@ -1,48 +0,0 @@
-\subsection{AMOR NeXus Routines}
-This module implements a few functions for writing NeXus data files
-for the  reflectoemter AMOR at SINQ, PSI. Nothing very exciting here:
-this is mostly boring repetetive code. Three functions are defined:
-
-@d namor @{
-   int WriteAmorHeader(char *file, SConnection *pCon);
-
-   int WriteAmorScan(char *file, SConnection *pCon, pScanData pScan);
-
-   int WriteAmorTOF(char *file, SConnection *pCon, pHistMem pHM);
-
-   int AmorStore(SConnection *pCon, SicsInterp *pSics, void *pData,
-                 int argc, char *argv[]);
-   int AmorStoreMake(SConnection *pCon, SicsInterp *pSics, void *pData,
-                 int argc, char *argv[]);
-
-@} 
-
-\begin{description}
-\item[WriteAmorHeader] writes all the AMOR header information and the
-zillions of motors. 
-\item[WriteAmorScan] writes data when AMOR was operated in scanning
-mode.
-\item[WriteAmorTOF] writes AMOR data when used with the PSD in
-time-of-flight mode.
-\item[AmorStore] the command function implementing  the storeamor 
- command.
-\item[AmorStoreMake] the initialization function which creates the
- storeamor command.
-\end{description}
-
-@o nxamor.h @{
-/*------------------------------------------------------------------------
-                              N X A M O R
-
- Some routines for writing NeXus files for the reflectometer AMOR at
- SINQ.
- 
- copyright: see copyright.h
-
- Mark Koennecke, September 1999
-----------------------------------------------------------------------*/
-#ifndef NXAMOR
-#define NXAMOR
-@<namor@>
-#endif
-@}
\ No newline at end of file
diff --git a/nxdict.c b/nxdict.c
index 78018c9f..ae2126a9 100644
--- a/nxdict.c
+++ b/nxdict.c
@@ -37,7 +37,7 @@
 #include <mfhdf.h>
 #include "fortify.h"
 #include "lld.h"
-#include "../napi.h"
+#include "napi.h"
 #include "stringdict.h"
 #include "dynstring.h"
 #include "nxdict.h"
diff --git a/nxsans.c b/nxsans.c
deleted file mode 100644
index 3cb67a4c..00000000
--- a/nxsans.c
+++ /dev/null
@@ -1,796 +0,0 @@
-/*--------------------------------------------------------------------------
-                      N X S A N S
-                      
-   a module of utility functions which serve to write Nexus
-   data files for SANS.
- 
-   Mark Koennecke, August 1997 - November 1998
-
-   Updated to support the larger detector resolution and possible 
-   TOF and stroboscopic modes, Mark Koennecke, February 2001
-
-   Added additional monitors for stroboscopic gummi mode,
-   Mark Koennecke, September 2002
-
-       Copyright:
-
-       Labor fuer Neutronenstreuung
-       Paul Scherrer Institut
-       CH-5423 Villigen-PSI
-
-
-      The authors hereby grant permission to use, copy, modify, distribute,
-      and license this software and its documentation for any purpose, provided
-      that existing copyright notices are retained in all copies and that this
-      notice is included verbatim in any distributions. No written agreement,
-      license, or royalty fee is required for any of the authorized uses.
-      Modifications to this software may be copyrighted by their authors
-      and need not follow the licensing terms described here, provided that
-      the new terms are clearly indicated on the first page of each file where
-      they apply.
-
-      IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-      FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-      ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-      DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-      POSSIBILITY OF SUCH DAMAGE.
-
-      THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-      INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-      FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-      IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-      NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-      MODIFICATIONS.
-----------------------------------------------------------------------------*/
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <time.h>
-#include "fortify.h"
-#include "sics.h"
-#include "sicsvar.h"
-#include "napi.h"
-#include "nxdict.h"
-#include "modriv.h"
-#include "motor.h"
-#include "nxutil.h"
-#include "nxdata.h" 
-#include "countdriv.h"
-#include "counter.h"
-#include "danu.h"
-#include "HistMem.h"
-#include "velo.h"
-#include "sps.h"
-#include "udpquieck.h"
-#include "mumo.h"
-#include "sanswave.h"
-
-
-#define HISTNAME "banana"
-#define SAMPLETABLE "sampletable"
-
-static int gummiFlag = 0; /* a flag indicating stroboscopic, or gummi mode */
-
-/*-----------------------------------------------------------------------*/
-  static void SNError(void *pData, char *text)
-  {
-     SConnection *pCon;
-     
-     assert(pData);
-     pCon = (SConnection *)pData;
-     SCWrite(pCon,text,eError);
-  }
-/*-------------------------------------------------------------------------*/
-  NXhandle SNXStartSANS(SConnection *pCon, SicsInterp *pSics)
-  {
-     NXhandle pFile = NULL;
-     char *filename = NULL;
-     pSicsVariable pVar = NULL;
-     int iStat;
-     char pBueffel[512];
-     
-     /* get a filename */
-     filename = SNXMakeFileName(pSics,pCon);
-     if(!filename)
-     {
-       return NULL;
-     }
-     
-     /* create a Nexus file */
-     NXopen(filename,NXACC_CREATE,&pFile);
-     if(!pFile)
-     {
-         SCWrite(pCon,"ERROR: cannot create data file ",eError);
-         return NULL;
-     }
-     
-     /* tell Uwe User what we are doing */
-     sprintf(pBueffel,"Writing %s ......",filename);
-     SCWrite(pCon,pBueffel,eWarning);
-     
-     /* store global attributes */
-     iStat = NXputattr(pFile,"file_name",filename, 
-     		       strlen(filename)+1,NX_CHAR);
-     if(iStat == NX_ERROR)
-     {
-        SCWrite(pCon,"ERROR: writing file_name attribute to Nexus file",eError);
-     }
-     
-     /* throw away filename, no longer needed */
-     free(filename);
-
-     /* write creation time */
-     SNXFormatTime(pBueffel,512);
-     iStat = NXputattr(pFile,"file_time",pBueffel,
-                       strlen(pBueffel)+1,NX_CHAR);
-     if(iStat == NX_ERROR)
-     {
-        SCWrite(pCon,"ERROR: writing date attribute to Nexus file",eError);
-     }
-     pVar = FindVariable(pSics,"instrument");
-     if(pVar)
-     {
-        iStat = NXputattr(pFile,"instrument",pVar->text,
-                          strlen(pVar->text)+1,NX_CHAR);
-        if(iStat == NX_ERROR)
-        {
-            SCWrite(pCon,"ERROR: writing instrument attribute to Nexus file",eError);
-        }
-     }
-     pVar = NULL;
-     pVar = FindVariable(pSics,"user");
-     if(pVar)
-     {
-        iStat = NXputattr(pFile,"owner",pVar->text,
-                          strlen(pVar->text)+1,NX_CHAR);
-        if(iStat == NX_ERROR)
-        {
-            SCWrite(pCon,"ERROR: writing owner attribute to Nexus file",eError);
-        }
-     }
-
-     pVar = NULL;
-     pVar = FindVariable(pSics,"adress");
-     if(pVar)
-     {
-        iStat = NXputattr(pFile,"owner_adress",pVar->text,
-                          strlen(pVar->text)+1,NX_CHAR);
-        if(iStat == NX_ERROR)
-        {
-            SCWrite(pCon,"ERROR: writing owner_adress attribute to Nexus file",eError);
-        }
-     }
-     pVar = NULL;
-     pVar = FindVariable(pSics,"phone");
-     if(pVar)
-     {
-        iStat = NXputattr(pFile,"owner_telephone_number",pVar->text,
-                          strlen(pVar->text)+1,NX_CHAR);
-        if(iStat == NX_ERROR)
-        {
-            SCWrite(pCon,"ERROR: writing owner_telephone_number attribute to Nexus file",eError);
-        }
-     }
-     pVar = NULL;
-     pVar = FindVariable(pSics,"fax");
-     if(pVar)
-     {
-        iStat = NXputattr(pFile,"owner_fax_number",pVar->text,
-                          strlen(pVar->text)+1,NX_CHAR);
-        if(iStat == NX_ERROR)
-        {
-            SCWrite(pCon,"ERROR: writing owner_fax_number attribute to Nexus file",eError);
-        }
-     }
-     pVar = NULL;
-     pVar = FindVariable(pSics,"email");
-     if(pVar)
-     {
-        iStat = NXputattr(pFile,"owner_email",pVar->text,
-                          strlen(pVar->text)+1,NX_CHAR);
-        if(iStat == NX_ERROR)
-        {
-            SCWrite(pCon,"ERROR: writing owner_email attribute to Nexus file",eError);
-        }
-     }
-     pVar = NULL;
-     return pFile;    
-  }                  
-/*--------------------------------------------------------------------------*/
-  int SNMakeSANS(SConnection *pCon, SicsInterp *pSics, NXdict pDict)
-  {
-     NXhandle Nfil = NULL;
-     char pBueffel[512];
-     float fVal;
-     int iVal, iSet;
-     int32 iAxis[256];
-     int i, iRet;
-     long lVal;
-     HistInt *lData = NULL;
-     const float *fTime = NULL;
-     CommandList *pCom = NULL;
-     pHistMem self = NULL;
-     CounterMode eMode;
-     pVelSel pVelo = NULL;
-     pSPS pSiem = NULL; 
-     const char *pNamPos = NULL;
-     float fRot, fTilt, fLambda;
-     pDummy pDum;
-     pIDrivable pDrive;
-     int iDim[MAXDIM], nDim, histSize,iStart;
-     
-     /* start file */
-     Nfil = SNXStartSANS(pCon,pSics);
-     if(!Nfil)
-     {
-        return 0;
-     }
-     
-     /*
-        during all this, no extensive error checking will be done, 
-        just write the error and continue, save at all cost
-     */   
-     
-     /* put all this global information */
-     SNXSPutVariable(pSics,pCon,Nfil,pDict,"etitle","title");
-     SNXSPutVariable(pSics,pCon,Nfil,pDict,"etime","starttime");
-     SNXFormatTime(pBueffel,511);
-     NXDputalias(Nfil,pDict,"endtime",pBueffel);
-     strcpy(pBueffel,"SANS at SINQ,PSI");
-     NXDputalias(Nfil,pDict,"iname",pBueffel);
-     strcpy(pBueffel,"SINQ at PSI,Villigen, Switzerland");
-     NXDputalias(Nfil,pDict,"sname",pBueffel);
-     strcpy(pBueffel,"Spallation");
-     NXDputalias(Nfil,pDict,"stype",pBueffel);
-     
-     /* put the velocity selector data */
-     NXDputalias(Nfil,pDict,"vname","Dornier Velocity Selector"); 
-     
-     fRot = 0.;
-     fTilt = 0.;
-     pCom = FindCommand(pSics,"nvs");
-     if(pCom)
-     {
-        pVelo = (pVelSel)pCom->pData;
-        if(!pVelo)
-        {
-           SCWrite(pCon,"WARNING: Velocity Selctor not found",eWarning);
-        }
-        iRet = VSGetRotation(pVelo,&fVal);
-        if(!iRet)
-        {
-           SCWrite(pCon,"WARNING: failed to read velocity selector speed",
-                   eWarning);
-        }  
-        else
-        {
-           fRot = fVal;
-           NXDputalias(Nfil,pDict,"vrot",&fVal);     
-        }
-        iRet = VSGetTilt(pVelo,&fTilt);
-        if(!iRet)
-        {
-           SCWrite(pCon,"WARNING: failed to read velocity selector tilt angle",eWarning);
-        }
-     }
-     SNXSPutMotor(pSics,pCon,Nfil,pDict,"vtilt","tilt");
-     CalculateLambda(fRot, fTilt, &fLambda);
-     NXDputalias(Nfil,pDict,"vlambda",&fLambda);     
-
-
-     /* monitor 1 */
-     pCom = FindCommand(pSics,HISTNAME);
-     if(!pCom)
-     {
-        sprintf(pBueffel,"ERROR: histogram memory %s not found",HISTNAME);
-        SCWrite(pCon,pBueffel,eError);
-        return 0;
-     }         
-     self = (pHistMem)pCom->pData;
-     assert(self);
-     lVal = GetHistMonitor(self,0,pCon);
-     iVal = (int32)lVal;
-     NXDputalias(Nfil,pDict,"m1counts",&iVal);
-     lVal = GetHistMonitor(self,4,pCon);
-     iVal = (int32)lVal;
-     NXDputalias(Nfil,pDict,"pbcounts",&iVal);
-
-     /* the collimator */
-     pCom = FindCommand(pSics,"sps2");
-     if(!pCom)
-     {
-        SCWrite(pCon,"WARNING: sps-unit for reading collimator NOT found",
-                 eWarning);
-     }
-     else
-     {
-        pSiem = (pSPS)pCom->pData;
-        if(!pSiem)
-        {
-            SCWrite(pCon,"WARNING: sps-unit for reading collimator NOT found",
-                    eWarning);
-        }
-        else
-        {
-          iRet = SPSGetSANS(pSiem,&fVal);
-          if(iRet <= 0)
-          {
-             SCWrite(pCon,"WARNING: Failed to read SPS",eWarning);
-          }
-          else
-	  {
-             NXDputalias(Nfil,pDict,"colli",&fVal);
-          }
-          /* as we got the sps, get the attenuator as well */
-          iRet = SPSGetStatus(pSiem,38,&iSet);
-          if(iRet <0)
-          {
-             SCWrite(pCon,"WARNING: Failed to read SPS",eWarning);
-          }
-          else
-          {
-            if(iSet)
-            {
-              iVal = 0;
-            }
-          }
-          iRet = SPSGetStatus(pSiem,39,&iSet);
-          if(iRet <0)
-          {
-             SCWrite(pCon,"WARNING: Failed to read SPS",eWarning);
-          }
-          else
-          {
-            if(iSet)
-            {
-              iVal = 1;
-            }
-          }
-          iRet = SPSGetStatus(pSiem,40,&iSet);
-          if(iRet <0)
-          {
-             SCWrite(pCon,"WARNING: Failed to read SPS",eWarning);
-          }
-          else
-          {
-            if(iSet)
-            {
-              iVal = 2;
-            }
-          }
-          iRet = SPSGetStatus(pSiem,41,&iSet);
-          if(iRet <0)
-          {
-             SCWrite(pCon,"WARNING: Failed to read SPS",eWarning);
-          }
-          else
-          {
-            if(iSet)
-            {
-              iVal = 3;
-            }
-          }
-          iRet = SPSGetStatus(pSiem,42,&iSet);
-          if(iRet <0)
-          {
-             SCWrite(pCon,"WARNING: Failed to read SPS",eWarning);
-          }
-          else
-          {
-            if(iSet)
-            {
-              iVal = 4;
-            }
-          }
-          iRet = SPSGetStatus(pSiem,43,&iSet);
-          if(iRet <0)
-          {
-             SCWrite(pCon,"WARNING: Failed to read SPS",eWarning);
-          }
-          else
-          {
-            if(iSet)
-            {
-              iVal = 5;
-            }
-          }
-          NXDputalias(Nfil,pDict,"atti",&iVal);
-        }
-     }
-    
-     /* the sample */
-     SNXSPutVariable(pSics,pCon,Nfil,pDict,"san","sample");
-     SNXSPutVariable(pSics,pCon,Nfil,pDict,"saenv","environment");
-     SNXSPutMotor(pSics,pCon,Nfil,pDict,"sax","sax");
-     SNXSPutMotor(pSics,pCon,Nfil,pDict,"say","say");
-     SNXSPutMotor(pSics,pCon,Nfil,pDict,"saz","saz");
-     SNXSPutMotorNull(pSics,pCon,Nfil,pDict,"saxn","sax");
-     SNXSPutMotorNull(pSics,pCon,Nfil,pDict,"sayn","say");
-     SNXSPutMotorNull(pSics,pCon,Nfil,pDict,"sazn","saz");
-
-
-     /* goniometer */
-     SNXSPutMotor(pSics,pCon,Nfil,pDict,"gphi","gphi");
-     SNXSPutMotor(pSics,pCon,Nfil,pDict,"gtheta","gtheta");
-     SNXSPutMotorNull(pSics,pCon,Nfil,pDict,"gphin","gphi");
-     SNXSPutMotorNull(pSics,pCon,Nfil,pDict,"gthetan","gtheta");
-     
-     SNXSPutMotor(pSics,pCon,Nfil,pDict,"saom","som");
-     SNXSPutMotorNull(pSics,pCon,Nfil,pDict,"saomn","som");
-     SNXSPutMotor(pSics,pCon,Nfil,pDict,"sapos","spos");
-     SNXSPutMotorNull(pSics,pCon,Nfil,pDict,"saposn","spos");
-     pCom = FindCommand(pSics,SAMPLETABLE);
-     if(pCom)
-     {
-       if(pCom->pData)
-       {
-         pNamPos = FindNamPos((pMulMot)pCom->pData,pCon);
-         if(pNamPos)
-         {
-           NXDputalias(Nfil,pDict,"sanampos",(char *)pNamPos);
-         }
-       }
-     }
-     /* write sample environment here */
-     pCom = FindCommand(pSics,"temperature");
-     if(pCom)
-     {
-       pDum = (pDummy)pCom->pData;
-       pDrive = pDum->pDescriptor->GetInterface(pDum,DRIVEID);
-       if(pDrive) /* a proper environment device */
-       {
-            fVal = pDrive->GetValue(pDum,pCon);
-            NXDputalias(Nfil,pDict,"satemp",&fVal);
-       }
-     }
-     pCom = FindCommand(pSics,"magnet");
-     if(pCom)
-     {
-       pDum = (pDummy)pCom->pData;
-       pDrive = pDum->pDescriptor->GetInterface(pDum,DRIVEID);
-       if(pDrive) /* a proper environment device */
-       {
-            fVal = pDrive->GetValue(pDum,pCon);
-            NXDputalias(Nfil,pDict,"samag",&fVal);
-       }
-     }
-
-     /* magnet motors. This instrument has motorized magnets crawling 
-        through the hall */
-     pCom = FindCommand(pSics,"mom");
-     if(pCom)
-     {
-       SNXSPutMotor(pSics,pCon,Nfil,pDict,"mom","mom");
-     }
-     pCom = FindCommand(pSics,"mz");
-     if(pCom)
-     {
-       SNXSPutMotor(pSics,pCon,Nfil,pDict,"mz","mz");
-     }     
-
-    
-    /* put Beam Stop */
-     /* read beamstop number */   
-     iVal = 1; 
-     pCom = FindCommand(pSics,"sps1");
-     if(!pCom)
-     {
-        SCWrite(pCon,"WARNING: sps-unit for reading beamstop NOT found",eWarning);
-     }
-     else
-     {
-        pSiem = (pSPS)pCom->pData;
-        if(!pSiem)
-        {
-            SCWrite(pCon,"WARNING: sps-unit for reading beamstop NOT found",eWarning);
-        }
-        else
-        {
-          iRet = SPSGetStatus(pSiem,8,&iSet);
-          if(iRet <0)
-          {
-             SCWrite(pCon,"WARNING: Failed to read SPS",eWarning);
-          }
-          else
-          {
-            if(iSet)
-            {
-              iVal = 2;
-            }
-          }
-          iRet = SPSGetStatus(pSiem,9,&iSet);
-          if(iRet <0)
-          {
-             SCWrite(pCon,"WARNING: Failed to read SPS",eWarning);
-          }
-          else
-          {
-            if(iSet)
-            {
-              iVal = 3;
-            }
-          }
-          iRet = SPSGetStatus(pSiem,10,&iSet);
-          if(iRet <0)
-          {
-             SCWrite(pCon,"WARNING: Failed to read SPS",eWarning);
-          }
-          else
-          {
-            if(iSet)
-            {
-              iVal = 4;
-            }
-          }
-        }
-     }
-     NXDputalias(Nfil,pDict,"bst",&iVal);     
-     SNXSPutMotor(pSics,pCon,Nfil,pDict,"vsx","BeamStopX");
-     SNXSPutMotor(pSics,pCon,Nfil,pDict,"vsy","BeamStopY");
-     SNXSPutMotorNull(pSics,pCon,Nfil,pDict,"vsxnull","BeamStopX");
-     SNXSPutMotorNull(pSics,pCon,Nfil,pDict,"vsynull","BeamStopY");
-  
-    /* what this is all about: the detector */
-     SNXSPutMotor(pSics,pCon,Nfil,pDict,"ddx","DetectorX");
-     SNXSPutMotor(pSics,pCon,Nfil,pDict,"ddy","DetectorY");
-     SNXSPutMotorNull(pSics,pCon,Nfil,pDict,"ddxn","DetectorX");
-     SNXSPutMotorNull(pSics,pCon,Nfil,pDict,"ddyn","DetectorY");
-     SNXSPutMotor(pSics,pCon,Nfil,pDict,"ddchi","DetectorRotation");
-     pCom = FindCommand(pSics,HISTNAME);
-     if(!pCom)
-     {
-        sprintf(pBueffel,"ERROR: histogram memory %s not found",HISTNAME);
-        SCWrite(pCon,pBueffel,eError);
-        return 0;
-     }         
-     self = (pHistMem)pCom->pData;
-     assert(self);
-     eMode = GetHistCountMode(self);
-     if(eMode == eTimer)
-     {
-       strcpy(pBueffel,"Timer");
-     }
-     else
-     {
-       strcpy(pBueffel,"Monitor");
-     }
-     NXDputalias(Nfil,pDict,"ddm",pBueffel);     
-     fVal = GetHistPreset(self);
-     NXDputalias(Nfil,pDict,"ddp",&fVal);
-     lVal = GetHistMonitor(self,1,pCon);
-     iVal = (int32)lVal;
-     NXDputalias(Nfil,pDict,"ddmo",&iVal);
-     fVal = GetHistCountTime(self,pCon);
-     NXDputalias(Nfil,pDict,"ddtime",&fVal);
-
-     /* 
-       Deal with actual histogram. Due to stroboscopic modes and the
-       new detector electronics we need to find out about the size
-       ourselves now. And possibly write time binning information.
-     */ 
-     GetHistDim(self, iDim,&nDim);
-     /*
-       handle time binning
-     */
-     fTime = GetHistTimeBin(self,&iVal);
-     if(iVal > 2)
-     {
-        NXDputalias(Nfil,pDict,"ddtb",(void *)fTime);
-	nDim = 3;
-	iDim[2] = iVal;
-     }
-
-     histSize = 1;
-     for(i = 0; i < nDim; i++)
-     {
-       histSize *= iDim[i];
-     }
-     lData = (HistInt *)malloc(histSize*sizeof(HistInt));
-     if(!lData)
-     {
-       SCWrite(pCon,"ERROR: out of memory, FAILED to store data, file corrupt",
-               eError);
-       NXclose(&Nfil);
-       return 0;
-     }
-     GetHistogram(self,pCon,0,0,histSize,lData,histSize*sizeof(HistInt));
-     sprintf(pBueffel," %d ",iDim[0]);
-     NXDupdate(pDict,"dim1",pBueffel); 
-     sprintf(pBueffel," %d ",iDim[1]);
-     NXDupdate(pDict,"dim2",pBueffel); 
-     if(nDim == 2)
-     {
-       sprintf(pBueffel," -rank 2 -dim {%d,%d} ", iDim[0], iDim[1]); 
-       NXDupdate(pDict,"countdim",pBueffel);
-     }
-     else if (nDim == 3)
-     {
-       sprintf(pBueffel," -rank 3 -dim {%d,%d,%d} ", iDim[0], iDim[1],
-               iDim[2]);
-       NXDupdate(pDict,"countdim",pBueffel);
-       sprintf(pBueffel," %d ",iDim[2]);
-       NXDupdate(pDict,"timedim",pBueffel);
-     }
-     NXDputalias(Nfil,pDict,"ddcounts",lData);
-     free(lData);
-
-     /* write x and y axis */
-     for(i = 0; i < iDim[0]; i++)
-     {
-       iAxis[i] = i;
-     }   
-     NXDputalias(Nfil,pDict,"ddcx",iAxis);
-     for(i = 0; i < iDim[1]; i++)
-     {
-       iAxis[i] = i;
-     }   
-     NXDputalias(Nfil,pDict,"ddcy",iAxis);
-
-
-
-     /*
-       write gummi monitors when apropriate
-     */
-     if(nDim == 3 && gummiFlag != 0)
-     {
-       histSize = 3*iDim[2];
-       lData = (HistInt *)malloc(histSize*sizeof(HistInt));
-       if(lData == NULL)
-       {
-	 SCWrite(pCon,"WARNING: failed to allocate memory for monitors",
-		 eWarning);
-       } else {
-	 memset(lData,0,histSize*sizeof(HistInt));
-         iStart = iDim[0]*iDim[1]*iDim[2];
-	 GetHistogramDirect(self,pCon,0,iStart,iStart+histSize,
-		      lData,histSize*sizeof(HistInt));
-	 NXDputalias(Nfil,pDict,"gummimon1",lData);
-	 NXDputalias(Nfil,pDict,"gummimon2",lData+iDim[2]);
-	 NXDputalias(Nfil,pDict,"gummimon3",lData+2*iDim[2]);
-	 free(lData);
-       }
-     }
-
-     /*
-       write detector temperature. It is a hot one............
-     */
-     if(pSiem)
-     {
-       iRet = SPSGetADC(pSiem,1,&iVal);
-       if(iRet)
-       {
-         fVal = iVal/269.9;
-         NXDputalias(Nfil,pDict,"ddtemp",&fVal);
-       }  
-     }
-     
-     /* do the linking in th data vgroup */
-     NXDaliaslink(Nfil,pDict,"dan","ddcounts");
-     NXDaliaslink(Nfil,pDict,"dan","ddcx");
-     NXDaliaslink(Nfil,pDict,"dan","ddcy");
-     NXDaliaslink(Nfil,pDict,"dan","ddmo");
-     NXDaliaslink(Nfil,pDict,"dan","vlambda");
-     if(nDim == 3)
-     {
-        NXDaliaslink(Nfil,pDict,"dan","ddtb");
-     }
-
-    /* send quieck message for automatic copying*/
-    i = 131;
-    iVal = NX_CHAR;
-    NXgetattr(Nfil,"file_name",pBueffel,&i,&iVal);
-    SendQuieck(QUIECK,pBueffel);
-    /* close this and go ............. */     
-    NXclose(&Nfil);
-    return 1;
-  }  
-/*------------------- The Mechanics for setting Up ------------------------*/
-  typedef struct {
-                  pObjectDescriptor pDes;
-                  NXdict pDict;
-                  } DictStruct, *pDictStruct;
-/*-------------------------------------------------------------------------*/
-  static pDictStruct MakeDictStruct(char *pFile)
-  {
-    pDictStruct pNew = NULL;
-    int iRet;
-    
-    pNew = (pDictStruct)malloc(sizeof(DictStruct));
-    if(!pNew)
-    {
-      return NULL;
-    }
-    memset(pNew,0,sizeof(DictStruct));
-    pNew->pDes = CreateDescriptor("StoreData");
-    if(!pNew->pDes)
-    {
-      free(pNew);
-      return NULL;
-    }
-    
-    iRet = NXDinitfromfile(pFile,&(pNew->pDict));
-    if(iRet != NX_OK)
-    {
-      DeleteDescriptor(pNew->pDes);
-      free(pNew);
-      return NULL;
-    }
-    return pNew;
-  }            
-/*--------------------------------------------------------------------------*/
-  static void KillDictStruct(void *pData)
-  {
-    pDictStruct self = NULL;
-    
-    self = (pDictStruct)pData;
-    assert(self);
-    
-    if(self->pDes)
-    {
-      DeleteDescriptor(self->pDes);
-    }
-    if(self->pDict)
-    {
-       NXDclose(self->pDict,NULL);
-    }
-    free(self);
-  }          
-
-/*--------------------------------------------------------------------------*/
- int SNStoreSANS(SConnection *pCon, SicsInterp *pSics, void *pData, int argc,
-           char *argv[])
-           
- {
-	char pBueffel[80];
-        pDictStruct self = NULL;
-        self = (pDictStruct)pData;
-
-        assert(self);
-        assert(pCon);
-        assert(pSics);
-
-        if(argc > 1){
-	  strtolower(argv[1]);
-	  if(strcmp(argv[1],"gummi") == 0){
-	    if(argc > 2){
-	      if(!SCMatchRights(pCon,usMugger)){
-		return 0;
-	      }
-	      gummiFlag = atoi(argv[2]);
-	      SCSendOK(pCon);
-	      return 1;
-            } else 
-	    {
-	      sprintf(pBueffel,"%s.gummi = %d",argv[0], gummiFlag);
-	      SCWrite(pCon,pBueffel,eValue);
-	      return 1;
-	    }
-          }
-	}
-
- 	return SNMakeSANS(pCon,pSics,self->pDict); 
- }         
-/*--------------------------------------------------------------------------*/
- int InitSANS(SConnection *pCon, SicsInterp *pSics, void *pData, 
-             int argc, char *argv[])
- {
-     pDictStruct pNew = NULL;
-     char pBueffel[512];
-     
-     if(argc < 2)
-     {
-       SCWrite(pCon,"ERROR: not enough arguments for IniSANS",eError);
-       return 0;
-     }
-     
-     pNew = MakeDictStruct(argv[1]);
-     if(!pNew)
-     {
-        sprintf(pBueffel,"ERROR: failed to initialise NXDDL from file %s",
-        argv[1]);
-        SCWrite(pCon,pBueffel,eError);
-        return 0;
-     }
-     AddCommand(pSics,"StoreData",SNStoreSANS,KillDictStruct,pNew);
-     return 1;
- }            
diff --git a/nxsans.h b/nxsans.h
deleted file mode 100644
index 56ef101b..00000000
--- a/nxsans.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*-------------------------------------------------------------------------
-                      N X S A N S
-
-  Prototypes for some more useful functions from the SANS data writing
-  module which may ne used in other parts of SICS.
-
-  Mark Koennecke, December 1997
----------------------------------------------------------------------------*/
-#ifndef NXSANS
-#define NXSANS
-  int InitSANS(SConnection *pCon, SicsInterp *pSics, void *pData,
-                int argc, char *argv[]);
-  int SNStoreSANS(SConnection *pCon, SicsInterp *pSics, void *pData,
-                int argc, char *argv[]);
-
-
-#endif 
\ No newline at end of file
diff --git a/ofac.c b/ofac.c
index 39c21e83..0ad4cc8d 100644
--- a/ofac.c
+++ b/ofac.c
@@ -6,7 +6,10 @@
 	
 
 
-	Mark Koennecke,    November 1996
+	Mark Koennecke,    November 1996 -- ????
+
+	heavy modifications to separate PSI specific commands into a 
+	separate library. Mark Koennecke, June 2003 
 
 	Copyright:
 
@@ -60,12 +63,10 @@
 #include "selvar.h"
 #include "countdriv.h"
 #include "counter.h"
-#include "buffer.h"
 #include "scan.h"
 #include "script.h"
 #include "o2t.h"
 #include "alias.h"
-#include "dmc.h"
 #include "stringdict.h"
 #include "HistMem.h"
 #include "velo.h"
@@ -76,44 +77,30 @@
 #include "scan.h"
 #include "fitcenter.h"
 #include "token.h"
-#include "serial.h"
 #include "hkl.h"
 #include "optimise.h"
-#include "nextrics.h"
 #include "mesure.h"
 #include "commandlog.h"
-#include "sps.h"
 #include "udpquieck.h"
-#include "pimotor.h"
-#include "sanswave.h"
-#include "faverage.h"
-#include "fowrite.h"
 #include "choco.h"
 #include "chadapter.h"
 #include "hklscan.h"
 #include "xytable.h"
-#include "amor2t.h"
-#include "nxamor.h"
-#include "amorstat.h"
 #include "maximize.h"
 #include "difrac.h"
 #include "sicscron.h"
 #include "lin2ang.h"
-#include "tas.h"
 #include "synchronize.h"
 #include "definealias.h"
-#include "swmotor.h"
 #include "hmcontrol.h"
 #include "rs232controller.h"
 #include "lomax.h"
-#include "polterwrite.h"
 #include "anticollider.h"
 #include "gpibcontroller.h"
-#include "ecb.h"
 #include "nxscript.h"
-#include "frame.h"
 #include "tclintimpl.h"
 #include "sicsdata.h"
+#include "site.h"
 /*----------------------- Server options creation -------------------------*/
   static int IFServerOption(SConnection *pCon, SicsInterp *pSics, void *pData,
                      int argc, char *argv[])
@@ -186,14 +173,12 @@
        DeleteTokenList(pList);
        return 1;
   } 
-/*-------------------------------------------------------------------------*/
-  int InitSANS(SConnection *pCon, SicsInterp *pSics, void *pData, 
-               int argc, char *argv[]); 
 /*--------------------------------------------------------------------------*/                   
   static void InitIniCommands(SicsInterp *pInter,pTaskMan pTask)
   {
     pExeList pExe;
     pEnvMon pEnv = NULL;
+    pSite site = NULL;
     assert(pInter);
     
     pExe = CreateExeList(pTask);
@@ -257,57 +242,45 @@
     AddCommand(pInter,"MakeWaveLength",MakeWaveLengthVar,NULL,NULL);
     AddCommand(pInter,"MakeEnergy",MakeEnergyVar,NULL,NULL);
     AddCommand(pInter,"MakeCounter",MakeCounter,NULL,NULL);
-    AddCommand(pInter,"MakeRuenBuffer",InitBufferSys,NULL,NULL);
     AddCommand(pInter,"MakeO2T",CreateO2T,NULL,NULL);
     AddCommand(pInter,"SicsAlias",SicsAlias,NULL,NULL);
     AddCommand(pInter,"DefineAlias",DefineAlias,NULL,NULL); /* M.Z. */
-    AddCommand(pInter,"InitDMC",InitDmc,NULL,NULL);
-    AddCommand(pInter,"InitSANS",InitSANS,NULL,NULL);
     AddCommand(pInter,"MakeHM",MakeHistMemory,NULL,NULL);
     AddCommand(pInter,"VelocitySelector",VelSelFactory,NULL,NULL);
     AddCommand(pInter,"MakeDataNumber",DNFactory,NULL,NULL);
     AddCommand(pInter,"MakeScanCommand",ScanFactory,NULL,NULL);
     AddCommand(pInter,"MakePeakCenter",FitFactory,NULL,NULL);
-    AddCommand(pInter,"SerialInit",SerialInit,NULL,NULL);
     AddCommand(pInter,"MakeHKL",HKLFactory,NULL,NULL);
     AddCommand(pInter,"MakeOptimise",MakeOptimiser,NULL,NULL);
-    AddCommand(pInter,"MakeTRICSNEXUS",NexTricsFactory,NULL,NULL);
     AddCommand(pInter,"MakeMesure",MesureFactory,NULL,NULL);
-    AddCommand(pInter,"MakeSPS",SPSFactory,NULL,NULL);
-    AddCommand(pInter,"MakePIMotor",PIMotorFactory,NULL,NULL);
-    AddCommand(pInter,"MakeSANSWave",MakeSANSWave,NULL,NULL);
-    AddCommand(pInter,"MakeFocusAverager",MakeFA,NULL,NULL);
     AddCommand(pInter,"kill_command",SICSKill,NULL,NULL);
-    AddCommand(pInter,"FocusInstall",FoInstall,NULL,NULL);
     AddCommand(pInter,"MakeChopper",ChocoFactory,NULL,NULL);
     AddCommand(pInter,"ChopperAdapter",CHAdapterFactory,NULL,NULL);
     AddCommand(pInter,"MakeHklscan",HklscanFactory,NULL,NULL);
     AddCommand(pInter,"MakeXYTable",XYFactory,NULL,NULL);
-    AddCommand(pInter,"MakeAmor2T",Amor2TFactory,NULL,NULL);
-    AddCommand(pInter,"MakeStoreAmor",AmorStoreMake,NULL,NULL);
-    AddCommand(pInter,"MakeAmorStatus",AmorStatusFactory,NULL,NULL);
     AddCommand(pInter,"MakeMaximize",MaximizeFactory,NULL,NULL);
-/*
-    AddCommand(pInter,"MakeDifrac",MakeDifrac,NULL,NULL);
-*/
     AddCommand(pInter,"MakeLin2Ang",MakeLin2Ang,NULL,NULL);
-    AddCommand(pInter,"MakeTAS",TASFactory,NULL,NULL);
     AddCommand(pInter,"MakeSync",MakeSync,NULL,NULL);
-    AddCommand(pInter,"MakeSWMotor",MakeSWMotor,NULL,NULL);
     AddCommand(pInter,"MakeHMControl",MakeHMControl,NULL,NULL);
     AddCommand(pInter,"MakeRS232Controller",RS232Factory,NULL,NULL);
     AddCommand(pInter,"MakeMaxDetector",LoMaxFactory,NULL,NULL);
-    AddCommand(pInter,"PolterInstall",PolterInstall,NULL,NULL);
     AddCommand(pInter,"AntiCollisionInstall",AntiColliderFactory,NULL,NULL);
     AddCommand(pInter,"MakeGPIB",MakeGPIB,NULL,NULL);
-    AddCommand(pInter,"MakeECB",MakeECB,NULL,NULL);
     AddCommand(pInter,"MakeNXScript",MakeNXScript,NULL,NULL);
-    AddCommand(pInter,"MakePSDFrame",MakeFrameFunc,NULL,NULL);
     AddCommand(pInter,"MakeTclInt",MakeTclInt,NULL,NULL);
+
+    /*
+      install site specific commands
+    */
+    site = getSite();
+    if(site != NULL){
+      site->AddSiteCommands(pInter);
+    }
   } 
 /*---------------------------------------------------------------------------*/
   static  void KillIniCommands(SicsInterp *pSics)
   {
+    pSite site = NULL;
   
     /* specify superfluous initialization commands here */
     RemoveCommand(pSics,"TokenInit");
@@ -327,48 +300,36 @@
     RemoveCommand(pSics,"MakeScan");
     RemoveCommand(pSics,"MakeO2T");
     RemoveCommand(pSics,"SicsAlias");
-    RemoveCommand(pSics,"InitDMC");
-    RemoveCommand(pSics,"InitSANS");
     RemoveCommand(pSics,"MakeHM");
     RemoveCommand(pSics,"VelocitySelector");
     RemoveCommand(pSics,"MakeDataNumber");
     RemoveCommand(pSics,"MakeScanCommand");
     RemoveCommand(pSics,"MakePeakCenter");
-    RemoveCommand(pSics,"SerialInit");
     RemoveCommand(pSics,"MakeHKL");
     RemoveCommand(pSics,"MakeOptimiser");
-    RemoveCommand(pSics,"MakeTRICSNEXUS");
     RemoveCommand(pSics,"MakeMesure");
-    RemoveCommand(pSics,"MakeSPS");
-    RemoveCommand(pSics,"MakePIMotor");
-    RemoveCommand(pSics,"MakeSANSWave");
-    RemoveCommand(pSics,"MakeFocusAverager");
-    RemoveCommand(pSics,"FocusInstall");
     RemoveCommand(pSics,"MakeChopper");
     RemoveCommand(pSics,"ChopperAdapter");
     RemoveCommand(pSics,"MakeHklscan");
     RemoveCommand(pSics,"MakeXYTable");
-    RemoveCommand(pSics,"MakeAmor2T");
-    RemoveCommand(pSics,"MakeStoreAmor");
-    RemoveCommand(pSics,"MakeAmorStatus");
     RemoveCommand(pSics,"MakeMaximize");
-/*
-    RemoveCommand(pSics,"MakeDifrac");
-*/
     RemoveCommand(pSics,"MakeLin2Ang");
-    RemoveCommand(pSics,"MakeTAS");
     RemoveCommand(pSics,"MakeSync");
-    RemoveCommand(pSics,"MakeSWMotor");
     RemoveCommand(pSics,"MakeHMControl");
     RemoveCommand(pSics,"MakeRS232Controller");
     RemoveCommand(pSics,"MakeMaxDetector");
-    RemoveCommand(pSics,"PolterInstall");
     RemoveCommand(pSics,"AntiColliderInstall");
     RemoveCommand(pSics,"MakeGPIB");
-    RemoveCommand(pSics,"MakeECB");
     RemoveCommand(pSics,"MakeNXScript");
-    RemoveCommand(pSics,"MakePSDFrame");
     RemoveCommand(pSics,"MakeTclInt");
+
+    /*
+      remove site specific installation commands
+    */
+    site = getSite();
+    if(site != NULL){
+      site->RemoveSiteCommands(pSics);
+    }
   }
   
    
diff --git a/pimotor.c b/pimotor.c
deleted file mode 100644
index ab9541b5..00000000
--- a/pimotor.c
+++ /dev/null
@@ -1,784 +0,0 @@
-/*--------------------------------------------------------------------------
-                               P I M O T O R
-                               
-   This file contains the implementation of a motor driver for the Physik
-   Instrument C-804 DC motor controller. Plus the implementation of an 
-   additional wrapper function for handling addtional support commands 
-   for this motor controller.
-   
-   Mark Koenencke, September 1998
-----------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <assert.h>
-#include <tcl.h>
-#include "fortify.h"
-#include "sics.h"
-#include "hardsup/serialsinq.h"
-#include "hardsup/el734_def.h"
-#include "hardsup/el734fix.h"
-#include "motor.h"
-#include "pimotor.h"
-
-
-/*================== The Driver data structure ============================*/
-  typedef struct __PIMoDriv {
-                           /* general motor driver interface 
-                              fields. REQUIRED!
-                           */
-                           float fUpper; /* upper limit */
-                           float fLower; /* lower limit */
-                           char *name;
-                           int   (*GetPosition)(void *self,float *fPos);
-                           int   (*RunTo)(void *self, float fNewVal);
-                           int   (*GetStatus)(void *self);
-                           void  (*GetError)(void *self, int *iCode, char *buffer, int iBufLen);
-                           int   (*TryAndFixIt)(void *self,int iError, float fNew);
-                           int   (*Halt)(void *self);
-                           int   (*GetDriverPar)(void *self, char *name, 
-                                  float *value);
-                           int    (*SetDriverPar)(void *self,SConnection *pCon,
-                                   char *name, float newValue);
-                           void   (*ListDriverPar)(void *self, char *motorName,
-                                  SConnection *pCon);
-                           
-                           
-                           /* C-804 specific fields */
-                           int iPort;
-                           char *hostname;
-                           int iChannel;
-                           int iMotor;
-                           void *pSerial;
-                           int iLastError;
-                          } C804Driv, *pC804Driv;
-   
-#define PITMO -845
-#define PICOMERR -846
-/*--------------------------------------------------------------------------*/
- static int PIPosition(void *pData, float *fPos)
- {
-      pC804Driv self = NULL;
-      int iRet;
-      char pCommand[20];
-      char pReply[80];
-      char *pPtr;
-      
-      self = (pC804Driv)pData;
-      assert(self);
-      
-      /* format command */
-      sprintf(pCommand,"%1.1dTP\r",self->iMotor); 
-      
-      /* send command */
-      iRet = SerialWriteRead(&self->pSerial,pCommand, pReply, 79);
-      if(iRet != 1)
-      {
-         self->iLastError = iRet;
-         *fPos = -99999;
-         return HWFault;  
-      }
-      
-      /* catch TMO or bad reply */
-      if(strstr(pReply,"TMO") != NULL)
-      {
-         self->iLastError = PITMO;
-         *fPos = -9999;
-         return HWFault;
-      }
-      if(strstr(pReply,"?") != NULL)
-      {
-         self->iLastError = PICOMERR;
-         *fPos = -9999;
-         return HWFault;
-      }
-
-      
-      /* read value */
-      pPtr = pReply + 3;
-      *fPos = atof(pPtr);
-      return OKOK;
- } 
-/*-------------------------------------------------------------------------*/
- static int PIRun(void *pData, float fVal)
- {
-      pC804Driv self = NULL;
-      int iRet;
-      char pCommand[20];
-      char pReply[80];
-      int iTmo;
-      
-      self = (pC804Driv)pData;
-      assert(self);
-
-      /* format drive command */
-      sprintf(pCommand,"%1.1dMA%10.10d\r",self->iMotor,(int)fVal); 
-      
-      iTmo = SerialGetTmo(&self->pSerial);
-      SerialConfig(&self->pSerial,0);
-
-      /* send command */
-      iRet = SerialWriteRead(&self->pSerial,pCommand, pReply, 79);
-      if(iRet != 1)
-      {
-         self->iLastError = iRet;
-         return HWFault;  
-      }
-
-      /* reset tmo */
-      SerialConfig(&self->pSerial,iTmo);
-      
-      /* wait a little to allow to gather some speed before checking on it */
-      SicsWait(2);
-      return OKOK;
- }                                  
-/*---------------------------------------------------------------------------*/
- static void PIError(void *pData, int *iCode, char *pError, int iErrLen)
- {
-      pC804Driv self = NULL;
-     
-      self = (pC804Driv)pData;
-      assert(self);
-       
-      *iCode = self->iLastError;
-      
-      if(*iCode == PITMO)
-      {
-        strncpy(pError,"Timeout at serial line", iErrLen);
-        return;
-      }  
-      if(*iCode == PICOMERR)
-      {
-        strncpy(pError,"C-804 Command Error",iErrLen);
-        return;
-      }
-      
-      SerialError(self->iLastError,pError,iErrLen);
-      return;     
- } 
-/*--------------------------------------------------------------------------*/
- static int PIFixError(void *pData, int iError, float fNew)
- {
-    pC804Driv self = NULL;
-    int iRet;
-    
-    self = (pC804Driv)pData;
-    assert(self);
-    
-        switch(iError)
-        {
-            /* network errors */
-            case NOCONNECTION:
-            case EL734__BAD_FLUSH:
-            case EL734__BAD_RECV:
-            case EL734__BAD_RECV_NET:
-            case EL734__BAD_RECV_UNKN:
-            case EL734__BAD_RECVLEN:
-            case EL734__BAD_RECV1:
-            case EL734__BAD_RECV1_PIPE:
-            case EL734__BAD_RNG:
-            case EL734__BAD_SEND:
-            case EL734__BAD_SEND_PIPE:
-            case EL734__BAD_SEND_NET:
-            case EL734__BAD_SEND_UNKN:
-            case EL734__BAD_SENDLEN:
-                      SerialClose(&self->pSerial);
-                      iRet = SerialOpen(&self->pSerial,self->hostname,
-                                        self->iPort, self->iChannel);
-                      if(iRet != 1)
-                      {
-                        return MOTREDO;
-                      }                 
-                      else
-                      {
-                        return MOTFAIL;
-                      }                 
-                      break;
-            /* handable protocoll errors */
-            case EL734__BAD_TMO:
-            case PITMO:
-            case TIMEOUT:
-                      return MOTREDO;
-                      break;
-            case PICOMERR:
-                      return MOTFAIL;
-                      break;          
-            default:
-                      return MOTFAIL;
-                      break;                       
-        }
-        return MOTFAIL;
- }
-/*---------------------------------------------------------------------------*/
-  static int PIHalt(void *pData)
-  {
-     pC804Driv self = NULL;
-     char pCommand[20], pReply[80];
-     int iTmo;
-     
-     self = (pC804Driv)pData;
-     assert(self);
-     
-     sprintf(pCommand,"%1.1dAB\r",self->iMotor);
-     
-     iTmo = SerialGetTmo(&self->pSerial);
-     SerialConfig(&self->pSerial,0);
-     SerialWriteRead(&self->pSerial,pCommand, pReply, 79);
-     SerialConfig(&self->pSerial,iTmo);
-     
-     return 1;
-  }  
-#define ABS(x) (x < 0 ? -(x) : (x))    
-/*-------------------------------------------------------------------------*/
-  static int PIStatus(void *pData)
-  {
-     pC804Driv self = NULL;
-     char pCommand[20], pReply[80], *pPtr;
-     int iRet;
-     float fSpeed;
-     
-     self = (pC804Driv)pData;
-     assert(self);
-  
-     /* read actual velocity: should be 0 when done */
-     sprintf(pCommand,"%1.1dTV\r",self->iMotor);
-     iRet = SerialWriteRead(&self->pSerial,pCommand,pReply,79);
-     if(iRet != 1)
-     {
-        self->iLastError = iRet;
-        return HWFault;  
-     }
-     /* check reply */
-     if(strstr(pReply,"TMO") != NULL)
-     {
-        self->iLastError = PITMO;
-        return HWFault;
-     }
-     if(strstr(pReply,"?") != NULL)
-     {
-        self->iLastError = PICOMERR;
-        return HWFault;
-     }
-   
-     pPtr = pReply+3;
-     fSpeed = atof(pPtr);
-     if(ABS(fSpeed) > 0)
-     {
-        return HWBusy;
-     }
-     return HWIdle;
-  }
-/*------------------------------------------------------------------------*/
-  static void KillC804(pC804Driv self)
-  {
-     if(!self)
-        return;
-        
-     if(self->name)
-     {
-        free(self->name);
-     }
-     if(self->hostname)
-     {
-        free(self->hostname);
-     }
-     if(self->pSerial)
-     {
-        SerialClose(&self->pSerial);
-     }
-     free(self);
-  }  
-/*--------------------------------------------------------------------------
- * The data necessary for initialising the C804 motor is contained in a
- * Tcl-Array given as pArray parameter. In case of an error the error is
- * returned in the Tcl-interpreter.
- */
-  static pC804Driv MakeC804Driver(Tcl_Interp *pTcl, char *pArray)
-  {
-     pC804Driv pNew = NULL;
-     int iRet, iVal, iTmo;
-     double dVal;
-     char *pPar = NULL;
-     char pCommand[20], pReply[40];
-     
-     /* allocate space: the final frontier */
-     pNew = (pC804Driv)malloc(sizeof(C804Driv));
-     if(!pNew)
-     {
-        Tcl_SetResult(pTcl,"Out of memory for C804 Driver",NULL);
-        return NULL;  
-     }
-     memset(pNew,0,sizeof(C804Driv));
-     
-     /* connection parameters */
-     pPar = Tcl_GetVar2(pTcl,pArray,"Computer",TCL_GLOBAL_ONLY);
-     if(!pPar)
-     {
-        Tcl_SetResult(pTcl,"Failed to find serial port server host name",NULL);
-        KillC804(pNew);
-        return NULL;
-     }
-     pNew->hostname = strdup(pPar);
-     
-     pPar = NULL;
-     pPar = Tcl_GetVar2(pTcl,pArray,"port",TCL_GLOBAL_ONLY);
-     if(!pPar)
-     {
-        Tcl_SetResult(pTcl,"Failed to find serial port server port adress",NULL);
-        KillC804(pNew);
-        return NULL;
-     }
-     iRet = Tcl_GetInt(pTcl,pPar,&iVal);
-     if(iRet != TCL_OK)
-     {
-        Tcl_SetResult(pTcl," Failed to convert port adress to integer",NULL);
-        KillC804(pNew);
-        return NULL;
-     }
-     pNew->iPort = iVal;
-     
-     pPar = NULL;
-     pPar = Tcl_GetVar2(pTcl,pArray,"channel",TCL_GLOBAL_ONLY);
-     if(!pPar)
-     {
-        Tcl_SetResult(pTcl,"Failed to find serial port server channel adress",NULL);
-        KillC804(pNew);
-        return NULL;
-     }
-     iRet = Tcl_GetInt(pTcl,pPar,&iVal);
-     if(iRet != TCL_OK)
-     {
-        Tcl_SetResult(pTcl," Failed to convert channel number to integer",NULL);
-        KillC804(pNew);
-        return NULL;
-     }
-     pNew->iChannel = iVal;
-     pPar = NULL;
-
-     pPar = Tcl_GetVar2(pTcl,pArray,"motor",TCL_GLOBAL_ONLY);
-     if(!pPar)
-     {
-        Tcl_SetResult(pTcl,"Failed to find motor number",NULL);
-        KillC804(pNew);
-        return NULL;
-     }
-     iRet = Tcl_GetInt(pTcl,pPar,&iVal);
-     if(iRet != TCL_OK)
-     {
-        Tcl_SetResult(pTcl," Failed to convert motor number to integer",NULL);
-        KillC804(pNew);
-        return NULL;
-     }
-     pNew->iMotor = iVal;
-     
-     /* limits */
-     pPar = NULL;
-     pPar = Tcl_GetVar2(pTcl,pArray,"lowerlimit",TCL_GLOBAL_ONLY);
-     if(!pPar)
-     {
-        Tcl_SetResult(pTcl,"Failed to  find lower motor limit",NULL);
-        KillC804(pNew);
-        return NULL;
-     }
-     iRet = Tcl_GetDouble(pTcl,pPar,&dVal);
-     if(iRet != TCL_OK)
-     {
-        Tcl_SetResult(pTcl," Failed to convert lower limit to double",NULL);
-        KillC804(pNew);
-        return NULL;
-     }
-     pNew->fLower = dVal;
-     
-     pPar = NULL;
-     pPar = Tcl_GetVar2(pTcl,pArray,"upperlimit",TCL_GLOBAL_ONLY);
-     if(!pPar)
-     {
-        Tcl_SetResult(pTcl,"Failed to find upper motor limit",NULL);
-        KillC804(pNew);
-        return NULL;
-     }
-     iRet = Tcl_GetDouble(pTcl,pPar,&dVal);
-     if(iRet != TCL_OK)
-     {
-        Tcl_SetResult(pTcl," Failed to convert motor number to integer",NULL);
-        KillC804(pNew);
-        return NULL;
-     }
-     pNew->fUpper  = dVal;
-      
-     
-     /* open the serialport connection */
-     iRet = SerialOpen(&pNew->pSerial,pNew->hostname, pNew->iPort,
-                       pNew->iChannel);
-     if(iRet != 1)
-     {
-        Tcl_SetResult(pTcl,
-            "Failed to open connection to serial port server",NULL);
-        KillC804(pNew);
-        return NULL;    
-     }                  
-     
-     /* switch on, just to make sure */
-     iTmo = SerialGetTmo(&pNew->pSerial);
-     SerialConfig(&pNew->pSerial,0);
-     sprintf(pCommand,"%1.1dMN\r",pNew->iMotor);
-     SerialWriteRead(&pNew->pSerial,pCommand,pReply,39);
-     SerialConfig(&pNew->pSerial,iTmo);
-     
-     /* configure the connection */
-     SerialATerm(&pNew->pSerial,"1\x03");
-     SerialSendTerm(&pNew->pSerial,"\r");
-  
-     /* configure the function pointers */
-     pNew->GetPosition = PIPosition;
-     pNew->RunTo       = PIRun;
-     pNew->GetStatus   = PIStatus;
-     pNew->GetError    = PIError;
-     pNew->TryAndFixIt = PIFixError;
-     pNew->Halt        = PIHalt;        
-     
-     /* success */
-     return pNew;
-  }  
-/*--------------------------------------------------------------------------*/
-  int PISetSpeed(pMotor pMot,SConnection *pCon, float fNew)
-  {
-     int iVal, iRet, iTmo;
-     char pCommand[20], pReply[80], pError[132];
-     pC804Driv self = NULL;
-     
-     assert(pMot);
-     self = (pC804Driv)pMot->pDriver;
-     assert(self);
-     
-     iVal = (int)fNew;
-     sprintf(pCommand,"%1.1dSV%7.7d\r",self->iMotor,iVal);
-     iTmo = SerialGetTmo(&self->pSerial);
-     SerialConfig(&self->pSerial,0);
-     iRet = SerialWriteRead(&self->pSerial,pCommand,pReply,79);
-     SerialConfig(&self->pSerial,iTmo);
-     if(iRet != 1)
-     {
-        self->iLastError = iRet;
-        PIError(self,&iRet,pReply,79);
-        sprintf(pError,"ERROR: %s",pReply);
-        SCWrite(pCon,pError,eError);   
-        return 0;  
-     }
-     return 1;
-  }  
-/*--------------------------------------------------------------------------*/
-  int PIHome(pMotor pMot,SConnection *pCon)
-  {
-     int iVal, iRet, iTmo;
-     char pCommand[20], pReply[80], pError[132];
-     pC804Driv self = NULL;
-     
-     assert(pMot);
-     self = (pC804Driv)pMot->pDriver;
-     assert(self);
-     
-     sprintf(pCommand,"%1.1dDH\r",self->iMotor);
-     iTmo = SerialGetTmo(&self->pSerial);
-     SerialConfig(&self->pSerial,0);
-     iRet = SerialWriteRead(&self->pSerial,pCommand,pReply,79);
-     SerialConfig(&self->pSerial,iTmo);
-     if(iRet != 1)
-     {
-        self->iLastError = iRet;
-        PIError(self,&iRet,pReply,79);
-        sprintf(pError,"ERROR: %s",pReply);
-        SCWrite(pCon,pError,eError);   
-        return 0;  
-     }
-     return 1;
-  }  
-/*--------------------------------------------------------------------------*/
-  int PIOn(pMotor pMot,SConnection *pCon)
-  {
-     int iVal, iRet, iTmo;
-     char pCommand[20], pReply[80], pError[132];
-     pC804Driv self = NULL;
-     
-     assert(pMot);
-     self = (pC804Driv)pMot->pDriver;
-     assert(self);
-     
-     sprintf(pCommand,"%1.1dMN\r",self->iMotor);
-     iTmo = SerialGetTmo(&self->pSerial);
-     SerialConfig(&self->pSerial,0);
-     iRet = SerialWriteRead(&self->pSerial,pCommand,pReply,79);
-     SerialConfig(&self->pSerial,iTmo);
-     if(iRet != 1)
-     {
-        self->iLastError = iRet;
-        PIError(self,&iRet,pReply,79);
-        sprintf(pError,"ERROR: %s",pReply);
-        SCWrite(pCon,pError,eError);   
-        return 0;  
-     }
-     return 1;
-  }  
-/*-------------------------------------------------------------------------*/
-  int PIGetSpeed(pMotor pMot,SConnection *pCon, float *fNew)
-  {
-     int iVal, iRet;
-     char pCommand[20], pReply[80], pError[132], *pPtr;
-     pC804Driv self = NULL;
-     
-     assert(pMot);
-     self = (pC804Driv)pMot->pDriver;
-     assert(self);
-     
-     sprintf(pCommand,"%1.1dTY\r",self->iMotor);
-     iRet = SerialWriteRead(&self->pSerial,pCommand,pReply,79);
-     if(iRet != 1)
-     {
-        self->iLastError = iRet;
-        PIError(self,&iRet,pReply,79);
-        sprintf(pError,"ERROR: %s",pReply);
-        SCWrite(pCon,pError,eError);   
-        return 0;  
-     }
-     pPtr = pReply+3;
-     *fNew = atof(pPtr);
-     return 1;
-  }  
-/*--------------------------------------------------------------------------*/
-  int PIMotorWrapper(SConnection *pCon, SicsInterp *pSics, void *pData,
-                     int argc, char *argv[])
-  {
-     pMotor pMot = NULL;
-     double dVal;
-     float fVal;
-     char pBueffel[256];
-     int iRet;
-     
-     pMot = (pMotor)pData;
-     
-     assert(pCon);
-     assert(pSics);
-     assert(pMot);
-     
-     if(argc >= 2)
-     {
-        strtolower(argv[1]);
-        if(strcmp(argv[1],"speed") == 0)
-        {
-           if(argc >= 3)
-           {
-              iRet = Tcl_GetDouble(pSics->pTcl,argv[2],&dVal);
-              if(iRet != TCL_OK)
-              {
-                 SCWrite(pCon,"ERROR: speed parameter not recognised as number",
-                         eError);
-                 return 0;        
-              }
-              if(!SCMatchRights(pCon,usMugger))
-              {
-                SCWrite(pCon,"ERROR: Insufficient privilege to change speed",
-                        eError);
-                return 0;        
-              }
-              iRet = PISetSpeed(pMot,pCon,(float)dVal);
-              if(!iRet)
-              {
-                 return 0;
-              }
-              SCSendOK(pCon);
-              return 1;
-           }
-           else
-           {
-              iRet = PIGetSpeed(pMot,pCon,&fVal);
-              if(!iRet)
-              {
-                 return 0;
-              }
-              sprintf(pBueffel,"%s.speed = %f",argv[0],fVal);
-              SCWrite(pCon,pBueffel,eValue);
-              return 1;         
-           }
-        } /* end speed */
-        if(strcmp(argv[1],"home") == 0)
-        {
-           if(!SCMatchRights(pCon,usMugger))
-           {
-             SCWrite(pCon,"ERROR: Insufficient privilege to change hardware 0",
-                     eError);
-             return 0;        
-           }
-           iRet = PIHome(pMot,pCon);
-           if(!iRet)
-           {
-             return 0;
-           }
-           SCSendOK(pCon);
-           return 1;
-        }
-        if(strcmp(argv[1],"on") == 0)
-        {
-           if(!SCMatchRights(pCon,usUser))
-           {
-             SCWrite(pCon,"ERROR: Insufficient privilege to switch motor on",
-                     eError);
-             return 0;        
-           }
-           iRet = PIOn(pMot,pCon);
-           if(!iRet)
-           {
-             return 0;
-           }
-           SCSendOK(pCon);
-           return 1;
-        }
-        if(strcmp(argv[1],"list") == 0)
-        {
-           iRet = PIGetSpeed(pMot,pCon,&fVal);
-           if(!iRet)
-           {
-              return 0;
-           }
-           sprintf(pBueffel,"%s.speed = %f",argv[0],fVal);
-           SCWrite(pCon,pBueffel,eValue);
-           return  MotorAction(pCon,pSics,pData,argc,argv);       
-        }
-           
-     }/* end arguments */
-     
-     /* forward everything else to main motor handler */
-     return MotorAction(pCon,pSics,pData,argc,argv);
-  } 
-/*--------------------------------------------------------------------------*/
-  static void PIMotorKill(void *self)
-  {
-     pMotor pM;
-     assert(self);
-     
-     pM = (pMotor)self;
-     
-     if(pM->name)
-       free(pM->name);
-     
-     if(pM->pDrivInt)
-     {
-       free(pM->pDrivInt);
-     }
-     
-     if(pM->pCall)
-     {
-       DeleteCallBackInterface(pM->pCall);
-     }
-     
-     /* kill driver */
-     if(pM->drivername)
-     {
-       if(strcmp(pM->drivername,"c804") == 0)
-       {
-	  if(pM->pDriver)
-	  {
-             KillC804((pC804Driv)pM->pDriver);
-	  }
-       }
-       else if(strcmp(pM->drivername,"SIM") == 0)
-       {
-          if(pM->pDriver)
-          {
-             KillSIM((void *)pM->pDriver);
-          }   
-       }	  
-     }
-     
-     if(pM->drivername)
-     {
-        free(pM->drivername);
-     }
-     /* get rid of parameter space */
-     if(pM->ParArray)
-     {
-       ObParDelete(pM->ParArray);
-     }
-     
-     /* kill Descriptor */
-     DeleteDescriptor(pM->pDescriptor);
-     
-     free(pM);
-  } 
-/*-------------------------------------------------------------------------*/  
-  int PIMotorFactory(SConnection *pCon, SicsInterp *pSics, void *pData,
-                        int argc, char *argv[])
-   {
-      pMotor pNew = NULL;
-      MotorDriver *pDriver = NULL;
-      char pBueffel[512];
-      int iD, iRet;
-      Tcl_Interp *ppTcl;
-      
-      assert(pCon);
-      assert(pSics);
-      
-      /* a first check */
-      if(argc < 3)
-      {
-        SCWrite(pCon,"Insufficient arguments for motor creation",eError);
-        return 0;
-      }
-      
-      /* create the driver */
-      strtolower(argv[2]);
-      strtolower(argv[1]);
-      if(strcmp(argv[2],"c804") == 0)
-      {
-         pDriver = (MotorDriver *)MakeC804Driver(pSics->pTcl,argv[3]);
-         if(!pDriver)
-         {
-           ppTcl = (Tcl_Interp *)pSics->pTcl;
-           SCWrite(pCon,ppTcl->result,eError);
-           return 0;
-         }
-         /* create the motor */
-         pNew  = MotorInit("c804",argv[1],pDriver);
-         if(!pNew)
-         {
-           sprintf(pBueffel,"Failure to create motor %s",argv[1]);
-           SCWrite(pCon,pBueffel,eError);
-           return 0; 
-         }
-      }
-      else if (strcmp(argv[2],"sim") == 0)
-      {
-         iD = argc - 3;
-         pDriver = CreateSIM(pCon,iD,&argv[3]);
-         if(!pDriver)
-         {
-          return 0;
-         }
-         /* create the motor */
-         pNew  = MotorInit("SIM",argv[1],pDriver);
-         if(!pNew)
-         {
-           sprintf(pBueffel,"Failure to create motor %s",argv[1]);
-           SCWrite(pCon,pBueffel,eError);
-           return 0; 
-         }
-      }
-      else 
-      {
-         sprintf(pBueffel,"Motor Type %s cot recognized for motor %s",
-                 argv[2],argv[1]);
-         SCWrite(pCon,pBueffel,eError);
-         return 0; 
-      }
-      
-      /* create the interpreter command */
-      iRet = AddCommand(pSics,argv[1],PIMotorWrapper,PIMotorKill,pNew);
-      if(!iRet)
-      {
-        sprintf(pBueffel,"ERROR: duplicate command %s not created",argv[1]);
-        SCWrite(pCon,pBueffel,eError);
-        return 0;
-      }
-      return 1;
-   }
-  
-                        
-    
-    
diff --git a/pimotor.h b/pimotor.h
deleted file mode 100644
index 83d39b44..00000000
--- a/pimotor.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*--------------------------------------------------------------------------
-                           P I M O T O R
-
-  Driver and add on code for the Physik Instrument Motor Controller C-804.
-  
-  Mark Koennecke, September 1998
-----------------------------------------------------------------------------*/
-#ifndef PIMOTOR
-#define PIMOTOR
-
-
-  int PIMotorWrapper(SConnection *pCon, SicsInterp *pSics, void *pData,
-                     int argc, char *argv[]);
-  int PIMotorFactory(SConnection *pCon, SicsInterp *pSics, void *pData,
-                     int argc, char *argv[]);
-
-  int PISetSpeed(pMotor self, SConnection *pCon, float fNew);
-  int PIGetSpeed(pMotor self, SConnection *pCon, float *fVal);
-
-  int PIHome(pMotor self, SConnection *pCon);
-
-#endif
-
diff --git a/pimotor.tex b/pimotor.tex
deleted file mode 100644
index d92c6566..00000000
--- a/pimotor.tex
+++ /dev/null
@@ -1,67 +0,0 @@
-\subsubsection{Physik Instrumente DC-Motor Controller}
-This is a mainly a driver for a C-804 DC-motor Controller as produced by the
-Company Physik Instrumente. This controller drives up to four high precision
-motors. These motors do not have reference points and have variable speeds.
-Therefore some additional code is needed to handle motor specific commands.
-This problem is solved by handling these specific additional commands in a
-new wrapper routine which finally calls the main motor wrapper routine for
-all the other commands. Of course, a special factory method is needed for
-this device as well.
-
-The public interface for this motor includes the following functions:
-
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap1}
-$\langle$pimoti {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  int PIMotorWrapper(SConnection *pCon, SicsInterp *pSics, void *pData,@\\
-\mbox{}\verb@                     int argc, char *argv[]);@\\
-\mbox{}\verb@  int PIMotorFactory(SConnection *pCon, SicsInterp *pSics, void *pData,@\\
-\mbox{}\verb@                     int argc, char *argv[]);@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  int PISetSpeed(pMotor self, SConnection *pCon, float fNew);@\\
-\mbox{}\verb@  int PIGetSpeed(pMotor self, SConnection *pCon, float *fVal);@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  int PIHome(pMotor self, SConnection *pCon);@\\
-\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@"pimotor.h"@ {\footnotesize ? }$\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@/*--------------------------------------------------------------------------@\\
-\mbox{}\verb@                           P I M O T O R@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  Driver and add on code for the Physik Instrument Motor Controller C-804.@\\
-\mbox{}\verb@  @\\
-\mbox{}\verb@  Mark Koennecke, September 1998@\\
-\mbox{}\verb@----------------------------------------------------------------------------*/@\\
-\mbox{}\verb@#ifndef PIMOTOR@\\
-\mbox{}\verb@#define PIMOTOR@\\
-\mbox{}\verb@@$\langle$pimoti {\footnotesize ?}$\rangle$\verb@@\\
-\mbox{}\verb@#endif@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@@$\diamond$
-\end{list}
-\vspace{-2ex}
-\end{minipage}\\[4ex]
-\end{flushleft}
-\subsubsection{Physik Instrument Piezo Controller E-255}
-This is piezo translator. A voltage is set and it elongates. It is
-handled as a motor because it is going to be scanned. A  driver has
-been  implemented in the file pipiezo.c. For
-the command protocoll, see the documentation coming with the gadget. 
- 
-
diff --git a/pimotor.w b/pimotor.w
deleted file mode 100644
index 0da1dd6e..00000000
--- a/pimotor.w
+++ /dev/null
@@ -1,48 +0,0 @@
-\subsubsection{Physik Instrumente DC-Motor Controller}
-This is a mainly a driver for a C-804 DC-motor Controller as produced by the
-Company Physik Instrumente. This controller drives up to four high precision
-motors. These motors do not have reference points and have variable speeds.
-Therefore some additional code is needed to handle motor specific commands.
-This problem is solved by handling these specific additional commands in a
-new wrapper routine which finally calls the main motor wrapper routine for
-all the other commands. Of course, a special factory method is needed for
-this device as well.
-
-The public interface for this motor includes the following functions:
-
-@d pimoti @{
-
-  int PIMotorWrapper(SConnection *pCon, SicsInterp *pSics, void *pData,
-                     int argc, char *argv[]);
-  int PIMotorFactory(SConnection *pCon, SicsInterp *pSics, void *pData,
-                     int argc, char *argv[]);
-
-  int PISetSpeed(pMotor self, SConnection *pCon, float fNew);
-  int PIGetSpeed(pMotor self, SConnection *pCon, float *fVal);
-
-  int PIHome(pMotor self, SConnection *pCon);
-@}  
-
-@o pimotor.h @{
-/*--------------------------------------------------------------------------
-                           P I M O T O R
-
-  Driver and add on code for the Physik Instrument Motor Controller C-804.
-  
-  Mark Koennecke, September 1998
-----------------------------------------------------------------------------*/
-#ifndef PIMOTOR
-#define PIMOTOR
-@<pimoti@>
-#endif
-
-@}
-
-
-\subsubsection{Physik Instrument Piezo Controller E-255}
-This is piezo translator. A voltage is set and it elongates. It is
-handled as a motor because it is going to be scanned. A  driver has
-been  implemented in the file pipiezo.c. For
-the command protocoll, see the documentation coming with the gadget. 
- 
-
diff --git a/pipiezo.c b/pipiezo.c
deleted file mode 100644
index b623bb3e..00000000
--- a/pipiezo.c
+++ /dev/null
@@ -1,390 +0,0 @@
-/*--------------------------------------------------------------------------
-                               P I M O T O R
-                               
-   This file contains the implementation of a motor driver for the Physik
-   Instrumente Piezo Controller E-255. It is handled as a motor though it
-   is a Piezo device. This gets a preset voltage in millivolts and that
-   determines it's elongation and that is it. 
-
-   Mark Koennecke, February 1999
-
-----------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <assert.h>
-#include <tcl.h>
-#include "fortify.h"
-#include "sics.h"
-#include "hardsup/serialsinq.h"
-#include "hardsup/el734_def.h"
-#include "hardsup/el734fix.h"
-#include "motor.h"
-
-
-/*================== The Driver data structure ============================*/
-  typedef struct __PIPiezo {
-                           /* general motor driver interface 
-                              fields. REQUIRED!
-                           */
-                           float fUpper; /* upper limit */
-                           float fLower; /* lower limit */
-                           char *name;
-                           int   (*GetPosition)(void *self,float *fPos);
-                           int   (*RunTo)(void *self, float fNewVal);
-                           int   (*GetStatus)(void *self);
-                           void  (*GetError)(void *self, int *iCode, char *buffer, int iBufLen);
-                           int   (*TryAndFixIt)(void *self,int iError, float fNew);
-                           int   (*Halt)(void *self);
-                           int   (*GetDriverPar)(void *self, char *name, 
-                                  float *value);
-                           int    (*SetDriverPar)(void *self,SConnection *pCon,
-                                   char *name, float newValue);
-                           void   (*ListDriverPar)(void *self, char *motorName,
-                                  SConnection *pCon);
-                           
-                           
-                           /* PiPiezo specific fields */
-                           int iPort;
-                           char *hostname;
-                           int iChannel;
-                           int iMotor;
-                           void *pSerial;
-                           int iLastError;
-                           int iLastVolt;
-                          }PiPiezo, *pPiPiezo;
-   
-#define PITMO -845
-#define PICOMERR -846
-/*--------------------------------------------------------------------------*/
- static int PIPosition(void *pData, float *fPos)
- {
-      pPiPiezo self = NULL;
-      int iRet;
-      char pCommand[20];
-      char pReply[80];
-      char *pPtr;
-      
-      self = (pPiPiezo)pData;
-      assert(self);
-      
-      /* format command */
-      sprintf(pCommand,"%1.1dTO\r",self->iMotor); 
-      
-      /* send command */
-      iRet = SerialWriteRead(&self->pSerial,pCommand, pReply, 79);
-      if(iRet != 1)
-      {
-         self->iLastError = iRet;
-         *fPos = -99999;
-         return HWFault;  
-      }
-      
-      /* catch TMO or bad reply */
-      if(strstr(pReply,"TMO") != NULL)
-      {
-         self->iLastError = PITMO;
-         *fPos = -9999;
-         return HWFault;
-      }
-      if(strstr(pReply,"?") != NULL)
-      {
-         self->iLastError = PICOMERR;
-         *fPos = -9999;
-         return HWFault;
-      }
-
-      
-      /* read value */
-      pPtr = pReply + 3;
-      *fPos = atof(pPtr);
-      return OKOK;
- } 
-/*-------------------------------------------------------------------------*/
- static int PIRun(void *pData, float fVal)
- {
-      pPiPiezo self = NULL;
-      int iRet;
-      char pCommand[20];
-      char pReply[80];
-      int iTmo;
-      
-      self = (pPiPiezo)pData;
-      assert(self);
-      
-      /* format command */
-      sprintf(pCommand,"%1.1dSO%5.5d\r",self->iMotor,(int)fVal); 
-      
-      /* send command */
-      iRet = SerialWriteRead(&self->pSerial,pCommand, pReply, 79);
-      if(iRet != 1)
-      {
-         self->iLastError = iRet;
-         return HWFault;  
-      }
-      self->iLastVolt = (int)fVal;
-
-      return OKOK;
- }                                  
-/*---------------------------------------------------------------------------*/
- static void PIError(void *pData, int *iCode, char *pError, int iErrLen)
- {
-      pPiPiezo self = NULL;
-     
-      self = (pPiPiezo)pData;
-      assert(self);
-       
-      *iCode = self->iLastError;
-      
-      if(*iCode == PITMO)
-      {
-        strncpy(pError,"Timeout at serial line", iErrLen);
-        return;
-      }  
-      if(*iCode == PICOMERR)
-      {
-        strncpy(pError,"E-255 Command Error",iErrLen);
-        return;
-      }
-
-      /* wait a little to give this thing a reaction time, otherwise
-         trouble reading responses
-      */
-      SicsWait(2);      
-      SerialError(self->iLastError,pError,iErrLen);
-      return;     
- } 
-/*--------------------------------------------------------------------------*/
- static int PIFixError(void *pData, int iError, float fNew)
- {
-    pPiPiezo self = NULL;
-    int iRet;
-    
-    self = (pPiPiezo)pData;
-    assert(self);
-    
-        switch(iError)
-        {
-            /* network errors */
-            case NOCONNECTION:
-            case EL734__BAD_FLUSH:
-            case EL734__BAD_RECV:
-            case EL734__BAD_RECV_NET:
-            case EL734__BAD_RECV_UNKN:
-            case EL734__BAD_RECVLEN:
-            case EL734__BAD_RECV1:
-            case EL734__BAD_RECV1_PIPE:
-            case EL734__BAD_RNG:
-            case EL734__BAD_SEND:
-            case EL734__BAD_SEND_PIPE:
-            case EL734__BAD_SEND_NET:
-            case EL734__BAD_SEND_UNKN:
-            case EL734__BAD_SENDLEN:
-                      SerialClose(&self->pSerial);
-                      iRet = SerialOpen(&self->pSerial,self->hostname,
-                                        self->iPort, self->iChannel);
-                      if(iRet != 1)
-                      {
-                        return MOTREDO;
-                      }                 
-                      else
-                      {
-                        return MOTFAIL;
-                      }                 
-                      break;
-            /* handable protocoll errors */
-            case EL734__BAD_TMO:
-            case PITMO:
-            case TIMEOUT:
-                      return MOTREDO;
-                      break;
-            case PICOMERR:
-                      return MOTFAIL;
-                      break;          
-            default:
-                      return MOTFAIL;
-                      break;                       
-        }
-        return MOTFAIL;
- }
-/*---------------------------------------------------------------------------*/
-  static int PIHalt(void *pData)
-  {
-
-    /* just drive to 0 volt */     
-     PIRun(pData,0.0);
-     
-     return 1;
-  }  
-#define ABS(x) (x < 0 ? -(x) : (x))    
-/*-------------------------------------------------------------------------*/
-  static int PIStatus(void *pData)
-  {
-     pPiPiezo self = NULL;
-     char pCommand[20], pReply[80], *pPtr;
-     int iRet;
-     float fSpeed;
-     int iSpeed, iDiff;
-     
-     self = (pPiPiezo)pData;
-     assert(self);
-  
-     /* read actual velocity: should be 0 when done */
-     sprintf(pCommand,"%1.1dTO",self->iMotor);
-     iRet = SerialWriteRead(&self->pSerial,pCommand,pReply,79);
-     if(iRet != 1)
-     {
-        self->iLastError = iRet;
-        return HWFault;  
-     }
-     /* check reply */
-     if(strstr(pReply,"TMO") != NULL)
-     {
-        self->iLastError = PITMO;
-        return HWFault;
-     }
-     if(strstr(pReply,"?") != NULL)
-     {
-        self->iLastError = PICOMERR;
-        return HWFault;
-     }
-   
-     pPtr = pReply+3;
-     iSpeed = atoi(pPtr);
-     iDiff = iSpeed - self->iLastVolt;
-     if(ABS(iDiff) > 5)
-     {
-        return HWBusy;
-     }
-     return HWIdle;
-  }
-/*------------------------------------------------------------------------*/
-  void KillPiPiezo(pPiPiezo self)
-  {
-     if(!self)
-        return;
-        
-     if(self->name)
-     {
-        free(self->name);
-     }
-     if(self->hostname)
-     {
-        free(self->hostname);
-     }
-     if(self->pSerial)
-     {
-        SerialClose(&self->pSerial);
-     }
-     free(self);
-  }  
-/*--------------------------------------------------------------------------
- * The data necessary for initialising the PiPiezo motor is contained in a
- * Tcl-Array given as pArray parameter. In case of an error the error is
- * returned in the Tcl-interpreter.
- */
-  MotorDriver *MakePiPiezo(Tcl_Interp *pTcl,char *pArray)
-  {
-     pPiPiezo pNew = NULL;
-     int iRet, iVal, iTmo;
-     double dVal;
-     char *pPar = NULL;
-     char pCommand[20], pReply[40];
-     
-     /* allocate space: the final frontier */
-     pNew = (pPiPiezo)malloc(sizeof(PiPiezo));
-     if(!pNew)
-     {
-        Tcl_SetResult(pTcl,"Out of memory for PiPiezo Driver",NULL);
-        return NULL;  
-     }
-     memset(pNew,0,sizeof(PiPiezo));
-     
-     /* connection parameters */
-     pPar = Tcl_GetVar2(pTcl,pArray,"Computer",TCL_GLOBAL_ONLY);
-     if(!pPar)
-     {
-        Tcl_SetResult(pTcl,"Failed to find serial port server host name",NULL);
-        KillPiPiezo(pNew);
-        return NULL;
-     }
-     pNew->hostname = strdup(pPar);
-     
-     pPar = NULL;
-     pPar = Tcl_GetVar2(pTcl,pArray,"port",TCL_GLOBAL_ONLY);
-     if(!pPar)
-     {
-        Tcl_SetResult(pTcl,"Failed to find serial port server port adress",NULL);
-        KillPiPiezo(pNew);
-        return NULL;
-     }
-     iRet = Tcl_GetInt(pTcl,pPar,&iVal);
-     if(iRet != TCL_OK)
-     {
-        Tcl_SetResult(pTcl," Failed to convert port adress to integer",NULL);
-        KillPiPiezo(pNew);
-        return NULL;
-     }
-     pNew->iPort = iVal;
-     
-     pPar = NULL;
-     pPar = Tcl_GetVar2(pTcl,pArray,"channel",TCL_GLOBAL_ONLY);
-     if(!pPar)
-     {
-        Tcl_SetResult(pTcl,"Failed to find serial port server channel adress",NULL);
-        KillPiPiezo(pNew);
-        return NULL;
-     }
-     iRet = Tcl_GetInt(pTcl,pPar,&iVal);
-     if(iRet != TCL_OK)
-     {
-        Tcl_SetResult(pTcl," Failed to convert channel number to integer",NULL);
-        KillPiPiezo(pNew);
-        return NULL;
-     }
-     pNew->iChannel = iVal;
-     pPar = NULL;
-
-     pPar = Tcl_GetVar2(pTcl,pArray,"motor",TCL_GLOBAL_ONLY);
-     if(!pPar)
-     {
-        Tcl_SetResult(pTcl,"Failed to find motor number",NULL);
-        KillPiPiezo(pNew);
-        return NULL;
-     }
-     iRet = Tcl_GetInt(pTcl,pPar,&iVal);
-     if(iRet != TCL_OK)
-     {
-        Tcl_SetResult(pTcl," Failed to convert motor number to integer",NULL);
-        KillPiPiezo(pNew);
-        return NULL;
-     }
-     pNew->iMotor = iVal;
-     
-     pNew->fUpper = 12000.;
-     pNew->fLower = -2000.;
-     
-     /* open the serialport connection */
-     iRet = SerialOpen(&pNew->pSerial,pNew->hostname, pNew->iPort,
-                       pNew->iChannel);
-     if(iRet != 1)
-     {
-        Tcl_SetResult(pTcl,
-            "Failed to open connection to serial port server",NULL);
-        KillPiPiezo(pNew);
-        return NULL;    
-     }                  
-     
-     /* configure the connection */
-     SerialATerm(&pNew->pSerial,"1\x03");
-     SerialSendTerm(&pNew->pSerial,"\r");
-  
-     /* configure the function pointers */
-     pNew->GetPosition = PIPosition;
-     pNew->RunTo       = PIRun;
-     pNew->GetStatus   = PIStatus;
-     pNew->GetError    = PIError;
-     pNew->TryAndFixIt = PIFixError;
-     pNew->Halt        = PIHalt;        
-     
-     /* success */
-     return (MotorDriver *)pNew;
-  }  
diff --git a/polterwrite.c b/polterwrite.c
deleted file mode 100644
index ec124cca..00000000
--- a/polterwrite.c
+++ /dev/null
@@ -1,786 +0,0 @@
-/*--------------------------------------------------------------------------
-                               P O L T E R W R I T E
-                            
-    Polterwrite is an object for writing POLTI data files. 
-    
-    copyright: see copyright.h
-    
-    Uwe Filges, November 2001
-----------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <assert.h>
-#include <math.h>
-#include <time.h>
-#include <tcl.h>
-#undef VOID
-#include "sics.h"
-#include "event.h"
-#include "counter.h"
-#include "HistMem.h"
-#include "nxdict.h"
-#include "nxutil.h"
-#include "motor.h"
-#include "sicsvar.h"
-#include "polterwrite.h"
-
-/*
-  diaphragm1 - chopper
-*/
-#define DIA1DIST 8000
-
-/*
-   histogram memory name
-*/
-#define HM "hm"
-
-#define DETRADIUS 3000
-
-typedef struct {
-                pObjectDescriptor pDes;
-                pHistMem pHist;
-                int iNew;
-                time_t tUpdate;
-                int iInterval;
-                int iEnd;
-                SConnection *pCon;
-                char *dictfile;
-                char *pFile; 
-}Polterdi, *pPolterdi;
-
-/* ------------------- forward declaration of task function --------------*/
-  static int PoldiTask(void *pData);                  
-  static void PoldiUpdate(pPolterdi self, SConnection *pCon);
-
-/*------------------ The Countstart Callback Function ----------------------*/
-   static int Countstartcallback(int iEvent, void *pEventData, void *pUser)
-   {
-      pPolterdi self = NULL;
-      
-      if(iEvent == COUNTSTART)
-      {
-         self = (pPolterdi)pUser;
-         assert(self);
-         self->iNew = 1;
-         self->iEnd = 0;
-         self->tUpdate = time(NULL);
-         self->pCon = (SConnection *)pEventData;
-         TaskRegister(pServ->pTasker,PoldiTask,NULL,NULL,self,1);
-         return 1;
-      }
-      return 1;
-   }               
-/*------------------ The Countend Callback Function ----------------------*/
-   static int Countendcallback(int iEvent, void *pEventData, void *pUser)
-   {
-      pPolterdi self = NULL;
-      
-      if(iEvent == COUNTEND)
-      {
-         self = (pPolterdi)pUser;
-         assert(self);
-         self->tUpdate = time(NULL);
-         self->iEnd = 1;
-         PoldiUpdate(self,self->pCon);
-         return 1;
-      }
-      return 1;
-   }               
-
-/*-----------------------------------------------------------------------*/
-  static void SNError(void *pData, char *text)
-  {
-     SConnection *pCon;
-     
-     assert(pData);
-     pCon = (SConnection *)pData;
-     SCWrite(pCon,text,eError);
-  }   
-
-/*-------------------------------------------------------------------*/
-static void writePolterdiGlobal(NXhandle hfil, NXdict hdict, 
-                                SConnection *pCon){
-  char pBueffel[512];
-
-  SNXSPutVariable(pServ->pSics,pCon,hfil,hdict,"etitle","title");       
-  SNXFormatTime(pBueffel,511);
-
-  NXDputalias(hfil,hdict,"estart",pBueffel);
-  SNXSPutVariable(pServ->pSics,pCon,hfil,hdict,"iname","instrument"); 
-  sprintf(pBueffel,"%d",strlen("SINQ, PSI, Switzerland"));
-  NXDupdate(hdict,"strdim",pBueffel);
-  NXDputalias(hfil,hdict,"sname","SINQ, PSI, Switzerland");
-  sprintf(pBueffel,"%d",strlen("continous spallation source"));
-  NXDupdate(hdict,"strdim",pBueffel);
-  NXDputalias(hfil,hdict,"stype","continous spallation source");
-  NXDupdate(hdict,"strdim","132");
-}
-/*-------------------------------------------------------------------*/
-static void writeChopper(NXhandle hfil, NXdict hdict, SConnection *pCon){
-  SNXSPutVariable(pServ->pSics,pCon,hfil,hdict,"cname","choppername");
-  SNXSPutDrivable(pServ->pSics,pCon,hfil,hdict,"chopperspeed","crot");
-}
-/*-------------------------------------------------------------------*/
-static void writeDiaphragm1(NXhandle hfil, NXdict hdict, 
-                            SConnection *pCon){
-  float dist;
-
-  SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,"dia1x","d1hl");  
-  SNXSPutMotorNull(pServ->pSics,pCon,hfil,hdict,"dia1x0","d1hl");
-  SNXSPutMotor(pServ->pSics,pCon,hfil,hdict,"dia1y","d1hr");  
-  SNXSPutMotorNull(pServ->pSics,pCon,hfil,hdict,"dia1y0","d1hr");
-  dist = (float)DIA1DIST;
-  NXDputalias(hfil,hdict,"dia1dist",&dist);
-}
-
-/*------------------------------------------------------------------*/
-
-static void writeDiaphragm2(NXhandle hfil, NXdict hdict, 
-                            SConnection *pCon){
-  
-  SNXSPutMotor(pServ->pSics, pCon, hfil, hdict, "dia2x_plus", "d2hl");
-  SNXSPutMotorNull(pServ->pSics, pCon, hfil, hdict, "dia2xplus0", "d2hl");
-  SNXSPutMotor(pServ->pSics, pCon, hfil, hdict, "dia2x_minus", "d2hr");
-  SNXSPutMotorNull(pServ->pSics, pCon, hfil, hdict, "dia2xminus0", "d2hr");
-  SNXSPutMotor(pServ->pSics, pCon, hfil, hdict, "dia2z_plus", "d2vu");
-  SNXSPutMotorNull(pServ->pSics, pCon, hfil, hdict, "dia2zplus0", "d2vu");
-  SNXSPutMotor(pServ->pSics, pCon, hfil, hdict, "dia2z_minus", "d2vl");
-  SNXSPutMotorNull(pServ->pSics, pCon, hfil, hdict, "dia2zminus0", "d2vl");
-
-  SNXSPutVariable(pServ->pSics,pCon,hfil,hdict,"dia2dist","dia1_dia2");
-}
-/*--------------------------------------------------------------------*/
-static void writeSample(NXhandle hfil, NXdict hdict, 
-                        SConnection *pCon)
-{
-   
-  SNXSPutVariable(pServ->pSics,pCon,hfil,hdict,"sdist","dia2_sample");
-  SNXSPutVariable(pServ->pSics,pCon,hfil,hdict,"chopperdist","chopper_sample"); 
-  SNXSPutVariable(pServ->pSics,pCon,hfil,hdict,"saname","sample");
-  SNXSPutVariable(pServ->pSics,pCon,hfil,hdict,"senvir","environment");
-  /*
-  SNXSPutEVVar(hfil,hdict,"temperature",pCon,"stemp","stddev");
-  SNXSPutMotor(pServ->pSics, pCon, hfil, hdict, "srsu", "rsu");
-  SNXSPutMotorNull(pServ->pSics, pCon, hfil, hdict, "srsu0", "rsu");
-  SNXSPutMotor(pServ->pSics, pCon, hfil, hdict, "srsl", "rsl");
-  SNXSPutMotorNull(pServ->pSics, pCon, hfil, hdict, "srsl0", "rsl");
-  SNXSPutMotor(pServ->pSics, pCon, hfil, hdict, "srsa", "rsa");
-  SNXSPutMotorNull(pServ->pSics, pCon, hfil, hdict, "srsa0", "rsa");
-  */
-  SNXSPutMotor(pServ->pSics, pCon, hfil, hdict, "sshu", "shu");
-  SNXSPutMotorNull(pServ->pSics, pCon, hfil, hdict, "sshu0", "shu");
-  SNXSPutMotor(pServ->pSics, pCon, hfil, hdict, "sshl", "shl");
-  SNXSPutMotorNull(pServ->pSics, pCon, hfil, hdict, "sshl0", "shl");
-  SNXSPutMotor(pServ->pSics, pCon, hfil, hdict, "ssgu", "sgu");
-  SNXSPutMotorNull(pServ->pSics, pCon, hfil, hdict, "ssgu0", "sgu");
-  SNXSPutMotor(pServ->pSics, pCon, hfil, hdict, "ssgl", "sgl");
-  SNXSPutMotorNull(pServ->pSics, pCon, hfil, hdict, "ssgl0", "sgl");
-  SNXSPutMotor(pServ->pSics, pCon, hfil, hdict, "ssv", "sv");
-  SNXSPutMotorNull(pServ->pSics, pCon, hfil, hdict, "ssv0", "sv");
-  SNXSPutMotor(pServ->pSics, pCon, hfil, hdict, "ssa", "sa");
-  SNXSPutMotorNull(pServ->pSics, pCon, hfil, hdict, "ssa0", "sa");  
-}
-
-/*--------------------------------------------------------------------*/
-
-static int PoldiStart(pPolterdi self, SConnection *pCon)
-{
-  char pBueffel[256];
-  NXhandle hfil = NULL;
-  NXdict   hdict= NULL;
-  int status;
-  const float *fTime = NULL;
-  CounterMode eMode;
-  float *fTime2 = NULL,fTheta0[801],fTheta[801], fVal;
-  pSicsVariable pVar = NULL;  
-  float det_radius, det_size, x0det, y0det, twothet;
-  float pi, alpha1, alphasamp, sms, phidetav, phim;
-  float phi2det, val1, val2, nodet,scancheck;
-  int iLength, i, nzell;
-  pMotor sa;
-  HistInt *lData = NULL;
-  long lVal;
-
-  /* create filename */
-  self->pFile = SNXMakeFileName(pServ->pSics,pCon);
-  if(!self->pFile)
-  {
-       SCWrite(pCon,"ERROR: Extra severe: failed to create data file name",
-               eError);
-       return 0;
-  }
-  /* create a Nexus file */
-  NXopen(self->pFile,NXACC_CREATE,&hfil);
-  if(!hfil)
-  {
-       SCWrite(pCon,"ERROR: cannot create data file ",eError);
-       return 0;
-  }
-  /* tell Uwe User what we are doing */
-   pVar = NULL;
-     pVar = FindVariable(pServ->pSics,"scancheck");
-     if(pVar)
-     {
-         VarGetFloat(pVar, &scancheck);
-     } else {
-         SCWrite(pCon,"ERROR: Command not found!",eError);
-         return;
-     }  
-     if (scancheck == 0) {
-         sprintf(pBueffel,"Writing %s ......",self->pFile);
-         SCWrite(pCon,pBueffel,eWarning);
-     }
-
-     
-  /* write globals */
-  SNXSPutGlobals(hfil,self->pFile,"POLDI",pCon);
-      
-  /* open nxdict */
-  status = NXDinitfromfile(self->dictfile,&hdict);
-  if(status != NX_OK)
-  {
-        sprintf(pBueffel,"ERROR: failed to open dictionary file %s",
-                self->dictfile);
-        SCWrite(pCon,pBueffel,eError);
-        SCWrite(pCon,"ERROR: Aborting data file writing",eError);
-        SCWrite(pCon,"ERROR: This is a SERIOUS problem!",eError);
-        SCWrite(pCon,"ERROR: DATA NOT WRITTEN",eError);
-        NXclose(&hfil);
-        return 0;        
-  }
-
-
-  writePolterdiGlobal(hfil,hdict,pCon);
-
-  writeChopper(hfil,hdict,pCon);
-
-  writeDiaphragm1(hfil,hdict,pCon);
-
-  writeDiaphragm2(hfil,hdict,pCon);
-
-  writeSample(hfil,hdict,pCon); 
-
-  /*
-    write time binning
-  */
-
-  fTime = GetHistTimeBin(self->pHist,&iLength);
-  fTime2 = (float *)malloc(iLength*sizeof(float));
-  if(fTime2)
-  {
-    for(i = 0;i < iLength; i++)
-    {
-      fTime2[i] = fTime[i]/2.;
-    }
-    sprintf(pBueffel,"%d",iLength);
-    NXDupdate(hdict,"timebin",pBueffel);
-    NXDputalias(hfil,hdict,"dtime",fTime2);
-    free(fTime2);
-  }
-  else
-  {
-    SCWrite(pCon,"ERROR: out of memory while writing time binning",eError);
-  }
-
-  /*
-    theta calculation
-  */
-  det_radius = (float)DETRADIUS;
-  pVar = FindVariable(pServ->pSics,"det_size");
-  if(pVar)
-  {
-    VarGetFloat(pVar,&det_size);
-  } else {
-    SCWrite(pCon,"ERROR: Command not found!",eError);
-    return;
-  } 
-  pVar = NULL;
-  pVar = FindVariable(pServ->pSics,"nodet");
-  if(pVar)
-  {
-    VarGetFloat(pVar,&nodet);
-  } else {
-    SCWrite(pCon,"ERROR: Command not found!",eError);
-    return;
-  } 
-  pVar = NULL;
-  nzell = (int)nodet;
-
-  pVar = FindVariable(pServ->pSics,"x0_det");
-  if(pVar)
-  {
-    VarGetFloat(pVar,&x0det);
-  } else {
-    SCWrite(pCon,"ERROR: Command not found!",eError);
-    return;
-  } 
-  pVar = NULL;
-  pVar = FindVariable(pServ->pSics,"y0_det");
-  if(pVar)
-  {
-    VarGetFloat(pVar, &y0det);
-  } else {
-    SCWrite(pCon,"ERROR: Command not found!",eError);
-    return;
-  } 
-  pVar = NULL;
-  pVar = FindVariable(pServ->pSics,"twotheta");
-  if(pVar)
-  {
-    VarGetFloat(pVar, &twothet);
-  } else {
-    SCWrite(pCon,"ERROR: Command not found!",eError);
-    return;
-  }  
-
-  pi = 3.1415926536;
-  /* transformation to radient */
-  twothet = twothet*pi/180;
-  if (x0det < 0) {
-     alpha1 = atan(y0det/x0det);
-  }
-  if (x0det > 0) {
-     alpha1 = pi + atan(y0det/x0det);
-  }     
-  alphasamp=pi + alpha1 - twothet;
-  sms = sqrt(x0det*x0det + y0det*y0det);
-  phidetav = pi - alphasamp - asin(sms/det_radius*sin(alphasamp)) + alpha1;
-  phim = atan(y0det/x0det);
-  if (phim < 0) {
-     phim = pi + phim;
-  }
-  for(i = 0; i <= nzell; i++)
-  {    
-    phi2det = phidetav+(i-0.5*(nzell-1.0))*det_size/(det_radius);
-    val1 = det_radius*sin(phi2det) - sms*sin(phim);
-    val2 = det_radius*cos(phi2det) - sms*cos(phim);
-    fTheta0[i] = atan(val1/val2);
-    if (fTheta0[i] < 0) {
-      fTheta0[i] = pi + fTheta0[i];
-    }
-    /* transformation to degree */
-    fTheta0[i] = fTheta0[i]*180/pi;  
-  }  
-  for (i=0;i<=nzell;i++)
-  {
-    fTheta[i]=fTheta0[nzell-i];
-  }
-  NXDputalias(hfil,hdict,"dtheta",fTheta);
-  NXDputalias(hfil,hdict,"detector_radius",&det_radius);
-  NXDputalias(hfil,hdict,"cell_size",&det_size);
-  SNXSPutVariable(pServ->pSics,pCon,hfil,hdict,"ddist","detectordist");
-  SNXSPutVariable(pServ->pSics,pCon,hfil,hdict,"sangle","scatt_angle");
-  SNXSPutVariable(pServ->pSics,pCon,hfil,hdict,"detx0","x0_det");
-  SNXSPutVariable(pServ->pSics,pCon,hfil,hdict,"dety0","y0_det");
-  SNXSPutVariable(pServ->pSics,pCon,hfil,hdict,"theta","twotheta");
-  /*
-    write Histogram
-  */
-  lData = GetHistogramPointer(self->pHist,pCon);
-  if(lData)
-  {
-    NXDputalias(hfil,hdict,"dcounts",lData);
-  }
-  else
-  {
-    SCWrite(pCon,"ERROR: failed to get histogram data",eError);
-  }
-  
-  /*
-    write counting data
-  */
-  fVal = GetHistCountTime(self->pHist,pCon);
-  NXDputalias(hfil,hdict,"cntime",&fVal);
-  lVal = GetHistMonitor(self->pHist,1,pCon);
-  NXDputalias(hfil,hdict,"cnmon1",&lVal);
-  eMode = GetHistCountMode(self->pHist);
-  if(eMode == eTimer)
-  {
-     strcpy(pBueffel,"timer");
-  }           
-  else
-  {
-     strcpy(pBueffel,"monitor");
-  }
-  NXDputalias(hfil,hdict,"cnmode",pBueffel);
-  fVal = GetHistPreset(self->pHist);
-  NXDputalias(hfil,hdict,"cnpreset",&fVal);
-  
-   /* close everything */
-  NXclose(&hfil);
-  NXDclose(hdict,NULL);
-  self->iNew = 0;
-}
-
-/*---------------------------------------------------------------------------*/
-
-  static void PoldiUpdate(pPolterdi self, SConnection *pCon)
-  {
-      char pBueffel[256];
-      NXhandle hfil = NULL;
-      NXdict   hdict = NULL;
-      int status;
-      const float *fTime = NULL;
-      CounterMode eMode;
-      float *fTime2 = NULL, fTheta[801], fVal;
-      pSicsVariable pVar = NULL;  
-      float det_radius, det_size, x0det, y0det, twothet;
-      float pi, alpha1, alphasamp, sms, phidetav, phim;
-      float phi2det, val1, val2, nodet, scancheck;
-      int iLength, i, nzell;
-      pMotor sa;
-      HistInt *lData = NULL;
-      long lVal;
-      time_t zeit;
-
-     /* open everything again */
-     status = NXopen(self->pFile,NXACC_RDWR,&hfil);
-     if(status != NX_OK)
-    {
-         SCWrite(pCon,"ERROR: cannot reopen data file ",eError);
-         return;
-     }
-     status = NXDinitfromfile(self->dictfile,&hdict);
-     if(status != NX_OK)
-     {
-        sprintf(pBueffel,"ERROR: failed to open dictionary file %s",
-                self->dictfile);
-        SCWrite(pCon,pBueffel,eError);
-        SCWrite(pCon,"ERROR: Aborting data file writing",eError);
-        SCWrite(pCon,"ERROR: This is a SERIOUS problem!",eError);
-        SCWrite(pCon,"ERROR: DATA NOT WRITTEN",eError);
-        NXclose(&hfil);
-        return;
-      }
-      
-     /* tell the user that something is happening */
-     pVar = NULL;
-     pVar = FindVariable(pServ->pSics,"scancheck");
-     if(pVar)
-     {
-         VarGetFloat(pVar, &scancheck);
-     } else {
-         SCWrite(pCon,"ERROR: Command not found!",eError);
-         return;
-     }  
-     if (scancheck == 0) {
-       time(&zeit); 
-        sprintf(pBueffel,"Updating %s on %s ",self->pFile,asctime(localtime(&zeit)));
-        SCWrite(pCon,pBueffel,eWarning);
-     }
-     /*
-    write time binning
-     */
-
-    fTime = GetHistTimeBin(self->pHist,&iLength);
-    fTime2 = (float *)malloc(iLength*sizeof(float));
-    if(fTime2)
-    {
-      for(i = 0;i < iLength; i++) {
-         fTime2[i] = fTime[i]/2.;
-      }
-      sprintf(pBueffel,"%d",iLength);
-      NXDupdate(hdict,"timebin",pBueffel);
-      NXDputalias(hfil,hdict,"dtime",fTime2);
-      free(fTime2);
-    } else {
-      SCWrite(pCon,"ERROR: out of memory while writing time binning",eError);
-    }
-
-  /*
-    write Histogram
-  */
-
-  lData = GetHistogramPointer(self->pHist,pCon);
-  if(lData)
-  {
-    NXDputalias(hfil,hdict,"dcounts",lData);
-  }
-  else
-  {
-    SCWrite(pCon,"ERROR: failed to get histogram data",eError);
-  }
-  
-  /*
-    write counting data
-  */
-  fVal = GetHistCountTime(self->pHist,pCon);
-  NXDputalias(hfil,hdict,"cntime",&fVal);
-  lVal = GetHistMonitor(self->pHist,1,pCon);
-  NXDputalias(hfil,hdict,"cnmon1",&lVal);
-  eMode = GetHistCountMode(self->pHist);
-  if(eMode == eTimer)
-  {
-     strcpy(pBueffel,"timer");
-  }           
-  else
-  {
-     strcpy(pBueffel,"monitor");
-  }
-  NXDputalias(hfil,hdict,"cnmode",pBueffel);
-  fVal = GetHistPreset(self->pHist);
-  NXDputalias(hfil,hdict,"cnpreset",&fVal);
-   
- 
-     /* close everything */
-     NXclose(&hfil);
-     NXDclose(hdict,NULL);
-      
-  }                 
-
-/*-------------------------------------------------------------------------
-  FoLink sets all the links for the NXdata vGroup. Had to be separate because
-  at least one update is necessary before this can be done.
--------------------------------------------------------------------------*/
-
-  static void PoldiLink(pPolterdi self, SConnection *pCon)
-  {
-     NXhandle hfil = NULL;
-     NXdict   hdict = NULL;
-     int status;
-     char pBueffel[512];
-     
-       /* open everything again */
-     NXopen(self->pFile,NXACC_RDWR,&hfil);
-     if(!self->pFile)
-     {
-         SCWrite(pCon,"ERROR: cannot reopen data file ",eError);
-         return;
-     }
-     status = NXDinitfromfile(self->dictfile,&hdict);
-     if(status != NX_OK)
-     {
-        sprintf(pBueffel,"ERROR: failed to open dictionary file %s",
-                self->dictfile);
-        SCWrite(pCon,pBueffel,eError);
-        SCWrite(pCon,"ERROR: Aborting data file writing",eError);
-        SCWrite(pCon,"ERROR: This is a SERIOUS problem!",eError);
-        SCWrite(pCon,"ERROR: DATA NOT WRITTEN",eError);
-        NXclose(&hfil);
-        return;
-      }
-
-      NXDaliaslink(hfil,hdict,"dana","dcounts");
-      NXDaliaslink(hfil,hdict,"dana","dtheta");
-      NXDaliaslink(hfil,hdict,"dana","dtime");
-
-      /* close everything */
-      NXclose(&hfil);
-      NXDclose(hdict,NULL);
-     
-  }  
-
-/*---------------------------------------------------------------------------
-  This is the task function for updating the data file any now and then
-  automatically
- --------------------------------------------------------------------------*/
- static int PoldiTask(void *pData)
- {
-    pPolterdi self = NULL;
-    int iWrite, iRet, ltask;
-    
-    self = (pPolterdi)pData;
-    if(!self)
-      return 0;
-      
-    /* figure out if we need to write */
-    iWrite = 0;
-    iRet = 1;
-    /* first case: update intervall */
-    if(time(NULL) >= self->tUpdate)
-    {
-      ltask = GetDevexecID(pServ->pExecutor);
-      if (ltask > 0)
-      {
-	self->tUpdate = time(NULL) + self->iInterval;
-        iWrite = 1;
-        iRet = 1;
-      } else {
-        self->iEnd = 1;
-      }
-    }  
-
-    if(self->iEnd == 1)
-    {
-       self->tUpdate = 0;
-       iWrite = 0;
-       iRet = 0;
-    }
-    
-    if(iWrite)
-    {
-       if(self->iNew)
-       {
-          PoldiStart(self,self->pCon);
-          PoldiUpdate(self,self->pCon);
-          PoldiLink(self,self->pCon);
-       }
-       else
-       {
-          PoldiUpdate(self,self->pCon);         
-       }
-    }
-    return iRet;
- }     
-
-/*----------------------------------------------------------------------*/
-static void KillPolterdi(void *pData){
-  pPolterdi self = (pPolterdi)pData;
-  if(!self)
-    return;
-
-  if(self->pDes){
-    DeleteDescriptor(self->pDes);
-  }
-  if(self->pFile){
-    free(self->pFile);
-  }
-  if(self->dictfile){
-    free(self->dictfile);
-  }
-  free(self);
-}
-
-
-
-
-/*-----------------------------------------------------------------------*/
-int PolterInstall(SConnection *pCon, SicsInterp *pSics,
-                 void *pData, int argc, char *argv[])
-{
-  pPolterdi pNew = NULL;
-  pICallBack pCall = NULL;
-  pDummy pDum;
-  pHistMem pHist = NULL;
-
-  /* configure fortify */
-  /*
-    iFortifyScope = Fortify_EnterScope();
-    Fortify_CheckAllMemory();
-  */
-  if(argc < 2){
-    SCWrite(pCon,"ERROR: insufficient number of arguments to PolterInstall",
-	    eError);
-    return 0;
-  }
-  pHist = (pHistMem)FindCommandData(pSics,HM,"HistMem");
-  
-  if (!pHist)
-  {
-    SCWrite(pCon,"ERROR: Histogram memory NOT found",eError);
-    return 0;
-  }
-
-  pNew = (pPolterdi)malloc(sizeof(Polterdi));
-  if(!pNew){
-    SCWrite(pCon,"ERROR: out of memory in PolterInstall",
-	    eError);
-    return 0;
-  }
-  memset(pNew,0,sizeof(Polterdi));
-  pNew->pDes = CreateDescriptor("PoldiWrite");
-  pNew->pHist = pHist;
-  pNew->dictfile = strdup(argv[1]);
-  pNew->iInterval = 20*60;
-  if(!pNew->pDes || !pNew->dictfile){
-    SCWrite(pCon,"ERROR: out of memory in PolterInstall",
-	    eError);
-    return 0;
-  }
-  /* install callbacks */
-  pDum = (pDummy)pHist;
-  pCall = (pICallBack)pDum->pDescriptor->GetInterface(pHist,CALLBACKINTERFACE);
-  if(!pCall)
-  {
-     SCWrite(pCon,
-     "ERROR: no callback interface found at your histogram memory",
-             eError);
-     KillPolterdi(pNew);
-     return 0;        
-  }
-  RegisterCallback(pCall,COUNTSTART,Countstartcallback,pNew,NULL);
-  RegisterCallback(pCall,COUNTEND,Countendcallback,pNew,NULL);
-
-  AddCommand(pSics,"storedata",PolterAction,KillPolterdi,pNew);
-  return 1;
-
-}
-
-/*----------------------------------------------------------------------*/
-int PolterAction(SConnection *pCon, SicsInterp *pSics,
-                 void *pData, int argc, char *argv[])
-{
-   int iRet, iVal;
-   pPolterdi self = NULL;
-   char pBueffel[512];
-   
-   if(argc < 2)
-   {
-     SCWrite(pCon,"ERROR: Insufficient number of arguments to StoreData",
-             eError);
-       return 0;        
-    }
-
-    self = (pPolterdi)pData;
-    assert(self);
-  
-    strtolower(argv[1]);
-    if(strcmp(argv[1],"start") == 0)
-    {
-       PoldiStart(self,pCon);
-       PoldiUpdate(self,pCon);
-       PoldiLink(self,pCon);
-       return 1;
-    } else if(strcmp(argv[1],"update") == 0)
-    { 
-      if((self->iNew) || (!self->pFile))
-      {
-        PoldiStart(self,pCon);
-        PoldiUpdate(self,pCon);
-        PoldiLink(self,pCon);
-      }
-      else
-      { 
-        PoldiUpdate(self,pCon);      
-      }
-      return 1; 
-    }
-    else if(strcmp(argv[1],"getfile") == 0)
-    {
-        sprintf(pBueffel,"StoreData.file = %s",self->pFile);
-        SCWrite(pCon,pBueffel,eValue);
-        return 1;
-    }
-    else if(strcmp(argv[1],"interval") == 0)
-    {
-       if(argc > 2) /* set value */
-       {
-          if(!SCMatchRights(pCon,usUser))  
-          {
-            return 0;
-          }   
-          iRet = Tcl_GetInt(pSics->pTcl,argv[2],&iVal);
-          if(iRet != TCL_OK)
-          {
-             sprintf(pBueffel,"ERROR: cannot convert --> %s <-- to number ",
-                     argv[2]);
-             SCWrite(pCon,pBueffel,eError);
-             return 0;
-          }
-          self->iInterval = iVal*60; /* go to seconds from minutes*/
-          SCSendOK(pCon);
-          return 1;
-       }
-       else /* read the value */ 
-       {
-          sprintf(pBueffel,"storedata.interval = %d",self->iInterval/60);
-          SCWrite(pCon,pBueffel,eValue);
-          return 1;
-       }
-    }
-    
-    SCWrite(pCon,"ERROR: subcommand to StoreData not recognized",eError); 
-    return 0;
-}
-                 
-
-
diff --git a/polterwrite.h b/polterwrite.h
deleted file mode 100644
index e08b8cbc..00000000
--- a/polterwrite.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------------------------------------------------
-                               P O L T E R W R I T E
-                            
-    polterwrite is an object for writing POLDI data files. 
-    
-    copyright: see copyright.h
-    
-    Uwe Filges, November 2001
-----------------------------------------------------------------------------*/
-#ifndef POLTERDI
-#define POLTERDI
-
-   int PolterInstall(SConnection *pCon, SicsInterp *pSics,
-                 void *pData, int argc, char *argv[]);
-                 
-
-   int PolterAction(SConnection *pCon, SicsInterp *pSics,
-                 void *pData, int argc, char *argv[]);
-                 
-#endif
-                               
diff --git a/ruli.c b/ruli.c
deleted file mode 100644
index 396bb103..00000000
--- a/ruli.c
+++ /dev/null
@@ -1,335 +0,0 @@
-/*-----------------------------------------------------------------------------
-                                R \"U N S T A C K
-                                
-     See header file for the rationale of this.
-     
- 	Copyright:
-
-	Labor fuer Neutronenstreuung
-	Paul Scherrer Institut
-	CH-5423 Villigen-PSI
-
-
-        The authors hereby grant permission to use, copy, modify, distribute,
-        and license this software and its documentation for any purpose, provided
-        that existing copyright notices are retained in all copies and that this
-        notice is included verbatim in any distributions. No written agreement,
-        license, or royalty fee is required for any of the authorized uses.
-        Modifications to this software may be copyrighted by their authors
-        and need not follow the licensing terms described here, provided that
-        the new terms are clearly indicated on the first page of each file where
-        they apply.
-
-        IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-        FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-        ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-        DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-        POSSIBILITY OF SUCH DAMAGE.
-
-        THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-        INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-        IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-        NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-        MODIFICATIONS.
-----------------------------------------------------------------------------*/
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <tcl.h>
-#include "fortify.h"
-#include "lld.h"
-#include "lld_blob.h"
-#include "lld_str.h"
-#include "conman.h"
-#include "obdes.h"
-#include "buffer.h"
-#include "fupa.h"
-#include "splitter.h"
-#include "ruli.h"
-#include "nserver.h"
-/*--------------------------------------------------------------------------*/
-  pRuenStack CreateRuenStack(void)
-  {
-     pRuenStack pNew = NULL;
-     
-     pNew = (pRuenStack)malloc(sizeof(RuenStack));
-     if(!pNew)
-     {
-       return NULL;
-     }
-     pNew->pDes = CreateDescriptor("SicsRuenStack");
-     if(!pNew->pDes)
-     {
-       free(pNew);
-       return NULL;
-     }
-     
-     pNew->iList = LLDcreate(sizeof(pRuenBuffer));
-     if(pNew->iList == -1)
-     {
-       DeleteDescriptor(pNew->pDes);
-       free(pNew);
-       return NULL;
-     }
-     return pNew;
-  }
-/*---------------------------------------------------------------------------*/
- void DeleteRuenStack(void *self)
-  {
-    pRuenStack pOld = (pRuenStack)self;
-    
-    assert(pOld);
-
-    if(pOld->pDes)
-    {
-      DeleteDescriptor(pOld->pDes);
-    }
-    LLDdelete(pOld->iList);
-    free(pOld);
-  }
-/*--------------------------------------------------------------------------*/
-  int RuenStackAdd(pRuenStack self, pRuenBuffer pVictim)
-  {
-     assert(self);
-     
-     return LLDnodePrepend(self->iList,&pVictim);
-  }
-/*-------------------------------------------------------------------------*/
-  int RuenStackUnlink(pRuenStack self, int i)
-  {
-    int iNum;
-    int iRet;
- 
-    assert(self);
-    
-    iRet = LLDnodePtr2First(self->iList);
-    iNum = 0;
-    while(iRet != 0)
-    {
-       if(iNum == i)
-       {
-         LLDnodeDelete(self->iList);
-         return 1;
-       }
-       iNum++;
-       iRet = LLDnodePtr2Next(self->iList);
-    }
-    return 0;
-  }
-/*--------------------------------------------------------------------------*/
- int RuenStackInsert(pRuenStack self, int i, pRuenBuffer pVictim)
-  {
-    int iNum;
-    int iRet;
- 
-    assert(self);
-    
-    iRet = LLDnodePtr2First(self->iList);
-    iNum = 0;
-    while(iRet != 0)
-    {
-       if(iNum == i)
-       {
-         LLDnodeInsert(self->iList, &pVictim);
-         return 1;
-       }
-       iNum++;
-       iRet = LLDnodePtr2Next(self->iList);
-    }
-    return 0;
-  }
-/*---------------------------------------------------------------------------*/
-  int RuenStackList(pRuenStack self, SConnection *pCon)
-  {
-   int iRet;
-   void *pPtr = NULL;
-   char pBueffel[512];
-   int iCount = 1;
-   pRuenBuffer pBuf = NULL; 
-
-   assert(self);
-
-   iRet = LLDnodePtr2First(self->iList);
-   SCWrite(pCon,"Listing the RunStack",eValue);
-   while(iRet != 0)
-   {
-      LLDnodeDataTo(self->iList,&pPtr);
-      pBuf = (pRuenBuffer)pPtr;
-      sprintf(pBueffel,"[%d] %s",iCount,pBuf->name);
-      SCWrite(pCon,pBueffel,eValue);
-      iRet = LLDnodePtr2Next(self->iList);
-      iCount++;
-   }
-   return 1; 
-  }    
-/*--------------------------------------------------------------------------*/
-  int RuenStackRun(pRuenStack self, SConnection *pCon, SicsInterp *pSics)
-  {
-     int iRet;
-     pRuenBuffer pBuf = NULL;
-     pRuenBuffer pTest = NULL;
-
-
-     assert(self);
-     assert(pCon);
-     assert(pSics); 
-
-     /* while stack not empty */
-     iRet = LLDnodePtr2Last(self->iList);
-     while(iRet != 0)
-     {
-       pBuf = (pRuenBuffer)LLDnodePtr(self->iList);
-       /* verify RuenBuffer */
-       pTest = NULL;
-       pTest = FindRuenBuffer(pSics,pBuf->name);
-       if(!pTest) /* buffer no longer alive */
-       { 
-          /* skip */
-       }      
-       else
-       {
-          BufferRun(pBuf,pCon,pSics);
-       }
-       /* delete the last one from stack, set to last one again */
-       LLDnodeDelete(self->iList);
-       iRet = LLDnodePtr2Last(self->iList); 
-     }  
-     return 1;
-  }
-/*---------------------------------------------------------------------------*/
-  int RuenStackBatch(pRuenStack self, SConnection *pCon, SicsInterp *pSics)
-  {
-     int iRet, iWait;
-     pRuenBuffer pBuf = NULL;
-     pRuenBuffer pTest = NULL;
-
-     assert(self);
-     assert(pCon);
-     assert(pSics);
-
-     for( ; ; )
-     {
-        iRet = LLDnodePtr2Last(self->iList);
-        if(iRet)
-        {
-           pBuf = (pRuenBuffer)LLDnodePtr(self->iList);
-           /* verify RuenBuffer */
-           pTest = NULL;
-           pTest = FindRuenBuffer(pSics,pBuf->name);
-           if(!pTest) /* buffer no longer alive */
-           { 
-               /* skip */
-               LLDnodeDelete(self->iList);
-           }      
-           else
-           {
-              BufferRun(pBuf,pCon,pSics);
-              LLDnodeDelete(self->iList); 
-           }
-        }  
-        else
-        {   
-            /* wait and look again */
-             iWait  = SicsWait(10);
-             if(!iWait)
-             {
-               return iWait;
-             } 
-        } 
-     }
-     return 1;
- }          
-/*----------------------------------------------------------------------------*/
-  int RuenStackAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-                   int argc, char *argv[])
- {
-   int iRet, iRet2;
-   char pBueffel[512];
-   char **argx;
-   FuPaResult PaRes;
-   pRuenStack pStack = NULL;
-   pRuenBuffer pBuf = NULL; 
-   FuncTemplate BufferTemplate[] = {
-                                      {"add",1,{FUPATEXT} },
-                                      {"del",1,{FUPAINT} },
-                                      {"ins",2,{FUPAINT,FUPATEXT}},
-                                      {"list",0,{0,0}},
-                                      {"run",0,{0,0}},
-                                      {"batch",0,{0,0}}, 
-                                      NULL
-                                    };
-
-   assert(pCon);
-   assert(pSics); 
-   pStack = (pRuenStack)pData;
-   assert(pStack);
-
-                                      
-   /* you need to be user to use this facility */
-   if(!SCMatchRights(pCon,usUser))
-   {
-         return 0;
-   }                                                                                                               
-   /* parse function args */
-   argtolower(argc,argv);
-   argx = &argv[1];
-   iRet = EvaluateFuPa((pFuncTemplate)&BufferTemplate,6,argc-1,argx,&PaRes);
-   if(iRet < 0)
-   {
-      sprintf(pBueffel,"%s",PaRes.pError);
-      SCWrite(pCon,pBueffel,eError);
-      return 0;
-   }
-   
-   switch(iRet)
-   {
-     case 0: /* add */
-             pBuf = FindRuenBuffer(pSics,PaRes.Arg[0].text);
-             if(!pBuf)
-             { 
-                sprintf(pBueffel,"ERROR: cannot find RuenBuffer %s",
-                        PaRes.Arg[0].text);
-                SCWrite(pCon,pBueffel,eError);
-                return 0;
-             } 
-             iRet2 = RuenStackAdd(pStack,pBuf);
-             if(iRet2)
-                SCSendOK(pCon);
-             return iRet2;   
-             break;
-     case 1: /* del */
-             iRet2 = RuenStackUnlink(pStack,PaRes.Arg[0].iVal);
-             if(iRet2)
-                SCSendOK(pCon);
-             return iRet2;   
-             break;
-     case 2: /* ins */
-             pBuf = FindRuenBuffer(pSics,PaRes.Arg[1].text);
-             if(!pBuf)
-             { 
-                sprintf(pBueffel,"ERROR: cannot find RuenBuffer %s",
-                        PaRes.Arg[1].text);
-                SCWrite(pCon,pBueffel,eError);
-                return 0;
-             } 
-             iRet2 = RuenStackInsert(pStack,PaRes.Arg[0].iVal,pBuf);
-             if(iRet2)
-               SCSendOK(pCon);
-             return iRet2;  
-             break;
-     case 3: /* list */
-             return RuenStackList(pStack,pCon);
-             break;
-     case 4: /* run */
-             return RuenStackRun(pStack,pCon,pSics);
-             break;
-     case 5: /* batch */
-             return RuenStackBatch(pStack,pCon,pSics);
-            break;
-     default:
-            assert(0);                   
-   }
-   return 1;
- }
-
diff --git a/ruli.h b/ruli.h
deleted file mode 100644
index dc2713da..00000000
--- a/ruli.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*------------------------------------------------------------------------------
-                       R \"U N L I S T
-                       
-     LNS has this special scheme of collecting commands in R\"unbuffers
-     (see buffer.h) and execute them from a stack. The R\"unbuffers are
-     implemented in buffer.*. This implements the stack.
-     
-     BEWARE: The R\"unList code does not delete R\"unbuffers! 
-     
-     Mark Koennecke, January 1996
-     
-      
-     copyright: see implementation file
-------------------------------------------------------------------------------*/
-#ifndef RUENSTACK
-#define RUENSTACK
-
-  typedef struct {
-                   pObjectDescriptor pDes;
-                   int iList;
-                  } RuenStack, *pRuenStack;
-  
-/*----------------------------- live & death --------------------------------*/
-  pRuenStack CreateRuenStack(void);
-  void DeleteRuenStack(void *self);
-                                      
-/*----------------------------- what can be done with it --------------------*/
-  int RuenStackAdd(pRuenStack self,pRuenBuffer pVictim);
-  int RuenStackUnlink(pRuenStack self, int iLine);
-  int RuenStackInsert(pRuenStack self, int iLine, pRuenBuffer pVictim);
-  int RuenStackList(pRuenStack self, SConnection *pCon);
-  int RuenStackRun(pRuenStack self,SConnection *pCon, SicsInterp *pSics);
-  int RuenStackBatch(pRuenStack self,SConnection *pCon, SicsInterp *pSics);
-/*------------------------- the command -------------------------------------*/
-  int RuenStackAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-                      int argc, char *argv[]);
-                                                                                                 
-#endif
-
diff --git a/sanscook.c b/sanscook.c
deleted file mode 100644
index ba13d1a9..00000000
--- a/sanscook.c
+++ /dev/null
@@ -1,682 +0,0 @@
-/*--------------------------------------------------------------------------
- 
-                           S A N S C O O K
-
- This is a controller driver for a heaiting device developed especially
- for use  with SANS at SINQ by somebody at the Some God Forsaken University
- (SGFU). As this device comes with two motors in addition to the heater
- the general controller mechanism as described in choco.tex is used.
-
- copyright: see copyright.h
-
- Mark Koennecke, July 2000
----------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <assert.h>
-#include <time.h>
-#include "fortify.h"
-#include "sics.h"
-#include "stringdict.h"
-#include "hardsup/serialsinq.h"
-#include "hardsup/el734_errcodes.h"
-#include "hardsup/el734fix.h"
-#include "codri.h"
-
-/*-----------------------------------------------------------------------
-  A private data structure for the SANS cooker
--------------------------------------------------------------------------*/
-  typedef struct {
-                   char *pHost;
-                   int  iPort;
-                   int iChannel;
-                   void *pData;
-                   int iStop;
-                   int iError;
-                  } SANSCook, *pSANSCook;
-/*
-  pHost, iPort and iChannel combined are the adress of the cooker
-  controller at the  Macintosh terminal server. pData is the serial 
-  port connection data structure needed and managed by the SerialIO
-  functions.
-
-  iError is the last error reported on this device. If no error: 0
-
------------------------------------------------------------------------*/
-  
-/*
- ERROR CODES:
-*/
-
-#define NOTINIT -9001
-#define POWEROFF -9002
-#define LOWRANGE -9003
-#define HIGHRANGE -9004
-#define CONTIMEOUT  -9005
-#define BADCOMMAND -9006
-#define NOANSWER   -9007
-#define BADINPUT   -9008
-#define MOTERROR   -9009
-#define CONBUSY    -9010
-#define BADREPLY   -9011
-
-/*-------------------------------------------------------------------------*/
-  static int CookerInit(pCodri self)
-  {
-     pSANSCook pPriv = NULL;
-     int iRet;
-     char pReply[131];
-
-     assert(self);
-     pPriv = (pSANSCook)self->pPrivate;
-     assert(pPriv);
-     pPriv->iError = 0;
-
-     /* first open the connection to the serial port server and channel */
-     iRet = SerialOpen(&(pPriv->pData),pPriv->pHost,pPriv->iPort,
-                       pPriv->iChannel);
-     if(iRet <= 0)
-     {
-       pPriv->iError = iRet;
-       return 0;
-     }
-     /* configure the connection */
-     SerialATerm(&(pPriv->pData),"1\r\n");
-     SerialSendTerm(&(pPriv->pData),"\r");
-
-     pPriv->iStop = 0;
-
-     /* switch everything on, but do not deal with errors here */
-     /*
-     SerialWriteRead(&(pPriv->pData),"mpon",pReply,131);
-     SerialWriteRead(&(pPriv->pData),"mzon",pReply,131);
-     SerialWriteRead(&(pPriv->pData),"ton",pReply,131);
-     */
-
-     return 1;     
-  } 
-/*------------------------------------------------------------------------*/
-  static int CookerClose(pCodri self)
-  {
-     pSANSCook pPriv = NULL;
-     int iRet;
-     long lVal;
-
-     assert(self);
-     pPriv = (pSANSCook)self->pPrivate;
-     assert(pPriv);
-
-     if(pPriv->pData)
-     {
-       SerialClose(&(pPriv->pData));
-       pPriv->pData = NULL;
-     }
-     return 1;
-  }
-/*-----------------------------------------------------------------------*/
-  static int CookerDelete(pCodri self)
-  {
-     pSANSCook pPriv = NULL;
-
-     assert(self);
-     pPriv = (pSANSCook)self->pPrivate;
-     assert(pPriv);
-
-     if(pPriv->pData)
-       {
-	 SerialClose(&(pPriv->pData));
-	 pPriv->pData = NULL;
-       }
-
-     if(pPriv->pHost)
-       free(pPriv->pHost);
-
-     free(pPriv); 
-
-     return 1;
-  }
-/*-----------------------------------------------------------------------*/
-  static int CookerSetPar(pCodri self, char *parname, float fValue)
-  {
-     pSANSCook pPriv = NULL;
-     char pCommand[80], pReply[132];
-     int iRet, iValue;
-    
-     assert(self);
-     pPriv = (pSANSCook)self->pPrivate;
-     assert(pPriv);
-     pPriv->iError = 0;
-
-     /* handle the numeric parameters */
-     iValue = (int)fValue;
-   
-     if(strcmp(parname,"mp") == 0)
-     {
-        sprintf(pCommand,"mps%3.3d",iValue); 
-     }
-     else if(strcmp(parname,"mz") == 0)
-     {
-        sprintf(pCommand,"mzs%3.3d",iValue); 
-     }
-     else if(strcmp(parname,"ts") == 0)
-     {
-        sprintf(pCommand,"ts%3.3d",iValue); 
-     }
-     else
-     {
-       pPriv->iError = BADINPUT;
-       return 0;
-     }
-     /* send command and check for errors right here */
-     iRet = SerialWriteRead(&(pPriv->pData),pCommand,pReply,131);
-     if(iRet != 1)
-     {
-         pPriv->iError = iRet;
-         return 0;
-     }
-     else
-     {
-       if(strstr(pReply,"Error") != NULL)
-       {
-          pPriv->iError = MOTERROR;
-          return 0;
-       }
-       if(strstr(pReply,"Power OFF") != NULL)
-       {
-          pPriv->iError = POWEROFF;
-          return 0;
-       }
-       if(strstr(pReply,"not init.") != NULL)
-       {
-          pPriv->iError = NOTINIT ;
-          return 0;
-       }
-       if(strstr(pReply,"Timeout") != NULL)
-       {
-          pPriv->iError = CONTIMEOUT ;
-          return 0;
-       }
-       if(strstr(pReply,"Busy") != NULL)
-       {
-          pPriv->iError = CONBUSY ;
-          return 0;
-       }
-       if( (strstr(pReply,"Max") != NULL) || (strstr(pReply,"high") != NULL) )
-       {
-          pPriv->iError = HIGHRANGE;
-          return 0;
-       }
-       if( (strstr(pReply,"Min") != NULL) || (strstr(pReply,"down") != NULL) )
-       {
-          pPriv->iError = LOWRANGE;
-          return 0;
-       }
-       return 1;
-     }
-
-
-  }
-/*------------------------------------------------------------------------*/
-  static int CookerSetPar2(pCodri self, char *parname, char *pValue)
-  {
-     pSANSCook pPriv = NULL;
-     char pCommand[80], pReply[132];
-     int iRet, iAct = 0;
-     float fValue;
-
-     assert(self);
-     pPriv = (pSANSCook)self->pPrivate;
-     assert(pPriv);
-     pPriv->iError = 0;
-
-     /* handle our parameters. The first set is the power settings */
-     if(strcmp(parname,"mp.power") == 0)
-     {
-        if(strstr(pValue,"on") != NULL)
-	{
-           strcpy(pCommand,"mpon");
-           iAct = 1;
-        }
-        else if(strstr(pValue,"off") != NULL)
-	{
-          strcpy(pCommand,"mpoff");
-           iAct = 1;
-        } 
-        else
-	{
-           pPriv->iError = BADINPUT;
-           return 0;
-        }
-     }
-     else if(strcmp(parname,"mz.power") == 0)
-     {
-        if(strstr(pValue,"on") != NULL)
-	{
-           strcpy(pCommand,"mzon");
-           iAct = 1;
-        }
-        else if(strstr(pValue,"off") != NULL)
-	{
-          strcpy(pCommand,"mzoff");
-           iAct = 1;
-        } 
-        else
-	{
-           pPriv->iError = BADINPUT;
-           return 0;
-        }
-     }
-     else if(strcmp(parname,"ts.power") == 0)
-     {
-        if(strstr(pValue,"on") != NULL)
-	{
-           iAct = 1;
-           strcpy(pCommand,"ton");
-        }
-        else if(strstr(pValue,"off") != NULL)
-	{
-           iAct = 1;
-          strcpy(pCommand,"toff");
-        } 
-        else
-	{
-           pPriv->iError = BADINPUT;
-           return 0;
-        }
-     }
-     if(iAct == 1)
-     {
-       /* send command and check for errors right here */
-       iRet = SerialWriteRead(&(pPriv->pData),pCommand,pReply,131);
-       if(iRet != 1)
-       {
-           pPriv->iError = iRet;
-            return 0;
-       }
-       else
-       {
-         if(strstr(pReply,"Error") != NULL)
-         {
-            pPriv->iError = MOTERROR;
-            return 0;
-         }
-         return 1;
-       }
-     }
-     
-
-     /* second set: init */
-     if(strcmp(parname,"mp.init") == 0)
-     {
-       strcpy(pCommand,"mpi");
-       iAct = 1;
-     }     
-     else if(strcmp(parname,"mz.init") == 0)
-     {
-       strcpy(pCommand,"mzi");
-       iAct = 1;
-     }     
-     if(iAct)
-     {
-       /* send command and check for errors right here */
-       iRet = SerialWriteRead(&(pPriv->pData),pCommand,pReply,131);
-       if(iRet != 1)
-       {
-           pPriv->iError = iRet;
-           return 0;
-       }
-       else
-       {
-         if(strstr(pReply,"Error") != NULL)
-         {
-            pPriv->iError = MOTERROR;
-            return 0;
-         }
-         return 1;
-       }
-     }
-
-     /*
-       what is left here is either the para's themselves which will be 
-       handled in the second function after convertion to float or an
-       error
-     */
-     iRet = sscanf(pValue,"%f",&fValue);
-     if(iRet != 1)
-     {
-       pPriv->iError = BADINPUT;
-       return 0;
-     }
-
-     return CookerSetPar(self,parname,fValue);
-  }
-/*-----------------------------------------------------------------------*/
-  static int CookerHalt(pCodri self)
-  {
-     pSANSCook pPriv = NULL;
-
-     assert(self);
-     pPriv = (pSANSCook)self->pPrivate;
-     assert(pPriv);
-     pPriv->iError = 0;
-
-     /* no commands are defined to halt a thing! */
-     return 1;
-  }
-/*----------------------------------------------------------------------*/
-extern char *stptok(const char *s, char *tok, size_t toklen, char *brk);
-
-  static int CookerGetPar(pCodri self, char *parname, 
-                          char *pBuffer, int iLen)
-  {
-     pSANSCook pPriv = NULL;
-     char pBueffel[256], pCommand[80], pReply[80];
-     float fVal;
-     char *pPtr;
-     int iAct = 0, iRet;
-
-     assert(self);
-     pPriv = (pSANSCook)self->pPrivate;
-     assert(pPriv);
-     pPriv->iError = 0;
-
-     /* first the power stuff */
-     if(strcmp(parname,"mp.power") == 0 || strcmp(parname,"mp.init") == 0)
-     {
-       strcpy(pBueffel,parname);
-       strcpy(pCommand,"mps");
-       iAct = 1;
-     }
-     else if(strcmp(parname,"mz.power") == 0 || strcmp(parname,"mz.init") ==0 )
-     {
-       strcpy(pBueffel,parname);
-       strcpy(pCommand,"mzs");
-       iAct = 1;
-     }
-     else if(strcmp(parname,"ts.power") == 0)
-     {
-       strcpy(pBueffel,parname);
-       strcpy(pCommand,"ts");
-       iAct = 1;
-     }
-     if(iAct)
-     {
-       iRet = SerialWriteRead(&(pPriv->pData),pCommand,pReply,80);
-       if(iRet != 1)
-       {
-           pPriv->iError = iRet;
-           return 0;
-       }
-       else
-       {
-         if( strstr(pReply,"OFF") != NULL || strstr(pReply,"Off") != NULL)
-	 {
-            strcat(pBueffel," off");
-         }
-         else if(strstr(pReply,"not init") != NULL)
-	 {
-            strcat(pBueffel," not");
-         }
-         else
-	 {
-            strcat(pBueffel," on");
-         }
-       
-       }
-       strncpy(pBuffer,pBueffel,iLen);
-       return 1;
-     }
-
-     /* now request values for the parameter */
-     if(strcmp(parname,"mp") == 0)
-     {
-       strcpy(pCommand,"mps");
-     }
-     else if(strcmp(parname,"mz") == 0)
-     {
-       strcpy(pCommand,"mzs");
-     }
-     else if(strcmp(parname,"ts") == 0)
-     {
-       strcpy(pCommand,"ts");
-     }
-     else
-     {
-       pPriv->iError = BADINPUT;
-       return 0;
-     }
-     iRet = SerialWriteRead(&(pPriv->pData),pCommand,pReply,80);
-     if(iRet != 1)
-     {
-           pPriv->iError = iRet;
-           return 0;
-     }
-     /* decode value */
-     pPtr = pReply;
-     pPtr = stptok(pPtr,pBueffel,255,"/\0");
-     pPtr = stptok(pPtr,pBueffel,255,"/\0");
-     iRet = sscanf(pBueffel,"%f",&fVal);
-     if(iRet != 1)
-     {
-       pPriv->iError = BADREPLY;
-       return 0; 
-     }          
-     sprintf(pBueffel,"%f",fVal);
-     strncpy(pBuffer,pBueffel,iLen);
-     return 1;
-  }
-/*-----------------------------------------------------------------------*/
-  static int CookerCheckPar(pCodri self, char *parname)
-  {
-     pSANSCook pPriv = NULL;
-     char pCommand[80], pReply[80];
-     int iRet;
-
-     assert(self);
-     pPriv = (pSANSCook)self->pPrivate;
-     assert(pPriv);
-
-     if(strcmp(parname,"mp") == 0)
-     {
-       strcpy(pCommand,"mps");
-     }
-     else if(strcmp(parname,"mz"))
-     {
-       strcpy(pCommand,"mzs");
-     }
-     else
-     {
-       pPriv->iError = BADINPUT;
-       return 0;
-     }
-
-     /* get a status reply */
-     iRet = SerialWriteRead(&(pPriv->pData),pCommand,pReply,80);
-     if(iRet != 1)
-     {
-           pPriv->iError = iRet;
-           return HWFault;
-     }
-
-     if( strstr(pReply,"Start") != NULL || strstr(pReply,"Move") != NULL )
-     {
-       return HWBusy;
-     }     
-     else
-     {
-       return HWIdle;
-     }
-     return HWIdle;
-  }
-/*---------------------------------------------------------------------*/
-  static int CookerError(pCodri self, int *iCode, char *pError, int iLen)
-  {
-     pSANSCook pPriv = NULL;
-     char pCommand[80], pReply[80];
-     int iRet;
-
-     assert(self);
-     pPriv = (pSANSCook)self->pPrivate;
-     assert(pPriv);
-
-     *iCode = pPriv->iError;
-     switch(pPriv->iError)
-     {
-       case NOTINIT:
-            strncpy(pError,"ERROR: NOT Initialized!",iLen);
-            break;
-       case POWEROFF:
-            strncpy(pError,"ERROR: Power is OFF",iLen);
-            break;
-       case LOWRANGE:
-            strncpy(pError,"ERROR: Lower limit violated",iLen);
-            break;
-       case HIGHRANGE:
-            strncpy(pError,"ERROR: Upper limit violated",iLen);
-            break;
-       case CONTIMEOUT:
-            strncpy(pError,"ERROR: Internal controller timeout ",iLen);
-            break;
-       case BADCOMMAND:
-            strncpy(pError,"ERROR: Controller did not understand command",iLen);
-            break;
-       case BADINPUT:
-            strncpy(pError,"A bad parameter was entered",iLen);
-            break;
-       case MOTERROR:
-            strncpy(pError,"ERROR: Iternal motor error in controller",iLen);
-            break;
-       case CONBUSY:
-            strncpy(pError,"ERROR: Controller is busy",iLen);
-            break;
-       default:
-               SerialError(pPriv->iError,pError,iLen);
-               break;
-     }
-     pPriv->iError = 0;
-     return 1;     
-  } 
-/*----------------------------------------------------------------------*/
-  static int CookerFix(pCodri self, int iCode)
-  {
-     pSANSCook pPriv = NULL;
-     int iRet;
-
-     assert(self);
-     pPriv = (pSANSCook)self->pPrivate;
-     assert(pPriv);
-
-     switch(iCode)
-     {
-       case NOTINIT:
-       case POWEROFF:
-       case LOWRANGE:
-       case HIGHRANGE:
-       case BADCOMMAND:
-       case BADINPUT:
-       case MOTERROR:
-            return CHFAIL;
-       case CONTIMEOUT:
-       case CONBUSY:
-            return CHREDO;
-	 /* network errors */
-	 case EL734__BAD_FLUSH:
-	 case EL734__BAD_RECV:
-	 case EL734__BAD_RECV_NET:
-	 case EL734__BAD_RECV_UNKN:
-	 case EL734__BAD_RECVLEN:
-	 case EL734__BAD_RECV1:
-	 case EL734__BAD_RECV1_PIPE:
-	 case EL734__BAD_RNG:
-	 case EL734__BAD_SEND:
-	 case EL734__BAD_SEND_PIPE:
-	 case EL734__BAD_SEND_NET:
-	 case EL734__BAD_SEND_UNKN:
-	 case EL734__BAD_SENDLEN:
-         case NOCONNECTION:
-                   SerialForceClose(&(pPriv->pData));
-                   pPriv->pData = NULL;
-                   iRet = SerialOpen(&(pPriv->pData),pPriv->pHost,
-                                     pPriv->iPort,pPriv->iChannel);
-		   if(iRet == 1 )
-		   {
-		     return CHREDO;
-		   }                 
-		   else
-		   {
-		     return CHFAIL;
-		   }                 
-		   break;
-	 case EL734__FORCED_CLOSED:
-		   iRet = CookerInit(self);
-		   if(iRet)
-		   {
-		     return CHREDO;
-		   }                 
-		   else
-		   {
-		     return CHFAIL;
-		   }                 
-		   break;
-	 default:
-		   return CHFAIL;
-		   break;                       
-
-     }
-  } 
-/*------------------------------------------------------------------------*/
- pCodri MakeCookerDriver(char *pHost, int iPort, int iChannel)
- {
-      pCodri pNew = NULL;
-      pSANSCook pPriv = NULL;
-      char *pText;
-
-      /* allocate memory */
-      pText = (char *)malloc(1024*sizeof(char));
-      pNew = (pCodri)malloc(sizeof(Codri));
-      pPriv = (pSANSCook)malloc(sizeof(SANSCook));
-      if( !pText || !pNew || !pPriv)
-      {
-        return NULL;
-      }
-      memset(pText,0,1024);
-      memset(pNew,0,sizeof(Codri));
-      memset(pPriv,0,sizeof(SANSCook));
-
-     /* initialize private data structure */
-     pPriv->pHost = strdup(pHost);
-     pPriv->iPort = iPort;
-     pPriv->iChannel = iChannel;
-     pPriv->pData = NULL;
-
-     /* set known parameter names */
-     strcpy(pText,"mp");
-     strcat(pText,",mp.power");
-     strcat(pText,",mp.init");
-     strcat(pText,",mz");
-     strcat(pText,",mz.power");
-     strcat(pText,",mz.init");
-     strcat(pText,",ts");
-     strcat(pText,",ts.power");
-
-
-     /* install codri */
-     pNew->Init      =  CookerInit;
-     pNew->Close     =  CookerClose;
-     pNew->Delete    =  CookerDelete;
-     pNew->SetPar    =  CookerSetPar;
-     pNew->SetPar2   =  CookerSetPar2;
-     pNew->GetPar    =  CookerGetPar;
-     pNew->CheckPar  =  CookerCheckPar;
-     pNew->GetError  =  CookerError;
-     pNew->TryFixIt  =  CookerFix;
-     pNew->Halt      =  CookerHalt;
-     pNew->pParList  =  pText;
-     pNew->pPrivate = pPriv;
-
-     return pNew;
- }
-  
-
-
-
-
diff --git a/sanswave.c b/sanswave.c
deleted file mode 100644
index 5f5f7d52..00000000
--- a/sanswave.c
+++ /dev/null
@@ -1,385 +0,0 @@
-/*----------------------------------------------------------------------------
-                              S A N S W A V E 
-                              
-   Wavelength calculation for neutron velocity selector. Implements a 
-   driveable interface.
-   
-   copyright: see copyright.h
-   
-   Mark Koennecke, October 1998
----------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <assert.h>
-#include <tcl.h>
-#include "fortify.h"
-#include "sics.h"
-#include "motor.h"
-#include "velo.h"
-#include "sanswave.h"
-
-#define NOTILT 801
-
-/*-----------------------------------------------------------------------*/
-   typedef struct __SANSwave {
-                              pObjectDescriptor pDes;
-                              pIDrivable        pDrivInt;
-                              pVelSel           pSelector;
-                             }SANSWave;
-
-/*-----------------------------------------------------------------------*/
-  static void CalculateCoefficients(float fTilt, float *fA, float *fB)
-  {
-     float fSQ, fTer, fQuat;
-     
-     fSQ = fTilt * fTilt;
-     fTer = fSQ * fTilt;
-     fQuat = fTer * fTilt;
-     
-     *fA = 0.01223 + (0.000360495 * fTilt) + (0.000313819 * fSQ) +
-           (0.0000304937 * fTer) + (0.000000931533 * fQuat);
-           
-     *fB = 12721.11905 - (611.74127 * fTilt) - (12.44417 * fSQ) -
-           (0.12411 * fTer) + (0.00583 * fQuat);
-                 
-  } 
-/*-----------------------------------------------------------------------*/
-  int CalculateLambda(float fRot, float fTilt, float *fLambda)
-  {
-     float fA, fB;
-     
-     if(fRot  < 10.0)
-     {
-        *fLambda = 0.0;
-        return 1;
-     }
-     
-     CalculateCoefficients(fTilt,&fA, &fB);
-     
-     *fLambda = fA + fB/fRot;
-     return 1;
-  } 
-/*-------------------------------------------------------------------------*/
-  static int SWHalt(void *pData)
-  {
-     pSANSWave self = NULL;
-     pIDrivable pDriv = NULL;
-     
-     self = (pSANSWave)pData;
-     assert(self);
-     
-     pDriv = GetDrivableInterface(self->pSelector);
-     assert(pDriv);
-     
-     return pDriv->Halt(self->pSelector);
-  }
-/*----------------------------------------------------------------------*/
-  static int SWLimits(void *pData, float fVal, char *error, int iErrLen)
-  {
-     pSANSWave self = NULL;
-     pIDrivable pDriv = NULL;
-     int iRet;
-     float fTilt, fA, fB, fRot;
-     
-     self = (pSANSWave)pData;
-     assert(self);
-     
-     pDriv = GetDrivableInterface(self->pSelector);
-     assert(pDriv);
-     
-     /* get tilt */
-     iRet = VSGetTilt(self->pSelector,&fTilt);
-     if(!iRet)
-     {
-       strncpy(error,"Failed to obtain tilt angle",iErrLen);
-       return 0;
-     }
-
-     /* Calculate rotation speed  */
-     CalculateCoefficients(fTilt,&fA, &fB);
-     fRot = fB/(fVal - fA);
-     return pDriv->CheckLimits(self->pSelector,fRot,error, iErrLen);
-  }
-/*-------------------------------------------------------------------------*/
-  static long SWSet(void *pData, SConnection *pCon, float fVal)
-  {
-     pSANSWave self = NULL;
-     pIDrivable pDriv = NULL;
-     int iRet, i;
-     float fTilt, fA, fB, fRot;
-     pDummy pDum = NULL;
-     
-     self = (pSANSWave)pData;
-     assert(self);
-     
-     pDriv = GetDrivableInterface(self->pSelector);
-     assert(pDriv);
-     
-     /* get tilt */
-     fTilt = -910;
-     for(i = 0; i < 3; i++)
-     {
-          iRet = VSGetTilt(self->pSelector,&fTilt);
-          if(iRet)
-          {
-            break;
-          }
-          else
-          {
-            SCWrite(pCon,"WARNING: trouble reading tilt angle",eWarning);
-          }
-     }     
-     if(fTilt < -900) /* failed to get tilt */
-     {
-        SCWrite(pCon,"ERROR: failed to read tilt angle 3 times",eError);
-        return 0;
-     }
-     
-     /* Calculate rotation speed  */
-     CalculateCoefficients(fTilt,&fA, &fB);
-     fRot = fB/(fVal - fA);
-     return pDriv->SetValue(self->pSelector,pCon,fRot);
-  }
-/*------------------------------------------------------------------------*/
-  static int SWStatus(void *pData,SConnection *pCon )
-  {
-     pSANSWave self = NULL;
-     pIDrivable pDriv = NULL;
-     
-     self = (pSANSWave)pData;
-     assert(self);
-     
-     pDriv = GetDrivableInterface(self->pSelector);
-     assert(pDriv);
-     
-     return pDriv->CheckStatus(self->pSelector, pCon);
-  }
-/*-------------------------------------------------------------------------*/
-  static float SWGetValue(void *pData,SConnection *pCon )
-  {
-     pSANSWave self = NULL;
-     pIDrivable pDriv = NULL;
-     float fRot, fTilt, fA, fB, fLambda;
-     int i, iRet;
-     
-     self = (pSANSWave)pData;
-     assert(self);
-     
-     pDriv = GetDrivableInterface(self->pSelector);
-     assert(pDriv);
-     
-     /* get tilt */
-     fTilt = -910;
-     for(i = 0; i < 3; i++)
-     {
-          iRet = VSGetTilt(self->pSelector,&fTilt);
-          if(iRet)
-          {
-            break;
-          }
-          else
-          {
-            SCWrite(pCon,"WARNING: trouble reading tilt angle",eWarning);
-          }
-     }     
-     if(fTilt < -900) /* failed to get tilt */
-     {
-        SCWrite(pCon,"ERROR: failed to read tilt angle 3 times",eError);
-        return -99999.99;
-     }
-     
-     /* get rotation speed */
-     iRet = VSGetRotation(self->pSelector,&fRot);    
-     if(!iRet)
-     {
-        SCWrite(pCon,"ERROR: cannot reading rotation speed",eError);
-        return -99999.99;
-     }
-   
-      CalculateLambda(fRot,fTilt,&fLambda);
-      return fLambda;
-  }
-/*--------------------------------------------------------------------------*/
-  static void *SWGetInterface(void *pData, int iID)
-  {
-       pSANSWave self = NULL;
-       
-       self = (pSANSWave)pData;
-       assert(self);
-
-       if(iID == DRIVEID)
-       {
-         return self->pDrivInt;
-       }
-       return NULL;  
-  }    
-/*--------------------------------------------------------------------------*/
-  static void KillSANSWave(void *pData)
-  {
-    pSANSWave self = NULL;
-    
-    self = (pSANSWave)pData;
-    if(!self)
-       return;
-       
-    if(self->pDes)
-       DeleteDescriptor(self->pDes);
-       
-    if(self->pDrivInt)
-       free(self->pDrivInt);
-       
-    free(self);         
-  }       
-/*--------------------------------------------------------------------------
-   arguments: name, name of velocity selctor 
-*/   
-  int  MakeSANSWave(SConnection *pCon, SicsInterp *pSics, void *pData,
-                    int argc, char *argv[])
-  {
-     pSANSWave pNew = NULL;
-     CommandList *pCom = NULL;
-     char pBueffel[512];
-     int iRet;
-     pDummy pDum = NULL;
-     
-     assert(pCon);
-     assert(pSics);
-     
-     /* enough arguments ? */
-     if(argc < 3)
-     {
-        SCWrite(pCon,"ERROR: not enough arguments to MakeSANSWave",eError);
-        return 0;
-     }
-    
-     /* allocate space */
-     pNew = (pSANSWave)malloc(sizeof(SANSWave));
-     if(!pNew)
-     {
-        SCWrite(pCon,"ERROR: out of memory in MakeSANSWave",eError);
-        return 0;
-     }
-     memset(pNew,0,sizeof(SANSWave));
-     
-     
-     /* the last arument must denote a velocity selector */
-     pCom = FindCommand(pSics, argv[2]);
-     if(!pCom)
-     {
-        sprintf(pBueffel,"ERROR: velocity selector %s NOT found",argv[2]);
-        SCWrite(pCon,pBueffel,eError);
-        KillSANSWave(pNew);
-        return 0;     
-     } 
-     pNew->pSelector = (pVelSel)pCom->pData;
-     if(!pNew->pSelector)
-     {
-        sprintf(pBueffel,"ERROR: velocity selector %s is invalid",argv[2]);
-        SCWrite(pCon,pBueffel,eError);
-        KillSANSWave(pNew);
-        return 0;     
-     }
-     pDum = (pDummy)pNew->pSelector; 
-     if(strcmp(pDum->pDescriptor->name,"VelocitySelector") != 0)
-     {
-        sprintf(pBueffel,"ERROR: velocity selector %s is invalid",argv[2]);
-        SCWrite(pCon,pBueffel,eError);
-        KillSANSWave(pNew);
-        return 0;     
-     } 
-
-     /* initialise the rest of the data structure */
-     pNew->pDes = CreateDescriptor("SANSWave");
-     pNew->pDrivInt = CreateDrivableInterface();
-     if( (!pNew->pDes) || (!pNew->pDrivInt) )
-     {
-        SCWrite(pCon,"ERROR: out of memory in MakeSANSWave",eError);
-        KillSANSWave(pNew);
-        return 0;
-     } 
-     pNew->pDes->GetInterface = SWGetInterface;
-     
-     pNew->pDrivInt->Halt          = SWHalt;
-     pNew->pDrivInt->CheckLimits   = SWLimits;
-     pNew->pDrivInt->SetValue      = SWSet;
-     pNew->pDrivInt->CheckStatus   = SWStatus;
-     pNew->pDrivInt->GetValue      = SWGetValue;
-      
-     /* install command */
-     iRet = AddCommand(pSics,argv[1],SANSWaveAction,KillSANSWave,pNew);
-     if(!iRet)
-     {
-        sprintf(pBueffel,"ERROR: duplicate command %s NOT created",
-                argv[1]);
-        SCWrite(pCon,pBueffel,eError);
-        KillSANSWave(pNew);
-        return 0;        
-     } 
-     return 1;
-  }                          
-/*---------------------------------------------------------------------------*/
-  int SANSWaveAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-                     int argc, char *argv[])
-  {
-    pSANSWave self = NULL;
-    float fLambda, fTilt, fRot, fA, fB;
-    double dNum;
-    int iRet;
-    char pBueffel[256];
-    
-    self = (pSANSWave)pData;
-    assert(self);
-    assert(pCon);
-    assert(pSics);
-    
-    if(argc > 2)
-    {
-       strtolower(argv[1]);
-       /* whatever we are asked to do, we need the current tilt angle */
-       iRet = VSGetTilt(self->pSelector, &fTilt);
-       if(!iRet)
-       {
-          SCWrite(pCon,"ERROR: failed to read tilt angle",eError);
-          return 0;
-       }
-       /* the second argument must be a number */
-       iRet = Tcl_GetDouble(pSics->pTcl,argv[2],&dNum);  
-       if(iRet != TCL_OK)
-       {
-         sprintf(pBueffel,"ERROR: cannot convert %s to number",argv[2]);
-         SCWrite(pCon,pBueffel,eError);
-         return 0;
-       }   
-       if(strcmp(argv[1],"rot") == 0) /* calculate rotation for wl */ 
-       {
-          CalculateCoefficients(fTilt,&fA, &fB);
-          fRot = fB/(dNum-fA);
-          sprintf(pBueffel,"%f nm = %f RPM", (float)dNum, fRot);
-          SCWrite(pCon,pBueffel,eValue);
-          return 1;   
-       }
-       else if(strcmp(argv[1],"wl") == 0) /* calculate wl from rot */ 
-       {
-          CalculateLambda((float)dNum,fTilt,&fLambda);
-          sprintf(pBueffel,"%f RPM = %f nm",(float)dNum,fLambda);
-          SCWrite(pCon,pBueffel,eValue);
-          return 1;
-       }
-       else
-       {
-         sprintf(pBueffel,"ERROR: subcommand %s NOT understood",argv[1]);
-         SCWrite(pCon,pBueffel,eError);
-         return 0;
-       }
-    }
-    
-    fLambda = self->pDrivInt->GetValue(self,pCon);
-    if(fLambda < -90000)
-    {
-       return 0;
-    }
-    
-    sprintf(pBueffel,"%s = %f", argv[0],fLambda);
-    SCWrite(pCon,pBueffel,eValue);
-    return 1;
-  }                                      
-               
diff --git a/sanswave.h b/sanswave.h
deleted file mode 100644
index 05c4ca98..00000000
--- a/sanswave.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-/*---------------------------------------------------------------------------
-                            S A N S W A V E
-
-  Wavelength calculations for a neutron velocity selector.  Allows to drive
-  the neutron wavelength directly.
-
-  copyright: see copyright.h
-
-  Mark Koennecke, October 1998
----------------------------------------------------------------------------*/
-#ifndef SANSWAVE
-#define SANSWAVE
-
-  typedef struct __SANSwave *pSANSWave;
-/*-----------------------------------------------------------------------*/
-
-  int CalculateLambda(float fRot, float fTilt, float *fLambda);
-
-  int MakeSANSWave(SConnection *pCon, SicsInterp *pSics, void *pData,
-                   int argc, char *argv[]);
-
-  int SANSWaveAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-                   int argc, char *argv[]);
-
-
-#endif 
diff --git a/sanswave.tex b/sanswave.tex
deleted file mode 100644
index 1f2decf1..00000000
--- a/sanswave.tex
+++ /dev/null
@@ -1,100 +0,0 @@
-\subsection{SANS Wavelength Calculation}
-The instrument SANS has a neutron velocity selector. A wavelength is
-selected by varying tilt angle and rotation speed of the velocity selector.
-The relation between tilt angle and rotation speed to wavelength is given by
-a formula: \begin{eqnarray}
- \lambda & = & A + \frac{B}{rot}\\
- \lambda & = & wavelength in nm\\
- rot & = & rotation speed in revolutions per minute.
-\end{eqnarray} 
-A and B are coefficients which are calculated from fourth degree polynoms.
-The coefficients of these polynoms have been obtained by fitting them
-against experimental data. This module now provides for this calculation and
-the driving of wavelength. This code does not vary tilt angle.
-
-This object data structure is simple:
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap1}
-$\langle$wavedat {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@   typedef struct __SANSwave {@\\
-\mbox{}\verb@                              pObjectDescriptor pDes;@\\
-\mbox{}\verb@                              pIDrivable        pDrivInt;@\\
-\mbox{}\verb@                              pVelSel           pSelector;@\\
-\mbox{}\verb@                             };@\\
-\mbox{}\verb@@$\diamond$
-\end{list}
-\vspace{-1ex}
-\footnotesize\addtolength{\baselineskip}{-1ex}
-\begin{list}{}{\setlength{\itemsep}{-\parsep}\setlength{\itemindent}{-\leftmargin}}
-\item Macro never referenced.
-\end{list}
-\end{minipage}\\[4ex]
-\end{flushleft}
-The fields are:
-\begin{description}
-\item[pDes] The standard SICS object descriptor.
-\item[pDrivInt] A standard drivable interface.
-\item[pSelector] The velocity selector to act upon.
-\end{description}
-
-Most functionality of this module is hidden in the functions comprising the
-drivable interface. Thus the external functions of this object are limited
-to:
-
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap2}
-$\langle$sanswaveint {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@  typedef struct __SANSwave *pSANSWave;@\\
-\mbox{}\verb@/*-----------------------------------------------------------------------*/@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  int CalculateLambda(float fRot, float fTilt, float *fLambda);@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  int MakeSANSWave(SConnection *pCon, SicsInterp *pSics, void *pData,@\\
-\mbox{}\verb@                   int argc, char *argv[]);@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  int SANSWaveAction(SConnection *pCon, SicsInterp *pSics, void *pData,@\\
-\mbox{}\verb@                   int argc, char *argv[]);@\\
-\mbox{}\verb@@\\
-\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}
-The coefficients for the calculation of A and B are hidden in the module
-static function CalculateCoefficients.
-
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap3}
-\verb@"sanswave.h"@ {\footnotesize ? }$\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@/*---------------------------------------------------------------------------@\\
-\mbox{}\verb@                            S A N S W A V E@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  Wavelength calculations for a neutron velocity selector.  Allows to drive@\\
-\mbox{}\verb@  the neutron wavelength directly.@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  copyright: see copyright.h@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  Mark Koennecke, October 1998@\\
-\mbox{}\verb@---------------------------------------------------------------------------*/@\\
-\mbox{}\verb@#ifndef SANSWAVE@\\
-\mbox{}\verb@#define SANSWAVE@\\
-\mbox{}\verb@@$\langle$sanswaveint {\footnotesize ?}$\rangle$\verb@@\\
-\mbox{}\verb@#endif @\\
-\mbox{}\verb@@$\diamond$
-\end{list}
-\vspace{-2ex}
-\end{minipage}\\[4ex]
-\end{flushleft}
diff --git a/sanswave.w b/sanswave.w
deleted file mode 100644
index fdcfb4c0..00000000
--- a/sanswave.w
+++ /dev/null
@@ -1,67 +0,0 @@
-\subsection{SANS Wavelength Calculation}
-The instrument SANS has a neutron velocity selector. A wavelength is
-selected by varying tilt angle and rotation speed of the velocity selector.
-The relation between tilt angle and rotation speed to wavelength is given by
-a formula: \begin{eqnarray}
- \lambda & = & A + \frac{B}{rot}\\
- \lambda & = & wavelength in nm\\
- rot & = & rotation speed in revolutions per minute.
-\end{eqnarray} 
-A and B are coefficients which are calculated from fourth degree polynoms.
-The coefficients of these polynoms have been obtained by fitting them
-against experimental data. This module now provides for this calculation and
-the driving of wavelength. This code does not vary tilt angle.
-
-This object data structure is simple:
-@d wavedat @{
-   typedef struct __SANSwave {
-                              pObjectDescriptor pDes;
-                              pIDrivable        pDrivInt;
-                              pVelSel           pSelector;
-                             };
-@}
-The fields are:
-\begin{description}
-\item[pDes] The standard SICS object descriptor.
-\item[pDrivInt] A standard drivable interface.
-\item[pSelector] The velocity selector to act upon.
-\end{description}
-
-Most functionality of this module is hidden in the functions comprising the
-drivable interface. Thus the external functions of this object are limited
-to:
-
-@d sanswaveint @{
-  typedef struct __SANSwave *pSANSWave;
-/*-----------------------------------------------------------------------*/
-
-  int CalculateLambda(float fRot, float fTilt, float *fLambda);
-
-  int MakeSANSWave(SConnection *pCon, SicsInterp *pSics, void *pData,
-                   int argc, char *argv[]);
-
-  int SANSWaveAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-                   int argc, char *argv[]);
-
-@}
-
-The coefficients for the calculation of A and B are hidden in the module
-static function CalculateCoefficients.
-
-@o sanswave.h @{
-/*---------------------------------------------------------------------------
-                            S A N S W A V E
-
-  Wavelength calculations for a neutron velocity selector.  Allows to drive
-  the neutron wavelength directly.
-
-  copyright: see copyright.h
-
-  Mark Koennecke, October 1998
----------------------------------------------------------------------------*/
-#ifndef SANSWAVE
-#define SANSWAVE
-@<sanswaveint@>
-#endif 
-@}  
-
diff --git a/scan.c b/scan.c
index f0267ae4..56fae36b 100644
--- a/scan.c
+++ b/scan.c
@@ -25,9 +25,9 @@
 #include "udpquieck.h"
 #include "splitter.h"
 #include "danu.h"
-#include "amorscan.h"
 #include "userscan.h"
 #include "motor.h"
+#include "site.h"
 
 extern void  SNXFormatTime(char *pBuffer, int iLen);
   /*
@@ -2033,6 +2033,7 @@ int StoreScanCounts(pScanData self, char *data)
         float fSum, fVar;
         double x;
         float fPos, FWHM, fHeight;
+	pSite site = NULL;
         
         self = (pScanData)pData;
         assert(self);
@@ -2309,6 +2310,9 @@ int StoreScanCounts(pScanData self, char *data)
              SCWrite(pCon,"ERROR: missing configure option",eError);
              return 0;
            }
+	   /* this is for userss only */
+	   if(!SCMatchRights(pCon,usUser))
+			return 0;
            strtolower(argv[2]);
            if(strcmp(argv[2],"standard") == 0)
 	   {
@@ -2316,15 +2320,6 @@ int StoreScanCounts(pScanData self, char *data)
                SCSendOK(pCon);
                return 1;
            }
-           else if(strcmp(argv[2],"amor") == 0)
-           {
-	      /* managers only  */
-	       if(!SCMatchRights(pCon,usMugger))
-			return 0;
-               ConfigureAmor(self);
-               SCSendOK(pCon);
-               return 1;
-           }
            else if(strcmp(argv[2],"user") == 0)
            {
                ConfigureUserScan(self);
@@ -2340,11 +2335,20 @@ int StoreScanCounts(pScanData self, char *data)
            }
            else
            {
-              sprintf(pBueffel,"ERROR: option %s not recognized by configure",
-                      argv[2]);
-              SCWrite(pCon,pBueffel,eError);
-              return 0;
-           }
+	     site = getSite();
+	     if(site != NULL){
+	       iRet = site->ConfigureScan(self,argv[2]);
+	     }
+	     if(!iRet){
+	       sprintf(pBueffel,"ERROR: option %s not recognized by configure",
+		       argv[2]);
+	       SCWrite(pCon,pBueffel,eError);
+	       return 0;
+	     } else {
+	       SCSendOK(pCon);
+	       return 1;
+	     }
+	   }
         }
 /*---------- scan */
         else if(strcmp(argv[1],"run") == 0)
diff --git a/scontroller.c b/scontroller.c
index dbeb72c7..141a59a4 100644
--- a/scontroller.c
+++ b/scontroller.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include "rs232c_def.h"
 #include "el734_def.h"
-#include "hardsup/serialsinq.h"
+#include "psi/hardsup/serialsinq.h"
 #include "sics.h"
 
 #define False 0
diff --git a/serial.c b/serial.c
deleted file mode 100644
index 285d3254..00000000
--- a/serial.c
+++ /dev/null
@@ -1,25 +0,0 @@
-
-/*--------------------------------------------------------------------------
-                         S I C S  S E R I A L
-
-  This object adds the serial command to the Tcl-interpreter within SICS.
-  Furthermore the commands sr1-sr6 are added as predefined names for 
-  possible connections. 
-
-  Mark Koennecke, January 1998
-----------------------------------------------------------------------------*/
-#include <tcl.h>
-#include "sics.h"
-
-   extern int Controller(ClientData pData, Tcl_Interp *pInter,
-                         int argc, char *argv[]);
-                         
-   int SerialInit(SConnection *pCon,SicsInterp *pSics, void *pData,
-                  int argc, char *argv[])
-   {
-       int iRet;
-
-       assert(pSics);
-       Tcl_CreateCommand(pSics->pTcl,"serialport",Controller,NULL,NULL);              
-       return 1;         
-   }               
diff --git a/serial.h b/serial.h
deleted file mode 100644
index 4e180715..00000000
--- a/serial.h
+++ /dev/null
@@ -1,15 +0,0 @@
-
-/*--------------------------------------------------------------------------
-                         S I C S  S E R I A L
-
-  This object adds the serial command to the Tcl-interpreter within SICS.
-  Furthermore the commands sr1-sr6 are added as predefined names for 
-  possible connections. 
-
-  Mark Koennecke, January 1998
-----------------------------------------------------------------------------*/
-#ifndef SICSERIAL
-#define SICSERIAL
-   int SerialInit(SConnection *pCon,SicsInterp *pSics, void *pData,
-                  int argc, char *argv[]);
-#endif
diff --git a/serial.w b/serial.w
deleted file mode 100644
index ed811e9e..00000000
--- a/serial.w
+++ /dev/null
@@ -1,29 +0,0 @@
-\subsection{Serial Connections}
-This object allows to send arbitrary strings to a serial port in the SINQ
-hardware setup system. This means a message is packaged and forwarded to  to 
-the Macintosh serving the port. And data is read back again from there. This
-facility has been devised in order to write environment device drivers in
-the macro language and as help for SICS instrument managers. 
-
-In contrast to the many SICS objects this object is defined for the Tcl
-interpreter. This is because it is in use within the psish Tcl interpreter
-as well. There is only one function, SerialInit, which adds the serial
-command to the SICS interpreter. 
-
-@o serial.h @{
-/*--------------------------------------------------------------------------
-                         S I C S  S E R I A L
-
-  This object adds the serial command to the Tcl-interpreter within SICS.
-  Furthermore the commands sr1-sr6 are added as predefined names for 
-  possible connections. 
-
-  Mark Koennecke, January 1998
-----------------------------------------------------------------------------*/
-#ifndef SICSERIAL
-#define SICSERIAL
-   int SerialInit(SConnection *pCon,SicsInterp *pSics, void *pData,
-                  int argc, char *argv[]);
-#endif
-@}
- 
\ No newline at end of file
diff --git a/serialwait.c b/serialwait.c
index b12c686a..8eb3aed9 100644
--- a/serialwait.c
+++ b/serialwait.c
@@ -5,8 +5,11 @@
     null messages in SICS.
     
     copyright: see copyright.h
-    
+
     Mark Koennecke, June 1998                 
+
+    This code is defunct and not used at the time being. It is left in the 
+    source tree for documentation purposes. Mark Koennecke, June 2003
 ---------------------------------------------------------------------------*/
 #include <stdlib.h>
 #include <string.h>
diff --git a/serialwait.h b/serialwait.h
index 48be45c3..d7193f9a 100644
--- a/serialwait.h
+++ b/serialwait.h
@@ -12,7 +12,7 @@
 #ifndef SERIALSICSWAIT
 #define SERIALSICSWAIT
 #include "sics.h"
-#include "hardsup/serialsinq.h"
+#include "psi/hardsup/serialsinq.h"
   int SerialSicsExecute(void **pData, char *pCommand, char *pReply, 
                         int iBufLen);
 
diff --git a/sicsdata.c b/sicsdata.c
index b533b51f..45144e60 100644
--- a/sicsdata.c
+++ b/sicsdata.c
@@ -126,7 +126,7 @@ static void netEncode(pSICSData self){
     }
     if(self->dataType[i] == FLOATTYPE){
       memcpy(&fVal,self->data + i,sizeof(float));
-      fVal /= 65536.;
+      fVal *= 65536.;
       self->data[i] = htonl((int)fVal);
     }
   } 
diff --git a/simcter.c b/simcter.c
index d39985f2..e625fb42 100644
--- a/simcter.c
+++ b/simcter.c
@@ -351,16 +351,9 @@ static float FAILRATE;
     pRes->Set         = SIMSet;
     pRes->Get         = SIMGet;
     pRes->Send        = SIMSend;
-      
+    pRes->KillPrivate  = NULL;
+       
     FAILRATE = fFail;
     return pRes; 
 }
-/*--------------------------------------------------------------------------*/
-  void KillSIMCounter(pCounterDriver self)
-  {
-    
-    assert(self);
-    
-    DeleteCounterDriver(self);
-  }
     
diff --git a/simdriv.c b/simdriv.c
index f7342bd1..de8e948f 100644
--- a/simdriv.c
+++ b/simdriv.c
@@ -255,6 +255,11 @@ static int SimSetPar(void *self, SConnection *pCon, char *name, float newValue)
   }
   return 0;
 }
+/*---------------------------------------------------------------------------*/
+ void KillSIM(void *pData)
+ {
+   return;
+ }
 /*--------------------------------------------------------------------------*/
   MotorDriver *CreateSIM(SConnection *pCon, int argc, char *argv[])
   {
@@ -356,6 +361,7 @@ static int SimSetPar(void *self, SConnection *pCon, char *name, float newValue)
      pDriv->Halt = SimHalt;
      pDriv->fSpeed = .01;
      pDriv->iTime = 0;
+     pDriv->KillPrivate = KillSIM;
      
      /* check for optional speed paramter */
      pCurrent = pCurrent->pNext;
@@ -369,17 +375,6 @@ static int SimSetPar(void *self, SConnection *pCon, char *name, float newValue)
      DeleteTokenList(pList);
      return (MotorDriver *)pDriv;
   }
-/*---------------------------------------------------------------------------*/
- void KillSIM(void *pData)
- {
-   SIMDriv *pDriv;
-   
-   assert(pData);
-   pDriv = (SIMDriv *)pData;
-   if(pDriv->name)
-     free(pDriv->name);
-   free(pDriv);
- }
 
 
 
diff --git a/sinqhm/FOCUS_gbl.h b/sinqhm/FOCUS_gbl.h
deleted file mode 100755
index 3fe89d4f..00000000
--- a/sinqhm/FOCUS_gbl.h
+++ /dev/null
@@ -1,299 +0,0 @@
-/*======================================= [...SinqHM]FOCUS_gbl.h - Ident V01B
-**
-**	Include file of Gbl Variables for FOCUS_srv and its children.
-*/
-
-#ifndef	uint
-#define	    uint    unsigned int
-#endif
-
-#ifndef	usint
-#define	    usint    unsigned short int
-#endif
-
-#ifndef	uchar
-#define	    uchar    unsigned char
-#endif
-
-#ifndef MAX_SLV
-#define MAX_SLV 3
-#endif
-/*
-**====================	Global Variables ======================================
-** Note:
-**	On VxWorks, all these global variables are visible by all tasks.
-**	Any changes to them should therefore only be done if protected
-**	by a semaphore.
-**
-**	At present, only the parent process changes these variables in a
-**	'significant' way (I don't count updating diagnostic counters such
-**	as FS_bytes_got!).
-*/
-    int		FS_errno;
-    int		FS_cnt_SIGUSR1;
-    char	FS_host[32];
-    char	FS_addr[20];
-
-    int	     FS_dbg_mask;	/* This is the log'l or of FS_dbg_lev0, etc */
-    int	     FS_dbg_lev0, FS_dbg_lev1, FS_dbg_lev2, FS_dbg_lev3;
-
-    int	     FS_cfgn_done;		/* == 0 if FOCUS_srv not configured */
-  /*
-  **		The buffer for holding Hist Mem data is pointed to
-  **		by FS_base_addr.
-  */
-    void    *FS_base_addr;
-
-    uint	FS_mode_ALL;	  /* The "total" mode of the histogram memory */
-    uint	FS_mode;	  /* The basic mode of the histogram memory */
-    uint	FS_mode_DEBUG;	  /* The SQHM__DEBUG   bit  of FS_mode_ALL */
-    uint	FS_mode_UD;	  /* The SQHM__UD      bit  of FS_mode_ALL */
-    uint	FS_mode_BO;	  /* The SQHM__BO      bits of FS_mode_ALL */
-    uint	FS_mode_STROBO;	  /* The SQHM__STROBO  bit  of FS_mode_ALL */
-    uint	FS_mode_REFLECT;  /* The SQHM__REFLECT bit  of FS_mode_ALL */
-    uint	FS_mode_NO_STAT;  /* The SQHM__NO_STAT bit  of FS_mode_ALL */
-
-    uint	FS_lo_cntr;	/* The first counter in TOF mode */
-    uint	FS_hi_cntr;	/* The last  counter in TOF mode */
-    uint	FS_lo_bin;	/* The first bin of the histogram */
-    uint	FS_hi_bin;	/* The last  bin of the histogram */
-    uint	FS_bpb;		/* The number of bytes per bin */
-    uint	FS_compress;	/* The bin compression factor */
-    uint	FS_totl_bytes;	/* The total number of bytes of histogram mem */
-
-    SEM_ID	FS_sem_daq;		   /* Semaphore to guard FS_dsbl_mask */
-    usint	FS_dsbl_mask;		      /* The data-acq disable mask */
-    usint	FS_srv_masks[MAX_CLIENTS+1];  /* The daq masks for ..
-					      ** .. servers (0 is mask of ..
-					      ** .. master process). */
-  /*--------------------------------------*/
-    time_t  FS_start_time;	    /* The time that FOCUS-main started */
-    uint    FS_port;
-    int	    FS_cnct_skt;
-    int	    FS_rw_skt;
-    pid_t   FS_pid;			/* PID of Master Process */
-    pid_t   FS_pids[MAX_CLIENTS+1];	/* Index 0 = Filler (not present for
-					**		FOCUS_srv)
-					** Index 1... = Child servers */
-    int	    FS_chld_exit_status[MAX_CLIENTS+1];
-    int	    FS_chld_cnct_skt[MAX_CLIENTS+1];
-    int	    FS_chld_rw_skt[MAX_CLIENTS+1];
-    char    FS_name[MAX_CLIENTS+1][20];    /* The name of the FOCUS-servers */
-    char   *FS_p_names[MAX_CLIENTS+1];	   /* Pointers to the names */
-
-    char    FS_inst[16];	    /* This identifies the instrument */
-    char    FS_def_ident[8];	    /* This is Ident of FOCUS_def.h */
-    char    FS_main_ident[8];	    /* This is Ident of main program */
-    char    FS_main_date[32];	    /* This is compil date of main program */
-    char    FS_serv_ident[8];	    /* This is Ident of server program */
-    char    FS_serv_date[32];	    /* This is compil date of server program */
-    char    FS_rout_ident[8];	    /* This is Ident of routines */
-    char    FS_rout_date[32];	    /* This is compil date of routines */
-
-    uint	FS_bytes_got, FS_bytes_put;
-
-    MSG_Q_ID	FS_msgQ_to_srv[MAX_CLIENTS+1];	/* Index 0 is for messages ..
-						** .. to FOCUS-master. The ..
-						** others are to the various ..
-						** servers.
-						*/
-    uint	FS_sem_tmo;
-    uint	FS_use_sem_tmo;    /* If True (== 1), enable sem timeouts */
-
-    int			 FS_n_slaves;		  /* The number of slaves */
-    char		*FS_slaves[MAX_SLV];	  /* The names of the slaves */
-    struct sockaddr_in	 FS_rmt_socknam[MAX_SLV]; /* Internet addresses of ..
-						  **	.. our slaves */
-    uint		 FS_lo_det[MAX_SLV];	  /* # of first det'r on each ..
-						  **	.. slave */
-    uint		 FS_hi_det[MAX_SLV];	  /* # of last  det'r on each ..
-						  **	.. slave */
-    int			 FS_slv_active[MAX_SLV];  /* True if slave has been ..
-						  **	.. cfg'd */
-    int			 FS_skt[MAX_CLIENTS+1][MAX_SLV];   /* Client skts for ..
-							   **	.. children */
-    int			 FS_pkt_siz[MAX_CLIENTS+1][MAX_SLV]; /* Packet sizes ..
-							   **  .. for childrn */
-/*========================== Define the function prototypes ================*/
-
-  int	    chk_config_alloc (
-		int			 skt,
-		struct req_buff_struct  *request,
-		struct rply_buff_struct *reply);
-  void	    failInet (
-		char *text);
-  void	    failInet_port (
-		char *text, int port);
-  int	    FOCUS_server (
-		pid_t	 parent_pid,
-		SEM_ID	 sem,
-		int	 index,
-		int	 pkt_size,
-		int	 suspend_flag,
-		int	*status);
-  void	    FS_catch_int_signal (
-		int signo);
-  void	    FS_catch_signal (
-		int signo);
-  void	    FS_cleanup_children (
-		int	  max_chld,
-		pid_t	 *pids,
-		int	 *pcnt_SIGUSR1,
-		int	  verbose,
-		char	**tsk_names,
-		char	 *filler_name);
-  int	    FS_close_all (
-		int	  index);
-  int	    FS_close_down_offspring (
-		int	  harshness,
-		int	  max_chld,
-		pid_t	 *pids,
-		int	 *exit_stat,
-		int	 *pcnt_SIGUSR1,
-		int	  verbose,
-		char	**tsk_names,
-		char	 *filler_name);
-  int	    FS_deconfig_all (
-		int	harshness);
-  int	    FS_do_command (
-		int			 index,
-		int			 skt,
-		int			 pkt_size,
-		struct req_buff_struct  *rqst,
-		struct rply_buff_struct *reply);
-  int	    FS_do_config (
-		int			 skt,
-		struct req_buff_struct  *request,
-		struct rply_buff_struct *reply);
-  int	    FS_do_daq (
-		int			 index,
-		int			 sub_cmnd,
-		struct req_buff_struct  *request,
-		struct rply_buff_struct *reply);
-  int	    FS_do_project (
-		int			index,
-		struct rply_buff_struct	*rply_bf,
-		int			rw_skt,
-		int			pkt_size,
-		uint			sub_code,
-		uint			x_lo,
-		uint			nx,
-		uint			y_lo,
-		uint			ny,
-		uint			xdim,
-		uint			h_slct);
-  int	    FS_do_read (
-		int			index,
-		struct rply_buff_struct	*rply_bf,
-		int			rw_skt,
-		int			pkt_size,
-		uint			nbins,
-		uint			first,
-		uint			hist_no);
-  int	    FS_do_write (
-		int			index,
-		struct req_buff_struct	*req_bf,
-		struct rply_buff_struct	*rply_bf,
-		int			rw_skt,
-		int			pkt_size,
-		int			nbins,
-		int			first,
-		int			bytes_per_bin,
-		int			hist_no);
-  int	    FS_do_zero (
-		struct rply_buff_struct *reply,
-		int			 index,
-		int			 nbins,
-		int			 fst_bin,
-		int			 hist_no);
-  void	    FS_free_memory (
-		void	*extras);
-  void	    FS_kill_children ();
-  int	    FS_make_child (
-		int	 proc (),
-		int	 prty,
-		int	 spnd,
-		int	 pkt_size,
-		int	 max_chld,
-		pid_t	*pids,
-		int	*exit_stat,
-		int	*pcnt_SIGUSR1,
-		char	*name);
-  int	    FS_project_hm (
-		int	 index,
-		int	 pkt_size,
-		uint	*buff,
-		uint	*w_buff,
-		uint	 blen_in_bins,
-		uint	 sub_code,
-		uint	 lo_cntr,
-		uint	 hi_cntr,
-		uint	 fst_bin,
-		uint	 lst_bin);
-  int	    FS_read_hm (
-		int	 skt,
-		int	 pkt_size,
-		uchar	*buff,
-		uint	 blen_in_bins,
-		uint	 first_bin,
-		uint	 last_bin);
-  int	    FS_rply_status_send (
-		int			 skt,
-		struct rply_buff_struct	*rply_bf,
-		uint			*out_cntr);
-  int	    FS_rply_status_setup_and_send (
-		int			 skt,
-		struct rply_buff_struct	*rply_bf,
-		int			 status,
-		int			 sub_status,
-		char			*msg,
-		uint			*out_cntr);
-  int	    FS_send_cmnd_to_mstr (
-		struct sockaddr_in	*rmt_sockname,
-		struct req_buff_struct	*request,
-		int			 requ_len,
-		struct rply_buff_struct	*reply,
-		uint			*in_cntr,
-		uint			*out_cntr);
-  void	    getErrno (
-		int *his_errno);
-  pid_t	    get_pid ();
-  int	    net_flush (
-		int skt,
-		int nbytes);
-  void	    rply_status_setup (
-		struct rply_buff_struct	*rply_bf,
-		int			 status,
-		int			 sub_status,
-		char			*msg);
-  int	    rqst_send_get (
-		int			 skt,
-		struct req_buff_struct	*rqst_bf,
-		int			 rq_len,
-		struct rply_buff_struct	*rply_bf,
-		int			 rp_size,
-		int			*out_cntr,
-		int			*in_cntr,
-		char			*tsk_name);
-  int	    setup_host (
-		char		   *host,
-		struct sockaddr_in *sockname,
-		int		    port,
-		int		    verbose);
-  void	    setup_inet_info (
-		char	*host,
-		int	 host_size,
-		char	*addr,
-		int	 addr_size);
-  int	    sleep (
-		int xx);
-  int	    socket_bind (
-		int	 port,
-		char	*tsk_name);
-  char	   *StrJoin (
-		char	*result,
-		int	 result_size,
-		char	*str_a,
-		char	*str_b);
-
-/*===================================================== End of FOCUS_gbl.h  */
diff --git a/sinqhm/FOCUS_srv_main.c b/sinqhm/FOCUS_srv_main.c
deleted file mode 100755
index e8136dce..00000000
--- a/sinqhm/FOCUS_srv_main.c
+++ /dev/null
@@ -1,2705 +0,0 @@
-#define	    IDENT	"1A03"
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     SINQ Division				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...SinqHM]FOCUS_srv_main.c
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Mar 2000
-**	    Well, start a motor. But not a3 in powder mode in order to
-
-** Updates:
-**  1A01  7-Mar-2000 DM	    Initial version.
-**---------------------------------------------------------------------------
-**  FOCUS_srv_main.c is the main program of a SINQ Histogram Memory process
-**  for the FOCUS TOF spectrometer at SINQ. It acts as an intermediary between
-**  host software, which believes that it is talking to a single version of
-**  SinqHM_srv, and 3 copies of SinqHM_srv on 3 different front-end processors,
-**  each of which is histogramming data from one of the 3 detector banks on
-**  FOCUS.
-**
-**  Communication between FOCUS_srv and the client is via TCP/IP protocol.
-**
-**  To compile and link this program for VxWorks on PSS123, use:
-**
-	    ccvx '-DINST="<instr>"' FOCUS_srv_main.c
-	    ccvx '-DINST="<instr>"' FOCUS_srv_server.c
-	    ccvx '-DINST="<instr>"' FOCUS_srv_routines.c
-** where
-	    ccvx = ccppc -O0			\
-		    -mcpu=603			\
-		    -I${WIND_BASE}/target/h	\
-		    -fno-builtin		\
-		    -fno-for-scope		\
-		    -nostdinc			\
-		    -DCPU=PPC603		\
-		    -D_GNU_TOOL			\
-		    -gdwarf -c -Wimplicit
-** and
-**	    <instr> = FOCUS or ...
-
-    ldppc -o FOCUS_srv.o -r FOCUS_srv_main.o	    \
-			     FOCUS_srv_routines.o  \
-			     FOCUS_srv_server.o
-
-**  and, on the target,
-**
-**   -> ld < /home/pss123/aco/maden/wind/SinqHM/FOCUS/NEW/FOCUS_srv.o
-**   -> sp FOCUS_main, \
-**	      <hostM>, <ncM>, <hostO>, <ncO>, <hostU>, <ncU>, <c_port>, <s_port>
-**	         ^       ^       ^       ^       ^       ^       ^         ^
-** Name of Host  |       |       |       |       |       |       |         |
-** for Mittel-Bnk+       |       |       |       |       |       |         |
-** # Counters in Mittel- +       |       |       |       |       |         |
-**    Bank                       |       |       |       |       |         |
-** Name of Host for Ober-Bank ---+       |       |       |       |         |
-** # Counters in Ober-Bank --------------+       |       |       |         |
-** Name of Host for Unter-Bank ------------------+       |       |         |
-** # Counters in Unter-Bank -----------------------------+       |         |
-** Port number of Bank Servers (dflt = 2500) --------------------+         |
-** Our Port number as a Server (dflt = 2400) ------------------------------+
-** e.g.
-**     sp  FOCUS_main, "localhost", 150, "lnse05.vme", 117, "lnse06.vme", 116
-**  or sps FOCUS_main, "localhost", 150, "lnse05.vme", 117, "lnse06.vme", 116
-**====================================================================
-*/
-#include    "vxWorks.h"
-#include    "taskLib.h"
-#include    "msgQLib.h"
-#include    "sockLib.h"
-#include    "inetLib.h"
-#include    "sysLib.h"
-
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <ctype.h>
-#include    <string.h>
-#include    <unistd.h>
-#include    <errno.h>
-#include    <netinet/in.h>
-#include    <arpa/inet.h>
-#include    <netdb.h>
-#include    <sys/types.h>
-#include    <sys/socket.h>
-#include    <setjmp.h>
-#include    <time.h>
-
-#include    <signal.h>		/* Get POSIX signal definitions. */
-#include    <timers.h>
-#include    <sys/mman.h>	/* Get POSIX mem mgmnt definitions. */
-#include    <sys/wait.h>	/* Get POSIX wait definitions. */
-/*
-**====================	Global Definitions =====================================
-*/
-#include    "SinqHM_def.h"
-#include    "FOCUS_gbl.h"
-
-#define READBUFSIZE 66560
-  extern    char    *vxWorksVersion;	/* Version string of vxWorks */
-  extern    char    *creationDate;	/* Creation Date string of vxWorks */
-  static    uchar   readBuffer[READBUFSIZE];
-
-/*
-**=============================================================================
-**  Local routines.
-**--------------------------------------------------------------------------
-**	    FOCUS_server:  This is the Child Process Code for FOCUS_srv.
-**
-**		Set up TCP/IP port for operations with client, accept his
-**		connection and perform services for him.
-**
-**		Note:	There must be NO return from this function.
-*/
-  int	FOCUS_server (
-/*	============
-*/		pid_t	 parent_pid,
-		SEM_ID	 sem,
-		int	 index,
-		int	 pkt_size,
-		int	 suspend_flag,
-		int	*iret) {    /* Return a status to parent here:
-				    **	0 = all OK
-				    ** -1 = sigaction error.
-				    ** -2 = socket or bind error with cnct_skt.
-				    ** -3 = listen error with cnct_skt.
-				    ** -4 = socket or bind error with clnt_skt.
-				    ** -5 = failed to connect to a slave mstr.
-				    ** -6 = SQHM_CNCT error response from slave.
-				    ** -7 = socket or bind error with child.
-				    ** -8 = failed to connect to a slave srvr.
-				    */
-    int			status;
-    int			i, is, nbytes, bytes_to_come;
-    char		recd[80];
-    char		*p_nxt_byte;
-    int			cnct_skt, rw_skt, clnt_skt, serve_port;
-    struct sockaddr_in	rmt_sockname;
-    int			rmt_sockname_len;
-    char		*buff_pntr;
-    int			port;
-
-    sigset_t		proc_sigmask;
-    struct sigaction	sig_action;
-
-    struct req_buff_struct  my_req_bf;
-    struct rply_buff_struct my_rply_bf;
-
-/*============================================================================
-*/
-    *iret = 0;	    /* Assume initialisation will be OK */
-
-    port = FS_port + index;
-
-    StrJoin (FS_name[index], sizeof (FS_name[0]), taskName (get_pid ()), "");
-
-    if (suspend_flag != 0) {
-      printf ("\n%s: Suspending ..\n", FS_name[index]);
-      taskSuspend (0);	    /* We've been told to suspend ourself, ..
-			    **  .. presumably for debug reasons.
-			    */
-      printf ("\n%s: Suspension ended!\n", FS_name[index]);
-    }
-/*============================================================================
-**	Define our signal mask first and define an action routine to catch
-**	the SIGINT signal our parent will send us when he wants us to exit.
-*/
-    status = sigemptyset (&proc_sigmask);
-    status = sigprocmask (SIG_SETMASK, &proc_sigmask, NULL);
-
-    status = sigemptyset (&sig_action.sa_mask);
-    sig_action.sa_handler = FS_catch_int_signal;
-    sig_action.sa_flags   = 0;
-    if (sigaction (SIGINT, &sig_action, NULL) == -1) {
-      getErrno (&FS_errno);
-      perror ("sigaction error:");
-      *iret = -1;			/* Tell our parent we've given up */
-      is = semGive (sem);		/* Let our parent continue */
-      exit (KER__BAD_VALUE);
-    }
-/*============================================================================
-**	Create a TCP/IP socket for communication, bind it and listen.
-*/
-    FS_chld_cnct_skt[index] = 0;
-    cnct_skt = socket_bind (port, FS_name[index]);
-    if (cnct_skt == -1) {
-      *iret = -2;			/* Tell our parent we've given up */
-      is = semGive (sem);		/* Let our parent continue */
-      exit (KER__BAD_VALUE);
-    }
-
-    status = listen (cnct_skt, 1);
-    if (status != 0) {
-      close (cnct_skt);
-      perror (StrJoin (recd, sizeof (recd),
-			FS_name[index], " -- cnct_skt listen error"));
-      *iret = -3;		/* Tell our parent we've given up */
-      is = semGive (sem);	/* Let our parent continue */
-      exit (KER__BAD_VALUE);
-    }
-/*============================================================================
-**	    Now open client connections to each of the Slaves
-*/
-    my_req_bf.bigend = htonl (0x12345678);
-    my_req_bf.cmnd   = htonl (SQHM_CNCT);
-    my_req_bf.u.cnct.max_pkt   = htonl (pkt_size);
-    my_req_bf.u.cnct.strt_mode = 0;
-    for (i = 0; i < FS_n_slaves; i++) {
-      if (FS_slv_active[i]) {
-		/*
-		** Create a socket and bind it
-		*/
-	clnt_skt = socket_bind (0, FS_name[index]);
-	if (clnt_skt == -1) {
-	  *iret = -4;		 /* Tell our parent we've given up */
-	  FS_close_all (index);	 /* Shut down any client cnct'ns we've made */
-	  close (cnct_skt);
-	  is = semGive (sem);	 /* Let our parent continue */
-	  exit (KER__BAD_VALUE);
-	}
-		/*
-		** Make a connection to Master-server in slave
-		*/
-	rmt_sockname_len = sizeof (FS_rmt_socknam[0]);
-	status = connect (clnt_skt, (struct sockaddr *) &FS_rmt_socknam[i],
-					rmt_sockname_len);
-	if (status == -1) {
-	  StrJoin (recd, sizeof (recd),
-			": error connecting to master in ", FS_slaves[i]);
-	  perror (StrJoin (recd, sizeof (recd), FS_name[index], recd));
-	  *iret = -5;		/* Tell our parent we've given up */
-	  close (clnt_skt);
-	  FS_close_all (index);	/* Shut down any client cnct'ns we've made */
-	  close (cnct_skt);
-	  is = semGive (sem);	/* Let our parent continue */
-	  exit (KER__BAD_VALUE);
-	}
-		/*
-		** Send SQHM_CNCT command to Master-server and get response
-		*/
-	status = rqst_send_get (clnt_skt, &my_req_bf, sizeof (my_req_bf),
-			 &my_rply_bf, sizeof (my_rply_bf),
-			 &FS_bytes_got, &FS_bytes_put, FS_name[index]);
-	if (!status || (ntohl (my_rply_bf.status) != KER__SUCCESS)) {
-	  if (ntohl (my_rply_bf.status) != KER__SUCCESS) {
-	    printf (
-             "\n%s: %s to %s.\n, status = %d, substatus = %d ",
-                        "error response to SINQHM_CNCT",
-			FS_name[index], FS_slaves[i], 
-                        ntohl(my_rply_bf.status), 
-                        ntohl(my_rply_bf.sub_status));
-	  }
-	  *iret = -6;		/* Tell our parent we've given up */
-	  close (clnt_skt);
-	  FS_close_all (index);	/* Shut down any client cnct'ns we've made */
-	  close (cnct_skt);
-	  is = semGive (sem);	/* Let our parent continue */
-	  exit (KER__BAD_VALUE);
-	}
-	close (clnt_skt);
-	serve_port = ntohl (my_rply_bf.u.cnct.port);
-	FS_pkt_siz[index][i] = ntohl (my_rply_bf.u.cnct.pkt_size);
-		/*
-		** Create a socket for talking to our server in slave and bind
-		*/
-	clnt_skt = socket_bind (0, FS_name[index]);
-	if (clnt_skt == -1) {
-	  *iret = -7;		 /* Tell our parent we've given up */
-	  FS_close_all (index);	 /* Shut down any client cnct'ns we've made */
-	  close (cnct_skt);
-	  is = semGive (sem);	 /* Let our parent continue */
-	  exit (KER__BAD_VALUE);
-	}
-		/*
-		** Make a connection to our server in slave
-		*/
-	rmt_sockname = FS_rmt_socknam[i];
-	rmt_sockname.sin_port = htons (serve_port);
-	rmt_sockname_len = sizeof (rmt_sockname);
-	status = connect (clnt_skt, (struct sockaddr *) &rmt_sockname,
-					rmt_sockname_len);
-	if (status == -1) {
-	  StrJoin (recd, sizeof (recd),
-			": error connecting to server in ", FS_slaves[i]);
-	  perror (StrJoin (recd, sizeof (recd), FS_name[index], recd));
-	  *iret = -8;		/* Tell our parent we've given up */
-	  close (clnt_skt);
-	  FS_close_all (index);	/* Shut down any client cnct'ns we've made */
-	  close (cnct_skt);
-	  is = semGive (sem);	/* Let our parent continue */
-	  exit (KER__BAD_VALUE);
-	}
-	FS_skt[index][i] = clnt_skt;
-      }
-    }
-/*============================================================================
-**	    Tell parent our cnct port is set up and waiting by releasing
-**	    semaphore so that our parent can continue. The parent will then
-**	    send a message to the client telling him which port he is to use.
-*/
-    FS_chld_cnct_skt[index] = cnct_skt;
-    is = semGive (sem);
-    if (is != OK) {
-      kill (parent_pid, SIGUSR1);   /* Inform parent that we are in trouble */
-      printf ("\n%s -- sem release error\n", FS_name[index]);
-      close (FS_chld_cnct_skt[index]); FS_chld_cnct_skt[index] = 0;
-      FS_close_all (index);	    /* Close connections to our servers */
-      exit (KER__BAD_VALUE);
-    }
-/*============================================================================
-**	    Wait for the client to connect to our port
-*/
-    rmt_sockname_len = sizeof (rmt_sockname);
-    rw_skt = accept (FS_chld_cnct_skt[index],
-		    (struct sockaddr *) &rmt_sockname, &rmt_sockname_len);
-    if (rw_skt == -1) {
-      perror (StrJoin (recd, sizeof (recd),
-			FS_name[index], " -- cnct_skt accept error"));
-      close (FS_chld_cnct_skt[index]); FS_chld_cnct_skt[index] = 0;
-      FS_close_all (index);	    /* Close connections to our servers */
-      kill (parent_pid, SIGUSR1);   /* Inform parent that we are in trouble */
-      exit (KER__BAD_VALUE);
-    }
-    FS_chld_rw_skt[index] = rw_skt;
-/*
-**-------------------------------------------------------------------------
-**			    Here is the main recv loop
-*/
-  main_loop:
-/*=========
-*/  bytes_to_come = sizeof (my_req_bf);	    /* Read a command */
-    p_nxt_byte = (char *) &my_req_bf;
-    while (bytes_to_come > 0) {
-      nbytes = recv (FS_chld_rw_skt[index], p_nxt_byte, bytes_to_come, 0);
-      if (nbytes <= 0) break;
-      FS_bytes_got += nbytes;
-      bytes_to_come -= nbytes;
-      p_nxt_byte += nbytes;
-    }
-    if ((bytes_to_come == 0) &&
-	(ntohl (my_req_bf.bigend) == 0x12345678) &&
-	(ntohl (my_req_bf.cmnd) != SQHM_CLOSE)) {
-      is = FS_do_command (index, FS_chld_rw_skt[index], pkt_size,
-					&my_req_bf, &my_rply_bf);
-      if (is) goto main_loop;	/* Break out of loop on error */
-    }
-/*
-**			    End of the main recv loop
-**-------------------------------------------------------------------------
-**	Get here if we drop out of the "recv" loop.
-**	This should only happen on getting a SQHM_CLOSE message or if our
-**	client closes his socket without sending a SQHM_CLOSE message.
-**	Anything else is a fatal error.
-*/
-    close (FS_chld_rw_skt[index]); FS_chld_rw_skt[index] = 0;
-    close (FS_chld_cnct_skt[index]); FS_chld_cnct_skt[index] = 0;
-		/*
-		** Check the various error conditions
-		*/
-    if (bytes_to_come != 0) {	/* Was a complete request read? */
-				/* No, it may be a network error, in which case
-				** nbytes is -1, or nothing was read, which
-				** indicates that our client simply closed
-				** his connection (forgetting to send a
-				** SQHM_CLOSE message), or the client has
-				** screwed up the protocol! */
-      if (nbytes == -1) {
-						/* It's a network error */
-	perror (StrJoin (recd, sizeof (recd),
-			    FS_name[index], " -- rw_skt recv error"));
-	status = KER__EXIT_SIGNAL;
-      }else if (bytes_to_come == sizeof (my_req_bf)) {
-				/* Our client simply closed his connection.
-				** Treat this as normal. */
-	printf ("\n%s exiting.\n", FS_name[index]);
-	status = KER__SUCCESS;
-      }else {
-	printf ("\n%s -- rw_skt recv wrong number of bytes: %d\n",
-				    FS_name[index], nbytes);
-	status = KER__EXIT_SIGNAL;
-      }
-    }else if (ntohl (my_req_bf.bigend) != 0x12345678) {
-					    /* Network byte-order wrong! */
-      printf ("\n%s -- big-endian/little-endian problem!\n"
-	    "    Buffer received in non-network byte order!\n", FS_name[index]);
-      status = KER__EXIT_SIGNAL;
-    }else if (ntohl (my_req_bf.cmnd) == SQHM_CLOSE) {
-			       /* SQHM_CLOSE request received. This is normal */
-      printf ("\n%s exiting.\n", FS_name[index]);
-      status = KER__SUCCESS;
-    }else {
-					/* Unrecognised request received! */
-      printf ("\n%s -- unrecognised command received: 0x%x\n",
-			FS_name[index], ntohl (my_req_bf.cmnd));
-      status = KER__EXIT_SIGNAL;
-    }
-
-    FS_close_all (index);	    /* Close connections to our servers */
-    kill (parent_pid, SIGUSR1);	    /* Inform parent that we are exiting */
-    exit (status);
-  }
-/*
-**--------------------------------------------------------------------------
-*/
-  void FS_catch_signal (int signo) {
-/*     ===============
-**		    Action Routine for catching signals from Child Processes.
-**
-**		This routine is specific to FOCUS_srv.
-*/
-    pid_t   my_pid;
-
-    my_pid = get_pid ();
-    if (FS_dbg_lev0) printf ("\nFS_catch_signal: "
-			"Signal %d received by PID 0x%x.\n", signo, my_pid);
-    switch (signo) {
-     case SIGUSR1:	    /* A child is about to exit. */
-       FS_cnt_SIGUSR1++;
-       sleep (1);	    /* Give it a chance to disappear! */
-       break;
-     default:
-       printf ("\nFS_catch_signal: Unexpected signal received "
-			    "by PID 0x%x: %d.\n", my_pid, signo);
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void FS_catch_int_signal (int signo) {
-/*     ===================
-**	    Action Routine for catching SIGINT signals. This is a signal
-**	    from the parent to get its child to exit. An exit will be performed.
-**
-**		This routine is specific to FOCUS_srv.
-*/
-    int	    i, j;
-    pid_t   my_pid;
-
-    my_pid = get_pid ();
-			    /*
-			    ** Try to find our index by searching the PID list
-			    */
-    if (my_pid == FS_pids[0]) {
-      ;				    /* Should not get here - there's no Filler
-				    ** for FOCUS_srv! */
-    }else {
-      for (i = MAX_CLIENTS; i > 0; i--) if (my_pid == FS_pids[i]) break;
-      if (i > 0) {
-	if (FS_chld_rw_skt[i] != 0) {
-	  printf ("\nClosing r/w socket of task %s\n", FS_name[i]);
-	  close (FS_chld_rw_skt[i]); FS_chld_rw_skt[i] = 0;
-	}
-	if (FS_chld_cnct_skt[i] != 0) {
-	  printf ("\nClosing connect socket of task %s\n", FS_name[i]);
-	  close (FS_chld_cnct_skt[i]); FS_chld_cnct_skt[i] = 0;
-	}
-	for (j = 0; j < FS_n_slaves; j++) {
-	  if (FS_skt[i][j] != 0) {
-	    printf ("\nClosing client socket of task %s to %s\n",
-			    FS_name[i], FS_slaves[i]);
-	    close (FS_skt[i][j]); FS_skt[i][j] = 0;
-	  }
-	}
-      }
-    }
-
-    if (FS_dbg_lev0) printf ("\nFS_catch_int_signal: "
-			"Signal %d received by PID 0x%x.\n", signo, my_pid);
-    switch (signo) {
-     case SIGINT:	    /* A SIGINT signal has been received. Exit. */
-       exit (KER__SUCCESS);
-       break;
-     default:
-       printf ("\nFS_catch_int_signal: "
-		 "Unexpected signal %d received by PID 0x%x.\n", signo, my_pid);
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**	    FS_cleanup_children:    Find out which child(ren) have exited and
-**			    update the list of task PID's so the associated
-**			    task slot becomes free.
-**
-**		    If FILLER should be present but has fallen off, then any
-**		    active children will be told to exit and we shall set our
-**		    state to "deconfig".
-*/
-  void	FS_cleanup_children (
-/*	===================
-*/		int	  max_chld,	/* The size of the pids array */
-		pid_t	 *pids,		/* Array of pids. Index 0 is FILLER */
-		int	 *pcnt_SIGUSR1,	/* Flag set on SIGUSR1 signals whenever
-					** a child exits. */
-		int	  verbose,	/* If true, report what's going on */
-		char	**tsk_names,
-		char	 *filler_name) {
-
-    int		i, status, n_active, do_newline = False;
-    char       *t_name;
-    pid_t	pid;
-
-    if (pids[0] != 0) {
-      if (verbose) printf ("\n  ... checking state of %s ...", filler_name);
-      t_name = taskName (pids[0]);
-      if (t_name == NULL) {
-        if (verbose) printf (" it has exited.");
-        pids[0] = 0;
-      }else {
-        if (verbose) printf (" it is still active.");
-      }
-      if (verbose) do_newline = True;
-    }
-
-    n_active = 0;
-    for (i = 1; i <= max_chld; i++) {
-      if (pids[i] != 0) {
-	if (verbose) printf ("\n  ... checking state of %s ...", tsk_names[i]);
-	t_name = taskName (pids[i]);
-	if (t_name == NULL) {
-	  if (verbose) printf (" it has exited.");
-	  pids[i] = 0;
-	}else {
-	  if (verbose) printf (" it is still active.");
-	  n_active += 1;
-	}
-	if (verbose) do_newline = True;
-      }
-    }
-    if (do_newline) printf ("\n");
-    if (pcnt_SIGUSR1 != NULL) *pcnt_SIGUSR1 = 0;
-
-    if ((filler_name[0] != NIL) &&	/* Must we force a de-config? */
-	(pids[0] == 0) &&
-	(n_active > 0)) {
-      for (;;) {			/* Loop for ever till programmed! */
-	printf ("\nThe filler process, %s, has terminated abnormally.\n"
-		"A de-configure must be forced\n"
-		"This has not yet been programmed.\n"
-		"Re-boot the histogram memory!!\n", filler_name);
-	sleep (5);
-      }
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**	    FS_close_all:	Shut down any active client cnct'ns
-*/
-  int	FS_close_all (
-/*	============
-*/		int	  index) {
-
-    int			    i, status;
-    char		    recd[80];
-    struct req_buff_struct  my_req_bf;
-    struct rply_buff_struct my_rply_bf;
-
-    my_req_bf.bigend = htonl (0x12345678);
-    my_req_bf.cmnd   = htonl (SQHM_CLOSE);
-    for (i = 0; i < FS_n_slaves; i++) {
-      if (FS_skt[index][i] != 0) {
-	status = send (FS_skt[index][i],
-			(char *) &my_req_bf, sizeof (my_req_bf), 0);
-	if (status == -1) {
-	  perror (StrJoin (recd, sizeof (recd),
-		FS_name[index], "/rqst_send_get: send error"));
-	}
-	close (FS_skt[index][i]);
-	FS_skt[index][i] = 0;
-      }
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**	    FS_close_down_offspring:	Close down FILLER and, if directed,
-**					other children too.
-*/
-  int	FS_close_down_offspring (
-/*	=======================
-*/		int	  harshness,
-		int	  max_chld,
-		pid_t	 *pids,
-		int	 *exit_stat,
-		int	 *pcnt_SIGUSR1,	/* Flag set on SIGUSR1 signals
-					** whenever a child exits. */
-		int	  verbose,	/* If true, report what's going on */
-		char	**tsk_names,
-		char	 *filler_name) {
-
-    int		i, j;
-    int		n_children, new_c = 0;
-    char	buff[132];
-
-    n_children = 0;		/* See if any server children are active */
-    for (i = 1; i <= max_chld; i++) {
-      if (pids[i] != 0) n_children += 1;
-    }
-    if (n_children > 0) {   /* If so, only proceed if asked to be ruthless */
-      if (harshness == 0) {
-	printf ("\nDe-configure error. ");
-        if (n_children == 1) sprintf (buff, "1 server is");
-        if (n_children != 1) sprintf (buff, "%d servers are", n_children);
-	printf ("%s still active.\n", buff);
-	return False;
-      }else {
-        if (n_children == 1) sprintf (buff, " -- 1 server is still active. It");
-        if (n_children != 1) sprintf (buff, " -- %d servers are still active. "
-						"They", n_children);
-	printf ("\n%s will be terminated.\n", buff);
-      }
-    }
-
-    FS_kill_children (max_chld, pids,
-	    tsk_names, filler_name);   /* Kill FILLER and any server children */
-    sleep (1);			       /* Give them chance to exit */
-    FS_cleanup_children (max_chld, pids,    /* Update the PIDs */
-			    pcnt_SIGUSR1, verbose, tsk_names, filler_name);
-
-    for (j = 0; j < n_children; j++) {	    /* Check to see if all gone */
-      if (pids[0] == 0) new_c = 0; else new_c = 1;  /* Count remainder */
-      for (i = max_chld; i > 0; i--) {
-	if (pids[i] != 0) new_c += 1;
-      }
-      if (new_c == 0) break;
-      sleep (1);
-      FS_cleanup_children (max_chld, pids,
-			    pcnt_SIGUSR1, verbose, tsk_names, filler_name);
-    }
-    if (new_c != 0) {
-      printf ("     ... failed to tidy up. %d children still active.\n", new_c);
-      return False;
-    }else {
-      return True;
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**	    FS_deconfig_all:  Deconfigure any active slaves.
-**
-**		This routine is specific to FOCUS_srv.
-*/
-  int	FS_deconfig_all (int harshness) {
-/*	===============
-*/
-    int				i, iret, all_ok = True;
-    struct req_buff_struct	rqst;
-    struct rply_buff_struct	reply;
-
-    rqst.bigend	    = htonl (0x12345678);     /* Set up the deconfig request */
-    rqst.cmnd	    = htonl (SQHM_DECONFIG);
-    rqst.u.decnfg.sub_code = htonl (harshness);
-					/*
-					** Loop sending it to active slaves
-					*/
-    for (i = 0; i < FS_n_slaves; i++) {
-      if (FS_slv_active[i]) {
-	iret = FS_send_cmnd_to_mstr (&FS_rmt_socknam[i],
-		    &rqst, sizeof (rqst), &reply,
-		    &FS_bytes_got, &FS_bytes_put);
-	if (iret && (ntohl (reply.status) == KER__SUCCESS)) {
-	  FS_slv_active[i] = False;
-	}else {
-	  all_ok = False;
-	}
-      }
-    }
-    return all_ok;
-  }
-/*
-**--------------------------------------------------------------------------
-**	    FS_do_command:  Action routine for an SQHM_??? command.
-**			    The command is processed (including returning a
-**			    status response message).
-**
-**		This routine is specific to FOCUS_srv.
-*/
-  int	FS_do_command (
-/*	=============
-*/		int			 index,
-		int			 skt,
-		int			 pkt_size,
-		struct req_buff_struct	*rqst,
-		struct rply_buff_struct *reply) {
-
-    int		status, indx, is, suspendMode, i, j, sub_cmnd;
-    int		txt_len, txt_offset, bytes_to_go, harshness;
-    int		my_first_bin, my_nbins, my_bytes_per_bin, my_hist_no;
-    int		my_sub_code, my_x_lo, my_nx, my_y_lo, my_ny, my_xdim, my_h_slct;
-    time_t	secs;
-    char       *msge, *p_buff, *p_txt;
-
-    reply->bigend = htonl (0x12345678);  /* Put in the "endian" flag. */
-    rply_status_setup (reply, KER__SUCCESS, 0, "All OK");
-
-    switch (ntohl (rqst->cmnd)) {
-
-     case SQHM_CLOSE:		     /* Close the connection. */
-      return False;		     /* Do nothing. */
-
-     case SQHM_CNCT:		     /* Make a new connection. */
-      printf ("\n%s: connecting ...", FS_name[index]);
-
-      time (&secs);
-      secs = secs - FS_start_time;
-      reply->u.cnct.up_time = htonl (secs);
-
-      if (!FS_cfgn_done) {	     /* Check we've been configured */
-	printf (" but not yet configured!\n");
-	is = FS_rply_status_setup_and_send (skt, reply, KER__BAD_STATE, 0,
-					    "Not configured", &FS_bytes_put);
-      }else if (index != 0) {
-	printf (" but not issued to SinqHM-master!\n");
-	is = FS_rply_status_setup_and_send (skt, reply, KER__BAD_STATE, 0,
-					    "Not SinqHM-master", &FS_bytes_put);
-      }else {
-	pkt_size = ntohl (rqst->u.cnct.max_pkt);
-	if ((pkt_size < 1024) || (pkt_size > 8192)) pkt_size = 8192;
-	pkt_size = pkt_size & ~3;     /* Ensure pkt_size is multiple of 4 */
-	indx = FS_make_child (FOCUS_server, 100,
-			ntohl (rqst->u.cnct.strt_mode), pkt_size,
-			MAX_CLIENTS, FS_pids, FS_chld_exit_status,
-			&FS_cnt_SIGUSR1, "FSserv");
-	if (indx <= 0) {	          /* Child created and ready? */
-	  printf ("\n%s: creation of child failed: %d.\n",
-					FS_name[0], indx);
-	  switch (indx) {
-	   case -1: msge = "Spawn failed"; break;
-	   case -2: msge = "No more ports"; break;
-	   case -3: msge = "Time-out of child start-up"; break;
-	   case -4: msge = "Child could not get started"; break;
-	   default: msge = "Bad status from make_child";
-	  }
-	  is = FS_rply_status_setup_and_send (skt, reply, KER__BAD_CREATE,
-						    indx, msge, &FS_bytes_put);
-	}else {			    /* Yes, child is up and ready. */
-	  reply->u.cnct.port	      = htonl (FS_port + indx);
-	  reply->u.cnct.pkt_size      = htonl (pkt_size);
-	  reply->u.cnct.hm_mode	      = htonl (FS_mode_ALL);
-	  reply->u.cnct.n_hists	      = htonl (FS_hi_cntr - FS_lo_cntr + 1);
-	  reply->u.cnct.num_bins      = htonl (FS_hi_bin - FS_lo_bin + 1);
-	  reply->u.cnct.bytes_per_bin = htonl (FS_bpb);
-	  reply->u.cnct.curr_hist     = htonl (0);
-	  reply->u.cnct.max_block = htonl (memFindMax ());  /* Max free mem */
-	  reply->u.cnct.total_bytes = htonl (FS_totl_bytes);
-	  reply->u.cnct.lo_cntr = htonl (FS_lo_cntr);
-	  reply->u.cnct.lo_bin = htonl (FS_lo_bin);
-	  reply->u.cnct.compress = htonl (FS_compress);
-	  printf (" %s started. Packet size = %d.\n", FS_name[indx], pkt_size);
-	  is = FS_rply_status_send (skt, reply, &FS_bytes_put);
-	}
-      }
-      if (!is)
-	printf ("\n%s -- send of status reply failed.\n", FS_name[index]);
-      return is;
-
-     case SQHM_CONFIG:
-      printf ("\n%s: Configure ..", FS_name[index]);
-      if (FS_cfgn_done) {
-	is = FS_rply_status_setup_and_send (skt, reply, KER__BAD_STATE, 0,
-					  "Already configured", &FS_bytes_put);
-	printf (" already configured!\n");
-	return False;
-      }
-
-      FS_free_memory (NULL);	/* There should be no memory allocated but
-				** go and release it anyway!
-				*/
-      is = FS_do_config (skt, rqst, reply);	/* No, do the config */
-      if (!is) {
-	FS_rply_status_send (skt, reply, &FS_bytes_put);
-	return False;
-      }else {
-	FS_cfgn_done = True;
-	is = FS_rply_status_send (skt, reply, &FS_bytes_put);
-	if (!is)
-	    printf ("\n%s -- send of status reply failed.\n", FS_name[index]);
-	return is;
-      }
-
-     case SQHM_DAQ:		    /* Start or stop data acquisition.
-				    ** Simply forward to our slaves. */
-      printf ("\n%s: SQHM_DAQ", FS_name[index]);
-      if (!FS_cfgn_done) {		      /* Configured yet? */
-	FS_rply_status_setup_and_send (skt, reply, KER__BAD_STATE, 0,  /* No */
-					    "Not configured", &FS_bytes_put);
-	printf (" -- not configured!\n");
-	return False;
-      }
-      sub_cmnd = ntohl (rqst->u.daq.sub_cmnd);
-      if (sub_cmnd == DAQ__CLR)  printf ("/DAQ__CLR:");
-      if (sub_cmnd == DAQ__GO)   printf ("/DAQ__GO:");
-      if (sub_cmnd == DAQ__INH)  printf ("/DAQ__INH:");
-      if (sub_cmnd == DAQ__STOP) printf ("/DAQ__STOP:");
-      if (sub_cmnd == DAQ__TST)  printf ("/DAQ__TST:");
-
-      is = FS_do_daq (index, sub_cmnd, rqst, reply);
-
-      if (FS_dsbl_mask == 0) {
-	printf (" data acquisition is active.\n");
-      }else {
-	printf (" data acquisition is inhibited.\n");
-      }
-
-      is = FS_rply_status_send (skt, reply, &FS_bytes_put);
-      if (!is)
-	    printf ("\n%s -- send of status reply failed.\n", FS_name[index]);
-      return is;
-
-     case SQHM_DBG:			     /* Set debug parameters.
-					     ** Just do this locally. Do not
-					     ** pass on to slaves. */
-      FS_dbg_mask = ntohl (rqst->u.dbg.mask);
-      FS_dbg_lev0 = ((FS_dbg_mask & 1) != 0) ? 1 : 0;
-      FS_dbg_lev1 = ((FS_dbg_mask & 2) != 0) ? 1 : 0;
-      FS_dbg_lev2 = ((FS_dbg_mask & 4) != 0) ? 1 : 0;
-      FS_dbg_lev3 = ((FS_dbg_mask & 8) != 0) ? 1 : 0;
-      printf ("\n%s: Debug mask = 0x%x\n", FS_name[index], FS_dbg_mask);
-      is = FS_rply_status_setup_and_send (skt, reply, KER__SUCCESS, 0,
-						NULL, &FS_bytes_put);
-      if (!is)
-	    printf ("\n%s -- send of status reply failed.\n", FS_name[index]);
-      return is;
-
-     case SQHM_DECONFIG:	/* Close down any servers and then deconfigure
-				** our slaves */
-      printf ("\n%s: De-configure", FS_name[index]);
-      if (!FS_cfgn_done) {		    /* Anything to do? */
-	printf (" -- already de-configured!\n");
-	is = FS_rply_status_setup_and_send (skt, reply, KER__SUCCESS, 0,
-						NULL, &FS_bytes_put);
-      }else if (index != 0) {
-	printf (" -- not issued to Master Server!\n");
-	is = FS_rply_status_setup_and_send (skt, reply, KER__BAD_STATE, 0,
-					    "Not Master Server", &FS_bytes_put);
-      }else {
-	harshness = ntohl (rqst->u.decnfg.sub_code);  /* Pick out "harshness" */
-	is = FS_close_down_offspring (harshness,
-		    MAX_CLIENTS, FS_pids, FS_chld_exit_status,
-		    &FS_cnt_SIGUSR1, FS_dbg_lev0, FS_p_names, "");
-	if (is) {
-	  is = FS_deconfig_all (harshness);
-	  if (is) {
-	    printf (" done.\n");
-	    FS_cfgn_done = False;
-	    is = FS_rply_status_setup_and_send (skt, reply, KER__SUCCESS, 0,
-						    NULL, &FS_bytes_put);
-	  }else {
-	    printf ("\nFailed! Problem deconfiguring slaves.\n");
-	    is = FS_rply_status_setup_and_send (skt, reply, KER__BAD_STATE, is,
-			    "Problem deconfiguring slaves", &FS_bytes_put);
-	  }
-	}else {
-	  printf ("\nFailed! Problem terminating children.\n");
-	  is = FS_rply_status_setup_and_send (skt, reply, KER__BAD_STATE, is,
-			    "Problem terminating children", &FS_bytes_put);
-	}
-	FS_free_memory (NULL);	    /* Release all reserved memory */
-      }
-      if (!is)
-	    printf ("\n%s -- send of status reply failed.\n", FS_name[index]);
-      return is;
-
-     case SQHM_EXIT:				    /* Rundown */
-      printf ("\n%s: Run-down ...", FS_name[index]);
-      if (index != 0) {
-	printf (" -- not issued to Master Server!\n");
-	is = FS_rply_status_setup_and_send (skt, reply, KER__BAD_STATE, 0,
-				    "Not SinqHM-master", &FS_bytes_put);
-      }else if (FS_cfgn_done) {
-	printf (" -- not issued to SinqHM-master!\n");
-	is = FS_rply_status_setup_and_send (skt, reply, KER__BAD_STATE, 0,
-				    "Not SinqHM-master", &FS_bytes_put);
-      }else {
-	rqst->u.decnfg.sub_code = htonl (1);	    /* Set "harshness" = 1 */
-	is = FS_close_down_offspring (
-		    ntohl (rqst->u.decnfg.sub_code),  /* Pick out "harshness" */
-		    MAX_CLIENTS, FS_pids, FS_chld_exit_status,
-		    &FS_cnt_SIGUSR1, FS_dbg_lev0, FS_p_names, "");
-	if (is) {
-	  if (FS_cfgn_done) {
-	    printf (" deconfiguring ...");
-	    is = FS_deconfig_all (1);
-	    if (is) {
-	      printf (" done.\n");
-	      FS_cfgn_done = False;
-	      is = FS_rply_status_setup_and_send (skt, reply, KER__SUCCESS, 0,
-						    NULL, &FS_bytes_put);
-	    }else {
-	      printf (" WARNING: deconfig failed.\n");
-	      is = FS_rply_status_setup_and_send (skt, reply, KER__BAD_STATE,
-			is, "Problem deconfiguring", &FS_bytes_put);
-	    }
-	  }
-	}else {
-	  printf (" WARNING: problem terminating children.\n");
-	  is = FS_rply_status_setup_and_send (skt, reply, KER__BAD_STATE, is,
-			    "Problem terminating children", &FS_bytes_put);
-	}
-	FS_free_memory (NULL);	    /* Release all reserved memory */
-      }
-      if (!is)
-	    printf ("\n%s -- send of status reply failed.\n", FS_name[index]);
-      return True;
-
-     case SQHM_IDENT:		     /* Give info on software identification. */
-      txt_len = IDENT_MSGE_LEN;
-      txt_offset = 0;
-      p_buff = calloc (txt_len, 1);	    /* Get a buffer for text info */
-      if (p_buff == NULL) {
-	printf ("\n%s -- SQHM_IDENT: failed to get buffer!\n",
-	    FS_name[index]);
-	FS_rply_status_setup_and_send (skt, reply, KER__BAD_ALLOC, 0,
-	    "Failed to get buffer for composing Ident", &FS_bytes_put);
-	return False;
-      }
-      time (&secs);
-      secs = secs - FS_start_time;
-      reply->u.ident.up_time = htonl (secs);
-      reply->u.ident.n_extra_bytes = htonl (IDENT_MSGE_LEN);
-      p_txt = p_buff;
-
-      reply->u.ident.offset_vxWorks_ident = htons (txt_offset);
-      StrJoin (p_txt, txt_len, vxWorksVersion, "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-      
-      reply->u.ident.offset_vxWorks_date = htons (txt_offset);
-      StrJoin (p_txt, txt_len, creationDate, "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-
-      reply->u.ident.offset_instr = htons (txt_offset);
-      StrJoin (p_txt, txt_len, FS_inst, "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-
-      reply->u.ident.offset_def_ident = htons (txt_offset);
-      StrJoin (p_txt, txt_len, FS_def_ident, "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-
-      reply->u.ident.offset_sinqhm_main_ident = htons (txt_offset);
-      StrJoin (p_txt, txt_len, FS_main_ident, "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-
-      reply->u.ident.offset_sinqhm_main_date = htons (txt_offset);
-      StrJoin (p_txt, txt_len, FS_main_date, "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-
-      reply->u.ident.offset_sinqhm_server_ident = htons (txt_offset);
-      StrJoin (p_txt, txt_len, FS_serv_ident, "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-
-      reply->u.ident.offset_sinqhm_server_date = htons (txt_offset);
-      StrJoin (p_txt, txt_len, FS_serv_date, "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-
-      reply->u.ident.offset_sinqhm_filler_ident = htons (txt_offset);
-      StrJoin (p_txt, txt_len, "", "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-
-      reply->u.ident.offset_sinqhm_filler_date = htons (txt_offset);
-      StrJoin (p_txt, txt_len, "", "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-
-      reply->u.ident.offset_sinqhm_routines_ident = htons (txt_offset);
-      StrJoin (p_txt, txt_len, FS_rout_ident, "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-
-      reply->u.ident.offset_sinqhm_routines_date = htons (txt_offset);
-      StrJoin (p_txt, txt_len, FS_rout_date, "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-
-      is = FS_rply_status_send (skt, reply, &FS_bytes_put);
-		    /*
-		    ** Now send the data
-		    */
-      p_txt = p_buff;
-      bytes_to_go = IDENT_MSGE_LEN;
-      while (bytes_to_go > 0) {
-	i = (bytes_to_go > pkt_size) ? pkt_size : bytes_to_go;
-	is = send (skt, p_txt, i, 0);
-	if (is > 0) {
-	  FS_bytes_put += is;
-	  bytes_to_go  -= is;
-	  p_txt        += is;
-	}else {
-	  free (p_buff);
-	  printf ("\n%s -- SQHM_IDENT: failed to send extra data!\n",
-				    FS_name[index]);
-	  return False;		    /* Fatal error on send */
-	}
-      }
-      free (p_buff);
-      return True;
-
-     case SQHM_PROJECT:	    /* Read a projected "rectangle" of the HM. */
-      if (!FS_cfgn_done) {	     /* Check we've been configured */
-	printf ("\n%s -- projecting but not yet configured!\n", FS_name[index]);
-	is = FS_rply_status_setup_and_send (skt, reply, KER__BAD_STATE, 0,
-					    "Not configured", &FS_bytes_put);
-	return False;
-      }else {
-	if (FS_dbg_lev0) printf ("\n%s -- projecting ...", FS_name[index]);
-	my_sub_code = ntohl (rqst->u.project.sub_code);
-	my_x_lo     = ntohl (rqst->u.project.x_lo);
-	my_nx       = ntohl (rqst->u.project.nx);
-	my_y_lo     = ntohl (rqst->u.project.y_lo);
-	my_ny       = ntohl (rqst->u.project.ny);
-	my_xdim     = ntohl (rqst->u.project.xdim);
-	my_h_slct   = ntohl (rqst->u.project.nhist);
-	is = FS_do_project (index, reply, skt, pkt_size,
-	       my_sub_code, my_x_lo, my_nx, my_y_lo, my_ny, my_xdim, my_h_slct);
-	if (!is) {
-	  printf ("\n%s -- SQHM_PROJECT fatal error sending status reply or "
-			"histo data.\n", FS_name[index]);
-	}else {
-	  if (FS_dbg_lev0) printf (" done.\n");
-	}
-	return is;
-      }
-
-     case SQHM_READ:	/* Read a section of the HM. */
-      if (!FS_cfgn_done) {	     /* Check we've been configured */
-	printf ("\n%s -- reading but not yet configured!\n", FS_name[index]);
-	is = FS_rply_status_setup_and_send (skt, reply, KER__BAD_STATE, 0,
-					    "Not configured", &FS_bytes_put);
-	return False;
-      }else {
-	if (FS_dbg_lev0) printf ("\n%s -- reading ...", FS_name[index]);
-	my_hist_no   = ntohl (rqst->u.read.hist_no);
-	my_first_bin = ntohl (rqst->u.read.first_bin);
-	my_nbins     = ntohl (rqst->u.read.n_bins);
-	is = FS_do_read (index, reply, skt, pkt_size,
-		    my_nbins, my_first_bin, my_hist_no);
-	if (!is) {
-	  printf ("\n%s -- SQHM_READ fatal error sending status reply or "
-			"histo data.\n", FS_name[index]);
-	}else {
-	  if (FS_dbg_lev0) printf (" done.\n");
-	}
-	return is;
-      }
-
-     case SQHM_SELECT:	    /* SQHM_SELECT still needs to be programmed. */
-      printf ("\n%s: Select ...", FS_name[index]);
-      is = FS_rply_status_setup_and_send (skt, reply, KER__BAD_VALUE, 0,
-				    "Not yet available!", &FS_bytes_put);
-      if (!is) {
-	printf ("\n%s -- send of status reply failed.\n", FS_name[index]);
-      }else {
-	printf (" not yet implemented!\n");
-      }
-      return is;
-
-     case SQHM_STATUS:			/* Get-Status request */
-      if (FS_dbg_lev0) printf ("\n%s: Status ...", FS_name[index]);
-		    /*
-		    ** Build up info
-		    */
-      reply->status = htonl (KER__SUCCESS);	/* Indicate success */
-      strcpy ((char *) &reply->sub_status,	/* Set up the Ident */
-			    SINQHM_DEF_ID);	/* This does not need htonl! */
-      reply->u.status.max_n_hists  = htonl (N_HISTS_MAX);
-      reply->u.status.max_num_bins = htonl (N_BINS_MAX + 1);
-      reply->u.status.max_srvrs    = MAX_CLIENTS;
-      reply->u.status.max_block    = htonl (memFindMax ());  /* Max free mem */
-      if (!FS_cfgn_done) {
-	reply->u.status.cfg_state     = 0;
-	reply->u.status.n_hists	      = 0;
-	reply->u.status.curr_hist     = 0;
-	reply->u.status.num_bins      = 0;
-	reply->u.status.act_srvrs     = 0;
-	reply->u.status.bytes_per_bin = 0;
-	reply->u.status.compress      = 0;
-	reply->u.status.daq_now	      = 0;
-	reply->u.status.filler_mask   = 0;
-	reply->u.status.tsi_status    = 0;
-	reply->u.status.flags	      = 0;
-	reply->u.status.dt_or_dts.both = 0;
-	reply->u.status.num_bad_events = 0;
-      }else {
-	reply->u.status.cfg_state    = htonl (FS_mode_ALL);
-	reply->u.status.n_hists      = htonl (FS_hi_cntr - FS_lo_cntr + 1);
-	reply->u.status.curr_hist    = htons (0);
-	reply->u.status.num_bins     = htonl (FS_hi_bin - FS_lo_bin + 1);
-
-	for (j = 0, i = 1; i <= MAX_CLIENTS; i++) if (FS_pids[i] != 0) j++;
-	reply->u.status.act_srvrs  = j;
-
-	reply->u.status.bytes_per_bin = FS_bpb;
-	reply->u.status.compress      = FS_compress;
-	reply->u.status.daq_now	      = htons (FS_dsbl_mask);
-	reply->u.status.filler_mask   = htons (FS_srv_masks[0]);
-	reply->u.status.tsi_status    = htonl (0);
-	reply->u.status.flags	      = htonl (0);
-	reply->u.status.dt_or_dts.both = htonl (0);
-	reply->u.status.num_bad_events = htonl (0);
-      }
-      time (&secs);
-      secs = secs - FS_start_time;
-      reply->u.status.up_time = htonl (secs);
-
-      is = FS_rply_status_send (skt, reply, &FS_bytes_put);
-      if (FS_dbg_lev0) {
-	if (!is) {
-	  printf ("\n%s -- send of status reply failed.\n", FS_name[index]);
-	}else {
-	  printf (" has been sent.\n");
-	}
-      }
-      return is;
-
-     case SQHM_WRITE:	/* Write a section of the HM.
-			**
-			** NOTE: always call FS_do_write, even if not configured
-			** ====  since network data has always to be read.
-			*/
-      printf ("\n%s: writing ...", FS_name[index]);
-      my_hist_no       = ntohl (rqst->u.write.hist_no);
-      my_first_bin     = ntohl (rqst->u.write.first_bin);
-      my_nbins	       = ntohl (rqst->u.write.n_bins);
-      my_bytes_per_bin = ntohl (rqst->u.write.bytes_per_bin);
-      is = FS_do_write (index, rqst, reply, skt, pkt_size,
-			my_nbins, my_first_bin, my_bytes_per_bin, my_hist_no);
-      if (!is) {
-	printf ("\n%s -- send of status reply failed.\n", FS_name[index]);
-      }else {
-	printf (" done.\n");
-      }
-      return is;
-
-     case SQHM_ZERO:
-      if (!FS_cfgn_done) {	     /* Check we've been configured */
-	printf ("\n%s -- zeroing but not yet configured!\n", FS_name[index]);
-	is = FS_rply_status_setup_and_send (skt, reply, KER__BAD_STATE, 0,
-					    "Not configured", &FS_bytes_put);
-	return False;
-      }else {
-        printf ("\n%s -- zeroing ...", FS_name[index]);
-
-	my_hist_no   = ntohl (rqst->u.zero.hist_no);
-	my_first_bin = ntohl (rqst->u.zero.first_bin);
-        my_nbins     = ntohl (rqst->u.zero.n_bins);
-
-	FS_do_zero (reply, index, my_nbins, my_first_bin, my_hist_no);
-	is = FS_rply_status_send (skt, reply, &FS_bytes_put);
-	if (!is) {
-	  printf ("\n%s -- send of status reply failed.\n", FS_name[index]);
-	}else {
-	  printf (" done.\n");
-	}
-	return is;
-      }
-
-     default:
-      printf ("\n%s: Unrecognised command received ...\n", FS_name[index]);
-      is = FS_rply_status_setup_and_send (skt, reply, KER__BAD_VALUE, 0,
-				"Unrecognised command!", &FS_bytes_put);
-      if (!is) {
-	printf ("\n%s -- send of status reply failed.\n", FS_name[index]);
-      }else {
-	printf (" it has been acknowledged.\n");
-      }
-      return is;
-    }
-    printf ("\nSoftware error in do_command - switch statement completed!\n");
-    return False;
-  }
-/*
-**--------------------------------------------------------------------------
-**	    FS_do_config:  ...
-*/
-  int	FS_do_config (
-/*	============
-*/		int			 skt,
-		struct req_buff_struct  *request,
-		struct rply_buff_struct *reply) {
-
-    int			i, n_bytes_got, iret, return_status;
-    uint		bytes_needed, n_extra, n_edges, n_banks;
-    uint		sizeof_edge_arr, n_bins, flag;
-    uint		lo_cntr, hi_cntr, n_cntrs, slv_lo_cntr, slv_hi_cntr;
-    char		    *p_addr;
-    struct tof_bank	    *p_bank;
-    struct req_buff_struct  *my_rqu;
-    struct rply_buff_struct  my_rply;
-
-    FS_mode_ALL = ntohl (request->u.cnfg.mode);	/* The histogramming mode */
-
-    FS_mode	    = FS_mode_ALL & (~SQHM__SUB_MODE_MSK);
-    FS_mode_DEBUG   = FS_mode_ALL & SQHM__DEBUG;
-    FS_mode_UD	    = FS_mode_ALL & SQHM__UD;
-    FS_mode_BO	    = FS_mode_ALL & SQHM__BO_MSK;
-    FS_mode_STROBO  = FS_mode_ALL & SQHM__STROBO;
-    FS_mode_REFLECT = FS_mode_ALL & SQHM__REFLECT;
-    FS_mode_NO_STAT = FS_mode_ALL & SQHM__NO_STAT;
-
-    if (FS_mode != SQHM__TOF) {	    /* The mode must be TOF */
-      printf ("\nFS_do_config: mode is not TOF\n");
-      return False;
-    }
-	    /*
-	    ** For complicated configurations, there may be more config
-	    ** data to be read. If so n_extra_bytes will be non-zero.
-	    */
-    n_extra = ntohl (request->u.cnfg.u.tof.n_extra_bytes);
-    if (n_extra != 0) {
-	    /*
-	    ** There is extra data to be read. Get buffer space for the
-	    ** extra stuff plus space to copy over what has already been
-	    ** read so that everything is in a contiguous buffer.
-	    */
-      bytes_needed = n_extra + sizeof (*request);
-      bytes_needed = (bytes_needed + 3) & (~3);	/* Round up to multiple of 4 */
-      p_addr = malloc (bytes_needed);
-      if (p_addr == NULL) {
-	printf ("\nFS_do_config:"
-	    " cannot allocate memory for extra config data!\n");
-	net_flush (skt, n_extra);
-	rply_status_setup (reply, KER__BAD_ALLOC, 0,
-	    "Failed to get buffer for extra config data");
-	return False;
-      }
-      my_rqu = (struct req_buff_struct *) p_addr;
-      memcpy (p_addr, request, sizeof (*request));  /* Copy in what has already
-						    ** been read. */
-      bytes_needed = n_extra;		/* And read the rest */
-      p_addr += sizeof (*request);
-      while (bytes_needed > 0) {
-	n_bytes_got = recv (skt, p_addr, bytes_needed, 0);
-	if (n_bytes_got <= 0) break;
-	FS_bytes_got += n_bytes_got;
-	bytes_needed -= n_bytes_got;
-	p_addr += n_bytes_got;
-      }
-      if (n_bytes_got < 0) {
-	printf ("\n"
-	    "%s -- R/W-Socket recv error\n"
-	    "%s -- Connection will be closed.\n", FS_name[0], FS_name[0]);
-	rply_status_setup (reply, KER__BAD_VALUE, 0, "recv failed");
-	free (my_rqu);
-	return False;
-      }
-    }else {
-      my_rqu = request;
-    }
-
-    n_bins = ntohl (my_rqu->u.cnfg.u.tof.edge_0.n_bins);
-    flag   = ntohl (my_rqu->u.cnfg.u.tof.edge_0.flag);
-    if ((flag & FLAG__VAR_BIN) != 0) {
-      sizeof_edge_arr = OffsetOf (struct tof_edge_arr, edges) +
-			((n_bins + 1) * sizeof (uint));
-      FS_compress = 0;
-    }else {
-      sizeof_edge_arr = sizeof (struct tof_edge_arr);
-      FS_compress = ntohl (my_rqu->u.cnfg.u.tof.edge_0.edges[1]) -
-			ntohl (my_rqu->u.cnfg.u.tof.edge_0.edges[0]);
-    }
-    p_bank = (struct tof_bank *) (
-		(char *) &my_rqu->u.cnfg.u.tof.edge_0 + sizeof_edge_arr);
-
-
-    n_edges = ntohs (my_rqu->u.cnfg.u.tof.n_edges);
-    n_banks = ntohs (my_rqu->u.cnfg.u.tof.n_banks);
-    if ((n_edges != 1) || (n_banks != 1)) {
-      printf ("\nFS_do_config: configuration is too complex.\n");
-      return False;
-    }
-    lo_cntr = ntohl (p_bank->first);
-    n_cntrs = ntohl (p_bank->n_cntrs);
-    hi_cntr = lo_cntr + n_cntrs -1;
-		    /*
-		    ** Now loop sending the configuration request to
-		    ** all slaves.
-		    */
-    return_status = True;		    /* Assume all will be OK */
-    for (i = 0; i < FS_n_slaves; i++) {
-      if (FS_slaves[i] != NULL) {
-	slv_lo_cntr = (FS_lo_det[i] > lo_cntr) ? FS_lo_det[i] : lo_cntr;
-	slv_hi_cntr = (FS_hi_det[i] < hi_cntr) ? FS_hi_det[i] : hi_cntr;
-	if (slv_hi_cntr >= slv_lo_cntr) {
-	  FS_slv_active[i] = True;
-	  p_bank->first	  = htonl (slv_lo_cntr - FS_lo_det[i]);
-	  p_bank->n_cntrs = htonl (slv_hi_cntr - slv_lo_cntr + 1);
-	  iret = FS_send_cmnd_to_mstr (&FS_rmt_socknam[i],
-		my_rqu, (sizeof (*request) + n_extra),
-		&my_rply, &FS_bytes_got, &FS_bytes_put);
-	  if (iret && (ntohl (my_rply.status) != KER__SUCCESS)) {
-	    reply->status     = my_rply.status;
-	    reply->sub_status = my_rply.sub_status;
-	    StrJoin (reply->u.message, sizeof (reply->u.message),
-				FS_slaves[i], ": ");
-	    StrJoin (reply->u.message, sizeof (reply->u.message),
-				reply->u.message, my_rply.u.message);
-	    FS_slv_active[i] = False;
-	    return_status = False;
-	    break;
-	  }
-	}else {
-	  FS_slv_active[i] = False;
-	}
-      }
-    }
-
-    if (!return_status) {   /* If any error, force deconfig */
-      FS_deconfig_all (1);
-      return return_status;
-    }
-
-    FS_lo_cntr = lo_cntr;
-    FS_hi_cntr = hi_cntr;
-    FS_lo_bin = 0;
-    FS_hi_bin = n_bins - 1;
-    FS_bpb = ntohl (p_bank->bytes_per_bin);
-    FS_totl_bytes = FS_bpb * (FS_hi_cntr - FS_lo_cntr + 1) *
-				(FS_hi_bin - FS_lo_bin + 1);
-
-    if (n_extra != 0) free (my_rqu);
-    return return_status;
-  }
-/*
-**--------------------------------------------------------------------------
-**	    FS_do_daq:  Handle an SQHM_DAQ command.
-*/
-  int	FS_do_daq (
-/*	=========
-*/		int			 indx,
-		int			 sub_cmnd,
-		struct req_buff_struct  *request,
-		struct rply_buff_struct *reply) {
-
-    int		i, iret, all_ok = True;
-
-    if (sub_cmnd == DAQ__TST) {	    /* DAQ__TST is special - we just give the ..
-				    ** .. caller a snapshot of our status ..
-				    ** .. without invoking our slaves. */
-      reply->status = htonl (KER__SUCCESS);
-      reply->u.daq.daq_was = htons (FS_dsbl_mask);
-      reply->u.daq.filler_mask = htons (FS_srv_masks[0]);
-      reply->u.daq.server_mask = htons (FS_srv_masks[indx]);
-      reply->u.daq.daq_now = reply->u.daq.daq_was;
-    }else {
-		/*
-		** Claim the sem to avoid race conditions with other threads
-		*/
-      if (FS_use_sem_tmo) {
-	iret = semTake (FS_sem_daq, FS_sem_tmo);
-      }else {
-	iret = semTake (FS_sem_daq, WAIT_FOREVER);
-      }
-			/*
-			** Loop sending the SQHM_DAQ command to active slaves
-			*/
-      request->bigend	      = htonl (0x12345678);
-      request->cmnd	      = htonl (SQHM_DAQ);
-      request->u.daq.sub_cmnd = htonl (sub_cmnd);
-      for (i = 0; i < FS_n_slaves; i++) {
-	if (FS_slv_active[i]) {
-	  if (indx == 0) {	/* If we are the master-server, send it to the
-				** master-servers in the slaves. */
-	    iret = FS_send_cmnd_to_mstr (&FS_rmt_socknam[i],
-		    request, sizeof (*request), reply,
-		    &FS_bytes_got, &FS_bytes_put);
-	    if (!iret || (ntohl (reply->status) != KER__SUCCESS)) all_ok=False;
-	  }else {
-	    iret = rqst_send_get (FS_skt[indx][i], request, sizeof (*request),
-			 reply, sizeof (*reply),
-			 &FS_bytes_got, &FS_bytes_put, FS_name[indx]);
-	    if (!iret || (ntohl (reply->status) != KER__SUCCESS)) all_ok=False;
-	  }
-	}
-      }
-      if (!all_ok) {		/* If error, go no further! */
-	semGive (FS_sem_daq);
-	return all_ok;
-      }
-      reply->status = htonl (KER__SUCCESS);
-      reply->u.daq.daq_was = htons (FS_dsbl_mask);
-      reply->u.daq.filler_mask = htons (FS_srv_masks[0]);
-      reply->u.daq.server_mask = htons (FS_srv_masks[indx]);
-      switch (sub_cmnd) {
-       case DAQ__CLR:
-	FS_dsbl_mask &= (~FS_srv_masks[indx]);  /* Clear user's mask bit. */
-	break;
-       case DAQ__GO:
-	FS_dsbl_mask &= (~FS_srv_masks[0]);	/* Clear "filler's" mask bit. */
-	break;
-       case DAQ__INH:
-	FS_dsbl_mask |= FS_srv_masks[indx];	    /* Set user's mask bit */
-	break;
-       case DAQ__STOP:
-	FS_dsbl_mask |= FS_srv_masks[0];	/* Set "filler's" mask bit. */
-      }
-      reply->u.daq.daq_now = htons (FS_dsbl_mask);  /* Complete the status
-						    ** response message */
-      iret = semGive (FS_sem_daq);	    /* Release the semaphore */
-    }
-    return all_ok;
-  }
-/*
-**--------------------------------------------------------------------------
-**	    FS_do_project:  Read a "rectangular" region of Hist Mem and send it
-**			    to the client.
-*/
-  int	FS_do_project (
-/*	=============
-*/		int			index,
-		struct rply_buff_struct *rply_bf,
-		int			rw_skt,
-		int			pkt_size,
-		uint			sub_code,
-		uint			x_lo,
-		uint			nx,
-		uint			y_lo,
-		uint			ny,
-		uint			xdim,
-		uint			h_slct) {
-/*
-**                  Read a "rectangular" region of Hist Mem and send it
-**		    to the client.
-*/
-    uint		    my_bin_lo,  my_bin_hi;
-    uint		    my_cntr_lo, my_cntr_hi;
-    int			    i, is, nput, my_daq_save;
-    uint		    my_nbins, bins_to_go, bytes_in_buff, bytes_to_go;
-    uchar		   *buff_pntr;
-    char		    recd[132], *nxt;
-    struct req_buff_struct  my_rqst;
-    struct rply_buff_struct my_rply;
-
-    register union {
-      void	    *base;
-      uchar	    *ch;
-      usint	    *i2;
-      uint	    *i4;
-    } my_pntr0, my_pntr1;
-
-    rply_status_setup (rply_bf, KER__BAD_VALUE, 0, "Bad argument"); /* Assume ..
-						** .. we shall find a bad arg */
-/*--------------------------------------------------------------------
-**	    There's no need to test the hist mode; it must be SQHM_TOF because
-**	    SQHM_CONFIG rejects anything else. So, start by checking arguments.
-*/
-    if ((sub_code & PROJECT__1_DIM) != 0) {
-      printf ("\n%s -- SQHM_PROJECT: SQHM__TOF+PROJECT__1_DIM not yet "
-			"implemented!\n", FS_name[index]);
-      is = FS_rply_status_setup_and_send (rw_skt, rply_bf, KER__BAD_VALUE, 0,
-			    "Not yet implemented", &FS_bytes_put);
-      return OK;
-    }
-				/* Check the arguments */
-				/* Check that counter numbers are in range */
-    my_cntr_lo = y_lo;
-    if ((my_cntr_lo < FS_lo_cntr) ||
-	(my_cntr_lo > FS_hi_cntr)) {
-      printf ("\n%s -- SQHM_PROJECT: Bad y_lo!\n", FS_name[index]);
-      is = FS_rply_status_send (rw_skt, rply_bf, &FS_bytes_put);
-      return OK;
-    }
-    my_cntr_hi = (ny != 0) ? (y_lo + ny - 1) : FS_hi_cntr;
-    if ((my_cntr_hi < my_cntr_lo) || (my_cntr_hi > FS_hi_cntr)) {
-      printf ("\n%s -- SQHM_PROJECT: Bad ny!\n", FS_name[index]);
-      is = FS_rply_status_send (rw_skt, rply_bf, &FS_bytes_put);
-      return OK;
-    }
-				/* Check that bin numbers are in range */
-    my_bin_lo = x_lo;
-    if ((my_bin_lo < FS_lo_bin) ||
-	(my_bin_lo > FS_hi_bin)) {
-      printf ("\n%s -- SQHM_PROJECT: Bad x_lo!\n", FS_name[index]);
-      is = FS_rply_status_send (rw_skt, rply_bf, &FS_bytes_put);
-      return OK;
-    }
-    my_bin_hi = (nx != 0) ?
-		    (x_lo + nx - 1) : FS_hi_bin;
-    if ((my_bin_hi < my_bin_lo) ||
-	(my_bin_hi > FS_hi_bin)) {
-      printf ("\n%s -- SQHM_PROJECT: Bad nx!\n", FS_name[index]);
-      is = FS_rply_status_send (rw_skt, rply_bf, &FS_bytes_put);
-      return OK;
-    }
-		    /*
-		    ** All the arguments have been checked. Reserve some space
-		    ** for projecting the data. The amount of space that we
-		    ** need for the projection depends on whether the
-		    ** projection is onto the x-axis or y-axis.
-		    */
-    my_nbins = ((sub_code & PROJECT__ON_Y) == 0) ?
-		    (my_bin_hi - my_bin_lo + 1) : (my_cntr_hi - my_cntr_lo + 1);
-
-    my_pntr0.base = calloc (my_nbins, sizeof (uint));
-    my_pntr1.base = calloc (my_nbins, sizeof (uint));
-    if ((my_pntr0.base == NULL) || (my_pntr1.base == NULL)) {
-      printf ("\n%s -- SQHM_PROJECT: failed to get buffer!\n",
-				FS_name[index]);
-      FS_rply_status_setup_and_send (rw_skt, rply_bf, KER__BAD_ALLOC, 0,
-	    "Failed to get buffer for projecting data", &FS_bytes_put);
-      return OK;
-      free (my_pntr1.base);
-    }
-		    /*-----------------------------------------------------
-		    ** We got some buffer space so inhibit data acqu ...
-		    */
-    my_daq_save = FS_dsbl_mask & FS_srv_masks[index]; /* Remember the ..
-			** .. state of our inhibit bit and disable data acq
-			** .. if not already disabled by us. This is necessary
-			** .. to prevent data "skewing" as we read out our
-			** .. 3 slaves. */
-    if (my_daq_save == 0) FS_do_daq (index, DAQ__INH, &my_rqst, &my_rply);
-		    /*-----------------------------------------------------
-		    ** ... then do the projection ...
-		    */
-    bins_to_go = FS_project_hm (index, pkt_size,
-		    my_pntr0.base, my_pntr1.base, my_nbins,
-		    sub_code, my_cntr_lo, my_cntr_hi, my_bin_lo, my_bin_hi);
-    if (bins_to_go <= 0) {
-      if (my_daq_save == 0) FS_do_daq (index, DAQ__CLR, &my_rqst, &my_rply);
-      perror (StrJoin (recd, sizeof (recd),
-		    FS_name[index], "/FS_do_project: FS_project_hm error"));
-      free (my_pntr0.base);
-      free (my_pntr1.base);
-      return False;
-    }
-		    /*-----------------------------------------------------
-		    ** ... projection complete so let Filler continue and
-		    **     send data back to client.
-		    */
-    if (my_daq_save == 0) FS_do_daq (index, DAQ__CLR, &my_rqst, &my_rply);
-
-    rply_bf->u.project.n_bins	     = htonl (my_nbins);
-    rply_bf->u.project.bytes_per_bin = htonl (sizeof (uint));
-    rply_bf->u.project.cnts_lo	     = htonl (0);
-    rply_bf->u.project.cnts_hi	     = htonl (0);
-
-    if (rply_bf->bigend != 0x12345678) {    /* If byte swapping needed, ...
-					    ** .. then swap them! */
-      for (i = 0; i < my_nbins; i++) my_pntr0.i4[i] = htonl (my_pntr0.i4[i]);
-    }
-
-    is = FS_rply_status_setup_and_send (rw_skt, rply_bf, KER__SUCCESS, 0,
-		    NULL, &FS_bytes_put);
-
-    bytes_to_go = my_nbins * sizeof (uint);
-    buff_pntr = (uchar *) my_pntr0.base;
-
-    while (bytes_to_go > 0) {
-      nput = (bytes_to_go > pkt_size) ? pkt_size : bytes_to_go;
-      is = send (rw_skt, buff_pntr, nput, 0);
-      if (is > 0) {
-	FS_bytes_put += is;
-	bytes_to_go  -= is;
-	buff_pntr    += is;
-      }else {
-	free (my_pntr0.base);
-        free (my_pntr1.base);
-	return ERROR;	    /* Fatal error on send */
-      }
-    }
-    free (my_pntr0.base);	    /* Release our bit of memory */
-    free (my_pntr1.base);
-    return True;
-  }
-/*
-**--------------------------------------------------------------------------
-**	    FS_do_read:	    Read a consecutive region of 'nbins' bins of the
-**			    Hist Mem starting with bin 'first' and send it to
-**			    the client.
-*/
-  int	FS_do_read (
-/*	==========
-*/		int			index,
-		struct rply_buff_struct *rply_bf,
-		int			rw_skt,
-		int			pkt_size,
-		uint			nbins,
-		uint			first,
-		uint			hist_no) {
-
-    register int	    i, my_fstbin, my_topbin;
-    int			    is, status, bytes_to_go, nput, nxtbin, nb;
-    int			    my_daq_save;
-    uint		    maxbins, my_nbins, bins_in_buff;
-    uint		    nxtbin_to_send, nbins_to_send, bytes_in_buff;
-    uint		    bins_to_go, lastbin;
-    struct req_buff_struct  my_rqst;
-    struct rply_buff_struct my_rply;
-    uchar		    *buff_pntr, *last_byte, *nxt;
-    uchar		    buff[pkt_size];
-
-    register union {
-      void	    *base;
-      uchar	    *ch;
-      usint	    *i2;
-      uint	    *i4;
-    } my_pntr, hm_pntr;
-/*--------------------------------------------------------------------
-**	    There's no need to test the hist mode; it must be SQHM_TOF because
-**	    SQHM_CONFIG rejects anything else. So, start by checking arguments.
-*/
-    maxbins = (FS_hi_cntr - FS_lo_cntr + 1) * (FS_hi_bin - FS_lo_bin + 1);
-/***************************************************************/
-/***************************************************************/
-    if ((hist_no == -1) || (hist_no == 0)) {
-		/* Regard the histograms as 1 long array */
-      if ((first == -1) && (nbins == -1)) {
-		/* The user just wants to read everything */
-	my_fstbin = 0;
-	my_nbins  = maxbins;
-      }else {
-		/* The user wants a part of the histogram data */
-	if (first >= maxbins) {
-	  if (FS_dbg_lev0) printf (
-	       "\n%s -- SQHM_READ: bad first_bin %d!\n", FS_name[index], first);
-	  is = FS_rply_status_setup_and_send (rw_skt, rply_bf, KER__BAD_VALUE,
-			    0, "\"first_bin\" too big", &FS_bytes_put);
-	  return is;
-	}else if ((nbins > maxbins) || ((first + nbins) > maxbins)) {
-	  if (FS_dbg_lev0) printf (
-		"\n%s -- SQHM_READ: bad n_bins %d!\n", FS_name[index], nbins);
-	  is = FS_rply_status_setup_and_send (rw_skt, rply_bf, KER__BAD_VALUE,
-			    0, "\"n_bins\" too big", &FS_bytes_put);
-	  return is;
-	}
-	my_fstbin = first;
-	my_nbins  = nbins;
-      }
-    }else {
-		/* The user wants a part of the histogram of a single counter */
-      if ((hist_no < FS_lo_cntr) || (hist_no > FS_hi_cntr)) {
-	if (FS_dbg_lev0) printf (
-		"\n%s -- SQHM_READ: bad hist_no!\n", FS_name[index]);
-	is = FS_rply_status_setup_and_send (rw_skt, rply_bf, KER__BAD_VALUE,
-			    0, "\"hist_no\" out of range", &FS_bytes_put);
-	return is;
-      }else if ((first < FS_lo_bin) || (first > FS_hi_bin)) {
-	if (FS_dbg_lev0) printf (
-		"\n%s -- SQHM_READ: bad first_bin!\n", FS_name[index]);
-	is = FS_rply_status_setup_and_send (rw_skt, rply_bf, KER__BAD_VALUE,
-			    0, "\"first_bin\" out of range", &FS_bytes_put);
-	return is;
-      }else if ((nbins > (FS_hi_bin - FS_lo_bin + 1)) ||
-		((first + nbins) > (FS_hi_bin + 1))) {
-	if (FS_dbg_lev0) printf (
-		"\n%s -- SQHM_READ: bad n_bins!\n", FS_name[index]);
-	is = FS_rply_status_setup_and_send (rw_skt, rply_bf, KER__BAD_VALUE,
-			    0, "\"n_bins\" out of range", &FS_bytes_put);
-	return is;
-      }
-      my_fstbin = (hist_no - FS_lo_cntr) * (FS_hi_bin - FS_lo_bin + 1) + first;
-      my_nbins  = nbins;
-    }
-/***************************************************************/
-		    /*
-		    ** The args are OK.
-		    ** Set up fixed buffer to do transfer
-		    */
-    my_pntr.base = NULL;
-    my_pntr.base = readBuffer;
-    bins_in_buff = READBUFSIZE/FS_bpb;
-
-    if (my_pntr.base == NULL ) {
-      if (FS_dbg_lev0) printf (
-		"\n%s -- SQHM_READ: no buffer space available!\n",
-					    FS_name[index]);
-      is = FS_rply_status_setup_and_send (rw_skt, rply_bf, KER__BAD_VALUE,
-			    0, "No buffer space", &FS_bytes_put);
-      return is;
-    }
-		    /*
-		    ** The args are OK and we have some buffer space.
-		    ** Tell client he's about to get some data!
-		    */
-    rply_bf->u.read.first_bin	    = htonl (my_fstbin);
-    rply_bf->u.read.n_bins	    = htonl (my_nbins);
-    rply_bf->u.read.bytes_per_bin   = htonl (FS_bpb);
-    rply_bf->u.read.cnts_lo	    = 0;    /* \  cnts_lo and cnts_hi not */
-    rply_bf->u.read.cnts_hi	    = 0;    /* /  yet implemented	  */
-    is = FS_rply_status_setup_and_send (rw_skt, rply_bf, KER__SUCCESS,
-				    0, NULL, &FS_bytes_put);
-
-    my_daq_save = FS_dsbl_mask & FS_srv_masks[index]; /* Remember the ..
-			** .. state of our inhibit bit and disable data acq
-			** .. if not already disabled by us. This is necessary
-			** .. to prevent data "skewing" as we read out our
-			** .. 3 slaves. */
-    if (my_daq_save == 0) FS_do_daq (index, DAQ__INH, &my_rqst, &my_rply);
-    nxtbin_to_send = my_fstbin;
-    nbins_to_send = my_nbins;
-    bytes_in_buff = 0;
-    nxt = (char *) my_pntr.base;
-
-    while (nbins_to_send > 0) {
-				    /* Read some histogram data into buffer */
-      lastbin = nxtbin_to_send + bins_in_buff;
-      if(lastbin > my_nbins-1){
-	lastbin = my_nbins-1;
-      }
-      bins_to_go = FS_read_hm (index, pkt_size,
-				my_pntr.base, bins_in_buff,
-				nxtbin_to_send, lastbin);
-      if (bins_to_go <= 0) {
-	perror (StrJoin (buff, pkt_size,
-		    FS_name[index], "/FS_do_read: FS_read_hm error"));
-	free (my_pntr.base);
-	if (my_daq_save == 0) FS_do_daq (index, DAQ__CLR, &my_rqst, &my_rply);
-	return False;
-      }
-      nxt = (char *) my_pntr.base;
-      bytes_in_buff = bins_to_go * FS_bpb;
-      while (bytes_in_buff > 0) {	    /* Send data to user */
-	bytes_to_go = (bytes_in_buff > pkt_size) ? pkt_size : bytes_in_buff;
-	is = send (rw_skt, nxt, bytes_to_go, 0);
-	if (is <= 0) {
-	  perror (StrJoin (buff, pkt_size,
-		    FS_name[index], "/FS_do_read: send error"));
-	  free (my_pntr.base);
-	  if (my_daq_save == 0) FS_do_daq (index, DAQ__CLR, &my_rqst, &my_rply);
-	  return False;
-	}
-	FS_bytes_put += bytes_to_go;
-	bytes_in_buff -= bytes_to_go;
-	nxt += bytes_to_go;
-      }
-      nxtbin_to_send += bins_to_go;
-      nbins_to_send  -= bins_to_go;
-    }
-
-		    /*
-		    ** Read-out complete so let DAQ continue.
-		    */
-    if (my_daq_save == 0) FS_do_daq (index, DAQ__CLR, &my_rqst, &my_rply);
-    return True;
-  }
-/*
-**--------------------------------------------------------------------------
-**	    FS_do_write:    Preset a consecutive region of the Hist Mem. The
-**			    number of bins to preset is 'nbins' starting with
-**			    bin 'first'. The data for the bins is read from
-**			    the client.
-*/
-  int	FS_do_write (
-/*	===========
-*/		int			index,
-		struct req_buff_struct	*req_bf,
-		struct rply_buff_struct *rply_bf,
-		int			rw_skt,
-		int			pkt_size,
-		int			nbins,
-		int			first,
-		int			bytes_per_bin,
-		int			hist_no) {
-    return True;
-  }
-/*
-**--------------------------------------------------------------------------
-**	    FS_do_zero:	    Action routine for SQHM_ZERO command.
- *
- * This is only partially functional. The definition for SQHM_ZERO states
- * that it is possible to zero only parts of the histogram. The version
- * below just forwards a full zero request to all slaves and thus fits
- * the bill for FOCUS. Probably for any other instrument as well.
- *  
- * Mark Koennecke, November 2000 
-*/
-  int	FS_do_zero (
-/*	===========
-*/		struct rply_buff_struct *reply,
-		int			indx,
-		int			nbins,
-		int			first_bin,
-		int			hist_no) {
-
-    int		i, iret, all_ok = True;
-    struct req_buff_struct request;
-
-    /*
-      set up the request structure which zeros the whole histogram
-    */
-    request.bigend = htonl(0x12345678);
-    request.cmnd   = htonl(SQHM_ZERO);
-    request.u.zero.hist_no = htonl(-1);
-    request.u.zero.first_bin = htonl(-1);
-    request.u.zero.n_bins = htonl(-1);
-
-		/*
-		** Claim the sem to avoid race conditions with other threads
-		*/
-    if (FS_use_sem_tmo) {
-	iret = semTake (FS_sem_daq, FS_sem_tmo);
-    }else {
-	iret = semTake (FS_sem_daq, WAIT_FOREVER);
-    }
-
-    /*
-      send the request to all known slaves 
-    */
-      for (i = 0; i < FS_n_slaves; i++) {
-	if (FS_slv_active[i]) {
-	  if (indx == 0) {	/* If we are the master-server, send it to the
-				** master-servers in the slaves. */
-	    iret = FS_send_cmnd_to_mstr (&FS_rmt_socknam[i],
-		    &request, sizeof (request), reply,
-		    &FS_bytes_got, &FS_bytes_put);
-	    if (!iret || (ntohl (reply->status) != KER__SUCCESS)) all_ok=False;
-	  }else {
-	    iret = rqst_send_get (FS_skt[indx][i], &request, sizeof (request),
-			 reply, sizeof (*reply),
-			 &FS_bytes_got, &FS_bytes_put, FS_name[indx]);
-	    if (!iret || (ntohl (reply->status) != KER__SUCCESS)) all_ok=False;
-	  }
-	}
-      }
-      if (!all_ok) {		/* If error, go no further! */
-        printf("Error zeroing histogram no %d\n", i);
-	semGive (FS_sem_daq);
-	return all_ok;
-      }
-
-      /*
-       tell the world about our success 
-      */
-      reply->status = htonl (KER__SUCCESS);
-
-      /* release semaphore */
-      semGive (FS_sem_daq);
-
-
-    return True;
-  }
-/*
-**--------------------------------------------------------------------------
-**	    FS_free_memory: Free any memory allocated for FOCUS_srv
-*/
-  void	FS_free_memory (
-/*	==============
-*/		    void *extras) {
-
-    int	    i;
-			/*
-			** Release a possible pending buffer
-			*/
-    free (extras);
-			/*
-			** Release any allocated histogram buffer
-			*/
-    free (FS_base_addr);
-    FS_base_addr = NULL;
-  }
-/*
-**--------------------------------------------------------------------------
-**	    FS_kill_children:	Send signals to all our offspring to cause
-**				them to terminate.
-*/
-  void	FS_kill_children (
-/*	================
-*/		    int	     max_chld,
-		    pid_t   *pids,
-		    char   **tsk_names,
-		    char    *filler_name) {
-
-    int	    i, is;
-
-    if (pids[0] != 0) {
-      printf (" .. closing down %s ..", filler_name);
-      is = kill (pids[0], SIGINT);
-      if (!is) printf ("\nBad status killing %s.\n", filler_name);
-    }
-    for (i = 1; i <= max_chld; i++) {
-      if (pids[i] != 0) {
-        printf ("\n    Terminating %s ..", tsk_names[i]);
-        is = kill (pids[i], SIGINT);
-	if (is == ERROR) printf ("\nBad status killing %s.\n", tsk_names[i]);
-      }
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**	    FS_make_child:  Find a free child index, create a child process and
-**		    invoke procedure proc in the child procedure.
-**		    Return value >= 0 if child successfully created;
-**				 = -1 if error returned by fork;
-**				 = -2 if there are too many children already;
-**				 = -3 if time-out waiting for child to signal.
-**				 < -3 the child indicated a start-up error. The
-**					child's error code is the return
-**					value + 3.
-*/
-  int	FS_make_child (
-/*	=============
-*/		int   (* proc) (),  /* The procedure to be started */
-		int	 prty,	    /* The child's priority */
-		int	 spnd,	    /* "Suspend" flag to help debug the child */
-		int	 pkt_size,  /* TCP/IP packet size to be used */
-		int	 max_chld,  /* The size of the following arrays */
-		pid_t	*pids,	    /* Array of PIDs of children */
-		int	*exit_stat, /* Array of children's exit stati */
-		int	*pcnt_SIGUSR1,	/* Flag set on SIGUSR1 signals whenever
-					** a child exits. */
-		char	*name) {    /* Prefix for child's name */
-		
-    int	    i, status, tmo;
-    pid_t   created_pid;
-    char    tsknam[20];
-    SEM_ID  my_sem;
-/*
-**	    Find a free PID index. Zero is not a permitted value.
-*/
-    for (i = 1; i <= max_chld; i++) if (pids[i] == 0) break;
-
-    if (i > max_chld) {		/* Free index found? */
-      return -2;		/* No, there are already too many children. */
-    }else {
-      if (pcnt_SIGUSR1 != NULL) *pcnt_SIGUSR1 = 0;
-      my_sem = semBCreate (SEM_Q_FIFO, SEM_EMPTY);  /* Create a claimed sem-
-				** -aphore which the child can release when
-				** it has finished its initialisation. */
-      exit_stat[i] = 0;		/* Zero child's status indicator */
-      sprintf (tsknam, "%.*s%02d", (sizeof (tsknam) - 3),
-			name, i);	    /* Generate the child's name */
-      created_pid = taskSpawn (		    /* Make a child */
-			tsknam,		    /* Name */
-			prty,		    /* Priority */
-			VX_FP_TASK,	    /* Options - fl.pt. usage assumed */
-			20000,		    /* Stack size */
-			proc,		    /* The entry point */
-			FS_pid, (int) my_sem, i, pkt_size, spnd,
-			(int) &exit_stat[i],
-			0, 0, 0, 0);
-      if (created_pid == ERROR) {	    /* Error? */
-        return -1;			    /* Yes. */
-      }else {				    /* Parent */
-	pids[i] = created_pid;
-	tmo = 1000;		    /* Normally give child 1000 ticks to ..
-				    ** .. get going */
-	if (spnd != 0) {
-	  tmo = WAIT_FOREVER;	    /* But in debug mode, wait forever! */
-	}
-	status = semTake (my_sem, tmo);	    /* Wait for child to get going */
-	semDelete (my_sem);
-	if (status == ERROR) {		    /* Timeout? */
-	  taskDelete (pids[i]);		    /* Yes, kill child. */
-	  pids[i] = 0;
-	  return -3;			    /* Return with error. */
-	}else {				/* No timeout so child is ready. */
-	  if (exit_stat[i] >= 0) {	/* Did the child have a startup ..
-					** .. problem */
-	    return i;			/* No, so return its index */
-	  }else {
-	    return (exit_stat[i] - 3);	/* Yes, so return error */
-	  }
-	}
-      }
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**	    FS_project_hm: Project a block of histogram data.
-**
-**		Return value = # of bins in buffer, each of size uint.
-**		Notes:
-**		  This is an internal routine so all args are assumed to be OK.
-*/
-  int	FS_project_hm (
-/*	=============
-*/		int	     index,
-		int	     pkt_size,
-		uint	    *buff,	    /* Buffer to receive the data */
-		uint	    *w_buff,	    /* Workspace */
-		uint	     blen_in_bins,  /* Size of buff and w_buff in bins */
-		uint	     sub_code,	    /* 0 or PROJECT__ON_Y */
-		uint	     lo_cntr,	    /* First counter wanted */
-		uint	     hi_cntr,	    /* Last counter wanted */
-		uint	     fst_bin,	    /* First bin wanted */
-		uint	     lst_bin) {	    /* Last bin wanted */
-
-    int			    i, j, k, nx, ny, iret;
-    uint		    s_lo_cntr, s_hi_cntr, bytes_to_come;
-    uint		    f_cntr, l_cntr, n_cntr_got;
-    uint		    f_bin,  l_bin,  n_bins_got;
-    uchar		   *b_pntr;
-    struct req_buff_struct  my_rq;
-    struct rply_buff_struct my_rp;
-			/*
-			** There are 2 cases: project on x and project on y.
-			** Project on x is expected to be the more common!
-			*/
-    if (sub_code != PROJECT__ON_Y) {
-      n_cntr_got = 0;			/* Project on X */
-      memset (buff, 0, (blen_in_bins * sizeof (uint)));	/* Zero the buffer */
-      for (i = 0; i < FS_n_slaves; i++) { /* Find which slave(s) has the wanted data */
-	s_lo_cntr = FS_lo_det[i];
-	s_hi_cntr = FS_hi_det[i];
-	if (((s_lo_cntr >= lo_cntr) && (s_hi_cntr <= hi_cntr)) ||
-	    ((s_lo_cntr <  lo_cntr) && (s_hi_cntr >  hi_cntr)) ||
-	    ((s_lo_cntr <  lo_cntr) && (s_hi_cntr >= lo_cntr)) ||
-	    ((s_lo_cntr <= hi_cntr) && (s_hi_cntr >  hi_cntr))) {
-	  f_cntr = (s_lo_cntr >= lo_cntr) ? 0 : (lo_cntr - s_lo_cntr);
-	  l_cntr = (s_hi_cntr <= hi_cntr) ? (s_hi_cntr - s_lo_cntr) :
-					    (hi_cntr - s_lo_cntr);
-	  my_rq.bigend             = htonl (0x12345678);
-	  my_rq.cmnd               = htonl (SQHM_PROJECT);
-	  my_rq.u.project.sub_code = htonl (0);
-	  my_rq.u.project.x_lo     = htonl (fst_bin);
-	  my_rq.u.project.nx       = htonl (lst_bin - fst_bin + 1);
-	  my_rq.u.project.y_lo     = htonl (f_cntr);
-	  my_rq.u.project.ny       = htonl (l_cntr - f_cntr + 1);
-	  my_rq.u.project.xdim     = htonl (0);
-	  my_rq.u.project.nhist    = htonl (0);
-	  iret = rqst_send_get (FS_skt[index][i], &my_rq, sizeof (my_rq),
-				&my_rp, sizeof (my_rp),
-				&FS_bytes_put, &FS_bytes_got, FS_name[index]);
-	  if (!iret) {return 0;};
-	  if (ntohl (my_rp.status) != KER__SUCCESS) {return 0;};
-	  nx = ntohl (my_rp.u.project.n_bins);	/* # of bins to be read */
-	  bytes_to_come = nx * ntohl (my_rp.u.project.bytes_per_bin);
-	  b_pntr = (uchar *) w_buff;
-	  while (bytes_to_come > 0) {
-	    j = (bytes_to_come > pkt_size) ? pkt_size : bytes_to_come;
-	    k = recv (FS_skt[index][i], b_pntr, j, 0);
-	    if (k <= 0) {perror ("FS_project_hm"); return 0;}
-	    bytes_to_come -= k;
-	    b_pntr += k;
-	  }
-	  k = l_cntr - f_cntr + 1;
-	  n_cntr_got += k;
-	  lo_cntr += k;
-	  for (k = 0; k < nx; k++) buff[k] += ntohl (w_buff[k]);
-	}
-      }
-      return nx;
-    }else {
-      n_cntr_got = 0;			/* Project on Y */
-      for (i = 0; i < 3; i++) {	/* Find which slave(s) has the wanted data */
-	s_lo_cntr = FS_lo_det[i];
-	s_hi_cntr = FS_hi_det[i];
-	if (((s_lo_cntr >= lo_cntr) && (s_hi_cntr <= hi_cntr)) ||
-	    ((s_lo_cntr <  lo_cntr) && (s_hi_cntr >  hi_cntr)) ||
-	    ((s_lo_cntr <  lo_cntr) && (s_hi_cntr >= lo_cntr)) ||
-	    ((s_lo_cntr <= hi_cntr) && (s_hi_cntr >  hi_cntr))) {
-	  f_cntr = (s_lo_cntr >= lo_cntr) ? 0 : (lo_cntr - s_lo_cntr);
-	  l_cntr = (s_hi_cntr <= hi_cntr) ? (s_hi_cntr - s_lo_cntr) :
-					    (hi_cntr - s_lo_cntr);
-	  my_rq.bigend             = htonl (0x12345678);
-	  my_rq.cmnd               = htonl (SQHM_PROJECT);
-	  my_rq.u.project.sub_code = htonl (PROJECT__ON_Y);
-	  my_rq.u.project.x_lo     = htonl (fst_bin);
-	  my_rq.u.project.nx       = htonl (lst_bin - fst_bin + 1);
-	  my_rq.u.project.y_lo     = htonl (f_cntr);
-	  my_rq.u.project.ny       = htonl (l_cntr - f_cntr + 1);
-	  my_rq.u.project.xdim     = htonl (0);
-	  my_rq.u.project.nhist    = htonl (0);
-	  iret = rqst_send_get (FS_skt[index][i], &my_rq, sizeof (my_rq),
-				&my_rp, sizeof (my_rp),
-				&FS_bytes_put, &FS_bytes_got, FS_name[index]);
-	  if (!iret) {return 0;};
-	  if (ntohl (my_rp.status) != KER__SUCCESS) {return 0;};
-	  ny = ntohl (my_rp.u.project.n_bins);	/* # of elements to be read */
-	  bytes_to_come = ny * ntohl (my_rp.u.project.bytes_per_bin);
-	  b_pntr = (uchar *) w_buff;
-	  while (bytes_to_come > 0) {
-	    j = (bytes_to_come > pkt_size) ? pkt_size : bytes_to_come;
-	    k = recv (FS_skt[index][i], b_pntr, j, 0);
-	    if (k <= 0) {perror ("FS_project_hm"); return 0;}
-	    bytes_to_come -= k;
-	    b_pntr += k;
-	  }
-	  for (k = 0; k < ny; k++) buff[n_cntr_got+k] = ntohl (w_buff[k]);
-	  n_cntr_got += ny;
-	  lo_cntr += ny;
-	}
-      }
-      return n_cntr_got;
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**	    FS_read_hm: Read a block of histogram data.
-**
-**		Return value = # of bins read.
-*/
-  int	FS_read_hm (
-/*	==========
-*/		int	     index,
-		int	     pkt_size,
-		uchar	    *buff,	    /* Buffer to receive the data */
-		uint	     blen_in_bins,  /* Size of buff in bins */
-		uint	     fst_bin,	    /* First bin wanted */
-		uint	     lst_bin) {	    /* Last bin wanted */
-
-    int			    i, j, k, iret;
-    uint		    s_fst_bin, s_lst_bin, bins_per_hist;
-    uint		    f_bin, l_bin, bytes_to_come, n_bins_got;
-    struct req_buff_struct  my_rq;
-    struct rply_buff_struct my_rp;
-
-    bins_per_hist = FS_hi_bin - FS_lo_bin + 1;
-    n_bins_got = 0;
-
-    for (i = 0; i < 3; i++) {	/* Find which slave(s) has the wanted data */
-      s_fst_bin = 0;
-      for (j = 0; j < i; j++) {
-	s_fst_bin += (FS_hi_det[j] - FS_lo_det[j] + 1) * bins_per_hist;
-      }
-      s_lst_bin = s_fst_bin +
-	    (FS_hi_det[i] - FS_lo_det[i] + 1) * bins_per_hist - 1;
-      if (((s_fst_bin >= fst_bin) && (s_lst_bin <= lst_bin)) ||
-	  ((s_fst_bin <  fst_bin) && (s_lst_bin >  lst_bin)) ||
-	  ((s_fst_bin <  fst_bin) && (s_lst_bin >= fst_bin)) ||
-	  ((s_fst_bin <= lst_bin) && (s_lst_bin >  lst_bin))) {
-	f_bin = (s_fst_bin >= fst_bin) ? 0 : (fst_bin - s_fst_bin);
-	l_bin = (s_lst_bin <= lst_bin) ? (s_lst_bin - s_fst_bin) :
-					    (lst_bin - s_fst_bin);
-	my_rq.bigend           = htonl (0x12345678);
-	my_rq.cmnd             = htonl (SQHM_READ);
-	my_rq.u.read.hist_no   = htonl (-1);
-	my_rq.u.read.first_bin = htonl (f_bin);
-	my_rq.u.read.n_bins    = htonl (l_bin - f_bin + 1);
-	iret = rqst_send_get (FS_skt[index][i], &my_rq, sizeof (my_rq),
-				&my_rp, sizeof (my_rp),
-				&FS_bytes_put, &FS_bytes_got, FS_name[index]);
-	if (!iret) {return 0;};
-	if (ntohl (my_rp.status) != KER__SUCCESS) {return 0;};
-	k = ntohl (my_rp.u.read.n_bins);	/* # of bins to be read */
-	bytes_to_come = k * FS_bpb;
-	while (bytes_to_come > 0) {
-	  j = (bytes_to_come > pkt_size) ? pkt_size : bytes_to_come;
-	  k = recv (FS_skt[index][i], buff, j, 0);
-	  if (k <= 0) {perror ("FS_read_hm"); return 0;}
-	  bytes_to_come -= k;
-	  buff += k;
-	}
-	k = l_bin - f_bin + 1;
-	n_bins_got += k;
-	fst_bin += k;
-      }
-    }
-    return n_bins_got;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int	FS_rply_status_send (
-/*	===================
-*/		int			skt,
-		struct rply_buff_struct	*rply_bf,
-		uint			*cntr_out) {
-
-    int	    is;
-
-    is = send (skt, (char *) rply_bf, sizeof (*rply_bf), 0);
-    if (is == sizeof (*rply_bf)) {
-      *cntr_out += is;
-      return True;
-    }else {
-      return False;
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int	FS_rply_status_setup_and_send (
-/*	=============================
-*/		int			skt,
-		struct rply_buff_struct	*rply_bf,
-		int			status,
-		int			sub_status,
-		char			*msg,
-		uint			*cntr_out) {
-
-    int	    is;
-
-    rply_status_setup (rply_bf, status, sub_status, msg);
-    is = FS_rply_status_send (skt, rply_bf, cntr_out);
-
-    return is;
-  }
-/*
-**--------------------------------------------------------------------------
-**	    FS_send_cmnd_to_mstr:	Send command to Sinqm-Master process
-**					in a slave.
-*/
-  int	FS_send_cmnd_to_mstr (
-/*	====================
-*/		    struct sockaddr_in	    *rmt_sockname,
-		    struct req_buff_struct  *request,
-		    int			     requ_len,
-		    struct rply_buff_struct *reply,
-		    uint		    *in_cntr,
-		    uint		    *out_cntr) {
-
-    int			 status, cnct_skt, rmt_sockname_len, i;
-    int			 bytes_to_come, nbytes;
-    char		*p_nxt_byte;
-    struct sockaddr_in	 lcl_sockname;
-/*
-**  	   Create a TCP/IP socket for connecting to SINQHM_SRV root and bind it.
-*/
-    cnct_skt = socket (AF_INET, SOCK_STREAM, 0);
-    i = 1;
-    setsockopt(cnct_skt,SOL_SOCKET, SO_REUSEADDR, &i,sizeof(int));
-    if (cnct_skt == -1) {
-      close(cnct_skt);
-      failInet ("\nFS_send_cmnd_to_mstr: socket error.");
-    }
-
-    setup_host (NULL, &lcl_sockname, 0, False);
-    status = bind (cnct_skt, (struct sockaddr *) &lcl_sockname,
-					sizeof (lcl_sockname));
-    if (status == -1){
-      close(cnct_skt);
-      failInet ("\nFS_send_cmnd_to_mstr: bind error.");
-    }
-/*
-**		Connect to SINQHM_SRV root.
-*/
-    rmt_sockname_len = sizeof (*rmt_sockname);
-    status = connect (cnct_skt, (struct sockaddr *) rmt_sockname,
-				    rmt_sockname_len);
-    if (status == -1) {
-      close(cnct_skt);
-      getErrno (&FS_errno);
-      failInet ("\nFS_send_cmnd_to_mstr: connect error");
-    }
-	    /*
-	    ** Send the request to the server
-	    */
-    status = send (cnct_skt, (char *) request, requ_len, 0);
-    if (status == -1) {
-      close(cnct_skt);
-      failInet ("\nFS_send_cmnd_to_mstr -- send error");
-    }
-    if (status != requ_len) {
-      printf ("\nFS_send_cmnd_to_mstr -- wrong number of bytes sent: %d %d\n",
-			status, requ_len);
-      close(cnct_skt);
-      return False;
-    }
-    *out_cntr += requ_len;
-/*
-**		    Wait for the status response.
-*/
-    bytes_to_come = sizeof (*reply);
-    p_nxt_byte = (char *) reply;
-    while (bytes_to_come > 0) {
-      nbytes = recv (cnct_skt, p_nxt_byte, bytes_to_come, 0);
-      if (nbytes <= 0) break;
-      *in_cntr += nbytes;
-      bytes_to_come -= nbytes;
-      p_nxt_byte += nbytes;
-    }
-    if (nbytes == -1) {
-      close(cnct_skt);
-      failInet ("\nFS_send_cmnd_to_mstr -- recv error");
-      return False;
-    }else if (nbytes == 0) {
-      printf ("\nFS_send_cmnd_to_mstr -- server has closed connection!\n");
-      close(cnct_skt);
-      return False;
-    }else if (ntohl (reply->bigend) != 0x12345678) {
-					    /* Network byte-order wrong! */
-      printf ("\nFS_send_cmnd_to_mstr -- big-endian/little-endian problem!\n"
-		"    Buffer received in non-network byte order!\n");
-      close(cnct_skt);
-      return False;
-    }
-    close(cnct_skt);
-    return True;
-  }
-/*
-**--------------------------------------------------------------------------
-**	    rqst_send_get:  Send a network request and get reply
-*/
-  int	rqst_send_get (
-/*	=============
-*/		int			 skt,
-		struct req_buff_struct	*rqst_bf,
-		int			 rq_len,
-		struct rply_buff_struct	*rply_bf,
-		int			 rp_size,
-		int			*out_cntr,
-		int			*in_cntr,
-		char			*tsk_name) {
-
-    int	     status, bytes_to_come, nbytes, n_bytes_got;
-    char     recd[80], *p_addr;
-		/*
-		** Send the request to the server
-		*/
-    status = send (skt, (char *) rqst_bf, rq_len, 0);
-    if (status == -1) {
-      perror (StrJoin (recd, sizeof (recd),
-		tsk_name, "/rqst_send_get: send error"));
-      return False;
-    }
-    if (status != rq_len) {
-      printf ("\n%s/rqst_send_get: wrong number of bytes sent: %d %d\n",
-			tsk_name, status, rq_len);
-      return False;
-    }
-    *out_cntr += rq_len;
-/*
-**		    Wait for the response.
-*/
-    bytes_to_come = rp_size;
-    p_addr = (char *) rply_bf;
-    while (bytes_to_come > 0) {
-      n_bytes_got = recv (skt, p_addr, bytes_to_come, 0);
-      if (n_bytes_got <= 0) break;
-      *in_cntr += n_bytes_got;
-      bytes_to_come -= n_bytes_got;
-      p_addr += n_bytes_got;
-    }
-    if (n_bytes_got < 0) {
-      perror (StrJoin (recd, sizeof (recd),
-		tsk_name, "/rqst_send_get: recv error"));
-      return False;
-    }else if (n_bytes_got == 0) {
-      printf ("\n%s/rqst_send_get: zero bytes received!\n", tsk_name);
-      return False;
-    }else if (ntohl (rply_bf->bigend) != 0x12345678) {
-      printf ("\n%s/rqst_send_get: big-endian/little-endian problem!\n",
-			    tsk_name);
-      return False;
-    }
-    return True;
-  }
-/*
-**--------------------------------------------------------------------------
-**	    setup_host:	Setup Internet structures for a named host
-*/
-  int	setup_host (
-/*	==========
-*/		    char		*host,
-		    struct sockaddr_in	*sockname,
-		    int			 port,
-		    int			 verbose) {
-
-    int		     i, j, k, l, m;
-    char	     my_host[64], my_addr[32];
-    struct in_addr   my_inet_addr;
-
-    if (host == NULL) {
-      my_inet_addr.s_addr = 0;
-    }else {
-      if (strlen (host) >= sizeof (my_host)) return False;
-      for (i = 0; i <= strlen (host); i++) my_host[i] = tolower (host[i]);
-		/*
-		** Try to convert the Internet address. First assume it is dot
-		** notation. If this fails, see if we can recognise the name.
-		*/
-      my_inet_addr.s_addr = inet_addr (my_host);
-      if (my_inet_addr.s_addr == ERROR) {
-	if (strcmp (my_host, "localhost") == 0) {
-	  my_inet_addr.s_addr = inet_addr ("127.0.0.1");
-	}else {
-	  i = sscanf (my_host, "lnse%d%n", &j, &k);
-	  if ((i == 1) && (k == 6)) {
-	    if (strcmp (&my_host[k], ".vme") == 0) {
-	      sprintf (my_addr, "192.168.11.%d", j);	    /* "lnse??.vme" */
-	    }else {
-	      sprintf (my_addr, "129.129.62.%d", (100+j));    /* "lnse??" */
-	    }
-	    my_inet_addr.s_addr = inet_addr (my_addr);
-	  }else {
-	    i = sscanf (my_host, "psds%d%n", &j, &k);
-	    if ((i == 1) && (k == 6) && (my_host[k] == NIL)) {
-	      sprintf (my_addr, "129.129.62.%d", j);    /* "psds??" */
-	      my_inet_addr.s_addr = inet_addr (my_addr);
-	    }
-	  }
-	}
-      }
-    }
-    if (my_inet_addr.s_addr == ERROR) {
-      printf ("\nsetup_host: Node \"%s\" is unknown.\n", host);
-      return False;
-    }
-    if (verbose) {
-      printf ("Host is %s ", host);
-      inet_ntoa_b (my_inet_addr, my_addr);
-      printf ("(%s),", my_addr);
-      printf (" Port %d.\n", port);
-    }
-    sockname->sin_family      = AF_INET;
-    sockname->sin_port	      = htons (port);
-    sockname->sin_addr.s_addr = my_inet_addr.s_addr;
-  }
-/*
-**--------------------------------------------------------------------------
-**	    socket_bind:    Setup an Internet socket and bind it to a port.
-*/
-  int	socket_bind (
-/*	===========
-*/		    int	     port,
-		    char    *tsk_name) {
-
-    int			status, skt;
-    struct sockaddr_in	sockname;
-    char		recd[80];
-
-    skt = socket (AF_INET, SOCK_STREAM, 0);
-    if (skt == -1) {
-      perror (StrJoin (recd, sizeof (recd), tsk_name,
-			" -- socket error in socket_bind"));
-      return skt;
-    }
-    status = 1;
-    setsockopt(skt,SOL_SOCKET, SO_REUSEADDR, &status, sizeof(int));
-
-    setup_host (NULL, &sockname, port, False);
-    status = bind (skt, (struct sockaddr *) &sockname, sizeof (sockname));
-    if (status != 0) {
-      close (skt);
-      perror (StrJoin (recd, sizeof (recd), tsk_name,
-			" -- bind error in socket_bind"));
-      return -1;
-    }
-    return skt;
-  }
-/*
-**==============================================================================
-**  Main line program
-**  ------------------
-**============================================================================*/
-  int	FOCUS_main (
-/*	==========
-*/	    char *hostM, int ndetM,
-	    char *hostO, int ndetO,
-	    char *hostU, int ndetU,
-	    int c_port,				/* Our port # as client */
-	    int s_port,				/* Our port # for serving */
-	    int arg9, int suspend) {
-/*============================================================================*/
-    struct req_buff_struct	    req_buff;
-    struct rply_buff_struct	    rply_buff;
-
-    int			i, j, is, status, cntr;
-    int			keep_going = True;
-    int			bytes_to_come, n_bytes_got;
-    char		*p_addr;
-    int			cl_port;
-    struct sockaddr_in	lcl_sockname;
-    struct sockaddr_in	rmt_sockname;
-    int			rmt_sockname_len;
-    int			pkt_size;
-    time_t		timer;
-    char		buff[132];
-
-    sigset_t		proc_sigmask;
-    struct sigaction	sig_action;
-
-/*============================================================================
-*/
-    printf ("\n");
-    printf ("hostM = \"%s\" %d cntrs\n", hostM, ndetM);
-    printf ("hostO = \"%s\" %d cntrs\n", hostO, ndetO);
-    printf ("hostU = \"%s\" %d cntrs\n", hostU, ndetU);
-    printf ("Client port = %d\n", c_port);
-    printf ("Server port = %d\n", s_port);
-
-    if (suspend != 0) {
-      printf ("\nFOCUS_srv: Suspending ...\n");
-      taskSuspend (0);	    /* We've been told to suspend ourself, ..
-			    **  .. presumably for debug reasons.
-			    */
-      printf ("\nFOCUS_srv: Suspension ended!\n");
-    }
-/*============================================================================
-**	Perform the initialisation of global variables ...
-*/
-    StrJoin (FS_inst, sizeof (FS_inst), INST, "");     /* Save the instr.
-							     ** name in a global
-							     */
-    StrJoin (FS_def_ident, sizeof (FS_def_ident), SINQHM_DEF_ID, "");
-    StrJoin (FS_main_ident, sizeof (FS_main_ident), IDENT, "");
-    StrJoin (FS_main_date,  sizeof (FS_main_date),  __DATE__, ", ");
-    StrJoin (FS_main_date,  sizeof (FS_main_date),  FS_main_date, __TIME__);
-    time (&FS_start_time);	/* Initialise the start time */
-    FS_serv_ident[0] = NIL;
-    FS_serv_date[0]  = NIL;
-    FS_rout_ident[0] = NIL;
-    FS_rout_date[0]  = NIL;
-
-    FS_cfgn_done = False; /* Force a configuration before we can do anything. */
-
-    FS_bytes_got = 0; FS_bytes_put = 0;
-    FS_dbg_mask = FS_dbg_lev0 = FS_dbg_lev1 = FS_dbg_lev2 = FS_dbg_lev3 = 0;
-
-    FS_free_memory (NULL);  /* Release memory (possibly) in case ..
-			    ** .. of a restart of the program */
-    if (FS_cnct_skt != 0) close (FS_cnct_skt);
-    if (FS_rw_skt   != 0) close (FS_rw_skt);
-    FS_cnct_skt = FS_rw_skt = 0;
-    
-    for (i = 0; i <= MAX_CLIENTS; i++) {
-      FS_pids[i] = 0;
-      FS_chld_exit_status[i] = 0;
-      if (FS_chld_cnct_skt[i] != 0) close (FS_chld_cnct_skt[i]);
-      if (FS_chld_rw_skt[i]   != 0) close (FS_chld_rw_skt[i]);
-      FS_chld_cnct_skt[i] = FS_chld_rw_skt[i]   = 0;
-      FS_p_names[i] = &FS_name[i][0]; FS_name[i][0] = NIL;
-      for (j = 0; j < MAX_SLV; j++) {
-	if (FS_skt[i][j] != 0) {close (FS_skt[i][j]); FS_skt[i][j] = 0;}
-      }
-      FS_srv_masks[i] = (i == 0) ? 0x8000 : 1 << (i - 1);
-    }
-
-    if (FS_sem_daq == NULL) {
-      FS_sem_daq = semBCreate (SEM_Q_FIFO, SEM_FULL);  /* Create a released sem-
-					    ** aphore for guarding access to
-					    ** FS_dsbl_mask */
-    }
-    FS_dsbl_mask = 0;		/* Start up with DAQ enabled */
-
-    FS_pid = get_pid ();			/* Store our pid */
-    StrJoin (FS_name[0], sizeof (FS_name[0]),	/* And our task name */
-		taskName (FS_pid), "");
-/*
-**	Debug hint - set FS_use_sem_tmo to False (== 0) to disable sem time-outs
-**		     during debug sessions. This will stop things falling off.
-*/
-    FS_sem_tmo = 5 * sysClkRateGet ();	/* 5 second time-out by default */
-    FS_use_sem_tmo = True;
-/*
-**	    Do all the necessary network orientated setup for our slaves to
-**	    make it easier to broadcast commands to them.
-*/
-/*
-**	    Get Internet address of the front-end.
-*/
-    FS_n_slaves = 3;
-    if ((c_port < 128) || (c_port > 32767)) c_port = 2500;
-
-    status = setup_host (hostM, &FS_rmt_socknam[0], c_port, True);
-    if (status) FS_slaves[0] = hostM; else FS_slaves[0] = NULL;
-    status = setup_host (hostO, &FS_rmt_socknam[1], c_port, True);
-    if (status) FS_slaves[1] = hostO; else FS_slaves[1] = NULL;
-    status = setup_host (hostU, &FS_rmt_socknam[2], c_port, True);
-    if (status) FS_slaves[2] = hostU; else FS_slaves[2] = NULL;
-
-    FS_lo_det[0] = 0;
-    FS_hi_det[0] = FS_lo_det[0] + ndetM - 1;
-    FS_lo_det[1] = FS_hi_det[0] + 1;
-    FS_hi_det[1] = FS_lo_det[1] + ndetO - 1;
-    FS_lo_det[2] = FS_hi_det[1] + 1;
-    FS_hi_det[2] = FS_lo_det[2] + ndetU - 1;
-    if (ndetM == 0) FS_slaves[0] = NULL;
-    if (ndetO == 0) FS_slaves[1] = NULL;
-    if (ndetU == 0) FS_slaves[2] = NULL;
-
-    for (i = 0; i <= FS_n_slaves; i++) {
-      FS_slv_active[i] = False;
-    }
-/*============================================================================
-**	Clear the process signal mask to let in all signals (actually, on
-**	PPC VxWorks this seems to cause all signals to get ignored!) and then
-**	declare action routine for SIGUSR1. Our children signal with SIGUSR1
-**	just before they exit in a more or less controlled manner. If the
-**	child gets deleted from the shell, it will not signal.
-*/
-    FS_cnt_SIGUSR1 = 0;
-
-    status = sigemptyset (&proc_sigmask);
-    status = sigprocmask (SIG_SETMASK, &proc_sigmask, NULL);
-    status = sigemptyset (&sig_action.sa_mask);
-    sig_action.sa_handler = FS_catch_signal;
-    sig_action.sa_flags   = 0;
-
-    if (sigaction (SIGUSR1, &sig_action, NULL) == -1) {
-      getErrno (&FS_errno);
-      perror ("sigaction error:");
-      exit (0);
-    }
-/*============================================================================
-**		Get a port number to use. If the argument "port" is not
-**		a valid port number (not in range 128 to 32767), use PORT_BASE.
-*/
-    FS_port = PORT_BASE;
-    if ((s_port >= 128) && (s_port < 32768)) FS_port = s_port;
-/*============================================================================
-**	Create a TCP/IP socket for receiving connection requests, bind it and
-**	set it to listen.
-*/
-    FS_cnct_skt = socket (AF_INET, SOCK_STREAM, 0);
-    if (FS_cnct_skt == -1) {
-      sprintf (buff, "\n%s -- Cnct-Socket socket error", FS_name[0]);
-      failInet (buff);
-    }
-    status = 1;
-    setsockopt(FS_cnct_skt, SOL_SOCKET, SO_REUSEADDR, &status, sizeof(int));
-    setup_host (NULL, &lcl_sockname, FS_port, False);
-    status = bind (FS_cnct_skt, (struct sockaddr *) &lcl_sockname,
-					  sizeof (lcl_sockname));
-    if (status != 0) {
-      sprintf (buff, "\n%s -- Cnct-Socket bind error", FS_name[0]);
-      failInet (buff);
-    }
-    status = listen (FS_cnct_skt, 5);
-    if (status != 0) {
-      sprintf (buff, "\n%s -- Cnct-Socket listen error", FS_name[0]);
-      failInet (buff);
-    }
-/*
-**	    Clients must now connect to the Connect-port and send either a
-**	    connect, configure, deconfigure, status or exit request. A
-**	    successful configure request must precede any connection request.
-**
-**	    When a configure request arrives, the histogram data structures are
-**	    initialised, the histogram filler process (FILLER) is spawned and
-**	    connection requests are enabled. A status reply is sent to the
-**	    client and the connection closed.
-**
-**	    When a connection request arrives, a child will be spawned to
-**	    handle the connection. The child will be told which port to use
-**	    and he will release a semaphore when the port is ready. The parent
-**	    then sends the client a reply to tell him which port to use. The
-**	    connection is then closed to await further connections.
-*/
-    setup_inet_info (FS_host, sizeof (FS_host),	    /* Find out who we are  */
-		     FS_addr, sizeof (FS_addr));
-    printf ("\n%s: Program  Ident = \"%s\". Started on %s (%s).\n",
-		    FS_name[0], IDENT, FS_host, FS_addr);
-    printf ("%s: Protocol Ident = \"%s\"\n", FS_name[0], FS_def_ident);
-
-#ifndef INST
-    #error  Define the target instrument via the symbol "INST"!
-#endif
-
-    if (strcmp (INST, "FOCUS") == 0) {
-      printf ("%s: Instrument = \"%s\"\n", FS_name[0], "FOCUS");
-    }else {
-      printf ("%s: Instrument is not defined\n", FS_name[0]);
-    }
-/*============================================================================*/
-    while (keep_going) {
-      rmt_sockname_len = sizeof (rmt_sockname);
-      FS_rw_skt = accept (FS_cnct_skt, (struct sockaddr *) &rmt_sockname,
-						&rmt_sockname_len);
-      if (FS_rw_skt == -1) {
-        getErrno (&FS_errno);
-	sprintf (buff, "\n%s -- Cnct-Socket accept error", FS_name[0]);
-	failInet (buff);	/* No return */
-      }
-
-      p_addr = inet_ntoa (rmt_sockname.sin_addr);
-      cl_port = ntohs (rmt_sockname.sin_port);
-      printf ("\n%s: Connected to Node %s, Port %d.\n",
-				FS_name[0], p_addr, cl_port);
-
-      bytes_to_come = sizeof (req_buff);   /* Read a command */
-      p_addr = (char *) &req_buff;
-      while (bytes_to_come > 0) {
-	n_bytes_got = recv (FS_rw_skt, p_addr, bytes_to_come, 0);
-	if (n_bytes_got <= 0) break;
-	FS_bytes_got += n_bytes_got;
-	bytes_to_come -= n_bytes_got;
-	p_addr += n_bytes_got;
-      }
-
-      if (FS_cnt_SIGUSR1 > 0) {	    /* Have any children exited? */
-	if (FS_dbg_lev0) printf ("\n%s: Cleaning up children ...", FS_name[0]);
-	FS_cleanup_children (MAX_CLIENTS,   /* Yes, update our database. */
-		FS_pids, &FS_cnt_SIGUSR1, FS_dbg_lev0, FS_p_names, "");
-	if (FS_dbg_lev0) printf ("\n  ... cleanup of children done.\n");
-      }
-
-      if (n_bytes_got < 0) {
-	printf ("\n%s -- R/W-Socket recv error\n", FS_name[0]);
-	printf ("%s -- Connection to %s will be closed.\n", FS_name[0],
-			    inet_ntoa (rmt_sockname.sin_addr));
-      }else if (n_bytes_got == 0) {
-	printf ("\n%s -- no command received!\n", FS_name[0]);
-	printf ("%s -- Connection to %s will be closed.\n", FS_name[0],
-			    inet_ntoa (rmt_sockname.sin_addr));
-      }else if (bytes_to_come != 0) {
-	printf ("\n%s -- command packet has wrong number of bytes:"
-		" %d instead of %d\n", FS_name[0],
-		n_bytes_got, sizeof (req_buff));
-	printf ("%s -- Connection to %s will be closed.\n", FS_name[0],
-			    inet_ntoa (rmt_sockname.sin_addr));
-      }else if (ntohl (req_buff.bigend) != 0x12345678) {
-	printf ("\n%s -- big-endian/little-endian problem!\n"
-		"   Buffer received in non-network byte order!\n", FS_name[0]);
-      }else {
-	FS_do_command (0, FS_rw_skt, 4096, &req_buff, &rply_buff);
-      }
-      close (FS_rw_skt); FS_rw_skt = 0;
-      if (ntohl (req_buff.cmnd) == SQHM_EXIT) keep_going = False;
-    }
-/*============================================================================*/
-    close (FS_cnct_skt); FS_cnct_skt = 0;
-    exit (KER__SUCCESS);
-  }
-/*========================================= End of FOCUS_srv_main.c ========*/
diff --git a/sinqhm/Makefile b/sinqhm/Makefile
deleted file mode 100644
index 7f57231d..00000000
--- a/sinqhm/Makefile
+++ /dev/null
@@ -1,103 +0,0 @@
-#---------------------------------------------------------------------------
-# Makefile for the SINQ hist mem client Programs in the sinqhm directory.
-# These are:
-#            sinqhm_ctrl
-#            sinqhm_client
-#            sinqhm_bootutil_client
-#            lwl_client
-#
-# David Maden, Oct-2000
-#--------------------------------------------------------------------------
-#
-#------------ for DigitalUnix (add -DFORTIFY to CFLAGS for fortified version)
-FF     = f90
-CC     = cc
-CFLAGS = -std -g -I. -I../hardsup -I$(PGPLOT_DIR) -I/data/koenneck/include
-BIN    = ../bin
-LFLAGS = -L../hardsup -L$PGPLOT_DIR -L/data/lnslib/lib -lX11
-#------------ for Linux
-## FF     = g77
-## CC     = gcc
-## CFLAGS = -g -I. -I../hardsup -I$(PGPLOT_DIR) -DLINUX
-## BIN    = $(HOME)/bin
-## LFLAGS = -L../hardsup -L$PGPLOT_DIR -L/usr/X11R6/lib
-#------------
-
-#----------------------------------------------------------
-
-all:    $(BIN)/sinqhm_ctrl \
-        $(BIN)/sinqhm_client \
-        $(BIN)/sinqhm_bootutil_client \
-        $(BIN)/lwl_client
-	@ echo
-	@ echo " This directory contains SINQ histogram memory software."
-	@ echo " The make file will make the histogram memory client programs:"
-	@ echo
-	@ echo "     sinqhm_ctrl"
-	@ echo "     sinqhm_client"
-	@ echo "     sinqhm_bootutil_client"
-	@ echo "     lwl_client"
-	@ echo
-	@ echo " To make them, simply specify:"
-	@ echo
-	@ echo "    make"
-	@ echo
-
-#----------------------------------------------------------
-
-$(BIN)/sinqhm_ctrl: SinqHM_def.h sinqhm_ctrl.c
-	@ rm -f $(BIN)/sinqhm_ctrl.old
-	@ if test -f $(BIN)/sinqhm_ctrl; then \
-           mv -f $(BIN)/sinqhm_ctrl \
-                 $(BIN)/sinqhm_ctrl.old; \
-        fi
-	$(CC) $(CFLAGS) -o $(BIN)/sinqhm_ctrl \
-                   sinqhm_ctrl.c $(LFLAGS) -lhlib -lX11
-
-$(BIN)/sinqhm_client: SinqHM_def.h sinqhm_client.c
-	@ rm -f $(BIN)/sinqhm_client.old
-	@ if test -f $(BIN)/sinqhm_client; then \
-           mv -f $(BIN)/sinqhm_client \
-                 $(BIN)/sinqhm_client.old; \
-        fi
-	$(FF) $(CFLAGS) -nofor_main -o $(BIN)/sinqhm_client \
-                   sinqhm_client.c $(LFLAGS) -lhlib -lcpgplot -lpgplot -lX11
-
-$(BIN)/sinqhm_bootutil_client:  SinqHM_def.h \
-                   sinqhm_bootutil_client.c
-	@ rm -f $(BIN)/sinqhm_bootutil_client.old
-	@ if test -f $(BIN)/sinqhm_bootutil_client; then \
-           mv -f $(BIN)/sinqhm_bootutil_client \
-                 $(BIN)/sinqhm_bootutil_client.old; \
-        fi
-	$(CC) $(CFLAGS) -o $(BIN)/sinqhm_bootutil_client \
-                   sinqhm_bootutil_client.c $(LFLAGS) -lhlib -lX11
-
-$(BIN)/lwl_client: SinqHM_def.h lwl_client.c
-	@ rm -f $(BIN)/lwl_client.old
-	@ if test -f $(BIN)/lwl_client; then \
-           mv -f $(BIN)/lwl_client \
-                 $(BIN)/lwl_client.old; \
-        fi
-	$(CC) $(CFLAGS) -o $(BIN)/lwl_client \
-                   lwl_client.c $(LFLAGS) -lhlib -lX11
-
-#----------------------------------------------------------
-
-clean:
-	- rm -f *.o
-	- rm -f $(BIN)/sinqhm_ctrl \
-                $(BIN)/sinqhm_client \
-                $(BIN)/sinqhm_bootutil_client \
-                $(BIN)/lwl_client
-	- rm -f $(BIN)/sinqhm_ctrl.old \
-                $(BIN)/sinqhm_client.old \
-                $(BIN)/sinqhm_bootutil_client.old \
-                $(BIN)/lwl_client.old
-
-#----------------------------------------------------------
-.c.o:
-	$(CC) $(CFLAGS) -c $*.c
-#----------------------------------------------------------
-
-
diff --git a/sinqhm/SinqHM_bootParamsConfig.c b/sinqhm/SinqHM_bootParamsConfig.c
deleted file mode 100755
index 77eb1d38..00000000
--- a/sinqhm/SinqHM_bootParamsConfig.c
+++ /dev/null
@@ -1,1263 +0,0 @@
-#define	    IDENT	"1B10"
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     SINQ Division				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...SINQHM]SinqHM_bootParamsConfig.c
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Jun 1997
-**
-** Updates:
-**  1A01 10-Jun-1997 DM	    Initial version.
-**---------------------------------------------------------------------------
-**  SinqHM_bootParamsConfig.c is a simple VxWorks utility program for
-**  obtaining the "other" field of the VxWorks boot line and using it
-**  to automatically start the SINQ Histogram Memory processes.
-*/
-    /*
-    **  The "other" string may be specified as follows:
-    **
-    **         <action>=<arg0>,..,<argn>/...
-    **
-    **  There may be no white space characters in the string. Tokens
-    **  in the string may be specified in upper or lower case.
-    **
-    **  <action> may be "sp"   for "Spawn a task"
-    **                  "sps"  for "Spawn and suspend a task"
-    **                  "cfg"  for "Configure SinqHM_srv"
-    **                  "wt"   for "Wait"
-    **----------------------------------------------------
-    **  If <action> = "sp" or "sps", then
-    **
-    **     <arg0> = name of task to spawn. This may be:
-    **                "SinqHM"   for SinqHM_srv or
-    **                "lwl"      for lwl_server or
-    **                "bootUtil" for SinqHM_bootUtil or
-    **                "focus"    for FOCUS_srv
-    **     <arg1>,..<arg9> = integer args for the spawn, as follows:
-    **
-    **    If <arg0> = "SinqHM"
-    **     <arg1> = TCP/IP port number for server (dflt=2400).
-    **     <arg2> = <use-level-gen> flag. If non-zero, then use level
-    **                  generator to generate timing signals (dflt=0).
-    **     <arg3> = base address of VMIO10 level generator
-    **                     module (dflt=0x1900).
-    **
-    **    If <arg0> = "lwl"
-    **     <arg1> = TCP/IP port number for lwl_server (dflt=3501).
-    **     <arg2> = base address of Histogram Test-generator
-    **                     module (dflt=0x1800).
-    **     <arg3> = verbosity. If non-zero, be verbose (dflt=0).
-    **
-    **    If <arg0> = "bootUtil"
-    **     <arg1> = TCP/IP port number for SinqHM_bootUtil (dflt=2300).
-    **
-    **    If <arg0> = "focus"
-    **     <arg1> = name of hostM (Mittel-bank) (dflt=localhost).
-    **     <arg2> = #-counters in Mittel-bank (dflt=150).
-    **     <arg3> = name of hostO (Ober-bank) (dflt=lnse05.vme).
-    **     <arg4> = #-counters in Ober-bank (dflt=117).
-    **     <arg5> = name of hostU (Unter-bank) (dflt=lnse06.vme).
-    **     <arg6> = #-counters in Unter-bank (dflt=116).
-    **     <arg7> = Client-side TCP/IP port number (dflt=2500).
-    **     <arg8> = Server-side TCP/IP port number (dflt=2400).
-    **
-    **    In addition, <arg10> will be set to 0 for "sp" and 1 for
-    **    "sps". SinqHM_srv, lwl_server and SinqHM_bootUtil will suspend
-    **    themselves immediately if they find <arg10> is non-zero. This
-    **    cooperation on the part of the spawned task is intended as a
-    **    debugging aid.
-    **
-    **    "SinqHM" and "SinqHM_bootUtil" will be spawned with priority
-    **    100, "lwl" with priority 250.
-    **
-    **  Notes:
-    **    a) Lower numbers imply higher priority.
-    **    b) "SinqHM_Filler" also gets spawned with priority 250. It is
-    **          important that "lwl" and "SinqHM_Filler" have the same
-    **          priority.
-    **----------------------------------------------------
-    **  If <action> = "cfg":
-    **     <arg0> = HM_DIG, HM_PSD, TOF, HRPT or TRANS to specify the
-    **                      hist memory mode.
-    **     <arg8> = sub-mode bits to "or" with <arg0> (dflt=0)
-    **     <arg9> = TCP/IP port # of server (dflt=2400)
-    **    And for <arg0> = HM_DIG or HRPT,
-    **     <arg1> = # bins (no dflt)
-    **     <arg2> = # histograms (dflt=1)
-    **     <arg3> = bytes per bin (dflt=4)
-    **     <arg4> = bin compression (dflt=0)
-    **     <arg5> = first bin (dflt=0)
-    **
-    **    And for <arg0> = TOF,
-    **     <arg1> = # counters (no dflt)
-    **     <arg2> = # bins per counter (no dflt)
-    **     <arg3> = time_span_per_bin (no dflt)
-    **     <arg4> = Start delay (dflt=0)
-    **     <arg5> = # of first counter (dflt=0)
-    **     <arg6> = bytes per bin (dflt=4)
-    **
-    **     Note: The built-in "cfg" program can only define bins of equal
-    **          width. For non-equal width bins, one must send the
-    **          SQHM_CONFIG message to SinqHM_srv from a host computer.
-    **
-    **    And for <arg0> = TRANS,
-    **     <arg1> = #-buffers (dflt = 8)
-    **     <arg2> = buff-size (dflt = 4096)
-    **
-    **    And for <arg0> = HM_PSD, the arguments still need defining.
-    **----------------------------------------------------
-    **  If <action> = "wt", then
-    **
-    **     <arg0> = number of seconds to wait (may be useful for
-    **                FOCUS startup).
-    **----------------------------------------------------
-    **  For example:
-    **
-    **     other = "sp=bootUtil/sp=SinqHM/cfg=HM_DIG,400"
-    **
-    **  will cause bootUtil and SinqHM_srv to be automatically started
-    **  after the system has been booted and will configure it in HM_DIG
-    **  mode with a single histogram of 400 bins (as used for DMC).
-    **----------------------------------------------------
-    */
-/*
-**  Communication with SinqHM_srv is via TCP/IP protocol.
-**
-**  To compile and link this program for VxWorks on PSS123, use:
-**
-	    set src = "lnsa09:ud0:[maden.pss123.wind.sinqhm]"
-	    rcp "${src}SinqHM_bootParamsConfig.c" SinqHM_bootParamsConfig.c
-	    ccvx -I${WIND_BASE}/target/config/all SinqHM_bootParamsConfig.c
-** where
-	    ccvx = ccppc -O0			\
-		    -mcpu=603			\
-		    -I${WIND_BASE}/target/h	\
-		    -fno-builtin		\
-		    -fno-for-scope		\
-		    -nostdinc			\
-		    -DCPU=PPC603		\
-		    -D_GNU_TOOL			\
-		    -gdwarf -c -Wimplicit
-
-**  and, on the target,
-**
-**   -> ld < /home/pss123/aco/maden/wind/SinqHM/SinqHM_bootParamsConfig.o
-**   -> taskSpawn "hmConfig", 100, 8, 20000, SinqHM_bootParamsConfig, <port>
-**									^
-**									|
-**		    TCP/IP port number of SinqHM_srv, e.g. 2400 --------+
-**
-**====================================================================
-*/
-#include    "vxWorks.h"			/* always first */
-#include    "taskLib.h"
-#include    "sockLib.h"
-#include    "bootLib.h"
-#include    "ioLib.h"
-
-#ifdef MV2600
-#include "../config/mv2604/config.h"
-#elif MEN_A012
-#include "../config/men_824x_ali/config.h"
-#else
-#if (CPU == PPC603)
-#include    "../config/mv1603/config.h"
-#elif (CPU == PPC604)
-#include    "../config/mv1604/config.h"
-#endif
-#endif
-
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <string.h>
-#include    <ctype.h>
-#include    <unistd.h>
-#include    <errno.h>
-#include    <netinet/in.h>
-#include    <arpa/inet.h>
-#include    <sys/types.h>
-#include    <sys/socket.h>
-/*
-**====================	Global Definitions =====================================
-*/
-#include    "SinqHM_def.h"
-
-
-#define	    MAX_ACTIONS	    8
-#define	    MAX_ARGS	   10
-#define	    NIL		   '\0'
-/*
-**====================	Global Variables =====================================
-*/
-  extern uint	Port_base;	/* The base port of SinqHM_srv */
-/*
-**=============================================================================
-**  Local routine prototypes.
-*/
-    int		sbpc_config (int mode,
-			char *a1, char *a2, char *a3,
-			char *a4, char *a5, char *a6,
-			char *a7, char *a8, char *a9);
-    int		sbpc_doAction (char *action);
-    void	sbpc_failInet (char *text);
-    void	sbpc_getErrno (int *his_errno);
-    int		sbpc_spawnBootUtil (int spnd_flg,
-			char *a1, char *a2, char *a3, char *a4);
-    int		sbpc_spawnFocus (int spnd_flg,
-			char *a1, char *a2, char *a3,
-			char *a4, char *a5, char *a6,
-			char *a7, char *a8);
-    int		sbpc_spawnLwl (int spnd_flg,
-			char *a1, char *a2, char *a3, char *a4);
-    int		sbpc_spawnSinqHM (int spnd_flg,
-			char *a1, char *a2, char *a3, char *a4);
-    void	sbpc_showHelp (char *errmsg);
-/*
-**--------------------------------------------------------------------------*/
-  int  sbpc_config (
-/*     ===========
-*/			int	mode,
-			char   *p_arg1,
-			char   *p_arg2,
-			char   *p_arg3,
-			char   *p_arg4,
-			char   *p_arg5,
-			char   *p_arg6,
-			char   *p_arg7,
-			char   *p_arg8,
-			char   *p_arg9) {
-    char	errmsg[128];
-    int		i, port, sub_mode;
-    int		nbins, nhists, ncntrs, bytes_per_bin, compress;
-    int		lo_bin, lo_cntr, span, delay, status, my_errno;
-    int         xSize, xOff, xFac, ySize, yOff, yFac;
-    int		hm_mode, nbuffs, nbytes;
-
-    int		bytes_to_come, skt;
-    char	*nxt_byte;
-
-    struct sockaddr_in	lcl_sockname;
-    struct sockaddr_in	rmt_sockname;
-    int			rmt_sockname_len;
-
-
-    struct req_buff_struct	    req_buff;
-    struct rply_buff_struct	    rply_buff;
-	/*-----------------------------------------------------------------
-	*/
-    printf ("Configuring SinqHM_srv ...\n");
-
-    if (p_arg9 == NULL) {
-      port = 2400;
-    }else {
-      if ((sscanf (p_arg9, "%i", &port) != 1) ||
-	  (port < 128) ||
-	  (port > 32767)) {
-	sprintf (errmsg, "The value for <port>, \"%s\", is illegal!\n", p_arg9);
-	sbpc_showHelp (errmsg);
-	return False;
-      }
-    }
-
-    if (p_arg8 == NULL) {
-      sub_mode = 0;
-    }else {
-      if ((sscanf (p_arg8, "%i", &sub_mode) != 1) ||
-	  ((sub_mode & (~SQHM__SUB_MODE_MSK)) != 0)) {
-	sprintf (errmsg, "The value for <sub-mode>, \"%s\", is illegal!\n",
-			p_arg8);
-	sbpc_showHelp (errmsg);
-	return False;
-      }
-    }
-	/*-----------------------------------------------------------------
-	**  If mode is SQHM__HM_DIG, the 5 args should be <#-bins>,
-	**						  <#-hists>,
-	**						  <bytes-per-bin>,
-	**						  <compress> and
-	**						  <lo-bin>.
-	**
-	**  If mode is SQHM__TOF, the 6 args should be	<#-cntrs>,
-	**						<#-bins>,
-	**						<bin-span>,
-	**						<start-delay>,
-	**						<lo_cntr> and
-	**						<bytes-per-bin>.
-	**
-	**  If mode is SQHM__TRANS, no arguments are used.
-	**
-	**  Mode SQHM__HM_PSD, is not yet supported.
-	**
-	**  If mode is SQHM__HRPT, the 5 args should be <#-bins>,
-	**						  <#-hists>,
-	**						  <bytes-per-bin>,
-	**						  <compress> and
-	**						  <lo-bin>.
-	*/
-    hm_mode = mode | sub_mode;
-
-    if ((mode == SQHM__HM_DIG) || (mode == SQHM__HRPT)) {
-					/*---------- <#-bins> */
-      if (p_arg1 == NULL) {
-	sbpc_showHelp ("No value specified for <#-bins>. No default allowed!");
-	return False;
-      }else {
-	if ((sscanf (p_arg1, "%i", &nbins) != 1) || (nbins <= 0)) {
-	  sprintf (errmsg, "The value for <#-nbins>, \"%s\", is illegal!\n"
-			 "It must be a positive integer.", p_arg1);
-	  sbpc_showHelp (errmsg);
-	  return False;
-	}
-      }
-					/*---------- <#-hists> */
-      if (p_arg2 == NULL) p_arg2 = "1";
-      i = sscanf (p_arg2, "%i", &nhists);
-      if ((i != 1) || (nhists <= 0)) {
-	sprintf (errmsg, "The value for <#-hists>, \"%s\", is illegal!\n"
-			 "It must be a positive integer.", p_arg2);
-	sbpc_showHelp (errmsg);
-	return False;
-      }
-					/*---------- <bytes-per-bin> */
-      if (p_arg3 == NULL) p_arg3 = "4";
-      i = sscanf (p_arg3, "%i", &bytes_per_bin);
-      if ((i != 1) ||
-	  ((bytes_per_bin != 1) &&
-	   (bytes_per_bin != 2) &&
-	   (bytes_per_bin != 4))) {
-	sprintf (errmsg, "The value for <bytes-per-bin>, \"%s\", is illegal!\n"
-			 "It must be 1, 2 or 4.", p_arg3);
-	sbpc_showHelp (errmsg);
-	return False;
-      }
-					/*---------- <compress> */
-      if (p_arg4 == NULL) p_arg4 = "0";
-      if ((sscanf (p_arg4, "%i", &compress) != 1) || (compress < 0)) {
-	sprintf (errmsg, "The value for <compress>, \"%s\", is illegal!\n"
-			 "It must be a non-negative integer.", p_arg4);
-	sbpc_showHelp (errmsg);
-	return False;
-      }
-					/*---------- <lo-bin> */
-      if (p_arg5 == NULL) p_arg5 = "0";
-      if ((sscanf (p_arg5, "%i", &lo_bin) != 1) || (lo_bin < 0)) {
-	sprintf (errmsg, "The value for <lo-bin>, \"%s\", is illegal!\n"
-		    "It must be a non-negative integer.", p_arg5);
-	sbpc_showHelp (errmsg);
-	return False;
-      }
-      if (mode == SQHM__HM_DIG) {
-	printf ("    Histogramming mode           = SQHM__HM_DIG\n");
-      }else if (mode == SQHM__HRPT) {
-	printf ("    Histogramming mode           = SQHM__HRPT\n");
-	hm_mode = SQHM__HRPT | SQHM__REFLECT;	/* Force histogram reflection */
-      }
-      printf ("    Number of bins per histogram = %d\n", nbins);
-      printf ("    Number of histograms         = %d\n", nhists);
-      printf ("    Number of bytes per bin      = %d\n", bytes_per_bin);
-      printf ("    Bin compression factor       = %d\n", compress);
-      printf ("    First bin                    = %d\n", lo_bin);
-      if ((hm_mode & SQHM__REFLECT) != 0)
-	printf ("    Histogram reflection requested\n");
-    }else if (mode == SQHM__HM_PSD) {  /* xSize*/
-	if ((sscanf (p_arg1, "%i", &xSize) != 1) || (xSize <= 0)) {
-	  sprintf (errmsg, "The value for <#-xSize>, \"%s\", is illegal!\n"
-			 "It must be a positive integer.", p_arg1);
-	  sbpc_showHelp (errmsg);
-	  return False;
-	}                            /* xOff*/
-	if ((sscanf (p_arg2, "%i", &xOff) != 1)) {
-	  sprintf (errmsg, "The value for <#-xOff>, \"%s\", is illegal!\n"
-			 "It must be a positive integer.", p_arg1);
-	  sbpc_showHelp (errmsg);
-	  return False;
-	}                           /* xFac */
-	if ((sscanf (p_arg3, "%i", &xFac) != 1)|| xFac <= 0) {
-	  sprintf (errmsg, "The value for <#-xFac>, \"%s\", is illegal!\n"
-			 "It must be a positive integer.", p_arg1);
-	  sbpc_showHelp (errmsg);
-	  return False;
-	}
-	                           /* ySize */
-	if ((sscanf (p_arg4, "%i", &ySize) != 1) || (ySize <= 0)) {
-	  sprintf (errmsg, "The value for <#-ySize>, \"%s\", is illegal!\n"
-			 "It must be a positive integer.", p_arg1);
-	  sbpc_showHelp (errmsg);
-	  return False;
-	}                         /* yOff*/
-	if ((sscanf (p_arg5, "%i", &yOff) != 1)) {
-	  sprintf (errmsg, "The value for <#-yOff>, \"%s\", is illegal!\n"
-			 "It must be a positive integer.", p_arg1);
-	  sbpc_showHelp (errmsg);
-	  return False;
-	}                        /* yFac */
-	if ((sscanf (p_arg6, "%i", &yFac) != 1) || (yFac <= 0)) {
-	  sprintf (errmsg, "The value for <#-yFac>, \"%s\", is illegal!\n"
-			 "It must be a positive integer.", p_arg1);
-	  sbpc_showHelp (errmsg);
-	  return False;
-	}
-        printf("\tHistogramming Mode  = SINQHM_PSD\n");
-        printf("\txSize, xOff, yFac = %5d, %5d, %5d\n",xSize, xOff, xFac);
-        printf("\tySize, yOff, yFac = %5d, %5d, %5d\n",ySize, yOff, yFac);
-    }else if (mode == SQHM__TOF) {
-					/*---------- <#-cntrs> */
-      if (p_arg1 == NULL) {
-	sbpc_showHelp ("No value specified for <#-cntrs>. No default allowed!");
-	return False;
-      }else {
-	if ((sscanf (p_arg1, "%i", &ncntrs) != 1) || (ncntrs <= 0)) {
-	  sprintf (errmsg, "The value for <#-ncntrs>, \"%s\", is illegal!\n"
-			 "It must be a positive integer.", p_arg1);
-	  sbpc_showHelp (errmsg);
-	  return False;
-	}
-      }
-					/*---------- <#-bins> */
-      if (p_arg2 == NULL) {
-	sbpc_showHelp ("No value specified for <#-bins>. No default allowed!");
-	return False;
-      }else {
-	if ((sscanf (p_arg2, "%i", &nbins) != 1) || (nbins <= 0)) {
-	  sprintf (errmsg, "The value for <#-nbins>, \"%s\", is illegal!\n"
-			 "It must be a positive integer.", p_arg2);
-	  sbpc_showHelp (errmsg);
-	  return False;
-	}
-      }
-					/*---------- <bin-span> */
-      if (p_arg3 == NULL) {
-	sbpc_showHelp ("No value specified for <bin-span>. No default allowed!");
-	return False;
-      }else {
-	if ((sscanf (p_arg3, "%i", &span) != 1) || (span <= 0)) {
-	  sprintf (errmsg, "The value for <bin-span>, \"%s\", is illegal!\n"
-			 "It must be a positive integer.", p_arg3);
-	  sbpc_showHelp (errmsg);
-	  return False;
-	}
-      }
-					/*---------- <start-delay> */
-      if (p_arg4 == NULL) p_arg4 = "0";
-      if ((sscanf (p_arg4, "%i", &delay) != 1) || (delay < 0)) {
-	sprintf (errmsg, "The value for <start-delay>, \"%s\", is illegal!\n"
-			 "It must be a non-negative integer.", p_arg4);
-	sbpc_showHelp (errmsg);
-	return False;
-      }
-					/*---------- <lo-cntr> */
-      if (p_arg5 == NULL) p_arg5 = "0";
-      if ((sscanf (p_arg5, "%i", &lo_cntr) != 1) || (lo_cntr < 0)) {
-	sprintf (errmsg, "The value for <lo-cntr>, \"%s\", is illegal!\n"
-		    "It must be a non-negative integer.", p_arg5);
-	sbpc_showHelp (errmsg);
-	return False;
-      }
-					/*---------- <bytes-per-bin> */
-      if (p_arg6 == NULL) p_arg6 = "4";
-      i = sscanf (p_arg6, "%i", &bytes_per_bin);
-      if ((i != 1) ||
-	  ((bytes_per_bin != 1) &&
-	   (bytes_per_bin != 2) &&
-	   (bytes_per_bin != 4))) {
-	sprintf (errmsg, "The value for <bytes-per-bin>, \"%s\", is illegal!\n"
-			 "It must be 1, 2 or 4.", p_arg6);
-	sbpc_showHelp (errmsg);
-	return False;
-      }
-      printf ("    Histogramming mode           = SQHM__TOF\n");
-      printf ("    Number of counters           = %d\n", ncntrs);
-      printf ("    Number of bins per counter   = %d\n", nbins);
-      printf ("    Bin span                     = %d\n", span);
-      printf ("    Start delay                  = %d\n", delay);
-      printf ("    First counter                = %d\n", lo_cntr);
-      printf ("    Number of bytes per bin      = %d\n", bytes_per_bin);
-    }else if (mode == SQHM__TRANS) {
-					/*---------- <#-buffers> */
-      if (p_arg1 == NULL) p_arg1 = "8";
-      if ((sscanf (p_arg1, "%i", &nbuffs) != 1) || (nbuffs <= 0)) {
-	sprintf (errmsg, "The value for <#-buffers>, \"%s\", is illegal!\n"
-			 "It must be a positive integer.", p_arg1);
-	sbpc_showHelp (errmsg);
-	return False;
-      }
-					/*---------- <#-bins> */
-      if (p_arg2 == NULL) p_arg2 = "4096";
-      if ((sscanf (p_arg2, "%i", &nbytes) != 1) || (nbytes <= 0)) {
-	sprintf (errmsg, "The value for <buff-size>, \"%s\", is illegal!\n"
-			 "It must be a positive integer.", p_arg2);
-	sbpc_showHelp (errmsg);
-	return False;
-      }
-      printf ("    Histogramming mode           = SQHM__TRANS\n");
-      nbuffs = 8;
-      nbytes = 4096;
-      printf ("    Number buffers = %d\n", nbuffs);
-      printf ("    Buffer size    = %d bytes\n", nbytes);
-    }
-    printf ("\nConnecting to SinqHM_srv via TCP/IP port %d ...\n", port);
-/*============================================================================
-**  	   Create a TCP/IP socket for connecting to SinqHM_srv root and bind it.
-*/
-    skt = socket (AF_INET, SOCK_STREAM, 0);
-    if (skt == -1) sbpc_failInet ("\nSocket error.");
-
-    lcl_sockname.sin_family = AF_INET;
-    lcl_sockname.sin_port   = htons (0);
-    lcl_sockname.sin_addr.s_addr = 0;
-    status = bind (skt, (struct sockaddr *) &lcl_sockname,
-					sizeof (lcl_sockname));
-    if (status == -1) sbpc_failInet ("\nBind error.");
-/*============================================================================
-**		Connect to SinqHM_srv root.
-*/
-    rmt_sockname_len = sizeof (rmt_sockname);
-    rmt_sockname.sin_family	 = AF_INET;
-    rmt_sockname.sin_port	 = htons (port);
-    rmt_sockname.sin_addr.s_addr = 0;		/* Connect to local machine */
-    status = connect (skt, (struct sockaddr *) &rmt_sockname,
-				    sizeof (rmt_sockname));
-    if (status == -1) {
-      sbpc_getErrno (&my_errno);
-      sbpc_failInet ("\nConnect error");
-    }
-/*============================================================================
-**		    Set up and send the configure message.
-*/
-    req_buff.bigend	 = htonl (0x12345678);
-    req_buff.cmnd	 = htonl (SQHM_CONFIG);
-    req_buff.u.cnfg.mode = htonl (hm_mode);
-
-    if ((mode == SQHM__HM_DIG) || (mode == SQHM__HRPT)) {
-      req_buff.u.cnfg.u.hm_dig.n_hists	     = htonl (nhists);
-      req_buff.u.cnfg.u.hm_dig.lo_bin	     = htonl (lo_bin);
-      req_buff.u.cnfg.u.hm_dig.num_bins	     = htonl (nbins);
-      req_buff.u.cnfg.u.hm_dig.bytes_per_bin = htonl (bytes_per_bin);
-      req_buff.u.cnfg.u.hm_dig.compress	     = htonl (compress);
-    }else if (mode == SQHM__HM_PSD) {
-      req_buff.u.cnfg.u.psd.n_extra_bytes = htonl (0);
-      req_buff.u.cnfg.u.psd.n_edges	  = htons (1);
-      req_buff.u.cnfg.u.psd.n_banks	  = htons (1);
-      req_buff.u.cnfg.u.psd.xOffset	  = htonl (xOff);
-      req_buff.u.cnfg.u.psd.yOffset	  = htonl (yOff);
-      req_buff.u.cnfg.u.psd.xFactor	  = htonl (xFac);
-      req_buff.u.cnfg.u.psd.yFactor	  = htonl (yFac);
-      req_buff.u.cnfg.u.psd.xSize	  = htons (xSize);
-      req_buff.u.cnfg.u.psd.ySize	  = htons (ySize);
-
-
-      req_buff.u.cnfg.u.psd.edge_0.n_bins   = htonl (1);
-      req_buff.u.cnfg.u.psd.edge_0.flag     = htonl (0);    /* Fixed bin span */
-
-      req_buff.u.cnfg.u.psd.edge_0.edges[0] = htonl (0);
-      req_buff.u.cnfg.u.psd.edge_0.edges[1] = htonl (10000);
-      req_buff.u.cnfg.u.psd.preset_delay    = htonl (0);
-
-      req_buff.u.cnfg.u.psd.bank_0.first         = htons (0);
-      req_buff.u.cnfg.u.psd.bank_0.n_cntrs       = htons (xSize*ySize);
-      req_buff.u.cnfg.u.psd.bank_0.edge_indx	 = htons (0);
-      req_buff.u.cnfg.u.psd.bank_0.bytes_per_bin = htons (4);
-
-    }else if (mode == SQHM__TOF) {
-      req_buff.u.cnfg.u.tof.n_extra_bytes = htonl (0);
-      req_buff.u.cnfg.u.tof.n_edges	  = htons (1);
-      req_buff.u.cnfg.u.tof.n_banks	  = htons (1);
-
-      req_buff.u.cnfg.u.tof.edge_0.n_bins   = htonl (nbins);
-      req_buff.u.cnfg.u.tof.edge_0.flag	    = htonl (0);
-      req_buff.u.cnfg.u.tof.edge_0.edges[0] = htonl (0);
-      req_buff.u.cnfg.u.tof.edge_0.edges[1] = htonl (span);
-      req_buff.u.cnfg.u.tof.preset_delay    = htonl (delay);
-
-      req_buff.u.cnfg.u.tof.bank_0.first	 = htons (lo_cntr);
-      req_buff.u.cnfg.u.tof.bank_0.n_cntrs	 = htons (ncntrs);
-      req_buff.u.cnfg.u.tof.bank_0.edge_indx	 = htons (0);
-      req_buff.u.cnfg.u.tof.bank_0.bytes_per_bin = htons (bytes_per_bin);
-    }else if (mode == SQHM__TRANS) {
-      req_buff.u.cnfg.u.trans.n_buffs = htonl (nbuffs);
-      req_buff.u.cnfg.u.trans.n_bytes = htonl (nbytes);
-    }
-
-    status = send (skt, (char *) &req_buff, sizeof (req_buff), 0);
-    if (status == -1) sbpc_failInet ("\nSend error");
-    if (status != sizeof (req_buff)) {
-      printf ("\nWrong number of bytes sent: %d", status);
-      close (skt);
-      return False;
-    }
-/*============================================================================
-**		    Wait for the status response.
-*/
-    bytes_to_come = sizeof (rply_buff);
-    nxt_byte = (char *) &rply_buff;
-    while (bytes_to_come > 0) {
-      status = recv (skt, nxt_byte, bytes_to_come, 0);
-      if (status == -1) {
-	sbpc_failInet ("\nRecv error");
-	close (skt);
-	return False;
-      } else if (status <= 0) {
-	printf ("Recv error - unexpected byte count: %d/%d\n",
-		    sizeof (rply_buff), status);
-	close (skt);
-	return False;
-      }
-      bytes_to_come = bytes_to_come - status;
-      nxt_byte = nxt_byte + status;
-    }
-    if (ntohl (rply_buff.bigend) != 0x12345678) {
-      printf ("Big-endian/little-endian problem!\n"
-	      "    Buffer received in non-network byte order!\n");
-      close (skt);
-      return False;
-    }
-    status = ntohl (rply_buff.status);
-    if (status != KER__SUCCESS) {
-      if (status == KER__BAD_CREATE) {
-	printf ("Status response is KER__BAD_CREATE\n");
-	printf (" Sub-status = %d\n", ntohl (rply_buff.sub_status));
-      }else if (status == KER__BAD_STATE) {
-	printf ("Status response is KER__BAD_STATE\n");
-      }else if (status == KER__BAD_VALUE) {
-	printf ("Status response is KER__BAD_VALUE\n");
-      }else if (status == KER__BAD_RECV) {
-	printf ("Status response is KER__BAD_RECV\n");
-      }else if (status == KER__BAD_ALLOC) {
-	printf ("Status response is KER__BAD_ALLOC\n");
-      }else {
-	printf ("Bad and unrecognised status response: 0x%x\n", status);
-      }
-      if (rply_buff.u.message[0] != '\0') {
-	printf (" Message = \"%s\"\n", &rply_buff.u.message[0]);
-      }
-      close (skt);
-      return False;
-    }
-/*
-**		Close the connection.
-*/
-    status = close (skt);
-    if ((status != 0) && (errno != ECONNRESET))
-	    sbpc_failInet ("\nClose error");
-    taskDelay (1 * sysClkRateGet ());	    /* Wait for 1 second to let ..
-					    ** .. SinqHM_srv to do its printing.
-					    */
-    printf ("\nSinqHM_srv has been configured.\n");
-    return 1;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int  sbpc_doAction (char *action) {
-/*     =============
-*/
-    int			i, j, a_len, n_args, status, spnd_flg;
-    char		errmsg[100];
-    char	       *p_verb, *p_arg[MAX_ARGS], *p_nxt;
-
-    for (i = 0; action[i] != '\0'; i++) action[i] = tolower (action[i]);
-    for (i = 0; i < MAX_ARGS; i++) p_arg[i] = NULL;
-
-    a_len = strlen (action);
-    p_verb = strtok (action, "=");	    /* Get the action verb */
-
-    n_args = 0;
-    for (i = 0; i < MAX_ARGS; i++) p_arg[i] = NULL;
-		    /*
-		    ** Now loop to get the args.
-		    ** Note:
-		    **  The loop does not use strtok since it wants to
-		    **  allow null arguments, i.e. adjacent commas may be
-		    **  used to indicate default args. This is not possible
-		    **  if one uses strtok.
-		    */
-    p_nxt = p_verb + strlen (p_verb) + 1;   /* Get addr of start of args */
-    while ((n_args < MAX_ARGS) &&
-	   ((p_nxt - action) < a_len)) {
-      p_arg[n_args] = p_nxt;
-      n_args++;
-      i = strcspn (p_nxt, ",");	    /* Find next comma (or end of string) */
-      p_nxt[i] = NIL;		    /* Change it to a NIL */
-      p_nxt = p_nxt + i + 1;	    /* Move to next argement */
-    }
-
-    if ((strcmp (p_verb, "sp") == 0) || (strcmp (p_verb, "sps") == 0)) {
-      spnd_flg = 0;
-      spnd_flg = (strcmp (p_verb, "sps") == 0) ? 1 : 0;
-      if (n_args == 0) {
-        sbpc_showHelp ("\"sp\" action has no arguments!");
-	return False;
-      }else if (strcmp (p_arg[0], "bootutil") == 0) {
-	status = sbpc_spawnBootUtil (spnd_flg,
-			    p_arg[1], p_arg[2], p_arg[3], p_arg[4]);
-	if (!status) return status;
-      }else if (strcmp (p_arg[0], "focus") == 0) {
-	status = sbpc_spawnFocus (spnd_flg,
-			    p_arg[1], p_arg[2], p_arg[3], p_arg[4],
-			    p_arg[5], p_arg[6], p_arg[7], p_arg[8]);
-	if (!status) return status;
-      }else if (strcmp (p_arg[0], "lwl") == 0) {
-	status = sbpc_spawnLwl (spnd_flg,
-			    p_arg[1], p_arg[2], p_arg[3], p_arg[4]);
-	if (!status) return status;
-      }else if (strcmp (p_arg[0], "sinqhm") == 0) {
-	status = sbpc_spawnSinqHM (spnd_flg,
-			    p_arg[1], p_arg[2], p_arg[3], p_arg[4]);
-	if (!status) return status;
-      }else {
-	sprintf (errmsg, "\"%s\" is an unrecognised thing to spawn!\n",
-			    p_arg[0]);
-	sbpc_showHelp (errmsg);
-	return False;
-      }
-    }else if (strcmp (p_verb, "cfg") == 0) {
-      if (n_args == 0) {
-        sbpc_showHelp ("\"cfg\" action has no arguments!");
-	return False;
-      }else if (strcmp (p_arg[0], "hm_dig") == 0) {
-	status = sbpc_config (SQHM__HM_DIG,
-		    p_arg[1], p_arg[2], p_arg[3], p_arg[4], p_arg[5],
-		    p_arg[6], p_arg[7], p_arg[8], p_arg[9]);
-	if (!status) return status;
-      }else if (strcmp (p_arg[0], "tof") == 0) {
-	status = sbpc_config (SQHM__TOF,
-		    p_arg[1], p_arg[2], p_arg[3], p_arg[4], p_arg[5],
-		    p_arg[6], p_arg[7], p_arg[8], p_arg[9]);
-	if (!status) return status;
-      }else if (strcmp (p_arg[0], "hm_psd") == 0) {
-	status = sbpc_config (SQHM__HM_PSD,
-		    p_arg[1], p_arg[2], p_arg[3], p_arg[4], p_arg[5],
-		    p_arg[6], p_arg[7], p_arg[8], p_arg[9]);
-	if (!status) return status;
-      }else if (strcmp (p_arg[0], "hrpt") == 0) {
-	status = sbpc_config (SQHM__HRPT,
-		    p_arg[1], p_arg[2], p_arg[3], p_arg[4], p_arg[5],
-		    p_arg[6], p_arg[7], p_arg[8], p_arg[9]);
-	if (!status) return status;
-      }else if (strcmp (p_arg[0], "trans") == 0) {
-	status = sbpc_config (SQHM__TRANS,
-		    p_arg[1], p_arg[2], p_arg[3], p_arg[4], p_arg[5],
-		    p_arg[6], p_arg[7], p_arg[8], p_arg[9]);
-	if (!status) return status;
-      }else {
-	sprintf (errmsg, "\"%s\" is an unrecognised thing to configure!\n",
-			    p_arg[0]);
-	sbpc_showHelp (errmsg);
-	return False;
-      }
-    }else if (strcmp (p_verb, "wt") == 0) {
-      if (n_args == 0) {
-        sbpc_showHelp ("\"wt\" action has no arguments!");
-	return False;
-      }else if ((sscanf (p_arg[0], "%i", &i) != 1) ||
-		(i <= 0) || (i > 300)) {
-	sprintf (errmsg, "The value for <wt>, \"%s\", is illegal!\n", p_arg[0]);
-	sbpc_showHelp (errmsg);
-	return False;
-      }
-      printf ("Waiting for %d secs ", i);
-      for (j = 0; j < i; j++) {
-	taskDelay (1 * sysClkRateGet ());	    /* Wait as requested .. */
-	printf (".");
-      }
-      printf ("\n");
-    }else {
-      sprintf (errmsg, "\"%s\" is an unrecognised action!\n", p_verb);
-      sbpc_showHelp (errmsg);
-      return False;
-    }
-    return True;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void sbpc_failInet (char *text) {
-/*     =============
-**		    Output the given text and exit the process.
-*/
-    int    my_errno;
-
-    sbpc_getErrno (&my_errno);
-    printf ("### Internet Error ###\n");
-    printf ("                   ### errno = %d.\n", my_errno);
-    perror (text);
-    exit (EXIT_FAILURE);
-  }
-/*--------------------------------------------------------------------------*/
-  void	sbpc_getErrno (int *his_errno) {
-/*      =============
-*/
-    *his_errno = errno;	    /* Make copy of errno   */
-    return;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void	sbpc_showHelp (char *errmsg) {
-/*      =============
-*/
-    if (errmsg != NULL) {
-      printf ("\007\n%s\n", errmsg);
-      taskDelay (5 * sysClkRateGet ());	    /* Give user time to read message */
-    }
-    printf ("\n"
- "The \"other\" field may be specified as follows:\n"
- "\n"
- "        <action>=<arg0>,..,<argn>/<action>=...\n"
- "\n"
- "There must be no white space characters in the string. The string may\n"
- "be specified in upper or lower case.\n"
- "\n"
- "<action> may be \"sp\"  for \"spawn a task\" or\n"
- "                \"sps\" for \"spawn and suspend a task\" or\n"
- "                \"cfg\" for \"configure SinqHM_srv (or FOCUS_srv)\"\n"
- "\n"
- "The following \"sp\" (or \"sps\") commands are available:\n"
- "\n"
- "  a)        sp=SinqHM,<port>,<use-lev-gen>,<VMIO10-base>\n"
- "     where\n"
- "          <port>        = TCP/IP port number for server. Dflt=2400.\n"
- "          <use-lev-gen> = flag to indicate if timing levels should be\n"
- "                            generated via a VMIO10 module. If non-zero,\n"
- "                            timing levels are generated. Dflt=0.\n"
- "          <VMIO10-base> = base address of VMIO10 level-generator\n"
- "                            module. Dflt=0x1900.\n"
- "     This action spawns the SinqHM histogram memory server task.\n"
- "\n"
- "  b)        sp=lwl,<port>,<VMIO10-base>,<verbosity>\n"
- "     where\n"
- "          <port>        = TCP/IP port number for server. Dflt=3501.\n"
- "          <VMIO10-base> = base address of VMIO10 test-generator\n"
- "                            module. Dflt=0x1800.\n"
- "          <verbosity>   = verbosity flag. If non-zero, the program is\n"
- "                            verbose. Dflt=0.\n"
- "     This action spawns the lwl_server task which can be used to feed\n"
- "     data packets into the hist memory fibre-optic (Licht-Wellen-Leiter)\n"
- "     link via a VMIO10 test-generator. If the test generator is absent,\n"
- "     the action can be omitted to avoid a boot-time error message.\n"
- "\n"
- "  c)        sp=bootUtil,<port>\n"
- "     where\n"
- "          <port>        = TCP/IP port number for server. Dflt=2300.\n"
- "\n"
- "The following \"cfg\" commands are available:\n"
- "\n"
- "  a)        cfg=HM_DIG,<#-bins>,<#-hists>,<bin-width>,<compress>,<lo-bin>\n"
- "     where\n"
- "          <#-bins>    = number of bins per histogram. No default.\n"
- "          <#-hists>   = number of defined histograms. Dflt=1.\n"
- "          <bin-width> = Number of bytes per bin. Dflt=4.\n"
- "          <compress>  = Bin compression factor. Dflt=1.\n"
- "          <lo-bin>    = First bin. Dflt=0.\n"
- "\n"
- "  b)        cfg=TOF,<#-bins>,<#-cntrs>,<bin-width>,<compress>,<lo-cntr>\n"
- "     where\n"
- "          <#-bins>    = number of bins per histogram. No default.\n"
- "          <#-cntrs>   = number of neutron counters. No default.\n"
- "          <bin-width> = Number of bytes per bin. Dflt=4.\n"
- "          <compress>  = Bin compression factor. Dflt=1.\n"
- "          <lo-cntr>   = # of first counter. Dflt=0.\n"
- "\n"
- "  c)        cfg=HM_PSD,... same arguments as HM_DIG (for now).\n"
- "\n"
- "For example:\n"
- "       other=\"sp=SinqHM/cfg=HM_DIG,400\"\n"
- "\n");
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int	sbpc_spawnBootUtil (
-/*	==================
-*/		int   spnd_flg,	/* Suspend flag (arg10) */
-		char *p_arg1,	/* TCP/IP port number. Dflt = 2300 */
-		char *p_arg2,	/* Not used */
-		char *p_arg3,	/* Not used */
-		char *p_arg4) {	/* Not used */
-
-    int		port;
-    int		status;
-
-    void SinqHM_bootUtil (void);    /* Define template for SinqHM_bootUtil */
-
-    if (p_arg1 == NULL) {
-      port = 2300;
-    }else if (p_arg1[0] == NIL) {
-      port = 2300;
-    }else {
-      if (sscanf (p_arg1, "%i", &port) != 1) {
-	printf ("bootUtil has not been spawned: invalid argument \"%s\"\n",
-				p_arg1);
-	return False;
-      }
-      if (port <= 0) port = 2300;
-    }
-
-    printf ("Spawning bootUtil ..\n    TCP/IP port = %d.\n", port);
-    status = taskSpawn ("bootUtil", 100, VX_FP_TASK, 20000,
-			(FUNCPTR) SinqHM_bootUtil,
-			port, 0, 0, 0, 0, 0, 0, 0, 0,
-			spnd_flg);
-    if (status == ERROR) {
-      printf ("\007\nSpawn of SinqHM_bootUtil failed!\n\n");
-      return False;
-    }
-    taskDelay (1 * sysClkRateGet ());	/* Give bootUtil time to get going */
-    return True;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int	sbpc_spawnFocus (
-/*	===============
-*/		int   spnd_flg,	/* Suspend flag (arg10) */
-		char *p_arg1,	/* hostM */
-		char *p_arg2,	/* #-cntrs for hostM */
-		char *p_arg3,	/* hostO */
-		char *p_arg4,	/* #-cntrs for hostO */
-		char *p_arg5,	/* hostU */
-		char *p_arg6,	/* #-cntrs for hostU */
-		char *p_arg7,	/* Client side port number */
-		char *p_arg8) {	/* Server side port number */
-
-    char	*hostM, *hostO, *hostU;
-    int		ndetM, ndetO, ndetU, c_port, s_port;
-    int		status;
-    char	tsknam[32];
-#ifndef FOCUS
-    printf ("\n\"/sp=focus\" is only permitted on the FOCUS instrument!\n");
-    return False;
-#else
-    void FOCUS_main (void);	/* Define template for FOCUS_main */
-
-    hostM = (p_arg1 != NULL) ? p_arg1 : "localhost";
-    if (hostM[0] == NIL) hostM = "localhost";
-
-    if (p_arg2 == NULL) {
-      ndetM = 150;
-    }else if (p_arg2[0] == NIL) {
-      ndetM = 150;
-    }else {
-      if ((sscanf (p_arg2, "%i", &ndetM) != 1) ||
-	  (ndetM <= 0) ||
-	  (ndetM > 1023)) {
-	printf ("FOCUS_main has not been spawned: invalid argument \"%s\"\n",
-				p_arg2);
-	return False;
-      }
-    }
-
-    hostO = (p_arg3 != NULL) ? p_arg3 : "lnse05.vme";
-    if (hostO[0] == NIL) hostO = "lnse05.vme";
-
-    if (p_arg4 == NULL) {
-      ndetO = 117;
-    }else if (p_arg4[0] == NIL) {
-      ndetO = 117;
-    }else {
-      if ((sscanf (p_arg4, "%i", &ndetO) != 1) ||
-	  (ndetO <= 0) ||
-	  (ndetO > 1023)) {
-	printf ("FOCUS_main has not been spawned: invalid argument \"%s\"\n",
-				p_arg4);
-	return False;
-      }
-    }
-
-    hostU = (p_arg5 != NULL) ? p_arg5 : "lnse06.vme";
-    if (hostU[0] == NIL) hostU = "lnse06.vme";
-
-    if (p_arg6 == NULL) {
-      ndetU = 116;
-    }else if (p_arg6[0] == NIL) {
-      ndetU = 116;
-    }else {
-      if ((sscanf (p_arg6, "%i", &ndetU) != 1) ||
-	  (ndetU <= 0) ||
-	  (ndetU > 1023)) {
-	printf ("FOCUS_main has not been spawned: invalid argument \"%s\"\n",
-				p_arg6);
-	return False;
-      }
-    }
-
-    if (p_arg7 == NULL) {
-      c_port = 2500;
-    }else if (p_arg7[0] == NIL) {
-      c_port = 2500;
-    }else {
-      if ((sscanf (p_arg7, "%i", &c_port) != 1) ||
-	  (c_port <= 1024) ||
-	  (c_port > 65535)) {
-	printf ("FOCUS_main has not been spawned: invalid argument \"%s\"\n",
-				p_arg7);
-	return False;
-      }
-    }
-
-    if (p_arg8 == NULL) {
-      s_port = 2400;
-    }else if (p_arg8[0] == NIL) {
-      s_port = 2400;
-    }else {
-      if ((sscanf (p_arg8, "%i", &s_port) != 1) ||
-	  (s_port <= 1024) ||
-	  (s_port > 65535)) {
-	printf ("FOCUS_main has not been spawned: invalid argument \"%s\"\n",
-				p_arg8);
-	return False;
-      }
-    }
-
-    printf ("Spawning FOCUS_main ..\n");
-    printf ("   Mittel-bank: %3d cntrs, host = \"%s\"\n", ndetM, hostM);
-    printf ("   Ober-bank:   %3d cntrs, host = \"%s\"\n", ndetO, hostO);
-    printf ("   Unter-bank:  %3d cntrs, host = \"%s\"\n", ndetU, hostU);
-    printf ("   Client TCP/IP port = %d.\n", c_port);
-    printf ("   Server TCP/IP port = %d.\n", s_port);
-
-    sprintf (tsknam, "Focus%04d", s_port);
-    status = taskSpawn (tsknam, 100, VX_FP_TASK, 20000,
-			(FUNCPTR) FOCUS_main,
-			(long int) hostM, ndetM,
-			(long int) hostO, ndetO,
-			(long int) hostU, ndetU,
-			c_port, s_port, 0,
-			spnd_flg);
-    if (status == ERROR) {
-      printf ("\007\nSpawn of FOCUS_main failed!\n\n");
-      return False;
-    }
-    taskDelay (1 * sysClkRateGet ());	/* Give FOCUS_main time to get going */
-    return True;
-#endif
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int	sbpc_spawnLwl (
-/*	=============
-*/		int   spnd_flg,	/* Suspend flag (arg10) */
-		char *p_arg1,	/* TCP/IP port number. Dflt = 3501 */
-		char *p_arg2,	/* Base addr of VMIO10 module. Dflt = 0x1800 */
-		char *p_arg3,	/* Verbosity. Dflt = 0 */
-		char *p_arg4) {	/* Not used */
-
-    int		port, vmio_base, verbosity;
-    int		status;
-
-    void lwl_server (void);	/* Define template for lwl_server */
-
-    if (p_arg1 == NULL) {
-      port = 3501;
-    }else if (p_arg1[0] == NIL) {
-      port = 3501;
-    }else {
-      if ((sscanf (p_arg1, "%i", &port) != 1) || (port < 0)) {
-	printf ("lwl_server has not been spawned: invalid argument \"%s\"\n",
-				p_arg1);
-	return False;
-      }
-      if (port == 0) port = 3501;
-    }
-
-    if (p_arg2 == NULL) {
-      vmio_base = 0x1800;
-    }else if (p_arg2[0] == NIL) {
-      vmio_base = 0x1800;
-    }else {
-      if (sscanf (p_arg2, "%i", &vmio_base) != 1) {
-	printf ("lwl_server has not been spawned: invalid argument \"%s\"\n",
-				p_arg2);
-	return False;
-      }
-    }
-
-    if (p_arg3 == NULL) {
-      verbosity = 0;
-    }else if (p_arg3[0] == NIL) {
-      verbosity = 0;
-    }else {
-      if (sscanf (p_arg3, "%i", &verbosity) != 1) {
-	printf ("lwl_server has not been spawned: invalid argument \"%s\"\n",
-				p_arg3);
-	return False;
-      }
-    }
-
-    printf ("Spawning lwl_server ..\n    TCP/IP port = %d.\n", port);
-    printf ("    VMIO10 base address = 0x%x\n", vmio_base);
-    if (verbosity == 0) {
-      printf ("    Terse mode.\n");
-    }else {
-      printf ("    Verbose mode.\n");
-    }
-	/*
-	** Note:    lwlServer must have exactly the same priority as
-	** ====	    the Filler task (hmFill2400).
-	**
-	**	    If the priority of lwlServer is lower that that of Filler,
-	**	    then lwlServer will never get to run because Filler only
-	**	    relinquishes the CPU via a "taskDelay (0)" and this only
-	**	    lets tasks of the same priority as Filler run.
-	**
-	**	    If the priority of lwlServer is higher that that of Filler,
-	**	    it is possible that the Filler gets blocked by lwlServer
-	**	    so that the LWL Fifo gets filled up and overflows.
-	*/
-    status = taskSpawn ("lwlServer", 250, VX_FP_TASK, 20000,
-			(FUNCPTR) lwl_server,
-			port, vmio_base, verbosity, 0, 0, 0, 0, 0, 0,
-			spnd_flg);
-    if (status == ERROR) {
-      printf ("\007\nSpawn of lwl_Server failed!\n\n");
-      return False;
-    }
-    taskDelay (1 * sysClkRateGet ());	/* Give lwl_server time to get going */
-    return True;
-  }
-
-/*
-**--------------------------------------------------------------------------*/
-
-#ifdef MEN_A012
-    extern int Hist_base_MEN_alloc;
-#endif
-  int	sbpc_spawnSinqHM (
-/*	================
-*/		int   spnd_flg,	/* Suspend flag (arg10) */
-		char *p_arg1,	/* TCP/IP port number. Dflt = 2400 */
-		char *p_arg2,	/* Use VMIO10 module if non-zero. Dflt = 0 */
-		char *p_arg3,	/* Base addr of VMIO10 module. Dflt = 0x1900 */
-		char *p_arg4) {	/* Not used */
-
-    int		port, use_level_gen, vmio_base;
-    int		status;
-    char	tsknam[32];
-
-    void SinqHM_srv (void);	/* Define template for SinqHM_srv */
-
-    if (p_arg1 == NULL) {
-      port = 2400;
-    }else if (p_arg1[0] == NIL) {
-      port = 2400;
-    }else {
-      if ((sscanf (p_arg1, "%i", &port) != 1) || (port < 0)) {
-	printf ("SinqHM has not been spawned: invalid argument \"%s\"\n",
-				p_arg1);
-	return False;
-      }
-      if (port == 0) port = 2400;
-    }
-
-    if (p_arg2 == NULL) {
-      use_level_gen = 0;
-    }else if (p_arg2[0] == NIL) {
-      use_level_gen = 0;
-    }else {
-      if (sscanf (p_arg2, "%i", &use_level_gen) != 1) {
-	printf ("SinqHM has not been spawned: invalid argument \"%s\"\n",
-				p_arg2);
-	return False;
-      }
-    }
-    if (use_level_gen != 0) use_level_gen = 1;
-
-    if (p_arg3 == NULL) {
-      vmio_base = 0x1900;
-    }else if (p_arg3[0] == NIL) {
-      vmio_base = 0x1900;
-    }else {
-      if (sscanf (p_arg3, "%i", &vmio_base) != 1) {
-	printf ("SinqHM has not been spawned: invalid argument \"%s\"\n",
-				p_arg3);
-	return False;
-      }
-    }
-#ifdef MEN_A012
-    /*
-      make sure that the memory allocation flag is properly initialized at
-      the first time
-    */
-    Hist_base_MEN_alloc = 0;
-#endif
-
-    printf ("Spawning SinqHM_srv ..\n    TCP/IP port = %d.\n", port);
-    if (use_level_gen == 0) {
-      printf ("    No timing signal generation requested.\n");
-    }else {
-      printf ("    Timing signal generation requested.\n");
-      printf ("    VMIO10 base address = 0x%x\n", vmio_base);
-    }
-
-    sprintf (tsknam, "hmRoot%04d", port);
-    status = taskSpawn (tsknam, 100, VX_FP_TASK, 20000,
-			(FUNCPTR) SinqHM_srv,
-			port, use_level_gen, vmio_base, 0, 0, 0, 0, 0, 0,
-			spnd_flg);
-    if (status == ERROR) {
-      printf ("\007\nSpawn of SinqHM_srv failed!\n\n");
-      return False;
-    }
-    taskDelay (1 * sysClkRateGet ());	/* Give SinqHM_srv time to get going */
-    return True;
-  }
-/*
-**==============================================================================
-**
-**  Main line program
-**
-**============================================================================*/
-
-  int	    SinqHM_bootParamsConfig () {
-/*	    =======================
-*/
-    char	       *local_mem, *p_item;
-    BOOT_PARAMS		my_params;
-
-    int			i, n_actions, status;
-    char	       *action_token[MAX_ACTIONS];
-    char		recd[132];
-/*============================================================================
-**	Perform the initialisation of variables ...
-*/
-    local_mem = (char *) BOOT_LINE_ADRS;    /* Get pointer to the boot line */
-/*============================================================================
-*/
-    bootStringToStruct (local_mem, &my_params);    /* Parse boot line */
-    		/*
-		** Parse the "other" string
-		*/
-    if (my_params.other[0] == '\0') {
-      printf ("\n"
-	    "There is no \"other\" field defined in the boot line.\n"
-	    "SinqHM_srv will not be automatically configured!\n");
-      sbpc_showHelp (NULL);
-      return True;
-    }
-    printf ("\nParsing the \"other\" field defined in the boot line\n\n"
-		"      Other = \"%s\"\n\n", my_params.other);
-	/*
-	** Start by splitting up into "/" terminated strings.
-	** These are "actions".
-	*/
-    n_actions = 0;
-    p_item = strtok (my_params.other, "/");
-    while ((n_actions < MAX_ACTIONS) && (p_item != NULL)) {
-      action_token[n_actions] = p_item;
-      n_actions++;
-      p_item = strtok (NULL, "/");	      /* Get the next action token */
-    }
-	/*
-	** Now process the actions in order.
-	*/
-    for (i = 0; i < n_actions; i++) {
-      status = sbpc_doAction (action_token[i]);
-      if (!status) return status;
-    }
-    return True;
-  }
-/*================================= End of SinqHM_bootParamsConfig.c ========*/
diff --git a/sinqhm/SinqHM_bootUtil.c b/sinqhm/SinqHM_bootUtil.c
deleted file mode 100755
index 7caf7efc..00000000
--- a/sinqhm/SinqHM_bootUtil.c
+++ /dev/null
@@ -1,631 +0,0 @@
-#define	    IDENT	"1A02"
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     SINQ Division				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...SINQHM]SinqHM_bootUtil.c
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Aug 1999
-**
-** Updates:
-**  1A01 16-Aug-1999 DM	    Initial version.
-**---------------------------------------------------------------------------
-**  SinqHM_bootUtil.c is a simple TCP/IP server for VxWorks.
-**  It obtains information about the VxWorks boot line.
-*/
-/*
-**  To compile and link this program for VxWorks on PSS123, use:
-**
-	    set src = "lnsa09:tas_src:[sinqhm]"
-	    rcp -p "${src}SinqHM_bootUtil.c" SinqHM_bootUtil.c
-	    ccvx -I${WIND_BASE}/target/config/all SinqHM_bootUtil.c
-** where
-	    ccvx = ccppc -O0			\
-		    -mcpu=603			\
-		    -I${WIND_BASE}/target/h	\
-		    -fno-builtin		\
-		    -fno-for-scope		\
-		    -nostdinc			\
-		    -DCPU=PPC603		\
-		    -D_GNU_TOOL			\
-		    -gdwarf -c -Wimplicit
-
-**  and, on the target,
-**
-**   -> ld < /home/pss123/aco/maden/wind/SinqHM/Dflt/SinqHM_srv.o
-**   -> ld < /home/pss123/aco/maden/wind/SinqHM/SinqHM_bootUtil.o
-**   -> taskSpawn "bootUtil", 100, 8, 20000, SinqHM_bootUtil, <port>
-**								^
-**								|
-**   TCP/IP port number of the "bootUtil" service, dflt = 2300 -+
-**
-**====================================================================
-*/
-#include    "vxWorks.h"			/* always first */
-#include    "taskLib.h"
-#include    "sockLib.h"
-#include    "bootLib.h"
-#include    "rebootLib.h"
-#include    "sysLib.h"
-#include    "usrLib.h"
-#include    "ioLib.h"
-
-#ifdef MV2600
-#include "../config/mv2604/config.h"
-#else
-#if (CPU == PPC603)
-#include    "../config/mv1603/config.h"
-#elif (CPU == PPC604)
-#include    "../config/mv1604/config.h"
-#endif
-#endif
-
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <string.h>
-#include    <ctype.h>
-#include    <unistd.h>
-#include    <errno.h>
-#include    <netinet/in.h>
-#include    <arpa/inet.h>
-#include    <sys/types.h>
-#include    <sys/socket.h>
-/*
-**====================	Global Definitions =====================================
-*/
-
-#include    "SinqHM_def.h"
-
-#define	    MAX_ACTIONS	    8
-#define	    MAX_ARGS	   10
-#define	    SBU_PORT_DFLT  2300	/* The Dflt Internet Port for Server Requests */
-/*
-**====================	Global Variables =====================================
-*/
-    uint    Sbu_port;	    /* The port number to use for the service */
-    char    Sbu_name[20];   /* Our task name */
-/*
-**=============================================================================
-**  Local routine prototypes.
-*/
-    int		sbu_doConfig (int skt);
-    void	sbu_doReboot ();
-    void	sbu_failInet (char *text);
-    void	sbu_failInet_str (char *text, char *str);
-    void	sbu_getErrno (int *his_errno);
-    void	sbu_showHelp (char *errmsg);
-
-    char       *StrJoin (
-		    char    *result,
-		    int	     result_size,
-		    char    *str_a,
-		    char    *str_b);
-    int		sbu_doConfig (int skt);
-/*
-**--------------------------------------------------------------------------*/
-  int	sbu_doConfig (int skt) {
-/*	============
-**			Configure the vxWorks boot information
-*/
-    char	    hdr_buff[8], *p_addr, recd[1024];
-    int		    status, i, j, l_recd, bytes_to_come, toklen, changed;
-    char	   *boot_line_addr, *b_status, *tok, *body;
-    BOOT_PARAMS	    my_boot_params;
-
-	    /*----------------------------------------
-	    ** Get the new boot information over the network.
-	    **
-	    ** Get first 4 bytes which gives the length to follow
-	    */
-    status = recv (skt, hdr_buff, 4, 0);
-    if (status != 4) sbu_failInet ("recv error on bootline header.\n");
-
-    i = sscanf (hdr_buff, "%4d%n", &l_recd, &j);	/* Convert to binary */
-    if ((i != 1) || (j != 4)) {
-      sprintf (recd, "Header bytes are not ASCII coded decimal: 0x%x 0x%x 0x%x 0x%x\n",
-		    hdr_buff[0], hdr_buff[1], hdr_buff[2], hdr_buff[3]);
-      sbu_failInet (recd);
-    }
-
-    if (l_recd >= sizeof (recd)) {
-      sprintf (recd, "Too long for buffer. Buffer length = %d\n", l_recd);
-      sbu_failInet (recd);
-    }
-
-    bytes_to_come = l_recd;
-    p_addr = recd;
-
-    while (bytes_to_come > 0) {
-      status = recv (skt, p_addr, bytes_to_come, 0);
-      if (status <= 0) break;
-      bytes_to_come -= status;
-      p_addr += status;
-    }
-    if (bytes_to_come != 0) {
-      if (status < 0) {
-	sbu_failInet ("R/W-Socket recv error");
-      }else if (status == 0) {
-	sbu_failInet ("R/W-Socket recv error -- return code = 0");
-      }
-      sbu_failInet ("R/W-Socket recv error -- not enough data received");
-    }
-		    /*
-		    ** Initialise the boot line structure with the existing
-		    ** contents of the boot line.
-		    */
-    boot_line_addr = (char *) BOOT_LINE_ADRS; /* Get pointer to the boot line */
-    b_status = bootStringToStruct (boot_line_addr, &my_boot_params);
-    if (*b_status != EOS) {
-      printf ("\n%s: Bad status from \"bootStringToStruct\": 0x%02x\n",
-			Sbu_name, *b_status);
-      return False;
-    }
-		    /*
-		    ** Now scan through the new boot string replacing items in
-		    ** the boot line structure as we find them.
-		    */
-    printf ("\nNew boot-line items are:\n");
-    changed = False;
-    tok = strtok (recd, ":\n");
-    while (tok != NULL) {
-      toklen = strlen (tok);
-      if (tok[toklen+1] == '\n') {	/* Watch out for tokens with no body */
-	tok = strtok (NULL, ":\n");	/* Skip an empty body */
-      }else {
-	body = strtok (NULL, "\n");
-	if ((strcmp (tok, "bootDev") == 0) && (body != NULL)) {
-	  if (strcmp (my_boot_params.bootDev, body) != 0) {
-	    changed = True;
-	    printf (" boot device          : %s\n", body);
-	    strcpy (my_boot_params.bootDev, body);
-	  }
-	}else if ((strcmp (tok, "procNum") == 0) && (body != NULL)) {
-	  status = sscanf (body, "%i%n", &i, &j);
-	  if ((status != 1) || (j != strlen (body))) {
-	    printf ("\n%s: Bad value found for procNum: \"%s\"\n", Sbu_name, body);
-	    return False;
-	  }
-	  if (my_boot_params.procNum != i) {
-	    changed = True;
-	    printf (" processor number     : %s\n", body);
-	    my_boot_params.procNum = i;
-	  }
-	}else if ((strcmp (tok, "hostName") == 0) && (body != NULL)) {
-	  if (strcmp (my_boot_params.hostName, body) != 0) {
-	    changed = True;
-	    printf (" host name            : %s\n", body);
-	    strcpy (my_boot_params.hostName, body);
-	  }
-	}else if ((strcmp (tok, "bootFile") == 0) && (body != NULL)) {
-	  if (strcmp (my_boot_params.bootFile, body) != 0) {
-	    changed = True;
-	    printf (" file name            : %s\n", body);
-	    strcpy (my_boot_params.bootFile, body);
-	  }
-	}else if ((strcmp (tok, "ead") == 0) && (body != NULL)) {
-	  if (strcmp (my_boot_params.ead, body) != 0) {
-	    changed = True;
-	    printf (" inet on ethernet (e) : %s\n", body);
-	    strcpy (my_boot_params.ead, body);
-	  }
-	}else if ((strcmp (tok, "bad") == 0) && (body != NULL)) {
-	  if (strcmp (my_boot_params.bad, body) != 0) {
-	    changed = True;
-	    printf (" inet on backplane (b): %s\n", body);
-	    strcpy (my_boot_params.bad, body);
-	  }
-	}else if ((strcmp (tok, "had") == 0) && (body != NULL)) {
-	  if (strcmp (my_boot_params.had, body) != 0) {
-	    changed = True;
-	    printf (" host inet (h)        : %s\n", body);
-	    strcpy (my_boot_params.had, body);
-	  }
-	}else if ((strcmp (tok, "gad") == 0) && (body != NULL)) {
-	  if (strcmp (my_boot_params.gad, body) != 0) {
-	    changed = True;
-	    printf (" gateway inet (g)     : %s\n", body);
-	    strcpy (my_boot_params.gad, body);
-	  }
-	}else if ((strcmp (tok, "usr") == 0) && (body != NULL)) {
-	  if (strcmp (my_boot_params.usr, body) != 0) {
-	    changed = True;
-	    printf (" user (u)             : %s\n", body);
-	    strcpy (my_boot_params.usr, body);
-	  }
-	}else if ((strcmp (tok, "passwd") == 0) && (body != NULL)) {
-	  if (strcmp (my_boot_params.passwd, body) != 0) {
-	    changed = True;
-	    printf (" ftp password (pw)    : %s\n", body);
-	    strcpy (my_boot_params.passwd, body);
-	  }
-	}else if ((strcmp (tok, "flags") == 0) && (body != NULL)) {
-	  status = sscanf (body, "%i%n", &i, &j);
-	  if ((status != 1) || (j != strlen (body))) {
-	    printf ("\n%s: Bad value found for flags: \"%s\"\n", Sbu_name, body);
-	    return False;
-	  }
-	  if (my_boot_params.flags != i) {
-	    changed = True;
-	    printf (" flags (f)            : %s\n", body);
-	    my_boot_params.flags = i;
-	  }
-	}else if ((strcmp (tok, "targetName") == 0) && (body != NULL)) {
-	  if (strcmp (my_boot_params.targetName, body) != 0) {
-	    changed = True;
-	    printf (" target name (tn)     : %s\n", body);
-	    strcpy (my_boot_params.targetName, body);
-	  }
-	}else if ((strcmp (tok, "startupScript") == 0) && (body != NULL)) {
-	  if (strcmp (my_boot_params.startupScript, body) != 0) {
-	    changed = True;
-	    printf (" startup script (s)   : %s\n", body);
-	    strcpy (my_boot_params.startupScript, body);
-	  }
-	}else if ((strcmp (tok, "other") == 0) && (body != NULL)) {
-	  if (strcmp (my_boot_params.other, body) != 0) {
-	    changed = True;
-	    printf (" other (o)            : %s\n", body);
-	    strcpy (my_boot_params.other, body);
-	  }
-	}else {
-	  if (body != NULL) {
-	    printf ("\n%s: Bad token found in new boot string: \"%s\" \"%s\"\n",
-		Sbu_name, tok, body);
-	  }else {
-	    printf ("\n%s: Token found with NULL body in new boot string: \"%s\"\n",
-		Sbu_name, tok);
-	  }
-	  printf ("\n%s: Boot string has not been re-configured!\n", Sbu_name);
-	  return False;
-	}
-	tok = strtok (NULL, ":");
-      }
-    }
-    if (!changed) printf (" Nothing has been changed!\n");
-
-    status = bootStructToString (boot_line_addr, &my_boot_params);
-    if (status != OK) {
-      printf ("\n%s: Bad status from \"bootStringToStruct\": 0x%02x\n", Sbu_name,
-			status);
-      return False;
-    }
-    b_status = bootStringToStruct (boot_line_addr, &my_boot_params);
-    if (*b_status != EOS) {
-      printf ("\n%s: Bad status from \"bootStringToStruct\": 0x%02x\n",
-		Sbu_name, *b_status);
-      return False;
-    }
-    printf ("\nResulting vxWorks Boot-Line is:\n"
-	      "          =================\n");
-
-    printf (" boot device          : %s\n", my_boot_params.bootDev);
-    printf (" processor number     : %d\n", my_boot_params.procNum);
-    printf (" host name            : %s\n", my_boot_params.hostName);
-    printf (" file name            : %s\n", my_boot_params.bootFile);
-    printf (" inet on ethernet (e) : %s\n", my_boot_params.ead);
-    printf (" inet on backplane (b): %s\n", my_boot_params.bad);
-    printf (" host inet (h)        : %s\n", my_boot_params.had);
-    printf (" gateway inet (g)     : %s\n", my_boot_params.gad);
-    printf (" user (u)             : %s\n", my_boot_params.usr);
-    printf (" ftp password (pw)    : %s\n", my_boot_params.passwd);
-    printf (" flags (f)            : 0x%x\n", my_boot_params.flags);
-    printf (" target name (tn)     : %s\n", my_boot_params.targetName);
-    printf (" startup script (s)   : %s\n", my_boot_params.startupScript);
-    printf (" other (o)            : %s\n\n", my_boot_params.other);
-		/*
-		** Write to non-volatile RAM
-		*/
-    status = sysNvRamSet (BOOT_LINE_ADRS, strlen (BOOT_LINE_ADRS) + 1, 0);
-    if (status != OK) {
-      printf ("\n%s: Bad status from \"sysNvRamSet\": 0x%02x\n",
-		Sbu_name, status);
-      return False;
-    }
-    return True;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void	sbu_doReboot () {
-/*	============
-**		    Re-boot the vxWorks system by calling reboot.
-*/
-    printf ("This processor is about to be re-booted ...\n");
-    taskDelay (sysClkRateGet ()/4);
-    reboot (BOOT_CLEAR);
-    exit (EXIT_SUCCESS);    /* Should not get here! */
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void sbu_failInet (char *text) {
-/*     =============
-**		    Output the given text and exit the process.
-*/
-    int    my_errno;
-
-    sbu_getErrno (&my_errno);
-    printf ("\n### Internet Error ###\n");
-    printf (  "                   ### errno = %d.\n", my_errno);
-    perror (text);
-    exit (EXIT_FAILURE);
-  }
-/*--------------------------------------------------------------------------*/
-  void sbu_failInet_str (char *fmt, char *str) {
-/*     ================
-**			    Call to failInet with an extra parameter.
-*/
-    char    my_buff[132];
-
-    sprintf (my_buff, fmt, str);
-    sbu_failInet (my_buff);
-    /* No return */
-  }
-/*--------------------------------------------------------------------------*/
-  void	sbu_getErrno (int *his_errno) {
-/*      =============
-*/
-    *his_errno = errno;	    /* Make copy of errno   */
-    return;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void	sbu_showHelp (char *errmsg) {
-/*      =============
-*/
-    if (errmsg != NULL) {
-      printf ("\007\n%s\n", errmsg);
-      taskDelay (5 * sysClkRateGet ());	    /* Give user time to read message */
-    }
-    printf ("\n"
- "The \"other\" field may be specified as follows:\n"
- "\n"
- "        <action>=<arg0>,..,<argn>/<action>=...\n"
- "\n"
- "There must be no white space characters in the string. The string may\n"
- "be specified in upper or lower case.\n"
- "\n"
- "<action> may be \"sp\"  for \"spawn a task\" or\n"
- "                \"cfg\" for \"configure SinqHM_srv\"\n"
- "\n"
- "The following \"sp\" commands are available:\n"
- "\n"
- "  a)        sp=SinqHM,<port>,<use-lev-gen>,<VMIO10-base>\n"
- "     where\n"
- "          <port>        = TCP/IP port number for server. Dflt=2400.\n"
- "          <use-lev-gen> = flag to indicate if timing levels should be\n"
- "                            generated via a VMIO10 module. If non-zero,\n"
- "                            timing levels are generated. Dflt=0.\n"
- "          <VMIO10-base> = base address of VMIO10 level-generator\n"
- "                            module. Dflt=0x1900.\n"
- "     This action spawns the SinqHM histogram memory server task.\n"
- "\n"
- "  b)        sp=lwl,<port>,<VMIO10-base>,<verbosity>\n"
- "     where\n"
- "          <port>        = TCP/IP port number for server. Dflt=3501.\n"
- "          <VMIO10-base> = base address of VMIO10 test-generator\n"
- "                            module. Dflt=0x1800.\n"
- "          <verbosity>   = verbosity flag. If non-zero, the program is\n"
- "                            verbose. Dflt=0.\n"
- "     This action spawns the lwl_server task which can be used to feed\n"
- "     data packets into the hist memory fibre-optic (Licht-Wellen-Leiter)\n"
- "     link via a VMIO10 test-generator. If the test generator is absent,\n"
- "     the action can be omitted to avoid a boot-time error message.\n"
- "\n"
- "The following \"cfg\" commands are available:\n"
- "\n"
- "  a)        cfg=HM_DIG,<#-bins>,<#-hists>,<bin-width>,<compress>,<lo-bin>\n"
- "     where\n"
- "          <#-bins>    = number of bins per histogram. No default.\n"
- "          <#-hists>   = number of defined histograms. Dflt=1.\n"
- "          <bin-width> = Number of bytes per bin. Dflt=4.\n"
- "          <compress>  = Bin compression factor. Dflt=1.\n"
- "          <lo-bin>    = First bin. Dflt=0.\n"
- "\n"
- "  b)        cfg=TOF,<#-bins>,<#-cntrs>,<bin-width>,<compress>,<lo-cntr>\n"
- "     where\n"
- "          <#-bins>    = number of bins per histogram. No default.\n"
- "          <#-cntrs>   = number of neutron counters. No default.\n"
- "          <bin-width> = Number of bytes per bin. Dflt=4.\n"
- "          <compress>  = Bin compression factor. Dflt=1.\n"
- "          <lo-cntr>   = # of first counter. Dflt=0.\n"
- "\n"
- "  c)        cfg=HM_PSD,... same arguments as HM_DIG (for now).\n"
- "\n"
- "For example:\n"
- "       other=\"sp=SinqHM/cfg=HM_DIG,400\"\n"
- "\n");
-  }
-/*
-**==============================================================================
-**
-**  Main line program
-**
-**============================================================================*/
-
-  int    SinqHM_bootUtil (int port, int arg2, int arg3, int arg4,
-/*	 ===============
-*/			  int arg5, int arg6, int arg7, int arg8, int arg9,
-			  int suspend) {
-/*
-**  Arguments:
-**	port	    the TCP/IP port number to use. If 0, use default.
-**	suspend	    sunspend ourself immediately if non-zero.
-*/
-    char	       *local_mem, boot_line[1024], buff[128], cmnd[8];
-    char	       *my_task_name;
-    BOOT_PARAMS		my_params;
-
-    int			status, keep_going, cl_port, my_errno, bl_len;
-    char	       *b_status, *p_host;
-
-    int			my_skt;		/* Connection socket */
-    int			rw_skt;		/* Read/write socket */
-    struct sockaddr_in	lcl_sockname;
-    struct sockaddr_in	rmt_sockname;
-    int			rmt_sockname_len;
-/*============================================================================
-*/
-    my_task_name = taskName (taskIdSelf());
-    if (suspend != 0) {
-      printf ("\n%s: Suspending ...\n", my_task_name);
-      taskSuspend (0);	    /* We've been told to suspend ourself, ..
-			    **  .. presumably for debug reasons.
-			    */
-      printf ("\n%s:   ... suspension ended!\n", my_task_name);
-    }
-/*============================================================================
-**	Perform the initialisation of variables ...
-*/
-    StrJoin (Sbu_name, sizeof (Sbu_name), taskName (taskIdSelf ()), "");
-    printf ("\n%s: Started -- program ident = \"%s\".\n", Sbu_name, IDENT);
-
-    local_mem = (char *) BOOT_LINE_ADRS;    /* Get pointer to the boot line */
-/*============================================================================
-*/
-    b_status = bootStringToStruct (local_mem, &my_params);    /* Parse boot line */
-    if (*b_status != EOS) {
-      printf ("\n%s: Bad status from \"bootStringToStruct\": 0x%02x\n",
-		Sbu_name, *b_status);
-      return False;
-    }
-
-    Sbu_port = SBU_PORT_DFLT;
-    if ((port >= 128) && (port < 32768)) Sbu_port = port;
-
-/*============================================================================
-**	Create a TCP/IP socket for receiving connection requests, bind it and
-**	set it to listen.
-*/
-    my_skt = socket (AF_INET, SOCK_STREAM, 0);
-    if (my_skt == -1)
-      sbu_failInet_str ("\n%s: socket error", Sbu_name);
-    lcl_sockname.sin_family = AF_INET;
-    lcl_sockname.sin_port   = htons (Sbu_port);
-    lcl_sockname.sin_addr.s_addr = 0;
-    status = bind (my_skt, (struct sockaddr *) &lcl_sockname,
-					  sizeof (lcl_sockname));
-    if (status != 0) sbu_failInet_str ("\n%s: bind error", Sbu_name);
-
-    status = listen (my_skt, 5);
-    if (status != 0) sbu_failInet_str ("\n%s: listen error", Sbu_name);
-
-/*
-**	    Clients must now connect to us.
-**
-**	    When a connection arrives, the boot line is sent to the client.
-*/
-    printf ("\n%s: waiting for connections on Port %d\n", Sbu_name, Sbu_port);
-    keep_going = True;
-    while (keep_going) {
-      rmt_sockname_len = sizeof (rmt_sockname);
-      rw_skt = accept (my_skt, (struct sockaddr *) &rmt_sockname,
-			    &rmt_sockname_len);
-      if (rw_skt == -1) {
-	sbu_getErrno (&my_errno);
-	sbu_failInet_str ("\n%s: accept error", Sbu_name);
-	/* No return */
-      }
-      p_host = inet_ntoa (rmt_sockname.sin_addr);
-      cl_port = ntohs (rmt_sockname.sin_port);
-
-      b_status = bootStringToStruct (local_mem, &my_params); /* Parse boot line */
-      if (*b_status != EOS) {
-	printf ("\n%s: Bad status from \"bootStringToStruct\": 0x%02x\n", Sbu_name,
-		*b_status);
-	return False;
-      }
-      StrJoin (boot_line, sizeof (boot_line), "bootDev:", my_params.bootDev);
-      StrJoin (boot_line, sizeof (boot_line), boot_line, "\nprocNum:");
-      sprintf (buff, "%d", my_params.procNum);
-      StrJoin (boot_line, sizeof (boot_line), boot_line, buff);
-      StrJoin (boot_line, sizeof (boot_line), boot_line, "\nhostName:");
-      StrJoin (boot_line, sizeof (boot_line), boot_line, my_params.hostName);
-      StrJoin (boot_line, sizeof (boot_line), boot_line, "\nbootFile:");
-      StrJoin (boot_line, sizeof (boot_line), boot_line, my_params.bootFile);
-      StrJoin (boot_line, sizeof (boot_line), boot_line, "\nead:");
-      StrJoin (boot_line, sizeof (boot_line), boot_line, my_params.ead);
-      StrJoin (boot_line, sizeof (boot_line), boot_line, "\nbad:");
-      StrJoin (boot_line, sizeof (boot_line), boot_line, my_params.bad);
-      StrJoin (boot_line, sizeof (boot_line), boot_line, "\nhad:");
-      StrJoin (boot_line, sizeof (boot_line), boot_line, my_params.had);
-      StrJoin (boot_line, sizeof (boot_line), boot_line, "\ngad:");
-      StrJoin (boot_line, sizeof (boot_line), boot_line, my_params.gad);
-      StrJoin (boot_line, sizeof (boot_line), boot_line, "\nusr:");
-      StrJoin (boot_line, sizeof (boot_line), boot_line, my_params.usr);
-      StrJoin (boot_line, sizeof (boot_line), boot_line, "\npasswd:");
-      StrJoin (boot_line, sizeof (boot_line), boot_line, my_params.passwd);
-      StrJoin (boot_line, sizeof (boot_line), boot_line, "\nflags:");
-      sprintf (buff, "0x%x", my_params.flags);
-      StrJoin (boot_line, sizeof (boot_line), boot_line, buff);
-      StrJoin (boot_line, sizeof (boot_line), boot_line, "\ntargetName:");
-      StrJoin (boot_line, sizeof (boot_line), boot_line, my_params.targetName);
-      StrJoin (boot_line, sizeof (boot_line), boot_line, "\nstartupScript:");
-      StrJoin (boot_line, sizeof (boot_line), boot_line, my_params.startupScript);
-      StrJoin (boot_line, sizeof (boot_line), boot_line, "\nother:");
-      StrJoin (boot_line, sizeof (boot_line), boot_line, my_params.other);
-
-      bl_len = strlen (boot_line) + 1;	/* Get len of line (including term'r) */
-      bl_len = (bl_len + 3) & (~3);	/* Round up to a multiple of 4 */
-      sprintf (buff, "%04.4d", bl_len);
-      status = send (rw_skt, buff, 4, 0);
-      if (status != 4) {
-	sbu_getErrno (&my_errno);
-	sbu_failInet_str ("\n%s: send error on boot-line header", Sbu_name);
-	/* No return */
-      }
-      status = send (rw_skt, boot_line, bl_len, 0);
-      if (status != bl_len) {
-	sbu_getErrno (&my_errno);
-	sbu_failInet_str ("\n%s: send error on boot-line body", Sbu_name);
-	/* No return */
-      }
-	    /*
-	    ** Now get a command from the client
-	    */
-      status = recv (rw_skt, cmnd, 8, 0);
-      if (status != 8) {
-	sbu_getErrno (&my_errno);
-	sprintf (buff, "\n%s: send error on boot-line body", Sbu_name);
-	perror (buff);
-      }else if (strcmp (cmnd, "CLOSE") == 0) {
-	send (rw_skt, "OK\0\0", 4, 0);	/* Acknowledge the command */
-      }else if (strcmp (cmnd, "CONFIG") == 0) {
-	printf ("\n%s: CONFIG command received from Host %s, Port %d ...\n",
-				    Sbu_name, p_host, cl_port);
-	status = sbu_doConfig (rw_skt);
-	if (status) {
-	  send (rw_skt, "OK\0\0", 4, 0);
-	}else {
-	  send (rw_skt, "Err", 4, 0);
-	}
-      }else if (strcmp (cmnd, "REBOOT") == 0) {
-	printf ("\n%s: REBOOT command received from Host %s, Port %d ...\n",
-				    Sbu_name, p_host, cl_port);
-	send (rw_skt, "OK\0\0", 4, 0);	/* Acknowledge the command */
-	status = close (rw_skt);
-	status = close (my_skt);
-	sbu_doReboot ();	    /* There is no return from this call! */
-      }else if (strcmp (cmnd, "RUNDOWN") == 0) {
-	printf ("\n%s: RUNDOWN command received from Host %s, Port %d ...\n",
-				    Sbu_name, p_host, cl_port);
-	send (rw_skt, "OK\0\0", 4, 0);	/* Acknowledge the command */
-	keep_going = False;
-      }else {
-	printf ("\n%s: unrecognised command received from Host %s, Port %d:"
-			"\"%s\"\n", Sbu_name, p_host, cl_port, cmnd);
-	send (rw_skt, "Err", 4, 0);
-      }
-      status = close (rw_skt);
-    }
-    status = close (my_skt);
-
-    return True;
-  }
-/*================================= End of SinqHM_bootUtil.c ========*/
diff --git a/sinqhm/SinqHM_def.h b/sinqhm/SinqHM_def.h
deleted file mode 100755
index b7860eb9..00000000
--- a/sinqhm/SinqHM_def.h
+++ /dev/null
@@ -1,493 +0,0 @@
-/*=================================================== [...SinqHM]SinqHM_def.h
-**
-**	Definition Include file for SinqHM_SRV and its clients.
-**
-**------------------------------------------------------------------------------
-*/
-#define	    SINQHM_DEF_ID	"V03C"
-
-#ifdef __alpha
-#ifndef __vms
-#pragma	    pack  1
-#endif
-#endif
-/*------------------------------------------------------------------------------
-*/
-#ifndef OffsetOf
-#define OffsetOf(type, identifier)  ((size_t)(&((type*) NULL)->identifier))
-#endif
-/*------------------------------------------------------------------------------
-**                      Define some defaults.
-*/
-#define PORT_BASE	2400	/* The Internet Port for Server Requests    */
-#define	MAX_CLIENTS	8	/* The maximum number of active clients   */
-#define MAX_TOF_CNTR	32768	/* The maximum number of individual counters ..
-				** which can be handled in TOF mode */
-#define MAX_PSD_CNTR    16777217 /* maximum number of PSD elements */
-#define MAX_PSD_ED      3       /* maximum number of additional
-                                   single detectors at AMOR
-				*/
-#define MAX_TOF_NBINS	32768	/* The maximum number of bins in a TOF histog */
-#define MAX_TOF_EDGE	16	/* The maximum number of TOF edge arrays */
-#define VMIO_BASE_ADDR	0x1900	/* VME address of a (possible) VMIO10 module */
-#define	IDENT_MSGE_LEN	256	/* Length of Ident info for SQHM_IDENT */
-
-#define	    uchar   unsigned char
-#define	    usint   unsigned short int
-#define	    uint    unsigned int
-/*------------------------------------------------------------------------------
-**                      Define some status values (similar to VAXeln).
-*/
-#define KER__SUCCESS	  1
-#define KER__BAD_CREATE	 -2
-#define KER__BAD_STATE	 -4
-#define KER__BAD_VALUE	 -6
-#define KER__EXIT_SIGNAL -10
-#define KER__BAD_RECV	 -14
-#define KER__BAD_ALLOC	 -16
-
-#ifndef True
-#define	True	1
-#endif
-
-#ifndef False
-#define	False	0
-#endif
-
-#ifndef NIL
-#define	NIL	'\0'
-#endif
-/*------------------------------------------------------------------------------
-**                      Define command verbs to SinqHM.
-*/
-#define SQHM_CNCT	0x01
-#define SQHM_CLOSE	0x02
-#define SQHM_CONFIG	0x03
-#define SQHM_DAQ	0x04
-#define SQHM_DBG	0x05
-#define SQHM_DECONFIG	0x06
-#define SQHM_EXIT	0x07
-#define SQHM_IDENT	0x0e
-#define SQHM_PROJECT	0x0d
-#define SQHM_READ	0x08
-#define SQHM_SELECT	0x09
-#define SQHM_STATUS	0x0a
-#define SQHM_WRITE	0x0b
-#define SQHM_ZERO	0x0c
-	    /*
-	    ** Define the various operation modes
-	    */
-#define SQHM__TRANS	0x1000	/* Transparent mode */
-#define SQHM__HM_DIG	0x2000	/* Hist mode (with digitised read-out) */
-#define SQHM__TOF	0x3000	/* Time-of-Flight mode */
-#define SQHM__HM_PSD	0x4000	/* Hist mode (with Pos-sens-detect read-out) */
-#define SQHM__HRPT	0x5000	/* Hist mode for HRPT */
-	    /*
-	    ** Define the various sub-mode bits of the operation modes
-	    */
-#define SQHM__SUB_MODE_MSK 0xff	/* Mask for extracting "sub-mode" bits */
-#define SQHM__DEBUG	0x01	/* Debug flag - FILLER will suspend itself ..
-				** .. after starting to allow debugging */
-#define SQHM__UD	0x02	/* Use Up/Down bit information */
-
-#define SQHM__BO_MSK	0x18	/* Mask for extracting "bin-overflow" bits */
-#define SQHM__BO_IGN	0x00	/* Ignore bin-overflows (bin-contents wrap) */
-#define SQHM__BO_SMAX	0x08	/* On bin-overflow, stop at maximum */
-#define SQHM__BO_CNT	0x10	/* Keep counts of overflow bins */
-
-#define SQHM__STROBO	0x20	/* Use strobo-bit information */
-#define SQHM__REFLECT	0x40	/* Reflect histograms */
-#define SQHM__NO_STAT	0x80	/* Suppress status info from "Filler" */
-	    /*
-	    ** ----------------------------------------------------------
-	    **		    SQHM_DAQ sub-function codes
-	    */
-#define DAQ__EXIT	0xffffffff
-#define DAQ__CLR	0x01
-#define DAQ__GO		0x02
-#define DAQ__INH	0x03
-#define DAQ__STOP	0x04
-#define DAQ__TST	0x05
-	    /*
-	    ** ----------------------------------------------------------
-	    **		    SQHM_PROJECT sub-codes
-	    */
-#define PROJECT__ON_Y	0x0001	/* Project onto y-axis */
-#define PROJECT__1_DIM	0x0002	/* Make projection of a 1-dim histogram */
-#define PROJECT__COLL   0x0003  /* collapse PSD on one time channel */
-#define PROJECT__SAMPLE 0x0004  /* sum a rectangular part of the PSD
-                                   detector in time
-				*/
-#define PROJECT__FRAME  0x0005  /* select a frame  from a 3D histogram:
-				   2 position dims plus time binning
-				*/
-	    /*
-	    ** ----------------------------------------------------------
-	    **		    Definition of bits in <flag> of TOF edge-array
-	    */
-#define FLAG__VAR_BIN	0x01	/* Bin span of histogram is variable */
-	    /*
-	    ** ----------------------------------------------------------
-	    **		  Definition of bits in <flags> of SQHM_STATUS response
-	    */
-#define STATUS_FLAGS__PF	0x8000	/* PF  - Power Fail */
-#define STATUS_FLAGS__SWC	0x4000	/* SWC - Status Word Changed */
-#define STATUS_FLAGS__NRL	0x2000	/* NRL - Neutron Rate Low */
-#define STATUS_FLAGS__DAQ	0x1000	/* DAQ on -- set if Hdr Mask Bits are
-				    ** correct so that data acq is active */
-#define STATUS_FLAGS__SYNC3	0x0800	/* Ext Synch Bit #3 */
-#define STATUS_FLAGS__SYNC2	0x0400	/* Ext Synch Bit #2 */
-#define STATUS_FLAGS__SYNC1	0x0200	/* Ext Synch Bit #1 */
-#define STATUS_FLAGS__SYNC0	0x0100	/* Ext Synch Bit #0 */
-#define STATUS_FLAGS__UD	0x0080	/* UD  - Up/Down */
-#define STATUS_FLAGS__GU	0x0040	/* GU  - Gummi (i.e. Strobo) */
-	    /*
-	    ** ----------------------------------------------------------
-	    */
-#define N_HISTS_MAX	64	    /* Maximum number of histograms supported */
-#define N_BINS_MAX	0x00ffff    /* Maximum histogram bin number permitted */
-#define N_TOTAL_BYTES	0x400000    /* Maximum total bytes of histogram */
-/*
-**------------------------------------------------------------------------------
-**				Definitions of Filler states in HRPT mode
-*/
-#define	HRPT__SRCH_FRAME    1
-#define	HRPT__READ_FRAME    2
-/*
-**------------------------------------------------------------------------------
-**				Definitions for the LWL Datagrams
-*/
-#define	LWL_HDR_TYPE_MASK   (0x1f000000)    /* Mask for extracting main dgrm ..
-					    ** .. hdr command-type bits */
-#define	LWL_HDR_PF_MASK	   (0x80000000)	/* Mask for extr Power Fail bit */
-#define	LWL_HDR_SWC_MASK   (0x40000000)	/* Mask for extr Status Word Chng bit */
-#define	LWL_HDR_NRL_MASK   (0x20000000)	/* Mask for extr Neutron Rate Low bit */
-#define LWL_HDR_SYNC3_MASK (0x00800000)	/* Mask for one of ext synch bits */
-#define LWL_HDR_SYNC2_MASK (0x00400000)	/* Mask for one of ext synch bits */
-#define LWL_HDR_SYNC1_MASK (0x00200000)	/* Mask for one of ext synch bits */
-#define LWL_HDR_SYNC0_MASK (0x00100000)	/* Mask for one of ext synch bits */
-#define	LWL_HDR_UD_MASK	   LWL_HDR_SYNC1_MASK /* Mask for Up/Down bit */
-#define	LWL_HDR_GU_MASK	   LWL_HDR_SYNC0_MASK /* Mask for GU bit */
-#define LWL_HDR_BA_MASK	   (0x00f00000)	/* Mask for TSI Binning Addr */
-#define LWL_HDR_TS_MASK	   (0x000fffff)	/* Mask for TSI Time Stamp */
-
-#define	LWL_FIFO_EMPTY	(0x1e000000)	/* FIFO Empty */
-
-#define	LWL_TSI_TR	(0x1f000000)  /* Time-Status-Info Transp-Mode */
-#define	LWL_TSI_HM_NC	(0x1f000000)  /* Time-Status-Info Hist-Mode+No-Coinc */
-#define	LWL_TSI_HM_C	(0x0e000000)  /* Time-Status-Info Hist-Mode+Coinc */
-#define	LWL_TSI_TOF	(0x1f000000)  /* Time-Status-Info TOF-Mode */
-#define	LWL_TSI_SM_NC   (0x1f000000)  /* Time-Status-Info Strobo-Mode+No-Coin */
-#define	LWL_TSI_SM_C	(0x0e000000)  /* Time-Status-Info Strobo-Mode+Coinc */
-#define LWL_TSI_DT_MSK	(0x000fffff)  /* Mask for Dead-Time in TSI */
-#define LWL_TSI_DTS_MSK	(0x000fffff)  /* Mask for Delay-Time-to-Start in TSI */
-
-#define	LWL_TR_C1	(0x00000001)	/* Transp. Mode Chan 1 */
-#define	LWL_TR_C2	(0x00000002)	/* Transp. Mode Chan 2 */
-#define	LWL_TR_C3	(0x00000003)	/* Transp. Mode Chan 3 */
-#define	LWL_TR_C4	(0x00000004)	/* Transp. Mode Chan 4 */
-#define	LWL_TR_C5	(0x00000005)	/* Transp. Mode Chan 5 */
-#define	LWL_TR_C6	(0x00000006)	/* Transp. Mode Chan 6 */
-#define	LWL_TR_C7	(0x00000007)	/* Transp. Mode Chan 7 */
-#define	LWL_TR_C8	(0x00000008)	/* Transp. Mode Chan 8 */
-#define	LWL_TR_C9	(0x00000009)	/* Transp. Mode Chan 9 */
-
-#define	LWL_HM_NC	(0x10000000)	/* Hist-Mode/No-Coinc 0 chan dgrm hdr */
-#define LWL_HM_NC_C1	(0x11000000)	/* Hist-Mode/No-Coinc 1 chan dgrm hdr */
-#define LWL_HM_NC_C2	(0x12000000)	/* Hist-Mode/No-Coinc 2 chan dgrm hdr */
-#define LWL_HM_NC_C3	(0x13000000)	/* Hist-Mode/No-Coinc 3 chan dgrm hdr */
-#define LWL_HM_NC_C4	(0x14000000)	/* Hist-Mode/No-Coinc 4 chan dgrm hdr */
-#define LWL_HM_NC_C5	(0x15000000)	/* Hist-Mode/No-Coinc 5 chan dgrm hdr */
-#define LWL_HM_NC_C6	(0x16000000)	/* Hist-Mode/No-Coinc 6 chan dgrm hdr */
-#define LWL_HM_NC_C7	(0x17000000)	/* Hist-Mode/No-Coinc 7 chan dgrm hdr */
-#define LWL_HM_NC_C8	(0x18000000)	/* Hist-Mode/No-Coinc 8 chan dgrm hdr */
-#define LWL_HM_NC_C9	(0x19000000)	/* Hist-Mode/No-Coinc 9 chan dgrm hdr */
-
-#define	LWL_HM_CO	(0x10000000)	/* Hist-Mode+Coinc 0 chan dgrm hdr */
-#define LWL_HM_CO_C2	(0x12000000)	/* Hist-Mode+Coinc 2 chan dgrm hdr */
-#define LWL_HM_CO_C3	(0x13000000)	/* Hist-Mode+Coinc 3 chan dgrm hdr */
-#define LWL_HM_CO_C4	(0x14000000)	/* Hist-Mode+Coinc 4 chan dgrm hdr */
-#define LWL_HM_CO_C5	(0x15000000)	/* Hist-Mode+Coinc 5 chan dgrm hdr */
-#define LWL_HM_CO_C6	(0x16000000)	/* Hist-Mode+Coinc 6 chan dgrm hdr */
-#define LWL_HM_CO_C7	(0x17000000)	/* Hist-Mode+Coinc 7 chan dgrm hdr */
-#define LWL_HM_CO_C8	(0x18000000)	/* Hist-Mode+Coinc 8 chan dgrm hdr */
-#define LWL_HM_CO_C9	(0x19000000)	/* Hist-Mode+Coinc 9 chan dgrm hdr */
-
-#define LWL_TOF_C1	(0x01000000)	/* TOF-Mode 1 chan dgrm hdr */
-#define LWL_TOF_C2	(0x02000000)	/* TOF-Mode 2 chan dgrm hdr */
-#define LWL_TOF_C3	(0x03000000)	/* TOF-Mode 3 chan dgrm hdr */
-#define LWL_TOF_C4	(0x04000000)	/* TOF-Mode 4 chan dgrm hdr */
-#define LWL_TOF_C5	(0x05000000)	/* TOF-Mode 5 chan dgrm hdr */
-#define LWL_TOF_C6	(0x06000000)	/* TOF-Mode 6 chan dgrm hdr */
-#define LWL_TOF_C7	(0x07000000)	/* TOF-Mode 7 chan dgrm hdr */
-#define LWL_TOF_C8	(0x08000000)	/* TOF-Mode 8 chan dgrm hdr */
-#define LWL_TOF_C9	(0x09000000)	/* TOF-Mode 9 chan dgrm hdr */
-
-#define LWL_GUMMI_MON   (0x14000000)    /* GUMMI-Mode Monitor datagram */
-
-#define LWL_PSD_TSI      0x0E000000     /* PSD-Mode TSI datagram */
-#define LWL_PSD_DATA     0x12000000     /* PSD-mode data datagram */ 
-#define LWL_PSD_ED       0x03000000     /* PSD-mode single detector datagram */
-#define LWL_PSD_PWF      0x20000000     /* PSD-mode Power Fail bit */
-#define LWL_PSD_TIME     0x000fffff     /* PSD-mode time stamp extraction
-                                           mask */
-#define LWL_PSD_FLASH_MASK 0x00ff       /* mask for flash count     */
-#define LWL_PSD_XORF       0x2000       /* mask for TDC-XORF bit */
-#define LWL_PSD_CONF       0x0100       /* mask for TDC-CONF flag */
-#define LWL_HDR_ED_MASK  0x1C000000     /* mask for extracting ds4-ds2 */
-
-#define	LWL_SM_NC	(0x10000000)  /* Strobo-Mode/No-Coinc 0 chan dgrm hdr */
-#define LWL_SM_NC_C1	(0x11000000)  /* Strobo-Mode/No-Coinc 1 chan dgrm hdr */
-#define LWL_SM_NC_C2	(0x12000000)  /* Strobo-Mode/No-Coinc 2 chan dgrm hdr */
-#define LWL_SM_NC_C3	(0x13000000)  /* Strobo-Mode/No-Coinc 3 chan dgrm hdr */
-#define LWL_SM_NC_C4	(0x14000000)  /* Strobo-Mode/No-Coinc 4 chan dgrm hdr */
-#define LWL_SM_NC_C5	(0x15000000)  /* Strobo-Mode/No-Coinc 5 chan dgrm hdr */
-#define LWL_SM_NC_C6	(0x16000000)  /* Strobo-Mode/No-Coinc 6 chan dgrm hdr */
-#define LWL_SM_NC_C7	(0x17000000)  /* Strobo-Mode/No-Coinc 7 chan dgrm hdr */
-#define LWL_SM_NC_C8	(0x18000000)  /* Strobo-Mode/No-Coinc 8 chan dgrm hdr */
-#define LWL_SM_NC_C9	(0x19000000)  /* Strobo-Mode/No-Coinc 9 chan dgrm hdr */
-
-#define	LWL_SM_CO	(0x10000000)  /* Strobo-Mode + Coinc 0 chan dgrm hdr */
-#define LWL_SM_CO_C1	(0x11000000)  /* Strobo-Mode + Coinc 1 chan dgrm hdr */
-#define LWL_SM_CO_C2	(0x12000000)  /* Strobo-Mode + Coinc 2 chan dgrm hdr */
-#define LWL_SM_CO_C3	(0x13000000)  /* Strobo-Mode + Coinc 3 chan dgrm hdr */
-#define LWL_SM_CO_C4	(0x14000000)  /* Strobo-Mode + Coinc 4 chan dgrm hdr */
-#define LWL_SM_CO_C5	(0x15000000)  /* Strobo-Mode + Coinc 5 chan dgrm hdr */
-#define LWL_SM_CO_C6	(0x16000000)  /* Strobo-Mode + Coinc 6 chan dgrm hdr */
-#define LWL_SM_CO_C7	(0x17000000)  /* Strobo-Mode + Coinc 7 chan dgrm hdr */
-#define LWL_SM_CO_C8	(0x18000000)  /* Strobo-Mode + Coinc 8 chan dgrm hdr */
-#define LWL_SM_CO_C9	(0x19000000)  /* Strobo-Mode + Coinc 9 chan dgrm hdr */
-
-#define LWL_TSI_MODE_MASK   (0x000e)	/* Mask for mode in Time Status Info */
-#define LWL_TSI_MODE_TR     (0x0000)	/* TSI Transparent-Mode */
-#define LWL_TSI_MODE_HM	    (0x0002)	/* TSI Hist-Mode */
-#define LWL_TSI_MODE_TOF    (0x0004)	/* TSI TOF-Mode */
-#define LWL_TSI_MODE_SM1    (0x0006)	/* TSI Strobo-Mode 1 - time-stamp coded */
-#define LWL_TSI_MODE_TR_UD  (0x0008)	/* TSI Transparent-Mode Up-Down */
-#define LWL_TSI_MODE_HM_UD  (0x000a)	/* TSI Hist-Mode Up-Down */
-#define LWL_TSI_MODE_TOF_UD (0x000c)	/* TSI TOF-Mode Up-Down */
-#define LWL_TSI_MODE_SM2    (0x000e)	/* TSI Strobo-Mode 2 - h/w coded */
-/*
-**------------------------------------------------------------------------------
-**				Define structure of a TOF histogram data item.
-*/
-    struct tof_histog {
-      int	cntr_nmbr;	/* Counter number */
-      uint	lo_edge;	/* Low edge of first bin (20-bit value) */
-      uint	hi_edge;	/* Top edge of last  bin (20-bit value) */
-      usint	flag;		/* Bit mask giving info on histog -- may be
-				** used to help optimise the code */
-      usint	bytes_per_bin;	/* Number of bytes in each histogram bin */
-      uint	n_bins;		/* Number of bins in histogram */
-      uint	cnt_early_up;	/* Count of early events (pol'n up) */
-      uint	cnt_late_up;	/* Count of late events (pol'n up) */
-      uint	cnt_early_down;	/* Count of early events (pol'n down) */
-      uint	cnt_late_down;	/* Count of late events (pol'n down) */
-      uint     *bin_edge;	/* Pointer to array of bin edges */
-      union {			/* Pointer to histogram array */
-        uchar	  *b_bin_data;	/*  .. pointer if it's  8-bit bins */
-        usint	  *w_bin_data;	/*  .. pointer if it's 16-bit bins */
-        uint	  *l_bin_data;	/*  .. pointer if it's 32-bit bins */
-      } u;
-    };
-
-/*		Define a TOF 'edge-info' structure. This structure is created
-**		as a result of a TOF 'edge-array' in a SQHM__TOF config cmnd.
-*/
-    struct tof_edge_info {
-      uint	n_bins;		/* Number of bins in histogram */
-      uint	flag;		/* Flag bits defining type of histo */
-      uint	bin_span;	/* Time spanned by a histogram bin (20-bit
-				**  value) if bin width is constant. Otherwise
-				**  it is zero. */
-      uint	hi_edge;	/* Top edge of last  bin (20-bit value) */
-      uint	edges[2];	/* Array of edge data (20-bit values). There
-				**  are actually (n_bins+1) items in the array
-				**  and give the bottom edges of the bin */
-    };
-
-/*		Define structure of a TOF 'edge-array' in SQHM__TOF config cmnd
-*/
-    struct tof_edge_arr {
-      uint	n_bins;		/* Number of bins in histogram */
-      uint	flag;		/* Flag (0/1) for fixed/variable bin size */
-      uint	edges[2];	/* Array of bottom edges (20-bit values) */
-    };
-
-/*		Define structure of a TOF 'bank' in SQHM__TOF config command
-*/
-    struct tof_bank {
-      usint	first;		/* Number of first counter in bank */
-      usint	n_cntrs;	/* Number of counters in bank */
-      usint	edge_indx;	/* Index of edge array */
-      usint	bytes_per_bin;	/* Number of bytes per bin */
-    };
-/*
-**------------------------------------------------------------------------------
-**				Define command structure.
-*/
-    struct req_buff_struct {			/* For messages to SinqHM */
-      uint		bigend;
-      uint		cmnd;
-      union {
-        char		filler[56];
-
-	struct {uint	max_pkt,
-			strt_mode;}	cnct;
-
-	struct {uint     mode;
-	  union {
-	    struct {
-	      uint   n_buffs;
-	      uint   n_bytes;
-	    } trans;
-	    struct {
-	      uint   n_hists;
-	      uint   lo_bin;
-	      uint   num_bins;
-	      uint   bytes_per_bin;
-	      uint   compress;
-	    } hm_dig;
-	    struct {
-	      uint	n_extra_bytes;
-	      usint	n_edges;
-	      usint	n_banks;
-	      uint	preset_delay;
-	      struct tof_edge_arr   edge_0;
-	      struct tof_bank	    bank_0;
-	    } tof;
-	    struct {
-	      uint	n_extra_bytes;
-	      usint	n_edges;
-	      usint	n_banks;
-	      uint	preset_delay;
-              usint       xFactor;
-              usint       yFactor;
-              usint       xOffset;
-              usint       yOffset;
-              usint       xSize;
-              usint       ySize;
-	      struct tof_edge_arr   edge_0;
-	      struct tof_bank	    bank_0;
-	    } psd;
-	  } u;
-	}				cnfg;
-
-	struct {uint	mask;}		dbg;
-
-	struct {uint	sub_code;}	decnfg;
-
-	struct {uint	sub_cmnd;}	daq;
-
-	struct {uint	sub_code, 
-			x_lo,
-			nx,
-			y_lo,
-			ny,
-			xdim,
-			nhist;}		project;
-
-	struct {uint	hist_no,
-			first_bin,
-			n_bins;}	read;
-
-	struct {uint	hist_no;}	select;
-
-	struct {uint	hist_no,
-			first_bin,
-			n_bins,
-			bytes_per_bin;}	write;
-
-	struct {uint	hist_no,
-			first_bin,
-			n_bins;}	zero;
-      } u;
-    };
-/*
-**------------------------------------------------------------------------------
-**				Define status response structure.
-*/
-    struct rply_buff_struct {	    /* For messages from SinqHM */
-      uint		bigend;
-      uint		status;
-      uint		sub_status;
-      union {
-        char		    message[52];
-
-	struct {uint	    port;
-		uint	    pkt_size;
-		uint	    hm_mode;
-		uint	    n_hists;
-		uint	    num_bins;
-		uint	    bytes_per_bin;
-		uint	    curr_hist;
-		uint	    max_block;
-		uint	    total_bytes;
-		uint	    lo_cntr;
-		uint	    lo_bin;
-		uint	    compress;
-		uint	    up_time;}		cnct;
-
-	struct {usint   daq_now;
-		usint   daq_was;
-		usint   filler_mask;
-		usint   server_mask;}	daq;
-
-	struct {uint	n_extra_bytes;
-		uint	up_time;
-		usint	offset_vxWorks_ident;
-		usint	offset_vxWorks_date;
-		usint	offset_instr;
-		usint	offset_def_ident;
-		usint	offset_sinqhm_main_ident;
-		usint	offset_sinqhm_main_date;
-		usint	offset_sinqhm_server_ident;
-		usint	offset_sinqhm_server_date;
-		usint	offset_sinqhm_filler_ident;
-		usint	offset_sinqhm_filler_date;
-		usint	offset_sinqhm_routines_ident;
-		usint	offset_sinqhm_routines_date;}	ident;
-
-	struct {uint	    n_bins;
-		uint	    bytes_per_bin;
-		uint	    cnts_lo;
-		uint	    cnts_hi;}		project;
-
-	struct {uint	    first_bin;
-		uint	    n_bins;
-		uint	    bytes_per_bin;
-		uint	    cnts_lo;
-		uint	    cnts_hi;}		read;
-
-	struct {uint	    cfg_state;
-		usint	    n_hists, curr_hist;
-		uint	    num_bins;
-		uint	    max_n_hists;
-		uint	    max_num_bins;
-		uchar	    max_srvrs, act_srvrs, bytes_per_bin, compress;
-		usint	    daq_now, filler_mask;
-		uint	    max_block;
-		usint	    tsi_status, flags;
-		union {
-		  uint	    dead_time;
-		  uint	    dts;
-		  uint	    both;
-			}   dt_or_dts;
-		uint	    num_bad_events;
-		uint	    up_time;}		status;
-      } u;
-    };
-/*
-**------------------------------------------------------------------------------
-**				Define structure of message to SinqHM-filler.
-*/
-    struct msg_to_filler_struct {	/* For messages to SinqHM-filler */
-      union {
-        char		    message[32];   /* Ensure buffer is 32 bytes total */
-	struct {
-	    uint	cmnd;
-	    uint	index;
-	    usint	new_mask;} uu;
-      } u;
-    };
-/*======================================================= End of SinqHM_def.h */
diff --git a/sinqhm/SinqHM_gbl.h b/sinqhm/SinqHM_gbl.h
deleted file mode 100755
index 3e0436d3..00000000
--- a/sinqhm/SinqHM_gbl.h
+++ /dev/null
@@ -1,351 +0,0 @@
-/*======================================= [...SinqHM]SinqHM_gbl.h - Ident V01N
-**
-**	Include file of Gbl Variables for SinqHM_srv and its children.
-*/
-
-#ifndef	uint
-#define	    uint    unsigned int
-#endif
-
-#ifndef	usint
-#define	    usint    unsigned short int
-#endif
-
-#ifndef	uchar
-#define	    uchar    unsigned char
-#endif
-/*
-**====================	Global Variables ======================================
-** Note:
-**	On VxWorks, all these global variables are visible by all tasks.
-**	Any changes to them should therefore only be done if protected
-**	by a semaphore.
-**
-**	At present, only the parent process changes these variables in a
-**	'significant' way (I don't count updating diagnostic counters such
-**	as Rw_bytes_got!).
-*/
-    int		My_errno;
-    int		Cnt_SIGUSR1;
-    char	Inet_host[32];
-    char	Inet_addr[20];
-
-    int	     Dbg_mask;		    /* This is the log'l or of Dbg_lev0, etc */
-    int	     Dbg_lev0, Dbg_lev1, Dbg_lev2, Dbg_lev3;
-
-    int	     Cfgn_done;		/* == 0 if SinqHM_srv not configured */
-  /*
-  **		The buffer for holding Hist Mem data is pointed to
-  **		by Hist_base_addr.
-  */
-    void    *Hist_base_addr;
-  /*
-  ** The MEN board has a divided memory architecture: below 32 MB everything
-  ** is normal. The area above has to be allocated in a separate memory 
-  ** partition with the partition number stored in sysHighMemPart. This
-  ** now is a flag which determines if Hist_base_addr has been allocated in 
-  ** such a way in order to be able to free it properly again. 
-  **/
-  int Hist_base_MEN_alloc;
-
-  /*
-  **		The buffer for holding a frame of data for CERCA type
-  **		interfaces (e.g. HRPT) is pointed to by Frame_base_addr.
-  */
-    void    *Frame_base_addr;
-
-    uint	Hm_mode_ALL;	 /* The "total" mode of the histogram memory */
-    uint	Hm_mode;	 /* The basic mode of the histogram memory */
-    uint	Hm_mode_DEBUG;	 /* The SQHM__DEBUG   bit  of Hm_mode_ALL */
-    uint	Hm_mode_UD;	 /* The SQHM__UD      bit  of Hm_mode_ALL */
-    uint	Hm_mode_BO;	 /* The SQHM__BO      bits of Hm_mode_ALL */
-    uint	Hm_mode_STROBO;	 /* The SQHM__STROBO  bit  of Hm_mode_ALL */
-    uint	Hm_mode_REFLECT; /* The SQHM__REFLECT bit  of Hm_mode_ALL */
-    uint	Hm_mode_NO_STAT; /* The SQHM__NO_STAT bit  of Hm_mode_ALL */
-
-    uint	N_hists;	/* The number of histograms */
-    uint	N_bins;		/* The number of bins per histogram */
-    uint	Lo_cntr;	/* The first counter in TOF mode */
-    uint	Lo_bin;		/* The first bin of the histogram */
-    uint	Hi_bin;		/* The top bin of the histogram */
-    uint	Bytes_per_bin;	/* The number of bytes per bin */
-    uint	Compress;	/* The bin compression factor */
-    uint	Curr_hist;	/* The currently selected histogram */
-    uint	Total_bytes;	/* The total number of bytes of histogram mem */
-    uint	Cnts_lo;	/* Count of hits below histogram(s) */
-    uint	Cnts_hi;	/* Count of hits above histogram(s) */
-    uchar      *Tran_buff_base;	/* Pointer to start of curr buff in TRANS mode */
-    uchar      *Next_char;	/* Pointer to next free byte in TRANS mode */
-    uint	Bytes_free;	/* Space left in current buffer in TRANS mode */
-    uint	MDI_mode;	/* Mode of Multi-detector interface as obtained
-				**  from the Extended Time-Stamp-Info packets */
-    uint	Frame_hdr;	/* The frame header (in HRPT mode) */
-    uint	Frame_num;	/* The frame number (in HRPT mode) */
-
-    usint	SinqHM_Dsbl_Mask;	      /* The data-acq disable mask */
-    usint	Server_masks[MAX_CLIENTS+1];  /* The daq masks for ..
-					      ** ..servers (0 is Filler) */
-  /*--------------------------------------*/
-    time_t  Sqhm_start_time;	    /* The time that SinqHM-main started */
-    uint    Port_base;
-    pid_t   Parent_pid;
-    pid_t   Child_pid[MAX_CLIENTS+1];
-    int	    Child_exit_status[MAX_CLIENTS];
-    int	    Child_cnct_skt[MAX_CLIENTS+1];
-    int	    Child_rw_skt[MAX_CLIENTS+1];
-    pid_t   Filler_pid;		      /* The process ID of the SinqHM-filler */
-    char    Filler_name[20];		    /* The name of the SinqHM-filler */
-    char    Tsk_name[MAX_CLIENTS+1][20];    /* The name of the SinqHM-servers */
-
-    char    Instr_name[16];	    /* This identifies the instrument */
-    char    Def_ident[8];	    /* This is Ident of SinqHM_def.h */
-    char    Sqhm_main_ident[8];	    /* This is Ident of main program */
-    char    Sqhm_main_date[32];	    /* This is compil date of main program */
-    char    Sqhm_serv_ident[8];	    /* This is Ident of server program */
-    char    Sqhm_serv_date[32];	    /* This is compil date of server program */
-    char    Sqhm_fill_ident[8];	    /* This is Ident of filler program */
-    char    Sqhm_fill_date[32];	    /* This is compil date of filler program */
-    char    Sqhm_rout_ident[8];	    /* This is Ident of routines */
-    char    Sqhm_rout_date[32];	    /* This is compil date of routines */
-
-    uint    Lwl_hdr_daq_mask;	/* Mask of header bits to be tested before
-				** histogramming a packet */
-    uint    Lwl_hdr_daq_soll;	/* Required value of masked hdr bits */
-
-
-    uint	Rw_bytes_got, Rw_bytes_put;
-    uint	Nrl_active;	 /* True if Neutron Rate Low bit set */
-    uint	Daq_active;	 /* True if Hdr Mask Bits are correct so that
-					** data acquisition is active */
-    int		Print_hdr;	 /* Set to True to get header printed in Filler */
-    uint	N_events;	 /* # of events collected */
-    uint	N_skipped;	 /* # of events skipped */
-    uint	N_no_coin_tsi;	 /* # of "normal" TSI packets */
-    uint	N_coin_tsi;	 /* # of "coincidence-mode" TSI packets */
-    uint	Tof_dts_soll;    /* Delay-Time-to-Start (soll-wert) */
-    uint	Tof_count_bad_counter_number;	/* Counter of number
-					    ** of TOF packets received in which
-					    ** the counter number is bad.
-					    */
-    uint	Num_bad_events;	    /* Number of bad events (from last "coinc"
-				    ** type TSI */
-    union {
-      	uint dead_time;
-      	uint dts;
-      	uint both;
-	    } Dt_or_dts; /* Dead-time or Delay-Time-to-Start from TSI packets */
-    usint	Tsi_status_info;    /* Status info from last TSI */
-    usint	Tsi_flags;	    /* Various flags from last TSI */
-
-    uint   *Lwl_fifo;	    /* This gets set to 0x80810080. ..
-			    ** .. It is the address via which ..
-			    ** .. one reads data from the fibre ..
-			    ** .. optic link (Licht-Wellen-Leiter)
-			    */
-    uint   *Lwl_csr;	    /* When we have one, this will get ..
-			    ** .. set to the addr of the optic ..
-			    ** .. link CSR. In the mean time, it ..
-			    ** .. is dummy (Lwl_dummy_csr).
-			    */
-    uint    Lwl_dummy_csr;  /* This is the dummy CSR till we have ..
-			    ** .. a real one.
-			    */
-    uint	Filler_flag;
-    SEM_ID	Sem_Filler;
-    SEM_ID	Sem_Server;
-    MSG_Q_ID	MsgQ_to_filler;
-    MSG_Q_ID	MsgQ_to_server[MAX_CLIENTS+1];	/* Index 0 is for messages ..
-						** .. to SinqHM-master. The ..
-						** others are to the various ..
-						** servers.
-						*/
-    uint	Sem_tmo;
-    uint	Use_sem_tmo;    /* If zero, disable sem timeouts */
-  /*--------------------------------------*/
-    struct tof_histog   *Tof_descr[MAX_TOF_CNTR]; /* An array of pointers to
-					    ** the data structures for the
-					    ** histos in TOF mode.
-					    */
-    uint		  N_tof_edges;	    /* The number of edge arrays */
-    struct tof_edge_info *Tof_edges[MAX_TOF_EDGE];   /* An array of pointers to
-					    ** data structures for the bin
-					    ** boundary information.
-					    */
-  /*--------------------------------------*/
-    int			FillTimer_active;   /* Set True if FillTimer active */
-    int			FillTimer_expired;  /* Set True in handler */
-    timer_t		FillTimerId;	    /* Identifier for Filler timer */
-    struct itimerspec	FillerTime;	    /* Set to Filler timer interval */
-  /*--------------------------------------*/
-    uchar	*VmioBase;	 /* Base address of VMIO10 module, if present */
-    uchar	 Vmio_Dummy[64]; /* Dummy VMIO10 addr space, in case absent */
-
-    jmp_buf	 Vmio_trap_env;
-/*==========================================================================
-  Special variables for decoding PSD data: The PSD detector position is
-  calculated as: coord = TXPOS*calibfactor + caliboffset. Thus we need two
-  factors for each direction. In addition we need to keep track of flashes 
-  and hits on the detector for diagnostic reasons.
-  ---------------------------------------------------------------------------*/
-  int psdXOffset;
-  int psdYOffset;
-  int psdXFactor;
-  int psdYFactor;
-  int psdFlashCount;
-  int psdHitCount;
-  int psdXSize;
-  int psdYSize;
-  int psdXORF, psdConf; 
-/*========================== Define the function prototypes ================*/
-
-  void	    catch_int_signal (
-		int signo);
-  void	    catch_machine_check (
-		int signo);
-  void	    catch_signal (
-		int signo);
-  int	    chk_config_alloc (
-		int			 skt,
-		struct req_buff_struct  *request,
-		struct rply_buff_struct *reply);
-  void	    cleanup_children ();
-  int	    close_down_offspring (
-		struct req_buff_struct  *request,
-		struct rply_buff_struct *reply);
-  void	    do_daq (
-		struct rply_buff_struct *reply,
-		int			 index,
-		int			 sub_cmnd);
-  int	    do_command (
-		int			 index,
-		int			 skt,
-		int			 pkt_size,
-		struct req_buff_struct  *rqst,
-		struct rply_buff_struct *reply);
-  int	    do_project (
-		int			index,
-		struct rply_buff_struct	*rply_bf,
-		int			rw_skt,
-		int			pkt_size,
-		uint			sub_code,
-		uint			x_lo,
-		uint			nx,
-		uint			y_lo,
-		uint			ny,
-		uint			xdim,
-		uint			h_slct);
-  int	    do_read (
-		int			index,
-		struct rply_buff_struct	*rply_bf,
-		int			rw_skt,
-		int			pkt_size,
-		uint			nbins,
-		uint			first,
-		uint			hist_no);
-  int	    do_SQHM__HM_DIG_alloc (
-		struct req_buff_struct  *request,
-		struct rply_buff_struct *reply);
-  int	    do_SQHM__HRPT_alloc (
-		struct req_buff_struct  *request,
-		struct rply_buff_struct *reply);
-  int	    do_SQHM__TOF_alloc (
-		int			skt,
-		struct req_buff_struct  *request,
-		struct rply_buff_struct *reply);
-  int	    do_SQHM__PSD_alloc (
-		int			skt,
-		struct req_buff_struct  *request,
-		struct rply_buff_struct *reply);
-  int	    do_SQHM__TRANS_alloc (
-		struct req_buff_struct  *request,
-		struct rply_buff_struct *reply);
-  int	    do_write (
-		int			index,
-		struct req_buff_struct	*req_bf,
-		struct rply_buff_struct	*rply_bf,
-		int			rw_skt,
-		int			pkt_size,
-		int			nbins,
-		int			first,
-		int			bytes_per_bin,
-		int			hist_no);
-  void	    do_zero (
-		struct rply_buff_struct *reply,
-		int			 index,
-		int			 nbins,
-		int			 fst_bin,
-		int			 hist_no);
-  void	    failInet (
-		char *text);
-  void	    failInet_port (
-		char *text, int port);
-  void	    free_HM_memory (void *extras);
-  void	    getErrno (
-		int *his_errno);
-  pid_t	    get_pid ();
-  int	    hm_zero (
-		int index, int nbins, int first, int hist_no);
-  void	    kill_children ();
-  void	    lwl_Fifo_Flush ();
-  int	    lwl_Packet_Read (
-		uint   hdr,
-		uchar *buff);
-  int	    make_child (
-		int proc (),
-		int flag,
-		int pkt_size);
-  int	    make_filler (
-		int suspendMode);
-  int	    net_flush (
-		int skt,
-		int nbytes);
-  void	    process_coinc_tsi (
-		uint hdr);
-  void	    process_psd_tsi (
-		uint hdr);
-  void	    process_no_coinc_tsi (
-		uint hdr);
-  void      process_gummi_monitor(
-		uint hdr);
-
-  int	    rply_status_send (
-		int			 skt,
-		struct rply_buff_struct	*rply_bf);
-  void	    rply_status_setup (
-		struct rply_buff_struct	*rply_bf,
-		int			 status,
-		int			 sub_status,
-		char			*msg);
-  int	    rply_status_setup_and_send (
-		int			 skt,
-		struct rply_buff_struct	*rply_bf,
-		int			 status,
-		int			 sub_status,
-		char			*msg);
-  uchar	   *selectNewBuffer (uchar *nxt);
-  void	    setupLevelGenerator (
-		int   use_level_gen,
-		char *base_addr);
-  void	    setup_inet_info (
-		char	*host,
-		int	 host_size,
-		char	*addr,
-		int	 addr_size);
-  int	    sleep (
-		int xx);
-  char	   *StrJoin (
-		char	*result,
-		int	 result_size,
-		char	*str_a,
-		char	*str_b);
-  int	    SinqHM_filler (
-		int suspend_flag);
-  void	    SinqHM_filler_setup_id ();
-  void	    SinqHM_routines_setup_id ();
-  void	    SinqHM_server_setup_id ();
-  int	    SinqHM_server (
-		int suspend_flag,
-		int index,
-		int pkt_size);
-
-/*===================================================== End of SinqHM_gbl.h  */
diff --git a/sinqhm/SinqHM_srv_filler.c b/sinqhm/SinqHM_srv_filler.c
deleted file mode 100755
index 81ab27a1..00000000
--- a/sinqhm/SinqHM_srv_filler.c
+++ /dev/null
@@ -1,1399 +0,0 @@
-#define	    IDENT	"1C05"
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     SINQ Division				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...SinqHM]SinqHM_srv_filler.c
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Oct 1996
-**
-** Updates:
-**  1A01  2-Oct-1996 DM	    Initial version.
-**  1B01 10-Jun-1998 DM	    Add code for SQMH__TOF mode.
-**  1C01 11-Jun-1999 DM	    Add code for SQMH__HRPT mode.
-**  1C03 10-Aug-1999 DM	    Make Lwl_hdr_daq_mask/Lwl_hdr_daq_soll dependent
-**				on the instrument.
-**
-**  SinqHM_srv_filler.c forms a child process of the SINQ Histogram Memory
-**  process. It reads data from the detector via the PCI bus and fills the
-**  histogram(s).
-**
-**  To compile this module for VxWorks on PSS123, use:
-**
-	    ccvx SinqHM_srv_filler.c
-** where
-	    ccvx = ccppc -O0			\
-		    -mcpu=603			\
-		    -I${WIND_BASE}/target/h	\
-		    -fno-builtin		\
-		    -fno-for-scope		\
-		    -nostdinc			\
-		    -DCPU=PPC603		\
-		    -D_GNU_TOOL			\
-		    -gdwarf -c -Wimplicit
-**====================================================================
-*/
-#include    <vxWorks.h>
-#include    <taskLib.h>
-#include    <sysLib.h>
-#include    <msgQLib.h>
-
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <signal.h>
-#include    <timers.h>
-#include    <errno.h>
-#include    <setjmp.h>
-
-/*
-**====================	Global Definitions =====================================
-*/
-#define ESC 27
-
-#include    "SinqHM_def.h"
-#include    "SinqHM_gbl.h"
-#include    "vmio10_def.h"
-/*==============================================================================
-		Global Routines
-**
-**   SinqHM_filler_setup_id  - copy some ident information to global variables.
-**
-**		Local Routines
-**
-**   SinqHM_filler_timer_handler - routine to handle timer interrupts.
-**
-**   SinqHM_filler_daq_hm_dig	- routine called by SinqHM_filler_daq for
-**				    performing data acquisition in
-**				    SQHM__HM_DIG mode, i.e. for data from
-**				    detectors with digitised read-out
-**				    electronics.
-**   SinqHM_filler_daq_hrpt	- routine called by SinqHM_filler_daq for
-**				    performing data acquisition in
-**				    SQHM__HRPT mode, i.e. for data from
-**				    detectors connected to a CERCA interface
-**				    as in the HRPT instrument.
-**   SinqHM_filler_daq_tof	- routine called by SinqHM_filler_daq for
-**				    performing data acquisition in
-**				    SQHM__TOF mode, i.e. for data from
-**				    time-of-flight detectors.
-**   SinqHM_filler_daq_psd	- routine called by SinqHM_filler_daq for
-**				    performing data acquisition in
-**				    SQHM__HM_PSD mode, i.e. for data from
-**				    EMBL detectors.
-**
-**   SinqHM_filler_daq		- routine called by SinqHM_filler for
-**				    performing data acquisition.
-**
-**   SinqHM_filler		- the main entry point for the FILLER child
-**				    process.
-**------------------------------------------------------------------------------
-**
-*/
-/*==============================================================================
-**		Global Routines for Filler
-*/
-  void	SinqHM_filler_setup_id () {
-/*	======================
-**		Simply copy some ident information to global variables
-**		for use by the SQHM_IDENT request.
-*/
-    StrJoin (Sqhm_fill_ident, sizeof (Sqhm_fill_ident), IDENT, "");
-    StrJoin (Sqhm_fill_date,  sizeof (Sqhm_fill_date),  __DATE__, ", ");
-    StrJoin (Sqhm_fill_date,  sizeof (Sqhm_fill_date),  Sqhm_fill_date, __TIME__);
-  }
-/*==============================================================================
-**		Local Routines for Filler
-*/
-  void	SinqHM_filler_timer_handler (int arg) {
-/*	===========================
-**				Routine to handle timer interrupts.
-*/
-    FillTimer_expired = True;
-  }
-/*
-**------------------------------------------------------------------------------
-**
-*/
-  void	SinqHM_filler_daq_hm_dig () {
-/*	========================
-**				Routine to handle Histogram Mode for
-**				detectors with single channel digitised
-**				read-out.
-**	Note:
-**	    Lwl_fifo could, in principle, be accessed via a register for better
-**	    efficiency. However, this can cause trouble with the GDB debugger
-**	    when single stepping. I think this is probably connected with
-**	    instruction pipe-lining.
-**	    For the time being, the register copy of Lwl_fifo will NOT be used.
-*/
-    register uint	*my_lwl_fifo;
-    register uint	 my_lo_bin, my_hi_bin;
-    register union {
-      uint	ui4;
-      usint	ui2[2];
-      uchar	ui1[4];
-    } lwl_hdr, lwl_data;
-    uchar		    my_buff[32];
-    int			    i, is;
-    char    er_eol[] = {ESC, '[', '0', 'J'};	/* Erase to End-of-Line */
-
-    register uchar  *my_char_base;
-    register usint  *my_word_base;
-    register uint   *my_long_base;
-
-			/*-----------------------------------------------
-			** Make register copies of some items for speed.
-			*/
-    my_lwl_fifo  = Lwl_fifo;
-    my_lo_bin    = Lo_bin;
-    my_hi_bin    = Hi_bin;
-    switch (Bytes_per_bin) {
-     case 1:  my_char_base = (uchar *) Hist_base_addr; break;
-     case 2:  my_word_base = (usint *) Hist_base_addr; break;
-     default: my_long_base = (uint  *) Hist_base_addr;
-    }
-			/*-----------------------------------------------*/
-    while (Filler_flag == 0) {	       /* Loop till flag gets set */
-      lwl_hdr.ui4 = *Lwl_fifo;	       /* Read a header from the FIFO */
-
-      if (lwl_hdr.ui4 == LWL_FIFO_EMPTY) {
-	taskDelay (0);	/* If FIFO is empty, we can take a breather! */
-      }else if ((lwl_hdr.ui4 & LWL_HDR_TYPE_MASK) == LWL_HM_NC_C1) {
-	VmioBase[VMIO_PORT_A] = 0xff;   /* Set timer level (if present) */
-	 
-	
-	for (i=0; i<1000000; i++) {
-	  lwl_data.ui4 = *Lwl_fifo;		/* Get the 16 bits of data */
-	  if (lwl_data.ui4 != LWL_FIFO_EMPTY) {
-             break;
-          }
-	  taskDelay (0); 			/* But wait if FIFO is slow! */
-	}
-	 
-	if (lwl_data.ui4 == LWL_FIFO_EMPTY) {
-	  printf ("Time-out getting histogram data word! Event # = %d\n",
-		    N_events);
-	}else if ((lwl_hdr.ui4 & Lwl_hdr_daq_mask) != Lwl_hdr_daq_soll) {
-	    /* Some header bits are not what they should be (e.g. NRL may
-	    ** be set) so skip the event.
-	    */
-	  N_skipped++;
-	  if (Dbg_lev1) {
-	    printf("Skipped header: 0x%08x\n"
-		   "          Mask: 0x%08x\n"
-		   "          Soll: 0x%08x\n", 
-                 lwl_hdr.ui4, Lwl_hdr_daq_mask, Lwl_hdr_daq_soll);
-	  }
-	}else if (lwl_data.ui4 < my_lo_bin)	{   /* Check "out-of-rnge" */
-	  if (Cnts_lo != 0xffffffff) Cnts_lo++;
-	}else if (lwl_data.ui4 > my_hi_bin)	{   /* Check "out-of-rnge" */
-	  if (Cnts_hi != 0xffffffff) Cnts_hi++;
-	}else {
-	  if (Hm_mode_REFLECT == 0) {	    /* Calculate bin number */
-	    lwl_data.ui4 -= my_lo_bin;	    /* No reflection */
-	  }else {
-	    lwl_data.ui4 = my_hi_bin - lwl_data.ui4; /* Histogram must be reflected */
-	  }
-	  switch (Bytes_per_bin) {
-	   case 1:
-	    if (my_char_base[lwl_data.ui4] != 0xff) {	/* Check bin ovfl */
-	      my_char_base[lwl_data.ui4]++;		/* Incr the bin */
-	    }else {
-	      switch (Hm_mode_BO) {		/* Bin overflow */
-	       case SQHM__BO_SMAX: break;		/* Stop-at-max */
-	       case SQHM__BO_CNT:  break;		/* Not programmed yet */
-	       default:
-		my_char_base[lwl_data.ui4] = 0;	 /* By default, wrap-to-zero */
-	      }
-	    }
-	    break;
-	   case 2:
-	    if (my_word_base[lwl_data.ui4] != 0xffff) {	/* Check bin ovfl */
-	      my_word_base[lwl_data.ui4]++;		/* Incr the bin */
-	    }else {
-	      switch (Hm_mode_BO) {		/* Bin overflow */
-	       case SQHM__BO_SMAX: break;		/* Stop-at-max */
-	       case SQHM__BO_CNT:  break;		/* Not programmed yet */
-	       default:
-		my_word_base[lwl_data.ui4] = 0;	 /* By default, wrap-to-zero */
-	      }
-	    }
-	    break;
-	   default:
-	    if (my_long_base[lwl_data.ui4] != 0xffffffff) { /* Check bin ovfl */
-	      my_long_base[lwl_data.ui4]++;		    /* Incr the bin */
-	    }else {
-	      switch (Hm_mode_BO) {		/* Bin overflow */
-	       case SQHM__BO_SMAX: break;		/* Stop-at-max */
-	       case SQHM__BO_CNT:  break;		/* Not programmed yet */
-	       default:
-		my_long_base[lwl_data.ui4] = 0;	 /* By default, wrap-to-zero */
-	      }
-	    }
-	  }
-	}
-	VmioBase[VMIO_PORT_A] = 0x00;  /* Reset timer level (if present) */
-	N_events++;
-      }else if ((lwl_hdr.ui4 & LWL_HDR_TYPE_MASK) == LWL_TSI_HM_NC) {
-
-	process_no_coinc_tsi (lwl_hdr.ui4);	/* We have found a "normal"
-				** TSI (Timing-Status-Info) header. Process
-				** it.
-				*/
-      }else if ((lwl_hdr.ui4 & LWL_HDR_TYPE_MASK) == LWL_TSI_HM_C) {
-
-	process_coinc_tsi (lwl_hdr.ui4);	/* We have found a "coincidence"
-				** type TSI header. The packet has 10 bytes
-				** altogether. Process it.
-				*/
-      }else {					/* Anything else gets flushed */
-	lwl_Packet_Read (lwl_hdr.ui4, my_buff);
-      }
-
-/*      if (FillTimer_expired) { */
-      if (0) {
-	if (Print_hdr) printf ("\nTaking data in Digitised Histogramming Mode\n"
-		  "  #-Events     #-Skip      #-TSI  Dead-Time Sync-Status\n");
-	Print_hdr = False;
-	FillTimer_expired = False;
-	printf ("\r%10u %10u %10u %10u %s", N_events, N_skipped,
-	   (N_no_coin_tsi + N_coin_tsi), Dt_or_dts.dead_time, er_eol);
-	if (Daq_active) printf (" DAQ");
-	if ((Tsi_flags & STATUS_FLAGS__PF)    != 0) printf (" PF");
-	if ((Tsi_flags & STATUS_FLAGS__SWC)   != 0) printf (" SWC");
-	if (Nrl_active) printf (" NRL");
-	if ((Tsi_flags & STATUS_FLAGS__SYNC3) != 0) printf (" SYNC3");
-	if ((Tsi_flags & STATUS_FLAGS__SYNC2) != 0) printf (" SYNC2");
-	if ((Tsi_flags & STATUS_FLAGS__SYNC1) != 0) printf (" SYNC1");
-	if ((Tsi_flags & STATUS_FLAGS__SYNC0) != 0) printf (" SYNC0");
-	if ((Tsi_flags & STATUS_FLAGS__UD)    != 0) printf (" UD");
-	if ((Tsi_flags & STATUS_FLAGS__GU)    != 0) printf (" GU");
-
-	is = timer_settime (FillTimerId, ~TIMER_ABSTIME, &FillerTime, NULL);
-	if (is != 0) {
-	  printf ("%s -- failed to set timer\n", Filler_name);
-	}
-      }
-    }
-		/* Our flag has been set. There should be ..
-		** .. a message waiting for us. Return to process it.
-		*/
-  }
-/*
-**------------------------------------------------------------------------------
-**
-*/
-  void	SinqHM_filler_daq_hrpt () {
-/*	======================
-**				Routine to handle Histogram Mode for
-**				detectors connected to a CERCA interface
-**				as in the HRPT instrument.
-**
-**	The wires of the detector are read out frame by frame.
-**	Each wire comes as a 3-word packet (i.e. Hist Mode mit 3 Kanaele).
-**	The first  word is 15-bit Wire Address (0 .. 1601) + Error Bit
-**	The second word is 10-bit Count
-**	The third  word is 16-bit Frame Number
-**
-**	To avoid skewing the histograms, the data is read out frame by frame
-**	and the frame is merged with the overall histogram only when it is
-**	complete and the LWL header information was OK for Wire 0 of the frame.
-**
-**	Note:
-**	    Lwl_fifo could, in principle, be accessed via a register for better
-**	    efficiency. However, this can cause trouble with the GDB debugger
-**	    when single stepping. I think this is probably connected with
-**	    instruction pipe-lining.
-**	    For the time being, the register copy of Lwl_fifo will NOT be used.
-**
-**	Another Note:
-**	    The HRPT detector has 1600 wires numbered 0 to 1599. The physicists
-**	    want these numbers reflected for reasons of their own.
-**	    The CERCA readout also uses wire numbers 1600 and 1601 to present
-**	    time information about the frame. This information is discarded.
-*/
-    register uint	*my_lwl_fifo;
-    register uint	 my_lo_bin, my_hi_bin;
-    register union {
-      uint	ui4;
-      usint	ui2[2];
-      uchar	ui1[4];
-    } lwl_hdr, lwl_data_0, lwl_data_1, lwl_data_2;
-    uchar		my_buff[32];
-    uint		wire;
-    int			i, j, k, is, my_state;
-    int			n_errors = 0;
-    char		err_txt[128];
-
-    char    er_eol[] = {ESC, '[', '0', 'J'};	/* Erase to End-of-Line */
-
-    register uchar  *my_char_base;
-    register usint  *my_word_base;
-    register uint   *my_long_base;
-
-    register uchar  *my_char_frame;
-    register usint  *my_word_frame;
-    register uint   *my_long_frame;
-
-			/*-----------------------------------------------
-			** Make register copies of some items for speed.
-			*/
-    my_lwl_fifo  = Lwl_fifo;
-    my_lo_bin    = Lo_bin;
-    my_hi_bin    = Hi_bin;
-    switch (Bytes_per_bin) {
-     case 1:  my_char_base = (uchar *) Hist_base_addr; break;
-     case 2:  my_word_base = (usint *) Hist_base_addr; break;
-     default: my_long_base = (uint  *) Hist_base_addr;
-    }
-    switch (Bytes_per_bin) {
-     case 1:  my_char_frame = (uchar *) Frame_base_addr; break;
-     case 2:  my_word_frame = (usint *) Frame_base_addr; break;
-     default: my_long_frame = (uint  *) Frame_base_addr;
-    }
-    my_state = HRPT__SRCH_FRAME;
-			/*-----------------------------------------------*/
-    while (Filler_flag == 0) {	       /* Loop till flag gets set */
-      lwl_hdr.ui4 = *Lwl_fifo;	       /* Read a header from the FIFO */
-
-      if (lwl_hdr.ui4 == LWL_FIFO_EMPTY) {
-	taskDelay (0);	/* If FIFO is empty, we can take a breather! */
-
-      }else if ((lwl_hdr.ui4 & LWL_HDR_TYPE_MASK) == LWL_HM_NC_C3) {
-			/* Histo data, three channel -- this is what we are
-			** interested in in HRPT mode. Start by reading out
-			** the 3 data words which should follow the header.
-			*/
-	VmioBase[VMIO_PORT_A] = 0xff;	    /* Set timer level (if present) */
-	for (i=0; i<1000; i++) {
-	  lwl_data_0.ui4 = *Lwl_fifo;		/* Get first 16 bits of data */
-	  if (lwl_data_0.ui4 != LWL_FIFO_EMPTY) break;
-	  taskDelay (0);			/* But wait if FIFO is slow! */
-	}
-	if (lwl_data_0.ui4 != LWL_FIFO_EMPTY) {
-	  for (i=0; i<1000; i++) {
-	    lwl_data_1.ui4 = *Lwl_fifo;	       /* Get second 16 bits of data */
-	    if (lwl_data_1.ui4 != LWL_FIFO_EMPTY) break;
-	    taskDelay (0);			/* But wait if FIFO is slow! */
-	  }
-	  if (lwl_data_1.ui4 != LWL_FIFO_EMPTY) {
-	    for (i=0; i<1000; i++) {
-	      lwl_data_2.ui4 = *Lwl_fifo;	/* Get third 16 bits of data */
-	      if (lwl_data_2.ui4 != LWL_FIFO_EMPTY) break;
-	      taskDelay (0);			/* But wait if FIFO is slow! */
-	    }
-            if (Dbg_lev1 && (lwl_data_1.ui4 > 0)) {
-                printf ("Got address = %d, shifted = %d, counts = %d\n", 
-                     lwl_data_0.ui4, (lwl_data_0.ui4 >> 1), lwl_data_1.ui4);
-	    }
-	  }
-	}
-	if ((lwl_data_0.ui4 == LWL_FIFO_EMPTY) ||
-	    (lwl_data_1.ui4 == LWL_FIFO_EMPTY) ||
-	    (lwl_data_2.ui4 == LWL_FIFO_EMPTY)) {
-	  if (n_errors == 0) {
-	    sprintf (err_txt, "Time-out getting the three data words! "
-			"Event # = %d\n", N_events);
-	  }
-	  n_errors++;
-	}else {
-	  wire = lwl_data_0.ui4 >> 1;		   /* Shift out error bit */
-	  if (wire < my_lo_bin) {		   /* Out-of-rnge? */
-	    if (Cnts_lo != 0xffffffff) Cnts_lo++;
-	  }else if (wire == my_lo_bin) {	   /* Start of new frame? */
-	    my_state = HRPT__READ_FRAME;	   /* Yes. Note our new state */
-	    Frame_hdr = lwl_hdr.ui4;		   /* Remember hdr for frame */
-	    Frame_num = lwl_data_2.ui4;
-	    switch (Bytes_per_bin) {
-	     case 1:  my_char_frame[0] = lwl_data_1.ui4; break;
-	     case 2:  my_word_frame[0] = lwl_data_1.ui4; break;
-	     default: my_long_frame[0] = lwl_data_1.ui4;
-	    }
-	  }else if (wire <= my_hi_bin) {	    /* In range? */
-	    if (my_state == HRPT__READ_FRAME) {	    /* Yes. Check state */
-	      if (lwl_data_2.ui4 == Frame_num) {    /* And check frame # */
-		switch (Bytes_per_bin) {
-		 case 1:  my_char_frame[wire-my_lo_bin] = lwl_data_1.ui4; break;
-		 case 2:  my_word_frame[wire-my_lo_bin] = lwl_data_1.ui4; break;
-		 default: my_long_frame[wire-my_lo_bin] = lwl_data_1.ui4;
-		}
-	      }else {
-		if (n_errors == 0) {
-		  sprintf (err_txt, "Frame sequence error: Frame 0x%04x\n"
-			"      Packet: 0x%08x 0x%04x 0x%04x 0x%04x\n",
-		   lwl_hdr.ui4, lwl_data_0.ui4, lwl_data_1.ui4, lwl_data_2.ui4);
-		}
-		n_errors++;
-	      }
-	      if (wire == my_hi_bin) {			/* End of frame? */
-						/* Yes, merge it in if the
-						** header bits are OK
-						*/
-		if ((Frame_hdr & Lwl_hdr_daq_mask) != Lwl_hdr_daq_soll) {
-		  N_skipped++;
-		  if (Dbg_lev1) {
-		    printf("Skipped frame %d\n"
-			   "       Hdr:  0x%08x\n"
-			   "       Mask: 0x%08x\n"
-			   "       Soll: 0x%08x\n", Frame_num,
-			    Frame_hdr, Lwl_hdr_daq_mask, Lwl_hdr_daq_soll);
-		  }
-		}else {
-		  N_events++;
-		  k = 0;
-		  for (i = my_lo_bin; i <= my_hi_bin; i++) {
-		    if (Hm_mode_REFLECT == 0) {	    /* Reflect if necessary */
-		      j = i - my_lo_bin;
-		    }else {
-		      j = my_hi_bin - i;
-		    }
-		    switch (Bytes_per_bin) {
-		     case 1:  my_char_base[j] += my_char_frame[k]; break;
-		     case 2:  my_word_base[j] += my_word_frame[k]; break;
-		     default: my_long_base[j] += my_long_frame[k];
-		    }
-		    k++;
-		  }
-		}
-		my_state == HRPT__SRCH_FRAME;
-	      }
-	    }
-	  }else if (wire == (my_hi_bin + 1)) {	    /* Frame timing #1? */
-	    continue;				    /* Yes, ignore */
-	  }else if (wire == (my_hi_bin + 2)) {	    /* Frame timing #2? */
-	    continue;				    /* Yes, ignore */
-	  }else if (wire > (my_hi_bin + 2))	{   /* Out-of-rnge? */
-	    if (Cnts_hi != 0xffffffff) Cnts_hi++;
-	  }
-	}
-	VmioBase[VMIO_PORT_A] = 0x00;  /* Reset timer level (if present) */
-      }else if ((lwl_hdr.ui4 & LWL_HDR_TYPE_MASK) == LWL_TSI_HM_NC) {
-	process_no_coinc_tsi (lwl_hdr.ui4);	/* We have found a "normal"
-				** TSI (Timing-Status-Info) header. Process
-				** it.
-				*/
-      }else if ((lwl_hdr.ui4 & LWL_HDR_TYPE_MASK) == LWL_TSI_HM_C) {
-	process_coinc_tsi (lwl_hdr.ui4);	/* We have found a "coincidence"
-				** type TSI header. The packet has 10 bytes
-				** altogether. Process it.
-				*/
-      }else {					/* Anything else gets flushed */
-	lwl_Packet_Read (lwl_hdr.ui4, my_buff);
-      }
-
-      if (FillTimer_expired) {
-	if (Print_hdr) printf ("\nTaking data in HRPT Mode\n"
-		  "  #-Events     #-Skip      #-TSI  #-Frame  Sync-Status\n");
-	Print_hdr = False;
-	FillTimer_expired = False;
-	printf ("\r%10u %10u %10u %10u %s", N_events, N_skipped,
-	   (N_no_coin_tsi + N_coin_tsi), Frame_num, er_eol);
-	if (Daq_active) printf (" DAQ");
-	if ((Tsi_flags & STATUS_FLAGS__PF)    != 0) printf (" PF");
-	if ((Tsi_flags & STATUS_FLAGS__SWC)   != 0) printf (" SWC");
-	if (Nrl_active) printf (" NRL");
-	if ((Tsi_flags & STATUS_FLAGS__SYNC3) != 0) printf (" SYNC3");
-	if ((Tsi_flags & STATUS_FLAGS__SYNC2) != 0) printf (" SYNC2");
-	if ((Tsi_flags & STATUS_FLAGS__SYNC1) != 0) printf (" SYNC1");
-	if ((Tsi_flags & STATUS_FLAGS__SYNC0) != 0) printf (" SYNC0");
-	if ((Tsi_flags & STATUS_FLAGS__UD)    != 0) printf (" UD");
-	if ((Tsi_flags & STATUS_FLAGS__GU)    != 0) printf (" GU");
-
-	if (n_errors != 0) {
-	  printf ("\n%d errors occurred in the last time period\n", n_errors);
-	  printf ("The first one was:\n%s\n", err_txt);
-	  n_errors = 0;
-	}
-	is = timer_settime (FillTimerId, ~TIMER_ABSTIME, &FillerTime, NULL);
-	if (is != 0) {
-	  printf ("%s -- failed to set timer\n", Filler_name);
-	}
-      }
-    }
-		/* Our flag has been set. There should be ..
-		** .. a message waiting for us. Return to process it.
-		*/
-  }
-/*
-**-----------------------------------------------------------------------------
-*/
-  void	SinqHM_filler_daq_tof () {
-/*	=====================
-**				Routine to handle Time-of-flight Mode
-**	Note:
-**	    Lwl_fifo could, in principle, be accessed via a register for better
-**	    efficiency. However, this can cause trouble with the GDB debugger
-**	    when single stepping. I think this is probably connected with
-**	    instruction pipe-lining.
-**	    For the time being, the register copy of Lwl_fifo will NOT be used.
-*/
-    register uint   *my_lwl_fifo;
-    register union {
-      uint	ui4;
-      usint	ui2[2];
-      uchar	ui1[4];
-    } lwl_hdr, lwl_data;
-
-    int				 i, j, is, ts, left, right, middl, not_finished;
-    uchar			 my_buff[32];
-    register struct tof_histog  *my_tof_descr;
-    uint			*edge_pntr;
-    char    er_eol[] = {ESC, '[', '0', 'J'};	/* Erase to End-of-Line */
-			/*-----------------------------------------------
-			** Make register copies of some items for speed.
-			*/
-    my_lwl_fifo  = Lwl_fifo;
-			/*-----------------------------------------------*/
-    while (Filler_flag == 0) {	       /* Loop till flag gets set */
-
-      lwl_hdr.ui4 = *Lwl_fifo;	       /* Read a header from the FIFO */
-
-      if (lwl_hdr.ui4 == LWL_FIFO_EMPTY) {
-	taskDelay (0);	/* If FIFO is empty, we can take a breather! */
-
-      }else if (((lwl_hdr.ui4 & LWL_HDR_TYPE_MASK) == LWL_TOF_C1) ||
-		((lwl_hdr.ui4 & LWL_HDR_TYPE_MASK) == LWL_TOF_C2) ||
-		((lwl_hdr.ui4 & LWL_HDR_TYPE_MASK) == LWL_TOF_C3) ||
-		((lwl_hdr.ui4 & LWL_HDR_TYPE_MASK) == LWL_TOF_C4) ||
-		((lwl_hdr.ui4 & LWL_HDR_TYPE_MASK) == LWL_TOF_C5) ||
-		((lwl_hdr.ui4 & LWL_HDR_TYPE_MASK) == LWL_TOF_C6) ||
-		((lwl_hdr.ui4 & LWL_HDR_TYPE_MASK) == LWL_TOF_C7) ||
-		((lwl_hdr.ui4 & LWL_HDR_TYPE_MASK) == LWL_TOF_C8) ||
-		((lwl_hdr.ui4 & LWL_HDR_TYPE_MASK) == LWL_TOF_C9)) {
-				/* We have found a header of the type we are
-				** interested in, i.e. a TOF packet. So
-				** process it. We must first get the 16 bits
-				** of data which give the counter number.
-				*/
-	VmioBase[VMIO_PORT_A] = 0xff;   /* Set timer level (if present) */
-	for (i=0; i<1000; i++) {
-	  lwl_data.ui4 = *Lwl_fifo;		/* Get the counter number */
-	  if (lwl_data.ui4 != LWL_FIFO_EMPTY) break;
-	  taskDelay (0);			/* But wait if FIFO is slow! */
-	}
-	if (lwl_data.ui4 == LWL_FIFO_EMPTY) {
-	  printf ("Time-out getting counter number!\n");
-	}else if ((lwl_hdr.ui4 & Lwl_hdr_daq_mask) != Lwl_hdr_daq_soll) {
-	    /* Some header bits are not what they should be (e.g. NRL may
-	    ** be set) so skip the event.
-	    */
-	  N_skipped++;
-	  if (Dbg_lev1) {
-	    printf("Skipped header: 0x%08x\n"
-		   "          Mask: 0x%08x\n"
-		   "          Soll: 0x%08x\n", 
-                 lwl_hdr.ui4, Lwl_hdr_daq_mask, Lwl_hdr_daq_soll);
-	  }
-	}else {
-			/* We have a valid TOF packet. Validate it
-			** thoroughly and process it. First check
-			** that the counter number is valid.
-			*/
-	  if (lwl_data.ui4 >= MAX_TOF_CNTR) {
-	    Tof_count_bad_counter_number++;	    /* It isn't */
-	  }else {
-	    my_tof_descr = Tof_descr[lwl_data.ui4];
-	    if (my_tof_descr == NULL) {
-	      Tof_count_bad_counter_number++;	    /* It isn't */
-	    }else {
-			/* The counter number is valid. Process the time-stamp
-			** (20-bit quantity) to find which bin to increment.
-			*/
-	      ts = lwl_hdr.ui4 & LWL_HDR_TS_MASK;
-	      if (ts < my_tof_descr->lo_edge) {
-		if ((Hm_mode_UD != 0) &&
-		    (lwl_hdr.ui4 & LWL_HDR_UD_MASK) == 0) {
-		  my_tof_descr->cnt_early_down++;
-		}else {
-		  my_tof_descr->cnt_early_up++;
-		}
-	      }else {
-		if (ts > my_tof_descr->hi_edge) {
-		  if ((Hm_mode_UD != 0) &&
-		      (lwl_hdr.ui4 & LWL_HDR_UD_MASK) == 0) {
-		    my_tof_descr->cnt_late_down++;
-		  }else {
-		    my_tof_descr->cnt_late_up++;
-		  }
-		}else {
-			    /* Now search the bin boundary list to find the
-			    ** bin to which this event belongs.
-			    */
-		  edge_pntr = my_tof_descr->bin_edge;
-		  left = 0;
-		  right = my_tof_descr->n_bins;
-		  middl = (left + right)/2;
-		  not_finished = True;
-		  while (not_finished) {
-		    switch (right - left) {
-		     case 0:
-		      not_finished = False;
-		      break;
-		     case 1:
-		      middl = (ts >= edge_pntr[right]) ? right : left;
-		      not_finished = False;
-		      break;
-		     default:
-		      middl = (left + right)/2;
-		      if (ts == edge_pntr[middl]) {
-		        not_finished = False;
-		      }else if (ts > edge_pntr[middl]) {
-			left = middl;
-		      }else {
-			right = middl;
-		      }
-		    }
-		  }
-		  if ((Hm_mode_UD != 0) &&
-		      ((lwl_hdr.ui4 & LWL_HDR_UD_MASK) != 0)) {
-		    middl += my_tof_descr->n_bins;
-		  }
-		  switch (my_tof_descr->bytes_per_bin) {
-		   case 1:
-		    my_tof_descr->u.b_bin_data[middl]++; break;
-		   case 2:
-		    my_tof_descr->u.w_bin_data[middl]++; break;
-		   default:
-		    my_tof_descr->u.l_bin_data[middl]++; break;
-		  }
-		}
-	      }
-	    }
-	  }
-	}
-	VmioBase[VMIO_PORT_A] = 0x00;  /* Reset timer level (if present) */
-	N_events++;
-      }else if ((lwl_hdr.ui4 & LWL_HDR_TYPE_MASK) == LWL_TSI_HM_NC) {
-	process_no_coinc_tsi (lwl_hdr.ui4);	/* We have found a "normal"
-				** TSI (Timing-Status-Info) header. Process
-				** it.
-				*/
-      }else if ((lwl_hdr.ui4 & LWL_HDR_TYPE_MASK) == LWL_TSI_HM_C) {
-	process_coinc_tsi (lwl_hdr.ui4);	/* We have found a "coincidence"
-				** type TSI header. The packet has 10 bytes
-				** altogether. Process it.
-				*/
-      }else if ((lwl_hdr.ui4 & LWL_HDR_TYPE_MASK) == LWL_GUMMI_MON) {
-	/*
-	  process a SANS gummi mode monitor datagram
-	*/
-	process_gummi_monitor(lwl_hdr.ui4);
-      }else {					/* Anything else gets flushed */
-	lwl_Packet_Read (lwl_hdr.ui4, my_buff);
-      }
-
-      if (FillTimer_expired) {
-	if (Print_hdr) printf ("\nTaking data in TOF Mode\n"
-		  "  #-Events     #-Skip      #-TSI Delay-Time Sync-Status\n");
-	Print_hdr = False;
-	FillTimer_expired = False;
-	printf ("\r%10u %10u %10u %10u %s", N_events, N_skipped,
-	   (N_no_coin_tsi + N_coin_tsi), Dt_or_dts.dts, er_eol);
-	if (Daq_active) printf (" DAQ");
-	if ((Tsi_flags & STATUS_FLAGS__PF)    != 0) printf (" PF");
-	if ((Tsi_flags & STATUS_FLAGS__SWC)   != 0) printf (" SWC");
-	if (Nrl_active) printf (" NRL");
-	if ((Tsi_flags & STATUS_FLAGS__SYNC3) != 0) printf (" SYNC3");
-	if ((Tsi_flags & STATUS_FLAGS__SYNC2) != 0) printf (" SYNC2");
-	if ((Tsi_flags & STATUS_FLAGS__SYNC1) != 0) printf (" SYNC1");
-	if ((Tsi_flags & STATUS_FLAGS__SYNC0) != 0) printf (" SYNC0");
-	if ((Tsi_flags & STATUS_FLAGS__UD)    != 0) printf (" UD");
-	if ((Tsi_flags & STATUS_FLAGS__GU)    != 0) printf (" GU");
-
-	is = timer_settime (FillTimerId, ~TIMER_ABSTIME, &FillerTime, NULL);
-	if (is != 0) {
-	  printf ("%s -- failed to set timer\n", Filler_name);
-	}
-      }
-    }
-		/* Our flag has been set. There should be ..
-		** .. a message waiting for us. Return to process it.
-		*/
-  }
-/*
-**-----------------------------------------------------------------------------
-*/
-  void	SinqHM_filler_daq_psd () {
-/*	=====================
-**				Routine to handle PSD-TOF Mode
-**	Note:
-**	    Lwl_fifo could, in principle, be accessed via a register for better
-**	    efficiency. However, this can cause trouble with the GDB debugger
-**	    when single stepping. I think this is probably connected with
-**	    instruction pipe-lining.
-**	    For the time being, the register copy of Lwl_fifo will NOT be used.
-*/
-    register uint   *my_lwl_fifo;
-    register union {
-      uint	ui4;
-      usint	ui2[2];
-      uchar	ui1[4];
-    } lwl_hdr, xData, yData, edData;
-
-    int xPos, yPos, iTime, dataPos, edNum, xOff, yOff;
-    signed int  sPosx, sPosy;
-    int		     i, j, is, ts, left, right, middl, not_finished;
-    uint			*edge_pntr;
-    char    er_eol[] = {ESC, '[', '0', 'J'};	/* Erase to End-of-Line */
-    uchar			 my_buff[32];
-    uint *histlPtr = (uint *)Hist_base_addr;
-    usint *histsPtr = (usint *)Hist_base_addr;
-    uchar *histcPtr = (uchar *)Hist_base_addr;
-    
-
-    /*
-      precalculate some offsets
-    */
-    xOff = psdXOffset*psdXFactor;
-    yOff = psdYOffset*psdYFactor;
-
-			/*-----------------------------------------------
-			** Make register copies of some items for speed.
-			*/
-    my_lwl_fifo  = Lwl_fifo;
-			/*-----------------------------------------------*/
-    while (Filler_flag == 0) {	       /* Loop till flag gets set */
-
-      lwl_hdr.ui4 = *Lwl_fifo;	       /* Read a header from the FIFO */
-
-      if (lwl_hdr.ui4 == LWL_FIFO_EMPTY) {
-	taskDelay (0);	/* If FIFO is empty, we can take a breather! */
-
-      }else if ( (lwl_hdr.ui4 & LWL_HDR_TYPE_MASK) == LWL_PSD_DATA) {
-        /*
-           we have located a PSD data packet. Let us read the xPos and
-           yPos packes.
-	*/
-	VmioBase[VMIO_PORT_A] = 0xff;   /* Set timer level (if present) */
-
-	for (i=0; i<1000; i++) {
-	  xData.ui4 = *Lwl_fifo;		/* Get the x Position */
-	  if (xData.ui4 != LWL_FIFO_EMPTY) break;
-	  taskDelay (0);			/* But wait if FIFO is slow! */
-	}
-	if (xData.ui4 == LWL_FIFO_EMPTY) {
-	  printf ("Time-out getting X position !\n");
-          continue;
-	}
-
-	for (i=0; i<1000; i++) {
-	  yData.ui4 = *Lwl_fifo;		/* Get the y Position */
-	  if (yData.ui4 != LWL_FIFO_EMPTY) break;
-	  taskDelay (0);			/* But wait if FIFO is slow! */
-	}
-	if (yData.ui4 == LWL_FIFO_EMPTY) {
-	  printf ("Time-out getting Y position!\n");
-          continue;
-	}
-
-        /*
-          check if data aquisition is active
-	*/
-        if ((lwl_hdr.ui4 & Lwl_hdr_daq_mask) != Lwl_hdr_daq_soll) {
-	    /* Some header bits are not what they should be (e.g. NRL 
-	    ** ow PWF may be set) so skip the event.
-	    */
-	  N_skipped++;
-	  if (Dbg_lev1) {
-	    printf("Skipped header: 0x%08x\n"
-		   "          Mask: 0x%08x\n"
-		   "          Soll: 0x%08x\n", 
-                 lwl_hdr.ui4, Lwl_hdr_daq_mask, Lwl_hdr_daq_soll);
-  	  }
-          continue;
-	}
-          /*
-            We have a valid PSD packet. Find and check positions.
-	  */
-
-
-	/*
-	  This is the new version where all values are offset by 4096
-          in order to give positive values at all times. This relates
-          to a zero point in the middle of the detector. As we want a
-          zero point in the lower left corner, we subtract 2048.
-	*/
-	  xPos = xData.ui2[1];
-	  xPos = (xPos - 2048)/psdXFactor;
-	  yPos = yData.ui2[1];
-	  yPos = (yPos - 2048)/psdYFactor;
-
-
-          if(xPos < 0 || xPos >= psdXSize)
-	  {
-	    printf("X position out of range: %d, alllowed 0 - %d\n",
-                   xPos, psdXSize);
-	    continue;
-          }
-          if(yPos < 0 || yPos >= psdYSize)
-	  {
-	    printf("Y position out of range: %d, alllowed 0 - %d\n",
-                   yPos, psdYSize);
-            continue;
-          }
-
-          /*
-            Extract time stamp and match to the appropriate time bin.
-	  */
-          iTime = lwl_hdr.ui4 & LWL_PSD_TIME;
-          if(Dbg_lev1){
-	    printf("Received detector hit at x,y, time: %d, %d, %d\n",
-		   xPos, yPos, iTime);
-          }
-
-	  edge_pntr = Tof_edges[0]->edges;
-	  left = 0;
-	  right = Tof_edges[0]->n_bins;
-	  middl = (left + right)/2;
-	  not_finished = True;
-          iTime -= Tof_dts_soll;
-	  while (not_finished) {
-		    switch (right - left) {
-		     case 0:
-		      not_finished = False;
-		      break;
-		     case 1:
-		      middl = (iTime >= edge_pntr[right]) ? right : left;
-		      not_finished = False;
-		      break;
-		     default:
-		      middl = (left + right)/2;
-		      if (iTime == edge_pntr[middl]) {
-		        not_finished = False;
-		      }else if (iTime > edge_pntr[middl]) {
-			left = middl;
-		      }else {
-			right = middl;
-		      }
-		    }
-	 }
-	 if(Dbg_lev1){
-	   printf("Matched time stamp %d into bin %d\n", iTime,middl);
-         }
-         
-	 if(middl >= Tof_edges[0]->n_bins){
-	   if(Tof_edges[0]->n_bins < 5){
-	     /*
-	       fix for PSD without TOF
-	     */
-	     middl = Tof_edges[0]->n_bins-1;
-	   } else {
-	     /* 
-		skip it, out of range
-	     */
-	     continue;
-	   }
-	 }
-
-         /* 
-	    calculate histogram position to update 
-	 */
-         dataPos = yPos*psdXSize*Tof_edges[0]->n_bins + 
-	   xPos*Tof_edges[0]->n_bins + middl;
-
-         /* UD must come but the bit is not yet defined
-	 if ((Hm_mode_UD != 0) &&
-	     ((lwl_hdr.ui4 & LWL_HDR_UD_MASK) != 0)) {
-		    dataPos += 
-		      (psdXSize*psdYSize+MAX_PSD_ED)*Tof_edges[0]->n_bins ;
-	 }
-         */
-         switch(Bytes_per_bin)
-	 {
-	   case 1:
-	     histcPtr[dataPos]++;
-	     break;
-	   case 2:
-	     histsPtr[dataPos]++;
-	     break;
-	   case 4:
-	     histlPtr[dataPos]++;
-	     break;
-         }         
-
-          VmioBase[VMIO_PORT_A] = 0x00;  /* Reset timer level (if present) */
-	  N_events++;
-      }else if ( (lwl_hdr.ui4 & LWL_HDR_ED_MASK) == 0) {
-        /*
-	  we have located a single detector packet from AMOR. We need to
-          read the detector number
-	*/
-	VmioBase[VMIO_PORT_A] = 0xff;   /* Set timer level (if present) */
-
-	for (i=0; i<1000; i++) {
-	  edData.ui4 = *Lwl_fifo;		/* Get the detector number */
-	  if (edData.ui4 != LWL_FIFO_EMPTY) break;
-	  taskDelay (0);			/* But wait if FIFO is slow! */
-	}
-	if (xData.ui4 == LWL_FIFO_EMPTY) {
-	  printf ("Time-out getting  detector number !\n");
-          continue;
-	}
-        /*
-          check if data aquisition is active
-	*/
-        if ((lwl_hdr.ui4 & Lwl_hdr_daq_mask) != Lwl_hdr_daq_soll) {
-	    /* Some header bits are not what they should be (e.g. NRL 
-	    ** ow PWF may be set) so skip the event.
-	    */
-	  N_skipped++;
-	  if (Dbg_lev1) {
-	    printf("Skipped header: 0x%08x\n"
-		   "          Mask: 0x%08x\n"
-		   "          Soll: 0x%08x\n", 
-                 lwl_hdr.ui4, Lwl_hdr_daq_mask, Lwl_hdr_daq_soll);
-  	  }
-          continue;
-	}
-          /*
-            We have a valid single detector packet. 
-	    Subtract one from the number because Urs Greuter starts 
-	    counting at 1, and ANSI-C at 0
-	  */
-	  edNum = edData.ui2[1] - 1;
-          if(edNum < 0 || edNum >= MAX_PSD_ED){
-	    printf("Got invalid single detector number %d\n",edNum);
-	    continue;
-          }
-
-          /*
-            Extract time stamp and match to the appropriate time bin.
-	  */
-          iTime = lwl_hdr.ui4 & LWL_PSD_TIME;
-          if(Dbg_lev1){
-	    printf("Received single detector hit at no, time: %d, %d\n",
-		   edNum, iTime);
-          }
-
-	  edge_pntr = Tof_edges[0]->edges;
-	  left = 0;
-	  right = Tof_edges[0]->n_bins;
-	  middl = (left + right)/2;
-	  not_finished = True;
-          iTime -= Tof_dts_soll;
-	  while (not_finished) {
-		    switch (right - left) {
-		     case 0:
-		      not_finished = False;
-		      break;
-		     case 1:
-		      middl = (iTime >= edge_pntr[right]) ? right : left;
-		      not_finished = False;
-		      break;
-		     default:
-		      middl = (left + right)/2;
-		      if (iTime == edge_pntr[middl]) {
-		        not_finished = False;
-		      }else if (iTime > edge_pntr[middl]) {
-			left = middl;
-		      }else {
-			right = middl;
-		      }
-		    }
-	 }
-	 if(Dbg_lev1){
-	   printf("Matched time stamp %d into bin %d\n", iTime,middl);
-         }
-         
-	 if(middl >= Tof_edges[0]->n_bins){
-	   middl = Tof_edges[0]->n_bins-1;
-           if(Dbg_lev1){
-	     printf("WARNING: Fixed bad time bin for single detector!\n");
-	   }
-	   continue;
-	 }
-
-         /* 
-	    calculate histogram position to update 
-	 */
-         dataPos = (psdYSize*psdXSize)*Tof_edges[0]->n_bins  
-	           + edNum*Tof_edges[0]->n_bins + middl - 1;
-
-	 if(Dbg_lev1){
-	   printf("dataPos = %d\n", dataPos);
-         }
-
-
-         /* UD must come but the UD bit is not defined......
-	 if ((Hm_mode_UD != 0) &&
-	     ((lwl_hdr.ui4 & LWL_HDR_UD_MASK) != 0)) {
-		    dataPos += 
-		      (psdXSize*psdYSize+MAX_PSD_ED)*Tof_edges[0]->n_bins ;
-	 }
-         */
-
-         switch(Bytes_per_bin)
-	 {
-	   case 1:
-	     histcPtr[dataPos]++;
-	     break;
-	   case 2:
-	     histsPtr[dataPos]++;
-	     break;
-	   case 4:
-	     histlPtr[dataPos]++;
-	     break;
-         }         
-
-          VmioBase[VMIO_PORT_A] = 0x00;  /* Reset timer level (if present) */
-	  N_events++;
-      }else if ((lwl_hdr.ui4 & LWL_HDR_TYPE_MASK) == LWL_PSD_TSI) {
-        /* 
-          we have located a PSD style TSI telegram
-	*/
-        process_psd_tsi(lwl_hdr.ui4);
-      }else {	    
-        /* Anything else gets flushed */
-	lwl_Packet_Read (lwl_hdr.ui4, my_buff);
-      }
-
-      if (FillTimer_expired) {
-	if (Print_hdr) printf ("\nTaking data in PSD Mode\n"
-            "  #-Events     #-Skip      #-TSI     #-Hits   %s",
-            "#-Flash Delay-Time Sync-Status\n");
-	Print_hdr = False;
-	FillTimer_expired = False;
-	printf ("\r%10u %10u %10u %10u %10u %10u %s", N_events, N_skipped,
-	   (N_no_coin_tsi + N_coin_tsi), psdHitCount, 
-                    psdFlashCount, Dt_or_dts.dts, er_eol);
-	if (Daq_active) printf (" DAQ");
-	if ((Tsi_flags & STATUS_FLAGS__PF)    != 0) printf (" PF");
-	if ((Tsi_flags & STATUS_FLAGS__SWC)   != 0) printf (" SWC");
-	if (Nrl_active) printf (" NRL");
-	if ((Tsi_flags & STATUS_FLAGS__SYNC3) != 0) printf (" SYNC3");
-	if ((Tsi_flags & STATUS_FLAGS__SYNC2) != 0) printf (" SYNC2");
-	if ((Tsi_flags & STATUS_FLAGS__SYNC1) != 0) printf (" SYNC1");
-	if ((Tsi_flags & STATUS_FLAGS__SYNC0) != 0) printf (" SYNC0");
-	if ((Tsi_flags & STATUS_FLAGS__UD)    != 0) printf (" UD");
-	if ((Tsi_flags & STATUS_FLAGS__GU)    != 0) printf (" GU");
-        if(psdXORF) printf(" XORF");
-        if(psdConf) printf(" CONF");
-	 
-	is = timer_settime (FillTimerId, ~TIMER_ABSTIME, &FillerTime, NULL);
-	if (is != 0) {
-	  printf ("%s -- failed to set timer\n", Filler_name);
-	}
-      }
-    }
-		/* Our flag has been set. There should be ..
-		** .. a message waiting for us. Return to process it.
-		*/
-  }
-/*
-**-----------------------------------------------------------------------------
-*/
-  void	SinqHM_filler_daq_trans () {
-/*	=======================
-**			Routine to handle Transparent Mode. Data is simply read
-**			and packed into the buffers. The buffers are used
-**			cyclically.
-**			The routine attempts to read packets of data from the
-**			fibre-optic channel. This code, however, assumes that
-**			the packets obey the LWL protocol specification.
-**	Note:
-**	    Lwl_fifo could, in principle, be accessed via a register for better
-**	    efficiency. However, this can cause trouble with the GDB debugger
-**	    when single stepping. I think this is probably connected with
-**	    instruction pipe-lining.
-**	    For the time being, the register copy of Lwl_fifo will NOT be used.
-*/
-    register uint   *my_lwl_fifo;
-    register union {
-      uint	ui4;
-      usint	ui2[2];
-      uchar	ui1[4];
-    } lwl_hdr, lwl_data;
-
-    uint	     status_info;
-    int		     i, j;
-    register uchar  *my_char_nxt;
-
-			/*-----------------------------------------------
-			** Make register copies of some items for speed.
-			*/
-    my_lwl_fifo = Lwl_fifo;
-    my_char_nxt = Next_char;
-
-    while (Filler_flag == 0) {	       /* Loop till flag gets set */
-      lwl_hdr.ui4 = *Lwl_fifo;	       /* Read a header from the FIFO */
-
-      if (lwl_hdr.ui4 == LWL_FIFO_EMPTY) {
-	taskDelay (0);	/* If FIFO is empty, we can take a breather! */
-      }else {
-#ifdef TRANNY	
-	VmioBase[VMIO_PORT_A] = 0xff;	    /* Set timer level (if present) */
-	*my_char_nxt = lwl_Packet_Read (lwl_hdr.ui4, &my_char_nxt[1]);
-	Bytes_free = Bytes_free - *my_char_nxt - 1;
-	my_char_nxt = my_char_nxt + *my_char_nxt + 1;
-	if (Bytes_free < 24) my_char_nxt = selectNewBuffer (my_char_nxt);
-	VmioBase[VMIO_PORT_A] = 0x00;	/* Reset timer level (if present) */
-#else
-        printf("%#8.8x\n",lwl_hdr.ui4);
-#endif
-      }
-    }
-		/* Our flag has been set. There should be ..
-		** .. a message waiting for us. Return to process it.
-		*/
-  }
-/*
-**-----------------------------------------------------------------------------
-*/
-  void	SinqHM_filler_daq () {
-/*	=================
-*/
-    int	    is;
-
-    switch (Hm_mode & (~SQHM__SUB_MODE_MSK)) {
-     case SQHM__TRANS:
-      SinqHM_filler_daq_trans ();	/* Do Transparent mode */
-      break;
-     case SQHM__HM_DIG:
-      SinqHM_filler_daq_hm_dig ();	/* Do Digitised-type detectors */
-      break;
-     case SQHM__HRPT:
-      SinqHM_filler_daq_hrpt ();	/* Do HRPT (CERCA) type detectors */
-      break;
-     case SQHM__HM_PSD:
-      SinqHM_filler_daq_psd ();		/* Do PSD readout  */
-      break;
-     case SQHM__TOF:
-      SinqHM_filler_daq_tof ();		/* Do time-of-flight read-out */
-      break;
-    }
-  }
-/*
-**=============================================================================
-**			Here beginneth the main code for FILLER ...
-*/
-  int SinqHM_filler (int suspend_flag) {
-/*    =============
-**		    FILLER - Scaler Overflow Handler for SinqHM sub-system.
-*/
-    int		status, i, is, j, k, wait_result, indx;
-    int		keep_cycling;
-    int		shm_size;
-    char		recd[80];
-
-    struct msg_to_filler_struct msg_buff;
-
-    sigset_t		proc_sigmask;
-    struct sigaction	sig_action;
-/*============================================================================
-*/
-    if (suspend_flag != 0) {
-      printf ("%s: Suspending ...", Filler_name);
-      taskSuspend (0);		/* We've been told to suspend ourself, ..
-				**  .. presumably for debug reasons.
-				*/
-      printf (" suspension ended!\n");
-    }
-/*============================================================================
-**	    Create message queue for receiving requests from clients.
-*/
-    if (MsgQ_to_filler == NULL) {
-      MsgQ_to_filler = msgQCreate (8, sizeof (msg_buff), MSG_Q_FIFO);
-      if (MsgQ_to_filler == NULL) {
-	printf ("%s -- failed to create MsgQ_to_filler message queue.\n",
-			    Filler_name);
-	exit (KER__BAD_VALUE);
-      }
-      if (Dbg_lev1) {
-	printf ("%s -- created MsgQ_to_filler message queue.\n", Filler_name);
-      }
-    }
-    while (msgQNumMsgs (MsgQ_to_filler) > 0) {	/* Ensure Q is empty */
-      msgQReceive (MsgQ_to_filler, (char *) &msg_buff, sizeof (msg_buff),
-		    WAIT_FOREVER);
-    }
-/*============================================================================
-**	    Create message queues for sending replies to servers.
-**	    Note: MsgQ_to_server[0] is used for messages to SinqHM-master.
-*/
-    for (i = 0; i <= MAX_CLIENTS; i++) {
-      if (MsgQ_to_server[i] == NULL) {
-	MsgQ_to_server[i] = msgQCreate (8, sizeof (msg_buff), MSG_Q_FIFO);
-	if (MsgQ_to_server[i] == NULL) {
-	  printf ("%s -- failed to create MsgQ_to_server[%d] message queue.\n",
-					Filler_name, i);
-	  exit (KER__BAD_VALUE);
-	}
-	if (Dbg_lev1) {
-	  printf ("%s -- created MsgQ_to_server[%d] message queue.\n",
-					Filler_name, i);
-	}
-      }
-      while (msgQNumMsgs (MsgQ_to_server[i]) > 0) {	/* Ensure Q is empty */
-	msgQReceive (MsgQ_to_server[i], (char *) &msg_buff, sizeof (msg_buff),
-		    WAIT_FOREVER);
-      }
-    }
-/*============================================================================*/
-    Filler_flag = 0;		/* Ensure the communication flag is zero */
-
-    Server_masks[0] = 0x8000;   /* This is our bit in SinqHM_Dsbl_Mask */
-    for (i = 1; i <= MAX_CLIENTS; i++) Server_masks[i] = 1 << (i - 1);
-
-    SinqHM_Dsbl_Mask = 0;	/* Start up with DAQ enabled */
-
-    /*
-      set up address of fibre optic. This is very board specific!
-      The last 3 bytes of this address are set in the programmable logic
-      of the mezzanine card. The first byte is the offset of the PCI memory
-      space in the processor memory map. Together the address must result 
-      in a valid address lying in the region reserved for PCI I/O. The 
-      program on the mezzanine card may need updating in order to ensure just
-      that.
-
-      Mark Koennecke, February 2002
-    */
-#ifdef MV2600
-    Lwl_fifo = (uint *) 0x80008080;
-#else
-    Lwl_fifo = (uint *) 0x80810080; /* for MVME1603 boards */ 
-#endif
- 
-    /*
-      For the MEN board the pci-to-pci bridge to the mezzanine card
-      has to be configured........... 
-    */
-#ifdef MEN_A012
-    printf("Configuring for MEN....\n");
-    Lwl_fifo = (uint *) 0x8a200000;
-    pciConfigOutWord(0,0x1d,0,0x04,0x0007);
-    pciConfigOutWord(0,0x1d,0,0x20,0x8a20);
-    pciConfigOutWord(0,0x1d,0,0x22,0x8a20);
-#endif
-
-    printf("Value at lwl_fifo = %x, address = %x\n", *Lwl_fifo, Lwl_fifo);
-
-    Lwl_csr  = &Lwl_dummy_csr;		/* Set up address of dummy CSR */
-/*============================================================================
-**	Define our signal mask first and define an action routine to catch
-**	the SIGINT signal our parent will send us when he wants us to exit.
-*/
-    status = sigemptyset (&proc_sigmask);
-    status = sigprocmask (SIG_SETMASK, &proc_sigmask, NULL);
-
-    status = sigemptyset (&sig_action.sa_mask);
-    sig_action.sa_handler = catch_int_signal;
-    sig_action.sa_flags   = 0;
-    if (sigaction (SIGINT, &sig_action, NULL) == -1) {
-      getErrno (&My_errno);
-      perror ("sigaction error:");
-      exit (KER__BAD_VALUE);
-    }
-/*============================================================================
-**	When we can do it, ensure the detector read-out is inhibited and
-**	flush out any data in the fibre-optic FIFO.
-*/
-    *Lwl_csr = 0x0001;	/* This will (maybe) initialise the fibre-optic FIFO. */
-    printf("vxWorks thinks it still has %d bytes of memory\n",memFindMax());
-	   
-    printf("Flushing lwl.....\n");
-    lwl_Fifo_Flush ();	/* Flush the fibre-optic FIFO. */
-
-/*============================================================================
-**	Initialisation done, release semaphore so that our parent can continue.
-*/
-    if (Dbg_lev1) printf ("%s -- releasing Sem_Filler semaphore\n",
-				    Filler_name);
-    is = semGive (Sem_Filler);
-    if (Dbg_lev1)
-      printf ("%s -- returned from sem release: %d\n", Filler_name, is);
-    if (is != OK) {
-      printf ("%s -- sem release error\n", Filler_name);
-      exit (KER__BAD_VALUE);
-    }
-    taskDelay ((sysClkRateGet())/2); /* Give parent time to display a message */
-/*============================================================================
-**		    Make a timer to give occasional status on console
-*/
-    FillTimer_active = False;
-    FillTimer_expired = False;
-    if (Hm_mode_NO_STAT != 0) {
-      printf ("%s -- display of TSI information suppressed\n", Filler_name);
-    }else {
-      is = timer_create (CLOCK_REALTIME, NULL, &FillTimerId);
-      if (is != 0) {
-	printf ("%s -- timer creation failed\n", Filler_name);
-      }else {
-	is = timer_connect (FillTimerId, SinqHM_filler_timer_handler, 0);
-	if (is != 0) {
-	  printf ("%s -- failed to connect to timer\n", Filler_name);
-	}else {
-	  FillerTime.it_value.tv_sec = 2;	    /* Set a 2 second timer */
-	  FillerTime.it_value.tv_nsec = 0;
-	  FillerTime.it_interval.tv_sec = 0;
-	  FillerTime.it_interval.tv_nsec = 0;
-	  is = timer_settime (FillTimerId, ~TIMER_ABSTIME, &FillerTime, NULL);
-	  if (is != 0) {
-	    printf ("%s -- failed to set timer\n", Filler_name);
-	  }
-	  FillTimer_active  = True;
-	}
-      }
-    }
-/*============================================================================
-**		    Loop taking data and waiting for requests from clients.
-*/
-    for (keep_cycling = True; keep_cycling;) {
-      if (SinqHM_Dsbl_Mask == 0) {
-	SinqHM_filler_daq ();	/* Start data acquisition ..
-				** .. We return here whenever Filler_flag ..
-				** .. indicates that a message is waiting ..
-				** .. to be processed.
-				*/
-      }
-      is = msgQReceive (MsgQ_to_filler, (char *) &msg_buff, sizeof (msg_buff),
-			    WAIT_FOREVER);
-      if (is <= 0) {
-	printf ("%s -- error status from msgQReceive: %d\n", Filler_name, is);
-	exit (KER__BAD_VALUE);
-      }
-      if (Dbg_lev1) printf ("%s -- received a message of %d bytes!\n",
-					Filler_name, is);
-      Filler_flag = 0;
-      indx = msg_buff.u.uu.index;
-      switch (msg_buff.u.uu.cmnd) {
-       case DAQ__EXIT:
-	keep_cycling = False;	    /* Break out of the loop */
-	break;
-       case DAQ__CLR:
-	SinqHM_Dsbl_Mask &= (~Server_masks[indx]);  /* Clear user's mask bit. */
-	break;
-       case DAQ__GO:
-	SinqHM_Dsbl_Mask &= (~Server_masks[0]);	    /* Clear our mask bit */
-	break;
-       case DAQ__INH:
-	SinqHM_Dsbl_Mask |= Server_masks[indx];	    /* Set user's mask bit */
-	break;
-       case DAQ__STOP:
-	SinqHM_Dsbl_Mask |= Server_masks[0];	    /* Set our mask bit. */
-	break;
-      }
-      msg_buff.u.uu.new_mask = SinqHM_Dsbl_Mask;    /* Put new mask in reply */
-      is = msgQSend (MsgQ_to_server[indx],	    /* Tell user to continue */
-			(char *) &msg_buff,
-			sizeof (msg_buff),
-			WAIT_FOREVER, MSG_PRI_NORMAL);
-      if (is != OK) {
-	printf ("%s -- error status from msgQSend: %d\n", Filler_name, is);
-	exit (KER__BAD_VALUE);
-      }
-    }
-    exit (KER__SUCCESS);
-  }
-/*======================================= End of SinqHM_srv_filler.c ========*/
-
-
-
-
diff --git a/sinqhm/SinqHM_srv_main.c b/sinqhm/SinqHM_srv_main.c
deleted file mode 100755
index 622e75d8..00000000
--- a/sinqhm/SinqHM_srv_main.c
+++ /dev/null
@@ -1,378 +0,0 @@
-#define	    IDENT	"1D02"
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     SINQ Division				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...SinqHM]SinqHM_srv_main.c
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Oct 1996
-**
-** Updates:
-**  1A01  1-Oct-1996 DM	    Initial version.
-**  1B01 16-Jul-1997 DM	    Flush fibre-optic FIFO on SQHM_ZERO and SQHM_WRITE.
-**  1C01 24-Jun-1998 DM	    Add TOF support.
-**  1C06 10-Aug-1999 DM	    Add instrument dependent conditional code.
-**---------------------------------------------------------------------------
-**  SinqHM_srv_main.c is the main program of a SINQ Histogram Memory process
-**  which will run in a front-end processor and perform the necessary
-**  operations for a SINQ multi-detector.
-**
-**  Communication between SinqHM_srv and the client is via TCP/IP protocol.
-**
-**  To compile and link this program for VxWorks on PSS123, use:
-**
-	    ccvx '-DINST="<instr>"' SinqHM_srv_main.c
-	    ccvx '-DINST="<instr>"' SinqHM_srv_routines.c
-	    ccvx '-DINST="<instr>"' SinqHM_srv_filler.c
-	    ccvx '-DINST="<instr>"' SinqHM_srv_server.c
-** where
-	    ccvx = ccppc -O0			\
-		    -mcpu=603			\
-		    -I${WIND_BASE}/target/h	\
-		    -fno-builtin		\
-		    -fno-for-scope		\
-		    -nostdinc			\
-		    -DCPU=PPC603		\
-		    -D_GNU_TOOL			\
-		    -gdwarf -c -Wimplicit
-** and
-**	    <instr> = DMC, SANS, FOCUS, HRPT, TRICS or POLDI
-
-    ldppc -o SinqHM_srv.o -r SinqHM_srv_main.o	    \
-			     SinqHM_srv_routines.o  \
-			     SinqHM_srv_filler.o    \
-			     SinqHM_srv_server.o
-
-**  and, on the target,
-**
-**   -> ld < /home/pss123/aco/maden/wind/SinqHM/SinqHM_srv.o
-**   -> taskSpawn "SinqHM_srv", 100, 8, 20000, SinqHM_srv, <port>
-**							   ^
-**							   |
-**				      default = 2400 ------+
-**
-**====================================================================
-*/
-#include    "vxWorks.h"
-#include    "taskLib.h"
-#include    "msgQLib.h"
-#include    "sockLib.h"
-
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <string.h>
-#include    <unistd.h>
-#include    <errno.h>
-#include    <netinet/in.h>
-#include    <arpa/inet.h>
-#include    <sys/types.h>
-#include    <sys/socket.h>
-#include    <setjmp.h>
-#include    <time.h>
-
-#include    <signal.h>		/* Get POSIX signal definitions. */
-#include    <timers.h>
-#include    <sys/mman.h>	/* Get POSIX mem mgmnt definitions. */
-#include    <sys/wait.h>	/* Get POSIX wait definitions. */
-/*
-**====================	Global Definitions =====================================
-*/
-#include    "SinqHM_def.h"
-#include    "SinqHM_gbl.h"
-/*
-
-**=============================================================================
-**  Local routines.
-**
-**    None
-*/
-/*==============================================================================
-
-**  Main line program
-**  ------------------
-**============================================================================*/
-  int SinqHM_srv (int port, int use_level_gen, char *base_addr,
-		  int arg4, int arg5, int arg6, int arg7, int arg8, int arg9,
-		  int suspend) {
-/*============================================================================*/
-    struct req_buff_struct	    req_buff;
-    struct rply_buff_struct	    rply_buff;
-
-    int			i, j, is, status, cntr;
-    int			keep_going = OK;
-    int			bytes_to_come, n_bytes_got;
-    char		*p_addr;
-    int			cl_port;
-    int			do_send;
-    int			cnct_skt;	/* Connection socket */
-    int			rw_skt;		/* Read/write socket */
-    struct sockaddr_in	lcl_sockname;
-    struct sockaddr_in	rmt_sockname;
-    int			rmt_sockname_len;
-    int			pkt_size;
-    time_t		timer;
-
-    sigset_t		proc_sigmask;
-    struct sigaction	sig_action;
-
-/*============================================================================
-*/
-    if (suspend != 0) {
-      printf ("\nSinqHM_srv: Suspending ...\n");
-      taskSuspend (0);	    /* We've been told to suspend ourself, ..
-			    **  .. presumably for debug reasons.
-			    */
-      printf ("\nSinqHM_srv: Suspension ended!\n");
-    }
-/*============================================================================
-**	Perform the initialisation of global variables ...
-*/
-    StrJoin (Instr_name, sizeof (Instr_name), INST, "");     /* Save the instr.
-							     ** name in a global
-							     */
-    StrJoin (Def_ident, sizeof (Def_ident), SINQHM_DEF_ID, "");
-    StrJoin (Sqhm_main_ident, sizeof (Sqhm_main_ident), IDENT, "");
-    StrJoin (Sqhm_main_date,  sizeof (Sqhm_main_date),  __DATE__, ", ");
-    StrJoin (Sqhm_main_date,  sizeof (Sqhm_main_date),  Sqhm_main_date, __TIME__);
-    SinqHM_server_setup_id ();
-    SinqHM_filler_setup_id ();
-    SinqHM_routines_setup_id ();
-    time (&Sqhm_start_time);	/* Initialise the start time */
-
-    StrJoin (Tsk_name[0], sizeof (Tsk_name[0]), taskName (get_pid ()), "");
-
-    Dbg_mask = 0;
-    Dbg_lev0 = 0;
-    Dbg_lev1 = 1;
-    Dbg_lev2 = 0;
-    Dbg_lev3 = 0;
-    Cfgn_done = 0;	  /* Force a configuration before we can do anything. */
-
-    free_HM_memory (NULL);  /* Release memory (possibly) in case ..
-			    ** .. of a restart of the program */
-    Parent_pid = get_pid ();
-    Filler_pid    = 0;
-    for (i = 0; i <= MAX_CLIENTS; i++) {
-      Child_pid[i] = 0;
-      Child_exit_status[i] = 0;
-    }
-
-    if (Sem_Filler == NULL) {
-      Sem_Filler = semBCreate (SEM_Q_FIFO, SEM_FULL);
-    }
-
-    if (Sem_Server == NULL) {
-      Sem_Server = semBCreate (SEM_Q_FIFO,SEM_FULL);
-    }
-/*
-**	Debug hint - set Use_sem_tmo to zero to disable semaphore time-outs
-**		     during debug sessions. This will stop FILLER falling off.
-*/
-    Sem_tmo = 10;	/* 10 second time-out by default */
-    Use_sem_tmo = 0;
-
-    setupLevelGenerator (use_level_gen, base_addr);
-/*============================================================================
-**	Clear the process signal mask to let in all signals (actually, on
-**	PPC VxWorks this seems to cause all signals to get ignored!) and then
-**	declare action routine for SIGUSR1. Our children signal with SIGUSR1
-**	just before they exit in a more or less controlled manner. If the
-**	child gets deleted from the shell, it will not signal.
-*/
-    Cnt_SIGUSR1 = 0;
-
-    status = sigemptyset (&proc_sigmask);
-    status = sigprocmask (SIG_SETMASK, &proc_sigmask, NULL);
-    status = sigemptyset (&sig_action.sa_mask);
-    sig_action.sa_handler = catch_signal;
-    sig_action.sa_flags   = 0;
-
-    if (sigaction (SIGUSR1, &sig_action, NULL) == -1) {
-      getErrno (&My_errno);
-      perror ("sigaction error:");
-      exit (0);
-    }
-/*============================================================================
-**		Get a port number to use. If the argument "port" is not
-**		a valid port number (not in range 128 to 32767), use PORT_BASE.
-*/
-    Port_base = PORT_BASE;
-    if ((port >= 128) && (port < 32768)) Port_base = port;
-/*============================================================================
-**	Create a TCP/IP socket for receiving connection requests, bind it and
-**	set it to listen.
-*/
-    cnct_skt = socket (AF_INET, SOCK_STREAM, 0);
-    if (cnct_skt == -1)
-      failInet_port ("\nhmRoot%d -- Cnct-Socket socket error", Port_base);
-    status = 1;
-    setsockopt(cnct_skt, SOL_SOCKET, SO_REUSEADDR, &status, sizeof(int));
-
-    lcl_sockname.sin_family = AF_INET;
-    lcl_sockname.sin_port   = htons (Port_base);
-    lcl_sockname.sin_addr.s_addr = 0;
-    status = bind (cnct_skt, (struct sockaddr *) &lcl_sockname,
-					  sizeof (lcl_sockname));
-    if (status != 0) failInet_port ("\nhmRoot%d -- Cnct-Socket bind error",
-					    Port_base);
-    status = listen (cnct_skt, 5);
-    if (status != 0) failInet_port ("\nhmRoot%d -- Cnct-Socket listen error",
-					    Port_base);
-/*
-**	    Clients must now connect to the Connect-port and send either a
-**	    connect, configure, deconfigure, status or exit request. A
-**	    successful configure request must precede any connection request.
-**
-**	    When a configure request arrives, the histogram data structures are
-**	    initialised, the histogram filler process (FILLER) is spawned and
-**	    connection requests are enabled. A status reply is sent to the
-**	    client and the connection closed.
-**
-**	    When a connection request arrives, a child will be spawned to
-**	    handle the connection. The child will be told which port to use
-**	    and he will release a semaphore when the port is ready. The parent
-**	    then sends the client a reply to tell him which port to use. The
-**	    connection is then closed to await further connections.
-*/
-    setup_inet_info (Inet_host, sizeof (Inet_host), /* Find out who we are */
-		     Inet_addr, sizeof (Inet_addr));
-    printf ("\n%s: Program  Ident = \"%s\". Started on %s (%s).\n",
-		    Tsk_name[0], IDENT, Inet_host, Inet_addr);
-    printf ("%s: Protocol Ident = \"%s\"\n", Tsk_name[0], SINQHM_DEF_ID);
-
-#ifndef INST
-    #error  Define the target instrument via the symbol "INST"!
-#endif
-
-    if (strcmp (INST, "DMC") == 0) {
-      printf ("%s: Instrument = \"%s\"\n", Tsk_name[0], "DMC");
-      Lwl_hdr_daq_mask = LWL_HDR_NRL_MASK;
-      Lwl_hdr_daq_soll = 0;
-    }else if (strcmp (INST, "SANS") == 0) {
-      printf ("%s: Instrument = \"%s\"\n", Tsk_name[0], "SANS");
-      Lwl_hdr_daq_mask = LWL_HDR_NRL_MASK;
-      Lwl_hdr_daq_soll = 0;
-    }else if (strcmp (INST, "FOCUS") == 0) {
-      /*
-      Lwl_hdr_daq_mask = LWL_HDR_NRL_MASK | LWL_HDR_SYNC2_MASK;
-      Lwl_hdr_daq_soll = 0;
-      */
-      Lwl_hdr_daq_mask = 0x00f00000;
-      Lwl_hdr_daq_soll = 0x00200000;
-      printf ("%s: Instrument = \"%s\"\n", Tsk_name[0], "FOCUS");
-    }else if (strcmp (INST, "HRPT") == 0) {
-      printf ("%s: Instrument = \"%s\"\n", Tsk_name[0], "HRPT");
-      Lwl_hdr_daq_mask = LWL_HDR_SYNC0_MASK | LWL_HDR_SYNC2_MASK;
-      Lwl_hdr_daq_soll = LWL_HDR_SYNC2_MASK;
-    }else if (strcmp (INST, "TRICS") == 0) {
-      printf ("%s: Instrument = \"%s\"\n", Tsk_name[0], "TriCS");
-      /*
-      Lwl_hdr_daq_mask = LWL_HDR_NRL_MASK | LWL_PSD_PWF;
-      Lwl_hdr_daq_soll = 0;
-      */
-      Lwl_hdr_daq_mask = 0x00f00000;
-      Lwl_hdr_daq_soll = 0x00e00000;
-    }else if (strcmp(INST,"AMOR") == 0) {
-      printf ("%s: Instrument = \"%s\"\n", Tsk_name[0], "AMOR");
-      Lwl_hdr_daq_mask = LWL_HDR_NRL_MASK | LWL_PSD_PWF;
-      Lwl_hdr_daq_soll = 0;
-      /*
-      Lwl_hdr_daq_mask = 0x00f00000;
-      Lwl_hdr_daq_soll = 0x00600000;
-      */
-    }else if (strcmp (INST, "POLDI") == 0) {
-      printf ("%s: Instrument = \"%s\"\n", Tsk_name[0], "POLDI");
-      Lwl_hdr_daq_mask = LWL_HDR_NRL_MASK;
-      Lwl_hdr_daq_soll = 0;
-      printf ("%s: Warning -- Lwl_hdr_daq_mask and Lwl_hdr_daq_soll are "
-		    "provisional!\n", Tsk_name[0]);
-    }else {
-      printf ("%s: Instrument is not defined\n", Tsk_name[0]);
-      Lwl_hdr_daq_mask = LWL_HDR_NRL_MASK;
-      Lwl_hdr_daq_soll = 0;
-    }
-    printf ("%s: Lwl_hdr_daq_mask = 0x%08x", Tsk_name[0], Lwl_hdr_daq_mask);
-    if ((Lwl_hdr_daq_mask & LWL_HDR_NRL_MASK) != 0) printf (" NRL");
-    if ((Lwl_hdr_daq_mask & LWL_HDR_SYNC3_MASK) != 0) printf (" SYNC3");
-    if ((Lwl_hdr_daq_mask & LWL_HDR_SYNC2_MASK) != 0) printf (" SYNC2");
-    if ((Lwl_hdr_daq_mask & LWL_HDR_SYNC1_MASK) != 0) printf (" SYNC1");
-    if ((Lwl_hdr_daq_mask & LWL_HDR_SYNC0_MASK) != 0) printf (" SYNC0");
-    printf ("\n%s: Lwl_hdr_daq_soll = 0x%08x", Tsk_name[0], Lwl_hdr_daq_soll);
-    if ((Lwl_hdr_daq_soll & LWL_HDR_NRL_MASK) != 0) printf (" NRL");
-    if ((Lwl_hdr_daq_soll & LWL_HDR_SYNC3_MASK) != 0) printf (" SYNC3");
-    if ((Lwl_hdr_daq_soll & LWL_HDR_SYNC2_MASK) != 0) printf (" SYNC2");
-    if ((Lwl_hdr_daq_soll & LWL_HDR_SYNC1_MASK) != 0) printf (" SYNC1");
-    if ((Lwl_hdr_daq_soll & LWL_HDR_SYNC0_MASK) != 0) printf (" SYNC0");
-    printf ("\n");
-
-    while (keep_going == OK) {
-      rmt_sockname_len = sizeof (rmt_sockname);
-      rw_skt = accept (cnct_skt, (struct sockaddr *) &rmt_sockname,
-						&rmt_sockname_len);
-      if (rw_skt == -1) {
-        getErrno (&My_errno);
-	failInet_port ("\nhmRoot%d -- Cnct-Socket accept error", Port_base);
-	/* No return */
-      }
-      Rw_bytes_got = 0; Rw_bytes_put = 0;
-
-      p_addr = inet_ntoa (rmt_sockname.sin_addr);
-      cl_port = ntohs (rmt_sockname.sin_port);
-      printf ("\n%s: Connected to Host %s, Port %d.\n",
-				Tsk_name[0], p_addr, cl_port);
-
-      bytes_to_come = sizeof (req_buff);   /* Read a command */
-      p_addr = (char *) &req_buff;
-      while (bytes_to_come > 0) {
-	n_bytes_got = recv (rw_skt, p_addr, bytes_to_come, 0);
-	if (n_bytes_got <= 0) break;
-	Rw_bytes_got += n_bytes_got;
-	bytes_to_come -= n_bytes_got;
-	p_addr += n_bytes_got;
-      }
-
-      if (Cnt_SIGUSR1 > 0) {	    /* Have any children exited? */
-	if (Dbg_lev0) printf ("hmRoot%d: Cleaning up children ...", Port_base);
-        cleanup_children ();	    /* Yes, update our database. */
-	if (Dbg_lev0) printf ("\n  ... cleanup of children done.\n");
-      }
-
-      if (n_bytes_got < 0) {
-	printf ("\007"
-		"%s -- R/W-Socket recv error\n", Tsk_name[0]);
-	printf ("%s -- Connection to %s will be closed.\n", Tsk_name[0],
-			    inet_ntoa (rmt_sockname.sin_addr));
-      }else if (n_bytes_got == 0) {
-	printf ("\007"
-		"%s -- no command received!\n", Tsk_name[0]);
-	printf ("%s -- Connection to %s will be closed.\n", Tsk_name[0],
-			    inet_ntoa (rmt_sockname.sin_addr));
-      }else if (n_bytes_got != sizeof (req_buff)) {
-	printf ("\007"
-		"%s -- command packet has wrong number of bytes:"
-		" %d instead of %d\n", Tsk_name[0],
-		n_bytes_got, sizeof (req_buff));
-	printf ("%s -- Connection to %s will be closed.\n", Tsk_name[0],
-			    inet_ntoa (rmt_sockname.sin_addr));
-      }else if (ntohl (req_buff.bigend) != 0x12345678) {
-	printf ("\007"
-		"%s -- big-endian/little-endian problem!\n"
-		"   Buffer received in non-network byte order!\n", Tsk_name[0]);
-      }else {
-	do_command (0, rw_skt, 4096, &req_buff, &rply_buff);
-      }
-      close (rw_skt);
-      if (ntohl (req_buff.cmnd) == SQHM_EXIT) keep_going = !OK;
-    }
-    close (cnct_skt);
-    exit (KER__SUCCESS);
-  }
-/*========================================= End of SinqHM_srv_main.c ========*/
diff --git a/sinqhm/SinqHM_srv_routines.c b/sinqhm/SinqHM_srv_routines.c
deleted file mode 100755
index a5cb81a3..00000000
--- a/sinqhm/SinqHM_srv_routines.c
+++ /dev/null
@@ -1,4130 +0,0 @@
-#define	    IDENT	"1B06"
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     SINQ Division				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...SinqHM]SinqHM_srv_routines.c
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Dec 1996
-**
-** Updates:
-**  1A01 12-Dec-1996 DM	    Initial version.
-**  1A06 16-Jul-1997 DM	    Flush fibre-optic FIFO on SQHM_ZERO and SQHM_WRITE.
-**  1B01 11-Jun-1999 DM	    Add SQHM__HRPT mode.
-**  1B02 10-Aug-1999 DM	    Make Lwl_hdr_daq_mask/Lwl_hdr_daq_soll dependent
-**				on the instrument.
-**  1B03 May-2001    MK     Added code for AMOR/TRICS PSD
-**  1B04 August 2001 MK     Added code for AMOR to PROJECT handling
-**---------------------------------------------------------------------------
-**  SinqHM_srv_routines.c is part of the SINQ Histogram Memory process
-**  which will run in a front-end processor and perform the necessary
-**  operations for a SINQ multi-detector. It provides various utility routines.
-**
-**  To compile this program for VxWorks on PSS123, use:
-**
-	    ccvx SinqHM_srv_routines.c
-** where
-	    ccvx = ccppc -O0			\
-		    -mcpu=603			\
-		    -I${WIND_BASE}/target/h	\
-		    -fno-builtin		\
-		    -fno-for-scope		\
-		    -nostdinc			\
-		    -DCPU=PPC603		\
-		    -D_GNU_TOOL			\
-		    -gdwarf -c -Wimplicit
-**====================================================================
-*/
-#include    <vxWorks.h>
-#include    <taskLib.h>
-#include    <msgQLib.h>
-#include    <sockLib.h>
-#include    <hostLib.h>
-#include    <inetLib.h>
-#include    <sysLib.h>
-#ifdef MEN_A012
-/*
-#include <MEN/men_typs.h>
-#include <sysLib_men.h>
-*/
-extern PART_ID sysHighMemPart;
-#endif
-#include    <tickLib.h>
-
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <ioLib.h>
-#include    <signal.h>
-#include    <timers.h>
-#include    <string.h>
-#include    <errno.h>
-#include    <netinet/in.h>
-#include    <unistd.h>
-#include    <setjmp.h>
-#include    <vme.h>
-
-
-/*
-**====================	Global Definitions =====================================
-*/
-#include    "SinqHM_def.h"
-#include    "SinqHM_gbl.h"
-#include    "vmio10_def.h"
-
-  extern    char    *vxWorksVersion;	/* Version string of vxWorks */
-  extern    char    *creationDate;	/* Creation Date string of vxWorks */
-/*========================== Define some prototypes ================*/
-/*
-
-**=============================================================================
-**  Routines in this Module:
-**
-**  SinqHM_routines_setup_id	: copy some ident information to global vars.
-**
-**  catch_int_signal	 : SIGINT signal catching routine.
-**  catch_machine_check	 : SIGBUS signal catching routine.
-**  catch_signal	 : Signal catching routine.
-**  chk_config_alloc	 : Check a configuration request and allocate memory.
-**  cleanup_children	 : Find out which child(ren) have exited.
-**  close_down_offspring : Close down FILLER and, possibly, other children.
-**  do_SQHM__HM_DIG_alloc: SQHM__HM_DIG aux routine for chk_config_alloc.
-**  do_SQHM__HRPT_alloc	 : SQHM__HRPT   aux routine for chk_config_alloc.
-**  do_SQHM__TOF_alloc	 : SQHM__TOF    aux routine for chk_config_alloc.
-**  do_SQHM__PSD_alloc	 : SQHM__PSD    aux routine for chk_config_alloc.
-**  do_SQHM__TRANS_alloc : SQHM__TRANS  aux routine for chk_config_alloc.
-**  do_command		 : Routine to handle a network command.
-**  do_daq		 : Action routine for SINQHM_DAQ command.
-**  do_project		 : Read projected histogram data.
-**  do_read		 : Read  a block of the histogram memory.
-**  do_write		 : Write a block of the histogram memory.
-**  do_zero		 : Action routine for SINQHM_ZERO command.
-**  failInet		 : Call to report fatal network failure.
-**  failInet_port	 : Call to failInet with an extra parameter.
-**  free_HM_memory	 : Release any allocated data structures.
-**  getErrno		 : Get local copy of errno.
-**  get_pid		 : Get our process ID (= TaskID under VxWorks).
-**  kill_children	 : Send stop signals to all children to stop them.
-**  lwl_Fifo_Flush	 : Flush out any data in the fibre-optic FIFO.
-**  lwl_Packet_Read	 : Read out current packet from the fibre-optic FIFO.
-**  make_child		 : Make a child process and activate it.
-**  make_filler		 : Make the filler process and activate it.
-**  net_flush		 : Flush out data from socket.
-**  process_coinc_tsi	 : Process a "coincidence" type TSI packet.
-**  process_no_coinc_tsi : Process a "normal" type TSI packet.
-**  rply_status_send	 : Send a reply status message to client.
-**  rply_status_setup	 : Setup a reply status message to client.
-**  rply_status_setup_and_send	 : Setup & send a reply status msg to client.
-**  selectNewBuffer	 : Move to new buffer in SQHM_TRANS mode.
-**  setupLevelGenerator	 : Set up VMIO10 module for generating timing signals.
-**  setup_inet_info	 : Used to get Internet Node name and addr from system.
-**  sleep		 : Go to sleep for a bit.
-**  StrJoin		 : join 2 strings.
-**==============================================================================
-*/
-  void	SinqHM_routines_setup_id () {
-/*	========================
-**		Simply copy some ident information to global variables
-**		for use by the SQHM_IDENT request.
-*/
-    StrJoin (Sqhm_rout_ident, sizeof (Sqhm_rout_ident), IDENT, "");
-    StrJoin (Sqhm_rout_date,  sizeof (Sqhm_rout_date),  __DATE__, ", ");
-    StrJoin (Sqhm_rout_date,  sizeof (Sqhm_rout_date),  Sqhm_rout_date, __TIME__);
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void catch_int_signal (int signo) {
-/*     ================
-**	    Action Routine for catching SIGINT signals. This is a signal
-**	    from the parent to get its child to exit. An exit will be performed.
-*/
-    int	    i, is;
-    pid_t   my_pid;
-
-    my_pid = get_pid ();
-			    /*
-			    ** Try to find our index by searching the PID list
-			    */
-    if (my_pid == Filler_pid) {
-      if (FillTimer_active) {	    /* If Filler, kill off timer */
-	is = timer_cancel (FillTimerId);
-	if (is != 0) printf ("Problem cancelling FillTimer\n");
-	is = timer_delete (FillTimerId);
-	if (is != 0) printf ("Problem deleting FillTimer\n");
-	FillTimer_active = False;
-      }
-    }else {
-      for (i = MAX_CLIENTS; i > 0; i--) if (my_pid == Child_pid[i]) break;
-      if (i > 0) {
-	if (Child_rw_skt[i] != 0) {
-	  printf ("\nClosing r/w socket of task %s\n", Tsk_name[i]);
-	  close (Child_rw_skt[i]);
-	  Child_rw_skt[i] = 0;
-	}
-	if (Child_cnct_skt[i] != 0) {
-	  printf ("\nClosing connect socket of task %s\n", Tsk_name[i]);
-	  close (Child_cnct_skt[i]);
-	  Child_cnct_skt[i] = 0;
-	}
-      }
-    }
-
-    if (Dbg_lev0) printf ("catch_int_signal: Signal %d received by PID 0x%x.\n",
-				    signo, my_pid);
-    switch (signo) {
-     case SIGINT:	    /* A SIGINT signal has been received. Exit. */
-       exit (KER__SUCCESS);
-       break;
-     default:
-       printf ("catch_int_signal: Unexpected signal %d received by PID 0x%x.\n",
-				    signo, my_pid);
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void catch_machine_check (int signo) {
-/*     ===================
-*/
-    longjmp (Vmio_trap_env, 1);	    /* Return to trapped code */
-  }
-/*
-**--------------------------------------------------------------------------
-*/
-  void catch_signal (int signo) {
-/*     ============
-**		    Action Routine for catching signals from Child Processes.
-*/
-    pid_t   my_pid;
-
-    my_pid = get_pid ();
-    if (Dbg_lev0) printf ("catch_signal: Signal %d received by PID 0x%x.\n",
-						    signo, my_pid);
-    switch (signo) {
-     case SIGUSR1:	    /* A child is about to exit. */
-       Cnt_SIGUSR1++;
-       sleep (1);	    /* Give it a chance to disappear! */
-       break;
-     default:
-       printf ("catch_signal: Unexpected signal received by PID 0x%x: %d.\n",
-				    my_pid, signo);
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int chk_config_alloc (
-/*    ================
-*/			int			 skt,
-			struct req_buff_struct	*request,
-			struct rply_buff_struct	*reply) {
-/*
-**
-**	    Routine to check a configuration request and reserve the
-**	    space for the histogram data.
-**		Return	OK    if configuration request OK.
-**			ERROR if error.
-*/
-    int	    i, mask, s_stat;
-
-    Hm_mode_ALL = ntohl (request->u.cnfg.mode);	/* The histogramming mode */
-
-    Hm_mode	    = Hm_mode_ALL & (~SQHM__SUB_MODE_MSK);
-    Hm_mode_DEBUG   = Hm_mode_ALL & SQHM__DEBUG;
-    Hm_mode_UD	    = Hm_mode_ALL & SQHM__UD;
-    Hm_mode_BO	    = Hm_mode_ALL & SQHM__BO_MSK;
-    Hm_mode_STROBO  = Hm_mode_ALL & SQHM__STROBO;
-    Hm_mode_REFLECT = Hm_mode_ALL & SQHM__REFLECT;
-    Hm_mode_NO_STAT = Hm_mode_ALL & SQHM__NO_STAT;
-
-    switch (Hm_mode) {
-     /*----------------------------*/
-     case SQHM__TRANS:
-      s_stat = do_SQHM__TRANS_alloc (request, reply);
-      if (s_stat != OK) return ERROR;
-      break;
-     /*----------------------------*/
-     case SQHM__HM_DIG:
-      s_stat = do_SQHM__HM_DIG_alloc (request, reply);
-      if (s_stat != OK) return ERROR;
-      break;
-     /*----------------------------*/
-     case SQHM__HRPT:
-      s_stat = do_SQHM__HRPT_alloc (request, reply);
-      if (s_stat != OK) return ERROR;
-      break;
-     /*----------------------------*/
-     case SQHM__HM_PSD:
-      s_stat = do_SQHM__PSD_alloc (skt, request, reply);
-      if (s_stat != OK) return ERROR;
-      break;
-     /*----------------------------*/
-     case SQHM__TOF:
-      s_stat = do_SQHM__TOF_alloc (skt, request, reply);
-      if (s_stat != OK) return ERROR;
-      break;
-     /*----------------------------*/
-     default:
-      printf ("\nchk_config_alloc: "
-		"unrecognised histogramming mode: %d.\n", Hm_mode);
-      rply_status_setup (reply, KER__BAD_VALUE, 0, "Unrecognised hist mem mode");
-      return ERROR;
-     /*----------------------------*/
-    }
-    Cfgn_done = 1;
-    return OK;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void cleanup_children () {
-/*     ================
-**		    Find out which child(ren) have exited and update the
-**		    list of task PID's so the associated task slot becomes
-**		    free.
-**
-**		    If FILLER has fallen off, then any active children will
-**		    be told to exit and we shall set our state to "deconfig".
-*/
-    int		i, status, n_active;
-    char       *t_name;
-    pid_t	pid;
-
-    if (Filler_pid != 0) {
-      if (Dbg_lev0) printf ("\n  ... checking state of %s ...", Filler_name);
-      t_name = taskName (Filler_pid);
-      if (t_name == NULL) {
-        if (Dbg_lev0) printf (" it has exited.");
-        Filler_pid = 0;
-      }else {
-        if (Dbg_lev0) printf (" it is still active.");
-      }
-    }
-
-    n_active = 0;
-    for (i = 1; i <= MAX_CLIENTS; i++) {
-      if (Child_pid[i] != 0) {
-	if (Dbg_lev0) printf ("\n  ... checking state of SRV_%02d ...", i);
-	t_name = taskName (Child_pid[i]);
-	if (t_name == NULL) {
-	  if (Dbg_lev0) printf (" it has exited.");
-	  Child_pid[i] = 0;
-	}else {
-	  if (Dbg_lev0) printf (" it is still active.");
-	  n_active += 1;
-	}
-      }
-    }
-    Cnt_SIGUSR1 = 0;
-
-    if ((Filler_pid == 0) && (n_active > 0)) {	/* Must we force a de-config? */
-      for (;;) {			     /* Loop for ever till programmed */
-	printf ("\n\007hmFill has terminated abnormally. A de-configure must"
-					    "be forced\n"
-	      "This has not yet been programmed.\n"
-	      "Re-boot the histogram memory!!\n");
-	sleep (5);
-      }
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int close_down_offspring (
-/*    ====================
-*/			    struct req_buff_struct  *request,
-			    struct rply_buff_struct *reply) {
-/*
-**		    Close down FILLER and, if directed, other children too.
-*/
-    int		i, j;
-    int		n_children = 0, new_c = 0;
-
-    n_children = 0;		/* See if any server children are active */
-    for (i = 1; i <= MAX_CLIENTS; i++) {
-      if (Child_pid[i] != 0) n_children += 1;
-    }
-    if (n_children > 0) {   /* If so, only proceed if asked to be ruthless */
-      if (ntohl (request->u.decnfg.sub_code) == 0) {
-	printf ("\nDe-configure error. ");
-        if (n_children == 1) printf ("1 server is");
-        if (n_children != 1) printf ("%d servers are", n_children);
-	printf (" still active.\n");
-	return KER__BAD_STATE;
-      }else {
-        if (n_children == 1) printf (" -- 1 server is still active. It");
-        if (n_children != 1) printf (" -- %d servers are still active. They",
-						n_children);
-	printf (" will be terminated.\n");
-      }
-    }
-
-    kill_children ();		    /* Kill FILLER and any server children */
-    sleep (1);			    /* Give them chance to exit */
-    cleanup_children ();	    /* Update the PIDs */
-
-    for (j = 0; j < n_children; j++) {	    /* Check to see if all gone */
-      if (Filler_pid == 0) new_c = 0; else new_c = 1;  /* Count remainder */
-      for (i = MAX_CLIENTS; i > 0; i--) {
-	if (Child_pid[i] != 0) new_c += 1;
-      }
-      if (new_c == 0) break;
-      sleep (1);
-      cleanup_children ();
-    }
-    if (new_c != 0) {
-      printf ("     ... failed to tidy up. %d children still active.\n", new_c);
-      return KER__BAD_STATE;
-    }else {
-      return KER__SUCCESS;
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int do_SQHM__HM_DIG_alloc (
-/*    =====================
-*/			struct req_buff_struct  *request,
-			struct rply_buff_struct	*reply) {
-/*
-**		Routine to allocate memory for the SQHM__HM_DIG
-**		configure request.
-**
-*/
-    int		i;
-
-    N_hists = ntohl (request->u.cnfg.u.hm_dig.n_hists);   /* The # of
-					** histograms (used in strobo (gummi)
-					** and Up/Down mode).
-					*/
-    Lo_bin   = ntohl (request->u.cnfg.u.hm_dig.lo_bin);   /* The index of
-					** first bin in histogram
-					*/
-    N_bins   = ntohl (request->u.cnfg.u.hm_dig.num_bins); /* The # of bins
-					** in each histogram
-					*/
-    Bytes_per_bin = ntohl (request->u.cnfg.u.hm_dig.bytes_per_bin); /* The # of
-							      ** bytes per bin
-							      */
-    Compress = ntohl (request->u.cnfg.u.hm_dig.compress); /* The compression
-							  ** factor
-							  */
-    Curr_hist = 0;				/* The selected histogram */
-    if (Compress      == 0) Compress	  = 1;
-    if (Bytes_per_bin == 0) Bytes_per_bin = 4;
-
-    if (N_hists > N_HISTS_MAX) {
-      printf ("do_SQHM__HM_DIG_alloc: Illegal number of histograms: %d.\n",
-		    N_hists);
-      rply_status_setup (reply, KER__BAD_VALUE, 0, "Bad number of histograms");
-      return ERROR;
-    }else if (Hm_mode_UD && (N_hists & 1)) {
-      printf ("do_SQHM__HM_DIG_alloc: SQHM_UD is set.\n"
-	      "       Number of histograms should be multiple of 2.\n"
-	      "       %d is therefore illegal.\n", N_hists);
-      rply_status_setup (reply, KER__BAD_VALUE, 0,
-	    "Number of histograms not multiple of 2");
-      return ERROR;
-    }else if (Hm_mode_STROBO && (N_hists & 15)) {
-      printf ("do_SQHM__HM_DIG_alloc: SQHM_STROBO is set.\n"
-	      "       Number of histograms should be multiple of 16.\n"
-	      "       %d is therefore illegal.\n", N_hists);
-      rply_status_setup (reply, KER__BAD_VALUE, 0,
-	    "Number of histograms not multiple of 16");
-      return ERROR;
-    }else if (Hm_mode_UD && Hm_mode_STROBO && (N_hists & 31)) {
-      printf ("do_SQHM__HM_DIG_alloc: SQHM_UD and SQHM_STROBO are both set.\n"
-	      "       Number of histograms should be multiple of 32.\n"
-	      "       %d is therefore illegal.\n", N_hists);
-      rply_status_setup (reply, KER__BAD_VALUE, 0,
-	    "Number of histograms not multiple of 32");
-      return ERROR;
-    }
-
-    if (Lo_bin > N_BINS_MAX) {
-      printf ("do_SQHM__HM_DIG_alloc: Illegal first bin: %d.\n", Lo_bin);
-      rply_status_setup (reply, KER__BAD_VALUE, 0, "Bad first bin");
-      return ERROR;
-    }
-
-    if (N_bins > (N_BINS_MAX + 1)) {
-      printf ("do_SQHM__HM_DIG_alloc: Illegal number of bins: %d.\n", N_bins);
-      rply_status_setup (reply, KER__BAD_VALUE, 0, "Bad # bins");
-      return ERROR;
-    }
-
-    Hi_bin = Lo_bin + N_bins - 1;
-    if (Hi_bin > N_BINS_MAX) {
-      printf ("do_SQHM__HM_DIG_alloc: Illegal first-bin and/or number-of-bins:"
-		" %d %d.\n", Lo_bin, N_bins);
-      rply_status_setup (reply, KER__BAD_VALUE, 0, "Bad bin definition");
-      return ERROR;
-    }
-
-    if ((Bytes_per_bin != 1) && (Bytes_per_bin != 2) && (Bytes_per_bin != 4)) {
-      printf ("do_SQHM__HM_DIG_alloc: Illegal bin width: %d.\n", Bytes_per_bin);
-      rply_status_setup (reply, KER__BAD_VALUE, 0, "Bad bytes-per-bin");
-      return ERROR;
-    }
-
-    Total_bytes = N_hists * N_bins * Bytes_per_bin;
-    if (Total_bytes > N_TOTAL_BYTES) {	     /* Check it's not too much */
-      printf ("do_SQHM__HM_DIG_alloc: Illegal overall size: %d.\n", Total_bytes);
-      printf ("                       Permitted max:        %d.\n", N_TOTAL_BYTES);
-      rply_status_setup (reply, KER__BAD_VALUE, 0,
-	    "Total histogram size too big");
-      return ERROR;
-    }
-    
-    printf ("\n    Histogramming mode is \"SQHM__HM_DIG\"\n");
-    printf ("    Number of histograms   = %5d\n", N_hists);
-    printf ("    First bin              = %5d\n", Lo_bin);
-    printf ("    Number of bins         = %5d\n", N_bins);
-    printf ("    Bytes per bin          = %5d\n", Bytes_per_bin);
-    printf ("    Bin compression factor = %5d\n", Compress);
-    if (Hm_mode_UD != 0)
-      printf ("    Up/Down mode selected\n");
-    if (Hm_mode_STROBO != 0)
-      printf ("    Stroboscopic mode selected\n");
-    if (Hm_mode_REFLECT != 0)
-      printf ("    Histograms will be reflected\n");
-    printf ("    Bin-overflow action is ");
-    switch (Hm_mode_BO) {
-     case SQHM__BO_IGN:	 printf ("\"Ignore\"\n"); break;
-     case SQHM__BO_SMAX: printf ("\"Stop-at-Max\"\n"); break;
-     case SQHM__BO_CNT:	 printf ("\"Count\"\n"); break;
-     default:		 printf ("\"Undefined\"\n");
-    }
-
-    i = memFindMax ();	    /* Get size of biggest free memory block */
-    if (i > Total_bytes) {
-      Hist_base_addr = calloc (Total_bytes, sizeof (char));
-    }else {
-      Hist_base_addr = NULL;
-    }
-    if (Hist_base_addr == NULL) {
-      printf ("\007do_SQHM__HM_DIG_alloc:\n"
-	" Unable to reserve %d bytes of memory!\n"
-	" Largest block available = %d.\n", Total_bytes, i);
-      rply_status_setup (reply, KER__BAD_ALLOC, i,
-	    "Failed to get buffer for histograms");
-      return ERROR;
-    }
-    Cnts_lo = Cnts_hi = 0;
-    N_events = N_skipped = N_no_coin_tsi = N_coin_tsi = 0;
-    Print_hdr = True;
-
-    printf ("    Histogram base address = 0x%08x\n", Hist_base_addr);
-    printf ("    SQHM__HM_DIG mode configured.\n");
-    return OK;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int do_SQHM__HRPT_alloc (
-/*    ===================
-*/			struct req_buff_struct  *request,
-			struct rply_buff_struct	*reply) {
-/*
-**		Routine to allocate memory for the SQHM__HRPT
-**		configure request.
-**
-*/
-    int		i;
-
-    N_hists = ntohl (request->u.cnfg.u.hm_dig.n_hists);   /* The # of
-					** histograms (used in strobo (gummi)
-					** and Up/Down mode).
-					*/
-    Lo_bin   = ntohl (request->u.cnfg.u.hm_dig.lo_bin);   /* The index of
-					** first bin in histogram
-					*/
-    N_bins   = ntohl (request->u.cnfg.u.hm_dig.num_bins); /* The # of bins
-					** in each histogram
-					*/
-    Bytes_per_bin = ntohl (request->u.cnfg.u.hm_dig.bytes_per_bin); /* The # of
-							      ** bytes per bin
-							      */
-    Compress = ntohl (request->u.cnfg.u.hm_dig.compress); /* The compression
-							  ** factor
-							  */
-    Curr_hist = 0;				/* The selected histogram */
-    if (Compress      == 0) Compress	  = 1;
-    if (Bytes_per_bin == 0) Bytes_per_bin = 4;
-
-    if (N_hists > N_HISTS_MAX) {
-      printf ("do_SQHM__HRPT_alloc: Illegal number of histograms: %d.\n",
-		    N_hists);
-      rply_status_setup (reply, KER__BAD_VALUE, 0, "Bad number of histograms");
-      return ERROR;
-    }else if (Hm_mode_UD && (N_hists & 1)) {
-      printf ("do_SQHM__HRPT_alloc: SQHM_UD is set.\n"
-	      "       Number of histograms should be multiple of 2.\n"
-	      "       %d is therefore illegal.\n", N_hists);
-      rply_status_setup (reply, KER__BAD_VALUE, 0,
-	    "Number of histograms not multiple of 2");
-      return ERROR;
-    }else if (Hm_mode_STROBO && (N_hists & 15)) {
-      printf ("do_SQHM__HRPT_alloc: SQHM_STROBO is set.\n"
-	      "       Number of histograms should be multiple of 16.\n"
-	      "       %d is therefore illegal.\n", N_hists);
-      rply_status_setup (reply, KER__BAD_VALUE, 0,
-	    "Number of histograms not multiple of 16");
-      return ERROR;
-    }else if (Hm_mode_UD && Hm_mode_STROBO && (N_hists & 31)) {
-      printf ("do_SQHM__HRPT_alloc: SQHM_UD and SQHM_STROBO are both set.\n"
-	      "       Number of histograms should be multiple of 32.\n"
-	      "       %d is therefore illegal.\n", N_hists);
-      rply_status_setup (reply, KER__BAD_VALUE, 0,
-	    "Number of histograms not multiple of 32");
-      return ERROR;
-    }
-
-    if (Lo_bin > N_BINS_MAX) {
-      printf ("do_SQHM__HRPT_alloc: Illegal first bin: %d.\n", Lo_bin);
-      rply_status_setup (reply, KER__BAD_VALUE, 0, "Bad first bin");
-      return ERROR;
-    }
-
-    if (N_bins > (N_BINS_MAX + 1)) {
-      printf ("do_SQHM__HRPT_alloc: Illegal number of bins: %d.\n", N_bins);
-      rply_status_setup (reply, KER__BAD_VALUE, 0, "Bad # bins");
-      return ERROR;
-    }
-
-    Hi_bin = Lo_bin + N_bins - 1;
-    if (Hi_bin > N_BINS_MAX) {
-      printf ("do_SQHM__HRPT_alloc: Illegal first-bin and/or number-of-bins:"
-		" %d %d.\n", Lo_bin, N_bins);
-      rply_status_setup (reply, KER__BAD_VALUE, 0, "Bad bin definition");
-      return ERROR;
-    }
-
-    if ((Bytes_per_bin != 1) && (Bytes_per_bin != 2) && (Bytes_per_bin != 4)) {
-      printf ("do_SQHM__HRPT_alloc: Illegal bin width: %d.\n", Bytes_per_bin);
-      rply_status_setup (reply, KER__BAD_VALUE, 0, "Bad bytes-per-bin");
-      return ERROR;
-    }
-
-    Total_bytes = N_hists * N_bins * Bytes_per_bin;
-    if (Total_bytes > N_TOTAL_BYTES) {	     /* Check it's not too much */
-      printf ("do_SQHM__HRPT_alloc: Illegal overall size: %d.\n", Total_bytes);
-      printf ("                       Permitted max:        %d.\n", N_TOTAL_BYTES);
-      rply_status_setup (reply, KER__BAD_VALUE, 0,
-	    "Total histogram size too big");
-      return ERROR;
-    }
-    
-    printf ("\n    Histogramming mode is \"SQHM__HRPT\"\n");
-    printf ("    Number of histograms   = %5d\n", N_hists);
-    printf ("    First bin              = %5d\n", Lo_bin);
-    printf ("    Number of bins         = %5d\n", N_bins);
-    printf ("    Bytes per bin          = %5d\n", Bytes_per_bin);
-    printf ("    Bin compression factor = %5d\n", Compress);
-    if (Hm_mode_UD != 0)
-      printf ("    Up/Down mode selected\n");
-    if (Hm_mode_STROBO != 0)
-      printf ("    Stroboscopic mode selected\n");
-    if (Hm_mode_REFLECT != 0)
-      printf ("    Histograms will be reflected\n");
-    printf ("    Bin-overflow action is ");
-    switch (Hm_mode_BO) {
-     case SQHM__BO_IGN:	 printf ("\"Ignore\"\n"); break;
-     case SQHM__BO_SMAX: printf ("\"Stop-at-Max\"\n"); break;
-     case SQHM__BO_CNT:	 printf ("\"Count\"\n"); break;
-     default:		 printf ("\"Undefined\"\n");
-    }
-
-    i = memFindMax ();	    /* Get size of biggest free memory block */
-    if (i > Total_bytes) {
-      Hist_base_addr  = calloc (Total_bytes, sizeof (char));
-      Frame_base_addr = calloc (((N_bins + 2) * Bytes_per_bin), sizeof (char));
-    }else {
-      Hist_base_addr  = NULL;
-      Frame_base_addr = NULL;
-    }
-    if (Hist_base_addr == NULL) {
-      free_HM_memory (NULL);
-      printf ("\007do_SQHM__HRPT_alloc:\n"
-	" Unable to reserve %d bytes of memory!\n"
-	" Largest block available = %d.\n", Total_bytes, i);
-      rply_status_setup (reply, KER__BAD_ALLOC, i,
-	    "Failed to get buffer for histograms");
-      return ERROR;
-    }
-    if (Frame_base_addr == NULL) {
-      free_HM_memory (NULL);
-      printf ("\007do_SQHM__HRPT_alloc:\n"
-	" Unable to reserve %d bytes of memory for frame buffer!\n"
-	" Largest block available = %d.\n", ((N_bins + 2) * Bytes_per_bin), i);
-      rply_status_setup (reply, KER__BAD_ALLOC, i,
-	    "Failed to get frame buffer");
-      return ERROR;
-    }
-    Cnts_lo = Cnts_hi = 0;
-    N_events = N_skipped = N_no_coin_tsi = N_coin_tsi = 0;
-    Print_hdr = True;
-
-    printf ("    Histogram    base address = 0x%08x\n", Hist_base_addr);
-    printf ("    Frame buffer base address = 0x%08x\n", Frame_base_addr);
-    printf ("    SQHM__HRPT mode configured.\n");
-    return OK;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int do_SQHM__TRANS_alloc (
-/*    ====================
-*/			struct req_buff_struct  *request,
-			struct rply_buff_struct	*reply) {
-/*
-**		Routine to allocate memory for the SQHM__TRANS
-**		configure request.
-*/
-    int		i;
-
-    N_hists = ntohl (request->u.cnfg.u.trans.n_buffs);  /* The # of buffers */
-    N_bins  = ntohl (request->u.cnfg.u.trans.n_bytes);	/* The buffer size */
-    Bytes_per_bin = 1;
-    Curr_hist     = 0;			/* Start with the first buffer */
-    Bytes_free	  = N_bins;
-
-    Lo_cntr = Lo_bin = Hi_bin = Compress = Cnts_lo = Cnts_hi = 0;
-
-    if ((N_hists == 0) || (N_hists > N_HISTS_MAX)) {
-      printf ("do_SQHM__TRANS_alloc: Illegal number of buffers: %d.\n",
-		    N_hists);
-      rply_status_setup (reply, KER__BAD_VALUE, 0, "Bad number of buffers");
-      return ERROR;
-    }
-
-    if ((N_bins < 23) || (N_bins > (N_BINS_MAX + 1))) {
-      printf ("do_SQHM__TRANS_alloc: Illegal buffer size: %d.\n", N_bins);
-      rply_status_setup (reply, KER__BAD_VALUE, 0, "Illegal buffer size");
-      return ERROR;
-    }
-
-    Total_bytes = N_hists * (N_bins + 4);
-    if (Total_bytes > N_TOTAL_BYTES) {	     /* Check it's not too much */
-      printf ("do_SQHM__TRANS_alloc: Illegal overall size: %d.\n", Total_bytes);
-      printf ("                      Permitted max:        %d.\n", N_TOTAL_BYTES);
-      rply_status_setup (reply, KER__BAD_VALUE, 0,
-	    "Total buffer size too big");
-      return ERROR;
-    }
-    
-    printf ("\n    Histogramming mode is \"SQHM__TRANS\"\n");
-    printf ("    Number of buffers = %5d\n", N_hists);
-    printf ("    Buffer size       = %5d bytes\n", N_bins);
-
-    i = memFindMax ();	    /* Get size of biggest free memory block */
-    if (i > Total_bytes) {
-      Hist_base_addr = calloc (Total_bytes, sizeof (char));
-    }else {
-      Hist_base_addr = NULL;
-    }
-    if (Hist_base_addr == NULL) {
-      printf ("\007do_SQHM__TRANS_alloc:\n"
-	" Unable to reserve %d bytes of memory!\n"
-	" Largest block available = %d.\n", Total_bytes, i);
-      rply_status_setup (reply, KER__BAD_ALLOC, i,
-	    "Failed to get space for buffers");
-      return ERROR;
-    }
-
-    Tran_buff_base = Hist_base_addr;
-    Next_char = Tran_buff_base + 4;
-    printf ("    Buffer base address = 0x%08x\n", Hist_base_addr);
-    printf ("    SQHM__TRANS mode configured.\n");
-    return OK;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int do_SQHM__TOF_alloc (
-/*    ==================
-*/			int			 skt,
-			struct req_buff_struct  *request,
-			struct rply_buff_struct	*reply) {
-/*
-**		Routine to allocate memory for the SQHM__TOF
-**		configure request.
-**
-**    Definitions:
-**	Edge-Array
-**		An 'edge-array' is a structure which specifies the lower edge
-**		of each bin in the histogram. This is to allow variable width
-**		histogram bins.
-**	Counter Bank
-**		A 'counter bank' is a contiguous group of counters, all of
-**		which share the same parameters. In particular, all the counters
-**		in the bank have the same number of bins and same bin edges.
-*/
-    int			     i, j, k, n_bytes_got;
-    uint	     n_extra_bytes, n_banks, com2, nchar;
-    uint	     first, n_cntrs, edge_indx, bytes_per_bin;
-    uint	     n_bins, flag, edge_0, edge_1, bin_span, top_edge;
-    uint	     bytes_needed, sizeof_edge_arr;
-    uint	     time_span, n_total_bins;
-    struct tof_edge_info    *edge_info_pntr;
-    struct tof_edge_arr	    *edge_arr_pntr;
-    struct tof_bank	    *bank_pntr;
-    void		    *nxt_hist_addr;
-    struct req_buff_struct  *my_rqst;
-    char		    *p_addr, buff[64];
-
-    Total_bytes = 0;
-
-    n_extra_bytes = ntohl (request->u.cnfg.u.tof.n_extra_bytes);  /* The # of
-					** extra bytes needed to be read from
-					** the client to complete the configure
-					** request.
-					*/
-    if (n_extra_bytes == 0) {
-      my_rqst = request;
-    }else {
-		/*
-		** There is extra data to be read. Get buffer space for the
-		** extra stuff plus space to copy over what has already been
-		** read so that everything is in a contiguous buffer.
-		*/
-      bytes_needed = n_extra_bytes + sizeof (*request);
-      bytes_needed = (bytes_needed + 3) & (~3); /* Round up to multiple of 4 */
-      p_addr = calloc (bytes_needed, sizeof (char));
-      if (p_addr == NULL) {
-	printf ("\007do_SQHM__TOF_alloc:\n"
-		" cannot allocate memory for extra config data!\n");
-	net_flush (skt, n_extra_bytes);
-	rply_status_setup (reply, KER__BAD_ALLOC, 0,
-	    "Failed to get buffer for extra config data");
-	return ERROR;
-      }
-      memcpy (p_addr, request, sizeof (*request));  /* Copy in what has already
-						    ** been read.
-						    */
-      my_rqst = (struct req_buff_struct *) p_addr;
-
-      bytes_needed = n_extra_bytes;	    /* And read the rest */
-      p_addr = p_addr + sizeof (*request);
-      while (bytes_needed > 0) {
-        n_bytes_got = recv (skt, p_addr, bytes_needed, 0);
-        if (n_bytes_got <= 0) break;
-        Rw_bytes_got += n_bytes_got;
-        bytes_needed -= n_bytes_got;
-        p_addr += n_bytes_got;
-      }
-      if (n_bytes_got < 0) {
-        printf ("\007"
-                "%s -- R/W-Socket recv error\n", Tsk_name[0]);
-        printf ("%s -- Connection will be closed.\n", Tsk_name[0]);
-	rply_status_setup (reply, KER__BAD_VALUE, 0, "recv failed");
-	if (n_extra_bytes != 0) free (my_rqst);
-	return ERROR;
-      }
-    }
-
-    printf ("\n    Histogramming mode is \"SQHM__TOF\"\n");
-
-    if (Hm_mode_UD != 0)
-      printf ("    Up/Down mode selected\n");
-    if (Hm_mode_STROBO != 0)
-      printf ("    Stroboscopic mode selected\n");
-    printf ("    Bin-overflow action is ");
-    switch (Hm_mode_BO) {
-     case SQHM__BO_IGN:	 printf ("\"Ignore\"\n"); break;
-     case SQHM__BO_SMAX: printf ("\"Stop-at-Max\"\n"); break;
-     case SQHM__BO_CNT:	 printf ("\"Count\"\n"); break;
-     default:		 printf ("\"Undefined\"\n");
-    }
-
-    N_tof_edges = ntohs (my_rqst->u.cnfg.u.tof.n_edges);    /* The # of
-					** different 'edge-arrays' which are
-					** to be defined.
-					*/
-    printf ("    Number of Edge Arrays   = %2d\n", N_tof_edges);
-    if (N_tof_edges > MAX_TOF_EDGE) {
-      printf ("do_SQHM__TOF_alloc: Illegal number of edge-arrays: %u.\n",
-		    N_tof_edges);
-      rply_status_setup (reply, KER__BAD_VALUE, 0, "Too many edge-arrays");
-      if (n_extra_bytes != 0) free (my_rqst);
-      return ERROR;
-    }
-
-    n_banks = ntohs (my_rqst->u.cnfg.u.tof.n_banks);	    /* The # of
-					** 'banks' of counters which are
-					** to be defined.
-					*/
-    printf ("    Number of Counter Banks = %2d\n", n_banks);
-    if (n_banks == 0) {
-      rply_status_setup (reply, KER__BAD_VALUE, 0, "Illegal n_banks");
-      printf ("do_SQHM__TOF_alloc: Illegal number of banks: %u.\n",
-		    n_banks);
-      if (n_extra_bytes != 0) free (my_rqst);
-      return ERROR;
-    }
-
-    Tof_dts_soll = ntohl (my_rqst->u.cnfg.u.tof.preset_delay); /* The
-					** required "Delay-Time-to-Start" */
-    if ((Tof_dts_soll & (~LWL_TSI_DTS_MSK)) != 0) {
-      rply_status_setup (reply, KER__BAD_VALUE, 0, "Bad Delay-Time-to-Start");
-      printf ("do_SQHM__TOF_alloc: Delay-Time-to-Start illegal: 0x%x\n",
-				    Tof_dts_soll);
-      if (n_extra_bytes != 0) free (my_rqst);
-      return ERROR;
-    }
-    com2 = open ("/tyCo/1", O_RDWR, 0);	    /* Send DTS to MDI via COM2 port */
-    if (com2 == ERROR) {
-      rply_status_setup (reply, KER__BAD_VALUE, 0, "COM2 open failed");
-      printf ("do_SQHM__TOF_alloc: error opening COM2 port. "
-		"Delay-Time-to-Start not set.\n");
-      if (n_extra_bytes != 0) free (my_rqst);
-      return ERROR;
-    }else {
-      ioctl (com2, FIOBAUDRATE, 9600);
-      write (com2, "\r", 1);
-      write (com2, "RMT 1\r", 6);
-      nchar = sprintf (buff, "DT %d\r", Tof_dts_soll);
-      if (write (com2, buff, nchar) != nchar) {
-	rply_status_setup (reply, KER__BAD_VALUE, 0,
-			    "Setting D-T-to-S failed");
-	printf ("do_SQHM__TOF_alloc: error setting Delay-Time-to-Start.\n");
-	if (n_extra_bytes != 0) free (my_rqst);
-	close (com2);
-	return ERROR;
-      }else {
-	printf ("    Delay-Time-to-Start     = %d\n", Tof_dts_soll);
-      }
-      close (com2);
-    }
-		/*
-		** Loop over all the edge arrays
-		*/
-    edge_arr_pntr = &my_rqst->u.cnfg.u.tof.edge_0;
-    for (i = 0; i < N_tof_edges; i++) {
-      n_bins = ntohl (edge_arr_pntr->n_bins);
-      flag   = ntohl (edge_arr_pntr->flag);
-      edge_0 = ntohl (edge_arr_pntr->edges[0]);
-      edge_1 = ntohl (edge_arr_pntr->edges[1]);
-      printf ("    Edge Array %d:\n", i);
-      printf ("      Number of bins          = %5d\n", n_bins);
-      printf ("      Flag                    = %5d\n", flag);
-      printf ("      Lower edge              = %5d\n", edge_0);
-      if ((n_bins == 0) || (n_bins > MAX_TOF_NBINS)) {
-	printf ("do_SQHM__TOF_alloc: Illegal # bins: %u.\n",
-		    n_bins);
-	rply_status_setup (reply, KER__BAD_VALUE, 0, "Bad number of bins");
-	free_HM_memory (NULL);
-	if (n_extra_bytes != 0) free (my_rqst);
-	return ERROR;
-      }
-      if ((edge_0 & (~LWL_HDR_TS_MASK)) != 0) {
-	printf ("do_SQHM__TOF_alloc: histog start is > 20 bits: %u\n",
-		edge_0);
-	rply_status_setup (reply, KER__BAD_VALUE, 0,
-		"Bin edges overflow 20 bits");
-	free_HM_memory (NULL);
-	if (n_extra_bytes != 0) free (my_rqst);
-	return ERROR;
-      }
-      if ((edge_1 & (~LWL_HDR_TS_MASK)) != 0) {
-	printf ("do_SQHM__TOF_alloc: first bin is > 20 bits: %u\n",
-		edge_1);
-	rply_status_setup (reply, KER__BAD_VALUE, 0,
-		"First bin overflows 20 bits");
-	free_HM_memory (NULL);
-	if (n_extra_bytes != 0) free (my_rqst);
-	return ERROR;
-      }
-      bytes_needed = OffsetOf (struct tof_edge_info, edges) +
-				    ((n_bins + 1) * sizeof (int));
-      Tof_edges[i] = calloc (bytes_needed, sizeof (char)); /* Allocate space for
-						      ** edge-array structure */
-      if (Tof_edges[i] == NULL) {
-	printf ("do_SQHM__TOF_alloc: unable to alloc memory for edge array.\n");
-	rply_status_setup (reply, KER__BAD_ALLOC, 0,
-	    "Failed to get memory for edge-array");
-	free_HM_memory (NULL);
-	if (n_extra_bytes != 0) free (my_rqst);
-	return ERROR;
-      }
-      Tof_edges[i]->n_bins = n_bins;
-      Tof_edges[i]->flag = flag;
-      if ((flag & FLAG__VAR_BIN) == 0) {	    /* Fixed width bins? */
-	printf ("      Bin width               = %5d\n", (edge_1 - edge_0));
-        if (edge_0 >= edge_1) {			    /* Yes. Check bin width */
-	  printf ("do_SQHM__TOF_alloc: bin width is zero or negative!\n");
-	  rply_status_setup (reply, KER__BAD_VALUE, 0, "illegal bin width");
-	  free_HM_memory (NULL);
-	  if (n_extra_bytes != 0) free (my_rqst);
-	  return ERROR;
-	}
-	bin_span = edge_1 - edge_0;
-	Tof_edges[i]->bin_span = bin_span;
-	top_edge = edge_0 + (n_bins * bin_span) - 1;
-	if ((top_edge & (~LWL_HDR_TS_MASK)) != 0) {
-	  printf ("do_SQHM__TOF_alloc: histog last bin is > 20 bits: %u\n",
-		top_edge);
-	  rply_status_setup (reply, KER__BAD_VALUE, 0,
-		"Last bin overflows 20 bits");
-	  free_HM_memory (NULL);
-	  if (n_extra_bytes != 0) free (my_rqst);
-	  return ERROR;
-	}
-	for (j=0; j <= n_bins; j++) Tof_edges[i]->edges[j] = edge_0+j*bin_span;
-	Tof_edges[i]->hi_edge = top_edge;
-	sizeof_edge_arr = OffsetOf (struct tof_edge_arr, edges) +
-					    2 * sizeof (uint);
-      }else {
-					/* Variable width bins */
-	bin_span = edge_1 - edge_0;	/* Note: even though the edges are
-					** defined as variable, they may, in
-					** fact, all be the same width. Check
-					** for this so that we can make a brief
-					** report rather than listing all
-					** the bin edges.
-					*/
-	Tof_edges[i]->bin_span = 0;
-	Tof_edges[i]->edges[0] = edge_0;
-	for (j = 1; j <= n_bins; j++) {
-	  Tof_edges[i]->edges[j] = ntohl (edge_arr_pntr->edges[j]);
-	  if ((Tof_edges[i]->edges[j] & (~LWL_HDR_TS_MASK)) != 0) {
-	    printf ("do_SQHM__TOF_alloc: histog bin is > 20 bits: %d %u\n",
-		j, Tof_edges[i]->edges[j]);
-	    rply_status_setup (reply, KER__BAD_VALUE, 0,
-		    "Bin edge overflows 20 bits");
-	    free_HM_memory (NULL);
-	    if (n_extra_bytes != 0) free (my_rqst);
-	    return ERROR;
-	  }
-	  if (Tof_edges[i]->edges[j-1] >= Tof_edges[i]->edges[j]) {
-	    printf ("do_SQHM__TOF_alloc: bin edges are not in sequence: %d %d\n",
-		i, j);
-	    rply_status_setup (reply, KER__BAD_VALUE, 0,
-		    "Bin edges not in sequence");
-	    free_HM_memory (NULL);
-	    if (n_extra_bytes != 0) free (my_rqst);
-	    return ERROR;
-	  }
-	  if ((Tof_edges[i]->edges[j] - Tof_edges[i]->edges[j-1]) != bin_span)
-	    bin_span = 0;   /* Set bin_span to zero if bin widths really are
-			    ** variable */
-	}
-	if (bin_span != 0) {
-	  printf ("      Variable width bins but width of all bins = %d\n",
-				bin_span);
-	}else {
-	  printf ("      Variable width bins. Upper bin edges are:\n");
-	  for (j = 1; j <= n_bins; j += 10) {
-	    for (k = 0; ((k + j) <= n_bins) && (k < 10); k++)
-	      printf ("%7d", Tof_edges[i]->edges[j+k]);
-	    printf ("\n");
-	  }
-	}
-	Tof_edges[i]->hi_edge = Tof_edges[i]->edges[n_bins] - 1;
-	sizeof_edge_arr = OffsetOf (struct tof_edge_arr, edges) +
-				((n_bins + 1) * sizeof (uint));
-      }
-      edge_arr_pntr = (struct tof_edge_arr *) (	   /* Move to next edge array */
-	    (char *) edge_arr_pntr + sizeof_edge_arr);
-    }
-		/*
-		** Loop over all the counter banks
-		*/
-    bank_pntr = (struct tof_bank *) edge_arr_pntr;
-
-    for (i = 0; i < n_banks; i++) {
-
-      first	    = ntohs (bank_pntr->first);
-      n_cntrs	    = ntohs (bank_pntr->n_cntrs);
-      edge_indx     = ntohs (bank_pntr->edge_indx);
-      bytes_per_bin = ntohs (bank_pntr->bytes_per_bin);
-
-      printf ("    Counter Bank %d:\n", i);
-      printf ("      Number of counters      = %5d\n", n_cntrs);
-      printf ("      First counter           = %5d\n", first);
-      if (N_tof_edges > 1) {
-	printf ("      Edge array #%d\n", edge_indx);
-      }
-      printf ("      Bytes per bin           = %5d\n", bytes_per_bin);
-
-      if (first >= MAX_TOF_CNTR) {
-	printf ("do_SQHM__TOF_alloc: Illegal first counter number: %u.\n",
-		    first);
-	rply_status_setup (reply, KER__BAD_VALUE, 0,
-		    "Bad first counter number");
-	free_HM_memory (NULL);
-	if (n_extra_bytes != 0) free (my_rqst);
-	return ERROR;
-      }
-
-      if ((n_cntrs == 0) || ((first+n_cntrs) > MAX_TOF_CNTR)) {
-	printf ("do_SQHM__TOF_alloc: Illegal # counters: %u %u.\n",
-		    first, n_cntrs);
-	rply_status_setup (reply, KER__BAD_VALUE, 0, "Bad # counters");
-	free_HM_memory (NULL);
-	if (n_extra_bytes != 0) free (my_rqst);
-	return ERROR;
-      }
-
-      if (edge_indx >= N_tof_edges) {
-	printf ("do_SQHM__TOF_alloc: Illegal edge index: %u.\n",
-		    edge_indx);
-	rply_status_setup (reply, KER__BAD_VALUE, 0, "Bad edge-array index");
-	free_HM_memory (NULL);
-	if (n_extra_bytes != 0) free (my_rqst);
-	return ERROR;
-      }
-      edge_info_pntr = Tof_edges[edge_indx];
-      n_bins = edge_info_pntr->n_bins;
-      flag   = edge_info_pntr->flag;
-
-      if (bytes_per_bin == 0) bytes_per_bin = 4;
-      if ((bytes_per_bin != 1) &&
-	  (bytes_per_bin != 2) &&
-	  (bytes_per_bin != 4)) {
-	printf ("do_SQHM__TOF_alloc: Illegal bytes per bin: %d.\n",
-		    bytes_per_bin);
-	rply_status_setup (reply, KER__BAD_VALUE, 0, "Bad bytes-per-bin");
-	free_HM_memory (NULL);
-	if (n_extra_bytes != 0) free (my_rqst);
-	return ERROR;
-      }
-
-      Total_bytes += (n_cntrs * n_bins * bytes_per_bin);
-      if (Hm_mode_UD != 0) Total_bytes += (n_cntrs * n_bins * bytes_per_bin);
-
-      for (j = first; j < (first + n_cntrs); j++) {
-	if (Tof_descr[j] != NULL) {
-	  printf ("do_SQHM__TOF_alloc: Doubly defined counter: %d.\n",
-		    (j));
-	  rply_status_setup (reply, KER__BAD_VALUE, 0, "Doubly defined counter");
-	  free_HM_memory (NULL);
-	  if (n_extra_bytes != 0) free (my_rqst);
-	  return ERROR;
-	}
-	Tof_descr[j] = calloc (1, sizeof (struct tof_histog));
-	if (Tof_descr[j] == NULL) {
-	  printf ("do_SQHM__TOF_alloc: unable to alloc memory for "
-			"histogram structure.\n");
-	  rply_status_setup (reply, KER__BAD_ALLOC, 0,
-		"Failed to get buffer for Tof_descr structure");
-	  free_HM_memory (NULL);
-	  if (n_extra_bytes != 0) free (my_rqst);
-	  return ERROR;
-	}
-	Tof_descr[j]->cntr_nmbr	     = first + j;
-	Tof_descr[j]->lo_edge	     = edge_info_pntr->edges[0];
-	Tof_descr[j]->hi_edge	     = edge_info_pntr->hi_edge;
-	Tof_descr[j]->flag	     = flag;
-	Tof_descr[j]->bytes_per_bin  = bytes_per_bin;
-	Tof_descr[j]->n_bins	     = n_bins;
-	Tof_descr[j]->cnt_early_up   = 0;
-	Tof_descr[j]->cnt_late_up    = 0;
-	Tof_descr[j]->cnt_early_down = 0;
-	Tof_descr[j]->cnt_late_down  = 0;
-	Tof_descr[j]->bin_edge	     = edge_info_pntr->edges;
-	Tof_descr[j]->u.b_bin_data   = NULL;
-      }
-
-      if (i == 0) {	    /* Use the first counter bank to define some .. */
-	N_hists = n_cntrs;  /* .. globals since we expect there usually to .. */
-			    /* .. be only 1 counter bank. */
-	N_bins = n_bins;
-	Lo_cntr = first;
-	Lo_bin = edge_info_pntr->edges[0];
-	Hi_bin = edge_info_pntr->hi_edge;
-	Compress = ((flag & FLAG__VAR_BIN) == 0) ?
-			edge_info_pntr->edges[1] - edge_info_pntr->edges[0] :
-			0;
-	Bytes_per_bin = bytes_per_bin;
-	Cnts_lo = Cnts_hi = 0;
-      }	    
-
-      bank_pntr++;	    /* Move to next counter bank */
-    }
-
-    if (n_extra_bytes != 0) free (my_rqst);
-
-    i = memFindMax ();	    /* Get size of biggest free memory block */
-    if (i > Total_bytes) {
-      Hist_base_addr = calloc (Total_bytes, sizeof (char));
-    }else {
-      Hist_base_addr = NULL;
-    }
-    if (Hist_base_addr == NULL) {
-      printf ("\007do_SQHM__TOF_alloc:\n"
-	" Unable to reserve %d bytes of memory!\n"
-	" Largest block available = %d.\n", Total_bytes, i);
-      rply_status_setup (reply, KER__BAD_ALLOC, i,
-	    "Failed to get buffer for histograms");
-      reply->sub_status = htonl (i);
-      return ERROR;
-    }
-    nxt_hist_addr = Hist_base_addr;
-    for (i = 0; i < MAX_TOF_CNTR; i++) {
-      if (Tof_descr[i] != NULL) {
-	Tof_descr[i]->u.b_bin_data = nxt_hist_addr;
-	j = Tof_descr[i]->n_bins * Tof_descr[i]->bytes_per_bin;
-	if (Hm_mode_UD != 0) j = j * 2;
-	nxt_hist_addr += j;
-      }
-    }
-    Cnts_lo = Cnts_hi = 0;
-    N_events = N_skipped = N_no_coin_tsi = N_coin_tsi = 0;
-    Print_hdr = True;
-
-    printf ("    Histogram base address = 0x%08x\n", Hist_base_addr);
-    printf ("    SQHM__TOF mode configured.\n");
-    return OK;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int do_SQHM__PSD_alloc (
-/*    ==================
-*/			int			 skt,
-			struct req_buff_struct  *request,
-			struct rply_buff_struct	*reply) {
-/*
-**		Routine to allocate memory for the SQHM__PSD
-**		configure request.
-**
-**    Definitions:
-**	Edge-Array
-**		An 'edge-array' is a structure which specifies the lower edge
-**		of each bin in the histogram. This is to allow variable width
-**		histogram bins.
-**	Counter Bank
-**		A 'counter bank' is a contiguous group of counters, all of
-**		which share the same parameters. In particular, all the counters
-**		in the bank have the same number of bins and same bin edges.
-*/
-    int			     i, j, k, n_bytes_got;
-    uint	     n_extra_bytes, n_banks, com2, nchar;
-    uint	     first, n_cntrs, edge_indx, bytes_per_bin;
-    uint	     n_bins, flag, edge_0, edge_1, bin_span, top_edge;
-    uint	     bytes_needed, sizeof_edge_arr;
-    uint	     time_span, n_total_bins;
-    struct tof_edge_info    *edge_info_pntr;
-    struct tof_edge_arr	    *edge_arr_pntr;
-    struct tof_bank	    *bank_pntr;
-    void		    *nxt_hist_addr;
-    struct req_buff_struct  *my_rqst;
-    char		    *p_addr, buff[64];
-
-    Total_bytes = 0;
-
-    /*
-      switch debugging on by default
-      Dbg_lev1 = 0; 
-    */
-
-    /*
-     read additional configuration information
-    */
-    n_extra_bytes = ntohl (request->u.cnfg.u.psd.n_extra_bytes);  /* The # of
-					** extra bytes needed to be read from
-					** the client to complete the configure
-					** request.
-					*/
- 
-    if (n_extra_bytes == 0) {
-      my_rqst = request;
-    }else {
-		/*
-		** There is extra data to be read. Get buffer space for the
-		** extra stuff plus space to copy over what has already been
-		** read so that everything is in a contiguous buffer.
-		*/
-      bytes_needed = n_extra_bytes + sizeof (*request);
-      bytes_needed = (bytes_needed + 3) & (~3); /* Round up to multiple of 4 */
-      p_addr = calloc (bytes_needed, sizeof (char));
-      if (p_addr == NULL) {
-	printf ("\007do_SQHM__PSD_alloc:\n"
-		" cannot allocate memory for extra config data!\n");
-	net_flush (skt, n_extra_bytes);
-	rply_status_setup (reply, KER__BAD_ALLOC, 0,
-	    "Failed to get buffer for extra config data");
-	return ERROR;
-      }
-
-
-      memcpy (p_addr, request, sizeof (*request));  /* Copy in what has already
-						    ** been read.
-						    */
-      my_rqst = (struct req_buff_struct *) p_addr;
-
-      bytes_needed = n_extra_bytes;	    /* And read the rest */
-      p_addr = p_addr + sizeof (*request);
-      while (bytes_needed > 0) {
-        n_bytes_got = recv (skt, p_addr, bytes_needed, 0);
-        if (n_bytes_got <= 0) break;
-        Rw_bytes_got += n_bytes_got;
-        bytes_needed -= n_bytes_got;
-        p_addr += n_bytes_got;
-      }
-      if (n_bytes_got < 0) {
-        printf ("\007"
-                "%s -- R/W-Socket recv error\n", Tsk_name[0]);
-        printf ("%s -- Connection will be closed.\n", Tsk_name[0]);
-	rply_status_setup (reply, KER__BAD_VALUE, 0, "recv failed");
-	if (n_extra_bytes != 0) free (my_rqst);
-	return ERROR;
-      }
-    }
-
-    printf ("\n    Histogramming mode is \"SQHM__PSD\"\n");
-
-    /*
-     decode general configuration information
-    */
-    if (Hm_mode_UD != 0)
-      printf ("    Up/Down mode selected\n");
-    if (Hm_mode_STROBO != 0)
-      printf ("    Stroboscopic mode selected\n");
-    printf ("    Bin-overflow action is ");
-    switch (Hm_mode_BO) {
-     case SQHM__BO_IGN:	 printf ("\"Ignore\"\n"); break;
-     case SQHM__BO_SMAX: printf ("\"Stop-at-Max\"\n"); break;
-     case SQHM__BO_CNT:	 printf ("\"Count\"\n"); break;
-     default:		 printf ("\"Undefined\"\n");
-    }
-
-    N_tof_edges = ntohs (my_rqst->u.cnfg.u.psd.n_edges);    /* The # of
-					** different 'edge-arrays' which are
-					** to be defined.
-					*/
-    printf ("    Number of Edge Arrays   = %2d\n", N_tof_edges);
-    if (N_tof_edges > MAX_TOF_EDGE) {
-      printf ("do_SQHM__PSD_alloc: Illegal number of edge-arrays: %u.\n",
-		    N_tof_edges);
-      rply_status_setup (reply, KER__BAD_VALUE, 0, "Too many edge-arrays");
-      if (n_extra_bytes != 0) free (my_rqst);
-      return ERROR;
-    }
-
-    n_banks = ntohs (my_rqst->u.cnfg.u.psd.n_banks);	    /* The # of
-					** 'banks' of counters which are
-					** to be defined.
-					*/
-    printf ("    Number of Counter Banks = %2d\n", n_banks);
-    if (n_banks == 0) {
-      rply_status_setup (reply, KER__BAD_VALUE, 0, "Illegal n_banks");
-      printf ("do_SQHM__PSD_alloc: Illegal number of banks: %u.\n",
-		    n_banks);
-      if (n_extra_bytes != 0) free (my_rqst);
-      return ERROR;
-    }
-
-    psdXOffset = ntohs(my_rqst->u.cnfg.u.psd.xOffset);
-    psdXFactor = ntohs(my_rqst->u.cnfg.u.psd.xFactor);
-    printf("\tX-Offset = %4d, X-Factor = %4d\n",
-           psdXOffset, psdXFactor);
-
-    psdYOffset = ntohs(my_rqst->u.cnfg.u.psd.yOffset);
-    psdYFactor = ntohs(my_rqst->u.cnfg.u.psd.yFactor);
-    printf("\tY-Offset = %4d, Y-Factor = %4d\n",
-           psdYOffset, psdYFactor);
-
-    psdFlashCount = 0;
-    psdHitCount = 0;
-
-    psdXSize = ntohs(my_rqst->u.cnfg.u.psd.xSize);
-    psdYSize = ntohs(my_rqst->u.cnfg.u.psd.ySize);
-    printf("\txSize = %4d, ySize = %4d\n", 
-           psdXSize, psdYSize);
-    N_hists = psdXSize*psdYSize+MAX_PSD_ED;
-
-    Tof_dts_soll = ntohl (my_rqst->u.cnfg.u.psd.preset_delay); /* The
-					** required "Delay-Time-to-Start" */
-    if ((Tof_dts_soll & (~LWL_TSI_DTS_MSK)) != 0) {
-      rply_status_setup (reply, KER__BAD_VALUE, 0, "Bad Delay-Time-to-Start");
-      printf ("do_SQHM__PSD_alloc: Delay-Time-to-Start illegal: 0x%x\n",
-				    Tof_dts_soll);
-      if (n_extra_bytes != 0) free (my_rqst);
-      return ERROR;
-    }
-    /*
-     send DTS to MDI through COM2 port. But only if we have more then one
-     time channel. Else we are operating in non-TOF mode.
-    */
-    if(N_tof_edges > 1) {
-       com2 = open ("/tyCo/1", O_RDWR, 0);	   
-       if (com2 == ERROR) {
-	 rply_status_setup (reply, KER__BAD_VALUE, 0, "COM2 open failed");
-	 printf ("do_SQHM__PSD_alloc: error opening COM2 port. "
-		   "Delay-Time-to-Start not set.\n");
-	 if (n_extra_bytes != 0) free (my_rqst);
-	 return ERROR;
-       }else {
-	 ioctl (com2, FIOBAUDRATE, 9600);
-	 write (com2, "\r", 1);
-	 write (com2, "RMT 1\r", 6);
-	 nchar = sprintf (buff, "DT %d\r", Tof_dts_soll);
-	 if (write (com2, buff, nchar) != nchar) {
-	   rply_status_setup (reply, KER__BAD_VALUE, 0,
-			       "Setting D-T-to-S failed");
-	   printf ("do_SQHM__PSD_alloc: error setting Delay-Time-to-Start.\n");
-	   if (n_extra_bytes != 0) free (my_rqst);
-	   close (com2);
-	   return ERROR;
-	 }else {
-	   printf ("    Delay-Time-to-Start     = %d\n", Tof_dts_soll);
-	 }
-	 close (com2);
-       }
-    }
-		/*
-		** Loop over all the edge arrays
-		*/
-    edge_arr_pntr = &my_rqst->u.cnfg.u.psd.edge_0;
-    for (i = 0; i < N_tof_edges; i++) {
-      n_bins = ntohl (edge_arr_pntr->n_bins);
-      N_bins = n_bins;
-      flag   = ntohl (edge_arr_pntr->flag);
-      edge_0 = ntohl (edge_arr_pntr->edges[0]);
-      edge_1 = ntohl (edge_arr_pntr->edges[1]);
-      printf ("    Edge Array %d:\n", i);
-      printf ("      Number of bins          = %5d\n", n_bins);
-      printf ("      Flag                    = %5d\n", flag);
-      printf ("      Lower edge              = %5d\n", edge_0);
-      if ((n_bins == 0) || (n_bins > MAX_TOF_NBINS)) {
-	printf ("do_SQHM__PSD_alloc: Illegal # bins: %u.\n",
-		    n_bins);
-	rply_status_setup (reply, KER__BAD_VALUE, 0, "Bad number of bins");
-	free_HM_memory (NULL);
-	if (n_extra_bytes != 0) free (my_rqst);
-	return ERROR;
-      }
-      if ((edge_0 & (~LWL_HDR_TS_MASK)) != 0) {
-	printf ("do_SQHM__PSD_alloc: histog start is > 20 bits: %u\n",
-		edge_0);
-	rply_status_setup (reply, KER__BAD_VALUE, 0,
-		"Bin edges overflow 20 bits");
-	free_HM_memory (NULL);
-	if (n_extra_bytes != 0) free (my_rqst);
-	return ERROR;
-      }
-      if ((edge_1 & (~LWL_HDR_TS_MASK)) != 0) {
-	printf ("do_SQHM__PSD_alloc: first bin is > 20 bits: %u\n",
-		edge_1);
-	rply_status_setup (reply, KER__BAD_VALUE, 0,
-		"First bin overflows 20 bits");
-	free_HM_memory (NULL);
-	if (n_extra_bytes != 0) free (my_rqst);
-	return ERROR;
-      }
-      bytes_needed = OffsetOf (struct tof_edge_info, edges) +
-				    ((n_bins + 1) * sizeof (int));
-      Tof_edges[i] = calloc (bytes_needed, sizeof (char)); /* Allocate space for
-						      ** edge-array structure */
-      if (Tof_edges[i] == NULL) {
-	printf ("do_SQHM__PSD_alloc: unable to alloc memory for edge array.\n");
-	rply_status_setup (reply, KER__BAD_ALLOC, 0,
-	    "Failed to get memory for edge-array");
-	free_HM_memory (NULL);
-	if (n_extra_bytes != 0) free (my_rqst);
-	return ERROR;
-      }
-      Tof_edges[i]->n_bins = n_bins;
-      Tof_edges[i]->flag = flag;
-      if ((flag & FLAG__VAR_BIN) == 0) {	    /* Fixed width bins? */
-	printf ("      Bin width               = %5d\n", (edge_1 - edge_0));
-        if (edge_0 >= edge_1) {			    /* Yes. Check bin width */
-	  printf ("do_SQHM__PSD_alloc: bin width is zero or negative!\n");
-	  rply_status_setup (reply, KER__BAD_VALUE, 0, "illegal bin width");
-	  free_HM_memory (NULL);
-	  if (n_extra_bytes != 0) free (my_rqst);
-	  return ERROR;
-	}
-	bin_span = edge_1 - edge_0;
-	Tof_edges[i]->bin_span = bin_span;
-	top_edge = edge_0 + (n_bins * bin_span) - 1;
-	if ((top_edge & (~LWL_HDR_TS_MASK)) != 0) {
-	  printf ("do_SQHM__PSD_alloc: histog last bin is > 20 bits: %u\n",
-		top_edge);
-	  rply_status_setup (reply, KER__BAD_VALUE, 0,
-		"Last bin overflows 20 bits");
-	  free_HM_memory (NULL);
-	  if (n_extra_bytes != 0) free (my_rqst);
-	  return ERROR;
-	}
-	for (j=0; j <= n_bins; j++) Tof_edges[i]->edges[j] = edge_0+j*bin_span;
-	Tof_edges[i]->hi_edge = top_edge;
-	sizeof_edge_arr = OffsetOf (struct tof_edge_arr, edges) +
-					    2 * sizeof (uint);
-      }else {
-					/* Variable width bins */
-	bin_span = edge_1 - edge_0;	/* Note: even though the edges are
-					** defined as variable, they may, in
-					** fact, all be the same width. Check
-					** for this so that we can make a brief
-					** report rather than listing all
-					** the bin edges.
-					*/
-	Tof_edges[i]->bin_span = 0;
-	Tof_edges[i]->edges[0] = edge_0;
-	for (j = 1; j <= n_bins; j++) {
-	  Tof_edges[i]->edges[j] = ntohl (edge_arr_pntr->edges[j]);
-	  if ((Tof_edges[i]->edges[j] & (~LWL_HDR_TS_MASK)) != 0) {
-	    printf ("do_SQHM__PSD_alloc: histog bin is > 20 bits: %d %u\n",
-		j, Tof_edges[i]->edges[j]);
-	    rply_status_setup (reply, KER__BAD_VALUE, 0,
-		    "Bin edge overflows 20 bits");
-	    free_HM_memory (NULL);
-	    if (n_extra_bytes != 0) free (my_rqst);
-	    return ERROR;
-	  }
-	  if (Tof_edges[i]->edges[j-1] >= Tof_edges[i]->edges[j]) {
-	    printf ("do_SQHM__PSD_alloc: bin edges are not in sequence: %d %d\n",
-		i, j);
-	    rply_status_setup (reply, KER__BAD_VALUE, 0,
-		    "Bin edges not in sequence");
-	    free_HM_memory (NULL);
-	    if (n_extra_bytes != 0) free (my_rqst);
-	    return ERROR;
-	  }
-	  if ((Tof_edges[i]->edges[j] - Tof_edges[i]->edges[j-1]) != bin_span)
-	    bin_span = 0;   /* Set bin_span to zero if bin widths really are
-			    ** variable */
-	}
-	if (bin_span != 0) {
-	  printf ("      Variable width bins but width of all bins = %d\n",
-				bin_span);
-	}else {
-	  printf ("      Variable width bins. Upper bin edges are:\n");
-	  for (j = 1; j <= n_bins; j += 10) {
-	    for (k = 0; ((k + j) <= n_bins) && (k < 10); k++)
-	      printf ("%7d", Tof_edges[i]->edges[j+k]);
-	    printf ("\n");
-	  }
-	}
-	Tof_edges[i]->hi_edge = Tof_edges[i]->edges[n_bins] - 1;
-	sizeof_edge_arr = OffsetOf (struct tof_edge_arr, edges) +
-				((n_bins + 1) * sizeof (uint));
-      }
-      edge_arr_pntr = (struct tof_edge_arr *) (	   /* Move to next edge array */
-	    (char *) edge_arr_pntr + sizeof_edge_arr);
-    }
-		/*
-		** Loop over all the counter banks
-		*/
-    bank_pntr = (struct tof_bank *) edge_arr_pntr;
-
-    for (i = 0; i < n_banks; i++) {
-
-      first	    = ntohs (bank_pntr->first);
-      n_cntrs	    = psdXSize*psdYSize;
-      edge_indx     = ntohs (bank_pntr->edge_indx);
-      bytes_per_bin = ntohs (bank_pntr->bytes_per_bin);
-      Bytes_per_bin = bytes_per_bin; /* update global var */
-
-      printf ("    Counter Bank %d:\n", i);
-      printf ("      Number of counters      = %5d\n", n_cntrs);
-      printf ("      First counter           = %5d\n", first);
-      if (N_tof_edges > 1) {
-	printf ("      Edge array #%d\n", edge_indx);
-      }
-      printf ("      Bytes per bin           = %5d\n", bytes_per_bin);
-
-      if (first >= MAX_PSD_CNTR) {
-	printf ("do_SQHM__PSD_alloc: Illegal first counter number: %u.\n",
-		    first);
-	rply_status_setup (reply, KER__BAD_VALUE, 0,
-		    "Bad first counter number");
-	free_HM_memory (NULL);
-	if (n_extra_bytes != 0) free (my_rqst);
-	return ERROR;
-      }
-
-      if ((n_cntrs == 0) || ((first+n_cntrs) > MAX_PSD_CNTR)) {
-	printf ("do_SQHM__PSD_alloc: Illegal # counters: %u %u.\n",
-		    first, n_cntrs);
-	rply_status_setup (reply, KER__BAD_VALUE, 0, "Bad # counters");
-	free_HM_memory (NULL);
-	if (n_extra_bytes != 0) free (my_rqst);
-	return ERROR;
-      }
-
-      if (edge_indx >= N_tof_edges) {
-	printf ("do_SQHM__PSD_alloc: Illegal edge index: %u.\n",
-		    edge_indx);
-	rply_status_setup (reply, KER__BAD_VALUE, 0, "Bad edge-array index");
-	free_HM_memory (NULL);
-	if (n_extra_bytes != 0) free (my_rqst);
-	return ERROR;
-      }
-      edge_info_pntr = Tof_edges[edge_indx];
-      n_bins = edge_info_pntr->n_bins;
-      flag   = edge_info_pntr->flag;
-
-      if (bytes_per_bin == 0) bytes_per_bin = 4;
-      if ((bytes_per_bin != 1) &&
-	  (bytes_per_bin != 2) &&
-	  (bytes_per_bin != 4)) {
-	printf ("do_SQHM__PSD_alloc: Illegal bytes per bin: %d.\n",
-		    bytes_per_bin);
-	rply_status_setup (reply, KER__BAD_VALUE, 0, "Bad bytes-per-bin");
-	free_HM_memory (NULL);
-	if (n_extra_bytes != 0) free (my_rqst);
-	return ERROR;
-      }
-
-      /*
-       here there is a tricky bit: AMOR has two additional single 
-       detectors which need to be binned. They are appended after the
-       normal PSD-histogram
-      */
-      Total_bytes += ((n_cntrs + MAX_PSD_ED) * n_bins * bytes_per_bin);
-      if (Hm_mode_UD != 0) 
-	Total_bytes += ((n_cntrs + MAX_PSD_ED) * n_bins * bytes_per_bin);
-
-      if (i == 0) {	    /* Use the first counter bank to define some .. */
-	N_hists = n_cntrs+MAX_PSD_ED;  
-	                   /* .. globals since we expect there usually to .. */
-			    /* .. be only 1 counter bank. */
-	N_bins = n_bins;
-	Lo_cntr = first;
-	Lo_bin = edge_info_pntr->edges[0];
-	Hi_bin = edge_info_pntr->hi_edge;
-	Compress = ((flag & FLAG__VAR_BIN) == 0) ?
-			edge_info_pntr->edges[1] - edge_info_pntr->edges[0] :
-			0;
-	Bytes_per_bin = bytes_per_bin;
-	Cnts_lo = Cnts_hi = 0;
-      }	    
-
-      bank_pntr++;	    /* Move to next counter bank */
-    }
-
-    if (n_extra_bytes != 0) free (my_rqst);
-
-#ifdef MEN_A012
-    Hist_base_addr = NULL;
-    printf("Calling memPartAlloc with %d, %d\n",
-	   (int)sysHighMemPart, Total_bytes);
-    Hist_base_addr  = memPartAlloc(sysHighMemPart,Total_bytes);
-    Hist_base_MEN_alloc = 1;
-#else
-    i = memFindMax ();	    /* Get size of biggest free memory block */
-    if (i > Total_bytes) {
-       Hist_base_addr = calloc (Total_bytes, sizeof (char));
-    }else {
-      Hist_base_addr = NULL;
-    }
-#endif
-    printf("Successfully allocated %d bytes\n", Total_bytes);
-    if (Hist_base_addr == NULL) {
-      printf ("\007do_SQHM__PSD_alloc:\n"
-	" Unable to reserve %d bytes of memory!\n"
-	" Largest block available = %d.\n", Total_bytes, i);
-      rply_status_setup (reply, KER__BAD_ALLOC, i,
-	    "Failed to get buffer for histograms");
-      reply->sub_status = htonl (i);
-      return ERROR;
-    }
-
-    Cnts_lo = Cnts_hi = 0;
-    N_events = N_skipped = N_no_coin_tsi = N_coin_tsi = 0;
-    Print_hdr = True;
-
-    printf ("    Histogram base address = 0x%08x\n", Hist_base_addr);
-    printf ("    SQHM__PSD mode configured.\n");
-    return OK;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int  do_command (
-/*     ==========
-*/		int			 index,
-		int			 skt,
-		int			 pkt_size,
-		struct req_buff_struct	*rqst,
-		struct rply_buff_struct *reply) {
-/*
-**			Action routine for an SQHM_??? command.
-**			The command is processed (including returning a
-**			status response message).
-*/
-    int		status, indx, is, suspendMode, i, j, sub_cmnd;
-    int		txt_len, txt_offset, bytes_to_go;
-    int		my_first_bin, my_nbins, my_bytes_per_bin, my_hist_no;
-    int		my_sub_code, my_x_lo, my_nx, my_y_lo, my_ny, my_xdim, my_h_slct;
-    time_t	secs;
-    char       *msge, *p_buff, *p_txt;
-
-    reply->bigend = htonl (0x12345678);  /* Put in the "endian" flag. */
-    rply_status_setup (reply, KER__SUCCESS, 0, "All OK");
-
-    switch (ntohl (rqst->cmnd)) {
-
-     case SQHM_CLOSE:		     /* Close the connection. */
-      return ERROR;		     /* Do nothing. */
-
-     case SQHM_CNCT:		     /* Make a new connection. */
-      printf ("%s -- connecting ..", Tsk_name[index]);
-
-      time (&secs);
-      secs = secs - Sqhm_start_time;
-      reply->u.cnct.up_time = htonl (secs);
-
-      if (Cfgn_done == 0) {		     /* Check we've been configured */
-	printf ("\007 but not yet configured!\n");
-	is = rply_status_setup_and_send (skt, reply, KER__BAD_STATE, 0,
-					    "Not configured");
-      }else if (index != 0) {
-	printf ("\007 but not issued to SinqHM-master!\n");
-	is = rply_status_setup_and_send (skt, reply, KER__BAD_STATE, 0,
-					    "Not SinqHM-master");
-      }else {
-	pkt_size = ntohl (rqst->u.cnct.max_pkt);
-	if ((pkt_size < 1024) || (pkt_size > 8192)) pkt_size = 8192;
-	pkt_size = pkt_size & ~3;     /* Ensure pkt_size is multiple of 4 */
-	indx = make_child (SinqHM_server,
-			ntohl (rqst->u.cnct.strt_mode),
-			pkt_size);
-	if (indx <= 0) {	          /* Child created and ready? */
-	  printf ("\n\007%s -- creation of child failed: %d.\n",
-					Tsk_name[0], indx);
-	  switch (indx) {
-	   case -1: msge = "Spawn failed"; break;
-	   case -2: msge = "No more ports"; break;
-	   case -3: msge = "Time-out of child start-up"; break;
-	   case -4: msge = "Child could not get started"; break;
-	   default: msge = "Bad status from make_child";
-	  }
-	  is = rply_status_setup_and_send (skt, reply, KER__BAD_CREATE,
-						    indx, msge);
-	}else {			    /* Yes, child is up and ready. */
-	  reply->u.cnct.port	      = htonl (Port_base + indx);
-	  reply->u.cnct.pkt_size      = htonl (pkt_size);
-	  reply->u.cnct.hm_mode	      = htonl (Hm_mode_ALL);
-	  reply->u.cnct.n_hists	      = htonl (N_hists);
-	  reply->u.cnct.num_bins      = htonl (N_bins);
-	  reply->u.cnct.bytes_per_bin = htonl (Bytes_per_bin);
-	  reply->u.cnct.curr_hist     = htonl (Curr_hist);
-	  reply->u.cnct.max_block = htonl (memFindMax ());  /* Max free mem */
-	  reply->u.cnct.total_bytes = htonl (Total_bytes);
-	  reply->u.cnct.lo_cntr = htonl (Lo_cntr);
-	  reply->u.cnct.lo_bin = htonl (Lo_bin);
-	  reply->u.cnct.compress = htonl (Compress);
-	  printf (" %s started. Packet size = %d.\n", Tsk_name[indx], pkt_size);
-	  is = rply_status_send (skt, reply);
-	}
-      }
-      if (is != OK)
-	printf ("\n%s -- send of status reply failed.\n", Tsk_name[index]);
-      return is;
-
-     case SQHM_CONFIG:
-      printf ("%s: Configure ..", Tsk_name[index]);
-      if (Cfgn_done) {
-	is = rply_status_setup_and_send (skt, reply, KER__BAD_STATE, 0,
-					    "Already configured");
-	printf ("\007 already configured!\n");
-	return ERROR;
-      }
-
-      free_HM_memory (NULL);	/* There should be no memory allocated but
-				** go and release it anyway!
-				*/
-      is = chk_config_alloc (skt, rqst, reply);	/* No, check config msg .. */
-      if (is != OK) {				/* .. and alloc mem */
-	rply_status_send (skt, reply);
-	return ERROR;
-      }
-
-      suspendMode = (Hm_mode_DEBUG != 0) ? 1 : 0;  /* The mode for Filler */
-      is = make_filler (suspendMode);  /* If OK so far, start FILLER. */
-      if (is <= 0) {		       /* Was FILLER created OK? */
-	rply_status_setup_and_send (skt, reply, KER__BAD_CREATE, is,  /* No */
-					    "Filler creation failed");
-	printf ("\n%s -- creation of FILLER failed: %d.\n",
-				    Tsk_name[index], is);
-	free_HM_memory (NULL);
-	Cfgn_done = 0;
-	return ERROR;
-      }else {			    /* Yes, child is up and ready. */
-	printf ("    .. configuration complete, %s has been started.\n",
-			    Filler_name);
-	is = rply_status_send (skt, reply);
-	if (is != OK)
-	    printf ("\n%s -- send of status reply failed.\n", Tsk_name[index]);
-	return is;
-      }
-
-     case SQHM_DAQ:		    /* Start or stop data acquisition. */
-      printf ("%s: DAQ", Tsk_name[index]);
-      if (!Cfgn_done) {			      /* Configured yet? */
-	rply_status_setup_and_send (skt, reply, KER__BAD_STATE, 0,  /* No */
-					    "Not configured");
-	printf ("\007: not configured!\n");
-	return ERROR;
-      }
-      sub_cmnd = ntohl (rqst->u.daq.sub_cmnd);
-      if (sub_cmnd == DAQ__CLR)  printf ("/DAQ__CLR:");
-      if (sub_cmnd == DAQ__GO)   printf ("/DAQ__GO:");
-      if (sub_cmnd == DAQ__INH)  printf ("/DAQ__INH:");
-      if (sub_cmnd == DAQ__STOP) printf ("/DAQ__STOP:");
-      if (sub_cmnd == DAQ__TST)  printf ("/DAQ__TST:");
-
-      do_daq (reply, index, sub_cmnd);
-
-      if (SinqHM_Dsbl_Mask == 0) {
-	printf (" data acquisition is active.\n");
-      }else {
-	printf (" data acquisition is inhibited.\n");
-      }
-
-      is = rply_status_send (skt, reply);
-      if (is != OK)
-	    printf ("\n%s -- send of status reply failed.\n", Tsk_name[index]);
-      return is;
-
-     case SQHM_DBG:			     /* Set debug parameters. */
-      Dbg_mask = ntohl (rqst->u.dbg.mask);
-      Dbg_lev0 = ((Dbg_mask & 1) != 0) ? 1 : 0;
-      Dbg_lev1 = ((Dbg_mask & 2) != 0) ? 1 : 0;
-      Dbg_lev2 = ((Dbg_mask & 4) != 0) ? 1 : 0;
-      Dbg_lev3 = ((Dbg_mask & 8) != 0) ? 1 : 0;
-      printf ("%s: Debug mask = 0x%x\n", Tsk_name[index], Dbg_mask);
-      is = rply_status_setup_and_send (skt, reply, KER__SUCCESS, 0, NULL);
-      if (is != OK)
-	    printf ("\n%s -- send of status reply failed.\n", Tsk_name[index]);
-      return is;
-
-     case SQHM_DECONFIG:	    /* Close down FILLER (and any servers)? */
-      printf ("%s: De-configure", Tsk_name[index]);
-      if (!Cfgn_done) {			    /* Anything to do? */
-	printf (" -- already de-configured!\n");
-	is = rply_status_setup_and_send (skt, reply, KER__SUCCESS, 0, NULL);
-      }else if (index != 0) {
-	printf ("\007 -- not issued to SinqHM-master!\n");
-	is = rply_status_setup_and_send (skt, reply, KER__BAD_STATE, 0,
-					    "Not SinqHM-master");
-      }else {
-	is = close_down_offspring (rqst, reply);
-	if (is == KER__SUCCESS) {
-	  printf (" done.\n");
-	  Cfgn_done = 0;
-	  is = rply_status_setup_and_send (skt, reply, KER__SUCCESS, 0, NULL);
-	}else {
-	  printf ("\n\007Failed! Problem terminating children.\n");
-	  is = rply_status_setup_and_send (skt, reply, KER__BAD_STATE, is,
-					    "Problem terminating children");
-	}
-	free_HM_memory (NULL);	    /* Release all reserved memory */
-      }
-      if (is != OK)
-	    printf ("\n%s -- send of status reply failed.\n", Tsk_name[index]);
-      return is;
-
-     case SQHM_EXIT:				    /* Rundown */
-      printf ("%s: Run-down", Tsk_name[index]);
-      if (index != 0) {
-	printf ("\007 -- not issued to SinqHM-master!\n");
-	is = rply_status_setup_and_send (skt, reply, KER__BAD_STATE, 0,
-					    "Not SinqHM-master");
-      }else {
-	rqst->u.decnfg.sub_code = htonl (1);	    /* Set "harshness" = 1 */
-	is = close_down_offspring (rqst, reply);
-	if (is == KER__SUCCESS) {
-	  printf (" done.\n");
-	  Cfgn_done = 0;
-	  is = rply_status_setup_and_send (skt, reply, KER__SUCCESS, 0, NULL);
-	}else {
-	  printf ("\007 -- warning -- problem terminating children.\n");
-	  is = rply_status_setup_and_send (skt, reply, KER__BAD_STATE, is,
-					    "Problem terminating children");
-	}
-	free_HM_memory (NULL);	    /* Release all reserved memory */
-      }
-      if (is != OK)
-	    printf ("\n%s -- send of status reply failed.\n", Tsk_name[index]);
-      return OK;
-
-     case SQHM_IDENT:		     /* Give info on software identification. */
-      txt_len = IDENT_MSGE_LEN;
-      txt_offset = 0;
-      p_buff = calloc (txt_len, 1);	    /* Get a buffer for text info */
-      if (p_buff == NULL) {
-	printf ("\n\007%s -- SQHM_IDENT: failed to get buffer!\n",
-	    Tsk_name[index]);
-	rply_status_setup_and_send (skt, reply, KER__BAD_ALLOC, 0,
-	    "Failed to get buffer for composing Ident");
-	return ERROR;
-      }
-      time (&secs);
-      secs = secs - Sqhm_start_time;
-      reply->u.ident.up_time = htonl (secs);
-      reply->u.ident.n_extra_bytes = htonl (IDENT_MSGE_LEN);
-      p_txt = p_buff;
-
-      reply->u.ident.offset_vxWorks_ident = htons (txt_offset);
-      StrJoin (p_txt, txt_len, vxWorksVersion, "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-      
-      reply->u.ident.offset_vxWorks_date = htons (txt_offset);
-      StrJoin (p_txt, txt_len, creationDate, "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-
-      reply->u.ident.offset_instr = htons (txt_offset);
-      StrJoin (p_txt, txt_len, Instr_name, "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-
-      reply->u.ident.offset_def_ident = htons (txt_offset);
-      StrJoin (p_txt, txt_len, Def_ident, "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-
-      reply->u.ident.offset_sinqhm_main_ident = htons (txt_offset);
-      StrJoin (p_txt, txt_len, Sqhm_main_ident, "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-
-      reply->u.ident.offset_sinqhm_main_date = htons (txt_offset);
-      StrJoin (p_txt, txt_len, Sqhm_main_date, "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-
-      reply->u.ident.offset_sinqhm_server_ident = htons (txt_offset);
-      StrJoin (p_txt, txt_len, Sqhm_serv_ident, "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-
-      reply->u.ident.offset_sinqhm_server_date = htons (txt_offset);
-      StrJoin (p_txt, txt_len, Sqhm_serv_date, "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-
-      reply->u.ident.offset_sinqhm_filler_ident = htons (txt_offset);
-      StrJoin (p_txt, txt_len, Sqhm_fill_ident, "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-
-      reply->u.ident.offset_sinqhm_filler_date = htons (txt_offset);
-      StrJoin (p_txt, txt_len, Sqhm_fill_date, "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-
-      reply->u.ident.offset_sinqhm_routines_ident = htons (txt_offset);
-      StrJoin (p_txt, txt_len, Sqhm_rout_ident, "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-
-      reply->u.ident.offset_sinqhm_routines_date = htons (txt_offset);
-      StrJoin (p_txt, txt_len, Sqhm_rout_date, "");
-      i = strlen (p_txt) + 1;
-      txt_offset += i; p_txt += i; txt_len -= i;
-
-      is = rply_status_send (skt, reply);
-		    /*
-		    ** Now send the data
-		    */
-      p_txt = p_buff;
-      bytes_to_go = IDENT_MSGE_LEN;
-      while (bytes_to_go > 0) {
-	i = (bytes_to_go > pkt_size) ? pkt_size : bytes_to_go;
-	is = send (skt, p_txt, i, 0);
-	if (is > 0) {
-	  Rw_bytes_put += is;
-	  bytes_to_go  -= is;
-	  p_txt        += is;
-	}else {
-	  free (p_buff);
-	  printf ("\n\007%s -- SQHM_IDENT: failed to send extra data!\n",
-				    Tsk_name[index]);
-	  return ERROR;		    /* Fatal error on send */
-	}
-      }
-      free (p_buff);
-      return OK;
-
-     case SQHM_PROJECT:	    /* Read a projected "rectangle" of the HM. */
-      if (Cfgn_done == 0) {		     /* Check we've been configured */
-	printf ("\007%s -- projecting but not yet configured!\n", Tsk_name[index]);
-	is = rply_status_setup_and_send (skt, reply, KER__BAD_STATE, 0,
-					    "Not configured");
-	return ERROR;
-      }else {
-	if (Dbg_lev0) printf ("%s -- projecting ..", Tsk_name[index]);
-	my_sub_code = ntohl (rqst->u.project.sub_code);
-	my_x_lo     = ntohl (rqst->u.project.x_lo);
-	my_nx       = ntohl (rqst->u.project.nx);
-	my_y_lo     = ntohl (rqst->u.project.y_lo);
-	my_ny       = ntohl (rqst->u.project.ny);
-	my_xdim     = ntohl (rqst->u.project.xdim);
-	my_h_slct   = ntohl (rqst->u.project.nhist);
-	is = do_project (index, reply, skt, pkt_size,
-	       my_sub_code, my_x_lo, my_nx, my_y_lo, my_ny, my_xdim, my_h_slct);
-	if (is != OK) {
-	  printf ("\n%s -- SQHM_PROJECT fatal error sending status reply or "
-			"histo data.\n", Tsk_name[index]);
-	}else {
-	  if (Dbg_lev0) printf (" done.\n");
-	}
-	return is;
-      }
-
-     case SQHM_READ:	/* Read a section of the HM. */
-      if (Cfgn_done == 0) {		     /* Check we've been configured */
-	printf ("\007%s -- reading but not yet configured!\n", Tsk_name[index]);
-	is = rply_status_setup_and_send (skt, reply, KER__BAD_STATE, 0,
-					    "Not configured");
-	return ERROR;
-      }else {
-	if (Dbg_lev0) printf ("%s -- reading ..", Tsk_name[index]);
-	my_hist_no   = ntohl (rqst->u.read.hist_no);
-	my_first_bin = ntohl (rqst->u.read.first_bin);
-	my_nbins     = ntohl (rqst->u.read.n_bins);
-	is = do_read (index, reply, skt, pkt_size,
-		    my_nbins, my_first_bin, my_hist_no);
-	if (is != OK) {
-	  printf ("\n%s -- SQHM_READ fatal error sending status reply or "
-			"histo data.\n", Tsk_name[index]);
-	}else {
-	  if (Dbg_lev0) printf (" done.\n");
-	}
-	return is;
-      }
-
-     case SQHM_SELECT:	    /* SQHM_SELECT still needs to be programmed. */
-      printf ("%s: Select ..\n", Tsk_name[index]);
-      is = rply_status_setup_and_send (skt,
-		    reply, KER__BAD_VALUE, 0, "Not yet available!");
-      if (is != OK) {
-	printf ("\n%s -- send of status reply failed.\n", Tsk_name[index]);
-      }else {
-	printf (" has been ignored but acknowledged.\n");
-      }
-      return is;
-
-     case SQHM_STATUS:			/* Get-Status request */
-      if (Dbg_lev0) printf ("%s: Status ..", Tsk_name[index]);
-		    /*
-		    ** Build up info
-		    */
-      reply->status = htonl (KER__SUCCESS);	/* Indicate success */
-      strcpy ((char *) &reply->sub_status,	/* Set up the Ident */
-			    SINQHM_DEF_ID);	/* This does not need htonl! */
-      reply->u.status.max_n_hists  = htonl (N_HISTS_MAX);
-      reply->u.status.max_num_bins = htonl (N_BINS_MAX + 1);
-      reply->u.status.max_srvrs    = MAX_CLIENTS;
-      reply->u.status.max_block    = htonl (memFindMax ());  /* Max free mem */
-      if (Cfgn_done == 0) {
-	reply->u.status.cfg_state     = 0;
-	reply->u.status.n_hists	      = 0;
-	reply->u.status.curr_hist     = 0;
-	reply->u.status.num_bins      = 0;
-	reply->u.status.act_srvrs     = 0;
-	reply->u.status.bytes_per_bin = 0;
-	reply->u.status.compress      = 0;
-	reply->u.status.daq_now	      = 0;
-	reply->u.status.filler_mask   = 0;
-	reply->u.status.tsi_status    = 0;
-	reply->u.status.flags	      = 0;
-	reply->u.status.dt_or_dts.both = 0;
-	reply->u.status.num_bad_events = 0;
-      }else {
-	reply->u.status.cfg_state    = htonl (Hm_mode_ALL);
-	reply->u.status.n_hists	     = htons (N_hists);
-	reply->u.status.curr_hist    = htons (Curr_hist);
-	reply->u.status.num_bins     = htonl (N_bins);
-
-	for (j = 0, i = MAX_CLIENTS; i > 0; i--) if (Child_pid[i] != 0) j++;
-	reply->u.status.act_srvrs  = j;
-
-	reply->u.status.bytes_per_bin = Bytes_per_bin;
-	reply->u.status.compress      = Compress;
-	reply->u.status.daq_now	      = htons (SinqHM_Dsbl_Mask);
-	reply->u.status.filler_mask   = htons (Server_masks[0]);
-	reply->u.status.tsi_status    = htons (Tsi_status_info);
-	reply->u.status.flags	      = htons (Tsi_flags);
-	reply->u.status.dt_or_dts.both = htonl (Dt_or_dts.both);
-	reply->u.status.num_bad_events = htonl (Num_bad_events);
-      }
-      time (&secs);
-      secs = secs - Sqhm_start_time;
-      reply->u.status.up_time = htonl (secs);
-
-      is = rply_status_send (skt, reply);
-      if (Dbg_lev0) {
-	if (is != OK) {
-	  printf ("\n%s -- send of status reply failed.\n", Tsk_name[index]);
-	}else {
-	  printf (" has been sent.\n");
-	}
-      }
-      return is;
-
-     case SQHM_WRITE:	/* Write a section of the HM.
-			**
-			** NOTE: always call do_write, even if not configured
-			** ====  since network data has always to be read.
-			*/
-      printf ("%s: writing ..", Tsk_name[index]);
-      my_hist_no       = ntohl (rqst->u.write.hist_no);
-      my_first_bin     = ntohl (rqst->u.write.first_bin);
-      my_nbins	       = ntohl (rqst->u.write.n_bins);
-      my_bytes_per_bin = ntohl (rqst->u.write.bytes_per_bin);
-      is = do_write (index, rqst, reply, skt, pkt_size,
-			my_nbins, my_first_bin, my_bytes_per_bin, my_hist_no);
-      if (is != OK) {
-	printf ("\n%s -- send of status reply failed.\n", Tsk_name[index]);
-      }else {
-	printf (" done.\n");
-      }
-      return is;
-
-     case SQHM_ZERO:
-      if (Cfgn_done == 0) {		     /* Check we've been configured */
-	printf ("\007%s -- zeroing but not yet configured!\n", Tsk_name[index]);
-	is = rply_status_setup_and_send (skt, reply, KER__BAD_STATE, 0,
-					    "Not configured");
-	return ERROR;
-      }else {
-        printf ("%s -- zeroing ..", Tsk_name[index]);
-
-	my_hist_no   = ntohl (rqst->u.zero.hist_no);
-	my_first_bin = ntohl (rqst->u.zero.first_bin);
-        my_nbins     = ntohl (rqst->u.zero.n_bins);
-
-	do_zero (reply, index, my_nbins, my_first_bin, my_hist_no);
-	is = rply_status_send (skt, reply);
-	if (is != OK) {
-	  printf ("\n%s -- send of status reply failed.\n", Tsk_name[index]);
-	}else {
-	  printf (" done.\n");
-	}
-	return is;
-      }
-
-     default:
-      printf ("%s: Unrecognised command received ..\n", Tsk_name[index]);
-      is = rply_status_setup_and_send (skt,
-		    reply, KER__BAD_VALUE, 0, "Unrecognised command!");
-      if (is != OK) {
-	printf ("\n%s -- send of status reply failed.\n", Tsk_name[index]);
-      }else {
-	printf (" it has been acknowledged.\n");
-      }
-      return is;
-    }
-    printf ("\007Software error in do_command - switch statement completed!\n");
-    return ERROR;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void do_daq (
-/*     ======
-*/		struct rply_buff_struct *reply,
-		int			 index,
-		int			 sub_cmnd) {
-/*
-**			Action routine for SQHM_DAQ command. Send a
-**			message to SinqHM-filler to get the command done.
-**
-**	    To send a message to SinqHM-filler:
-**		a) Claim Sem_Filler to gain access to the messageQ to filler;
-**		b) Set Filler_flag = 1 to warn SinqHM-filler that a message
-**		    is coming. If SinqHM-filler is taking data, this gets it
-**		    to break out of its data acquisition loop and wait for
-**		    a message. This is to avoid SinqHM-filler having to do
-**		    a system call in its innermost daq loop.
-**		c) Send the message with msgQSend (remembering to set up the
-**		    index in the message correctly so that SinqHM-filler knows
-**		    to whom it should send a reply).
-**		d) Wait for the reply with msgQReceive.
-**		e) Release Sem_Filler.
-*/
-    int				is, status;
-    char			recd[80];
-    struct msg_to_filler_struct msg;
-
-    reply->status = htonl (KER__SUCCESS);	     /* Assume success */
-    reply->u.daq.daq_was = htons (SinqHM_Dsbl_Mask); /* Return old daq state */
-    reply->u.daq.filler_mask = htons (Server_masks[0]);	    /* Filler's mask */
-    reply->u.daq.server_mask = htons (Server_masks[index]); /* Server's mask */
-
-    if (sub_cmnd == DAQ__TST) {	    /* DAQ__TST is special - we just give the ..
-				    ** .. caller a snapshot without invoking ..
-				    ** .. SinqHM-filler. */
-      reply->u.daq.daq_now = reply->u.daq.daq_was;
-      return;
-    }
-
-    if (Dbg_lev0) printf ("\nDO_DAQ_%02d - claiming Sem_Filler\n", index);
-    if (Use_sem_tmo) {
-      is = (int) semTake (Sem_Filler, Sem_tmo);
-    }else {
-      is = (int) semTake (Sem_Filler, WAIT_FOREVER);
-    }
-    if (Dbg_lev0)
-      printf ("DO_DAQ_%02d - completed Sem_Filler claim: %d\n", index, is);
-    if (is != OK) {
-      kill (Parent_pid, SIGUSR1);   /* Inform parent that we are in trouble */
-      sprintf (recd, "DO_DAQ_%02d - sem claim err\n", index);
-      perror (recd);
-      exit (KER__BAD_VALUE);
-    }
-
-    Filler_flag = 1;	/* Warn SinqHM-filler that a message is coming */
-
-    msg.u.uu.cmnd  = sub_cmnd;
-    msg.u.uu.index = index;
-    is = msgQSend (MsgQ_to_filler,
-			(char *) &msg,
-			sizeof (msg),
-			WAIT_FOREVER, MSG_PRI_NORMAL);
-    if (is != OK) {
-      printf ("do_daq -- error status from msgQSend: %d\n", is);
-      exit (KER__BAD_VALUE);
-    }
-    is = msgQReceive (MsgQ_to_server[index],
-			(char *) &msg,
-			sizeof (msg),
-			WAIT_FOREVER);
-    if (is <= 0) {
-      printf ("do_daq -- error status from msgQReceive: %d\n", is);
-      exit (KER__BAD_VALUE);
-    }
-				    /* Complete the status response message */
-    reply->u.daq.daq_now = htons (msg.u.uu.new_mask);	    /* New daq state */
-
-    if (Dbg_lev0) printf ("DO_DAQ_%02d - releasing sem\n", index);
-    is = (int) semGive (Sem_Filler);	/* Release the semaphore */
-    if (Dbg_lev0)
-      printf ("DO_DAQ_%02d - completed sem release: %d\n", index, is);
-    if (is != OK) {
-      kill (Parent_pid, SIGUSR1);   /* Inform parent that we are in trouble */
-      sprintf (recd, "DO_DAQ_%02d - sem release err\n", index);
-      perror (recd);
-      exit (KER__BAD_VALUE);
-    }
-  }
-/**
- * --------------------------------------------------------------------------
- * project_frame reads one time frame of a TOF or PSD histogram
- */
-static int project_frame(int rw_skt, int pkt_size, int nx){
-  struct rply_buff_struct rply;
-  uint *buffer = NULL; 
-  uchar *bufPtr;
-  int i, bytesToSend, nSend, bytesSent;
-    register union {
-      void	    *base;
-      uchar	    *ch;
-      usint	    *i2;
-      uint	    *i4;
-    } hm_pntr;
-    long sum;
-
-  printf("PROJECT: Trying to retrieve time frame: %d\n", nx);
-
-  /*
-    check arguments
-  */
-  if(nx < 0 || nx >= N_bins){
-    printf("PROJECT FRAME: bad time frame requested: 0 < %d < %d\n",
-	   nx,N_bins);
-    rply_status_setup (&rply, KER__BAD_VALUE, 0, "Bad argument"); 
-    rply_status_send (rw_skt, &rply);
-    return OK;
-  }
-  
-  /*
-    allocate space
-  */
-  buffer = (uint *)malloc(N_hists*sizeof(uint));
-  if(!buffer){
-    printf ("\n\007 -- SQHM_PROJECT-FRAME: failed to get buffer!\n");
-      rply_status_setup_and_send (rw_skt, &rply, KER__BAD_ALLOC, 0,
-	    "Failed to get buffer for projecting data");
-      return OK;
-  }
-  
-  /*
-    fill buffer
-    FIX: This works only OK with 4 byte HM data. 
-  */
-  hm_pntr.i4 = Hist_base_addr;
-  for(i = 0, sum = 0; i < N_hists;i++){
-    buffer[i] = htonl(*(hm_pntr.i4 + (i*N_bins) + nx));
-    sum += *(hm_pntr.i4+(i*N_bins) +nx);
-  }
-
-  printf("Frame %d contained %d counts \n",nx,sum);
-  /*
-    build reply and send data
-  */
-  rply.bigend = 0x12345678;
-  rply.u.project.n_bins = htonl(N_hists);
-  rply.u.project.bytes_per_bin = htonl(4);
-  rply.u.project.cnts_lo = 0;
-  rply.u.project.cnts_hi = 0;
-  rply_status_setup_and_send (rw_skt, &rply, KER__SUCCESS, 0, NULL);
-  bufPtr = (uchar *)buffer;
-  bytesToSend = N_hists*4;
-  while(bytesToSend > 0){
-    nSend = (bytesToSend > pkt_size) ? pkt_size : bytesToSend;
-    bytesSent = send(rw_skt,bufPtr,nSend,0);
-    if(bytesSent > 0){
-      bytesToSend -= bytesSent;
-      bufPtr += bytesSent;
-    } else {
-      return ERROR;
-    }
-  }
-  free(buffer);
-
-  return OK;
-}
-/*
-**--------------------------------------------------------------------------*/
-  int do_project (
-/*    ==========
-*/		int			index,
-		struct rply_buff_struct *rply_bf,
-		int			rw_skt,
-		int			pkt_size,
-		uint			sub_code,
-		uint			x_lo,
-		uint			nx,
-		uint			y_lo,
-		uint			ny,
-		uint			xdim,
-		uint			h_slct) {
-/*
-**                  Read a "rectangular" region of Hist Mem and send it
-**		    to the client.
-*/
-    register int	i, j, k, offs, dataPtr, nTime;
-    register uint	my_bin_lo,  my_bin_hi;
-    register uint	my_hist_lo, my_hist_hi;
-
-    uint		    my_xdim, eff_nhists;
-    int			    my_nbins, is, status, bytes_to_go, nput, nxtbin, nb;
-    int			    my_daq_save;
-    struct rply_buff_struct dummy_rply;
-    uchar		   *buff_pntr, *last_byte;
-    uchar		    buff[pkt_size];
-
-    register union {
-      void	    *base;
-      uchar	    *ch;
-      usint	    *i2;
-      uint	    *i4;
-    } my_pntr, hm_pntr;
-
-    rply_status_setup (rply_bf, KER__BAD_VALUE, 0, "Bad argument"); /* Assume ..
-						** .. we shall find a bad arg */
-/*--------------------------------------------------------------------
-**	    The SQHM_PROJECT command is histogram mode dependent. Switch
-**	    accordingly.
-*/
-
-    /*    
-  printf("\nProject with hm-mode : %d, subcode = %d\n", Hm_mode, sub_code); 
-    */
-
-
-    switch (Hm_mode) {
-		/*-----------------------------------------------------------*/
-     case SQHM__HM_DIG:	/* SQHM__HM_DIG and SQHM__HRPT are handled the same. */
-     case SQHM__HRPT:
-      if ((sub_code & PROJECT__1_DIM) == 0) {  /* Check for pseudo-2-dim mode */
-				    /* Non-pseudo-2-dim mode. Check the args */
-	my_hist_lo = y_lo;
-	if (my_hist_lo >= N_hists) {
-	  printf ("\n\007%s -- SQHM_PROJECT: Bad y_lo!\n", Tsk_name[index]);
-	  is = rply_status_send (rw_skt, rply_bf);
-	  return OK;
-	}
-	my_hist_hi = (ny != 0) ? (y_lo + ny - 1) : (N_hists - 1);
-	  if ((my_hist_hi < my_hist_lo) || (my_hist_hi >= N_hists)) {
-	  printf ("\n\007%s -- SQHM_PROJECT: Bad ny!\n", Tsk_name[index]);
-	  is = rply_status_send (rw_skt, rply_bf);
-	  return OK;
-	}
-	my_bin_lo = x_lo;
-	if (my_bin_lo >= N_bins) {
-	  printf ("\n\007%s -- SQHM_PROJECT: Bad x_lo!\n", Tsk_name[index]);
-	  is = rply_status_send (rw_skt, rply_bf);
-	  return OK;
-	}
-	my_bin_hi = (nx != 0) ? (x_lo + nx - 1) : (N_bins - 1);
-	if ((my_bin_hi < my_bin_lo) || (my_bin_hi >= N_bins)) {
-	  printf ("\n\007%s -- SQHM_PROJECT: Bad nx!\n", Tsk_name[index]);
-	  is = rply_status_send (rw_skt, rply_bf);
-	  return OK;
-	}
-      }else {					/* It is pseudo-2-dim mode */
-	if (h_slct >= N_hists) {
-	  printf ("\n\007%s -- SQHM_PROJECT: Bad h_slct!\n", Tsk_name[index]);
-	  is = rply_status_send (rw_skt, rply_bf);
-	  return OK;
-	}
-	if ((xdim == 0) ||
-	    (xdim > N_bins) ||
-	    ((N_bins % xdim) != 0)) {
-	  printf ("\n\007%s -- SQHM_PROJECT: Bad xdim!\n", Tsk_name[index]);
-	  is = rply_status_send (rw_skt, rply_bf);
-	  return OK;
-	}
-	eff_nhists = N_bins/xdim;
-	my_hist_lo = y_lo;
-	if (my_hist_lo >= eff_nhists) {
-	  printf ("\n\007%s -- SQHM_PROJECT: Bad y_lo!\n", Tsk_name[index]);
-	  is = rply_status_send (rw_skt, rply_bf);
-	  return OK;
-	}
-	my_hist_hi = (ny != 0) ? (y_lo + ny - 1) : (eff_nhists - 1);
-	  if ((my_hist_hi < my_hist_lo) || (my_hist_hi >= eff_nhists)) {
-	  printf ("\n\007%s -- SQHM_PROJECT: Bad ny!\n", Tsk_name[index]);
-	  is = rply_status_send (rw_skt, rply_bf);
-	  return OK;
-	}
-	my_bin_lo = x_lo;
-	if (my_bin_lo >= xdim) {
-	  printf ("\n\007%s -- SQHM_PROJECT: Bad x_lo!\n", Tsk_name[index]);
-	  is = rply_status_send (rw_skt, rply_bf);
-	  return OK;
-	}
-	my_bin_hi = (nx != 0) ? (x_lo + nx - 1) : (xdim - 1);
-	if ((my_bin_hi < my_bin_lo) || (my_bin_hi >= xdim)) {
-	  printf ("\n\007%s -- SQHM_PROJECT: Bad nx!\n", Tsk_name[index]);
-	  is = rply_status_send (rw_skt, rply_bf);
-	  return OK;
-	}
-      }
-		    /*
-		    ** All the arguments are OK. Drop through to common code
-		    ** for reserving buffer space.
-		    */
-      break;
-		/*-----------------------------------------------------------*/
-     case SQHM__TOF:		/* Time-of-Flight Mode */
-       if(sub_code == PROJECT__FRAME){
-	 return project_frame(rw_skt,pkt_size,nx);
-       }
-
-      if ((sub_code & PROJECT__1_DIM) != 0) {
-	printf ("\n\007%s -- SQHM_PROJECT: SQHM__TOF+PROJECT__1_DIM not yet "
-			"implemented!\n", Tsk_name[index]);
-	is = rply_status_setup_and_send (rw_skt, rply_bf, KER__BAD_VALUE, 0,
-			    "Not yet implemented");
-	return OK;
-      }
-					    /* Check the arguments */
-      my_hist_lo = y_lo;
-      if (my_hist_lo >= MAX_TOF_CNTR) {
-	printf ("\n\007%s -- SQHM_PROJECT: Bad y_lo!\n", Tsk_name[index]);
-	is = rply_status_send (rw_skt, rply_bf);
-	return OK;
-      }
-      my_hist_hi = (ny != 0) ? (y_lo + ny - 1) : (N_hists - 1);
-      if ((my_hist_hi < my_hist_lo) || (my_hist_hi >= MAX_TOF_CNTR)) {
-	printf ("\n\007%s -- SQHM_PROJECT: Bad ny!\n", Tsk_name[index]);
-	is = rply_status_send (rw_skt, rply_bf);
-	return OK;
-      }
-					/*
-					** Check that all hists are defined
-					*/
-      for (i = my_hist_lo; i <= my_hist_hi; i++) {
-        if (Tof_descr[i] == NULL) {
-	  printf ("\n\007%s -- SQHM_PROJECT: Bad counter range!\n",
-					Tsk_name[index]);
-	  is = rply_status_send (rw_skt, rply_bf);
-	  return OK;
-	}
-      }
-				    /*
-				    ** Check that all have the same edge array.
-				    */
-      for (i = (my_hist_lo + 1); i <= my_hist_hi; i++) {
-        if (Tof_descr[i]->bin_edge != Tof_descr[i-1]->bin_edge) {
-	  printf ("\n\007%s -- SQHM_PROJECT: Bad histogram edges!\n",
-					Tsk_name[index]);
-	  is = rply_status_send (rw_skt, rply_bf);
-	  return OK;
-	}
-      }
-
-      my_bin_lo = x_lo;
-      if (my_bin_lo >= Tof_descr[my_hist_lo]->n_bins) {
-	printf ("\n\007%s -- SQHM_PROJECT: Bad x_lo!\n", Tsk_name[index]);
-	is = rply_status_send (rw_skt, rply_bf);
-	return OK;
-      }
-      my_bin_hi = (nx != 0) ?
-		    (x_lo + nx - 1) : (Tof_descr[my_hist_lo]->n_bins - 1);
-      if ((my_bin_hi < my_bin_lo) ||
-	  (my_bin_hi >= Tof_descr[my_hist_lo]->n_bins)) {
-	printf ("\n\007%s -- SQHM_PROJECT: Bad nx!\n", Tsk_name[index]);
-	is = rply_status_send (rw_skt, rply_bf);
-	return OK;
-      }
-		    /*
-		    ** All the arguments are OK. Drop through to common code
-		    ** for reserving buffer space.
-		    */
-      break;
-     case SQHM__HM_PSD:
-                    /*
-		    ** code for TRICS, AMOR PSD
-                    */
-       if( (sub_code & PROJECT__FRAME) == 0){
-	 return project_frame(rw_skt,pkt_size,nx);
-       }
-
-       if(sub_code == PROJECT__COLL){
-	 my_nbins = psdXSize * psdYSize;	 
-         nTime = Tof_edges[0]->n_bins;
-       } else if(sub_code == PROJECT__SAMPLE) {
-	 if(x_lo < 0 || x_lo + nx > psdXSize){
-	  printf ("\n\007%s -- SQHM_PROJECT:Bad x_range lo %d, n %d,max %d\n", 
-             Tsk_name[index], x_lo,nx,psdXSize);
- 	  is = rply_status_send (rw_skt, rply_bf);
-	  return OK;
-         }
-	 if(y_lo < 0 || y_lo + ny > psdYSize){
-	  printf ("\n\007%s -- SQHM_PROJECT:Bad y_range lo %d, n %d,max %d\n", 
-             Tsk_name[index], y_lo,ny,psdYSize);
- 	  is = rply_status_send (rw_skt, rply_bf);
-	  return OK;
-         }
-         my_nbins = Tof_edges[0]->n_bins;
-         nTime = Tof_edges[0]->n_bins;
-       } else {
-	  printf ("\n\007%s -- SQHM_PROJECT:Bad subcode for PSD\n", 
-             Tsk_name[index]);
- 	  is = rply_status_send (rw_skt, rply_bf);
-	  return OK;
-       }
-       break;
-		/*-----------------------------------------------------------*/
-     default:	/* SQHM_PROJECT is not supported in other modes. */
-      printf ("\n\007%s -- SQHM_PROJECT: bad Hm_mode!\n", Tsk_name[index]);
-      is = rply_status_setup_and_send (rw_skt, rply_bf, KER__BAD_VALUE, 0,
-			    "Bad Hm_mode");
-      return OK;
-    }
-/*-------------------------------------------------------------------------
-*/		    /*
-		    ** All the arguments have been checked. Reserve some space
-		    ** for projecting the data. The amount of space that we
-		    ** need for the projection depends on whether the
-		    ** projection is onto the x-axis or y-axis.
-		    */
-
-    if(Hm_mode != SQHM__HM_PSD){
-      my_nbins = ((sub_code & PROJECT__ON_Y) == 0) ?
-		  (my_bin_hi - my_bin_lo + 1) : (my_hist_hi - my_hist_lo + 1);
-    }
-
-    my_pntr.base = calloc (my_nbins, sizeof (uint));
-    if (my_pntr.base == NULL) {
-      printf ("\n\007%s -- SQHM_PROJECT: failed to get buffer!\n",
-				Tsk_name[index]);
-      rply_status_setup_and_send (rw_skt, rply_bf, KER__BAD_ALLOC, 0,
-	    "Failed to get buffer for projecting data");
-      return OK;
-    }
-		    /*-----------------------------------------------------
-		    ** We got some buffer space so inhibit data acqu ...
-		    */
-    my_daq_save = SinqHM_Dsbl_Mask & Server_masks[index]; /* Remember the ..
-							  ** .. state of our ..
-							  ** .. inhibit bit */
-    if (my_daq_save == 0) do_daq (&dummy_rply, index, DAQ__INH);
-		    /*-----------------------------------------------------
-		    ** ... then do the projection ...
-		    */
-    switch (Hm_mode) {
-
-     case SQHM__HM_DIG:	    /* HM_DIG & HRPT Mode */
-     case SQHM__HRPT:
-      if ((sub_code & PROJECT__1_DIM) == 0) {  /* Check for pseudo-2-dim mode */
-				 /* Non-pseudo-2-dim mode. Do a simple proj'n */
-	if ((sub_code & PROJECT__ON_Y) == 0) {
-	  for (i = my_hist_lo; i <= my_hist_hi; i++) {
-	    hm_pntr.base = Hist_base_addr + (i * N_bins * Bytes_per_bin);
-	    for (j = my_bin_lo; j <= my_bin_hi; j++) {
-	      switch (Bytes_per_bin) {
-	       case 1: my_pntr.i4[j-my_bin_lo] += hm_pntr.ch[j]; break;
-	       case 2: my_pntr.i4[j-my_bin_lo] += hm_pntr.i2[j]; break;
-	       case 4: my_pntr.i4[j-my_bin_lo] += hm_pntr.i4[j];
-	      }
-	    }
-	  }
-	}else {
-	  for (i = my_hist_lo; i <= my_hist_hi; i++) {
-	    hm_pntr.base = Hist_base_addr + (i * N_bins * Bytes_per_bin);
-	    offs = i - my_hist_lo;
-	    for (j = my_bin_lo; j <= my_bin_hi; j++) {
-	      switch (Bytes_per_bin) {
-	       case 1: my_pntr.i4[offs] += hm_pntr.ch[j]; break;
-	       case 2: my_pntr.i4[offs] += hm_pntr.i2[j]; break;
-	       case 4: my_pntr.i4[offs] += hm_pntr.i4[j];
-	      }
-	    }
-	  }
-	}
-      }else {					/* It is pseudo-2-dim mode */
-	hm_pntr.base = Hist_base_addr + (h_slct * N_bins * Bytes_per_bin);
-	if ((sub_code & PROJECT__ON_Y) == 0) {
-	  for (i = my_hist_lo; i <= my_hist_hi; i++) {
-	    for (j = my_bin_lo; j <= my_bin_hi; j++) {
-	      switch (Bytes_per_bin) {
-	       case 1: my_pntr.i4[j-my_bin_lo] += hm_pntr.ch[xdim*i+j]; break;
-	       case 2: my_pntr.i4[j-my_bin_lo] += hm_pntr.i2[xdim*i+j]; break;
-	       case 4: my_pntr.i4[j-my_bin_lo] += hm_pntr.i4[xdim*i+j];
-	      }
-	    }
-	  }
-	}else {
-	  for (i = my_hist_lo; i <= my_hist_hi; i++) {
-	    offs = i - my_hist_lo;
-	    for (j = my_bin_lo; j <= my_bin_hi; j++) {
-	      switch (Bytes_per_bin) {
-	       case 1: my_pntr.i4[offs] += hm_pntr.ch[xdim*i+j]; break;
-	       case 2: my_pntr.i4[offs] += hm_pntr.i2[xdim*i+j]; break;
-	       case 4: my_pntr.i4[offs] += hm_pntr.i4[xdim*i+j];
-	      }
-	    }
-	  }
-	}
-      }
-      break;
-
-     case SQHM__TOF:		/* Time-of-Flight Mode */
-      if ((sub_code & PROJECT__ON_Y) == 0) {
-	for (i = my_hist_lo; i <= my_hist_hi; i++) {
-	  hm_pntr.base = (void *) Tof_descr[i]->u.l_bin_data;
-	  for (j = my_bin_lo; j <= my_bin_hi; j++) {
-	    switch (Bytes_per_bin) {
-	     case 1: my_pntr.i4[j-my_bin_lo] += hm_pntr.ch[j]; break;
-	     case 2: my_pntr.i4[j-my_bin_lo] += hm_pntr.i2[j]; break;
-	     case 4: my_pntr.i4[j-my_bin_lo] += hm_pntr.i4[j];
-	    }
-	  }
-	}
-      }else {
-	for (i = my_hist_lo; i <= my_hist_hi; i++) {
-	  hm_pntr.base = (void *) Tof_descr[i]->u.l_bin_data;
-	  offs = i - my_hist_lo;
-	  for (j = my_bin_lo; j <= my_bin_hi; j++) {
-	    switch (Bytes_per_bin) {
-	     case 1: my_pntr.i4[offs] += hm_pntr.ch[j]; break;
-	     case 2: my_pntr.i4[offs] += hm_pntr.i2[j]; break;
-	     case 4: my_pntr.i4[offs] += hm_pntr.i4[j];
-	    }
-	  }
-	}
-      }
-      break;
-    case SQHM__HM_PSD:
-              /*
-	      ** code for TRICS/AMOR PSD
-              **
-	      */
-      if(sub_code == PROJECT__COLL){
-        hm_pntr.base = 	Hist_base_addr;
-	for(i = 0; i < psdXSize; i++){
-	  for(j = 0; j < psdYSize; j++){
-	    offs = j * psdXSize + i;
-	    dataPtr = j*psdXSize*nTime + i*nTime;
-	    my_pntr.i4[offs] = 0;
-	    for(k = 0; k < nTime; k++){
-	      switch(Bytes_per_bin)
-	      {
-		case 1:
-		  my_pntr.i4[offs] += hm_pntr.ch[dataPtr + k];
-		  break;
-		case 2:
-		  my_pntr.i4[offs] += hm_pntr.i2[dataPtr + k];
-		  break;
-		case 4:
-		  my_pntr.i4[offs] += hm_pntr.i4[dataPtr + k];
-		  break;
-	      }         
-            }
-          }
-        }
-      } else if(sub_code == PROJECT__SAMPLE){
-        hm_pntr.base = 	Hist_base_addr;
-	for(i = 0; i < nTime; i++){
-	  my_pntr.i4[i] = 0;
-        }
-	for(i = x_lo; i < x_lo + nx; i++){
-	  for(j = y_lo; j < y_lo + ny; j++){
-	    dataPtr = j*psdXSize*nTime  + i*nTime;
-            for(k = 0; k < nTime; k++){
-	      my_pntr.i4[k] += hm_pntr.i4[dataPtr +k];
-            }   
-          }
-        }
-      }
-      break;
-
-     default:
-    }
-		    /*-----------------------------------------------------
-		    ** ... projection complete so let Filler continue and
-		    **     send data back to client.
-		    */
-    if (my_daq_save == 0) do_daq (&dummy_rply, index, DAQ__CLR);
-
-    rply_bf->u.project.n_bins	     = htonl (my_nbins);
-    rply_bf->u.project.bytes_per_bin = htonl (sizeof (uint));
-    rply_bf->u.project.cnts_lo	     = htonl (Cnts_lo);
-    rply_bf->u.project.cnts_hi	     = htonl (Cnts_hi);
-
-
-    if (rply_bf->bigend != 0x12345678) {    /* If byte swapping needed, ...
-					    ** .. then swap them! */
-      for (i = 0; i < my_nbins; i++) my_pntr.i4[i] = htonl (my_pntr.i4[i]);
-    }
-
-
-    is = rply_status_setup_and_send (rw_skt, rply_bf, KER__SUCCESS, 0, NULL);
-
-    bytes_to_go = my_nbins * sizeof (uint);
-    buff_pntr = (uchar *) my_pntr.base;
-
-    while (bytes_to_go > 0) {
-      nput = (bytes_to_go > pkt_size) ? pkt_size : bytes_to_go;
-      is = send (rw_skt, buff_pntr, nput, 0);
-      if (is > 0) {
-	Rw_bytes_put += is;
-	bytes_to_go  -= is;
-	buff_pntr    += is;
-      }else {
-	free (my_pntr.base);
-	return ERROR;	    /* Fatal error on send */
-      }
-    }
-    free (my_pntr.base);	    /* Release our bit of memory */
-
-    return OK;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int do_read (
-/*    =======
-*/		int			index,
-		struct rply_buff_struct *rply_bf,
-		int			rw_skt,
-		int			pkt_size,
-		uint			nbins,
-		uint			first,
-		uint			hist_no) {
-/*
-**                  Read a consecutive region of 'nbins' bins of the Hist Mem
-**		    starting with bin 'first' and send it to the client.
-*/
-    register int	    i, my_fstbin, my_topbin;
-    int			    is, my_nbins, status, bytes_to_go, nput, nxtbin, nb;
-    int			    my_daq_save;
-    struct rply_buff_struct dummy_rply;
-    uchar		   *buff_pntr, *last_byte;
-    uchar		    buff[pkt_size];
-
-    register union {
-      void	    *base;
-      uchar	    *ch;
-      usint	    *i2;
-      uint	    *i4;
-    } my_pntr, hm_pntr;
-
-    rply_status_setup (rply_bf, KER__BAD_VALUE, 0, "Bad argument"); /* Assume ..
-						** .. we shall find a bad arg */
-/*--------------------------------------------------------------------
-**	    SQHM__TRANS mode is a special case since we must always suspend
-**	    data acq so that we can move FILLER on to the next buffer safely
-**	    and take a private copy of the current buffer.
-*/
-    if (Hm_mode == SQHM__TRANS) {
-		/*
-		** SQHM__TRANS mode: start by ensuring user's buffer size is OK.
-		*/
-      nbins = nbins & (~3);	/* Ensure <nbins> is a multiple of 4 */
-      if (nbins	< 16) {
-	if (Dbg_lev0) printf ("\n");
-	printf ("\007%s -- SQHM_READ: bad NBINS!\n", Tsk_name[index]);
-	is = rply_status_setup_and_send (rw_skt, rply_bf, KER__BAD_VALUE, 0,
-			    "\"n_bins\" < 16");
-	return OK;
-      }
-		/*
-		** Ensure data acq is disabled
-		*/
-      my_daq_save = SinqHM_Dsbl_Mask & Server_masks[index]; /* Remember the ..
-					    ** .. state of our inhibit bit */
-      if (my_daq_save == 0) do_daq (&dummy_rply, index, DAQ__INH);
-		/*
-		** Now we can manipulate the buffer "safely". Actually,
-		** we should really use semaphore access to the buffer
-		** pointers since another SinqHM client could be running
-		** in parallel with us. We shall ignore this refinement
-		** for the time being!
-		*/
-      hm_pntr.base = Tran_buff_base;
-      last_byte = Next_char;
-      selectNewBuffer (last_byte);  /* Move data acquisition to next buffer */
-
-      bytes_to_go = (last_byte - hm_pntr.ch + 4) & (~3);
-      my_pntr.base = malloc (bytes_to_go);
-      if (buff_pntr == NULL) {
-	rply_status_setup_and_send (rw_skt, rply_bf, KER__BAD_ALLOC, 0,
-		"Failed to get buffer for data transfer");
-	return OK;
-      }
-      *my_pntr.i4 = htonl (*hm_pntr.i4);
-      memcpy (my_pntr.ch+4, hm_pntr.ch+4, bytes_to_go-4);
-		    /*
-		    ** Copy complete so let Filler continue.
-		    */
-      if (my_daq_save == 0) do_daq (&dummy_rply, index, DAQ__CLR);
-
-      if (bytes_to_go > nbins) bytes_to_go = nbins;
-		    /*
-		    ** Everything seems to be OK.
-		    ** Tell client he's about to get some data!
-		    */
-      rply_bf->u.read.first_bin	    = htonl (0);
-      rply_bf->u.read.n_bins	    = htonl (bytes_to_go);
-      rply_bf->u.read.bytes_per_bin = htonl (1);
-      rply_bf->u.read.cnts_lo	    = htonl (0);
-      rply_bf->u.read.cnts_hi	    = htonl (0);
-      is = rply_status_setup_and_send (rw_skt, rply_bf, KER__SUCCESS, 0, NULL);
-		    /*
-		    ** Now send the data
-		    */
-      buff_pntr = my_pntr.ch;
-      while (bytes_to_go > 0) {
-	nput = (bytes_to_go > pkt_size) ? pkt_size : bytes_to_go;
-	is = send (rw_skt, buff_pntr, nput, 0);
-	if (is > 0) {
-	  Rw_bytes_put += is;
-	  bytes_to_go  -= is;
-	  buff_pntr    += is;
-	}else {
-	  free (my_pntr.base);
-	  return ERROR;		    /* Fatal error on send */
-	}
-      }
-      free (my_pntr.base);
-      return OK;
-    }
-/*--------------------------------------------------------------------
-**	    Non-transparent mode: Start by checking arguments.
-*/
-    if ((hist_no == -1) && (first == -1) && (nbins == -1)) {
-      my_fstbin = 0;
-      my_nbins  = N_hists * N_bins;
-    }else {
-      if (nbins	< 0) {
-	if (Dbg_lev0) printf ("\n");
-	printf ("\007%s -- SQHM_READ: bad NBINS!\n", Tsk_name[index]);
-	is = rply_status_setup_and_send (rw_skt, rply_bf, KER__BAD_VALUE, 0,
-			    "\"n_bins\" < 0");
-	return OK;
-      }
-      if (first < 0) {
-	if (Dbg_lev0) printf ("\n");
-	printf ("\007%s -- SQHM_READ: bad FIRST!\n", Tsk_name[index]);
-	is = rply_status_setup_and_send (rw_skt, rply_bf, KER__BAD_VALUE, 0,
-			    "\"first_bin\" < 0");
-	return OK;
-      }
-      my_nbins = nbins;
-      if (hist_no == -1) {
-        my_fstbin = first;
-	my_topbin = my_fstbin + my_nbins;
-	if ((my_topbin <= 0) || (my_topbin > N_hists * N_bins)) {
-	  if (Dbg_lev0) printf ("\n");
-	  printf ("\007%s -- SQHM_READ: bad parameters!\n", Tsk_name[index]);
-	  is = rply_status_setup_and_send (rw_skt, rply_bf, KER__BAD_VALUE, 0,
-			    "Bad parameters");
-	  return OK;
-	}
-      }else {
-	if ((hist_no < 0) || (hist_no >= N_hists)) {
-	  if (Dbg_lev0) printf ("\n");
-	  printf ("\007%s -- SQHM_READ: bad HIST_NO!\n", Tsk_name[index]);
-	  is = rply_status_setup_and_send (rw_skt, rply_bf, KER__BAD_VALUE, 0,
-			    "Bad \"hist_no\"");
-	  return OK;
-	}
-	my_fstbin = (hist_no * N_bins) + first;
-	my_topbin    = my_fstbin + my_nbins;
-      }
-    }
-		    /*
-		    ** The args are OK.
-		    ** Tell client he's about to get some data!
-		    */
-    rply_bf->u.read.first_bin	    = htonl (my_fstbin);
-    rply_bf->u.read.n_bins	    = htonl (my_nbins);
-    rply_bf->u.read.bytes_per_bin   = htonl (Bytes_per_bin);
-    rply_bf->u.read.cnts_lo	    = htonl (Cnts_lo);
-    rply_bf->u.read.cnts_hi	    = htonl (Cnts_hi);
-    is = rply_status_setup_and_send (rw_skt, rply_bf, KER__SUCCESS, 0, NULL);
-		    /*
-		    ** See if we can reserve some space for making a
-		    ** copy of the histogram data.
-		    */
-    my_pntr.base = NULL;
-    i = memFindMax ();	    /* Get size of biggest free memory block */
-    if (i > (my_nbins * Bytes_per_bin)) my_pntr.base =
-					    malloc (my_nbins * Bytes_per_bin);
-		    /*
-		    ** If we got a private buffer, inhibit Filler whilst we
-		    ** make a quick copy.
-		    */
-    if (my_pntr.base != NULL) {
-		    /*
-		    ** We got a private copy
-		    */
-      my_daq_save = SinqHM_Dsbl_Mask & Server_masks[index]; /* Remember the ..
-							   ** .. state of our ..
-							   ** .. inhibit bit */
-      if (my_daq_save == 0) do_daq (&dummy_rply, index, DAQ__INH);
-      memcpy (my_pntr.base,
-	      ((char *) Hist_base_addr) + (my_fstbin * Bytes_per_bin),
-	      (my_nbins * Bytes_per_bin));
-		    /*
-		    ** Copy complete so let Filler continue.
-		    */
-      if (my_daq_save == 0) do_daq (&dummy_rply, index, DAQ__CLR);
-      bytes_to_go = my_nbins * Bytes_per_bin;
-      buff_pntr = (char *) my_pntr.base;
-
-      while (bytes_to_go > 0) {
-	nput = (bytes_to_go > pkt_size) ? pkt_size : bytes_to_go;
-	is = send (rw_skt, buff_pntr, nput, 0);
-	if (is > 0) {
-	  Rw_bytes_put += is;
-	  bytes_to_go  -= is;
-	  buff_pntr    += is;
-	}else {
-	  free (my_pntr.base);
-	  return ERROR;	    /* Fatal error on send */
-	}
-      }
-      free (my_pntr.base);	    /* Release our bit of memory */
-    }else {
-    		    /*
-		    ** We did not get a private copy. We'll have to copy
-		    ** out of the HM area as we send - this would cause a much
-		    ** longer inhibit of Filler so we let Filler keep running.
-		    ** If the user wants unskewed data, he must inhibit DAQ
-		    ** first using DAQ__INH.
-		    */
-      bytes_to_go = my_nbins * Bytes_per_bin;
-      nxtbin = my_fstbin;
-
-      my_pntr.base = buff;
-      hm_pntr.base = Hist_base_addr;
-
-      while (bytes_to_go > 0) {
-	nput = (bytes_to_go > pkt_size) ? pkt_size : bytes_to_go;
-	nb = nput/Bytes_per_bin;
-	switch (Bytes_per_bin) {
-	 case 1:
-	  for (i=0; i<nb; i++) my_pntr.ch[i] = hm_pntr.ch[nxtbin+i];
-	  break;
-	 case 2:
-	  for (i=0; i<nb; i++) my_pntr.i2[i] = htons (hm_pntr.i2[nxtbin+i]);
-	  break;
-	 case 4:
-	  for (i=0; i<nb; i++) my_pntr.i4[i] = htonl (hm_pntr.i4[nxtbin+i]);
-	  break;
-	}
-	buff_pntr = buff;
-	while (nput > 0) {
-	  is = send (rw_skt, buff_pntr, nput, 0);
-	  if (is > 0) {
-	    Rw_bytes_put += is;
-	    nput	 -= is;
-	    bytes_to_go	 -= is;
-	    buff_pntr    += is;
-	  }else {
-	    return ERROR;	/* Fatal error on send */
-	  }
-	}
-	nxtbin += nb;
-      }
-    }
-    return OK;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int do_write (
-/*    ========
-*/		int			index,
-		struct req_buff_struct	*req_bf,
-		struct rply_buff_struct *rply_bf,
-		int			rw_skt,
-		int			pkt_size,
-		int			nbins,
-		int			first,
-		int			bytes_per_bin,
-		int			hist_no) {
-/*
-**                  Preset a consecutive region of the Hist Mem. The number of
-**		    bins to preset is 'nbins' starting with bin 'first'. The
-**		    data for the bins is read from the client.
-*/
-    int         i, is, status, bytes_to_come, nget;
-    uchar	*b_pntr;
-    usint	*w_pntr;
-    uint	*l_pntr;
-
-    if ((nbins <= 0) || (bytes_per_bin <= 0)) { /* If nothing to do, do nothing! */
-      is = rply_status_setup_and_send (rw_skt, rply_bf, KER__SUCCESS, 0, NULL);
-      return is;
-    }
-	/*
-	** Check that we've been configured. If not, flush the data from
-	** the client and return an error.
-	*/
-    if (Cfgn_done == 0) {
-      printf ("\007 but not yet configured!\n");
-      net_flush (rw_skt, nbins * bytes_per_bin);
-      is = rply_status_setup_and_send (rw_skt, rply_bf, KER__BAD_STATE, 0,
-				"Not configured!");
-      return ERROR;
-    }
-	/*
-	** Check that parameters are valid.
-	*/
-    if ((bytes_per_bin != Bytes_per_bin) ||
-	(first  <  0) ||
-	((first+nbins) > (N_hists*N_bins))) {
-      printf ("\007 but invalid parameters!\n");
-      net_flush (rw_skt, nbins * bytes_per_bin);
-      is = rply_status_setup_and_send (rw_skt, rply_bf, KER__BAD_VALUE, 0,
-			"Bad \"first_bin\", \"n_bins\" or \"bytes_per_bin\"!");
-      return ERROR;
-    }
-
-    bytes_to_come = nbins * Bytes_per_bin;
-    b_pntr = (char *) Hist_base_addr;
-    while (bytes_to_come > 0) {
-      nget = (bytes_to_come > pkt_size) ? pkt_size : bytes_to_come;
-      is = recv (rw_skt, b_pntr, nget, 0);
-      if (is > 0) {
-	Rw_bytes_got += is;
-	bytes_to_come -= is;
-	b_pntr += is;
-      }else {
-	net_flush (rw_skt, bytes_to_come);
-	is = rply_status_setup_and_send (rw_skt, rply_bf, KER__BAD_RECV, is,
-			"DO_WRITE: recv error status");
-	return ERROR;
-      }
-    }
-
-    if (0x12345678 != ntohl (0x12345678)) {	/* Swap bytes, if necessary */
-      switch (Bytes_per_bin) {
-       case 1:
-	break;
-       case 2:
-	w_pntr = (usint *) Hist_base_addr;
-	for (i=0; i<nbins; i++) w_pntr[i] = ntohs (w_pntr[i]);
-	break;
-       case 4:
-	l_pntr = (uint *) Hist_base_addr;
-	for (i=0; i<nbins; i++) l_pntr[i] = ntohl (l_pntr[i]);
-	break;
-      }
-    }
-
-    lwl_Fifo_Flush ();		/* Ensure the fibre-optic FIFO is empty */
-
-    is = rply_status_setup_and_send (rw_skt, rply_bf, KER__SUCCESS, 0, NULL);
-    return is;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void do_zero (
-/*     =======
-*/		struct rply_buff_struct	*reply,
-		int			 index,
-		int			 nbins,
-		int			 first_bin,
-		int			 hist_no) {
-/*
-**			    Action routine for SQHM_ZERO command.
-*/
-    register int	    i, my_first_bin, my_topbin;
-    int			    is, my_nbins;
-    int			    my_daq_save;
-    char		    recd[80];
-    struct rply_buff_struct dummy_rply;
-
-    register uchar	*b_pntr;
-    register usint	*w_pntr;
-    register uint	*l_pntr;
-
-    reply->status = KER__BAD_VALUE;	/* Assume we shall find a bad arg */
-    if ((hist_no == -1) && (first_bin == -1) && (nbins == -1)) {
-      my_first_bin = 0;
-      my_nbins	   = N_hists * N_bins;
-      my_topbin	   = my_first_bin + my_nbins;
-    }else {
-      if (nbins	    < 0) return;
-      if (first_bin < 0) return;
-      if (hist_no == -1) {
-        my_first_bin = first_bin;
-	my_nbins     = nbins;
-	my_topbin    = my_first_bin + my_nbins;
-	if ((my_topbin <= 0) || (my_topbin > N_hists * N_bins)) return;
-      }else {
-	if ((hist_no < 0) || (hist_no >= N_hists)) return;
-	my_first_bin = (hist_no * N_bins) + first_bin;
-	my_topbin    = my_first_bin + my_nbins;
-      }
-    }
-
-    reply->status = KER__SUCCESS;	/* The args are OK -- inhibit Filler */
-
-    my_daq_save = SinqHM_Dsbl_Mask & Server_masks[index];  /* Remember the ..
-							   ** .. state of our ..
-							   ** .. inhibit bit */
-    if (my_daq_save == 0) {
-      do_daq (&dummy_rply, index, DAQ__INH);
-    }
-
-    switch (Bytes_per_bin) {
-     case 1:
-      b_pntr = (uchar *) Hist_base_addr;
-      for (i = my_first_bin; i < my_topbin; i++) b_pntr[i] = 0;
-      break;
-     case 2:
-      w_pntr = (usint *) Hist_base_addr;
-      for (i = my_first_bin; i < my_topbin; i++) w_pntr[i] = 0;
-      break;
-     case 4:
-      l_pntr = (uint *) Hist_base_addr;
-      for (i = my_first_bin; i < my_topbin; i++) l_pntr[i] = 0;
-      break;
-    }
-    Cnts_lo = Cnts_hi = 0;
-    N_events = N_skipped = N_no_coin_tsi = N_coin_tsi = 0;
-    Print_hdr = True;
-
-    lwl_Fifo_Flush ();		/* Ensure the fibre-optic FIFO is empty */
-
-    /* 
-     clear PSD counts 
-    */
-    psdHitCount = 0;
-    psdFlashCount = 0;
-
-    if (my_daq_save == 0) {
-      do_daq (&dummy_rply, index, DAQ__CLR);  /* Remove our inhibit on Filler */
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void failInet (char *text) {
-/*     ========
-**		    Output the given text and exit the process.
-*/
-    int    my_errno;
-    static int showMem = 0;
-
-    if(showMem == 0)
-    {
-      memShowInit();
-      showMem = 1;
-    } 
-
-    getErrno (&my_errno);
-    printf ("### Internet Error ###\n");
-    printf ("                   ### errno = %d.\n", my_errno);
-    perror (text);
-    memShow(1);
-    exit (EXIT_FAILURE);
-  }
-/*--------------------------------------------------------------------------*/
-  void failInet_port (char *text, int port) {
-/*     =============
-**			    Call to failInet with an extra parameter.
-*/
-    char    my_buff[132];
-
-    kill (Parent_pid, SIGUSR1);   /* Inform the parent that we are in trouble */
-
-    sprintf (my_buff, text, port);
-    failInet (my_buff);
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void	free_HM_memory (void *extras) {
-/*	===============
-**			    Free any memory allocated for TOF histograms
-*/
-    int	    i;
-			/*
-			** Release a possible pending buffer
-			*/
-    free (extras);
-			/*
-			** Release any allocated histogram buffer
-			*/
-#ifdef MEN_A012
-    if(Hist_base_MEN_alloc == 1){
-      memPartFree(sysHighMemPart, Hist_base_addr);
-    } else {
-      free (Hist_base_addr);
-    }
-    Hist_base_MEN_alloc = 0;
-#else
-    free(Hist_base_addr);
-#endif
-    Hist_base_addr = NULL;
-    free (Frame_base_addr);
-    Frame_base_addr = NULL;
-			/*
-			** Release the tof_edge_info structures
-			*/
-    for (i = 0; i < MAX_TOF_EDGE; i++) {
-      free (Tof_edges[i]);
-      Tof_edges[i] = NULL;
-    }
-			/*
-			** Release the tof_edge_info structures
-			*/
-    for (i = 0; i < MAX_TOF_CNTR; i++) {
-      free (Tof_descr[i]);
-      Tof_descr[i] = NULL;
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void	getErrno (int *his_errno) {
-/*      ========
-*/
-    *his_errno = errno;	    /* Make copy of errno   */
-    return;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  pid_t get_pid () {
-/*      =======
-*/
-    int	    my_tid;
-
-    my_tid = taskIdSelf ();
-
-    return (pid_t) my_tid;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void kill_children () {
-/*     =============
-**		    Send signals to all our offspring to cause them to terminate
-*/
-    int	    i, is;
-
-    if (Filler_pid != 0) {
-      printf (" .. closing down %s ..", Filler_name);
-      is = kill (Filler_pid, SIGINT);
-      if (is == ERROR) printf ("Bad status killing FILLER.\n");
-    }
-    for (i = MAX_CLIENTS; i > 0; i--) {
-      if (Child_pid[i] != 0) {
-        printf ("\n    Terminating %s ..", Tsk_name[i]);
-        is = kill (Child_pid[i], SIGINT);
-	if (is == ERROR) printf ("Bad status killing server.\n");
-      }
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void lwl_Fifo_Flush () {
-/*     ==============
-**			    Flush out any data in the fibre-optic FIFO.
-*/
-    register int	    i;
-    register uint	   *my_lwl_fifo;
-    register union {
-      uint     ui4;
-      usint    ui2[2];
-      uchar    byte[4];
-    } lwl_hdr;
-    uchar		    my_buff[32];
-
-    my_lwl_fifo = Lwl_fifo;
-		/*
-		** Note: The following loop runs at a rate of about 570 nsec
-		**	 per cycle. Since it takes 2 executions of the loop to
-		**	 read 1 packet in Hist Mode and this corresponds to
-		**	 6 bytes, this loop should manage to empty the FIFO
-		**	 for neutron rates below about 875 kHz. This
-		**	 corresponds to a data rate over the fibre-optic link
-		**	 of 5.2 Mbyte/sec. Since the link can theoretically
-		**	 go faster than this, the code sets a finite limit
-		**	 for itself and, if the limit is hit, flushes to the
-		**	 end of a packet.
-		*/
-    for (i = 0; i < 10000000; i++) {
-      lwl_hdr.ui4 = *my_lwl_fifo;
-      if (lwl_hdr.ui4 == LWL_FIFO_EMPTY) return;
-    }
-		/*
-		** We did not succeed in emptying the FIFO. We are therefore
-		** likely to be in trouble!! However, we shall try our best
-		** to please by finding a header marker and then flushing to
-		** the end of that packet to leave things tidy.
-		*/
-    for (i = 0; i < 100; i++) {
-      lwl_hdr.ui4 = *my_lwl_fifo;
-      if (lwl_hdr.ui4 == LWL_FIFO_EMPTY) return;
-      if (lwl_hdr.byte[0] != 0) {		    /* Packet header? */
-	lwl_Packet_Read (lwl_hdr.ui4, my_buff);	    /* Yes! Flush and .. */
-	break;					    /*	    .. quit */
-      }
-    }
-    return;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int  lwl_Packet_Read (uint hdr, uchar *buff) {
-/*     ===============
-**			    Read current packet from the fibre-optic FIFO.
-**			    <hdr> is the packet header and is used to calculate
-**			    the amount of reading required. The data (including
-**			    the header) is copied into *buff, which must be at
-**			    least 22 bytes long.
-**		Return value: Number of bytes read (including 4 bytes for hdr).
-*/
-    register uint   *my_lwl_fifo;
-    register union {
-      uint	ui4;
-      usint	ui2[2];
-      uchar	byte[4];
-    } lwl_data;
-
-    int		    i, do_print, bytes_read = 4;
-    ULONG	    tick_now;
-    static ULONG    lPF_tick[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-    static int	    lPF_indx = 0;
-    static int	    lPF_clockRate = 0;
-    static int	    lPF_skipped = 0;
-
-    if (lPF_clockRate == 0) lPF_clockRate = sysClkRateGet (); /* Ticks/second */
-    my_lwl_fifo = Lwl_fifo;
-
-    lwl_data.ui4 = hdr;
-    buff[0] = lwl_data.byte[0];
-    buff[1] = lwl_data.byte[1];
-    buff[2] = lwl_data.byte[2];
-    buff[3] = lwl_data.byte[3];
-	/*
-	** Switch according to header type ...
-	*/
-    switch (hdr & LWL_HDR_TYPE_MASK) {
-     case LWL_HM_NC_C9:		    /* Cases with 18 more bytes ..
-				    ** .. Also includes	LWL_HM_CO_C9
-				    ** ..		LWL_SM_NC_C9
-				    ** ..		LWL_SM_CO_C9
-				    */
-      lwl_data.ui4 = *my_lwl_fifo;	    /* Read remaining bytes */
-      buff[bytes_read++] = lwl_data.byte[2];
-      buff[bytes_read++] = lwl_data.byte[3];
-
-     case LWL_HM_NC_C8:		    /* Cases with 16 more bytes ..
-				    ** .. Also includes	LWL_HM_CO_C8
-				    ** ..		LWL_SM_NC_C8
-				    ** ..		LWL_SM_CO_C8
-				    */
-      lwl_data.ui4 = *my_lwl_fifo;	    /* Read remaining bytes */
-      buff[bytes_read++] = lwl_data.byte[2];
-      buff[bytes_read++] = lwl_data.byte[3];
-
-     case LWL_HM_NC_C7:		    /* Cases with 14 more bytes ..
-				    ** .. Also includes	LWL_HM_CO_C7
-				    ** ..		LWL_SM_NC_C7
-				    ** ..		LWL_SM_CO_C7
-				    */
-      lwl_data.ui4 = *my_lwl_fifo;	    /* Read remaining bytes */
-      buff[bytes_read++] = lwl_data.byte[2];
-      buff[bytes_read++] = lwl_data.byte[3];
-
-     case LWL_HM_NC_C6:		    /* Cases with 12 more bytes ..
-				    ** .. Also includes	LWL_HM_CO_C6
-				    ** ..		LWL_SM_NC_C6
-				    ** ..		LWL_SM_CO_C6
-				    */
-      lwl_data.ui4 = *my_lwl_fifo;	    /* Read remaining bytes */
-      buff[bytes_read++] = lwl_data.byte[2];
-      buff[bytes_read++] = lwl_data.byte[3];
-
-     case LWL_HM_NC_C5:		    /* Cases with 10 more bytes ..
-				    ** .. Also includes	LWL_HM_CO_C5
-				    ** ..		LWL_SM_NC_C5
-				    ** ..		LWL_SM_CO_C5
-				    */
-      lwl_data.ui4 = *my_lwl_fifo;	    /* Read remaining bytes */
-      buff[bytes_read++] = lwl_data.byte[2];
-      buff[bytes_read++] = lwl_data.byte[3];
-
-     case LWL_HM_NC_C4:		    /* Cases with 8 more bytes ..
-				    ** .. Also includes	LWL_HM_CO_C4
-				    ** ..		LWL_SM_NC_C4
-				    ** ..		LWL_SM_CO_C4
-				    */
-      lwl_data.ui4 = *my_lwl_fifo;	    /* Read remaining bytes */
-      buff[bytes_read++] = lwl_data.byte[2];
-      buff[bytes_read++] = lwl_data.byte[3];
-
-     case LWL_HM_NC_C3:		    /* Cases with 6 more bytes ..
-				    ** .. Also includes	LWL_HM_CO_C3
-				    ** ..		LWL_SM_NC_C3
-				    ** ..		LWL_SM_CO_C3
-				    */
-     case LWL_TSI_HM_C:		    /* Other cases with 6 more bytes ..
-				    ** .. Also includes	LWL_TSI_SM_C
-				    */
-      lwl_data.ui4 = *my_lwl_fifo;	    /* Read remaining bytes */
-      buff[bytes_read++] = lwl_data.byte[2];
-      buff[bytes_read++] = lwl_data.byte[3];
-
-     case LWL_HM_NC_C2:		    /* Cases with 4 more bytes ..
-				    ** .. Also includes	LWL_HM_CO_C2
-				    ** ..		LWL_SM_NC_C2
-				    ** ..		LWL_SM_CO_C2
-				    */
-      lwl_data.ui4 = *my_lwl_fifo;	    /* Read remaining bytes */
-      buff[bytes_read++] = lwl_data.byte[2];
-      buff[bytes_read++] = lwl_data.byte[3];
-
-     case LWL_HM_NC_C1:		    /* Cases with 2 more bytes ..
-				    ** .. Also includes	LWL_HM_NC_C1
-				    */
-     case LWL_TR_C1:		    /* Other cases with 2 more bytes */
-     case LWL_TR_C2:		    /*  Also includes LWL_TOF_C1 - LWL_TOF_C9 */
-     case LWL_TR_C3:
-     case LWL_TR_C4:
-     case LWL_TR_C5:
-     case LWL_TR_C6:
-     case LWL_TR_C7:
-     case LWL_TR_C8:
-     case LWL_TR_C9:
-
-     case LWL_TSI_TR:		    /* Yet more cases with 2 more bytes ..
-				    ** .. Also includes	LWL_TSI_HM_NC
-				    ** ..		LWL_TSI_TOF
-				    ** ..		LWL_TSI_SM_NC
-				    */
-      lwl_data.ui4 = *my_lwl_fifo;	    /* Read remaining bytes */
-      buff[bytes_read++] = lwl_data.byte[2];
-      buff[bytes_read++] = lwl_data.byte[3];
-
-     case LWL_FIFO_EMPTY:	    /* FIFO empty - no more bytes */
-      break;
-
-     default:
-		    /*
-		    ** Suppress messages if too many! Record times of last
-		    ** 10 messages to see if this one should be printed.
-		    */
-      tick_now = tickGet ();
-
-      if (lPF_indx == 9) {	    /* Only suppress after 10th message */
-        if ((tick_now - lPF_tick[0]) > (5 * 60 * lPF_clockRate)) {
-	  do_print = True;	    /* No more than 10 message per 5 mins */
-	  for (i = 0; i < 9; i++) lPF_tick[i] = lPF_tick[i+1];
-	  lPF_tick[9] = tick_now;
-        }else if ((tick_now - lPF_tick[9]) > (60 * lPF_clockRate)) {
-	  do_print = True;	    /* No more than 1 message per min */
-	  for (i = 0; i < 9; i++) lPF_tick[i] = lPF_tick[i+1];
-	  lPF_tick[9] = tick_now;
-	}else {
-	  do_print = False;	/* Suppress this message */
-	  lPF_skipped++;
-	}
-      }else {
-	do_print = True;
-        lPF_tick[lPF_indx] = tick_now;
-	lPF_indx++;
-      }
-
-      if (do_print) {
-	printf ("lwl_Packet_Read -- unrecognised packet header 0x%08x\n", hdr);
-	if (lPF_skipped > 0) {
-	  printf ("lwl_Packet_Read -- %d packets skipped\n", lPF_skipped);
-	}
-	lPF_skipped = 0;
-      }
-    }
-    return bytes_read;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int make_child (int (* proc) (), int flag, int pkt_size) {
-/*    ==========
-**		    Find a free child index, create a child process and
-**		    invoke procedure proc in the child procedure.
-**		    Return value >  0 if child successfully created;
-**				 =  0 if this is the child which is executing;
-**				 = -1 if error returned by fork;
-**				 = -2 if there are too many children already;
-**				 = -3 if time-out waiting for child to signal.
-**				 = -4 the child indicated a start-up error.
-*/
-    int	    i, status, tmo;
-    pid_t   created_pid;
-    char    tsknam[20];
-/*
-**	    Find a free PID index. Zero is not a permitted value.
-*/
-    for (i = 1; i <= MAX_CLIENTS; i++) {
-      if (Child_pid[i] == 0) break;
-    }
-
-    if (i <= MAX_CLIENTS) {			    /* Free index found? */
-      Cnt_SIGUSR1 = 0;
-      semTake (Sem_Server, NO_WAIT);   /* Ensure that Sem_Server is claimed. ..
-				       ** .. Child will release it when ready */
-      Child_exit_status[i] = 0;		/* Zero child's status indicator */
-      sprintf (tsknam, "hmSrv%02d", i);
-      created_pid = taskSpawn (		    /* Make a child */
-			tsknam,		    /* Name */
-			100,		    /* Priority */
-			VX_FP_TASK,	    /* Options - fl.pt. usage assumed */
-			20000,		    /* Stack size */
-			proc,		    /* The entry point */
-			flag,
-			i,
-			pkt_size, 0,0,0,0,0,0,0);
-      if (created_pid == ERROR) {	    /* Error? */
-        return -1;			    /* Yes. */
-      }else {				    /* Parent */
-	Child_pid[i] = created_pid;
-	tmo = 1000;		    /* Normally give child 1000 ticks to ..
-				    ** .. get going */
-	if (flag != 0) {
-	  tmo = WAIT_FOREVER;	    /* But in debug mode, wait forever! */
-	}
-	status = semTake (Sem_Server, tmo); /* Wait for child to get going */
-	if (status == ERROR) {			/* Timeout? */
-	  taskDelete (Child_pid[i]);		/* Yes, kill child. */
-	  Child_pid[i] = 0;
-	  return -3;				    /* Return with error. */
-	}else {				/* No timeout so child is ready. */
-	  if (Child_exit_status[i] == 0) {  /* Did the child have startup a ..
-					    ** .. problem */
-	    return i;			/* No, so return its index */
-	  }else {
-	    return -4;			/* Yes, so return error */
-	  }
-	}
-      }
-    }
-    return -2;	    /* There are already too many children. */
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int make_filler (int suspendMode) {
-/*    ===========
-**		    Create a child process to execute the FILLER procedure.
-**		    Return value =  1 if FILLER successfully created;
-**				 =  0 if this is FILLER which is executing;
-**				 = -1 if error returned by fork;
-**				 = -2 if FILLER already running;
-**				 = -3 if time-out waiting for FILLER to signal.
-*/
-    int	    i, status, tmo;
-    int	    created_pid;
-
-    if (Filler_pid == 0) {
-      Cnt_SIGUSR1 = 0;
-      semTake (Sem_Filler, NO_WAIT); /* Ensure that Sem_Filler is claimed. ..
-				     ** .. FILLER will release it when set up */
-
-      sprintf (Filler_name, "hmFill%04d", Port_base);
-      created_pid = taskSpawn (		 /* Make a child */
-			Filler_name,	 /* Name */
-			250,		 /* Priority (0=highest, 255=lowest ) */
-			VX_FP_TASK,	 /* Options - fl.pt. usage assumed */
-			20000,		 /* Stack size */
-			SinqHM_filler,	 /* The entry point */
-			suspendMode,
-			0,0,0,0,0,0,0,0,0);
-      if (created_pid == ERROR) {	    /* Error? */
-        return -1;			    /* Yes. */
-      }else {				    /* No */
-        Filler_pid = created_pid;
-	tmo = 10000;		    /* Normally give FILLER 1000 ticks to ..
-				    ** .. get going */
-	if (suspendMode != 0) {
-	  tmo = WAIT_FOREVER;	    /* But in debug mode, wait forever! */
-	}
-	if (Dbg_lev0) printf ("make_filler: waiting for %s to get going ..\n",
-				    Filler_name);
-	status = semTake (Sem_Filler, tmo); /* Wait for FILLER to get going */
-        if (status == ERROR) {			  /* Timeout? */
-	  taskDelete (Filler_pid);		  /* Yes, kill FILLER. */
-	  Filler_pid = 0;
-	  return -3;				  /* Return with error. */
-        }else {				/* No timeout so FILLER is ready. */
-	  if (Dbg_lev0)
-	    printf ("make_filler: %s is up and running.\n", Filler_name);
-	  semGive (Sem_Filler);		/* Release Sem_Filler */
-          return 1;
-        }
-      }
-    }
-    return -2;	    /* FILLER already active. A configure has been repeated. */
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int net_flush (int skt, int nbytes) {
-/*    =========
-*/
-    int	    is, bytes_to_come, nget;
-    char    buff[1024];
-
-    bytes_to_come = nbytes;
-    while (bytes_to_come > 0) {
-      nget = (bytes_to_come > sizeof (buff)) ? sizeof (buff) : bytes_to_come;
-      is = recv (skt, buff, nget, 0);
-      if (is > 0) {
-        bytes_to_come -= is;
-      }else {
-        return ERROR;
-      }
-    }
-    return OK;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void	process_coinc_tsi (
-/*	=================
-*/			    uint hdr) {
-
-/*		    Routine to process a "coincidence" Timing-Status-Info
-**		    Packet. These packets have 10 bytes altogether. The first
-**		    4 bytes are in hdr.
-*/
-    int	    i, j, is;
-    register union {
-      uint	ui4;
-      usint	ui2[2];
-      uchar	ui1[4];
-	} lwl_data;
-
-    usint	words[3];
-
-    for (j=0; j<3; j++) {		/* Get the remaining 6 bytes */
-      for (i=0; i<1000; i++) {
-	lwl_data.ui4 = *Lwl_fifo;		/* Get the last 16 bits */
-	if (lwl_data.ui4 != LWL_FIFO_EMPTY) {
-           break;
-        }
-	taskDelay (0);			/* But wait if FIFO is slow! */
-      }
-      if (lwl_data.ui4 == LWL_FIFO_EMPTY) {
-	printf ("Time-out getting last 6 bytes of a \"coincidence\" "
-		    "TSI packet!\n");
-	return;
-      }
-      words[j] = lwl_data.ui2[1];
-    }
-
-    N_coin_tsi++;
-    Dt_or_dts.both = hdr & LWL_TSI_DT_MSK;
-    Nrl_active = ((hdr & LWL_HDR_NRL_MASK) != 0) ? True : False;
-    Daq_active = ((hdr & Lwl_hdr_daq_mask) == Lwl_hdr_daq_soll) ? True : False;
-    Tsi_status_info = words[0];
-
-    Tsi_flags = (Nrl_active) ? STATUS_FLAGS__NRL : 0;
-    if ((hdr & LWL_HDR_PF_MASK)	   != 0) Tsi_flags |= STATUS_FLAGS__PF;
-    if ((hdr & LWL_HDR_SWC_MASK)   != 0) Tsi_flags |= STATUS_FLAGS__SWC;
-    if (Daq_active) Tsi_flags |= STATUS_FLAGS__DAQ;
-    if ((hdr & LWL_HDR_SYNC0_MASK) != 0) Tsi_flags |= STATUS_FLAGS__SYNC0;
-    if ((hdr & LWL_HDR_SYNC1_MASK) != 0) Tsi_flags |= STATUS_FLAGS__SYNC1;
-    if ((hdr & LWL_HDR_SYNC2_MASK) != 0) Tsi_flags |= STATUS_FLAGS__SYNC2;
-    if ((hdr & LWL_HDR_SYNC3_MASK) != 0) Tsi_flags |= STATUS_FLAGS__SYNC3;
-    if ((hdr & LWL_HDR_UD_MASK)	   != 0) Tsi_flags |= STATUS_FLAGS__UD;
-    if ((hdr & LWL_HDR_GU_MASK)	   != 0) Tsi_flags |= STATUS_FLAGS__GU;
-
-    lwl_data.ui2[0] = words[1];
-    lwl_data.ui2[1] = words[2];
-    Num_bad_events = lwl_data.ui4;
-  }
-/*--------------------------------------------------------------------------
-  process_gummi_monitor processes special monitor datagrams as emitted by
-  SANS. In gummi mode a sample environment is cycled and data continously
-  collected during various steps of the cycle. Naturally, monitor values are
-  needed at each step in order to be able to scale the data measured 
-  appropriatetly. The monitors are sent in a special datagram consisting of.
-  7 packets.  The first is the header and handed down as a function
-  call parameter. This header also holds the gummi cycle number to which this
-  monitor belongs. The following six packets are the monitor values, separate
-  as low byte, high byte.
-  
-  The monitors are then stored into the last three counters of the first 
-  detector (and only) detector bank. The looser is supposed to give three
-  additional detectors additional to the normal ones. 
-
-  Look at this again when one of the following conditions is violated:
-  - More then one detector bank.
-
-  --------------------------------------------------------------------------*/
-void process_gummi_monitor(uint hdr){
-  uint gummiBin, readbuf[6], mon[3];
-  int i, imon;
-  struct tof_histog  *my_tof_descr;
-
-    union {
-      uint	ui4;
-      usint	ui2[2];
-      uchar	ui1[4];
-	} lwl_data, monitor;
-
-    /*
-      collect those monitor values
-    */
-    for(imon = 0; imon < 6; imon++){
-      readbuf[imon] = LWL_FIFO_EMPTY;
-      for (i=0; i<1000; i++) {
-	  readbuf[imon] = *Lwl_fifo;		
-	  if (readbuf[imon] != LWL_FIFO_EMPTY) break;
-	  taskDelay (0);			/* But wait if FIFO is slow! */
-      }
-      if(readbuf[imon] == LWL_FIFO_EMPTY){
-	printf("Timeout reading monitor %d in SANS GUMMI mode\n", imon);
-	return;
-      }
-    }
-     
-    /*
-      put them together again
-    */
-    for(imon = 0; imon < 3; imon++){
-      lwl_data.ui4 = readbuf[imon*2];
-      monitor.ui2[0] = lwl_data.ui2[1];
-      lwl_data.ui4 = readbuf[imon*2+1];
-      monitor.ui2[1] = lwl_data.ui2[1];
-      mon[imon] = monitor.ui4;
-    }
-
-    gummiBin = hdr & LWL_HDR_TS_MASK;
-    if(gummiBin < 0 || gummiBin >= N_bins){
-      printf("Invalid gummiBin %d detected \n", gummiBin);
-      return;
-    }  
-    
-    if(Dbg_lev1){
-    	printf(" Gummi monitors: %d, %d, %d registered for gummi bin %d\n",
-    	        mon[0],mon[1],mon[2],gummiBin);
-   }
-
-    for(imon = 0; imon < 3; imon++){
-      my_tof_descr=Tof_descr[N_hists-3+imon];
-      /*
-      printf(" detector %d receives %d\n", N_hists-3+imon, mon[imon]);
-      */
-      switch (my_tof_descr->bytes_per_bin) {
-      case 1:
-	my_tof_descr->u.b_bin_data[gummiBin] += mon[imon];
-        break;
-      case 2:
-	my_tof_descr->u.w_bin_data[gummiBin] += mon[imon]; 
-	break;
-      default:
-	my_tof_descr->u.l_bin_data[gummiBin] += mon[imon];
-	break;
-      }
-    }
-}
-/*
-**--------------------------------------------------------------------------*/
-  void	process_psd_tsi (
-/*	=================
-*/			    uint hdr) {
-
-/*		    Routine to process a PSD Timing-Status-Info
-**		    Packet. These packets have 10 bytes altogether. The first
-**		    4 bytes are in hdr.
-*/
-    int	    i, j, is;
-    register union {
-      uint	ui4;
-      usint	ui2[2];
-      uchar	ui1[4];
-	} lwl_data;
-
-    usint	words[3];
-
-    for (j=0; j<3; j++) {		/* Get the remaining 6 bytes */
-      for (i=0; i<1000; i++) {
-	lwl_data.ui4 = *Lwl_fifo;		/* Get the last 16 bits */
-	if (lwl_data.ui4 != LWL_FIFO_EMPTY) break;
-	taskDelay (0);			/* But wait if FIFO is slow! */
-      }
-      if (lwl_data.ui4 == LWL_FIFO_EMPTY) {
-	printf ("Time-out getting last 6 bytes of a PSD "
-		    "TSI packet!\n");
-	return;
-      }
-      words[j] = lwl_data.ui2[1];
-    }
-/*    printf(" %X %X %X\n", words[0], words[1], words[2]); */
-
-    N_coin_tsi++;
-    Dt_or_dts.both = hdr & LWL_TSI_DT_MSK;
-    Nrl_active = ((hdr & LWL_HDR_NRL_MASK) != 0) ? True : False;
-    Daq_active = ((hdr & Lwl_hdr_daq_mask) == Lwl_hdr_daq_soll) ? True : False;
-    Tsi_status_info = words[0];
-
-    Tsi_flags = (Nrl_active) ? STATUS_FLAGS__NRL : 0;
-    if ((hdr & LWL_PSD_PWF)	   != 0) Tsi_flags |= STATUS_FLAGS__PF;
-    if ((hdr & LWL_HDR_SWC_MASK)   != 0) Tsi_flags |= STATUS_FLAGS__SWC;
-    if (Daq_active) Tsi_flags |= STATUS_FLAGS__DAQ;
-    if ((hdr & LWL_HDR_SYNC0_MASK) != 0) Tsi_flags |= STATUS_FLAGS__SYNC0;
-    if ((hdr & LWL_HDR_SYNC1_MASK) != 0) Tsi_flags |= STATUS_FLAGS__SYNC1;
-    if ((hdr & LWL_HDR_SYNC2_MASK) != 0) Tsi_flags |= STATUS_FLAGS__SYNC2;
-    if ((hdr & LWL_HDR_SYNC3_MASK) != 0) Tsi_flags |= STATUS_FLAGS__SYNC3;
-    /*
-    if ((hdr & LWL_HDR_UD_MASK)	   != 0) Tsi_flags |= STATUS_FLAGS__UD;
-    if ((hdr & LWL_HDR_GU_MASK)	   != 0) Tsi_flags |= STATUS_FLAGS__GU;
-    */
-    psdHitCount += words[1];
-    psdFlashCount += words[2] & LWL_PSD_FLASH_MASK;    
-    if((words[2] & LWL_PSD_XORF) != 0) {
-      psdXORF = 1;
-    }else {
-      psdXORF = 0;
-    }
-    if((words[2] & LWL_PSD_CONF) != 0) {
-      psdConf = 0;
-    }else {
-      psdConf = 1;
-    }
-
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void	process_no_coinc_tsi (
-/*	====================
-*/			    uint hdr) {
-
-/*		    Routine to process a "normal" Timing-Status-Info Packet.
-**		    These packets have 6 bytes altogether. The first 4 bytes are
-**		    in hdr.
-*/
-    int			i;
-    register union {
-      uint	ui4;
-      usint	ui2[2];
-      uchar	ui1[4];
-	} lwl_data;
-
-    for (i=0; i<1000; i++) {
-      lwl_data.ui4 = *Lwl_fifo;		/* Get the last 16 bits */
-      if (lwl_data.ui4 != LWL_FIFO_EMPTY) {
-         break;
-      }
-      taskDelay (0);			/* But wait if FIFO is slow! */
-    }
-    if (lwl_data.ui4 == LWL_FIFO_EMPTY) {
-      printf ("Time-out getting last 16 bits of a \"normal\" TSI packet!\n");
-      return;
-    }
-    N_no_coin_tsi++;
-    Dt_or_dts.both = hdr & LWL_TSI_DT_MSK;
-    Nrl_active = ((hdr & LWL_HDR_NRL_MASK) != 0) ? True : False;
-    Daq_active = ((hdr & Lwl_hdr_daq_mask) == Lwl_hdr_daq_soll) ? True : False;
-    Tsi_status_info = lwl_data.ui2[1];
-
-    Tsi_flags = (Nrl_active) ? STATUS_FLAGS__NRL : 0;
-    if ((hdr & LWL_HDR_PF_MASK)	   != 0) Tsi_flags |= STATUS_FLAGS__PF;
-    if ((hdr & LWL_HDR_SWC_MASK)   != 0) Tsi_flags |= STATUS_FLAGS__SWC;
-    if (Daq_active) Tsi_flags |= STATUS_FLAGS__DAQ;
-    if ((hdr & LWL_HDR_SYNC0_MASK) != 0) Tsi_flags |= STATUS_FLAGS__SYNC0;
-    if ((hdr & LWL_HDR_SYNC1_MASK) != 0) Tsi_flags |= STATUS_FLAGS__SYNC1;
-    if ((hdr & LWL_HDR_SYNC2_MASK) != 0) Tsi_flags |= STATUS_FLAGS__SYNC2;
-    if ((hdr & LWL_HDR_SYNC3_MASK) != 0) Tsi_flags |= STATUS_FLAGS__SYNC3;
-    if ((hdr & LWL_HDR_UD_MASK)	   != 0) Tsi_flags |= STATUS_FLAGS__UD;
-    if ((hdr & LWL_HDR_GU_MASK)	   != 0) Tsi_flags |= STATUS_FLAGS__GU;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int rply_status_send (
-/*    ================
-*/		int			skt,
-		struct rply_buff_struct	*rply_bf) {
-
-    int	    is;
-
-    is = send (skt, (char *) rply_bf, sizeof (*rply_bf), 0);
-    if (is == sizeof (*rply_bf)) {
-      Rw_bytes_put += is;
-      return OK;
-    }else {
-      return ERROR;
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**	    rply_status_setup:	Routine to set up a Status-response to client.
-**				If <msg> is not NULL, <msg> will be copied
-**				to the message field of the response. Otherwise,
-**				only the status and sub_status fields will be
-**				set up.
-*/
-  void	rply_status_setup (
-/*	=================
-*/			struct rply_buff_struct	*rply_bf,
-			int			status,
-			int			sub_status,
-			char			*msg) {
-
-    rply_bf->bigend	= htonl (0x12345678);
-    rply_bf->status	= htonl (status);
-    rply_bf->sub_status = htonl (sub_status);
-    if (msg != NULL) {
-      if (strlen (msg) < sizeof (rply_bf->u.message)) {
-	strcpy (rply_bf->u.message, msg);
-      }else {
-	strcpy (rply_bf->u.message, "Message overflow!");
-      }
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int rply_status_setup_and_send (
-/*    ==========================
-*/		int			skt,
-		struct rply_buff_struct	*rply_bf,
-		int			status,
-		int			sub_status,
-		char			*msg) {
-
-    int	    is;
-
-    rply_status_setup (rply_bf, status, sub_status, msg);
-    is = rply_status_send (skt, rply_bf);
-
-    return is;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  uchar	*selectNewBuffer (uchar *nxt) {
-/*	 ===============
-**
-**                  Move to new buffer in SQHM_TRANS mode.
-**
-**	    *nxt = next free byte in current buffer.
-**	    Return value is first free byte in next buffer.
-*/
-    int	    i;
-		/*
-		** Close off the current buffer
-		*/
-    *nxt = 0;
-    i = nxt - Tran_buff_base;	  /* Get number of bytes used in this buffer */
-    memcpy (Tran_buff_base, &i, sizeof (i));	/* Put at front of buffer */
-		/*
-		** Move to next buffer
-		*/
-    Curr_hist++;
-    if (Curr_hist > N_hists) Curr_hist = 0;
-    Tran_buff_base = ((uchar *) Hist_base_addr) + (Curr_hist * N_bins);
-    Next_char = Tran_buff_base + 4;
-    return Next_char;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void setupLevelGenerator (int use_level_gen, char *base_addr) {
-/*     ===================
-**                  Set up VME access to a VMIO10 module at address 0x1900
-**		    to be used for generating timing signals.
-**
-**		    If (use_level_gen == 0), the level generator will not
-**			    be used. The VME address will point to a memory
-**			    location.
-*/
-    STATUS	status;
-    char	aux;
-    void	(* sig_status) (int);
-
-    if (use_level_gen == 0) {
-      VmioBase = Vmio_Dummy;
-      printf ("Timing signal generation via VMIO10 module disabled.\n");
-      return;
-    }
-    if (base_addr == NULL) {
-      status = sysBusToLocalAdrs (VME_AM_USR_SHORT_IO, (char *) VMIO_BASE_ADDR,
-					(char **) &VmioBase);
-    }else {
-      status = sysBusToLocalAdrs (VME_AM_USR_SHORT_IO, base_addr,
-					(char **) &VmioBase);
-    }
-    if (status != OK) {
-      printf ("Error status from sysBusToLocalAdrs -- VMIO10 disabled.\n");
-      VmioBase = Vmio_Dummy;
-      return;
-    }
-	    /*
-	    ** The "setjmp" and "signal" stuff it to trap a possible machine
-	    ** check if the VMIO10 module is absent. This is rather obscure
-	    ** code -- sorry about that but blame Unix thinking, not me, if
-	    ** you don't like it!
-	    */
-    sig_status = signal (SIGBUS, catch_machine_check);
-    if (setjmp (Vmio_trap_env) != 0) {
-		    /*
-		    ** We get to this code only if the VMIO10 module is absent.
-		    */
-      printf ("\007Bus error detected on trying to access the VMIO10 module!\n"
-	      "Timing signals will not be generated via the VMIO10.\n");
-      VmioBase = Vmio_Dummy;
-      return;
-    }
-	/*
-	** Now set up Ports A & B of the VMIO10, i.e. the first Z8536-CIO.
-	** If the module is absent, the first access will trap and exit via
-	** the "setjmp" condition block above.
-	**
-	** Start with a "reset" ..
-	*/
-    aux = VmioBase[VMIO_AB_CNTL];   /* Read Cntrl to ensure not State 1 */
-    VmioBase[VMIO_AB_CNTL] = 0x00;  /* Write zero to Cntrl to ensure not in ..
-				    ** .. "Reset State" */
-    aux = VmioBase[VMIO_AB_CNTL];   /* Read Cntrl to ensure State 0 */
-    VmioBase[VMIO_AB_CNTL] = Z8536_MICR;    /* Select the Mstr Int Ctrl Reg */
-    VmioBase[VMIO_AB_CNTL] = 0x01;	    /* Set the reset bit */
-    VmioBase[VMIO_AB_CNTL] = 0x00;	    /* Then clr it to complete reset */
-	/*
-	** Now set polarity and direction ..
-	*/
-    VmioBase[VMIO_AB_CNTL] = Z8536_DPPR_A;  /* Port A Data Path Pol */
-    VmioBase[VMIO_AB_CNTL] = 0x00;	    /* Non-inverting */
-    VmioBase[VMIO_AB_CNTL] = Z8536_DPPR_B;  /* Port B Data Path Pol */
-    VmioBase[VMIO_AB_CNTL] = 0x00;	    /* Non-inverting */
-
-    VmioBase[VMIO_AB_CNTL] = Z8536_DDR_A;   /* Port A Data Direction */
-    VmioBase[VMIO_AB_CNTL] = 0x00;	    /* All bits output */
-    VmioBase[VMIO_AB_CNTL] = Z8536_DDR_B;   /* Port B Data Direction */
-    VmioBase[VMIO_AB_CNTL] = 0x00;	    /* All bits output */
-	/*
-	** Now enable Ports A & B ..
-	*/
-    VmioBase[VMIO_AB_CNTL] = Z8536_MCCR;    /* Select Master Config Ctrl Reg */
-    VmioBase[VMIO_AB_CNTL] = 0x84;
-	/*
-	** Finally zero Ports A & B ..
-	*/
-    VmioBase[VMIO_PORT_A] = 0x00;
-    VmioBase[VMIO_PORT_B] = 0x00;
-
-    sig_status = signal (SIGBUS, SIG_DFL);   /* Reset trap handler to default */
-
-    printf ("Timing signal generation via VMIO10 module enabled.\n");
-    return;
-  }
-/*
-**--------------------------------------------------------------------------
-**	    setup_inet_info:	Get Internet Nodename and Address from System.
-*/
-  void setup_inet_info (
-/*     ===============
-*/			char	*host,
-			int	 host_size,
-			char	*addr,
-			int	 addr_size) {
-
-    int			    status;
-    struct in_addr	    my_addr;
-    char		    my_addr_c[INET_ADDR_LEN];
-
-    status = gethostname (host, host_size);
-    if (status != 0) StrJoin (host, host_size, "Undefined", "");
-
-    my_addr.s_addr = hostGetByName (host);
-    inet_ntoa_b (my_addr, my_addr_c);
-    StrJoin (addr, addr_size, my_addr_c, "");
-  }
-/*--------------------------------------------------------------------------*/
-  int sleep (int secs) {
-/*    =====
-**                  Go to sleep for secs seconds.
-*/
-    int	    ticks;
-
-    ticks = secs * sysClkRateGet ();
-    taskDelay (ticks);
-    return 0;
-  }
-/*
-**---------------------------------------------------------------------------
-**		StrJoin	- join 2 strings.
-**
-**		    The routine joins 2 strings, checking for total string
-**		    length and ensuring the result will be zero terminated.
-**		    The "result" arg may be the same as "str_a" or "str_b".
-**
-**			    Note: strncat is used exclusively rather than
-**				  strncpy to be sure result is always
-**				  null terminated.
-*/
-  char	*StrJoin (
-/*	 =======
-*/		    char    *result,
-		    int	    result_size,
-		    char    *str_a,
-		    char    *str_b) {
-
-    int	    i, size, size_a, size_b;
-
-    size = result_size - 1;
-
-    if (size < 0) return result;
-
-    if (result == str_a) {	    /* Are the result and str_a the same? */
-      size_a = strlen (str_a);	    /* Yes */
-      if (size_a > size) {	    /* Check sizes anyway. */
-	result[size] = NIL;	    /* Truncate str_a. No room for str_b! */
-      }else {
-	size = size - strlen (result);	/* And append str_b */
-	if (size > 0) {
-	  strncat (result, str_b, size);
-	}
-      }
-    }else if (result == str_b) {    /* Are the result and str_b the same? */
-      size_a = strlen (str_a);	    /* Yes, this is a bit complicated! */
-      size_b = strlen (str_b);
-      if (size_a >= size) {	    /* If str_a completely fills result, .. */
-	result[0] = NIL;	    /* .. then just copy in str_a */
-	strncat (result, str_a, size);
-      }else {
-			    /*
-			    ** Otherwise, str_b must first be moved to
-			    ** make room for str_a and then str_a must
-			    ** be put at the front of the result.
-			    */
-	if ((size_a + size_b) > size) size_b = size - size_a;
-	result[size_a+size_b] = NIL;
-	for (i = (size_b-1); i >= 0; i--) result[size_a+i] = str_b[i];
-	memcpy (result, str_a, size_a);
-      }
-    }else {			   /* Result is neither str_a nor str_b so .. */
-      result[0] = NIL;		   /* .. str_a needs to be copied */
-      strncat (result, str_a, size);
-      size = size - strlen (result);		    /* And str_a appended */
-      if (size > 0) strncat (result, str_b, size);
-    }
-    return result;
-  }
-/*===================================== End of SinqHM_srv_routines.c ========*/
diff --git a/sinqhm/SinqHM_srv_server.c b/sinqhm/SinqHM_srv_server.c
deleted file mode 100755
index 46a440be..00000000
--- a/sinqhm/SinqHM_srv_server.c
+++ /dev/null
@@ -1,284 +0,0 @@
-#define	    IDENT	"1A08"
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     SINQ Division				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...SinqHM]SinqHM_srv_server.c
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Oct 1996
-**
-** Updates:
-**  1A01  2-Oct-1996 DM	    Initial version.
-**
-**  SinqHM_srv_server.c forms a child process of the SINQ Histogram Memory
-**  process. It does the communication with the client.
-**
-**  To compile this program for VxWorks on PSS123, use:
-**
-	    ccvx SinqHM_srv_server.c
-** where
-	    ccvx = ccppc -O0			\
-		    -mcpu=603			\
-		    -I${WIND_BASE}/target/h	\
-		    -fno-builtin		\
-		    -fno-for-scope		\
-		    -nostdinc			\
-		    -DCPU=PPC603		\
-		    -D_GNU_TOOL			\
-		    -gdwarf -c -Wimplicit
-**
-**====================================================================
-*/
-#include    <vxWorks.h>
-#include    <taskLib.h>
-#include    <msgQLib.h>
-#include    <sockLib.h>
-
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <setjmp.h>
-
-#include    <unistd.h>	/* Get the POSIX environment defined ..
-			** .. see DEC OSF/1 Guide to Realtime Programming */
-#include    <errno.h>
-#include    <netinet/in.h>
-#include    <sys/types.h>
-#include    <sys/socket.h>
-
-#include    <sys/mman.h>	/* Get POSIX mem mgmnt definitions. */
-#include    <signal.h>		/* Get POSIX signal definitions. */
-#include    <timers.h>
-#include    <sys/wait.h>	/* Get POSIX wait definitions. */
-/*
-**====================	Global Definitions =====================================
-*/
-#include    "SinqHM_def.h"
-#include    "SinqHM_gbl.h"
-/*==============================================================================
-		Local Routines for SRV
-**					None
-*/
-/*==============================================================================
-		Global Routines for SRV
-**			
-*/
-  void	SinqHM_server_setup_id () {
-/*	======================
-**		Simply copy some ident information to global variables
-**		for use by the SQHM_IDENT request.
-*/
-    StrJoin (Sqhm_serv_ident, sizeof (Sqhm_serv_ident), IDENT, "");
-    StrJoin (Sqhm_serv_date,  sizeof (Sqhm_serv_date),  __DATE__, ", ");
-    StrJoin (Sqhm_serv_date,  sizeof (Sqhm_serv_date),  Sqhm_serv_date, __TIME__);
-  }
-/*==============================================================================
-		Here beginneth the main code for SinqHM_server ...
-**
-**		    Note: There must be NO return from this function.
-*/
-  int SinqHM_server (int suspend_flag, int index, int pkt_size) {
-/*    =============
-**
-**		Set up TCP/IP port for operations with client, accept his
-**		connection and perform services for him.
-*/
-    int			status, status0, status1;
-    int			i, is, nbytes, bytes_to_come;
-    char		recd[80];
-    char		*p_nxt_byte;
-    int			cnct_skt, rw_skt;
-    struct sockaddr_in	my_lcl_sockname;
-    struct sockaddr_in	my_rmt_sockname;
-    int			my_rmt_sockname_len;
-    char		*buff_pntr;
-    int			port;
-
-    sigset_t		proc_sigmask;
-    struct sigaction	sig_action;
-
-    struct req_buff_struct  my_req_bf;
-    struct rply_buff_struct my_rply_bf;
-
-    port = Port_base + index;
-/*============================================================================
-*/
-    StrJoin (Tsk_name[index], sizeof (Tsk_name[0]), taskName (get_pid ()), "");
-
-    if (suspend_flag != 0) {
-      printf ("\n%s: Suspending ..\n", Tsk_name[index]);
-      taskSuspend (0);	    /* We've been told to suspend ourself, ..
-			    **  .. presumably for debug reasons.
-			    */
-      printf ("\n%s: Suspension ended!\n", Tsk_name[index]);
-    }
-/*============================================================================
-**	Define our signal mask first and define an action routine to catch
-**	the SIGINT signal our parent will send us when he wants us to exit.
-*/
-    status = sigemptyset (&proc_sigmask);
-    status = sigprocmask (SIG_SETMASK, &proc_sigmask, NULL);
-
-    status = sigemptyset (&sig_action.sa_mask);
-    sig_action.sa_handler = catch_int_signal;
-    sig_action.sa_flags   = 0;
-    if (sigaction (SIGINT, &sig_action, NULL) == -1) {
-      getErrno (&My_errno);
-      perror ("sigaction error:");
-      Child_exit_status[index] = -1;	/* Tell our parent we've given up */
-      is = semGive (Sem_Server);	/* Let our parent continue */
-      exit (KER__BAD_VALUE);
-    }
-/*============================================================================
-**	Create a TCP/IP socket for communication, bind it and listen.
-*/
-    Child_cnct_skt[index] = 0;
-    cnct_skt = socket (AF_INET, SOCK_STREAM, 0);
-    if (cnct_skt == -1) {
-      perror (StrJoin (recd, sizeof (recd),
-		Tsk_name[index], " -- cnct_skt socket error"));
-      Child_exit_status[index] = -2;	/* Tell our parent we've given up */
-      is = semGive (Sem_Server);	/* Let our parent continue */
-      exit (KER__BAD_VALUE);
-    }
-    status = 1;
-    setsockopt(cnct_skt, SOL_SOCKET, SO_REUSEADDR, &status, sizeof(int));
-
-    my_lcl_sockname.sin_family = AF_INET;
-    my_lcl_sockname.sin_port   = htons (port);
-    my_lcl_sockname.sin_addr.s_addr = 0;
-    status = bind (cnct_skt, (struct sockaddr *) &my_lcl_sockname,
-					  sizeof (my_lcl_sockname));
-    if (status != 0) {
-      close (cnct_skt);
-      perror (StrJoin (recd, sizeof (recd),
-			Tsk_name[index], " -- cnct_skt bind error"));
-      Child_exit_status[index] = -2;	/* Tell our parent we've given up */
-      is = semGive (Sem_Server);	/* Let our parent continue */
-      exit (KER__BAD_VALUE);
-    }
-
-    status = listen (cnct_skt, 1);
-    if (status != 0) {
-      close (cnct_skt);
-      perror (StrJoin (recd, sizeof (recd),
-			Tsk_name[index], " -- cnct_skt listen error"));
-      Child_exit_status[index] = -3;	/* Tell our parent we've given up */
-      is = semGive (Sem_Server);	/* Let our parent continue */
-      exit (KER__BAD_VALUE);
-    }
-/*============================================================================
-**	    Tell parent our cnct port is set up and waiting by releasing
-**	    semaphore so that our parent can continue. The parent will then
-**	    send a message to the client telling him which port he is to use.
-*/
-    is = semGive (Sem_Server);
-    if (is != OK) {
-      kill (Parent_pid, SIGUSR1);   /* Inform parent that we are in trouble */
-      printf ("%s -- sem release error\n", Tsk_name[index]);
-      close (cnct_skt);
-      exit (KER__BAD_VALUE);
-    }
-    Child_cnct_skt[index] = cnct_skt;
-/*============================================================================
-**	    Ensure that our bit in SinqHM_Dsbl_Mask is clear.
-*/
-    do_daq (&my_rply_bf, index, DAQ__CLR);
-/*============================================================================
-**	    Wait for the client to connect to our port
-*/
-    my_rmt_sockname_len = sizeof (my_rmt_sockname);
-    rw_skt = accept (cnct_skt, (struct sockaddr *) &my_rmt_sockname,
-						&my_rmt_sockname_len);
-    if (rw_skt == -1) {
-      perror (StrJoin (recd, sizeof (recd),
-			Tsk_name[index], " -- cnct_skt accept error"));
-      close (cnct_skt);
-      Child_cnct_skt[index] = 0;
-      kill (Parent_pid, SIGUSR1);   /* Inform parent that we are in trouble */
-      exit (KER__BAD_VALUE);
-    }
-    Child_rw_skt[index] = rw_skt;
-/*
-**-------------------------------------------------------------------------
-**			    Here is the main recv loop
-*/
-  main_loop:
-/*=========
-*/  bytes_to_come = sizeof (my_req_bf);	    /* Read a command */
-    p_nxt_byte = (char *) &my_req_bf;
-    while (bytes_to_come > 0) {
-      nbytes = recv (rw_skt, p_nxt_byte, bytes_to_come, 0);
-      if (nbytes <= 0) break;
-      Rw_bytes_got += nbytes;
-      bytes_to_come -= nbytes;
-      p_nxt_byte += nbytes;
-    }
-    if ((bytes_to_come == 0) &&
-	(ntohl (my_req_bf.bigend) == 0x12345678) &&
-	(ntohl (my_req_bf.cmnd) != SQHM_CLOSE)) {
-      is = do_command (index, rw_skt, pkt_size, &my_req_bf, &my_rply_bf);
-      if (is == OK) goto main_loop;	/* Break out of loop on error */
-    }
-/*
-**			    End of the main recv loop
-**-------------------------------------------------------------------------
-**	Get here if we drop out of the "recv" loop.
-**	This should only happen on getting a SQHM_CLOSE message.
-**	Anything else is a fatal error.
-*/
-    do_daq (&my_rply_bf, index, DAQ__CLR); /* Ensure our inhibit bit is clear */
-
-    close (rw_skt);	Child_rw_skt[index] = 0;
-    close (cnct_skt);	Child_cnct_skt[index] = 0;
-		/*
-		** Check the various error conditions
-		*/
-    if (bytes_to_come != 0) {	/* Was a complete request read? */
-				/* No, it may be a network error, in which case
-				** nbytes is -1, or nothing was read, which
-				** indicates that our client simply closed
-				** his connection (forgetting to send a
-				** SQHM_CLOSE message), or the client has
-				** screwed up the protocol! */
-      if (nbytes == -1) {
-						/* It's a network error */
-	perror (StrJoin (recd, sizeof (recd),
-			    Tsk_name[index], " -- rw_skt recv error"));
-	status = KER__EXIT_SIGNAL;
-      }else if (bytes_to_come == sizeof (my_req_bf)) {
-				/* Our client simply closed his connection.
-				** Treat this as normal. */
-	printf ("\n%s exiting.\n", Tsk_name[index]);
-	status = KER__SUCCESS;
-      }else {
-	printf ("\n%s -- rw_skt recv wrong number of bytes: %d\n",
-				    Tsk_name[index], nbytes);
-	status = KER__EXIT_SIGNAL;
-      }
-    }else if (ntohl (my_req_bf.bigend) != 0x12345678) {
-					    /* Network byte-order wrong! */
-      printf ("\n%s -- big-endian/little-endian problem!\n"
-	   "    Buffer received in non-network byte order!\n", Tsk_name[index]);
-      status = KER__EXIT_SIGNAL;
-    }else if (ntohl (my_req_bf.cmnd) == SQHM_CLOSE) {
-			       /* SQHM_CLOSE request received. This is normal */
-      printf ("\n%s exiting.\n", Tsk_name[index]);
-      status = KER__SUCCESS;
-    }else {
-					/* Unrecognised request received! */
-      printf ("\n%s -- unrecognised command received: 0x%x\n",
-			Tsk_name[index], ntohl (my_req_bf.cmnd));
-      status = KER__EXIT_SIGNAL;
-    }
-    kill (Parent_pid, SIGUSR1);	    /* Inform parent that we are exiting */
-    exit (status);
-  }
-/*======================================= End of SinqHM_srv_server.c ========*/
diff --git a/sinqhm/bld b/sinqhm/bld
deleted file mode 100755
index 265640e1..00000000
--- a/sinqhm/bld
+++ /dev/null
@@ -1,415 +0,0 @@
-#!	/bin/csh
-#			pss123:~sinqhm/wind/SinqHM/<instr>/bld	V01G
-#
-#	    Script to compile and link the SinqHM_srv programs for vxWorks
-#
-#	  rcp -p "lnsa04:sinqhm/bld" ~/wind/SinqHM/bld
-
-##   printf 'Arg 0 = "%s"\n' $0
-##   printf 'Arg 1 = "%s"\n' $1
-##   printf 'Arg 2 = "%s"\n' $2
-##   printf 'Arg 3 = "%s"\n' $3
-
-	set proc = "$0"
-	if (`expr match "$proc" "\/"` != 1) set proc = "./$0"
-	cd $proc:h		# Build in bld's directory!
-#------------------------------------------------------------------------------
-#    Uncomment the following command to disable remote-copy operations
-#
-## alias rcp 'echo "  Warning -- remote copy disabled"; echo \!\!:* > /dev/null'
-#------------------------------------------------------------------------------
-	if ("`whoami`" == "maden") then
-	  set src = "maden@lnsa06:sinqhm/"
-	else if ("`whoami`" == "sinqhm") then
-	  set src = "koenneck@lnsa17:src/sics/sinqhm/"
-	else
-	  echo Sorry, you are not recognised by this script.
-	  exit
-	endif
-#------------------------------------------------------------------------------
-	alias  ccvx   'ccppc -O0 -mcpu=603 -I${WIND_BASE}/target/h ' \
-		'-fno-builtin -fno-for-scope ' \
-		'-nostdinc -DCPU=PPC603 -D_GNU_TOOL -gdwarf -c -Wimplicit'
-#
-	set Insts = (dev dmc sans focus hrpt trics poldi amor)
-
-	if (("$1" == "") ||	\
-	    ("$1" == "?") ||	\
-	    ("$1" == "h") ||	\
-	    ("$1" == "he") ||	\
-	    ("$1" == "hel") ||	\
-	    ("$1" == "help"))	goto show_help
-
-	printf "\n"
-	printf "Working directory is %s\n" "$cwd"
-	printf 'Source is "%s"\n' "$src"
-	printf "\n"
-
-	if ("$1" == "bld")	goto bld
-	if ("$1" == "startup")	goto startup
-	if ("$1" == "basic")	goto basic
-
-	foreach inst ($Insts)
-	  if ("$1" == "$inst")  goto $inst
-	end
-	  printf '\aI do not know how to build "%s"\!\n' $1
-	  goto show_help
-#===========================================================================
- show_help_0:
-	printf '\n\007You must specify what you want to build\!\n\n'
- show_help:
-#=========
-	echo "Usage:"
-	echo "    bld bld         - copy over new version of bld script."
-	echo "    bld startup     - copy over new version of startup script."
-	echo "    bld basic       - build basic system."
-	echo "    bld <inst> all  - build all modules for instrument <inst>."
-	echo "    bld <inst> SinqHM_srv [<module>]   - build SinqHM_srv module"
-	echo "    bld <inst> lwl_server              - build lwl_server module"
-	echo "    bld <inst> SinqHM_bootParamsConfig - build auto-config module"
-	echo "    bld <inst> SinqHM_bootUtil         - build boot-utility module"
-	echo "    bld focus  FOCUS_srv [<module>]    - build FOCUS_srv module"
-	echo "    bld <inst> auto                    - build auto-spawn system"
-	echo " "
-	echo "Valid instruments are:"
-	echo "    $Insts"
-	echo " "
-	exit
-#-----------------------------------------------------------------------------
- bld:
-#===
-	echo "   Copying bld (previous version is bld.save) ..."
-	mv bld bld.save
-	rcp -p "${src}bld" ./bld
-	rcp -p "${src}bld2" ./bld2
-	rcp -p "${src}bld604" ./bld604
-	exit
-#-----------------------------------------------------------------------------
- startup:
-#=======
-	echo "   Copying startup ..."
-	rcp -p "${src}startup.template" ./startup
-	exit
-#-----------------------------------------------------------------------------
- basic:
-#=====
-	set dflt = "$cwd"
-	cd $WIND_BASE/target/config/mv1603
-	echo " "
-	echo "Default directory changed to:"
-	echo "            $cwd"
-	printf "Building vxWorks_basic system image ...\n\n"
-	touch config.h		# Force a complete re-compilation
-
-	make 	ADDED_CFLAGS=" -DSINQHM_SPAWN=0" \
-		ADDED_MODULES=""
-
-	mv vxWorks     vxWorks_basic
-	mv vxWorks.sym vxWorks.sym_basic
-	cp -p vxWorks_basic      $dflt/vxWorks_basic
-	cp -p vxWorks.sym_basic  $dflt/vxWorks.sym
-	cd $dflt
-	echo "   Done. Result is $dflt/vxWorks_basic"
-	exit
-#=============================================================================
-#		Now follow labels for all the valid instruments.
- dev:
-#----
-	set instr = Devel
-	set defn = '-DINST="Devel" -DDevel'
-	set direc = Devel/NEW
-	goto comn
- dmc:
-#---
-	set instr = DMC
-	set defn = '-DINST="DMC" -DDMC'
-	set direc = DMC/NEW
-	goto comn
- sans:
-#----
-	set instr = SANS
-	set defn = '-DINST="SANS" -DSANS'
-	set direc = SANS/NEW
-	goto comn
- focus:
-#-----
-	set instr = FOCUS
-	set defn = '-DINST="FOCUS" -DFOCUS'
-	set direc = FOCUS/NEW
-	goto comn
- hrpt:
-#----
-	set instr = HRPT
-	set defn = '-DINST="HRPT" -DHRPT'
-	set direc = HRPT/NEW
-	goto comn
- trics:
-#-----
-	set instr = TriCS
-	set defn = '-DINST="TRICS" -DTRICS'
-	set direc = TRICS
-	goto comn
- poldi:
-#-----
-	set instr = POLDI
-	set defn = '-DINST="POLDI" -DPOLDI'
-	set direc = POLDI/NEW
-	goto comn
- amor:
-#----
-	set instr = AMOR
-	set defn = '-DINST="AMOR" -DAMOR'
-	set direc = AMOR/NEW
-	goto comn
- comn:
-#----
-	echo The selected instrument is ${instr}.
-
-	if ("$2" == "")				goto show_help_0
-
-	cd $direc
-	printf "Working directory changed to %s\n" "$cwd"
-	if ("$2" == "SinqHM_srv") 		goto SinqHM_srv
-	if ("$2" == "lwl_server") 		goto lwl_server
-	if ("$2" == "SinqHM_bootParamsConfig") 	goto SinqHM_bootParamsConfig
-	if ("$2" == "SinqHM_bootUtil")		goto SinqHM_bootUtil
-	if (("$instr" == "FOCUS") && ("$2" == "FOCUS_srv")) goto FOCUS_srv
-	if ("$2" == "auto") 			goto auto
-	if ("$2" != "all") then
-	  printf '\007I do not know how to build "%s" for %s\!\n' "$2" $instr
-	  printf 'Type "bld help" for help\!\n'
-	  exit 
-	endif
-#--------------------------------------------------------------
- SinqHM_srv:
-#==========
-	set Mods = (SinqHM_gbl.h \
-		    SinqHM_def.h \
-		    vmio10_def.h \
-		    SinqHM_srv_main.c \
-		    SinqHM_srv_routines.c \
-		    SinqHM_srv_filler.c \
-		    SinqHM_srv_server.c)
-
-	if (("$3" == "") || ("$3" == "all")) goto SinqHM_srv_all
-
-	foreach module ($Mods)
-	  if ("$3" == "$module") goto SinqHM_srv_cpy
-	end
-
-	if (("$3" != "?") &&	\
-	    ("$3" != "h") &&	\
-	    ("$3" != "he") &&	\
-	    ("$3" != "hel") &&	\
-	    ("$3" != "help")) then
-	  printf '"%s" is not a recognised module of SinqHM_srv\!\n\n' "$3"
-	endif
-
-	printf 'To build SinqHM_srv, use the command:\n'
-	printf '\n'
-	printf '      bld <instr> SinqHM_srv [module]\n'
-	printf '\n'
-	printf 'Valid instruments are:\n'
-	printf '\n'
-	printf '      %s\n' "$Insts"
-	printf '\n'
-	printf 'Valid modules are:\n'
-	printf '\n'
-	foreach module ($Mods)
-	  printf '      %s\n' "$module"
-	end
-	printf '\n'
-	exit
-#----------------------------------------------------------------------------
- SinqHM_srv_cpy:
-#--------------
-	echo "   Copying $3 ..."
-	rcp -p  "${src}$3" ./$3
-
-	if ("$3" == "SinqHM_gbl.h")		goto SinqHM_srv_compile_all
-	if ("$3" == "SinqHM_def.h")		goto SinqHM_srv_compile_all
-	if ("$3" == "vmio10_def.h")		goto SinqHM_srv_compile_all
-
-	echo "   Compiling $3 ..."
-	ccvx $defn $3
-	goto SinqHM_srv_link
-
- SinqHM_srv_all:
-#--------------
-	echo " "
-	echo "Building SinqHM_srv ..."
-	echo "   Copying header files ..."
-	  rcp -p "${src}SinqHM_gbl.h"	./SinqHM_gbl.h
-	  rcp -p "${src}SinqHM_def.h"	./SinqHM_def.h
-	  rcp -p "${src}vmio10_def.h"	./vmio10_def.h
-	echo "   Copying source files ..."
-	  rcp -p "${src}SinqHM_srv_main.c"	./SinqHM_srv_main.c
-	  rcp -p "${src}SinqHM_srv_routines.c"	./SinqHM_srv_routines.c
-	  rcp -p "${src}SinqHM_srv_filler.c"	./SinqHM_srv_filler.c
-	  rcp -p "${src}SinqHM_srv_server.c"	./SinqHM_srv_server.c
-
- SinqHM_srv_compile_all:
-#----------------------
-	echo "   Compiling SinqHM_srv_main.c ..."
-		ccvx $defn SinqHM_srv_main.c
-	echo "   Compiling SinqHM_srv_routines.c ..."
-		ccvx $defn SinqHM_srv_routines.c
-	echo "   Compiling SinqHM_srv_filler.c ..."
-		ccvx $defn SinqHM_srv_filler.c
-	echo "   Compiling SinqHM_srv_server.c ..."
-		ccvx $defn SinqHM_srv_server.c
-
- SinqHM_srv_link:
-#---------------
-	echo "   Linking ..."
-		ldppc -o SinqHM_srv.o -r	\
-				SinqHM_srv_main.o SinqHM_srv_routines.o \
-				SinqHM_srv_filler.o SinqHM_srv_server.o
-	echo "   Done. Result is $cwd/SinqHM_srv.o"
-	if ("$2" != "all") exit
-#---------------------------------------------------------------------------
- lwl_server:
-#==========
-	echo " "
-	echo "Building lwl_server ..."
-	echo "   Copying header files ..."
-		rcp -p "${src}vmio10_def.h" ./vmio10_def.h
-	echo "   Copying source files ..." 
-		rcp -p "${src}lwl_server.c" ./lwl_server.c
-	echo "   Compiling lwl_server.c ..."
-		ccvx $defn lwl_server.c
-	echo "   Done. Result is $cwd/lwl_server.o"
-	if ("$2" != "all") exit
-#---------------------------------------------------------------------------
- SinqHM_bootParamsConfig:
-#=======================
-	echo " "
-	echo "Building SinqHM_bootParamsConfig ..."
-	echo "   Copying header files ..."
-		rcp -p	"${src}SinqHM_def.h" ./SinqHM_def.h
-	echo "   Copying source files ..."
-		rcp -p "${src}SinqHM_bootParamsConfig.c" \
-			./SinqHM_bootParamsConfig.c
-	echo "   Compiling SinqHM_bootParamsConfig.c ..."
-		ccvx $defn -I${WIND_BASE}/target/config/all \
-			SinqHM_bootParamsConfig.c
-	echo "   Done. Result is $cwd/SinqHM_bootParamsConfig.o"
-	if ("$2" != "all") exit
-#---------------------------------------------------------------------------
- SinqHM_bootUtil:
-#===============
-	echo " "
-	echo "Building SinqHM_bootUtil ..."
-	echo "   Copying header file ..."
-		rcp -p	"${src}SinqHM_def.h" ./SinqHM_def.h
-	echo "   Copying source file ..."
-		rcp -p "${src}SinqHM_bootUtil.c" \
-			./SinqHM_bootUtil.c
-	echo "   Compiling SinqHM_bootUtil.c ..."
-		ccvx $defn -I${WIND_BASE}/target/config/all SinqHM_bootUtil.c
-	echo "   Done. Result is $cwd/SinqHM_bootUtil.o"
-	if ("$2" != "all") exit
-#---------------------------------------------------------------------------
- FOCUS_srv:
-#==========
-	if ($instr != "FOCUS") goto FOCUS_srv_skp
-	  set Mods = ( FOCUS_gbl.h \
-		    SinqHM_def.h \
-		    FOCUS_srv_main.c )
-
-	  if (("$3" == "") || ("$3" == "all")) goto FOCUS_srv_all
-
-	  foreach module ( $Mods )
-	    if ("$3" == "$module") goto FOCUS_srv_cpy
-	  end
-
-	  if (("$3" != "?") &&	\
-	      ("$3" != "h") &&	\
-	      ("$3" != "he") &&	\
-	      ("$3" != "hel") &&	\
-	      ("$3" != "help")) then
-	    printf '"%s" is not a recognised module of FOCUS_srv\!\n\n' "$3"
-	  endif
-
-	  printf 'To build FOCUS_srv, use the command:\n'
-	  printf '\n'
-	  printf '      bld <instr> FOCUS_srv [module]\n'
-	  printf '\n'
-	  printf 'Valid instruments are:\n'
-	  printf '\n'
-	  printf '      %s\n' "focus"
-	  printf '\n'
-	  printf 'Valid modules are:\n'
-	  printf '\n'
-	  foreach module ($Mods)
-	    printf '      %s\n' "$module"
-	  end
-	  printf '\n'
-	  exit
-#----------------------------------------------------------------------------
- FOCUS_srv_cpy:
-#--------------
-	echo "   Copying $3 ..."
-	rcp -p  "${src}$3" ./$3
-
-	if ("$3" == "FOCUS_gbl.h")		goto FOCUS_srv_compile_all
-	if ("$3" == "SinqHM_def.h")		goto FOCUS_srv_compile_all
-
-	echo "   Compiling $3 ..."
-	ccvx $defn $3
-	goto FOCUS_srv_link
-
- FOCUS_srv_all:
-#--------------
-	echo " "
-	echo "Building FOCUS_srv ..."
-	echo "   Copying header files ..."
-	  rcp -p "${src}FOCUS_gbl.h"	./FOCUS_gbl.h
-	  rcp -p "${src}SinqHM_def.h"	./SinqHM_def.h
-	echo "   Copying source files ..."
-	  rcp -p "${src}FOCUS_srv_main.c"	./FOCUS_srv_main.c
-
- FOCUS_srv_compile_all:
-#----------------------
-	echo "   Compiling FOCUS_srv_main.c ..."
-		ccvx $defn FOCUS_srv_main.c
-
- FOCUS_srv_link:
-#---------------
-	echo "   Linking ..."
-		ldppc -o FOCUS_srv.o -r	\
-				FOCUS_srv_main.o
-	echo "   Done. Result is $cwd/FOCUS_srv.o"
- FOCUS_srv_skp:
-#-------------
-	if ("$2" != "all") exit
-#---------------------------------------------------------------------------
- auto:
-#====
-	set dflt = "$cwd"
-	cd $WIND_BASE/target/config/mv1603
-	echo " "
-	echo "Default directory changed to:"
-	echo "            $cwd"
-	printf "\n\n==================================================\n"
-	printf \
-	  "\n\nBuilding vxWorks_auto system image for $instr Instrument ...\n\n"
-	touch config.h		# Force a complete re-compilation
-
-	set mods = (	$dflt/SinqHM_srv.o \
-			$dflt/lwl_server.o \
-			$dflt/SinqHM_bootParamsConfig.o \
-			$dflt/SinqHM_bootUtil.o	)
-	if ($instr == FOCUS) set mods = ( $mods $dflt/FOCUS_srv.o )
-
-	make 	ADDED_CFLAGS=" -DSINQHM_SPAWN=1" 	\
-		ADDED_MODULES="$mods"
- 			
-	mv vxWorks     vxWorks_auto
-	mv vxWorks.sym vxWorks.sym_auto
-	cp -p vxWorks_auto      $dflt/vxWorks_auto
-	cp -p vxWorks.sym_auto  $dflt/vxWorks.sym
-	cd $dflt
-	echo "   Done. Result is $dflt/vxWorks_auto"
-	exit
-#------------------------------------------------------------------ End of bld
diff --git a/sinqhm/bld2 b/sinqhm/bld2
deleted file mode 100755
index 357a9571..00000000
--- a/sinqhm/bld2
+++ /dev/null
@@ -1,432 +0,0 @@
-#!	/bin/csh
-#			pss123:~sinqhm/wind/SinqHM/<instr>/bld	V01G
-#
-#	    Script to compile and link the SinqHM_srv programs for vxWorks
-#
-#	  rcp -p "lnsa04:sinqhm/bld" ~/wind/SinqHM/bld
-#
-#  This version is for the Tornado 2.0.2 version and the MVME2604 board
-#  as used at AMOR and SANS
-#
-#  Mark Koennecke, February 2002
-
-##   printf 'Arg 0 = "%s"\n' $0
-##   printf 'Arg 1 = "%s"\n' $1
-##   printf 'Arg 2 = "%s"\n' $2
-##   printf 'Arg 3 = "%s"\n' $3
-#----------------------------------------------------------------------------
-	set proc = "$0"
-	if (`expr match "$proc" "\/"` != 1) set proc = "./$0"
-	cd $proc:h		# Build in bld's directory!
-#------------------------------------------------------------------------------
-#    Uncomment the following command to disable remote-copy operations
-#
-## alias rcp 'echo "  Warning -- remote copy disabled"; echo \!\!:* > /dev/null'
-#------------------------------------------------------------------------------
-	if ("`whoami`" == "maden") then
-	  set src = "maden@lnsa06:sinqhm/"
-	else if ("`whoami`" == "sinqhm") then
-	  set src = "koenneck@lnsa17:src/sics/sinqhm/"
-	else
-	  echo Sorry, you are not recognised by this script.
-	  exit
-	endif
-#------------------------------------------------------------------------------
-#	alias  ccvx   'ccppc -O0 -mcpu=603 -I${WIND_BASE}/target/h ' \
-#		'-fno-builtin -fno-for-scope ' \
-#		'-nostdinc -DCPU=PPC603 -D_GNU_TOOL -gdwarf -c -Wimplicit'
-alias ccvx 'ccppc ' \
- '-B/home/pss123/aco/sinqhm/wind2/2.0.2/host/sun4-solaris2/lib/gcc-lib/' \
- ' -mstrict-align -fdollars-in-identifiers -O2 -fvolatile -fno-builtin' \
- ' -fno-for-scope -Wall -I/h   -I. '\
- ' -I/home/pss123/aco/sinqhm/wind2/2.0.2/target/config/all ' \
- ' -I/home/pss123/aco/sinqhm/wind2/2.0.2/target/h '\
- ' -I/home/pss123/aco/sinqhm/wind2/2.0.2/target/src/config '\
- ' -I/home/pss123/aco/sinqhm/wind2/2.0.2/target/src/drv -DCPU=PPC604 '\
-  ' -DMV2600  -DSINQHM_SPAWN=1 -c '
-
-
-#
-
-	set Insts = (dev dmc sans focus hrpt trics poldi amor)
-
-	if (("$1" == "") ||	\
-	    ("$1" == "?") ||	\
-	    ("$1" == "h") ||	\
-	    ("$1" == "he") ||	\
-	    ("$1" == "hel") ||	\
-	    ("$1" == "help"))	goto show_help
-
-	printf "\n"
-	printf "Working directory is %s\n" "$cwd"
-	printf 'Source is "%s"\n' "$src"
-	printf "\n"
-
-	if ("$1" == "bld")	goto bld
-	if ("$1" == "startup")	goto startup
-	if ("$1" == "basic")	goto basic
-
-	foreach inst ($Insts)
-	  if ("$1" == "$inst")  goto $inst
-	end
-	  printf '\aI do not know how to build "%s"\!\n' $1
-	  goto show_help
-#===========================================================================
- show_help_0:
-	printf '\n\007You must specify what you want to build\!\n\n'
- show_help:
-#=========
-	echo "Usage:"
-	echo "    bld bld         - copy over new version of bld script."
-	echo "    bld startup     - copy over new version of startup script."
-	echo "    bld basic       - build basic system."
-	echo "    bld <inst> all  - build all modules for instrument <inst>."
-	echo "    bld <inst> SinqHM_srv [<module>]   - build SinqHM_srv module"
-	echo "    bld <inst> lwl_server              - build lwl_server module"
-	echo "    bld <inst> SinqHM_bootParamsConfig - build auto-config module"
-	echo "    bld <inst> SinqHM_bootUtil         - build boot-utility module"
-	echo "    bld focus  FOCUS_srv [<module>]    - build FOCUS_srv module"
-	echo "    bld <inst> auto                    - build auto-spawn system"
-	echo " "
-	echo "Valid instruments are:"
-	echo "    $Insts"
-	echo " "
-	exit
-#-----------------------------------------------------------------------------
- bld:
-#===
-	echo "   Copying bld (previous version is bld.save) ..."
-	mv bld bld.save
-	rcp -p "${src}bld" ./bld
-	rcp -p "${src}bld2" ./bld2
-	rcp -p "${src}tornado2" ./tornado2
-	exit
-#-----------------------------------------------------------------------------
- startup:
-#=======
-	echo "   Copying startup ..."
-	rcp -p "${src}startup.template" ./startup
-	exit
-#-----------------------------------------------------------------------------
- basic:
-#=====
-	set dflt = "$cwd"
-	cd $WIND_BASE/target/config/mv2604
-	echo " "
-	echo "Default directory changed to:"
-	echo "            $cwd"
-	printf "Building vxWorks_basic system image ...\n\n"
-	touch config.h		# Force a complete re-compilation
-
-	make 	ADDED_CFLAGS=" -DSINQHM_SPAWN=0" \
-		ADDED_MODULES=""
-
-	mv vxWorks     vxWorks_basic
-	mv vxWorks.sym vxWorks.sym_basic
-	cp -p vxWorks_basic      $dflt/vxWorks_basic
-	cp -p vxWorks.sym_basic  $dflt/vxWorks.sym
-	cd $dflt
-	echo "   Done. Result is $dflt/vxWorks_basic"
-	exit
-#=============================================================================
-#		Now follow labels for all the valid instruments.
- dev:
-#----
-	set instr = Devel
-	set defn = '-DINST="Devel" -DDevel'
-	set direc = Devel/NEW
-	goto comn
- dmc:
-#---
-	set instr = DMC
-	set defn = '-DINST="DMC" -DDMC'
-	set direc = DMC/NEW
-	goto comn
- sans:
-#----
-	set instr = SANS
-	set defn = '-DINST="SANS" -DSANS'
-	set direc = SANS/NEW
-	goto comn
- focus:
-#-----
-	set instr = FOCUS
-	set defn = '-DINST="FOCUS" -DFOCUS'
-	set direc = FOCUS/NEW
-	goto comn
- hrpt:
-#----
-	set instr = HRPT
-	set defn = '-DINST="HRPT" -DHRPT'
-	set direc = HRPT/NEW
-	goto comn
- trics:
-#-----
-	set instr = TriCS
-	set defn = '-DINST="TRICS" -DTRICS'
-	set direc = TRICS
-	goto comn
- poldi:
-#-----
-	set instr = POLDI
-	set defn = '-DINST="POLDI" -DPOLDI'
-	set direc = POLDI/NEW
-	goto comn
- amor:
-#----
-	set instr = AMOR
-	set defn = '-DINST="AMOR" -DAMOR'
-	set direc = AMOR/NEW
-	goto comn
- comn:
-#----
-	echo The selected instrument is ${instr}.
-
-	if ("$2" == "")				goto show_help_0
-
-	cd $direc
-	printf "Working directory changed to %s\n" "$cwd"
-	if ("$2" == "SinqHM_srv") 		goto SinqHM_srv
-	if ("$2" == "lwl_server") 		goto lwl_server
-	if ("$2" == "SinqHM_bootParamsConfig") 	goto SinqHM_bootParamsConfig
-	if ("$2" == "SinqHM_bootUtil")		goto SinqHM_bootUtil
-	if (("$instr" == "FOCUS") && ("$2" == "FOCUS_srv")) goto FOCUS_srv
-	if ("$2" == "auto") 			goto auto
-	if ("$2" != "all") then
-	  printf '\007I do not know how to build "%s" for %s\!\n' "$2" $instr
-	  printf 'Type "bld help" for help\!\n'
-	  exit 
-	endif
-#--------------------------------------------------------------
- SinqHM_srv:
-#==========
-	set Mods = (SinqHM_gbl.h \
-		    SinqHM_def.h \
-		    vmio10_def.h \
-		    SinqHM_srv_main.c \
-		    SinqHM_srv_routines.c \
-		    SinqHM_srv_filler.c \
-		    SinqHM_srv_server.c)
-
-	if (("$3" == "") || ("$3" == "all")) goto SinqHM_srv_all
-
-	foreach module ($Mods)
-	  if ("$3" == "$module") goto SinqHM_srv_cpy
-	end
-
-	if (("$3" != "?") &&	\
-	    ("$3" != "h") &&	\
-	    ("$3" != "he") &&	\
-	    ("$3" != "hel") &&	\
-	    ("$3" != "help")) then
-	  printf '"%s" is not a recognised module of SinqHM_srv\!\n\n' "$3"
-	endif
-
-	printf 'To build SinqHM_srv, use the command:\n'
-	printf '\n'
-	printf '      bld <instr> SinqHM_srv [module]\n'
-	printf '\n'
-	printf 'Valid instruments are:\n'
-	printf '\n'
-	printf '      %s\n' "$Insts"
-	printf '\n'
-	printf 'Valid modules are:\n'
-	printf '\n'
-	foreach module ($Mods)
-	  printf '      %s\n' "$module"
-	end
-	printf '\n'
-	exit
-#----------------------------------------------------------------------------
- SinqHM_srv_cpy:
-#--------------
-	echo "   Copying $3 ..."
-	rcp -p  "${src}$3" ./$3
-
-	if ("$3" == "SinqHM_gbl.h")		goto SinqHM_srv_compile_all
-	if ("$3" == "SinqHM_def.h")		goto SinqHM_srv_compile_all
-	if ("$3" == "vmio10_def.h")		goto SinqHM_srv_compile_all
-
-	echo "   Compiling $3 ..."
-	ccvx $defn $3
-	goto SinqHM_srv_link
-
- SinqHM_srv_all:
-#--------------
-	echo " "
-	echo "Building SinqHM_srv ..."
-	echo "   Copying header files ..."
-	  rcp -p "${src}SinqHM_gbl.h"	./SinqHM_gbl.h
-	  rcp -p "${src}SinqHM_def.h"	./SinqHM_def.h
-	  rcp -p "${src}vmio10_def.h"	./vmio10_def.h
-	echo "   Copying source files ..."
-	  rcp -p "${src}SinqHM_srv_main.c"	./SinqHM_srv_main.c
-	  rcp -p "${src}SinqHM_srv_routines.c"	./SinqHM_srv_routines.c
-	  rcp -p "${src}SinqHM_srv_filler.c"	./SinqHM_srv_filler.c
-	  rcp -p "${src}SinqHM_srv_server.c"	./SinqHM_srv_server.c
-
- SinqHM_srv_compile_all:
-#----------------------
-	echo "   Compiling SinqHM_srv_main.c ..."
-		ccvx $defn SinqHM_srv_main.c
-	echo "   Compiling SinqHM_srv_routines.c ..."
-		ccvx $defn SinqHM_srv_routines.c
-	echo "   Compiling SinqHM_srv_filler.c ..."
-		ccvx $defn SinqHM_srv_filler.c
-	echo "   Compiling SinqHM_srv_server.c ..."
-		ccvx $defn SinqHM_srv_server.c
-
- SinqHM_srv_link:
-#---------------
-	echo "   Linking ..."
-		ldppc -o SinqHM_srv.o -r	\
-				SinqHM_srv_main.o SinqHM_srv_routines.o \
-				SinqHM_srv_filler.o SinqHM_srv_server.o
-	echo "   Done. Result is $cwd/SinqHM_srv.o"
-	if ("$2" != "all") exit
-#---------------------------------------------------------------------------
- lwl_server:
-#==========
-	echo " "
-	echo "Building lwl_server ..."
-	echo "   Copying header files ..."
-		rcp -p "${src}vmio10_def.h" ./vmio10_def.h
-	echo "   Copying source files ..." 
-		rcp -p "${src}lwl_server.c" ./lwl_server.c
-	echo "   Compiling lwl_server.c ..."
-		ccvx $defn lwl_server.c
-	echo "   Done. Result is $cwd/lwl_server.o"
-	if ("$2" != "all") exit
-#---------------------------------------------------------------------------
- SinqHM_bootParamsConfig:
-#=======================
-	echo " "
-	echo "Building SinqHM_bootParamsConfig ..."
-	echo "   Copying header files ..."
-		rcp -p	"${src}SinqHM_def.h" ./SinqHM_def.h
-	echo "   Copying source files ..."
-		rcp -p "${src}SinqHM_bootParamsConfig.c" \
-			./SinqHM_bootParamsConfig.c
-	echo "   Compiling SinqHM_bootParamsConfig.c ..."
-		ccvx $defn -I${WIND_BASE}/target/config/all \
-			SinqHM_bootParamsConfig.c
-	echo "   Done. Result is $cwd/SinqHM_bootParamsConfig.o"
-	if ("$2" != "all") exit
-#---------------------------------------------------------------------------
- SinqHM_bootUtil:
-#===============
-	echo " "
-	echo "Building SinqHM_bootUtil ..."
-	echo "   Copying header file ..."
-		rcp -p	"${src}SinqHM_def.h" ./SinqHM_def.h
-	echo "   Copying source file ..."
-		rcp -p "${src}SinqHM_bootUtil.c" \
-			./SinqHM_bootUtil.c
-	echo "   Compiling SinqHM_bootUtil.c ..."
-		ccvx $defn -I${WIND_BASE}/target/config/all SinqHM_bootUtil.c
-	echo "   Done. Result is $cwd/SinqHM_bootUtil.o"
-	if ("$2" != "all") exit
-#---------------------------------------------------------------------------
- FOCUS_srv:
-#==========
-	if ($instr != "FOCUS") goto FOCUS_srv_skp
-	  set Mods = ( FOCUS_gbl.h \
-		    SinqHM_def.h \
-		    FOCUS_srv_main.c )
-
-	  if (("$3" == "") || ("$3" == "all")) goto FOCUS_srv_all
-
-	  foreach module ( $Mods )
-	    if ("$3" == "$module") goto FOCUS_srv_cpy
-	  end
-
-	  if (("$3" != "?") &&	\
-	      ("$3" != "h") &&	\
-	      ("$3" != "he") &&	\
-	      ("$3" != "hel") &&	\
-	      ("$3" != "help")) then
-	    printf '"%s" is not a recognised module of FOCUS_srv\!\n\n' "$3"
-	  endif
-
-	  printf 'To build FOCUS_srv, use the command:\n'
-	  printf '\n'
-	  printf '      bld <instr> FOCUS_srv [module]\n'
-	  printf '\n'
-	  printf 'Valid instruments are:\n'
-	  printf '\n'
-	  printf '      %s\n' "focus"
-	  printf '\n'
-	  printf 'Valid modules are:\n'
-	  printf '\n'
-	  foreach module ($Mods)
-	    printf '      %s\n' "$module"
-	  end
-	  printf '\n'
-	  exit
-#----------------------------------------------------------------------------
- FOCUS_srv_cpy:
-#--------------
-	echo "   Copying $3 ..."
-	rcp -p  "${src}$3" ./$3
-
-	if ("$3" == "FOCUS_gbl.h")		goto FOCUS_srv_compile_all
-	if ("$3" == "SinqHM_def.h")		goto FOCUS_srv_compile_all
-
-	echo "   Compiling $3 ..."
-	ccvx $defn $3
-	goto FOCUS_srv_link
-
- FOCUS_srv_all:
-#--------------
-	echo " "
-	echo "Building FOCUS_srv ..."
-	echo "   Copying header files ..."
-	  rcp -p "${src}FOCUS_gbl.h"	./FOCUS_gbl.h
-	  rcp -p "${src}SinqHM_def.h"	./SinqHM_def.h
-	echo "   Copying source files ..."
-	  rcp -p "${src}FOCUS_srv_main.c"	./FOCUS_srv_main.c
-
- FOCUS_srv_compile_all:
-#----------------------
-	echo "   Compiling FOCUS_srv_main.c ..."
-		ccvx $defn FOCUS_srv_main.c
-
- FOCUS_srv_link:
-#---------------
-	echo "   Linking ..."
-		ldppc -o FOCUS_srv.o -r	\
-				FOCUS_srv_main.o
-	echo "   Done. Result is $cwd/FOCUS_srv.o"
- FOCUS_srv_skp:
-#-------------
-	if ("$2" != "all") exit
-#---------------------------------------------------------------------------
- auto:
-#====
-	set dflt = "$cwd"
-	cd $WIND_BASE/target/config/mv2604
-	echo " "
-	echo "Default directory changed to:"
-	echo "            $cwd"
-	printf "\n\n==================================================\n"
-	printf \
-	  "\n\nBuilding vxWorks_auto system image for $instr Instrument ...\n\n"
-	touch config.h		# Force a complete re-compilation
-
-	set mods = (	$dflt/SinqHM_srv.o \
-			$dflt/lwl_server.o \
-			$dflt/SinqHM_bootParamsConfig.o \
-			$dflt/SinqHM_bootUtil.o	)
-	if ($instr == FOCUS) set mods = ( $mods $dflt/FOCUS_srv.o )
-
-	make 	ADDED_CFLAGS=" -DSINQHM_SPAWN=1" 	\
-		ADDED_MODULES="$mods"
- 			
-	mv vxWorks     vxWorks_auto
-	mv vxWorks.sym vxWorks.sym_auto
-	cp -p vxWorks_auto      $dflt/vxWorks_auto
-	cp -p vxWorks.sym_auto  $dflt/vxWorks.sym
-	cd $dflt
-	echo "   Done. Result is $dflt/vxWorks_auto"
-	exit
-#------------------------------------------------------------------ End of bld
diff --git a/sinqhm/bldmen b/sinqhm/bldmen
deleted file mode 100755
index 9687216b..00000000
--- a/sinqhm/bldmen
+++ /dev/null
@@ -1,439 +0,0 @@
-#!	/bin/csh
-#			pss123:~sinqhm/wind/SinqHM/<instr>/bld	V01G
-#
-#	    Script to compile and link the SinqHM_srv programs for vxWorks
-#
-#	  rcp -p "lnsa04:sinqhm/bld" ~/wind/SinqHM/bld
-#
-#  This version is for the Tornado 2.0.2 version and the MEN-A12 board
-#  for testing.
-#
-#  Mark Koennecke, October  2002
-
-##   printf 'Arg 0 = "%s"\n' $0
-##   printf 'Arg 1 = "%s"\n' $1
-##   printf 'Arg 2 = "%s"\n' $2
-##   printf 'Arg 3 = "%s"\n' $3
-#----------------------------------------------------------------------------
-	set proc = "$0"
-	if (`expr match "$proc" "\/"` != 1) set proc = "./$0"
-	cd $proc:h		# Build in bld's directory!
-#------------------------------------------------------------------------------
-#    Uncomment the following command to disable remote-copy operations
-#
-## alias rcp 'echo "  Warning -- remote copy disabled"; echo \!\!:* > /dev/null'
-#------------------------------------------------------------------------------
-	if ("`whoami`" == "maden") then
-	  set src = "maden@lnsa06:sinqhm/"
-	else if ("`whoami`" == "sinqhm") then
-	  set src = "koenneck@lnsa17:src/sics/sinqhm/"
-	else
-	  echo Sorry, you are not recognised by this script.
-	  exit
-	endif
-#------------------------------------------------------------------------------
-#	alias  ccvx   'ccppc -O0 -mcpu=603 -I${WIND_BASE}/target/h ' \
-#		'-fno-builtin -fno-for-scope ' \
-#		'-nostdinc -DCPU=PPC603 -D_GNU_TOOL -gdwarf -c -Wimplicit'
-
-setenv MEN_WORK_DIR /home/pss123/aco/sinqhm/wind2/MEN
-setenv MEN          /home/pss123/aco/sinqhm/wind2/MEN
-
-alias ccvx 'ccppc ' \
-'-B/home/pss123/aco/sinqhm/wind2/2.0.2/host/sun4-solaris2/lib/gcc-lib/' \
- ' -mstrict-align -ansi -nostdinc -O2 -fvolatile -fno-builtin' \
- ' -fno-for-scope -Wall -I/h  -I$MEN/VXWORKS/INCLUDE/NATIVE '\
- ' -I$MEN/VXWORKS/INCLUDE/COM -I$MEN/VXWORKS  -I. '\
- ' -I/home/pss123/aco/sinqhm/wind2/2.0.2/target/config/all ' \
- ' -I/home/pss123/aco/sinqhm/wind2/2.0.2/target/config/men_824x_ali ' \
- ' -I/home/pss123/aco/sinqhm/wind2/2.0.2/target/h '\
- ' -I/home/pss123/aco/sinqhm/wind2/2.0.2/target/src/config '\
- ' -I/home/pss123/aco/sinqhm/wind2/2.0.2/target/src/drv -DCPU=PPC603 '\
-  ' -DMEN_A012  -DSINQHM_SPAWN=1 -c '
-
-
-#
-
-	set Insts = (dev dmc sans focus hrpt trics poldi amor)
-
-	if (("$1" == "") ||	\
-	    ("$1" == "?") ||	\
-	    ("$1" == "h") ||	\
-	    ("$1" == "he") ||	\
-	    ("$1" == "hel") ||	\
-	    ("$1" == "help"))	goto show_help
-
-	printf "\n"
-	printf "Working directory is %s\n" "$cwd"
-	printf 'Source is "%s"\n' "$src"
-	printf "\n"
-
-	if ("$1" == "bld")	goto bld
-	if ("$1" == "startup")	goto startup
-	if ("$1" == "basic")	goto basic
-
-	foreach inst ($Insts)
-	  if ("$1" == "$inst")  goto $inst
-	end
-	  printf '\aI do not know how to build "%s"\!\n' $1
-	  goto show_help
-#===========================================================================
- show_help_0:
-	printf '\n\007You must specify what you want to build\!\n\n'
- show_help:
-#=========
-	echo "Usage:"
-	echo "    bld bld         - copy over new version of bld script."
-	echo "    bld startup     - copy over new version of startup script."
-	echo "    bld basic       - build basic system."
-	echo "    bld <inst> all  - build all modules for instrument <inst>."
-	echo "    bld <inst> SinqHM_srv [<module>]   - build SinqHM_srv module"
-	echo "    bld <inst> lwl_server              - build lwl_server module"
-	echo "    bld <inst> SinqHM_bootParamsConfig - build auto-config module"
-	echo "    bld <inst> SinqHM_bootUtil         - build boot-utility module"
-	echo "    bld focus  FOCUS_srv [<module>]    - build FOCUS_srv module"
-	echo "    bld <inst> auto                    - build auto-spawn system"
-	echo " "
-	echo "Valid instruments are:"
-	echo "    $Insts"
-	echo " "
-	exit
-#-----------------------------------------------------------------------------
- bld:
-#===
-	echo "   Copying bld (previous version is bld.save) ..."
-	mv bld bld.save
-	rcp -p "${src}bld" ./bld
-	rcp -p "${src}bld2" ./bld2
-	rcp -p "${src}tornado2" ./tornado2
-	exit
-#-----------------------------------------------------------------------------
- startup:
-#=======
-	echo "   Copying startup ..."
-	rcp -p "${src}startup.template" ./startup
-	exit
-#-----------------------------------------------------------------------------
- basic:
-#=====
-	set dflt = "$cwd"
-	cd $WIND_BASE/target/config/men_824x_ali
-	echo " "
-	echo "Default directory changed to:"
-	echo "            $cwd"
-	printf "Building vxWorks_basic system image ...\n\n"
-	touch config.h		# Force a complete re-compilation
-
-	make 	ADDED_CFLAGS=" -DSINQHM_SPAWN=0" \
-		ADDED_MODULES=""
-
-	mv vxWorks     vxWorks_basic
-	mv vxWorks.sym vxWorks.sym_basic
-	cp -p vxWorks_basic      $dflt/vxWorks_basic
-	cp -p vxWorks.sym_basic  $dflt/vxWorks.sym
-	cd $dflt
-	echo "   Done. Result is $dflt/vxWorks_basic"
-	exit
-#=============================================================================
-#		Now follow labels for all the valid instruments.
- dev:
-#----
-	set instr = Devel
-	set defn = '-DINST="Devel" -DDevel'
-	set direc = Devel/NEW
-	goto comn
- dmc:
-#---
-	set instr = DMC
-	set defn = '-DINST="DMC" -DDMC'
-	set direc = DMC/NEW
-	goto comn
- sans:
-#----
-	set instr = SANS
-	set defn = '-DINST="SANS" -DSANS'
-	set direc = SANS/NEW
-	goto comn
- focus:
-#-----
-	set instr = FOCUS
-	set defn = '-DINST="FOCUS" -DFOCUS'
-	set direc = FOCUS/NEW
-	goto comn
- hrpt:
-#----
-	set instr = HRPT
-	set defn = '-DINST="HRPT" -DHRPT'
-	set direc = HRPT/NEW
-	goto comn
- trics:
-#-----
-	set instr = TriCS
-	set defn = '-DINST="TRICS" -DTRICS'
-	set direc = TRICS
-	goto comn
- poldi:
-#-----
-	set instr = POLDI
-	set defn = '-DINST="POLDI" -DPOLDI'
-	set direc = POLDI/NEW
-	goto comn
- amor:
-#----
-	set instr = AMOR
-	set defn = '-DINST="AMOR" -DAMOR'
-	set direc = AMOR/NEW
-	goto comn
- comn:
-#----
-	echo The selected instrument is ${instr}.
-
-	if ("$2" == "")				goto show_help_0
-
-	cd $direc
-	printf "Working directory changed to %s\n" "$cwd"
-	if ("$2" == "SinqHM_srv") 		goto SinqHM_srv
-	if ("$2" == "lwl_server") 		goto lwl_server
-	if ("$2" == "SinqHM_bootParamsConfig") 	goto SinqHM_bootParamsConfig
-	if ("$2" == "SinqHM_bootUtil")		goto SinqHM_bootUtil
-	if (("$instr" == "FOCUS") && ("$2" == "FOCUS_srv")) goto FOCUS_srv
-	if ("$2" == "auto") 			goto auto
-	if ("$2" != "all") then
-	  printf '\007I do not know how to build "%s" for %s\!\n' "$2" $instr
-	  printf 'Type "bld help" for help\!\n'
-	  exit 
-	endif
-#--------------------------------------------------------------
- SinqHM_srv:
-#==========
-	set Mods = (SinqHM_gbl.h \
-		    SinqHM_def.h \
-		    vmio10_def.h \
-		    SinqHM_srv_main.c \
-		    SinqHM_srv_routines.c \
-		    SinqHM_srv_filler.c \
-		    SinqHM_srv_server.c)
-
-	if (("$3" == "") || ("$3" == "all")) goto SinqHM_srv_all
-
-	foreach module ($Mods)
-	  if ("$3" == "$module") goto SinqHM_srv_cpy
-	end
-
-	if (("$3" != "?") &&	\
-	    ("$3" != "h") &&	\
-	    ("$3" != "he") &&	\
-	    ("$3" != "hel") &&	\
-	    ("$3" != "help")) then
-	  printf '"%s" is not a recognised module of SinqHM_srv\!\n\n' "$3"
-	endif
-
-	printf 'To build SinqHM_srv, use the command:\n'
-	printf '\n'
-	printf '      bld <instr> SinqHM_srv [module]\n'
-	printf '\n'
-	printf 'Valid instruments are:\n'
-	printf '\n'
-	printf '      %s\n' "$Insts"
-	printf '\n'
-	printf 'Valid modules are:\n'
-	printf '\n'
-	foreach module ($Mods)
-	  printf '      %s\n' "$module"
-	end
-	printf '\n'
-	exit
-#----------------------------------------------------------------------------
- SinqHM_srv_cpy:
-#--------------
-	echo "   Copying $3 ..."
-	rcp -p  "${src}$3" ./$3
-
-	if ("$3" == "SinqHM_gbl.h")		goto SinqHM_srv_compile_all
-	if ("$3" == "SinqHM_def.h")		goto SinqHM_srv_compile_all
-	if ("$3" == "vmio10_def.h")		goto SinqHM_srv_compile_all
-
-	echo "   Cpy Compiling $3 ..."
-	ccvx $defn $3
-	goto SinqHM_srv_link
-
- SinqHM_srv_all:
-#--------------
-	echo " "
-	echo "Building SinqHM_srv ..."
-	echo "   Copying header files ..."
-	  rcp -p "${src}SinqHM_gbl.h"	./SinqHM_gbl.h
-	  rcp -p "${src}SinqHM_def.h"	./SinqHM_def.h
-	  rcp -p "${src}vmio10_def.h"	./vmio10_def.h
-	echo "   Copying source files ..."
-	  rcp -p "${src}SinqHM_srv_main.c"	./SinqHM_srv_main.c
-	  rcp -p "${src}SinqHM_srv_routines.c"	./SinqHM_srv_routines.c
-	  rcp -p "${src}SinqHM_srv_filler.c"	./SinqHM_srv_filler.c
-	  rcp -p "${src}SinqHM_srv_server.c"	./SinqHM_srv_server.c
-
- SinqHM_srv_compile_all:
-#----------------------
-	echo "   Compiling SinqHM_srv_main.c ..."
-		ccvx $defn -o SinqHM_srv_main.o SinqHM_srv_main.c
-	echo "   Compiling SinqHM_srv_routines.c ..."
-		ccvx $defn -o SinqHM_srv_routines.o SinqHM_srv_routines.c
-	echo "   Compiling SinqHM_srv_filler.c ..."
-		ccvx $defn -o SinqHM_srv_filler.o SinqHM_srv_filler.c
-	echo "   Compiling SinqHM_srv_server.c ..."
-		ccvx $defn -o SinqHM_srv_server.o SinqHM_srv_server.c
-
- SinqHM_srv_link:
-#---------------
-	echo "   Linking ..."
-		ldppc -o SinqHM_srv.o -r	\
-				SinqHM_srv_main.o SinqHM_srv_routines.o \
-				SinqHM_srv_filler.o SinqHM_srv_server.o
-	echo "   Done. Result is $cwd/SinqHM_srv.o"
-	if ("$2" != "all") exit
-#---------------------------------------------------------------------------
- lwl_server:
-#==========
-	echo " "
-	echo "Building lwl_server ..."
-	echo "   Copying header files ..."
-		rcp -p "${src}vmio10_def.h" ./vmio10_def.h
-	echo "   Copying source files ..." 
-		rcp -p "${src}lwl_server.c" ./lwl_server.c
-	echo "   Compiling lwl_server.c ..."
-		ccvx $defn -o lwl_server.o lwl_server.c
-	echo "   Done. Result is $cwd/lwl_server.o"
-	if ("$2" != "all") exit
-#---------------------------------------------------------------------------
- SinqHM_bootParamsConfig:
-#=======================
-	echo " "
-	echo "Building SinqHM_bootParamsConfig ..."
-	echo "   Copying header files ..."
-		rcp -p	"${src}SinqHM_def.h" ./SinqHM_def.h
-	echo "   Copying source files ..."
-		rcp -p "${src}SinqHM_bootParamsConfig.c" \
-			./SinqHM_bootParamsConfig.c
-	echo "   Compiling SinqHM_bootParamsConfig.c ..."
-		ccvx $defn -I${WIND_BASE}/target/config/all \
-			-o SinqHM_bootParamsConfig.o SinqHM_bootParamsConfig.c
-	echo "   Done. Result is $cwd/SinqHM_bootParamsConfig.o"
-	if ("$2" != "all") exit
-#---------------------------------------------------------------------------
- SinqHM_bootUtil:
-#===============
-	echo " "
-	echo "Building SinqHM_bootUtil ..."
-	echo "   Copying header file ..."
-		rcp -p	"${src}SinqHM_def.h" ./SinqHM_def.h
-	echo "   Copying source file ..."
-		rcp -p "${src}SinqHM_bootUtil.c" \
-			./SinqHM_bootUtil.c
-	echo "   Compiling SinqHM_bootUtil.c ..."
-		ccvx $defn -I${WIND_BASE}/target/config/all \
-	-o SinqHM_bootUtil.o SinqHM_bootUtil.c
-	echo "   Done. Result is $cwd/SinqHM_bootUtil.o"
-	if ("$2" != "all") exit
-#---------------------------------------------------------------------------
- FOCUS_srv:
-#==========
-	if ($instr != "FOCUS") goto FOCUS_srv_skp
-	  set Mods = ( FOCUS_gbl.h \
-		    SinqHM_def.h \
-		    FOCUS_srv_main.c )
-
-	  if (("$3" == "") || ("$3" == "all")) goto FOCUS_srv_all
-
-	  foreach module ( $Mods )
-	    if ("$3" == "$module") goto FOCUS_srv_cpy
-	  end
-
-	  if (("$3" != "?") &&	\
-	      ("$3" != "h") &&	\
-	      ("$3" != "he") &&	\
-	      ("$3" != "hel") &&	\
-	      ("$3" != "help")) then
-	    printf '"%s" is not a recognised module of FOCUS_srv\!\n\n' "$3"
-	  endif
-
-	  printf 'To build FOCUS_srv, use the command:\n'
-	  printf '\n'
-	  printf '      bld <instr> FOCUS_srv [module]\n'
-	  printf '\n'
-	  printf 'Valid instruments are:\n'
-	  printf '\n'
-	  printf '      %s\n' "focus"
-	  printf '\n'
-	  printf 'Valid modules are:\n'
-	  printf '\n'
-	  foreach module ($Mods)
-	    printf '      %s\n' "$module"
-	  end
-	  printf '\n'
-	  exit
-#----------------------------------------------------------------------------
- FOCUS_srv_cpy:
-#--------------
-	echo "   Copying $3 ..."
-	rcp -p  "${src}$3" ./$3
-
-	if ("$3" == "FOCUS_gbl.h")		goto FOCUS_srv_compile_all
-	if ("$3" == "SinqHM_def.h")		goto FOCUS_srv_compile_all
-
-	echo "   Compiling $3 ..."
-	ccvx $defn $3
-	goto FOCUS_srv_link
-
- FOCUS_srv_all:
-#--------------
-	echo " "
-	echo "Building FOCUS_srv ..."
-	echo "   Copying header files ..."
-	  rcp -p "${src}FOCUS_gbl.h"	./FOCUS_gbl.h
-	  rcp -p "${src}SinqHM_def.h"	./SinqHM_def.h
-	echo "   Copying source files ..."
-	  rcp -p "${src}FOCUS_srv_main.c"	./FOCUS_srv_main.c
-
- FOCUS_srv_compile_all:
-#----------------------
-	echo "   Compiling FOCUS_srv_main.c ..."
-		ccvx $defn FOCUS_srv_main.c
-
- FOCUS_srv_link:
-#---------------
-	echo "   Linking ..."
-		ldppc -o FOCUS_srv.o -r	\
-				FOCUS_srv_main.o
-	echo "   Done. Result is $cwd/FOCUS_srv.o"
- FOCUS_srv_skp:
-#-------------
-	if ("$2" != "all") exit
-#---------------------------------------------------------------------------
- auto:
-#====
-	set dflt = "$cwd"
-	cd $WIND_BASE/target/config/men_824x_ali
-	echo " "
-	echo "Default directory changed to:"
-	echo "            $cwd"
-	printf "\n\n==================================================\n"
-	printf \
-	  "\n\nBuilding vxWorks_auto system image for $instr Instrument ...\n\n"
-	touch config.h		# Force a complete re-compilation
-
-	set mods = (	$dflt/SinqHM_srv.o \
-			$dflt/lwl_server.o \
-			$dflt/SinqHM_bootParamsConfig.o \
-			$dflt/SinqHM_bootUtil.o	)
-	if ($instr == FOCUS) set mods = ( $mods $dflt/FOCUS_srv.o )
-
-	make 	ADDED_CFLAGS=" -DSINQHM_SPAWN=1" 	\
-		ADDED_MODULES="$mods"
- 			
-	mv vxWorks     vxWorks_auto
-	mv vxWorks.sym vxWorks.sym_auto
-	cp -p vxWorks_auto      $dflt/vxWorks_auto
-	cp -p vxWorks.sym_auto  $dflt/vxWorks.sym
-	cd $dflt
-	echo "   Done. Result is $dflt/vxWorks_auto"
-	exit
-#------------------------------------------------------------------ End of bld
diff --git a/sinqhm/hist_mem_notes.tex b/sinqhm/hist_mem_notes.tex
deleted file mode 100755
index edefe142..00000000
--- a/sinqhm/hist_mem_notes.tex
+++ /dev/null
@@ -1,1572 +0,0 @@
-%	TAS_SRC:[PSI.NOTES]HIST_MEM_NOTES.TEX	- Ident 1A05
-%	====================================
-%%
-%%====================================================================
-\documentclass[openbib,a4paper,twoside,12pt]{article}
-\usepackage{array}
-\usepackage{epsfig}
-%
- \newcommand{\nc}{\newcommand}
- \newcommand{\rc}{\renewcommand}
-%
- \nc{\myident}{1A05}
- \nc{\mydate}{26th October 2000}
-%
-%%====================================================================
-%%
-%%  +--------------------------------------------------------------+
-%%  |			Paul Scherrer Institute			   |
-%%  |                       SINQ Division			   |
-%%  |                                                              |
-%%  | This software may be used freely by non-profit organizations.|
-%%  | It may be copied provided that the name of P.S.I. and of the |
-%%  | author is included. Neither P.S.I. nor the author assume any |
-%%  | responsibility for the use of this software outside of P.S.I.|
-%%  +--------------------------------------------------------------+
-%%
-%%  Project  . . . . . . . . . . : SINQ
-%%  Brief Document Title . . . . : Notes for the SinqHM Histogram Memory
-%%  Author . . . . . . . . . . . : D.Maden
-%%  Date of creation . . . . . . : 4-Nov-1997
-%%
-%%  Updates:
-%%	    4-Nov-1997 DM.	Initial Latex Version.
-%%	   15-Dec-1998 DM.	Expand.
-%%	   18-Jun-1999 DM.	Bring up to date.
-%%	   18-Nov-1999 DM.	Bring up to date.
-%%====================================================================
-%%  To process this file under Digital Unix
-%%
-%%	rcp maden@lnsa04:sinqhm/hist_mem_notes.tex .
-%%	rcp maden@lnsa04:sinqhm/psi_logo.ps .
-%%	rcp maden@lnsa04:sinqhm/sinq_logo.ps .
-%%	latex hist_mem_notes
-%%	dvips -o hist_mem_notes.ps hist_mem_notes
-%%	vpp -device=ps800 -form=duplex hist_mem_notes.ps
-%%====================================================================
-%%
- \addtolength{\textheight}{40mm}
- \setlength{\textwidth}{160mm}
- \setlength{\oddsidemargin}{8mm}
- \setlength{\evensidemargin}{-10mm}
- \setlength{\topmargin}{-20mm}
-%
- \setcounter{tocdepth}{2}
-%
- \parskip 1.0ex plus 5pt minus 5pt      % Space between paragraphs.
-%%\setlength{\parindent}{0em}
-%
-%%%\rc{\thepage}{\arabic{page}%
-%%%			\setcounter{footnote}{0}}
- \rc{\topfraction}{0.9}
- \rc{\bottomfraction}{0.9}
- \nc{\botfigrule}{\vspace*{-3pt}%
-	\hspace*{\fill}\rule{0.75\columnwidth}{0.4pt}\hspace*{\fill}%
-	\vspace*{-2.6pt}}
- \nc{\topfigrule}{\vspace*{-3pt}%
-	\hspace*{\fill}\rule{0.75\columnwidth}{0.4pt}\hspace*{\fill}%
-	\vspace*{-2.6pt}}
-%
- \nc{\PreserveBackslash}[1]{\let\temp=\\#1\let\\=\temp}
- \let\PBS=\PreserveBackslash	% shorthand
-%
-%		Define "\usc" to get a proper underscore!!
- \nc{\usc}{\protect\makebox[0.6em]{\protect\rule{0.5em}{0.1ex}}}
-%
- \nc{\camac}{\protect\makebox[4.1em][l]{CAMAC}}
- \nc{\musr}{\protect\makebox[2.1em][l]{$\mu$SR}}
-%
- \nc{\myfile}{tas{\usc}src:[psi.notes]hist{\usc}mem{\usc}notes.tex}
-%
- \rc{\sf}[1]{\textsf{#1}}
- \rc{\bf}[1]{\textbf{#1}}
- \nc{\sfbf}[1]{\textsf{\textbf{#1}}}
-%
- \setlength{\unitlength}{1.0mm}
-%
- \title{SinqHM Histogram Memory \\ Software Support Notes}
- \author{U. Greuter, D. Maden and P. Rasmussen}
- \date{\mydate}
-%
- \pagestyle{empty}
- \begin{document}
-      \begin{center}\begin{picture}(160,242)(16,5)
-       \put(0,0){
-         \linethickness{0.80mm}
-         \put(0, 0){\framebox(180,255){~}}
-			% Horizontal lines - bottom to top
-         \linethickness{0.40mm}
-         \put(0,  12){\line(1,0){180}}
-         \linethickness{0.30mm}
-         \multiput(124, 17)(0,5){8}{\line(1,0){56}}
-         \linethickness{0.60mm}
-         \put(124, 63){\line(1,0){56}}
-         \put(124, 57){\line(1,0){56}}
-         \linethickness{0.40mm}
-         \put(0,  76){\line(1,0){180}}
-         \put(0,  98){\line(1,0){180}}
-         \put(0, 154){\line(1,0){180}}
-         \put(0, 184){\line(1,0){180}}
-         \put(0, 206){\line(1,0){180}}
-         \put(0, 218){\line(1,0){180}}
-         \linethickness{0.80mm}
-         \put(0, 230){\line(1,0){180}}
-			% Vertical lines - left to right
-         \linethickness{0.40mm}
-         \put( 40, 230){\line(0,1){25}}
-         \put( 60, 206){\line(0,1){12}}
-	 \put( 90,   0){\line(0,1){12}}
-         \put(120, 184){\line(0,1){46}}
-	 \put(140, 218){\line(0,1){37}}
-			%
-	 \linethickness{0.40mm}
-         \put(124,  12){\line(0,1){64}}
-         \put(138,  12){\line(0,1){51}}
-         \linethickness{0.60mm}
-         \put(152,  12){\line(0,1){51}}
-         \linethickness{0.40mm}
-         \put(166,  12){\line(0,1){51}}
-	 %
-         \put(50, 232){\shortstack{%
-		{\huge Paul Scherrer Institut} \\
-		{W\"{u}renlingen und Villigen} \\
-		{\large CH-5232 Villigen PSI} \\[1.0ex]
-		{\tiny{\em (N\"{u}r f\"{u}r internen Gebrauch)}}}}
-         \put(160, 250){\makebox(0,0){\Large Projekt}}
-         \put(  2, 228){\makebox(0,0)[l]{\tiny Klassifizierung:}}
-         \put(122, 228){\makebox(0,0)[l]{\tiny Kurzzeichen:}}
-         \put(142, 228){\makebox(0,0)[l]{\tiny PSP-Nr:}}
-         \put(  2, 216){\makebox(0,0)[l]{\tiny Ersatz f\"{u}r:}}
-         \put( 62, 216){\makebox(0,0)[l]{\tiny Erstellungs/\"{A}nderungsdatum:}}
-         \put(122, 216){\makebox(0,0)[l]{\tiny Doku-Nr:}}
-	 \put(  2, 204){\makebox(0,0)[l]{\tiny Federf. Autor:}}
-	 \put(  2, 201){\makebox(0,0)[l]{\tiny Co-autoren:}}
-         \put(122, 204){\makebox(0,0)[l]{\tiny Unterschrift Federf. Autor:}}
-         \put(  2, 182){\makebox(0,0)[l]{\tiny Titel:}}
-         \put(  2, 152){\makebox(0,0)[l]{\tiny Kurztext bzw. Inhalt:}}
-         \put(110, 152){\makebox(0,0)[l]{\tiny Doppelseitig:}}
-		\put(128, 152){\makebox(0,0)[l]{\tiny Ja}}
-		\put(135, 152){\makebox(0,0)[l]{$\bullet$}}
-		\put(128, 149){\makebox(0,0)[l]{\tiny Nein}}
-		\put(135, 149){\makebox(0,0)[l]{$\circ$}}
-         \put(145, 152){\makebox(0,0)[l]{\tiny Seitenzahl total:}}
-         \put(  2,  96){\makebox(0,0)[l]{\tiny Schlagw\"{o}rter/Suchkriterien:}}
-         \put(  2,  74){\makebox(0,0)[l]{\tiny Verteiler:}}
-         \put(126,  74){\makebox(0,0)[l]{\tiny Erstellereigene Doku-Nr:}}
-         \put(131,  60){\makebox(0,0){PSP}} \put(145, 60){\makebox(0,0){Visum}}
-         \put(159,  60){\makebox(0,0){PSP}} \put(173, 60){\makebox(0,0){Visum}}
-		%
-	 \put(131,54.5){\makebox(0,0){\tiny 8}}
-	 \put(131,49.5){\makebox(0,0){\tiny 82}}
-	 \put(131,44.5){\makebox(0,0){\tiny 83}}
-	 \put(131,39.5){\makebox(0,0){\tiny 84}}
-	 \put(131,34.5){\makebox(0,0){\tiny 85}}
-	 \put(131,29.5){\makebox(0,0){\tiny 86}}
-	 \put(131,24.5){\makebox(0,0){\tiny 89}}
-		%
-	 \put(159,54.5){\makebox(0,0){\tiny 811}}
-	 \put(159,49.5){\makebox(0,0){\tiny 812}}
-	 \put(159,44.5){\makebox(0,0){\tiny 813}}
-	 \put(159,39.5){\makebox(0,0){\tiny 814}}
-	 \put(159,34.5){\makebox(0,0){\tiny 815}}
-	 \put(159,29.5){\makebox(0,0){\tiny 816}}
-	 \put(159,24.5){\makebox(0,0){\tiny 817}}
-		%
-         \put(  2,  10){\makebox(0,0)[l]{\tiny Datum:}}
-         \put( 47,  10){\makebox(0,0)[l]{\tiny Visum FBV:}}
-         \put( 92,  10){\makebox(0,0)[l]{\tiny Datum:}}
-         \put(137,  10){\makebox(0,0)[l]{\tiny Visum PL:}}
-%
-	 \put(2,230){\epsfig{bbllx=93,bblly=697,bburx=207,bbury=754,%
-		file=psi_logo.ps,%
-		height=20mm,clip=}}
-%
-	 \put(150,232){\epsfig{bbllx=122,bblly=700,bburx=201,bbury=740,%
-		file=sinq_logo.ps,%
-		height=14mm,clip=}}
-%
-	 \put( 25,223){\makebox(0,0)[l]{Basisunterlage}}
-	 \put(130,223){\makebox(0,0){FI}}
-	 \put(160,223){\makebox(0,0){89}}
-	 \put( 90,210){\makebox(0,0){\mydate}}
-	 \put(150,210){\makebox(0,0){891/MD36-???-}}
-	 \put( 25,195){\makebox(0,0)[l]{\shortstack[l]{%
-		U. Greuter	\\
-		D. Maden	\\
-		P. Rasmussen}}}
-	 \put( 25,175){\makebox(0,0)[l]{Software Support Notes for the
-					SINQ Histogram Memory, SinqHM}}
-	 \put(170,152){\makebox(0,0){25}}
-	 \put( 25,135){\shortstack[l]{%
-		This note provides software support information \\
-		for the SINQ histogramming memories}}
-	 \put( 25, 86){\shortstack[l]{%
-		\tiny HISTOGRAM MEMORY \\
-		\tiny SOFTWARE NOTES \\
-		\tiny SINQHM}}
-	 \put( 25, 60){\shortstack[l]{%
-		\tiny U. Greuter, WMHA/C15 \\
-		\tiny D. Maden, WHGA/247 \\
-		\tiny P. Rasmussen, WMHA/C28 \\
-		\tiny SINQ-Sekretariat, WHGA/249}}
-	 \put(150, 69){\makebox(0,0){\myident}}
-       }
-      \end{picture}\end{center}
- \cleardoublepage
-%
- \setcounter{page}{1}
-%
- \maketitle
-%
- \thispagestyle{myheadings}
- \rc{\thepage}{}
- \markboth%
-   {\rm \roman{page}\hspace*{-8mm}\underline{\hspace*{120mm}SinqHM
-				Notes Vn \myident}}%
-   {\underline{\rm SinqHM Notes Vn \myident \hspace*{21mm} File = \myfile}}
-%
- \begin{abstract}
-	\noindent Software support notes for the SINQ histogramming memories.
- \end{abstract}
-%
- \tableofcontents
-%
- \cleardoublepage
- \rc{\thepage}{\arabic{page}}
-%
- \pagestyle{myheadings}
- \markboth{\hspace*{-8mm} \underline{\rm \hspace*{117mm} SinqHM
-				Notes Vn \myident}}%
-	 {\underline{\rm SinqHM Notes Vn \myident
-				\hspace*{118mm}} \hspace*{-8mm}}
-%
-    \section{Introduction}
-%   ======================
-%
-      This document provides the support programmer
-      with information on setting up and using
-      the \mbox{SinqHM} histogramming memories which have been developed by
-      Bereichs B8 and ASQ for SINQ experiments. Details of the TCP/IP interface
-      with the SinqHM software are given elsewhere \cite{Hist-Mem-Spec}.
-
-      The histogram memory is based on a VME Power-PC single board computer
-      (MVME-1603). The processor is interfaced to an instrument's detector via a
-      {\em PMC\/}\footnote{PMC = PCI local bus Mezzanine Card.} piggy-back card.
-      Control and read-out of the SinqHM histogramming software are via the
-      processor's Ethernet interface.
-
-      Most of the examples in these notes refer to the DMC instrument. For
-      the other instruments using a histogram memory, e.g. SANS, FOCUS and
-      HRPT), simply substitute the capitalised name of the instrument for
-      {\em DMC\/} wherever it occurs and replace the histogram memory name,
-      {\em lnse01}, accordingly.
-%
-    \section{Power-PC Hardware Setup}
-%   =================================
-%
-    \label{PPC-HW-Setup}
-%
-      The MVME-1603\footnote{The MVME-1603 consists of an MVME1600-001 base
-      board which has a plug-on processor/memory module. This is why the front
-      of the VME module is labelled MVME1600-001 rather than MVME-1603!}
-      Power-PC module is delivered with two factory installed EPROMs designed
-      for OS9 operation. These must be removed and a single VxWorks boot EPROM
-      must be installed in the upper EPROM socket (XU1). It is also
-      necessary\footnote{Some of these settings may not be actually {\em
-      necessary}. They are, however, known to be sufficient for the operation of
-      SinqHM.} to set the on-board jumpers as follows:
-       \begin{itemize}
-	\item[J7:] In to enable on-board SCSI termination.
-	\item[J8:] All 8 jumpers in to set the software readable header to 0x00.
-	\item[J9:] Jumper between pins 1 and 2 to select ``Auto System
-		Controller''.
-	\item[J10:] Jumper between pins 2 and 3 to select ``Drive TXC'' on
-		Serial Port 3.
-	\item[J13:] Jumper between pins 2 and 3 to select ``Drive TXC'' on
-		Serial Port 4.
-       \end{itemize}
-%
-      The location of these jumpers is given in Reference~\cite{MVME-1603}. The
-      PMC fibre-optic interface card must be plugged into the appropriate
-      sockets of the MVME1600-001 base board.
-%
-    \section{Power-PC Installation}
-%   ===============================
-%
-    \label{PPC-Install}
-%
-      In normal operation of SinqHM, the MVME-1603 only requires power from the
-      VME crate since it acquires data via the PMC and builds the histograms in
-      its internal memory. The MVME-1603 can, in this case, simply be plugged
-      into any slot of a double-height VME crate.
-
-      If, however, SinqHM will require VME access, e.g. to implement a VME bus
-      shared memory network\footnote{FOCUS uses a VME bus network between its 3
-      MVME-1603 
-      modules.}, to generate simulated
-      data via a histogram memory test generator or to generate timing signals
-      via a VMIO10 I/O module, then the setup of the VME crate is important. In
-      this case, it is important that the VME bus-grant (BG) and
-      interrupt-acknowledge (IACK) links are correctly configured.
-
-      The simplest way to do this is to place all modules which require to act
-      as VME bus masters in adjacent slots to the left of the crate, starting
-      in Slot~1. If any slots are empty, the 5 jumpers (BG1, BG2, BG3, BG4 and
-      IACK) of the empty slot must be bridged. So far at SINQ, this is only
-      necessary on the FOCUS instrument.
-
-      For all instruments except FOCUS, the MVME-1603 is located in an
-      arbitrary slot and no other VME master is present in the crate.
-
-      On FOCUS, there are 3 MVME-1603 modules in the VME
-      crate. Since a MVME-1603 with its PMC piggy-back requires 2 VME slots,
-      these modules are located in slots 1, 3 and 5. The BG and IACK signals
-      are bridged with 10 jumpers in slots 2 and 4. On the WES type VME crates
-      in use at SINQ, these jumpers are located to the right of the so-called
-      J1 connector on the front of the crate's backplane. The J1 connector is
-      the upper of the 2 connectors present at each slot. Note that there are 2
-      columns of jumpers between slots 2 and 3. The right-hand column contains
-      the jumpers which are to be bridged.
-
-      Having installed the MVME-1603 module(s) in the front of the crate, it is
-      then necessary to install a corresponding {\em MVME-760-001 Transition
-      Module\/} in the rear of the crate for each MVME-1603. The connection is
-      to the so-called J2 (lower) connector via a ribbon cable. The transition
-      module provides connectors for the COM1, COM2 and Ethernet ports of the
-      MVME-1603.
-
-      The COM1 and COM2 ports are 9-pin male D-type connectors, common on PCs.
-      The Ethernet port has both an AUI (15-pin) and a 10BaseT Ethernet
-      connector, either of which may be used without changing any jumpers.
-
-      There are 2 jumpers on the transition module but their settings are
-      not relevant for COM1, COM2 or Ethernet operation. The important point
-      to remember is that, if the MVME-1603 is moved to a different slot,
-      then the ribbon cable connection to the rear J2 connector must be moved
-      as well.
-
-      For normal operation of the SinqHM software, there is no need to connect a
-      `dumb' terminal to the COM1 port. However, for set-up and debugging
-      operations,
-      such a connection can be extremely valuable. If possible, it is even
-      better if the COM1 port can be connected to the port of a terminal server.
-      One can then use a {\em telnet\/} session from a remote computer to
-      emulate the `dumb' terminal. In this case, it is usually necessary to
-      issue the following two {\em telnet\/} commands after the {\em telnet\/}
-      connection has been established: \\[1.0ex]
-%
-	\hspace*{15mm}\verb#telnet> mode character# \\
-	\hspace*{15mm}\verb#telnet> set binary# \\[1.0ex]
-%
-      In order to obtain the \verb#telnet># prompt, it is usually necessary
-      to hit \verb#<Ctrl-]>#. Alternatively, this setup can be automated by
-      means of entries in the {\em .telnetrc} file. See the {\em telnetrc}
-      manual page for more information.
-
-      Given such a connection, the
-      VxWorks operating system may be rebooted by simply hitting
-      \verb#<Ctrl-X># on the terminal keyboard. Alternatively, the
-      recessed {\em reset\/} button (RST) on the MVME-1603 or the white {\em
-      Manual System Reset} button on the front of the VME crate may be pressed.
-%
-    \section{Power-PC Software Setup}
-%   =================================
-%
-    \label{PPC-Soft-Setup}
-%
-      On powering up an MVME-1603 which has been correctly configured for
-      SinqHM, the following is typical of the messages which should appear on a
-      dumb terminal connected to COM1:
-      \vspace*{-3ex}
-      \begin{verbatim}
-                             VxWorks System Boot
-
-   Copyright 1984-1996  Wind River Systems, Inc.
-
-   CPU: Motorola MVME1600 - PowerPC 603e
-   Version: 5.3
-   BSP version: 1.1/3
-   Creation date: Aug 23 1996, 14:30:10
-
-   Press any key to stop auto-boot...
-    0                                             <== See Note 1
-   auto-booting...
-
-   boot device     : dc
-   processor num   : 0
-   host name       : pss123
-   file name       : /home/pss123/aco/sinqhm/wind/SinqHM/DMC/vxWorks_auto
-   inet on e'net   : 129.129.62.101:ffff0000
-   host inet (h)   : 129.129.40.123
-   user (u)        : sinqhm
-   flags (f)       : 0x8
-   target name     : lnse01
-   other (o)       : sp=bootUtil/sp=SinqHM/cfg=HM_DIG,400  <== See Note 2
-
-   Attaching network interface dc0... done.
-   Attaching network interface lo0... done.
-
-   Loading... 598800
-   Starting at 0x100000...
-
-   Attaching network interface dc0... done.
-   Attaching network interface lo0... done.
-
-                    VxWorks
-
-   Copyright 1984-1996  Wind River Systems, Inc.
-
-               CPU: Motorola MVME1600 - PowerPC 603e
-           VxWorks: 5.3
-       BSP version: 1.1/3
-     Creation date: Nov 11 1999 14:55:43
-               WDB: Ready. \end{verbatim}
- \newpage
-      \begin{verbatim}
-   Spawning SinqHM_bootParamsConfig ...                  <== See Note 3
-
-   Parsing the "other" field defined in the boot line    <== See Note 4
-         Other = "sp=bootUtil/sp=SinqHM/cfg=HM_DIG,400"
-
-   Spawning bootUtil ..                                  <== See Note 5
-       TCP/IP port = 2300.
-   bootUtil: Started -- program ident = "1A01".
-   bootUtil: waiting for connections on Port 2300
-
-   Spawning SinqHM_srv ..
-       TCP/IP port = 2400.
-       No timing signal generation requested.
-   Timing signal generation via VMIO10 module disabled.
-   hmRoot2400: Program  Ident = "1D01". Started on lnse01 ...
-   hmRoot2400: Protocol Ident = "V03A"
-   hmRoot2400: Instrument = "DMC"
-   hmRoot2400: Lwl_hdr_daq_mask = 0x20000000 NRL         <== See Note 6
-   hmRoot2400: Lwl_hdr_daq_soll = 0x00000000
-
-   Configuring SinqHM_srv ...
-       Histogramming mode           = SQHM__HM_DIG
-       Number of bins per histogram = 400
-\end{verbatim}
-
-	\vspace*{-3.5ex}\hspace*{15mm} \vdots \vspace*{-3.5ex}
-	\begin{verbatim}
-   Connecting to SinqHM_srv via TCP/IP port 2400 ...
-   hmRoot2400: Connected to Node 129.129.62.101, Port 1024.
-   hmRoot2400: Configure ..                              <== See Note 7
-       Histogramming mode is "SQHM__HM_DIG"
-       Number of histograms   =     1
-       First bin              =     0
-       Number of bins         =   400
-       Bytes per bin          =     4
-       Bin compression factor =     1
-       Bin-overflow action is "Ignore"
-       Histogram base address = 0x007fc710
-       SQHM__HM_DIG mode configured.
-       .. configuration complete, hmFill2400 has been started.
-
-   SinqHM_srv has been configured.
-
-   Taking data in Digitised Histogramming Mode
-     #-Events     #-Skip      #-TSI  Dead-Time Sync-Status
-            0          0          0          0
-\end{verbatim}%
-      \hspace*{-5mm}\textbf{Notes:}
-      \begin{enumerate}
-	\item By hitting any key at this point, the boot procedure can be
-		interrupted and the boot program enters interactive mode which
-		allows one to inspect and modify the boot parameters as
-		described below.
-	\item This {\em other\/} information specifies the default configuration
-		information for SinqHM. See Note 4 and Appendix~\ref{other}.
-	\item The VxWorks system image, selected by the {\em file name} boot
-		parameter,
-		includes the SinqHM software and code for automatically starting
-		up SinqHM once the boot procedure has completed. This is the
-		first message indicating the start-up of the SinqHM software.
-		More information on available VxWorks system images is given in
-		Section~\ref{VxWorks-os}.
-	\item This is where the {\em other\/} boot parameter gets parsed in
-		order to configure SinqHM automatically.
-	\item {\em bootUtil\/} is a TCP/IP server program which allows a remote
-		client to display and modify the MVME-1603 boot configuration
-		over the network rather than via 
-		a `dumb' terminal connection to COM1. {\em bootUtil\/}
-		is not needed for normal SinqHM operation.
-	\item This {\em Lwl\/} information is instrument dependent. It indicates
-		the signals which must be present at the multi-detector
-		interface for an event to be accepted and histogrammed.
-	\item This and the following messages are generated by SinqHM{\usc}srv
-		in response to a configure request.
-      \end{enumerate}
-      If one interrupts the VxWorks boot procedure as described in Note 1, one
-      obtains the VxWorks boot prompt. Issuing a \sfbf{p} command lists the
-      settings of the boot parameters, e.g.
-      \begin{verbatim}
-    [VxWorks Boot]: p
-
-   boot device   : dc
-   processor num : 0
-   host name     : pss123
-   file name     : /home/pss123/aco/sinqhm/wind/SinqHM/DMC/vxWorks_auto
-   inet on e'net : 129.129.62.101:ffff0000
-   host inet (h) : 129.129.40.123
-   user (u)      : sinqhm
-   flags (f)     : 0x8
-   target name   : lnse01
-   other (o)     : sp=SinqHM/cfg=HM_DIG,400\end{verbatim}%
-%
-      The boot parameters may be changed by issuing a \sfbf{c} command and
-      following the dialogue, e.g.
-      \begin{verbatim}
-    [VxWorks Boot]: c
-
-    '.' = clear field;  '-' = go to previous field;  ^D = quit
-
-   boot device   : dc
-   processor num : 0
-   host name     : pss123
-   file name     : /home/pss123/aco/sinqhm/wind/SinqHM/DMC/vxWorks_auto
-   inet on e'net : 129.129.62.101:ffff0000
-   inet on b'pl  :
-   host inet (h) : 129.129.40.123
-   gateway inet  :
-   user (u)      : sinqhm
-   ftp password  (blank = use rsh):
-   flags (f)     : 0x8
-   target name   : lnse01
-   startup scr   :
-   other (o)     : sp=boo..400 sp=SinqHM/cfg=HM_DIG,512\end{verbatim}%
-%
-      In the above dialogue, all prompts were answered with a
-      \verb#<Return># except for the {\em other\/} prompt. Here, the
-      default histogram size was changed to 512 bins and the
-      spawning of the {\em bootUtil\/} utility was removed.
-
-      Having changed the boot parameters, the VxWorks system can be booted by
-      hitting \verb#<Ctrl-X>#.
-%
-    \section{VxWorks Host Computer Setup}
-%   =====================================
-%
-    \label{VxWorks-Host-Setup}
-%
-      The VxWorks operating system is booted from a file belonging to user {\em
-      sinqhm\/} on computer {\em pss123.psi.ch}. There are 2 files on this
-      computer which must be set up before the target can be booted.
-
-%
-    \subsection{The {\em /etc/hosts\/} File}
-%   ========================================
-%
-    \label{etc-hosts}
-%
-      All target hosts must be entered into the file: \\[1.0ex]
-%
-	\hspace*{15mm} \sfbf{/etc/hosts} \\[1.0ex]
-%
-      on computer {\em pss123.psi.ch}. The following are some examples of
-      entries in this file:\\[1.0ex]
-      \texttt{%
-       \hspace*{15mm}129.129.62.101~~lnse01\\
-       \hspace*{15mm}129.129.62.102~~lnse02\\
-       \hspace*{15mm}129.129.62.103~~lnse03\\
-       \hspace*{15mm}129.129.62.104~~lnse04\\
-       \hspace*{15mm}\\
-       \hspace*{15mm}192.168.11.4~~~~lnse04.vme~~~~}\verb#\#\texttt{\\
-       \hspace*{15mm}192.168.11.5~~~~lnse05.vme~~~~~>} ~~ See
-						Section~\ref{FOCUS-setup}\\
-      \texttt{%
-       \hspace*{15mm}192.168.11.6~~~~lnse06.vme~~~~/}\\[1.0ex]
-%
-      \hspace*{-5mm}\textbf{Note:} One needs {\em root\/} privilege to edit this
-      file.
-%
-    \subsection{The {\em .rhosts\/} File}
-%   =====================================
-%
-      All target hosts must also be entered into the proxy definition file:
-      \\[1.0ex]
-%
-	\hspace*{15mm} \sfbf{/home/pss123/aco/sinqhm/.rhosts} \\[1.0ex]
-%
-      on computer {\em pss123.psi.ch}. This is in the home directory of user
-      {\em sinqhm}. The following are some examples of entries in this
-      file:\\[1.0ex]
-      \texttt{%
-       \hspace*{15mm}lnse01~~sinqhm\\
-       \hspace*{15mm}lnse02~~sinqhm\\
-       \hspace*{15mm}lnse03~~sinqhm\\
-       \hspace*{15mm}\\
-       \hspace*{15mm}lnse04~~~~~~sinqhm~~}\verb#\#\texttt{\\
-       \hspace*{15mm}lnse04.vme~~sinqhm~~~}\verb#\#\texttt{\\
-       \hspace*{15mm}lnse05~~~~~~sinqhm~~~~}\verb#\# ~~ See
-						Section~\ref{FOCUS-setup}\\
-      \texttt{%
-       \hspace*{15mm}lnse05.vme~~sinqhm~~~~/\\
-       \hspace*{15mm}lnse06~~~~~~sinqhm~~~/\\
-       \hspace*{15mm}lnse06.vme~~sinqhm~~/}
-%
-  \subsection{Special Considerations for FOCUS}
-% =============================================
-%
-    \label{FOCUS-setup}
-      The FOCUS detector consists of 383 detectors connected to 3 histogram
-      memories in a single VME crate. Only one of the histogram memories is
-      connected to the PSI-wide Ethernet. Communication with the other 2
-      modules is via the VME bus and a so-called VME bus shared memory network.
-      The module
-      with the Ethernet connection acts as an Internet router from the PSI
-      Internet domain, 129.129.xxx.xxx, to the Class C network, 192.168.11.xxx,
-      which operates over the backplane.
-      This configuration requires special setup as described in this
-      section.
-
-      The network connections for FOCUS are as shown in the figure:
-      \begin{verbatim}
-  +----------------+                             +----------------+
-  |    pss123      |                             |    lnsa12      |
-  | 129.129.40.123 |                             | 129.129.56.231 |
-  +-------+--------+                             +-------+--------+
-          |                                              |
-          |                   Ethernet                   |
- ---------+--+-------------------------------------------+---------
-             |
-             |
-     +-------+--------+     +----------------+     +----------------+
-     | 129.129.62.104 |     |                |     |                |
-     |    lnse04      |     |  lnse05.vme    |     |  lnse06.vme    |
-     | 192.168.11.4   |     | 192.168.11.5   |     | 192.168.11.6   |
-     +-------+--------+     +-------+--------+     +-------+--------+
-             |                      |                      |
-             |                      |                      |
-        -----+----------------------+----------------------+---
-                                         VME
-      \end{verbatim}
-      It is necessary to declare that {\em lnse04} is the router for {\em
-      lnse05.vme} and {\em lnse06.vme} on both the VxWorks boot server, {\em
-      pss123}, and on the FOCUS host computer, {\em lnsa12}. This requires {\em
-      root} privilege. The details are described in the following two
-      sub-sections.
-
-  \subsubsection{Setup for FOCUS on {\em pss123}}
-% ===============================================
-%
-      One should first check that the Internet addresses for the 3 histogram 
-      memory modules are defined in the {\em /etc/hosts} file,
-      as shown in Sect.~\ref{etc-hosts}. The command:\\[1.0ex]
-%
-       \hspace*{15mm}\texttt{route~~add~~net~~192.168.11.0~~129.129.62.104~~1}
-		\\[1.0ex]
-%
-      will then set up the necessary routing. In order to set the
-      routing automatically whenever the computer is rebooted, it is
-      necessary to add a startup file to the Unix boot
-      procedure. According to the documentation, this is supposed to
-      be possible via the {\em /etc/gateways} file. Unfortunately, the 
-      author was unable to get this to work and therefore the
-      following, somewhat more complicated, method was necessary.
-
-      During the boot procedure, Unix proceeds through several phases
-      and, in each phase, a series of scripts is executed. The routing 
-      information must be added in Phase~2, after the {\em inet}
-      subsystem has been started. The scripts which are executed in
-      Phase~2 have names of the form:\\[1.0ex]
-%
-       \hspace*{15mm}\texttt{/etc/rc2.d/Snn*}\\[1.0ex]
-%
-      where {\em nn} is a number in the range 01 to 99. The scripts
-      are executed in numerical order. On the current {\em pss123}
-      system, the {\em inet} subsystem is started up in script {\em
-      S69inet}. The file:\\[1.0ex]
-%
-       \hspace*{15mm}\texttt{/etc/rc2.d/S69z-inet-D.Maden}\\[1.0ex]
-%
-      has therefore been created containing the command:\\[1.0ex]
-%
-       \hspace*{15mm}\texttt{/usr/sbin/route add net 192.168.11.0
-			129.129.62.104 1}\\[1.0ex]
-%
-      Because the file name is alphabetically after {\em S69inet},
-      this script is executed after the {\em inet} subsystem has been
-      started, as required.
-
-      In order to check that the route has been defined correctly, one 
-      may issue the command:\\[1.0ex]
-%
-       \hspace*{15mm}\texttt{netstat -r}\\[1.0ex]
-%
-      One should obtain output of the form:
-\begin{verbatim}
-   Routing Table:
-     Destination           Gateway           Flags  Ref   Use   Interface
-   -------------------- -------------------- ----- ----- ------ ---------
-   ...
-   192.168.11.0         lnse04                UG       0     84
-   ...
-\end{verbatim}
-%
-  \subsubsection{Setup for FOCUS on {\em lnsa12}}
-% ===============================================
-%
-      One should first check that the Internet addresses for the 3 histogram 
-      memory modules are defined in the {\em /etc/hosts} file,
-      as shown in Sect.~\ref{etc-hosts}. The command:\\[1.0ex]
-%
-       \hspace*{15mm}\texttt{route~~add~~-net~~192.168.11.0~~129.129.62.104}
-		\\[1.0ex]
-%
-      will then set up the necessary routing. In order to set the
-      routing automatically whenever the computer is rebooted, it is
-      necessary to add a startup file to the Unix boot
-      procedure. According to the documentation, this is supposed to
-      be possible via the {\em /etc/gateways} file. Unfortunately, the 
-      author was unable to get this to work and therefore the
-      following, somewhat more complicated, method was necessary.
-
-      During the boot procedure, Unix proceeds through several phases
-      and, in each phase, a series of scripts is executed. The routing 
-      information must be added in Phase~3, after the {\em inet}
-      subsystem has been started. The scripts which are executed in
-      Phase~3 have names of the form:\\[1.0ex]
-%
-       \hspace*{15mm}\texttt{/sbin/rc3.d/Snn*}\\[1.0ex]
-%
-      where {\em nn} is a number in the range 01 to 99. The scripts
-      are executed in numerical order. On the current {\em lnsa12}
-      system, the {\em inet} subsystem is started up in script {\em
-      S55inetd}. The file:\\[1.0ex]
-%
-       \hspace*{15mm}\texttt{/sbin/rc3.d/S55z-inetd-D.Maden}\\[1.0ex]
-%
-      has therefore been added to this directory containing the
-      command:\\[1.0ex]
-%
-       \hspace*{15mm}\texttt{/sbin/route add -net 192.168.11.0 129.129.62.104
-					 }\\[1.0ex]
-%
-      Because the file name is alphabetically after {\em S55inetd},
-      this script is executed after the {\em inet} subsystem has been
-      started, as required.
-
-      In order to check that the route has been defined correctly, one 
-      may issue the command:\\[1.0ex]
-%
-       \hspace*{15mm}\texttt{netstat -r}\\[1.0ex]
-%
-      One should obtain output of the form:
-\begin{verbatim}
-   Routing tables
-   Destination      Gateway            Flags     Refs     Use  Interface
-   Netmasks:
-   ...
-   192.168.11       lnse04             UGS         0      347  tu0
-   ...
-\end{verbatim}
-%
-    \section{SinqHM Software}
-%   =========================
-%
-    \label{SinqHM-Soft}
-%
-      The master copy of the SinqHM software resides on the computer
-      {\em lnsa15.psi.ch\/} as module {\em sinqhm} of a CVS\footnote{{\em
-      CVS\/} is a code management
-      system.} repository. A working copy of the current SinqHM software can
-      be obtained by logging in to the LNS CVS repository
-      (See~\cite{LNS-CVS}) and issuing the command:\\[1.0ex]
-%
-       \hspace*{15mm}\texttt{cvs export -D today sinqhm}\\[1.0ex]
-%
-      In order to compile and link SinqHM, it is necessary to use a computer
-      on which the VxWorks cross-development software has been installed.
-      This is {\em pss123.psi.ch\/} and the user account is {\em sinqhm},
-      whose home directory, \sf{\$HOME}, is: \\[1.0ex]
-%
-	\hspace*{15mm} /home/pss123/aco/sinqhm \\[1.0ex]
-%
-      The build procedure involves the copying of the
-      SinqHM source files from working copy to {\em pss123}, compiling and
-      linking them and then merging the resultant object files into a VxWorks
-      system image.
-
-      \noindent The main components of the software are:
-      \begin{itemize}
-	\item the VxWorks operating system image;
-	\item the SinqHM histogram memory server, {\em SinqHM{\usc}srv\/};
-	\item the SinqHM auto-configure utility, {\em
-		SinqHM{\usc}bootParamsConfig\/};
-	\item a fibre-optic test generator server, {\em lwl{\usc}server\/};
-	\item a boot-line configuration server, {\em
-	SinqHM{\usc}bootUtil} and
-	\item the SinqHM server-server for FOCUS, {\em FOCUS{\usc}srv}.
-      \end{itemize}
-      These are described in the following sub-sections.
-%
-    \subsection{The VxWorks Operating System}
-%   =========================================
-%
-    \label{VxWorks-os}
-%
-      There is a VxWorks system image file for each instruments called:
-      \\[1.0ex]
-%
-	\hspace*{15mm} \texttt{\$HOME/wind/SinqHM/$<$instr$>$/vxWorks{\usc}auto}
-	\\[1.0ex]
-%
-      where \texttt{$<$instr$>$} is either \texttt{"DMC"}, \texttt{"SANS"},
-      \texttt{"FOCUS"}, \texttt{"HRPT"}, \texttt{"TRICS"},
-      \texttt{"POLDI"}, \texttt{"AMOR"} or
-      \texttt{"Devel"}\footnote{\texttt{"Devel"}
-      is a directory where test versions of SinqHM may be built.}. These
-      are VxWorks system images into which the four or five 
-      SinqHM utility programs
-      have been loaded and code has been added to the VxWorks startup so that
-      {\em SinqHM{\usc}bootParamsConfig\/} is started automatically once
-      the system has been booted. Copies of the source code used to build
-      the instrument specific system images are also kept in the same directory
-      as the image, viz. \texttt{\$HOME/wind/SinqHM/$<$instr$>$}.
-
-      In addition, there is a VxWorks system image file common to all
-      instruments called:
-      \\[1.0ex]
-%
-	\hspace*{15mm} \texttt{\$HOME/wind/SinqHM/vxWorks{\usc}basic}
-	\\[1.0ex]
-%
-      This is a basic VxWorks system with no user application
-      software installed. After it has been booted, one must use the VxWorks
-      Tornado {\em shell\/}
-      to load and start the SinqHM software as described in
-      Section~\ref{manual-start}. It is intended for debugging the
-      SinqHM software.
-
-      The system images were originally created interactively
-      using the WindCFG Tornado
-      utility (see Chapter 8 of Ref.~\cite{Tornado-Users} on {\em Target
-      Configuration\/}). The current procedure, however, is to use the
-      {\em bld\/} script described in Appendix~\ref{bld-script}. The remainder
-      of this section describes these two procedures. Beware that there
-      are some possible problems with the {\em bld\/} script as noted
-      in the warnings in the text.
-
-      The WindCFG configuration names for the system images are
-      \texttt{SinqHM} for the basic system and
-      \texttt{SinqHM{\usc}spawn{\usc}$<$instr$>$} for each of the
-      instruments. All
-      have the same \mbox{VxWorks} options included, viz:
-      \begin{center}\begin{tabular}%
-		{@{}l@{\hspace{1mm}}l@{\hspace{1mm}}l@{\hspace{1mm}}l@{}}
-      BOOTP			& NETWORK		& SIGNALS		& WDB{\usc}CTXT	\\
-      CONSTANT{\usc}RDY{\usc}Q	& NET{\usc}INIT		& SM{\usc}NET		& WDB{\usc}DIRECT{\usc}CALL \\
-      ENV{\usc}VARS		& NET{\usc}SHOW		& STDIO			& WDB{\usc}EVENTS \\
-      EXC{\usc}HANDLING		& PIPES			& TASK{\usc}HOOKS	& WDB{\usc}EXC{\usc}NOTIFY \\
-      EXC{\usc}TASK		& POSIX{\usc}SIGNALS	& TASK{\usc}VARS	& WDB{\usc}EXIT{\usc}NOTIFY \\
-      FLOATING{\usc}POINT	& POSIX{\usc}TIMERS	& TFTP{\usc}CLIENT	& WDB{\usc}FUNC{\usc}CALL \\
-      FORMATTED{\usc}IO		& PROXY{\usc}CLIENT	& TIMEX			& WDB{\usc}GOPHER \\
-      FTP{\usc}SERVER		& RAMDRV		& TTY{\usc}DEV		& WDB{\usc}MEM \\
-      IO{\usc}SYSTEM		& SELECT		& WATCHDOGS		& WDB{\usc}REG \\
-      LOGGING			& SEM{\usc}BINARY	& WDB			& WDB{\usc}TTY{\usc}TEST \\
-      MEM{\usc}MGR{\usc}FULL	& SEM{\usc}COUNTING	& WDB{\usc}BANNER	& WDB{\usc}VIO \\
-      MSG{\usc}Q		& SEM{\usc}MUTEX	& WDB{\usc}BP \\
-      \end{tabular}\end{center}
-%
-      In addition, the \texttt{SinqHM{\usc}spawn{\usc}$<$instr$>$}
-      configurations have the first four\footnote{The {\em
-      FOCUS{\usc}srv} module has not been included in the VxWorks
-      systems by means of WindCFG.} SinqHM
-      modules included and the {\em edit\/} button is used to define symbol
-      \texttt{SINQHM{\usc}SPAWN} in the {\em config.h\/} file. This causes the
-      auto-configure module, {\em SinqHM{\usc}bootParamsConfig}, to get
-      spawned automatically at the end of the boot
-      procedure and this, in its turn, uses the {\em other\/}
-      field from the boot
-      parameters to spawn and configure the other modules. The full build
-      procedure is described in the comments in the file: \\[1.0ex]
-%
-	\hspace*{15mm}\$HOME/wind/ppc/target/config/all/usrConfig.c
-		\\[1.0ex]
-%
-      For completeness, these comments are reproduced here:
-
-      \begin{verbatim}
-    /*
-    **  This file should be copied to the VxWorks directory tree, e.g:
-    **    pss123> set src = "lnslib@lnsa15:sinqhm/"
-    **    pss123> rcp -p "${src}usrConfig.c" \
-    **                $HOME/wind/ppc/target/config/all/usrConfig.c
-    **    pss123> rcp -p "${src}bld" $HOME/wind/SinqHM/bld
-    **
-    **  The system images are:
-    **
-    **       $HOME/wind/SinqHM/vxWorks_basic
-    **       $HOME/wind/SinqHM/<instr>/vxWorks_auto
-    **
-    ** Using the Tornado tools:
-    ** =======================
-    **  To build the system image WITHOUT the SinqHM modules:
-    **      a) Start WindCFG with no target selected.      <== see Note 1
-    **      b) Select the "mv1603" BSP.
-    **      c) Select configuration "SinqHM"
-    **      d) Start up the editor and ensure that "SINQHM_SPAWN"
-    **          is either not defined or is defined to be 0.
-    **      e) Select the Build option.
-    **      f) Copy file vxWorks to $HOME/wind/SinqHM/vxWorks_basic.
-    **
-    **  To build the system image WITH the SinqHM modules:
-    **      a) Start WindCFG with no target selected.      <== see Note 1
-    **      b) Select the "mv1603" BSP.
-    **      c) Select configuration "SinqHM_spawn_<instr>".
-    **      d) Start up the editor and ensure that "SINQHM_SPAWN"
-    **          is defined to be non-zero, e.g:
-    **              #define  SINQHM_SPAWN  1
-    **      e) Select the Build option.
-    **      f) Copy file $HOME/wind/ppc/target/config/mv1603/vxWorks 
-    **                to $HOME/wind/SinqHM/<instr>/vxWorks_auto.
-    **
-    ** Using the bld script:
-    ** ====================
-    **  To build system images using the bld script:
-    **
-    **    a) without the SinqHM modules:
-    **                     pss123> $HOME/wind/SinqHM/bld basic
-    **    b) with    the SinqHM modules:
-    **                     pss123> bld <instr> all
-    **
-    **  Warnings:
-    **    The bld script will only work if SINQHM_SPAWN is NOT
-    **    defined in $HOME/wind/ppc/target/config/mv1603/config.h
-    **
-    **    When using the bld script, be sure that the file
-    **    $HOME/wind/ppc/target/config/mv1603/configdb.h
-    **    is set to select the correct VxWorks options. It is
-    **    easiest to use the Tornado WindCFG tool to do this.
-    */ \end{verbatim}%
-      \hspace*{-5mm}\textbf{Note:}
-      \begin{enumerate}
-	\item This step is important because the SinqHM boot files do not
-		reside in the usual VxWorks directory tree. If the VxWorks
-		Tornado Launcher has a target processor selected when
-		WindCFG is started, WindCFG assumes that the directory
-		tree in which the target's boot file is located is the one
-		which it should use. As a result, it is
-		unable to find the BSPs\footnote{{\em BSP\/} = Board
-		Support Package.} which it needs for building system images.
-		If, on the other hand, the Launcher has {\em no\/} target
-		processor selected when WindCFG is started, WindCFG will use
-		the \texttt{WIND{\usc}BASE} environment variable to locate
-		the directory tree and it will be able to find the BSPs.
-		Unfortunately, there is no {\em Target-deselect\/} option
-		in the Launcher. It may therefore be necessary to quit the
-		Launcher and to restart it in order to be able to use WindCFG.
-      \end{enumerate}
-%
-    \subsection{The SinqHM Histogram Memory Server}
-%   ===============================================
-%
-      The SinqHM histogram memory server, {\em SinqHM{\usc}srv}, is the
-      central item
-      of the histogramming memory system in the MVME-1603. It normally runs
-      under the name {\em hmRoot2400}. Once configured (see
-      Sect.~\ref{auto-config}), it spawns a background task, {\em hmFill2400},
-      which reads data from the multi-detector interface via the PMC card and
-      fills
-      histograms appropriately. It then listens for TCP/IP connections from
-      clients and responds to any requests received. \\[1.0ex]
-%
-      {\em SinqHM{\usc}srv\/} is built from the following source files: \\[1.0ex]
-%
-      \hspace*{\fill} \begin{tabular}{ll}
-      SinqHM{\usc}srv{\usc}main.c	& - the main program of
-						{\em SinqHM{\usc}srv}.\\
-      SinqHM{\usc}srv{\usc}filler.c	& - the histogram filler.\\
-      SinqHM{\usc}srv{\usc}server.c	& - the server program.\\
-      SinqHM{\usc}srv{\usc}routines.c	& - miscellaneous routines.\\
-      SinqHM{\usc}def.h			& - header file defining symbols and
-						structures.\\
-      SinqHM{\usc}gbl.h			& - header file defining global
-						variables.\\
-      vmio10{\usc}def.h			& - header file defining symbols for
-						the VMIO10 module.
-      \end{tabular} \hspace*{\fill} \\[1.0ex]
-%
-      These files are compiled and linked using the script {\em bld} via
-      the command: \\[1.0ex]
-%
-	\hspace*{15mm}\texttt{\$HOME/wind/SinqHM/bld $<$instr$>$
-		SinqHM{\usc}srv} \\[1.0ex]
-%
-      which generates the object module\footnote{Note that there are 2 
-      directories in each instrument's base directory called
-      \texttt{OLD} and \texttt{NEW}. It is assumed that the released 
-      version of SinqHM for an instrument resides in its base
-      directory. The {\em bld} script uses the \texttt{NEW} directory
-      as its working directory. When the new version is to be
-      released, the files in the base directory should be moved to
-      the \texttt{OLD} directory and then the files from \texttt{NEW}
-      can then be copied to the base directory.}\\[1.0ex]
-%
-	\hspace*{15mm}\texttt{\$HOME/wind/SinqHM/$<$instr$>$%
-		/NEW/SinqHM{\usc}srv.o} \\[1.0ex]
-%
-      This can be loaded into VxWorks and started.
-      \noindent When the {\em SinqHM{\usc}srv\/} process is created via the
-      VxWorks {\em taskSpawn\/} function, up to 10 arguments, \verb#<arg1>#
-      \ldots \verb#<arg10>#, may be specified. The following are used by {\em
-      SinqHM{\usc}srv\/}: \\[1.0ex]
-      \hspace*{\fill}\begin{tabular}{llp{91mm}}
-	\texttt{$<$arg1$>$}  & \texttt{$<$port$>$} & The TCP/IP port number to
-					be used for listening for connections
-					from clients. Default = 2400. \\
-	\texttt{$<$arg2$>$}  & \texttt{$<$use-level-gen$>$} & If non-zero, the
-					SinqHM {\em Filler\/} process will
-					use a VMIO10 module for
-					generating signals so that its speed
-					may be measured on an
-					oscilloscope. Default = 0. \\
-	\texttt{$<$arg3$>$}  & \texttt{$<$base-addr$>$} & The VME base address
-					of the VMIO10 module. Default = 0x1900.
-					\\
-	\texttt{$<$arg10$>$} & \texttt{$<$suspend$>$} & If non-zero, {\em
-					SinqHM{\usc}srv\/} will immediately
-					suspend itself
-					as soon as it starts. This is intended
-					for debug purposes.
-      \end{tabular}\hspace*{\fill}
-%
-    \subsection{The SinqHM Auto-configure Utility}
-%   ==============================================
-%
-      \label{auto-config}
-%
-      The SinqHM auto-configure utility, {\em SinqHM{\usc}bootParamsConfig}, is
-      a program which will analyse the {\em other\/} field of the boot setup of
-      the processor and configure {\em SinqHM{\usc}srv\/} accordingly. It is an
-      optional module whose use is intended to simplify the start-up of {\em
-      SinqHM{\usc}srv\/} in cases where SinqHM is being used without a data
-      acquisition
-      computer\footnote{Normally, SinqHM is configured prior to data acquisition
-      via software such as SICS, the SINQ Instrument Control System,
-      which is running on the data acquisition computer.}. The
-      syntax of the {\em other\/} field is described in
-      Appendix~\ref{other}. The way in which the {\em other\/} field is specified
-      is described in Section~\ref{PPC-Soft-Setup}.
-
-      \noindent {\em SinqHM{\usc}bootParamsConfig\/} is built from the following
-      source files: \\[1.0ex]
-%
-      \hspace*{\fill} \begin{tabular}{ll}
-      SinqHM{\usc}bootParamsConfig.c	& - the main program. \\
-      SinqHM{\usc}def.h			& - header file defining symbols and
-						structures.
-      \end{tabular} \hspace*{\fill} \\[1.0ex]
-%
-      The program is compiled via the command: \\[1.0ex]
-%
-      \verb#   ccvx -I${WIND_BASE}/target/config/all SinqHM_bootParamsConfig.c#
-
-      \noindent which generates the object module {\em
-      SinqHM{\usc}bootParamsConfig.o}. This can be loaded into VxWorks and
-      started. {\em ccvx\/} is an alias defined in the {\em sinqhm\/}
-      login script as:\begin{verbatim}
-    alias ccvx 'ccppc -O0 -mcpu=603 -I${WIND_BASE}/target/h ' \
-               '-fno-builtin -fno-for-scope -nostdinc ' \
-               '-DCPU=PPC603 -D_GNU_TOOL -gdwarf -c -Wimplicit'\end{verbatim}
-
-      \noindent When the {\em SinqHM{\usc}bootParamsConfig\/} process is created
-      via the VxWorks {\em taskSpawn\/} function\footnote{This normally happens
-      via code which has been added to the {\em usrConfig.c\/} file, but the
-      program may also be
-      started manually via the Tornado WindSh utility for debugging 
-      purposes.}, up to
-      10 arguments, \verb#<arg1># \ldots
-      \verb#<arg10>#, may be specified. Only \verb#<arg1># is used by
-      {\em SinqHM{\usc}bootParamsConfig\/} as follows: \\[1.0ex]
-      \hspace*{\fill}\begin{tabular}{llp{90mm}}
-	\texttt{$<$arg1$>$}  & \texttt{$<$port$>$} & The TCP/IP port number to
-					be used for connecting to SinqHM when
-					issuing the SQHM{\usc}CONFIG command.
-					No default is allowed. The value of
-					2400 should usually be specified.
-      \end{tabular}\hspace*{\fill}
-%
-    \subsection{The Test Generator Server}
-%   ======================================
-%
-      The Test Generator Server, {\em lwl{\usc}server}, is a program which can
-      run in the Power-PC processor and which can be used to generate a data
-      stream into the fibre-optic input channel of SinqHM via a Histogram
-      Test-generator Module. The data to be
-      written to the module is created by an interactive client program running
-      elsewhere and connecting to {\em lwl{\usc}server\/} via TCP/IP sockets.
-      It is an optional module whose use is intended to facilitate the
-      debugging of {\em SinqHM{\usc}srv}.
-
-      \noindent {\em lwl{\usc}server\/} is built from the following
-      source files: \\[1.0ex]
-%
-      \hspace*{\fill} \begin{tabular}{ll}
-      lwl{\usc}server.c		& - the main program. \\
-      vmio10{\usc}def.h		& - header file defining symbols for
-						VMIO10 VME modules.
-      \end{tabular} \hspace*{\fill} \\[1.0ex]
-%
-      The program is compiled via the command: \\[1.0ex]
-%
-      \verb#      ccvx lwl_server.c#
-
-      \noindent which generates the object module {\em
-      lwl{\usc}server.o}. This can be loaded into VxWorks and
-      started. {\em ccvx\/} is an alias defined as shown in
-      Section~\ref{auto-config}.
-
-      \noindent When the {\em lwl{\usc}server\/} process is created via the
-      VxWorks {\em taskSpawn\/} function, up to 10 arguments, \verb#<arg1>#
-      \ldots \verb#<arg10>#, may be specified. The following are used by {\em
-      lwl{\usc}server\/}: \\[1.0ex]
-      \hspace*{\fill}\begin{tabular}{llp{90mm}}
-	\texttt{$<$arg1$>$}  & \texttt{$<$port$>$} & The TCP/IP port number to
-					be used for listening for connections
-					from clients. Default = 3501. \\
-	\texttt{$<$arg2$>$}  & \texttt{$<$base-addr$>$} & The VME base address
-					of the Histogram Test-generator Module.
-      					Default = 0x1800. \\
-	\texttt{$<$arg3$>$}  & \texttt{$<$verbose$>$} & If non-zero, {\em
-					lwl{\usc}server\/} generates extra
-					messages via the COM1 console port of
-					the MVME-1603. \\
-	\texttt{$<$arg10$>$} & \texttt{$<$suspend$>$} & If non-zero, {\em
-					lwl{\usc}server\/} will immediately
-					suspend itself
-					as soon as it starts. This is intended
-					for debug purposes.
-      \end{tabular}\hspace*{\fill}
-%
-    \subsection{The {\em SinqHM{\usc}bootUtil\/} Server}
-%   ====================================================
-%
-      The {\em SinqHM{\usc}bootUtil\/} server is a program which can
-      run in the Power-PC processor and which can be used to display and
-      modify the boot parameters of the Power-PC via a client program running
-      remotely. The Power-PC can also be rebooted via the
-      {\em SinqHM{\usc}bootUtil\/}
-      server. It is an optional module whose use is intended to allow
-      the configuration of a Power-PC's boot parameters in cases where
-      the more usual method via a `dumb' terminal connected to its COM1 port,
-      as described in Section~\ref{PPC-Soft-Setup}, is not convenient.
-
-      \noindent {\em SinqHM{\usc}bootUtil\/} is built from the following
-      source files: \\[1.0ex]
-%
-      \hspace*{\fill} \begin{tabular}{ll}
-      SinqHM{\usc}bootUtil.c		& - the main program. \\
-      SinqHM{\usc}def.h			& - header file defining symbols and
-						structures.
-      \end{tabular} \hspace*{\fill} \\[1.0ex]
-%
-      The program is compiled via the command: \\[1.0ex]
-%
-      \verb#   ccvx -I${WIND_BASE}/target/config/all SinqHM_bootUtil.c#
-
-      \noindent which generates the object module {\em
-      SinqHM{\usc}bootUtil.o}. This can be loaded into VxWorks and
-      started. {\em ccvx\/} is an alias defined as shown in
-      Section~\ref{auto-config}.
-
-      \noindent When the {\em SinqHM{\usc}bootUtil\/} process is created via the
-      VxWorks {\em taskSpawn\/} function, up to 10 arguments, \verb#<arg1>#
-      \ldots \verb#<arg10>#, may be specified. The following are used by {\em
-      SinqHM{\usc}bootUtil\/}: \\[1.0ex]
-      \hspace*{\fill}\begin{tabular}{llp{90mm}}
-	\texttt{$<$arg1$>$}  & \texttt{$<$port$>$} & The TCP/IP port number to
-					be used for listening for connections
-					from clients. Default = 2300. \\
-	\texttt{$<$arg10$>$} & \texttt{$<$suspend$>$} & If non-zero, {\em
-					SinqHM{\usc}bootUtil\/} will immediately
-					suspend itself
-					as soon as it starts. This is intended
-					for debug purposes.
-      \end{tabular}\hspace*{\fill}
-%
-    \section{Starting SinqHM Manually}
-%   ==================================
-%
-      \label{manual-start}
-%
-      This section describes the manual loading and startup of the SinqHM
-      software. It is presented in check-list form, assuming some familiarity
-      with the VxWorks Tornado cross-development system. The reader is referred
-      to the Tornado User's Guide \cite{Tornado-Users} for more information.
-      \begin{enumerate}
-%
-      \item It is assumed in the following that the Power-PC boot parameters
-	have been configured so that the boot file is
-	the basic VxWorks system image, \texttt{vxWorks{\usc}basic},
-	described in Section~\ref{VxWorks-os} and
-	that the Power-PC has been freshly booted. When debugging, it is
-	recommended to reboot the Power-PC rather than to try simply to reload
-	the software. This is because the TCP/IP ports are not automatically
-        released when a module is reloaded. Reloaded software modules will
-	therefore generally fail at the call to the {\em bind\/} function.
-%
-      \item From a terminal with X-windows support, login to {\em pss123\/} as
-	user {\em sinqhm\/} and change the default directory: \\[1.0ex]
-%
-	\verb#      cd $HOME/wind/SinqHM/DMC/NEW#
-%
-      \item Start the Tornado launcher\footnote{If one is logged-in to
-	{\em pss123\/} from a Unix workstation, it may be necessary to issue
-	the command \texttt{"xhost pss123"} on the workstation before the
-	Tornado launcher can be started.} via a command of the form: \\[1.0ex]
-%
-	\verb#      launch -fg black &#
-%
-      \item If necessary, select the launcher's menu item
-	``\texttt{Target/Create ...}'' and create a {\em Target Server\/} for the
-	target processor. The only item in the {\em Create Target Server\/} form
-	which needs to be specified is ``\texttt{Target name or IP address}''.
-	As a result of typing the target's name into this item, the entry in
-	``\texttt{Target server launch command}'' should read
-	``\verb#tgtsvr <target-name>#''. None of the other check marks need to
-	be selected. The {\em Target Server\/} can then be started by clicking the
-	{\em Launch\/} button. The name of the target should then appear in the
-	list of targets in the Tornado Launcher window.
-%
-      \item Select the target in the list of targets in the Tornado Launcher
-	window by clicking on it.
-%
-      \item Start a WindSh tool for the target processor by clicking
-	the {\em WindSh\/} button. A WindSh window should
-	appear and the VxWorks shell prompt, ``\verb#->#'' should be displayed.
-%
-      \item Load the SinqHM modules into the VxWorks system via the commands:
-	\\[1.0ex]
-%
-	\verb#      -> ld < SinqHM_srv.o# \\
-	\verb#      -> ld < lwl_server.o# \\
-	\verb#      -> ld < SinqHM_bootParamsConfig.o# \\
-	\verb#      -> ld < SinqHM_bootUtil.o# \\[1.0ex]
-%
-	Note that these commands assume that the default directory has been set
-	correctly in Step~2 above. Otherwise, the object files must be prefixed
-	with the appropriate directory path.
-%
-      \item If it is desired to debug one of the SinqHM modules, it is now
-	possible to start the module in the suspended state via the WindSh
-	spawn-and-suspend command, {\em sps}, e.g. \\[1.0ex]
-%
-	\verb#      -> sps lwl_server, 3501, 0x1800, 0# \\[1.0ex]
-%
-	The meanings of the arguments for the various modules are given in
-	Section~\ref{SinqHM-Soft}. One can now start the Tornado debugger, {\em
-	CrossWind}, attach to the suspended task and debug it interactively.
-	Note that the program counter of the task will initially be in the
-	{\em suspend\/} routine of the operating system. The easiest way to get to
-	the start of the program's code is by issuing the \sfbf{s} command to
-	the debugger.
-%
-      \item Alternatively, the programs may be started normally via the normal
-	VxWorks spawn function, {\em taskSpawn}, e.g. \\[1.0ex]
-%
-	\verb#      -> taskSpawn "hmRoot2400", 100, 8, 20000, \# \\
-        \verb#               SinqHM_srv, 2400, 0, 0x1900# \\[1.0ex]
-%
-	The arguments preceding {\em SinqHM{\usc}srv\/} are standard VxWorks
-	defaults for priority, stack size, etc. The other arguments are as
-	defined in Section~\ref{SinqHM-Soft}.
-%
-      \end{enumerate}
- \newpage
-%
-    \appendix
-    \section{The {\em bld\/} Script}
-%   ==============================
-%
-      \label{bld-script}
-%
-      The various components of SinqHM, including the bootable system images,
-      can be created using the {\em bld\/} script. For help on using the script,
-      simply enter the command \\[1.0ex]
-%
-	\hspace*{15mm}\texttt{\$HOME/wind/SinqHM/bld h} \\[1.0ex]
-%
-      A simplified version of the script is reproduced
-      below. The script is actually more complicated than illustrated on
-      account of checking for the correctness of the arguments.
-      \begin{verbatim}
-    #!   /bin/csh
-    #-------------------------------------------------
-    #           pss123:~sinqhm/wind/SinqHM/bld   V01G
-    #
-    #       Script to compile and link the SinqHM programs for vxWorks
-    #
-       set proc = "$0"
-       if (`expr match "$proc" "\/"` != 1) set proc = "./$0"
-       cd $proc:h                     # Move to bld's directory!
-       if ("$1" == "dmc") then
-         cd DMC/NEW                           <== See Note 1
-         set defn = '-DINST="DMC" -DDMC'      <== See Note 2
-       else if ("$1" == "sans") then
-\end{verbatim}
-
-	\vspace*{-3.5ex}\hspace*{15mm} \vdots \vspace*{-3.5ex}
-	\begin{verbatim}
-       endif
-    #
-       set src = "maden@lnsa04:sinqhm/"
-    #
-       printf "\nWorking directory is %s\n" "$cwd"
-       printf 'Source is "%s"\n\n' "$src"
-    #
-       alias  ccvx   'ccppc -O0 -mcpu=603 -I${WIND_BASE}/target/h ' \
-            '-fno-builtin -fno-for-scope ' \
-            '-nostdinc -DCPU=PPC603 -D_GNU_TOOL -gdwarf -c -Wimplicit'
-\end{verbatim}
-
-      \vspace*{-2.5ex}\hspace*{15mm} \vdots \vspace*{-2.5ex}
-      \begin{verbatim}
-    #-------------------------------------------------
-       echo "Building SinqHM_srv ..."
-       echo "   Copying header files ..."
-          rcp -p  "${src}SinqHM_gbl.h" ./SinqHM_gbl.h
-          rcp -p  "${src}SinqHM_def.h" ./SinqHM_def.h
-          rcp -p  "${src}vmio10_def.h" ./vmio10_def.h
-       echo "   Copying source files ..."
-          rcp -p  "${src}SinqHM_srv_main.c"     ./SinqHM_srv_main.c
-          rcp -p  "${src}SinqHM_srv_routines.c" ./SinqHM_srv_routines.c
-          rcp -p  "${src}SinqHM_srv_filler.c"   ./SinqHM_srv_filler.c
-          rcp -p  "${src}SinqHM_srv_server.c"   ./SinqHM_srv_server.c
-    #---------------------------------- (continued on next page) \end{verbatim}
- \newpage \begin{verbatim}
-    #---------------------------------- (continuation of "bld")
-       echo "   Compiling SinqHM ..."
-          ccvx $defn SinqHM_srv_main.c        <== See Note 2
-          ccvx $defn SinqHM_srv_routines.c
-          ccvx $defn SinqHM_srv_filler.c
-          ccvx $defn SinqHM_srv_server.c
-       echo "   Linking ..."
-          ldppc -o SinqHM_srv.o -r   \
-                    SinqHM_srv_main.o SinqHM_srv_routines.o \
-                    SinqHM_srv_filler.o SinqHM_srv_server.o
-       echo "   Done. Result is $cwd/SinqHM_srv.o"
-    #-------------------------------------------------
-       echo "Building lwl_server ..."
-       echo "   Copying files ..."
-          rcp -p "${src}vmio10_def.h" ./vmio10_def.h
-          rcp -p "${src}lwl_server.c" ./lwl_server.c
-       echo "   Compiling lwl_server.c ..."
-          ccvx lwl_server.c
-       echo "   Done."
-    #-------------------------------------------------
-       echo "Building SinqHM_bootParamsConfig ..."
-       echo "   Copying files ..."
-          rcp -p "${src}SinqHM_def.h" ./SinqHM_def.h
-          rcp -p "${src}SinqHM_bootParamsConfig.c" \
-                        ./SinqHM_bootParamsConfig.c
-       echo "   Compiling SinqHM_bootParamsConfig.c ..."
-          ccvx -I${WIND_BASE}/target/config/all \
-                        SinqHM_bootParamsConfig.c
-       echo "   Done."
-    #-------------------------------------------------
-       echo "Building SinqHM_bootUtil ..."
-       echo "   Copying files ..."
-          rcp -p "${src}SinqHM_def.h" ./SinqHM_def.h
-          rcp -p "${src}SinqHM_bootUtil.c" \
-                        ./SinqHM_bootUtil.c
-       echo "   Compiling SinqHM_bootUtil.c ..."
-          ccvx -I${WIND_BASE}/target/config/all \
-                        SinqHM_bootUtil.c
-       echo "   Done."
-    #-------------------------------------------------
-       printf "\n\nBuilding vxWorks_auto system image ...\n\n"
-       set dflt = "$PWD"
-       cd $WIND_BASE/target/config/mv1603
-       echo " Default directory changed to: $PWD"
-    #
-       touch config.h        # Force a complete re-compilation
-     #---------------------------------- (continued on next page) \end{verbatim}
- \newpage \begin{verbatim}
-    #---------------------------------- (continuation of "bld")
-       set mods = ( \
-             ../../../../SinqHM/SinqHM_srv.o \
-             ../../../../SinqHM/lwl_server.o \
-             ../../../../SinqHM/SinqHM_bootParamsConfig.o \
-             ../../../../SinqHM/SinqHM_bootUtil.o )
-       make  ADDED_CFLAGS=" -DSINQHM_SPAWN=1" \
-             ADDED_MODULES="$mods"
-       cp -p vxWorks     $dflt/vxWorks_auto
-       cp -p vxWorks.sym $dflt/vxWorks.sym
-       echo "   Done. Result is $dflt/vxWorks_auto"
-    #-------------------------------------------------
-       printf "Building vxWorks_basic system image ...\n\n"
-       cd $proc:h                     # Move to bld's directory!
-       set dflt = "$PWD"
-       cd $WIND_BASE/target/config/mv1603
-       echo " Default directory changed to: $PWD"
-       touch config.h        # Force a complete re-compilation
-    
-       make  ADDED_CFLAGS=" -DSINQHM_SPAWN=0"  \
-             ADDED_MODULES=""
-       cp -p vxWorks     $dflt/vxWorks_basic
-       cp -p vxWorks.sym $dflt/vxWorks.sym
-       echo "   Done. Result is $dflt/vxWorks_basic"\end{verbatim}%
-      \hspace*{-5mm}\textbf{Notes:}
-      \begin{enumerate}
-	\item {\em bld\/} changes to the instrument's \texttt{NEW} directory
-		for building instrument dependent modules.
-	\item {\em defn\/} supplies compile time definitions
-		to enable the selection of instrument specific code by
-		means of conditional compilation macros.
-      \end{enumerate}
- \newpage
-%
-    \section{The {\em other\/} Field}
-%   =================================
-%
-      \label{other}
-%
-      \vspace*{-2ex}
-      The {\em other\/} field of the boot setup of the Power-PC processor can be
-      used for specifying the default configuration of SinqHM. It can, for
-      example, be used to set a default histogramming mode and number of bins
-      per histogram. The procedure for setting up the {\em other\/} field is
-      described in Section~\ref{PPC-Soft-Setup}. The syntax of the field is
-      described in the comments in file {\em SinqHM{\usc}bootParamsConfig.c}.
-      These comments are reproduced here:
-      \vspace*{-2ex}
-      \begin{verbatim}
-    /*
-    **  The "other" string may be specified as follows:
-    **
-    **         <action>=<arg0>,..,<argn>/...
-    **
-    **  There may be no white space characters in the string. Tokens
-    **  in the string may be specified in upper or lower case.
-    **
-    **  <action> may be "sp"   for "Spawn a task"
-    **                  "sps"  for "Spawn and suspend a task"
-    **                  "cfg"  for "Configure SinqHM_srv"
-    **                  "wt"   for "Wait"
-    **----------------------------------------------------
-    **  If <action> = "sp" or "sps", then
-    **
-    **     <arg0> = name of task to spawn. This may be:
-    **                "SinqHM"   for SinqHM_srv or
-    **                "lwl"      for lwl_server or
-    **                "bootUtil" for SinqHM_bootUtil or
-    **                "focus"    for FOCUS_srv
-    **     <arg1>,..<arg9> = integer args for the spawn, as follows:
-    **
-    **    If <arg0> = "SinqHM"
-    **     <arg1> = TCP/IP port number for server (dflt=2400).
-    **     <arg2> = <use-level-gen> flag. If non-zero, then use level
-    **                  generator to generate timing signals (dflt=0).
-    **     <arg3> = base address of VMIO10 level generator
-    **                     module (dflt=0x1900).
-    **
-    **    If <arg0> = "lwl"
-    **     <arg1> = TCP/IP port number for lwl_server (dflt=3501).
-    **     <arg2> = base address of Histogram Test-generator
-    **                     module (dflt=0x1800).
-    **     <arg3> = verbosity. If non-zero, be verbose (dflt=0).
-    **
-    **    If <arg0> = "bootUtil"
-    **     <arg1> = TCP/IP port number for SinqHM_bootUtil (dflt=2300).
-    **
-    **    If <arg0> = "focus"
-    **     <arg1> = name of hostM (Mittel-bank) (dflt=localhost).
-    **     <arg2> = #-counters in Mittel-bank (dflt=151).\end{verbatim}
- \newpage%
-      \begin{verbatim}
-    **     <arg3> = name of hostO (Ober-bank) (dflt=lnse05.vme).
-    **     <arg4> = #-counters in Ober-bank (dflt=117).
-    **     <arg5> = name of hostU (Unter-bank) (dflt=lnse06.vme).
-    **     <arg6> = #-counters in Unter-bank (dflt=116).
-    **     <arg7> = Client-side TCP/IP port number (dflt=2500).
-    **     <arg8> = Server-side TCP/IP port number (dflt=2400).
-    **
-    **    In addition, <arg10> will be set to 0 for "sp" and 1 for
-    **    "sps". SinqHM_srv, lwl_server and SinqHM_bootUtil will suspend
-    **    themselves immediately if they find <arg10> is non-zero. This
-    **    cooperation on the part of the spawned task is intended as a
-    **    debugging aid.
-    **
-    **    "SinqHM" and "SinqHM_bootUtil" will be spawned with priority
-    **    100, "lwl" with priority 250.
-    **
-    **  Notes:
-    **    a) Lower numbers imply higher priority.
-    **    b) "SinqHM_Filler" also gets spawned with priority 250. It is
-    **          important that "lwl" and "SinqHM_Filler" have the same
-    **          priority.
-    **----------------------------------------------------
-    **  If <action> = "cfg":
-    **     <arg0> = HM_DIG, HM_PSD, TOF, HRPT or TRANS to specify the
-    **                      hist memory mode.
-    **     <arg8> = sub-mode bits to "or" with <arg0> (dflt=0)
-    **     <arg9> = TCP/IP port # of server (dflt=2400)
-    **    And for <arg0> = HM_DIG or HRPT,
-    **     <arg1> = # bins (no dflt)
-    **     <arg2> = # histograms (dflt=1)
-    **     <arg3> = bytes per bin (dflt=4)
-    **     <arg4> = bin compression (dflt=0)
-    **     <arg5> = first bin (dflt=0)
-    **
-    **    And for <arg0> = TOF,
-    **     <arg1> = # counters (no dflt)
-    **     <arg2> = # bins per counter (no dflt)
-    **     <arg3> = time_span_per_bin (no dflt)
-    **     <arg4> = Start delay (dflt=0)
-    **     <arg5> = # of first counter (dflt=0)
-    **     <arg6> = bytes per bin (dflt=4)
-    **
-    **     Note: The built-in "cfg" program can only define bins of equal
-    **          width. For non-equal width bins, one must send the
-    **          SQHM_CONFIG message to SinqHM_srv from a host computer.\end{verbatim}
- \newpage%
-      \begin{verbatim}
-    **
-    **    And for <arg0> = TRANS,
-    **     <arg1> = #-buffers (dflt = 8)
-    **     <arg2> = buff-size (dflt = 4096)
-    **
-    **    And for <arg0> = HM_PSD, the arguments still need defining.
-    **----------------------------------------------------
-    **  If <action> = "wt", then
-    **
-    **     <arg0> = number of seconds to wait (may be useful for
-    **                FOCUS startup).
-    **----------------------------------------------------
-    **  For example:
-    **
-    **     other = "sp=bootUtil/sp=SinqHM/cfg=HM_DIG,400"
-    **
-    **  will cause bootUtil and SinqHM_srv to be automatically started
-    **  after the system has been booted and will configure it in HM_DIG
-    **  mode with a single histogram of 400 bins (as used for DMC).
-    **----------------------------------------------------
-    */
-      \end{verbatim}
-%
- \newpage
-%
- \begin{thebibliography}{9}
-      \addcontentsline{toc}{section}{References}
-
- \bibitem{Hist-Mem-Spec} D. Maden, PSI, May 1997 \\
-	{\em The SINQ Histogram Memory, SinqHM} \\
-	Project SINQ 891/MD36-701
-      
- \bibitem{MVME-1603} Motorola Inc, February 1995 \\
-	{\em MVME1603/MVME1604 Single Board Computer} \\
-	{\em Installation and Use\/} V1600-1A/IH1
-
- \bibitem{Tornado-Users} Wind River Systems, December 1995 \\
-	{\em Tornade User's Guide (Unix Version)} \\
-      	DOC-11033-ND-01
-
- \bibitem{LNS-CVS} Mark K\"{o}nnecke, February 2000 \\
-	{\em The LNS CVS Repository} \\
-      	Internal Note
-
- \end{thebibliography}
-\end{document}
diff --git a/sinqhm/hist_mem_spec.tex b/sinqhm/hist_mem_spec.tex
deleted file mode 100755
index 1527bb4b..00000000
--- a/sinqhm/hist_mem_spec.tex
+++ /dev/null
@@ -1,2677 +0,0 @@
-%	TAS_SRC:[PSI.NOTES]HIST_MEM_SPEC.TEX	- Ident 1.4
-%	====================================
-%%
-%%====================================================================
-\documentclass[openbib,a4paper,twoside,12pt]{article}
-\usepackage{array}
-\usepackage{epsfig}
-%
- \newcommand{\nc}{\newcommand}
- \newcommand{\rc}{\renewcommand}
-%
- \nc{\myident}{Vn 1.5}
- \nc{\mydate}{23rd November, 1999}
-%
-%%====================================================================
-%%
-%%  +--------------------------------------------------------------+
-%%  |			Paul Scherrer Institute			   |
-%%  |                       SINQ Division			   |
-%%  |                                                              |
-%%  | This software may be used freely by non-profit organizations.|
-%%  | It may be copied provided that the name of P.S.I. and of the |
-%%  | author is included. Neither P.S.I. nor the author assume any |
-%%  | responsibility for the use of this software outside of P.S.I.|
-%%  +--------------------------------------------------------------+
-%%
-%%  Project  . . . . . . . . . . : SINQ
-%%  Brief Document Title . . . . : Specification of SinqHM Histogram Memory
-%%  Author . . . . . . . . . . . : D.Maden
-%%  Date of creation . . . . . . : 2-Apr-1997
-%%
-%%  Updates:
-%%	    2-Apr-1997 DM.	Initial Latex Version.
-%%    1.3a  3-Dec-1998 DM.	Add details of SQHM__TOF configuration.
-%%    1.4a 15-Jun-1999 DM.	Add details of SQHM_MERGE command.
-%%    1.4b 17-Aug-1999 DM.	Rename SQHM_MERGE as SQHM_PROJECT.
-%%====================================================================
-%%  To process this file on PSICL0:
-%%
-%%	$ import tex
-%%	$ set default usr_scroot:[maden]
-%%	$ copy lnsa09::tas_src:[psi.notes]hist_mem_spec.tex []
-%%	$ copy lnsa09::tas_src:[psi.notes]hist_mem_spec_fig%.ps []
-%%	$ copy lnsa09::tas_src:[psi.notes]psi_logo.ps,sinq_logo []
-%%	$ latex hist_mem_spec
-%%	$ dvips/printer=lps20 hist_mem_spec
-%%	$ print/noti/noflag/par=(side=two,page_orientation=portrait) -
-%%		/que=whga_u119_ps1 hist_mem_spec.ps
-%%====================================================================
-%%
- \addtolength{\textheight}{40mm}
- \setlength{\textwidth}{160mm}
- \setlength{\oddsidemargin}{8mm}
- \setlength{\evensidemargin}{-10mm}
- \setlength{\topmargin}{-20mm}
-%
- \setcounter{tocdepth}{2}
-%
- \parskip 1.0ex plus 5pt minus 5pt      % Space between paragraphs.
-%%\setlength{\parindent}{0em}
-%
-%%%\rc{\thepage}{\arabic{page}%
-%%%			\setcounter{footnote}{0}}
- \rc{\topfraction}{0.9}
- \rc{\bottomfraction}{0.9}
- \nc{\botfigrule}{\vspace*{-3pt}%
-	\hspace*{\fill}\rule{0.75\columnwidth}{0.4pt}\hspace*{\fill}%
-	\vspace*{-2.6pt}}
- \nc{\topfigrule}{\vspace*{-3pt}%
-	\hspace*{\fill}\rule{0.75\columnwidth}{0.4pt}\hspace*{\fill}%
-	\vspace*{-2.6pt}}
-%
- \nc{\PreserveBackslash}[1]{\let\temp=\\#1\let\\=\temp}
- \let\PBS=\PreserveBackslash	% shorthand
-%
-%		Define "\usc" to get a proper underscore!!
- \nc{\usc}{\protect\makebox[0.6em]{\protect\rule{0.5em}{0.1ex}}}
-%
- \nc{\camac}{\protect\makebox[4.1em][l]{CAMAC}}
- \nc{\musr}{\protect\makebox[2.1em][l]{$\mu$SR}}
-%
- \nc{\myfile}{tas{\usc}src:[psi.notes]hist{\usc}mem{\usc}spec.tex}
-%
- \nc{\Topbox}[1]{
-	\put(0,0){\line(0,1){7}}
-	\put(0,7){\line(1,0){120}}
-	\put(120,7){\line(0,-1){7}}
-	\put(30,7){\line(0,-1){1}}
-	\put(60,7){\line(0,-1){1}}
-	\put(90,7){\line(0,-1){1}}
-	\put(60,3.5){\makebox(0,0){\textsf{#1}}}
-	\put(0,7){\makebox(5,3)[lt]{\textsf{\tiny{31}}}}
-	\put(115,7){\makebox(5,3)[rt]{\textsf{\tiny{0}}}}
-	}
-%
- \nc{\Midbox}[1]{
-	\put(0,0){\line(0,1){7}}
-	\put(0,7){\line(1,0){120}}
-	\put(120,7){\line(0,-1){7}}
-	\put(30,7){\line(0,-1){1}}
-	\put(60,7){\line(0,-1){1}}
-	\put(90,7){\line(0,-1){1}}
-	\put(60,3.5){\makebox(0,0){\textsf{#1}}}
-	}
-%
- \nc{\Midwordbox}[2]{
-	\put(0,0){\line(0,1){7}}
-	\put(0,7){\line(1,0){120}}
-	\put(120,7){\line(0,-1){7}}
-	\put(30,7){\line(0,-1){1}}
-	\put(60,7){\line(0,-1){7}}
-	\put(90,7){\line(0,-1){1}}
-	\put(30,3.5){\makebox(0,0){\textsf{#1}}}
-	\put(90,3.5){\makebox(0,0){\textsf{#2}}}
-	}
-%
- \nc{\Midbytebox}[4]{
-	\put(0,0){\line(0,1){7}}
-	\put(0,7){\line(1,0){120}}
-	\put(120,7){\line(0,-1){7}}
-	\put(30,7){\line(0,-1){7}}
-	\put(60,7){\line(0,-1){7}}
-	\put(90,7){\line(0,-1){7}}
-	\put(15,3.5){\makebox(0,0){\textsf{#1}}}
-	\put(45,3.5){\makebox(0,0){\textsf{#2}}}
-	\put(75,3.5){\makebox(0,0){\textsf{#3}}}
-	\put(105,3.5){\makebox(0,0){\textsf{#4}}}
-	}
-%
- \nc{\Midbody}[1]{
-	\put(0,0){\line(0,1){7}}
-	\put(120,7){\line(0,-1){7}}
-	\put(0,7){\line(1,0){1}}
-	\put(120,7){\line(-1,0){1}}
-	\put(60,3.5){\makebox(0,0){\textsf{#1}}}
-	}
-%
- \nc{\Midbodydashed}[1]{
-	\put(0,0){\multiput(0,1)(0,2){3}{\line(0,1){1}}}
-	\put(120,0){\multiput(0,1)(0,2){3}{\line(0,1){1}}}
-	\put(0,7){\line(1,0){1}}
-	\put(120,7){\line(-1,0){1}}
-	\put(60,3.5){\makebox(0,0){\textsf{#1}}}
-	}
-%
- \nc{\Botbox}[1]{
-	\put(0,0){\line(0,1){7}}
-	\put(0,7){\line(1,0){120}}
-	\put(120,7){\line(0,-1){7}}
-	\put(0,0){\line(1,0){120}}
-	\put(30,7){\line(0,-1){1}}
-	\put(60,7){\line(0,-1){1}}
-	\put(90,7){\line(0,-1){1}}
-	\put(60,3.5){\makebox(0,0){\textsf{#1}}}
-	}
-%
- \nc{\Botbody}[1]{
-	\put(0,0){\line(0,1){7}}
-	\put(120,7){\line(0,-1){7}}
-	\put(0,0){\line(1,0){120}}
-	\put(0,7){\line(1,0){1}}
-	\put(120,7){\line(-1,0){1}}
-	\put(30,0){\line(0,1){1}}
-	\put(60,0){\line(0,1){1}}
-	\put(90,0){\line(0,1){1}}
-	\put(60,3.5){\makebox(0,0){\textsf{#1}}}
-	}
-%
- \nc{\Botwordbox}[2]{
-	\put(0,0){\line(0,1){7}}
-	\put(0,7){\line(1,0){120}}
-	\put(120,7){\line(0,-1){7}}
-	\put(0,0){\line(1,0){120}}
-	\put(30,7){\line(0,-1){1}}
-	\put(60,7){\line(0,-1){7}}
-	\put(90,7){\line(0,-1){1}}
-	\put(30,3.5){\makebox(0,0){\textsf{#1}}}
-	\put(90,3.5){\makebox(0,0){\textsf{#2}}}
-	}
-%
- \nc{\Topwbox}[2]{			% Same as \Topbox but with width arg.
-	\put(0,0){\line(0,1){7}}
-	\put(0,7){\line(1,0){#1}\line(1,0){#1}\line(1,0){#1}\line(1,0){#1}%
-		\line(0,-1){7}}
-	\put(#1,6){\line(0,1){1}}
-	\put(#1,0){\put(#1,6){\line(0,1){1}}}
-	\put(#1,0){\put(#1,0){\put(#1,6){\line(0,1){1}}}}
-	\put(#1,0){\put(#1,3.5){\makebox(0,0){\textsf{#2}}}}
-	\put(0,7){\makebox(5,3)[lt]{\textsf{\tiny{31}}}}
-	\put(#1,0){\put(#1,0){\put(#1,0){\put(#1,0){\put(-5,7){%
-		\makebox(5,3)[rt]{\textsf{\tiny{0}}}}}}}}
- }
-%
- \nc{\Midwbox}[2]{		     % Same as \Midbox but with width arg.
-	\put(0,0){\line(0,1){7}}
-	\put(0,7){\line(1,0){#1}\line(1,0){#1}\line(1,0){#1}\line(1,0){#1}%
-		\line(0,-1){7}}
-	\put(#1,6){\line(0,1){1}}
-	\put(#1,0){\put(#1,6){\line(0,1){1}}}
-	\put(#1,0){\put(#1,0){\put(#1,6){\line(0,1){1}}}}
-	\put(#1,0){\put(#1,3.5){\makebox(0,0){\textsf{#2}}}}
- }
-%
- \nc{\Midwwordbox}[3]{		     % Same as \Midwordbox but with width arg.
-	\put(0,0){\line(0,1){7}}
-	\put(0,7){\line(1,0){#1}\line(1,0){#1}\line(1,0){#1}\line(1,0){#1}%
-		\line(0,-1){7}}
-	\put(#1,6){\line(0,1){1}}
-	\put(#1,0){\put(#1,0){\line(0,1){7}}}
-	\put(#1,0){\put(#1,0){\put(#1,6){\line(0,1){1}}}}
-	\put(#1,3.5){\makebox(0,0){\textsf{#2}}}
-	\put(#1,0){\put(#1,0){\put(#1,3.5){\makebox(0,0){\textsf{#3}}}}}
- }
-%
- \nc{\Botwwordbox}[3]{		     % Same as \Botwordbox but with width arg.
-	\put(0,0){\line(0,1){7}}
-	\put(0,0){\line(1,0){#1}\line(1,0){#1}\line(1,0){#1}\line(1,0){#1}%
-	  \line(0,1){7}}
-	\put(0,7){\line(1,0){#1}\line(1,0){#1}\line(1,0){#1}\line(1,0){#1}}
-	\put(#1,6){\line(0,1){1}}
-	\put(#1,0){\put(#1,0){\line(0,1){7}}}
-	\put(#1,0){\put(#1,0){\put(#1,6){\line(0,1){1}}}}
-	\put(#1,3.5){\makebox(0,0){\textsf{#2}}}
-	\put(#1,0){\put(#1,0){\put(#1,3.5){\makebox(0,0){\textsf{#3}}}}}
- }
-%
- \nc{\Tabrow}[3]{%
-	\textsf{#1} & \textsf{\textbf{#2}} & \textsf{#3} \\%
-	}%
-%
- \nc{\sfbf}[1]{\textsf{\textbf{#1}}}
-%
- \setlength{\unitlength}{1.0mm}
-%
-%       Define insertplot is insert a PostScript plot.
-%       Usage:
-%               \insertplot{<file>}{<height>}{<left-margin>}
-%       Example:
-%               \insertplot{dvipsdoc.pal}{70mm}{5.0mm}
-%
- \def\insertplot#1#2#3{\par
-  \hbox{%
-   \hskip #3
-   \vbox to #2{
-     \vfil
-     \special{ps: plotfile #1}
-   }%
-  }
- }
-%
- \title{The SINQ Histogram Memory \\ SinqHM}
- \author{D. Maden}
- \date{\mydate}
-%
- \pagestyle{empty}
- \begin{document}
-      \begin{center}\begin{picture}(160,242)(16,5)
-       \put(0,0){
-         \linethickness{0.80mm}
-         \put(0, 0){\framebox(180,255){~}}
-			% Horizontal lines - bottom to top
-         \linethickness{0.40mm}
-         \put(0,  12){\line(1,0){180}}
-         \linethickness{0.30mm}
-         \multiput(124, 17)(0,5){8}{\line(1,0){56}}
-         \linethickness{0.60mm}
-         \put(124, 63){\line(1,0){56}}
-         \put(124, 57){\line(1,0){56}}
-         \linethickness{0.40mm}
-         \put(0,  76){\line(1,0){180}}
-         \put(0,  98){\line(1,0){180}}
-         \put(0, 154){\line(1,0){180}}
-         \put(0, 184){\line(1,0){180}}
-         \put(0, 206){\line(1,0){180}}
-         \put(0, 218){\line(1,0){180}}
-         \linethickness{0.80mm}
-         \put(0, 230){\line(1,0){180}}
-			% Vertical lines - left to right
-         \linethickness{0.40mm}
-         \put( 40, 230){\line(0,1){25}}
-         \put( 60, 206){\line(0,1){12}}
-	 \put( 90,   0){\line(0,1){12}}
-         \put(120, 184){\line(0,1){46}}
-	 \put(140, 218){\line(0,1){37}}
-			%
-	 \linethickness{0.40mm}
-         \put(124,  12){\line(0,1){64}}
-         \put(138,  12){\line(0,1){51}}
-         \linethickness{0.60mm}
-         \put(152,  12){\line(0,1){51}}
-         \linethickness{0.40mm}
-         \put(166,  12){\line(0,1){51}}
-	 %
-         \put(50, 232){\shortstack{%
-		{\huge Paul Scherrer Institut} \\
-		{W\"{u}renlingen und Villigen} \\
-		{\large CH-5232 Villigen PSI} \\[1.0ex]
-		{\tiny{\em (N\"{u}r f\"{u}r internen Gebrauch)}}}}
-         \put(160, 250){\makebox(0,0){\Large Projekt}}
-         \put(  2, 228){\makebox(0,0)[l]{\tiny Klassifizierung:}}
-         \put(122, 228){\makebox(0,0)[l]{\tiny Kurzzeichen:}}
-         \put(142, 228){\makebox(0,0)[l]{\tiny PSP-Nr:}}
-         \put(  2, 216){\makebox(0,0)[l]{\tiny Ersatz f\"{u}r:}}
-         \put( 62, 216){\makebox(0,0)[l]{\tiny Erstellungs/\"{A}nderungsdatum:}}
-         \put(122, 216){\makebox(0,0)[l]{\tiny Doku-Nr:}}
-	 \put(  2, 204){\makebox(0,0)[l]{\tiny Federf. Autor:}}
-	 \put(  2, 201){\makebox(0,0)[l]{\tiny Co-autoren:}}
-         \put(122, 204){\makebox(0,0)[l]{\tiny Unterschrift Federf. Autor:}}
-         \put(  2, 182){\makebox(0,0)[l]{\tiny Titel:}}
-         \put(  2, 152){\makebox(0,0)[l]{\tiny Kurztext bzw. Inhalt:}}
-         \put(110, 152){\makebox(0,0)[l]{\tiny Doppelseitig:}}
-		\put(128, 152){\makebox(0,0)[l]{\tiny Ja}}
-		\put(135, 152){\makebox(0,0)[l]{$\bullet$}}
-		\put(128, 149){\makebox(0,0)[l]{\tiny Nein}}
-		\put(135, 149){\makebox(0,0)[l]{$\circ$}}
-         \put(145, 152){\makebox(0,0)[l]{\tiny Seitenzahl total:}}
-         \put(  2,  96){\makebox(0,0)[l]{\tiny Schlagw\"{o}rter/Suchkriterien:}}
-         \put(  2,  74){\makebox(0,0)[l]{\tiny Verteiler:}}
-         \put(126,  74){\makebox(0,0)[l]{\tiny Erstellereigene Doku-Nr:}}
-         \put(131,  60){\makebox(0,0){PSP}} \put(145, 60){\makebox(0,0){Visum}}
-         \put(159,  60){\makebox(0,0){PSP}} \put(173, 60){\makebox(0,0){Visum}}
-		%
-	 \put(131,54.5){\makebox(0,0){\tiny 8}}
-	 \put(131,49.5){\makebox(0,0){\tiny 82}}
-	 \put(131,44.5){\makebox(0,0){\tiny 83}}
-	 \put(131,39.5){\makebox(0,0){\tiny 84}}
-	 \put(131,34.5){\makebox(0,0){\tiny 85}}
-	 \put(131,29.5){\makebox(0,0){\tiny 86}}
-	 \put(131,24.5){\makebox(0,0){\tiny 89}}
-		%
-	 \put(159,54.5){\makebox(0,0){\tiny 811}}
-	 \put(159,49.5){\makebox(0,0){\tiny 812}}
-	 \put(159,44.5){\makebox(0,0){\tiny 813}}
-	 \put(159,39.5){\makebox(0,0){\tiny 814}}
-	 \put(159,34.5){\makebox(0,0){\tiny 815}}
-	 \put(159,29.5){\makebox(0,0){\tiny 816}}
-	 \put(159,24.5){\makebox(0,0){\tiny 817}}
-		%
-         \put(  2,  10){\makebox(0,0)[l]{\tiny Datum:}}
-         \put( 47,  10){\makebox(0,0)[l]{\tiny Visum FBV:}}
-         \put( 92,  10){\makebox(0,0)[l]{\tiny Datum:}}
-         \put(137,  10){\makebox(0,0)[l]{\tiny Visum PL:}}
-%
-	 \put(2,230){\epsfig{bbllx=93,bblly=697,bburx=207,bbury=754,%
-		file=psi_logo.ps,%
-		height=20mm,clip=}}
-%
-	 \put(150,232){\epsfig{bbllx=122,bblly=700,bburx=201,bbury=740,%
-		file=sinq_logo.ps,%
-		height=14mm,clip=}}
-%
-	 \put( 25,223){\makebox(0,0)[l]{Basisunterlage}}
-	 \put(130,223){\makebox(0,0){FI}}
-	 \put(160,223){\makebox(0,0){89}}
-	 \put( 90,210){\makebox(0,0){\mydate}}
-	 \put(150,210){\makebox(0,0){891/MD36-701.-}}
-	 \put( 25,195){\makebox(0,0)[l]{Maden, D}}
-	 \put( 25,175){\makebox(0,0)[l]{The SINQ Histogram Memory, SinqHM}}
-	 \put(170,152){\makebox(0,0){39}}
-	 \put( 25,135){\shortstack[l]{%
-		This note specifies the interface between the data \\
-		acquisition software and the SINQ histogramming memories}}
-	 \put( 25, 86){\shortstack[l]{%
-		\tiny HISTOGRAM MEMORY \\
-		\tiny SINQHM}}
-	 \put( 25, 60){\shortstack[l]{%
-		\tiny D. Maden, WHGA/247 \\
-		\tiny SINQ-Sekretariat, WHGA/249}}
-	 \put(150, 69){\makebox(0,0){\myident}}
-       }
-      \end{picture}\end{center}
- \cleardoublepage
-%
- \setcounter{page}{1}
-%
- \maketitle
-%
- \thispagestyle{myheadings}
- \rc{\thepage}{}
- \markboth%
-   {\rm \roman{page}\hspace*{-8mm}\underline{\hspace*{126mm}SinqHM \myident}}%
-   {\underline{\rm SinqHM \myident \hspace*{44mm} File = \myfile}}
-%
- \begin{abstract}
-	\noindent This note specifies the interface
-	between the data acquisition software and
-	the SINQ histogramming memories.
- \end{abstract}
-%
- \tableofcontents
-%
- \cleardoublepage
- \rc{\thepage}{\arabic{page}}
-%
- \pagestyle{myheadings}
- \markboth{\hspace*{-8mm} \underline{\rm \hspace*{126mm} SinqHM \myident}}%
-	 {\underline{\rm SinqHM \myident \hspace*{126mm}} \hspace*{-8mm}}
-%
-    \section{Introduction}
-%   ======================
-%
-      This note specifies the interface between the SINQ histogram memory,
-      SinqHM, and the data acquisition software.
-
-      The histogram memory is based on a VME Power-PC single board
-      computer (MVME-1603). In the first instance, access to the memory
-      from the data acquisition software will be via its Ethernet interface.
-      At a later date, it is possible to consider a read-out of the memory
-      either via the VME bus or via a higher speed network technology. The
-      client/server nature of the specification should make such extensions
-      relatively simple.
-
-      The initial version of this specification, therefore, is concerned
-      exclusively with defining a TCP/IP client/server model which will
-      allow the control and read-out of the histogram memory via its
-      Ethernet interface. The histogram memory will act as a TCP/IP
-      server offering data access to several data acquisition clients
-      simultaneously. Many of the concepts described here are similar to
-      those implemented in the histogram memory server package which is
-      in use on \musr experiments at PSI \cite{CTN94005}.
-
-      This document assumes a certain familiarity with the C programming
-      language. The header file {\em SinqHM{\usc}def.h} defines all data
-      structures and symbols referred to in the text.
-%
-    \section{Histogramming Concepts and Definitions}
-%   ================================================
-%
-      It appears that there are differences in terminology associated with
-      histograms and the histogramming process according to one's scientific
-      background. These differences can naturally lead to some confusion.
-      The purpose of this section is to try to remove this confusion by
-      describing the process of histogramming in abstract terms and defining
-      the various terms as used in this document. Some of the limitations
-      implicit in the SinqHM implementation will also be discussed.
-      The description of PAW, the Physics Analysis Workstation software
-      package from the CERN 
-      Program Library \cite{PAW}, should be consulted for more
-      information\footnote{Warning: this reference naturally presents the high
-      energy physicist's histogramming terminology!}.
-
-      A {\em histogram} is a frequency distribution of an {\em
-      Ntuple}\footnote{An {\em Ntuple} is a list of identical data structures
-      where each element describes a single event. In the simple
-      case typical of neutron diffraction experiments, an element of the Ntuple
-      might be a single integer giving the number of the counter which detected
-      a neutron. In the more complex situation of a signal from a position
-      sensitive detector, an element of the Ntuple might be several integers
-      giving the various ADC values associated with the signal.}. Each element
-      of the {\em Ntuple} specifies a measured event such as a detected
-      neutron. The processing of an element may generate one or more
-      quantities characterising the event. The process of generating a
-      frequency distribution of these quantities is referred to as {\em
-      histogram filling} or simply {\em histogramming}.
-      
-      The number of quantities which are used to define an event
-      determines the dimension of the histogram. For SinqHM, the events of
-      interest are detected neutrons and the various dimensions of a histogram
-      might be:
-      \begin{itemize}
-      \item the x- or y-coordinate of a position sensitive detector;
-      \item the time-of-flight of a neutron;
-      \item the wire number of a one-dimensional counter array or
-		the counter number of an array of counters.
-      \end{itemize}
-%
-      The histogram is defined by dividing each of its dimensions into
-      a number of intervals called {\em bins} or {\em cells}. Once the bin
-      boundaries in each dimension have been specified, the total number of
-      bins can be calculated and space may be reserved for compiling the
-      histogram. SinqHM refers to this operation as {\em configuring} the
-      histogram memory. Other histogram packages such as HBOOK \cite{PAW} refer
-      to it as {\em booking} the histogram.
-
-      In the general case, the bin boundaries are floating point numbers. It is
-      also possible that bin boundaries along a particular axis are not equally
-      spaced. A further consideration when configuring the histogram memory is
-      the maximum number of events to be recorded in each bin. This determines
-      the number of bytes of computer memory to be reserved for each
-      bin\footnote{SinqHM allows the user to specify that each bin be associated
-      with either 1, 2 or 4 bytes of storage.}. There is
-      naturally a trade-off between available computer memory, the desired
-      experimental resolution and the statistical errors. The
-      action to be taken by the histogramming process on bin overflow should
-      also be specified\footnote{SinqHM will wrap
-      overflowed bins to zero by default. Other actions are possible (see
-      Section~\ref{Sect-sinqhm-config})}.
-
-      Once storage space for the histogram has been reserved, the histogram may
-      by {\em filled}. The process of filling a histogram consists of
-      processing each element of the Ntuple to obtain the index of a bin in the
-      histogram corresponding to the element. This bin is then incremented.
-      In the general case, it is conceivable that the bin increment be weighted
-      in some way so that the bin content could be a floating point number
-      rather than a simple counter.
-
-      The Ntuple to be processed by SinqHM consists of events occuring in
-      real-time during an experimental run. It is therefore vital that the
-      event processing should be efficient in order to minimise the
-      experimental deadtime. For this reason and also because the data to be
-      processed by SinqHM is mainly of integer type,
-      the histogramming procedures implemented in SinqHM are restricted to
-      integer quantities, i.e. the bin boundaries are specified as
-      integers and the histogram bin content is a simple integer counter.
-      Updating a histogram involves adding one to the contents of a single bin.
-
-      In many cases, the
-      dimension of a histogram is somewhat arbitrary since,
-      in practice, a histogram is stored as a one dimensional array in
-      computer memory: an $m \times n$ 2-dimensional histogram may equally
-      well be considered as $m$ 1-dimensional histograms with $n$ bins each.
-      SinqHM does not have a well-defined policy in this respect. In general,
-      though, the dimension of a histogram as perceived by SinqHM is a
-      function of the number of values used to access a bin. For example:
-      \begin{itemize}
-      \item On the FOCUS time-of-flight instrument, a histogram bin is defined
-        by the number of the counter which detected the neutron and the time at
-        which the neutron was detected after the chopper's start pulse. SinqHM
-        considers this to be a 2-dimensional histogram.
-      \item On the SANS small angle scattering instrument, the x/y position
-	of the neutron in the 128~$\times$~128 2-dimensional detector is
-	encoded into a single 14 bit integer. SinqHM therefore considers
-	this to be a 1-dimensional histogram with 16384 bins. Physically,
-        however, a 2-dimensional interpretation would be more meaningful. If the
-	instrument is operated in time-of-flight mode, the result is a
-	2-dimensional histogram with the x/y position as one dimension
-	and time as the second dimension. It is also possible to operate the
-	instrument in {\em stroboscopic} mode in which a cyclic variation
-	in the conditions of the sample could be considered as yet another
-	dimension of the histogram. However, in the specification of SinqHM,
-	it has been decided to consider instead that the stroboscopic phase
-	be treated as a histogram selector rather than as an extra histogram
-	dimension.
-      \item On experiments with polarised neutrons, the up/down polarity
-	could be used as an extra dimension to the histogram. The histogram
-	would only have
-	two bins in this dimension. As with the SANS stroboscopic mode, it
-	has been decided to treat the up/down bit as a histogram selector
-	rather than as an extra histogram dimension.
-      \end{itemize}
-
-      \noindent The problem of selecting the number of bytes of computer memory
-      associated with each bin has already been mentioned. In some
-      histogramming package implementations, this
-      parameter is referred to as the {\em bin-width}, i.e. its width in
-      computer memory. In this document, however, this parameter will be
-      referred to as {\em bytes-per-bin}. The term {\em bin-width} will be used
-      to refer to the physical width of the bin. For example, in a time-of
-      flight spectrum, the {\em bin-width}\footnote{The terms {\em bin-span} or
-      {\em span} may sometimes be used instead.} might refer to the time in
-      nsecs spanned by the bin and, in the case where the parameter being
-      histogrammed is a counter number, {\em bin-width} will refer to the
-      number of counters combined into one bin. In this latter case, the term
-      {\em bin-compression} may be used instead.
-%
-    \section{Hardware Overview}
-%   ===========================
-%
-    \label{Sect-hardware}
-%
-      The data acquisition hardware of a typical SINQ instrument is as
-      shown in Figure~\ref{Fig-hard-config}. The various types of multi-detector
-      which are
-      planned for SINQ instruments can be interfaced via the
-      multi-detector interface to a 100 Mbaud fibre optic link to the
-      histogram memory. The multi-detector interface is set up via
-      front-panel switches and via its serial RS-232-C interface.
-      An inhibit signal\footnote{The inhibit
-      signal can, for
-      example, be generated by the {\em rate-low} output from an EL737
-      Neutron Counter. It is therefore referred to as {\em Neutron Rate Low}
-      or {\em NRL}.} can be input to the multi-detector interface. The
-      state of this signal is transmitted along with the detector data
-      to the histogram memory and will be used to suppress data
-      acquisition by the histogram memory.
-
-      \begin{figure}[b]%
-      \begin{center}%
-      \epsfig{bbllx=82,bblly=35,bburx=552,bbury=470,%
-		file=hist_mem_spec_fig1.ps,%
-		height=147mm,clip=}%
-      \caption{Typical SINQ Instrument Configuration}%
-      \label{Fig-hard-config}%
-      \end{center}%
-      \end{figure}
-
-      The host communicates with the various serial devices, which are used to
-      control the instrument, via the TCP/IP based terminal server. 
-
-      The main interaction between the physicists and the instrument
-      hardware is via the {\em host} computer.
-%
-    \section{Software Components}
-%   =============================
-%
-      The software components of the SinqHM sub-system are shown in
-      Figure~\ref{Fig-soft-comp}.
-      The SinqHM-master process is responsible for creating
-      offspring processes which then run asynchro\-nously under the
-      PowerPC's operating system. When the SinqHM sub-system is first
-      started, only SinqHM-master is running. It is waiting to accept a
-      connection on its TCP/IP listener port from a client whose first
-      job is to ``configure'' SinqHM. ``Configuring the Histogram Memory''
-      involves specifying the mode in which the histogram memory is to
-      operate, reserving and initialising the histogram memory buffer,
-      creating the necessary semaphores for synchronising access to this
-      buffer and activating the {\em histogram filler} background process.
-
-      \begin{figure}[b]%
-      \begin{center}%
-      \epsfig{bbllx=102,bblly=40,bburx=535,bbury=590,%
-		file=hist_mem_spec_fig2.ps,%
-		height=165mm,clip=}%
-      \caption{SinqHM Software Components}%
-      \label{Fig-soft-comp}%
-      \end{center}%
-      \end{figure}
-
-      The main activity of the {\em filler} process is to read data from the
-      fibre-optic link and update the defined histograms accordingly. It
-      will use the RS-232-C connection to the front-end electronics, as
-      described in Section~\ref{Sect-mdi-comm}, for forwarding any necessary
-      configuration information to the electronics. It is also possible
-      to instruct {\em filler} to suspend and resume data acquisition but it
-      is expected that this will not be the normal method used to
-      control data acquisition. Instead, the data acquisition software
-      (running on the host computer) will usually inhibit data
-      acquisition by inhibiting the EL737 neutron counter. This will
-      then cause suspension of data acquisition by {\em filler} via the
-      inhibit signal to the multi-detector interface (see
-      Fig.~\ref{Fig-hard-config}).
-
-      Once SinqHM has been configured, SinqHM-master enters its normal
-      operating mode where it will accept requests from clients. These
-      requests may either be of a one-off nature or they may involve the
-      creation of a SinqHM-server process for a long-term connection
-      between the client and the SinqHM system. One-off requests are
-      suitable for infrequent operations such as the setting of the contents of
-      the histogram memory to zero in preparation for a new data acquisition
-      run. A long-term connection would be suitable for a client which is
-      generating an updating display of the histogram contents.
-
-      Figure~\ref{Fig-soft-comp} shows the
-      situation in which  SinqHM has been configured
-      and has set up long-term connections for 3 clients. One of these
-      clients could, for example, be responsible for making a regular
-      archive of the histogram contents to disk file while the other two
-      could be programs which periodically show the current contents of
-      all or part of the histogram memory buffer. These two display
-      programs could quite well be running on two different hosts such
-      as the DECstation in the experimental barrack and a workstation in
-      a physicist's office.
-      
-      The general procedure for configuring SinqHM is described in
-      Section~\ref{Sect-config-sinqhm} whereas
-      the general procedure for creating a long-term
-      connection to a SinqHM-server is described in
-      Section~\ref{Sect-serv-setup}. The
-      detailed definition  of messages to SinqHM is given in
-      Section~\ref{Sect-sinqhm-comm}.
-
-      \begin{figure}[b]%
-      \begin{center}%
-      \epsfig{bbllx=136,bblly=40,bburx=507,bbury=480,%
-		file=hist_mem_spec_fig3.ps,%
-		height=155mm,clip=}%
-      \caption{Configuring SinqHM}%
-      \label{Fig-conf-sinqhm}%
-      \end{center}%
-      \end{figure}
-
-    \section{Configuring the SinqHM Master}
-%   =======================================
-%
-    \label{Sect-config-sinqhm}
-%
-      The general procedure for configuring SinqHM is shown in
-      Figure~\ref{Fig-conf-sinqhm}.
-      Note that the creation of the ``Histogram Filler'' is indicated as
-      being via a Posix {\em fork} operation. Unfortunately, the operating
-      system which is being used to develop SinqHM on the PowerPC,
-      VxWorks, does not provide the {\em fork} system call. The {\em taskSpawn}
-      system call is used instead.
-
-      The details of the configure request which is sent to SinqHM
-      Master are given in Section~\ref{Sect-sinqhm-config}.
-      This request will define the type
-      of detector which is connected to the front-end electronics, the
-      size and number of histograms required, whether ``stroboscopic''
-      (gummi) mode is to be used to switch between histograms as a result
-      of indicators in the data flow from the detector, etc., etc.
-
-    \section{Setting up a Client/Server TCP/IP Data Acquisition Connection}
-%   =======================================================================
-%
-    \label{Sect-serv-setup}
-%
-      Once SinqHM has been configured, SinqHM-master will accept
-      requests from clients for the establishment of a long-term
-      client/server connection. The procedure for doing this is shown in
-      Figure~\ref{Fig-tcpip-setup}.
-      Note that the connection is a two step process. This is
-      {\bf not} the normal procedure for establishing TCP/IP client/server
-      connections.
-
-      \begin{figure}[b]%
-      \begin{center}%
-      \epsfig{bbllx=141,bblly=37,bburx=500,bbury=565,%
-		file=hist_mem_spec_fig4.ps,%
-		height=170mm,clip=}%
-      \caption{TCP/IP Client/Server Setup}%
-      \label{Fig-tcpip-setup}%
-      \end{center}%
-      \end{figure}
-
-      The normal procedure would be for a server to invoke the {\em accept} 
-      procedure to await a connection from a client. The return value of
-      the procedure would be a socket which could be used for communicating with
-      the client. Since a server usually wishes to support several
-      clients simultaneously, it would be
-      usual for the server to {\em fork} at this
-      point in order to create a child process which would then handle
-      the communication with the client using this socket. The parent
-      returns to the {\em accept} call to await connections from further
-      clients via the original socket. In this way, it is simple to
-      generate single-threaded code in the server and to let the
-      operating system handle the multi-processing aspects of the
-      system.
-
-      However, when the Histogram Memory package was implemented
-      for the \musr experi\-ments at PSI using the VAXeln real-time
-      operating system, it was found that the POSIX version of the {\em fork} 
-      procedure created a child process with too much autonomy for it to
-      be able to use a socket passed to it by its parent. Because of
-      some of the conditions which the POSIX standard imposes on child
-      processes created via the {\em fork} procedure\footnote{e.g. a child
-      should be able to survive the termination of its parent.}, it is
-      possible that other real-time operating systems may also suffer from
-      this same problem.
-
-      In order not to abandon POSIX compatibility as a goal
-      in the implementation of the SinqHM package, it has been decided to use
-      the same two step procedure for setting up client/server connections for
-      SinqHM. The procedure is as follows:
-      \begin{itemize}
-      \item The server establishes a base port and waits for clients to
-        connect to it by calling the {\em accept} procedure.
-      \item The client connects to the base port and sends a
-        $<$serve-me$>$ request.
-      \item The server responds by finding a free port (it maintains a pool
-        of ports to be used by its children), setting a global semaphore
-        to the {\em claimed} state, {\em forking} to create a child and
-	informing
-        the child which port it is to use. From now on, the terms
-        {\em server-master} and {\em server-child} will be used to
-	distinguish the
-        two server processes.
-      \item The server-master then waits for the server-child to set the
-        global semaphore to the {\em released} state to indicate that it has
-        completed its initialisation.The server-child creates a socket
-        of its own, {\em binds} it to the port specified by the server-master,
-        sets it to be a {\em listener} and then releases the semaphore on
-        which the server-master is waiting. It then waits via the {\em accept} 
-        procedure for the client to connect to it.
-      \item On continuing from the wait for the global semaphore to become
-        free, the server-master sends the port number of the
-        server-child to the client. It then closes this connection and
-        loops to {\em accept} a further connection to its base port from
-        another client.
-      \item The client, having received the port number from the
-        server-master, closes its connection with server-master, creates
-        a new socket and uses it to connect to the server-child.
-      \item This completes the setup of the client/server connection to
-        SinqHM.
-      \end{itemize}
-      \newpage
-%
-    \section{Communication with SinqHM}
-%   ===================================
-%
-    \label{Sect-sinqhm-comm}
-%
-      All communication with SinqHM (master or child)
-      is initiated from the client side by sending a message of 64 bytes. The
-      format\footnote{Data structures and symbols are defined in
-      the {\em SinqHM{\usc}def.h} header file.} of the message is defined by
-      {\em struct req{\usc}buff{\usc}struct} and
-      has the form:
-%
-      \begin{center}\begin{picture}(125,42)(0,-42)
-       \linethickness{0.15mm} \put(0,0){
-	\put(0, -7){\Topbox{big-end-id}}
-	\put(0,-14){\Midbox{command}}
-	\put(0,-21){\Midbox{}}
-	\put(0,-28){\Midbodydashed{command-body (56 bytes)}}
-	\put(0,-35){\Midbody{}}
-	\put(0,-42){\Botbody{}}
-       }
-      \end{picture}\end{center}
-%
-      \begin{center}\begin{tabular}{|llp{90mm}|} \hline
-	\Tabrow{\textbf{Field}}{Symbol Name}{\textbf{Description}}
-	\hline
-	\Tabrow{big-end-id}{bigend}{Value = 0x12345678\footnotemark. It %
-				allows SinqHM to decide what byte swapping %
-				is required, if any.}
-	\Tabrow{command}{cmnd}{Command verb.}
-	\Tabrow{command-body}{}{56 bytes of command dependent data.}
-	\hline
-      \end{tabular}\end{center}
-      \footnotetext{For the benefit of readers not familiar with the C
-	programming language, {\em 0x} indicates a hexadecimal number.}
-%
-      If there are data associated with the command (e.g. the SQHM{\usc}WRITE
-      command), the command may be followed by extra data. In such cases,
-      the parameters in the command-body will indicate to SinqHM how many
-      extra bytes of data it must receive. The client must not send any further
-      commands until it has sent the indicated number of data bytes.
-
-      When SinqHM has completed the command, it returns a status
-      response to the client. The response to all commands is a 64 byte
-      message defined by {\em struct rply{\usc}buff{\usc}struct}. Its format is:
-%
-      \begin{center}\begin{picture}(125,49)(0,-49)
-       \linethickness{0.15mm} \put(0,0){
-	\put(0, -7){\Topbox{big-end-id}}
-	\put(0,-14){\Midbox{status}}
-	\put(0,-21){\Midbox{sub-status}}
-	\put(0,-28){\Midbox{}}
-	\put(0,-35){\Midbodydashed{reply-body (52 bytes)}}
-	\put(0,-42){\Midbody{}}
-	\put(0,-49){\Botbody{}}
-       }
-      \end{picture}\end{center}
-%
-      \begin{center}\begin{tabular}{|llp{90mm}|} \hline
-	\Tabrow{\textbf{Field}}{Symbol Name}{\textbf{Description}}
-	\hline
-	\Tabrow{big-end-id}{bigend}{Value = 0x12345678. It allows the client %
-				to decide what byte swapping is required, %
-				if any.}
-	\Tabrow{status}{status}{Status code}
-	\Tabrow{sub-status}{sub{\usc}status}{Secondary status code}
-	\Tabrow{reply-body}{}{52 bytes of command dependent data.}
-	\hline
-      \end{tabular}\end{center}
-%
-      The following values for status are possible:
-%
-      {\sffamily\begin{center}\begin{tabular}{|lr|lr|} \hline
-        KER{\usc}{\usc}SUCCESS		&   1 &
-	KER{\usc}{\usc}BAD{\usc}VALUE	&  -6 \\
-        KER{\usc}{\usc}BAD{\usc}CREATE	&  -2 &
-	KER{\usc}{\usc}BAD{\usc}RECV	& -14 \\
-        KER{\usc}{\usc}BAD{\usc}STATE	&  -4 &
-	KER{\usc}{\usc}BAD{\usc}ALLOC	& -16 \\
-        \hline
-      \end{tabular}\end{center}}
-%
-      \noindent Depending on the command (e.g. the SQHM{\usc}READ command) and
-      the values of \sfbf{status} and
-      \sfbf{sub{\usc}status}, the status response may be
-      followed by extra data. In such cases, the parameters in the reply-body
-      will indicate to the client how many extra bytes of data it must
-      receive. These extra bytes must be read by the client before further
-      commands are sent to SinqHM.
-
-      \noindent If the value of \sfbf{status} indicates an error,
-      the reply-body will contain a zero-terminated ASCII string which may help
-      in locating the problem.
-%
-      \begin{itemize}
-      \item[{\bf Note:}] In the various diagrams of commands and status
-             messages which follow, only the defined fields will be
-             shown. The bytes which must be added as padding to
-             bring the total message length up to 64 bytes will not
-             be shown.
-      \end{itemize}
-
-      The following values of \sfbf{cmnd} are recognised by SinqHM:
-%
-	{\sffamily\begin{center}\begin{tabular}{|p{40mm}cp{75mm}|} \hline
-           \textbf{Symbolic Name} & \textbf{Value} & \textbf{Description} \\
-		\hline
-           SQHM{\usc}CNCT     &   0x01 &  Create a SinqHM-server (child) and %
-						open a connection to it. \\
-           SQHM{\usc}CLOSE    &   0x02 &  Close connection to SinqHM-server. \\
-           SQHM{\usc}CONFIG   &   0x03 &  Configure SinqHM. \\
-           SQHM{\usc}DAQ      &   0x04 &  Functions related to data %
-						acquisition. \\
-           SQHM{\usc}DBG      &   0x05 &  Set debug level. \\
-           SQHM{\usc}DECONFIG &   0x06 &  De-configure SinqHM. \\
-           SQHM{\usc}EXIT     &   0x07 &  Instruct SinqHM to close down. \\
-           SQHM{\usc}IDENT    &   0x0e &  Get SinqHM identification. \\
-           SQHM{\usc}PROJECT  &   0x0d &  Read projected histogram data. \\
-           SQHM{\usc}READ     &   0x08 &  Read an area of histogram memory. \\
-           SQHM{\usc}SELECT   &   0x09 &  Select active histogram. \\
-           SQHM{\usc}STATUS   &   0x0a &  Get SinqHM status. \\
-           SQHM{\usc}WRITE    &   0x0b &  Pre-set an area of histogram %
-						memory. \\
-           SQHM{\usc}ZERO     &   0x0c &  Zero an area of histogram memory. \\
-		\hline
-	\end{tabular}\end{center}}
-%
-      The various commands are detailed in the following subsections.
-
-      The programs SINQHM{\usc}CTRL and SINQHM{\usc}CLIENT, described in
-      Sections~\ref{Sect-sinqhm-ctrl} and \ref{Sect-sinqhm-client}, are
-      utility programs which may be used to
-      issue most of these commands to SinqHM.
-%
-      \newpage
-%
-    \subsection{SQHM{\usc}CNCT}
-%   ===========================
-%
-      The SQHM{\usc}CNCT command is the first step in establishing a
-      client/server relationship with SinqHM. It causes SinqHM-master to
-      create a SinqHM-server process to which one may open a connection
-      as a client. This  command may only be sent after SinqHM has been
-      configured. The format of the SQHM{\usc}CNCT command is:
-%
-      \begin{center}\begin{picture}(125,28)(0,-28)
-       \linethickness{0.15mm} \put(0,0){
-	\put(0, -7){\Topbox{big-end-id}}
-	\put(0,-14){\Midbox{SQHM{\usc}CNCT}}
-	\put(0,-21){\Midbox{max-packet-size}}
-	\put(0,-28){\Botbox{startup-mode}}
-       }
-      \end{picture}\end{center}
-%
-      \begin{center}\begin{tabular}{|llp{80mm}|} \hline
-	\Tabrow{\textbf{Field}}{Symbol Name}{\textbf{Description}}
-	\hline
-	\Tabrow{big-end-id}{bigend}{See Section~\ref{Sect-sinqhm-comm}}
-	\Tabrow{SQHM{\usc}CNCT}{cmnd}{Command verb}
-	\Tabrow{max-packet-size}{u.cnct.max{\usc}pkt}{Maximum packet size
-						supported by client.}
-	\Tabrow{startup-mode}{u.cnct.strt{\usc}mode}{Startup mode of
-						SinqHM-server.}
-	\hline
-      \end{tabular}\end{center}
-
-      \sfbf{max{\usc}pkt} should be set to a proposed maximum
-      packet size in bytes\footnote{A value of 8192 is recommended. This is
-      the maximum value which is to be used for the {\em len} argument in
-      calls to the send/recv TCP/IP functions. Although the TCP/IP protocol
-      hides the underlying packet nature of network communications, it has been
-      found that the use of much larger values for {\em len} seems to cause
-      problems.} for communication with the server. The value should be at least
-      1024. SinqHM will respond with the actual value to be used. The
-      actual value will not be greater than \sfbf{max{\usc}pkt}.
-
-      The value of \sfbf{strt{\usc}mode} is passed by SinqHM-master
-      to the created SinqHM-server process. It should normally be set to zero.
-      If it is set non-zero, the server process will suspend itself as soon as
-      it is started. This is intended to allow the server process to be debugged
-      interactively.
-
-      In response to the SQHM{\usc}CNCT command, SinqHM-master allocates a
-      TCP/IP port number for a new server process, establishes the packet size
-      which the server should use and creates the server process. The server is
-      passed the value of the TCP/IP port number and the value of
-      \sfbf{strt{\usc}mode}. It then waits for the server to
-      initialise itself before returning a status response to the client. The
-      format of the response is shown below. Values of the
-      \sfbf{status} field may be:
-%
-	{\sffamily\begin{center}\begin{tabular}{|p{40mm}p{100mm}|} \hline
-          KER{\usc}{\usc}SUCCESS         & SinqHM-server started successfully.\\
-          KER{\usc}{\usc}BAD{\usc}STATE  & SinqHM has not yet been configured.\\
-          KER{\usc}{\usc}BAD{\usc}CREATE & Creation of child process failed. The
-                                 cause is indicated by \textbf{sub{\usc}status}.
-                                 Possible values are: \\
-		& \hspace*{5mm}	-1  Spawn failed. \\
-		& \hspace*{5mm}	-2  No more ports available. \\
-		& \hspace*{5mm}	-3  The child took more than 15 seconds to \\
-		& \hspace*{15mm} initialise itself. The child has been
-					terminated. \\
-		& \hspace*{5mm}	-4  The child had a start-up problem. \\
-		\hline
-	\end{tabular}\end{center}}
-%
-      \newpage
-      The format of the status response to a SQHM{\usc}CNCT command is:
-%
-      \begin{center}\begin{picture}(125,112)(0,-112)
-       \linethickness{0.15mm} \put(0,0){
-	\put(0,  -7){\Topbox{big-end-id}}
-	\put(0, -14){\Midbox{status}}
-	\put(0, -21){\Midbox{sub-status}}
-	\put(0, -28){\Midbox{port-number}}
-	\put(0, -35){\Midbox{packet-size}}
-	\put(0, -42){\Midbox{hist-mode}}
-	\put(0, -49){\Midbox{number-hists}}
-	\put(0, -56){\Midbox{number-bins}}
-	\put(0, -63){\Midbox{bytes-per-bin}}
-	\put(0, -70){\Midbox{current-hist}}
-	\put(0, -77){\Midbox{max-free-block}}
-	\put(0, -84){\Midbox{total-bytes}}
-	\put(0, -91){\Midbox{low-cntr}}
-	\put(0, -98){\Midbox{low-bin}}
-	\put(0,-105){\Midbox{compress}}
-	\put(0,-112){\Botbox{up-time}}
-       }
-      \end{picture}\end{center}
-%
-      \begin{center}\begin{tabular}{|llp{80mm}|} \hline
-	\Tabrow{\textbf{Field}}{Symbol Name}{\textbf{Description}}
-	\hline
-	\Tabrow{big-end-id}{bigend}{See Section~\ref{Sect-sinqhm-comm}}
-	\Tabrow{status}{status}{Status code}
-	\Tabrow{sub-status}{sub{\usc}status}{Secondary status code}
-	\Tabrow{port-number}{u.cnct.port}{TCP/IP port number of SinqHM-server}
-	\Tabrow{packet-size}{u.cnct.pkt{\usc}size}{Client/server packet size}
-	\Tabrow{hist-mode}{u.cnct.hm{\usc}mode}{Histogram memory mode}
-	\Tabrow{number-hists}{u.cnct.n{\usc}hists}{Number of defined histograms}
-	\Tabrow{number-bins}{u.cnct.num{\usc}bins}{Number of bins per histogram}
-	\Tabrow{bytes-per-bin}{u.cnct.bytes{\usc}per{\usc}bin}{Number of bytes
-						per bin (1, 2 or 4)}
-	\Tabrow{current-hist}{u.cnct.curr{\usc}hist}{Currently selected histogram}
-	\Tabrow{max-free-block}{u.cnct.max{\usc}block}{Largest free memory block %
-						(in bytes)}
-	\Tabrow{total-bytes}{u.cnct.total{\usc}bytes}{Size of all defined histograms}
-	\Tabrow{low-cntr}{u.cnct.lo{\usc}cntr}{First defined counter}
-	\Tabrow{low-bin}{u.cnct.lo{\usc}bin}{Lower edge of first bin}
-	\Tabrow{compress}{u.cnct.compress}{Bin compression factor}
-	\Tabrow{up-time}{u.cnct.up{\usc}time}{SinqHM up-time in seconds}
-	\hline
-      \end{tabular}\end{center}
-%
-      If the value of \sfbf{status} indicates success, the value of
-      \sfbf{port} is the
-      value to be used by the client in establishing its connection to
-      the SinqHM-server. \sfbf{pkt{\usc}size} will be the maximum
-      value of the {\em len} 
-      argument which the server will use in calls to the {\em send/recv}
-      functions. The value will not be greater than
-      \sfbf{max{\usc}pkt}. The values
-      of \sfbf{hm{\usc}mode}, \sfbf{n{\usc}hists},
-      \sfbf{num{\usc}bins},
-      \sfbf{bytes{\usc}per{\usc}bin},
-      \sfbf{total{\usc}bytes},
-      \sfbf{lo{\usc}cntr}, \sfbf{lo{\usc}bin} and
-      \sfbf{compress} indicate the
-      configuration\footnote{Note: in TOF mode, it is possible to define a more
-      complex configuration than can be described in the 64 byte status
-      response. At present, there is no way of obtaining this detailed
-      information from SinqHM.} of the histogram memory (see
-      Sect.~\ref{Sect-sinqhm-config}).
-      \sfbf{curr{\usc}hist} indicates the currently selected
-      histogram (see Sect.~\ref{Sect-sinqhm-select}).
-      \sfbf{max{\usc}block} indicates
-      the maximum free memory block currently
-      available in the histogram memory. \sfbf{up{\usc}time}, which is set
-      whether or not \sfbf{status} indicates success, gives the time in seconds
-      since SinqHM-master was started.
-%
-      \vspace*{20mm}
-%
-    \subsection{SQHM{\usc}CLOSE}
-%   ============================
-%
-      The SQHM{\usc}CLOSE command is used to terminate communication with
-      one's SinqHM-server. There are no command dependent parameters and
-      there is {\bf no status response}. The SinqHM-server will simply tidy up,
-      close its TCP/IP socket and exit.
-
-      The SQHM{\usc}CLOSE command will be ignored if issued to SinqHM-master.
-%
-      \newpage
-%
-    \subsection{SQHM{\usc}CONFIG}
-%   =============================
-%
-    \label{Sect-sinqhm-config}
-%
-      The SQHM{\usc}CONFIG command is used to configure SinqHM. It informs
-      SinqHM-master of the required histogram memory space, the type of
-      detector from which data will be coming and the mode in which
-      histograms are to be filled. Until SinqHM has been successfully
-      configured, it will not establish any client/server connections. The
-      format of the SQHM{\usc}CONFIG command is:
-%
-      \begin{center}\begin{picture}(125,49)(0,-49)
-       \linethickness{0.15mm} \put(0,0){
-	\put(0, -7){\Topbox{big-end-id}}
-	\put(0,-14){\Midbox{SQHM{\usc}CONFIG}}
-	\put(0,-21){\Midbox{hist-mode}}
-	\put(0,-28){\Midbox{}}
-	\put(0,-35){\Midbody{mode dependent parameters}}
-	\put(0,-42){\Midbody{see Sections~\ref{SubSect-transp},
-		\ref{SubSect-hm-dig}, \ref{SubSect-TOF},
-		\ref{SubSect-HRPT} and \ref{SubSect-PSD}}}
-	\put(0,-49){\Botbody{}}
-       }
-      \end{picture}\end{center}
-%
-      \begin{center}\begin{tabular}{|llp{75mm}|} \hline
-	\Tabrow{\textbf{Field}}{Symbol Name}{\textbf{Description}}
-	\hline
-	\Tabrow{big-end-id}{bigend}{See Section~\ref{Sect-sinqhm-comm}}
-	\Tabrow{SQHM{\usc}CONFIG}{cmnd}{Command verb}
-	\Tabrow{hist-mode}{u.cnfg.mode}{Histogram memory mode}
-	\hline
-      \end{tabular}\end{center}
-%
-      The \sfbf{mode} parameter specifies the basic operating mode
-      of the histogram memory. This mode must agree with the set-up of
-      the multi-detector interface since the format of data packets from this
-      interface is mode dependent. Values which may be taken by
-      \sfbf{mode} are:
-%
-	{\sffamily\begin{center}\begin{tabular}{|p{37mm}cp{94mm}|} \hline
-           \multicolumn{3}{|l|}{Supported values of \textbf{mode}} \\
-		\hline
-           SQHM{\usc}{\usc}TRANS & 0x1000 & Transparent mode. See
-				Section~\ref{SubSect-transp}. \\
-           SQHM{\usc}{\usc}HM{\usc}DIG & 0x2000 & Histogram mode with
-				digitised read-out. See
-				Section~\ref{SubSect-hm-dig}. \\
-           SQHM{\usc}{\usc}TOF & 0x3000 & Time-of-flight mode. See
-				Section~\ref{SubSect-TOF}. \\
-           SQHM{\usc}{\usc}HM{\usc}PSD & 0x4000 & Histogram mode with
-				TriCS type position sensitive detector
-				(charge division read-out). See
-				Section~\ref{SubSect-PSD}. \\
-           SQHM{\usc}{\usc}HRPT & 0x5000 & Histogram mode for HRPT type
-				interface. See
-			Section~\ref{SubSect-HRPT}. \\
-		\hline
-	\end{tabular}\end{center}}
-%
-      It is also possible to set modifier bits in the \sfbf{mode} parameter.
-      These may be used to refine the operation of the histogramming function.
-      The defined modifier bits are listed in the upper table on the next
-      page.\\[1.0ex]
-%
-      In response to a SQHM{\usc}CONFIG command,
-      SinqHM-master will reserve the required buffer space for the
-      histograms and start the SinqHM-filler process. Once the filler
-      process has initialised itself, a status response is returned.
-      Only the \sfbf{status} and \sfbf{sub{\usc}status}
-      fields of the response are significant. Possible values for \sfbf{status}
-      in the status response are listed in the lower table on the next
-      page.
-%
-	{\sffamily\begin{center}\begin{tabular}{|p{37mm}cp{94mm}|} \hline
-           \multicolumn{3}{|l|}{Modifier bits of \textbf{mode}} \\
-		\hline
-           SQHM{\usc}{\usc}DEBUG & 0x01 & Can be set to facilitate interactive %
-			debugging of the histogram memory software. If this %
-			bit is set, the histogram filler process will suspend %
-			itself after being started to allow the use of an %
-			interactive debugger. \\
-           SQHM{\usc}{\usc}UD & 0x02 & The \textsl{up/down} bit delivered by
-			the front-end electronics will be used to select
-			the histogram to be updated. The value of
-			\textbf{n{\usc}hists} must be a multiple of 2
-			in this mode. This bit and the SQHM{\usc}{\usc}STROBO
-			bit are mutually exclusive. \\
-           SQHM{\usc}{\usc}BO{\usc}MSK & 0x18 & Bin-overflow mask - use this
-			to mask out the \textsl{bin-overflow} bits
-			of \textbf{mode} as defined in the following
-			3 entries. \\
-           SQHM{\usc}{\usc}BO{\usc}IGN & 0x00 & Ignore bin overflows. An 
-			overflowing bin will wrap-around to zero. \\
-           SQHM{\usc}{\usc}BO{\usc}SMAX & 0x08 & Stop at maximum. If a bin
-			overflows, stop incrementing the bin when the maximum
-			count in the bin is reached. Other bins will continue
-			to count. \\
-           SQHM{\usc}{\usc}BO{\usc}CNT & 0x10 & Count bin overflows. If a bin
-			overflows, the number of the overflowing bin is
-			added to a table where the number of overflows of
-			this bin are recorded. This feature is not yet
-			supported. \\
-           SQHM{\usc}{\usc}STROBO & 0x20 & The raw data from the
-			fibre-optic link is expected to be
-			single-channel-stroboscopic-mode.  The
-			binning-address-bits delivered 
-			by the front-end electronics will be
-			used to select the histogram 
-			which will be updated. The value of
-			\textbf{n{\usc}hists} must be a multiple of 
-			16. This bit and the SQHM{\usc}{\usc}UD
-			bit are mutually exclusive.
-			Note that a finer selection of the
-			histogram which is to be updated based on 
-			the time-stamp information in the raw data is
-			not yet defined. \\
-           SQHM{\usc}{\usc}REFLECT & 0x40 & The histogram wires will be
-				reflected (needed by HRPT). \\
-           SQHM{\usc}{\usc}NO{\usc}STAT & 0x80 & The status info displayed by
-				Filler on the COM1 port will be suppressed. \\
-		\hline
-	\end{tabular}\end{center}}
-%
-	{\sffamily\begin{center}\begin{tabular}{|p{40mm}p{104mm}|} \hline
-          KER{\usc}{\usc}SUCCESS         & SinqHM-filler started successfully.\\
-          KER{\usc}{\usc}BAD{\usc}STATE  & SinqHM has already been configured.\\
-          KER{\usc}{\usc}BAD{\usc}VALUE  & Invalid parameter found. \\
-	  KER{\usc}{\usc}BAD{\usc}ALLOC  & Not enough space available for
-			histogram memory buffer. The maximum 
-			available space in bytes is given by
-			\textbf{sub{\usc}status}. \\
-          KER{\usc}{\usc}BAD{\usc}CREATE & Creation of SinqHM-filler failed. The
-			cause is indicated \\
-		& by \textbf{sub{\usc}status}. Possible values are: \\
-		& \hspace*{5mm}	-1  Spawn failed. \\
-		& \hspace*{5mm}	-2  SinqHM-filler already active (should
-			not be possible). \\
-		& \hspace*{5mm}	-3  SinqHM-filler took more than 15 seconds
-			to \\
-		& \hspace*{15mm} initialise itself. It has been
-					terminated. \\
-		& \hspace*{5mm}	-4  SinqHM-filler had a start-up problem. \\
-		\hline
-	\end{tabular}\end{center}}
-%
-      \newpage
-%
-    \subsubsection{SQHM{\usc}{\usc}TRANS: Transparent Mode}
-%   =======================================================
-%
-    \label{SubSect-transp}
-%
-      No histogramming is done in Transparent Mode. The raw data as read from
-      the fibre-optic link is buffered and transferred to the host on request.
-      The format of the SQHM{\usc}TRANS command is:
-%
-      \begin{center}\begin{picture}(125,35)(0,-35)
-       \linethickness{0.15mm} \put(0,0){
-	\put(0, -7){\Topbox{big-end-id}}
-	\put(0,-14){\Midbox{SQHM{\usc}CONFIG}}
-	\put(0,-21){\Midbox{SQHM{\usc}{\usc}TRANS}}
-	\put(0,-28){\Midbox{buff-number}}
-	\put(0,-35){\Botbox{buff-size}}
-       }
-      \end{picture}\end{center}
-%
-      \begin{center}\begin{tabular}{|llp{68mm}|} \hline
-	\Tabrow{\textbf{Field}}{Symbol Name}{\textbf{Description}}
-	\hline
-	\Tabrow{big-end-id}{bigend}{See Section~\ref{Sect-sinqhm-comm}}
-	\Tabrow{SQHM{\usc}CONFIG}{cmnd}{Command verb}
-	\Tabrow{SQHM{\usc}{\usc}TRANS}{mode}{The selected mode}
-	\Tabrow{buff-number}{$<$prefix$>$.n{\usc}buffs}{Number of buffers to
-							use.}
-	\Tabrow{buff-size}{$<$prefix$>$.n{\usc}bytes}{Size of each buffer in
-							bytes.}
-	\hline
-      \end{tabular}\end{center}
-%
-      \sfbf{$<$prefix$>$} is
-      \sfbf{u.cnfg.u.trans}.\\[1.0ex]
-%
-      The buffers are used cyclically. Their contents may be read via the
-      SQHM{\usc}READ command.
-%
-      \newpage
-%
-    \subsubsection{SQHM{\usc}{\usc}HM{\usc}DIG: Digitised Histogram Mode}
-%   =====================================================================
-%
-    \label{SubSect-hm-dig}
-%
-      The raw data from the fibre-optic link is expected to be
-      \textsl{single-channel-histogram-mode}. It will be histogrammed into the
-      currently selected histogram (see Sect.~\ref{Sect-sinqhm-select}). If the
-      SQHM{\usc}{\usc}UD or SQHM{\usc}{\usc}STROBO modifier bit of
-      \sfbf{mode} is
-      set, the {\em up/down bit} or the {\em binning-address-bits} in the
-      fibre-optic data packets will be used to select one of a group of adjacent
-      histograms to be updated.\\[1.0ex]
-%
-      The format of the SQHM{\usc}CONFIG command for Digitised Histogram Mode
-      is:
-%
-      \begin{center}\begin{picture}(125,56)(0,-56)
-       \linethickness{0.15mm} \put(0,0){
-	\put(0, -7){\Topbox{big-end-id}}
-	\put(0,-14){\Midbox{SQHM{\usc}CONFIG}}
-	\put(0,-21){\Midbox{SQHM{\usc}{\usc}HM{\usc}DIG}}
-	\put(0,-28){\Midbox{number-hists}}
-	\put(0,-35){\Midbox{low-bin}}
-	\put(0,-42){\Midbox{number-bins}}
-	\put(0,-49){\Midbox{bytes-per-bin}}
-	\put(0,-56){\Botbox{bin-compress}}
-       }
-      \end{picture}\end{center}
-%
-      \begin{center}\begin{tabular}{|llp{68mm}|} \hline
-	\Tabrow{\textbf{Field}}{Symbol Name}{\textbf{Description}} \hline
-	\Tabrow{big-end-id}{bigend}{See Section~\ref{Sect-sinqhm-comm}}
-	\Tabrow{SQHM{\usc}CONFIG}{cmnd}{Command verb}
-	\Tabrow{SQHM{\usc}{\usc}HM{\usc}DIG}{mode}{The selected mode}
-	\Tabrow{number-hists}{$<$prefix$>$.n{\usc}hists}{Number of
-						defined histograms.}
-	\Tabrow{low-bin}{$<$prefix$>$.lo{\usc}bin}{Coordinate of lower
-						edge of first bin.}
-	\Tabrow{number-bins}{$<$prefix$>$.num{\usc}bins}{Number of bins
-						per histogram.}
-	\Tabrow{bytes-per-bin}{$<$prefix$>$.bytes{\usc}per{\usc}bin}{%
-				Number of bytes per bin (1, 2 or 4).}
-	\Tabrow{bin-compress}{$<$prefix$>$.compress}{Bin compression factor 
-					(bin width).}
-	\hline
-      \end{tabular}\end{center}
-%
-      \sfbf{$<$prefix$>$} is
-      \sfbf{u.cnfg.u.hm{\usc}dig}.\\[1.0ex]
-%
-      Let $x$ be the 16-bit data field obtained from the fibre-optic event
-      packet. If\\[1.0ex]
-%
-	\hspace*{\fill}
-		$ x < \sfbf{lo{\usc}bin} $
-	\hspace*{\fill} \\[1.0ex]
-%
-      the lower {\em out-of-range} counter for the histogram will be
-      incremented. If\\[1.0ex]
-%
-	\hspace*{\fill}
-		$ x \geq (\sfbf{lo{\usc}bin} + \sfbf{num{\usc}bins} \times
-				\sfbf{compress}) $
-	\hspace*{\fill} \\[1.0ex]
-%
-      the upper {\em out-of-range} counter for the histogram will be
-      incremented. Otherwise, the index of the bin to be incremented
-      is:\\[1.0ex]
-%
-	\hspace*{\fill}
-		$ (x - \sfbf{lo{\usc}bin})/\sfbf{compress} $
-	\hspace*{\fill} \\[1.0ex]
-%
-      In most cases, \sfbf{lo{\usc}bin} will be 0 and
-      \sfbf{compress} will be 1. 
-%
-      \newpage
-%
-    \subsubsection{SQHM{\usc}{\usc}TOF: Time-of-Flight Mode}
-%   ========================================================
-%
-    \label{SubSect-TOF}
-%
-      Time-of-flight (TOF) histograms are intrinsically 2-dimensional. One
-      dimension is the time after the start signal at which the neutron was
-      detected and the other dimension is the position (or number) of the
-      detector which detected the neutron. There are two special
-      requirements for TOF spectra which
-      complicate the definition of the configuration command. These are:
-      \begin{itemize}
-       \item the time-span of the bins of the histogram along the time axis may
-	not be constant. It may, for example, be preferable to define bin
-	boundaries so that the bin width is constant after the histograms have
-	been converted to energy space.
-       \item it may be necessary to define different time-binning for various
-	sections of the bank of detectors.
-      \end{itemize}
-%
-      For this reason, two special data structures have been defined for use in
-      the SQHM{\usc}{\usc}TOF mode configuration command. These are the {\em
-      edge-array} and {\em counter-bank} data structures.\\[1.5ex]
-%
-    \hspace*{-3mm}\textbf{The {\em edge-array} Structure}
-
-      \noindent The {\em edge-array} data structure is \sfbf{struct
-      tof{\usc}edge{\usc}arr}. It is used to specify the bin coordinates of a
-      histogram. Its format is:
-%
-      \begin{center}\begin{picture}(125,35)(0,-35)
-       \linethickness{0.15mm} \put(0,0){
-	\put(0, -7){\Topbox{number-bins}}
-	\put(0,-14){\Midbox{flag}}
-	\put(0,-21){\Midbox{}}
-	\put(0,-28){\Midbody{edges}}
-	\put(0,-35){\Botbody{}}
-       }
-      \end{picture}\end{center}
-%
-      \begin{center}\begin{tabular}{|llp{68mm}|} \hline
-	\Tabrow{\textbf{Field}}{Symbol Name}{\textbf{Description}} \hline
-	\Tabrow{number-bins}{n{\usc}bins}{Number of bins per counter.}
-	\Tabrow{flag}{flag}{If set to 1, variable bin width.}
-	\Tabrow{edges}{edges[]}{Array of lower bin edges.}
-	\hline
-      \end{tabular}\end{center}
-%
-      If the least significant bit of \sfbf{flag} is zero, the associated
-      histogram has a fixed bin width
-      along the time axis. In this case, \sfbf{edges[]} has 2 elements giving
-      the lower edge of the first two bins. From this, the lower edges of the
-      complete time axis of the histogram can be computed. \\[1.0ex]
-%
-      If the least significant bit of \sfbf{flag} is non-zero, the associated
-      histogram has a variable bin
-      width. In this case, \sfbf{edges[]} must have (\sfbf{n{\usc}bins} + 1)
-      elements giving the lower edges of all the bins. The last element should
-      be 1 greater than the upper edge of the last bin. \\[1.5ex]
-%
-    \hspace*{-3mm}\textbf{The {\em counter-bank} Structure}
-
-      \noindent The {\em counter-bank} data structure is \sfbf{struct
-      tof{\usc}bank}. It is used to specify a group of TOF counters, all of
-      which have the same histogram binning along the time axis. Its format is:
-%
-      \begin{center}\begin{picture}(125,28)(0,-28)
-       \linethickness{0.15mm} \put(0,0){
-	\put(0, -7){\Topbox{first-cntr}}
-	\put(0,-14){\Midbox{number-cntrs}}
-	\put(0,-21){\Midbox{edge-index}}
-	\put(0,-28){\Botbox{bytes-per-bin}}
-       }
-      \end{picture}\end{center}
-%
-      \begin{center}\begin{tabular}{|llp{68mm}|} \hline
-	\Tabrow{\textbf{Field}}{Symbol Name}{\textbf{Description}} \hline
-	\Tabrow{first-cntr}{first}{Number of first counter in bank.}
-	\Tabrow{number-cntrs}{n{\usc}cntrs}{Number of counters in bank.}
-	\Tabrow{edge-index}{edge{\usc}indx}{Index of corresponding edge-array.}
-	\Tabrow{bytes-per-bin}{bytes{\usc}per{\usc}bin}{Number of bytes per bin
-						(1, 2 or 4).}
-	\hline
-      \end{tabular}\end{center}
-%
-      Having defined the {\em edge-array} and {\em counter-bank} data
-      structures, it is now possible to define the SQHM{\usc}{\usc}TOF mode
-      configuration command as follows:
-%
-      \begin{center}\begin{picture}(125,84)(0,-84)
-       \linethickness{0.15mm} \put(0,0){
-	\put(0, -7){\Topbox{big-end-id}}
-	\put(0,-14){\Midbox{SQHM{\usc}CONFIG}}
-	\put(0,-21){\Midbox{SQHM{\usc}{\usc}TOF}}
-	\put(0,-28){\Midbox{extra-bytes}}
-	\put(0,-35){\Midwordbox{n-banks}{n-edges}}
-	\put(0,-42){\Midbox{preset-delay}}
-	\put(0,-49){\Midbox{}}
-	\put(0,-56){\Midbodydashed{edge[0] $\ldots$ edge[n-edges]}}
-	\put(0,-63){\Botbody{}}
-	\put(0,-70){\Midbox{}}
-	\put(0,-77){\Midbodydashed{bank[0] $\ldots$ bank[n-banks]}}
-	\put(0,-84){\Botbody{}}
-       }
-      \end{picture}\end{center}
-%
-      \begin{center}\begin{tabular}{|llp{68mm}|} \hline
-	\Tabrow{\textbf{Field}}{Symbol Name}{\textbf{Description}} \hline
-	\Tabrow{big-end-id}{bigend}{See Section~\ref{Sect-sinqhm-comm}}
-	\Tabrow{SQHM{\usc}CONFIG}{cmnd}{Command verb}
-	\Tabrow{SQHM{\usc}{\usc}TOF}{mode}{The selected mode}
-	\Tabrow{extra-bytes}{$<$prefix$>$.n{\usc}extra{\usc}bytes}{Number of
-						extra bytes to read.}
-	\Tabrow{n-edges}{$<$prefix$>$.n{\usc}edges}{Number of edge arrays
-						following.}
-	\Tabrow{n-banks}{$<$prefix$>$.n{\usc}banks}{Number of counter banks
-						following.}
-	\Tabrow{preset-delay}{$<$prefix$>$.preset{\usc}delay}{Time delay for
-					sending to multi-detector interface.}
-	\Tabrow{edge[i]}{$<$prefix$>$.edge{\usc}0}{An edge array.}
-	\Tabrow{bank[j]}{$<$prefix$>$.bank{\usc}0}{A counter bank.}
-	\hline
-      \end{tabular}\end{center}
-%
-      \sfbf{$<$prefix$>$} is
-      \sfbf{u.cnfg.u.tof}. \\[1.0ex]
-%
-      If the data required for the edge-arrays and counter-banks exceeds the
-      normal 64-byte limit for a message to SinqHM, the parameter
-      \sfbf{n{\usc}extra{\usc}bytes} must indicate the number of extra bytes
-      which must be read by SinqHM to complete the message. For the case of
-      fixed bin width histograms and a single counter-bank,
-      \sfbf{n{\usc}extra{\usc}bytes} will be zero. The
-      \sfbf{preset{\usc}delay} is sent to the multi-detector interface via
-      the COM2 port of the MVME-1603 PowerPC module. See
-      Section~\ref{Sect-mdi-comm} for details.\\[1.0ex]
-%
-      Note that, if there is more than one edge-array or if the
-      edge-array defines bins with a variable width, the location of the
-      counter-banks in the command must be computed at run time.
-%
-	\vspace*{10mm}
-%
-    \subsubsection{SQHM{\usc}{\usc}HRPT: HRPT Detector Mode}
-%   ============================================================================
-%
-    \label{SubSect-HRPT}
-%
-      The raw data from the fibre-optic link is expected to be
-      \textsl{3-channel-histogram-mode} as defined for the CERCA interface for
-      the HRPT detector. It will be histogrammed into the
-      currently selected histogram (see Sect.~\ref{Sect-sinqhm-select}). If the
-      SQHM{\usc}{\usc}UD or SQHM{\usc}{\usc}STROBO modifier bit of
-      \sfbf{mode} is
-      set, the {\em up/down bit} or the {\em binning-address-bits} in the
-      fibre-optic data packets will be used to select one of a group of adjacent
-      histograms to be updated.\\[1.0ex]
-%
-      The format of the SQHM{\usc}CONFIG command for HRPT mode is the same
-      as for Digitised Histogram Mode (see Sect.~\ref{SubSect-hm-dig})
-      except for the \sfbf{mode} field, which must naturally be set to
-      \sfbf{SQHM{\usc}{\usc}HRPT} rather than
-      \sfbf{SQHM{\usc}{\usc}HM{\usc}DIG}.
-%
-	\vspace*{10mm}
-%
-    \subsubsection{SQHM{\usc}{\usc}HM{\usc}PSD: Position Sensitive Detector Mode}
-%   ============================================================================
-%
-    \label{SubSect-PSD}
-%
-      The instruments TRICS and AMOR  use 2D position sensitive detectors
-      provided by the EMBL at ILL. These detectors have a delay line 
-      readout. This means the detector readout for each neutron is two
-      delay values. From these values the actual detector positions can be
-      calculated from the formula:
-      \begin{equation}
-	pos = \frac{(delay - offset)}{factor}
-      \end{equation}      
-      Thus the configuration message must carry two additional values for each
-      of the two detector dimensions. 
-
-      AMOR will be operated in time--of--flight mode. For TRICS this is not
-      necessary. However, as the data telegrams coming from the fibre optic
-      link contain the time binning information in any case it was decided
-      to treat both conditions equally as a variation of the time--of--flight
-      case. For a description of the edge and bank data structures
-      involved  see \ref{SubSect-TOF}. TRICS detectors will then be
-      treated as a time--of--flight detector with a single huge timebin.
-      
-     Thus the  SQHM{\usc}{\usc}HM{\usc}PSD configuration command looks as follows:
-      \begin{center}\begin{picture}(125,105)(0,-105)
-       \linethickness{0.15mm} \put(0,0){
-	\put(0, -7){\Topbox{big-end-id}}
-	\put(0,-14){\Midbox{SQHM{\usc}CONFIG}}
-	\put(0,-21){\Midbox{SQHM{\usc}{\usc}HM{\usc}{\usc}PSD}}
-	\put(0,-28){\Midbox{extra-bytes}}
-	\put(0,-35){\Midwordbox{n-banks}{n-edges}}
-	\put(0,-42){\Midbox{preset-delay}}
-	\put(0,-49){\Midwordbox{x-Factor}{y-Factor}}
-	\put(0,-56){\Midwordbox{X Offset}{Y Offset}}
-	\put(0,-63){\Midwordbox{x Size}{y Size}}
-	\put(0,-70){\Midbox{}}
-	\put(0,-76){\Midbodydashed{edge[0] $\ldots$ edge[n-edges]}}
-	\put(0,-84){\Botbody{}}
-	\put(0,-91){\Midbox{}}
-	\put(0,-98){\Midbodydashed{bank[0] $\ldots$ bank[n-banks]}}
-	\put(0,-105){\Botbody{}}
-       }
-      \end{picture}\end{center}
-%
-      \begin{center}\begin{tabular}{|llp{68mm}|} \hline
-	\Tabrow{\textbf{Field}}{Symbol Name}{\textbf{Description}} \hline
-	\Tabrow{big-end-id}{bigend}{See Section~\ref{Sect-sinqhm-comm}}
-	\Tabrow{SQHM{\usc}CONFIG}{cmnd}{Command verb}
-	\Tabrow{SQHM{\usc}{\usc}HM{\usc}{\usc}PSD}{mode}{The selected mode}
-	\Tabrow{extra-bytes}{$<$prefix$>$.n{\usc}extra{\usc}bytes}{Number of
-						extra bytes to read.}
-	\Tabrow{n-edges}{$<$prefix$>$.n{\usc}edges}{Number of edge arrays
-						following.}
-	\Tabrow{n-banks}{$<$prefix$>$.n{\usc}banks}{Number of counter banks
-						following.}
-	\Tabrow{preset-delay}{$<$prefix$>$.preset{\usc}delay}{Time delay for
-					sending to multi-detector interface.}
-
-	\Tabrow{x-Factor}{$<$prefix$>$.xFactor}{Division factor for
-calculating x position.}
-	\Tabrow{y-factor}{$<$prefix$>$.yFactor}{Division factor for
-calculating y position.}
-
-	\Tabrow{x Offset}{$<$prefix$>$.xOffset}{Offset value  for
-calculating x position.}
-	\Tabrow{y Offset}{$<$prefix$>$.yOffset}{Offset value for
-calculating y position.}
-
-	\Tabrow{xSize}{$<$prefix$>$.xSize}{Number of detector wires in
-x direction.}
-	\Tabrow{ySize}{$<$prefix$>$.ySize}{Number of detector wires in
-y direction.}
-	\Tabrow{edge[i]}{$<$prefix$>$.edge{\usc}0}{An edge array.}
-	\Tabrow{bank[j]}{$<$prefix$>$.bank{\usc}0}{A counter bank.}
-	\hline
-      \end{tabular}\end{center}
-
-
-%
-      \newpage
-%
-    \subsection{SQHM{\usc}DAQ}
-%   ==========================
-%
-      The SQHM{\usc}DAQ command is used for operations related to the
-      enabling and inhibiting of data acquisition by SinqHM. As
-      mentioned in Section~\ref{Sect-hardware},
-      the method of data acquisition control
-      used in the SinqHM histogram memory is to apply a signal to the
-      inhibit input of the multi-detector interface to disable data
-      acquisition by the histogram memory. In this situation, the
-      SQHM{\usc}DAQ command is not necessary. It has been provided to allow
-      the possibility of extending SinqHM for use in other types of
-      experiment, such as \musr, where the data acquisition control
-      philosophy is somewhat different.
-
-      In order to understand the details of the command, it is first
-      necessary to describe the way in which the command is implemented.
-
-      SinqHM maintains a mask, {\em Dsbl{\usc}Mask}, in a region of memory
-      which is
-      accessible to SinqHM-filler and to the SinqHM-servers. Both
-      SinqHM-filler and the SinqHM-servers are each associated with a
-      particular bit in {\em Dsbl{\usc}Mask}. If the mask is non-zero, data
-      acquisition will be inhibited.
-
-      When SinqHM-filler is first started in response to a SQHM{\usc}CONFIG
-      command, it flushes the FIFO from the fibre-optic link and clears
-      {\em Dsbl{\usc}Mask}. Data acquisition is therefore enabled.
-      However, since
-      the inhibit input to the multi-detector interface is presumably
-      set at this point and remains so until the user starts a data
-      acquisition run via the EL737 neutron counter, any data which
-      SinqHM-filler reads from the fibre-optic link will be discarded.
-
-      Whenever a SinqHM-server is started in response to a SQHM{\usc}CNCT
-      command, its associated bit is cleared. Whenever a server exits,
-      it also ensures that its bit is clear. The SQHM{\usc}DAQ command allows
-      a user to manipulate the bits in {\em Dsbl{\usc}Mask} and hence to control
-      whether SinqHM-filler will read data from the fibre-optic link or
-      not. Because of the high speed of the PowerPC processor and the
-      way in which SinqHM-filler has been implemented, the test to see
-      if {\em Dsbl{\usc}Mask} is set or not adds only about 30 nsec
-      to the read-out loop of the histogram memory.
-
-      The format of the SQHM{\usc}DAQ command, which may only be issued once
-      SinqHM has been successfully configured, is:
-%
-      \begin{center}\begin{picture}(125,21)(0,-21)
-       \linethickness{0.15mm} \put(0,0){
-	\put(0, -7){\Topbox{big-end-id}}
-	\put(0,-14){\Midbox{SQHM{\usc}DAQ}}
-	\put(0,-21){\Botbox{modifier}}
-       }
-      \end{picture}\end{center}
-%
-      \begin{center}\begin{tabular}{|llp{75mm}|} \hline
-	\Tabrow{\textbf{Field}}{Symbol Name}{\textbf{Description}}
-	\hline
-	\Tabrow{big-end-id}{bigend}{See Section~\ref{Sect-sinqhm-comm}}
-	\Tabrow{SQHM{\usc}DAQ}{cmnd}{Command verb}
-	\Tabrow{modifier}{u.daq.sub{\usc}cmnd}{Command modifier (see below)}
-	\hline
-      \end{tabular}\end{center}
-%
-      The values which may be taken by \sfbf{sub{\usc}cmnd} are
-      given in the following table.
-      If the commands DAQ{\usc}{\usc}CLR and DAQ{\usc}{\usc}INH are issued as
-      one-off commands to SinqHM-master, they behave as though DAQ{\usc}{\usc}GO
-      and DAQ{\usc}{\usc}STOP commands had been issued.
-%
-	{\sffamily\begin{center}\begin{tabular}{|p{37mm}cp{94mm}|} \hline
-	  \multicolumn{3}{|l|}{Supported values of \textbf{sub{\usc}cmnd}} \\
-		\hline
-        DAQ{\usc}{\usc}CLR  & 0x0001 & Clear the client's bit in
-				\textsl{Dsbl{\usc}Mask}. If, as a result, the
-				mask becomes zero, data acquisition will be
-				enabled. \\
-        DAQ{\usc}{\usc}GO   & 0x0002 & Instruct SinqHM-filler to clear its bit
-				in \textsl{Dsbl{\usc}Mask}. \\
-        DAQ{\usc}{\usc}INH  & 0x0003 & Set the client's bit in
-				\textsl{Dsbl{\usc}Mask}. This is guaranteed
-				to disable data acquisition. \\
-        DAQ{\usc}{\usc}STOP & 0x0004 & Instruct SinqHM-filler to set its bit
-				in \textsl{Dsbl{\usc}Mask}. \\
-        DAQ{\usc}{\usc}TST  & 0x0005 & Read the state of
-				\textsl{Dsbl{\usc}Mask}. \\
-		\hline
-	\end{tabular}\end{center}}
-
-      The format of the status response to a SQHM{\usc}DAQ command is:
-%
-      \begin{center}\begin{picture}(125,35)(0,-35)
-       \linethickness{0.15mm} \put(0,0){
-	\put(0, -7){\Topbox{big-end-id}}
-	\put(0,-14){\Midbox{status}}
-	\put(0,-21){\Midbox{sub-status}}
-	\put(0,-28){\Midwordbox{daq-state-was}{daq-state-now}}
-	\put(0,-35){\Botwordbox{server-mask}{filler-mask}}
-       }
-      \end{picture}\end{center}
-%
-      \begin{center}\begin{tabular}{|llp{85mm}|} \hline
-	\Tabrow{\textbf{Field}}{Symbol Name}{\textbf{Description}}
-	\hline
-	\Tabrow{big-end-id}{bigend}{See Section~\ref{Sect-sinqhm-comm}}
-	\Tabrow{status}{status}{Status code}
-	\Tabrow{sub-status}{sub{\usc}status}{Secondary status code}
-	\Tabrow{daq-state-now}{u.daq.daq{\usc}now}{New (or current) data
-			acquisition status (= value of \textsl{Dsbl{\usc}Mask})}
-	\Tabrow{daq-state-was}{u.daq.daq{\usc}was}{Previous data acquisition
-			status (= old value of \textsl{Dsbl{\usc}Mask}).}
-	\Tabrow{filler-mask}{u.daq.filler{\usc}mask}{Mask indicating which bit
-				in \textbf{daq{\usc}now} corresponds to
-				SinqHM-filler.}
-	\Tabrow{server-mask}{u.daq.server{\usc}mask}{Mask indicating which bit
-				in \textbf{daq{\usc}now} corresponds to the
-				client which issued the SQHM{\usc}DAQ command.}
-	\hline
-      \end{tabular}\end{center}
-%
-      The only values for \sfbf{status} should be
-      KER{\usc}{\usc}SUCCESS and
-      KER{\usc}{\usc}BAD{\usc}VALUE, the latter indicating that
-      \sfbf{sub{\usc}cmnd} is invalid.
-      Any other value which might occur indicates a software problem,
-      probably related to accessing the semaphore associated with
-      {\em Dsbl{\usc}Mask}.
-
-      \noindent If \sfbf{daq{\usc}now} is non-zero, data acquisition by
-      SinqHM is disabled.
-      Each non-zero bit in \sfbf{daq{\usc}now} corresponds to a
-      process in SinqHM
-      which is inhibiting data acquisition. \sfbf{filler{\usc}mask}
-      indicates the
-      bit which is associated with SinqHM-filler.
-      \sfbf{client{\usc}mask} indicates
-      the bit which is associated with  the client which issued the
-      SQHM{\usc}DAQ command.
-
-      \noindent \sfbf{daq{\usc}was} is a copy of {\em Dsbl{\usc}Mask} prior
-      to the execution of the current command.
-%
-      \newpage
-%
-%
-    \subsection{SQHM{\usc}DBG}
-%   ==========================
-%
-      The SQHM{\usc}DBG command is used to enable the display of diagnostic
-      messages from SinqHM. A mask of 4 bits may be set to select various
-      diagnostic messages. The diagnostic messages are directed to the COM1
-      console port of the PowerPC module. The format of the command is:
-%
-      \begin{center}\begin{picture}(125,21)(0,-21)
-       \linethickness{0.15mm} \put(0,0){
-	\put(0,	-7){\Topbox{big-end-id}}
-	\put(0,-14){\Midbox{SQHM{\usc}DBG}}
-	\put(0,-21){\Botbox{debug-mask}}
-       }
-      \end{picture}\end{center}
-%
-      \begin{center}\begin{tabular}{|llp{80mm}|} \hline
-	\Tabrow{\textbf{Field}}{Symbol Name}{\textbf{Description}}
-	\hline
-	\Tabrow{big-end-id}{bigend}{See Section~\ref{Sect-sinqhm-comm}}
-	\Tabrow{SQHM{\usc}DBG}{cmnd}{Command verb}
-	\Tabrow{debug-mask}{u.dgb.mask}{Mask of bits selecting various debug
-					print switches. The least significant
-					4 bits are relevant.}
-	\hline
-      \end{tabular}\end{center}
-%
-      Setting \sfbf{mask} to a value of 15 will enable all diagnostic messages.
-
-      \noindent The response to the SQHM{\usc}DBG command will have
-      \sfbf{status} set to KER{\usc}{\usc}SUCCESS.
-%
-      \newpage
-%
-    \subsection{SQHM{\usc}DECONFIG}
-%   ===============================
-%
-      The SQHM{\usc}DECONFIG command is used to de-configure SinqHM (usually
-      in preparation for a new SQHM{\usc}CONFIG command). The
-      format of the command is:
-%
-      \begin{center}\begin{picture}(125,21)(0,-21)
-       \linethickness{0.15mm} \put(0,0){
-	\put(0, -7){\Topbox{big-end-id}}
-	\put(0,-14){\Midbox{SQHM{\usc}DECONFIG}}
-	\put(0,-21){\Botbox{harshness}}
-       }
-      \end{picture}\end{center}
-%
-      \begin{center}\begin{tabular}{|llp{70mm}|} \hline
-	\Tabrow{\textbf{Field}}{Symbol Name}{\textbf{Description}}
-	\hline
-	\Tabrow{big-end-id}{bigend}{See Section~\ref{Sect-sinqhm-comm}}
-	\Tabrow{SQHM{\usc}DECONFIG}{cmnd}{Command verb}
-	\Tabrow{harshness}{u.decnfg.sub{\usc}code}{Command modifier (see below)}
-	\hline
-      \end{tabular}\end{center}
-%
-      SinqHM-master will check to see if there are any active
-      SinqHM-server (child) processes active. If there are no active
-      children, the SinqHM-filler process will be terminated and SinqHM
-      returns to the de-configured state.
-
-      \noindent If there are active children, however, the
-      \sfbf{sub{\usc}code} (harshness)
-      field is used. If it is zero, then the condition is considered to
-      be an error.
-
-      \noindent If it is non-zero, then SinqHM-master will be more ruthless. All
-      its active children (including SinqHM-filler) will be terminated
-      and it will then return to the de-configured state.
-
-      \noindent Possible values for \sfbf{status} in the status response to the
-      SQHM{\usc}DECONFIG command are:
-%
-	{\sffamily\begin{center}\begin{tabular}{|p{40mm}p{110mm}|} \hline
-          KER{\usc}{\usc}SUCCESS        & SinqHM has been successfully
-						de-configured.\\
-          KER{\usc}{\usc}BAD{\usc}STATE & Either: \\
-			& \hspace*{5mm} - there are active clients and
-					   \textbf{sub{\usc}code} was zero or \\
-			& \hspace*{5mm} - there were problems terminating
-					   the children. \\
-		\hline
-	\end{tabular}\end{center}}
-%
- \vspace*{10mm}
-%
-    \subsection{SQHM{\usc}EXIT}
-%   ===========================
-%
-      The SQHM{\usc}EXIT command is used to terminate SinqHM-master and all
-      its children. It is only recognised as a one-off command to
-      SinqHM-master. It will not be recognised by a SinqHM-server.
-
-      It is normally only of interest in debugging situations since
-      manual intervention on the histogram memory module is required
-      afterwards to start up SinqHM-master again. The status response is
-      the same as for the SQHM{\usc}DECONFIG command. An error status will
-      only be returned if SinqHM-master has trouble terminating its
-      children. It will, in any case, proceed to exit.
-%
-      \newpage
-%
-    \subsection{SQHM{\usc}IDENT}
-%   ============================
-%
-      The SQHM{\usc}IDENT command is used for obtaining information about
-      the revision status of the SinqHM software running in the histogram
-      memory. There are no command dependent parameters. The format of the
-      status response is:
-%
-      \begin{center}\begin{picture}(125,77)(10,-77)
-       \linethickness{0.15mm} \put(0,0){
-        \put(0, -7){\Topwbox{35}{bigend}}
-        \put(0,-14){\Midwbox{35}{status}}
-        \put(0,-21){\Midwbox{35}{sub{\usc}status}}
-        \put(0,-28){\Midwbox{35}{u.ident.n{\usc}extra{\usc}bytes}}
-        \put(0,-35){\Midwbox{35}{u.ident.up{\usc}time}}
-        \put(0,-42){\Midwwordbox{35}%
-		{u.ident.offset{\usc}vxWorks{\usc}date}%
-		{u.ident.offset{\usc}vxWorks{\usc}ident}}
-        \put(0,-49){\Midwwordbox{35}%
-		{u.ident.offset{\usc}def{\usc}ident}%
-		{u.ident.offset{\usc}instr}}
-        \put(0,-56){\Midwwordbox{35}%
-		{u.ident.offset{\usc}sinqhm{\usc}main{\usc}date}%
-		{u.ident.offset{\usc}sinqhm{\usc}main{\usc}ident}}
-        \put(0,-63){\Midwwordbox{35}%
-		{u.ident.offset{\usc}sinqhm{\usc}server{\usc}date}%
-		{u.ident.offset{\usc}sinqhm{\usc}server{\usc}ident}}
-        \put(0,-70){\Midwwordbox{35}%
-		{u.ident.offset{\usc}sinqhm{\usc}filler{\usc}date}%
-		{u.ident.offset{\usc}sinqhm{\usc}filler{\usc}ident}}
-        \put(0,-77){\Botwwordbox{35}%
-		{u.ident.offset{\usc}sinqhm{\usc}routines{\usc}date}%
-		{u.ident.offset{\usc}sinqhm{\usc}routines{\usc}ident}}
-       }
-      \end{picture}\end{center}
-%
-      \begin{center}\begin{tabular}{|lp{90mm}|} \hline
-	\sfbf{Symbol Name} & \sfbf{Description} \\ \hline
-	\sfbf{bigend} & \textsf{%
-	  See Section~\ref{Sect-sinqhm-comm}} \\
-	\sfbf{status} & \textsf{%
-	  Status code} \\
-	\sfbf{sub{\usc}status} & \textsf{%
-	  Secondary status code} \\
-	\sfbf{n{\usc}extra{\usc}bytes} & \textsf{%
-	  Number of extra bytes to receive.} \\
-	\sfbf{up{\usc}time} & \textsf{%
-	  SinqHM up-time in seconds} \\
-	\sfbf{offset{\usc}vxWorks{\usc}ident} & \textsf{%
-	  Revision level of the vxWorks system.} \\
-	\sfbf{offset{\usc}vxWorks{\usc}date} & \textsf{%
-	  Date on which the vxWorks system was created.} \\
-	\sfbf{offset{\usc}instr} & \textsf{%
-	  Instrument for which SinqHM was compiled.} \\
-	\sfbf{offset{\usc}def{\usc}ident} & \textsf{%
-	  Revision level of SinqHM{\usc}def.h} \\
-	\sfbf{offset{\usc}sinqhm{\usc}main{\usc}ident} & \textsf{%
-	  Revision level of SinqHM{\usc}srv{\usc}main.c} \\
-	\sfbf{offset{\usc}sinqhm{\usc}main{\usc}date} & \textsf{%
-	  Date on which SinqHM{\usc}srv{\usc}main.c was compiled.} \\
-	\sfbf{offset{\usc}sinqhm{\usc}server{\usc}ident} & \textsf{%
-	  Revision level of SinqHM{\usc}srv{\usc}server.c} \\
-	\sfbf{offset{\usc}sinqhm{\usc}server{\usc}date} & \textsf{%
-	  Date on which SinqHM{\usc}srv{\usc}server.c was compiled.} \\
-	\sfbf{offset{\usc}sinqhm{\usc}filler{\usc}ident} & \textsf{%
-	  Revision level of SinqHM{\usc}srv{\usc}filler.c} \\
-	\sfbf{offset{\usc}sinqhm{\usc}filler{\usc}date} & \textsf{%
-	  Date on which SinqHM{\usc}srv{\usc}filler.c was compiled.} \\
-	\sfbf{offset{\usc}sinqhm{\usc}routines{\usc}ident} & \textsf{%
-	  Revision level of SinqHM{\usc}srv{\usc}routines.c} \\
-	\sfbf{offset{\usc}sinqhm{\usc}routines{\usc}date} & \textsf{%
-	  Date on which SinqHM{\usc}srv{\usc}routines.c was compiled.} \\
-	\hline
-      \end{tabular}\end{center}
-%
-      Possible values for \sfbf{status} in the status response to the
-      SQHM{\usc}IDENT command are KER{\usc}{\usc}SUCCESS, indicating success,
-      and KER{\usc}{\usc}BAD{\usc}ALLOC, indicating that Sinq\-HM was unable
-      to reserve buffer space for composing the revision status response.
-      If \sfbf{status} indicates success, the status response is followed
-      by \sfbf{n{\usc}extra{\usc}bytes} of data giving the requested revision
-      status of SinqHM. This extra block of data must be read by the client
-      before further commands are sent to SinqHM. The various {\em offset} items
-      in the status response specify byte offsets from the start of this extra
-      block to null-terminated strings.
-%
-      \newpage
-%
-    \subsection{SQHM{\usc}PROJECT}
-%   ==============================
-%
-      The SQHM{\usc}PROJECT command is used for projecting a rectangular
-      region of two-dimensional histogram data onto the x or y axis
-      and reading it out. It is intended to be used, for example, for adding
-      together a number of TOF histograms in order to obtain a fast, rough
-      status display from the histogram memory of large histogram arrays
-      which would take too long to read out otherwise.
-
-      \noindent The command may also be used to obtain a projection within a
-      one-dimensional histogram. This is intended for detectors such as SANS
-      which are physically two-dimensional but where the electronics presents
-      the data to the histogram memory in a one-dimensional form. It may be
-      useful in such cases to be able to generate an x- or y-projection of
-      the data in the histogram memory rather than having to transfer the
-      complete histogram data over the network.
-
-      \noindent The format of the command is:
-%
-      \begin{center}\begin{picture}(125,63)(0,-63)
-       \linethickness{0.15mm} \put(0,0){
-	\put(0, -7){\Topbox{bigend}}
-	\put(0,-14){\Midbox{cmnd = SQHM{\usc}PROJECT}}
-	\put(0,-21){\Midbox{u.project.sub{\usc}code}}
-	\put(0,-28){\Midbox{u.project.x{\usc}lo}}
-	\put(0,-35){\Midbox{u.project.nx}}
-	\put(0,-42){\Midbox{u.project.y{\usc}lo}}
-	\put(0,-49){\Midbox{u.project.ny}}
-	\put(0,-56){\Midbox{u.project.xdim}}
-	\put(0,-63){\Botbox{u.project.nhist}}
-       }
-      \end{picture}\end{center}
-%
-      \begin{center}\begin{tabular}{|lp{95mm}|} \hline
-	\sfbf{Symbol Name} & \sfbf{Description} \\ \hline
-	%
-	\sfbf{bigend} & \textsf{%
-	  See Section~\ref{Sect-sinqhm-comm}} \\
-	\sfbf{cmnd} & \textsf{%
-	  Command verb = SQHM{\usc}PROJECT} \\
-	\sfbf{sub{\usc}code} & \textsf{%
-	  Sub-code} \\
-	\sfbf{x{\usc}lo} & \textsf{%
-	  Number of first bin in x-direction.} \\
-	\sfbf{nx} & \textsf{%
-	  Number of bins in x-direction.} \\
-	\sfbf{y{\usc}lo} & \textsf{%
-	  Number of first bin in y-direction.} \\
-	\sfbf{ny} & \textsf{%
-	  Number of bins in y-direction.} \\
-	\sfbf{xdim} & \textsf{%
-	  If PROJECT{\usc}{\usc}1{\usc}DIM is set, the histogram dimension
-	  in x-direction.} \\
-	\sfbf{nhist} & \textsf{%
-	  If PROJECT{\usc}{\usc}1{\usc}DIM is set, the number of the histogram
-	  to be projected.} \\
-	\hline
-      \end{tabular}\end{center}
-%
-      The following bits are defined in \sfbf{sub{\usc}code}:
-%
-	{\sffamily\begin{center}\begin{tabular}{|p{37mm}cp{75mm}|} \hline
-	  PROJECT{\usc}{\usc}ON{\usc}Y & 0x0001 & Project onto y-axis. \\
-	  PROJECT{\usc}{\usc}1{\usc}DIM & 0x0002 & Make projection of a
-					1-dim histogram. \\
-		\hline
-		\end{tabular}\end{center}}
-%
-      \noindent The interpretation and default values for the various parameters
-      depend on the configured mode of the histogram memory and the settings
-      of bits in \sfbf{sub{\usc}code}. The following description is limited to
-      the known applications of the SQHM{\usc}PROJECT command. Other
-      combinations may also work but may not be physically meaningful.
-
-    \subsubsection{SQHM{\usc}{\usc}TOF Mode and PROJECT{\usc}{\usc}1{\usc}DIM
-		= 0}
-%
-      In TOF mode, it is expected that the SQHM{\usc}PROJECT command will be
-      used to combine TOF spectra from adjacent counters.
-
-      \noindent In this case,
-      \sfbf{y{\usc}lo} specifies the number of the first counter and
-      \sfbf{ny} specifies the number of adjacent counters whose spectra are
-      to be combined. The parameters \sfbf{x{\usc}lo} and \sfbf{nx} specify
-      the range of bins in each spectrum which is to be combined.
-
-      \noindent An error
-      will be reported if all counters in the specified range do not have the
-      same edge-array (see Section~\ref{SubSect-TOF}).
-
-    \subsubsection{SQHM{\usc}{\usc}HM{\usc}DIG or SQHM{\usc}{\usc}HRPT Mode
-		and \\ PROJECT{\usc}{\usc}1{\usc}DIM = 0}
-%
-      In SQHM{\usc}{\usc}HM{\usc}DIG and SQHM{\usc}{\usc}HRPT modes, it is
-      possible for multiple histograms to be defined, e.g. for stroboscopic
-      type measurements. The SQHM{\usc}PROJECT command may be used for
-      combining a range of these histograms by setting the
-      PROJECT{\usc}{\usc}1{\usc}DIM bit to zero.
-
-      \noindent In this case,
-      \sfbf{y{\usc}lo} specifies the number of the first histogram and
-      \sfbf{ny} specifies the number of adjacent histograms which are to be
-      combined. The parameters \sfbf{x{\usc}lo} and \sfbf{nx} specify
-      the range of bins in each histogram which is to be combined.
-
-    \subsubsection{SQHM{\usc}{\usc}HM{\usc}DIG or SQHM{\usc}{\usc}HRPT Mode
-		and \\ PROJECT{\usc}{\usc}1{\usc}DIM = 1}
-%
-      In SQHM{\usc}{\usc}HM{\usc}DIG and SQHM{\usc}{\usc}HRPT modes, it is
-      possible for SinqHM to consider a histogram to be one-dimensional whereas
-      it would be more natural for it to be considered as a two-dimensional
-      histogram.
-      A typical example is the SANS detector at SINQ which is a 128~$\times$~128
-      x-y detector. This appears to the histogram memory as a 16k
-      one-dimensional histogram since the 7-bits of x and 7-bits of y
-      information from
-      the detector are combined into a 14-bit word before being presented to it.
-      In this case, the PROJECT{\usc}{\usc}1{\usc}DIM bit may be set to force
-      SinqHM to consider the histogram as two-dimensional.
-
-      \noindent The \sfbf{x{\usc}lo}, \sfbf{nx}, \sfbf{y{\usc}lo} and \sfbf{ny}
-      arguments define the rectangle of interest. \sfbf{xdim}
-      provides SinqHM with the size of the histogram in the x
-      dimension\footnote{Histograms are assumed to be stored so that bins in
-      the x-direction are adjacent.}. \sfbf{xdim} must be an exact divisor
-      of the number of bins per histogram. \sfbf{nhist} is used to select
-      which of the defined histograms is to be projected.
-
-      \noindent PROJECT{\usc}{\usc}ON{\usc}Y bit may be set to request that
-      the histogram be projected onto the y-axis. In this case, \sfbf{ny}
-      rather than \sfbf{nx} bins of data will be returned.
-
-      \noindent Having checked the validity of the parameters, SinqHM tries to
-      reserve sufficient buffer space to hold the projected histogram
-      contents. If this succeeds, which it usually will since it is usually only
-      necessary to reserve a relatively small amount of memory,
-      data acquisition is inhibited, the projected histogram data is computed,
-      data acquisition is re-enabled
-      and the status response plus data are sent to the client.\\[1.0ex]
-%
-      \noindent If buffer space is not available, an error status is returned
-      to the client.\\[1.0ex]
-%
-      \noindent The format of the status response is:
-%
-      \begin{center}\begin{picture}(125,49)(0,-49)
-       \linethickness{0.15mm} \put(0,0){
-	\put(0, -7){\Topbox{bigend}}
-	\put(0,-14){\Midbox{status}}
-	\put(0,-21){\Midbox{sub{\usc}status}}
-	\put(0,-28){\Midbox{u.project.n{\usc}bins}}
-	\put(0,-35){\Midbox{u.project.bytes{\usc}per{\usc}bin = 4}}
-	\put(0,-42){\Midbox{u.project.cnts{\usc}lo}}
-	\put(0,-49){\Botbox{u.project.cnts{\usc}hi}}
-       }
-      \end{picture}\end{center}
-%
-      If the value of \sfbf{status} is KER{\usc}{\usc}SUCCESS, the
-      status response is
-      followed by
-      (\sfbf{n{\usc}bins} $\times$ 4) bytes
-      of histogram data which must
-      be received before any other commands are issued. \sfbf{n{\usc}bins}
-      will be either \sfbf{nx} or \sfbf{ny} depending on the setting of
-      PROJECT{\usc}{\usc}ON{\usc}Y. The only other
-      possible values of \sfbf{status} should be
-      KER{\usc}{\usc}BAD{\usc}VALUE, which indicates
-      that a command parameter was invalid and KER{\usc}{\usc}BAD{\usc}ALLOC,
-      which indicates that SinqHM was unable to reserve buffer space for
-      projecting the histogram data. Any other value of
-      \sfbf{status}
-      indicates a software problem in the SinqHM package.\\[1.0ex]
-%
-      \sfbf{cnts{\usc}lo} and \sfbf{cnts{\usc}hi} are the lower and
-      upper {\em out-of-range} counters for the projected histogram. They count
-      events which are either below or above the range of the histogram bins.
-      The values will be the sum of the counters for the projected histograms.
-%
-      \newpage
-%
-    \subsection{SQHM{\usc}READ}
-%   ===========================
-%
-      The SQHM{\usc}READ command is used for reading data from the histogram
-      memory. It may only be issued once SinqHM has been successfully
-      configured. The format of the command is:
-
-      \begin{center}\begin{picture}(125,35)(0,-35)
-       \linethickness{0.15mm} \put(0,0){
-	\put(0, -7){\Topbox{big-end-id}}
-	\put(0,-14){\Midbox{SQHM{\usc}READ}}
-	\put(0,-21){\Midbox{hist-number}}
-	\put(0,-28){\Midbox{first-bin}}
-	\put(0,-35){\Botbox{number-bins}}
-       }
-      \end{picture}\end{center}
-%
-      \begin{center}\begin{tabular}{|llp{75mm}|} \hline
-	\Tabrow{\textbf{Field}}{Symbol Name}{\textbf{Description}}
-	\hline
-	\Tabrow{big-end-id}{bigend}{See Section~\ref{Sect-sinqhm-comm}}
-	\Tabrow{SQHM{\usc}READ}{cmnd}{Command verb}
-	\Tabrow{hist-number}{u.read.hist{\usc}no}{Histogram number (see below).}
-	\Tabrow{first-bin}{u.read.first{\usc}bin}{Number of first bin to be
-					read.}
-	\Tabrow{number-bins}{u.read.n{\usc}bins}{Number of bins to read.}
-	\hline
-      \end{tabular}\end{center}
-%
-      In SQHM{\usc}{\usc}HM{\usc}DIG or SQHM{\usc}{\usc}HRPT mode,
-      \sfbf{hist{\usc}no} specifies the
-      number of the histogram which is to be read or -1. If \sfbf{hist{\usc}no}
-      is -1, then \sfbf{first{\usc}bin} and \sfbf{n{\usc}bins} specify a portion
-      of the total histogram buffer considered as a single histogram of size
-      (\sfbf{n{\usc}hists} $\times$ \sfbf{num{\usc}bins}) bins. Otherwise,
-      \sfbf{first{\usc}bin} and \sfbf{n{\usc}bins} specify a portion of the
-      histogram to be read. If
-	\sfbf{hist{\usc}no}~=~%
-		\sfbf{first{\usc}bin}~=~%
-		\sfbf{n{\usc}bins}~=~-1
-      the complete histogram memory buffer will be read.
-
-      \noindent In SQHM{\usc}{\usc}TOF mode, \sfbf{hist{\usc}no} is assumed to
-      specify a counter number or -1. If \sfbf{hist{\usc}no} is -1, then
-      \sfbf{first{\usc}bin} and \sfbf{n{\usc}bins} are used as in
-      SQHM{\usc}{\usc}HM{\usc}DIG mode. Otherwise, \sfbf{first{\usc}bin} and
-      \sfbf{n{\usc}bins} select a portion of the time histogram of the
-      specified counter which is to be read.
-
-      \noindent Having checked the validity of the parameters, SinqHM tries to
-      reserve sufficient buffer space for making a copy of the histogram
-      contents. If this succeeds, data acquisition is inhibited, a copy
-      of the histogram contents is made, data acquisition is re-enabled
-      and the status response plus data are sent to the client. If
-      buffer space is not available for making a copy of the histogram
-      contents, data acquisition will not be inhibited during the
-      transmission of data to the client. This is because the
-      transmission may be quite long and could therefore cause the loss
-      of data. The data will therefore be slightly skewed.
-
-      \noindent The format of the status response is given in the diagram below.
-      If the value of \sfbf{status} is KER{\usc}{\usc}SUCCESS, the
-      status response is
-      followed by
-      (\sfbf{n{\usc}bins} $\times$
-		\sfbf{bytes{\usc}per{\usc}bin}) bytes
-      of histogram data which must
-      be received before any other commands are issued. The only other
-      possible value of \sfbf{status} should be
-      KER{\usc}{\usc}BAD{\usc}VALUE which indicates
-      that a command parameter was invalid. Any other value of
-      \sfbf{status}
-      indicates a software problem in the SinqHM package.
-%
-      \begin{center}\begin{picture}(125,56)(0,-56)
-       \linethickness{0.15mm} \put(0,0){
-	\put(0, -7){\Topbox{big-end-id}}
-	\put(0,-14){\Midbox{status}}
-	\put(0,-21){\Midbox{sub-status}}
-	\put(0,-28){\Midbox{first-bin (\textbf{u.read.first{\usc}bin})}}
-	\put(0,-35){\Midbox{number-bins (\textbf{u.read.n{\usc}bins})}}
-	\put(0,-42){\Midbox{bytes-per-bin
-		(\textbf{u.read.bytes{\usc}per{\usc}bin})}}
-	\put(0,-49){\Midbox{low-cnts (\textbf{u.read.cnts{\usc}lo})}}
-	\put(0,-56){\Botbox{high-cnts (\textbf{u.read.cnts{\usc}hi})}}
-       }
-      \end{picture}\end{center}
-
-      \noindent \sfbf{cnts{\usc}lo} and \sfbf{cnts{\usc}hi} are the lower and
-      upper {\em out-of-range} counters for the selected histogram. They count
-      events which are either below or above the range of the histogram bins. If
-      more than one histogram is defined, there are 2 such counters defined for
-      each histogram. If \sfbf{hist{\usc}no} was specified as -1, the values
-      will be the sum of the counters for all defined histograms.
-%
-      \vspace*{20mm}
-%
-    \subsection{SQHM{\usc}SELECT}
-%   =============================
-%
-    \label{Sect-sinqhm-select}
-%
-      The format of the SQHM{\usc}SELECT command, which may only be issued
-      once SinqHM has been successfully configured, is:
-%
-      \begin{center}\begin{picture}(125,21)(0,-21)
-       \linethickness{0.15mm} \put(0,0){
-	\put(0, -7){\Topbox{big-end-id}}
-	\put(0,-14){\Midbox{SQHM{\usc}SELECT}}
-	\put(0,-21){\Botbox{hist-number}}
-       }
-      \end{picture}\end{center}
-%
-      \begin{center}\begin{tabular}{|llp{75mm}|} \hline
-	\Tabrow{\textbf{Field}}{Symbol Name}{\textbf{Description}}
-	\hline
-	\Tabrow{big-end-id}{bigend}{See Section~\ref{Sect-sinqhm-comm}}
-	\Tabrow{SQHM{\usc}SELECT}{cmnd}{Command verb}
-	\Tabrow{hist-number}{u.select.hist{\usc}no}{Histogram number to be
-				selected}
-	\hline
-      \end{tabular}\end{center}
-%
-      When SinqHM is configured, the user may specify that space be
-      reserved for multiple histograms. If so, the histogram or
-      group\footnote{If the SQHM{\usc}UD mode modifier was specified,
-      \sfbf{hist{\usc}no} must be a multiple of 2 and selects a
-      pair of histograms which will be active. If the SQHM{\usc}STROBO mode
-      modifier was specified, \sfbf{hist{\usc}no} must be a multiple
-      of 16.} of histograms which is currently active, i.e.
-      which will be updated as data are read from the fibre-optic link, can be
-      selected using the SQHM{\usc}SELECT command.
-
-      There are no command-specific fields in the status response from
-      a SQHM{\usc}SELECT command. A value of KER{\usc}{\usc}BAD{\usc}VALUE for
-      \sfbf{status}
-      indicates that \sfbf{hist{\usc}no} is illegal.
-%
-      \newpage
-%
-    \subsection{SQHM{\usc}STATUS}
-%   =============================
-%
-      The SQHM{\usc}STATUS command is used to obtain the status of SinqHM.
-      There are no command dependent
-      parameters. The format of the status response is:
-%
-      \begin{center}\begin{picture}(125,105)(0,-105)
-       \linethickness{0.15mm} \put(0,0){
-        \put(0, -7){\Topbox{big-end-id}}
-        \put(0,-14){\Midbox{status}}
-        \put(0,-21){\Midbox{sub-status}}
-        \put(0,-28){\Midbox{config-state}}
-        \put(0,-35){\Midwordbox{current-hist}{number-hists}}
-        \put(0,-42){\Midbox{bins-per-hist}}
-        \put(0,-49){\Midbox{max-num-hists}}
-        \put(0,-56){\Midbox{max-num-bins}}
-        \put(0,-63){\Midbytebox{bin-compress}{bytes-per-bin}%
-				{active-servers}{max-servers}}
-        \put(0,-70){\Midwordbox{filler-mask}{daq-state-now}}
-        \put(0,-77){\Midbox{max-free-block}}
-        \put(0,-84){\Midwordbox{flags}{tsi-status}}
-        \put(0,-91){\Midbox{dead-time/delay-to-start}}
-        \put(0,-98){\Midbox{number-bad-events}}
-        \put(0,-105){\Botbox{up-time}}
-       }
-      \end{picture}\end{center}
-%
-      All of these fields occur in the description of other commands.
-      The following list therefore only gives the various symbol names:
-%
-      {\sffamily\begin{center}\begin{tabular}{|ll|ll|} \hline
-	\textbf{Field} & \textbf{Symbol Name} & \textbf{Field} &
-					\textbf{Symbol Name} \\ \hline
-	big-end-id	& \textbf{bigend}	&
-		bytes-per-bin	  & \textbf{bytes{\usc}per{\usc}bin} \\
-	status		& \textbf{status}	&
-		bin-compress	  & \textbf{compress} \\
-	sub-status	& \textbf{sub{\usc}status}	&
-		daq-state-now	  & \textbf{daq{\usc}now} \\
-	config-state	& \textbf{cfg{\usc}state}	&
-		filler-mask	  & \textbf{filler{\usc}mask} \\
-	number-hists	& \textbf{n{\usc}hists}	&
-		max-free-block	  & \textbf{max{\usc}block} \\
-	current-hist	& \textbf{curr{\usc}hist}	&
-		tsi-status	  & \textbf{tsi{\usc}status} \\
-	bins-per-hist	& \textbf{num{\usc}bins}	&
-		flags		  & \textbf{flags} \\
-	max-num-hists	& \textbf{max{\usc}n{\usc}hists}	&
-		dead-time/	  & \textbf{dt{\usc}or{\usc}dts.both} \\
-	max-num-bins	& \textbf{max{\usc}num{\usc}bins}	&
-		\hspace*{3mm}delay-to-start & \\
-	max-servers	& \textbf{max{\usc}srvrs}	&
-		number-bad-events & \textbf{num{\usc}bad{\usc}events} \\
-	active-servers	& \textbf{act{\usc}srvrs}	&
-		up-time		  & \textbf{up{\usc}time} \\
-        \hline
-      \end{tabular}\end{center}}
-
-      \noindent The prefix \sfbf{u.status} is required for each of the above
-      symbols.\\[1.0ex]
-%
-      \sfbf{tsi{\usc}status} is the status word (i.e. the last two bytes)
-      contained in the last {\em Timing Status Info} packet received from the
-      multi-detector interface. The \sfbf{flags} item gives various flag bits
-      from the last {\em Timing Status Info} packet. The various bits in
-      \sfbf{flags} are:
-
-	{\sffamily\begin{center}\begin{tabular}{|p{48mm}cp{75mm}|} \hline
-STATUS{\usc}FLAGS{\usc}{\usc}PF    & 0x8000 & Power Fail \\
-STATUS{\usc}FLAGS{\usc}{\usc}SWC   & 0x4000 & Status Word Changed \\
-STATUS{\usc}FLAGS{\usc}{\usc}NRL   & 0x2000 & Neutron Rate Low \\
-STATUS{\usc}FLAGS{\usc}{\usc}DAQ   & 0x1000 & DAQ on -- set if Hdr Mask Bits
-				are correct so that data acq is active \\
-STATUS{\usc}FLAGS{\usc}{\usc}SYNC3 & 0x0800 & Ext Synch Bit 3 \\
-STATUS{\usc}FLAGS{\usc}{\usc}SYNC2 & 0x0400 & Ext Synch Bit 2 \\
-STATUS{\usc}FLAGS{\usc}{\usc}SYNC1 & 0x0200 & Ext Synch Bit 1 \\
-STATUS{\usc}FLAGS{\usc}{\usc}SYNC0 & 0x0100 & Ext Synch Bit 0 \\
-STATUS{\usc}FLAGS{\usc}{\usc}UD    & 0x0080 & UD  - Up/Down \\
-STATUS{\usc}FLAGS{\usc}{\usc}GU    & 0x0040 & GU  - Gummi (i.e. Strobo) \\
-		\hline
-	\end{tabular}\end{center}}
-
-\noindent Note that \sfbf{STATUS{\usc}FLAGS{\usc}{\usc}DAQ} is a derived
-quantity. The derivation is intrument dependent. The following table lists
-the requirements which must be satisfied in order for this bit to be set.
-
-	{\sffamily\begin{center}\begin{tabular}{|c|l|l|} \hline
-	\textbf{Instrument} & \textbf{Conditions for DAQ = 1} &
-		\textbf{Significance}	\\ \hline
-FOCUS	& NRL = 0	& Neutron rate not low	\\
-	& SYNC2 = 0	& Neutron counter is counting \\ \hline
-HRPT	& SYNC2 = 1	& ?? \\
-	& SYNC0 = 0	& ?? \\ \hline
-Other	& NRL = 0	& Neutron rate not low \\\hline
-	\end{tabular}\end{center}}
-
- \newpage
-%
-%
-    \subsection{SQHM{\usc}WRITE}
-%   ===========================
-%
-      The SQHM{\usc}WRITE command is the opposite of the SQHM{\usc}READ command.
-      It allows a user to preset a region of the histogram memory. It
-      may only be issued once SinqHM has been successfully configured.
-      The command format is:
-%
-      \begin{center}\begin{picture}(125,42)(0,-42)
-       \linethickness{0.15mm} \put(0,0){
-	\put(0, -7){\Topbox{big-end-id}}
-	\put(0,-14){\Midbox{SQHM{\usc}WRITE}}
-	\put(0,-21){\Midbox{hist-number}}
-	\put(0,-28){\Midbox{first-bin}}
-	\put(0,-35){\Midbox{number-bins}}
-	\put(0,-42){\Botbox{bytes-per-bin}}
-       }
-      \end{picture}\end{center}
-%
-      \begin{center}\begin{tabular}{|llp{70mm}|} \hline
-	\Tabrow{\textbf{Field}}{Symbol Name}{\textbf{Description}}
-	\hline
-	\Tabrow{big-end-id}{bigend}{See Section~\ref{Sect-sinqhm-comm}}
-	\Tabrow{SQHM{\usc}WRITE}{cmnd}{Command verb.}
-	\Tabrow{hist-number}{u.write.hist{\usc}no}{Histogram number.}
-	\Tabrow{first-bin}{u.write.first{\usc}bin}{Number of first bin to be
-				written.}
-	\Tabrow{number-bins}{u.write.n{\usc}bins}{Number of bins to write.}
-	\Tabrow{bytes-per-bin}{u.write.bytes{\usc}per{\usc}bin}{Number of bytes
-					per bin (1, 2 or 4).}
-	\hline
-      \end{tabular}\end{center}
-%
-      \sfbf{hist{\usc}no} has the same meaning as for the
-      SQHM{\usc}READ command. Since SQHM{\usc}WRITE is intended mainly for
-      debugging and demonstration purposes, data acquisition is not inhibited
-      whilst data is read over the network and written to the histogram memory
-      buffer.
-
-      The SQHM{\usc}WRITE command must be followed by
-      $(\sfbf{n{\usc}bins} \times
-			\sfbf{bytes{\usc}per{\usc}bin})$
-      bytes of histogram data.
-
-      There are no command-specific fields in the status response to an
-      SQHM{\usc}WRITE command. Possible error values for
-      \sfbf{status} are:
-%
-	{\sffamily\begin{center}\begin{tabular}{|p{40mm}p{110mm}|} \hline
-          KER{\usc}{\usc}BAD{\usc}STATE	& SinqHM has not yet been configured. \\
-          KER{\usc}{\usc}BAD{\usc}VALUE	& A command parameter is invalid. \\
-	  KER{\usc}{\usc}BAD{\usc}RECV	& SinqHM had problems reading the
-					   histogram data over the network. \\
-		\hline
-	\end{tabular}\end{center}}
-%
-      \newpage
-%
-    \subsection{SQHM{\usc}ZERO}
-%   ===========================
-%
-      The SQHM{\usc}ZERO command is used for setting a region of the
-      histogram memory buffer to zero. It may only be issued once SinqHM
-      has been successfully configured.  The command format is:
-%
-      \begin{center}\begin{picture}(125,35)(0,-35)
-       \linethickness{0.15mm} \put(0,0){
-	\put(0, -7){\Topbox{big-end-id}}
-	\put(0,-14){\Midbox{SQHM{\usc}ZERO}}
-	\put(0,-21){\Midbox{hist-number}}
-	\put(0,-28){\Midbox{first-bin}}
-	\put(0,-35){\Botbox{number-bins}}
-       }
-      \end{picture}\end{center}
-%
-      \begin{center}\begin{tabular}{|llp{70mm}|} \hline
-	\Tabrow{\textbf{Field}}{Symbol Name}{\textbf{Description}}
-	\hline
-	\Tabrow{big-end-id}{bigend}{See Section~\ref{Sect-sinqhm-comm}}
-	\Tabrow{SQHM{\usc}ZERO}{cmnd}{Command verb}
-	\Tabrow{hist-number}{u.zero.hist{\usc}no}{Histogram number.}
-	\Tabrow{first-bin}{u.zero.first{\usc}bin}{Number of first bin to zero.}
-	\Tabrow{number-bins}{u.zero.n{\usc}bins}{Number of bins to zero.}
-	\hline
-      \end{tabular}\end{center}
-%
-      The parameters are the same as for the SQHM{\usc}WRITE command except
-      that there is no histogram data accompanying the command. In
-      addition, if\\[1.0ex]
-%
-	\hspace*{\fill}\sfbf{hist{\usc}no} =
-		\sfbf{first{\usc}bin} =
-		\sfbf{n{\usc}bins} = -1\hspace*{\fill}\\[1.0ex]
-%
-      the complete histogram memory buffer will be set to zero.
-      Data acquisition is disabled whilst the histogram memory buffer is
-      set to zero. The status response is the same as for the SQHM{\usc}WRITE
-      command.
-%
-      \newpage
-%
-    \section{The SinqHM Control Program, SINQHM{\usc}CTRL}
-%   ======================================================
-%
-    \label{Sect-sinqhm-ctrl}
-%
-      The SINQHM{\usc}CTRL program can be used for transmitting commands to
-      SinqHM-master. It has been implemented for both the OpenVMS and
-      Unix operating systems.
-%
-    \subsection{Using SINQHM{\usc}CTRL under OpenVMS}
-%   =================================================
-%
-    \label{Sect-sinqhm-ctrl-vms}
-%
-      In order to use SINQHM{\usc}CTRL under OpenVMS, it is necessary to
-      define a so-called DCL Foreign Command. This is best achieved by
-      including a command of the form:\\[1.0ex]
-%
-	\hspace*{20mm}\texttt{\$ ctrl :== \$mad{\usc}exe:sinqhm{\usc}ctrl}
-		\\[1.0ex]
-%
-      in one's login command file. One may also specify the TCP/IP host
-      parameters of the histogram memory via the logical name
-      SINQHM{\usc}FRONTEND\footnote{It is also possible to specify the
-      histogram memory by means of the {\em -host} option on the command
-      line.}, e.g.\\[1.0ex]
-%
-	\hspace*{20mm}\texttt{\$ define/job sinqhm{\usc}frontend
-			"<host>,<port>,<pkt>"} \\[1.0ex]
-%
-      where \verb#<host># is the name of the histogram memory (no
-      default), \verb#<port>#
-      is the TCP/IP port of SinqHM (default = 2400) and \verb#<pkt># is the
-      packet size for messages to and from SinqHM (default = 8192).
-      Once this has been done, it is then possible to execute the
-      following commands:
-        {\ttfamily\begin{tabbing}%
-%
-	\hspace*{20mm}\=\$ ctrl config \verb#<#modifier\verb#>#mmmm\=! .. \kill
-	\>\$ ctrl config \verb#<#modifier\verb#>#  \>! Send SQHM{\usc}CONFIG %
-								command \\
-	\>\$ ctrl debug \verb#<#level\verb#>#       \>! Send SQHM{\usc}DBG %
-								command \\
-	\>\$ ctrl deconfig \verb#<#severity\verb#># \>! Send %
-						SQHM{\usc}DECONFIG command \\
-	\>\$ ctrl go				    \>! Send SQHM{\usc}DAQ/GO %
-								command \\
-	\>\$ ctrl help \verb#<#subject\verb#>#      \>! Display some help text\\
-	\>\$ ctrl rundown			    \>! Send SQHM{\usc}EXIT %
-								command \\
-	\>\$ ctrl show				    \>! Send SQHM{\usc}STATUS %
-								command \\
-	\>\$ ctrl stop				    \>! Send SQHM{\usc}DAQ/STOP %
-								command \\
-	\>\$ ctrl zero				    \>! Send SQHM{\usc}ZERO %
-							command
-	\end{tabbing}}
-%
-      \noindent%
-      The parameters for the SQHM{\usc}CONFIG command are taken from
-      logical name definitions. The primary logical name is:
-%
-      {\sffamily\begin{center}\begin{tabular}{|llp{71mm}|} \hline
-	\textbf{Logical Name} & \textbf{Default Value} & \textbf{Description} \\
-	\hline
-	SINQHM{\usc}MODE & \verb#"HM_DIG"# & The histogramming mode. \\
-	\hline
-      \end{tabular}\end{center}}
-%
-      \noindent%
-      Further logical names are used depending on the value of
-      SINQHM{\usc}MODE as follows:\\[1.0ex]
-%
-      {\bf SINQHM{\usc}MODE = \verb#"HM_DIG"# or \verb#"HRPT"#:}
-%
-      {\sffamily\begin{center}\begin{tabular}{|lcp{69mm}|} \hline
-	\textbf{Logical Name} & \textbf{Default Value} & \textbf{Description} \\
-	\hline
-	SINQHM{\usc}NBINS	& \verb#None# & Number of bins per histogram. \\
-	SINQHM{\usc}LOW{\usc}BIN & \verb#0#	& First bin of histogram. \\
-	SINQHM{\usc}COMPRESS	 & \verb#0#	& Bin compression factor \\
-	SINQHM{\usc}BYTES{\usc}PER{\usc}BIN & \verb##4 & Number of bytes per
-							bin (1, 2 or 4).\\
-	SINQHM{\usc}NHISTS	 & \verb#1#    & Number of histograms.\\
-	\hline
-      \end{tabular}\end{center}}
-%
-      \noindent%
-      {\bf SINQHM{\usc}MODE = \verb#"TOF"#:}
-%
-      {\sffamily\begin{center}\begin{tabular}{|lcp{69mm}|} \hline
-	\textbf{Logical Name} & \textbf{Default Value} & \textbf{Description} \\
-	\hline
-	SINQHM{\usc}NCNTRS	 & \verb#None#	& Number of counters.\\
-	SINQHM{\usc}LOW{\usc}CNTR & \verb#0#	& Number of first counter.\\
-	SINQHM{\usc}NBINS	 & \verb#None#	& Number of bins per histogram. \\
-	SINQHM{\usc}LOW{\usc}BIN & \verb#0#	& First bin of histogram. \\
-	SINQHM{\usc}BIN{\usc}SPAN & \verb#None#	& Time span per bin.\\
-	SINQHM{\usc}BYTES{\usc}PER{\usc}BIN & \verb##4 & Number of bytes per
-							bin (1, 2 or 4).\\
-	\hline
-      \end{tabular}\end{center}}
-%
-      \noindent The values of the sub-mode bits in the SQHM{\usc}CONFIG
-      request to
-      SinqHM may be set by appending the tokens \verb#"BO_IGN"#,
-      \verb#"BO_SMAX"#, \verb#"BO_CNT"#, \verb#"UD"#, \verb#"STROBO"#,
-      \verb#"REFLECT"# or \verb#"NO_STAT"# to the value
-      of SINQHM{\usc}MODE.
-
-      \noindent \verb#<modifier># may be specified as \verb#"suspend"#. If so,
-      the SQHM{\usc}{\usc}DEBUG
-      modifier bit in \sfbf{mode} will be set so that SinqHM-filler
-      will suspend itself as soon as it starts. This is intended to allow
-      interactive debugging of SinqHM-filler.
-
-      \noindent \verb#<level>#
-      may be ``on'', ``off'' or an integer in the range 0 to 15.
-      The default is ``on'' which corresponds to level 1.
-
-      \noindent The SQHM{\usc}DECONFIG command will be sent with
-      \sfbf{sub{\usc}code} (harshness) set to zero unless
-      \verb#<severity># is specified as ``harsh''. In this
-      case, \sfbf{sub{\usc}code} will be set to 1.
-
-      \noindent The \sfbf{zero} command will set the entire
-      histogram buffer to zero.
-%
-    \subsection{Using SINQHM{\usc}CTRL under Unix}
-%   ==============================================
-%
-      The exact use of SINQHM{\usc}CTRL under Unix depends on the shell which
-      is being used. In the following, this is assumed to be {\em csh}.
-      It is also assumed that the {\em sinqhm{\usc}ctrl} executable is
-      located in directory \textsf{/data/lnslib/bin}.
-
-      The invocation of SINQHM{\usc}CTRL can be facilitated by defining
-      an alias such as:\\[1.0ex]
-%
-	\hspace*{20mm} \verb#alias ctrl /data/lnslib/bin/sinqhm_ctrl# \\[1.0ex]
-%
-      in one's \textsf{\$HOME/.cshrc} shell initialisation script. Once
-      this has been done, the program can be used in the same way as
-      is described above for OpenVMS except that one uses environment variables
-      instead of logical names, e.g.\\[1.0ex]
-%
-	\hspace*{20mm} \verb#setenv  SINQHM_MODE  "TOF"#
-%
-%
-    \section{The SinqHM Client Program, SINQHM{\usc}CLIENT}
-%   =======================================================
-%
-    \label{Sect-sinqhm-client}
-%
-      The SINQHM{\usc}CLIENT, as opposed to the SINQHM{\usc}CTRL, program can
-      be used for communicating with SinqHM for functions which usually
-      require a long-lived link such as the display of the histogram data.
-      As with SINQHM{\usc}CTRL, it
-      has been implemented for both the OpenVMS and Unix operating systems.
-      The following description refers to the Unix implementation. By referring
-      to Section~\ref{Sect-sinqhm-ctrl-vms}, it should be clear how to run the
-      program under OpenVMS.
-
-      \noindent Assuming that the program is located in the
-      directory \textsf{/data/lnslib/bin}, define an alias as follows:\\[1.0ex]
-%
-	\hspace*{20mm} \verb#alias client /data/lnslib/bin/sinqhm_client# \\[1.0ex]
-%
-      The program can then be started via a command of the form:\\[1.0ex]
-%
-	\hspace*{20mm} \verb#client -host <host>#\\[1.0ex]
-%
-      where \verb#<host># specifies the name of the histogram memory. One
-      should then obtain a prompt of the form:\\[1.0ex]
-%
-	\hspace*{20mm}\verb#The following commands are available:# \\
-	\hspace*{20mm}\verb#    Help Open Status Read 2D Project Dump# \\
-	\hspace*{20mm}\verb#    LOAD WRITE W2D GO STOP ZERO Quit# \\[1.0ex]
-%
-      More information can then be obtained via the help command.
-%
-    \section{Communication with Multi-detector Interface}
-%   =====================================================
-%
-    \label{Sect-mdi-comm}
-%
-      SinqHM can communicate with the front-end electronics via the
-      full-duplex RS-232-C COM2 port  of the MVME-1603 PowerPC module.
-      The details of this communication have still to be worked out.
-      Here is a very, very, very preliminary proposal.
-
-      SinqHM can send the following messages to the front-end
-      electronics:
-%
-      \begin{center}\begin{tabular}{|cp{90mm}|} \hline
-        \rule{0em}{2.5ex}\verb#RMT 1# &	Set the front-ent electronics to
-				remote mode. \\
-        \rule{0em}{2.5ex}\verb#DT <val># &	Set TOF start time delay to
-				\verb#<val>#. \\ \hline
-      \end{tabular}\end{center}
-%
-    \section{Update History}
-%   ========================
-%
-    \label{Updates}
-%
-      This document has had the following changes:
-%
-      \begin{center}\begin{tabular}{llp{90mm}}
-      \sfbf{Version} & \sfbf{Date} & \sfbf{Description} \\[1.0ex]
-      Vn 1.5 & 23-Nov-1999 & a) Add SQHM{\usc}IDENT command. \\
-	     &		   & b) Add SQHM{\usc}PROJECT command. \\
-	     &		   & c) Add HRPT support. \\
-      Draft 1.4  &  9-Dec-1998 & Add TOF support. \\
-      Draft 1.3  & 10-Jul-1997 & Mainly expanded documentation. \\
-      Draft 1.2  & 19-Mar-1997 & Initial release.
-      \end{tabular}\end{center}
-%
- \begin{thebibliography}{9}
-
- \bibitem{CTN94005} D. Maden, PSI, Oct 1994 \\
-	{\em The \musr Histogram Memory Server for the KAV-30 rtVAX} \\
-	CTN-94-005
-
- \bibitem{PAW} CERN Program Library, Long Write-up, Feb 1995 \\
-	{\em PAW Physics Analysis Workstation} \\
-	Entry Q121
-
- \end{thebibliography}
-\end{document}
diff --git a/sinqhm/hist_mem_spec_fig1.ps b/sinqhm/hist_mem_spec_fig1.ps
deleted file mode 100755
index 444d9d91..00000000
--- a/sinqhm/hist_mem_spec_fig1.ps
+++ /dev/null
@@ -1,1632 +0,0 @@
-%!PS-Adobe-2.1
-%%Creator: DECwrite V3.0-2
-%%+Copyright (c) 1990,1994 DIGITAL EQUIPMENT CORPORATION.  
-%%+All Rights Reserved.
-%%DocumentFonts: (atend)
-%%EndComments
-%%BeginProcSet DEC_WRITE 1.10
-save/DEC_WRITE_dict 150 dict def DEC_WRITE_dict begin/$D exch def/$I 0
-def/$S 0 def/$C matrix def/$R matrix def/$L matrix def/$E matrix
-def/pat1{/px exch def/pa 8 array def 0 1 7{/py exch def/pw 4 string def 0 1
-3{pw exch px py 1 getinterval putinterval}for pa py pw put}for}def/pat2{/pi
-exch def/cflag exch def save cflag 1 eq{eoclip}{clip}ifelse
-newpath{clippath pathbbox}stopped not{/ph exch def/pw exch def/py exch
-def/px exch def/px px 3072 div floor 3072 mul def/py py 3072 div floor 3072
-mul def px py translate/pw pw px sub 3072 div floor 1 add cvi def/ph ph py
-sub 3072 div floor 1 add cvi def pw 3072 mul ph 3072 mul scale/pw pw 32 mul
-def/ph ph 32 mul def/px 0 def/py 0 def pw ph pi[pw 0 0 ph 0 0]{pa py get/px
-px 32 add def px pw ge{/px 0 def/py py 1 add 8 mod def}if}pi
-type/booleantype eq{imagemask}{image}ifelse}if restore}def/PS{/_op exch
-def/_np 8 string def 0 1 7{/_ii exch def/num _op _ii get def _np 7 _ii sub
-num -4 bitshift PX num 15 and 4 bitshift -4 bitshift PX 4 bitshift or
-put}for _np}def/PX{[15 7 11 3 13 5 9 1 14 6 10 2 12 4 8 0]exch
-get}def/FR{0.7200 0 $E defaultmatrix dtransform/yres exch def/xres exch def
-xres dup mul yres dup mul add sqrt}def/SU{/_sf exch def/_sa exch def/_cs
-exch def/_mm $C currentmatrix def/rm _sa $R rotate def/sm _cs dup $L scale
-def sm rm _mm _mm concatmatrix _mm concatmatrix pop 1 0 _mm dtransform/y1
-exch def/x1 exch def/_vl x1 dup mul y1 dup mul add sqrt def/_fq FR _vl div
-def/_na y1 x1 atan def _mm 2 get _mm 1 get mul _mm 0 get _mm 3 get mul sub
-0 gt{{neg}/_sf load concatprocs/_sf exch def}if _fq _na/_sf load
-setscreen}def/BO{/_yb exch def/_xb exch def/_bv _bs _yb _bw mul _xb 8 idiv
-add get def/_mk 1 7 _xb 8 mod sub bitshift def _bv _mk and 0 ne $I 1 eq
-xor}def/BF{DEC_WRITE_dict begin/_yy exch def/_xx exch def/_xi _xx 1 add 2
-div _bp mul cvi def/_yi _yy 1 add 2 div _bp mul cvi def _xi _yi BO{/_nb _nb
-1 add def 1}{/_fb _fb 1 add def 0}ifelse end}def/setpattern{/_cz exch
-def/_bw exch def/_bp exch def/_bs exch PS def/_nb 0 def/_fb 0 def _cz 0/BF
-load SU{}settransfer _fb _fb _nb add div setgray/$S 1
-def}def/invertpattern{$S 0 eq{{1 exch sub}currenttransfer concatprocs
-settransfer}if}def/invertscreen{/$I 1 def/$S 0 def}def/revertscreen{/$I 0
-def}def/setrect{/$h exch def/$w exch def/$y exch def/$x exch def newpath $x
-$y moveto $w $x add $y lineto $w $x add $h $y add lineto $x $h $y add
-lineto closepath}def/concatprocs{/_p2 exch cvlit def/_p1 exch cvlit def/_pn
-_p1 length _p2 length add array def _pn 0 _p1 putinterval _pn _p1 length
-_p2 putinterval _pn cvx}def/OF/findfont load def/findfont{dup
-DEC_WRITE_dict exch known{DEC_WRITE_dict exch get}if DEC_WRITE_dict/OF get
-exec}def
-mark/ISOLatin1Encoding 
-8#000 1 8#001{StandardEncoding exch get}for /emdash/endash
-8#004 1 8#025{StandardEncoding exch get}for /quotedblleft/quotedblright
-8#030 1 8#054{StandardEncoding exch get}for /minus 8#056 1 8#217
-{StandardEncoding exch get}for/dotlessi 8#301 1 8#317{StandardEncoding 
-exch get}for/space/exclamdown/cent/sterling/currency/yen/brokenbar/section
-/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/hyphen/registered
-/macron/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph
-/periodcentered/cedilla/onesuperior/ordmasculine/guillemotright/onequarter
-/onehalf/threequarters/questiondown/Agrave/Aacute/Acircumflex/Atilde
-/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave
-/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde
-/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn
-/germandbls/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla
-/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis
-/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide/oslash/ugrave
-/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis
-256 array astore def cleartomark 
-/encodefont{findfont dup maxlength dict begin{1 index/FID ne{def}{pop
-pop}ifelse}forall/Encoding exch def dup/FontName exch def currentdict
-definefont end}def/loads{/$/ISOLatin1Encoding load def/&/encodefont load
-def/*/invertpattern load def/+/revertscreen load def/-/invertscreen load
-def/:/concatprocs load def/^/setpattern load def/~/pat1 load def/_/pat2
-load def/@/setrect load def/A/arcn load def/B/ashow load def/C/curveto load
-def/D/def load def/E/eofill load def/F/findfont load def/G/setgray load
-def/H/closepath load def/I/clip load def/J/fill load def/K/kshow load
-def/L/lineto load def/M/moveto load def/N/newpath load def/O/rotate load
-def/P/pop load def/R/grestore load def/S/gsave load def/T/translate load
-def/U/sub load def/V/div load def/W/widthshow load def/X/exch load
-def/Y/awidthshow load def/a/save load def/c/setlinecap load def/d/setdash
-load def/e/restore load def/f/setfont load def/g/initclip load def/h/show
-load def/i/setmiterlimit load def/j/setlinejoin load def/k/stroke load
-def/l/rlineto load def/m/rmoveto load def/n/currentfont load
-def/o/scalefont load def/p/currentpoint load def/q/setrgbcolor load
-def/r/currenttransfer load def/s/scale load def/t/setmatrix load
-def/u/settransfer load def/w/setlinewidth load def/x/matrix load
-def/y/currentmatrix load def}def
-end
-%%EndProcSet
-%%EndProlog
-
-%%BeginSetup
-DEC_WRITE_dict begin
-loads
-version cvi 23.0 gt {
-currentdict {dup type /arraytype eq
-{bind def} {pop pop} ifelse} forall} if
-0.0100 0.0100 s
-
-%%EndSetup
-%%Page: 1 1
-/$P a D
-g N
-0 84189 T
-7087 -5669 T
-N
-312 -1212 M
-312 -2653 M
--7087 5669 T
-
-7087 -1169 T
-N
-312 -1212 M
--7087 1169 T
-
-7087 -5669 T
-N
-312 -1212 M
-312 -2653 M
--7087 5669 T
-
-N
-S
-7085 -80769 48178 54554 @ I N
-7085 -26215 T
-N
-N
-23508 -26885 M
-23508 -39779 L
-S
-150 w
-0 c
-0 j
-[400 400 100 400] 0 d
-0.00 G k
-R
-N
-
-N
-24514 -27357 M
-24514 -35528 L
-S
-150 w
-0 c
-0 j
-[400 400 100 400] 0 d
-0.00 G k
-R
-N
-
-N
-25519 -26636 M
-25519 -29922 L
-S
-150 w
-0 c
-0 j
-[400 400 100 400] 0 d
-0.00 G k
-R
-N
-
-N
-11147 -47469 M
-11147 -51318 L
-S
-2000 w
-0 c
-0 j
-/patt6 <3333333333333333> D
-patt6 8 1 72 300 32 V V ^ k
-R
-N
-
-N
-23915 -22282 M
-23915 -26132 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-15234 -43743 M
-15234 -45467 L
-S
-75 w
-0 c
-0 j
-2 i
-[100 400] 0 d
-0.00 G k
-R
-N
-
-N
-11147 -22282 M
-11147 -34126 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-21881 -18420 M
-21881 -22270 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-
-N
-27986 -40383 M
-27986 -43744 L
-S
-75 w
-0 c
-0 j
-2 i
-[100 400] 0 d
-0.00 G k
-R
-N
-
-N
-11690 -38261 M
-11690 -48177 L
-S
-300 w
-0 c
-0 j
-[400 400] 0 d
-0.00 G k
-R
-N
-
-
-N
-10603 -33882 M
-10603 -48177 L
-S
-150 w
-0 c
-0 j
-[400 400 100 400] 0 d
-0.00 G k
-R
-N
-
-N
-S
-18611 -21226 6541 7765 @ I N
-18611 -13461 T
-N
-N
-1022 -5312 M
-817 -5312 L
-817 -5312 L
-653 -5292 L
-499 -5247 L
-359 -5172 L
-237 -5072 L
-138 -4950 L
-62 -4813 L
-16 -4659 L
-0 -4494 L
-0 -4494 L
-0 -817 L
-0 -817 L
-16 -653 L
-62 -499 L
-138 -359 L
-237 -237 L
-359 -138 L
-499 -62 L
-653 -16 L
-817 0 L
-817 0 L
-5724 0 L
-5724 0 L
-5886 -16 L
-6040 -62 L
-6180 -138 L
-6301 -237 L
-6401 -359 L
-6476 -499 L
-6522 -653 L
-6541 -817 L
-6541 -817 L
-6541 -4494 L
-6541 -4494 L
-6522 -4659 L
-6476 -4813 L
-6401 -4950 L
-6301 -5072 L
-6180 -5172 L
-6040 -5247 L
-5886 -5292 L
-5724 -5312 L
-5724 -5312 L
-5519 -5312 L
-5926 -5926 L
-6131 -5926 L
-6541 -7765 L
-0 -7765 L
-410 -5926 L
-615 -5926 L
-1022 -5312 L
-S
-0.50 G E
-R
-S
-44 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-
-N
-817 -4904 M
-655 -4872 L
-528 -4783 L
-440 -4654 L
-410 -4494 L
-410 -4494 L
-410 -817 L
-410 -817 L
-440 -655 L
-528 -528 L
-655 -440 L
-817 -410 L
-817 -410 L
-5724 -407 L
-5724 -407 L
-5883 -437 L
-6013 -526 L
-6099 -655 L
-6131 -817 L
-6131 -817 L
-6131 -4494 L
-6131 -4494 L
-6099 -4654 L
-6013 -4783 L
-5883 -4872 L
-5724 -4904 L
-5724 -4904 L
-817 -4904 L
-S
-0.50 G E
-R
-S
-44 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-1022 -5312 M
-5519 -5312 L
-S
-44 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-5926 -5926 M
-615 -5926 L
-S
-44 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-615 -6131 M
-5926 -6131 L
-6131 -7560 L
-410 -7560 L
-615 -6131 L
-S
-0.50 G E
-R
-S
-44 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-R
-
-
-
-3189 -22601 739 638 @
-S
-0.00 G J
-R
-S
-399 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-
-25529 -16799 M
-/Times-Bold-ISOLatin1 $
-/Times-Bold & P
-/Times-Bold-ISOLatin1 F 1200 o f
-0.000000 0.000000 0.000000 q
-(DECstation) h
-
-N
-33621 -46088 M
-36965 -46088 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-
-37723 -46405 M
-/Helvetica-ISOLatin1 $
-/Helvetica & P
-/Helvetica-ISOLatin1 F 1000 o f
-(= E t h e r n e t) h
-
-N
-33610 -47755 M
-36954 -47755 L
-S
-150 w
-0 c
-0 j
-[400 400 100 400] 0 d
-0.00 G k
-R
-N
-
-
-37723 -48059 M
-(= R S 2 3 2 C) h
-
-8148 -39186 9211 7305 @
-S
-99 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-13816 -34412 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(VME) h
-
-10076 -38570 2143 6073 @
-S
-0.875 G J
-R
-S
-99 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-3271 -29401 M
-n 0.833 o f
-(PowerPC) h
-
-
-1063 -30234 M
-(Histogram Memory) h
-
-N
-5243 -30759 M
-6480 -34096 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-6084 -33745 M
-6556 -34301 L
-6552 -33571 L
-H
-S
-0.00 G J
-R
-N
-
-6241 -48092 9813 3457 @
-S
-0.00 1 X U G J
-R
-S
-99 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-
-7314 -46059 M
-n 1.200 o f
-(Multi\255Detector) h
-
-8814 -47576 M
-(Interface) h
-
-N
-33610 -49408 M
-36954 -49408 L
-S
-300 w
-0 c
-0 j
-[400 400] 0 d
-0.00 G k
-R
-N
-
-
-37723 -49712 M
-/Helvetica-ISOLatin1 F 1000 o f
-(= F i b r e O p t i c) h
-
-29502 -42863 M
-(Inhibit) h
-
-N
-28971 -41831 M
-28971 -43213 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-28721 -42746 M
-28971 -43432 L
-29221 -42746 L
-H
-S
-0.00 G J
-R
-N
-
-2910 -41116 M
-(Configuration) h
-
-
-26929 -18025 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(\(Host\)) h
-
-43235 -22601 739 638 @
-S
-0.00 G J
-R
-S
-399 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-3218 -22282 M
-43604 -22282 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-38614 -21736 M
-/Helvetica-ISOLatin1 F 1000 o f
-(Ethernet) h
-
-4577 -42405 M
-(Setup) h
-
-N
-9565 -40038 M
-9565 -42960 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-9315 -42493 M
-9565 -43179 L
-9815 -42493 L
-H
-S
-0.00 G J
-R
-N
-
-13107 -41381 M
-(Detector) h
-
-
-13940 -42670 M
-(Data) h
-
-N
-12399 -40257 M
-12399 -43179 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-12649 -40724 M
-12399 -40038 L
-12149 -40724 L
-H
-S
-0.00 G J
-R
-N
-
-N
-15234 -43743 M
-27987 -43743 L
-S
-75 w
-0 c
-0 j
-2 i
-[100 400] 0 d
-0.00 G k
-R
-N
-
-2999 -53138 16297 2127 @
-S
-0.00 1 X U G J
-R
-S
-99 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-
-7322 -52529 M
-/Times-Bold-ISOLatin1 F 1198 o f
-(Multi\255Detector) h
-
-N
-33610 -51061 M
-36954 -51061 L
-S
-75 w
-0 c
-0 j
-2 i
-[100 400] 0 d
-0.00 G k
-R
-N
-
-
-37723 -51365 M
-/Helvetica-ISOLatin1 F 1000 o f
-(= T T L   L e v e l) h
-
-N
-12399 -48942 M
-12399 -50063 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-12649 -49409 M
-12399 -48723 L
-12149 -49409 L
-H
-S
-0.00 G J
-R
-N
-
-30324 -25735 M
-/Times-Bold-ISOLatin1 F 1000 o f
-(Terminal Server) h
-
-N
-24416 -27990 M
-20242 -25484 L
-20182 -25217 L
-20225 -25211 L
-20189 -25191 L
-20235 -24525 L
-20235 -24525 L
-20249 -24465 L
-20285 -24439 L
-20285 -24439 L
-20658 -24382 L
-20658 -24272 L
-24769 -23673 L
-25225 -23873 L
-25235 -23919 L
-25308 -23909 L
-25538 -24009 L
-25548 -24056 L
-25621 -24046 L
-28601 -25341 L
-29010 -25450 L
-29010 -25450 L
-29047 -25490 L
-29053 -25550 L
-29053 -25550 L
-29513 -25753 L
-29513 -25753 L
-29616 -25836 L
-29672 -25986 L
-29672 -25986 L
-29756 -26775 L
-29699 -26788 L
-29759 -26812 L
-29769 -26905 L
-29699 -26918 L
-29626 -27005 L
-28464 -27224 L
-28404 -27195 L
-27036 -27454 L
-26996 -27501 L
-25002 -27880 L
-24939 -27840 L
-24746 -27877 L
-24696 -27937 L
-24416 -27990 L
-S
-0.50 G E
-R
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-
-N
-24416 -27990 M
-24513 -27880 L
-24566 -27887 L
-29699 -26918 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-29759 -26815 M
-24553 -27797 L
-20182 -25217 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-20225 -25211 M
-24553 -27760 L
-29699 -26788 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-28537 -27138 M
-28464 -27224 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-27069 -27414 M
-27036 -27454 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-25079 -27790 M
-25002 -27880 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-24769 -27850 M
-24746 -27877 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-24566 -27887 M
-24553 -27797 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-24553 -27760 M
-24460 -26892 L
-24460 -26892 L
-24410 -26755 L
-24293 -26649 L
-24293 -26649 L
-20312 -24445 L
-20312 -24445 L
-20285 -24439 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-20658 -24382 M
-20658 -24439 L
-24047 -26289 L
-24476 -26356 L
-24476 -26356 L
-24506 -26339 L
-24519 -26292 L
-24506 -26243 L
-24476 -26213 L
-24476 -26213 L
-24047 -26096 L
-21410 -24678 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-21337 -24638 M
-21137 -24528 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-21064 -24492 M
-20658 -24272 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-24486 -26356 M
-29023 -25590 L
-29023 -25590 L
-29053 -25550 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-28694 -25504 M
-24659 -26183 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-25801 -27481 M
-25784 -27314 L
-25838 -27304 L
-25854 -27471 L
-25801 -27481 L
-S
-0.50 G E
-R
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-25468 -26928 M
-25458 -26835 L
-25784 -26778 L
-25794 -26872 L
-25468 -26928 L
-S
-0.50 G E
-R
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-25049 -26955 M
-25042 -26908 L
-25372 -26852 L
-25382 -26945 L
-25052 -27001 L
-25049 -26955 L
-25375 -26898 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-24886 -27031 M
-24802 -27045 L
-24792 -26952 L
-24956 -26922 L
-24966 -27018 L
-24886 -27031 L
-24886 -27031 L
-24932 -26985 L
-24932 -26985 L
-24916 -26952 L
-24886 -26938 L
-24886 -26938 L
-24852 -26952 L
-24839 -26985 L
-24839 -26985 L
-24852 -27015 L
-24886 -27031 L
-S
-0.50 G E
-R
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-24103 -27341 M
-24103 -26699 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-24003 -26642 M
-24003 -27284 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-23904 -27224 M
-23904 -26585 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-23807 -26529 M
-23807 -27168 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-23707 -27111 M
-23707 -26476 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-23607 -26419 M
-23607 -27051 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-23507 -26995 M
-23507 -26362 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-23408 -26309 M
-23408 -26935 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-23308 -26878 M
-23308 -26253 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-23208 -26196 M
-23208 -26818 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-23111 -26762 M
-23111 -26143 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-23011 -26086 M
-23011 -26705 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-22912 -26645 M
-22912 -26030 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-22812 -25973 M
-22812 -26589 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-22712 -26529 M
-22712 -25920 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-22612 -25863 M
-22612 -26472 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-22512 -26416 M
-22512 -25807 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-22412 -25753 M
-22412 -26356 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-22316 -26299 M
-22316 -25697 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-22216 -25640 M
-22216 -26239 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-22116 -26183 M
-22116 -25584 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-25548 -24056 M
-21410 -24678 L
-21377 -24831 L
-21337 -24638 L
-25538 -24009 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-25235 -23919 M
-21137 -24528 L
-21104 -24682 L
-21064 -24492 L
-25225 -23873 L
-S
-55 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-45097 -30717 M
-40624 -30717 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-
-N
-45097 -29124 M
-40624 -29124 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-28765 -32720 M
-28765 -34694 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-
-N
-30702 -32720 M
-30702 -34694 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-32638 -32720 M
-32638 -34694 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-34574 -32720 M
-34574 -34694 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-36510 -32720 M
-36510 -34694 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-38446 -32720 M
-38446 -34694 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-29734 -32720 M
-29734 -34694 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-31670 -32720 M
-31670 -34694 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-33606 -32720 M
-33606 -34694 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-35542 -32720 M
-35542 -34694 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-37478 -32720 M
-37478 -34694 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-39414 -32720 M
-39414 -34694 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-45009 -39778 M
-40536 -39778 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-
-N
-31618 -39778 M
-23508 -39778 L
-S
-150 w
-0 c
-0 j
-[400 400 100 400] 0 d
-0.00 G k
-R
-N
-
-N
-32624 -35527 M
-24514 -35527 L
-S
-150 w
-0 c
-0 j
-[400 400 100 400] 0 d
-0.00 G k
-R
-N
-
-26344 -36965 15493 2876 @
-S
-0.00 1 X U G J
-R
-S
-99 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-29391 -35982 M
-n 1.200 o f
-(EL734 Motor Ctrl) h
-
-26344 -41216 15493 2876 @
-S
-0.00 1 X U G J
-R
-S
-99 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-27824 -40233 M
-(EL737 Neutron Counter) h
-
-N
-46600 -39778 M
-44545 -39778 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-45012 -39528 M
-44326 -39778 L
-45012 -40028 L
-H
-S
-0.00 G J
-R
-N
-
-42662 -39361 M
-/Helvetica-ISOLatin1 F 1000 o f
-(Monitor) h
-
-N
-45097 -29921 M
-40624 -29921 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-29661 -29921 M
-25519 -29921 L
-S
-150 w
-0 c
-0 j
-[400 400 100 400] 0 d
-0.00 G k
-R
-N
-
-26344 -31359 15493 2876 @
-S
-0.00 1 X U G J
-R
-S
-99 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-27841 -30376 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(Temperature Controller) h
-
-R
-
-
-showpage
-$P e
-
-%%Trailer
-$D end restore
- % DEC_WRITE_dict
-%%Pages: 1
-%%DocumentFonts: Times-Bold
-%%+ Helvetica
diff --git a/sinqhm/hist_mem_spec_fig2.ps b/sinqhm/hist_mem_spec_fig2.ps
deleted file mode 100755
index 9a9a8636..00000000
--- a/sinqhm/hist_mem_spec_fig2.ps
+++ /dev/null
@@ -1,808 +0,0 @@
-%!PS-Adobe-2.1
-%%Creator: DECwrite V3.0-2
-%%+Copyright (c) 1990,1994 DIGITAL EQUIPMENT CORPORATION.  
-%%+All Rights Reserved.
-%%DocumentFonts: (atend)
-%%EndComments
-%%BeginProcSet DEC_WRITE 1.10
-save/DEC_WRITE_dict 150 dict def DEC_WRITE_dict begin/$D exch def/$I 0
-def/$S 0 def/$C matrix def/$R matrix def/$L matrix def/$E matrix
-def/pat1{/px exch def/pa 8 array def 0 1 7{/py exch def/pw 4 string def 0 1
-3{pw exch px py 1 getinterval putinterval}for pa py pw put}for}def/pat2{/pi
-exch def/cflag exch def save cflag 1 eq{eoclip}{clip}ifelse
-newpath{clippath pathbbox}stopped not{/ph exch def/pw exch def/py exch
-def/px exch def/px px 3072 div floor 3072 mul def/py py 3072 div floor 3072
-mul def px py translate/pw pw px sub 3072 div floor 1 add cvi def/ph ph py
-sub 3072 div floor 1 add cvi def pw 3072 mul ph 3072 mul scale/pw pw 32 mul
-def/ph ph 32 mul def/px 0 def/py 0 def pw ph pi[pw 0 0 ph 0 0]{pa py get/px
-px 32 add def px pw ge{/px 0 def/py py 1 add 8 mod def}if}pi
-type/booleantype eq{imagemask}{image}ifelse}if restore}def/PS{/_op exch
-def/_np 8 string def 0 1 7{/_ii exch def/num _op _ii get def _np 7 _ii sub
-num -4 bitshift PX num 15 and 4 bitshift -4 bitshift PX 4 bitshift or
-put}for _np}def/PX{[15 7 11 3 13 5 9 1 14 6 10 2 12 4 8 0]exch
-get}def/FR{0.7200 0 $E defaultmatrix dtransform/yres exch def/xres exch def
-xres dup mul yres dup mul add sqrt}def/SU{/_sf exch def/_sa exch def/_cs
-exch def/_mm $C currentmatrix def/rm _sa $R rotate def/sm _cs dup $L scale
-def sm rm _mm _mm concatmatrix _mm concatmatrix pop 1 0 _mm dtransform/y1
-exch def/x1 exch def/_vl x1 dup mul y1 dup mul add sqrt def/_fq FR _vl div
-def/_na y1 x1 atan def _mm 2 get _mm 1 get mul _mm 0 get _mm 3 get mul sub
-0 gt{{neg}/_sf load concatprocs/_sf exch def}if _fq _na/_sf load
-setscreen}def/BO{/_yb exch def/_xb exch def/_bv _bs _yb _bw mul _xb 8 idiv
-add get def/_mk 1 7 _xb 8 mod sub bitshift def _bv _mk and 0 ne $I 1 eq
-xor}def/BF{DEC_WRITE_dict begin/_yy exch def/_xx exch def/_xi _xx 1 add 2
-div _bp mul cvi def/_yi _yy 1 add 2 div _bp mul cvi def _xi _yi BO{/_nb _nb
-1 add def 1}{/_fb _fb 1 add def 0}ifelse end}def/setpattern{/_cz exch
-def/_bw exch def/_bp exch def/_bs exch PS def/_nb 0 def/_fb 0 def _cz 0/BF
-load SU{}settransfer _fb _fb _nb add div setgray/$S 1
-def}def/invertpattern{$S 0 eq{{1 exch sub}currenttransfer concatprocs
-settransfer}if}def/invertscreen{/$I 1 def/$S 0 def}def/revertscreen{/$I 0
-def}def/setrect{/$h exch def/$w exch def/$y exch def/$x exch def newpath $x
-$y moveto $w $x add $y lineto $w $x add $h $y add lineto $x $h $y add
-lineto closepath}def/concatprocs{/_p2 exch cvlit def/_p1 exch cvlit def/_pn
-_p1 length _p2 length add array def _pn 0 _p1 putinterval _pn _p1 length
-_p2 putinterval _pn cvx}def/OF/findfont load def/findfont{dup
-DEC_WRITE_dict exch known{DEC_WRITE_dict exch get}if DEC_WRITE_dict/OF get
-exec}def
-mark/ISOLatin1Encoding 
-8#000 1 8#001{StandardEncoding exch get}for /emdash/endash
-8#004 1 8#025{StandardEncoding exch get}for /quotedblleft/quotedblright
-8#030 1 8#054{StandardEncoding exch get}for /minus 8#056 1 8#217
-{StandardEncoding exch get}for/dotlessi 8#301 1 8#317{StandardEncoding 
-exch get}for/space/exclamdown/cent/sterling/currency/yen/brokenbar/section
-/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/hyphen/registered
-/macron/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph
-/periodcentered/cedilla/onesuperior/ordmasculine/guillemotright/onequarter
-/onehalf/threequarters/questiondown/Agrave/Aacute/Acircumflex/Atilde
-/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave
-/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde
-/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn
-/germandbls/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla
-/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis
-/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide/oslash/ugrave
-/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis
-256 array astore def cleartomark 
-/encodefont{findfont dup maxlength dict begin{1 index/FID ne{def}{pop
-pop}ifelse}forall/Encoding exch def dup/FontName exch def currentdict
-definefont end}def/loads{/$/ISOLatin1Encoding load def/&/encodefont load
-def/*/invertpattern load def/+/revertscreen load def/-/invertscreen load
-def/:/concatprocs load def/^/setpattern load def/~/pat1 load def/_/pat2
-load def/@/setrect load def/A/arcn load def/B/ashow load def/C/curveto load
-def/D/def load def/E/eofill load def/F/findfont load def/G/setgray load
-def/H/closepath load def/I/clip load def/J/fill load def/K/kshow load
-def/L/lineto load def/M/moveto load def/N/newpath load def/O/rotate load
-def/P/pop load def/R/grestore load def/S/gsave load def/T/translate load
-def/U/sub load def/V/div load def/W/widthshow load def/X/exch load
-def/Y/awidthshow load def/a/save load def/c/setlinecap load def/d/setdash
-load def/e/restore load def/f/setfont load def/g/initclip load def/h/show
-load def/i/setmiterlimit load def/j/setlinejoin load def/k/stroke load
-def/l/rlineto load def/m/rmoveto load def/n/currentfont load
-def/o/scalefont load def/p/currentpoint load def/q/setrgbcolor load
-def/r/currenttransfer load def/s/scale load def/t/setmatrix load
-def/u/settransfer load def/w/setlinewidth load def/x/matrix load
-def/y/currentmatrix load def}def
-end
-%%EndProcSet
-%%EndProlog
-
-%%BeginSetup
-DEC_WRITE_dict begin
-loads
-version cvi 23.0 gt {
-currentdict {dup type /arraytype eq
-{bind def} {pop pop} ifelse} forall} if
-0.0100 0.0100 s
-
-%%EndSetup
-%%Page: 1 1
-/$P a D
-g N
-0 84189 T
-7087 -5669 T
-N
-312 -1212 M
-312 -2653 M
--7087 5669 T
-
-7087 -1169 T
-N
-312 -1212 M
--7087 1169 T
-
-7087 -5669 T
-N
-312 -1212 M
-312 -2653 M
--7087 5669 T
-
-N
-S
-7085 -80769 48178 58098 @ I N
-7085 -22671 T
-N
-N
-35450 -14207 M
-35450 -20478 L
-S
-300 w
-0 c
-0 j
-[100 400] 0 d
-0.00 G k
-R
-N
-
-N
-34939 -27801 M
-34939 -31417 L
-S
-300 w
-0 c
-0 j
-[100 400] 0 d
-0.00 G k
-R
-N
-
-N
-22559 -31416 M
-34940 -31416 L
-S
-300 w
-0 c
-0 j
-[100 400] 0 d
-0.00 G k
-R
-N
-
-N
-28850 -22464 M
-36291 -22464 L
-S
-300 w
-0 c
-0 j
-[100 400] 0 d
-0.00 G k
-R
-N
-
-N
-25364 -27471 M
-32805 -27471 L
-S
-300 w
-0 c
-0 j
-[100 400] 0 d
-0.00 G k
-R
-N
-
-N
-34838 -8181 M
-44702 -8181 L
-S
-150 w
-0 c
-0 j
-[400 400 100 400] 0 d
-0.00 G k
-R
-N
-
-
-N
-37261 -11835 M
-44702 -11835 L
-S
-300 w
-0 c
-0 j
-[400 400] 0 d
-0.00 G k
-R
-N
-
-
-N
-5116 -41296 M
-13045 -41296 L
-10151 -40810 L
-17399 -40810 L
-S
-150 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-5329 -46076 M
-10817 -46076 L
-8814 -45591 L
-13831 -45591 L
-S
-150 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-5097 -50856 M
-8568 -50856 L
-7302 -50369 L
-10477 -50369 L
-S
-150 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-8049 -22253 M
-14559 -22253 L
-12183 -21767 L
-18134 -21767 L
-S
-150 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-8204 -27033 M
-12656 -27033 L
-11031 -26548 L
-15101 -26548 L
-S
-150 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-7974 -31812 M
-9684 -31812 L
-9060 -31326 L
-10624 -31326 L
-S
-150 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-17555 -25215 12599 6410 @
-S
-0.00 1 X U G J
-R
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-
-20553 -21763 M
-/Times-Bold-ISOLatin1 $
-/Times-Bold & P
-/Times-Bold-ISOLatin1 F 1800 o f
-0.000000 0.000000 0.000000 q
-(SinqHM) h
-
-20181 -23488 M
-(Server #3) h
-
-13917 -29995 12599 6410 @
-S
-0.00 1 X U G J
-R
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-
-16915 -26543 M
-(SinqHM) h
-
-16543 -28268 M
-(Server #2) h
-
-26356 -14253 11683 6411 @
-S
-1.00 G J
-R
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-
-29996 -9172 M
-n 0.667 o f
-(SinqHM) h
-
-28430 -10621 M
-(Histogrammer) h
-
-N
-8038 -14590 M
-12490 -14590 L
-10865 -14105 L
-14935 -14105 L
-S
-150 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-7750 -8385 M
-7750 -35227 L
-4980 -31609 L
-4980 -55005 L
-S
-924 w
-0 c
-0 j
-0.00 G k
-R
-N
-N
-3483 -52783 M
-4980 -56897 L
-6477 -52783 L
-H
-S
-0.00 G J
-R
-N
-N
-9247 -10607 M
-7750 -6493 L
-6253 -10607 L
-H
-S
-0.00 G J
-R
-N
-
-5615 -16587 M
-n 1.167 o f
-(N) h
-
-
-5810 -18140 M
-(e) h
-
-5888 -19694 M
-(t) h
-
-5615 -21246 M
-(w) h
-
-5770 -22800 M
-(o) h
-
-5810 -24354 M
-(r) h
-
-5732 -25906 M
-(k) h
-
-14414 -17086 12599 6410 @
-S
-0.00 1 X U G J
-R
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-
-17412 -13634 M
-n 1.286 o f
-(SinqHM) h
-
-17965 -15359 M
-(Master) h
-
-30797 -12069 M
-n 0.667 o f
-(Filler) h
-
-N
-38178 -18846 M
-31080 -20545 L
-31080 -27341 L
-38178 -29040 L
-45279 -27341 L
-45279 -20545 L
-H
-S
-1.00 G E
-R
-S
-152 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-
-34329 -24949 M
-/Times-Italic-ISOLatin1 $
-/Times-Italic & P
-/Times-Italic-ISOLatin1 F 1800 o f
-(Histogram) h
-
-32030 -26884 M
-(Storage & Status) h
-
-N
-37575 -22189 M
-36742 -19887 L
-36839 -19851 L
-36839 -19851 L
-37005 -19786 L
-37171 -19741 L
-37331 -19716 L
-37489 -19705 L
-37489 -19705 L
-37668 -20198 L
-37668 -20198 L
-37823 -20201 L
-37976 -20215 L
-38278 -20271 L
-38278 -20271 L
-38101 -19776 L
-38101 -19776 L
-38420 -19849 L
-38741 -19915 L
-38741 -19915 L
-38918 -20408 L
-38918 -20408 L
-39078 -20431 L
-39242 -20444 L
-39405 -20445 L
-39574 -20432 L
-39574 -20432 L
-39752 -20916 L
-39752 -20916 L
-39582 -20933 L
-39415 -20931 L
-39253 -20916 L
-39095 -20896 L
-39095 -20896 L
-38918 -20408 L
-38918 -20408 L
-38597 -20340 L
-38278 -20271 L
-38278 -20271 L
-38456 -20757 L
-38456 -20757 L
-38772 -20827 L
-39095 -20896 L
-39095 -20896 L
-39271 -21382 L
-39271 -21382 L
-38950 -21315 L
-38634 -21244 L
-38634 -21244 L
-38456 -20757 L
-38456 -20757 L
-38152 -20703 L
-37999 -20687 L
-37842 -20684 L
-37842 -20684 L
-37668 -20198 L
-37668 -20198 L
-37509 -20209 L
-37347 -20234 L
-37182 -20278 L
-37016 -20345 L
-37016 -20345 L
-37192 -20831 L
-37192 -20831 L
-37360 -20764 L
-37524 -20720 L
-37685 -20694 L
-37842 -20684 L
-37842 -20684 L
-38021 -21173 L
-38021 -21173 L
-37862 -21180 L
-37701 -21207 L
-37536 -21252 L
-37368 -21317 L
-37368 -21317 L
-37684 -22189 L
-37575 -22189 L
-S
-0.50 G E
-R
-S
-41 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-37368 -21317 M
-37192 -20831 L
-S
-41 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-37016 -20345 M
-36839 -19851 L
-S
-41 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-37489 -19705 M
-37644 -19708 L
-37798 -19724 L
-38101 -19776 L
-S
-41 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-38741 -19915 M
-38901 -19938 L
-39063 -19951 L
-39226 -19953 L
-39396 -19938 L
-39396 -19938 L
-39574 -20432 L
-S
-41 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-39752 -20916 M
-39927 -21406 L
-39927 -21406 L
-39756 -21418 L
-39592 -21418 L
-39431 -21406 L
-39271 -21382 L
-S
-41 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-N
-38634 -21244 M
-38328 -21191 L
-38175 -21175 L
-38021 -21173 L
-S
-41 w
-1 c
-1 j
-0.00 G k
-R
-N
-
-40756 -21309 M
-/Times-Bold-ISOLatin1 F 800 o f
-(Semaphores) h
-
-10279 -34774 12599 6410 @
-S
-0.00 1 X U G J
-R
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-
-13277 -31322 M
-n 2.250 o f
-(SinqHM) h
-
-12905 -33047 M
-(Server #1) h
-
-N
-2399 -37411 M
-40612 -37411 L
-S
-150 w
-0 c
-0 j
-[400 400] 0 d
-0.00 G k
-R
-N
-
-32402 -35854 M
-/Times-Roman-ISOLatin1 $
-/Times-Roman & P
-/Times-Roman-ISOLatin1 F 1800 o f
-(PowerPC) h
-
-33153 -40255 M
-(Host\(s\)) h
-
-17025 -44258 12599 6410 @
-S
-0.00 1 X U G J
-R
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-
-19850 -41697 M
-/Times-Bold-ISOLatin1 F 1800 o f
-(Client #3) h
-
-13387 -49038 12599 6410 @
-S
-0.00 1 X U G J
-R
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-
-16212 -46477 M
-(Client #2) h
-
-9749 -53817 12599 6410 @
-S
-0.00 1 X U G J
-R
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-
-12574 -51256 M
-(Client #1) h
-
-41622 -22578 M
-n 0.444 o f
-(Signals) h
-
-38442 -10637 M
-/Helvetica-ISOLatin1 $
-/Helvetica & P
-/Helvetica-ISOLatin1 F 1000 o f
-(Detector  Data) h
-
-N
-42386 -11027 M
-40331 -11027 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-40798 -10777 M
-40112 -11027 L
-40798 -11277 L
-H
-S
-0.00 G J
-R
-N
-
-N
-42737 -7309 M
-39542 -7309 L
-S
-75 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-42270 -7559 M
-42956 -7309 L
-42270 -7059 L
-H
-S
-0.00 G J
-R
-N
-
-33772 -6855 M
-(Configuration and Control) h
-
-R
-
-
-showpage
-$P e
-
-%%Trailer
-$D end restore
- % DEC_WRITE_dict
-%%Pages: 1
-%%DocumentFonts: Times-Bold
-%%+ Times-Italic
-%%+ Times-Roman
-%%+ Helvetica
diff --git a/sinqhm/hist_mem_spec_fig3.ps b/sinqhm/hist_mem_spec_fig3.ps
deleted file mode 100755
index 1faa4de3..00000000
--- a/sinqhm/hist_mem_spec_fig3.ps
+++ /dev/null
@@ -1,1048 +0,0 @@
-%!PS-Adobe-2.1
-%%Creator: DECwrite V3.0-2
-%%+Copyright (c) 1990,1994 DIGITAL EQUIPMENT CORPORATION.  
-%%+All Rights Reserved.
-%%DocumentFonts: (atend)
-%%EndComments
-%%BeginProcSet DEC_WRITE 1.10
-save/DEC_WRITE_dict 150 dict def DEC_WRITE_dict begin/$D exch def/$I 0
-def/$S 0 def/$C matrix def/$R matrix def/$L matrix def/$E matrix
-def/pat1{/px exch def/pa 8 array def 0 1 7{/py exch def/pw 4 string def 0 1
-3{pw exch px py 1 getinterval putinterval}for pa py pw put}for}def/pat2{/pi
-exch def/cflag exch def save cflag 1 eq{eoclip}{clip}ifelse
-newpath{clippath pathbbox}stopped not{/ph exch def/pw exch def/py exch
-def/px exch def/px px 3072 div floor 3072 mul def/py py 3072 div floor 3072
-mul def px py translate/pw pw px sub 3072 div floor 1 add cvi def/ph ph py
-sub 3072 div floor 1 add cvi def pw 3072 mul ph 3072 mul scale/pw pw 32 mul
-def/ph ph 32 mul def/px 0 def/py 0 def pw ph pi[pw 0 0 ph 0 0]{pa py get/px
-px 32 add def px pw ge{/px 0 def/py py 1 add 8 mod def}if}pi
-type/booleantype eq{imagemask}{image}ifelse}if restore}def/PS{/_op exch
-def/_np 8 string def 0 1 7{/_ii exch def/num _op _ii get def _np 7 _ii sub
-num -4 bitshift PX num 15 and 4 bitshift -4 bitshift PX 4 bitshift or
-put}for _np}def/PX{[15 7 11 3 13 5 9 1 14 6 10 2 12 4 8 0]exch
-get}def/FR{0.7200 0 $E defaultmatrix dtransform/yres exch def/xres exch def
-xres dup mul yres dup mul add sqrt}def/SU{/_sf exch def/_sa exch def/_cs
-exch def/_mm $C currentmatrix def/rm _sa $R rotate def/sm _cs dup $L scale
-def sm rm _mm _mm concatmatrix _mm concatmatrix pop 1 0 _mm dtransform/y1
-exch def/x1 exch def/_vl x1 dup mul y1 dup mul add sqrt def/_fq FR _vl div
-def/_na y1 x1 atan def _mm 2 get _mm 1 get mul _mm 0 get _mm 3 get mul sub
-0 gt{{neg}/_sf load concatprocs/_sf exch def}if _fq _na/_sf load
-setscreen}def/BO{/_yb exch def/_xb exch def/_bv _bs _yb _bw mul _xb 8 idiv
-add get def/_mk 1 7 _xb 8 mod sub bitshift def _bv _mk and 0 ne $I 1 eq
-xor}def/BF{DEC_WRITE_dict begin/_yy exch def/_xx exch def/_xi _xx 1 add 2
-div _bp mul cvi def/_yi _yy 1 add 2 div _bp mul cvi def _xi _yi BO{/_nb _nb
-1 add def 1}{/_fb _fb 1 add def 0}ifelse end}def/setpattern{/_cz exch
-def/_bw exch def/_bp exch def/_bs exch PS def/_nb 0 def/_fb 0 def _cz 0/BF
-load SU{}settransfer _fb _fb _nb add div setgray/$S 1
-def}def/invertpattern{$S 0 eq{{1 exch sub}currenttransfer concatprocs
-settransfer}if}def/invertscreen{/$I 1 def/$S 0 def}def/revertscreen{/$I 0
-def}def/setrect{/$h exch def/$w exch def/$y exch def/$x exch def newpath $x
-$y moveto $w $x add $y lineto $w $x add $h $y add lineto $x $h $y add
-lineto closepath}def/concatprocs{/_p2 exch cvlit def/_p1 exch cvlit def/_pn
-_p1 length _p2 length add array def _pn 0 _p1 putinterval _pn _p1 length
-_p2 putinterval _pn cvx}def/OF/findfont load def/findfont{dup
-DEC_WRITE_dict exch known{DEC_WRITE_dict exch get}if DEC_WRITE_dict/OF get
-exec}def
-mark/ISOLatin1Encoding 
-8#000 1 8#001{StandardEncoding exch get}for /emdash/endash
-8#004 1 8#025{StandardEncoding exch get}for /quotedblleft/quotedblright
-8#030 1 8#054{StandardEncoding exch get}for /minus 8#056 1 8#217
-{StandardEncoding exch get}for/dotlessi 8#301 1 8#317{StandardEncoding 
-exch get}for/space/exclamdown/cent/sterling/currency/yen/brokenbar/section
-/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/hyphen/registered
-/macron/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph
-/periodcentered/cedilla/onesuperior/ordmasculine/guillemotright/onequarter
-/onehalf/threequarters/questiondown/Agrave/Aacute/Acircumflex/Atilde
-/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave
-/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde
-/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn
-/germandbls/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla
-/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis
-/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide/oslash/ugrave
-/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis
-256 array astore def cleartomark 
-/encodefont{findfont dup maxlength dict begin{1 index/FID ne{def}{pop
-pop}ifelse}forall/Encoding exch def dup/FontName exch def currentdict
-definefont end}def/loads{/$/ISOLatin1Encoding load def/&/encodefont load
-def/*/invertpattern load def/+/revertscreen load def/-/invertscreen load
-def/:/concatprocs load def/^/setpattern load def/~/pat1 load def/_/pat2
-load def/@/setrect load def/A/arcn load def/B/ashow load def/C/curveto load
-def/D/def load def/E/eofill load def/F/findfont load def/G/setgray load
-def/H/closepath load def/I/clip load def/J/fill load def/K/kshow load
-def/L/lineto load def/M/moveto load def/N/newpath load def/O/rotate load
-def/P/pop load def/R/grestore load def/S/gsave load def/T/translate load
-def/U/sub load def/V/div load def/W/widthshow load def/X/exch load
-def/Y/awidthshow load def/a/save load def/c/setlinecap load def/d/setdash
-load def/e/restore load def/f/setfont load def/g/initclip load def/h/show
-load def/i/setmiterlimit load def/j/setlinejoin load def/k/stroke load
-def/l/rlineto load def/m/rmoveto load def/n/currentfont load
-def/o/scalefont load def/p/currentpoint load def/q/setrgbcolor load
-def/r/currenttransfer load def/s/scale load def/t/setmatrix load
-def/u/settransfer load def/w/setlinewidth load def/x/matrix load
-def/y/currentmatrix load def}def
-end
-%%EndProcSet
-%%EndProlog
-
-%%BeginSetup
-DEC_WRITE_dict begin
-loads
-version cvi 23.0 gt {
-currentdict {dup type /arraytype eq
-{bind def} {pop pop} ifelse} forall} if
-0.0100 0.0100 s
-
-%%EndSetup
-%%Page: 1 1
-/$P a D
-g N
-0 84189 T
-7087 -5669 T
-N
-312 -1212 M
-312 -2653 M
--7087 5669 T
-
-7087 -1169 T
-N
-312 -1212 M
--7087 1169 T
-
-7087 -5669 T
-N
-312 -1212 M
-312 -2653 M
--7087 5669 T
-
-N
-S
-7085 -80769 48178 65891 @ I N
-7085 -14878 T
-N
-12501 -23746 M
-/Times-Bold-ISOLatin1 $
-/Times-Bold & P
-/Times-Bold-ISOLatin1 F 1400 o f
-0.000000 0.000000 0.000000 q
-/x0 p P D
-(SinqHM Master) h
-S
-/x1 p P D
-x0 x1 U -188.9 m
-x1 x0 U 0 l
-99.8 w k
-R
-
-33381 -23746 M
-/x0 p P D
-(SinqHM Client) h
-S
-/x1 p P D
-x0 x1 U -188.9 m
-x1 x0 U 0 l
-99.8 w k
-R
-
-13696 -33766 M
-n 0.857 o f
-(recv) h
-/Times-Roman-ISOLatin1 $
-/Times-Roman & P
-/Times-Roman-ISOLatin1 F 1200 o f
-( message) h
-
-12563 -31288 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(accept) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( connection) h
-
-13664 -25783 M
-(Create ) h
-/Times-Bold-ISOLatin1 F 1200 o f
-(socket) h
-
-
-12462 -27016 M
-/Times-Roman-ISOLatin1 F 1200 o f
-(and ) h
-/Times-Bold-ISOLatin1 F 1200 o f
-(bind) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( base port) h
-
-11596 -36441 M
-(Set up shared memory) h
-
-
-10712 -37674 M
-(region for communication) h
-
-15696 -44532 M
-/Times-Bold-ISOLatin1 F 1400 o f
-(fork) h
-
-
-21401 -49358 M
-/Times-Roman-ISOLatin1 F 1200 o f
-(wait till) h
-
-
-19569 -50539 M
-(semaphore free) h
-
-9212 -48685 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(Histogram) h
-
-
-10545 -49918 M
-(Filler) h
-
-10280 -59044 M
-/Times-Roman-ISOLatin1 F 1200 o f
-(release) h
-
-
-9346 -60277 M
-(semaphore) h
-
-20600 -53460 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(send) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( client) h
-
-
-19536 -54694 M
-(message giving) h
-
-19234 -55927 M
-(subsystem status) h
-
-22020 -59037 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(close) h
-
-
-20618 -60269 M
-/Times-Roman-ISOLatin1 F 1200 o f
-(connection) h
-
-N
-16980 -29196 M
-16980 -29947 L
-S
-0.00 1 X U G J
-R
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-16727 -29522 M
-16980 -30066 L
-17234 -29522 L
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-16958 -31781 M
-16958 -32532 L
-S
-0.00 1 X U G J
-R
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-16705 -32107 M
-16958 -32651 L
-17212 -32107 L
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-17061 -34209 M
-17061 -34961 L
-S
-0.00 1 X U G J
-R
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-16808 -34536 M
-17061 -35080 L
-17315 -34536 L
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-16980 -41740 M
-16980 -42491 L
-S
-0.00 1 X U G J
-R
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-16727 -42066 M
-16980 -42610 L
-17234 -42066 L
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-11795 -50338 M
-11795 -52093 L
-S
-0.00 1 X U G J
-R
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-11542 -51668 M
-11795 -52212 L
-12049 -51668 L
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-16184 -45217 M
-12541 -47320 L
-S
-0.00 1 X U G J
-R
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-12782 -46888 M
-12437 -47379 L
-13035 -47327 L
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-
-N
-18301 -45253 M
-21577 -47144 L
-S
-0.00 1 X U G J
-R
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-21082 -47151 M
-21680 -47203 L
-21336 -46712 L
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-
-34633 -28082 M
-(Create ) h
-/Times-Bold-ISOLatin1 F 1200 o f
-(socket) h
-
-
-34648 -29313 M
-/Times-Roman-ISOLatin1 F 1200 o f
-(and ) h
-/Times-Bold-ISOLatin1 F 1200 o f
-(bind) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( port) h
-
-33149 -36418 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(connect) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( to SinqHM) h
-
-N
-37977 -29818 M
-37977 -30570 L
-S
-0.00 1 X U G J
-R
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-37724 -30145 M
-37977 -30689 L
-38231 -30145 L
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-23258 -61140 M
-23258 -62460 L
-S
-0.00 1 X U G J
-R
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-23005 -62035 M
-23258 -62579 L
-23512 -62035 L
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-23252 -62696 M
-27360 -62696 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-27359 -62697 M
-27359 -42869 L
-S
-0.00 1 X U G J
-R
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-27613 -43294 M
-27359 -42750 L
-27106 -43294 L
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-27359 -49870 M
-27359 -29805 L
-S
-0.00 1 X U G J
-R
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-27360 -29805 M
-18979 -29805 L
-S
-0.00 1 X U G J
-R
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-19404 -29552 M
-18860 -29805 L
-19404 -30059 L
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-33800 -39546 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(send ) h
-/Times-Roman-ISOLatin1 F 1200 o f
-(\026configure) h
-(\027) h
-
-
-36215 -40779 M
-(request) h
-
-33562 -55348 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(recv) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( acknowledge) h
-
-
-34592 -56581 M
-(from SinqHM) h
-
-36743 -59300 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(close) h
-
-
-35343 -60532 M
-/Times-Roman-ISOLatin1 F 1200 o f
-(connection) h
-
-37127 -63254 M
-(etc.) h
-
-33433 -32265 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(gethostbyname) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( of) h
-
-
-34566 -33497 M
-(SinqHM node) h
-
-N
-37977 -34054 M
-37977 -34806 L
-S
-0.00 1 X U G J
-R
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-37724 -34381 M
-37977 -34925 L
-38231 -34381 L
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-37977 -37100 M
-37977 -37852 L
-S
-0.00 1 X U G J
-R
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-37724 -37427 M
-37977 -37971 L
-38231 -37427 L
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-32608 -35973 M
-31288 -35973 L
-28315 -30898 L
-22449 -30898 L
-S
-100 w
-0 c
-0 j
-2 i
-[400 400] 0 d
-0.00 G k
-R
-N
-N
-22884 -30633 M
-22157 -30898 L
-22884 -31163 L
-H
-S
-0.00 G J
-R
-N
-
-N
-32869 -39119 M
-31626 -39119 L
-27981 -33342 L
-21333 -33342 L
-S
-100 w
-0 c
-0 j
-2 i
-[400 400] 0 d
-0.00 G k
-R
-N
-N
-21768 -33077 M
-21041 -33342 L
-21768 -33607 L
-H
-S
-0.00 G J
-R
-N
-
-N
-37977 -41879 M
-37977 -53534 L
-S
-0.00 1 X U G J
-R
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-37724 -53109 M
-37977 -53653 L
-38231 -53109 L
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-26828 -53136 M
-29998 -53136 L
-30629 -54888 L
-32399 -54888 L
-S
-100 w
-0 c
-0 j
-2 i
-[400 400] 0 d
-0.00 G k
-R
-N
-N
-31964 -55153 M
-32691 -54888 L
-31964 -54623 L
-H
-S
-0.00 G J
-R
-N
-
-N
-15460 -58708 M
-17844 -58708 L
-18947 -49047 L
-20088 -49047 L
-S
-241 w
-0 c
-0 j
-0.00 G k
-R
-N
-N
-19354 -49494 M
-20582 -49047 L
-19354 -48600 L
-H
-S
-0.00 G J
-R
-N
-
-N
-23258 -56346 M
-23258 -57666 L
-S
-0.00 1 X U G J
-R
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-23005 -57241 M
-23258 -57785 L
-23512 -57241 L
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-37977 -57058 M
-37977 -57966 L
-S
-0.00 1 X U G J
-R
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-37724 -57541 M
-37977 -58085 L
-38231 -57541 L
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-37977 -61171 M
-37977 -62138 L
-S
-0.00 1 X U G J
-R
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-37724 -61713 M
-37977 -62257 L
-38231 -61713 L
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-23258 -51079 M
-23258 -51832 L
-S
-0.00 1 X U G J
-R
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-23005 -51407 M
-23258 -51951 L
-23512 -51407 L
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-15189 -45191 3951 1936 @
-S
-120 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-12155 -46084 M
-/Times-Bold-ISOLatin1 F 1000 o f
-(child) h
-
-20375 -46084 M
-(parent) h
-
-6077 -53347 M
-/Times-Roman-ISOLatin1 F 1200 o f
-(Complete configuration) h
-
-
-7028 -54580 M
-(e.g. set up front end) h
-
-N
-11795 -61023 M
-11795 -61774 L
-S
-0.00 1 X U G J
-R
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-11542 -61349 M
-11795 -61893 L
-12049 -61349 L
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-11795 -55612 M
-11795 -57367 L
-S
-0.00 1 X U G J
-R
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-11542 -56942 M
-11795 -57486 L
-12049 -56942 L
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-5712 -63363 M
-(Read data from front\255end) h
-
-
-6394 -64596 M
-(and update histograms) h
-
-11095 -40279 M
-(Initialise a semaphore to) h
-
-
-13830 -41416 M
-/Times-Italic-ISOLatin1 $
-/Times-Italic & P
-/Times-Italic-ISOLatin1 F 1200 o f
-(claimed) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( state) h
-
-N
-16980 -38139 M
-16980 -38890 L
-S
-0.00 1 X U G J
-R
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-16727 -38465 M
-16980 -39009 L
-17234 -38465 L
-S
-100 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-12394 -28533 M
-(Set socket to ) h
-/Times-Bold-ISOLatin1 F 1200 o f
-(listen) h
-
-R
-
-
-showpage
-$P e
-
-%%Trailer
-$D end restore
- % DEC_WRITE_dict
-%%Pages: 1
-%%DocumentFonts: Times-Bold
-%%+ Times-Roman
-%%+ Times-Italic
diff --git a/sinqhm/hist_mem_spec_fig4.ps b/sinqhm/hist_mem_spec_fig4.ps
deleted file mode 100755
index 4c003cb1..00000000
--- a/sinqhm/hist_mem_spec_fig4.ps
+++ /dev/null
@@ -1,1336 +0,0 @@
-%!PS-Adobe-2.1
-%%Creator: DECwrite V3.0-2
-%%+Copyright (c) 1990,1994 DIGITAL EQUIPMENT CORPORATION.  
-%%+All Rights Reserved.
-%%DocumentFonts: (atend)
-%%EndComments
-%%BeginProcSet DEC_WRITE 1.10
-save/DEC_WRITE_dict 150 dict def DEC_WRITE_dict begin/$D exch def/$I 0
-def/$S 0 def/$C matrix def/$R matrix def/$L matrix def/$E matrix
-def/pat1{/px exch def/pa 8 array def 0 1 7{/py exch def/pw 4 string def 0 1
-3{pw exch px py 1 getinterval putinterval}for pa py pw put}for}def/pat2{/pi
-exch def/cflag exch def save cflag 1 eq{eoclip}{clip}ifelse
-newpath{clippath pathbbox}stopped not{/ph exch def/pw exch def/py exch
-def/px exch def/px px 3072 div floor 3072 mul def/py py 3072 div floor 3072
-mul def px py translate/pw pw px sub 3072 div floor 1 add cvi def/ph ph py
-sub 3072 div floor 1 add cvi def pw 3072 mul ph 3072 mul scale/pw pw 32 mul
-def/ph ph 32 mul def/px 0 def/py 0 def pw ph pi[pw 0 0 ph 0 0]{pa py get/px
-px 32 add def px pw ge{/px 0 def/py py 1 add 8 mod def}if}pi
-type/booleantype eq{imagemask}{image}ifelse}if restore}def/PS{/_op exch
-def/_np 8 string def 0 1 7{/_ii exch def/num _op _ii get def _np 7 _ii sub
-num -4 bitshift PX num 15 and 4 bitshift -4 bitshift PX 4 bitshift or
-put}for _np}def/PX{[15 7 11 3 13 5 9 1 14 6 10 2 12 4 8 0]exch
-get}def/FR{0.7200 0 $E defaultmatrix dtransform/yres exch def/xres exch def
-xres dup mul yres dup mul add sqrt}def/SU{/_sf exch def/_sa exch def/_cs
-exch def/_mm $C currentmatrix def/rm _sa $R rotate def/sm _cs dup $L scale
-def sm rm _mm _mm concatmatrix _mm concatmatrix pop 1 0 _mm dtransform/y1
-exch def/x1 exch def/_vl x1 dup mul y1 dup mul add sqrt def/_fq FR _vl div
-def/_na y1 x1 atan def _mm 2 get _mm 1 get mul _mm 0 get _mm 3 get mul sub
-0 gt{{neg}/_sf load concatprocs/_sf exch def}if _fq _na/_sf load
-setscreen}def/BO{/_yb exch def/_xb exch def/_bv _bs _yb _bw mul _xb 8 idiv
-add get def/_mk 1 7 _xb 8 mod sub bitshift def _bv _mk and 0 ne $I 1 eq
-xor}def/BF{DEC_WRITE_dict begin/_yy exch def/_xx exch def/_xi _xx 1 add 2
-div _bp mul cvi def/_yi _yy 1 add 2 div _bp mul cvi def _xi _yi BO{/_nb _nb
-1 add def 1}{/_fb _fb 1 add def 0}ifelse end}def/setpattern{/_cz exch
-def/_bw exch def/_bp exch def/_bs exch PS def/_nb 0 def/_fb 0 def _cz 0/BF
-load SU{}settransfer _fb _fb _nb add div setgray/$S 1
-def}def/invertpattern{$S 0 eq{{1 exch sub}currenttransfer concatprocs
-settransfer}if}def/invertscreen{/$I 1 def/$S 0 def}def/revertscreen{/$I 0
-def}def/setrect{/$h exch def/$w exch def/$y exch def/$x exch def newpath $x
-$y moveto $w $x add $y lineto $w $x add $h $y add lineto $x $h $y add
-lineto closepath}def/concatprocs{/_p2 exch cvlit def/_p1 exch cvlit def/_pn
-_p1 length _p2 length add array def _pn 0 _p1 putinterval _pn _p1 length
-_p2 putinterval _pn cvx}def/OF/findfont load def/findfont{dup
-DEC_WRITE_dict exch known{DEC_WRITE_dict exch get}if DEC_WRITE_dict/OF get
-exec}def
-mark/ISOLatin1Encoding 
-8#000 1 8#001{StandardEncoding exch get}for /emdash/endash
-8#004 1 8#025{StandardEncoding exch get}for /quotedblleft/quotedblright
-8#030 1 8#054{StandardEncoding exch get}for /minus 8#056 1 8#217
-{StandardEncoding exch get}for/dotlessi 8#301 1 8#317{StandardEncoding 
-exch get}for/space/exclamdown/cent/sterling/currency/yen/brokenbar/section
-/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/hyphen/registered
-/macron/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph
-/periodcentered/cedilla/onesuperior/ordmasculine/guillemotright/onequarter
-/onehalf/threequarters/questiondown/Agrave/Aacute/Acircumflex/Atilde
-/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave
-/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde
-/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn
-/germandbls/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla
-/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis
-/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide/oslash/ugrave
-/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis
-256 array astore def cleartomark 
-/encodefont{findfont dup maxlength dict begin{1 index/FID ne{def}{pop
-pop}ifelse}forall/Encoding exch def dup/FontName exch def currentdict
-definefont end}def/loads{/$/ISOLatin1Encoding load def/&/encodefont load
-def/*/invertpattern load def/+/revertscreen load def/-/invertscreen load
-def/:/concatprocs load def/^/setpattern load def/~/pat1 load def/_/pat2
-load def/@/setrect load def/A/arcn load def/B/ashow load def/C/curveto load
-def/D/def load def/E/eofill load def/F/findfont load def/G/setgray load
-def/H/closepath load def/I/clip load def/J/fill load def/K/kshow load
-def/L/lineto load def/M/moveto load def/N/newpath load def/O/rotate load
-def/P/pop load def/R/grestore load def/S/gsave load def/T/translate load
-def/U/sub load def/V/div load def/W/widthshow load def/X/exch load
-def/Y/awidthshow load def/a/save load def/c/setlinecap load def/d/setdash
-load def/e/restore load def/f/setfont load def/g/initclip load def/h/show
-load def/i/setmiterlimit load def/j/setlinejoin load def/k/stroke load
-def/l/rlineto load def/m/rmoveto load def/n/currentfont load
-def/o/scalefont load def/p/currentpoint load def/q/setrgbcolor load
-def/r/currenttransfer load def/s/scale load def/t/setmatrix load
-def/u/settransfer load def/w/setlinewidth load def/x/matrix load
-def/y/currentmatrix load def}def
-end
-%%EndProcSet
-%%EndProlog
-
-%%BeginSetup
-DEC_WRITE_dict begin
-loads
-version cvi 23.0 gt {
-currentdict {dup type /arraytype eq
-{bind def} {pop pop} ifelse} forall} if
-0.0100 0.0100 s
-
-%%EndSetup
-%%Page: 1 1
-/$P a D
-g N
-0 84189 T
-7087 -5669 T
-N
-312 -1212 M
-312 -2653 M
--7087 5669 T
-
-7087 -1169 T
-N
-312 -1212 M
--7087 1169 T
-
-7087 -5669 T
-N
-312 -1212 M
-312 -2653 M
--7087 5669 T
-
-N
-S
-7085 -80769 48178 68017 @ I N
-7085 -12752 T
-N
-N
-16341 -34886 M
-16341 -35643 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-16089 -35181 M
-16341 -35874 L
-16593 -35181 L
-H
-S
-0.00 G J
-R
-N
-
-11677 -17366 M
-/Times-Bold-ISOLatin1 $
-/Times-Bold & P
-/Times-Bold-ISOLatin1 F 1400 o f
-0.000000 0.000000 0.000000 q
-/x0 p P D
-(SinqHM Master) h
-S
-/x1 p P D
-x0 x1 U -188.9 m
-x1 x0 U 0 l
-99.8 w k
-R
-
-32557 -17366 M
-/x0 p P D
-(SinqHM Client) h
-S
-/x1 p P D
-x0 x1 U -188.9 m
-x1 x0 U 0 l
-99.8 w k
-R
-
-12872 -27082 M
-n 0.857 o f
-(recv) h
-/Times-Roman-ISOLatin1 $
-/Times-Roman & P
-/Times-Roman-ISOLatin1 F 1200 o f
-( message) h
-
-11739 -24604 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(accept) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( connection) h
-
-12840 -19250 M
-(Create ) h
-/Times-Bold-ISOLatin1 F 1200 o f
-(socket) h
-
-
-11638 -20483 M
-/Times-Roman-ISOLatin1 F 1200 o f
-(and ) h
-/Times-Bold-ISOLatin1 F 1200 o f
-(bind) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( base port) h
-
-12856 -29757 M
-(Find free port) h
-
-
-14106 -30990 M
-(for child) h
-
-14872 -37176 M
-/Times-Bold-ISOLatin1 F 1400 o f
-(fork) h
-
-
-20577 -41278 M
-/Times-Roman-ISOLatin1 F 1200 o f
-(wait till) h
-
-
-18745 -42459 M
-(semaphore free) h
-
-7806 -41354 M
-(Create ) h
-/Times-Bold-ISOLatin1 F 1200 o f
-(socket) h
-
-
-7820 -42587 M
-/Times-Roman-ISOLatin1 F 1200 o f
-(and ) h
-/Times-Bold-ISOLatin1 F 1200 o f
-(bind) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( port) h
-
-9456 -47452 M
-(release) h
-
-
-8522 -48685 M
-(semaphore) h
-
-6554 -55620 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(accept) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( connection) h
-
-7687 -59181 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(recv) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( message) h
-
-8420 -65765 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(send) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( reply) h
-
-8853 -62665 M
-(Do work) h
-
-19776 -45380 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(send) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( client) h
-
-
-19479 -46614 M
-(port number) h
-
-20578 -47847 M
-(of child) h
-
-21196 -50957 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(close) h
-
-
-19794 -52189 M
-/Times-Roman-ISOLatin1 F 1200 o f
-(connection) h
-
-N
-16156 -22512 M
-16156 -23269 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-15904 -22807 M
-16156 -23500 L
-16408 -22807 L
-H
-S
-0.00 G J
-R
-N
-
-N
-16134 -25097 M
-16134 -25854 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-15882 -25392 M
-16134 -26085 L
-16386 -25392 L
-H
-S
-0.00 G J
-R
-N
-
-N
-16237 -27525 M
-16237 -28283 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-15985 -27821 M
-16237 -28514 L
-16489 -27821 L
-H
-S
-0.00 G J
-R
-N
-
-N
-16341 -31398 M
-16341 -32155 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-16089 -31693 M
-16341 -32386 L
-16593 -31693 L
-H
-S
-0.00 G J
-R
-N
-
-N
-11022 -45163 M
-11022 -45920 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-10770 -45458 M
-11022 -46151 L
-11274 -45458 L
-H
-S
-0.00 G J
-R
-N
-
-N
-15360 -37861 M
-11712 -39967 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-11985 -39518 M
-11511 -40082 L
-12237 -39954 L
-H
-S
-0.00 G J
-R
-N
-
-
-N
-17477 -37897 M
-20758 -39791 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-20232 -39778 M
-20958 -39906 L
-20484 -39342 L
-H
-S
-0.00 G J
-R
-N
-
-
-33809 -21398 M
-(Create ) h
-/Times-Bold-ISOLatin1 F 1200 o f
-(socket) h
-
-
-33824 -22629 M
-/Times-Roman-ISOLatin1 F 1200 o f
-(and ) h
-/Times-Bold-ISOLatin1 F 1200 o f
-(bind) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( port) h
-
-32325 -29734 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(connect) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( to SinqHM) h
-
-N
-37153 -23134 M
-37153 -23892 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-36901 -23430 M
-37153 -24123 L
-37405 -23430 L
-H
-S
-0.00 G J
-R
-N
-
-N
-22434 -53099 M
-22434 -54425 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-22182 -53963 M
-22434 -54656 L
-22686 -53963 L
-H
-S
-0.00 G J
-R
-N
-
-N
-22428 -54655 M
-26536 -54655 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-26535 -54656 M
-26535 -34822 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-26787 -35284 M
-26535 -34591 L
-26283 -35284 L
-H
-S
-0.00 G J
-R
-N
-
-N
-26535 -43186 M
-26535 -23121 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-10971 -49696 M
-10971 -54027 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-10719 -53565 M
-10971 -54258 L
-11223 -53565 L
-H
-S
-0.00 G J
-R
-N
-
-N
-10971 -56078 M
-10971 -57611 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-10719 -57149 M
-10971 -57842 L
-11223 -57149 L
-H
-S
-0.00 G J
-R
-N
-
-N
-10971 -60111 M
-10971 -60869 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-10719 -60407 M
-10971 -61100 L
-11223 -60407 L
-H
-S
-0.00 G J
-R
-N
-
-N
-10971 -63442 M
-10971 -64199 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-10719 -63737 M
-10971 -64430 L
-11223 -63737 L
-H
-S
-0.00 G J
-R
-N
-
-N
-10971 -66541 M
-10971 -67530 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-10971 -67529 M
-15078 -67529 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-17128 -67530 M
-17128 -61528 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-17380 -61990 M
-17128 -61297 L
-16876 -61990 L
-H
-S
-0.00 G J
-R
-N
-
-N
-17128 -61808 M
-17128 -56923 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-17129 -56923 M
-13413 -56923 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-13875 -56671 M
-13182 -56923 L
-13875 -57175 L
-H
-S
-0.00 G J
-R
-N
-
-N
-13022 -67529 M
-17129 -67529 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-
-N
-26536 -23121 M
-18149 -23121 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-18611 -22869 M
-17918 -23121 L
-18611 -23373 L
-H
-S
-0.00 G J
-R
-N
-
-33126 -32862 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(send ) h
-/Times-Roman-ISOLatin1 F 1200 o f
-(\026serve me) h
-(\027) h
-
-
-35391 -34095 M
-(request) h
-
-32953 -48664 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(recv) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( port number) h
-
-
-33285 -49897 M
-(of child \(server\)) h
-
-35919 -52616 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(close) h
-
-
-34519 -53848 M
-/Times-Roman-ISOLatin1 F 1200 o f
-(connection) h
-
-33836 -56643 M
-(Create ) h
-/Times-Bold-ISOLatin1 F 1200 o f
-(socket) h
-
-
-33851 -57875 M
-/Times-Roman-ISOLatin1 F 1200 o f
-(and ) h
-/Times-Bold-ISOLatin1 F 1200 o f
-(bind) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( port) h
-
-33219 -60359 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(connect) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( to child) h
-
-33868 -63304 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(send) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( requests) h
-
-
-34303 -64536 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(recv) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( replies) h
-
-36303 -66942 M
-(etc.) h
-
-32609 -25581 M
-/Times-Bold-ISOLatin1 F 1200 o f
-(gethostbyname) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( of) h
-
-
-33742 -26813 M
-(SinqHM node) h
-
-N
-37153 -27370 M
-37153 -28128 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-36901 -27666 M
-37153 -28359 L
-37405 -27666 L
-H
-S
-0.00 G J
-R
-N
-
-N
-37153 -30416 M
-37153 -31174 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-36901 -30712 M
-37153 -31405 L
-37405 -30712 L
-H
-S
-0.00 G J
-R
-N
-
-N
-31936 -29517 M
-30646 -29517 L
-27738 -24519 L
-21944 -24519 L
-S
-79 w
-0 c
-0 j
-2 i
-[400 400] 0 d
-0.00 G k
-R
-N
-N
-22406 -24267 M
-21713 -24519 L
-22406 -24771 L
-H
-S
-0.00 G J
-R
-N
-
-N
-32500 -32662 M
-31209 -32662 L
-27424 -26887 L
-20448 -26887 L
-S
-79 w
-0 c
-0 j
-2 i
-[400 400] 0 d
-0.00 G k
-R
-N
-N
-20910 -26635 M
-20217 -26887 L
-20910 -27139 L
-H
-S
-0.00 G J
-R
-N
-
-N
-37153 -35195 M
-37153 -46856 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-36901 -46394 M
-37153 -47087 L
-37405 -46394 L
-H
-S
-0.00 G J
-R
-N
-
-N
-25812 -45028 M
-28829 -45028 L
-30120 -48375 L
-31977 -48375 L
-S
-79 w
-0 c
-0 j
-2 i
-[400 400] 0 d
-0.00 G k
-R
-N
-N
-31515 -48627 M
-32208 -48375 L
-31515 -48123 L
-H
-S
-0.00 G J
-R
-N
-
-N
-14636 -46863 M
-17020 -46863 L
-18123 -40934 L
-19264 -40934 L
-S
-241 w
-0 c
-0 j
-0.00 G k
-R
-N
-N
-18530 -41381 M
-19758 -40934 L
-18530 -40487 L
-H
-S
-0.00 G J
-R
-N
-
-N
-32608 -60294 M
-27027 -60294 L
-20658 -55398 L
-16985 -55398 L
-S
-79 w
-0 c
-0 j
-2 i
-[400 400] 0 d
-0.00 G k
-R
-N
-N
-17447 -55146 M
-16754 -55398 L
-17447 -55650 L
-H
-S
-0.00 G J
-R
-N
-
-N
-22434 -48266 M
-22434 -49592 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-22182 -49130 M
-22434 -49823 L
-22686 -49130 L
-H
-S
-0.00 G J
-R
-N
-
-N
-37153 -50374 M
-37153 -51288 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-36901 -50826 M
-37153 -51519 L
-37405 -50826 L
-H
-S
-0.00 G J
-R
-N
-
-N
-37153 -54146 M
-37153 -55472 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-36901 -55010 M
-37153 -55703 L
-37405 -55010 L
-H
-S
-0.00 G J
-R
-N
-
-N
-37153 -58181 M
-37153 -59285 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-36901 -58823 M
-37153 -59516 L
-37405 -58823 L
-H
-S
-0.00 G J
-R
-N
-
-N
-37153 -60809 M
-37153 -62133 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-36901 -61671 M
-37153 -62364 L
-37405 -61671 L
-H
-S
-0.00 G J
-R
-N
-
-N
-37153 -64859 M
-37153 -65832 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-36901 -65370 M
-37153 -66063 L
-37405 -65370 L
-H
-S
-0.00 G J
-R
-N
-
-N
-33048 -63159 M
-25968 -63159 L
-19652 -59039 L
-15245 -59039 L
-S
-79 w
-0 c
-0 j
-2 i
-[400 400] 0 d
-0.00 G k
-R
-N
-N
-15707 -58787 M
-15014 -59039 L
-15707 -59291 L
-H
-S
-0.00 G J
-R
-N
-
-N
-14244 -65600 M
-21494 -65600 L
-26100 -64217 L
-32817 -64217 L
-S
-79 w
-0 c
-0 j
-2 i
-[400 400] 0 d
-0.00 G k
-R
-N
-N
-32355 -64469 M
-33048 -64217 L
-32355 -63965 L
-H
-S
-0.00 G J
-R
-N
-
-N
-22434 -42999 M
-22434 -43758 L
-S
-0.00 1 X U G J
-R
-S
-79 w
-0 c
-0 j
-2 i
-0.00 G k
-R
-N
-N
-22182 -43296 M
-22434 -43989 L
-22686 -43296 L
-H
-S
-0.00 G J
-R
-N
-
-14365 -37835 3951 1936 @
-S
-120 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-11331 -38728 M
-/Times-Bold-ISOLatin1 F 1000 o f
-(child) h
-
-19551 -38728 M
-(parent) h
-
-10271 -33418 M
-/Times-Roman-ISOLatin1 F 1200 o f
-(Initialise a semaphore to) h
-
-
-13006 -34479 M
-/Times-Italic-ISOLatin1 $
-/Times-Italic & P
-/Times-Italic-ISOLatin1 F 1200 o f
-(claimed) h
-/Times-Roman-ISOLatin1 F 1200 o f
-( state) h
-
-11570 -22000 M
-(Set socket to ) h
-/Times-Bold-ISOLatin1 F 1200 o f
-(listen) h
-
-6536 -44104 M
-/Times-Roman-ISOLatin1 F 1200 o f
-(Set socket to ) h
-/Times-Bold-ISOLatin1 F 1200 o f
-(listen) h
-
-R
-
-
-showpage
-$P e
-
-%%Trailer
-$D end restore
- % DEC_WRITE_dict
-%%Pages: 1
-%%DocumentFonts: Times-Bold
-%%+ Times-Roman
-%%+ Times-Italic
diff --git a/sinqhm/lwl_client.c b/sinqhm/lwl_client.c
deleted file mode 100755
index 6538b712..00000000
--- a/sinqhm/lwl_client.c
+++ /dev/null
@@ -1,1423 +0,0 @@
-#define	    Ident	"1B01"
-/*---------------------------------------------------------------------------*/
-#ifdef __DECC
-#pragma	    module	    LWL_CLIENT	    Ident
-#endif
-/*
-** Link_options - Here is the Linker Option File
-**!	lwl_client
-**!	tas_src:[lib]sinq_olb/lib
-**!	sys$share:decw$xlibshr/share
-**!!
-**!!	    To build LWL_CLIENT on LNSA09
-**!!
-**!!	$ import tasmad
-**!!	$ define/job deltat_c_tlb sinq_c_tlb
-**!!	$ sss := tas_src:[sinqhm]
-**!!	$ bui 'sss'lwl_client debug
-** Link_options_end
-**
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     Computing Section                        |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...SINQHM]LWL_CLIENT.C
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Jan 1997
-**
-**  LWL_CLIENT is the main program of an Internet Client which transmits
-**  messages to a LWL_SERVER running on a front-end processor. The server
-**  writes the data into a LWL Test Generator.
-**
-** Updates:
-**   9-Jan-1997 DM.	Initial version.
-**  17-Jun-1998 1A05 DM.    Set 5 sec time-out on "connect" on VMS systems.
-**			    Add TOF data packet generation.
-**  1B01  8-May-2000 DM.    Use command line options instead of env variables.
-**====================================================================
-*/
-
-#include    <errno.h>
-#include    <netdb.h>
-#include    <stdio.h>
-#include    <stdlib.h>
-#include    <signal.h>
-#include    <time.h>
-
-
-#include    <sys/types.h>
-#include    <ctype.h>
-#include    <math.h>
-#include    <sys/socket.h>
-#include    <string.h>
-
-#ifdef	__VMS
-#include    <ucx$inetdef.h>
-#include    <sys/unixio.h>
-#include    <descrip>
-#else
-#include    <unistd.h>
-#endif
-
-#ifdef __VMS
-#include    <sys/ssdef.h>
-#include    <sys/starlet.h>
-#else
-#define	    SS$_NORMAL	    EXIT_SUCCESS
-#define	    SS$_BADPARAM    EXIT_FAILURE
-#define	    SS$_IVBUFLEN    EXIT_FAILURE
-#define	    NO_MEMORY	    4
-#endif
-
-#include    <netinet/in.h>
-#include    <arpa/inet.h>
-#include    <X11/Intrinsic.h>
-/*
-**====================	Global Definitions =====================================
-*/
-#include    <sinq_prototypes.h>
-
-#include    "SinqHM_def.h"
-
-#define	    DFLT_PORT	3501
-#define	    NIL		'\0'
-#define	    NL		'\n'
-#define	    MAXARR	4000000
-#define	    MAXREC	65563
-/*------------------------------------------------------------
-**		Definitions for the LWL Datagrams
-*/
-#define	b_LWL_HM_NC	0x10    /* Hist-Mode/No-Coinc Datagram Header */
-#define	b_LWL_HM_NC3	0x13    /* Hist-Mode/No-Coinc/3-chan Datagram Header */
-#define	b_LWL_HM_C	0x10    /* Hist-Mode+Coinc Datagram Header */
-#define	b_LWL_TOF	0x00    /* TOF-Mode Datagram Header */
-#define	b_LWL_STR_NC	0x10    /* Strobo-Mode/No-Coinc Datagram Header */
-#define	b_LWL_STR_C	0x10    /* Strobo-Mode+Coinc Datagram Header */
-
-#define	b_LWL_TR_TSI	 0x1f    /* Transp-Mode Time Status Info */
-#define	b_LWL_HM_NC_TSI  0x1f    /* Hist-Mode/No-Coinc Time Status Info */
-#define	b_LWL_TOF_TSI	 0x1f    /* TOF-Mode Time Status Info */
-#define	b_LWL_STR_NC_TSI 0x1f    /* Strobo-Mode/No-Coinc Time Status Info */
-
-#define	b_LWL_HM_C_TSI  0x0e    /* Hist-Mode+Coinc Time Status Info */
-#define	b_LWL_STR_C_TSI 0x0e    /* Strobo-Mode+Coinc Time Status Info */
-#define	b_LWL_TR_ETSI	0x0e    /* Transp-Mode Extended Time Status Info */
-
-#define	b_LWL_FIFO_EMPTY    0x1e    /* FIFO Empty */
-
-#define	b_LWL_HDR_NRL_MASK  0x20    /* Mask for Neutron Rate Low bit */
-#define	b_LWL_HDR_BIT8	    0x10    /* Pattern for getting Bit-8 set */
-/*------------------------------------------------------------*/
-	    /*
-	    **			Define the Data Structures we need
-	    */
-/*
-**====================	Global Variables ======================================
-*/
-  int			    My_errno, My_vaxc_errno;
-
-  char		Rmt_host[32];
-  int		Rmt_port;
-  int		Pkt_size;
-  int		Verbose;
-  static int	Cnct_skt = 0;	    /* Connect socket */
-  static int	Ctrl_C_has_happened;
-
-  static XrmOptionDescRec OptTable[] = {
-      {"-name",	   ".name",	    XrmoptionSepArg, (XPointer) NULL},
-      {"-host",	   ".lwlHost",	    XrmoptionSepArg, (XPointer) NULL},
-      {"-port",	   ".lwlPort",	    XrmoptionSepArg, (XPointer) NULL},
-      {"-size",	   ".lwlSize",	    XrmoptionSepArg, (XPointer) NULL},
-    };
-/*
-**=============================================================================
-**  Local routines.
-**
-**  CtrlC_Handler	: Catch a Ctrl-C interrupt.
-**  Do_ETSI		: Generate an Extended Time Status Info datagram.
-**  Do_File		: Read and send contents of file to LWL.
-**  Do_HM		: Generate data stream in Histogram Mode.
-**  Do_HRPT		: Generate data stream in HRPT Mode.
-**  Do_Misc		: Generate a miscellaneous datagram.
-**  Do_TOF		: Generate data stream in TOF Mode.
-**  Do_TS		: Generate a Time Status datagram.
-**  exit_handler	: Exit handler in case a forced exit is made.
-**  openConnection	: Open connection to LWL_SERVER.
-**----------------------------------------------------------------------------
-**							    Prototypes
-*/
-  void	    CtrlC_Handler (int sigint);
-  void	    Do_ESTI ();
-  void	    Do_File ();
-  void	    Do_HM (int silent);
-  void	    Do_Misc ();
-  void	    Do_TOF (int silent);
-  void	    Do_TS ();
-  void	    exit_handler ();
-  void	    openConnection (char *node, int port);
-/*
-**--------------------------------------------------------------------------
-**		CtrlC_Handler:  Signal handler to detect <Ctrl-C> on keyboard.
-*/
-  void	CtrlC_Handler (int sigint) {
-/*      =============
-*/
-    Ctrl_C_has_happened = 1;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void	Do_ETSI () {
-/*	=======		Generate an Extended Time Status Info (hdr + 9 bytes)
-*/
-    int	    i, j, status;
-    char   *p_p1, *p_p2, *p_p3, *p_p4, *p_p5, *p_p6, *p_p7, *p_p8, *p_p9;
-    int	      p1,    p2,    p3,    p4,    p5,    p6,    p7,    p8,    p9;
-
-    static unsigned char   etsi[] = {0,
-				b_LWL_HDR_BIT8, b_LWL_TR_ETSI, 0xa5, 0xb6, 0xc7,
-				0xd8, 0xe9, 0xfa, 0x0b, 0x1c, 0x2d};
-    etsi[0] = sizeof (etsi) - 1;
-    p_p1 = p_p2 = p_p3 = p_p4 = p_p5 = p_p6 = p_p7 = p_p8 = p_p9 = NULL;
-
-    p_p1 = strtok (NULL, " ,");
-    if (p_p1 != NULL) p_p2 = strtok (NULL, " ,");
-    if (p_p2 != NULL) p_p3 = strtok (NULL, " ,");
-    if (p_p3 != NULL) p_p4 = strtok (NULL, " ,");
-    if (p_p4 != NULL) p_p5 = strtok (NULL, " ,");
-    if (p_p5 != NULL) p_p6 = strtok (NULL, " ,");
-    if (p_p6 != NULL) p_p7 = strtok (NULL, " ,");
-    if (p_p7 != NULL) p_p8 = strtok (NULL, " ,");
-    if (p_p8 != NULL) p_p9 = strtok (NULL, " ,");
-
-    if (p_p1 != NULL) {sscanf (p_p1, "%x", &p1); etsi[ 3] = p1 & 0xff;}
-    if (p_p2 != NULL) {sscanf (p_p2, "%x", &p2); etsi[ 4] = p2 & 0xff;}
-    if (p_p3 != NULL) {sscanf (p_p3, "%x", &p3); etsi[ 5] = p3 & 0xff;}
-    if (p_p4 != NULL) {sscanf (p_p4, "%x", &p4); etsi[ 6] = p4 & 0xff;}
-    if (p_p5 != NULL) {sscanf (p_p5, "%x", &p5); etsi[ 7] = p5 & 0xff;}
-    if (p_p6 != NULL) {sscanf (p_p6, "%x", &p6); etsi[ 8] = p6 & 0xff;}
-    if (p_p7 != NULL) {sscanf (p_p7, "%x", &p7); etsi[ 9] = p7 & 0xff;}
-    if (p_p8 != NULL) {sscanf (p_p8, "%x", &p8); etsi[10] = p8 & 0xff;}
-    if (p_p9 != NULL) {sscanf (p_p9, "%x", &p9); etsi[11] = p9 & 0xff;}
-
-    status = send (Cnct_skt, etsi, etsi[0]+1, 0);
-    printf ("Sent: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x "
-		"0x%02x 0x%02x 0x%02x 0x%02x\n", etsi[1], etsi[2], etsi[3],
-		     etsi[4],  etsi[5], etsi[6], etsi[7], etsi[8], etsi[9],
-		     etsi[10], etsi[11]);
-    etsi[ 3] += 1;
-    etsi[ 4] += 1;
-    etsi[ 5] += 1;
-    etsi[ 6] += 1;
-    etsi[ 7] += 1;
-    etsi[ 8] += 1;
-    etsi[ 9] += 1;
-    etsi[10] += 1;
-    etsi[11] += 1;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void	Do_File () {
-/*	=======		Read and send the contents of a file.
-**
-**	The file format is:
-**	    <preamble>
-**	    $		    <== all records prior to this "$" are skipped.
-**	    <datagram-0>    <== subsequent records specify datagrams.
-**	    <datagram-1>
-**	    .
-**	    <datagram-n>
-**	    End-of-File
-**
-**	The format of a datagram record is:
-**	    <cntr> <Bit-8> <Byte-0> <Byte-1> ... <Byte-n>
-**	where
-**	    <cntr> is a hex counter (not used - it can be used to label records)
-**	    <Bit-8> is the control byte for the datagram header. Set to 0x10
-**			to get Bit-8 of the datagram header set to 1.
-**	    <Byte-0> specifies Bits 0-7 of the datagram header.
-**	    <Byte-1> ... <Byte-n> specify subsequent bytes (Bit-8 = 0).
-**	All items should be in hex, with or without a 0x prefix.
-**	For valid datagrams, there should be an even number of bytes.
-**
-**	The file is read into an internal data structure, buff. Pointers
-**	to the individual records are kept in array p_recs, i.e. p_recs[i]
-**	is the address of the first byte of record i. This bytes in the
-**	record are:
-**	    Byte 0	- the number of bytes in the record (excl this one);
-**	    Byte 1	- the Bit-8 control byte for the datagram header;
-**	    Byte 2	- Bits 0-7 of the datagram header;
-**	    Byte 3 ...	- subsequent bytes in the datagram.
-*/
-    int		 i, j, status, nrec, l_recd;
-    FILE	*stream;
-    char	*p_recd, recd[256], recd1[256];
-    char	*p_ln,	*p_bit8, *p_data;
-
-    char	*p_file, *p_ncycles;
-    int		 ncycles;
-    static char	 last_file[128] = {NIL};
-    static int	 last_ncycles = 1;
-
-    unsigned char   *nxt_data;
-    unsigned char   *p_recs[MAXREC];	/* Array of Pointers to the Records */
-    unsigned char   buff[MAXARR];	/* Array to hold the Records */
-		/*
-		** ---------- process the arguments <file> and <#-cycles> ----
-		*/
-    p_file = p_ncycles = NULL;
-    p_file = strtok (NULL, " ");
-    if (p_file != NULL) p_ncycles = strtok (NULL, " ");
-
-    if (p_file == NULL) p_file = last_file;
-    if (p_file[0] == NIL) {
-      printf ("\007No file name specified!\n");
-      return;
-    }
-
-    if (p_ncycles != NULL) {
-      sscanf (p_ncycles, "%i", &ncycles);
-      if (ncycles <= 0) ncycles = 1;
-    }else {
-      ncycles = last_ncycles;
-    }
-		/*
-		** ---------- Input File einlesen ---------------
-		*/
-    printf ("Opening file %s ...", p_file);
-    stream = fopen (p_file, "r");
-    if (stream == NULL) {
-      printf ("\n\007Couldn't open %s\n", p_file);
-      return;
-    }else {
-      printf ("\nSkipping over preamble ...");
-      recd[0] = NIL;
-      do {
-	p_recd = fgets (recd, sizeof (recd), stream);
-      } while ((p_recd != NULL) && (recd[0] != '$'));
-      if (p_recd == NULL) {
-	printf ("\n\007Couldn't find end of preamble!\n");
-	return;
-      }
-    }
-    printf (" reading data ...");
-    nrec = 0;
-    nxt_data = buff;
-    while (fgets (recd, sizeof (recd), stream) != NULL) {
-      p_recs[nrec] = nxt_data;
-      nxt_data++;
-      if (nxt_data > &buff[MAXARR-3]) {
-	fclose (stream);
-        printf ("\n\007Abandoned -- more than %d bytes in file!\n", MAXARR-3);
-	return;
-      }
-      l_recd = sizeof (recd1);
-      StrEdit (recd1, recd, "uncomment compress", &l_recd);
-      p_ln   = strtok (recd1, " \n");
-      p_bit8 = (p_ln   == NULL) ? NULL : strtok (NULL, " \n");
-      p_data = (p_bit8 == NULL) ? NULL : strtok (NULL, " \n");
-      if ((p_ln == NULL) || (p_bit8 == NULL) || (p_data == NULL)) {
-	fclose (stream);
-        printf ("\n\007Abandoned -- Record %d bad\n  \"%s\"\n", nrec, recd);
-	return;
-      }
-      sscanf (p_bit8, "%x", &j); *nxt_data = j; nxt_data++;
-      sscanf (p_data, "%x", &j); *nxt_data = j; nxt_data++;
-      *p_recs[nrec] = 2;
-      while ((p_data = strtok (NULL, " \n")) != NULL) {
-        sscanf (p_data, "%x", &j);
-	*nxt_data = j;
-	nxt_data++;
-	*p_recs[nrec] += 1;	/* Count the bytes in the record */
-	if (nxt_data > &buff[MAXARR]) {
-	  fclose (stream);
-          printf ("\n\007Abandoned -- more than %d bytes in file!\n", MAXARR);
-	  return;
-	}
-      }
-      printf ("\n%5s", p_ln);
-      for (i = 0; i != *p_recs[nrec]; i++) {
-        printf (" 0x%02x", *(p_recs[nrec]+i+1));
-      }
-      nrec++;
-      if (nrec >= MAXREC) {
-	fclose (stream);
-        printf ("\n\007Abandoned -- more than %d records in file!\n", MAXREC);
-	return;
-      }
-    }
-    fclose (stream);
-		/*
-		**======  Now loop ncycles times sending the data ========
-		*/
-    for (i = 0; i < ncycles; i++) {
-      printf ("\nCycle %5d", i+1);
-      for (j = 0; j < nrec; j++) {
-	status = send (Cnct_skt, p_recs[j], (*p_recs[j])+1, 0);
-	/*        sleep(2);      */
-      }
-    }
-    printf ("\nDone.\n");
-
-    last_ncycles = ncycles;	    /* Save last used values */
-    strcpy (last_file, p_file);
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void	Do_HM (int silent) {
-/*	=====		Generate a stream of events in "Histogram" Mode
-*/
-    int		    i, j, status;
-    long int	    nrl;
-    char	   *p_nevents, *p_nchans, *p_maxchn[3];
-    int		    nevents,    nchans,    maxchn[3];
-    unsigned char   buff[64];
-    float	    scale[3];
-    void	    (* sig_status) (int);
-
-    union {
-	int		wire;
-	unsigned char	b_wire[4];
-    } u;
-    
-    p_nevents = p_nchans = p_maxchn[0] = p_maxchn[1] = p_maxchn[2] = NULL;
-
-    p_nevents = strtok (NULL, " ,");
-    if (p_nevents   != NULL) p_nchans	 = strtok (NULL, " ,");
-    if (p_nchans    != NULL) p_maxchn[0] = strtok (NULL, " ,");
-    if (p_maxchn[0] != NULL) p_maxchn[1] = strtok (NULL, " ,");
-    if (p_maxchn[1] != NULL) p_maxchn[2] = strtok (NULL, " ,");
-
-    if ((p_nevents == NULL) ||
-	(sscanf (p_nevents, "%i", &nevents) != 1)) nevents = 10;
-    if ((p_nchans == NULL) ||
-	(sscanf (p_nchans, "%i", &nchans) != 1)) nchans = 1;
-    if ((p_maxchn[0] == NULL) ||
-	(sscanf (p_maxchn[0], "%i", &maxchn[0]) != 1)) maxchn[0] = 1024;
-    if ((p_maxchn[1] == NULL) ||
-	(sscanf (p_maxchn[1], "%i", &maxchn[1]) != 1)) maxchn[1] = 1024;
-    if ((p_maxchn[2] == NULL) ||
-	(sscanf (p_maxchn[2], "%i", &maxchn[2]) != 1)) maxchn[2] = 1024;
-    if  (nevents <= 0) nevents = 10;
-    if ((nchans <= 0) || (nchans > 3)) nchans = 1;
-    if ((maxchn[0] < 0) || (maxchn[0] > 32767)) maxchn[0] = 1024;
-    if ((maxchn[1] < 0) || (maxchn[1] > 32767)) maxchn[1] = 1024;
-    if ((maxchn[2] < 0) || (maxchn[2] > 32767)) maxchn[2] = 1024;
-    switch (nchans) {
-     case 1: printf ("HM: %d events, 1 channel, max-channel-value = %d\n",
-			    nevents, maxchn[0]);
-	     break;
-     case 2: printf ("HM: %d events, 2 channels\n"
-		     "     max-channel-0-value = %d\n"
-		     "     max-channel-1-value = %d\n",
-			    nevents, maxchn[0], maxchn[1]);
-	     break;
-     case 3: printf ("HM: %d events, 3 channels\n"
-		     "     max-channel-0-value = %d\n"
-		     "     max-channel-1-value = %d\n"
-		     "     max-channel-2-value = %d\n",
-			    nevents, maxchn[0], maxchn[1], maxchn[2]);
-    }
-    Ctrl_C_has_happened = 0;
-    sig_status = signal (SIGINT, CtrlC_Handler);   /* Catch Ctrl-C interrupts */
-    if (sig_status == SIG_ERR) {
-      printf ("    Problem setting up a <Ctrl-C> signal handler. You probably\n"
-	      "    will not be able to stop by hitting <Ctrl-C>!\n");
-    }else {
-      printf ("    Hit <Ctrl-C> to stop:       ");
-    }
-
-    buff[0] = 0x81;	/* Get LWL_SERVER to zero message count */
-    status = send (Cnct_skt, buff, 1, 0);
-    if (status != 1) {
-      printf ("\nBad send status (%d) on \"zero-message\" request. "
-		    "Abandoning!\n", status);
-      return;
-    }
-
-    scale[0] = ((float) maxchn[0])/(((float) RAND_MAX) + 1.0);
-    if (nchans > 1) scale[1] = ((float) maxchn[1])/(((float) RAND_MAX) + 1.0);
-    if (nchans > 2) scale[2] = ((float) maxchn[2])/(((float) RAND_MAX) + 1.0);
-
-    if (silent == 0) {
-      printf ("\n     ");
-      if (nchans == 1) printf (" Value");
-      if (nchans == 2) printf ("  Val0  Val1");
-      if (nchans == 3) printf ("  Val0  Val1  Val2");
-    }
-
-    buff[0] = 5 + (nchans * 2);	/* Set up length of datagram */
-    buff[1] = b_LWL_HDR_BIT8;
-    buff[2] = b_LWL_HM_NC | nchans;  /* Header for Hist-Mode/No-Coinc/n-Chans */
-    buff[3] = 0x00;
-    buff[4] = 0x00;
-    buff[5] = 0x00;
-    i = 0;
-    do {
-      buff[5] = i & 0xff;
-      if (silent == 0) printf ("\n%5d", i);
-      for (j = 0; j < nchans; j++) {
-	u.wire = (int) (rand () * scale[j]);
-	buff[6+2*j] = u.b_wire[1];
-	buff[7+2*j] = u.b_wire[0];
-	if (silent == 0) printf (" %5d", u.wire);
-      }
-      status = send (Cnct_skt, buff, buff[0]+1, 0);
-      if (silent == 0) {
-	printf (" 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x",
-		buff[1], buff[2], buff[3], buff[4], buff[5], buff[6], buff[7]);
-	if (nchans > 1) printf (" 0x%02x 0x%02x", buff[8], buff[9]);
-	if (nchans > 2) printf (" 0x%02x 0x%02x", buff[10], buff[11]);
-      }
-      if (status != (buff[0] + 1)) {
-	printf ("\nBad send status (%d) on event %d. Abandoning!\n", status, i);
-	return;
-      }
-      i++;
-    } while ((i != nevents) && (Ctrl_C_has_happened == 0));
-    printf ("\nDone: %d\n", i);
-    signal (SIGINT, SIG_DFL);
-
-    buff[0] = 0x82;	/* Get LWL_SERVER to display message count */
-    status = send (Cnct_skt, buff, 1, 0);
-    if (status != 1) {
-      printf ("\nBad send status (%d) on \"display-message\" request. "
-		    "Abandoning!\n", status);
-      return;
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void	Do_HRPT (int silent) {
-/*	=======		Generate a stream of events in "HRPT" Mode
-*/
-    int		    i, j, status, wire, cnt;
-    long int	    nrl;
-    char	   *p_nevents, *p_minwire, *p_maxwire, *p_maxcnt;
-    int		    nevents,    minwire,    maxwire,    maxcnt;
-    unsigned char   buff[64];
-    float	    scale[2];
-    void	    (* sig_status) (int);
-
-    p_nevents = p_minwire = p_maxwire = p_maxcnt = NULL;
-
-    p_nevents = strtok (NULL, " ,");
-    if (p_nevents != NULL) p_minwire = strtok (NULL, " ,");
-    if (p_minwire != NULL) p_maxwire = strtok (NULL, " ,");
-    if (p_maxwire != NULL) p_maxcnt  = strtok (NULL, " ,");
-
-    if ((p_nevents == NULL) ||
-	(sscanf (p_nevents, "%i", &nevents) != 1)) nevents = 10;
-    if ((p_minwire == NULL) ||
-	(sscanf (p_minwire, "%i", &minwire) != 1)) minwire = 1;
-    if ((p_maxwire == NULL) ||
-	(sscanf (p_maxwire, "%i", &maxwire) != 1)) maxwire = 1600;
-    if ((p_maxcnt == NULL) ||
-	(sscanf (p_maxcnt,  "%i", &maxcnt)  != 1)) maxcnt = 0x3ff;
-    if  (nevents <= 0) nevents = 10;
-    if ((minwire < 0) || (minwire > 0x7fff)) minwire = 1;
-    if ((maxwire < minwire) || (maxwire > 0x7fff)) maxwire = 1600;
-    if ((maxcnt < 0) || (maxcnt > 0x3ff)) maxcnt = 0x3ff;
-    printf ("HRPT: %d events, Wire# %d to Wire# %d, max-cnts-per-wire = %d\n",
-			    nevents, minwire, maxwire, maxcnt);
-
-    Ctrl_C_has_happened = 0;
-    sig_status = signal (SIGINT, CtrlC_Handler);   /* Catch Ctrl-C interrupts */
-    if (sig_status == SIG_ERR) {
-      printf ("    Problem setting up a <Ctrl-C> signal handler. You probably\n"
-	      "    will not be able to stop by hitting <Ctrl-C>!\n");
-    }else {
-      printf ("    Hit <Ctrl-C> to stop:       ");
-    }
-
-    buff[0] = 0x81;	/* Get LWL_SERVER to zero message count */
-    status = send (Cnct_skt, buff, 1, 0);
-    if (status != 1) {
-      printf ("\nBad send status (%d) on \"zero-message\" request. "
-		    "Abandoning!\n", status);
-      return;
-    }
-
-    scale[0] = ((float) (maxwire - minwire + 1))/(((float) RAND_MAX) + 1.0);
-    scale[1] = ((float) (maxcnt))/(((float) RAND_MAX) + 1.0);
-
-    if (silent == 0) {
-      printf ("\n       Wire  Cnts");
-    }
-
-    buff[0] = 11;			/* Set up length of datagram */
-    buff[1] = b_LWL_HDR_BIT8;
-    buff[2] = b_LWL_HM_NC3;	/* Header for Hist-Mode/No-Coinc/3-Chans */
-    buff[3] = 0x00;
-    buff[4] = 0x00;
-    i = 0;
-    do {
-      buff[5] = i & 0xff;
-      if (silent == 0) printf ("\n%5d", i);
-      wire = (int) (rand () * scale[0]);
-      wire += minwire;
-      cnt  = (int) (rand () * scale[1]);
-      buff[6] = (wire & 0x0000ff00) >> 8;
-      buff[7] = wire & 0xff;
-      buff[8] = (cnt & 0x0000ff00) >> 8;
-      buff[9] = cnt & 0xff;
-      buff[10] = (i & 0x0000ff00) >> 8;
-      buff[11] = i & 0xff;
-      if (silent == 0) printf (" %5d %5d", wire, cnt);
-      status = send (Cnct_skt, buff, buff[0]+1, 0);
-      if (silent == 0) {
-	printf (" 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x"
-		" 0x%02x 0x%02x 0x%02x 0x%02x",
-		buff[1], buff[2], buff[3], buff[4], buff[5], buff[6], buff[7],
-		buff[8], buff[9], buff[10], buff[11]);
-      }
-      if (status != (buff[0] + 1)) {
-	printf ("\nBad send status (%d) on event %d. Abandoning!\n", status, i);
-	return;
-      }
-      i++;
-    } while ((i != nevents) && (Ctrl_C_has_happened == 0));
-    printf ("\nDone: %d\n", i);
-    signal (SIGINT, SIG_DFL);
-
-    buff[0] = 0x82;	/* Get LWL_SERVER to display message count */
-    status = send (Cnct_skt, buff, 1, 0);
-    if (status != 1) {
-      printf ("\nBad send status (%d) on \"display-message\" request. "
-		    "Abandoning!\n", status);
-      return;
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void	Do_Misc () {
-/*	=======		Generate a Miscellaneous Datagram
-*/
-    int	    i, j, status;
-    char   *p_p00, *p_p01, *p_p02, *p_p03, *p_p04, *p_p05, *p_p06, *p_p07,
-	   *p_p08, *p_p09, *p_p10, *p_p11, *p_p12, *p_p13, *p_p14, *p_p15,
-	   *p_p16, *p_p17, *p_p18, *p_p19, *p_p20, *p_p21, *p_p22, *p_p23;
-
-    int	      p00,    p01,    p02,    p03,    p04,    p05,    p06,    p07,
-	      p08,    p09,    p10,    p11,    p12,    p13,    p14,    p15,
-	      p16,    p17,    p18,    p19,    p20,    p21,    p22,    p23;
-    char   *tmp;
-
-    unsigned char   misc[32];
-    
-    p_p00 = p_p01 = p_p02 = p_p03 = p_p04 = p_p05 = p_p06 = p_p07 =
-    p_p08 = p_p09 = p_p10 = p_p11 = p_p12 = p_p13 = p_p14 = p_p15 =
-    p_p16 = p_p17 = p_p18 = p_p19 = p_p20 = p_p21 = p_p22 = p_p23 = NULL;
-    misc[0] = 0;	/* Initialise number of bytes to be sent */
-
-    p_p00 = strtok (NULL, " ,");
-    if (p_p00 != NULL) {misc[0]++; p_p01 = strtok (NULL, " ,");}
-    if (p_p01 != NULL) {misc[0]++; p_p02 = strtok (NULL, " ,");}
-    if (p_p02 != NULL) {misc[0]++; p_p03 = strtok (NULL, " ,");}
-    if (p_p03 != NULL) {misc[0]++; p_p04 = strtok (NULL, " ,");}
-    if (p_p04 != NULL) {misc[0]++; p_p05 = strtok (NULL, " ,");}
-    if (p_p05 != NULL) {misc[0]++; p_p06 = strtok (NULL, " ,");}
-    if (p_p06 != NULL) {misc[0]++; p_p07 = strtok (NULL, " ,");}
-    if (p_p07 != NULL) {misc[0]++; p_p08 = strtok (NULL, " ,");}
-    if (p_p08 != NULL) {misc[0]++; p_p09 = strtok (NULL, " ,");}
-    if (p_p09 != NULL) {misc[0]++; p_p10 = strtok (NULL, " ,");}
-    if (p_p10 != NULL) {misc[0]++; p_p11 = strtok (NULL, " ,");}
-    if (p_p11 != NULL) {misc[0]++; p_p12 = strtok (NULL, " ,");}
-    if (p_p12 != NULL) {misc[0]++; p_p13 = strtok (NULL, " ,");}
-    if (p_p13 != NULL) {misc[0]++; p_p14 = strtok (NULL, " ,");}
-    if (p_p14 != NULL) {misc[0]++; p_p15 = strtok (NULL, " ,");}
-    if (p_p15 != NULL) {misc[0]++; p_p16 = strtok (NULL, " ,");}
-    if (p_p16 != NULL) {misc[0]++; p_p17 = strtok (NULL, " ,");}
-    if (p_p17 != NULL) {misc[0]++; p_p18 = strtok (NULL, " ,");}
-    if (p_p18 != NULL) {misc[0]++; p_p19 = strtok (NULL, " ,");}
-    if (p_p19 != NULL) {misc[0]++; p_p20 = strtok (NULL, " ,");}
-    if (p_p20 != NULL) {misc[0]++; p_p21 = strtok (NULL, " ,");}
-    if (p_p21 != NULL) {misc[0]++; p_p22 = strtok (NULL, " ,");}
-    if (p_p22 != NULL) {misc[0]++; p_p23 = strtok (NULL, " ,");}
-    if (p_p23 != NULL)  misc[0]++;
-    tmp = (p_p23 != NULL) ? strtok (NULL, " ,") : NULL;
-    if (tmp != NULL) {
-      printf ("\007Too many bytes specified. The current maximum is 24!\n");
-      return;
-    }
-    if ((misc[0] & 0x01) != 0) {
-      printf ("\007Warning - an odd number of bytes was specified.\n"
-		  "          This generates an illegal datagram!\n");
-    }
-    if (misc[0] == 0) {
-      printf ("\007No bytes specified!\n");
-      return;
-    }
-
-    misc[1] = b_LWL_HDR_BIT8;	/* The first byte is the Bit-8 byte */
-    misc[0]++;			/* Count it too */
-
-    if (p_p00 != NULL) {sscanf (p_p00, "%x", &p00); misc[ 2] = p00 & 0xff;}
-    if (p_p01 != NULL) {sscanf (p_p01, "%x", &p01); misc[ 3] = p01 & 0xff;}
-    if (p_p02 != NULL) {sscanf (p_p02, "%x", &p02); misc[ 4] = p02 & 0xff;}
-    if (p_p03 != NULL) {sscanf (p_p03, "%x", &p03); misc[ 5] = p03 & 0xff;}
-    if (p_p04 != NULL) {sscanf (p_p04, "%x", &p04); misc[ 6] = p04 & 0xff;}
-    if (p_p05 != NULL) {sscanf (p_p05, "%x", &p05); misc[ 7] = p05 & 0xff;}
-    if (p_p06 != NULL) {sscanf (p_p06, "%x", &p06); misc[ 8] = p06 & 0xff;}
-    if (p_p07 != NULL) {sscanf (p_p07, "%x", &p07); misc[ 9] = p07 & 0xff;}
-    if (p_p08 != NULL) {sscanf (p_p08, "%x", &p08); misc[10] = p08 & 0xff;}
-    if (p_p09 != NULL) {sscanf (p_p09, "%x", &p09); misc[11] = p09 & 0xff;}
-    if (p_p10 != NULL) {sscanf (p_p10, "%x", &p10); misc[12] = p10 & 0xff;}
-    if (p_p11 != NULL) {sscanf (p_p11, "%x", &p11); misc[13] = p11 & 0xff;}
-    if (p_p12 != NULL) {sscanf (p_p12, "%x", &p12); misc[14] = p12 & 0xff;}
-    if (p_p13 != NULL) {sscanf (p_p13, "%x", &p13); misc[15] = p13 & 0xff;}
-    if (p_p14 != NULL) {sscanf (p_p14, "%x", &p14); misc[16] = p14 & 0xff;}
-    if (p_p15 != NULL) {sscanf (p_p15, "%x", &p15); misc[17] = p15 & 0xff;}
-    if (p_p16 != NULL) {sscanf (p_p16, "%x", &p16); misc[18] = p16 & 0xff;}
-    if (p_p17 != NULL) {sscanf (p_p17, "%x", &p17); misc[19] = p17 & 0xff;}
-    if (p_p18 != NULL) {sscanf (p_p18, "%x", &p18); misc[20] = p18 & 0xff;}
-    if (p_p19 != NULL) {sscanf (p_p19, "%x", &p19); misc[21] = p19 & 0xff;}
-    if (p_p20 != NULL) {sscanf (p_p20, "%x", &p20); misc[22] = p20 & 0xff;}
-    if (p_p21 != NULL) {sscanf (p_p21, "%x", &p21); misc[23] = p21 & 0xff;}
-    if (p_p22 != NULL) {sscanf (p_p22, "%x", &p22); misc[24] = p22 & 0xff;}
-    if (p_p23 != NULL) {sscanf (p_p23, "%x", &p23); misc[25] = p23 & 0xff;}
-
-    status = send (Cnct_skt, misc, misc[0]+1, 0);
-    printf ("Sent: 0x%02x 0x%02x", misc[1], misc[2]);
-    if (misc[0] >  2) printf (" 0x%02x", misc[ 3]);
-    if (misc[0] >  3) printf (" 0x%02x", misc[ 4]);
-    if (misc[0] >  4) printf (" 0x%02x", misc[ 5]);
-    if (misc[0] >  5) printf (" 0x%02x", misc[ 6]);
-    if (misc[0] >  6) printf (" 0x%02x", misc[ 7]);
-    if (misc[0] >  7) printf (" 0x%02x", misc[ 8]);
-    if (misc[0] >  8) printf ("\n      0x%02x", misc[ 9]);
-    if (misc[0] >  9) printf (" 0x%02x", misc[10]);
-    if (misc[0] > 10) printf (" 0x%02x", misc[11]);
-    if (misc[0] > 11) printf (" 0x%02x", misc[12]);
-    if (misc[0] > 12) printf (" 0x%02x", misc[13]);
-    if (misc[0] > 13) printf (" 0x%02x", misc[14]);
-    if (misc[0] > 14) printf (" 0x%02x", misc[15]);
-    if (misc[0] > 15) printf (" 0x%02x", misc[16]);
-    if (misc[0] > 16) printf ("\n      0x%02x", misc[17]);
-    if (misc[0] > 17) printf (" 0x%02x", misc[18]);
-    if (misc[0] > 18) printf (" 0x%02x", misc[19]);
-    if (misc[0] > 19) printf (" 0x%02x", misc[20]);
-    if (misc[0] > 20) printf (" 0x%02x", misc[21]);
-    if (misc[0] > 21) printf (" 0x%02x", misc[22]);
-    if (misc[0] > 22) printf (" 0x%02x", misc[23]);
-    if (misc[0] > 23) printf (" 0x%02x", misc[24]);
-    if (misc[0] > 24) printf (" 0x%02x", misc[25]);
-    printf ("\n");
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void	Do_TOF (int silent) {
-/*	======		Generate a stream of events in "TOF" Mode
-*/
-    int		    i, j, status;
-    long int	    nrl;
-    char	   *p_nevents, *p_hi_cntr, *p_hi_time, *p_lo_cntr, *p_lo_time;
-    unsigned int    nevents,    hi_cntr,    hi_time,    lo_cntr,    lo_time;
-    unsigned char   buff[64];
-    float	    cntr_scale, time_scale;
-    void	    (* sig_status) (int);
-
-    union {
-	int		i4;
-	unsigned char	byt[4];
-    } cntr, time;
-    
-    p_nevents = p_hi_cntr = p_hi_time = p_lo_cntr = p_lo_time = NULL;
-
-    p_nevents = strtok (NULL, " ,");
-    if (p_nevents  != NULL) p_hi_cntr   = strtok (NULL, " ,");
-    if (p_hi_cntr   != NULL) p_hi_time = strtok (NULL, " ,");
-    if (p_hi_time != NULL) p_lo_cntr  = strtok (NULL, " ,");
-    if (p_lo_cntr  != NULL) p_lo_time  = strtok (NULL, " ,");
-
-    if ((p_nevents == NULL) ||
-	(sscanf (p_nevents, "%u", &nevents) != 1)) nevents = 10;
-    if ((p_hi_cntr == NULL) ||
-	(sscanf (p_hi_cntr, "%u", &hi_cntr) != 1)) hi_cntr = 127;
-    if ((p_hi_time == NULL) ||
-	(sscanf (p_hi_time, "%u", &hi_time) != 1)) hi_time = LWL_HDR_TS_MASK;
-    if ((p_lo_cntr == NULL) ||
-	(sscanf (p_lo_cntr, "%u", &lo_cntr) != 1)) lo_cntr = 0;
-    if ((p_lo_time == NULL) ||
-	(sscanf (p_lo_time, "%u", &lo_time) != 1)) lo_time = 0;
-
-    if (nevents == 0) nevents = 10;
-    if (hi_cntr > MAX_TOF_CNTR)	hi_cntr = 127;
-    if (hi_time > (LWL_HDR_TS_MASK)) hi_time = LWL_HDR_TS_MASK;
-    if (lo_cntr > hi_cntr) lo_cntr = 0;
-    if (lo_time > hi_time) lo_time = 0;
-
-    printf ("TOF: %u events\n"
-	    "     Counters    from   %u to %u\n"
-	    "     Time-values from 0x%x to 0x%x\n",
-		nevents, lo_cntr, hi_cntr, lo_time, hi_time);
-
-    Ctrl_C_has_happened = 0;
-    sig_status = signal (SIGINT, CtrlC_Handler);   /* Catch Ctrl-C interrupts */
-    if (sig_status == SIG_ERR) {
-      printf ("    Problem setting up a <Ctrl-C> signal handler. You probably\n"
-	      "    will not be able to stop by hitting <Ctrl-C>!\n");
-    }else {
-      printf ("    Hit <Ctrl-C> to stop:       ");
-    }
-
-    buff[0] = 0x81;	/* Get LWL_SERVER to zero message count */
-    status = send (Cnct_skt, buff, 1, 0);
-    if (status != 1) {
-      printf ("\nBad send status (%d) on \"zero-message\" request. "
-		    "Abandoning!\n", status);
-      return;
-    }
-
-    cntr_scale = ((float) (hi_cntr - lo_cntr + 1))/(((float) RAND_MAX) + 1.0);
-    time_scale = ((float) (hi_time - lo_time + 1))/(((float) RAND_MAX) + 1.0);
-
-    if (silent == 0)
-      printf ("\n          Time  Cntr");
-    buff[0] = 7;		/* Set up length of datagram */
-    buff[1] = b_LWL_HDR_BIT8;
-    buff[2] = b_LWL_TOF | 1;	/* Header for TOF-Mode/1-Chan */
-    buff[3] = 0x00;
-    buff[4] = 0x00;
-    buff[5] = 0x00;
-    buff[6] = 0x00;
-    buff[7] = 0x00;
-    i = 0;
-    do {
-      time.i4 = (int) (rand () * time_scale);
-      time.i4 += lo_time;
-      if (time.i4 > hi_time) time.i4 = hi_time;
-      time.i4 &= LWL_HDR_TS_MASK;
-      buff[3] = time.byt[2];
-      buff[4] = time.byt[1];
-      buff[5] = time.byt[0];
-
-      cntr.i4 = (int) (rand () * cntr_scale);
-      cntr.i4 += lo_cntr;
-      if (cntr.i4 > hi_cntr) cntr.i4 = hi_cntr;
-      buff[6] = cntr.byt[1];
-      buff[7] = cntr.byt[0];
-
-      status = send (Cnct_skt, buff, buff[0]+1, 0);
-      if (silent == 0) {
-	printf ("\n%5d %8d %5d 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x",
-		i, time.i4, cntr.i4,
-		buff[1], buff[2], buff[3], buff[4], buff[5], buff[6], buff[7]);
-      }
-      if (status != (buff[0] + 1)) {
-	printf ("\nBad send status (%d) on event %d. Abandoning!\n", status, i);
-	return;
-      }
-      i++;
-    } while ((i != nevents) && (Ctrl_C_has_happened == 0));
-    printf ("\nDone: %d\n", i);
-    signal (SIGINT, SIG_DFL);
-
-    buff[0] = 0x82;	/* Get LWL_SERVER to display message count */
-    status = send (Cnct_skt, buff, 1, 0);
-    if (status != 1) {
-      printf ("\nBad send status (%d) on \"display-message\" request. "
-		    "Abandoning!\n", status);
-      return;
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void	Do_TS () {
-/*	=====		Generate a Time Status packet (hdr + 5 bytes)
-*/
-    int		    i, j, status;
-    char	   *p_p1, *p_p2, *p_p3, *p_p4, *p_p5;
-    int		      p1,    p2,    p3,    p4,    p5;
-
-    static unsigned char   ts[] = {0,
-				b_LWL_HDR_BIT8, b_LWL_TR_TSI, 0x2e, 0x3d, 0x4c,
-				0x5b, 0x6a};
-    ts[0] = sizeof (ts) - 1;
-    p_p1 = p_p2 = p_p3 = p_p4 = p_p5 = NULL;
-
-    p_p1 = strtok (NULL, " ,");
-    if (p_p1 != NULL) p_p2 = strtok (NULL, " ,");
-    if (p_p2 != NULL) p_p3 = strtok (NULL, " ,");
-    if (p_p3 != NULL) p_p4 = strtok (NULL, " ,");
-    if (p_p4 != NULL) p_p5 = strtok (NULL, " ,");
-
-    if (p_p1 != NULL) {sscanf (p_p1, "%x", &p1); ts[3] = p1 & 0xff;}
-    if (p_p2 != NULL) {sscanf (p_p2, "%x", &p2); ts[4] = p2 & 0xff;}
-    if (p_p3 != NULL) {sscanf (p_p3, "%x", &p3); ts[5] = p3 & 0xff;}
-    if (p_p4 != NULL) {sscanf (p_p4, "%x", &p4); ts[6] = p4 & 0xff;}
-    if (p_p5 != NULL) {sscanf (p_p5, "%x", &p5); ts[7] = p5 & 0xff;}
-
-    status = send (Cnct_skt, ts, ts[0]+1, 0);
-    printf ("Sent: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n",
-		    ts[1], ts[2], ts[3], ts[4], ts[5], ts[6], ts[7]);
-    ts[3] += 1;
-    ts[4] += 1;
-    ts[5] += 1;
-    ts[6] += 1;
-    ts[7] += 1;
-  }
-/*
-**---------------------------------------------------------------------------*/
-  void exit_handler () {
-/*     ============
-**                  We must exit. Tidy up first.
-**		    Close TCP/IP link to front-end.
-*/
-    int	    status;
-    char    buff[16];
-/*
-**			Tell server we're quitting.
-*/
-    if (Cnct_skt != 0) {
-      printf ("Closing connection to %s ...\n", Rmt_host);
-      buff[0] = 0x00;
-      status = send (Cnct_skt, buff, 1, 0);
-      status = close (Cnct_skt);
-      Cnct_skt = 0;
-      if (status != 0) FailInet ("EXIT_HANDLER -- R/W-Socket close error\n");
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void	openConnection (
-/*	==============
-**			Open connection to histogram memory front-end.
-*/
-	    char	*node,
-	    int		 port) {
-
-    int	    i, status;
-    struct sockaddr_in	lcl_sockname;
-    struct sockaddr_in	rmt_sockname;
-    int			rmt_inet_addr;
-    struct in_addr	*rmt_inet_addr_pntr;
-    struct hostent	*rmt_hostent;
-    int			rmt_sockname_len;
-    unsigned int	oto_len, oto_status;
-    char		old_time_out[4];
-    union {
-      char  chars[4];
-      int   val;
-    } time_out;
-		/*
-		** Get Internet address of the front-end.
-		*/
-    for (i=0; i < strlen (node); i++) node[i] = tolower (node[i]);
-    rmt_hostent = gethostbyname (node);
-    if (rmt_hostent == NULL) {
-		/*
-		** The following code is to handle nodes which are not yet
-		** in the BIND data base.
-		*/
-      if (strcmp (node, "sqfe01") == 0) {
-        rmt_inet_addr_pntr = (struct in_addr *) &rmt_inet_addr;
-	rmt_inet_addr = inet_addr ("129.129.56.181");
-      }else {
-	printf ("Server Node is %s.\n", node);
-        FailInet ("\nGethostbyname error.");
-      }
-    }else {
-      rmt_inet_addr_pntr = (struct in_addr *) rmt_hostent->h_addr_list[0];
-    }
-    printf (" LWL_SERVER is running on %s ", node);
-    printf ("(%s),", inet_ntoa (*rmt_inet_addr_pntr));
-    printf (" Port %d\n", port);
-/*
-**	    Create a TCP/IP socket for prelim. connect to server and bind it.
-*/
-    Cnct_skt = socket (AF_INET, SOCK_STREAM, 0);
-    if (Cnct_skt == -1) FailInet ("Socket error.\n");
-
-    lcl_sockname.sin_family = AF_INET;
-    lcl_sockname.sin_port   = htons (0);
-    lcl_sockname.sin_addr.s_addr = 0;
-    status = bind (Cnct_skt, (struct sockaddr *) &lcl_sockname,
-				    sizeof (lcl_sockname));
-    if (status == -1) FailInet ("Bind error.\n");
-	    /*---------------------------
-	    ** Set short time-out (VMS systems only)
-	    */
-#ifdef	__VMS
-    oto_len = sizeof (old_time_out);	/* Save current time-out first */
-    oto_status = getsockopt (Cnct_skt, IPPROTO_TCP, UCX$C_TCP_PROBE_IDLE,
-			    old_time_out, &oto_len);
-    if (oto_status == 0) {
-      time_out.val = 5;		    /* Set new time-out */
-      status = setsockopt (Cnct_skt, IPPROTO_TCP, UCX$C_TCP_PROBE_IDLE,
-			    time_out.chars, sizeof (time_out));
-    }
-#endif
-/*
-**=========================================  Now connect to the server.
-*/
-    rmt_sockname_len = sizeof (rmt_sockname);
-    rmt_sockname.sin_family	 = AF_INET;
-    rmt_sockname.sin_port	 = htons (port);
-    rmt_sockname.sin_addr.s_addr = rmt_inet_addr_pntr->s_addr;
-    status = connect (Cnct_skt, (struct sockaddr *) &rmt_sockname,
-				    sizeof (rmt_sockname));
-    if (status == -1) {
-      GetErrno (&My_errno, &My_vaxc_errno);
-      FailInet ("Connect error\n");
-    }
-		/*---------------------------
-		** Restore time-out (VMS only)
-		*/
-#ifdef	__VMS
-    if (oto_status == 0) {
-      setsockopt (Cnct_skt, IPPROTO_TCP, UCX$C_TCP_PROBE_IDLE,
-			    old_time_out, oto_len);
-    }
-#endif
-  }
-/*
-**---------------------------------------------------------------------------
-**			setup_xrm_database    - setup Resource Manager Database
-*/
-  int	setup_xrm_database (
-/*	==================
-*/			XrmDatabase	*db,
-			char		*name[],
-			int		*argc,
-			char		*argv[],
-			int		verbose) {
-
-    static char	our_name[80]  = "Unknown";  /* This holds the program name */
-    static char lkup_name[80] = "Unknown";  /* Name for looking in database */
-
-    int		status, i, first = True;
-    char	text[80];
-    char	full_nm0[80];
-    char	full_nm1[80];
-    char	*p_fil[] = {0,0,0,0,0,0,0,0,0,0};
-    char	*my_name;
-    char	*my_name_last;
-
-    char	*name_type;
-    XrmValue	name_value;
-
-    XrmDatabase cmnd_line_db = NULL;
-    XrmDatabase	lcl_db	     = NULL;
-  /*-----------------------------------------------------
-  ** This routine merges some resource databases with options specified on
-  ** the command line. Resources can then be looked up using XrmGetResource.
-  ** This is a bit like the X-toolkit routine XtAppInitialize does for the
-  ** extraction of resources by XtGetApplicationResources.
-  ** 
-  ** I can't help but think that there's a simpler way of doing this but I
-  ** can't find it in the X manuals. Basically, the problem arises with wanting
-  ** to avoid the calling program being associated with an X-display, i.e. it
-  ** is intended for use by "command-line oriented" programs. All the nice,
-  ** easy-to-use resource/command-line setup routines in Xlib or Xtlib seem to
-  ** assume one is going to use a display -- not surprising, I suppose,
-  ** since the concept of Xlib is for writing window based applications!
-  **
-  ** Anyway, the point is that the following way turns out to be lacking
-  ** when it gets tested in anger.
-  */
-    status = True;		/* Assume success	*/
-
-    our_name[0] = NIL;
-	/*
-	** Make a list of the databases to be merged, highest priority first.
-	*/
-#ifdef  __VMS
-    p_fil[0] = "decw$user_defaults:SinQ_rc.dat";
-    p_fil[1] = "decw$group_defaults:SinQ_rc.dat";
-    p_fil[2] = "decw$system_defaults:SinQ_rc.dat";
-    p_fil[3] = "decw$user_defaults:decw$xdefaults.dat";
-    p_fil[4] = "decw$group_defaults:decw$xdefaults.dat";
-    p_fil[5] = "decw$system_defaults:decw$xdefaults.dat";
-    p_fil[6] = NULL;
-    if (*argc > 0) {	     /* Find out what we are called - parse file nm */
-      my_name = strstr (argv[0], "]");	/* Find end of directory, i.e. "]" */
-      my_name++;			/* Skip over "]" */
-      if (my_name[0] == '[') {		/* Handle possible concealed device */
-        my_name = strstr (my_name, "]");
-	my_name++;
-      }
-      i = sizeof (our_name);
-      StrEdit (our_name, my_name, "lowercase", &i);	    /* Copy the rest */
-      strtok (our_name, ".");		/* Close it off at "." */
-    }
-#else
-    p_fil[0] = StrJoin (full_nm0, sizeof (full_nm0),
-			    getenv ("HOME"), "/SinQ_rc");
-    p_fil[1] = "/usr/lib/X11/app-defaults/SinQ_rc";
-    p_fil[2] = StrJoin (full_nm1, sizeof (full_nm1),
-			    getenv ("HOME"), "/.Xdefaults");
-    p_fil[3] = "/usr/lib/X11/app-defaults/Xdefaults";
-    p_fil[4] = NULL;
-    if (*argc > 0) {	      /* Find out what we are called - parse file nm  */
-			      /* Find end of directories */
-      my_name = argv[0] - 1;
-      while (my_name != NULL) {
-        my_name_last = my_name;
-	my_name_last++;
-	my_name = strstr (my_name_last, "/");
-      }
-      StrJoin (our_name, sizeof (our_name), my_name_last, "");
-    }
-#endif
-    if (verbose) printf ("My name is \"%s\"\n", our_name);
-	/*
-	**  Initialise and combine all databases
-	*/
-    XrmInitialize ();
-    for (i = 0; i < XtNumber (p_fil); i++) {
-      if (p_fil[i] == NULL) break;
-      status = XrmCombineFileDatabase (p_fil[i], &lcl_db, False);
-      if ((status != 0) && verbose) {
-	if (first)
-	  printf ("Resource database created from file %s.\n", p_fil[i]);
-	if (!first)
-	  printf ("File %s merged into resource database.\n", p_fil[i]);
-	first = False;
-      }
-    }
-	/*----------------------------------------------------------------
-	**  See if there's anything specified on cmnd line, incl "name".
-	*/
-    XrmParseCommand (&cmnd_line_db,
-			OptTable, XtNumber(OptTable), our_name, argc, argv);
-    if (cmnd_line_db != NULL) {
-	    /*
-	    ** There was at least 1 item on cmnd line. Process the line.
-	    ** If -name was specified, adopt it.
-	    */
-      status = XrmGetResource (cmnd_line_db,  /* See if a name was specified  */
-			    StrJoin (text, sizeof (text), our_name, ".name"),
-			    "ProgramName.Values",
-			    &name_type, &name_value);
-      if (status) {
-	i = sizeof (lkup_name);
-	StrEdit (lkup_name, name_value.addr, "lowercase", &i);
-	printf ("Option list name is \"%s\"\n", lkup_name);
-      }else {
-        strcpy (lkup_name, our_name);
-      }
-	    /*
-	    ** Loop over all items in OptTable and merge them into database,
-	    ** taking care of any possible name changes.
-	    */
-      for (i = 0; i < XtNumber (OptTable); i++) {
-	if (strcmp (OptTable[i].option, "-name") == 0) continue;
-        status = XrmGetResource (cmnd_line_db,
-				StrJoin (text, sizeof (text),
-				    our_name, OptTable[i].specifier),
-				"ProgramName.Values",
-				&name_type, &name_value);
-	if (status) {
-	  StrJoin (text, sizeof (text), lkup_name, OptTable[i].specifier);
-	  XrmPutResource (&lcl_db, text, "String", &name_value);
-	}
-      }
-    }
-/*----------------------------------------------------------------
-*/
-    *name = lkup_name;
-    *db = lcl_db;
-    if ((lcl_db == NULL) && verbose)
-      printf ("\007Warning -- no resource database found.\n");
-
-    XrmDestroyDatabase (cmnd_line_db);
-/*
-**    XrmPutFileDatabase (lcl_db, "lwl_client.db");
-*/
-    return status;
-  }
-/*
-**==========================================================================
-**
-**  Main line program
-**  ------------------
-**==========================================================================*/
-  int	main (int argc, char *argv[]) {
-/*	====
-*/
-    int			i, j, k, status, is, silent;
-
-    unsigned char	ubuff[16];
-    unsigned char	fe[] = {5, b_LWL_HDR_BIT8, b_LWL_FIFO_EMPTY,
-					0x00, 0x00, 0x00};
-
-    char    recd[256], recd1[256];
-    char    last_recd[256] = {NIL};
-    char    *verb;
-    int	    l_recd;
-    time_t  startTime;
-    char    cmndLine[132];
-
-    char		buff[80], *appName;
-    XrmDatabase		my_db;
-    XrmValue		value;
-    char		*type;
-/*============================================================================
-*/
-    startTime = time (NULL);
-    printf ("LWL_CLIENT Ident %s started.\n", Ident);
-    printf ("Started at %s", asctime (localtime (&startTime)));
-
-    StrJoin (cmndLine, sizeof (cmndLine), argv[0], "");
-    for (i = 1; i < argc; i++) {
-      StrJoin (cmndLine, sizeof (cmndLine), cmndLine, " ");
-      StrJoin (cmndLine, sizeof (cmndLine), cmndLine, argv[i]);
-    }
-    printf ("Command: %s\n", cmndLine);
-/*============================================================================
-**	    Declare an exit handler to tidy up if we get forced to exit.
-*/
-    is = atexit (exit_handler);
-    if (is != 0) {
-      printf ("LWL_CLIENT -- error setting up exit handler.");
-      return EXIT_FAILURE;
-    }
-/*============================================================================
-**	Setup the resource database and look up the resources.
-**	If there is a single item left on the command line, assume
-**	that it is the target host.
-*/
-    Verbose = False;
-    for (i = 1; i < argc; i++) if (strcmp ("-v", argv[i]) == 0) Verbose = True;
-
-    setup_xrm_database (&my_db, &appName, &argc, argv, Verbose);
-	/* - - - - - - - - - - - - - - - - - - - - - - - - */
-    status = XrmGetResource (my_db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".lwlHost"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (status) {
-      StrJoin (Rmt_host, sizeof (Rmt_host), value.addr, "");
-    }else {
-      if (argc == 2) {
-	StrJoin (Rmt_host, sizeof (Rmt_host), argv[1], "");
-	argc--;
-      }else {
-	printf ("\n"
-		"Host name not defined via the\n"
-		"               \"lwlHost\" resource or the\n"
-		"               \"-host\" option.\n"
-		"There is no default!\n");
-	exit (EXIT_FAILURE);
-      }
-    }
-	/* - - - - - - - - - - - - - - - - - - - - - - - - */
-    if (argc > 1) {
-      printf ("The following illegal options were specified:\n   ");
-      for (i = 1; i < argc; i++) printf (" %s", argv[i]);
-      printf ("\nThe following options are recognised:\n");
-      for (i = 1; i < XtNumber (OptTable); i++) {
-	printf ("   %s\n", OptTable[i].option);
-      }
-      exit (EXIT_FAILURE);
-    }
-	/* - - - - - - - - - - - - - - - - - - - - - - - - */
-    status = XrmGetResource (my_db,
-				StrJoin (buff, sizeof (buff),
-				appName, ".lwlPort"),
-				"ProgramName.Values",
-				&type, &value);
-    if (!status) {
-      Rmt_port = 3501;
-    }else if ((sscanf (value.addr, "%d", &Rmt_port) != 1) ||
-	      (Rmt_port < 1024) ||
-	      (Rmt_port > 65535)) {
-      printf ("\n"
-	      " \"-port %s\" is illegal! It must be an integer in the range "
-		    "1024 to 65535\n"
-	      "\n", value.addr);
-      exit (EXIT_FAILURE);
-    }
-	/* - - - - - - - - - - - - - - - - - - - - - - - - */
-    status = XrmGetResource (my_db,
-				StrJoin (buff, sizeof (buff),
-				appName, ".lwlSize"),
-				"ProgramName.Values",
-				&type, &value);
-    if (!status) {
-      Pkt_size = 8192;
-    }else if ((sscanf (value.addr, "%d", &Pkt_size) != 1) ||
-	      (Pkt_size < 256) ||
-	      (Pkt_size > 65536)) {
-      printf ("\n"
-	      " \"-size %s\" is illegal! It must be an integer in the range "
-		    "256 to 65536\n"
-	      "\n", value.addr);
-      exit (EXIT_FAILURE);
-    }
-/*============================================================================
-**	    Find out the location of the LWL Server and make
-**	    a connection to it. Any errors during this phase cause the program
-**	    to exit with an error status.
-*/
-    openConnection (Rmt_host, Rmt_port);
-/*
-**====================================================== Wait for work =========
-*/
-    recd[0] = NIL;
-    printf ("> ");
-    while (fgets (recd, sizeof (recd), stdin) != NULL) {
-      if (strlen (recd) == (sizeof (recd) - 1)) {
-	printf ("\n\n\007Input buffer overflow -- command ignored!\n\n");
-	do {					/* Flush the remains */
-	  fgets (recd, sizeof (recd), stdin);
-	} while (strlen (recd) == (sizeof (recd) - 1));
-	printf ("> ");
-	continue;
-      }
-      i = strlen (recd) - 1;
-      if (recd[i] == NL) recd[i] = NIL;	    /* Suppress the trailing \n */
-      if (recd[0] == NIL) {		    /* If just <Return>, repeat */
-        strcpy (recd, last_recd);
-      }
-      l_recd = sizeof (recd1);
-      StrEdit (recd1, recd, "trim compress uncomment lowercase", &l_recd);
-      if (l_recd <= 0) {	/* Skip empty lines */
-        printf ("\n> ");
-	continue;
-      }
-	    /*
-	    ** Parse the command
-	    */
-      verb = strtok (recd1, " ,");
-      if ((strcmp (verb, "q") == 0) ||  /* Quit */
-	  (strcmp (verb, "qu") == 0) ||
-	  (strcmp (verb, "qui") == 0) ||
-	  (strcmp (verb, "quit") == 0) ||
-	  (strcmp (verb, "ex") == 0) ||
-	  (strcmp (verb, "exi") == 0) ||
-	  (strcmp (verb, "exit") == 0)) {
-	break;
-      }else if ((strcmp (verb, "et") == 0) ||  /* Send Extended T Status Info */
-		(strcmp (verb, "ets") == 0) ||
-		(strcmp (verb, "etsi") == 0)) {
-	Do_ETSI ();
-      }else if (strcmp (verb, "fe") == 0) {	    /* Send Fifo-empty */
-	status = send (Cnct_skt, fe, fe[0]+1, 0);
-        printf ("Sent: 0x%02x 0x%02x 0x%02x 0x%02x\n",
-			fe[1], fe[2], fe[3], fe[4]);
-      }else if ((strcmp (verb, "fi") == 0) ||	    /* Send File */
-		(strcmp (verb, "fil") == 0) ||
-		(strcmp (verb, "file") == 0)) {
-	Do_File ();
-      }else if ((strcmp (verb, "hm") == 0) ||	/* Histogram Mode */
-		(strcmp (verb, "hm/s") == 0)) {	/* Params are:
-						**	<#-events>
-						**	<#-chans> (1, 2 or 3)
-						**	<max-chan-0>
-						**	<max-chan-1>
-						**	...
-						*/
-	silent = 0;
-	if (strcmp (verb, "hm/s") == 0) silent = 1;
-        Do_HM (silent);
-      }else if ((strcmp (verb, "hr") == 0) ||	/* HRPT Mode */
-		(strcmp (verb, "hrp") == 0) ||
-		(strcmp (verb, "hrpt") == 0) ||
-		(strcmp (verb, "hr/s") == 0) ||
-		(strcmp (verb, "hrp/s") == 0) ||
-		(strcmp (verb, "hrpt/s") == 0)) {	/* Params are:
-						**	<#-events>
-						**	<min-wire>
-						**	<max-wire>
-						**	<max-cnt-per-wire>
-						**	...
-						*/
-	silent = 0;
-	if (strcmp (verb, "hr/s") == 0) silent = 1;
-	if (strcmp (verb, "hrp/s") == 0) silent = 1;
-	if (strcmp (verb, "hrpt/s") == 0) silent = 1;
-        Do_HRPT (silent);
-      }else if ((strcmp (verb, "mi") == 0) ||  /* Send Miscellaneous Datagram */
-		(strcmp (verb, "mis") == 0) ||
-		(strcmp (verb, "misc") == 0)) {
-	Do_Misc ();
-      }else if ((strcmp (verb, "tof") == 0) ||	  /* TOF Mode */
-		(strcmp (verb, "tof/s") == 0)) {  /* Params are:
-						  **  <#-events> (dflt=10)
-						  **  <hi-cntr>  (dflt=127)
-						  **  <hi-time>  (dflt=0xfffff)
-						  **  <lo-cntr>  (dflt=0)
-						  **  <lo-time>  (dflt=0)
-						  */
-	silent = (strcmp (verb, "tof/s") == 0) ? 1 : 0;
-        Do_TOF (silent);
-      }else if (strcmp (verb, "ts") == 0) {	    /* Send Time Stamp */
-	Do_TS ();
-      }else if ((strcmp (verb, "?") == 0) ||
-		(strcmp (verb, "h") == 0) ||
-		(strcmp (verb, "he") == 0) ||
-		(strcmp (verb, "hel") == 0) ||
-		(strcmp (verb, "help") == 0)) {
-	printf ("\n"
-	" The following commands are recognised by LWL_CLIENT:\n"
-	"\n"
-	"    ETSI <b1> ...   - Send Extended Time Stamp Info (0x0e + 9 bytes)\n"
-	"\n"
-	"    FE          - Send FIFO-Empty (0x1e, 0, 0, 0)\n"
-	"\n"
-	"    FILE <file> <#-cycles>   - Send file to LWL <#-cycles> times.\n"
-	"\n"
-	"    HM <#-events> <#chans> <max-chan-0> <max-chan-1> ...  - generate\n"
-	"                                 data flow in \"Histogram\" Mode.\n"
-	"\n"
-	"    HM/S <#-events> <#chans> <max-chan-0> ...  - same as HM only"
-							    " silent.\n"
-	"\n"
-	"    HRPT <#-events> <min-wire> <max-wire> <max-cnt-per-wire> ...  "
-						"- generate\n"
-	"                                 data flow in \"HRPT\" Mode.\n"
-	"\n"
-	"    HRPT/S <#-events> <min-wire> <max-wire> ...  - same as HRPT only"
-							    " silent.\n"
-	"\n"
-	"    TOF <#-events> <hi-cntr> <hi-time> <lo-cntr> <lo-time> "
-						"- generate\n"
-	"                                 data flow in \"TOF\" Mode.\n"
-	"\n"
-	"    TOF/S <#-events> <hi-cntr> <hi-time> ...    - same as TOF only"
-							    " silent.\n"
-	"\n"
-	"    MISC <b0> ...    - Send miscellaneous datagram (up to 10 bytes)\n"
-	"                       \"<b0> ...\" are in hex, without \"0x\" prefix.\n"
-	"\n"
-	"    TS <b1> ...      - Send Time Stamp (0x1f + 5 bytes)\n"
-	"\n"
-	"    HELP or ?   - generate this help text.\n"
-	"\n"
-	" To run the program:\n"
-	"      lwl_client [-host] <host> [-port <port>] [-size <size>]\n"
-	"\n"
-	"      Default for <port> = 3501\n"
-	"      Default for <size> = 8192\n"
-	"\n");
-      }else {
-        printf ("\n Illegal command - type \"?\" for help.\n");
-      }
-      strcpy (last_recd, recd);
-	    /*
-	    ** Get another command.
-	    */
-      printf ("> ");
-    }
-/*
-**			Tell server we're quitting.
-*/
-    printf ("Closing connection to %s ...\n", Rmt_host);
-    ubuff[0] = 0x00;
-    status = send (Cnct_skt, ubuff, 1, 0);
-    status = close (Cnct_skt);
-    Cnct_skt = 0;
-    if (status != 0) FailInet ("LWL_CLIENT -- R/W-Socket close error\n");
-
-    return EXIT_SUCCESS;
-  }
-/*============================================= End of LWL_CLIENT.C ======*/
diff --git a/sinqhm/lwl_server.c b/sinqhm/lwl_server.c
deleted file mode 100755
index bf539cf7..00000000
--- a/sinqhm/lwl_server.c
+++ /dev/null
@@ -1,485 +0,0 @@
-#define	    ident	"1B03"
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     Computing Section                        |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...SINQHM]LWL_SERVER.C
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Oct 1996
-**
-** Updates:
-**  1A01  1-Oct-1996 DM	    Initial version.
-**---------------------------------------------------------------------------
-**  LWL_SERVER.C is the main program of a SINQ Histogram Memory process
-**  which will run in a front-end processor, accept a TCP/IP connection
-**  and transfer received data into the LWL (Licht-Wellen-Leiter) Test
-**  generator.
-**
-**  To compile this program for VxWorks on PSS123, use:
-**
-	    ccvx lwl_server.c
-** where
-	    ccvx = ccppc -O0		    \
-		    -mcpu=603		    \
-		    -I${WIND_BASE}/target/h \
-		    -fno-builtin	    \
-		    -fno-for-scope	    \
-		    -nostdinc		    \
-		    -DCPU=PPC603	    \
-		    -D_GNU_TOOL		    \
-		    -gdwarf -c -Wimplicit
-
-**  and, on the target,
-**
-**   -> ld < lwl_server.o
-**   -> taskSpawn "lwl_server", 100, 8, 20000, lwl_server, \
-**					    <port>, <base-addr>, <verbose>
-**					      ^		^	    ^
-**					      |		|	    |
-**     		         default = 3501 ------+		|	    |
-**			 default = 0x1800 --------------+	    |
-**			 verbose mode if non-zero ------------------+
-**
-**  To suppress VME access, e.g. for test purposes, compile with the
-**  option
-**		-D_NO_VME
-**====================================================================
-*/
-#include    <vxWorks.h>
-#include    <taskLib.h>
-#include    <msgQLib.h>
-#include    <sockLib.h>
-#include    <hostLib.h>
-#include    <inetLib.h>
-#include    <sysLib.h>
-#include    <vme.h>
-
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <unistd.h>
-#include    <errno.h>
-#include    <netinet/in.h>
-#include    <arpa/inet.h>
-#include    <sys/types.h>
-#include    <sys/socket.h>
-
-/*** #include    <sys/file.h>	***/	/* Get POSIX file definitions. */
-
-#include    <signal.h>		/* Get POSIX signal definitions. */
-#include    <sys/mman.h>	/* Get POSIX mem mgmnt definitions. */
-#include    <sys/wait.h>	/* Get POSIX wait definitions. */
-
-#include    "vmio10_def.h"
-/*
-**====================	Global Definitions =====================================
-*/
-#define	    DFLT_PORT	    3501
-#define	    DFLT_BASE_ADDR  0x1800
-/*
-**====================	Global Variables =====================================
-*/
-  char	    *LwlBase;
-  char	    Lwl_dummy[64];	/* Dummy array - used only when VME access ..
-				** .. is disabled. */
-
-  int	    Lwl_cnct_skt = 0;	/* Connection socket */
-  int	    Lwl_rw_skt = 0;		/* Read/write socket */
-
-  char	    Lwl_inet_node[20];
-  char	    Lwl_inet_addr[20];
-  int	    Lwl_my_errno;
-/*
-
-**=============================================================================
-**  Local routines.
-**				    Forward references ...
-*/
-    void    lwl_enable ();
-    void    lwl_failInet (char *text);
-    void    lwl_getErrno (int *his_errno);
-    void    lwl_resetcio ();
-    void    lwl_setup_inet_info ();
-    void    lwl_vmio_byte_send (char bit8, char lobits);
-    void    lwl_vmio_init ();
-    void    lwl_vmio_send (char nbytes, char *buff);
-    void    lwl_vmio_tg_reset ();
-    void    lwl_vmio_transp_init ();
-/*
-**-----------------------------------------------------------------*/
-  void	lwl_enable () {
-/*	==========
-**			output/input enable for IC6 ,IC7
-*/
-    LwlBase[VMIO_AB_CNTL] = 0x01;
-    LwlBase[VMIO_AB_CNTL] = 0x94;
-    LwlBase[VMIO_CD_CNTL] = 0x01;
-    LwlBase[VMIO_CD_CNTL] = 0x94;
-  }
-/*
-**-----------------------------------------------------------------*/
-  void lwl_failInet (char *text) {
-/*     ============
-**		    Output the given text and exit the process.
-*/
-    int    my_errno;
-
-    lwl_getErrno (&my_errno);
-    printf ("\n### Internet Error ###\n");
-    printf ("                   ### errno = %d.\n", my_errno);
-    perror (text);
-    exit (EXIT_FAILURE);
-  }
-/*
-**-----------------------------------------------------------------*/
-  void	lwl_getErrno (int *his_errno) {
-/*      ============
-*/
-    *his_errno = errno;	    /* Make copy of errno   */
-    return;
-  }
-/*
-**-----------------------------------------------------------------*/
-  void	lwl_resetcio () {
-/*	============
-**			Software reset for cio
-*/
-    char    aux;
-
-    aux = LwlBase[VMIO_AB_CNTL];
-    LwlBase[VMIO_AB_CNTL] = 0x00;
-
-    aux = LwlBase[VMIO_AB_CNTL];
-    LwlBase[VMIO_AB_CNTL] = 0x00;
-    LwlBase[VMIO_AB_CNTL] = 0x01;
-    LwlBase[VMIO_AB_CNTL] = 0x00;
-	
-    aux = LwlBase[VMIO_CD_CNTL];
-    LwlBase[VMIO_CD_CNTL] = 0x00;
-    aux = LwlBase[VMIO_CD_CNTL];
-    LwlBase[VMIO_CD_CNTL] = 0x00;
-    LwlBase[VMIO_CD_CNTL] = 0x01;
-    LwlBase[VMIO_CD_CNTL] = 0x00;
-  }
-/*
-**-----------------------------------------------------------------*/
-  void lwl_setup_inet_info () {
-/*     ===================
-**                  Get Internet Nodename and Address from System.
-*/
-    int			    status;
-    struct in_addr	    my_addr;
-
-    status = gethostname (Lwl_inet_node, sizeof (Lwl_inet_node));
-    if (status != 0) sprintf (Lwl_inet_node, "Undefined");
-
-    my_addr.s_addr = hostGetByName (Lwl_inet_node);
-    inet_ntoa_b (my_addr, Lwl_inet_addr);
-  }
-/*
-**-----------------------------------------------------------------*/
-  void	lwl_vmio_byte_send (char bit8, char lobits) {
-/*	==================
-**			    Send a byte (well, 9 bits really) via the VMIO10.
-*/
-    char    aux;
-
-    do {				/* Wait for Output Reg. empty */
-      LwlBase[VMIO_AB_CNTL] = 0X09;	/* Select Port B status reg .. */
-      aux = LwlBase[VMIO_AB_CNTL];	/* .. and read it. */
-    } while ((aux & 0x08) == 0);	/* Test its "empty" bit */
-
-    LwlBase[VMIO_PORT_C] = bit8;	/* Send Bit-8 */
-    LwlBase[VMIO_PORT_B] = lobits;	/* Output the other bits */
-  }
-/*
-**-----------------------------------------------------------------*/
-  void	lwl_vmio_init () {
-/*	=============
-**			initialise VMIO10 Module
-*/
-    LwlBase[VMIO_CD_CNTL] = 0x2A;	/* Port D %00101010 */
-    LwlBase[VMIO_CD_CNTL] = 0x00;	/* %00000000, non inverting */
-    LwlBase[VMIO_CD_CNTL] = 0x2B;	/* %00101011 */
-    LwlBase[VMIO_CD_CNTL] = 0x0F;	/* %00001111, Run, EF0_S, Q2, Q1, Q0 */
-
-    LwlBase[VMIO_AB_CNTL] = 0x2A;	/* Port B */
-    LwlBase[VMIO_AB_CNTL] = 0x00;
-    LwlBase[VMIO_AB_CNTL] = 0x2B;
-    LwlBase[VMIO_AB_CNTL] = 0x00;
-	
-    LwlBase[VMIO_AB_CNTL] = 0x22;	/* Port A %00100010 */
-    LwlBase[VMIO_AB_CNTL] = 0x00;	/* %00000000, non inverting */
-    LwlBase[VMIO_AB_CNTL] = 0x23;	/* %00100011 */
-    LwlBase[VMIO_AB_CNTL] = 0x00;	/* %00000000, all output */
-	
-    LwlBase[VMIO_CD_CNTL] = 0x22;	/* Port C */
-    LwlBase[VMIO_CD_CNTL] = 0x00;
-    LwlBase[VMIO_CD_CNTL] = 0x23;
-    LwlBase[VMIO_CD_CNTL] = 0x00;
-  }
-/*
-**-----------------------------------------------------------------*/
-  void	lwl_vmio_send (
-/*	=============			Send bytes to the LWL.
-*/		    char    nbytes,
-		    char    *buff) {
-/*
-**		The bytes are buff[0] to buff[nbytes-1]. buff[0] gives the
-**		headerbit for buff[1]. The remainder are sent with the 9th
-**		bit clear.
-*/
-    int	    i;
-    char    aux;
-		/*
-		** ---------- loop sending the bytes ---------------
-		*/
-    LwlBase[VMIO_PORT_C] = 0;			    /* Mode = 0 */
-
-    if (nbytes < 2) return;
-    lwl_vmio_byte_send (buff[0], buff[1]); /* 2 bytes define the first "LWL-byte" */
-
-    if (nbytes < 3) return;
-
-    for (i = 2; i < nbytes; i++) {     /* The remaining bytes have Bit-8 = 0 */
-      lwl_vmio_byte_send (0x00, buff[i]);
-    }
-  }
-/*
-**-----------------------------------------------------------------*/
-  void	lwl_vmio_tg_reset () {
-/*	=================
-**			Initialise VMIO10 Test Generator Piggyback
-*/
-    LwlBase[VMIO_PORT_AB] = 0x02;	/* Clear Write, Strobe */
-    LwlBase[VMIO_PORT_C] = 0x00;	/* Mode = 0 -> R,W = High */
-    LwlBase[VMIO_PORT_C] = 0x07;	/* Mode = reset */
-    LwlBase[VMIO_PORT_C] = 0x00;	/* Mode = 0 */
-  }
-/*
-**-----------------------------------------------------------------*/
-  void	lwl_vmio_transp_init () {
-/*	====================
-**			Initialise VMIO10 ready for transparent
-**			transmission of data.
-*/
-		/*
-		** ---------- initialize i/o ---------------
-		*/
-    LwlBase[VMIO_AB_CNTL] = 0x28;	/* Port B output port-Mode Spec. Reg */
-    LwlBase[VMIO_AB_CNTL] = 0x80;
-    	
-    LwlBase[VMIO_AB_CNTL] = 0x29;	/* Port B handshake interlock */
-    LwlBase[VMIO_AB_CNTL] = 0x00;
-  }
-/*==============================================================================
-
-**  Main line program
-**  ------------------
-**============================================================================*/
-  int lwl_server (int port, int base_addr, int verbose,
-		  int arg4, int arg5, int arg6, int arg7, int arg8, int arg9,
-		  int suspend) {
-/*============================================================================*/
-    STATUS		status;
-    char	       *my_task_name;
-    int			i, j, n_bytes_got, bytes_to_get;
-    int			msg_cnt = 0;
-    char		*p_addr;
-    int			cl_port;
-    struct sockaddr_in	lcl_sockname;
-    struct sockaddr_in	rmt_sockname;
-    int			rmt_sockname_len;
-
-    char		nbytes, buff[256], *p_buff;
-/*============================================================================
-*/
-    my_task_name = taskName (taskIdSelf());
-    if (suspend != 0) {
-      printf ("\n%s: Suspending ...\n", my_task_name);
-      taskSuspend (0);	    /* We've been told to suspend ourself, ..
-			    **  .. presumably for debug reasons.
-			    */
-      printf ("\n%s:   ... suspension ended!\n", my_task_name);
-    }
-/*============================================================================
-**	Perform the initialisation of global variables ...
-*/
-    if (Lwl_cnct_skt != 0) {
-      printf ("\007Lwl_cnct_skt = %d -- still open? ... ", Lwl_cnct_skt);
-      status = close (Lwl_cnct_skt);
-      if (status != ERROR) taskDelay (30);  /* Pause, maybe, to let system ..
-					    ** .. tidy up. */
-      printf ("it has been closed!\n");
-      Lwl_cnct_skt = 0;
-    }
-    if (Lwl_rw_skt != 0) {
-      printf ("\007Lwl_rw_skt   = %d -- still open? ...", Lwl_rw_skt);
-      status = close (Lwl_rw_skt);
-      if (status != ERROR) taskDelay (30);  /* Pause, maybe, to let system ..
-					    ** .. tidy up. */
-      printf ("it has been closed!\n");
-      Lwl_rw_skt = 0;
-    }
-/*============================================================================
-**		Get a port number to use. If the argument "port" is not
-**		a valid port number (not in range 128 to 32767), use DFLT_PORT.
-*/
-    if ((port < 128) || (port > 32767)) port = DFLT_PORT;
-/*============================================================================
-**		Get the VME base address of the Test Generator Module.
-**		If the argument "base_addr" is zero, use DFLT_BASE_ADDR.
-*/
-    if (base_addr == 0) base_addr = DFLT_BASE_ADDR;
-#ifdef _NO_VME
-    printf ("LWL_SERVER: Warning, VME access disabled.\n");
-    LwlBase = Lwl_dummy;
-#else
-    status = sysBusToLocalAdrs (VME_AM_USR_SHORT_IO,
-				    (char *) base_addr, &LwlBase);
-    if (status != OK) {
-      printf ("Error status from sysBusToLocalAdrs\n");
-      return ERROR;
-    }
-#endif	    /* _NO_VME */
-		    /*
-		    ** Initialise the Test Generator Module.
-		    */
-    lwl_resetcio ();
-    lwl_vmio_init ();
-    lwl_enable ();
-    lwl_vmio_tg_reset ();
-/*============================================================================
-**	Create a TCP/IP socket for receiving connection requests, bind it and
-**	set it to listen.
-*/
-    Lwl_cnct_skt = socket (AF_INET, SOCK_STREAM, 0);
-    if (Lwl_cnct_skt == -1) lwl_failInet ("\nLWL_SERVER -- Cnct-Socket socket error");
-
-    lcl_sockname.sin_family = AF_INET;
-    lcl_sockname.sin_port   = htons (port);
-    lcl_sockname.sin_addr.s_addr = 0;
-    status = bind (Lwl_cnct_skt, (struct sockaddr *) &lcl_sockname,
-					  sizeof (lcl_sockname));
-    if (status != 0) lwl_failInet ("\nLWL_SERVER -- Cnct-Socket bind error");
-
-    status = listen (Lwl_cnct_skt, 5);
-    if (status != 0) lwl_failInet ("\nLWL_SERVER -- Cnct-Socket listen error");
-
-    lwl_setup_inet_info ();    /* Find out who we are  */
-    printf ("\nLWL_SERVER Ident \"%s\" started on %s (%s). Port %d.\n",
-			    ident, Lwl_inet_node, Lwl_inet_addr, port);
-    if (verbose != 0) printf ("Verbose mode\n");
-		    /*
-		    **===============================================
-		    **	    Loop accepting connections from clients.
-		    */
-    while (TRUE) {
-      rmt_sockname_len = sizeof (rmt_sockname);
-      Lwl_rw_skt = accept (Lwl_cnct_skt, (struct sockaddr *) &rmt_sockname,
-						&rmt_sockname_len);
-      if (Lwl_rw_skt <= 0) {
-        lwl_getErrno (&Lwl_my_errno);
-	close (Lwl_cnct_skt);
-	Lwl_cnct_skt = 0;
-	lwl_failInet ("\nLWL_SERVER -- Cnct-Socket accept error");	/* No return */
-      }
-
-      p_addr = inet_ntoa (rmt_sockname.sin_addr);
-      cl_port = ntohs (rmt_sockname.sin_port);
-      printf ("\nLWL_SERVER_%d: Connected to Node %s, Port %d.\n",
-				port, p_addr, cl_port);
-
-      lwl_vmio_transp_init ();  /* Ensure the VMIO10 module is in correct mode. */
-		    /*
-		    **=======================================================
-		    **	    Loop reading messages from client.
-		    */
-      n_bytes_got = recv (Lwl_rw_skt, &nbytes, 1, NULL);
-      while ((n_bytes_got == 1) && (nbytes != 0)) {
-	if (verbose != 0) printf ("\nLWL:%3d", nbytes);
-			/*
-			** See if it's a "special" request (0x80 to 0xff).
-			*/
-	if ((nbytes & 0x80) == 0) {
-	  msg_cnt++;
-	  bytes_to_get = nbytes;
-	  p_buff = buff;
-	  while (bytes_to_get > 0) {
-	    n_bytes_got = recv (Lwl_rw_skt, p_buff, bytes_to_get, NULL);
-	    if (n_bytes_got != bytes_to_get) {
-	      if (n_bytes_got <= 0) {
-		printf ("\nLWL_SERVER: recv error on message %d; "
-			" recv status = %d\n", n_bytes_got);
-		printf ("   This is fatal - closing connection to %s.\n",
-					    inet_ntoa (rmt_sockname.sin_addr));
-		close (Lwl_rw_skt);
-		Lwl_rw_skt = 0;
-		close (Lwl_cnct_skt);
-		Lwl_cnct_skt = 0;
-		return ERROR;
-	      }
-	    }
-	    bytes_to_get -= n_bytes_got;
-	    p_buff += n_bytes_got;
-	  }
-	  if (verbose != 0) {
-	    for (i = 0; i < nbytes; i++) {
-	      if ((i % 16 == 0) && (i != 0)) {
-		printf ("\n        %02x", buff[i]);
-	      }else {
-		printf (" %02x", buff[i]);
-	      }
-	    }
-	    printf ("\n");
-	  }
-	  lwl_vmio_send (nbytes, buff);	    /* Send the bytes to the LWL. */
-	}else if (nbytes == 0x81) {
-	  printf ("\nLWL_SERVER: message count set to zero\n");
-	  msg_cnt = 0;
-	}else if (nbytes == 0x82) {
-	  printf ("\nLWL_SERVER: message count = %d\n", msg_cnt);
-	}else {
-          printf ("\nLWL_SERVER: unrecognised request received -- exiting!\n");
-	  printf ("            Request byte = 0x%x\n", nbytes);
-	  close (Lwl_rw_skt);
-	  Lwl_rw_skt = 0;
-	  close (Lwl_cnct_skt);
-	  Lwl_cnct_skt = 0;
-	  return ERROR;
-	}
-	n_bytes_got = recv (Lwl_rw_skt, &nbytes, 1, NULL);
-      }
-		    /*
-		    **	    End of loop reading messages from client.
-		    **===============================================
-		    */
-      if (n_bytes_got <= 0) {
-	printf ("\nLWL_SERVER -- R/W-Socket recv error.\n");
-	printf ("              Closing connection to %s.\n",
-					inet_ntoa (rmt_sockname.sin_addr));
-      }else {
-	printf ("\nLWL_SERVER -- client %s has terminated his connection.\n",
-					inet_ntoa (rmt_sockname.sin_addr));
-      }
-      close (Lwl_rw_skt);
-      Lwl_rw_skt = 0;
-    }
-		    /*
-		    **	    End of loop accepting connections from clients.
-		    **======================================================
-		    */
-    return OK;
-  }
-/*========================================= End of LWL_SERVER.C ========*/
-
-
-
-
diff --git a/sinqhm/make_sinqhm.com b/sinqhm/make_sinqhm.com
deleted file mode 100755
index 0732ba76..00000000
--- a/sinqhm/make_sinqhm.com
+++ /dev/null
@@ -1,202 +0,0 @@
-$!	TAS_SRC:[SINQHM]MAKE_SINQHM.COM		Ident V01A
-$!	=============================
-$!
-$! V01D 12-May-2000 DM.	Initial version
-$!-------------------------------------------------------------------------
-$	progs = "lwl_client," + -
-		"sinqhm_bootutil_client," + -
-		"sinqhm_client," + -
-		"sinqhm_ctrl"
-$	progs = f$edit (progs, "collapse, upcase") + ","
-$!-------------------------------------------------------------------------
-$	if p1 .nes. "?" .and. -
-	   p1 .nes. "H" .and. -
-	   p1 .nes. "HE" .and. -
-	   p1 .nes. "HEL" .and. -
-	   p1 .nes. "HELP" then goto skip_help
-$	  type sys$input
-
- -------------------------------------------------------------------------
-  Usage:
-		@TAS_SRC:[SINQHM]MAKE_SINQHM.COM  <exe-list>
-	where
-		<exe-list> = list of programs to make.
-
-  <exe-list> must be a comma separated list without white space chars.
-
-  If <exe-list> is empty, everything is created. Otherwise, just the named
-  programs are created. The programs which may be selected are:
-$
-$	  cnt = 0
-$ exe_loop:
-$	exe = f$element (cnt, ",", progs)
-$	cnt = cnt + 1
-$	if (exe .nes. ",") .and. (exe .nes. "") then say "	''exe'
-$	if exe .nes. "," then goto exe_loop
-$	  type sys$input
-
-  All programs are compiled with debug. If MAD_EXE is not
-  "TASMAD_DISK:[MAD.EXE]", _DBG versions of .EXE files are also created.
- -------------------------------------------------------------------------
-$	  exit
-$ skip_help:
-$	say := write sys$output
-$	bel[0,8] = 7
-$
-$	fopt = "/debug/noopt/include=tas_src:[def]"
-$	if f$getsyi("ARCH_TYPE") .eq. 2 then fopt = fopt + "/sep"
-$
-$	copt = "/decc/prefix=all/debug/noopt"
-$
-$	no_dbg := false
-$	if f$trnlnm ("mad_exe") .eqs. "TASMAD_DISK:[MAD.EXE]" then -
-	  no_dbg := true
-$	if .not. no_dbg then say "Debug execs will also be created ...
-$! ***********************************************************
-$	targ = f$element (0, "]", f$environment ("procedure")) + "]"
-$	targ_obj = f$element (0, "]", f$environment ("procedure")) + ".OBJ]"
-$
-$	mad_exe = f$trnlnm ("mad_exe")
-$
-$	if p1 .eqs. "" then p1 := all
-$	if p1 .eqs. "ALL" then goto do_all
-$!
-$!		Get here to build selected utilities.
-$!
-$	  cnt = 0		! First loop selecting no progs.
-$ lp0:
-$	nxt = f$element (cnt, ",", progs)
-$	cnt = cnt + 1
-$	if nxt .eqs. "" then goto lp0_end
-$	  do_'nxt' := false
-$	  goto lp0
-$ lp0_end:
-$!				Now pick out the items in P1
-$!
-$	pp1 = f$edit (p1, "collapse, upcase") + ","
-$	u_len = f$length (progs)
-$	cnt = 0
-$ lp1:
-$	nxt = f$element (cnt, ",", pp1)
-$	nxtt = nxt + ","
-$	cnt = cnt + 1
-$	if nxt .eqs. "" then goto lp1_end
-$	  if f$locate (nxtt, progs) .lt. u_len then goto lp1_ok
-$	    say "''bel'''nxt' is not a recognised TASMAD utility!
-$	    exit
-$ lp1_ok:
-$	do_'nxt' := true
-$	goto lp1
-$ lp1_end:
-$	goto do_comn
-$!----------------------------------------------------------------------
-$ do_all:
-$	cnt = 0			! Loop selecting all progs.
-$ lp2:
-$	nxt = f$element (cnt, ",", progs)
-$	cnt = cnt + 1
-$	if nxt .eqs. "" then goto lp2_end
-$	  do_'nxt' := true
-$	  goto lp2
-$ lp2_end:
-$ do_comn:
-$!-----------------------------------------------------------------
-$!		Compile and build LWL_CLIENT
-$!
-$	if .not. do_lwl_client then goto skp_lwl_client
-$	  say "Compiling and linking LWL_CLIENT ...
-$	  cc 'copt' 'targ'lwl_client + tas_src:[lib]sinq_c.tlb/lib
-$	  link /exe=mad_exe:lwl_client sys$input/opt
-		lwl_client
-		tas_src:[lib]sinq_dbg/lib
-		sys$share:decw$xlibshr/share
-$	  purge mad_exe:lwl_client.exe
-$	  rename mad_exe:lwl_client.exe;0 lwl_client.exe;1
-$
-$	  if no_dbg then goto lwl_client_no_dbg
-$	    link /debug /exe=mad_exe:lwl_client_dbg sys$input/opt
-		lwl_client
-		tas_src:[lib]sinq_dbg/lib
-		sys$share:decw$xlibshr/share
-$	    purge mad_exe:lwl_client_dbg.exe
-$	    rename mad_exe:lwl_client_dbg.exe;0 lwl_client_dbg.exe;1
-$ lwl_client_no_dbg:
-$	delete/nolog lwl_client.obj;*
-$ skp_lwl_client:
-$!-----------------------------------------------------------------
-$!		Compile and build SINQHM_BOOTUTIL_CLIENT
-$!
-$	if .not. do_sinqhm_bootutil_client then goto skp_sinqhm_bootutil_client
-$	  say "Compiling and linking SINQHM_BOOTUTIL_CLIENT ...
-$	  cc 'copt' 'targ'sinqhm_bootutil_client + tas_src:[lib]sinq_c.tlb/lib
-$	  link /exe=mad_exe:sinqhm_bootutil_client sys$input/opt
-		sinqhm_bootutil_client
-		tas_src:[lib]sinq_dbg/lib
-		sys$share:decw$xlibshr/share
-$	  purge mad_exe:sinqhm_bootutil_client.exe
-$	  rename mad_exe:sinqhm_bootutil_client.exe;0 -
-	    sinqhm_bootutil_client.exe;1
-$
-$	  if no_dbg then goto sinqhm_bootutil_client_no_dbg
-$	    link /debug /exe=mad_exe:sinqhm_bootutil_client_dbg sys$input/opt
-		sinqhm_bootutil_client
-		tas_src:[lib]sinq_dbg/lib
-		sys$share:decw$xlibshr/share
-$	    purge mad_exe:sinqhm_bootutil_client_dbg.exe
-$	    rename mad_exe:sinqhm_bootutil_client_dbg.exe;0 -
-	      sinqhm_bootutil_client_dbg.exe;1
-$ sinqhm_bootutil_client_no_dbg:
-$	delete/nolog sinqhm_bootutil_client.obj;*
-$ skp_sinqhm_bootutil_client:
-$!-----------------------------------------------------------------
-$!		Compile and build SINQHM_CLIENT
-$!
-$	if .not. do_sinqhm_client then goto skp_sinqhm_client
-$	  say "Compiling and linking SINQHM_CLIENT ...
-$	  cc 'copt' 'targ'sinqhm_client + tas_src:[lib]sinq_c.tlb/lib
-$	  link /exe=mad_exe:sinqhm_client sys$input/opt
-		sinqhm_client
-		tas_src:[lib]sinq_dbg/lib
-		pgplot_dir:cpgplot.olb/lib
-		pgplot_dir:grpckg.olb/lib
-		sys$share:decw$xlibshr/share
-$	  purge mad_exe:sinqhm_client.exe
-$	  rename mad_exe:sinqhm_client.exe;0 sinqhm_client.exe;1
-$
-$	  if no_dbg then goto sinqhm_client_no_dbg
-$	    link /debug /exe=mad_exe:sinqhm_client_dbg sys$input/opt
-		sinqhm_client
-		tas_src:[lib]sinq_dbg/lib
-		pgplot_dir:cpgplot.olb/lib
-		pgplot_dir:grpckg.olb/lib
-		sys$share:decw$xlibshr/share
-$	    purge mad_exe:sinqhm_client_dbg.exe
-$	    rename mad_exe:sinqhm_client_dbg.exe;0 sinqhm_client_dbg.exe;1
-$ sinqhm_client_no_dbg:
-$	delete/nolog sinqhm_client.obj;*
-$ skp_sinqhm_client:
-$!-----------------------------------------------------------------
-$!		Compile and build SINQHM_CTRL
-$!
-$	if .not. do_sinqhm_ctrl then goto skp_sinqhm_ctrl
-$	  say "Compiling and linking SINQHM_CTRL ...
-$	  cc 'copt' 'targ'sinqhm_ctrl + tas_src:[lib]sinq_c.tlb/lib
-$	  link /exe=mad_exe:sinqhm_ctrl sys$input/opt
-		sinqhm_ctrl
-		tas_src:[lib]sinq_dbg/lib
-		sys$share:decw$xlibshr/share
-$	  purge mad_exe:sinqhm_ctrl.exe
-$	  rename mad_exe:sinqhm_ctrl.exe;0 sinqhm_ctrl.exe;1
-$
-$	  if no_dbg then goto sinqhm_ctrl_no_dbg
-$	    link /debug /exe=mad_exe:sinqhm_ctrl_dbg sys$input/opt
-		sinqhm_ctrl
-		tas_src:[lib]sinq_dbg/lib
-		sys$share:decw$xlibshr/share
-$	    purge mad_exe:sinqhm_ctrl_dbg.exe
-$	    rename mad_exe:sinqhm_ctrl_dbg.exe;0 sinqhm_ctrl_dbg.exe;1
-$ sinqhm_ctrl_no_dbg:
-$	delete/nolog sinqhm_ctrl.obj;*
-$ skp_sinqhm_ctrl:
-$!-----------------------------------------------------------------
-$	exit
diff --git a/sinqhm/monitor.c b/sinqhm/monitor.c
deleted file mode 100644
index 2e2cc976..00000000
--- a/sinqhm/monitor.c
+++ /dev/null
@@ -1,354 +0,0 @@
-/*****************************************************************************
-*	File:		monitor.c
-*	Purpose:	to allow a user to easily edit memory using 1,2 
-*                         or 4 byte
-*				words.
-*	Author:		Scott Johnson
-*	Host Sys:	VxWorks
-*	Started:	01/20/90
-*	Updates:	02/13/90	added my own display routine
-*				03/29/90	added history
-*				08/22/90	fixed repeat command (return key)
-*				11/13/90	bus errors are trapped
-*                       Mark Koennecke
-*                               04/02/2002      for Tornado 2.0.2
-*****************************************************************************/
-/* tabstop = 4 */
-
-#include "vxWorks.h"
-#include "strLib.h"
-#include "stdioLib.h"
-
-int data_type = 2;	/* 1 = byte 2 = word 4 = long */
-
-static void help(void);
-static int process_command(char *command);
-
-int monitor (int a1, int a2, int a3, int a4, int a5, int a6, int a7,
-	     int a8, int a9, int suspend) 
-{
-
-  char command [80];
-  char input [80];
-  char *from_read;
-
-  printf ("VxWorks history added 03/29/90\n");
-  printf ("Bus Error trapping added 11/13/90\n\n");
-  do
-    {
-      switch (data_type)
-	{
-	case 1 : printf ("byte>"); break;
-	case 2 : printf ("word>"); break;
-	case 4 : printf ("long>"); break;
-	}
-
-      if ((from_read = fgets(input,79,stdin)) != EOF)
-	{
-	  if ( strlen(input) == 0  && (strlen(command) != 0))
-	    {
-	      printf ("%s\n", command);
-	      process_command (command);
-	    }
-	  else
-	    {
-	      printf ("%s\n", input);
-	      process_command (input);
-	      strcpy (command, input);
-	    }
-	}
-
-    } while ((input [0] != 'q') && (from_read != EOF));
-  fflush (stdin);
-  fflush (stdout);
-  return 1;
-}
-
-static int process_command (command)
-     char *command;
-{
-
-  unsigned long longInt, longVal;
-  unsigned short shortInt;
-  unsigned char byte;
-  unsigned char *ptr;
-  unsigned char *address, *size;
-  unsigned int start, end, value;
-  int scanned;
-  char ch;
-
-  switch (command [0])
-    {
-    case 'q' : 	/* user wants to quit so do nothing */
-    case '#' :	/* comment character */
-      break;
-    case 'f' :	/* block fill */
-      scanned=sscanf(command,"%c %x %x %x",&ch,&address,&size,&longInt); 
-      if (scanned != 4)
-	printf ("usage : f address size value\n");
-      else 
-	{
-	  for (ptr = address ;(int)ptr < ((int)size + (int)address);
-	       ptr+=data_type)
-	    {
-	      switch (data_type)
-		{
-		case 1 : 
-		  if (vxMemProbe (ptr, READ, data_type, &byte) != OK)
-		    {
-		      printf ("Bus error: address = %06x, data size = %d\n",
-			      (unsigned int) ptr, data_type);
-		      return (1);
-		    }
-		  else
-		    *((unsigned char *) ptr) = byte;
-		  break;
-		case 2 : 
-		  if (vxMemProbe (ptr, READ, data_type, &shortInt) != OK)
-		    {
-		      printf ("Bus error: address = %06x, data size = %d\n",
-			      (unsigned int) ptr, data_type);
-		      return (1);
-		    }
-		  else
-		    *((unsigned short *) ptr) = shortInt;
-		  break;
-		case 4 :
-		  if (vxMemProbe (ptr, READ, data_type, &longInt) != OK)
-		    {
-		      printf ("Bus error: address = %06x, data size = %d\n",
-			      (unsigned int) ptr, data_type);
-		      return (1);
-		    }
-		  else
-		    *((unsigned long *) ptr) = longInt;
-		  break;
-		}
-	    }
-	}
-      break;
-    case 's' :	/* scan range */
-      scanned=sscanf(command,"%c %x %x %x",&ch,&start,&end,&value); 
-      if (scanned != 4)
-	printf ("usage : s start end value\n");
-      else 
-	{
-	  /**
-	    scanning does not work: some memory locations lock up!!!!
-	  */
-          printf("Scanning from %x %x for %x\n", start, end, value);
-	  for (ptr = start ;(unsigned int)ptr <  end;
-	       ptr+=data_type)
-	    {
-	      switch (data_type)
-		{
-		case 1 : 
-		  if (vxMemProbe (ptr, READ, data_type, &byte) != OK)
-		    {
-		      printf ("Bus error: address = %06x, data size = %d\n",
-			      (unsigned int) ptr, data_type);
-		    }
-		  else {
-		    if((unsigned char)*ptr == value){
-		      printf("Value found at %08x\n",ptr);
-                    }
-                  }
-		  break;
-		case 2 : 
-		  if (vxMemProbe (ptr, READ, data_type, &shortInt) != OK)
-		    {
-		      printf ("Bus error: address = %06x, data size = %d\n",
-			      (unsigned int) ptr, data_type);
-		    }
-		  else
-		    {
-		      if((unsigned short)*ptr == value){
-			printf("Value found at %08x\n",ptr); 
-                      }
-		    }
-		  break;
-		case 4 :
-		  if (vxMemProbe (ptr, READ, data_type, &longInt) != OK)
-		    {
-		      printf ("Bus error: address = %06x, data size = %d\n",
-			      (unsigned int) ptr, data_type);
-		    }
-		  else
-		    {
-		      if((unsigned int)*ptr == value){
-			printf("Value found at %08x\n",ptr); 
-                      }
-		    }
-		}
-	    }
-	}
-      printf("Finished scanning....\n");
-      break;
-    case 'l' :
-      data_type = 4;
-      break;
-    case 'b' :
-      data_type = 1;
-      break;
-    case 'w' :
-      if (command [1] == 'o') 
-	data_type = 2;
-      else 
-	{
-	  scanned=sscanf(command,"%c %x %x",&ch,&ptr,&longInt); 
-	  if (scanned != 3)
-	    printf ("usage : w address value\n");
-	  else 
-	    {
-	      switch (data_type)
-		{
-		case 1 : 
-		  byte = (unsigned char) longInt;
-		  if (vxMemProbe (ptr, WRITE, data_type, &byte) != OK)
-		    printf ("Bus error: address = %06x, data size = %d\n",
-			    (unsigned int) ptr, data_type);
-		  else
-		    printf("%06X : %02X\n",(unsigned) ptr, byte); 
-		  break;
-		case 2 : 
-		  shortInt = (unsigned short) longInt;
-		  if (vxMemProbe (ptr, WRITE, data_type, &shortInt) != OK)
-		    printf ("Bus error: address = %06x, data size = %d\n",
-			    (unsigned int) ptr, data_type);
-		  else
-		    printf ("%06X : %04X\n", (unsigned) ptr, shortInt);
-		  break;
-		case 4 :
-		  if (vxMemProbe (ptr, WRITE, data_type, &longInt) != OK)
-		    printf ("Bus error: address = %06x, data size = %d\n",
-			    (unsigned int) ptr, data_type);
-		  else
-		    printf ("%06X : %08X\n", (unsigned) ptr, longInt);
-		  break;
-		}
-	    }
-	}
-      break;
-    case 'r' :
-      scanned = sscanf (command,"%c %x", &ch,&ptr);
-      if (scanned != 2)
-	printf ("usage : r address\n");
-      else 
-	{
-	  switch (data_type)
-	    {
-	    case 1 : 
-	      if (vxMemProbe (ptr, READ, data_type, &byte) != OK)
-		printf ("Bus error: address = %06x, data size = %d\n",
-			(unsigned int) ptr, data_type);
-	      else
-		printf ("%06x : %02x\n",(unsigned) ptr, byte);
-	      break;
-	    case 2 : 
-	      if (vxMemProbe (ptr, READ, data_type, &shortInt) != OK)
-		printf ("Bus error: address = %06x, data size = %d\n",
-			(unsigned int) ptr, data_type);
-	      else
-		printf ("%06x : %04x\n",(unsigned) ptr, shortInt);
-	      break;
-	    case 4 :
-	      if (vxMemProbe (ptr, READ, data_type, &longInt) != OK)
-		printf ("Bus error: address = %06x, data size = %d\n",
-			(unsigned int) ptr, data_type);
-	      else
-		printf ("%06X : %08X\n", (unsigned) ptr, longInt);
-	      break;
-	    }
-	}
-      break;
-    case 'd' :	/* use VxWorks display routine */
-      scanned = sscanf (command,"%c %x", &ch,&ptr);
-      if (scanned != 2)
-	printf ("usage : d address\n");
-      else
-	{	
-	  int x,y;
-	  for (y=0;y<16;y++)
-	    {
-	      printf ("%06X-", (unsigned int) ptr);
-	      for (x=0;x<16/data_type;x++, ptr += data_type)
-		{
-		  switch (data_type) 
-		    {
-		    case 1 : 
-		      if (vxMemProbe (ptr, READ, data_type, &byte) != OK)
-			{
-			  printf ("Bus error: address = %06x, data size = %d\n",
-				  (unsigned int) ptr, data_type);
-			  return (1);
-			}
-		      else
-			printf (" %02x", byte);
-		      break;
-		    case 2 :
-		      if (vxMemProbe (ptr, READ, data_type, &shortInt) != OK)
-			{
-			  printf ("Bus error: address = %06x, data size = %d\n",
-				  (unsigned int) ptr, data_type);
-			  return (1);
-			}
-		      else
-			printf (" %04x", shortInt);
-		      break;
-		    case 4 :
-		      if (vxMemProbe (ptr, READ, data_type, &longInt) != OK)
-			{
-			  printf ("Bus error: address = %06x, data size = %d\n",
-				  (unsigned int) ptr, data_type);
-			  return (1);
-			}
-		      else
-			printf (" %08x", longInt);
-		      break;
-		    }
-		}
-	      printf ("\n");
-	    }
-	}
-      break;
-    case 'h' : 
-      help ();
-      break;
-    default :
-      printf ("Unrecognized command.  Use h for help.\n");
-      break;
-    }
-  return 1;
-}
-
-static void help ()
-{
-
-  printf ("===================================================\n");
-  printf ("=                   Monitor                       =\n");
-  printf ("=                By Scott Johnson                 =\n");
-  printf ("===================================================\n");
-  printf ("Commands:\n");
-  printf ("[r]ead address..................reads given address\n");
-  printf ("[w]rite address value...........writes value to address\n");
-  printf ("[b]yte..........................read/write 8 bits\n");
-  printf ("[wo]rd..........................read/write 16 bits\n");
-  printf ("[l]ong..........................read/write 32 bits\n");
-  printf ("[d]isplay address...............show memory at address\n");
-  printf ("[f]ill address size value.......fill a block with value\n");
-  printf 
-  ("[s]scan start end value.........scan range between start end for value\n");
-  printf ("[q]uit..........................quit\n");
-  printf ("\n");
-  printf ("Features:\n");
-  printf ("1) Hit return to do a command again.\n");
-  printf ("2) VxWorks history is supported\n");
-  printf ("3) Redirect a script file while in the shell to easily\n");
-  printf ("   setup multiple locations.\n");
-  printf ("   Ex:   -> monitor < script_file  \n"); 
-  printf ("\n");
-  printf ("Remember to end script files with a 'q'\n");
-  printf ("\n");
-}
-
-
diff --git a/sinqhm/psi_logo.ps b/sinqhm/psi_logo.ps
deleted file mode 100755
index 7cbd6297..00000000
--- a/sinqhm/psi_logo.ps
+++ /dev/null
@@ -1,743 +0,0 @@
-%!PS-Adobe-2.1
-%%Creator: DECwrite V3.0-2
-%%+Copyright (c) 1990,1994 DIGITAL EQUIPMENT CORPORATION.  
-%%+All Rights Reserved.
-%%DocumentFonts: (atend)
-%%EndComments
-%%BeginProcSet DEC_WRITE 1.10
-save/DEC_WRITE_dict 150 dict def DEC_WRITE_dict begin/$D exch def/$I 0
-def/$S 0 def/$C matrix def/$R matrix def/$L matrix def/$E matrix
-def/pat1{/px exch def/pa 8 array def 0 1 7{/py exch def/pw 4 string def 0 1
-3{pw exch px py 1 getinterval putinterval}for pa py pw put}for}def/pat2{/pi
-exch def/cflag exch def save cflag 1 eq{eoclip}{clip}ifelse
-newpath{clippath pathbbox}stopped not{/ph exch def/pw exch def/py exch
-def/px exch def/px px 3072 div floor 3072 mul def/py py 3072 div floor 3072
-mul def px py translate/pw pw px sub 3072 div floor 1 add cvi def/ph ph py
-sub 3072 div floor 1 add cvi def pw 3072 mul ph 3072 mul scale/pw pw 32 mul
-def/ph ph 32 mul def/px 0 def/py 0 def pw ph pi[pw 0 0 ph 0 0]{pa py get/px
-px 32 add def px pw ge{/px 0 def/py py 1 add 8 mod def}if}pi
-type/booleantype eq{imagemask}{image}ifelse}if restore}def/PS{/_op exch
-def/_np 8 string def 0 1 7{/_ii exch def/num _op _ii get def _np 7 _ii sub
-num -4 bitshift PX num 15 and 4 bitshift -4 bitshift PX 4 bitshift or
-put}for _np}def/PX{[15 7 11 3 13 5 9 1 14 6 10 2 12 4 8 0]exch
-get}def/FR{0.7200 0 $E defaultmatrix dtransform/yres exch def/xres exch def
-xres dup mul yres dup mul add sqrt}def/SU{/_sf exch def/_sa exch def/_cs
-exch def/_mm $C currentmatrix def/rm _sa $R rotate def/sm _cs dup $L scale
-def sm rm _mm _mm concatmatrix _mm concatmatrix pop 1 0 _mm dtransform/y1
-exch def/x1 exch def/_vl x1 dup mul y1 dup mul add sqrt def/_fq FR _vl div
-def/_na y1 x1 atan def _mm 2 get _mm 1 get mul _mm 0 get _mm 3 get mul sub
-0 gt{{neg}/_sf load concatprocs/_sf exch def}if _fq _na/_sf load
-setscreen}def/BO{/_yb exch def/_xb exch def/_bv _bs _yb _bw mul _xb 8 idiv
-add get def/_mk 1 7 _xb 8 mod sub bitshift def _bv _mk and 0 ne $I 1 eq
-xor}def/BF{DEC_WRITE_dict begin/_yy exch def/_xx exch def/_xi _xx 1 add 2
-div _bp mul cvi def/_yi _yy 1 add 2 div _bp mul cvi def _xi _yi BO{/_nb _nb
-1 add def 1}{/_fb _fb 1 add def 0}ifelse end}def/setpattern{/_cz exch
-def/_bw exch def/_bp exch def/_bs exch PS def/_nb 0 def/_fb 0 def _cz 0/BF
-load SU{}settransfer _fb _fb _nb add div setgray/$S 1
-def}def/invertpattern{$S 0 eq{{1 exch sub}currenttransfer concatprocs
-settransfer}if}def/invertscreen{/$I 1 def/$S 0 def}def/revertscreen{/$I 0
-def}def/setrect{/$h exch def/$w exch def/$y exch def/$x exch def newpath $x
-$y moveto $w $x add $y lineto $w $x add $h $y add lineto $x $h $y add
-lineto closepath}def/concatprocs{/_p2 exch cvlit def/_p1 exch cvlit def/_pn
-_p1 length _p2 length add array def _pn 0 _p1 putinterval _pn _p1 length
-_p2 putinterval _pn cvx}def/OF/findfont load def/findfont{dup
-DEC_WRITE_dict exch known{DEC_WRITE_dict exch get}if DEC_WRITE_dict/OF get
-exec}def
-mark/ISOLatin1Encoding 
-8#000 1 8#001{StandardEncoding exch get}for /emdash/endash
-8#004 1 8#025{StandardEncoding exch get}for /quotedblleft/quotedblright
-8#030 1 8#054{StandardEncoding exch get}for /minus 8#056 1 8#217
-{StandardEncoding exch get}for/dotlessi 8#301 1 8#317{StandardEncoding 
-exch get}for/space/exclamdown/cent/sterling/currency/yen/brokenbar/section
-/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/hyphen/registered
-/macron/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph
-/periodcentered/cedilla/onesuperior/ordmasculine/guillemotright/onequarter
-/onehalf/threequarters/questiondown/Agrave/Aacute/Acircumflex/Atilde
-/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave
-/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde
-/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn
-/germandbls/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla
-/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis
-/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide/oslash/ugrave
-/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis
-256 array astore def cleartomark 
-/encodefont{findfont dup maxlength dict begin{1 index/FID ne{def}{pop
-pop}ifelse}forall/Encoding exch def dup/FontName exch def currentdict
-definefont end}def/loads{/$/ISOLatin1Encoding load def/&/encodefont load
-def/*/invertpattern load def/+/revertscreen load def/-/invertscreen load
-def/:/concatprocs load def/^/setpattern load def/~/pat1 load def/_/pat2
-load def/@/setrect load def/A/arcn load def/B/ashow load def/C/curveto load
-def/D/def load def/E/eofill load def/F/findfont load def/G/setgray load
-def/H/closepath load def/I/clip load def/J/fill load def/K/kshow load
-def/L/lineto load def/M/moveto load def/N/newpath load def/O/rotate load
-def/P/pop load def/R/grestore load def/S/gsave load def/T/translate load
-def/U/sub load def/V/div load def/W/widthshow load def/X/exch load
-def/Y/awidthshow load def/a/save load def/c/setlinecap load def/d/setdash
-load def/e/restore load def/f/setfont load def/g/initclip load def/h/show
-load def/i/setmiterlimit load def/j/setlinejoin load def/k/stroke load
-def/l/rlineto load def/m/rmoveto load def/n/currentfont load
-def/o/scalefont load def/p/currentpoint load def/q/setrgbcolor load
-def/r/currenttransfer load def/s/scale load def/t/setmatrix load
-def/u/settransfer load def/w/setlinewidth load def/x/matrix load
-def/y/currentmatrix load def}def
-end
-%%EndProcSet
-%%EndProlog
-
-%%BeginSetup
-DEC_WRITE_dict begin
-loads
-version cvi 23.0 gt {
-currentdict {dup type /arraytype eq
-{bind def} {pop pop} ifelse} forall} if
-0.0100 0.0100 s
-
-%%EndSetup
-%%Page: 1 1
-/$P a D
-g N
-0 84189 T
-7087 -79802 T
-N
-312 -1212 M
--7087 79802 T
-
-7087 -1169 T
-N
-312 -1212 M
--7087 1169 T
-
-7087 -5669 T
-N
-312 -1212 M
-312 -12072 M
--7087 5669 T
-N
-S
-7087 -16800 14877 9419 @ I N
-7087 -7381 T
-N
-N
-3855 -2089 M
-3855 -5168 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-4021 -1834 M
-6176 -1834 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-6344 -2088 M
-6344 -4034 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-5337 -4410 M
-5337 -5164 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-4060 -5343 M
-5185 -5342 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-5526 -4199 M
-6174 -4199 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-4960 -3016 M
-5569 -3016 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-4077 -2057 T
-217 229 s
-0 0 1 -191 -259 A
-ctm_cached t
-N
-/ctm_cached x y D
-4077 -2057 T
-217 229 s
-0 0 1 -191 -259 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-S
-N
-/ctm_cached x y D
-4125 -5053 T
-273 293 s
-0 0 1 -101 -169 A
-ctm_cached t
-N
-/ctm_cached x y D
-4125 -5053 T
-273 293 s
-0 0 1 -101 -169 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-S
-N
-/ctm_cached x y D
-5087 -5079 T
-254 271 s
-0 0 1 -11 -79 A
-ctm_cached t
-N
-/ctm_cached x y D
-5087 -5079 T
-254 271 s
-0 0 1 -11 -79 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-S
-N
-/ctm_cached x y D
-5587 -4417 T
-261 230 s
-0 0 1 -191 -259 A
-ctm_cached t
-N
-/ctm_cached x y D
-5587 -4417 T
-261 230 s
-0 0 1 -191 -259 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-S
-N
-/ctm_cached x y D
-6114 -3986 T
-229 213 s
-0 0 1 -11 -79 A
-ctm_cached t
-N
-/ctm_cached x y D
-6114 -3986 T
-229 213 s
-0 0 1 -11 -79 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-S
-N
-/ctm_cached x y D
-6090 -2152 T
-263 328 s
-0 0 1 79 11 A
-ctm_cached t
-N
-/ctm_cached x y D
-6090 -2152 T
-263 328 s
-0 0 1 79 11 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-6361 -4355 M
-6357 -5209 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-6573 -1846 M
-8675 -1846 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-8871 -2060 M
-8871 -2877 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-8872 -3309 M
-8872 -5208 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-6615 -5378 M
-8693 -5378 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-7270 -3041 M
-8693 -3041 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-6659 -2136 T
-317 298 s
-0 0 1 -191 -259 A
-ctm_cached t
-N
-/ctm_cached x y D
-6659 -2136 T
-317 298 s
-0 0 1 -191 -259 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-S
-N
-/ctm_cached x y D
-6686 -5127 T
-334 262 s
-0 0 1 -101 -169 A
-ctm_cached t
-N
-/ctm_cached x y D
-6686 -5127 T
-334 262 s
-0 0 1 -101 -169 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-S
-N
-/ctm_cached x y D
-8573 -5134 T
-307 249 s
-0 0 1 -11 -79 A
-ctm_cached t
-N
-/ctm_cached x y D
-8573 -5134 T
-307 249 s
-0 0 1 -11 -79 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-S
-N
-/ctm_cached x y D
-8576 -2126 T
-297 288 s
-0 0 1 79 11 A
-ctm_cached t
-N
-/ctm_cached x y D
-8576 -2126 T
-297 288 s
-0 0 1 79 11 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-S
-N
-/ctm_cached x y D
-8626 -2813 T
-245 227 s
-0 0 1 -11 -79 A
-ctm_cached t
-N
-/ctm_cached x y D
-8626 -2813 T
-245 227 s
-0 0 1 -11 -79 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-S
-N
-/ctm_cached x y D
-8620 -3358 T
-255 323 s
-0 0 1 79 11 A
-ctm_cached t
-N
-/ctm_cached x y D
-8620 -3358 T
-255 323 s
-0 0 1 79 11 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-6540 -4199 M
-7966 -4199 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-6594 -4396 T
-239 202 s
-0 0 1 -191 -259 A
-ctm_cached t
-N
-/ctm_cached x y D
-6594 -4396 T
-239 202 s
-0 0 1 -191 -259 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-S
-N
-/ctm_cached x y D
-6615 -3952 T
-276 247 s
-0 0 1 -101 -169 A
-ctm_cached t
-N
-/ctm_cached x y D
-6615 -3952 T
-276 247 s
-0 0 1 -101 -169 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-S
-N
-/ctm_cached x y D
-9236 -2164 T
-367 313 s
-0 0 1 -191 -259 A
-ctm_cached t
-N
-/ctm_cached x y D
-9236 -2164 T
-367 313 s
-0 0 1 -191 -259 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-S
-N
-/ctm_cached x y D
-9163 -5091 T
-291 254 s
-0 0 1 -101 -169 A
-ctm_cached t
-N
-/ctm_cached x y D
-9163 -5091 T
-291 254 s
-0 0 1 -101 -169 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-9100 -5340 M
-10370 -5340 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-10571 -5155 M
-10571 -2157 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-10299 -5073 T
-279 271 s
-0 0 1 -11 -79 A
-ctm_cached t
-N
-/ctm_cached x y D
-10299 -5073 T
-279 271 s
-0 0 1 -11 -79 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-9154 -1858 M
-10427 -1858 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-8871 -2833 M
-8871 -3294 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-2124 -4538 1569 1658 @
-S
-0.75 G J
-R
-N
-
-10721 -4526 1569 1658 @
-S
-0.75 G J
-R
-N
-
-N
-6142 -4296 M
-6267 -4191 L
-6320 -4252 L
-6198 -4354 L
-H
-S
-0.75 G E
-R
-N
-
-N
-5604 -4321 M
-5475 -4391 L
-5475 -4485 L
-6253 -4485 L
-6253 -4374 L
-6173 -4317 L
-H
-S
-0.75 G E
-R
-N
-
-S
-N
-/ctm_cached x y D
-10350 -2201 T
-225 349 s
-0 0 1 79 11 A
-ctm_cached t
-N
-/ctm_cached x y D
-10350 -2201 T
-225 349 s
-0 0 1 79 11 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-R
-
-
-
-showpage
-$P e
-
-%%Trailer
-$D end restore
- % DEC_WRITE_dict
-%%Pages: 1
-%%DocumentFonts:
diff --git a/sinqhm/sinq_logo.ps b/sinqhm/sinq_logo.ps
deleted file mode 100755
index 90ba241c..00000000
--- a/sinqhm/sinq_logo.ps
+++ /dev/null
@@ -1,1385 +0,0 @@
-%!PS-Adobe-2.1
-%%Creator: DECwrite V3.0-2
-%%+Copyright (c) 1990,1994 DIGITAL EQUIPMENT CORPORATION.  
-%%+All Rights Reserved.
-%%DocumentFonts: (atend)
-%%EndComments
-%%BeginProcSet DEC_WRITE 1.10
-save/DEC_WRITE_dict 150 dict def DEC_WRITE_dict begin/$D exch def/$I 0
-def/$S 0 def/$C matrix def/$R matrix def/$L matrix def/$E matrix
-def/pat1{/px exch def/pa 8 array def 0 1 7{/py exch def/pw 4 string def 0 1
-3{pw exch px py 1 getinterval putinterval}for pa py pw put}for}def/pat2{/pi
-exch def/cflag exch def save cflag 1 eq{eoclip}{clip}ifelse
-newpath{clippath pathbbox}stopped not{/ph exch def/pw exch def/py exch
-def/px exch def/px px 3072 div floor 3072 mul def/py py 3072 div floor 3072
-mul def px py translate/pw pw px sub 3072 div floor 1 add cvi def/ph ph py
-sub 3072 div floor 1 add cvi def pw 3072 mul ph 3072 mul scale/pw pw 32 mul
-def/ph ph 32 mul def/px 0 def/py 0 def pw ph pi[pw 0 0 ph 0 0]{pa py get/px
-px 32 add def px pw ge{/px 0 def/py py 1 add 8 mod def}if}pi
-type/booleantype eq{imagemask}{image}ifelse}if restore}def/PS{/_op exch
-def/_np 8 string def 0 1 7{/_ii exch def/num _op _ii get def _np 7 _ii sub
-num -4 bitshift PX num 15 and 4 bitshift -4 bitshift PX 4 bitshift or
-put}for _np}def/PX{[15 7 11 3 13 5 9 1 14 6 10 2 12 4 8 0]exch
-get}def/FR{0.7200 0 $E defaultmatrix dtransform/yres exch def/xres exch def
-xres dup mul yres dup mul add sqrt}def/SU{/_sf exch def/_sa exch def/_cs
-exch def/_mm $C currentmatrix def/rm _sa $R rotate def/sm _cs dup $L scale
-def sm rm _mm _mm concatmatrix _mm concatmatrix pop 1 0 _mm dtransform/y1
-exch def/x1 exch def/_vl x1 dup mul y1 dup mul add sqrt def/_fq FR _vl div
-def/_na y1 x1 atan def _mm 2 get _mm 1 get mul _mm 0 get _mm 3 get mul sub
-0 gt{{neg}/_sf load concatprocs/_sf exch def}if _fq _na/_sf load
-setscreen}def/BO{/_yb exch def/_xb exch def/_bv _bs _yb _bw mul _xb 8 idiv
-add get def/_mk 1 7 _xb 8 mod sub bitshift def _bv _mk and 0 ne $I 1 eq
-xor}def/BF{DEC_WRITE_dict begin/_yy exch def/_xx exch def/_xi _xx 1 add 2
-div _bp mul cvi def/_yi _yy 1 add 2 div _bp mul cvi def _xi _yi BO{/_nb _nb
-1 add def 1}{/_fb _fb 1 add def 0}ifelse end}def/setpattern{/_cz exch
-def/_bw exch def/_bp exch def/_bs exch PS def/_nb 0 def/_fb 0 def _cz 0/BF
-load SU{}settransfer _fb _fb _nb add div setgray/$S 1
-def}def/invertpattern{$S 0 eq{{1 exch sub}currenttransfer concatprocs
-settransfer}if}def/invertscreen{/$I 1 def/$S 0 def}def/revertscreen{/$I 0
-def}def/setrect{/$h exch def/$w exch def/$y exch def/$x exch def newpath $x
-$y moveto $w $x add $y lineto $w $x add $h $y add lineto $x $h $y add
-lineto closepath}def/concatprocs{/_p2 exch cvlit def/_p1 exch cvlit def/_pn
-_p1 length _p2 length add array def _pn 0 _p1 putinterval _pn _p1 length
-_p2 putinterval _pn cvx}def/OF/findfont load def/findfont{dup
-DEC_WRITE_dict exch known{DEC_WRITE_dict exch get}if DEC_WRITE_dict/OF get
-exec}def
-mark/ISOLatin1Encoding 
-8#000 1 8#001{StandardEncoding exch get}for /emdash/endash
-8#004 1 8#025{StandardEncoding exch get}for /quotedblleft/quotedblright
-8#030 1 8#054{StandardEncoding exch get}for /minus 8#056 1 8#217
-{StandardEncoding exch get}for/dotlessi 8#301 1 8#317{StandardEncoding 
-exch get}for/space/exclamdown/cent/sterling/currency/yen/brokenbar/section
-/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/hyphen/registered
-/macron/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph
-/periodcentered/cedilla/onesuperior/ordmasculine/guillemotright/onequarter
-/onehalf/threequarters/questiondown/Agrave/Aacute/Acircumflex/Atilde
-/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave
-/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde
-/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn
-/germandbls/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla
-/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis
-/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide/oslash/ugrave
-/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis
-256 array astore def cleartomark 
-/encodefont{findfont dup maxlength dict begin{1 index/FID ne{def}{pop
-pop}ifelse}forall/Encoding exch def dup/FontName exch def currentdict
-definefont end}def/loads{/$/ISOLatin1Encoding load def/&/encodefont load
-def/*/invertpattern load def/+/revertscreen load def/-/invertscreen load
-def/:/concatprocs load def/^/setpattern load def/~/pat1 load def/_/pat2
-load def/@/setrect load def/A/arcn load def/B/ashow load def/C/curveto load
-def/D/def load def/E/eofill load def/F/findfont load def/G/setgray load
-def/H/closepath load def/I/clip load def/J/fill load def/K/kshow load
-def/L/lineto load def/M/moveto load def/N/newpath load def/O/rotate load
-def/P/pop load def/R/grestore load def/S/gsave load def/T/translate load
-def/U/sub load def/V/div load def/W/widthshow load def/X/exch load
-def/Y/awidthshow load def/a/save load def/c/setlinecap load def/d/setdash
-load def/e/restore load def/f/setfont load def/g/initclip load def/h/show
-load def/i/setmiterlimit load def/j/setlinejoin load def/k/stroke load
-def/l/rlineto load def/m/rmoveto load def/n/currentfont load
-def/o/scalefont load def/p/currentpoint load def/q/setrgbcolor load
-def/r/currenttransfer load def/s/scale load def/t/setmatrix load
-def/u/settransfer load def/w/setlinewidth load def/x/matrix load
-def/y/currentmatrix load def}def
-end
-%%EndProcSet
-%%EndProlog
-
-%%BeginSetup
-DEC_WRITE_dict begin
-loads
-version cvi 23.0 gt {
-currentdict {dup type /arraytype eq
-{bind def} {pop pop} ifelse} forall} if
-0.0100 0.0100 s
-
-%%EndSetup
-%%Page: 1 1
-/$P a D
-g N
-0 84189 T
-7087 -79802 T
-N
-312 -1212 M
--7087 79802 T
-
-7087 -1169 T
-N
-312 -1212 M
--7087 1169 T
-
-7087 -5669 T
-N
-312 -1212 M
-312 -18448 M
--7087 5669 T
-N
-S
-7087 -23176 21253 15795 @ I N
-7087 -7381 T
-N
-S
-N
-/ctm_cached x y D
-4572 -3448 T
-200 201 s
-0 0 1 -179 -271 A
-ctm_cached t
-N
-/ctm_cached x y D
-4572 -3448 T
-200 201 s
-0 0 1 -179 -271 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-
-N
-4577 -3247 M
-4986 -3247 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-4372 -3451 M
-4372 -3860 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-4579 -5974 T
-207 204 s
-0 0 1 -91 -180 A
-ctm_cached t
-N
-/ctm_cached x y D
-4579 -5974 T
-207 204 s
-0 0 1 -91 -180 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-4577 -6178 M
-4986 -6178 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-4372 -5566 M
-4372 -5975 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-4572 -5411 T
-200 200 s
-0 0 1 -179 -271 A
-ctm_cached t
-N
-/ctm_cached x y D
-4572 -5411 T
-200 200 s
-0 0 1 -179 -271 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-4577 -5211 M
-4986 -5211 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-4372 -5414 M
-4372 -5824 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-4579 -5007 T
-207 204 s
-0 0 1 -91 -180 A
-ctm_cached t
-N
-/ctm_cached x y D
-4579 -5007 T
-207 204 s
-0 0 1 -91 -180 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-4577 -5211 M
-4986 -5211 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-4372 -4598 M
-4372 -5006 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-4628 -5211 M
-5658 -5211 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-4372 -3599 M
-4372 -4862 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-4667 -6178 M
-6167 -6178 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-5053 -4228 M
-6081 -4228 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-4667 -3247 M
-6167 -3247 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-6202 -3454 T
-204 207 s
-0 0 1 90 1 A
-ctm_cached t
-N
-/ctm_cached x y D
-6202 -3454 T
-204 207 s
-0 0 1 90 1 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-6407 -3451 M
-6407 -3860 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-5793 -3247 M
-6202 -3247 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-6191 -5973 T
-215 205 s
-0 0 1 0 -87 A
-ctm_cached t
-N
-/ctm_cached x y D
-6191 -5973 T
-215 205 s
-0 0 1 0 -87 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-5793 -6178 M
-6202 -6178 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-6407 -5565 M
-6407 -5974 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-6191 -4024 T
-215 205 s
-0 0 1 0 -87 A
-ctm_cached t
-N
-/ctm_cached x y D
-6191 -4024 T
-215 205 s
-0 0 1 0 -87 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-5793 -4228 M
-6202 -4228 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-6407 -3616 M
-6407 -4025 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-6202 -4436 T
-204 208 s
-0 0 1 90 1 A
-ctm_cached t
-N
-/ctm_cached x y D
-6202 -4436 T
-204 208 s
-0 0 1 90 1 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-6407 -4433 M
-6407 -4842 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-5793 -4228 M
-6202 -4228 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-6407 -4557 M
-6407 -5821 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-6407 -5795 M
-6407 -3631 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-7195 -5795 M
-7195 -3631 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-6607 -3448 T
-200 201 s
-0 0 1 -179 -271 A
-ctm_cached t
-N
-/ctm_cached x y D
-6607 -3448 T
-200 201 s
-0 0 1 -179 -271 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-6612 -3247 M
-7021 -3247 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-6407 -3451 M
-6407 -3860 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-6991 -3454 T
-205 207 s
-0 0 1 90 1 A
-ctm_cached t
-N
-/ctm_cached x y D
-6991 -3454 T
-205 207 s
-0 0 1 90 1 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-7195 -3451 M
-7195 -3860 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-6582 -3247 M
-6991 -3247 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-6979 -5973 T
-216 205 s
-0 0 1 0 -87 A
-ctm_cached t
-N
-/ctm_cached x y D
-6979 -5973 T
-216 205 s
-0 0 1 0 -87 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-S
-N
-/ctm_cached x y D
-6615 -5974 T
-208 204 s
-0 0 1 -91 -180 A
-ctm_cached t
-N
-/ctm_cached x y D
-6615 -5974 T
-208 204 s
-0 0 1 -91 -180 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-6582 -6178 M
-6991 -6178 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-7195 -5565 M
-7195 -5974 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-6612 -6178 M
-7021 -6178 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-6407 -5566 M
-6407 -5975 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-7395 -3448 T
-200 201 s
-0 0 1 -179 -271 A
-ctm_cached t
-N
-/ctm_cached x y D
-7395 -3448 T
-200 201 s
-0 0 1 -179 -271 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-7399 -3247 M
-7808 -3247 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-7195 -3451 M
-7195 -3860 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-9576 -5795 M
-9576 -3631 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-9361 -5973 T
-215 205 s
-0 0 1 0 -87 A
-ctm_cached t
-N
-/ctm_cached x y D
-9361 -5973 T
-215 205 s
-0 0 1 0 -87 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-8964 -6178 M
-9374 -6178 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-9576 -5565 M
-9576 -5974 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-7195 -5795 M
-7195 -3631 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-7983 -5630 M
-7983 -4224 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-7768 -5973 T
-215 205 s
-0 0 1 0 -87 A
-ctm_cached t
-N
-/ctm_cached x y D
-7768 -5973 T
-215 205 s
-0 0 1 0 -87 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-S
-N
-/ctm_cached x y D
-7402 -5974 T
-207 204 s
-0 0 1 -91 -180 A
-ctm_cached t
-N
-/ctm_cached x y D
-7402 -5974 T
-207 204 s
-0 0 1 -91 -180 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-7369 -6178 M
-7780 -6178 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-7983 -5565 M
-7983 -5974 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-7399 -6178 M
-7808 -6178 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-7195 -5566 M
-7195 -5975 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-8190 -5974 T
-207 204 s
-0 0 1 -91 -180 A
-ctm_cached t
-N
-/ctm_cached x y D
-8190 -5974 T
-207 204 s
-0 0 1 -91 -180 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-8188 -6178 M
-8596 -6178 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-7983 -5566 M
-7983 -5975 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-8780 -5203 M
-8780 -3797 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-8575 -3454 T
-205 207 s
-0 0 1 90 1 A
-ctm_cached t
-N
-/ctm_cached x y D
-8575 -3454 T
-205 207 s
-0 0 1 90 1 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-8780 -3451 M
-8780 -3860 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-8167 -3247 M
-8576 -3247 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-8980 -3448 T
-200 201 s
-0 0 1 -179 -271 A
-ctm_cached t
-N
-/ctm_cached x y D
-8980 -3448 T
-200 201 s
-0 0 1 -179 -271 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-8983 -3247 M
-9393 -3247 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-8780 -3451 M
-8780 -3860 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-7470 -3247 M
-8497 -3247 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-8267 -6178 M
-9294 -6178 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-9373 -3454 T
-204 207 s
-0 0 1 90 1 A
-ctm_cached t
-N
-/ctm_cached x y D
-9373 -3454 T
-204 207 s
-0 0 1 90 1 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-9576 -3451 M
-9576 -3860 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-8964 -3247 M
-9374 -3247 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-9777 -3448 T
-201 201 s
-0 0 1 -179 -271 A
-ctm_cached t
-N
-/ctm_cached x y D
-9777 -3448 T
-201 201 s
-0 0 1 -179 -271 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-
-N
-9782 -3247 M
-10190 -3247 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-9576 -3451 M
-9576 -3860 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-9576 -5795 M
-9576 -3631 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-9784 -5974 T
-208 204 s
-0 0 1 -91 -180 A
-ctm_cached t
-N
-/ctm_cached x y D
-9784 -5974 T
-208 204 s
-0 0 1 -91 -180 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-9782 -6178 M
-10190 -6178 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-9852 -3247 M
-10880 -3247 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-9576 -5566 M
-9576 -5975 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-9852 -6178 M
-10880 -6178 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-11098 -3454 T
-204 207 s
-0 0 1 90 1 A
-ctm_cached t
-N
-/ctm_cached x y D
-11098 -3454 T
-204 207 s
-0 0 1 90 1 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-11302 -3451 M
-11302 -3860 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-10689 -3247 M
-11098 -3247 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-S
-N
-/ctm_cached x y D
-11087 -5973 T
-215 205 s
-0 0 1 0 -87 A
-ctm_cached t
-N
-/ctm_cached x y D
-11087 -5973 T
-215 205 s
-0 0 1 0 -87 A
-ctm_cached t
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-R
-
-N
-10689 -6178 M
-11098 -6178 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-11302 -5565 M
-11302 -5974 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-11302 -5795 M
-11302 -3631 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-10256 -5422 368 1426 @
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-N
-10982 -6175 M
-10982 -5831 L
-11201 -5831 L
-11201 -6147 L
-S
-200 w
-0 c
-0 j
-0.00 G k
-R
-N
-
-R
-
-
-
-showpage
-$P e
-
-%%Trailer
-$D end restore
- % DEC_WRITE_dict
-%%Pages: 1
-%%DocumentFonts:
diff --git a/sinqhm/sinqhm_bootutil_client.c b/sinqhm/sinqhm_bootutil_client.c
deleted file mode 100755
index bdb4cede..00000000
--- a/sinqhm/sinqhm_bootutil_client.c
+++ /dev/null
@@ -1,1311 +0,0 @@
-#define	    IDENT	"1A01"
-/*---------------------------------------------------------------------------*/
-#ifdef __DECC
-#pragma	    module	    SINQHM_BOOTUTIL_CLIENT	    IDENT
-#endif
-/*
-** Link_options - Here is the Linker Option File
-**!	sinqhm_bootutil_client
-**!	tas_src:[lib]sinq_dbg/lib
-**!	sys$share:decw$xlibshr/share
-**!!
-**!!	    To build SINQHM_BOOTUTIL_CLIENT on LNSA09
-**!!
-**!!	$ import tasmad
-**!!	$ define/job deltat_c_tlb sinq_c_tlb
-**!!	$ sss := tas_src:[sinqhm]
-**!!	$ bui 'sss'sinqhm_bootutil_client debug
-** Link_options_end
-**
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     Computing Section                        |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...SINQHM]SINQHM_BOOTUTIL_CLIENT.C
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Aug 1999
-**
-**  SINQHM_BOOTUTIL_CLIENT is the main program of an Internet Client which
-**  communicates with SINQHM_BOOTUTIL running on a SINQ Histogram Memory.
-**  It allows the user to inspect and modify the boot parameters of the
-**  histogram memory.
-**
-** Updates:
-**  27-Aug-1999 1A01 DM.    Initial version.
-**
-**    The following logical name definitions are used ...
-**
-**	SINQHM_FRONTEND -
-**	    "<hostname>, -  The host where SINQHM_BOOTUTIL is running.
-**	     <port>"        TCP/IP port number of SINQHM_BOOTUTIL (dflt = 2300).
-**====================================================================
-*/
-
-#include    <errno.h>
-#include    <netdb.h>
-#include    <stdio.h>
-#include    <stdlib.h>
-#include    <signal.h>
-#include    <time.h>
-
-#include    <netinet/in.h>
-
-#include    <sys/types.h>
-#include    <ctype.h>
-#include    <arpa/inet.h>
-#include    <math.h>
-#include    <sys/socket.h>
-#include    <string.h>
-#include    <X11/Intrinsic.h>
-
-#ifdef	__VMS
-#include    <ucx$inetdef.h>
-#include    <sys/unixio.h>
-#include    <descrip>
-#else
-#include    <unistd.h>
-#endif
-
-#ifdef __VMS
-#include    <sys/ssdef.h>
-#include    <sys/starlet.h>
-#else
-#define	    SS$_NORMAL	    EXIT_SUCCESS
-#define	    SS$_BADPARAM    EXIT_FAILURE
-#define	    SS$_IVBUFLEN    EXIT_FAILURE
-#define	    NO_MEMORY	    4
-#endif
-/*
-**====================	Global Definitions =====================================
-*/
-#include    <sinq_prototypes.h>
-
-#define	    DFLT_PORT	2300
-#define	    NIL		'\0'
-#define	    NL		'\n'
-#define	    MAXARR	8192
-#define	    MAXREC	 512
-/*------------------------------------------------------------*/
-	    /*
-	    **			Define the Data Structures we need
-	    */
-/*
-**====================	Global Variables ======================================
-*/
-  int			    My_errno, My_vaxc_errno;
-
-  int		Verbose;
-  int		Rmt_port;
-  char		Rmt_host[32];
-  static int	Cnct_skt = 0;	    /* Connect socket */
-  static int	Ctrl_C_has_happened;
-
-  static XrmOptionDescRec OpTable_0[] = {
-      {"-name",	    ".name",		XrmoptionSepArg, (XPointer) NULL},
-      {"-h",	    ".butilHelp",	XrmoptionNoArg,	 (XPointer) "1"},
-      {"-he",	    ".butilHelp",	XrmoptionNoArg,	 (XPointer) "1"},
-      {"-hel",	    ".butilHelp",	XrmoptionNoArg,	 (XPointer) "1"},
-      {"-help",	    ".butilHelp",	XrmoptionNoArg,	 (XPointer) "1"},
-      {"-ho",	    ".butilHost",	XrmoptionSepArg, (XPointer) NULL},
-      {"-hos",	    ".butilHost",	XrmoptionSepArg, (XPointer) NULL},
-      {"-host",	    ".butilHost",	XrmoptionSepArg, (XPointer) NULL},
-      {"-port",	    ".butilPort",	XrmoptionSepArg, (XPointer) NULL},
-      {"-v",	    ".butilVerbose",	XrmoptionNoArg,	 (XPointer) "1"},
-      {"-?",	    ".butilHelpItem",	XrmoptionSepArg, (XPointer) NULL},
-    };
-/*
-**=============================================================================
-**  Local routines.
-**
-**  CtrlC_Handler	: Catch a Ctrl-C interrupt.
-**  do_config		: Handle the CONFIG  command
-**  do_reboot		: Handle the REBOOT  command
-**  do_rundown		: Handle the RUNDOWN command
-**  exit_handler	: Exit handler in case a forced exit is made.
-**  get_SINQHM_FRONTEND	: Extract info from SINQHM_FRONTEND environment variable
-**  openConnection	: Open connection to server.
-**  show_help		: Display the help text.
-**----------------------------------------------------------------------------
-**							    Prototypes
-*/
-  void	    CtrlC_Handler (int sigint);
-  int	    do_config (char *bootline);
-  int	    do_reboot ();
-  int	    do_rundown ();
-  void	    exit_handler ();
-  int	    get_check_resources (XrmDatabase *db,
-				 char	     *appName,
-				 int	     verbose);
-  void	    get_SINQHM_FRONTEND (char *host, int host_l, char *host_dflt,
-				 int  *port,		 int   port_dflt,
-				 int  *pktlen,		 int   pktlen_dflt);
-  int	    openConnection (char *host, int port);
-  int	    read_boot_line (int skt, char *recd, int s_recd);
-  int	    send_a_close (int skt);
-  int	    setup_xrm_database (XrmDatabase	*db,
-				char		*name[],
-				int		*argc,
-				char		*argv[],
-				int		verbose);
-  int	    show_boot_line (char *bootline);
-  void	    show_help (char *token);
-/*
-**--------------------------------------------------------------------------
-**		CtrlC_Handler:  Signal handler to detect <Ctrl-C> on keyboard.
-*/
-  void	CtrlC_Handler (int sigint) {
-/*      =============
-*/
-    Ctrl_C_has_happened = 1;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int	do_config (
-/*	=========
-**			    Interact with user to get modified config data.
-**			    Then send CONFIG command to the target.
-*/
-		char    *bootline) {	/* The current boot-line */
-
-#define	    MAXP    32
-
-    char    my_bootline[1024], old_bootline[1024];
-    char    buff[132], *tok, *nxttok, *body;
-    char    prefix[MAXP][64];
-    char    prompt[MAXP][64];
-    char    bodies[MAXP][128];
-    int	    is_numeric[MAXP], is_hex[MAXP];
-    int	    i, j, k, status, n_toks, toklen, bootlen;
-
-    StrJoin (my_bootline, sizeof (my_bootline), bootline, "");
-    for (i = 0; i < MAXP; i++) is_numeric[i] = is_hex[i] = False;
-		    /*
-		    ** Scan through the boot-line setting up a table of prompts
-		    */
-    n_toks = 0;
-    tok = strtok (my_bootline, ":\n");
-    while ((tok != NULL) && (n_toks < MAXP)) {
-      StrJoin (prefix[n_toks], sizeof (prefix[0]), tok, ":");
-      toklen = strlen (tok);
-      if (tok[toklen+1] == '\n') {	/* Watch out for tokens with no body */
-	body = "";
-	bodies[n_toks][0] = NIL;
-	nxttok = strtok (NULL, ":\n");	/* Skip an empty body */
-      }else {
-	body = strtok (NULL, "\n");
-	if (body == NULL) body = "";
-	StrJoin (bodies[n_toks], sizeof (bodies[0]), body, "");
-	nxttok = strtok (NULL, ":");
-      }
-      if ((strcmp (tok, "bootDev") == 0) && (body != NULL)) {
-	strcpy (prompt[n_toks], "boot device          : ");
-      }else if ((strcmp (tok, "procNum") == 0) && (body != NULL)) {
-	strcpy (prompt[n_toks], "processor number     : ");
-	is_numeric[n_toks] = True;
-	status = sscanf (body, "%i%n", &i, &j);
-	if ((status != 1) || (j != strlen (body))) {
-	  printf ("do_config: Bad value found for procNum: \"%s\"\n", body);
-	  return False;
-	}
-      }else if ((strcmp (tok, "hostName") == 0) && (body != NULL)) {
-	strcpy (prompt[n_toks], "host name            : ");
-      }else if ((strcmp (tok, "bootFile") == 0) && (body != NULL)) {
-	strcpy (prompt[n_toks], "file name            : ");
-      }else if ((strcmp (tok, "ead") == 0) && (body != NULL)) {
-	strcpy (prompt[n_toks], "inet on ethernet (e) : ");
-      }else if ((strcmp (tok, "bad") == 0) && (body != NULL)) {
-	strcpy (prompt[n_toks], "inet on backplane (b): ");
-      }else if ((strcmp (tok, "had") == 0) && (body != NULL)) {
-	strcpy (prompt[n_toks], "host inet (h)        : ");
-      }else if ((strcmp (tok, "gad") == 0) && (body != NULL)) {
-	strcpy (prompt[n_toks], "gateway inet (g)     : ");
-      }else if ((strcmp (tok, "usr") == 0) && (body != NULL)) {
-	strcpy (prompt[n_toks], "user (u)             : ");
-      }else if ((strcmp (tok, "passwd") == 0) && (body != NULL)) {
-	strcpy (prompt[n_toks], "ftp password (pw)    : ");
-      }else if ((strcmp (tok, "flags") == 0) && (body != NULL)) {
-	strcpy (prompt[n_toks], "flags (f)            : ");
-	is_numeric[n_toks] = True;
-	is_hex[n_toks] = True;
-	status = sscanf (body, "%i%n", &i, &j);
-	if ((status != 1) || (j != strlen (body))) {
-	  printf ("do_config: Bad value found for flags: \"%s\"\n", body);
-	  return False;
-	}
-      }else if ((strcmp (tok, "targetName") == 0) && (body != NULL)) {
-	strcpy (prompt[n_toks], "target name (tn)     : ");
-      }else if ((strcmp (tok, "startupScript") == 0) && (body != NULL)) {
-	strcpy (prompt[n_toks], "startup script (s)   : ");
-      }else if ((strcmp (tok, "other") == 0) && (body != NULL)) {
-	strcpy (prompt[n_toks], "other (o)            : ");
-      }else {
-	printf ("do_config: Bad token found in boot-line: "
-			    "\"%s\" \"%s\"\n", tok, body);
-	return False;
-      }
-      n_toks++;
-      tok = nxttok;
-    }
-    if (tok != NULL) {
-      printf ("\007Too many tokens in the boot-line!\n");
-      return False;
-    }
-    if (n_toks <= 0) {
-      printf ("\007No tokens in the boot-line!\n");
-      return False;
-    }
-  re_edit:
-/*=======
-*/  printf ("\n'.' = clear field;  '-' = go to previous field;  ");
-#ifdef	__VMS
-    printf ("^Z = quit\n\n");
-#else
-    printf ("^D = quit\n\n");
-#endif
-    i = 0;
-    while (i < n_toks) {
-      printf ("%s%s ", prompt[i], bodies[i]);
-      if (fgets (buff, sizeof (buff), stdin) == NULL) break;
-      if (strlen (buff) == (sizeof (buff) - 1)) {
-	printf ("\n\007Input buffer overflow, try again!\n");
-	i--;
-	return False;
-      }
-      j = sizeof (buff); StrEdit (buff, buff, "trim compress", &j);
-      if (j == 0) {
-				/* Empty input -- leave the field unchanged */
-      }else if (StrMatch (buff, ".", 1)) {
-	bodies[i][0] = NIL;	/* "." -- clear the field */
-      }else if (StrMatch (buff, "-", 1)) {
-	i -= 2;			/* "-" -- go to previous field */
-	if (i < 0) i = -1;
-      }else if (j >= sizeof (bodies[0])) {
-	printf ("\007Input too long, try again!\n");
-	i--;
-      }else {
-	if (is_numeric[i]) {
-	  status = sscanf (buff, "%i%n", &k, &j);
-	  if ((status != 1) || (j != strlen (buff))) {
-	    printf ("\007Value must be an integer, \"%s\" is invalid. "
-			    "Try again!\n", buff);
-	    i--;
-	  }else {
-	    if (is_hex[i]) {
-	      sprintf (bodies[i], "0x%x", k);
-	    }else {
-	      sprintf (bodies[i], "%d", k);
-	    }
-	  }
-	}else {
-	  StrJoin (bodies[i], sizeof (bodies[0]), buff, "");
-	}
-      }
-      i++;
-    }
-
-    i = printf ("\n\nNew boot-line for %s is:\n", Rmt_host);
-    for (j = 3; j < i; j++) printf ("="); printf ("\n");
-    my_bootline[0] = NIL;
-    for (i = 0; i < n_toks; i++) {
-      if (bodies[i][0] != NIL) printf ("%s%s\n", prompt[i], bodies[i]);
-      StrJoin (my_bootline, sizeof (my_bootline), my_bootline, prefix[i]);
-      StrJoin (my_bootline, sizeof (my_bootline), my_bootline, bodies[i]);
-      StrJoin (my_bootline, sizeof (my_bootline), my_bootline, "\n");
-    }
-
-    printf ("\nType \"Yes\" to configure, ");
-#ifdef	__VMS
-    printf ("^Z");
-#else
-    printf ("^D");
-#endif
-    printf (" to abandon and anything else to re-edit: ");
-
-    if (fgets (buff, sizeof (buff), stdin) == NULL) return False;
-    if (strlen (buff) == (sizeof (buff) - 1)) {
-      printf ("\n\007Input buffer overflow, no config performed!\n");
-      return False;
-    }
-    i = sizeof (buff); StrEdit (buff, buff, "trim compress lowercase", &i);
-    if (!StrMatch (buff, "yes", 3)) goto re_edit;
-
-    Cnct_skt = openConnection (Rmt_host, Rmt_port);
-    read_boot_line (Cnct_skt, old_bootline, sizeof (old_bootline));
-
-    strcpy (buff, "CONFIG");
-    bootlen = strlen (my_bootline) + 1;	      /* Get string length */
-    bootlen = (bootlen + 3) & (~3);	      /* Round up to a multiple of 4 */
-    i = sprintf (&buff[8], "%04.4d", bootlen);  /* Convert to ASCII */
-    if (i != 4) {
-      printf ("\007The new boot line is too long! CONFIG has not "
-				"been performed.\n");
-      return False;
-    }
-    status = send (Cnct_skt, buff, 12, 0);
-    if (status != 12) FailInet ("do_config - bad send");
-    status = send (Cnct_skt, my_bootline, bootlen, 0);
-    if (status != bootlen) FailInet ("do_config - bad send");
-    status = recv (Cnct_skt, buff, 4, 0);	    /* Await the response */
-    close (Cnct_skt);
-    Cnct_skt = 0;
-    if (status != 4) {
-      FailInet ("do_config - bad recv");
-      return False;
-    }
-    if (!StrMatch (buff, "OK", 2)) {
-      printf ("\007Config command rejected by target!\n");
-      return False;
-    }
-    printf ("The boot-line of %s has been re-configured successfully.\n",
-			Rmt_host);
-    return True;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int	do_reboot (
-/*	=========
-**			    Send REBOOT command to the target.
-*/
-		) {
-
-    char    ist_bootline[1024], buff[128];
-    int	    i, status;
-
-    printf ("Type \"Yes\" to re-boot %s: ", Rmt_host);
-    if (fgets (buff, sizeof (buff), stdin) == NULL) exit (EXIT_FAILURE);
-    if (strlen (buff) == (sizeof (buff) - 1)) {
-      printf ("\n\007Input buffer overflow, no re-boot performed!\n");
-      exit (EXIT_FAILURE);
-    }
-    i = sizeof (buff); StrEdit (buff, buff, "trim compress lowercase", &i);
-    if (!StrMatch (buff, "yes", 3)) {
-      printf ("No re-boot performed!\n");
-      exit (EXIT_FAILURE);
-    }
-
-    Cnct_skt = openConnection (Rmt_host, Rmt_port);
-    read_boot_line (Cnct_skt, ist_bootline, sizeof (ist_bootline));
-
-    strcpy (buff, "REBOOT");
-    status = send (Cnct_skt, buff, 8, 0);
-    if (status != 8) FailInet ("do_reboot - bad send");
-
-    status = recv (Cnct_skt, buff, 4, 0);	    /* Await the response */
-    close (Cnct_skt);
-    Cnct_skt = 0;
-    if (status != 4) {
-      FailInet ("do_reboot - bad recv");
-      return False;
-    }
-    if (!StrMatch (buff, "OK", 2)) {
-      printf ("\007Reboot command rejected by target!\n");
-      return False;
-    }
-    printf ("%s is rebooting.\n", Rmt_host);
-    return True;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int	do_rundown (
-/*	==========
-**			    Send RUNDOWN command to the target.
-*/
-		) {
-
-    char    ist_bootline[1024], buff[128];
-    int	    i, status;
-
-    printf ("Type \"Yes\" to rundown bootUtil on %s: ", Rmt_host);
-    if (fgets (buff, sizeof (buff), stdin) == NULL) exit (EXIT_FAILURE);
-    if (strlen (buff) == (sizeof (buff) - 1)) {
-      printf ("\n\007Input buffer overflow, no rundown performed!\n");
-      exit (EXIT_FAILURE);
-    }
-    i = sizeof (buff); StrEdit (buff, buff, "trim compress lowercase", &i);
-    if (!StrMatch (buff, "yes", 3)) {
-      printf ("No rundown performed!\n");
-      exit (EXIT_FAILURE);
-    }
-
-    Cnct_skt = openConnection (Rmt_host, Rmt_port);
-    read_boot_line (Cnct_skt, ist_bootline, sizeof (ist_bootline));
-
-    strcpy (buff, "RUNDOWN");
-    status = send (Cnct_skt, buff, 8, 0);
-    if (status != 8) FailInet ("do_rundown - bad send");
-
-    status = recv (Cnct_skt, buff, 4, 0);	    /* Await the response */
-    close (Cnct_skt);
-    Cnct_skt = 0;
-    if (status != 4) {
-      FailInet ("do_rundown - bad recv");
-      return False;
-    }
-    if (!StrMatch (buff, "OK", 2)) {
-      printf ("\007Rundown command rejected by target!\n");
-      return False;
-    }
-    printf ("The bootUtil server on %s is running down.\n", Rmt_host);
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------*/
-  void exit_handler () {
-/*     ============
-**                  We must exit. Tidy up first.
-**		    Close TCP/IP link to front-end.
-*/
-    int	    status;
-    char    buff[16];
-/*
-**			Tell server we're quitting.
-*/
-    if (Cnct_skt != 0) {
-      printf ("Closing connection to %s ...\n", Rmt_host);
-      status = send (Cnct_skt, "-001", 4, 0);
-      status = close (Cnct_skt);
-      Cnct_skt = 0;
-      if (status != 0) FailInet ("EXIT_HANDLER -- R/W-Socket close error\n");
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void	flushNet (
-/*	========
-**			    Flush bytes from the server.
-**
-*/		int	nbytes) {	/* Number of bytes to flush */
-
-    char    buff[256];
-    int	    i, status, bytes_to_come, bytes_to_get;
-
-    bytes_to_come = nbytes;
-
-    while (bytes_to_come > 0) {
-      bytes_to_get = (bytes_to_come > sizeof (buff)) ?
-			sizeof (buff) : bytes_to_get;
-      status = recv (Cnct_skt, buff, bytes_to_get, 0);
-      if (status <= 0) break;
-      bytes_to_come -= status;
-    }
-    if (bytes_to_come != 0) {
-      if (status < 0) {
-	FailInet ("R/W-Socket recv error in flushNet");
-      }else if (status == 0) {
-	FailInet ("R/W-Socket recv error in flushNet -- return code = 0");
-      }
-      exit (EXIT_FAILURE);
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**			get_check_resources - get and check our resources
-*/
-  int	get_check_resources (
-/*	===================
-*/			    XrmDatabase	*db,
-			    char	*appName,
-			    int		verbose) {
-
-    int			status, len, do_help;
-    char		buff[80];
-    char		*type;
-    XrmValue		value;
-    time_t		time_now;
-    float		tmp_secs;
-/*----------------------------------------------------------	-help	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".butilHelp"),
-			     "ProgramName.Values",
-			     &type, &value);
-    do_help = (status) ? True : False;
-    if (do_help) {
-      show_help (NULL);
-      exit (EXIT_SUCCESS);
-    }
-/*----------------------------------------------------------	-?	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".butilHelpItem"),
-			     "ProgramName.Values",
-			     &type, &value);
-    do_help = (status) ? True : False;
-    if (do_help) {
-      len = sizeof (buff);
-      StrEdit (buff, value.addr, "trim lowercase", &len);
-      show_help (buff);
-      exit (EXIT_SUCCESS);
-    }
-/*----------------------------------------------------------	-verbose */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".butilVerbose"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Verbose = verbose = (status) ? True : False;
-/*----------------------------------------------------------	-host	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".butilHost"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      Rmt_host[0] = NIL;
-    }else {
-      StrJoin (Rmt_host, sizeof (Rmt_host), value.addr, "");
-      if (verbose) printf ("Target processor is \"%s\".\n", Rmt_host);
-    }
-/*----------------------------------------------------------	-port	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".butilPort"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%d", &Rmt_port) != 1)) {
-      Rmt_port = DFLT_PORT;
-      if (verbose) printf ("Using the default TCP/IP port number of ");
-    }else {
-      if (verbose) printf ("TCP/IP  port  number = ");
-    }
-    if (verbose) printf ("%d\n", Rmt_port);
-/*----------------------------------------------------------*/
-    return True;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void get_SINQHM_FRONTEND (
-/*     ===================
-**			    Extract info from the SINQHM_FRONTEND
-**			    environment variable.
-*/
-		char	 *host, int host_l, char *host_dflt,
-		int	 *port,		    int	  port_dflt,
-		int	 *pktlen,	    int	  pktlen_dflt) {
-
-    int	  env_len;
-    char *p_env, *token;
-    char  my_env[100];
-
-    p_env = getenv ("SINQHM_FRONTEND");    /* Get pointer to env var */
-    if (p_env == NULL) {
-			    /* Env. var. not found, prompt the user ... */
-      printf ("\n"
-	    " The name of the Histogram Memory is defined neither as part of "
-							"the command,\n"
-	    " nor via the environment variable SINQHM_FRONTEND nor in the "
-							"resource data\n"
-	    " base. You must therefore specify the details of the Hist Mem "
-							"interactively.\n"
-	    "\n"
-	    " Please specify the following on a single line:\n");
-      if ((host_dflt == NULL) || (host_dflt[0] == NIL)) {
-	printf ("\n"
-	    "    Name of Histogram Memory (no default)\n"
-	    "    TCP/IP port number of HM server (default = %d)\n"
-	    "    Max send/rcve packet size (default = %d)\n",
-	    port_dflt, pktlen_dflt);
-      }else {
-	printf ("\n"
-	    "    Name of Histogram Memory (default = \"%s\")\n"
-	    "    TCP/IP port number of HM server (default = %d)\n"
-	    "    Max send/rcve packet size (default = %d)\n",
-	    host_dflt, port_dflt, pktlen_dflt);
-      }
-      printf ("\n"
-	    "Specify Hist Mem information> ");
-      if (fgets (my_env, sizeof (my_env), stdin) == NULL) exit (EXIT_SUCCESS);
-      env_len = strlen (my_env);
-      if (my_env[env_len-1] != '\n') {
-        printf ("Name is too long!\n");
-	exit (EXIT_FAILURE);
-      }
-      env_len = sizeof (my_env);
-      StrEdit (my_env, my_env, "uncomment compress trim", &env_len);
-    }else {	    /* Make a local copy of it in case the original is in ..
-		    ** .. read-protected memory (strtok needs to be able to ..
-		    ** .. modify it */
-      env_len = sizeof (my_env);
-      StrEdit (my_env, p_env, "uncomment compress trim", &env_len);
-    }
-    token = (env_len == 0) ? NULL : strtok (my_env, " \t\n,"); /* Get host token */
-    if ((token == NULL) || (token[0] == ' ')) {
-			    /* Host token not found, return defaults */
-      StrJoin (host, host_l, host_dflt, "");
-      *port	= port_dflt;
-      *pktlen	= pktlen_dflt;
-    }else {
-      StrJoin (host, host_l, token, "");
-      token = strtok (NULL, " \t\n,");	/* Get port token */
-      if (token == NULL) {
-	  *port   = port_dflt;	/* Port token not found, return defaults */
-	  *pktlen = pktlen_dflt;
-      }else {
-	if (sscanf (token, "%d", port) != 1) {
-	  *port   = port_dflt;    /* Port token illegal, return defaults */
-	  *pktlen = pktlen_dflt;
-	}else {
-	  token = strtok (NULL, " \t,");    /* Get packet-size token */
-	  if (token == NULL) {
-	    *pktlen = pktlen_dflt; /* Packet-size token not found, use dflt */
-	  }else {
-	    if (sscanf (token, "%d", pktlen) != 1) {
-	      *pktlen = pktlen_dflt;	/* Packet-size token illegal, use dflt */
-	    }
-	  }
-	}
-      }
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int	openConnection (
-/*	==============
-**			Open connection to histogram memory front-end.
-*/
-	    char	*host,
-	    int		 port) {
-
-    int			i, status, my_skt;
-    struct sockaddr_in	lcl_sockname;
-    struct sockaddr_in	rmt_sockname;
-    int			rmt_inet_addr;
-    struct in_addr	*rmt_inet_addr_pntr;
-    struct hostent	*rmt_hostent;
-    int			rmt_sockname_len;
-    unsigned int	oto_len, oto_status;
-    char		old_time_out[4];
-    union {
-      char  chars[4];
-      int   val;
-    } time_out;
-		/*
-		** Get Internet address of the front-end.
-		*/
-    for (i=0; i < strlen (host); i++) host[i] = tolower (host[i]);
-    rmt_hostent = gethostbyname (host);
-    if (rmt_hostent == NULL) {
-		/*
-		** The following code is to handle hosts which are not yet
-		** in the BIND data base.
-		*/
-      if (strcmp (host, "sqfe01") == 0) {
-        rmt_inet_addr_pntr = (struct in_addr *) &rmt_inet_addr;
-	rmt_inet_addr = inet_addr ("129.129.56.181");
-      }else {
-	printf ("Target processor is %s.\n", host);
-        FailInet ("\nGethostbyname error.");
-      }
-    }else {
-      rmt_inet_addr_pntr = (struct in_addr *) rmt_hostent->h_addr_list[0];
-    }
-    printf (" Target processor is %s ", host);
-    printf ("(%s)\n", inet_ntoa (*rmt_inet_addr_pntr));
-    printf (" Server Port %d\n", port);
-/*
-**	    Create a TCP/IP socket for prelim. connect to server and bind it.
-*/
-    my_skt = socket (AF_INET, SOCK_STREAM, 0);
-    if (my_skt == -1) FailInet ("Socket error.\n");
-
-    lcl_sockname.sin_family = AF_INET;
-    lcl_sockname.sin_port   = htons (0);
-    lcl_sockname.sin_addr.s_addr = 0;
-    status = bind (my_skt, (struct sockaddr *) &lcl_sockname,
-				    sizeof (lcl_sockname));
-    if (status == -1) FailInet ("Bind error.\n");
-	    /*---------------------------
-	    ** Set short time-out (VMS systems only)
-	    */
-#ifdef	__VMS
-    oto_len = sizeof (old_time_out);	/* Save current time-out first */
-    oto_status = getsockopt (my_skt, IPPROTO_TCP, UCX$C_TCP_PROBE_IDLE,
-			    old_time_out, &oto_len);
-    if (oto_status == 0) {
-      time_out.val = 5;		    /* Set new time-out */
-      status = setsockopt (my_skt, IPPROTO_TCP, UCX$C_TCP_PROBE_IDLE,
-			    time_out.chars, sizeof (time_out));
-    }
-#endif
-/*
-**=========================================  Now connect to the server.
-*/
-    rmt_sockname_len = sizeof (rmt_sockname);
-    rmt_sockname.sin_family	 = AF_INET;
-    rmt_sockname.sin_port	 = htons (port);
-    rmt_sockname.sin_addr.s_addr = rmt_inet_addr_pntr->s_addr;
-    status = connect (my_skt, (struct sockaddr *) &rmt_sockname,
-				    sizeof (rmt_sockname));
-    if (status == -1) {
-      GetErrno (&My_errno, &My_vaxc_errno);
-      FailInet ("Connect error\n");
-    }
-		/*---------------------------
-		** Restore time-out (VMS only)
-		*/
-#ifdef	__VMS
-    if (oto_status == 0) {
-      setsockopt (my_skt, IPPROTO_TCP, UCX$C_TCP_PROBE_IDLE,
-			    old_time_out, oto_len);
-    }
-#endif
-    return my_skt;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int	read_boot_line (
-/*	==============
-**			    Get the boot line from the server.
-*/
-		int	 skt,		/* The socket to read from */
-		char	*recd,		/* Buffer to receive the boot line */
-		int	 s_recd) {	/* Size of buffer */
-
-    char    hdr_buff[8], *p_addr;
-    int	    i, j, len, status, bytes_to_come;
-	    /*----------------------------------------
-	    ** Get first 4 bytes which gives the length to follow
-	    */
-    status = recv (skt, hdr_buff, 4, 0);
-    if (status != 4) FailInet ("recv error on bootline header.\n");
-
-    i = sscanf (hdr_buff, "%4d%n", &len, &j);	/* Convert to binary */
-    if ((i != 1) || (j != 4)) {
-      printf ("Header bytes are not ASCII coded decimal: 0x%x 0x%x 0x%x 0x%x\n",
-		    hdr_buff[0], hdr_buff[1], hdr_buff[2], hdr_buff[3]);
-      exit (EXIT_FAILURE);
-    }
-
-    if (len >= s_recd) {
-      printf (" Boot-line length is %d\n", len);
-      printf ("Too long for buffer. Buffer length = %d\n", s_recd);
-      flushNet (len);
-      exit (EXIT_FAILURE);
-    }
-
-    bytes_to_come = len;
-    p_addr = recd;
-
-    while (bytes_to_come > 0) {
-      status = recv (skt, p_addr, bytes_to_come, 0);
-      if (status <= 0) break;
-      bytes_to_come -= status;
-      p_addr += status;
-    }
-    if (bytes_to_come != 0) {
-      if (status < 0) {
-	FailInet ("R/W-Socket recv error");
-      }else if (status == 0) {
-	FailInet ("R/W-Socket recv error -- return code = 0");
-      }
-      exit (EXIT_FAILURE);
-    }
-    i = strlen (recd);
-    if (i > len) {
-      printf (" Length of boot-line buffer read from target = %d.\n", len);
-      printf (" String length of boot-line = %d.\n", i);
-      printf (" It appears as though the boot-line is not null terminated!");
-      exit (EXIT_FAILURE);
-    }
-    return True;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int	send_a_close (
-/*	============
-**			    Send a "CLOSE" message to the target host.
-*/
-		int	 skt) {		/* The socket to send to. */
-
-    char    cmnd_buff[32], buff[32];
-    int	    status, i, bootlen;
-
-    strcpy (cmnd_buff, "CLOSE");
-    status = send (skt, cmnd_buff, 8, 0);
-    if (status != 8) FailInet ("send_a_close - bad send");
-
-    status = recv (skt, buff, 4, 0);	    /* Await the response */
-					    /* But do not check it */
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------*/
-  int	setup_xrm_database (
-/*	==================
-**				Setup Resource Manager Database
-*/
-			XrmDatabase	*db,
-			char		*name[],
-			int		*argc,
-			char		*argv[],
-			int		verbose) {
-
-    static char	our_name[80]  = "Unknown";  /* This holds the program name */
-    static char lkup_name[80] = "Unknown";  /* Name for looking in database */
-
-    int		status, i, first = True;
-    char	text[80];
-    char	full_nm0[80];
-    char	full_nm1[80];
-    char	*p_fil[] = {0,0,0,0,0,0,0,0,0,0};
-    char	*my_name;
-    char	*my_name_last;
-
-    char	*name_type;
-    XrmValue	name_value;
-
-    XrmDatabase cmnd_line_db = NULL;
-    XrmDatabase	lcl_db	     = NULL;
-  /*-----------------------------------------------------
-  ** This routine merges some resource databases with options specified on
-  ** the command line. Resources can then be looked up using XrmGetResource.
-  ** This is a bit like the X-toolkit routine XtAppInitialize does for the
-  ** extraction of resources by XtGetApplicationResources.
-  ** 
-  ** I can't help but think that there's a simpler way of doing this but I
-  ** can't find it in the X manuals. Basically, the problem arises with wanting
-  ** to avoid the calling program being associated with an X-display, i.e. it
-  ** is intended for use by "command-line oriented" programs. All the nice,
-  ** easy-to-use resource/command-line setup routines in Xlib or Xtlib seem to
-  ** assume one is going to use a display -- not surprising, I suppose,
-  ** since the concept of Xlib is for writing window based applications!
-  **
-  ** Anyway, the point is that the following way turns out to be lacking
-  ** when it gets tested in anger.
-  */
-    status = True;		/* Assume success	*/
-
-    our_name[0] = NIL;
-	/*
-	** Make a list of the databases to be merged, highest priority first.
-	*/
-#ifdef  __VMS
-    p_fil[0] = "decw$user_defaults:SinQ_rc.dat";
-    p_fil[1] = "decw$group_defaults:SinQ_rc.dat";
-    p_fil[2] = "decw$system_defaults:SinQ_rc.dat";
-    p_fil[3] = "decw$user_defaults:decw$xdefaults.dat";
-    p_fil[4] = "decw$group_defaults:decw$xdefaults.dat";
-    p_fil[5] = "decw$system_defaults:decw$xdefaults.dat";
-    p_fil[6] = NULL;
-    if (*argc > 0) {	     /* Find out what we are called - parse file nm */
-      my_name = strstr (argv[0], "]");	/* Find end of directory, i.e. "]" */
-      my_name++;			/* Skip over "]" */
-      if (my_name[0] == '[') {		/* Handle possible concealed device */
-        my_name = strstr (my_name, "]");
-	my_name++;
-      }
-      i = sizeof (our_name);
-      StrEdit (our_name, my_name, "lowercase", &i);	    /* Copy the rest */
-      strtok (our_name, ".");		/* Close it off at "." */
-    }
-#else
-    p_fil[0] = StrJoin (full_nm0, sizeof (full_nm0),
-			    getenv ("HOME"), "/SinQ_rc");
-    p_fil[1] = "/usr/lib/X11/app-defaults/SinQ_rc";
-    p_fil[2] = StrJoin (full_nm1, sizeof (full_nm1),
-			    getenv ("HOME"), "/.Xdefaults");
-    p_fil[3] = "/usr/lib/X11/app-defaults/Xdefaults";
-    p_fil[4] = NULL;
-    if (*argc > 0) {	      /* Find out what we are called - parse file nm  */
-			      /* Find end of directories */
-      my_name = argv[0] - 1;
-      while (my_name != NULL) {
-        my_name_last = my_name;
-	my_name_last++;
-	my_name = strstr (my_name_last, "/");
-      }
-      StrJoin (our_name, sizeof (our_name), my_name_last, "");
-    }
-#endif
-    if (verbose) printf ("My name is \"%s\"\n", our_name);
-	/*
-	**  Initialise and combine all databases
-	*/
-    XrmInitialize ();
-    for (i = 0; i < XtNumber (p_fil); i++) {
-      if (p_fil[i] == NULL) break;
-      status = XrmCombineFileDatabase (p_fil[i], &lcl_db, False);
-      if ((status != 0) && verbose) {
-	if (first)
-	  printf ("Resource database created from file %s.\n", p_fil[i]);
-	if (!first)
-	  printf ("File %s merged into resource database.\n", p_fil[i]);
-	first = False;
-      }
-    }
-	/*----------------------------------------------------------------
-	**  See if there's anything specified on cmnd line, incl "name".
-	*/
-    XrmParseCommand (&cmnd_line_db,
-			OpTable_0, XtNumber(OpTable_0), our_name, argc, argv);
-    if (cmnd_line_db != NULL) {
-	    /*
-	    ** There was at least 1 item on cmnd line. Process the line.
-	    ** If -name was specified, adopt it.
-	    */
-      status = XrmGetResource (cmnd_line_db,  /* See if a name was specified  */
-			    StrJoin (text, sizeof (text), our_name, ".name"),
-			    "ProgramName.Values",
-			    &name_type, &name_value);
-      if (status) {
-	i = sizeof (lkup_name);
-	StrEdit (lkup_name, name_value.addr, "lowercase", &i);
-	printf ("Option list name is \"%s\"\n", lkup_name);
-      }else {
-        strcpy (lkup_name, our_name);
-      }
-	    /*
-	    ** Loop over all items in OpTable_0 and merge them into database,
-	    ** taking care of any possible name changes.
-	    */
-      for (i = 0; i < XtNumber (OpTable_0); i++) {
-	if (strcmp (OpTable_0[i].option, "-name") == 0) continue;
-        status = XrmGetResource (cmnd_line_db,
-				StrJoin (text, sizeof (text),
-				    our_name, OpTable_0[i].specifier),
-				"ProgramName.Values",
-				&name_type, &name_value);
-	if (status) {
-	  StrJoin (text, sizeof (text), lkup_name, OpTable_0[i].specifier);
-	  XrmPutResource (&lcl_db, text, "String", &name_value);
-	}
-      }
-    }
-/*----------------------------------------------------------------
-*/
-    *name = lkup_name;
-    *db = lcl_db;
-    if ((lcl_db == NULL) && verbose)
-      printf ("\007Warning -- no resource database found.\n");
-
-    XrmDestroyDatabase (cmnd_line_db);
-/*
-**    XrmPutFileDatabase (lcl_db, "sinqhm_client.db");
-*/
-    return status;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int	show_boot_line (
-/*	==============
-**			    Display the boot line.
-**
-*/		char	*recd) {    /* The boot-line as received from serever */
-
-    char    *tok, *body;
-    int	    i, j, status, toklen, empty;
-
-		    /*
-		    ** Scan through the boot-line printing non-null items.
-		    */
-    empty = True;
-    tok = strtok (recd, ":\n");
-    while (tok != NULL) {
-      toklen = strlen (tok);
-      if (tok[toklen+1] == '\n') {	/* Watch out for tokens with no body */
-	tok = strtok (NULL, ":\n");	/* Skip an empty body */
-      }else {
-	body = strtok (NULL, "\n");
-	if ((strcmp (tok, "bootDev") == 0) && (body != NULL)) {
-	  empty = False;
-	  printf (" boot device          : %s\n", body);
-	}else if ((strcmp (tok, "procNum") == 0) && (body != NULL)) {
-	  status = sscanf (body, "%i%n", &i, &j);
-	  if ((status != 1) || (j != strlen (body))) {
-	    printf ("show_boot_line: Bad value found for procNum: \"%s\"\n", body);
-	  }else {
-	    empty = False;
-	    printf (" processor number     : %s\n", body);
-	  }
-	}else if ((strcmp (tok, "hostName") == 0) && (body != NULL)) {
-	  empty = False;
-	  printf (" host name            : %s\n", body);
-	}else if ((strcmp (tok, "bootFile") == 0) && (body != NULL)) {
-	  empty = False;
-	  printf (" file name            : %s\n", body);
-	}else if ((strcmp (tok, "ead") == 0) && (body != NULL)) {
-	  empty = False;
-	  printf (" inet on ethernet (e) : %s\n", body);
-	}else if ((strcmp (tok, "bad") == 0) && (body != NULL)) {
-	  empty = False;
-	  printf (" inet on backplane (b): %s\n", body);
-	}else if ((strcmp (tok, "had") == 0) && (body != NULL)) {
-	  empty = False;
-	  printf (" host inet (h)        : %s\n", body);
-	}else if ((strcmp (tok, "gad") == 0) && (body != NULL)) {
-	  empty = False;
-	  printf (" gateway inet (g)     : %s\n", body);
-	}else if ((strcmp (tok, "usr") == 0) && (body != NULL)) {
-	  empty = False;
-	  printf (" user (u)             : %s\n", body);
-	}else if ((strcmp (tok, "passwd") == 0) && (body != NULL)) {
-	  empty = False;
-	  printf (" ftp password (pw)    : %s\n", body);
-	}else if ((strcmp (tok, "flags") == 0) && (body != NULL)) {
-	  status = sscanf (body, "%i%n", &i, &j);
-	  if ((status != 1) || (j != strlen (body))) {
-	    printf ("show_boot_line: Bad value found for flags: \"%s\"\n", body);
-	  }else {
-	    empty = False;
-	    printf (" flags (f)            : %s\n", body);
-	  }
-	}else if ((strcmp (tok, "targetName") == 0) && (body != NULL)) {
-	  empty = False;
-	  printf (" target name (tn)     : %s\n", body);
-	}else if ((strcmp (tok, "startupScript") == 0) && (body != NULL)) {
-	  empty = False;
-	  printf (" startup script (s)   : %s\n", body);
-	}else if ((strcmp (tok, "other") == 0) && (body != NULL)) {
-	  empty = False;
-	  printf (" other (o)            : %s\n", body);
-	}else {
-	  if (body != NULL) {
-	    printf ("show_boot_line: Bad token found in boot-line: "
-			    "\"%s\" \"%s\"\n", tok, body);
-	  }else {
-	    printf ("show_boot_line: Token found with NULL body in boot-line: "
-			    "\"%s\"\n", tok);
-	  }
-	}
-	tok = strtok (NULL, ":");
-      }
-    }
-    if (empty) printf (" The boot-line was empty!\n");
-    return EXIT_SUCCESS;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void show_help (char *token) {
-/*     =========
-**		    Display help text
-*/
-    int	    len;
-
-    if ((token == NULL) || (token[0] == NIL)) {
-      printf ("\n"
-	" The following commands are recognised by SINQHM_BOOTUTIL_CLIENT:\n"
-	"\n"
-	"    help or ?  - generate this help text.\n"
-	"    config     - interactive configuration of target boot-line.\n"
-	"    reboot     - reboot the target.\n"
-	"    rundown    - cause the bootUtil server on the target to exit.\n"
-	"    show       - display the boot-line of the target.\n"
-	"\n"
-	" To get more detailed help on a specific command, specify:\n"
-	"\n"
-	"               HELP <cmnd>\n"
-	"\n"
-	" on the command line. For information on the environment setup "
-							    "for the\n"
-	" program, specify:\n"
-	"\n"
-	"               HELP SETUP\n"
-	"\n"
-	" on the command line.\n"
-	"\n");
-    } else if (StrMatch ("CONFIG", token, 1) == 0) {
-      printf ("\n"
-	    " Config:\n"
-	    "   The current boot-line information will be displayed. The "
-							    "user will then\n"
-	    "   be prompted for new settings for each field of the boot-"
-							"line. The modified\n"
-	    "   boot-line will then be displayed and the user asked whether "
-							    "it should be\n"
-	    "   written to the non-volatile memory of the target or not.\n"
-	    "\n");
-    }else if (StrMatch ("REBOOT", token, 2) == 0) {
-      printf ("\n"
-	    " Reboot\n"
-	    "   The target processor will be rebooted.\n"
-	    "\n");
-    }else if (StrMatch ("RUNDOWN", token, 2) == 0) {
-      printf ("\n"
-	    " Rundown\n"
-	    "   The bootUtil server on the target processor will be "
-						    "requested to exit.\n"
-	    "   Manual intervention on the target will then be necessary "
-						    "before this program\n"
-	    "   can be used again.\n"
-	    "\n");
-    }else if (StrMatch ("SHOW", token, 1) == 0) {
-      printf ("\n"
-	    " Show:\n"
-	    "   The current boot-line information of the target will be "
-							"displayed.\n"
-	    "\n");
-    }else if (StrMatch ("SETUP", token, 2) == 0) {
-      printf ("\n"
-	    " Setup:\n"
-	    "   The target host with which SinqHM_bootUtil_Client is to "
-								"communicate\n"
-	    "   can most easily be specified via options of the form:\n"
-	    "\n"
-	    "         -host <target-name> -port <port>\n"
-	    "\n"
-	    "   on the command line. There is no default for <target-name> "
-								"whereas\n"
-	    "   <port>, which specifies the TCP/IP port number at which "
-							"the SinqHM_bootUtil\n"
-	    "   server is accepting connections on the target, defaults "
-								"to 2300.\n"
-	    "\n"
-	    "   Alternatively, the environment variable SINQHM_FRONTEND "
-							"may be defined.\n"
-	    "   On Unix systems this is done thus:\n"
-	    "\n"
-	    "         setenv SINQHM_FRONTEND \"<target-name> <port>\"\n"
-	    "\n"
-	    "   On VMS systems, logical names are used instead, e.g.\n"
-	    "\n"
-	    "         define/job sinqhm_frontend \"<target-name> <port>\"\n"
-	    "\n"
-	    "   It is also possible to specify <target-name> and <port> in "
-							"an X-resources\n"
-	    "   data base. The resource names are \"butilHost\" and "
-							"\"butilPort\".\n"
-	    "\n");
-    }else {
-      printf ("Sorry, no help available for \"%s\"!\n", token);
-    }
-  }
-/*
-**==========================================================================
-**
-**  Main line program
-**  ------------------
-**==========================================================================*/
-  int	main (int argc, char *argv[]) {
-/*	====
-*/
-    int	    i, j, k, status, is, dummy, cmnd_len;
-
-    char    cmnd[16], ist_bootline[1024], new_bootline[1024], buff[1024];
-    int	    boot_line_changed;
-
-    char    recd[256], recd1[256];
-    char    last_recd[256] = {NIL};
-    char    *verb;
-    int	    l_recd;
-    XrmDatabase		my_db;
-    char		*appName;
-/*============================================================================
-*/
-    printf ("SinqHM_bootUtil_Client Ident \"%s\" started.\n", IDENT);
-/*============================================================================
-**	    Declare an exit handler to tidy up if we get forced to exit.
-*/
-    is = atexit (exit_handler);
-    if (is != 0) {
-      printf ("SINQHM_BOOTUTIL_CLIENT -- error setting up exit handler.");
-      return EXIT_FAILURE;
-    }
-	/*-------------------------------------------------------------
-	**	Setup the resource database and look up the resources.
-	*/
-    Verbose = False;
-    for (i = 1; i < argc; i++) if (strcmp ("-v", argv[i]) == 0) Verbose = True;
-
-    setup_xrm_database (&my_db, &appName, &argc, argv, Verbose);
-    status = get_check_resources (&my_db, appName, Verbose);
-    if (!status) return False;
-/*============================================================================
-**	    Analyse the arguments to see what has to be done.
-*/
-    if (argc > 1) {	/* There should just be at least one argument remaining.
-			*/
-      StrJoin (cmnd, sizeof (cmnd), argv[1], "");
-      cmnd_len = sizeof (cmnd);
-      StrEdit (cmnd, argv[1], "upcase", &cmnd_len);	/* Cvt to upper case */
-      if (cmnd[0] == '-')			      /* Ignore a leading "-" */
-	StrJoin (cmnd, sizeof (cmnd), &cmnd[1], "");
-    }else {
-      printf ("\n  No command was specified on the command line, "
-						"default is \"SHOW\".\n"
-		"  Specify \"HELP\" for help.\n\n");
-      strcpy (cmnd, "SHOW");
-    }
-    if (StrMatch (cmnd, "HELP", 1) || StrMatch (cmnd, "?", 1)) {
-      if (argc > 2) show_help (argv[2]); else show_help (NULL);
-      return EXIT_SUCCESS;
-    }
-
-    if (!StrMatch (cmnd, "CONFIG", 1)   &&
-	!StrMatch (cmnd, "REBOOT", 6)   &&
-	!StrMatch (cmnd, "RUNDOWN", 7)	&&
-	!StrMatch (cmnd, "SHOW", 1)) {
-      printf ("\n\"%s\" is not a recognised command.\n\n", cmnd);
-      show_help (NULL);
-      return EXIT_FAILURE;
-    }
-/*============================================================================
-**	    Find out the location of the bootUtil Server and make
-**	    a connection to it. Any errors during this phase cause the program
-**	    to exit with an error status.
-*/
-    if (Rmt_host[0] == NIL) {
-      get_SINQHM_FRONTEND (Rmt_host, sizeof (Rmt_host), "",
-			 &Rmt_port, DFLT_PORT,
-			 &dummy, 0);
-      if (Rmt_host[0] == NIL) {
-	printf ("\n"
-	    " No target processor has been specified!\n"
-	    "\n");
-	show_help ("setup");
-	return EXIT_FAILURE;
-      }
-    }
-/*============================================================================*/
-    Cnct_skt = openConnection (Rmt_host, Rmt_port);
-    status = read_boot_line (Cnct_skt, ist_bootline, sizeof (ist_bootline));
-    status = send_a_close (Cnct_skt);
-    close (Cnct_skt);
-    Cnct_skt = 0;
-
-    strcpy (new_bootline, ist_bootline);
-    boot_line_changed = False;
-
-    i = printf ("\nCurrent boot-line of %s is:\n", Rmt_host);
-    for (j = 3; j < i; j++) printf ("="); printf ("\n");
-    status = show_boot_line (ist_bootline);
-/*
-**=========================================== Carry out the command =========
-*/
-    if (StrMatch (cmnd, "CONFIG", 1)) {		/* Modify the configuration? */
-      status = do_config (new_bootline);
-      if (status) {
-	Cnct_skt = openConnection (Rmt_host, Rmt_port);
-	status = read_boot_line (Cnct_skt, ist_bootline, sizeof (ist_bootline));
-	status = send_a_close (Cnct_skt);
-	close (Cnct_skt);
-	Cnct_skt = 0;
-	if (status) {
-	  i = printf ("\nNew boot-line of %s is:\n", Rmt_host);
-	  for (j = 3; j < i; j++) printf ("="); printf ("\n");
-	  status = show_boot_line (ist_bootline);
-	  printf ("\n");
-	}else {
-	  printf ("\007Error getting new boot-line information!\n");
-	}
-      }
-    }else if (StrMatch (cmnd, "REBOOT", 2)) {	/* Reboot? */
-      status = do_reboot ();
-    }else if (StrMatch (cmnd, "RUNDOWN", 2)) {	/* Rundown? */
-      status = do_rundown ();
-    }else if (StrMatch (cmnd, "SHOW", 1)) {	/* Show? */
-		/* Already done! */
-    }else {
-      printf ("\n Illegal command - try \"HELP\".\n");
-      status = EXIT_FAILURE;
-    }
-
-    return status;
-  }
-/*==================================== End of SINQHM_BOOTUTIL_CLIENT.C ======*/
diff --git a/sinqhm/sinqhm_client.c b/sinqhm/sinqhm_client.c
deleted file mode 100755
index b5031fa9..00000000
--- a/sinqhm/sinqhm_client.c
+++ /dev/null
@@ -1,3124 +0,0 @@
-#define	    IDENT	"1C06"
-/*---------------------------------------------------------------------------*/
-#ifdef __DECC
-#pragma	    module	    SinqHM_Client	    IDENT
-#endif
-/*
-** Link_options - Here is the Linker Option File
-**!	sinqhm_client
-**!	sinq_olb/lib/inc=deltat_messages
-**!	pgplot_dir:cpgplot.olb/lib
-**!	pgplot_dir:grpckg.olb/lib
-**!	sys$share:decw$xlibshr/share
-**!!
-**!!	    To build SINQHM_CTRL on LNSA09
-**!!
-**!!	$ import tasmad
-**!!	$ define/job deltat_c_tlb sinq_c_tlb
-**!!	$ sss := tas_src:[sinqhm]
-**!!	$ bui 'sss'sinqhm_client debug
-** Link_options_end
-**
-**	Building on Alpha OSF/1:
-**
-**	    cc -Dmain=MAIN__ -std1 -g -c -o sinqhm_client.o	    \
-**			-I/data/lnslib -I.			    \
-**			~/SinqHM/sinqhm_client.c
-**	    f77 -g -o ~/bin/sinqhm_client sinqhm_client.o		\
-**			-L/public/lib -lsinq -lcpgplot -lpgplot -lX11
-**	    rm sinqhm_client.o
-**
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     Computing Section                        |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...sinqhm]sinqhm_client.c
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Jan 1997
-**
-**  SinqHM_Client is the main program of an Internet Client which transmits
-**  requests to a SinqHM server running on a front-end processor.
-**
-** Updates:
-**   9-Jan-1997 DM.	Initial version.
-**
-**====================================================================
-*/
-
-#include    <errno.h>
-#include    <netdb.h>
-#include    <stdio.h>
-#include    <stdlib.h>
-#include    <stdarg.h>
-#include    <time.h>
-
-#include    <netinet/in.h>
-#include    <arpa/inet.h>
-
-#include    <ctype.h>
-#include    <math.h>
-#include    <sys/socket.h>
-#include    <string.h>
-#include    <sys/types.h>
-#include    <X11/Intrinsic.h>
-
-#ifdef	__VMS
-#include    <pgplot_dir:cpgplot.h>
-#else
-#include    <cpgplot.h>
-#endif
-/*
-**====================	Global Definitions =====================================
-*/
-#include    <sinq_prototypes.h>
-
-#include    "SinqHM_def.h"
-
-#define	    uchar	unsigned char
-#define	    usint	unsigned short int
-#define	    uint	unsigned int
-#define	    NIL		'\0'
-#define	    NL		'\n'
-#define	    MAXERR	10
-#define	    MAX_HIS	16
-#define	    BSIZE	((128*1024)/512)	/* Specify 128 kbyte buffer */
-
-#ifndef True
-#define True	1
-#endif
-
-#ifndef False
-#define False	0
-#endif
-
-  /*
-  **			Define the Data Structures we need
-  */
-
-/*
-**====================	Global Variables ======================================
-*/
-  int			    My_errno, My_vaxc_errno;
-  struct req_buff_struct    Req_buff;
-  struct rply_buff_struct   Rply_buff;
-
-  int		Verbose;
-  int		Rmt_port;
-  int		Pkt_size;
-  char		Rmt_host[32];
-  int		Rw_bytes_got, Rw_bytes_put;
-  static int	Cnct_skt = 0;	    /* Connect socket */
-  static int	Rw_skt = 0;	    /* Read/write socket */
-  int		Dbg_mode;	    /* Setting of <strt_mode> in the SQHM_CNCT
-				    **	message to SINQHM server */
-/*
-**		The buffer for holding Hist Mem data is pointed to
-**		by Hm_buff_addr. The number of bytes allocated is Hm_buff_size.
-*/
-  void		*Hm_buff_addr = NULL;
-  uint		 Hm_buff_size;
-  uint		 Hm_buff_used;
-  uint		 Hm_mode;	/* Histogramming Mode of Histogram Memory */
-  uint		 N_hists;	/* The number of histograms */
-  uint		 Hm_nbins;	/* The number of bins per histogram */
-  uint		 Compress;	/* The span of each bin */
-  uint		 Bytes_per_bin;	/* The number of bytes per bin */
-  uint		 Curr_hist;	/* The current histogram */
-  uint		 Max_block;
-  uint		 Lo_cntr;
-  uint		 Lo_bin;
-  uint		 Total_bytes;
-
-  int		 PGPLOT_started = 0;
-
-  float		 P1 = 2000000,
-		 P2 =   10000, 
-		 P3 =       0, 
-		 P4 =  200000, 
-		 P5 =     500, 
-		 P6 =       0;
-
-  static XrmOptionDescRec OpTable_0[] = {
-      {"-name",	    ".name",		XrmoptionSepArg, (XPointer) NULL},
-      {"-dbg",	    ".sqhmDebug",	XrmoptionNoArg,	 (XPointer) "1"},
-      {"-debug",    ".sqhmDebug",	XrmoptionNoArg,	 (XPointer) "1"},
-      {"-h",	    ".sqhmHelp",	XrmoptionNoArg,	 (XPointer) "1"},
-      {"-he",	    ".sqhmHelp",	XrmoptionNoArg,	 (XPointer) "1"},
-      {"-hel",	    ".sqhmHelp",	XrmoptionNoArg,	 (XPointer) "1"},
-      {"-help",	    ".sqhmHelp",	XrmoptionNoArg,	 (XPointer) "1"},
-      {"-ho",	    ".sqhmHost",	XrmoptionSepArg, (XPointer) NULL},
-      {"-hos",	    ".sqhmHost",	XrmoptionSepArg, (XPointer) NULL},
-      {"-host",	    ".sqhmHost",	XrmoptionSepArg, (XPointer) NULL},
-      {"-port",	    ".sqhmPort",	XrmoptionSepArg, (XPointer) NULL},
-      {"-pktsize",  ".sqhmPktSize",	XrmoptionSepArg, (XPointer) NULL},
-      {"-size",	    ".sqhmPktSize",	XrmoptionSepArg, (XPointer) NULL},
-      {"-v",	    ".sqhmVerbose",	XrmoptionNoArg,	 (XPointer) "1"},
-      {"-?",	    ".sqhmHelpItem",	XrmoptionSepArg, (XPointer) NULL},
-    };
-/*
-**=============================================================================
-**  Local routines.
-**
-**  do_dump		: Dump out the contents of the histogram buffer.
-**  do_load		: Load the histogram buffer from a file.
-**  do_plot		: Plot the data.
-**  do_project		: Handle the "PROJECT" command.
-**  do_status		: Get and display status of SinqHM_srv.
-**  do_1d		: Handle the "READ" command.
-**  do_2d		: Handle the "2D"   command.
-**  do_2d_plot		: Plot the data 2-dimensionally.
-**  exit_handler	: Exit handler in case a forced exit is made.
-**  gen_data		: Generate sum of 2 Lorenzians.
-**  gen_data_2d		: Generate sum of 2 Lorenzians in pseudo 2-dim mode.
-**  get_recd		: Read a record from file.
-**  new_config_quit	: Quit because SinqHM config'n has changed.
-**  openConnection	: Open connection to SinqHM.
-**  openConnectionGbl	: Call openConnection then set up some globals.
-**  print_HM_mode	: Interpret the HM configuration.
-**  print_uptime	: Print out the up-time.
-**  read_hm		: Read block of bins from SINQHM_SRV
-**  read_project	: Read projected block of bins from SINQHM_SRV
-**  show_help		: Display the help text.
-**  split_args		: Parse a command line.
-**  write_hm		: Write block of bins to SINQHM_SRV
-**----------------------------------------------------------------------------
-**							    Prototypes
-*/
-  void	    do_dump (char *args);
-  void	    do_load (char *args, int dbg_mode);
-  void	    do_plot (uint first, uint n_bins, uint bytes_per_bin, uint total);
-  void	    do_project (char *args, int dbg_mode);
-  void	    do_status (int dbg_mode);
-  void	    do_1d (char *args, int dbg_mode);
-  void	    do_2d (char *args, int dbg_mode);
-  void	    do_2d_plot (uint f_hist, uint n_hists, uint f_bin, uint n_bins,
-			    uint bytes_per_bin, uint total);
-  void	    exit_handler ();
-  void	    gen_data (char *args);
-  void	    gen_data_2d (char *args);
-  int	    get_check_resources (XrmDatabase *db,
-				 char	     *appName,
-				 int	     *argc,
-				 char	     *argv[],
-				 int	      verbose);
-  int	    get_recd (FILE *lun, char *recd, int recd_len);
-  void	    new_config_quit (char *txt);
-  int	    openConnection (char    *node,
-			    int	    *port,
-			    int	    *pkt_size,
-			    int	     mode,
-			    struct rply_buff_struct *reply,
-			    int	     verbose);
-  int	    openConnectionGbl (char     *node,
-			       int	*port,
-			       int	*pkt_size,
-			       int	 mode,
-			       struct rply_buff_struct *reply,
-			       int	 verbose);
-  void	    print_HM_mode (uint mode, int n_pad);
-  void	    print_uptime (FILE *lun, char *prefix, int secs, char *suffix);
-  int	    read_hm (char  *buff,
-		     uint  hbuf_size,
-		     uint  f_bin,
-		     uint  n_bins,
-		     uint  hist_num,
-		     uint *cntr_lo,
-		     uint *cntr_hi);
-  int	    read_project (char	  *buff,
-		     uint  hbuf_size,
-		     uint  f_hist,
-		     uint  n_hists,
-		     uint  f_bin,
-		     uint  n_bins,
-		     uint  axis,
-		     uint  xdim,
-		     uint  h_select,
-		     uint *cntr_lo,
-		     uint *cntr_hi);
-  int	    setup_xrm_database (XrmDatabase	*db,
-				char		*name[],
-				int		*argc,
-				char		*argv[],
-				int		verbose);
-  void	    show_help (char *token);
-  void	    split_args (char *args, ...);
-  int	    write_hm (void  *buff,
-		     uint  hist_no,
-		     uint  f_bin,
-		     uint  n_bins,
-		     uint  bpb);
-/*
-**----------------------------------------------------------------------------*/
-  void 	do_dump (char *args) {
-/*	=======
-**		Dump out the contents of the histogram buffer
-**		Args are:
-**		    Number of first bin	to dump (dflt = 0)
-**		    Number of bins to dump      (dflt = rest of buffer)
-**		    File to receive the data    (dflt = standard output)
-*/
-    int		i, j, k;
-    time_t	time_now;
-    uint	n_items, f_bin, n_bins;
-    uint	total = 0;
-    char	*p_p1, *p_p2, *p_p3;
-    char	recd[256];
-    FILE	*lun;
-
-    uchar	*p_byte;
-    usint	*p_word;
-    uint	*p_long;
-
-    if (Hm_buff_used == 0) {
-      printf ("There is nothing available to dump!\n");
-      return;
-    }
-
-    n_items = Hm_buff_used/Bytes_per_bin;
-
-    split_args (args, &p_p1, &p_p2, &p_p3, NULL);
-    if (p_p1 == NULL) p_p1 = "0";
-    if ((sscanf (p_p1, "%u", &f_bin) != 1) ||
-	(f_bin >= n_items)) {
-      printf ("<1st-bin> is invalid: \"%s\"\n", p_p1);
-      return;
-    }
-
-    if (p_p2 == NULL) {
-      n_bins = n_items - f_bin;
-    }else {
-      if ((sscanf (p_p2, "%u", &n_bins) != 1) ||
-          (n_bins > n_items) ||
-	  ((n_bins + f_bin) > n_items)) {
-	printf ("<#-bins> is invalid: \"%s\"\n", p_p2);
-	n_bins = n_items - f_bin;
-	printf ("It has been set to %d\n", n_bins);
-      }
-    }
-
-    if (p_p3 == NULL) {
-      printf (" Dumping histogram memory buffer ...\n");
-      lun = stdout;
-    }else {
-      printf (" Opening file %s to receive the memory dump ...\n", p_p3);
-      lun = fopen (p_p3, "w");
-      if (lun == NULL) {
-	printf ("  ... failed to open file. No dump made!\n");
-	return;
-      }
-      time_now = time (NULL);
-      fprintf (lun, "! Histogram Memory Dump of %s at %s",
-				Rmt_host, asctime (localtime (&time_now)));
-      fprintf (lun, "! =====================\n");
-    }
-
-    fprintf (lun, "First-bin:      %5u\n", f_bin);
-    fprintf (lun, "Number-of-bins: %5u\n", n_bins);
-
-    p_byte = (uchar	*) Hm_buff_addr;
-    p_word = (usint	*) Hm_buff_addr;
-    p_long = (uint	*) Hm_buff_addr;
-
-    for (i = 0; i < n_bins; i += 10) {
-      k = 0;
-      for (j = 0; j < 10; j++) {
-	if ((i + j) >= n_bins) break;
-	switch (Bytes_per_bin) {
-	 case 1: k += sprintf (&recd[k], "%5d", p_byte[f_bin+i+j]);
-		 total += p_byte[f_bin+i+j];
-		 break;
-	 case 2: k += sprintf (&recd[k], "%6d", p_word[f_bin+i+j]);
-		 total += p_word[f_bin+i+j];
-		 break;
-	 case 4: k += sprintf (&recd[k], "%7d", p_long[f_bin+i+j]);
-		 total += p_long[f_bin+i+j];
-	}
-      }
-      if (j > 0) fprintf (lun, "%6d: %s\n", f_bin+i, recd);
-    }
-    if (lun == stdout) printf ("\n");
-    fprintf (lun, "Total: %u\n", total);
-    if (lun != stdout) {
-      fclose (lun);
-      chmod (p_p3, 0644);
-      printf (" ... dump completed.\n");
-    }
-  }
-/*
-**----------------------------------------------------------------------------*/
-  void 	do_load (char *args, int dbg_mode) {
-/*	=======
-**		Load the contents of the histogram buffer from a file
-**		Args are:
-**		    File to read to get the data (dflt = standard input)
-*/
-    int		i, j, binnum, status;
-    uint	bytes_needed, f_bin, n_bins, value;
-    uint	total = 0;
-    char	*p_p1, *pBinnum, *tok;
-    char	recd[256];
-    FILE	*lun;
-
-    uchar	*p_byte;
-    usint	*p_word;
-    uint	*p_long;
-
-    if (Rw_skt == 0) {
-      Rw_skt = openConnectionGbl (Rmt_host, &Rmt_port, &Pkt_size, dbg_mode,
-					    &Rply_buff, Verbose);
-      if (Rw_skt == 0) FailInet ("\ndo_load/openConnectionGbl error.");
-    }
-
-    split_args (args, &p_p1, NULL);
-    if (p_p1 == NULL) {
-      printf (" Loading histogram memory from standard input ...\n");
-      lun = stdin;
-    }else {
-      printf (" Reading histogram memory data from file %s ...\n", p_p1);
-      lun = fopen (p_p1, "r");
-      if (lun == NULL) {
-	printf ("  ... failed to open file. No load done!\n");
-	return;
-      }
-    }
-
-    get_recd (lun, recd, sizeof (recd));    /* Get first non-comment record */
-    i = sscanf (recd, "First-bin: %i%n", &f_bin, &j);
-    if ((i != 1) || (j != strlen (recd))) {
-      printf ("  ... First-bin record not found. No load done!\n");
-      if (lun != stdin) fclose (lun);
-      return;
-    }
-
-    get_recd (lun, recd, sizeof (recd));    /* Get second non-comment record */
-    i = sscanf (recd, "Number-of-bins: %i%n", &n_bins, &j);
-    if ((i != 1) || (j != strlen (recd))) {
-      printf ("  ... Number-of-bins record not found. No load done!\n");
-      if (lun != stdin) fclose (lun);
-      return;
-    }
-    printf ("First-bin:      %5u\n", f_bin);
-    printf ("Number-of-bins: %5u\n", n_bins);
-
-    bytes_needed = n_bins * Bytes_per_bin;
-    if (bytes_needed > Hm_buff_size) {		/* Expand buffer space? */
-      Hm_buff_addr = realloc (Hm_buff_addr, bytes_needed);  /* Yes */
-      if (Hm_buff_addr != NULL) {
-	Hm_buff_size = bytes_needed;
-      }else {
-	printf ("Error getting memory buffer for file data. No load done!\n");
-	if (lun != stdin) fclose (lun);
-	return;
-      }
-    }
-    Hm_buff_used = bytes_needed;
-
-    p_byte = (uchar *) Hm_buff_addr;
-    p_word = (usint *) Hm_buff_addr;
-    p_long = (uint  *) Hm_buff_addr;
-
-    for (i = 0; i < n_bins; i += 10) {
-      status = get_recd (lun, recd, sizeof (recd));    /* Get another record */
-      if (!status) {
-	printf ("Error getting data from file at record %d! No load done!\n",
-			    (i+10)/10);
-	if (lun != stdin) fclose (lun);
-	return;
-      }
-      pBinnum = strtok (recd, ":");
-      if ((pBinnum == NULL) ||
-	  (sscanf (pBinnum, "%i", &binnum) != 1) ||
-	  (binnum != (i + f_bin))) {
-	printf ("Bin number wrong at record %d! No load done!\n", (i+10)/10);
-	if (lun != stdin) fclose (lun);
-	return;
-      }
-      for (j = 0; j < 10; j++) {
-	if ((i + j) >= n_bins) break;
-	tok = strtok (NULL, " ");
-	if ((tok == NULL) || (sscanf (tok , "%u", &value) != 1)) {
-	  printf ("Bad data value on record %d! No load done!\n", (i+10)/10);
-	  if (lun != stdin) fclose (lun);
-	  return;
-	}
-	switch (Bytes_per_bin) {
-	 case 1: p_byte[i+j] = value; total += p_byte[i+j]; break;
-	 case 2: p_word[i+j] = value; total += p_word[i+j]; break;
-	 case 4: p_long[i+j] = value; total += p_long[i+j];
-	}
-      }
-    }
-
-    get_recd (lun, recd, sizeof (recd));    /* Get last non-comment record */
-    i = sscanf (recd, "Total: %i%n", &value, &j);
-    if ((i != 1) || (j != strlen (recd))) {
-      printf ("  ... \"Total\" record not found. No load done!\n");
-      if (lun != stdin) fclose (lun);
-      return;
-    }
-    if (value != total) {
-      printf ("  ... the \"Total\" record is inconsistent. No load done!\n");
-      printf ("           Total of bins           = %6u\n"
-	      "           Total on \"Total\" record = %6u\n", total, value);
-      if (lun != stdin) fclose (lun);
-      return;
-    }
-    printf (" Sending the data ...");
-    status = write_hm (Hm_buff_addr, -1, f_bin, n_bins, Bytes_per_bin);
-    if (lun != stdin) fclose (lun);
-    if (status) printf (" load completed.\n");
-  }
-/*
-**----------------------------------------------------------------------------*/
-  void do_plot (uint first, uint n_bins, uint bytes_per_bin, uint total) {
-/*     =======
-**				Make a plot of the data.
-*/
-    int		i;
-    char	total_txt[21];
-#ifdef LINUX
-    char	dev[] = "/XSERV";
-#else
-    char	dev[] = "/XW";
-#endif
-    char	xlab[] = "Bins";
-    char	ylab[] = "Counts";
-    float	xlo, xhi, yhi;
-    float	*x;
-    float	*y;
-
-    uchar	*p_byte;
-    usint	*p_word;
-    uint	*p_long;
-
-    if ((n_bins <= 0) || (total == 0)) {
-      printf ("Nothing to plot!\n");
-      return;
-    }
-
-    x = (float *) malloc ((n_bins + 1) * sizeof (float));
-    if (x == NULL) {
-      printf ("Cannot get plot memory for x-array\n");
-      return;
-    }
-    y = (float *) malloc (n_bins * sizeof (float));
-    if (y == NULL) {
-      printf ("Cannot get plot memory for y-array\n");
-      return;
-    }
-
-    sprintf (total_txt, "Bin Total = %8d", total);
-
-    p_byte = (uchar *) Hm_buff_addr;
-    p_word = (usint *) Hm_buff_addr;
-    p_long = (uint  *) Hm_buff_addr;
-
-    if (PGPLOT_started == 0) {
-      cpgbeg (0, dev, 1, 1);
-	    /* - - - - - - - - - - - - - - - - - - - - - -
-	    ** Set black on white (hopefully)
-	    */
-      cpgscr (0, 0.79, 0.67, 0.57);
-      cpgscr (1, 0.0, 0.0, 0.0);
-
-      cpgask (0);
-      PGPLOT_started = 1;
-    }
-    xlo = (float) first;
-    xhi = (float) first + n_bins + 1;
-    yhi = 10.0;
-    switch (bytes_per_bin) {
-     case 1:
-      for (i = 0; i < n_bins; i++) {
-	x[i] = first + i;
-	y[i] = p_byte[i];
-        if (y[i] > yhi) yhi = y[i];
-      }
-      break;
-     case 2:
-      for (i = 0; i < n_bins; i++) {
-	x[i] = first + i;
-	y[i] = p_word[i];
-        if (y[i] > yhi) yhi = y[i];
-      }
-      break;
-     case 4:
-      for (i = 0; i < n_bins; i++) {
-	x[i] = first + i;
-	y[i] = p_long[i];
-        if (y[i] > yhi) yhi = y[i];
-      }
-      break;
-    }
-    x[n_bins] = first + n_bins;
-    yhi = cpgrnd (yhi, &i);
-    cpgenv (xlo, xhi, 0.0, yhi, 0, 0);
-    cpglab (xlab, ylab, total_txt);
-    cpgbin (n_bins, x, y, False);
-    cpgmove (x[n_bins], y[n_bins-1]); cpgdraw (x[n_bins], 0.0);
-
-    free (x);
-    free (y);
-  }
-/*
-**----------------------------------------------------------------------------*/
-  void 	do_project (char *args, int dbg_mode) {
-/*	==========
-**	Generate a projected plot of a 2-dim hist (e.g. of TOF array of cntrs)
-**		Args are:
-**		    Number of first histogram
-**		    Number of histograms
-**		    Number of first bin
-**		    Number of bins
-**		    Axis ('X' = x-axis, 'Y' = y-axis)
-**		    x-dim
-**		Default is to project everything onto x-axis
-*/
-    char	    *p_p1, *p_p2, *p_p3, *p_p4, *p_p5, *p_p6, *p_p7;
-    int		    i, status, axis;
-    uint	    f_hist, n_hists, f_bin, n_bins;
-    uint	    x_dim, h_slct, eff_nbins, eff_nhists;
-    uint	    nbins_to_read, bytes_needed, total, cntr_lo, cntr_hi;
-
-    uchar	*p_byte;
-    usint	*p_word;
-    uint	*p_long;
-
-    if (Rw_skt == 0) {
-      Rw_skt = openConnectionGbl (Rmt_host, &Rmt_port, &Pkt_size, dbg_mode,
-					    &Rply_buff, Verbose);
-      if (Rw_skt == 0) FailInet ("\ndo_project/openConnectionGbl error.");
-    }
-
-    split_args (args, &p_p1, &p_p2, &p_p3, &p_p4,	/* Get pntrs to */
-			    &p_p5, &p_p6, &p_p7, NULL);	/* the 7 args */
-
-    if (p_p6 == NULL) {
-      x_dim = 0;
-    }else {
-      if ((sscanf (p_p6, "%u", &x_dim) != 1) ||
-	  (x_dim > Hm_nbins) ||
-	  ((x_dim != 0) && ((Hm_nbins % x_dim) != 0))) {
-	printf ("<x-dim> is invalid: \"%s\"\n", p_p6);
-	printf ("<x-dim> must be an exact divisor of the number of bins "
-			    "per histogram, %d\n", Hm_nbins);
-	return;
-      }
-    }
-    eff_nbins  = (x_dim == 0) ? Hm_nbins : x_dim;
-    eff_nhists = (x_dim == 0) ? N_hists  : (Hm_nbins/x_dim);
-
-    if (p_p1 == NULL) p_p1 = "0";
-    if ((sscanf (p_p1, "%u", &f_hist) != 1) ||
-	(f_hist >= eff_nhists)) {
-      printf ("<1st-hist> is invalid: \"%s\"\n", p_p1);
-      printf ("It must be an integer in the range 0 to %d\n", (eff_nhists - 1));
-      return;
-    }
-
-    if (p_p2 == NULL) {
-      n_hists = eff_nhists - f_hist;
-    }else {
-      if ((sscanf (p_p2, "%u", &n_hists) != 1) ||
-	  (n_hists == 0) ||
-	  (n_hists > eff_nhists) ||
-	  ((n_hists + f_hist) > eff_nhists)) {
-	printf ("<#-hists> is invalid: \"%s\"\n", p_p2);
-	printf ("It must be an integer in the range 1 to %d\n",
-			    (eff_nhists - f_hist));
-	return;
-      }
-    }
-
-    if (p_p3 == NULL) p_p3 = "0";
-    if ((sscanf (p_p3, "%u", &f_bin) != 1) ||
-	(f_bin >= eff_nbins)) {
-      printf ("<1st-bin> is invalid: \"%s\"\n", p_p3);
-      printf ("It must be an integer in the range 0 to %d\n",
-			    (eff_nbins - 1));
-      return;
-    }
-
-    if (p_p4 == NULL) {
-      n_bins = eff_nbins - f_bin;
-    }else {
-      if ((sscanf (p_p4, "%u", &n_bins) != 1) ||
-	  (n_bins > eff_nbins) ||
-	  ((n_bins + f_bin) > eff_nbins)) {
-	printf ("<#-bins> is invalid: \"%s\"\n", p_p4);
-	printf ("It must be an integer in the range 1 to %d\n",
-			    (eff_nbins - f_bin));
-	return;
-      }
-    }
-
-    if (p_p5 == NULL) {
-      axis = 0;
-    }else {
-      if (strcmp ("x", p_p5) == 0) {
-	axis = 0;
-      }else if (strcmp ("y", p_p5) == 0) {
-	axis = 1;
-      }else if (sscanf (p_p4, "%u", &axis) == 1) {
-	if (axis != 0) axis = 1;
-      }else {
-	printf ("<axis> is invalid: \"%s\"\n", p_p5);
-	printf ("It should be \"x\" or \"y\"\n");
-	return;
-      }
-    }
-
-    if (p_p7 == NULL) {
-      h_slct = 0;
-    }else {
-      if ((sscanf (p_p7, "%u", &h_slct) != 1) ||
-	  (h_slct > N_hists)) {
-	printf ("<hist-#> is invalid: \"%s\"\n", p_p7);
-	printf ("It must be an integer in the range 1 to %d\n", (N_hists - 1));
-	return;
-      }
-    }
-
-    printf ("\n Read Projected Region of 2-dimensional histogram ...\n"
-	          "       First histogram      = %5u\n"
-		  "       Number of histograms = %5u\n"
-	          "       First bin            = %5u\n"
-		  "       Number of bins       = %5u\n",
-			    f_hist, n_hists, f_bin, n_bins, axis);
-    if (axis == 0) printf ("       Axis                 =     X\n");
-    if (axis != 0) printf ("       Axis                 =     Y\n");
-    if (x_dim != 0) printf ("       x-dimension          = %5u\n", x_dim);
-		/*
-		** Allocate buffer space for holding the data. The space needed
-		** depends on whether it is an x- or y-projection.
-		*/
-    nbins_to_read = (axis == 0) ? n_bins : n_hists;
-    bytes_needed = nbins_to_read * sizeof (uint);
-    if (bytes_needed > Hm_buff_size) {		/* Expand buffer space? */
-      Hm_buff_addr = realloc (Hm_buff_addr, bytes_needed);  /* Yes */
-      if (Hm_buff_addr != NULL) {
-	Hm_buff_size = bytes_needed;
-      }else {
-	printf ("SinqHM_Client -- "
-			"error getting memory buffer for histogram data.\n");
-	exit (EXIT_FAILURE);
-      }
-    }
-    Hm_buff_used = bytes_needed;
-
-    status = read_project (Hm_buff_addr, Hm_buff_size,
-			    f_bin, n_bins, f_hist, n_hists, axis, x_dim, h_slct,
-			    &cntr_lo, &cntr_hi);
-    if (status == EXIT_SUCCESS) {
-      total = 0;
-      switch (Bytes_per_bin) {
-       case 1:
-	p_byte = (uchar *) Hm_buff_addr;
-	for (i = 0; i < nbins_to_read; i++) total += p_byte[i];
-	break;
-       case 2:
-	p_word = (usint *) Hm_buff_addr;
-	for (i = 0; i < nbins_to_read; i++) total += p_word[i];
-	break;
-       case 4:
-	p_long = (uint *) Hm_buff_addr;
-	for (i = 0; i < nbins_to_read; i++) total += p_long[i];
-      }
-      printf (" Done! Total contents of bins = %d\n", total);
-      if (cntr_lo != 0) printf (" Number of underflow events = %u\n", cntr_lo);
-      if (cntr_hi != 0) printf (" Number of overflow  events = %u\n", cntr_hi);
-      if (axis == 0) {
-	do_plot (f_bin, n_bins, Bytes_per_bin, total);
-      }else {
-	do_plot (f_hist, n_hists, Bytes_per_bin, total);
-      }
-    }
-  }
-/*
-**----------------------------------------------------------------------------*/
-  void 	do_status (int dbg_mode) {
-/*	=========
-**		Get and display status of SinqHM_srv
-*/
-    int		i, status, secs, mins, hrs, days;
-    int		off_a, off_b, off_c, off_d, off_e, off_f;
-    int		off_g, off_h, off_i, off_j, off_k, off_l;
-    uint	state, nh, nb, bpb, span, ch, bytes_to_come;
-    char	recd[256], *p_buff, *p_nxt;
-    uint	tsi_status, tsi_flags, dt_or_dts, num_bad_ev;
-
-    if (Rw_skt == 0) {
-      Rw_skt = openConnectionGbl (Rmt_host, &Rmt_port, &Pkt_size, dbg_mode,
-					&Rply_buff, Verbose);
-      if (Rw_skt == 0) FailInet ("\ndo_status/openConnectionGbl error.");
-    }
-    printf ("\n Getting histogram memory identification ...\n");
-		/*
-		** Send the ident request message first
-		*/
-    Req_buff.bigend = htonl (0x12345678);
-    Req_buff.cmnd   = htonl (SQHM_IDENT);
-    status = send (Rw_skt, (char *) &Req_buff, sizeof (Req_buff), 0);
-    if (status == -1) FailInet ("do_status -- R/W-Socket send error\n");
-    if (status != sizeof (Req_buff)) {
-      printf ("SinqHM_Client -- wrong number of bytes sent: %d", status);
-      exit (EXIT_FAILURE);
-    }
-		/*
-		** Now get the server's ident message.
-		*/
-    status = recv (Rw_skt, (char *) &Rply_buff, sizeof (Rply_buff), 0);
-    if (status == -1) {
-      FailInet ("do_status -- R/W-Socket recv error\n");
-      exit (EXIT_FAILURE);
-    }else if (status != sizeof (Rply_buff)) {
-      printf ("do_status --  Cnct-Socket recv error - ");
-      printf ("unexpected byte count: %d.\n", status);
-      exit (EXIT_FAILURE);
-    }
-    if (ntohl (Rply_buff.bigend) != 0x12345678) {
-      printf (
-	    "SinqHM_Client -- big-endian/little-endian problem!\n"
-	    "    Buffer received in non-network byte order!\n");
-      exit (EXIT_FAILURE);
-    }else if (ntohl (Rply_buff.status) == KER__BAD_VALUE) {
-      printf ("   ... identification request not supported\n");
-    }else if (ntohl (Rply_buff.status) != KER__SUCCESS) {
-      printf ("SinqHM_Client -- Bad status from Ident Request: %d.\n",
-		    ntohl (Rply_buff.status));
-      printf ("     \"%s\"\n", Rply_buff.u.message);
-      exit (EXIT_FAILURE);
-    }else {
-		/*
-		**	    Get the rest of the response
-		*/
-      bytes_to_come = ntohl (Rply_buff.u.ident.n_extra_bytes);
-      p_buff = calloc (bytes_to_come, 1);
-      if (p_buff == NULL) {
-	printf ("Could not get buffer space for ident information\n");
-	exit (EXIT_FAILURE);
-      }
-      p_nxt = p_buff;
-      while (bytes_to_come > 0) {
-	i = (bytes_to_come > Pkt_size) ? Pkt_size : bytes_to_come;
-	status = recv (Rw_skt, p_nxt, i, 0);
-	Rw_bytes_got += status;
-	if (status == -1) FailInet ("do_status -- R/W-Socket data recv error\n");
-	bytes_to_come -= status;
-	p_nxt	      += status;
-      }
-		/*
-		**	    Extract and print the information
-		*/
-      off_a = ntohs (Rply_buff.u.ident.offset_vxWorks_ident);
-      off_b = ntohs (Rply_buff.u.ident.offset_vxWorks_date);
-      off_c = ntohs (Rply_buff.u.ident.offset_instr);
-      off_d = ntohs (Rply_buff.u.ident.offset_def_ident);
-      off_e = ntohs (Rply_buff.u.ident.offset_sinqhm_main_ident);
-      off_f = ntohs (Rply_buff.u.ident.offset_sinqhm_main_date);
-      off_g = ntohs (Rply_buff.u.ident.offset_sinqhm_server_ident);
-      off_h = ntohs (Rply_buff.u.ident.offset_sinqhm_server_date);
-      off_i = ntohs (Rply_buff.u.ident.offset_sinqhm_filler_ident);
-      off_j = ntohs (Rply_buff.u.ident.offset_sinqhm_filler_date);
-      off_k = ntohs (Rply_buff.u.ident.offset_sinqhm_routines_ident);
-      off_l = ntohs (Rply_buff.u.ident.offset_sinqhm_routines_date);
-      i = strlen (&p_buff[off_b]) + 1;
-      StrEdit (&p_buff[off_b], &p_buff[off_b], "compress trim", &i);
-      i = strlen (&p_buff[off_f]) + 1;
-      StrEdit (&p_buff[off_f], &p_buff[off_f], "compress trim", &i);
-      i = strlen (&p_buff[off_h]) + 1;
-      StrEdit (&p_buff[off_h], &p_buff[off_h], "compress trim", &i);
-      i = strlen (&p_buff[off_j]) + 1;
-      StrEdit (&p_buff[off_j], &p_buff[off_j], "compress trim", &i);
-      i = strlen (&p_buff[off_l]) + 1;
-      StrEdit (&p_buff[off_l], &p_buff[off_l], "compress trim", &i);
-
-      printf (" Instrument = %s, SinqHM Protocol Identifier = %s\n",
-		    &p_buff[off_c], &p_buff[off_d]);
-      printf (" SinqHM_srv_main     Identifier %s compiled on %s\n",
-			    &p_buff[off_e], &p_buff[off_f]);
-      printf (" SinqHM_srv_server   Identifier %s compiled on %s\n",
-			    &p_buff[off_g], &p_buff[off_h]);
-      printf (" SinqHM_srv_filler   Identifier %s compiled on %s\n",
-			    &p_buff[off_i], &p_buff[off_j]);
-      printf (" SinqHM_srv_routines Identifier %s compiled on %s\n",
-			    &p_buff[off_k], &p_buff[off_l]);
-      printf (" vxWorks Version %s created on %s\n", &p_buff[off_a],
-			    &p_buff[off_b]);
-      print_uptime (stdout, " Up-time = ", ntohl (Rply_buff.u.ident.up_time),
-				    "\n");
-      free (p_buff);
-    }
-/*----------------------------------------------------------------------------*/
-    printf ("\n Getting histogram memory status ...\n");
-		/*
-		** Send the request message first
-		*/
-    Req_buff.bigend = htonl (0x12345678);
-    Req_buff.cmnd   = htonl (SQHM_STATUS);
-    status = send (Rw_skt, (char *) &Req_buff, sizeof (Req_buff), 0);
-    if (status == -1) FailInet ("do_status -- R/W-Socket send error\n");
-    if (status != sizeof (Req_buff)) {
-      printf ("SinqHM_Client -- wrong number of bytes sent: %d", status);
-      exit (EXIT_FAILURE);
-    }
-		/*
-		** Now get the server's status message.
-		*/
-    status = recv (Rw_skt, (char *) &Rply_buff, sizeof (Rply_buff), 0);
-    if (status == -1) {
-      FailInet ("do_status -- R/W-Socket recv error\n");
-      exit (EXIT_FAILURE);
-    }else if (status != sizeof (Rply_buff)) {
-      printf ("do_status --  Cnct-Socket recv error - ");
-      printf ("unexpected byte count: %d.\n", status);
-      exit (EXIT_FAILURE);
-    }
-    if (ntohl (Rply_buff.bigend) != 0x12345678) {
-      printf (
-	    "SinqHM_Client -- big-endian/little-endian problem!\n"
-	    "    Buffer received in non-network byte order!\n");
-      exit (EXIT_FAILURE);
-    }else if (ntohl (Rply_buff.status) != KER__SUCCESS) {
-      printf ("SinqHM_Client -- Bad status from Status Request: %d.\n",
-		    ntohl (Rply_buff.status));
-      printf ("     \"%s\"\n", Rply_buff.u.message);
-      exit (EXIT_FAILURE);
-    }else {
-		/*
-		**	    Display the status obtained.
-		*/
-      printf (" Maximum number of connections        = %6d\n",
-		Rply_buff.u.status.max_srvrs);
-      printf (" Maximum number of histograms         = %6d\n",
-		ntohl (Rply_buff.u.status.max_n_hists));
-      printf (" Maximum number of bins per histogram = %6d\n",
-		ntohl (Rply_buff.u.status.max_num_bins));
-      if (Rply_buff.u.status.cfg_state == 0) {
-	printf (" Space available for histograms       = %6d\n\n",
-		ntohl (Rply_buff.u.status.max_block));
-      }else {
-	printf (" Free buffer space available          = %6d\n\n",
-		ntohl (Rply_buff.u.status.max_block));
-      }
-
-      if (Rply_buff.u.status.cfg_state == 0) {
-	printf (" SINQHM has not yet been configured.\n");
-      }else {
-	state = ntohl (Rply_buff.u.status.cfg_state);
-	nh    = ntohs (Rply_buff.u.status.n_hists);
-	ch    = ntohs (Rply_buff.u.status.curr_hist);
-	nb    = ntohl (Rply_buff.u.status.num_bins);
-	bpb   = Rply_buff.u.status.bytes_per_bin;
-	span  = Rply_buff.u.status.compress;
-	if ((Hm_mode & (~SQHM__SUB_MODE_MSK)) !=
-	    (state   & (~SQHM__SUB_MODE_MSK)))
-	  new_config_quit ("hm_mode/cfg_state");
-	if (N_hists != nh) new_config_quit ("n_hists");
-	if (Hm_nbins != nb) new_config_quit ("num_bins");
-	if (Bytes_per_bin != bpb) new_config_quit ("bytes_per_bin");
-
-	print_HM_mode (state, 10);
-	if (nh != 1) printf (" Number of histograms         = %6d\n", nh);
-	if (ch != 0) printf (" Current histogram            = %6d\n", ch);
-	printf (" Number of bins per histogram = %6d\n", nb);
-	if (nh > 1) printf (" Total number of bins         = %6d\n", nh * nb);
-	if (span > 1) printf (" Bin span                     = %6d\n", span);
-	printf (" Number of bytes per bin      = %6d\n", bpb);
-	printf (" Number of active connections = %6d\n",
-			Rply_buff.u.status.act_srvrs);
-	if (Rply_buff.u.status.daq_now == 0) {
-	  printf (" Data acquisition is active\n");
-	}else {
-	  printf (" Data acquisition is not active\n");
-	}
-	tsi_status = ntohs (Rply_buff.u.status.tsi_status);
-	tsi_flags  = ntohs (Rply_buff.u.status.flags);
-	dt_or_dts  = ntohl (Rply_buff.u.status.dt_or_dts.both);
-	num_bad_ev = ntohl (Rply_buff.u.status.num_bad_events);
-	if (dt_or_dts != 0) {
-	  if ((Hm_mode & (~SQHM__SUB_MODE_MSK)) == SQHM__TOF) {
-	    printf (" Delay-Time-to-Start          = %6u\n", dt_or_dts);
-	  }else {
-	    printf (" Dead-Time                    = %6u\n", dt_or_dts);
-	  }
-	}
-	if (num_bad_ev != 0) {
-	  printf (" Number-of-Bad-Events         = %u\n", num_bad_ev);
-	}
-	if ((tsi_status != 0) || (tsi_flags != 0)) {
-	  printf (" TSI Status Info              =   0x%04x\n", tsi_status);
-	  printf (" TSI Flags                    =   0x%04x", tsi_flags);
-	  if ((tsi_flags & STATUS_FLAGS__PF)    != 0) printf (" PF");
-	  if ((tsi_flags & STATUS_FLAGS__SWC)   != 0) printf (" SWC");
-	  if ((tsi_flags & STATUS_FLAGS__NRL)   != 0) printf (" NRL");
-	  if ((tsi_flags & STATUS_FLAGS__DAQ)   != 0) printf (" DAQ");
-	  if ((tsi_flags & STATUS_FLAGS__SYNC3) != 0) printf (" SYNC3");
-	  if ((tsi_flags & STATUS_FLAGS__SYNC2) != 0) printf (" SYNC2");
-	  if ((tsi_flags & STATUS_FLAGS__SYNC1) != 0) printf (" SYNC1");
-	  if ((tsi_flags & STATUS_FLAGS__SYNC0) != 0) printf (" SYNC0");
-	  if ((tsi_flags & STATUS_FLAGS__UD)    != 0) printf (" UD");
-	  if ((tsi_flags & STATUS_FLAGS__GU)    != 0) printf (" GU");
-	  printf ("\n");
-	}
-      }
-    }
-  }
-/*
-**----------------------------------------------------------------------------*/
-  void 	do_1d (char *args, int dbg_mode) {
-/*	=====
-**		Generate a 1-dim plot
-**		Args are:
-**		    Number of first bin	(dflt = 0)
-**		    Number of bins      (dflt = rest of histogram)
-**		    Number of histogram (dflt = -1)
-**		Default is to plot everything.
-*/
-    int		i, status;
-    uint	f_bin, n_bins, hist_num;
-    uint	cntr_lo, cntr_hi;
-    uint	total;
-    char	*p_p1, *p_p2, *p_p3;
-
-    unsigned char	*p_byte;
-    unsigned short int	*p_word;
-    unsigned int	*p_long;
-
-    if (Rw_skt == 0) {
-      Rw_skt = openConnectionGbl (Rmt_host, &Rmt_port, &Pkt_size, dbg_mode,
-					    &Rply_buff, Verbose);
-      if (Rw_skt == 0) FailInet ("\ndo_1d/openConnectionGbl error.");
-    }
-    split_args (args, &p_p1, &p_p2, &p_p3, NULL);
-    if (p_p1 == NULL) p_p1 = "0";
-    if (sscanf (p_p1, "%u", &f_bin) != 1) {
-      printf ("<1st-bin> is invalid: \"%s\"\n", p_p1);
-      return;
-    }
-
-    if (p_p3 == NULL) p_p3 = "-1";
-    if ((sscanf (p_p3, "%u", &hist_num) != 1) ||
-        ((hist_num != -1) && (hist_num >= N_hists))) {
-      printf ("<hist-#> is invalid: \"%s\"\n", p_p3);
-      printf ("There are %d histograms defined.\n", N_hists);
-      return;
-    }
-    if (((hist_num != -1) && (f_bin >= Hm_nbins)) ||
-        (f_bin >= (N_hists * Hm_nbins))) {
-      printf ("<1st-bin> is invalid: \"%s\"\n", p_p1);
-      printf ("The number of bins is %d\n",
-			(hist_num == -1) ? (N_hists * Hm_nbins) : Hm_nbins);
-      return;
-    }
-
-    if (p_p2 != NULL) {
-      if ((sscanf (p_p2, "%d", &n_bins) != 1) ||
-          ((hist_num != -1) && ((f_bin + n_bins) > Hm_nbins)) ||
-          ((f_bin + n_bins) >= (N_hists * Hm_nbins))) {
-	printf ("<#-bins> is invalid: \"%s\"\n", p_p2);
-	n_bins = (hist_num == -1) ? (N_hists * Hm_nbins) : Hm_nbins;
-	n_bins = n_bins - f_bin;
-	printf ("The value has been set to %d.\n", n_bins);
-      }
-    }else {
-      n_bins = (hist_num == -1) ? (N_hists * Hm_nbins) : Hm_nbins;
-      n_bins = n_bins - f_bin;
-    }
-
-    printf (" Read histogram memory ...\n"
-	    "       First bin        = %5d\n"
-	    "       Number of bins   = %5d\n"
-	    "       Histogram number = %5d\n", f_bin, n_bins, hist_num);
-		/*
-		** Allocate buffer space for holding the data.
-		*/
-    if ((n_bins * Bytes_per_bin) > Hm_buff_size) { /* Expand buffer space? */
-      Hm_buff_addr = realloc (Hm_buff_addr, (n_bins * Bytes_per_bin)); /* Yes */
-      if (Hm_buff_addr != NULL) {
-	Hm_buff_size = n_bins * Bytes_per_bin;
-      }else {
-	printf ("SinqHM_Client -- "
-			"error getting memory buffer for histogram data.\n");
-	exit (EXIT_FAILURE);
-      }
-    }
-    Hm_buff_used = n_bins * Bytes_per_bin;
-
-    status = read_hm (Hm_buff_addr, Hm_buff_size,
-			    f_bin, n_bins, hist_num, &cntr_lo, &cntr_hi);
-    if (status == EXIT_SUCCESS) {
-      total = 0;
-      switch (Bytes_per_bin) {
-       case 1:
-	p_byte = (uchar *) Hm_buff_addr;
-	for (i=0; i < n_bins; i++) total += p_byte[i];
-	break;
-       case 2:
-	p_word = (usint *) Hm_buff_addr;
-	for (i=0; i < n_bins; i++) total += p_word[i];
-	break;
-       case 4:
-	p_long = (uint *) Hm_buff_addr;
-	for (i=0; i < n_bins; i++) total += p_long[i];
-	break;
-      }
-      printf (" Done! Total contents of bins = %d\n", total);
-      if (cntr_lo != 0) printf (" Number of underflow events = %u\n", cntr_lo);
-      if (cntr_hi != 0) printf (" Number of overflow  events = %u\n", cntr_hi);
-      do_plot (f_bin, n_bins, Bytes_per_bin, total);
-    }
-  }
-/*
-**----------------------------------------------------------------------------*/
-  void 	do_2d (char *args, int dbg_mode) {
-/*	=====
-**		Generate a 2-dim plot (e.g. of TOF array of counters
-**		Args are:
-**		    Number of first histogram
-**		    Number of histograms
-**		    Number of first bin
-**		    Number of bins
-**		Default is to plot everything.
-*/
-    char	    *p_p1, *p_p2, *p_p3, *p_p4;
-    int		    i, status;
-    uint	    f_hist, n_hists, f_bin, n_bins;
-    uint	    bytes_needed, total, cntr_lo, cntr_hi;
-
-    uchar	*p_byte;
-    usint	*p_word;
-    uint	*p_long;
-
-    if (Rw_skt == 0) {
-      Rw_skt = openConnectionGbl (Rmt_host, &Rmt_port, &Pkt_size, dbg_mode,
-					    &Rply_buff, Verbose);
-      if (Rw_skt == 0) FailInet ("\ndo_2d/openConnectionGbl error.");
-    }
-
-    split_args (args, &p_p1, &p_p2, &p_p3, &p_p4, NULL);    /* Get pointers to
-							    ** the 4 args */
-    if (p_p1 == NULL) p_p1 = "0";
-    if ((sscanf (p_p1, "%u", &f_hist) != 1) ||
-	(f_hist >= N_hists)) {
-      printf ("<1st-hist> is invalid: \"%s\"\n", p_p1);
-      printf ("There are %d histograms defined.\n", N_hists);
-      return;
-    }
-
-    if (p_p2 == NULL) {
-      n_hists = N_hists - f_hist;
-    }else {
-      if ((sscanf (p_p2, "%u", &n_hists) != 1) ||
-	  (n_hists > N_hists) ||
-	  ((n_hists + f_hist) > N_hists)) {
-	printf ("<#-hists> is invalid: \"%s\"\n", p_p2);
-	printf ("There are %d histograms defined.\n", N_hists);
-	return;
-      }
-    }
-
-    if (p_p3 == NULL) p_p3 = "0";
-    if ((sscanf (p_p3, "%u", &f_bin) != 1) ||
-	(f_bin >= Hm_nbins)) {
-      printf ("<1st-bin> is invalid: \"%s\"\n", p_p3);
-      printf ("The number of bins is %d\n", Hm_nbins);
-      return;
-    }
-
-    if (p_p4 == NULL) {
-      n_bins = Hm_nbins - f_bin;
-    }else {
-      if ((sscanf (p_p4, "%u", &n_bins) != 1) ||
-	  (n_bins > Hm_nbins) ||
-	  ((n_bins + f_bin) > Hm_nbins)) {
-	printf ("<#-bins> is invalid: \"%s\"\n", p_p4);
-	printf ("The number of bins is %d\n", Hm_nbins);
-	return;
-      }
-    }
-
-    printf ("\n Read 2-dimensional histogram memory ...\n"
-	          "       First histogram      = %5u\n"
-		  "       Number of histograms = %5u\n"
-	          "       First bin            = %5u\n"
-		  "       Number of bins       = %5u\n",
-			    f_hist, n_hists, f_bin, n_bins);
-		/*
-		** Allocate buffer space for holding the data. Note that the
-		** data in the Hist Mem is stored as a 1-dim array with
-		** the bins of each histogram contiguous. It is usually
-		** more efficient (at least, it is easier to program) to
-		** transfer over complete histograms if we need to pick out
-		** a sub-range of bins.
-		*/
-    bytes_needed = n_hists * Hm_nbins * Bytes_per_bin;
-    if (bytes_needed > Hm_buff_size) {		/* Expand buffer space? */
-      Hm_buff_addr = realloc (Hm_buff_addr, bytes_needed);  /* Yes */
-      if (Hm_buff_addr != NULL) {
-	Hm_buff_size = bytes_needed;
-      }else {
-	printf ("SinqHM_Client -- "
-			"error getting memory buffer for histogram data.\n");
-	exit (EXIT_FAILURE);
-      }
-    }
-    Hm_buff_used = bytes_needed;
-
-    status = read_hm (Hm_buff_addr, Hm_buff_size,
-			    (f_hist * Hm_nbins), (n_hists * Hm_nbins), -1,
-			    &cntr_lo, &cntr_hi);
-    if (status == EXIT_SUCCESS) {
-      total = 0;
-      switch (Bytes_per_bin) {
-       case 1:
-	p_byte = (uchar *) Hm_buff_addr;
-	for (i=0; i<(n_hists * Hm_nbins); i++) total += p_byte[i];
-	break;
-       case 2:
-	p_word = (usint *) Hm_buff_addr;
-	for (i=0; i<(n_hists * Hm_nbins); i++) total += p_word[i];
-	break;
-       case 4:
-	p_long = (uint *) Hm_buff_addr;
-	for (i=0; i<(n_hists * Hm_nbins); i++) total += p_long[i];
-      }
-      printf (" Done! Total contents of bins = %d\n", total);
-      if (cntr_lo != 0) printf (" Number of underflow events = %u\n", cntr_lo);
-      if (cntr_hi != 0) printf (" Number of overflow  events = %u\n", cntr_hi);
-      do_2d_plot (f_hist, n_hists, f_bin, n_bins, Bytes_per_bin, total);
-    }
-  }
-/*
-**----------------------------------------------------------------------------*/
-  void do_2d_plot (
-/*     ==========
-**			    Make a 2-dimensional plot of the data.
-*/
-		    uint f_hist, uint n_hists, uint f_bin, uint n_bins,
-		    uint bytes_per_bin, uint total) {
-
-    int		i, t_bins, ix1, ix2, iy1, iy2, ioff;
-    int		nx = 1;
-    int		ny = 1;
-    char	total_txt[21];
-#ifdef LINUX
-    char	dev[] = "/XSERV";
-#else
-    char	dev[] = "/XW";
-#endif
-    char	xlab[] = "Bins";
-    char	ylab[] = "Counts";
-    float	xlo, xhi, yhi, bias;
-    float	*data;
-    float	*x, *ylims;
-
-    uchar	*p_byte;
-    usint	*p_word;
-    uint	*p_long;
-
-    if ((n_hists == 0) || (n_bins == 0) || (total == 0)) {
-      printf ("Nothing to plot!\n");
-      return;
-    }
-
-    p_byte = (uchar *) Hm_buff_addr;
-    p_word = (usint *) Hm_buff_addr;
-    p_long = (uint  *) Hm_buff_addr;
-
-    t_bins = n_hists * Hm_nbins;
-
-    data = (float *) malloc (t_bins * sizeof (float));
-    if (data == NULL) {
-      printf ("Cannot get plot memory for 2-dim array\n");
-      return;
-    }
-
-    x = (float *) malloc ((n_bins + 1) * sizeof (float));
-    if (x == NULL) {
-      printf ("Cannot get plot memory for x-array\n");
-      return;
-    }
-
-    ylims = (float *) malloc ((n_bins + 1) * sizeof (float));
-    if (x == NULL) {
-      printf ("Cannot get workspace memory for 2-dim plot\n");
-      return;
-    }
-
-    switch (bytes_per_bin) {
-     case 1:
-      for (i = 0; i < t_bins; i++) data[i] = p_byte[i]; break;
-     case 2:
-      for (i = 0; i < t_bins; i++) data[i] = p_word[i]; break;
-     case 4:
-      for (i = 0; i < t_bins; i++) data[i] = p_long[i]; break;
-    }
-
-    yhi = 10.0;
-    for (i = 0; i < t_bins; i++) if (data[i] > yhi) yhi = data[i];
-    yhi = yhi * 1.3;
-    yhi = cpgrnd (yhi, &i);
-
-    ioff = 1;
-    for (i = 0; i <= n_bins; i++) x[i] = (float) (f_bin + i);
-    xlo = (float) f_bin;
-    xhi = (float) f_bin + n_bins + 1 + (n_hists * ioff);
-    
-    ix1 = 1;
-    ix2 = n_hists;
-    iy1 = f_bin + 1;
-    iy2 = f_bin + n_bins;
-
-    bias = yhi * 0.0001;
-
-    sprintf (total_txt, "Bin Total = %8d", total);
-
-    if (PGPLOT_started == 0) {
-      cpgbeg (0, dev, 1, 1);
-	    /* - - - - - - - - - - - - - - - - - - - - - -
-	    ** Set black on white (hopefully)
-	    */
-      cpgscr (0, 0.79, 0.67, 0.57);
-      cpgscr (1, 0.0, 0.0, 0.0);
-
-      cpgask (0);
-      PGPLOT_started = 1;
-    }
-    cpgenv (xlo, xhi, 0.0, yhi, 0, 0);
-    cpglab (xlab, ylab, total_txt);
-
-    cpghi2d (data, n_hists, Hm_nbins, ix1, ix2, iy1, iy2, x, ioff,
-		    bias, False, ylims);
-
-    free (data);
-    free (x);
-    free (ylims);
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void exit_handler () {
-/*     ============
-**			We must exit. Tidy up first.
-**			Close TCP/IP link to front-end.
-*/
-    int	    status;
-/*
-**			Tell server we're quitting.
-*/
-    if (Rw_skt != 0) {
-      printf ("Closing connection to %s ...\n", Rmt_host);
-      Req_buff.bigend = htonl (0x12345678);
-      Req_buff.cmnd = htonl (SQHM_CLOSE);
-      status = send (Rw_skt, (char *) &Req_buff, sizeof (Req_buff), 0);
-      Rw_bytes_put += status;
-      if (status == -1) FailInet ("exit_handler -- R/W-Socket send error\n");
-      if (status != sizeof (Req_buff)) {
-        printf ("EXIT_HANDLER -- wrong number of bytes sent: %d", status);
-        exit (EXIT_FAILURE);
-      }
-      status = close (Rw_skt);
-      Rw_skt = 0;
-      if (status != 0) FailInet ("exit_handler -- R/W-Socket close error\n");
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void gen_data (char *args) {
-/*     ========
-**				Generate sum of 2 Lorenzians.
-*/
-
-    int		 i, j, nbins;
-    char	*p_p1, *p_p2, *p_p3, *p_p4, *p_p5, *p_p6;
-    float	 p1, p2, p3, p4, p5, p6;
-    float	 ff, fact_1, fact_2;
-    char	*p_byte;
-    short int	*p_word;
-    int		*p_long;
-		/*
-		** Allocate buffer space for holding the data.
-		*/
-    nbins = Hm_nbins * N_hists;
-    if ((nbins * Bytes_per_bin) > Hm_buff_size) {  /* Expand buffer space? */
-      Hm_buff_addr = realloc (Hm_buff_addr, (nbins * Bytes_per_bin)); /* Yes */
-      if (Hm_buff_addr != NULL) {
-        Hm_buff_size = nbins * Bytes_per_bin;
-      }else {
-        printf ("SinqHM_Client -- "
-			"error getting memory buffer for histogram data.\n");
-        exit (EXIT_FAILURE);
-      }
-    }
-    Hm_buff_used = nbins * Bytes_per_bin;
-		/*
-		** Parse the arguments
-		*/
-    split_args (args, &p_p1, &p_p2, &p_p3, &p_p4, &p_p5, &p_p6, NULL);
-
-    if ((p_p1 != NULL) && (sscanf (p_p1, "%f", &p1) == 1)) P1 = p1;
-    if ((p_p2 != NULL) && (sscanf (p_p2, "%f", &p2) == 1)) P2 = p2;
-    if ((p_p3 != NULL) && (sscanf (p_p3, "%f", &p3) == 1)) P3 = p3;
-    if ((p_p4 != NULL) && (sscanf (p_p4, "%f", &p4) == 1)) P4 = p4;
-    if ((p_p5 != NULL) && (sscanf (p_p5, "%f", &p5) == 1)) P5 = p5;
-    if ((p_p6 != NULL) && (sscanf (p_p6, "%f", &p6) == 1)) P6 = p6;
-
-    if (P2 <= 0) P2 = 1000;
-    if (P5 <= 0) P5 = 1000;
-
-    if (P3 <= 0) P3 = ((float) Hm_nbins) * 0.25;
-    if (P6 <= 0) P6 = ((float) Hm_nbins) * 0.60;
-
-    p_byte = (char	*) Hm_buff_addr;
-    p_word = (short int *) Hm_buff_addr;
-    p_long = (int	*) Hm_buff_addr;
-
-    for (j = 0; j < N_hists; j++) {    /* Calculate sum of 2 Lorenzians */
-      fact_1 = 0.5 + (float) (j)/(float) (N_hists);
-      fact_2 = 2.0 - fact_1;
-
-      for (i = 0; i < Hm_nbins; i++) {
-
-	p1 = ((float) i) - P3;	/* First Lorenzian */
-	p1 = p1 * p1;
-	p2 = P1/(P2 + p1);
-	p2 *= fact_1;
-
-	p3 = ((float) i) - P6;	/* Second Lorenzian */
-	p3 = p3 * p3;
-	p4 = P4/(P5 + p3);
-	p4 *= fact_2;
-
-	ff = p2 + p4;
-	switch (Bytes_per_bin) {
-	 case 1:
-	  *p_byte++ = (char) ff;
-	  break;
-	 case 2:
-	  *p_word++ = (short int) ff;
-	  break;
-	 case 4:
-	  *p_long++ = (int) ff;
-	  break;
-	}
-      }
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void gen_data_2d (char *args) {
-/*     ===========
-**				Same as gen_data, i.e. generate sum of 2
-**				Lorenzians, but suitable for pseudo 2-dim mode.
-**				The first arg is the number of sub-histograms.
-*/
-    char	*p_nhis, *p_p1, *p_p2, *p_p3, *p_p4, *p_p5, *p_p6;
-    int		 i, j, totbins, nhis, nbins;
-    float	 p1, p2, p3, p4, p5, p6;
-    float	 ff, fact_1, fact_2;
-    char	*p_byte;
-    short int	*p_word;
-    int		*p_long;
-
-		/*
-		** Allocate buffer space for holding the data.
-		*/
-    totbins = Hm_nbins * N_hists;
-    if ((totbins * Bytes_per_bin) > Hm_buff_size) {  /* Expand buffer space? */
-      Hm_buff_addr = realloc (Hm_buff_addr, (totbins * Bytes_per_bin)); /* Yes */
-      if (Hm_buff_addr != NULL) {
-        Hm_buff_size = totbins * Bytes_per_bin;
-      }else {
-        printf ("SinqHM_Client -- "
-			"error getting memory buffer for histogram data.\n");
-        exit (EXIT_FAILURE);
-      }
-    }
-    Hm_buff_used = totbins * Bytes_per_bin;
-		/*
-		** Parse the arguments
-		*/
-    split_args (args, &p_nhis,
-		      &p_p1, &p_p2, &p_p3, &p_p4, &p_p5, &p_p6, NULL);
-    if (p_nhis != NULL) {
-      i = sscanf (p_nhis, "%i", &nhis);
-      if ((i != 1) || ((totbins % nhis) != 0)) {
-	if (i != 1) printf ("<#-hists> is invalid. It must be an integer!\n");
-	if (i == 1) printf ("<#-hists> is invalid. It must be a factor"
-				" of the total number of bins!\n");
-	printf ("<#-hists> is \"%s\", total number of bins = %d\n",
-				p_nhis, totbins);
-	printf ("<#-hists> set to 1\n");
-	nhis = 1;
-      }
-    }else {
-      nhis = 1;
-    }
-    nbins = totbins/nhis;
-
-    if ((p_p1 != NULL) && (sscanf (p_p1, "%f", &p1) == 1)) P1 = p1;
-    if ((p_p2 != NULL) && (sscanf (p_p2, "%f", &p2) == 1)) P2 = p2;
-    if ((p_p3 != NULL) && (sscanf (p_p3, "%f", &p3) == 1)) P3 = p3;
-    if ((p_p4 != NULL) && (sscanf (p_p4, "%f", &p4) == 1)) P4 = p4;
-    if ((p_p5 != NULL) && (sscanf (p_p5, "%f", &p5) == 1)) P5 = p5;
-    if ((p_p6 != NULL) && (sscanf (p_p6, "%f", &p6) == 1)) P6 = p6;
-
-    if (P2 <= 0) P2 = 1000;
-    if (P5 <= 0) P5 = 1000;
-
-    if (P3 <= 0) P3 = ((float) nbins) * 0.25;
-    if (P6 <= 0) P6 = ((float) nbins) * 0.60;
-
-    p_byte = (char	*) Hm_buff_addr;
-    p_word = (short int *) Hm_buff_addr;
-    p_long = (int	*) Hm_buff_addr;
-
-    for (j = 0; j < nhis; j++) {    /* Calculate sum of 2 Lorenzians */
-      fact_1 = 0.5 + (float) (j)/(float) (nhis);
-      fact_2 = 2.0 - fact_1;
-
-      for (i = 0; i < nbins; i++) {
-
-	p1 = ((float) i) - P3;	/* First Lorenzian */
-	p1 = p1 * p1;
-	p2 = P1/(P2 + p1);
-	p2 *= fact_1;
-
-	p3 = ((float) i) - P6;	/* Second Lorenzian */
-	p3 = p3 * p3;
-	p4 = P4/(P5 + p3);
-	p4 *= fact_2;
-
-	ff = p2 + p4;
-	switch (Bytes_per_bin) {
-	 case 1:
-	  *p_byte++ = (char) ff;
-	  break;
-	 case 2:
-	  *p_word++ = (short int) ff;
-	  break;
-	 case 4:
-	  *p_long++ = (int) ff;
-	  break;
-	}
-      }
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**			get_check_resources - get and check our resources
-*/
-  int	get_check_resources (
-/*	===================
-*/			    XrmDatabase	*db,
-			    char	*appName,
-			    int		*argc,
-			    char	*argv[],
-			    int		verbose) {
-
-    int			i, status, len, do_help;
-    char		buff[80];
-    char		*type;
-    XrmValue		value;
-    time_t		time_now;
-    float		tmp_secs;
-/*----------------------------------------------------------	-help	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmHelp"),
-			     "ProgramName.Values",
-			     &type, &value);
-    do_help = (status) ? True : False;
-    if (do_help) {
-      show_help (NULL);
-      exit (EXIT_SUCCESS);
-    }
-/*----------------------------------------------------------	-?	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmHelpItem"),
-			     "ProgramName.Values",
-			     &type, &value);
-    do_help = (status) ? True : False;
-    if (do_help) {
-      len = sizeof (buff);
-      StrEdit (buff, value.addr, "trim lowercase", &len);
-      show_help (buff);
-      exit (EXIT_SUCCESS);
-    }
-/*----------------------------------------------------------	-verbose */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmVerbose"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Verbose = verbose = (status) ? True : False;
-/*----------------------------------------------------------	-host	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmHost"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (status) {
-      StrJoin (Rmt_host, sizeof (Rmt_host), value.addr, "");
-    }else {
-      if (*argc >= 2) {
-	StrJoin (Rmt_host, sizeof (Rmt_host), argv[1], "");
-	(*argc)--;
-	for (i = 1; i < *argc; i++) argv[i] = argv[i+1];
-      }else {
-	printf ("\n"
-		"  Target host not specified, there is no default!\n");
-	show_help (NULL);
-	exit (EXIT_FAILURE);
-      }
-    }
-    if (verbose) printf ("Target host is \"%s\".\n", Rmt_host);
-/*----------------------------------------------------------	-port	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmPort"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%d", &Rmt_port) != 1)) {
-      Rmt_port = 2400;
-      if (verbose) printf ("Using the default TCP/IP port number of ");
-    }else {
-      if (verbose) printf ("TCP/IP  port  number = ");
-    }
-    if (verbose) printf ("%d\n", Rmt_port);
-/*----------------------------------------------------------	-pktsize */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmPktSize"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%d", &Pkt_size) != 1)) {
-      Pkt_size = 8192;
-      if (verbose) printf ("Using the default packet size of ");
-    }else {
-      if (verbose) printf ("Packet size = ");
-    }
-    if (verbose) printf ("%d\n", Pkt_size);
-/*----------------------------------------------------------	-debug	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmDebug"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Dbg_mode = (status) ? 1 : 0;
-/*----------------------------------------------------------*/
-    return True;
-  }
-/*
-**----------------------------------------------------------------------------*/
-  int	get_recd (FILE *lun, char *recd, int recd_len) {
-/*	========
-**				Get a non-comment record from a file
-*/
-    int nbytes = -1;
-
-    while (nbytes <= 0) {
-      if (fgets (recd, (recd_len - 1), lun) == NULL) return False;
-
-      nbytes = recd_len;
-      StrEdit (recd, recd, "trim compress uncomment", &nbytes);
-    }
-    return True;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void new_config_quit (
-/*     ===============
-**			    Quit because SinqHM config'n has changed.
-**
-*/		char	 *txt) {
-
-    printf ("\n"
-	" It looks as though the configuration of SinqHM has been changed\n"
-	" whilst we were not looking. This should not be possible!\n"
-	" Please report the incident.\n"
-	" The item which has changed is \"%s\".\n\n", txt);
-    exit (EXIT_FAILURE);
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int openConnection (
-/*    ==============
-**			Open connection to histogram memory front-end.
-**			Return value is socket id for communication with server.
-**			On successful connection, the SQHM_CNCT status reply
-**			is returned in <request>.
-*/
-	    char	*node,
-	    int		*port,		       /* <== this arg gets modified! */
-	    int		*pkt_size,	       /* <== this arg gets modified! */
-	    int		 mode,
-	    struct rply_buff_struct *reply,    /* <== this arg gets modified! */
-	    int		 verbose) {
-
-    int	    i, status;
-    int	    my_skt = 0;
-    struct sockaddr_in	lcl_sockname;
-    struct sockaddr_in	rmt_sockname;
-    int			rmt_inet_addr;
-    struct in_addr	*rmt_inet_addr_pntr;
-    struct hostent	*rmt_hostent;
-    int			rmt_sockname_len;
-		/*
-		** Get Internet address of the front-end.
-		*/
-    for (i=0; i < strlen (node); i++) node[i] = tolower (node[i]);
-    rmt_hostent = gethostbyname (node);
-    if (rmt_hostent == NULL) {
-		/*
-		** The following code is to handle nodes which are not yet
-		** in the BIND data base.
-		*/
-      if (strcmp (node, "sqfe01") == 0) {
-        rmt_inet_addr_pntr = (struct in_addr *) &rmt_inet_addr;
-	rmt_inet_addr = inet_addr ("129.129.56.181");
-      }else {
-	printf ("Server Node is %s.\n", node);
-        FailInet ("\nopenConnection/Gethostbyname error.");
-      }
-    }else {
-      rmt_inet_addr_pntr = (struct in_addr *) rmt_hostent->h_addr_list[0];
-    }
-    printf (" SinqHM Server is %s ", rmt_hostent->h_name);
-    printf ("(%s),", inet_ntoa (*rmt_inet_addr_pntr));
-    printf (" Base port %d\n", *port);
-/*
-**	    Create a TCP/IP socket for prelim. connect to server and bind it.
-*/
-    Cnct_skt = socket (AF_INET, SOCK_STREAM, 0);
-    if (Cnct_skt == -1) FailInet ("openConnection -- Cnct_skt socket error.\n");
-
-    lcl_sockname.sin_family = AF_INET;
-    lcl_sockname.sin_port   = htons (0);
-    lcl_sockname.sin_addr.s_addr = 0;
-    status = bind (Cnct_skt, (struct sockaddr *) &lcl_sockname,
-				    sizeof (lcl_sockname));
-    if (status == -1) FailInet ("openConnection -- Cnct_skt bind error.\n");
-/*
-**=========================================  Now connect to the server.
-*/
-    rmt_sockname_len = sizeof (rmt_sockname);
-    rmt_sockname.sin_family	 = AF_INET;
-    rmt_sockname.sin_port	 = htons (*port);
-    rmt_sockname.sin_addr.s_addr = rmt_inet_addr_pntr->s_addr;
-    status = connect (Cnct_skt, (struct sockaddr *) &rmt_sockname,
-				    sizeof (rmt_sockname));
-    if (status == -1) {
-      GetErrno (&My_errno, &My_vaxc_errno);
-      FailInet ("openConnection -- connect error\n");
-    }
-/*
-**============================== Set up and send a connection request message.
-*/
-    Req_buff.bigend = htonl (0x12345678);
-    Req_buff.cmnd   = htonl (SQHM_CNCT);
-    Req_buff.u.cnct.max_pkt = htonl (*pkt_size);
-    Req_buff.u.cnct.strt_mode = htonl (mode);
-    if (mode != 0) {
-      printf (" Warning -- mode = %d\n", mode);
-      printf (" Use the debugger in the Hist Mem to get our server to run.\n");
-    }
-    status = send (Cnct_skt, (char *) &Req_buff, sizeof (Req_buff), 0);
-    if (status == -1) FailInet ("openConnection -- Cnct-Socket send error\n");
-    if (status != sizeof (Req_buff)) {
-      printf ("SinqHM_Client -- wrong number of bytes sent: %d\n", status);
-      exit (EXIT_FAILURE);
-    }
-/*
-**	Wait for the response telling us the port to use.
-*/
-    status = recv (Cnct_skt, (char *) &Rply_buff, sizeof (Rply_buff), 0);
-    if (status == -1) {
-      FailInet ("openConnection -- Cnct-Socket recv error\n");
-    }else if (status != sizeof (Rply_buff)) {
-      printf ("SinqHM_Client --  Cnct-Socket recv error - ");
-      printf ("unexpected byte count: %d.\n", status);
-      exit (EXIT_FAILURE);
-    }
-    if (ntohl (reply->bigend) != 0x12345678) {
-      printf (
-	    "SinqHM_Client -- big-endian/little-endian problem!\n"
-	    "    Buffer received in non-network byte order!\n");
-      exit (EXIT_FAILURE);
-    }
-    status = ntohl (reply->status);
-    if (status != KER__SUCCESS) {
-      if (status == KER__BAD_STATE) {
-	printf (" SinqHM_Client -- Histogram memory has not yet been "
-					    "configured!\n");
-	print_uptime (stdout, " Up-time = ", ntohl (reply->u.cnct.up_time),
-						"\n");
-      }else if (status == KER__BAD_CREATE) {
-	status = ntohl (reply->sub_status);
-	printf (
-	 "SinqHM_Client -- creation of histogram memory server process "
-							    "failed!\n"
-	 "                 Sub-status = ");
-	switch (status) {
-	 case -1: printf ("%d. Spawn failed.\n", status); break;
-	 case -2: printf ("%d. No more ports available.\n", status); break;
-	 case -3: printf ("%d. Time-out.\n", status); break;
-	 case -4: printf ("%d. Child process detected a problem "
-				    "during startup.\n", status); break;
-	 default: printf ("%d. Undefined. Refer to the source code!\n", status);
-	}
-      }else {
-	printf ("SinqHM_Client -- Bad and unrecognised status from Connect "
-					    "Request: %d.\n", status);
-      }
-      exit (EXIT_FAILURE);
-    }
-    status = close (Cnct_skt);
-    Cnct_skt = 0;
-    if (status != 0) FailInet ("openConnection -- Cnct-Socket close error\n");
-
-    *port = ntohl (reply->u.cnct.port);
-    if (verbose) printf (" Server port to use           = %6d\n", *port);
-    *pkt_size = ntohl (reply->u.cnct.pkt_size);
-    if (verbose) printf (" Agreed packet size           = %6d\n", *pkt_size);
-/*
-**     Now create, bind and connect a TCP/IP socket to our remote server port.
-*/
-    my_skt = socket (AF_INET, SOCK_STREAM, 0);
-    if (my_skt == -1) {
-      FailInet ("openConnection -- Srvr-Skt socket error.\n");
-      return 0;
-    }
-
-    lcl_sockname.sin_family = AF_INET;
-    lcl_sockname.sin_port   = htons (0);
-    lcl_sockname.sin_addr.s_addr = 0;
-    status = bind (my_skt, (struct sockaddr *) &lcl_sockname,
-						    sizeof (lcl_sockname));
-    if (status == -1) {
-      FailInet ("openConnection -- Srvr-Skt bind error.\n");
-      return 0;
-    }
-
-    rmt_sockname_len = sizeof (rmt_sockname);
-    rmt_sockname.sin_family	 = AF_INET;
-    rmt_sockname.sin_port	 = htons (*port);
-    rmt_sockname.sin_addr.s_addr = rmt_inet_addr_pntr->s_addr;
-    status = connect (my_skt, (struct sockaddr *) &rmt_sockname,
-						    sizeof (rmt_sockname));
-    if (status == -1) {
-      GetErrno (&My_errno, &My_vaxc_errno);
-      FailInet ("openConnection -- Srvr-Skt connect error\n");
-      return 0;
-    }
-    Rw_bytes_got = 0; Rw_bytes_put = 0;
-
-    return my_skt;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int openConnectionGbl (
-/*    =================
-**			Call openConnection then set up some global variables.
-*			Return value is socket id for communication with server.
-*/
-	    char	*node,
-	    int		*port,		       /* <== this arg gets modified! */
-	    int		*pkt_size,	       /* <== this arg gets modified! */
-	    int		 mode,
-	    struct rply_buff_struct *reply,    /* <== this arg gets modified! */
-	    int		 verbose) {
-
-    int	    my_skt = 0;
-
-    my_skt = openConnection (node, port, pkt_size, mode, reply, verbose);
-    if (my_skt == 0) return my_skt;
-
-    Hm_mode = ntohl (Rply_buff.u.cnct.hm_mode);
-    if (verbose) print_HM_mode (Hm_mode, 10);
-
-    N_hists = ntohl (Rply_buff.u.cnct.n_hists);
-    if (verbose && (N_hists != 1))
-      printf (" Number of histograms         = %6d\n", N_hists);
-
-    Hm_nbins = ntohl (Rply_buff.u.cnct.num_bins);
-    if (verbose) printf (" Number of bins per histogram = %6d\n", Hm_nbins);
-
-    Compress = ntohl (Rply_buff.u.cnct.compress);
-    if ((verbose) && (Compress > 1))
-      printf (" Bin span                     = %6d\n", Compress);
-
-    if (verbose && (N_hists > 1))
-      printf (" Total number of bins         = %6d\n", N_hists * Hm_nbins);
-
-    Bytes_per_bin = ntohl (Rply_buff.u.cnct.bytes_per_bin);
-    if (verbose)
-      printf (" Number of bytes per bin      = %6d\n", Bytes_per_bin);
-
-    Lo_cntr = ntohl (Rply_buff.u.cnct.lo_cntr);
-    if (verbose && (Lo_cntr != 0))
-      printf (" Low counter number           = %6d\n", Lo_cntr);
-
-    Lo_bin = ntohl (Rply_buff.u.cnct.lo_bin);
-    if (verbose && (Lo_bin != 0))
-      printf (" Low counter number           = %6d\n", Lo_bin);
-
-    Curr_hist = ntohl (Rply_buff.u.cnct.curr_hist);
-    if (verbose && (Curr_hist != 0))
-	printf (" Current histogram            = %6d\n", Curr_hist);
-
-    Total_bytes = ntohl (Rply_buff.u.cnct.total_bytes);
-    if (verbose)
-      printf (" Histogram buffer size        = %6d bytes\n", Total_bytes);
-
-    Max_block = ntohl (Rply_buff.u.cnct.max_block);
-    if (verbose)
-      printf (" Free memory space available  = %6d bytes\n", Max_block);
-
-    return my_skt;
-  }
-/*
-**--------------------------------------------------------------------------
-*/
-  void print_HM_mode (
-/*     =============
-**			    Interpret the HM configuration.
-**
-*/		    uint   mode,    /* The configuration to be interpreted */
-		    int	   n_pad) { /* A padding count to move the "=" */
-
-    uint    my_mode;
-
-    printf (" Histogramming Mode%*s = 0x%x", n_pad, "", mode);
-
-    my_mode = mode & (~SQHM__SUB_MODE_MSK);
-    if (my_mode == SQHM__TRANS)  printf (" TRANS");
-    if (my_mode == SQHM__HM_DIG) printf (" HM_DIG");
-    if (my_mode == SQHM__TOF)    printf (" TOF");
-    if (my_mode == SQHM__HM_PSD) printf (" HM_PSD");
-    if (my_mode == SQHM__HRPT)   printf (" HRPT");
-    if ((mode & SQHM__DEBUG)   != 0) printf (" DEBUG");
-    if ((mode & SQHM__UD)      != 0) printf (" UD");
-    if ((mode & SQHM__STROBO)  != 0) printf (" STROBO");
-    if ((mode & SQHM__REFLECT) != 0) printf (" REFLECT");
-    if ((mode & SQHM__NO_STAT) != 0) printf (" NO_FILLER_STATUS");
-    printf ("\n");
-
-    printf (" Bin Overflow Mode %*s = ", n_pad, "");
-    my_mode = mode & SQHM__BO_MSK;
-    if (my_mode == SQHM__BO_IGN) {
-      printf ("\"Ignore\"\n");
-    }else if (my_mode == SQHM__BO_SMAX) {
-      printf ("\"Stop-at-Max\"\n");
-    }else if (my_mode == SQHM__BO_CNT) {
-      printf ("\"Count\"");
-    }else {
-      printf ("\"Unrecognised\" = 0x%x\n", my_mode);
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void	print_uptime (
-/*	============
-**			Print out the up-time
-*/
-	    FILE    *lun,   	/* The output stream */
-	    char    *prefix,	/* A message prefix */
-	    int	     secs,	/* The up-time in seconds */
-	    char    *suffix) {	/* A message suffix */
-
-    int		mins, hrs, days;
-
-    mins = secs/60; secs -= mins * 60;
-    hrs  = mins/60; mins -= hrs  * 60;
-    days = hrs/24;  hrs  -= days * 24;
-    fprintf (lun, "%s", prefix);
-    if (days > 0) {
-      printf (" %d days, %d%02d%02d%s", days, hrs, mins, secs, suffix);
-    }else if (hrs > 0) {
-      printf (" %d hrs, %d mins, %d secs%s", hrs, mins, secs, suffix);
-    }else if (mins > 0) {
-      printf (" %d mins, %d secs%s", mins, secs, suffix);
-    }else {
-      printf (" %d secs%s", secs, suffix);
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int read_hm (
-/*    =======
-**			Read block of bins from SINQHM_SRV
-*/
-	    char *hbuf,		/* Buffer to hold data */
-	    uint  hbuf_size,	/* Size of hbuf */
-	    uint  f_bin,	/* First bin to read */
-	    uint  n_bins,	/* Number of bins to read	*/
-	    uint  hist_no,	/* Histogram number to read	*/
-	    uint *cntr_lo,	/* # events below histo range */
-	    uint *cntr_hi) {	/* # events above histo range */
-/*
-**		Send SQHM_READ request to server to read n_bins hist mem bins
-**		starting at bin f_bin. On return, the data is in the buffer
-**		pointed to by Hm_buff_addr.
-*/
-    int		    status, is, i;
-    int		    bytes_to_come;
-    uint	    my_n_bins, my_bytes_per_bin;
-
-    uchar	*nxt_byte;
-    usint	*nxt_word;
-    uint	*nxt_long;
-
-    bytes_to_come = n_bins * Bytes_per_bin;
-    if (bytes_to_come > hbuf_size) {
-        printf ("read_hm: buffer is too small!\n"
-		    "         It is %d rather than %d bytes long.\n",
-		    hbuf_size, bytes_to_come);
-	return EXIT_FAILURE;
-    }
-
-    status = EXIT_SUCCESS;		/* Assume success. */
-    Req_buff.bigend = htonl (0x12345678);
-    Req_buff.cmnd = htonl (SQHM_READ);
-    Req_buff.u.read.n_bins     = htonl (n_bins);
-    Req_buff.u.read.first_bin    = htonl (f_bin);
-    Req_buff.u.read.hist_no	 = htonl (hist_no);
-    status = send (Rw_skt, (char *) &Req_buff, sizeof (Req_buff), 0);
-    Rw_bytes_put += status;
-    if (status == -1) FailInet ("read_hm -- R/W-Socket send error\n");
-    if (status != sizeof (Req_buff)) {
-        printf ("read_hm: wrong number of bytes sent: %d", status);
-	return EXIT_FAILURE;
-    }
-	/*
-	**	Wait for the status response.
-	*/
-    status = recv (Rw_skt, (char *) &Rply_buff, sizeof (Rply_buff), 0);
-    Rw_bytes_got += status;
-    if (status == -1) {
-      FailInet ("read_hm -- R/W-Socket recv error\n");
-    }else if (status != sizeof (Rply_buff)) {
-      printf ("read_hm: R/W-Socket recv error - ");
-      printf ("unexpected byte count: %d.\n", status);
-      return EXIT_FAILURE;
-    }
-    if (ntohl (Rply_buff.bigend) != 0x12345678) {
-      printf (
-	    "read_hm: big-endian/little-endian problem!\n"
-	    "    Buffer received in non-network byte order!\n");
-      return EXIT_FAILURE;
-    }
-    if (ntohl (Rply_buff.status) != KER__SUCCESS) {
-      printf ("read_hm: Bad status from SQHM_READ Request: %d.\n",
-	 	    ntohl (Rply_buff.status));
-      printf ("                                  Sub-status: %d.\n",
-	 	    ntohl (Rply_buff.sub_status));
-      if (Rply_buff.u.message[0] != NIL)
-	printf ("           Message is: %s\n", Rply_buff.u.message);
-      return EXIT_FAILURE;
-    }
-	/*
-	**	Data was read OK so read the data which has been sent.
-	*/
-    my_n_bins	     = ntohl (Rply_buff.u.read.n_bins);
-    my_bytes_per_bin = ntohl (Rply_buff.u.read.bytes_per_bin);
-    *cntr_lo	     = ntohl (Rply_buff.u.read.cnts_lo);
-    *cntr_hi	     = ntohl (Rply_buff.u.read.cnts_hi);
-    if (my_n_bins != n_bins) {
-      printf ("read_hm: "
-	"Warning -- server is sending us %d bins of data rather than %d!\n",
-	my_n_bins, n_bins);
-    }
-    bytes_to_come = my_n_bins * my_bytes_per_bin;
-    if (bytes_to_come > hbuf_size) {
-      printf ("read_hm: Warning -- buffer size = %d bytes\n"
-		  "                    Server is sending us %d bytes of data.\n"
-		  "                    Some data will have to be flushed!\n",
-		    hbuf_size, bytes_to_come);
-    }
-    nxt_byte = (uchar *) Hm_buff_addr;
-    while (bytes_to_come > 0) {
-      i = (bytes_to_come > Pkt_size) ? Pkt_size : bytes_to_come;
-      if (bytes_to_come > hbuf_size) {
-	i = hbuf_size;
-	nxt_byte = (uchar *) Hm_buff_addr;
-      }
-      status = recv (Rw_skt, nxt_byte, i, 0);
-      Rw_bytes_got += status;
-      if (status == -1) FailInet ("read_hm -- R/W-Socket data recv error\n");
-      bytes_to_come = bytes_to_come - status;
-      nxt_byte      = nxt_byte      + status;
-    }
-		/*
-		** If byte swapping is necessary, do it!
-		*/
-    if ((Bytes_per_bin > 0) && (Rply_buff.bigend != 0x12345678)) {
-      switch (Bytes_per_bin) {	    /* Byte swapping is necessary */
-       case 2:
-			/* Not sure how to do this - this might be wrong! */
-        nxt_word = (usint *) Hm_buff_addr;
-	for (i = 0; i < n_bins; i++) nxt_word[i] = ntohs (nxt_word[i]);
-        break;
-       case 4:
-        nxt_long = (uint *) Hm_buff_addr;
-	for (i = 0; i < n_bins; i++) nxt_long[i] = ntohl (nxt_long[i]);
-        break;
-      }
-    }
-    return EXIT_SUCCESS;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int read_project (
-/*    ============
-**			Read projected block of bins from SINQHM_SRV.
-**			Send SQHM_PROJECT request to server.
-**			On return, the data is in the buffer pointed to by hbuf.
-*/
-	    char *hbuf,		/* Buffer to hold data */
-	    uint  hbuf_size,	/* Size of hbuf */
-	    uint  f_bin,	/* First bin to read */
-	    uint  n_bins,	/* Number of bins to read */
-	    uint  f_hist,	/* First histogram to read */
-	    uint  n_hists,	/* Number of histograms to read */
-	    uint  axis,		/* Projection axis */
-	    uint  xdim,		/* Pseudo-x-dimension */
-	    uint  h_select,	/* Histogram to select (pseudo 2-d mode) */
-	    uint *cntr_lo,	/* # events below histo range */
-	    uint *cntr_hi) {	/* # events above histo range */
-
-    int		    status, is, i;
-    int		    bytes_to_come;
-    uint	    nbins_to_read, my_n_bins, my_bytes_per_bin;
-
-    uchar	*nxt_byte;
-    usint	*nxt_word;
-    uint	*nxt_long;
-
-    nbins_to_read = (axis == 0) ? n_bins : n_hists;
-    bytes_to_come = nbins_to_read * sizeof (uint);
-    if (bytes_to_come > hbuf_size) {
-        printf ("read_project: buffer is too small!\n"
-		    "              It is %d rather than %d bytes long.\n",
-		    hbuf_size, bytes_to_come);
-	return EXIT_FAILURE;
-    }
-
-    status = EXIT_SUCCESS;		/* Assume success. */
-    Req_buff.bigend = htonl (0x12345678);
-    Req_buff.cmnd = htonl (SQHM_PROJECT);
-
-    i = (axis == 0) ? 0 : PROJECT__ON_Y;
-    if (xdim != 0) i |= PROJECT__1_DIM;
-    Req_buff.u.project.sub_code = htonl (i);
-
-    Req_buff.u.project.x_lo     = htonl (f_bin);
-    Req_buff.u.project.nx	= htonl (n_bins);
-    Req_buff.u.project.y_lo     = htonl (f_hist);
-    Req_buff.u.project.ny	= htonl (n_hists);
-    Req_buff.u.project.xdim     = htonl (xdim);
-    Req_buff.u.project.nhist    = htonl (h_select);
-    status = send (Rw_skt, (char *) &Req_buff, sizeof (Req_buff), 0);
-    Rw_bytes_put += status;
-    if (status == -1) FailInet ("read_project -- R/W-Socket send error\n");
-    if (status != sizeof (Req_buff)) {
-        printf ("read_project: wrong number of bytes sent: %d", status);
-	return EXIT_FAILURE;
-    }
-	/*
-	**	Wait for the status response.
-	*/
-    status = recv (Rw_skt, (char *) &Rply_buff, sizeof (Rply_buff), 0);
-    Rw_bytes_got += status;
-    if (status == -1) {
-      FailInet ("read_project -- R/W-Socket recv error\n");
-    }else if (status != sizeof (Rply_buff)) {
-      printf ("read_project: R/W-Socket recv error - ");
-      printf ("unexpected byte count: %d.\n", status);
-      return EXIT_FAILURE;
-    }
-    if (ntohl (Rply_buff.bigend) != 0x12345678) {
-      printf (
-	    "read_project: big-endian/little-endian problem!\n"
-	    "    Buffer received in non-network byte order!\n");
-      return EXIT_FAILURE;
-    }
-    if (ntohl (Rply_buff.status) != KER__SUCCESS) {
-      printf ("read_project: Bad status from SQHM_READ Request: %d.\n",
-	 	    ntohl (Rply_buff.status));
-      printf ("                                  Sub-status: %d.\n",
-	 	    ntohl (Rply_buff.sub_status));
-      if (Rply_buff.u.message[0] != NIL)
-	printf ("           Message is: %s\n", Rply_buff.u.message);
-      return EXIT_FAILURE;
-    }
-	/*
-	**	Data was read OK so read the data which has been sent.
-	*/
-    my_n_bins	     = ntohl (Rply_buff.u.project.n_bins);
-    my_bytes_per_bin = ntohl (Rply_buff.u.project.bytes_per_bin);
-    *cntr_lo	     = ntohl (Rply_buff.u.project.cnts_lo);
-    *cntr_hi	     = ntohl (Rply_buff.u.project.cnts_hi);
-    if (my_n_bins != nbins_to_read) {
-      printf ("read_project: Warning -- "
-	"server is sending us %d bins of data rather than %d!\n",
-	my_n_bins, n_bins);
-    }
-    bytes_to_come = my_n_bins * my_bytes_per_bin;  /* Compute length of data */
-    if (bytes_to_come > hbuf_size) {
-      printf ("read_project: Warning -- buffer size = %d bytes\n"
-		  "                Server is sending us %d bytes of data.\n"
-		  "                Some data will have to be flushed!\n",
-		    hbuf_size, bytes_to_come);
-    }
-    nxt_byte = (uchar *) hbuf;
-    while (bytes_to_come > 0) {
-      i = (bytes_to_come > Pkt_size) ? Pkt_size : bytes_to_come;
-      if (bytes_to_come > hbuf_size) {
-	i = hbuf_size;
-	nxt_byte = (uchar *) hbuf;
-      }
-      status = recv (Rw_skt, nxt_byte, i, 0);
-      Rw_bytes_got += status;
-      if (status == -1) FailInet ("read_project -- R/W-Socket data recv error\n");
-      bytes_to_come = bytes_to_come - status;
-      nxt_byte      = nxt_byte      + status;
-    }
-		/*
-		** If byte swapping is necessary, do it!
-		*/
-    if ((my_bytes_per_bin > 0) && (Rply_buff.bigend != 0x12345678)) {
-      switch (my_bytes_per_bin) {	    /* Byte swapping is necessary */
-       case 2:
-			/* Not sure how to do this - this might be wrong! */
-        nxt_word = (usint *) hbuf;
-	for (i = 0; i < nbins_to_read; i++) nxt_word[i] = ntohs (nxt_word[i]);
-        break;
-       case 4:
-        nxt_long = (uint *) hbuf;
-	for (i = 0; i < nbins_to_read; i++) nxt_long[i] = ntohl (nxt_long[i]);
-        break;
-      }
-    }
-    return EXIT_SUCCESS;
-  }
-/*
-**---------------------------------------------------------------------------
-**			setup_xrm_database    - setup Resource Manager Database
-*/
-  int	setup_xrm_database (
-/*	==================
-*/			XrmDatabase	*db,
-			char		*name[],
-			int		*argc,
-			char		*argv[],
-			int		verbose) {
-
-    static char	our_name[80]  = "Unknown";  /* This holds the program name */
-    static char lkup_name[80] = "Unknown";  /* Name for looking in database */
-
-    int		status, i, first = True;
-    char	text[80];
-    char	full_nm0[80];
-    char	full_nm1[80];
-    char	*p_fil[] = {0,0,0,0,0,0,0,0,0,0};
-    char	*my_name;
-    char	*my_name_last;
-
-    char	*name_type;
-    XrmValue	name_value;
-
-    XrmDatabase cmnd_line_db = NULL;
-    XrmDatabase	lcl_db	     = NULL;
-  /*-----------------------------------------------------
-  ** This routine merges some resource databases with options specified on
-  ** the command line. Resources can then be looked up using XrmGetResource.
-  ** This is a bit like the X-toolkit routine XtAppInitialize does for the
-  ** extraction of resources by XtGetApplicationResources.
-  ** 
-  ** I can't help but think that there's a simpler way of doing this but I
-  ** can't find it in the X manuals. Basically, the problem arises with wanting
-  ** to avoid the calling program being associated with an X-display, i.e. it
-  ** is intended for use by "command-line oriented" programs. All the nice,
-  ** easy-to-use resource/command-line setup routines in Xlib or Xtlib seem to
-  ** assume one is going to use a display -- not surprising, I suppose,
-  ** since the concept of Xlib is for writing window based applications!
-  **
-  ** Anyway, the point is that the following way turns out to be lacking
-  ** when it gets tested in anger.
-  */
-    status = True;		/* Assume success	*/
-
-    our_name[0] = NIL;
-	/*
-	** Make a list of the databases to be merged, highest priority first.
-	*/
-#ifdef  __VMS
-    p_fil[0] = "decw$user_defaults:SinQ_rc.dat";
-    p_fil[1] = "decw$group_defaults:SinQ_rc.dat";
-    p_fil[2] = "decw$system_defaults:SinQ_rc.dat";
-    p_fil[3] = "decw$user_defaults:decw$xdefaults.dat";
-    p_fil[4] = "decw$group_defaults:decw$xdefaults.dat";
-    p_fil[5] = "decw$system_defaults:decw$xdefaults.dat";
-    p_fil[6] = NULL;
-    if (*argc > 0) {	     /* Find out what we are called - parse file nm */
-      my_name = strstr (argv[0], "]");	/* Find end of directory, i.e. "]" */
-      my_name++;			/* Skip over "]" */
-      if (my_name[0] == '[') {		/* Handle possible concealed device */
-        my_name = strstr (my_name, "]");
-	my_name++;
-      }
-      i = sizeof (our_name);
-      StrEdit (our_name, my_name, "lowercase", &i);	    /* Copy the rest */
-      strtok (our_name, ".");		/* Close it off at "." */
-    }
-#else
-    p_fil[0] = StrJoin (full_nm0, sizeof (full_nm0),
-			    getenv ("HOME"), "/SinQ_rc");
-    p_fil[1] = "/usr/lib/X11/app-defaults/SinQ_rc";
-    p_fil[2] = StrJoin (full_nm1, sizeof (full_nm1),
-			    getenv ("HOME"), "/.Xdefaults");
-    p_fil[3] = "/usr/lib/X11/app-defaults/Xdefaults";
-    p_fil[4] = NULL;
-    if (*argc > 0) {	      /* Find out what we are called - parse file nm  */
-			      /* Find end of directories */
-      my_name = argv[0] - 1;
-      while (my_name != NULL) {
-        my_name_last = my_name;
-	my_name_last++;
-	my_name = strstr (my_name_last, "/");
-      }
-      StrJoin (our_name, sizeof (our_name), my_name_last, "");
-    }
-#endif
-    if (verbose) printf ("My name is \"%s\"\n", our_name);
-	/*
-	**  Initialise and combine all databases
-	*/
-    XrmInitialize ();
-    for (i = 0; i < XtNumber (p_fil); i++) {
-      if (p_fil[i] == NULL) break;
-      status = XrmCombineFileDatabase (p_fil[i], &lcl_db, False);
-      if ((status != 0) && verbose) {
-	if (first)
-	  printf ("Resource database created from file %s.\n", p_fil[i]);
-	if (!first)
-	  printf ("File %s merged into resource database.\n", p_fil[i]);
-	first = False;
-      }
-    }
-	/*----------------------------------------------------------------
-	**  See if there's anything specified on cmnd line, incl "name".
-	*/
-    XrmParseCommand (&cmnd_line_db,
-			OpTable_0, XtNumber(OpTable_0), our_name, argc, argv);
-    if (cmnd_line_db != NULL) {
-	    /*
-	    ** There was at least 1 item on cmnd line. Process the line.
-	    ** If -name was specified, adopt it.
-	    */
-      status = XrmGetResource (cmnd_line_db,  /* See if a name was specified  */
-			    StrJoin (text, sizeof (text), our_name, ".name"),
-			    "ProgramName.Values",
-			    &name_type, &name_value);
-      if (status) {
-	i = sizeof (lkup_name);
-	StrEdit (lkup_name, name_value.addr, "lowercase", &i);
-	printf ("Option list name is \"%s\"\n", lkup_name);
-      }else {
-        strcpy (lkup_name, our_name);
-      }
-	    /*
-	    ** Loop over all items in OpTable_0 and merge them into database,
-	    ** taking care of any possible name changes.
-	    */
-      for (i = 0; i < XtNumber (OpTable_0); i++) {
-	if (strcmp (OpTable_0[i].option, "-name") == 0) continue;
-        status = XrmGetResource (cmnd_line_db,
-				StrJoin (text, sizeof (text),
-				    our_name, OpTable_0[i].specifier),
-				"ProgramName.Values",
-				&name_type, &name_value);
-	if (status) {
-	  StrJoin (text, sizeof (text), lkup_name, OpTable_0[i].specifier);
-	  XrmPutResource (&lcl_db, text, "String", &name_value);
-	}
-      }
-    }
-/*----------------------------------------------------------------
-*/
-    *name = lkup_name;
-    *db = lcl_db;
-    if ((lcl_db == NULL) && verbose)
-      printf ("Warning -- no resource database found.\n");
-
-    XrmDestroyDatabase (cmnd_line_db);
-/*
-**    XrmPutFileDatabase (lcl_db, "sinqhm_client.db");
-*/
-    return status;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void show_help (char *token) {
-/*     =========
-**		    Display help text
-*/
-    int	    len;
-
-    if (token == NULL) token = "";
-    if (token[0] == NIL) {
-      printf ("\n"
-	    " The following commands are recognised by SinqHM_Client:\n"
-	    "\n"
-	    "    Help or ?   - generate this help information\n"
-	    "    Open or     - open the connection to the histogram memory\n"
-	    "      Connect\n"
-	    "    Status or   - show the status of the histogram memory\n"
-	    "      Show\n"
-	    "    Read        - read a region of histogram memory\n"
-	    "    2D          - read a region of a 2-dimensional histogram\n"
-	    "    Project     - read a projected region of a 2-dim histogram\n"
-	    "    Dump        - dump the contents of the histogram buffer\n"
-	    "    LOAD        - write the histogram buffer from a file\n"
-	    "    WRIte       - write data to a histogram region\n"
-	    "    W2D         - write data to a histogram region in pseudo 2-dim mode\n"
-	    "    GO          - start data acquisition\n"
-	    "    STOP        - stop data acquisition\n"
-	    "    ZERO        - zero a region of histogram memory\n"
-	    "    Quit or     - end the program\n"
-	    "      Exit or End\n"
-	    "\n"
-	    " To get more detailed help on a specific command, issue "
-				"the command:\n"
-	    "\n"
-	    "    ? <cmnd>\n"
-	    "\n"
-	    " For information on environment setup for SinqHM_Client, issue"
-				"the command:\n"
-	    "\n"
-	    "    ? SETUP\n"
-	    "\n");
-    } else {
-      len = strlen (token);
-      if (StrMatch (token, "read", 1)) {
-	printf ("\n"
-	    " Read <1st-bin> <#-bins> <hist-#>\n"
-	    "          ^        ^        ^\n"
-	    "          |        |        |\n"
-	    "          |        |        +--- Dflt = -1\n"
-	    "          |        +------------ Dflt = see below\n"
-	    "          +--------------------- Dflt = 0\n"
-	    "\n"
-	    "   Read <#-bins> bins starting at <1st-bin> of histogram <hist-#>.\n"
-	    "\n"
-	    "   If <hist-#> is -1, the histogram data is regarded as a single "
-								"histogram.\n"
-	    "   The default for <#-bins> depends on the value of <hist-#>. "
-								"If <hist-#>\n"
-	    "   is -1, it defaults to the total histogram size (i.e. "
-							"<#-bins-per-hist> *\n"
-	    "   <#-histograms>). Otherwise, it defaults to <#-bins-per-hist>.\n"
-	    "\n"
-	    "   The command verb should be terminated by a space or tab.\n"
-	    "   Arguments may be separated by spaces, tabs or commas.\n"
-	    "\n"
-	    "   Hence, to read the whole of histogram number 5, for example, "
-							    "specify:\n"
-	    "\n"
-	    "          READ ,,5\n"
-	    "\n");
-      }else if (StrMatch (token, "2d", 2)) {
-	printf ("\n"
-	    " 2D <1st-hist> <#-hists> <1st-bin> <#-bins>\n"
-	    "        ^          ^         ^        ^\n"
-	    "        |          |         |        |\n"
-	    "        |          |         |        +--- Dflt = histogram size\n"
-	    "        |          |         +------------ Dflt = 0\n"
-	    "        |          +---------------------- Dflt = number of histograms\n"
-	    "        +--------------------------------- Dflt = 0\n"
-	    "\n"
-	    "   Read a rectangular array of the 2-dim histogram memory (e.g. a TOF\n"
-	    "   spectrum). From each histogram, <#-bins> bins starting at <1st-bin>\n"
-	    "   are read. The same region is read from histograms <1st-hist> to\n"
-	    "   <1st-hist>+<#-hists>-1.\n"
-	    "\n");
-      }else if (StrMatch (token, "project", 1)) {
-	printf ("\n"
-	    " Project <1st-hist>,  <-- dflt = 0.\n"
-	    "         <#-hists>,   <-- dflt = number of histograms.\n"
-	    "         <1st-bin>,   <-- dflt = 0.\n"
-	    "         <#-bins>,    <-- dflt = histogram size.\n"
-	    "         <axis>,      <-- \"X\" or \"Y\" for proj'n onto x- or "
-						    "y-axis. Dflt = \"X\".\n"
-	    "         <x-dim>,     <-- gives x-extent of histog in pseudo-2-"
-							"dim mode.\n"
-	    "         <hist-#>     <-- selects a histogram in pseudo-2-dim "
-							"mode. Dflt = 0.\n"
-	    "\n"
-	    "   Read a rectangular array of the 2-dim histogram memory (e.g. "
-							    "a TOF\n"
-	    "   spectrum) projected onto the x or y axis. From each histogram, "
-							    "<#-bins> bins\n"
-	    "   starting at <1st-bin> are read. The same region is read"
-							    "from histograms\n"
-	    "   <1st-hist> to <1st-hist>+<#-hists>-1.\n"
-	    "\n"
-	    "   If <x-dim> is non-zero, pseudo-2-dim mode will be assumed "
-							"(i.e. the\n"
-	    "   PROJECT__1_DIM sub_code bit will be set.\n"
-	    "\n");
-      }else if (StrMatch (token, "dump", 1)) {
-	printf ("\n"
-	    " DUMP <1st-bin> <#-bins> <file>\n"
-	    "          ^        ^       ^\n"
-	    "          |        |       |\n"
-	    "          |        |       +---- Dflt = standard output\n"
-	    "          |        +------------ Dflt = rest of buffer\n"
-	    "          +--------------------- Dflt = 0\n"
-	    "\n"
-	    "   Dump <#-bins> bins starting at <1st-bin> of buffer.\n"
-	    "\n"
-	    "   The command verb should be terminated by a space or tab.\n"
-	    "   Arguments may be separated by spaces, tabs or commas.\n"
-	    "\n"
-	    "   Hence, to dump 25 bins starting at bin 100, specify:\n"
-	    "\n"
-	    "          DUMP 100,25\n"
-	    "\n");
-      }else if (StrMatch (token, "load", 1)) {
-	printf ("\n"
-	    " LOAD <file>\n"
-	    "        ^\n"
-	    "        |\n"
-	    "        +---- Dflt = standard input\n"
-	    "\n"
-	    "   Read the contents of the file and write to hist mem.\n"
-	    "   The file format should be the same as that generated by DUMP\n"
-	    "\n");
-      }else if (StrMatch (token, "write", 2)) {
-	printf ("\n"
-	    " WRITE <p1> <p2> <p3> <p4> <p5> <p6>\n"
-	    "        ^    ^    ^    ^    ^    ^\n"
-	    "        |    |    |    |    |    |\n"
-	    "        |    |    |    |    |    +--- Dflt = 0.60 * Number of bins\n"
-	    "        |    |    |    |    +-------- Dflt = 1000\n"
-	    "        |    |    |    +------------- Dflt =  200000\n"
-	    "        |    |    +------------------ Dflt = 0.23 * Number of bins\n"
-	    "        |    +----------------------- Dflt = 1000\n"
-	    "        +---------------------------- Dflt = 2000000\n"
-	    "\n"
-	    "   Preset the histogram memory to the sum of 2 Lorenzians given by\n"
-	    "   <p1> ... <p6>.\n"
-	    "\n");
-      }else if (StrMatch (token, "w2d", 2)) {
-	printf ("\n"
-	    " WRITE <#-hists> <p1> <p2> <p3> <p4> <p5> <p6>\n"
-	    "          ^       ^    ^    ^    ^    ^    ^\n"
-	    "          |       |    |    |    |    |    |\n"
-	    "          |       |    |    |    |    |    +--- Dflt = 0.60 * Number of bins\n"
-	    "          |       |    |    |    |    +-------- Dflt = 1000\n"
-	    "          |       |    |    |    +------------- Dflt =  200000\n"
-	    "          |       |    |    +------------------ Dflt = 0.23 * Number of bins\n"
-	    "          |       |    +----------------------- Dflt = 1000\n"
-	    "          |       +---------------------------- Dflt = 2000000\n"
-	    "          +--------- Dflt = 1. The total allocated hist mem is\n"
-	    "                     split into <#-hists> histograms.\n"
-	    "\n"
-	    "   Preset the histogram memory to the sum of 2 Lorenzians given by\n"
-	    "   <p1> ... <p6>.\n"
-	    "\n");
-      }else if (StrMatch (token, "go", 1)) {
-	printf ("\n"
-	    " GO\n"
-	    "\n"
-	    "   Start data acquisition.\n"
-	    "\n");
-      }else if (StrMatch (token, "show", 2)) {
-	printf ("\n"
-	    " SHOW\n"
-	    "\n"
-	    "   Show Hist Mem status.\n"
-	    "\n");
-      }else if (StrMatch (token, "stop", 2)) {
-	printf ("\n"
-	    " STOP\n"
-	    "\n"
-	    "   Stop data acquisition.\n"
-	    "\n");
-      }else if (StrMatch (token, "zero", 1)) {
-	printf ("\n"
-	    " ZERO <1st-bin> <#-bins>\n"
-	    "          ^        ^\n"
-	    "          |        |\n"
-	    "          |        +---- Dflt = histogram size\n"
-	    "          +------------- Dflt = 0\n"
-	    "\n"
-	    "   Zero <#-bins> bins starting at <1st-bin>.\n"
-	    "\n");
-      }else if ((StrMatch (token, "open", 1)) ||
-		(StrMatch (token, "connect", 1))) {
-	if (StrMatch (token, "open", 1)) {
-	  printf ("\n OPEN\n\n");
-	}else {
-	  printf ("\n CONNECT\n\n");
-	}
-	printf (
-	    "   Open the connection to the Hist Mem.\n"
-	    "   The connection is usually not opened until the first "
-							"action command\n"
-	    "   is given.\n"
-	    "\n");
-      }else if (StrMatch (token, "setup", 2)) {
-	printf ("\n"
-	    " The following environment variables should be set on Unix systems:\n"
-	    "\n"
-	    "           setenv SINQHM_FRONTEND \"<host> <port> <pkt-size>\"\n"
-	    "           setenv SINQHM_DBG_MODE <mode>\n"
-	    "\n"
-	    " The following logical names should be set on VMS systems:\n"
-	    "\n"
-	    "           DEFINE/GROUP SINQHM_FRONTEND \"<host> <port> <pkt-size>\"\n"
-	    "           DEFINE/GROUP SINQHM_DBG_MODE <mode>\n"
-	    "\n"
-	    " Defaults:\n"
-	    "      <host>     None          <mode>  0\n"
-	    "      <port>     2400\n"
-	    "      <pkt-size> 8192\n"
-	    "\n"
-	    " If <mode> is non-zero, the server will suspend itself to allow debugging.\n"
-	    "\n");
-      }else {
-	printf ("Sorry, no help available for \"%s\"!\n", token);
-      }
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void split_args (
-/*     ==========
-**		    Split up a text string into arguments. The arguments
-**		    may be separated by white space or commas. Adjacent
-**		    commas indicate a default argument.
-**
-**		    Each argument in the variable length argument list will
-**		    get set to the address of the start of the appropriate
-**		    argument. A defaulted argument is returned as NULL.
-*/
-	char *str,  /* The string to be parsed. This string will get modified
-		    ** as it is split up into tokens */
-	...) {	    /* A NULL terminated list of char** arguments. */
-
-    va_list	ap;	    /* Pointer to variable args */
-    int		i, s_len, l_nxt;
-    char	*nxt_str;
-    char	**arg_ptr;
-
-    va_start (ap, str);	    /* Set up var arg machinery */
-
-    s_len = strlen (str);
-    if (s_len <= 0) {	    /* If input string is null, return lots of NULLs */
-      arg_ptr = va_arg (ap, char **);
-      while (arg_ptr != NULL) {
-	*arg_ptr = NULL;
-	arg_ptr = va_arg (ap, char **);
-      }
-      return;
-    }
-			/* Turn all white space chars into spaces */
-    l_nxt = strcspn (str, "\t\f\v\n");
-    while (l_nxt != s_len) {
-      str[l_nxt] = ' ';
-      l_nxt = strcspn (str, "\t\f\v\n");
-    }
-			/* Now compress out multiple spaces */
-    nxt_str = strstr (str, "  ");
-    while (nxt_str != NULL) {
-      nxt_str[1] = NIL;
-      StrJoin (str, (s_len + 1), str, &nxt_str[2]);
-      nxt_str = strstr (str, "  ");
-    }
-    if (str[0] == ' ') str++;	/* Remove a leading space, if present */
-
-			/* Remove a space if followed by a comma */
-    nxt_str = strstr (str, " ,");
-    while (nxt_str != NULL) {
-      nxt_str[0] = NIL;
-      StrJoin (str, (s_len + 1), str, &nxt_str[1]);
-      nxt_str = strstr (str, " ,");
-    }
-			/* Remove a space if preceded by a comma */
-    nxt_str = strstr (str, ", ");
-    while (nxt_str != NULL) {
-      nxt_str[1] = NIL;
-      StrJoin (str, (s_len + 1), str, &nxt_str[2]);
-      nxt_str = strstr (str, ", ");
-    }
-			/* Turn all remaining spaces into commas */
-    s_len = strlen (str);
-    l_nxt = strcspn (str, " ");
-    while (l_nxt != s_len) {
-      str[l_nxt] = ',';
-      l_nxt = strcspn (str, " ");
-    }
-			/* Now split up the comma-separated tokens */
-    arg_ptr = va_arg (ap, char **);	/* Get pntr to first argument */
-    while (arg_ptr != NULL) {		/* Loop till all have been done */
-      if (strlen (str) == 0) {
-	*arg_ptr = NULL;	    /* If str is exhausted, keep giving NULL */
-      }else {
-	l_nxt = strcspn (str, ",");	/* Find end of next token */
-	if (l_nxt > 0) {		/* Is it a null token? */
-	  *arg_ptr = str;		    /* No, so set up next arg pntr */
-	  str[l_nxt] = NIL;		    /* Terminate the token */
-	  str = &str[l_nxt+1];		    /* Move over the separator */
-	}else {				/* It is a null token */
-	  *arg_ptr = NULL;
-	  str++;			/* Move over the separator */
-	}
-      }
-      arg_ptr = va_arg (ap, char **);	/* Get pntr to next parameter ident */
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int write_hm (
-/*    ========
-**			Write block of bins to SINQHM_SRV
-*/
-	    void *hbuf,		/* Buffer holding data */
-	    uint  hist_no,	/* Histogram number to write */
-	    uint  f_bin,	/* First bin to write */
-	    uint  n_bins,	/* Number of bins to write */
-	    uint  bpb) {	/* # bytes per bin */
-
-    int		i, status, bytes_to_go;
-
-    uchar	*p_byte;
-    usint	*p_word;
-    uint	*p_long;
-
-    p_byte = (uchar *) hbuf;
-    p_word = (usint *) hbuf;
-    p_long = (uint  *) hbuf;
-
-    if (0x12345678 != ntohl (0x12345678)) {	/* Swap bytes, if necessary */
-      switch (bpb) {
-       case 1: break;
-       case 2: for (i=0; i<n_bins; i++) p_word[i] = htons (p_word[i]); break;
-       case 4: for (i=0; i<n_bins; i++) p_long[i] = htonl (p_long[i]);
-      }
-    }
-		/*
-		** Send the request message first
-		*/
-    Req_buff.bigend		   = htonl (0x12345678);
-    Req_buff.cmnd		   = htonl (SQHM_WRITE);
-    Req_buff.u.write.hist_no       = htonl (hist_no);
-    Req_buff.u.write.n_bins	   = htonl (n_bins);
-    Req_buff.u.write.first_bin     = htonl (f_bin);
-    Req_buff.u.write.bytes_per_bin = htonl (bpb);
-    status = send (Rw_skt, (char *) &Req_buff, sizeof (Req_buff), 0);
-    if (status == -1) FailInet ("write_hm -- R/W-Socket send error\n");
-    if (status != sizeof (Req_buff)) {
-      printf ("SinqHM_Client -- wrong number of bytes sent: %d", status);
-      exit (EXIT_FAILURE);
-    }
-		/*
-		** Now send the data.
-		*/
-    bytes_to_go = n_bins * bpb;
-    p_byte = (uchar *) hbuf;
-    while (bytes_to_go > 0) {
-      i = (bytes_to_go > Pkt_size) ? Pkt_size : bytes_to_go;
-      status = send (Rw_skt, (char *) p_byte, i, 0);
-      if (status <= 0) {
-	FailInet ("write_hm -- R/W-Socket send error\n");
-	exit (EXIT_FAILURE);
-      }
-      bytes_to_go -= status;
-      p_byte += status;
-    }
-		/*
-		** Now get the server's status message.
-		*/
-    status = recv (Rw_skt, (char *) &Rply_buff, sizeof (Rply_buff), 0);
-    if (status == -1) {
-      FailInet ("write_hm -- R/W-Socket recv error\n");
-      exit (EXIT_FAILURE);
-    }else if (status != sizeof (Rply_buff)) {
-      printf ("SinqHM_Client --  Cnct-Socket recv error - ");
-      printf ("unexpected byte count: %d.\n", status);
-      exit (EXIT_FAILURE);
-    }
-    if (ntohl (Rply_buff.bigend) != 0x12345678) {
-      printf (
-	    "SinqHM_Client -- big-endian/little-endian problem!\n"
-	    "    Buffer received in non-network byte order!\n");
-      exit (EXIT_FAILURE);
-    }else if (ntohl (Rply_buff.status) != KER__SUCCESS) {
-      printf ("SinqHM_Client -- Bad status from Write Request: %d.\n",
-		    ntohl (Rply_buff.status));
-      printf ("     \"%s\"\n", Rply_buff.u.message);
-      exit (EXIT_FAILURE);
-    }
-			    /* Finally, swap bytes back again, if necessary,
-			    ** so that a DUMP command will make sense.
-			    */
-    if (0x12345678 != ntohl (0x12345678)) {
-      switch (bpb) {
-       case 1: break;
-       case 2: for (i=0; i<n_bins; i++) p_word[i] = ntohs (p_word[i]); break;
-       case 4: for (i=0; i<n_bins; i++) p_long[i] = ntohl (p_long[i]);
-      }
-    }
-    return True;
-  }
-/*
-**==========================================================================
-**				Main line program
-**				-----------------
-**==========================================================================*/
-  main (int argc, char *argv[]) {
-/*==========================================================================*/
-    int			i, j, k, status, is, nerr, vlen, nbins;
-    char		*cmnd;
-    int			bytes_to_come, bytes_to_go;
-    uint		f_bin, n_bins, hist_num;
-    uint		daq_was, daq_now, filler_mask, server_mask;
-
-    char		recd[256], recd1[256];
-    char		last_recd[256] = {NIL};
-    char		*verb, *p_p1, *p_p2, *p_p3, *p_p4, *p_p5, *p_p6;
-    int			l_recd;
-    XrmDatabase		my_db;
-    char		*appName;
-/*============================================================================
-*/
-    printf ("SinqHM_Client Ident \"%s\" started.\n", IDENT);
-/*============================================================================
-**	    Declare an exit handler to tidy up if we get forced to exit.
-*/
-    is = atexit (exit_handler);
-    if (is != 0) {
-      printf ("SinqHM_Client -- error setting up exit handler.");
-      exit (is);
-    }
-	/*-------------------------------------------------------------
-	**	Setup the resource database and look up the resources.
-	*/
-    Verbose = False;
-    for (i = 1; i < argc; i++) if (strcmp ("-v", argv[i]) == 0) Verbose = True;
-
-    setup_xrm_database (&my_db, &appName, &argc, argv, Verbose);
-    status = get_check_resources (&my_db, appName, &argc, argv, Verbose);
-    if (!status) return False;
-
-    if (argc > 1) {
-      printf ("\nThe following arguments were not used:\n\n     ");
-      for (i = 1; i < argc; i++) {
-	  printf ("\"%s\" ", argv[i]);
-      }
-      printf ("\n");
-      show_help (NULL);
-      return False;
-    }
-/*====================================================== Wait for work =========
-*/
-    printf ("\n"
-	" The following commands are available:\n"
-	"    Help Open Status Read 2D Project Dump LOAD WRITE W2D GO STOP ZERO "
-					"Quit\n");
-    recd[0] = NIL;
-    printf ("> ");
-    while (fgets (recd, sizeof (recd), stdin) != NULL) {
-      nerr = 0;	    /* Reset error counter for each unit of work. */
-      if (strlen (recd) == (sizeof (recd) - 1)) {
-	printf ("\n\nInput buffer overflow -- command ignored!\n\n");
-	do {					/* Flush the remains */
-	  fgets (recd, sizeof (recd), stdin);
-	} while (strlen (recd) == (sizeof (recd) - 1));
-	printf ("> ");
-	continue;
-      }
-      i = strlen (recd) - 1;
-      if (recd[i] == NL) recd[i] = NIL;	    /* Suppress the trailing \n */
-      if (recd[0] == NIL) {		    /* If just <Return>, repeat */
-        strcpy (recd, last_recd);
-      }
-      l_recd = sizeof (recd1);
-      StrEdit (recd1, recd, "trim compress uncomment lowercase", &l_recd);
-      if (l_recd <= 0) {	/* Skip empty lines */
-        printf ("\n> ");
-	continue;
-      }
-      StrJoin (recd1, sizeof (recd1), recd1, " ,,,,,,,,,,");
-	    /*
-	    ** Parse the command
-	    */
-      verb = strtok (recd1, " \t\f\v\n");
-      vlen = strlen (verb);
-
-      if (StrMatch (verb, "read", 1)) {
-	do_1d (&verb[vlen+1], Dbg_mode);   /* Generate a 1-dim plot */
-      }else if (StrMatch (verb, "2d", 2)) {
-	do_2d (&verb[vlen+1], Dbg_mode);   /* Generate a 2-dim plot */
-      }else if (StrMatch (verb, "project", 1)) {
-	do_project (&verb[vlen+1], Dbg_mode);   /* Do a projected read */
-      }else if (StrMatch (verb, "dump", 1)) {
-	do_dump (&verb[vlen+1]);	    /* Generate a dump of the data */
-      }else if (StrMatch (verb, "load", 4)) {
-	do_load (&verb[vlen+1], Dbg_mode);    /* Load histog mem from file */
-      }else if (StrMatch (verb, "write", 5)) {
-	if (Rw_skt == 0) {
-	  Rw_skt = openConnectionGbl (Rmt_host, &Rmt_port, &Pkt_size, Dbg_mode,
-					&Rply_buff, Verbose);
-	  if (Rw_skt == 0) FailInet ("\nmain/openConnectionGbl error.");
-	}
-
-	printf ("\n Writing data to histogram memory ...");
-	gen_data (&verb[vlen+1]);	/* Generate some pseudo data */
-	hist_num = -1;
-	f_bin = 0;
-	nbins = Hm_nbins * N_hists;
-	status = write_hm (Hm_buff_addr, hist_num, f_bin, nbins, Bytes_per_bin);
-	if (status) printf (" OK\n");
-      }else if (StrMatch (verb, "w2d", 3)) {
-	if (Rw_skt == 0) {
-	  Rw_skt = openConnectionGbl (Rmt_host, &Rmt_port, &Pkt_size, Dbg_mode,
-					&Rply_buff, Verbose);
-	  if (Rw_skt == 0) FailInet ("\nmain/openConnectionGbl error.");
-	}
-
-	printf ("\n Writing pseudo 2-dim data to histogram memory ...");
-	gen_data_2d (&verb[vlen+1]);	/* Generate some pseudo data */
-	hist_num = -1;
-	f_bin = 0;
-	nbins = Hm_nbins * N_hists;
-	status = write_hm (Hm_buff_addr, hist_num, f_bin, nbins, Bytes_per_bin);
-	if (status) printf (" OK\n");
-      }else if (StrMatch (verb, "go", 2)) {
-	if (Rw_skt == 0) {
-	  Rw_skt = openConnectionGbl (Rmt_host, &Rmt_port, &Pkt_size, Dbg_mode,
-					&Rply_buff, Verbose);
-	  if (Rw_skt == 0) FailInet ("\nmain/openConnectionGbl error.");
-	}
-	printf ("\n Starting data acquisition ...");
-		/*
-		** Send the request message
-		*/
-	Req_buff.bigend = htonl (0x12345678);
-	Req_buff.cmnd   = htonl (SQHM_DAQ);
-	Req_buff.u.daq.sub_cmnd = htonl (DAQ__GO);
-	status = send (Rw_skt, (char *) &Req_buff, sizeof (Req_buff), 0);
-	if (status == -1) FailInet ("SinqHM_Client -- R/W-Socket send error\n");
-	if (status != sizeof (Req_buff)) {
-	  printf ("\n"
-		  "SinqHM_Client -- wrong number of bytes sent: %d", status);
-	  exit (EXIT_FAILURE);
-	}
-		/*
-		** Now get the server's status message.
-		*/
-	status = recv (Rw_skt, (char *) &Rply_buff, sizeof (Rply_buff), 0);
-	if (status == -1) {
-	  FailInet ("\nSinqHM_Client -- R/W-Socket recv error\n");
-	  exit (EXIT_FAILURE);
-	}else if (status != sizeof (Rply_buff)) {
-	  printf ("\n"
-		  "SinqHM_Client --  Cnct-Socket recv error - "
-		  "unexpected byte count: %d.\n", status);
-	  exit (EXIT_FAILURE);
-	}
-	if (ntohl (Rply_buff.bigend) != 0x12345678) {
-	  printf ("\n"
-	    "SinqHM_Client -- big-endian/little-endian problem!\n"
-	    "    Buffer received in non-network byte order!\n");
-	  exit (EXIT_FAILURE);
-	}else if (ntohl (Rply_buff.status) != KER__SUCCESS) {
-	  printf ("\n"
-		  "SinqHM_Client -- Bad status from Go Request: %d.\n",
-		    ntohl (Rply_buff.status));
-	  printf ("     \"%s\"\n", Rply_buff.u.message);
-	  exit (EXIT_FAILURE);
-	}else {
-	  daq_was = ntohs (Rply_buff.u.daq.daq_was);
-	  daq_now = ntohs (Rply_buff.u.daq.daq_now);
-	  filler_mask = ntohs (Rply_buff.u.daq.filler_mask);
-	  server_mask = ntohs (Rply_buff.u.daq.server_mask);
-	  if (daq_now == 0) {
-	    printf (" OK.\n");
-	    if (daq_was == 0)
-	      printf (" Actually, data acquisition was already active.\n");
-	  }else {
-	    printf ("\n"
-		    " Data acquisition not yet started. The various masks"
-								" are:\n"
-		    "     Daq-state-now = 0x%04x\n"
-		    "     Filler-mask   = 0x%04x\n"
-		    "     Server-mask   = 0x%04x\n",
-			daq_now, filler_mask, server_mask);
-	  }
-	}
-      }else if ((StrMatch (verb, "show", 1)) ||
-		(StrMatch (verb, "status", 1))) {
-	do_status (Dbg_mode);		    /* Get status of SinqHM_srv */
-      }else if (StrMatch (verb, "stop", 4)) {
-	if (Rw_skt == 0) {
-	  Rw_skt = openConnectionGbl (Rmt_host, &Rmt_port, &Pkt_size, Dbg_mode,
-					&Rply_buff, Verbose);
-	  if (Rw_skt == 0) FailInet ("\nmain/openConnectionGbl error.");
-	}
-	printf ("\n Stopping data acquisition ...");
-		/*
-		** Send the request message
-		*/
-	Req_buff.bigend = htonl (0x12345678);
-	Req_buff.cmnd   = htonl (SQHM_DAQ);
-	Req_buff.u.daq.sub_cmnd = htonl (DAQ__STOP);
-	status = send (Rw_skt, (char *) &Req_buff, sizeof (Req_buff), 0);
-	if (status == -1) FailInet ("\nmain/send -- R/W-Socket send error\n");
-	if (status != sizeof (Req_buff)) {
-	  printf ("\n"
-		  "SinqHM_Client -- wrong number of bytes sent: %d", status);
-	  exit (EXIT_FAILURE);
-	}
-		/*
-		** Now get the server's status message.
-		*/
-	status = recv (Rw_skt, (char *) &Rply_buff, sizeof (Rply_buff), 0);
-	if (status == -1) {
-	  FailInet ("\nmain/recv -- R/W-Socket recv error\n");
-	  exit (EXIT_FAILURE);
-	}else if (status != sizeof (Rply_buff)) {
-	  printf ("\n"
-		  "SinqHM_Client --  Cnct-Socket recv error - "
-		  "unexpected byte count: %d.\n", status);
-	  exit (EXIT_FAILURE);
-	}
-	if (ntohl (Rply_buff.bigend) != 0x12345678) {
-	  printf ("\n"
-	    "SinqHM_Client -- big-endian/little-endian problem!\n"
-	    "    Buffer received in non-network byte order!\n");
-	  exit (EXIT_FAILURE);
-	}else if (ntohl (Rply_buff.status) != KER__SUCCESS) {
-	  printf ("\n"
-		  "SinqHM_Client -- Bad status from Stop Request: %d.\n",
-		    ntohl (Rply_buff.status));
-	  printf ("     \"%s\"\n", Rply_buff.u.message);
-	  exit (EXIT_FAILURE);
-	}else {
-	  daq_was = ntohs (Rply_buff.u.daq.daq_was);
-	  daq_now = ntohs (Rply_buff.u.daq.daq_now);
-	  filler_mask = ntohs (Rply_buff.u.daq.filler_mask);
-	  server_mask = ntohs (Rply_buff.u.daq.server_mask);
-	  if (daq_now != 0) {
-	    printf (" OK. The various masks are:\n"
-		    "     Daq-state-now = 0x%04x\n"
-		    "     Filler-mask   = 0x%04x\n"
-		    "     Server-mask   = 0x%04x\n",
-			daq_now, filler_mask, server_mask);
-	  }else {
-	    printf ("\n"
-		    " Data acquisition is still active!\n");
-	  }
-	}
-      }else if (StrMatch (verb, "zero", 4)) {
-	if (Rw_skt == 0) {
-	  Rw_skt = openConnectionGbl (Rmt_host, &Rmt_port, &Pkt_size, Dbg_mode,
-					&Rply_buff, Verbose);
-	  if (Rw_skt == 0) FailInet ("\nmain/openConnectionGbl error.");
-	}
-	p_p1 = strtok (NULL, " \t,");	/* Get pointers to the 2 args */
-	p_p2 = strtok (NULL, " \t,");
-	if ((p_p1 != NULL) && (sscanf (p_p1, "%d", &f_bin) == 1)) {
-	  if (p_p2 != NULL) {
-	    if (sscanf (p_p2, "%d", &n_bins) != 1) n_bins = Hm_nbins;
-	  }
-	}else {
-	  f_bin = 0;
-	  n_bins = Hm_nbins * N_hists;
-	}
-	printf ("\n Zeroing histogram memory ...\n"
-	          "       First bin = %d\n"
-		  "       # bins    = %d\n", f_bin, n_bins);
-		/*
-		** Send the request message first
-		*/
-	Req_buff.bigend = htonl (0x12345678);
-	Req_buff.cmnd   = htonl (SQHM_ZERO);
-	Req_buff.u.zero.hist_no = htonl (-1);
-	Req_buff.u.zero.first_bin = htonl (f_bin);
-	Req_buff.u.zero.n_bins  = htonl (n_bins);
-	status = send (Rw_skt, (char *) &Req_buff, sizeof (Req_buff), 0);
-	if (status == -1) FailInet ("\nmain/send -- R/W-Socket send error\n");
-	if (status != sizeof (Req_buff)) {
-	  printf ("SinqHM_Client -- wrong number of bytes sent: %d", status);
-	  exit (EXIT_FAILURE);
-	}
-		/*
-		** Now get the server's status message.
-		*/
-	status = recv (Rw_skt, (char *) &Rply_buff, sizeof (Rply_buff), 0);
-	if (status == -1) {
-	  FailInet ("\nmain/recv -- R/W-Socket recv error\n");
-	  exit (EXIT_FAILURE);
-	}else if (status != sizeof (Rply_buff)) {
-	  printf ("SinqHM_Client --  Cnct-Socket recv error - ");
-	  printf ("unexpected byte count: %d.\n", status);
-	  exit (EXIT_FAILURE);
-	}
-	if (ntohl (Rply_buff.bigend) != 0x12345678) {
-	  printf (
-	    "SinqHM_Client -- big-endian/little-endian problem!\n"
-	    "    Buffer received in non-network byte order!\n");
-	  exit (EXIT_FAILURE);
-	}else if (ntohl (Rply_buff.status) != KER__SUCCESS) {
-	  printf ("SinqHM_Client -- Bad status from Zero Request: %d.\n",
-		    ntohl (Rply_buff.status));
-	  printf ("     \"%s\"\n", Rply_buff.u.message);
-	  exit (EXIT_FAILURE);
-	}else {
-	  printf (" done.\n");
-	}
-      }else if ((StrMatch (verb, "open", 1)) ||
-		(StrMatch (verb, "connect", 1))) {
-	if (Rw_skt == 0) {
-	  printf ("\n Opening the connection ...\n");
-	  Rw_skt = openConnectionGbl (Rmt_host, &Rmt_port, &Pkt_size, Dbg_mode,
-					&Rply_buff, Verbose);
-	  if (Rw_skt == 0) FailInet ("\nmain/openConnection error.");
-	}else {
-	  printf ("\n The connection is already open!\n");
-	}
-      }else if ((StrMatch (verb, "exit", 1)) ||
-		(StrMatch (verb, "quit", 1)) ||
-		(StrMatch (verb, "end", 1))) {
-	break;
-      }else if ((StrMatch (verb, "?", 1)) ||
-		(StrMatch (verb, "help", 1))) {
-	show_help (strtok (NULL, " \t,"));
-      }else {
-        printf (" Illegal command - type \"?\" for help.\n");
-      }
-      strcpy (last_recd, recd);
-	    /*
-	    ** Get another command.
-	    */
-      printf ("> ");
-    }
-/*
-**			Time to quit. Note that the exit handler will tidy
-**			up any open connection to the Hist Mem Server,
-*/
-    exit (EXIT_SUCCESS);
-  }
-/*============================================= End of SinqHM_Client.C ======*/
diff --git a/sinqhm/sinqhm_ctrl.c b/sinqhm/sinqhm_ctrl.c
deleted file mode 100755
index 670ef561..00000000
--- a/sinqhm/sinqhm_ctrl.c
+++ /dev/null
@@ -1,2038 +0,0 @@
-#define	    IDENT	"1A14"
-/*---------------------------------------------------------------------------*/
-#ifdef __DECC
-#pragma	    module	    sinqhm_ctrl	    IDENT
-#endif
-/*
-** Link_options - Here is the Linker Option File
-**!	sinqhm_ctrl
-**!	tas_src:[lib]sinq/lib
-**!	sys$share:decw$xlibshr/share
-**!!
-**!!	    To build sinqhm_ctrl on LNSA09
-**!!
-**!!	$ import tasmad
-**!!	$ define/job deltat_c_tlb sinq_c_tlb
-**!!	$ sss := tas_src:[sinqhm]
-**!!	$ bui 'sss'sinqhm_ctrl debug
-** Link_options_end
-**
-**	Building on Alpha OSF/1:
-**
-	    cc -std1 -g -o ~/bin/sinqhm_ctrl -I/public/lib/include	\
-			-transitive_link -L/public/lib -lsinq -lrt	\
-			~/SinqHM/sinqhm_ctrl.c
-**
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     Computing Section                        |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : TAS_SRC:[SINQHM]sinqhm_ctrl.c
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Dec 1996
-**
-** Purpose
-** =======
-**    sinqhm_ctrl.c is an Internet Client which can be used to send control
-**    messages to a front-end processor running the SINQHM histogram
-**    memory server process. Control messages may be sent to configure,
-**    de-configure, rundown, set the level of debug printing, start data
-**    acquisition, stop data acquisition, show the status of SINQHM_SRV, or
-**    zero the histogram memory.
-**
-**  1) Configure:
-**     =========
-**    The configuration information is obtained from options on the command
-**    line. Use the "-help config" option for details.
-**
-**    Once the configuration information has been checked, a connection is
-**    made to the SINQHM_SRV root process on the front-end and a configure
-**    message is sent. SINQHM_SRV will check the information, start up a child
-**    process, FILLER, which will do the work of filling histograms, and then
-**    send a reply.
-**
-**    Note: If SINQHM_SRV has already been successfully configured, i.e. it
-**	    already has an active FILLER child process, it must be
-**	    de-configured first.
-**
-**  2) Debug:
-**     ======
-**    The level of debug printing in the SINQHM_SRV root process can be set. The
-**    higher the level, the more print-out on the front-end processor's console
-**    occurs. The debug level is inherited by any server children (or FILLER)
-**    which subsequently get started.
-**
-**  3) De-configure:
-**     ============
-**    "De-configuration" involves terminating any child processes of the
-**    SINQHM_SRV root process. Normally, it is expected that the server children
-**    will have been terminated via the protocol between the servers and their
-**    clients so that a de-configure involves simply the termination of FILLER.
-**    This is a so-called "gentle" de-configure. However, in order to facilitate
-**    the recovery from error situations, it is possible to specify a "harsh"
-**    de-configure in which any active server children will also be terminated.
-**    A gentle de-configure will fail if there are active children.
-**
-**  4) Rundown:
-**     =======
-**    "Rundown" implies the termination not only of the SINQHM_SRV children but
-**    also of the root process itself. Once a rundown has been performed,
-**    intervention will be required on the front-end (e.g. reboot or creation
-**    of a new SINQHM_SRV root job from the front-end console) before SINQHM_SRV
-**    can be used again.
-**
-**  5) Show-Status:
-**     ===========
-**    The status of SINQHM_SRV is illicited and printed out.
-**
-**  6) Start-Data-Acquisition
-**     ======================
-**    The SinqHM-Filler process in the HM is instructed to start data-acq.
-**
-**  7) Stop-Data-Acquisition
-**     =====================
-**    The SinqHM-Filler process in the HM is instructed to stop data-acq.
-**
-**  8) Zero:
-**     ====
-**    The complete histogram area is set to zero.
-**
-** Use:
-** ===
-**	Define the foreign command:
-**
-**	    $ sinqhm_ctrl :== $mad_exe:sinqhm_ctrl
-**
-**	Then issue the command:
-**
-**	    $ sinqhm_ctrl <cmnd> <modifier>
-**
-**	where <cmnd> may be "CONFIG", "DEBUG", "DECONFIG", "GO", "HELP",
-**	"RUNDOWN", "STATUS", "STOP" or "ZERO". If <cmnd> is omitted or none of
-**	the above or if any error occurs obtaining the configuration
-**	information for the "CONFIG" command, a "HELP" command will be assumed.
-**
-**	For the "CONFIG" command, <modifier> may be specified as "SUSPEND".
-**	If so, the filler task in the front-end will suspend as soon as it
-**	starts so that it can be debugged. Note that the same action can be
-**	achieved by specifying "DEBUG" as a token in SINQHM_MODE.
-**
-**	For the "DEBUG" command, <modifier> is an integer specifying the debug
-**	level. <modifier> may also be specified as "ON" or "OFF", corresponding
-**	to levels 1 and 0 respectively. If <modifier> is anything else (or
-**	absent), "ON" is assumed.
-**
-**	For the "DECONFIG" command, <modifier> is used to specify the
-**	"harshness" of the de-configure. If <modifier> is specified as
-**	"HARSH", the de-configure will be "harsh". If <modifier> is anything
-**	else (or absent) the de-configure will be gentle.
-**
-**  Communication between sinqhm_ctrl and the server is via TCP/IP protocol.
-**
-** Updates:
-**  1A01 18-Dec-1996 DM.	Initial version.
-**====================================================================
-*/
-#include    <errno.h>
-#include    <netdb.h>
-#include    <stdio.h>
-#include    <stdlib.h>
-#include    <time.h>
-
-#ifdef	__VMS
- #include    <ucx$inetdef.h>
-#else
- #include    <netinet/tcp.h>
- #include    <unistd.h>
-#endif
-
-#include    <netinet/in.h>
-#include    <arpa/inet.h>
-
-#include    <ctype.h>
-#include    <math.h>
-#include    <sys/socket.h>
-#include    <string.h>
-#include    <sys/types.h>
-#include    <X11/Intrinsic.h>
-
-/*
-**====================	Global Definitions =====================================
-*/
-#include    <sinq_prototypes.h>
-#include    "SinqHM_def.h"
-
-#define SUCCESS	       1
-#define ERROR	       0
-#define NIL	       '\0'
-
-#define HM_SIZE	   65536	/* Number of Bins in Hist Mem */
-/*
-**====================	Some functions and structures =====================
-**
-**					Fixed-Length Descriptor:
-*/
-    struct  dsc__descriptor_s {
-	unsigned short  dsc__w_length;   /* length of data item in bytes */
-	unsigned char   dsc__b_dtype;    /* data type code */
-	unsigned char   dsc__b_class;    /* descriptor class code */
-	char		*dsc__a_pointer; /* address of data storage */
-    };
-/*
-**====================	Global Variables ======================================
-*/
-  int		    My_errno, My_vaxc_errno;
-
-  struct req_buff_struct	    Req_buff;
-  struct rply_buff_struct	    Rply_buff;
-
-  int		Verbose;
-  char		Rmt_host[32];
-  int		Rmt_port;
-  int		Pkt_size;
-
-  int		Do_config;
-  int		Do_debug;
-  int		Do_deconfig;
-  int		Do_go;
-  int		Do_rundown;
-  int		Do_status;
-  int		Do_stop;
-  int		Do_zero;
-
-  int		Dbg_level;
-  int		Be_harsh;	/* Set to True if -harsh option specified */
-  char		Mode[64];	/* The "-mode" option */
-  int		Hm_mode;	/* The histogramming mode */
-  int		Nhist;		/* The number of histograms to fill */
-  int		Nbins;		/* The number of bins to fill */
-  int		Lo_bin;		/* The first bin */
-  int		Compress;	/* The bin compression factor */
-  int		Bytes_per_bin;	/* The number of bytes per bin */
-  int		Ncntrs;		/* The number of counters (TOF mode) */
-  int		Lo_cntr;	/* The first counter */
-  int		Span;		/* The time span per bin */
-  int		Delay_time_to_start;	/* The DTS for the MDI in TOF mode */
-  int		Nbuff;		/* The # buffers in TRANS mode */
-  int		Buff_size;	/* The buffer size in TRANS mode */
-  int           xOff;           /* X Offset in PSD mode */ 
-  int           yOff;           /* Y Offset in PSD mode */
-  int           xFac;           /* X factor in PSD mode */
-  int           yFac;           /* Y factor in PSD mode */
-  int           xSize;          /* xSize in PSD mode */
-  int           ySize;          /* ySize in PSD mode */
-
-  struct dsc__descriptor_s Name_desc;
-
-  static XrmOptionDescRec OpTable_0[] = {
-      {"-name",	    ".name",		XrmoptionSepArg, (XPointer) NULL},
-      {"-h",	    ".sqhmHelp",	XrmoptionNoArg,	 (XPointer) "1"},
-      {"-he",	    ".sqhmHelp",	XrmoptionNoArg,	 (XPointer) "1"},
-      {"-hel",	    ".sqhmHelp",	XrmoptionNoArg,	 (XPointer) "1"},
-      {"-help",	    ".sqhmHelp",	XrmoptionNoArg,	 (XPointer) "1"},
-      {"-?",	    ".sqhmHelp",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-ho",	    ".sqhmHost",	XrmoptionSepArg, (XPointer) NULL},
-      {"-hos",	    ".sqhmHost",	XrmoptionSepArg, (XPointer) NULL},
-      {"-host",	    ".sqhmHost",	XrmoptionSepArg, (XPointer) NULL},
-      {"-port",	    ".sqhmPort",	XrmoptionSepArg, (XPointer) NULL},
-      {"-size",	    ".sqhmPktSize",	XrmoptionSepArg, (XPointer) NULL},
-      {"-v",	    ".sqhmVerbose",	XrmoptionNoArg,	 (XPointer) "1"},
-      {"-config",   ".sqhmConfig",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-debug",    ".sqhmDebug",	XrmoptionSepArg, (XPointer) NULL},
-      {"-deconfig", ".sqhmDeconfig",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-go",	    ".sqhmGo",		XrmoptionNoArg,  (XPointer) "1"},
-      {"-rundown",  ".sqhmRundown",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-show",	    ".sqhmStatus",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-status",   ".sqhmStatus",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-stop",	    ".sqhmStop",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-zero",	    ".sqhmZero",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-mode",	    ".sqhmMode",	XrmoptionSepArg, (XPointer) NULL},
-      {"-nhist",    ".sqhmNhist",	XrmoptionSepArg, (XPointer) NULL},
-      {"-nbins",    ".sqhmNbins",	XrmoptionSepArg, (XPointer) NULL},
-      {"-lo_bin",   ".sqhmLoBin",	XrmoptionSepArg, (XPointer) NULL},
-      {"-compress", ".sqhmCompress",	XrmoptionSepArg, (XPointer) NULL},
-      {"-bpb",	    ".sqhmBpb",		XrmoptionSepArg, (XPointer) NULL},
-      {"-ncntr",    ".sqhmNcntr",	XrmoptionSepArg, (XPointer) NULL},
-      {"-lo_cntr",  ".sqhmLoCntr",	XrmoptionSepArg, (XPointer) NULL},
-      {"-span",	    ".sqhmSpan",	XrmoptionSepArg, (XPointer) NULL},
-      {"-delay",    ".sqhmDelay",	XrmoptionSepArg, (XPointer) NULL},
-      {"-nbuff",    ".sqhmNbuff",	XrmoptionSepArg, (XPointer) NULL},
-      {"-buff_size",".sqhmBuffSize",	XrmoptionSepArg, (XPointer) NULL},
-      {"-harsh",    ".sqhmHarsh",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-xoff",     ".sqhmxoff",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-yoff",     ".sqhmyoff",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-xfac",     ".sqhmxfac",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-yfac",     ".sqhmyfac",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-xsize",    ".sqhmxsize",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-ysize",    ".sqhmyszie",	XrmoptionNoArg,  (XPointer) "1"},
-    };
-
-  extern int	 C_gbl_status;	    /*  Return status from C_... routines */
-/*
-**=============================================================================
-**  Local routines.
-**
-**  show_help		: Display the help text.
-**----------------------------------------------------------------------------
-**							    Prototypes
-*/
-  int	    getCheckStatusResponse (
-			int			 skt,
-			struct rply_buff_struct *reply,
-			int			 rlen);
-  int	    get_check_resources (
-			XrmDatabase *db,
-			char	    *appName,
-			int	    *argc,
-			char	    *argv[],
-			int	     verbose);
-  int	    get_no_arg_resource (
-			XrmDatabase	*db,
-			char		*appName,
-			int		*argc,
-			char		*argv[],
-			char		*resource,
-			char		*cmnd,
-			int		 min_len);
-  int	    open_socket (
-			char		*host,
-			int		 port);
-  void	    print_HM_mode (uint mode);
-  void	    print_uptime (FILE *lun, char *prefix, int secs, char *suffix);
-  int	    setup_xrm_database (XrmDatabase	*db,
-				char		*name[],
-				int		*argc,
-				char		*argv[],
-				int		verbose);
-  void	    show_help (char *mod0, char *mod1);
-/*
-**--------------------------------------------------------------------------*/
-  int	getCheckStatusResponse (
-/*	======================
-**			    Wait for the status response from SinqHM and
-**			    check it for errors.
-**
-*/		int			 skt,	    /* The socket for recv */
-		struct rply_buff_struct	*reply,	    /* The buffer to use */
-		int			 rlen) {    /* Size of buffer */
-
-    int	    status;
-
-    status = recv (skt, (char *) reply, rlen, 0);
-    if (status == -1) {
-      FailInet ("\n\007sinqhm_ctrl -- recv error");
-      return ERROR;
-    } else if (status != rlen) {
-      printf ("\007"
-	    "sinqhm_ctrl --  recv error - unexpected byte count: %d/%d\n",
-		    rlen, status);
-      return ERROR;
-    }
-    if (ntohl (reply->bigend) != 0x12345678) {
-      printf ("\007"
-	    "sinqhm_ctrl -- big-endian/little-endian problem!\n"
-	    "    Buffer received in non-network byte order!\n");
-      return ERROR;
-    }
-    status = ntohl (reply->status);
-    if (status == KER__SUCCESS) {
-      return SUCCESS;
-    }else if (status == KER__BAD_CREATE) {
-      printf ("\007 Status response is KER__BAD_CREATE\n");
-      printf (" Sub-status = %d\n", ntohl (reply->sub_status));
-    }else if (status == KER__BAD_STATE) {
-      printf ("\007 Status response is KER__BAD_STATE\n");
-    }else if (status == KER__BAD_VALUE) {
-      printf ("\007 Status response is KER__BAD_VALUE\n");
-    }else if (status == KER__BAD_RECV) {
-      printf ("\007 Status response is KER__BAD_RECV\n");
-    }else if (status == KER__BAD_ALLOC) {
-      printf ("\007 Status response is KER__BAD_ALLOC\n");
-    }else {
-      printf ("\007 Bad and unrecognised status response: 0x%x\n",
-		    status);
-    }
-    if (reply->u.message[0] != NIL) {
-      printf (" Message = \"%s\"\n", &reply->u.message[0]);
-    }
-    return ERROR;
-  }
-/*
-**---------------------------------------------------------------------------
-**			get_check_resources - get and check our resources
-*/
-  int	get_check_resources (
-/*	===================
-*/			XrmDatabase	*db,
-			char		*appName,
-			int		*argc,
-			char		*argv[],
-			int		verbose) {
-
-    int			i, status, len;
-    char		buff[80];
-    char		*type;
-    XrmValue		value;
-    time_t		time_now;
-    float		tmp_secs;
-/*----------------------------------------------------------	-help	*/
-    status = get_no_arg_resource (db, appName, argc, argv,
-					    ".sqhmHelp", "help", 1);
-    if (status) {
-      if (*argc <= 1) {
-	show_help (NULL, NULL);
-      }else if (*argc <= 2) {
-	show_help (argv[1], NULL);
-      }else {
-	show_help (argv[1], argv[2]);
-      }
-      exit (EXIT_SUCCESS);
-    }
-/*----------------------------------------------------------	-v */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmVerbose"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Verbose = verbose = (status) ? True : False;
-/*----------------------------------------------------------	-host	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmHost"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (status) {
-      StrJoin (Rmt_host, sizeof (Rmt_host), value.addr, "");
-    }else {
-      if (*argc >= 2) {
-	StrJoin (Rmt_host, sizeof (Rmt_host), argv[1], "");
-	(*argc)--;
-	for (i = 1; i < *argc; i++) argv[i] = argv[i+1];
-      }else {
-	printf ("\n"
-		"  Target host not specified, there is no default!\n");
-	show_help (NULL, NULL);
-	exit (EXIT_FAILURE);
-      }
-    }
-    if (verbose) printf ("Target host is \"%s\".\n", Rmt_host);
-/*----------------------------------------------------------	-port	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmPort"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%d", &Rmt_port) != 1)) {
-      Rmt_port = 2400;
-      if (verbose) printf ("Using the default TCP/IP port number of ");
-    }else {
-      if (verbose) printf ("TCP/IP port number = ");
-    }
-    if (verbose) printf ("%d\n", Rmt_port);
-/*----------------------------------------------------------	-size */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmPktSize"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%d", &Pkt_size) != 1)) {
-      Pkt_size = 8192;
-      if (verbose) printf ("Using the default packet size of ");
-    }else {
-      if (verbose) printf ("Packet size = ");
-    }
-    if (verbose) printf ("%d\n", Pkt_size);
-/*----------------------------------------------------------*/
-    Do_config   = get_no_arg_resource (db, appName, argc, argv,
-					    ".sqhmConfig", "config", 1);
-    Do_deconfig = get_no_arg_resource (db, appName, argc, argv,
-					    ".sqhmDeconfig", "deconfig", 8);
-    Do_go       = get_no_arg_resource (db, appName, argc, argv,
-					    ".sqhmGo", "go", 2);
-    Do_rundown  = get_no_arg_resource (db, appName, argc, argv,
-					    ".sqhmRundown", "rundown", 7);
-    Do_status   = get_no_arg_resource (db, appName, argc, argv,
-					    ".sqhmStatus", "status", 1);
-    if (!Do_status) Do_status = get_no_arg_resource (db, appName, argc, argv,
-					    ".sqhmStatus", "show", 1);
-    Do_stop     = get_no_arg_resource (db, appName, argc, argv,
-					    ".sqhmStop", "stop", 4);
-    Do_zero     = get_no_arg_resource (db, appName, argc, argv,
-					    ".sqhmZero", "zero", 4);
-    Be_harsh    = get_no_arg_resource (db, appName, argc, argv,
-					    ".sqhmHarsh", "harsh", 5);
-/*----------------------------------------------------------	-debug */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmDebug"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      Do_debug = False;
-    }else {
-      if (StrMatch (value.addr, "ON", 2)) {
-	Dbg_level = 0x0001;
-      }else if (StrMatch (value.addr, "OFF", 2)) {
-	Dbg_level = 0x0000;
-      }else if ((sscanf (value.addr, "%i", &Dbg_level) != 1) ||
-		(Dbg_level < 0) ||
-		(Dbg_level > 0x0ff)) {
-	printf ("\n"
-		"  \"-debug %s\" is invalid!\n"
-		"\n", value.addr);
-	show_help ("debug", NULL);
-	exit (EXIT_FAILURE);
-      }
-      Do_debug = True;
-    }
-/*----------------------------------------------------------	-mode	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmMode"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (status) {
-      StrJoin (Mode, sizeof (Rmt_host), value.addr, "");
-      if (verbose) printf ("-mode is \"%s\"\n", Mode);
-    }else {
-      StrJoin (Mode, sizeof (Rmt_host), "", "");
-    }
-/*----------------------------------------------------------	-nhist	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmNhist"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      Nhist = 1;
-    }else if (sscanf (value.addr, "%d", &Nhist) != 1) {
-      printf (" \"-nhist %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }else if (Nhist <= 0) {
-      printf (" \"-nhist %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }
-/*----------------------------------------------------------	-nbins	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmNbins"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      Nbins = 0;
-    }else if (sscanf (value.addr, "%d", &Nbins) != 1) {
-      printf (" \"-nbins %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }else if (Nbins <= 0) {
-      printf (" \"-nbins %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }
-/*----------------------------------------------------------	-lo_bin	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmLoBin"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      Lo_bin = 0;
-    }else if (sscanf (value.addr, "%d", &Lo_bin) != 1) {
-      printf ("\"-lo_bin %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }else if (Lo_bin < 0) {
-      printf ("\"-lo_bin %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }
-/*----------------------------------------------------------	-compress */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmCompress"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      Compress = 1;
-    }else if (sscanf (value.addr, "%d", &Compress) != 1) {
-      printf (" \"-compress %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }else if (Compress <= 0) {
-      printf (" \"-compress %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }
-/*----------------------------------------------------------	-bpb */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmBpb"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      Bytes_per_bin = 4;
-    }else if (sscanf (value.addr, "%d", &Bytes_per_bin) != 1) {
-      printf (" \"-bpb %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }else if ((Bytes_per_bin != 1) ||
-	      (Bytes_per_bin != 2) ||
-	      (Bytes_per_bin != 4)) {
-      printf (" \"-bpb %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }
-/*----------------------------------------------------------	-ncntr */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmNcntr"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      Ncntrs = 0;
-    }else if (sscanf (value.addr, "%d", &Ncntrs) != 1) {
-      printf (" \"-ncntr %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }else if (Ncntrs <= 0) {
-      printf (" \"-ncntr %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }
-/*----------------------------------------------------------	-lo_cntr */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmLoCntr"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      Lo_cntr = 0;
-    }else if (sscanf (value.addr, "%d", &Lo_cntr) != 1) {
-      printf (" \"-lo_cntr %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }else if (Lo_cntr < 0) {
-      printf (" \"-lo_cntr %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }
-/*----------------------------------------------------------	-span */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmSpan"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      Span = -1;
-    }else if (sscanf (value.addr, "%d", &Span) != 1) {
-      printf (" \"-span %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }else if (Span <= 0) {
-      printf (" \"-span %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }
-/*----------------------------------------------------------	-delay */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmDelay"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      Delay_time_to_start = 0;
-    }else if (sscanf (value.addr, "%d", &Delay_time_to_start) != 1) {
-      printf (" \"-delay %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }else if (Delay_time_to_start <= 0) {
-      printf (" \"-delay %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }
-/*----------------------------------------------------------	-nbuff */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmNbuff"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      Nbuff = 5;
-    }else if (sscanf (value.addr, "%d", &Nbuff) != 1) {
-      printf (" \"-nbuff %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }else if (Nbuff <= 0) {
-      printf (" \"-nbuff %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }
-/*----------------------------------------------------------	-buff_size */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmBuffSize"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      Buff_size = 8192;
-    }else if (sscanf (value.addr, "%d", &Buff_size) != 1) {
-      printf (" \"-buff_size %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }else if (Buff_size <= 0) {
-      printf (" \"-buff_size %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }
-/*----------------------------------------------------------	-xoff */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmxoff"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      xOff = 100;
-    }else if (sscanf (value.addr, "%d", &xOff) != 1) {
-      printf (" \"-xoff %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }else if (xOff <= 0) {
-      printf (" \"-xoff %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }
-/*----------------------------------------------------------	-yoff */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmyoff"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      yOff = 100;
-    }else if (sscanf (value.addr, "%d", &yOff) != 1) {
-      printf (" \"-yoff %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }else if (yOff <= 0) {
-      printf (" \"-yoff %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }
-/*----------------------------------------------------------	-yfac */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmyfac"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      yFac = 10;
-    }else if (sscanf (value.addr, "%d", &yFac) != 1) {
-      printf (" \"-yfac %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }else if (yFac <= 0) {
-      printf (" \"-yfac %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }
-/*----------------------------------------------------------	-xfac */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmxfac"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      xFac = 10;
-    }else if (sscanf (value.addr, "%d", &xFac) != 1) {
-      printf (" \"-xfac %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }else if (xFac <= 0) {
-      printf (" \"-xfac %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }
-/*----------------------------------------------------------	-xsize */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmxsize"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      xSize = 256;
-    }else if (sscanf (value.addr, "%d", &xSize) != 1) {
-      printf (" \"-xsize %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }else if (xSize <= 0) {
-      printf (" \"-xsize %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }
-/*----------------------------------------------------------	-ysize */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".sqhmxsize"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      ySize = 256;
-    }else if (sscanf (value.addr, "%d", &ySize) != 1) {
-      printf (" \"-ysize %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }else if (ySize <= 0) {
-      printf (" \"-ysize %s\" is invalid!\n", value.addr);
-      exit (EXIT_FAILURE);
-    }
-/*----------------------------------------------------------------------*/
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**			get_no_arg_resource - get a resource with no args
-*/
-  int	get_no_arg_resource (
-/*	===================
-*/			XrmDatabase	*db,
-			char		*appName,
-			int		*argc,
-			char		*argv[],
-			char		*resource,
-			char		*cmnd,
-			int		 min_len) {
-
-    int			i, status;
-    char		buff[80];
-    char		*type;
-    XrmValue		value;
-
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff), appName, resource),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (status) {
-      return True;
-    }else {
-      if ((*argc >= 2) && StrMatch (argv[1], cmnd, min_len)) {
-	(*argc)--;
-	for (i = 1; i < *argc; i++) argv[i] = argv[i+1];
-	return True;
-      }
-    }
-    return False;
-  }
-/*
-**---------------------------------------------------------------------------
-** Function:		open_socket ()
-**
-** Description:
-**   Create a "stream" socket and connect to a given Host/Port combination.
-**
-**   Return value is socket.
-**   If an error is detected, a message will be printed and return value = 0.
-*/
-  int	open_socket (
-/*	===========
-*/
-	    char	*host,	    /* The host's name */
-	    int		 port) {    /* The port on the host to connect to */
-
-    int			 status, my_skt, my_port;
-    char		 old_time_out[4];
-    union {
-      char  chars[4];
-      int   val;
-    } time_out;
-    unsigned int	 oto_status;
-    struct sockaddr_in	 lcl_sockname;
-    struct sockaddr_in	 rmt_sockname;
-    struct in_addr	 rmt_inet_addr;
-    struct in_addr	*rmt_inet_addr_pntr;
-    struct hostent	*rmt_hostent;
-    int			 rmt_sockname_len;
-#ifdef	__VMS
-    unsigned int    oto_len;
-    int		    tcp_option = UCX$C_TCP_PROBE_IDLE;
-#else
-    int		    oto_len;
-  #ifdef LINUX
-    int		    tcp_option = 0;
-  #else
-    int		    tcp_option = TCP_KEEPINIT;
-  #endif
-#endif
-/*------------------------------------------------------------------*/
-		/*
-		** Get the Internet address of the Host
-		*/
-    rmt_inet_addr.s_addr = inet_addr (host);
-    if (rmt_inet_addr.s_addr != -1) {
-      rmt_inet_addr_pntr = &rmt_inet_addr;
-    }else {
-      rmt_hostent = gethostbyname (host);
-      if (rmt_hostent == NULL) {
-	printf ("failed!\n\n"
-	      "   Host name, \"%s\", is not a known "
-			"Internet address.\n", host);
-	return 0;
-      }
-      rmt_inet_addr_pntr = (struct in_addr *) rmt_hostent->h_addr_list[0];
-    }
-	    /*---------------------------
-	    ** Create a TCP/IP socket for connecting to server and bind it.
-	    */
-    my_skt = socket (AF_INET, SOCK_STREAM, 0);
-    if (my_skt <= 0) {
-      printf ("failed!\n\n"
-	      "   Could not create a socket.\n\n");
-      perror ("OpenSocket");
-      return 0;
-    }
-    lcl_sockname.sin_family = AF_INET;
-    lcl_sockname.sin_port   = htons (0);
-    lcl_sockname.sin_addr.s_addr = 0;
-    status = bind (my_skt, (struct sockaddr *) &lcl_sockname,
-					sizeof (lcl_sockname));
-    if (status == -1) {
-      close (my_skt);
-      printf ("failed!\n\n"
-	      "   Could not bind the socket.\n\n");
-      perror ("OpenSocket");
-      return 0;
-    }
-		/*---------------------------
-		** Set short time-out
-		*/
-    oto_len = sizeof (old_time_out);	/* Save current time-out first */
-    oto_status = getsockopt (my_skt, IPPROTO_TCP, tcp_option,
-				old_time_out, &oto_len);
-    if (oto_status == 0) {
-      time_out.val = 5;			/* Set new time-out */
-      status = setsockopt (my_skt, IPPROTO_TCP, tcp_option,
-			    time_out.chars, sizeof (time_out));
-    }
-		/*---------------------------
-		** Connect to host
-		*/
-    my_port = port;
-    rmt_sockname_len = sizeof (rmt_sockname);
-    rmt_sockname.sin_family	 = AF_INET;
-    rmt_sockname.sin_port	 = htons (my_port);
-    rmt_sockname.sin_addr.s_addr = rmt_inet_addr_pntr->s_addr;
-    status = connect (my_skt, (struct sockaddr *) &rmt_sockname,
-				    sizeof (rmt_sockname));
-    if (status != 0) {
-      close (my_skt);
-      printf ("failed!\n\n"
-	      "   Could not connect to Host %s, Port %d.\n\n",
-		    host, my_port);
-      perror ("OpenSocket");
-      return 0;
-    }
-		/*---------------------------
-		** Restore time-out
-		*/
-    if (oto_status == 0) {
-      setsockopt (my_skt, IPPROTO_TCP, tcp_option,
-			    old_time_out, oto_len);
-    }
-    return my_skt;
-  }
-/*
-**--------------------------------------------------------------------------
-*/
-  void print_HM_mode (
-/*     =============
-**			    Interpret the HM configuration.
-**
-*/		    uint  mode) {   /* The configuration to be interpreted */
-
-    uint    my_mode;
-
-    printf (" Histogramming Mode = 0x%x", mode);
-
-    my_mode = mode & (~SQHM__SUB_MODE_MSK);
-    if (my_mode == SQHM__TRANS)  printf (" SQHM__TRANS");
-    if (my_mode == SQHM__HM_DIG) printf (" SQHM__HM_DIG");
-    if (my_mode == SQHM__TOF)    printf (" SQHM__TOF");
-    if (my_mode == SQHM__HM_PSD) printf (" SQHM__HM_PSD");
-    if (my_mode == SQHM__HRPT)   printf (" SQHM__HRPT");
-    if ((mode & SQHM__DEBUG)   != 0) printf ("/DEBUG");
-    if ((mode & SQHM__UD)      != 0) printf ("/UD");
-    if ((mode & SQHM__STROBO)  != 0) printf ("/STROBO");
-    if ((mode & SQHM__REFLECT) != 0) printf ("/REFLECT");
-    if ((mode & SQHM__NO_STAT) != 0) printf ("/NO_FILLER_STATUS");
-
-    printf ("\n   Bin overflow mode = ");
-    my_mode = mode & SQHM__BO_MSK;
-    if (my_mode == SQHM__BO_IGN) {
-      printf ("\"Ignore\"\n");
-    }else if (my_mode == SQHM__BO_SMAX) {
-      printf ("\"Stop-at-Max\"\n");
-    }else if (my_mode == SQHM__BO_CNT) {
-      printf ("\"Count\"");
-    }else {
-      printf ("\"Unrecognised\" = 0x%x\n", my_mode);
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void	print_uptime (
-/*	============
-**			Print out the up-time
-*/
-	    FILE    *lun,   	/* The output stream */
-	    char    *prefix,	/* A message prefix */
-	    int	     secs,	/* The up-time in seconds */
-	    char    *suffix) {	/* A message suffix */
-
-    int		mins, hrs, days;
-
-    mins = secs/60; secs -= mins * 60;
-    hrs  = mins/60; mins -= hrs  * 60;
-    days = hrs/24;  hrs  -= days * 24;
-    fprintf (lun, "%s", prefix);
-    if (days > 0) {
-      printf (" %d days, %d%02d%02d%s", days, hrs, mins, secs, suffix);
-    }else if (hrs > 0) {
-      printf (" %d hrs, %d mins, %d secs%s", hrs, mins, secs, suffix);
-    }else if (mins > 0) {
-      printf (" %d mins, %d secs%s", mins, secs, suffix);
-    }else {
-      printf (" %d secs%s", secs, suffix);
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**			setup_xrm_database    - setup Resource Manager Database
-*/
-  int	setup_xrm_database (
-/*	==================
-*/			XrmDatabase	*db,
-			char		*name[],
-			int		*argc,
-			char		*argv[],
-			int		verbose) {
-
-    static char	our_name[80]  = "Unknown";  /* This holds the program name */
-    static char lkup_name[80] = "Unknown";  /* Name for looking in database */
-
-    int		status, i, first = True;
-    char	text[80];
-    char	full_nm0[80];
-    char	full_nm1[80];
-    char	*p_fil[] = {0,0,0,0,0,0,0,0,0,0};
-    char	*my_name;
-    char	*my_name_last;
-
-    char	*name_type;
-    XrmValue	name_value;
-
-    XrmDatabase cmnd_line_db = NULL;
-    XrmDatabase	lcl_db	     = NULL;
-  /*-----------------------------------------------------
-  ** This routine merges some resource databases with options specified on
-  ** the command line. Resources can then be looked up using XrmGetResource.
-  ** This is a bit like the X-toolkit routine XtAppInitialize does for the
-  ** extraction of resources by XtGetApplicationResources.
-  ** 
-  ** I can't help but think that there's a simpler way of doing this but I
-  ** can't find it in the X manuals. Basically, the problem arises with wanting
-  ** to avoid the calling program being associated with an X-display, i.e. it
-  ** is intended for use by "command-line oriented" programs. All the nice,
-  ** easy-to-use resource/command-line setup routines in Xlib or Xtlib seem to
-  ** assume one is going to use a display -- not surprising, I suppose,
-  ** since the concept of Xlib is for writing window based applications!
-  **
-  ** Anyway, the point is that the following way turns out to be lacking
-  ** when it gets tested in anger.
-  */
-    status = True;		/* Assume success	*/
-
-    our_name[0] = NIL;
-	/*
-	** Make a list of the databases to be merged, highest priority first.
-	*/
-#ifdef  __VMS
-    p_fil[0] = "decw$user_defaults:SinQ_rc.dat";
-    p_fil[1] = "decw$group_defaults:SinQ_rc.dat";
-    p_fil[2] = "decw$system_defaults:SinQ_rc.dat";
-    p_fil[3] = "decw$user_defaults:decw$xdefaults.dat";
-    p_fil[4] = "decw$group_defaults:decw$xdefaults.dat";
-    p_fil[5] = "decw$system_defaults:decw$xdefaults.dat";
-    p_fil[6] = NULL;
-    if (*argc > 0) {	     /* Find out what we are called - parse file nm */
-      my_name = strstr (argv[0], "]");	/* Find end of directory, i.e. "]" */
-      my_name++;			/* Skip over "]" */
-      if (my_name[0] == '[') {		/* Handle possible concealed device */
-        my_name = strstr (my_name, "]");
-	my_name++;
-      }
-      i = sizeof (our_name);
-      StrEdit (our_name, my_name, "lowercase", &i);	    /* Copy the rest */
-      strtok (our_name, ".");		/* Close it off at "." */
-    }
-#else
-    p_fil[0] = StrJoin (full_nm0, sizeof (full_nm0),
-			    getenv ("HOME"), "/SinQ_rc");
-    p_fil[1] = "/usr/lib/X11/app-defaults/SinQ_rc";
-    p_fil[2] = StrJoin (full_nm1, sizeof (full_nm1),
-			    getenv ("HOME"), "/.Xdefaults");
-    p_fil[3] = "/usr/lib/X11/app-defaults/Xdefaults";
-    p_fil[4] = NULL;
-    if (*argc > 0) {	      /* Find out what we are called - parse file nm  */
-			      /* Find end of directories */
-      my_name = argv[0] - 1;
-      while (my_name != NULL) {
-        my_name_last = my_name;
-	my_name_last++;
-	my_name = strstr (my_name_last, "/");
-      }
-      StrJoin (our_name, sizeof (our_name), my_name_last, "");
-    }
-#endif
-    if (verbose) printf ("My name is \"%s\"\n", our_name);
-	/*
-	**  Initialise and combine all databases
-	*/
-    XrmInitialize ();
-    for (i = 0; i < XtNumber (p_fil); i++) {
-      if (p_fil[i] == NULL) break;
-      status = XrmCombineFileDatabase (p_fil[i], &lcl_db, False);
-      if ((status != 0) && verbose) {
-	if (first)
-	  printf ("Resource database created from file %s.\n", p_fil[i]);
-	if (!first)
-	  printf ("File %s merged into resource database.\n", p_fil[i]);
-	first = False;
-      }
-    }
-	/*----------------------------------------------------------------
-	**  See if there's anything specified on cmnd line, incl "name".
-	*/
-    XrmParseCommand (&cmnd_line_db,
-			OpTable_0, XtNumber(OpTable_0), our_name, argc, argv);
-    if (cmnd_line_db != NULL) {
-	    /*
-	    ** There was at least 1 item on cmnd line. Process the line.
-	    ** If -name was specified, adopt it.
-	    */
-      status = XrmGetResource (cmnd_line_db,  /* See if a name was specified  */
-			    StrJoin (text, sizeof (text), our_name, ".name"),
-			    "ProgramName.Values",
-			    &name_type, &name_value);
-      if (status) {
-	i = sizeof (lkup_name);
-	StrEdit (lkup_name, name_value.addr, "lowercase", &i);
-	printf ("Option list name is \"%s\"\n", lkup_name);
-      }else {
-        strcpy (lkup_name, our_name);
-      }
-	    /*
-	    ** Loop over all items in OpTable_0 and merge them into database,
-	    ** taking care of any possible name changes.
-	    */
-      for (i = 0; i < XtNumber (OpTable_0); i++) {
-	if (strcmp (OpTable_0[i].option, "-name") == 0) continue;
-        status = XrmGetResource (cmnd_line_db,
-				StrJoin (text, sizeof (text),
-				    our_name, OpTable_0[i].specifier),
-				"ProgramName.Values",
-				&name_type, &name_value);
-	if (status) {
-	  StrJoin (text, sizeof (text), lkup_name, OpTable_0[i].specifier);
-	  XrmPutResource (&lcl_db, text, "String", &name_value);
-	}
-      }
-    }
-/*----------------------------------------------------------------
-*/
-    *name = lkup_name;
-    *db = lcl_db;
-    if ((lcl_db == NULL) && verbose)
-      printf ("\007Warning -- no resource database found.\n");
-
-    XrmDestroyDatabase (cmnd_line_db);
-/*
-**    XrmPutFileDatabase (lcl_db, "sinqhm_client.db");
-*/
-    return status;
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void show_help (char *mod0, char *mod1) {
-/*     =========
-*/
-    int len;
-
-    len = (mod0 == NULL) ? 0 : strlen (mod0);
-    if (len == 0) goto sh_basic;
-
-    if (StrMatch (mod0, "host", 1))      goto sh_host;
-    if (StrMatch (mod0, "resources", 2)) goto sh_resources;
-    if (StrMatch (mod0, "config", 1))    goto sh_config;
-    if (StrMatch (mod0, "debug", 3))     goto sh_debug;
-    if (StrMatch (mod0, "deconfig", 3))  goto sh_deconfig;
-    if (StrMatch (mod0, "go", 1))        goto sh_go;
-    if (StrMatch (mod0, "rundown", 2))   goto sh_rundown;
-    if (StrMatch (mod0, "show", 1))	 goto sh_show;
-    if (StrMatch (mod0, "status", 2))    goto sh_status;
-    if (StrMatch (mod0, "stop", 3))	 goto sh_stop;
-    if (StrMatch (mod0, "zero", 1))	 goto sh_zero;
-
-    printf ("\n"
-	    " \"%s\" in an unrecognised help option. Here are some\n"
-	    " hints on using sinqhm_ctrl:\n", mod0);
-sh_basic:
-    printf ("\n"
-	"  The following major command options are recognised by sinqhm_ctrl:\n"
-	"\n"
-	"    -host ...           - specifies the target histogram memory.\n"
-	"\n"
-	"    -config ...         - configure the hist memory.\n"
-	"    -debug <level>      - sets the debug level.\n"
-	"    -deconfig           - de-configure the hist memory.\n"
-	"    -go                 - start data acquisition.\n"
-	"    -rundown            - run down SinqHM server.\n"
-	"    -status (or -show)  - get status of hist memory.\n"
-	"    -stop               - stop data acquisition.\n"
-	"    -zero               - zero the HM buffer.\n"
-	"\n"
-	"  In order to use sinqhm_ctrl on a VMS system, the DCL$PATH logical\n"
-	"  name must be defined, e.g:\n"
-	"                   $ define/job dcl$path mad_exe:\n"
-	"\n"
-	"  To get more help, issue the command:    sinqhm_ctrl -help <subject>\n"
-	"\n"
-	"  where <subject> may be any of\n"
-	"\n"
-	"    host\n"
-	"    config    debug    deconfig  go\n"
-	"    rundown   status   stop      zero\n"
-	"    resources\n"
-	"\n");
-    return;
-
-  sh_host:
-    printf ("\n -host\n"
-	"\n"
-	"  The histogram memory with which sinqhm_ctrl is to communicate is\n"
-	"  specified on the command line, thus:\n"
-	"\n"
-	"           -host <host> -port <port> -size <pkt-size>\n"
-	"\n"
-	"  <host> is the Internet name of the histogram memory specified as\n"
-	"  a name or in the normal Internet dot notation. There is no default.\n"
-	"\n"
-	"  <port> defaults to 2400 and is the Internet port number at which "
-									"the\n"
-	"  SinqHM server in <host> is accepting connections.\n"
-	"\n"
-	"  <pkt-size> defaults to 8192 and is the maximum size to be used "
-								"in send/recv\n"
-	"  calls for transmitting messegas and data between the client and "
-								    "<host>.\n"
-	"  It is not recommended to make this value too large since it causes "
-									"the\n"
-	"  network software to reserve too much dynamic memory.\n"
-	"\n");
-    return;
-
-  sh_resources:
-    printf ("\n"
-	    " Sorry, \"-help resources\" is not yet available.\n\n");
-
-  sh_config:
-    len = (mod1 == NULL) ? 0 : strlen (mod1);
-    if (len == 0) goto shc_basic;
-
-    if (StrMatch (mod1, "hm_dig", 4))     goto shmc_hm_dig;
-    if (StrMatch (mod1, "tof",    2))     goto shmc_tof;
-    if (StrMatch (mod1, "hrpt",   2))     goto shmc_hrpt;
-    if (StrMatch (mod1, "hm_psd", 4))     goto shmc_psd;
-    if (StrMatch (mod1, "trans",  2))     goto shmc_trans;
-    printf ("\n"
-	    " \"%s\" in an unrecognised \"-help config\" option. Here is\n"
-	    " the basic \"-help config\" information:\n", mod1);
-  shc_basic:
-    printf ("\n -config           Configure the histogram memory.\n"
-	"\n"
-	"  When the -config option is used to configure the histogram memory,\n"
-	"  the -mode option must also be given to specify the histogramming mode.\n"
-	"  The -mode option takes the form:\n"
-	"\n"
-	"         -mode <main-mode>[/<sub-mode>][/<sub-mode>]...\n"
-	"  \n"
-	"  <main-mode> specifies the histogramming mode. Recognised values are:\n"
-	"      HM_DIG = Digitised histogramming mode (e.g. DMC or SANS)\n"
-	"      TOF    = Time-of-Flight mode\n"
-	"      HRPT   = HRPT mode\n"
-	"      HM_PSD = Position-Sensitive-Detector mode\n"
-	"      TRANS  = Transparent mode\n"
-	"\n"
-	"  <sub-mode> specifies extra options for the mode. Recognised values are:\n"
-	"      DEBUG    - debug mode. The filler task will suspend itself as\n"
-	"                   soon as it is started so that it can be debugged.\n"
-	"      UD       - Up/Down mode.\n"
-	"      BO_IGN   - Ignore bin overflows when histogramming.\n"
-	"      BO_SMAX  - If a bin overflows, stop at maximum value.\n"
-	"      BO_CNT   - Keep a count of bin overflows (not yet available).\n"
-	"      STROBO   - Stroboscopic (gummi) mode.\n"
-	"      REFLECT  - histograms are reflected (used on HRPT)\n"
-	"      NO_STAT  - Suppress status information from the filler task.\n"
-	"\n"
-	"  Further options must also be specified depending on the value of <main-mode>.\n"
-	"  To get more help, issue the command:\n"
-	"\n"
-	"         sinqhm_ctrl -help config <main-mode>\n"
-	"\n"
-	"  where <main-mode> may be any of HM_DIG, TOF, HRPT, HM_PSD or TRANS.\n"
-	"\n"
-	"  The configuring of the histogram memory results in the starting up\n"
-	"  of the filler process.\n"
-	"\n");
-    return;
-
-  shmc_hm_dig:
-    printf ("\n -config -mode HM_DIG           Digitised histogramming mode.\n"
-	"\n"
-	"  The following options are required to define the HM_DIG mode:\n");
-    goto shmc_hm_dig_hrpt_comn;
-
-  shmc_hrpt:
-    printf ("\n -config -mode HRPT             HRPT histogramming mode.\n"
-	"\n"
-	"  The following options are required to define the HRPT mode:\n");
-
-  shmc_hm_dig_hrpt_comn:
-    printf ("\n"
-	"    -nhist    <#-hists>     (Dflt =    1) = Number of histograms.\n"
-	"    -nbins    <#-bins>      (Dflt = none) = Number of bins.\n"
-	"    -bpb      <bpb>         (Dflt =    4) = Bytes per bin.\n"
-	"    -lo_bin   <lo_bin>      (Dflt =    0) = Number of lowest bin.\n"
-	"    -compress <cmprs>       (Dflt =    1) = Bin compression factor.\n"
-	"\n");
-    return;
-
-  shmc_tof:
-    printf ("\n -config -mode TOF          Time-of-Flight histogramming mode.\n"
-	"\n"
-	"  The following options are required to define the TOF mode:\n"
-	"    -ncntr    <#-cntrs>     (Dflt = none) = Number of counters.\n"
-	"    -nbins    <#-bins>      (Dflt = none) = Number of bins.\n"
-	"    -lo_bin   <lo_bin>      (Dflt =    0) = Tick value of first bin.\n"
-	"    -lo_cntr  <lo_cntr>     (Dflt =    0) = Number of first counter.\n"
-	"    -bpb      <bpb>         (Dflt =    4) = Bytes per bin.\n"
-	"    -span     <span>        (Dflt = none) = Number of ticks spanned by a bin.\n"
-	"    -delay    <delay>       (Dflt =    0) = Delay time to start\n"
-	"\n");
-    return;
-
-  shmc_psd:
-    printf ("\n -config -mode HM_PSD          PSD histogramming mode.\n"
-	"\n"
-	"          Not yet available!\n"
-	"\n");
-    return;
-
-  shmc_trans:
-    printf ("\n -config -mode TRANS            Transparent mode.\n"
-	"\n"
-	"  The following options are required to define the Transparent mode:\n"
-	"    -nbuff     <#-buff>     (Dflt =    5) = Number of buffers.\n"
-	"    -buff_size <size>       (Dflt = 8192) = Size in bytes of each buffer.\n"
-	"\n");
-    return;
-
-  sh_debug:
-    printf ("\n -debug <level>   Set the level of debug messages.\n"
-	"\n"
-	"  The value of <level> sets the verbosity of the SinqHM system\n"
-	"  in generating messages to the COM1 port of the histogram\n"
-	"  memory.\n"
-	"\n"
-	"  <level> may be set to \"OFF\", \"ON\", 0, 1, 2 or 3.\n"
-	"\n"
-	" \"OFF\" is equivalent to 0\n"
-	" \"ON\"  is equivalent to 1\n"
-	" The default is \"ON\".\n"
-	"\n");
-    return;
-
-  sh_deconfig:
-    printf ("\n -deconfig <harshness>    De-configure the hist memory.\n"
-	"\n"
-	" If <harshness> is not specified, there must be no active clients\n"
-	" for the command to be accepted.\n"
-	"\n"
-	" If <harshness> is specified as \"HARSH\", any active clients will\n"
-	" be killed.\n"
-	"\n"
-	" The filler task is also terminated.\n"
-	"\n");
-    return;
-
-  sh_go:
-    printf ("\n -go     Start data acquisition by SinqHM-filler\n"
-	"\n"
-	"  An SQHM_DAQ/DAQ__GO command will be sent to SinqHM-master to cause\n"
-	"  SinqHM-filler to start data acquisition.\n"
-	"\n");
-    return;
-
-  sh_rundown:
-    printf ("\n -rundown     Runs down SinqHM\n"
-	"\n"
-	"          +------------------+\n"
-	"          | USE WITH CAUTION |\n"
-	"          +------------------+\n"
-	"\n"
-	" SinqHM-master, SinqHM-filler and all SinqHM-servers will\n"
-	" be terminated.\n"
-	"\n"
-	" After issuing this command, manual intervention on the\n"
-	" histogram memory will be necessary in order to restart\n"
-	" SinqHM.\n"
-	"\n");
-    return;
-
-  sh_show:
-    printf ("\n -show      Same as -status\n"
-	"\n"
-	"      Get and display the status of the hist memory.\n"
-	"\n");
-    return;
-
-  sh_status:
-    printf ("\n -status      Get and display the status of the hist memory.\n"
-	"\n");
-    return;
-
-  sh_stop:
-    printf ("\n -stop     Stop data acquisition by SinqHM-filler\n"
-	"\n"
-	"  An SQHM_DAQ/DAQ__STOP command will be sent to SinqHM-master to cause\n"
-	"  SinqHM-filler to stop data acquisition.\n"
-	"\n");
-    return;
-
-  sh_zero:
-    printf ("\n -zero         Zero the histogram memory buffer\n"
-	"\n"
-	" An SQHM_ZERO command will be sent to SinqHM-master. The values of\n"
-	" hist_no, first_bin and n_bins will be set to -1 so that the entire\n"
-	" histogram memory buffer will be set to zero.\n"
-	"\n");
-    return;
-  }
-/*
-**==========================================================================
-**
-**  Main line program
-**  ------------------
-**==========================================================================*/
-  main (int argc, char *argv[]) {
-/*==========================================================================*/
-    int			i, j, k, status, cmnd_len, mod_len;
-    int			is1, is2, mode;
-    int			nh, ch, bph, bpb, span;
-    int			tsi_status, tsi_flags, dt_or_dts, num_bad_ev;
-    char		*p_addr, *opt, tmp_ch;
-    char		buff[64], my_cmnd[32], my_mod[32];
-    char		*token;
-    unsigned int	daq_state_now;
-    unsigned int	daq_state_was;
-    unsigned int	filler_mask;
-    unsigned int	server_mask;
-    XrmDatabase		my_db;
-    char		*appName;
-
-    int			cnct_skt;	/* Connect socket */
-    struct sockaddr_in	lcl_sockname;
-    struct sockaddr_in	rmt_sockname;
-    int			rmt_inet_addr;
-    struct in_addr	*rmt_inet_addr_pntr;
-    struct hostent	*rmt_hostent;
-    int			rmt_sockname_len;
-    int			oto_status;
-    char		old_time_out[4];
-    union {
-      char  chars[4];
-      int   val;
-    } time_out;
-/*============================================================================*/
-    printf ("sinqhm_ctrl ident %s.\n", IDENT);
-
-	/*-------------------------------------------------------------
-	**	Setup the resource database and look up the resources.
-	*/
-    Verbose = False;
-    for (i = 1; i < argc; i++) if (strcmp ("-v", argv[i]) == 0) Verbose = True;
-
-    setup_xrm_database (&my_db, &appName, &argc, argv, Verbose);
-    status = get_check_resources (&my_db, appName, &argc, argv, Verbose);
-    if (!status) return False;
-
-    if (Verbose) printf (" Server is %s ", Rmt_host);
-    if (Verbose) printf ("(%s),", inet_ntoa (*rmt_inet_addr_pntr));
-    if (Verbose) printf (" Port %d.\n", Rmt_port);
-/*============================================================================
-**		Execute the user's wish.
-*/
-    i = 0;
-    if (Do_config)   i++;
-    if (Do_debug)    i++;
-    if (Do_deconfig) i++;
-    if (Do_go)	     i++;
-    if (Do_rundown)  i++;
-    if (Do_status)   i++;
-    if (Do_stop)     i++;
-    if (Do_zero)     i++;
-    if (i == 0) {
-      printf ("No action has been specified. Assume \"-status\" ...\n");
-      Do_status = True;
-    }else if (i != 1) {
-      printf ("Only one action may be specified on the command line.\n");
-      show_help (NULL, NULL); exit (EXIT_FAILURE);
-    }
-/*============================================================================
-**		Switch according to value of <cmnd>
-*/
-    if (Do_config)	goto config;
-    if (Do_debug)	goto debug;
-    if (Do_deconfig)	goto deconfig;
-    if (Do_go)		goto go;
-    if (Do_rundown)	goto rundown;
-    if (Do_status)	goto status;
-    if (Do_stop)	goto stop;
-    if (Do_zero)	goto zero;
-    goto status;
-/*============================================================================*/
-  config:
-/*======		Configure - Extract values from the logical names.
-*/
-    Hm_mode = 0;
-    StrJoin (buff, sizeof (buff), Mode, "");
-    token = strtok (buff, "/");   /* Split up the tokens */
-    while (token != NULL) {
-      if (StrMatch (token, "HM_DIG", 4)) {
-	Hm_mode = (Hm_mode & ~SQHM__SUB_MODE_MSK) | SQHM__HM_DIG;
-      }else if (StrMatch (token, "TOF", 3)) {
-	Hm_mode = (Hm_mode & ~SQHM__SUB_MODE_MSK) | SQHM__TOF;
-      }else if (StrMatch (token, "HRPT", 3)) {
-	Hm_mode = (Hm_mode & ~SQHM__SUB_MODE_MSK) | SQHM__HRPT;
-      }else if (StrMatch (token, "TRANS", 3)) {
-	Hm_mode = (Hm_mode & ~SQHM__SUB_MODE_MSK) | SQHM__TRANS;
-      }else if (StrMatch (token, "HM_PSD", 4)) {
-	Hm_mode = (Hm_mode & ~SQHM__SUB_MODE_MSK) | SQHM__HM_PSD;
-      }else if (StrMatch (token, "DEBUG", 3)) {
-	Hm_mode |= SQHM__DEBUG;
-      }else if (StrMatch (token, "UD", 2)) {
-	Hm_mode |= SQHM__UD;
-      }else if (StrMatch (token, "BO_IGN", 4)) {
-	Hm_mode = (Hm_mode & ~SQHM__BO_MSK ) | SQHM__BO_IGN;
-      }else if (StrMatch (token, "BO_SMAX", 4)) {
-	Hm_mode = (Hm_mode & ~SQHM__BO_MSK ) | SQHM__BO_SMAX;
-      }else if (StrMatch (token, "BO_CNT", 4)) {
-	Hm_mode = (Hm_mode & ~SQHM__BO_MSK ) | SQHM__BO_CNT;
-      }else if (StrMatch (token, "STROBO", 3)) {
-	Hm_mode |= SQHM__STROBO;
-      }else if (StrMatch (token, "REFLECT", 4)) {
-	Hm_mode |= SQHM__REFLECT;
-      }else if (StrMatch (token, "NO_STAT", 4)) {
-	Hm_mode |= SQHM__NO_STAT;
-      }else {
-	printf ("\007 The -mode option is not valid.\n");
-	printf (" Here is some help ...\n");
-	show_help ("config", NULL);
-	return EXIT_FAILURE;
-      }
-      token = strtok (NULL, "/");
-    }
-
-    is1 = EXIT_SUCCESS;
-    if (((Hm_mode & ~SQHM__SUB_MODE_MSK) == SQHM__HM_DIG) ||
-	((Hm_mode & ~SQHM__SUB_MODE_MSK) == SQHM__HRPT)) {
-      if (Nbins <= 0) {is1 = !EXIT_SUCCESS; opt = "-nbins";}
-    }else if ((Hm_mode & ~SQHM__SUB_MODE_MSK) == SQHM__TOF) {
-      if (Ncntrs <= 0) {
-	is1 = !EXIT_SUCCESS;
-	opt = "-ncntr";
-      }else if (Nbins <= 0) {
-	is1 = !EXIT_SUCCESS;
-	opt = "-nbins";
-      }else if (Span < 0) {
-	is1 = !EXIT_SUCCESS;
-	opt = "-span";
-      }
-    }else if((Hm_mode & ~SQHM__SUB_MODE_MSK) == SQHM__HM_PSD){
-      if(xSize <= 0) {
-        is1 = !EXIT_SUCCESS;
-        opt = "-xsize";
-      }else if(ySize <= 0) {
-        is1 = !EXIT_SUCCESS;
-        opt = "-ysize";
-      }
-    }else if ((Hm_mode & ~SQHM__SUB_MODE_MSK) == SQHM__TRANS) {
-    }else {
-      is1 = !EXIT_SUCCESS;
-      opt = "-mode";
-    }
-    if (is1 != EXIT_SUCCESS) {
-      printf ("\007 The configuration is not defined or not complete.\n");
-      printf (" Here is some help ...\n");
-      show_help ("config", NULL);
-      printf (" The problem is with %s\n", opt);
-      printf ("\n");
-      return EXIT_FAILURE;
-    }
-/*
-**		    The configuration seems to be OK. Connect to the target.
-*/
-    cnct_skt = open_socket (Rmt_host, Rmt_port);
-    if (cnct_skt <= 0) exit (EXIT_FAILURE);
-/*
-**		    Set up and send the configure message.
-*/
-    Req_buff.bigend = htonl (0x12345678);
-    Req_buff.cmnd   = htonl (SQHM_CONFIG);
-
-    Req_buff.u.cnfg.mode     = htonl (Hm_mode);
-    if ((Hm_mode & ~SQHM__SUB_MODE_MSK) == SQHM__HM_DIG) {
-      Req_buff.u.cnfg.u.hm_dig.n_hists	     = htonl (Nhist);
-      Req_buff.u.cnfg.u.hm_dig.lo_bin	     = htonl (Lo_bin);
-      Req_buff.u.cnfg.u.hm_dig.num_bins	     = htonl (Nbins);
-      Req_buff.u.cnfg.u.hm_dig.bytes_per_bin = htonl (Bytes_per_bin);
-      Req_buff.u.cnfg.u.hm_dig.compress	     = htonl (Compress);
-    }else if ((Hm_mode & ~SQHM__SUB_MODE_MSK) == SQHM__TOF) {
-      Req_buff.u.cnfg.u.tof.n_extra_bytes = htonl (0);
-      Req_buff.u.cnfg.u.tof.n_edges	  = htons (1);
-      Req_buff.u.cnfg.u.tof.n_banks	  = htons (1);
-
-      Req_buff.u.cnfg.u.tof.edge_0.n_bins   = htonl (Nbins);
-      Req_buff.u.cnfg.u.tof.edge_0.flag     = htonl (0);    /* Fixed bin span */
-      Req_buff.u.cnfg.u.tof.edge_0.edges[0] = htonl (Lo_bin);
-      Req_buff.u.cnfg.u.tof.edge_0.edges[1] = htonl (Lo_bin+Span);
-      Req_buff.u.cnfg.u.tof.preset_delay    = htonl (Delay_time_to_start);
-
-      Req_buff.u.cnfg.u.tof.bank_0.first         = htons (Lo_cntr);
-      Req_buff.u.cnfg.u.tof.bank_0.n_cntrs       = htons (Ncntrs);
-      Req_buff.u.cnfg.u.tof.bank_0.edge_indx	 = htons (0);
-      Req_buff.u.cnfg.u.tof.bank_0.bytes_per_bin = htons (Bytes_per_bin);
-    }else if ((Hm_mode & ~SQHM__SUB_MODE_MSK) == SQHM__HM_PSD) {
-      Req_buff.u.cnfg.u.psd.n_extra_bytes = htonl (0);
-      Req_buff.u.cnfg.u.psd.n_edges	  = htons (1);
-      Req_buff.u.cnfg.u.psd.n_banks	  = htons (1);
-      Req_buff.u.cnfg.u.psd.xOffset	  = htons (xOff);
-      Req_buff.u.cnfg.u.psd.yOffset	  = htons (yOff);
-      Req_buff.u.cnfg.u.psd.xFactor	  = htons (xFac);
-      Req_buff.u.cnfg.u.psd.yFactor	  = htons (yFac);
-      Req_buff.u.cnfg.u.psd.xSize	  = htons (xSize);
-      Req_buff.u.cnfg.u.psd.ySize	  = htons (ySize);
-
-
-      Req_buff.u.cnfg.u.psd.edge_0.n_bins   = htonl (Nbins);
-      Req_buff.u.cnfg.u.psd.edge_0.flag     = htonl (0);    /* Fixed bin span */
-
-      Req_buff.u.cnfg.u.psd.edge_0.edges[0] = htonl (0);
-      Req_buff.u.cnfg.u.psd.edge_0.edges[1] = htonl (Span);
-      Req_buff.u.cnfg.u.psd.preset_delay    = htonl (Delay_time_to_start);
-
-      Req_buff.u.cnfg.u.psd.bank_0.first         = htons (Lo_cntr);
-      Req_buff.u.cnfg.u.psd.bank_0.n_cntrs       = htons (xSize*ySize);
-      Req_buff.u.cnfg.u.psd.bank_0.edge_indx	 = htons (0);
-      Req_buff.u.cnfg.u.psd.bank_0.bytes_per_bin = htons (Bytes_per_bin);
-    }else if ((Hm_mode & ~SQHM__SUB_MODE_MSK) == SQHM__TRANS) {
-      Req_buff.u.cnfg.u.trans.n_buffs = htonl (Nbuff);
-      Req_buff.u.cnfg.u.trans.n_bytes = htons (Buff_size);
-    }
-
-    printf (" Configuration:\n"
-	    "   Histogramming mode is 0x%08x", Hm_mode);
-    if ((Hm_mode & ~SQHM__SUB_MODE_MSK) == SQHM__HM_DIG) {
-      printf (" = HM_DIG");
-    }else if ((Hm_mode & ~SQHM__SUB_MODE_MSK) == SQHM__HM_PSD) {
-      printf (" = HM_PSD");
-    }else if ((Hm_mode & ~SQHM__SUB_MODE_MSK) == SQHM__HRPT) {
-      printf (" = HRPT");
-    }else if ((Hm_mode & ~SQHM__SUB_MODE_MSK) == SQHM__TRANS) {
-      printf (" = TRANS");
-    }else if ((Hm_mode & ~SQHM__SUB_MODE_MSK) == SQHM__TOF) {
-      printf (" = TOF");
-    }
-    if ((Hm_mode & SQHM__DEBUG) != 0) printf (" + DEBUG");
-    printf ("\n");
-    if ((Hm_mode & ~SQHM__SUB_MODE_MSK) != SQHM__TOF) {
-      printf ("   Number of histograms         = %5d\n"
-	    "   Index of first bin           = %5d\n"
-	    "   Number of bins per histogram = %5d\n"
-	    "   Number of bytes per bin      = %5d\n"
-	    "   Bin compression factor       = %5d\n",
-			Nhist, Lo_bin, Nbins, Bytes_per_bin, Compress);
-    } else if (((Hm_mode & ~SQHM__SUB_MODE_MSK) != SQHM__HM_DIG) ||
-	       ((Hm_mode & ~SQHM__SUB_MODE_MSK) != SQHM__HRPT)) {
-      printf ("   Number of counters           = %5d\n"
-	    "   First counter                = %5d\n"
-	    "   Number of bins per histogram = %5d\n"
-	    "   Lower edge of first bin      = %5d\n"
-	    "   Bin width                    = %5d\n"
-	    "   Number of bytes per bin      = %5d\n"
-	    "   Delay-Time-to-Start          = %5d\n",
-			Ncntrs, Lo_cntr, Nbins, Lo_bin, Span, Bytes_per_bin,
-			Delay_time_to_start);
-    }
-    if ((Hm_mode & SQHM__DEBUG) != 0)
-      printf ("\007\n   Warning -- DEBUG suspend flag is set!\n\n");
-    printf (" Configuring ..."); fflush (NULL);
-
-    status = send (cnct_skt, (char *) &Req_buff, sizeof (Req_buff), 0);
-    if (status == -1) FailInet ("\nsinqhm_ctrl -- send error");
-    if (status != sizeof (Req_buff)) {
-      printf ("\nsinqhm_ctrl -- wrong number of bytes sent: %d", status);
-      return EXIT_FAILURE;
-    }
-/*
-**		    Wait for the status response.
-*/
-    status = getCheckStatusResponse (cnct_skt, &Rply_buff, sizeof (Rply_buff));
-    if (status == SUCCESS) {
-      printf (" done.\n");
-    }
-/*
-**		Close the connection.
-*/
-    status = close (cnct_skt);
-    if ((status != 0) && (errno != ECONNRESET))
-	    FailInet ("\nsinqhm_ctrl -- close error");
-    return EXIT_SUCCESS;
-/*============================================================================*/
-  debug:
-/*=====		Debug. Set up the debug level of the front-end..
-*/
-    printf (" Setting SinqHM debug mask = 0x%04x ...", Dbg_level); fflush (NULL);
-    Req_buff.bigend = htonl (0x12345678);
-    Req_buff.cmnd   = htonl (SQHM_DBG);
-    Req_buff.u.dbg.mask = htonl (Dbg_level);
-
-    cnct_skt = open_socket (Rmt_host, Rmt_port);
-    if (cnct_skt <= 0) exit (EXIT_FAILURE);
-
-    status = send (cnct_skt, (char *) &Req_buff, sizeof (Req_buff), 0);
-    if (status == -1) FailInet ("\nsinqhm_ctrl -- send error");
-    if (status != sizeof (Req_buff)) {
-      printf ("sinqhm_ctrl -- wrong number of bytes sent: %d", status);
-      status = close (cnct_skt);
-      return EXIT_FAILURE;
-    }
-/*
-**		Wait for the status response.
-*/
-    status = getCheckStatusResponse (cnct_skt, &Rply_buff, sizeof (Rply_buff));
-    if (status == SUCCESS) {
-      printf (" done.\n");
-    }
-/*
-**		Close the connection.
-*/
-    status = close (cnct_skt);
-    if ((status != 0) && (errno != ECONNRESET))
-	    FailInet ("\nsinqhm_ctrl -- close error");
-    return EXIT_SUCCESS;
-/*============================================================================*/
-  deconfig:
-/*========		De-configure. Set up and send the deconfig message.
-*/
-    Req_buff.bigend = htonl (0x12345678);
-    Req_buff.cmnd   = htonl (SQHM_DECONFIG);
-    Req_buff.u.decnfg.sub_code = 0;		/* Be gentle, by default */
-    if (Be_harsh) {
-      Req_buff.u.decnfg.sub_code = htonl (1);	/* But be harsh, if ordered */
-      printf (" Deconfiguring (mit Gewalt!) ...");
-    }else {
-      printf (" Deconfiguring ...");
-    }
-    fflush (NULL);
-    
-    cnct_skt = open_socket (Rmt_host, Rmt_port);
-    if (cnct_skt <= 0) exit (EXIT_FAILURE);
-
-    status = send (cnct_skt, (char *) &Req_buff, sizeof (Req_buff), 0);
-    if (status == -1) FailInet ("\nsinqhm_ctrl -- send error");
-    if (status != sizeof (Req_buff)) {
-      printf ("sinqhm_ctrl -- wrong number of bytes sent: %d", status);
-      status = close (cnct_skt);
-      return EXIT_FAILURE;
-    }
-/*
-**		Wait for the status response.
-*/
-    status = getCheckStatusResponse (cnct_skt, &Rply_buff, sizeof (Rply_buff));
-    if (status == SUCCESS) {
-      printf (" done.\n");
-    }
-/*
-**		Close the connection.
-*/
-    status = close (cnct_skt);
-    if ((status != 0) && (errno != ECONNRESET))
-	    FailInet ("\nsinqhm_ctrl -- close error");
-    return EXIT_SUCCESS;
-/*============================================================================*/
-  go:
-/*==		Go. Get SinqHM-filler to start taking data.
-*/
-    printf (" Starting data acquisition ..."); fflush (NULL);
-
-    Req_buff.bigend	    = htonl (0x12345678);
-    Req_buff.cmnd	    = htonl (SQHM_DAQ);
-    Req_buff.u.daq.sub_cmnd = htonl (DAQ__GO);
-
-    cnct_skt = open_socket (Rmt_host, Rmt_port);
-    if (cnct_skt <= 0) exit (EXIT_FAILURE);
-
-    status = send (cnct_skt, (char *) &Req_buff, sizeof (Req_buff), 0);
-    if (status == -1) FailInet ("\nsinqhm_ctrl -- send error");
-    if (status != sizeof (Req_buff)) {
-      printf ("sinqhm_ctrl -- wrong number of bytes sent: %d", status);
-      status = close (cnct_skt);
-      return EXIT_FAILURE;
-    }
-/*
-**		Wait for the status response.
-*/
-    status = getCheckStatusResponse (cnct_skt, &Rply_buff, sizeof (Rply_buff));
-    if (status == SUCCESS) {
-      daq_state_now = ntohs (Rply_buff.u.daq.daq_now);
-      daq_state_was = ntohs (Rply_buff.u.daq.daq_was);
-      filler_mask   = ntohs (Rply_buff.u.daq.filler_mask);
-      server_mask   = ntohs (Rply_buff.u.daq.server_mask);
-      if (daq_state_now == 0) {
-	if (daq_state_was == 0) {
-	  printf (" done. It was already active!\n");
-	}else {
-	  printf (" done.\n");
-	}
-      }else {
-	printf ("\n\007 Data acquisition is still disabled.\n"
-	      "   Daq-state-now is 0x%04x\n"
-	      "   Filler-mask   is 0x%04x\n", daq_state_now, filler_mask);
-      }
-    }
-/*
-**		Close the connection.
-*/
-    status = close (cnct_skt);
-    if ((status != 0) && (errno != ECONNRESET))
-	    FailInet ("\nsinqhm_ctrl -- close error");
-    return EXIT_SUCCESS;
-/*============================================================================*/
-  rundown:
-/*=======		Rundown. Set up and send the rundown message.
-*/
-    printf (" Sending SQHM_EXIT command to SinqHM ..."); fflush (NULL);
-    Req_buff.bigend = htonl (0x12345678);
-    Req_buff.cmnd   = htonl (SQHM_EXIT);
-    
-    cnct_skt = open_socket (Rmt_host, Rmt_port);
-    if (cnct_skt <= 0) exit (EXIT_FAILURE);
-
-    status = send (cnct_skt, (char *) &Req_buff, sizeof (Req_buff), 0);
-    if (status == -1) FailInet ("\nsinqhm_ctrl -- send error");
-    if (status != sizeof (Req_buff)) {
-      printf ("sinqhm_ctrl -- wrong number of bytes sent: %d", status);
-      status = close (cnct_skt);
-      return EXIT_FAILURE;
-    }
-/*
-**		Wait for the status response.
-*/
-    status = getCheckStatusResponse (cnct_skt, &Rply_buff, sizeof (Rply_buff));
-    if (status == SUCCESS) {
-      printf (" done.\n");
-    }
-/*
-**		Close the connection.
-*/
-    status = close (cnct_skt);
-    if ((status != 0) && (errno != ECONNRESET))
-	    FailInet ("\nsinqhm_ctrl -- close error");
-    return EXIT_SUCCESS;
-/*============================================================================*/
-  status:
-/*======	    Show-status. Set up and send the status message.
-*/
-    printf (" Getting status of SinqHM ..."); fflush (NULL);
-
-    Req_buff.bigend = htonl (0x12345678);
-    Req_buff.cmnd   = htonl (SQHM_STATUS);
-    
-    cnct_skt = open_socket (Rmt_host, Rmt_port);
-    if (cnct_skt <= 0) exit (EXIT_FAILURE);
-
-    status = send (cnct_skt, (char *) &Req_buff, sizeof (Req_buff), 0);
-    if (status == -1) FailInet ("\nsinqhm_ctrl -- send error");
-    if (status != sizeof (Req_buff)) {
-      printf ("sinqhm_ctrl -- wrong number of bytes sent: %d", status);
-      status = close (cnct_skt);
-      return EXIT_FAILURE;
-    }
-/*
-**		Wait for the status response.
-*/
-    status = getCheckStatusResponse (cnct_skt, &Rply_buff, sizeof (Rply_buff));
-    if (status == SUCCESS) {
-			/*
-			**    Display the status obtained.
-			*/
-      memcpy (buff, (char *) &Rply_buff.sub_status, 4); /* Get SinqHM Ident */
-      buff[4] = '\0';
-      printf ("\n"
-	" SinqHM Identifier is \"%s\"\n", buff);
-      printf (" Maximum number of histograms = %d\n",
-	    ntohl (Rply_buff.u.status.max_n_hists));
-      printf (" Maximum number of bins per histogram = %d\n",
-	    ntohl (Rply_buff.u.status.max_num_bins));
-      printf (" Maximum number of active connections supported = %d\n",
-	    Rply_buff.u.status.max_srvrs);
-      printf (" Maximum space available for histograms = %d bytes\n",
-	    ntohl (Rply_buff.u.status.max_block));
-      print_uptime (stdout, " Up-time = ",
-		    ntohl (Rply_buff.u.status.up_time), "\n\n");
-      if (Rply_buff.u.status.cfg_state == 0) {
-	printf (" SINQHM has not yet been configured.\n");
-      }else {
-	mode = ntohl (Rply_buff.u.status.cfg_state);
-	print_HM_mode (mode);
-	printf ("\n");
-
-	nh	   = ntohs (Rply_buff.u.status.n_hists);
-	ch	   = ntohs (Rply_buff.u.status.curr_hist);
-	bph	   = ntohl (Rply_buff.u.status.num_bins);
-	bpb	   = Rply_buff.u.status.bytes_per_bin;
-	span	   = Rply_buff.u.status.compress;
-	tsi_status = ntohs (Rply_buff.u.status.tsi_status);
-	tsi_flags  = ntohs (Rply_buff.u.status.flags);
-	dt_or_dts  = ntohl (Rply_buff.u.status.dt_or_dts.both);
-	num_bad_ev = ntohl (Rply_buff.u.status.num_bad_events);
-
-	if (((mode & ~SQHM__SUB_MODE_MSK) == SQHM__HM_DIG) ||
-	    ((mode & ~SQHM__SUB_MODE_MSK) == SQHM__HRPT)) {
-	  if (nh != 0) {
-	    printf (" Number of histograms         = %d\n", nh);
-	    printf (" Current   histogram          = %d\n", ch);
-	  }
-	  printf (" Number of bins per histogram = %d\n", bph);
-	  printf (" Number of bytes per bin      = %d\n", bpb);
-	  if (span > 1) printf (" Bin compression factor       = %d\n", span);
-	  if (dt_or_dts != 0) 
-	    printf (" Dead-Time                    = %u\n", dt_or_dts);
-	}else if ((mode & ~SQHM__SUB_MODE_MSK) == SQHM__TOF) {
-	  nh = ntohs (Rply_buff.u.status.n_hists);
-	  printf (" Number of counters           = %d\n", nh);
-	  printf (" Number of bins per histogram = %d\n", bph);
-	  printf (" Number of bytes per bin      = %d\n", bpb);
-	  if (span > 1) printf (" Time span per bin            = %d\n", span);
-	  if (dt_or_dts != 0) 
-	    printf (" Delay-Time-to-Start          = %u\n", dt_or_dts);
-	}else if ((mode & ~SQHM__SUB_MODE_MSK) == SQHM__HM_PSD) {
-	}else if ((mode & ~SQHM__SUB_MODE_MSK) == SQHM__TRANS) {
-	  printf (" Number of buffers            = %d\n", nh);
-	  printf (" Current   buffer             = %d\n", ch);
-	  printf (" Number of bytes per buffer   = %d\n", bph);
-	}
-	printf (" Number of active connections = %d\n",
-	    Rply_buff.u.status.act_srvrs);
-	if (Rply_buff.u.status.daq_now == 0) {
-	  printf (" Data acquisition is active\n");
-	}else {
-	  printf (" Data acquisition is not active\n");
-	}
-	if ((tsi_status != 0) || (tsi_flags != 0)) {
-	  if (tsi_flags != 0) {
-	    printf (" TSI Flags = 0x%04x", tsi_flags);
-	    if ((tsi_flags & STATUS_FLAGS__PF)    != 0) printf ("/PF");
-	    if ((tsi_flags & STATUS_FLAGS__SWC)   != 0) printf ("/SWC");
-	    if ((tsi_flags & STATUS_FLAGS__NRL)   != 0) printf ("/NRL");
-	    if ((tsi_flags & STATUS_FLAGS__DAQ)   != 0) printf ("/DAQ");
-	    if ((tsi_flags & STATUS_FLAGS__SYNC3) != 0) printf ("/SYNC3");
-	    if ((tsi_flags & STATUS_FLAGS__SYNC2) != 0) printf ("/SYNC2");
-	    if ((tsi_flags & STATUS_FLAGS__SYNC1) != 0) printf ("/SYNC1");
-	    if ((tsi_flags & STATUS_FLAGS__SYNC0) != 0) printf ("/SYNC0");
-	    if ((tsi_flags & STATUS_FLAGS__UD)    != 0) printf ("/UD");
-	    if ((tsi_flags & STATUS_FLAGS__GU)    != 0) printf ("/GU");
-	  }
-	  printf ("\n");
-	}
-	if (num_bad_ev != 0)
-	  printf (" Number-of-Bad-Events = %u\n", num_bad_ev);
-      }
-    }
-/*
-**		Close the connection.
-*/
-    status = close (cnct_skt);
-    if ((status != 0) && (errno != ECONNRESET))
-	    FailInet ("\nsinqhm_ctrl -- close error");
-    return EXIT_SUCCESS;
-/*============================================================================*/
-  stop:
-/*====		Stop. Get SinqHM-filler to stop taking data.
-*/
-    printf (" Stopping data acquisition ..."); fflush (NULL);
-
-    Req_buff.bigend	    = htonl (0x12345678);
-    Req_buff.cmnd	    = htonl (SQHM_DAQ);
-    Req_buff.u.daq.sub_cmnd = htonl (DAQ__STOP);
-
-    cnct_skt = open_socket (Rmt_host, Rmt_port);
-    if (cnct_skt <= 0) exit (EXIT_FAILURE);
-
-    status = send (cnct_skt, (char *) &Req_buff, sizeof (Req_buff), 0);
-    if (status == -1) FailInet ("\nsinqhm_ctrl -- send error");
-    if (status != sizeof (Req_buff)) {
-      printf ("sinqhm_ctrl -- wrong number of bytes sent: %d", status);
-      status = close (cnct_skt);
-      return EXIT_FAILURE;
-    }
-/*
-**		Wait for the status response.
-*/
-    status = getCheckStatusResponse (cnct_skt, &Rply_buff, sizeof (Rply_buff));
-    if (status == SUCCESS) {
-      daq_state_now = ntohs (Rply_buff.u.daq.daq_now);
-      daq_state_was = ntohs (Rply_buff.u.daq.daq_was);
-      filler_mask   = ntohs (Rply_buff.u.daq.filler_mask);
-      server_mask   = ntohs (Rply_buff.u.daq.server_mask);
-      if (daq_state_now != 0) {
-	if (daq_state_was == 0) {
-	  printf (" done.\n");
-	}else {
-	  printf (" done. It was already stopped!\n");
-	}
-      }else {
-	printf ("\n\007 Data acquisition is still enabled!\n"
-	      "   Daq-state-now is 0x%04x\n"
-	      "   Filler-mask   is 0x%04x\n", daq_state_now, filler_mask);
-      }
-    }
-/*
-**		Close the connection.
-*/
-    status = close (cnct_skt);
-    if ((status != 0) && (errno != ECONNRESET))
-	    FailInet ("\nsinqhm_ctrl -- close error");
-    return EXIT_SUCCESS;
-/*============================================================================*/
-  zero:
-/*====		Zero. Zero the complete histogram buffer
-*/
-    Req_buff.bigend = htonl (0x12345678);
-    Req_buff.cmnd   = htonl (SQHM_ZERO);
-    Req_buff.u.zero.hist_no   = htonl (-1);
-    Req_buff.u.zero.first_bin = htonl (-1);
-    Req_buff.u.zero.n_bins    = htonl (-1);
-    printf (" Zeroing the histogram memory buffer ..."); fflush (NULL);
-
-    cnct_skt = open_socket (Rmt_host, Rmt_port);
-    if (cnct_skt <= 0) exit (EXIT_FAILURE);
-
-    status = send (cnct_skt, (char *) &Req_buff, sizeof (Req_buff), 0);
-    if (status == -1) FailInet ("\nsinqhm_ctrl -- send error");
-    if (status != sizeof (Req_buff)) {
-      printf ("\nsinqhm_ctrl -- wrong number of bytes sent: %d", status);
-      status = close (cnct_skt);
-      return EXIT_FAILURE;
-    }
-/*
-**		Wait for the status response.
-*/
-    status = getCheckStatusResponse (cnct_skt, &Rply_buff, sizeof (Rply_buff));
-    if (status == SUCCESS) {
-      printf (" done.\n");
-    }
-/*
-**		Close the connection.
-*/
-    status = close (cnct_skt);
-    if ((status != 0) && (errno != ECONNRESET))
-	    FailInet ("\nsinqhm_ctrl -- close error");
-    return EXIT_SUCCESS;
-  }
-/*================================================ End of SINQHM_CTRL.C =====*/
diff --git a/sinqhm/usrConfig.c b/sinqhm/usrConfig.c
deleted file mode 100755
index 95292884..00000000
--- a/sinqhm/usrConfig.c
+++ /dev/null
@@ -1,944 +0,0 @@
-/* usrConfig.c - user-defined system configuration library */
-
-/* Copyright 1984-1998 Wind River Systems, Inc. */
-#include "copyright_wrs.h"
-
-    /*
-    **  This file should be copied to the VxWorks directory tree, e.g:
-    **    pss123> set src = "lnsa09:tas_src:[sinqhm]"
-    **    pss123> if ("$USER" != "maden") set src = "lnsg@$src"
-    **    pss123> rcp -p "${src}usrConfig.c" \
-    **                $WIND_BASE/target/config/all/usrConfig.c
-    **    pss123> rcp -p "${src}bld." $HOME/wind/SinqHM/bld
-    **
-    **  The system images are:
-    **
-    **       $HOME/wind/SinqHM/vxWorks_basic
-    **       $HOME/wind/SinqHM/<instr>/vxWorks_auto
-    **
-    ** Using the Tornado tools:
-    ** =======================
-    **  To build the system image WITHOUT the SinqHM modules:
-    **      a) Start WindCFG with no target selected.
-    **      b) Select the "mv1603" BSP.
-    **      c) Select configuration "SinqHM"
-    **      d) Start up the editor and ensure that "SINQHM_SPAWN"
-    **          is either not defined or is defined to be 0.
-    **      e) Select the Build option.
-    **      f) Copy file vxWorks to $HOME/wind/SinqHM/vxWorks_basic.
-    **
-    **  To build the system image WITH the SinqHM modules:
-    **      a) Start WindCFG with no target selected.
-    **      b) Select the "mv1603" BSP.
-    **      c) Select configuration "SinqHM_spawn_<instr>".
-    **      d) Start up the editor and ensure that "SINQHM_SPAWN"
-    **          is defined to be non-zero, e.g:
-    **              #define  SINQHM_SPAWN  1
-    **      e) Select the Build option.
-    **      f) Copy file $HOME/wind/ppc/target/config/mv1603/vxWorks 
-    **                to $HOME/wind/SinqHM/<instr>/vxWorks_auto.
-    **
-    ** Using the bld script:
-    ** ====================
-    **  To build system images using the bld script:
-    **
-    **    a) without the SinqHM modules:
-    **                     pss123> $HOME/wind/SinqHM/bld basic
-    **    b) with    the SinqHM modules:
-    **                     pss123> $HOME/wind/SinqHM/bld <instr> all
-    **
-    **  Warnings:
-    **    The bld script will only work if SINQHM_SPAWN is NOT
-    **    defined in $HOME/wind/1.0.1-SENS/ppc/target/config/mv1603/config.h
-    **
-    **    When using the bld script, be sure that the file
-    **    $HOME/wind/1.0.1-SENS/ppc/target/config/mv1603/configdb.h
-    **    is set to select the correct VxWorks options. It is
-    **    easiest to use the Tornado WindCFG tool to do this.
-    */
-/*
-modification history
---------------------
-V01F 29-Feb-2000 DM.	Update for Tornado /1.0.1-SENS/ + updates to
-			    the above comments.
-V01B  4-Aug-1997 DM.	Just spawn SinqHM_bootParamsConfig. This then spawns
-			    anything else which is specified in the boot line.
-V01A  3-Jun-1997 DM.	Include spawning of SinqHM modules.
-
-18u,22sep98,cth  merged in tffs, http, java changes for wv2.0 fcs
-18r,22apr98,hdn  added comment for tffsDrv().
-18t,17apr98,nps  added support for rBuffShow.
-18s,09mar98,sjw  merge in HTTP and JAVA changes for conflict resolution
-18q,19jan98,hdn  changed a condition macro to include tffsDrv().
-18r,18dec97,cth  replaced windview, timestamp initialization with windviewConfig
-18q,13nov97,cth  changed WV evtInstInit to wvLibInit2; removed connRtnSet, 
-		 evtTaskInit; added include wvLib.h, rBuffLib.h
-18p,23sep97,yp   added support for TFFS.
-18p,18aug97,nps  changed WV buffer initialization with the rBuff API.
-18o,26feb97,dat  added INCLUDE_USER_APPL and USER_APPL_INIT, spr 8071.
-18n,13dec96,elp	 changed syncLibInit() into symSyncLibInit().
-18m,18nov96,dds  SPR 2529: return status for sysScsiInit is now checked.
-18l,06nov96,ms   removed 17n hack to usrClock.
-18k,01nov96,hdn  added support for PCMCIA.
-18j,21oct96,hdn  changed paramerters for new LPT driver.
-18i,04oct96,elp  added INCLUDE_SYM_TBL_SYNC (SPR# 6775).
-18h,11jul96,tam  changed copyright year from 1995 to 1996.
-18l,19jul96,hdn  added support for ATA driver.
-18k,25jun96,jmb  Eliminated alternative WDB macro names (SPR #5707).
-18j,25jun96,dbt  Initialized _func_selWakeupListInit before tyLib (SPR #3314).
-18i,21jun96,jmb  update copyright. SPR #6364
-18h,21jun96,jmb  long modhist -- deleted entries prior to 1994.  SPR #6528
-18g,12mar96,tam  removed all #if (CPU == PPC403).
-18p,06jun96,ism  bumped copyright to 1996.
-18o,26jan96,ism  cleaned up vxsim/solaris version
-18f,02oct95,kvk  added sysHwInit2() for PPC603.
-18e,27sep95,tpr  removed #if (CPU_FAMILY != PPC) staff.
-18n,07nov95,srh  fixed C++ support comments.
-18m,29oct95,dat  fixed warnings about printf arguments
-18l,11oct95,jdi  doc: changed .pG to .tG.
-18k,10oct95,dat	 new BSP revision id. Added WDB Banner printing
-18j,15jun95,ms	 updated for new serial drivers.
-18i,09jun95,ms	 cleaned up console initialization
-18h,30may95,p_m  added initialization of formatted I/O library.
-		 replaced spyStop() by spyLibInit().
-18g,22may95,p_m  no longer initialize object format specific libraries if
-		 loader is not included.
-18f,22may95,myz  modified new serial device initialization for x86 support
-18e,22may95,ms   added some WDB agent support
-18e,30oct95,ism  updated for SIMSPARCSOLARIS
-18d,28mar95,kkk  added scalability support, changed edata and end to arrays
-		 (SPR #3917), changed baud rate to be a macro in configAll.h
-18g,25may95,yao  changed to bzero bss segment for PPC.
-18f,04apr95,caf  added PPC cache support.
-18e,03mar95,yao  added shsHwInit2 () for PPC403.
-18d,24feb95,caf  added PPC support.
-18c,20nov94,kdl  added hashLibInit() when using dosFs.
-18b,09nov94,jds  additions for scsi backward compatability ; scsi[12]IfInit()
-18a,04nov94,kdl	 merge cleanup.
-17l,02aug94,tpr  added cacheEnable (BRANCH_CACHE) for the MC68060.
-17m,15oct94,hdn  added LPT driver.
-17o,20jul94,ms   changed INCLUDE_AOUT_HPPA to INCLUDE_SOM_COFF
-17n,02may94,ms   added VxSim HP hack to usrClock().
-17q,15mar94,smb  renamed tEvtTask parameters.
-17p,15feb94,smb  defined WV_MODE, EVTBUFFER_ADDRESS for wvInstInit().
-17o,12jan94,kdl  modified posix initialization; added queued signal init.
-*/
-
-/*
-DESCRIPTION
-This library is the WRS-supplied configuration module for VxWorks.  It
-contains the root task, the primary system initialization routine, the
-network initialization routine, and the clock interrupt routine.
-
-The include file config.h includes a number of system-dependent parameters used
-in this file.
-
-In an effort to simplify the presentation of the configuration of vxWorks,
-this file has been split into smaller files.  These additional configuration
-source files are located in ../../src/config/usr[xxx].c and are #included into
-this file below.  This file contains the bulk of the code a customer is
-likely to customize.
-
-The module usrDepend.c contains checks that guard against unsupported
-configurations suchas INCLUDE_NFS without INCLUDE_RPC.  The module
-usrKernel.c contains the core initialization of the kernel which is rarely
-customized, but provided for information.  The module usrNetwork.c now
-contains all network initialization code.  Finally, the module usrExtra.c
-contains the conditional inclusion of the optional packages selected in
-configAll.h.
-
-The source code necessary for the configuration selected is entirely
-included in this file during compilation as part of a standard build in
-the board support package.  No other make is necessary.
-
-INCLUDE FILES:
-config.h
-
-SEE ALSO:
-.tG "Getting Started, Cross-Development"
-*/
-
-#include "vxWorks.h"			/* always first */
-#include "config.h"			/* board support configuration header */
-#include "usrConfig.h"			/* general configuration header */
-#include "usrDepend.c"			/* include dependency rules */
-#include "usrKernel.c"			/* kernel configuration */
-#include "usrExtra.c"			/* conditionally included packages */
-
-#ifdef INCLUDE_HTTP
-#include "http/httpLib.h"		/* Wind Web Server interfaces */
-#endif
-
-/* global variables */
-
-int		consoleFd;		/* fd of initial console device */
-char		consoleName[20];	/* console device name, eg. "/tyCo/0" */
-SYMTAB_ID	statSymTbl;		/* system error status symbol table id*/
-SYMTAB_ID	standAloneSymTbl;	/* STANDALONE version symbol table id */
-SYMTAB_ID	sysSymTbl;		/* system symbol table id */
-BOOT_PARAMS	sysBootParams;		/* parameters from boot line */
-int		sysStartType;		/* type of boot (WARM, COLD, etc) */
-
-/*******************************************************************************
-*
-* usrInit - user-defined system initialization routine
-*
-* This is the first C code executed after the system boots.  This routine is
-* called by the assembly language start-up routine sysInit() which is in the
-* sysALib module of the target-specific directory.  It is called with
-* interrupts locked out.  The kernel is not multitasking at this point.
-*
-* This routine starts by clearing BSS; thus all variables are initialized to 0,
-* as per the C specification.  It then initializes the hardware by calling
-* sysHwInit(), sets up the interrupt/exception vectors, and starts kernel
-* multitasking with usrRoot() as the root task.
-*
-* RETURNS: N/A
-*
-* SEE ALSO: kernelLib
-*
-* ARGSUSED0
-*/
-
-void usrInit 
-    (
-    int startType
-    )
-    {
-#if	(CPU_FAMILY == SPARC)
-    excWindowInit ();				/* SPARC window management */
-#endif
-
-    /* configure data and instruction cache if available and leave disabled */
-
-#ifdef  INCLUDE_CACHE_SUPPORT
-    cacheLibInit (USER_I_CACHE_MODE, USER_D_CACHE_MODE);
-#endif  /* INCLUDE_CACHE_SUPPORT */
-
-#if	CPU_FAMILY!=SIMSPARCSUNOS && CPU_FAMILY!=SIMHPPA && CPU_FAMILY!=SIMSPARCSOLARIS
-    /* don't assume bss variables are zero before this call */
-
-    bzero (edata, end - edata);		/* zero out bss variables */
-#endif	/* CPU_FAMILY!=SIMSPARCSUNOS && CPU_FAMILY!=SIMHPPA && CPU_FAMILY!=SIMSPARCSOLARIS */
-
-    sysStartType = startType;			/* save type of system start */
-
-    intVecBaseSet ((FUNCPTR *) VEC_BASE_ADRS);	/* set vector base table */
-
-#if (CPU_FAMILY == AM29XXX)
-    excSpillFillInit ();			/* am29k stack cache managemt */
-#endif
-
-#ifdef  INCLUDE_EXC_HANDLING
-    excVecInit ();				/* install exception vectors */
-    excShowInit ();				/* install sysExcMsg handlers */
-#endif  /* INCLUDE_EXC_HANDLING */
-
-    sysHwInit ();				/* initialize system hardware */
-
-    usrKernelInit ();				/* configure the Wind kernel */
-
-#ifdef  INCLUDE_CACHE_SUPPORT
-#ifdef 	USER_I_CACHE_ENABLE
-    cacheEnable (INSTRUCTION_CACHE);		/* enable instruction cache */
-#endif	/* USER_I_CACHE_ENABLE */
-
-#ifdef	USER_D_CACHE_ENABLE
-    cacheEnable (DATA_CACHE);			/* enable data cache */
-#endif 	/* USER_D_CACHE_ENABLE */
-
-#if (CPU == MC68060)
-#ifdef 	USER_B_CACHE_ENABLE
-    cacheEnable (BRANCH_CACHE);			/* enable branch cache */
-#endif	/* USER_B_CACHE_ENABLE */
-#endif	/* (CPU == MC68060) */
-#endif  /* INCLUDE_CACHE_SUPPORT */
-
-    /* start the kernel specifying usrRoot as the root task */
-    kernelInit ((FUNCPTR) usrRoot, ROOT_STACK_SIZE,
-#ifdef  INCLUDE_WDB
-                (char *) FREE_RAM_ADRS + WDB_POOL_SIZE,
-#else
-                (char *) FREE_RAM_ADRS,
-#endif
-		sysMemTop (), ISR_STACK_SIZE, INT_LOCK_LEVEL);
-    }
-
-/*******************************************************************************
-*
-* usrRoot - the root task
-*
-* This is the first task to run under the multitasking kernel.  It performs
-* all final initialization and then starts other tasks.
-*
-* It initializes the I/O system, installs drivers, creates devices, and sets
-* up the network, etc., as necessary for a particular configuration.  It
-* may also create and load the system symbol table, if one is to be included.
-* It may then load and spawn additional tasks as needed.  In the default
-* configuration, it simply initializes the VxWorks shell.
-*
-* RETURNS: N/A
-*/
-
-void usrRoot
-    (
-    char *	pMemPoolStart,		/* start of system memory partition */
-    unsigned	memPoolSize		/* initial size of mem pool */
-    )
-    {
-    char tyName [20];
-    int  ix;
-
-#if (SINQHM_SPAWN != 0)
-	/*-----------------------------------------------------------------
-	** Define local variables and templates for SinqHM modules
-	*/
-
-    void SinqHM_bootParamsConfig (void);
-
-	/*-----------------------------------------------------------------*/
-#endif	    /* (SINQHM_SPAWN != 0) */
-
-    /* Initialize the memory pool before initializing any other package.
-     * The memory associated with the root task will be reclaimed at the
-     * completion of its activities.
-     */
-
-#ifdef INCLUDE_MEM_MGR_FULL
-    memInit (pMemPoolStart, memPoolSize);	/* initialize memory pool */
-#else
-    memPartLibInit (pMemPoolStart, memPoolSize);/* initialize memory pool */
-#endif /* INCLUDE_MEM_MGR_FULL */
-
-#ifdef	INCLUDE_SHOW_ROUTINES 
-    memShowInit ();				/* initialize memShow routine */
-#endif	/* INCLUDE_SHOW_ROUTINES */
-
-#if	defined(INCLUDE_MMU_BASIC) || defined(INCLUDE_MMU_FULL)
-    usrMmuInit ();				/* initialize the mmu */
-#endif	/* defined(INCLUDE_MMU_BASIC) || defined(INCLUDE_MMU_FULL) */
-
-    /* set up system timer */
-
-    sysClkConnect ((FUNCPTR) usrClock, 0);	/* connect clock ISR */
-    sysClkRateSet (60);				/* set system clock rate */
-    sysClkEnable ();				/* start it */
-
-    /* 
-     * select sould be initialized after NFS and RPC for proper delete
-     * hook order but _func_selWakeupListInit should be set 
-     * before tyLib module (SPR #3314).
-     */
-
-#ifdef  INCLUDE_SELECT
-    _func_selWakeupListInit     = (FUNCPTR) selWakeupListInit;
-#endif	/* INCLUDE_SELECT */
-
-    /* initialize I/O system */
-
-#ifdef  INCLUDE_IO_SYSTEM
-    iosInit (NUM_DRIVERS, NUM_FILES, "/null");
-
-    consoleFd = NONE;                           /* assume no console device */
-
-#ifdef  INCLUDE_TYCODRV_5_2
-#ifdef  INCLUDE_TTY_DEV
-    if (NUM_TTY > 0)
-	{
-	tyCoDrv ();				/* install console driver */
-
-	for (ix = 0; ix < NUM_TTY; ix++)	/* create serial devices */
-	    {
-	    sprintf (tyName, "%s%d", "/tyCo/", ix);
-
-	    (void) tyCoDevCreate (tyName, ix, 512, 512);
-
-	    if (ix == CONSOLE_TTY)
-		strcpy (consoleName, tyName);	/* store console name */
-	    }
-
-	consoleFd = open (consoleName, O_RDWR, 0);
-
-	/* set baud rate */
-
-	(void) ioctl (consoleFd, FIOBAUDRATE, CONSOLE_BAUD_RATE);
-	(void) ioctl (consoleFd, FIOSETOPTIONS, OPT_TERMINAL);
-	}
-#endif	/* INCLUDE_TTY_DEV */
-
-#else   /* !INCLUDE_TYCODRV_5_2 */
-#ifdef  INCLUDE_TTY_DEV
-    if (NUM_TTY > 0)
-	{
-	ttyDrv();				/* install console driver */
-
-	for (ix = 0; ix < NUM_TTY; ix++)	/* create serial devices */
-	    {
-#if     (defined(INCLUDE_WDB) && (WDB_COMM_TYPE == WDB_COMM_SERIAL))
-	    if (ix == WDB_TTY_CHANNEL)		/* don't use WDBs channel */
-		continue;
-#endif
-	    sprintf (tyName, "%s%d", "/tyCo/", ix);
-	    (void) ttyDevCreate (tyName, sysSerialChanGet(ix), 512, 512);
-
-	    if (ix == CONSOLE_TTY)		/* init the tty console */
-		{
-		strcpy (consoleName, tyName);
-		consoleFd = open (consoleName, O_RDWR, 0);
-		(void) ioctl (consoleFd, FIOBAUDRATE, CONSOLE_BAUD_RATE);
-		(void) ioctl (consoleFd, FIOSETOPTIONS, OPT_TERMINAL);
-		}
-	    }
-	}
-#endif  /* INCLUDE_TTY_DEV */
-
-#ifdef INCLUDE_PC_CONSOLE
-    pcConDrv ();
-    for (ix = 0; ix < N_VIRTUAL_CONSOLES; ix++)
-	{
-	sprintf (tyName, "%s%d", "/pcConsole/", ix);
-	(void) pcConDevCreate (tyName,ix, 512, 512);
-	if (ix == PC_CONSOLE)		/* init the console device */
-	    {
-	    strcpy (consoleName, tyName);
-	    consoleFd = open (consoleName, O_RDWR, 0);
-	    (void) ioctl (consoleFd, FIOBAUDRATE, CONSOLE_BAUD_RATE);
-	    (void) ioctl (consoleFd, FIOSETOPTIONS, OPT_TERMINAL);
-	    }
-	}
-#endif	/* INCLUDE_PC_CONSOLE */
-
-#endif  /* !INCLUDE_TYCODRV_5_2 */
-
-    ioGlobalStdSet (STD_IN,  consoleFd);
-    ioGlobalStdSet (STD_OUT, consoleFd);
-    ioGlobalStdSet (STD_ERR, consoleFd);
-#endif  /* INCLUDE_IO_SYSTEM */
-
-    /* initialize symbol table facilities */
-
-#ifdef	INCLUDE_SYM_TBL
-    hashLibInit ();			/* initialize hash table package */
-    symLibInit ();			/* initialize symbol table package */
-#ifdef 	INCLUDE_SHOW_ROUTINES 
-    symShowInit ();			/* initialize symbol table show */
-#endif	/* INCLUDE_SHOW_ROUTINES */
-#endif	/* INCLUDE_SYM_TBL */
-
-
-    /* initialize exception handling */
-
-#if     defined(INCLUDE_EXC_HANDLING) && defined(INCLUDE_EXC_TASK)
-    excInit ();				/* initialize exception handling */
-#endif  /* defined(INCLUDE_EXC_HANDLING) && defined(INCLUDE_EXC_TASK) */
-
-#ifdef	INCLUDE_LOGGING
-    logInit (consoleFd, MAX_LOG_MSGS);	/* initialize logging */
-#endif	/* INCLUDE_LOGGING */
-
-#ifdef	INCLUDE_SIGNALS
-    sigInit ();				/* initialize signals */
-#endif	/* INCLUDE_SIGNALS */
-
-    /* initialize debugging */
-
-#ifdef	INCLUDE_DEBUG
-    dbgInit ();				/* initialize debugging */
-#endif	/* INCLUDE_DEBUG */
-
-
-    /* initialize pipe driver */
-
-#ifdef	INCLUDE_PIPES
-    pipeDrv ();				/* install pipe driver */
-#endif	/* INCLUDE_PIPES */
-
-
-    /* initialize standard I/O package */
-
-#ifdef	INCLUDE_STDIO
-    stdioInit ();			/* initialize standard I/O library */
-#ifdef  INCLUDE_SHOW_ROUTINES
-    stdioShowInit ();
-#endif  /* INCLUDE_SHOW_ROUTINES */
-#endif	/* INCLUDE_STDIO */
-
-    /* initialize POSIX queued signals */
-
-#if defined(INCLUDE_POSIX_SIGNALS) && defined(INCLUDE_SIGNALS)
-    sigqueueInit (NUM_SIGNAL_QUEUES); /* initialize queued signals */
-#endif
-
-    /* initialize POSIX semaphores */
-
-#ifdef  INCLUDE_POSIX_SEM
-    semPxLibInit ();			
-#ifdef INCLUDE_SHOW_ROUTINES
-    semPxShowInit ();
-#endif  /* INCLUDE_SHOW_POUTINES */
-#endif  /* INCLUDE_POSIX_SEM */
-
-    /* initialize POSIX message queues */
-
-#ifdef INCLUDE_POSIX_MQ
-    mqPxLibInit (MQ_HASH_SIZE);		
-#ifdef INCLUDE_SHOW_ROUTINES
-    mqPxShowInit ();
-#endif  /* INCLUDE_SHOW_ROUTINES */
-#endif  /* INCLUDE_POSIX_MQ */
-
-    /* initialize POSIX async I/O support */
-
-#ifdef INCLUDE_POSIX_AIO
-    aioPxLibInit (MAX_LIO_CALLS);
-#ifdef INCLUDE_POSIX_AIO_SYSDRV
-    aioSysInit (MAX_AIO_SYS_TASKS, AIO_TASK_PRIORITY, AIO_TASK_STACK_SIZE);
-#endif  /* INCLUDE_POSIX_AIO_SYSDRV */
-#endif  /* INCLUDE_POSIX_AIO */
-
-    /* initialize filesystems and disk drivers */
-
-#ifdef	INCLUDE_DOSFS
-    hashLibInit ();			/* initialize hash table package */
-    dosFsInit (NUM_DOSFS_FILES); 	/* init dosFs filesystem */
-#endif	/* INCLUDE_DOSFS */
-
-#ifdef	INCLUDE_RAWFS
-    rawFsInit (NUM_RAWFS_FILES); 	/* init rawFs filesystem */
-#endif	/* INCLUDE_RAWFS */
-
-#ifdef	INCLUDE_RT11FS
-    rt11FsInit (NUM_RT11FS_FILES); 	/* init rt11Fs filesystem */
-#endif	/* INCLUDE_RT11FS */
-
-#ifdef	INCLUDE_RAMDRV
-    ramDrv ();				/* initialize ram disk driver */
-#endif	/* INCLUDE_RAMDRV */
-
-#ifdef	INCLUDE_SCSI
-
-    /*
-     * initialize either the SCSI1 or SCSI2 interface; initialize SCSI2 when 
-     * the SCSI2 interface is available.
-     */
-
-#ifndef INCLUDE_SCSI2
-    scsi1IfInit ();
-#else
-    scsi2IfInit ();
-#endif
-
-    /* initialize SCSI controller */
-    if (sysScsiInit () == OK)
-	{
-	usrScsiConfig ();			/* configure SCSI peripherals */
-        }
-    else
-        {
-        printf ("sysScsiInit() Failed, SCSI system not initialized\n");
-        }
-
-#endif	/* INCLUDE_SCSI */
-
-#ifdef  INCLUDE_FD
-    fdDrv (FD_INT_VEC, FD_INT_LVL);     /* initialize floppy disk driver */
-#endif  /* INCLUDE_FD */
-
-#ifdef  INCLUDE_IDE
-    ideDrv (IDE_INT_VEC, IDE_INT_LVL, IDE_CONFIG); /* init IDE disk driver */
-#endif  /* INCLUDE_IDE */
-
-#ifdef  INCLUDE_ATA
-    {                                   /* initialize hard disk driver */
-    IMPORT ATA_RESOURCE ataResources[];
-    ATA_RESOURCE *pAtaResource;
-
-    for (ix = 0; ix < ATA_MAX_CTRLS; ix++)
-        {
-        pAtaResource = &ataResources[ix];
-        if (pAtaResource->ctrlType == IDE_LOCAL)
-            ataDrv (ix, pAtaResource->drives, pAtaResource->intVector,
-                    pAtaResource->intLevel, pAtaResource->configType,
-                    pAtaResource->semTimeout, pAtaResource->wdgTimeout);
-        }
-    }
-#ifdef  INCLUDE_SHOW_ROUTINES
-    ataShowInit ();                     /* install ATA/IDE show routine */
-#endif  /* INCLUDE_SHOW_ROUTINES */
-#endif  /* INCLUDE_ATA */
-
-#ifdef  INCLUDE_LPT
-    {
-    IMPORT LPT_RESOURCE lptResources[];
-    lptDrv (LPT_CHANNELS, &lptResources[0]); /* init LPT parallel driver */
-    }
-#endif  /* INCLUDE_LPT */
-
-#ifdef  INCLUDE_PCMCIA
-#ifdef  INCLUDE_SHOW_ROUTINES
-    pcmciaShowInit ();			/* install PCMCIA show routines */
-#endif  /* INCLUDE_SHOW_ROUTINES */
-    pcmciaInit ();			/* init PCMCIA Lib */
-#endif  /* INCLUDE_PCMCIA */
-
-#ifdef	INCLUDE_TFFS
-    tffsDrv ();				/* it should be after pcmciaInit() */
-#endif	/* INCLUDE_TFFS */
-
-#ifdef  INCLUDE_FORMATTED_IO
-    fioLibInit ();			/* initialize formatted I/O */
-#endif  /* INCLUDE_FORMATTED_IO */
-
-    /* initialize floating point facilities */
-
-#ifdef	INCLUDE_FLOATING_POINT
-    floatInit ();			/* initialize floating point I/O */
-#endif	/* INCLUDE_FLOATING_POINT */
-
-    /* install software floating point emulation (if applicable) */
-
-#ifdef	INCLUDE_SW_FP
-    mathSoftInit ();			/* use software emulation for fp math */
-#endif	/* INCLUDE_SW_FP */
-
-    /* install hardware floating point support (if applicable) */
-
-#ifdef	INCLUDE_HW_FP
-    mathHardInit (); 			/* do fppInit() & install hw fp math */
-
-#ifdef	INCLUDE_SHOW_ROUTINES 
-    fppShowInit ();			/* install hardware fp show routine */
-#endif	/* INCLUDE_SHOW_ROUTINES */
-#endif	/* INCLUDE_HW_FP */
-
-    /* initialize performance monitoring tools */
-
-#ifdef	INCLUDE_SPY
-    spyLibInit ();			/* install task cpu utilization tool */
-#endif	/* INCLUDE_SPY */
-
-#ifdef	INCLUDE_TIMEX
-    timexInit ();			/* install function timing tool */
-#endif	/* INCLUDE_TIMEX */
-
-#ifdef  INCLUDE_ENV_VARS
-    envLibInit (ENV_VAR_USE_HOOKS);	/* initialize environment variable */
-#endif	/* INCLUDE_ENV_VARS */
-
-
-    /* initialize object module loader */
-
-#ifdef	INCLUDE_LOADER
-    moduleLibInit ();			/* initialize module manager */
-
-#if	defined(INCLUDE_AOUT)
-    loadAoutInit ();				/* use a.out format */
-#else	/* coff or ecoff */
-#if	defined(INCLUDE_ECOFF)
-    loadEcoffInit ();				/* use ecoff format */
-#else	/* ecoff */
-#if	defined(INCLUDE_COFF)
-    loadCoffInit ();				/* use coff format */
-#else   /* coff */
-#if	defined(INCLUDE_ELF)
-    loadElfInit ();				/* use elf format */
-#else
-#if	defined(INCLUDE_SOM_COFF)
-    loadSomCoffInit ();
-#endif
-#endif
-#endif
-#endif
-#endif
-
-#endif	/* INCLUDE_LOADER */
-
-    /* initialize wtx client to synchronize host and target symbol tables */
-#ifdef	INCLUDE_SYM_TBL_SYNC
-    symSyncLibInit ();
-#endif /* INCLUDE_SYM_TBL_SYNC */
-
-    /* initialize network */
-
-#ifdef  INCLUDE_NET_INIT
-    usrBootLineInit (sysStartType);	/* crack the bootline */
-    usrNetInit (BOOT_LINE_ADRS);	/* initialize network support */
-#endif	/* INCLUDE_NET_INIT */
-
-#ifdef	INCLUDE_PASSFS
-    {
-    extern STATUS passFsInit ();
-    extern void *passFsDevInit ();
-    char passName [256];
-
-    if (passFsInit (1) == OK)
-	{
-	extern char vxsim_hostname[];
-	extern char vxsim_cwd[];
-
-	sprintf (passName, "%s:", vxsim_hostname);
-	if (passFsDevInit (passName) == NULL)
-	    {
-	    printf ("passFsDevInit failed for <%s>\n", passName);
-	    }
-	else
-	    {
-	    sprintf (passName, "%s:%s", vxsim_hostname, vxsim_cwd);
-	    ioDefPathSet (passName);
-	    }
-	}
-    else
-	printf ("passFsInit failed\n");
-    }
-#endif	/* INCLUDE_PASSFS */
-
-#ifdef	INCLUDE_DOS_DISK
-    {
-    char unixName [80];
-    extern void unixDrv ();
-    extern void unixDiskInit ();
-    extern char *u_progname;  /* home of executable */
-    char *pLastSlash;
-
-    unixDrv ();
-
-    pLastSlash = strrchr (u_progname, '/');
-    pLastSlash = (pLastSlash == NULL) ? u_progname : (pLastSlash + 1);
-    sprintf (unixName, "/tmp/%s%d.dos", pLastSlash, sysProcNumGet());
-    unixDiskInit (unixName, "A:", 0);
-    }
-#endif	/* INCLUDE_DOS_DISK */
-
-    /* initialize shared memory objects */
-
-#ifdef INCLUDE_SM_OBJ			/* unbundled shared memory objects */
-    usrSmObjInit (BOOT_LINE_ADRS);
-#endif /* INCLUDE_SM_OBJ */
-
-    /* write protect text segment & vector table only after bpattach () */
-
-#ifdef	INCLUDE_MMU_FULL		/* unbundled mmu product */
-#ifdef	INCLUDE_PROTECT_TEXT
-    if (vmTextProtect () != OK)
-	printf ("\nError protecting text segment. errno = %x\n", errno);
-#endif	/* INCLUDE_PROTECT_TEXT */
-
-#ifdef	INCLUDE_PROTECT_VEC_TABLE
-    if (intVecTableWriteProtect () != OK)
-	printf ("\nError protecting vector table. errno = %x\n", errno);
-#endif	/* INCLUDE_PROTECT_VEC_TABLE */
-#endif	/* INCLUDE_MMU_FULL */
-
-    /* initialize select only after NFS and RPC for proper delete hook order */
-
-#ifdef	INCLUDE_SELECT
-    selectInit ();
-#endif	/* INCLUDE_SELECT */
-
-    /* create system and status symbol tables */
-
-#ifdef  INCLUDE_STANDALONE_SYM_TBL
-    sysSymTbl = symTblCreate (SYM_TBL_HASH_SIZE_LOG2, TRUE, memSysPartId);
-
-    printf ("\nAdding %ld symbols for standalone.\n", standTblSize);
-
-    for (ix = 0; ix < standTblSize; ix++)	/* fill in from built in table*/
-	symTblAdd (sysSymTbl, &(standTbl[ix]));
-#endif	/* INCLUDE_STANDALONE_SYM_TBL */
-
-#ifdef  INCLUDE_NET_SYM_TBL
-    sysSymTbl = symTblCreate (SYM_TBL_HASH_SIZE_LOG2, TRUE, memSysPartId);
-
-    netLoadSymTbl ();				/* fill in table from host */
-#endif	/* INCLUDE_NET_SYM_TBL */
-
-#ifdef  INCLUDE_STAT_SYM_TBL
-    statSymTbl = symTblCreate (STAT_TBL_HASH_SIZE_LOG2, FALSE, memSysPartId);
-
-    for (ix = 0; ix < statTblSize; ix ++)	/* fill in from built in table*/
-	symTblAdd (statSymTbl, &(statTbl [ix]));
-#endif	/* INCLUDE_STAT_SYM_TBL */
-
-
-    /* initialize C++ support library */
-
-#if	defined (INCLUDE_CPLUS) && defined (INCLUDE_CPLUS_MIN)
-#error	Define only one of INCLUDE_CPLUS or INCLUDE_CPLUS_MIN, not both
-#endif
-
-#ifdef	INCLUDE_CPLUS			/* all standard C++ runtime support */
-    cplusLibInit ();
-#endif
-
-#ifdef	INCLUDE_CPLUS_MIN		/* minimal C++ runtime support */
-    cplusLibMinInit ();
-#endif
-
-    /* initialize Wind Web Server */
-
-#ifdef INCLUDE_HTTP
-    httpd ();
-#endif /* INCLUDE_HTTP */
-
-    /* initialize windview support */
-
-#ifdef   INCLUDE_RBUFF                  /* install rBuff support */
-    rBuffLibInit();
-#ifdef  INCLUDE_SHOW_ROUTINES
-    rBuffShowInit ();                   /* install rBuff show routine */
-#endif  /* INCLUDE_SHOW_ROUTINES */
-#endif /* INCLUDE_RBUFF */
-
-#ifdef INCLUDE_WINDVIEW
-    windviewConfig ();
-#endif /* INCLUDE_WINDVIEW */
-
-
-    /* initialize the WDB debug agent */
-
-#ifdef  INCLUDE_WDB
-    wdbConfig();
-
-#ifdef	INCLUDE_WDB_BANNER
-#ifndef INCLUDE_SHELL
-    /* short banner, like the bootPrintLogo banner */
-    printf ("\n\n");
-    printf ("%17s%s",     "","VxWorks\n\n");
-    printf ("Copyright 1984-1996  Wind River Systems, Inc.\n\n");
-    printf ("            CPU: %s\n", sysModel ());
-    printf ("        VxWorks: " VXWORKS_VERSION "\n");
-    printf ("    BSP version: " BSP_VERSION BSP_REV "\n");
-    printf ("  Creation date: %s %s\n", __DATE__, __TIME__);
-    printf ("            WDB: %s.\n\n",
-	    ((wdbRunsExternal () || wdbRunsTasking ()) ?
-		 "Ready" : "Agent configuration failed") );
-#endif /*INCLUDE_SHELL*/
-
-#endif /*INCLUDE_WDB_BANNER*/
-
-#endif  /* INCLUDE_WDB */
-
-    /* initialize interactive shell */
-
-#ifdef  INCLUDE_SHELL
-#ifdef	INCLUDE_SECURITY			/* include shell security */
-    if ((sysFlags & SYSFLG_NO_SECURITY) == 0)
-	{
-        loginInit ();				/* initialize login table */
-        shellLoginInstall (loginPrompt, NULL);	/* install security program */
-
-	/* add additional users here as required */
-
-        loginUserAdd (LOGIN_USER_NAME, LOGIN_PASSWORD);	
-	}
-#endif	/* INCLUDE_SECURITY */
-
-    printLogo ();				/* print out the banner page */
-
-    printf ("                               ");
-    printf ("CPU: %s.  Processor #%d.\n", sysModel (), sysProcNumGet ());
-    printf ("                              ");
-    printf ("Memory Size: 0x%x.", (UINT)(sysMemTop () - (char *)LOCAL_MEM_LOCAL_ADRS));
-    printf ("  BSP version " BSP_VERSION BSP_REV ".");
-#if defined(INCLUDE_WDB) && defined(INCLUDE_WDB_BANNER)
-    printf ("\n                             ");
-    printf ("WDB: %s.",
-	    ((wdbRunsExternal () || wdbRunsTasking ()) ?
-		 "Ready" : "Agent configuration failed") );
-#endif /*INCLUDE_WDB && INCLUDE_WDB_BANNER*/
-    printf ("\n\n");
-
-#ifdef	INCLUDE_STARTUP_SCRIPT			/* run a startup script */
-    if (sysBootParams.startupScript [0] != EOS)
-	usrStartupScript (sysBootParams.startupScript);
-#endif	/* INCLUDE_STARTUP_SCRIPT */
-
-    shellInit (SHELL_STACK_SIZE, TRUE);		/* create the shell */
-
-
-    /* only include the simple demo if the shell is NOT included */
-
-#else
-#if defined(INCLUDE_DEMO)			/* create demo w/o shell */
-    taskSpawn ("demo", 20, 0, 2000, (FUNCPTR)usrDemo, 0,0,0,0,0,0,0,0,0,0);
-#endif						/* mips cpp no elif */
-
-#endif	/* INCLUDE_SHELL */
-
-#if defined(INCLUDE_JAVA)
-    javaConfig ();
-#endif	/* INCLUDE_JAVA */
-
-#ifdef INCLUDE_USER_APPL
-    /* Startup the user's application */
-
-    USER_APPL_INIT;	/* must be a valid C statement or block */
-#endif
-
-#if (SINQHM_SPAWN != 0)
-    printf ("Spawning SinqHM_bootParamsConfig ...\n");
-    taskSpawn ("hmConfig", 100, VX_FP_TASK, 20000,
-			(FUNCPTR) SinqHM_bootParamsConfig,
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-	/*------------------------------------------------------------------*/
-#endif	    /* (SINQHM_SPAWN != 0) */
-    }
-
-/*******************************************************************************
-*
-* usrClock - user-defined system clock interrupt routine
-*
-* This routine is called at interrupt level on each clock interrupt.
-* It is installed by usrRoot() with a sysClkConnect() call.
-* It calls all the other packages that need to know about clock ticks,
-* including the kernel itself.
-*
-* If the application needs anything to happen at the system clock interrupt
-* level, it can be added to this routine.
-*
-* RETURNS: N/A
-*/
-
-void usrClock ()
-
-    {
-    tickAnnounce ();	/* announce system tick to kernel */
-    }
-
-#ifdef	INCLUDE_DEMO
-
-/********************************************************************************
-* usrDemo - example application without shell
-*
-* This routine is spawned as a task at the end of usrRoot(), if INCLUDE_DEMO
-* is defined, and INCLUDE_SHELL is NOT defined in configAll.h or config.h.
-* It is intended to indicate how a shell-less application can be linked,
-* loaded, and ROMed.
-*
-* NOMANUAL
-*/
-
-void usrDemo (void)
-
-    {
-    char string [40];
-
-    printf ("VxWorks (for %s) version %s.\n", sysModel (), vxWorksVersion);
-    printf ("Kernel: %s.\n", kernelVersion ());
-    printf ("Made on %s.\n", creationDate);
-
-    FOREVER
-        {
-        printf ("\nThis is a test.  Type something: ");
-        fioRdString (STD_IN, string, sizeof (string));
-	printf ("\nYou typed \"%s\".\n", string);
-
-	if (strcmp (string, "0") == 0)
-	    memShow (0);
-
-	if (strcmp (string, "1") == 0)
-	    memShow (1);
-        }
-    }
-
-#endif	/* INCLUDE_DEMO */
diff --git a/sinqhm/usrConfig.c_diffs b/sinqhm/usrConfig.c_diffs
deleted file mode 100755
index 4266ac4c..00000000
--- a/sinqhm/usrConfig.c_diffs
+++ /dev/null
@@ -1,125 +0,0 @@
-The following is the output generated by diff for the distribution copy
-of usrConfig.c and the version used for generating the SinqHM_srv
-Histogram Memory bootable image.
-                                                 24-Nov-1999
-   Date of Distribution Version: Jul 12 1996
-   Date of SinqHM_srv Version:   Nov 24 1999
-======================================================================
-6,58d5
-<     /*
-<     **  This file should be copied to the VxWorks directory tree, e.g:
-<     **    pss123> set src = "lnsa09:tas_src:[sinqhm]"
-<     **    pss123> if ("$USER" != "maden") set src = "lnsg@$src"
-<     **    pss123> rcp -p "${src}usrConfig.c" \
-<     **                $HOME/wind/ppc/target/config/all/usrConfig.c
-<     **    pss123> rcp -p "${src}bld." $HOME/wind/SinqHM/bld
-<     **
-<     **  The system images are:
-<     **
-<     **       $HOME/wind/SinqHM/vxWorks_basic
-<     **       $HOME/wind/SinqHM/<instr>/vxWorks_auto
-<     **
-<     ** Using the Tornado tools:
-<     ** =======================
-<     **  To build the system image WITHOUT the SinqHM modules:
-<     **      a) Start WindCFG with no target selected.
-<     **      b) Select the "mv1603" BSP.
-<     **      c) Select configuration "SinqHM"
-<     **      d) Start up the editor and ensure that "SINQHM_SPAWN"
-<     **          is either not defined or is defined to be 0.
-<     **      e) Select the Build option.
-<     **      f) Copy file vxWorks to $HOME/wind/SinqHM/vxWorks_basic.
-<     **
-<     **  To build the system image WITH the SinqHM modules:
-<     **      a) Start WindCFG with no target selected.
-<     **      b) Select the "mv1603" BSP.
-<     **      c) Select configuration "SinqHM_spawn_<instr>".
-<     **      d) Start up the editor and ensure that "SINQHM_SPAWN"
-<     **          is defined to be non-zero, e.g:
-<     **              #define  SINQHM_SPAWN  1
-<     **      e) Select the Build option.
-<     **      f) Copy file $HOME/wind/ppc/target/config/mv1603/vxWorks 
-<     **                to $HOME/wind/SinqHM/<instr>/vxWorks_auto.
-<     **
-<     ** Using the bld script:
-<     ** ====================
-<     **  To build system images using the bld script:
-<     **
-<     **    a) without the SinqHM modules:
-<     **                     pss123> $HOME/wind/SinqHM/bld basic
-<     **    b) with    the SinqHM modules:
-<     **                     pss123> bld <instr> all
-<     **
-<     **  Warnings:
-<     **    The bld script will only work if SINQHM_SPAWN is NOT
-<     **    defined in $HOME/wind/ppc/target/config/mv1603/config.h
-<     **
-<     **    When using the bld script, be sure that the file
-<     **    $HOME/wind/ppc/target/config/mv1603/configdb.h
-<     **    is set to select the correct VxWorks options. It is
-<     **    easiest to use the Tornado WindCFG tool to do this.
-<     */
-62,67d8
-< V01E 24-Nov-1999 DM.	Yet more updates to the above comments.
-< V01D 18-Jun-1999 DM.	More updates to the above comments.
-< V01C 11-Dec-1998 DM.	Just update the above comments.
-< V01B  4-Aug-1997 DM.	Just spawn SinqHM_bootParamsConfig. This then spawns
-< 			    anything else which is specified in the boot line.
-< V01A  3-Jun-1997 DM.	Include spawning of SinqHM modules.
-402,411d342
-< #if (SINQHM_SPAWN != 0)
-< 	/*-----------------------------------------------------------------
-< 	** Define local variables and templates for SinqHM modules
-< 	*/
-< 
-<     void SinqHM_bootParamsConfig (void);
-< 
-< 	/*-----------------------------------------------------------------*/
-< #endif	    /* (SINQHM_SPAWN != 0) */
-< 
-415a347
-> 
-913c845
-<     printf ("  Creation date: %s %s\n", __DATE__, __TIME__);
----
->     printf ("  Creation date: %s\n", __DATE__);
-969,975d900
-< #if (SINQHM_SPAWN != 0)
-<     printf ("Spawning SinqHM_bootParamsConfig ...\n");
-<     taskSpawn ("hmConfig", 100, VX_FP_TASK, 20000,
-< 			(FUNCPTR) SinqHM_bootParamsConfig,
-< 			2400, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-< 	/*------------------------------------------------------------------*/
-< #endif	    /* (SINQHM_SPAWN != 0) */
-1025,1033c950,967
-< /*
-< **    int		fd;
-< */
-<     printf ("VxWorks (for %s) version %s\n", sysModel (), vxWorksVersion);
-<     printf ("Kernel: %s\n", kernelVersion ());
-<     printf ("Made on %s\n", creationDate);
-<     printf ("Delaying for 10 secs ...");
-<     taskDelay (600);
-<     printf (" done\n");
----
->     char string [40];
-> 
->     printf ("VxWorks (for %s) version %s.\n", sysModel (), vxWorksVersion);
->     printf ("Kernel: %s.\n", kernelVersion ());
->     printf ("Made on %s.\n", creationDate);
-> 
->     FOREVER
->         {
->         printf ("\nThis is a test.  Type something: ");
->         fioRdString (STD_IN, string, sizeof (string));
-> 	printf ("\nYou typed \"%s\".\n", string);
-> 
-> 	if (strcmp (string, "0") == 0)
-> 	    memShow (0);
-> 
-> 	if (strcmp (string, "1") == 0)
-> 	    memShow (1);
->         }
-1034a969
-> 
-========================================================================= End
diff --git a/sinqhm/usrConfig2604.c b/sinqhm/usrConfig2604.c
deleted file mode 100755
index e0a1c592..00000000
--- a/sinqhm/usrConfig2604.c
+++ /dev/null
@@ -1,996 +0,0 @@
-/* usrConfig.c - user-defined system configuration library */
-
-/* Copyright 1984-1998 Wind River Systems, Inc. */
-#include "copyright_wrs.h"
-
-/*
-modification history
---------------------
-31-01-2002,Mark Koennecke, added code for starting the SinqHM stuff.
-***********************************************************************
-
-          This file has to copied to  
-  /home/pss123/aco/sinqhm/wind2/2.0.2/target/config/all/usrConfig.c
-**********************************************************************
-
-19f,10mar99,drm  Changing WINDMP to VXFUSION to reflect new product name.
-19e,08oct98,rlp  added support for UGL and HTML.
-19d,17sep98,ms   call cplusDemanglerInit if INCLUDE_CPLUS and INCLUDE_LOADER
-19c,17sep98,cym  added code to calculate proper IP address for PCSIM.
-19b,01sep98,drm  added code to initialize WindMP
-19a,10aug98,cym  added code to inform tornado when the NT simulator is up.
-18z,23apr98,yp   merged in TrueFFS support
-18y,22apr98,elp  created group 1 module when standalone (fixed SPR# 20301).
-18w,22apr98,hdn  added comment for tffsDrv().
-18t,17apr98,nps  added support for rBuffShow.
-18s,09mar98,sjw  merge in HTTP and JAVA changes for conflict resolution
-18r,18dec97,cth  replaced windview, timestamp initialization with windviewConfig
-18q,13nov97,cth  changed WV evtInstInit to wvLibInit2; removed connRtnSet, 
-		 evtTaskInit; added include wvLib.h, rBuffLib.h
-18p,18aug97,nps  changed WV buffer initialization with the rBuff API.
-18x,06mar98,ms   changed copyright year from 1996 to 1998.
-18v,04feb98,jpd  fix unsigned/signed warning (usrRoot); updated copyright date.
-18u,25feb98,jgn  removed call to excShowInit(), it is called by excInit()
-                 if needed (SPR #20625)
-18t,19jan98,hdn  changed a condition macro to include tffsDrv().
-18p,06jan98,cym  added SIMNT as processor not to clear bss.
-18s,23sep97,yp   added support for TFFS.
-18r,13aug97,cdp  add Thumb (ARM7TDMI_T) support;
-                 'fix' unsigned/signed comparison in usrRoot.
-18q,26feb97,dat  added INCLUDE_USER_APPL and USER_APPL_INIT, spr 8071.
-18p,05feb97,cdp  remove ARM test hook (_func_armStartup).
-18o,12dec96,cdp  added _func_armStartup for ARM platforms.
-18n,13dec96,elp	 changed syncLibInit() into symSyncLibInit().
-18m,18nov96,dds  SPR 2529: return status for sysScsiInit is now checked.
-18l,06nov96,ms   removed 17n hack to usrClock.
-18k,01nov96,hdn  added support for PCMCIA.
-18j,21oct96,hdn  changed paramerters for new LPT driver.
-18i,04oct96,elp  added INCLUDE_SYM_TBL_SYNC (SPR# 6775).
-18h,11jul96,tam  changed copyright year from 1995 to 1996.
-18l,19jul96,hdn  added support for ATA driver.
-18k,25jun96,jmb  Eliminated alternative WDB macro names (SPR #5707).
-18j,25jun96,dbt  Initialized _func_selWakeupListInit before tyLib (SPR #3314).
-18i,21jun96,jmb  update copyright. SPR #6364
-18h,21jun96,jmb  long modhist -- deleted entries prior to 1994.  SPR #6528
-18g,12mar96,tam  removed all #if (CPU == PPC403).
-18p,06jun96,ism  bumped copyright to 1996.
-18o,26jan96,ism  cleaned up vxsim/solaris version
-18f,02oct95,kvk  added sysHwInit2() for PPC603.
-18e,27sep95,tpr  removed #if (CPU_FAMILY != PPC) staff.
-18n,07nov95,srh  fixed C++ support comments.
-18m,29oct95,dat  fixed warnings about printf arguments
-18l,11oct95,jdi  doc: changed .pG to .tG.
-18k,10oct95,dat	 new BSP revision id. Added WDB Banner printing
-18j,15jun95,ms	 updated for new serial drivers.
-18i,09jun95,ms	 cleaned up console initialization
-18h,30may95,p_m  added initialization of formatted I/O library.
-		 replaced spyStop() by spyLibInit().
-18g,22may95,p_m  no longer initialize object format specific libraries if
-		 loader is not included.
-18f,22may95,myz  modified new serial device initialization for x86 support
-18e,22may95,ms   added some WDB agent support
-18e,30oct95,ism  updated for SIMSPARCSOLARIS
-18d,28mar95,kkk  added scalability support, changed edata and end to arrays
-		 (SPR #3917), changed baud rate to be a macro in configAll.h
-18g,25may95,yao  changed to bzero bss segment for PPC.
-18f,04apr95,caf  added PPC cache support.
-18e,03mar95,yao  added shsHwInit2 () for PPC403.
-18d,24feb95,caf  added PPC support.
-18c,20nov94,kdl  added hashLibInit() when using dosFs.
-18b,09nov94,jds  additions for scsi backward compatability ; scsi[12]IfInit()
-18a,04nov94,kdl	 merge cleanup.
-17l,02aug94,tpr  added cacheEnable (BRANCH_CACHE) for the MC68060.
-17m,15oct94,hdn  added LPT driver.
-17o,20jul94,ms   changed INCLUDE_AOUT_HPPA to INCLUDE_SOM_COFF
-17n,02may94,ms   added VxSim HP hack to usrClock().
-17q,15mar94,smb  renamed tEvtTask parameters.
-17p,15feb94,smb  defined WV_MODE, EVTBUFFER_ADDRESS for wvInstInit().
-17o,12jan94,kdl  modified posix initialization; added queued signal init.
-*/
-
-/*
-DESCRIPTION
-This library is the WRS-supplied configuration module for VxWorks.  It
-contains the root task, the primary system initialization routine, the
-network initialization routine, and the clock interrupt routine.
-
-The include file config.h includes a number of system-dependent parameters used
-in this file.
-
-In an effort to simplify the presentation of the configuration of vxWorks,
-this file has been split into smaller files.  These additional configuration
-source files are located in ../../src/config/usr[xxx].c and are #included into
-this file below.  This file contains the bulk of the code a customer is
-likely to customize.
-
-The module usrDepend.c contains checks that guard against unsupported
-configurations suchas INCLUDE_NFS without INCLUDE_RPC.  The module
-usrKernel.c contains the core initialization of the kernel which is rarely
-customized, but provided for information.  The module usrNetwork.c now
-contains all network initialization code.  Finally, the module usrExtra.c
-contains the conditional inclusion of the optional packages selected in
-configAll.h.
-
-The source code necessary for the configuration selected is entirely
-included in this file during compilation as part of a standard build in
-the board support package.  No other make is necessary.
-
-INCLUDE FILES:
-config.h
-
-SEE ALSO:
-.tG "Getting Started, Cross-Development"
-*/
-
-#include "vxWorks.h"			/* always first */
-#include "config.h"			/* board support configuration header */
-#include "usrConfig.h"			/* general configuration header */
-#include "usrDepend.c"			/* include dependency rules */
-#include "usrKernel.c"			/* kernel configuration */
-#include "usrExtra.c"			/* conditionally included packages */
-
-#if CPU==SIMNT
-extern int simUpMutex;
-extern int win_ReleaseMutex(int hMutex);
-#endif
-
-#ifdef INCLUDE_HTTP
-#include "http/httpLib.h"		/* Wind Web Server interfaces */
-#endif
-
-/* global variables */
-
-int		consoleFd;		/* fd of initial console device */
-char		consoleName[20];	/* console device name, eg. "/tyCo/0" */
-SYMTAB_ID	statSymTbl;		/* system error status symbol table id*/
-SYMTAB_ID	standAloneSymTbl;	/* STANDALONE version symbol table id */
-SYMTAB_ID	sysSymTbl;		/* system symbol table id */
-BOOT_PARAMS	sysBootParams;		/* parameters from boot line */
-int		sysStartType;		/* type of boot (WARM, COLD, etc) */
-
-/*******************************************************************************
-*
-* usrInit - user-defined system initialization routine
-*
-* This is the first C code executed after the system boots.  This routine is
-* called by the assembly language start-up routine sysInit() which is in the
-* sysALib module of the target-specific directory.  It is called with
-* interrupts locked out.  The kernel is not multitasking at this point.
-*
-* This routine starts by clearing BSS; thus all variables are initialized to 0,
-* as per the C specification.  It then initializes the hardware by calling
-* sysHwInit(), sets up the interrupt/exception vectors, and starts kernel
-* multitasking with usrRoot() as the root task.
-*
-* RETURNS: N/A
-*
-* SEE ALSO: kernelLib
-*
-* ARGSUSED0
-*/
-
-void usrInit 
-    (
-    int startType
-    )
-    {
-#if	(CPU_FAMILY == SPARC)
-    excWindowInit ();				/* SPARC window management */
-#endif
-
-    /* configure data and instruction cache if available and leave disabled */
-
-#ifdef  INCLUDE_CACHE_SUPPORT
-    cacheLibInit (USER_I_CACHE_MODE, USER_D_CACHE_MODE);
-#endif  /* INCLUDE_CACHE_SUPPORT */
-
-#if	CPU_FAMILY!=SIMNT && CPU_FAMILY!=SIMSPARCSUNOS && CPU_FAMILY!=SIMHPPA && CPU_FAMILY!=SIMSPARCSOLARIS
-    /* don't assume bss variables are zero before this call */
-
-    bzero (edata, end - edata);		/* zero out bss variables */
-#endif	/* CPU_FAMILY!=SIMNT && CPU_FAMILY!=SIMSPARCSUNOS && CPU_FAMILY!=SIMHPPA && CPU_FAMILY!=SIMSPARCSOLARIS */
-
-    sysStartType = startType;			/* save type of system start */
-
-    intVecBaseSet ((FUNCPTR *) VEC_BASE_ADRS);	/* set vector base table */
-
-#if (CPU_FAMILY == AM29XXX)
-    excSpillFillInit ();			/* am29k stack cache managemt */
-#endif
-
-#ifdef  INCLUDE_EXC_HANDLING
-    excVecInit ();				/* install exception vectors */
-#endif  /* INCLUDE_EXC_HANDLING */
-
-    sysHwInit ();				/* initialize system hardware */
-
-    usrKernelInit ();				/* configure the Wind kernel */
-
-#ifdef  INCLUDE_CACHE_SUPPORT
-#ifdef 	USER_I_CACHE_ENABLE
-    cacheEnable (INSTRUCTION_CACHE);		/* enable instruction cache */
-#endif	/* USER_I_CACHE_ENABLE */
-
-#ifdef	USER_D_CACHE_ENABLE
-    cacheEnable (DATA_CACHE);			/* enable data cache */
-#endif 	/* USER_D_CACHE_ENABLE */
-
-#if (CPU == MC68060)
-#ifdef 	USER_B_CACHE_ENABLE
-    cacheEnable (BRANCH_CACHE);			/* enable branch cache */
-#endif	/* USER_B_CACHE_ENABLE */
-#endif	/* (CPU == MC68060) */
-#endif  /* INCLUDE_CACHE_SUPPORT */
-
-    /* start the kernel specifying usrRoot as the root task */
-    kernelInit ((FUNCPTR) usrRoot, ROOT_STACK_SIZE,
-#ifdef  INCLUDE_WDB
-                (char *) FREE_RAM_ADRS + WDB_POOL_SIZE,
-#else
-                (char *) FREE_RAM_ADRS,
-#endif
-		sysMemTop (), ISR_STACK_SIZE, INT_LOCK_LEVEL);
-    }
-
-/*******************************************************************************
-*
-* usrRoot - the root task
-*
-* This is the first task to run under the multitasking kernel.  It performs
-* all final initialization and then starts other tasks.
-*
-* It initializes the I/O system, installs drivers, creates devices, and sets
-* up the network, etc., as necessary for a particular configuration.  It
-* may also create and load the system symbol table, if one is to be included.
-* It may then load and spawn additional tasks as needed.  In the default
-* configuration, it simply initializes the VxWorks shell.
-*
-* RETURNS: N/A
-*/
-
-void usrRoot
-    (
-    char *	pMemPoolStart,		/* start of system memory partition */
-    unsigned	memPoolSize		/* initial size of mem pool */
-    )
-    {
-    char tyName [20];
-    int  ix;
-
-
-#if (SINQHM_SPAWN != 0)
-	/*-----------------------------------------------------------------
-	** Define local variables and templates for SinqHM modules
-	*/
-
-    void SinqHM_bootParamsConfig (void);
-
-	/*-----------------------------------------------------------------*/
-#endif	    /* (SINQHM_SPAWN != 0) */
-
-   
-    /* Initialize the memory pool before initializing any other package.
-     * The memory associated with the root task will be reclaimed at the
-     * completion of its activities.
-     */
-
-#ifdef INCLUDE_MEM_MGR_FULL
-    memInit (pMemPoolStart, memPoolSize);	/* initialize memory pool */
-#else
-    memPartLibInit (pMemPoolStart, memPoolSize);/* initialize memory pool */
-#endif /* INCLUDE_MEM_MGR_FULL */
-
-#ifdef	INCLUDE_SHOW_ROUTINES 
-    memShowInit ();				/* initialize memShow routine */
-#endif	/* INCLUDE_SHOW_ROUTINES */
-
-#if	defined(INCLUDE_MMU_BASIC) || defined(INCLUDE_MMU_FULL)
-    usrMmuInit ();				/* initialize the mmu */
-#endif	/* defined(INCLUDE_MMU_BASIC) || defined(INCLUDE_MMU_FULL) */
-
-    /* set up system timer */
-
-    sysClkConnect ((FUNCPTR) usrClock, 0);	/* connect clock ISR */
-    sysClkRateSet (60);				/* set system clock rate */
-    sysClkEnable ();				/* start it */
-
-    /* 
-     * select sould be initialized after NFS and RPC for proper delete
-     * hook order but _func_selWakeupListInit should be set 
-     * before tyLib module (SPR #3314).
-     */
-
-#ifdef  INCLUDE_SELECT
-    _func_selWakeupListInit     = (FUNCPTR) selWakeupListInit;
-#endif	/* INCLUDE_SELECT */
-
-    /* initialize I/O system */
-
-#ifdef  INCLUDE_IO_SYSTEM
-    iosInit (NUM_DRIVERS, NUM_FILES, "/null");
-
-    consoleFd = NONE;                           /* assume no console device */
-
-#ifdef  INCLUDE_TYCODRV_5_2
-#ifdef  INCLUDE_TTY_DEV
-    if (NUM_TTY > 0)
-	{
-	tyCoDrv ();				/* install console driver */
-
-	for (ix = 0; ix < NUM_TTY; ix++)	/* create serial devices */
-	    {
-	    sprintf (tyName, "%s%d", "/tyCo/", ix);
-
-	    (void) tyCoDevCreate (tyName, ix, 512, 512);
-
-	    if (ix == CONSOLE_TTY)
-		strcpy (consoleName, tyName);	/* store console name */
-	    }
-
-	consoleFd = open (consoleName, O_RDWR, 0);
-
-	/* set baud rate */
-
-	(void) ioctl (consoleFd, FIOBAUDRATE, CONSOLE_BAUD_RATE);
-	(void) ioctl (consoleFd, FIOSETOPTIONS, OPT_TERMINAL);
-	}
-#endif	/* INCLUDE_TTY_DEV */
-
-#else   /* !INCLUDE_TYCODRV_5_2 */
-#ifdef  INCLUDE_TTY_DEV
-    if (NUM_TTY > 0)
-	{
-	ttyDrv();				/* install console driver */
-
-	for (ix = 0; ix < NUM_TTY; ix++)	/* create serial devices */
-	    {
-#if     (defined(INCLUDE_WDB) && (WDB_COMM_TYPE == WDB_COMM_SERIAL))
-	    if (ix == WDB_TTY_CHANNEL)		/* don't use WDBs channel */
-		continue;
-#endif
-	    sprintf (tyName, "%s%d", "/tyCo/", ix);
-	    (void) ttyDevCreate (tyName, sysSerialChanGet(ix), 512, 512);
-
-	    if (ix == CONSOLE_TTY)		/* init the tty console */
-		{
-		strcpy (consoleName, tyName);
-		consoleFd = open (consoleName, O_RDWR, 0);
-		(void) ioctl (consoleFd, FIOBAUDRATE, CONSOLE_BAUD_RATE);
-		(void) ioctl (consoleFd, FIOSETOPTIONS, OPT_TERMINAL);
-		}
-	    }
-	}
-#endif  /* INCLUDE_TTY_DEV */
-
-#ifdef INCLUDE_PC_CONSOLE
-    pcConDrv ();
-    for (ix = 0; ix < N_VIRTUAL_CONSOLES; ix++)
-	{
-	sprintf (tyName, "%s%d", "/pcConsole/", ix);
-	(void) pcConDevCreate (tyName,ix, 512, 512);
-	if (ix == PC_CONSOLE)		/* init the console device */
-	    {
-	    strcpy (consoleName, tyName);
-	    consoleFd = open (consoleName, O_RDWR, 0);
-	    (void) ioctl (consoleFd, FIOBAUDRATE, CONSOLE_BAUD_RATE);
-	    (void) ioctl (consoleFd, FIOSETOPTIONS, OPT_TERMINAL);
-	    }
-	}
-#endif	/* INCLUDE_PC_CONSOLE */
-
-#endif  /* !INCLUDE_TYCODRV_5_2 */
-
-    ioGlobalStdSet (STD_IN,  consoleFd);
-    ioGlobalStdSet (STD_OUT, consoleFd);
-    ioGlobalStdSet (STD_ERR, consoleFd);
-#endif  /* INCLUDE_IO_SYSTEM */
-
-    /* initialize symbol table facilities */
-
-#ifdef	INCLUDE_SYM_TBL
-    hashLibInit ();			/* initialize hash table package */
-    symLibInit ();			/* initialize symbol table package */
-#ifdef 	INCLUDE_SHOW_ROUTINES 
-    symShowInit ();			/* initialize symbol table show */
-#endif	/* INCLUDE_SHOW_ROUTINES */
-#endif	/* INCLUDE_SYM_TBL */
-
-
-    /* initialize exception handling */
-
-#if     defined(INCLUDE_EXC_HANDLING) && defined(INCLUDE_EXC_TASK)
-    excInit ();				/* initialize exception handling */
-#endif  /* defined(INCLUDE_EXC_HANDLING) && defined(INCLUDE_EXC_TASK) */
-
-#ifdef	INCLUDE_LOGGING
-    logInit (consoleFd, MAX_LOG_MSGS);	/* initialize logging */
-#endif	/* INCLUDE_LOGGING */
-
-#ifdef	INCLUDE_SIGNALS
-    sigInit ();				/* initialize signals */
-#endif	/* INCLUDE_SIGNALS */
-
-    /* initialize debugging */
-
-#ifdef	INCLUDE_DEBUG
-    dbgInit ();				/* initialize debugging */
-#endif	/* INCLUDE_DEBUG */
-
-
-    /* initialize pipe driver */
-
-#ifdef	INCLUDE_PIPES
-    pipeDrv ();				/* install pipe driver */
-#endif	/* INCLUDE_PIPES */
-
-
-    /* initialize standard I/O package */
-
-#ifdef	INCLUDE_STDIO
-    stdioInit ();			/* initialize standard I/O library */
-#ifdef  INCLUDE_SHOW_ROUTINES
-    stdioShowInit ();
-#endif  /* INCLUDE_SHOW_ROUTINES */
-#endif	/* INCLUDE_STDIO */
-
-    /* initialize POSIX queued signals */
-
-#if defined(INCLUDE_POSIX_SIGNALS) && defined(INCLUDE_SIGNALS)
-    sigqueueInit (NUM_SIGNAL_QUEUES); /* initialize queued signals */
-#endif
-
-    /* initialize POSIX semaphores */
-
-#ifdef  INCLUDE_POSIX_SEM
-    semPxLibInit ();			
-#ifdef INCLUDE_SHOW_ROUTINES
-    semPxShowInit ();
-#endif  /* INCLUDE_SHOW_POUTINES */
-#endif  /* INCLUDE_POSIX_SEM */
-
-    /* initialize POSIX message queues */
-
-#ifdef INCLUDE_POSIX_MQ
-    mqPxLibInit (MQ_HASH_SIZE);		
-#ifdef INCLUDE_SHOW_ROUTINES
-    mqPxShowInit ();
-#endif  /* INCLUDE_SHOW_ROUTINES */
-#endif  /* INCLUDE_POSIX_MQ */
-
-    /* initialize POSIX async I/O support */
-
-#ifdef INCLUDE_POSIX_AIO
-    aioPxLibInit (MAX_LIO_CALLS);
-#ifdef INCLUDE_POSIX_AIO_SYSDRV
-    aioSysInit (MAX_AIO_SYS_TASKS, AIO_TASK_PRIORITY, AIO_TASK_STACK_SIZE);
-#endif  /* INCLUDE_POSIX_AIO_SYSDRV */
-#endif  /* INCLUDE_POSIX_AIO */
-
-    /* initialize filesystems and disk drivers */
-
-#ifdef	INCLUDE_DOSFS
-    hashLibInit ();			/* initialize hash table package */
-    dosFsInit (NUM_DOSFS_FILES); 	/* init dosFs filesystem */
-#endif	/* INCLUDE_DOSFS */
-
-#ifdef	INCLUDE_RAWFS
-    rawFsInit (NUM_RAWFS_FILES); 	/* init rawFs filesystem */
-#endif	/* INCLUDE_RAWFS */
-
-#ifdef	INCLUDE_RT11FS
-    rt11FsInit (NUM_RT11FS_FILES); 	/* init rt11Fs filesystem */
-#endif	/* INCLUDE_RT11FS */
-
-#ifdef	INCLUDE_RAMDRV
-    ramDrv ();				/* initialize ram disk driver */
-#endif	/* INCLUDE_RAMDRV */
-
-#ifdef	INCLUDE_SCSI
-
-    /*
-     * initialize either the SCSI1 or SCSI2 interface; initialize SCSI2 when 
-     * the SCSI2 interface is available.
-     */
-
-#ifndef INCLUDE_SCSI2
-    scsi1IfInit ();
-#else
-    scsi2IfInit ();
-#endif
-
-    /* initialize SCSI controller */
-    if (sysScsiInit () == OK)
-	{
-	usrScsiConfig ();			/* configure SCSI peripherals */
-        }
-    else
-        {
-        printf ("sysScsiInit() Failed, SCSI system not initialized\n");
-        }
-
-#endif	/* INCLUDE_SCSI */
-
-#ifdef  INCLUDE_FD
-    fdDrv (FD_INT_VEC, FD_INT_LVL);     /* initialize floppy disk driver */
-#endif  /* INCLUDE_FD */
-
-#ifdef  INCLUDE_IDE
-    ideDrv (IDE_INT_VEC, IDE_INT_LVL, IDE_CONFIG); /* init IDE disk driver */
-#endif  /* INCLUDE_IDE */
-
-#ifdef  INCLUDE_ATA
-    {                                   /* initialize hard disk driver */
-    IMPORT ATA_RESOURCE ataResources[];
-    ATA_RESOURCE *pAtaResource;
-
-    for (ix = 0; ix < ATA_MAX_CTRLS; ix++)
-        {
-        pAtaResource = &ataResources[ix];
-        if (pAtaResource->ctrlType == IDE_LOCAL)
-            ataDrv (ix, pAtaResource->drives, pAtaResource->intVector,
-                    pAtaResource->intLevel, pAtaResource->configType,
-                    pAtaResource->semTimeout, pAtaResource->wdgTimeout);
-        }
-    }
-#ifdef  INCLUDE_SHOW_ROUTINES
-    ataShowInit ();                     /* install ATA/IDE show routine */
-#endif  /* INCLUDE_SHOW_ROUTINES */
-#endif  /* INCLUDE_ATA */
-
-#ifdef  INCLUDE_LPT
-    {
-    IMPORT LPT_RESOURCE lptResources[];
-    lptDrv (LPT_CHANNELS, &lptResources[0]); /* init LPT parallel driver */
-    }
-#endif  /* INCLUDE_LPT */
-
-#ifdef  INCLUDE_PCMCIA
-#ifdef  INCLUDE_SHOW_ROUTINES
-    pcmciaShowInit ();			/* install PCMCIA show routines */
-#endif  /* INCLUDE_SHOW_ROUTINES */
-    pcmciaInit ();			/* init PCMCIA Lib */
-#endif  /* INCLUDE_PCMCIA */
-
-#ifdef	INCLUDE_TFFS
-    tffsDrv ();				/* it should be after pcmciaInit() */
-#endif	/* INCLUDE_TFFS */
-
-#ifdef  INCLUDE_FORMATTED_IO
-    fioLibInit ();			/* initialize formatted I/O */
-#endif  /* INCLUDE_FORMATTED_IO */
-
-    /* initialize floating point facilities */
-
-#ifdef	INCLUDE_FLOATING_POINT
-    floatInit ();			/* initialize floating point I/O */
-#endif	/* INCLUDE_FLOATING_POINT */
-
-    /* install software floating point emulation (if applicable) */
-
-#ifdef	INCLUDE_SW_FP
-    mathSoftInit ();			/* use software emulation for fp math */
-#endif	/* INCLUDE_SW_FP */
-
-    /* install hardware floating point support (if applicable) */
-
-#ifdef	INCLUDE_HW_FP
-    mathHardInit (); 			/* do fppInit() & install hw fp math */
-
-#ifdef	INCLUDE_SHOW_ROUTINES 
-    fppShowInit ();			/* install hardware fp show routine */
-#endif	/* INCLUDE_SHOW_ROUTINES */
-#endif	/* INCLUDE_HW_FP */
-
-    /* initialize performance monitoring tools */
-
-#ifdef	INCLUDE_SPY
-    spyLibInit ();			/* install task cpu utilization tool */
-#endif	/* INCLUDE_SPY */
-
-#ifdef	INCLUDE_TIMEX
-    timexInit ();			/* install function timing tool */
-#endif	/* INCLUDE_TIMEX */
-
-#ifdef  INCLUDE_ENV_VARS
-    envLibInit (ENV_VAR_USE_HOOKS);	/* initialize environment variable */
-#endif	/* INCLUDE_ENV_VARS */
-
-#ifdef INCLUDE_NTPASSFS
-    {
-    extern int ntPassFsInit();
-    extern int ntPassFsDevInit();
-
-    ntPassFsInit(1);
-    ntPassFsDevInit("host:");
-    }
-#endif /* INCLUDE_NTPASSFS */
-
-    /* initialize object module loader */
-
-#ifdef	INCLUDE_LOADER
-    moduleLibInit ();			/* initialize module manager */
-
-#if	defined(INCLUDE_AOUT)
-    loadAoutInit ();				/* use a.out format */
-#else	/* coff or ecoff */
-#if	defined(INCLUDE_ECOFF)
-    loadEcoffInit ();				/* use ecoff format */
-#else	/* ecoff */
-#if	defined(INCLUDE_COFF)
-    loadCoffInit ();				/* use coff format */
-#else   /* coff */
-#if	defined(INCLUDE_ELF)
-    loadElfInit ();				/* use elf format */
-#else
-#if	defined(INCLUDE_SOM_COFF)
-    loadSomCoffInit ();
-#else
-#if	defined(INCLUDE_PECOFF)
-    {
-    extern int loadPecoffInit();
-
-    loadPecoffInit ();
-    }
-#endif
-#endif
-#endif
-#endif
-#endif
-#endif
-
-#endif	/* INCLUDE_LOADER */
-
-    /* initialize wtx client to synchronize host and target symbol tables */
-#ifdef	INCLUDE_SYM_TBL_SYNC
-    symSyncLibInit ();
-#endif /* INCLUDE_SYM_TBL_SYNC */
-
-    /* initialize network */
-
-#ifdef  INCLUDE_NET_INIT
-    usrBootLineInit (sysStartType);	/* crack the bootline */
-    usrNetInit (BOOT_LINE_ADRS);	/* initialize network support */
-#if CPU==SIMNT
-    {
-    extern int simProcnum;
-    char ulipIP[] = "90.0.0.1";
-
-    ulipIP[7] = '1'+simProcnum;
-    routeAdd("0.0.0.0",ulipIP);
-    }
-#endif  /* CPU==SIMNT */
-#endif	/* INCLUDE_NET_INIT */
-
-#ifdef	INCLUDE_PASSFS
-    {
-    extern STATUS passFsInit ();
-    extern void *passFsDevInit ();
-    char passName [256];
-
-    if (passFsInit (1) == OK)
-	{
-	extern char vxsim_hostname[];
-	extern char vxsim_cwd[];
-
-	sprintf (passName, "%s:", vxsim_hostname);
-	if (passFsDevInit (passName) == NULL)
-	    {
-	    printf ("passFsDevInit failed for <%s>\n", passName);
-	    }
-	else
-	    {
-	    sprintf (passName, "%s:%s", vxsim_hostname, vxsim_cwd);
-	    ioDefPathSet (passName);
-	    }
-	}
-    else
-	printf ("passFsInit failed\n");
-    }
-#endif	/* INCLUDE_PASSFS */
-
-#ifdef	INCLUDE_DOS_DISK
-    {
-    char unixName [80];
-    extern void unixDrv ();
-    extern void unixDiskInit ();
-    extern char *u_progname;  /* home of executable */
-    char *pLastSlash;
-
-    unixDrv ();
-
-    pLastSlash = strrchr (u_progname, '/');
-    pLastSlash = (pLastSlash == NULL) ? u_progname : (pLastSlash + 1);
-    sprintf (unixName, "/tmp/%s%d.dos", pLastSlash, sysProcNumGet());
-    unixDiskInit (unixName, "A:", 0);
-    }
-#endif	/* INCLUDE_DOS_DISK */
-
-    /* initialize shared memory objects */
-
-#ifdef INCLUDE_SM_OBJ			/* unbundled shared memory objects */
-    usrSmObjInit (BOOT_LINE_ADRS);
-#endif /* INCLUDE_SM_OBJ */
-
-   /* initialize WindMP */
-
-#ifdef INCLUDE_VXFUSION			/* unbundled VxFusion (distributed objects) */
-    usrVxFusionInit (BOOT_LINE_ADRS);
-#ifdef INCLUDE_SHOW_ROUTINES
-    {
-    extern void msgQDistShowInit();
-    extern void distNameShowInit ();
-    extern void distIfShowInit ();
-    extern void msgQDistGrpShowInit ();
-
-    msgQDistShowInit();
-    distNameShowInit ();
-    distIfShowInit ();
-    msgQDistGrpShowInit ();
-    }
-#endif /* INCLUDE_SHOW_ROUTINES */
-#endif /* INCLUDE_WINDMP */
-
-    /* write protect text segment & vector table only after bpattach () */
-
-#ifdef	INCLUDE_MMU_FULL		/* unbundled mmu product */
-#ifdef	INCLUDE_PROTECT_TEXT
-    if (vmTextProtect () != OK)
-	printf ("\nError protecting text segment. errno = %x\n", errno);
-#endif	/* INCLUDE_PROTECT_TEXT */
-
-#ifdef	INCLUDE_PROTECT_VEC_TABLE
-    if (intVecTableWriteProtect () != OK)
-	printf ("\nError protecting vector table. errno = %x\n", errno);
-#endif	/* INCLUDE_PROTECT_VEC_TABLE */
-#endif	/* INCLUDE_MMU_FULL */
-
-    /* initialize select only after NFS and RPC for proper delete hook order */
-
-#ifdef	INCLUDE_SELECT
-    selectInit ();
-#endif	/* INCLUDE_SELECT */
-
-    /* create system and status symbol tables */
-
-#ifdef  INCLUDE_STANDALONE_SYM_TBL
-    sysSymTbl = symTblCreate (SYM_TBL_HASH_SIZE_LOG2, TRUE, memSysPartId);
-
-#ifdef	INCLUDE_SYM_TBL_SYNC
-    /* create a module (group 1) that is not synchronized (SPR# 20301) */
-
-    moduleCreate ("vxWorks.sym", 
-#if (defined INCLUDE_AOUT)
-		  MODULE_A_OUT,
-#elif ((defined INCLUDE_COFF) || (defined INCLUDE_ECOFF) || \
-       (defined INCLUDE_SOMCOFF))
-		  MODULE_ECOFF,
-#elif (defined INCLUDE_ELF)
-		  MODULE_ELF,
-#endif /* INCLUDE_AOUT */
-		  HIDDEN_MODULE|LOAD_NO_SYMBOLS);
-#endif /* INCLUDE_SYM_TBL_SYNC */
-
-    printf ("\nAdding %ld symbols for standalone.\n", standTblSize);
-
-    /* fill in from built in table*/
-
-    for (ix = 0; (ULONG) ix < standTblSize; ix++)
-#if	(CPU == ARM7TDMI_T)
-	thumbSymTblAdd (sysSymTbl, &(standTbl[ix]));
-#else
-	symTblAdd (sysSymTbl, &(standTbl[ix]));
-#endif	/* CPU==ARM7TDMI_T `*/
-#endif	/* INCLUDE_STANDALONE_SYM_TBL */
-
-#ifdef  INCLUDE_NET_SYM_TBL
-    sysSymTbl = symTblCreate (SYM_TBL_HASH_SIZE_LOG2, TRUE, memSysPartId);
-
-    netLoadSymTbl ();				/* fill in table from host */
-#endif	/* INCLUDE_NET_SYM_TBL */
-
-#ifdef  INCLUDE_STAT_SYM_TBL
-    statSymTbl = symTblCreate (STAT_TBL_HASH_SIZE_LOG2, FALSE, memSysPartId);
-
-    for (ix = 0; (ULONG)ix < statTblSize; ix ++) /* fill in from builtin table*/
-	symTblAdd (statSymTbl, &(statTbl [ix]));
-#endif	/* INCLUDE_STAT_SYM_TBL */
-
-
-    /* initialize C++ support library */
-
-#if	defined (INCLUDE_CPLUS) && defined (INCLUDE_CPLUS_MIN)
-#error	Define only one of INCLUDE_CPLUS or INCLUDE_CPLUS_MIN, not both
-#endif
-
-#ifdef	INCLUDE_CPLUS			/* all standard C++ runtime support */
-    cplusLibInit ();
-#ifdef	INCLUDE_LOADER
-    cplusDemanglerInit ();
-#endif
-#endif
-
-#ifdef	INCLUDE_CPLUS_MIN		/* minimal C++ runtime support */
-    cplusLibMinInit ();
-#ifdef	INCLUDE_LOADER
-    cplusDemanglerInit ();
-#endif
-#endif
-
-    /* initialize Wind Web Server */
-
-#ifdef INCLUDE_HTTP
-    httpd ();
-#endif /* INCLUDE_HTTP */
-
-#ifdef   INCLUDE_RBUFF                  /* install rBuff support */
-    rBuffLibInit();
-#ifdef  INCLUDE_SHOW_ROUTINES
-    rBuffShowInit ();                   /* install rBuff show routine */
-#endif  /* INCLUDE_SHOW_ROUTINES */
-#endif /* INCLUDE_RBUFF */
-
-#ifdef INCLUDE_WINDVIEW
-    windviewConfig ();
-#endif /* INCLUDE_WINDVIEW */
-
-
-    /* initialize the WDB debug agent */
-
-#ifdef  INCLUDE_WDB
-    wdbConfig();
-
-#ifdef	INCLUDE_WDB_BANNER
-#ifndef INCLUDE_SHELL
-    /* short banner, like the bootPrintLogo banner */
-    printf ("\n\n");
-    printf ("%17s%s",     "","VxWorks\n\n");
-    printf ("Copyright 1984-1998  Wind River Systems, Inc.\n\n");
-    printf ("            CPU: %s\n", sysModel ());
-    printf ("        VxWorks: " VXWORKS_VERSION "\n");
-    printf ("    BSP version: " BSP_VERSION BSP_REV "\n");
-    printf ("  Creation date: %s\n", __DATE__);
-    printf ("            WDB: %s.\n\n",
-	    ((wdbRunsExternal () || wdbRunsTasking ()) ?
-		 "Ready" : "Agent configuration failed") );
-#endif /*INCLUDE_SHELL*/
-
-#endif /*INCLUDE_WDB_BANNER*/
-
-#endif  /* INCLUDE_WDB */
-
-    /* initialize interactive shell */
-
-#ifdef  INCLUDE_SHELL
-#ifdef	INCLUDE_SECURITY			/* include shell security */
-    if ((sysFlags & SYSFLG_NO_SECURITY) == 0)
-	{
-        loginInit ();				/* initialize login table */
-        shellLoginInstall (loginPrompt, NULL);	/* install security program */
-
-	/* add additional users here as required */
-
-        loginUserAdd (LOGIN_USER_NAME, LOGIN_PASSWORD);	
-	}
-#endif	/* INCLUDE_SECURITY */
-
-    printLogo ();				/* print out the banner page */
-
-    printf ("                               ");
-    printf ("CPU: %s.  Processor #%d.\n", sysModel (), sysProcNumGet ());
-    printf ("                              ");
-    printf ("Memory Size: 0x%x.", (UINT)(sysMemTop () - (char *)LOCAL_MEM_LOCAL_ADRS));
-    printf ("  BSP version " BSP_VERSION BSP_REV ".");
-#if defined(INCLUDE_WDB) && defined(INCLUDE_WDB_BANNER)
-    printf ("\n                             ");
-    printf ("WDB: %s.",
-	    ((wdbRunsExternal () || wdbRunsTasking ()) ?
-		 "Ready" : "Agent configuration failed") );
-#endif /*INCLUDE_WDB && INCLUDE_WDB_BANNER*/
-    printf ("\n\n");
-
-#ifdef	INCLUDE_STARTUP_SCRIPT			/* run a startup script */
-    if (sysBootParams.startupScript [0] != EOS)
-	usrStartupScript (sysBootParams.startupScript);
-#endif	/* INCLUDE_STARTUP_SCRIPT */
-
-    shellInit (SHELL_STACK_SIZE, TRUE);		/* create the shell */
-
-
-    /* only include the simple demo if the shell is NOT included */
-
-#else
-#if defined(INCLUDE_DEMO)			/* create demo w/o shell */
-    taskSpawn ("demo", 20, 0, 2000, (FUNCPTR)usrDemo, 0,0,0,0,0,0,0,0,0,0);
-#endif						/* mips cpp no elif */
-
-#endif	/* INCLUDE_SHELL */
-
-#ifdef  INCLUDE_UGL
-    usrUglInit ();
-#endif  /* INCLUDE_UGL */
-
-#if defined(INCLUDE_JAVA)
-    javaConfig ();
-#endif	/* INCLUDE_JAVA */
-
-#ifdef INCLUDE_HTML
-    usrHtmlInit ();
-#endif /* INCLUDE_HTML */
-
-#if CPU==SIMNT
-    win_ReleaseMutex(simUpMutex);
-#endif
-
-#ifdef INCLUDE_USER_APPL
-    /* Startup the user's application */
-
-    USER_APPL_INIT;	/* must be a valid C statement or block */
-#endif
-#if (SINQHM_SPAWN != 0)
-    printf ("Spawning SinqHM_bootParamsConfig ...\n");
-    taskSpawn ("hmConfig", 100, VX_FP_TASK, 20000,
-			(FUNCPTR) SinqHM_bootParamsConfig,
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-	/*------------------------------------------------------------------*/
-#endif	    /* (SINQHM_SPAWN != 0) */
-
-    }
-
-/*******************************************************************************
-*
-* usrClock - user-defined system clock interrupt routine
-*
-* This routine is called at interrupt level on each clock interrupt.
-* It is installed by usrRoot() with a sysClkConnect() call.
-* It calls all the other packages that need to know about clock ticks,
-* including the kernel itself.
-*
-* If the application needs anything to happen at the system clock interrupt
-* level, it can be added to this routine.
-*
-* RETURNS: N/A
-*/
-
-void usrClock ()
-
-    {
-    tickAnnounce ();	/* announce system tick to kernel */
-    }
-
-#ifdef	INCLUDE_DEMO
-
-/********************************************************************************
-* usrDemo - example application without shell
-*
-* This routine is spawned as a task at the end of usrRoot(), if INCLUDE_DEMO
-* is defined, and INCLUDE_SHELL is NOT defined in configAll.h or config.h.
-* It is intended to indicate how a shell-less application can be linked,
-* loaded, and ROMed.
-*
-* NOMANUAL
-*/
-
-void usrDemo (void)
-
-    {
-    char string [40];
-
-    printf ("VxWorks (for %s) version %s.\n", sysModel (), vxWorksVersion);
-    printf ("Kernel: %s.\n", kernelVersion ());
-    printf ("Made on %s.\n", creationDate);
-
-    FOREVER
-        {
-        printf ("\nThis is a test.  Type something: ");
-        fioRdString (STD_IN, string, sizeof (string));
-	printf ("\nYou typed \"%s\".\n", string);
-
-	if (strcmp (string, "0") == 0)
-	    memShow (0);
-
-	if (strcmp (string, "1") == 0)
-	    memShow (1);
-        }
-    }
-
-#endif	/* INCLUDE_DEMO */
diff --git a/sinqhm/vmio10_def.h b/sinqhm/vmio10_def.h
deleted file mode 100755
index 8327675a..00000000
--- a/sinqhm/vmio10_def.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef	    VMIO10_DEF_ID
-#define	    VMIO10_DEF_ID   "V01A"
-/*=================================================== [...SINQHM]VMIO10_DEF.H
-**
-**	Definition Include file for VMIO10 VME Module.
-**
-**  The module has 2 Z8536-CIO chips, each of which has 2 I/O ports (A and B)
-**  and 3 counter/timer registers. Hence, the module has 4 I/O ports and
-**  6 counter/timers. Just to confuse things, we call the 4 ports A, B, C and D!
-**  Ports A & B are associated with the first Z8536-CIO and Ports C & D are
-**  associated with the second Z8536-CIO.
-**------------------------------------------------------------------------------
-**	    VME offsets for the first Z8536-CIO.
-*/
-#define	VMIO_PORT_AB	0x01
-#define	VMIO_PORT_B	0x11
-#define	VMIO_PORT_A	0x21
-#define	VMIO_AB_CNTL	0x31
-/*
-**	    VME offsets for the second Z8536-CIO.
-*/
-#define	VMIO_PORT_CD	0x09
-#define	VMIO_PORT_D	0x19
-#define	VMIO_PORT_C	0x29
-#define	VMIO_CD_CNTL	0x39
-/*
-**	    Z8536-CIO register definitions
-*/
-#define Z8536_MICR	0x00	/* Master Interrupt Control Register */
-#define	Z8536_MCCR	0x01	/* Master Config Control Register */
-
-#define Z8536_DPPR_A	0x22	/* Data Path Polarity Register - Port A */
-#define Z8536_DPPR_B	0x2a	/* Data Path Polarity Register - Port B */
-#define Z8536_DPPR_C	0x05	/* Data Path Polarity Register - Port C */
-
-#define Z8536_DDR_A	0x23	/* Data Direction Register - Port A */
-#define Z8536_DDR_B	0x2b	/* Data Direction Register - Port B */
-#define Z8536_DDR_C	0x06	/* Data Direction Register - Port C */
-
-#define Z8536_SIOCR_A	0x24	/* Special I/O Control Register - Port A */
-#define Z8536_SIOCR_B	0x2c	/* Special I/O Control Register - Port B */
-#define Z8536_SIOCR_C	0x07	/* Special I/O Control Register - Port C */
-/*======================================================= End of VMIO10_DEF.H */
-#endif
diff --git a/sinqhm/vmio_utility.c b/sinqhm/vmio_utility.c
deleted file mode 100755
index 56f285f8..00000000
--- a/sinqhm/vmio_utility.c
+++ /dev/null
@@ -1,307 +0,0 @@
-#define	    ident	"1A01"
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     Computing Section                        |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Module Name  . . . . . . . . : [...SINQHM]VMIO_UTILITY.C
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Mar 1997
-**
-** Updates:
-**  1A01  14-Mar-1997 DM	    Initial version.
-**---------------------------------------------------------------------------
-**  VMIO_UTILITY.C is a set of routines for setting up and using a VMIO10.
-**
-**  To compile this program for VxWorks on PSS123, use:
-**
-	    ccvx vmio_utility.c
-** where
-	    ccvx = ccppc -O0		    \
-		    -mcpu=603		    \
-		    -I${WIND_BASE}/target/h \
-		    -fno-builtin	    \
-		    -fno-for-scope	    \
-		    -nostdinc		    \
-		    -DCPU=PPC603	    \
-		    -D_GNU_TOOL		    \
-		    -gdwarf -c -Wimplicit
-
-**  and, on the target,
-**
-**   -> ld < vmio_utility.o
-**====================================================================
-*/
-#include    <vxWorks.h>
-#include    <taskLib.h>
-#include    <sysLib.h>
-#include    <vme.h>
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <signal.h>
-#include    <setjmp.h>
-
-#include    "vmio10_def.h"
-/*
-**====================	Global Definitions =====================================
-*/
-#define	    NIL		    0x00
-
-#define	    DFLT_BASE_ADDR  0x1900
-/*
-**====================	Global Variables =====================================
-*/
-  char	    *VmioBase;
-  char	    Vme_dummy[256];	/* Dummy array - used only when VME access ..
-				** .. is disabled. */
-  char	    Null = 0x00;
-  char	    Bit8 = 0x10;
-  int	    My_errno;
-  int	    Go_on;
-  int	    Signal_has_happened;
-  jmp_buf   Trap_env;
-/*
-
-**=============================================================================
-**  Local routines.
-**				    Forward references ...
-*/
-    void    vmio_byte_send (char bit8, char lobits);
-    void    vmio_enable (int ab_enbl, int bc_enbl);
-    void    vmio_pol_dir (int a_pol, int a_dir,
-			  int b_pol, int b_dir,
-			  int c_pol, int c_dir,
-			  int d_pol, int d_dir);
-    void    vmio_reset ();
-    void    vmio_send (char nbytes, char *buff);
-    void    vmio_transp_init ();
-/*
-**-----------------------------------------------------------------*/
-  void	Signal_Handler (int sigint) {
-/*	==============
-*/
-    Signal_has_happened = 1;
-    printf ("Got into Signal_Handler\n");
-    longjmp (Trap_env, 1);
-  }
-/*
-**-----------------------------------------------------------------*/
-  void	vmio_byte_send (char bit8, char lobits) {
-/*	==============
-**			    Send a byte (well, 9 bits really) via the VMIO10.
-*/
-    char    aux;
-
-    do {				/* Wait for Output Reg. empty */
-      VmioBase[VMIO_AB_CNTL] = 0X09;	/* Select Port B status reg .. */
-      aux = VmioBase[VMIO_AB_CNTL];	/* .. and read it. */
-    } while ((aux & 0x08) == 0);	/* Test its "empty" bit */
-
-    VmioBase[VMIO_PORT_C] = bit8;		/* Send Bit-8 */
-    VmioBase[VMIO_PORT_B] = lobits;		/* Output the other bits */
-  }
-/*
-**-----------------------------------------------------------------*/
-  void	vmio_enable (int ab_enbl, int bc_enbl) {
-/*	===========
-**			output/input enable for IC6 ,IC7
-*/
-    VmioBase[VMIO_AB_CNTL] = Z8536_MCCR; /* Select Master Config Control Reg */
-    VmioBase[VMIO_AB_CNTL] = ab_enbl;
-
-    VmioBase[VMIO_CD_CNTL] = Z8536_MCCR;
-    VmioBase[VMIO_CD_CNTL] = bc_enbl;
-  }
-/*
-**-----------------------------------------------------------------*/
-  void	vmio_pol_dir (
-/*	============		Set Polarity and Direction of VMIO10 Module
-**				A, B, C and D registers.
-**				Polarity  bit = 0 for non-inverting.
-**				Direction bit = 0 for output.
-*/		    int	a_pol,
-		    int a_dir,
-		    int	b_pol,
-		    int b_dir,
-		    int	c_pol,
-		    int c_dir,
-		    int	d_pol,
-		    int d_dir) {
-
-    VmioBase[VMIO_AB_CNTL] = Z8536_DPPR_A; /* Port A %10'0010, Data Path Pol */
-    VmioBase[VMIO_AB_CNTL] = a_pol;
-    VmioBase[VMIO_AB_CNTL] = Z8536_DDR_A;  /* Port A %10'0011, Data Direction */
-    VmioBase[VMIO_AB_CNTL] = a_dir;
-	
-    VmioBase[VMIO_AB_CNTL] = Z8536_DPPR_B; /* Port B %10'1010, Data Path Pol */
-    VmioBase[VMIO_AB_CNTL] = b_pol;
-    VmioBase[VMIO_AB_CNTL] = Z8536_DDR_B;  /* Port B %10'1011, Data Direction */
-    VmioBase[VMIO_AB_CNTL] = b_dir;
-	
-    VmioBase[VMIO_CD_CNTL] = Z8536_DPPR_A; /* Port C %10'0010, Data Path Pol */
-    VmioBase[VMIO_CD_CNTL] = c_pol;
-    VmioBase[VMIO_CD_CNTL] = Z8536_DDR_A;  /* Port C %10'0011, Data Direction */
-    VmioBase[VMIO_CD_CNTL] = c_dir;
-
-    VmioBase[VMIO_CD_CNTL] = Z8536_DPPR_B; /* Port D %10'1010, Data Path Pol */
-    VmioBase[VMIO_CD_CNTL] = d_pol;
-    VmioBase[VMIO_CD_CNTL] = Z8536_DDR_B;  /* Port D %10'0011, Data Direction */
-    VmioBase[VMIO_CD_CNTL] = d_dir;
-  }
-/*
-**-----------------------------------------------------------------*/
-  void	vmio_reset () {
-/*	==========
-**			    Software reset for VMIO10 module
-*/
-    char    aux;
-		/*
-		** Start by forcing the state machine into State 0
-		*/
-    aux = VmioBase[VMIO_AB_CNTL];    /* Read Cntrl to ensure not State 1 */
-    VmioBase[VMIO_AB_CNTL] = NIL;    /* Write zero to Cntrl to ensure not in ..
-				     ** .. "Reset State" */
-    aux = VmioBase[VMIO_AB_CNTL];    /* Read Cntrl to ensure State 0 */
-
-    VmioBase[VMIO_AB_CNTL] = Z8536_MICR; /* Select the Master Int Ctrl Reg */
-    VmioBase[VMIO_AB_CNTL] = 0x01;	 /* Set the reset bit */
-    VmioBase[VMIO_AB_CNTL] = NIL;	 /* Then clear it to complete reset */
-		/*
-		** Repeat for the other Z8536-CIO
-		*/
-    aux = VmioBase[VMIO_CD_CNTL];
-    VmioBase[VMIO_CD_CNTL] = NIL;
-    aux = VmioBase[VMIO_CD_CNTL];
-
-    VmioBase[VMIO_CD_CNTL] = Z8536_MICR;
-    VmioBase[VMIO_CD_CNTL] = 0x01;
-    VmioBase[VMIO_CD_CNTL] = NIL;
-  }
-/*
-**-----------------------------------------------------------------*/
-  void	vmio_send (
-/*	=========			Send bytes to the LWL.
-*/		    char    nbytes,
-		    char    *buff) {
-/*
-**		The bytes are buff[0] to buff[nbytes-1]. buff[0] gives the
-**		headerbit for buff[1]. The remainder are sent with the 9th
-**		bit clear.
-*/
-    int	    i;
-    char    aux;
-		/*
-		** ---------- loop sending the bytes ---------------
-		*/
-    VmioBase[VMIO_PORT_C] = 0;			    /* Mode = 0 */
-
-    if (nbytes < 2) return;
-    vmio_byte_send (buff[0], buff[1]); /* 2 bytes define the first "LWL-byte" */
-
-    if (nbytes < 3) return;
-
-    for (i = 2; i < nbytes; i++) {     /* The remaining bytes have Bit-8 = 0 */
-      vmio_byte_send (NIL, buff[i]);
-    }
-  }
-/*
-**-----------------------------------------------------------------*/
-  void	vmio_transp_init () {
-/*	================
-**			Initialise VMIO10 ready for transparent
-**			transmission of data.
-*/
-		/*
-		** ---------- initialize i/o ---------------
-		*/
-    VmioBase[VMIO_AB_CNTL] = 0x28;	/* Port B output port-Mode Spec. Reg */
-    VmioBase[VMIO_AB_CNTL] = 0x80;
-    	
-    VmioBase[VMIO_AB_CNTL] = 0x29;	/* Port B handshake interlock */
-    VmioBase[VMIO_AB_CNTL] = 0x00;
-  }
-/*==============================================================================
-
-**  Main line program
-**  ------------------
-**============================================================================*/
-  int vmio_utility (char *base_addr) {
-/*============================================================================*/
-    STATUS	    status;
-    int		    i;
-    char	    aux;
-    void	    (* sig_status) (int);
-/*============================================================================
-**	Perform the initialisation of global variables ...
-*/
-
-/*============================================================================
-**		Get the VME base address of the Test Generator Module.
-**		If the argument "base_addr" is zero, use DFLT_BASE_ADDR.
-*/
-    if (base_addr == NULL) base_addr = (char *) DFLT_BASE_ADDR;
-
-#ifdef _NO_VME
-    printf ("VMIO_UTILITY: Warning, VME access disabled.\n");
-    VmioBase = &Vme_dummy[0];
-#else
-    status = sysBusToLocalAdrs (VME_AM_USR_SHORT_IO, base_addr, &VmioBase);
-    if (status != OK) {
-      printf ("Error status from sysBusToLocalAdrs\n");
-      return ERROR;
-    }
-#endif
-	/*
-	** See if the module is present
-	*/
-    Signal_has_happened = 0;
-    sig_status = signal (SIGBUS, Signal_Handler);   /* Catch machine checks */
-    if (sig_status == SIG_ERR) {
-      printf ("    Problem setting up a signal handler!\n");
-      return ERROR;
-    }
-    i = setjmp (Trap_env);
-    if (i == 0) aux = VmioBase[VMIO_AB_CNTL];
-    if (Signal_has_happened != 0) {
-      printf ("VMIO10 Module not present -- exiting!\n");
-      return ERROR;
-    }
-	/*
-	** Reset the VMIO10 Module.
-	*/
-    vmio_reset ();
-	/*
-	** Set Ports A, B, C and D to non-inverting and output
-	*/
-    vmio_pol_dir (NIL, NIL,	/* Port A */
-		  NIL, NIL,	/* Port B */
-		  NIL, NIL,	/* Port C */
-		  NIL, NIL);	/* Port D */
-	/*
-	** Enable Ports A, B, C and D.
-	*/
-    vmio_enable (0x84, 0x84);
-
-    Go_on = 0;
-
-    for (;;) {
-      for (i=0; i<1000; i++) {}
-      if (Go_on != 0) break;
-      VmioBase[VMIO_PORT_A] = 0xff;
-      VmioBase[VMIO_PORT_A] = 0x00;
-      VmioBase[VMIO_PORT_A] = 0xff;
-      VmioBase[VMIO_PORT_A] = 0x00;
-      VmioBase[VMIO_PORT_A] = 0xff;
-      VmioBase[VMIO_PORT_A] = 0x00;
-    }
-    printf ("Vmio_Utility exiting\n");
-    return OK;
-  }
-/*===================================== End of VMIO_UTILITY.C =============*/
diff --git a/sinqhmdriv.c b/sinqhmdriv.c
deleted file mode 100644
index 0aec462f..00000000
--- a/sinqhmdriv.c
+++ /dev/null
@@ -1,1171 +0,0 @@
-/*---------------------------------------------------------------------------
-
-			S I N Q H M D R I V
-			
-   This is the SICS driver to the SINQ histogram memory.
-   
-   Mark Koennecke, April 1997
-   
-       Copyright:
-
-       Labor fuer Neutronenstreuung
-       Paul Scherrer Institut
-       CH-5423 Villigen-PSI
-
-
-      The authors hereby grant permission to use, copy, modify, distribute,
-      and license this software and its documentation for any purpose, provided
-      that existing copyright notices are retained in all copies and that this
-      notice is included verbatim in any distributions. No written agreement,
-      license, or royalty fee is required for any of the authorized uses.
-      Modifications to this software may be copyrighted by their authors
-      and need not follow the licensing terms described here, provided that
-      the new terms are clearly indicated on the first page of each file where
-      they apply.
-
-      IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-      FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-      ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-      DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-      POSSIBILITY OF SUCH DAMAGE.
-
-      THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-      INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-      FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-      IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-      NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-      MODIFICATIONS.
-
-      Modified to work without counter in slave mode.
-      Mark Koennecke, January 2001
-
-----------------------------------------------------------------------------*/
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <math.h>
-#include "fortify.h"
-#include "sics.h"
-#include "countdriv.h"
-#include "counter.h"
-#include "HistMem.h"
-#include "hardsup/sinqhm.h"
-#include "hardsup/sinqhm.i" /* for byte switching stuff */
-#include "stringdict.h"
-#include "HistDriv.i"
-#include "sinqhmdriv.i"
-/*-----------------------------------------------------------------------*/
-  static void PrintHMError(char *text, SConnection *pCon)
-  {
-     char pBueffel[1064];
-     
-     strcpy(pBueffel,"ERROR: Histogram Memory --> ");
-     strcat(pBueffel,text);
-     SCWrite(pCon,pBueffel,eError);
-  }
-/*-------------------------------------------------------------------------*/
-  static void ErrInit(SinqHMDriv *self)
-  {
-    self->iLastHMError = 0;
-    self->iLastCTError = 0;
-  }
-/*------------------------------------------------------------------------*/
-  static char *pHistMode[] = {
-                               "transparent",
-                               "normal",
-                               "tof",
-                               "strobo",
-                               "hrpt",
-                               "psd",
-                               "sanstof",
-                               NULL
-                             };
-
- static HistMode Text2Mode(char *text)
- {
-    int i = 0;
-    
-    while(pHistMode[i] != NULL)
-    {
-       if(strcmp(pHistMode[i],text) == 0)
-       {
-         return i;
-       }
-       i++;
-    } 
-    /* not found */
-    return -1;      
- }
-/*------------------------------------------------------------------------*/
-  static char *pFlowMode[] = {
-                               "ignore",
-                               "ceil",
-                               "count",
-                               "reflect",
-                               NULL
-                             };
-
- static OverFlowMode Text2Flow(char *text)
- {
-    int i = 0;
-    
-    while(pFlowMode[i] != NULL)
-    {
-       if(strcmp(pFlowMode[i],text) == 0)
-       {
-         return i;
-       }
-       i++;
-    } 
-    /* not found */
-    return -1;      
- }
-/*--------------------------------------------------------------------------
-  Configure deconfigures first, in order to have a clean state. Than the HM
-  is configured and a client connection will be built. Configure requires, 
-  that the pSINQHM data structure has been initialised by CreateSINQHMDriver.
-  */
-  
-  static int SQConfigure(pHistDriver self, SConnection *pCon,
-                         pStringDict pOpt, SicsInterp *pSics)
-  {
-     SinqHMDriv *pInternal;
-     int status, iMode;
-     char pError[132];
-     char pHMComputer[256], pValue[80], pBueffel[256];
-     float fVal;
-     char pcCounter[256];
-     CommandList *pCom = NULL;
-     int iStart = 0;
-     int iInit = 0, i, iRet;
-     int xOff, xFac, yOff, yFac;
-     int iPort, iLength;
-     int extraDetectors, noDet;
-     
-     assert(self);
-     assert(self->pPriv);
-     assert(pCon);
-     assert(pOpt);
-     
-     pInternal = (SinqHMDriv *)self->pPriv;
-     ErrInit(pInternal);
-
-
-      /* enter histmode */
-      iRet = StringDictGet(pOpt,"histmode",pValue,79);
-      if(!iRet)
-      {
-        SCWrite(pCon,"ERROR: internal Value not found!",eError);
-        return 0;
-      }      
-      strtolower(pValue);
-      iRet = Text2Mode(pValue);
-      if(iRet < 0)
-      {
-        sprintf(pBueffel,"ERROR: Invalid parameter %s to HistMode",pValue);
-        SCWrite(pCon,pBueffel,eError);
-        return 0;
-      }
-      pInternal->eHistMode = iRet;
-
-      /* handle overflowmode */
-      iRet = StringDictGet(pOpt,"overflowmode",pValue,79);
-      if(!iRet)
-      {
-        SCWrite(pCon,"ERROR: internal Value not found!",eError);
-        return 0;
-      }      
-      strtolower(pValue);
-      iRet = Text2Flow(pValue);
-      if(iRet < 0)
-      {
-        sprintf(pBueffel,"ERROR: Invalid parameter %s to OverflowMode",pValue);
-        SCWrite(pCon,pBueffel,eError);
-        return 0;
-      }
-      pInternal->eFlow = iRet;
-
-      /* BinWidth */
-      iRet = StringDictGetAsNumber(pOpt,"binwidth",&fVal);
-      if(!iRet)
-      {
-        iRet = StringDictGet(pOpt,"binwidth",pValue,79);
-        if(iRet)
-        {
-             sprintf(pBueffel,"ERROR: %s not valid for BinWidth ",pValue);
-             SCWrite(pCon,pBueffel,eError);
-             return 0;
-        }
-        else
-        {
-           SCWrite(pCon,"ERROR: internal Value not found!",eError);
-           return 0;
-        }     
-      }      
-      if(fVal < 1)
-      {
-        sprintf(pBueffel,"ERROR: %f is invalid for BinWidth",fVal);
-        SCWrite(pCon,pBueffel,eError);
-        return 0;
-      }
-      pInternal->iBinWidth = (int)fVal;
-
-      /*
-	extra detectors
-      */
-      iRet = StringDictGet(pOpt,"extradetector",pValue,79);
-      if(iRet)
-      {
-	extraDetectors = atoi(pValue);
-      }  
-      else
-      {
-	extraDetectors = 0;
-      }
-      pInternal->extraDetector = extraDetectors;
-    
-
-
-     /* check BinWidth */
-     if( (pInternal->iBinWidth != 1) && (pInternal->iBinWidth != 2)
-         && (pInternal->iBinWidth != 4))
-     {
-       PrintHMError("Unsuported BinWidth specified, 1,2,4 are permissable",pCon);
-       return 0;
-     }    
-     
-     /* if not initialised, analyze options database for the stuff we need*/
-     if(pInternal->pMaster == NULL)
-     {
-        iStart = 1;
-        /* the histogram memory */
-        status = StringDictGet(pOpt,"hmcomputer",pHMComputer,254);
-        if(!status)
-        {
-          PrintHMError("No network name for histogram memory computer found",pCon);
-          return 0;
-        }
-        status = StringDictGetAsNumber(pOpt,"hmport",&fVal);
-        if(!status)
-        {
-          PrintHMError("No network name for histogram memory computer found",pCon);
-          return 0;
-        }
-        iPort = (int)fVal;        
-        
-        /* the counter */
-        status = StringDictGet(pOpt,"counter",pcCounter,254);
-        if(!status)
-        {
-          SCWrite(pCon,"WARNING: no counter control found for this HM",
-                  eWarning);
-          pInternal->pCounter = NULL;
-        }
-        else
-	{
-           pCom = FindCommand(pSics,pcCounter);
-           if(!pCom)
-           {
-              PrintHMError("WARNING: no counter for HM found! ",
-                          pCon);
-              pInternal->pCounter = NULL;
-           }
-           else
-	   {
-	      pInternal->pCounter = (pCounter)pCom->pData;
-	      if(!pInternal->pCounter->pDes->GetInterface(pInternal->pCounter,
-		 COUNTID))
-	      {
-		 PrintHMError("Counter for histogram memory is invalid",
-			     pCon);
-		 return 0;
-	      }
-           }
-	}
-        /* ok! put in HM */
-        pInternal->pMaster = CreateSINQHM(pHMComputer,iPort);
-        if(!pInternal->pMaster)
-        {
-          PrintHMError("No memory to allocate SINQHM",pCon);
-          return 0;
-        }
-     }
-     else
-     {
-        /* close the connection if there is such a thing */
-        SINQHMCloseDAQ(pInternal->pMaster);
-     }
-     
-     /* in any case let us propagate the state of affairs to 
-        SINQHM
-     */     
-     
-     SINQHMSetPar(pInternal->pMaster,self->data->rank, 
-		  getHMDataLength(self->data), 
-		  pInternal->iBinWidth);
-
-     
-     /* actual configuration. On first call, check for flag INIt in
-        options. We do need to configure, if the HM has configured
-        itself already. What is does, these days.
-     */   
-     if(iStart)
-     {
-        status = StringDictGetAsNumber(pOpt,"init",&fVal);
-        if(!status)
-        {
-           iInit = 0;
-        }
-        else
-        {
-          if(fVal > 0.9 )
-          {
-            iInit = 1;
-          }
-        }
-     }
-            
-     if(iInit == 0)
-     {
-        /* do a deconfig first */
-        status = SINQHMDeconfigure(pInternal->pMaster,1);
-        if(status < 0)
-        {
-           SINQHMError2Text(status, pError,131);
-           PrintHMError(pError,pCon);
-           return 0;
-        }
-     
-        if( (pInternal->iBinWidth != 1) && (pInternal->iBinWidth != 2)
-            && (pInternal->iBinWidth != 4))
-        {
-           PrintHMError("Unsuported BinWidth specified, 1,2,4 are permissable",
-pCon);
-           return 0;
-        }    
-         
-  
-        /* configure */
-        switch(pInternal->eHistMode)
-        {
-          case eHTransparent:
-                 iMode = SQHM__TRANS;
-                 break;
-          case eHNormal:
-                iMode = SQHM__HM_DIG;
-                break;
-           case eHTOF:
-	   case eSANSTOF:
-                iMode = SQHM__TOF;
-                /* recalculate some parameters */
-                noDet  = 1;
-                for(i = 0; i < self->data->rank; i++)
-                {
-                  noDet *= self->data->iDim[i];
-                }  
-		noDet += extraDetectors;
-                iLength = noDet*self->data->nTimeChan;
-                SINQHMDefineBank(pInternal->pMaster,0,0,noDet,
-                                   self->data->timeBinning,
-				 self->data->nTimeChan);
-                break;
-           case eHStrobo:
-                iMode = SQHM__HM_PSD | SQHM__STROBO;
-                break;
-	   case eHRPT:
-	        iMode = SQHM__HRPT;
-                break;
-	   case ePSD:
-	     iMode = SQHM__HM_PSD;
-             break;
-           default:
-                PrintHMError("Unsupported mode requested",pCon);
-                return 0;
-        }
-        switch(pInternal->eFlow)
-        {
-             case eOIgnore:
-                  iMode  = iMode | SQHM__BO_IGN;
-                  break;
-             case eOCeil:
-                  iMode = iMode | SQHM__BO_SMAX;
-                  break;
-             case eOCount:
-                  iMode = iMode | SQHM__BO_CNT;
-                  break;
-	     case eReflect:
-                  iMode = iMode | SQHM__REFLECT;
-                  break;
-             default:
-                  PrintHMError("Unsupported overflowmode requested",pCon);
-                  return 0;
-       }
-	if(pInternal->eHistMode  != ePSD)
-	{
-           status = SINQHMConfigure(pInternal->pMaster,
-                                  iMode,
-                                  self->data->rank,
-                                  getHMDataLength(self->data) + 
-				    extraDetectors*self->data->nTimeChan ,
-                                  pInternal->iBinWidth,
-                                  0,0);
-	}
-        else
-        {
-          status = StringDictGetAsNumber(pOpt,"xoff",&fVal);
-          if(!status)
-          {
-              PrintHMError(
-               "No xOff value for PSD mode found",pCon);
-              return 0;
-          }
-          xOff = (int)fVal;
-          status = StringDictGetAsNumber(pOpt,"xfac",&fVal);
-          if(!status)
-          {
-              PrintHMError(
-               "No xFac value for PSD mode found",pCon);
-              return 0;
-          }
-          xFac = (int)fVal;
-          status = StringDictGetAsNumber(pOpt,"yoff",&fVal);
-          if(!status)
-          {
-              PrintHMError(
-               "No yOff value for PSD mode found",pCon);
-              return 0;
-          }
-          yOff = (int)fVal;
-          status = StringDictGetAsNumber(pOpt,"yfac",&fVal);
-          if(!status)
-          {
-              PrintHMError(
-               "No yFac value for PSD mode found",pCon);
-              return 0;
-          }
-          yFac = (int)fVal;
-          /* xSize and ySize are supposed to be in dim */
-          status = SINQHMConfigurePSD(pInternal->pMaster,
-                                      iMode,
-                                      self->data->iDim[0],     
-                                      xOff,
-                                      xFac,
-                                      self->data->iDim[1],
-                                      yOff,
-                                      yFac,
-                                      pInternal->iBinWidth,
-                                      self->data->timeBinning,
-                                      self->data->nTimeChan);
-        }
-
-       if(status < 0)
-       {
-          SINQHMError2Text(status, pError,131);
-          PrintHMError(pError,pCon);
-          return 0;
-       }
-     }
-
-     /* initiate a client connection for DAQ */
-     status = SINQHMOpenDAQ(pInternal->pMaster);
-     if(status < 0)
-     {
-        SINQHMError2Text(status, pError,131);
-        PrintHMError(pError,pCon);
-        return 0;
-     }
-                                   
-     /* tell the counter box our current status */
-     if(pInternal->pCounter != NULL)
-     {
-        SetCounterMode(pInternal->pCounter,self->eCount);
-        SetCounterPreset(pInternal->pCounter,self->fCountPreset);
-     }
-
-     self->iReconfig = 0;
-     return 1;
-  }   
-/*--------------------------------------------------------------------------*/
-  static int SQStart(pHistDriver self, SConnection *pCon)
-  {
-     SinqHMDriv *pInternal;
-     pICountable pCountInt = NULL;
-     int status, iMode, nHist, length;
-     char pError[132];
-
-     assert(self);
-     assert(pCon);
-     assert(self->pPriv);
-     
-     pInternal = self->pPriv;
-
-     /* tell the counter box our current status */
-     if(pInternal->pCounter != NULL)
-     {
-         SetCounterMode(pInternal->pCounter,self->eCount);
-         pInternal->pCounter->pDriv->fPreset = self->fCountPreset;
-     }
-
-     /* first zero the HM */
-     if(pInternal->eHistMode == ePSD && self->data->nTimeChan > 2){
-       /*
-	 this is special for AMOR and should be replaced by -1, -1, -1
-	 logic ASAP
-       */
-       nHist = (self->data->iDim[0]*self->data->iDim[1] + 2) * 
-	 self->data->nTimeChan;
-       status = SINQHMZero(pInternal->pMaster,-1,-1,-1);
-     }else{ 
-       length = getHMDataLength(self->data);
-       if(pInternal->extraDetector > 0 && isInTOFMode(self->data) ) {
-	 length += pInternal->extraDetector*getNoOfTimebins(self->data);
-       }
-       status = SINQHMZero(pInternal->pMaster,-1,0,
-			   length);
-     }
-     /*
-     status = SINQHMZero(pInternal->pMaster,-1,-1,-1);
-     */
-     if(status < 0)
-     {
-        pInternal->iLastHMError = status;
-        return HWFault;
-     }
-     
-     /* start the HM */
-     status = SINQHMStartDAQ(pInternal->pMaster);
-     if( (status < 0) && (status != DAQ_INHIBIT) )
-     {
-        pInternal->iLastHMError = status;
-        return HWFault;
-     }
-
-     /*
-       When SICS was interrupted while the measurement was paused
-       the inhibit flag may still be set. We clear this here in order to 
-       fix this bug.
-     */
-     status = SINQHMContinueDAQ(pInternal->pMaster);
-     if( (status < 0) && (status != DAQ_INHIBIT) )
-     {
-        pInternal->iLastHMError = status;
-        return HWFault;
-     }
-
-     
-     /* start the El737 counter */
-     if(pInternal->pCounter != NULL)
-     {
-         pCountInt = pInternal->pCounter->pDes->GetInterface(
-                                          pInternal->pCounter,
-                                                         COUNTID);
-         if(pCountInt)
-         {                                                    
-            return pCountInt->StartCount(pInternal->pCounter,pCon);          
-         }
-     }
-     return 1;  
-  }
-/*--------------------------------------------------------------------------*/
-  static int SQPause(pHistDriver self, SConnection *pCon)
-  {
-     SinqHMDriv *pInternal;
-     pICountable pCountInt = NULL;
-     int status, iMode;
-     char pError[132];
-
-     assert(self);
-     assert(pCon);
-     assert(self->pPriv);
-     
-     pInternal = self->pPriv;
-
-     /* pause the HM */
-     status = SINQHMInhibitDAQ(pInternal->pMaster);
-     if( (status < 0) && (status != DAQ_INHIBIT) )
-     {
-        pInternal->iLastHMError = status;
-        return HWFault;
-     }
-     
-     /* pause the El737 counter */
-     if(pInternal->pCounter != NULL)
-     {
-        pCountInt = pInternal->pCounter->pDes->GetInterface(
-                                         pInternal->pCounter,
-                                                         COUNTID);
-        if(pCountInt)
-        {                                                    
-            return pCountInt->Pause(pInternal->pCounter,pCon);          
-        }
-     }
-     return 1;  
-  }
-/*--------------------------------------------------------------------------*/
-  static int SQContinue(pHistDriver self, SConnection *pCon)
-  {
-     SinqHMDriv *pInternal;
-     pICountable pCountInt = NULL;
-     int status, iMode;
-     char pError[132];
-
-     assert(self);
-     assert(pCon);
-     assert(self->pPriv);
-     
-     pInternal = self->pPriv;
-
-     /* continue the HM */
-     status = SINQHMContinueDAQ(pInternal->pMaster);
-     if( (status < 0) && (status != DAQ_INHIBIT) )
-     {
-        pInternal->iLastHMError = status;
-        return HWFault;
-     }
-     
-     /* continue the El737 counter */
-     if(pInternal->pCounter != NULL)
-     {
-         pCountInt = pInternal->pCounter->pDes->GetInterface(
-                                                         pInternal->pCounter,
-                                                         COUNTID);
-         if(pCountInt)
-         {                                                    
-             return pCountInt->Continue(pInternal->pCounter,pCon);          
-         }
-     }
-     return 1;  
-  }
-/*--------------------------------------------------------------------------*/
-  static int SQHalt(pHistDriver self)
-  {
-     SinqHMDriv *pInternal;
-     pICountable pCountInt = NULL;
-     int status, iRet;
-     char pError[132];
-
-     assert(self);
-     assert(self->pPriv);
-     
-     pInternal = self->pPriv;
-     iRet = 1;
-
-     /* Halt HM */
-     status = SINQHMStopDAQ(pInternal->pMaster);  
-     if(status < 0)
-     {
-        iRet = 0;
-     }
-     
-     /* Halt counter */
-     if(pInternal->pCounter != NULL)
-     {
-            pCountInt = pInternal->pCounter->pDes->GetInterface(
-                                                         pInternal->pCounter,
-                                                         COUNTID);
-            if(pCountInt)
-            {                                                    
-                  status = pCountInt->Halt(pInternal->pCounter);
-                  if(!status)
-                  {
-                     iRet = 0;
-                  }
-                  else 
-		  {
-		    iRet = 1;
-                  }
-	    } 
-           return iRet;
-     }
-     return 1;      
-  }
-/*---------------------------------------------------------------------------*/
-  static int SQStatus(pHistDriver self, SConnection *pCon)
-  {
-     SinqHMDriv *pInternal;
-     pICountable pCountInt = NULL;
-     int status, iRet;
-     char pError[132];
-     int iMode, iRank, iLength, iDaq, iBin, iClient;
-     float fControl;
-
-     assert(self);
-     assert(self->pPriv);
-     
-     pInternal = self->pPriv;
-
-     /* first check at counter */
-     if(pInternal->pCounter != NULL)
-     {
-         pCountInt = pInternal->pCounter->pDes->GetInterface(
-                                                         pInternal->pCounter,
-                                                         COUNTID);
-	 if(pCountInt)
-	 {                                                    
-	    status = pCountInt->CheckCountStatus(pInternal->pCounter,
-							    pCon);
-	    if( (status == HWFault)  )
-	    {
-	      return status;
-	    }
-	 }
-     }
-     
-     /* now check at HM */
-     iRet = SINQHMGetStatus(pInternal->pMaster,&iMode,&iDaq,
-                            &iRank, &iBin, &iLength, &iClient);
-     if(iRet < 0)
-     {
-        SINQHMError2Text(iRet, pError,131);
-        PrintHMError(pError,pCon);
-        return HWFault;
-     }
-     
-     if(iDaq == 2)
-     {
-       return HWPause;
-     }
-     /*
-     else if(iDaq == 1)
-     {
-       status = HWBusy;
-     } 
-     */    
-     else if(iDaq == 0)
-     {
-       status = HWIdle;
-     }
-                            
-     return status;                                     
-  }
-/*--------------------------------------------------------------------------*/
-  static int SQError(pHistDriver self, int *iCode, char *pError, int iErrLen)
-  {
-     SinqHMDriv *pInternal;
-
-     assert(self);
-     assert(self->pPriv);
-     
-     pInternal = self->pPriv;
-     
-     /* first check for HM errors */
-     if(pInternal->iLastHMError < 0)
-     {
-       SINQHMError2Text(pInternal->iLastHMError,pError,iErrLen);
-       *iCode = pInternal->iLastHMError;
-       return 1;
-     }
-     
-     /* now counter errors */
-     if(pInternal->pCounter != NULL)
-     {
-       return pInternal->pCounter->pDriv->GetError(pInternal->pCounter->pDriv,
-                                                iCode,
-                                                pError,
-                                                iErrLen);
-     }
-     else 
-     {
-       /* this can't be */
-       return 0;
-     }  
-  }
-/*--------------------------------------------------------------------------*/
-  static int SQFixIt(pHistDriver self, int iCode)
-  {
-     SinqHMDriv *pInternal;
-
-     assert(self);
-     assert(self->pPriv);
-     
-     pInternal = self->pPriv;
-     
-     /* check for HM Errors */
-     if(pInternal->iLastHMError < 0)
-     {
-        switch(iCode)
-        {
-          case RECEIVE_ERROR:
-          case INSUFFICIENT_DATA:
-               /* may happen after a bad command. Currently the HM-client
-                  dies in this stage. This should fix this.
-               */   
-               SINQHMCloseDAQ(pInternal->pMaster);
-               SINQHMOpenDAQ(pInternal->pMaster);
-               return COREDO;
-               break;
-          
-          case BYTE_ORDER_CHAOS:
-          case HIST_BAD_RECV:
-          case SEND_ERROR:
-               return COREDO;
-               break;
-               
-          default:
-                 return COTERM;
-        }
-     }
-     
-     /* do counter errors */
-     if(pInternal->pCounter != NULL)
-     {
-       return pInternal->pCounter->pDriv->TryAndFixIt(
-                                        pInternal->pCounter->pDriv,
-                                                    iCode);     
-     }
-     return COTERM;
-  }
-/*---------------------------------------------------------------------------*/
-  static int SQGetData(pHistDriver self, SConnection *pCon)
-  {
-     SinqHMDriv *pInternal;
-     pICountable pCountInt = NULL;
-     int iMode, iDaq, iRank, iBin, iLength, iClient, iRet;
-     char pError[132];
-
-     assert(self);
-     assert(self->pPriv);
-     
-     pInternal = self->pPriv;
-
-     /* now check at HM */
-     iRet = SINQHMGetStatus(pInternal->pMaster,&iMode,&iDaq,
-                            &iRank, &iBin, &iLength, &iClient);
-     if(iRet < 0)
-     {
-        SINQHMError2Text(iRet, pError,131);
-        PrintHMError(pError,pCon);
-        return HWFault;
-     }
-     
-     /* stop DAQ, if still active */
-     if(iDaq == 1)
-     {
-        SINQHMStopDAQ(pInternal->pMaster);
-     }
-
-
-     /* do only counter, histograms are read on demand */
-     if(pInternal->pCounter != NULL)
-     {
-          pCountInt = pInternal->pCounter->pDes->GetInterface(
-                                                         pInternal->pCounter,
-                                                         COUNTID);
-	  if(pCountInt)
-	  {                                                    
-	      return pCountInt->TransferData(pInternal->pCounter,
-						     pCon);
-	  }
-     }
-     return 1;                                                
-  }
-/*--------------------------------------------------------------------------*/
-  static int SQGetHistogram(pHistDriver self, SConnection *pCon,
-                            int iNum, int iStart, int iEnd,
-                            HistInt *plData)
-  {
-     SinqHMDriv *pInternal;
-     void *pData = NULL;
-     char *pPtr;
-     SQint16 *pPtr16;
-     SQint32 *pPtr32;
-     int i, iLen, iByte, status;
-     char pError[132];
-
-     assert(self);
-     assert(self->pPriv);
-     
-     pInternal = self->pPriv;
-
-     /* we do not need to do a lot of copying when datasizes match! */
-     iByte = (iEnd - iStart) * pInternal->iBinWidth;
-     if(pInternal->iBinWidth == sizeof(HistInt))
-     {
-        /* read HM */
-        status = SINQHMRead(pInternal->pMaster,
-                         iNum,iStart, iEnd, plData, iByte);  
-        if(status < 0)
-        {
-           SINQHMError2Text(status, pError,131);
-           PrintHMError(pError,pCon);
-           return 0;
-        }
-        return 1;
-     }
-
-     /* we need to convert datasizes: allocate storage */
-     pData = (void *)malloc(iByte*sizeof(char));
-     if(!pData)
-     {
-       PrintHMError("Out of memory in SinqHMDriv",pCon);
-       return 0;
-     }
-     memset(pData,0,iByte);
-       
-     /* read HM */
-     status = SINQHMRead(pInternal->pMaster,iNum,iStart, iEnd, pData, iByte);  
-     if(status < 0)
-     {
-        SINQHMError2Text(status, pError,131);
-        PrintHMError(pError,pCon);
-        return 0;
-     }
-
-     /* convert to correct datasize */
-     switch(pInternal->iBinWidth)
-     {
-       case 1:
-            pPtr = (char *)pData;
-            for(i = 0; i < iEnd; i++)
-            {
-              plData[i] = (HistInt)pPtr[i];
-            }
-            break;
-       case 2:
-            pPtr16 = (SQint16 *)pData;
-            for(i = 0; i < iEnd; i++)
-            {
-              plData[i] = (HistInt)pPtr16[i];
-            }
-            break;
-       case 4:     
-       /* 32 bit is native here now. May need change on other machine, 
-          no conversion necessary
-       */   
-            pPtr32 = (SQint32 *)pData;
-       /*     for(i = 0; i < iEnd; i++)
-            {
-              plData[i] = (HistInt)pPtr32[i];
-            }
-       */
-            memcpy(plData,pPtr32,iEnd*sizeof(HistInt));            
-            break;
-     }     
-     
-     free(pData);
-     return 1;       
-  } 
-/*--------------------------------------------------------------------------*/
-  static int SQSetHistogram(pHistDriver self, SConnection *pCon,
-                            int iNum, int iStart, int iEnd, 
-                            HistInt *plData)
-  {
-     SinqHMDriv *pInternal;
-     void *pData = NULL;
-     char *pPtr;
-     SQint16 *pPtr16;
-     SQint32 *pPtr32;
-     int i, iLen, iByte, status;
-     char pError[132];
-
-     assert(self);
-     assert(self->pPriv);
-     
-     pInternal = self->pPriv;
-
-     /* allocate storage */
-     iByte = iEnd * pInternal->iBinWidth;
-     pData = (void *)malloc(iByte*sizeof(char));
-     if(!pData)
-     {
-       PrintHMError("Out of memory in SinqHMDriv",pCon);
-       return 0;
-     }
-     memset(pData,0,iByte);
-
-     /* convert from long to supported binwidth */
-     switch(pInternal->iBinWidth)
-     {
-       case 1:
-            pPtr = (char *)pData;
-            for(i = 0; i < iEnd; i++)
-            {
-              pPtr[i] = plData[i];
-            }
-            break;
-       case 2:
-            pPtr16 = (SQint16 *)pData;
-            for(i = 0; i < iEnd; i++)
-            {
-              pPtr16[i] = plData[i];
-            }
-            break;
-       case 4:     
-            pPtr32 = (SQint32 *)pData;
-            for(i = 0; i < iEnd; i++)
-            {
-              pPtr32[i] = plData[i];
-            }
-            break;
-     }     
-
-     /* send data */
-     status = SINQHMWrite(pInternal->pMaster,iNum,iStart, iEnd, pData);  
-     if(status < 0)
-     {
-        SINQHMError2Text(status, pError,131);
-        PrintHMError(pError,pCon);
-        free(pData);
-        return 0;
-     }
-     
-     free(pData);
-     return 1;
-
-  }    
-/*---------------------------------------------------------------------------*/
-  static long SQGetMonitor(pHistDriver self, int i, SConnection *pCon)
-  {
-     SinqHMDriv *pInternal;
-     char pError[132];
-
-     assert(self);
-     assert(self->pPriv);
-     
-     pInternal = self->pPriv;
-     if(pInternal->pCounter != NULL)
-     {
-         return GetMonitor(pInternal->pCounter,i,pCon);
-     }
-     return 0;
-  }  
-/*---------------------------------------------------------------------------*/
-  static float SQGetTime(pHistDriver self,SConnection *pCon)
-  {
-     SinqHMDriv *pInternal;
-     char pError[132];
-
-     assert(self);
-     assert(self->pPriv);
-     
-     pInternal = self->pPriv;
-     if(pInternal->pCounter != NULL)
-     {
-        return GetCountTime(pInternal->pCounter,pCon);
-     }
-     return -999.99;
-  }  
-/*---------------------------------------------------------------------------*/
-  static int SQPreset(pHistDriver self, SConnection *pCon, HistInt iVal)
-  {
-     SinqHMDriv *pInternal;
-     char pError[132];
-     HistInt *plData = NULL;
-     int i, status, nHist;
-
-     assert(self);
-     assert(self->pPriv);
-     
-     pInternal = self->pPriv;
-     
-     /* get memory */
-     if(pInternal->eHistMode == ePSD && self->data->nTimeChan > 2){
-       nHist = self->data->iDim[0]*self->data->iDim[1]*self->data->nTimeChan;
-     } else {
-       nHist = getHMDataLength(self->data);
-     }
-     plData = (HistInt *)malloc(nHist*sizeof(HistInt));
-     if(!plData)
-     {
-       PrintHMError("Out of memory in SinqHMDriv",pCon);
-       return 0;
-     }
-
-     /* initialise */
-     for(i = 0; i < nHist; i++)
-     {
-       plData[i] = iVal;
-     }
-     
-     status = SQSetHistogram(self,pCon, -1,0,nHist, plData);
-     free(plData);
-     return status;
-  }
-/*--------------------------------------------------------------------------*/
-  static int SQFreePrivate(pHistDriver self)
-  {
-     SinqHMDriv *pInternal;
-
-     assert(self);
-     assert(self->pPriv);
-     
-     pInternal = self->pPriv;
-
-     if(pInternal->pMaster)
-     {
-       DeleteSINQHM(pInternal->pMaster);
-     }
-     free(pInternal);
-     return 1;   
-  }
-/*--------------------------------------------------------------------------*/
-  pHistDriver CreateSINQDriver(pStringDict pOption)
-  {
-    pHistDriver pNew = NULL;
-    SinqHMDriv *pInternal = NULL;
-    
-    /* create the general driver */
-    pNew = CreateHistDriver(pOption);
-    if(!pNew)
-    {
-      return NULL;
-    } 
-
-    /* add our options */
-    StringDictAddPair(pOption,"hmcomputer","psds02.psi.ch");
-    StringDictAddPair(pOption,"hmport","2400");
-    StringDictAddPair(pOption,"counter","Rudolf");
-    StringDictAddPair(pOption,"xsize","256");
-    StringDictAddPair(pOption,"xoff","100");
-    StringDictAddPair(pOption,"xfac","10");
-    StringDictAddPair(pOption,"ysize","256");
-    StringDictAddPair(pOption,"yoff","100");
-    StringDictAddPair(pOption,"yfac","10");
-    StringDictAddPair(pOption,"init","1");
-    StringDictAddPair(pOption,"histmode","normal");
-    StringDictAddPair(pOption,"overflowmode","ceil");
-    StringDictAddPair(pOption,"binwidth","4");
-  
-    /* initialise our private data structure */
-    pInternal = (SinqHMDriv *)malloc(sizeof(SinqHMDriv));
-    if(!pInternal)
-    {
-      free(pNew);
-      return NULL;
-    }
-    memset(pInternal,0,sizeof(SinqHMDriv));
-    pNew->pPriv = pInternal;
-    pInternal->eHistMode = eHNormal;
-    pInternal->eFlow = eOCeil;
-    pInternal->iBinWidth = 4;
-    
-
-    /* configure all those functions */
-    pNew->Configure = SQConfigure;
-    pNew->Start     = SQStart;
-    pNew->Halt      = SQHalt;
-    pNew->GetCountStatus = SQStatus;
-    pNew->GetError  = SQError;
-    pNew->TryAndFixIt = SQFixIt;
-    pNew->GetData   = SQGetData;
-    pNew->GetHistogram =  SQGetHistogram;
-    pNew->SetHistogram =  SQSetHistogram;
-    pNew->GetMonitor   =  SQGetMonitor;
-    pNew->GetTime      =  SQGetTime;
-    pNew->Preset    = SQPreset;
-    pNew->FreePrivate = SQFreePrivate;
-    pNew->Pause       = SQPause;
-    pNew->Continue    = SQContinue;
-    
-    return pNew;
- }
-/*--------------------------------------------------------------------------*/
-int isSINQHMDriv(pHistDriver test)
-{
-  if(test->Start == SQStart)
-    return 1;
-  else
-    return 0;
-}
-
-
diff --git a/sinqhmdriv.i b/sinqhmdriv.i
deleted file mode 100644
index b3943434..00000000
--- a/sinqhmdriv.i
+++ /dev/null
@@ -1,42 +0,0 @@
-
-#line 64 "sinqhmdriv.w"
-
-/*--------------------------------------------------------------------------
-                         S I N Q H M 
-
-  A driver for the SINQ histogram memory.
-
-  Mark Koennecke, April 1997
-
-  copyright: see implementation file
-----------------------------------------------------------------------------*/
-#ifndef SINQHMDRIVER
-#define SINQHMDRIVER
-
-
-#line 22 "sinqhmdriv.w"
-
-      typedef struct __SinqHMDriv {
-                                    pCounter pCounter;
-                                    pSINQHM  pMaster;
-                                    int iLastHMError;
-                                    int iLastCTError;
-                                    HistMode eHistMode;
-                                    int iBinWidth;
-                                    OverFlowMode eFlow;
-                                    int extraDetector;
-                                   } SinqHMDriv;
-
-#line 77 "sinqhmdriv.w"
-
-/*-------------------------------------------------------------------------*/
-
-#line 59 "sinqhmdriv.w"
-
-   pHistDriver CreateSINQDriver(pStringDict pOption);
-   int isSINQHMDriv(pHistDriver test);
-
-#line 79 "sinqhmdriv.w"
-
-
-#endif
diff --git a/sinqhmdriv.w b/sinqhmdriv.w
deleted file mode 100644
index 09e8c343..00000000
--- a/sinqhmdriv.w
+++ /dev/null
@@ -1,85 +0,0 @@
-\subsubsection{SINQ Histogram memory}
-This is a driver for the SINQ developed histogram memory. This HM can
-operate in normal, TOF and stroboscopic mode. All the real time processing
-for this HM is done by an on-board computer in a VME crate. This on board
-computer also runs TCP/IP and a server program which allows for
-configuration and communication with the HM. A tricky bit is, that
-configuration and communication operate differently. For configuration an
-connection to the main server is installed which handles the configuration
-requests. For starting data collection and retrieval of information a second
-connection is needed. This is obtained by sending a request to the main
-server on the on board computer. This main server will than spawn a second
-process on the on board computer which is dedicated to serving our requests.
-The mainserver sends  a packet containing the new port number our secondary
-server is listening to. Than the driver can connect to this secondary server
-in order to exchange data. More details on this scheme can be found in the
-manual for the SINQ-histogram memory. A further complication arises from the
-fact that the actual counting control, such as monitor handling, starting
-and stopping etc. is handled via a EL737 counter box, which needs to be kept
-track off as well. All this results in a rather complicated driver. This is
-already reflected by the driver private data structure:
-
-@d SQType @{
-      typedef struct __SinqHMDriv {
-                                    pCounter pCounter;
-                                    pSINQHM  pMaster;
-                                    int iLastHMError;
-                                    int iLastCTError;
-				    HistMode eHistMode;
-				    int iBinWidth;
-                                    OverFlowMode eFlow;
-                                   } SinqHMDriv;
-@}
-
-pCounter is a pointer to the EL737 counter box to use for count control.
-pMaster is an internal data structure for the interface functions to the
-SINQ histogram memory. iLastHMError keeps the last histogram memory error,
-iLasyCTError is set to 1 when a counter error happened. This is necessary to
-implement the GetError function.
-
-Please note that this driver needs some options in the histogram memories
-database:
-\begin{itemize}
-\item Control must have as value a configured EL737 counter box.
-\item HMComputer is the name of the histogram memory computer.
-\item HMPort is the port on which the histogram memory computer listens for
-requests.
-\end{itemize}
- 
-The driver implements all the functions specified in the driver interface.
-Please note that these contain functions for the deletion of driver private
-data structures which will be automatically called form DeleteHistDriver.
-Therefore the only function to define is CreateSINQDriver which sets things
-up. Another function is isSINQHMDriv which tests if the driver given as an
-argument actually is a SINQHM driver. This is currently only used in 
-amorstat.c which has to circumvent normal SICS mechanisms for performance
- reasons. 
-
-@d Protos @{
-   pHistDriver CreateSINQDriver(pStringDict pOption);
-   int isSINQHMDriv(pHistDriver test);
-@} 
-
-@o sinqhmdriv.i -d @{
-/*--------------------------------------------------------------------------
-                    	 S I N Q H M 
-
-  A driver for the SINQ histogram memory.
-
-  Mark Koennecke, April 1997
-
-  copyright: see implementation file
-----------------------------------------------------------------------------*/
-#ifndef SINQHMDRIVER
-#define SINQHMDRIVER
-
-@<SQType @>
-/*-------------------------------------------------------------------------*/
-@<Protos @>
-
-#endif
-@}
-
-
-
-
diff --git a/site.h b/site.h
new file mode 100644
index 00000000..3d6edf37
--- /dev/null
+++ b/site.h
@@ -0,0 +1,57 @@
+
+/*-----------------------------------------------------------------------
+        S i t e  A b s t r a c t  i o n  L a y e r
+
+With ANSTO using SICS as well it became necessary to separate the
+general parts  of SICS from the installation specific components. Each
+installation will have a separate set of drivers and, to some
+extent,  instrument specific commands. Such code has to be in a
+separate library. Access to this library is through an interface which
+consists of a structure containing pointers to functions which allow
+for the creation of site specific drivers and commands. Moreover, the
+site specific library has to implement a function,  getSite, which
+returns the appropriate data structure for the site for which SICS is
+being compiled. 
+------------------------------------------------------------------------*/
+#ifndef SICSSITE
+#define SICSSITE
+#include <sics.h>
+#include <motor.h>
+#include <countdriv.h>
+#include <HistDriv.i>
+#include <stringdict.h>
+#include <velo.h>
+#include <tcl.h>
+#include <codri.h>
+#include <evcontroller.h>
+#include <scan.h>
+
+        typedef struct {
+                void (*AddSiteCommands)(SicsInterp *pSics);
+                void (*RemoveSiteCommands)(SicsInterp *pSics);
+                pMotor (*CreateMotor)(SConnection *pCon,
+                                            int argc, char *argv[]);
+                pCounterDriver (*CreateCounterDriver)(
+                                                SConnection *pCon,
+                                                int argc, 
+                                                char *argv[]);
+                HistDriver *(*CreateHistogramMemoryDriver)(
+                                char *name, pStringDict pOption);
+                pVelSelDriv (*CreateVelocitySelector)(char *name, 
+                                char *array, Tcl_Interp *pTcl);
+                pCodri      (*CreateControllerDriver)(SConnection *pCon,
+                                                        int argc,
+                                                        char *argv[]);
+                pEVControl            (*InstallEnvironmentController)(
+                                        SicsInterp *pSics,
+                                        SConnection *pCon,
+                                        int argc,
+                                        char *argv[]);
+                int                     (*ConfigureScan)(pScanData self,
+                                                char *option);
+                void (*KillSite)(void *pData);
+}Site, *pSite;
+
+/*-------------------------------------------------------------------*/
+pSite getSite(void);
+#endif
diff --git a/site.w b/site.w
new file mode 100644
index 00000000..52d08166
--- /dev/null
+++ b/site.w
@@ -0,0 +1,124 @@
+\subsubsection{Site Abstraction Layer}
+With ANSTO using SICS as well it became necessary to separate the
+general parts  of SICS from the installation specific components. Each
+installation will have a separate set of drivers and, to some
+extent,  instrument specific commands. Such code has to be in a
+separate library. Access to this library is through an interface which
+consists of a structure containing pointers to functions which allow
+for the creation of site specific drivers and commands. Moreover, the
+site specific library has to implement a function,  getSite, which
+returns the appropriate data structure for the site for which SICS is
+being compiled. This data structure looks like this:
+
+@d sitedata @{
+	typedef struct {
+		void (*AddSiteCommands)(SicsInterp *pSics);
+		void (*RemoveSiteCommands)(SicsInterp *pSics);
+	        pMotor (*CreateMotor)(SConnection *pCon,
+					    int argc, char *argv[]);
+		pCounterDriver (*CreateCounterDriver)(
+						SConnection *pCon,
+						int argc, 
+						char *argv[]);
+                HistDriver *(*CreateHistogramMemoryDriver)(
+				char *name, pStringDict pOption);
+		pVelSelDriv (*CreateVelocitySelector)(char *name, 
+				char *array, Tcl_Interp *pTcl);
+                pCodri      (*CreateControllerDriver)(SConnection *pCon,
+							int argc,
+							char *argv[]);
+		pEVControl            (*InstallEnvironmentController)(
+					SicsInterp *pSics,
+					SConnection *pCon,
+					int argc,
+					char *argv[]);
+	        int                     (*ConfigureScan)(pScanData self,
+						char *option);
+                void (*KillSite)(void *pData);
+}Site, *pSite;
+@}
+\begin{description}
+\item[AddSiteCommands] adds site specific object creation and
+instrument specific commands to the SICS interpreter, pSics.
+\item[RemoveSiteCommands] will be called to remove surplus object
+creation commands after the SICS interpreter has processed the
+initialization files. Please note, that SICS does not support the
+removal of objects at runtime in general. This is due to the fact that
+any possible object may be used by or linked to others and and it
+would be a bookeeping nightmare to keep track of all those relations.
+\item[CreateMotor] creates a motor using the arguments in argc and
+argv. It returns a pointer to the new motor structure on success or
+NULL in case of a failure. This function has to return a complete
+motor in order to allow for special configurations of the motor to
+take place in its initialization.
+\item[CreateCounterDriver] returns a driver for a new counter box
+driver if the parameters are valid or NULL if not. Driver arguments
+are in the argc, argv pair.  
+\item[CreateHistogramMemoryDriver] creates a driver for a histogram
+memory. The driver type is specified through name. 
+Driver options are in pOptions. 
+\item[CreateVelocitySelector] create a driver for a velocity selector.
+The parameter name is the name of the driver, array is the name of a
+Tcl array holding configuration parameters for the driver and pTcl is
+the Tcl interpreter in which array lives. 
+\item[CreateControllerDriver] creates a driver for the general
+controller module within SICS. argc and argv hold the parameters,
+starting with the name of the driver to create.  
+\item[InstallEnvironmentController] installs a a sample
+environment device such as a temperature controller or magnet
+controller etc. into the interpreter pSics. pCon is a connection
+object to  which errors can be
+reported, argc and argv are the controller parameters starting with
+the driver name. This method does not get away with creating a driver
+but must install the command into SICS because  some environment
+devices overload the standard Wrapper function with special ones. The
+newly created object is still returned for further processing. In the
+case of failure NULL is returned. Errors will have been printed to
+pCon. 
+\item[ConfigureScan] allows for modules which configure the scan
+object. option is the option to xxscan configure to process, the scan
+object to configure is passed in in self. This returns 1 on success
+and 0 on failures or options which are not recognized. 
+\item[KillSite] is a function to remove the site data structure when
+SICS is done with it. pData must point to the site data structure.
+KillSite's  purpose is to free all memory associated with
+the site data structure. This is mostly a cleanup thing, to keep the
+fortify logs clear off inconsequential and confusing data.
+\end{description} 
+
+
+@o site.h @{
+/*-----------------------------------------------------------------------
+	S i t e  A b s t r a c t  i o n  L a y e r
+
+With ANSTO using SICS as well it became necessary to separate the
+general parts  of SICS from the installation specific components. Each
+installation will have a separate set of drivers and, to some
+extent,  instrument specific commands. Such code has to be in a
+separate library. Access to this library is through an interface which
+consists of a structure containing pointers to functions which allow
+for the creation of site specific drivers and commands. Moreover, the
+site specific library has to implement a function,  getSite, which
+returns the appropriate data structure for the site for which SICS is
+being compiled. 
+------------------------------------------------------------------------*/
+#ifndef SICSSITE
+#define SICSSITE
+#include <sics.h>
+#include <motor.h>
+#include <countdriv.h>
+#include <HistDriv.i>
+#include <stringdict.h>
+#include <velo.h>
+#include <tcl.h>
+#include <codri.h>
+#include <evcontroller.h>
+#include <scan.h>
+@<sitedata@>
+/*-------------------------------------------------------------------*/
+pSite getSite(void);
+#endif
+@}
+
+
+
diff --git a/slsmagnet.c b/slsmagnet.c
deleted file mode 100644
index 5df3a51b..00000000
--- a/slsmagnet.c
+++ /dev/null
@@ -1,389 +0,0 @@
- /*--------------------------------------------------------------------------
-                     S L S M A G N E T
-
- This file contains the driver for the PSI-DSP magnet controller as
- aquired from SLS.
-
- Mark Koennecke, October 2001 
-
- Copyright: see copyright.h
-----------------------------------------------------------------------------*/
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <math.h>
-#include <assert.h>
-#include <unistd.h>
-#include "fortify.h"
-#include "conman.h"
-#include "servlog.h"
-#include "fortify.h"
-
-  typedef struct __EVDriver  *pEVDriver;
-
-#include "evdriver.i"  
-#include "hardsup/el734_def.h"
-#include "hardsup/el734fix.h"
-#include "network.h"
-#include "rs232controller.h"
-
-/*
-  error codes
-*/
-#define BADECHO -5100
-#define NOTCONNECTED -5200
-#define TIMEOUT      -5300
-
-/*
-  when waiting for results, the code loops at max MAXLOOP times 
-  before doing a timeout. 100 corresponds to one second
-*/
-#define MAXLOOP 100
-
-/*
-  packet header codes
-*/
-#define DSPWRITE 0x80
-#define DSPREAD 0x0
-
-/*-----------------------------------------------------------------------*/
-  typedef struct {
-                   mkChannel *pSock;
-                   char *pHost;
-                   int iPort;
-                   int iError;
-                  } SLSDriv, *pSLSDriv;
-/*-------------------------------------------------------------------------
- Code for data conversion from Lukas Tanner. The ULONG is system dependent,
- it MUST describe a 32 bit value.  
- -------------------------------------------------------------------------*/
-#define ULONG int
-/***********************************************************************/
-static ULONG double2DSPfloat( double input )
-/***********************************************************************/
-/* Konvertiert eine normale double Variable in ein 32bit DSP Float Format. */
-{
-	ULONG output;
-	double mantissa;
-	int exponent;
-
-	if (input == 0) {
-		output = 0;
-	} else {
-		mantissa = 2 * (frexp(fabs(input), &exponent));
-		mantissa = ldexp(mantissa, 23);
-		exponent =exponent - 1 + 127;
-		if (exponent < 0) {
-			exponent = 0;
-		} else if (exponent > 0xFE) {
-			exponent = 0xFE;
-		}
-		exponent = exponent << 23;
-		output = ((ULONG) mantissa) & 0x7FFFFF;
-		output = output | ((ULONG) (exponent));
-		if (input < 0) {
-			output = output | 0x80000000;
-		}
-	}
-    return output;
-}
-
-/***********************************************************************/
-static double DSPfloat2double( ULONG input )
-/***********************************************************************/
-/* Konvertiert eine Variable inder ein 32bit DSP Float Wert abgelegt ist,
-   in ein normales double Format
-   32bit IEEE Float => SEEEEEEEEMMMMMMMMMMMMMMMMMMMMMMM;	S = Sign Bit
-															E = Exponent
-												   			M = Mantissa (23)*/
-{
-	double output;
-	if ((input & 0x7FFFFF) == 0 && ((input >> 23) & 0xFF) == 0) {
-		output = 0;
-	} else {
-		output = ldexp(input & 0x7FFFFF,-23) + 1;
-		output = output * pow(-1, ((input >>31) & 1));
-		output = output * ldexp(1, (((input >>23) & 0xFF) - 127));
-	}
-    return output;
-}
-/*-------------------------------------------------------------------------*/
-static int communicateSLS(mkChannel *pSock, char msg[6], char reply[6])
-{
-  long lVal = 0;
-  int iRet, i;
-
-  if(!pSock)
-    return NOTCONNECTED;
-
-  iRet = NETWrite(pSock,msg,6);
-  if(iRet < 0)
-  {
-    return iRet;
-  }
-  for(i = 0; i < MAXLOOP; i++)
-  {
-    iRet = NETAvailable(pSock,10);
-    if(iRet < 0)
-    {
-      return iRet;
-    }
-    else if(iRet == 1)
-    {
-      lVal += NETRead(pSock,reply+lVal,6-lVal,-10);
-      if(lVal >= 6)
-      {
-        return (int)lVal;      
-      }
-      else
-      {
-	continue;
-      }
-    }
-  }
-  return TIMEOUT;
-}
-/*---------------------------------------------------------------------------*/
-  static int GetSLSPos(pEVDriver  self, float *fPos)
-  {
-     pSLSDriv pMe = NULL;
-     int iRet, ival;
-     double dval;
-     char msg[6], reply[6];
-     long lVal;
-
-     assert(self);
-     pMe = (pSLSDriv)self->pPrivate;
-     assert(pMe);
-     
-     msg[0] = DSPREAD; /* read request */
-     msg[1] = 0x92; /* address of mag current */
-     iRet = communicateSLS(pMe->pSock,msg,reply);
-     if(iRet < 0)
-     {
-       pMe->iError = iRet;
-       return iRet;
-     }
-     memcpy(&ival,reply+2,4);
-     dval = DSPfloat2double(ival);
-     *fPos = (float)dval;
-     pMe->iError = 0;
-
-     return 1;
-  } 
-/*----------------------------------------------------------------------------*/
-  static int SLSRun(pEVDriver self, float fVal)
-  {
-     pSLSDriv pMe = NULL;
-     int iRet, ival,i;
-     char msg[6], reply[6];
-     
-     assert(self);
-     pMe = (pSLSDriv )self->pPrivate;
-     assert(pMe);
-
-     msg[0] = DSPWRITE;
-     msg[1] = 0x90;
-     ival = double2DSPfloat((double)fVal);
-     memcpy(msg+2, &ival,4);
-     iRet = communicateSLS(pMe->pSock,msg,reply);
-     if(iRet <= 0)
-     {
-       pMe->iError = iRet;
-       return iRet;
-     }
-     for(i = 1; i < 6; i++)
-     {
-       if(msg[i] != reply[i])
-       {
-	 pMe->iError = BADECHO;
-         return BADECHO;
-       }
-     }
-     return 1;
- }
-/*--------------------------------------------------------------------------*/
-  static int SLSError(pEVDriver self, int *iCode, char *error, int iErrLen)
-  {
-     pSLSDriv pMe = NULL;
-     char *pPtr = NULL;
-     int i1, i2;
-     char pBueffel[132];
-     
-     assert(self);
-     pMe = (pSLSDriv)self->pPrivate;
-     assert(pMe);
-
-     *iCode = pMe->iError;
-     switch(*iCode)
-     {
-     case BADECHO:
-       strncpy(error,"message sent and reply did not match", iErrLen);
-       break;
-     case NOTCONNECTED:
-       strncpy(error,"Not connected to device", iErrLen);
-       break;
-     case TIMEOUT:
-       strncpy(error,"Timeout waiting for response", iErrLen);
-       break;
-     default:
-       getRS232Error(*iCode,error,iErrLen);
-       break;
-     }  
-    
-    return 1;
-  }
-/*-------------------------------------------------------------------------*/
-  static int SLSSend(pEVDriver self, char *pCommand, char *pReply, int iLen)
-  {
-    strncpy(pReply,"PSI-DSP understands only binary, send disabled",iLen);
-    return 0;
-  }
-/*--------------------------------------------------------------------------*/
-  static int SLSInit(pEVDriver self)
-  {
-     pSLSDriv pMe = NULL;
-     int iRet, ival, i;
-     char msg[6], reply[6];
-     
-     assert(self);
-     pMe = (pSLSDriv )self->pPrivate;
-     assert(pMe);
-
-     pMe->pSock = NULL;
-     pMe->pSock = NETConnect(pMe->pHost,pMe->iPort);
-     if(!pMe->pSock)
-     {
-       return 0;
-     }
-
-     sleep(1); 
-
-     /*
-       try to switch device on
-     */
-     msg[0] = DSPWRITE;
-     msg[1] = 0x31;
-     ival = 1;
-     memcpy(msg+2, &ival,4);
-     iRet = communicateSLS(pMe->pSock,msg,reply);
-     if(iRet <= 0)
-     {
-       pMe->iError = iRet;
-       return iRet;
-     }
-     for(i = 1; i < 6; i++)
-     {
-       if(msg[i] != reply[i])
-       {
-	 pMe->iError = BADECHO;
-         return BADECHO;
-       }
-     }
-
-     return iRet;
-  }  
-/*--------------------------------------------------------------------------*/
-  static int SLSClose(pEVDriver self)
-  {
-     pSLSDriv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pSLSDriv )self->pPrivate;
-     assert(pMe);
-
-     NETClosePort(pMe->pSock);
-     pMe->pSock = NULL;
-     return 1;
-  }  
-/*---------------------------------------------------------------------------*/
-  static int SLSFix(pEVDriver self, int iError)
-  {
-     pSLSDriv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pSLSDriv )self->pPrivate;
-     assert(pMe);
-
-     switch(iError)
-     {
-            case BADECHO:
-            case TIMEOUT:
-	        return DEVREDO;
-            default:
-                      SLSClose(self);
-                      iRet = SLSInit(self);
-                      if(iRet)
-                      {
-                        return DEVREDO;
-                      }                 
-                      else
-                      {
-                        return DEVFAULT;
-                      }                 
-                      break;
-     }
-  }
-     
-/*--------------------------------------------------------------------------*/
-  static int SLSHalt(pEVDriver *self)
-  {
-     assert(self);
-     
-     return 1;
-  }
-/*------------------------------------------------------------------------*/
-  void KillSLS(void *pData)
-  {
-     pSLSDriv pMe = NULL;
-     
-     pMe = (pSLSDriv)pData;
-     assert(pMe);
-     
-     if(pMe->pHost)
-     {
-        free(pMe->pHost);
-     }
-     free(pMe);
-  }  
-/*------------------------------------------------------------------------*/
-  pEVDriver CreateSLSDriv(int argc, char *argv[])
-  {
-     pEVDriver pNew = NULL;
-     pSLSDriv pSim = NULL;
-     
-     /* check for arguments */
-     if(argc < 2)
-     {
-       return NULL;
-     }
-     
-     pNew = CreateEVDriver(argc,argv);
-     pSim = (pSLSDriv)malloc(sizeof(SLSDriv));
-     memset(pSim,0,sizeof(SLSDriv));
-     if(!pNew || !pSim)
-     {
-       return NULL;
-     }
-     pNew->pPrivate = pSim;
-     pNew->KillPrivate = KillSLS;
-     
-     pSim->pHost = strdup(argv[0]);
-     pSim->iPort = atoi(argv[1]);
-     
-     /* initialise function pointers */
-     pNew->SetValue = SLSRun;
-     pNew->GetValue = GetSLSPos;
-     pNew->Send     = SLSSend;
-     pNew->GetError = SLSError;
-     pNew->TryFixIt = SLSFix;
-     pNew->Init     = SLSInit;
-     pNew->Close    = SLSClose;
-     
-     return pNew; 
-  }	
-  
-
-
diff --git a/splitter.c b/splitter.c
index 09b61d18..414204b7 100644
--- a/splitter.c
+++ b/splitter.c
@@ -381,6 +381,30 @@ typedef enum _CharType {eSpace, eNum,eeText,eQuote} CharType;
      }
      return EOF;
   }   
+/*---------------------------------------------------------------------*/
+  int isNumeric(char *pText)
+  {
+    int i, ii, iGood;
+    static char pNum[13] = {"1234567890.+-"};
+    
+    for(i = 0; i < strlen(pText); i++)
+    {
+      for(ii = 0; ii < 13; ii++)
+      {
+        iGood = 0;
+        if(pText[i] == pNum[ii])
+        {
+          iGood = 1;
+          break;
+        }
+      }
+      if(!iGood)
+      {
+          return 0;
+      }
+    }    
+    return 1;
+  }  
 /*============================================================================
 
 	Testprogram, can be activated by defining MAIN
diff --git a/splitter.h b/splitter.h
index 9c98ff84..536a7f4d 100644
--- a/splitter.h
+++ b/splitter.h
@@ -69,4 +69,8 @@ typedef struct _TokenEntry {
            not start with the comment character "#". Returns 1 for success,
            or EOF when the end of file has been reached.
          !*/
+         int isNumeric(char *pText);
+         /*!
+            isNumeric test if pText is a number
+	 !*/
 #endif 
diff --git a/sps.c b/sps.c
deleted file mode 100644
index 2859a404..00000000
--- a/sps.c
+++ /dev/null
@@ -1,799 +0,0 @@
-/*--------------------------------------------------------------------------
-                                 S P S
-                                
-  Implementation file for the SICS module handling Siemens SPS controllers
-  at SinQ. 
-  
-  copyright: see copyright.h
-  I cannot imagine that somebody wants this. It is highly special for SINQ.                                 
-  It handles a protocoll tailor made by Siemens for Sinq. I cannot imagine
-  that somebody wants something from Siemens anyway.
-  
-  
-  Mark Koennnecke, Juli 1998
-  
----------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <tcl.h>
-#include "fortify.h"
-#include "hardsup/serialsinq.h"
-#include "sics.h"
-#include "lld.h"  
-#include "bit.h"
-#include "sps.i"
-#include "sps.h"
-#include "commandlog.h"
-
-/*--------------------- some internal defines ----------------------------*/
-#define SPSOFFLINE -10
-#define COMMDEAD   -11
-#define COMMRECONNECT -12
-#define COMMTMO    -13
-/*-------------------------------------------------------------------------*/
-  static float SimRandom(void)
-  {
-      float fVal;
-        
-      fVal = ( (float) rand() / (float)RAND_MAX) * 100.0;
-      return fVal;
-  }
-/*--------------------- static functions ---------------------------------*/
-  static int init(pSPS self)
-  {
-     int iRet;  
-
-     assert(self);
-     assert(self->pHost);
-
-     /* check if in simulation mode */
-     if(self->iMode)
-        return 1;
-
-     /* open the port */
-     iRet = SerialOpen(&self->pData, self->pHost, self->iPort, self->iChannel);
-     if((iRet != 1) || (self->pData == NULL) )
-     {
-         self->iLastError = COMMDEAD;
-         return 0;
-     }
-     
-     /* configure terminators */
-     SerialATerm(&self->pData, "1\r\n");
-     SerialSendTerm(&self->pData,"\r\n");
-     
-     return 1;     
-  }  
-/*-------------------------------------------------------------------------*/
-  static int SPSCommand(pSPS self, char *pCommand, char *pReply, 
-                        int iReplyLen)
-  {
-      int iRet, i;
-      char pError[132];
-      
-      assert(self);
-      assert(pCommand);
-      assert(pReply);
-      
-      /*
-         try at least three times to get the command through before
-         giving up
-      */
-      for(i = 0; i < 3; i++)
-      {
-         iRet = SerialWriteRead(&self->pData,pCommand,pReply,iReplyLen);
-         if(iRet != 1)
-         {
-             switch(iRet)
-             {
-                case TIMEOUT:
-                    self->iLastError = COMMTMO;
-                    continue;
-                    break;
-                 default:
-                    self->iLastError = iRet;
-                    SerialError(iRet,pError,131);
-                    WriteToCommandLog("SYS: SPS-TROUBLE:",pError);
-                    SerialClose(&self->pData);
-                    iRet = init(self);
-                    if(iRet == 0)
-		    {
-		      return 0;
-                    }
-                    continue;                
-                    break;
-              }
-          }      
-      
-          /* now we may still have a TMO or OFL message */
-          if(strstr(pReply,"?TMO") != NULL)
-          {
-               self->iLastError = COMMTMO;
-               continue;
-           }
-           if(strstr(pReply,"?OFL") != NULL)
-           {
-               self->iLastError = SPSOFFLINE;
-               return 0;
-           }
-           return 1;
-      }
-      return 0;
-  }                        
-/*--------------------------------------------------------------------------*/
-  int SPSSetButton(pSPS self, SConnection *pCon, int iByte, int iBit)
-  {
-      Permission perm;
-      char pCommand[30];
-      char pBueffel[256];
-      int iRet, iTest,i;
-      
-      assert(self);
-      assert(pCon);
-      
-      
-      /* first check permissions */
-      iRet = LLDnodePtr2First(self->lPermissions);
-      iTest = 0;
-      while(iRet != 0)
-      {
-        LLDnodeDataTo(self->lPermissions,&perm);
-        if(perm.iByte == iByte)
-        {
-             if(perm.iBit == iBit)
-             {
-               iTest = SCMatchRights(pCon,perm.iPrivilege);
-               break;
-             }
-        }
-        iRet = LLDnodePtr2Next(self->lPermissions);
-      }
-      if(!iTest)
-      {
-         sprintf(pBueffel,"ERROR: you have no permission to flip %d.%d",
-               iByte,iBit);
-         SCWrite(pCon,pBueffel,eError);
-         return 0;      
-      }
-      
-      /* if in sim mode, return true */
-      if(self->iMode)
-      {
-        return 1;
-      }
-      
-      /* format command and send a command to set a bit through the 
-         drain in order to simulate a button press 
-      */
-      sprintf(pCommand,"S%3.3d%1.1d",iByte,iBit);
-      iRet = SPSCommand(self,pCommand,pBueffel,255);
-      if(!iRet)
-      {
-         SCWrite(pCon,pBueffel,eError);
-         SCWrite(pCon,"ERROR: Sending flip command failed",eError);
-         return 0;
-      }
-      return 1;
-  }
-/*--------------------------------------------------------------------------*/
-  int SPSGetStatus(pSPS self, int iStatus, int *iSet)
-  {
-     int iRet, i, i2, iVal;
-     unsigned char pByte[16];
-     char pBueffel[256], pNum[10];
-     char *pPtr; 
-     unsigned char cBit, cMask;
-  
-     assert(self);
-     
-     if((iStatus < 0) || (iStatus >= 128) )
-     {
-       return -1;
-     } 
-     
-     /* if in simulation mode, return 1 */
-     if(self->iMode)
-     {
-         *iSet = 1;
-	 return 1;
-     }
-     
-     /* send an R command down to the SPS */
-     iRet = SPSCommand(self,"R",pBueffel,255);
-     if(!iRet)
-     {
-       return 0;
-     }
-     
-     /* decode the reply into the Byte array */
-     pPtr = pBueffel;
-     if(*pPtr != 'R')
-     {
-       return -2;
-     }
-     pPtr++;
-     for(i = 0; i < 16; i++)
-     {
-        /* skip the whitespace */ 
-        pPtr++;
-        pNum[0] = *pPtr;
-        pPtr++;
-        pNum[1] = *pPtr;
-        pPtr++;
-        pNum[2] = *pPtr;
-        pPtr++;
-        pNum[3] = '\0';
-        pByte[i] = atoi(pNum);
-     }
-     
-     /*  test the bit */
-     i = iStatus / 8;
-     cBit = pByte[i];
-     i2 = iStatus % 8;
-     cMask = 1 << i2;
-
-     /*
-     printf("Byte %d, Value %d, Bit %d, Value: %d\n", i,cBit, i2, (cBit & cMask));
-     */
-
-     if((cBit & cMask) > 0 )
-     {
-       *iSet = 1;
-     }
-     else
-     {
-       *iSet = 0;
-     }
-     return 1;
-  }    
-/*-------------------------------------------------------------------------
-  This is a special feature for SANS at SINQ. SANS has a collimator and 
-  the length of the collimator can only be deduced from the SPS status
-  message by checking each of nine segments separately. For efficiency
-  this is coded into a special function for SANS. This also needs a special
-  function for testing bits.
-
-  Mark Koennecke, April 1999
-*/  
-  static int TestBit(unsigned char cByte, int iBit)
-  {
-     unsigned char cMask;
-
-     assert(iBit >= 0);
-     assert(iBit < 8);
-
-     cMask = 1 << iBit;
-     if( (cMask & cByte) > 0)
-     {
-       return 1;
-     }
-     else
-     {
-       return 0;
-     }
-  }
-/*-----------------------------------------------------------------------*/
-  int SPSGetSANS(pSPS self, float *fLength)
-  {
-     int iRet, i, i2, iVal;
-     unsigned char pByte[16];
-     char pBueffel[256], pNum[10];
-     char *pPtr; 
-     unsigned char cBit, cMask;
-     float fLang;
-  
-     assert(self);
-     
-     /* if in simulation mode, return a random number */
-     if(self->iMode)
-     {
-       *fLength = SimRandom();
-       return 1;
-     }
-     
-     /* send an R command down to the SPS */
-     iRet = SPSCommand(self,"R",pBueffel,255);
-     if(!iRet)
-     {
-       return 0;
-     }
-     
-     /* decode the reply into the Byte array */
-     pPtr = pBueffel;
-     if(*pPtr != 'R')
-     {
-       return -2;
-     }
-     pPtr++;
-     for(i = 0; i < 16; i++)
-     {
-        /* skip the whitespace */ 
-        pPtr++;
-        pNum[0] = *pPtr;
-        pPtr++;
-        pNum[1] = *pPtr;
-        pPtr++;
-        pNum[2] = *pPtr;
-        pPtr++;
-        pNum[3] = '\0';
-        pByte[i] = atoi(pNum);
-     }
-     
-     fLang = 189.;
-     if(TestBit(pByte[0],1) > 0)
-     {
-        fLang = 18.;
-     }
-     /* coll 1  15m */
-     if(TestBit(pByte[0],3) > 0)
-     {
-        fLang = 15.;
-     }
-     /* coll 2 11 m*/
-     if(TestBit(pByte[0],7) > 0)
-     {
-        fLang = 11.;
-     }
-     /* coll 3 8 m*/
-     if(TestBit(pByte[1],3) > 0)
-     {
-        fLang -= 3.;
-     }
-     /* coll 4  6m */
-     if(TestBit(pByte[1],7) > 0)
-     {
-        fLang -= 2.;
-     }
-     /* coll 5 4.5 m */
-     if(TestBit(pByte[2],3) > 0)
-     {
-        fLang -= 1.5;
-     }
-     /* coll 6 3 m*/
-     if(TestBit(pByte[2],7) > 0)
-     {
-        fLang -= 1.5;
-     }
-     /* coll 7 */
-     if(TestBit(pByte[3],3) > 0)
-     {
-        fLang -= 1.;
-     }
-     /* coll 8 */
-     if(TestBit(pByte[3],6) > 0)
-     {
-        fLang -= 1.;
-     }
-     if(TestBit(pByte[3],7) > 0)
-     {
-        fLang -= 0.6;
-     }
-     *fLength = fLang;
-     return 1;
-  }    
-/*--------------------------------------------------------------------------*/
-  int SPSGetADC(pSPS self, int iWhich, int *iValue)
-  {
-     int iADC[8];
-     int i, iRet;
-     char *pPtr, pBueffel[256], pNum[10];
-     
-     assert(self);
-     
-     /* check iWhich */
-     if( (iWhich < 0) || (iWhich > 7) )
-     {
-       return 0;
-     } 
-     
-     /* give a random number in simulation mode */
-     if(self->iMode)
-     {
-        *iValue = (int)SimRandom();
-         return 1;
-     }
-     
-     /* send an A command to the box */
-     iRet = SPSCommand(self,"A",pBueffel,255);
-     if(!iRet)
-     {
-        return 0;
-     }
-     
-     /* decode the result */
-     pPtr = pBueffel;
-     if(*pPtr != 'A') /* a silly answer was returned */
-     {
-        SICSLogWrite("SPS: Silly answer in SPSGetADC",eError);
-        return 0;
-     }
-     pPtr++;
-     for(i = 0; i < 8; i++)
-     {
-       pPtr++; /* skip whitespace */
-       strncpy(pNum,pPtr,5);
-       pNum[5] = '\0';
-       pPtr += 5;
-       iADC[i] = atoi(pNum);
-     }
-
-     /* now give the value */
-     *iValue = iADC[iWhich];
-     return 1;     
-  }  
-/*-----------------------------------------------------------------------*/
-  void SPSAddPermission(pSPS self, int iByte, int iBit, int iRights)
-  {
-     Permission perm;
-     
-     assert(self);
-     
-     perm.iByte = iByte;
-     perm.iBit = iBit;
-     perm.iPrivilege = iRights;
-     
-     LLDnodeAppendFrom(self->lPermissions,&perm);
-  }
-/*-------------------------------------------------------------------------*/
-  void RemoveSPS(void *pData)
-  {
-     pSPS self = NULL;
-     
-     self = (pSPS)pData;
-     
-     if(!self)
-        return;
-        
-     if(self->pHost)
-     {
-       free(self->pHost);
-     }  
-     
-     SerialClose(&self->pData);
-     if(self->pDes)
-     {
-       DeleteDescriptor(self->pDes);
-     }
-     LLDdelete(self->lPermissions);
-     free(self);
-  }  
-/*---------------------------------------------------------------------------*/
-  int SPSFactory(SConnection *pCon, SicsInterp *pSics, void *pData,
-                 int argc, char *argv[])
-  {
-    int iRet, iVal;
-    pSPS pNew = NULL;
-    char pBueffel[256];
-    
-    assert(pCon);
-    assert(pSics);
-    
-    /* we need at least two extra arguments: name and either host or sim */
-    if(argc < 3)
-    {
-       SCWrite(pCon,
-              "ERROR: Insufficient number of arguments for installing SPS",
-              eError);
-       return 0;       
-    }
-    
-    /* allocate a new SPS */
-    pNew = (pSPS)malloc(sizeof(SPS));
-    if(!pNew)
-    {
-      SCWrite(pCon,"ERROR: no memory to allocate SPS",eError);
-      return 0;
-    }
-    memset(pNew,0,sizeof(SPS));
-    pNew->pDes = CreateDescriptor("SPS");
-    pNew->lPermissions = LLDcreate(sizeof(Permission));
-    if( (!pNew->pDes) || (pNew->lPermissions < 0) )
-    {
-      SCWrite(pCon,"ERROR: no memory to allocate SPS",eError);
-      return 0;
-    }
-    pNew->pHost = strdup(argv[2]);
-
-    /* check if we go for sim */    
-    strtolower(argv[2]);
-    if(strcmp(argv[2],"sim") == 0)
-    {
-        pNew->iMode = 1;
-    }
-    else /* we are installing a real one and need tons more arguments */ 
-    {
-       if(argc < 5)
-       {
-           SCWrite(pCon,
-                  "ERROR: Insufficient number of arguments for installing SPS",
-                  eError);
-           RemoveSPS(pNew);       
-           return 0;       
-       }
-       /* get port number */
-       iRet = Tcl_GetInt(pSics->pTcl,argv[3],&iVal);
-       if(iRet != TCL_OK)
-       {
-         sprintf(pBueffel,"ERROR: expected integer argument for port, got %s",
-                 argv[3]);
-         SCWrite(pCon,pBueffel,eError);
-         RemoveSPS(pNew);
-         return 0;        
-       }
-       pNew->iPort = iVal;
-       
-       /* get channel number */
-       iRet = Tcl_GetInt(pSics->pTcl,argv[4],&iVal);
-       if(iRet != TCL_OK)
-       {
-         sprintf(pBueffel,"ERROR: expected integer argument for channel, got %s",
-                 argv[4]);
-         SCWrite(pCon,pBueffel,eError);
-         RemoveSPS(pNew);
-         return 0;        
-       }
-       pNew->iChannel = iVal;
-    }
-    
-    /* initialise */
-    iRet = init(pNew);
-    if(!iRet)
-    {
-       SCWrite(pCon,"ERROR: Failure to initialise SPS controller",eError);
-       RemoveSPS(pNew);
-       return 0;
-    }
-    
-    /* install command */
-    iRet = AddCommand(pSics, argv[1],SPSAction,RemoveSPS,pNew);
-    if(!iRet)
-    {
-      sprintf(pBueffel,"ERROR: duplicate SPS command %s NOT created",
-              argv[1]);
-      SCWrite(pCon,pBueffel,eError);
-      RemoveSPS(pNew);        
-    }
-    return 1;
-  }        
-#include "access.c"  
-/*-------------------------------------------------------------------------*/
-  int SPSAction(SConnection *pCon,  SicsInterp *pSics, void *pData,
-                int argc, char *argv[])
-  {
-     pSPS self = NULL;
-     char pBueffel[256];
-     int iByte, iBit, iSet;
-     int iRet, i;
-     float fLang;
-     
-     self = (pSPS)pData;
-     assert(self);
-     
-     /* we need at least 3 arguments */
-     if(argc < 2)
-     {
-        sprintf(pBueffel,"ERROR: need at least two arguments to %s",
-                argv[0]);
-        SCWrite(pCon,pBueffel,eError);
-        return 0;        
-     }
-     
-     /* do something according to key word */
-     strtolower(argv[1]);
-     if(strcmp(argv[1],"push") == 0) /* operate a button */
-     {
-        /* four arguments needed */
-        if(argc < 4)
-        {
-              sprintf(pBueffel,"ERROR: need at least two arguments to %s push",
-                      argv[0]);
-              SCWrite(pCon,pBueffel,eError);
-              return 0;        
-        }
-        /* convert arguments */
-        iRet = Tcl_GetInt(pSics->pTcl,argv[2],&iByte);
-        if(iRet != TCL_OK)
-        {
-           sprintf(pBueffel,"ERROR: expected integer argument for byte, got %s",
-                   argv[2]);
-           SCWrite(pCon,pBueffel,eError);
-           return 0;        
-        }
-        iRet = Tcl_GetInt(pSics->pTcl,argv[3],&iBit);
-        if(iRet != TCL_OK)
-        {
-           sprintf(pBueffel,"ERROR: expected integer argument for bit, got %s",
-                   argv[3]);
-           SCWrite(pCon,pBueffel,eError);
-           return 0;        
-        }
-        /* try it */
-        iRet = SPSSetButton(self,pCon,iByte,iBit);
-        if(!iRet)
-        {
-          SCWrite(pCon,"ERROR: Pushing button failed",eError);
-          return 0;
-        }
-        else
-        {
-          SCSendOK(pCon);
-          return 1;
-        }
-     }
-     else if(strcmp(argv[1],"status") == 0) /* status bits */
-     {
-         /* which bit ? */
-        if(argc < 3)
-        {
-              sprintf(pBueffel,"ERROR: need at least two arguments to %s push",
-                      argv[0]);
-              SCWrite(pCon,pBueffel,eError);
-              return 0;        
-        }
-         iRet = Tcl_GetInt(pSics->pTcl,argv[2],&iByte);
-         if(iRet != TCL_OK)
-         {
-             sprintf(pBueffel,"ERROR: expected integer argument for bit, got %s",
-                   argv[2]);
-             SCWrite(pCon,pBueffel,eError);
-             return 0;        
-         }
-         iRet = SPSGetStatus(self,iByte,&iSet);
-         if(iRet <= 0)
-         {
-            sprintf(pBueffel,"ERROR: failed to read status bit %d",
-                    iByte);
-            SCWrite(pCon,pBueffel,eError);
-            return 0;        
-         }
-         sprintf(pBueffel,"%s.status.%3.3d = %d",argv[0],iByte,iSet);
-         SCWrite(pCon,pBueffel,eValue);
-         return 1;
-     }
-     else if(strcmp(argv[1],"stat2") == 0) /* status bits */
-     {
-         if(argc < 4)
-         {
-              sprintf(pBueffel,"ERROR: need at least two arguments to %s stat2",
-                      argv[0]);
-              SCWrite(pCon,pBueffel,eError);
-              return 0;        
-         }
-         /* which bit ? */
-         iRet = Tcl_GetInt(pSics->pTcl,argv[2],&iByte);
-         if(iRet != TCL_OK)
-         {
-             sprintf(pBueffel,"ERROR: expected integer argument for bit, got %s",
-                   argv[2]);
-             SCWrite(pCon,pBueffel,eError);
-             return 0;        
-         }
-         iRet = Tcl_GetInt(pSics->pTcl,argv[3],&iBit);
-         if(iRet != TCL_OK)
-         {
-            sprintf(pBueffel,"ERROR: expected integer argument for bit, got %s",
-                    argv[3]);
-            SCWrite(pCon,pBueffel,eError);
-            return 0;        
-         }
-         if( (iByte <= 0) || (iBit < 0) || (iBit > 7) )
-         {
-            SCWrite(pCon,"ERROR: arguments out of range for stat2",eError);
-            return 0;
-         }
-         iRet = SPSGetStatus(self,((iByte-1)*8 + iBit),&iSet);
-         if(iRet <= 0)
-         {
-            sprintf(pBueffel,"ERROR: failed to read status bit %d",
-                    iByte);
-            SCWrite(pCon,pBueffel,eError);
-            return 0;        
-         }
-         sprintf(pBueffel,"%s.status.%3.3d.%1.1d = %d",argv[0],iByte,iBit,iSet);
-         SCWrite(pCon,pBueffel,eValue);
-         return 1;
-     }
-     else if(strcmp(argv[1],"adc") == 0) /* ADC values */
-     {
-         /* which ADC ? */
-         iRet = Tcl_GetInt(pSics->pTcl,argv[2],&iByte);
-         if(iRet != TCL_OK)
-         {
-             sprintf(pBueffel,"ERROR: expected integer argument for ADC, got %s",
-                   argv[2]);
-             SCWrite(pCon,pBueffel,eError);
-             return 0;        
-         }
-         iRet = SPSGetADC(self,iByte,&iSet);
-         if(!iRet)
-         {
-            sprintf(pBueffel,"ERROR: failed to read ADC %d",
-                    iByte);
-            SCWrite(pCon,pBueffel,eError);
-            return 0;        
-         }
-         sprintf(pBueffel,"%s.ADC.%1.1d = %d",argv[0],iByte,iSet);
-         SCWrite(pCon,pBueffel,eValue);
-         return 1;
-     }
-     else if(strcmp(argv[1],"perm") == 0)
-     {
-       /* only managers may set permissions */
-       if(!SCMatchRights(pCon,usMugger))
-       {
-         SCWrite(pCon,"ERROR: Security: Only mangagers may configure SPS buttons",
-                 eError);
-         return 0;        
-       }
-        
-       /* we need lots of parameters */
-        if(argc < 5)
-        {
-              sprintf(pBueffel,"ERROR: need at least three arguments to %s perm",
-                      argv[0]);
-              SCWrite(pCon,pBueffel,eError);
-              return 0;        
-        }
-        /* convert arguments */
-        iRet = Tcl_GetInt(pSics->pTcl,argv[2],&iByte);
-        if(iRet != TCL_OK)
-        {
-           sprintf(pBueffel,"ERROR: expected integer argument for byte, got %s",
-                   argv[2]);
-           SCWrite(pCon,pBueffel,eError);
-           return 0;        
-        }
-        iRet = Tcl_GetInt(pSics->pTcl,argv[3],&iBit);
-        if(iRet != TCL_OK)
-        {
-           sprintf(pBueffel,"ERROR: expected integer argument for bit, got %s",
-                   argv[3]);
-           SCWrite(pCon,pBueffel,eError);
-           return 0;        
-        }
-        /* try to convert user code */
-        strtolower(argv[4]);
-        iSet = -10;
-        i = 0;
-        while(aCode[i] != NULL)
-        {
-          if(strcmp(aCode[i],argv[4]) == 0)
-          {
-            iSet = i;
-            break;
-          }
-          i++;
-        }
-        if(iSet < 0)
-        {
-          sprintf(pBueffel,"ERROR: %s is not valid user code",argv[4]);
-          SCWrite(pCon,pBueffel,eError);
-          return 0;
-        }
-        /* do it, finally */
-        SPSAddPermission(self,iByte,iBit,iSet);
-        SCSendOK(pCon);
-        return 1;    
-     }
-/* -------- sans collimator */
-     else if(strcmp(argv[1],"colli") == 0)
-     {
-       iRet = SPSGetSANS(self,&fLang);
-       if(!iRet)
-       {
-          SCWrite(pCon,"ERROR: cannot read SANS collimator",eError);
-          return 0;
-       }
-       else
-       {
-          sprintf(pBueffel,"SANS.collimator = %f",fLang);
-          SCWrite(pCon,pBueffel,eValue);
-          return 1;
-       }
-     }
-     sprintf(pBueffel,"ERROR: %s does not not understand subcommand %s",
-             argv[0], argv[1]);
-     SCWrite(pCon,pBueffel,eError);        
-     return 0;
-  }
diff --git a/sps.h b/sps.h
deleted file mode 100644
index e6f6fc21..00000000
--- a/sps.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-/*------------------------------------------------------------------------
-                            S P S
-
-  A module to handle Siemens SPS controllers at SINQ. For more information 
-  see sps.tex
-
-  Mark Koennecke, Juli 1998
-----------------------------------------------------------------------------*/
-#ifndef SICSSPS
-#define SICSSPS
-
-   typedef struct __SPS *pSPS;
-/*-------------------------------------------------------------------------*/
-   int SPSSetButton(pSPS self, SConnection *pCon, int iByte, int iBit);
-   int SPSGetStatus(pSPS self, int iStatus, int *iSet);
-   int SPSGetSANS(pSPS self, float *fVal);
-   int SPSGetADC(pSPS self, int iWhich, int *iValue);
-   void SPSAddPermission(pSPS self, int iByte, int iBit, int iRight);
-/*------------------------------------------------------------------------*/
-   int SPSFactory(SConnection *pCon, SicsInterp *pSics, void *pData,
-                  int argc, char *argv[]);
-
-   int SPSAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-                 int argc, char *argv[]);
-
-#endif
diff --git a/sps.i b/sps.i
deleted file mode 100644
index 83739164..00000000
--- a/sps.i
+++ /dev/null
@@ -1,26 +0,0 @@
-
-/*--------------------------------------------------------------------------
-  SPS Controller module internal header file. Do not include. Leave 
-  alone. Is automatically created from another file.
----------------------------------------------------------------------------*/
-
-   typedef struct {
-                   int iByte;
-                   int iBit;
-                   int iPrivilege;
-                  }Permission, *pPermission;
-
-
-
-   typedef struct __SPS {
-                           pObjectDescriptor pDes;
-                           int iMode;
-                           int iLastError;
-                           char *pHost;
-                           int iPort;
-                           int iChannel;
-                           int lPermissions;
-                           void *pData;
-                         } SPS;
-
-      
diff --git a/sps.tex b/sps.tex
deleted file mode 100644
index f4945b80..00000000
--- a/sps.tex
+++ /dev/null
@@ -1,198 +0,0 @@
-\subsection{SPS Controllers}
-This module is very specific to SINQ. At SINQ there are Siemens SPS
-controllers which are used to put beam components in, lift air cushions etc.
-Essentially these are push button devices. There exists a protocoll for
-pushing buttons through a RS--232 interface. This protocoll is described
-elsewhere. 
-
-These obscure SPS devices support three types of functionalities:
-\begin{itemize}
-\item Bits may be flipped. This correcponds to pushing a button. There are
-12b bytes of those with 8 bits each.
-\item Status bits may be read. This allows to figure out if an operation
-succeeded. 128 status bits are available.
-\item Furthermore this thing has up to 8 ADC inputs. These can be read as
-well.
-\end{itemize}
-This module implements a means to communicate with SPS devices. It will
-support the three functionalities in the list above. This is more a module
-providing a basic functionality. In practice this will and should be wrapped
-into Tcl wrapper functions. This is the best solution because bit
-assignements vary between instruments and tend to change all the time. Or at
-least seem to, as the electricians don't talk to us.  As this is no general
-device the usual SICS division between hardware object and hardware driver
-will not be upheld. 
-
-There is a problem with pushing buttons. Not all buttons may be pushed
-remotely, for instance it may not be permitted to operate the beam shutter
-remotely. Not all of the bits in the SPS actually correspond to a pressable
-button but are set as consequence of a pushed button. In order to run all
-this a permission list must be configured for each SPS controller. This list
-holds the adress of the bit and the privelege required to operate this
-button. If a bit is not in the list permission is automatically not given to
-operate it. Each entry in this permission list looks like this:
-
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap1}
-$\langle$permlist {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@   typedef struct {@\\
-\mbox{}\verb@                   int iByte;@\\
-\mbox{}\verb@                   int iBit;@\\
-\mbox{}\verb@                   int iPrivilege;@\\
-\mbox{}\verb@                  }Permission, *pPermission;@\\
-\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}
-The fields are: the byte we refer to, the bit in the byte and the Privilege
-required to operate this switch. Entries of this kind will be held in a
-standard linked list.
-
-
-
-In order to run the SPS, the following data strucure is required:
-
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap2}
-$\langle$spsdata {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@   typedef struct __SPS {@\\
-\mbox{}\verb@                           pObjectDescriptor pDes;@\\
-\mbox{}\verb@                           int iMode;@\\
-\mbox{}\verb@                           int iLastError;@\\
-\mbox{}\verb@                           char *pHost;@\\
-\mbox{}\verb@                           int iPort;@\\
-\mbox{}\verb@                           int iChannel;@\\
-\mbox{}\verb@                           int lPermissions;@\\
-\mbox{}\verb@                           void *pData;@\\
-\mbox{}\verb@                         } SPS;@\\
-\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}
-The fields are:
-\begin{description}
-\item[pDes] The SICS standard object descriptor.
-\item[iMode] The SPS can be operated in simulation mode for software
-testing. This flag denotes that.
-\item[iLastError] an integer code representing the last error, if any.
-\item[pHost] The Macintosh computer running the serial port server.
-\item[iPort] The TCP/IP port number where the Macintosh serial port server
-is listening.
-\item[iChannel] The serial port ID to which the SPS controller is connected
-to.
-\item[lPermissions] The linked list where the permissions are stored.
-\item[pData] The private data structure for serial communication with the
-SPS.
-\end{description}
-
-
-The external interface to this module looks like this:
-
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap3}
-$\langle$spshead {\footnotesize ?}$\rangle\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@   typedef struct __SPS *pSPS;@\\
-\mbox{}\verb@/*-------------------------------------------------------------------------*/@\\
-\mbox{}\verb@   int SPSSetButton(pSPS self, SConnection *pCon, int iByte, int iBit);@\\
-\mbox{}\verb@   int SPSGetStatus(pSPS self, int iStatus, int *iSet);@\\
-\mbox{}\verb@   int SPSGetSANS(pSPS self, float *fVal);@\\
-\mbox{}\verb@   int SPSGetADC(pSPS self, int iWhich, int *iValue);@\\
-\mbox{}\verb@   void SPSAddPermission(pSPS self, int iByte, int iBit, int iRight);@\\
-\mbox{}\verb@/*------------------------------------------------------------------------*/@\\
-\mbox{}\verb@   int SPSFactory(SConnection *pCon, SicsInterp *pSics, void *pData,@\\
-\mbox{}\verb@                  int argc, char *argv[]);@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@   int SPSAction(SConnection *pCon, SicsInterp *pSics, void *pData,@\\
-\mbox{}\verb@                 int argc, char *argv[]);@\\
-\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}
-The functions and their meaning are described below. All function return 1
-on success and 0 on failure.
-\begin{description}
-\item[SPSSetButton] Tries to set the button described by iByte and iBit.
-pCon is needed to determine user rights associated with the request. Please note that a
-successful return from this function means that the button has been pressed
-but not that the SPS has successfully completed the requested action. In
-order to check for that you have to check the associated status bit.
-\item[SPSGetStatus] Requests the value of the status bit iStatus. iSet will
-be set to 1 if the bit is set or 0 if not.
-\item[SPSGetSANS] is a special function for reading the collimation 
-length from the SANS collimator SPS controller. This requires checking tons
- of bits. For efficiency this has been put into a separate function. 
-\item[SPSGetADC] requests the value of the ADC channel iWhich. The value is
-returned in iValue. Please note that this is probably a meaningless integer
-value which has to be converted to a physically meaningful value.
-\item[SPSFactory] is the interpreter factory function which will be used to
-create command in the interpreter representing SPS controllers.
-\item[SPSAction] implements the actual commands in the SICS interpreter for
-interacting with the SPS controller. 
-\end{description} 
-
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap4}
-\verb@"sps.i"@ {\footnotesize ? }$\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@/*--------------------------------------------------------------------------@\\
-\mbox{}\verb@  SPS Controller module internal header file. Do not include. Leave @\\
-\mbox{}\verb@  alone. Is automatically created from another file.@\\
-\mbox{}\verb@---------------------------------------------------------------------------*/@\\
-\mbox{}\verb@@$\langle$permlist {\footnotesize ?}$\rangle$\verb@@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@@$\langle$spsdata {\footnotesize ?}$\rangle$\verb@@\\
-\mbox{}\verb@      @\\
-\mbox{}\verb@@$\diamond$
-\end{list}
-\vspace{-2ex}
-\end{minipage}\\[4ex]
-\end{flushleft}
-\begin{flushleft} \small
-\begin{minipage}{\linewidth} \label{scrap5}
-\verb@"sps.h"@ {\footnotesize ? }$\equiv$
-\vspace{-1ex}
-\begin{list}{}{} \item
-\mbox{}\verb@@\\
-\mbox{}\verb@/*------------------------------------------------------------------------@\\
-\mbox{}\verb@                            S P S@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  A module to handle Siemens SPS controllers at SINQ. For more information @\\
-\mbox{}\verb@  see sps.tex@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  Mark Koennecke, Juli 1998@\\
-\mbox{}\verb@----------------------------------------------------------------------------*/@\\
-\mbox{}\verb@#ifndef SICSSPS@\\
-\mbox{}\verb@#define SICSSPS@\\
-\mbox{}\verb@@$\langle$spshead {\footnotesize ?}$\rangle$\verb@@\\
-\mbox{}\verb@#endif@\\
-\mbox{}\verb@@$\diamond$
-\end{list}
-\vspace{-2ex}
-\end{minipage}\\[4ex]
-\end{flushleft}
diff --git a/sps.w b/sps.w
deleted file mode 100644
index c1c01500..00000000
--- a/sps.w
+++ /dev/null
@@ -1,144 +0,0 @@
-\subsection{SPS Controllers}
-This module is very specific to SINQ. At SINQ there are Siemens SPS
-controllers which are used to put beam components in, lift air cushions etc.
-Essentially these are push button devices. There exists a protocoll for
-pushing buttons through a RS--232 interface. This protocoll is described
-elsewhere. 
-
-These obscure SPS devices support three types of functionalities:
-\begin{itemize}
-\item Bits may be flipped. This correcponds to pushing a button. There are
-12b bytes of those with 8 bits each.
-\item Status bits may be read. This allows to figure out if an operation
-succeeded. 128 status bits are available.
-\item Furthermore this thing has up to 8 ADC inputs. These can be read as
-well.
-\end{itemize}
-This module implements a means to communicate with SPS devices. It will
-support the three functionalities in the list above. This is more a module
-providing a basic functionality. In practice this will and should be wrapped
-into Tcl wrapper functions. This is the best solution because bit
-assignements vary between instruments and tend to change all the time. Or at
-least seem to, as the electricians don't talk to us.  As this is no general
-device the usual SICS division between hardware object and hardware driver
-will not be upheld. 
-
-There is a problem with pushing buttons. Not all buttons may be pushed
-remotely, for instance it may not be permitted to operate the beam shutter
-remotely. Not all of the bits in the SPS actually correspond to a pressable
-button but are set as consequence of a pushed button. In order to run all
-this a permission list must be configured for each SPS controller. This list
-holds the adress of the bit and the privelege required to operate this
-button. If a bit is not in the list permission is automatically not given to
-operate it. Each entry in this permission list looks like this:
-
-@d permlist @{
-   typedef struct {
-                   int iByte;
-                   int iBit;
-                   int iPrivilege;
-                  }Permission, *pPermission;
-@}
-The fields are: the byte we refer to, the bit in the byte and the Privilege
-required to operate this switch. Entries of this kind will be held in a
-standard linked list.
-
-
-
-In order to run the SPS, the following data strucure is required:
-
-@d spsdata @{
-   typedef struct __SPS {
-                           pObjectDescriptor pDes;
-                           int iMode;
-                           int iLastError;
-                           char *pHost;
-                           int iPort;
-                           int iChannel;
-                           int lPermissions;
-                           void *pData;
-                         } SPS;
-@}
-
-The fields are:
-\begin{description}
-\item[pDes] The SICS standard object descriptor.
-\item[iMode] The SPS can be operated in simulation mode for software
-testing. This flag denotes that.
-\item[iLastError] an integer code representing the last error, if any.
-\item[pHost] The Macintosh computer running the serial port server.
-\item[iPort] The TCP/IP port number where the Macintosh serial port server
-is listening.
-\item[iChannel] The serial port ID to which the SPS controller is connected
-to.
-\item[lPermissions] The linked list where the permissions are stored.
-\item[pData] The private data structure for serial communication with the
-SPS.
-\end{description}
-
-
-The external interface to this module looks like this:
-
-@d spshead @{
-   typedef struct __SPS *pSPS;
-/*-------------------------------------------------------------------------*/
-   int SPSSetButton(pSPS self, SConnection *pCon, int iByte, int iBit);
-   int SPSGetStatus(pSPS self, int iStatus, int *iSet);
-   int SPSGetSANS(pSPS self, float *fVal);
-   int SPSGetADC(pSPS self, int iWhich, int *iValue);
-   void SPSAddPermission(pSPS self, int iByte, int iBit, int iRight);
-/*------------------------------------------------------------------------*/
-   int SPSFactory(SConnection *pCon, SicsInterp *pSics, void *pData,
-                  int argc, char *argv[]);
-
-   int SPSAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-                 int argc, char *argv[]);
-@}
-
-The functions and their meaning are described below. All function return 1
-on success and 0 on failure.
-\begin{description}
-\item[SPSSetButton] Tries to set the button described by iByte and iBit.
-pCon is needed to determine user rights associated with the request. Please note that a
-successful return from this function means that the button has been pressed
-but not that the SPS has successfully completed the requested action. In
-order to check for that you have to check the associated status bit.
-\item[SPSGetStatus] Requests the value of the status bit iStatus. iSet will
-be set to 1 if the bit is set or 0 if not.
-\item[SPSGetSANS] is a special function for reading the collimation 
-length from the SANS collimator SPS controller. This requires checking tons
- of bits. For efficiency this has been put into a separate function. 
-\item[SPSGetADC] requests the value of the ADC channel iWhich. The value is
-returned in iValue. Please note that this is probably a meaningless integer
-value which has to be converted to a physically meaningful value.
-\item[SPSFactory] is the interpreter factory function which will be used to
-create command in the interpreter representing SPS controllers.
-\item[SPSAction] implements the actual commands in the SICS interpreter for
-interacting with the SPS controller. 
-\end{description} 
-
-@o sps.i @{
-/*--------------------------------------------------------------------------
-  SPS Controller module internal header file. Do not include. Leave 
-  alone. Is automatically created from another file.
----------------------------------------------------------------------------*/
-@<permlist@>
-
-@<spsdata@>
-      
-@}
-
-@o sps.h @{
-/*------------------------------------------------------------------------
-                            S P S
-
-  A module to handle Siemens SPS controllers at SINQ. For more information 
-  see sps.tex
-
-  Mark Koennecke, Juli 1998
-----------------------------------------------------------------------------*/
-#ifndef SICSSPS
-#define SICSSPS
-@<spshead@>
-#endif
-@}
diff --git a/swmotor.c b/swmotor.c
deleted file mode 100644
index 6a5881f3..00000000
--- a/swmotor.c
+++ /dev/null
@@ -1,547 +0,0 @@
-/*--------------------------------------------------------------------------
-  TOPSI switched motors implementation module. Three motors share a common
-  EL734 motor. The actual motor is selected through a SPS. More information in
-  file switchedmotor.tex or with Jochen Stahn.
-
-  copyright: see file copyright.h
-
-  Mark Koennecke, May 2001
-  --------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <assert.h>
-#include <stdio.h>
-#include <tcl.h>
-#include "fortify.h"
-#include "sics.h"
-#include "SCinter.h"
-#include "splitter.h"
-#include "hardsup/sinq_prototypes.h"
-#include "hardsup/rs232c_def.h"
-#include "hardsup/el734_def.h"
-#include "hardsup/el734fix.h"
-#include "modriv.h"
-#include "swmotor.h"
-#include "swmotor.i"
-
-/*========================================================================
- We start of by implementing the interface functions for the various 
- interfaces this module has to implement.
- ==========================================================================*/
-static int SWHalt(void *pData)
-{
-  pSWmot self = (pSWmot)pData;
-  assert(self);
-  return self->pMaster->pDrivInt->Halt(self->pMaster);
-}
-/*--------------------------------------------------------------------*/
-static int SWCheckLimits(void *pData, float fVal, char *error, int iErrLen)
-{
-  pSWmot self = (pSWmot)pData;
-  assert(self);
-  return self->pMaster->pDrivInt->CheckLimits(self->pMaster,
-                                              fVal,error,iErrLen);
-}
-/*--------------------------------------------------------------------*/
-static int SWCheckStatus(void *pData, SConnection *pCon)
-{
-  pSWmot self = (pSWmot)pData;
-  assert(self);
-  return self->pMaster->pDrivInt->CheckStatus(self->pMaster,
-                                              pCon);
-}
-/*---------------------------------------------------------------------*/
-static int SWSaveStatus(void *pData, char *name, FILE *fd)
-{
-  pSWmot self = (pSWmot)pData;
-  assert(self);
-
-  fprintf(fd,"%s savedValue = %f\n", name, 
-	  self->positions[self->myNumber]);
-  return 1;
-}
-/*-----------------------------------------------------------------------*/
-static void *SWGetInterface(void *pData, int ID)
-{
-  pSWmot self = (pSWmot)pData;
-  assert(self);
-
-  if(ID == DRIVEID)
-  {
-    return self->pDriv;
-  }
-  return NULL;
-}
-/*----------------------------------------------------------------------*/
-static float SWGetValue(void *pData, SConnection *pCon)
-{
-  pSWmot self = (pSWmot)pData;
-  float fVal;
-  assert(self);
-
-  /*
-    we are not selected: return stored data:
-  */
-  if(self->myNumber != self->selectedMotor[0]) 
-  {
-    SCWrite(pCon,"WARNING: motor not activem returning stored value",
-            eWarning);
-    return self->positions[self->myNumber];
-  }
-  else
-  {
-    fVal = self->pMaster->pDrivInt->GetValue(self->pMaster, pCon);
-    self->positions[self->myNumber] = fVal;
-    return fVal;
-  }
-}
-/*-----------------------------------------------------------------------*/
-static long SWSetValue(void *pData, SConnection *pCon, float fVal)
-{
-  pSWmot self = (pSWmot)pData;
-  char pCommand[256], pError[132];
-  int status;
-  EL734Driv *pElli;  
-  Tcl_Interp *pTcl;
-
-  assert(self);
-  self->errCode = 1;
-
-  /*
-   first case: we are already selected
-  */
-  if(self->myNumber == self->selectedMotor[0])
-  {
-    return self->pMaster->pDrivInt->SetValue(self->pMaster,pCon,fVal);
-  }
-  else
-  {
-    /*
-      second case: switch to the requested motor, do a reference run
-      and then execute Set command
-    */
-    sprintf(pCommand,"Switching to motor number %d", self->myNumber);
-    SCWrite(pCon,pCommand,eWarning);
-    sprintf(pCommand,"%s %d",self->switchFunc, self->myNumber);
-    pTcl = (Tcl_Interp *)pServ->pSics->pTcl;
-    status  = Tcl_Eval(pTcl,pCommand);
-    strncpy(pError,pTcl->result, 131);
-    if(status !=  TCL_OK || strstr(pError,"OK") == NULL)
-    {
-      sprintf(pCommand,"ERROR: %s while switching motor", pError);
-      SCWrite(pCon,pCommand, eError);
-      self->errCode = -1001;
-      return HWFault;
-    }
-    self->selectedMotor[0] = self->myNumber;
-
-    /*
-     switch done! Start a reference run
-    */
-    SicsWait(10);
-    SCWrite(pCon,"Standby, starting reference run... ", eWarning);
-    pElli = (EL734Driv *)self->pMaster->pDriver;
-    sprintf(pCommand,"R %d\r",pElli->iMotor);
-    status = EL734_SendCmnd(&(pElli->EL734struct),
-                             pCommand,
-                             pError, 131);
-    if(status != 1)
-    {
-      sprintf(pCommand,"ERROR: %s while trying to start reference run",
-              pError);
-      SCWrite(pCon,pCommand,eError);
-      self->errCode = -1002;
-      return HWFault;
-    }    
-    /*
-     now loop forever until reference run is done. This is either when the
-     motors stops being busy or when  the user interrupts.
-    */
-    sprintf(pCommand,"SS %d\r",pElli->iMotor);
-    for( ; ;)
-    {
-       status = EL734_SendCmnd(&(pElli->EL734struct),
-                               pCommand,
-                               pError, 131);
-       if(status != 1)
-       {
-	 sprintf(pCommand,"ERROR: %s during reference run",
-		 pError);
-	 SCWrite(pCon,pCommand,eError);
-	 self->errCode = -1003;
-	 return HWFault;
-       }
-       if(strstr(pError,"?BSY") == NULL)
-	 break;
-       if(SCGetInterrupt(pCon) != eContinue)
-       {
-	 self->errCode = -1004;
-         SCWrite(pCon,"ERROR: user interrupted reference run",eError);
-         return HWFault;
-       }
-       SicsWait(2);
-    }
-
-    /*
-     now this is finished. We can really start driving the motor
-    */
-    SCWrite(pCon,"Reference run completed, starting to drive motor..",
-            eWarning);
-    return self->pMaster->pDrivInt->SetValue(self->pMaster,pCon,fVal);
-  }
-}   
-/*----------------------------------------------------------------------*/
-static void KillSWFull(void *pData)
-{
-  pSWmot self = (pSWmot)pData;
-  if(self == NULL)
-    return;
-  
-  if(self->pDriv)
-    free(self->pDriv);
-  if(self->pDes)
-    DeleteDescriptor(self->pDes);
-  if(self->selectedMotor)
-    free(self->selectedMotor);
-  if(self->switchFunc)
-    free(self->switchFunc);
-  free(self);
-}
-/*---------------------------------------------------------------------*/
-static void KillSWHalf(void *pData)
-{
-  pSWmot self = (pSWmot)pData;
-  if(self)
-    free(self);
-}
-/*----------------------------------------------------------------------
-  Alright, now the interpreter functions follow
-  Usage:
-         MakeSWMotor master switchFunc slave1 slave2 slave3
-  -----------------------------------------------------------------------*/
-int MakeSWMotor(SConnection *pCon, SicsInterp *pSics, void *pData,
-                   int argc, char *argv[])
-{
-  pSWmot sw1, sw2, sw3;
-  char pBueffel[256];
-  int i, status;
-
-  /*
-   check that we have enough arguments
-  */
-  if(argc < 6)
-  {
-    SCWrite(pCon,"ERROR: insufficient number of arguments to MakeSWMotor",
-            eError);
-    return 0;
-  }
-  
-  /*
-   allocate a new data structure 
-  */
-  sw1 = (pSWmot)malloc(sizeof(SWmot));
-  if(sw1 == NULL)
-  {
-    SCWrite(pCon,"ERROR: out of memory in MakeSWMotor",eError);
-    return 0;
-  }
-  memset(sw1,0,sizeof(SWmot));
-  
-  /*
-    fill it up with stuff
-  */
-  sw1->pDes = CreateDescriptor("Sparbroetchen");
-  sw1->pDriv = CreateDrivableInterface();
-  sw1->selectedMotor = (int *)malloc(sizeof(int));
-  if(!sw1->pDes || ! sw1->pDriv || !sw1->selectedMotor)
-  {
-    SCWrite(pCon,"ERROR: out of memory in MakeSWMotor",eError);
-    return 0;
-  }
-  sw1->selectedMotor[0] = -1;
-  sw1->pMaster = FindMotor(pSics,argv[1]);
-  if(!sw1->pMaster)
-  {
-    sprintf(pBueffel,"ERROR: cannot find master motor %s", argv[1]);
-    SCWrite(pCon,pBueffel,eError);
-    return 0;
-  }  
-  sw1->switchFunc = strdup(argv[2]);
-  for(i = 0; i < 3; i++)
-  {
-    strcpy(sw1->slaves[i],argv[3+i]);
-  } 
-
-  /*
-    initialize function pointers
-  */
-  sw1->pDes->SaveStatus = SWSaveStatus;
-  sw1->pDes->GetInterface = SWGetInterface;
-  sw1->pDriv->GetValue = SWGetValue;
-  sw1->pDriv->SetValue = SWSetValue;
-  sw1->pDriv->Halt     = SWHalt;
-  sw1->pDriv->CheckStatus = SWCheckStatus;
-  sw1->pDriv->CheckLimits = SWCheckLimits;
-
-  /*
-   create clones of the new data structure ofr the other slaves
-  */
-  sw2 = (pSWmot)malloc(sizeof(SWmot));
-  sw3 = (pSWmot)malloc(sizeof(SWmot));
-  if(!sw2 || !sw2) 
-  {
-    SCWrite(pCon,"ERROR: out of memory in MakeSWMotor",eError);
-    return 0;
-  }
-  memcpy(sw2,sw1,sizeof(SWmot));
-  sw2->myNumber = 1;
-  memcpy(sw3,sw1,sizeof(SWmot));
-  sw3->myNumber = 2;
-
-  /*
-    install commands
-  */
-  status = AddCommand(pSics, argv[3], SWMotorAction, KillSWFull, sw1);
-  if(!status)
-  {
-    sprintf(pBueffel,"ERROR: command %s already exists!",argv[3]);
-    SCWrite(pCon,pBueffel,eError);
-    return 0;
-  }
-  status = AddCommand(pSics, argv[4], SWMotorAction, KillSWHalf, sw2);
-  if(!status)
-  {
-    sprintf(pBueffel,"ERROR: command %s already exists!",argv[4]);
-    SCWrite(pCon,pBueffel,eError);
-    return 0;
-  }
-  status = AddCommand(pSics, argv[5], SWMotorAction, KillSWHalf, sw3);
-  if(!status)
-  {
-    sprintf(pBueffel,"ERROR: command %s already exists!",argv[3]);
-    SCWrite(pCon,pBueffel,eError);
-    return 0;
-  }
-
-  return 1;
-}
-/*-------------------------------------------------------------------
-  some prototypes from functions implemented in motor.c
-  --------------------------------------------------------------------*/
-void MotorListLL(pMotor self, SConnection *pCon);
-void MotorReset(pMotor pM);
-/*---------------------------------------------------------------------*/
-int SWMotorAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-                   int argc, char *argv[])
-{
-    char pBueffel[512];
-    TokenList *pList = NULL;
-    TokenList *pCurrent;
-    TokenList *pName; 
-    int iRet;
-    pSWmot self = NULL;
-    float fValue;
-    long lID;
-    
-    assert(pCon);
-    assert(pSics);
-    assert(pData);
-    
-    self = (pSWmot)pData;
-    
-    /* create Tokenlist */
-    argtolower(argc,argv);
-    pList = SplitArguments(argc,argv);
-    if(!pList)
-    {
-      SCWrite(pCon,"Error parsing argument list in SWMotorAction",eError);
-      return 0;
-    }
-  
-     /* first argument can be one of list, reset or parameter name */   
-     pCurrent = pList->pNext;
-     if(!pCurrent) /* no argument, print value */
-     {
-        fValue = self->pDriv->GetValue(self,pCon);
-        if(fValue < -990.)
-        {
-              sprintf(pBueffel,"Error obtaining position for %s",argv[0]);
-              SCWrite(pCon,pBueffel,eValue);
-              DeleteTokenList(pList);
-              return 0;
-         }
-         sprintf(pBueffel,"%s = %f",argv[0],fValue);
-         SCWrite(pCon,pBueffel,eValue);
-         DeleteTokenList(pList);
-         return 1; 
-     }
-     
-     /* check for list */  
-     if(strcmp(pCurrent->text,"list") == 0)
-     {
-        MotorListLL(self->pMaster,pCon);
-        DeleteTokenList(pList);
-        return 1;
-     } /* check for reset */
-     else if(strcmp(pCurrent->text,"reset") == 0)
-     {
-       if(!SCMatchRights(pCon,usUser))
-       {
-         sprintf(pBueffel,"Insufficient privilege to reset %s",
-                 argv[0]);
-         SCWrite(pCon,pBueffel,eError);
-         DeleteTokenList(pList);
-         return 0;         
-       }
-       MotorReset(self->pMaster);
-       DeleteTokenList(pList);
-       SCSendOK(pCon);
-       return 1;
-     }
-     else if(strcmp(pCurrent->text,"savedValue") == 0)
-     {
-       pCurrent = pCurrent->pNext;
-       if(!pCurrent)
-       {
-	 /*
-          print Value
-	 */
-         sprintf(pBueffel,"%s.savedValue = %f", argv[0], 
-                 self->positions[self->myNumber]);
-         SCWrite(pCon,pBueffel,eValue);
-	 DeleteTokenList(pList);
-         return 1;
-       }
-       else
-       {
-	 /*
-          set saveValue, must be a numeric parameter
-	 */
-          if(pCurrent->Type == eInt)
-          {
-            fValue = (float)pCurrent->iVal;
-          } 
-          else if(pCurrent->Type == eFloat)
-          {
-            fValue = pCurrent->fVal;
-          }
-          else
-          {
-            sprintf(pBueffel,"Wrong argument type for %s %s ",
-                    argv[0],"saveValue");
-            SCWrite(pCon,pBueffel,eError); 
-            DeleteTokenList(pList);
-            return 0;
-          }
-          self->positions[self->myNumber] = fValue;
-          SCSendOK(pCon);
-          return 1;
-       }
-     } 
-     else if(strcmp(pCurrent->text,"selected") == 0)
-     {
-       pCurrent = pCurrent->pNext;
-       if(!pCurrent)
-       {
-	 /*
-          print Value
-	 */
-         sprintf(pBueffel,"%s.selected = %d", argv[0], 
-                 self->selectedMotor[0]);
-         SCWrite(pCon,pBueffel,eValue);
-	 DeleteTokenList(pList);
-         return 1;
-       }
-       else
-       {
-	 /*
-          set selected, must be a numeric parameter
-	 */
-          if(pCurrent->Type == eInt)
-          {
-            fValue = (float)pCurrent->iVal;
-          } 
-          else if(pCurrent->Type == eFloat)
-          {
-            fValue = pCurrent->fVal;
-          }
-          else
-          {
-            sprintf(pBueffel,"Wrong argument type for %s %s ",
-                    argv[0],"selected");
-            SCWrite(pCon,pBueffel,eError); 
-            DeleteTokenList(pList);
-            return 0;
-          }
-          self->selectedMotor[0] = (int)fValue;
-          SCSendOK(pCon);
-          return 1;
-       }
-     } 
-     else /* one of the parameter commands or error left now */
-     {
-        pName = pCurrent;
-        pCurrent = pCurrent->pNext;
-        if(!pCurrent) /* no third par: print val */
-        {
-          /* deal with position first */
-          if(strcmp(pName->text,"position") == 0)
-          {
-            fValue = self->pDriv->GetValue(self,pCon);
-            if(fValue < 999.)
-            {
-              sprintf(pBueffel,"Error obtaining position for %s",argv[0]);
-              SCWrite(pCon,pBueffel,eValue);
-              DeleteTokenList(pList);
-              return 0;
-            }
-            sprintf(pBueffel,"%s.SoftPosition = %f",argv[0],fValue);
-            SCWrite(pCon,pBueffel,eValue);
-            DeleteTokenList(pList);
-            return 1;
-          }
-          iRet = MotorGetPar(self->pMaster,pName->text,&fValue);
-          if(!iRet)
-          { 
-            sprintf(pBueffel,"Parameter %s not found ",pName->text);
-            SCWrite(pCon,pBueffel,eValue);
-            DeleteTokenList(pList);
-            return 0;
-          }
-          else
-          {
-            sprintf(pBueffel, " %s.%s = %f",argv[0],pName->text,fValue);
-            SCWrite(pCon,pBueffel,eValue);
-            DeleteTokenList(pList);
-            return 1;
-          }
-        }
-        else /* set */
-        { /* set command */
-          /* parameter must be numerical value */
-          if(pCurrent->Type == eInt)
-          {
-            fValue = (float)pCurrent->iVal;
-          } 
-          else if(pCurrent->Type == eFloat)
-          {
-            fValue = pCurrent->fVal;
-          }
-          else
-          {
-            sprintf(pBueffel,"Wrong argument type for %s %s set",
-                    argv[0],pName->text);
-            SCWrite(pCon,pBueffel,eError); 
-            DeleteTokenList(pList);
-            return 0;
-          }
-          iRet = MotorSetPar(self->pMaster,pCon,pName->text,fValue);
-          DeleteTokenList(pList);
-          if(iRet)
-            SCSendOK(pCon);
-          return iRet;
-        }
-     }
-     return 0;
-}
-
-
diff --git a/swmotor.h b/swmotor.h
deleted file mode 100644
index cc15e6a6..00000000
--- a/swmotor.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-/*----------------------------------------------------------------------
-  TOPSI switched motors. Three motors share a EL734 motor. Between is
-  switched through a SPS. 
-
-  Mark Koennecke, May 2001
------------------------------------------------------------------------*/
-#ifndef SWMOTOR
-#define SWMOTOR
-#include "obdes.h"
-#include "interface.h"
-#include "motor.h"
-
-  int MakeSWMotor(SConnection *pCon, SicsInterp *pSics, void *pData,
-                   int argc, char *argv[]);
-
-  int SWMotorAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-                   int argc, char *argv[]);
-
-#endif 
diff --git a/swmotor.i b/swmotor.i
deleted file mode 100644
index 5efd2413..00000000
--- a/swmotor.i
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/* ----------------------------------------------------------------------
- Internal data structure for the switched motor module. For
- documentation see swmotor.tex.
-
- Mark Koennecke, May 2001
-----------------------------------------------------------------------*/
-
-        typedef struct __SWMOT {
-                               pObjectDescriptor pDes;
-                               pIDrivable pDriv;
-                               pMotor pMaster;
-                               int *selectedMotor;
-                               int myNumber;
-                               float positions[3];
-                               char slaves[3][80];
-                               char *switchFunc;
-                               int errCode;
-                               } SWmot, *pSWmot;
-
- 
diff --git a/tas.c b/tas.c
deleted file mode 100644
index ffcbf775..00000000
--- a/tas.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*--------------------------------------------------------------------------
-  This is the implementation file for the TASMAD simulation module for
-  SICS. The requirement is to make SICS look as much as TASMAD as 
-  possible. This includes:
-  - TASMAD is variable driven
-  - Sometimes variables are accessed in storage order.
-  - A complicated calculation has to be done for getting the instruments
-    settings right. The appropriate F77 routine from TASMAD will be 
-    reused.
-  - The scan logic is different.
-  - Output of ILL-formatted data files is required. 
-
-  Mark Koennecke, November 2000
----------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <assert.h>
-#include "fortify.h"
-#include "sics.h"
-#include "sicsvar.h"
-#include "counter.h"
-#include "motor.h"
-#include "tas.h"
-
-/*
-  As variables may be accessed in storage order, it is necessary to 
-  know the order of the motors
-*/
-extern char *tasMotorOrder[] = { "A1", 
-                              "A2",
-                              "A3",
-                              "A4",
-                              "A5",
-                              "A6",
-                              "MCV",
-                              "SRO",
-                              "ACH",
-                              "MTL",
-                              "MTU",
-                              "STL",
-                              "STU",
-                              "ATL",
-                              "ATU",
-                              "MGL",
-                              "SGL",
-                              "SGU",
-                              "AGL",
-                              NULL };
-/*
-  In order to initialise the variable array in the TAS data structure we
-  need to know the names of the variables in the right order. This order
-  has to match the order defined in tas.h through the defines.
-*/ 
-char *tasVariableOrder[] = {
-                            "WAV",
-                            "DM",
-                            "DA",
-                            "ETAM",
-                            "ETAA",
-                            "TI",
-                            "MN",
-                            "IF1V",
-                            "IF1H",
-                            "IF2V",
-                            "IF2H",
-                            "HELM",
-                            "AS",
-                            "BS",
-                            "CS",
-                            "AA",
-                            "BB",
-                            "CC",
-                            "ETAS",
-                            "AX",
-                            "AY",
-                            "AZ",
-                            "BX",
-                            "BY",
-                            "BZ",
-                            "EI",
-                            "KI",
-                            "EF",
-                            "KF",
-                            "QH",
-                            "QK",
-                            "QL",
-                            "EN",
-                            "QM",
-                            "HX",
-                            "HY",
-                            "HZ",
-                            "DA1",
-                            "DA2",
-                            "DA3",
-                            "DA4",
-                            "DA5",
-                            "DA6",
-                            "DMCV",
-                            "SRO",
-                            "DACH",
-                            "DMTL",
-                            "DMTU",
-                            "DSTL",                               
-                            "DSTU",
-                            "DATL",
-                            "DATU",
-                            "DMGL",
-                            "DSGL",
-                            "DSGU",
-                            "DAGL",
-                            "DEI",
-                            "DKI",
-                            "DEF",
-                            "DKF",
-                            "DQH",
-                            "DQK",
-                            "DEN",
-                            "DQM",
-                            "DT",
-                            "SM",
-                            "SS",
-                             "SA",
-                            "FX",
-                            "NP",
-                            "F1",
-                            "F2",
-                            NULL};
-                
-
-
diff --git a/tas.h b/tas.h
deleted file mode 100644
index 551b13de..00000000
--- a/tas.h
+++ /dev/null
@@ -1,187 +0,0 @@
-
-/*----------------------------------------------------------------------
-   Header file for the SICS triple axis module. Implements new drive
-   and scan commands for triple axis which use the old tasmad F77 
-   routine for calculating the spectrometer setting angles. 
-
-   Mark Koennecke, November 2000
-------------------------------------------------------------------------*/  
-#ifndef SICSTAS
-#define SICSTAS
-
-/*------------------------- parameter defines -------------------------*/
-#define WAV   0
-#define DM    1
-#define DA    2
-#define ETAM  3
-#define ETAA  4
-#define TI    5
-#define MN    6
-#define IF1V  7
-#define IF2V  8
-#define IF1H  9
-#define IF2H 10
-#define HELM 11
-#define AS   12
-#define BS   13
-#define CS   14
-#define AA   15
-#define BB   16
-#define CC   17
-#define ETAS 18
-#define AX   19
-#define AY   20
-#define AZ   21
-#define BX   22
-#define BY   23
-#define BZ   24
-#define EI   25
-#define KI   26
-#define EF   27
-#define KF   28
-#define QH   29
-#define QK   30
-#define QL   31 
-#define EN   32 
-#define QM   33
-
-#define HX   34
-#define HY   35
-#define HZ   36
-
-#define DA1  37 
-#define DA2  38
-#define DA3  39
-#define DA4  40
-#define DA5  41
-#define DA6  42
-#define DMCV 43
-#define DSRO 44
-#define DACH 45
-#define DMTL 46
-#define DMTU 47
-#define DSTL 48
-#define DSTU 49
-#define DATL 50
-#define DATU 51
-#define DMGL 52
-#define DSGL 53
-#define DSGU 54
-#define DAGL 55
-#define DEI  56
-#define DKI  57
-#define DEF  58
-#define DKF  59
-#define DQH  60
-#define DQK  62
-#define DQL  62
-#define DEN  63
-#define DQM  64
-#define DT   65
-#define SM   66
-#define SS   67
-#define SA   68
-#define FX   69
-#define NP   70
-#define F1   71
-#define F2   72
-#define LPA  73
-
-#define MRX1 74
-#define MRX2 75
-#define ARX1 76
-#define ARX2 77
-
-#define INST 78
-#define TIT  79
-#define USR  80
-#define COM  81
-#define ALF1 82
-#define ALF2 83
-#define ALF3 84
-#define ALF4 85
-#define BET1 86
-#define BET2 87
-#define BET3 88
-#define BET4 89
-#define OUT  90
-#define LOC  91
-#define SWUNIT 92
-#define SINFO  93
-#define TEI   94
-#define TKI   95
-#define TEF   96
-#define TKF   97
-#define TQH   98
-#define TQK   99
-#define TQL  100 
-#define TEN  101 
-#define TQM  102
-#define THX  103
-#define THY  104
-#define THZ  105
-
-#define TI1  106
-#define TI2  107
-#define TI3  108
-#define TI4  109
-#define TI5  110
-#define TI6  111
-#define TI7  112
-#define TI8  113
-#define DI1  114
-#define DI2  115
-#define DI3  116
-#define DI4  117
-#define DI5  118
-#define DI6  119
-#define DI7  120
-#define DI8  121
-#define DHX  122
-#define DHY  123
-#define DHZ  124
-#define HCONV1 125
-#define HCONV2 126
-#define HCONV3 127
-#define HCONV4 128
-#define POLFIL 129
-
-#define MAXPAR 130
-#define MAXADD 20
-#define MAXEVAR 12
-
-#define SROMOT 7  /* number of the SRO motor */ 
-#define A4MOT  3  /* index of a4 motor */
-/* --------------------- data structure -------------------------------*/
-
-typedef struct {
-        pObjectDescriptor pDes;
-        pSicsVariable tasPar[MAXPAR];
-        pCounter counter;
-        pScanData pScan;
-        int iPOL; 
-        int iIgnore; /* in order to ignore writing scan points again 
-                        in polarisation mode;
-                    */
-        int addOutput[MAXADD];
-        int addType[MAXADD];
-        int addCount;          
-        int iFileNO;
-        int iFast;
-        char scanVar[80];
-        float oldSRO;
-   }TASdata, *pTASdata;
-
-
-/*---------------------- interface ----------------------------------*/
-
-  int TASFactory(SConnection *pCon, SicsInterp *pSics, void *pData,
-                 int argc, char *argv[]);
-  int TASDrive(SConnection *pCon, SicsInterp *pSics, void *pData,
-                 int argc, char *argv[]);
-  int TASScan(SConnection *pCon, SicsInterp *pSics, void *pData,
-                 int argc, char *argv[]);
-  int TASSet(SConnection *pCon, SicsInterp *pSics, void *pData,
-                 int argc, char *argv[]);
-
-#endif
diff --git a/tas.w b/tas.w
deleted file mode 100644
index f00b5aa6..00000000
--- a/tas.w
+++ /dev/null
@@ -1,255 +0,0 @@
-\subsection{Triple Axis Spectrometer Software}
-A triple axis spectrometer performs complicated scans in Q--energy space.  
-The triple axis spectrometers pose a couple of challenges to the SICS
-software:  \begin{itemize}
-\item The command syntax should be as close as possible to the syntax
-of the ancient tasmad program.
-\item A relatively complicated algorithm is used for computing the
-motor positions and magnet settings. It is a selling point when the
-F77 routine used for this purpose in tasmad can be reused.
-\item A ILL format scan file must be written after each scan in order
-to provide compatability with existing data analysis software.  
-\item Provisions must be made to  execute a batch file at each scan
-point in order to allow for polarisation analysis. 
-\item The user interface of tasmad is largely based on parameters
-which are used to store and manipulate state information. 
-\item There exists a special syntax for assigning variables which
-requires the parameters to be in a special storage order. 
-\end{itemize}
-
-These requirements are implemented in the following way: tasmad
-variables are matched to SICS variables. The scan and drive commands
-are reimplemented in order to allow for both syntax parsing and the
-reuse of the triple axis calculation routines. In order to support the
-strange storage order assignment system the set command is also
-implemented in this modules as it can share code with scan and drive. 
-All the remaining syntax adaptions will be implemented in the
-scripting language.   
-
-
-\subsubsection{Data Structures}
-It would be inconvenient to search all necessary parameters in the
-interpreter anytime a scan or drive command is used. In order to avoid
-this, the parameters are cached in a local data structure which is
-initialized when installing the tas module. 
-
-@d tasdata @{
-typedef struct {
-	pObjectDescriptor pDes;
-        pSicsVariable tasPar[MAXPAR];
-        pCounter counter;
-        pScanData pScan;
-        int iPOL; 
-	int iIgnore; /* in order to ignore writing scan points again 
-                        in polarisation mode;
-	            */
-        int addOutput[MAXADD];
-        int addType[MAXADD];
-        int addCount;          
-        int iFileNO;
-        int iFast;
-        char scanVar[80];
-	float oldSRO;
-   }TASdata, *pTASdata;
-@}
-\begin{description}
-\item[pDes] The standard object descriptor required for any SICs
-object. 
-\item[floatPar] An array of pointers to float parameters. 
-The parameters are indexed through defined constants.
-\item[pScan] A pointer to a SICS scan object.
-\item[iPOL] a flag which is non zer when polarisation analysis is
-required.
-\item[addOutput] TAS scans may have additional output fields besides
-the scan variables in the scan data. This array holds the indices of
-such variables.
-\item[addType] This array holds the type of additional output
-variables. This can be 0 for simple variables or 1 for a motor.
-\item[addCount] is the number of additional output variables.
-\item[iFileNO] is the number of the current data file.  
-\item[iFast] is a flag denoting a fast scan. In a fast scan there is
-no wait for the motors  to finish driving.
-\item[scanVar] memorizes the first scan variable with a step of greater
- zero.
-\item[oldSRO] keeps the old value of the motor SRO. This because the
-helmholtz angle  stored in the variable helm has to be corrected when
-SRO has been driven. This value is initialised in tasdrive and
-TasScanDrive. The actual correction is done in TASUpdate.
-\end{description}
-The constants for the parameters are defined in the header file. 
-
-\subsubsection{Exported Functions}
-These are mainly the interpreter interface functions:
-@d tasfunc @{
-  int TASFactory(SConnection *pCon, SicsInterp *pSics, void *pData,
-                 int argc, char *argv[]);
-  int TASDrive(SConnection *pCon, SicsInterp *pSics, void *pData,
-                 int argc, char *argv[]);
-  int TASScan(SConnection *pCon, SicsInterp *pSics, void *pData,
-                 int argc, char *argv[]);
-  int TASSet(SConnection *pCon, SicsInterp *pSics, void *pData,
-                 int argc, char *argv[]);
-@}
-
-
-@o tas.h @{
-/*----------------------------------------------------------------------
-   Header file for the SICS triple axis module. Implements new drive
-   and scan commands for triple axis which use the old tasmad F77 
-   routine for calculating the spectrometer setting angles. 
-
-   Mark Koennecke, November 2000
-------------------------------------------------------------------------*/  
-#ifndef SICSTAS
-#define SICSTAS
-
-/*------------------------- parameter defines -------------------------*/
-#define WAV   0
-#define DM    1
-#define DA    2
-#define ETAM  3
-#define ETAA  4
-#define TI    5
-#define MN    6
-#define IF1V  7
-#define IF2V  8
-#define IF1H  9
-#define IF2H 10
-#define HELM 11
-#define AS   12
-#define BS   13
-#define CS   14
-#define AA   15
-#define BB   16
-#define CC   17
-#define ETAS 18
-#define AX   19
-#define AY   20
-#define AZ   21
-#define BX   22
-#define BY   23
-#define BZ   24
-#define EI   25
-#define KI   26
-#define EF   27
-#define KF   28
-#define QH   29
-#define QK   30
-#define QL   31 
-#define EN   32 
-#define QM   33
-
-#define HX   34
-#define HY   35
-#define HZ   36
-
-#define DA1  37 
-#define DA2  38
-#define DA3  39
-#define DA4  40
-#define DA5  41
-#define DA6  42
-#define DMCV 43
-#define DSRO 44
-#define DACH 45
-#define DMTL 46
-#define DMTU 47
-#define DSTL 48
-#define DSTU 49
-#define DATL 50
-#define DATU 51
-#define DMGL 52
-#define DSGL 53
-#define DSGU 54
-#define DAGL 55
-#define DEI  56
-#define DKI  57
-#define DEF  58
-#define DKF  59
-#define DQH  60
-#define DQK  62
-#define DQL  62
-#define DEN  63
-#define DQM  64
-#define DT   65
-#define SM   66
-#define SS   67
-#define SA   68
-#define FX   69
-#define NP   70
-#define F1   71
-#define F2   72
-#define LPA  73
-
-#define MRX1 74
-#define MRX2 75
-#define ARX1 76
-#define ARX2 77
-
-#define INST 78
-#define TIT  79
-#define USR  80
-#define COM  81
-#define ALF1 82
-#define ALF2 83
-#define ALF3 84
-#define ALF4 85
-#define BET1 86
-#define BET2 87
-#define BET3 88
-#define BET4 89
-#define OUT  90
-#define LOC  91
-#define SWUNIT 92
-#define SINFO  93
-#define TEI   94
-#define TKI   95
-#define TEF   96
-#define TKF   97
-#define TQH   98
-#define TQK   99
-#define TQL  100 
-#define TEN  101 
-#define TQM  102
-#define THX  103
-#define THY  104
-#define THZ  105
-
-#define TI1  106
-#define TI2  107
-#define TI3  108
-#define TI4  109
-#define TI5  110
-#define TI6  111
-#define TI7  112
-#define TI8  113
-#define DI1  114
-#define DI2  115
-#define DI3  116
-#define DI4  117
-#define DI5  118
-#define DI6  119
-#define DI7  120
-#define DI8  121
-#define DHX  122
-#define DHY  123
-#define DHZ  124
-#define HCONV1 125
-#define HCONV2 126
-#define HCONV3 127
-#define HCONV4 128
-#define POLFIL 129
-
-#define MAXPAR 130
-#define MAXADD 20
-#define MAXEVAR 12
-
-#define SROMOT 7  /* number of the SRO motor */ 
-#define A4MOT  3  /* index of a4 motor */
-/* --------------------- data structure -------------------------------*/
-@<tasdata@>
-
-/*---------------------- interface ----------------------------------*/
-@<tasfunc@>
-#endif
-@}
\ No newline at end of file
diff --git a/tasdrive.c b/tasdrive.c
deleted file mode 100644
index 603b0ee1..00000000
--- a/tasdrive.c
+++ /dev/null
@@ -1,331 +0,0 @@
-/*--------------------------------------------------------------------------
-  This is one implementation file for the TASMAD simulation module for
-  SICS. The requirement is to make SICS look as much as TASMAD as 
-  possible. This includes:
-  - TASMAD is variable driven
-  - Sometimes variables are accessed in storage order.
-  - A complicated calculation has to be done for getting the instruments
-    settings right. The appropriate F77 routine from TASMAD will be 
-    reused.
-  - The scan logic is different.
-  - Output of ILL-formatted data files is required. 
-
-  This file implements the MAD dr command for driving.
-
-  Mark Koennecke, November 2000
-
-  Polarisation support added.
-
-  Mark Koennecke, April 2002
----------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <assert.h>
-#include "fortify.h"
-#include "sics.h"
-#include "sicsvar.h"
-#include "counter.h"
-#include "motor.h"
-#include "scan.h"
-#include "splitter.h"
-#include "tas.h"
-#include "tasu.h"
-
-
-/* a token break function, implemented in stptok.c */
-extern char *stptok(const char *s, char *tok, size_t toklen, char *brk);
-
-#define VAR 1
-#define VALUE 2
-
-/*----------------------------------------------------------------------
-  TASDrive has to do an interesting parsing job: The normal syntax is
-  par=val. However, it is possible that the we get par = val, val, val 
-  which means that the motors following par in storage order are
-  driven. Additionally we have to check for special energy or Q variables
-  which require a triple axis calculation. 
-
-  It helps if one understands some fundamental things used in the code 
-  below:
-  - motorMask holds a value for each motor in the motor list. The
-    value can be either 0 for not to drive or 1 for drive. After
-    successfull parsing these motors will be started. The mask will be built 
-    during parsing. 
-  - newPositions holds the new positions for the normal motors.
-  - tasMask is a mask which indicates which triple axis special variable
-    (Energy or Q) is driven.
-  - tasTargetMask will be set by the TAS calculation and will indicate
-    which motors of the range A1-A6, curvature and currents need to be
-    driven. 
-  - tasTargets holds after the TAS calculation the target values for the
-    A1-A6, curvature and currents  motors.
-
-
--------------------------------------------------------------------------*/  
-#define NUM 1
-#define TXT 2
-
-int TASDrive(SConnection *pCon, SicsInterp *pSics, void *pData,
-                 int argc, char *argv[])
-{
-   pTASdata self = NULL;
-   int iTAS = 0;
-   float tasTargets[20], oldPos, oldEnergy[MAXEVAR];
-   unsigned char tasTargetMask[20], tasMask[MAXEVAR];
-   char *pPtr, pToken[20], pLine[256];
-   int varPointer, i, motorPointer, status, rStatus, lastToken;
-   char pBueffel[256];
-   unsigned char motorMask[MAXMOT]; 
-   float newPositions[MAXMOT];
-   pMotor pMot;
-
-
-
-   assert(pCon);
-   assert(pSics);
-   self = (pTASdata)pData;
-   assert(self);
-
-   /* 
-     check authorization
-   */
-   if(!SCMatchRights(pCon,usUser))
-     return 0;
-
-
-   /* Initialize */
-   Arg2Text(argc, argv,pLine,255);
-   strtolower(pLine);
-   lastToken = NUM;
-   pPtr = pLine + strlen(argv[0]); /* step over command */
-   for(i = 0; i < 10; i++)
-   {
-     tasMask[i] = 0;
-     motorMask[i] = 0;
-     motorMask[10+i] = 0;
-     tasTargets[i] = .0;
-     tasTargets[i+10] = .0;
-     oldEnergy[i] = .0;
-   }
-   tasMask[10] = 0;
-   tasMask[11] = 0;
-
-   for(i = 0; i < MAXMOT; i++)
-   {
-     motorMask[i] = 0;
-   }
-   varPointer = -1; 
-   rStatus = 1;
-
-   /* parse loop */
-   while(pPtr != NULL)
-   {
-     pPtr = stptok(pPtr,pToken,20," ,=");
-     if(strlen(pToken) < 1 || pPtr == NULL )
-       continue;
-
-     if(tasNumeric(pToken)) /* numbers */
-     {
-        if(lastToken == NUM)
-	{
-          /* handle storage order logic */
-	  if(motorPointer > -1)
-	  {
-	    motorPointer++;
-          }
-          else if(varPointer > -1)
-	  {
-	    varPointer++;
-          }
-          else
-	  {
-	    sprintf(pBueffel,"ERROR: parse error at %s, %s",
-                pToken,"need parameter to drive");
-            SCWrite(pCon,pBueffel,eError);
-            return 0;
-          }
-        }
-        /* enter the parameter to drive into the appropriate mask */
-        if(motorPointer >= 0)
-	{
-          motorMask[motorPointer] = 1;
-          newPositions[motorPointer] = atof(pToken);       	  
-        }
-        else if(varPointer >= 0 )
-	{
-           tasMask[varPointer] = 1;
-           oldEnergy[varPointer] = self->tasPar[EMIN+varPointer]->fVal;
-           self->tasPar[EMIN + varPointer]->fVal = atof(pToken); 
-           self->tasPar[ETARGET + varPointer]->fVal = atof(pToken); 
-        }
-        else
-	{
-	   sprintf(pBueffel,"ERROR: parse error at %s, %s",
-                pToken,"need parameter to drive");
-           SCWrite(pCon,pBueffel,eError);
-           return 0;
-        }
-        lastToken = NUM;
-     }
-     else /* text tokens */
-     {
-       lastToken = TXT;
-       if( (status = isTASEnergy(pToken)) > -1) /* Ei, KI, EF, KF, Q.... */
-       {
-	 iTAS = 1;
-         motorPointer = -1;
-         varPointer = status;
-       }
-       else if( (status = isTASMotor(pToken)) > -1)
-       {
-	 motorPointer = status;
-         varPointer = -1;
-       }
-       else
-       {
-          sprintf(pBueffel,"ERROR: cannot drive %s", pToken);
-          SCWrite(pCon,pBueffel,eError);
-          rStatus = 0;
-          break;
-       }
-     }
-   }/* end of parse loop */
-   if(rStatus != 1)
-     return rStatus;
-
-  /*
-    store SRO motor value
-  */
-  getSRO(pCon,&self->oldSRO);
-
-
-   /* having done this, we can start the motors */
-   for(i = 0; i < MAXMOT; i++)
-   {
-     if(motorMask[i] > 0)
-     {
-       pMot = FindMotor(pSics, tasMotorOrder[i]);
-       if(pMot)
-       {
-	 MotorGetSoftPosition(pMot, pCon, &oldPos);
-       }
-       else
-       {
-	 oldPos = -9999.;
-       }
-       sprintf(pBueffel,"Driving %s from %f to %f", 
-            tasMotorOrder[i],oldPos,newPositions[i]);
-       SCWrite(pCon,pBueffel,eWarning);
-       status = StartMotor(pServ->pExecutor,pSics,pCon,
-                           tasMotorOrder[i],newPositions[i]);
-       if(status == 0)
-       {
-         /* error should already have been reported by StartMotor*/
-	 rStatus = 0;
-       }
-     }
-   } 
-
-   /* 
-     if in TAS mode do the TAS calculation and start the appropriate   
-     motors.
-   */
-   if(iTAS > 0)
-   {
-     status = TASCalc(self,pCon,tasMask,tasTargets, tasTargetMask);
-     if(status)
-     {
-       /*
-        do output, first Q-E variables
-       */
-       for(i = 0; i < 12; i++)
-       {
-	 if(tasMask[i])
-	 {
-	   sprintf(pBueffel,"Driving %s from %f to %f", tasVariableOrder[EI+i],
-		   oldEnergy[i],
-                   self->tasPar[EI+i]->fVal);
-           SCWrite(pCon,pBueffel,eWarning);
-         }
-       }
-       /* 
-        more output: the motor positions
-       */
-       for(i = 0; i < 9; i++)
-       {
-	 if(tasTargetMask[i])
-	 {
-           pMot = FindMotor(pSics, tasMotorOrder[i]);
-           if(pMot)
-           {
-	      MotorGetSoftPosition(pMot, pCon, &oldPos);
-           }
-           else
-           {
-	      oldPos = -9999.;
-           }
-	   sprintf(pBueffel,"Driving %s from %f to %f",tasMotorOrder[i],
-                   oldPos, tasTargets[i]);
-           SCWrite(pCon,pBueffel,eWarning);
-         }
-       }
-       /*
-         output for magnet currents 
-       */
-       for(i = 0; i < 8; i++)
-       {
-	 if(tasTargetMask[9+i])
-	 {
-	   oldPos = readDrivable(tasMotorOrder[CURMOT+i], pCon);
-	   sprintf(pBueffel,"Driving %s from %f to %f",tasMotorOrder[CURMOT+i],
-                   oldPos, tasTargets[9+i]);
-           SCWrite(pCon,pBueffel,eWarning);
-         }
-       }
-       
-       status = TASStart(self,pCon,pSics,tasTargets,tasTargetMask);
-       if(status == 0)
-       {
-	 rStatus = 0;
-       }
-     }
-     else
-     {
-        rStatus = 0;
-     }
-   }
-
-
-   /*
-     wait till we are finished
-   */
-   status = Wait4Success(GetExecutor());
-   TASUpdate(self,pCon);
-   if(status == DEVINT)
-   {
-      if(SCGetInterrupt(pCon) == eAbortOperation)
-      {
-          SCSetInterrupt(pCon,eContinue);
-          sprintf(pBueffel,"Driving aborted");
-          SCWrite(pCon,pBueffel,eStatus);
-       }
-       return 0;
-    }
-    else if(status == DEVDONE)
-    {
-          sprintf(pBueffel,"Driving done");
-          SCWrite(pCon,pBueffel,eStatus);
-    }
-    else
-    {
-          sprintf(pBueffel,
-           "Driving finished");
-          SCWrite(pCon,pBueffel,eStatus);
-    }            
-    return rStatus; 
-}
-
-
-
-
-
-
diff --git a/tasinit.c b/tasinit.c
deleted file mode 100644
index c90b56f8..00000000
--- a/tasinit.c
+++ /dev/null
@@ -1,435 +0,0 @@
-/*--------------------------------------------------------------------------
-  This is one implementation file for the TASMAD simulation module for
-  SICS. The requirement is to make SICS look as much as TASMAD as 
-  possible. This includes:
-  - TASMAD is variable driven
-  - Sometimes variables are accessed in storage order.
-  - A complicated calculation has to be done for getting the instruments
-    settings right. The appropriate F77 routine from TASMAD will be 
-    reused.
-  - The scan logic is different.
-  - Output of ILL-formatted data files is required. 
-
-  This file implements the initialization  part of the whole thing.
-
-  Mark Koennecke, November 2000
----------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <assert.h>
-#include "fortify.h"
-#include "sics.h"
-#include "sicsvar.h"
-#include "counter.h"
-#include "motor.h"
-#include "scan.h"
-#include "scan.i"
-#include "tas.h"
-
-extern int getSRO(SConnection *pCon, float *fVal);   /* tasutil.c */
-
-/*
-  As variables may be accessed in storage order, it is necessary to 
-  know the order of the motors
-*/
-extern char *tasMotorOrder[] = { "a1", 
-                              "a2",
-                              "a3",
-                              "a4",
-                              "a5",
-                              "a6",
-                              "mcv",
-                              "sro",
-                              "ach",
-                              "mtl",
-                              "mtu",
-                              "stl",
-                              "stu",
-                              "stl",
-                              "atu",
-                              "mgl",
-                              "sgl",
-                              "sgu",
-                              "agl",
-			      "atl",
-			      "tt",
-			      "i1" ,
-			      "i2",
-			      "i3",
-			      "i4",
-			      "hxx",
-			      "hyy",
-			      "hzz",
-			      "i5",
-			      "i6",
-			      "i7",
-			      "i8",
-                              NULL };
-/*
-  In order to initialise the variable array in the TAS data structure we
-  need to know the names of the variables in the right order. This order
-  has to match the order defined in tas.h through the defines. Otherwise 
-  quite weird things may happen at runtime.
-*/ 
-extern char *tasVariableOrder[] = {
-                            "wav",
-                            "dm",
-                            "da",
-                            "etam",
-                            "etaa",
-                            "ti",
-                            "mn",
-                            "if1v",
-                            "if1h",
-                            "if2v",
-                            "if2h",
-                            "helm",
-                            "as",
-                            "bs",
-                            "cs",
-                            "aa",
-                            "bb",
-                            "cc",
-                            "etas",
-                            "ax",
-                            "ay",
-                            "az",
-                            "bx",
-                            "by",
-                            "bz",
-                            "ei",
-                            "ki",
-                            "ef",
-                            "kf",
-                            "qh",
-                            "qk",
-                            "ql",
-                            "en",
-                            "qm",
-                            "hx",
-                            "hy",
-                            "hz",
-                            "da1",
-                            "da2",
-                            "da3",
-                            "da4",
-                            "da5",
-                            "da6",
-                            "dmcv",
-                            "dsro",
-                            "dach",
-                            "dmtl",
-                            "dmtu",
-                            "dstl",                               
-                            "dstu",
-                            "datl",
-                            "datu",
-                            "dmgl",
-                            "dsgl",
-                            "dsgu",
-                            "dagl",
-                            "dei",
-                            "dki",
-                            "def",
-                            "dkf",
-                            "dqh",
-                            "dqk",
-                            "dql",
-                            "den",
-                            "dqm",
-                            "dt",
-                            "sm",
-                            "ss",
-                             "sa",
-                            "fx",
-                            "np",
-                            "f1",
-                            "f2",
-                            "lpa",
-                            "mrx1",
-                            "mrx2",
-                            "arx1",
-                            "arx2",
-                            "instrument",
-                            "title",
-                            "user",
-                            "lastcommand",
-                            "alf1",
-                            "alf2",
-                            "alf3",
-                            "alf4",
-                            "bet1",
-                            "bet2",
-                            "bet3",
-                            "bet4",
-                            "output",
-                            "local",
-                            "swunit",
-                            "scaninfo",
-                            "tei",
-			    "tki",
-			    "tef",
-			    "tkf",
-			    "tqh",
-			    "tqk",
-			    "tql",
-			    "ten",
-			    "tqm",
-			    "ti1",
-			    "ti2",
-			    "ti3",
-			    "ti4",
-			    "ti5",
-			    "ti6",
-			    "ti7",
-			    "ti8",
-			    "di1",
-			    "di2",
-			    "di3",
-			    "di4",
-			    "di5",
-			    "di6",
-			    "di7",
-			    "di8",
-                            "dhx",
-			    "dhy",
-			    "dhz",
-			    "thx",
-			    "thy",
-			    "thz",
-                            "hconv1",
-			    "hconv2",
-			    "hconv3",
-			    "hconv4",
-			    "polfile",
-                            NULL};
-/*-------------------------------------------------------------------
-  Normally SICS does not store motor hardware limits into status files as 
-  they are read from the motor controller. However, in order to better 
-  synchronize simulation and instrument this has to be done for TASP.
-  TasSave does just that: saving hard limits in order for the simulation to
-  be able to read them.
-  ------------------------------------------------------------------------*/ 
-static int TasSaveStatus(void *self, char *name, FILE *fd)
-{
-  int i = 0;
-  pMotor pMot;
-  float value;
-  SConnection *pCon = NULL;
-
-  pCon = SCCreateDummyConnection(pServ->pSics);
-  if(!pCon)
-  {
-    return 0;
-  }
-  while(tasMotorOrder[i] != NULL)
-  {
-    pMot = FindMotor(pServ->pSics,tasMotorOrder[i]);
-    if(pMot)
-    {
-      MotorGetPar(pMot,"hardupperlim",&value);
-      fprintf(fd,"%s hardupperlim %f\n",tasMotorOrder[i], value);
-      MotorGetPar(pMot,"hardlowerlim",&value);
-      fprintf(fd,"%s hardlowerlim %f\n",tasMotorOrder[i], value);
-      /*
-	DISABLED: reading all the motors made to much of a delay during
-        normal operation of the instrument. This is mainly due  to the 
-        sloooooooooowwwwwwwww SINQ hardware
-      MotorGetSoftPosition(pMot,pCon,&value);
-      fprintf(fd,"run %s %f\n",tasMotorOrder[i], value);
-      */
-    }
-    i++;
-  }
-  SCDeleteConnection(pCon);
-  /*
-  fprintf(fd,"success\n");
-  */
-
-  fprintf(fd,"updateqe\n");
-  return 1;
-}
-/*---------------------------------------------------------------------
-  There is a special feauture in MAD where the count mode is determined
-  which variable, MN for monitor od TI for time has been set as the last
-  one. In order to implement this in SICS callback functions will be 
-  used on the variables which switch the counter box into the appropriate 
-  mode.
------------------------------------------------------------------------*/
-static int MonitorCallback(int iEvent, void *pEvent, void *pUser)
-{
-  pTASdata self = (pTASdata)pUser;
-  assert(self);
- 
-  if(iEvent != VALUECHANGE)
-    return 0;
-
-  SetCounterMode(self->pScan->pCounterData,ePreset);
-  SetCounterPreset(self->pScan->pCounterData,(float)self->tasPar[MN]->iVal);
-  return 1;
-} 
-/*---------------------------------------------------------------------*/
-static int TimerCallback(int iEvent, void *pEvent, void *pUser)
-{
-  pTASdata self = (pTASdata)pUser;
-  assert(self);
-
-  if(iEvent != VALUECHANGE)
-    return 0;
-
-  SetCounterMode(self->pScan->pCounterData,eTimer);
-  SetCounterPreset(self->pScan->pCounterData,self->tasPar[TI]->fVal);
-  return 1;
-} 
-/*-----------------------------------------------------------------------
-  This is an interpreter wrapper function which allows to call for the
-  recalculation of the energy variables from scripts.
---------------------------------------------------------------------------*/
-extern int TASUpdate(pTASdata self,SConnection *pCon); /* tasutil.c */ 
-
-static int RecalcAction(SConnection *pCon, SicsInterp *pSics, void *pData,
-			int argc, char *argv[])
-{
-   pTASdata self = NULL;
-
-   assert(pCon);
-   assert(pSics);
-   self = (pTASdata)pData;
-   assert(self);
-
-   return TASUpdate(self,pCon);
-}
-
-/*-----------------------------------------------------------------------
-  A function for killing the TAS data structure is needed
-  -------------------------------------------------------------------------*/
-static void TASKill(void *pData)
-{
-  pTASdata self = (pTASdata)pData;
-  if(!self)
-     return;
-
-  if(self->pDes)
-     DeleteDescriptor(self->pDes);
-  free(self);
-}
-/*-----------------------------------------------------------------------*/
-int TASFactory(SConnection *pCon, SicsInterp *pSics, void *pData,
-                 int argc, char *argv[])
-{
-   pTASdata pNew = NULL;
-   int iPtr, iError;
-   char pBueffel[132];
-   pSicsVariable pVar = NULL;
-   CommandList *pCom = NULL;
-
-   /* check arguments*/
-   if(argc < 2)
-   {
-     SCWrite(pCon,"ERROR: insufficient paarameters to MakeTAS",eError);
-     return 0;
-   }
-
-   /* create a new data structure */
-   pNew = (pTASdata)malloc(sizeof(TASdata));
-   if(!pNew)
-   {
-     SCWrite(pCon,"ERROR: insufficient memory to allocate TAS data structure",
-             eError);
-     return 0;
-   } 
-   memset(pNew,0,sizeof(TASdata));
-   pNew->pDes = CreateDescriptor("TAS");
-   if(!pNew->pDes)
-   {
-     SCWrite(pCon,"ERROR: insufficient memory to allocate TAS data structure",
-             eError);
-     free(pNew);
-     return 0;
-   } 
-   pNew->iPOL = -1;
-   pNew->pDes->SaveStatus = TasSaveStatus;
-
-   /* connect to all the variables  */
-   iPtr = 0; iError = 0;
-   while(tasVariableOrder[iPtr] != NULL)
-   {
-     pNew->tasPar[iPtr] = FindVariable(pSics,tasVariableOrder[iPtr]);
-     if(!pNew->tasPar[iPtr])
-     {
-       sprintf(pBueffel,"ERROR: TAS variable %s not found", 
-               tasVariableOrder[iPtr]);
-       SCWrite(pCon,pBueffel,eError);
-       iError++; 
-     }
-     iPtr++;
-   }
-   if(iError != 0)
-   {
-      SCWrite(pCon,"ERROR: TAS bad initialisation, TAS not created",eError);
-      TASKill(pNew);
-      return 0;
-   }
-
-   /* connect to the scan object */
-   pCom = FindCommand(pSics,argv[1]);
-   if(!pCom)
-   {
-     SCWrite(pCon,"ERROR: no scan routine for TAS found",eError);
-     TASKill(pNew);
-     return 0;
-   }   
-   pNew->pScan = (pScanData)pCom->pData;
-
-   /* 
-     Install the callbacks for TI and MN. Sloppy error checking because
-     the variables should have been accessed earlier on.
-   */
-   pVar = FindVariable(pSics,"MN");
-   if(pVar)
-   {
-     RegisterCallback(pVar->pCall,VALUECHANGE,MonitorCallback,pNew,NULL);
-   }
-   pVar = FindVariable(pSics,"TI");
-   if(pVar)
-   {
-     RegisterCallback(pVar->pCall,VALUECHANGE,TimerCallback,pNew,NULL);
-   }
-
-   /*
-     initialize SRO value
-   */
-   getSRO(pCon,&pNew->oldSRO);
-   
-   /* install TAS commands */
-   iError = AddCommand(pSics,"dr",TASDrive,TASKill,pNew);
-   if(!iError)
-   {
-     SCWrite(pCon,"ERROR: duplicate dr command not created",eError);
-     TASKill(pNew);
-     return 0;
-   }
-   iError = AddCommand(pSics,"sc",TASScan,NULL,pNew);
-   if(!iError)
-   {
-     SCWrite(pCon,"ERROR: duplicate sc command not created",eError);
-     TASKill(pNew);
-     return 0;
-   }
-   iError = AddCommand(pSics,"fs",TASScan,NULL,pNew);
-   if(!iError)
-   {
-     SCWrite(pCon,"ERROR: duplicate sf command not created",eError);
-     TASKill(pNew);
-     return 0;
-   }
-   iError = AddCommand(pSics,"updateqe",RecalcAction,NULL,pNew);
-   if(!iError)
-   {
-     SCWrite(pCon,"ERROR: duplicate updateqe command not created",eError);
-     TASKill(pNew);
-     return 0;
-   }
-   return 1;
-}
-
-
diff --git a/tasscan.c b/tasscan.c
deleted file mode 100644
index 204d6c31..00000000
--- a/tasscan.c
+++ /dev/null
@@ -1,1504 +0,0 @@
-/*--------------------------------------------------------------------------
-  This is one implementation file for the TASMAD simulation module for
-  SICS. The requirement is to make SICS look as much as TASMAD as 
-  possible. This includes:
-  - TASMAD is variable driven
-  - Sometimes variables are accessed in storage order.
-  - A complicated calculation has to be done for getting the instruments
-    settings right. The appropriate F77 routine from TASMAD will be 
-    reused.
-  - The scan logic is different.
-  - Output of ILL-formatted data files is required. 
-
-  This file implements the MAD sc command for scanning. The general idea is
-  that specialized action functions are defined for the scan object and the
-  main SICS scan loop is used as a driver.  
-
-  Mark Koennecke, November-December 2000
----------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <assert.h>
-#include <time.h>
-#include <ctype.h>
-#include <tcl.h>
-#include "fortify.h"
-#include "sics.h"
-#include "sicsvar.h"
-#include "counter.h"
-#include "motor.h"
-#include "scan.h"
-#include "scan.i"
-#include "tas.h"
-#include "tasu.h"
-#include "evcontroller.h"
-#include "splitter.h"
-#include "status.h"
-
-/*------------------------------------------------------------------------
-  a little local utility for making a line of characters
-  -------------------------------------------------------------------------*/
-static void charLine(char *pBueffel, char c)
-{
-   int i;
-
-   for(i = 0; i < 80; i++)
-   {
-     pBueffel[i] = c;
-   }
-   pBueffel[80] = '\n';
-   pBueffel[81] = '\0';
-}
-/*------------------------------------------------------------------------*/
-static void strtoupper(char *pText)
-  {
-    assert(pText);
-    
-    while(*pText != '\0')
-    {
-      *pText = toupper(*pText);
-      pText++;
-    }
-  }
-/*-----------------------------------------------------------------------*/
-static void strcenter(char *str, char *target, int iLength)
-{
-  int iPtr, i;
-
-  /*
-   catch the error if target is to long
-  */
-  if(strlen(str) >= iLength)
-  {
-    strncpy(target,str,iLength);
-  }
-
-  iPtr = (iLength - strlen(str))/2;
-  for(i = 0; i < iPtr;i++)
-  {
-    target[i] = ' ';
-  }
-  target[iPtr] = '\0';
-  strcat(target,str);
-  for(i = iPtr + strlen(str); i < iLength - 1; i++)
-  {
-    target[i] = ' ';
-  }
-  target[iLength-1] = '\0';
-}
-/*-------------------------------------------------------------------------
-  TASHeader writes the header of a TAS data file. The format is an 
-  obscure format from ILL ( not ill but Institute Laue Langevin). No
-  documentation about this exists except the files themselves. This is long 
-  and tiresome code.
----------------------------------------------------------------------------*/  
-static int TASHeader(pScanData self)
-{
-  pTASdata pTAS = (pTASdata)self->pSpecial;
-  int i, iCount, status, iFileNO;
-  char pBueffel[1024], pHeader[1024], pWork[132], pWork2[60], pTen[11], *pcPtr;
-  time_t iDate;
-  struct tm *psTime;
-  pVarEntry pVar = NULL;
-  void *pPtr = NULL;
-  pMotor pMot;
-  float fVal, fVal2;
-  CommandList *pCom = NULL;
-  pDummy pDum= NULL;
-  pIDrivable pDrive = NULL;
-  pEVControl pTem = NULL;
-
-  assert(self);
-  assert(pTAS);
-  assert(self->pCon);
-  assert(self->pSics);
-
-  /* open data file */
-  self->fd = fopen(self->pFile,"w");
-  if(!self->fd)
-  {
-     SCWrite(self->pCon,"ERROR: cannot write data file",eError);
-     return 0;
-  }
-
-  /*
-    extract the file number from the name for entry into the
-    datafile
-  */
-  pcPtr = strstr(self->pFile,".");
-  pcPtr -= 9; /* four for year, 5 for number */
-  for(i = 0; i < 5; i++, pcPtr++)
-  {
-    pWork[i] = *pcPtr;
-  }
-  pWork[5] = '\0';
-  iFileNO = atoi(pWork);
-
-  /* the bizarre R, A, V header */
-  charLine(pBueffel,'R');
-  fputs(pBueffel,self->fd);
-  fprintf(self->fd,"%8d%8d%8d\n",iFileNO,1,0);
-  fputs("ILL TAS data in the new ASCII format follow after the line VV...V\n",
-        self->fd);
-  charLine(pBueffel,'A');
-  fputs(pBueffel,self->fd);
-  fprintf(self->fd,"%8d%8d\n",42,0);
-
-  /*
-    format time to TAS format
-  */
-  iDate = time(NULL);
-  psTime = localtime(&iDate);
-  memset(pWork,0,59);         
-  strftime(pWork,59,"%d-%b-%Y %H:%M:%S",psTime);
-  fprintf(self->fd,"%-10s%-12s%-s\n",pTAS->tasPar[INST]->text,
-          pTAS->tasPar[USR]->text,pWork);
-
-  charLine(pBueffel,'V');
-  fputs(pBueffel,self->fd);
-
-  /* 
-    output a plethora of parameters
-  */
-  fprintf(self->fd,"INSTR: %s\n",pTAS->tasPar[INST]->text);
-  fprintf(self->fd,"EXPNO: \n");
-  fprintf(self->fd,"USER_: %s\n",pTAS->tasPar[USR]->text);
-  fprintf(self->fd,"LOCAL: %s\n",pTAS->tasPar[LOC]->text);
-  fprintf(self->fd,"FILE_: %d\n",iFileNO);
-  fprintf(self->fd,"DATE_: %s\n",pWork);
-  fprintf(self->fd,"TITLE: %s\n",pTAS->tasPar[TIT]->text);
-  fprintf(self->fd,"COMND: %s\n",pTAS->tasPar[COM]->text);
-  fprintf(self->fd,
-	  "POSQE: QH=%8.4f, QK=%8.4f, QL=%8.4f, EN=%8.4f, UN=MEV\n",
-          pTAS->tasPar[QH]->fVal,
-          pTAS->tasPar[QK]->fVal,
-          pTAS->tasPar[QL]->fVal,
-          pTAS->tasPar[EN]->fVal);
-  /*
-   build the steps line
-  */
-  sprintf(pBueffel,"STEPS: ");
-  for(i = 0; i < self->iScanVar; i++)
-  {
-     DynarGet(self->pScanVar,i,&pPtr);
-     pVar = (pVarEntry)pPtr;
-     if(pVar)
-     {
-       strncpy(pWork2,pVar->Name,59);
-       strtoupper(pWork2);
-       sprintf(pWork,"D%s=%8.4f, ",pWork2,pVar->fStep);
-       strcat(pBueffel,pWork);
-     }    
-  }  
-  strcat(pBueffel,"\n");
-  fputs(pBueffel,self->fd);
-
-  /*
-    a lot of parameters
-  */ 
-  fprintf(self->fd,"PARAM: DM=%8.4f, DA=%8.4f, SM=%2d, SS=%2d, SA=%2d\n",
-          pTAS->tasPar[DM]->fVal,
-          pTAS->tasPar[DA]->fVal,
-          pTAS->tasPar[SM]->iVal,
-          pTAS->tasPar[SS]->iVal,
-          pTAS->tasPar[SA]->iVal);
-  fprintf(self->fd,"PARAM: FX=%3f, KFIX=%8.4f\n",
-          pTAS->tasPar[FX]->fVal,
-          pTAS->tasPar[KF]->fVal);
-  fprintf(self->fd,"PARAM: ALF1=%8.4f, ALF2=%8.4f, ALF3=%8.4f, ALF4=%8.4f\n",
-          pTAS->tasPar[ALF1]->fVal,
-          pTAS->tasPar[ALF2]->fVal,
-          pTAS->tasPar[ALF3]->fVal,
-          pTAS->tasPar[ALF4]->fVal);
-  fprintf(self->fd,"PARAM: BET1=%8.4f, BET2=%8.4f, BET3=%8.4f, BET4=%8.4f\n",
-          pTAS->tasPar[BET1]->fVal,
-          pTAS->tasPar[BET2]->fVal,
-          pTAS->tasPar[BET3]->fVal,
-          pTAS->tasPar[BET4]->fVal);
-  fprintf(self->fd,"PARAM: ETAM=%8.4f, ETAA=%8.4f\n",
-          pTAS->tasPar[ETAM]->fVal,
-          pTAS->tasPar[ETAA]->fVal);
-  fprintf(self->fd,"PARAM: AS=%8.4f, BS=%8.4f, CS=%8.4f\n",
-          pTAS->tasPar[AS]->fVal,
-          pTAS->tasPar[BS]->fVal,
-          pTAS->tasPar[CS]->fVal);
-  fprintf(self->fd,"PARAM: AA=%8.4f, BB=%8.4f, CC=%8.4f\n",
-          pTAS->tasPar[AA]->fVal,
-          pTAS->tasPar[BB]->fVal,
-          pTAS->tasPar[CC]->fVal);
-  fprintf(self->fd,"PARAM: AX=%8.4f, AY=%8.4f, AZ=%8.4f\n",
-          pTAS->tasPar[AX]->fVal,
-          pTAS->tasPar[AY]->fVal,
-          pTAS->tasPar[AZ]->fVal);
-  fprintf(self->fd,"PARAM: BX=%8.4f, BY=%8.4f, BZ=%8.4f\n",
-          pTAS->tasPar[BX]->fVal,
-          pTAS->tasPar[BY]->fVal,
-          pTAS->tasPar[BZ]->fVal);
-
-  /*
-    write currents if in polarisation mode
-  */
-  if(pTAS->iPOL >= 0){
-     fprintf(self->fd,"VARIA: ");
-     iCount = 0;
-     for(i = MAXMOT-8; i < MAXMOT;i++)
-     {
-          fVal = readDrivable(tasMotorOrder[i],self->pCon);
-	  strcpy(pWork2,tasMotorOrder[i]);
-	  strtoupper(pWork2);
-	  fprintf(self->fd,"%-8s=%8.4f, ",pWork2,fVal);
-	  iCount++;
-     }
-     fprintf(self->fd,"\n");  
-  }
-
-  /* 
-    write motors and currents
-  */
-  fprintf(self->fd,"VARIA: ");
-  iCount = 0;
-  for(i = 0; i < MAXMOT-8;i++)
-  {
-    fVal = readDrivable(tasMotorOrder[i],self->pCon);
-    if(iCount == 3)
-    {
-       iCount = 0; 
-       fprintf(self->fd,"\nVARIA: ");
-    }
-    strcpy(pWork2,tasMotorOrder[i]);
-    strtoupper(pWork2);
-    fprintf(self->fd,"%-8s=%8.4f, ",pWork2,fVal);
-    iCount++;
-  }
-  fprintf(self->fd,"\n");  
-           
-  /* 
-   write zeros 
-  */
-  fprintf(self->fd,"ZEROS: ");
-  iCount = 0;
-  for(i = 0; i < CURMOT -1;i++)
-  {
-     pMot = FindMotor(self->pSics, tasMotorOrder[i]);
-     if(pMot)
-     {
-       status = MotorGetPar(pMot,"softzero",&fVal);
-       if(!status)
-       {
-         fVal = -9999.77;
-       }
-       fVal *= -1;
-       if(iCount == 3)
-       {
-	 iCount = 0; 
-         fprintf(self->fd,"\nZEROS: ");
-       }
-       strcpy(pWork2,tasMotorOrder[i]);
-       strtoupper(pWork2);
-       fprintf(self->fd,"%-8s=%8.4f, ",pWork2,fVal);
-       iCount++;
-     }
-     else
-     {
-       sprintf(pBueffel,"WARNING: motor %s NOT found, %s",
-               tasMotorOrder[i], 
-               " possible data file corruption");
-       SCWrite(self->pCon,pBueffel,eWarning);
-     }
-  }  
-  fprintf(self->fd,"\n");
-
-  /*
-    write counter parameters
-  */
-  fVal = GetCounterPreset(self->pCounterData);
-  if(GetCounterMode(self->pCounterData) == eTimer)
-  {
-    fprintf(self->fd,"PARAM: TI=%8.4f\n",fVal);
-  }
-  else
-  {
-    fprintf(self->fd,"PARAM: MN=%8f\n",fVal);
-  }
-  
-  /*
-   write temperature data
-  */
-  pCom = FindCommand(self->pSics,"temperature");
-  if(pCom)
-  {
-     pDum = (pDummy)pCom->pData;
-     pDrive = pDum->pDescriptor->GetInterface(pDum,DRIVEID);
-     if(pDrive) /* a proper environment device */
-     {
-         fVal = pDrive->GetValue(pDum,self->pCon);
-         pTem = (pEVControl)pCom->pData;
-         EVCGetPar(pTem,"target",&fVal2);
-         fprintf(self->fd,"PARAM: TT=%8.4f, RT=%8.4f\n",fVal, fVal2);
-     }
-  }
-   
-  /* 
-     build both the format and the data header line,
-     start with the scan variables 
-  */
-  if(pTAS->iPOL >=0 ){
-    strcpy(pBueffel,"FORMT: (I4,I4,");
-    strcpy(pHeader,"  PNT PAL");
-  } else {
-    strcpy(pBueffel,"FORMT: (I4,1X,");
-    strcpy(pHeader,"  PNT");
-  }
-  for(i = 0; i < self->iScanVar; i++)
-  {
-     DynarGet(self->pScanVar,i,&pPtr);
-     pVar = (pVarEntry)pPtr;
-     if(pVar)
-     {
-       strcat(pBueffel,"F9.4,1X,");
-       strncpy(pWork2,pVar->Name,59);
-       strtoupper(pWork2);       
-       strcenter(pWork2,pTen,10);
-       strcat(pHeader,pTen);
-     }    
-  }
-  /*
-   put the standard counter things
-  */
-  strcat(pBueffel,"F8.0,1X,F8.0,1X,F9.2,1X,F8.0,1X,F8.0,1X,");
-  strcat(pHeader,"     M1       M2      TIME     CNTS     M3  ");
-  /*
-   now the additional variables
-  */
-  for(i = 0; i < pTAS->addCount; i++)
-  {
-    strcat(pBueffel,"F9.4,1X,");
-    if(pTAS->addType[i] == 1) /* motor */
-    {
-      strcpy(pWork2,tasMotorOrder[pTAS->addOutput[i]]);
-    }
-    else
-    {
-     strcpy(pWork2,tasVariableOrder[pTAS->addOutput[i]]);
-    }
-    strtoupper(pWork2);       
-    strcenter(pWork2,pTen,11);
-    strcat(pHeader,pTen);
-  } 
-  strcat(pBueffel,")");
-
-  /* 
-    write the final bit
-  */
-  fprintf(self->fd,"%s\nDATA_:\n%s\n",pBueffel,pHeader);
-
-  /* 
-    write header to screen as well
-  */
-  SCWrite(self->pCon,pHeader,eWarning);
-
-  /*
-   close the file, we will reopen later with append for the data
-  */
-  fclose(self->fd);
-  self->fd = NULL;
-  return 1;
-}
-/*--------------------------------------------------------------------------
-  TASScanPoint writes the data at each ScanPoint
----------------------------------------------------------------------------*/
-static int TASScanPoint(pScanData self, int iPoint)
-{
-  pTASdata pTAS = (pTASdata)self->pSpecial;
-  pVarEntry pVar = NULL;
-  void *pPtr = NULL;
-  int i, status, iPtr;
-  float fVal;
-  pMotor pMot = NULL;
-  long m1, m2, m3, cnts;
-  char pBueffel[1024], pWork[80], pError[132];
-
-  /*
-    after polarisation analysis, this has to be ignored as it is called 
-    another time from the ScanLoop
-  */
-  if(pTAS->iIgnore){
-    return 1;
-  }
-
-  /*
-    reopen file for appending
-  */
-  self->fd = fopen(self->pFile,"a");
-  if(!self->fd)
-  {
-     SCWrite(self->pCon,"ERROR: cannot append to data file",eError);
-     return 0;
-  }
-
-  /* 
-     write point number
-  */
-  if(pTAS->iPOL > 0)
-  {
-    sprintf(pBueffel,"%3d %3d",iPoint+1,pTAS->iPOL);
-  }
-  else
-  {
-    sprintf(pBueffel,"%4d ", iPoint+1);
-  }
-
-  /*
-   write the scan variables
-  */
-  for(i = 0; i < self->iScanVar; i++)
-  {
-     DynarGet(self->pScanVar,i,&pPtr);
-     pVar = (pVarEntry)pPtr;
-     if(pVar)
-     {
-        if(isTASMotor(pVar->Name) >= 0)
-	{
-	  pMot = FindMotor(self->pSics,pVar->Name);
-          if(pMot)
-	  {
-	    status = MotorGetSoftPosition(pMot,self->pCon,&fVal);
-            if(!status)
-	    {
-	      fVal = -9999.77;
-            }
-          }
-        }
-        else if((iPtr = isTASVar(pVar->Name)) >= 0 )
-	{
-	  fVal = pTAS->tasPar[iPtr]->fVal;
-        }       
-     }
-     sprintf(pWork,"%8.4f ", fVal);
-     strcat(pBueffel,pWork);
-  }
-
-  /* 
-    write monitors and counters
-  */ 
-  m1 = GetMonitor(self->pCounterData,1,self->pCon);
-  m2 = GetMonitor(self->pCounterData,2,self->pCon);
-  m3 = GetMonitor(self->pCounterData,3,self->pCon);
-  cnts = GetCounts(self->pCounterData,self->pCon);
-  fVal = GetCountTime(self->pCounterData, self->pCon);
-  sprintf(pWork,"%8d %8d %9.4f %8d %8d ",m1,m2,fVal, cnts, m3);
-  strcat(pBueffel,pWork);
-
-  /* 
-     write additional parameters
-  */
-  for(i = 0; i < pTAS->addCount; i++)
-  {
-    fVal = -999.99;
-    if(pTAS->addType[i] == 1) /* motor */
-    {
-      fVal = readDrivable(tasMotorOrder[pTAS->addOutput[i]],self->pCon);
-      if(fVal < -990.){
-	sprintf(pError,"WARNING: problem reading %s",
-		tasMotorOrder[pTAS->addOutput[i]]);
-	SCWrite(self->pCon, pError,eWarning);
-      }
-    }
-    else
-    {
-      fVal = pTAS->tasPar[pTAS->addOutput[i]]->fVal;
-    }
-    sprintf(pWork,"%9.4f ", fVal);
-    strcat(pBueffel,pWork); 
-  }
-
-  /*
-   write both to file and onto screen
-  */
-  fprintf(self->fd,"%s\n",pBueffel);
-  SCWrite(self->pCon,pBueffel,eWarning);
-
-  /*
-   close the file
-  */
-  fclose(self->fd);
-  self->fd = NULL;
-  return 1;
-    
-}  
-/*-----------------------------------------------------------------------
-  disables a3 driving in powder mode. In powder mode a3 is fixed. This
-  supresses the error message issued otherwise.
-  ------------------------------------------------------------------------*/
-static void fixPowder(unsigned char tasTargetMask[20]){
-  char *pPtr = NULL;
-
-  pPtr = Tcl_GetVar(pServ->pSics->pTcl,"powder",TCL_GLOBAL_ONLY);
-  if(pPtr){
-    if(strstr(pPtr,"1") != NULL){
-      tasTargetMask[2] = 0;
-    }
-  }
-}
-/*------------------------------------------------------------------------
- TASScanDrive starts all the motors necessary to drive to a new scan
- position. It thereby takes care of the TAS calculation if necessary.
- -------------------------------------------------------------------------*/
-static int TASScanDrive(pScanData self, int iPoint)
-{
-  pTASdata pTAS = (pTASdata)self->pSpecial;
-  pVarEntry pVar = NULL;
-  void *pPtr = NULL;
-  int i, status, iPtr;
-  int iTAS = 0;
-  pMotor pMot;
-  unsigned char tasTargetMask[20], tasMask[MAXEVAR];
-  float tasTargets[20];
-
-  /* 
-     initialize masks to 0
-  */
-  for(i = 0; i < 10; i++)
-  {
-    tasMask[i] = 0;
-    tasTargetMask[i] = 0;
-    tasTargetMask[i+10] = 0;
-    tasTargets[i] = .0;
-    tasTargets[i+10] = .0;
-  }
-  tasMask[10] = 0;
-  tasMask[11] = 0;
-
-  /*
-    store SRO motor value
-  */
-  getSRO(self->pCon,&pTAS->oldSRO);
-
-  /*
-   loop through all the scan variables
-  */
-  for(i = 0; i < self->iScanVar; i++)
-  {
-     DynarGet(self->pScanVar,i,&pPtr);
-     pVar = (pVarEntry)pPtr;
-     if(pVar)
-     {
-       /* set variable if QE-variable */
-       if((iPtr = isTASEnergy(pVar->Name)) >= 0)
-       {
-	 iTAS = 1;
-         pTAS->tasPar[EI+iPtr]->fVal =
-               pVar->fStart + iPoint * pVar->fStep;
-         pTAS->tasPar[ETARGET+iPtr]->fVal =
-               pVar->fStart + iPoint * pVar->fStep;
-         tasMask[iPtr] = 1;
-       }
-       else 
-       {
-	 /* 
-	    This is a motor, start it.
-	 */
-         StartMotor(pServ->pExecutor,self->pSics, self->pCon, pVar->Name,
-                   pVar->fStart + iPoint * pVar->fStep);
-         /*
-           Ignore errors. TAS scans continues when a motor runs into
-           a limit.
-	 */
-       }
-     }
-  }
- 
-  /* 
-    now check if we need a TAS calculation: if so do it and start 
-    the motors
-  */
-  if(iTAS)
-  {
-     status = TASCalc(pTAS,self->pCon,tasMask,
-                     tasTargets, tasTargetMask);
-     if(status) 
-     {
-       /*
-	 Errors both in calculation or in starting motors are
-         ignored here on purpose. There is a slight chance that
-         other points in the scan fit the bill.
-       */ 
-       fixPowder(tasTargetMask);
-       TASStart(pTAS,self->pCon,
-               self->pSics,tasTargets,tasTargetMask);
-     }
-  }
-
-  /*
-    now wait for our motors to arrive, thereby ignoring any error 
-    returns. DO NOT WAIT if fast scan!
-  */
-  if(pTAS->iFast)
-  {
-     return 1;
-  } 
-  else
-  {
-      status = Wait4Success(GetExecutor());
-  }
-
-  TASUpdate(pTAS,self->pCon);
-  return 1;
-}
-/*-----------------------------------------------------------------------
- RunPolScan does a polarized scan
- ------------------------------------------------------------------------*/
-static int RunPolScan(pScanData self, int iPoint)
-{
-  FILE *fd = NULL;
-  char buffer[132];
-  pTASdata pTAS = (pTASdata)self->pSpecial;
-
-  fd = fopen(pTAS->tasPar[POLFIL]->text,"r");
-  if(!fd){
-    SCWrite(self->pCon,"ERROR: failed to open polarisation analysis file",
-	    eError);
-    return 0;
-  }
-  pTAS->iPOL = 0;
-  while(fgets(buffer,131,fd) != NULL){
-    /*
-      ignore all errors here 
-    */
-    InterpExecute(self->pSics,self->pCon,buffer);
-    strtolower(buffer);
-    if(strstr(buffer,"co") != NULL){
-      pTAS->iPOL++;
-      self->WriteScanPoints(self,iPoint);
-    }
-    /*
-      but allow for interrupts
-    */
-    if(SCGetInterrupt(self->pCon) != eContinue){
-      break;
-    }
-  }
-  pTAS->iIgnore = 1;
-  fclose(fd);
-  pTAS->iPOL = 1;
-
-  return 1;
-}
-/*---------------------------------------------------------------------------
-    TASScanCount starts the counter for a TAS scan or runs the polarization
-    analysis.
----------------------------------------------------------------------------*/  
-static int TASScanCount(pScanData self, int iPoint)
-{
-  pTASdata pTAS = (pTASdata)self->pSpecial;
-  float fVal;
-  int status, iRet;
-  Status eOld;
-
-  pTAS->iIgnore = 0;
-  /*
-    call the polarisation scan function if necessary
-  */
-  if(pTAS->iPOL >= 0)
-  {
-    return RunPolScan(self, iPoint);
-  }
-
-  /* 
-    this is easy, just an ordinary scan, start a counter
-  */
-  fVal = GetCounterPreset(self->pCounterData); 
-  eOld = GetStatus();
-  status = DoCount(self->pCounterData,fVal,self->pCon,0);
-  iRet = Wait4Success(GetExecutor());
-  if(iRet == DEVINT)
-  {
-       SCWrite(self->pCon,"Counting aborted due to Interrupt",eStatus);
-       status = 0;
-  }
-  else if(iRet == DEVERROR)
-  {
-       SCWrite(self->pCon,"Counting finished with Problems",eStatus);
-       status = 0; 
-  }
-  else
-  {
-    status = 1;
-  }
-  SetStatus(eOld);
-  
-  return status;
-}
-/*--------------------------------------------------------------------------
-  TAS stores the scan data. This is necessary in order to support things 
-  like peak or center which require the scan data for operation
-  --------------------------------------------------------------------------*/
-  static int TASCollect(pScanData self, int iPoint)
-  {
-     pVarEntry pVar = NULL;
-     void *pDings;
-     int i, iRet, status, iPtr;
-     float fVal;
-     CountEntry sCount;
-     char *pAns = NULL, *pPtr = NULL ;
-     pTASdata pTAS = (pTASdata)self->pSpecial;
-     pMotor pMot; 
-
-     assert(self);
-     assert(self->pCon);
-     
-     /* loop over all scan variables */
-     status = 1;
-     for(i = 0; i < self->iScanVar; i++)
-     {
-        DynarGet(self->pScanVar,i,&pDings);
-        pVar = (pVarEntry)pDings;
-        if(pVar)
-        {
-           if( (iPtr = isTASEnergy(pVar->Name)) >= 0)
-	   {
-	     fVal = pTAS->tasPar[EI+iPtr]->fVal;
-           }
-           else
-	   {
-             pMot = FindMotor(self->pSics,pVar->Name);
-             if(pMot)
-	     {
-	       MotorGetSoftPosition(pMot,self->pCon,&fVal);
-             }
-           }
-           pVar->fData[iPoint] = fVal;
-        }
-     }
-  
-     /* store counter data */
-     /* monitors */
-     for(i = 1; i < 10; i++)
-     {
-        sCount.Monitors[i-1] = GetMonitor((pCounter)self->pCounterData,i,
-                                        self->pCon);
-     }
-     if( self->iChannel != 0 && self->iChannel != -10 )
-     {
-       sCount.Monitors[self->iChannel - 1] = 
-           GetCounts((pCounter)self->pCounterData,
-                                                   self->pCon);     
-     }
-
-     /* counts, depending on iChannel */
-     if(self->iChannel == 0)
-     {
-        sCount.lCount = GetCounts((pCounter)self->pCounterData,self->pCon);
-     }
-     else
-     {
-        sCount.lCount = GetMonitor((pCounter)self->pCounterData,
-                                  self->iChannel, self->pCon);
-     }
-
-     /* get time */
-     sCount.fTime = GetCountTime((pCounter)self->pCounterData,
-                                 self->pCon);
-     /* stow away */
-     DynarReplace(self->pCounts,self->iCounts,&sCount,sizeof(CountEntry));
-     self->iCounts++;
-     return 1;
-  }  
-/*----------------------------------------------------------------------
-  SetTASScan sets the special TAS scan functions in the scan data 
-  structure
-  ------------------------------------------------------------------------*/
-static void SetTASScan(pScanData self, pTASdata pTAS)
-{
-  self->PrepareScan = NonCheckPrepare;
-  self->WriteHeader = TASHeader;
-  self->WriteScanPoints = TASScanPoint;
-  self->ScanDrive = TASScanDrive;
-  self->ScanCount = TASScanCount;
-  self->CollectScanData = TASCollect;
-  self->pSpecial = pTAS;
-} 
-/*-------------------------------------------------------------------------
-  AddTASScanVar is the same as the standard AddScanVar but without the
-  error checking for a drivable parameter
-  --------------------------------------------------------------------------*/
-static int AddTASScanVar(pScanData self, SicsInterp *pSics, SConnection *pCon,
-                 char *name, float fStart, float fStep)
-  {
-     CommandList *pCom = NULL;
-     pIDrivable  pDriv = NULL;
-     pDummy      pData = NULL;
-     VarEntry    pVar;
-     char pBueffel[512];
-     
-     if(self->iActive)
-     {
-       SCWrite(pCon,
-        "ERROR: cannot change parameters while scan is running",eError);
-       return 0;
-     }
-     
-     /* find the thing */
-     pCom = FindCommand(pSics,name);
-     if(!pCom)
-     {
-        sprintf(pBueffel,"ERROR: Cannot find variable %s to scan",name);
-        SCWrite(pCon,pBueffel,eError);
-        return 0;
-     }
-     pData = (pDummy)pCom->pData;
-     if(!pData)
-     {
-        sprintf(pBueffel,"ERROR: Cannot find data for variable %s",name);
-        SCWrite(pCon,pBueffel,eError);
-        return 0;
-     }
-
-     /* got everything, fill in the VarEntry structure */
-     strcpy(pVar.Name,name);
-     pVar.pInter = NULL;
-     pVar.pObject = pData;
-     pVar.fStart = fStart;
-     pVar.fStep =  fStep;
-     pVar.fData  = NULL;
-     
-     /* put it away */
-     DynarPutCopy(self->pScanVar,self->iScanVar,&pVar,sizeof(VarEntry));
-     self->iScanVar++;
-     
-     return 1; 
-  }   
-/*-----------------------------------------------------------------------
-  The TAS scan command line contains two types of items: Scan variables 
-  and their center values and normal SICS variables such as the monitor
-  to use and the steps in each scan variable. As this is decidely easier
-  this command line is parsed in two pathes: In the first pass all the 
-  variables are set and removed. In the second pass the scan variables
-  are parsed and entered into the scan data structure. 
-
-  ParseVar implements the first pass.
-  -------------------------------------------------------------------------*/
-#define NONE 0
-#define NUM 1
-#define TXT 2
-extern char *stptok(const char *s, char *tok, size_t toklen, char *brk);
-
-
-static int ParseVar(pTASdata pTAS, char *pBueffel, SConnection *pCon)
-{
-  char *myBuffer = NULL, pToken[20], *pPtr, pError[132];
-  int iPtr, lastToken, lastVar;
-  VarType vt;
-
-  /*
-    set up our own buffer
-  */
-  myBuffer = (char *)malloc((strlen(pBueffel)+10) * sizeof(char));
-  if(!myBuffer)
-  {
-    SCWrite(pCon,"ERROR: out of memory in TASSCan",eError);
-    return 0;
-  }
-  memset(myBuffer,0,10+strlen(pBueffel));
-
-  /* 
-    parse loop
-  */
-  lastToken = NONE;
-  lastVar = -1;
-  pPtr = stptok(pBueffel,pToken,20," ,="); /* step over sc */
-  while(pPtr != NULL)
-  {
-     pPtr = stptok(pPtr,pToken,20," ,=");
-     if(strlen(pToken) < 1 || pPtr == NULL)
-                       continue;
-     switch(lastToken)
-     {
-        case NONE:
-                 if(tasNumeric(pToken))
-		 { 
-                    sprintf(pError,
-                      "ERROR: parse error at %s, expected variable",
-                       pToken);
-                    SCWrite(pCon,pError,eError);
-                    return 0;
-                 }
-                 lastToken = TXT;
-                 if( (iPtr = isTASVar(pToken)) >= 0 )
-		 {
-		   if(isTASEnergy(pToken) >= 0)
-		   {
-                     /* energy variables are scan variables */
-		     strcpy(myBuffer,pToken);
-                     strcat(myBuffer," ");
-                   }
-                   else
-		   {
-		     lastVar = iPtr;
-                   }
-		 } 
-                 else
-		 {
-		   /* this is the motor case */
-		     strcpy(myBuffer,pToken);
-                     strcat(myBuffer," ");
-                 }
-                 break; 
-         case TXT:
-                 if(tasNumeric(pToken))
-		 {
-                   lastToken = NUM;
-		   if(lastVar >= 0)
-		   {
-                     vt = GetVarType(pTAS->tasPar[lastVar]);
-                     if(vt == veFloat)
-		     {
-		         VarSetFloat(pTAS->tasPar[lastVar],atof(pToken),
-                                     usInternal);
-			 SCparChange(pCon);
-                     }
-                     else if(vt == veInt)
-                     {
-		         VarSetInt(pTAS->tasPar[lastVar],
-				   (int)atof(pToken), usInternal);
-			 SCparChange(pCon);
-                     }
-                     else
-                     {
-		         pTAS->tasPar[lastVar]->text = strdup(pToken);
-			 SCparChange(pCon);
-                     }
-                     lastVar++;
-                   }
-                   else
-		   {
-		     strcat(myBuffer,pToken);
-                     strcat(myBuffer," ");
-                   }
-                 }
-                 else
-		 {
-		   sprintf(pError,"ERROR: parse error at %s, expected number",
-                   pToken);
-                   SCWrite(pCon,pError,eError);
-                   return 0;
-                 }
-                 break;
-        case NUM:
-                 if(tasNumeric(pToken))
-		 {
-                   lastToken = NUM;
-		   if(lastVar >= 0)
-		   {
-                     vt = GetVarType(pTAS->tasPar[lastVar]);
-                     if(vt == veFloat)
-		     {
-		         VarSetFloat(pTAS->tasPar[lastVar],atof(pToken),
-                                     usInternal);
-                         SCparChange(pCon);
-                     }
-                     else if(vt == veInt)
-                     {
-		         VarSetInt(pTAS->tasPar[lastVar],
-                                   (int)atof(pToken),usInternal);
-			 SCparChange(pCon);
-                     }
-                     else
-                     {
-		        pTAS->tasPar[lastVar]->text = strdup(pToken);
-                     }
-                     lastVar++;
-                   }
-                   else
-		   {
-		     strcat(myBuffer,pToken);
-                     strcat(myBuffer," ");
-                   }
-                 }
-                 else
-		 {
-                    lastVar = -1;
-		    if( (iPtr = isTASVar(pToken)) >= 0 )
-		    {
-		      if(isTASEnergy(pToken) >= 0 )
-		      {
-			/* energy variables are scan variables */
-			strcat(myBuffer,pToken);
-			strcat(myBuffer," ");
-		      }
-		      else
-		      {
-			lastVar = iPtr;
-		      }
-		    } 
-		    else
-		    {
-		      /* this is the motor case */
-			strcat(myBuffer,pToken);
-			strcat(myBuffer," ");
-		    }
-                 }
-                 break;
-     }
-  }
-  strcpy(pBueffel, myBuffer);
-  free(myBuffer);
-  return 1;  
-}
-/*-------------------------------------------------------------------
-EnterScanVar adds the scan variable given to the scan. Thereby it 
-caluclate sthe start of the scan from the center given and NP. To this
-and other purposes it locates the scan variable increment.
------------------------------------------------------------------------*/
-
-static int EnterScanVar(pTASdata pTAS, char *name, float fCenter,
-                        SConnection *pCon)       
-{
-  int iPtr;
-  char pIncrement[30], pError[132];
-  float fIncrement, fStart, fTemp;
-
-  /*
-   get increment
-  */
-  strcpy(pIncrement,"d");
-  strcat(pIncrement,name);
-  iPtr = isTASVar(pIncrement);
-  if(iPtr < 0)
-  {
-    sprintf(pError,"ERROR: internal error, increment %s not found", 
-            pIncrement);
-    SCWrite(pCon,pError,eError);
-    return 0;
-  }
-  fIncrement = pTAS->tasPar[iPtr]->fVal;
-
-  /*
-   calculate start
-  */
-  fStart = fCenter - (pTAS->pScan->iNP/2) * fIncrement;
-
-  /* 
-     If step > 0 save it for scaninfo
-  */
-  if(fIncrement < 0)
-    fTemp = -fIncrement;
-  else
-    fTemp = fIncrement;
-  if(fTemp > .001 && strlen(pTAS->scanVar) < 2)
-  {
-    sprintf(pTAS->scanVar,"%s,%f,%f",name,fStart,fIncrement);
-  }
-
-  /*
-   put it in
-  */
-  return AddTASScanVar(pTAS->pScan,pTAS->pScan->pSics, pCon, 
-                       name, fStart, fIncrement); 
-}
-/*----------------------------------------------------------------------
-  ParseScanVars parses the scan variables and enters them into the
-  scan. Thereby it takes care of the odd MAD syntax and off the fact that
-  the values given to sc are the center of the scan whereas we need the
-  start of the scan. Also ParseScanVars locates the increments for the
-  various variables which are represented as SICS variables. They are 
-  just the variable name prepended with a "d".
-  ------------------------------------------------------------------------*/ 
-static int ParseScanVar(pTASdata pTAS, char *pBueffel, SConnection *pCon,
-                        int *iTas)
-{
-  char pToken[20], *pPtr, pError[132];
-  int iPtr, lastToken, lastVar, lastMotor, status;
-  VarType vt;
-
-  /* 
-    parse loop
-  */
-  lastToken = NONE;
-  lastVar = lastMotor = -1;
-  pPtr = pBueffel;
-  while(pPtr != NULL)
-  {
-     pPtr = stptok(pPtr,pToken,20," ,=");
-     if(strlen(pToken) < 1 || pPtr == NULL)
-                       continue;
-     switch(lastToken)
-     {
-        case NONE:
-                 if(tasNumeric(pToken))
-		 { 
-                    sprintf(pError,
-                      "ERROR: parse error at %s, expected variable",
-                       pToken);
-                    SCWrite(pCon,pError,eError);
-                    return 0;
-                 }
-                 lastToken = TXT;
-		 if( (iPtr = isTASEnergy(pToken)) >= 0)
-		 {
-                     /* QE - variables are scan variables */
-                     lastVar = iPtr;
-                     (*iTas)++;
-                 }
-                 else if( (iPtr = isTASMotor(pToken)) >= 0)
-		 {
-		   /* as are motors */
-		      lastMotor = iPtr;
-                 }
-                 else
-		 {
-                    sprintf(pError,"ERROR: cannot scan %s",pToken);
-                    SCWrite(pCon,pError,eError);
-                    return 0;
-                 }
-                 break; 
-         case TXT:
-                 if(tasNumeric(pToken))
-		 {
-                   lastToken = NUM;
-		   if(lastVar >= 0)
-		   {
-		     /* 
-                       add energy variable
-		     */
-                     status = EnterScanVar(pTAS,tasVariableOrder[EI+lastVar],
-                                           atof(pToken),pCon);
-                     pTAS->tasPar[EI+lastVar]->fVal = atof(pToken);
-                     if(!status)
-                       return status;
-                     lastVar++;
-                   }
-                   else if(lastMotor >= 0)
-		   {
-                     /*
-                       add motor 
-		     */
-                     status = EnterScanVar(pTAS,tasMotorOrder[lastMotor],
-                                           atof(pToken),pCon);
-                     if(!status)
-                       return status;
-                     lastMotor++;
-                   }
-                   else
-		   {
-                     /* internal error */
-		     assert(0);
-                   }
-                 }
-                 else
-		 {
-		   sprintf(pError,"ERROR: parse error at %s, expected number",
-                   pToken);
-                   SCWrite(pCon,pError,eError);
-                   return 0;
-                 }
-                 break;
-        case NUM:
-                 if(tasNumeric(pToken))
-		 {
-                   lastToken = NUM;
-		   if(lastVar >= 0)
-		   {
-		     /* 
-                       add energy variable
-		     */
-                     status = EnterScanVar(pTAS,tasVariableOrder[EI+lastVar],
-                                           atof(pToken),pCon);
-                     pTAS->tasPar[EI+lastVar]->fVal = atof(pToken);
-                     if(!status)
-                       return status;
-                     lastVar++;
-                   }
-                   else if(lastMotor >= 0)
-		   {
-                     /*
-                       add motor 
-		     */
-                     status = EnterScanVar(pTAS,tasMotorOrder[lastMotor],
-                                           atof(pToken),pCon);
-                     if(!status)
-                       return status;
-                     lastMotor++;
-                   }
-                   else
-		   {
-                     /* internal error */
-		     assert(0);
-                   }
-                 }
-                 else
-		 {
-                    lastVar = lastMotor =  -1;
-		    if( (iPtr = isTASEnergy(pToken)) >= 0)
-		    {
-			/* QE - variables are scan variables */
-			lastVar = iPtr;
-                        (*iTas)++;
-		    }
-		    else if( (iPtr = isTASMotor(pToken)) >= 0)
-		    {
-		      /* as are motors */
-			 lastMotor = iPtr;
-		    }
-		    else
-		    {
-		       sprintf(pError,"ERROR: cannot scan %s",pToken);
-		       SCWrite(pCon,pError,eError);
-		       return 0;
-		    }
-                 }
-                 break;
-     }
-  }
-  return 1;  
-}       
-/*-----------------------------------------------------------------------
- During a TAS scan additional output variables can be printed. These are
-  defined in a text variable called ouput. ParseOutput now parses this
-  variable and enters the variables found in there into the TAS data
-  structure so that they can be printed during the scan.
-  ------------------------------------------------------------------------*/
-static void ParseOutput(pTASdata pTAS, SConnection *pCon)
-{
-    char *pText = NULL, *pPtr, pToken[20], pWarn[256];
-    int iPtr;
-
-    /*
-     get a copy of output
-    */
-   pText = (char *)malloc((strlen(pTAS->tasPar[OUT]->text)+10)*sizeof(char));
-   if(!pText)
-   {
-     SCWrite(pCon,"WARNING: out of memory while parsing output variable",
-             eWarning);
-     return;
-   }
-   strcpy(pText,pTAS->tasPar[OUT]->text);
-
-   /*
-    wash it
-   */
-   prepare2Parse(pText);
-
-   /*
-     parse
-   */
-   pTAS->addCount = 0;
-   pPtr = pText;
-   while(pPtr != NULL)
-   {
-     pPtr = stptok(pPtr,pToken,20," ,=");
-     if(strlen(pToken) < 1 || pPtr == NULL)
-                       continue;
-
-     if((iPtr = isTASMotor(pToken)) >= 0)
-     {
-       pTAS->addOutput[pTAS->addCount] = iPtr;
-       pTAS->addType[pTAS->addCount] = 1;
-       pTAS->addCount++;
-     }
-     else if((iPtr = isTASVar(pToken)) >= 0)
-     {
-       pTAS->addOutput[pTAS->addCount] = iPtr;
-       pTAS->addType[pTAS->addCount] = 0;
-       pTAS->addCount++;
-     }
-     else
-     {
-       sprintf(pWarn,"WARNING: ignored invalid token > %s < in output",
-               pToken);
-       SCWrite(pCon,pWarn,eWarning); 
-     }
-   } 
-   free(pText);
-} 
-/*--------------------------------------------------------------------------
-  Now, after so many lines of code we are really ready to boogey: Parse
-  the scan command line, set variables, set the scan up and then actually
-  perform the scan. 
-  --------------------------------------------------------------------------*/
-int TASScan(SConnection *pCon, SicsInterp *pSics, void *pData,
-                 int argc, char *argv[])
-{
-   pTASdata pTAS = (pTASdata)pData;
-   char pLine[1024], pToken[20], *pPtr, pWork[70];
-   int i, status, iPtr, iTas;
-   time_t iDate;
-   struct tm *psTime;
-
-   /* 
-     check authorization
-   */
-   if(!SCMatchRights(pCon,usUser))
-     return 0;
-
-   /*
-     check if we are a fast scan or a normal scan
-   */
-   strtolower(argv[0]);
-   if(strcmp(argv[0],"sf") == 0)
-   {
-     pTAS->iFast = 1;
-   }
-   else
-   {
-     pTAS->iFast = 0;
-   }
-
-   /* Initialize parsing*/
-   Arg2Text(argc, argv,pLine,1023);
-   strtolower(pLine);
-
-   /*
-    set command text for data file 
-   */
-   VarSetText(pTAS->tasPar[COM],pLine, usInternal);
-
-
-   /* 
-      first pass: parse simple variables
-   */
-   status = ParseVar(pTAS,pLine,pCon);
-   if(!status)
-      return status;
-
-   /*
-     clear out old scan
-   */
-   ClearScanVar(pTAS->pScan);   
-   pTAS->scanVar[0] = '\0';
-   
-
-   /*
-    at this stage all simple variables have been set. Now we get the values
-    of some important inital values which we need for entering the scan
-    variables.
-   */
-   pTAS->pScan->iNP = pTAS->tasPar[NP]->iVal;
-   pTAS->pScan->iMode = GetCounterMode(pTAS->pScan->pCounterData);
-   pTAS->pScan->fPreset = GetCounterPreset(pTAS->pScan->pCounterData);
-   pTAS->pScan->pCon = pCon;
-   pTAS->pScan->pSics = pSics;
-
-   /*
-     check for polarisation 
-   */
-   if(pTAS->tasPar[LPA]->iVal == 1){
-     pTAS->iPOL = 1;
-   } else {
-     pTAS->iPOL = -1;
-   }
-
-   /* 
-     now parse the scan variables 
-   */ 
-   iTas = 0;
-   status = ParseScanVar(pTAS,pLine,pCon, &iTas);
-   if(!status)
-      return status;
-
-   /*
-     check if there is something to scan
-   */
-   if(pTAS->pScan->iScanVar < 1)
-   {
-     SCWrite(pCon,"ERROR: nothing to scan",eError);
-     return 0;
-   }
-
-   /*
-    now there is enough information to set the scaninfo variable which
-    is needed to help the status display.
-   */
-   sprintf(pWork,"%d,%s",pTAS->pScan->iNP,pTAS->scanVar);
-   VarSetText(pTAS->tasPar[SINFO],pWork,0);
-
-   /*
-     parse the output variable in order to get additional stuff to write 
-   */
-   ParseOutput(pTAS,pCon);
-   
-   /* 
-      print some status information for the looser
-   */
-   iDate = time(NULL);
-   psTime = localtime(&iDate);
-   memset(pWork,0,69);         
-   strftime(pWork,69,"%d-%b-%Y %H:%M:%S",psTime);
-   sprintf(pLine,"%8s   %3d Points Scan %3d Scanned Variable(s) %s",
-           pTAS->tasPar[INST]->text,
-           pTAS->pScan->iNP, pTAS->pScan->iScanVar, 
-           pWork);
-   SCWrite(pCon,pLine,eWarning);
-   if(GetCounterMode(pTAS->pScan->pCounterData) == eTimer)
-   {
-     sprintf(pLine,"     %8f Seconds per point",
-             GetCounterPreset(pTAS->pScan->pCounterData));
-   }    
-   else
-   {
-     sprintf(pLine,"     %8f Monitor Counts per point",
-             GetCounterPreset(pTAS->pScan->pCounterData));
-
-   }
-   SCWrite(pCon,pLine,eWarning);
-   SCWrite(pCon," ",eWarning);
-   SCWrite(pCon," ",eWarning);
-   sprintf(pLine,
-     " %12s %6s      HKLE: %6.2f%6.2f%6.2f%9.4f%7.3f%7.3f%7.3f",
-     pTAS->tasPar[TIT]->text,
-     pTAS->tasPar[USR]->text,
-     pTAS->tasPar[QH]->fVal - (pTAS->pScan->iNP/2)*pTAS->tasPar[DQH]->fVal,
-     pTAS->tasPar[QK]->fVal - (pTAS->pScan->iNP/2)*pTAS->tasPar[DQL]->fVal,
-     pTAS->tasPar[QL]->fVal - (pTAS->pScan->iNP/2)*pTAS->tasPar[DQK]->fVal,
-     pTAS->tasPar[EN]->fVal - (pTAS->pScan->iNP/2)*pTAS->tasPar[DEN]->fVal,
-     pTAS->tasPar[DQH]->fVal,
-     pTAS->tasPar[DQK]->fVal,
-     pTAS->tasPar[DQL]->fVal,
-     pTAS->tasPar[DEN]->fVal);
-   SCWrite(pCon,pLine,eWarning);
-   if(iTas > 0)
-   {
-     if(pTAS->tasPar[FX]->iVal == 1)
-     {
-       sprintf(pLine,"   Constant KI Scan: KI= %7.4f Angs-1; EI= %9.4f",
-               pTAS->tasPar[KI]->fVal,
-               pTAS->tasPar[EI]->fVal);
-     }
-     else
-     {
-       sprintf(pLine,"   Constant KF Scan: KF= %7.4f Angs-1; EF= %9.4f",
-               pTAS->tasPar[KF]->fVal,
-               pTAS->tasPar[EF]->fVal);
-     }
-     SCWrite(pCon,pLine,eWarning);
-   }   
-
-   /*
-    set our scan functions
-   */
-   SetTASScan(pTAS->pScan, pTAS);
-
-
-   /*
-    finally scan
-   */
-   status = DoScan(pTAS->pScan, 
-                   pTAS->pScan->iNP,
-                   pTAS->pScan->iMode,
-                   pTAS->pScan->fPreset,
-                   pSics,
-                   pCon);
-
-   /*
-     cleanup a little
-   */
-   ResetScanFunctions(pTAS->pScan);
-
-   /*
-     print a message for Severian Gvassilja
-   */
-   sprintf(pLine,"Scan finished, data saved to %s", pTAS->pScan->pFile);
-   SCWrite(pCon,pLine,eWarning);
-
-   return status;
-}
diff --git a/tasu.h b/tasu.h
deleted file mode 100644
index 1ede56fc..00000000
--- a/tasu.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-  This is a helper header file which contains the prototypes for some
-  functions to be used in the implementation of the triple axis spectrometer
-  module. For more info on the functions see the comments in the
-  implementation file tasutil.c
-
-  Initial Coding: Mark Koennecke, November 2000
-  Added TASUpdate: Mark Koennecke, May 2001  
-
-*/
-#ifndef TASUSICS
-#define TASUSICS
-
-extern char *tasMotorOrder[];
-extern char *tasVariableOrder[];
-
-/* maximum number of motors in the list */
-#define MAXMOT 32
-/* offset to the currents, if available */
-#define CURMOT (MAXMOT - 11) 
-
-
-/*
-  Note: the defines below MUST map the range between EI - HZ in the list
-  of variables as defined in tas.h. Otherwise quite interesting things
-  can happen. ETARGET is the variable order index for the energy targets.
-*/
-#define EMIN 25
-#define EMAX 36
-#define ETARGET 94
-
-int isTASMotor(char *val);
-int isTASCurrent(char *val);
-int isTASVar(char *val);
-int isTASEnergy(char *val);
-void prepare2Parse(char *line);
-int getSRO(SConnection *pCon, float *sroVal);
-int tasNumeric(char *pText);
-float readDrivable(char *val, SConnection *pCon);
-void startCurrent(char *val, SConnection *pCon, float fVal);
-void readConversionFactors(pTASdata self,float convH[4]);
-
-int TASCalc(pTASdata self, SConnection *pCon,
-            unsigned char tasMask[10],
-            float motorTargets[20],
-            unsigned char motorMask[20]);
-int TASStart(pTASdata self, SConnection *pCon, SicsInterp *pSics,
-            float motorTargets[20],
-            unsigned char motorMask[20]);
-
-int TASUpdate(pTASdata self, SConnection *pCon);
-
-
-#endif
diff --git a/tasutil.c b/tasutil.c
deleted file mode 100644
index 52e64002..00000000
--- a/tasutil.c
+++ /dev/null
@@ -1,848 +0,0 @@
-/*--------------------------------------------------------------------------
-  This is one implementation file for the TASMAD simulation module for
-  SICS. The requirement is to make SICS look as much as TASMAD as 
-  possible. This includes:
-  - TASMAD is variable driven
-  - Sometimes variables are accessed in storage order.
-  - A complicated calculation has to be done for getting the instruments
-    settings right. The appropriate F77 routine from TASMAD will be 
-    reused.
-  - The scan logic is different.
-  - Output of ILL-formatted data files is required. 
-
-  This file implements a couple of utility functions mainly for parsing
-  and second for interfacing to the F77 routines for calculating the 
-  TAS settings..
-
-  Mark Koennecke, November 2000
-
-  Polarisation support added.
-
-  Mark Koennecke, April 2002
----------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <assert.h>
-#include "fortify.h"
-#include "sics.h"
-#include "sicsvar.h"
-#include "counter.h"
-#include "motor.h"
-#include "scan.h"
-#include "tas.h"
-#include "tasu.h"
-
-
-/*-----------------------------------------------------------------------
-  isTASMotor finds out if the given string is a TAS motor and returns its
-  index in the motor list if this the case. Else -1 is returned.
-  -------------------------------------------------------------------------*/
-int isTASMotor(char *val)
-{
-  int iPtr;
-
-  iPtr = 0;
-  while(tasMotorOrder[iPtr] != NULL)
-  {
-    if(strcmp(val,tasMotorOrder[iPtr]) == 0)
-    {
-      return iPtr;
-    }
-    else
-    {
-      iPtr++;
-    }
-  }
-  return -1;
-}
-/*------------------------------------------------------------------------
- return number if val is a current variable, else -1
- -----------------------------------------------------------------------*/
-int isTASCurrent(char *val){
-  int test;
-  test = isTASMotor(val);
-  if(test < 0){
-    return test;
-  }
-  if(test > 18){
-    return test;
-  } else {
-    return -1;
-  }
-}
-/*--------------------------------------------------------------------------
- isTASVar finds out if the given string is a TAS variable and returns its
-  index if this is the case. Else -1 will be returned.
-  --------------------------------------------------------------------------*/
-int isTASVar(char *val)
-{
-  int iPtr;
-
-  iPtr = 0;
-  while(tasVariableOrder[iPtr] != NULL)
-  {
-    if(strcmp(val,tasVariableOrder[iPtr]) == 0)
-    {
-      return iPtr;
-    }
-    else
-    {
-      iPtr++;
-    }
-  }
-  return -1;
-}
-/*------------------------------------------------------------------------
-isTASEnergy finds out if a variable is a TAS energy variable. This would
-require a TAS calculation to take place. If the test is positive then the
-index of the Variable is returned, else -1 is returned.
--------------------------------------------------------------------------*/ 
-isTASEnergy(char *val)
-{
-  int iPtr;
-
-  for(iPtr = EMIN; iPtr <= EMAX;iPtr++)
-  {
-    if(strcmp(val,tasVariableOrder[iPtr]) == 0)
-    {
-      return iPtr-EMIN;
-    }
-  }
-  return -1;
-}
-/*-----------------------------------------------------------------------
-prepare2Parse removes all unnecessary delimiters from the parse string.
-These are: ' = 
-----------------------------------------------------------------------*/
-void prepare2Parse(char *line)
-{
-  int i, iLang;
-
-  iLang = strlen(line);
-  for(i = 0; i < iLang; i++)
-  {
-    if(line[i] == ',' || line[i] == '=')
-    {
-       line[i] = ' ';
-    }
-  }
-}
-/*---------------------------------------------------------------------*/
-  int tasNumeric(char *pText)
-  {
-    int i, ii, iGood;
-    static char pNum[13] = {"1234567890.+-"};
-    
-    for(i = 0; i < strlen(pText); i++)
-    {
-      for(ii = 0; ii < 13; ii++)
-      {
-        iGood = 0;
-        if(pText[i] == pNum[ii])
-        {
-          iGood = 1;
-          break;
-        }
-      }
-      if(!iGood)
-      {
-          return 0;
-      }
-    }    
-    return 1;
-  }  
-/*--------------------------------------------------------------------
-  print calculation errors.
-*/
-static int printError(int ier, SConnection *pCon)
-{
-  /* 
-     error messages taken from erreso 
-  */
-  switch(ier)
-  {
-     case 1:
-        SCWrite(pCon,"ERROR: Bad lattice parameters(AS,BS,CS)",eError);
-        return 0;
-        break;
-     case 2:
-        SCWrite(pCon,"ERROR: Bad cell angles",eError);
-        return 0;
-        break;
-     case 3:
-        SCWrite(pCon,"ERROR: Bad scattering plane ",eError);
-        return 0;
-        break;
-     case 4:
-        SCWrite(pCon,"ERROR: Bad lattice or lattice plane",eError);
-        return 0;
-        break;
-     case 5:
-        SCWrite(pCon,"ERROR: Check Lattice and Scattering Plane",eError);
-        return 0;
-        break;
-     case 6:
-        SCWrite(pCon,"ERROR: Q not in scattering plane",eError);
-        return 0;
-        break;
-        break;
-     case 7:
-        SCWrite(pCon,"ERROR: Q-modulus to small",eError);
-        return 0;
-        break;
-     case 8:
-     case 12:
-        SCWrite(pCon,"ERROR: KI,KF,Q triangle cannot close",eError);
-        return 0;
-        break;
-     case 9:
-        SCWrite(pCon,"ERROR: KI or K, check d-spacings",eError);
-        return 0;
-        break;
-     case 10:
-        SCWrite(pCon,"ERROR: KI or KF cannot be obtained",eError);
-        return 0;
-        break;
-     case 11:
-        SCWrite(pCon,"ERROR: KI or KF to small",eError);
-        return 0;
-        break;
-     default:
-        break;
-  }
-}
-/*---------------------------------------------------------------------
-  getSRO reads the SRO motor. This motor is for the rotation of the
-  magnet. The value has to be subtracted from the helm value during
-  calculations
-  -----------------------------------------------------------------------*/
-int getSRO(SConnection *pCon, float *sroVal)
-{
-  pMotor pMot = NULL;
-  int status;
-  
-  pMot = FindMotor(pServ->pSics,"sro");
-  if(!pMot)
-  {
-    SCWrite(pCon,"ERROR: internal: motor sro not found!",eError);
-    return 0;
-  }
-  status = MotorGetSoftPosition(pMot,pCon,sroVal);
-  if(status != 1)
-  {
-    SCWrite(pCon,"ERROR: failed to read motor sro",eError);
-    return 0;
-  }
-  return 1;
-}
-/*----------------------------------------------------------------------
-TASCalc does the triple axis spectrometer calculations. This function is
-invoked whenever energy or Q needs to be driven. The parameters:
- - self a pointer to a TASdata structure holding information about all
-  necessary parameters.
- - pCon a SConnection object needed for reporting errors.
- - tasMask a mask with 0,1 indicating which variable is driven. IT IS
-   ASSUMED THAT THE APPROPRIATE VARIABLE HAS ALREADY BEEN SET IN THE
-   INTERPRETER BEFORE TASCalc IS CALLED. This is because for convenience
-   this functions collects the values from the interpreter.
- - motorTargets will hold the new targets for the relevant motors
-   (A1-A6 plus some magnet related) when the call finished happily.
- - motorMask will hold 1's for each motor to drive, 0 for each motor
-   not affected.
-
-This version uses the TASMAD calculation routines. These have been 
-translated from F77 to C with f2c (f2c -A crysconv.f , tacov.f). The C is
-not maintainable, always edit the F77 sources in case of need and 
-retranslate. This scheme requires the definitions going before TASCalc. The
-advantage of using f2c is that we get less portability problems with 
-different calling conventions for C anf F77 on different platforms. 
------------------------------------------------------------------------*/
-#include "f2c.h"
-extern int setrlp_(real *sam, integer *ier);
-
-extern int t_conv__(real *ei, real *aki, real *ef, real *akf, real *
-	qhkl, real *en, real *hx, real *hy, real *hz, integer *if1, integer *
-	if2, logical *ldk, logical *ldh, logical *ldf, logical *lpa, real *dm,
-	 real *da, real *helm, real *f1h, real *f1v, real *f2h, real *f2v, 
-	real *f, integer *ifx, integer *iss, integer *ism, integer *isa, real 
-	*t_a__, real *t_rm__, real *t_alm__, real *t_ra__, real *qm, logical *
-	ldra, logical *ldr_rm__, logical *ldr_alm__, logical *ldr_ra__, real *
-	p_ih__, real *c_ih__, doublereal *a4, integer *ier);
-
-extern int inicurve_(integer *midx, real *mrx1, real *mrx2, integer 
-	*aidx, real *arx1, real *arx2, real *mmin, real *mmax, real *amin, 
-	real *amax);
-
-/*-------------------------------------------------------------------*/
-int TASCalc(pTASdata self, SConnection *pCon,
-            unsigned char tasMask[MAXEVAR],
-            float motorTargets[20],
-            unsigned char motorMask[20])
-{
-  /* for setrlp */
-  real sam[13];
-  integer ier;
-  /* for t_conv */
-  real ei, aki, ef, akf, qhkl[3], en, hx, hy, hz, dm, da, helm, f1h, f1v, 
-       f2h, f2v, f, angles[6], tRM, tRA, tALM, qm, currents[8], 
-       helmconv[4];
-  doublereal a4;
-  integer if1, if2, ifx, iss, ism, isa;
-  logical ldk[8], ldh, ldf, lpa, ldra[6], l_RM, l_RA, l_ALM;
-  /* for inicurve */
-  real mrx1, mrx2, arx1, arx2, mmin, mmax, amin, amax;
-  integer im, ia;
-  pMotor pMot;
-  float fVal, fSRO;
-    /* else */
-  int i;  
-
-  assert(self);
-  assert(pCon);
-  /*
-    The first thing we need to do is to set up the orientation matrix
-    from the sample parameters.
-  */
-  sam[0] = (real)self->tasPar[AS]->fVal;
-  sam[1] = (real)self->tasPar[BS]->fVal;
-  sam[2] = (real)self->tasPar[CS]->fVal;
-  sam[3] = (real)self->tasPar[AA]->fVal;
-  sam[4] = (real)self->tasPar[BB]->fVal;
-  sam[5] = (real)self->tasPar[CC]->fVal;
-  sam[6] = (real)self->tasPar[AX]->fVal;
-  sam[7] = (real)self->tasPar[AY]->fVal;
-  sam[8] = (real)self->tasPar[AZ]->fVal;
-  sam[9] = (real)self->tasPar[BX]->fVal;
-  sam[10] = (real)self->tasPar[BY]->fVal;
-  sam[11] = (real)self->tasPar[BZ]->fVal;
-  setrlp_(sam,&ier);
-  switch(ier)
-  {
-     case 1:
-       SCWrite(pCon,"ERROR: error on lattice parameters",eError);
-       return 0;
-       break;
-     case 2:
-       SCWrite(pCon,"ERROR: error on lattice angles",eError);
-       return 0;
-       break;
-     case 3:
-       SCWrite(pCon,"ERROR: error on vectors A1, A2",eError);
-       return 0;
-       break;
-     default:
-       break;
-  }
-
-  /* 
-     now we need to set the parameters for mono/analyzer
-     curvature calculations.
-  */
-  mrx1  = (real)self->tasPar[MRX1]->fVal;
-  mrx2  = (real)self->tasPar[MRX2]->fVal;
-  arx1  = (real)self->tasPar[ARX1]->fVal;
-  arx2  = (real)self->tasPar[ARX2]->fVal;
-  im = 7;
-  ia = 9; 
-  pMot = FindMotor(pServ->pSics,"MCV");
-  if(!pMot)
-  {
-    SCWrite(pCon,"ERROR: cannot find monochromator curvature motor",eError);
-    return 0;
-  }
-  MotorGetPar(pMot,"softupperlim",&fVal);
-  mmax = (real)fVal;
-  MotorGetPar(pMot,"softlowerlim",&fVal);
-  mmin = (real)fVal;
-  pMot = FindMotor(pServ->pSics,"ACH");
-  if(!pMot)
-  {
-    SCWrite(pCon,"ERROR: cannot find analyzer curvature motor",eError);
-    return 0;
-  }
-  MotorGetPar(pMot,"softupperlim",&fVal);
-  amax = (real)fVal;
-  MotorGetPar(pMot,"softlowerlim",&fVal);
-  amin = (real)fVal;
-  inicurve_(&im,&mrx1, &mrx2, &ia, &arx1, &arx2,&mmin, &mmax,
-            &amin, &amax);
-
-  /*
-    This done, we painstackingly initialize the tons of parameters required
-    by the t_conv
-  */
-  ei  = (real)self->tasPar[TEI]->fVal;
-  aki = (real)self->tasPar[TKI]->fVal;
-  ef  = (real)self->tasPar[TEF]->fVal;
-  akf = (real)self->tasPar[TKF]->fVal;
-  qhkl[0] = (real)self->tasPar[TQH]->fVal;
-  qhkl[1] = (real)self->tasPar[TQK]->fVal;
-  qhkl[2] = (real)self->tasPar[TQL]->fVal;
-  en = (real)self->tasPar[TEN]->fVal;
-  hx = (real)self->tasPar[THX]->fVal;
-  hy = (real)self->tasPar[THY]->fVal;
-  hz = (real)self->tasPar[THZ]->fVal;
-  f = (real)2.072; /* energy unit meV */
-  if1 = (integer)self->tasPar[F1]->iVal;
-  if2 = (integer)self->tasPar[F2]->iVal;
-  for(i = 0; i < 8; i++)
-  {
-     ldk[i] = (logical)tasMask[i];
-  }
-  if(if1 > 0 || if2 > 0){
-    ldf = 1;
-  } else {
-    ldf = 0;
-  }
-  if(tasMask[9] || tasMask[10] || tasMask[11] ) {
-    ldh = 1;
-  } else {
-    ldh = 0;
-  }
-
- if(self->tasPar[LPA]->iVal > 0)
-    lpa = (logical)1;
- else
-   lpa = (logical)0;
-
-  dm   = (real)self->tasPar[DM]->fVal;
-  da   = (real)self->tasPar[DA]->fVal;
-  qm   = (real)self->tasPar[QM]->fVal;
-  helm = (real)self->tasPar[HELM]->fVal;
-  f1h  = (real)self->tasPar[IF1H]->fVal;
-  f1v  = (real)self->tasPar[IF1V]->fVal;
-  f2h  = (real)self->tasPar[IF2H]->fVal;
-  f2v  = (real)self->tasPar[IF2V]->fVal;
-  ifx = (integer)self->tasPar[FX]->iVal;
-  iss = (integer)self->tasPar[SS]->iVal;
-  ism = (integer)self->tasPar[SM]->iVal;
-  isa = (integer)self->tasPar[SA]->iVal;
-
-  /*
-   initialize the magnet currents. 
-  */
-  for(i = 0; i < 4; i++)
-  {
-    helmconv[i] = .0;
-    currents[i] = readDrivable(tasMotorOrder[CURMOT+i],pCon);
-    currents[i+4] = readDrivable(tasMotorOrder[CURMOT + i + 4],pCon);
-  }
-  readConversionFactors(self,helmconv);
-
-  /*
-    warning if energy fixed
-  */
-  if(ifx == 0)
-  {
-    SCWrite(pCon,"WARNING: energy fixed",eWarning);
-  }
-
-  /*
-    read a4 in order to make magnet calculations work
-  */
-  a4 = .0;
-  a4 = readDrivable(tasMotorOrder[A4MOT],pCon);
-
-  /* 
-    initalise the motorMasks to 0.
-  */
-  for(i = 0; i < 20; i++)
-  {
-    motorMask[i] = 0;
-  }
-  for(i = 0; i < 6; i++)
-  {
-    ldra[i] = 0;
-  }
-  l_RA = l_RM = l_ALM = ier = 0;  
-
-  /* now we can call */
-  t_conv__(&ei, &aki, &ef, &akf, 
-	qhkl, &en, &hx, &hy, &hz, &if1,
-	&if2, ldk, &ldh, &ldf, &lpa, &dm,
-	&da, &helm, &f1h, &f1v, &f2h, &f2v, 
-	&f, &ifx, &iss, &ism, &isa,  
-	angles, &tRM, &tALM, &tRA, &qm, ldra, 
-	&l_RM, &l_ALM,&l_RA, currents,helmconv,&a4, 
-	&ier);
-
-  if(ier != 0)
-  {
-    printError(ier,pCon);
-    return 0;
-  }
-
-  /* 
-  now we have to put those things back which interest us, including 
-  updating the variables which may have accidentally been set. 
-  */
-  for(i = 0; i < 6; i++)
-  {
-    motorTargets[i] = angles[i];
-    motorMask[i] = ldra[i];    
-  }
-  /*
-    these additional motors are the curvature motors
-  */
-  motorMask[6] = l_RM;
-  motorTargets[6] = tRM;
-  motorMask[8] = l_RA;
-  motorTargets[8] = tRA;
-  for(i = 0; i < 8; i++)
-  {
-    motorTargets[9+i] = currents[i];
-  }  
-  if(ldh){ 
-    /* currents must be driven */
-    for( i = 0; i < 3; i++){
-      motorMask[13+i] = 1;
-    }
-  }
-  if(ldf){ 
-    /* currents must be driven */
-    for( i = 0; i < 4; i++){
-      motorMask[9+i] = 1;
-    }
-  }
-
-  self->tasPar[TEI]->fVal = (float)ei;
-  self->tasPar[TKI]->fVal = (float)aki;
-  self->tasPar[TEF]->fVal = (float)ef;
-  self->tasPar[TKF]->fVal = (float)akf;
-  self->tasPar[TEN]->fVal = (float)en;
-  self->tasPar[QM]->fVal = (float)qm;  
-  self->tasPar[TQM]->fVal = (float)qm;  
-
-  return 1;
-}
-/*-------------------------------------------------------------------------
-TASStart starts the motors calculated by TASCalc
----------------------------------------------------------------------------*/
-int TASStart(pTASdata self, SConnection *pCon, SicsInterp *pSics,
-            float motorTargets[20],
-            unsigned char motorMask[20])
-{
-  int status, i;
-  char pBueffel[80];
-
-  /*
-    do the A1-A6 motors first
-  */
-  for(i = 0; i < 6; i++)
-  {
-    if(motorMask[i] != 0)
-    {
-      status =  StartMotor(pServ->pExecutor,pSics,pCon,
-                           tasMotorOrder[i], motorTargets[i]);
-      if(status  == 0)
-      {
-        /* the error will have been reported and must be ignored */
-	SCSetInterrupt(pCon,eContinue);
-      }
-    }
-  }
-  /* 
-   start the  monochromator and analyzer curvature motors
-  */
-  if(motorMask[6])
-  {
-      status =  StartMotor(pServ->pExecutor,pSics,pCon,
-                           "MCV", motorTargets[6]);
-      if(status  == 0)
-      {
-        /* the error will have been reported but must be ignored*/
-	SCSetInterrupt(pCon,eContinue);
-      }
-  }
-  if(motorMask[8])
-  {
-      status =  StartMotor(pServ->pExecutor,pSics,pCon,
-                           "ACH", motorTargets[8]);
-      if(status  == 0)
-      {
-        /* the error will have been reported but must be ignored*/
-	SCSetInterrupt(pCon,eContinue);
-	return 0;
-      }
-  }
-
-  /*
-    start magnet currents.
-  */   
-  for(i = 0; i < 8; i++){
-    if(motorMask[9+i] == 1){
-      startCurrent(tasMotorOrder[CURMOT+i],pCon,motorTargets[9+i]);
-    }
-  }
-
-  return 1;
-}      
-/*------------------ from t_update.f converted to t_update.c -----------*/       
-extern int t_update__(real *p_a__, real *p_ih__, real *c_ih__, 
-		     logical *lpa, real *dm, real *da, integer *isa, 
-                     real *helm, real *f1h, real *f1v, real *f2h, real *f2v, 
-                     real *f, real *ei, real *aki, real *ef, real *akf, 
-                     real *qhkl, real *en, real *hx, real *hy, real *hz, 
-		     integer *if1, integer *if2, real *qm, integer *ier);
-/*---------------------------------------------------------------------------
- TASUpdate calculates the Q/E variables back from the motors A1-A6 and
- then proceeds to update the energy variables. It also checks if the
- analyzer monochromator motors match up i.e tth = 2*om.
- ----------------------------------------------------------------------------*/
-int TASUpdate(pTASdata self, SConnection *pCon)
-{  
-  real sam[16], amot[6], helmCurrent[8], convH[4], dm, da, helm, f1h, f1v;
-  real f, ei, aki, ef, akf, qhkl[3], en, hx, hy, hz, qm, f2v, f2h;
-  logical lpa;
-  integer isa, if1, if2, ier, ifx;
-  pMotor pMot;
-  char pBueffel[132];
-  float fMot, diff, fSRO;
-  int i, status;
-
-  assert(self);
-  assert(pCon);
-
-  /*
-    The first thing we need to do is to set up the orientation matrix
-    from the sample parameters.
-  */
-  sam[0] = (real)self->tasPar[AS]->fVal;
-  sam[1] = (real)self->tasPar[BS]->fVal;
-  sam[2] = (real)self->tasPar[CS]->fVal;
-  sam[3] = (real)self->tasPar[AA]->fVal;
-  sam[4] = (real)self->tasPar[BB]->fVal;
-  sam[5] = (real)self->tasPar[CC]->fVal;
-  sam[6] = (real)self->tasPar[AX]->fVal;
-  sam[7] = (real)self->tasPar[AY]->fVal;
-  sam[8] = (real)self->tasPar[AZ]->fVal;
-  sam[9] = (real)self->tasPar[BX]->fVal;
-  sam[10] = (real)self->tasPar[BY]->fVal;
-  sam[11] = (real)self->tasPar[BZ]->fVal;
-  setrlp_(sam,&ier);
-  switch(ier)
-  {
-     case 1:
-       SCWrite(pCon,"ERROR: error on lattice parameters",eError);
-       return 0;
-       break;
-     case 2:
-       SCWrite(pCon,"ERROR: error on lattice angles",eError);
-       return 0;
-       break;
-     case 3:
-       SCWrite(pCon,"ERROR: error on vectors A1, A2",eError);
-       return 0;
-       break;
-     default:
-       break;
-  }
-
-  /*
-    correct helmholtz angle for SRO rotation
-  */
-  if(getSRO(pCon,&fSRO)) {
-    fSRO = self->oldSRO - fSRO;
-    fSRO =  self->tasPar[HELM]->fVal - fSRO;
-    if(fSRO > 360){
-      fSRO -= 360.;
-    }
-    if(fSRO < -360){
-      fSRO += 360.;
-    }
-    getSRO(pCon,&self->oldSRO);
-    self->tasPar[HELM]->fVal = fSRO;
-  }
-
-  /*
-   get the motor angles A1-A6
-  */
-  for(i = 0; i < 6; i++)
-  {
-    pMot = FindMotor(pServ->pSics,tasMotorOrder[i]);
-    if(!pMot)
-    {
-      sprintf(pBueffel,"ERROR: internal: motor %s NOT found", 
-              tasMotorOrder[i]);
-      SCWrite(pCon,pBueffel,eError);
-      return 0;      
-    }
-    status = MotorGetSoftPosition(pMot,pCon,&fMot);
-    if(status != 1)
-    {
-      sprintf(pBueffel, "ERROR: failed to read motor %s", 
-              tasMotorOrder[i]);
-      SCWrite(pCon,pBueffel,eError);
-      return 0;
-    }
-    amot[i] = fMot;
-  }
-
-  /*
-   read magnet currents.
-  */
-  for(i = 0; i < 4; i++)
-  {
-    convH[i] = .0;
-    helmCurrent[i] = readDrivable(tasMotorOrder[CURMOT+i],pCon);
-    helmCurrent[4+i] = readDrivable(tasMotorOrder[CURMOT+i+4],pCon);
-  }
-  readConversionFactors(self,convH);
-
-  /*
-   collect all the other machine parameters needed for a call to 
-   t_update
-  */
-  if(self->tasPar[LPA]->iVal > 0)
-    lpa = (logical)1;
-  else
-    lpa = (logical)0;
-
-  da   = (real)self->tasPar[DA]->fVal;
-  dm   = (real)self->tasPar[DM]->fVal;
-  isa = (integer)self->tasPar[SA]->iVal;
-  helm = (real)self->tasPar[HELM]->fVal;
-  f1h  = (real)self->tasPar[IF1H]->fVal;
-  f1v  = (real)self->tasPar[IF1V]->fVal;
-  f2h  = (real)self->tasPar[IF2H]->fVal;
-  f2v  = (real)self->tasPar[IF2V]->fVal;
-  f = (real)2.072; /* energy unit meV */
-
-  ifx = (integer)self->tasPar[FX]->iVal;
-
-  /*
-    now call t_update to do the calculation
-  */
-  ier = 0;
-  en = ef = ei = .0;
-  t_update__(amot, helmCurrent, convH, &lpa, &dm, &da, &isa, &helm,
-	     &f1h, &f1v, &f2h, &f2v, &f, &ei, &aki, &ef, &akf,
-             qhkl, &en, &hx, &hy, &hz, &if1, &if2, &qm, &ier);  
-  /*
-   !!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   t_update's function ex_up must be edited manually after conversion 
-   to c by f2c. The reason is a different definition of the abs function.
-   The line:
-    arg = (d__1 = *dx * sin(*ax2 / 114.59155902616465, abs(d__1));
-
-   has to be changed to: 
-    arg = *dx * sin(*ax2 / 114.59155902616465);
-    if(arg < .0)
-      arg = -arg;
-
-   !!!!!!!!!!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
-
-  if(ier != 0)
-  {
-    printError(ier,pCon);
-    return 0;
-  }
-  
-  /*
-    update all the energy variables
-  */
-  self->tasPar[EI]->fVal = ei;
-  self->tasPar[KI]->fVal = aki;
-  self->tasPar[EF]->fVal = ef;
-  self->tasPar[KF]->fVal = akf;
-  self->tasPar[QH]->fVal = qhkl[0];
-  self->tasPar[QK]->fVal = qhkl[1];
-  self->tasPar[QL]->fVal = qhkl[2];
-  /*
-  self->tasPar[EN]->fVal = en;
-  */
-  self->tasPar[EN]->fVal = ei - ef;
-  self->tasPar[HX]->fVal = hx;
-  self->tasPar[HY]->fVal = hy;
-  self->tasPar[HZ]->fVal = hz;
-  self->tasPar[QM]->fVal = qm;
-  self->tasPar[HX]->fVal = hx;
-  self->tasPar[HY]->fVal = hy;
-  self->tasPar[HZ]->fVal = hz;
-
-  /*
-    now check the analyzer or monochromator angles
-  */
-  if(ifx == 1)
-  {
-    diff = amot[1]/2 - amot[0];
-    if(diff < .0)
-      diff = -diff;
-    if(diff > .1)
-    {
-      sprintf(pBueffel,"WARNING: A2 = %f is not half of A1 = %f",
-	      amot[1], amot[0]);
-      SCWrite(pCon,pBueffel,eWarning);
-    }
-  }
-  else if (ifx == 2)
-  {
-    diff = amot[5]/2 - amot[4];
-    if(diff < .0)
-      diff = -diff;
-    if(diff > .1)
-    {
-      sprintf(pBueffel,"WARNING: A6 = %f is not half of A5 = %f",
-	      amot[5], amot[4]);
-      SCWrite(pCon,pBueffel,eWarning);
-    }
-  }
-
-  return 1;
-}
-/*-----------------------------------------------------------------------
- readDrivable tries to read the value of one of the magnet currents.
- All errors are ignored because most of the time currents will not be 
- present in the system.
- -----------------------------------------------------------------------*/
-float readDrivable(char *val, SConnection *pCon){
-  pIDrivable pDriv;
-  CommandList *pCom;
-  pDummy pDum;
-  pMotor pMot = NULL;
-  float fVal;
-
-  /*
-    if motor: read motor
-   */
-  pMot = FindMotor(pServ->pSics,val);
-  if(pMot != NULL){
-    MotorGetSoftPosition(pMot,pCon,&fVal);
-    return fVal;
-  }
-
-  /*
-    else: read general drivable
-  */
-  pCom = FindCommand(pServ->pSics,val);
-  if(pCom != NULL){
-    pDriv = GetDrivableInterface(pCom->pData);
-    if(pDriv != NULL){
-      return pDriv->GetValue(pCom->pData,pCon);
-    }
-  }
-  return -999.99;
-}
-/*-----------------------------------------------------------------------
- startCurrent starts driving a current to a new value
- All errors are ignored because most of the time currents will not be 
- present in the system.
- -----------------------------------------------------------------------*/
-void startCurrent(char *val, SConnection *pCon, float fVal){
-  StartMotor(pServ->pExecutor,pServ->pSics,pCon,
-	       val,fVal);
-}
-
-/*-----------------------------------------------------------------------
- readConversionFactors updates the array given as a parameter with the 
- values of the Gauss->Ampere conversion factors
- -------------------------------------------------------------------------*/
-void readConversionFactors(pTASdata self,float convH[4]){
-  convH[0] = self->tasPar[HCONV1]->fVal;
-  convH[1] = self->tasPar[HCONV2]->fVal;
-  convH[2] = self->tasPar[HCONV3]->fVal;
-  convH[3] = self->tasPar[HCONV4]->fVal;
-}
-
-
-
-
diff --git a/tdchm.c b/tdchm.c
deleted file mode 100644
index 47324f28..00000000
--- a/tdchm.c
+++ /dev/null
@@ -1,563 +0,0 @@
-/*--------------------------------------------------------------------------
-  This is a driver for the TDC histogram memory as supplied with the
-  Risoe instruments. This system uses a Z80 processor internally. 
-  Communication is via a GPIB interface. For more information on this
-  device consult documentation available from Risoe.
-
-  The TDC needs a separate counter for controlling the count operation. 
-  The counter is connected to the TDC and inhibits histogramming when the 
-  counter is not ready. This is alos why many of the functions in this
-  file chain down to a counter.
-
-  copyright: see file COPYRIGHT
-
-  Mark Koennecke, February 2003
-  --------------------------------------------------------------------------*/
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <math.h>
-#include "fortify.h"
-#include "sics.h"
-#include "countdriv.h"
-#include "counter.h"
-#include "HistMem.h"
-#include "stringdict.h"
-#include "HistDriv.i"
-#include "ecb.h"
-
-/*-------------------------- private definitions -----------------------*/
-typedef enum {HMX, HMY, HMXY} TDCModes;
-
-#define MAXTDCCHANNELS (128*128)
-
-#define COMMERROR    -301
-#define MAXEXCEEDED  -302
-
-/*------------------------- private data structure ---------------------*/
-
-typedef struct{
-  TDCModes mode;
-  int map;
-  int bank;
-  unsigned char fillByte;
-  int range;
-  int n;
-  int errorCode;
-  pCounter counter;
-  pECB tdc;
-} Tdc, *pTdc;
-
-/*=======================================================================*/
-static int downloadConfiguration(pTdc self){
-  int status;
-  Z80_reg in, out;
-  int function;
-
-  /*
-    map 
-  */
-  in.d = (unsigned char)self->map;
-  status = ecbExecute(self->tdc,134,in,&out);
-  if(status != 1){
-    return status;
-  }
-
-  /*
-    mode
-  */
-  switch(self->mode){
-  case HMX:
-    function = 129;
-    break;
-  case HMY:
-    function = 130;
-    break;
-  case HMXY:
-    function = 128;
-    break;
-  default:
-    assert(0);
-  }
-  status = ecbExecute(self->tdc,function,in,&out);
-  if(status != 1){
-    return status;
-  }
-
-  return 1;
-}
-/*----------------------------------------------------------------------*/
-static int TDCConfigure(pHistDriver self, SConnection *pCon,
-		       pStringDict pOpt, SicsInterp *pSics){
-  pTdc tdc = NULL;
-  char pValue[80];
-  float value;
-  int status;
-
-  assert(self);
-  tdc = (pTdc)self->pPriv;
-  assert(tdc);
-
-  status = StringDictGet(pOpt,"mode",pValue,79);
-  assert(status); /* defaults should have been set in driver creation*/
-  if(strcmp(pValue,"HMX") == 0){
-    tdc->mode = HMX;
-  }else if(strcmp(pValue,"HMY") == 0){
-    tdc->mode = HMY;
-  }else if(strcmp(pValue,"HMXY") == 0){
-    tdc->mode = HMXY;
-  } else {
-    SCWrite(pCon,"ERROR: invalid HM mode defaulted to HMXY",eError);
-    tdc->mode = HMXY;
-  }
-
-  status = StringDictGetAsNumber(pOpt,"map",&value);
-  if(!status){
-    SCWrite(pCon,"ERROR: invalid map value",eError);
-  } else {
-    tdc->map = (int)rint(value);
-  }
-
-  status = StringDictGetAsNumber(pOpt,"bank",&value);
-  if(!status){
-    SCWrite(pCon,"ERROR: invalid bank value",eError);
-  } else {
-    tdc->bank = (int)rint(value);
-    if(tdc->bank != 0 && tdc->bank != 1){
-      SCWrite(pCon,"ERROR: invalid bank value defaulted to 0",eError);
-      tdc->bank = 0;
-    }
-  }
-
-  status = StringDictGetAsNumber(pOpt,"range",&value);
-  if(!status){
-    SCWrite(pCon,"ERROR: invalid range value",eError);
-  } else {
-    tdc->range = (int)rint(value);
-  }
-
-  status = StringDictGetAsNumber(pOpt,"n",&value);
-  if(!status){
-    SCWrite(pCon,"ERROR: invalid n value",eError);
-  } else {
-    tdc->n = (int)rint(value);
-  }
-
-  status = StringDictGet(pOpt,"counter",pValue,79);
-  /*
-    ignore errors here, in order to support operations without counter
-  */
-  if(!status){
-    tdc->counter = NULL;
-  }
-  tdc->counter = FindCommandData(pSics,pValue,"SingleCounter");
-
-  tdc->fillByte = 0;
-
-  status = StringDictGet(pOpt,"ecb",pValue,79);
-  assert(status);
-  tdc->tdc = FindCommandData(pSics,pValue,"ECB");
-  if(tdc->tdc == NULL){
-    SCWrite(pCon,"ERROR: failed to locate ECB system, critical!",eError);
-    return 0;
-  }
-
-  status = downloadConfiguration(tdc);
-  if(!status){
-    tdc->errorCode = status;
-    return 0;
-  }
-
-
-  self->iReconfig = 0;
-
-  return 1;
-}
-/*=======================================================================*/
-static int clearTdc(pTdc self, unsigned char fill){
-  Z80_reg in, out;
-
-  in.b = self->bank;
-  in.c = fill;
-  in.d = 0;
-  return ecbExecute(self->tdc,133,in,&out);
-}
-/*---------------------------------------------------------------------*/
-static int enableTdc(pTdc self){
-  Z80_reg in, out;
-
-  /*
-    range and n are obscure parameters
-  */
-  in.c = 0;
-  in.b = self->range;
-  in.d = (char) ((self->n >>8) && 255);
-  in.e = (char)(self->n && 255);
-
-  return ecbExecute(self->tdc,131,in,&out);
-}
-/*-----------------------------------------------------------------------*/
-static int TDCStart(pHistDriver self, SConnection *pCon){
-  pTdc tdc = NULL;
-  int status;
-
-  assert(self);
-  tdc = (pTdc)self->pPriv;
-  assert(tdc);
-  tdc->errorCode = 0;
-
-  status = clearTdc(tdc,0);
-  if(status != 1){
-    tdc->errorCode = COMMERROR;
-    return HWFault;
-  }
-
-  status = enableTdc(tdc);
-  if(status != 1){
-    tdc->errorCode = COMMERROR;
-    return HWFault;
-  }
-
-  /*
-    start the counter if available
-  */
-  if(tdc->counter != NULL){
-    tdc->counter->pDriv->fPreset = self->fCountPreset;
-    tdc->counter->pDriv->eMode = self->eCount;
-    return tdc->counter->pDriv->Start(tdc->counter->pDriv);
-  }
-  return 1;
-}
-/*=====================================================================*/
-static int disableTdc(pTdc self){
-  Z80_reg in, out;
-
-  return ecbExecute(self->tdc,132,in,&out);
-}
-/*-------------------------------------------------------------------*/
-static int TDCHalt(pHistDriver self){
-  pTdc tdc = NULL;
-  int status;
-
-  assert(self);
-  tdc = (pTdc)self->pPriv;
-  assert(tdc);
-  tdc->errorCode = 0;
-
-  status = disableTdc(tdc);
-  if(status != 1){
-    tdc->errorCode = COMMERROR;
-    return HWFault;
-  }
-  
-  if(tdc->counter != NULL){
-    tdc->counter->pDriv->Halt(tdc->counter->pDriv);
-  }
-  return 1;
-}
-/*=====================================================================*/
-static int TDCCountStatus(pHistDriver self, SConnection *pCon){
-  pTdc tdc = NULL;
-  int tdcstatus, status;
-  float fControl;
-
-  assert(self);
-  tdc = (pTdc)self->pPriv;
-  assert(tdc);
-
-  if(tdc->counter != NULL){
-    status = tdc->counter->pDriv->GetStatus(tdc->counter->pDriv,&fControl);
-  }
-  /*
-    The TDC does not seem to have a means to figure if it is counting or not
-    or to do some sort of progress report. So it has to have an associated 
-    counter in order to stop it at the end.
-  */
-
-  /* 
-     This is no proper fix. The proper fix would be to keep the state
-     in the private data structure as well and disbale to TDC
-     on HWNoBeam and enable the TDC again if the
-     beam comes on. However, this is done in hardware at SANS-II. So we 
-     leave it for now.
-  */
-  if(status == HWIdle || status == HWFault){
-    tdcstatus = disableTdc(tdc);
-    if(tdcstatus != 1){
-      tdc->errorCode = COMMERROR;
-      return HWFault;
-    }
-  }
-  return status;
-}
-/*=====================================================================*/
-static int TDCGetError(pHistDriver self, int *iCode, char *perror,
-		       int iErrlen){
-  pTdc tdc = NULL;
-
-  assert(self);
-  tdc = (pTdc)self->pPriv;
-  assert(tdc);
-
-  *iCode = tdc->errorCode;
-  switch(tdc->errorCode){
-  case COMMERROR:
-    strncpy(perror,"Communication problem with TDC",iErrlen);
-    break;
-  case MAXEXCEEDED:
-    strncpy(perror,"Requested to many channels for read",iErrlen);
-    break;
-  default:
-    if(tdc->counter != NULL){
-      tdc->counter->pDriv->GetError(tdc->counter->pDriv,
-				    iCode,perror,iErrlen);
-    } else{
-      strncpy(perror,"Undefined error code",iErrlen);
-    }
-    break;
-  }
-  return 1;
-}
-/*=====================================================================*/
-static int TDCFixIt(pHistDriver self, int iCode){
-  pTdc tdc = NULL;
-  int result;
-
-  assert(self);
-  tdc = (pTdc)self->pPriv;
-  assert(tdc);
-
-  switch(iCode){
-  case COMMERROR:
-    ecbClear(tdc->tdc);
-    result = COREDO;
-    break;
-  default:
-    if(tdc->counter != NULL){
-      result = tdc->counter->pDriv->TryAndFixIt(tdc->counter->pDriv,
-				    iCode);
-    } else{
-      result = COTERM;
-    }
-    break;
-  }
-  return result;
-}
-/*=====================================================================*/
-static int TDCGetData(pHistDriver self, SConnection *pCon){
-  pTdc tdc = NULL;
-
-  assert(self);
-  tdc = (pTdc)self->pPriv;
-  assert(tdc);
-
-  if(tdc->counter != NULL){
-    return tdc->counter->pDriv->ReadValues(tdc->counter->pDriv);
-  }
-  return 1;
-}
-/*======================================================================*/
-static long TDCGetMonitor(pHistDriver self, int i, SConnection *pCon){
-  pTdc tdc = NULL;
-
-  assert(self);
-  tdc = (pTdc)self->pPriv;
-  assert(tdc);
-
-  if(tdc->counter != NULL){
-    return GetMonitor(tdc->counter,i,pCon);
-  }
-  return -9999; /* no monitor available */
-}
-/*======================================================================*/
-static float TDCGetTime(pHistDriver self,SConnection *pCon){
-  pTdc tdc = NULL;
-
-  assert(self);
-  tdc = (pTdc)self->pPriv;
-  assert(tdc);
-
-  if(tdc->counter != NULL){
-    return GetCountTime(tdc->counter,pCon);
-  }
-  return -9999.99; /* no time available */
-}
-/*=====================================================================*/
-static int TDCPause(pHistDriver self, SConnection *pCon){
-  pTdc tdc = NULL;
-  int status;
-
-  assert(self);
-  tdc = (pTdc)self->pPriv;
-  assert(tdc);
-
-  status = disableTdc(tdc);
-  if(status != 1){
-    tdc->errorCode = COMMERROR;
-    return HWFault;
-  }
-
-
-  if(tdc->counter != NULL){
-    return tdc->counter->pDriv->Pause(tdc->counter->pDriv);
-  }
-  return 1;
-}
-/*=====================================================================*/
-static int TDCContinue(pHistDriver self, SConnection *pCon){
-  pTdc tdc = NULL;
-  int status;
-
-  assert(self);
-  tdc = (pTdc)self->pPriv;
-  assert(tdc);
-
-  status = enableTdc(tdc);
-  if(status != 1){
-    tdc->errorCode = COMMERROR;
-    return HWFault;
-  }
-
-
-  if(tdc->counter != NULL){
-    return tdc->counter->pDriv->Continue(tdc->counter->pDriv);
-  }
-  return 1;
-}
-/*=======================================================================*/
-static int TDCFree(pHistDriver self){
-  free(self->pPriv);
-  return 1;
-}
-/*======================================================================*/
-static int TDCSetHistogram(pHistDriver self, SConnection *pCon,
-			   int i, int iStart, int iEnd, HistInt *pData){
-  pTdc tdc = NULL;
-  int status;
-  char pBueffel[256];
-  Ecb_pack data;
-
-  assert(self);
-  tdc = (pTdc)self->pPriv;
-  assert(tdc);
-
-  sprintf(pBueffel,
-	  "WARNING: SetHistogram can only fill HM with a fill byte %s",
-	  "\n using firts value for that");
-  SCWrite(pCon,pBueffel,eWarning);
-
-  data.result = pData[0];
-  status = clearTdc(tdc,data.b.byt0);
-  if(status != 1){
-    tdc->errorCode = COMMERROR;
-    return HWFault;
-  }
-  return 1;
-}
-/*======================================================================*/
-static int TDCPreset(pHistDriver self, SConnection *pCon, HistInt iVal){
-  pTdc tdc = NULL;
-  int status;
-  char pBueffel[256];
-  Ecb_pack data;
-
-  assert(self);
-  tdc = (pTdc)self->pPriv;
-  assert(tdc);
-
-  sprintf(pBueffel,
-	  "WARNING: Preset can only fill HM with a fill byte %s",
-	  "\n using first value for that");
-  SCWrite(pCon,pBueffel,eWarning);
-
-  data.result = iVal;
-  status = clearTdc(tdc,data.b.byt0);
-  if(status != 1){
-    tdc->errorCode = COMMERROR;
-    return HWFault;
-  }
-  return 1;
-}
-/*======================================================================*/
-static int TDCGetHistogram(pHistDriver self, SConnection *pCon,
-			   int bank, int iStart, int length,
-			   HistInt *pData){
-  pTdc tdc = NULL;
-  int status;
-  unsigned short address, byteCount;
-
-  assert(self);
-  tdc = (pTdc)self->pPriv;
-  assert(tdc);
-
-  if(length > MAXTDCCHANNELS){
-    tdc->errorCode = MAXEXCEEDED;
-    return HWFault;
-  }
-
-  address = (unsigned short)iStart;
-  /*
-    this is a fix because the TDC cannot send more then 64KB
-  */ 
-  if(length >= 16384){
-    length = 16383;
-  }
-  byteCount = length *4;
-  status = ecbDMARead(tdc->tdc,address,pData,byteCount);
-  if(status != 1){
-    tdc->errorCode = COMMERROR;
-    return HWFault;
-  }
-  return 1;
-}
-/*====================================================================*/
-pHistDriver MakeTDCHM(pStringDict pOption){
-    pHistDriver pNew = NULL;
-    pTdc tdc = NULL;
-    
-    /* create the general driver */
-    pNew = CreateHistDriver(pOption);
-    if(!pNew)
-    {
-      return NULL;
-    } 
-
-    /* add our options */
-    StringDictAddPair(pOption,"ecb","blub");
-    StringDictAddPair(pOption,"range","0");
-    StringDictAddPair(pOption,"n","0");
-    StringDictAddPair(pOption,"bank","0");
-    StringDictAddPair(pOption,"mode","HMXY");
-    StringDictAddPair(pOption,"counter","Gwendolin");
-    StringDictAddPair(pOption,"map","9");
-  
-    /* initialise our private data structure */
-    tdc = (pTdc)malloc(sizeof(Tdc));
-    if(tdc == NULL){
-      free(pNew);
-      return NULL;
-    }
-    memset(tdc,0,sizeof(Tdc));
-    tdc->map = 9;
-    tdc->mode = HMXY;
-    pNew->pPriv = tdc;
-    
-    /* configure all those functions */
-    pNew->Configure = TDCConfigure;
-    pNew->Start     = TDCStart;
-    pNew->Halt      = TDCHalt;
-    pNew->GetCountStatus = TDCCountStatus;
-    pNew->GetError  = TDCGetError;
-    pNew->TryAndFixIt = TDCFixIt;
-    pNew->GetData   = TDCGetData;
-    pNew->GetHistogram =  TDCGetHistogram;
-    pNew->SetHistogram =  TDCSetHistogram;
-    pNew->GetMonitor   =  TDCGetMonitor;
-    pNew->GetTime      =  TDCGetTime;
-    pNew->Preset    = TDCPreset;
-    pNew->FreePrivate = TDCFree;
-    pNew->Pause       = TDCPause;
-    pNew->Continue    = TDCContinue;
-    
-    return pNew;
-}
diff --git a/tdchm.h b/tdchm.h
deleted file mode 100644
index 1490d5da..00000000
--- a/tdchm.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*--------------------------------------------------------------------------
-  This is a driver for the TDC histogram memory as supplied with the
-  Risoe instruments. This system uses a Z80 processor internally. 
-  Communication is via a GPIB interface. For more information on this
-  device consult documentation available from Risoe.
-
-  copyright: see file COPYRIGHT
-
-  Mark Koennecke, February 2003
-  --------------------------------------------------------------------------*/
-#ifndef TDCHM
-#define TDCHM
-
-pHistDriver MakeTDCHM(pStringDict pOption);
-#endif
diff --git a/tecs/coc_client.c b/tecs/coc_client.c
deleted file mode 100644
index d3b1ef78..00000000
--- a/tecs/coc_client.c
+++ /dev/null
@@ -1,521 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/socket.h>
-#include <string.h>
-#include <unistd.h>
-#include <assert.h>
-#include <signal.h>
-#include "myc_err.h"
-#include "coc_util.h"
-#include "coc_client.h"
-#include "myc_str.h"
-
-/* --- non ANSI signal --- */
-#ifndef SIGPIPE
-#define SIGPIPE 13
-#endif
-
-#define COC_NETTMO 5
-#define COC_RESTMO 60
-
-#define ARG_CHAR 1
-#define ARG_INT 2
-#define ARG_FLT 3
-#define ARG_ARR 4
-
-/*-------------------------------------------------------------------------*/
-
-int CocConnect(CocConn *conn) { /* connect, but do not start */
-  int i;
-  struct sockaddr_in sadr;
-
-  ERR_I(CocCreateSockAdr(&sadr, conn->host, conn->port));
-  ERR_SI(conn->fd=socket(AF_INET, SOCK_STREAM, 0));
-  i = 1;
-  ERR_SI(setsockopt(conn->fd,SOL_SOCKET,SO_REUSEADDR,&i,sizeof(int))); /* allow quick port reuse */
-  i=connect(conn->fd, (struct sockaddr *)&sadr, sizeof(sadr));
-  if (i<0) {
-    if (errno==ECONNREFUSED) return(1);
-    ERR_COD(errno);
-  }
-  return(0);
-  OnError: return(-1);
-}
-
-int CocOpen(CocConn *conn) { /* connect and start, if not succsessful */ 
-  int i, try, tmo;
-
-  ERR_I(i=CocConnect(conn));
-  if (i==0) return(0);
-  /* connection refused */
-  if (conn->startcmd[0]=='\0') {
-    CocDelay(500);
-    ErrTxt("connect",1); return(1);
-  }
-
-  printf("Starting TecsServer ...\n\n%s\n", conn->startcmd);
-  ERR_I(system(conn->startcmd));
-
-  try=15;
-  tmo=100; /* wait total ca. 10 sec. for max. 15 tries */
-  while (try>0) {
-    try--;
-    CocDelay(tmo); tmo=tmo*5/4;
-    ERR_I(i=CocConnect(conn));
-    if (i==0) {
-      printf("\n... connected to TecsServer\n");
-      return(0);
-    }
-  }
-  ERR_MSG("can not start TECS, too many retries");
-  OnError: return(-1);
-}
-
-/*-------------------------------------------------------------------------*/
-
-int CocInitClient(CocConn *conn, char *host, int port, char *magic, int bufsize, char *startcmd) {
-  int iret;
-  assert(conn!=NULL);
-  if (bufsize==0) bufsize=1024;
-  StrLink(&conn->cmdbuf, conn->cmdbuf_);
-  StrLink(&conn->resbuf, conn->resbuf_);
-  conn->port=port;
-  ERR_I(str_copy(conn->host, host));
-  ERR_I(str_copy(conn->magic, magic));
-  ERR_I(str_copy(conn->startcmd, startcmd));
-  conn->fd=-1;
-  ERR_I(iret=CocOpen(conn));
-  if (iret==0) {
-    iret=CocSendMagic(conn, conn->magic);
-    if (iret<0) {
-      CocCloseClient(conn);
-      iret=1;
-    }
-  }
-  return(iret);
-  OnError: return(-1);
-}
-
-/*-------------------------------------------------------------------------*/
-
-int CocSendMagic(CocConn *conn, char *magic) {
-  char *err;
-  int siz, n;
-
-  StrClear(&conn->resbuf); /* use return buffer for command in order to preserve command buffer */
-  ERR_I(StrPut(&conn->resbuf, "", COC_MAGIC));
-  ERR_I(StrPut(&conn->resbuf, magic, COC_SEP));
-  ERR_I(CocSend(conn->fd, conn->resbuf.buf, conn->resbuf.wrpos));
-  ERR_I(CocRecv(conn->fd, &conn->resbuf, COC_NETTMO, NULL));
-  ERR_P(err=StrGet(&conn->resbuf, NULL, COC_SEP));
-  if (err[0]!=COC_MAGIC) ERR_MSG("magic synch error");
-  if (err[1]!='\0') { ErrMsg(err+1); ErrTxt(": (response from server)",0); goto OnError; }
-  ERR_I(StrGetEnd(&conn->resbuf));
-  return(0);
-  OnError: return(-1);
-}
-
-/*-------------------------------------------------------------------------*/
-
-int CocCheck(CocConn *conn) {
-
-  if (conn->fd<0) return(1);
-  ERR_I(CocSend(conn->fd, "_quit", 6));
-  ERR_I(CocRecv(conn->fd, &conn->resbuf, COC_NETTMO, NULL));
-  return(0);
-  OnError:
-    if (ErrCode==ECONNRESET || ErrCode==EPIPE) return(1);
-    return(-1);
-}
-
-/*-------------------------------------------------------------------------*/
-
-int CocTryCmd(CocConn *conn) {
-  int iret=-1, siz;
-
-  signal(SIGPIPE, SIG_IGN);
-  if (conn->fd<0) {
-    ERR_I(iret=CocConnect(conn)); /* was CocOpen earlier */
-    if (iret == 1) {
-      CocDelay(500);
-      ErrTxt("connect",1); return (-1);
-    }
-
-    iret=-1;
-    ERR_I(CocSendMagic(conn, conn->magic));
-  }
-  ERR_I(CocSend(conn->fd, conn->cmdbuf.buf, conn->cmdbuf.wrpos));
-  ERR_I(CocRecv(conn->fd, &conn->resbuf, COC_NETTMO, NULL));
-  return(0);
-  OnError:
-    if (ErrCode==ECONNRESET || ErrCode==EPIPE) return(-2);
-    return(iret);
-}
-
-/*-------------------------------------------------------------------------*/
-
-int CocCmdWithRetry(CocConn *conn) {
-  int cnt, iret;
-
-  if (conn==NULL) ERR_MSG("not connected");
-  cnt=3;
-  while (1) {
-    cnt--;
-    if (cnt<=0) {
-      ERR_I(CocTryCmd(conn));
-      break;
-    }
-    iret=CocTryCmd(conn);
-    if (iret>=0) break;
-    close(conn->fd);
-    conn->fd=-1;
-    if (iret==-1) goto OnError; /* severe error */
-    ErrShort(ErrMessage);
-    ErrShort("try to reconnect");
-  }
-  return(0);
-  OnError: return(-1);
-}
-
-/*-------------------------------------------------------------------------*/
-
-void CocReset(CocConn *conn) { 
-  assert(conn!=NULL);
-  StrClear(&conn->cmdbuf);
-  if (conn->synch!=COC_SYN0) {
-    conn->synch=COC_SYN0;
-  } else {
-    conn->synch=COC_SYN1;
-  }
-  StrPut(&conn->cmdbuf, "", conn->synch);
-  conn->nargs=0;
-}
-
-/*-------------------------------------------------------------------------*/
-
-int CocPushArg(CocConn *conn, const char *name, void *value, int type, int size) {
-  StrBuf *buf;
-  int n;
-
-  assert(conn!=NULL);
-  assert(NULL==strchr(name, ' '));
-  buf=&conn->cmdbuf;
-  n=conn->nargs;
-  if (n>=sizeof(conn->args)) ERR_MSG("too many return arguments");
-  conn->args[n].adr=value;
-  conn->args[n].type=type;
-  conn->args[n].size=size;
-  conn->args[n].cmd=buf->buf + buf->wrpos;
-  conn->nargs=n+1;
-  if (value==NULL) {
-    ERR_I(StrPut(buf, name, ' '));
-  } else {
-    ERR_I(StrPut(buf, name, COC_SEP));
-  }
-  return(0);
-  OnError: return(-1);
-}
-
-/*-------------------------------------------------------------------------*/
-
-int CocPutStr(CocConn *conn, const char *name, const char *value) { 
-  StrBuf *buf;
-
-  ERR_I(CocPushArg(conn, name, NULL, ARG_CHAR, 0));
-  ERR_I(StrPut(&conn->cmdbuf, value, COC_SEP));
-  return(0);
-  OnError: return(-1);
-}
-
-/*-------------------------------------------------------------------------*/
-
-int CocPutFloat(CocConn *conn, const char *name, float value) {
-
-  ERR_I(CocPushArg(conn, name, NULL, ARG_FLT, 0));
-  ERR_I(StrPutFloat(&conn->cmdbuf, value, COC_SEP));
-  return(0);
-  OnError: return(-1);
-}
-
-/*-------------------------------------------------------------------------*/
-
-int CocPutArray(CocConn *conn, const char *name, float *value, int value_size) {
-
-  ERR_I(CocPushArg(conn, name, NULL, ARG_ARR, 0));
-  ERR_I(StrPutArray(&conn->cmdbuf, value, value_size));
-  return(0);
-  OnError: return(-1);
-}
-
-/*-------------------------------------------------------------------------*/
-
-int CocPutInt(CocConn *conn, const char *name, int value) {
-
-  ERR_I(CocPushArg(conn, name, NULL, ARG_INT, 0));
-  ERR_I(StrPutInt(&conn->cmdbuf, value, COC_SEP));
-  return(0);
-  OnError: return(-1);
-}
-
-/*-------------------------------------------------------------------------*/
-
-int CocGetStr(CocConn *conn, const char *name, char *value, int value_len) { 
-
-  return(CocPushArg(conn, name, value, ARG_CHAR, value_len));
-}
-
-/*-------------------------------------------------------------------------*/
-
-int CocGetFloat(CocConn *conn, const char *name, float *value) {
-
-  return(CocPushArg(conn, name, value, ARG_FLT, 0));
-}
-
-/*-------------------------------------------------------------------------*/
-
-int CocGetInt(CocConn *conn, const char *name, int *value) {
-
-  return(CocPushArg(conn, name, value, ARG_INT, 0));
-}
-
-/*-------------------------------------------------------------------------*/
-
-int CocGetArray(CocConn *conn, const char *name, float *value, int value_size) {
-
-  return(CocPushArg(conn, name, value, ARG_ARR, value_size));
-}
-
-/*-------------------------------------------------------------------------*/
-
-int CocDoIt(CocConn *conn, char *res, int res_len) {
-  StrBuf *buf;
-  int i, pending;
-  CocArg *a;
-  char *resp, *t, tag;
-  int iret=0;
-
-  assert(conn!=NULL);
-  ERR_I(CocCmdWithRetry(conn));
-  buf=&conn->resbuf;
-  while (buf->buf[0] != conn->synch) { /* throw away unsynchronized answers */
-    ERR_I(CocRecv(conn->fd, buf, COC_NETTMO, NULL));
-  }
-
-  pending=conn->nargs;
-  *res='\0';
-  while (1) {
-    if (buf->buf[0] != conn->synch) ERR_MSG("synch error");
-    ERR_P(StrGet(buf, NULL, conn->synch));
-    i=0;
-    a=conn->args;
-    while (pending>0 && i<conn->nargs) {
-      if (a->type!=0) {
-        resp=buf->buf + buf->rdpos;
-        tag=*resp;
-        if (tag==COC_DELAYED) { /* delayed response */
-          resp++;
-          ERR_P(StrGet(buf, NULL, COC_SEP));
-        } else {
-          pending--;
-          if (tag==COC_ERR || tag==COC_TRM) { /* error response */
-            str_ncat(res, a->cmd, res_len);
-            resp++;
-            ERR_P(StrGet(buf, NULL, COC_SEP));
-            str_ncat(res, ": ", res_len);
-            iret=1;
-            if (tag==COC_TRM) return(1);
-          } else {
-            if (a->adr==NULL) {
-              t=strchr(res, COC_SEP);
-              str_ncat(res, a->cmd, res_len);
-              t=strchr(t, ' ');
-              assert(t!=NULL); /* truncate argument */
-              *t=COC_SEP;
-              str_ncat(res, "=", res_len);
-              ERR_P(StrGet(buf, NULL, COC_SEP));
-            } else {
-              str_ncat(res, a->cmd, res_len);
-              str_ncat(res, "=", res_len);
-              if (a->type==ARG_INT) {
-                ERR_I(StrGetInt(buf, (int *)a->adr, COC_SEP));
-              } else if (a->type==ARG_FLT) {
-                ERR_I(StrGetFloat(buf, (float *)a->adr, COC_SEP));
-              } else if (a->type==ARG_ARR) {
-                ERR_I(StrGetArray(buf, (float *)a->adr, a->size));
-                resp="<array>";
-              } else if (a->type==ARG_CHAR) {
-                ERR_P(StrNGet(buf, (char *)a->adr, a->size, COC_SEP));
-              } else {
-                ERR_MSG("unknown type");
-              }
-              a->type=0; /* done */
-            }
-          }
-          str_ncat(res, resp, res_len);
-          str_ncat(res, "\n", res_len);
-        }
-      }
-      i++; a++;
-    }
-    ERR_I(StrGetEnd(buf));
-    if (pending==0) return(iret); /* no more delayed response awaiting */
-
-    ERR_I(CocRecv(conn->fd, buf, COC_RESTMO, NULL));
-  }
-  return(iret);
-  OnError: return(-1);
-}
-
-static int interrupt, logFd=0;
-
-void CocIntSignal(int sig) {
-  char buf[4];
-  int siz;
-
-  if (logFd) {
-    interrupt=2;
-    buf[0]=COC_CLRLOG;
-    buf[1]=COC_SEP; /* send "clear log" message */
-    printf("\nCLRLOG\n");
-    CocSend(logFd, buf, 2);
-  } else {
-    printf("\ninterrupt\n");
-    interrupt=1;
-  }
-}
-
-int CocWatchLog(CocConn *conn, char *loglist) {
-  char cbuf[1024];
-  StrBuf *buf;
-  int fd, iret;
-  int i, siz, n;
-  static int init=1;
-
-#if __VMS
-  if (init) {
-    init=0;
-    DECC$CRTL_INIT();
-  }
-#endif
-  fd=conn->fd;
-  CocReset(conn);
-  ERR_I(CocPutStr(conn, "loglist", loglist));
-  ERR_I(CocDoIt(conn, cbuf, sizeof(cbuf)));
-  buf=&conn->resbuf;
-  interrupt=0;
-  logFd=fd;
-  signal(SIGINT, CocIntSignal);
-
-  while (!interrupt) {
-    logFd=fd;
-    ERR_I(iret=CocRecv(fd, buf, 60, &logFd));
-    if (iret>0) {
-      if (buf->buf[0]==COC_CLRLOG) { /* confirmed "clear log" message */
-        interrupt=3;
-      } else { /* it's a log message */
-        StrReset(buf);
-        while (!StrEnd(buf)) {
-          ERR_P(StrGet(buf, cbuf, COC_SEP));
-          printf("%s", cbuf);
-        }
-      }
-    }
-  }
-  signal(SIGINT, SIG_DFL);
-  logFd=0;
-  if (interrupt==1) { /* send "clear log" message */
-    cbuf[0]=COC_CLRLOG;
-    cbuf[1]=COC_SEP; /* send "clear log" message */
-    printf("\nclrlog\n");
-    CocSend(fd, cbuf, 2);
-    do {
-      ERR_I(CocRecv(fd, buf, 10, NULL));
-    } while (buf->buf[0]!=COC_CLRLOG);
-  }
-  return(0);
-  OnError:
-    signal(SIGINT, SIG_DFL);
-    return(-1);
-}
-
-int CocShowLog(CocConn *conn, char *loglist, int start, int lines) {
-  char cbuf[1024];
-  StrBuf *buf;
-  int fd, iret;
-  int i, siz, n;
-
-  fd=conn->fd;
-  CocReset(conn);
-  if (start>0) {
-    ERR_I(CocPutInt(conn, "logstart", start));
-  }
-  ERR_I(CocPutInt(conn, "loglines", lines));
-  ERR_I(CocPutStr(conn, "logshow", loglist));
-  ERR_I(CocDoIt(conn, cbuf, sizeof(cbuf)));
-  buf=&conn->resbuf;
-
-  while (1) {
-    ERR_I(iret=CocRecv(fd, buf, 10, NULL));
-    if (iret<=0) break;
-    if (buf->buf[0]==COC_CLRLOG) { /* end of log message */
-      break;
-    } else { /* it's a log message */
-      StrReset(buf);
-      while (!StrEnd(buf)) {
-        ERR_P(StrGet(buf, cbuf, COC_SEP));
-        printf("%s", cbuf);
-      }
-    }
-  }
-  return(0);
-  OnError:
-    signal(SIGINT, SIG_DFL);
-    return(-1);
-}
-
-void CocCloseClient(CocConn *conn) {
-  assert(conn!=NULL);
-  close(conn->fd);
-  conn->fd=-1;
-}
-
-
-/*-------------------------------------------------------------------------*/
-
-static char rbuf[256];
-
-int CocSet(CocConn *conn, const char *name, const char *value) {
-  int iret;
-
-  assert(conn!=NULL);
-  CocReset(conn);
-  ERR_I(CocPutStr(conn, name, value));
-  ERR_I(iret=CocDoIt(conn, rbuf, sizeof(rbuf)));
-  if (iret) ERR_MSG(rbuf);
-  return(0);
-  OnError: return(-1);
-}
-
-int CocGetN(CocConn *conn, const char *name, char *value, int reslen) {
-  int iret;
-
-  assert(conn!=NULL);
-  CocReset(conn);
-  ERR_I(CocGetStr(conn, name, value, reslen));
-  ERR_I(iret=CocDoIt(conn, rbuf, sizeof(rbuf)));
-  if (iret) ERR_MSG(rbuf);
-  return(0);
-  OnError: return(-1);
-}
-
-int CocSetGetN(CocConn *conn, const char *name, const char *cmd, char *value, int reslen) {
-  int iret;
-
-  assert(conn!=NULL);
-  CocReset(conn);
-  ERR_I(CocPutStr(conn, name, cmd));
-  ERR_I(CocDoIt(conn, value, reslen));
-  return(0);
-  OnError: return(-1);
-}
-
diff --git a/tecs/coc_client.h b/tecs/coc_client.h
deleted file mode 100644
index a08ea558..00000000
--- a/tecs/coc_client.h
+++ /dev/null
@@ -1,82 +0,0 @@
-#ifndef	_COC_CLIENT_H_
-#define	_COC_CLIENT_H_
-
-#include "myc_buf.h"
-#include "coc_util.h"
-
-typedef struct {
-  void *adr;
-  int type, size;
-  char *cmd;
-} CocArg;
-
-typedef struct {
-  int fd;
-  /* private */
-  int port;
-  StrBuf cmdbuf; /* for sending command */
-  StrBuf resbuf; /* for response */
-  char cmdbuf_[COC_CMD_LEN];
-  char resbuf_[COC_RES_LEN];
-  CocArg args[16];
-  int nargs;
-  char host[64];
-  char magic[32];
-  char startcmd[512];
-  char synch;
-} CocConn;
-
-int CocInitClient(CocConn *conn, char *host, int port, char *magic, int bufsize, char *startcmd);
-/*  initialize a connection to the server process
-*/
-
-int CocSendMagic(CocConn *conn, char *magic);
-/* send magic word to the server for changing access rights
-*/
-
-void CocReset(CocConn *conn);
-int CocPutStr(CocConn *conn, const char *name, const char *value);
-int CocPutFloat(CocConn *conn, const char *name, float value);
-int CocPutInt(CocConn *conn, const char *name, int value);
-int CocPutArray(CocConn *conn, const char *name, float *value, int value_size);
-int CocGetStr(CocConn *conn, const char *name, char *value, int value_len);
-int CocGetFloat(CocConn *conn, const char *name, float *value);
-int CocGetInt(CocConn *conn, const char *name, int *value);
-int CocGetArray(CocConn *conn, const char *name, float *value, int value_size);
-int CocDoIt(CocConn *conn, char *error, int error_len);
-
-int CocCheck(CocConn *conn);
-/*
-   returns 1, if not yet open
-   returns 0, if connection o.k.
-   returns -1 (error message), if connection died
-*/
-
-int CocWatchLog(CocConn *conn, char *list);
-/*
-  Watch indefinitely for log messages
-*/
-
-int CocSet(CocConn *conn, const char *name, const char *value);
-/*
-   set one variable
-*/
-
-int CocGetN(CocConn *conn, const char *name, char *value, int reslen);
-#define CocGet(C,N,V) CocGetN(C,N,V,sizeof(V))
-/*
-   read one variable. Use the macro if value is a fixed length array
-*/
-
-int CocSetGetN(CocConn *conn, const char *name, const char *cmd, char *value, int reslen);
-#define CocSetGet(C,N,S,V) CocSetGetN(C,N,S,V,sizeof(V))
-/*
-   set and get a variable. Use the macro if value is a fixed length array
-*/
-
-void CocCloseClient(CocConn *conn);
-/*
-   close the connection to the server
-*/
-
-#endif /* _COC_CLIENT_H_ */
diff --git a/tecs/coc_logfile.c b/tecs/coc_logfile.c
deleted file mode 100644
index b1938738..00000000
--- a/tecs/coc_logfile.c
+++ /dev/null
@@ -1,350 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <assert.h>
-#include "coc_logfile.h"
-#include "myc_time.h"
-#include "myc_err.h"
-#include "myc_str.h"
-
-static FILE *fil=NULL;
-static char lnam[224]="";
-static char filnam[256]="";
-static char ebuf[20000]="";
-static char *statusBuf=NULL;
-static int statusSize;
-static char *eptr=&ebuf[0];
-static int dated=0;
-static int logMask=0;
-static int wrtMask=0;
-static int newLine=1;
-static int logfileStd;
-static int dirty, writeAll;
-static int lastline=1;
-static long int lastpos=0;
-static int lastStamp=0;
-static int openTime;
-static int openDate;
-
-void (*logfileOutRtn)(int, char *)=NULL;
-
-void logfileOpen(int append) {
-  int year;
-
-  if (logfileStd) {
-    fil=stdout;
-    str_copy(filnam, "<stdout>");
-    return;
-  }
-  assert(fil==NULL);
-  openTime = mycNow();
-  openDate = mycDate(openTime); /* date in yyyymmdd decimal encoding */
-  openTime = openTime % (24*3600); /* seconds since midnight */
-  if (dated) {
-    sprintf(filnam, "%s%02d-%02d.log", lnam, openDate % 10000 / 100, openDate % 100);
-  } else {
-    if (lnam[0]=='\0') {
-      str_copy(filnam, "test.log");
-    } else {
-      str_copy(filnam, lnam);
-      str_append(filnam, ".log");
-    }
-  }
-  if (dated) {
-    fil=fopen(filnam, "a+");
-    if (fil != NULL) {
-      fseek(fil, 0, SEEK_SET); /* set position to start */
-      year=0;
-      fscanf(fil, "%4d", &year);
-      if (year != openDate / 10000) {
-        fclose(fil);
-        fil=fopen(filnam, "w+"); /* overwrite old logfile */
-      } else {
-        fseek(fil, 0, SEEK_END); /* set position to end */
-      }
-    }
-  } else {
-    fil=fopen(filnam, "w+"); /* overwrite last logfile */
-  }
-  if (fil==NULL) {
-    printf("Can not open %s\n", filnam);
-    fil=stdout;
-    str_copy(filnam, "<stdout>");
-    return;
-  }
-  ErrSetOutFile(fil);
-  fprintf(fil, "%04d-%02d-%02d %02d:%02d:%02d opened logfile\n"
-    , openDate / 10000, openDate % 10000 / 100, openDate % 100
-    , openTime / 3600,  openTime / 60 % 60,     openTime % 60);
-  lastStamp = openTime / 60;
-}
-
-void logfileStatusBuffer(char *buffer, int bufsize) {
-  statusBuf=buffer;
-  statusSize=bufsize-1;
-}
-
-char *logfileInit(char *path, int nodate, int use_stdout, int write_all) {
-  str_copy(lnam, path);
-  logfileStd=use_stdout;
-  writeAll=write_all;
-  dated=!nodate;
-  logfileOpen(1);
-  return(filnam);
-}
-
-void logfileStamp(char *text) {
-  int time, date, stamp;
-
-  time = mycNow();
-  date = mycDate(time); /* date in yyyymmdd decimal encoding */
-  time = time % (24*3600); /* seconds since midnight */
-
-  stamp=time / 60;
-  if (date != openDate ) { /* day has changed -> new logfile */
-    if (fil!=NULL) { fclose(fil); fil=NULL; }
-    lastpos=0;
-    lastline=1;
-    logfileOpen(1);
-  }
-  if (text==NULL) {
-    if (stamp>lastStamp+1) {
-      fprintf(fil, "---\t%02d:%02d:%02d\n", stamp / 60, stamp % 60, time % 60, text);
-    }
-  } else {
-    fprintf(fil, "\t%02d:%02d:%02d%s", stamp / 60, stamp % 60, time % 60, text);
-  }
-  dirty=0;
-  lastStamp=stamp;      
-}
-
-void logfileOut(int mask, const char *fmt, ...)
-{ va_list ap;
-  char buf[8192], *p;
-  int l;
-
-  va_start(ap, fmt);
-
-  if (mask & LOG_STAT && statusBuf!=NULL) {
-    if (newLine) {
-      statusBuf[0]='\0';
-      newLine=0;
-    }
-    buf[statusSize]='\0';
-    vsprintf(buf, fmt, ap);
-    assert(buf[statusSize]=='\0'); /* check for overflow */
-    if (buf[0]=='@') {
-      if (buf[1]==' ') {
-        str_ncat(statusBuf, buf+2, statusSize);
-      } else {
-        str_ncat(statusBuf, buf+1, statusSize);
-      }
-    } else {
-      str_ncat(statusBuf, buf, statusSize);
-    }
-    p=strchr(statusBuf, '\n');
-    if (p!=NULL) {
-      newLine=1;
-      *p='\0';
-    }
-  }
-  if (logfileOutRtn!=NULL) {
-    vsprintf(buf, fmt, ap); /* does not check for overflow! */
-    logfileOutRtn(mask, buf);
-  }
-  if (writeAll) {
-    vfprintf(fil, fmt, ap);
-    wrtMask=LOG_ALL;
-  } else if ((mask | LOG_NET) != LOG_NET) { /* do not store LOG_NET info */
-    if (eptr!=NULL) {
-      if (eptr-ebuf > sizeof(ebuf)-512) {
-        sprintf(eptr, "... buffer full ... \1\1");
-        eptr=NULL;
-      } else {
-        vsprintf(eptr, fmt, ap);
-        p=strchr(eptr, '\1');
-        if (p==NULL) {
-          l=strlen(eptr);
-          if (l>256) {
-            sprintf(buf, "unusual long output %.32s... (%d chars)\n", eptr, l);
-            logfileStamp(buf);
-          }
-          eptr+=l;
-        } else {
-          eptr=p; /* is in fact an error */
-        }
-        eptr[0]='\1'; /* put \1 as separator between blocks */
-        eptr[1]=mask & 31;
-        eptr[2]='\0';
-        eptr+=2;
-      }
-    }
-    wrtMask=wrtMask | mask;
-  }
-  va_end(ap);
-}
-
-void logfileMask(int mask) {
-  logMask=logMask | mask;
-}
-
-void logfileWrite0(int mask) {
-  char *s, *next;
-
-  logMask=logMask | mask;
-  if (dirty) logfileStamp(NULL); /* there was something written since last time */
-
-  s=ebuf;
-  if (writeAll || *s!='\0' && wrtMask & logMask) {
-    next=strchr(s, '\1');
-    while (next!=NULL) {
-      *next='\0';
-      next++;
-      if (*next & logMask) {
-        if (*s=='@') { /* write out time */
-          logfileStamp(s+1);
-        } else {
-          logfileStamp(NULL); /* write stamp before write something */
-          fprintf(fil, "%s", s);
-          dirty=1;
-        }
-      }
-      s=next+1;
-      next=strchr(s, '\1');
-    }
-  }
-  ebuf[0]='\0';
-  eptr=&ebuf[0];
-  logMask=0;
-  wrtMask=0;
-}
-
-void logfileScan(int date, void (*scanLine)(void*, char*), void *arg) {
-  FILE *sFile;
-  char buf[256], *res;
-
-  if (date == openDate) {
-    sFile=fil;
-    rewind(sFile);
-  } else {
-    sprintf(buf, "%s%02d-%02d.log", lnam, date % 10000 / 100, date % 100);
-    sFile=fopen(buf, "r+");
-    if (sFile==NULL) return;
-  }
-  res=fgets(buf, sizeof(buf), sFile);
-  while (res!=NULL) {
-    if (res[0]=='\t') {
-      scanLine(arg, res+1);
-    }
-    res=fgets(buf, sizeof(buf), sFile);
-  }
-  if (sFile==fil) {
-    fseek(fil, 0, SEEK_END);
-  } else {
-    fclose(sFile);
-  }
-}
-
-void logfileWrite(int mask) {
-  logfileWrite0(mask);
-  fflush(fil);
-}
-
-void logfileShowErr(char *text)
-{
-  logfileWrite0(LOG_ALL); /* write all */
-  ErrShow(text);
-  fflush(fil);
-}
-
-void logfileClose()
-{
-  logfileWrite0(LOG_MAIN+LOG_INFO);
-  lastStamp=-2;
-  logfileOut(LOG_MAIN, "closed\n");
-  logfileStamp(NULL);
-  if (fil!=NULL) { fclose(fil); fil=NULL; }
-  filnam[0]='\0';
-}
-
-void logfileOutBuf(int mask, StrBuf *buf)
-{ char str[256];
-  int rd0;
-  char *ret;
-
-  rd0=buf->rdpos;
-  if (buf->rdpos < 0 || buf->rdpos >= buf->dsize
-    || buf->wrpos < 0 || buf->wrpos >= buf->dsize) {
-    logfileOut(mask, "<buffer corrupt>"); return;
-  }
-  while (!StrEnd(buf)) {
-    ret=StrGet(buf, str, '\0');
-    if (ret==NULL) {
-      ret="...";
-      buf->rdpos=buf->wrpos;
-    }
-    if (ret[0]<32 && ret[0]>0) {
-      logfileOut(mask, "[%d]%s;", ret[0], ret+1);
-    } else {
-      logfileOut(mask, "%s;", ret);
-    }
-  }
-  buf->rdpos=rd0;
-}
-
-int logfileLength(void) {
-  char lin[256];
-  int l, ll;
-
-  if (logfileStd || fil==NULL) return 0;
-  fseek(fil, lastpos, SEEK_SET);
-  ll=lastpos;
-  l=lastline;
-  while (NULL!=fgets(lin, sizeof(lin), fil)) {
-    lastpos=ll;
-    ll=ftell(fil);
-    lastline=l;
-    l++;
-  }
-  return(lastline);
-}
-
-long int logfilePos(int n) {
-  /* set file to the start of n-th last line n, if n<0 then position to the -n-th line  */
-  int i;
-  char lin[256];
-
-  if (logfileStd || fil==NULL) return 0;
-  if (n>0) {
-    n=logfileLength()-n+1;
-  } else {
-    n=-n;
-  }
-  fseek(fil, 0, SEEK_SET);
-  for (i=1; i<n; i++) {
-    if (NULL==fgets(lin, sizeof(lin), fil)) return ftell(fil);
-  }
-  return ftell(fil);
-}
-
-
-long int logfileGetLines(long int pos, int linmax, char *line, int len_line) {
-  int l,i;
-  if (logfileStd || fil==NULL) {
-    line[0]='\0';
-    return 0;
-  }
-  l=0;
-  fseek(fil, pos, SEEK_SET);
-  for (i=0; i<linmax; i++) {
-    if (NULL==fgets(line+l, len_line-l, fil)) {
-      line[l]='\0';
-      return ftell(fil);
-    }
-    l=strlen(line);
-  }
-  pos=ftell(fil);
-  fseek(fil, 0, SEEK_END);
-  return pos;
-}
diff --git a/tecs/coc_logfile.h b/tecs/coc_logfile.h
deleted file mode 100644
index 9efedabc..00000000
--- a/tecs/coc_logfile.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef _COC_LOGFILE_H_
-#define _COC_LOGFILE_H_
-
-#include "myc_buf.h"
-
-#define LOG_ALL  31
-#define LOG_STAT 32
-#define LOG_SER  8
-#define LOG_NET  4
-#define LOG_INFO 2
-#define LOG_MAIN 1
-#define logfileStatusBuf(B) logfileStatusBuffer(B,sizeof(B))
-
-void logfileStatusBuffer(char *buffer, int bufsize);
-char *logfileInit(char *path, int nodate, int use_stdout, int write_all);
-void logfileOut(int mask, const char *fmt, ...);
-void logfileOutBuf(int mask, StrBuf *buf);
-void logfileShowErr(char *text);
-void logfileMask(int mask);
-void logfileScan(int date, void (*scanLine)(void*, char*), void *arg);
-void logfileWrite(int mask);
-void logfileClose(void);
-long int logfilePos(int n);
-long int logfileGetLines(long int pos, int linmax, char *line, int len_line);
-
-extern void (*logfileOutRtn)(int, char *); /* custom output routine */
-
-#endif /* _COC_LOGFILE_H_ */
diff --git a/tecs/coc_server.c b/tecs/coc_server.c
deleted file mode 100644
index f7440285..00000000
--- a/tecs/coc_server.c
+++ /dev/null
@@ -1,661 +0,0 @@
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/time.h>
-#include <sys/timeb.h>
-#include <strings.h>
-#include <unistd.h>
-#include <string.h>
-#include <assert.h>
-#include "myc_mem.h"
-#include "myc_err.h"
-#include "coc_logfile.h"
-#include "coc_util.h"
-#include "coc_server.h"
-#include "myc_str.h"
-#include "myc_time.h"
-
-#define COC_NUL COC_SEP
-
-typedef struct _CocVar {
-  struct _CocVar *next;
-  char name[32];
-  void *var;
-  int access;
-  int type;
-  int size;
-  void *strucType;
-  int (*hdl)(int, void *, int);
-  int pending;
-} CocVar;
-
-CocVar *serverVarList=NULL;
-static CocVar **varListHandle=&serverVarList;
-static CocVar *lastDef=NULL;
-
-typedef struct {
-  CocVar *var;
-  void *base;
-  int mode;
-} Pend;
-  
-typedef struct _CocClient {
-  struct _CocClient *next;
-  int fd;
-  int mode;
-  Pend pend[16];
-  int npend;
-  int logmask;
-  char synch;
-  void *data;
-} CocClient;
-
-void *(*setData)(void *);
-
-/*
-static CocClientData **clData;
-static int clDataSize;
-*/
-
-DeclStrBuf(buf, COC_CMD_LEN);
-DeclStrBuf(bufo, COC_RES_LEN);
-
-static fd_set mask, rmask;
-static int maxfd;
-CocClient *cList;
-static int mainFd;
-static int modified;
-static char loglist[16];
-
-void CocVarList(void **varList) {
-  if (varList==NULL) {
-    varListHandle=(CocVar **)varList;
-  } else {
-    varListHandle=&serverVarList;
-  }
-}
-
-void CocList() {  CocVar *p;
-
-  p=*varListHandle;
-  while (p!=NULL) {
-    printf("%s %d ", p->name, p->type);
-    p=p->next;
-  }
-  printf("\n");
-}
-
-CocVar *CocFindVar1(const char *name) {
-  CocVar *p;
-
-  p=*varListHandle;
-  while (p!=NULL && 0!=strcasecmp(p->name,name)) p=p->next;
-  return(p);
-}
-
-void *CocFindVar(const char *name, void **adr) {
-  CocVar *p, *t;
-  const char *f;
-  void *base;
-  char nam[32];
-
-  f=str_split(nam, name, '.');
-  if (f==NULL) {
-    f=str_split(nam, name, '-');
-    if (f!=NULL) {
-      if (f[0]!='>') {
-        f=NULL;
-      } else {
-        f++;
-      }
-    }
-  }
-  if (f!=NULL) {
-    if (adr!=NULL) *adr=NULL;
-    p=CocFindVar1(nam);
-    if (p==NULL) { return(NULL); }
-    t=p->strucType;
-    if (t==NULL) { return(NULL); }
-    str_copy(nam, t->name);
-    str_append(nam, ":");
-    str_append(nam, f);
-    if (adr!=NULL) {
-      base=p->var;
-      if (p->type==COC_PTR) base=*(void **)base;
-      *adr=base;
-    }
-  } else if (adr!=NULL) {
-    *adr=NULL;
-  }
-  p=CocFindVar1(nam);
-  if (p!=NULL && p->type==COC_ALIAS) { /* recursive call for alias */
-    p=CocFindVar(p->var, adr);
-  }
-  return(p);
-}
-
-void *CocIntPtr(int *ptr) { return(ptr); }
-void *CocFltPtr(float *ptr) { return(ptr); }
-void *CocChrPtr(char *ptr) { return(ptr); }
-
-void *CocDefVar(const char *name, void *var, int type, int size, int access) {
-  CocVar *p;
-  const char *f;
-  void *adr;
-
-  assert(varListHandle!=NULL);
-  p=CocFindVar1(name);
-  if (p==NULL) {
-    NEW(p,CocVar);
-    p->next=*varListHandle;
-    *varListHandle=p;
-    str_copy(p->name, name);
-    p->type=type;
-    p->size=size;
-  } else {
-    assert(p->type==type);
-  }
-  p->var=var;
-  p->access=access;
-/*  printf("define %s %d\n", name, (int)var); */
-  lastDef=p;
-  return(p);
-  OnError:
-    assert(0);
-}
-
-void CocHdl(int (*handler)(int, void *, int)) {
-  assert(lastDef!=NULL);
-  lastDef->hdl=handler;
-}
-
-int *CocSizePtr(void) {
-  assert(lastDef!=NULL && lastDef->type==COC_ARRAY);
-  return &lastDef->size;
-}
-
-void CocDefVarS(const char *name, const char *tname, void *var, int type) {
-  CocVar *p, *t;
-
-  assert(type==COC_PTR || type==COC_STRUCT);
-  p=CocDefVar(name, var, type, 0, COC_RDONLY);
-  p->strucType=CocDefVar(tname, NULL, COC_TYPE, 0, COC_RDONLY);
-}
-
-char err_name[64];
-
-int CocGetThisVar(CocVar *var, void *base, StrBuf *buf, int separator) {
-  void *adr;
-  int iret;
-  
-  if (base==NULL) {
-    adr=var->var;
-    if (adr==NULL)
-      ERR_MSG("NULL pointer accessed");
-  } else { /* dereference */
-    adr=(char *)base + (int)var->var;
-  }
-  /* printf("get %s %d\n", name, (int)adr); */
-  if (var->type==COC_CHAR) {
-    ERR_P(StrNGet(buf, (char *)adr, var->size, separator));
-  } else if (var->type==COC_INT) {
-    ERR_I(StrGetInt(buf, (int *)adr, separator));
-  } else if (var->type==COC_FLT) {
-    ERR_I(StrGetFloat(buf, (float *)adr, separator));
-  } else if (var->type==COC_ARRAY) {
-    ERR_I(StrGetArray(buf, (float *)adr, var->size));
-  } else {
-    ERR_MSG("unknown type");
-  }
-  return(0);
-  OnError: return(-1);
-}
-
-int CocPutThisVar(CocVar *var, void *base, StrBuf *buf, int separator) {
-  void *adr;
-  int iret;
-  
-  if (base==NULL) {
-    adr=var->var;
-    if (adr==NULL)
-      ERR_MSG("NULL pointer accessed");
-  } else { /* dereference */
-    adr=(char *)base + (int)var->var;
-  }
-  /* printf("put %s %d\n", name, (int)adr); */
-  if (var->type==COC_CHAR) {
-    ERR_I(StrPut(buf, adr, separator));
-  } else if (var->type==COC_INT) {
-    ERR_I(StrPutInt(buf, *(int *)adr, separator));
-  } else if (var->type==COC_FLT) {
-    ERR_I(StrPutFloat(buf, *(float *)adr, separator));
-  } else if (var->type==COC_ARRAY) {
-    ERR_I(StrPutArray(buf, (float *)adr, var->size));
-  } else {
-    ERR_MSG("unknown type");
-  }
-  return(0);
-  OnError: return(-1);
-}
-
-int CocGetVar(const char *name, StrBuf *buf, int separator) {
-  CocVar *var;
-  void *base;
-
-  var=CocFindVar(name, &base);
-  if (var==NULL) ERR_MSG("undefined variable");
-  ERR_I(CocGetThisVar(var, base, buf, separator));
-  return(0);
-  OnError: str_copy(err_name, name); ErrTxt(err_name,0); return(-1);
-}
-
-int CocPutVar(const char *name, StrBuf *buf, int separator) {
-  CocVar *var;
-  void *base;
-  
-  var=CocFindVar(name, &base);
-  if (var==NULL) ERR_MSG("undefined variable");
-  ERR_I(CocPutThisVar(var, base, buf, separator));
-  return(0);
-  OnError: str_copy(err_name, name); ErrTxt(err_name,0); return(-1);
-}
-
-void CocFreeVarList(void) {
-  CocVar *p, *v;
-
-  v=*varListHandle;
-  while (v!=NULL) {
-    p=v;
-    v=p->next;
-    p->next=NULL;
-    FREE(p);
-  }
-  *varListHandle=NULL;
-}
-
-char *CocReadVars(char *str, char stop){
-  int i, l;
-  char *eql, *cr, buf[80];
-  StrBuf sbuf;
-
-  /* interprete variables until stop character appeares */
-  i=sscanf(str, "%79s%n", buf, &l);
-  while (i>0 && buf[0]!=stop) {
-    if (buf[0]=='!') {
-      cr=strchr(str, '\n');
-      if (cr==NULL) return strchr(str, '\0');
-      str=cr+1;
-    } else {
-      eql=strchr(buf,'=');
-      if (eql==NULL) ERR_MSG("syntax error");
-      *eql='\0';
-      if (eql[1] == '\'' || eql[1]== '"') {
-        eql=strchr(str, '=');
-        StrNLink(&sbuf, eql+1, 80);
-        ERR_I(CocGetVar(buf, &sbuf, StrNONE));
-        str = sbuf.buf + sbuf.rdpos;
-      } else {
-        str+=l;
-        StrLink(&sbuf, eql+1);
-        ERR_I(CocGetVar(buf, &sbuf, ' '));
-      }
-    }
-    i=sscanf(str, "%79s%n", buf, &l);
-  }
-  return str;
-  OnError: return NULL;
-}
-
-void CocToClients(int mask, char *str) {
-  int iret;
-  CocClient *cl;
-
-  cl=cList->next;
-  while (cl!=NULL) {
-    if (cl->logmask & mask) {
-      iret=CocSend(cl->fd, str, strlen(str)+1);
-      if (iret<0) {
-        cl->logmask=0; /* disable logging for dead clients */
-        logfileOut(LOG_MAIN, "(%d) disconnected while logging\n", cl->fd);
-      }
-    }
-    cl=cl->next;
-  }
-}
-
-int CocInitServer(void *(*setDataRtn)(void *), int port) {
-  int i;
-  struct sockaddr_in sadr;
-  char *err;
-
-  setData=setDataRtn;
-  /*
-  clDataSize=clientDataSize;
-  clData=clientData;
-  */
-  NEW(cList,CocClient); /* empty header */
-
-  ERR_SI(mainFd=socket(AF_INET, SOCK_STREAM, 0));
-  i = 1;
-  ERR_SI(setsockopt(mainFd,SOL_SOCKET,SO_REUSEADDR,&i,sizeof(int))); /* allow quick port reuse */
-  ERR_I(CocCreateSockAdr(&sadr, NULL, port));
-  ERR_SI(bind(mainFd, (struct sockaddr *)&sadr, sizeof(sadr)));
-  logfileOutRtn=CocToClients;
-  logfileOut(LOG_INFO, "created server on port %d\n", port);
-  ERR_SI(listen(mainFd, 8));
-  FD_ZERO(&mask);
-  FD_SET(mainFd, &mask);
-  maxfd=mainFd+1;
-  CocDefStr(loglist, COC_RDWR);
-  return(0);
-  OnError: return(-1);
-}
-
-int CocHandleThis(CocVar *var, void *base, StrBuf *outBuf, int mode, int fd) {
-  int iret;
-
-  if (var->hdl!=NULL) {
-    iret=var->hdl(mode, base, fd);
-    if (iret<0) { /* error */
-      ErrShow(var->name);
-      ERR_I(StrPut(outBuf, "", COC_ERR)); /* signal error message */
-      ERR_I(StrPut(outBuf, ErrMessage, COC_SEP));
-      return(0);
-    }
-    if (iret==COC_DRD) {
-      ERR_I(StrPut(outBuf, "", COC_DELAYED)); /* delayed response message */
-      ERR_I(StrPut(outBuf, "", COC_SEP)); /* empty message */
-      return(COC_DRD);
-    }
-    if (iret!=0 && iret!=COC_DWR)
-        ERR_MSG("illegal return value from handler");
-  } else {
-    iret=0;
-  }
-  ERR_I(CocPutThisVar(var, base, outBuf, COC_NUL));
-  return(iret);
-  OnError: return(-1);
-}
-
-int CocPushThisHandler(CocVar *var, CocClient *cl, void *base, int mode) {
-  int n;
-
-  if (mode==COC_DWR) {
-    if (var->pending) return(0);
-    var->pending=1;
-  }
-  n=cl->npend;
-  if (n>=sizeof(cl->pend)) {
-    ERR_MSG("too many commands")
-  }
-  cl->pend[n].var=var;
-  cl->pend[n].base=base;
-  cl->pend[n].mode=mode;
-  cl->npend=n+1;
-  return(0);
-  OnError: return(-1);
-}
-
-int CocCallHandlers(void) {
-  CocClient *cl;
-  CocVar *var;
-  Pend *p;
-  int i, iret, mode, delayedRead;
-  char synch;
-  DeclStrBuf(bufr, COC_RES_LEN);
-
-  cl=cList->next;
-  while (cl!=NULL) {
-
-    delayedRead=0;
-    /* treat delayed write handlers first */
-    for (i=0; i<cl->npend; i++) {
-      p=&cl->pend[i];
-      mode=p->mode;
-      var=p->var;
-      assert(var!=NULL && var->hdl!=NULL);
-      if (mode==COC_DWR) {
-        var->pending=0;
-        ERR_I(var->hdl(mode, p->base, cl->fd));
-        p->mode=0;
-      } else {
-        delayedRead=1;
-      }
-    }
-    if (delayedRead) {
-      StrClear(&bufr);
-      synch=cl->synch;
-      ERR_I(StrPut(&bufr, "", cl->synch));
-      for (i=0; i<cl->npend; i++) {
-        p=&cl->pend[i];
-        mode=p->mode;
-        var=p->var;
-        assert(var!=NULL && var->hdl!=NULL);
-        if (mode==COC_DRD) {
-          iret=var->hdl(mode, p->base, cl->fd);
-          if (iret<0) { /* error */
-            ERR_I(StrPut(&bufr, "", COC_ERR)); /* signal error message */
-            ERR_I(StrPut(&bufr, ErrMessage, COC_SEP));
-          }
-          ERR_I(CocPutThisVar(var, p->base, &bufr, COC_NUL));
-        }
-      }
-      if (cl->synch==synch) { /* send only if no new request from client received */
-        assert(cl->fd!=0);
-        ERR_I(CocSend(cl->fd, bufr.buf, bufr.wrpos));
-      }
-    }
-    cl->npend=0;
-    cl=cl->next;
-  }
-  return(0);
-  OnError:
-    cl->npend=0;
-    return(-1);
-}
-
-void CocShowHandlers(char *buf, int buf_len) {
-  CocClient *cl;
-  Pend *p;
-  int i;
-
-  buf[0]='\0';
-  cl=cList->next;
-  while (cl!=NULL) {
-    for (i=0; i<cl->npend; i++) {
-      p=&cl->pend[i];
-      if (p->mode==COC_DWR) {
-        assert(p->var!=NULL);
-        if (buf[0]!='\0') str_ncat(buf, ", ", buf_len);
-        str_ncat(buf, p->var->name, buf_len);
-      }
-    }
-    cl=cl->next;
-  }
-  return;
-}
-
-#ifdef __VMS
-  typedef size_t socklen_type;
-#else
-  typedef int socklen_type;
-#endif
-
-int CocHandle1Request(int tmo_msec, int fd) {
-  struct sockaddr_in cadr;
-  struct hostent *h;
-  struct timeval tmo={0,1};
-  CocClient *cl, *cl0;
-  CocVar *var;
-  int i, lmask, newfd, n, iret;
-  socklen_type cadrlen;
-  char *err, *cmd, *arg, *varname;
-  void *base;
-
-  rmask=mask;
-  if (fd>0) FD_SET(fd, &rmask);
-  tmo.tv_sec=tmo_msec / 1000;
-  tmo.tv_usec=(tmo_msec % 1000)*1000+1;
-  if (fd>=maxfd) maxfd=fd+1;
-  ERR_SI(i=select(maxfd,&rmask,NULL,NULL,&tmo));
-  if (fd>0 && FD_ISSET(fd, &rmask)) return(1); /* event on fd */
-  if (i==0) return(0); /* timeout */
-
-  if (FD_ISSET(mainFd, &rmask)) {
-    cadrlen=sizeof(cadr);
-    ERR_SI(newfd=accept(mainFd, (struct sockaddr *)&cadr, &cadrlen));
-    FD_SET(newfd, &mask);
-    if (newfd>=maxfd) maxfd=newfd+1;
-    NEW(cl, CocClient);
-    cl->fd=newfd;
-    cl->mode=0;
-    if (setData!=NULL) {
-      ERR_P(cl->data = setData(NULL)); /* create new client data object */
-    }
-    /*
-    ERR_SP(cList=calloc(1,sizeof(CocClient)+clDataSize));
-    */
-    cl->next=cList->next;
-    cList->next=cl;
-    h=gethostbyaddr((void *)&cadr.sin_addr, 4, AF_INET);
-    if (h==NULL) {
-      logfileOut(LOG_INFO, "(%d) open from %s\n", newfd, "local");
-    } else {
-      logfileOut(LOG_INFO, "(%d) open from %s\n", newfd, h->h_name);
-    }
-  } else {
-    cl0=cList; cl=cl0->next;
-    while (cl!=NULL) {
-      if (FD_ISSET(cl->fd, &rmask)) {
-        iret=CocRecv(cl->fd, &buf, -1, NULL);
-        if (iret<=0) {
-          logfileOut(LOG_INFO, "(%d) disconnected\n",cl->fd);
-          close(cl->fd);
-          FD_CLR(cl->fd, &mask);
-          cl0->next=cl->next;
-          FREE(cl);
-          cl=cl0;
-        } else {
-          cl->logmask=0; /* stop output to log client */
-          lmask=0;
-          StrReset(&buf);
-          StrClear(&bufo);
-          err=NULL;
-          logfileOut(LOG_NET, "(%d) ", cl->fd);
-          logfileOutBuf(LOG_NET, &buf);
-          /* cl->npend=0; why that ? */
-          logfileOut(LOG_NET, "\n");
-          cl->synch=buf.buf[0];
-          ERR_P(StrGet(&buf, NULL, cl->synch));
-          ERR_I(StrPut(&bufo, "", cl->synch));
-          while (!StrEnd(&buf)) {
-            ERR_P(varname=StrGet(&buf, NULL, ' '));
-            if (cl->synch==COC_MAGIC) { /* access code */
-              if (0==strcmp(varname,"rdacs")) {
-                logfileOut(LOG_INFO, "set read mode\n");
-                cl->mode=1;
-                ERR_I(StrPut(&bufo, "", COC_SEP)); /* empty message */
-              } else if (0==strcmp(varname,"rwacs")) {
-                logfileOut(LOG_INFO, "set write mode\n");
-                cl->mode=2;
-                ERR_I(StrPut(&bufo, "", COC_SEP)); /* empty message */
-              } else {
-                ERR_I(StrPut(&bufo, "", COC_ERR)); /* signal error message */
-                ERR_I(StrPut(&bufo, "bad access code", COC_SEP));
-              }
-              ERR_P(StrGet(&buf, NULL, COC_NUL)); /* skip separator */
-            } else if (cl->mode==0) {
-              ERR_I(StrPut(&bufo, "", COC_ERR)); /* signal terminal error message */
-              ERR_I(StrPut(&bufo, "no access", COC_SEP));
-              ERR_P(StrGet(&buf, NULL, COC_NUL)); /* skip separator */
-            } else {
-              if (cl->data!=NULL) {
-                setData(cl->data);
-              }
-              var=CocFindVar(varname, &base);              
-              if (var==NULL) {
-                ERR_I(StrPut(&bufo, "", COC_ERR)); /* signal error message */
-                ERR_I(StrPut(&bufo, "undefined variable", COC_SEP));
-                ERR_P(StrGet(&buf, NULL, COC_NUL)); /* skip separator */
-              } else if (buf.seen) { /* separator was there: set mode */
-                if (var->access > cl->mode) {
-                  ERR_I(StrPut(&bufo, "", COC_ERR)); /* signal error message */
-                  ERR_I(StrPut(&bufo, "no access", COC_SEP));
-                  ERR_P(StrGet(&buf, NULL, COC_NUL)); /* skip separator */
-                } else {
-                  ERR_I(CocGetThisVar(var, base, &buf, COC_SEP));
-                  if (0==strcmp(var->name,"loglist")) {
-                    str_upcase(loglist, loglist);
-                    if (NULL!=strchr(loglist,'A')) lmask = lmask | LOG_ALL;
-                    if (NULL!=strchr(loglist,'S')) lmask = lmask | LOG_SER;
-                    if (NULL!=strchr(loglist,'N')) lmask = lmask | LOG_NET;
-                    if (NULL!=strchr(loglist,'I')) lmask = lmask | LOG_INFO;
-                    if (NULL!=strchr(loglist,'M')) lmask = lmask | LOG_MAIN;
-                    ERR_I(StrPut(&bufo, "", COC_NUL)); /* o.k. */
-                  } else {
-                    ERR_I(iret=CocHandleThis(var, base, &bufo, COC_WR, cl->fd));
-                    if (iret) ERR_I(CocPushThisHandler(var, cl, base, iret));
-                  }
-                  modified=1;
-                }
-              } else {
-                ERR_P(StrGet(&buf, NULL, COC_NUL)); /* skip separator */
-                ERR_I(iret=CocHandleThis(var, base, &bufo, COC_RD, cl->fd));
-                if (iret) ERR_I(CocPushThisHandler(var, cl, base, iret));
-              }
-            }
-          }
-          ERR_I(StrGetEnd(&buf));
-          logfileOut(LOG_NET, "    ");
-          logfileOutBuf(LOG_NET, &bufo);
-          logfileOut(LOG_NET, "\n");
-          ERR_I(CocSend(cl->fd, bufo.buf, bufo.wrpos));
-          cl->logmask=lmask;
-        }
-      }
-      cl0=cl; cl=cl->next;
-    }
-  }
-  if (modified) return(2);
-  return(3);
-  OnError: return(-1);
-}
-
-int CocHandleRequests(int tmo_msec, int fd) {
-  int tdif, iret, tim0;
-
-  if (modified && fd==0) { /* earlier modification */
-    modified=0;
-    return(2);
-  }
-  tim0=mycMsecSince(0);
-  tdif=tmo_msec;
-  while (tdif>=0) {
-    ERR_I(iret=CocHandle1Request(tdif, fd));
-    if (fd==0) {
-      if (iret==2) return(2); /* modification of a variable */
-    } else {
-      if (iret==1) return(1); /* event on fd */
-    }
-    if (iret==0) return(0); /* timeout */
-    tdif = tmo_msec - mycMsecSince(tim0);
-  }
-  return(0); /* timeout */
-  OnError: return(-1);
-}
-
-void CocCloseServer() {
-  CocClient *cl, *cl0;
-
-  cl=cList->next;
-  while (cl!=NULL) {
-    close(cl->fd);
-    cl0=cl;
-    cl=cl->next;
-    FREE(cl0);
-  }
-  FREE(cList);
-  close(mainFd);
-}
diff --git a/tecs/coc_server.h b/tecs/coc_server.h
deleted file mode 100644
index bf29eee0..00000000
--- a/tecs/coc_server.h
+++ /dev/null
@@ -1,123 +0,0 @@
-#ifndef _SERVER_H_
-#define _SERVER_H_
-
-#include "myc_buf.h"
-
-void CocVarList(void **varlist);
-/*
-  instal a variable list
-*/
-
-void CocFreeVarList(void);
-/*
-  free variable list
-*/
-
-void *CocFindVar(const char *name, void **adr);
-/*
-  find a variable. returns NULL if not found.
-*/
-
-int CocPutVar(const char *name, StrBuf *buf, int separator);
-/*
-  put a variable named <name> of variable list <varList> to the buffer <buf>
-*/
-
-int CocGetVar(const char *name, StrBuf *buf, int separator);
-/*
-  get a variable named <name> of variable list <varList> from the buffer <buf>
-*/
-
-char *CocReadVars(char *str, char stop);
-/*
-  read variables from the string str until a word starts with the stop character
-  the string has the form [ whitespace var=value ] whitespace stop-character
-  any text between an exclamation character and the next line break is treated as comment
-*/
-
-void CocHdl(int (*handler)(int, void *, int));
-/*
-  define handler for last defined item
-*/
-
-int *CocSizePtr(void);
-/*
-  get size pointer from last defined item (only valid when an array)
-*/
-
-void *CocIntPtr(int *ptr);
-void *CocFltPtr(float *ptr);
-void *CocChrPtr(char *ptr);
-void *CocDefVar(const char *name, void *var, int type, int size, int access);
-void CocDefVarS(const char *name, const char *tname, void *var, int type);
-/*
-  Define variables. Call this routines not directly, but through
-  one of the macros below.
-*/
-
-#define CocDefInt(V,A)      CocDefVar(#V,CocIntPtr(&V),COC_INT,0,A)
-#define CocDefFlt(V,A)      CocDefVar(#V,CocFltPtr(&V),COC_FLT,0,A)
-#define CocDefStr(V,A)      CocDefVar(#V,CocChrPtr(V),COC_CHAR,sizeof(V),A)
-#define CocDefArr(V,A)      CocDefVar(#V,CocFltPtr(V),COC_ARRAY,sizeof(V)/sizeof(float),A)
-#define CocDefPtr(V,S)      CocDefVarS(#V,#S,&V,(V!=(S *)NULL,0,COC_PTR));
-#define CocDefStruct(V,S)   CocDefVarS(#V,#S,&V,(&V!=(S *)NULL,0,COC_STRUCT));
-#define CocIntFld(S,V,A)    CocDefVar(#S":"#V,CocIntPtr(&((S *)NULL)->V),COC_INT,0,A);
-#define CocFltFld(S,V,A)    CocDefVar(#S":"#V,CocFltPtr(&((S *)NULL)->V),COC_FLT,0,A);
-#define CocStrFld(S,V,A)    CocDefVar(#S":"#V,CocChrPtr(((S *)NULL)->V),COC_CHAR,sizeof(((S *)NULL)->V),A);
-#define CocArrFld(S,V,A)    CocDefVar(#S":"#V,CocFltPtr(((S *)NULL)->V),COC_FLT,sizeof(((S *)NULL)->V)/sizeof(float),A);
-#define CocAlias(A,V)       CocDefVar(#A, #V, COC_ALIAS,0,0);
-
-#define COC_RDONLY 3
-#define COC_RDWR 2
-#define COC_RDWRALL 1
-
-#define COC_WR 1
-#define COC_RD 2
-#define COC_DWR 3
-#define COC_DRD 4
-#define COC_SHOW 5
-
-#define COC_CHAR 1
-#define COC_INT 2
-#define COC_FLT 3
-#define COC_ARRAY 4
-#define COC_PTR 5
-#define COC_STRUCT 6
-#define COC_TYPE 7
-#define COC_ALIAS 8
-
-int CocInitServer(void *(*setDataRtn)(void *), int port);
-
-int CocHandleRequests(int tmo_msec, int fd);
-int CocHandle1Request(int tmo_msec, int fd);
-/*
-  handle hetwork requests.
-
-  return value: <0: error
-                =0: timeout
-                =1: event on fd
-                =2: variable was changed
-                =3: other network request treated
-
-  CocHandle1Request handles only one network request
-
-  For CocHandleRequests:
-
-  if fd=0: returns when a network request has changed a variable,
-           or when timeout has expired (result is 0 or 2)
-
-  if fd>0: returns when an read event is pending on fd
-           or when timeout has expired (result is 0 or 1)
-
-*/
-
-/* server handlers removed
-int CocPushHandler(const char *name);
-*/
-
-int CocCallHandlers(void);
-void CocShowHandlers(char *buf, int buf_len);
-
-void CocCloseServer(void);
-
-#endif /* _SERVER_H_ */
diff --git a/tecs/coc_util.c b/tecs/coc_util.c
deleted file mode 100644
index 4f61c68e..00000000
--- a/tecs/coc_util.c
+++ /dev/null
@@ -1,112 +0,0 @@
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <string.h>
-#include "myc_err.h"
-#include "myc_str.h"
-#include "coc_util.h"
-/*-------------------------------------------------------------------------*/
-/* CreateSocketAddress stolen from Tcl. Thanks to John Ousterhout */
-
-int CocCreateSockAdr(
-    struct sockaddr_in *sockaddrPtr,    /* Socket address */
-    const char *host,                   /* Host.  NULL implies INADDR_ANY */
-    int port)                           /* Port number */
-{
-    struct hostent *hostent;            /* Host database entry */
-    struct in_addr addr;                /* For 64/32 bit madness */
-
-    (void) memset((char *) sockaddrPtr, '\0', sizeof(struct sockaddr_in));
-    sockaddrPtr->sin_family = AF_INET;
-    sockaddrPtr->sin_port = htons((unsigned short) (port & 0xFFFF));
-    if (host == NULL || host[0]=='\0') {
-        addr.s_addr = INADDR_ANY;
-    } else {
-        hostent = gethostbyname(host);
-        if (hostent != NULL) {
-            memcpy((char *) &addr,
-                (char *) hostent->h_addr_list[0], (size_t) hostent->h_length);
-        } else {
-            addr.s_addr = inet_addr(host);
-            if (addr.s_addr == (unsigned long)-1) {
-                return -1;       /* error */
-            }
-        }
-    }
-    /*
-     * There is a rumor that this assignment may require care on
-     * some 64 bit machines.
-     */
-
-    sockaddrPtr->sin_addr.s_addr = addr.s_addr;
-    return 0;
-}
-
-/*-------------------------------------------------------------------------*/
-
-void CocDelay(int msec) {
-  struct timeval tmo;
-
-  tmo.tv_sec=msec / 1000;
-  tmo.tv_usec=(msec % 1000)*1000+1;
-  select(1,NULL,NULL,NULL,&tmo);
-}
-
-/*-------------------------------------------------------------------------*/
-
-int CocSend(int fd, char *str, int size) {
-  int siz;
-  siz=htonl(size);
-  ERR_SI(send(fd, &siz, 4, 0));
-  ERR_SI(send(fd, str, size, 0));
-  return(0);
-  OnError: return(-1);
-}
-
-/*-------------------------------------------------------------------------*/
-
-int CocRecv(int fd, StrBuf *buf, int timeout, int *flag) {
-  struct timeval tmo={0,1};
-  fd_set mask;
-  int i, l;
-  int siz, n;
-
-  if (timeout>=0) {
-    tmo.tv_sec=timeout;
-
-    FD_ZERO(&mask);
-    FD_SET(fd, &mask);
-    ERR_SI(i=select(fd+1,&mask,NULL,NULL,&tmo));
-    if (flag!=NULL) {
-      *flag=0;
-      if (i==0) return(0);
-    } else {
-      if (i==0) { ERR_MSG("time out"); }
-    }
-  }
-
-  n=0;
-  ERR_SI(i=recv(fd, &n, 4, 0));
-  if (i!=4) {
-    ERR_COD(ECONNREFUSED);
-  }
-  siz=ntohl(n);
-  if (siz > buf->dsize)
-      ERR_MSG("buffer too small");
-  ERR_SI(l=recv(fd, buf->buf, siz, 0));
-  buf->wrpos=l;
-  while (buf->wrpos<siz) {
-    if (l==0) {
-      ERR_COD(ECONNRESET);
-    }
-    ERR_SI(l=recv(fd, buf->buf+buf->wrpos, siz, 0));
-    buf->wrpos+=l;
-  }
-  StrReset(buf);
-  return(buf->wrpos);
-  OnError: return(-1);
-}
-
diff --git a/tecs/coc_util.h b/tecs/coc_util.h
deleted file mode 100644
index c022d2e3..00000000
--- a/tecs/coc_util.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef _COC_UTIL_H_
-#define _COC_UTIL_H_
-
-#include <netinet/in.h>
-#include "myc_buf.h"
-
-#define COC_CMD_LEN 256
-#define COC_RES_LEN 16384
-
-int CocCreateSockAdr(
-    struct sockaddr_in *sockaddrPtr,    /* Socket address */
-    const char *host,                   /* Host.  NULL implies INADDR_ANY */
-    int port);                          /* Port number */
-/*
-  compose internet address
-*/
-
-void CocDelay(int msec);
-/*
-  system independent delay function with msec resolution
-*/
-
-int CocSend(int fd, char *buf, int size);
-/*
-  send a message
-*/
-
-int CocRecv(int fd, StrBuf *buf, int timeout, int *flag);
-/*
-  receive message
-  if flag is NULL, a timeout generates an error
-  else *flag is set to zero between the select and the recv command
-*/
-
-#define COC_SEP '\0'
-#define COC_DELAYED '\1'
-#define COC_ERR '\2'
-#define COC_TRM '\3'
-#define COC_SYN0 '\4'
-#define COC_SYN1 '\5'
-#define COC_MAGIC '\6'
-#define COC_CLRLOG '\7'
-
-#endif /* _COC_UTIL_H_ */
diff --git a/tecs/fortify1.c b/tecs/fortify1.c
deleted file mode 100644
index a3def4c0..00000000
--- a/tecs/fortify1.c
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "fortify.c"
-#ifndef FORTIFY
-  void null(void){}
-#endif
diff --git a/tecs/instr_hosts.c b/tecs/instr_hosts.c
deleted file mode 100644
index 4217bc31..00000000
--- a/tecs/instr_hosts.c
+++ /dev/null
@@ -1,87 +0,0 @@
-#include <time.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdio.h>
-#include "myc_str.h"
-#include "myc_fortran.h"
-
-typedef struct { char *instr; char *host; int port; char *user; int cod; } Instrument;
-static Instrument list[]={
-    { "DMC",   "lnsa05.psi.ch", 9753, "DMC"   , 1},
-    { "TOPSI", "pc4120.psi.ch", 9753, "TOPSI" , 1},
-    { "SANS",  "lnsa10.psi.ch", 9753, "SANS"  , 1},
-    { "HRPT",  "lnsa11.psi.ch", 9753, "HRPT"  , 1},
-    { "TRICS", "lnsa18.psi.ch", 9753, "TRICS" , 1},
-    { "AMOR",  "lnsa14.psi.ch", 9753, "AMOR"  , 1},
-    { "FOCUS", "lnsa16.psi.ch", 9753, "FOCUS" , 1},
-    { "TASP",  "lnsa12.psi.ch", 9753, "TASP",   1},
-    { "TASP0", "lnsa09.psi.ch", 9753, NULL    , 0},
-    { "RITA",  "rita2.psi.ch", 9753, NULL    , 0},
-    { "PREP",  "lnsa01.psi.ch", 9753, NULL    , 0},
-    { "AREA",  "lnsa01.psi.ch", 9751, NULL    , 0},
-    { "TEST",  "lnsa15.psi.ch", 9753, "lnslib", 2}
-  };
-
-int InstrHost(char *input, char *instr, char *host, char *user, char *pcod
-    , int instr_len, int host_len, int user_len, int pcod_len) {
-  char buf[256];
-  int i, j;
-  struct tm tim;
-  time_t t;
-
-  j=-1;
-  str_upcase(buf, input);
-  for (i = 0; i < sizeof(list) / sizeof(list[0]); i++) {
-    if (0==strcmp(buf, list[i].instr)) {
-      j=i;
-    }
-  }
-  if (j<0) {
-    str_lowcase(buf, input);
-    for (i = 0; i < sizeof(list) / sizeof(list[0]); i++) {
-      if (list[i].host==strstr(list[i].host, buf)) {
-        if (j>=0) return 0;
-        j=i;
-      }
-    }
-  }
-  if (j<0) return 0;
-  str_ncpy(instr,list[j].instr, instr_len);
-  str_ncpy(host, list[j].host, host_len);
-  if (list[j].user != NULL) {
-    str_ncpy(user,    list[j].user, user_len);
-    if (list[j].cod == 1) {
-      str_ncpy(pcod, instr, pcod_len);
-      str_ncat(pcod, "LNS", pcod_len);
-    } else if (list[j].cod == 2) {
-      time(&t);
-      tim=*localtime(&t);
-      sprintf(pcod, "%02dlns%d", tim.tm_year % 100, tim.tm_mon/6+1);
-    } else {
-      str_ncpy(pcod, " ", pcod_len);
-    }
-  }
-  return list[j].port;
-}
-
-
-#ifdef F_CHAR
-/* compile only when fortran c interface stuff is defined */
-
-int F_FUN(instr_host)(F_CHAR(input), F_CHAR(instr), F_CHAR(host), F_CHAR(user), F_CHAR(pcod)
-    , int input_len, int instr_len, int host_len, int user_len, int pcod_len) {
-  char buf[256], in[256], ho[256], us[256], pc[256];
-  int iRet;
-
-  STR_TO_C(buf, input);
-  iRet=InstrHost(buf, in, ho, us, pc, sizeof(in), sizeof(ho), sizeof(us), sizeof(pc));
-  if (iRet>0) {
-    STR_TO_F(instr, in);
-    STR_TO_F(host, ho);
-    STR_TO_F(user, us);
-    STR_TO_F(pcod, pc);
-  }
-  return iRet;
-}
-
-#endif
diff --git a/tecs/instr_hosts.h b/tecs/instr_hosts.h
deleted file mode 100644
index d94cd2ad..00000000
--- a/tecs/instr_hosts.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _MYC_STR_H_
-#define _MYC_STR_H_
-
-int InstrHost(char *input, char *instr, char *host, char *user, char *pcod
-    , int instr_len, int host_len, int user_len, int pcod_len);
-
-/* input may be a host of instrument name
-   output is: instrument name, host name, user name and pcod (the code needed to enter...)
-*/
-
-#endif /* _MYC_STR_H_ */
diff --git a/tecs/keep_running.c b/tecs/keep_running.c
deleted file mode 100644
index aa43c997..00000000
--- a/tecs/keep_running.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <time.h>
-#include <sys/wait.h>
-
-#define MAX_CNT 10
-#define MIN_PERIOD 3600
-
-int main(int argc, char *argv[]) {
-  int cnt, dif;
-  time_t tim1, tim2;
-  pid_t pid;
-  int status, i;
-  
-  if (argc<2) return 0;
-  cnt = MAX_CNT;
-  while (cnt > 0) {
-    time(&tim1);
-    pid=vfork();
-    if (pid == 0) {
-      execvp(argv[1], argv+1);
-      perror("execvp");
-      exit(1);
-    }
-    waitpid(pid, &status, 0);
-    if (status==512) { /* kill */
-      return 0;
-    }
-    if (status==256) { /* restart */
-      cnt = MAX_CNT;
-    }
-    time(&tim2);
-    dif = (int) difftime(tim2, tim1);
-    cnt += dif / MIN_PERIOD;
-    if (cnt > MAX_CNT) cnt = MAX_CNT;
-    cnt--;
-    if (dif < MIN_PERIOD) {
-      printf("Status=%d. Died after %d sec", status, dif);
-    } else {
-      printf("Status=%d. Died after %f hours", status, dif/3600.);
-    }
-    if (cnt > 0) {
-      printf(" - %d tries left - retry ...\n", cnt);
-    }
-  }
-  printf(" - too many restarts\n");
-  return -1;
-}
diff --git a/tecs/make_gen b/tecs/make_gen
deleted file mode 100644
index fdc675ff..00000000
--- a/tecs/make_gen
+++ /dev/null
@@ -1,65 +0,0 @@
-#---------------------------------------------------------------------------
-# Makefile (sytem independent part) for the TECS Client library and TecsServer
-# included in a machine-specific makefile
-#
-# Markus Zolliker, March 2003
-#--------------------------------------------------------------------------
-
-LIBR_OBJ  =coc_util.o myc_err.o myc_str.o myc_buf.o myc_time.o
-SERV_OBJ  =tecs.o coc_server.o tecs_lsc.o tecs_serial.o coc_logfile.o \
-           tecs_data.o $(LIBR_OBJ)
-CLI_OBJ   =tecs_cli.o coc_client.o $(LIBR_OBJ)
-TCLI_OBJ  =sys_getenv.o sys_env.o myc_tmp.o sys_cmdpar.o \
-           sys_date.o sys_wait.o sys_lun.o sys_rdline.o \
-           sys_get_key.o sys_unix.o sys_open$(SYS_OPEN).o \
-           $(CLI_OBJ)
-TECLI_OBJ =tecs_client.o tecs_plot.o str.o instr_hosts.o \
-           $(TCLI_OBJ)
-
-#.f.o:
-#	$(FC) $(FFLAGS) -c $F
-#
-#.c.o:
-#	$(CC) $(CFLAGS) -c $C
-
-libtecsl.a: $(CLI_OBJ)
-	rm -f $@
-	$(AR) $(ARFLAGS) $@ $Q
-	ranlib $@
-
-all: libtecsl.a TecsServer TecsClient keep_running six
-
-test: tecs_cli.c
-	echo $(VPATH) $C
-
-TecsServer: $(SERV_OBJ) $(HARDSUPLIB)
-	$(CC) $(CFLAGS) -o $@ $Q -lm $(FORTIFYOBJ)
-
-TecsClient: $(TECLI_OBJ)
-	$(FC) -o $@ $Q $(PGLIB) $(RDLIB) $(FORTIFYOBJ)
-
-# -- for tascom --
-libtecs.so: tecs_c.c $(CLI_OBJ)
-	$(CC) $(CFLAGS) -shared -o $@ $Q $(FORTIFYOBJ)
-
-# -- needs special include
-tecs_serial.o: tecs_serial.c
-	$(CC) $(CFLAGS) -I$(SICS)/hardsup -c $Q
-
-keep_running: keep_running.c
-	$(CC) $(CFLAGS) -o $@ $Q $(FORTIFYOBJ)
-
-six: six.c term.o sys_select.o libtecsl.a
-	$(CC) $(CFLAGS) -o $@ $Q $(FORTIFYOBJ)
-
-#rstart: rstart.c myc_str.o myc_err.o instr_hosts.o
-#	$(CC) $(CFLAGS) -o $@ $Q $(FORTIFYOBJ)
-#
-#serverd: serverd.c myc_str.o myc_err.o coc_util.o myc_buf.o
-#	$(CC) $(CFLAGS) -o $@ $Q $(FORTIFYOBJ)
-#
-#starts: starts.c myc_str.o myc_err.o coc_util.o myc_buf.o
-#	$(CC) $(CFLAGS) -o $@ $Q $(FORTIFYOBJ)
-
-clean:
-	rm -f *.o *.a six keep_running TecsServer TecsClient
diff --git a/tecs/make_opt b/tecs/make_opt
deleted file mode 100644
index 20aa4ed8..00000000
--- a/tecs/make_opt
+++ /dev/null
@@ -1,37 +0,0 @@
-#---------------------------------------------------------------------------
-# Makefile options for the TECS Client library and TecsServer
-# for Redhat linux on llc3 or llc4
-#
-# Markus Zolliker, March 2003
-#--------------------------------------------------------------------------
-
-SINQ=/afs/psi.ch/project/sinq/linux
-SICS=..
-
-# -- GNU make
-# -- all prerequisites:
-Q=$^
-# -- Fortran source:
-F=$<
-# -- C source
-C=$<
-
-CC       = gcc
-FC       = g77
-CFLAGS   = -DLINUX -g
-FFLAGS   = -u -fvxt -g
-ARFLAGS  = cr
-
-# FORTIFYOBJ = fortify.o
-
-# -- system dependent routines
-SYS_FILE =sys_linux
-
-# -- PGPLOT library
-PGLIB    =$(SINQ)/pgplot/libpgplot.a -L/usr/X11R6/lib -lX11
-
-# -- library for ASYNSRV
-HARDSUPLIB=$(SICS)/hardsup/libhlib.a
-
-# -- readline library
-RDLIB    =-lreadline -ltermcap
diff --git a/tecs/make_opt_alpha b/tecs/make_opt_alpha
deleted file mode 100644
index 7f900156..00000000
--- a/tecs/make_opt_alpha
+++ /dev/null
@@ -1,27 +0,0 @@
-#---------------------------------------------------------------------------
-# Makefile options for the TECS Client library and TecsServer
-# for Redhat linux on llc3 or llc4
-#
-# Markus Zolliker, March 2003
-#--------------------------------------------------------------------------
-
-SINQ=/afs/psi.ch/project/sinq/linux
-SICS=..
-
-CC       = cc
-FC       = f77
-CFLAGS   = -std1 -g -warnprotos
-FFLAGS   = -u -g
-ARFLAGS  = cr
-
-# -- system dependent routines
-SYS_FILE =sys_aunix
-
-# -- PGPLOT library
-PGLIB    =$(PGPLOT_DIR)/libpgplot.a -L/usr/X11R6/lib -lX11
-
-# -- library for ASYNSRV
-HARDSUPLIB=$(SICS)/hardsup/libhlib.a
-
-# -- readline library
-RDLIB    =-lreadline -ltermcap
diff --git a/tecs/make_opt_llc b/tecs/make_opt_llc
deleted file mode 100644
index 2c57ab15..00000000
--- a/tecs/make_opt_llc
+++ /dev/null
@@ -1,27 +0,0 @@
-#---------------------------------------------------------------------------
-# Makefile options for the TECS Client library and TecsServer
-# for Redhat linux on llc3 or llc4
-#
-# Markus Zolliker, March 2003
-#--------------------------------------------------------------------------
-
-SINQ=/afs/psi.ch/project/sinq/linux
-SICS=..
-
-CC       = gcc
-FC       = g77
-CFLAGS   = -DLINUX -g
-FFLAGS   = -u -fvxt -g
-ARFLAGS  = cr
-
-# -- system dependent routines
-SYS_FILE =sys_linux
-
-# -- PGPLOT library
-PGLIB    =$(SINQ)/pgplot/libpgplot.a -L/usr/X11R6/lib -lX11
-
-# -- library for ASYNSRV
-HARDSUPLIB=$(SICS)/hardsup/libhlib.a
-
-# -- readline library
-RDLIB    =-lreadline -ltermcap
diff --git a/tecs/makefile b/tecs/makefile
deleted file mode 100644
index 53664a33..00000000
--- a/tecs/makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-#include makefile_alpha
-include makefile_linux
-
diff --git a/tecs/makefile_alpha b/tecs/makefile_alpha
deleted file mode 100644
index c9b8eb9c..00000000
--- a/tecs/makefile_alpha
+++ /dev/null
@@ -1,44 +0,0 @@
-#---------------------------------------------------------------------------
-# Makefile for the TECS Client library and TecsServer
-# machine-dependent part for Tru64 Unix
-#
-# Markus Zolliker, March 2003
-#--------------------------------------------------------------------------
-# the following lines only for fortified version
-#DFORTIFY=-DFORTIFY -I$(SRC)..
-#FORTIFYOBJ=../strdup.o ../fortify.o
-#==========================================================================
-
-
-SICS=src/..
-
-CC       = cc
-FC       = f77
-CFLAGS   = -std1 -g -warnprotos $(DFORITFY)
-FFLAGS   = -u -g
-ARFLAGS  = cr
-
-# -- system dependent routines
-SYS_OPEN = _alpha
-
-# -- PGPLOT library
-PGLIB    =$(PGPLOT_DIR)/libpgplot.a -L/usr/X11R6/lib -lX11
-
-# -- library for ASYNSRV
-HARDSUPLIB=../hardsup/libhlib.a
-
-# -- readline library
-RDLIB    =-lreadline -ltermcap
-
-# -- the following macros are used as a replacement for some automatic variables
-#    due to different make versions.
-# This is for Tru64 standard make.
-#
-# list of prerequisites including paths for VPATH
-Q=$>
-
-# Fortran/C source file name
-F=$*.f
-C=$*.c
-
-include make_gen
diff --git a/tecs/makefile_linux b/tecs/makefile_linux
deleted file mode 100644
index eda4593e..00000000
--- a/tecs/makefile_linux
+++ /dev/null
@@ -1,45 +0,0 @@
-#---------------------------------------------------------------------------
-# Makefile options for the TECS Client library and TecsServer
-# machine-dependent part for Redhat Linux with AFS at PSI
-#
-# Markus Zolliker, March 2003
-#--------------------------------------------------------------------------
-# the following lines only for fortified version
-DFORTIFY=-DFORTIFY -I$(SRC)..
-FORTIFYOBJ=../strdup.o ../fortify.o
-#==========================================================================
-
-SICST=..
-SICS=$(SRC)..
-
-CC       = gcc
-FC       = g77
-CFLAGS   = -DLINUX -g $(DFORTIFY)
-FFLAGS   = -u -fvxt -g
-ARFLAGS  = cr
-
-# -- system dependent routines
-
-# -- PGPLOT library
-#PGPLOT   =/afs/psi.ch/project/sinq/linux/pgplot/
-PGPLOT   =/afs/psi.ch/user/z/zolliker/pgplot/
-PGLIB    =$(PGPLOT)/libpgplot.a -L/usr/X11R6/lib -lX11
-
-# -- library for ASYNSRV
-HARDSUPLIB=$(SICST)/hardsup/libhlib.a
-
-# -- readline library
-RDLIB    =-lreadline -ltermcap
-
-# -- the following macros are used as a replacement for some automatic variables
-#    due to different make versions.
-# This is for GNU make.
-#
-# list of prerequisites including paths for VPATH
-Q=$^
-
-# Fortran/C source file name
-F=$<
-C=$<
-
-include $(SRC)make_gen
diff --git a/tecs/myc_buf.c b/tecs/myc_buf.c
deleted file mode 100644
index 8c0e51bb..00000000
--- a/tecs/myc_buf.c
+++ /dev/null
@@ -1,312 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <string.h>
-#include <strings.h>
-#include <stdlib.h>
-#include "myc_err.h"
-#include "myc_str.h"
-#include "myc_buf.h"
-
-char *StrNGet(StrBuf *buf, char *result, int reslen, int sep) {
-  char *b, *f, *e, quote;
-  int res, l, ll;
-
-  if (buf->rdpos < 0 || buf->rdpos >= buf->dsize || buf->buf==NULL)
-      ERR_MSG("buffer corrupt");
-  b=buf->buf + buf->rdpos;
-  if (*b=='"' || *b=='\'') { /* take string within quotes (single or double) */
-    quote=*b; b++;
-    f=strchr(b, quote);
-    if (f==NULL)
-        ERR_MSG("missing '""'");
-    l=f-b;
-    if (sep == StrNONE) {
-      buf->rdpos=f - buf->buf + 1;
-      buf->seen = 0;
-    } else {
-      e=strchr(f+1, sep);
-      if (e==NULL) {
-        buf->rdpos = f - buf->buf + 1 + strlen(f+1);
-        buf->seen=0;
-      } else {
-        buf->rdpos = e - buf->buf + 1;
-        buf->seen=1;
-      }
-    }
-  } else {
-    f=strchr(b, sep);
-    if (f==NULL) {
-      l=strlen(b);
-      f=b+l;
-      buf->rdpos+=l;
-      buf->seen=0;
-    } else {
-      l=f-b;
-      buf->rdpos+=l+1;
-      buf->seen=1;
-    }
-  }
-  if (result==NULL) {
-    if (reslen==-1) { /* special case for StrGetBuf */
-      return(f);
-    }
-    *f='\0';
-    return(b);
-  } else {
-    if (l>=reslen) l=reslen-1; /* ERR_MSG("result too short"); */
-    strncpy(result, b, l);
-    result[l]='\0';
-    return(result);
-  }
-  OnError:
-    buf->rdpos=buf->dsize; /* illegal value */
-    return(NULL);
-}
-
-int StrGetBuf(StrBuf *buf, StrBuf *res, int sep) {
-  char *b, *f;
-
-  b = buf->buf + buf->rdpos;
-  ERR_P(f=StrNGet(buf, NULL, -1, sep));
-  res->buf   = b;
-  res->wrpos = f-b;
-  res->rdpos = 0;
-  res->dsize = f-b;
-  return(0);
-  OnError:
-    buf->rdpos=buf->dsize; /* illegal value */
-    return(-1);
-}
-
-int StrGetInt(StrBuf *buf, int *res, int sep) {
-  char num[32];
-  int i, l, p;
-
-  p=buf->rdpos;
-  ERR_P(StrGet(buf, num, sep));
-  i=sscanf(num, "%d%n", res, &l);
-  if (i==0)
-      ERR_MSG("illegal number");
-  if (sep==StrNONE) {
-    buf->rdpos=p+l;
-  }
-  return(0);
-  OnError:
-    buf->rdpos=buf->dsize; /* illegal value */
-    return(0);
-}
-
-int StrGetFloat(StrBuf *buf, float *res, int sep) {
-  char num[32];
-  int i, l, p;
-
-  p=buf->rdpos;
-  ERR_P(StrGet(buf, num, sep));
-  if (num[0]=='N' && num[1]=='a' && num[2]=='N') {
-    l=3;
-    *res = MYC_NAN;
-  } else {
-    i=sscanf(num, "%f%n", res, &l);
-    if (i==0) {
-      ERR_MSG("illegal number");
-    }
-  }
-  if (sep==StrNONE) {
-    buf->rdpos=p+l;
-  }
-  return(0);
-  OnError:
-    buf->rdpos=buf->dsize; /* illegal value */
-    return(-1);
-}
-
-int StrGetEnd(StrBuf *buf) {
-  if (buf->buf!=NULL) {
-    if (buf->rdpos < 0 || buf->rdpos >= buf->dsize)
-        ERR_MSG("buffer corrupt");
-    if (buf->rdpos != buf->wrpos)
-        ERR_MSG("superflous content in buffer");
-  }
-  return(0);
-  OnError:
-    return(-1);
-}
-
-int StrPut(StrBuf *buf, const char *str, int sep) {
-  int l, pos;
-  char quote;
-
-  pos=buf->wrpos;
-  if (pos < 0 || pos >= buf->dsize || buf->buf==NULL)
-      ERR_MSG("buffer corrupt");
-  l=strlen(str);
-  quote='\0';
-  if (sep>0) {
-    if (strchr(str, sep)!=NULL) {
-      if (strchr(str, '"')!=NULL) {
-        quote='"'; l+=2;
-      }
-      if (strchr(str, '\'')!=NULL) {
-        if (quote!='\0')
-            ERR_MSG("str must not contain separator and both kind of quotes");
-        quote='\''; l+=2;
-      }
-    }
-  }
-  if (pos+l >= buf->dsize)
-      ERR_MSG("buffer too short");
-  if (quote!='\0') {
-    buf->buf[pos]=quote; pos++;
-    strcpy(buf->buf + pos, str);
-    buf->buf[pos]=quote; pos++;
-  } else {
-    strcpy(buf->buf + pos, str);
-  }
-  pos+=l;
-  if (sep!=StrNONE) {
-    buf->buf[pos]=sep;
-    pos++;
-  } else {
-    buf->buf[pos]='\0';    
-  }
-  buf->wrpos=pos;
-  return(0);
-  OnError:
-    buf->wrpos=-1;
-    return(-1);
-}
-
-int StrPutInt(StrBuf *buf, int val, int sep) {
-  char num[32];
-
-  sprintf(num, "%d", val);
-  ERR_I(StrPut(buf, num, sep));
-  return(0);
-  OnError:
-    return(-1);
-}
-
-int StrPutFloat(StrBuf *buf, float val, int sep) {
-  char num[32];
-  int l;
-
-  if (val == MYC_NAN) {
-    ERR_I(StrPut(buf, "NaN", sep));
-  } else {
-    sprintf(num, "%g", val);
-    ERR_I(StrPut(buf, num, sep));
-  }
-  return(0);
-  OnError:
-    return(-1);
-}
-
-void StrReset(StrBuf *buf) {
-  buf->rdpos=0;
-}
-
-void StrClear(StrBuf *buf) {
-  buf->rdpos=0;
-  buf->wrpos=0;
-}
-
-void StrNLink(StrBuf *buf, char *str, int length) {
-  int l;
-  buf->buf=str;
-  buf->rdpos=0;
-  l=strlen(str);
-  if (l<length) l=length;
-  buf->wrpos=l;
-  buf->dsize=buf->wrpos;
-}
-
-#define TWO_23 8388608
-#define EXP_OFFS 128
-
-void flt_to_char4(double f, char buf[4]) {
-  double m;
-  int e, res, ir;
-
-  m=frexp(f, &e);
-  e=e+EXP_OFFS;
-  if (e<0 || m==0) {
-    res=0; m=0;
-  } else {
-    if (e>255) {
-      res=255*TWO_23+(TWO_23-1); /* max. representable number */
-    } else {
-      res=e*TWO_23+(int)(0.5+(fabs(m*2)-1.0)*TWO_23);
-    }
-  }
-  buf[0]=res % 256; res=res/256;
-  buf[1]=res % 256; res=res/256;
-  buf[2]=res % 256; res=res/256;
-  if (m<0) {
-    buf[3]=res-128;
-  } else {
-    buf[3]=res;
-  }
-}
-
-double flt_from_char4(char buf[4]) {
-  int s, i, b0, b1, b2, b3;
-  
-  b0=buf[0]; if (b0<0) b0+=256;
-  b1=buf[1]; if (b1<0) b1+=256;
-  b2=buf[2]; if (b2<0) b2+=256;
-  b3=buf[3]; if (b3<0) b3+=256;
-  if (b3>=128) {
-    i=(b3-128)*(256*65536)+b2*65536+b1*256+b0;
-    if (i==0) return 0.0;
-    return -ldexp((i % TWO_23)*1.0/(TWO_23)*0.5+0.5, i/TWO_23-EXP_OFFS);
-  } else {
-    i=b3*(256*65536)+b2*65536+b1*256+b0;
-    if (i==0) return 0.0;
-    return ldexp((i % TWO_23)*1.0/(TWO_23)*0.5+0.5, i/TWO_23-EXP_OFFS);
-  }
-}
-
-int StrPutArray(StrBuf *buf, float val[], int size) {
-  int i, pos;
-  char *b;
-
-  pos=buf->wrpos;
-  if (pos < 0 || pos >= buf->dsize || buf->buf==NULL)
-      ERR_MSG("buffer corrupt");
-  if (pos+4*size >= buf->dsize)
-      ERR_MSG("buffer too short");
-  b=buf->buf+pos;
-  flt_to_char4((float)size, b);
-  b+=4;
-  for (i=0; i<size; i++) {
-    flt_to_char4(val[i], b);
-    b+=4;
-  }
-  buf->wrpos=b - buf->buf;
-  return(0);
-  OnError:
-    buf->wrpos=-1;
-    return(-1);
-}
-
-int StrGetArray(StrBuf *buf, float val[], int maxsize) {
-  int size, i;
-  char *b;
-  double gg;
-
-  if (buf->rdpos < 0 || buf->rdpos >= buf->dsize || buf->buf==NULL)
-      ERR_MSG("buffer corrupt");
-  b=buf->buf + buf->rdpos;
-  size=flt_from_char4(b);  b+=4;
-  buf->rdpos+=4*(size+1);
-  if (maxsize<size) size=maxsize;
-  for (i=0; i<size; i++) {
-    gg=flt_from_char4(b); b+=4;
-    val[i]=gg;
-  }
-  return size;
-  OnError:
-    buf->rdpos=buf->dsize; /* illegal value */
-    return(-1);
-}
diff --git a/tecs/myc_buf.h b/tecs/myc_buf.h
deleted file mode 100644
index 853022e8..00000000
--- a/tecs/myc_buf.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef	_STR_BUF_H_
-#define	_STR_BUF_H_
-
-/*
-  This module is used to write and read from character strings
-  It is a simplified, safe replacement for sprintf/sscanf.
-
-  DeclStrBuf(buf, size) declares and initializes a buffer of a given size.
-  Use this macro in the declaration part of a function.
-*/
-typedef struct { char *buf; int dsize, rdpos, wrpos, seen; } StrBuf;
-
-#define DeclStrBuf(BUF,SIZ) static char STR__##BUF[SIZ]; StrBuf BUF={STR__##BUF,SIZ}
-
-/*------------------------------------------------------------------------
-  Write content to the buffer, and add separator sep, if sep!=StrNONE
-*/
-#define StrNONE -1
-int StrPut(StrBuf *buf, const char *str, int sep);
-int StrPutInt(StrBuf *buf, int val, int sep);
-int StrPutFloat(StrBuf *buf, float val, int sep);
-int StrPutArray(StrBuf *buf, float val[], int size);
-
-/*------------------------------------------------------------------------
-  Read from the buffer until separator sep.
-  Use the StrGet macro if the result is a fixed size.
-  Special case sep=StrNONE:
-  - StrGet reads until the end of the buffer or until the end of a quoted string
-  - StrGetInt and StrGetFloat read until the end of a legal number 
-*/
-char *StrNGet(StrBuf *buf, char *result, int reslen, int sep);
-#define StrGet(BUF,RES,SEP) StrNGet(BUF,RES,sizeof(RES),SEP)
-int StrGetInt(StrBuf *buf, int *res, int sep);
-int StrGetFloat(StrBuf *buf, float *res, int sep);
-int StrGetArray(StrBuf *buf, float val[], int maxsize);
-#define StrEnd(BUF) ((BUF)->rdpos>=(BUF)->wrpos)
-
-/*------------------------------------------------------------------------
-  reset the buffer to read from the beginning
-*/
-void StrReset(StrBuf *buf);
-
-/*------------------------------------------------------------------------
-  Clear the buffer
-*/
-void StrClear(StrBuf *buf);
-
-/*------------------------------------------------------------------------
-  Verify that the end is reached
-*/
-  int StrGetEnd(StrBuf *buf);
-
-/*------------------------------------------------------------------------
-  Link the buffer to a string. The buffer length is set to
-  sizeof(STR) or strlen(STR), whichever is greater
-*/
-#define StrLink(BUF, STR) StrNLink(BUF, STR, sizeof(STR))
-void StrNLink(StrBuf *buf, char *str, int size);
-
-#endif /* _STR_BUF_H_ */
diff --git a/tecs/myc_err.c b/tecs/myc_err.c
deleted file mode 100644
index c92112eb..00000000
--- a/tecs/myc_err.c
+++ /dev/null
@@ -1,136 +0,0 @@
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "myc_fortran.h"
-#include "myc_str.h"
-#include "myc_err.h"
-
-#define SLEN 64
-#define MLEN 64
-
-static char *txt[SLEN];
-static int sp=0;
-static int stack_empty=1;
-
-int ErrCode;
-char *ErrMessage=NULL;
-void (*outrtn)(void *, char *)=NULL;
-void *outarg;
-
-void ErrTxt(char *text, int systemError)
-{
-  if (systemError) {
-    sp=0; ErrCode=errno; ErrMessage=strerror(errno);
-  }
-  if (stack_empty && sp>0) {
-    sp=0;
-    stack_empty=0;
-  }
-  if (sp<SLEN) {
-    txt[sp++]=text;
-  }
-}
-
-void ErrMsg(char *msg)
-{
-  ErrCode=-1;
-  ErrMessage=msg; sp=0;
-}
-
-void ErrCod(int code)
-{
-  ErrCode=code;
-  ErrMessage=strerror(code); sp=0;
-}
-
-void ErrOutFil(void *arg, char *text) {
-  fprintf((FILE *)arg, "%s\n", text);
-}
-
-void ErrShow(char *text)
-{
-  int i, l;
-  char buf[256];
-
-  if (outrtn==NULL) {
-    outrtn=ErrOutFil;
-    outarg=stdout;
-  }
-  l=strlen(text)+strlen(ErrMessage)+6;
-  assert(l<256);
-  sprintf(buf, "--- %s: %s", text, ErrMessage);
-  for (i=0;i<sp;i++) {
-    if (txt[i][0]==':') {
-      l+=strlen(txt[i]);
-      assert(l<256);
-      strcat(buf, &(txt[i][1]));
-    } else {
-      outrtn(outarg, buf);
-      l=strlen(txt[i]);
-      assert(l<256);
-      strcpy(buf, txt[i]);
-    }
-  }
-  outrtn(outarg, buf);
-  outrtn(outarg, "");
-  stack_empty=1;
-}
-
-void ErrShort(char *msg) {
-  if (outrtn==NULL) {
-    outrtn=ErrOutFil;
-    outarg=stdout;
-  }
-  outrtn(outarg, msg);
-}
-
-void ErrSetOutRtn(void (*rtn)(void *, char *), void *arg) {
-  outrtn=rtn;
-  outarg=arg;
-}
-
-void ErrSetOutFile(FILE *arg) {
-  outrtn=ErrOutFil;
-  outarg=arg;
-}
-
-void ERR_EXIT(char *text) {
-  ErrShow(text); exit(1);
-}
-
-/* FORTRAN wrappers */
-
-#ifdef F_CHAR
-/* compile only when fortran c interface stuff is defined */
-
-void F_FUN(err_show)(F_CHAR(text), int text_len) {
-  char buf[256];
-
-  STR_TO_C(buf, text);
-  ErrShow(buf);
-}
-
-void F_FUN(err_txt)(F_CHAR(text), int text_len) {
-  char buf[256];
-
-  STR_TO_C(buf, text);
-  ErrTxt(buf,0);
-}
-
-void F_FUN(err_msg)(F_CHAR(text), int text_len) {
-  static char buf[256];
-
-  STR_TO_C(buf, text);
-  ErrMsg(buf);
-}
-
-void F_FUN(err_set_outrtn)(void (*rtn)(void *, char*), void *arg) {
-  ErrSetOutRtn(rtn, arg);
-}
-
-void F_FUN(err_short)(void) {
-  ErrShort(ErrMessage);
-}
-
-#endif
diff --git a/tecs/myc_err.h b/tecs/myc_err.h
deleted file mode 100644
index cd5e89a3..00000000
--- a/tecs/myc_err.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#ifndef _ERR_HANDLING_H_
-#define _ERR_HANDLING_H_
-
-#include <stdio.h>
-#include <sys/errno.h>
-
-/* ErrHDL Error handling utilities
-   -------------------------------
-   Makes code more readable by hiding annoying error condition checks.
-
-Macros and routines:
-
-  Spelling in uppercase indicates, that it the program flow
-  may be modified (jump to OnError label or program exit).
-
-
-  ERR_x
-
-    Usage                        Error condition     Error message taken from
-    -----------------------------------------------------------------------------------------
-    ERR_SI(res=routine1(...))    res<0               errno
-    ERR_SP(ptr=routine2(...))    ptr==NULL           errno
-    ERR_I(res=routine3(...))     res<0               stored by routine3 using errhdl mechanism
-    ERR_P(ptr=routine4(...))     ptr==NULL           stored by routine4 using errhdl mechanism
-
-    The result assignment "res=" or "ptr=" is optional.
-
-    Description:
-    The routine routineX is called.
-    If the result indicates an error, the source text  is saved and the
-    program continues at the OnError label.
-    The error message and the source code of the calling instructions is
-    saved for a later call to ErrShow or ErrExit.
-
-  ERR_EXIT("program_name")
-
-    Show error and exit program.
-
-  ERR_MSG("message")
-
-    Signals an error condition. If "message" is replaced by a variable,
-    take care that it is not modified until ErrShow is called.
-
-  ERR_COD(cod)
-
-    Signals an error condition as code from errno.h
-
-  ErrShow("program_name")
-
-    Show actual error message with traceback information to stdout
-    or a file fil
-
-Global Variables (read only)
-
-  int ErrCode
-
-    actual error message code
-    = errno for system errors or
-    = -1 for custom errors signaled by ERRMSG
-
-  char *ErrMessage
-
-    actual error message
-*/
-
-#define ERR_SI(R) { if(0>(R)) { ErrTxt(#R,1); goto OnError; }; }
-#define ERR_SP(R) { if(NULL==(R)) { ErrTxt(#R,1); goto OnError; }; }
-#define ERR_I(R) { if(0>(R)) { ErrTxt(#R,0); goto OnError; }; }
-#define ERR_P(R) { if(NULL==(R)) { ErrTxt(#R,0); goto OnError; }; }
-#define ERR_MSG(R) { ErrMsg(R); goto OnError; }
-#define ERR_COD(R) { ErrCod(R); goto OnError; }
-
-void ErrTxt(char *text, int systemError);
-void ErrMsg(char *msg);
-void ErrCod(int code);
-void ErrShow(char *text); /* write out error message with stack info */
-void ErrShort(char *msg); /* write out short error message */
-void ERR_EXIT(char *text);
-void ErrSetOutRtn(void (*rtn)(void *,char *), void *arg);
-void ErrSetOutFile(FILE *file);
-
-extern int ErrCode;
-extern char *ErrMessage;
-
-#endif /* _ERR_HANDLING_H_ */
diff --git a/tecs/myc_fortran.h b/tecs/myc_fortran.h
deleted file mode 100755
index 33e5cf65..00000000
--- a/tecs/myc_fortran.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef _SYS_UTIL_H_
-#define _SYS_UTIL_H_
-
-/* 
-
-   fortran interface stuff
-
-     declare fortran character arguments as F_CHAR(arg)
-     and at at the end for each character argument <arg> add
-     int <arg>_len to the argument list
-
-     Use macros STR_TO_C and STR_TO_F to convert from Fortran character strings
-     to C character arrays and vice versa.
-
-*/
-
-
-#if defined __VMS
-
-typedef struct { short size, dummy; char *text; } SysVmsChar;
-
-#define F_CHAR(VAR) SysVmsChar *VAR
-#define F_DCHAR(VAR,LEN) static char VAR##_str[LEN]; SysVmsChar VAR##_desc={LEN,270,&VAR##_str[0]}; SysVmsChar *VAR=&VAR##_desc
-#define F_CLEN(VAR) 
-#define F_ALEN(VAR) 
-#define F_LEN(VAR) VAR->size
-#define STR_TO_C(DST,SRC) str_ntrim(DST, SRC->text, sizeof(DST), SRC->size)
-#define STR_TO_F(DST,SRC) str_npad(DST->text, SRC, DST->size)
-#define F_FUN(A) A
-
-
-#elif defined __alpha || defined __unix  || defined __GNUC__
-
-#define F_CHAR(VAR) char *VAR
-#define F_DCHAR(VAR,LEN) char VAR[LEN]; int VAR##_len=LEN
-#define F_CLEN(VAR) ,int VAR##_len
-#define F_ALEN(VAR) ,VAR##_len
-#define F_LEN(VAR) VAR##_len
-#define STR_TO_C(DST,SRC) str_ntrim(DST, SRC, sizeof(DST), SRC##_len)
-#define STR_TO_F(DST,SRC) str_npad(DST, SRC, DST##_len)
-
-#ifdef __alpha
-#define F_FUN(A) A##_
-#elif defined __GNUC__
-#define F_FUN(A) A##__
-#else
-#define F_FUN(A) A##__
-#endif
-
-#else
-
-#error "other machines are not supported"
-
-#endif
-
-#endif /* _SYS_UTIL_H_ */
diff --git a/tecs/myc_mem.h b/tecs/myc_mem.h
deleted file mode 100644
index c734f2eb..00000000
--- a/tecs/myc_mem.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef _MEM_UTIL_H_
-#define _MEM_UTIL_H_
-
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef FORTIFY
-#include "fortify.h"
-#endif
-
-/* ------------------------------------------------------------
-   these macros help for safer dynamic memory
-   you may change these macros if you want to log dynamic memory access
-
-*/
-
-#define NEW(PTR,TYP) {TYP _0_={0}; ERR_SP(PTR=malloc(sizeof(*PTR))); *PTR=_0_; }
-/*
-  allocates and initializes an object of type TYP and make PTR point to it
-  TYP must be defined with an appropriate typedef declaration, and
-  INIT(TYP) must follow the declaration to initialize a dummy initializer
-  object.
-*/
-
-#define NEW_STR(TO,FROM) {ERR_SP(TO=malloc(strlen(FROM)+1)); strcpy(TO,FROM); }
-
-#define MALLOC(SIZE) malloc(SIZE)
-#define FREE(PTR) { free(PTR); PTR=NULL; }
-
-#endif /* _MEM_UTIL_H_ */
diff --git a/tecs/myc_str.c b/tecs/myc_str.c
deleted file mode 100644
index 63c98e47..00000000
--- a/tecs/myc_str.c
+++ /dev/null
@@ -1,251 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include "myc_err.h"
-#include "myc_str.h"
-#include "myc_mem.h"
-
-char *str_splitx(char *str, char sep, char *list[], int *n) {
-  int i;
-  char *s, *e;
-
-  s=str;
-  for (i=0; i<*n; i++) {
-    list[i]=s;
-    e=strchr(s, sep);
-    if (e==NULL) { *n=i+1; return(NULL); }
-    s=e+1;
-    e--;
-    while (e>str && *e==' ') e--; /* trim sequence */
-    e[1]='\0';
-  }
-  return(s);
-}
-
-char *str_split1(char *str, char sep) {
-  char *s, *e;
-
-  e=strchr(str, sep);
-  if (e==NULL) {
-    s=NULL;
-    e=str+strlen(str);
-  } else {
-    s=e+1;
-  }
-  e--;
-  while (e>str && *e==' ') e--; /* trim sequence */
-  e[1]='\0';
-  return(s);
-}
-
-int str_ntrim(char *dest, const char *src, int ldest, int lsrc) {
-  int i;
-
-  if (lsrc>=ldest) lsrc=ldest-1;
-  if (dest!=src) strncpy(dest, src, lsrc);
-  dest[lsrc]='\0';
-  i=strlen(dest)-1;
-  while (i>=0 && dest[i]==' ') i--; /* trim sequence */
-  i++;
-  dest[i]='\0';
-  return(i);
-}
-
-int str_npad(char *dest, const char *src, int ldest) {
-  int i, lsrc;
-
-  lsrc=strlen(src);
-  if (lsrc>=ldest) {
-    if (dest!=src) strncpy(dest, src, ldest);
-    lsrc=ldest;
-  } else {
-    if (dest!=src) strcpy(dest, src);
-    for (i=lsrc; i<ldest; i++) {
-      dest[i]=' ';
-    }
-  }
-  return(lsrc);
-}
-
-char *str_nsplit(char *dst, const char *src, char sep, int dstlen) {
-  char *s;
-  int i;
-
-  s=strchr(src, sep);
-  if (s==NULL) {
-    s=NULL;
-    i=strlen(src);
-  } else {
-    i=s-src;
-    s++; /* skip separator */
-  }
-  if (i>=dstlen) {
-    str_copy(dst, src);
-  } else {
-    strncpy(dst, src, i);
-    dst[i]='\0';
-  }
-  return(s);
-}
-
-char *str_read_until(FILE *fil, char *term, char *buf, char *end) {
-  char fmt[24];
-  int i, l, siz;
-  char ch;
-
-  siz=end-buf-1;
-  if (siz<1) return(NULL);
-  sprintf(fmt, "%s%d[^%s%s", "%", siz, term, "]%n%c");
-  i=fscanf(fil, fmt, buf, &l, &ch);
-  if (i<0) { /* eof */
-    buf[0]='\0';
-    return(&buf[0]);
-  } else if (i==0) { /* fscanf returns 0 if first char is terminator */
-    buf[0]=fgetc(fil);
-    return(&buf[0]);
-  } else if (i==1) { /* terminator not found -> read until eof */
-    buf[l]='\0';
-    return(&buf[l]);
-  } else {
-    buf[l]=ch;
-    if (l==siz && NULL==strchr(term, ch)) return(NULL);
-    return(&buf[l]);
-  }
-}
-
-char *str_read_file(char *file) {
-  FILE *fil;
-  char *str, *s, *e, *p, *q;
-  int i, size;
-  struct stat statbuf;
-  
-  i=stat(file, &statbuf);
-  if (i<0) ERR_MSG("file not found");
-  size=statbuf.st_size+4;
-  ERR_SP(str=MALLOC(size));
-  e=&str[size-1];
-  ERR_SP(fil=fopen(file, "r"));
-  s=str;
-  while (1) {
-    p=str_read_until(fil, "!", s, e);
-    if (p==NULL) break;
-    if (*p=='!') {
-      q=str_read_until(fil, "\n", p, e);
-      if (q==NULL) { p=NULL; break; }
-      s=p; *s='\n'; s++;
-    } else {
-      assert(*p=='\0');
-      break;
-    }
-  }
-  ERR_SI(fclose(fil));
-  assert(strlen(str)<size);
-  return(str);
-  OnError: return(NULL);
-}
-
-void str_replace_char(char *str, char ch, char rep) {
-  char *s;
-
-  assert(ch!='\0' && ch!=rep);
-  s=strchr(str, ch);
-  while (s!=NULL) {
-    *s=rep;
-    s=strchr(s, ch);
-  }
-}
-
-int str_nsubstitute(char *result, char *str, char *old, char *new, int reslen) {
-  char *s, *p, *r;
-  int l, ln, lo;
-
-  p=str;
-  r=result;
-  ln=strlen(new);
-  lo=strlen(old);
-  s=strstr(p, old);
-  reslen--;
-  if (reslen<0) ERR_MSG("result buffer too short");
-  while (s!=NULL) {
-    l=s-p;
-    if (l>reslen) ERR_MSG("result buffer too short");
-    strncpy(r, p, l);
-    r+=l; reslen-=l;
-    if (ln>reslen) ERR_MSG("result buffer too short");
-    strncpy(r, new, reslen);
-    r+=ln; reslen-=ln;
-    p=s+lo;
-    s=strstr(p, old);
-  }
-  l=strlen(p);
-  if (l>reslen) ERR_MSG("result buffer too short");
-  strncpy(r, p, l);
-  r+=l;
-  *r='\0';
-  return(r-result);
-  OnError:
-    result[0]='\0';
-    return(-1);
-}
-
-void str_nupcase(char *dst, const char *src, int dstlen) {
-  dstlen--; /* space for trailing nul */
-  while (*src!='\0' && dstlen>0) {
-    *dst=toupper((int)*src);
-    dst++; src++;
-    dstlen--;
-  }
-  *dst='\0';
-}
-
-void str_nlowcase(char *dst, const char *src, int dstlen) {
-  dstlen--; /* space for trailing nul */
-  while (*src!='\0' && dstlen>0) {
-    *dst=tolower((int)*src);
-    dst++; src++;
-    dstlen--;
-  }
-  *dst='\0';
-}
-
-#ifndef __GNUC__
-int strcasecmp(const char *str1, const char *str2) {
-  int i;
-  char ch1, ch2;
-  ch1=tolower(*(str1++)); ch2=tolower(*(str2++));
-  i=1;
-  while (ch1!='\0' && ch2!='\0' && ch1==ch2) {
-    ch1=tolower(*(str1++)); ch2=tolower(*(str2++)); i++;
-  }
-  if (ch1<ch2) {
-    return(-i);
-  } else if (ch1>ch2) {
-    return(i);
-  }
-  return(0);
-}
-#endif
-
-int str_ncpy(char *dst, const char *src, int maxdest) {
-  strncpy(dst, src, maxdest);
-  if (dst[maxdest-1]!='\0') {
-    dst[maxdest-1]='\0';
-    ERR_MSG("destination string too short");
-  }
-  return(0);
-  OnError: return(-1);
-}
-
-int str_ncat(char *dst, const char *src, int maxdest) {
-  strncat(dst, src, maxdest-strlen(dst)-1);
-  if (dst[maxdest-1]!='\0') {
-    dst[maxdest-1]='\0';
-    ERR_MSG("destination string too short");
-  }
-  return(0);
-  OnError: return(-1);
-}
diff --git a/tecs/myc_str.h b/tecs/myc_str.h
deleted file mode 100644
index 95bdbfaf..00000000
--- a/tecs/myc_str.h
+++ /dev/null
@@ -1,122 +0,0 @@
-#ifndef _MYC_STR_H_
-#define _MYC_STR_H_
-
-#define MYC_NAN (-1.125/1024./1024./1024.)
-
-/*
-  use these macros if DST is a fixed length character array
-*/
-
-#define str_trim(DST,SRC,L)             str_ntrim(DST,SRC,sizeof(DST),L)
-#define str_pad(DST,SRC)                str_npad(DST,SRC,sizeof(DST))
-#define str_split(DST,SRC,SEP)          str_nsplit(DST,SRC,SEP,sizeof(DST))
-#define str_substitute(DST,SRC,OLD,NEW) str_nsubstitute(DST,SRC,OLD,NEW,sizeof(DST))
-#define str_upcase(DST,SRC)             str_nupcase(DST,SRC,sizeof(DST))
-#define str_lowcase(DST,SRC)            str_nlowcase(DST,SRC,sizeof(DST))
-#define str_copy(DST,SRC)               str_ncpy(DST,SRC,sizeof(DST))
-#define str_append(DST,SRC)             str_ncat(DST,SRC,sizeof(DST))
-
-
-char *str_split1(char *str, char separator);
-/*
-  trims text before separator in *str and returns
-  a pointer to the first character after separator
-*/
-
-char *str_splitx(char *str, char sep, char *list[], int *n);
-/*
-  split string into *n strings using separator sep.
-  spaces at the end of the elements are trimmed
-  attention: *str is modified ('\0' placed at the end of the elements)
-  
-  if *n separators are found, result points to string after *n-th separator
-  else result is NULL
-  *n contains number of elements stored in list
-*/
-
-int str_ntrim(char *dest, const char *src, int ldest, int lsrc);
-/*
-  copy characters 0 to lsrc-1 from src to dest (max ldest chars).
-*/
-
-int str_npad(char *dest, const char *src, int ldest);
-/*
-  copy src to dest and fill with spaces (fortran string format)
-*/
-
-char *str_nsplit(char *dst, const char *src, char sep, int dstlen);
-/*
-  returns a pointer to the text after the separator sep in *src
-  and copies the text before the separator to *dst
-  when *src does not contain the separator sep
-  NULL is returned, and *dst is a copy of *src
-*/
-
-char *str_read_file(char *file);
-/*
-  return one string containing the contents of file *file
-  comments separated by '!' are omitted. The caller must
-  free the result after use.
-*/
-
-void str_replace_char(char *str, char ch, char rep);
-/*
-  replace all occurences of character ch by character rep in string *str
-*/
-
-int str_nsubstitute(char *result, char *str, char *old, char *new, int reslen);
-/*
-  replace every instance of old in str by new.
-  the result must not overlap
-  if the result would be longer than reslen, the result is en empty string
-  and the return value is -1;
-  else the return value is the length of the result.
-  return one string containing the contents of file *file
-  the contents are treated in the following way:
-  - #0,#1,...#n is replaced by the corresponding argument *args[n] (n=0..nargs-1, nargs<10)
-  - at the end of each line spaces and comments separated by ! are trimmed
-*/
-
-void str_nupcase(char *dst, const char *src, int dstlen);
-/*
-  convert *str to uppercase
-*/
-
-void str_nlowcase(char *dst, const char *src, int dstlen);
-/*
-  convert *str to lowercase
-*/
-
-#ifdef __VMS_VER
-#if __VMS_VER<70000000
-
-int strcasecmp(const char *str1, const char *str2);
-/*
-  compare *str1 with *str2
-  the comparison is not case sensitive
-  if result=0: strings are equal
-  else
-    result>0 <==> *str1>*str2
-    first different character is at position abs(result)-1
-*/
-
-#else
-#include <strings.h>
-#endif /* __VMS_VER<70000000 */
-#else
-#include <strings.h>
-#endif /* __VMS_VER */
-
-int str_ncpy(char *dst, const char *src, int maxdest);
-/*
-  copy *src to *dest, maximal maxdest characters,
-  it is guaranteed, that dst contains '\0'
-*/
-
-int str_ncat(char *dst, const char *src, int maxdest);
-/*
-  append *src to *dest, maximal maxdest characters,
-  it is guaranteed, that dst contains '\0'
-*/
-
-#endif /* _MYC_STR_H_ */
diff --git a/tecs/myc_time.c b/tecs/myc_time.c
deleted file mode 100644
index 3daf1009..00000000
--- a/tecs/myc_time.c
+++ /dev/null
@@ -1,124 +0,0 @@
-#include <assert.h>
-#include <sys/time.h>
-#include <time.h>
-#if __VMS
-#include <sys/timeb.h>
-#endif
-#include "myc_fortran.h"
-#include "myc_time.h"
-
-
-static time_t my_base=0;
-
-void initBase(void) {
-  struct tm tim;
-  time_t now;
-
-  time(&now);
-  tim = *localtime(&now);
-  tim.tm_year = MYC_TIME_BASE / 10000 - 1900;
-  tim.tm_mon  = (MYC_TIME_BASE % 10000) / 100 - 1;
-  tim.tm_mday = MYC_TIME_BASE % 100;
-  tim.tm_hour = 12;
-  tim.tm_min  = 0;
-  tim.tm_sec  = 0;
-/* take daylight saving time flag and gmt offset from today */
-  my_base=mktime(&tim) - 12*3600;
-  assert(tim.tm_wday == 1); /* time base must be a monday */
-}
-
-int mycNow(void) {
-  time_t now;
-
-  if (my_base == 0) initBase();
-  time(&now);
-  return (int)(now-my_base);
-}
-
-int mycMsecSince(int since) {
-#if __VMS
-  struct timeb now;
-#else
-  struct timeval now;
-#endif
-  int msec;
-
-  if (my_base == 0) initBase();
-#if __VMS
-  ftime(&now);
-  msec = (now.time - my_base) % (24*3600) * 1000 + now.millitm - since;
-#else
-  gettimeofday(&now, NULL);
-  msec = (now.tv_sec - my_base) % (24*3600) * 1000 + now.tv_usec/1000 - since;
-#endif
-  if (msec < 0) msec+=24*3600000;
-  return msec;
-}
-
-int mycDate(int time) {
-  struct tm tim;
-  time_t t;
-
-  if (my_base == 0) initBase();
-  t = time + my_base;
-  tim=*localtime(&t);
-  return (tim.tm_year + 1900) * 10000 + (tim.tm_mon + 1) * 100 + tim.tm_mday;
-}
-
-int mycTime(int date) {
-  struct tm tim;
-  time_t t, now;
-  int y, m, d;
-
-  if (my_base == 0) initBase();
-  time(&now);
-  tim=*localtime(&now);
-  tim.tm_hour=0;
-  tim.tm_min=0;
-  tim.tm_sec=0;
-  if (date != 0) {
-    d = date % 100;
-    date = date / 100;
-    m = date % 100;
-    y = date / 100;
-    if (y == 0) {
-      if (m == 0) {
-        if (d > tim.tm_mday) {
-          if (tim.tm_mon == 0) { /* jan */
-            tim.tm_mon=11; /* dec */
-            tim.tm_year--;
-          } else {
-            tim.tm_mon--; /* last month */
-          }
-        }
-      } else {
-        tim.tm_mon = m - 1;
-      }
-    } else {
-      tim.tm_year = y - 1900;
-      if (m == 0) {
-        if (d == 0) {
-          tim.tm_mon = 0;
-        }
-      } else {
-        tim.tm_mon = m - 1;
-      }
-    }
-    if (d == 0) d = 1;
-    tim.tm_mday = d;
-  }
-  return (int)(mktime(&tim)-my_base);
-}
-
-
-/* fortran routines --------------------------------------------------
-*/
-
-#ifdef F_CHAR
-/* compile only when fortran c interface stuff is defined */
-
-int F_FUN(myc_now)(void) { return mycNow(); }
-int F_FUN(myc_date)(int *time) { return mycDate(*time); }
-int F_FUN(myc_time)(int *date) { return mycTime(*date); }
-
-#endif
diff --git a/tecs/myc_time.h b/tecs/myc_time.h
deleted file mode 100644
index 80142b78..00000000
--- a/tecs/myc_time.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _MYC_TIME_H_
-#define _MYC_TIME_H_
-
-#define MYC_TIME_BASE 20010101
-
-int mycNow(void);
-/*
-   return seconds since a Monday specified by MYC_TIME_BASE
-   mycNow() % (24*3600) is always 0 at 00:00 even in daylight saving time
-*/
-
-int mycMsecSince(int since);
-/*
-   mycMsecSince(0) return milliseconds since midnight
-   mycMsecSince(x) return milliseconds since x (x is time since midnight)
-*/
-
-int mycDate(int time);
-/*
-   return year * 10000 + month * 100 + day_of_month of a time obtained by mycNow
-   year > 1900
-   1 <= month <= 12
-   1 <= day_of_month <= 31
-*/
-
-int mycTime(int date);
-/*
-   does the inverse of MycDate. Chooses the last possible date not later than today
-*/
-
-/* the following subroutines are to be called from FORTRAN
-
-integer function myc_now()
-real function myc_date(time)
-integer function myc_time(date)
-
-integer time
-real date
-
-*/
-
-#endif /* _MYC_TIME_H_ */
diff --git a/tecs/myc_tmp.c b/tecs/myc_tmp.c
deleted file mode 100644
index bde43979..00000000
--- a/tecs/myc_tmp.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include "myc_fortran.h"
-#include "myc_mem.h"
-#include "myc_err.h"
-#include "myc_str.h"
-
-int MycTmpName(char *result, const char *name, int reslen) {
-  char tmp[128];
-  char *u;
-  
-  if (strlen(name)+64 > sizeof(tmp))
-    ERR_MSG("destination string too short"); /* do not accept too long names */
-  u=getenv("USER");
-  if (u==NULL)
-    ERR_MSG("USER undefined");
-  sprintf(tmp, "/tmp/%s_%s.%d", name, u, getpid());
-  ERR_I(str_ncpy(result, tmp, reslen));
-  return 0;
-  OnError:
-    return -1;
-}
-
-int MycCleanTmp(void) {
-  time_t tim;
-  static time_t last=0;
-  char file[128], line[1024], fullid[16];
-  char *sess=NULL, *files=NULL;
-  char *list, *id, *nxt, *nextline;
-  int i;
-  
-  time(&tim);
-  if (tim < last+3600) return 0; /* do not clean up before an hour after last time */
-  last=tim;
-  file[0]='\0';
-  ERR_I(MycTmpName(file, ".cleanup", sizeof(file)));
-  unlink(file);
-  /* make a list of used session and process id's */
-  sprintf(line, "ps -U $USER -o pid,sess > %s", file);
-  system(line);
-  ERR_P(sess=str_read_file(file));
-  unlink(file);
-  for (i=0; i<2; i++) {
-    if (i==0) {
-      sprintf(line,
-      "find /tmp/. ! -name . -prune -name \".*_$USER.*\" > %s", file);
-    } else {
-      sprintf(line,
-      "find /tmp/. ! -name . -prune -name \"*_$USER.*\" -mtime +7 > %s", file);
-    }
-    system(line);
-    ERR_P(files=str_read_file(file));
-    unlink(file);
-    str_replace_char(sess, '\n', ' ');
-    list=files;
-    while (*list != '\0') {
-      nextline=str_split1(list, '\n');
-      id=NULL;
-      nxt=list;
-      while (nxt != NULL) { /* find last dot */
-        id=nxt+1;
-        nxt=strchr(nxt+1, '.');
-      }
-      if (id!=NULL) { /* file contains a dot */
-        sprintf(fullid, " %.12s ", id);
-        if (strstr(sess, fullid)==NULL) {
-          unlink(list);
-        }
-      }
-      list=nextline;
-    }
-    FREE(files); files=NULL;
-  }
-  FREE(sess); sess=NULL;
-  return 0;
-  OnError:
-    if (file[0] != '\0') unlink(file);
-    if (sess!=NULL) FREE(sess);
-    if (files!=NULL) FREE(files);
-    return -1;
-}
-
-void F_FUN(sys_temp_name) ( F_CHAR(name), F_CHAR(path) F_CLEN(name) F_CLEN(path)) {
-  char nam[128];
-  char pat[1024];
-
-  STR_TO_C(nam, name);
-  MycTmpName(pat, nam, sizeof(pat));
-  STR_TO_F(path, pat);
-}
-
-void F_FUN(sys_clean_tmp) (void) {
-  MycCleanTmp();
-}
diff --git a/tecs/myc_tmp.h b/tecs/myc_tmp.h
deleted file mode 100644
index c9e1e38a..00000000
--- a/tecs/myc_tmp.h
+++ /dev/null
@@ -1,9 +0,0 @@
-int MycTmpName(char *result, const char *name, int reslen);
-/* generate a temporary filename containing 'name'.
- * the filename is stored in 'result' with less than 'reslen' characters.
- */
- 
-int MycCleanTmp(void);
-/* deletes temporary files from closed sessions. files not beginning with a
- * dot will be kept at least for 7 days (if the system does not delete then)
- */ 
diff --git a/tecs/rstart.c b/tecs/rstart.c
deleted file mode 100644
index c858af6e..00000000
--- a/tecs/rstart.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <netdb.h>
-#include "myc_str.h"
-#include "instr_hosts.h"
-
-int rexec(char **host, int port, char *user, char *passwd, char *command, int *err_file_desc);
-
-int main(int argc, char *argv[]) {
-  int port, i, j, l, fd;
-  char inst[32], cmd[256], host[256], user[64], pcod[64];
-  char *hostp;
-  struct tm tim;
-  time_t t;
-  
-  struct servent s;
-  
-  s=*getservbyname("exec", "tcp");
-  i=0;
-  if (argc < 3) {
-    printf("not enough arguments\n");
-    return 0;
-  }
-  i=InstrHost(argv[1], inst, host, user, pcod, sizeof(inst), sizeof(host), sizeof(user), sizeof(pcod));
-  if (i==0) {
-    printf("unknown host/instrument\n");
-    return -1;
-  }
-  str_copy(cmd, "");
-  for (i=2; i<argc; i++) {
-    if (0==strcmp(argv[i], "sics")) {
-      str_append(cmd, "bin/startsics\n");
-    } else if (0==strcmp(argv[i], "tecs")) {
-      if (i<argc) i++; /* skip argument */
-      str_append(cmd, "bin/startecs\n");
-    } else {
-      printf("unknown server %s\n", argv[i]);
-      return 0;
-    }
-  }
-  printf("login to %s\n", host);
-  hostp=host;
-  fd=rexec(&hostp, s.s_port, user, pcod, cmd, &i);
-  if (fd<0) {
-    perror("rexec"); return -1;
-  }
-  close(fd);
-  return 0;
-}
diff --git a/tecs/six.c b/tecs/six.c
deleted file mode 100644
index fc075447..00000000
--- a/tecs/six.c
+++ /dev/null
@@ -1,220 +0,0 @@
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <assert.h>
-#include <string.h>
-#include <stdio.h>
-#include "coc_util.h"
-#include "myc_err.h"
-#include "myc_str.h"
-#include "term.h"
-
-int CocCreateSockAdr(
-    struct sockaddr_in *sockaddrPtr,    /* Socket address */
-    const char *host,                   /* Host.  NULL implies INADDR_ANY */
-    int port)                           /* Port number */
-{
-    struct hostent *hostent;            /* Host database entry */
-    struct in_addr addr;                /* For 64/32 bit madness */
-
-    (void) memset((char *) sockaddrPtr, '\0', sizeof(struct sockaddr_in));
-    sockaddrPtr->sin_family = AF_INET;
-    sockaddrPtr->sin_port = htons((unsigned short) (port & 0xFFFF));
-    if (host == NULL || host[0]=='\0') {
-        addr.s_addr = INADDR_ANY;
-    } else {
-        hostent = gethostbyname(host);
-        if (hostent != NULL) {
-            memcpy((char *) &addr,
-                (char *) hostent->h_addr_list[0], (size_t) hostent->h_length);
-        } else {
-            addr.s_addr = inet_addr(host);
-            if (addr.s_addr == (unsigned long)-1) {
-                return -1;       /* error */
-            }
-        }
-    }
-    /*
-     * There is a rumor that this assignment may require care on
-     * some 64 bit machines.
-     */
-
-    sockaddrPtr->sin_addr.s_addr = addr.s_addr;
-    return 0;
-}
-
-int readWrite(int fd, int skip) {
-  char msg[128];
-  int l, i, go, iret, ires, n;
-/*
- * read from fd and write to stdout until a key pressed,
- * a timeout occured (1 or 5 sec.), or a <go ahead> message
- * received.
- * skip=0: timeout 1 sec (normal behaviour)
- * skip>0: timeout 5 sec.
- * skip>1: swallow text
- * skip=1,2: return 0 if SICS not found in message text
- * skip=3: return 0 if not acknowledged
- */
-  n=0;
-  go=0;
-  ires=0;
-  iret=term_wait_fd(fd, skip?5000:1000);
-  while (iret==1) {
-    ERR_SI(l=recv(fd, msg, sizeof(msg)-1, 0));
-  /*  if (l==0) return(0); */
-    msg[l]='\0';
-    if (skip==3) {
-      if (NULL!=strstr(msg, "Acknowledged")) ires=1;
-    } else if (skip==1 || skip==2) {
-      if (NULL!=strstr(msg, "SICS")) ires=1;
-    }
-    for (i=0; i<l-1; i++) {
-      if (msg[i]==-1 && msg[i+1]==-7) { /* go ahead */
-        go=1;
-        msg[i]='<'; msg[i+1]='>';
-      } else {
-        go=0;
-      }
-    }
-    if (skip<2 || skip==2 && ires==0) {
-      fputs(msg, stdout);
-    } else {
-      n+=strlen(msg);
-    }
-    if (go) break;
-    iret=term_wait_fd(fd, skip?5000:1000);
-  }
-  if (n==0 && ires==1) return 1;
-  return ires*n;
-  OnError: return -1;
-}
-
-int main (int argc, char *argv[]) {
-  int iret, pos;
-  fd_set mask;
-  int fd, l, i, j, port, skip;
-  char buf[128], lbuf[16], ibuf[64];
-  char *rights, *instr, *sim="", *us, *ps;
-
-  struct sockaddr_in sadr;
-
-  port=1301;
-  skip=2;
-  j=0;
-  for (i=1; i<argc; i++) {
-    if (0==strcmp(argv[i], "-s")) {
-      port=1303; sim="-sim";
-    } else if (0==strcmp(argv[i], "-w")) {
-      skip=1;
-    } else {
-      if (strlen(argv[i])>=32) {
-	printf("argument too long\n");
-      } else {
-	if (j==0) {
-	  us=argv[i];
-	  j=1;
-	} else if (j==1) {
-	  ps=argv[i];
-	  j=2;
-	} else {
-	  printf("too many arguments\n");
-	  return 0;
-	}
-      }
-    }
-  }
-  if (j==1) {
-    printf("missing password\n");
-    return(0);
-  }
-  instr=getenv("Instrument");
-  if (instr==NULL || instr[0]=='\0') {
-    printf("Instrument is undefined\n");
-    return(0);
-  }
-  ERR_I(CocCreateSockAdr(&sadr, "0", port));
-  ERR_SI(fd=socket(AF_INET, SOCK_STREAM, 0));
-  term_reg_socket(fd);
-  ERR_SI(connect(fd, (struct sockaddr *)&sadr, sizeof(sadr)));
-  strcpy(buf, "sicslogin Spy 007\r\n");
-  ERR_SI(send(fd, buf, strlen(buf), 0));
-  ERR_I(i=readWrite(fd,skip));
-  if (!i) {
-    printf("rejected\n");
-    return 0;
-  }
-  if (skip==2) printf("reading welcome message ...\n");
-  if (j==0) {
-    rights=getenv("six_rights");
-    if (rights!=NULL && 0==strcmp(rights, instr)) {
-      us="lnsmanager";
-      ps="lnsSICSlns";
-    } else {
-      sprintf(ibuf, "%suser", instr);
-      str_lowcase(ibuf, ibuf);
-      us=ibuf;
-      ps="03lns1";
-    }
-  }
-  sprintf(buf, "config Rights %s %s\r\n", us, ps);
-  ERR_SI(send(fd, buf, strlen(buf), 0));
-  ERR_I(i=readWrite(fd,3));
-  if (!i) {
-    us="Spy";
-  }
-  printf("\rlogged in to SICS as %s on %s%s\n", us, instr, sim);
-/*
-  if (*sim!='\0') {
-    strcpy(buf, "sync\r\n");
-    ERR_SI(send(fd, buf, strlen(buf), 0));
-    ERR_I(i=readWrite(fd,1));
-  }
-*/
-  iret=1;
-  buf[0]='\0';
-  pos=0;
-  str_lowcase(instr,instr);
-  sprintf(ibuf, "six[%s%s] ", instr, sim);
-  while (1) {
-    FD_ZERO(&mask);
-    FD_SET(fd, &mask);
-    iret=term_get_line(buf, sizeof(buf)-2, &pos, ibuf, &mask);
-    if (iret==STDIN_FILENO) { /* input line terminated */
-      str_lowcase(lbuf, buf);
-      if (0==strcmp(lbuf,"quit")) break;
-      if (0==strcmp(lbuf,"exit")) break;
-      if (0==strcmp(lbuf,"stop")) {
-        strcpy(buf, "INT1712 3");
-      } else if (0==strcmp(buf, "")) {
-        strcpy(buf, "status");
-      }
-      fputs("\n", stdout);
-      skip=0;
-      if (0==strcmp(lbuf,"sync")) skip=1;
-      l=strlen(buf);
-/*
-      printf("sent> %s[%d chars]\n", buf, l);
-*/
-      buf[l]=13;
-      buf[l+1]=10;
-      ERR_SI(send(fd, buf, l+2, 0));
-      ERR_I(i=readWrite(fd,skip));
-      buf[0]='\0';
-      pos=0;
-    } else if (iret<0) { /* ?? */
-      printf("\nwhat?\n"); exit(1);
-    } else { /* socket iret ready to read */
-      assert(fd==iret);
-      ERR_I(readWrite(fd,0));
-    }
-  }
-  fputs("\n", stdout);
-  return(0);
-  OnError:
-    ErrShow("end");
-    return(0);
-}
diff --git a/tecs/str.f b/tecs/str.f
deleted file mode 100644
index 5bd82c10..00000000
--- a/tecs/str.f
+++ /dev/null
@@ -1,131 +0,0 @@
-!! string handling
-!!
-	subroutine STR_TRIM(RETSTR, STR, RETLEN) !!
-!!
-!! if RETSTR=STR then RETSTR is not touched
-!!
-!! Arguments:
-	character*(*) STR, RETSTR !! in,out
-	integer RETLEN    	!! out
-	integer i
-
-	i=len(str)
-	if (str(1:1) .gt. ' ') then
-10	  if (str(i:i) .le. ' ') then
-	    i=i-1
-	    goto 10
-	  endif
-	else
-20	  if (str(i:i) .le. ' ') then
-	    if (i .gt. 1) then
-	      i=i-1
-	      goto 20
-	    endif
-	  endif
-	endif
-	retlen=min(len(retstr),i)
-	if (retstr .ne. str) then ! avoid copy to retstr if equal
-	  retstr=str(1:i)
-	endif
-	end
-
-!!
-	subroutine STR_UPCASE(RETSTR, STR) !!
-!!
-!! Arguments:
-	character STR*(*), RETSTR*(*)	!! in,out
-	integer i, ch
-
-	retstr=str
-	do i=1,len(retstr)
-	  ch=ichar(retstr(i:i))
-	  if (ch .ge. ichar('a') .and. ch .le. ichar('z')) then
-	    retstr(i:i)=char(ch-(ichar('a')-ichar('A')))
-	  endif
-	enddo
-	end
-
-!!
-	subroutine STR_LOWCASE(RETSTR, STR) !!
-!!
-!! Arguments:
-	character STR*(*), RETSTR*(*)	!! in,out
-	integer i, ch
-
-	retstr=str
-	do i=1,len(retstr)
-	  ch=ichar(retstr(i:i))
-	  if (ch .ge. ichar('A') .and. ch .le. ichar('Z')) then
-	    retstr(i:i)=char(ch+(ichar('a')-ichar('A')))
-	  endif
-	enddo
-	end
-
-!!
-	subroutine STR_APPEND(str, length, add) !!
-!!
-	implicit none
-
-	character*(*) str, add !!
-	integer length         !!
-
-	if (len(add)+length .gt. len(str)) then
-	  if (length .lt. len(str)) then
-	    str(length+1:)=add
-	    length=len(str)
-	  endif
-	else
-	  str(length+1:length+len(add))=add
-	  length=length+len(add)
-	endif
-	end
-
-!!
-	integer function STR_CMP(str1, str2) !!
-!!
-!! if strings are equal: return 0
-!! else return position of first different character
-
-	character str1*(*), str2*(*) !!
-
-	integer i
-
-	do i=0,min(len(str1),len(str2))-1
-	  if (str1(i+1:i+1) .ne. str2(i+1:i+1)) then
-	    str_cmp=i+1
-	    return
-	  endif
-	enddo
-	do i=len(str1),len(str2)-1
-	  if (str2(i+1:i+1) .ne. ' ') then
-	    str_cmp=i+1
-	    return
-	  endif
-	enddo
-	do i=len(str2),len(str1)-1
-	  if (str1(i+1:i+1) .ne. ' ') then
-	    str_cmp=i+1
-	    return
-	  endif
-	enddo
-	str_cmp=0
-	return
-	end
-
-!!
-	subroutine STR_FIRST_NONBLANK(STR, POS) !!
-!!
-!! Arguments:
-	character*(*) STR       !! in
-	integer POS             !! out
-	integer i
-
-	do i=1,len(str)
-	  if (str(i:i) .gt. ' ') then
-	    pos=i
-	    return
-	  endif
-	enddo
-	pos=0
-	end
-
diff --git a/tecs/sys_cmdpar.f b/tecs/sys_cmdpar.f
deleted file mode 100755
index 1bed707b..00000000
--- a/tecs/sys_cmdpar.f
+++ /dev/null
@@ -1,23 +0,0 @@
-!!-----------------------------------------------------------------------------
-!!
-	subroutine SYS_GET_CMDPAR(STR, L)	!!
-!!	---------------------------------
-!!
-	character*(*) STR !!
-	integer L	!!
-
-        integer i,iargc
-        
-	l=0
-	str=' '
-	do i=1,iargc()
-	  if (l .lt. len(str)) then
-	    call getarg(i, str(l+1:))
-	    call str_trim(str, str, l)
-	    l=l+1
-	  endif
-	enddo
-	if (l .gt. 0) then
-	  if (str(1:l) .eq. ' ') l=0
-	endif
-	end
diff --git a/tecs/sys_date.f b/tecs/sys_date.f
deleted file mode 100755
index b92a8767..00000000
--- a/tecs/sys_date.f
+++ /dev/null
@@ -1,18 +0,0 @@
-!!-----------------------------------------------------------------------------
-!!
-        subroutine SYS_DATE(YEAR, MONTH, DAY) !!
-!!      -------------------------------------
-!!
-!! get actual date
-!!
-        integer YEAR, MONTH, DAY !! 4-Digits year, month and day
-
-        integer tarray(9)
-        external time
-        integer time
-
-        call ltime(time(), tarray)
-        day=tarray(4)
-        month=tarray(5)+1   ! tarray(5): months since january (0-11)!
-        year=tarray(6)+1900 ! tarray(6): years since 1900, no y2k problem
-        end
diff --git a/tecs/sys_env.c b/tecs/sys_env.c
deleted file mode 100755
index 6a8d2ef8..00000000
--- a/tecs/sys_env.c
+++ /dev/null
@@ -1,179 +0,0 @@
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <termios.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <utmp.h>
-#include "myc_tmp.h"
-#include "myc_str.h"
-#include "myc_fortran.h"
-
-#define ENAM_LEN 128
-#define EVAL_LEN 1024
-
-int lnblnk_(const char *str, int len);
-#ifdef __alpha
-  int setenv(char *p1, char *p2, int ow);
-#endif
-
-typedef struct _EnvList { struct _EnvList *next; char *name; char *value; } EnvList;
-static EnvList *envlist;
-static char tmpfil[128];
-static char senv_id[16];
-static char *empty="";
-static int loaded=0;
-static int dirty=0;
-
-EnvList *sys_findenv(char *name) {
-  EnvList *p;
-  for (p=envlist; p!=NULL; p=p->next) {
-    if (0==strcmp(name, p->name)) {
-      return p;
-    }
-  }
-  return NULL;
-}
-
-int F_FUN(sys_loadenv)(void) {
-  FILE *fil;
-  char buf[ENAM_LEN+EVAL_LEN+10];
-  char old[EVAL_LEN], userid[32];
-  char *nam, *val, *pold, *u, *ret, *v;
-  int l;
-  EnvList *p;
-  
-  if (!loaded) {
-    loaded=-1; /* assume failure */
-    /* u=cuserid(userid); */
-    u=getenv("USER");
-    if (u==NULL) {
-      strcpy(userid, "Anonymous");
-    } else {
-      strncpy(userid, u, sizeof(userid));
-    }
-    val=getenv("senv_id");
-    if (val==NULL) {
-      sprintf(senv_id, "%d", getppid());
-    } else {
-      strcpy(senv_id, val);
-    }
-    sprintf(tmpfil, "/tmp/.senv_%s.%s", userid, senv_id);
-    fil=fopen(tmpfil, "r");
-    if (fil==NULL) {
-      loaded=1;
-      return 1;
-    }
-    while (1) {
-
-      ret=fgets(buf, sizeof(buf), fil);
-      if (!ret || buf[0]=='#') break;
-      l=strlen(buf);
-      if (l<10 || buf[l-1]!='\n') return -1;
-      buf[l-1]='\0';
-      buf[6]='\0';
-      if (0!=strcmp(buf, "setenv")) return -1;
-      nam=buf+7;
-      val=strchr(nam, ' ');
-      if (val==NULL) return -1;
-      *val='\0'; val++;
-      if (*val=='"') {
-	if (buf[l-2]!='"') return -1;
-	buf[l-2]='\0';
-	val++;
-      }
-      
-      ret=fgets(old, sizeof(old), fil);
-      if (!ret) break;
-      l=strlen(old);
-      if (l==0 || old[0]!='#' || old[l-1]!='\n') return -1;
-      old[l-1]='\0';
-      pold=old+1;
-
-      v=getenv(nam);
-      if (v==NULL) v=empty;
-      if (0==strcmp(v,pold)) { /* take value from file only if env. variable not changed in the meantime */
-        p = malloc(sizeof(*p)); if (p == NULL) goto senv;
-        if (NULL==(p->name = strdup(nam))) goto senv;
-        if (NULL==(p->value = strdup(v))) goto senv;
-        p->next = envlist;
-        envlist=p;
-	senv:
-	setenv(nam, val, 1);
-      }
-    }
-    if (0>fclose(fil)) return -1;
-    loaded=1;
-  }
-  return loaded;
-}
-
-int F_FUN(sys_setenv)(char *enam, char *eval, int snam, int sval) {
-  int lnam, lval;
-  char *v, nam[ENAM_LEN], val[EVAL_LEN];
-  EnvList *p=NULL;
-  
-  lnam = lnblnk_(enam,snam);
-  if (lnam>=sizeof(nam)) lnam=sizeof(nam)-1;
-  strncpy(nam,enam,lnam); nam[lnam] = '\0';
-
-  lval = lnblnk_(eval,sval);
-  if (lval>=sizeof(val)) lval=sizeof(val)-1;
-  strncpy(val,eval,lval); val[lval] = '\0';
-
-  if (loaded>0) {
-    v=getenv(nam);
-    if (v == NULL) v=empty;
-    if (!dirty) {
-      dirty = 0 != strcmp(val,v);
-    }
-    p=sys_findenv(nam);
-    if (p==NULL) {  
-      p = malloc(sizeof(*p)); if (p == NULL) goto senv;
-      if (NULL==(p->name = strdup(nam))) goto senv;
-      if (NULL==(p->value = strdup(v))) goto senv;
-      p->next = envlist;
-      envlist=p;
-    }
-  }
-  senv:
-  return setenv(nam, val, 1);
-}
-
-int F_FUN(sys_saveenv)(void) {
-  FILE *fil;
-  char *v;
-  EnvList *p;
-  
-  if (F_FUN(sys_loadenv)()<0 || !dirty) return loaded;
-  
-  fil=fopen(tmpfil, "w");
-  if (fil==NULL) return -1;
-
-  for (p=envlist; p!=NULL; p=p->next) {
-    v=getenv(p->name);
-    if (0!=strcmp(v, p->value)) {
-      if (0>fputs("setenv ", fil)) return -1;
-      if (0>fputs(p->name, fil)) return -1;
-      if (0>fputs(" \"", fil)) return -1;
-      if (0>fputs(v, fil)) return -1;
-      if (0>fputs("\"\n#", fil)) return -1;
-      if (0>fputs(p->value, fil)) return -1;
-      if (0>fputs("\n", fil)) return -1;
-    }
-  }
-  if (0>fputs("#\nif ($$ == ", fil)) return -1;
-  if (0>fputs(senv_id, fil)) return -1;
-  if (0>fputs(") then\n /bin/rm ", fil)) return -1;
-  if (0>fputs(tmpfil, fil)) return -1;
-/*
-  if (0>fputs("\n echo \"#\" > ", fil)) return -1;
-  if (0>fputs(tmpfil, fil)) return -1;
-*/
-  if (0>fputs("\nendif\n", fil)) return -1;
-  if (0>fclose(fil)) return -1;
-  dirty=0;
-  return 0;
-}
diff --git a/tecs/sys_get_key.f b/tecs/sys_get_key.f
deleted file mode 100644
index 8ae39114..00000000
--- a/tecs/sys_get_key.f
+++ /dev/null
@@ -1,52 +0,0 @@
-!!-----------------------------------------------------------------------------
-!!
-	subroutine SYS_GET_KEY(KEY, TMO) !!
-!!
-!! read for keyboard with timeout, without echo
-!!
-	character KEY*1 !!
-	integer TMO !! timeout in seconds (<100)
-
-	character esc*1, csi*1, ss3*1
-
-        esc=char(27)
-        csi=char(155)
-        ss3=char(143)
-	
-	call sys_get_raw_key(key, tmo)
-1	if (key .eq. esc) then
-	  call sys_get_raw_key(key, tmo)
-	  if (key .eq. 'O') then
-	    key=ss3
-	    goto 1
-	  elseif (key .eq. '[') then
-	    key=csi
-	    goto 1
-	  endif
-	elseif (key .eq. csi) then
-	  call sys_get_raw_key(key, tmo)
-	  do while (key .ge. '0' .and. key .le. '9') 
-	    call sys_get_raw_key(key, tmo)
-	  enddo
-	  key=' '
-	elseif (key .eq. ss3) then
-	  call sys_get_raw_key(key, tmo)
-	  if (key .eq. 'm') then
-	    key='-'
-	  elseif (key .eq. 'l') then
-	    key='+'
-	  elseif (key .eq. 'n') then
-	    key='.'
-	  elseif (key .eq. 'M') then
-	    key=char(13)
-	  elseif (key .eq. 'S') then
-	    key='*'
-	  elseif (key .eq. 'R') then
-	    key='/'
-	  elseif (key .eq. 'Q') then
-	    key='='
-	  else
-	    key=' '
-	  endif
-	endif
-	end
diff --git a/tecs/sys_getenv.f b/tecs/sys_getenv.f
deleted file mode 100755
index ca1243a1..00000000
--- a/tecs/sys_getenv.f
+++ /dev/null
@@ -1,75 +0,0 @@
-!!------------------------------------------------------------------------------
-!!
-	subroutine SYS_GETENV(NAME, VALUE)	!!
-!!	==================================
-!!
-!! Get environment variable NAME
-!! try all uppercase also
-
-	implicit none
-!! Arguments:
-	character*(*) NAME		!! logical name
-	character*(*) VALUE		!! result
-
-	integer l
-        character nam*128
-
-	call sys_loadenv
-	call str_trim(nam, name, l)
-	call getenv(nam(1:l), value)
-        if (value .ne. ' ') RETURN
-        if (nam(1:1) .ge. 'a') then
-          call str_upcase(nam(1:l), nam(1:l))
-        else
-          call str_lowcase(nam(1:l), nam(1:l))
-        endif
-	call getenv(nam(1:l), value)
-	end
-
-!!------------------------------------------------------------------------------
-!!
-	subroutine SYS_GETENV_IDX(NAME, VALUE, IDX)	!!
-!!	===========================================
-!!
-!! Get environment variable NAME, only list element IDX (start with 0)
-!! (separated by comma)
-
-	implicit none
-!! Arguments:
-	character*(*) NAME		!! logical name
-	character*(*) VALUE		!! result
-	integer IDX			!! index
-
-	integer l,pos,j,i
-        character nam*128, list*1024
-
-	call str_trim(nam, name, l)
-	call getenv(nam(1:l), list)
-        if (list .eq. ' ') then
-          if (nam(1:1) .ge. 'a') then
-            call str_upcase(nam(1:l), nam(1:l))
-          else
-            call str_lowcase(nam(1:l), nam(1:l))
-          endif
-	  call getenv(nam(1:l), list)
-	endif
-        pos=0
-        do i=1,idx
-          j=index(list(pos+1:), ',')
-          if (j .eq. 0) then
-            value=' '
-            RETURN
-          endif
-	  pos=pos+j
-        enddo
-        j=index(list(pos+1:), ',')
-        if (j .eq. 1) then
-          value=' '
-          RETURN
-        endif
-        if (j .le. 0) then
-          value=list(pos+1:)
-        else
-          value=list(pos+1:pos+j-1)
-	endif
-	end
diff --git a/tecs/sys_lun.f b/tecs/sys_lun.f
deleted file mode 100755
index 4b2f703e..00000000
--- a/tecs/sys_lun.f
+++ /dev/null
@@ -1,43 +0,0 @@
-!!-----------------------------------------------------------------------------
-!!
-	subroutine SYS_GET_LUN(LUN)    !!
-!!
-!! allocate logical unit number
-!!
-	integer LUN     !! out
-
-	logical*1 act(50:100)/51*.false./
-	common /sys_lun/act
-
-	integer l
-
-	l=50
-	do while (l .lt. 99 .and. act(l))
-	  l=l+1
-	enddo
-	if (l .eq. 100) stop 'SYS_GET_LUN: no more luns available'
-	lun=l
-	act(l)=.true.
-	end
-
-
-!!-----------------------------------------------------------------------------
-!!
-	subroutine SYS_FREE_LUN(LUN)    !!
-!!
-!! deallocate logical unit number
-!!
-	integer LUN     !! in
-
-	logical*1 act(50:100)/51*.false./
-	common /sys_lun/act
-
-	if (lun .lt. 50 .or. lun .gt. 99) then
-	  stop 'SYS_FREE_LUN: illegal lun'
-	endif
-	if (act(lun)) then
-	  act(lun)=.false.
-	else
-	  stop 'SYS_FREE_LUN: lun already free'
-	endif
-	end
diff --git a/tecs/sys_open.f b/tecs/sys_open.f
deleted file mode 100755
index 9ccf0a9d..00000000
--- a/tecs/sys_open.f
+++ /dev/null
@@ -1,55 +0,0 @@
-!!-----------------------------------------------------------------------------
-!!
-        subroutine SYS_OPEN(LUN, FILE, ACCESS, IOSTAT)   !!
-!!      ==============================================
-!!
-!! ACCESS='r': open file for read
-!! ACCESS='w': open or create file for write (on vms: new version, on unix: overwrite)
-!! ACCESS='wo': overwrite existing file (do not make a new version)
-!! ACCESS='wn': keep old file (on unix systems, a tilde '~' is appended to the name)
-!! ACCESS='a': open or create file for append
-
-        integer LUN          !! (in) logical unit number
-        character FILE*(*)   !! (in) filename
-        character ACCESS*(*) !! (in) access mode
-        integer IOSTAT       !! (out) status
-
-        character acc*2
-	character amnt*128
-	integer i,j,l,ios
-	real s
-	
-        call str_upcase(acc, access)
-
-        if (acc .eq. 'R') then
-	  open(lun, name=file, iostat=iostat, status='old')
-	  if (iostat .eq. 0) RETURN ! success
-	  l=0
-	  i=1
-	  do while (i .ne. 0)
-	    l=l+i
-	    i=index(file(l+1:),'/')
-	  enddo
-	  if (l .eq. 1) RETURN ! no directory given
-	  open(lun, name=file(1:l-1), iostat=ios, status='old')
-	  if (ios .eq. 0) then
-	    close(lun)
-	    RETURN ! directory exists -> already mounted
-	  endif
-	  call sys_getenv('dat_automount', amnt)
-	  if (amnt .eq. ' ') RETURN
-	  call sys_cmd(amnt) !try to mount
-	  open(lun, name=file, iostat=iostat, status='old')	  
-        else if (acc .eq. 'W' .or. acc .eq. 'WO') then
-	  open(lun, name=file, iostat=iostat, status='unknown')
-        else if (acc .eq. 'WN') then
-        ! rename to be done
-          open(lun, name=file, iostat=iostat, status='unknown')
-        else if (acc .eq. 'A') then
-	  open(lun, name=file, iostat=iostat, status='unknown'
-	1, access='append')
-        else
-          print *,'unknown access mode: ',acc
-          stop 'error in SYS_OPEN'
-        endif
-        end
diff --git a/tecs/sys_open_alpha.f b/tecs/sys_open_alpha.f
deleted file mode 100755
index 185db865..00000000
--- a/tecs/sys_open_alpha.f
+++ /dev/null
@@ -1,54 +0,0 @@
-!!-----------------------------------------------------------------------------
-!!
-        subroutine SYS_OPEN(LUN, FILE, ACCESS, IOSTAT)   !!
-!!      ==============================================
-!!
-!! ACCESS='r': open file for read
-!! ACCESS='w': open or create file for write (on vms: new version, on unix: overwrite)
-!! ACCESS='wo': overwrite existing file (do not make a new version)
-!! ACCESS='wn': keep old file (on unix systems, a tilde '~' is appended to the name)
-!! ACCESS='a': open or create file for append
-
-        integer LUN          !! (in) logical unit number
-        character FILE*(*)   !! (in) filename
-        character ACCESS*(*) !! (in) access mode
-        integer IOSTAT       !! (out) status
-
-        character acc*2
-	character amnt*128
-	integer i,j,l,ios
-	
-        call str_upcase(acc, access)
-
-        if (acc .eq. 'R') then
-	  open(lun, name=file, iostat=iostat, status='old', readonly)
-	  if (iostat .eq. 0) RETURN
-	  l=0
-	  i=1
-	  do while (i .ne. 0)
-	    l=l+i
-	    i=index(file(l+1:),'/')
-	  enddo
-	  if (l .eq. 1) RETURN ! no directory given
-	  open(lun, name=file(1:l-1), iostat=ios, status='old')
-	  if (ios .eq. 0) then
-	    close(lun)
-	    RETURN ! directory exists -> already mounted
-	  endif
-	  call sys_getenv('dat_automount', amnt)
-	  if (amnt .eq. ' ') RETURN
-	  call sys_cmd(amnt) !try to mount
-	  open(lun, name=file, iostat=iostat, status='old', readonly)
-        else if (acc .eq. 'W' .or. acc .eq. 'WO') then
-	  open(lun, name=file, iostat=iostat, status='unknown')
-        else if (acc .eq. 'WN') then
-        ! rename to be done
-          open(lun, name=file, iostat=iostat, status='unknown')
-        else if (acc .eq. 'A') then
-	  open(lun, name=file, iostat=iostat, status='unknown'
-	1, access='append')
-        else
-          print *,'unknown access mode: ',acc
-          stop 'error in SYS_OPEN'
-        endif
-        end
diff --git a/tecs/sys_rdline.c b/tecs/sys_rdline.c
deleted file mode 100755
index 61a4af6d..00000000
--- a/tecs/sys_rdline.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <assert.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include "myc_str.h"
-#include "myc_fortran.h"
-
-static char *last_line = NULL;
-
-char *readline (char *prompt);
-void add_history(const char *line);
-
-void F_FUN(sys_rd_line)(F_CHAR(cmd), int *retlen, F_CHAR(prompt) F_CLEN(cmd) F_CLEN(prompt))
-{
-  char *line_read;
-  char p0[64], p[64];
-
-  STR_TO_C(p0, prompt);
-  str_copy(p, "\n");
-  str_append(p, p0);
-  if (last_line == NULL) { last_line =malloc(1); last_line[0] = '\0';};
-
-  line_read = readline(p);
-
-  if (line_read)
-  {  
-    if (*line_read && strcmp(last_line, line_read)!=0)
-      add_history (line_read);
-    free (last_line);
-    STR_TO_F(cmd, line_read);
-    *retlen=strlen(line_read);
-    last_line = line_read;
-    if (*retlen>F_LEN(cmd)) *retlen=F_LEN(cmd);
-  } else {
-    *retlen=-1;
-  }
-}
diff --git a/tecs/sys_select.c b/tecs/sys_select.c
deleted file mode 100644
index 6f9e87dc..00000000
--- a/tecs/sys_select.c
+++ /dev/null
@@ -1,91 +0,0 @@
-#include <termios.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/time.h>
-
-static int lastFd=-1;
-static struct termios atts;
-
-void sys_keys_on(void) {
-  int iret;
-  
-  struct termios attr;
-  iret=tcgetattr(STDIN_FILENO,&attr);
-  atts=attr; /* save term. attr. */
-  if (iret!=0) { perror("***\n");}
-  attr.c_lflag &= ~(ICANON) & ~(ECHO); /* canonical mode off, echo off */
-  attr.c_cc[VMIN]=0;
-  attr.c_cc[VTIME]=1; /* 0.1 sec */
-  iret= tcsetattr(STDIN_FILENO,TCSANOW,&attr);
-  if (iret!=0) {perror("***\n");}
-}
-
-void sys_keys_off(void) {
-  int iret;
-  
-  iret=tcsetattr(STDIN_FILENO,TCSANOW,&atts); /* restore term. attributes */
-  if (iret!=0) {perror("***\n");};
-}
-
-int sys_select_or_key(fd_set *mask, int msecTmo, char *key) {
-  int chan, fd, iret, fd1, m, chr;
-  struct timeval tmo, tmo0={0,0};
-  fd_set rmask;
-  static int init=1;
-  
-  if (init) {
-    sys_keys_on();
-    init=0;
-  }
-  rmask=*mask;
-  iret=select(FD_SETSIZE, &rmask, NULL, NULL, &tmo0);
-  if (iret<0) {
-    FD_ZERO(&rmask);
-    perror("error in select");
-  }
-  fd1=STDIN_FILENO;
-  chr=fgetc(stdin);
-  if (chr==EOF && iret==0) {
-    rmask=*mask;
-    FD_SET(STDIN_FILENO, &rmask);
-    if (msecTmo>=0) {
-      if (msecTmo>100) { /* reduce 100 ms for the 1 tenth second in fgetc */
-	msecTmo=msecTmo-100;
-      } else {
-	msecTmo=1;
-      }
-      tmo.tv_sec=msecTmo / 1000;
-      tmo.tv_usec=(msecTmo%1000)*1000;
-      iret=select(FD_SETSIZE, &rmask, NULL, NULL, &tmo);
-    } else {
-      iret=select(FD_SETSIZE, &rmask, NULL, NULL, NULL);    
-    }
-    if (iret<0) {
-      FD_ZERO(&rmask);
-      perror("error in select");
-    }
-    if (FD_ISSET(STDIN_FILENO, &rmask)) {
-      chr=fgetc(stdin);
-    }
-    FD_CLR(STDIN_FILENO, &rmask);
-  }
-  if (chr==EOF) {
-    chr=0;
-    fd1=-1;
-    for (fd=1; fd<FD_SETSIZE; fd++) {
-      if (FD_ISSET(fd, &rmask)) {
-	if (fd1<0) {
-	  fd1=fd; /* first fd */
-	} else if (fd>lastFd) {
-	  fd1=fd; break;
-	}
-      }
-    }
-  }
-  *mask=rmask;
-  *key=chr;
-  /*
-  sys_keys_off();
-  */
-  return(fd1);
-}
diff --git a/tecs/sys_select.h b/tecs/sys_select.h
deleted file mode 100644
index ac18468a..00000000
--- a/tecs/sys_select.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef SYS_SELECT_H_
-#define SYS_SELECT_H_
-
-#include <sys/time.h>
-
-int sys_select_or_key(fd_set *mask, int msecTmo, char *key);
-
-/* wait for read event on sockets included in mask or from keyboard or a timeout
-   result is negative for timeout,
-   STDIN_FILENO for a key pressed,
-   else socket number
-*/
-
-#endif /* SYS_SELECT_H_ */
diff --git a/tecs/sys_unix.c b/tecs/sys_unix.c
deleted file mode 100755
index b660d47e..00000000
--- a/tecs/sys_unix.c
+++ /dev/null
@@ -1,133 +0,0 @@
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <termios.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <utmp.h>
-#include "myc_tmp.h"
-#include "myc_str.h"
-#include "myc_fortran.h"
-
-void F_FUN(usleep)(int *usec) { usleep(*usec); }
-int F_FUN(getppid)(void) { return getppid(); }
-int lnblnk_(const char *str, int len);
-
-void F_FUN(sys_check_system)(F_CHAR(code) F_CLEN(code)) {
-#if defined __alpha
-  STR_TO_F(code, "TRU64");
-#elif defined __GNUC__
-  STR_TO_F(code, "GNU");
-#else
-  "sys_check_system: unsupported machine"
-#endif
-}
-
-void F_FUN(sys_realpath)(F_CHAR(rpath), int *reslen,
-  F_CHAR(path) F_CLEN(rpath) F_CLEN(path)) {
-  char p[PATH_MAX], rp[PATH_MAX], *pt;
-
-  STR_TO_C(p, path);
-  pt=realpath(p, rp);
-  if (pt==NULL) str_copy(rp, p);
-  *reslen=strlen(rp);
-  STR_TO_F(rpath, rp);
-}
-
-void F_FUN(sys_cmd)(char *command, int clen) {
-  int rc, l;
-  char *p;
-
-  l = lnblnk_(command, clen);
-  p = malloc((unsigned) l+1); if( p == NULL ) return;
-  strncpy(p,command,l); p[l] = '\0';
-  rc = system(p);
-  free(p);
-}
-
-static struct termios atts;
-
-void F_FUN(sys_rd_tmo)(char *prompt, char *result, int *reslen, int p_len, int r_len) {
-  struct termios attr;
-  int ires, i, ntmo, chr;
-
-  ires=tcgetattr(STDIN_FILENO,&attr);
-  atts=attr; /* save term. attr. */
-  if (ires!=0) {
-    perror("error in terinq/tcgetattr ");
-    (*reslen)=0;
-    *result='\0';
-    return;
-  }
-  attr.c_lflag &= ~(ICANON) & ~(ECHO); /* canonical mode off, echo off */
-  attr.c_cc[VMIN]=0;
-  ires= tcsetattr(STDIN_FILENO,TCSANOW,&attr);
-  if (ires!=0) {perror("error in terinq/tcsetattr ");}
-
-  do { chr=fgetc(stdin); } while (chr!=EOF);
-
-  for (i=0; i<p_len; i++)
-  { fputc(prompt[i], stderr);
-  };
-
-  ires=fflush(stdin);
-  ires=fflush(stderr);
-
-  *reslen=0;
-  if (prompt[0]=='\0') { ntmo=10; }
-  else { ntmo=200; }; /* wait 2 sec. for the first char */
-  while (*reslen<r_len)
-  { chr=fgetc(stdin);
-    if (chr==EOF)
-    { while ((chr==EOF) & (ntmo>0))
-      { usleep(10000); /* wait 10 ms */
-        chr=fgetc(stdin);
-        ntmo--;
-      };
-      if (chr==EOF) break;
-      if (chr==10) {ntmo=10;} else {ntmo=100;}; /* wait 0.1 sec after LF, 1 sec else */
-    };
-    result[(*reslen)++]=(char)chr;
-    if (chr==24) {(*reslen)=0;}; /* ctrl-X purges buffer */
-  };
-  if (result[(*reslen)-1]==10) {(*reslen)--;}; /* strip trailing LF */
-
-  ires=tcsetattr(STDIN_FILENO,TCSANOW,&atts); /* restore term. attributes */
-  clearerr(stdin);
-  if (ires!=0) {
-    perror("error in terinq/tcsetattr ");
-  }
-}
-
-void F_FUN(sys_get_raw_key)(char *key, int *tmo, int k_len)
-{
-  struct termios attr;
-  int ires, ntmo, chr;
-  
-  ires=tcgetattr(STDIN_FILENO,&attr);
-  atts=attr; /* save term. attr. */
-  if (ires!=0) {perror("***\n");}
-  attr.c_lflag &= ~(ICANON) & ~(ECHO); /* canonical mode off, echo off */
-  attr.c_cc[VMIN]=0;
-  ires= tcsetattr(STDIN_FILENO,TCSANOW,&attr);
-  if (ires!=0) {perror("***\n");}
-  
-  ntmo=*tmo*100;
-  chr=fgetc(stdin);
-  if (chr==EOF) {
-    while ((chr==EOF) & (ntmo>0)) {
-      usleep(10000); /* wait 10 ms */
-      chr=fgetc(stdin);
-      ntmo--;
-    }
-  }
-  if (chr==EOF) chr=0;
-      
-  *key=chr;
-      
-  ires=tcsetattr(STDIN_FILENO,TCSANOW,&atts); /* restore term. attributes */
-  if (ires!=0) {perror("***\n");};
-} 
-
diff --git a/tecs/sys_wait.f b/tecs/sys_wait.f
deleted file mode 100755
index ee5bdeb1..00000000
--- a/tecs/sys_wait.f
+++ /dev/null
@@ -1,20 +0,0 @@
-!!-----------------------------------------------------------------------------
-!!
-	subroutine SYS_WAIT(SECONDS)	!!
-!!      ============================
-!! wait for SECONDS
-	real SECONDS !! resolution should be better than 0.1 sec.
-
-	real tim, del
-
-	tim=secnds(0.0)
-1	del=seconds-secnds(tim)
-	if (del .ge. 0.999) then
-	  call sleep(int(del))
-	  goto 1
-	endif
-	if (del .gt. 0) then	
-	  call usleep(int(del*1E6))
-	  goto 1
-	endif
-	end
diff --git a/tecs/tecs.bld b/tecs/tecs.bld
deleted file mode 100644
index 0c098d0b..00000000
--- a/tecs/tecs.bld
+++ /dev/null
@@ -1,4 +0,0 @@
-f90 -c -g tecs_plot.f90
-f77 -o tecs -g tecs_client.f tecs_for.f sys_aunix_c.c \
-  tecs_plot.o sys_aunix.f -L. -ltecsl -L/data/lnslib/lib -lpgplot \
-  -so_archive -lreadline -ltermcap -lX11 -lXm
diff --git a/tecs/tecs.c b/tecs/tecs.c
deleted file mode 100644
index f8557f5e..00000000
--- a/tecs/tecs.c
+++ /dev/null
@@ -1,2553 +0,0 @@
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <signal.h>
-#include <string.h>
-#include <ctype.h>
-#include "myc_mem.h"
-#include "myc_err.h"
-#include "coc_util.h"
-#include "coc_server.h"
-#include "coc_logfile.h"
-#include "myc_str.h"
-#include "myc_time.h"
-#include "tecs_lsc.h"
-#include "tecs_data.h"
-
-/* --- non ANSI signal --- */
-#ifndef SIGPIPE
-#define SIGPIPE 13
-#endif
-
-#define TABLE_FILE "tecs.cfg"
-#define LOGLIFETIME 24*3600
-
-static SerChannel *ser=NULL;
-static char binDir[256]="";
-static char logDir[256]="";
-static int logIt=0, use_stdout=0;
-static char serverId[32]="tecs";
-static int msecTmo=5000;
-static char host[64]="";
-static int port=9753;
-
-typedef struct {
-  char ch[4];
-  float t, t0, t1, t2, min, max, band; /* temperatures */
-  float scale; /* scale for extreme ranges */
-  float lim; /* range limit (used when two sensors present) */
-  float alarm;
-  int stat1, stat2; /* reading status summary */
-  int present; /* 0: sensor inactive, 1: sensor configured, -1: sensor parameters read */
-  int readStat; /* reading status */
-  char type;
-} SensorT;
-
-enum Sensors { A, B, C, D, A1, A2, A3, A4, N_SENSORS };
-
-static SensorT
-  sensA={"A"},
-  sensB={"B"},
-  sensC={"C"},
-  sensD={"D"},
-  sensA1={"A1", DATA_UNDEF},
-  sensA2={"A2", DATA_UNDEF},
-  sensA3={"A3", DATA_UNDEF},
-  sensA4={"A4", DATA_UNDEF},
-  *sensors[N_SENSORS]={&sensA, &sensB, &sensC, &sensD, &sensA1, &sensA2, &sensA3, &sensA4 },
-  *ctlSens=NULL, /* control sensor */
-  *heliumSens=NULL,
-  *auxSens=NULL,
-  *testSens=NULL,
-  *sens=&sensA;
-
-typedef struct {
-  SensorT *sensor1, *sensor2;
-  float temp; /* weighted temperature */
-  float t1, t2; /* minimum and maximum temperatures since ... */
-} Testpoint;
-
-static Testpoint /* C standard guarantees initialization to zero */
-  cryo, /* data for heat exchanger, or the only sensors */
-  samp, /* data for sensors on sample stick */
-  *tpoints[2]={&cryo, &samp},
-  *tpoint=&cryo;
-
-typedef struct _Plug {
-  SensorT *sensor1, *sensor2;
-  int manual; /* manual device */
-  int code, code1, code2; /* device code, buffers for device code */
-  int codChanged; /* code has changed */
-  int codDefined; /* code is not yet confirmed */
-  char device[16]; /* device name */
-} Plug;
-
-static Plug
-  plug0={&sensA, &sensB }, /* data for sensors on plug0 */
-  plug1={&sensC, &sensD }, /* data for sensors on plug1 */
-  *plugs[2]={&plug0, &plug1},
-  *plug=&plug0;
-
-static float
-  set, /* set T */
-  setH, /* set T on heat exchanger */
-  htr, power=DATA_UNDEF,   /* heater current percentage, heater power */
-  tLimit, /* temperature limit */
-  maxPower, /* max. Power */
-  scalPower,
-  powFact=1, /* power factor (for external power supplies) */
-  resist, /* heater resistance */
-  tShift=0, /* setpoint shift */
-  full, /* full value for helium level */
-  prop, integ, deriv, /* pid */
-  maxShift=2, /* maximal shift in when controlMode=2 */
-  tm=DATA_UNDEF, /* main temperature */
-  ts=DATA_UNDEF, /* sample temperature */
-  tx=DATA_UNDEF, /* controlled temperature */
-  tr=DATA_UNDEF, /* set temperature (read back) */
-  te=DATA_UNDEF, /* test temperature */
-  he=DATA_UNDEF, /* helium level value */
-  aux=DATA_UNDEF, /* auxiliary value */
-  ramp=0, 
-  slope=0,
-  smooth=0,
-  fbuf, /* float buffer */
-  r1, r2, /* temporary values */
-  still=0,
-  tInt=0; /* integral time (sec.) for setpoint shift */
-
-static int
-  logPeriod=5, /* data logging period (sec.) */
-  period=5000, /* default read interval (msec.) */
-  logTime, /* next logging time */
-  settingsFlag, /* settings to be done */
-  saveTime, /* time for a CRVSAV command */
-  noResp=1, /* no response */
-  quit, /* quit server */
-  controlMode=2, /* 0: control on heater, 1: control on sample, 3: 2nd loop for difference heater-sample */
-  int2=30, /* inegration time for controlMode 2 */
-  remoteMode, /* 1: local, 2: remote */
-  maxfld, /* last used display field */
-  busy, /* busy after CRVSAV */
-  relay, relay0, /* relay status */
-  deviceFlag, /* device given via net */
-  num, /* curve number */
-  key, /* key status */
-  serialNo,
-  readTemp, /* client requested readTemp */
-  cod1, cod2, out1, out2, /* codes read from digital input/output */
-  iRange, iAmp, /* max. range and max. current code */
-  htrst, htrst0, /* heater status */
-  loop=1, /* active loop */
-  touched, /* user touched keys */
-  tim0, /* msec Time */
-  per, /* effective period */
-  mmInt, mmTime, /* interval and time for next min-max logging */
-  nScan=0, /* number of scanned channels */
-  alarmListSize=0,
-  lockAlarm,
-  cntError,
-  tableTime; /* last time when table was read */
-
-int tim, rdTim; /* actual time, read Time */
-
-static int decod[8]={21,20,17,16,5,4,1,0}; /* for code conversion */
-
-static char
-  statusBuf[132], /* phase status */
-  status[1000], /* status summary */
-  pid[128], /* PID summary */
-  device[64], /* concatenated device names */
-  buf1[256], buf2[256], buf3[256], buf4[256], /* buffers for temporary use */
-  head[64], /* curve header */
-  intype[64], /* input configuration */
-  chan[4], /* actual channel */
-  alarmStatus[20], /* alarm status */
-  config[256], /* special configuration commands */
-  helium[80], /* helium level status */
-  heUnits[4], /* helium level units */
-  alarmChannels[N_SENSORS],
-  alarmHistory[N_SENSORS],
-  dev[80],
-  dev2[80],
-  devHelp[10000],
-  controlChannel[4]="A";
-
-static char
-  *alarmList[N_SENSORS], /* enabled alarms */
-  *table=NULL, /* environment devices table */
-  *cache=NULL, /* curve list cache */
-  *logfile="<none>";
-
-static int logMask=LOG_MAIN;
-
-static float gradata[7200];
-static char grapar[128];
-static int* grasize;
-
-typedef struct {
-  char cmd[COC_CMD_LEN];
-  int logstart;
-  long int logpos;
-  char logline[COC_RES_LEN];
-} ClientData;
-
-/*
-static ClientData clInit;
-static ClientData *clData=&clInit;
-*/
-
-static ClientData *clData;
-
-void ignore_forever(int signo) {
-  signal(signo,ignore_forever);
-}
-
-int IdleHdl(int tmo, int fd) {
-  int iRet;
-
-  iRet=CocHandleRequests(tmo, fd);
-  if (iRet<0) logfileShowErr("CocHandleRequests");
-  return iRet;
-}
-
-void *SetClientData(void *data) {
-  ClientData *cl;
-  if (data==NULL) {
-    NEW(cl, ClientData);
-    return cl;
-  }
-  clData = data;
-  return NULL;
-  OnError:
-    return NULL;
-}
-
-void ConcatDevice(void) {
-  str_copy(device, plug0.device);
-  if (0!=strcmp(plug0.device, plug1.device) && (plug1.device[0]!='\0' || plug1.manual)) {
-    str_append(device, "/");
-    str_append(device, plug1.device);
-  }
-  if (device[0]=='\0') return;
-  if (plug0.manual) {
-    str_append(device, " (manual");
-  } else {
-    str_append(device, " (auto");
-  }
-  if (plug1.manual==plug0.manual) {
-    str_append(device, ")");
-  } else if (plug1.manual) {
-    str_append(device, "/manual)");
-  } else {
-    str_append(device, "/auto)");
-  }
-}
-
-int PutPermanentData(FILE *fil) {
-  char buf[256];
-  char *d1, *d2;
-
-  if (plug0.manual) {
-    d1="*";
-  } else {
-    d1="";
-  }
-  if (plug1.manual) {
-    d2="*";
-  } else {
-    d2="";
-  }
-  sprintf(buf, "%s%s/%s%s/%d/%d\n", d1, plug0.device, d2, plug1.device, plug0.code, plug1.code);
-  ERR_SI(fputs(buf, fil));
-  return 0;
-  OnError: return -1;
-}
-
-int InstalCurve(SensorT *sensor, char *dev) {
-/*
-  install sensor
-*/
-  char nam[32], buf[256], chead[64], nbuf[256], lbuf[16];
-  char *crv, *entry, *points, *start,
-    *s, /* start of found entry */
-    *e, /* cache part after found entry */
-    *res, *t;
-  int i, n, c1, c2;
-  char used[60];
-  FILE *fil;
-
-  sens=sensor;
-  str_copy(chan, sens->ch);
-  sens->present=0;
-  if (sens->type=='x' || sens->type=='h' || sens->type=='f') {
-    if (chan[0]>='C') {
-      ERR_P(LscCmd(ser, "INTYPE [chan]:0,1,2,1,13;INSET [chan],1")); /* 7.5 V Range */
-    } else {
-      ERR_P(LscCmd(ser, "INTYPE [chan]:0,1,2,1,12;INSET [chan],1")); /* 5 V Range */
-    }
-    if (sens->type=='f') {
-      ERR_P(LscCmd(ser, "MNMX [chan]:1,4;INCRV [chan]:0"));
-    } else {
-      ERR_P(LscCmd(ser, "MNMX [chan]:1,3;INCRV [chan]:0"));
-    }
-    if (settingsFlag==0) sens->present=1;
-    return 0;
-  }
-
-  fil=NULL;
-  crv=NULL;
-  e=NULL;
-
-  sprintf(nam, "%s_%c", dev, sens->type);
-  logfileOut(LOG_MAIN+LOG_STAT, "install curve %s\n", nam);
-
-  /* read curve file */
-  str_copy(nbuf, binDir);
-  str_append(nbuf, nam);
-  str_append(nbuf, ".crv");
-
-  ERR_P(crv=str_read_file(nbuf));
-
-  t=str_split(chead, crv, '\n');
-  if (t==NULL) {
-    points=NULL;
-  } else {
-    points=str_split(intype, t, '\n');
-  }
-  if (points==NULL) ERR_MSG("illegal curve file");
-  if (cache==NULL) { ERR_SP(cache=MALLOC(1)); *cache='\0'; } /* create empty cache if undefined */
-
-  start=strchr(cache, '\n'); /* skip permanent data */
-  if (start==NULL) { start=cache; } else { start++; }
-
-  if (points[0]=='$') { /* standard curve */
-
-    points++; num=atoi(points);
-    if (num>20) ERR_MSG("illegal standard curve number");
-
-    ERR_P(LscCmd(ser, "CRVHDR?[num]>head"));
-      
-  } else {
-
-    strcpy(buf, ":");
-    str_append(buf, nam);
-    str_append(buf, " ");
-    str_upcase(buf, buf);
-
-    entry=strstr(start, buf);
-    if (entry==NULL) { /* sensor not found in cache */
-      entry=start;
-      for (i=60;i>20;i--) used[i]=0;
-      n=40; num=0;
-      while (entry!=NULL && n>0) {
-        i=0;
-        sscanf(entry, "%d", &i);
-        if (i>20 && i<=60) { num=i; s=entry; used[i]=1; n--; }
-        entry=strchr(entry, '\n');
-        if (entry !=NULL) entry++;
-      }
-      if (n>0) {
-        for (num=60;num>20;num--) {
-          if (used[num]==0) break;
-        }
-        s=NULL;
-        e=NULL;
-      } else {
-        e=strchr(s, '\n');
-        if (e!=NULL) { *e='\0'; e++; }
-        if (s>start) { s--; *s='\0'; }
-      }
-      head[0]='\0';
-    } else {
-      s=entry; entry++;
-      while (s>start && *s!='\n') s--;
-      if (s>start) { *s='\0'; s++; }
-      num=0;
-      sscanf(s, "%d", &num);
-      if (num<21 || num>60) ERR_MSG("illegal curve number");
-
-      ERR_P(LscCmd(ser, "CRVHDR?[num]>head"));
-
-      e=strchr(entry, '\n');
-      if (e!=NULL) { *e='\0'; e++; }
-    }
-  }
-  if (head[0]!='\0' && LscEqPar(head, chead)) { /* header matches: select sensor type and curve */
-
-    if (chan[1]>'1') { /* scanned inputs A2...A4 */
-      ERR_P(LscCmd(ser, "INCRV?[chan]>buf2;INSET?[chan]>buf3"));
-      str_copy(buf1, intype);
-    } else {
-      ERR_P(LscCmd(ser, "INTYPE?[chan]>buf1;INCRV?[chan]>buf2;INSET?[chan]>buf3"));
-    }
-    if (!LscEqPar(buf1, intype) || atoi(buf2)!=num || buf3[0]!='1') {
-      ERR_P(LscCmd(ser, "ANALOG 2:0,3;INSET [chan],1"));
-      if (chan[1]<='1') ERR_P(LscCmd(ser, "RANGE:0;INTYPE [chan]:[intype]"));
-      ERR_P(LscCmd(ser, "INCRV [chan]:[num];MNMX [chan]:1,1"));
-      logfileOut(LOG_MAIN, "curve %d on channel %s selected\n", num, chan);
-    } else {
-      logfileOut(LOG_MAIN, "curve %d on channel %s is already selected\n", num, chan);
-    }
-
-  } else { /* header does not match -> download */
-
-    logfileOut(LOG_MAIN, "%s\n%s\n", head, chead);
-    if (num<=20) ERR_MSG("standard curve does not match");
-    if (busy) ERR_MSG("busy");
-    logfileOut(LOG_MAIN+LOG_STAT, "download curve %d\n", num);
-    ERR_P(LscCmd(ser, "ANALOG 2:0,3;INSET [chan],1"));
-    /* select sensor type first */
-    if (chan[1]<='1') ERR_P(LscCmd(ser, "RANGE:0;INTYPE [chan]:[intype]"));
-
-    n=3;
-    do {
-      ERR_P(LscCmd(ser, "CRVDEL [num];CRVHDR?[num]>buf1,"));
-      buf1[4]='\0';
-      i=strcmp(buf1, "User");
-      n--;
-    } while (i!=0 && n!=0);
-    if (i!=0) ERR_MSG("can not delete curve");
-
-    /* store header, but without name (curve format must be determined before loading points) */
-    t=strchr(chead, ',');
-    if (t==NULL) ERR_MSG("illegal header");
-    str_copy(buf2, t);
-    ERR_P(LscCmd(ser, "CRVHDR [num]:[buf2]"));
-
-    sprintf(lbuf, "CRVPT %d", num);
-    i=0;
-    do { /* download curve */
-      t=str_split(nbuf, points, '\n');
-      if (nbuf[0]!='\0') {
-        ERR_I(str_substitute(buf, nbuf, "#0", lbuf));
-        ERR_P(LscCmd(ser, buf));
-        i++;
-        sprintf(statusBuf, "downloading curve %d at line %d", num, i);
-      }
-      points=t;
-    } while (t!=NULL);
-
-    /* write header, select curve */
-    str_upcase(head, chead);
-    ERR_P(LscCmd(ser, "CRVHDR [num]:[head];INCRV [chan]:[num];MNMX [chan]:1,1"));
-    logfileOut(LOG_MAIN, "curve %d selected on channel %s\n", num, chan);
-    saveTime=tim+30;
-  }
-  FREE(crv); crv=NULL;
-
-  if (sens->scale!=1.0)
-      ERR_P(LscCmd(ser, "LINEAR [chan]:1,[sens.scale],1,1,0")); /* scaling for display */
-
-  if (settingsFlag==0) sens->present=1;
-  /*
-  if (num<=20) return 0;
-  */
-   /* standard curve, do not touch cache */
-
-  /* rewrite cache with actual entry at beginning */
-  str_copy(nbuf, logDir);
-  str_append(nbuf, "lsc.tmp");
-  fil=fopen(nbuf, "w+");
-  if (fil==NULL) ERR_SP(fil=fopen(nbuf, "w"));
-  ERR_I(PutPermanentData(fil));
-  if (num>20) { /* write actual entry */
-    sprintf(buf, "%d:%s", num, head);
-    ERR_SI(fputs(buf, fil));
-  }
-  if (start!=s) { /* write content before replaced entry */
-    if (num>20) {
-      ERR_SI(fputs("\n", fil));
-    }
-    ERR_SI(fputs(start, fil));
-  }
-  if (e!=NULL) { /* write content after replaced entry */
-    ERR_SI(fputs("\n", fil));
-    ERR_SI(fputs(e, fil));
-  }
-  ERR_SI(fputc('\0', fil));
-  ERR_SI(fclose(fil));
-  str_copy(buf, logDir);
-  sprintf(lbuf, "lsc.%d", serialNo);
-  str_append(buf, lbuf);
-  rename(nbuf, buf); /* rename to permanent version */
-  fil=NULL;
-  FREE(cache);
-  /* re-read it */
-  ERR_P(cache=str_read_file(buf));
-
-  /* for vms: */
-  str_append(buf, ";-1");
-  remove(buf); /* remove old version */
-  buf[strlen(buf)-2]='\0'; /* strip off "-1" */
-  rename(buf, buf); /* lower version number */
-
-  return 0;
-
-  OnError:
-    if (crv!=NULL) FREE(crv);
-    if (fil!=NULL) fclose(fil);
-    return -1;
-}
-
-int ReadTable(void) {
-  char nbuf[256];
-  if (table!=NULL && tim>tableTime+60) { FREE(table); table=NULL; }; /* clear old table */
-  if (table!=NULL) return 0;
-  str_copy(nbuf, binDir);
-  str_append(nbuf, TABLE_FILE);
-  ERR_P(table=str_read_file(nbuf));
-  tableTime=tim;
-  return 1;
-  OnError: return -1;
-}
-
-int PrepInput(char *label) {
-  char *t, *e;
-  char nam[16], chans[8], typ;
-  int i, j, l;
-  SensorT *s;
-
-  ERR_I(ReadTable());
-  t=strstr(table, label);
-  if (t==NULL) ERR_MSG("device not found");
-  e=strchr(t, '\'');
-  if (e==NULL || e>strchr(t,'\n')) ERR_MSG("missing ' or device name in table file");
-  t=e+1;
-  if (plug==&plug0) {
-    sensA.present=0;
-    sensB.present=0;
-    sensA.scale=1;
-    sensB.scale=1;
-    sensA.lim=0;
-    sensB.lim=0;
-    sensA.alarm=0;
-    sensB.alarm=0;
-    slope=0;
-    ramp=0;
-    controlMode=0;
-    powFact=1;
-    config[0]='\0';
-    tLimit=310;
-  } else {
-    sensC.present=0;
-    sensD.present=0;
-    sensC.scale=1;
-    sensD.scale=1;
-    sensC.lim=0;
-    sensD.lim=0;
-    sensC.alarm=0;
-    sensD.alarm=0;
-  }
-  loop=1;
-  resist=10;
-  str_copy(heUnits, "%");
-
-  i=sscanf(t, "%12s%n", nam, &l);
-  if (i<1) ERR_MSG("missing device name");
-  nam[strlen(nam)-1]='\0'; /* strip off quote */
-  t+=l;
-  str_copy(chans, "____");
-  i=sscanf(t, "%8s%n", chans, &l);
-  if (i<1) ERR_MSG("missing chans");
-  t+=l;
-
-  /* interprete settings until '+' appeares (after whitespace) */
-  ERR_P(CocReadVars(t, '+'));
-
-  if (loop!=2) loop=1;
-  if (strlen(chans)>4) ERR_MSG("no more than 4 channels allowed");
-
-  j=0;
-  if (plug==&plug1) j=2;
-
-  if (chans[0]>'0' && chans[0]<='4') {
-    nScan=chans[0]-'0';
-    for (i=4;i<4+nScan;i++) {
-      s=sensors[i];
-      s->present=-1;
-      s->band=10;
-      if (s->scale==0.0) s->scale=1.0;
-      s->type='1'+i-4;
-    }
-    chans[0]='_';
-    for (i=4+nScan; i<N_SENSORS; i++) {
-      sensors[i]->t=DATA_UNDEF;
-      sensors[i]->present=0;
-    }
-  }
-  for (i=j; i<j+2; i++) {
-    s=sensors[i];
-    typ=chans[i];
-    if (typ=='_') typ='\0';
-    if (NULL==strchr("mnslhxft", typ)) ERR_MSG("unknown channel type code");
-    if (typ!='\0') {
-      s->present=-1;
-    }
-    s->type=typ;
-    s->band=10;
-    if (s->scale==0.0) s->scale=1.0;
-    if (s->alarm==0.0 && typ=='m' || typ=='s') s->alarm=tLimit;
-  }
-
-  if (!plug->manual) { /* set device name */
-    str_copy(plug->device, nam);
-    ConcatDevice();
-  }
-  return 0;
-  OnError: return -1;
-}
-
-int LoadCache(void) {
-  int i, j, k;
-  char *res;
-  char buf[256], nbuf[256], lbuf[16];
-  char *bufi[4];
-  FILE *fil;
-
-  fil=NULL;
-  sprintf(lbuf, "lsc.%d", serialNo);
-  str_copy(nbuf, logDir);
-  str_append(nbuf, lbuf);
-  ERR_SP(fil=fopen(nbuf, "w"));
-  ERR_I(PutPermanentData(fil));
-  bufi[0]=buf1;
-  bufi[1]=buf2;
-  bufi[2]=buf3;
-  bufi[3]=buf4;
-  for (i=60; i>21; i-=4) {
-    sprintf(buf, "CRVHDR?%d>buf1;CRVHDR?%d>buf2;CRVHDR?%d>buf3;CRVHDR?%d>buf4", i, i-1, i-2, i-3);
-    ERR_P(LscCmd(ser, buf));
-    k=0;
-    for (j=i; j>i-4; j--) {
-      res=bufi[k]; k++;
-      if (res[1]=='s') { i=0; break;} /* s of "User", must be an empty slot, lowercase letters are not programmable */
-      sprintf(buf, "%d:", j);
-      ERR_SI(fputs(buf, fil));
-      ERR_SI(fputs(res, fil));
-      ERR_SI(fputs("\n", fil));
-    }
-  }
-  ERR_SI(fclose(fil));
-  /* re-read cache */
-  ERR_P(cache=str_read_file(nbuf));
-  return 0;
-  OnError:
-    if (fil!=NULL) fclose(fil);
-    return -1;
-}
-
-float WeightedAverage(float tH, float tL, Testpoint *t) {
-  float p,q, tLow, tHigh;
-  SensorT *s1, *s2;
-
-  if (tH==DATA_UNDEF) tH=0.0;
-  if (tL==DATA_UNDEF) tL=0.0;
-  s1=t->sensor1;
-  s2=t->sensor2;
-  tH = tH * s1->scale;
-  tL = tL * s2->scale;
-  if (tH!=0.0) {
-    if (tL!=0.0) {
-      tLow=s1->lim;
-      tHigh=s2->lim;
-      if (tL<=tLow) {
-        return tL;
-      } else if (tH<tHigh) {
-        p=tHigh-tH;
-        q=tL-tLow;
-        if (p==0.0 && q==0.0) { p=1; q=1; } /* should not be the case */
-        return (tL*p*p+tH*q*q)/(p*p+q*q);
-      }
-    }
-    return tH ;
-  } else if (tL!=0.0) {
-    return tL ;
-  }
-  return DATA_UNDEF;
-}
-
-void LogMinMax(int new) {
-  char buf[256];
-  int i;
-  static int first;
-  float tbuf;
-  SensorT *s1, *s2;
-
-  sprintf(buf, "@");
-  if (cryo.sensor1!=NULL) { /* at least one sensor is present */
-    for (i=0; i<2; i++) {
-      tpoint=tpoints[i];
-      s1=tpoint->sensor1;
-      s2=tpoint->sensor2;
-      tpoint->t1 = WeightedAverage(s1->min, s2->min, tpoint);
-      tpoint->t2 = WeightedAverage(s1->max, s2->max, tpoint);
-      if (fabsf(tpoint->t1 - tpoint->temp) < fabsf(tpoint->t2 - tpoint->temp)) {
-        tbuf = tpoint->t1;
-        tpoint->t1 = tpoint->t2;
-        tpoint->t2 = tbuf;
-      }
-      s1->min=0;
-      s1->max=0;
-      s2->min=0;
-      s2->max=0;
-    }
-
-    if (cryo.t1!=DATA_UNDEF) {
-      sprintf(buf1, " Tm %.5g _ %.5g", cryo.t1, cryo.t2);
-      str_append(buf, buf1);
-    }
-    if (cryo.sensor1!=samp.sensor1 && samp.t1!=DATA_UNDEF) {
-      sprintf(buf1, " Ts %.5g _ %.5g", samp.t1, samp.t2);
-      str_append(buf, buf1);
-    }
-    if (tr!=DATA_UNDEF) {
-      sprintf(buf1, " Tr %.5g", tr);
-      str_append(buf, buf1);
-    }
-    if (te!=DATA_UNDEF) {
-      sprintf(buf1, " Te %.5g", te);
-      str_append(buf, buf1);
-    }
-  } else if (nScan==0) {
-    return;
-  }
-  for (i=4; i<4+nScan; i++) {
-    s1=sensors[i];
-    if (s1->t!=DATA_UNDEF) {
-      sprintf(buf1, " T%c %.5g", s1->ch[1], s1->t);
-      str_append(buf, buf1);
-    }
-  }
-  if (power!=DATA_UNDEF) {
-    sprintf(buf1, " P %.4g", power);
-    str_append(buf, buf1);
-  }
-  if (he!=DATA_UNDEF) {
-    sprintf(buf1, " He %.4g", he);
-    str_append(buf, buf1);
-  }
-  if (aux!=DATA_UNDEF) {
-    sprintf(buf1, " Aux %.5g", aux);
-    str_append(buf, buf1);
-  }
-  if (new==2) {
-    mmTime=mmTime+30;
-    first=1;
-  } else {
-    if (first==0) {
-      logfileOut(LOG_MAIN, "%s\n", buf);
-    } else {
-      first=0;
-    }
-    if (new) {
-      mmInt=30;
-    } else {
-      mmInt=60;
-    }
-    mmTime=((tim+mmInt/2)/mmInt+1)*mmInt-logPeriod;
-  }
-}
-
-float CtlScale(void) {
-  if (controlMode==1) {
-    tShift=0;
-    if (ctlSens==NULL) {
-      ctlSens=samp.sensor1;
-    } else if (ctlSens==samp.sensor1) {
-      if (set < ctlSens->lim) {
-        ctlSens=samp.sensor2;
-      }
-    } else if (ctlSens==samp.sensor2) {
-      if (set > ctlSens->lim) {
-        ctlSens=samp.sensor1;
-      }
-    } else {
-      ctlSens=samp.sensor1;
-    }
-  } else {
-    if (controlMode!=2) tShift=0;
-    if (ctlSens==NULL) {
-      ctlSens=cryo.sensor1;
-    } else if (ctlSens==cryo.sensor1) {
-      if (set < ctlSens->lim) {
-        ctlSens=cryo.sensor2;
-      }
-    } else if (ctlSens==cryo.sensor2) {
-      if (set > ctlSens->lim) {
-        ctlSens=cryo.sensor1;
-      }
-    } else {
-      ctlSens=cryo.sensor1;
-    }
-  }
-  if (ctlSens==NULL) {
-    return 1.0;
-  } else {
-    return ctlSens->scale;
-  }
-}
-
-int ReadTemp(void) {
-  char buf[256], typ, *err;
-  int i, doit, stat;
-  int tfill, dfill;
-  static int iScan=0;
-  float hlev;
-  SensorT *s;
-
-  readTemp=0;
-
-  doit=0;
-  if (nScan>0) {
-    while (1) { /* read until a non-selected channel found */
-      if (iScan>=nScan) iScan=0;
-      s=sensors[iScan+4];
-      if (s->present<1) break;
-      str_copy(chan, s->ch);
-      ERR_P(LscCmd(ser, "KRDG?[chan]>fbuf;DIOST?>,out1"));
-      if (out1==iScan) break;
-      s->t=fbuf;
-      iScan++;
-    }
-  }
-  for (i=0; i<4; i++) {
-    s=sensors[i];
-    s->stat1=0;
-    s->stat2=0;
-    if (s->present) {
-      if (doit) ERR_P(LscCmd(ser, buf));
-      if (i<4) {
-        str_substitute(buf
-          , "KRDG?#>sens#.t0;MDAT?#>sens#.t1,sens#.t2;MDATST?#>sens#.stat1,sens#.stat2"
-          , "#", s->ch);
-      } else {
-        str_substitute(buf
-          , "KRDG?#>sens#.t1;RDGST?#>sens#.stat1;DIOST?>,sens#.stat2"
-          , "#", s->ch);
-      }
-      if (s->type=='h' || s->type=='x') {
-        buf[0]='S'; /* change KRDG to SRDG */
-        typ='S';
-      } else if (s->type=='f') {
-        buf[0]='L'; /* change KRDG to LDAT */
-        buf[1]='D';
-        buf[2]='A';
-        buf[3]='T';
-      }
-      doit=1;
-    }
-  }
-  if (doit) {
-    if (ramp!=0) {
-      str_append(buf, ";SETP?[loop]>fbuf");
-    }
-    str_append(buf, ";MNMXRST");
-    ERR_P(LscCmd(ser, buf));
-    if (ramp!=0) {
-      tr=fbuf*CtlScale();
-    } else {
-      tr=setH*CtlScale();
-    }
-    if (tr==0) tr=DATA_UNDEF;
-  }
-
-  /* check for reading errors, determine legal value */
-  for (i=0; i<4; i++) {
-    s=sensors[i];
-    if (s->present) {
-
-      if (i>=4) {
-        if (s->stat2==i-4) { /* ignore reading, if channel was active (may be noisy) */
-          s->t1 = s->t;
-        }
-        s->t2 = s->t1;
-        s->stat2 = s->stat1;
-      }
-      if (s->t1 == 63.0 || s->t2 == 63.0 || s->t0 == 63.0) {
-        /* probably noisy values */
-        logfileOut(LOG_MAIN, "magic %s: %g %g %g\n", s->ch, s->t1, s->t2, s->t0);
-      }
-
-      stat=(s->stat1 & s->stat2) & (255-3); /* ignore "old reading" and "invalid reading", error must be on min & max */
-      if (stat > s->readStat || stat==0 && s->readStat>0) {
-        err=LscReadStat(stat);
-        if (*err=='\0') {
-          logfileOut(LOG_MAIN, "reading o.k. %s\n", s->ch);
-        } else {
-          logfileOut(LOG_MAIN, "%s %s\n", err, s->ch);
-        }
-        s->readStat=stat;
-      }
-      if (stat==0) {
-
-        if (s->type=='h') {
-          hlev = s->t1; /* take minimum only */
-          if (full>0) {
-            if (hlev<full && hlev>0) {
-              he=hlev*100.0/full;
-              s->t=he;
-              tfill = tim % (24*3600) / 60; /* min since midnight */
-              dfill = mycDate(tim) % 10000; /* fill date without year */
-              sprintf(helium, "%.3g %s (%02d.%02d., %02d:%02d)", he, heUnits
-                , dfill % 100, dfill / 100, tfill / 60, tfill % 60);
-            }
-          }
-        } else if (s->t2 - s->t1 <= s->band*2) { /* normal case */
-          s->t = (s->t1 + s->t2) * 0.5; /* mean of min and max */
-          s->band = s->band/2;
-        } else {
-          if (s->t1 < 0.8 * s->t2) {
-            /* probably noisy values */
-            logfileOut(LOG_MAIN, "min/max %s: %g %g\n", s->ch, s->t1, s->t2);
-          }
-          s->t=s->t0;
-          s->t1 = s->t;
-          s->t2 = s->t;
-        }
-        if (s->t1 < s->min || s->min==0.0) s->min = s->t1;
-        if (s->t2 > s->max) s->max = s->t2;
-        if (s->max - s->min > s->band) {
-          s->band = s->max - s->min;
-        }
-      } else {
-        s->t=DATA_UNDEF;
-      }
-    } else {
-      s->t=DATA_UNDEF;
-    }
-  }
-
-  rdTim=mycNow();
-
-  tm=DATA_UNDEF;
-  ts=DATA_UNDEF;
-  if (cryo.sensor1!=NULL) {
-    cryo.temp=WeightedAverage(cryo.sensor1->t, cryo.sensor2->t, &cryo);
-    samp.temp=WeightedAverage(samp.sensor1->t, samp.sensor2->t, &samp);
-    tm=cryo.temp;
-    if (samp.sensor1!=cryo.sensor1) {
-      ts=samp.temp;
-    }
-    if (samp.temp==DATA_UNDEF) {
-      samp.temp=cryo.temp;
-    }
-  } else if (nScan==0) {
-    tm=(rdTim % 3600) * 1.0e-4;
-    ts=(rdTim % 60) * 60.0e-4+0.5;
-  }
-  if (controlMode==0) {
-    tx=tm;
-  } else {
-    tx=ts;
-  }
-  if (auxSens != NULL) {
-    aux=auxSens->t * auxSens->scale;
-  } else { 
-    aux=DATA_UNDEF;
-  }
-  if (testSens != NULL) {
-    te=testSens->t * testSens->scale;
-  } else { 
-    te=DATA_UNDEF;
-  }
-  if (heliumSens == NULL) {
-    he=DATA_UNDEF;
-  }
-  return 0;
-  OnError: return -1;
-}
-
-int ReadHeater(void) {
-  if (loop==1) {
-    if (relay) {
-      ERR_P(LscCmd(ser, "HTRST?>htrst"));
-      htr=0;
-    } else {
-      ERR_P(LscCmd(ser, "HTR?>htr;HTRST?>htrst;RELAYST?1>relay"));
-    }
-  } else {
-    ERR_P(LscCmd(ser, "AOUT?2>htr"));
-    htrst=0;
-  }
-  if (set == 0) {
-    power=DATA_UNDEF;
-  } else {
-    power=htr*htr*scalPower*1e-4;
-    if (power>maxPower) power=maxPower;
-  }
-  return 0;
-  OnError: return -1;
-}
-
-int SetTemp(int switchOn) {
-  int showSet;
-  float scale;
-
-  if (set<0 || set>tLimit) {
-    set=0;
-    logfileOut(LOG_MAIN, "set point not within (0 ... %g), reset to 0\n", tLimit);
-  }
-  if (switchOn) {
-    ERR_I(ReadTemp());
-    LogMinMax(switchOn);
-  }
-  scale=CtlScale();
-  if (ctlSens==NULL) return 0;
-
-  str_copy(chan, ctlSens->ch);
-  if (tShift>maxShift) {
-    tShift=maxShift;
-  } else if (tShift<-maxShift) {
-    tShift=-maxShift;
-  }
-  setH=(set+tShift)/scale;
-  if (setH>tLimit/scale) setH=tLimit/scale;
-  if (switchOn) {
-    /* switch off other loop */
-    if (loop==1) {
-      ERR_P(LscCmd(ser, "CSET 2:[chan],1,0,0"));
-    } else {
-      ERR_P(LscCmd(ser, "CSET 1:[chan],1,0,0"));
-    }
-    if (ramp > 0 && set != 0) {
-      /* take ramp from actual temperature if more than 1 % deviation */
-      ERR_P(LscCmd(ser, "CSET?[loop]>,,cod1;SETP?[loop]>fbuf"));
-      tr=fbuf*scale;
-      if (cod1 == 0 || fabsf(ctlSens->t - tr) >= 0.1 * ctlSens->t) {
-        fbuf = ctlSens->t;
-        tr = fbuf * scale;
-        ERR_P(LscCmd(ser, "SETP [loop],[fbuf];RAMP [loop],0,0;SETP [loop],[fbuf]"));
-      }
-    }
-  }
-  if (set==0) {
-    ERR_P(LscCmd(ser, "CSET [loop]:[chan],1,1,0"));
-    if (loop==1) {
-      ERR_P(LscCmd(ser, "RANGE:0"));
-    } else {
-      ERR_P(LscCmd(ser, "ANALOG 2:0,0"));
-    }
-    setH=0;
-  } else if (switchOn) { /* switch on also when bad heater message and no alarms: || (htrst>=5 && !relay))  */
-    ERR_P(LscCmd(ser, "CSET [loop]:[chan],1,1,0"));
-    if (loop==1) {
-      ERR_P(LscCmd(ser, "RANGE:[iRange]"));
-    } else {
-      ERR_P(LscCmd(ser, "ANALOG 2:0,3"));
-    }
-  } else {
-    ERR_P(LscCmd(ser, "CSET?[loop]>,buf1,"));
-    if (buf1[0] != '1') {
-      ERR_P(LscCmd(ser, "CSET [loop]:[chan],1"));
-    }
-  }
-  showSet=(0!=strcmp(ctlSens->ch, controlChannel) || switchOn);
-  str_copy(controlChannel, ctlSens->ch);
-  if (ramp==0 || set==0) {
-    ERR_P(LscCmd(ser, "RAMP?[loop]>buf1,"));
-    if (buf1[0] != '0') {
-      ERR_P(LscCmd(ser, "RAMP [loop]:0,[ramp]"));
-    }
-    ERR_P(LscCmd(ser, "SETP?[loop]>fbuf"));
-    if (fabsf(setH-fbuf) >= (fbuf+setH)*1.0e-5) {
-      ERR_P(LscCmd(ser, "SETP [loop]:[setH]"));
-      if (controlMode!=2 && !showSet) {
-        logfileOut(LOG_MAIN, "set %g (on %s) (was changed %g -> %g)\n", set, ctlSens->ch, fbuf, setH);
-      }
-    } else {
-      setH=fbuf;
-    }
-    tr=setH*scale;
-    if (showSet) {
-      logfileOut(LOG_MAIN, "set %g (on %s)\n", set, ctlSens->ch);
-    }
-  } else {
-    if (ramp < 0) ramp=-ramp;
-    if (ramp < 0.1) ramp=0.1;
-    if (showSet) {
-      ERR_P(LscCmd(ser, "RAMP [loop]:1,[ramp];SETP [loop],[setH];SETP?[loop]>fbuf"));
-    } else {
-      ERR_P(LscCmd(ser, "SETP?[loop]>fbuf"));
-      if (fabs(fbuf-setH) >= ramp*smooth) {
-        fbuf=ramp;
-      } else {
-        fbuf=sqrt(fabs(fbuf-setH)*ramp/smooth);
-        if (fbuf<0.1) fbuf=0.1;
-      }
-      ERR_P(LscCmd(ser, "RAMP [loop]:1,[fbuf];SETP [loop],[setH]"));
-      ERR_P(LscCmd(ser, "SETP?[loop]>fbuf"));
-    }
-    tr=fbuf*scale;
-    if (showSet) {
-      logfileOut(LOG_MAIN, "set %g (on %s) %g K/min, starting from %g\n", set, ctlSens->ch, ramp, tr);
-    }
-  }
-  if (tr==0) tr=DATA_UNDEF;
-  if (showSet) {
-    /* relay=0; */
-    ERR_I(ReadHeater());
-  }
-  return 0;
-  OnError: return -1;
-}
-
-void CalcMaxPower(void) {
-  int i, j, vmax;
-  float pa, pr, pw, quo, p, pl, plim;
-
-  iAmp=1; iRange=0;
-  if (scalPower==0) scalPower=maxPower;
-  if (maxPower>0) {
-    p=scalPower/powFact;
-    plim=2500/resist;
-    /* power limited by 50 V output. U*U/R=2500/R */
-    if (p>plim) p=plim;
-    pa=resist*4; /* max. maxPower R*I*I (I=2 A) */
-    pw=0; quo=0.;
-    for (i=4; i>0; i--) {
-      pr=pa;
-      for (j=5; j>0; j--) {
-        if (p<pr) {
-          if (p/pr>quo) { quo=p/pr; pw=pr; iAmp=i; iRange=j; }
-        } else if (p<plim || pw==0) {
-          if (pr/p>quo) { quo=pr/p; pw=pr; iAmp=i; iRange=j; }
-        }
-        pr=pr/10;
-      }
-      pa=pa/4;
-    }
-    scalPower=pw*powFact;
-    assert(scalPower>0);
-    if (scalPower<plim*powFact) {
-      maxPower=scalPower;
-    } else {
-      maxPower=plim*powFact;
-    }
-  } else {
-    iRange=0;
-  }
-}
-
-int PutFloat(StrBuf *buf, int prec, float f) {
-  char num[32], fmt[32];
-  int l;
-
-  if (f == DATA_UNDEF) {
-    return StrPut(buf, "NaN", StrNONE);
-  } else {
-    sprintf(fmt, "%%.%dg", prec);
-    sprintf(num, fmt, f);
-    return StrPut(buf, num, StrNONE);
-  }
-}
-
-int PidSumHdl(int mode, void *base, int fd) {
-  StrBuf buf;
-
-  StrLink(&buf, pid);
-  StrClear(&buf);
-  ERR_I(PutFloat(&buf, 5, prop));
-  ERR_I(StrPut(&buf, " ", StrNONE));
-  ERR_I(PutFloat(&buf, 5, integ));
-  ERR_I(StrPut(&buf, " ", StrNONE));
-  ERR_I(PutFloat(&buf, 4, deriv));
-  ERR_I(StrPut(&buf, " /", ' '));
-  ERR_I(PutFloat(&buf, 4, prop*sqrt(scalPower/resist)/600));
-  ERR_I(StrPut(&buf, " A/K,", ' '));
-  ERR_I(PutFloat(&buf, 4, 1000.0/integ));
-  ERR_I(StrPut(&buf, " sec,", ' '));
-  ERR_I(PutFloat(&buf, 4, deriv));
-  ERR_I(StrPut(&buf, " sec/scalPower", ' '));
-  if (scalPower>0.5) {
-    ERR_I(PutFloat(&buf, 4, scalPower));
-    ERR_I(StrPut(&buf, " W", StrNONE));
-  } else {
-    ERR_I(PutFloat(&buf, 4, scalPower*1000));
-    ERR_I(StrPut(&buf, " mW", StrNONE));
-  }
-  return 0;
-  OnError:
-    return -1;
-}
-
-int SetMaxPower(void) {
-  static float p0, pold;
-  float plim;
-
-  if (loop == 1) {
-    ERR_P(LscCmd(ser, "CLIMIT?1>,,,iAmp,iRange"));
-    if (iRange>0) {
-      p0=resist*pow(4.0,iAmp)*pow(10.0,iRange)/6.4e6*powFact;
-      plim=2500/resist;
-      pold=p0;
-      if (pold>plim) pold=plim;
-    }
-    CalcMaxPower();
-  }
-  logfileOut(LOG_MAIN, "maxPower changed from %g to %g\n", pold, maxPower);
-  ERR_P(LscCmd(ser, "CDISP 1:[loop],[resist],1;MOUT [loop]:0;CMODE [loop]:1"));
-  if (slope<0) slope=-slope;
-  if (slope!=0 && slope<0.1) slope=0.1;
-  fbuf=tLimit/CtlScale();
-  if (loop==1) {
-    if (scalPower!=0) prop=sqrt(p0/scalPower)*prop;
-    ERR_P(LscCmd(ser, "CLIMIT 1:[fbuf],[slope],0,[iAmp],[iRange];PID [loop],[prop]"));
-  } else {
-    ERR_P(LscCmd(ser, "CLIMIT 2:[fbuf],[slope],0"));
-  }
-  p0=scalPower;
-  pold=maxPower;
-  PidSumHdl(COC_RD, NULL, 0);
-  logfileOut(LOG_MAIN, "pid: %s\n", pid);
-  return 0;
-  OnError: return -1;
-}
-
-char DisplayFmt(SensorT *s) {
-  if (s==NULL || s->present<=0 || s->type=='h') return '\0';
-  if (s->type=='x') {
-    return '3';
-  } else if (s->type=='f') {
-    return '4';
-  } else {
-    if (s->scale==1.0) {
-      return '1';
-    } else {
-      return '4';
-    }
-  }
-}
-
-int ConfigAlarms(void) {
-  int i, k;
-  SensorT *s;
-
-  ERR_P(LscCmd(ser, "RELAY 1:1;BEEP:0"));
-  relay=0;
-  k=0;
-  for (i=0;i<4+nScan;i++) {
-    s=sensors[i];
-    str_copy(buf1, s->ch);
-    if (s->present==1 && s->alarm>0) {
-      r1=s->alarm/s->scale;
-      ERR_P(LscCmd(ser, "ALARM [buf1]:1,1,[r1],0,1,1"));
-      alarmList[k]=s->ch;
-      k++;
-    } else {
-      ERR_P(LscCmd(ser, "ALARM [buf1]:0")); /* switch off unused alarms */
-    }
-  }
-  alarmListSize=k;
-  return 0;
-  OnError: return -1;
-}
-
-int LoadFromLsc(void) {
-  ERR_P(LscCmd(ser, "PID?[loop]>prop,integ,deriv"));
-  ERR_P(LscCmd(ser, "RAMP?[loop]>,ramp"));
-  ERR_P(LscCmd(ser, "ANALOG?1>,,,,,,fbuf"));
-  still=fbuf*fbuf/70;
-  return 0;
-  OnError: return -1;
-}
-
-int Settings(void) {
-  char buf[256], typ;
-  char *flds[6], fmt[6];
-  char *cfg, *p;
-  int i,k,l;
-  SensorT *s;
-
-  if (remoteMode!=2) {
-    remoteMode=2; /* set to remote mode */
-    ERR_I(LoadFromLsc());
-    ERR_P(LscCmd(ser, "MODE:[remoteMode]"));
-  } else {
-    ERR_P(LscCmd(ser, "PID [loop],[prop],[integ],[deriv]"));
-  }
-  for (i=0; i<4+nScan; i++) {
-    s=sensors[i];
-    if (i<4) {
-      plug=plugs[i/2];
-    } else {
-      plug=&plug0;
-    }
-    if (s->present < 0) {
-      if (settingsFlag) return 0;
-      if (i==4) {
-        ERR_P(LscCmd(ser, "DOUT:2;XSCAN:2,,2"));
-      }
-      ERR_I(InstalCurve(s, plug->device));
-    }
-  }
-  if (nScan>0) {
-    for (out1=nScan+1;out1<=4;out1++) {
-      ERR_P(LscCmd(ser, "INSET A[out1],0"));
-    }
-    ERR_P(LscCmd(ser, "INSET A5,0;INSET A6,0;INSET A7,0;INSET A8,0"));
-    ERR_P(LscCmd(ser, "INSET A9,0;INSET A10,0;INSET A11,0;INSET A12,0"));
-    ERR_P(LscCmd(ser, "INSET A13,0;INSET A14,0;INSET A15,0;INSET A16,0"));
-  }
-
-  cryo.sensor1=NULL;
-  cryo.sensor2=NULL;
-  samp.sensor1=NULL;
-  samp.sensor2=NULL;
-  heliumSens=NULL;
-  auxSens=NULL;
-  testSens=NULL;
-  for (i=0; i<4+nScan; i++) {
-    s=sensors[i];
-    if (s->present==1) {
-      typ=s->type;
-      if ('m'==typ) {
-        if (cryo.sensor2==NULL) cryo.sensor2=s;
-        cryo.sensor1=s;
-      } else if ('n'==typ) {
-        if (cryo.sensor1==NULL) cryo.sensor1=s;
-        cryo.sensor2=s;
-      } else if ('s'==typ) {
-        if (samp.sensor2==NULL) samp.sensor2=s;
-        samp.sensor1=s;
-      } else if ('l'==typ) {
-        if (samp.sensor1==NULL) samp.sensor1=s;
-        samp.sensor2=s;
-      } else if ('h'==typ) {
-        heliumSens=s;
-      } else if ('x'==typ || 'f'==typ) {
-        auxSens=s;
-      } else if ('t'==typ) {
-        testSens=s;
-      }
-      s->band=10;
-    }
-  }
-  if (cryo.sensor1==NULL) {
-    cryo.sensor1=samp.sensor1;
-    cryo.sensor2=samp.sensor2;
-  } else if (samp.sensor1==NULL) {
-    samp.sensor1=cryo.sensor1;
-    samp.sensor2=cryo.sensor2;
-  }
-
-  if (settingsFlag) return 0;
-
-  s=cryo.sensor1;
-  if (s!=NULL) {
-    ERR_I(SetMaxPower());
-  }
-
-  if (settingsFlag) return 0;
-
-  str_copy(statusBuf, "alarms");
-  ERR_I(ConfigAlarms());
-
-  if (settingsFlag) return 0;
-
-  str_copy(statusBuf, "display");
-
-  /* display */
-  k=1;
-
-  fmt[k]=DisplayFmt(cryo.sensor1);
-  if (fmt[k]!='\0') {
-    flds[k]=cryo.sensor1->ch;
-    k++;
-  }
-  if (samp.sensor1 != cryo.sensor1) {
-    fmt[k]=DisplayFmt(samp.sensor1);
-    if (fmt[k]!='\0') {
-      flds[k]=samp.sensor1->ch;
-      k++;
-    }
-  }
-  if (cryo.sensor2 != cryo.sensor1) {
-    fmt[k]=DisplayFmt(cryo.sensor2);
-    if (fmt[k]!='\0') {
-      flds[k]=cryo.sensor2->ch;
-      k++;
-    }
-  }
-  if (samp.sensor2 != samp.sensor1 && samp.sensor2 != cryo.sensor2) {
-    fmt[k]=DisplayFmt(samp.sensor2);
-    if (fmt[k]!='\0') {
-      flds[k]=samp.sensor2->ch;
-      k++;
-    }
-  }
-  fmt[k]=DisplayFmt(testSens);
-  if (fmt[k]!='\0' && k<=4) {
-    flds[k]=testSens->ch;
-    k++;
-  }
-  fmt[k]=DisplayFmt(auxSens);
-  if (fmt[k]!='\0' && k<=4) {
-    flds[k]=auxSens->ch;
-    k++;
-  }
-  if (nScan>0) {
-    i=0;
-    while (k<=4 && i<nScan) {
-      fmt[k]=DisplayFmt(sensors[i+4]);
-      if (fmt[k]!='\0') {
-        flds[k]=sensors[i+4]->ch;
-        k++; i++;
-      }
-    }
-  }
-  maxfld=k-1;
-
-  /* fields 5-8 standard raw data */
-  ERR_P(LscCmd(ser, "DISPFLD 5,A,3;DISPFLD 6,C,3;DISPFLD 7,B,3;DISPFLD 8,D,3"));
-  if (maxfld==0) { /* show raw data */
-    ERR_P(LscCmd(ser, "DISPFLD 1,A,3;DISPFLD 2,C,3;DISPFLD 3,B,3;DISPFLD 4,D,3;DISPLAY:4"));
-  } else {
-    l=0;
-    for (k=1; k<=maxfld; k++) {
-      assert(l<128);
-      sprintf(buf+l, "DISPFLD %d,%s,%c;", k, flds[k], fmt[k]);
-      l=strlen(buf);
-    }
-    str_append(buf, "DISPLAY:[maxfld]");
-    ERR_P(LscCmd(ser, buf));
-  }
-  if (config[0] != '\0') {
-    str_copy(buf, binDir);
-    str_append(buf, config);
-    cfg=str_read_file(buf);
-    if (cfg != NULL) {
-      logfileOut(LOG_MAIN, "load %s\n", config);
-      p=cfg;
-      while (p!=NULL) {
-        p=str_split(buf, p, '\n');
-        ERR_P(LscCmd(ser, buf));
-      }
-      FREE(cfg);
-    }
-  }
-
-  if (settingsFlag) return 0;
-  str_copy(statusBuf, "reading temperatures");  
-
-  if (cryo.sensor1!=NULL) {
-    ERR_I(SetTemp(2));
-  } else {
-    ERR_I(ReadTemp());
-  }
-  logTime=(rdTim / logPeriod + 2) * logPeriod; /* wait before logging "dirty" temperatures */
-  return 0;
-  OnError:
-    return -1;
-}
-
-int ConfigByCode(int plugNr) {
-  char buf[16];
-
-  plug=plugs[plugNr];
-  str_copy(plug->device,"");
-  plug->manual=0;
-  ConcatDevice();
-  if (plug->code==0) {
-    logfileOut(LOG_MAIN ,"reset inputs on plug%d\n", plugNr);
-    plug->sensor1->present=0;
-    plug->sensor2->present=0;
-  } else {
-    logfileOut(LOG_MAIN+LOG_STAT ,"configure plug%d for cod %+d\n", plugNr, plug->code);
-    sprintf(buf, "%+d,", plug->code);
-    ERR_I(PrepInput(buf));
-  }
-  settingsFlag=1;
-  return 0;
-  OnError: return -1;
-}
-
-int ConfigByName(int plugNr) {
-  char buf[20];
-
-  plug=plugs[plugNr];
-  plug->manual=1;
-  logfileOut(LOG_MAIN+LOG_STAT ,"configure plug%d for %s\n", plugNr, plug->device);
-  plug->sensor1->present=0;
-  plug->sensor2->present=0;
-  if (0!=strcmp(plug->device, "none")) {
-    sprintf(buf, "'%s'", plug->device);
-    ERR_I(PrepInput(buf));
-  }
-  settingsFlag=1;
-  return 0;
-  OnError:
-    plug->device[0]='\0';
-    ConcatDevice();
-    return -1;
-}
-
-int PeriodicTask(void) {
-  char buf[256], lbuf[16];
-  char *next, *alms;
-  int i, k;
-  float t3[3], p, d, w, t;
-
-  if (nScan==0) {
-    ERR_P(LscCmd(ser, "DIOST?>cod1,out1;DOUT 3,29;BUSY?>busy"));
-  } else {
-    cod1=0;
-    ERR_P(LscCmd(ser, "BUSY?>busy"));
-  }
-  if (plug0.codDefined && plug1.codDefined || nScan>0) {
-    per=period; /* no timeout on above command and codes are defined: normal period */
-    if (per>logPeriod*1000) per=logPeriod*1000;
-  }
-  if (noResp) { /* there was no response on an earlier command, or we are initializing */
-    k=serialNo; /* check serial number */
-    ERR_P(LscCmd(ser, "*IDN?>buf1,buf2,serialNo,"));
-    if (0!=strcmp(buf1, "LSCI") || 0!=strcmp(buf2, "MODEL340") || serialNo==0) return 0;
-    if (k!=serialNo) { /* controller exchanged or we are initializing */
-      if (k!=0) {
-        logfileOut(LOG_MAIN, "controller connected\n");
-      }
-      set=0;
-
-      /* reload curve cache: */
-      if (cache!=NULL) FREE(cache);
-      sprintf(lbuf, "lsc.%d", serialNo);
-      str_copy(buf, logDir);
-      str_append(buf, lbuf);
-      cache=str_read_file(buf);
-      if (cache==NULL && 0==strcmp(ErrMessage, "file not found")) ERR_I(LoadCache());
-
-      /* get device names and last codes separated by '/' */
-      str_split(buf, cache, '\n'); /* read 1 line */
-      plug1.device[0]='\0';
-      plug0.code=0;
-      plug1.code=0;
-      next=str_split(buf1, buf, '/');
-      if (next!=NULL) {
-        next=str_split(buf2, next, '/');
-        if (next!=NULL) {
-          next=str_split(buf3, next, '/');
-          plug0.code=atoi(buf3);
-          plug0.codChanged=1;
-          if (next!=NULL) {
-            next=str_split(buf3, next, '\n');
-            plug1.code=atoi(buf3);
-            plug1.codChanged=1;
-          }
-        }
-      }
-      if (buf1[0]=='*') {
-        str_copy(plug0.device, buf1+1);
-        plug0.codChanged=0;
-        ConfigByName(0);
-      } else {
-        if (plug0.code!=0) str_copy(plug0.device, buf1);
-        plug0.manual=0;
-      }
-      if (buf2[0]=='*') {
-        str_copy(plug1.device, buf2+1);
-        plug1.codChanged=0;
-        ConfigByName(1);
-      } else {
-        if (plug1.code!=0) str_copy(plug1.device, buf2);
-        plug1.manual=0;
-      }
-      ConcatDevice();
-
-      settingsFlag=1;
-    }
-    noResp=0;
-  }
-
-  ERR_I(ReadHeater());
-
-  if (relay || loop !=1) {
-    if (alarmListSize!=0) {
-      buf[0]='\0';
-      for (k=0;k<alarmListSize;k++) {
-        str_append(buf,";ALARMST?");
-        str_append(buf, alarmList[k]);
-      }
-      ERR_P(alms=LscCmd(ser, buf+1)); /* send without leading semicolon */
-      if (0!=strcmp(alarmStatus, alms)) {
-        str_copy(alarmStatus, alms);
-        alarmChannels[0]='\0';
-        for (k=0;k<alarmListSize;k++) {
-          if (alms[k*4] != '0' || alms[k*4+2] != '0') {
-            str_append(alarmChannels, alarmList[k]);
-            str_append(alarmChannels, " ");
-            if (NULL==strstr(alarmHistory, alarmList[k])) { /* if not yet in history */
-              str_append(alarmHistory, alarmList[k]); /* add to history */
-            }
-          }
-        }
-        if (alarmChannels[0]=='\0') {
-          if (lockAlarm) {
-            logfileOut(LOG_MAIN, "No more active alarms, latching alarms: %s!\n", alarmHistory);
-          } else {
-            alarmHistory[0]='\0';
-            alarmChannels[0]='\0';
-            logfileOut(LOG_MAIN, "No more active alarms\n");
-            ERR_P(LscCmd(ser, "ALMRST"));
-            relay=0;
-          }
-        } else {
-          logfileOut(LOG_MAIN, "Alarm on channel %s\n", alarmChannels);
-          if (!relay0 && set!=0) {
-            lockAlarm=1;
-            logfileOut(LOG_MAIN, "Switch off heater\n");
-            if (loop==1) { /* turn on high relay manually, switch off heater and reset alarms */
-              ERR_P(LscCmd(ser, "RELAY 1:2,1;RANGE:0;ALMRST")); 
-            } else {
-              ERR_P(LscCmd(ser, "RELAY 1:2,1;ANALOG 2:0,0;ALMRST"));
-              relay=1;
-            }
-          } else {
-            ERR_P(LscCmd(ser, "ALMRST"));
-          }
-        }
-      } else {
-        ERR_P(LscCmd(ser, "ALMRST"));
-      }
-    } else if (loop == 1) {
-      if (!relay0) logfileOut(LOG_MAIN, "Relay is on!\n");
-      alarmStatus[0]='\0';
-    }
-  } else if (loop == 1) {
-    alarmChannels[0]='\0';
-    alarmStatus[0]='\0';
-  }
-  relay0=relay;
-
-  ERR_I(ReadTemp());
-
-  if (htrst!=htrst0) {
-    LogMinMax(0);
-    if (htrst==0) {
-      logfileOut(LOG_MAIN, "heater o.k.\n");
-    } else {
-      logfileOut(LOG_MAIN, "%s\n", LscHtrStat(htrst));
-    }
-    htrst0=htrst;
-  }
-
-  if (rdTim>=logTime) {
-    ERR_I(DataPutAll(NULL, rdTim));
-    logTime=(rdTim / logPeriod + 1) * logPeriod;
-    if (rdTim>mmTime && (cryo.sensor1 != NULL || nScan>0)) LogMinMax(0);
-  }
-  if (set!=0 && remoteMode==2) {
-    if (cryo.sensor1!=samp.sensor1 && controlMode==2) {
-      t=ctlSens->t;
-      d=(setH-t)/t; /* relative difference */
-      w=exp(-d*d*230); /* gaussian */
-      /* if (w<0.1) tInt=0; reset when far from setpoint (more than 10 %) */
-      if (int2<1) int2=1;
-      if (tInt<int2) tInt+=w*per/1000; /* increase integral time until int2 sec. */
-      if (tInt>w) {
-        p=w/tInt;
-      } else {
-        p=1.0;
-      }
-      tShift=tShift*(1.0-p)+p*(cryo.temp-samp.temp);
-      ERR_I(SetTemp(0));
-    } else {
-      ERR_I(SetTemp(0));
-    }
-  }
-
-  if (nScan==0) {
-    ERR_P(LscCmd(ser, "KEYST?>key;DIOST?>cod2,out2;DOUT 3,30"));
-  } else {
-    ERR_P(LscCmd(ser, "KEYST?>key"));
-  }
-  if (busy==0) {
-    if (nScan==0) {
-      if (out1!=30) {
-        ERR_P(LscCmd(ser, "DOUT:3,30"));
-        ERR_P(LscCmd(ser, "DIOST?>cod1,out1"));
-      }
-      if (out2!=29) {
-        ERR_P(LscCmd(ser, "DOUT:3,29"));
-        ERR_P(LscCmd(ser, "DIOST?>cod2,out2;DOUT 3,30"));
-      }
-    }
-
-    if (out1==30 && out2==29) {
-      /* code conversion */
-      plug0.code1=3*decod[cod2 % 8] ^ 2*decod[cod1 % 8]; /* ^ is exclusive OR */
-      plug1.code1=-(3*decod[cod2 / 8] ^ 2*decod[cod1 / 8]);
-      for (i=0; i<2; i++) {
-        plug=plugs[i];
-        if (plug->code1!=plug->code) { /* code has changed -> wait for a confirmation */
-          if (plug->code1!=plug->code2) {
-            plug->code2=plug->code1;
-          } else {
-            plug->code=plug->code1;
-            plug->codChanged=1;
-          }
-        } else {
-          plug->code2=plug->code;
-          if (plug->codChanged) { /* code change confirmed */
-            plug->codChanged=0;
-            if (plug->code1==0) {
-              logfileOut(LOG_MAIN, "plug%d unplugged\n", i);
-            } else {
-              logfileOut(LOG_MAIN, "plugged %d on plug%d\n", plug->code1, i);
-            }
-            set=0;
-            ERR_I(ConfigByCode(i));
-          }
-          plug->codDefined=1;
-        }
-      }
-    }
-  }
-
-  if (key!=0) {
-    ERR_P(LscCmd(ser, "MODE?>remoteMode"));
-    if (!touched) {
-      touched=1;
-      logfileOut(LOG_MAIN ,"user touched keys\n");
-    }
-    if (remoteMode==2) {
-      logfileOut(LOG_MAIN ,"user switched to remote\n");
-      touched=0;
-      ERR_I(LoadFromLsc());
-      if (controlMode==2) {
-        ERR_P(LscCmd(ser, "RANGE?>iRange"));
-        if (iRange==0) set=0;
-      } else {
-        ERR_P(LscCmd(ser, "RAMP?[loop]>,ramp"));
-        ERR_P(LscCmd(ser, "RANGE?>iRange;CSET?[loop]>,cod1,;SETP?[loop]>set"));
-        if (cod1!=1) {
-          set=0;
-          logfileOut(LOG_MAIN, "set point was not in K, set to 0\n");
-        }
-      }
-      settingsFlag=1;
-    }
-  }
-
-  if (saveTime!=0 && tim>saveTime) {
-    ERR_P(LscCmd(ser, "CRVSAV;BUSY?>busy"));
-    while (!busy) {
-      IdleHdl(200, 0); /* wait 200 ms */
-      ERR_P(LscCmd(ser, "BUSY?>busy"));
-    }
-    saveTime=0;
-  }
-  return 0;
-  OnError: return -1;
-}
-
-int DeviceHdl(int mode, void *base, int fd) {
-  char *t, *res;
-  int do0, do1;
-
-  if (mode==COC_WR) {
-    set=0;
-    t=strchr(device, '/');
-    if (t==NULL) {
-      if (0==strcmp(device, "0") || 0==strcasecmp(device, "auto")) {
-        nScan=0;
-        ERR_I(ConfigByCode(0));
-        ERR_I(ConfigByCode(1));
-      } else {
-        str_copy(plug0.device, device);
-        str_copy(plug1.device, device);
-        ERR_I(ConfigByName(0));
-        ERR_I(ConfigByName(1));
-      }
-    } else {
-      do0=0;
-      do1=0;
-      if (t!=device) {
-        *t='\0';
-        str_copy(plug0.device, device);
-        *t='/';
-        do0=1;
-      }
-      t++;
-      if (*t!='\0') {
-        str_copy(plug1.device, t);
-        do1=1;
-      }
-      if (do0) ERR_I(ConfigByName(0));
-      if (do1) ERR_I(ConfigByName(1));
-    }
-    ConcatDevice();
-  }
-  return 0;
-  OnError: return -1;
-}
-
-int SetHdl(int mode, void *base, int fd) {
-  if (mode==COC_WR) {
-    if (remoteMode!=2) {
-      ERR_MSG("controller is in local mode, enter 'remote' first");
-    } else if (relay && set!=0) {
-      if (alarmChannels[0]!='\0') {
-        ERR_MSG("alarm is active, set prohibited");
-      } else {
-        ERR_MSG("alarm was active, enter 'reset' first");
-      }
-    } else if (set<0) {
-      set=0;
-    } else if (set>tLimit) {
-      set=0;
-      ERR_MSG("set point too high");
-    }
-    return COC_DWR;
-  } else if (mode==COC_DWR) {
-    if (cryo.sensor1!=NULL && remoteMode==2) {
-      tInt=0; /* reset integral time */
-      ERR_I(SetTemp(1));
-    }
-  }
-  return 0;
-  OnError: return -1;
-}
-
-int PidHdl(int mode, void *base, int fd) {
-  if (mode==COC_WR) {
-    return COC_DWR;
-  } else if (mode==COC_DWR) {
-    ERR_P(LscCmd(ser,"PID [loop]:[prop],[integ],[deriv]"));
-    PidSumHdl(COC_RD, base, fd);
-    logfileOut(LOG_MAIN, "pid: %s\n", pid);
-  }
-  return 0;
-  OnError: return -1;
-}
-
-int AlarmHdl(int mode, void *base, int fd) {
-  if (mode==COC_WR) {
-    return COC_DWR;
-  } else if (mode==COC_DWR) {
-    ERR_I(ConfigAlarms());
-  }
-  return 0;
-  OnError: return -1;
-}
-
-int MaxPowerHdl(int mode, void *base, int fd) {
-  if (mode==COC_WR) {
-    scalPower=maxPower;
-    CalcMaxPower();
-    if (remoteMode!=2) {
-      ERR_MSG("controller is in local mode, enter 'remote' first");
-    } else if (relay) {
-      if (alarmChannels[0]!='\0') {
-        ERR_MSG("alarm is active, maxPower prohibited");
-      } else {
-        ERR_MSG("alarm was active, enter 'reset' first");
-      }
-    }
-    return COC_DWR;
-  } else if (mode==COC_DWR && remoteMode==2) {
-    ERR_I(SetMaxPower());
-    ERR_I(SetTemp(1));
-  }
-  return 0;
-  OnError: return -1;
-}
-
-int StillHdl(int mode, void *base, int fd) {
-  if (mode==COC_WR) {
-    return COC_DWR;
-  } else if (mode==COC_DWR) {
-    fbuf=sqrt(still*70);
-    ERR_P(LscCmd(ser,"ANALOG 1:0,2,,,,,[fbuf]"));
-  }
-  return 0;
-  OnError: return -1;
-}
-
-int SendHdl(int mode, void *base, int fd) {
-  char *res;
-  ClientData *data;
-
-  if (mode==COC_WR) {
-    return COC_DRD;
-  } else if (mode==COC_DRD) {
-    data=base;
-    if (NULL!=strchr(data->cmd, '>') || NULL!=strchr(data->cmd, '['))
-        ERR_MSG("no variables allowed");
-    ERR_P(res=LscCmd(ser, data->cmd));
-    str_copy(data->cmd, res);
-  }
-  return 0;
-  OnError: return -1;
-}
-
-int LogHdl(int mode, void *base, int fd) {
-  ClientData *data;
-
-  if (mode==COC_RD) {
-    data=base;
-    if (data->logstart != 0) {
-      data->logpos = logfilePos(data->logstart);
-      data->logstart = 0;
-    }
-    data->logpos=logfileGetLines(data->logpos, 25, data->logline, sizeof(data->logline));
-  }
-  return 0;
-  OnError: return -1;
-}
-
-int PltHdl(int mode, void *base, int fd) {
-  if (mode==COC_RD) {
-    ERR_MSG("Tecs client version not up to date");
-  }
-  return 0;
-  OnError: return -1;
-}
-
-int GraHdl(int mode, void *base, int fd) {
-  ClientData *data;
-  int l;
-  char names[64];
-  long startTime, endTime, step;
-
-  if (mode==COC_RD) {
-    ERR_SI(sscanf(grapar, "%ld %ld %ld %n", &startTime, &endTime, &step, &l)-2);
-    str_copy(names, grapar+l);
-    ERR_I(l=DataGetMult(names, startTime, endTime, step, 30, gradata, sizeof(gradata)/sizeof(float)));
-    assert(l*sizeof(float)<sizeof(gradata));
-    *grasize=l;
-  }
-  return 0;
-  OnError: return -1;
-}
-
-int ShowSensor(StrBuf *buf, SensorT *s, char *name, char *units, char lim) {
-
-  if (s->present!=1) return 0;
-  ERR_I(StrPut(buf, "\n ", ' '));
-  ERR_I(StrPut(buf, s->ch, ':'));
-  ERR_I(StrPut(buf, "", ' '));
-  if (s->readStat==0) {
-    if (s->t==0) {
-      ERR_I(StrPut(buf, "not yet read", StrNONE));
-    } else {
-      ERR_I(StrPut(buf, name, '='));
-      ERR_I(PutFloat(buf, 5, s->t * s->scale));
-      ERR_I(StrPut(buf, " ", StrNONE));
-      ERR_I(StrPut(buf, units, StrNONE));
-    }
-  } else {
-    ERR_I(StrPut(buf, LscReadStat(s->readStat), StrNONE));
-  }
-  if (s==ctlSens) {
-    ERR_I(StrPut(buf, ", setpoint", '='));
-    if (tr==DATA_UNDEF) {
-      ERR_I(PutFloat(buf, 5, 0.0));
-    } else {
-      ERR_I(PutFloat(buf, 5, tr));
-    }
-    ERR_I(StrPut(buf, " ", StrNONE));
-    ERR_I(StrPut(buf, units, StrNONE));
-  }
-  if (s->lim > 0 && lim!=0) {
-    ERR_I(StrPut(buf, ", for T", lim));
-    ERR_I(PutFloat(buf, 5, s->lim));
-  }
-  return 0;
-  OnError: return -1;
-}
-
-int StatusHdl(int mode, void *base, int fd) {
-  int i, stat, typ;
-  StrBuf buf;
-  float tM, tS;
-  SensorT *s;
-  char pendAct[256];
-
-  readTemp=1;
-  StrLink(&buf, status);
-  StrClear(&buf);
-  ERR_I(StrPut(&buf, "\n", StrNONE));
-  if (noResp==3) {
-    ERR_I(StrPut(&buf, "no connection or controller switched off", StrNONE));
-    goto EndStatus;
-  }
-  if (statusBuf[0]!='\0') {
-    ERR_I(StrPut(&buf, "configuring:", ' '));
-    ERR_I(StrPut(&buf, statusBuf, StrNONE));
-    goto EndStatus;
-  }
-  CocShowHandlers(pendAct, sizeof(pendAct));
-  if (pendAct[0]!='\0') {
-    if (mode==COC_RD) {
-      return COC_DRD;
-    } else {
-      ERR_I(StrPut(&buf, "pending action(s):", ' '));
-      ERR_I(StrPut(&buf, pendAct, StrNONE));
-      goto EndStatus;
-    }
-  }
-  if (device[0]=='\0') {
-    ERR_I(StrPut(&buf, "no device selected", ' '));
-    goto EndStatus;
-  }
-  if (remoteMode==1) {
-    ERR_I(StrPut(&buf, "LOCAL mode, enter 'remote' to enable remote control", '\n'));
-  }
-  ERR_I(StrPut(&buf, "device:", ' '));
-  ERR_I(StrPut(&buf, device, StrNONE));
-  if (set==0) {
-    ERR_I(StrPut(&buf, "\nheater off,",' '));
-  } else {
-    ERR_I(StrPut(&buf, "\ntarget", '='));
-    ERR_I(PutFloat(&buf, 5, set));
-    if (ramp==0 || tr==setH) {
-      ERR_I(StrPut(&buf, " K,", ' '));
-    } else {
-      ERR_I(StrPut(&buf, " K ramping at", ' '));
-      ERR_I(PutFloat(&buf, 4, ramp));
-      ERR_I(StrPut(&buf, " K/min,", ' '));
-    }
-  }
-  if (relay) {
-    if (alarmChannels[0]!='\0') {
-      ERR_I(StrPut(&buf, "alarm on channel",' '));
-      ERR_I(StrPut(&buf, alarmChannels, StrNONE));
-    } else if (alarmHistory[0]!='\0') {
-      ERR_I(StrPut(&buf, "alarm was on channel", ' '));
-      ERR_I(StrPut(&buf, alarmHistory, ','));
-      ERR_I(StrPut(&buf, " (enter 'reset' to confirm)", StrNONE));
-    } else {
-      ERR_I(StrPut(&buf, "alarm",' '));
-    }
-  } else if (htrst!=0) {
-    ERR_I(StrPut(&buf, LscHtrStat(htrst), StrNONE));
-  } else {
-    if (power!=DATA_UNDEF) {
-      ERR_I(StrPut(&buf, "htr power", '='));
-      if (power>=0.5) {
-        ERR_I(PutFloat(&buf, 3, power));
-        ERR_I(StrPut(&buf, " W, htr current", '='));
-      } else {
-        ERR_I(PutFloat(&buf, 3, power*1000));
-        ERR_I(StrPut(&buf, " mW, htr current", '='));
-      }
-      ERR_I(PutFloat(&buf, 4, htr));
-      ERR_I(StrPut(&buf, "% ", '('));
-      ERR_I(PutFloat(&buf, 4, sqrt(power/resist)));
-      ERR_I(StrPut(&buf, " A", ')'));
-    } else {
-      ERR_I(StrPut(&buf, "set=0", StrNONE));
-    }
-  }
-  tM=0; tS=0;
-  if (cryo.sensor1!=NULL) {
-    if (cryo.sensor1!=samp.sensor1) {
-      ERR_I(StrPut(&buf, "\nheat exchanger", ':'));
-      if (cryo.sensor2!=cryo.sensor1) {
-        ERR_I(StrPut(&buf, " T", '='));
-        ERR_I(PutFloat(&buf, 4, cryo.temp));
-        ERR_I(StrPut(&buf, " ", 'K'));
-        ERR_I(ShowSensor(&buf, cryo.sensor1, "T", "K", '>'));
-      }
-      ERR_I(ShowSensor(&buf, cryo.sensor2, "T", "K", '<'));
-      ERR_I(StrPut(&buf, "\nsample:", ' '));
-    }
-    if (samp.sensor2!=samp.sensor1) {
-      ERR_I(StrPut(&buf, " T", '='));
-      ERR_I(PutFloat(&buf, 4, samp.temp));
-      ERR_I(StrPut(&buf, " ", 'K'));
-      ERR_I(ShowSensor(&buf, samp.sensor1, "T", "K", '>'));
-    }
-    ERR_I(ShowSensor(&buf, samp.sensor2, "T", "K", '<'));
-  }
-  if (testSens!=NULL || nScan>0) {
-    ERR_I(StrPut(&buf, "\ntest", ':'));
-  }
-  if (testSens!=NULL) {
-    ERR_I(ShowSensor(&buf, testSens, "T", "K", 0));
-  }
-  for (i=4; i<4+nScan; i++) {
-    ERR_I(ShowSensor(&buf, sensors[i], "T", "K", 0));
-  }
-  if (auxSens!=NULL) {
-    ERR_I(StrPut(&buf, "\nauxilliary", ':'));
-    ERR_I(ShowSensor(&buf, auxSens, "U", "V", 0));
-  }
-  if (heliumSens!=NULL) {
-    ERR_I(StrPut(&buf, "\nhelium:", ' '));
-    ERR_I(StrPut(&buf, helium, StrNONE));
-  }
-  if (still!=0) {
-    ERR_I(StrPut(&buf, "\nstill:", ' '));
-    ERR_I(PutFloat(&buf, 1, still));
-    ERR_I(StrPut(&buf, " mW", ' '));
-  }
-EndStatus:
-  ERR_I(StrPut(&buf, "", '\0'));
-  return 0;
-  OnError:
-    return -1;
-}
-
-int DevHelpHdl(int mode, void *base, int fd) {
-  char *t, *n, *d, *en, *ed;
-  char line[80], nbuf[256];
-  int l, iret;
-  static int doit=1;
-
-  ERR_I(iret=ReadTable());
-  if (iret) doit=1;
-  if (doit) {
-    doit=0;
-    t=table;
-    str_copy(devHelp,"\n");
-    while (t!=NULL) {
-      t++;
-      n=strchr(t, '\'');
-      d=strchr(t, '"');
-      t=strchr(t, '\n');
-      if (n!=NULL && d!=NULL && n < d && d < t) {
-        en=strchr(n+1, '\'');
-        ed=strchr(d+1, '"');
-        if (en != NULL && en<d && ed != NULL && ed<t) {        
-          l=en-n;
-          if (l>12) l=12;
-          str_ncpy(line, n+1, l);
-          str_npad(line, line, 12);
-          l=ed-d;
-          if (l>77) l=77;
-          str_ncpy(line+12, d+1, l);
-          str_append(line, "\n");
-          str_append(devHelp, line);
-        }
-      }
-    }
-  }
-  return 0;
-  OnError: return -1;
-}
-
-int RemoteHdl(int mode, void *base, int fd) {
-  if (mode==COC_WR) {
-    return COC_DWR;
-  } else if (mode==COC_DWR) {
-    ERR_P(LscCmd(ser, "MODE:[remoteMode]"));
-  }
-  return 0;
-  OnError: return -1;
-}
-
-int RelayHdl(int mode, void *base, int fd) {
-  if (mode==COC_WR) {
-    if (alarmChannels[0]!='\0') ERR_MSG("alarm is still active");
-    return COC_DWR;
-  } else if (mode==COC_DWR) {
-    if (relay) {
-      ERR_P(LscCmd(ser, "RELAY 1:2,1"));
-      if (alarmHistory[0]=='\0') {
-        str_copy(alarmHistory, "X");
-      }
-    } else {
-      alarmHistory[0]='\0';
-      alarmStatus[0]='\0';
-      ERR_P(LscCmd(ser, "ALMRST;RELAY 1:1"));
-      logfileOut(LOG_MAIN, "reset alarms\n");
-      relay0=0;
-      lockAlarm=0;
-      set=0;
-    }
-  }
-  return 0;
-  OnError: return -1;
-}
-
-int TmoHdl(int mode, void *base, int fd) {
-  if (mode==COC_WR) {
-    ERR_I(SerSetTmo(ser, msecTmo));
-  }
-  return 0;
-  OnError: return -1;
-}
-
-int LogfileHdl(int mode, void *base, int fd) {
-  char buf[256];
-  if (mode==COC_WR) {
-    logfileClose();
-    str_copy(buf, logDir);
-    str_append(buf, serverId);
-    logfile=logfileInit(buf, logIt, use_stdout, logIt && use_stdout);
-    CocDefStr(logfile, COC_RDONLY);
-  }
-  return 0;
-}
-
-
-int ExecuteRequest(void) {
-  if (readTemp) ERR_I(ReadTemp());
-  ERR_I(CocCallHandlers());
-  while (settingsFlag==1) {
-    settingsFlag=0;
-    ERR_I(Settings());
-  }
-  statusBuf[0]='\0';
-  return 0;
-  OnError:
-    return -1;
-}
-
-int MainBody(void) {
-  int i, iret, tdif;
-
-  logfileWrite(logMask);
-
-  while (!quit) {
-    tdif = per - mycMsecSince(tim0);
-    if (tdif<0) { tim = mycNow(); break; } /* timeout */
-    ERR_I(iret=CocHandleRequests(tdif, 0));
-    tim=mycNow();
-    if (iret==0) { /* timeout */
-      break;
-    }
-    if (ser!=NULL) {
-      ERR_I(ExecuteRequest());
-    }
-    logfileWrite(logMask);
-  }
-  tdif = mycMsecSince(tim0);
-  if (tdif>60000 && cntError < 2) {
-    logfileOut(LOG_MAIN ,"%d seconds lost\n", tdif/1000);
-  }
-  tim0 = mycMsecSince(0)/period*period;
-
-  if (ser!=NULL) {
-    ERR_I(PeriodicTask());
-    ERR_I(ExecuteRequest());
-  }
-
-  return 0;
-  OnError:
-    if (0==strcmp(ErrMessage, "timeout")) {
-      if (noResp==2) { /* this is the second time we have no response */
-        per=1000; /* 1 sec */
-        cryo.temp=0;
-        samp.temp=0;
-        /* remoteMode=1; */
-        noResp=3;
-      } else if (noResp < 2) {
-        logfileOut(LOG_ALL ,"no response\n");
-        noResp=2;
-        per=100; /* try again soon */
-      }
-      return 0;
-    }
-    return -1;
-}
-
-int main(int argc, char *argv[]) {
-  int i, iret;
-  char *inistr;
-  char buf[256], opt;
-
-  signal(SIGPIPE, ignore_forever);
-
-#define RD COC_RDONLY
-#define RW COC_RDWR
-#define RA COC_RDWRALL
-
-  CocDefStruct(cryo, Testpoint);
-  CocDefStruct(samp, Testpoint);
-  CocDefPtr(tpoint, Testpoint);
-
-  CocFltFld(Testpoint, temp, RD);
-  CocFltFld(Testpoint, t1, RD);
-  CocFltFld(Testpoint, t2, RD);
-
-  CocDefStruct(sensA, SensorT);
-  CocDefStruct(sensB, SensorT);
-  CocDefStruct(sensC, SensorT);
-  CocDefStruct(sensD, SensorT);
-  CocDefStruct(sensA1, SensorT);
-  CocDefStruct(sensA2, SensorT);
-  CocDefStruct(sensA3, SensorT);
-  CocDefStruct(sensA4, SensorT);
-  CocDefPtr(sens, SensorT);
-
-  CocFltFld(SensorT, t, RD);
-  CocFltFld(SensorT, t0, RD);
-  CocFltFld(SensorT, t1, RD);
-  CocFltFld(SensorT, t2, RD);
-  CocFltFld(SensorT, lim, RW);
-  CocFltFld(SensorT, scale, RD);
-  CocFltFld(SensorT, alarm, RW); CocHdl(AlarmHdl);
-  CocIntFld(SensorT, readStat, RD);
-  CocIntFld(SensorT, stat1, RD);
-  CocIntFld(SensorT, stat2, RD);
-  CocStrFld(SensorT, ch, RD);
-
-  CocDefFlt(maxPower, RW); CocHdl(MaxPowerHdl);
-  CocDefFlt(slope, RW);    CocHdl(MaxPowerHdl);
-  CocDefFlt(prop,     RW); CocHdl(PidHdl);
-  CocDefFlt(integ,    RW); CocHdl(PidHdl);
-  CocDefFlt(deriv,    RW); CocHdl(PidHdl);
-  CocDefFlt(set,  RW); CocHdl(SetHdl);
-  CocDefFlt(ramp, RW); CocHdl(SetHdl);
-  CocDefFlt(still, RW); CocHdl(StillHdl);
-  CocDefFlt(scalPower, RD);
-  CocDefFlt(smooth, RW);
-  CocDefFlt(powFact, RW);
-  CocDefFlt(resist, RD);
-  CocDefFlt(htr, RD);
-  CocDefFlt(power, RD);
-  CocDefFlt(setH, RD);
-  CocDefFlt(full, RW);
-  CocDefFlt(tLimit, RD);
-  CocDefFlt(maxShift, RW);
-  CocDefFlt(tm, RD);
-  CocDefFlt(ts, RD);
-  CocDefFlt(tr, RD);
-  CocDefFlt(tx, RD);
-  CocDefFlt(te, RD);
-  CocDefFlt(aux, RD);
-  CocDefFlt(he, RD);
-  CocDefFlt(fbuf, RD);
-  CocDefFlt(r1, RD);
-  CocDefFlt(r2, RD);
-  CocDefFlt(tShift, RW);
-  CocDefFlt(tInt, RW);
-
-  CocDefPtr(clData, ClientData);
-  CocStrFld(ClientData, cmd, RW); CocHdl(SendHdl);
-  CocIntFld(ClientData, logstart, RA);
-  CocStrFld(ClientData, logline, RA); CocHdl(LogHdl);
-
-  CocAlias(send, clData.cmd);
-  CocAlias(logstart, clData.logstart);
-  CocAlias(logline, clData.logline);
-
-  CocDefStr(device, RW); CocHdl(DeviceHdl);
-  CocDefStr(buf1, RD);
-  CocDefStr(buf2, RD);
-  CocDefStr(buf3, RD);
-  CocDefStr(buf4, RD);
-  CocDefStr(head, RD);
-  CocDefStr(chan, RD);
-  CocDefStr(helium, RD);
-  CocDefStr(heUnits, RD);
-  CocDefStr(intype, RD);
-  CocDefStr(status, RD); CocHdl(StatusHdl);
-  CocDefStr(pid, RD); CocHdl(PidSumHdl);
-  CocDefStr(config, RD);
-  CocDefStr(dev, RD);
-  CocDefStr(dev2, RD);
-  CocDefStr(devHelp, RD); CocHdl(DevHelpHdl);
-
-  CocDefInt(cod1, RD);
-  CocDefInt(cod2, RD);
-  CocDefInt(out1, RD);
-  CocDefInt(out2, RD);
-  CocDefInt(num, RD);
-  CocDefInt(key, RD);
-  CocDefInt(maxfld, RD);
-  CocDefInt(iAmp, RD);
-  CocDefInt(iRange, RD);
-  CocDefInt(remoteMode, RW); CocHdl(RemoteHdl);
-  CocDefInt(relay, RW); CocHdl(RelayHdl);
-  CocDefInt(htrst, RD);
-  CocDefInt(loop, RD);
-  CocDefInt(rdTim, RD);
-  CocDefInt(tim0, RD);
-
-  CocDefInt(logMask, RW);
-  CocDefInt(logPeriod, RW);
-  CocDefInt(readTemp, RW);
-  CocDefInt(controlMode, RW);
-  CocDefInt(int2, RW);
-  CocDefInt(busy, RD);
-  CocDefInt(serialNo, RD);
-  CocDefInt(quit, RW);
-  CocDefInt(nScan, RD);
-
-  CocDefStr(grapar, RA);
-  CocDefArr(gradata, RD); CocHdl(GraHdl); grasize=CocSizePtr();
-
-  CocAlias(tempX,cryo.temp);
-  CocAlias(tempP,samp.temp);
-  CocAlias(Ta,sensA.t);
-  CocAlias(Tb,sensB.t);
-  CocAlias(Tc,sensC.t);
-  CocAlias(Td,sensD.t);
-  CocAlias(T1,sensA1.t);
-  CocAlias(T2,sensA2.t);
-  CocAlias(T3,sensA3.t);
-  CocAlias(T4,sensA4.t);
-  CocAlias(P,power);
-  CocAlias(tempC, set);
-  CocAlias(int,integ);
-
-  CocDefInt(msecTmo, RW); CocHdl(TmoHdl);
-  CocDefStr(host, RW);
-  CocDefInt(port, RD);
-  CocDefInt(use_stdout, RW); CocHdl(LogfileHdl);
-  CocDefStr(serverId, RW); CocHdl(LogfileHdl);
-  CocDefInt(logIt, RW); CocHdl(LogfileHdl);
-  CocDefStr(logDir, RW); CocHdl(LogfileHdl);
-  CocDefStr(binDir, RW);
-
-  logfileOut(LOG_MAIN ,"%s ", argv[0]);
-  for (i=1;i<argc;i++) {
-    if (argv[i]!=NULL) {
-      if (argv[i][0]=='-') {
-        opt=tolower(argv[i][1]);
-      } else {
-        opt=' ';
-      }
-      if ('l'==opt) {
-        logIt=1;
-        logMask=LOG_ALL;
-        opt=' ';
-      } else if ('s'==opt) {
-        use_stdout=1;
-        opt=' ';
-      } else if ('n'==opt) {
-        i++;
-        str_copy(serverId, argv[i]);
-      } else if ('b'==opt) {
-        i++;
-        str_copy(binDir, argv[i]);
-      } else if ('d'==opt) {
-        i++;
-        str_copy(logDir, argv[i]);
-      } else if ('t'==opt) {
-        i++;
-        msecTmo=atoi(argv[i]);
-      } else if ('h'==opt) {
-        i++;
-        str_copy(host, argv[i]);
-      } else if ('p'==opt) {
-        i++;
-        port=atoi(argv[i]);
-      } else if ('f'==opt) {
-        i++;
-        logPeriod=atoi(argv[i]);
-      } else {
-        if (NULL!=strchr(argv[i], '=')) {
-          CocReadVars(argv[i], '\0');
-        } else {
-          inistr=str_read_file(argv[i]);
-          if (inistr==NULL) {
-            logfileOut(LOG_MAIN ,"?");
-          } else {
-            CocReadVars(inistr, '\0');
-            FREE(inistr);
-          }
-        } 
-      }
-      if (opt!=' ') logfileOut(LOG_MAIN ,"-%c ", opt);
-      logfileOut(LOG_MAIN ,"%s ", argv[i]);
-    }
-  }
-
-  assert(logPeriod>0 && host[0]!='\0' && port!=0 && msecTmo>0);
-
-  str_copy(statusBuf, "starting up");
-  logfileStatusBuf(statusBuf);
-
-  str_copy(buf, logDir);
-  str_append(buf, serverId);
-  logfile=logfileInit(buf, logIt, use_stdout, logIt && use_stdout);
-  CocDefStr(logfile, RD);
-  logfileOut(LOG_MAIN ,"\n");
-  logfileWrite(logMask);
-
-  ERR_I(CocInitServer(SetClientData, port));
-
-  ser=SerOpen(host, msecTmo, IdleHdl);
-  if (ser==NULL) {
-    str_copy(statusBuf, "can not connect to serial port server or terminal server");
-    logfileShowErr("error in SerOpen");
-  }
-  ERR_I(iret=CocHandleRequests(100, 0));
-  tim0=mycMsecSince(0)/period*period;
-  tim=mycNow();
-
-  ERR_P(DataCreateSet(NULL, "Tm", &tm, 5, LOGLIFETIME, tim));
-  ERR_P(DataCreateSet(NULL, "Ts", &ts, 5, LOGLIFETIME, tim));
-  ERR_P(DataCreateSet(NULL, "Tr", &tr, 5, LOGLIFETIME, tim));
-  ERR_P(DataCreateSet(NULL, "Te", &te, 5, LOGLIFETIME, tim));
-  ERR_P(DataCreateSet(NULL, "He", &he, 5, LOGLIFETIME, tim));
-  ERR_P(DataCreateSet(NULL, "T1", &sensA1.t, 5, LOGLIFETIME, tim));
-  ERR_P(DataCreateSet(NULL, "T2", &sensA2.t, 5, LOGLIFETIME, tim));
-  ERR_P(DataCreateSet(NULL, "T3", &sensA3.t, 5, LOGLIFETIME, tim));
-  ERR_P(DataCreateSet(NULL, "T4", &sensA4.t, 5, LOGLIFETIME, tim));
-  ERR_P(DataCreateSet(NULL, "Aux", &aux, 5, LOGLIFETIME, tim));
-  ERR_P(DataCreateSet(NULL, "P", &power, 5, LOGLIFETIME, tim));
-
-  remoteMode=2;
-  prop=50;
-  integ=20;
-  deriv=0;
-  if (ser!=NULL) {
-    LscCmd(ser, "MODE?>remoteMode");
-    LoadFromLsc();
-  }
-  per=1; /* advance fast when initializing */
-  cntError=0;
-  while (!quit) {
-    iret=MainBody();
-    if (ser!=NULL && 0!=strcmp(host, ser->host)) {
-      SerClose(ser);
-      ser=NULL;
-      noResp=1;
-    }
-    if (iret<0 || ser==NULL) {
-      cntError++;
-      ser=SerCheck(ser);
-      if (0==strcmp(ErrMessage, "asynsrv error")) {
-        if (ser!=NULL) SerClose(ser);
-        ser=NULL;
-        noResp=1;
-      }
-      if (cntError<4) {
-        if (iret<0) {
-          logfileShowErr("error in TecsServer/MainBody");
-        } else {
-          logfileShowErr("error in SerOpen");
-        }
-      } else if (cntError==4) {
-        logfileOut(LOG_MAIN, "--- too many errors: skip messages ---\n");
-      }
-      if (ser==NULL) {
-        CocHandleRequests(msecTmo, 0);
-        ser=SerOpen(host, msecTmo, IdleHdl);
-        if (ser==NULL) {
-          str_copy(statusBuf, "can not connect to serial port server or terminal server");
-        } else {
-          LscCmd(ser, "MODE?>remoteMode");
-          LoadFromLsc();
-        }
-      }
-    } else {
-      if (cntError>0) {
-        if (cntError>4) {
-          cntError=4;
-        }
-        cntError--;
-      }
-    }
-  }
-  LogMinMax(0);
-  logfileWrite(logMask);
-  if (quit==1) {
-    ERR_MSG("restart by quit command");
-  } else {
-    ERR_MSG("killed by quit command");
-  }
-  OnError:
-    printf("TecsServer exited: %s\n", ErrMessage);
-    logfileShowErr("exit TecsServer");
-    if (ser!=NULL) SerClose(ser);
-    CocCloseServer();
-    logfileClose();
-    return quit;
-}
diff --git a/tecs/tecs.tcl b/tecs/tecs.tcl
deleted file mode 100644
index 6f19fe95..00000000
--- a/tecs/tecs.tcl
+++ /dev/null
@@ -1,3 +0,0 @@
-catch {evfactory del temperature} msg
-evfactory new temperature tecs
-SicsAlias temperature tt
diff --git a/tecs/tecs_c.c b/tecs/tecs_c.c
deleted file mode 100644
index d10ea1e8..00000000
--- a/tecs/tecs_c.c
+++ /dev/null
@@ -1,82 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "myc_err.h"
-#include "myc_str.h"
-#include "myc_time.h"
-#include "myc_mem.h"
-#include "tecs_cli.h"
-#include "tecs_c.h"
-
-static pTecsClient conn=NULL;
-static char response[COC_RES_LEN];
-static char *rwCode="rwacs";
-static char *rdCode="rdacs";
-
-char *TecsCmd(char *cmd) {
-  char nbuf[64], *p, pbuf[4];
-  int iret=-1, l;
-
-  p=strchr(cmd, ' ');
-  if (p==NULL) {
-    str_copy(nbuf, cmd);
-  } else {
-    l=p-cmd;
-    if (l>=sizeof(nbuf)) l=sizeof(nbuf)-1;
-    strncpy(nbuf, cmd, l+1);
-    nbuf[l]='\0';
-    while (*p>'\0' && *p<=' ') p++;
-    if (*p=='\0') p=NULL;
-  }
-  if (p==NULL) {
-    CocReset(conn);
-    ERR_I(CocGetStr(conn, nbuf, pbuf, sizeof(pbuf)));
-    ERR_I(CocDoIt(conn, response, sizeof(response)));
-  } else {
-    CocReset(conn);
-    ERR_I(CocPutStr(conn, nbuf, p));
-    ERR_I(CocDoIt(conn, response, sizeof(response)));
-  }
-  return response;
-  OnError: return ErrMessage;
-}
-
-char *TecsGet3(float *tset, float *texch, float *tsamp) {
-  ERR_I(TeccGet3(conn, tset, texch, tsamp));
-  return NULL;
-  OnError: return ErrMessage;
-}
-
-char *TecsSet(float temp) {
-  ERR_I(TeccSet(conn, temp));
-  return NULL;
-  OnError: return ErrMessage;
-}
-
-char *TecsInit(char *host, int port) {
-  int iret;
-  if (conn!=NULL) TeccClose(conn);
-  NEW(conn, CocConn);
-  if (host==NULL || *host=='\0') {
-    ERR_I(iret=CocInitClient(conn, "", port, rwCode, 0, ""));
-  } else {
-    ERR_I(iret=CocInitClient(conn, host, port, rdCode, 0, ""));
-  }
-  if (iret==1) ErrShort("TECS_INIT: can not connect to TecsServer");
-  return NULL;
-  OnError:
-    FREE(conn);
-    return ErrMessage;
-}
-
-int TecsIsOpen(void) {
-  return(conn!=NULL);
-}
-
-void TecsClose(void) {
-  if (conn!=NULL) {
-    TeccClose(conn);
-    conn=NULL;
-  }
-}
-
diff --git a/tecs/tecs_c.h b/tecs/tecs_c.h
deleted file mode 100644
index 92a06dca..00000000
--- a/tecs/tecs_c.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* prototypes for TASCOM */
-
-char *TecsCmd(char *cmd);
-char *TecsGet3(float *tset, float *texch, float *tsamp);
-char *TecsSet(float temp);
-char *TecsInit(char *host, int port);
-int TecsIsOpen(void);
-void TecsClose(void);
diff --git a/tecs/tecs_cli.c b/tecs/tecs_cli.c
deleted file mode 100644
index 03368508..00000000
--- a/tecs/tecs_cli.c
+++ /dev/null
@@ -1,374 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "myc_mem.h"
-#include "myc_err.h"
-#include "myc_str.h"
-#include "myc_time.h"
-#include "myc_fortran.h"
-#include "coc_util.h"
-#include "tecs_cli.h"
-#include "tecs_data.h"
-
-int gethostname(char *name, int namelen);
-
-static char response[COC_RES_LEN];
-static char *rwCode="rwacs";
-static char *rdCode="rdacs";
-
-pTecsClient TeccInit(char *startcmd, int port) {
-  CocConn *conn=NULL;
-  char *code, host[64];
-  int iret;
-
-  NEW(conn, CocConn);
-  code=rwCode;
-  if (startcmd[0]=='#') {
-    gethostname(host, sizeof(host));
-    if (0!=strcmp(startcmd+1, host)) code=rdCode;
-    ERR_I(iret=CocInitClient(conn, startcmd+1, port, code, 0, ""));
-  } else {
-    ERR_I(iret=CocInitClient(conn, "", port, code, 0, startcmd));
-  }
-  if (iret==1) ErrShort("TECS_INIT: can not connect to TecsServer");
-  return((pTecsClient)conn);
-  OnError:
-    if (conn!=NULL) FREE(conn);
-    return(NULL);
-}
-
-pTecsClient TeccStart(char *startcmd, char *host, int port) {
-  CocConn *conn;
-  char *code, *cmd, thishost[64];
-  int iret;
-
-  NEW(conn, CocConn);
-  code=rwCode;
-  cmd=startcmd;
-  if (host[0]!='\0') {
-    gethostname(thishost, sizeof(thishost));
-    if (0!=strcmp(thishost, host)) {
-      code=rdCode;
-      cmd="";
-    }
-  }
-  ERR_I(iret=CocInitClient(conn, host, port, code, 0, cmd));
-  if (iret==1) ErrShort("TECS_INIT: can not connect to TecsServer");
-  return((pTecsClient)conn);
-  OnError: return(NULL);
-}
-
-int TeccGet3(pTecsClient conn, float *tC, float *tX, float *tP) {
-  int iret;
-
-  CocReset(conn);
-  ERR_I(CocGetFloat(conn, "set", tC));
-  ERR_I(CocGetFloat(conn, "tempX", tX));
-  ERR_I(CocGetFloat(conn, "tempP", tP));
-  ERR_I(CocPutInt(conn, "readTemp", 1));
-  ERR_I(iret=CocDoIt(conn, response, sizeof(response)));
-  if (iret) ERR_MSG(response);
-  return 0;
-  OnError: return(-1);
-}
-
-int TeccGet(pTecsClient conn, float *temp) {
-  int iret;
-
-  CocReset(conn);
-  ERR_I(CocGetFloat(conn, "tempP", temp));
-  ERR_I(CocPutInt(conn, "readTemp", 1));
-  ERR_I(iret=CocDoIt(conn, response, sizeof(response)));
-  if (iret) ERR_MSG(response);
-  return 0;
-  OnError: return(-1);
-}
-
-int TeccGetX(pTecsClient conn, float *tC, float *tP, float *tDif) {
-  int iret;
-  float tx;
-
-  CocReset(conn);
-  CocReset(conn);
-  ERR_I(CocGetFloat(conn, "set", tC));
-  ERR_I(CocGetFloat(conn, "tx", &tx));
-  ERR_I(CocGetFloat(conn, "tempP", tP));
-  ERR_I(CocPutInt(conn, "readTemp", 1));
-  ERR_I(iret=CocDoIt(conn, response, sizeof(response)));
-  *tDif = *tC - tx;
-  if (iret) ERR_MSG(response);
-  return 0;
-  OnError: return(-1);
-}
-
-int TeccSet(pTecsClient conn, float temp) {
-  int iret;
-
-  CocReset(conn);
-  ERR_I(CocPutFloat(conn, "set", temp));
-  ERR_I(iret=CocDoIt(conn, response, sizeof(response)));
-  if (iret) ERR_MSG(response);
-  return 0;
-  OnError: return(-1);
-}
-
-int TeccQuitServer(pTecsClient conn, int kill) {
-  int iret, cnt;
-
-  ERR_I(iret=CocCheck(conn));
-  if (iret>0) return iret;
-  CocReset(conn);
-  ERR_I(CocPutInt(conn, "quit", 1+kill));
-  ERR_I(iret=CocDoIt(conn, response, sizeof(response)));
-  if (iret) ERR_MSG(response);
-  cnt=50;
-  while (iret==0 && cnt>0) {
-    CocDelay(100);
-    ERR_I(iret=CocCheck(conn));
-    cnt--;
-  }
-  if (iret==0) ERR_MSG("Does not quit within 5 seconds");
-  return 0;
-  OnError:
-    return(-1);
-}
-
-int TeccSend(pTecsClient conn, char *cmd, char *reply, int replyLen) {
-  return(CocSetGetN(conn, "send", cmd, reply, replyLen));
-}
-
-void TeccClose(pTecsClient conn) {
-  if (conn!=NULL) {
-    CocCloseClient(conn);
-    FREE(conn);
-  }
-}
-
-/* fortran wrappers --------------------------------------------------
-
-  reduced functionality:
-  connection is static, so only one connection at a time may be opened 
-
-*/
-
-#ifdef F_CHAR
-/* compile only when fortran c interface stuff is defined */
-
-
-static pTecsClient conn=NULL;
-
-int F_FUN(tecs_set_par)(F_CHAR(name), F_CHAR(par), int *show, int name_len, int par_len) {
-  char nbuf[64], pbuf[COC_CMD_LEN];
-  int iret=-1;
-
-  STR_TO_C(nbuf, name);
-  STR_TO_C(pbuf, par);
-
-  CocReset(conn);
-  ERR_I(CocPutStr(conn, nbuf, pbuf));
-  ERR_I(CocDoIt(conn, response, sizeof(response)));
-  if (*show) {
-    printf("%s", response);
-  }
-  return 0;
-  OnError: return(-1);
-}
-
-int F_FUN(tecs_get_par)(F_CHAR(name), F_CHAR(par), int *show, int name_len, int par_len) {
-  char *b, nbuf[64], pbuf[COC_RES_LEN];
-  int iret=-1;
-
-  STR_TO_C(nbuf, name);
-  CocReset(conn);
-  ERR_I(CocGetStr(conn, nbuf, pbuf, sizeof(pbuf)));
-  ERR_I(CocDoIt(conn, response, sizeof(response)));
-  if (*show==2) {
-    b=response;
-  } else {
-    b=strchr(response,'=');
-    if (b==NULL) {
-      b=response;
-    } else {
-      b++;
-    }
-  }
-  if (*show) {
-    printf("%s", b);
-  }
-  return(STR_TO_F(par, pbuf));
-  OnError: return(-1);
-}
-
-int F_FUN(tecs_get_mult)(F_CHAR(names), int *time, int *nvalues, float values[], int names_len) {
-  char *b, nbuf[64], pbuf[COC_RES_LEN];
-  char *nams, nam[32];
-  int i;
-
-  STR_TO_C(nbuf, names);
-  CocReset(conn);
-
-  ERR_I(CocGetInt(conn, "rdTim", time));
-  i=0;
-  nams=nbuf;
-  while (nams!=NULL && i < *nvalues) {
-    nams=str_split(nam, nams, ' ');
-    if (nam[0]!='\0') {
-      ERR_I(CocGetFloat(conn, nam, values+i));
-      i++;
-    }
-  }
-
-  ERR_I(CocDoIt(conn, response, sizeof(response)));
-  return 0;
-  OnError: return(-1);
-}
-
-int F_FUN(tecs_init)(F_CHAR(startcmd), int *port, int startcmd_len) {
-  char sbuf[132];
-
-  STR_TO_C(sbuf, startcmd);
-  ERR_P(conn=TeccInit(sbuf, *port));
-  return 0;
-  OnError: return(-1);  
-}
-
-int F_FUN(tecs_start)(F_CHAR(startcmd), F_CHAR(host), int *port, int startcmd_len, int host_len) {
-  char sbuf[132], hbuf[64];
-
-  STR_TO_C(sbuf, startcmd);
-  STR_TO_C(hbuf, host);
-  ERR_P(conn=TeccStart(sbuf, hbuf, *port));
-  if (conn->fd<0) return 1;
-  return 0;
-  OnError: return(-1);
-}
-
-int F_FUN(tecs_rights)(int write) {
-  if (write) {
-    ERR_I(CocSendMagic(conn, rwCode));
-  } else {
-    ERR_I(CocSendMagic(conn, rdCode));
-  }
-  return 0;
-  OnError: return(-1);  
-}
-
-int F_FUN(tecs_get)(float *temp) {
-  ERR_I(TeccGet(conn, temp));
-  return 0;
-  OnError: return(-1);  
-}
-
-int F_FUN(tecs_get3)(float *t1, float *t2, float *t3) {
-  ERR_I(TeccGet3(conn, t1, t2, t3));
-  return 0;
-  OnError: return(-1);  
-}
-
-int F_FUN(tecs_set)(float *temp) {
-  ERR_I(TeccSet(conn, *temp));
-  return 0;
-  OnError: return(-1);  
-}
-
-int F_FUN(tecs_is_open)(void) {
-  return(conn!=NULL);
-}
-
-void F_FUN(tecs_close)(void) {
-  TeccClose(conn);
-  conn=NULL;
-}
-
-int F_FUN(tecs_quit_server)(int *kill) {
-  int iret;
-
-  ERR_I(iret=TeccQuitServer(conn, *kill));
-  return(iret);
-  OnError: return(-1);  
-}
-
-int F_FUN(tecs_watch_log)(F_CHAR(list), int list_len) {
-  char buf[16];
-  STR_TO_C(buf, list);
-  ERR_I(CocWatchLog(conn, buf));
-  return 0;
-  OnError: return(-1);  
-}
-
-int F_FUN(tecs_get_data)(F_CHAR(names), int *startTime, int *endTime, int *step, int *tbase
-                  , float xdata[], float ydata[], int *maxLen, int *width
-                  , int retLen[], int names_len) {
-  char nam[64];
-  char str[128];
-  float offset, fact, *py, data[8192];
-  int i, j, k, l, iret;
-
-  if (*endTime - *startTime > *step * (*maxLen-1)) {
-    printf("maxLen too small\n");
-  }
-  STR_TO_C(nam, names);
-  if (*step <= 0) {
-    *step = 60;
-  }
-  sprintf(str, "%d %d %d %s", *startTime, *endTime, *step, nam);
-  
-  CocReset(conn);
-  ERR_I(CocPutStr(conn, "grapar", str));
-  ERR_I(CocGetArray(conn, "gradata", data, sizeof(data)/sizeof(float)));
-  ERR_I(iret=CocDoIt(conn, response, sizeof(response)));
-  if (iret) ERR_MSG(response);
-  py=data;
-  for (i=0; i < *width; i++) {
-    l=*py; py++;
-    if (l>0) {
-      fact = (float)(*endTime - *startTime) / l;
-    }
-    offset = *startTime - *tbase;
-    k = i * *maxLen;
-    for (j=0; j<l; j++) {
-      if (py[j] != DATA_GAP) {
-        ydata[k] = py[j];
-        xdata[k] = offset + j * fact;
-        k++;
-      }
-    }
-    py+=l;
-    retLen[i] = k - i * *maxLen;
-  }
-  return 0;
-  OnError:
-    return -1;
-}
-
-
-/*
-float tecs_date_(time_t *time) {
-  struct tm tim;
-
-  tim=*localtime(time);
-  return(tim.tm_mday+(tim.tm_mon+1)*0.01);
-}
-
-time_t tecs_time_(float *date) {
-  struct tm tim;
-  time_t t, now;
-  int m;
-
-  time(&now);
-  tim=*localtime(&now);
-  tim.tm_hour=0;
-  tim.tm_min=0;
-  tim.tm_sec=0;
-  tim.tm_mday=(int)*date;
-  m=(int)(*date*100+0.1) % 100;
-  if (m > 0) tim.tm_mon=m-1;
-  t=mktime(&tim);
-  if (t > now) {
-    tim.tm_year--;
-    t=mktime(&tim);
-  }
-  return t;
-}
-*/
-#endif
diff --git a/tecs/tecs_cli.h b/tecs/tecs_cli.h
deleted file mode 100644
index a2b3a6ae..00000000
--- a/tecs/tecs_cli.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef _TECS_CLI_H_
-#define _TECS_CLI_H_
-
-#include "coc_client.h"
-/*
-  tecs_cli.h: tecs client interface routines
-
-  M. Zolliker March 2000
-*/
-
-typedef CocConn *pTecsClient;
-
-
-pTecsClient TeccInit(char *server, int port);
-/*  init tecs client (connect to server)  */
-
-int TeccGet(pTecsClient conn, float *temp);
-/*  get temperature  */
-
-int TeccGetX(pTecsClient conn, float *tC, float *tP, float *tDif);
-/*  get controlled temperature  */
-
-int TeccGet3(pTecsClient conn, float *tSet, float *tExch, float *tSamp);
-/*  get temperatures  */
-
-int TeccSet(pTecsClient conn, float temp);
-/*  set temperature */
-
-int TeccSend(pTecsClient conn, char *cmd, char *reply, int replyLen);
-/*  send a command transparently to the controller
-    replyLen is the maximal length of reply */
-
-void TeccClose(pTecsClient conn);
-/*  close connection and free ressources */
-
-int TeccQuitServer(pTecsClient conn, int kill);
-/*  quit the server process, kill = 0: restart if possible */
-
-/* Fortran interface:
-
-    integer function TECS_INIT(STARTCMD, PORT)      - open server connection
-    logical function TECS_IS_OPEN ()                - check if tecs is open
-    integer function TECS_GET3(SET_T, REG_T, SAM_T) - read 3 temperatures
-    integer function TECS_WAIT()                    - wait for end of configuration
-    integer function TECS_SET (TEMP)                - set temperature target
-    integer function TECS_GET (TEMP)                - get sample temperature
-    integer function TECS_QUIT_SERVER ()            - force server to quit
-    integer function TECS_GET_PAR (NAME, PAR)       - get parameter
-    integer function TECS_SET_PAR (NAME, PAR)       - set parameter
-    integer function TECS_SEND (CMND, REPLY)        - send command to LakeShore
-    subroutine TECS_CLOSE                           - close connection to tecs
-   
-      character*(*) STARTCMD    - command to start server (no restart if empty)
-      integer PORT              - port number
-      real SET_T,REG_T,SAM_T    - set-temperature, regulation temperature, sample temperature
-      real TEMP                 - temperature
-      character*(*) NAME        - parameter name
-      character*(*) PAR         - parameter value
-      character*(*) CMND        - raw command
-      character*(*) REPLY       - reply to command
-
-    integer return values are error codes (negative means error, like in most C system routines)
-*/
-
-#endif /* _TECS_CLI_H_ */
diff --git a/tecs/tecs_client.f b/tecs/tecs_client.f
deleted file mode 100644
index 3865bd4b..00000000
--- a/tecs/tecs_client.f
+++ /dev/null
@@ -1,364 +0,0 @@
-	program tecs_client
-
-	character device*32, start*80, line*80, cmd*16, par*80, response*1024
-	character inst*64, host*64, user*1, pcod*1
-	integer i,j,k,iret,l,port
-	integer maxfiles
-	real wait
-	parameter (maxfiles=10)
-	integer nfiles/0/, mfiles/0/, idx, luns(0:maxfiles-1)
-	character cmdpar*128
-	character prompt*32/'tecs>'/
-	integer promptlen/6/
-	logical oneCommand
-	character logarg*4/'25'/
-	character defcmd*8/'status'/
-
-! functions
-	integer tecs_get_par, tecs_quit_server, tecs_set_par, tecs_watch_log
-	integer tecs_get, tecs_rights, show_log, instr_host, tecs_start
-
-	call sys_loadenv
-	call sys_getenv('CHOOSER_GDEV', line)
-	if (line .ne. ' ') then
-	  call sys_setenv('PGPLOT_DEV', '/'//line)
-	endif
-
-	call sys_get_cmdpar(line, l)
-
-	if (l .ne. 0) then
-	  if (line(1:l) .eq. 'off' .or. line(1:l) .eq. 'OFF') then
-	    iret=tecs_start(' ', ' ', 9753)
-	    if (iret .lt. 0) goto 91
-	    iret=tecs_quit_server(0)
-	    if (iret .lt. 0) goto 91
-	    goto 99
-	  endif
-	  oneCommand=.true.
-	  port=instr_host(line, inst, host, user, pcod)
-	else
-	  oneCommand=.false.
-	  port=0
-	endif
-
-	call sys_getenv('TECS_START', start)
-	if (port .gt. 0) then
-	  if (port .eq. 1) port=9753
-	  call str_trim(start, start, k)
-	  call str_trim(inst, inst, i)
-	  if (start .ne. ' ') then
-	    start=start(1:k)//' '//inst(1:i)
-	  endif
-	  iret=tecs_start(start, host, port)
-	  oneCommand=.false.
-	  prompt='tecs/'//inst(1:i)//'> '
-	  promptlen=i+7
-	else
-	  iret=tecs_start(start, ' ', 9753)
-	endif
-	if (iret .ne. 0) goto 90
-
-	if (oneCommand) goto 11
-
-	print *
-	print *,'Tecs Client'
-	print *,'-----------'
-	print *
-	print *,'set <temp>           set temperature'
-	print *,'send <command>       direct command to LSC340'
-	print *,'device <device>      set cryo device'
-	print *,'<parameter>          show parameter'
-	print *,'<parameter> <value>  set parameter'
-	print *
-	print *,'<empty line>         show summary'
-	print *,'plot <var>           chart for temperature and <var>'
-	1 ,' var = P (default), He, Aux'
-	print *,'log <n>              show last n lines of logfile'
-	print *,'remote               set to remote mode'
-	print *,'reset                reset alarms'
-	print *,'kill                 shut down TecsServer'
-	print *,'restart              restart TecsServer'
-	print *,'exit,quit            exit tecs client'
-	print *,'help                 show list of parameters and cryo devices'
-	print *
-
-	l=0
-1	if (oneCommand) goto 99
-	if (nfiles .gt. 0) then
-	  read(luns(idx), '(q,a)', err=22,end=22) l, line
-	  print '(x,2a)', prompt(1:promptlen),line(1:max(1,l))
-	else
-	  call sys_rd_line(line, l, prompt(1:promptlen))
-	  if (l .lt. 0) goto 99
-	endif
-	if (line(1:1) .eq. '@') then
-	  nfiles=nfiles+1
-	  idx=mod(nfiles, maxfiles)
-	  if (nfiles .gt. mfiles+maxfiles) then ! close files which are too much nested
-	    close(luns(idx))
-	    mfiles=nfiles-maxfiles
-	  else
-	    call sys_get_lun(luns(idx))
-	  endif
-	  call sys_open(luns(idx), line(2:), 'R', i)
-	  if (i .ne. 0) then
-	    print *,'error opening ',line(2:)
-	    close(luns(idx))
-	    call sys_free_lun(luns(idx))
-	    nfiles=nfiles-1
-	    idx=mod(nfiles, maxfiles)
-          endif
-	  goto 1
-	endif
-11	l=l+1	
-	line(l:l)=' '
-	cmd=' '
-	k=0
-	do j=1,l
-	  if (k .gt. 0 .and. line(j:j) .eq. '=') line(j:j)=' '
-	  if (line(j:j) .gt. ' ') then
-	    k=k+1
-	    cmd(k:k)=line(j:j)
-	    if (cmd(k:k) .ge. 'A' .and. cmd(k:k) .le. 'Z') then ! set to lowercase
-	      cmd(k:k)=char(ichar(cmd(k:k))+32)
-	    endif
-	  elseif (k .gt. 0) then ! end of command
-	    par=' '
-	    do i=j,l
-	      if (line(i:i) .gt. ' ') then
-	        par=line(i:l)
-	        goto 3 ! command with parameter
-	      endif
-	    enddo
-	    goto 2 ! parameterless command
-	  endif
-	enddo
-
-	if (k .ne. 0) then
-	  print *,'command too long'
-	  goto 1
-	endif
-
-	! empty command
-
-12	cmd=defcmd
-
-2	continue ! parameterless command
-
-	defcmd='status'
-
-	if (cmd .eq. 'kill') then
-	  iret=tecs_quit_server(1)
-	  if (iret .lt. 0) goto 19
-	  if (iret .gt. 0) then
-	    print *,'tecs server is not running'
-	  endif
-	else if (cmd .eq. 'restart') then
-	  iret=tecs_quit_server(0)
-	  if (iret .lt. 0) goto 19
-	  if (iret .gt. 0) then
-	    print *,'tecs server is not running'
-	  endif
-	else if (cmd .eq. 'remote') then
-	  iret=tecs_set_par('remoteMode', '2', 2)
-	  if (iret .lt. 0) goto 19
-	else if (cmd .eq. 'reset') then
-	  iret=tecs_set_par('relay', '0', 2)
-	  if (iret .lt. 0) goto 19
-	elseif (cmd .eq. 'rwacs') then
-	  iret=tecs_rights(1)
-	  if (iret .lt. 0) goto 19
-	elseif (cmd .eq. 'exit' .or. cmd .eq. 'quit') then
-	  goto 99
-	elseif (cmd .eq. 'status') then
-	  iret=tecs_get_par('status', response, 1)
-	  if (iret .lt. 0) goto 19
-	elseif (cmd .eq. 'on' .or. cmd .eq. 'off') then
-	  l=0
-	  goto 11
-	elseif (cmd .eq. 'plot') then
-	  call tecs_plot(' ')
-	elseif (cmd .eq. 'help') then
-	  print *
-	  print *,'Writeable parameters:'
-	  print *
-	  print *,'set           temperature set-point'
-	  print *,'device        temperature device'
-	  print *,'controlMode   control on: 0: heat exchanger, '
-	1        ,'1: sample, 2: second loop'
-	  print *,'maxPower      heater max. power'
-	  print *,'ramp          ramp in K/min. (0: no ramp)'
-	  print *,'prop          PID gain'
-	  print *,'int           PID integration time: 1000/int sec'
-	  print *,'deriv         PID derivation term'
-	  print *,'maxShift      maximum (set-tempH) for controlMode=2'
-	  print *,'int2          integration time (sec) for controlMode=2'
-!	  print *,'remoteMode    1: local, 2: remote'
-	  print *
-	  print *,'Read only parameters:'
-	  print *
-	  print *,'Tm            main temperature'
-	  print *,'Ts            sample temperature'
-	  print *,'Tr            set-point on regulation'
-	  print *,'tLimit        temperature limit'
-	  print *,'helium        helium level'
-	  print *,'htr           heater current percentage'
-	  print *,'resist        heater resistance'
-	  print *,'logfile       name of the logfile'
-	  print *
-	  print *,'Ta,Tb,Tc,Td   values of channels A,B,C,D'
-	  print *
-	  print *,'devhelp       list available temperature devices'
-	  print *
-	elseif (cmd .eq. 'log') then
-	  if (line(1:l) .eq. ' ') then
-	    print '(x,a)'
-	1     ,char(27)//'[A'//char(13)//char(27)//'[K'//char(27)//'[2A'
-	  endif
-	  if (show_log(logarg) .le. 0) then
-	    logarg='25'
-	    print *,'-------- end of logfile --------'
-	    goto 12
-	  endif
-	  defcmd='log'
-	  logarg=' '
-	elseif (cmd .eq. 'watch') then
-          iret=tecs_watch_log('M')
-	  if (iret .lt. 0) goto 19
-	else
-	  iret=tecs_get_par(cmd, response, 2)
-	  if (iret .lt. 0) goto 19
-	  if (oneCommand .and. response .eq. ' ') goto 92
-	endif
-	goto 1
-
-3	continue ! command with parameter
-
-	defcmd='status'
-
-	if (cmd .eq. 'log') then
-	  if (show_log(par) .gt. 0) then
-	    defcmd='log'
-	  endif
-	  logarg=' '
-	elseif (cmd .eq. 'plot') then
-	  call str_lowcase(par, par)
-	  call str_upcase(par(1:1), par(1:1))
-	  call tecs_plot(par)
-	elseif (cmd .eq. 'watch') then
-          iret=tecs_watch_log(par)
-	  if (iret .lt. 0) goto 19
-	elseif (cmd .eq. 'wait') then
-	  read(par, *, err=17,end=17) wait
-	  call sys_wait(wait*60.0)
-17	  continue
-	else
-	  iret=tecs_set_par(cmd, par, 2)
-	  if (iret .lt. 0) goto 19
-	  if (oneCommand .and. par .eq. ' ') goto 92
-	endif
-	goto 1
-
-19	if (iret .eq. -2) then
-	  call tecs_write_msg(6)
-	  if (oneCommand) goto 90
-	else
-	  call tecs_write_error(6)
-	endif
-	goto 1
-
-22	continue ! end of file
-	close(luns(idx))
-	call sys_free_lun(luns(idx))
-	nfiles=nfiles-1
-	if (nfiles .lt. mfiles) then
-	  print *,'too many files nested'
-	  mfiles=0
-	  nfiles=0
-	endif
-	idx=mod(nfiles,maxfiles)
-	goto 1
-
-90	call tecs_write_error(6)
-92	call exit(40) ! Abort
-
-91	if (iret .lt. 0) then
-	  call tecs_write_error(6)
-	endif
-99	end
-
-
-	integer function show_log(lines)
-
-	character*(*) lines
-
-	integer i,l
-	character str*8192
-
-! functions
-	integer tecs_get_par, tecs_set_par
-
-	if (lines .ne. ' ') then
-	  l=tecs_set_par('logstart', lines, 0)
-	  print *,'line: ',lines
-	  print *
-	endif
-
-	show_log=tecs_get_par('logline', str, 1)
-	end
-
-
-	subroutine TECS_WRITE_ERROR(IOLUN)  !!
-!!	==================================
-!!
-!! write out error message of last error and stack info
-!!
-	implicit    none
-
-	integer IOLUN  !! logical unit for output
-
-	external    tecs_err_routine
-
-	call err_set_outrtn(tecs_err_routine, iolun)
-	call err_show('Error in TECS')
-	end
-
-
-	subroutine TECS_WRITE_MSG(IOLUN)  !!
-!!	================================
-!!
-!! write out error message of last error without stack info
-!!
-	implicit    none
-
-	integer IOLUN  !! logical unit for output
-
-	external    tecs_err_routine
-
-	call err_set_outrtn(tecs_err_routine, iolun)
-	call err_short
-	end
-
-
-	SUBROUTINE TECS_ERR_ROUTINE (LUN, TEXT)
-!	=======================================
-!
-! routine called from C
-!
-	implicit    none
-c--------------------------------------------------------------
-c			    Define the dummy arguments
-	byte	text(128)
-	integer lun
-c--------------------------------------------------------------
-	integer i, j
-c--------------------------------------------------------------
-	do i=1,128
-	  if (text(i) .eq. 0) then
-	    write(lun, '(x,128a1)') (text(j), j=1,i-1)
-	    return
-	  endif
-	enddo
-! no terminating ASCII NUL found
-	write(lun, *) 'error in TECS_ERR_ROUTINE: illegal error text'
-	end
diff --git a/tecs/tecs_data.c b/tecs/tecs_data.c
deleted file mode 100644
index 1fb7bca1..00000000
--- a/tecs/tecs_data.c
+++ /dev/null
@@ -1,558 +0,0 @@
-#include <stdlib.h>
-#include <float.h>
-#include <strings.h>
-#include <assert.h>
-#include "myc_mem.h"
-#include "myc_str.h"
-#include "myc_err.h"
-#include "myc_time.h"
-#include "coc_logfile.h"
-#include "tecs_data.h"
-
-#define RUN_SIZE 1024
-#define SET_LEN 1024
-
-typedef struct {
-  int tmin, tmax, tlim;
-  float dmin, dmax;
-  int reset;
-} Summary;
-
-typedef struct _Run {
-  struct _Run *next;
-  int size, step;
-  int startTime, endTime;
-  float data[RUN_SIZE];
-} Run;
-
-typedef struct _Set {
-  DataSet set;
-  struct _Set *next;
-  int nRuns;
-  int step, lifetime;
-  int start, end;
-  float *var;
-  Run *runs;
-  Summary sum;
-} Set;
-
-typedef struct {
-  Set *head;
-} Base;
-
-typedef struct {
-  Base *base;
-  int tim, from, to;
-  int stdStep;
-} ScanData;
-
-static Base database;
-
-void InsSum(Summary *sum, int t, float d) {
-  if (sum->tmin == 0) {
-    sum->tmin = t;
-    sum->tmax = t;
-    sum->dmin = d;
-    sum->dmax = d;
-  } else {
-    if (d <= sum->dmin) {
-      sum->dmin = d;
-      sum->tmin = t;
-    } else if (d >= sum->dmax) {
-      sum->dmax = d;
-      sum->tmax = t;
-    }
-  }
-}
-
-void ResetSum(Summary *sum) {
-  sum->reset = 1;
-  sum->tmin = 0;
-  sum->dmin = DATA_UNDEF;
-  sum->dmax = DATA_UNDEF;
-}
-
-void PutSum(Summary *sum, float *data) {
-  if (sum->tmin == 0) {
-    data[1] = sum->dmin;
-    data[0] = sum->dmax;
-  } else if (sum->tmin > sum->tmax) {
-    data[1] = sum->dmin;
-    data[0] = sum->dmax;
-    sum->dmin = sum->dmax;
-  } else if (sum->tmin < sum->tmax) {
-    data[1] = sum->dmax;
-    data[0] = sum->dmin;
-    sum->dmax = sum->dmin;
-  } else {
-    data[1] = sum->dmin;
-    data[0] = sum->dmax;
-  }
-  sum->tmin = 0;
-  if (sum->reset) {
-    sum->dmin = DATA_UNDEF;
-    sum->dmax = DATA_UNDEF;
-    sum->reset = 0;
-  }
-}  
-
-Set *FindSet(Base *base, char *name) {
-  Set *s;
-  int total;
-
-  total=0;
-  s = base->head;
-  while (s!=NULL && 0!=strcasecmp(name, s->set.name)) {
-    s = s->next;
-  }
-  return s;
-}
-
-Set *CreateSet(Base *base, char *name, float *var, int step, int lifetime, int start) {
-  Set *s;
-  char *nam;
-
-  s = FindSet(base, name);
-  if (s != NULL) ERR_MSG("dataset exists");
-  NEW(s, Set);
-  s->next = base->head;
-  base->head = s;
-  NEW_STR(nam, name);
-  s->set.name = nam;
-  s->runs = NULL;
-  s->nRuns = 0;
-  s->lifetime = lifetime;
-  s->start = start;
-  s->step = step;
-  s->var = var;
-  ResetSum(&s->sum);
-  return s;
-  OnError:
-    return NULL;
-}
-  
-DataSet *DataFindSet(DataBase *dBase, char *name) {
-  Base *base;
-  if (dBase==NULL) {
-    base=&database;
-  } else {
-    base=(Base *)dBase;
-  }
-  return (DataSet *) FindSet(base, name);
-}
-
-DataSet *DataCreateSet(DataBase *dBase, char *name, float *var, int step, int lifetime, int start) {
-  Base *base;
-  if (dBase==NULL) {
-    base=&database;
-  } else {
-    base=(Base *)dBase;
-  }
-  return (DataSet *) CreateSet(base, name, var, step, lifetime, start);
-}
-  
-int DataSetStep(DataSet *set, int step) {
-  Set *s;
-
-  ERR_P(set);
-  ERR_I(step-1); /* step > 0 */
-  s = (Set *)set;
-  s->step = step;
-  return 0;
-  OnError: return -1;
-}
-
-int DataSetLifetime(DataSet *set, int lifetime) {
-  Set *s;
-
-  ERR_P(set);
-  s = (Set *)set;
-  s->lifetime = lifetime;
-  return 0;
-  OnError: return -1;
-}
-
-Run *InsertRun(Set *s, int time) {
-  Run *r, *next, *last;
-
-  NEW(r, Run);
-  r->next = s->runs;
-  s->runs = r;
-  r->step = s->step;
-  s->nRuns++;
-  if (s->nRuns * s->step > s->lifetime) {
-    next=r->next;
-    last=r;
-    while (next!=NULL && next->endTime > time - s->lifetime) {
-      last = next;
-      next = last->next;
-    }
-    while (next!=NULL) {
-      last->next = next->next;
-      FREE(next);
-      s->nRuns--;
-      next = last->next;
-    }
-  }
-  return r;
-  OnError:
-    return NULL;
-}
-
-int Put(Set *set, int time, float value) {
-  Run *r;
-  int t, try = 1;
-  int size;
-  float last;
-
-  ERR_P(set);
-  if (value == DATA_UNDEF) return 0;
-  r = set->runs;
-  if (r == NULL || r->step != set->step || r->size+3 > RUN_SIZE) {
-    ERR_P(r = InsertRun(set, time));
-    r->startTime = time;
-    r->endTime = time - r->step;
-    size = 0;
-    t = 1;
-  } else {
-    size = r->size;
-    t = (time - r->endTime) / r->step;
-    last = r->data[size-1];
-  }
-  if (t<0) {
-    if (t<-1) {
-      logfileOut(LOG_MAIN, "%s %d <? %d\n", set->set.name, time, r->endTime);
-      ERR_MSG("back in time not possible");
-    }
-    t=0;
-  }     
-  if (t == 0) {
-    InsSum(&set->sum, time, value);
-  } else {
-    if (size % 2) {
-      PutSum(&set->sum, r->data+size-1); size++;
-      r->endTime += r->step;
-      t--;
-    }
-    if (t > 2) {
-      r->data[size]=t-1; size++;
-      r->data[size]=DATA_UNDEF; size++;
-      set->sum.reset = 1;
-      r->endTime += r->step * (t-1);
-      t=1;
-    }
-    InsSum(&set->sum, time, value);
-    if (t % 2) {
-      r->data[size]=value; size++; /* put a provisory value */
-      r->endTime += r->step;
-    } else if (t == 2) {
-      PutSum(&set->sum, r->data+size); size+=2;
-      r->endTime += r->step * 2;
-    }
-  }
-  r->size = size;
-  return 0;
-  OnError:
-    return -1;
-}
-
-int DataPut(DataSet *set, int time, float value) {
-  return Put((Set *)set, time, value);
-}
-
-int DataPutAll(DataBase *base, int time) {
-  Set *s;
-
-  if (base == NULL) {
-    s=database.head;
-  } else {
-    s=((Base *)base)->head;
-  }
-  while (s!=NULL) {
-    if (s->var!=NULL) {
-      ERR_I(Put(s, time, *s->var));
-    }
-    s=s->next;
-  }
-  return 0;
-  OnError:
-    return -1;
-}
-
-int Start(Set *s) {
-  Run *r;
-  int t1, t2;
-  
-  r = s->runs;
-  t1 = s->start;
-  if (r != NULL) {
-    t2 = r->endTime - s->lifetime;
-    if (t1 < t2) {
-      while (r != NULL) {
-        t1 = r->startTime;
-        r = r->next;
-      }
-      if (t1 > t2) {
-        t1 = t2;
-      }
-    }
-  }
-  return t1;
-}
-
-void FreeBase(Base *base) {
-  Set *s, *sFree;
-  Run *r, *rFree;
-
-  s = base->head;
-  while (s != NULL) {
-    r = s->runs;
-    while (r != NULL) {
-      rFree = r;
-      r = r->next;
-      FREE(rFree);
-    }
-    sFree=s;
-    s = s->next;
-    FREE(sFree);
-  }
-}
-
-int GetSet(Set *s, int startTime, int endTime, int size, float *data) {
-  Run *r;
-  int t, tlim, tmin;
-  float d;
-  int i, idx;
-  Summary sum;
-
-  if (size<=0 || size%2 != 0) ERR_MSG("size must be even and positive");
-  ERR_P(s);
-  ERR_P(data);
-  
-  r = s->runs;
-
-  ResetSum(&sum);
-  idx = size - 2;
-  tlim = (endTime - startTime) * idx / size + startTime;
-
-  while (r != NULL) {
-    if (startTime > r->endTime) break;
-    if (endTime >= r->startTime) {
-      t = r->endTime;
-      d = 0;
-      for (i = r->size - 1; i>=0; i--, t-=r->step) {
-        d = r->data[i];
-        if (d == DATA_UNDEF) {
-          i--;
-          t -= (int)(r->data[i] + 0.5) * r->step;
-          sum.reset = 1;
-        } else {
-          if (t < startTime) break;
-          if (t < endTime) {
-            while (t < tlim) {
-              PutSum(&sum, data+idx); idx-=2;
-              tlim = (endTime - startTime) * idx / size + startTime;
-            }
-            InsSum(&sum, t, d);
-          }
-        }
-      }
-    }
-    r = r->next;
-  }
-  sum.reset = 1;
-  while (idx >= 0) {
-    PutSum(&sum, data+idx); idx-=2;
-  }
-  return 0;
-  OnError:
-    return -1;
-}
-
-void Scan(void *sData, char *line) {
-  Set *set;
-  Run *run;
-  Base *base;
-  char str[64], nam[64];
-  int l, iret, hh, mm, ss;
-  float num;
-  int tim, tshift, t0;
-
-  base=((ScanData *)sData)->base;
-  tim=((ScanData *)sData)->tim;
-  
-  /* read time */
-  l=0; iret=sscanf(line, "%d:%d:%d%n", &hh, &mm, &ss, &l); line+=l;
-  if (iret!=3) return;
-  tim+=hh*3600+mm*60+ss;
-  if (tim < ((ScanData *)sData)->from || tim > ((ScanData *)sData)->to) return;
-
-  set=NULL;
-  l=0; iret=sscanf(line, "%64s%n", str, &l); line+=l;
-  while (iret==1) {
-    if (str[0] >= 'A') {
-      str_copy(nam, str);
-      l=0; iret=sscanf(line, "%64s%n", str, &l); line+=l;
-      if (iret==1) {
-        iret=sscanf(str, "%f", &num);
-        if (iret==1) {
-          tshift = 0;
-          if (0 != strcmp(nam, "_")) {
-            set=FindSet(base, nam);
-            if (set!=NULL) tshift = 1;
-          }
-          if (set!=NULL && tim < set->end) {
-            if (tshift) {
-              t0 = tim - ((ScanData *)sData)->stdStep*2;
-              run = set->runs;
-              if (run != NULL && run->endTime >= t0) {
-                t0 = run->endTime;
-              }
-              t0 += set->step;
-              if (t0 > tim) t0 = tim;
-              Put(set, t0, num);
-            } else {
-              Put(set, tim, num);
-            }
-          }
-        }
-      }
-    } else {
-      l=0; iret=sscanf(line, "%64s%n", str, &l); line+=l;
-    }
-  }
-}
-
-void Load(Base *base, int from, int to, int stdStep) {
-  Set *set;
-  ScanData scanData;
-  int t, date;
-
-  scanData.base = base;
-  scanData.stdStep = stdStep;
-  scanData.from = from;
-  scanData.to = to;
-
-  /* round down "from" and "to" to 00:00 local time */
-  from = from - (from % (24*3600));
-  to = to - (to % (24*3600));
-
-  for (t=from; t<=to; t+=24*3600) {
-    scanData.tim=t;
-    logfileScan(mycDate(t), Scan, &scanData);
-  }
-}
-
-int DataGetMult(char *names, int startTime, int endTime, int step, int stdStep, float *data, int data_len) {
-  Base base;
-  Set *set, *s;
-  int stp, minStep, period, s1;
-  char *nams, nam[32];
-  int p, l, n, i, j, siz1, siz2, halfsiz, start;
-
-  base.head = NULL;
-  period = endTime - startTime;
-  if (period<=0) period=1;
-  n=0; nams = names;
-  while (nams != NULL) { /* count names */
-    nams = str_split(nam, nams, ' ');
-    if (nam[0] != '\0') n++;
-  }
-
-  stp=step;
-  if (stp<stdStep) stp=stdStep;
-  nams=names;
-  while (nams!=NULL) { /* create sets for data not in memory */
-    nams=str_split(nam, nams, ' ');
-    if (nam[0]!='\0') {
-      set=FindSet(&database, nam);
-      if (set != NULL) {
-        start = Start(set);
-      } else {
-        start = endTime;
-      }
-      if (set == NULL || start > startTime) {
-        set=CreateSet(&base, nam, NULL, stp, period, startTime);
-        if (set != NULL) set->end = start;
-      }
-    }
-  }
-  if (base.head != NULL) { /* load if needed */
-    Load(&base, startTime, endTime, stdStep);
-  }
-  p=0;
-  nams=names;
-  while (nams!=NULL) {
-    nams=str_split(nam, nams, ' ');
-    if (nam[0]!='\0') {
-      s = FindSet(&database, nam);
-      set = FindSet(&base, nam);
-      s1 = startTime;
-      if (s == NULL) {
-        if (set == NULL) {
-          s1 = 0;
-        } else {
-          s = set;
-        }
-      } else {
-        minStep = s->step;
-        if (set != NULL) {
-          s1 = Start(s);
-          if (s1 >= endTime) {
-            s = set;
-            s1 = startTime;
-          } else if (s1 < startTime || s1 <= Start(set)) {
-            s1 = startTime;
-          }
-        }
-      }
-      if (s1 == 0) { /* empty array */
-        data[p++]=0;
-      } else {
-        minStep = s->step;
-        stp = step;
-        halfsiz = period / (2 * stp) + 1;
-        if (startTime + minStep * halfsiz * 2 > endTime) {
-          if (stp < minStep) stp = minStep;
-          halfsiz = period / (2 * stp) + 1;
-          if (halfsiz * 2 + n > data_len) { /* check if enough space */
-            halfsiz = ((data_len - p) / n - 1) / 2;
-          }
-        }
-        siz1 = (s1 - startTime) * halfsiz / period * 2;
-        siz2 = halfsiz * 2 - siz1;
-        s1 = startTime + (siz1 * period + halfsiz) / halfsiz / 2;
-        p++;
-        if (siz1 > 0) {
-          halfsiz = (s1 - startTime) / set->step / 2;
-          if (halfsiz * 2 < siz1 && halfsiz > 0) {
-            ERR_I(GetSet(set, startTime, s1, halfsiz*2, data+p));
-            j = siz1 - 1;
-            for (i = halfsiz * 2-1; i >= 0; i--) { /* expand data */
-              while (j > siz1 / 2 * i / halfsiz) {
-                data[p+j]=DATA_GAP; j--;
-              }
-              data[p+j]=data[p+i]; j--;
-            }
-          } else {
-            ERR_I(GetSet(set, startTime, s1, siz1, data+p));
-          }
-          l=siz1;
-        } else {
-          l=0;
-        }
-        if (siz2 > 0) {
-          ERR_I(GetSet(s, s1, endTime, siz2, data+p+siz1));
-          l+=siz2;
-        }
-        data[p-1]=l;
-        p+=l;
-      }
-      n--;
-    }
-  }
-  FreeBase(&base);
-  return p;
-  OnError:
-    return -1;
-}
diff --git a/tecs/tecs_data.h b/tecs/tecs_data.h
deleted file mode 100644
index 75bc1124..00000000
--- a/tecs/tecs_data.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef TECS_DATA_H_
-#define TECS_DATA_H_
-
-typedef struct {
-  char *name;
-} DataSet;
-
-typedef struct {
-  void *private;
-} DataBase;
-
-DataSet *DataCreateSet(DataBase *dBase, char *name, float *var, int step, int lifetime, int start);
-/*
-   create a new dataset
-   if the dataset already exists, or memory allocation failed, NULL is returned
-   set <dBase> to NULL to use the common database
-*/
-
-DataSet *DataFindSet(DataBase *dBase, char *name);
-/*
-   find a previously created dataset.
-   returns NULL if dataset not found
-   set <dBase> to NULL to use the common database
-*/
-
-int DataSetStep(DataSet *set, int step);
-int DataSetLifetime(DataSet *set, int lifetime);
-int DataPut(DataSet *set, int time, float value);
-/*
-  put one value to dataset
-*/
-
-int DataPutAll(DataBase *dBase, int time);
-/*
-  put all variables in a set to their dataset
-*/
-
-int DataGetMult(char *names, int startTime, int endTime, int step, int stdStep, float *data, int data_len);
-/*
-  get multiple datasets
-*/
-
-/*
-  define DATA_UNDEF as a binary and decimal well defined, hopefully rarely used number
-*/
-#define DATA_UNDEF MYC_NAN
-#define DATA_GAP (MYC_NAN*2)
-
-#endif /* TECS_DATA_H_ */
diff --git a/tecs/tecs_dlog.inc b/tecs/tecs_dlog.inc
deleted file mode 100644
index 7eaaf7d0..00000000
--- a/tecs/tecs_dlog.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-	integer version, recs, mdat, recl
-	parameter (version=106, recs=1024, mdat=4, recl=mdat*recs)
-	integer step,size,dirlen
-	parameter (step=5, size=8*24*3600/step, dirlen=size/recs+1)
-	real undef
-	parameter (undef=-65535.0)
-
-	integer lunw, lunr, wrec, rrec
-	integer vers, stim, etim
-	logical update
-	real wdat(mdat,0:recs-1), rdat(mdat,0:recs-1)
-	integer wdir(0:dirlen-1), rdir(0:dirlen-1)
-	common/tecs_dlog_inc/ lunw, lunr, wrec, rrec
-	1, vers, stim, etim, update, wdat, rdat, wdir, rdir
diff --git a/tecs/tecs_for.f b/tecs/tecs_for.f
deleted file mode 100644
index 3ad923d3..00000000
--- a/tecs/tecs_for.f
+++ /dev/null
@@ -1,231 +0,0 @@
-	SUBROUTINE TECS_FOR		! File TAS_SRC:[TECS]TECS_FOR.FOR
-c	===================
-c
-cdec$	  ident	'V01D'
-c------------------------------------------------------------------------------
-c	    Fortran-Interface to the TECS Client
-c
-c  M. Zolliker, March 2000
-c Updates:
-c  V01A 21-Mar-2000 DM.	  Integrate into TASMAD
-c       05-Apr-2000 M.Z.  modifed error handling/changed arguments in TeccGet3
-c       01-May-2000 M.Z.  renamed source, TECS_OPEN is now in a separate, system dependent file
-c  V01C 11-May-2000 DM.	  Split into modules.
-c  V01D 12-May-2000 M.Z.  Changed error handling, no longer automatic call to TECS_OPEN
-c------------------------------------------------------------------------------
-c
-c  For a description of the public interface:
-c    on VMS:  search tecs_for.for "!'''!"     (''' may be omitted)
-c    on Unix: grep !"!" tecs_for.for
-c
-c  Public routines in this Module:
-c
-c    subroutine TECS_OPEN (LUN, INIT, IRET)        - open connection to tecs, if not yet open
-c    subroutine TECS_GET_T (IOLUN, TEMP, IRET)     - read the temperature, wait if tecs is configuring
-c    subroutine TECS_WRITE_ERROR (IOLUN)           - write out last occured error in TECS_x routines
-c
-c  For internal use only:
-c
-c    subroutine TECS_FOR                           - dummy entry point to get module name
-c                                                    in library to match the file name.
-c    subroutine TECS_ERR_ROUTINE (LUN, TEXT)       - (for internal use only)
-c
-!!------------------------------------------------------------------------------
-!! C Routines with Fortran interface (see TECS_CLI.C):
-!!
-!!   integer function TECS_SET (TEMP)             - set temperature target
-!!   integer function TECS_GET (TEMP)             - get sample temperature
-!!   integer function TECS_QUIT_SERVER ()         - force server to quit
-!!   integer function TECS_GET_PAR (NAME, PAR)    - get parameter
-!!   integer function TECS_SET_PAR (NAME, PAR)    - set parameter
-!!   integer function TECS_SEND (CMND, REPLY)     - send command to LakeShore
-!!   subroutine TECS_CLOSE                        - close connection to tecs
-!!   
-!!     real TEMP
-!!     character*(*) NAME, PAR, CMND, REPLY
-!!
-!!     integer return values are error codes (negative means error, like in most C system routines)
-!!
-!
-!  C routines only for internal use in TECS_FOR.FOR:
-!
-!    integer function TECS_INIT(STARTCMD, PORT)      - open server connection
-!    logical function TECS_IS_OPEN ()                - check if tecs is open
-!    integer function TECS_GET3(SET_T, REG_T, SAM_T) - read 3 temperatures
-!    integer function TECS_WAIT()                    - wait for end of configuration
-!
-!      character*(*) STARTCMD
-!      integer PORT
-!      real SET_T,REG_T,SAM_T
-c------------------------------------------------------------------------------
-	implicit    none
-	stop 'TECS_FOR: do not call module header'
-	end
-!!------------------------------------------------------------------------------
-!! Fortran routines in this file:
-!!
-	SUBROUTINE TECS_OPEN(LUN, INIT, IRET) !!
-!!	=====================================
-!!
-!! Open connection to the Tecs Server, if not yet done.
-!! (a) LUN==0: INIT is the start command which should contain "-p <portnumber>"
-!! (b) LUN/=0: INIT is the file specification where to read port number and start command
-!!
-c------------------------------------------------------------------------------
-	implicit    none
-
-c--------------------------------------------------------------
-c			    Define the dummy arguments
-	integer       LUN        !! logical number for reading init file
-	character*(*) INIT       !! file specification or start command
-	integer	      IRET       !! iret<0 means error
-c--------------------------------------------------------------
-	integer	      ios, port, i
-	character*128 startcmd
-
-! functions:
-	integer       tecs_init
-	logical       tecs_is_open
-c--------------------------------------------------------------
-
-	if (tecs_is_open()) then
-	  iret=1 ! already open
-	  return
-	endif
-
-	port=0
-
-	if (lun .eq. 0) then
-
-c	  extract the port number from the start command
-
-	  i=index(init, '-p ')
-	  if (i .eq. 0) i=index(init, '-P ')
-	  if (i .ne. 0) then
-	    read(init(min(len(init),i+3):),*,iostat=ios) port
-	  endif
-
-	  if (port .eq. 0) port=9753
-
-	  if (init(1:1) .eq. '#') then
-	    i=index(init, '-')-1
-	    if (i .le. 0) i=len(init)
-	  else
-	    i=len(init)
-	  endif
-	  iret=tecs_init(init(1:i), port)
-
-	else
-
-c	  if INIT exists, read it to get the port number and the start command
-
-	  startcmd=' '
-
-	  call sys_open(lun, init, 'R', ios)
-	  if (ios .eq. 0) read (lun, *, iostat=ios) port
-	  if (ios .eq. 0) read (lun, *, iostat=ios) ! skip options line
-	  if (ios .eq. 0) read (lun, '(a)', iostat=ios) startcmd
-	  close(lun)
-	  if (ios .ne. 0) then
-	    iret=-2
-	    call err_msg('TECS_OPEN: init file not found')
-	    return
-	  endif
-	  if (port .eq. 0) port=9753
-	  iret=tecs_init(startcmd, port)
-
-	endif
-	end
-
-	SUBROUTINE TECS_GET_T (IOLUN, TEMP, IRET) !!
-!!	=========================================
-!!
-!! Get temperatures and wait if TECS is configuring
-!!
-	implicit    none
-
-c			Define the dummy arguments
-
-	integer     IOLUN        !! unit to write informational messages
-	real*4	    TEMP(4)      !! TASMAD temperature array: set-temp, regulation, sample, aux-temp
-	integer     IRET         !! IRET=0: o.k., IRET<0: error
-c------------------------------------------------------------------------------
-	integer  tecs_get3, tecs_wait
-	external tecs_get3, tecs_wait
-c------------------------------------------------------------------------------
-	iret=tecs_get3(temp(1), temp(3), temp(2)) ! temp(2) and temp(3) are exchanged in MSHOWT
-	if (iret .lt. 0) then
-	  call err_txt('tecs_get_3'//char(10)//'tecs_get_t')
-	  return
-	endif
-	if (iret .gt. 0) then
-!	  write(iolun, *) 'configuring temperature controller ...'
-!	  iret=tecs_wait()
-!	  if (iret .lt. 0) then
-!	    call err_txt('tecs_wait'//char(10)//'tecs_get_t')
-!	    return
-!	  endif
-!	  write(iolun, *) '... done'
-!	  iret=tecs_get3(temp(1), temp(3), temp(2)) ! temp(2) and temp(3) are exchanged in MSHOWT
-!	  if (iret .lt. 0) then
-!	    call err_txt('tecs_get3(2)'//char(10)//'tecs_get_t')
-!	    return
-!	  endif
-	endif
-	temp(4)=0.0 ! no auxilliary sensor
-	end
-
-	subroutine TECS_WRITE_ERROR(IOLUN)  !!
-!!	==================================
-!!
-!! write out error message of last error and stack info
-!!
-	implicit    none
-
-	integer IOLUN  !! logical unit for output
-
-	external    tecs_err_routine
-
-	call err_set_outrtn(tecs_err_routine, iolun)
-	call err_show('Error in TECS')
-	end
-
-
-	subroutine TECS_WRITE_MSG(IOLUN)  !!
-!!	================================
-!!
-!! write out error message of last error without stack info
-!!
-	implicit    none
-
-	integer IOLUN  !! logical unit for output
-
-	external    tecs_err_routine
-
-	call err_set_outrtn(tecs_err_routine, iolun)
-	call err_short
-	end
-
-
-	SUBROUTINE TECS_ERR_ROUTINE (LUN, TEXT)
-!	=======================================
-!
-! routine called from C
-!
-	implicit    none
-c--------------------------------------------------------------
-c			    Define the dummy arguments
-	byte	text(128)
-	integer lun
-c--------------------------------------------------------------
-	integer i, j
-c--------------------------------------------------------------
-	do i=1,128
-	  if (text(i) .eq. 0) then
-	    write(lun, '(x,128a1)') (text(j), j=1,i-1)
-	    return
-	  endif
-	enddo
-! no terminating ASCII NUL found
-	write(lun, *) 'error in TECS_ERR_ROUTINE: illegal error text'
-	end
diff --git a/tecs/tecs_lsc.c b/tecs/tecs_lsc.c
deleted file mode 100644
index 99097d6e..00000000
--- a/tecs/tecs_lsc.c
+++ /dev/null
@@ -1,208 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <assert.h>
-#include "myc_err.h"
-#include "coc_logfile.h"
-#include "coc_server.h"
-#include "tecs_lsc.h"
-#include "myc_str.h"
-
-#define MAX_PAR 16
-#define MAX_ARG 9
-
-int LscEqPar(char *par, char *res) {
-  char *p, *r, pbuf[SER_BUF_LEN], rbuf[SER_BUF_LEN];
-  int i,n,i1,i2;
-  float f1, f2;
-
-  p=par;
-  r=res;
-  while (p!=NULL) {
-    if (r==NULL) {
-      return(0);
-    }
-    p=str_split(pbuf, p, ',');
-    str_trim(pbuf, pbuf, sizeof(pbuf));
-    r=str_split(rbuf, r, ',');
-    str_trim(rbuf, rbuf, sizeof(rbuf));
-    if (pbuf[0]!='\0' && 0!=strcasecmp(pbuf, rbuf)) {
-      i1=sscanf(pbuf, "%f", &f1);
-      i2=sscanf(rbuf, "%f", &f2);
-      if (i1!=1 || i2!=1 || abs(f1-f2)>1e-4+abs(f1)*5e-6) {
-        logfileOut(LOG_INFO, "%s#%s\n", pbuf, rbuf);
-        return(0);
-      }
-    }
-  }
-  return(1);
-}
-
-#define nLIST 30
-
-char *LscCmd(SerChannel *ser, const char *cmds) {
-  va_list ap;
-  char *blank, *colon, *qu, *res;
-  const char *p, *this, *next, *cmd_ptr, *retreq;
-  const char *list[nLIST];
-  char seg[SER_BUF_LEN], result[SER_BUF_LEN], par[SER_BUF_LEN];
-  char cmd[SER_BUF_LEN];
-  char varname[32];
-  DeclStrBuf(sbuf, SER_BUF_LEN);
-  int nres, i, j, response;
-
-  nres=0;
-  response=0;
-  this=cmds;
-  while (this!=NULL) {
-    next=str_split(cmd, this, ';');
-    retreq=strchr(cmd, '>');
-    if (retreq!=NULL) { /* save pointer to return request */
-      i=retreq-cmd;
-      cmd[i]='\0'; /* cut return request */
-      list[nres]=this+i;
-      nres++; assert(nres<=nLIST);
-    }
-    cmd_ptr=sbuf.buf+sbuf.wrpos; /* pointer to command in buffer */
-    p=str_split(seg, cmd, '[');
-    ERR_I(StrPut(&sbuf, seg, StrNONE));
-    while (p!=NULL) { /* substitute variables */
-      p=str_split(varname, p, ']');
-      if (p==NULL) ERR_MSG("missing ']'");
-      ERR_I(CocPutVar(varname, &sbuf, StrNONE));
-      p=str_split(seg, p, '[');
-      ERR_I(StrPut(&sbuf, seg, StrNONE));
-    }
-    ERR_I(str_copy(cmd, cmd_ptr));
-    colon=strchr(cmd_ptr, ':');
-    if (colon!=NULL) { /* command with query */
-      blank=strchr(cmd_ptr, ' ');
-      if (blank==NULL || blank>colon) {
-        *colon=' '; blank=colon;
-      } else {
-        *colon=',';
-      }
-      list[nres]=colon+1; nres++; assert(nres<=nLIST); /* pointer to parameters */
-      list[nres]=cmd_ptr; nres++; assert(nres<=nLIST); /* pointer to command */
-      ERR_I(StrPut(&sbuf, ";", StrNONE));
-      cmd[blank-cmd_ptr]='?'; /* build query */
-      if (colon==blank) colon++;
-      cmd[colon-cmd_ptr]='\0';
-      ERR_I(StrPut(&sbuf, cmd, ';')); /* put query */
-      response=1;
-    } else { 
-      qu=strchr(cmd, '?');
-      ERR_I(StrPut(&sbuf, ";", StrNONE));
-      if (qu!=NULL) { /* command is a query */
-        response=1;
-        if (retreq==NULL) {
-          /* ERR_MSG("missing return format"); */
-        }
-        list[nres]=NULL; nres++; assert(nres<=nLIST);
-      } else {
-        if (retreq!=NULL) ERR_MSG("no return request allowed after command without query ");
-      }
-    }
-    this=next;
-  }
-
-  if (!response) {
-    ERR_I(StrPut(&sbuf, "busy?",'\0'));
-  } else {
-    sbuf.buf[sbuf.wrpos-1]='\0'; /* strip off trailing ";" */
-  }
-  ERR_P(res=SerCmd(ser, sbuf.buf));
-  if (0==strncmp("?TMO", res, 4)) ERR_MSG("timeout");
-  /*
-     list[0..nres-1] contains a now:
-       for a command with return request:
-       - a pointer to a the request
-       then, for a command with query:
-       - a pointer to the parameters and
-       - a pointer to the command
-     this is repeated for every command
-  */
-
-  /* check results */
-  this=res;
-  for (i=0; i<nres; i++) {
-    if (this==NULL) ERR_MSG("not all results received");
-    this=str_split(result, this, ';');
-    retreq=list[i];
-    if (retreq!=NULL) {
-      if (retreq[0]=='>') {
-        i++;
-      } else {
-        retreq=NULL;
-      }
-    }
-    if (list[i]!=NULL) {
-      qu=str_split(par, list[i], ';'); /* get parameters */
-      i++;
-      if (!LscEqPar(par, result)) { /* try again with single command */
-        qu=strchr(qu, ';');
-        assert(list[i]!=NULL);
-        str_copy(cmd, list[i]);
-        if (qu!=NULL) cmd[qu-list[i]]='\0';
-        ERR_P(qu=SerCmd(ser, cmd));
-        if (!LscEqPar(par, qu)) {
-          if (0!=strcmp(result, qu)) {
-            ERR_MSG("result does not match");
-          } else {
-            ERR_MSG("result does not match command");
-          }
-        }
-      }
-    }
-    if (retreq!=NULL) { /* query */
-      StrLink(&sbuf, result);
-      str_split(par, retreq+1, ';');
-      p=par;
-      while (p!=NULL) {
-        p=str_split(varname, p, ',');
-        if (varname[0]!='\0') {
-          if (p==NULL) { /* last element: get rest of line */
-            ERR_I(CocGetVar(varname, &sbuf, '\0'));
-          } else {
-            ERR_I(CocGetVar(varname, &sbuf, ','));
-          }
-        } else {
-          ERR_P(StrGet(&sbuf, varname, ','));
-        }
-      }
-    }
-  }
-  return(res);
-  OnError: return(NULL);
-}
-
-
-char *LscReadStat(int stat) {
-  if (stat &128) return("units overrange");
-  if (stat & 64) return("units zero");
-  if (stat & 32) return("temp overrange");
-  if (stat & 16) return("temp underrange");
-  if (stat &  2) return("old reading");
-  if (stat &  1) return("invalid reading");
-  return ("");
-}
-
-static char
-  *heaterStatus[7]={
-    "",
-    "heater supply over V",
-    "heater supply under V",
-    "heater output DAC error",
-    "heater Ilimit DAC error",
-    "open heater load",
-    "heater load < 10 Ohm",
-  };
-
-char *LscHtrStat(int stat) {
-  if (stat<0 || stat>sizeof(heaterStatus)) {
-    return("unknown heater status");
-  } else {
-    return(heaterStatus[stat]);
-  }
-}
diff --git a/tecs/tecs_lsc.h b/tecs/tecs_lsc.h
deleted file mode 100644
index 10db37f7..00000000
--- a/tecs/tecs_lsc.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef _TECS_LSC_H_
-#define _TECS_LSC_H_
-
-#include "tecs_serial.h"
-
-char *LscCmd(SerChannel *ser, const char *cmds);
-/*
-  Send commands to LSC-340.
-  There may be several commands separated by semicolon.
-  A special syntax is used:
-    - Commands containing a colon are commands with query,
-      i.e. the sent parameters are checked. The sent parameters
-      are those after the query, the command before the colon
-      is used as query, after inserting a question mark.
-    - Variable names in square brackets are substitute by their value
-    - Return values may be assigned to variables, separated by
-      a right angle bracket. There may be several variables
-      separated by comma, corresponding to the returned parameters,
-      beeing separated by commas also. If the variable is not terminated
-      by a comma, the whole remaining result is assigned, even if it
-      contains commas. Return values may only be used when a command
-      with wuery was sent, or when the command was a query (containing
-      a question mark).
-
-    Example:
-
-      LscCmd(ser, "RANGE:5>range;SETP 1:[tempH];CRVHDR?[num]>name,head;MODE 2");
-
-      assume that tempH=295 and num=25 the command sent to LSC is:
-
-      RANGE 5;RANGE?;SETP 1,295;SETP?1;CRVHDR?25;MODE 2
-
-      and assume LSC sens back:
-
-      3;295.000E+00;CTI5           ,R10410    ,3,+330.000E+0,2
-
-      then the following variables will be assigned:
-
-      range=3
-      name="CTI5"
-      head="R10410    ,3,+330.000E+0,2"
-
-      All used variables have to be declared with CocDef... (see coc_server.h)
-*/
-
-int LscEqPar(char *par, char *res);
-/*
-  compare if parameters are equal (numbers as numbers, spaces ignored)
-  if any parameter in par is omitted, it is not compared
-*/
-
-char *LscReadStat(int stat);
-
-char *LscHtrStat(int stat);
-
-#endif /* _TECS_LSC_H_ */
diff --git a/tecs/tecs_plot.f b/tecs/tecs_plot.f
deleted file mode 100644
index d818a024..00000000
--- a/tecs/tecs_plot.f
+++ /dev/null
@@ -1,756 +0,0 @@
-	subroutine tecs_plot(auxpar)
-
-	character*(*) auxpar
-		
-	integer dmax, nmax, tmax, amax, nmenu, chartperiod, naux
-	parameter (dmax=400, nmax=9, tmax=8, amax=3, nmenu=13
-	1          , chartperiod=5, naux=1)
-	integer minRange, maxRange, oneDay
-	parameter (minRange=60, maxRange=7*24*3600, oneDay=24*3600)
-	integer zoom, right, live
-	parameter (zoom=1, right=2, live=3)
-	real winmin, undef
-	parameter (winmin=60., undef=-1.125/1024./1024./1024.)
-	
-	real*4 x1,x2,xmin,xmax,ymin(2),ymax(2),window
-	real*4 xd(dmax, nmax),yd(dmax,nmax), yy0(nmax), yy1(nmax)
-	real*4 ylast1,ylast2,y1,y2
-	real*4 ex,ey,fx,fy,row,ticks,tim0,tim1,menuwid
-	integer l,j,i,n,t,leng,i1,i2,rl,startday,thisday
-	integer ncol, nset, mode
-	integer first,last,step,tbase,lastj
-	integer colorList(nmax)/5,3,2,4,6,8,14,15,8/
-	integer color(nmax)
-	integer retLen(nmax)
-	integer sel/0/, sel1, sel2, auxsel/1/
-	character key*1
-	character text(2,nmenu)*16/
-	1    'L'    ,'live off' 
-	1   ,'z'    ,'sel. zoom'
-	1   ,'+'    ,'zoom in'  
-	1   ,'-'    ,'zoom out' 
-	1   ,'x'    ,'show all' 
-	1   ,'2d'   ,'2 days'  
-	1   ,'1h'   ,'1 hour'  
-	1   ,'15m'  ,'15 min' 
-	1   ,'31.7t','goto date'
-	1   ,'c'    ,'show P/He/Aux'
-	1   ,'s'    ,'select T'
-	1   ,'f'    ,'write file'
-	1   ,'q'    ,'quit'/
-	character weekdays(7)*4/
-	1  'Mon','Tue','Wed','Thu','Fri','Sat','Sun'/
-	character buf*8, device*8, name*40, filnam*128, numb*16
-	character title*64, pars*64
-	character*4 tpar(tmax)/'Te','Tr','Tm','Ts','T1','T2','T3','T4'/
-	character*4 apar(amax)/'P', 'He', 'Aux'/
-	character*16 parnam(nmax)
-	logical gap, done
-	logical saveit
-	integer iret, lund, numl, mon, day
-	integer pars_len, title_len, text_len, name_len
-	integer idx(nmax)
-	character line*132
-	real x0
-	logical loop
-	
-	! functions
-	integer myc_now, myc_time, myc_date, get_data
-	integer tecs_get_mult, tecs_get_par
-	
-	data window/0./
-	
-	if (window .eq. 0) window=1800.
-	saveit=.false.
-	mode=live
-	call pgopen(' ')
-	
-	call pgqinf('TYPE', device, l)
-	if (device .eq. 'NULL') then
-	  call pgclos
-	  call pgopen('?')
-	  call pgqinf('TYPE', device, l)
-	  if (device .eq. 'NULL') then
-	    print *,'No PGPLOT-Device defined'
-	    goto 9
-	  endif
-	  call sys_setenv('PGPLOT_DEV', device)
-	endif
-	
-	call pgqcol(i,ncol)
-	!  print *,i,ncol,' colors ',device
-	if (ncol .ge. 8 .and. device .ne. 'VT125') then
-	  call pgscr(0, 1.0, 1.0, 1.0)
-	  call pgscr(1, 0.0, 0.0, 0.0)
-	  call pgscr(2, 1.0, 0.0, 0.0)
-	  call pgscr(3, 0.0, 1.0, 0.0)
-	  call pgscr(4, 0.0, 0.0, 1.0)
-	  call pgscr(5, 0.0, 1.0, 1.0)
-	  call pgscr(6, 1.0, 0.0, 1.0)
-	  call pgscr(7, 1.0, 1.0, 0.0)
-	  call pgscr(8, 1.0, 0.5, 0.0)
-	endif
-	
-	call pgask(.false.)
-	call pgupdt
-	l=0
-	x1=0
-	step=0
-	do i=1,amax
-	  if (auxpar .eq. apar(i)) then
-	    auxsel=i
-	  endif
-	enddo
-	
-1	pars=' '
-	nset=0
-	do i=1,tmax
-	  nset=nset+1
-	  color(nset)=colorList(i)
-	  parnam(nset)=tpar(i)
-	  call str_trim(pars, pars, pars_len)
-	  pars=pars(1:pars_len)//' '//parnam(nset)
-	enddo
-	nset=nset+1
-	color(nset)=colorList(3)
-	parnam(nset)=apar(auxsel)
-	call str_trim(pars, pars, pars_len)
-	pars=pars(1:pars_len)//' '//parnam(nset)
-	
-	iret=tecs_get_mult(pars, t, nset, yy0)
-	if (iret .lt. 0) goto 99
-	if (window .eq. 0) then
-	  last=t
-	  step=maxRange/dmax
-	  window=maxRange
-	  first=t-min(dmax*step-1,maxRange-step)
-	else if (mode .ge. right) then
-	  step=window/(dmax-2)+0.99
-	  last=t
-	  first=t-min(dmax*step-1,nint(window))
-	else
-	  if (mode .eq. zoom) then
-	    x2=(x1+x2+window)/2
-	    x1=x2-window
-	  endif
-	  if (x1 .gt. x2-minRange) x1=x2-minRange
-	  step=(x2-x1)/(dmax-2)+0.99
-	  last=x2+tbase
-	  first=x1-step+tbase
-	endif 
-	if (step .eq. 0) step=1
-	
-	if (step .gt. 60) then   ! normalize step
-	  step=(step+59)/60*60
-	else if (step .gt. 30) then
-	  step=60
-	elseif (step .gt. 20) then
-	  step=30
-	else
-	  step=(step+4)/5*5
-	endif
-	first=last-(last-first+step-1)/step*step ! round first
-	!  print *,step,last-first
-	tbase=first-mod(first,7*oneDay)
-	iret=get_data(pars, first, last, step, tbase
-	1              , xd, yd, dmax, nmax, retLen)
-	if (iret .lt. 0) goto 99
-	
-	x2 = last - tbase
-	if (mode .ge. right) then
-	  x1=x2-window
-	else
-	  x1 = first - tbase
-	endif
-	tim0=t-tbase
-	do i=1,nset
-	  leng=retLen(i)
-	  do while (leng .gt. 1 .and. yd(leng,i) .eq. undef)
-	    leng=leng-1
-	  enddo
-	  if (leng .eq. 1) leng=0
-	  retLen(i)=leng
-	  if (mode .eq. live .and. leng .gt. 0) then
-	    xd(leng,i)=tim0
-	    yd(leng,i)=yy0(i)
-	  endif
-	enddo
-	if (sel .ne. 0) then
-	  do while (sel .lt. nset .and. retLen(sel) .eq. 0)
-	    sel=sel+1
-	  enddo
-	  if (sel .ge. nset) sel = 0
-	endif
-	if (saveit) goto 9
-	if (mode .eq. live) then
-	  x2=max(tim0,x2)+min(1800., window*0.5)
-	endif
-	
-	if (window .gt. 50*3600) then
-	  ticks=8*3600
-	elseif (window .gt. 25*3600) then
-	  ticks=4*3600
-	else
-	  ticks=0.0 ! automatic
-	endif
-	
-	i1=1
-	i2=nset-naux
-	if (sel .eq. 0) then
-	  sel1=i1
-	  sel2=i2
-	else
-	  sel1=sel
-	  sel2=sel
-	endif
-	do rl=1,2
-	  if (mode .eq. zoom .and. rl .eq. 1) then
-	    ymin(1)=y1
-	    ymax(1)=y2
-	  else
-	    ymin(rl)=1e30
-	    ymax(rl)=-1e30
-	    ylast1=ymin(rl)
-	    ylast2=ymax(rl)
-	    do i=sel1,sel2
-	      do j=1,retLen(i)
-	        if (yd(j,i) .ne. undef) then
-	          ymin(rl)=min(ymin(rl),yd(j,i))
-	          ymax(rl)=max(ymax(rl),yd(j,i))
-	        endif
-	      enddo
-	      do j=max(1,retLen(i)-4),retLen(i)
-	        if (yd(j, i) .ne. undef) then
-	          ylast1=min(ylast1,yd(j, i))
-	          ylast2=max(ylast2,yd(j, i))
-	        endif
-	      enddo
-	    enddo
-	
-	    ey=(ymax(rl)-ymin(rl))
-	    fy=abs(ymax(rl))
-	    ymax(rl)=ymax(rl)+max(fy*0.0075,ey*0.01)
-	    ymin(rl)=ymin(rl)-max(fy*0.005,ey*0.01)
-	    if (mode .eq. live) then
-	      ymin(rl)=min(ymin(rl),max(0.0,ylast1-ey*0.4))
-	      ymax(rl)=max(ymax(rl),ylast2+ey*0.4)
-	    endif
-	  endif
-	
-	  if (ymax(rl) .lt. ymin(rl)) then
-	    ymax(rl)=1.0
-	    ymin(rl)=0
-	  elseif (ymax(rl) .eq. ymin(rl)) then
-	    ymax(rl)=ymin(rl)*1.00001+1.0
-	    ymin(rl)=-1.0e-3
-	  endif
-	
-	  call set_win(rl,x1,x2,ymin(rl),ymax(rl))
-	
-	  do i=i1,i2
-	    call pgsci(color(i))
-	    l=0
-	    lastj=1
-	    do j=1,retLen(i)
-	      if (yd(j,i) .eq. undef) then
-	        if (j .gt. lastj) then
-	          call pgline(j-lastj, xd(lastj,i), yd(lastj,i))
-	        endif
-	        lastj=j+1
-	      else
-	        l=j
-	      endif
-	    enddo
-	    if (retLen(i) .gt. lastj)
-	1     call pgline(retLen(i)+1-lastj, xd(lastj,i), yd(lastj,i))
-	    retLen(i)=l
-	  enddo
-	  call pgsci(1)
-	  if (rl .eq. 1) then
-	    call pgsch(1.0)
-	    call pgtbox('ZHXYBINST', ticks, 0, 'BCINMST', 0.0, 0)
-	    call pgtbox('C', 0.0, 0, ' ', 0.0, 0)
-	    ey=0.0
-	    do i=i1,i2
-	      if (retLen(i) .gt. 0) then
-	        name=parnam(i)
-	        if (name .eq. 'Tm') then
-	          name='Main Sensor'
-	        elseif (name .eq. 'Ts') then
-	          name='Sample Sensor'
-	        elseif (name .eq. 'Tr') then
-	          name='SetPoint'
-	        endif
-	        call str_trim(name, name, name_len)
-	        if (sel .eq. i) then
-	          name=name(1:name_len)//'*'
-	          call str_trim(name, name, name_len)
-	        endif
-	        call pglen(5, name(1:name_len), fx, fy)
-	        call pgsci(color(i))
-	        call pgmtxt ('L', 2.5, ey, 0.0, name(1:name_len))
-	        ey=ey+fy+0.04
-	      endif
-	    enddo
-	    call pgsci(1)
-	    call pgmtxt ('L', 2.5, ey, 0.0, 'T [K]')
-	  else
-	    call pgsch(0.7)
-	    call pgtbox('ZCIST', ticks, 0, 'BCVINMST', 0.0, 0)
-	    call pgtbox('B', 0.0, 0, ' ', 0.0, 0)
-	    call pgsci(color(nset))
-	    call pgsch(1.0)
-	    if (parnam(nset) .eq. 'P' .or. parnam(nset) .eq. 'p') then
-	      call pgmtxt ('L', 2.5, 0.5, 0.5, 'Power [W]')
-	    elseif (parnam(nset) .eq. 'He') then
-	      title='%'
-	      iret=tecs_get_par('heUnits', title, 0)
-	      call str_trim(title, title, title_len)
-	      call pgmtxt ('L', 2.5, 0.5, 0.5,
-	1       'Helium ['//title(1:title_len)//']')
-	    else
-	      call pgmtxt ('L', 2.5, 0.5, 0.5, parnam(nset))
-	    endif
-	  endif
-	  i1=nset-naux+1
-	  i2=nset
-	  sel1=i1
-	  sel2=i2
-	enddo
-	
-	call pgsch(0.7)
-	rl=1
-	call set_win(rl,x1,x2,ymin(rl),ymax(rl))
-	
-	call pgsci(1)
-	call pgsclp(0)
-	if (mode .eq. live) then
-	  text(2,1)='live off'
-	else
-	  text(2,1)='live on'    
-	endif
-	text(2,10)='show '//apar(mod(auxsel,3)+1)
-	menuwid=0.0
-	do i=1,nmenu
-	  call str_trim(text(2,i), text(2,i), text_len)
-	  call pglen(5, text(2,i)(1:text_len), fx, fy)
-	  call pgmtxt('T', 3.0, menuwid, 0.0, '|'//text(1,i))
-	  call pgmtxt('T', 2.5, menuwid, 0.0, '|')
-	  call pgmtxt('T', 2.0, menuwid, 0.0, '|'//text(2,i))
-	  menuwid=menuwid+fx+0.01
-	enddo
-	call pgmtxt('T', 3.0, menuwid, 0.0, '|')
-	call pgmtxt('T', 2.5, menuwid, 0.0, '|')
-	call pgmtxt('T', 2.0, menuwid, 0.0, '|')
-	menuwid=menuwid+0.01
-	
-	call pgsch(0.8)
-	done=.false.
-	row=(ymax(rl)-ymin(rl))/30.
-	ey=ymin(rl)-row*3.5
-	i=max(0,int((x1+oneDay/2)/oneDay))
-	
-	ex=(i+0.5)*oneDay
-	do while (ex .le. x2)
-	  done=.true.
-	  write(buf,'(i8.8)') myc_date(nint(ex)+tbase)
-	  call pgptxt(ex, ey, 0.0, 0.5,
-	1   weekdays(mod(i,7)+1)//buf(7:8)//'.'//buf(5:6))
-	  ex=ex-12*3600
-	  if (ex .gt. x1) then
-	    call pgmove(ex, ey)
-	    call pgdraw(ex, ey+row)
-	  endif
-	  ex=ex+oneDay
-	  if (ex .lt. x2) then
-	    call pgmove(ex, ey)
-	    call pgdraw(ex, ey+row)
-	  endif
-	  i=i+1
-	  ex=(i+0.5)*oneDay
-	enddo
-	if (.not. done) then
-	  n=nint(x2)/oneDay*oneDay
-	  i=nint(x1)-n
-	  j=nint(x2)-n
-	  if (i .lt. 0) then
-	    if (-i .gt. j) then
-	      ex=0.0
-	      i=nint(x1)+tbase
-	    else
-	      ex=1.0
-	      i=nint(x2)+tbase
-	    endif
-	  else
-	    ex=0.5
-	    i=nint(x2)+tbase
-	  endif
-	  thisday=mod(i/oneDay,7)+1
-	  write(buf,'(i8.8)') myc_date(i)
-	  call pgmtxt('B', 3.5, ex, ex,
-	1   weekdays(thisday)//buf(7:8)//'.'//buf(5:6))
-	endif
-	
-	iret=tecs_get_par('device', title, 0)
-	if (iret .lt. 0) goto 99
-	i=index(title, '(')
-	if (i .gt. 2 ) then
-	  title=title(1:i-1)
-	else
-	  title='test - no device'
-	endif
-	
-	call pgmtxt('T', -1.5, 0.02, 0.0, title)
-	call pgsclp(1)
-	
-	call purge_keys ! purge buffer
-	
-	numl=0
-	numb=' '
-7	ex=undef
-	if (mode .eq. live) then
-	!    if (device(1:1) .eq. 'X') then
-	!      call pgmtxt('T', 0.5, 0.0, 0.0, 'LIVE MODE (click on text window before pressing any further key)')
-	!    endif
-	!    call get_key(key, 0, chartperiod)
-	  i=chartperiod-mod(myc_now(), chartperiod)
-	  call get_cursor(ex, ey, key, -i)
-	  
-	  do while (key .eq. char(0) .or. key .eq. ' ') ! no key or space key pressed
-	    iret=tecs_get_mult(pars, t, nset, yy1)
-	    if (iret .lt. 0) goto 99
-	    tim1=t-tbase
-	    if (tim1 .gt. x2) then
-	      call pgpage
-		window=x2-x1
-	      goto 1
-	    endif
-	    if (tim1 .gt. tim0) then
-	      i1=1
-	      i2=nset-naux
-	      do rl=1,2
-	        call set_win(rl,x1,x2,ymin(rl),ymax(rl))
-	        do i=i1,i2
-	          if (yy0(i) .ne. undef .and. yy1(i) .ne. undef) then
-	            if ((sel .eq. 0 .or. sel .eq. i) .and.
-	1               (yy1(i) .lt. ymin(rl) .or.
-	1                yy1(i) .gt. ymax(rl))) then
-	              call pgpage
-		      window=x2-x1
-	              goto 1
-	            endif
-	            call pgsci(color(i))
-	            call pgmove(tim0, yy0(i))
-		    call pgdraw(tim1, yy1(i))
-	          endif
-	          yy0(i)=yy1(i)
-	        enddo
-	        i1=nset-naux+1
-	        i2=nset
-	      enddo
-	      tim0=tim1
-	
-	    endif
-	    i=chartperiod-mod(myc_now(), chartperiod)
-	    call get_cursor(ex, ey, key, -i)
-	  enddo
-	else
-	  call get_cursor(ex, ey, key, 0)
-	endif
-	rl=1
-	call set_win(rl,x1,x2,ymin(rl),ymax(rl))
-	
-8	if (key .ge. 'a') key=char(ichar(key)-32)
-	if (key .eq. '-') then
-	  window=min(window*2, 8.0*oneDay)
-	  if (mode .eq. zoom) then
-	    x1=x1-(x2-x1)/2
-	    x2=x2+(x2-x1)/3
-	    y1=y1-(y2-y1)/2
-	    y2=y2+(y2-y1)/3
-	  endif
-	elseif (key .eq. 'X') then
-	  window=0
-	  mode=0
-	elseif (key .eq. '+' .or. key .eq. ',') then
-	  window=max(winmin,window/2)
-	  if (mode .eq. zoom) then
-	    if (ex .eq. undef) then
-	      ex=(x1+x2)/2
-	      ey=(min(y2,ymax(1))+max(y1,ymin(1)))/2
-	    end if
-	    fx=max(winmin,x2-x1)
-	    fy=max(y2-y1,1e-3,y2*1e-5)
-	    x1=ex-fx/4
-	    x2=ex+fx/4
-	    y1=ey-fy/4
-	    y2=ey+fy/4
-	  endif
-	elseif (key .eq. 'Z') then
-	  call pgsci(1)
-	  if (ex .eq. undef) then
-	    call pgmtxt('T', 0.5, 0.0, 0.0,
-	1     'click on two opposite corners of a selection rectangle')
-	    call get_cursor(ex, ey, key, 0)
-	  else
-	    call pgmtxt('T', 0.5, 0.0, 0.0,
-	1     'click on second corner of selection rectangle')
-	  endif
-	  call pgsci(6)
-	  xmin=x1
-	  xmax=x2
-	    call pgmove(xmin, ey)
-	    call pgdraw(xmax, ey)
-	    call pgmove(ex, ymin(rl))
-	    call pgdraw(ex, ymax(rl))
-	  if (device(1:1) .eq. 'X') then
-	    fx=ex
-	    fy=ey
-	    call get_cursor(fx, fy, key, 2)
-	  else
-	    call get_cursor(fx, fy, key, 0)
-	  endif
-	  x1=max(xmin,min(ex,fx))
-	  x2=min(xmax,max(ex,fx))
-	  if (x1 .ge. x2) then
-	    x1=xmin
-	    x2=xmax
-	  endif
-	  window=x2-x1
-	  y1=max(ymin(1),min(ey,fy))
-	  y2=min(ymax(1),max(ey,fy))
-	  if (y1 .ge. y2) then
-	    y1=ymin(1)
-	    y2=ymax(1)
-	  endif
-	  mode=zoom
-	elseif (key .ge. '0' .and. key .le. '9' .or. key .eq. '.') then ! number
-	  if (numl .lt. len(numb)) then
-	    numl=numl+1
-	    numb(numl:numl)=key
-	    call pgsci(1)
-	    call pgsch(0.8)
-	    call pgmtxt('T', 2.0, menuwid, 0.0, numb(1:numl))
-	  endif
-	!    call get_cursor(ex, ey, key, -chartperiod)
-	!    if (key .ne. char(0)) goto 8
-	  if (mode .eq. zoom) mode=0
-	  goto 7
-	elseif (key .eq. 'D') then
-	  ex=1
-	  read(numb, *, iostat=i) ex
-	  window=min(maxRange,max(minRange, nint(oneDay*ex)))
-	  if (mode .lt. right) mode=right
-	  x1=0
-	elseif (key .eq. 'H') then
-	  ex=1
-	  read(numb, *, iostat=i) ex
-	  window=min(maxRange,max(minRange, nint(3600*ex)))
-	  if (mode .lt. right) mode=right
-	  x1=0
-	elseif (key .eq. 'M') then
-	  ex=1
-	  read(numb, *, iostat=i) ex
-	  window=min(maxRange,max(minRange, nint(60*ex)))
-	  if (mode .lt. right) mode=right
-	  x1=0
-	elseif (key .eq. 'T' .or. numl .gt. 0 .and.
-	1       (key .eq. char(13) .or. key .eq. char(10))) then
-	  j=index(numb,'.')
-	  day=0
-	  if (j .gt. 1 .and. j .lt. numl) then
-	    read(numb(1:j-1), *, iostat=i) day
-	    mon=0
-	    read(numb(j+1:numl), *, iostat=i) mon
-	    tbase = myc_time(day+mon*100)
-	  else
-	    read(numb, *, iostat=i) day
-	    tbase = myc_time(day)
-	  endif
-	  x1=0
-	  x2=oneDay
-	  window=x2
-	  mode=0
-	elseif (key .eq. 'L') then
-	  if (mode .eq. live) then
-	    mode=right
-	  else
-	    mode=live
-	  endif
-	elseif (key .eq. 'F') then
-	  saveit=.true.
-	elseif (key .eq. 'Q' .or. key .eq. char(13)
-	1       .or. key .eq. char(10)) then
-	  goto 9
-	elseif (key .eq. 'S') then
-	  sel=sel+1
-	  if (sel .gt. tmax) sel=0
-	  if (mode .eq. zoom) mode=0
-	elseif (key .eq. 'C') then
-	  auxsel=auxsel+1
-	  if (auxsel .gt. amax) auxsel=1
-	elseif (mode .eq. live) then
-	  goto 7
-	endif
-	numl=0
-	numb=' '
-	call pgpage
-	goto 1
-99	call tecs_write_msg(6)
-9	continue
-	call pgclos
-	call purge_keys
-	print *
-	if (saveit) then
-	  lund=41
-	  print '(x,a,$)', 'Filename: '
-	  read(*,'(a)') filnam
-	  open(lund, file=filnam, status='unknown')
-	
-	  line='time [h]'
-	  call str_trim(line, line, l)
-	  do j=1,nset
-	    idx(j)=0
-	    do i=1,retlen(j)
-	      if (yd(i,j) .ne. undef) then
-	        idx(j)=1
-	        l=l+1
-	        line(l:l)=char(9)
-	        call str_trim(line(l+1:), parnam(j), text_len)
-	        l=l+max(9,text_len)
-	        goto 109
-	      endif
-	    enddo
-109         continue
-	  enddo
-	  write(lund, '(a)') line(1:l)
-	
-	  n=1
-	  x0=0
-	  do while (x0 .lt. 3e7)
-	    x0=4e7
-	    do j=1,nmax ! find next x
-	      if (idx(j) .gt. 0 .and. idx(j) .lt. retlen(j)) then
-	        x0=min(x0,xd(idx(j),j))
-	      endif
-	    enddo
-	    if (x0 .lt. 3e7) then
-	      write(line,'(f9.4)') x0/3600.
-	      l=9
-	      do j=1,nmax
-	        if (idx(j) .gt. 0) then
-	          l=l+1
-	          line(l:l)=char(9)
-		  if (idx(j) .le. retlen(j)) then
-	            if (xd(idx(j),j) .lt. x0+1) then
-	              write(line(l+1:), '(f9.4)')
-	1               max(-999.,min(9999.,yd(idx(j),j)))
-	              l=l+9
-	              idx(j)=idx(j)+1
-	            endif
-	          endif
-	        endif
-	      enddo
-	      write(lund, '(a)') line(1:l)
-	      n=n+1
-	    endif
-	  enddo
-	  close(lund)
-	  print *, n, ' lines written to ',filnam(1:48)
-	endif
-	
-	end
-	
-
-	subroutine get_cursor(x, y, key, mode)
-	character*1 key
-	real*4 x, y
-	integer mode
-	integer with_timeout/-1/
-	integer l
-	character res*32
-	
-	if (with_timeout .lt. 0) then
-	  with_timeout=0
-	  call pgqinf('VERSION', res, l)
-	  if (res(l:l) .eq. '+') then
-	    call pgqinf('TYPE', res, l)
-	    if (res(1:1) .eq. 'X') then
-	      with_timeout=1
-	    end if
-	  end if
-	end if
-	if (with_timeout .gt. 0 .or. mode .ge. 0) then
-	  call pgband(mode, 0, x, y, x, y, key)
-	else
-	  call sys_get_key(key, -mode)
-	endif
-	end
-	
-
-	subroutine purge_keys
-	character key*1
-	key=' '
-	do while (key .ne. char(0))
-	  call sys_get_key(key, 0)
-	end do
-	end
-	
-
-	subroutine set_win(rl, x1, x2, y1, y2)
-	integer rl
-	real x1, x2, y1, y2
-	
-	if (rl .eq. 1) then
-	  call pgsvp(0.07,0.93,0.3,0.9)
-	else
-	  call pgsvp(0.07,0.93,0.01,0.20)
-	endif
-	
-	call pgswin(x1,x2,y1,y2)
-	end
-
-	
-	integer function get_data(pars, first, last, step, tbase
-	1                        , xd, yd, dmax, nmax, retlen)
-
-	character pars*(*)
-	integer first, last, step, tbase, dmax, nmax, retlen(nmax)
-	real*4 xd(dmax,nmax), yd(dmax,nmax)
-	
-	integer oneDay, maxn
-	parameter (oneDay = 24*3600, maxn=9)
-	integer tecs_get_data
-	
-	integer i,j,rl(maxn),m,k,n,mm
-	
-	if (nmax .gt. maxn) stop 'get_data: nmax>maxn'
-	if (last-first .le. oneDay) then
-	  get_data=tecs_get_data(pars, first, last, step, tbase
-	1                       , xd, yd, dmax, nmax, retLen)
-	else
-	  do j=1,nmax
-	    retlen(j)=0
-	  enddo
-	  m=0
-	  do i=first/oneDay,last/oneDay
-	    get_data=tecs_get_data(pars, max(first,i*oneDay)
-	1        , min(last,(i+1)*oneDay-step), step, tbase
-	1        , xd(m+1, 1), yd(m+1, 1), dmax, nmax, rl)
-	    if (get_data .lt. 0) return
-	    mm=0
-	    do j=1,nmax
-	      n=retlen(j)
-	      do k=m+1,m+rl(j)
-	        n=n+1
-		xd(n,j)=xd(k,j)
-		yd(n,j)=yd(k,j)
-	      enddo
-	      retlen(j)=n
-	      mm=max(mm,n)
-	    enddo
-	!      print *,mm-m,' points read'
-	    m=mm
-	  enddo
-	endif
-	end
diff --git a/tecs/tecs_serial.c b/tecs/tecs_serial.c
deleted file mode 100644
index ea432a76..00000000
--- a/tecs/tecs_serial.c
+++ /dev/null
@@ -1,244 +0,0 @@
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <assert.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include "rs232c_def.h"
-#include "asynsrv_def.h"
-#include "sinq_prototypes.h"
-#include "myc_err.h"
-#include "tecs_serial.h"
-#include "coc_logfile.h"
-#include "coc_util.h"
-#include "myc_str.h"
-#include "myc_mem.h"
-
-#define ASYNSRV_TYPE 1
-#define TERMSRV_TYPE 2
-#define EOT '\r'
-
-typedef struct {
-  char host[64];
-  int type; /* = ASYNSRV_TYPE */
-  struct AsynSrv__info    asyn_info; /* Contains skt, host, port & chan */
-  struct RS__MsgStruct    to_host;
-  struct RS__RespStruct   from_host;
-} AsynSrvChan;
-
-typedef struct {
-  char host[64];
-  int type; /* = TERMSRV_TYPE */
-  char res[SER_BUF_LEN];
-  int fd, tmo;
-  int (*idleHdl)(int,int);
-} TermSrvChan;
-
-void SerA_error(void) {
-  char *a_txt;
-  int a_cod, a_my, a_vms;
-
-  AsynSrv_ErrInfo(&a_txt, &a_cod, &a_my, &a_vms);
-  ErrMsg("asynsrv error"); ErrTxt(a_txt,0);
-}
-
-int SerWait(int tmo_msec, int fd) {
-  struct timeval tmo;
-  fd_set mask;
-  int i;
-  
-  FD_ZERO(&mask);
-  FD_SET(fd, &mask);
-  tmo.tv_sec=tmo_msec / 1000;
-  tmo.tv_usec=(tmo_msec % 1000) % 1000 +1;
-  ERR_SI(i=select(fd+1,&mask,NULL,NULL,&tmo));
-  if (i==0) return(0); /* timeout */
-  return(1);
-  OnError: return(-1);
-}
-
-SerChannel *SerOpen(const char *hostPort, int msecTmo, int (*idleHdl)(int,int)) {
-  AsynSrvChan *aser;
-  TermSrvChan *tser;
-  char hbuf[64], cport[16], host[32];
-  char *p, *c;
-  struct sockaddr_in sadr;
-  int iret;
-  time_t t1, t2;
-  static int ecnt;
-
-  time(&t1);
-  str_copy(hbuf, hostPort);
-  p=str_split(host, hbuf, ':');
-  assert(p!=NULL);
-  c=str_split(cport, p, '/');
-  if (msecTmo==0) msecTmo=5000;
-  if (c!=NULL) {
-    NEW(aser, AsynSrvChan); aser->type=ASYNSRV_TYPE;
-    str_copy(aser->asyn_info.host, host);
-    aser->asyn_info.port=atoi(cport);
-    aser->asyn_info.chan=atoi(c);
-    
-    iret=AsynSrv_Open(&aser->asyn_info);
-    if (iret==1) {
-      iret=AsynSrv_Config(&aser->asyn_info, "msecTmo", msecTmo, "idleHdl", idleHdl, NULL);
-    }
-    if (iret!=1) { SerA_error(); goto OnError; }
-    time(&t2);
-    ecnt=0;
-    logfileOut(LOG_MAIN, "connection to %s:%d/%d opened (%d sec)\n",
-       aser->asyn_info.host, aser->asyn_info.port, aser->asyn_info.chan,
-       t2-t1);
-    str_copy(aser->host, hostPort);
-    return((SerChannel *)aser);
-  } else {
-    NEW(tser, TermSrvChan); tser->type=TERMSRV_TYPE;
-    tser->tmo=msecTmo;
-    if (idleHdl==NULL) {
-      tser->idleHdl=SerWait;
-    } else {
-      tser->idleHdl=idleHdl;
-    }
-    ERR_I(CocCreateSockAdr(&sadr, host, atoi(p)));
-    ERR_SI(tser->fd=socket(AF_INET, SOCK_STREAM, 0));
-    ERR_SI(connect(tser->fd, (struct sockaddr *)&sadr, sizeof(sadr)));
-    time(&t2);
-    ecnt=0;
-    logfileOut(LOG_MAIN, "connected to %s (%d sec)\n", hostPort, t2-t1);
-    str_copy(tser->host, hostPort);
-    return ((SerChannel *)tser);
-  }
-  OnError:
-    time(&t2);
-    if (ecnt<4) {
-      logfileOut(LOG_MAIN, "failed after %d sec\n", t2-t1);
-      ecnt++;
-    }
-    return(NULL);
-}
-
-int SerSetTmo(SerChannel *serch, int msecTmo) {
-  AsynSrvChan *aser;
-  TermSrvChan *tser;
-  int iret;
-
-  if (serch->type==ASYNSRV_TYPE) {
-    aser=(AsynSrvChan *)serch;
-    iret=AsynSrv_Config(&aser->asyn_info, "msecTmo", msecTmo, NULL);
-    if (iret!=1) { SerA_error(); goto OnError; }
-  } else if (serch->type==TERMSRV_TYPE) {
-    tser=(TermSrvChan *)serch;
-    tser->tmo=msecTmo;
-  }
-  return 0;
-  OnError: return -1;
-}
-
-void SerClose(SerChannel *serch) {
-  AsynSrvChan *aser;
-  TermSrvChan *tser;
-
-  if (serch->type==ASYNSRV_TYPE) {
-    aser=(AsynSrvChan *)serch;
-    AsynSrv_Close(&aser->asyn_info, 1);
-  } else if (serch->type==TERMSRV_TYPE) {
-    tser=(TermSrvChan *)serch;
-    close(tser->fd);
-  }    
-  serch->type=0;
-}
-
-SerChannel *SerCheck(SerChannel *serch) {
-  if (serch==NULL || serch->type==0) {
-    return(NULL);
-  } else {
-    return(serch);
-  }
-}
-
-char *SerCmd(SerChannel *serch, char *cmnd) {
-  int l, n;
-  AsynSrvChan *aser;
-  TermSrvChan *tser;
-  char *result, *pos, *trm;
-  int iret, incomplete;
-
-  l=strlen(cmnd);
-  if (l>=SER_BUF_LEN-1) ERR_COD(ENOBUFS);
-  cmnd[l]=EOT; l++;
-  cmnd[l]='\0';
-
-  logfileOut(LOG_SER, ">%s\n", cmnd);
-  if (serch->type==ASYNSRV_TYPE) {
-    aser=(AsynSrvChan *)serch;
-    iret=AsynSrv_SendCmnds(&aser->asyn_info, &aser->to_host, &aser->from_host, cmnd, NULL);
-    if (iret!=1) {
-      SerA_error();
-      SerClose(serch);
-      return(NULL);
-    }
-    result=AsynSrv_GetReply(&aser->asyn_info, &aser->from_host, NULL);
-    if (result==NULL) ERR_MSG("empty result");
-  } else if (serch->type==TERMSRV_TYPE) {
-    tser=(TermSrvChan *)serch;
-    iret=send(tser->fd, cmnd, l, 0);
-    if (iret<0) {
-      ErrMsg("disconnected");
-      SerClose(serch);
-      goto OnError;
-    }
-    n=sizeof(tser->res);
-    pos=tser->res;
-    result=NULL;
-    incomplete=1;
-    while (incomplete) {
-      /* Wait for an event on tser->fd or a timeout tmo */
-      iret=tser->idleHdl(tser->tmo, tser->fd);
-      if (iret==0) {
-        if (result==NULL) ERR_MSG("timeout");
-        ERR_MSG("missing terminator");
-      }
-      ERR_SI(l=recv(tser->fd, pos, n, 0));
-      if (l==0) {
-        ErrMsg("disconnected");
-        SerClose(serch);
-        goto OnError;
-      }
-      n -= l;
-      if (n==0) ERR_MSG("answer too long");
-      while (l>0) {
-        if (*pos>' ') {
-          if (result==NULL) result=pos; /* skip trailing white space */
-        } else if (*pos<' ') { /* all control characters are treated as terminators */
-          if (result!=NULL) {
-            *pos='\0';
-            incomplete=0;
-          }
-        }
-        pos++; l--;
-      }
-    }    
-  } else {
-    serch->type=0;
-    ERR_MSG("invalid channel");
-  }
-  logfileOut(LOG_SER, "<%s\n", result);
-
-  return(result);
-  OnError:
-    return(NULL);
-}
-
-/* obsolete ?
-char *SerCmdC(SerChannel *serch, const char *cmnd) {
-  char cmd[SER_BUF_LEN];
-  int l;
-
-  l=strlen(cmnd);
-  if (l>=SER_BUF_LEN-1) ERR_COD(ENOBUFS);
-  strcpy(cmd, cmnd);
-  return(SerCmd(serch, cmd));
-  OnError: return(NULL);
-}
-*/
-
diff --git a/tecs/tecs_serial.h b/tecs/tecs_serial.h
deleted file mode 100644
index 8fb801ba..00000000
--- a/tecs/tecs_serial.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _SERUTIL_H_
-#define _SERUTIL_H_
-
-#define SER_BUF_LEN 320
-
-typedef struct {
-  char host[64];
-  /* private */
-  int type;
-} SerChannel;
-
-SerChannel *SerOpen(const char *host, int msecTmo, int (*idleHdl)(int,int));
-char *SerCmd(SerChannel *ser, char *cmnd);
-int SerSetTmo(SerChannel *ser, int msecTmo);
-SerChannel *SerCheck(SerChannel *ser);
-void SerClose(SerChannel *ser);
-
-/* char *SerCmdC(SerChannel *ser, const char *cmnd); */
-
-#endif /* _SERUTIL_H_ */
diff --git a/tecs/term.c b/tecs/term.c
deleted file mode 100644
index c4832b6f..00000000
--- a/tecs/term.c
+++ /dev/null
@@ -1,238 +0,0 @@
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <assert.h>
-#include <string.h>
-#include <stdio.h>
-#include "myc_mem.h"
-#include "sys_select.h"
-
-#define ESC_TMO 1000
-#define REF_TMO 100
-#define HISTORY_LINES 256
-
-#define L_ARROW '\200'
-#define R_ARROW '\201'
-#define U_ARROW '\202'
-#define D_ARROW '\203'
-#define EVT_CHAR '\0'
-#define DEL_CHAR '\b'
-#define RET_CHAR '\n'
-
-static char esc_key='\0';
-
-static fd_set regMask;
-static int lastFd=-1;
-
-void term_reg_socket(int fd) {
-  FD_SET(fd, &regMask);
-}
-
-void term_unr_socket(int fd) {
-  FD_CLR(fd, &regMask);
-}
-
-int term_raw_key(char *key, int msecTmo) {
-  fd_set mask;
-
-  mask=regMask;
-  return(sys_select_or_key(&mask, msecTmo, key));
-}
-
-int term_wait_fd(int fd, int msecTmo) {
-  fd_set mask;
-  struct timeval tmo;
-
-  FD_ZERO(&mask);
-  FD_SET(fd, &mask);
-  tmo.tv_sec=msecTmo / 1000;
-  tmo.tv_usec=(msecTmo % 1000) * 1000+1;
-  return(select(FD_SETSIZE, &mask, NULL, NULL, &tmo));
-}
-
-int term_get_key(char *key, int msecTmo) {
-  int iret;
-  char k;
-
-  if (esc_key==0) {
-    iret=term_raw_key(&k, msecTmo);
-  } else {
-    k=esc_key;
-  }
-  while (k==27) { /* esc */
-    iret=term_raw_key(&k, ESC_TMO);
-    switch (k) {
-    case 'O': k='\217'; break; /* ss3 */
-    case '[': k='\233'; break; /* csi */
-    default: break;
-    }
-  }      
-  if (iret!=STDIN_FILENO) {
-    esc_key=k;
-    *key='\0';
-    return(iret);
-  }
-  switch (k) {
-  case '\233': /* csi */
-    iret=term_raw_key(&k, ESC_TMO);
-    while (k>='0' && k <='9') {
-      iret=term_raw_key(&k, ESC_TMO);
-    }
-    if (iret!=STDIN_FILENO) {
-      esc_key=k;
-      *key='\0';
-      return(iret);
-    }
-    switch (k) { /* L,R,U,D arrows */
-    case 'D': k=L_ARROW; break;
-    case 'C': k=R_ARROW; break;
-    case 'A': k=U_ARROW; break;
-    case 'B': k=D_ARROW; break;
-    default: k='?';
-    }
-    break;
-  case '\217': /* ss3 */
-    iret=term_raw_key(&k, ESC_TMO);
-    if (iret!=STDIN_FILENO) {
-      esc_key=k;
-      *key='\0';
-      return(iret);
-    }
-    if (k=='M') { /* enter */
-      k=RET_CHAR;
-    } else if (k >= 'l' && k <= 'y') {
-      k=k-64;
-    } else {
-      k='?';
-    }
-    break;
-  case '\177': /* del */
-  case '\b': /* bs */
-    k=DEL_CHAR;
-    break;
-  case '\r': /* cr */
-  case '\n': /* lf */
-    k=RET_CHAR;
-    break;
-  case EVT_CHAR: /* time out*/
-    break;
-  default:
-    if (k<' ' || k>'\176') k='?';
-  }
-  *key=k;
-  esc_key='\0';
-  return (STDIN_FILENO);
-}
-
-static char *history[HISTORY_LINES]={NULL};
-/* history array: it's a cyclic buffer, when it is full, the oldest values
-   are overwritten.
-*/
-
-static int hist_pos=0; /* position when scrolling through the history */
-static int hist_end=0; /* end of history. Always history[hist_end]==NULL */
-
-int term_get_line(char *buf, int size, int *pos, char *prompt, fd_set *mask) {
-  char key, *lin;
-  int i,j,l,iret,buflen;
-  char tmp[512];
-
-  buf[size-1]='\0'; /* make sure buf is null terminated */
-  l=strlen(buf);
-  if (*pos>l) {
-    *pos=l;
-  } else if (*pos<0) {
-    *pos=0;
-  }
-  iret=term_get_key(&key, 0);
-  while (1) {
-    if (iret==-1 || key == RET_CHAR || key==EVT_CHAR) { /* refresh after a short timeout */
-      assert(l*2+20+strlen(prompt)<sizeof(tmp));
-      tmp[0]='\r';
-      tmp[1]='\0';
-      strcat(tmp, prompt);
-      strcat(tmp, buf);
-      strcat(tmp,"\033[K");
-      j=strlen(tmp);
-      for (i=l; i>*pos; i--) {
-        tmp[j]='\b'; j++;
-      }
-      tmp[j]='\0';
-      fputs(tmp, stdout);
-      if (iret==-1) {
-        iret=term_get_key(&key, -1); /* no timeout */
-      }
-    }
-    switch (key) {
-    case EVT_CHAR:
-      fputs("\r\033[K", stdout);
-      return(iret);
-
-      /* interrupted EXIT */
-
-    case RET_CHAR:
-      /* fputs("\r\033[K", stdout); */
-      i=hist_end-1; if (i<0) i=HISTORY_LINES-1;
-      if ((history[i]==NULL || 0!=strcmp(history[i], buf)) && buf[0]!='\0') { /* do not save equal and empty lines */
-        buflen=strlen(buf)+1;
-	lin=MALLOC(buflen);
-        strncpy(lin, buf, buflen);
-        history[hist_end]=lin;
-        hist_end++; if (hist_end>=HISTORY_LINES) hist_end=0;
-        if (history[hist_end]!=NULL) {
-          FREE(history[hist_end]); /* clear line at end of history */
-        }
-        history[hist_end]==NULL;
-      }
-      hist_pos=hist_end;
-      return(STDIN_FILENO);
-
-      /* normal EXIT */
-
-    case DEL_CHAR:
-      if (*pos>0) {
-        for (i=*pos; buf[i]!='\0'; i++) {
-          buf[i-1] = buf [i];
-        }
-        buf[i-1]='\0';
-        (*pos)--;
-        l--;
-      }
-      break;
-    case L_ARROW:
-      if (*pos>0) (*pos)--;
-      break;
-    case R_ARROW:
-      if (buf[*pos]!='\0') (*pos)++;
-      break;
-    case U_ARROW:
-    case D_ARROW:
-      if (key==U_ARROW) {
-        i=hist_pos-1; if (i<0) i=HISTORY_LINES-1;
-      } else {
-        i=hist_pos+1; if (i>=HISTORY_LINES) i=0;
-      }
-      if (history[i]!=NULL) {
-        strncpy(buf, history[i], size-1);
-        buf[size-1]='\0';
-        hist_pos=i;
-        l=strlen(buf);
-        *pos=l;
-      }
-      break;
-    default:
-      if (l<size-1) {
-        for (i=l; i>*pos; i--) {
-          buf[i]=buf[i-1];
-        }
-        (*pos)++; l++;
-        buf[i]=key;
-        buf[l]='\0';
-      }
-      break;
-    }
-    iret=term_get_key(&key, REF_TMO);
-  }
-}
-
diff --git a/tecs/term.h b/tecs/term.h
deleted file mode 100644
index 34773fa3..00000000
--- a/tecs/term.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef TERM_H_
-#define TERM_H_
-
-void term_reg_socket(int fd);
-/* register socket */
-
-void term_unr_socket(int fd);
-/* unregister socket */
-
-int term_raw_key(char *key, int msecTmo);
-
-int term_wait_fd(int fd, int msecTmo);
-/* wait for a read event on fd or timeout */
-
-int term_get_key(char *key, int msecTmo);
-
-int term_get_line(char *buf, int size, int *pos, char *prompt, fd_set *mask);
-
-#endif /* TERM_H_ */
diff --git a/tecsdriv.c b/tecsdriv.c
deleted file mode 100644
index facceddb..00000000
--- a/tecsdriv.c
+++ /dev/null
@@ -1,419 +0,0 @@
-/*---------------------------------------------------------------------------
-                      T E C S D R I V . C
-	
-  This is the implementation for TECS object derived from an more general
-  environment controller. At present, TECS is used for driving the
-  LakeShore 340 Temperutre Controller.
-  
-  Markus Zolliker, March 2000
-  
-       Copyright:
-
-       Labor fuer Neutronenstreuung
-       Paul Scherrer Institut
-       CH-5423 Villigen-PSI
-
-
-      The authors hereby grant permission to use, copy, modify, distribute,
-      and license this software and its documentation for any purpose, provided
-      that existing copyright notices are retained in all copies and that this
-      notice is included verbatim in any distributions. No written agreement,
-      license, or royalty fee is required for any of the authorized uses.
-      Modifications to this software may be copyrighted by their authors
-      and need not follow the licensing terms described here, provided that
-      the new terms are clearly indicated on the first page of each file where
-      they apply.
-
-      IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-      FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-      ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-      DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-      POSSIBILITY OF SUCH DAMAGE.
-
-      THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-      INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-      FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-      IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-      NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-      MODIFICATIONS.
-----------------------------------------------------------------------------*/
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <sys/time.h>
-#include <tcl.h>
-#include "fortify.h"
-#include "sics.h"
-#include "splitter.h"
-#include "obpar.h"
-#include "devexec.h"
-#include "nserver.h"
-#include "interrupt.h"
-#include "emon.h"
-#include "evcontroller.h"
-#include "evcontroller.i"
-#include "tecsdriv.h"
-#include "servlog.h"
-#include "sicsvar.h"
-#include "tecs/coc_util.h"
-#include "tecs/tecs_cli.h"
-#include "tecs/myc_str.h"
-#include "tecs/myc_err.h"
-  extern pServer pServ;
-
-#include "evdriver.i"  
-
-/*-----------------------------------------------------------------------*/
-  typedef struct {
-                   void *pData;
-                   char *lastError;
-                   time_t lastGet;
-                   int iLastError, port;
-                   char server[256];
-                 } TecsDriv, *pTecsDriv;
-
-
-/*-------------------------------------------------------------------------*/
-
-  int TecsWrapper(SConnection *pCon, SicsInterp *pSics, void *pData,
-                  int argc, char *argv[])
-  {
-    pEVControl self = NULL;
-    char pBueffel[256], result[1024];
-    int iRet;
-    pEVDriver pD;
-    pTecsDriv pMe;
-    float fVal;
-    
-    self = (pEVControl)pData;
-    assert(self);
-    assert(pCon);
-    assert(pSics);
-    
-    if(argc < 2)
-    {
-      return EVControlWrapper(pCon,pSics,pData,argc,argv);
-    }
-    
-    pD=self->pDriv; assert(pD);
-    pMe=pD->pPrivate; assert(pMe);
-    strcpy(pBueffel, " ");
-    strcat(pBueffel, argv[1]);
-    strcat(pBueffel, " ");
-    strtolower(pBueffel);
-    if (0==strcmp(pBueffel," targetvalue ")) {
-      if (argc == 2) {
-        iRet=CocGet(pMe->pData,"set",result); /* get parameter */
-        if (iRet<0) goto Error;
-        self->fTarget = atof(result);
-      }
-      return EVControlWrapper(pCon,pSics,pData,argc,argv);
-    } else if (0==strcmp(pBueffel," list ")) {
-      iRet=CocGet(pMe->pData,"set",result); /* get parameter */
-      if (iRet<0) goto Error;
-      self->fTarget = atof(result);
-      iRet = EVControlWrapper(pCon,pSics,pData,argc,argv);
-      if (iRet != 0) {
-        iRet=CocGet(pMe->pData,"tlimit",result); /* get parameter */
-        if (iRet<0) goto Error;
-        fVal = atof(result);
-        if (fVal != 0 && ObVal(self->pParam,UPLIMIT) > fVal) {
-          sprintf(pBueffel,"WARNING: upper limit is above %g, (limit of the device)", fVal);
-          SCWrite(pCon,pBueffel,eValue);
-        }
-        iRet=CocGet(pMe->pData,"status",result); /* get parameter */
-        if (iRet<0) goto Error;
-        SCWrite(pCon,result,eValue);
-      }
-      return iRet;
-    } else if (0==strcmp(pBueffel," upperlimit ")) {
-      if (argc > 2) {
-        iRet=CocGet(pMe->pData,"tlimit",result); /* get parameter */
-        if (iRet<0) goto Error;
-        fVal=atof(result);
-        if (atof(argv[2]) > fVal) {
-          sprintf(pBueffel,"ERROR: upper limit must not be higher than %g", fVal);
-          SCWrite(pCon,pBueffel,eError);
-          return 0;
-	}
-      }
-      return EVControlWrapper(pCon,pSics,pData,argc,argv);
-    } else if (0==strcmp(pBueffel," lowerlimit ")) {
-      if (argc > 2) {
-        if (atof(argv[2]) > ObVal(self->pParam,UPLIMIT)) {
-          SCWrite(pCon,"ERROR: lower limit must not be higher than upperlimit",eError);
-          return 0;
-	}
-      }
-      return EVControlWrapper(pCon,pSics,pData,argc,argv);
-    } else if (NULL!=strstr(
-        " log send tolerance access errorhandler interrupt interest safevalue currentvalue maxwait settle "
-			    , pBueffel)) {
-      /* forward to standard handler */
-      return EVControlWrapper(pCon,pSics,pData,argc,argv);
-    }
-    if(argc > 2) { /* set case */
-      iRet=CocSet(pMe->pData,argv[1],argv[2]);
-      if (iRet<0) goto Error;
-      return 1;
-    } else { /* get case (or command without parameter) */
-      if (0==strcasecmp(argv[1], "kill")) {
-        iRet=CocSet(pMe->pData,"quit","1"); /* send quit flag */
-        strcpy(result, "1");
-      } else {
-        iRet=CocGet(pMe->pData,argv[1],result); /* get parameter */
-      }
-      if (iRet<0) goto Error;
-      sprintf(pBueffel,"%s.%s = %s\n",self->pName,
-               argv[1],result);
-      SCWrite(pCon,pBueffel,eValue);
-      return 1;
-    }
-    /* not reached */
-    Error:
-      sprintf(pBueffel,"ERROR in TECS: %s",ErrMessage);
-      SCWrite(pCon,pBueffel,eError);
-      return 0; 
-  }  
-
-/*----------------------------------------------------------------------------*/
-
-  static int TecsGet(pEVDriver  self, float *fPos)
-  {
-     pTecsDriv pMe = NULL;
-     int iRet;
-     time_t now;
-     
-     assert(self);
-     pMe = (pTecsDriv)self->pPrivate;
-     assert(pMe);   
-
-     time(&now);
-     if (now!=pMe->lastGet) { /* TecsGet was not yet called within this second */
-       pMe->lastGet=now;
-     } else {
-       CocDelay(200); /* wait 0.2 sec. (seems that SICS has nothing else to do then reading temperatures) */
-     }
-
-     /* get temperature */
-     iRet = TeccGet(pMe->pData, fPos);
-     if(iRet < 0) {
-       pMe->lastError = ErrMessage;
-       pMe->iLastError=1; /* severe */
-       return 0;
-     }
-     pMe->iLastError=0;
-     return 1;
-  } 
-/*----------------------------------------------------------------------------*/
-
-  static int TecsGetX(pEVDriver  self, float *fTarget, float *fPos, float *fDelta)
-  {
-     pTecsDriv pMe = NULL;
-     int iRet;
-     time_t now;
-    
-     assert(self);
-     pMe = (pTecsDriv)self->pPrivate;
-     assert(pMe);   
-
-     time(&now);
-     if (now!=pMe->lastGet) { /* TecsGet was not yet called within this second */
-       pMe->lastGet=now;
-     } else {
-       CocDelay(200); /* wait 0.2 sec. (seems that SICS has nothing else to do then reading temperatures) */
-     }
-
-     /* get temperature */
-     iRet = TeccGetX(pMe->pData, fTarget, fPos, fDelta);
-     if(iRet < 0) {
-       pMe->lastError = ErrMessage;
-       pMe->iLastError=1; /* severe */
-       return 0;
-     }
-     pMe->iLastError=0;
-     return 1;
-  } 
-/*----------------------------------------------------------------------------*/
-  static int TecsRun(pEVDriver self, float fVal)
-  {
-     pTecsDriv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pTecsDriv )self->pPrivate;
-     assert(pMe);
-
-     /* set temperature */
-     iRet  = TeccSet(pMe->pData, fVal);
-     if(iRet < 0) {
-       pMe->iLastError=1; /* severe */
-       pMe->lastError = ErrMessage;
-       return 0;
-     }
-     return 1;
- }
-/*--------------------------------------------------------------------------*/
-  int TecsError(pEVDriver self, int *iCode, char *error, int iErrLen)
-  {
-     pTecsDriv pMe = NULL;
-     
-     assert(self);
-     pMe = (pTecsDriv)self->pPrivate;
-     assert(pMe);
-
-     *iCode = pMe->iLastError;
-     if (pMe->lastError==NULL) {
-       str_ncpy(error, "undefined error", iErrLen);
-     } else {
-       str_ncpy(error, pMe->lastError, iErrLen);
-       str_ncat(error, " (TECS)", iErrLen);
-     }
-     return 1;
-  }
-/*---------------------------------------------------------------------------*/
-  static int TecsFix(pEVDriver self, int iError)
-  {
-     pTecsDriv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pTecsDriv )self->pPrivate;
-     assert(pMe);
-     if (pMe->iLastError==1) { /* for Tecs, iLastError means severity level */
-       return(DEVFAULT);      /* 1: severe */
-     } else {
-       return(DEVREDO);       /* 2: try again, good luck! */
-     }
-  }
-/*--------------------------------------------------------------------------*/
-  static int TecsSend(pEVDriver self, char *pCommand, char *pReply, int iLen)
-  {
-     pTecsDriv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pTecsDriv )self->pPrivate;
-     assert(pMe);
-
-     iRet  = TeccSend(pMe->pData, pCommand, pReply,iLen);
-     if(iRet < 0)
-     {
-       pMe->lastError = ErrMessage;
-       return 0;
-     }
-     return 1;
-
-  }  
-/*--------------------------------------------------------------------------*/
-  static int TecsInit(pEVDriver self)
-  {
-     pTecsDriv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pTecsDriv )self->pPrivate;
-     assert(pMe);
-
-     pMe->pData = TeccInit(pMe->server, pMe->port);
-     if(pMe->pData==NULL)
-     {
-       pMe->iLastError = 1; /* severe */
-       pMe->lastError = ErrMessage;
-       return -1; /* fatal */
-     }
-     return 1;
-  }  
-/*--------------------------------------------------------------------------*/
-  static int TecsClose(pEVDriver self)
-  {
-     pTecsDriv pMe = NULL;
-     int iRet;
-     
-     assert(self);
-     pMe = (pTecsDriv )self->pPrivate;
-     assert(pMe);
-
-     TeccClose(pMe->pData);
-     pMe->pData=NULL;
-     return 1;
-  }  
-/*--------------------------------------------------------------------------*/
-  static int TecsHalt(pEVDriver *self)
-  {
-     assert(self);
-     
-     return 1;
-  }
-/*------------------------------------------------------------------------*/
-  void TecsKill(void *pData)
-  {
-     pTecsDriv pMe = NULL;
-     
-     pMe = (pTecsDriv)pData;
-     assert(pMe);
-     free(pMe);
-  }  
-/*------------------------------------------------------------------------*/
-  pEVDriver CreateTecsDriver(int argc, char *argv[])
-  {
-     pEVDriver pNew = NULL;
-     pTecsDriv pMe = NULL;
-     pSicsVariable pInst = NULL;
-     char *pPort=NULL, *pPath=NULL;
-     FILE *fil;
-     char buf[256];
-    
-     pNew = CreateEVDriver(argc,argv);
-     pMe = (pTecsDriv)malloc(sizeof(TecsDriv));
-     memset(pMe,0,sizeof(TecsDriv));
-     if(!pNew || !pMe)
-     {
-       return NULL;
-     }
-     pNew->pPrivate = pMe;
-     pNew->KillPrivate = TecsKill;
-     
-     /* initalise pTecsDriver */
-     pMe->lastError = NULL;
-
-     pMe->port=0;
-     pMe->server[0]='\0';
-
-     pPath = IFindOption(pSICSOptions, "TecsInit");
-     if (pPath != NULL) {
-       fil=fopen(pPath, "r");
-       if (fil!=NULL) {
-         pPort=fgets(buf, sizeof(buf), fil);
-         if (pPort != NULL) {
-           pMe->port=atoi(pPort);
-	 }
-	 fgets(buf, sizeof(buf), fil);
-	 fgets(pMe->server, sizeof(pMe->server), fil);
-       }
-     }
-	    
-     if (pMe->port==0) {
-       /* get the port number for tecs */
-       pPort = IFindOption(pSICSOptions, "TecsPort");
-       if (pPort!=NULL) {
-         pMe->port=atoi(pPort);
-       }
-       if (pMe->port==0) {
-         pMe->port=9753;
-       }
-     }
-
-     /* initialise function pointers */
-     pNew->SetValue = TecsRun;
-     pNew->GetValue = TecsGet;
-     pNew->Send     = TecsSend;
-     pNew->GetError = TecsError;
-     pNew->TryFixIt = TecsFix;
-     pNew->Init     = TecsInit;
-     pNew->Close    = TecsClose;
-     pNew->GetValues= TecsGetX;
-     
-     return pNew; 
-  }	
diff --git a/tecsdriv.h b/tecsdriv.h
deleted file mode 100644
index d38b69a0..00000000
--- a/tecsdriv.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*-------------------------------------------------------------------------
-                             T E C S D R I V . H
- 
-  Support for TECS server (LakeShore 340 Temperature controllers) for SICS.
-  The meaning and working of the functions defined is as described for a
-  general environment controller.
-
-  Markus Zolliker, March 2000
-
-  copyright: see implementation file.
-
------------------------------------------------------------------------------*/
-#ifndef SICSTECS
-#define SICSTECS
-/*------------------------- The Driver ------------------------------------*/
-
-   pEVDriver CreateTecsDriver(int argc, char *argv[]);
-
-
-/*------------------------- The Tecs object ------------------------------*/
-
-   int TecsWrapper(SConnection *pCon, SicsInterp *pSics, void *pData,
-                     int argc, char *argv[]);
-
-   int TecsError(pEVDriver self, int *iCode, char *error, int iErrLen);
-
-#endif
diff --git a/utils/Makefile b/utils/Makefile
deleted file mode 100644
index bbff3c84..00000000
--- a/utils/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-#---------------------------------------------------------------------------
-# Makefile for the Utilities in the utils directory,
-#
-#	e.g. SerPortServer asynsrv_test
-#
-# David Maden, Sep-2000
-#--------------------------------------------------------------------------
-
-#------------ for DigitalUnix (add -DFORTIFY to CFLAGS for fortified version)
-#CC     = cc
-#CFLAGS = -std -g -warnprotos -I. -I../hardsup
-#BIN    = ../bin
-#LFLAGS = -L../hardsup
-
-#------------ for Linux
-CC     = gcc
-CFLAGS = -g -I. -I../hardsup -DLinux
-BIN    = ../bin
-LFLAGS = -L../hardsup -L/usr/X11R6/lib
-#------------
-
-#----------------------------------------------------------
-
-all:    $(BIN)/asynsrv_test \
-        $(BIN)/el734 \
-        $(BIN)/el734_test \
-        $(BIN)/el737 \
-        $(BIN)/SerPortServer
-
-#----------------------------------------------------------
-
-$(BIN)/SerPortServer: SerPortServer.c
-	rm -f $(BIN)/SerPortServer
-	$(CC) $(CFLAGS)  -o $(BIN)/SerPortServer  \
-         SerPortServer.c $(LFLAGS) -lhlib -lX11 
-	    
-
-$(BIN)/asynsrv_test: asynsrv_test.c
-	rm -f $(BIN)/asynsrv_test
-	$(CC) $(CFLAGS) -o $(BIN)/asynsrv_test \
-                  asynsrv_test.c $(LFLAGS) -lhlib -lX11
-
-$(BIN)/el734: el734.c
-	@ echo "el734 needs Motif library. Not yet found on linux"
-	rm -f $(BIN)/el734
-	$(CC) $(CFLAGS) -o $(BIN)/el734 \
-                  el734.c $(LFLAGS) -lhlib -lX11 -lXt -lXm
-
-$(BIN)/el734_test: el734_test.c
-	rm -f $(BIN)/el734_test
-	$(CC) $(CFLAGS) -o $(BIN)/el734_test \
-                  el734_test.c $(LFLAGS) -lhlib -lX11
-
-$(BIN)/el737: el737.c
-	@ echo "el737 needs Motif library. Not yet found on linux"
-	rm -f $(BIN)/el737
-	$(CC) $(CFLAGS) -I/usr/X11R6/include -o $(BIN)/el737 \
-                  el737.c $(LFLAGS) -lhlib -lXm -lXt -lX11 -lm
-
-#----------------------------------------------------------
-
-clean:
-	- rm -f *.o
-	- rm -f $(BIN)/SerPortServer \
-                $(BIN)/asynsrv_test \
-                $(BIN)/el734 \
-                $(BIN)/el734_test \
-                $(BIN)/el737
-#----------------------------------------------------------
-.c.o:
-	$(CC) $(CFLAGS) -c $*.c
-#----------------------------------------------------------
diff --git a/utils/SerPortServer.c b/utils/SerPortServer.c
deleted file mode 100755
index 40cf050a..00000000
--- a/utils/SerPortServer.c
+++ /dev/null
@@ -1,2588 +0,0 @@
-#define	    ident	    "1B04"
-
-#ifdef __DECC
-#pragma	    module	    SerPortServer	ident
-#endif
-/*
-** Updates:
-**  1A01 26-Apr-1999 DM.	Initial version.
-**  1A04 14-Jan-2000 DM.	Increase # RS-232-C ports to 20.
-**  1A08  3-Apr-2000 DM.	Add fortify.h
-**  1A10  7-Apr-2000 DM.	Change time-out units to 0.2 secs.
-**  1B01 21-Aug-2000 DM.	Handle client requests in parallel and put
-**				    time-out units back to 0.1 secs.
-**
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     SINQ Project				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Link_options - Here is the Linker Option File
-**!$	if p1 .eqs. "DEBUG" then dbg1 := /debug
-**!$	if p1 .eqs. "DEBUG" then dbg2 := _dbg
-**!$	link 'dbg1'/exe=new_SerPortServer'dbg2'.exe sys$input/options
-**!	    new_SerPortServer
-**!	    mad_lib:sinq_dbg/lib
-**!	    sys$share:decw$xmlibshr12/share
-**!	    sys$share:decw$xtlibshrr5/share
-**!	    sys$share:decw$xlibshr/share
-**!$	purge/nolog new_SerPortServer'dbg2'.exe
-**!$	set prot=w:re new_SerPortServer'dbg2'.exe
-**!$	write sys$output "Exec file is ''f$environment ("default")'new_SerPortServer''DBG2'.EXE
-**!$	exit
-**!$!
-**!$! To build on LNSA09 ...
-**!$!	$ import tasmad dev
-**!$!	$ build_cc_select :== decc
-**!$!	$ define/job deltat_c_tlb sinq_c_tlb
-**!$!	$ bui tas_src:[utils]new_SerPortServer debug
-**!$!
-** Link_options_end
-**
-**	Building on Alpha Digital Unix:
-**
-**	    setenv TAS_BASE ~maden/tasmad
-**	    source $TAS_BASE/tasmad.setup
-**	    rcp -p "lnsa09:tas_src:[utils]new_SerPortServer.c" \
-**			    $TAS_SRC/utils/new_SerPortServer.c
-**	    cc -std -g -o $TAS_BIN/new_SerPortServer	\
-**		    -I$TAS_INC				\
-**		    $TAS_SRC/utils/new_SerPortServer.c	\
-**		    -L$TAS_LIB -lsinq -lXm -lXt -lX11
-**
-** Resources and Options	    File:	decw$user_defaults:SinQ_rc.dat
-** ---------------------	    or		$HOME/SinQ_rc
-**
-**  Resource		Option    Default	    Description
-**  --------		------    -------	    -----------
-**  -			-name	  SerPortServer	Name to use when looking up the
-**						   resources. The default is the
-**						   image file name.
-**  *serPortTsName	-ts       none		 Name or IP address of Terminal
-**						   Server.
-**  *serPortServPort	-port     4000		 TCP/IP port service number.
-**  *serPortTrace	-trace	  		 Turn on tracing.
-**  *serPortTraceSize	-tsize  0x40000	(= 256k) Trace buffer size.
-**  *serPortPeriod	-period      60	    Period for writing trace time-stamps
-**  *serPortMax         -max      20             Maximum number of serial ports
-**                                               to use
-**
-**  A value given via -name will be converted to lowercase before being used.
-**---------------------------------------------------------------------------
-** Module Name  . . . . . . . . : [...MOTIF]SerPortServer.C
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Apr 1999
-**
-** Purpose
-** =======
-**	SerPortServer is a TCP/IP server program which should accept TCP/IP
-**	connections from EL734, EL737 or other clients obeying the AsynSrv
-**	protocol and then transmit requests to an RS232C device connected to
-**	a Lantronix ETSnnP terminal server. It should provide the same
-**	functions as the SerPortServer program on the Mac.
-** Use:
-** ===
-**  1) Set up the name of the Terminal Server and the TCP/IP port number on
-**	which this TCP/IP server will listen for connections in the resources
-**	file (see above). These can also be supplied as an option on the
-**	command line.
-**
-**  2) Run the program
-**
-**	    $ spawn/nowait/out=nl: run <directory>SerPortServer
-**
-**	or, to specify the options on the command line, use a
-**	DCL foreign command:
-**
-**	    $ SerPortServer :== $<directory>SerPortServer
-**	    $ SerPortServer -ts <TS-name> -port <port-number>
-**
-**====================================================================
-** Clients send packets of commands to SerPortServer. These packets consist
-** of zero or more commands to a serial port. The commands are sent and
-** the responses are read. The responses are packed up ito a response packet
-** which is sent to the client when complete. See rs232c_def.h for a description
-** of the packet structure.
-**
-** If an error is detected, the field n_rply in the response packet is set
-** to "-001" and the field u.sub_status may take one of the values:
-**  "-00000000001" if field n_cmnds is a non-decimal ASCII string.
-**  "-00000000002" if field n_cmnds is illegal.
-**  "-00000000003" if runaway command list.
-**  "-00000000004" if non-decimal ASCII command length.
-**  "-00000000005" if illegal command length.
-**  "-00000000006" if bad status from send.
-**  "-00000000007" if request aborted while in pending list.
-**  "-00000000008" if field serial_port is illegal.
-**  "-00000000009" if command list execution terminated because another request
-**			has been received from this client before this one
-**			was completed.
-**  "-00000000010" if the request timed out whilst still on the pending queue
-**			for the specified channel.
-**  "-00000000011" if command list execution terminated via <Ctrl-C>.
-**  "-00000000012" if the terminal server IP address is not known.
-**  "-00000000014" if TS socket create failed.
-**  "-00000000015" if TS socket bind failed.
-**  "-00000000016" if TS socket connect failed.
-**  "-00000000017" if no more TS indices available.
-**  "-00000000018" if runaway pending list.
-**  "000000005001" if protocol level mismatch.
-**====================================================================
-*/
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <netdb.h>
-#include    <signal.h>
-#include    <ctype.h>
-#include    <errno.h>
-
-#include    <sys/socket.h>
-#include    <sys/time.h>
-#include    <sys/types.h>
-
-#ifdef  __VMS
-  #include    <ucx$inetdef.h>
-  #include    <unixio.h>
-  #include    <lib$routines.h>
-  #include    <libdtdef.h>
-#else
-  #include    <unistd.h>
-  #include    <netinet/tcp.h>
-  #ifdef FORTIFY
-    #include    <fortify/fortify.h>
-  #endif
-#endif
-
-#include    <netinet/in.h>
-
-#include    <arpa/inet.h>
-
-#include    <X11/Intrinsic.h>
-/*
-
-**--------------------------------------------------------------------------
-**			Define global structures and constants.
-*/
-#include    <sinq_prototypes.h>
-#ifdef	__VMS
-    int	    sys$gettim (int *time, ...);
-#endif
-
-#define	RS__MAX_CLIENTS	 8	/* Up to 8 clients will be supported */
-static int  RS__MAX_ASYNCH =	20;	/* Asynch "ports" 0 - 19 will be allowed */
-#define MAX_OPEN_CHANS	20
-
-#define MAX_PKT_SIZE	10000	/* The SerPortServer packet protocol has a
-				** 4 char ASCII header giving the packet length.
-				** The max packet size is therefore 9999.
-				*/
-#define	NIL	'\0'
-
-  enum ACTION {
-    IN,
-    OUT,
-    ERROR,
-    OPEN,
-    CLOSE,
-    TMO,
-    FLUSH};
-
-  enum CL_SKT_STATUS {
-    CL_SS_IDLE,
-    CL_SS_BUSY,
-    CL_SS_PENDING};
-
-  enum TS_SKT_STATUS {
-    TS_SS_IDLE = -1};
-/*-------------------------------------------------------------
-**			Prototypes of Routines in this File
-*/
-  void	    abortPending (
-		int	 indx);
-  void	    addToBuffer (
-		char	 byte,
-		char	*buff,
-		int	 b_size,
-		int	*nxt);
-  void	    addToPendList (
-		int	 ts_indx,
-		int	 cl_indx);
-  void	    chanFlush (
-		int	 indx);
-  void	    closeClient (
-		int	 indx);
-  void	    closeTs (
-		int	 indx);
-  void	    ctrlC_Handler (
-		int	 sigint);
-  void	    freeAll ();
-  void	    getCurrentTime (
-		struct timeval	*time_now);
-  void	    handleClientRecv (
-		int	 indx);
-  void	    handlePendTmo (
-		int	 indx);
-  void	    handleTmo (
-		int	 indx);
-  void	    handleTsRecv (
-		int	 indx);
-  int	    lookForTerm (
-		int	    *len,
-		char	    *term,
-		int	     nterm,
-		char	    *terms,
-		char	    *buff,
-		int	     nch);
-  int	    open_RS232C_Chan (
-		char		*server,
-		int		 chan,
-		struct RS__RespStruct   *rply);
-  void	    sendCmndToTs (
-		int		 ts_indx,
-		int		 cl_indx);
-  int	    setupErrReply (
-		struct RS__RespStruct *rply,
-		char		*msg_id,
-		char		*sub_status);
-  void	    setupNewClient (
-		int	    skt);
-  int	    setupSocket (
-		int	    port);
-  char	   *setupTime (
-		char	*buff,
-		int	 buff_size);
-  int	    setupXrmDatabase (
-		XrmDatabase *db,
-		char	    *name[],
-		int	    *argc,
-		char	    *argv[]);
-  void	    startUserRequest (
-		int	 indx);
-  float	    subtractTimes (
-		struct timeval	time0,
-		struct timeval	time1);
-  void	    traceAdd (
-		int	 n_txt,
-		char	*txt);
-  void	    traceDo (
-		char	    prefix,
-		int	    indx,
-		enum ACTION in_or_out,
-		int	    n_txt,
-		char	   *txt);
-  void	    traceWrite ();
-  void	    USR1_Handler (
-		int	 sigint);
-/*-------------------------------------------------------------
-**	Global Variables
-*/
-  static int	Inet_port;		/* TCP/IP Port number for listening */
-  static int	Cnct_skt;		/* Base socket for "accept" */
-  static fd_set	Skt_mask;		/* Mask for "select"	*/
-  static int	Max_skt  = 0;		/* Max socket to check by "select" */
-  static float	Next_tmo_secs;		/* Number of secs till next time-out */
-
-  static char	Ts_name[32];		/* Name of Terminal Server */
-
-  static int	N_clients;	/* The number of connected clients */
-  static int	N_open_chans;	/* The number of open RS-232-C chans */
-
-  static struct cl_recd {	      /* Data structures for the open clients */
-    struct RS__MsgStruct  *msge;       /* Pntr to bufr for msge from client */
-    struct RS__RespStruct *rply;       /* Pntr to bufr for reply to client */
-    enum CL_SKT_STATUS	  status;      /* Status of the connection */
-    char		  host[64];    /* Name of client host */
-    int			  port;	       /* Client's TCP/IP port number */
-    int			  skt;	       /* The socket number */
-    int			  pending;     /* Index of a pending request */
-    struct timeval	  pend_time;   /* Time-stamp if rqst pending */
-    int			  msg_len;     /* The length of the data in *msge */
-    int			  pcol_code;   /* The Protocol level of *msge */
-    char		  fmt_in[8];   /* The format for decoding */
-    char		  fmt_out[8];  /* The format for encoding */
-    int			  hdr_size;    /* The size of header fields (2 or 4) */
-    int			  chan;	       /* The channel # from *msge */
-    int			  chnx;	       /* The channel index */
-    float		  tmo;	       /* Time-out in secs from *msge */
-    int			  nterm;       /* # terminators from *msge */
-    char		  terms[4];    /* The terminators from *msge */
-    int			  n_cmnds;     /* # cmnds from *msge */
-    int			  n_rplys;     /* # replies in from *rply */
-    int			  c_len;       /* Len of current cmnd from *msge */
-    int			  msge_size;   /* The size of the *msge buffer */
-    int			  rply_size;   /* The size of the *rply buffer */
-    int			  remaining;   /* # bytes available in *rply */
-    char		 *nxt_cmnd_ptr;	/* Pntr to next cmnd in *msge */
-    char		 *nxt_rply_ptr0;/* Pntr to hdr of nxt rply in *rply */
-    char		 *nxt_rply_ptr1;/* Pntr to next byte to fill in *rply */
-  } *Cl_info;
-
-  static struct ts_recd {		/* Data structures for the open chans */
-    enum TS_SKT_STATUS	status;		/* Status of the connection
-					**  >= 0 ==> in use by a client. The
-					**	value is the client's index.
-					*/
-    char		server[64];	/* Name of terminal server */
-    char		dot_addr[20];	/* Internet addr of TS in dot format */
-    int			chan;		/* The channel number */
-    int			port;		/* Remote TCP/IP port number */
-    int			skt;		/* The socket number */
-    fd_set		mask;		/* A select mask for the socket */
-    char		tp_ahd[2048];	/* Type-ahead buffer */
-    int			tp_nxt;		/* Index of next free byte in tp_ahd */
-    float		tmo;		/* Time-out for current cmnd in secs */
-    struct timeval	time_stamp;	/* Time-stamp for current cmnd */
-    int			pending;	/* Index of a pending request */
-  } *Ts_info;
-
-  static int		Trace;			/* Trace transactions if True */
-  static int		Tr_buf_size = 0x40000;	/* Size of trace buffer */
-  static unsigned char *Tr_buf = NULL;		/* Buffer to hold trace info. */
-  static int		Tr_buf_len = 0;		/* Length of allo trace buff */
-  static unsigned char *Tr_buf_nxt;		/* Next free byte in trace bf */
-  static int		Tr_buf_free;		/* # free bytes in trace buff */
-  static int		Tr_buf_shuff;		/* Trace buffer shuffle value */
-  static struct timeval	Tr_timer;		/* Trace time-stamp */
-  static int		Tr_period = 60;		/* Trace time-stamp period */
-
-  static int	Debug;			/* Debug mode if True */
-  static int	Usr1_has_happened;   /* Set to True when USR1 signal detected */
-
-  static int		Ctrl_C_has_happened; /* Set to True when <Ctrl-C> hit */
-  static int		Ctrl_C_pending;	     /* True if <Ctrl-C> exit is
-					     **	    pending */
-  static struct timeval	Ctrl_C_time;	     /* Time-stamp of detection
-					     **	    of <Ctrl-C> */
-/*
-**---------------------------------------------------------------------------
-**		abortPending:  Abort any pending requests on a channel.
-*/
-  void	abortPending (
-/*	============
-*/	    int		 indx) {	/* The index of the channel */
-
-    int	    i, j, status;
-
-    if (Ts_info[indx].pending >= 0) {
-      i = Ts_info[indx].pending;
-      Ts_info[indx].pending = -1;
-      while (i != -1) {
-	j = setupErrReply (Cl_info[i].rply,
-				Cl_info[i].msge->msg_id, "-00000000007");
-	status = send (Cl_info[i].skt, (char *) Cl_info[i].rply, j, 0);
-	if (Trace) traceDo ('S', Cl_info[i].skt, ERROR, 16, " sub_status = -7");
-	j = Cl_info[i].pending;
-	Cl_info[i].status = CL_SS_IDLE;
-	Cl_info[i].pending = -1;
-	j = i;
-      }
-    }
-    return;
-  }
-/*
-**---------------------------------------------------------------------------
-**		addToBuffer:  Add a byte to the end of a type-ahead buffer.
-*/
-  void	addToBuffer (
-/*	===========
-*/	    char	 byte,	    /* The byte to be added */
-	    char	*buff,	    /* The buffer start address */
-	    int		 b_size,    /* The size of the buffer */
-	    int		*nxt) {	    /* Index of first free byte in buffer */
-
-    int		i;
-
-    if (*nxt >= b_size) {		/* Must the buffer be shuffled down? */
-      for (i = 1; i < b_size; i++) buff[i-1] = buff[i];	    /* Yes */
-      *nxt = b_size - 1;
-    }
-    buff[*nxt] = byte;
-    *nxt += 1;
-  }
-/*
-**---------------------------------------------------------------------------
-**			addToPendList	- add a request to pending list
-*/
-  void	addToPendList (
-/*	=============
-*/		int	    ts_indx,	/* Term srvr index */
-		int	    cl_indx) {	/* Client index of pending request */
-
-    int		i, j, run_away = 0;
-
-    Cl_info[cl_indx].status  = CL_SS_PENDING;
-    Cl_info[cl_indx].pending = -1;
-    getCurrentTime (&Cl_info[cl_indx].pend_time);
-
-    if (Ts_info[ts_indx].pending == -1) {
-      Ts_info[ts_indx].pending = cl_indx;
-    }else {
-      i = Ts_info[ts_indx].pending;
-      while ((Cl_info[i].pending != -1) && (run_away < 10)) {
-	i = Cl_info[i].pending; run_away++;
-      }
-      if (Cl_info[i].pending != -1) {
-	if (Trace) traceDo ('C', Ts_info[ts_indx].chan, ERROR,
-                                    23, " <runaway pending list>");
-	if (Trace) traceDo ('S', Cl_info[cl_indx].skt, ERROR,
-                                    23, " <runaway pending list>");
-	printf ("   <runaway pending list> C:%d S:%d\n",
-			Ts_info[ts_indx].chan, Cl_info[cl_indx].skt);
-	j = setupErrReply (Cl_info[cl_indx].rply,
-				Cl_info[cl_indx].msge->msg_id, "-00000000018");
-	send (Cl_info[cl_indx].skt,
-                            (char *) Cl_info[cl_indx].rply, j, 0);
-	Cl_info[cl_indx].status = CL_SS_IDLE;
-	return;
-      }
-      Cl_info[i].pending = cl_indx;
-    }
-  }
-/*
-**---------------------------------------------------------------------------*/
-  void	chanFlush (
-/*	=========
-**				Flush out any pending input
-*/
-	    int		indx) {	    /* The Ts_info index of channel to flush */
-
-    int			i, status;
-    fd_set		my_rd_msk;
-    char		buff[80];
-    struct timeval	tmo, zero_tmo = {0, 0};
-		    /*
-		    ** First flush the type-ahead buffer
-		    */
-    if ((Trace) && (Ts_info[indx].tp_nxt > 0)) {
-      traceDo ('C', Ts_info[indx].chan, FLUSH,
-			Ts_info[indx].tp_nxt, Ts_info[indx].tp_ahd);
-    }
-    Ts_info[indx].tp_nxt = 0;
-		    /*
-		    ** Then flush the socket
-		    */
-    my_rd_msk = Ts_info[indx].mask;
-    tmo = zero_tmo;
-    status = select (Ts_info[indx].skt+1,
-			    &my_rd_msk, NULL, NULL, &tmo);
-    while (status > 0) {
-      status = recv (Ts_info[indx].skt, buff, sizeof (buff), 0);
-      if ((Trace) && (status > 0)) traceDo ('C', Ts_info[indx].chan, FLUSH,
-						    status, buff);
-      my_rd_msk = Ts_info[indx].mask;
-      tmo = zero_tmo;
-      status = select (Ts_info[indx].skt+1,
-			    (fd_set *) &my_rd_msk, NULL, NULL, &tmo);
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void	closeClient (
-/*	===========
-**		    Close a client socket and remove the item from the
-**		    Cl_info array and compress the rest.
-*/
-	    int		indx) {	    /* The index of the client to be closed */
-
-    int	    i, j;
-
-    if ((indx < 0) || (indx >= N_clients)) return;
-		    /*
-		    ** Ensure that the client is not in any active or pending
-		    ** list and remove it, if so.
-		    */
-    for (i = 0; i < N_open_chans; i++) {
-      if (Ts_info[i].status != TS_SS_IDLE) {
-	if (Ts_info[i].status == indx) {
-	  Ts_info[i].status = TS_SS_IDLE;
-	  if (Ts_info[i].pending >= 0) {
-	    j = Ts_info[i].pending;
-	    startUserRequest (j);
-	    Ts_info[i].pending = Cl_info[j].pending;  /* Move up pending chain */
-	    while (Cl_info[j].pending >= 0) {
-	      Cl_info[j].pending = Cl_info[Cl_info[j].pending].pending;
-	      j = Cl_info[j].pending;
-	    }
-	  }
-	}
-	if (Ts_info[i].pending == indx) {
-	  j = Ts_info[i].pending;
-	  Ts_info[i].pending = Cl_info[j].pending;
-	}
-      }
-    }
-    for (i = 0; i < N_clients; i++) {
-      if ((i != indx) && (Cl_info[i].status != CL_SS_IDLE)) {
-	if (Cl_info[i].pending == indx) {
-	  Cl_info[i].pending = Cl_info[indx].pending;
-	}
-      }
-    }
-		    /*---------------------------------------------*/
-    close (Cl_info[indx].skt);
-    for (i = (indx + 1); i < N_clients; i++) {
-      memcpy (Cl_info[i-1].msge, Cl_info[i].msge, MAX_PKT_SIZE);
-      memcpy (Cl_info[i-1].rply, Cl_info[i].rply, MAX_PKT_SIZE);
-      Cl_info[i-1].status	= Cl_info[i].status;
-      memcpy (Cl_info[i-1].host, Cl_info[i].host, sizeof (Cl_info[i].host));
-      Cl_info[i-1].port		= Cl_info[i].port;
-      Cl_info[i-1].skt		= Cl_info[i].skt;
-      Cl_info[i-1].pending	= Cl_info[i].pending;
-      if (Cl_info[i-1].pending > indx) Cl_info[i-1].pending -= 1;
-      Cl_info[i-1].pend_time	= Cl_info[i].pend_time;
-      Cl_info[i-1].msg_len	= Cl_info[i].msg_len;
-      Cl_info[i-1].pcol_code	= Cl_info[i].pcol_code;
-      strcpy (Cl_info[i-1].fmt_in,  Cl_info[i].fmt_in);
-      strcpy (Cl_info[i-1].fmt_out, Cl_info[i].fmt_out);
-      Cl_info[i-1].hdr_size	= Cl_info[i].hdr_size;
-      Cl_info[i-1].chan		= Cl_info[i].chan;
-      Cl_info[i-1].chnx		= Cl_info[i].chnx;
-      Cl_info[i-1].tmo		= Cl_info[i].tmo;
-      Cl_info[i-1].nterm	= Cl_info[i].nterm;
-      memcpy (Cl_info[i-1].terms, Cl_info[i].terms, sizeof (Cl_info[i].terms));
-      Cl_info[i-1].n_cmnds	= Cl_info[i].n_cmnds;
-      Cl_info[i-1].n_rplys	= Cl_info[i].n_rplys;
-      Cl_info[i-1].c_len	= Cl_info[i].c_len;
-      Cl_info[i-1].msge_size	= Cl_info[i].msge_size;
-      Cl_info[i-1].rply_size	= Cl_info[i].rply_size;
-      Cl_info[i-1].remaining	= Cl_info[i].remaining;
-      Cl_info[i-1].nxt_cmnd_ptr	= Cl_info[i].nxt_cmnd_ptr -
-	    ((char *) Cl_info[i].msge - (char *) Cl_info[i-1].msge);
-      Cl_info[i-1].nxt_rply_ptr0 = Cl_info[i].nxt_rply_ptr0 -
-	    ((char *) Cl_info[i].rply - (char *) Cl_info[i-1].rply);
-      Cl_info[i-1].nxt_rply_ptr1 = Cl_info[i].nxt_rply_ptr1 -
-	    ((char *) Cl_info[i].rply - (char *) Cl_info[i-1].rply);
-    }
-    N_clients--;
-
-    for (i = 0; i < N_open_chans; i++) {
-      if (Ts_info[i].pending > indx) Ts_info[i].pending -= 1;
-    }
-			/*
-			** Ensure Max_skt and Skt_mask are up to date
-			*/
-    FD_ZERO (&Skt_mask); FD_SET (Cnct_skt, &Skt_mask);
-    Max_skt = Cnct_skt + 1;
-    for (i = 0; i < N_open_chans; i++) {
-      FD_SET (Ts_info[i].skt, &Skt_mask);
-      if (Ts_info[i].skt >= Max_skt) Max_skt = Ts_info[i].skt + 1;
-    }
-    for (i = 0; i < N_clients; i++) {
-      FD_SET (Cl_info[i].skt, &Skt_mask);
-      if (Cl_info[i].skt >= Max_skt) Max_skt = Cl_info[i].skt + 1;
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  void	closeTs (
-/*	=======
-**		    Close a socket and remove the item from the
-**		    Ts_info array and compress the rest.
-*/
-	    int		indx) {	    /* The index of the channel to be closed */
-
-    int	    i;
-
-    if ((indx < 0) || (indx >= N_open_chans)) return;
-
-    abortPending (indx);
-    close (Ts_info[indx].skt);
-
-    for (i = (indx + 1); i < N_open_chans; i++) {
-      Ts_info[i-1].status   = Ts_info[i].status;
-      memcpy (Ts_info[i-1].server, Ts_info[i].server,
-			    sizeof (Ts_info[i-1].server));
-      memcpy (Ts_info[i-1].dot_addr, Ts_info[i].dot_addr,
-			    sizeof (Ts_info[i-1].dot_addr));
-      Ts_info[i-1].chan	      = Ts_info[i].chan;
-      Ts_info[i-1].port	      = Ts_info[i].port;
-      Ts_info[i-1].skt	      = Ts_info[i].skt;
-      Ts_info[i-1].mask	      = Ts_info[i].mask;
-      memcpy (Ts_info[i-1].tp_ahd, Ts_info[i].tp_ahd, Ts_info[i].tp_nxt);
-      Ts_info[i-1].tp_nxt     = Ts_info[i].tp_nxt;
-      Ts_info[i-1].tmo	      = Ts_info[i].tmo;
-      Ts_info[i-1].time_stamp = Ts_info[i].time_stamp;
-      Ts_info[i-1].pending    = Ts_info[i].pending;
-    }
-    N_open_chans--;
-
-    for (i = 0; i < N_clients; i++) {
-      if (Cl_info[i].chnx > indx) Cl_info[i].chnx -= 1;
-    }
-			/*
-			** Ensure Max_skt and Skt_mask are up to date
-			*/
-    FD_ZERO (&Skt_mask); FD_SET (Cnct_skt, &Skt_mask);
-    Max_skt = Cnct_skt + 1;
-    for (i = 0; i < N_open_chans; i++) {
-      FD_SET (Ts_info[i].skt, &Skt_mask);
-      if (Ts_info[i].skt >= Max_skt) Max_skt = Ts_info[i].skt + 1;
-    }
-    for (i = 0; i < N_clients; i++) {
-      FD_SET (Cl_info[i].skt, &Skt_mask);
-      if (Cl_info[i].skt >= Max_skt) Max_skt = Cl_info[i].skt + 1;
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**		ctrlC_Handler:  Signal handler to detect <Ctrl-C> on keyboard.
-*/
-  void	ctrlC_Handler (int sigint) {
-/*      =============
-*/
-    Ctrl_C_has_happened = True;
-  }
-/*
-**--------------------------------------------------------------------------
-**		freeAll:  Free all allocated space.
-*/
-  void	freeAll () {
-/*      =======
-*/
-    int	    i;
-
-    if (Cl_info != NULL) {
-      for (i = 0; i < RS__MAX_CLIENTS; i++) {
-	if (Cl_info[i].msge != NULL) free (Cl_info[i].msge);
-	if (Cl_info[i].rply != NULL) free (Cl_info[i].rply);
-	Cl_info[i].msge = NULL; Cl_info[i].rply = NULL;
-      }
-      free (Cl_info);
-      Cl_info = NULL;
-    }
-    if (Ts_info != NULL) {
-      free (Ts_info);
-      Ts_info = NULL;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		    getCurrentTime - get current time
-*/
-  void	getCurrentTime (
-/*	==============
-*/		struct timeval	*time_now) {	/* Return value */
-
-#ifdef __VMS
-    int	    my_time_now[2];
-
-    sys$gettim (my_time_now);
-    time_now->tv_sec  = my_time_now[0];
-    time_now->tv_usec = my_time_now[1];
-#else
-    gettimeofday (time_now, NULL);
-#endif
-  }
-/*
-**---------------------------------------------------------------------------*/
-  void	handleClientRecv (
-/*	================
-**			A recv from a client is pending. Handle it.
-*/
-	    int	    indx) {	 /* In  -- Client index of pending recv */
-
-    int		    i, j, status, max_msg_size;
-    int		    r_size, bytes_to_come;
-    int		    my_errno, my_vaxc_errno;
-    char	    buff[120], *p_nxt_byte;
-		/*
-		** If there is currently outstanding work for this client,
-		** abort it with an error.
-		*/
-    if (Cl_info[indx].status != CL_SS_IDLE) {
-      i = setupErrReply (Cl_info[indx].rply, Cl_info[indx].msge->msg_id,
-					"-00000000009");
-      status = send (Cl_info[indx].skt, (char *) Cl_info[indx].rply, i, 0);
-      Cl_info[indx].status = CL_SS_IDLE;
-      if (Trace) traceDo ('S', Cl_info[indx].skt, ERROR,
-				16, " sub_status = -9");
-    }
-		/*
-		** Call recv to get the client's message. First get the
-		** first 4 bytes to see how much more must be read.
-		*/
-    max_msg_size = Cl_info[indx].msge_size -
-			    sizeof (Cl_info[indx].msge->msg_size);
-    status = recv (Cl_info[indx].skt,
-                                    Cl_info[indx].msge->msg_size,
-                                    sizeof (Cl_info[indx].msge->msg_size), 0);
-    if (status != sizeof (Cl_info[indx].msge->msg_size)) {
-      GetErrno (&my_errno, &my_vaxc_errno);
-      setupTime (buff, sizeof (buff));
-      printf ("%s: ", buff);
-      if (((status == -1) && (errno == EPIPE)) ||
-           (status == 0)) {
-        printf ("Socket %d --> %s:%d closed.\n",
-			    Cl_info[indx].skt, Cl_info[indx].host, Cl_info[indx].port);
-        if (Trace) traceDo ('S', Cl_info[indx].skt, CLOSE, 9, " <Closed>");
-      }else if ((status == -1) && (errno == ECONNRESET)) {
-        printf ("Socket %d --> %s:%d. Connection reset by peer.\n",
-			    Cl_info[indx].skt, Cl_info[indx].host, Cl_info[indx].port);
-        if (Trace) traceDo ('S', Cl_info[indx].skt, CLOSE,
-				    26, " <ECONNRESET - skt closed>");
-      }else if (status == -1) {
-        printf ("Socket %d --> %s:%d. recv error.\n",
-			    Cl_info[indx].skt, Cl_info[indx].host, Cl_info[indx].port);
-	perror ("handleClientRecv: ");
-        if (Trace) traceDo ('S', Cl_info[indx].skt, CLOSE,
-				    24, " <recv err - skt closed>");
-      }else {
-        printf ("recv: Did not get full message header on ");
-        printf ("socket %d.\n", Cl_info[indx].skt);
-        printf ("      Should be: %d. Was: %d. Connection closed.\n",
-                                    sizeof (Cl_info[indx].msge->msg_size), status);
-        if (Trace) traceDo ('S', Cl_info[indx].skt, ERROR,
-					 30, " <Only partial message header>");
-      }
-      closeClient (indx);
-    }else {
-      Cl_info[indx].msge->msg_size[status] = NIL;	/* Terminate msg_size */
-      if (sscanf (Cl_info[indx].msge->msg_size, "%d",
-		    &Cl_info[indx].msg_len) != 1) {
-        printf ("recv: Non-decimal ASCII message size on ");
-        printf ("socket %d.\n", Cl_info[indx].skt);
-        printf ("      Value received = \"%s\". Connection closed.\n",
-                                    Cl_info[indx].msge->msg_size);
-	closeClient (indx);
-      }else if (Cl_info[indx].msg_len == -1) {     /* Close connection? */
-        if (Trace) traceDo ('S', Cl_info[indx].skt, IN,
-                                          status, Cl_info[indx].msge->msg_size);
-        send (Cl_info[indx].skt, "-001", 4, 0);    /* Yes */
-        if (Trace) {
-	  strcpy (&Cl_info[indx].msge->msg_size[status], " # close connection");
-	  traceDo ('S', Cl_info[indx].skt, IN,
-			strlen (Cl_info[indx].msge->msg_size),
-			Cl_info[indx].msge->msg_size);
-	}
-        setupTime (buff, sizeof (buff));	/* Yes */
-	printf ("%.15s - Closing socket %d to client %s:%d ...", &buff[4],
-		    Cl_info[indx].skt, Cl_info[indx].host, Cl_info[indx].port);
-	fflush (NULL);
-        closeClient (indx);
-	printf (" done.\n");
-      }else if (Cl_info[indx].msg_len == -2) {     /* Turn trace on? */
-        setupTime (buff, sizeof (buff));	/* Yes */
-        printf ("%s: ", buff);
-        printf ("\"Trace on\" rqst from Socket %d.\n", Cl_info[indx].skt);
-        if (Tr_buf == NULL) {
-          Tr_buf = malloc (Tr_buf_size);  /* Allocate buf for trace */
-          if (Tr_buf != NULL) {
-            Tr_buf_len = Tr_buf_size;
-          }else {
-            printf ("    No buffer space available for tracing!\n");
-          }
-        }
-        if (Tr_buf != NULL) {
-          Tr_buf_free = Tr_buf_len;
-          Tr_buf_nxt = Tr_buf;
-          Tr_buf_shuff = (Tr_buf_size * 25)/100; /* Shuffle buff by 25% */
-          Trace = True;
-	  StrJoin (buff, sizeof (buff), "Trace on at ", buff);
-	  traceAdd (strlen (buff), buff);
-          getCurrentTime (&Tr_timer);  /* Initialise trace time stamp */
-        }
-        if (Trace) {
-	  strcpy (&Cl_info[indx].msge->msg_size[status], " # trace on");
-	  traceDo ('S', Cl_info[indx].skt, IN,
-			strlen (Cl_info[indx].msge->msg_size),
-			Cl_info[indx].msge->msg_size);
-	}
-        send (Cl_info[indx].skt, "-002", 4, 0);
-        if (Trace) traceDo ('S', Cl_info[indx].skt, OUT, 4, "-002");
-      }else if (Cl_info[indx].msg_len == -3) {     /* Turn trace off? */
-        if (Trace) {				/* Yes */
-		  strcpy (&Cl_info[indx].msge->msg_size[status], " # trace off");
-		  traceDo ('S', Cl_info[indx].skt, IN,
-			strlen (Cl_info[indx].msge->msg_size),
-			Cl_info[indx].msge->msg_size);
-	}
-        setupTime (buff, sizeof (buff));
-        printf ("%s: ", buff);
-        printf ("\"Trace off\" rqst from Socket %d.\n",
-                                Cl_info[indx].skt);
-        if (Trace) {
-          StrJoin (buff, sizeof (buff), "Trace off at ", buff);
-          traceAdd (strlen (buff), buff);
-          Trace = False;
-        }
-        fflush (NULL);
-        send (Cl_info[indx].skt, "-003", 4, 0);
-      }else if (Cl_info[indx].msg_len == -4) {     /* Flush output? */
-        if (Trace) {				/* Yes */
-	  strcpy (&Cl_info[indx].msge->msg_size[status], " # flush output");
-	  traceDo ('S', Cl_info[indx].skt, IN,
-			strlen (Cl_info[indx].msge->msg_size),
-			Cl_info[indx].msge->msg_size);
-	}
-        setupTime (buff, sizeof (buff));
-        printf ("%s: ", buff);
-        printf ("\"Flush rqst\" from Socket %d.\n", Cl_info[indx].skt);
-        fflush (NULL);
-        if (Trace) traceAdd (7, "Flushed");
-        send (Cl_info[indx].skt, "-004", 4, 0);
-        if (Trace) traceDo ('S', Cl_info[indx].skt, OUT, 4, "-004");
-      }else if (Cl_info[indx].msg_len == -5) {     /* Write trace? */
-        if (Trace) {				/* Yes */
-	  strcpy (&Cl_info[indx].msge->msg_size[status], " # write trace");
-	  traceDo ('S', Cl_info[indx].skt, IN,
-			strlen (Cl_info[indx].msge->msg_size),
-			Cl_info[indx].msge->msg_size);
-	}
-        setupTime (buff, sizeof (buff));
-        printf ("%.15s: ", &buff[4]);
-        printf ("\"Write trace\" rqst from Socket %d ...", Cl_info[indx].skt);
-	fflush (NULL);
-        traceWrite ();
-        printf (" ... done.\n");
-        fflush (NULL);
-        send (Cl_info[indx].skt, "-005", 4, 0);
-        if (Trace) traceDo ('S', Cl_info[indx].skt, OUT, 4, "-005");
-      }else if (Cl_info[indx].msg_len == -6) {     /* Close channels? */
-        if (Trace) {				/* Yes */
-	  strcpy (&Cl_info[indx].msge->msg_size[status], " # close channels");
-	  traceDo ('S', Cl_info[indx].skt, IN,
-			strlen (Cl_info[indx].msge->msg_size),
-	  Cl_info[indx].msge->msg_size);
-	}
-        setupTime (buff, sizeof (buff));
-        printf ("%s: ", buff);
-        printf ("\"Close channels\" rqst from Socket %d ...\n",
-                                    Cl_info[indx].skt);
-	if (N_open_chans <= 0) {
-	  printf ("    No RS-232-C channels are open.\n");
-	}else {
-	  for (i = N_open_chans; i > 0; i--) {
-	    if (Trace) traceDo ('C', Ts_info[0].chan, CLOSE,
-					    18, " <Close-chan rqst>");
-	    printf ("    Closing connection to "
-				    "channel %d ...\n", Ts_info[0].chan);
-	    if (Ts_info[0].status >= 0) {   /* Is the channel busy? */
-					    /* Yes, terminate the work in
-					    **   progress */
-	      i = Ts_info[0].status;
-	      if (Trace) traceDo ('S', Cl_info[i].skt, ERROR,
-					31, " <Close-chan> - Work terminated");
-	      j = setupErrReply (Cl_info[i].rply,
-				Cl_info[i].msge->msg_id, "-00000000011");
-	      status = send (Cl_info[i].skt,
-                            (char *) Cl_info[i].rply, j, 0);
-	      Cl_info[i].status = CL_SS_IDLE;
-	      Ts_info[0].status = TS_SS_IDLE;
-	    }
-	    closeTs (0);
-	  }
-	  N_open_chans = 0;
-	}
-        printf ("    ... done.\n");
-        send (Cl_info[indx].skt, "-006", 4, 0);
-        if (Trace) traceDo ('S', Cl_info[indx].skt, OUT, 4, "-006");
-      }else if ((Cl_info[indx].msg_len <= 0) ||
-                (Cl_info[indx].msg_len > max_msg_size)) {
-        if (Trace) traceDo ('S', Cl_info[indx].skt, IN,
-                                          status, Cl_info[indx].msge->msg_size);
-        printf ("recv: Illegal pending message size on ");
-        printf ("socket %d.\n", Cl_info[indx].skt);
-        printf ("    Max is: %d. Received: %d. Connection closed.\n",
-                                  max_msg_size, Cl_info[indx].msg_len);
-        close (Cl_info[indx].skt);
-        if (Trace) traceDo ('S', Cl_info[indx].skt, ERROR,
-                                                  14, " <Bad msg hdr>");
-        if (Trace) traceDo ('S', Cl_info[indx].skt, CLOSE, 9, " <Closed>");
-	closeClient (indx);
-      }else {
-        bytes_to_come = Cl_info[indx].msg_len;
-        p_nxt_byte = Cl_info[indx].msge->msg_id;
-        while (bytes_to_come > 0) {
-          status = recv (Cl_info[indx].skt, p_nxt_byte, bytes_to_come, 0);
-          if (status <= 0) break;
-          bytes_to_come -= status;
-          p_nxt_byte += status;
-        }
-
-        if (bytes_to_come != 0) {
-          printf ("recv: Did not get all of expected data on "
-                                "socket %d.\n", Cl_info[indx].skt);
-          printf ("     Should be: %d. Was: %d. Connection closed.\n",
-                Cl_info[indx].msg_len, (Cl_info[indx].msg_len - bytes_to_come));
-          if (Trace) traceDo ('S', Cl_info[indx].skt, ERROR,
-                                            18, " <bad recv length>");
-          status = send (Cl_info[indx].skt, "-001", 4, 0);
-          if (Trace) traceDo ('S', Cl_info[indx].skt, OUT, 4, "-001");
-	  closeClient (indx);
-        }else {
-          if (Trace) traceDo ('S', Cl_info[indx].skt, IN,
-		       Cl_info[indx].msg_len + 4, Cl_info[indx].msge->msg_size);
-          startUserRequest (indx);
-        }
-      }
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		    handlePendTmo - a pending client request has timed-out.
-**				    Handle it.
-*/
-  void	handlePendTmo (
-/*	=============
-*/
-	    int	    indx) {	 /* Index of timed-out client */
-
-    int	    j, n, status, chnx;
-
-    if (Trace) traceDo ('S', Cl_info[indx].skt, ERROR,
-				19, " <pending time-out>");
-			/*
-			** Send the client an error response.
-			*/
-    j = setupErrReply (Cl_info[indx].rply, Cl_info[indx].msge->msg_id,
-					"-00000000010");
-    status = send (Cl_info[indx].skt, (char *) Cl_info[indx].rply, j, 0);
-    if (status != j) {
-      printf ("send: Bad byte count sent to ");
-      printf ("socket %d.\n", Cl_info[indx].skt);
-      printf ("      Should have been: %d\n", j);
-      printf ("      Was:              %d\n", status);
-      if (Trace) traceDo ('S', Cl_info[indx].skt, ERROR,
-                                            16, " <bad send size>");
-      if (Trace) traceDo ('S', Cl_info[indx].skt, CLOSE,
-                                            9, " <Closed>");
-      closeClient (indx);
-      return;
-    }
-	    /*
-	    ** The channel is now idle.
-	    */
-    Cl_info[indx].status = CL_SS_IDLE;
-	    /*
-	    ** Remove it from the channel's pending linked list.
-	    */
-    chnx = Cl_info[indx].chnx;
-    if (Ts_info[chnx].pending == indx) {
-      Ts_info[chnx].pending = Cl_info[indx].pending;
-    }else {
-      j = Ts_info[chnx].pending;
-      for (n = 0; ((n < 10) && (Cl_info[j].pending != -1)); n++) {
-	if (Cl_info[j].pending == indx) {
-	  Cl_info[j].pending = Cl_info[indx].pending;
-	  break;
-	}
-	j = Cl_info[j].pending;
-      }
-    }
-    return;
-  }
-/*
-**---------------------------------------------------------------------------
-**		    handleTmo	- a channel has timed-out. Handle it.
-*/
-  void	handleTmo (
-/*	=========
-*/
-	    int	    indx) {	 /* TS channel index of timed-out channel */
-
-    int	    i, j, cl_x, hdr_size, remaining, status;
-    char    *nxt, *nxt_rply_ptr0, *nxt_rply_ptr1, buff[16];
-
-    if (Trace) traceDo ('C', Ts_info[indx].chan, ERROR,
-				19, " <channel time-out>");
-
-    cl_x = Ts_info[indx].status;	/* Get index of associated client */
-
-    nxt_rply_ptr0 = Cl_info[cl_x].nxt_rply_ptr0;
-    nxt_rply_ptr1 = Cl_info[cl_x].nxt_rply_ptr1;
-    hdr_size	  = Cl_info[cl_x].hdr_size;
-    remaining	  = Cl_info[cl_x].remaining;
-				/*
-				** Close off the current cmnd by prefixing
-				** it with "?TMO".
-				*/
-    if (remaining >= 4) {		    /* Room for "?TMO"? */
-					    /* Yes. */
-      for (nxt = nxt_rply_ptr1; nxt > nxt_rply_ptr0; nxt--) nxt[4] = nxt[0];
-      memcpy (&nxt_rply_ptr0[hdr_size+1], "?TMO", 4);
-      nxt_rply_ptr1 += 4;
-      remaining -= 4;
-    }
-    *nxt_rply_ptr1++ = NIL; remaining--;          /* Terminate the response */
-    j = nxt_rply_ptr1 - nxt_rply_ptr0 - hdr_size;   /* Fill in rply length
-						** Note that this also sets
-						** terminator to NIL */
-    sprintf (nxt_rply_ptr0, Cl_info[cl_x].fmt_out, j);
-    nxt_rply_ptr0 = nxt_rply_ptr1;
-    nxt_rply_ptr1 = &nxt_rply_ptr0[hdr_size+1];
-    remaining -= (hdr_size + 1);
-    Cl_info[cl_x].n_cmnds--;
-    Cl_info[cl_x].n_rplys++;
-				/*
-				** Close off all remaining cmnds with "?TMO".
-				*/
-    for (i = 0; i < Cl_info[cl_x].n_cmnds; i++) {
-      if (remaining > 5) {
-	strcpy (nxt_rply_ptr1, "?TMO");
-	sprintf (nxt_rply_ptr0, Cl_info[cl_x].fmt_out, 6); /* Fill in rply len
-						  ** Note that this also sets
-						  ** terminator to NIL */
-	remaining -= (hdr_size + 6);
-	nxt_rply_ptr0 += (hdr_size + 6);
-	nxt_rply_ptr1 = &nxt_rply_ptr0[hdr_size+1];
-	Cl_info[cl_x].n_rplys++;
-      }
-    }
-		    /*
-		    **	    Set up # of replies
-		    */
-    sprintf (buff, "%04.4d", Cl_info[cl_x].n_rplys); /* Set up # of replies */
-    memcpy (Cl_info[cl_x].rply->n_rply, buff, 4);
-		    /*
-		    **	    Set up reply length
-		    */
-    j = nxt_rply_ptr0 - Cl_info[cl_x].rply->msg_id;
-    j = (j + 3) & (~3);
-    sprintf (buff, "%04.4d", j);
-    memcpy (Cl_info[cl_x].rply->msg_size, buff, 4);
-		    /*
-		    **	    Send the reply
-		    */
-    j += 4;
-    status = send (Cl_info[cl_x].skt, (char *) Cl_info[cl_x].rply, j, 0);
-    if (status != j) {
-      printf ("send: Bad byte count sent to ");
-      printf ("socket %d.\n", Cl_info[cl_x].skt);
-      printf ("      Should have been: %d\n", j);
-      printf ("      Was:              %d\n", status);
-      if (Trace) traceDo ('S', Cl_info[cl_x].skt, ERROR,
-                                            16, " <bad send size>");
-      if (Trace) traceDo ('S', Cl_info[cl_x].skt, CLOSE,
-                                            9, " <Closed>");
-      closeClient (cl_x);
-    }else {
-      Cl_info[cl_x].status = CL_SS_IDLE;    /* The client is now idle */
-    }
-	    /*
-	    ** The channel is now idle, see if there are any pending requests
-	    */
-    Ts_info[indx].status = TS_SS_IDLE;
-    if (Ts_info[indx].pending >= 0) {
-		/*
-		** There is something pending ...
-		*/
-      cl_x = i = Ts_info[indx].pending;
-		/*
-		** ... move up the chain of pending requests ...
-		*/
-      Ts_info[indx].pending = Cl_info[i].pending;
-      while (Cl_info[i].pending >= 0) {
-	j = Cl_info[i].pending;
-	Cl_info[i].pending = Cl_info[j].pending;
-	i = j;
-      }
-		/*
-		** ... and start up the pending request.
-		*/
-      startUserRequest (cl_x);
-    }
-    return;
-  }
-/*
-**---------------------------------------------------------------------------*/
-  void	handleTsRecv (
-/*	============
-**			A recv from a Terminal Server channel is pending.
-**			Handle it.
-*/
-	    int	    indx) {	 /* In  -- TS channel index of pending recv */
-
-    int		    i, j, cl_x, status, term_fnd, bytes_got, r_size;
-    char	    my_term, rcve[512], buff[32], *p_rcve;
-			/*
-			** If there's anything in type-ahd buff, put this
-			** in front of what is about to be received.
-			*/
-    r_size = sizeof (rcve);
-    p_rcve = rcve;
-    if (Ts_info[indx].tp_nxt > 0) {
-      i = (Ts_info[indx].tp_nxt > r_size) ? r_size : Ts_info[indx].tp_nxt;
-      memcpy (p_rcve, Ts_info[indx].tp_ahd, i);
-      Ts_info[indx].tp_nxt -= i;
-      if (Ts_info[indx].tp_nxt > 0) {
-	for (j = 0; j < Ts_info[indx].tp_nxt; j++)
-	  Ts_info[indx].tp_ahd[j] = Ts_info[indx].tp_ahd[j+i];
-      }
-      r_size -= i;
-      p_rcve += i;
-    }
-    if (r_size > 0) {
-      j = recv (Ts_info[indx].skt, p_rcve, r_size, 0);
-      if (j <= 0) {
-		/*
-		** An error status was returned by recv. Report the error,
-		** shut down any pending work on the channel and close the
-		** socket to the Terminal Server.
-		*/
-	printf ("handleTsRecv: bad recv length: %d\n", j);
-	if (Trace) traceDo ('C', Ts_info[indx].chan, ERROR,
-				    18, " <Bad recv length>");
-	closeTs (indx);		    /* Close the socket to the channel */
-	return;
-      }
-      j += (p_rcve - rcve);
-    }
-		/*--------------------------------------------------
-		** We got some input. See if it's expected and, if so, put it
-		** in the buffer for sending to the client. If not, move it
-		** to the type-ahead buffer for the channel.
-		*/
-    i = Ts_info[indx].status;	    /* See if channel is "busy" */
-    if (i < 0) {		    /* If < 0, it's not. */
-      for (i = 0; i < j; i++) {  /* Channel is not busy, so add to Tp-ahead */
-	  addToBuffer (rcve[i], Ts_info[indx].tp_ahd,
-		sizeof (Ts_info[0].tp_ahd), &Ts_info[indx].tp_nxt);
-      }
-      return;
-    }else {
-      term_fnd = lookForTerm (&bytes_got, &my_term,
-                          Cl_info[i].nterm, Cl_info[i].terms, rcve, j);
-      if (bytes_got > Cl_info[i].remaining) {  /* If string too long, .. */
-	bytes_got = Cl_info[i].remaining; /* .. force "terminator-not-fnd" status */
-	term_fnd = False;
-	my_term = NIL;
-      }
-      if (bytes_got > 0) {
-	memcpy (Cl_info[i].nxt_rply_ptr1, rcve, bytes_got);
-	Cl_info[i].remaining -= bytes_got;
-	Cl_info[i].nxt_rply_ptr1 += bytes_got;
-
-	memcpy (Ts_info[indx].tp_ahd, &rcve[bytes_got], (j - bytes_got));
-	Ts_info[indx].tp_nxt = j - bytes_got;
-      }
-      if (term_fnd) {		    /* Response complete? */
-	sprintf (Cl_info[i].nxt_rply_ptr0, Cl_info[i].fmt_out,	    /* Yes */
-	    (Cl_info[i].nxt_rply_ptr1 -
-		Cl_info[i].nxt_rply_ptr0 - Cl_info[i].hdr_size));
-	Cl_info[i].nxt_rply_ptr0[Cl_info[i].hdr_size] = my_term;
-	Cl_info[i].n_rplys++;
-	Cl_info[i].nxt_rply_ptr0 = Cl_info[i].nxt_rply_ptr1;
-	Cl_info[i].nxt_rply_ptr1 = Cl_info[i].nxt_rply_ptr0 +
-					Cl_info[i].hdr_size + 1;
-	Cl_info[i].remaining -= (Cl_info[i].hdr_size + 1);
-		    /*
-		    ** Move to next cmnd
-		    */
-	Cl_info[i].nxt_cmnd_ptr += (Cl_info[i].hdr_size + Cl_info[i].c_len);
-	Cl_info[i].n_cmnds--;
-	if (Cl_info[i].n_cmnds <= 0) {
-		    /*
-		    ** No more commands, so send reply to client
-		    */
-	  Cl_info[i].status = CL_SS_IDLE;	/* The client is now idle */
-	  Ts_info[indx].status = TS_SS_IDLE;	/* The channel is now idle */
-		    /*
-		    **	    Set up # of replies
-		    */
-	  sprintf (buff, "%04.4d", Cl_info[i].n_rplys); /* Set up # of replies */
-	  memcpy (Cl_info[i].rply->n_rply, buff, 4);
-		    /*
-		    **	    Set up reply length
-		    */
-	  r_size = Cl_info[i].nxt_rply_ptr0 - Cl_info[i].rply->msg_id;
-	  r_size = (r_size + 3) & (~3);
-	  sprintf (buff, "%04.4d", r_size);
-	  memcpy (Cl_info[i].rply->msg_size, buff, 4);
-		    /*
-		    **	    Send the reply
-		    */
-	  r_size += 4;
-	  status = send (Cl_info[i].skt, (char *) Cl_info[i].rply, r_size, 0);
-	  if (status != r_size) {
-            printf ("send: Bad byte count sent to ");
-            printf ("socket %d.\n", Cl_info[i].skt);
-            printf ("      Should have been: %d\n", r_size);
-            printf ("      Was:              %d\n", status);
-            if (Trace) traceDo ('S', Cl_info[i].skt, ERROR,
-                                            16, " <bad send size>");
-            if (Trace) traceDo ('S', Cl_info[i].skt, CLOSE,
-                                            9, " <Closed>");
-            closeClient (i);
-	  }
-	}else {
-	  sendCmndToTs (indx, i);
-	}
-      }
-    }
-	    /*
-	    ** If the channel is now idle, see if there are any pending requests
-	    */
-    if ((Ts_info[indx].status == TS_SS_IDLE) &&
-	(Ts_info[indx].pending >= 0)) {
-		/*
-		** There is something pending ...
-		*/
-      cl_x = i = Ts_info[indx].pending;
-		/*
-		** ... move up the chain of pending requests ...
-		*/
-      Ts_info[indx].pending = Cl_info[i].pending;
-      while (Cl_info[i].pending >= 0) {
-	j = Cl_info[i].pending;
-	Cl_info[i].pending = Cl_info[j].pending;
-	i = j;
-      }
-		/*
-		** ... and start up the pending request.
-		*/
-      startUserRequest (cl_x);
-    }
-  }
-/*
-**---------------------------------------------------------------------------*/
-  int	lookForTerm (
-/*	===========
-**			Look for a terminator. Note that NIL is an allowed
-**			terminator so the normal C library routines are not
-**			very useful.
-**
-**			Return value is False if no terminator found.
-*/
-	    int	    *len,	 /* Out -- The length of string, including
-				 **		the terminator (if any) */
-	    char    *term,	 /* Out -- The found terminator (if any) */
-	    int	     nterm,	 /* In  -- The number of terminators */
-	    char    *terms,	 /* In  -- Pntr to string of valid term's */
-	    char    *buff,	 /* In  -- Pntr to buffer to search */
-	    int	     nch) {	 /* In  -- The number of chars in buff */
-
-    int		 i, j, noTerm = -1, nLen = -1;
-
-    if (nterm <= 0) {
-      *len = nch;	    /* No terminator. So return complete string */
-      *term = NIL;
-      return False;
-    }else {			/* Search string for a terminator */
-      for (i = 0; i < nch; i++) {
-	for (j = 0; j < nterm; j++) {
-	   if (buff[i] == terms[j]) {
-	      /* replace terminator with NIL */
-	      buff[i] = NIL; /* replace terminator with NIL */
-              noTerm = j;
-              break;
-           }
-        }
-      }
-      *len = i;
-      if (noTerm >= 0 ) {    /* Was a terminator found? */
-	*term = terms[noTerm];	    /* Yes. Return it */
-	*len += 1;		    /* And include the term in the length */
-	return True;
-      }else {
-	*term = NIL;		    /* No */
-	return False;
-      }
-    }
-  }
-/*
-**--------------------------------------------------------------------------*/
-  int	open_RS232C_Chan (
-/*	================
-**			See if a socket is already open to an RS-232-C
-**			channel on a Terminal Server. If so simply return its
-**			data structure index.
-**			Otherwise, open a connection to the Terminal Server
-**			channel, set up its data structure and return the
-**			index to it.
-**
-**			If the connection fails, return -1.
-*/
-	    char		   *server,	/* The name of the TS */
-	    int			    chan,	/* The channel to open */
-	    struct RS__RespStruct  *rply) {	/* Buffer for forming reply --
-						**  only an error status is put
-						**  in so we don't need to know
-						**  its length.
-						*/
-/*
-**    If an error is detected, this routine will set rply->u.sub_status
-**    as follows:
-**	    "-00000000012" - the terminal server IP address is not known.
-**	    "-00000000014" - socket create failed.
-**	    "-00000000015" - socket bind failed.
-**	    "-00000000016" - socket connect failed.
-**	    "-00000000017" - no more indices available.
-**------------------------------------------------------------------
-*/
-    int			 i, status;
-    char		 old_time_out[4], buff[80];
-    union {
-      char  chars[4];
-      int   val;
-    } time_out;
-    unsigned int	 oto_status;
-    struct sockaddr_in	 lcl_sockname;
-    struct sockaddr_in	 rmt_sockname;
-    struct in_addr	 rmt_inet_addr;
-    struct in_addr	*rmt_inet_addr_pntr;
-    struct hostent	*rmt_hostent;
-    int			 rmt_sockname_len;
-    char		*ts_dot_addr;
-#ifdef  __VMS
-    unsigned int    oto_len;
-    int		    tcp_option = UCX$C_TCP_PROBE_IDLE;
-#else
-    int		    oto_len;
-  #ifdef Linux
-    int		    tcp_option = 0;
-  #else
-    int		    tcp_option = TCP_KEEPINIT;
-  #endif
-#endif
-/*------------------------------------------------------------------
-**		See if the channel is already open
-*/
-    for (i = 0; i < N_open_chans; i++) {
-      if ((strcmp (server, Ts_info[i].server) == 0) &&
-	  (chan == Ts_info[i].chan)) {
-	return i;		    /* It is, simply return the index */
-      }
-    }
-/*------------------------------------------------------------------
-**		Channel is not open. We must open it.
-*/
-    setupTime (buff, sizeof (buff));
-    printf ("%.15s - Opening channel %d on %s ",
-		&buff[4], chan, server); fflush (NULL);
-
-    i = N_open_chans;
-    if (i >= MAX_OPEN_CHANS) {
-      printf ("\nFailed! --"
-	      " exceeded maximum # of open channels (%d).\n", MAX_OPEN_CHANS);
-      memcpy (rply->u.sub_status, "-00000000017", 12);
-      if (Trace) traceDo ('C', chan, ERROR, 16, " <No more slots>");
-      return -1;
-    }
-		/*
-		** Get the Internet address of the Terminal Server
-		*/
-    rmt_inet_addr.s_addr = inet_addr (server);
-    if (rmt_inet_addr.s_addr != -1) {
-      rmt_inet_addr_pntr = &rmt_inet_addr;
-    }else {
-      rmt_hostent = gethostbyname (server);
-      if (rmt_hostent == NULL) {
-	printf ("\nFailed! --"
-	      " Terminal server, \"%s\", is not a known "
-			"Internet address.\n", server);
-	memcpy (rply->u.sub_status, "-00000000012", 12);
-	if (Trace) traceDo ('C', chan, ERROR, 16, " <TS not known>");
-	return -1;
-      }
-      rmt_inet_addr_pntr = (struct in_addr *) rmt_hostent->h_addr_list[0];
-    }
-    ts_dot_addr = inet_ntoa (*rmt_inet_addr_pntr);
-    printf ("(%s) ... ", ts_dot_addr); fflush (NULL);
-
-    Ts_info[i].status  = TS_SS_IDLE;
-    Ts_info[i].pending = -1;
-    StrJoin (Ts_info[i].server, sizeof (Ts_info[i].server), server, "");
-    StrJoin (Ts_info[i].dot_addr, sizeof (Ts_info[i].dot_addr), ts_dot_addr,"");
-    Ts_info[i].chan = chan;
-    Ts_info[i].tp_nxt = 0;	    /* Empty type-ah'd buffer */
-	    /*---------------------------
-	    ** Get the Internet port number of the device on the Terminal Server
-	    */
-    Ts_info[i].port = 3000 + chan;
-	    /*---------------------------
-	    ** Create a TCP/IP socket for connecting to server and bind it.
-	    */
-    Ts_info[i].skt = socket (AF_INET, SOCK_STREAM, 0);
-    if (Ts_info[i].skt <= 0) {
-      printf ("failed!\n\n"
-	      "   Could not create a socket.\n\n");
-      perror ("open_RS232C_Chan");
-      memcpy (rply->u.sub_status, "-00000000014", 12);
-      if (Trace) traceDo ('C', chan, ERROR, 16, " <socket error>");
-      return -1;
-    }
-    lcl_sockname.sin_family = AF_INET;
-    lcl_sockname.sin_port   = htons (0);
-    lcl_sockname.sin_addr.s_addr = 0;
-    status = bind (Ts_info[i].skt, (struct sockaddr *) &lcl_sockname,
-					sizeof (lcl_sockname));
-    if (status == -1) {
-      close (Ts_info[i].skt);
-      printf ("failed!\n\n"
-	      "   Could not bind the socket.\n\n");
-      perror ("open_RS232C_Chan");
-      memcpy (rply->u.sub_status, "-00000000015", 12);
-      if (Trace) traceDo ('C', chan, ERROR, 16, " <bind error>");
-      return -1;
-    }
-		/*---------------------------
-		** Set short time-out
-		*/
-    oto_len = sizeof (old_time_out);	/* Save current time-out first */
-    oto_status = getsockopt (Ts_info[i].skt, IPPROTO_TCP, tcp_option,
-				old_time_out, &oto_len);
-    if (oto_status == 0) {
-      time_out.val = 5;			/* Set new time-out */
-      status = setsockopt (Ts_info[i].skt, IPPROTO_TCP, tcp_option,
-			    time_out.chars, sizeof (time_out));
-    }
-		/*---------------------------
-		** Connect to Terminal Server
-		*/
-    rmt_sockname_len = sizeof (rmt_sockname);
-    rmt_sockname.sin_family	 = AF_INET;
-    rmt_sockname.sin_port	 = htons (Ts_info[i].port);
-    rmt_sockname.sin_addr.s_addr = rmt_inet_addr_pntr->s_addr;
-    status = connect (Ts_info[i].skt, (struct sockaddr *) &rmt_sockname,
-				    sizeof (rmt_sockname));
-    if (status != 0) {
-      close (Ts_info[i].skt);
-      printf ("failed!\n\n"
-	      "   Could not connect to Terminal Server %s, Port %d.\n\n",
-		    server, Ts_info[i].port);
-      perror ("open_RS232C_Chan");
-      memcpy (rply->u.sub_status, "-00000000016", 12);
-      if (Trace) traceDo ('C', chan, ERROR, 16, " <connect error>");
-      return -1;
-    }
-		/*---------------------------
-		** Restore time-out
-		*/
-    if (oto_status == 0) {
-      setsockopt (Ts_info[i].skt, IPPROTO_TCP, tcp_option,
-			    old_time_out, oto_len);
-    }
-    printf (" done.\n");
-
-    FD_ZERO (&Ts_info[i].mask); FD_SET (Ts_info[i].skt, &Ts_info[i].mask);
-    FD_SET (Ts_info[i].skt, &Skt_mask);
-    if (Ts_info[i].skt >= Max_skt) Max_skt = Ts_info[i].skt + 1;
-    N_open_chans++;
-
-    if (Trace) {
-      sprintf (buff, " <Connected to chan %d via socket %d:%d>",
-			chan, Ts_info[i].skt, Ts_info[i].port);
-      traceDo ('C', chan, OPEN, strlen (buff), buff);
-    }
-    return i;
-  }
-/*
-**---------------------------------------------------------------------------
-**			sendCmndToTs	- send a command to the Terminal Server
-*/
-  void	sendCmndToTs (
-/*	============
-*/		int	    ts_indx,	/* Term srvr index */
-		int	    cl_indx) {	/* Client index */
-
-    int		i, c_len, status, term_fnd, bytes_got, r_size, hdr_size;
-    char	my_term, buff[32], *fmt_in, *fmt_out;
-    char	*nxt_cmnd_ptr, *nxt_rply_ptr0, *nxt_rply_ptr1;
-
-    hdr_size	= Cl_info[cl_indx].hdr_size;
-    fmt_in	= Cl_info[cl_indx].fmt_in;
-    fmt_out	= Cl_info[cl_indx].fmt_out;
-    nxt_cmnd_ptr    = Cl_info[cl_indx].nxt_cmnd_ptr;
-    nxt_rply_ptr0   = Cl_info[cl_indx].nxt_rply_ptr0;
-    nxt_rply_ptr1   = Cl_info[cl_indx].nxt_rply_ptr1;
-
-    getCurrentTime (&Ts_info[ts_indx].time_stamp);
-    sscanf (nxt_cmnd_ptr, fmt_in, &c_len);
-    Cl_info[cl_indx].c_len = c_len;
-    if (c_len > 0) {		/* If there is a command to send, .. */
-      chanFlush (ts_indx);	/* .. flush the input first. */
-      status = send (Ts_info[ts_indx].skt, &nxt_cmnd_ptr[hdr_size], c_len, 0);
-      if (status != c_len) {
-	if (status == -1) perror ("sendCmndToTs/send");
-	printf ("sendCmndToTs: bad send length on channel %d: %d %d\n",
-                          Cl_info[cl_indx].chan, c_len, status);
-        memcpy (Cl_info[cl_indx].rply->u.sub_status, "-00000000006", 12);
-	send (Cl_info[cl_indx].skt, (char *) Cl_info[cl_indx].rply, 28, 0);
-        if (Trace) traceDo ('C', Cl_info[cl_indx].chan, ERROR,
-				34, " <bad send length. Channel closed>");
-	closeTs (ts_indx);
-        if (Trace) traceDo ('C', Cl_info[cl_indx].chan, CLOSE, 9, " <Closed>");
-	Cl_info[cl_indx].status = CL_SS_IDLE;
-        return;
-      }
-    }
-		/*
-		** If there is anything in the typ-ahead buf, transfer it
-		** to the client's buffer.
-		*/
-    if (Ts_info[ts_indx].tp_nxt > 0) {
-      term_fnd = lookForTerm (&bytes_got, &my_term,
-			Cl_info[cl_indx].nterm, Cl_info[cl_indx].terms,
-			Ts_info[ts_indx].tp_ahd, Ts_info[ts_indx].tp_nxt);
-      if (bytes_got > Cl_info[cl_indx].remaining) {  /* If string too long, .. */
-	bytes_got = Cl_info[cl_indx].remaining; /* .. force "terminator-not-fnd" status */
-	term_fnd = False;
-	my_term = NIL;
-      }
-      memcpy (nxt_rply_ptr1, Ts_info[ts_indx].tp_ahd, bytes_got);
-      Cl_info[cl_indx].remaining -= bytes_got;
-      nxt_rply_ptr1 += bytes_got;
-
-      Ts_info[ts_indx].tp_nxt -= bytes_got;
-      if (Ts_info[ts_indx].tp_nxt > 0) {
-	for (i = 0; i < Ts_info[ts_indx].tp_nxt; i++)
-	  Ts_info[ts_indx].tp_ahd[i] = Ts_info[ts_indx].tp_ahd[i+bytes_got];
-      }
-      if (term_fnd) {		    /* Response complete? */
-	sprintf (nxt_rply_ptr0, fmt_out,   /* Yes */
-	    (nxt_rply_ptr1 -
-		nxt_rply_ptr0 - hdr_size));
-	nxt_rply_ptr0[hdr_size] = my_term;
-	Cl_info[cl_indx].n_rplys++;
-	nxt_rply_ptr0 = nxt_rply_ptr1;
-	nxt_rply_ptr1 = &nxt_rply_ptr0[hdr_size+1];
-	Cl_info[cl_indx].remaining -= (hdr_size + 1);
-		    /*
-		    ** Move to next cmnd
-		    */
-	nxt_cmnd_ptr += (hdr_size + Cl_info[cl_indx].c_len);
-	Cl_info[cl_indx].n_cmnds--;
-	if (Cl_info[cl_indx].n_cmnds <= 0) {
-		    /*
-		    ** No more commands, so send reply to client
-		    */
-	  Ts_info[ts_indx].status = TS_SS_IDLE;	/* The channel is now idle */
-	  Cl_info[cl_indx].status = CL_SS_IDLE;	/* The client is now idle */
-		    /*
-		    **	    Set up # of replies
-		    */
-	  sprintf (buff, "%04.4d", Cl_info[cl_indx].n_rplys); /* Set up # of replies */
-	  memcpy (Cl_info[cl_indx].rply->n_rply, buff, 4);
-		    /*
-		    **	    Set up reply length
-		    */
-	  r_size = nxt_rply_ptr0 - Cl_info[cl_indx].rply->msg_id;
-	  r_size = (r_size + 3) & (~3);
-	  sprintf (buff, "%04.4d", r_size);
-	  memcpy (Cl_info[cl_indx].rply->msg_size, buff, 4);
-		    /*
-		    **	    Send the reply
-		    */
-	  r_size += 4;
-	  status = send (Cl_info[cl_indx].skt, (char *) Cl_info[cl_indx].rply,
-							r_size, 0);
-	  if (status != r_size) {
-            printf ("send: Bad byte count sent to ");
-            printf ("socket %d.\n", Cl_info[cl_indx].skt);
-            printf ("      Should have been: %d\n", r_size);
-            printf ("      Was:              %d\n", status);
-            if (Trace) traceDo ('S', Cl_info[cl_indx].skt, ERROR,
-                                            16, " <bad send size>");
-            if (Trace) traceDo ('S', Cl_info[cl_indx].skt, CLOSE,
-                                            9, " <Closed>");
-            closeClient (cl_indx);
-	  }
-	  Ts_info[ts_indx].status = TS_SS_IDLE;
-	  Cl_info[cl_indx].status = CL_SS_IDLE;
-	  return;
-	}else {
-	  sendCmndToTs (ts_indx, cl_indx);
-	}
-      }
-    }
-    Cl_info[cl_indx].nxt_cmnd_ptr  = nxt_cmnd_ptr;
-    Cl_info[cl_indx].nxt_rply_ptr0 = nxt_rply_ptr0;
-    Cl_info[cl_indx].nxt_rply_ptr1 =  nxt_rply_ptr1;
-
-    if (Ts_info[ts_indx].tmo < Next_tmo_secs)
-      Next_tmo_secs = Ts_info[ts_indx].tmo;
-
-    Ts_info[ts_indx].status = cl_indx;
-    Cl_info[cl_indx].status = CL_SS_BUSY;
-    return;
-  }
-/*
-**---------------------------------------------------------------------------
-**			setupErrReply	- set up a reply with an error status
-*/
-  int	setupErrReply (
-/*	=============
-*/		struct RS__RespStruct *rply,
-		char		      *msg_id,
-		char		      *sub_status) {
-
-    strcpy (rply->msg_size,     "0024");
-    memcpy (rply->msg_id,	msg_id, sizeof (rply->msg_id));
-    strcpy (rply->s_pcol_lvl,   RS__PROTOCOL_ID_V01B);
-    strcpy (rply->n_rply,	"-001");
-    memcpy (rply->u.sub_status, sub_status, sizeof (rply->u.sub_status));
-    return 28;
-  }
-/*
-**---------------------------------------------------------------------------
-**			setupNewClient	- accept a new client connection
-*/
-  void	setupNewClient (int skt) {
-/*	==============
-*/
-    int			rw_skt;
-    char		*rmt_host;
-    struct hostent	*rmt_host_name;
-    int			 rmt_port;
-    struct sockaddr_in	rmt_sockname;
-    char		buff[120];
-/*------------------------------------------------
-**		Note:
-**		    There seems to be an inconsistency between the prototype
-**		    definitions of the accept function for VMS and Digital Unix.
-**		    This conditional code is a hack to avoid error messages from
-**		    the compiler.
-*/
-#ifdef	__VMS
-    unsigned int	rmt_sockname_len;
-#else
-    int			rmt_sockname_len;
-#endif
-/*------------------------------------------------*/
-    rmt_sockname_len = sizeof (rmt_sockname);
-    rw_skt = accept (Cnct_skt, (struct sockaddr *) &rmt_sockname,
-					    &rmt_sockname_len);
-    if (rw_skt <= 0) {
-	    FailInet ("SerPortServer: accept error\n");
-    }
-    rmt_host = inet_ntoa (rmt_sockname.sin_addr);
-    rmt_port = ntohs (rmt_sockname.sin_port);
-    rmt_host_name = gethostbyaddr ((char *) &rmt_sockname.sin_addr,
-				sizeof (rmt_sockname.sin_addr), AF_INET);
-    if (N_clients < RS__MAX_CLIENTS) {
-      Cl_info[N_clients].status = CL_SS_IDLE;
-      StrJoin (Cl_info[N_clients].host, sizeof Cl_info[N_clients].host,
-		"", (rmt_host_name != NULL) ? rmt_host_name->h_name : rmt_host);
-      Cl_info[N_clients].port    = rmt_port;
-      Cl_info[N_clients].skt     = rw_skt;
-      Cl_info[N_clients].pending = -1;
-      FD_SET (rw_skt, &Skt_mask);
-      if (rw_skt >= Max_skt) Max_skt = rw_skt + 1;
-      setupTime (buff, sizeof (buff));
-      printf ("%.15s - Connected to client %s:%d via socket %d.\n",
-			  &buff[4], Cl_info[N_clients].host, rmt_port, rw_skt);
-      if (Trace) {
-	sprintf (buff, " <Connected to %s:%d>",
-			    Cl_info[N_clients].host, rmt_port);
-	traceDo ('S', rw_skt, OPEN, strlen (buff), buff);
-      }
-      N_clients++;
-    }else {
-      printf ("accept: Connection to %s:%d rejected.\n",
-			(rmt_host_name != NULL) ? rmt_host_name->h_name :
-						  rmt_host,
-			rmt_port);
-      printf ("        Client slots exhausted.\n");
-      close (rw_skt);
-          if (Trace) traceDo ('S', Cnct_skt, ERROR, 16, " <No more slots>");
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**			setupSocket	- declare ourselves as TCP/IP server
-*/
-  int	setupSocket (int port) {
-/*	===========
-*/
-    int	    status;
-    int	    my_skt;			/* listener Socket */
-    int	    one = 1;
-    struct sockaddr_in	lcl_sockname;
-
-	/*===============================================================
-	**	Create a TCP/IP socket for receiving connection requests and
-	**			bind it and set it to listen.
-	*/
-    my_skt = socket (AF_INET, SOCK_STREAM, 0);
-    if (my_skt == -1) FailInet ("SerPortServer -- socket error\n");
-	/*
-	**	Set the socket option to ease rapid re-starting of SerPortServer
-	*/
-    status = setsockopt (my_skt, SOL_SOCKET, SO_REUSEADDR,
-			    (char *) &one, sizeof (one));
-
-    lcl_sockname.sin_family = AF_INET;
-    lcl_sockname.sin_port   = htons (port);
-    lcl_sockname.sin_addr.s_addr = 0;
-    status = bind (my_skt, (struct sockaddr *) &lcl_sockname,
-				    sizeof (lcl_sockname));
-    if (status != 0) FailInet ("SerPortServer -- bind error\n");
-
-    status = listen (my_skt, 5);
-    if (status != 0) FailInet ("SerPortServer -- listen error\n");
-
-    return my_skt;
-  }
-/*
-**---------------------------------------------------------------------------
-**			setupTime	- get the current time in ASCII
-*/
-  char	*setupTime (char *buff, int buff_size) {
-/*	==========
-*/
-    time_t	    time_now;
-
-    time_now = time (NULL);	/* Get the current time */
-    StrJoin (buff, buff_size,	/* Convert to ASCII and copy to buffer */
-		asctime (localtime (&time_now)), "");
-    strtok (buff, "\n");	/* Remove the trailing "\n" character. */
-    return buff;
-  }
-/*
-**---------------------------------------------------------------------------
-**			setupXrmDatabase    - setup Resource Manager Database
-*/
-  int	setupXrmDatabase (
-/*	================
-*/			XrmDatabase	*db,
-			char		*name[],
-			int		*argc,
-			char		*argv[]) {
-
-    static XrmOptionDescRec opTable[] = {
-      {"-name",	   ".name",	        XrmoptionSepArg, (XPointer) NULL},
-      {"-ts",	   ".serPortTsName",    XrmoptionSepArg, (XPointer) NULL},
-      {"-port",	   ".serPortServPort",  XrmoptionSepArg, (XPointer) NULL},
-      {"-trace",   ".serPortTrace",     XrmoptionNoArg,  (XPointer) "1"},
-      {"-tsize",   ".serPortTraceSize", XrmoptionSepArg, (XPointer) NULL},
-      {"-period",  ".serPortPeriod",    XrmoptionSepArg, (XPointer) NULL},
-      {"-debug",   ".serPortDebug",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-max",     ".serPortMax",	XrmoptionSepArg, (XPointer) NULL},
-    };
-
-    static char	our_name[80] = "Unknown";   /* This holds the program name */
-
-    int		status, i;
-    char	text[80];
-    char	full_nm0[80];
-    char	full_nm1[80];
-    char	*p_fil[10];
-    char	*my_name;
-    char	*my_name_last;
-
-    char	*name_type;
-    XrmValue	name_value;
-
-    XrmDatabase cmnd_line_db = NULL;
-    XrmDatabase	lcl_db	     = NULL;
-  /*-----------------------------------------------------*/
-    status = True;		/* Assume success	*/
-
-    our_name[0] = NIL;
-	/*
-	** Make a list of the databases to be merged, highest priority first.
-	*/
-#ifdef  __VMS
-    p_fil[0] = "decw$user_defaults:SinQ_rc.dat";
-    p_fil[1] = "decw$group_defaults:SinQ_rc.dat";
-    p_fil[2] = "decw$system_defaults:SinQ_rc.dat";
-    p_fil[3] = "mad_dflt:SinQ_rc.dat";
-    p_fil[4] = "decw$user_defaults:decw$xdefaults.dat";
-    p_fil[5] = "decw$group_defaults:decw$xdefaults.dat";
-    p_fil[6] = "decw$system_defaults:decw$xdefaults.dat";
-    p_fil[7] = "mad_dflt:decw$xdefaults.dat";
-    p_fil[8] = NULL;
-    if (*argc > 0) {	     /* Find out what we are called - parse file nm */
-      my_name = strstr (argv[0], "]");	/* Find end of directory, i.e. "]" */
-      my_name++;			/* Skip over "]" */
-      if (my_name[0] == '[') {		/* Handle possible concealed device */
-        my_name = strstr (my_name, "]");
-	my_name++;
-      }
-      StrJoin (our_name, sizeof (our_name), my_name, "");   /* Copy the rest */
-      strtok (our_name, ".");		/* Close it off at "." */
-    }
-    for (i = 0; our_name[i] != 0; i++) our_name[i] = tolower (our_name[i]);
-#else
-    p_fil[0] = StrJoin (full_nm0, sizeof (full_nm0),
-			    getenv ("HOME"), "/SinQ_rc");
-    p_fil[1] = "/usr/lib/X11/app-defaults/SinQ_rc";
-    p_fil[2] = StrJoin (full_nm1, sizeof (full_nm1),
-			    getenv ("HOME"), "/.Xdefaults");
-    p_fil[3] = "/usr/lib/X11/app-defaults/Xdefaults";
-    p_fil[4] = NULL;
-    if (*argc > 0) {	      /* Find out what we are called - parse file nm  */
-			      /* Find end of directories */
-      my_name = argv[0] - 1;
-      while (my_name != NULL) {
-        my_name_last = my_name;
-	my_name_last++;
-	my_name = strstr (my_name_last, "/");
-      }
-      StrJoin (our_name, sizeof (our_name), my_name_last, "");
-    }
-#endif
-	/*
-	**  Initialise and combine all databases
-	*/
-    XrmInitialize ();
-    i = 0;
-    while (p_fil[i] != NULL) {
-      status = XrmCombineFileDatabase (p_fil[i], &lcl_db, False);
-      i++;
-    }
-	/*
-	**  See if there's anything specified on cmnd line, incl "name".
-	*/
-    XrmParseCommand (&cmnd_line_db,
-			opTable, XtNumber(opTable), our_name, argc, argv);
-    if (cmnd_line_db != NULL) {
-	    /*
-	    ** There was at least 1 item on cmnd line. Process the line.
-	    ** If -name was specified, adopt it.
-	    */
-      status = XrmGetResource (cmnd_line_db,  /* See if a name was specified  */
-			    StrJoin (text, sizeof (text), our_name, ".name"),
-			    "ProgramName.Values",
-			    &name_type, &name_value);
-      if (status) {
-        StrJoin (our_name, sizeof (our_name), name_value.addr, "");
-        for (i = 0; our_name[i] != 0; i++) our_name[i] = tolower (our_name[i]);
-        printf ("Option list name is \"%s\"\n", our_name);
-      }
-	    /*
-	    ** Loop over all items in opTable and merge them into database,
-	    ** taking care of any possible name changes.
-	    */
-      for (i = 0; i < XtNumber (opTable); i++) {
-	if (strcmp (opTable[i].option, "-name") == 0) continue;
-        status = XrmGetResource (cmnd_line_db,
-				StrJoin (text, sizeof (text),
-				    our_name, opTable[i].specifier),
-				"ProgramName.Values",
-				&name_type, &name_value);
-	if (status) {
-	  StrJoin (text, sizeof (text), our_name, opTable[i].specifier);
-	  XrmPutResource (&lcl_db, text, "String", &name_value);
-	}
-      }
-    }
-    *name = our_name;
-    *db = lcl_db;
-    if (lcl_db == NULL) printf ("Warning -- no resource database found.\n");
-
-    XrmDestroyDatabase (cmnd_line_db);
-
-    return status;
-  }
-/*
-**---------------------------------------------------------------------------
-**			startUserRequest	- respond to user
-*/
-  void	startUserRequest (
-/*	================
-**				Start the handling of a user request.
-*/
-	    int		indx) {	    /* The index of the client */
-	/*
-	** Return value is CL_SS_IDLE if the request has been handled
-	** completely. Otherwise, the first command of the user's request
-	** will have been sent to the specified channel and the various
-	** data structures set-up so that the command will continue to be
-	** processed in the "select" loop.
-	*/
-    int			status, i, rply_size, c_len, chnx;
-    char		*nxt_cmnd_ptr;
-    char		zero[] = {0, 0, 0, 0};
-
-    setupErrReply (Cl_info[indx].rply,	    /* Set up a null error reply */
-			Cl_info[indx].msge->msg_id,
-			"000000000000");
-		/*----------------------------------------------
-		** Check protocol level of request. If all zero, give error
-		** response silently (AsynSrv_Open is probably trying to
-		** establish our level). Otherwise, it must be recognised.
-		*/
-    if (memcmp (Cl_info[indx].msge->c_pcol_lvl, &zero, 4) == 0) {
-      memcpy (Cl_info[indx].rply->n_rply, "0000", 4); /* Protocol level is null.
-					    ** Return "bad protocol level" err.
-					    */
-      memcpy (Cl_info[indx].rply->u.sub_status, "000000005001", 12);
-      send (Cl_info[indx].skt, (char *) Cl_info[indx].rply, 28, 0);
-      Cl_info[indx].status = CL_SS_IDLE; return;
-    }else if (memcmp (Cl_info[indx].msge->c_pcol_lvl,
-			RS__PROTOCOL_ID_V01B, 4) == 0) {
-      Cl_info[indx].pcol_code = RS__PROTOCOL_CODE_V01B;
-      strcpy (Cl_info[indx].fmt_in, "%4d");
-      strcpy (Cl_info[indx].fmt_out, "%4.4d");
-      Cl_info[indx].hdr_size = 4;
-    }else if (memcmp (Cl_info[indx].msge->c_pcol_lvl, RS__PROTOCOL_ID, 4) == 0) {
-      Cl_info[indx].pcol_code = RS__PROTOCOL_CODE;
-      strcpy (Cl_info[indx].fmt_in, "%2d");
-      strcpy (Cl_info[indx].fmt_out, "%2.2d");
-      Cl_info[indx].hdr_size = 2;
-    }else {
-      printf ("startUserRequest -- bad protocol level: \"%.4s\"\n",
-		    Cl_info[indx].msge->c_pcol_lvl);
-      memcpy (Cl_info[indx].rply->u.sub_status, "000000005001", 12);
-      send (Cl_info[indx].skt, (char *) Cl_info[indx].rply, 28, 0);
-      Cl_info[indx].status = CL_SS_IDLE; return;
-    }
-    nxt_cmnd_ptr = Cl_info[indx].nxt_cmnd_ptr =
-			(char *) &Cl_info[indx].msge->cmnds;
-    Cl_info[indx].nxt_rply_ptr0 = (char *) Cl_info[indx].rply->u.rplys;
-    Cl_info[indx].nxt_rply_ptr1 = Cl_info[indx].nxt_rply_ptr0 +
-				    Cl_info[indx].hdr_size + 1;
-    Cl_info[indx].remaining = Cl_info[indx].rply_size -
-	    (Cl_info[indx].nxt_rply_ptr1 - &Cl_info[indx].rply->msg_size[0]);
-    Cl_info[indx].n_rplys = 0;
-		/*----------------------------------------------
-		** Protocol level seems OK. Continue decyphering the message
-		*/
-    status = sscanf (Cl_info[indx].msge->serial_port, "%4d",
-			&Cl_info[indx].chan);
-    if ((status != 1) ||
-	(Cl_info[indx].chan < 0) ||
-	(Cl_info[indx].chan >= RS__MAX_ASYNCH)) {
-      printf ("startUserRequest: Bad Cl_info[indx].msge->serial_port.\n");
-      if (Trace) traceDo ('S', Cl_info[indx].skt, ERROR,
-			    16, " <bad channel #>");
-      memcpy (Cl_info[indx].rply->u.sub_status, "-00000000008", 12);
-      send (Cl_info[indx].skt, (char *) Cl_info[indx].rply, 28, 0);
-      Cl_info[indx].status = CL_SS_IDLE; return;
-    }
-
-    if (sscanf (Cl_info[indx].msge->tmo, "%4d", &i) != 1) i = 50;
-    if (i < 0) i = 0;
-    Cl_info[indx].tmo = ((float) i)/10.0;
-
-    switch (Cl_info[indx].msge->terms[0]) {
-     case '0': Cl_info[indx].nterm = 0; break;
-     case '1': Cl_info[indx].nterm = 1; break;
-     case '2': Cl_info[indx].nterm = 2; break;
-     case '3': Cl_info[indx].nterm = 3; break;
-     default:  Cl_info[indx].nterm = 0;
-    }
-    if (Cl_info[indx].nterm > 0) memcpy (Cl_info[indx].terms,
-			&Cl_info[indx].msge->terms[1], Cl_info[indx].nterm);
-    Cl_info[indx].terms[Cl_info[indx].nterm] = NIL;
-
-    if (sscanf (Cl_info[indx].msge->n_cmnds, "%4d",
-			    &Cl_info[indx].n_cmnds) != 1) {
-      printf ("startUserRequest: Non-decimal ASCII "
-		    "Cl_info[indx].msge->n_cmnds.\n");
-      memcpy (Cl_info[indx].rply->u.sub_status, "-00000000001", 12);
-      send (Cl_info[indx].skt, (char *) Cl_info[indx].rply, 28, 0);
-      if (Trace) traceDo ('S', Cl_info[indx].skt, ERROR,
-			    14, " <bad n_cmnds>");
-      Cl_info[indx].status = CL_SS_IDLE; return;
-    }else if (Cl_info[indx].n_cmnds == 0) {
-      memcpy (Cl_info[indx].rply->n_rply, "0000", 4);	    /* Nothing to do!! */
-      send (Cl_info[indx].skt, (char *) Cl_info[indx].rply, 28, 0);
-      Cl_info[indx].status = CL_SS_IDLE; return;
-    }else if (Cl_info[indx].n_cmnds < 0) {
-      printf ("startUserRequest: Illegal Cl_info[indx].msge->n_cmnds: %d\n",
-		    Cl_info[indx].n_cmnds);
-      memcpy (Cl_info[indx].rply->u.sub_status, "-00000000002", 12);
-      send (Cl_info[indx].skt, (char *) Cl_info[indx].rply, 28, 0);
-      if (Trace) traceDo ('S', Cl_info[indx].skt, ERROR,
-			    14, " <bad n_cmnds>");
-      Cl_info[indx].status = CL_SS_IDLE; return;
-    }
-		/*
-		** Check the structure of the command list
-		*/
-    for (i = 0; i < Cl_info[indx].n_cmnds; i++) {
-      if ((nxt_cmnd_ptr - Cl_info[indx].msge->msg_id) >=
-		Cl_info[indx].msg_len) {
-        printf ("startUserRequest: runaway command list.\n");
-        memcpy (Cl_info[indx].rply->u.sub_status, "-00000000003", 12);
-	send (Cl_info[indx].skt, (char *) Cl_info[indx].rply, 28, 0);
-	if (Trace) traceDo ('S', Cl_info[indx].skt, ERROR,
-			    20, " <runaway cmnd list>");
-	Cl_info[indx].status = CL_SS_IDLE; return;
-      }
-      if (sscanf (nxt_cmnd_ptr, Cl_info[indx].fmt_in, &c_len) != 1) {
-        printf ("startUserRequest: Non-decimal ASCII command length.\n");
-        memcpy (Cl_info[indx].rply->u.sub_status, "-00000000004", 12);
-	send (Cl_info[indx].skt, (char *) Cl_info[indx].rply, 28, 0);
-	if (Trace) traceDo ('S', Cl_info[indx].skt, ERROR,
-			    15, " <bad cmnd len>");
-	Cl_info[indx].status = CL_SS_IDLE; return;
-      }
-      if ((c_len <  0) || (c_len >= Cl_info[indx].msg_len)) { 
-        printf ("startUserRequest: illegal command length: %d\n", c_len);
-        memcpy (Cl_info[indx].rply->u.sub_status, "-00000000005", 12);
-	send (Cl_info[indx].skt, (char *) Cl_info[indx].rply, 28, 0);
-	if (Trace) traceDo ('S', Cl_info[indx].skt, ERROR,
-			    16, " <illg cmnd len>");
-	Cl_info[indx].status = CL_SS_IDLE; return;
-      }
-      nxt_cmnd_ptr += (Cl_info[indx].hdr_size + c_len); /* Move to next cmnd */
-    }
-		/*
-		** The list of commands seems to be OK. Start processing them.
-		** Find the index of the data structure for the channel. If
-		** necessary, a socket will be opened.
-		*/
-    chnx = open_RS232C_Chan (Ts_name, Cl_info[indx].chan, Cl_info[indx].rply);
-    if (chnx < 0) {
-      send (Cl_info[indx].skt, (char *) Cl_info[indx].rply, 28, 0);
-      if (Trace) traceDo ('S', Cl_info[indx].skt, ERROR,
-			    23, " <bad open_RS232C_Chan>");
-      Cl_info[indx].status = CL_SS_IDLE; return;
-    }
-    Cl_info[indx].chnx = chnx;
-    if (Ts_info[chnx].status == TS_SS_IDLE) {	/* If channel is idle ... */
-      Ts_info[chnx].tmo  = Cl_info[indx].tmo;	/* .. start processing the .. */
-      sendCmndToTs (chnx, indx);		/* .. commands. */
-    }else {
-      addToPendList (chnx, indx);	    /* Otherwise, pend the request */
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**			subtractTimes	- subtract two times. Return value
-**					    is time difference in seconds.
-*/
-  float	subtractTimes (
-/*	=============
-*/		struct timeval	time0,	    /* The first time */
-		struct timeval	time1) {    /* The time to be subtracted */
-
-	/*
-	** Under UNIX, time0 & time1 contain the time of day in secs/microsecs
-	** since 1970.
-	*/
-    int	    diff_secs, diff_usec;
-    float   val;
-
-#ifdef __VMS
-    int	    my_time0[2], my_time1[2], deltaTime[2];
-
-    my_time0[0] = time0.tv_sec;
-    my_time0[1] = time0.tv_usec;
-
-    my_time1[0] = time1.tv_sec;
-    my_time1[1] = time1.tv_usec;
-
-    lib$sub_times (my_time0, my_time1, deltaTime);
-    lib$cvtf_from_internal_time (&LIB$K_DELTA_SECONDS_F, &val, deltaTime);
-#else
-    if (time0.tv_sec > time1.tv_sec) {		/* Is delta-Time positive? */
-      diff_secs = time0.tv_sec  - time1.tv_sec;	/* Yes */
-      diff_usec = time0.tv_usec - time1.tv_usec;
-      if (diff_usec < 0) {diff_secs -= 1; diff_usec += 1000000;}
-    }else if (time0.tv_sec == time1.tv_sec) { /* Maybe - anyway, it's < 1sec */
-      diff_secs = 0; diff_usec = time0.tv_usec - time1.tv_usec;
-      if (diff_usec < 0) {diff_secs = -1; diff_usec += 1000000;}
-    }else {					/* delta-Time is negative */
-      diff_secs = time0.tv_sec  - time1.tv_sec;
-      diff_usec = time0.tv_usec - time1.tv_usec;
-      if (diff_usec < 0) {diff_secs -= 1; diff_usec += 1000000;}
-    }
-    val = (float) diff_usec; val /= 1000000;
-    val += (float) diff_secs;
-#endif
-    return val;
-  }
-/*
-**---------------------------------------------------------------------------
-**			    Add a trace message to the trace buffer
-*/
-  void	traceAdd (
-/*	========
-*/		int	n_chars,    /* # chars in buffer */
-		char	*buf) {	    /* The buffer of chars */
-
-    int		    i = n_chars, j;
-    unsigned char  *nxt;
-
-    if (Tr_buf == NULL) return;
-
-    if (i > 252) i = 252;	/* Ensure length fits in 1 byte */
-
-    if (i >= (Tr_buf_free - 2)) {	/* Must we shuffle the buffer? */
-      nxt = Tr_buf;		/* Yes */
-      j = 0;
-      while ((*nxt != 0)&&(j < Tr_buf_shuff)) {j += *nxt + 1; nxt += *nxt + 1;}
-      memmove (Tr_buf, nxt, (Tr_buf_len - j));
-      Tr_buf_free += j;
-      Tr_buf_nxt -= j;
-      if (i >= Tr_buf_free) {	/* Double check, in case trace buf is small! */
-        printf ("Trace buffer shuffle problems, trace turned off!\n");
-        Trace = False; fflush (NULL); return;
-      }
-    }
-    memcpy (&Tr_buf_nxt[1], buf, i);
-    *Tr_buf_nxt = i;
-    if (i != n_chars) {
-      Tr_buf_nxt[i+1] = '.';
-      Tr_buf_nxt[i+2] = '.';
-      Tr_buf_nxt[i+3] = '.';
-      *Tr_buf_nxt += 3;
-    }
-    Tr_buf_free -= *Tr_buf_nxt; Tr_buf_free--;
-    Tr_buf_nxt += *Tr_buf_nxt;  Tr_buf_nxt++;
-    *Tr_buf_nxt = 0;
-  }
-/*
-**---------------------------------------------------------------------------
-**			    Add a message to the trace
-*/
-  void	traceDo (
-/*	=======
-*/
-	    char	prefix,		/* 'C' or 'S' for Chan or Socket */
-	    int		indx,		/* The channel or socket # */
-	    enum ACTION in_or_out,	/* The 'action' to be traced */
-	    int		n_txt,		/* The # chars in the text */
-	    char       *txt) {		/* The text */
-
-    int	    i;
-    char   *my_buf, *nxt;
-
-    my_buf = malloc (2 * n_txt + 10);
-    if (my_buf == NULL) return;
-
-    my_buf[0] = prefix;
-    if ((indx < 0) || (indx > 99)) indx = 99;
-    sprintf (&my_buf[1], "%02d", indx);
-    switch (in_or_out) {
-     case IN:	    my_buf[3] = '<'; break;
-     case OUT:	    my_buf[3] = '>'; break;
-     case ERROR:    my_buf[3] = 'E'; break;
-     case OPEN:	    my_buf[3] = 'O'; break;
-     case CLOSE:    my_buf[3] = 'C'; break;
-     case TMO:	    my_buf[3] = 'T'; break;
-     case FLUSH:    my_buf[3] = 'F'; break;
-     default:	    my_buf[3] = '?';
-    }
-    nxt = &my_buf[4];
-    for (i = 0; i < n_txt; i++) {
-      *nxt = txt[i];
-      if (*nxt == '^') {nxt++; *nxt = '^';}
-      if (!isprint (*nxt)) {*nxt++ = '^'; *nxt = txt[i] + '@';}
-      nxt++;
-    }
-    *nxt = NIL;
-    traceAdd (strlen (my_buf), my_buf);
-    free (my_buf);
-  }
-/*
-**---------------------------------------------------------------------------*/
-  void	traceWrite () {
-/*	==========
-**				Write trace to disk
-*/
-    FILE	    *fd;
-    int		     i;
-    unsigned char   *nxt;
-    char	     buff[40];
-
-    if (Tr_buf == NULL) return;
-
-#ifdef  __VMS
-    fd = fopen ("mad_log:SerPortServer.trace", "wb");
-    printf ("    Writing trace to mad_log:SerPortServer.trace ...");
-#else
-    fd = fopen ("/tmp/SerPortServer.trace", "wb");
-    printf ("    Writing trace to /tmp/SerPortServer.trace ...");
-#endif
-    fflush (NULL);
-    if (fd != NULL) {
-      nxt = Tr_buf;
-      while (*nxt != 0) {
-        fwrite (&nxt[1], 1, *nxt, fd);
-        fwrite ("\n", 1, 1, fd);
-        nxt += *nxt + 1;
-      }
-
-      setupTime (buff, sizeof (buff)); fprintf (fd, "%s\n", buff);
-      fprintf (fd, "The listener socket is %d, Port %d\n", Cnct_skt, Inet_port);
-
-      if (N_clients > 0) {
-	fprintf (fd, "The following client connections are open:\n");
-	for (i = 0; i < N_clients; i++)
-	  fprintf (fd, "    Skt %2d --> %s:%d\n",
-			Cl_info[i].skt, Cl_info[i].host, Cl_info[i].port);
-      }else {
-	fprintf (fd, "There are no open client connections.\n");
-      }
-
-      if (N_open_chans > 0) {
-	fprintf (fd, "The following channels are open:\n");
-	for (i = 0; i < N_open_chans; i++)
-	  fprintf (fd,
-	    "    Chan %2d via Skt %2d and Port %4d\n",
-	    Ts_info[i].chan, Ts_info[i].skt, Ts_info[i].port);
-      }else {
-	fprintf (fd, "There are no open channels.\n");
-      }
-      fclose (fd);
-      printf (" done.\n");
-    }else {
-      printf (" failed to open file!\n");
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**		USR1_Handler:  Signal handler to detect USR1 (31) signals.
-*/
-  void	USR1_Handler (int sigint) {
-/*      ============
-*/
-    Usr1_has_happened = True;
-  }
-/*
-**==========================================================================
-**			Main line program
-**			------------------
-*/
-  int	main (int argc, char **argv) {
-/*      ============================
-*/
-    Widget	    main_window;	    /* MainWindow */
-    char	    buff[120], *p_nxt_byte;
-    int		    buff_len;
-    int		    status, i, j, indx, fds_bits_last = 0;
-    fd_set	    my_rd_mask;
-    int		    r_size, bytes_to_come;
-    struct timeval  tmo, time_now;
-    pid_t	    my_pid;
-
-    int			my_errno, my_vaxc_errno;
-
-    int				max_msg_size;
-    char			*appName;
-
-    XrmDatabase		    my_db;
-    char		    *type;
-    XrmValue		     value;
-/*-----------------------------------------------------------------------*/
-    setupTime (buff, sizeof (buff));
-    my_pid = getpid ();
-    printf ("%s - SerPortServer, Ident %s, started. PID = %d/0x%x\n",
-			&buff[4], ident, my_pid, my_pid);
-	/*--------------------------------------------------------------
-	**	Setup the resource database and look up the resources.
-	*/
-    setupXrmDatabase (&my_db, &appName, &argc, argv);
-	/* - - - - - - - - - - - - - - - - - - - - - - - -         -ts */
-    status = XrmGetResource (my_db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".serPortTsName"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      printf ("    Terminal server name not defined via the\n");
-      printf ("               \"serPortTsName\" resource or the\n");
-      printf ("               \"-ts\" option.\n");
-      printf ("    There is no default!\n");
-      exit (EXIT_FAILURE);
-    }
-    StrJoin (Ts_name, sizeof (Ts_name), value.addr, "");
-    printf ("    Terminal Server to use is %s\n", Ts_name);
-	/* - - - - - - - - - - - - - - - - - - - - - - - -         -port */
-    status = XrmGetResource (my_db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".serPortServPort"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status ||
-        (sscanf (value.addr, "%d", &Inet_port) != 1)) {
-      Inet_port = 4000;
-      printf ("    TCP/IP server port number defaulting to %d\n", Inet_port);
-    }else {
-      printf ("    TCP/IP server port number = %d\n", Inet_port);
-    }
-	/* - - - - - - - - - - - - - - - - - - - - - - - -         -tsize */
-    status = XrmGetResource (my_db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".serPortTraceSize"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status ||
-        (sscanf (value.addr, "%d", &Tr_buf_size) != 1)) {
-      Tr_buf_size = 0x40000;
-    }
-	/* - - - - - - - - - - - - - - - - - - - - - - - -         -trace */
-    status = XrmGetResource (my_db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".serPortTrace"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Trace = (status) ? True : False;
-    if (Trace) {
-      Tr_buf = malloc (Tr_buf_size);	    /* Allocate buffer for tracing */
-      if (Tr_buf != NULL) {
-        printf ("    Tracing is on.\n");
-	Tr_buf_len = Tr_buf_free = Tr_buf_size;
-	Tr_buf_nxt = Tr_buf;
-	Tr_buf_shuff = (Tr_buf_size * 25)/100;	/* Shuffle buff by 25% */
-	getCurrentTime (&Tr_timer);	    /* Initialise trace time stamp */
-	setupTime (buff, sizeof (buff));
-	traceAdd (strlen (buff), buff);
-      }else {
-	Trace = False;
-        printf ("    No buffer space available for tracing!\n");
-      }
-    }
-	/* - - - - - - - - - - - - - - - - - - - - - - - -         -period */
-    status = XrmGetResource (my_db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".serPortPeriod"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status ||
-        (sscanf (value.addr, "%d", &i) != 1)) {
-      i = 60;
-    }
-    Tr_period = (float) i;
-	/* - - - - - - - - - - - - - - - - - - - - - - - -         -debug */
-    status = XrmGetResource (my_db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".serPortDebug"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Debug = (status) ? True : False;
-	/* - - - - - - - - - - - - - - - - - - - - - - - -         -max */
-    status = XrmGetResource (my_db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".serPortMax"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status ||
-        (sscanf (value.addr, "%d", &RS__MAX_ASYNCH) != 1)) {
-      RS__MAX_ASYNCH =  20;
-      printf ("    Max Serial Lines defaulting to %d\n", RS__MAX_ASYNCH);
-    }else {
-      printf ("    Max Serial Lines Taken = %d\n", RS__MAX_ASYNCH);
-    }
-/*-----------------------------------------------------------------------*/
-    N_clients = N_open_chans = 0;
-
-    Cl_info = calloc (RS__MAX_CLIENTS, sizeof (Cl_info[0]));
-    if (Cl_info == NULL) {
-      printf ("    Unable to allocate space for Cl_info\n");
-      exit (EXIT_FAILURE);
-    }
-    for (i = 0; i < RS__MAX_CLIENTS; i++) {
-      Cl_info[i].status = CL_SS_IDLE;
-      Cl_info[i].msge_size = MAX_PKT_SIZE;
-      Cl_info[i].rply_size = MAX_PKT_SIZE;
-      Cl_info[i].msge = calloc (MAX_PKT_SIZE, sizeof (char));
-      Cl_info[i].rply = calloc (MAX_PKT_SIZE, sizeof (char));
-      if ((Cl_info[i].msge == NULL) || (Cl_info[i].rply == NULL)) {
-	printf ("    Unable to allocate space for Cl_info[%d].msge or"
-		    " Cl_info[%d].rply\n", i, i);
-	freeAll (); exit (EXIT_FAILURE);
-      }
-    }
-
-    Ts_info = calloc (RS__MAX_ASYNCH, sizeof (Ts_info[0]));
-    if (Ts_info == NULL) {
-      printf ("    Unable to allocate space for Ts_info\n");
-      freeAll (Cl_info); exit (EXIT_FAILURE);
-    }
-    for (i = 0; i < RS__MAX_ASYNCH; i++) Ts_info[i].status = TS_SS_IDLE;
-/*-----------------------------------------------------------------------*/
-    printf ("    Creating RS-232-C Server Socket ...\n");
-    Cnct_skt = setupSocket (Inet_port);
-/*-----------------------------------------------------------------------*/
-    printf ("    RS-232-C Server ready. Waiting for work ...\n");
-
-    FD_ZERO (&Skt_mask); FD_SET (Cnct_skt, &Skt_mask);
-    Max_skt  = Cnct_skt + 1;
-		    /*
-		    ** Declare a signal handler to catch <Ctrl-C> so that we
-		    ** can exit cleanly.
-		    */
-    Ctrl_C_has_happened = False;
-    Ctrl_C_pending	= False;
-    signal (SIGINT,  ctrlC_Handler);	/* SIGINT  is signal #2  */
-    signal (SIGTERM, ctrlC_Handler);	/* SIGTERM is signal #15 */
-		    /*
-		    ** Declare a signal handler to catch USR1 signals. These
-		    ** cause the trace to be written to disk.
-		    */
-    Usr1_has_happened = False;
-    signal (SIGUSR1, USR1_Handler);	/* SIGUSR1 is signal #31 */
-		    /*--------------------------------------------------------
-		    **	Poll looking for work: accepts, reads or exceptions.
-		    **	Each time, check for <Ctrl-C> signals (= SIGINT/SIGTERM)
-		    **  and USR1 signals too and handle them.
-		    */
-    Next_tmo_secs = 1.0;	/* Time-out is 1 sec by default. It can be
-				** shorter if client requests need it to be. */
-    for (;;) {
-      fflush (NULL);
-
-#ifdef Linux
-  #define fds_bits __fds_bits
-#endif	    /* Linux */
-
-      if (Debug && (Skt_mask.fds_bits[0] != fds_bits_last)) {
-	printf ("Skt_mask.fds_bits[0] is now 0x%04x\n", Skt_mask.fds_bits[0]);
-	fds_bits_last = Skt_mask.fds_bits[0];
-      }
-
-      tmo.tv_sec  = (int) Next_tmo_secs;	    /* Set up the time-out */
-      tmo.tv_usec = (int) ((Next_tmo_secs - (float) tmo.tv_sec) * 1000000.0);
-      my_rd_mask = Skt_mask;
-      status = select (Max_skt, &my_rd_mask, NULL, NULL, &tmo);
-
-      Next_tmo_secs = 1.0;
-      if (status < 0) {				    /* Select error? */
-	if (errno != EINTR) {			    /* Yes. Ignore signal
-						    **	interrupts of select */
-	  FailInet ("SerPortServer: select error.\n");
-	}
-      }else if (status > 0) {
-					/* Look for pending new client */
-	if (FD_ISSET (Cnct_skt, &my_rd_mask)) {
-	  status--;
-	  setupNewClient (Cnct_skt);
-        }
-					/* Look for pending recv's from TS */
-	for (i = 0; (i < N_open_chans) && (status > 0); i++) {
-          if (FD_ISSET (Ts_info[i].skt, &my_rd_mask) != 0) {
-	    handleTsRecv (i);
-	    status--;
-	  }
-	}
-				    /* Look for pending recv's from Clients */
-	for (i = 0; (i < N_clients) && (status > 0); i++) {
-          if (FD_ISSET (Cl_info[i].skt, &my_rd_mask) != 0) {
-	    handleClientRecv (i);
-	    status--;
-          }
-        }
-      }
-		    /*
-		    ** Check all active channels for time-out
-		    */
-      getCurrentTime (&time_now);
-      for (i = 0; i < N_open_chans; i++) {
-	if (Ts_info[i].status != TS_SS_IDLE) {
-	  if (subtractTimes (time_now, Ts_info[i].time_stamp) >=
-					    Ts_info[i].tmo) {
- 	    subtractTimes(time_now, Ts_info[i].time_stamp);
-	    printf("TMO: Difference: %f, allowed %f\n",
-		   subtractTimes(time_now, Ts_info[i].time_stamp),
-		   Ts_info[i],tmo);
-	    handleTmo (i);	/* This channel has timed-out! */
-	  }
-	}
-      }
-		    /*
-		    ** Check all pending clients for time-out
-		    */
-      for (i = 0; i < N_clients; i++) {
-	if (Cl_info[i].status == CL_SS_PENDING) {
-	  if (subtractTimes (time_now, Cl_info[i].pend_time) >=
-					    Cl_info[i].tmo) {
-	    handlePendTmo (i);	/* This pending client request has timed-out! */
-	  }
-	}
-      }
-
-      if ((Trace) && (subtractTimes (time_now, Tr_timer) > Tr_period)) {
-	setupTime (buff, sizeof (buff)); memcpy (&buff[5], "===== ", 6);
-	traceAdd (14, &buff[5]);
-	Tr_timer = time_now;
-      }
-
-      if (Ctrl_C_has_happened) {    /* Check for <Ctrl-C> (= SIGINT/SIGTERM) */
-			/* <Ctrl-C> detected.
-			** If any RS-232-C channels are open, close them and
-			**	start a timer.
-			** If no RS-232-C channels are open, see if a timer is
-			**	active. Exit if it's less than 5 secs since
-			**	previous <Ctrl-C>.
-			*/
-	Ctrl_C_has_happened = False;
-	setupTime (buff, sizeof (buff));
-        printf ("%.15s - <Ctrl-C> detected ...\n", &buff[4]);
-	if (N_open_chans <= 0) {
-	  printf ("    No RS-232-C channels were open.\n");
-	  if (Ctrl_C_pending) {
-	    if (subtractTimes (time_now, Ctrl_C_time) < 5.0) {
-	      printf ("    SerPortServer closing down ...\n");
-	      if (N_clients <= 0) {
-		printf ("    No client connections were open.\n");
-	      }else {
-		for (i = N_clients; i > 0; i--) {
-		  printf ("    Closing client socket %d --> %s:%d ...\n",
-			Cl_info[0].skt, Cl_info[0].host, Cl_info[0].port);
-		  closeClient (0);
-		}
-		printf ("    All client sockets closed.\n");
-	      }
-	      printf ("    Closing listener socket %d ...\n", Cnct_skt);
-	      if (Trace) {
-		setupTime (buff, sizeof (buff));
-		StrJoin (buff, sizeof(buff), buff,
-					": SerPortServer terminating");
-		traceAdd (strlen (buff), buff);
-		traceWrite ();
-	      }
-	      close (Cnct_skt); Cnct_skt = 0; freeAll ();
-	      printf ("    SerPortServer exiting.\n");
-	      exit (EXIT_SUCCESS);
-	    }
-	  }
-	}else {
-	  while (N_open_chans > 0) {
-	    if (Trace) traceDo ('C', Ts_info[0].chan, CLOSE,
-					18, " <Ctrl-C> detected");
-	    printf ("    Closing connection to channel %d ...\n",
-			    Ts_info[0].chan);
-	    if (Ts_info[0].status >= 0) {   /* Is the channel busy? */
-					    /* Yes, terminate the work in
-					    **   progress */
-	      indx = Ts_info[0].status;
-	      if (Trace) traceDo ('S', Cl_info[indx].skt, ERROR,
-					27, " <Ctrl-C> - Work terminated");
-	      j = setupErrReply (Cl_info[indx].rply,
-				Cl_info[indx].msge->msg_id, "-00000000011");
-	      status = send (Cl_info[indx].skt,
-                            (char *) Cl_info[indx].rply, j, 0);
-	      Cl_info[indx].status = CL_SS_IDLE;
-	      Ts_info[0].status = TS_SS_IDLE;
-	    }
-	    closeTs (0);
-	  }
-	  N_open_chans = 0;
-	  printf ("    All RS-232-C channels closed.\n");
-	}
-	if (Trace) traceWrite ();
-	Ctrl_C_pending = True;
-	Ctrl_C_time = time_now;
-	printf ("    Hit <Ctrl-C> again fairly soon to quit program.\n");
-
-	signal (SIGINT,  ctrlC_Handler);    /* Re-enable <Ctrl-C> signal */
-	signal (SIGTERM, ctrlC_Handler);    /* Re-enable <Ctrl-C> signal */
-      }else {
-	if (Ctrl_C_pending) {	     /* No <Ctrl-C> detected. If a <Ctrl-C> was
-				     ** detected recently, see if the time-out
-				     ** has elapsed. */
-	  if (subtractTimes (time_now, Ctrl_C_time) >= 5.0) {
-	    Ctrl_C_pending = False;	/* The time-out has elapsed. */
-	    printf ("    <Ctrl-C> time has expired.\n");
-	  }
-	}
-      }
-
-      if (Usr1_has_happened) {
-	Usr1_has_happened = False;
-	setupTime (buff, sizeof (buff));
-	if (Tr_buf != NULL) {
-	  printf ("%.15s - USR1 signal detected. Write trace to disk.\n",
-				    &buff[4]);
-	  traceWrite ();
-	}else {
-	  printf ("%.15s - USR1 signal detected. There is no trace buffer.\n");
-	}
-        fflush (NULL);
-	signal (SIGUSR1, USR1_Handler);	    /* Re-enable USR1 signal */
-      }
-    }
-  }
-/*------------------------------------------------- End of SerPortServer.C */
diff --git a/utils/asynsrv_test.c b/utils/asynsrv_test.c
deleted file mode 100755
index 36393a93..00000000
--- a/utils/asynsrv_test.c
+++ /dev/null
@@ -1,861 +0,0 @@
-#define	    ident	    "1A09"
-
-#ifdef __DECC
-#pragma	    module	    asynsrv_test	ident
-#endif
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     SINQ Project				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Link_options - Here is the Linker Option File
-**!$	if p1 .eqs. "DEBUG" then dbg1 := /debug
-**!$	if p1 .eqs. "DEBUG" then dbg2 := _dbg
-**!$	link 'dbg1'/exe=asynsrv_test'dbg2'.exe sys$input/options
-**!	    asynsrv_test
-**!	    sinq_olb/lib
-**!	    sys$share:decw$xmlibshr12/share
-**!	    sys$share:decw$xtlibshrr5/share
-**!	    sys$share:decw$xlibshr/share
-**!$	purge/nolog asynsrv_test'dbg2'.exe
-**!$	write sys$output "Exec file is asynsrv_test''DBG2'.exe
-**!$	exit
-**!!
-**!! To build on LNSA01 ...
-**!!	$ build_cc_select :== decc
-**!!	$ import tasmad
-**!!	$ define/job deltat_c_tlb sinq_c_tlb
-**!!	$ set default ud0:[maden.scratch]
-**!!	$ bui tasmad_disk:[mad.tests]asynsrv_test debug
-**!!
-** Link_options_end
-**
-**	Building on Alpha Digital Unix:
-**
-**	    setenv TAS_BASE ~maden/tasmad
-**	    source $TAS_BASE/tasmad.setup
-**	    rcp -p "lnsa09:tas_src:[utils]asynsrv_test.c" \
-**			$TAS_SRC/utils/asynsrv_test.c
-**	    cc -std -g -o $TAS_BIN/asynsrv_test    \
-**			-I$TAS_INC		    \
-**			$TAS_SRC/utils/asynsrv_test.c \
-**			-L$TAS_LIB -lsinq -lXm -lXt -lX11
-**
-** Resources and Flags	    File:	decw$user_defaults:SinQ_rc.dat
-** -------------------		    or	$HOME/SinQ_rc
-**
-**  Resource	    Flag    Default	  Description
-**  --------	    ----    -------	  -----------
-**  -		    -name   asynsrv_test  Name to use when looking up the
-**						resources. The default is the
-**						image file name.
-**  *AsynSrvHelp    -help   -		  Generates help info.
-**  *AsynSrvHost    -host   none	  The name of the host to which the
-**						program wishes to connect.
-**  *AsynSrvPort    -port   4000	  The TCP/IP port of the RS232C server.
-**  *AsynSrvChan    -chan   none	  The number of the RS232C channel to
-**						which the device is attached.
-**  *AsynSrvTmo	    -tmo    2		  Time-out in secs for responses to
-**  *AsynSrvTmoConn -tmoC   5		  Time-out in secs for connect.
-**					    commands.
-**  *AsynSrvDebug   -debug  		  If specified, selects debug mode (not
-**					    yet implemented).
-**  *AsynSrvLower   -lc     -		  If specified, causes conversion of
-**					    input to lowercase before sending.
-**  *AsynSrvUpper   -uc     -		  If specified, causes conversion of
-**					    input to uppercase before sending.
-**					    This is the default.
-**  *AsynSrvNoCase  -ncc    -		  If specified, causes no case
-**					    conversion of input before sending.
-**  *AsynSrvTermOut -termout "\r"	  Specifies a string to be appended to
-**					    anything sent to the server.
-**  *AsynSrvTermIn  -termin  "\r"	  Specifies a string of up to 3 chars
-**					    which will be recognised as 
-**					    input response terminators.
-**  A value given via -name will be converted to lowercase before being used.
-**+
-**---------------------------------------------------------------------------
-** Module Name  . . . . . . . . : [...tests]asynsrv_test.c
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Jan 1997
-**
-** Purpose
-** =======
-**	asynsrv_test is a TCP/IP server client which should make a TCP/IP
-**	connection to an RS-232-C server and allow the user to transmit
-**	commands from the keyboard to a device attached to an RS-232-C channel
-**	on the server.
-** Use:
-** ===
-**  1) Set up the host name, TCP/IP port number and RS-232-C channel of the
-**	device in the resources file (see above). These can also
-**	be supplied as options on the command line.
-**
-**  2) Run the program
-**
-**	    $ run cpt:[exe]asynsrv_test
-**
-**	or, to specify options on the command line, use a DCL foreign
-**	command:
-**
-**	    $ asynsrv_test :== $cpt:[exe]asynsrv_test
-**	    $ asynsrv_test -host <host> -port <port-number> -chan <chan>
-**
-** Updates:
-**  1A01 20-Jan-1997 DM.	Initial version.
-**  1A07  3-Apr-2000 DM.        Add fortify.h
-**-
-**====================================================================
-*/
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <signal.h>
-#include    <ctype.h>
-
-#include    <time.h>
-
-#ifdef  __VMS
-  #include    <sys/unixio.h>
-#else
-  #include    <unistd.h>
-  #ifdef FORTIFY
-    #include    <fortify/fortify.h>
-  #endif
-#endif
-
-#include    <X11/Intrinsic.h>
-/*
-**====================================================================
-*/
-#include    <sinq_prototypes.h>
-#include    <asynsrv_def.h>
-#include    <rs232c_def.h>
-/*
-
-**--------------------------------------------------------------------------
-**			Define global structures and constants.
-*/
-/*-------------------------------------------------------------
-**			Global Variables
-*/
-  static int	C_gbl_status;	    /*  Return status from C_... routines */
-  static int	Ctrl_C_has_happened;
-  void	       *Hndl = NULL;
-
-  static XrmOptionDescRec OpTable[] = {
-      {"-name",	    ".name",		XrmoptionSepArg, (XPointer) NULL},
-      {"-help",	    ".AsynSrvHelp",	XrmoptionNoArg,	 (XPointer) "1"},
-      {"-host",	    ".AsynSrvHost",	XrmoptionSepArg, (XPointer) NULL},
-      {"-port",	    ".AsynSrvPort",	XrmoptionSepArg, (XPointer) NULL},
-      {"-chan",	    ".AsynSrvChan",	XrmoptionSepArg, (XPointer) NULL},
-      {"-tmoC",	    ".AsynSrvTmoConn",	XrmoptionSepArg, (XPointer) NULL},
-      {"-tmoc",	    ".AsynSrvTmoConn",	XrmoptionSepArg, (XPointer) NULL},
-      {"-tmo",	    ".AsynSrvTmo",	XrmoptionSepArg, (XPointer) NULL},
-      {"-debug",    ".AsynSrvDebug",	XrmoptionNoArg,	 (XPointer) "1"},
-      {"-lc",	    ".AsynSrvLower",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-uc",	    ".AsynSrvUpper",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-ncc",	    ".AsynSrvNoCase",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-termout",  ".AsynSrvTermOut",	XrmoptionSepArg, (XPointer) NULL},
-      {"-termin",   ".AsynSrvTermIn",	XrmoptionSepArg, (XPointer) NULL},
-    };
-  struct AsynSrv__info	AsynSrv_info;
-  int			Debug;
-  float			TmoC;
-  float			Tmo;
-  int			DoLower, DoUpper;
-  char			TermOut[16];
-  char			TermIn[16];
-  int			Do_help;
-
-  char		    *Errstack;
-  int		    Errcode, Errno, Vaxc_errno;
-/*
-**--------------------------------------------------------------------------
-**		PrintErrInfo:  print out error information.
-*/
-  void	PrintErrInfo (char *text) {
-/*      ============
-*/
-
-    AsynSrv_ErrInfo (&Errstack, &Errcode, &Errno, &Vaxc_errno);
-    fprintf (stderr, "\n"
-		"  Error return from %s.\n"
-		"    Errstack = \"%s\".\n"
-		"    Errcode = %d.  Errno = %d. Vaxc$errno = %d.\n",
-		text, Errstack, Errcode, Errno, Vaxc_errno);
-    switch (Errcode) {
-     case ASYNSRV__BAD_BIND:
-      fprintf (stderr, "ASYNSRV__BAD_BIND\n");
-      break;
-     case ASYNSRV__BAD_CONNECT:
-      fprintf (stderr, "ASYNSRV__BAD_CONNECT\n");
-      break;
-     case ASYNSRV__BAD_HOST:
-      fprintf (stderr, "ASYNSRV__BAD_HOST\n");
-      break;
-     case ASYNSRV__BAD_PAR:
-      fprintf (stderr, "ASYNSRV__BAD_PAR\n");
-      break;
-     case ASYNSRV__BAD_SOCKET:
-      fprintf (stderr, "ASYNSRV__BAD_SOCKET\n");
-      break;
-     case ASYNSRV__NO_ROOM:
-      fprintf (stderr, "ASYNSRV__NO_ROOM\n");
-      break;
-     default:
-      fprintf (stderr, "Unrecognised error code!\n");
-      if ((Errno != 0) || (Vaxc_errno != 0)) perror (text);
-    }
-    return;
-  }
-/*
-**--------------------------------------------------------------------------
-**		ShowUsage:  A simple print-out routine.
-*/
-  void	ShowUsage (int full) {
-/*      =========
-*/
-    if (!full) {
-      if (Do_help) return;
-      printf ("\n"
-	"To get help on running the program issue the command:\n"
-	"\n"
-	"       asynsrv_test -help\n"
-	"\n");
-      return;
-    }
-    printf ("\n"
-	"Usage:  asynsrv_test [options ...]\n"
-	" \n"
-	" Valid options are:             Equivalent resource name:\n"
-	"    -help                           *AsynSrvHelp\n"
-	"    -host     <host-name>           *AsynSrvHost\n"
-	"    -port     <port-number>         *AsynSrvPort     Dflt=4000\n"
-	"    -chan     <channel-number>      *AsynSrvChan\n"
-	"    -debug                          *AsynSrvDebug\n"
-	"    -tmo      <secs>                *AsynSrvTmo      Dflt=2\n"
-	"    -tmoC     <secs>                *AsynSrvTmoConn  Dflt=5\n"
-	"    -lc                             *AsynSrvLower\n"
-	"    -uc                             *AsynSrvUpper\n"
-	"    -ncc                            *AsynSrvNoCase\n"
-	"    -termout  <term-out-string>     *AsynSrvTermOut  Dflt=\"\\r\"\n"
-	"    -termin   <term-in-string>      *AsynSrvTermIn   Dflt=\"\\r\"\n"
-	"    -termin\n"
-	"\n"
-	" No default is allowed for -host or -chan,"
-					    " i.e. values for\n"
-	" these parameters must be supplied either via a resource file or"
-					    " on the\n"
-	" command line.\n"
-	"\n"
-	" -tmo  is the time-out for responses to commands.\n"
-	" -tmoC is the time-out for the initial connection to the server.\n"
-	"\n"
-	"To quit the program,    issue the command \"#q\".\n"
-	"To send a null command, issue the command \"\\0\".\n"
-	"Other special commands are:\n"
-	"      #help\n"
-	"      #close        - gets SerPortServer to close its serial ports.\n"
-	"      #flush        - gets SerPortServer to flush its output.\n"
-	"      #trace off    - turn off SerPortServer tracing.\n"
-	"      #trace on     - turn on  SerPortServer tracing.\n"
-	"      #trace write  - gets SerPortServer to write its trace buffer.\n"
-	"To send a command starting with \"#\", start it with \"##\".\n"
-	"\n");
-    return;
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoInteract:  Interact with the RS-232-C Device
-*/
-  int	DoInteract () {
-/*      ==========
-*/
-    int	    status, go_on, no_errors, no_restore, i, j, len, act_len, tok_len;
-
-    FILE    *lun;
-    char    recd[132], buff[132], cmnd[132], cmnd_prnt[512];
-    char    eot_save[4], tmo_save[4], term;
-    char    *rptr, *tok;
-
-    struct RS__MsgStruct    send_buff;
-    struct RS__RespStruct   rcve_buff;
-
-    lun = stdin;			    /* Use standard input */
-
-    go_on = True;
-    no_errors  = True;
-
-    if (lun == stdin) {
-      printf ("Issue the command \"#h\" for help and \"#q\" to quit.\n> ");
-      fflush (NULL);
-    }
-    while (go_on && (fgets (recd, sizeof (recd), lun) != NULL)) {
-      len = strlen (recd);
-      if (len <= 1) {
-	if (lun == stdin) {printf ("> "); fflush (NULL);}
-        continue;
-      }
-      if (recd[len-1] != '\n') {
-	recd[20] = '\0';
-        printf ("   Record not terminated by \"\\n\". "
-			    "It is probably too long!\n"
-		"   The record starts thus: %s ...\n"
-		"   It has been skipped.\n", recd);
-	if (lun == stdin) {printf ("> "); fflush (NULL);}
-	continue;
-      }
-      recd[len-1] = '\0';	/* Remove the terminating "\n" */
-	    /*
-	    ** Strip off any trailing stuff (but keep it around so that we
-	    ** can print it out). "Trailing stuff" is anything after a "!".
-	    */
-      act_len = strcspn (recd, "!");
-      len = sizeof (buff);
-      if (DoLower) {
-	StrEdit (buff, recd, "trim uncomment lowercase", &len);
-      }else if (DoUpper) {
-	StrEdit (buff, recd, "trim uncomment upcase", &len);
-      }else {
-	StrEdit (buff, recd, "trim uncomment", &len);
-      }
-
-      len = sizeof (cmnd);
-      StrEdit (cmnd, buff, "lowercase", &len);
-
-      if (strncmp (buff, "##", 2) == 0) {   /* "##" at start gets compressed
-					    ** to "#" */
-        len = sizeof (buff);
-	StrEdit (buff, &buff[1], "trim", &len);
-      }
-
-      tok = strtok (cmnd, " ");
-      tok_len = (tok != NULL) ? strlen (tok) : 0;
-      if ((tok_len >= 2) &&
-	  (strncmp (tok, "#exit", tok_len) == 0)) {
-        go_on = False;
-      }else if ((tok_len >= 2) &&
-		(strncmp (tok, "#quit", tok_len) == 0)) {
-        go_on = False;
-      }else if ((tok_len >= 2) &&
-		(strncmp (tok, "#trace", tok_len) == 0)) {
-        tok = strtok (NULL, " ");
-	tok_len = (tok != NULL) ? strlen (tok) : 0;
-	if ((tok_len >= 2) &&
-	    (strncmp (tok, "on", tok_len) == 0)) {
-	  printf ("Requesting server to turn tracing on ..."); fflush (NULL);
-          status = AsynSrv_Trace (&AsynSrv_info, True);
-	  if (status) {
-	    printf (" done.\n");
-	  }else {
-	    printf ("\nError detected!\n");
-	  }
-	}else if ((tok_len >= 2) &&
-		  (strncmp (tok, "off", tok_len) == 0)) {
-	  printf ("Requesting server to turn tracing off ..."); fflush (NULL);
-          status = AsynSrv_Trace (&AsynSrv_info, False);
-	  if (status) {
-	    printf (" done.\n");
-	  }else {
-	    printf ("\nError detected!\n");
-	  }
-	}else if ((tok_len >= 1) &&
-		  (strncmp (tok, "write", tok_len) == 0)) {
-	  printf ("Requesting server to write trace ..."); fflush (NULL);
-          status = AsynSrv_Trace_Write (&AsynSrv_info);
-	  if (status) {
-	    printf (" done.\n");
-	  }else {
-	    printf ("\nError detected!\n");
-	  }
-	}else {
-          printf ("Illegal \"#trace\" command! You must "
-		    "specify \"on\" or \"off\" or \"write\".\n");
-	}
-      }else if ((tok_len >= 2) &&
-		(strncmp (tok, "#flush", tok_len) == 0)) {
-	printf ("Requesting server to flush ..."); fflush (NULL);
-        status = AsynSrv_Flush (&AsynSrv_info);
-	if (status) {
-	  printf (" done.\n");
-	}else {
-	  printf ("\nError detected!\n");
-	}
-      }else if ((tok_len >= 2) &&
-		(strncmp (tok, "#close", tok_len) == 0)) {
-	printf ("Requesting server to close its serial channels ..."); fflush (NULL);
-        status = AsynSrv_ChanClose (&AsynSrv_info);
-	if (status) {
-	  printf (" done.\n");
-	}else {
-	  printf ("\nError detected!\n");
-	}
-      }else if ((tok_len >= 2) &&
-		(strncmp (tok, "#help", tok_len) == 0)) {
-	ShowUsage (True);
-      }else if ((cmnd[0] == '#') && (cmnd[1] != '#')) {
-        printf ("Illegal command! If you really want to start a command\n"
-		"                 with a \"#\" character, you should use\n"
-		"                 \"##\" instead!\n");
-      }else {
-	if (strlen (buff) > 0) {
-	  StrJoin (buff, sizeof (buff), buff, TermOut);	/* Append terminator */
-	}
-		    /*
-		    ** Show user what's getting sent
-		    */
-	MakePrintable (cmnd_prnt, sizeof (cmnd_prnt), buff);
-        printf ("Sending  \"%s\" ... ", cmnd_prnt); fflush (NULL);
-
-	status = AsynSrv_SendCmnds (&AsynSrv_info, &send_buff, &rcve_buff,
-					buff, NULL);
-	if (!status) {
-	  go_on = no_errors = False;
-	  continue;
-	}else {
-	  rptr = AsynSrv_GetReply (&AsynSrv_info, &rcve_buff, NULL);
-	  if (rptr == NULL) {
-	    printf ("No response from server!\n");
-	    go_on = no_errors = False;
-	    continue;
-	  }else {
-	    AsynSrv_GetLenTerm (&AsynSrv_info, &rcve_buff, rptr, &len, &term);
-	    MakeMemPrintable (cmnd_prnt, sizeof (cmnd_prnt), rptr, len);
-	    MakeMemPrintable (recd, sizeof (recd), &term, 1);
-	    j = strlen (cmnd_prnt);
-	    printf ("\nResponse length = %d. Terminator = \"%s\".\n", len, recd);
-	    for (i = 0; i < (j/70); i++)
-	      printf ("   \"%.70s\"\\...\n", &cmnd_prnt[i*70]);
-	    printf ("   \"%s\"\n", &cmnd_prnt[i*70]);
-	  }
-	}
-      }
-      if (lun == stdin) {printf ("> "); fflush (NULL);}
-    }
-
-    if (no_errors) {
-      printf ("\"Interaction\" completed.\n");
-    }else {
-      printf ("Interaction failed.\n");
-    }
-    return no_errors;
-  }
-/*
-**---------------------------------------------------------------------------
-**			SetupXrmDatabase    - setup Resource Manager Database
-*/
-  int	SetupXrmDatabase (
-/*	================
-*/			XrmDatabase	*db,
-			char		*name[],
-			int		*argc,
-			char		*argv[]) {
-
-    static char	our_name[80]  = "Unknown";  /* This holds the program name */
-    static char lkup_name[80] = "Unknown";  /* Name for looking in database */
-
-    int		status, i, first = True;
-    char	text[80];
-    char	full_nm0[80];
-    char	full_nm1[80];
-    char	*p_fil[] = {0,0,0,0,0,0,0,0,0,0};
-    char	*my_name;
-    char	*my_name_last;
-
-    char	*name_type;
-    XrmValue	name_value;
-
-    XrmDatabase cmnd_line_db = NULL;
-    XrmDatabase	lcl_db	     = NULL;
-  /*-----------------------------------------------------
-  ** This routine merges some resource databases with options specified on
-  ** the command line. Resources can then be looked up using XrmGetResource.
-  ** This is a bit like the X-toolkit routine XtAppInitialize does for the
-  ** extraction of resources by XtGetApplicationResources.
-  ** 
-  ** I can't help but think that there's a simpler way of doing this but I
-  ** can't find it in the X manuals. Basically, the problem arises with wanting
-  ** to avoid the calling program being associated with an X-display, i.e. it
-  ** is intended for use by "command-line oriented" programs. All the nice,
-  ** easy-to-use resource/command-line setup routines in Xlib or Xtlib seem to
-  ** assume one is going to use a display -- not surprising, I suppose,
-  ** since the concept of Xlib is for writing window based applications!
-  **
-  ** Anyway, the point is that the following way turn out to be lacking
-  ** when it gets tested in anger.
-  */
-    status = True;		/* Assume success	*/
-
-    our_name[0] = '\0';
-	/*
-	** Make a list of the databases to be merged, highest priority first.
-	*/
-#ifdef  __VMS
-    p_fil[0] = "decw$user_defaults:SinQ_rc.dat";
-    p_fil[1] = "decw$group_defaults:SinQ_rc.dat";
-    p_fil[2] = "decw$system_defaults:SinQ_rc.dat";
-    p_fil[3] = "decw$user_defaults:decw$xdefaults.dat";
-    p_fil[4] = "decw$group_defaults:decw$xdefaults.dat";
-    p_fil[5] = "decw$system_defaults:decw$xdefaults.dat";
-    p_fil[6] = NULL;
-    if (*argc > 0) {	     /* Find out what we are called - parse file nm */
-      my_name = strstr (argv[0], "]");	/* Find end of directory, i.e. "]" */
-      my_name++;			/* Skip over "]" */
-      if (my_name[0] == '[') {		/* Handle possible concealed device */
-        my_name = strstr (my_name, "]");
-	my_name++;
-      }
-      i = sizeof (our_name);
-      StrEdit (our_name, my_name, "lowercase", &i);	    /* Copy the rest */
-      strtok (our_name, ".");		/* Close it off at "." */
-    }
-#else
-    p_fil[0] = StrJoin (full_nm0, sizeof (full_nm0),
-			    getenv ("HOME"), "/SinQ_rc");
-    p_fil[1] = "/usr/lib/X11/app-defaults/SinQ_rc";
-    p_fil[2] = StrJoin (full_nm1, sizeof (full_nm1),
-			    getenv ("HOME"), "/.Xdefaults");
-    p_fil[3] = "/usr/lib/X11/app-defaults/Xdefaults";
-    p_fil[4] = NULL;
-    if (*argc > 0) {	      /* Find out what we are called - parse file nm  */
-			      /* Find end of directories */
-      my_name = argv[0] - 1;
-      while (my_name != NULL) {
-        my_name_last = my_name;
-	my_name_last++;
-	my_name = strstr (my_name_last, "/");
-      }
-      StrJoin (our_name, sizeof (our_name), my_name_last, "");
-    }
-#endif
-    printf ("My name is \"%s\"\n", our_name);
-	/*
-	**  Initialise and combine all databases
-	*/
-    XrmInitialize ();
-    for (i = 0; i < XtNumber (p_fil); i++) {
-      if (p_fil[i] == NULL) break;
-      status = XrmCombineFileDatabase (p_fil[i], &lcl_db, False);
-      if (status != 0) {
-        if (first) {
-	  printf ("Resource database created from file %s.\n", p_fil[i]);
-	}else {
-	  printf ("File %s merged into resource database.\n", p_fil[i]);
-	}
-	first = False;
-      }
-    }
-	/*
-	**  See if there's anything specified on cmnd line, incl "name".
-	*/
-    XrmParseCommand (&cmnd_line_db,
-			OpTable, XtNumber(OpTable), our_name, argc, argv);
-    if (cmnd_line_db != NULL) {
-	    /*
-	    ** There was at least 1 item on cmnd line. Process the line.
-	    ** If -name was specified, adopt it.
-	    */
-      status = XrmGetResource (cmnd_line_db,  /* See if a name was specified  */
-			    StrJoin (text, sizeof (text), our_name, ".name"),
-			    "ProgramName.Values",
-			    &name_type, &name_value);
-      if (status) {
-	i = sizeof (lkup_name);
-	StrEdit (lkup_name, name_value.addr, "lowercase", &i);
-	printf ("Option list name is \"%s\"\n", lkup_name);
-      }else {
-        strcpy (lkup_name, our_name);
-      }
-	    /*
-	    ** Loop over all items in OpTable and merge them into database,
-	    ** taking care of any possible name changes.
-	    */
-      for (i = 0; i < XtNumber (OpTable); i++) {
-	if (strcmp (OpTable[i].option, "-name") == 0) continue;
-        status = XrmGetResource (cmnd_line_db,
-				StrJoin (text, sizeof (text),
-				    our_name, OpTable[i].specifier),
-				"ProgramName.Values",
-				&name_type, &name_value);
-	if (status) {
-	  StrJoin (text, sizeof (text), lkup_name, OpTable[i].specifier);
-	  XrmPutResource (&lcl_db, text, "String", &name_value);
-	}
-      }
-    }
-    *name = lkup_name;
-    *db = lcl_db;
-    if (lcl_db == NULL) printf ("Warning -- no resource database found.\n");
-
-    XrmDestroyDatabase (cmnd_line_db);
-/*
-**    XrmPutFileDatabase (lcl_db, "asynsrv_test.db");
-*/
-    return status;
-  }
-/*
-**---------------------------------------------------------------------------
-**			GetCheckResources - get and check our resources
-*/
-  int	GetCheckResources (
-/*	=================
-*/			    XrmDatabase	*db,
-			    char	*appName) {
-
-    int			i, status;
-    char		buff[80];
-    char		*type;
-    XrmValue		value;
-    time_t		time_now;
-    float		tmp_secs;
-
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".AsynSrvHelp"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_help = (status) ? True : False;
-    if (Do_help) {
-      ShowUsage (True);
-      exit (EXIT_SUCCESS);
-    }
-
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".AsynSrvDebug"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Debug = (status) ? True : False;
-
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".AsynSrvNoCase"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (status) {
-      DoLower = False; DoUpper = False;
-    }else {
-      DoLower = False; DoUpper = True;
-    }
-
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".AsynSrvLower"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (status) DoLower = True;
-    if (DoLower) DoUpper = False;
-
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".AsynSrvUpper"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (status) DoUpper = True;
-    if (DoUpper) DoLower = False;
-
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".AsynSrvHost"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      printf ("No server specified via the -host option. "
-			"No default allowed!\n");
-      ShowUsage (False);
-      return False;
-    }else {
-      StrJoin (AsynSrv_info.host, sizeof (AsynSrv_info.host), value.addr, "");
-      printf ("Using Internet host \"%s\".\n", AsynSrv_info.host);
-    }
-
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".AsynSrvPort"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%d", &AsynSrv_info.port) != 1)) {
-      AsynSrv_info.port = 4000;
-      printf ("Using the default TCP/IP port number of %d.\n",
-			    AsynSrv_info.port);
-    }else {
-      printf ("TCP/IP  port  number = %d\n", AsynSrv_info.port);
-    }
-
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".AsynSrvChan"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%d", &AsynSrv_info.chan) != 1)) {
-      printf ("No RS-232-C channel specified via the -chan option. "
-			"No default allowed!\n");
-      ShowUsage (False);
-      return False;
-    }else {
-      printf ("RS-232-C channel number = %d\n", AsynSrv_info.chan);
-    }
-
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".AsynSrvTmo"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%f", &Tmo) != 1)) {
-      Tmo = 2.0;
-    }else {
-      printf ("Response time-out = %d msec.\n", (int) ((Tmo + 0.0001) * 1000));
-    }
-
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".AsynSrvTmoConn"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%f", &TmoC) != 1)) {
-      TmoC = 5.0;
-    }else {
-      printf ("Connection time-out = %d secs.\n", (int) (TmoC + 0.0001));
-    }
-
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".AsynSrvTermOut"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      printf ("Output terminator is \"\\r\"\n");
-      strcpy (TermOut, "\r");
-    }else {
-      printf ("Output terminator is \"%s\"\n", value.addr);
-      i = sizeof (TermOut);
-      if (StrEdit (TermOut, value.addr, "trim", &i) == NULL) {
-	printf ("Bad output terminator!\n");
-	ShowUsage (False);
-	return False;
-      }
-    }
-
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".AsynSrvTermIn"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      printf ("Input  terminator is \"\\r\"\n");
-      memcpy (TermIn, "1\r\0\0", 4);
-    }else {
-      printf ("Input  terminator is \"%s\"\n", value.addr);
-      i = sizeof (TermIn) - 1;
-      if (StrEdit (&TermIn[1], value.addr, "trim", &i) == NULL) {
-	printf ("Bad input terminator!\n");
-	ShowUsage (False);
-	return False;
-      }
-      switch (strlen (&TermIn[1])) {
-       case 0: strcpy (TermIn, "0\0\0\0"); break;
-       case 1: TermIn[0] = '1'; TermIn[2] = TermIn[3] = '\0'; break;
-       case 2: TermIn[0] = '2'; TermIn[3] = '\0'; break;
-       case 3: TermIn[0] = '3'; break;
-       default:
-	printf ("Input terminator string is too long!\n");
-	return False;
-      }
-    }
-    return True;
-  }
-/*
-**--------------------------------------------------------------------------
-**		CtrlC_Handler:  Signal handler to detect <Ctrl-C> on keyboard.
-*/
-  void	CtrlC_Handler (int sigint) {
-/*      =============
-*/
-    Ctrl_C_has_happened = True;
-  }
-/*
-**==========================================================================
-**			Main line program
-**			------------------
-*/
-  int	main (int argc, char **argv) {
-/*      ============================
-*/
-    char	    buff[80], text0[80], text1[80];
-    int		    buff_len;
-    int		    status, errcode, errno, vaxc_errno, i;
-    char	    *errName;
-    time_t	    time_now;
-    int		    sec_tmoC, msec_tmo;
-
-    XrmDatabase		my_db;
-    char		*appName;
-/*-----------------------------------------------------------------------*/
-    time_now = time (NULL);
-    printf ("RS-232-C Device Test Program, Ident %s.\n", ident);
-    printf ("Started at %s", asctime (localtime (&time_now)));
-	/*-------------------------------------------------------------
-	**	Setup the resource database and look up the resources.
-	*/
-    SetupXrmDatabase (&my_db, &appName, &argc, argv);
-    if (argc > 1) {
-      if (argc > 2) {
-	printf ("\nThe following arguments were not used:\n\n     ");
-	for (i = 1; i < argc; i++) {
-	  printf ("\"%s\" ", argv[i]);
-	}
-      }else {
-        printf ("\nArgument \"%s\" was not used.", argv[1]);
-      }
-      printf ("\n");
-      ShowUsage (False);
-      return False;
-    }
-    status = GetCheckResources (&my_db, appName);
-    if (!status) return False;
-		    /*
-		    ** Declare a signal handler to catch <Ctrl-C> so that we
-		    ** can exit cleanly.
-		    */
-    Ctrl_C_has_happened = False;
-    signal (SIGINT, CtrlC_Handler);
-
-    sec_tmoC = (int) (TmoC + 0.0001);
-    msec_tmo = (int) ((Tmo + 0.0001) * 1000);
-    status = AsynSrv_ConfigDflt (
-		"tmoC",    sec_tmoC,  /* Specify the connection time-out */
-		"msecTmo", msec_tmo,  /* Specify the response time-out */
-		"eot",     TermIn,    /* Specify the terminators */
-		NULL);
-    if (!status) {
-      printf ("Error setting default configuration of server connection.\n");
-      PrintErrInfo ("AsynSrv_ConfigDflt");
-      return False;
-    }
-
-    status = AsynSrv_Open (&AsynSrv_info);
-    if (!status) {
-      printf ("Error opening connection to server.\n");
-      PrintErrInfo ("AsynSrv_Open");
-      return False;
-    }else {
-
-      status = DoInteract ();
-      if (!status) {
-	PrintErrInfo ("DoInteract");
-	AsynSrv_Close (&AsynSrv_info, 0);
-	return False;
-      }
-
-      status = AsynSrv_Close (&AsynSrv_info, 0);
-    }
-    return True;
-  }
-/*------------------------------------------------- End of asynsrv_test.c */
diff --git a/utils/check/amorcheck b/utils/check/amorcheck
deleted file mode 100755
index a679a5d3..00000000
--- a/utils/check/amorcheck
+++ /dev/null
@@ -1,97 +0,0 @@
-#! /bin/sh
-#next line is executed by sh, not by Tcl \
-   exec tclsh $0 ${1+"$@"}
-#--------------------------------------------------------------------------
-# This is the SICS syntax checker for the AMOR reflectometer
-#
-# Mark Koennecke, March 2003
-#--------------------------------------------------------------------------
-source /data/koenneck/src/sics/utils/check/sicssyntaxlib.tcl
-
-#------------ define AMOR motors and aliases
-sicsSyntaxMap ftz       syntaxMotor
-sicsSyntaxMap fom       syntaxMotor
-sicsSyntaxMap d1l       syntaxMotor
-sicsSyntaxMap d1r       syntaxMotor
-sicsSyntaxMap d1t       syntaxMotor
-sicsSyntaxMap d1b       syntaxMotor
-sicsSyntaxMap moz       syntaxMotor
-sicsSyntaxMap mty       syntaxMotor
-sicsSyntaxMap mom       syntaxMotor
-sicsSyntaxMap mtz       syntaxMotor
-sicsSyntaxMap d2l       syntaxMotor
-sicsSyntaxMap d2r       syntaxMotor
-sicsSyntaxMap d2t       syntaxMotor
-sicsSyntaxMap d2b       syntaxMotor
-sicsSyntaxMap d3l       syntaxMotor
-sicsSyntaxMap d3r       syntaxMotor
-sicsSyntaxMap d3t       syntaxMotor
-sicsSyntaxMap d3b       syntaxMotor
-sicsSyntaxMap stz       syntaxMotor
-sicsSyntaxMap som       syntaxMotor
-sicsSyntaxMap sch       syntaxMotor
-sicsSyntaxMap soz       syntaxMotor
-sicsSyntaxMap stb       syntaxMotor
-sicsSyntaxMap d4l       syntaxMotor
-sicsSyntaxMap d4r       syntaxMotor
-sicsSyntaxMap d4t       syntaxMotor
-sicsSyntaxMap d4b       syntaxMotor
-sicsSyntaxMap aoz       syntaxMotor
-sicsSyntaxMap aom       syntaxMotor
-sicsSyntaxMap atz       syntaxMotor
-sicsSyntaxMap d5l       syntaxMotor
-sicsSyntaxMap d5r       syntaxMotor
-sicsSyntaxMap d5t       syntaxMotor
-sicsSyntaxMap d5b       syntaxMotor
-sicsSyntaxMap coz       syntaxMotor
-sicsSyntaxMap c3z       syntaxMotor
-sicsSyntaxMap com       syntaxMotor
-sicsSyntaxMap cox       syntaxMotor
-
-#------------ define AMOR counters
-sicsSyntaxMap counter syntaxCounter
-sicsSyntaxMap hm      syntaxHM
-
-#------------ define AMOR variables 
-sicsSyntaxMap title        syntaxTextPar
-sicsSyntaxMap user         syntaxTextPar
-sicsSyntaxMap adres        syntaxTextPar 
-sicsSyntaxMap collimation  syntaxTextPar
-sicsSyntaxMap sample       syntaxTextPar
-sicsSyntaxMap comment1     syntaxTextPar
-sicsSyntaxMap comment2     syntaxTextPar
-sicsSyntaxMap comment3     syntaxTextPar
-sicsSyntaxMap fax          syntaxTextPar
-sicsSyntaxMap email        syntaxTextPar
-sicsSyntaxMap sample       syntaxTextPar
-
-#----------- define AMOR environment
-sicsSyntaxMap temperature evSyntax
-sicsSyntaxMap tt          evSyntax
-sicsSyntaxMap pby         evSyntax
-sicsSyntaxMap aby         evSyntax
-sicsSyntaxMap magnet      evSyntax
-
-#---------- define AMOR auxiliary
-sicsSyntaxMap dr  syntaxDrive
-sicsSyntaxMap s2t syntaxNumPar
-sicsSyntaxMap o2t syntaxNumPar
-sicsSyntaxMap td  syntaxNumPar
-sicsSyntaxMap aw  syntaxNumPar
-sicsSyntaxMap shutter syntaxTextPar
-
-#syntaxLoadSICS amorstatus.tcl
-#puts stdout [array names sicsPar]
-
-if { $argc < 1} {
-	puts stdout "Usage: \n\tamorcheck filename"
-	exit 0
-}
-set filename [lindex $argv 0]
-lappend fileList [file tail $filename]
-puts stdout "Syntax checking --> $filename <-- ........."
-source $filename
-puts stdout "If this completed without errors the likelihoof of your script"
-puts stdout "executing properly on the instrument has increased significantly"
-exit 1
- 
diff --git a/utils/check/dmccheck b/utils/check/dmccheck
deleted file mode 100755
index 4f7aca43..00000000
--- a/utils/check/dmccheck
+++ /dev/null
@@ -1,68 +0,0 @@
-#! /bin/sh
-#next line is executed by sh, not by Tcl \
-   exec tclsh $0 ${1+"$@"}
-#--------------------------------------------------------------------------
-# This is the SICS syntax checker for the DMC powder diffractometer
-#
-# Mark Koennecke, March 2003
-#--------------------------------------------------------------------------
-source /data/koenneck/src/sics/utils/check/sicssyntaxlib.tcl
-
-#------------------------- define DMC motors and aliases
-sicsSyntaxMap omegam    syntaxMotor
-sicsSyntaxMap twothetam syntaxMotor
-sicsSyntaxMap monox     syntaxMotor
-sicsSyntaxMap monoy     syntaxMotor
-sicsSyntaxMap curvem    syntaxMotor
-sicsSyntaxMap monophi   syntaxMotor
-sicsSyntaxMap monochi   syntaxMotor
-sicsSyntaxMap table     syntaxMotor
-sicsSyntaxMap twothetad syntaxMotor
-sicsSyntaxMap a1        syntaxMotor
-sicsSyntaxMap a2        syntaxMotor
-sicsSyntaxMap a3        syntaxMotor
-sicsSyntaxMap a4        syntaxMotor
-sicsSyntaxMap a5        syntaxMotor
-sicsSyntaxMap a6        syntaxMotor
-sicsSyntaxMap a7        syntaxMotor
-sicsSyntaxMap a8        syntaxMotor
-sicsSyntaxMap a9        syntaxMotor
-
-#------------ define DMC counters
-sicsSyntaxMap counter syntaxCounter
-sicsSyntaxMap banana syntaxHM
-
-#------------ define DMC variables
-sicsSyntaxMap title        syntaxTextPar
-sicsSyntaxMap user         syntaxTextPar
-sicsSyntaxMap collimation  syntaxTextPar
-sicsSyntaxMap sample       syntaxTextPar
-sicsSyntaxMap comment1     syntaxTextPar
-sicsSyntaxMap comment2     syntaxTextPar
-sicsSyntaxMap comment3     syntaxTextPar
-sicsSyntaxMap fax          syntaxTextPar
-sicsSyntaxMap email        syntaxTextPar
-sicsSyntaxMap sample       syntaxTextPar
-sicsSyntaxMap lambda       syntaxNumPar
-
-#----------- define DMC environment
-sicsSyntaxMap temperature evSyntax
-sicsSyntaxMap tt          evSyntax
-
-#---------- define DMC auxiliary
-sicsSyntaxMap beam syntaxDummy
-
-#--------- Main checking stuff
-
-if { $argc < 1} {
-	puts stdout "Usage: \n\tdmccheck filename"
-	exit 0
-}
-set filename [lindex $argv 0]
-lappend fileList [file tail $filename]
-puts stdout "Syntax checking --> $filename <-- ........."
-source $filename
-puts stdout "If this completed without errors the likelihoof of your script"
-puts stdout "executing properly on the instrument has increased significantly"
-exit 1
- 
\ No newline at end of file
diff --git a/utils/check/focuscheck b/utils/check/focuscheck
deleted file mode 100755
index 944b9480..00000000
--- a/utils/check/focuscheck
+++ /dev/null
@@ -1,82 +0,0 @@
-#! /bin/sh
-#next line is executed by sh, not by Tcl \
-   exec tclsh $0 ${1+"$@"}
-#--------------------------------------------------------------------------
-# This is the SICS syntax checker for the FOCUS TOF diffractometer
-#
-# Mark Koennecke, March 2003
-#--------------------------------------------------------------------------
-source /data/koenneck/src/sics/utils/check/sicssyntaxlib.tcl
-
-#------------ define FOCUS motors and aliases
-sicsSyntaxMap mtt       syntaxMotor
-sicsSyntaxMap msl       syntaxMotor
-sicsSyntaxMap mth       syntaxMotor
-sicsSyntaxMap mtx       syntaxMotor
-sicsSyntaxMap mty       syntaxMotor
-sicsSyntaxMap mgo       syntaxMotor
-sicsSyntaxMap m1ch      syntaxMotor
-sicsSyntaxMap m1cv      syntaxMotor
-sicsSyntaxMap m2ch      syntaxMotor
-sicsSyntaxMap m2cv      syntaxMotor
-sicsSyntaxMap mex       syntaxMotor
-sicsSyntaxMap som       syntaxMotor
-sicsSyntaxMap sth       syntaxMotor
-sicsSyntaxMap sph       syntaxMotor
-sicsSyntaxMap theta     syntaxMotor
-
-sicsSyntaxMap a1        syntaxMotor
-sicsSyntaxMap a2        syntaxMotor
-
-#------------ define FOCUS counters
-sicsSyntaxMap counter syntaxCounter
-sicsSyntaxMap hm      syntaxHM
-
-#------------ define FOCUS variables 
-sicsSyntaxMap title        syntaxTextPar
-sicsSyntaxMap user         syntaxTextPar
-sicsSyntaxMap adres        syntaxTextPar 
-sicsSyntaxMap collimation  syntaxTextPar
-sicsSyntaxMap sample       syntaxTextPar
-sicsSyntaxMap comment1     syntaxTextPar
-sicsSyntaxMap comment2     syntaxTextPar
-sicsSyntaxMap comment3     syntaxTextPar
-sicsSyntaxMap fax          syntaxTextPar
-sicsSyntaxMap email        syntaxTextPar
-sicsSyntaxMap sample       syntaxTextPar
-sicsSyntaxMap lambda       syntaxNumPar
-
-#----------- define FOCUS environment
-sicsSyntaxMap temperature evSyntax
-sicsSyntaxMap tt          evSyntax
-
-#---------- define FOCUS auxiliary
-sicsSyntaxMap   fermispeed  syntaxNumPar
-sicsSyntaxMap   diskspeed   syntaxNumPar
-sicsSyntaxMap   ratio       syntaxNumPar
-sicsSyntaxMap   phase       syntaxNumPar
-
-sicsSyntaxMap   shutter     syntaxTextPar
-sicsSyntaxMap   colli       syntaxTextPar
-sicsSyntaxMap   td          syntaxNumPar
-sicsSyntaxMap   aw          syntaxNumPar
-sicsSyntaxMap   helium      syntaxDummy 
-
-sicsSyntaxMap   mono        syntaxDummy
-
-#--------- Main checking stuff
-#syntaxLoadSICS focusstatus.tcl
-#puts stdout [array names sicsPar]
-
-if { $argc < 1} {
-	puts stdout "Usage: \n\tfocuscheck filename"
-	exit 0
-}
-set filename [lindex $argv 0]
-lappend fileList [file tail $filename]
-puts stdout "Syntax checking --> $filename <-- ........."
-source $filename
-puts stdout "If this completed without errors the likelihoof of your script"
-puts stdout "executing properly on the instrument has increased significantly"
-exit 1
- 
diff --git a/utils/check/hrptcheck b/utils/check/hrptcheck
deleted file mode 100755
index 241f988b..00000000
--- a/utils/check/hrptcheck
+++ /dev/null
@@ -1,85 +0,0 @@
-#! /bin/sh
-#next line is executed by sh, not by Tcl \
-   exec tclsh $0 ${1+"$@"}
-#--------------------------------------------------------------------------
-# This is the SICS syntax checker for the HRPT powder diffractometer
-#
-# Mark Koennecke, March 2003
-#--------------------------------------------------------------------------
-source /data/koenneck/src/sics/utils/check/sicssyntaxlib.tcl
-
-#------------------------- define HRPT motors and aliases
-sicsSyntaxMap momu      syntaxMotor
-sicsSyntaxMap mtvu      syntaxMotor
-sicsSyntaxMap mtpu      syntaxMotor
-sicsSyntaxMap mgvu      syntaxMotor
-sicsSyntaxMap mgpu      syntaxMotor
-sicsSyntaxMap mcvu      syntaxMotor
-sicsSyntaxMap moml      syntaxMotor
-sicsSyntaxMap mtvl      syntaxMotor
-sicsSyntaxMap mtpl      syntaxMotor
-sicsSyntaxMap mgvl      syntaxMotor
-sicsSyntaxMap mcvl      syntaxMotor
-sicsSyntaxMap mexz      syntaxMotor
-sicsSyntaxMap som       syntaxMotor
-sicsSyntaxMap stt       syntaxMotor
-sicsSyntaxMap cex1      syntaxMotor
-sicsSyntaxMap cex2      syntaxMotor
-sicsSyntaxMap a1        syntaxMotor
-sicsSyntaxMap a3        syntaxMotor
-sicsSyntaxMap om        syntaxMotor
-sicsSyntaxMap omega     syntaxMotor
-sicsSyntaxMap a4        syntaxMotor
-sicsSyntaxMap th        syntaxMotor
-sicsSyntaxMap b1        syntaxMotor
-sicsSyntaxMap a17       syntaxMotor
-sicsSyntaxMap a18       syntaxMotor
-sicsSyntaxMap a12       syntaxMotor
-sicsSyntaxMap a13       syntaxMotor
-sicsSyntaxMap a14       syntaxMotor
-sicsSyntaxMap a15       syntaxMotor
-sicsSyntaxMap a16       syntaxMotor
-sicsSyntaxMap a37       syntaxMotor
-sicsSyntaxMap a22       syntaxMotor
-sicsSyntaxMap a24       syntaxMotor
-sicsSyntaxMap a25       syntaxMotor
-sicsSyntaxMap a26       syntaxMotor
-#------------ define HRPT counters
-sicsSyntaxMap counter syntaxCounter
-sicsSyntaxMap banana syntaxHM
-
-#------------ define HRPT variables
-sicsSyntaxMap title        syntaxTextPar
-sicsSyntaxMap user         syntaxTextPar
-sicsSyntaxMap collimation  syntaxTextPar
-sicsSyntaxMap sample       syntaxTextPar
-sicsSyntaxMap comment1     syntaxTextPar
-sicsSyntaxMap comment2     syntaxTextPar
-sicsSyntaxMap comment3     syntaxTextPar
-sicsSyntaxMap fax          syntaxTextPar
-sicsSyntaxMap email        syntaxTextPar
-sicsSyntaxMap sample       syntaxTextPar
-sicsSyntaxMap lambda       syntaxNumPar
-sicsSyntaxMap mtt          syntaxNumPar
-
-#----------- define HRPT environment
-sicsSyntaxMap temperature evSyntax
-sicsSyntaxMap tt          evSyntax
-
-#---------- define HRPT auxiliary
-sicsSyntaxMap beam    syntaxDummy
-sicsSyntaxMap graphit syntaxTextPar
-#--------- Main checking stuff
-
-if { $argc < 1} {
-	puts stdout "Usage: \n\thrptcheck filename"
-	exit 0
-}
-set filename [lindex $argv 0]
-lappend fileList [file tail $filename]
-puts stdout "Syntax checking --> $filename <-- ........."
-source $filename
-puts stdout "If this completed without errors the likelihoof of your script"
-puts stdout "executing properly on the instrument has increased significantly"
-exit 1
- 
\ No newline at end of file
diff --git a/utils/check/sanscheck b/utils/check/sanscheck
deleted file mode 100755
index 0b12c906..00000000
--- a/utils/check/sanscheck
+++ /dev/null
@@ -1,144 +0,0 @@
-#! /bin/sh
-#next line is executed by sh, not by Tcl \
-   exec tclsh $0 ${1+"$@"}
-#--------------------------------------------------------------------------
-# This is the SICS syntax checker for the SANS small angle machine
-#
-# Mark Koennecke, March 2003
-#--------------------------------------------------------------------------
-source /data/koenneck/src/sics/utils/check/sicssyntaxlib.tcl
-
-#------------------------- define SANS motors and aliases
-sicsSyntaxMap som        syntaxMotor
-sicsSyntaxMap sax        syntaxMotor
-sicsSyntaxMap say        syntaxMotor
-sicsSyntaxMap saz        syntaxMotor
-sicsSyntaxMap spos       syntaxMotor
-sicsSyntaxMap mz         syntaxMotor
-sicsSyntaxMap mom        syntaxMotor
-sicsSyntaxMap gphi       syntaxMotor
-sicsSyntaxMap gtheta     syntaxMotor
-sicsSyntaxMap gomega     syntaxMotor
-sicsSyntaxMap detectorx  syntaxMotor
-sicsSyntaxMap detectory  syntaxMotor
-sicsSyntaxMap detectorrotation syntaxMotor
-sicsSyntaxMap beamstopy  syntaxMotor
-sicsSyntaxMap beamstopx  syntaxMotor
-
-#------------ multimotors and their aliases
-sicsSyntaxMap emagnetsampleholder mumoSyntax
-set sicsPar(emagnetsampleholder.alias) [list z om]
-set sicsPar(emagnetsampleholder.nampos) [list back]
-
-sicsSyntaxMap msh mumoSyntax
-set sicsPar(msh.alias) [list z om]
-set sicsPar(msh.nampos) [list back]
-
-sicsSyntaxMap cryomagnetsampleholder mumoSyntax
-set sicsPar(cryomagnetsampleholder.alias) [list phi theta omega]
-set sicsPar(cryomagnetsampleholder.nampos) [list back]
-
-sicsSyntaxMap cryo mumoSyntax
-set sicsPar(cryo.alias) [list phi theta omega]
-set sicsPar(cryo.nampos) [list back]
-
-sicsSyntaxMap sampletable mumoSyntax
-set sicsPar(sampletable.alias) [list omega x y z posi]
-set sicsPar(sampletable.nampos) [list back]
-
-sicsSyntaxMap st mumoSyntax
-set sicsPar(st.alias) [list omega x y z posi]
-set sicsPar(st.nampos) [list back]
-
-sicsSyntaxMap detector mumoSyntax
-set sicsPar(detector.alias) [list x y phi]
-set sicsPar(detector.nampos) [list back]
-
-sicsSyntaxMap dt mumoSyntax
-set sicsPar(dt.alias) [list x y phi]
-set sicsPar(dt.nampos) [list back]
-
-sicsSyntaxMap beamstop mumoSyntax
-set sicsPar(beamstop.alias) [list x y]
-set sicsPar(beamstop.nampos) [list back]
-
-sicsSyntaxMap bs mumoSyntax
-set sicsPar(bs.alias) [list x y]
-set sicsPar(bs.nampos) [list back]
-
-#------------ define SANS counters
-sicsSyntaxMap counter syntaxCounter
-sicsSyntaxMap banana syntaxHM
-
-#------------ define SANS variables
-sicsSyntaxMap title        syntaxTextPar
-sicsSyntaxMap user         syntaxTextPar
-sicsSyntaxMap collimation  syntaxTextPar
-sicsSyntaxMap sample       syntaxTextPar
-sicsSyntaxMap comment1     syntaxTextPar
-sicsSyntaxMap comment2     syntaxTextPar
-sicsSyntaxMap comment3     syntaxTextPar
-sicsSyntaxMap fax          syntaxTextPar
-sicsSyntaxMap email        syntaxTextPar
-sicsSyntaxMap sample       syntaxTextPar
-sicsSyntaxMap lambda       syntaxNumPar
-sicsSyntaxMap nvs          syntaxNumPar
-
-#----------- define SANS environment
-sicsSyntaxMap temperature evSyntax
-sicsSyntaxMap tt          evSyntax
-
-
-
-#---------- define SANS auxiliary
-sicsSyntaxMap beam syntaxDummy
-sicsSyntaxMap detemp syntaxDummy
-sicsSyntaxMap temp2 syntaxDummy
-sicsSyntaxMap temp3 syntaxDummy
-sicsSyntaxMap temp4 syntaxDummy
-sicsSyntaxMap coll  syntaxNumPar
-sicsSyntaxMap att   syntaxNumPar
-sicsSyntaxMap shutter  syntaxTextPar
-sicsSyntaxMap bschange syntaxNumPar
-sicsSyntaxMap qrange   syntaxNumPar
-sicsSyntaxMap bsin     syntaxDummy
-sicsSyntaxMap bsout    syntaxDummy
-
-#------------- SANS xy-tables
-sicsSyntaxMap xydata0 syntaxXY
-sicsSyntaxMap xydata1 syntaxXY
-sicsSyntaxMap xydata2 syntaxXY
-sicsSyntaxMap xydata3 syntaxXY
-sicsSyntaxMap xydata4 syntaxXY
-sicsSyntaxMap xydata5 syntaxXY
-sicsSyntaxMap xydata6 syntaxXY
-sicsSyntaxMap xydata7 syntaxXY
-sicsSyntaxMap xydata8 syntaxXY
-sicsSyntaxMap xydata9 syntaxXY
-sicsSyntaxMap xydata  syntaxXY
-
-#--------- do we need this?
-sicsSyntaxMap save syntaxDummy
-sicsSyntaxMap SplitReply syntaxDummy
-sicsSyntaxMap Publish syntaxDummy
-
-#--------- Main checking stuff
-
-if { $argc < 1} {
-	puts stdout "Usage: \n\tsanscheck filename"
-	exit 0
-}
-set filename [lindex $argv 0]
-lappend fileList [file tail $filename]
-puts stdout "Syntax checking --> $filename <-- ........."
-source $filename
-puts stdout "If this completed without errors the likelihoof of your script"
-puts stdout "executing properly on the instrument has increased significantly"
-exit 1
- 
-
-
-
-
-
-
diff --git a/utils/check/sicssyntax.tex b/utils/check/sicssyntax.tex
deleted file mode 100644
index 06824807..00000000
--- a/utils/check/sicssyntax.tex
+++ /dev/null
@@ -1,86 +0,0 @@
-\documentclass[12pt,a4paper]{article}
-%%\usepackage[dvips]{graphics}
-%%\usepackage{epsf}
-\setlength{\textheight}{24cm}
-\setlength{\textwidth}{16cm}
-\setlength{\headheight}{0cm}
-\setlength{\headsep}{0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\oddsidemargin}{0cm}
-\setlength{\evensidemargin}{0cm}
-\setlength{\hoffset}{0cm}
-\setlength{\marginparwidth}{0cm}
-
-\begin{document}
-\begin{center}
-\begin{Large}
-SICS Syntax Checker\\
-Implementation Notes\\
-\end{Large}
-Mark K\"onnecke\\
-Mark.Koennecke@psi.ch\\
-March/April 2003\\
-Laboratory for Neutron Scattering\\
-Paul Scherrer Institute\\
-CH--5232 Villigen--PSI
-Switzerland
-\end{center}
-
-Users wish to check their batch files for syntax errors before
-submitting them to SICS for the weekend or the night. Unfortunately
-checking SICS syntax is not so easy as it consists of Tcl syntax plus
-SICS commands. In order to implement a syntax checker various
-possibilities exist:\begin{itemize}
-\item Implement the syntax checker as a calculation mode within
-SICS. This has the disadvantage that the syntax check can only be run
-by one person and only when the SICS server is not performing an
-experiment. This is due to the fact, that SICS has only one set of
-variables which may be changed dureing the syntax check. In order to
-prevent corruption the security measures stated above are necessary.
-\item Use a SICServer with simulated hardware. This would
-work. Problems are that this is very time consuming to set up and the
-synchronisation of parameter values with the main SICServer. This has
-been solved through the sync command and thus this option is available
-for complex scripts. 
-\item Use a Tcl interpreter with dummy SICS commands as a syntax
-checker. In many cases batch files are fairly simple and a complete
-simulation is not needed. The such a option would be sufficient.   
-\end{itemize}
-\end{document}
-
-\section{The Tcl Syntax Checker}
-This section describes the syntax checker built from a Tcl interpreter
-with dummy routines testing SICS syntax. The dummy procedures only
-have to test the syntax and else do nothing. Not many such proecdures
-have to be implemented but a means is needed for mapping names, for
-instance motor names, to a suitable procedure for checking the syntax.
-
-This syntax checker can be used in a variety of situations:
-\begin{itemize}
-\item Standalone: the preferred mode of operation
-\item Within SICS: SICS would need to have a second Tcl interpreter
-for this purpose in order to prevent corruption of the main
-interpreter. Even then a rogue script could go into an endless loop
-and thus hang the SICS server. Thus this second interpreter would have
-to run as a separate process or thread. 
-\item This syntax checker could also help debugging SICS scripts.
-\end{itemize}
-
-For each instrument two files are needed for this syntax checker.  The
-first is a common library file which implements the syntax checking
-procedures and the sics_alias procedure which maps names to
-procedures. The second is a mapping file which defines the instrument
-and enables those names the instrument provides. This is much like the
-instrument initialization file for the main SICS program.
-
-In order to help in script debugging, a global array with parameter
-values defined through the user script will be maintained. 
-
-In a latter stage a connection to the main SICS could be added to the
-system. Through this  connection the actual configuration of the
-instrument could be queried. Also parameter values can be updated in
-order to help in debugging sophisticated scripts.  Moreover this
-connection could be used to check limit violations. 
-
-
-
diff --git a/utils/check/sicssyntaxlib.tcl b/utils/check/sicssyntaxlib.tcl
deleted file mode 100644
index 1cf09be0..00000000
--- a/utils/check/sicssyntaxlib.tcl
+++ /dev/null
@@ -1,1088 +0,0 @@
-#-----------------------------------------------------------------------------
-# This is the library file for the Tcl syntax checker for SICS commands.
-# The basic idea is this:
-# - SICS commands are replaced by Tcl procedures with the same name which
-#   implement the actual syntax check for this command.
-# - As many SICS commands are object commands a facility is needed to map
-#   syntax checking procedures to names.
-#
-# copyright: see file COPYRIGHT
-#
-# Mark Koennecke, March 2003
-#---------------------------------------------------------------------------
-# sicsSyntaxMap maps the procedure syntaxProc to the name name. The name
-# is prepended to the argument list in order to make the name available
-# in the syntax checking procedure as the first argument
-# This means syntax check procedures have two arguments: 
-# - the name
-# - the list of remaining parameters as a string. Use syntaxListify
-#   to convert the list to a proper list for further processing  
-#---------------------------------------------------------------------------
-proc sicsSyntaxMap {name syntaxProc} {
-   append newProc "proc " $name " args " \{  $syntaxProc " "
-   append newProc $name " "   "\$args"    \}
-   eval $newProc
-}  
-#--------------------------------------------------------------------------
-# a helper procedure which tests a value if it is numeric
-#--------------------------------------------------------------------------
-proc syntaxNumeric {val} {
-    set ret [catch {expr $val *1.} msg]
-    if { $ret == 0} {
-	return 1
-    } else {
-	return 0
-    }
-}
-#--------------------------------------------------------------------------
-# a helper procedure which converts a stringified list back into a proper
-# list
-#--------------------------------------------------------------------------
-proc syntaxListify {uff} {
-    set l [string trim $uff "{}"]
-    return [split $l]
-}
-#--------------------------------------------------------------------------
-# a helper procedure which gets a parameter from the global parameter
-# array or replaces it by the default 77 if it does not exist
-#-------------------------------------------------------------------------
-proc syntaxGet {name} {
-    global sicsPar
-    if { [info exists sicsPar($name)] == 1} {
-	return [format "%s = %s" $name \
-		    $sicsPar($name)] 
-    } else {
-	return [format " %s = 77" $name]
-    }
-}
-#------------------------------------------------------------------------
-# syntaxCounterMode tests if par is a valid counter mode
-#-----------------------------------------------------------------------
-proc syntaxCounterMode {par} {
-    set p [string trim [string tolower $par]]
-    switch $p {
-	monitor { return 1}
-	timer   {return 1}
-	default { return 0}
-    }
-}
-#-------------------------------------------------------------------------
-# syntaxLoadSICS loads a SICS status file. The trick is to ignore all
-# errors because the syntax checker may not have all commands implemented
-#-------------------------------------------------------------------------
-proc syntaxLoadSICS {fname} {
-    set f [open $fname r]
-    while { [gets $f line] > 0} {
-	set ret [catch {eval $line} msg]
-#	if { $ret != 0} {
-#	    puts stdout "ERROR in: $line"
-#	}
-    }
-    close $f
-}
-#-------------------------------------------------------------------------
-# syntaxLimit checks if a parameter violates a limit
-#------------------------------------------------------------------------
-proc syntaxLimit {var val} {
-    global sicsPar
-    
-#-------- fixed?
-    if { [info exists sicsPar($var.fixed)] } {
-	set lim $sicsPar($var.fixed)
-	if { $lim > 0 } {
-	    error "ERROR: $var is fixed"
-	}
-    }
-
-#--------- lower limit?
-    set lim shit
-    if { [info exists sicsPar($var.softlowerlim)] } {
-	set lim $sicsPar($var.softlowerlim)
-    }
-    if { [info exists sicsPar($var.lowerlimit)] } {
-	set lim $sicsPar($var.lowerlimit)
-    }
-    if { [syntaxNumeric $lim] == 1} {
-	if { $val < $lim} {
-	    error "ERROR: lower limit $lim violated by $val for $var"
-	}
-    }
-#------------ upper limit?
-    set lim shit
-    if { [info exists sicsPar($var.softupperlim)] } {
-	set lim $sicsPar($var.softupperlim)
-    }
-    if { [info exists sicsPar($var.upperlimit)] } {
-	set lim $sicsPar($var.upperlimit)
-    }
-    if { [syntaxNumeric $lim] == 1} {
-	if { $val > $lim} {
-	    error "ERROR: upper limit $lim violated by $val for $var"
-	}
-    }
-}
-#---------------------------------------------------------------------------
-# syntaxDummy is a syntax checking procedure which does nothing. This is a
-# quick fix for SICS commands for which no syntax checking procedure has yet
-# been defined.
-#-------------------------------------------------------------------------
-proc syntaxDummy {name args} {
-}
-#---------------------------------------------------------------------------
-# syntaxWarn is a syntax checking procedure which does nothing. This is a
-# quick fix for SICS commands for which no syntax checking procedure has not
-# yet been defined or makes no sense. This version wanrs about it.
-#-------------------------------------------------------------------------
-proc syntaxWarn {name args} {
-    puts stdout "INFO: Syntax for $name not checked"
-    return
-}
-#-----------------------------------------------------------------------
-# syntaxTextPar is a syntax handling procedure for simple text variables
-#---------------------------------------------------------------------- 
-proc syntaxTextPar {name args} {
-    global sicsPar
-    
-    set args [syntaxListify $args]
-     if { [llength $args] > 0} {
-	set sicsPar($name) [join $args]
-    } else {
-	if { [info exists sicsPar($name)] == 1} {
-	    return [format "%s = %s" $name \
-		    $sicsPar($name)] 
-         } else {
-	     return [format " %s = UNKNOWN" $name]
-        }
-    }
-}
-#------------------------------------------------------------------------
-# syntaxNumPar is a syntax handling procedure for a numeric variable
-#-----------------------------------------------------------------------
-proc syntaxNumPar {name args} {
-    global sicsPar
-
-    set args [syntaxListify $args]
-    if { [llength $args] > 0} {
-	if { [syntaxNumeric [lindex $args 0]] == 1} {
-	    set sicsPar($name) [lindex $args 0]
-	} else {
-	    error [format \
-		    "ERROR: expected numeric argument for %s, received: %s" \
-		    $name [lindex $args 0]]
-	}
-    } else {
-	return [syntaxGet $name]
-    }
-}
-#--------------------------------------------------------------------------
-# syntaxMtor handles the syntax for a SICS motor
-#-------------------------------------------------------------------------
-lappend motSubKey list reset interest uninterest position hardposition 
-lappend motSub hardlowerlim hardupperlim softlowerlim
-lappend motSub softupperlim softzero fixed interruptmode precision
-lappend motSub accessmode sign failafter accesscode
-
-proc syntaxMotor {name args} {
-    global sicsPar motSub motSubKey
-
-    set args [syntaxListify $args]
-#----- value request
-    if { [llength $args] == 0} {
-	return [syntaxGet $name]
-    }
-#---------- keywords
-    set subcommand [string tolower [lindex $args 0]]
-    if { [lsearch $motSubKey $subcommand] >= 0} {
-	return
-    }
-#---------- parameters
-    if { [lsearch $motSub $subcommand] < 0} {
-	error [format "ERROR: motor %s does not know subcommand %s" \
-		$name $subcommand]
-    } else {
-	if { [llength $args] > 1 } {
-	    set val [lindex $args 1]
-	    if { [syntaxNumeric $val] == 0 } {
-		error [format "ERROR: %s.%s expected number, received %s" \
-			$name $subcommand $val]
-	    } else {
-		set sicsPar($name.$subcommand) $val
-	    }
-	} else {
-	    return [syntaxGet $name.$subcommand]
-	}
-    }
-} 
-#---------------------------------------------------------------------------
-# syntaxCounter deals with the syntax for a single counter
-#---------------------------------------------------------------------------
-lappend cterKey interest uninterest stop send
-
-proc syntaxCounter {name args} {
-    global cterKey sicsPar
-
-    set args [syntaxListify $args]
-    if { [llength $args] == 0} {
-	error [format "ERROR: subcommand expected to %s" $name]
-    }
-#--------- get command
-    set subcommand [string trim [string tolower [lindex $args 0]]]
-#------ test keyWords
-    if { [lsearch $cterKey $subcommand] >= 0} {
-	return
-    }
-#------- the rest
-    switch $subcommand {
-    count -
-    countnb { 
-	if { [llength $args] < 2} {
-	    error "ERROR: missing argument to count/coutnb"
-	}
-	if {[syntaxNumeric [lindex $args 1]] == 0 } {
-	    error "ERROR: expected numeric argument to count/countb"
-	}
-	return
-    }
-    getpreset {
-	return [syntaxGet $name.preset]
-    }
-    getexponent {
-	return [syntaxGet $name.exponent]
-    }
-    gettime {
-	return [format "%s.time = 77" $name]
-    }
-    getcounts {
-	return [format "%s.counts = {77 77 77 77 77}" $name]
-    }
-    getthreshold {
-	if { [llength $args] < 2} {
-	    error "ERROR: missing argument to getthreshold"
-	}
-	if {[syntaxNumeric [lindex $args 1]] == 0 } {
-	    error "ERROR: expected numeric argument to getthreshold"
-	}
-	return [syntaxGet $name.threshold]
-    }
-    getmonitor {
-	if { [llength $args] < 2} {
-	    error "ERROR: missing argument to getmonitor"
-	}
-	if {[syntaxNumeric [lindex $args 1]] == 0 } {
-	    error "ERROR: expected numeric argument to getmonitor"
-	}
-	return "$name.monitor 1 = 77"
-    }
-    status {
-	return "counter.status = 77 77 77"
-    }
-    setmode {
-	if { [llength $args] < 2} {
-	    error "ERROR: missing argument to getthreshold"
-	}
-	if { [syntaxCounterMode [lindex $args 1]] == 0} {
-	    error [format "ERROR: invalid counter mode: %s" \
-		    [lindex $args 1]]
-	}
-	return
-    }
-    setpreset {
-	if { [llength $args] < 2} {
-	    error "ERROR: missing argument to setpreset"
-	}
-	if {[syntaxNumeric [lindex $args 1]] == 0 } {
-	    error "ERROR: expected numeric argument to setpreset"
-	}
-	return
-    }
-    setexponent {
-	if { [llength $args] < 2} {
-	    error "ERROR: missing argument to setexponent"
-	}
-	if {[syntaxNumeric [lindex $args 1]] == 0 } {
-	    error "ERROR: expected numeric argument to setexponent"
-	}
-	return
-    }
-    mode {
-	if { [llength $args] <2} {
-	    return [syntaxGet $name.mode]
-	} else {
-	    if { [syntaxCounterMode [lindex $args 1]] == 0} {
-		error [format "ERROR: invalid counter mode: %s" \
-			[lindex $args 1]]
-	    }
-	    set sicsPar($name.mode) [lindex $args 1]
-	    return
-	}
-    }
-    preset {
-	if { [llength $args] <2} {
-	    return [syntaxGet $name.preset]
-	} else {
-	    if { [syntaxNumeric [lindex $args 1]] == 0} {
-		error [format "ERROR: iexpected numeric preset, got : %s" \
-			[lindex $args 1]]
-	    }
-	    set sicsPar($name.preset) [lindex $args 1]
-	    return
-	}
-    }
-    getthreshold {
-	if { [llength $args] < 2} {
-	    error "ERROR: missing argument to getthreshold"
-	}
-	if {[syntaxNumeric [lindex $args 1]] == 0 } {
-	    error "ERROR: expected numeric argument to getthreshold"
-	}
-	return "$name.threshold = 77"
-    }
-    setthreshold {
-	if { [llength $args] < 3} {
-	    error "ERROR: missing argument to setthreshold"
-	}
-	if {[syntaxNumeric [lindex $args 1]] == 0 } {
-	    error "ERROR: expected numeric argument to setthreshold"
-	}
-	if {[syntaxNumeric [lindex $args 2]] == 0 } {
-	    error "ERROR: expected numeric argument to setthreshold"
-	}
-	return
-    }
-    default {
-	error "ERROR: subcommand $subcommand to counter not known"
-    }
-    }
-}
-#---------------------------------------------------------------------------
-# The syntax handler for SICS histogram memories
-#--------------------------------------------------------------------------
-lappend hmKey count countf interest uninterest init countblock clearbin
-lappend hmConf dim0 dim1 binwidth rank overflowmode histmode xfac yfac
-lappend hmConf xfrac yfrac hmcomputer hmport counter init 
-
-proc syntaxHM {name args} {
-    global hmKey hmConf sicsPar
-
-    set args [syntaxListify $args]
-    if { [llength $args] == 0} {
-	error [format "ERROR: subcommand expected to %s" $name]
-    }
-#--------- get command
-    set subcommand [string trim [string tolower [lindex $args 0]]]
-#------ test keyWords
-    if { [lsearch $hmKey $subcommand] >= 0} {
-	return
-    }
-    switch $subcommand {
-	preset {
-	    if { [llength $args] <2} {
-		return [syntaxGet $name.preset]
-	    } else {
-		if { [syntaxNumeric [lindex $args 1]] == 0} {
-		    error [format "ERROR: iexpected numeric preset, got : %s" \
-			    [lindex $args 1]]
-		}
-		set sicsPar($name.preset) [lindex $args 1]
-		return
-	    }
-	}
-	exponent {
-	    if { [llength $args] <2} {
-		return [syntaxGet $name.exponent]
-	    } else {
-		if { [syntaxNumeric [lindex $args 1]] == 0} {
-		    error [format "ERROR: expected numeric exponent, got : %s"\
-			    [lindex $args 1]]
-		}
-		set sicsPar($name.exponent) [lindex $args 1]
-		return
-	    }
-	}
-	countmode -
-	mode {
-	    if { [llength $args] <2} {
-		return [syntaxGet $name.mode]
-	    } else {
-		if { [syntaxCounterMode [lindex $args 1]] == 0} {
-		    error [format "ERROR: invalid counter mode: %s" \
-			    [lindex $args 1]]
-		}
-		set sicsPar($name.mode) [lindex $args 1]
-		return
-	    }
-	}
-	get -
-	uuget -
-	zipget {
-	    for { set i 1} { $i < [llength $args]} {incr i} {
-		if { [syntaxNumeric [lindex $args $i]] == 0} {
-		    error \
-	             [format "ERROR: expected numeric hm argument, got %s"\
-		     [lindex $args $i]]
- 
-		}
-	    }
-	    return
-	}
-	genbin {
-	    if { [llength $args] < 4 } {
-		error "ERROR: insufficient number of argument to hm genbin"
-	    } 
-	    for { set i 1} { $i < 4} { incr i} {
-		if { [syntaxNumeric [lindex $args $i]] == 0} {
-		    error \
-	             [format "ERROR: expected numeric hm argument, got %s"\
-		     [lindex $args $i]]
- 
-		}
-	    }
-	}
-	notimebin {
-	    return "$name.notimebin = 77"
-	}
-	timebin {
-	    return "histogram.timebins = 77 77 77 77 77 77"
-	}
-	setbin {
-	    if { [llength $args] < 3 } {
-		error "ERROR: insufficient number of argument to hm setbin"
-	    } 
-	    for { set i 1} { $i < 3} { incr i} {
-		if { [syntaxNumeric [lindex $args $i]] == 0} {
-		    error \
-	             [format "ERROR: expected numeric hm argument, got %s"\
-		     [lindex $args $i]]
- 
-		}
-	    }
-	}
-	sum {
-	    return
-	}
-	configure {
-	    if { [llength $args] < 2} {
-		error "ERROR: insufficient number of arguments to hm configure"
-	    }
-	    set opt [string trim [string tolower [lindex $args 1]]]
-	    if { [lsearch $hmConf $opt] < 0} {
-		error "ERROR: configuration option $opt not known"
-	    }
-	    return
-	}
-	default {
-	    error "ERROR: subcommand $subcommand to hm not known"
-	}
-    }
-}
-#-----------------------------------------------------------------------------
-# a syntax handler for environment controllers
-#-----------------------------------------------------------------------------
-lappend evKey send interest uninterest list
-lappend evPar tolerance access errorHandler interrupt upperlimit lowerlimit
-lappend evPar safevalue maxwait settle ramp
-
-proc evSyntax {name args} {
-    global sicsPar evKey evPar
-
-    set args [syntaxListify $args]
-#------ no subcommand: get value
-    if { [llength $args] == 0} {
-	return [syntaxGet $name]
-    } 
-    set subcommand [string trim [string tolower [lindex $args 0]]]
-#-------- numeric subcommand: drive!
-    if { [syntaxNumeric $subcommand] == 1} {
-	set sicsPar($name) $subcommand
-	return
-    }
-#--------- keywords
-    if { [lsearch $evKey $subcommand] >= 0} {
-	return
-    }
-#---------- parameters
-    if { [lsearch $evPar $subcommand] < 0} {
-	error [format "ERROR: evcontroller %s does not know subcommand %s" \
-		$name $subcommand]
-    } else {
-	if { [llength $args] > 1 } {
-	    set val [lindex $args 1]
-	    if { [syntaxNumeric $val] == 0 } {
-		error [format "ERROR: %s.%s expected number, received %s" \
-			$name $subcommand $val]
-	    } else {
-		set sicsPar($name.$subcommand) $val
-	    }
-	} else {
-	    return [syntaxGet $name.$subcommand]
-	}
-    }
-}
-#----------------------------------------------------------------------------
-# the syntax drive command
-#---------------------------------------------------------------------------
-proc syntaxDrive {name args} {
-    global sicsPar
-
-    set args [syntaxListify $args]
-    if { [llength $args] < 2 } {
-	error "insufficient number or arguments for $name"
-    }
-    for {set i 0} {$i < [llength $args]} {set i [expr $i + 2]} {
-	set ret [catch {info body [lindex $args $i]} msg]
-	if { $ret != 0 } {
-	    error [format "ERROR: no %s to %s found" $name [lindex $args $i]]
-	}
-	if { [syntaxNumeric [lindex $args [expr $i + 1]]] != 1 } {
-	    error [format "ERROR: expected numeric %s target, got %s" \
-		    $name [lindex $args [expr $i +1]]]
-	}
-	syntaxLimit [lindex $args $i] [lindex $args [expr $i + 1]]
-	set sicsPar([lindex $args $i]) [lindex $args [expr $i + 1]]
-    }
-}
-#--------------------------------------------------------------------------
-# The syntax count command
-#--------------------------------------------------------------------------
-proc count { {mode  NULL } { preset NULL } } {
-    set m [string trim [string tolower $mode]]
-    if { [string compare $m null] == 0} {
-	return
-    } else {
-	set c [string index $mode 0]
-	if { [regexp \[mc\] $c] != 1 } {
-	    error "ERROR: invalid counter mode $m specified for count"
-	}
-    }
-    set p [string trim [string tolower $preset]]
-    if { [string compare $p null] == 0} {
-	return
-    } else {
-	if {[syntaxNumeric $p] != 1 } {
-	    error "ERROR: count expected numeric preset, got $p"
-	}
-    }
-}
-#---------------------------------------------------------------------------
-# The co command, same syntax as count though functionally different
-#---------------------------------------------------------------------------
-proc co { {mode NULL} {prest NULL} } {
-    count $mode $prest
-}
-#---------------------------------------------------------------------------
-# the syntax repeat command
-#---------------------------------------------------------------------------
-proc repeat { num {mode  NULL} {preset NULL} }  {
-    if { [syntaxNumeric $num] != 1 } {
-	error "ERROR: expected numeric repeat count, got $num"
-    }
-    set m [string trim [string tolower $mode]]
-    if { [string compare $m null] == 0} {
-	return
-    } else {
-	set c [string index $mode 0]
-	if { [regexp \[mc\] $c] != 1 } {
-	    error "ERROR: invalid counter mode $m specified for count"
-	}
-    }
-    set p [string trim [string tolower $preset]]
-    if { [string compare $p null] == 0} {
-	return
-    } else {
-	if {[syntaxNumeric $p] != 1 } {
-	    error "ERROR: count expected numeric preset, got $p"
-	}
-    }
-}
-#----------------------------------------------------------------------------
-# The scan commands for the syntax checker
-#----------------------------------------------------------------------------
-proc cscan { var center delta np preset } {
-
-	set ret [catch {info body $var} msg]
-	if { $ret != 0 } {
-	    error [format "ERROR: no %s to scan found" $var]
-	}
-	if { [syntaxNumeric $center] != 1} {
-	    error "ERROR: $center is no number, expected scan center"
-	}
-	if { [syntaxNumeric $delta] != 1} {
-	    error "ERROR: $delta is no number, expected scan step"
-	}
-	if { [syntaxNumeric $np] != 1} {
-	    error "ERROR: $np is no number, expected scan noPoints"
-	}
-	if { [syntaxNumeric $preset] != 1} {
-	    error "ERROR: $preset is no number, expected scan preset"
-	}
-	set val [expr $center - ($np/2) *$delta]
-	syntaxLimit $var $val
-	set val [expr $center + ($np/2)*$delta]
-	syntaxLimit $var $val
-}
-#---------------------------------------------------------------------------
-proc sscan args {
-    set lang [llength $args]
-    if { $lang < 5} {
-	error "ERROR: not enough arguments to sscan"
-    }
-#-------- last two: np, preset
-    set val [lindex $args [expr $lang - 1]]
-    if { [syntaxNumeric $val] != 1} {
-	error "ERROR: expected numeric preset, got $val"
-    }
-    set val [lindex $args [expr $lang - 2]]
-    if { [syntaxNumeric $val] != 1} {
-	error "ERROR: expected numeric NP, got $val"
-    }
-    set np $val
-#-------- from start: var start step sequences
-    for {set i 0} { $i < [expr $lang - 2]} { set i [expr $i + 3]} {
-	set var [string trim [string tolower [lindex $args $i]]]
-	set ret [catch {info body $var} msg]
-	if { $ret != 0 } {
-	    error [format "ERROR: no %s to scan found" $var]
-	}
-	set start [lindex $args [expr $i + 1]]
-	if { [syntaxNumeric $start] != 1} {
-	    error "ERROR: $start is no number, expected scan start"
-	}
-	set step [lindex $args [expr $i + 2]]
-	if { [syntaxNumeric $step] != 1} {
-	    error "ERROR: $step is no number, expected scan step"
-	}
-	syntaxLimit $var $start
-	set val [expr $start + $np * $step]
-	syntaxLimit $var $val
-    }
-}
-#------------------------------------------------------------------------
-# The main scan object
-#------------------------------------------------------------------------
-proc scan args {
-    global sicsPar
-
-    if { [llength $args] < 1} {
-	error "ERROR: need subcommand for scan"
-    }
-    set subcommand [string trim [string tolower [lindex $args 0]]]
-    switch $subcommand {
-	info -
-	getvars -
-	xaxis -
-	cinterest -
-	uuinterest -
-	pinterest -
-	file -
-	list -
-	clear -
-	getcounts -
-	run -
-	recover -
-	forceclear {
-	    return
-	}
-	np -
-	preset -
-	setchannel {
-	    if { [llength $args] > 1} {
-		set val [lindex $args 1]
-		if { [syntaxNumeric $val] != 1} {
-		    error ERROR: expected numeric arg to $subcommand, got $val
-		}
-		set sicsPar(scan.$subcommand) $val
-	    } else {
-		return [syntaxGet scan.$subcommand]
-	    }
-	}
-	var {
-	    if { [llength $args] < 4} {
-		error "ERROR: not enough arguments for scan var"
-	    }
-	    set var [lindex $args 1]
-	    set ret [catch {info body $var} msg]
-	    if { $ret != 0 } {
-		error [format "ERROR: no %s to scan found" $var]
-	    }
-	    set val [lindex $args 2]
-	    if { [syntaxNumeric $val] != 1} {
-		error "ERROR: expected number for start, got $val"
-	    }
-	    set val [lindex $args 3]
-	    if { [syntaxNumeric $val] != 1} {
-		error "ERROR: expected number for step, got $val"
-	    }
-	}
-	mode {
-	    if { [llength $args] > 1} {
-		set val [lindex $args 1]
-		if { [syntaxCounterMode $val] != 1} {
-		    error ERROR: expected counter mode, got $val
-		}
-		set sicsPar(scan.mode) $val
-	    } else {
-		return [syntaxGet scan.mode]
-	    }
-	}
-	default {
-	    error "ERROR: subcommand $subcommand to scan not known"
-	}
-    }
-}
-#------------------------------------------------------------------------
-# optimiseSyntax: The syntax for the optimize command
-#-----------------------------------------------------------------------
-lappend optiPar maxcycles threshold channel preset
-
-proc optiSyntax {name args} {
-    global optiPar
- 
-    set args [syntaxListify $args]
-    if { [llength $args] < 1} {
-	error "ERROR: need subcommand for optimise"
-    }
-    set subcommand [string trim [string tolower [lindex $args 0]]]
-    if { [lsearch $optiPar $subcommand] >= 0} {
-	if { [llength $args] > 1 } {
-	    set val [lindex $args 1]
-	    if { [syntaxNumeric $val] == 0 } {
-		error [format "ERROR: %s.%s expected number, received %s" \
-			$name $subcommand $val]
-	    } else {
-		set sicsPar($name.$subcommand) $val
-		return
-	    }
-	} else {
-	    return [syntaxGet $name.$subcommand]
-	}
-    }
-    switch $subcommand {
-	addvar {
-	    if { [llength $args] < 5} {
-		error "ERROR: not enough arguments to addvar"
-	    }
-	    set var [string trim [string tolower [lindex $args 1]]]
-	    set ret [catch {info body $var} msg]
-	    if { $ret != 0 } {
-		error [format "ERROR: no %s to optimise found" $var]
-	    }
-	    for { set i 2} {$i < [llength $args]} {incr i} {
-		set val [lindex $args $i]
-		if { [syntaxNumeric $val] != 1} {
-		    error "ERROR: expected numeric par to opti, got $val"
-		}
-	    }
-	}
-	clear -
-	run { return}
-	countmode {
-	    if { [llength $args] > 1} {
-		set val [lindex $args 1]
-		if { [syntaxCounterMode $val] != 1} {
-		    error ERROR: expected counter mode, got $val
-		}
-		set sicsPar(opti.mode) $val
-	    } else {
-		return [syntaxGet opti.mode]
-	    }
-	}
-	default {
-	    error "ERROR: optimiser does not know about subcommand $subcommand"
-	}
-    }
-}
-#-------------------------------------------------------------------------
-# mumoSyntax: the syntax for SANS style multi motors
-# The aliases must be set in sicsPar(multimotorname.alias) during setup
-# in order for this to find them
-# Also sicsPar(multimotorname.nampos) has to be initialised to [list back] 
-#------------------------------------------------------------------------
-proc mumoSyntax {name args} {
-    global sicsPar
-
-    set args [syntaxListify $args]
-    if { [llength $args] == 0} {
-	return
-    }
-    set subcommand [string trim [string tolower [lindex $args 0]]]
-#---------check named position
-    if {[lsearch $sicsPar($name.nampos) $subcommand] >= 0} {
-	return
-    }
-    switch $subcommand {
-	list {
-	    return
-	}
-	pos -
-	recovernampos {
-	    if { [llength $args] < 2} {
-		error "ERROR: not enough args to $subcommand"
-	    }
-	    set nam [string trim [string tolower [lindex $args 1]]]
-	    if { [lsearch $sicsPar($name.nampos) $nam] < 0} {
-		lappend sicsPar($name.nampos) $nam 
-	    }
-	    return
-	}
-	drop {
-	    if { [llength $args] < 2} {
-		error "ERROR: not enough args to $subcommand"
-	    }
-	    set nam [string trim [string tolower [lindex $args 1]]]
-	    if { [string compare $name all] == 0} {
-		set sicsPar($name.nampos) [list back]
-	    } else {
-		set ind [lsearch $sicsPar($name.nampos) $nam]
-		if { $ind >= 0} {
-		    set sicsPar($name.nampos) \
-			    [lreplace $sicsPar($name.nampos) $ind $ind]
-		} else {
-		    puts stdout "INFO: failed to drop $nam"
-		}
-	    }
-	    return
-	}
-    }
-#------------------ now it can only be the alias syntax
-# but we have to wash away all =,+,- first before we can analyze it
-    set aliastxt [string trim [string tolower [join $args]]]
-    set word 1
-    set length [string length $aliastxt]
-    for {set i 0} { $i < $length} {incr i} {
-	set c [string index $aliastxt $i]
-	if { [regexp \[=+-\] $c] == 1} {
-#	    puts stdout "Discovered +=- $c" 
-	    if { $word == 1} {
-		append washedTxt " "
-		set word 0
-	    } 
-	    continue
-	}
-	if { [string match {\ } $c] == 1} {
-#	    puts stdout "Discovered white space $c"
-	    if { $word == 1} {
-		append washedTxt $c
-		set word 0
-	    } 
-	    continue
-	}
-#	puts stdout "Discovered $c"
-	append washedTxt $c
-	set word 1
-    }
-#    puts stdout $washedTxt
-#------- now we should have aliases followed by numbers only
-    set args [split $washedTxt]
-    for { set i 0} { $i < [llength $args]} { set i [expr $i +2]} {
-	set var [lindex $args $i]
-	if { [lsearch $sicsPar($name.alias) $var] < 0} {
-	    error "ERROR: alias $var does not exist in $name"
-	}
-	set val [lindex $args [expr $i + 1]]
-	if { [syntaxNumeric $val] != 1 } {
-	    error "ERROR expected numeric target, got $val"
-	}
-    }
-}
-#--------------------------------------------------------------------------
-# The wait operation
-#--------------------------------------------------------------------------
-proc wait {time} {
-    if { [syntaxNumeric $time] != 1} {
-	error "ERROR: expected numeric wait time, got $time"
-    }
-}
-#--------------------------------------------------------------------------
-# fileeval. Fileeval checks for loops in command
-# files. This is no error but a usage feature
-#--------------------------------------------------------------------------
-lappend fileList grrrmmmpffff
-
-proc fileeval {name} {
-    global fileList
-    set f [file tail $name]
-    if { [lsearch $fileList $f] >= 0} {
-	puts stdout "INFO: Command file loop detected!"
-	return
-    } else {
-	lappend fileList $f
-	source $name
-    }
-}
-#--------------------------------------------------------------------------
-# batchrun
-#--------------------------------------------------------------------------
-proc batchrun {name} {
-    global sicsPar
-    fileeval $sicspar(batchroot)/$name
-}
-#---------------------------------------------------------------------------
-# The sp command for setting zero points
-#--------------------------------------------------------------------------
-proc sp {axis value} {
-    set axis [string tolower [string trim $axis]]
-    set ret [catch {info body $axis]} msg]
-    if { $ret != 0 } {
-	error [format "ERROR: no %s to zero found" $axis]
-    }
-    if { [syntaxNumeric $value] != 1 } {
-	    error [format "ERROR: expected numeric zero target, got %s" \
-		    $name $value]
-    }
-}
-#--------------------------------------------------------------------------
-# The psdconfigure command 4 TRICS and AMOR
-#--------------------------------------------------------------------------
-proc psdconfigure {hm xSize ySize} {
-    set ret [catch {info body $hm} msg]
-    if { $ret != 0 } {
-	error [format "ERROR: $hm to configure not found!" $hm]
-    }
-    if { [syntaxNumeric $xSize] != 1 } {
-	error "ERROR: expected numeric xSize, got $xSize"
-    }
-    if { [syntaxNumeric $ySize] != 1 } {
-	error "ERROR: expected numeric ySize, got $ySize"
-    }
-} 
-#------------------------------------------------------------------------
-# The histogram memory control syntax
-#-----------------------------------------------------------------------
-proc hmcSyntax {name args} {
-    set args [syntaxListify $args]
-    if { [llength $args] < 2} {
-	error "ERROR: missing argumnets to $name"
-    }
-    set p [lindex $args 0]
-    if { [syntaxNumeric $p] != 1} {
-	error "ERROR: expected numeric preset for $name, got $p" 
-    } 
-    set p [string trim [string tolower [lindex $args 1]]]
-    if { [syntaxCountMode $p] != 1} {
-	error "ERROR: invalid count mode $p for $name" 
-    } 
-}
-#-------------------------------------------------------------------------
-# The syntax for the fourcircle calculation module
-#--------------------------------------------------------------------------
-lappend hklKey list current
-lappend hklPar lambda hm
-
-proc syntaxHKL {name args} {
-    global hklKey hklPar
-
-    set args [syntaxListify $args]
-
-    if { [llength $args] < 1} {
-	error "ERROR: no subcommand to $name"
-    }
-    set subcommand [string trim [string tolower [lindex $args 0]]]
-#-------- check keyword commands
-    if { [lsearch $hklKey $subcommand]  >= 0} {
-	return
-    }
-#-------- check parameter commands
-    if { [lsearch $hklPar $subcommand] >= 0} {
-	if { [llength $args] > 1 } {
-	    set val [lindex $args 1]
-	    if { [syntaxNumeric $val] == 0 } {
-		error [format "ERROR: %s.%s expected number, received %s" \
-			$name $subcommand $val]
-	    } else {
-		set sicsPar($name.$subcommand) $val
-	    }
-	} else {
-	    return [syntaxGet $name.$subcommand]
-	}
-    }
-#------------ check the rest
-    switch $subcommand {
-	calc -
-	drive -
-	run {
-	    if { [llength $args] < 4} {
-		error "ERROR: insufficient no args to $name calc,drive,run"
-	    }
-	    for { set i 1} { $i < [llength $args]} { incr i} {
-		set val [lindex $args $i]
-		if { [syntaxNumeric $val] != 1} {
-		    error "ERROR: expected numeric argument, got $val"
-		}
-	    } 
-	}
-	nb -
-	quadrant {
-	    if { [llength $args] < 2} {
-		error "ERROR: insufficient no args to $name nb, quadrant"
-	    }
-	    set val [lindex $args 1]
-	    if { [syntaxNumeric $val] != 1} {
-		error \
-		"ERROR: expected numeric argument ot nb, quadrant, got $val"
-	    }
-	}
-	setub {
-	    if { [llength $args] < 10 } {
-		error "ERROR: insufficient no args to $name setub"
-	    }
-	    for { set i 1} { $i < [llength $args]} { incr i} {
-		set val [lindex $args $i]
-		if { [syntaxNumeric $val] != 1} {
-		    error "ERROR: expected numeric argument, got $val"
-		}
-	    } 
-	}
-	default {
-	    error "ERROR: $name does not know subcomand $subcommand"
-	}
-    }
-}
-#---------------------------------------------------------------------------
-# syntax for xytables as used at SANS
-#---------------------------------------------------------------------------
-proc syntaxXY {name args} {
-    set args [syntaxListify $args]
-    if { [llength $args] < 1} {
-	error "ERROR: expected argument to $name"
-    }
-    set subcommand [string tolower [string trim [lindex $args 0]]]
-    switch $subcommand {
-	clear -
-	list -
-	uuget {return}
-	write {
-	    if { [llength $args] < 2} {
-		error "ERROR: missing file name for $name write"
-	    }
-	    return
-	}
-	add {
-	    if { [llength $args] < 3} {
-		error "ERROR: missing values for $name add"
-	    }
-	    for { set i 1} { $i < 3} {incr i} {
-		set val [string trim [lindex $args $i]]
-		if { [syntaxNumeric $val] != 1} {
-		    error "ERROR: expected numeric arg to $name add, got $val"
-		}
-	    }
-	}
-	default {
-	     error "ERROR: subcommand $subcommand to $name not recognized"
-	}
-    }
-}
-#---------------------------------------------------------------------------
-# Mappings for some common SICS commands and variables
-#---------------------------------------------------------------------------
-sicsSyntaxMap clientput syntaxDummy 
-sicsSyntaxMap ClientPut syntaxDummy 
-sicsSyntaxMap success   syntaxDummy
-sicsSyntaxMap drive     syntaxDrive
-sicsSyntaxMap run       syntaxDrive
-sicsSyntaxMap peak      syntaxDummy
-sicsSyntaxMap center    syntaxDummy
-sicsSyntaxMap batchroot syntaxTextPar
-sicsSyntaxMap sicstime  syntaxDummy
-
-
diff --git a/utils/check/topsicheck b/utils/check/topsicheck
deleted file mode 100755
index 57d98b5c..00000000
--- a/utils/check/topsicheck
+++ /dev/null
@@ -1,142 +0,0 @@
-#! /bin/sh
-#next line is executed by sh, not by Tcl \
-   exec tclsh $0 ${1+"$@"}
-#--------------------------------------------------------------------------
-# This is the SICS syntax checker for the TOPSI diffractometer
-#
-# Mark Koennecke, March 2003
-#--------------------------------------------------------------------------
-source /data/koenneck/src/sics/utils/check/sicssyntaxlib.tcl
-
-#------------------------- define TOPSI motors and aliases
-sicsSyntaxMap d1r       syntaxMotor
-sicsSyntaxMap d1l       syntaxMotor
-sicsSyntaxMap d2r       syntaxMotor
-sicsSyntaxMap d2l       syntaxMotor
-sicsSyntaxMap d3r       syntaxMotor
-sicsSyntaxMap d3l       syntaxMotor
-sicsSyntaxMap dxt       syntaxMotor
-sicsSyntaxMap dxb       syntaxMotor
-sicsSyntaxMap utz       syntaxMotor
-sicsSyntaxMap uty       syntaxMotor
-sicsSyntaxMap sth       syntaxMotor
-sicsSyntaxMap stt       syntaxMotor
-sicsSyntaxMap stx       syntaxMotor
-sicsSyntaxMap sty       syntaxMotor
-sicsSyntaxMap sgx       syntaxMotor
-sicsSyntaxMap sgy       syntaxMotor
-sicsSyntaxMap utt       syntaxMotor
-sicsSyntaxMap scx       syntaxMotor
-sicsSyntaxMap scy       syntaxMotor
-sicsSyntaxMap po1       syntaxMotor
-sicsSyntaxMap po2       syntaxMotor
-sicsSyntaxMap mth       syntaxMotor
-sicsSyntaxMap mtt       syntaxMotor
-sicsSyntaxMap mtx       syntaxMotor
-sicsSyntaxMap mty       syntaxMotor
-sicsSyntaxMap mgx       syntaxMotor
-sicsSyntaxMap mfv       syntaxMotor
-sicsSyntaxMap d1b       syntaxMotor
-sicsSyntaxMap d2b       syntaxMotor
-sicsSyntaxMap d3b       syntaxMotor
-sicsSyntaxMap d1t       syntaxMotor
-sicsSyntaxMap d2t       syntaxMotor
-sicsSyntaxMap d3t       syntaxMotor
-#------------ aliases
-sicsSyntaxMap s1r       syntaxMotor
-sicsSyntaxMap s1l       syntaxMotor
-sicsSyntaxMap s2r       syntaxMotor
-sicsSyntaxMap s2l       syntaxMotor
-sicsSyntaxMap s3r       syntaxMotor
-sicsSyntaxMap s3l       syntaxMotor
-sicsSyntaxMap a6        syntaxMotor
-sicsSyntaxMap a5        syntaxMotor
-sicsSyntaxMap a3        syntaxMotor
-sicsSyntaxMap som       syntaxMotor
-sicsSyntaxMap th        syntaxMotor
-sicsSyntaxMap om        syntaxMotor
-sicsSyntaxMap a4        syntaxMotor
-sicsSyntaxMap s2t       syntaxMotor
-sicsSyntaxMap tth       syntaxMotor
-sicsSyntaxMap 2t        syntaxMotor
-sicsSyntaxMap stu       syntaxMotor
-sicsSyntaxMap stl       syntaxMotor
-sicsSyntaxMap sgu       syntaxMotor
-sicsSyntaxMap sgl       syntaxMotor
-sicsSyntaxMap mgu       syntaxMotor
-sicsSyntaxMap sch       syntaxMotor
-sicsSyntaxMap sph       syntaxMotor
-sicsSyntaxMap pol       syntaxMotor
-sicsSyntaxMap ana       syntaxMotor
-sicsSyntaxMap a1        syntaxMotor
-sicsSyntaxMap mom       syntaxMotor
-sicsSyntaxMap a2        syntaxMotor
-sicsSyntaxMap m2t       syntaxMotor
-sicsSyntaxMap mtu       syntaxMotor
-sicsSyntaxMap mtl       syntaxMotor
-sicsSyntaxMap mcv       syntaxMotor
-sicsSyntaxMap sttl      syntaxMotor
-sicsSyntaxMap u2t       syntaxMotor
-
-#------------ define TOPSI counters
-sicsSyntaxMap counter syntaxCounter
-
-#------------ define TOPSI variables
-sicsSyntaxMap title        syntaxTextPar
-sicsSyntaxMap user         syntaxTextPar
-sicsSyntaxMap collimation  syntaxTextPar
-sicsSyntaxMap sample       syntaxTextPar
-sicsSyntaxMap comment1     syntaxTextPar
-sicsSyntaxMap comment2     syntaxTextPar
-sicsSyntaxMap comment3     syntaxTextPar
-sicsSyntaxMap fax          syntaxTextPar
-sicsSyntaxMap email        syntaxTextPar
-sicsSyntaxMap sample       syntaxTextPar
-sicsSyntaxMap lambda       syntaxNumPar
-
-#----------- define TOPSI environment
-sicsSyntaxMap temperature evSyntax
-sicsSyntaxMap tt          evSyntax
-
-#---------- define TOPSI auxiliary
-sicsSyntaxMap beam    syntaxDummy
-sicsSyntaxMap o2t     syntaxNumPar
-sicsSyntaxMap o2tl    syntaxNumPar
-sicsSyntaxMap o2u     syntaxNumPar
-sicsSyntaxMap ttc     syntaxTextPar
-sicsSyntaxMap sttc    syntaxTextPar
-sicsSyntaxMap sef     syntaxTextPar
-sicsSyntaxMap remote  syntaxTextPar
-
-#------------------------------------------------------------------------
-# some strange TOPSI commands with 3 numeric parameters
-#-----------------------------------------------------------------------
-proc dah {w1 w2 w3} {
-    if { [syntaxNumeric $w1] != 1 } {
-	error "ERROR: expected numeric w1, got $w1"
-    }
-    if { [syntaxNumeric $w2] != 1 } {
-	error "ERROR: expected numeric w2, got $w2"
-    }
-    if { [syntaxNumeric $w3] != 1 } {
-	error "ERROR: expected numeric w3, got $w3"
-    }
-}
-proc dav {w1 w2 w3} {
-    dah $w1 $w2 $w3
-}
-
-#--------- Main checking stuff
-
-if { $argc < 1} {
-	puts stdout "Usage: \n\ttopsicheck filename"
-	exit 0
-}
-set filename [lindex $argv 0]
-lappend fileList [file tail $filename]
-puts stdout "Syntax checking --> $filename <-- ........."
-source $filename
-puts stdout "If this completed without errors the likelihoof of your script"
-puts stdout "executing properly on the instrument has increased significantly"
-exit 1
- 
\ No newline at end of file
diff --git a/utils/check/tricscheck b/utils/check/tricscheck
deleted file mode 100755
index 884fd332..00000000
--- a/utils/check/tricscheck
+++ /dev/null
@@ -1,288 +0,0 @@
-#! /bin/sh
-#next line is executed by sh, not by Tcl \
-   exec tclsh $0 ${1+"$@"}
-#--------------------------------------------------------------------------
-# This is the SICS syntax checker for the TRICS 
-#
-# Mark Koennecke, March 2003
-#--------------------------------------------------------------------------
-source /data/koenneck/src/sics/utils/check/sicssyntaxlib.tcl
-
-#------------ define TRICS motors and aliases
-sicsSyntaxMap momu      syntaxMotor
-sicsSyntaxMap mtvu      syntaxMotor
-sicsSyntaxMap mtpu      syntaxMotor
-sicsSyntaxMap mgvu      syntaxMotor
-sicsSyntaxMap mgpu      syntaxMotor
-sicsSyntaxMap mcvu      syntaxMotor
-sicsSyntaxMap moml      syntaxMotor
-sicsSyntaxMap mtvl      syntaxMotor
-sicsSyntaxMap mtpl      syntaxMotor
-sicsSyntaxMap mgvl      syntaxMotor
-sicsSyntaxMap mcvl      syntaxMotor
-sicsSyntaxMap mexz      syntaxMotor
-sicsSyntaxMap cex1      syntaxMotor
-sicsSyntaxMap som       syntaxMotor
-sicsSyntaxMap stt       syntaxMotor
-sicsSyntaxMap sch       syntaxMotor
-sicsSyntaxMap sph       syntaxMotor
-sicsSyntaxMap dg1       syntaxMotor
-sicsSyntaxMap dg2       syntaxMotor
-sicsSyntaxMap dg3       syntaxMotor
-sicsSyntaxMap a17       syntaxMotor
-sicsSyntaxMap a18       syntaxMotor
-sicsSyntaxMap a1        syntaxMotor
-sicsSyntaxMap a12       syntaxMotor
-sicsSyntaxMap a13       syntaxMotor
-sicsSyntaxMap a14       syntaxMotor
-sicsSyntaxMap a15       syntaxMotor
-sicsSyntaxMap a16       syntaxMotor
-sicsSyntaxMap b1        syntaxMotor
-sicsSyntaxMap a22       syntaxMotor
-sicsSyntaxMap a23       syntaxMotor
-sicsSyntaxMap a24       syntaxMotor
-sicsSyntaxMap a25       syntaxMotor
-sicsSyntaxMap a26       syntaxMotor
-sicsSyntaxMap a37       syntaxMotor
-sicsSyntaxMap a3        syntaxMotor
-sicsSyntaxMap om        syntaxMotor
-sicsSyntaxMap a4        syntaxMotor
-sicsSyntaxMap th        syntaxMotor
-sicsSyntaxMap a10       syntaxMotor
-sicsSyntaxMap a20       syntaxMotor
-sicsSyntaxMap ch        syntaxMotor
-sicsSyntaxMap chi       syntaxMotor
-sicsSyntaxMap ph        syntaxMotor
-sicsSyntaxMap a31       syntaxMotor
-sicsSyntaxMap a32       syntaxMotor
-sicsSyntaxMap a33       syntaxMotor
-sicsSyntaxMap phi       syntaxMotor
-sicsSyntaxMap muca      syntaxMotor
-
-
-#------------ define TRICS counters
-sicsSyntaxMap counter syntaxCounter
-sicsSyntaxMap hm1     syntaxHM
-sicsSyntaxMap hm2     syntaxHM
-sicsSyntaxMap hm3     syntaxHM
-
-#------------ define TRICS variables 
-sicsSyntaxMap title        syntaxTextPar
-sicsSyntaxMap user         syntaxTextPar
-sicsSyntaxMap adres        syntaxTextPar 
-sicsSyntaxMap collimation  syntaxTextPar
-sicsSyntaxMap sample       syntaxTextPar
-sicsSyntaxMap comment1     syntaxTextPar
-sicsSyntaxMap comment2     syntaxTextPar
-sicsSyntaxMap comment3     syntaxTextPar
-sicsSyntaxMap fax          syntaxTextPar
-sicsSyntaxMap email        syntaxTextPar
-sicsSyntaxMap sample       syntaxTextPar
-
-#----------- define TRICS environment
-sicsSyntaxMap temperature evSyntax
-sicsSyntaxMap tt          evSyntax
-
-#---------- define TRICS auxiliary
-proc xbu {fname} {
- fileeval $fname
-}
-proc exe {fname} {
- fileeval $fname
-}
-proc do {fname} {
- fileeval $fname
-}
-sicsSyntaxMap o2t syntaxNumPar
-sicsSyntaxMap four syntaxTextPar
-sicsSyntaxMap hmc  hmcSyntax
-sicsSyntaxMap hkl  syntaxHKL
-sicsSyntaxMap opti optiSyntax
-sicsSyntaxMap rliste syntaxWarn
-
-#-------------------------------------------------------------------------
-# TRICS uses a couple of special scan commands with a special common
-# syntax. This is defined here.
-#-----------------------------------------------------------------------
-proc tttscan { var start delta np {mode NULL} {preset NULL} } {
-	if { [syntaxNumeric $start] != 1} {
-	    error "ERROR: $start is no number, expected scan start"
-	}
-	if { [syntaxNumeric $delta] != 1} {
-	    error "ERROR: $delta is no number, expected scan step"
-	}
-	if { [syntaxNumeric $np] != 1} {
-	    error "ERROR: $np is no number, expected scan noPoints"
-	}
-	if { [string compare $preset NULL] != 0 } {
-	    if { [syntaxNumeric $preset] != 1} {
-		error "ERROR: $preset is no number, expected scan preset"
-	    }
-	}
-	if { [string compare $mode NULL] != 0 } {
-	    set mode [string trim [string tolower $mode]]
-	    if { [syntaxCounterMode $mode] != 1} {
-		error "ERROR: $mode is no valid count mode!"
-	    }
-	}
-	syntaxLimit $var $start
-	syntaxLimit $var [expr $start + $np*$delta]
-}
-proc tricsscan {start step np {mode NULL} {preset NULL} } {
-    tttscan om $start $step $np $mode $preset
-}
-proc detscan {start step np {mode NULL} {preset NULL} } {
-    tttscan stt $start $step $np $mode $preset
-}
-proc phscan {start step np {mode NULL} {preset NULL} } {
-    tttscan ph $start $step $np $mode $preset
-}
-#----------------------------------------------------------------------
-# psdrefscan syntax. I wonder if anyone is using this........
-#-----------------------------------------------------------------------
-proc psdrefscan {filename step {mode NULL} {preset NULL}} {
-	if { [syntaxNumeric $step] != 1} {
-	    error "ERROR: $step is no number, expected scan step"
-	}
-	if { [syntaxNumeric $np] != 1} {
-	    error "ERROR: $np is no number, expected scan noPoints"
-	}
-	if { [string compare $preset NULL] != 0 } {
-	    if { [syntaxNumeric $preset] != 1} {
-		error "ERROR: $preset is no number, expected scan preset"
-	    }
-	}
-	if { [string compare $mode NULL] != 0 } {
-	    set mode [string trim [string tolower $mode]]
-	    if { [syntaxCountMode $mode] != 1} {
-		error "ERROR: $mode is no valid count mode!"
-	    }
-	}
-}
-#----------------------------------------------------------------------
-# mess measures a whole file with reflections
-#----------------------------------------------------------------------
-lappend messKey start file nb bi close writereflection
-
-proc mess args {
-    global messKey sicsPar
-
-    if { [llength $args] < 1} {
-	error "ERROR: need subcommand to mess"
-    }
-    set subcommand [string trim [string tolower [lindex $args 0]]]
-    if { [lsearch $messKey $subcommand] >= 0} {
-	return
-    }
-    switch $subcommand {
-	preset -
-	np -
-	step -
-	compact {
-	    if { [llength $args] > 1} {
-		set val [lindex $args 1]
-		if { [syntaxNumeric $val] != 1} {
-		    error \
-                   "ERROR: expected numeric par to $subcommand, got $val"
-		}
-		set sicsPar(mess.$subcommand) $val
-	    } else {
-		return [syntaxGet mess.$subcommand] 
-	    }
-	}
-	mode -
-	countmode {
-	    if { [llength $args] > 1} {
-		set val [lindex $args 1]
-		if { [syntaxCounterMode $val] != 1} {
-		    error ERROR: expected counter mode, got $val
-		}
-		set sicsPar(mess.mode) $val
-	    } else {
-		return [syntaxGet mess.mode]
-	    }
-	}
-	reopen -
-	genlist -
-	measure {
-	    if { [llength $args] < 2} {
-		error "ERROR: no filename to process for $subcommand"
- 	    }
-	}
-	default {
-	    error "ERROR: subcommand $subcommand to mess not known"
-	}
-    }
-}
-#-------------------------------------------------------------------------
-# The local maximum search command
-#------------------------------------------------------------------------
-lappend lomaPar window threshold steepness cogwindow cogcontour
-
-proc lomax args {
-    global lomaPar sicsPar
-
-    if { [llength $args] < 1} {
-	error "ERROR: need subcommand to lomax"
-    }
-    set subcommand [string trim [string tolower [lindex $args 0]]]
-    if { [lsearch $lomaPar $subcommand] >= 0} {
-	if { [llength $args] > 1} {
-	    set val [lindex $args 1]
-	    if { [syntaxNumeric $val] != 1} {
-		error "ERROR: expected numeric arg to $subcommand, got $val"
-	    }
-	    set sicsPar(lomax.$subcommand) $val
-	} else {
-	    return [syntaxGet lomax.$subcommand]
-	}
-    }
-    switch $subcommand {
-	stat -
-	search {
-	    if { [llength $args] < 2} {
-		error "ERROR: need a hm to $subcommand"
-	    }
-	    set p [string trim [string tolower [lindex $args 1]]]
-	    set ret [catch {info body $p} msg]
-	    if { $ret != 0 } {
-		error [format "ERROR: no %s to $subcommand found" $p]
-	    }
-	}
-	cog {
-	    if { [llength $args] < 4} {
-		error "ERROR: not enough arguments to lomax cog"
- 	    }
-	    set p [string trim [string tolower [lindex $args 1]]]
-	    set ret [catch {info body $p} msg]
-	    if { $ret != 0 } {
-		error [format "ERROR: no %s to calc COG fromfound" $p]
-	    }
-	    for {set i 2} {$i < [llength $args]} {incr i} {
-		set val [lindex $args $i]
-		if { [syntaxNumeric $val] != 1} {
-		    error "ERROR: expected numeric par to cog, got $val"
-		}
- 	    }
-	}
-	default {
-	    error "ERROR: subcommand $subcommand to lomax not known"
-	}
-    }
-}
-#--------------------------- main program --------------------------------
-#syntaxLoadSICS amorstatus.tcl
-#puts stdout [array names sicsPar]
-
-if { $argc < 1} {
-	puts stdout "Usage: \n\ttricscheck filename"
-	exit 0
-}
-set filename [lindex $argv 0]
-lappend fileList [file tail $filename]
-puts stdout "Syntax checking --> $filename <-- ........."
-source $filename
-puts stdout "If this completed without errors the likelihoof of your script"
-puts stdout "executing properly on the instrument has increased significantly"
-exit 1
- 
diff --git a/utils/el734.c b/utils/el734.c
deleted file mode 100755
index 3f6e32bd..00000000
--- a/utils/el734.c
+++ /dev/null
@@ -1,2087 +0,0 @@
-#define	    ident	    "1A07"
-#define	    Active_Server   1
-#define	    Blink_On	    0
-
-#ifdef __DECC
-#pragma	    module	    EL734	ident
-#endif
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     SINQ Project				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Link_options - Here is the Linker Option File
-**!$!
-**!$! To build on LNSA09 ...
-**!$!   $  build_cc_select :== decc
-**!$!	$  import tasmad
-**!$!	$  def/job deltat_c_tlb sinq_c_tlb
-**!$!   $  bui ud0:[maden.motor]el734 debug
-**!$!
-**!$! To build on PSICL0 ...
-**!$!	$ build_cc_select :== decc
-**!$!	$ set default usr_scroot:[maden]
-**!$!	$ copy lnsa09::ud0:[maden.motor]el734.c     []
-**!$!	$ copy lnsa09::tasmad_disk:[mad.lib]sinq_dbg.olb []
-**!$!	$ copy lnsa09::tasmad_disk:[mad.lib]sinq_c.tlb []
-**!$!	$ def/job sinq_olb   usr_scroot:[maden]sinq_dbg.olb
-**!$!	$ def/job sinq_c_tlb usr_scroot:[maden]sinq_c.tlb
-**!$!	$ def/job deltat_c_tlb sinq_c_tlb
-**!$!	$ bui el734 debug
-**!$!
-**!$	if p1 .eqs. "DEBUG" then dbg1 := /debug
-**!$	if p1 .eqs. "DEBUG" then dbg2 := _dbg
-**!$	link 'dbg1'/exe=cpt:[exe]el734'dbg2'.exe sys$input/options
-**!	    el734
-**!	    sinq_olb/lib
-**!	    sys$share:decw$xmlibshr12.exe/share
-**!	    sys$share:decw$xtlibshrr5.exe/share
-**!$	purge/nolog cpt:[exe]el734'dbg2'.exe
-**!$	exit
-**!$!
-** Link_options_end
-**
-**	Building on Alpha Digital Unix:
-**
-**	    setenv TAS_BASE ~maden/tasmad
-**	    source $TAS_BASE/tasmad.setup
-**	    rcp -p "lnsa09:tas_src:[utils]el734.c" \
-**			$TAS_SRC/utils/el734.c
-**	    cc -std -g -o $TAS_BIN/el734	    \
-**			-I$TAS_INC		    \
-**			$TAS_SRC/utils/el734.c	    \
-**			-L$TAS_LIB -lsinq -lXm -lXt -lX11
-**+
-** Resource File:	decw$user_defaults:SinQ_rc.dat
-** -------------     or $HOME/SinQ_rc
-**
-**	*el734Host:		Undefined     <-- the name of the server
-**	*el734Port:		4000	      <-- the port of the server
-**	*el734Chan:		0	      <-- the RS232C channel of EL734
-**	*el734Motor:		1	      <-- the motor number (1..12)
-**  plus
-**	EL734.msecPoll:	       1000	<-- 1.0 sec updates
-**	EL734.scaleWidth:	800	<-- scale width
-**---------------------------------------------------------------------------
-** Module Name  . . . . . . . . : [...MOTOR]EL734.C
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Nov 1994
-**
-** Purpose
-** =======
-**    EL734 is a test program for using with the SINQ VME/RS-232-C
-**    Motor Controller, EL734.
-**
-** Use:
-** ===
-**   1)	Ensure that EL734_SRV is running on the appropriate computer.
-**
-**   2)	Define a foreign command and the workstation where the display
-**	is to appear via the commands:
-**
-**	    $ motor :== $cpt:[exe]el734
-**	    $ set display /create /transport=tcpip /node=pswxxx
-**
-**   3) Check the resource file DECW$USER_DEFAULTS:SinQ_rc.dat on VMS or
-**			        $HOME/SinQ_rc on Digital-UNIX for the
-**	required resources (or specify them as flags - see below).
-**
-**   4)	Ensure that the Session Manager security is set up to allow windows
-**	to be created on one's workstation.
-**
-**   5)	Issue the command:	$ motor [-options]
-**
-**	Options are:			Equivalent Resource Name    Default
-**	-------				------------------------    -------
-**	    -host  <server-name>	 *el734Host		    None
-**	    -port  <port-number>	 *el734Port		    4000
-**	    -chan  <chan-number>	 *el734Chan		    None
-**	    -poll  <poll-delay-in-msec>	 EL734.msecPoll		    1000
-**	    -m     <motor-number>	 EL734.el734Motor	    None
-**	    -scale <width>		 EL734.scaleWidth:	     800
-**	where
-**	    <motor-number> must be in the range 1 to 12. It is the motor which
-**			    will be controlled.
-**	    <width> specifies the width of the displayed scale in pixels.
-**
-**	If specified, a flag takes precedence over the resource file.
-**
-** Updates:
-**  1A01 20-Dec-1994 DM.	Initial version.
-**-
-**====================================================================
-*/
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <stdarg.h>
-#include    <netdb.h>
-#include    <errno.h>
-
-#ifdef	__VMS
-#include    <signal.h>
-#include    <unixio.h>
-#else
-#include    <unistd.h>
-#endif
-
-#include    <netinet/in.h>
-#include    <arpa/inet.h>
-#include    <math.h>
-#include    <sys/socket.h>
-
-#include <X11/Intrinsic.h>
-#include <Xm/Xm.h>
-#include <Xm/ArrowB.h>
-#include <Xm/CascadeB.h>
-#include <Xm/DrawnB.h>
-#include <Xm/Form.h>
-#include <Xm/Frame.h>
-#include <Xm/Label.h>
-#include <Xm/MainW.h>
-#include <Xm/PushB.h>
-#include <Xm/RowColumn.h>
-#include <Xm/PanedW.h>
-#include <Xm/Scale.h>
-#include <Xm/ScrolledW.h>
-#include <Xm/Separator.h>
-/*
-**--------------------------------------------------------------------------
-**			Define global structures and constants.
-*/
-#include    <sinq_prototypes.h>
-#include    <el734_def.h>
-#include    <rs232c_def.h>
-
-#define TMO	        50	/* Units are 0.1 secs */
-#define MAX_ARGS	20
-
-  enum	Menu_Type {CASCADE, PULL_DOWN, SEPARATOR};
-
-  enum CmndFmts   {ONE_INT, ONE_HEX, ONE_STRING, TWO_INT, TWO_STRING, NO_MORE};
-
-  typedef struct {
-    int   msec_timer;		    /* Poll rate in msec */
-    char* vme_motor_host;	    /* Name         of Motor Server */
-    int   vme_motor_port;	    /* Port  Number of Motor Server */
-    int   vme_motor_number;	    /* Motor Number of Interest */
-    int   v24_chan;		    /* Motor Number of Interest */
-    int   scale_width;		    /* Scale width */
-  } ApplicationData;
-/*
-**-------------------------------------------------------------
-**	Global Variables
-*/
-  ApplicationData AppData;
-
-  XtAppContext App_context;	/* application context;	*/
-
-  static XtResource	Resources[] = {
-       {"el734Host", "El734Host", XmRString, sizeof(String),
-			XtOffsetOf (ApplicationData, vme_motor_host),
-			XmRString, "Undefined"},
-       {"el734Port", "El734Port", XmRInt, sizeof(int),
-			XtOffsetOf (ApplicationData, vme_motor_port),
-			XmRImmediate, (XtPointer) 0},
-       {"el734Chan", "El734Chan", XmRInt, sizeof(int),
-			XtOffsetOf (ApplicationData, v24_chan),
-			XmRImmediate, (XtPointer) 0xffff},
-       {"el734Motor", "El734Motor", XmRInt, sizeof(int),
-			XtOffsetOf (ApplicationData, vme_motor_number),
-			XmRImmediate, (XtPointer) 0},
-       {"scaleWidth", "ScaleWidth", XmRInt, sizeof(int),
-			XtOffsetOf (ApplicationData, scale_width),
-			XmRImmediate, (XtPointer) 800},
-       {"msecPoll", "MsecPoll", XmRInt, sizeof(int),
-			XtOffsetOf (ApplicationData, msec_timer),
-			XmRImmediate, (XtPointer) 1000},
-  };
-  static XrmOptionDescRec	OpTable[] = {
-       {"-host",  ".el734Host",	    XrmoptionSepArg, (XPointer) NULL},
-       {"-port",  ".el734Port",	    XrmoptionSepArg, (XPointer) NULL},
-       {"-chan",  ".el734Chan",	    XrmoptionSepArg, (XPointer) NULL},
-       {"-m",	  ".el734Motor",    XrmoptionSepArg, (XPointer) NULL},
-       {"-motor", ".el734Motor",    XrmoptionSepArg, (XPointer) NULL},
-       {"-poll",  ".msecPoll",      XrmoptionSepArg, (XPointer) NULL},
-       {"-scale", ".scaleWidth",    XrmoptionSepArg, (XPointer) NULL},
-    };
-
-  static int		Motor;
-  static int		Scale_width;
-  static int		Msg_seq = 1234;
-
-  struct Motor_State	    Old_Mot_state;
-  struct Motor_State	    Mot_state;
-  struct RS__RespStruct	    Respon_buff;
-
-  int			Mot_factor;
-  float			Mot_pos_ist;
-  float			Mot_pos_soll;
-  float			Mot_inertia_tol;
-  float			Mot_ref_param;
-  float			Mot_null_pt;
-  float			Mot_lo_lim;
-  float			Mot_hi_lim;
-
-  float			Mot_scale_middle;
-  int			Mot_is_on_left;
-
-  int			Cnct_skt = 0;
-  char			Err_text[80];
-
-  Widget    Wtop_level;		/*  Top window	*/
-
-  Widget    Wquit_cascade;	/*  Quit   CascadeButton	*/
-  Widget    Wslct_cascade;	/*  Select CascadeButton	*/
-  Widget    Whelp_cascade;	/*  Help   CascadeButton	*/
-
-  Widget    Wupdt_button;	/*  Update   Push Button */
-  Widget    Wgo_button;		/*  Go	     Push Button */
-  Widget    Wstop_button;	/*  Stop     Push Button */
-
-  Widget    Wmot_cascade;	/*  Motor Selection CascadeButton */
-
-  Widget    Wlbl_state;		/*  Status Label */
-
-  Widget    Label_name;
-  Widget    Label_lo_lim;
-  Widget    Label_hi_lim;
-  Widget    Label_ist;
-  Widget    Label_soll;
-  Widget    Scale_soll;
-  Widget    Scale_ist;
-  Widget    Label_msr;
-  Widget    Label_ss;
-  Widget    Label_stats;
-  Widget    Label_fd;
-  Widget    Label_fm;
-  Widget    Label_d;
-  Widget    Label_e;
-  Widget    Label_f;
-  Widget    Label_g;
-  Widget    Label_j;
-  Widget    Label_k;
-  Widget    Label_l;
-  Widget    Label_m;
-  Widget    Label_q;
-  Widget    Label_t;
-  Widget    Label_w;
-  Widget    Label_v;
-  Widget    Label_out;
-  Widget    Label_in;
-  Widget    Label_z;
-  Widget    DrawnBut, DrawnButFrame;
-
-  int	    Scale_is_khz;
-  int	    Scale_max;
-  float	    Thresh_cntr_thresh;
-  float	    Thresh_cntr_rate;
-
-  int	    Nargs;		/* Argument list variables - these must ..  */
-  Arg	    Args[MAX_ARGS];	/* .. only be used as temporary variables.  */
-
-  enum CmndFmts   Cmnd_fmt[] = {
-			ONE_STRING, ONE_INT,    TWO_INT,    TWO_INT,
-			ONE_STRING, ONE_INT,    ONE_INT,    ONE_INT,
-			TWO_STRING, ONE_INT,	ONE_INT,    ONE_INT,
-			ONE_INT,    ONE_STRING,	ONE_INT,    ONE_STRING,
-			ONE_INT,    ONE_INT,	ONE_STRING, ONE_INT,
-			ONE_INT,    ONE_INT,	NO_MORE};
-
-  size_t    Offsets[] = {
-		    OffsetOf (struct Motor_State, name[0]),
-		    OffsetOf (struct Motor_State, dec_pt),
-		    OffsetOf (struct Motor_State, enc_factor[0]),
-		    OffsetOf (struct Motor_State, enc_factor[1]),
-		    OffsetOf (struct Motor_State, mot_factor[0]),
-		    OffsetOf (struct Motor_State, mot_factor[1]),
-		    OffsetOf (struct Motor_State, inertia_tol[0]),
-		    OffsetOf (struct Motor_State, ramp),
-		    OffsetOf (struct Motor_State, loop_mode),
-		    OffsetOf (struct Motor_State, slow_hz),
-		    OffsetOf (struct Motor_State, lims[0][0]),
-		    OffsetOf (struct Motor_State, lims[1][0]),
-		    OffsetOf (struct Motor_State, fast_hz),
-		    OffsetOf (struct Motor_State, ref_mode),
-		    OffsetOf (struct Motor_State, backlash),
-		    OffsetOf (struct Motor_State, pos_tol),
-		    OffsetOf (struct Motor_State, ref_param[0]),
-		    OffsetOf (struct Motor_State, is_sided),
-		    OffsetOf (struct Motor_State, null_pt[0]),
-		    OffsetOf (struct Motor_State, ac_par),
-		    OffsetOf (struct Motor_State, enc_circ),
-		    OffsetOf (struct Motor_State, set_real[0]),
-		    OffsetOf (struct Motor_State, ac_state),
-		    OffsetOf (struct Motor_State, out),
-		    OffsetOf (struct Motor_State, in)
-		    };
-/*
-**---------------------------------------------------------------------------
-**			DecodeFloats	- decode the fl. pt. strings.
-*/
-  int	DecodeFloats () {
-/*	=============
-*/
-    int		status, i;
-    static int	do_warn_dec_pt	 = True;
-    static int	do_warn_pos_real = True;
-    static int	do_warn_pos_set  = True;
-
-    status = True;	/* Assume all will be OK    */
-
-    if (sscanf (Mot_state.pos_real, "%f", &Mot_pos_ist) != 1)
-					status = False;
-    if (sscanf (Mot_state.inertia_tol, "%f", &Mot_inertia_tol) != 1)
-					status = False;
-    if (sscanf (Mot_state.lims[0], "%f", &Mot_lo_lim) != 1)
-					status = False;
-    if (sscanf (Mot_state.lims[1], "%f", &Mot_hi_lim) != 1)
-					status = False;
-    if (sscanf (Mot_state.ref_param, "%f", &Mot_ref_param) != 1)
-					status = False;
-    if (sscanf (Mot_state.null_pt, "%f", &Mot_null_pt) != 1)
-					status = False;
-    if (sscanf (Mot_state.set_real, "%f", &Mot_pos_soll) != 1)
-					status = False;
-    if (Mot_lo_lim > Mot_hi_lim) {
-      sscanf (Mot_state.lims[1], "%f", &Mot_lo_lim);
-      sscanf (Mot_state.lims[0], "%f", &Mot_hi_lim);
-    }
-    if ((Mot_pos_ist < Mot_lo_lim) || (Mot_hi_lim < Mot_pos_ist)) {
-      if (do_warn_pos_real) {
-        printf ("\007Warning -- actual position is outside low/high limits\n");
-        printf ("         Low/actual/high are %f, %f, %f.\n",
-			Mot_lo_lim, Mot_pos_ist, Mot_hi_lim);
-	Mot_pos_ist = (Mot_lo_lim + Mot_hi_lim)/2.0;
-        printf ("         Actual position will be displayed as %f.\n",
-			Mot_pos_ist);
-        do_warn_pos_real = False;
-      }
-    }else {
-      do_warn_pos_real = True;
-    }
-    if ((Mot_pos_soll < Mot_lo_lim) || (Mot_hi_lim < Mot_pos_soll)) {
-      if (do_warn_pos_set) {
-        printf ("\007Warning -- set position is outside low/high limits\n");
-        printf ("         Low/set/high are %f, %f, %f.\n",
-			Mot_lo_lim, Mot_pos_soll, Mot_hi_lim);
-	Mot_pos_soll = (Mot_lo_lim + Mot_hi_lim)/2.0;
-        printf ("         Set position will be displayed as %f.\n",
-			Mot_pos_soll);
-	do_warn_pos_set = False;
-      }
-    }else {
-      do_warn_pos_set = True;
-    }
-    if ((Mot_state.dec_pt < 0) || (6 < Mot_state.dec_pt)) {
-      if (do_warn_dec_pt) {
-        printf ("\007Warning -- number of decimal digits is invalid.\n");
-        printf ("         Low/value/high are %d, %d, %d.\n",
-			0, Mot_state.dec_pt, 6);
-	Mot_state.dec_pt = 2;
-        printf ("         A value of %d will be assumed.\n", Mot_state.dec_pt);
-	do_warn_dec_pt = False;
-      }
-    }else {
-      do_warn_dec_pt = True;
-    }
-    Mot_factor = 1;
-    for (i = 0; i < Mot_state.dec_pt; i++) Mot_factor = Mot_factor * 10;
-
-    return status;
-  }
-/*
-**---------------------------------------------------------------------------
-**			EncodeSS	- encode the SS flags into text.
-*/
-  void	EncodeSS (char *text, int ss) {
-/*	========
-*/
-    int	    len;
-
-    if (ss == 0) {
-      sprintf (text, "Flags, SS = 0");
-    }else if ((ss & ~(0x3f)) != 0) {
-      sprintf (text, "Flags, SS = ??");
-    }else {
-      sprintf (text, "Flags, SS = %#x ", ss);
-      if ((ss & 0x20) != 0) strcat (text, "LSX/");
-      if ((ss & 0x10) != 0) strcat (text, "LS2/");
-      if ((ss & 0x08) != 0) strcat (text, "LS1/");
-      if ((ss & 0x04) != 0) strcat (text, "STP/");
-      if ((ss & 0x02) != 0) strcat (text, "CCW/");
-      if ((ss & 0x01) != 0) strcat (text, "HLT/");
-      len = strlen (text);
-      text[len-1] = '\0';
-    }
-    return;
-  }
-/*
-**---------------------------------------------------------------------------
-**			EncodeMSR	- encode the MSR flags into text.
-*/
-  void	EncodeMSR (char *text,	int text_len,
-/*	=========
-*/				int msr,
-				int ored_msr,
-				int fp_cntr,
-				int fr_cntr) {
-    int	    len;
-    char    my_text[132];
-    char    my_text_0[32];
-
-    if (msr == 0) {
-      ored_msr = ored_msr & ~(MSR__BUSY);	    /* Zero "Busy" bit */
-      if (ored_msr == MSR__OK) {
-        StrJoin (text, text_len, "Status, MSR = Idle. Positioned OK.", "");
-      }else {
-        if ((ored_msr & MSR__OK) != 0) {
-          StrJoin (text, text_len, "Status, MSR = Idle. Positioned OK. ", "");
-        }else {
-          StrJoin (text, text_len, "Status, MSR = Idle. ", "");
-	}
-	if ((ored_msr & MSR__REF_OK) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Ref. Pos'n OK. ");
-	}
-	if ((ored_msr & MSR__LIM_ERR) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Limit Switch Problem. ");
-	}
-	if ((ored_msr & MSR__AC_FAIL) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Air-Cushion Error. ");
-	}
-	if ((ored_msr & MSR__REF_FAIL) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Ref. Pos'n Fail. ");
-	}
-	if ((ored_msr & MSR__POS_FAIL) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Pos'n Fail. ");
-	}
-	if ((ored_msr & MSR__POS_FAULT) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  if (fp_cntr == 1) {
-	    StrJoin (text, text_len, my_text, "1 Pos'n Fault. ");
-	  }else {
-	    sprintf (my_text_0, "%d Pos'n Faults. ", fp_cntr);
-	    StrJoin (text, text_len, my_text, my_text_0);
-	  }
-	}
-	if ((ored_msr & MSR__RUN_FAIL) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Run Fail. ");
-	}
-	if ((ored_msr & MSR__RUN_FAULT) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  if (fr_cntr == 1) {
-	    StrJoin (text, text_len, my_text, "1 Run Fault. ");
-	  }else {
-	    sprintf (my_text_0, "%d Run Faults. ", fr_cntr);
-	    StrJoin (text, text_len, my_text, my_text_0);
-	  }
-	}
-	if ((ored_msr & MSR__HALT) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Halt. ");
-	}
-	if ((ored_msr & MSR__HI_LIM) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Hit HiLim. ");
-	}
-	if ((ored_msr & MSR__LO_LIM) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Hit LoLim. ");
-	}
-	if ((ored_msr & MSR__STOPPED) != 0) {
-	  StrJoin (my_text, sizeof (my_text), text, "");
-	  StrJoin (text, text_len, my_text, "Stopped. ");
-	}
-      }
-    }else if ((msr & ~(0x2fff)) != 0) {
-      StrJoin (text, text_len, "Status, MSR = ??", "");
-    }else {
-      sprintf (my_text, "%#x ", msr);
-      StrJoin (text, text_len, "Status, MSR = ", my_text);
-      if ((msr & MSR__LIM_ERR) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Limit Switch Problem/");
-      }
-      if ((msr & MSR__AC_FAIL) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Air-Cushion Error/");
-      }
-      if ((msr & MSR__REF_FAIL) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Ref. Pos'n Fail/");
-      }
-      if ((msr & MSR__POS_FAIL) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Pos'n Fail/");
-      }
-      if ((msr & MSR__POS_FAULT) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Pos'n Fault/");
-      }
-      if ((msr & MSR__RUN_FAIL)	!= 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Run Fail/");
-      }
-      if ((msr & MSR__RUN_FAULT) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Run Fault/");
-      }
-      if ((msr & MSR__HALT) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Halt/");
-      }
-      if ((msr & MSR__HI_LIM) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Hit HiLim/");
-      }
-      if ((msr & MSR__LO_LIM) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Hit LoLim/");
-      }
-      if ((msr & MSR__STOPPED) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Stopped/");
-      }
-      if ((msr & MSR__REF_OK) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Ref. Pos'n OK/");
-      }
-      if ((msr & MSR__OK) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "OK/");
-      }
-      if ((msr & MSR__BUSY) != 0) {
-	StrJoin (my_text, sizeof (my_text), text, "");
-        StrJoin (text, text_len, my_text, "Busy/");
-      }
-      len = strlen (text);
-      text[len-1] = '\0';
-    }
-    return;
-  }
-/*
-**---------------------------------------------------------------------------
-**			ConnectToSrvr	- make connection to Motor Server
-*/
-  int	ConnectToSrvr (char *host, int port) {
-/*	=============
-*/
-    int	    status;
-    int	    my_cnct_skt;    /* Socket for connecting to Motor Srv */
-    struct sockaddr_in	lcl_sockname;
-    struct sockaddr_in	rmt_sockname;
-    int			rmt_inet_addr;
-    struct in_addr	*rmt_inet_addr_pntr;
-    int			rmt_port;
-    int			rmt_sockname_len;
-    int			i;
-    struct hostent	*rmt_hostent;
-
-#if Active_Server
-    rmt_hostent = gethostbyname (host);
-    if (rmt_hostent == NULL) FailInet ("Gethostbyname error.\n");
-    rmt_inet_addr_pntr = (struct in_addr *) rmt_hostent->h_addr_list[0];
-
-    rmt_port = port;
-/*
-**  	    Create a TCP/IP socket for connecting to root and bind it.
-*/
-    my_cnct_skt = socket (AF_INET, SOCK_STREAM, 0);
-    if (my_cnct_skt == -1) FailInet ("Socket error.\n");
-
-    lcl_sockname.sin_family = AF_INET;
-    lcl_sockname.sin_port   = htons (0);
-    lcl_sockname.sin_addr.s_addr = 0;
-    status = bind (my_cnct_skt, (struct sockaddr *) &lcl_sockname,
-					sizeof (lcl_sockname));
-    if (status == -1) FailInet ("Bind error.\n");
-/*
-**		Connect to Motor Server.
-*/
-    rmt_sockname_len = sizeof (rmt_sockname);
-    rmt_sockname.sin_family	 = AF_INET;
-    rmt_sockname.sin_port	 = htons (rmt_port);
-    rmt_sockname.sin_addr.s_addr = rmt_inet_addr_pntr->s_addr;
-    status = connect (my_cnct_skt, (struct sockaddr *) &rmt_sockname,
-				    sizeof (rmt_sockname));
-    if (status == -1) {
-      FailInet ("Connect error.\n");
-    }
-    return my_cnct_skt;
-#else	/* Active_Server */
-    return 0;	/* "No server" mode - don't connect to server */
-#endif	/* Active_Server */
-  }
-/*
-**---------------------------------------------------------------------------
-**			ModifyLabel		- modify text of a simple label
-*/
-  void	 ModifyLabel (
-/*	 ===========
-*/		Widget		labl,	    /*  widget id of label */
-		char		*text) {    /*  The text for the label */
-
-    XmString	my_compString;
-
-    my_compString = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-    XtVaSetValues (labl,
-			XmNlabelString, my_compString,
-			NULL);
-    XmStringFree (my_compString);
-
-    return;
-  }
-/*
-**---------------------------------------------------------------------------
-**		    SetStateInWindows - update State fields in Windows to
-**					match state_ptr->msr, etc.
-*/
-  void	SetStateInWindows (
-/*	=================
-*/	    struct Motor_State	*old_state_ptr,	/* Motor status of display */
-	    struct Motor_State	*state_ptr) {	/* current motor status */
-
-    XmString	    tmp_cmpStr;
-    int		    i_left, i_right, i_ist, i_soll;
-    float	    flt;
-    char	    text[80];
-    static int	    state_len;
-	/*
-	** First time in, ensure that state_len is set to the length of
-	** the Motor_State structure which must be checked for changes.
-	*/
-    if (state_len == 0) state_len = sizeof (struct Motor_State);
-    if (memcmp (old_state_ptr, state_ptr, state_len) == 0) return;
-
-    if (strcmp (state_ptr->pos_real, old_state_ptr->pos_real) != 0) {
-      sscanf (state_ptr->pos_real, "%f", &flt);
-      i_left  = (int) (Mot_lo_lim * Mot_factor);
-      i_right = (int) (Mot_hi_lim * Mot_factor);
-      i_ist   = (int) (flt        * Mot_factor);
-		/*    
-		**      Update "Ist" scale slider
-		*/
-      if (i_ist < i_left)  i_ist = i_left;
-      if (i_ist > i_right) i_ist = i_right;
-      XmScaleSetValue (Scale_ist, i_ist);
-		/*    
-		**      Update "Ist" label
-		*/
-      sprintf (text, "%.*f", state_ptr->dec_pt, Mot_pos_ist);
-      ModifyLabel (Label_ist, text);
-      if (Mot_is_on_left) {
-	XtVaSetValues (Label_ist,
-	    XmNleftPosition, (i_ist - i_left), NULL);
-      }else {
-	XtVaSetValues (Label_ist,
-	    XmNrightPosition, (i_ist - i_left), NULL);
-      }
-    }
-
-    if (strcmp (state_ptr->set_real, old_state_ptr->set_real) != 0) {
-      sscanf (state_ptr->set_real, "%f", &flt);
-      i_left  = (int) (Mot_lo_lim * Mot_factor);
-      i_right = (int) (Mot_hi_lim * Mot_factor);
-      i_soll  = (int) (flt        * Mot_factor);
-		/*    
-		**      Update "Soll" scale slider
-		*/
-      if (i_soll < i_left)  i_soll = i_left;
-      if (i_soll > i_right) i_soll = i_right;
-      XmScaleSetValue (Scale_soll, i_soll);
-		/*    
-		**      Update "Soll" label
-		*/
-      sprintf (text, "%.*f", state_ptr->dec_pt, Mot_pos_soll);
-      ModifyLabel (Label_soll, text);
-      if (Mot_is_on_left) {
-	XtVaSetValues (Label_soll,
-	    XmNleftPosition, (i_soll - i_left), NULL);
-      }else {
-	XtVaSetValues (Label_soll,
-	    XmNrightPosition, (i_soll - i_left), NULL);
-      }
-    }
-		/*    
-		**      Update MSR label if necessary
-		*/
-    if (state_ptr->msr != old_state_ptr->msr) {
-      EncodeMSR (text, sizeof (text),	state_ptr->msr,
-					state_ptr->ored_msr,
-					state_ptr->fp_cntr,
-					state_ptr->fr_cntr);
-      ModifyLabel (Label_msr, text);
-    }
-		/*    
-		**      Update SS label if necessary
-		*/
-    if (state_ptr->ss != old_state_ptr->ss) {
-      EncodeSS (text, state_ptr->ss);
-      ModifyLabel (Label_ss, text);
-    }
-		/*    
-		**      Update Statistics label if necessary
-		*/
-    if ((state_ptr->stat_pos != old_state_ptr->stat_pos) ||
-	(state_ptr->stat_pos_flt != old_state_ptr->stat_pos_flt) ||
-	(state_ptr->stat_pos_fail != old_state_ptr->stat_pos_fail) ||
-	(state_ptr->stat_cush_fail != old_state_ptr->stat_cush_fail)) {
-      sprintf (text, "Statistics: Total/Faults/Fails/Cush-fails = %d/%d/%d/%d",
-			state_ptr->stat_pos,	 state_ptr->stat_pos_flt,
-			state_ptr->stat_pos_fail, state_ptr->stat_cush_fail);
-      ModifyLabel (Label_stats, text);
-    }
-		/*    
-		**      Update FD label if necessary
-		*/
-    if ((state_ptr->enc_factor[0] != old_state_ptr->enc_factor[0]) ||
-	(state_ptr->enc_factor[1] != old_state_ptr->enc_factor[1])) {
-      sprintf (text, "Encoder Ratio, FD = %d:%d", state_ptr->enc_factor[0],
-						  state_ptr->enc_factor[1]);
-      ModifyLabel (Label_fd, text);
-    }
-		/*    
-		**      Update FM label if necessary
-		*/
-    if ((state_ptr->mot_factor[0] != old_state_ptr->mot_factor[0]) ||
-	(state_ptr->mot_factor[1] != old_state_ptr->mot_factor[1])) {
-      sprintf (text, "Motor   Ratio, FM = %d:%d", state_ptr->mot_factor[0],
-						  state_ptr->mot_factor[1]);
-      ModifyLabel (Label_fm, text);
-    }
-		/*    
-		**      Update D label if necessary
-		*/
-    if (strcmp (state_ptr->inertia_tol, old_state_ptr->inertia_tol) != 0) {
-      sprintf (text, "Inertia tol'nce, D = %s", state_ptr->inertia_tol);
-      ModifyLabel (Label_d, text);
-    }
-		/*    
-		**      Update E label if necessary
-		*/
-    if (state_ptr->ramp != old_state_ptr->ramp) {
-      sprintf (text, "Start/stop ramp, E = %d", state_ptr->ramp);
-      ModifyLabel (Label_e, text);
-    }
-		/*    
-		**      Update F label if necessary
-		*/
-    if (state_ptr->loop_mode != old_state_ptr->loop_mode) {
-      switch (state_ptr->loop_mode) {
-       case 0:  sprintf (text, "Open loop mode, F = 0");	    break;
-       case 1:  sprintf (text, "Closed loop mode, F = 1");    break;
-       default: sprintf (text, "Bad loop mode, F = %d", state_ptr->loop_mode);
-      }
-      ModifyLabel (Label_f, text);
-    }
-		/*    
-		**      Update G label if necessary
-		*/
-    if (state_ptr->slow_hz != old_state_ptr->slow_hz) {
-      sprintf (text, "Start/stop  Hz, G = %d", state_ptr->slow_hz);
-      ModifyLabel (Label_g, text);
-    }
-		/*    
-		**      Update J label if necessary
-		*/
-    if (state_ptr->fast_hz != old_state_ptr->fast_hz) {
-      sprintf (text, "Positioning Hz, J = %d", state_ptr->fast_hz);
-      ModifyLabel (Label_j, text);
-    }
-		/*    
-		**      Update K label if necessary
-		*/
-    if (state_ptr->ref_mode != old_state_ptr->ref_mode) {
-      switch (state_ptr->ref_mode) {
-       case   0: sprintf (text, "Absolute encoder, K = 0"); break;
-       case   1: sprintf (text, "HiLimit is RefPt, K = 1"); break;
-       case  -1: sprintf (text, "LoLimit is RefPt, K = -1"); break;
-       case   2: sprintf (text, "Sep RefPt, K = 2"); break;
-       case  11: sprintf (text, "HiLimit is RefPt + Indx, K = 11"); break;
-       case -11: sprintf (text, "LoLimit is RefPt + Indx, K = -11"); break;
-       case  12: sprintf (text, "Sep RefPt + Indx, K = 12"); break;
-       default:  sprintf (text, "RefMode unknown, K = %d", state_ptr->ref_mode);
-      }
-      ModifyLabel (Label_k, text);
-    }
-		/*    
-		**      Update L label if necessary
-		*/
-    if (state_ptr->backlash != old_state_ptr->backlash) {
-      sprintf (text, "Backlash, L = %d", state_ptr->backlash);
-      ModifyLabel (Label_l, text);
-    }
-		/*    
-		**      Update M label if necessary
-		*/
-    if (state_ptr->pos_tol != old_state_ptr->pos_tol) {
-      sprintf (text, "Position Tol'nce, M = %d", state_ptr->pos_tol);
-      ModifyLabel (Label_m, text);
-    }
-		/*    
-		**      Update Q label if necessary
-		*/
-    if (strcmp (state_ptr->ref_param, old_state_ptr->ref_param) != 0) {
-      sprintf (text, "RefPt Width, Q = %s", state_ptr->ref_param);
-      ModifyLabel (Label_q, text);
-    }
-		/*    
-		**      Update T label if necessary
-		*/
-    if (state_ptr->is_sided != old_state_ptr->is_sided) {
-      if (state_ptr->is_sided == 0) {
-        sprintf (text, "No dir'n dependency, T = 0");
-      }else if (state_ptr->is_sided > 0) {
-        sprintf (text, "Position from above, T = %d", state_ptr->is_sided);
-      }else {
-        sprintf (text, "Position from below, T = %d", state_ptr->is_sided);
-      }
-      ModifyLabel (Label_t, text);
-    }
-		/*    
-		**      Update V label if necessary
-		*/
-    if (strcmp (state_ptr->null_pt, old_state_ptr->null_pt) != 0) {
-      sprintf (text, "NullPt, V = %s", state_ptr->null_pt);
-      ModifyLabel (Label_v, text);
-    }
-		/*    
-		**      Update W label if necessary
-		*/
-    if ((state_ptr->ac_par   != old_state_ptr->ac_par) ||
-	(state_ptr->ac_state != old_state_ptr->ac_state)) {
-      if (state_ptr->ac_par == 0) {
-        sprintf (text, "No air-cushion present, W = 0");
-      }else if (state_ptr->ac_par == Motor) {
-        if (state_ptr->ac_state == 0) {
-	  sprintf (text, "Air-cushion down");
-        }else {
-	  sprintf (text, "Air-cushion up");
-        }
-      }else {
-        if (state_ptr->ac_state == 0) {
-	  sprintf (text, "Air-cushion up (chained to %d)", state_ptr->ac_par);
-        }else {
-	  sprintf (text, "Air-cushion down (chained to %d)", state_ptr->ac_par);
-        }
-      }
-      ModifyLabel (Label_w, text);
-    }
-		/*    
-		**      Update Output label if necessary
-		*/
-    if (state_ptr->out != old_state_ptr->out) {
-      if (state_ptr->out == 0) {
-        sprintf (text, "Output signal not active", state_ptr->null_pt);
-      }else {
-        sprintf (text, "Output signal active", state_ptr->null_pt);
-      }
-      ModifyLabel (Label_out, text);
-    }
-		/*    
-		**      Update Input label if necessary
-		*/
-    if (state_ptr->in != old_state_ptr->in) {
-      if (state_ptr->in == 0) {
-        sprintf (text, "Input signal not present");
-      }else {
-        sprintf (text, "Input signal present");
-      }
-      ModifyLabel (Label_in, text);
-    }
-		/*    
-		**      Update Z label if necessary
-		*/
-    if (state_ptr->enc_circ != old_state_ptr->enc_circ) {
-      sprintf (text, "Enc Circum, Z = %d", state_ptr->enc_circ);
-      ModifyLabel (Label_z, text);
-    }
-		/*
-		*/
-    memcpy (old_state_ptr, state_ptr, state_len);
-  }
-/*
-**---------------------------------------------------------------------------
-**			SendCmndToServer   - send command to RS232C server
-*/
-  int	SendCmndToServer (
-/*	=================
-*/	    int			    v24_chan,	 /* RS232C port number	*/
-	    int			    tmo,	 /* Time-out (0.1 secs) */
-	    struct RS__RespStruct  *respon_ptr, /* Buffer for response */
-	    int			    respon_size, /* Size of resp'se buff */
-	    ...) {			/* Now we have parameter pairs -
-					**   char *fmt   = pntr to format strng
-					**   char *param = pntr to param
-					** Terminate list with *fmt = NULL.
-					*/
-    struct RS__MsgStruct    msg_buff;
-    int			    status, c_len, size, max_size, ncmnds;
-    char		    text[20];
-    va_list		    ap;		/* Pointer to variable args */
-    char		    *fmt_ptr;
-    char		    *param_ptr;
-    char		    *cmnd_lst_ptr;
-
-    if (Cnct_skt == 0) return True;	/* Do nothing if no connection - this
-					** allows testing in "client-only" mode.
-					*/
-
-    Msg_seq++;				/* Set up an incrementing message id */
-    if (Msg_seq > 9999) Msg_seq = 1;
-    sprintf (msg_buff.msg_id,	   "%04.4d", Msg_seq);
-
-    memcpy (msg_buff.c_pcol_lvl, RS__PROTOCOL_ID,
-					sizeof (msg_buff.c_pcol_lvl));
-    sprintf (msg_buff.serial_port, "%04.4d", v24_chan);
-    sprintf (msg_buff.tmo,	   "%04.4d", tmo);
-
-    memcpy (msg_buff.terms, "1\r\0\0", sizeof (msg_buff.terms));
-
-    memcpy (msg_buff.n_cmnds, "0000", sizeof (msg_buff.n_cmnds));
-
-    va_start (ap, respon_size);		/* Set up var arg machinery */
-
-    fmt_ptr = va_arg (ap, char *);	/* Get pntr to next format string */
-    ncmnds = 0;
-    cmnd_lst_ptr = &msg_buff.cmnds[0];
-
-    while (fmt_ptr != NULL) {
-      param_ptr = va_arg (ap, char *);	/* Get pntr to next param */
-      c_len = sprintf (cmnd_lst_ptr+2, fmt_ptr, param_ptr);
-      sprintf (text, "%02.2d", c_len);
-      memcpy (cmnd_lst_ptr, text, 2);
-      cmnd_lst_ptr = cmnd_lst_ptr + c_len + 2;
-      ncmnds++;
-      fmt_ptr = va_arg (ap, char *);
-    }
-    sprintf (text, "%04.4d", ncmnds);
-    memcpy (msg_buff.n_cmnds, text, sizeof (msg_buff.n_cmnds));
-
-    size = cmnd_lst_ptr - msg_buff.msg_id;
-    size = (size + 3) & (~3);	/* Round up to multiple of 4 */
-    sprintf (text, "%04.4d", size);
-    memcpy (msg_buff.msg_size, text, 4);
-
-    status = send (Cnct_skt, (char *) &msg_buff, size+4, 0);
-    if (status != (size+4)) {
-      sprintf (Err_text, "send: did not send all of buffer: %d %d.\n",
-			size+4, status);
-      FailInet (Err_text);
-    }
-
-    size = sizeof (respon_ptr->msg_size);
-    status = recv (Cnct_skt, respon_ptr->msg_size, size, 0);
-    if (status != size) {
-      sprintf (Err_text, "recv: did not get full byte count: %d %d.\n",
-					size, status);
-      FailInet (Err_text);
-      }
-    if (sscanf (respon_ptr->msg_size, "%4d", &size) != 1) {
-      sprintf (Err_text, "recv: byte count is not ASCII decimal: %4s\n",
-			respon_ptr->msg_size);
-      FailInet (Err_text);
-    }
-    max_size = respon_size - sizeof (respon_ptr->msg_size);
-    if (size > max_size) {
-      sprintf (Err_text, "recv: message length is too big: %d, %d.\n",
-		    max_size, size);
-      FailInet (Err_text);
-    }
-    status = recv (Cnct_skt, (char *) respon_ptr->msg_id, size, 0);
-    if (status != size) {
-      sprintf (Err_text, "recv: did not get all of expected data: %d %d.\n",
-			size, status);
-      FailInet (Err_text);
-    }
-    return status;
-  }
-/*
-**---------------------------------------------------------------------------
-**			GetReply    - get next reply from a reply buffer
-*/
-  struct RS__RplyStruct *GetReply (
-/*		         ========
-*/	    struct RS__RespStruct  *respon_ptr,  /* Structure to pull apart */
-	    struct RS__RplyStruct  *last_rply) { /* Starting point */
-
-    int			    rply_len;
-    struct RS__RplyStruct   *ptr;
-
-    static int		n_replies, max_replies;
-
-    ptr = NULL;
-    if (last_rply == NULL) {	/* Start with first reply? */
-      if (sscanf (respon_ptr->n_rply, "%4d", &max_replies) != 1)
-	    max_replies = 0;
-      if (max_replies > 0) ptr = (struct RS__RplyStruct *) respon_ptr->u.rplys;
-      n_replies = 1;
-    }else {
-      n_replies++;
-      if (n_replies <= max_replies) {
-        if (sscanf (last_rply->rply_len, "%2d", &rply_len) == 1) {
-	  ptr = (struct RS__RplyStruct *) ((char *) last_rply + rply_len + 2);
-	}
-      }
-    }
-    return ptr;
-  }
-/*
-**---------------------------------------------------------------------------
-**			GetMotorStatus	- get Motor status from srvr
-*/
-  int	GetMotorStatus (
-/*	================
-*/	    int type,			    /* FULL__STATUS or SHORT__STATUS */
-	    struct Motor_State  *state) {   /* Structure to hold status */
-
-    struct RS__MsgStruct    msg_buff;
-    int			    status, size, max_size;
-    int			    i, indx;
-    int			    j0, j1;
-    char		    txt0[16], txt1[16], mot_txt[10];
-    struct RS__RplyStruct   *rply_ptr;
-	/*
-	** Start by getting "short" status of motor.
-	*/
-#if Active_Server
-    sprintf (mot_txt, "%d", state->motor);
-    status = SendCmndToServer (AppData.v24_chan, TMO,
-				&Respon_buff, sizeof (Respon_buff),
-				"msr %s\r", mot_txt,
-				"ss %s\r",  mot_txt,
-				"u %s\r",   mot_txt,
-				"p %s\r",   mot_txt,
-				"sp %s\r",  mot_txt,
-				"st %s\r",  mot_txt,
-				"sr %s\r",  mot_txt,
-				"sa %s\r",  mot_txt,
-				NULL);
-    rply_ptr = GetReply (&Respon_buff, NULL);
-    if (rply_ptr != NULL) {
-      if (sscanf (rply_ptr->rply, "%x", &state->msr) == 1) {
-	state->exists = True;
-	state->ored_msr = state->ored_msr | state->msr;
-	if ((state->msr & MSR__POS_FAULT) != 0) state->fp_cntr++;
-	if ((state->msr & MSR__RUN_FAULT) != 0) state->fr_cntr++;
-	rply_ptr = GetReply (&Respon_buff, rply_ptr);
-	if (rply_ptr != NULL) {
-	  if (sscanf (rply_ptr->rply, "%x", &state->ss) != 1) state->ss = -1;
-	  rply_ptr = GetReply (&Respon_buff, rply_ptr);
-	  if (rply_ptr != NULL) {
-	    strncpy (state->pos_real, rply_ptr->rply,
-			    sizeof (state->pos_real) - 1);
-	    sscanf (state->pos_real, "%f", &Mot_pos_ist);
-	    rply_ptr = GetReply (&Respon_buff, rply_ptr);
-	    if (rply_ptr != NULL) {
-	      strncpy (state->set_real, rply_ptr->rply,
-			      sizeof (state->set_real) - 1);
-	      sscanf (state->set_real, "%f", &Mot_pos_soll);
-	      rply_ptr = GetReply (&Respon_buff, rply_ptr);
-	      if (rply_ptr != NULL) {
-		sscanf (rply_ptr->rply, "%d", &state->stat_pos);
-		rply_ptr = GetReply (&Respon_buff, rply_ptr);
-		if (rply_ptr != NULL) {
-		  sscanf (rply_ptr->rply, "%d", &state->stat_pos_flt);
-		  rply_ptr = GetReply (&Respon_buff, rply_ptr);
-		  if (rply_ptr != NULL) {
-		    sscanf (rply_ptr->rply, "%d", &state->stat_pos_fail);
-		    rply_ptr = GetReply (&Respon_buff, rply_ptr);
-		    if (rply_ptr != NULL) {
-		      sscanf (rply_ptr->rply, "%d", &state->stat_cush_fail);
-		      rply_ptr = GetReply (&Respon_buff, rply_ptr);
-	            }
-	          }
-	        }
-	      }
-	    }
-	  }
-	}
-      }else {
-	state->exists = False;
-      }
-    }
-    if ((type == FULL__STATUS) && state->exists) {
-      status = SendCmndToServer (AppData.v24_chan, TMO,
-				&Respon_buff, sizeof (Respon_buff),
-				"mn %s\r", mot_txt,
-				"a %s\r",  mot_txt,
-				"fd %s\r", mot_txt,
-				"fm %s\r", mot_txt,
-				"d %s\r",  mot_txt,
-				"e %s\r",  mot_txt,
-				"f %s\r",  mot_txt,
-				"g %s\r",  mot_txt,
-				"h %s\r",  mot_txt,
-				"j %s\r",  mot_txt,
-				"k %s\r",  mot_txt,
-				"l %s\r",  mot_txt,
-				"m %s\r",  mot_txt,
-				"q %s\r",  mot_txt,
-				"t %s\r",  mot_txt,
-				"v %s\r",  mot_txt,
-				"w %s\r",  mot_txt,
-				"z %s\r",  mot_txt,
-				"p %s\r",  mot_txt,
-				"ac %s\r", mot_txt,
-				"so %s\r", mot_txt,
-				"ri %s\r", mot_txt,
-				NULL);
-
-      rply_ptr = GetReply (&Respon_buff, NULL);
-      indx = 0;
-      for (i = 0; Cmnd_fmt[i] != NO_MORE; i++) {
-        if (rply_ptr != NULL) {
-	  switch (Cmnd_fmt[i]) {
-	   case ONE_INT:
-	    sscanf (rply_ptr->rply, "%d",
-			((char *) state) + Offsets[indx]);
-	    indx++;
-	    break;
-	   case TWO_INT:
-	    sscanf (rply_ptr->rply, "%d %d",
-			((char *) state) + Offsets[indx],
-			((char *) state) + Offsets[indx+1]);
-	    indx++; indx++;
-	    break;
-	   case ONE_STRING:
-	    sscanf (rply_ptr->rply, "%15s",
-			((char *) state) + Offsets[indx]);
-	    indx++;
-	    break;
-	   case TWO_STRING:
-	    sscanf (rply_ptr->rply, "%15s %15s",
-			((char *) state) + Offsets[indx],
-			((char *) state) + Offsets[indx+1]);
-	    indx++; indx++;
-	    break;
-	  }
-          rply_ptr = GetReply (&Respon_buff, rply_ptr);
-	}
-      }
-      DecodeFloats ();	    /* Convert all strings in state to binary	*/
-    }
-#else
-    state->exists = True;
-    state->msr = 1;
-    state->ss = 2;
-    strcpy (state->pos_real, "12.2");
-    state->pos_hex = 0x1234;
-    strcpy (state->name, "DELTA");
-    state->dec_pt = 3;
-    state->enc_factor[0] = 400;
-    state->enc_factor[1] = 2;
-    state->mot_factor[0] = -300;
-    state->mot_factor[1] = 3;
-    strcpy (state->inertia_tol, "0.1");
-    state->ramp = 20;
-    state->loop_mode = 1;
-    state->slow_hz = 300;
-    strcpy (&state->lims[0][0], "-50.0");
-    strcpy (&state->lims[1][0], "200.0");
-    state->fast_hz = 1000;
-    state->ref_mode = 2;
-    state->backlash = 0;
-    state->pos_tol = 1;
-    strcpy (state->ref_param, "10.0");
-    state->is_sided = 0;
-    strcpy (state->null_pt, "-15.0");
-    state->ac_par = state->motor;
-    state->enc_circ = 0;
-    state->stat_pos = 1234;
-    state->stat_pos_flt = 2345;
-    state->stat_pos_fail = 3456;
-    state->stat_cush_fail = 4567;
-    strcpy (state->set_real, "70.5");
-    state->set_hex = 0x4321;
-    state->ac_state = 0;
-    state->out = 0;
-    state->in = 0;
-#endif	/* Active_Server */
-    return True;
-  }
-/*
-
-**---------------------------------------------------------------------------
-**			ActivateCB		- callback for button
-*/
-  void	ActivateCB (
-/*	==========
-*/		Widget	    w,			/*  widget id	*/
-		XtPointer    client_data,	/*  data from application   */
-		XtPointer    call_data) {	/*  data from widget class  */
-
-    Widget	w_tmp;
-    char	*button_name, *parent_name;
-	    /*
-	    **	print message to prove we got activated
-	    */
-    w_tmp = XtParent (w);
-    button_name = XtName (w);
-    parent_name = XtName (w_tmp);
-
-    printf ("Push button \"%s\" of Parent \"%s\" selected.\n",
-		button_name, parent_name);
-  }
-/*
-**---------------------------------------------------------------------------
-**		MotorSelectCB	- callback for Select .../Motor .../Number
-*/
-  void	MotorSelectCB (
-/*	=============
-*/		Widget	    w,			/*  widget id	*/
-		XtPointer    client_data,	/*  data from application   */
-		XtPointer    call_data) {	/*  data from widget class  */
-
-    int		 motor = 0, i_left, i_right, i_soll, i_ist;
-    char	*button_name, text[80];
-    XmString	 tmp_cmpStr;
-	    /*
-	    **	print message to prove we got activated
-	    */
-    button_name = XtName (w);
-    printf ("Push button \"%s\" selected.\n", button_name);
-    if ((sscanf (button_name, "%i", &motor) != 1) ||
-	(motor <= 0) ||
-	(motor > 12)) {
-      printf ("Invalid push button label or motor number!\n");
-      return;
-    }
-    if (motor != Motor) {
-      Motor = motor;
-      Mot_state.motor = Motor;
-      printf ("Getting full status of Motor %d ...\n", Motor);
-      GetMotorStatus (FULL__STATUS, &Mot_state);
-
-      sprintf (text, "%.*f", Mot_state.dec_pt, Mot_lo_lim);
-      tmp_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-      XtVaSetValues (Label_lo_lim,
-			XmNlabelString, tmp_cmpStr,
-			NULL);
-      XmStringFree (tmp_cmpStr);
-
-      sprintf (text, "Motor %d \"%s\"", Motor, Mot_state.name);
-      tmp_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-      XtVaSetValues (Label_name,
-			XmNlabelString, tmp_cmpStr,
-			NULL);
-      XmStringFree (tmp_cmpStr);
-
-      sprintf (text, "%.*f", Mot_state.dec_pt, Mot_hi_lim);
-      tmp_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-      XtVaSetValues (Label_hi_lim,
-			XmNlabelString, tmp_cmpStr,
-			NULL);
-      XmStringFree (tmp_cmpStr);
-
-      i_left  = (int) (Mot_lo_lim   * Mot_factor);
-      i_right = (int) (Mot_hi_lim   * Mot_factor);
-      i_soll  = (int) (Mot_pos_soll * Mot_factor);
-      i_ist   = (int) (Mot_pos_ist  * Mot_factor);
-      if (i_ist  < i_left)  i_ist  = i_left;
-      if (i_ist  > i_right) i_ist  = i_right;
-      if (i_soll < i_left)  i_soll = i_left;
-      if (i_soll > i_right) i_soll = i_right;
-      XtVaSetValues (Scale_ist,
-			XmNminimum, i_left,
-			XmNmaximum, i_right,
-			XmNvalue,   i_ist,
-			NULL);
-      XtVaSetValues (Scale_soll,
-			XmNminimum, i_left,
-			XmNmaximum, i_right,
-			XmNvalue,   i_soll,
-			NULL);
-
-      SetStateInWindows (&Old_Mot_state, &Mot_state); /* Update window display. */
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**			AddMenuItem		- add item into menu
-*/
-  Widget AddMenuItem (
-/*	 ===========
-*/		Widget		parent,		/* The parent menu	    */
-		char		*name,		/* Name of menu item	    */
-		char		accelerator,	/* Accelerator character    */
-		int		menu_type,	/* Menu type		    */
-		Widget		casc_pane,    /* Pane to link to button ..
-					      ** .. (menu_type = CASCADE only */
-		XtCallbackProc	callback) {	/* Callback procedure	    */
-
-    Widget	my_menu_item;
-
-    Nargs = 0;
-    if (accelerator != 0)
-      XtSetArg (Args[Nargs], XmNmnemonic, accelerator);  Nargs++;
-    XtSetArg (Args[Nargs], XmNnavigationType, XmTAB_GROUP);  Nargs++;
-
-    switch (menu_type) {
-      case CASCADE:
-	XtSetArg (Args[Nargs], XmNsubMenuId, casc_pane);  Nargs++;
-        my_menu_item = XmCreateCascadeButton (parent, name, Args, Nargs);
-        break;
-      case PULL_DOWN:
-	my_menu_item = XmCreatePushButton (parent, name, Args, Nargs);
-        break;
-      case SEPARATOR:
-	my_menu_item = XmCreateSeparator (parent, NULL, Args, Nargs);
-        break;
-      default:
-        printf ("\007Illegal menu_type in call to AddMenuItem\n");
-    }
-    XtManageChild (my_menu_item);
-
-    if (callback != NULL)
-      XtAddCallback (my_menu_item, XmNactivateCallback, callback, NULL);
-
-    return my_menu_item;
-  }
-/*
-**---------------------------------------------------------------------------
-**			MakeLabel		- make a simple label
-*/
-  Widget MakeLabel (
-/*	 =========
-*/		Widget		w,	    /*  widget id of parent of label */
-		char		*text,	    /*  The text for the label */
-		unsigned char	align) {    /*  The alignment for the label */
-
-    Widget	my_label;
-    XmString	my_compString;
-
-    my_compString = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNlabelString, my_compString); Nargs++;
-    XtSetArg (Args[Nargs], XmNentryAlignment, align); Nargs++;
-    XtSetArg (Args[Nargs], XmNrecomputeSize, False); Nargs++;
-    my_label = XmCreateLabel (w, NULL, Args, Nargs);
-    XtManageChild (my_label);
-    XmStringFree (my_compString);
-
-    return my_label;
-  }
-/*
-**---------------------------------------------------------------------------
-**			QuitCB		- callback for quit button
-*/
-  void	QuitCB (
-/*	======
-*/		Widget	    w,			/*  widget id	*/
-		XtPointer    client_data,	/*  data from application   */
-		XtPointer    call_data) {	/*  data from widget class  */
-
-    char	buff[4];
-
-    if (Cnct_skt != 0) {
-      send (Cnct_skt, "-001", 4, 0);	/* Tell our TCP/IP server that ..
-					** .. we are about to quit.
-					*/
-      recv (Cnct_skt, buff, sizeof (buff), 0);	/* And wait for his ack */
-      close (Cnct_skt);
-    }
-    exit (True);	    /* Terminate the application. */
-  }
-/*
-**---------------------------------------------------------------------------
-**			SollCB		- callback for Soll-position Scale
-*/
-  void	SollCB (
-/*	======
-*/	    Widget		  w,		 /*  widget id	*/
-	    XtPointer		  client_data, 	 /*  data from application   */
-	    XmScaleCallbackStruct *call_data) {	 /*  data from widget class  */
-
-    int		status;
-    int		i_tmp;
-    float	f_tmp;
-    char	fmt[80];
-    char	text[80];
-    XmString	tmp_cmpStr;
-
-    f_tmp = ((float) call_data->value)/((float) Mot_factor);
-    sprintf (text, "%.*f", Mot_state.dec_pt, f_tmp);
-    tmp_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-    XtVaSetValues (Label_soll,
-			XmNlabelString, tmp_cmpStr,
-			NULL);
-    XmStringFree (tmp_cmpStr);
-
-    if (call_data->reason != XmCR_VALUE_CHANGED) {
-      XmUpdateDisplay (Wtop_level);
-      return;
-    }
-	    /*
-	    **	Adjust position of label to be near pointer. There is a
-	    **	complication if the position goes over the mid-point.
-	    */
-    i_tmp = call_data->value - (int) (Mot_lo_lim * Mot_factor);
-    if (((f_tmp < Mot_scale_middle) &&  Mot_is_on_left)  ||
-	((f_tmp > Mot_scale_middle) && !Mot_is_on_left)) {
-		    /*
-		    **	Get here if side has not changed.
-		    */
-      if (Mot_is_on_left) {
-	XtVaSetValues (Label_soll,
-			XmNleftPosition, i_tmp,
-			NULL);
-	XtVaSetValues (Label_ist,
-			XmNleftPosition, i_tmp,
-			NULL);
-      }else {
-	XtVaSetValues (Label_soll,
-			XmNrightPosition, i_tmp,
-			NULL);
-	XtVaSetValues (Label_ist,
-			XmNrightPosition, i_tmp,
-			NULL);
-      }
-    }else if (Mot_is_on_left) {
-		    /*
-		    **	Get here if side has changed from left to right.
-		    */
-      Mot_is_on_left = False;
-      XtVaSetValues (Label_soll,
-			XmNleftAttachment, XmATTACH_NONE,
-			XmNleftPosition, 0,
-			XmNrightAttachment, XmATTACH_POSITION,
-			XmNrightPosition, i_tmp,
-			NULL);
-      XtVaSetValues (Label_ist,
-			XmNleftAttachment, XmATTACH_NONE,
-			XmNleftPosition, 0,
-			XmNrightAttachment, XmATTACH_POSITION,
-			XmNrightPosition, i_tmp,
-			NULL);
-    }else {
-		    /*
-		    **	Get here if side has changed from right to left.
-		    */
-      Mot_is_on_left = True;
-      XtVaSetValues (Label_soll,
-			XmNleftAttachment, XmATTACH_POSITION,
-			XmNleftPosition, i_tmp,
-			XmNrightAttachment, XmATTACH_NONE,
-			XmNrightPosition, 0,
-			NULL);
-      XtVaSetValues (Label_ist,
-			XmNleftAttachment, XmATTACH_POSITION,
-			XmNleftPosition, i_tmp,
-			XmNrightAttachment, XmATTACH_NONE,
-			XmNrightPosition, 0,
-			NULL);
-    }
-    XmUpdateDisplay (Wtop_level);
-
-    Mot_state.ored_msr = 0;
-    Mot_state.fp_cntr  = 0;
-    Mot_state.fr_cntr  = 0;
-    sprintf (fmt, "p %d %%s\r", Motor);
-    status = SendCmndToServer (AppData.v24_chan, TMO,
-				&Respon_buff, sizeof (Respon_buff),
-				fmt, text,
-				NULL);
-  }
-/*
-**---------------------------------------------------------------------------
-**			TimerCB		- callback for timer
-*/
-  void	TimerCB (
-/*	=======
-*/		XtPointer	client_data,	/*  data from application   */
-		XtIntervalId	*id) {		/*  data from widget class  */
-
-    static int	    first = True;
-    static int	    blink = True;
-    static Display  *disp;
-    static Window   wind;
-    static GC	    gc;
-
-    GetMotorStatus (SHORT__STATUS, &Mot_state);
-    SetStateInWindows (&Old_Mot_state, &Mot_state); /* Update window display. */
-
-    if (AppData.msec_timer > 0) {
-      XtAppAddTimeOut (App_context, AppData.msec_timer, TimerCB, NULL);
-    }else {
-      printf ("\007EL734 -- status polling disabled.\n");
-    }
-#if  Blink_On	    /* This is just an exercise to do a bit of graphics!! */
-    if (first) {
-      first = False;
-      disp = XtDisplay (DrawnBut);
-      wind = XtWindow (DrawnBut);
-      gc   = DefaultGCOfScreen (XtScreen (DrawnBut));
-    }
-    if (blink) {
-      XFillArc (disp, wind, gc,
-		    10, 10, 50, 50, 0, 360*64);
-    }else {
-      XClearArea (disp, wind, 10, 10, 50, 50, False);
-    }
-    blink = !blink;
-#endif	/* Blink_On */
-  }
-/*
-**---------------------------------------------------------------------------
-**			CreateMenuBar - Create menu bar for main window.
-*/
-  Widget CreateMenuBar (Widget window) {
-/* 	 =============
-*/
-    Widget my_menu_bar;		/*  MenuBar		*/
-
-    Widget quit_menu_pane;	/*  Quit    MenuPane	*/
-    Widget slct_menu_pane;	/*  Select  MenuPane	*/
-    Widget help_menu_pane;	/*  Help    MenuPane	*/
-
-    Widget mot_menu_pane;	/*  Motor MenuPane	*/
-
-    Widget my_button;
-	    /*-------------------------------------------------------------
-	    **	Create MenuBar in MainWindow.
-	    */
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNadjustLast, True);  Nargs++;
-    my_menu_bar = XmCreateMenuBar (window, "menu_bar", Args, Nargs); 
-    XtManageChild (my_menu_bar);
-		/*---------------------------------------------------------
-		**    Create panes for the Menu Bar Pulldown Menus.
-		*/
-    Nargs = 0;
-    quit_menu_pane = XmCreatePulldownMenu (my_menu_bar, "Quit_Menu",
-								Args, Nargs);
-    slct_menu_pane = XmCreatePulldownMenu (my_menu_bar, "Select_Menu",
-								Args, Nargs);
-    help_menu_pane = XmCreatePulldownMenu (my_menu_bar, "Help_Menu",
-								Args, Nargs);
-
-    mot_menu_pane  = XmCreatePulldownMenu (slct_menu_pane, "Motor_Menu",
-						    Args, Nargs);
-		/*-------------------------------------------------------------
-		**	    Create buttons on menu bar and specify afterwards
-		**	    which one is the Help item.
-		*/
-    Wquit_cascade = AddMenuItem (my_menu_bar, "File",  'F',
-						CASCADE, quit_menu_pane, NULL);
-    Wslct_cascade = AddMenuItem (my_menu_bar, "Select", 'S',
-						CASCADE, slct_menu_pane, NULL);
-    Whelp_cascade = AddMenuItem (my_menu_bar, "Help",  'H',
-						CASCADE, help_menu_pane, NULL);
-
-    XtSetArg (Args[0], XmNmenuHelpWidget, Whelp_cascade);
-    XtSetValues (my_menu_bar, Args, 1);
-		/*---------------------------------------------------------
-		**    Put items into the menu bar menu panes. Start with Exit.
-		*/
-    AddMenuItem (quit_menu_pane,  "Quit/Finish", 'F', PULL_DOWN, NULL, QuitCB);
-		/*---------------------------------------------------------
-		**    Now do Select.
-		*/
-    Wmot_cascade = AddMenuItem (slct_menu_pane,
-			"Motor", 'M', CASCADE, mot_menu_pane, NULL);
-		/*---------------------------------------------------------
-		**    Now do Help.
-		*/
-    AddMenuItem (help_menu_pane, "Context-sensitive Help", 'C',
-						PULL_DOWN, NULL, ActivateCB);
-    AddMenuItem (help_menu_pane, NULL, '\0', SEPARATOR, NULL, NULL);
-    AddMenuItem (help_menu_pane, "Overview", 'O',
-						PULL_DOWN, NULL, ActivateCB);
-		/*---------------------------------------------------------
-		**    Now do Motor.
-		*/
-    AddMenuItem (mot_menu_pane, "1", '1', PULL_DOWN, NULL, MotorSelectCB);
-    AddMenuItem (mot_menu_pane, "2", '2', PULL_DOWN, NULL, MotorSelectCB);
-    AddMenuItem (mot_menu_pane, "3", '3', PULL_DOWN, NULL, MotorSelectCB);
-    AddMenuItem (mot_menu_pane, "4", '4', PULL_DOWN, NULL, MotorSelectCB);
-    AddMenuItem (mot_menu_pane, "5", '5', PULL_DOWN, NULL, MotorSelectCB);
-    AddMenuItem (mot_menu_pane, "6", '6', PULL_DOWN, NULL, MotorSelectCB);
-    AddMenuItem (mot_menu_pane, "7", '7', PULL_DOWN, NULL, MotorSelectCB);
-    AddMenuItem (mot_menu_pane, "8", '8', PULL_DOWN, NULL, MotorSelectCB);
-    AddMenuItem (mot_menu_pane, "9", '9', PULL_DOWN, NULL, MotorSelectCB);
-    AddMenuItem (mot_menu_pane, "10 (0x0a)", 'a', PULL_DOWN, NULL, MotorSelectCB);
-    AddMenuItem (mot_menu_pane, "11 (0x0b)", 'b', PULL_DOWN, NULL, MotorSelectCB);
-    AddMenuItem (mot_menu_pane, "12 (0x0c)", 'c', PULL_DOWN, NULL, MotorSelectCB);
-
-    return my_menu_bar;
-  }
-/*
-**---------------------------------------------------------------------------
-**			CreateApplication - set up main window. Return value
-**					    is main window widget.
-*/
-  Widget CreateApplication (Widget parent) {
-/*	 =================
-*/
-    Widget  main_window;	/*  MainWindow		*/
-    Widget  form_0;		/*  Form Widget		*/
-    Widget  rc_00;		/*  RowColumn Widget	*/
-    Widget  rc_01;		/*  RowColumn Widget	*/
-
-    XmString	    tmp_cmpStr;
-    char	    text[80];
-    int		    i_left, i_right, i_soll, i_ist;
-	    /*-------------------------------------------------------------*/
-    i_left	    = (int) (Mot_lo_lim   * Mot_factor);
-    i_right	    = (int) (Mot_hi_lim   * Mot_factor);
-    i_soll	    = (int) (Mot_pos_soll * Mot_factor);
-    i_ist	    = (int) (Mot_pos_ist  * Mot_factor);
-    Mot_scale_middle = (Mot_lo_lim + Mot_hi_lim)/2.0;
-    if (Mot_pos_soll < Mot_scale_middle) {
-      Mot_is_on_left = True;
-    }else {
-      Mot_is_on_left = False;
-    }
-	    /*-------------------------------------------------------------
-	    **	Create MainWindow.
-	    */
-    Nargs = 0;
-    main_window = XmCreateMainWindow (parent, "main_window", Args, Nargs);
-    XtManageChild (main_window);
-
-    CreateMenuBar (main_window);
-	    /*    
-	    **      Create Form Widget to hold the various items
-	    **	    in the Main Window
-	    */
-    Nargs = 0;
-    form_0 = XmCreateForm (main_window, "form_0", Args, Nargs);
-    XtVaSetValues (form_0,
-			XmNfractionBase, (i_right - i_left),
-			NULL);
-    XtManageChild (form_0);
-		/*    
-		**      Create label to show lower limit
-		*/
-    sprintf (text, "%.*f", Mot_state.dec_pt, Mot_lo_lim);
-    tmp_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNentryAlignment, XmALIGNMENT_BEGINNING); Nargs++;
-    XtSetArg (Args[Nargs], XmNlabelString, tmp_cmpStr); Nargs++;
-    XtSetArg (Args[Nargs], XmNrecomputeSize, True); Nargs++;
-    Label_lo_lim = XmCreateLabel (form_0, "Lo_Lim_Label", Args, Nargs);
-    XtManageChild (Label_lo_lim);
-    XmStringFree (tmp_cmpStr);
-		/*    
-		**      Create label to show motor number and name
-		*/
-    sprintf (text, "Motor %d \"%s\"", Motor, Mot_state.name);
-    tmp_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNentryAlignment, XmALIGNMENT_CENTER); Nargs++;
-    XtSetArg (Args[Nargs], XmNlabelString, tmp_cmpStr); Nargs++;
-    XtSetArg (Args[Nargs], XmNrecomputeSize, True); Nargs++;
-    Label_name = XmCreateLabel (form_0, "Name_Label", Args, Nargs);
-    XtManageChild (Label_name);
-    XmStringFree (tmp_cmpStr);
-		/*    
-		**      Create label to show upper limit
-		*/
-    sprintf (text, "%.*f", Mot_state.dec_pt, Mot_hi_lim);
-    tmp_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNentryAlignment, XmALIGNMENT_END); Nargs++;
-    XtSetArg (Args[Nargs], XmNlabelString, tmp_cmpStr); Nargs++;
-    XtSetArg (Args[Nargs], XmNrecomputeSize, True); Nargs++;
-    Label_hi_lim = XmCreateLabel (form_0, "Hi_Lim_Label", Args, Nargs);
-    XtManageChild (Label_hi_lim);
-    XmStringFree (tmp_cmpStr);
-	    /*    
-	    **      Create scales -- use resource value as dimension.
-	    */
-		/*    
-		**      Create label to show "Soll" position
-		*/
-    sprintf (text, "%.*f", Mot_state.dec_pt, Mot_pos_soll);
-    tmp_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNlabelString, tmp_cmpStr); Nargs++;
-    Label_soll = XmCreateLabel (form_0, "Soll_Label", Args, Nargs);
-    XtManageChild (Label_soll);
-    XmStringFree (tmp_cmpStr);
-		/*    
-		**      Create scales to show "Soll" and "Ist" positions
-		*/
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNdecimalPoints, Mot_state.dec_pt);  Nargs++;
-    XtSetArg (Args[Nargs], XmNminimum, i_left); Nargs++;
-    XtSetArg (Args[Nargs], XmNmaximum, i_right); Nargs++;
-    XtSetArg (Args[Nargs], XmNorientation, XmHORIZONTAL);  Nargs++;
-    XtSetArg (Args[Nargs], XmNscaleWidth, Scale_width);  Nargs++;
-
-    Scale_soll = XmCreateScale (form_0, "Soll_Scale", Args, Nargs);
-    XtManageChild (Scale_soll);
-
-    Scale_ist  = XmCreateScale (form_0, "Ist_Scale", Args, Nargs);
-    XtManageChild (Scale_ist);
-
-    XtVaSetValues (Scale_soll,
-			XmNvalue, i_soll,
-			XmNsensitive, True,
-			NULL);
-
-    XtVaSetValues (Scale_ist,
-			XmNvalue, i_ist,
-			XmNsensitive, False,
-			NULL);
-
-    XtAddCallback (Scale_soll, XmNdragCallback,
-				    (XtCallbackProc) SollCB, NULL);
-    XtAddCallback (Scale_soll, XmNvalueChangedCallback,
-				    (XtCallbackProc) SollCB, NULL);
-		/*    
-		**      Create label to show "Ist" position
-		*/
-    sprintf (text, "%.*f", Mot_state.dec_pt, Mot_pos_ist);
-    tmp_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNlabelString, tmp_cmpStr); Nargs++;
-    Label_ist = XmCreateLabel (form_0, "Ist_Label", Args, Nargs);
-    XtManageChild (Label_ist);
-    XmStringFree (tmp_cmpStr);
-	    /*    
-	    **      Create RowColumn widgets for status displays
-	    */
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNnumColumns, 1);  Nargs++;
-    XtSetArg (Args[Nargs], XmNpacking, XmPACK_COLUMN);  Nargs++;
-    XtSetArg (Args[Nargs], XmNorientation, XmVERTICAL);  Nargs++;
-    XtSetArg (Args[Nargs], XmNentryAlignment, XmALIGNMENT_BEGINNING); Nargs++;
-    rc_00 = XmCreateRowColumn (form_0, "RowCol_00", Args, Nargs);
-    XtManageChild (rc_00);
-
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNnumColumns, 3);  Nargs++;
-    XtSetArg (Args[Nargs], XmNpacking, XmPACK_COLUMN);  Nargs++;
-    XtSetArg (Args[Nargs], XmNorientation, XmVERTICAL);  Nargs++;
-    XtSetArg (Args[Nargs], XmNentryAlignment, XmALIGNMENT_BEGINNING); Nargs++;
-    rc_01 = XmCreateRowColumn (form_0, "RowCol_01", Args, Nargs);
-    XtManageChild (rc_01);
-	    /*
-	    **    create labels for RowColumn widgets
-	    */
-    EncodeMSR (text, sizeof (text), Mot_state.msr,
-				    Mot_state.ored_msr,
-				    Mot_state.fp_cntr,
-				    Mot_state.fr_cntr);
-    Label_msr = MakeLabel (rc_00, text, XmALIGNMENT_BEGINNING);
-
-    EncodeSS (text, Mot_state.ss);
-    Label_ss = MakeLabel (rc_00, text, XmALIGNMENT_BEGINNING);
-
-    sprintf (text, "Statistics: Total/Faults/Fails/Cush-fails = %d/%d/%d/%d",
-			Mot_state.stat_pos,	 Mot_state.stat_pos_flt,
-			Mot_state.stat_pos_fail, Mot_state.stat_cush_fail);
-    Label_stats = MakeLabel (rc_00, text, XmALIGNMENT_BEGINNING);
-
-    sprintf (text, "Encoder Ratio, FD = %d:%d", Mot_state.enc_factor[0],
-						Mot_state.enc_factor[1]);
-    Label_fd = MakeLabel (rc_01, text, XmALIGNMENT_BEGINNING);
-    sprintf (text, "Motor   Ratio, FM = %d:%d", Mot_state.mot_factor[0],
-						Mot_state.mot_factor[1]);
-    Label_fm = MakeLabel (rc_01, text, XmALIGNMENT_BEGINNING);
-    sprintf (text, "Inertia tol'nce, D = %s", Mot_state.inertia_tol);
-    Label_d = MakeLabel (rc_01, text, XmALIGNMENT_BEGINNING);
-    sprintf (text, "Start/stop ramp, E = %d", Mot_state.ramp);
-    Label_e = MakeLabel (rc_01, text, XmALIGNMENT_BEGINNING);
-    switch (Mot_state.loop_mode) {
-     case 0:  sprintf (text, "Open loop mode, F = 0");	    break;
-     case 1:  sprintf (text, "Closed loop mode, F = 1");    break;
-     default: sprintf (text, "Bad loop mode, F = %d", Mot_state.loop_mode);
-    }
-    Label_f = MakeLabel (rc_01, text, XmALIGNMENT_BEGINNING);
-    sprintf (text, "Start/stop  Hz, G = %d", Mot_state.slow_hz);
-    Label_g = MakeLabel (rc_01, text, XmALIGNMENT_BEGINNING);
-    sprintf (text, "Positioning Hz, J = %d", Mot_state.fast_hz);
-    Label_j = MakeLabel (rc_01, text, XmALIGNMENT_BEGINNING);
-    switch (Mot_state.ref_mode) {
-     case   0: sprintf (text, "Absolute encoder, K = 0"); break;
-     case   1: sprintf (text, "HiLimit is RefPt, K = 1"); break;
-     case  -1: sprintf (text, "LoLimit is RefPt, K = -1"); break;
-     case   2: sprintf (text, "Sep RefPt, K = 2"); break;
-     case  11: sprintf (text, "HiLimit is RefPt + Indx, K = 11"); break;
-     case -11: sprintf (text, "LoLimit is RefPt + Indx, K = -11"); break;
-     case  12: sprintf (text, "Sep RefPt + Indx, K = 12"); break;
-     default:  sprintf (text, "RefMode unknown, K = %d", Mot_state.ref_mode);
-    }
-    Label_k = MakeLabel (rc_01, text, XmALIGNMENT_BEGINNING);
-    sprintf (text, "Backlash, L = %d", Mot_state.backlash);
-    Label_l = MakeLabel (rc_01, text, XmALIGNMENT_BEGINNING);
-    sprintf (text, "Position Tol'nce, M = %d", Mot_state.pos_tol);
-    Label_m = MakeLabel (rc_01, text, XmALIGNMENT_BEGINNING);
-    sprintf (text, "RefPt Width, Q = %s", Mot_state.ref_param);
-    Label_q = MakeLabel (rc_01, text, XmALIGNMENT_BEGINNING);
-    if (Mot_state.is_sided == 0) {
-      sprintf (text, "No dir'n dependency, T = 0");
-    }else if (Mot_state.is_sided > 0) {
-      sprintf (text, "Position from above, T = %d", Mot_state.is_sided);
-    }else {
-      sprintf (text, "Position from below, T = %d", Mot_state.is_sided);
-    }
-    Label_t = MakeLabel (rc_01, text, XmALIGNMENT_BEGINNING);
-    sprintf (text, "NullPt, V = %s", Mot_state.null_pt);
-    Label_v = MakeLabel (rc_01, text, XmALIGNMENT_BEGINNING);
-    if (Mot_state.ac_par == 0) {
-      sprintf (text, "No air-cushion present, W = 0");
-    }else if (Mot_state.ac_par == Motor) {
-      if (Mot_state.ac_state == 0) {
-	sprintf (text, "Air-cushion down");
-      }else {
-	sprintf (text, "Air-cushion up");
-      }
-    }else {
-      if (Mot_state.ac_state == 0) {
-	sprintf (text, "Air-cushion up (chained to %d)", Mot_state.ac_par);
-      }else {
-	sprintf (text, "Air-cushion down (chained to %d)", Mot_state.ac_par);
-      }
-    }
-    Label_w = MakeLabel (rc_01, text, XmALIGNMENT_BEGINNING);
-    if (Mot_state.out == 0) {
-      sprintf (text, "Output signal not active", Mot_state.null_pt);
-    }else {
-      sprintf (text, "Output signal active", Mot_state.null_pt);
-    }
-    Label_out = MakeLabel (rc_01, text, XmALIGNMENT_BEGINNING);
-    if (Mot_state.in == 0) {
-      sprintf (text, "Input signal not present");
-    }else {
-      sprintf (text, "Input signal present");
-    }
-    Label_in = MakeLabel (rc_01, text, XmALIGNMENT_BEGINNING);
-    sprintf (text, "Enc Circum, Z = %d", Mot_state.enc_circ);
-    Label_z = MakeLabel (rc_01, text, XmALIGNMENT_BEGINNING);
-		/*    
-		**      Create DrawnButton in Frame for a bit of research
-		*/
-#if Blink_On
-    Nargs = 0;
-    DrawnButFrame = XmCreateFrame (form_0, "Button_Frame", Args, Nargs);
-    XtManageChild (DrawnButFrame);
-
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNminimum, i_left); Nargs++;
-    XtSetArg (Args[Nargs], XmNmaximum, i_right); Nargs++;
-    XtSetArg (Args[Nargs], XmNwidth, Scale_width/2);  Nargs++;
-    XtSetArg (Args[Nargs], XmNheight, 100);  Nargs++;
-    DrawnBut = XmCreateDrawnButton (DrawnButFrame, "Drawn_Button", Args, Nargs);
-    XtManageChild (DrawnBut);
-#endif	/* Blink_On */
-	    /*-------------------------------------------------------------
-	    **      Organise the components of the Main Form
-	    */
-    XtVaSetValues (Label_lo_lim,
-			XmNtopAttachment, XmATTACH_FORM,
-			XmNleftAttachment, XmATTACH_FORM,
-			NULL);
-
-    XtVaSetValues (Label_name,
-			XmNtopAttachment, XmATTACH_FORM,
-			XmNleftAttachment, XmATTACH_WIDGET,
-			XmNleftWidget, Label_lo_lim,
-			XmNrightAttachment, XmATTACH_WIDGET,
-			XmNrightWidget, Label_hi_lim,
-			NULL);
-
-    XtVaSetValues (Label_hi_lim,
-			XmNtopAttachment, XmATTACH_FORM,
-			XmNrightAttachment, XmATTACH_FORM,
-			NULL);
-
-    XtVaSetValues (Label_soll,
-			XmNtopAttachment, XmATTACH_WIDGET,
-			XmNtopWidget, Label_name,
-			NULL);
-    if (Mot_is_on_left) {
-      XtVaSetValues (Label_soll,
-			XmNleftAttachment, XmATTACH_POSITION,
-			XmNleftPosition, (i_soll - i_left),
-			NULL);
-    }else {
-      XtVaSetValues (Label_soll,
-			XmNrightAttachment, XmATTACH_POSITION,
-			XmNrightPosition, (i_soll - i_left),
-			NULL);
-    }
-
-    XtVaSetValues (Scale_soll,
-			XmNleftAttachment, XmATTACH_FORM,
-			XmNtopAttachment, XmATTACH_WIDGET,
-			XmNtopWidget, Label_soll,
-			NULL);
-
-    XtVaSetValues (Scale_ist,
-			XmNleftAttachment, XmATTACH_FORM,
-			XmNtopAttachment, XmATTACH_WIDGET,
-			XmNtopWidget, Scale_soll,
-			NULL);
-
-    XtVaSetValues (Label_ist,
-			XmNtopAttachment, XmATTACH_WIDGET,
-			XmNtopWidget, Scale_ist,
-			NULL);
-    if (Mot_is_on_left) {
-      XtVaSetValues (Label_ist,
-			XmNleftAttachment, XmATTACH_POSITION,
-			XmNleftPosition, (i_ist - i_left),
-			NULL);
-    }else {
-      XtVaSetValues (Label_ist,
-			XmNrightAttachment, XmATTACH_POSITION,
-			XmNrightPosition, (i_ist - i_left),
-			NULL);
-    }
-    XtVaSetValues (rc_00,
-			XmNleftAttachment, XmATTACH_FORM,
-			XmNtopAttachment, XmATTACH_WIDGET,
-			XmNtopWidget, Label_ist,
-			NULL);
-    XtVaSetValues (rc_01,
-			XmNleftAttachment, XmATTACH_FORM,
-			XmNtopAttachment, XmATTACH_WIDGET,
-			XmNtopWidget, rc_00,
-			NULL);
-#if Blink_On
-    XtVaSetValues (DrawnButFrame,
-			XmNleftAttachment, XmATTACH_FORM,
-			XmNtopAttachment, XmATTACH_WIDGET,
-			XmNtopWidget, Label_stats,
-			NULL);
-#endif	/* Blink_On */
-    return main_window;
-  }
-/*
-**==========================================================================
-**			Main line program
-**			------------------
-*/
-  int   main (int argc, char **argv) {
-/*      ============================
-*/
-    Widget		main_window;	/* MainWindow		*/
-    int			status, i;
-	/*-------------------------------------------------
-	**	Initialize Mot_state to rubbish.
-	*/
-    memset (&Mot_state, '%', sizeof (Mot_state));
-    Mot_state.motor		= Motor;
-    Mot_state.exists		= False;
-    Mot_state.ored_msr		= 0;
-    Mot_state.fp_cntr		= 0;
-    Mot_state.fr_cntr		= 0;
-    Mot_state.pos_real[15]	= '\0';
-    Mot_state.name[15]		= '\0';
-    Mot_state.inertia_tol[15]	= '\0';
-    Mot_state.lims[0][15]	= '\0';
-    Mot_state.lims[1][15]	= '\0';
-    Mot_state.ref_param[15]	= '\0';
-    Mot_state.null_pt[15]	= '\0';
-    Mot_state.set_real[15]	= '\0';
-    memcpy (&Old_Mot_state, &Mot_state, sizeof (Mot_state));
-	/*
-	**	Initialize toolkit and open the display.
-	*/
-    Wtop_level = XtAppInitialize (&App_context, "SinQ_rc",
-			    OpTable, XtNumber(OpTable),
-			    &argc, argv, NULL, NULL, 0);
-
-    XtGetApplicationResources (Wtop_level, (XtPointer) &AppData,
-                              Resources, XtNumber(Resources), NULL, 0);
-
-    printf ("Motor Client, Version %s\n\n", ident);
-
-    if (strcmp (AppData.vme_motor_host, "Undefined") == 0) {
-      printf ("   \"-host\" not specified!\n\n");
-      return EXIT_FAILURE;
-    }
-
-    if (AppData.v24_chan == 0xffff) {
-      printf ("   \"-chan\" not specified!\n\n");
-      return EXIT_FAILURE;
-    }else if ((AppData.v24_chan < 0) || (AppData.v24_chan > 15)) {
-      printf ("   \"-chan\" is illegal!\n\n");
-      return EXIT_FAILURE;
-    }
-
-    if ((AppData.vme_motor_number <= 0) || (AppData.vme_motor_number > 12)) {
-      printf ("   \"-motor\" not specified or illegal!\n\n");
-      return EXIT_FAILURE;
-    }
-
-    printf ("Motor Server        = \"%s\"\n",
-			AppData.vme_motor_host);
-
-    if (AppData.vme_motor_port == 0) {
-      AppData.vme_motor_port = 4000;
-      printf ("Default TCP/IP Port = %d\n", AppData.vme_motor_port);
-    }else {
-      printf ("TCP/IP Port         = %d\n", AppData.vme_motor_port);
-    }
-
-    printf ("RS-232-C channel    = %d\n", AppData.v24_chan);
-    printf ("Polling delay       = %d msec.\n", AppData.msec_timer);
-    Scale_width = AppData.scale_width;
-    printf ("Scale width         = %d pixels.\n\n", Scale_width);
-
-    Motor = AppData.vme_motor_number;
-    printf ("Motor number        = %d.\n\n", Motor);
-
-    printf ("Opening connection to Motor Server ...\n");
-    Cnct_skt = ConnectToSrvr (AppData.vme_motor_host,
-		     AppData.vme_motor_port);
-
-    Mot_state.motor = Motor;
-
-    printf ("Ensuring EL734 is in \"rmt 1\" mode ...\n");
-    status = SendCmndToServer (AppData.v24_chan, TMO,
-				&Respon_buff, sizeof (Respon_buff),
-				"rmt 1\r", NULL,
-				"rmt 1\r", NULL,
-				NULL);
-
-    printf ("Ensuring EL734 is in \"echo 0\" mode ...\n");
-    status = SendCmndToServer (AppData.v24_chan, TMO,
-				&Respon_buff, sizeof (Respon_buff),
-				"echo 0\r", NULL,
-				NULL);
-
-    printf ("Getting full status of Motor ...\n");
-    GetMotorStatus (FULL__STATUS, &Mot_state);
-    if (!Mot_state.exists) {
-      printf ("\007Selected motor is off-line.\n");
-      exit (False);
-    }
-    memcpy (&Old_Mot_state, &Mot_state, sizeof (Mot_state));
-    
-    main_window = CreateApplication (Wtop_level);
-	/*
-	**	Realize Widgets
-	*/
-    XtRealizeWidget (Wtop_level);
-	/*
-	**	Make a timer so that the display gets updated regularly.
-	*/
-    if (AppData.msec_timer > 0) {
-      XtAppAddTimeOut (App_context, AppData.msec_timer, TimerCB, NULL);
-    } else {
-      printf ("msecTimer = 0. Continuous status update disabled.\n");
-    }
-	/*
-	**	process events
-	*/
-    XtAppMainLoop (App_context);
-  }
-/*------------------------------------------------------ End of EL734.C */
diff --git a/utils/el734_test.c b/utils/el734_test.c
deleted file mode 100755
index 8885180a..00000000
--- a/utils/el734_test.c
+++ /dev/null
@@ -1,4133 +0,0 @@
-#define	    ident	    "1F01"
-#define	    Active_Motor   1
-
-#ifdef __DECC
-#pragma	    module	    EL734_TEST	ident
-#endif
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     SINQ Project				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Link_options - Here is the Linker Option File
-**!$!
-**!$! To build on LNSA09 ...
-**!$!   $  build_cc_select :== decc
-**!$!	$  import tasmad
-**!$!	$  def/job deltat_c_tlb sinq_c_tlb
-**!$!   $  bui tas_src:[utils]el734_test debug
-**!$!
-**!$! To build on PSICL0 ...
-**!$!	$ build_cc_select :== decc
-**!$!	$ set default usr_scroot:[maden]
-**!$!	$ copy lnsa09::ud0:[maden.motor]el734_test.c     []
-**!$!	$ copy lnsa09::tasmad_disk:[mad.lib]sinq_dbg.olb []
-**!$!	$ copy lnsa09::tasmad_disk:[mad.lib]sinq_c.tlb []
-**!$!	$ def/job sinq_olb   usr_scroot:[maden]sinq_dbg.olb
-**!$!	$ def/job sinq_c_tlb usr_scroot:[maden]sinq_c.tlb
-**!$!	$ def/job deltat_c_tlb sinq_c_tlb
-**!$!	$ bui el734_test debug
-**!$!
-**!$	if p1 .eqs. "DEBUG" then dbg1 := /debug
-**!$	if p1 .eqs. "DEBUG" then dbg2 := _dbg
-**!$	link 'dbg1'/exe=el734_test'dbg2'.exe sys$input/options
-**!	    el734_test
-**!	    mad_lib:sinq_dbg.olb/lib/include=(el734_errcodes,asynsrv_errcodes)
-**!	    sys$share:decw$xmlibshr12/share
-**!	    sys$share:decw$xtlibshrr5/share
-**!	    sys$share:decw$xlibshr/share
-**!$	purge/nolog el734_test'dbg2'.exe
-**!$	set prot=w:re el734_test'dbg2'.exe
-**!$	my_dir = f$element (0, "]", f$environment ("procedure")) + "]"
-**!$	write sys$output "Exec file is ''my_dir'EL734_TEST''DBG2'.EXE
-**!$	exit
-**!$!
-** Link_options_end
-**
-**	Building on Alpha Digital Unix:
-**
-**	    setenv TAS_BASE ~maden/tasmad
-**	    source $TAS_BASE/tasmad.setup
-**	    rcp -p "lnsa09:tas_src:[utils]el734_test.c" \
-**			$TAS_SRC/utils/el734_test.c
-**	    cc -std -g -o $TAS_BIN/el734_test	    \
-**			-I$TAS_INC		    \
-**			$TAS_SRC/utils/el734_test.c \
-**			-L$TAS_LIB -lsinq -lrt -lXm -lXt -lX11
-**
-** Resources and Flags	    File:	decw$user_defaults:SinQ_rc.dat
-** -------------------		    or	$HOME/SinQ_rc
-**
-**  Resource	    Flag    Default	    Description
-**  --------	    ----    -------	    -----------
-**  -		    -name   el734_test   Name to use when looking up the
-**					      resources. The default is the
-**					      image file name.
-**  ...
-**  A value given via -name will be converted to lowercase before being used.
-**+
-**---------------------------------------------------------------------------
-** Module Name  . . . . . . . . : [...MOTOR]EL734_TEST.C
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Nov 1995
-**
-** Purpose
-** =======
-**	EL734_TEST is a test program for the EL734 Motor Controller.
-** Use:
-** ===
-**  1) On VMS, define a foreign command, e.g.
-**
-**	    $ el734_test :== $psi_public:[exe_axp]el734_test.exe
-**
-**     On Unix systems, ensure el734_test is in a suitable PATH directory.
-**
-**  2) Issue commands of the form:
-**
-**	    el734_test -host lnsp22 -chan 5 -m 6 -p 25.0
-**
-**	where
-**	    -host specifies the name of the computer to which the EL734 is
-**			    attached. This computer must be running the
-**			    RS232C_SRV program or equivalent.
-**	    -chan specifies the serial channel number to which the EL734 is
-**			    attached.
-**	    -m	  specifies the motor number to be driven and
-**	    -p	  specifies that a positioning command is to be executed.
-**
-**	For a full list of options, issue the command:
-**
-**	    el734_test -help
-**
-** Updates:
-**  1A01 25-Nov-1994 DM.	Initial version.
-**  1C01 12-Sep-1996 DM.	Use SINQ.OLB and SINQ_C.TLB on VMS.
-**  1D01  6-Nov-1996 DM.	Add EC command to SAVE command list.
-**  1E01  8-May-1997 DM.	Add RESTORE and NO_RESTORE to LOAD command list.
-**  1F01 30-May-2000 DM.	Add DIFF command list.
-**-
-**====================================================================
-*/
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <signal.h>
-#include    <ctype.h>
-
-#include    <time.h>
-
-#ifdef  __VMS
-#include    <sys/unixio.h>
-#else
-#include    <unistd.h>
-#endif
-
-#include    <X11/Intrinsic.h>
-/*
-**====================================================================
-*/
-
-#include    <sinq_prototypes.h>
-#include    <el734_def.h>
-/*
-
-**--------------------------------------------------------------------------
-**			Define global structures and constants.
-*/
-#define NIL	'\0'
-#ifndef True
-#define True	1
-#define False	0
-#endif
-/*
-**		    Define the file idents for stdin, stdout and stderr
-*/
-#define	STDIN	0
-#define	STDOUT	1
-#define	STDERR	2
-
-#define	N_ELEMENTS(arg)	    (sizeof (arg)/sizeof (arg[0]))
-/*-------------------------------------------------------------
-**			Global Variables
-*/
-  static int	C_gbl_status;	    /*  Return status from C_... routines */
-  static int	Ctrl_C_has_happened;
-  void	       *Hndl = NULL;
-
-  static XrmOptionDescRec OpTable_0[] = {
-      {"-name",	    ".name",		XrmoptionSepArg, (XPointer) NULL},
-      {"-?",	    ".el734HelpItem",	XrmoptionSepArg, (XPointer) NULL},
-      {"-?cmd",	    ".el734HelpCmd",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-?msg",	    ".el734HelpMsg",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-?par",	    ".el734HelpPar",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-?res",	    ".el734HelpRes",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-chan",	    ".el734Chan",	XrmoptionSepArg, (XPointer) NULL},
-      {"-diff",	    ".el734Diff",	XrmoptionSepArg, (XPointer) NULL},
-      {"-f",	    ".el734Frequency",	XrmoptionSepArg, (XPointer) NULL},
-      {"-fb",	    ".el734Fb",		XrmoptionNoArg,	 (XPointer) "-1"},
-      {"-ff",	    ".el734Ff",		XrmoptionNoArg,	 (XPointer) "-1"},
-      {"-frequency",".el734Frequency",	XrmoptionSepArg, (XPointer) NULL},
-      {"-help",	    ".el734Help",	XrmoptionNoArg,	 (XPointer) "1"},
-      {"-hi",	    ".el734High",	XrmoptionSepArg, (XPointer) NULL},
-      {"-high",	    ".el734High",	XrmoptionSepArg, (XPointer) NULL},
-      {"-host",	    ".el734Host",	XrmoptionSepArg, (XPointer) NULL},
-      {"-hunt",	    ".el734Hunt",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-id",	    ".el734Id",		XrmoptionSepArg, (XPointer) NULL},
-      {"-limits",   ".el734Limits",	XrmoptionSepArg, (XPointer) NULL},
-      {"-lo",	    ".el734Low",	XrmoptionSepArg, (XPointer) NULL},
-      {"-load",	    ".el734Load",	XrmoptionSepArg, (XPointer) NULL},
-      {"-low",	    ".el734Low",	XrmoptionSepArg, (XPointer) NULL},
-      {"-m",	    ".el734Motor",	XrmoptionSepArg, (XPointer) NULL},
-      {"-motor",    ".el734Motor",	XrmoptionSepArg, (XPointer) NULL},
-      {"-n",	    ".el734N",		XrmoptionSepArg, (XPointer) NULL},
-      {"-p",	    ".el734Position",	XrmoptionSepArg, (XPointer) NULL},
-      {"-port",	    ".el734Port",	XrmoptionSepArg, (XPointer) NULL},
-      {"-position", ".el734Position",	XrmoptionSepArg, (XPointer) NULL},
-      {"-random",   ".el734Random",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-ref",	    ".el734Ref",	XrmoptionNoArg,	 (XPointer) "1"},
-      {"-rndm",	    ".el734Random",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-s",	    ".el734Stop",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-save",	    ".el734Save",	XrmoptionSepArg, (XPointer) NULL},
-      {"-saw",	    ".el734Saw",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-sb",	    ".el734Sb",		XrmoptionNoArg,	 (XPointer) "-1"},
-      {"-scan",	    ".el734Scan",	XrmoptionNoArg,  (XPointer) "-1"},
-      {"-seed",	    ".el734Seed",	XrmoptionSepArg, (XPointer) NULL},
-      {"-sf",	    ".el734Sf",		XrmoptionNoArg,	 (XPointer) "-1"},
-      {"-step",	    ".el734Step",	XrmoptionSepArg, (XPointer) NULL},
-      {"-stop",	    ".el734Stop",	XrmoptionNoArg,  (XPointer) "1"},
-      {"-tmo",	    ".el734Tmo",	XrmoptionSepArg, (XPointer) NULL},
-      {"-ur@",	    ".el734SetPos",	XrmoptionSepArg, (XPointer) NULL},
-      {"-v",	    ".el734Verbose",	XrmoptionSepArg, (XPointer) NULL},
-      {"-V",	    ".el734VeryVerbose",XrmoptionNoArg,  (XPointer) "1"},
-      {"-wait",	    ".el734Wait",	XrmoptionSepArg, (XPointer) NULL},
-    };
-  char		    El734_host[20];
-  int		    El734_port;		/* TCP/IP Port number for socket */
-  int		    El734_chan;		/* Asynch channel number */
-  char		    El734_id0[20];	/* The 1st EL734 identifier string */
-  char		    El734_id1[20];	/* The 2nd EL734 identifier string */
-  int		    Check_EL734_id;
-  int		    Motor;		/* Motor number */
-  int		    Enc_typ;
-  int		    Enc_num;
-  int		    Enc_par;
-  int		    N_moves;
-  float		    Lo_arg,	    Hi_arg;
-  int		    Lo_arg_present, Hi_arg_present;
-  int		    Do_help, Do_posit, Do_rndm, Do_saw, Do_scan, Do_step;
-  int		    Do_ref, Do_hunt, Do_ff, Do_fb, Do_sf, Do_sb, Do_stop;
-  int		    Do_save,  Do_load, Do_diff;
-  int		    Do_limits, Do_setpos;
-  float		    Lim_arg_lo,	Lim_arg_hi, Ist_arg;
-  float		    Tmo, Tmo_ref;
-  unsigned int	    Seed;
-  int		    Seed_present;
-  int		    Verbose;
-  int		    Very_verbose;
-  int		    Wait_time, Frequency;
-  float		    Soll_posit;
-  float		    Step;
-  char		    Save_file[80];
-  char		    Load_file[80];
-  char		    Diff_file[80];
-
-  int		    Dec_pt = 3;
-  int		    Enc_fact_0,	    Enc_fact_1;
-  int		    Mot_fact_0,	    Mot_fact_1;
-  float		    Inertia_tol;
-  int		    Ramp;
-  int		    Loop_mode;
-  int		    Slow_hz;
-  float		    Lo,		    Hi;
-  char		    Ctrl_id[32];
-  int		    Fast_hz;
-  int		    Ref_mode;
-  int		    Backlash;
-  int		    Pos_tol;
-  char		    Mot_mem[16];
-  char		    Mot_name[16];
-  float		    Ref_param;
-  int		    Is_sided;
-  int		    Null_pt;
-  int		    Ac_par;
-  int		    Enc_circ;
-  int		    Stat_pos;
-  int		    Stat_pos_flt;
-  int		    Stat_pos_fail;
-  int		    Stat_cush_fail;
-  float		    Ist_pos;
-  int		    Prop;
-  int		    Integ;
-  int		    Deriv;
-
-  char		    *Errstack;
-  int		    Errcode, Errno, Vaxc_errno;
-/*
-**--------------------------------------------------------------------------
-**		PrintErrInfo:  print out error information.
-*/
-  int	PrintErrInfo (char *text) {
-/*      ============
-*/
-
-    EL734_ErrInfo (&Errstack, &Errcode, &Errno, &Vaxc_errno);
-    fprintf (stderr, "\n\007"
-		" Error return from %s\n"
-		"  Errstack = \"%s\"\n"
-		"  Errcode = %d   Errno = %d   Vaxc$errno = %d\n",
-		text, Errstack, Errcode, Errno, Vaxc_errno);
-    switch (Errcode) {
-     case EL734__BAD_ADR:
-      fprintf (stderr, "  Address error\n"); break;
-     case EL734__BAD_CMD:
-      fprintf (stderr, "  Command error\n"); break;
-     case EL734__BAD_ILLG:
-      fprintf (stderr, "  Illegal response\n"); break;
-     case EL734__BAD_LOC:
-      fprintf (stderr, "  EL734 is in manual mode.\n"); break;
-     case EL734__BAD_MALLOC:
-      fprintf (stderr, "  Call to \"malloc\" failed\n"); perror (text); break;
-     case EL734__BAD_OFL:
-      fprintf (stderr, "  Connection to asynch port lost\n"); break;
-     case EL734__BAD_OVFL:
-      fprintf (stderr, "  Overflow: may be due to bad encoder gearing factor\n"); break;
-     case EL734__BAD_PAR:
-      fprintf (stderr, "  Illegal parameter specified\n"); break;
-     case EL734__BAD_RNG:
-      fprintf (stderr, "  Attempted to exceed lower or upper limit\n"); break;
-     case EL734__BAD_SOCKET:
-      fprintf (stderr, "  Call to \"AsynSrv_Open\" failed\n"); perror (text); break;
-     case EL734__BAD_STP:
-      fprintf (stderr, "  Motor is disabled: \"Stop\" signal is active!");
-      break;
-     case EL734__BAD_TMO:
-      fprintf (stderr, "  Time-out of EL734 response.\n");
-      break;
-     default: if ((Errno != 0) || (Vaxc_errno != 0)) perror (text);
-    }
-    return Errcode;
-  }
-/*
-**--------------------------------------------------------------------------
-**		GetKHVQZ:  read the K, H, V, Q and Zero-point parameters
-*/
-  int	GetKHVQZ (
-/*      ========
-*/		    int	    *k,
-		    float   *lo,
-		    float   *hi,
-		    int	    *v,
-		    float   *q,
-		    float   *z) {
-
-    int	    status;
-
-    status = EL734_GetRefMode (&Hndl, k);
-    if (!status) {
-      printf ("\n\007");
-      printf ("Bad status from EL734_GetRefMode.\n");
-      return False;
-    }
-
-    status = EL734_GetLimits (&Hndl, lo, hi);
-    if (!status) {
-      printf ("\n\007");
-      printf ("Bad status from EL734_GetLimits.\n");
-      return False;
-    }
-
-    status = EL734_GetNullPoint (&Hndl, v);
-    if (!status) {
-      printf ("\n\007");
-      printf ("Bad status from EL734_GetZeroPoint.\n");
-      return False;
-    }
-
-    status = EL734_GetRefParam (&Hndl, q);
-    if (!status) {
-      printf ("\n\007");
-      printf ("Bad status from EL734_GetRefParam.\n");
-      return False;
-    }
-
-    status = EL734_GetZeroPoint (&Hndl, z);
-    if (!status) {
-      printf ("\n\007");
-      printf ("Bad status from EL734_GetZeroPoint.\n");
-      return False;
-    }
-
-    return True;
-  }
-/*
-**---------------------------------------------------------------------------
-**		My_WaitIdle:  Wait till MSR goes to zero or <Ctrl-C>
-**				This routine is similar to EL734_WaitIdle
-**				with the extra verbose argument and a test
-**				for <Ctrl-C>.
-*/
-  int	My_WaitIdle (
-/*	===========
-*/		void	**handle,
-		int      verbose,	/* Width of <posit> display field */
-		int      *ored_msr,
-		int      *fp_cntr,
-		int      *fr_cntr,
-		float    *ist_posit) {
-#ifdef __VMS
-#include	<lib$routines.h>
-#define hibernate   lib$wait (0.25)
-#else
-#include    <unistd.h>
-#include    <time.h>
-    struct timespec	delay = {0, 250000000};
-    struct timespec	delay_left;
-#define hibernate   nanosleep_d9 (&delay, &delay_left)
-#endif
-    int			i, msr, ss, s_stat;
-    int			my_verbose;
-    float		last_posit;
-    char		buff[64];
-
-    my_verbose = verbose;
-    if (my_verbose*2 > sizeof (buff)) my_verbose = sizeof (buff)/2;
-    if (my_verbose > 0) {
-      s_stat = EL734_GetStatus (handle,
-		    &msr, ored_msr, fp_cntr, fr_cntr, &ss, ist_posit);
-      if (!s_stat) {
-	PrintErrInfo ("My_WaitIdle/EL734_GetStatus");
-	return False;
-      }
-      last_posit = *ist_posit;
-      sprintf (buff, "%*.*f", my_verbose, Dec_pt, last_posit);
-      printf (buff); fflush (NULL);
-      for (i=0; i<my_verbose; i++) buff[i] = '\010';  /* Pad with BS */
-    }
-    while (EL734_GetStatus (handle,
-		&msr, ored_msr, fp_cntr, fr_cntr, &ss, ist_posit)) {
-      if ((my_verbose > 0) && (*ist_posit != last_posit)) {
-	last_posit = *ist_posit;
-        sprintf (&buff[my_verbose], "%*.*f", my_verbose, Dec_pt, last_posit);
-	printf (buff); fflush (NULL);
-      }
-      if ((msr & MSR__BUSY) == 0) return True;
-      hibernate;
-      if (Ctrl_C_has_happened) return False;
-    }
-    PrintErrInfo ("My_WaitIdle/EL734_GetStatus");   /* Error detected in
-						    ** EL734_GetStatus */
-    return False;
-  }
-/*
-**--------------------------------------------------------------------------
-**		LoadCheckTwoInteger:  routine to check that a command specifying
-**				      two integers set correctly.
-*/
-  int	LoadCheckTwoInteger (char *cmnd) {
-/*      ===================
-*/
-    int	    status, len;
-    char    my_cmnd[80], rd_cmnd[40], buff[40];
-    char    *cmnd_tok, *motor_tok, *par0_tok, *par1_tok, *rd0_tok, *rd1_tok;
-
-    StrJoin (my_cmnd, sizeof (my_cmnd), cmnd, "");  /* Make a copy of cmnd */
-    len = strlen (my_cmnd);
-    if (my_cmnd[len-1] == '\r') my_cmnd[len-1] = NIL;
-
-    cmnd_tok  = strtok (my_cmnd, " ");
-    motor_tok = strtok (NULL, " ");
-    par0_tok = strtok (NULL, " ");
-    par1_tok = strtok (NULL, " ");
-    if ((cmnd_tok == NULL) || (motor_tok == NULL) ||
-	(par0_tok == NULL) || (par1_tok == NULL)) {
-      printf ("\007Software problem in LoadCheckTwoInteger\n");
-      return False;
-    }
-    StrJoin (buff, sizeof (buff), cmnd_tok, " ");
-    StrJoin (rd_cmnd, sizeof (rd_cmnd), buff, motor_tok);
-    len = strlen (rd_cmnd);
-    rd_cmnd[len]   = '\r';
-    rd_cmnd[len+1] = NIL;
-    status = EL734_SendCmnd (&Hndl, rd_cmnd, buff, sizeof (buff));
-    if (status) {
-      rd0_tok = strtok (buff, " ");
-      rd1_tok = strtok (NULL, " ");
-      if ((rd0_tok == NULL) ||
-	  (rd1_tok == NULL) ||
-	  (strcmp (par0_tok, rd0_tok) != 0) ||
-	  (strcmp (par1_tok, rd1_tok) != 0)) {
-	if (rd0_tok == NULL) rd0_tok = "";
-	if (rd1_tok == NULL) rd1_tok = "";
-	printf ("\007Verify error for command \"%s %s %s %s\"\n",
-			    cmnd_tok, motor_tok, par0_tok, par1_tok);
-	printf ("Values set in EL734 controller are \"%s %s\"\n"
-		  "                    They should be \"%s %s\"\n",
-			rd0_tok, rd1_tok, par0_tok, par1_tok);
-	return False;
-      }else {
-	return True;	    /* The parameter has been set correctly! */
-      }
-    }else {
-      printf ("\007LoadCheckTwoInteger -- error from EL734_SendCmnd\n");
-      printf ("Command being checked was \"%s %s %s %s\"\n",
-		    cmnd_tok, motor_tok, par0_tok, par1_tok);
-      return False;
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**		LoadCheckTwoFloat:  routine to check that a command specifying
-**				      two real values set correctly.
-*/
-  int	LoadCheckTwoFloat (char *cmnd, int n_dec) {
-/*      =================
-*/
-    int	    status, len;
-    char    my_cmnd[80], rd_cmnd[40], buff[40], par0[40], par1[40];
-    char    *cmnd_tok, *motor_tok, *par0_tok, *par1_tok, *rd0_tok, *rd1_tok;
-    char    *whole_tok, *frac_tok;
-
-    StrJoin (my_cmnd, sizeof (my_cmnd), cmnd, "");  /* Make a copy of cmnd */
-    len = strlen (my_cmnd);
-    if (my_cmnd[len-1] == '\r') my_cmnd[len-1] = NIL;
-
-    cmnd_tok  = strtok (my_cmnd, " ");
-    motor_tok = strtok (NULL, " ");
-    par0_tok = strtok (NULL, " ");
-    par1_tok = strtok (NULL, " ");
-    if ((cmnd_tok == NULL) || (motor_tok == NULL) ||
-	(par0_tok == NULL) || (par1_tok == NULL)) {
-      printf ("\007Software problem in LoadCheckTwoFloat\n");
-      return False;
-    }
-		/*---------------------------------------------------
-		** Check that the number of decimal places in the first set
-		** parameter agrees with the setting of the EL734.
-		*/
-    StrJoin (par0, sizeof (par0), par0_tok, "");
-    whole_tok = strtok (par0, ".");
-    frac_tok  = strtok (NULL, ".");
-    if (frac_tok == NULL) {	    /* Check for a decimal point */
-      len = strlen (whole_tok);	    /* None there, so put in a ".0" */
-      frac_tok = whole_tok + len + 1;
-      frac_tok[0] = '0';
-      frac_tok[1] = NIL;
-    }
-    len = strlen (frac_tok);
-    if (len > n_dec) {		/* Param has too many decimal places */
-				/* Try to remove trailing zeros */
-      while ((len >= 0) && (frac_tok[len-1] == '0')) {
-	len = len - 1;
-	frac_tok[len] = NIL;
-	if (len == n_dec) break;
-      }
-      if (len != n_dec) {
-	printf ("Don't expect the parameter to verify correctly.\n"
-		"You have specified too many decimal places!\n");
-      }
-    }else if (len < n_dec) {	/* Param has too few decimal places */
-      while (len < n_dec) {	/* Pad with zeros */
-	frac_tok[len] = '0';
-	len = len + 1;
-	frac_tok[len] = NIL;
-      }
-    }
-    len = strlen (whole_tok);	/* Re-join the parts of param again */
-    whole_tok[len] = '.';
-		/*---------------------------------------------------
-		** Check that the number of decimal places in the second set
-		** parameter agrees with the setting of the EL734.
-		*/
-    StrJoin (par1, sizeof (par1), par1_tok, "");
-    whole_tok = strtok (par1, ".");
-    frac_tok  = strtok (NULL, ".");
-    if (frac_tok == NULL) {	    /* Check for a decimal point */
-      len = strlen (whole_tok);	    /* None there, so put in a ".0" */
-      frac_tok = whole_tok + len + 1;
-      frac_tok[0] = '0';
-      frac_tok[1] = NIL;
-    }
-    len = strlen (frac_tok);
-    if (len > n_dec) {		/* Param has too many decimal places */
-				/* Try to remove trailing zeros */
-      while ((len >= 0) && (frac_tok[len-1] == '0')) {
-	len = len - 1;
-	frac_tok[len] = NIL;
-	if (len == n_dec) break;
-      }
-      if (len != n_dec) {
-	printf ("Don't expect the parameter to verify correctly.\n"
-		"You have specified too many decimal places!\n");
-      }
-    }else if (len < n_dec) {	/* Param has too few decimal places */
-      while (len < n_dec) {	/* Pad with zeros */
-	frac_tok[len] = '0';
-	len = len + 1;
-	frac_tok[len] = NIL;
-      }
-    }
-    len = strlen (whole_tok);	/* Re-join the parts of param again */
-    whole_tok[len] = '.';
-		/*	    End of checking number of decimal places
-		**---------------------------------------------------
-		*/
-    StrJoin (buff, sizeof (buff), cmnd_tok, " ");
-    StrJoin (rd_cmnd, sizeof (rd_cmnd), buff, motor_tok);
-    len = strlen (rd_cmnd);
-    rd_cmnd[len]   = '\r';
-    rd_cmnd[len+1] = NIL;
-    status = EL734_SendCmnd (&Hndl, rd_cmnd, buff, sizeof (buff));
-    if (status) {
-      rd0_tok = strtok (buff, " ");
-      rd1_tok = strtok (NULL, " ");
-      if ((rd0_tok == NULL) ||
-	  (rd1_tok == NULL) ||
-	  (strcmp (par0, rd0_tok) != 0) ||
-	  (strcmp (par1, rd1_tok) != 0)) {
-	if (rd0_tok == NULL) rd0_tok = "";
-	if (rd1_tok == NULL) rd1_tok = "";
-	printf ("\007Verify error for command \"%s %s %s %s\"\n",
-			    cmnd_tok, motor_tok, par0, par1);
-	printf ("Value set in EL734 controller is \"%s %s\"\n"
-		  "                    It should be \"%s %s\"\n",
-			    rd0_tok, rd1_tok, par0, par1);
-	return False;
-      }else {
-	return True;	    /* The parameter has been set correctly! */
-      }
-    }else {
-      printf ("\007LoadCheckTwoFloat -- error from EL734_SendCmnd\n");
-      printf ("Command being checked was \"%s %s %s %s\"\n",
-		    cmnd_tok, motor_tok, par0, par1);
-      return False;
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**		LoadFloatJuggle:  routine to try to get around an EL734 problem.
-**
-**			The problem is that the EL734 does not at the moment
-**			handle binary <--> float conversion correctly.
-*/
-  int	LoadFloatJuggle (
-/*      ===============
-*/		    char *cmnd,	    /* The command to be issued */
-		    char *motor,    /* The motor index being loaded */
-		    char *param,    /* The desired parameter */
-		    int   n_dec) {  /* The number of decimal places */
-/*
-**	    It is assumed that all parameters are consistent (especially
-**	    param and n_dec) since this is an internal routine and that
-**	    they are not terminated with <CR>.
-*/
-    int	    status, i, incr0, incr1, incr2;
-    char    set_cmnd[80], read_cmnd[40], my_par[40], buff[40];
-    char   *rd_tok;
-
-    printf ("Trying to juggle the \"%s\" parameter of Motor %s"
-		" to be %s ..\n  .. ", cmnd, motor, param);
-
-    sprintf (read_cmnd, "%s %s\r", cmnd, motor); /* Prepare the param rd cmnd */
-		/*
-		** Find indices of last 3 chars to be incremented
-		*/
-    incr0 = strlen (param);
-    incr0--;			/* incr0 now indexes the last digit of param */
-
-    if (!isdigit (param[incr0])) incr0--;  /* Be careful not to increment .. */
-					   /* .. a decimal point! */
-    incr1 = incr0 - 1;
-    if (!isdigit (param[incr1])) incr1--;  /* Be careful not to increment .. */
-					   /* .. a decimal point! */
-    incr2 = incr1 - 1;
-    if (!isdigit (param[incr2])) incr2--;  /* Be careful not to increment .. */
-					   /* .. a decimal point! */
-    if ((!isdigit (param[incr0])) ||
-	(!isdigit (param[incr1])) ||
-	(!isdigit (param[incr2]))) {
-      printf ("LoadFloatJuggle: software problem with decimal point\n"
-	      "      The routine probably needs to be enhanced!\n");
-      return False;
-    }
-	    /*----------------------------------------------------------------
-	    ** First try incrementing the last digit of the set value of the
-	    ** parameter 5 times.
-	    */
-    StrJoin (my_par, sizeof (my_par), param, "");   /* Make a copy of param */
-
-    for (i = 0; i < 5; i++) {
-      if (my_par[incr0] != '9') {    /* Check for carry to next digit */
-        my_par[incr0]++;
-      }else {
-	my_par[incr0] = '0';
-	if (my_par[incr1] != '9') {
-	  my_par[incr1]++;
-	}else {
-	  my_par[incr1] = '0';
-	  if (my_par[incr2] != '9') {
-	    my_par[incr2]++;
-	  }else {
-	    my_par[incr2] = '0';
-	  }
-	}
-      }
-
-      printf ("%s .. ", my_par);
-      sprintf (set_cmnd, "%s %s %s\r", cmnd, motor, my_par);
-
-      status = EL734_SendCmnd (&Hndl, set_cmnd, buff, sizeof (buff));
-      if (status) status = EL734_SendCmnd (&Hndl, read_cmnd, buff, sizeof (buff));
-      if (!status) {
-	printf ("\nError with \"%s %s %s\"\n"
-	        "Abandoning parameter juggle!\n", cmnd, motor, my_par);
-	return False;
-      }
-      rd_tok = strtok (buff, " ");    /* Skip leading spaces */
-      if (strcmp (param, rd_tok) == 0) {
-	printf ("\n  Success. Parameter as sent was %s\n"
-	          "           Parameter as read is  %s\n", my_par, param);
-	return True;
-      }
-    }
-	    /*----------------------------------------------------------------
-	    ** Now try decrementing the last digit of the set value of the
-	    ** parameter 5 times.
-	    */
-    StrJoin (my_par, sizeof (my_par), param, "");   /* Make a copy of param */
-
-    for (i = 0; i < 5; i++) {
-      if (my_par[incr0] != '0') {    /* Check for carry to next digit */
-        my_par[incr0]--;
-      }else {
-	my_par[incr0] = '9';
-	if (my_par[incr1] != '0') {
-	  my_par[incr1]--;
-	}else {
-	  my_par[incr1] = '9';
-	  if (my_par[incr2] != '0') {
-	    my_par[incr2]--;
-	  }else {
-	    my_par[incr2] = '9';
-	  }
-	}
-      }
-
-      printf ("%s .. ", my_par);
-      sprintf (set_cmnd, "%s %s %s\r", cmnd, motor, my_par);
-
-      status = EL734_SendCmnd (&Hndl, set_cmnd, buff, sizeof (buff));
-      if (status) status = EL734_SendCmnd (&Hndl, read_cmnd, buff, sizeof (buff));
-      if (!status) {
-	printf ("\nError with \"%s %s %s\"\n"
-	        "Abandoning parameter juggle!\n", cmnd, motor, my_par);
-	return False;
-      }
-      rd_tok = strtok (buff, " ");    /* Skip leading spaces */
-      if (strcmp (param, rd_tok) == 0) {
-	printf ("\n  Success. Parameter as sent was %s\n"
-	          "           Parameter as read is  %s\n", my_par, param);
-	return True;
-      }
-    }
-	/*
-	** Failed - go back to original setting
-	*/
-    sprintf (set_cmnd, "%s %s %s\r", cmnd, motor, param);
-    status = EL734_SendCmnd (&Hndl, set_cmnd, buff, sizeof (buff));
-    if (status) status = EL734_SendCmnd (&Hndl, read_cmnd, buff, sizeof (buff));
-    if (status) {
-      rd_tok = strtok (buff, " ");
-      printf ("\n  Failed. Parameter value is set to %s\n", rd_tok);
-    }else {
-      printf ("\n  Failed. Parameter value is unknown due to error\n");
-    }
-    return False;
-  }
-/*
-**--------------------------------------------------------------------------
-**		LoadIntJuggle:  routine to try to get around an EL734 problem.
-**
-**			The problem is that some integer parameters (e.g. E)
-**			do not set correctly.
-*/
-  int	LoadIntJuggle (
-/*      =============
-*/		    char *cmnd,	    /* The command to be issued */
-		    char *motor,    /* The motor index being loaded */
-		    char *param) {  /* The desired parameter */
-/*
-**	    It is assumed that the parameters are trimmed (especially
-**	    param) and are not terminated with <CR>.
-*/
-    int	    status, i, my_par;
-    char    set_cmnd[80], read_cmnd[40], buff[40];
-    char   *rd_tok;
-
-    printf ("Trying to juggle the \"%s\" parameter of Motor %s"
-		" to be %s ..\n  .. ", cmnd, motor, param);
-
-    sprintf (read_cmnd, "%s %s\r", cmnd, motor); /* Prepare the param rd cmnd */
-
-	    /*----------------------------------------------------------------
-	    ** First try incrementing the parameter 5 times.
-	    */
-    sscanf (param, "%d", &my_par);	/* Gen binary value of param */
-
-    for (i = 0; i < 5; i++) {
-      my_par++;
-
-      printf ("%d .. ", my_par);
-      sprintf (set_cmnd, "%s %s %d\r", cmnd, motor, my_par);
-
-      status = EL734_SendCmnd (&Hndl, set_cmnd, buff, sizeof (buff));
-      if (status) status = EL734_SendCmnd (&Hndl, read_cmnd, buff, sizeof (buff));
-      if (!status) {
-	printf ("\nError with \"%s %s %d\"\n"
-	        "Abandoning parameter juggle!\n", cmnd, motor, my_par);
-	return False;
-      }
-      rd_tok = strtok (buff, " ");    /* Skip leading spaces */
-      if (strcmp (param, rd_tok) == 0) {
-	printf ("\n  Success. Parameter as sent was %d\n"
-	          "           Parameter as read is  %s\n", my_par, param);
-	return True;
-      }
-    }
-	    /*----------------------------------------------------------------
-	    ** Now try decrementing the last digit of the set value of the
-	    ** parameter 5 times.
-	    */
-    sscanf (param, "%d", &my_par);	/* Gen binary value of param */
-
-    for (i = 0; i < 5; i++) {
-      my_par--;
-
-      printf ("%d .. ", my_par);
-      sprintf (set_cmnd, "%s %s %d\r", cmnd, motor, my_par);
-
-      status = EL734_SendCmnd (&Hndl, set_cmnd, buff, sizeof (buff));
-      if (status) status = EL734_SendCmnd (&Hndl, read_cmnd, buff, sizeof (buff));
-      if (!status) {
-	printf ("\nError with \"%s %s %d\"\n"
-	        "Abandoning parameter juggle!\n", cmnd, motor, my_par);
-	return False;
-      }
-      rd_tok = strtok (buff, " ");    /* Skip leading spaces */
-      if (strcmp (param, rd_tok) == 0) {
-	printf ("\n  Success. Parameter as sent was %d\n"
-	          "           Parameter as read is  %s\n", my_par, param);
-	return True;
-      }
-    }
-	/*
-	** Failed - go back to original setting
-	*/
-    sprintf (set_cmnd, "%s %s %s\r", cmnd, motor, param);
-    status = EL734_SendCmnd (&Hndl, set_cmnd, buff, sizeof (buff));
-    if (status) status = EL734_SendCmnd (&Hndl, read_cmnd, buff, sizeof (buff));
-    if (status) {
-      rd_tok = strtok (buff, " ");
-      printf ("\n  Failed. Parameter value is set to %s\n", rd_tok);
-    }else {
-      printf ("\n  Failed. Parameter value is unknown due to error\n");
-    }
-    return False;
-  }
-/*
-**--------------------------------------------------------------------------
-**		LoadCheckOneInteger:  routine to check that a command specifying
-**				      a single integer set correctly.
-*/
-  int	LoadCheckOneInteger (char *cmnd) {
-/*      ===================
-*/
-    int	    status, len;
-    char    my_cmnd[80], rd_cmnd[40], buff[40];
-    char    *cmnd_tok, *motor_tok, *param_tok, *rd_tok;
-
-    StrJoin (my_cmnd, sizeof (my_cmnd), cmnd, "");  /* Make a copy of cmnd */
-    len = strlen (my_cmnd);
-    if (my_cmnd[len-1] == '\r') my_cmnd[len-1] = NIL;
-
-    cmnd_tok  = strtok (my_cmnd, " ");
-    motor_tok = strtok (NULL, " ");
-    param_tok = strtok (NULL, " ");
-    if ((cmnd_tok == NULL) || (motor_tok == NULL) || (param_tok == NULL)) {
-      printf ("\007Software problem in LoadCheckOneInteger\n");
-      return False;
-    }
-    StrJoin (buff, sizeof (buff), cmnd_tok, " ");
-    StrJoin (rd_cmnd, sizeof (rd_cmnd), buff, motor_tok);
-    len = strlen (rd_cmnd);
-    rd_cmnd[len]   = '\r';
-    rd_cmnd[len+1] = NIL;
-    status = EL734_SendCmnd (&Hndl, rd_cmnd, buff, sizeof (buff));
-    if (status) {
-      rd_tok = strtok (buff, " ");
-      if ((rd_tok == NULL) ||
-	  (strcmp (param_tok, rd_tok) != 0)) {
-	if (rd_tok == NULL) rd_tok = "";
-	printf ("\007Verify error for command \"%s %s %s\"\n",
-			    cmnd_tok, motor_tok, param_tok);
-	printf ("Value set in EL734 controller is \"%s\"\n"
-		  "                    It should be \"%s\"\n",
-			    rd_tok, param_tok);
-	status = LoadIntJuggle (cmnd_tok, motor_tok, param_tok);
-	return status;
-      }else {
-	return True;	    /* The parameter has been set correctly! */
-      }
-    }else {
-      printf ("\007LoadCheckOneInteger -- error from EL734_SendCmnd\n");
-      printf ("Command being checked was \"%s %s %s\"\n",
-		    cmnd_tok, motor_tok, param_tok);
-      return False;
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**		LoadCheckOneFloat:  routine to check that a command specifying
-**				      a single real value set correctly.
-*/
-  int	LoadCheckOneFloat (char *cmnd, int n_dec) {
-/*      =================
-*/
-    int	    status, len, n_dec_ok;
-    char    my_cmnd[80], rd_cmnd[40], buff[40], param[40];
-    char    *cmnd_tok, *motor_tok, *param_tok, *rd_tok;
-    char    *whole_tok, *frac_tok;
-
-    StrJoin (my_cmnd, sizeof (my_cmnd), cmnd, "");  /* Make a copy of cmnd */
-    len = strlen (my_cmnd);
-    if (my_cmnd[len-1] == '\r') my_cmnd[len-1] = NIL;
-
-    cmnd_tok  = strtok (my_cmnd, " ");
-    motor_tok = strtok (NULL, " ");
-    param_tok = strtok (NULL, " ");
-    if ((cmnd_tok == NULL) || (motor_tok == NULL) || (param_tok == NULL)) {
-      printf ("\007Software problem in LoadCheckOneFloat\n");
-      return False;
-    }
-		/*
-		** Check that the number of decimal places in the set parameter
-		** agrees with the setting of the EL734.
-		*/
-    n_dec_ok = True;	    /* Assume it will be OK */
-    StrJoin (param, sizeof (param), param_tok, "");
-    whole_tok = strtok (param, ".");
-    frac_tok  = strtok (NULL, ".");
-    if (frac_tok == NULL) {	    /* Check for a decimal point */
-      len = strlen (whole_tok);	    /* None there, so put in a ".0" */
-      frac_tok = whole_tok + len + 1;
-      frac_tok[0] = '0';
-      frac_tok[1] = NIL;
-    }
-    len = strlen (frac_tok);
-    if (len > n_dec) {		/* Param has too many decimal places */
-				/* Try to remove trailing zeros */
-      while ((len >= 0) && (frac_tok[len-1] == '0')) {
-	len = len - 1;
-	frac_tok[len] = NIL;
-	if (len == n_dec) break;
-      }
-      if (len != n_dec) {
-	printf ("Don't expect the parameter to verify correctly.\n"
-		"You have specified too many decimal places!\n");
-	n_dec_ok = False;	    /* Remember it (to suppress retries) */
-      }
-    }else if (len < n_dec) {	/* Param has too few decimal places */
-      while (len < n_dec) {	/* Pad with zeros */
-	frac_tok[len] = '0';
-	len = len + 1;
-	frac_tok[len] = NIL;
-      }
-    }
-    len = strlen (whole_tok);	/* Re-join the parts of param again */
-    whole_tok[len] = '.';
-
-    StrJoin (buff, sizeof (buff), cmnd_tok, " ");
-    StrJoin (rd_cmnd, sizeof (rd_cmnd), buff, motor_tok);
-    len = strlen (rd_cmnd);
-    rd_cmnd[len]   = '\r';
-    rd_cmnd[len+1] = NIL;
-    status = EL734_SendCmnd (&Hndl, rd_cmnd, buff, sizeof (buff));
-    if (status) {
-      rd_tok = strtok (buff, " ");
-      if ((rd_tok == NULL) ||
-	    (strcmp (param, rd_tok) != 0)) {
-	if (rd_tok == NULL) rd_tok = "";
-	printf ("\007Verify error for command \"%s %s %s\"\n",
-			    cmnd_tok, motor_tok, param);
-	printf ("Value set in EL734 controller is \"%s\"\n"
-		  "                    It should be \"%s\"\n",
-			    rd_tok, param);
-	if (n_dec_ok) {
-	  status = LoadFloatJuggle (cmnd_tok, motor_tok, param, n_dec);
-	}
-	return status;
-      }else {
-	return True;	    /* The parameter has been set correctly! */
-      }
-    }else {
-      printf ("\007LoadCheckOneFloat -- error from EL734_SendCmnd\n");
-      printf ("Command being checked was \"%s %s %s\"\n",
-		    cmnd_tok, motor_tok, param);
-      return False;
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoStop:  Send a STOP command to the motor. If <Ctrl-C> has
-**			    been detected, assume that this is an emergency
-**			    stop and do fewer tests.
-*/
-  int	DoStop () {
-/*      ======
-*/
-    int	    status, no_errors, i,	len,	 act_len;
-    int	    msr,    ored_msr,  fp_cntr, fr_cntr, ss;
-    char    recd[132], buff[132], cmnd[80];
-    float   f_tmp;
-
-    no_errors = True;
-
-    if (!Ctrl_C_has_happened) {
-      EL734_ZeroStatus (&Hndl);
-      printf ("Sending STOP command to motor %d ...", Motor);
-    }else {
-      printf ("\n\007<Ctrl-C> detected: Sending STOP command to motor %d ...",
-		    Motor);
-    }
-
-    status = EL734_Stop (&Hndl);
-    if (!status) no_errors = False;
-
-    if (no_errors) {
-      if (Ctrl_C_has_happened) {
-	printf (" OK.\n");
-	return True;
-      }else {
-	printf ("\nWaiting for motor to become idle ... ");
-	status = My_WaitIdle (&Hndl, Verbose,
-		    &ored_msr, &fp_cntr, &fr_cntr, &Ist_pos);
-	if (!status) {
-	  if (Ctrl_C_has_happened) {
-	    printf ("\n\007   <Ctrl-C> detected: Wait-for-idle abandoned!\n");
-	  }else {
-	    printf ("\n\007   Error return status from My_WaitIdle!\n");
-	  }
-	  return False;
-	}
-	if ((ored_msr & MSR__STOPPED) == 0) {
-	  printf ("\n\007   Warning -- MSR STOP bit is not set!\n");
-	  return False;
-	}
-	if ((ored_msr & (~MSR__STOPPED)) != 0) {
-	  printf ("\n\007     ... unexpected MSR obtained!\n");
-	  printf ("    %s\n", EL734_EncodeMSR (buff, sizeof (buff),
-				    0, ored_msr, fp_cntr, fr_cntr));
-	  return False;
-	}
-	printf (" OK.\n");
-      }
-      return True;
-    }else {
-      printf ("\n\007   STOP command not accepted!\n");
-      return False;
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoLimits:  Set the lower and upper software limits
-*/
-  int	DoLimits (
-/*      ========
-*/		    float   lo,
-		    float   hi) {
-
-    int	    status, no_errors, i,	len,	 act_len;
-    int	    msr,    ored_msr,  fp_cntr, fr_cntr, ss;
-    char    recd[132], buff[132], cmnd[80];
-    float   f_tmp;
-
-    no_errors = False;
-
-    printf ("Sending command \"h %d %.*f %.*f\" ...",
-			Motor, Dec_pt, lo, Dec_pt, hi);
-
-    sprintf (cmnd, "h %d %.*f %.*f\r", Motor, Dec_pt, lo, Dec_pt, hi);
-    status = EL734_SendCmnd (&Hndl, cmnd, buff, sizeof (buff));
-    if (status && (buff[0] == NIL)) no_errors = True;
-
-    if (no_errors) {
-      printf (" OK.\n");
-      return True;
-    }else {
-      printf ("\n\007   Command not accepted!\n");
-      return False;
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**	DoSimpleMove:  Send a simple move command to the motor and wait for idle
-*/
-  int	DoSimpleMove (
-/*      ============
-*/		    char *a_cmnd,
-		    int	  test_status) {
-
-    int	    status, i,	len,	 act_len;
-    int	    msr,    ored_msr,  fp_cntr, fr_cntr, ss;
-    char    recd[132], buff[132], cmnd[80];
-    float   f_tmp;
-    char    *etxt;
-
-    EL734_ZeroStatus (&Hndl);
-
-    sprintf (cmnd, a_cmnd, Motor);
-    printf ("Sending \"%s\" command ...", cmnd);
-
-    i = strlen (cmnd);
-    cmnd[i]   = '\r';
-    cmnd[i+1] = NIL;
-    status = EL734_SendCmnd (&Hndl, cmnd, buff, sizeof (buff));
-    if (!status) {
-      PrintErrInfo ("EL734_SendCmnd");
-      return False;
-    }
-
-    if (buff[0] != NIL) {
-      printf ("\007 response was \"%s\".\n", buff);
-      etxt = "Unrecognised response!";
-      if (strcmp (buff, "?BSY") == 0) etxt = "Motor busy!";
-      if (strcmp (buff, "?CMD") == 0) etxt = "Bad command!";
-      if (strcmp (buff, "?LOC") == 0) etxt = "Controller is in manual mode!";
-      if (strcmp (buff, "?ADR") == 0) etxt = "Bad motor number!";
-      if (strcmp (buff, "?RNG") == 0) etxt = "Range error! Check low/high limits.";
-      if (strcmp (buff, "*MS")  == 0)
-	etxt = "Motor is disabled: \"Stop\" signal is active!";
-      if (strcmp (buff, "*ES")  == 0)
-	etxt = "Motor is disabled: \"Emergency Stop\" signal is active!";
-      if (strncmp (buff, "?TMO", 4) == 0)
-	etxt = "Time-out! You should check the cables, perhaps.";
-      printf ("%s\n", etxt);
-      return False;
-    }
-
-    printf ("\nWaiting for motor to become idle ..."); fflush (NULL);
-    status = My_WaitIdle (&Hndl, Verbose,
-		    &ored_msr, &fp_cntr, &fr_cntr, &Ist_pos);
-    if (!status) {
-      if (Ctrl_C_has_happened) DoStop ();
-      return False;
-    }
-    if (test_status && ((ored_msr & (~MSR__BUSY)) != MSR__OK)) {
-      printf ("\n\007     ... unexpected MSR obtained!\n");
-      printf ("    %s\n", EL734_EncodeMSR (buff, sizeof (buff),
-				    0, ored_msr, fp_cntr, fr_cntr));
-      return False;
-    }
-    printf (" OK.\nPosition = %.*f\n", Dec_pt, Ist_pos);
-    return True;
-  }
-/*
-**--------------------------------------------------------------------------
-**	   DoSimpleSet:  Send a parameter set command to the motor and
-**			    check for null response.
-*/
-  int	DoSimpleSet (
-/*      ===========
-*/		    char *a_cmnd) {
-
-    int	    status, i;
-    char    cmnd[80], buff[40];
-
-    sprintf (cmnd, a_cmnd, Motor);
-    printf ("Sending \"%s\" command ...", cmnd);
-    i = strlen (cmnd);
-    cmnd[i]   = '\r';
-    cmnd[i+1] = NIL;
-
-    status = EL734_SendCmnd (&Hndl, cmnd, buff, sizeof (buff));
-    if (status && (buff[0] == NIL)) {
-      printf (" OK.\n");
-      return True;
-    }else if (!status) {
-      printf ("\n\007");
-      PrintErrInfo ("EL734_SendCmnd");
-      return False;
-    }else {
-      printf ("\n\007Error response from the motor: \"%s\"!\n", buff);
-      return False;
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoSetPos:  Set the current position
-*/
-  int	DoSetPos (float	ist) {
-/*      ========
-*/
-
-    int	    status;
-    char    cmnd[80];
-
-    sprintf (cmnd, "UU %%d %.*f", Dec_pt, ist);
-    status = DoSimpleSet (cmnd);
-    if (status) printf ("Position set to %.*f\n", Dec_pt, ist);
-    return status;
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoRef:  Perform a Reference Seek
-*/
-  int	DoRef (
-/*      =====
-*/		float	*shift) {
-
-    int	    status, no_restore, i,	len,	 act_len;
-    int	    msr,    ored_msr,  fp_cntr, fr_cntr, ss;
-    char    recd[132], buff[132], cmnd[80];
-    int	    k, v;
-    float   lo, hi, q, zero_pt, targ;
-    float   f_tmp;
-/*-----------------------------------------------------------------
-**					     Absolute encoder?
-*/
-    status = GetKHVQZ (&k, &lo, &hi, &v, &q, &zero_pt);
-    if (!status) return status;
-
-    if (k == 0) {
-      printf ("\n\007Absolute encoder, K = 0, "
-	      "\"-ref\" option is not meaningful!\n");
-      return False;
-    }else {
-      printf ("Performing reference point seek.\n");
-      sprintf (recd, "%.*f", Dec_pt, zero_pt);
-      if (k == -1 || k == -11) {
-	printf ("Reference point = %s (lower limit switch) ...", recd);
-      }else if (k == 1 || k == 11) {
-	printf ("Reference point = %s (upper limit switch) ...", recd);
-      }else if (k == 2 || k == 12) {
-	printf ("Reference point = %s (separate switch) ...", recd);
-      }else {
-	printf ("Reference point = %s (reference mode = %d (unrecognised)) ...",
-			recd, k);
-      }
-    }
-/*---------------------------------------------------------------*/
-    *shift = 0.0;
-
-    status = EL734_GetStatus (&Hndl,
-		&msr, &ored_msr, &fp_cntr, &fr_cntr, &ss, &Ist_pos);
-    if ((!status) || (msr == -1)) {
-      printf ("\n\007");
-      printf ("Bad status from EL734_GetStatus.\n"
-	         "    ... failed to do reference seek.\n");
-      return False;
-    }
-    EL734_ZeroStatus (&Hndl);
-
-    sprintf (cmnd, "rf %d\r", Motor);		    /* Start reference seek */
-    status = EL734_SendCmnd (&Hndl, cmnd, buff, sizeof (buff));
-    if (!status) {
-      printf ("\n\007"
-		"   ... failed to initiate reference seek.\n");
-      PrintErrInfo ("EL734_SendCmnd");
-      return False;
-    }else {
-      if (buff[0] != NIL) {
-	printf ("\n\007"
-		"   ... error response when initiating reference seek:"
-		" \"%s\".\n"
-		" Operation abandoned.\n", buff);
-	return False;
-      }
-    }
-    status = My_WaitIdle (&Hndl, Verbose,
-		    &ored_msr, &fp_cntr, &fr_cntr, &Ist_pos);
-    if (!status) {
-      if (Ctrl_C_has_happened) {
-	DoStop ();
-      }else {
-	PrintErrInfo ("My_WaitIdle");
-      }
-      return False;
-    }
-    if ((ored_msr & MSR__REF_OK) != 0) {
-      printf (" OK.\n");
-    }else {
-      if ((ored_msr & MSR__REF_FAIL) != 0) {
-	printf ("\007 failed!\n");
-      }else {
-	printf ("\007 unexpected MSR obtained!\n");
-      }
-      printf ("   %s\n", EL734_EncodeMSR (recd, sizeof (recd),
-			0, ored_msr, fp_cntr, fr_cntr));
-      return False;
-    }
-
-    *shift = Ist_pos - zero_pt;
-    sprintf (recd, "%.*f", Dec_pt, *shift);
-    printf ("Position = %.*f,  Zero-point error = %s\n", Dec_pt, Ist_pos, recd);
-    sscanf (recd, "%f", &f_tmp);
-    if (f_tmp != 0.0) {
-      sprintf (recd, "%.*f", Dec_pt, zero_pt);
-      printf ("\007Setting current position to be %s\n", recd);
-      status = DoSetPos (zero_pt);
-      if (!status) return False;
-    }
-    if ((zero_pt < lo) || (zero_pt > hi)) {	/* Move into range? */
-      if (zero_pt < lo) targ = lo;			/* Yes */
-      if (zero_pt > lo) targ = hi;
-      printf ("Moving into low-high range ...\n");
-      sprintf (cmnd, "P %%d %.*f", Dec_pt, targ);
-      status = DoSimpleMove (cmnd, True);
-    }
-    return True;
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoFF:  Send a FF command to the motor
-*/
-  int	DoFF () {
-/*      ====
-*/
-    int	    status;
-    char    cmnd[32];
-
-    if (Frequency > 0) {
-      sprintf (cmnd, "FF %%d %d", Frequency);
-    }else {
-      strcpy (cmnd, "FF %d");
-    }
-    status = DoSimpleMove (cmnd, True);
-    return status;
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoFB:  Send a FB command to the motor
-*/
-  int	DoFB () {
-/*      ====
-*/
-    int	    status;
-    char    cmnd[32];
-
-    if (Frequency > 0) {
-      sprintf (cmnd, "FB %%d %d", Frequency);
-    }else {
-      strcpy (cmnd, "FB %d");
-    }
-    status = DoSimpleMove (cmnd, True);
-    return status;
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoSF:  Send a SF command to the motor
-*/
-  int	DoSF () {
-/*      ====
-*/
-    int	    status;
-    char    cmnd[32];
-
-    if (Frequency > 0) {
-      sprintf (cmnd, "SF %%d %d", Frequency);
-    }else {
-      strcpy (cmnd, "SF %d");
-    }
-    status = DoSimpleMove (cmnd, True);
-    return status;
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoSB:  Send a SB command to the motor
-*/
-  int	DoSB () {
-/*      ====
-*/
-    int	    status;
-    char    cmnd[32];
-
-    if (Frequency > 0) {
-      sprintf (cmnd, "SB %%d %d", Frequency);
-    }else {
-      strcpy (cmnd, "SB %d");
-    }
-    status = DoSimpleMove (cmnd, True);
-    return status;
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoHunt:  hunt for the motor's reference point.
-*/
-  int	DoHunt (int ist_posit) {
-/*      ======
-*/
-    int	    status;
-    int	    k;
-    float   lo, hi, q, shift, zero;
-    int	    v;
-    int	    msr, ored_msr, fp_cntr, fr_cntr, ss;
-    float   step, targ, start_posit, f_tmp;
-    char    cmnd[20];
-
-    status = GetKHVQZ (&k, &lo, &hi, &v, &q, &zero);
-    if (!status) return status;
-/*-----------------------------------------------------------------
-**					     Absolute encoder    */
-    if (k == 0) {
-      printf ("\n\007Absolute encoder, K = 0, "
-	      "-hunt option is not meaningful!\n");
-      return False;
-/*-----------------------------------------------------------------
-**					     Lo-Lim is Ref Pt	 */
-    }else if ((k == -1) || (k == -11)) {
-      printf ("Reference point = %.*f (low limit switch)\n", Dec_pt, zero);
-      if (q <= 0) {
-	printf ("\n\007Q = %.*f. This is inconsistent with K = %d!\n",
-				    Dec_pt, q, k);
-	return False;
-      }
-      printf ("Setting wide soft limits so that we can hit the "
-		    "low-limit switch ...\n");
-      status = DoSimpleSet ("H %d -8000 8000");
-      if (!status) return status;
-
-      if ((ist_posit < -2000.0) || (ist_posit > 2000.0)) {
-	printf ("Forcing the current position to zero ...\n");
-	status = DoSetPos (0.0);
-	if (!status) {
-	  DoLimits (lo, hi);	    /* On error, reset the limits */
-          return status;
-	}
-      }
-
-      status = DoSimpleMove ("FB %d", False); /* Do FB but don't test MSR at end */
-      if (!status) return status;
-
-      DoLimits (lo, hi);	/* Reset lo/hi limits */
-
-      status = EL734_GetStatus (&Hndl,
-		&msr, &ored_msr, &fp_cntr, &fr_cntr, &ss, &Ist_pos);
-      if (msr == -1) {
-	printf ("\n\007Bad status from EL734_GetStatus!");
-	return False;
-      }
-
-      if ((ored_msr & MSR__LO_LIM) == 0) {
-	printf ("\n\007Low-limit switch was not reached!");
-	return False;
-      }
-
-      status = DoSetPos (zero);
-      if (!status) return status;
-
-      if ((ss & SS__LSX) != 0) {
-	printf ("\n\007Reference-point is still active!");
-	return False;
-      }
-
-      status = DoRef (&shift);
-      return status;
-/*-----------------------------------------------------------------
-**					     Hi-Lim is Ref Pt	 */
-    }else if ((k == 1) || (k == 11)) {
-      printf ("Reference point = %.*f (high limit switch)\n", Dec_pt, zero);
-      if (q <= 0) {
-	printf ("\n\007Q = %.*f. This is inconsistent with K = %d!\n",
-					    Dec_pt, q, k);
-	return False;
-      }
-      status = DoSimpleSet ("H %d -8000 8000");
-      if (!status) return status;
-
-      status = DoSetPos (0.0);
-      if (!status) return status;
-
-      status = DoSimpleMove ("FF %d", False); /* Do FF but don't test MSR at end */
-      if (!status) return status;
-
-      DoLimits (lo, hi);	/* Reset lo/hi limits */
-
-      status = EL734_GetStatus (&Hndl,
-		&msr, &ored_msr, &fp_cntr, &fr_cntr, &ss, &Ist_pos);
-      if (msr == -1) {
-	printf ("\n\007Bad status from EL734_GetStatus!");
-	return False;
-      }
-
-      if ((ored_msr & MSR__HI_LIM) == 0) {
-	printf ("\n\007High-limit switch was not reached!");
-	return False;
-      }
-
-      status = DoSetPos (zero);
-      if (!status) return status;
-
-      if ((ss & SS__LSX) != 0) {
-	printf ("\n\007Reference-point is still active!");
-	return False;
-      }
-
-      status = DoRef (&shift);
-      return status;
-/*-----------------------------------------------------------------
-**					     Separate Ref Pt	 */
-    }else if ((k == 2) || (k == 12)) {
-      printf ("Reference point = %.*f (separate switch)\n", Dec_pt, zero);
-      printf ("Ref-point width (Q parameter) = %.*f\n", Dec_pt, q);
-      if (q == 0.0) {
-	printf ("\n\007Q = %.*f. This is inconsistent with K = %d!\n",
-					    Dec_pt, q, k);
-	return False;
-      }else {
-	sprintf (cmnd, "%.*f", Dec_pt, q);  /* Check Q param is not too small */
-	sscanf (cmnd, "%f", &f_tmp);
-	if (f_tmp == 0.0) {
-	  printf ("\n\007Q = %f. This is too small!\n", q);
-	  return False;
-	}
-      }
-      printf ("Setting wide soft limits so that they do not interfere ...\n");
-      status = DoSimpleSet ("H %d -8000 8000");
-      if (!status) return status;
-		    /*
-		    ** If the current position is more or less a reasonable
-		    ** work without forcing the position to zero. Otherwise,
-		    ** force the position to zero to ensure the algorithms
-		    ** have a good chance of working.
-		    */
-      if ((ist_posit < -2000.0) || (ist_posit > 2000.0)) {
-	printf ("Forcing the current position to zero ...\n");
-	status = DoSetPos (0.0);
-	if (!status) {DoLimits (lo, hi); return status;}
-	targ = 0.0;
-      }else {
-	targ = zero - (q/2.0);
-	sprintf (cmnd, "P %%d %.*f", Dec_pt, targ);
-	printf ("Moving to start position = Ref-pt - (q/2.0) = %.*f ...\n",
-				Dec_pt, targ);
-	status = DoSimpleMove (cmnd, False);
-	if (!status) {DoLimits (lo, hi); return status;}
-	status = EL734_GetStatus (&Hndl,
-		    &msr, &ored_msr, &fp_cntr, &fr_cntr, &ss, &Ist_pos);
-	if (status &&
-	    (((ored_msr & MSR__LO_LIM) != 0) ||
-	     ((ored_msr & MSR__HI_LIM) != 0))) {
-	  if ((ored_msr & MSR__LO_LIM) != 0) {
-	    printf ("Hit lo-limit switch!\n");
-	  }else {
-	    printf ("Hit hi-limit switch!\n");
-	  }
-	  targ = Ist_pos;
-	}
-	EL734_ZeroStatus (&Hndl);
-      }
-
-      start_posit = targ;
-      step = 0.95 * q;
-      printf ("Low-to-High distance = %.*f\n", Dec_pt, (hi - lo));
-      printf ("Approximate number of steps = %d\n", (int) ((hi - lo)/step));
-      printf ("Step size = %.*f\n", Dec_pt, step);
-      if (step > 0) {
-	printf ("Stepping to low-limit switch looking for ref-point ...\n");
-      }else {
-	printf ("Stepping to high-limit switch looking for ref-point ...\n");
-      }
-      fflush (NULL);
-      status = EL734_GetStatus (&Hndl,
-		&msr, &ored_msr, &fp_cntr, &fr_cntr, &ss, &Ist_pos);
-      while (status &&
-	     ((ored_msr & MSR__LO_LIM) == 0) &&
-	     ((ored_msr & MSR__HI_LIM) == 0) &&
-	     ((ss & SS__LSX) == 0)) {
-        targ = targ - step;
-	sprintf (cmnd, "P %%d %.*f", Dec_pt, targ);
-	status = DoSimpleMove (cmnd, False);
-        if (!status) {
-	  if (Ctrl_C_has_happened) {
-	    DoStop ();
-	  }else {
-	    PrintErrInfo ("DoSimpleMove");
-	  }
-	  DoLimits (lo, hi);
-	  return False;
-	}
-	status = EL734_GetStatus (&Hndl,
-		&msr, &ored_msr, &fp_cntr, &fr_cntr, &ss, &Ist_pos);
-      }
-      if (!status) {
-	DoLimits (lo, hi);
-	return False;
-      }
-      if ((ored_msr & (MSR__LO_LIM | MSR__HI_LIM)) != 0) {
-        printf ("Got to limit switch. Ref-point not found. "
-		"Returning to Start.\n"); fflush (NULL);
-	sprintf (cmnd, "P %%d %.*f", Dec_pt, start_posit);
-	status = DoSimpleMove (cmnd, False);
-        if (!status) {
-	  if (Ctrl_C_has_happened) {
-	    DoStop ();
-	  }else {
-	    PrintErrInfo ("DoSimpleMove");
-	  }
-	  DoLimits (lo, hi);
-	  return False;
-	}
-	targ = start_posit;
-	if (step > 0) {
-	  printf ("Stepping to high-limit switch looking for ref-point ...\n");
-	}else {
-	  printf ("Stepping to low-limit switch looking for ref-point ...\n");
-	}
-	status = EL734_GetStatus (&Hndl,
-		&msr, &ored_msr, &fp_cntr, &fr_cntr, &ss, &Ist_pos);
-	while (status &&
-	       ((ored_msr & MSR__LO_LIM) == 0) &&
-	       ((ored_msr & MSR__HI_LIM) == 0) &&
-	       ((ss & SS__LSX) == 0)) {
-	  targ = targ + step;
-	  sprintf (cmnd, "P %%d %.*f", Dec_pt, targ);
-	  status = DoSimpleMove (cmnd, False);
-          if (!status) {
-	    if (Ctrl_C_has_happened) {
-	      DoStop ();
-	    }else {
-	      PrintErrInfo ("DoSimpleMove");
-	    }
-	    DoLimits (lo, hi);
-	    return False;
-	  }
-	  status = EL734_GetStatus (&Hndl,
-		&msr, &ored_msr, &fp_cntr, &fr_cntr, &ss, &Ist_pos);
-	}
-	if (!status) return False;
-	if ((ored_msr & (MSR__LO_LIM | MSR__HI_LIM)) != 0) {
-	  printf ("\n\007Got to limit switch. Ref-point not found!\n");
-	  printf ("Hunt operation abandoned.\n");
-	  DoLimits (lo, hi);
-	  if (step > 0) DoSetPos (hi); else DoSetPos (lo);
-	  return False;
-	}
-      }
-      DoLimits (lo, hi);	    /* Reset lo/hi limits */
-      if ((ss & SS__LSX) == 0) {
-        printf ("\n\007Ref-point not found!\n");
-	DoLimits (lo, hi);
-	return False;
-      }else {
-        printf ("\n"
-		"   +-------------------------------+\n"
-		"   | Ref-point found at %10.3f |\n"
-		"   +-------------------------------+\n\n", targ);
-      }
-      status = DoRef (&shift);
-      return status;
-    }else {
-      printf ("\n\007Reference Mode, K = %d. Unrecognised value!\n", k);
-      return False;
-    }
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoSave:  Get all parameter settings of motor.
-*/
-  int	DoSave () {
-/*      ======
-*/
-    int			 status, no_errors;
-    char		 buff[80];
-    int			 msr,      ored_msr,  fp_cntr, fr_cntr, ss;
-    int			 air_cush, inp_state, act_mot;
-    FILE		*lun;
-    time_t		 time_now;
-    struct EL734info	*info_ptr;
-
-    char    cmnd00[10], cmnd01[10], cmnd02[10], cmnd03[10], cmnd04[10];
-    char    cmnd05[10], cmnd06[10], cmnd07[10], cmnd08[10], cmnd09[10];
-    char    cmnd10[10], cmnd11[10], cmnd12[10], cmnd13[10], cmnd14[10];
-    char    cmnd15[10], cmnd16[10], cmnd17[10], cmnd18[10], cmnd19[10];
-    char    cmnd20[10], cmnd21[10], cmnd22[10], cmnd23[10], cmnd24[10];
-    char    cmnd25[10], cmnd26[10], cmnd27[10], cmnd28[10], cmnd29[10];
-    char    cmnd30[10], cmnd31[10];
-
-    char    *rptr00, *rptr01, *rptr02, *rptr03, *rptr04;
-    char    *rptr05, *rptr06, *rptr07, *rptr08, *rptr09;
-    char    *rptr10, *rptr11, *rptr12, *rptr13, *rptr14;
-    char    *rptr15, *rptr16, *rptr17, *rptr18, *rptr19;
-    char    *rptr20, *rptr21, *rptr22, *rptr23, *rptr24;
-    char    *rptr25, *rptr26, *rptr27, *rptr28, *rptr29;
-    char    *rptr30, *rptr31;
-
-    int	no_EC_cmnd = True;
-    int	no_A_cmnd  = True;
-    int	no_FD_cmnd = True;
-    int	no_FM_cmnd = True;
-    int	no_D_cmnd  = True;
-    int	no_E_cmnd  = True;
-    int	no_F_cmnd  = True;
-    int	no_G_cmnd  = True;
-    int	no_H_cmnd  = True;
-    int	no_J_cmnd  = True;
-    int	no_K_cmnd  = True;
-    int	no_L_cmnd  = True;
-    int	no_M_cmnd  = True;
-    int	no_Q_cmnd  = True;
-    int	no_T_cmnd  = True;
-    int	no_V_cmnd  = True;
-    int	no_W_cmnd  = True;
-    int	no_Z_cmnd  = True;
-    int	no_SP_cmnd = True;
-    int	no_ST_cmnd = True;
-    int	no_SR_cmnd = True;
-    int	no_SA_cmnd = True;
-    int	no_AC_cmnd = True;
-    int	no_RI_cmnd = True;
-    int	no_AM_cmnd = True;
-    int	no_EP_cmnd = True;
-    int	no_KP_cmnd = True;
-    int	no_KI_cmnd = True;
-    int	no_KD_cmnd = True;
-
-    if ((strcmp (Save_file, "-") == 0) ||
-	(strcmp (Save_file, "=") == 0)) {	/* Use standard output? */
-      lun = stdout;				/* Yes */
-    }else {
-      lun = fopen (Save_file, "w");
-      if (lun == NULL) return False;
-      printf ("Writing motor parameters to file %s ...", Save_file);
-      fflush (NULL);
-    }
-    time_now = time (NULL);
-    fprintf (lun, "! EL734 Status at %s", asctime (localtime (&time_now)));
-    fprintf (lun, "! ============\n");
-
-    sprintf (cmnd00, "id\r");
-    sprintf (cmnd01, "mn %d\r", Motor);
-    sprintf (cmnd02, "mem %d\r", Motor);
-    sprintf (cmnd03, "ec %d\r", Motor);
-    sprintf (cmnd04, "a %d\r", Motor);
-    sprintf (cmnd05, "fd %d\r", Motor);
-    sprintf (cmnd06, "fm %d\r", Motor);
-    sprintf (cmnd07, "d %d\r", Motor);
-    sprintf (cmnd08, "e %d\r", Motor);
-    sprintf (cmnd09, "f %d\r", Motor);
-    sprintf (cmnd10, "g %d\r", Motor);
-    sprintf (cmnd11, "h %d\r", Motor);
-    sprintf (cmnd12, "j %d\r", Motor);
-    sprintf (cmnd13, "k %d\r", Motor);
-    sprintf (cmnd14, "l %d\r", Motor);
-    sprintf (cmnd15, "m %d\r", Motor);
-    sprintf (cmnd16, "q %d\r", Motor);
-    sprintf (cmnd17, "t %d\r", Motor);
-    sprintf (cmnd18, "v %d\r", Motor);
-    sprintf (cmnd19, "w %d\r", Motor);
-    sprintf (cmnd20, "z %d\r", Motor);
-    sprintf (cmnd21, "sp %d\r", Motor);
-    sprintf (cmnd22, "st %d\r", Motor);
-    sprintf (cmnd23, "sr %d\r", Motor);
-    sprintf (cmnd24, "sa %d\r", Motor);
-    sprintf (cmnd25, "ac %d\r", Motor);
-    sprintf (cmnd26, "ri %d\r", Motor);
-    sprintf (cmnd27, "am\r");
-    sprintf (cmnd28, "ep %d\r", Motor);
-    sprintf (cmnd29, "kp %d\r", Motor);
-    sprintf (cmnd30, "ki %d\r", Motor);
-    sprintf (cmnd31, "kd %d\r", Motor);
-
-    no_errors = True;
-
-    info_ptr = (struct EL734info *) Hndl;
-    status = AsynSrv_SendCmnds (&info_ptr->asyn_info,
-		&info_ptr->to_host, &info_ptr->from_host,
-		cmnd00, cmnd01, cmnd02, cmnd03, cmnd04, cmnd05, cmnd06, 
-		cmnd07, cmnd08, cmnd09, cmnd10, cmnd11, cmnd12, cmnd13, 
-		cmnd14, cmnd15, cmnd16, cmnd17, cmnd18, cmnd19, cmnd20, 
-		cmnd21, cmnd22, cmnd23, cmnd24, cmnd25, cmnd26, cmnd27,
-		cmnd28, cmnd29, cmnd30, cmnd31, NULL);
-    if (status) {
-      rptr00 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, NULL);
-      rptr01 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr00);
-      rptr02 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr01);
-      rptr03 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr02);
-      rptr04 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr03);
-      rptr05 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr04);
-      rptr06 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr05);
-      rptr07 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr06);
-      rptr08 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr07);
-      rptr09 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr08);
-      rptr10 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr09);
-      rptr11 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr10);
-      rptr12 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr11);
-      rptr13 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr12);
-      rptr14 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr13);
-      rptr15 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr14);
-      rptr16 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr15);
-      rptr17 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr16);
-      rptr18 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr17);
-      rptr19 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr18);
-      rptr20 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr19);
-      rptr21 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr20);
-      rptr22 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr21);
-      rptr23 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr22);
-      rptr24 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr23);
-      rptr25 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr24);
-      rptr26 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr25);
-      rptr27 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr26);
-      rptr28 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr27);
-      rptr29 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr28);
-      rptr30 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr29);
-      rptr31 = AsynSrv_GetReply (&info_ptr->asyn_info,
-		    &info_ptr->from_host, rptr30);
-      if ((rptr00 == NULL) || (rptr01 == NULL) || (rptr02 == NULL) || 
-	  (rptr03 == NULL) || (rptr04 == NULL) || (rptr05 == NULL) || 
-	  (rptr06 == NULL) || (rptr07 == NULL) || (rptr08 == NULL) || 
-	  (rptr09 == NULL) || (rptr10 == NULL) || (rptr11 == NULL) || 
-	  (rptr12 == NULL) || (rptr13 == NULL) || (rptr14 == NULL) || 
-	  (rptr15 == NULL) || (rptr16 == NULL) || (rptr17 == NULL) || 
-	  (rptr18 == NULL) || (rptr19 == NULL) || (rptr20 == NULL) || 
-	  (rptr21 == NULL) || (rptr22 == NULL) || (rptr23 == NULL) || 
-	  (rptr24 == NULL) || (rptr25 == NULL) || (rptr26 == NULL) ||
-	  (rptr27 == NULL) || (rptr28 == NULL) || (rptr29 == NULL) ||
-	  (rptr30 == NULL) || (rptr31 == NULL)) {
-	no_errors = False;
-      }else {
-        StrJoin (Ctrl_id,  sizeof (Ctrl_id),  rptr00, "");
-        StrJoin (Mot_name, sizeof (Mot_name), rptr01, "");
-        StrJoin (Mot_mem,  sizeof (Mot_mem),  rptr02, "");
-	if (sscanf (rptr03, "%d %d", &Enc_typ, &Enc_num) == 2)
-	    no_EC_cmnd = False;
-	if (sscanf (rptr04, "%d", &Dec_pt) == 1) no_A_cmnd  = False;
-	if (sscanf (rptr05, "%d %d", &Enc_fact_0, &Enc_fact_1) == 2)
-	    no_FD_cmnd = False;
-	if (sscanf (rptr06, "%d %d", &Mot_fact_0, &Mot_fact_1) == 2)
-	    no_FM_cmnd = False;
-	if (sscanf (rptr07, "%f", &Inertia_tol) == 1) no_D_cmnd = False;
-	if (sscanf (rptr08, "%d", &Ramp) == 1) no_E_cmnd = False;
-	if (sscanf (rptr09, "%d", &Loop_mode) == 1) no_F_cmnd = False;
-	if (sscanf (rptr10, "%d", &Slow_hz) == 1) no_G_cmnd = False;
-	if (sscanf (rptr11, "%f %f", &Lo, &Hi) == 2) no_H_cmnd = False;
-	if (sscanf (rptr12, "%d", &Fast_hz) == 1) no_J_cmnd = False;
-	if (sscanf (rptr13, "%d", &Ref_mode) == 1) no_K_cmnd = False;
-	if (sscanf (rptr14, "%d", &Backlash) == 1) no_L_cmnd = False;
-	if (sscanf (rptr15, "%d", &Pos_tol) == 1) no_M_cmnd = False;
-	if (sscanf (rptr16, "%f", &Ref_param) == 1) no_Q_cmnd = False;
-	if (sscanf (rptr17, "%d", &Is_sided) == 1) no_T_cmnd = False;
-	if (sscanf (rptr18, "%d", &Null_pt) == 1) no_V_cmnd = False;
-	if (sscanf (rptr19, "%d", &Ac_par) == 1) no_W_cmnd = False;
-	if (sscanf (rptr20, "%d", &Enc_circ) == 1) no_Z_cmnd = False;
-	if (sscanf (rptr21, "%d", &Stat_pos) == 1) no_SP_cmnd = False;
-	if (sscanf (rptr22, "%d", &Stat_pos_flt) == 1) no_ST_cmnd = False;
-	if (sscanf (rptr23, "%d", &Stat_pos_fail) == 1)
-	    no_SR_cmnd = False;
-	if (sscanf (rptr24, "%d", &Stat_cush_fail) == 1)
-	    no_SA_cmnd = False;
-	if (sscanf (rptr25, "%d", &air_cush) == 1) no_AC_cmnd = False;
-	if (sscanf (rptr26, "%d", &inp_state) == 1) no_RI_cmnd = False;
-	if (sscanf (rptr27, "%x", &act_mot) == 1) no_AM_cmnd = False;
-	if (sscanf (rptr28, "%d", &Enc_par) == 1) no_EP_cmnd = False;
-	if (sscanf (rptr29, "%d", &Prop) == 1) no_KP_cmnd = False;
-	if (sscanf (rptr30, "%d", &Integ) == 1) no_KI_cmnd = False;
-	if (sscanf (rptr31, "%d", &Deriv) == 1) no_KD_cmnd = False;
-      }
-    }else {
-      no_errors = False;
-    }
-    if (no_errors) {
-      EL734_GetStatus (&Hndl,
-		&msr, &ored_msr, &fp_cntr, &fr_cntr, &ss, &Ist_pos);
-      if (msr == -1) no_errors = False;
-    }
-    if (no_errors) goto ds_do;
-      printf ("\007");
-      fprintf (lun, "!\n");
-      fprintf (lun, "! Failed to get status of motor\n");
-      if (lun != stdout) {
-	fclose (lun);
-	printf ("\007error detected.\n");
-      }
-      return False;
-ds_do:
-    if (no_K_cmnd) {
-      fprintf (lun, "!\n"
-	"! EL734 ID = \"%s\"\n"
-	"! Server \"%s\"\n"
-	"! Port    %5d\n"
-	"! Channel %5d\n"
-	"! Motor   %5d\n",
-	    Ctrl_id, El734_host, El734_port, El734_chan, Motor);
-    }else {
-      fprintf (lun, "!\n"
-	"! Reference mode information:                 EL734 ID = \"%s\"\n"
-	"!     K = -11 = LoLim + Index is ref. pt.     Server \"%s\"\n"
-	"!          -1 = LoLim is ref. pt.             Port    %5d\n"
-	"!           0 = Abs encoder                   Channel %5d\n"
-	"!           1 = HiLim is ref. pt.             Motor   %5d\n"
-	"!           2 = Separate ref. pt.\n"
-	"!          11 = HiLim + Index is ref. pt.\n"
-	"!          12 = Separate + Index ref. pt.\n",
-	    Ctrl_id, El734_host, El734_port, El734_chan, Motor);
-    }
-    fprintf (lun, "!\n");
-    if (!no_SP_cmnd) fprintf (lun, "! # of positionings,         SP = %d\n",
-				Stat_pos);
-    if (!no_ST_cmnd) fprintf (lun, "! # of positioning faults,   ST = %d\n",
-				Stat_pos_flt);
-    if (!no_SR_cmnd) fprintf (lun, "! # of positioning failures, SR = %d\n",
-				Stat_pos_fail);
-    if (!no_SA_cmnd) fprintf (lun, "! # of air-cushion failures, SA = %d\n",
-				Stat_cush_fail);
-    fprintf (lun, "! %s", EL734_EncodeMSR (buff, sizeof (buff),
-				    msr, ored_msr, fp_cntr, fr_cntr));
-    fprintf (lun, "     %s\n", EL734_EncodeSS (buff, sizeof (buff), ss));
-    if (!no_W_cmnd) {
-      if (Ac_par == 0) {
-        switch (air_cush) {
-         case 0:  break;	/* Don't mention air cushions in this case! */
-	 case 1:  fprintf (lun, "! Air-cushion status is \"on\".\n"); break;
-	 default: fprintf (lun, "! Air-cushion status = %d.\n", air_cush);
-	}
-      }else {
-	switch (air_cush) {
-	 case 0:  fprintf (lun, "! Air-cushion is \"down\"\n"); break;
-	 case 1:  fprintf (lun, "! Air-cushion is \"up\"\n"); break;
-	 default: fprintf (lun, "! Air-cushion status = %d.\n", air_cush);
-	}
-      }
-    }
-    if (!no_RI_cmnd) {
-      switch (inp_state) {
-       case 0:	fprintf (lun, "! Input status is \"off\".\n"); break;
-       case 1:	fprintf (lun, "! Input status is \"on.\"\n"); break;
-       default:	fprintf (lun, "! Input status = %d.\n", inp_state);
-      }
-    }
-    if (!no_AM_cmnd) {
-      if (act_mot != 0) {
-	fprintf (lun, "! Active motor status = 0x%03X\n", act_mot);
-      }else {
-	fprintf (lun, "! No motors are active.\n");
-      }
-    }
-    fprintf (lun, "!\n");
-    if (Mot_name[0] == NIL) {
-      sprintf (buff, " mn  %%d  ...............");
-    }else {
-      sprintf (buff, " mn  %%d  %s", Mot_name);
-    }
-    fprintf (lun, "%-32s! %s\n", buff, "Motor name");
-    if (!no_EC_cmnd) {
-      sprintf (buff, " ec  %%d  0 0");
-      fprintf (lun, "%-32s! %s\n", buff, "Zero the encoder mapping");
-      sprintf (buff, " ec  %%d  %s", rptr03);
-      fprintf (lun, "%-32s! %s\n", buff, "Encoder mapping (type/number)");
-    }
-    if (!no_EP_cmnd) {
-      sprintf (buff, " ep  %%d  %s", rptr28);
-      fprintf (lun, "%-32s! %s\n", buff, "Encoder magic parameter");
-    }
-    if (!no_A_cmnd) {
-      sprintf (buff, " a   %%d  %s",	rptr04);
-      fprintf (lun, "%-32s! %s\n", buff, "Precision");
-    }
-    if (!no_FD_cmnd) {
-      sprintf (buff, " fd  %%d  %s",	rptr05);
-      fprintf (lun, "%-32s! %s\n", buff, "Encoder gearing (numer/denom)");
-    }
-    if (!no_FM_cmnd) {
-      sprintf (buff, " fm  %%d  %s",	rptr06);
-      fprintf (lun, "%-32s! %s\n", buff, "Motor   gearing (numer/denom)");
-    }
-    if (!no_D_cmnd) {
-      sprintf (buff, " d   %%d  %s",	rptr07);
-      fprintf (lun, "%-32s! %s\n", buff, "Inertia tolerance");
-    }
-    if (!no_E_cmnd) {
-      sprintf (buff, " e   %%d  %s",	rptr08);
-      fprintf (lun, "%-32s! %s\n", buff, "Start/stop ramp (kHz/sec)");
-    }
-    if (!no_F_cmnd) {
-      sprintf (buff, " f   %%d  %s",	rptr09);
-      fprintf (lun, "%-32s! %s\n", buff, "Open loop/Closed loop (0/1)");
-    }
-    if (!no_G_cmnd) {
-      sprintf (buff, " g   %%d  %s",	rptr10);
-      fprintf (lun, "%-32s! %s\n", buff, "Start/stop frequency (Mot-S/sec)");
-    }
-    if (!no_H_cmnd) {
-      sprintf (buff, " h   %%d  %s",	rptr11);
-      fprintf (lun, "%-32s! %s\n", buff, "Low/High Software Limits");
-    }
-    if (!no_J_cmnd) {
-      sprintf (buff, " j   %%d  %s",	rptr12);
-      fprintf (lun, "%-32s! %s\n", buff, "Top speed (Mot-S/sec)");
-    }
-    if (!no_K_cmnd) {
-      sprintf (buff, " k   %%d  %s",	rptr13);
-      fprintf (lun, "%-32s! %s\n", buff, "Reference mode");
-    }
-    if (!no_L_cmnd) {
-      sprintf (buff, " l   %%d  %s",	rptr14);
-      fprintf (lun, "%-32s! %s\n", buff, "Backlash/Spielausgleich (Mot-S)");
-    }
-    if (!no_M_cmnd) {
-      sprintf (buff, " m   %%d  %s",	rptr15);
-      fprintf (lun, "%-32s! %s\n", buff, "Position tolerance (Enc-Steps)");
-    }
-    if (!no_Q_cmnd) {
-      sprintf (buff, " q   %%d  %s",	rptr16);
-      fprintf (lun, "%-32s! %s\n", buff, "Reference switch width");
-    }
-    if (!no_T_cmnd) {
-      sprintf (buff, " t   %%d  %s",	rptr17);
-      fprintf (lun, "%-32s! %s\n", buff, "One-sided operation flag (0 = no)");
-    }
-    if (!no_V_cmnd) {
-      sprintf (buff, " v   %%d  %s",	rptr18);
-      fprintf (lun, "%-32s! %s\n", buff, "Null point");
-    }
-    if (!no_W_cmnd) {
-      sprintf (buff, " w   %%d  %s",	rptr19);
-      fprintf (lun, "%-32s! %s\n", buff, "Air-cushion dependency");
-    }
-    if (!no_Z_cmnd) {
-      sprintf (buff, " z   %%d  %s",	rptr20);
-      fprintf (lun, "%-32s! %s\n", buff, "Circumf. of encoder (Enc-Steps)");
-    }
-    if (!no_KP_cmnd) {
-      sprintf (buff, " kp  %%d  %s",	rptr29);
-      fprintf (lun, "%-32s! %s\n", buff, "Proportional");
-    }
-    if (!no_KI_cmnd) {
-      sprintf (buff, " ki  %%d  %s",	rptr30);
-      fprintf (lun, "%-32s! %s\n", buff, "Integral");
-    }
-    if (!no_KD_cmnd) {
-      sprintf (buff, " kd  %%d  %s",	rptr31);
-      fprintf (lun, "%-32s! %s\n", buff, "Differential");
-    }
-    if (Mot_mem[0] == NIL) {
-      sprintf (buff, " mem %%d  ...............");
-    }else {
-      sprintf (buff, " mem %%d  %s", Mot_mem);
-    }
-    fprintf (lun, "%-32s! %s\n", buff, "User data register");
-
-    if (Ref_mode != 0) {
-      fprintf (lun, "%-32s! %s\n", " restore", "Incr. encoder"
-			" - specify position restore");
-    }
-
-    fprintf (lun, "!\n");
-    fprintf (lun, "! Current position is %.*f\n", Dec_pt, Ist_pos);
-    fprintf (lun, "!\n");
-    if (lun != stdout) {
-      fclose (lun);
-      chmod (Save_file, 0644);
-      printf (" OK.\n");
-    }
-    return True;
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoLoad:  Load parameter settings from a file.
-*/
-  int	DoLoad () {
-/*      ======
-*/
-    int	    status, go_on, no_errors, no_restore, i, len,  act_len;
-    int	    msr, ored_msr, fp_cntr, fr_cntr, ss;
-    FILE    *lun;
-    char    recd[132], buff[132], cmnd[80], cmnd_prnt[80];
-		/*
-		** Setting motor parameters usually causes the current
-		** position to get lost. Read it now so that it can be
-		** restored at the end if required.
-		*/
-    printf ("The current position, ");
-    status = EL734_GetPrecision (&Hndl, &Dec_pt);
-    if (status) {
-      EL734_GetStatus (&Hndl,
-		&msr, &ored_msr, &fp_cntr, &fr_cntr, &ss, &Ist_pos);
-      if (msr == -1) status = False;
-    }
-    if (!status) {
-      printf ("\n     ... failed to get current position.\n");
-      return False;
-    }else {
-      printf ("%.*f, can be restored at end of load operation if\n"
-	"a \"RESTORE\" command is given. Executing a \"U\" or a \"UU\""
-			" or any motion command\n"
-	"will cancel the effect of a \"RESTORE\" command.\n",
-		    Dec_pt, Ist_pos);
-      no_restore = True;
-    }
-
-    if ((strcmp (Load_file, "-") == 0) ||
-	(strcmp (Load_file, "=") == 0)) {	/* Use standard input? */
-      lun = stdin;				/* Yes */
-      printf ("Getting motor parameters from standard input ...\n> ");
-    }else {
-      lun = fopen (Load_file, "r");
-      if (lun == NULL) {
-        printf ("\007Error opening file %s ... load failed.\n", Load_file);
-	return False;
-      }
-      printf ("Getting motor parameters from file %s ...\n", Load_file);
-    }
-
-    go_on = True;
-    no_errors  = True;
-
-    while (go_on && (fgets (recd, sizeof (recd), lun) != NULL)) {
-      len = strlen (recd);
-      if (len <= 1) {
-	if (lun == stdin) {printf ("> "); fflush (NULL);}
-        continue;
-      }
-      if (recd[len-1] != '\n') {
-	recd[20] = NIL;
-        printf ("\007   Record not terminated by \"\\n\". "
-			    "It is probably too long!\n"
-		"   The record starts thus: %s ...\n"
-		"   It has been skipped.\n", recd);
-	if (lun == stdin) {printf ("> "); fflush (NULL);}
-	continue;
-      }
-      recd[len-1] = NIL;	/* Remove the terminating "\n" */
-	    /*
-	    ** Strip off any trailing stuff (but keep it around so that we
-	    ** can print it out). "Trailing stuff" is anything after a "!".
-	    */
-      act_len = strcspn (recd, "!");
-      len = sizeof (buff);
-      StrEdit (buff, recd, "trim compress uncomment", &len);
-	    /*
-	    ** If the remainder is just white-space, do nothing.
-	    */
-      if (len <= 0) {
-        if (lun == stdin) {printf ("> "); fflush (NULL);}
-	continue;
-      }
-      if (strlen (buff) >= sizeof (cmnd)) {
-	recd[20] = NIL;
-        printf ("\007   Record has a dubious format!!\n"
-		"   The record starts thus: %s ...\n"
-		"   It has been skipped.\n", recd);
-	if (lun == stdin) {printf ("> "); fflush (NULL);}
-	continue;
-      }
-      if (sprintf (cmnd, buff, Motor) >= sizeof (cmnd)) {
-	fprintf (stderr,
-		"\007   Record has generated a command which is too long.\n"
-		"   This may have corrupted the program. To be safe,\n"
-		"   we are now going to do an emergency exit. Bye.\n");
-	exit (False);
-      }
-      if ((lun != stdin) && (len > 0)) {    /* Show user what's going on */
-	strcpy (cmnd_prnt, cmnd);
-	MakePrint (cmnd_prnt);
-        printf ("%-32s%s\n", cmnd_prnt, &recd[act_len]); fflush (NULL);
-      }
-      len = sizeof (cmnd);
-      StrEdit (cmnd, cmnd, "upcase compress", &len);
-      if (strncmp (cmnd, "EXIT", 4) == 0) {
-        go_on = False;
-	continue;
-      }else if (strncmp (cmnd, "QUIT", 4) == 0) {
-        go_on = False;
-	continue;
-      }else if (strncmp (cmnd, "NO_RESTORE", 10) == 0) {
-        no_restore = True;
-	printf ("The restore operation has been suppressed via "
-		    "the \"NO_RESTORE\" command.\n");
-      }else if (strncmp (cmnd, "RESTORE", 7) == 0) {
-        no_restore = False;
-	printf ("The restore operation has been requested via "
-		    "the \"RESTORE\" command.\n");
-      }else if (strncmp (cmnd, "WAIT", 4) == 0) {
-	status = My_WaitIdle (&Hndl, Verbose,
-			&ored_msr, &fp_cntr, &fr_cntr, &Ist_pos);
-	if (!status) {
-	  go_on = no_errors = False;
-	  if (Ctrl_C_has_happened) DoStop ();
-	  continue;
-	}else {
-	  if ((ored_msr & ~(MSR__BUSY | MSR__OK)) != 0) {
-	    printf ("! %s\n", EL734_EncodeMSR (buff, sizeof (buff),
-				    0, ored_msr, fp_cntr, fr_cntr));
-	  }
-	}
-      }else {
-	len = strlen (cmnd);
-	if (len == 2 && cmnd[0] == '\\' && cmnd[1] == 'R') len = 0;
-	if (len == 2 && cmnd[0] == '\\' && cmnd[1] == '0') {
-	  cmnd[0] = NIL;	/* Null command */
-	}else {
-	  cmnd[len] = '\r';	/* Terminate command with a <Return> */
-	  cmnd[len+1] = NIL;
-	}
-	status = EL734_SendCmnd (&Hndl, cmnd, buff, sizeof (buff));
-	if (!status) {
-	  go_on = no_errors = False;
-	  continue;
-	}else {
-	  if (buff[0] == NIL) {
-	    len = sizeof (cmnd);
-	    if ((strncmp (cmnd, "U ",  2) == 0) ||
-		(strncmp (cmnd, "UU ", 3) == 0) ||
-		(strncmp (cmnd, "P ",  2) == 0) ||
-		(strncmp (cmnd, "PD ", 3) == 0) ||
-		(strncmp (cmnd, "PR ", 3) == 0) ||
-		(strncmp (cmnd, "R ",  2) == 0) ||
-		(strncmp (cmnd, "FF ", 3) == 0) ||
-		(strncmp (cmnd, "FB ", 3) == 0) ||
-		(strncmp (cmnd, "SF ", 3) == 0) ||
-		(strncmp (cmnd, "SB ", 3) == 0)) {
-	      no_restore = True;
-	    }else if ((strncmp (cmnd, "A ",  2) == 0) ||
-		      (strncmp (cmnd, "E ",  2) == 0) ||
-		      (strncmp (cmnd, "EP ", 3) == 0) ||
-		      (strncmp (cmnd, "F ",  2) == 0) ||
-		      (strncmp (cmnd, "G ",  2) == 0) ||
-		      (strncmp (cmnd, "J ",  2) == 0) ||
-		      (strncmp (cmnd, "K ",  2) == 0) ||
-		      (strncmp (cmnd, "L ",  2) == 0) ||
-		      (strncmp (cmnd, "M ",  2) == 0) ||
-		      (strncmp (cmnd, "T ",  2) == 0) ||
-		      (strncmp (cmnd, "V ",  2) == 0) ||
-		      (strncmp (cmnd, "W ",  2) == 0) ||
-		      (strncmp (cmnd, "Z ",  2) == 0)) {
-	      LoadCheckOneInteger (cmnd);
-	      if (strncmp (cmnd, "A ",  2) == 0) {
-		status = EL734_GetPrecision (&Hndl, &i);
-		if (status) Dec_pt = i;
-	      }
-	    }else if ((strncmp (cmnd, "EC ", 3) == 0) ||
-		      (strncmp (cmnd, "FD ", 3) == 0) ||
-		      (strncmp (cmnd, "FM ", 3) == 0)) {
-	      LoadCheckTwoInteger (cmnd);
-	    }else if ((strncmp (cmnd, "D ",  2) == 0)) {
-	      LoadCheckOneFloat (cmnd, 1);   /* D cmnd only has 1 Dec Place */
-	    }else if ((strncmp (cmnd, "Q ",  2) == 0)) {
-	      LoadCheckOneFloat (cmnd, Dec_pt);
-	    }else if ((strncmp (cmnd, "H ",  2) == 0)) {
-	      LoadCheckTwoFloat (cmnd, Dec_pt);
-	    }
-	  }else {
-	    if (buff[0] == '?') {
-	      printf ("%s\n", buff);
-	      if (lun != stdin) {		/* If input from file .. */
-		go_on = no_errors = False;	/* .. quit */
-		continue;
-	      }
-	    }else {
-	      if (strncmp (cmnd, "MSR ", 4) == 0) {
-		sscanf (buff, "%x", &ored_msr);
-		printf ("%s ! %s\n", buff,
-				EL734_EncodeMSR (buff, sizeof (buff),
-				    ored_msr, ored_msr, 0, 0));
-	      }else if (strncmp (cmnd, "SS ", 3) == 0) {
-		sscanf (buff, "%x", &ss);
-		printf ("%s ! %s\n", buff,
-				EL734_EncodeSS (buff, sizeof (buff), ss));
-	      }else {
-		printf ("%s\n", buff);
-	      }
-	    }
-	  }
-	}
-      }
-      if (lun == stdin) {printf ("> "); fflush (NULL);}
-    }
-		/*
-		** Restore the current motor position.
-		*/
-    if (no_errors && !no_restore) {
-      EL734_GetPrecision (&Hndl, &Dec_pt);
-      printf ("Restoring %.*f as current motor position ...\n",
-		    Dec_pt, Ist_pos);
-      sprintf (cmnd, "uu %d %.*f\r", Motor, Dec_pt, Ist_pos);
-      status = EL734_SendCmnd (&Hndl, cmnd, buff, sizeof(buff));
-      if (status) {
-	if (buff[0] != NIL) {
-	  no_errors = False;
-	}
-      }else {
-	no_errors = False;
-      }
-    }
-    if (lun != stdin) fclose (lun);
-    if (no_errors) {
-      printf ("\"load\" completed.\n");
-      EL734_GetStatus (&Hndl,
-		&msr, &ored_msr, &fp_cntr, &fr_cntr, &ss, &Ist_pos);
-      printf ("The motor position is %.*f\n", Dec_pt, Ist_pos);
-    }else {
-      printf ("\007Failed to load motor parameters.\n");
-    }
-    return no_errors;
-  }
-/*
-**--------------------------------------------------------------------------
-**		DoDiff:  Compare parameter settings with those in a file.
-*/
-  int	DoDiff () {
-/*      ======
-*/
-    int	    status, go_on, no_errors, n_errs, i, len,  act_len;
-    int	    msr, ored_msr, fp_cntr, fr_cntr, ss;
-    FILE    *lun;
-    char    recd[132], buff[132], buff0[132], cmnd[80], cmnd_prnt[80];
-    char    *tok0, *tok1, *tok2, *tok3, *tok2a, *tok3a;
-
-    if ((strcmp (Diff_file, "-") == 0) ||
-	(strcmp (Diff_file, "=") == 0)) {	/* Use standard input? */
-      lun = stdin;				/* Yes */
-      printf ("Comparing motor parameters with those from standard "
-			"input ...\n> ");
-    }else {
-      lun = fopen (Diff_file, "r");
-      if (lun == NULL) {
-        printf ("\007Error opening file %s ... diff failed.\n", Diff_file);
-	return False;
-      }
-      printf ("Comparing motor parameters with those in %s ...\n", Diff_file);
-    }
-
-    go_on = True;
-    no_errors = True;
-    n_errs = 0;
-
-    while (go_on && (fgets (recd, sizeof (recd), lun) != NULL)) {
-      len = strlen (recd);
-      if (len <= 1) {
-	if (lun == stdin) {printf ("> "); fflush (NULL);}
-        continue;
-      }
-      if (recd[len-1] != '\n') {
-	recd[20] = NIL;
-        printf ("\007   Record not terminated by \"\\n\". "
-			    "It is probably too long!\n"
-		"   The record starts thus: %s ...\n"
-		"   It has been skipped.\n", recd);
-	if (lun == stdin) {printf ("> "); fflush (NULL);}
-	continue;
-      }
-      recd[len-1] = NIL;	/* Remove the terminating "\n" */
-	    /*
-	    ** Strip off any trailing stuff (but keep it around so that we
-	    ** can print it out). "Trailing stuff" is anything after a "!".
-	    */
-      act_len = strcspn (recd, "!");
-      len = sizeof (buff0);
-      StrEdit (buff0, recd, "trim compress uncomment", &len);
-	    /*
-	    ** If the remainder is just white-space, do nothing.
-	    */
-      if (len <= 0) {
-        if (lun == stdin) {printf ("> "); fflush (NULL);}
-	continue;
-      }
-      if (sprintf (buff, buff0, Motor) >= sizeof (buff)) {
-	fprintf (stderr,
-		"\007   Record has generated a command which is too long.\n"
-		"   This may have corrupted the program. To be safe,\n"
-		"   we are now going to do an emergency exit. Bye.\n");
-	exit (False);
-      }
-      if (strlen (buff) >= sizeof (cmnd)) {
-	recd[20] = NIL;
-        printf ("\007   Record has a dubious format!!\n"
-		"   The record starts thus: %s ...\n"
-		"   It has been skipped.\n", recd);
-	if (lun == stdin) {printf ("> "); fflush (NULL);}
-	continue;
-      }
-      tok0 = strtok (buff, " \t"); if (tok0 == NULL) tok0 = "";
-      tok1 = strtok (NULL, " \t"); if (tok1 == NULL) tok1 = "";
-      tok2 = strtok (NULL, " \t"); if (tok2 == NULL) tok2 = "";
-      tok3 = strtok (NULL, " \t"); if (tok3 == NULL) tok3 = "";
-      MakePrint (tok0); MakePrint (tok1); MakePrint (tok2); MakePrint (tok3);
-      sprintf (cmnd_prnt, "%-2s %s", tok0, tok1);
-      len = sizeof (cmnd);
-      StrEdit (cmnd, cmnd_prnt, "upcase compress", &len);
-      StrJoin (cmnd_prnt, sizeof (cmnd_prnt), cmnd_prnt, " ");
-      StrJoin (cmnd_prnt, sizeof (cmnd_prnt), cmnd_prnt, tok2);
-      StrJoin (cmnd_prnt, sizeof (cmnd_prnt), cmnd_prnt, " ");
-      StrJoin (cmnd_prnt, sizeof (cmnd_prnt), cmnd_prnt, tok3);
-      if (strncmp (cmnd, "EXIT", 4) == 0) {
-        go_on = False;
-	continue;
-      }else if (strncmp (cmnd, "QUIT", 4) == 0) {
-        go_on = False;
-	continue;
-      }else if ((strcmp (tok2, "0") == 0) &&
-		(strcmp (tok3, "0") == 0) &&
-		(strcmp (&recd[act_len], "! Zero the encoder mapping") == 0)) {
-		    /*
-		    ** This is the command "ec %d 0 0" which is used to zero
-		    ** the encoder mapping before it is set again. Simply
-		    ** skip this command.
-		    */
-        if (lun == stdin) {printf ("> "); fflush (NULL);}
-	continue;
-      }else {
-	if (lun != stdin) {			/* Show user what's going on */
-	  printf ("%-32s%s\n", cmnd_prnt, &recd[act_len]); fflush (NULL);
-	}
-	len = strlen (cmnd);
-	cmnd[len] = '\r';	/* Terminate command with a <Return> */
-	cmnd[len+1] = NIL;
-	status = EL734_SendCmnd (&Hndl, cmnd, buff0, sizeof (buff0));
-	if (!status) {
-	  go_on = no_errors = False;
-	  n_errs++;
-	  continue;
-	}else {
-	  tok2a = strtok (buff0, " \t"); if (tok2a == NULL) tok2a = "";
-	  tok3a = strtok (NULL,  " \t"); if (tok3a == NULL) tok3a = "";
-	  if ((strcmp (tok2, tok2a) != 0) && (strcmp (tok3, tok3a) != 0)) {
-	    printf ("   >>>> Parameters were %-7s and %s\n", tok2,  tok3);
-	    printf ("   >>>> Now they are    %-7s and %s\n", tok2a, tok3a);
-	    no_errors = False;
-	    n_errs++;
-	  }else if (strcmp (tok2, tok2a) != 0) {
-	    if ((strcmp (tok2,  "") == 0) ||
-		(strcmp (tok2a, "...............") == 0)) {
-	    }else if ((strcmp (tok2,  "...............") == 0) ||
-		      (strcmp (tok2a, "") == 0)) {
-	    }else {
-	      printf ("   >>>> Parameter was %-7s\n", tok2);
-	      printf ("   >>>> Now it is     %-7s\n", tok2a);
-	      no_errors = False;
-	      n_errs++;
-	    }
-	  }else if (strcmp (tok3, tok3a) != 0) {
-	    printf ("   >>>> Parameters were %-7s and %s\n", tok2,  tok3);
-	    printf ("   >>>> Now they are    %-7s and %s\n", tok2a, tok3a);
-	    no_errors = False;
-	    n_errs++;
-	  }
-	}
-      }
-      if (lun == stdin) {printf ("> "); fflush (NULL);}
-    }
-    if (lun != stdin) fclose (lun);
-    if (no_errors) {
-      printf ("All OK.\n");
-    }else if (n_errs == 1) {
-      printf ("\007%d motor parameter difference found.\n", n_errs);
-    }else {
-      printf ("\007%d motor parameter differences found.\n", n_errs);
-    }
-    return no_errors;
-  }
-/*
-**---------------------------------------------------------------------------
-**			DoWait - wait (if necessary)
-*/
-  void	DoWait (
-/*	======
-*/		int	print_flag) {
-
-    int		my_wait, irand;
-    float	my_rand;
-
-    if (Wait_time == 0) return;
-
-    if (Wait_time > 0) {
-      if (print_flag) printf (" waiting %d secs ...", Wait_time);
-      sleep (Wait_time);
-      if (print_flag) printf ("\n");
-      return;
-    }
-
-    my_wait = -Wait_time;
-
-    irand = rand () & 0x7FFF;
-    my_rand = ((float) irand)/32768.0;
-
-    my_rand = my_rand * ((float) (my_wait));
-    irand = (int) (my_rand + 1);
-    if (print_flag) printf (" waiting %d secs ...", irand);
-    sleep (irand);
-    if (print_flag) printf ("\n");
-  }
-/*
-**--------------------------------------------------------------------------
-**		PrintUsage: Auxilliary routine for ShowUsage and ShowItemUsage
-*/
-  int	PrintUsage (char **txt, int n_recd) {
-/*	==========
-*/
-    int	    i = 0;
-    int	    ans;
-
-    printf ("\n");
-    while (i < n_recd) {
-      printf ("%s\n", txt[i]);
-      i++;
-      if ((i % 24 == 0) && isatty (STDOUT)) {
-	printf ("More? ");
-	ans = getchar ();
-	if ((ans == EOF) || (toupper (ans) == 'Q')) return False;
-      }
-    }
-    printf ("\n");
-  }
-/*
-**--------------------------------------------------------------------------
-**		ShowUsage:  A simple help routine.
-*/
-  void	ShowUsage (int level) {
-/*      =========
-*/
-    char    *short_help_txt[] = {
-"\007To get help on running the program issue the command:",
-"",
-"       el734_test -help"};
-
-    char    *help_txt[] = {
-" Usage:  el734_test [options ...]",
-"",
-" Valid options are:",
-"    -help                     Generates this help text.",
-"    -?         <option>       Get detailed help on <option>.",
-"    -?cmd                     Gives list of EL734 commands.",
-"    -?msg                     Gives list of EL734 messages.",
-"    -?par                     Gives list of EL734 parameters.",
-"    -?res                     Get list of Xlib resources.",
-"    -chan      <channel>      Specify channel number of EL734.",
-"    -f         <freq>         Abbreviation for \"-frequency\".",
-"    -fb                       Fast backward to low  software limit.",
-"    -ff                       Fast forward  to high software limit.",
-"    -frequency <freq>         Frequency for -fb, -ff, -sb or -sf operation.",
-"    -hi        <high-limit>   Abbreviation for \"-high\".",
-"    -high      <high-limit>   Specify high limit for -saw, -scan and -rndm.",
-"    -host      <host-name>    Specify name of TCP/IP server.",
-"    -hunt                     Hunt for reference point then do \"-ref\".",
-"    -id        <device-id>    Specify expected EL734 identifier.",
-"    -limits    <lo>/<hi>      Set the Lo/Hi software limits.",
-"    -lo        <low-limit>    Abbreviation for \"-low\".",
-"    -load      <file>         Read file and set motor params.",
-"    -low       <low-limit>    Specify low limit for -saw, -scan and -rndm.",
-"    -m         <index>        Abbreviation for \"-motor\".",
-"    -motor     <index>        Specify motor number (1 .. 12)",
-"    -n         <n-moves>      Specify number of moves to make.",
-"    -p         <target>       Abbreviation for \"-position\".",
-"    -port      <port-number>  Specify port number of TCP/IP server.",
-"    -position  <target>       Position the motor.",
-"    -random                   Perform <n-moves> random moves.",
-"    -ref                      Perform reference seek.",
-"    -rndm                     Abbreviation for \"-random\".",
-"    -s                        Abbreviation for \"-stop\".",
-"    -save      <file>         Read motor parameters and save to file.",
-"    -saw                      Perform <n-moves> moves between <low-limit>",
-"                              and <high-limit>.",
-"    -sb                       Slow backward to low software limit.",
-"    -scan                     Perform <n-moves> equal moves from <low-limit>",
-"                              to <high-limit>.",
-"    -seed      <seed-value>   Specify random number seed.",
-"    -sf                       Slow forward to high software limit.",
-"    -step      <step-size>    Perform an incremental move.",
-"    -stop                     Stop the motor moving.",
-"    -tmo       <secs>         Specify time-out to wait for response.",
-"    -ur@       <pos>          Set the current position to be <pos>.",
-"    -v         <wid>          Specify \"verbosity\". Dflt = 10.",
-"    -wait      <secs>         Specify wait time between moves.",
-"",
-" No default is allowed for -host, -chan or -motor, i.e. values for",
-" these parameters must be supplied either via a resource file or on the",
-" command line. If <file> is specified as \"-\" or \"=\", standard input or",
-" output will be used rather than a file.",
-"",
-" When the program starts, the EL734 identifier will be used to ensure that",
-" an EL734 is being addressed. The identifier string must start with the",
-" characters \"STPMC EL734\" or \"DCMC EL734\". Specifying \"ignore\" for",
-" <device-id> will suppress the ID check.",
-"",
-" The positioning options, i.e. -position, -step, -ref, -hunt, -random, -saw,",
-" -scan, -ff, -fb, -sf and -sb are mutually exclusive. If neither a positioning",
-" option nor a -save, -load, -stop, -ur@ nor -limits option has been specified,",
-" \"-save -\" will be assumed.",
-"",
-" Regardless of the order of options on the command line, -load will be done",
-" before any positioning commands and -save will be done last.",
-"",
-" A motor movement can be interrupted by hitting <Ctrl-C>."};
-
-    if (level == 0) {	    /* Level 0 is called after an error is detected */
-      if (Do_help) return;
-      PrintUsage (short_help_txt, N_ELEMENTS (short_help_txt));
-    }else {
-      PrintUsage (help_txt, N_ELEMENTS (help_txt));
-    }
-    return;
-  }
-/*
-**--------------------------------------------------------------------------
-**		ShowItemUsage:  give more detailed help.
-*/
-  void	ShowItemUsage (char *item) {
-/*      =============
-*/
-    char    my_item[40];
-    char    *cmd_txt[] = {
-"The EL734 recognises the following commands:",
-" AM        - read active motor status (hex integer)",
-" U         - read current position of all motors",
-" U   m [r] - read or set current position (note: \"U m r\" also",
-"              modifies the limit parameters)",
-" UD  m     - read current position as hex integer",
-" UU  m [r] - read or set current position (note: \"UU m r\" does",
-"              not modify the limit parameters)",
-" P   m r   - drive motor to new target position",
-" P   m     - read target position",
-" PD  m [h] - read or set current position as hex integer",
-" PR  m i   - drive motor \"i\" steps",
-" N   m     - free motor from limit switch",
-" S   [m]   - stop specified motor or all motors",
-" R   m     - reference search and set current position to",
-"              reference point if successful",
-" RF  m     - reference search but do not set current",
-"              position to reference point",
-" FF  m [i] - fast forward  to high limit with ramp. Frequency = <i>",
-" FB  m [i] - fast backward to low  limit with ramp. Frequency = <i>",
-" SF  m [i] - slow forward  to high limit without ramp. Frequency = <i>",
-" SB  m [i] - slow backward to low  limit without ramp. Frequency = <i>",
-" AC  m [i] - read or change air-cushion status (0/1 = down/up)",
-" SO  m [i] - read or change status of output signal",
-" RI  [m]   - read or change status of input signal",
-" MSR m     - read and clear motor status register",
-" SS  m     - read status flag register",
-" DE  m     - set all parameters of motor to default",
-" ECHO [i]  - read or set echo mode (0/1/2 = off/on/off-with-*-messages)",
-" RMT [i]   - read or set controller manual status (0/1 = manual/remote)",
-" %         - stop all motors and reset all parameters of all motors",
-"              to default",
-" ?         - provide help information",
-" ?C        - provide list of commands",
-" ?P        - provide list of parameters",
-" ?M        - provide list of messages"};
-
-    char    *msg_txt[] = {
-"The following messages may be generated by the EL734:",
-"",
-" ?ADR   Address error",
-" ?BSY   Motor busy",
-" ?CMD   Command error",
-" ?LOC   Local mode",
-" ?PAR   Parameter error",
-" ?RNG   Range error",
-"",
-" *ACE   0x1000  Aircushion error",
-" *FP    0x0200  Position fault",
-" *FR    0x0080  Run fault",
-" *MB    0x0001  Motor busy",
-" *MF    0x0400  Position failure",
-" *MH    0x0040  Stop on HALT",
-" *ML    0x0010  Stop on low limit switch",
-" *MP    0x0002  Position ready",
-" *MR    0x0100  Run failure",
-" *MS    0x0008  Stop on STOP switch or command",
-" *MU    0x0020  Stop on upper limit switch",
-" *NF    0x2000  Failed to free end stop",
-" *RF    0x0800  Reference failure",
-" *RP    0x0004  Reference position ready",
-"",
-" The \"*\" messages are interrupts. The equivalent bits in the",
-" MSR register is indicated by the hex values shown.",
-""};
-    char    *par_txt[] = {
-"",
-"The EL734 has the following parameters:",
-" A   m [i]     - # digits after decimal point",
-" FD  m [i1 i2] - encoder gearing ratio (numer/denom)",
-" FM  m [i1 i2] - motor   gearing ratio (numer/denom)",
-" D   m [r]     - inertia tolerance",
-" E   m [i]     - start/stop ramp (kHz/sec)",
-" EC  m [i1 i2] - encoder mapping (type/number) (step motors)",
-" EP  m [i]     - encoder magic parameter (step motors)",
-" F   m [i]     - open loop/closed loop (0/1)",
-" G   m [i]     - start/stop frequency (motor-steps/sec) (step motors)",
-" H   m [r1 r2] - low/high software limits",
-" ID            - controller identifier",
-" J   m [i]     - top speed (motor-steps/sec)",
-" K   m [i]     - reference mode (step motors)",
-" KP  m [i]     - proportional PID parameter (DC motors)",
-" KI  m [i]     - integral     PID parameter (DC motors)",
-" KD  m [i]     - derivative   PID parameter (DC motors)",
-" L   m [i]     - backlash/spielausgleich (motor-steps) (step motors)",
-" M   m [i]     - position tolerance (encoder-steps)",
-" MEM m [txt]   - 15 character memory register",
-" MN  m [txt]   - 15 character motor name",
-" Q   m [r]     - reference switch width (step motors)",
-" T   m [i]     - one-sided operation flag (0 = no) (step motors)",
-" V   m [i]     - null point",
-" W   m [i]     - air-cushion dependency (step motors)",
-" Z   m [i]     - circumf. of encoder (encoder-Steps) (step motors)",
-" SP  m [i]     - # of positionings",
-" ST  m [i]     - # of positioning faults",
-" SR  m [i]     - # of positioning failures",
-" SA  m [i]     - # of air-cushion failures",
-" SN  [CLR]     - # of parameter resets",
-" SW  [CLR]     - # of watchdog  resets"};
-
-    char    *res_txt[] = {
-"The correspondence between options and resource names is as follows:",
-"",
-"    Option            Equivalent resource name",
-"    ======            ========================",
-"    -?                  *el734HelpItem",
-"    -?cmd               *el734HelpCmd",
-"    -?msg               *el734HelpMsg",
-"    -?par               *el734HelpPar",
-"    -?res               *el734HelpRes",
-"    -chan               *el734Chan",
-"    -diff               *el734Diff",
-"    -f                  *el734Frequency",
-"    -fb                 *el734Fb",
-"    -ff                 *el734Ff",
-"    -frequency          *el734Frequency",
-"    -help               *el734Help",
-"    -hi                 *el734High",
-"    -high               *el734High",
-"    -host               *el734Host",
-"    -hunt               *el734Hunt",
-"    -id                 *el734Id",
-"    -limits             *el734Limits",
-"    -lo                 *el734Low",
-"    -load               *el734Load",
-"    -low                *el734Low",
-"    -m                  *el734Motor",
-"    -motor              *el734Motor",
-"    -n                  *el734N",
-"    -p                  *el734Position",
-"    -port               *el734Port",
-"    -position           *el734Position",
-"    -random             *el734Random",
-"    -ref                *el734Ref",
-"    -rndm               *el734Random",
-"    -s                  *el734Stop",
-"    -save               *el734Save",
-"    -saw                *el734Saw",
-"    -sb                 *el734Sb",
-"    -scan               *el734Scan",
-"    -seed               *el734Seed",
-"    -sf                 *el734Sf",
-"    -step               *el734Step",
-"    -stop               *el734Stop",
-"    -tmo                *el734Tmo",
-"    -ur@                *el734SetPos",
-"    -v                  *el734Verbose",
-"    -V                  *el734VeryVerbose",
-"    -wait               *el734Wait"};
-
-    char    *chan_txt[] = {
-"Usage of \"-chan <chan>\"",
-"   <chan> specifies the RS-232-C channel to which the EL734 is",
-"          attached on the server. It is usually a small integer.",
-"          There is no default."};
-
-    char    *f_txt[] = {
-"Usage of \"-f <freq>\"",
-"   <freq> specifies the frequency to be used in an -fb, -ff, -sb or -sf",
-"          command. The default is to use the J register value for the -fb",
-"          and -ff commands and the G register value for the -sb and -sf",
-"          commands."};
-
-    char    *fb_txt[] = {
-"Usage of \"-fb\"   (Fast Backward)",
-"   An FB command is issued to the motor. The motor moves with ramp to the",
-"   lower software limit. The top speed is either <freq> or, if no -frequency",
-"   option has been specified, the value of the J register."};
-
-    char    *ff_txt[] = {
-"Usage of \"-ff\"   (Fast Forward)",
-"   An FF command is issued to the motor. The motor moves with ramp to the",
-"   upper software limit. The top speed is either <freq> or, if no -frequency",
-"   option has been specified, the value of the J register."};
-
-    char    *frequency_txt[] = {
-"Usage of \"-frequency <freq>\"",
-"   <freq> specifies the frequency to be used in an -fb, -ff, -sb or -sf",
-"          command. The default is to use the J register value for the -fb",
-"          and -ff commands and the G register value for the -sb and -sf",
-"          commands."};
-
-    char    *hi_txt[] = {
-"Usage of \"-hi <high-limit>\"",
-"   <high-limit> specifies the upper limit to be used in -saw, -scan and -rndm",
-"                operations. It defaults to the upper software limit of the",
-"                motor (H register value)."};
-
-    char    *high_txt[] = {
-"   <high-limit> specifies the upper limit to be used in -saw, -scan and -rndm",
-"                operations. It defaults to the upper software limit of the",
-"                motor (H register value)."};
-
-    char    *host_txt[] = {
-"Usage of \"-host <host-name>\"",
-"   <host-name> specifies the name of the RS-232-C server computer to which the",
-"               EL734 is connected. There is no default."};
-
-    char    *hunt_txt[] = {
-"Usage of \"-hunt\"",
-"   The program will hunt for the the motor's reference point and then carry",
-"   out a reference positioning operation. The method used for the search",
-"   depends on the value of the K register."};
-
-    char    *id_txt[] = {
-"Usage of \"-id <device-id>\"",
-"   <device-id> specifies the expected response from the EL734 to the \"ID\"",
-"               command. When this program first starts, it issues an ID",
-"               command to check that it is connected to an EL734. By default,",
-"               the response is expected to start with \"STPMC EL734\" or",
-"               \"DCMC EL734\". By specifying <device-id> to be \"ignore\",",
-"               the identifier check is suppressed."};
-
-    char    *limits_txt[] = {
-"Usage of \"-limits <lo>/<hi>\"",
-"   <lo>/<hi> specify the lower and upper software limits (H register values)",
-"             for the motor. These values are set in the EL734 controller."};
-
-    char    *lo_txt[] = {
-"Usage of \"-lo <low-limit>\"",
-"   <low-limit> specifies the lower limit to be used in -saw, -scan and -rndm",
-"               operations. It defaults to the lower software limit of the",
-"               motor (H register value)."};
-
-    char    *load_txt[] = {
-"Usage of \"-load <file>\"",
-"   The file <file> is read record by record. Any \"%d\" token in a record",
-"   is replaced with the motor index and sent as a command to the EL734.",
-"   This is the opposite of the \"-save\" option. It is used for setting",
-"   a motor's parameters to the values saved in the \"-save\" file.",
-"",
-"   If <file> is specified as \"-\" or \"=\", commands are read from 'standard",
-"   input'. In this case, the \"-load\" option can be used interactively."};
-
-    char    *low_txt[] = {
-"Usage of \"-low <low-limit>\"",
-"   <low-limit> specifies the lower limit to be used in -saw, -scan and -rndm",
-"               operations. It defaults to the lower software limit of the",
-"               motor (H register value)."};
-
-    char    *m_txt[] = {
-"Usage of \"-m <index>\"",
-"   <index> is the number of the motor to be used. It is an integer in the",
-"           range 1 to 12. There is no default."};
-
-    char    *motor_txt[] = {
-"Usage of \"-motor <index>\"",
-"   <index> is the number of the motor to be used. It is an integer in the",
-"           range 1 to 12. There is no default."};
-
-    char    *n_txt[] = {
-"Usage of \"-n <n-moves>\"",
-"   <n-moves> specifies the number of times the motor should be moved in",
-"             a -saw, -scan or -random option. The default is 5."};
-
-    char    *p_txt[] = {
-"Usage of \"-p <target>\"",
-"   The motor will move to the location specified by <target>. The program",
-"   will wait until the motor becomes idle. If the -v parameter is non-zero,",
-"   the changing motor position will be reported on the screen."};
-
-    char    *port_txt[] = {
-"Usage of \"-port <port-number>\"",
-"   <port-number> specifies the TCP/IP port number of the RS-232-C server",
-"                 when listening for connections. The default is 4000."};
-
-    char    *position_txt[] = {
-"Usage of \"-position <target>\"",
-"   The motor will move to the location specified by <target>. The program",
-"   will wait until the motor becomes idle. If the -v parameter is non-zero,",
-"   the changing motor position will be reported on the screen."};
-
-    char    *random_txt[] = {
-"Usage of \"-random\"",
-"   The motor will be positioned <n-moves> times to random target positions",
-"   in the range <low-limit> to <high-limit>. After each move, the program waits",
-"   for a time specified by the -wait option before starting the next move."};
-
-    char    *ref_txt[] = {
-"Usage of \"-ref\"",
-"   A reference positioning operation is started via the RF command. If",
-"   successful, the displacement between the motor position and the zero",
-"   position is displayed. This represents a shift in the motor position",
-"   since the last time a -ref option was performed. The position of the motor",
-"   is then set to the zero position. Finally, if the zero position is outside",
-"   the software limits, the motor is driven to the nearest software limit."};
-
-    char    *rndm_txt[] = {
-"Usage of \"-rndm\"",
-"   The motor will be positioned <n-moves> times to random target positions",
-"   in the range <low-limit> to <high-limit>. After each move, the program waits",
-"   for a time specified by the -wait option before starting the next move."};
-
-    char    *s_txt[] = {
-"Usage of \"-s\"",
-"   A \"Stop\" command is issued to the motor."};
-
-    char    *save_txt[] = {
-"Usage of \"-save <file>\"",
-"   The motor's parameters will be read and saved in file <file>. If <file>",
-"   is specified as \"-\" or \"=\", the list of parameters will be written",
-"   to 'standard output'."};
-
-    char    *saw_txt[] = {
-"Usage of \"-saw\"",
-"   The motor will be positioned <n-moves> times alternately to <low-limit>",
-"   and <high-limit>. After each move, the program waits for a time specified",
-"   by the -wait option before starting the next move."};
-
-    char    *sb_txt[] = {
-"Usage of \"-sb\"   (Slow Backward)",
-"   An SB command is issued to the motor. The motor moves without ramp to the",
-"   lower software limit. The speed is either <freq> or, if no -frequency",
-"   option has been specified, the value of the G register."};
-
-    char    *scan_txt[] = {
-"Usage of \"-scan\"",
-"   The motor will be scanned from <low-limit> to <high-limit> in <n-moves>",
-"   steps. After each move, the program waits for a time specified by the",
-"   -wait option before starting the next move."};
-
-    char    *seed_txt[] = {
-"Usage of \"-seed <seed-value>\"",
-"   <seed-value> specifies a seed for the random number generator. By default,",
-"                the seen is generated from the time-of-day clock."};
-
-    char    *sf_txt[] = {
-"Usage of \"-sf\"   (Slow Forward)",
-"   An SF command is issued to the motor. The motor moves without ramp to the",
-"   upper software limit. The speed is either <freq> or, if no -frequency",
-"   option has been specified, the value of the G register."};
-
-    char    *step_txt[] = {
-"Usage of \"-step <step-size>\"",
-"   The motor will be moved a distance of <step-size> from its current position."};
-
-    char    *stop_txt[] = {
-"Usage of \"-stop\"",
-"   A \"Stop\" command is issued to the motor."};
-
-    char    *tmo_txt[] = {
-"Usage of \"-tmo <secs>\"",
-"   <secs> specifies the time-out in seconds to be used in waiting for responses",
-"          from the EL734. The default is normally 1 second unless a -ref or",
-"          -hunt option has been specified, in which case it is 30 secs."};
-
-    char    *u_r_at_txt[] = {
-"Usage of \"-ur@ <pos>\"",
-"   \"ur@\" should be read as \"You are at\". The current position of the",
-"   motor will be forced to be <pos> via a UU command."};
-
-    char    *verbose_txt[] = {
-"Usage of \"-v <wid>\"",
-"   Whenever the motor is being moved, an updating display of the actual motor",
-"   position can be generated on the display in a field of width <wid>. The",
-"   default is 10. If <wid> is specified to be 0, the updating display is",
-"   suppressed."};
-
-    char    *wait_txt[] = {
-"Usage of \"-wait <secs>\"",
-"   <secs> specifies a wait time in seconds between moves for the -rndm, -scan",
-"          and -saw options. If <secs> is zero, no wait is performed. If",
-"          <secs> is negative, a random wait between 1 and -<secs> seconds",
-"          is performed."};
-
-
-    if (item[0] != '-') {
-      StrJoin (my_item, sizeof (my_item), "-", item);
-    }else {
-      StrJoin (my_item, sizeof (my_item), item, "");
-    }
-    if (strcmp (my_item, "-?cmd") == 0) {
-      PrintUsage (cmd_txt, N_ELEMENTS (cmd_txt));
-    }else if (strcmp (my_item, "-?msg") == 0) {
-      PrintUsage (msg_txt, N_ELEMENTS (msg_txt));
-    }else if (strcmp (my_item, "-?par") == 0) {
-      PrintUsage (par_txt, N_ELEMENTS (par_txt));
-    }else if (strcmp (my_item, "-?res") == 0) {
-      PrintUsage (res_txt, N_ELEMENTS (res_txt));
-    }else if (strcmp (my_item, "-chan") == 0) {
-      PrintUsage (chan_txt, N_ELEMENTS (chan_txt));
-    }else if (strcmp (my_item, "-f") == 0) {
-      PrintUsage (f_txt, N_ELEMENTS (f_txt));
-    }else if (strcmp (my_item, "-fb") == 0) {
-      PrintUsage (fb_txt, N_ELEMENTS (fb_txt));
-    }else if (strcmp (my_item, "-ff") == 0) {
-      PrintUsage (ff_txt, N_ELEMENTS (ff_txt));
-    }else if (strcmp (my_item, "-frequency") == 0) {
-      PrintUsage (frequency_txt, N_ELEMENTS (frequency_txt));
-    }else if (strcmp (my_item, "-hi") == 0) {
-      PrintUsage (hi_txt, N_ELEMENTS (hi_txt));
-    }else if (strcmp (my_item, "-high") == 0) {
-      PrintUsage (high_txt, N_ELEMENTS (high_txt));
-    }else if (strcmp (my_item, "-host") == 0) {
-      PrintUsage (host_txt, N_ELEMENTS (host_txt));
-    }else if (strcmp (my_item, "-hunt") == 0) {
-      PrintUsage (hunt_txt, N_ELEMENTS (hunt_txt));
-    }else if (strcmp (my_item, "-id") == 0) {
-      PrintUsage (id_txt, N_ELEMENTS (id_txt));
-    }else if (strcmp (my_item, "-limits") == 0) {
-      PrintUsage (limits_txt, N_ELEMENTS (limits_txt));
-    }else if (strcmp (my_item, "-lo") == 0) {
-      PrintUsage (lo_txt, N_ELEMENTS (lo_txt));
-    }else if (strcmp (my_item, "-load") == 0) {
-      PrintUsage (load_txt, N_ELEMENTS (load_txt));
-    }else if (strcmp (my_item, "-low") == 0) {
-      PrintUsage (low_txt, N_ELEMENTS (low_txt));
-    }else if (strcmp (my_item, "-m") == 0) {
-      PrintUsage (m_txt, N_ELEMENTS (m_txt));
-    }else if (strcmp (my_item, "-motor") == 0) {
-      PrintUsage (motor_txt, N_ELEMENTS (motor_txt));
-    }else if (strcmp (my_item, "-n") == 0) {
-      PrintUsage (n_txt, N_ELEMENTS (n_txt));
-    }else if (strcmp (my_item, "-port") == 0) {
-      PrintUsage (port_txt, N_ELEMENTS (port_txt));
-    }else if (strcmp (my_item, "-p") == 0) {
-      PrintUsage (p_txt, N_ELEMENTS (p_txt));
-    }else if (strcmp (my_item, "-position") == 0) {
-      PrintUsage (position_txt, N_ELEMENTS (position_txt));
-    }else if (strcmp (my_item, "-random") == 0) {
-      PrintUsage (random_txt, N_ELEMENTS (random_txt));
-    }else if (strcmp (my_item, "-rndm") == 0) {
-      PrintUsage (rndm_txt, N_ELEMENTS (rndm_txt));
-    }else if (strcmp (my_item, "-ref") == 0) {
-      PrintUsage (ref_txt, N_ELEMENTS (ref_txt));
-    }else if (strcmp (my_item, "-save") == 0) {
-      PrintUsage (save_txt, N_ELEMENTS (save_txt));
-    }else if (strcmp (my_item, "-saw") == 0) {
-      PrintUsage (saw_txt, N_ELEMENTS (saw_txt));
-    }else if (strcmp (my_item, "-s") == 0) {
-      PrintUsage (s_txt, N_ELEMENTS (s_txt));
-    }else if (strcmp (my_item, "-sb") == 0) {
-      PrintUsage (sb_txt, N_ELEMENTS (sb_txt));
-    }else if (strcmp (my_item, "-scan") == 0) {
-      PrintUsage (scan_txt, N_ELEMENTS (scan_txt));
-    }else if (strcmp (my_item, "-seed") == 0) {
-      PrintUsage (seed_txt, N_ELEMENTS (seed_txt));
-    }else if (strcmp (my_item, "-sf") == 0) {
-      PrintUsage (sf_txt, N_ELEMENTS (sf_txt));
-    }else if (strcmp (my_item, "-step") == 0) {
-      PrintUsage (step_txt, N_ELEMENTS (step_txt));
-    }else if (strcmp (my_item, "-stop") == 0) {
-      PrintUsage (stop_txt, N_ELEMENTS (stop_txt));
-    }else if (strcmp (my_item, "-tmo") == 0) {
-      PrintUsage (tmo_txt, N_ELEMENTS (tmo_txt));
-    }else if (strcmp (my_item, "-ur@") == 0) {
-      PrintUsage (u_r_at_txt, N_ELEMENTS (u_r_at_txt));
-    }else if (strcmp (my_item, "-v") == 0) {
-      PrintUsage (verbose_txt, N_ELEMENTS (verbose_txt));
-    }else if (strcmp (my_item, "-wait") == 0) {
-      PrintUsage (wait_txt, N_ELEMENTS (wait_txt));
-    }else {
-      printf ("\n"
-	"Usage of \"%s\":\n"
-	" \n"
-	"   Sorry, this is either an invalid help item or it still\n"
-	"   needs to be programmed!\n\n", my_item);
-    }
-    return;
-  }
-/*
-**---------------------------------------------------------------------------
-**			SetupXrmDatabase    - setup Resource Manager Database
-*/
-  int	SetupXrmDatabase (
-/*	================
-*/			XrmDatabase	*db,
-			char		*name[],
-			int		verbose,
-			int		*argc,
-			char		*argv[]) {
-
-    static char	our_name[80]  = "Unknown";  /* This holds the program name */
-    static char lkup_name[80] = "Unknown";  /* Name for looking in database */
-
-    int		status, i, first = True;
-    char	text[80];
-    char	full_nm0[80];
-    char	full_nm1[80];
-    char	*p_fil[] = {0,0,0,0,0,0,0,0,0,0};
-    char	*my_name;
-    char	*my_name_last;
-
-    char	*name_type;
-    XrmValue	name_value;
-
-    XrmDatabase cmnd_line_db = NULL;
-    XrmDatabase	lcl_db	     = NULL;
-  /*-----------------------------------------------------
-  ** This routine merges some resource databases with options specified on
-  ** the command line. Resources can then be looked up using XrmGetResource.
-  ** This is a bit like the X-toolkit routine XtAppInitialize does for the
-  ** extraction of resources by XtGetApplicationResources.
-  ** 
-  ** I can't help but think that there's a simpler way of doing this but I
-  ** can't find it in the X manuals. Basically, the problem arises with wanting
-  ** to avoid the calling program being associated with an X-display, i.e. it
-  ** is intended for use by "command-line oriented" programs. All the nice,
-  ** easy-to-use resource/command-line setup routines in Xlib or Xtlib seem to
-  ** assume one is going to use a display -- not surprising, I suppose,
-  ** since the concept of Xlib is for writing window based applications!
-  **
-  ** Anyway, the point is that the following way turns out to be lacking
-  ** when it gets tested in anger.
-  */
-    status = True;		/* Assume success	*/
-
-    our_name[0] = NIL;
-	/*
-	** Make a list of the databases to be merged, highest priority first.
-	*/
-#ifdef  __VMS
-    p_fil[0] = "decw$user_defaults:SinQ_rc.dat";
-    p_fil[1] = "decw$group_defaults:SinQ_rc.dat";
-    p_fil[2] = "decw$system_defaults:SinQ_rc.dat";
-    p_fil[3] = "decw$user_defaults:decw$xdefaults.dat";
-    p_fil[4] = "decw$group_defaults:decw$xdefaults.dat";
-    p_fil[5] = "decw$system_defaults:decw$xdefaults.dat";
-    p_fil[6] = NULL;
-    if (*argc > 0) {	     /* Find out what we are called - parse file nm */
-      my_name = strstr (argv[0], "]");	/* Find end of directory, i.e. "]" */
-      my_name++;			/* Skip over "]" */
-      if (my_name[0] == '[') {		/* Handle possible concealed device */
-        my_name = strstr (my_name, "]");
-	my_name++;
-      }
-      i = sizeof (our_name);
-      StrEdit (our_name, my_name, "lowercase", &i);	    /* Copy the rest */
-      strtok (our_name, ".");		/* Close it off at "." */
-    }
-#else
-    p_fil[0] = StrJoin (full_nm0, sizeof (full_nm0),
-			    getenv ("HOME"), "/SinQ_rc");
-    p_fil[1] = "/usr/lib/X11/app-defaults/SinQ_rc";
-    p_fil[2] = StrJoin (full_nm1, sizeof (full_nm1),
-			    getenv ("HOME"), "/.Xdefaults");
-    p_fil[3] = "/usr/lib/X11/app-defaults/Xdefaults";
-    p_fil[4] = NULL;
-    if (*argc > 0) {	      /* Find out what we are called - parse file nm  */
-			      /* Find end of directories */
-      my_name = argv[0] - 1;
-      while (my_name != NULL) {
-        my_name_last = my_name;
-	my_name_last++;
-	my_name = strstr (my_name_last, "/");
-      }
-      StrJoin (our_name, sizeof (our_name), my_name_last, "");
-    }
-#endif
-    if (verbose) printf ("My name is \"%s\"\n", our_name);
-	/*
-	**  Initialise and combine all databases
-	*/
-    XrmInitialize ();
-    for (i = 0; i < XtNumber (p_fil); i++) {
-      if (p_fil[i] == NULL) break;
-      status = XrmCombineFileDatabase (p_fil[i], &lcl_db, False);
-      if (status != 0) {
-        if (verbose && first) {
-	  printf ("Resource database created from file %s.\n", p_fil[i]);
-	}else if (verbose) {
-	  printf ("File %s merged into resource database.\n", p_fil[i]);
-	}
-	first = False;
-      }
-    }
-	/*----------------------------------------------------------------
-	**  See if there's anything specified on cmnd line, incl "name".
-	*/
-    XrmParseCommand (&cmnd_line_db,
-			OpTable_0, XtNumber(OpTable_0), our_name, argc, argv);
-    if (cmnd_line_db != NULL) {
-	    /*
-	    ** There was at least 1 item on cmnd line. Process the line.
-	    ** If -name was specified, adopt it.
-	    */
-      status = XrmGetResource (cmnd_line_db,  /* See if a name was specified  */
-			    StrJoin (text, sizeof (text), our_name, ".name"),
-			    "ProgramName.Values",
-			    &name_type, &name_value);
-      if (status) {
-	i = sizeof (lkup_name);
-	StrEdit (lkup_name, name_value.addr, "lowercase", &i);
-	if (verbose) printf ("Option list name is \"%s\"\n", lkup_name);
-      }else {
-        strcpy (lkup_name, our_name);
-      }
-	    /*
-	    ** Loop over all items in OpTable_0 and merge them into database,
-	    ** taking care of any possible name changes.
-	    */
-      for (i = 0; i < XtNumber (OpTable_0); i++) {
-	if (strcmp (OpTable_0[i].option, "-name") == 0) continue;
-        status = XrmGetResource (cmnd_line_db,
-				StrJoin (text, sizeof (text),
-				    our_name, OpTable_0[i].specifier),
-				"ProgramName.Values",
-				&name_type, &name_value);
-	if (status) {
-	  StrJoin (text, sizeof (text), lkup_name, OpTable_0[i].specifier);
-	  XrmPutResource (&lcl_db, text, "String", &name_value);
-	}
-      }
-    }
-/*----------------------------------------------------------------
-*/
-    *name = lkup_name;
-    *db = lcl_db;
-    if (lcl_db == NULL) printf ("Warning -- no resource database found.\n");
-
-    XrmDestroyDatabase (cmnd_line_db);
-/*
-**    XrmPutFileDatabase (lcl_db, "el734_test.db");
-*/
-    return status;
-  }
-/*
-**---------------------------------------------------------------------------
-**			GetCheckResources - get and check our resources
-*/
-  int	GetCheckResources (
-/*	=================
-*/			    XrmDatabase	*db,
-			    char	*appName) {
-
-    int			status, len;
-    char		buff[80];
-    char		*type;
-    XrmValue		value;
-    time_t		time_now;
-    float		tmp_secs;
-/*----------------------------------------------------------	-V	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734VeryVerbose"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Very_verbose = (status) ? True : False;
-/*----------------------------------------------------------	-help	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Help"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_help = (status) ? True : False;
-    if (Do_help) {
-      ShowUsage (1);
-      exit (EXIT_SUCCESS);
-    }
-/*----------------------------------------------------------	-?	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734HelpItem"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_help = (status) ? True : False;
-    if (Do_help) {
-      len = sizeof (buff);
-      StrEdit (buff, value.addr, "trim lowercase", &len);
-      ShowItemUsage (buff);
-      exit (EXIT_SUCCESS);
-    }
-/*----------------------------------------------------------	-?cmd	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734HelpCmd"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_help = (status) ? True : False;
-    if (Do_help) {
-      strcpy (buff, "-?cmd");
-      ShowItemUsage (buff);
-      exit (EXIT_SUCCESS);
-    }
-/*----------------------------------------------------------	-?msg	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734HelpMsg"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_help = (status) ? True : False;
-    if (Do_help) {
-      strcpy (buff, "-?msg");
-      ShowItemUsage (buff);
-      exit (EXIT_SUCCESS);
-    }
-/*----------------------------------------------------------	-?par	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734HelpPar"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_help = (status) ? True : False;
-    if (Do_help) {
-      strcpy (buff, "-?par");
-      ShowItemUsage (buff);
-      exit (EXIT_SUCCESS);
-    }
-/*----------------------------------------------------------	-?res	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734HelpRes"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_help = (status) ? True : False;
-    if (Do_help) {
-      strcpy (buff, "-?res");
-      ShowItemUsage (buff);
-      exit (EXIT_SUCCESS);
-    }
-/*----------------------------------------------------------	-host	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Host"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status) {
-      printf ("No server specified via the -host option. "
-			"No default allowed!\n");
-      ShowUsage (0);
-      return False;
-    }else {
-      StrJoin (El734_host, sizeof (El734_host), value.addr, "");
-      printf ("Using Internet host \"%s\".\n", El734_host);
-    }
-/*----------------------------------------------------------	-port	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Port"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%d", &El734_port) != 1)) {
-      El734_port = 4000;
-      printf ("Using the default TCP/IP port number of %d.\n", El734_port);
-    }else {
-      printf ("TCP/IP  port  number = %d\n", El734_port);
-    }
-/*----------------------------------------------------------	-chan	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Chan"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%d", &El734_chan) != 1)) {
-      printf ("No RS-232-C channel specified via the -chan option. "
-			"No default allowed!\n");
-      ShowUsage (0);
-      return False;
-    }else {
-      printf ("RS-232-C channel number = %d\n", El734_chan);
-    }
-/*----------------------------------------------------------	-motor	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Motor"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%d", &Motor) != 1)) {
-      printf ("No motor specified via the -m option. "
-			"No default allowed!\n");
-      ShowUsage (0);
-      return False;
-    }else {
-      printf ("Using Motor Number %d.\n", Motor);
-    }
-/*----------------------------------------------------------	-tmo	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Tmo"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%f", &Tmo) != 1)) {
-      Tmo = 1.0;	/* If no explicit -tmo, use 1 secs by default but .. */
-      Tmo_ref = 30.0;	/*	.. use 30 secs for -ref */
-    }else {
-      Tmo_ref = Tmo;  /* If explicit -tmo, assume user wants it for -ref too */
-    }
-/*----------------------------------------------------------	-v  */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Verbose"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%d", &Verbose) != 1))
-	    Verbose = 10;
-/*----------------------------------------------------------	-wait	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Wait"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%f", &tmp_secs) != 1)) tmp_secs = 0.0;
-    Wait_time = (int) tmp_secs;
-/*----------------------------------------------------------	-low	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Low"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%f", &Lo_arg) != 1)) {
-      Lo_arg = Lo;
-      Lo_arg_present = False;
-    }else {
-      Lo_arg_present = True;
-    }
-/*----------------------------------------------------------	-high	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734High"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%f", &Hi_arg) != 1)) {
-      Hi_arg = Hi;
-      Hi_arg_present = False;
-    }else {
-      Hi_arg_present = True;
-    }
-/*----------------------------------------------------------	-seed	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Seed"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (!status || (sscanf (value.addr, "%u", &Seed) != 1)) {
-      time_now = time (NULL);	    /* Get a half-ways random number */
-      Seed = (int) time_now;
-      srand (Seed);
-      Seed_present = False;
-    }else {
-      srand (Seed);
-      printf ("Random number seed = %u.\n", Seed);
-      Seed_present = True;
-    }
-/*----------------------------------------------------------	-n	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734N"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (status) {
-      if ((sscanf (value.addr, "%d", &N_moves) != 1) || (N_moves == 0)) {
-	N_moves = 5;
-	printf ("\007Bad \"-n\" parameter: \"%s\"\n"
-		  "It should be a non-zero integer.\n", value.addr);
-	return False;
-      }
-    }else {
-      N_moves = 5;
-    }
-/*----------------------------------------------------------	-frequency */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Frequency"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (status) {
-      if ((sscanf (value.addr, "%d", &Frequency) != 1) || (Frequency <= 0)) {
-	Frequency = -1;
-	printf ("\007Bad \"-frequency\" parameter: \"%s\"\n"
-		  "It should be a positive integer.\n", value.addr);
-	return False;
-      }
-    }else {
-      Frequency = -1;
-    }
-/*----------------------------------------------------------	-limits	*/
-    Do_limits = False;
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Limits"),
-			     "ProgramName.Values",
-			     &type, &value);
-    if (status) {
-      if ((sscanf (value.addr, "%f/%f", &Lim_arg_lo, &Lim_arg_hi) == 2) &&
-	  (Lim_arg_lo < Lim_arg_hi)) {
-	Do_limits = True;
-      }else {
-	printf ("\007Bad \"-limits\" parameter: \"%s\"\n"
-		  "It should be specified as \"<lo>/<hi>\".\n", value.addr);
-	ShowUsage (0);
-	return False;
-      }
-    }
-/*----------------------------------------------------------	-ur@	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734SetPos"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_setpos = ((status) && 
-	         (sscanf (value.addr, "%f", &Ist_arg) == 1)) ?
-		    True : False;
-    if (status && !Do_setpos) {
-      printf ("\n"
-	"-ur@ option must be specified as \"<pos>\"\n"
-	"\"%s\" is invalid.\n", value.addr);
-      ShowUsage (0);
-      return False;
-    }
-/*----------------------------------------------------------	-save	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Save"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_save = (status && (sscanf (value.addr, "%79s", Save_file) == 1)) ?
-	True : False;
-/*----------------------------------------------------------	-load	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Load"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_load = (status && (sscanf (value.addr, "%79s", Load_file) == 1)) ?
-	True : False;
-/*----------------------------------------------------------	-diff	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Diff"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_diff = (status && (sscanf (value.addr, "%79s", Diff_file) == 1)) ?
-	True : False;
-/*----------------------------------------------------------	-id	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Id"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Check_EL734_id = True;
-    if (!status) {
-      strcpy (El734_id0, "STPMC EL734");
-      strcpy (El734_id1, "DCMC EL734");
-    }else {
-      StrJoin (El734_id0, sizeof (El734_id0), value.addr, "");
-      El734_id1[0] = NIL;
-      len = sizeof (El734_id0);
-      StrEdit (El734_id0, El734_id0, "upcase", &len);
-      if (strcmp (El734_id0, "IGNORE") == 0) Check_EL734_id = False;
-    }
-/*----------------------------------------------------------	-stop	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Stop"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_stop = (status) ? True : False;
-/*----------------------------------------------------------	-position   */
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Position"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_posit = (status && (sscanf (value.addr, "%f", &Soll_posit) == 1)) ?
-	True : False;
-/*----------------------------------------------------------	-ff	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Ff"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_ff = (status) ? True : False;
-/*----------------------------------------------------------	-fb	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Fb"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_fb = (status) ? True : False;
-/*----------------------------------------------------------	-sf	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Sf"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_sf = (status) ? True : False;
-/*----------------------------------------------------------	-sb	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Sb"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_sb = (status) ? True : False;
-/*----------------------------------------------------------	-random	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Random"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_rndm = (status) ? True : False;
-    if (Do_rndm) {
-      if (!Seed_present) printf ("Using \"randomised\" random number seed.\n");
-    }
-/*----------------------------------------------------------	-saw	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Saw"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_saw = (status) ? True : False;
-/*----------------------------------------------------------	-ref	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Ref"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_ref = (status) ? True : False;
-/*----------------------------------------------------------	-hunt	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Hunt"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_hunt = (status) ? True : False;
-/*----------------------------------------------------------	-scan	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Scan"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_scan = (status) ? True : False;
-/*----------------------------------------------------------	-step	*/
-    status = XrmGetResource (*db,
-			     StrJoin (buff, sizeof (buff),
-				      appName, ".el734Step"),
-			     "ProgramName.Values",
-			     &type, &value);
-    Do_step = (status && (sscanf (value.addr, "%f", &Step) == 1)) ?
-	True : False;
-/*--------------------- Check that no more than 1 position option is present */
-    status = 0;
-    if (Do_stop)  status++;
-    if (Do_posit) status++;
-    if (Do_step)  status++;
-    if (Do_ff)    status++;
-    if (Do_fb)    status++;
-    if (Do_sf)    status++;
-    if (Do_sb)    status++;
-    if (Do_rndm)  status++;
-    if (Do_saw)   status++;
-    if (Do_ref)   status++;
-    if (Do_hunt)  status++;
-    if (Do_scan)  status++;
-    if (status > 1) {
-      printf ("\n"
-	    "The positioning options are mutually exclusive!\n"
-	    "The following cannot be used together:\n");
-      if (Do_stop)  printf ("    -stop\n");
-      if (Do_posit) printf ("    -position\n");
-      if (Do_step)  printf ("    -step\n");
-      if (Do_fb)    printf ("    -fb\n");
-      if (Do_ff)    printf ("    -ff\n");
-      if (Do_hunt)  printf ("    -hunt\n");
-      if (Do_ref)   printf ("    -ref\n");
-      if (Do_rndm)  printf ("    -random\n");
-      if (Do_saw)   printf ("    -saw\n");
-      if (Do_scan)  printf ("    -scan\n");
-      if (Do_sb)    printf ("    -sb\n");
-      if (Do_sf)    printf ("    -sf\n");
-      ShowUsage (0);
-      return False;
-    }
-    if (!(Do_stop | Do_posit | Do_ff  | Do_fb   | Do_sf     | Do_sb	|
-	  Do_rndm | Do_saw   | Do_ref | Do_step | Do_limits | Do_setpos |
-	  Do_load | Do_diff  | Do_hunt  | Do_scan) &&
-	!Do_save) {
-      Do_save = True;
-      strcpy (Save_file, "-");
-    }
-    return True;
-  }
-/*
-**--------------------------------------------------------------------------
-**		CtrlC_Handler:  Signal handler to detect <Ctrl-C> on keyboard.
-*/
-  void	CtrlC_Handler (int sigint) {
-/*      =============
-*/
-    Ctrl_C_has_happened = True;
-  }
-/*
-**==========================================================================
-**			Main line program
-**			------------------
-*/
-  int	main (int argc, char **argv) {
-/*      ============================
-*/
-    char	    buff[80], text0[80], text1[80];
-    int		    buff_len;
-    int		    status, errcode, errno, vaxc_errno, i, len, nmoves;
-    char	    *errName;
-    time_t	    time_now;
-    int		    msec_tmo;
-
-    int		    msr, ored_msr, fp_cntr, fr_cntr, ss, irand;
-    float	    ist_posit, posit, my_rand, f_tmp, shift;
-
-    XrmDatabase		my_db;
-    char		*appName;
-/*-----------------------------------------------------------------------*/
-			    /* See if -V has been specified. This turns on
-			    ** extra diagnostic print-out */
-    for (i = 1; i < argc; i++) {
-      if (strcmp ("-V", argv[i]) == 0) Very_verbose = True;
-    }
-/*-----------------------------------------------------------------------*/
-    time_now = time (NULL);
-    if (Very_verbose) {
-      printf ("EL734 Motor Controller Test Program 1, Ident %s.\n", ident);
-      printf ("Started at %s", asctime (localtime (&time_now)));
-    }
-	/*-------------------------------------------------------------
-	**	Setup the resource database and look up the resources.
-	*/
-    SetupXrmDatabase (&my_db, &appName, Very_verbose, &argc, argv);
-    if (argc > 1) {
-      if (argc > 2) {
-	printf ("\nThe following arguments were not used:\n\n     ");
-	for (i = 1; i < argc; i++) {
-	  printf ("\"%s\" ", argv[i]);
-	}
-      }else {
-        printf ("\nArgument \"%s\" was not used.", argv[1]);
-      }
-      printf ("\n");
-      ShowUsage (0);
-      return EXIT_FAILURE;
-    }
-    status = GetCheckResources (&my_db, appName);
-    if (!status) return EXIT_FAILURE;
-		    /*
-		    ** Declare a signal handler to catch <Ctrl-C> so that we
-		    ** can exit cleanly.
-		    */
-    Ctrl_C_has_happened = False;
-    signal (SIGINT, CtrlC_Handler);
-
-    status = EL734_Open (&Hndl,
-		    El734_host, El734_port, El734_chan, Motor, NULL);
-    if (!status) {
-      printf ("Error opening connection to server.\n");
-      status = PrintErrInfo ("EL734_Open");
-      return status;
-    }
-
-    if (Check_EL734_id) {
-      status = EL734_GetId (&Hndl, buff, sizeof (buff));
-      if (!status) {
-	printf ("Error getting controller ID string.\n");
-	status = PrintErrInfo ("EL734_GetId");
-	return status;
-      }
-      len = sizeof (buff);
-      StrEdit (buff, buff, "upcase", &len);
-      if ((strncmp (buff, El734_id0, strlen (El734_id0)) != 0) &&
-	  (strncmp (buff, El734_id1, strlen (El734_id1)) != 0)) {
-	printf ("Controller ID mismatch.\n   The controller ID is \"%s\".\n",
-			buff);
-	if (El734_id1[0] == NIL) {
-	  printf ("   It should be \"%s\".\n", El734_id0);
-	}else {
-	  printf ("   It should be either \"%s ...\".\n"
-		  "                    or \"%s ...\".\n", El734_id0, El734_id1);
-	}
-	return EXIT_FAILURE;
-      }
-    }
-
-    if (Do_ref || Do_hunt) {
-      msec_tmo = (int) (Tmo_ref * 1000.0);
-      printf ("Time-out is %.1f secs.\n", Tmo_ref);
-    }else {
-      msec_tmo = (int) (Tmo * 1000.0);
-    }
-    EL734_Config (&Hndl,	    /* Configure the connection */
-	    "msecTmo", msec_tmo,
-	    "eot",     "1\r",
-	    NULL);
-/*---------------------------------------------------
-**		    Ensure -stop has top priority!
-*/
-    if (Do_stop) {
-      status = DoStop ();
-      if (!status) {
-	PrintErrInfo ("DoStop");
-	EL734_Close (&Hndl, False);
-	return EXIT_FAILURE;
-      }
-    }
-/*---------------------------------------------------*/
-    EL734_GetStatus (&Hndl,
-		    &msr, &ored_msr, &fp_cntr, &fr_cntr, &ss, &ist_posit);
-    if (msr == -1) {
-      status = PrintErrInfo ("EL734_GetStatus");
-      EL734_Close (&Hndl, False);
-      return status;
-    }
-    status = EL734_GetPrecision (&Hndl, &Dec_pt);
-    if (!status) {
-      status = PrintErrInfo ("EL734_GetPrecision");
-      EL734_Close (&Hndl, False);
-      return status;
-    }else {
-      printf ("%s\n%s\nPosition = %.*f\n",
-		EL734_EncodeMSR (text0, sizeof (text0),
-				    msr, ored_msr, fp_cntr, fr_cntr),
-		EL734_EncodeSS  (text1, sizeof (text1), ss),
-		Dec_pt, ist_posit);
-    }
-/*---------------------------------------------------
-**		    -load has to be done first (well, after -stop)!
-*/
-    if (Do_load) {
-      status = DoLoad ();
-      if (!status) {
-	status = PrintErrInfo ("DoLoad");
-	EL734_Close (&Hndl, False);
-	return status;
-      }
-    }
-/*---------------------------------------------------
-**		    -limits can be done now!
-*/
-    if (Do_limits) {
-      status = DoLimits (Lim_arg_lo, Lim_arg_hi);
-      if (!status) {
-	status = PrintErrInfo ("DoLimits");
-	EL734_Close (&Hndl, False);
-	return status;
-      }
-    }
-/*---------------------------------------------------
-**		    -ur@ (you-are-at) can be done now!
-*/
-    if (Do_setpos) {
-      status = DoSetPos (Ist_arg);
-      if (!status) {
-	status = PrintErrInfo ("DoSetPos");
-	EL734_Close (&Hndl, False);
-	return status;
-      }
-    }
-/*---------------------------------------------------
-**		    -position	move to a given position
-*/
-    if (Do_posit) {
-      printf ("Moving to %.*f ... ", Dec_pt, Soll_posit); fflush (NULL);
-      status = EL734_MoveNoWait (&Hndl, Soll_posit);
-      if (!status) {
-	status = PrintErrInfo ("EL734_MoveNoWait");
-	return status;
-      }
-      status = My_WaitIdle (&Hndl, Verbose,
-				&ored_msr, &fp_cntr, &fr_cntr, &ist_posit);
-      if (!status) {
-	if (Ctrl_C_has_happened) {
-	  DoStop ();
-	}else {
-	  PrintErrInfo ("My_WaitIdle");
-	}
-	return EXIT_FAILURE;
-      }else {
-	if ((ored_msr & ~(MSR__BUSY | MSR__OK)) != 0) {
-	  printf ("\007??\n    Position = %.*f\n    %s\n", Dec_pt, ist_posit,
-			EL734_EncodeMSR (text0, sizeof (text0),
-			0, ored_msr, fp_cntr, fr_cntr));
-	}else {
-	  printf (" OK\n");
-	}
-      }
-    }
-/*---------------------------------------------------
-**		    -step	move a single step
-*/
-    if (Do_step) {
-      Soll_posit = ist_posit + Step;
-      printf ("Step size = %.*f\nMoving to %.*f ... ", 
-	Dec_pt, Step, Dec_pt, Soll_posit);
-      fflush (NULL);
-      status = EL734_MoveNoWait (&Hndl, Soll_posit);
-      if (!status) {
-	status = PrintErrInfo ("EL734_MoveNoWait");
-	return status;
-      }
-      status = My_WaitIdle (&Hndl, Verbose,
-				&ored_msr, &fp_cntr, &fr_cntr, &ist_posit);
-      if (!status) {
-	if (Ctrl_C_has_happened) {
-	  DoStop ();
-	}else {
-	  PrintErrInfo ("My_WaitIdle");
-	}
-	return EXIT_FAILURE;
-      }else {
-	if ((ored_msr & ~(MSR__BUSY | MSR__OK)) != 0) {
-	  printf ("\007??\n    Position = %.*f\n    %s\n", Dec_pt, ist_posit,
-			EL734_EncodeMSR (text0, sizeof (text0),
-			0, ored_msr, fp_cntr, fr_cntr));
-	}else {
-	  printf (" OK\n");
-	}
-      }
-    }
-/*---------------------------------------------------
-**		    -ref	reference Point Seek
-*/
-    if (Do_ref) {
-      DoRef (&shift);
-    }
-/*---------------------------------------------------
-**		    -saw, -random or -scan
-*/
-    if (Do_saw || Do_rndm || Do_scan) {
-      status = EL734_GetLimits (&Hndl, &Lo, &Hi);
-      if (!status) {
-	PrintErrInfo ("EL734_GetLimits");
-	EL734_Close (&Hndl, False);
-	return EXIT_FAILURE;
-      }
-      printf ("Low and High Software Limits are %.*f and %.*f\n",
-				Dec_pt, Lo, Dec_pt, Hi);
-      if (!Lo_arg_present) Lo_arg = Lo;
-      if (!Hi_arg_present) Hi_arg = Hi;
-      if (Lo_arg < Lo) Lo_arg = Lo;
-      if (Hi_arg > Hi) Hi_arg = Hi;
-      if (Lo_arg > Hi_arg) {
-	f_tmp = Lo_arg; Lo_arg = Hi_arg; Hi_arg = f_tmp;
-      }
-      if (Do_saw) {				/*-----------------------------
-						**  See-Saw Moves
-						*/
-	nmoves = (N_moves >= 0) ? N_moves : -N_moves;
-	if (N_moves >= 0) {
-	  posit = Lo_arg;
-	  printf ("Performing %d moves between %.*f and %.*f.\n",
-			nmoves, Dec_pt, Lo_arg, Dec_pt, Hi_arg);
-	}else {
-	  posit = Hi_arg;
-	  printf ("Performing %d moves between %.*f and %.*f.\n",
-			nmoves, Dec_pt, Hi_arg, Dec_pt, Lo_arg);
-	}
-	if (Wait_time > 0) {
-	  printf ("Wait time between moves = %d secs.\n", Wait_time);
-	}else if (Wait_time < 0) {
-	  printf ("Random wait time between moves = %d secs.\n", -Wait_time);
-	}
-	for (i = 0; i <= nmoves; i++) {
-	  printf ("%d: Moving to %.*f ... ", i, Dec_pt, posit); fflush (NULL);
-	  status = EL734_MoveNoWait (&Hndl, posit);
-	  if (!status) {
-	    PrintErrInfo ("EL734_MoveNoWait");
-	    return EXIT_FAILURE;
-	  }
-	  status = My_WaitIdle (&Hndl, Verbose,
-				&ored_msr, &fp_cntr, &fr_cntr, &ist_posit);
-	  if (!status) {
-	    if (Ctrl_C_has_happened) {
-	      DoStop ();
-	    }else {
-	      PrintErrInfo ("My_WaitIdle");
-	    }
-	    return EXIT_FAILURE;
-	  }
-	  if ((ored_msr & ~(MSR__BUSY | MSR__OK)) != 0) {
-	    printf ("\007??\n"
-			"    Position = %.*f\n    %s\n", Dec_pt, ist_posit,
-			EL734_EncodeMSR (text0, sizeof (text0),
-				    0, ored_msr, fp_cntr, fr_cntr));
-	    if ((ored_msr & MSR__OK) == 0) return EXIT_FAILURE;
-	  }else {
-	    if ((Wait_time == 0) || (i == N_moves)) printf (" OK.\n");
-	  }
-	  if (i != nmoves) DoWait (True);
-	  posit = (posit == Hi_arg) ? Lo_arg : Hi_arg;
-	}
-      }else if (Do_rndm) {			/*-----------------------------
-						**  Random Moves
-						*/
-	nmoves = (N_moves >= 0) ? N_moves : -N_moves;
-	printf ("Performing %d random moves between %.*f and %.*f.\n",
-			nmoves, Dec_pt, Lo_arg, Dec_pt, Hi_arg);
-	if (Wait_time > 0) {
-	  printf ("Wait time between moves = %d secs.\n", Wait_time);
-	}else if (Wait_time < 0) {
-	  printf ("Random wait time between moves = %d secs.\n", -Wait_time);
-	}
-	for (i = 1; i <= nmoves; i++) {
-	  irand = rand () & 0x7FFF;
-	  my_rand = ((float) irand)/32768.0;
-	  posit = Lo_arg + my_rand * (Hi_arg - Lo_arg);
-	  printf ("%d: Moving to %.*f ... ", i, Dec_pt, posit); fflush (NULL);
-
-	  status = EL734_MoveNoWait (&Hndl, posit);
-	  if (!status) {
-	    PrintErrInfo ("EL734_MoveNoWait");
-	    return EXIT_FAILURE;
-	  }
-	  status = My_WaitIdle (&Hndl, Verbose,
-				&ored_msr, &fp_cntr, &fr_cntr, &ist_posit);
-	  if (!status) {
-	    if (Ctrl_C_has_happened) {
-	      DoStop ();
-	    }else {
-	      PrintErrInfo ("My_WaitIdle");
-	    }
-	    return EXIT_FAILURE;
-	  }
-	  if ((ored_msr & ~(MSR__BUSY | MSR__OK)) != 0) {
-	    printf ("\007??\n"
-			"    Position = %.*f\n    %s\n", Dec_pt, ist_posit,
-			EL734_EncodeMSR (text0, sizeof (text0),
-				    0, ored_msr, fp_cntr, fr_cntr));
-	    if ((ored_msr & MSR__OK) == 0) return EXIT_FAILURE;
-	  }else {
-	    if ((Wait_time == 0) || (i == N_moves)) printf (" OK.\n");
-	  }
-	  if (i != nmoves) DoWait (True);
-	}
-      }else if (Do_scan) {	    /*----------------------------------------
-				    **  Incremental motion
-				    */
-	if (N_moves == 0) N_moves = 5;
-	nmoves = (N_moves >= 0) ? N_moves : -N_moves;
-	Step = (Hi_arg - Lo_arg)/N_moves;
-	printf ("Step size = %.*f\n", Dec_pt, Step);
-	if (Step > 0) {
-	  posit = Lo_arg;
-	  printf ("Performing %d steps between %.*f and %.*f.\n",
-			nmoves, Dec_pt, Lo_arg, Dec_pt, Hi_arg);
-	}else {
-	  posit = Hi_arg;
-	  printf ("Performing %d steps between %.*f and %.*f.\n",
-			nmoves, Dec_pt, Hi_arg, Dec_pt, Lo_arg);
-	}
-	if (Wait_time > 0) {
-	  printf ("Wait time between steps = %d secs.\n", Wait_time);
-	}else if (Wait_time < 0) {
-	  printf ("Random wait time between steps = %d secs.\n", -Wait_time);
-	}
-	for (i = 0; i <= nmoves; i++) {
-	  printf ("%d: Moving to %.*f ... ", i, Dec_pt, posit); fflush (NULL);
-	  status = EL734_MoveNoWait (&Hndl, posit);
-	  if (!status) {
-	    PrintErrInfo ("EL734_MoveNoWait");
-	    return EXIT_FAILURE;
-	  }
-	  status = My_WaitIdle (&Hndl, Verbose,
-				&ored_msr, &fp_cntr, &fr_cntr, &ist_posit);
-	  if (!status) {
-	    if (Ctrl_C_has_happened) {
-	      DoStop ();
-	    }else {
-	      PrintErrInfo ("My_WaitIdle");
-	    }
-	    return EXIT_FAILURE;
-	  }
-	  if ((ored_msr & ~(MSR__BUSY | MSR__OK)) != 0) {
-	    printf ("\007??\n"
-			"    Position = %.*f\n    %s\n", Dec_pt, ist_posit,
-			EL734_EncodeMSR (text0, sizeof (text0),
-				    0, ored_msr, fp_cntr, fr_cntr));
-	    if ((ored_msr & MSR__OK) == 0) return EXIT_FAILURE;
-	  }else {
-	    if (Wait_time == 0) printf (" OK.\n");
-	  }
-	  posit = posit + Step;
-	  if (i != nmoves) DoWait (True);
-	}
-	if (Wait_time != 0) printf (" OK.\n");
-      }
-    }
-/*---------------------------------------------------
-**		    -ff, -fb, -sf or -sb
-*/
-    if (Do_ff || Do_fb || Do_sf || Do_sb || Do_hunt) {
-      status = EL734_GetLimits (&Hndl, &Lo, &Hi);
-      if (!status) {
-	PrintErrInfo ("EL734_GetLimits");
-	EL734_Close (&Hndl, False);
-	return EXIT_FAILURE;
-      }
-
-      if (Do_fb || Do_sb) printf ("Low Software Limit is %.*f\n", Dec_pt, Lo);
-      if (Do_ff || Do_sf) printf ("High Software Limit is %.*f\n", Dec_pt, Hi);
-      if (Do_hunt) printf ("Software Limits are %.*f and %.*f\n",
-				    Dec_pt, Lo, Dec_pt, Hi);
-
-      if (Do_ff) status = DoFF ();
-      if (Do_fb) status = DoFB ();
-      if (Do_sf) status = DoSF ();
-      if (Do_sb) status = DoSB ();
-      if (Do_hunt) status = DoHunt (ist_posit);
-    }
-/*---------------------------------------------------
-**		    -diff
-*/
-    if (Do_diff) {
-      status = DoDiff ();
-      if (!status) {
-	EL734_Close (&Hndl, False);
-	return EXIT_FAILURE;
-      }
-    }
-/*---------------------------------------------------*/
-    if (Do_save) {
-      status = DoSave ();
-      if (!status) {
-	PrintErrInfo ("DoSave");
-	EL734_Close (&Hndl, False);
-	return EXIT_FAILURE;
-      }
-    }
-/*---------------------------------------------------*/
-    status = EL734_Close (&Hndl, False);
-    return EXIT_SUCCESS;
-  }
-/*------------------------------------------------- End of EL734_TEST.C */
diff --git a/utils/el737.c b/utils/el737.c
deleted file mode 100755
index 62177c1b..00000000
--- a/utils/el737.c
+++ /dev/null
@@ -1,2848 +0,0 @@
-#define	    ident	"1A11"
-#ifdef __DECC
-#pragma	    module	    EL737	ident
-#endif
-/*
-** +--------------------------------------------------------------+
-** |                  Paul Scherrer Institute                     |
-** |                     SINQ Project				  |
-** |                                                              |
-** | This software may be used freely by non-profit organizations.|
-** | It may be copied provided that the name of P.S.I. and of the |
-** | author is included. Neither P.S.I. nor the author assume any |
-** | responsibility for the use of this software outside of P.S.I.|
-** +--------------------------------------------------------------+
-**
-** Link_options - Here is the Linker Option File
-**!$	if p1 .eqs. "DEBUG" then dbg1 := /debug
-**!$	if p1 .eqs. "DEBUG" then dbg2 := _dbg
-**!$	link 'dbg1'/exe=el737'dbg2'.exe sys$input/options
-**!	    el737
-**!	    sinq_olb/lib
-**!	    sys$share:decw$xmlibshr12.exe/share
-**!	    sys$share:decw$xtlibshrr5.exe/share
-**!$	purge/nolog el737'dbg2'.exe
-**!$	exit
-**!$!
-**!$! To build on LNSA09 ...
-**!$!	$ build_cc_select :== decc
-**!$!	$ import tasmad
-**!$!	$ define/job deltat_c_tlb sinq_c_tlb
-**!$!	$ set default ud0:[maden.scratch]
-**!$!	$ bui tas_src:[utils]el737 debug
-**!$!
-** Link_options_end
-**
-**	Building on Alpha Digital Unix:
-**
-**	    setenv TAS_BASE ~maden/tasmad
-**	    source $TAS_BASE/tasmad.setup
-**	    rcp -p "lnsa09:tas_src:[utils]el737.c" $TAS_SRC/utils/el737.c
-**	    cc -std1 -g -o $TAS_BIN/el737	\
-**		    -I$TAS_INC			\
-**		    $TAS_SRC/utils/el737.c	\
-**		    -L$TAS_LIB -lsinq -lm -lrt -lXm -lXt -lX11
-**
-** Resource File:	    decw$user_defaults:SinQ_rc.dat
-** -------------     or	    $HOME/SinQ_rc
-**
-**	*rs232cSrvHost:		lnsw02	<-- the name of the RS232C server
-**	*rs232cSrvInetPort:	4000	<-- the TCP/IP port of the server
-**	*rs232cSrvEL737Chan:	2	<-- the RS232C channel number of the
-**						EL737 VME counter on the server
-**  plus
-**	*vmeCntrMsecPoll:	500	<-- 0.5 sec updates
-**	*vmeCntrMode:		Count	<-- "Count" or "Time"
-**	*vmeCntrPresetCount:	0	<-- The preset count
-**	*vmeCntrPresetTime:	0	<-- The preset time (secs or hh:mm:ss.t)
-**	    if *vmeCntrPresetCount is zero, the value is read from the cntr.
-**	    Ditto for *vmeCntrPresetTime.
-**+
-**---------------------------------------------------------------------------
-** Module Name  . . . . . . . . : [...MOTIF]EL737.C
-**
-** Author   . . . . . . . . . . : D. Maden
-** Date of creation . . . . . . : Nov 1994
-**
-** Purpose
-** =======
-**    EL737 is a program which was written to learn about OSF/Motif
-**    programming and, maybe, to generate a useful tool for the SINQ
-**    VME/RS-232-C Neutron Counter.
-**
-** Use:
-** ===
-**   1)	Ensure that VME_MOTOR_SRV is running on the appropriate computer.
-**
-**   2)	Define the foreign command and the workstation where the display
-**	is to appear via the commands:
-**
-**	    $ cntr :== $cpt:[exe]el737
-**	    $ set display /create /transport=tcpip /node=pswxxx
-**
-**   3)	Check the resource file DECW$USER_DEFAULTS:SinQ_rc.dat on VMS or
-**				$HOME/SinQ_rc on Digital-UNIX for the
-**	required resources (or specify them as options - see below).
-**
-**   4) Ensure that the Session Manager security is set up to allow windows
-**	to be created on one's workstation.
-**
-**   5)	Issue the command:
-**				    $ cntr [-options]
-**
-**	Options are:			Equivalent Resource Name   Default
-**	-----------			------------------------   -------
-**	    -host  <server-name>	  *rs232cSrvHost	      Undefined
-**	    -port  <port-number>	  *rs232cSrvInetPort	      4000
-**	    -chan  <chan-number>	  *rs232cSrvEL737Chan	      0
-**	    -mode  <counter-mode>	  *vmeCntrMode		      ???
-**	    -count <preset-count>	  *vmeCntrPresetCount	      0
-**	    -time  <preset-time>	  *vmeCntrPresetTime	      0
-**	    -poll  <poll-delay-in-msec>	  *vmeCntrMsecPoll	      1000
-**	    -tmo   <time-out-in-msecs>	  *vmeCntrTmo		      5000
-**	    -persist   	                  *vmeCntrPersist             False
-**	where
-**	    <chan-number>  is the number of the RS-232-C channel on the
-**			    server which is connected to the EL737 VME counter.
-**			    For example, on a Macintosh, the 4 channels of the
-**			    first Hurdler board are usually channels 2 - 5 incl.
-**	    <counter-mode> may be "Count" or "Time".
-**	    <preset-count> must be an integer.
-**	    <preset-time>  may be a fixed point number, e.g. 10.5, in which case
-**			    it is assumed to be seconds, or "hh:mm:ss.t".
-**	If specified, a flag takes precedence over the resource file.
-**
-** Updates:
-**  1A01 11-Nov-1994 DM.	Initial version.
-**  1A10  3-Apr-2000 DM.        Add fortify.h
-**-
-**====================================================================
-*/
-#include    <stdlib.h>
-#include    <stdio.h>
-#include    <stdarg.h>
-#include    <netdb.h>
-#include    <errno.h>
-#include    <ctype.h>
-
-#ifdef	__VMS
-  #include    <signal.h>
-  #include    <unixio.h>
-#else
-  #include    <unistd.h>
-  #ifdef FORTIFY
-    #include    <fortify/fortify.h>
-  #endif
-#endif
-
-#include    <netinet/in.h>
-#include    <arpa/inet.h>
-#include    <math.h>
-#include    <sys/socket.h>
-#include    <sys/time.h>
-
-#include <X11/Intrinsic.h>
-#include <Xm/Xm.h>
-#include <Xm/ArrowB.h>
-#include <Xm/BulletinB.h>
-#include <Xm/CascadeB.h>
-#include <Xm/Form.h>
-#include <Xm/Frame.h>
-#include <Xm/Label.h>
-#include <Xm/MainW.h>
-#include <Xm/MessageB.h>
-#include <Xm/PushB.h>
-#include <Xm/RowColumn.h>
-#include <Xm/PanedW.h>
-#include <Xm/Scale.h>
-#include <Xm/ScrolledW.h>
-#include <Xm/SelectioB.h>
-#include <Xm/Separator.h>
-/*
-**--------------------------------------------------------------------------
-**			Define global structures and constants.
-*/
-#include    <el737_def.h>
-#include    <sinq_prototypes.h>
-
-#define MAX_ARGS	20
-#define SCALE_RUN_MAX	1000
-
-  enum	Menu_Type {CASCADE, PULL_DOWN, SEPARATOR};
-
-  typedef struct {
-    char* rs232c_srv_host;	    /* Name of Host running the RS232C Server */
-    int   rs232c_srv_inet_port;	    /* TCP/IP Port Number of    RS232C Server */
-    int   v24_chan;		    /* Channel # of VME counter on Server */
-    char* mode;			    /* Default Mode of Neutron Counter */
-    int   preset_count;		    /* Value for preset counter */
-    char* preset_time;		    /* Value for preset timer */
-    int   msec_poll;		    /* Poll rate in msec */
-    int   msec_tmo;		    /* Time-out in msec */
-    int   persist;		    /* If non-zero, keep going on error */
-  } ApplicationData;
-/*
-**-------------------------------------------------------------
-**	Global Variables
-*/
-  void		    *Hndl = NULL;
-  struct EL737info  *InfoHndl;
-
-  ApplicationData    AppData;
-
-  XtAppContext	     App_context;	/* application context;	*/
-
-  static XtResource	Resources[] = {
-       {"rs232cSrvHost", "Rs232cSrvHost", XmRString, sizeof(String),
-			XtOffsetOf (ApplicationData, rs232c_srv_host),
-			XmRString, "Undefined"},
-       {"rs232cSrvInetPort", "Rs232cSrvInetPort", XmRInt, sizeof(int),
-			XtOffsetOf (ApplicationData, rs232c_srv_inet_port),
-			XmRImmediate, (XtPointer) 4000},
-       {"rs232cSrvEL737Chan", "Rs232cSrvEL737Chan", XmRInt, sizeof(int),
-			XtOffsetOf (ApplicationData, v24_chan),
-			XmRImmediate, (XtPointer) 0},
-       {"vmeCntrMode", "VmeCntrMode", XmRString, sizeof(String),
-			XtOffsetOf (ApplicationData, mode),
-			XmRString, "???"},
-       {"vmeCntrMsecPoll", "VmeCntrMsecPoll", XmRInt, sizeof(int),
-			XtOffsetOf (ApplicationData, msec_poll),
-			XmRImmediate, (XtPointer) 1000},
-       {"vmeCntrTmo", "VmeCntrTmo", XmRInt, sizeof(int),
-			XtOffsetOf (ApplicationData, msec_tmo),
-			XmRImmediate, (XtPointer) 5000},
-       {"vmeCntrPresetCount", "VmeCntrPresetCount", XmRInt, sizeof(int),
-			XtOffsetOf (ApplicationData, preset_count),
-			XmRImmediate, (XtPointer) 0},
-       {"vmeCntrPresetTime", "VmeCntrPresetTime", XmRString, sizeof(String),
-			XtOffsetOf (ApplicationData, preset_time),
-			XmRString, "0"},
-       {"vmeCntrPersist", "VmeCntrPersist", XmRInt, sizeof(int),
-			XtOffsetOf (ApplicationData, persist),
-			XmRImmediate, (XtPointer) 0},
-  };
-  static XrmOptionDescRec	OpTable[] = {
-       {"-host",    ".rs232cSrvHost",	   XrmoptionSepArg, (XPointer) NULL},
-       {"-port",    ".rs232cSrvInetPort",  XrmoptionSepArg, (XPointer) NULL},
-       {"-chan",    ".rs232cSrvEL737Chan", XrmoptionSepArg, (XPointer) NULL},
-       {"-mode",    ".vmeCntrMode",	   XrmoptionSepArg, (XPointer) NULL},
-       {"-count",   ".vmeCntrPresetCount", XrmoptionSepArg, (XPointer) NULL},
-       {"-time",    ".vmeCntrPresetTime",  XrmoptionSepArg, (XPointer) NULL},
-       {"-poll",    ".vmeCntrMsecPoll",	   XrmoptionSepArg, (XPointer) NULL},
-       {"-tmo",     ".vmeCntrMsecTmo",	   XrmoptionSepArg, (XPointer) NULL},
-       {"-persist", ".vmeCntrPersist",	   XrmoptionNoArg,  (XPointer) "1"},
-    };
-  static struct Counter_State	Cntr_state;
-  static struct Counter_State	Old_Cntr_state;
-  static int			Cntr_state_mode;
-  static int			Cntr_state_mon_preset = 100;
-  static char			Cntr_state_timer_preset[32] = "10.00";
-
-  static int			Cntr_state_mode_in_window;
-  static int			Cntr_state_mon_preset_in_window;
-  static char			Cntr_state_timer_preset_in_window[32];
-
-  static struct RS__RespStruct	Respon_buff;
-
-  static int	    Msg_seq = 9876;
-  static int	    Scale_is_khz;
-  static int	    Scale_max;
-  static float	    Thresh_cntr_thresh;	/* This is threshold of th'hold cntr */
-  static float	    Thresh_cntr_rate;	/* This is its rate */
-  static Pixel	    Dflt_foreground;
-  static Pixel	    Dflt_background;
-
-  static XtIntervalId		Timer_id = 0;
-  static char			Err_text[80];
-
-  static Widget    Top_level;		/* Shell widget	*/
-
-  static Widget    File_cascade;	/*  File  CascadeButton	*/
-  static Widget    Setup_cascade;	/*  Setup CascadeButton	*/
-  static Widget    Help_cascade;	/*  Help  CascadeButton	*/
-  static Widget    Mode_cascade;	/*  Mode  CascadeButton	*/
-
-  static Widget    Updt_button;		/*  Update   Push Button */
-  static Widget    Go_button;		/*  Go	     Push Button */
-  static Widget    Stop_button;		/*  Stop     Push Button */
-  static Widget    Pause_button;	/*  Pause    Push Button */
-  static Widget    Cont_button;		/*  Continue Push Button */
-
-  static Widget    Swch_mode_button;	/* Switch Preset Mode Push Button */
-  static Widget    Pre_cnt_button;	/* Preset Count Push Button */
-  static Widget    Pre_time_button;	/* Preset Time  Push Button */
-
-  static Widget    Lbl_counter_mode;
-  static Widget    Lbl_counter_state;
-
-  static Widget    Lbl_timer;
-  static Widget    Lbl_mon, Lbl_mon_rate;
-  static Widget    Lbl_det, Lbl_det_rate;
-  static Widget    Lbl_c3,  Lbl_c3_rate;
-  static Widget    Lbl_c4,  Lbl_c4_rate;
-  static Widget    Lbl_c5,  Lbl_c5_rate;
-  static Widget    Lbl_c6,  Lbl_c6_rate;
-  static Widget    Lbl_c7,  Lbl_c7_rate;
-  static Widget    Lbl_c8,  Lbl_c8_rate;
-
-  static Widget    Lbl_thresh_scales;
-  static Widget    Scale_thresh;
-  static Widget    Scale_rate;
-  static Widget    Lbl_rate_scale_max;
-  static Widget    Lbl_thr_scale_val;
-  static Widget    Lbl_rate_scale_val;
-  static Widget    Btn_scale_up;
-  static Widget    Btn_scale_down;
-  static Widget    Scale_run_progress;
-
-  static int	Nargs;		/* Argument list variables - these must ..  */
-  static Arg	Args[MAX_ARGS];	/* .. only be used as temporary variables.  */
-/*
-**---------------------------------------------------------------------------
-**			StrnTrim	- copy text, trimming whitespace.
-*/
-  char	*StrnTrim (
-/*	 ========
-*/		    char *dest,	/* Destination string */
-		    char *src,	/* Source string */
-		    int  max) {	/* Length of dest (incl terminating null) */
-    char    *pntr;
-    int	    prfx, cntr, last_non_space = 0;
-
-    dest[0] = '\0';
-    if (strlen (src) == 0) return dest;
-
-    prfx = strspn (src, " \t\n\r\v\f");
-    pntr = src + prfx;
-    cntr = 0;
-    while ((cntr < max) && (*pntr != '\0')) {
-      dest[cntr] = *pntr;
-      if (strcspn (pntr, " \t\n\r\v\f") >= 1) last_non_space = cntr;
-      cntr++;
-      pntr++;
-    }
-    dest[cntr] = '\0';
-    dest[last_non_space+1] = '\0';
-    return dest;
-  }
-/*
-**---------------------------------------------------------------------------
-**		CheckTimeSyntax	- check syntax of a time string
-*/
-  char	*CheckTimeSyntax (	/* Return NULL if not valid */
-/*	 ===============
-*/		char	    *str,	/* The string to be checked */
-		char	    *secs) {	/* If valid, returned string of equiv
-					**  duration in seconds
-					*/
-    static char	    text[50];
-    char	    *pntr, *h_pntr, *m_pntr, *s_pntr;
-    int		    len, hh, mm, ss, deci_secs;
-    float	    f_ss;
-    Boolean			    sep;
-	    /*
-	    ** Carefully check the syntax. Only whitespace, digits, ",", ":",
-	    ** "." and "'" are allowed. Simply squeeze out "," and "'", i.e. no
-	    ** check that exactly 3 chars occur between them!!
-	    */
-    StrnTrim (text, str, sizeof (text) - 1);	/* Make local copy to work on */
-    len = strlen (text);
-    if (len <= 0) return NULL;
-
-    if (strspn (text, "0123456789,\':.") != len) return NULL;
-
-    while ((pntr = strpbrk (text, ",\'")) != NULL) { /* Remove primes and */
-      do {					      /*  commas */
-        pntr[0] = pntr[1];
-        pntr++;
-      } while (pntr[0] != '\0');
-    }
-    if (strchr (text, ':') != NULL) {	/* hh:mm:ss.t or seconds?? */
-					/* It seems to be hh:mm:ss.t */
-      hh = mm = ss = deci_secs = 0;
-      h_pntr = strtok (text, ":");  /* Split into tokens */
-      m_pntr = strtok (NULL, ":");
-      s_pntr = strtok (NULL, ":");
-      if ((h_pntr == NULL) || (m_pntr == NULL) || (s_pntr == NULL)) return NULL;
-      if (sscanf (h_pntr, "%d", &hh) != 1) return NULL;
-      if (sscanf (m_pntr, "%d", &mm) != 1) return NULL;
-      if (sscanf (s_pntr, "%f", &f_ss) != 1) return NULL;
-      ss = (int) f_ss;
-      if (hh >= 555) return NULL;
-      if (mm >= 60) return NULL;
-      if (ss >= 60) return NULL;
-      deci_secs = (int) ((f_ss - (float) ss) * 10.0 + 0.001);
-      ss = ((hh * 60 + mm) * 60) + ss;
-      sprintf (text, "%d:%02d:%02d.%d", hh, mm, ss, deci_secs);
-      sprintf (secs, "%d.%d", ss, deci_secs);
-    }else {				/* Must be secs */
-      if (sscanf (text, "%f", &f_ss) != 1) return NULL;
-      if (f_ss <= 0.1) return NULL;
-      deci_secs = (int) (f_ss * 10 + 0.1);
-      hh = deci_secs/36000; deci_secs = deci_secs - (36000 * hh);
-      mm = deci_secs/600;   deci_secs = deci_secs - (  600 * mm);
-      ss = deci_secs/10;    deci_secs = deci_secs - (   10 * ss);
-      sprintf (text, "%d:%02d:%02d.%d", hh, mm, ss, deci_secs);
-      sprintf (secs, "%d.%d", (hh * 3600) + (mm * 60) + ss, deci_secs);
-    }
-    return text;
-  }
-/*
-**---------------------------------------------------------------------------
-**			TimeString	- set up time as a string.
-*/
-  void	 TimeString (
-/*	 ==========
-*/		    char    *dest,	/* Destination string */
-		    char    *prfx,	/* Prefix string */
-		    char    *secs) {	/* The time in seconds */
-
-    float   time = 0.0;
-    int	    hh, mm, ss, ticks;
-
-    sscanf (secs, "%f", &time);
-    ticks = (int) (time * 10.0 + 0.001);
-    ss = ticks/10; ticks = ticks - (ss * 10);
-    mm = ss/60; ss = ss - (mm * 60);
-    hh = mm/60; mm = mm - (hh * 60);
-    if (hh > 99) {
-        sprintf (dest, "%s%d:%02d:%02d.%01d", prfx, hh, mm, ss, ticks);
-    }else {
-        sprintf (dest, "%s%02d:%02d:%02d.%01d", prfx, hh, mm, ss, ticks);
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**			HelpCB		- callback for help buttons
-*/
-  void	HelpCB (
-/*	======
-*/		Widget	    w,		/*  widget id	*/
-		XtPointer    client_data,	/*  data from application   */
-		XtPointer    call_data) {	/*  data from widget class  */
-
-    static Widget   my_hlp = NULL;
-    char	    *button_name, text[60];
-    XmString	    my_cmpStr, my_cmpStr1;
-
-    if (my_hlp == NULL) {
-      my_cmpStr = XmStringCreateLtoR ("H E L P ! !",
-				XmSTRING_DEFAULT_CHARSET);
-      Nargs = 0;
-      XtSetArg (Args[Nargs], XmNdialogTitle, my_cmpStr); Nargs++;
-      my_hlp = XmCreateMessageDialog (Top_level, "Help", Args, Nargs);
-      XmStringFree (my_cmpStr);
-      XtUnmanageChild (XmMessageBoxGetChild (my_hlp, XmDIALOG_OK_BUTTON));
-      XtUnmanageChild (XmMessageBoxGetChild (my_hlp, XmDIALOG_HELP_BUTTON));
-    }
-    sprintf (text, "\"%s\" not yet available", XtName (w));
-    my_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-    XtVaSetValues (my_hlp, XmNmessageString, my_cmpStr, NULL);
-    XtManageChild (my_hlp);
-    XmStringFree (my_cmpStr);
-  }
-/*
-
-**---------------------------------------------------------------------------
-**			SetStateInWindows - update State fields in Windows to
-**					    match Cntr_state.state.
-*/
-  void	SetStateInWindows () {
-/*	=================
-*/
-    enum    {GO = 1, STOP = 2, PAUSE = 4, CONT = 8, MODE = 16};
-
-    XmString	    tmp_cmpStr, my_cmpStr;
-    int		    i, sens_mask, hh, mm, ss;
-    float	    thresh, thresh1, rate, rate1, f_tmp, f_tmp_max;
-    int		    i_tmp, scale_val;
-    int		    updt_cntr_mode, mill, thou, units;
-    char	    *buff, *title, text[80], r_text[40], t_text[40];
-
-    if (memcmp (&Cntr_state, &Old_Cntr_state, sizeof (Cntr_state)) == 0) return;
-
-    if (Cntr_state.state != Old_Cntr_state.state) {
-		/*
-		** State has changed. Adjust sensitivity of buttons.
-		*/
-      switch (Cntr_state.state) {
-        case OFFLINE:    sens_mask = 0;
-		    buff = "Off-line";
-		    break;
-        case MS:    sens_mask =	(GO | MODE);
-		    buff = "Stopped";
-		    break;
-        case PTS:   sens_mask = (STOP | PAUSE);
-		    buff = "Active";
-		    Cntr_state_mode = VMECNT__PRESET_TIME;
-		    break;
-        case PCS:   sens_mask = (STOP | PAUSE);
-		    buff = "Active";
-		    Cntr_state_mode = VMECNT__PRESET_COUNT;
-		    break;
-        case LRTS:  sens_mask = (STOP | PAUSE);
-		    buff = "Rate low";
-		    Cntr_state_mode = VMECNT__PRESET_TIME;
-		    break;
-        case LRCS:  sens_mask = (STOP | PAUSE);
-		    buff = "Rate low";
-		    Cntr_state_mode = VMECNT__PRESET_COUNT;
-		    break;
-        case PTSP:  sens_mask = (STOP | CONT);
-		    buff = "Paused";
-		    Cntr_state_mode = VMECNT__PRESET_TIME;
-		    break;
-        case PCSP:  sens_mask = (STOP | CONT);
-		    buff = "Paused";
-		    Cntr_state_mode = VMECNT__PRESET_COUNT;
-		    break;
-        case LRTSP: sens_mask = (STOP | CONT);
-		    buff = "Rate low and Paused";
-		    Cntr_state_mode = VMECNT__PRESET_TIME;
-		    break;
-        case LRCSP: sens_mask = (STOP | CONT);
-		    buff = "Rate low and Paused";
-		    Cntr_state_mode = VMECNT__PRESET_COUNT;
-		    break;
-        default:    sens_mask = 0;
-		    buff = "Illegal";
-      }
-		/*
-		** Desensitise.
-		*/
-      Nargs = 0;
-      XtSetArg (Args[Nargs], XmNsensitive, False); Nargs++;
-      if ((sens_mask & GO)    == 0) XtSetValues (Go_button,    Args, Nargs);
-      if ((sens_mask & STOP)  == 0) XtSetValues (Stop_button,  Args, Nargs);
-      if ((sens_mask & PAUSE) == 0) XtSetValues (Pause_button, Args, Nargs);
-      if ((sens_mask & CONT)  == 0) XtSetValues (Cont_button,  Args, Nargs);
-      if ((sens_mask & MODE)  == 0) XtSetValues (Mode_cascade, Args, Nargs);
-		/*
-		** Sensitise.
-		*/
-      Nargs = 0;
-      XtSetArg (Args[Nargs], XmNsensitive, True); Nargs++;
-      if ((sens_mask & GO)    != 0) XtSetValues (Go_button,    Args, Nargs);
-      if ((sens_mask & STOP)  != 0) XtSetValues (Stop_button,  Args, Nargs);
-      if ((sens_mask & PAUSE) != 0) XtSetValues (Pause_button, Args, Nargs);
-      if ((sens_mask & CONT)  != 0) XtSetValues (Cont_button,  Args, Nargs);
-      if ((sens_mask & MODE)  != 0) XtSetValues (Mode_cascade, Args, Nargs);
-		/*
-		** Adjust Status Label Text to match state.
-		*/
-      tmp_cmpStr = XmStringCreateLtoR (buff, XmSTRING_DEFAULT_CHARSET);
-      Nargs = 0;
-      XtSetArg (Args[Nargs], XmNlabelString, tmp_cmpStr); Nargs++;
-      XtSetValues (Lbl_counter_state, Args, Nargs);
-      XmStringFree (tmp_cmpStr);
-    }
-    if (strcmp (Cntr_state.timer, Old_Cntr_state.timer) != 0) {
-      sscanf (Cntr_state.timer, "%f", &f_tmp);
-      if (f_tmp < 10.0) {
-        sprintf (text, "%.3f sec", f_tmp);
-      } else if (f_tmp < 60.0) {
-        sprintf (text, "%.2f sec", f_tmp);
-      } else {
-        ss = (int) f_tmp;
-        mm = ss/60; ss = ss - (mm * 60);
-        hh = mm/60; mm = mm - (hh * 60);
-        sprintf (text, "%d:%02d:%02d", hh, mm, ss);
-      }
-      tmp_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-      XtSetArg (Args[0], XmNlabelString, tmp_cmpStr);
-      XtSetValues (Lbl_timer, Args, 1);
-      XmStringFree (tmp_cmpStr);
-      if (Cntr_state_mode == VMECNT__PRESET_TIME) {
-        sscanf (Cntr_state_timer_preset, "%f", &f_tmp_max);
-	scale_val = (int) ((f_tmp/f_tmp_max) * SCALE_RUN_MAX);
-	if (scale_val > SCALE_RUN_MAX) scale_val = SCALE_RUN_MAX;
-	XmScaleSetValue (Scale_run_progress, scale_val);
-      }
-    }
-    for (i = 0; i < 8; i++) {
-      if (Cntr_state.cntrs[i] != Old_Cntr_state.cntrs[i]) {
-	sprintf (text, "%d", Cntr_state.cntrs[i]);
-	tmp_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-	XtSetArg (Args[0], XmNlabelString, tmp_cmpStr);
-	switch (i) {
-	 case 0: XtSetValues (Lbl_mon, Args, 1); break;
-	 case 1: XtSetValues (Lbl_det, Args, 1); break;
-	 case 2: XtSetValues (Lbl_c3,  Args, 1); break;
-	 case 3: XtSetValues (Lbl_c4,  Args, 1); break;
-	 case 4: XtSetValues (Lbl_c5,  Args, 1); break;
-	 case 5: XtSetValues (Lbl_c6,  Args, 1); break;
-	 case 6: XtSetValues (Lbl_c7,  Args, 1); break;
-	 case 7: XtSetValues (Lbl_c8,  Args, 1);
-	}
-	XmStringFree (tmp_cmpStr);
-	if ((Cntr_state_mode == VMECNT__PRESET_COUNT) &&
-	    (i == 0)) {
-	  f_tmp = ((float) Cntr_state.cntrs[0])/((float) Cntr_state_mon_preset);
-	  scale_val = (int) (f_tmp * SCALE_RUN_MAX);
-	  if (scale_val > SCALE_RUN_MAX) scale_val = SCALE_RUN_MAX;
-	  XmScaleSetValue (Scale_run_progress, scale_val);
-	}
-      }
-    }
-
-    for (i = 0; i < 8; i++) {
-      if (strcmp (Cntr_state.rates[i], Old_Cntr_state.rates[i]) != 0) {
-	sscanf (Cntr_state.rates[i], "%f", &f_tmp);
-        if (f_tmp > 999.0) {
-          sprintf (text, "%.1f kHz", f_tmp/1000.0);
-        }else if (f_tmp > 0.01) {
-          sprintf (text, "%.1f Hz", f_tmp);
-	}else {
-          sprintf (text, "%.0f Hz", f_tmp);
-        }
-	tmp_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-	XtSetArg (Args[0], XmNlabelString, tmp_cmpStr);
-	switch (i) {
-	 case 0: XtSetValues (Lbl_mon_rate, Args, 1); break;
-	 case 1: XtSetValues (Lbl_det_rate, Args, 1); break;
-	 case 2: XtSetValues (Lbl_c3_rate,  Args, 1); break;
-	 case 3: XtSetValues (Lbl_c4_rate,  Args, 1); break;
-	 case 4: XtSetValues (Lbl_c5_rate,  Args, 1); break;
-	 case 5: XtSetValues (Lbl_c6_rate,  Args, 1); break;
-	 case 6: XtSetValues (Lbl_c7_rate,  Args, 1); break;
-	 case 7: XtSetValues (Lbl_c8_rate,  Args, 1);
-	}
-	XmStringFree (tmp_cmpStr);
-      }
-    }
-
-    if (Cntr_state.analog_indx != Old_Cntr_state.analog_indx) {
-      Nargs = 0;	    /* Prepare arguments to undo reverse-video */
-      XtSetArg (Args[Nargs], XmNforeground, Dflt_foreground); Nargs++;
-      XtSetArg (Args[Nargs], XmNbackground, Dflt_background); Nargs++;
-      switch (Old_Cntr_state.analog_indx) {	/* Then do it */
-       case 0: XtSetValues (Lbl_mon_rate, Args, Nargs); break;
-       case 1: XtSetValues (Lbl_det_rate, Args, Nargs); break;
-       case 2: XtSetValues (Lbl_c3_rate,  Args, Nargs); break;
-       case 3: XtSetValues (Lbl_c4_rate,  Args, Nargs); break;
-       case 4: XtSetValues (Lbl_c5_rate,  Args, Nargs); break;
-       case 5: XtSetValues (Lbl_c6_rate,  Args, Nargs); break;
-       case 6: XtSetValues (Lbl_c7_rate,  Args, Nargs); break;
-       case 7: XtSetValues (Lbl_c8_rate,  Args, Nargs);
-      }
-      Nargs = 0;	    /* Then prepare arguments to do reverse-video */
-      XtSetArg (Args[Nargs], XmNforeground, Dflt_background); Nargs++;
-      XtSetArg (Args[Nargs], XmNbackground, Dflt_foreground); Nargs++;
-      switch (Cntr_state.analog_indx) {	/* Then do it */
-       case 0: XtSetValues (Lbl_mon_rate, Args, Nargs); break;
-       case 1: XtSetValues (Lbl_det_rate, Args, Nargs); break;
-       case 2: XtSetValues (Lbl_c3_rate,  Args, Nargs); break;
-       case 3: XtSetValues (Lbl_c4_rate,  Args, Nargs); break;
-       case 4: XtSetValues (Lbl_c5_rate,  Args, Nargs); break;
-       case 5: XtSetValues (Lbl_c6_rate,  Args, Nargs); break;
-       case 6: XtSetValues (Lbl_c7_rate,  Args, Nargs); break;
-       case 7: XtSetValues (Lbl_c8_rate,  Args, Nargs);
-      }
-    }
-
-    switch (Cntr_state.thresh_indx) {
-     case -1:	title = "Threshold Check disabled";	break;
-     case  0:	title = "\"Monitor\" Threshold/Rate";	break;
-     case  1:	title = "\"Detector\" Threshold/Rate";	break;
-     case  2:	title = "\"C3\" Threshold/Rate";	break;
-     case  3:	title = "\"C4\" Threshold/Rate";	break;
-     case  4:	title = "\"C5\" Threshold/Rate";	break;
-     case  5:	title = "\"C6\" Threshold/Rate";	break;
-     case  6:	title = "\"C7\" Threshold/Rate";	break;
-     case  7:	title = "\"C8\" Threshold/Rate";
-    }
-    if (Cntr_state.thresh_indx < 0) {
-      thresh = rate = 0.0;
-    }else {
-      sscanf (Cntr_state.threshes[Cntr_state.thresh_indx], "%f", &thresh);
-      sscanf (Cntr_state.rates[Cntr_state.thresh_indx],    "%f", &rate);
-    }
-
-    if (Cntr_state.thresh_indx != Old_Cntr_state.thresh_indx) {
-      tmp_cmpStr = XmStringCreateLtoR (title, XmSTRING_DEFAULT_CHARSET);
-      XtSetArg (Args[0], XmNlabelString, tmp_cmpStr);
-      XtSetValues (Lbl_thresh_scales, Args, 1);
-/*
-**      if (Cntr_state.thresh_indx < 0) {
-**	XtSetArg (Args[0], XmNsensitive, False);
-**      }else {
-**	XtSetArg (Args[0], XmNsensitive, True);
-**      }
-**      XtSetValues (Scale_thresh, Args, 1);
-*/
-      XmStringFree (tmp_cmpStr);
-      Thresh_cntr_thresh = thresh + 0.1;    /* Ensure thresh is updated */
-      Thresh_cntr_rate = rate + 0.1;	    /* Ensure cntr rate is updated */
-    }
-
-    if (Scale_is_khz) {
-      thresh1 = thresh/100.0;
-      rate1   = rate/100.0;
-    }else {
-      thresh1 = thresh;
-      rate1   = rate;
-    }
-    if (thresh > 999.0) {
-      sprintf (t_text, "Thresh = %.1f kHz", thresh/1000.0);
-    }else {
-      sprintf (t_text, "Thresh = %.1f Hz", thresh);
-    }
-    if (rate > 999.0) {
-      sprintf (r_text, "Rate   = %.1f kHz", rate/1000.0);
-    }else {
-      sprintf (r_text, "Rate   = %.1f Hz", rate);
-    }
-
-    if (thresh != Thresh_cntr_thresh) {    
-      if ((int) thresh1 > Scale_max) {
-        XmScaleSetValue (Scale_thresh, Scale_max);
-      }else {
-        XmScaleSetValue (Scale_thresh, (int) thresh1);
-      }
-      tmp_cmpStr = XmStringCreateLtoR (t_text, XmSTRING_DEFAULT_CHARSET);
-      XtSetArg (Args[0], XmNlabelString, tmp_cmpStr);
-      XtSetValues (Lbl_thr_scale_val, Args, 1);
-      XmStringFree (tmp_cmpStr);
-
-      Thresh_cntr_thresh = thresh;
-    }
-    if (rate != Thresh_cntr_rate) {
-      if ((int) rate1 > Scale_max) {
-        XmScaleSetValue (Scale_rate, Scale_max);
-      }else {
-        XmScaleSetValue (Scale_rate, (int) rate1);
-      }
-      tmp_cmpStr = XmStringCreateLtoR (r_text, XmSTRING_DEFAULT_CHARSET);
-      XtSetArg (Args[0], XmNlabelString, tmp_cmpStr);
-      XtSetValues (Lbl_rate_scale_val, Args, 1);
-      XmStringFree (tmp_cmpStr);
-
-      Thresh_cntr_rate = rate;
-    }
-
-    updt_cntr_mode = False;
-    if (Cntr_state_mode != Cntr_state_mode_in_window) updt_cntr_mode = True;
-
-    if ((Cntr_state_mode == VMECNT__PRESET_COUNT) &&
-	(Cntr_state.mon_preset != Cntr_state_mon_preset_in_window))
-	    updt_cntr_mode = True;
-
-    if ((Cntr_state_mode == VMECNT__PRESET_TIME) &&
-	(strcmp (Cntr_state.timer_preset,
-		 Cntr_state_timer_preset_in_window) != 0))
-		    updt_cntr_mode = True;
-
-    if (updt_cntr_mode) {
-      if (Cntr_state_mode == VMECNT__PRESET_COUNT) {
-	units = Cntr_state.mon_preset;
-	thou  = units/1000; units = units - (1000 * thou);
-	mill  = thou/1000;  thou  = thou  - (1000 * mill);
-	if (mill > 0) {
-	  sprintf (text, "Preset Count Mode: %d'%03d'%03d", mill, thou, units);
-	}else if (thou > 0) {
-	  sprintf (text, "Preset Count Mode: %d'%03d", thou, units);
-	}else {
-	  sprintf (text, "Preset Count Mode: %d", units);
-	}
-	Cntr_state_mon_preset_in_window = Cntr_state.mon_preset;
-      }else {
-	TimeString (text, "Preset Time Mode: ", Cntr_state.timer_preset);
-	strcpy (Cntr_state_timer_preset, Cntr_state.timer_preset);
-	strcpy (Cntr_state_timer_preset_in_window, Cntr_state.timer_preset);
-	strcpy (Cntr_state_timer_preset_in_window, Cntr_state.timer_preset);
-      }
-      my_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-      XtSetArg (Args[0], XmNlabelString, my_cmpStr);
-      XtSetValues (Lbl_counter_mode, Args, 1);
-      XmStringFree (my_cmpStr);
-      Cntr_state_mode_in_window = Cntr_state_mode;
-    }
-
-    memcpy (&Old_Cntr_state, &Cntr_state, sizeof (Cntr_state));
-  }
-/*
-**---------------------------------------------------------------------------
-**                      setupTime       - get the current time in ASCII
-*/
-  char  *setupTime (char *buff, int buff_size) {
-/*      ==========
-*/
-    time_t          time_now;
-
-    time_now = time (NULL);     /* Get the current time */
-    StrJoin (buff, buff_size,   /* Convert to ASCII and copy to buffer */
-                asctime (localtime (&time_now)), "");
-    strtok (buff, "\n");        /* Remove the trailing "\n" character. */
-    return buff;
-  }
-/*
-**---------------------------------------------------------------------------
-**			GetCounterStatus	- get counter status from srvr
-*/
-  int	GetCounterStatus (
-/*	================
-*/			int type) {	/* VMECNT__FULL  or 
-					** VMECNT__INCR  or
-					** VMECNT__SHORT
-					*/
-    int			status, size, max_size, errcode, my_errno, vaxc_errno;
-    float		my_flt;
-    char		text[20], buff[80], *err_pntr;
-    char		*cmnd;
-    char		*fmt;
-    char		*pntr;
-    char		*rply;
-
-    static char *cmnd_list[] = {"rr 1\r", "rr 2\r", "rr 3\r", "rr 4\r",
-				"rr 5\r", "rr 6\r", "rr 7\r", "rr 8\r",
-
-				"di 1\r", "di 2\r", "di 3\r", "di 4\r",
-				"di 5\r", "di 6\r", "di 7\r", "di 8\r",
-
-				"dt\r", "da\r", "dr\r",
-
-				"dl 1\r", "dl 2\r", "dl 3\r", "dl 4\r",
-				"dl 5\r", "dl 6\r", "dl 7\r", "dl 8\r",
-
-				"mp\r", "tp\r", NULL};
-
-    static char *cmnd_fmt[]  = {"%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s",
-				"%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s",
-				"%s", "%d", "%d",
-				"%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s",
-				"%d", "%s"};
-    static char *cmnd_pntr[]  = {	Cntr_state.rates[0],
-					Cntr_state.rates[1],
-					Cntr_state.rates[2],
-					Cntr_state.rates[3],
-					Cntr_state.rates[4],
-					Cntr_state.rates[5],
-					Cntr_state.rates[6],
-					Cntr_state.rates[7],
-					Cntr_state.thresh_integ_time[0],
-					Cntr_state.thresh_integ_time[1],
-					Cntr_state.thresh_integ_time[2],
-					Cntr_state.thresh_integ_time[3],
-					Cntr_state.thresh_integ_time[4],
-					Cntr_state.thresh_integ_time[5],
-					Cntr_state.thresh_integ_time[6],
-					Cntr_state.thresh_integ_time[7],
-					Cntr_state.rate_integ_time,
-			      (char *) &Cntr_state.analog_indx,
-			      (char *) &Cntr_state.thresh_indx,
-					Cntr_state.threshes[0],
-					Cntr_state.threshes[1],
-					Cntr_state.threshes[2],
-					Cntr_state.threshes[3],
-					Cntr_state.threshes[4],
-					Cntr_state.threshes[5],
-					Cntr_state.threshes[6],
-					Cntr_state.threshes[7],
-			      (char *) &Cntr_state.mon_preset,
-					Cntr_state.timer_preset};
-    static int  cmnd_indx = 0;
-		    /*
-		    ** Send an appropriate list of commands
-		    ** to the server and get a response.
-		    */
-    switch (type) {
-     case VMECNT__SHORT:	/* Short (quick) status.
-				*/
-      status = AsynSrv_SendCmnds (&InfoHndl->asyn_info,
-			&InfoHndl->to_host, &InfoHndl->from_host,
-			"rs\r", "ra\r", NULL);
-      break;
-     case VMECNT__INCR:		/* Incremental status - this slowly updates
-				**  the status information of the counter.
-				*/
-      cmnd = cmnd_list[cmnd_indx];
-      fmt  = cmnd_fmt[cmnd_indx];
-      pntr = cmnd_pntr[cmnd_indx];
-      status = AsynSrv_SendCmnds (&InfoHndl->asyn_info,
-			&InfoHndl->to_host, &InfoHndl->from_host,
-			"rs\r", "ra\r", cmnd, NULL);
-      cmnd_indx++;
-      if (cmnd_list[cmnd_indx] == NULL) cmnd_indx = 0;
-      break;
-     case VMECNT__FULL:		/* Full status.
-				*/
-      status = AsynSrv_SendCmnds (&InfoHndl->asyn_info,
-			&InfoHndl->to_host, &InfoHndl->from_host,
-			"rs\r", "ra\r",
-			cmnd_list[ 0], cmnd_list[ 1], cmnd_list[ 2],
-			cmnd_list[ 3], cmnd_list[ 4], cmnd_list[ 5],
-			cmnd_list[ 6], cmnd_list[ 7], cmnd_list[ 8],
-			cmnd_list[ 9], cmnd_list[10], cmnd_list[11],
-			cmnd_list[12], cmnd_list[13], cmnd_list[14],
-			cmnd_list[15], cmnd_list[16], cmnd_list[17],
-			cmnd_list[18], cmnd_list[19], cmnd_list[20],
-			cmnd_list[21], cmnd_list[22], cmnd_list[23],
-			cmnd_list[24], cmnd_list[25], cmnd_list[26],
-			cmnd_list[27], cmnd_list[28], cmnd_list[29],
-			NULL);
-    }
-	    /*--------------------------------------------------------------
-	    ** Now analyse the response. All responses start with the same
-	    ** 2 commands so do these in common.
-	    */
-    if (status) {
-      rply = AsynSrv_GetReply (
-		    &InfoHndl->asyn_info, &InfoHndl->from_host, NULL);
-      if (rply != NULL) {
-        if (sscanf (rply, "%d", &Cntr_state.state) != 1) {
-	  if (strncmp (rply, "?OF", 3) != 0) {
-	    printf ("%s\n", setupTime (buff, sizeof (buff)));
-	    printf ("GetCounterStatus -- bad response to RS command.\n");
-	    printf ("         Response = \"%s\"\n", rply);
-	  }
-	  Cntr_state.state = (AppData.persist) ? UNKNOWN : OFFLINE;
-	  return FALSE;
-	}
-	if ((Cntr_state.state & PTS) != 0) Cntr_state_mode=VMECNT__PRESET_TIME;
-	if ((Cntr_state.state & PCS) != 0) Cntr_state_mode=VMECNT__PRESET_COUNT;
-
-        rply = AsynSrv_GetReply (
-		    &InfoHndl->asyn_info, &InfoHndl->from_host, rply);
-	if (rply != NULL) {
-	  if ((sscanf (rply, "%s %d %d %d %d %d %d %d %d",
-		Cntr_state.timer,
-		&Cntr_state.cntrs[0], &Cntr_state.cntrs[1],
-		&Cntr_state.cntrs[2], &Cntr_state.cntrs[3],
-		&Cntr_state.cntrs[4], &Cntr_state.cntrs[5],
-		&Cntr_state.cntrs[6], &Cntr_state.cntrs[7]) != 9) ||
-              (sscanf (rply, "%f %d", &my_flt, &status) != 2)) {
-	    if (strncmp (rply, "?OF", 3) != 0) {
-	      printf ("%s\n", setupTime (buff, sizeof (buff)));
-	      printf ("GetCounterStatus -- bad response to RA command.\n");
-	      printf ("         Response = \"%s\"\n", rply);
-	    }
-	    Cntr_state.state = (AppData.persist) ? UNKNOWN : OFFLINE;
-	    return FALSE;
-	  }
-	}else {
-          printf ("%s\n", setupTime (buff, sizeof (buff)));
-	  printf ("GetCounterStatus -- Bad reply packet format!\n");
-	  Cntr_state.state = (AppData.persist) ? UNKNOWN : OFFLINE;
-	  return FALSE;
-	}
-      }else {
-        printf ("%s\n", setupTime (buff, sizeof (buff)));
-        printf ("GetCounterStatus -- Bad reply packet format!\n");
-	Cntr_state.state = (AppData.persist) ? UNKNOWN : OFFLINE;
-        return FALSE;
-      }
-      switch (type) {		/* Now switch to handle rest of reply */
-       case VMECNT__SHORT:	/* Short status - nothing more to do */
-	break;
-       case VMECNT__INCR:	/* Incremental status - just one reply to
-				** analyse */
-        rply = AsynSrv_GetReply (
-		    &InfoHndl->asyn_info, &InfoHndl->from_host, rply);
-	if (rply != NULL) {
-	  if ((sscanf (rply, fmt, pntr) != 1) ||
-	      (sscanf (rply, "%f", &my_flt) != 1)) {
-	    if (strncmp (rply, "?OF", 3) != 0) {
-	      strcpy (text, cmnd);
-	      text[strlen (cmnd) - 1] = '\0';	/* Remove trailing "\r" */
-              printf ("%s\n", setupTime (buff, sizeof (buff)));
-	      printf ("GetCounterStatus -- bad response to command.\n");
-	      printf ("         Command  = \"%s\"\n", text);
-	      printf ("         Response = \"%s\"\n", rply);
-	    }
-	    Cntr_state.state = (AppData.persist) ? UNKNOWN : OFFLINE;
-	    return FALSE;
-	  }else {
-	    if (strncmp (cmnd, "da", 2) == 0) {
-	      Cntr_state.analog_indx--;
-	      if (Cntr_state.analog_indx < 0) Cntr_state.analog_indx = 0;
-	      if (Cntr_state.analog_indx > 7) Cntr_state.analog_indx = 0;
-	    }
-	    if (strncmp (cmnd, "dr", 2) == 0) {
-	      Cntr_state.thresh_indx--;
-	      if (Cntr_state.thresh_indx < -1) Cntr_state.thresh_indx = -1;
-	      if (Cntr_state.thresh_indx >  7) Cntr_state.thresh_indx = -1;
-	    }
-	  }
-	}else {
-          printf ("%s\n", setupTime (buff, sizeof (buff)));
-	  printf ("GetCounterStatus -- Bad reply packet format!\n");
-	  Cntr_state.state = (AppData.persist) ? UNKNOWN : OFFLINE;
-	  return FALSE;
-	}
-	break;
-       case VMECNT__FULL:	/* Full status - loop to analyse reply */
-	for (cmnd_indx = 0; cmnd_list[cmnd_indx] != NULL; cmnd_indx++) {
-	  cmnd = cmnd_list[cmnd_indx];
-	  fmt  = cmnd_fmt[cmnd_indx];
-	  pntr = cmnd_pntr[cmnd_indx];
-	  rply = AsynSrv_GetReply (
-		    &InfoHndl->asyn_info, &InfoHndl->from_host, rply);
-	  if (rply != NULL) {
-	    if ((sscanf (rply, fmt, pntr) != 1) ||
-	        (sscanf (rply, "%f", &my_flt) != 1)) {
-	      if (strncmp (rply, "?OF", 3) != 0) {
-                strcpy (text, cmnd);
-                text[strlen (cmnd) - 1] = '\0';	/* Remove trailing "\r" */
-                printf ("%s\n", setupTime (buff, sizeof (buff)));
-                printf ("GetCounterStatus -- bad response to command.\n");
-                printf ("         Command  = \"%s\"\n", text);
-                printf ("         Response = \"%s\"\n", rply);
-              }
-	      Cntr_state.state = (AppData.persist) ? UNKNOWN : OFFLINE;
-              return FALSE;
-	    }else if (strncmp (cmnd, "da", 2) == 0) {
-	      Cntr_state.analog_indx--;
-	      if (Cntr_state.analog_indx < 0) Cntr_state.analog_indx = 0;
-	      if (Cntr_state.analog_indx > 7) Cntr_state.analog_indx = 0;
-	    }else if (strncmp (cmnd, "dr", 2) == 0) {
-	      Cntr_state.thresh_indx--;
-	      if (Cntr_state.thresh_indx < -1) Cntr_state.thresh_indx = -1;
-	      if (Cntr_state.thresh_indx >  7) Cntr_state.thresh_indx = -1;
-	    }
-	  }else {
-            printf ("%s\n", setupTime (buff, sizeof (buff)));
-	    printf ("GetCounterStatus -- Bad reply packet format!\n");
-	    Cntr_state.state = (AppData.persist) ? UNKNOWN : OFFLINE;
-	    return FALSE;
-	  }
-        }
-	cmnd_indx = 0;
-      }
-    }else {
-      printf ("%s\n", setupTime (buff, sizeof (buff)));
-      printf ("GetCounterStatus:\n");
-      printf ("       Bad status from AsynSrv_SendCmnds: %d\n", status);
-      EL737_ErrInfo (&err_pntr, &errcode, &my_errno, &vaxc_errno);
-      if (err_pntr != NULL) printf ("%s\n", err_pntr);
-    }
-    return TRUE;
-  }
-/*
-**---------------------------------------------------------------------------
-**			PutOnLine	- try to turn counter on-line.
-*/
-  int	PutOnLine () {
-/*	=========
-**		    Return value is True if counter is on-line.
-*/
-    int			    status;
-    char		    text[32];
-		    /*
-		    ** Send commands to get the counter on-line. Use a
-		    ** short time-out.
-		    */
-    EL737_Config (&Hndl, "msecTmo", 500, NULL);
-
-    status = EL737_SendCmnd (&Hndl, "rmt 1\r", text, sizeof (text));
-
-    status = EL737_SendCmnd (&Hndl, "rmt 1\r", text, sizeof (text));
-    if ((!status) || (text[0] == '?')) goto offline;
-
-    status = EL737_SendCmnd (&Hndl, "echo 2\r", text, sizeof (text));
-    if ((!status) || (text[0] == '?')) goto offline;
-
-    status = EL737_SendCmnd (&Hndl, "id\r", text, sizeof (text));
-    if ((!status) || (strncmp (text, "EL737", 5) != 0)) goto offline;
-
-    EL737_Config (&Hndl, "msecTmo", AppData.msec_tmo, NULL);
-    return True;
-
-offline:
-    printf ("\007PutOnLine:\n"
-		"      Device is not an EL737!\n");
-    return False;
-  }
-/*
-**---------------------------------------------------------------------------
-**		PresetCntCB	- callback for setting preset count
-*/
-  void	PresetCntCB (
-/*	===========
-*/		Widget	    w,		/*  widget id	*/
-		XtPointer    client_data,	/*  data from application   */
-		XtPointer    call_data) {	/*  data from widget class  */
-
-    static Widget   my_err = NULL;
-    char	    text[32], *token, *pntr;
-    int		    limit = 0, len;
-    int		    mill, thou, units;
-    XmString			    my_cmpStr;
-    XmSelectionBoxCallbackStruct   *my_call_data;
-    XmStringContext		    ctxt;
-    XmStringCharSet		    charset;
-    XmStringDirection		    dir;
-    Boolean			    sep;
-	    /*
-	    **	Do the work to find the result of the user's input
-	    */
-    my_call_data = (XmSelectionBoxCallbackStruct *) call_data;
-    XmStringInitContext (&ctxt, my_call_data->value);
-    XmStringGetNextSegment(ctxt, &token, &charset, &dir, &sep);
-    XmStringFreeContext(ctxt);
-    XtFree ((char *) dir);
-    XtFree ((char *) sep);
-    XtFree ((char *) charset);
-	    /*
-	    ** Carefully check the syntax. Only whitespace, digits, "," and "'"
-	    ** are allowed. Simply squeeze out "," and "'", i.e. no check that
-	    ** exactly 3 chars occur between them!!
-	    */
-    StrnTrim (text, token, sizeof (text) - 1);
-    len = strlen (text);
-    if (len <= 0) goto pc_error;
-    if (strspn (text, "0123456789,\'") != len) goto pc_error;
-    while ((pntr = strpbrk (text, ",\'")) != NULL) { /* Remove primes and */
-      do {					      /*  commas */
-        pntr[0] = pntr[1];
-        pntr++;
-      } while (pntr[0] != '\0');
-    }
-    if (sscanf (text, "%d", &limit) != 1) {
-      goto pc_error;
-    }else {
-      if ((limit < 1) || (limit >= 2000e6)) {
-        goto pc_error;
-      }else {
-        Cntr_state_mon_preset = limit;
-      }
-    }
-    units = Cntr_state_mon_preset;
-    thou  = units/1000; units = units - (1000 * thou);
-    mill  = thou/1000;  thou  = thou  - (1000 * mill);
-    if (mill > 0) {
-      sprintf (text, "Preset Count Mode: %d'%03d'%03d", mill, thou, units);
-    }else if (thou > 0) {
-      sprintf (text, "Preset Count Mode: %d'%03d", thou, units);
-    }else {
-      sprintf (text, "Preset Count Mode: %d", units);
-    }
-    my_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-    XtSetArg (Args[0], XmNlabelString, my_cmpStr);
-    XtSetValues (Lbl_counter_mode, Args, 1);
-    XmStringFree (my_cmpStr);
-    return;
-
-  pc_error:
-/*========
-*/  if (my_err == 0) {
-      my_cmpStr = XmStringCreateLtoR (
-			"Illegal Value. Value must be an integer\n"
-			"in the range 0 < Value < 2000e6",
-			XmSTRING_DEFAULT_CHARSET);
-      Nargs = 0;
-      XtSetArg (Args[Nargs], XmNdefaultButtonType, XmDIALOG_CANCEL_BUTTON);
-					Nargs++;
-      XtSetArg (Args[Nargs], XmNmessageAlignment, XmALIGNMENT_CENTER); Nargs++;
-      XtSetArg (Args[Nargs], XmNmessageString, my_cmpStr); Nargs++;
-      my_err = XmCreateErrorDialog (Top_level, "Error", Args, Nargs);
-      XmStringFree (my_cmpStr);
-      XtUnmanageChild (XmMessageBoxGetChild (my_err, XmDIALOG_OK_BUTTON));
-      XtUnmanageChild (XmMessageBoxGetChild (my_err, XmDIALOG_HELP_BUTTON));
-    }
-    XtManageChild (my_err);
-    return;
-  }
-/*
-**---------------------------------------------------------------------------
-**		PresetTimeCB	- callback for setting preset time
-*/
-  void	PresetTimeCB (
-/*	============
-*/		Widget	    w,		/*  widget id	*/
-		XtPointer    client_data,	/*  data from application   */
-		XtPointer    call_data) {	/*  data from widget class  */
-
-    static Widget   my_err = NULL;
-    char	    *token;
-    char	    *pntr, secs_text[50], text[50];
-
-    XmString			    my_cmpStr;
-    XmSelectionBoxCallbackStruct   *my_call_data;
-    XmStringContext		    ctxt;
-    XmStringCharSet		    charset;
-    XmStringDirection		    dir;
-    Boolean			    sep;
-	    /*
-	    **	Do the work to find the result of the user's input
-	    */
-    my_call_data = (XmSelectionBoxCallbackStruct *) call_data;
-    XmStringInitContext (&ctxt, my_call_data->value);
-    XmStringGetNextSegment(ctxt, &token, &charset, &dir, &sep);
-    XmStringFreeContext(ctxt);
-    XtFree ((char *) dir);
-    XtFree ((char *) sep);
-    XtFree ((char *) charset);
-	    /*
-	    ** Carefully check the syntax.
-	    */
-    pntr = CheckTimeSyntax (token, secs_text);
-    if (pntr == NULL) goto pt_error;
-
-    strcpy (Cntr_state_timer_preset, secs_text);
-    strcpy (Cntr_state_timer_preset_in_window, secs_text);
-
-    TimeString (text, "Preset Time Mode: ", Cntr_state_timer_preset);
-    my_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-    XtSetArg (Args[0], XmNlabelString, my_cmpStr);
-    XtSetValues (Lbl_counter_mode, Args, 1);
-    XmStringFree (my_cmpStr);
-    return;
-
-  pt_error:
-/*========
-*/  if (my_err == NULL) {
-      my_cmpStr = XmStringCreateLtoR (
-			"Illegal Value. Value must be hh:mm:ss.t\n"
-			"or a floating point value. The allowed\n"
-			"range is 0.1 secs to 555 hours.",
-			XmSTRING_DEFAULT_CHARSET);
-      Nargs = 0;
-      XtSetArg (Args[Nargs], XmNdefaultButtonType, XmDIALOG_CANCEL_BUTTON);
-					Nargs++;
-      XtSetArg (Args[Nargs], XmNmessageAlignment, XmALIGNMENT_CENTER); Nargs++;
-      XtSetArg (Args[Nargs], XmNmessageString, my_cmpStr); Nargs++;
-      my_err = XmCreateErrorDialog (Top_level, "Error", Args, Nargs);
-      XmStringFree (my_cmpStr);
-      XtUnmanageChild (XmMessageBoxGetChild (my_err, XmDIALOG_OK_BUTTON));
-      XtUnmanageChild (XmMessageBoxGetChild (my_err, XmDIALOG_HELP_BUTTON));
-    }
-    XtManageChild (my_err);
-    return;
-  }
-/*
-**---------------------------------------------------------------------------
-**		ThreshActiveCB	- callback for Threshold .../Active Counter ...
-*/
-  void	ThreshActiveCB (
-/*	==============
-*/		Widget	    w,		/*  widget id	*/
-		XtPointer    client_data,	/*  data from application   */
-		XtPointer    call_data) {	/*  data from widget class  */
-
-    char	*button_name, text[16];
-    int		cntr, status;
-    float	my_val;
-	    /*
-	    **	print message to prove we got activated
-	    */
-    button_name = XtName (w);
-    if ((sscanf (button_name, "C%d", &cntr) == 1) &&
-	(cntr > 0) &&
-	(cntr <= 8)) {
-      printf (" Setting \"%s\" as Threshold Counter.\n", button_name);
-    }else {
-      cntr = 0;
-      printf (" Disabling threshold monitoring.\n");
-    }
-
-    status = EL737_EnableThresh (&Hndl, cntr);
-    if (status) {
-      status = EL737_GetThresh (&Hndl, &Cntr_state.thresh_indx, &my_val);
-      if (status) {
-	Cntr_state.thresh_indx--;
-	if (Cntr_state.thresh_indx < -1) Cntr_state.thresh_indx = -1;
-	if (Cntr_state.thresh_indx >  7) Cntr_state.thresh_indx = -1;
-	Thresh_cntr_thresh = my_val;
-      }
-    }
-    SetStateInWindows ();   /* Update window display. */
-  }
-/*
-**---------------------------------------------------------------------------
-**		ThreshThreshCB	- callback for Threshold slider change.
-*/
-  void	ThreshThreshCB (
-/*	==============
-*/	    Widget	    w,			/*  widget id	*/
-	    XtPointer	    client_data,	/*  data from application   */
-	    XtPointer	    call_data) {	/*  data from widget class  */
-
-    XmScaleCallbackStruct  *my_call_data;
-    char		    text[32], text1[32];
-    int			    cntr, my_value, status;
-    char		   *rply_ptr;
-    float		    my_flt;
-	    /*
-	    **	Find new value of slider
-	    */
-    my_call_data = (XmScaleCallbackStruct *) call_data;
-    my_value = my_call_data->value;
-    if (Scale_is_khz) my_value = my_value * 100;
-
-    cntr = Cntr_state.thresh_indx + 1;
-    if ((cntr >= 1) && (cntr <= 8)) {
-      my_flt = my_value;
-      status = EL737_SetThresh (&Hndl, cntr, my_flt);
-      if (status) {
-	status = EL737_GetThresh (&Hndl, &cntr, &my_flt);
-	if (status) Thresh_cntr_thresh = my_flt;
-      }
-      SetStateInWindows ();   /* Update window display. */
-    }else {
-      printf (" Threshold monitoring is disabled. Slider ignored.\n");
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		ThreshIntValCB	- callback for setting threshold integ time
-*/
-  void  ThreshIntValCB (
-/*	==============
-*/		Widget	    w,			/*  widget id	*/
-		XtPointer   client_data,	/*  data from application   */
-		XtPointer   call_data) {	/*  data from widget class  */
-
-    int				    status, len, cntr;
-    static Widget		    my_err = NULL;
-    char			    text[32], *token, *pntr;
-    char			    cmnd0[32], cmnd1[32];
-    float			    f_time = 0.5;
-    char			   *rply_ptr;
-    XmString			    my_cmpStr;
-    XmSelectionBoxCallbackStruct   *my_call_data;
-    XmStringContext		    ctxt;
-    XmStringCharSet		    charset;
-    XmStringDirection		    dir;
-    Boolean			    sep;
-	    /*
-	    **	Do the work to find the result of the user's input
-	    */
-    my_call_data = (XmSelectionBoxCallbackStruct *) call_data;
-    XmStringInitContext (&ctxt, my_call_data->value);
-    XmStringGetNextSegment(ctxt, &token, &charset, &dir, &sep);
-    XmStringFreeContext(ctxt);
-    XtFree ((char *) dir);
-    XtFree ((char *) sep);
-    XtFree ((char *) charset);
-	    /*
-	    ** Carefully check the syntax. Only whitespace, digits and "."
-	    ** are allowed.
-	    */
-    StrnTrim (text, token, sizeof (text) - 1);
-    len = strlen (text);
-    if (len <= 0) goto it_error;
-    if (strspn (text, "0123456789.") != len) goto it_error;
-    if (sscanf (text, "%f", &f_time) != 1)   goto it_error;
-    if ((f_time < 0.1) || (f_time >= 30.0))  goto it_error;
-	    /*
-	    ** Finally, check for at most 1 "." (%f is not clever enough)
-	    */
-    pntr = strchr (text, '.');
-    if (pntr != NULL) {
-      pntr++;
-      pntr = strchr (pntr, '.');
-    }
-    if (pntr != NULL) goto it_error;
-	    /*
-	    ** Everything seems to be ship-shape.
-	    */
-    cntr = Cntr_state.thresh_indx + 1;
-    sprintf (cmnd0, "di %d %.1f\r", cntr, f_time);
-    sprintf (cmnd1, "di %d\r", cntr);
-    status = AsynSrv_SendCmnds (&InfoHndl->asyn_info,
-			&InfoHndl->to_host, &InfoHndl->from_host,
-			cmnd0, cmnd1, NULL);
-    if (status) {
-      rply_ptr = AsynSrv_GetReply (&InfoHndl->asyn_info,
-			&InfoHndl->from_host, NULL);
-      if (rply_ptr != NULL) rply_ptr = AsynSrv_GetReply (&InfoHndl->asyn_info,
-					    &InfoHndl->from_host, rply_ptr);
-      if ((rply_ptr != NULL) && (rply_ptr[0] != '?')) {
-	strcpy (Cntr_state.thresh_integ_time[Cntr_state.thresh_indx],
-		rply_ptr);
-      }
-    }
-    return;
-
-  it_error:
-/*========
-*/  if (my_err == 0) {
-      my_cmpStr = XmStringCreateLtoR (
-			"Illegal Value. Value must be \n"
-			"in the range 0.1 < Value < 30.0",
-			XmSTRING_DEFAULT_CHARSET);
-      Nargs = 0;
-      XtSetArg (Args[Nargs], XmNdefaultButtonType, XmDIALOG_CANCEL_BUTTON);
-					Nargs++;
-      XtSetArg (Args[Nargs], XmNmessageAlignment, XmALIGNMENT_CENTER); Nargs++;
-      XtSetArg (Args[Nargs], XmNmessageString, my_cmpStr); Nargs++;
-      my_err = XmCreateErrorDialog (Top_level, "Error", Args, Nargs);
-      XmStringFree (my_cmpStr);
-      XtUnmanageChild (XmMessageBoxGetChild (my_err, XmDIALOG_OK_BUTTON));
-      XtUnmanageChild (XmMessageBoxGetChild (my_err, XmDIALOG_HELP_BUTTON));
-    }
-    XtManageChild (my_err);
-    return;
-  }
-/*
-**---------------------------------------------------------------------------
-**		ThreshIntegCB  - callback for Threshold .../Integration Time ...
-*/
-  void	ThreshIntegCB (
-/*	=============
-*/		Widget	    w,		/*  widget id	*/
-		XtPointer    client_data,	/*  data from application   */
-		XtPointer    call_data) {	/*  data from widget class  */
-
-    static Widget   my_it = NULL;
-    char	    *button_name, text[40];
-    int		    mill, thou, units;
-    int		    hh, mm, ss;
-    int		    cnts = 0;
-    float	    f_tmp = 0.0;
-    XmString	    my_cmpStr, my_cmpStr1;
-
-    if (my_it == NULL) {
-      my_cmpStr = XmStringCreateLtoR ("Threshold Integration Time",
-				XmSTRING_DEFAULT_CHARSET);
-      my_cmpStr1 = XmStringCreateLtoR ("Specify time in seconds\n"
-				       "0.1 < Integration Time < 30",
-				XmSTRING_DEFAULT_CHARSET);
-      Nargs = 0;
-      XtSetArg (Args[Nargs], XmNdialogStyle,
-				XmDIALOG_PRIMARY_APPLICATION_MODAL); Nargs++;
-      XtSetArg (Args[Nargs], XmNdialogTitle, my_cmpStr); Nargs++;
-      XtSetArg (Args[Nargs], XmNselectionLabelString, my_cmpStr1); Nargs++;
-      my_it = XmCreatePromptDialog (Top_level, "Integ_Time", Args, Nargs);
-      XmStringFree (my_cmpStr);
-      XmStringFree (my_cmpStr1);
-      XtAddCallback (my_it, XmNokCallback, ThreshIntValCB, NULL);
-      XtUnmanageChild (XmSelectionBoxGetChild (my_it, XmDIALOG_HELP_BUTTON));
-    }
-    sscanf (Cntr_state.thresh_integ_time[Cntr_state.thresh_indx], "%f", &f_tmp);
-    if (f_tmp <= 0.1 || f_tmp >= 30.0) f_tmp = 0.5;
-    sprintf (text, "%.1f", f_tmp);
-    my_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-    XtVaSetValues (my_it, XmNtextString, my_cmpStr, NULL);
-    XmStringFree (my_cmpStr);
-    XtManageChild (my_it);
-  }
-/*
-**---------------------------------------------------------------------------
-**			TimerCB		- callback for timer
-*/
-  void	TimerCB (
-/*	=======
-*/		XtPointer	client_data,	/*  data from application   */
-		XtIntervalId	*id) {		/*  data from widget class  */
-
-    GetCounterStatus (VMECNT__INCR);
-    if (Cntr_state.state == OFFLINE) {
-      Old_Cntr_state.state = UNKNOWN; /* Force screen update if gone off-line */
-    }
-    SetStateInWindows ();		    /* Update window display. */
-
-    if ((Cntr_state.state != OFFLINE) && (AppData.msec_poll > 0)) {
-      Timer_id = XtAppAddTimeOut (App_context, AppData.msec_poll,
-					TimerCB, NULL);
-    }else {
-      Timer_id = 0;
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**		PollRateValCB	- callback for setting polling rate
-*/
-  void	PollRateValCB (
-/*	=============
-*/		Widget	    w,		/*  widget id	*/
-		XtPointer   client_data,	/*  data from application   */
-		XtPointer   call_data) {	/*  data from widget class  */
-
-    static Widget   my_err = NULL;
-    char	    text[32], *token, *pntr;
-    int		    timer = 1000, len;
-    XmString			    my_cmpStr;
-    XmSelectionBoxCallbackStruct   *my_call_data;
-    XmStringContext		    ctxt;
-    XmStringCharSet		    charset;
-    XmStringDirection		    dir;
-    Boolean			    sep;
-	    /*
-	    **	Do the work to find the result of the user's input
-	    */
-    my_call_data = (XmSelectionBoxCallbackStruct *) call_data;
-    XmStringInitContext (&ctxt, my_call_data->value);
-    XmStringGetNextSegment(ctxt, &token, &charset, &dir, &sep);
-    XmStringFreeContext(ctxt);
-    XtFree ((char *) dir);
-    XtFree ((char *) sep);
-    XtFree ((char *) charset);
-	    /*
-	    ** Carefully check the syntax. Only whitespace, digits, "," and "'"
-	    ** are allowed. Simply squeeze out "," and "'", i.e. no check that
-	    ** exactly 3 chars occur between them!!
-	    */
-    StrnTrim (text, token, sizeof (text) - 1);
-    len = strlen (text);
-    if (len <= 0) goto pt_error;
-    if (strspn (text, "0123456789,\'") != len) goto pt_error;
-    while ((pntr = strpbrk (text, ",\'")) != NULL) { /* Remove primes and */
-      do {					      /*  commas */
-        pntr[0] = pntr[1];
-        pntr++;
-      } while (pntr[0] != '\0');
-    }
-    if (sscanf (text, "%d", &timer) != 1) goto pt_error;
-    if ((timer < 0) || (timer > 10000)) goto pt_error;
-		/* 
-		** Now enable the new polling interval.
-		*/
-    if (Timer_id != 0) XtRemoveTimeOut (Timer_id);
-    Timer_id = 0;
-    if (timer != 0) {
-      Timer_id = XtAppAddTimeOut (App_context, AppData.msec_poll,
-					TimerCB, NULL);
-    }
-    AppData.msec_poll = timer;
-    return;
-
-  pt_error:
-/*========
-*/  if (my_err == 0) {
-      my_cmpStr = XmStringCreateLtoR (
-			"Illegal Value. Value must be an integer\n"
-			"in the range 0 < Value < 2000e6",
-			XmSTRING_DEFAULT_CHARSET);
-      Nargs = 0;
-      XtSetArg (Args[Nargs], XmNdefaultButtonType, XmDIALOG_CANCEL_BUTTON);
-					Nargs++;
-      XtSetArg (Args[Nargs], XmNmessageAlignment, XmALIGNMENT_CENTER); Nargs++;
-      XtSetArg (Args[Nargs], XmNmessageString, my_cmpStr); Nargs++;
-      my_err = XmCreateErrorDialog (Top_level, "Error", Args, Nargs);
-      XmStringFree (my_cmpStr);
-      XtUnmanageChild (XmMessageBoxGetChild (my_err, XmDIALOG_OK_BUTTON));
-      XtUnmanageChild (XmMessageBoxGetChild (my_err, XmDIALOG_HELP_BUTTON));
-    }
-    XtManageChild (my_err);
-    return;
-  }
-/*
-**---------------------------------------------------------------------------
-**		PollRateCB  - callback for Basic Timing/Polling Rate ...
-*/
-  void	PollRateCB (
-/*	==========
-*/		Widget	    w,		/*  widget id	*/
-		XtPointer   client_data,	/*  data from application   */
-		XtPointer   call_data) {	/*  data from widget class  */
-
-    static Widget   my_pr = NULL;
-    char	    *button_name, text[40];
-    int		    thou, units;
-    XmString	    my_cmpStr, my_cmpStr1;
-
-    if (my_pr == NULL) {
-      my_cmpStr = XmStringCreateLtoR ("Polling Rate",
-				XmSTRING_DEFAULT_CHARSET);
-      my_cmpStr1 = XmStringCreateLtoR ("Specify polling delay in milliseconds\n"
-				       "Specifying 0 disables Polling\n"
-				       "0 <= delay <= 10'000",
-				XmSTRING_DEFAULT_CHARSET);
-      Nargs = 0;
-      XtSetArg (Args[Nargs], XmNdialogStyle,
-				XmDIALOG_PRIMARY_APPLICATION_MODAL); Nargs++;
-      XtSetArg (Args[Nargs], XmNdialogTitle, my_cmpStr); Nargs++;
-      XtSetArg (Args[Nargs], XmNselectionLabelString, my_cmpStr1); Nargs++;
-      my_pr = XmCreatePromptDialog (Top_level, "Integ_Time", Args, Nargs);
-      XmStringFree (my_cmpStr);
-      XmStringFree (my_cmpStr1);
-      XtAddCallback (my_pr, XmNokCallback, PollRateValCB, NULL);
-      XtUnmanageChild (XmSelectionBoxGetChild (my_pr, XmDIALOG_HELP_BUTTON));
-    }
-    units = AppData.msec_poll;
-    thou  = units/1000; units = units - (1000 * thou);
-    if (thou > 0) {
-      sprintf (text, "%d'%03d", thou, units);
-    }else {
-      sprintf (text, "%d", units);
-    }
-    my_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-    XtVaSetValues (my_pr, XmNtextString, my_cmpStr, NULL);
-    XmStringFree (my_cmpStr);
-    XtManageChild (my_pr);
-  }
-/*
-**---------------------------------------------------------------------------
-**		IntegTimeCB  - callback for "Basic Timing/Integration Time ..."
-*/
-  void	IntegTimeCB (
-/*	=============
-*/		Widget	    w,		/*  widget id	*/
-		XtPointer    client_data,	/*  data from application   */
-		XtPointer    call_data) {	/*  data from widget class  */
-
-    static Widget   my_it = NULL;
-    char	    *button_name, text[60];
-    XmString	    my_cmpStr, my_cmpStr1;
-
-    if (my_it == NULL) {
-      my_cmpStr = XmStringCreateLtoR ("Integration Time",
-				XmSTRING_DEFAULT_CHARSET);
-      Nargs = 0;
-      XtSetArg (Args[Nargs], XmNdialogTitle, my_cmpStr); Nargs++;
-      my_it = XmCreateMessageDialog (Top_level, "IntTime", Args, Nargs);
-      XmStringFree (my_cmpStr);
-      XtUnmanageChild (XmMessageBoxGetChild (my_it, XmDIALOG_OK_BUTTON));
-      XtUnmanageChild (XmMessageBoxGetChild (my_it, XmDIALOG_HELP_BUTTON));
-    }
-    sprintf (text, "Integration times can not yet be set", XtName (w));
-    my_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-    XtVaSetValues (my_it, XmNmessageString, my_cmpStr, NULL);
-    XtManageChild (my_it);
-    XmStringFree (my_cmpStr);
-  }
-/*
-**---------------------------------------------------------------------------
-**		AnalSelectCB	- callback for Analogue .../Cn
-*/
-  void	AnalSelectCB (
-/*	============
-*/		Widget	    w,		/*  widget id	*/
-		XtPointer    client_data,	/*  data from application   */
-		XtPointer    call_data) {	/*  data from widget class  */
-
-    char	*button_name, text[16];
-    char	*rply_ptr;
-    int		status;
-	    /*
-	    **	print message to prove we got activated
-	    */
-    button_name = XtName (w);
-    printf (" Routing Counter \"%s\" to Analogue Display.\n", button_name);
-
-    sprintf (text, "da %c\r", button_name[1]);
-
-    status = AsynSrv_SendCmnds (&InfoHndl->asyn_info,
-			&InfoHndl->to_host, &InfoHndl->from_host,
-			text, "da\r", NULL);
-    if (status) {
-      rply_ptr = AsynSrv_GetReply (&InfoHndl->asyn_info,
-			&InfoHndl->from_host, NULL);
-      rply_ptr = AsynSrv_GetReply (&InfoHndl->asyn_info,
-			&InfoHndl->from_host, rply_ptr);
-      if ((rply_ptr != NULL) && (rply_ptr[0] != '?')) {
-	sscanf (rply_ptr, "%d", &Cntr_state.analog_indx);
-	Cntr_state.analog_indx--;
-      }
-    }
-    SetStateInWindows ();   /* Update window display. */
-  }
-/*
-**---------------------------------------------------------------------------
-**			RunCB		- callback for Command menu
-*/
-  void	RunCB (
-/*	=====
-*/		Widget	    w,		/*  widget id	*/
-		XtPointer    client_data,	/*  data from application   */
-		XtPointer    call_data) {	/*  data from widget class  */
-
-    int		status_type, i_tmp;
-    float	f_tmp;
-    char	*button_name, text[32];
-    XmString	tmp_cmpStr;
-	    /*
-	    **	print message to prove we got activated
-	    */
-    button_name = XtName (w);
-
-    status_type = VMECNT__SHORT;   /* Get short (and quick) status by default */
-    if (strcmp (button_name, "Update") == 0) {
-      status_type = VMECNT__FULL;
-      if ((Cntr_state.state == OFFLINE) ||	/* Must we go on-line? */
-	  (Cntr_state.state == UNKNOWN)) {
-	tmp_cmpStr = XmStringCreateLtoR ("Trying ..",XmSTRING_DEFAULT_CHARSET);
-	XtVaSetValues (Lbl_counter_state, XmNlabelString, tmp_cmpStr, NULL);
-        XmUpdateDisplay (Top_level);
-	if (!PutOnLine ()) {
-	  tmp_cmpStr = XmStringCreateLtoR ("Off-line",XmSTRING_DEFAULT_CHARSET);
-	  XtVaSetValues (Lbl_counter_state, XmNlabelString, tmp_cmpStr, NULL);
-          XmUpdateDisplay (Top_level);
-	  XmStringFree (tmp_cmpStr);
-	  return;
-	}
-	if ((Timer_id == 0) && (AppData.msec_poll > 0)) {  /*
-							   ** Re-enable polling.
-							   */
-	  Timer_id = XtAppAddTimeOut (App_context, AppData.msec_poll,
-					TimerCB, NULL);
-	}
-      }
-      tmp_cmpStr = XmStringCreateLtoR ("Updating", XmSTRING_DEFAULT_CHARSET);
-    }else if (strcmp (button_name, "Go") == 0) {
-      tmp_cmpStr = XmStringCreateLtoR ("Starting", XmSTRING_DEFAULT_CHARSET);
-      if (Cntr_state_mode == VMECNT__PRESET_TIME) {
-	sprintf (text, "tp %s\r", Cntr_state_timer_preset);
-	AsynSrv_SendCmnds (&InfoHndl->asyn_info,
-			&InfoHndl->to_host, &InfoHndl->from_host,
-			text, NULL);
-      }else {
-	sprintf (text, "mp %d\r", Cntr_state_mon_preset);
-	AsynSrv_SendCmnds (&InfoHndl->asyn_info,
-			&InfoHndl->to_host, &InfoHndl->from_host,
-			text, NULL);
-      }
-      XmScaleSetValue (Scale_run_progress, 0);
-    }else if (strcmp (button_name, "Stop") == 0) {
-      tmp_cmpStr = XmStringCreateLtoR ("Stopping", XmSTRING_DEFAULT_CHARSET);
-      AsynSrv_SendCmnds (&InfoHndl->asyn_info,
-			&InfoHndl->to_host, &InfoHndl->from_host,
-			"stop\r", NULL);
-    }else if (strcmp (button_name, "Pause") == 0) {
-      tmp_cmpStr = XmStringCreateLtoR ("Pausing", XmSTRING_DEFAULT_CHARSET);
-      AsynSrv_SendCmnds (&InfoHndl->asyn_info,
-			&InfoHndl->to_host, &InfoHndl->from_host,
-			"ps\r", NULL);
-    }else if (strcmp (button_name, "Cont") == 0) {
-      tmp_cmpStr = XmStringCreateLtoR ("Continuing", XmSTRING_DEFAULT_CHARSET);
-      AsynSrv_SendCmnds (&InfoHndl->asyn_info,
-			&InfoHndl->to_host, &InfoHndl->from_host,
-			"co\r", NULL);
-    }else {
-      printf ("\007Unknown push button \"%s\" selected.\n", button_name);
-      return;
-    }
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNlabelString, tmp_cmpStr); Nargs++;
-    XtSetValues (Lbl_counter_state, Args, Nargs);
-    XmStringFree (tmp_cmpStr);
-    XmUpdateDisplay (Top_level);
-    Old_Cntr_state.state = -1;
-
-    GetCounterStatus (status_type);
-    SetStateInWindows ();   /* Update window display. */
-  }
-/*
-**---------------------------------------------------------------------------
-**			ScaleCB		- callback for Command menu
-*/
-  void	ScaleCB (
-/*	=======
-*/		Widget	    w,		/*  widget id	*/
-		XtPointer    client_data,	/*  data from application   */
-		XtPointer    call_data) {	/*  data from widget class  */
-
-    char	*button_name, text[40];
-    XmString	tmp_cmpStr;
-    int		tmp_max, dec_points;
-    int		tmp_thresh, tmp_rate;
-	    /*
-	    **	print message to prove we got activated
-	    */
-    button_name = XtName (w);
-
-    tmp_max = (Scale_is_khz) ? (Scale_max * 100) : Scale_max;
-
-    if (strcmp (button_name, "Scale_up") == 0) {
-      if (tmp_max >= 10000000) {
-	printf ("Push button \"%s\" ignored.\n", button_name);
-      }else {
-        tmp_max = tmp_max * 10;
-      }
-    }else {
-      if (tmp_max <= 100) {
-	printf ("Push button \"%s\" ignored.\n", button_name);
-      }else {
-        tmp_max = tmp_max/10;
-      }
-    }
-    if (tmp_max > 1000) {
-      Scale_is_khz = TRUE;
-      Scale_max = tmp_max/100;
-      dec_points = 1;
-      tmp_thresh = Thresh_cntr_thresh/100.0;
-      tmp_rate   = Thresh_cntr_rate/100.0;
-    }else {
-      Scale_is_khz = FALSE;
-      Scale_max = tmp_max;
-      dec_points = 0;
-      tmp_thresh = Thresh_cntr_thresh;
-      tmp_rate   = Thresh_cntr_rate;
-    }
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNdecimalPoints, dec_points); Nargs++;
-    XtSetArg (Args[Nargs], XmNmaximum, (int) Scale_max); Nargs++;
-    XtSetArg (Args[Nargs], XmNvalue, 0); Nargs++;
-    XtSetValues (Scale_thresh, Args, Nargs);
-    XtSetValues (Scale_rate, Args, Nargs);
-
-    if ((int) tmp_thresh > Scale_max) {
-      XmScaleSetValue (Scale_thresh, Scale_max);
-    }else {
-      XmScaleSetValue (Scale_thresh, tmp_thresh); Nargs++;
-    }
-
-    if ((int) tmp_rate > Scale_max) {
-      XmScaleSetValue (Scale_rate, Scale_max);
-    }else {
-      XmScaleSetValue (Scale_rate, tmp_rate);
-    }
-
-    if (Scale_is_khz) {
-      sprintf (text, "<-- %d kHz", Scale_max/10);
-    }else {
-      sprintf (text, "<-- %d Hz", Scale_max);
-    }
-    tmp_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-    XtSetArg (Args[0], XmNlabelString, tmp_cmpStr);
-    XtSetValues (Lbl_rate_scale_max, Args, 1);
-    XmStringFree (tmp_cmpStr);
-
-    if (Thresh_cntr_thresh > 999.0) {
-      sprintf (text, "Thresh = %.1f kHz", Thresh_cntr_thresh/1000.0);
-    }else {
-      sprintf (text, "Thresh = %.0f Hz", Thresh_cntr_thresh);
-    }
-    tmp_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-    XtSetArg (Args[0], XmNlabelString, tmp_cmpStr);
-    XtSetValues (Lbl_thr_scale_val, Args, 1);
-    XmStringFree (tmp_cmpStr);
-
-
-    if (Thresh_cntr_rate > 999.0) {
-      sprintf (text, "Rate   = %.1f kHz", Thresh_cntr_rate/1000.0);
-    }else {
-      sprintf (text, "Rate   = %.1f Hz", Thresh_cntr_rate);
-    }
-    tmp_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-    XtSetArg (Args[0], XmNlabelString, tmp_cmpStr);
-    XtSetValues (Lbl_rate_scale_val, Args, 1);
-    XmStringFree (tmp_cmpStr);
-
-    if (Scale_is_khz && (Scale_max >= 100000)) {
-      XtSetArg (Args[0], XmNsensitive, False);
-      XtUnmanageChild (Btn_scale_up);
-    }else {
-      XtSetArg (Args[0], XmNsensitive, True);
-      XtManageChild (Btn_scale_up);
-    }
-    XtSetValues (Btn_scale_up, Args, 1);
-
-    if (!Scale_is_khz && (Scale_max <= 100)) {
-      XtSetArg (Args[0], XmNsensitive, False);
-      XtUnmanageChild (Btn_scale_down);
-    }else {
-      XtSetArg (Args[0], XmNsensitive, True);
-      XtManageChild (Btn_scale_down);
-    }
-    XtSetValues (Btn_scale_down, Args, 1);
-  }
-/*
-
-**---------------------------------------------------------------------------
-**			SetPresetModeCB	- callback routine
-*/
-  void	SetPresetModeCB (
-/*	===============
-*/		Widget	    w,		/*  widget id	*/
-		XtPointer    client_data,	/*  data from application   */
-		XtPointer    call_data) {	/*  data from widget class  */
-
-    static Widget   my_pc = NULL;
-    static Widget   my_pt = NULL;
-    char	    *button_name, text[40];
-    int		    mill, thou, units;
-    int		    hh, mm, ss;
-    int		    cnts = 0;
-    float	    f_tmp = 0.0;
-    XmString	    my_cmpStr, my_cmpStr1;
-
-    if (my_pc == NULL) {
-      my_cmpStr = XmStringCreateLtoR ("Preset Count",
-				XmSTRING_DEFAULT_CHARSET);
-      my_cmpStr1 = XmStringCreateLtoR ("0 < Preset Count < 2000e6",
-				XmSTRING_DEFAULT_CHARSET);
-      Nargs = 0;
-      XtSetArg (Args[Nargs], XmNdialogStyle,
-				XmDIALOG_PRIMARY_APPLICATION_MODAL); Nargs++;
-      XtSetArg (Args[Nargs], XmNdialogTitle, my_cmpStr); Nargs++;
-      XtSetArg (Args[Nargs], XmNselectionLabelString, my_cmpStr1); Nargs++;
-      my_pc = XmCreatePromptDialog (Top_level, "Preset_Count", Args, Nargs);
-      XmStringFree (my_cmpStr);
-      XmStringFree (my_cmpStr1);
-      XtAddCallback (my_pc, XmNokCallback, PresetCntCB, NULL);
-      XtUnmanageChild (XmSelectionBoxGetChild (my_pc, XmDIALOG_HELP_BUTTON));
-
-      my_cmpStr = XmStringCreateLtoR ("Preset Time",
-				XmSTRING_DEFAULT_CHARSET);
-      my_cmpStr1 = XmStringCreateLtoR ("Seconds or hh:mm:ss.t\n"
-				       "0.1 secs < Time < 555 hours",
-				XmSTRING_DEFAULT_CHARSET);
-      Nargs = 0;
-      XtSetArg (Args[Nargs], XmNdialogStyle,
-				XmDIALOG_PRIMARY_APPLICATION_MODAL); Nargs++;
-      XtSetArg (Args[Nargs], XmNdialogTitle, my_cmpStr); Nargs++;
-      XtSetArg (Args[Nargs], XmNselectionLabelString, my_cmpStr1); Nargs++;
-      my_pt = XmCreatePromptDialog (Top_level, "Preset_Time", Args, Nargs);
-      XmStringFree (my_cmpStr);
-      XmStringFree (my_cmpStr1);
-      XtAddCallback (my_pt, XmNokCallback, PresetTimeCB, NULL);
-      XtUnmanageChild (XmSelectionBoxGetChild (my_pt, XmDIALOG_HELP_BUTTON));
-    }
-    button_name = XtName (w);
-    if (strcmp (button_name, "Switch Mode") == 0) {
-      if (Cntr_state_mode == VMECNT__PRESET_TIME) {
-        Cntr_state_mode = VMECNT__PRESET_COUNT;
-        units = Cntr_state_mon_preset;
-        thou  = units/1000; units = units - (1000 * thou);
-        mill  = thou/1000;  thou  = thou  - (1000 * mill);
-        if (mill > 0) {
-          sprintf (text, "Preset Count Mode: %d'%03d'%03d", mill, thou, units);
-        }else if (thou > 0) {
-          sprintf (text, "Preset Count Mode: %d'%03d", thou, units);
-        }else {
-          sprintf (text, "Preset Count Mode: %d", units);
-        }
-      }else {
-        Cntr_state_mode = VMECNT__PRESET_TIME;
-	TimeString (text, "Preset Time Mode: ", Cntr_state_timer_preset);
-      }
-      my_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-      XtVaSetValues (Lbl_counter_mode, XmNlabelString, my_cmpStr, NULL);
-      XmStringFree (my_cmpStr);
-    }else if (strcmp (button_name, "Set Preset Count Limit ...") == 0) {
-      units = Cntr_state_mon_preset;
-      thou  = units/1000; units = units - (1000 * thou);
-      mill  = thou/1000;  thou  = thou  - (1000 * mill);
-      if (mill > 0) {
-        sprintf (text, "%d'%03d'%03d", mill, thou, units);
-      }else if (thou > 0) {
-        sprintf (text, "%d'%03d", thou, units);
-      }else {
-        sprintf (text, "%d", units);
-      }
-      my_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-      XtVaSetValues (my_pc, XmNtextString, my_cmpStr, NULL);
-      XmStringFree (my_cmpStr);
-      XtManageChild (my_pc);
-    }else if (strcmp (button_name, "Set Preset Time Limit ...") == 0) {
-      TimeString (text, "", Cntr_state_timer_preset);
-      my_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-      XtVaSetValues (my_pt, XmNtextString, my_cmpStr, NULL);
-      XmStringFree (my_cmpStr);
-      XtManageChild (my_pt);
-    }else {
-	    /*
-	    **	print message to prove we got activated
-	    */
-      printf ("\007Unrecognised push button \"%s\" ignored.\n", button_name);
-      return;
-    }
-    switch (Cntr_state_mode) {	    /* Ensure everything is up-to-date. */
-     case VMECNT__PRESET_COUNT:
-      XtSetArg (Args[0], XmNsensitive, True);	/* Sensitise relevant buttons */
-      XtSetValues (Pre_cnt_button,  Args, 1);
-
-      XtSetArg (Args[0], XmNsensitive, False);	/* De-sensitise the others */
-      XtSetValues (Pre_time_button, Args, 1);
-      break;
-
-     case VMECNT__PRESET_TIME:
-      XtSetArg (Args[0], XmNsensitive, True);	/* Sensitise relevant buttons */
-      XtSetValues (Pre_time_button, Args, 1);
-
-      XtSetArg (Args[0], XmNsensitive, False);	/* De-sensitise the others */
-      XtSetValues (Pre_cnt_button, Args, 1);
-    }
-  }
-/*
-**---------------------------------------------------------------------------
-**			AddMenuItem		- add item into menu
-*/
-  Widget AddMenuItem (
-/*	 ===========
-*/		Widget		parent,		/* The parent menu	    */
-		char		*name,		/* Name of menu item	    */
-		char		accelerator,	/* Accelerator character    */
-		int		menu_type,	/* Menu type		    */
-		Widget		casc_pane,    /* Pane to link to button ..
-					      ** .. (menu_type = CASCADE only */
-		XtCallbackProc	callback) {	/* Callback procedure	    */
-
-    Widget	my_menu_item;
-
-    Nargs = 0;
-    if (accelerator != 0)
-      XtSetArg (Args[Nargs], XmNmnemonic, accelerator);  Nargs++;
-    XtSetArg (Args[Nargs], XmNnavigationType, XmTAB_GROUP);  Nargs++;
-
-    switch (menu_type) {
-      case CASCADE:
-	XtSetArg (Args[Nargs], XmNsubMenuId, casc_pane);  Nargs++;
-        my_menu_item = XmCreateCascadeButton (parent, name, Args, Nargs);
-        break;
-      case PULL_DOWN:
-	my_menu_item = XmCreatePushButton (parent, name, Args, Nargs);
-        break;
-      case SEPARATOR:
-	my_menu_item = XmCreateSeparator (parent, NULL, Args, Nargs);
-        break;
-      default:
-        printf ("\007Illegal menu_type in call to AddMenuItem\n");
-    }
-    XtManageChild (my_menu_item);
-
-    if (callback != NULL)
-      XtAddCallback (my_menu_item, XmNactivateCallback, callback, NULL);
-
-    return my_menu_item;
-  }
-/*
-**---------------------------------------------------------------------------
-**			MakeLabel		- make a simple label
-*/
-  Widget MakeLabel (
-/*	 =========
-*/		Widget		w,	    /*  widget id of parent of label */
-		char		*text,	    /*  The text for the label */
-		unsigned char	align) {    /*  The alignment for the label */
-
-    Widget	my_label;
-    XmString	my_compString;
-
-    my_compString = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNlabelString, my_compString); Nargs++;
-    XtSetArg (Args[Nargs], XmNentryAlignment, align); Nargs++;
-    XtSetArg (Args[Nargs], XmNrecomputeSize, False); Nargs++;
-    my_label = XmCreateLabel (w, NULL, Args, Nargs);
-    XtManageChild (my_label);
-    XmStringFree (my_compString);
-
-    return my_label;
-  }
-/*
-**---------------------------------------------------------------------------
-**			QuitCB		- callback for quit button
-*/
-  void	QuitCB (
-/*	======
-*/		Widget	    w,		/*  widget id	*/
-		XtPointer    client_data,	/*  data from application   */
-		XtPointer    call_data) {	/*  data from widget class  */
-
-    AsynSrv_Close (&InfoHndl->asyn_info, False);    /* Close the connection */
-    exit (EXIT_SUCCESS);	    /* Terminate the application. */
-  }
-/*
-**---------------------------------------------------------------------------
-**			CreateMenuBar - Create menu bar for main window.
-*/
-  Widget CreateMenuBar (Widget window) {
-/* 	 =============
-*/
-    Widget my_menu_bar;		/*  MenuBar		*/
-
-    Widget file_menu_pane;	/*  File    MenuPane	*/
-    Widget cmnd_menu_pane;	/*  Command MenuPane	*/
-    Widget setup_menu_pane;	/*  Setup MenuPane	*/
-    Widget help_menu_pane;	/*  Help  MenuPane	*/
-    Widget mode_menu_pane;	/*  Mode  MenuPane	*/
-    Widget thr_menu_pane;	/*  Threshold MenuPane	*/
-    Widget anal_menu_pane;	/*  Analogue MenuPane	*/
-    Widget time_menu_pane;	/*  Basic Timing MenuPane */
-    Widget thr_cntr_menu_pane;	/*  Threshold Counter MenuPane	*/
-
-    Widget my_button;
-	    /*-------------------------------------------------------------
-	    **	Create MenuBar in MainWindow.
-	    */
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNadjustLast, True);  Nargs++;
-    my_menu_bar = XmCreateMenuBar (window, "menu_bar", Args, Nargs); 
-    XtManageChild (my_menu_bar);
-		/*---------------------------------------------------------
-		**    Create panes for the Menu Bar Pulldown Menus.
-		*/
-    Nargs = 0;
-    file_menu_pane  = XmCreatePulldownMenu (my_menu_bar, "File_Menu",
-								Args, Nargs);
-    setup_menu_pane = XmCreatePulldownMenu (my_menu_bar, "Setup_Menu",
-								Args, Nargs);
-    help_menu_pane  = XmCreatePulldownMenu (my_menu_bar, "Help_Menu",
-								Args, Nargs);
-
-    mode_menu_pane  = XmCreatePulldownMenu (setup_menu_pane, "Mode_Menu",
-								Args, Nargs);
-    thr_menu_pane   = XmCreatePulldownMenu (setup_menu_pane, "Thresh_Menu",
-						    Args, Nargs);
-    anal_menu_pane   = XmCreatePulldownMenu (setup_menu_pane, "Analog_Menu",
-						    Args, Nargs);
-    time_menu_pane  = XmCreatePulldownMenu (setup_menu_pane, "Timing_Menu",
-						    Args, Nargs);
-    thr_cntr_menu_pane = XmCreatePulldownMenu (thr_menu_pane, "Thr_Cntr_Menu",
-						    Args, Nargs);
-		/*-------------------------------------------------------------
-		**	    Create buttons on menu bar and specify afterwards
-		**	    which one is the Help item.
-		*/
-    File_cascade  = AddMenuItem (my_menu_bar, "File",  'F',
-						CASCADE, file_menu_pane, NULL);
-    Setup_cascade = AddMenuItem (my_menu_bar, "Setup", 'S',
-						CASCADE, setup_menu_pane, NULL);
-    Help_cascade  = AddMenuItem (my_menu_bar, "Help",  'H',
-						CASCADE, help_menu_pane, NULL);
-
-    XtSetArg (Args[0], XmNmenuHelpWidget, Help_cascade);
-    XtSetValues (my_menu_bar, Args, 1);
-		/*---------------------------------------------------------
-		**    Put items into the menu bar menu panes. Start with File.
-		*/
-    AddMenuItem (file_menu_pane,  "Quit/Finish", 'F', PULL_DOWN, NULL, QuitCB);
-		/*---------------------------------------------------------
-		**    Now do Setup.
-		*/
-    Mode_cascade = AddMenuItem (setup_menu_pane, "Mode",      'M',
-						CASCADE, mode_menu_pane, NULL);
-    AddMenuItem (setup_menu_pane, "Threshold", 'T',
-						CASCADE, thr_menu_pane, NULL);
-    AddMenuItem (setup_menu_pane, "Analogue", 'A',
-						CASCADE, anal_menu_pane, NULL);
-    AddMenuItem (setup_menu_pane, "Basic Timing", 'B',
-						CASCADE, time_menu_pane, NULL);
-		/*---------------------------------------------------------
-		**    Now do Help.
-		*/
-    AddMenuItem (help_menu_pane, "Context-sensitive Help", 'C',
-						PULL_DOWN, NULL, HelpCB);
-    AddMenuItem (help_menu_pane, NULL, '\0', SEPARATOR, NULL, NULL);
-    AddMenuItem (help_menu_pane, "Overview", 'O',
-						PULL_DOWN, NULL, HelpCB);
-		/*---------------------------------------------------------
-		**    Now do Mode.
-		*/
-    Swch_mode_button = AddMenuItem (mode_menu_pane, "Switch Mode",
-				    'M',  PULL_DOWN, NULL, SetPresetModeCB);
-		       AddMenuItem (mode_menu_pane, NULL,
-				    '\0', SEPARATOR, NULL, NULL);
-    Pre_cnt_button  = AddMenuItem (mode_menu_pane, "Set Preset Count Limit ...",
-				    'C', PULL_DOWN, NULL, SetPresetModeCB);
-    Pre_time_button  = AddMenuItem (mode_menu_pane, "Set Preset Time Limit ...",
-				    'T', PULL_DOWN, NULL, SetPresetModeCB);
-
-    XtSetArg (Args[0], XmNsensitive, False); Nargs++;	/* Desensitise */
-    switch (Cntr_state_mode) {
-     case VMECNT__PRESET_COUNT:
-      XtSetValues (Pre_time_button, Args, 1);
-      break;
-     case VMECNT__PRESET_TIME:
-      XtSetValues (Pre_cnt_button,  Args, 1);
-      break;
-    }
-		/*---------------------------------------------------------
-		**    Now do Threshold.
-		*/
-    AddMenuItem (thr_menu_pane, "Active counter", 'A',
-					CASCADE, thr_cntr_menu_pane, NULL);
-    AddMenuItem (thr_menu_pane, "Integration Time ...",  'I',
-					PULL_DOWN, NULL, ThreshIntegCB);
-		/*---------------------------------------------------------
-		**    Now do "Active counter" menu pane.
-		*/
-    AddMenuItem (thr_cntr_menu_pane, "Disable Threshold Monitoring", '1',
-					PULL_DOWN, NULL, ThreshActiveCB);
-    AddMenuItem (thr_cntr_menu_pane, "C1 (Monitor)", '1',
-					PULL_DOWN, NULL, ThreshActiveCB);
-    AddMenuItem (thr_cntr_menu_pane, "C2 (Detector)", '2',
-					PULL_DOWN, NULL, ThreshActiveCB);
-    AddMenuItem (thr_cntr_menu_pane, "C3", '3',
-					PULL_DOWN, NULL, ThreshActiveCB);
-    AddMenuItem (thr_cntr_menu_pane, "C4", '4',
-					PULL_DOWN, NULL, ThreshActiveCB);
-    AddMenuItem (thr_cntr_menu_pane, "C5", '5',
-					PULL_DOWN, NULL, ThreshActiveCB);
-    AddMenuItem (thr_cntr_menu_pane, "C6", '6',
-					PULL_DOWN, NULL, ThreshActiveCB);
-    AddMenuItem (thr_cntr_menu_pane, "C7", '7',
-					PULL_DOWN, NULL, ThreshActiveCB);
-    AddMenuItem (thr_cntr_menu_pane, "C8", '8',
-					PULL_DOWN, NULL, ThreshActiveCB);
-		/*---------------------------------------------------------
-		**    Now do Analogue.
-		*/
-    AddMenuItem (anal_menu_pane, "C1 (Monitor)", '1',
-					PULL_DOWN, NULL, AnalSelectCB);
-    AddMenuItem (anal_menu_pane, "C2 (Detector)", '2',
-					PULL_DOWN, NULL, AnalSelectCB);
-    AddMenuItem (anal_menu_pane, "C3", '3',
-					PULL_DOWN, NULL, AnalSelectCB);
-    AddMenuItem (anal_menu_pane, "C4", '4',
-					PULL_DOWN, NULL, AnalSelectCB);
-    AddMenuItem (anal_menu_pane, "C5", '5',
-					PULL_DOWN, NULL, AnalSelectCB);
-    AddMenuItem (anal_menu_pane, "C6", '6',
-					PULL_DOWN, NULL, AnalSelectCB);
-    AddMenuItem (anal_menu_pane, "C7", '7',
-					PULL_DOWN, NULL, AnalSelectCB);
-    AddMenuItem (anal_menu_pane, "C8", '8',
-					PULL_DOWN, NULL, AnalSelectCB);
-		/*---------------------------------------------------------
-		**    Now do Basic Timing.
-		*/
-    AddMenuItem (time_menu_pane, "Polling Rate ...", 'P',
-						PULL_DOWN, NULL, PollRateCB);
-    AddMenuItem (time_menu_pane, "Integration Time ...", 'I',
-						PULL_DOWN, NULL, IntegTimeCB);
-
-    return my_menu_bar;
-  }
-/*
-**---------------------------------------------------------------------------
-**			CreateApplication - set up main window.
-*/
-  Widget CreateApplication (Widget parent) {
-/*	 =================
-*/
-    Widget main_window;		/*  MainWindow		*/
-    Widget form_0;		/*  Form Widget	*/
-
-    Widget frame_00;		/*  Frame Widget	*/
-    Widget frame_01;		/*  Frame Widget	*/
-    Widget frame_02;		/*  Frame Widget	*/
-    Widget form_03;		/*  Form Widget	*/
-    Widget rc_window_04;	/*  RowColumn Window	*/
-
-    Widget rc_window_1;		/*  RowColumn Window	*/
-    Widget w_tmp;
-
-    XmString	    tmp_cmpStr;
-    char	    text[80];
-    int		    i, hh, mm, ss, dec_points, indx, i_tmp;
-    int		    mill, thou, units;
-    float	    f_tmp, f_max;
-    char	    *title;
-	    /*-------------------------------------------------------------
-	    **	Create MainWindow.
-	    */
-    Nargs = 0;
-    main_window = XmCreateMainWindow (parent, "main_window", Args, Nargs);
-    XtManageChild (main_window);
-
-    CreateMenuBar (main_window);
-	    /*    
-	    **      Create Form Widget to hold the various items
-	    **	    in the Main Window
-	    */
-    Nargs = 0;
-    form_0 = XmCreateForm (main_window, "form_0", Args, Nargs);
-    XtManageChild (form_0);
-	    /*-------------------------------------------------------------
-	    **      Create Frame to hold Mode Label in Main Window
-	    */
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNtraversalOn, False);  Nargs++;
-    frame_00 = XmCreateFrame (form_0, "frame_00", Args, Nargs);
-    XtManageChild (frame_00);
-	    /*    
-	    **      Create Label in this Frame
-	    */
-    if (Cntr_state_mode == VMECNT__PRESET_COUNT) {
-      Old_Cntr_state.mon_preset = 0x7fffffff;
-      units = Old_Cntr_state.mon_preset;
-      thou  = units/1000; units = units - (1000 * thou);
-      mill  = thou/1000;  thou  = thou  - (1000 * mill);
-      sprintf (text, "Preset Count Mode: %d'%03d'%03d", mill, thou, units);
-      Cntr_state_mode_in_window = VMECNT__PRESET_COUNT;
-      Cntr_state_mon_preset_in_window = Old_Cntr_state.mon_preset;
-    }else {
-      strcpy (Old_Cntr_state.timer_preset, "2000000.0");
-      strcpy (Cntr_state_timer_preset, "10000.0");
-      TimeString (text, "Preset Time Mode: ", Cntr_state_timer_preset);
-      Cntr_state_mode_in_window = VMECNT__PRESET_TIME;
-      strcpy (Cntr_state_timer_preset_in_window, Old_Cntr_state.timer_preset);
-    }
-    tmp_cmpStr = XmStringCreateLtoR (text, XmSTRING_DEFAULT_CHARSET);
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNlabelString, tmp_cmpStr); Nargs++;
-    XtSetArg (Args[Nargs], XmNalignment, XmALIGNMENT_BEGINNING); Nargs++;
-    XtSetArg (Args[Nargs], XmNrecomputeSize, True); Nargs++;
-    Lbl_counter_mode = XmCreateLabel (frame_00, "Counter_Mode", Args, Nargs);
-    XtManageChild (Lbl_counter_mode);
-    XmStringFree (tmp_cmpStr);
-	    /*-------------------------------------------------------------
-	    **      Create Frame to hold RowColumn Widget in Main Window
-	    */
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNtraversalOn, False);  Nargs++;
-    frame_01 = XmCreateFrame (form_0, "frame_01", Args, Nargs);
-    XtManageChild (frame_01);
-	    /*    
-	    **      Create RowColumn Window for register display
-	    */
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNnumColumns, 3);  Nargs++;
-    XtSetArg (Args[Nargs], XmNpacking, XmPACK_COLUMN);  Nargs++;
-    XtSetArg (Args[Nargs], XmNorientation, XmVERTICAL);  Nargs++;
-    XtSetArg (Args[Nargs], XmNentryAlignment, XmALIGNMENT_END); Nargs++;
-
-    rc_window_1 = XmCreateRowColumn (frame_01, "rc_window_1", Args, Nargs);
-    XtManageChild (rc_window_1);
-	    /*
-	    **    create labels for Col 1 (Identifiers)
-	    */
-    MakeLabel (rc_window_1, " ",	    XmALIGNMENT_END);
-    MakeLabel (rc_window_1, "Timer:",	    XmALIGNMENT_END);
-    MakeLabel (rc_window_1, "Monitor:",	    XmALIGNMENT_END);
-    MakeLabel (rc_window_1, "Detector:",    XmALIGNMENT_END);
-    MakeLabel (rc_window_1, "C3:",	    XmALIGNMENT_END);
-    MakeLabel (rc_window_1, "C4:",	    XmALIGNMENT_END);
-    MakeLabel (rc_window_1, "C5:",	    XmALIGNMENT_END);
-    MakeLabel (rc_window_1, "C6:",	    XmALIGNMENT_END);
-    MakeLabel (rc_window_1, "C7:",	    XmALIGNMENT_END);
-    MakeLabel (rc_window_1, "C8:",	    XmALIGNMENT_END);
-	    /*
-	    **    create labels for Col 2 (Values)
-	    */
-    MakeLabel (rc_window_1, "Value  ", XmALIGNMENT_END);
-
-    f_tmp = 99 * 3600 + 59 * 60 + 59;		/* Set up 99h:59m:59s */
-    sprintf (Old_Cntr_state.timer, "%f", f_tmp);
-    sscanf (Cntr_state.timer, "%f", &f_tmp);
-    ss = (int) f_tmp;
-    mm = ss/60; ss = ss - (mm * 60);
-    hh = mm/60; mm = mm - (hh * 60);
-    sprintf (text, "%d:%02d:%02d", hh, mm, ss);
-    Lbl_timer = MakeLabel (rc_window_1, text, XmALIGNMENT_END);
-
-    Old_Cntr_state.cntrs[0] = 0x7fffffff;
-    sprintf (text, "%d", Old_Cntr_state.cntrs[0]);
-    Lbl_mon = MakeLabel (rc_window_1, text, XmALIGNMENT_END);
-
-    for (i = 1; i < 8; i++) Old_Cntr_state.cntrs[i] = 0;
-    Lbl_det = MakeLabel (rc_window_1, "0", XmALIGNMENT_END);
-    Lbl_c3  = MakeLabel (rc_window_1, "0", XmALIGNMENT_END);
-    Lbl_c4  = MakeLabel (rc_window_1, "0", XmALIGNMENT_END);
-    Lbl_c5  = MakeLabel (rc_window_1, "0", XmALIGNMENT_END);
-    Lbl_c6  = MakeLabel (rc_window_1, "0", XmALIGNMENT_END);
-    Lbl_c7  = MakeLabel (rc_window_1, "0", XmALIGNMENT_END);
-    Lbl_c8  = MakeLabel (rc_window_1, "0", XmALIGNMENT_END);
-	    /*
-	    **    create labels for Col 3 (Rates)
-	    */
-    MakeLabel (rc_window_1, "  Rate  ", XmALIGNMENT_END);
-    MakeLabel (rc_window_1, " ", XmALIGNMENT_END);
-
-    strcpy (Old_Cntr_state.rates[0], "4000000.0");
-    sscanf (Old_Cntr_state.rates[0], "%f", &f_tmp);
-    sprintf (text, "%.1f kHz", f_tmp/1000.0);
-    Lbl_mon_rate = MakeLabel (rc_window_1, text, XmALIGNMENT_END);
-
-    for (i = 1; i < 8; i++) strcpy (Old_Cntr_state.rates[i], "0.0");
-    Lbl_det_rate = MakeLabel (rc_window_1, "0.0", XmALIGNMENT_END);
-    Lbl_c3_rate  = MakeLabel (rc_window_1, "0.0", XmALIGNMENT_END);
-    Lbl_c4_rate  = MakeLabel (rc_window_1, "0.0", XmALIGNMENT_END);
-    Lbl_c5_rate  = MakeLabel (rc_window_1, "0.0", XmALIGNMENT_END);
-    Lbl_c6_rate  = MakeLabel (rc_window_1, "0.0", XmALIGNMENT_END);
-    Lbl_c7_rate  = MakeLabel (rc_window_1, "0.0", XmALIGNMENT_END);
-    Lbl_c8_rate  = MakeLabel (rc_window_1, "0.0", XmALIGNMENT_END);
-	    /*-------------------------------------------------------------
-	    **	    The rate of counter which goes to analogue display is
-	    **	    displayed in reverse video. Make this C1 to start off with.
-	    */
-    Nargs = 0;	    /* Get default foreground and background first. */
-    XtSetArg (Args[Nargs], XmNforeground, &Dflt_foreground); Nargs++;
-    XtSetArg (Args[Nargs], XmNbackground, &Dflt_background); Nargs++;
-    XtGetValues (Lbl_mon_rate, Args, Nargs);
-
-    Old_Cntr_state.analog_indx = 0;	/* Make C1 reverse video for starters */
-
-    Nargs = 0;		    /* Prepare arguments to make a reverse-video */
-    XtSetArg (Args[Nargs], XmNforeground, Dflt_background); Nargs++;
-    XtSetArg (Args[Nargs], XmNbackground, Dflt_foreground); Nargs++;
-    XtSetValues (Lbl_mon_rate, Args, Nargs);	/* And do it */
-	    /*-------------------------------------------------------------
-	    **      Create Frame to hold Counter Status Label in Main Window
-	    */
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNtraversalOn, False);  Nargs++;
-    frame_02 = XmCreateFrame (form_0, "frame_02", Args, Nargs);
-    XtManageChild (frame_02);
-	    /*    
-	    **      Create Label in this Frame
-	    */
-    tmp_cmpStr = XmStringCreateLtoR ("This_is_a_Place_Holder", 
-						XmSTRING_DEFAULT_CHARSET);
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNlabelString, tmp_cmpStr); Nargs++;
-    XtSetArg (Args[Nargs], XmNalignment, XmALIGNMENT_CENTER); Nargs++;
-    XtSetArg (Args[Nargs], XmNrecomputeSize, False); Nargs++;
-    Lbl_counter_state = XmCreateLabel (frame_02, "Counter_Status", Args, Nargs);
-    XtManageChild (Lbl_counter_state);
-    XmStringFree (tmp_cmpStr);
-	    /*    
-	    **      Create RowColumn Window for command buttons
-	    */
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNnumColumns, 1);  Nargs++;
-    XtSetArg (Args[Nargs], XmNpacking, XmPACK_COLUMN);  Nargs++;
-    XtSetArg (Args[Nargs], XmNorientation, XmHORIZONTAL);  Nargs++;
-    XtSetArg (Args[Nargs], XmNtraversalOn, True); Nargs++;
-
-    rc_window_04 = XmCreateRowColumn (form_0, "rc_window_04", Args, Nargs);
-    XtManageChild (rc_window_04);
-
-    Go_button    = AddMenuItem (rc_window_04, "Go",
-				    '\0', PULL_DOWN, NULL, RunCB);
-    Stop_button  = AddMenuItem (rc_window_04, "Stop",
-				    '\0', PULL_DOWN, NULL, RunCB);
-    Pause_button = AddMenuItem (rc_window_04, "Pause",
-				    '\0', PULL_DOWN, NULL, RunCB);
-    Cont_button  = AddMenuItem (rc_window_04, "Cont",
-				    '\0', PULL_DOWN, NULL, RunCB);
-    Updt_button  = AddMenuItem (rc_window_04, "Update",
-				    '\0', PULL_DOWN, NULL, RunCB);
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNtraversalOn, False);  Nargs++;
-    XtSetValues (Go_button, Args, Nargs);
-    XtSetValues (Stop_button, Args, Nargs);
-    XtSetValues (Pause_button, Args, Nargs);
-    XtSetValues (Cont_button, Args, Nargs);
-	    /*    
-	    **      Create scale to show run progress
-	    */
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNorientation, XmHORIZONTAL); Nargs++;
-    XtSetArg (Args[Nargs], XmNmaximum, SCALE_RUN_MAX); Nargs++;
-    XtSetArg (Args[Nargs], XmNsensitive, False); Nargs++;
-    Scale_run_progress = XmCreateScale (form_0, "Run_Scale", Args, Nargs);
-    XtManageChild (Scale_run_progress);
-	    /*-------------------------------------------------------------
-	    **      Create Form to hold the Threshold/Rate Indicators
-	    */
-    Nargs = 0;
-    form_03 = XmCreateForm (form_0, "form_03", Args, Nargs);
-    XtManageChild (form_03);
-	    /*    
-	    **      Pick out values for this Form
-	    */
-    indx = 1;	    /* Ensure the first display has the longest content so that,
-		    ** if they get changed, there will be room for the
-		    ** new selection.
-		    */
-    Old_Cntr_state.thresh_indx = indx;
-    title = "\"Detector\" Threshold/Rate";
-    strcpy (Old_Cntr_state.threshes[indx], "4000000.0");
-    strcpy (Old_Cntr_state.rates[indx], "3000000.0");
-    sscanf (Old_Cntr_state.threshes[indx], "%f", &Thresh_cntr_thresh);
-    sscanf (Old_Cntr_state.rates[indx],    "%f", &Thresh_cntr_rate);
-    f_max = (Thresh_cntr_rate > Thresh_cntr_thresh) ?
-					Thresh_cntr_rate : Thresh_cntr_thresh;
-    f_tmp = 1.0e2;
-    if (f_max > f_tmp) f_tmp = 1.0e3;
-    if (f_max > f_tmp) f_tmp = 1.0e4;
-    if (f_max > f_tmp) f_tmp = 1.0e5;
-    if (f_max > f_tmp) f_tmp = 1.0e6;
-    if (f_max > f_tmp) f_tmp = 1.0e7;
-    f_max = f_tmp;
-    Scale_is_khz = TRUE;
-    dec_points = 1;	    /* Play tricks to get 1 dec place in display */
-    f_max = f_max/100.0;
-    Thresh_cntr_thresh = Thresh_cntr_thresh/100.0;
-    Thresh_cntr_rate   = Thresh_cntr_rate/100.0;
-    Scale_max = (int) f_max;
-	    /*    
-	    **      Create Label for Threshold/Rate Form
-	    */
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNtraversalOn, False);  Nargs++;
-    Lbl_thresh_scales = XmCreateLabel (form_03, title, Args, Nargs);
-    XtManageChild (Lbl_thresh_scales);
-	    /*    
-	    **      Create Scale for Threshold
-	    */
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNdecimalPoints, dec_points); Nargs++;
-    XtSetArg (Args[Nargs], XmNorientation, XmVERTICAL); Nargs++;
-    XtSetArg (Args[Nargs], XmNminimum, 0); Nargs++;
-    XtSetArg (Args[Nargs], XmNmaximum, (int) Scale_max); Nargs++;
-    XtSetArg (Args[Nargs], XmNshowValue, True); Nargs++;
-    XtSetArg (Args[Nargs], XmNvalue, (int) Thresh_cntr_thresh); Nargs++;
-    XtSetArg (Args[Nargs], XmNsensitive, True); Nargs++;
-    Scale_thresh = XmCreateScale (form_03, "Thr_Scale", Args, Nargs);
-    XtManageChild (Scale_thresh);
-    XtAddCallback (Scale_thresh, XmNvalueChangedCallback, ThreshThreshCB, NULL);
-	    /*    
-	    **      Create Scale for Rate
-	    */
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNdecimalPoints, dec_points); Nargs++;
-    XtSetArg (Args[Nargs], XmNorientation, XmVERTICAL); Nargs++;
-    XtSetArg (Args[Nargs], XmNminimum, 0); Nargs++;
-    XtSetArg (Args[Nargs], XmNmaximum, (int) f_max); Nargs++;
-    XtSetArg (Args[Nargs], XmNvalue, (int) Thresh_cntr_rate); Nargs++;
-    XtSetArg (Args[Nargs], XmNsensitive, False); Nargs++;
-    Scale_rate = XmCreateScale (form_03, "Rate_Scale", Args, Nargs);
-    XtManageChild (Scale_rate);
-	    /*    
-	    **      Create Label giving scale maximum
-	    */
-    sprintf (text, "<-- %d kHz", ((int) f_max)/10);
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNrecomputeSize, True); Nargs++;
-    XtSetArg (Args[Nargs], XmNtraversalOn, False);  Nargs++;
-    Lbl_rate_scale_max = XmCreateLabel (form_03, text, Args, Nargs);
-    XtManageChild (Lbl_rate_scale_max);
-	    /*    
-	    **      Create Labels giving present rate and thresh values
-	    */
-    sprintf (text, "Thresh = %.1f kHz", Thresh_cntr_thresh/10.0);
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNrecomputeSize, True); Nargs++;
-    XtSetArg (Args[Nargs], XmNtraversalOn, False);  Nargs++;
-    Lbl_thr_scale_val = XmCreateLabel (form_03, text, Args, Nargs);
-    XtManageChild (Lbl_thr_scale_val);
-
-    sprintf (text, "Rate   = %.1f kHz", Thresh_cntr_rate/10.0);
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNrecomputeSize, True); Nargs++;
-    XtSetArg (Args[Nargs], XmNtraversalOn, False);  Nargs++;
-    Lbl_rate_scale_val = XmCreateLabel (form_03, text, Args, Nargs);
-    XtManageChild (Lbl_rate_scale_val);
-	    /*    
-	    **      Create arrow buttons for changing scale
-	    */
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNarrowDirection, XmARROW_UP); Nargs++;
-    XtSetArg (Args[Nargs], XmNtraversalOn, False);  Nargs++;
-    if (Scale_is_khz && (Scale_max >= 100000)) {
-      XtSetArg (Args[Nargs], XmNsensitive, False); Nargs++;
-    }
-    Btn_scale_up = XmCreateArrowButton (form_03, "Scale_up", Args, Nargs);
-    XtManageChild (Btn_scale_up);
-    XtAddCallback (Btn_scale_up, XmNactivateCallback, ScaleCB, NULL);
-
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNarrowDirection, XmARROW_DOWN); Nargs++;
-    XtSetArg (Args[Nargs], XmNtraversalOn, False);  Nargs++;
-    if (!Scale_is_khz && (Scale_max <= 100)) {
-      XtSetArg (Args[Nargs], XmNsensitive, False); Nargs++;
-    }
-    Btn_scale_down = XmCreateArrowButton (form_03, "Scale_down", Args, Nargs);
-    XtManageChild (Btn_scale_down);
-    XtAddCallback (Btn_scale_down, XmNactivateCallback, ScaleCB, NULL);
-	    /*-------------------------------------------------------------
-	    **      Organise the components of the Threshold/Rate Form
-	    */
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNtopAttachment, XmATTACH_FORM); Nargs++;
-    XtSetValues (Lbl_thresh_scales, Args, Nargs);
-
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNtopAttachment, XmATTACH_WIDGET); Nargs++;
-    XtSetArg (Args[Nargs], XmNtopWidget, Lbl_thresh_scales); Nargs++;
-    XtSetArg (Args[Nargs], XmNleftAttachment, XmATTACH_FORM); Nargs++;
-    XtSetArg (Args[Nargs], XmNbottomAttachment, XmATTACH_FORM); Nargs++;
-    XtSetValues (Scale_thresh, Args, Nargs);
-
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNtopAttachment, XmATTACH_WIDGET); Nargs++;
-    XtSetArg (Args[Nargs], XmNtopWidget, Lbl_thresh_scales); Nargs++;
-    XtSetArg (Args[Nargs], XmNleftAttachment, XmATTACH_WIDGET); Nargs++;
-    XtSetArg (Args[Nargs], XmNleftWidget, Scale_thresh); Nargs++;
-    XtSetArg (Args[Nargs], XmNbottomAttachment, XmATTACH_FORM); Nargs++;
-    XtSetValues (Scale_rate, Args, Nargs);
-
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNtopAttachment, XmATTACH_WIDGET); Nargs++;
-    XtSetArg (Args[Nargs], XmNtopWidget, Lbl_thresh_scales); Nargs++;
-    XtSetArg (Args[Nargs], XmNleftAttachment, XmATTACH_WIDGET); Nargs++;
-    XtSetArg (Args[Nargs], XmNleftWidget, Scale_rate); Nargs++;
-    XtSetValues (Lbl_rate_scale_max, Args, Nargs);
-
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNleftAttachment, XmATTACH_WIDGET); Nargs++;
-    XtSetArg (Args[Nargs], XmNleftWidget, Scale_rate); Nargs++;
-    XtSetArg (Args[Nargs], XmNbottomAttachment, XmATTACH_FORM); Nargs++;
-    XtSetValues (Lbl_thr_scale_val, Args, Nargs);
-
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNleftAttachment, XmATTACH_WIDGET); Nargs++;
-    XtSetArg (Args[Nargs], XmNleftWidget, Scale_rate); Nargs++;
-    XtSetArg (Args[Nargs], XmNbottomAttachment, XmATTACH_WIDGET); Nargs++;
-    XtSetArg (Args[Nargs], XmNbottomWidget, Lbl_thr_scale_val); Nargs++;
-    XtSetValues (Lbl_rate_scale_val, Args, Nargs);
-
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNtopAttachment, XmATTACH_WIDGET); Nargs++;
-    XtSetArg (Args[Nargs], XmNtopWidget, Lbl_thresh_scales); Nargs++;
-    XtSetArg (Args[Nargs], XmNleftAttachment, XmATTACH_WIDGET); Nargs++;
-    XtSetArg (Args[Nargs], XmNleftWidget, Lbl_rate_scale_max); Nargs++;
-    XtSetValues (Btn_scale_up, Args, Nargs);
-
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNtopAttachment, XmATTACH_WIDGET); Nargs++;
-    XtSetArg (Args[Nargs], XmNtopWidget, Btn_scale_up); Nargs++;
-    XtSetArg (Args[Nargs], XmNleftAttachment, XmATTACH_WIDGET); Nargs++;
-    XtSetArg (Args[Nargs], XmNleftWidget, Lbl_rate_scale_max); Nargs++;
-    XtSetValues (Btn_scale_down, Args, Nargs);
-	    /*-------------------------------------------------------------
-	    **      Organise the components of the Main Form
-	    */
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNtopAttachment, XmATTACH_FORM); Nargs++;
-    XtSetArg (Args[Nargs], XmNleftAttachment, XmATTACH_FORM); Nargs++;
-    XtSetValues (frame_00, Args, Nargs);
-
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNtopAttachment, XmATTACH_WIDGET); Nargs++;
-    XtSetArg (Args[Nargs], XmNtopWidget, frame_00); Nargs++;
-    XtSetArg (Args[Nargs], XmNleftAttachment, XmATTACH_FORM); Nargs++;
-    XtSetValues (frame_01, Args, Nargs);
-
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNtopAttachment, XmATTACH_WIDGET); Nargs++;
-    XtSetArg (Args[Nargs], XmNtopWidget, frame_01); Nargs++;
-    XtSetArg (Args[Nargs], XmNleftAttachment, XmATTACH_FORM); Nargs++;
-    XtSetValues (frame_02, Args, Nargs);
-
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNtopAttachment, XmATTACH_FORM); Nargs++;
-    XtSetArg (Args[Nargs], XmNleftAttachment, XmATTACH_WIDGET); Nargs++;
-    XtSetArg (Args[Nargs], XmNleftWidget, frame_01); Nargs++;
-    XtSetArg (Args[Nargs], XmNbottomAttachment, XmATTACH_WIDGET); Nargs++;
-    XtSetArg (Args[Nargs], XmNbottomWidget, frame_02); Nargs++;
-    XtSetValues (form_03, Args, Nargs);
-
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNtopAttachment, XmATTACH_WIDGET); Nargs++;
-    XtSetArg (Args[Nargs], XmNtopWidget, frame_01); Nargs++;
-    XtSetArg (Args[Nargs], XmNleftAttachment, XmATTACH_WIDGET); Nargs++;
-    XtSetArg (Args[Nargs], XmNleftWidget, frame_02); Nargs++;
-    XtSetArg (Args[Nargs], XmNrightAttachment, XmATTACH_FORM); Nargs++;
-    XtSetValues (rc_window_04, Args, Nargs);
-
-    Nargs = 0;
-    XtSetArg (Args[Nargs], XmNtopAttachment, XmATTACH_WIDGET); Nargs++;
-    XtSetArg (Args[Nargs], XmNtopWidget, rc_window_04); Nargs++;
-    XtSetArg (Args[Nargs], XmNleftAttachment, XmATTACH_FORM); Nargs++;
-    XtSetArg (Args[Nargs], XmNrightAttachment, XmATTACH_FORM); Nargs++;
-    XtSetValues (Scale_run_progress, Args, Nargs);
-
-    SetStateInWindows ();
-
-    return (main_window);
-  }
-/*
-**==========================================================================
-**			Main line program
-**			------------------
-*/
-  int	main (int argc, char **argv) {
-/*      ============================
-*/
-    Widget		main_window;	/* MainWindow		*/
-    int			status, i, errcode, my_errno, vaxc_errno;
-    char		my_buff[32] = "Empty";
-    char		secs_text[32], *pntr, buff[80];
-    struct RS__RplyStruct   *rply_ptr;
-	/*
-	**	Initialize toolkit and open the display.
-	*/
-    Top_level = XtAppInitialize (&App_context, "SinQ_rc",
-			    OpTable, XtNumber(OpTable),
-			    &argc, argv, NULL, NULL, 0);
-
-    XtGetApplicationResources (Top_level, (XtPointer) &AppData,
-                              Resources, XtNumber(Resources), NULL, 0);
-
-    printf ("%s\n", setupTime (buff, sizeof (buff)));
-    printf ("\n VME Neutron Counter, EL737, Client, Version %s\n\n", ident);
-    printf ("   RS-232-C Server  = \"%s\"\n",
-			AppData.rs232c_srv_host);
-    printf ("   TCP/IP Port      = %d\n", AppData.rs232c_srv_inet_port);
-    printf ("   RS-232-C Channel = %d\n", AppData.v24_chan);
-    printf ("   Polling delay    = %d msec.\n", AppData.msec_poll);
-    printf ("   Time-out         = %d msec.\n", AppData.msec_tmo);
-    if (AppData.persist)
-      printf ("   Persistent Mode  = on.\n");
-    printf ("\n");
-
-    printf (" Opening connection to RS-232-C Server .. "); fflush (NULL);
-    status = EL737_Open (&Hndl,
-		AppData.rs232c_srv_host,
-		AppData.rs232c_srv_inet_port,
-		AppData.v24_chan);
-    if (status) {
-      printf ("connection established.\n");
-      InfoHndl = (struct EL737info *) Hndl;
-    }else {
-      printf ("\n\007   .. connection failed. I can't go on!\n");
-      EL737_ErrInfo (&pntr, &errcode, &my_errno, &vaxc_errno);
-      if (pntr != NULL) printf ("%s\n", pntr);
-      #ifdef  __VMS
-        exit (errcode);
-      #else
-        exit (EXIT_FAILURE);
-      #endif
-    }
-
-    if (!PutOnLine ()) {
-      printf ("\n\007   PutOnLine failed. I can't go on!\n");
-      EL737_ErrInfo (&pntr, &errcode, &my_errno, &vaxc_errno);
-      if (pntr != NULL) printf ("%s\n", pntr);
-      #ifdef  __VMS
-        exit (errcode);
-      #else
-        exit (EXIT_FAILURE);
-      #endif
-    }
-	/*
-	**	Initialize Cntr_state to something harmless
-	*/
-    strcpy (Cntr_state.timer, "0.0");
-    for (i = 0; i < 8; i++) Cntr_state.cntrs[i] = 0;
-    for (i = 0; i < 8; i++) strcpy (Cntr_state.rates[i], "0.0");
-    Cntr_state.state = OFFLINE;
-    for (i = 0; i < 8; i++) strcpy (Cntr_state.thresh_integ_time[i], "0.1");
-    strcpy (Cntr_state.rate_integ_time,	"0.1");
-    Cntr_state.analog_indx = 0;
-    Cntr_state.thresh_indx = 0;
-    for (i = 0; i < 8; i++) strcpy (Cntr_state.threshes[i], "0.0");
-    Cntr_state.mon_preset = 1;
-    strcpy (Cntr_state.timer_preset, "10.0");
-
-    memcpy (&Old_Cntr_state, &Cntr_state, sizeof (Old_Cntr_state));
-    Old_Cntr_state.analog_indx++;
-    Old_Cntr_state.thresh_indx++;
-
-    printf (" Getting full status of counter ...\n");
-    status = GetCounterStatus (VMECNT__FULL);
-    if (!status) {
-      printf (" Bad counter status -- aborting!\n");
-      EL737_ErrInfo (&pntr, &errcode, &my_errno, &vaxc_errno);
-      if (pntr != NULL) printf ("%s\n", pntr);
-      #ifdef  __VMS
-        exit (errcode);
-      #else
-        exit (EXIT_FAILURE);
-      #endif
-    }
-		/*
-		** Try to make an intelligent guess as to which mode (preset-
-		** time or preset-count) the user wants at first. The following
-		** is the list of precedence:
-		**  a) If counter status is other than MS, the value selects
-		**	the mode. 
-		**  b) The values of the MP and TP registers are checked. If
-		**	they are both set to power-up values (100 and 10.00)
-		**	or neither is set to its power-up value, go to (c).
-		**	Otherwise, select the mode corresponding to the non-
-		**	power-up value.
-		**  c) Select the mode according to the -mode option (or
-		**	*vmeCntrMode resource) if it is present and valid.
-		**  d) Everything failed so set preset-tcount mode.
-		**
-		** In case (a) or (b), use the value of the MP register as the
-		** initial preset value. In (c) or (d), the initial preset
-		** value is that given by flag -count or -time (or resources
-		** *vmeCntrPresetCount or *vmeCntrPresetTime), if present and
-		** valid.
-		**
-		** For the other mode, the initial preset value is the value
-		** of the register if it is not the power-up value. Otherwise,
-		** it is that given by flag -count or -time (or resources
-		** *vmeCntrPresetCount or *vmeCntrPresetTime), if present and
-		** valid.
-		*/
-    if ((Cntr_state.state & PTS) != 0) {
-      Cntr_state_mode = VMECNT__PRESET_TIME;
-      strcpy (Cntr_state_timer_preset, Cntr_state.timer_preset);
-      printf (" Counter is active and in \"Preset-time\" mode.\n");
-    }else if ((Cntr_state.state & PCS) != 0) {
-      Cntr_state_mode = VMECNT__PRESET_COUNT;
-      Cntr_state_mon_preset = Cntr_state.mon_preset;
-      printf (" Counter is active and in \"Preset-count\" mode.\n");
-    }else if ((Cntr_state.mon_preset == 100) &&
-	      (strcmp (Cntr_state.timer_preset, "10.00") != 0)) {
-      Cntr_state_mode = VMECNT__PRESET_TIME;
-      strcpy (Cntr_state_timer_preset, Cntr_state.timer_preset);
-      printf (" Counter assumed to be in \"Preset-time\" mode.\n");
-    }else if ((Cntr_state.mon_preset != 100) &&
-	      (strcmp (Cntr_state.timer_preset, "10.00") == 0)) {
-      Cntr_state_mode = VMECNT__PRESET_COUNT;
-      Cntr_state_mon_preset = Cntr_state.mon_preset;
-      printf (" Counter assumed to be in \"Preset-count\" mode.\n");
-    }else {	/*
-		** The status of the counter was no help. See if "-mode" set.
-		*/
-      strncpy (my_buff, AppData.mode, (sizeof (my_buff) - 1));
-      for (i = 0; my_buff[i] != 0; i++) my_buff[i] = tolower (my_buff[i]);
-      if (strcmp (my_buff, "count") == 0) {
-	Cntr_state_mode = VMECNT__PRESET_COUNT;
-	printf (" Initial mode of counter specified as \"Preset-count\".\n");
-	if (AppData.preset_count > 0) {
-	  Cntr_state.mon_preset = AppData.preset_count;
-	  Cntr_state_mon_preset = AppData.preset_count;
-	}else {
-	  Cntr_state_mon_preset = Cntr_state.mon_preset;
-	}
-      }else if (strcmp (my_buff, "time") == 0) {
-	Cntr_state_mode = VMECNT__PRESET_TIME;
-	printf (" Initial mode of counter specified as \"Preset-time\".\n");
-	if (strcmp (AppData.preset_time, "0") != 0) {
-	  pntr = CheckTimeSyntax (AppData.preset_time, secs_text);
-	  if (pntr != NULL) {
-	    strcpy (Cntr_state.timer_preset, secs_text);
-	    strcpy (Cntr_state_timer_preset, secs_text);
-	  }else {
-	    strcpy (Cntr_state_timer_preset, Cntr_state.timer_preset);
-	  }
-	}else {
-	  strcpy (Cntr_state_timer_preset, Cntr_state.timer_preset);
-	}
-      }else {
-	printf (" Initial mode of counter is undefined. "
-		  "\"Preset-count\" selected by default.\n");
-	Cntr_state_mode = VMECNT__PRESET_COUNT;
-	Cntr_state_mon_preset = Cntr_state.mon_preset;
-	if (AppData.preset_count > 0)
-	  Cntr_state.mon_preset = AppData.preset_count;
-      }
-    }
-
-    if (Cntr_state_mode == VMECNT__PRESET_TIME) {
-      if (Cntr_state.mon_preset != 100) {
-	Cntr_state_mon_preset = Cntr_state.mon_preset;
-      }else {
-	if (AppData.preset_count > 0) {
-	  Cntr_state.mon_preset = AppData.preset_count;
-	  Cntr_state_mon_preset = AppData.preset_count;
-	}
-      }
-    }else {
-      if (strcmp (Cntr_state.timer_preset, "10.00") != 0) {
-	strcpy (Cntr_state_timer_preset, Cntr_state.timer_preset);
-      }else {
-	if (strcmp (AppData.preset_time, "0") != 0) {
-	  pntr = CheckTimeSyntax (AppData.preset_time, secs_text);
-	  if (pntr != NULL) {
-	    strcpy (Cntr_state.timer_preset, secs_text);
-	    strcpy (Cntr_state_timer_preset, secs_text);
-	  }
-	}
-      }
-    }
-
-    main_window = CreateApplication (Top_level);
-	/*
-	**	Realize Widgets
-	*/
-    XtRealizeWidget (Top_level);
-	/*
-	**	Make a timer so that the display gets updated regularly.
-	*/
-    if ((AppData.msec_poll > 0) && (Cntr_state.state != OFFLINE)) {
-      Timer_id = XtAppAddTimeOut (App_context, AppData.msec_poll,
-					TimerCB, NULL);
-    } else if (AppData.msec_poll == 0) {
-      printf (" msecPoll = 0. Continuous status update disabled.\n");
-    } else {
-      printf (" EL737 is off-line. Continuous status update disabled.\n");
-    }
-	/*
-	**	process events
-	*/
-    XtAppMainLoop (App_context);
-  }
-/*------------------------------------------------------ End of EL737.C */
diff --git a/velo.c b/velo.c
index d11a7da9..90a15370 100644
--- a/velo.c
+++ b/velo.c
@@ -54,6 +54,7 @@
 #include "velo.h"
 #include "velo.i"
 #include "velodriv.h"
+#include "site.h"
 
 /* -------- defines for parameters to velocity selector */
 #define INT 0 
@@ -746,7 +747,8 @@
        Tcl_Interp *pT = NULL;
        int iRet;
        pEVDriver pMonDriv = NULL;
-   
+       pSite site = NULL;
+
        assert(pCon);
        assert(pSics);
        
@@ -777,16 +779,21 @@
        {
           pDriv = VSCreateSim();
        }
-       else if(strcmp(argv[3],"dornier") == 0) /* Dornier velocity selector */
+       else
        {
           if(argc < 5)
           {
-            sprintf(pBueffel,"ERROR: missing options array for Dornier velocity selector");
+            sprintf(pBueffel,
+	  "ERROR: missing options array for velocity selector");
             SCWrite(pCon,pBueffel,eError);
             return 0;
           }
-          pT = (Tcl_Interp *)pSics->pTcl;
-          pDriv = VSCreateDornierSINQ(argv[4],pT);
+          pT = InterpGetTcl(pSics);
+          site = getSite();
+	  if(site != NULL)
+	  {
+             pDriv = site->CreateVelocitySelector(argv[3],argv[4],pT);
+          }
           if(!pDriv)
           {
             SCWrite(pCon,pT->result,eError);
@@ -802,7 +809,7 @@
           return 0;        
        }
        
-       /* now initialise the rubbish and install it as command */
+       /* now initialise this and install it as command */
        pNew = VSCreate(pTilt,pDriv);
        if(!pNew)
        {
diff --git a/velodorn.c b/velodorn.c
deleted file mode 100644
index 14671236..00000000
--- a/velodorn.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/*-------------------------------------------------------------------------
-
-			V E L O D O R N
-			
-  Utility functions for talking to a Dornier velocity selector in the
-  SINQ setup.
-  
-  Mark Koennecke, Juli 1997
-
-       Copyright:
-
-       Labor fuer Neutronenstreuung
-       Paul Scherrer Institut
-       CH-5423 Villigen-PSI
-
-
-      The authors hereby grant permission to use, copy, modify, distribute,
-      and license this software and its documentation for any purpose, provided
-      that existing copyright notices are retained in all copies and that this
-      notice is included verbatim in any distributions. No written agreement,
-      license, or royalty fee is required for any of the authorized uses.
-      Modifications to this software may be copyrighted by their authors
-      and need not follow the licensing terms described here, provided that
-      the new terms are clearly indicated on the first page of each file where
-      they apply.
-
-      IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-      FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-      ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-      DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-      POSSIBILITY OF SUCH DAMAGE.
-
-      THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-      INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-      FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-      IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-      NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-      MODIFICATIONS.
-----------------------------------------------------------------------------*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <ctype.h>
-#include "sics.h"
-#include "fortify.h"
-#include "hardsup/sinq_prototypes.h"
-#include "velodorn.h"
-#include "hardsup/serialsinq.h"
-#include "serialwait.h"
-
-#define TOK_BUF_L 25
-/*--------------------------- analyse Dornier status string ----------------*/
-  int AnalyseDornierStatus(char *pText, pDornierStatus pResult)
-  {
-     int cnt, key_id, sl, sts;
-     long err;
-     char ena_str[] = "ENABLED";
-     char dis_str[] = "DISABLED";
-     char keys[16][9] =
-	             {
-	               "Status:\0 ",
-	               "S_DREH:\0 ",
-	               "I_DREH:\0 ",
-	               "P_VERL:\0 ",
-	               "STROM:\0  ",
-	               "T_ROT:\0  ",
-	               "T_GEH:\0  ",
-	               "T_VOR:\0  ",
-	               "T_RUECK:\0",
-	               "DURCHFL:\0",
-	               "VAKUUM:\0 ",
-	               "BESCHL:\0 ",
-	               "KOM: \0   ",
-	               "DATE: \0  ",
-	               "TIME: \0  ",
-	               "Hz:\0    "};
-
-     char tok_buf[TOK_BUF_L], *ptr_token, *ptr_src, *ptr;
-     const char  tok_c[] = "/\\\0";
-     char status[255];
-
-     ptr_src = pText;
-     memset(pResult,0,sizeof(DornierStatus));
-
-       /* skip over first token, should be command echo */
-     ptr_token = strtok(ptr_src, tok_c);
-     if (ptr_token == NULL) return 0; /* error */
-     strcpy(pResult->echo,(const char *)ptr_token);
-     ptr_src += strlen(ptr_token);
-       
-     ptr_src = NULL; /* necessary for further search with strtok */        
-     for (;;)
-     {
-	/* read text  till next separator '/' */
-	ptr_token = strtok(ptr_src, tok_c);
-	if (ptr_token == NULL) break;
-	strcpy(tok_buf,ptr_token);
-
-	for (key_id = 0; key_id<=15; key_id++)
-	{
-		/* search key  ? */
-	  sl = strlen(keys[key_id]);
-	  if (strncmp(&keys[key_id][0], tok_buf, sl) == 0)
-	  {
-			/* step over key  */
-		for (cnt=0;cnt+sl < TOK_BUF_L; cnt++)
-				tok_buf[cnt] = tok_buf[cnt+sl];
-		switch (key_id)
-		{
-		  case 0:  {strcpy(pResult->rm, tok_buf); break;}
-		  case 1:  {sscanf(tok_buf,"%d",&pResult->nom_rpm); break;}
-		  case 2:  {sscanf(tok_buf,"%d",&pResult->cur_rpm); break;}
-		  case 3:  {sscanf(tok_buf,"%d",&pResult->pwr); break;}
-		  case 4:  {sscanf(tok_buf,"%f",&pResult->curr); break;}
-		  case 5:  {sscanf(tok_buf,"%d",&pResult->rot_temp); break;}
-		  case 6:  {sscanf(tok_buf,"%d",&pResult->cont_temp); break;}
-		  case 7:  {sscanf(tok_buf,"%d",&pResult->inl_temp); break;}
-		  case 8:  {sscanf(tok_buf,"%d",&pResult->outl_temp); break;}
-		  case 9:  {sscanf(tok_buf,"%f",&pResult->cool_wat); break;}
-		  case 10: {sscanf(tok_buf,"%f",&pResult->vacuum); break;}
-		  case 11: {sscanf(tok_buf,"%f",&pResult->accel); break;}
-		  case 12: {
-				if (strcmp(tok_buf, ena_str) == 0)
-					{pResult->komm = 1; break;}
-				if (strcmp(tok_buf, dis_str) == 0)
-					{pResult->komm = 0;break;}
-				break;
-			   }
-		  case 13: break;	        /* date */
-		  case 14: break;	        /* time */
-		  case 15: {sscanf(tok_buf,"%d",&pResult->iHz);	break;}
-	        }
-	  }
-	}
-     }
-     return(1);
-  }
-/*-------------------------------------------------------------------------*/
-  int DornierSend(void **pData, char *pCommand, char *pReply, int iRepLen)
-  {
-      char pOldCom[10];
-      char *pPtr;
-      int iRet;
-      
-      /* first copy the command send out, in order to test for echo */
-      pPtr = pCommand;
-      memset(pOldCom,0,10);
-      while( isspace(*pPtr) && (*pPtr != '\0') )
-      {
-        pPtr++;
-      }  
-      if(*pPtr == '\0') /* no command */
-      {
-         return NOCOMMAND;
-      }
-      strncpy(pOldCom,pPtr,3);
-      
-      iRet = SerialWriteRead(pData, pCommand, pReply, iRepLen);
-/*      
-      iRet = SerialSicsExecute(pData,pCommand,pReply,iRepLen);
-*/
-      if(iRet != 1)
-      {
-        return iRet; /* an error ocurred */
-      }
-      
-      /* try to find command in the reply */
-      pPtr = strstr(pReply,pOldCom);
-      if(pPtr == NULL)
-      {
-         SICSLogWrite("Velocity Selector: Bad Reply:",eError);
-         SICSLogWrite(pReply,eError);
-         return ECHOMISSING;
-      }
-      return 1;
-  }
-/*-------------------------------------------------------------------------*/
-  int GetDornierStatus(void **pData, pDornierStatus pDornier)
-  {
-      char pCommand[10] = {"???"};
-      char pReply[256];
-      int iRet;
-      
-       /* send command */
-       iRet = DornierSend(pData,pCommand,pReply,255);
-       if(iRet < 0 )
-       {
-         return iRet;
-       }
-       if(strlen(pReply) < 100)
-       {
-         SICSLogWrite("Velocity Selector: Bad Reply:",eError);
-         SICSLogWrite(pReply,eError);
-         return INVALIDSTATUS;
-       }
-       
-       
-       /* analyse reply */
-       iRet = AnalyseDornierStatus(pReply,pDornier);
-       if(!iRet)
-       {
-         return BADANALYSIS;
-       }
-       if(pDornier->cur_rpm > 70000)
-       {
-         printf("Shitty status reply: %s detected \n",pReply);
-       }
-       return 1;
-  }    
diff --git a/velodorn.h b/velodorn.h
deleted file mode 100644
index 71ae40ac..00000000
--- a/velodorn.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-#line 46 "velodorn.w"
-
-/*---------------------------------------------------------------------------
-                        V E L O D O R N
-
-  a set of utility functions needed in order to communicate with a 
-  Dornier velocity selector through the SINQ system. 
-
-  Mark Koennecke, Juli 1997
-
-  copyright: see implementation file.
-------------------------------------------------------------------------------*/
-#ifndef VELODORN
-#define VELODORN
-/*-------------------- a data structure for status analysis ---------------*/
- typedef struct {
-                 char echo[30]; /* echo of command */
-                 char rm[10]; /* operation status: REG == adjusting, STB == idle, 
-                         BRE == braking */
-                 int nom_rpm; /* envisaged rotation */
-                 int cur_rpm; /* actual rotation speed */        
-                 int pwr;     /* loss current, only valid after check */
-                 float curr;  /* electircal current */
-                 int  rot_temp; /* temperature of rotor */
-                 int cont_temp; /* temperature of housing */
-                 int inl_temp;  /* in temperature of cooling water */
-                 int outl_temp; /* temperature of cooling water after 
-                                   velocity selector */
-                 float cool_wat; /* cooling water flow (l/minute) */
-                 float vacuum;  /* vacuum (mbar) */
-                 float accel;   /* rotation acceleration (g) */
-                 int komm;      /* communication status PC-Host,
-                                   0 = enabled,  1 = disabled 
-                                */
-                 int iHz;
-                 } DornierStatus, *pDornierStatus;                                   
-
-/*--------- error codes */
-#define NOCOMMAND -300
-#define ECHOMISSING -302
-#define BADANALYSIS -303
-#define STARTTIMEOUT -304
-#define INVALIDSTATUS -305
-/*------ functions */
-
-#line 41 "velodorn.w"
-
-   int GetDornierStatus(void **pData, pDornierStatus pDornier);
-   int DornierSend(void **pData, char *pCommand, char *pReply, int iLen);
-
-#line 89 "velodorn.w"
-
-
-#endif
diff --git a/velodorn.tex b/velodorn.tex
deleted file mode 100644
index a9faee1c..00000000
--- a/velodorn.tex
+++ /dev/null
@@ -1,113 +0,0 @@
-\subsection{The hardware driver for the Dornier velocity selector at SINQ}
-SANS uses a velocity selector provided by Dornier, Germany. This velocity
-selector comes with a IBM--compatible PC for control. On this PC there is a
-control program for the velocity selector. This program can be operated from
-the PC's monitor and keyboard or remotely, from a host computer, 
-through a RS--232 connection. The protocoll on this RS--232 connection is a
-simple ASCII command protocoll detailed in the documentation delivered by
-Dornier. At SINQ this velocity selcector control PC is connected via the
-RS--232 connection to a Macintosh computer. This Mac is connected to the
-network by TCP/IP. The Mac runs a terminal server program. This program
-forwards commands sent by TCP/IP to the apropriate RS--232 port. Due to this
-complicated setup, the hardware driver for the Dornier velocity selector has
-three layers:
-\begin{itemize}
-\item A command forwarding layer, which sends command to the selector via
-TCP/IP, the MAC and RS--232 and collects answers. This is fairly general
-code, used for many SICS hardware drivers.
-\item A primitive operations layer which implements simple command on the
-selector. This layer is based on code provided by Dr. Emmelmann, HMI. 
-\item At the end, there is the actual SICS hardware driver which builds the
-interface to the SICS system.
-\end{itemize}
-
-The implementation of the Dornier velocity selector driver is further
-complicated by the fact that it is very slow in responding to commands
-and moreover due to the fact that it has different modes:
-\begin{itemize}
-\item Starting is just after starting the velocity selector
-\item regel is the normal mode.
-\item halting is the mode when the velocity selector has been asked to
-stop. 
-\end{itemize}
-Unfortunately the actions necessary to run a Dornier velocity
-selector to a desired speed depend on those modes. For instance if the
-Dornier velocity
-selector is stopped it first needs to be started and then, when a
-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
-\mbox{}\verb@@\\
-\mbox{}\verb@/*---------------------------------------------------------------------------@\\
-\mbox{}\verb@                        V E L O D O R N@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  a set of utility functions needed in order to communicate with a @\\
-\mbox{}\verb@  Dornier velocity selector through the SINQ system. @\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  Mark Koennecke, Juli 1997@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@  copyright: see implementation file.@\\
-\mbox{}\verb@------------------------------------------------------------------------------*/@\\
-\mbox{}\verb@#ifndef VELODORN@\\
-\mbox{}\verb@#define VELODORN@\\
-\mbox{}\verb@/*-------------------- a data structure for status analysis ---------------*/@\\
-\mbox{}\verb@ typedef struct {@\\
-\mbox{}\verb@                 char echo[30]; /* echo of command */@\\
-\mbox{}\verb@                 char rm[10]; /* operation status: REG == adjusting, STB == idle, @\\
-\mbox{}\verb@                         BRE == braking */@\\
-\mbox{}\verb@                 int nom_rpm; /* envisaged rotation */@\\
-\mbox{}\verb@                 int cur_rpm; /* actual rotation speed */        @\\
-\mbox{}\verb@                 int pwr;     /* loss current, only valid after check */@\\
-\mbox{}\verb@                 float curr;  /* electircal current */@\\
-\mbox{}\verb@                 int  rot_temp; /* temperature of rotor */@\\
-\mbox{}\verb@                 int cont_temp; /* temperature of housing */@\\
-\mbox{}\verb@                 int inl_temp;  /* in temperature of cooling water */@\\
-\mbox{}\verb@                 int outl_temp; /* temperature of cooling water after @\\
-\mbox{}\verb@                                   velocity selector */@\\
-\mbox{}\verb@                 float cool_wat; /* cooling water flow (l/minute) */@\\
-\mbox{}\verb@                 float vacuum;  /* vacuum (mbar) */@\\
-\mbox{}\verb@                 float accel;   /* rotation acceleration (g) */@\\
-\mbox{}\verb@                 int komm;      /* communication status PC-Host,@\\
-\mbox{}\verb@                                   0 = enabled,  1 = disabled @\\
-\mbox{}\verb@                                */@\\
-\mbox{}\verb@                 int iHz;@\\
-\mbox{}\verb@                 } DornierStatus, *pDornierStatus;                                   @\\
-\mbox{}\verb@@\\
-\mbox{}\verb@/*--------- error codes */@\\
-\mbox{}\verb@#define NOCOMMAND -300@\\
-\mbox{}\verb@#define ECHOMISSING -302@\\
-\mbox{}\verb@#define BADANALYSIS -303@\\
-\mbox{}\verb@#define STARTTIMEOUT -304@\\
-\mbox{}\verb@#define INVALIDSTATUS -305@\\
-\mbox{}\verb@/*------ functions */@\\
-\mbox{}\verb@@$\langle$dh {\footnotesize ?}$\rangle$\verb@@\\
-\mbox{}\verb@@\\
-\mbox{}\verb@#endif@\\
-\mbox{}\verb@@$\diamond$
-\end{list}
-\vspace{-2ex}
-\end{minipage}\\[4ex]
-\end{flushleft}
diff --git a/velodorn.w b/velodorn.w
deleted file mode 100644
index c80387fc..00000000
--- a/velodorn.w
+++ /dev/null
@@ -1,93 +0,0 @@
-\subsection{The hardware driver for the Dornier velocity selector at SINQ}
-SANS uses a velocity selector provided by Dornier, Germany. This velocity
-selector comes with a IBM--compatible PC for control. On this PC there is a
-control program for the velocity selector. This program can be operated from
-the PC's monitor and keyboard or remotely, from a host computer, 
-through a RS--232 connection. The protocoll on this RS--232 connection is a
-simple ASCII command protocoll detailed in the documentation delivered by
-Dornier. At SINQ this velocity selcector control PC is connected via the
-RS--232 connection to a Macintosh computer. This Mac is connected to the
-network by TCP/IP. The Mac runs a terminal server program. This program
-forwards commands sent by TCP/IP to the apropriate RS--232 port. Due to this
-complicated setup, the hardware driver for the Dornier velocity selector has
-three layers:
-\begin{itemize}
-\item A command forwarding layer, which sends command to the selector via
-TCP/IP, the MAC and RS--232 and collects answers. This is fairly general
-code, used for many SICS hardware drivers.
-\item A primitive operations layer which implements simple command on the
-selector. This layer is based on code provided by Dr. Emmelmann, HMI. 
-\item At the end, there is the actual SICS hardware driver which builds the
-interface to the SICS system.
-\end{itemize}
-
-The implementation of the Dornier velocity selector driver is further
-complicated by the fact that it is very slow in responding to commands
-and moreover due to the fact that it has different modes:
-\begin{itemize}
-\item Starting is just after starting the velocity selector
-\item regel is the normal mode.
-\item halting is the mode when the velocity selector has been asked to
-stop. 
-\end{itemize}
-Unfortunately the actions necessary to run a Dornier velocity
-selector to a desired speed depend on those modes. For instance if the
-Dornier velocity
-selector is stopped it first needs to be started and then, when a
-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.  
-
-@d dh @{
-   int GetDornierStatus(void **pData, pDornierStatus pDornier);
-   int DornierSend(void **pData, char *pCommand, char *pReply, int iLen);
-@}
-
-@o velodorn.h -d @{
-/*---------------------------------------------------------------------------
-			V E L O D O R N
-
-  a set of utility functions needed in order to communicate with a 
-  Dornier velocity selector through the SINQ system. 
-
-  Mark Koennecke, Juli 1997
-
-  copyright: see implementation file.
-------------------------------------------------------------------------------*/
-#ifndef VELODORN
-#define VELODORN
-/*-------------------- a data structure for status analysis ---------------*/
- typedef struct {
-                 char echo[30]; /* echo of command */
-                 char rm[10]; /* operation status: REG == adjusting, STB == idle, 
-                         BRE == braking */
-                 int nom_rpm; /* envisaged rotation */
-                 int cur_rpm; /* actual rotation speed */        
-                 int pwr;     /* loss current, only valid after check */
-                 float curr;  /* electircal current */
-                 int  rot_temp; /* temperature of rotor */
-                 int cont_temp; /* temperature of housing */
-                 int inl_temp;  /* in temperature of cooling water */
-                 int outl_temp; /* temperature of cooling water after 
-                                   velocity selector */
-                 float cool_wat; /* cooling water flow (l/minute) */
-                 float vacuum;  /* vacuum (mbar) */
-                 float accel;   /* rotation acceleration (g) */
-                 int komm;      /* communication status PC-Host,
-                                   0 = enabled,  1 = disabled 
-                                */
-                 int iHz;
-                 } DornierStatus, *pDornierStatus;                                   
-
-/*--------- error codes */
-#define NOCOMMAND -300
-#define ECHOMISSING -302
-#define BADANALYSIS -303
-#define STARTTIMEOUT -304
-#define INVALIDSTATUS -305
-/*------ functions */
-@<dh@>
-
-#endif
-@}
-
diff --git a/velodornier.c b/velodornier.c
deleted file mode 100644
index 92bb64c4..00000000
--- a/velodornier.c
+++ /dev/null
@@ -1,683 +0,0 @@
-/*--------------------------------------------------------------------------
-              		       V E L O D O R N I E R
-              		       
-     A driver for a Dornier velocity selector, connected to our world
-     via a terminal server and TCP/IP. Please note, that the protocoll
-     implemented by the velocity selector PC has been changed in the following 
-     ways from the standard as supplied by Dornier:
-     - no messages we have not asked for.
-     - The whole response will be concatenated in a string, each item 
-       separated by a /. At the end is a single <CR><LF>. This is because
-       our terminal server reads only up to the first terminator.      
-   
-     
-     Author: Mark Koennecke, Juli 1997
-     Thoroughly revised: October 1997 Mark Koennecke
-     
-     Copyright:
-
-       Labor fuer Neutronenstreuung
-       Paul Scherrer Institut
-       CH-5423 Villigen-PSI
-
-
-      The authors hereby grant permission to use, copy, modify, distribute,
-      and license this software and its documentation for any purpose, provided
-      that existing copyright notices are retained in all copies and that this
-      notice is included verbatim in any distributions. No written agreement,
-      license, or royalty fee is required for any of the authorized uses.
-      Modifications to this software may be copyrighted by their authors
-      and need not follow the licensing terms described here, provided that
-      the new terms are clearly indicated on the first page of each file where
-      they apply.
-
-      IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-      FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-      ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-      DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-      POSSIBILITY OF SUCH DAMAGE.
-
-      THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-      INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-      FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-      IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-      NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-      MODIFICATIONS.
-----------------------------------------------------------------------------*/
-#include "sics.h"
-#include <string.h>
-#include <math.h>
-#include <tcl.h>
-#include <time.h>
-#include "fortify.h"
-
-typedef struct __VelSelDriv *pVelSelDriv;
-
-#include "velodriv.h"
-#include "velodorn.h"
-#include "hardsup/serialsinq.h"
-#include "hardsup/el734_def.h"
-#include "hardsup/el734fix.h"
-#include "serialwait.h"
-
-/* VELO* MUST be the same as in velo.i!*/
-#define VELOREDO -1
-#define VELOFAIL  0
-#define VELOOK    1
-#define VSNOCON 0
-#define VSOK    1
-#define VSACCEL -7
-#define VSFAIL -2
-
-typedef enum {eStart, eRegel, eHalted} eVeloMode;
-#define RPMALIFE 3090
-
-/*----------------------------- The private data structure ---------------*/
- typedef struct{
-                char *pComputer;
-                int iPort;
-                int iChannel;
-                int iTimeOut;
-                int iLastError;
-                void *pData;
-                eVeloMode eVelo;
-                time_t  t_End;
-                float fTarget;
-                int iBusy;
-                float fLastRPM;
-                } Dornier, *pDornier;
-/*----------------------------------------------------------------------------*/
-
-  static int GetDornierPos(pVelSelDriv self, float *fPos)
-  {
-    pDornier pDorn = NULL;
-    DornierStatus DStatus;
-    int iRet;
-  
-    assert(self);
-    pDorn = (pDornier)self->pPrivate;
-    
-    if(pDorn->iBusy)
-    {
-       *fPos = pDorn->fLastRPM;
-       return 1;
-    }
-    
-    pDorn->iBusy = 1;
-    iRet = GetDornierStatus(&pDorn->pData, &DStatus);
-    pDorn->iBusy = 0;
-    if(iRet < 0)
-    {
-      *fPos = -9999.;
-      return 0;
-    }
-    *fPos = DStatus.cur_rpm;
-    pDorn->fLastRPM = DStatus.cur_rpm;
-    return 1;
-  } 
-/*--------------------------------------------------------------------------*/
-  static int DornierHalt(pVelSelDriv self)
-  {
-        pDornier pDorn = NULL;
-        int iRet;
-        char pCom[] = {"HAL"};
-        char pAnswer[80];
-        
-        assert(self);
-        pDorn = (pDornier)self->pPrivate;
-
-        iRet = SerialWriteRead(&pDorn->pData, pCom,pAnswer,79);
-/*        iRet = SerialSicsExecute(&pDorn->pData, pCom,pAnswer,79);
-*/
-        pDorn->eVelo = eHalted;
-        if(iRet != 1)
-        {
-          pDorn->iLastError = iRet;
-          return 0;
-        }
-        return 1;
-  }
-/*----------------------------------------------------------------------------*/
-  static int DornierRun(pVelSelDriv self, float fVal)
-  {
-      int iRet;
-      char pCommand[50], pAnswer[50];
-      pDornier pDorn = NULL;
-      
-      assert(self);
-      pDorn = (pDornier)self->pPrivate;    
-
-      /* less then zero, means halt in this case */
-      if(fVal < RPMALIFE)
-      {
-         DornierHalt(self);
-         return 1;
-      }
-      
-      /* if busy, wait until free */
-      while(pDorn->iBusy)
-      {
-         SicsWait(1);
-      }
-      
-      switch(pDorn->eVelo)
-      {
-        case eHalted:
-             strcpy(pCommand,"SST");
-             pDorn->fTarget = fVal;
-             pDorn->eVelo = eStart;
-             pDorn->t_End = time(NULL) + 1800; /* start time + 30 min */
-             break;
-        case eRegel:
-              sprintf(pCommand,"SDR %5u",(int)fVal);
-              pDorn->fTarget = fVal;
-              break;
-      }
-
-      pDorn->iBusy = 1;
-      iRet = SerialWriteRead(&pDorn->pData,pCommand,pAnswer,49);
-
-/*      iRet = SerialSicsExecute(&pDorn->pData,pCommand,pAnswer,49);
-*/
-      pDorn->iBusy = 0;
-      
-      if(iRet != 1)
-      {
-         pDorn->iLastError = iRet;
-         return 0;
-      }
-      return 1;
-  }
-/*--------------------------------------------------------------------------*/
-  static int DornierError(pVelSelDriv self, int *iCode, char *error, int iErrLen)
-  {
-      pDornier pDorn = NULL;
-      
-      assert(self);
-      pDorn = (pDornier)self->pPrivate;    
-
-      *iCode = pDorn->iLastError;
-      
-      switch(pDorn->iLastError)
-      {
-        case NOCOMMAND:
-                       strncpy(error,"No command was specified, internal error",iErrLen);
-                       break;
-        case ECHOMISSING:
-                       strncpy(error,"No echo received, may be busy",iErrLen);
-                       break;
-        case BADANALYSIS:
-                       strncpy(error,"Error analysing status messge",iErrLen);
-                       break;
-        case STARTTIMEOUT:
-                       strncpy(error,"Velocity Selector failed to start",iErrLen);
-                       break;               
-        default:
-                       SerialError(pDorn->iLastError,error,iErrLen);
-                       break;                                                     
-      }
-      return 1;
-  }
-/*---------------------------------------------------------------------------*/
-  static int DornierFixIt(pVelSelDriv self, int iError)
-  {
-        pDornier pDorn = NULL;
-        int iRet;
-        
-        assert(self);
-        pDorn = (pDornier)self->pPrivate;
-        
-        switch(iError)
-        {
-            /* network errors */
-            case NOCONNECTION:
-            case EL734__BAD_FLUSH:
-            case EL734__BAD_RECV:
-            case EL734__BAD_RECV_NET:
-            case EL734__BAD_RECV_UNKN:
-            case EL734__BAD_RECVLEN:
-            case EL734__BAD_RECV1:
-            case EL734__BAD_RECV1_PIPE:
-            case EL734__BAD_RNG:
-            case EL734__BAD_SEND:
-            case EL734__BAD_SEND_PIPE:
-            case EL734__BAD_SEND_NET:
-            case EL734__BAD_SEND_UNKN:
-            case EL734__BAD_SENDLEN:
-                      SerialClose(&pDorn->pData);
-                      iRet = SerialForceOpen(&pDorn->pData,pDorn->pComputer,
-                                        pDorn->iPort, pDorn->iChannel);
-                      if(iRet != 1)
-                      {
-                        return VELOREDO;
-                      }                 
-                      else
-                      {
-                        return VELOFAIL;
-                      }                 
-                      break;
-            /* handable protocoll errors */
-            case ECHOMISSING:
-            case EL734__BAD_TMO:
-            case -1:
-            case TIMEOUT:
-                      return VELOREDO;
-                      break;
-            case STARTTIMEOUT:
-                      return VELOFAIL;
-                      break;
-            case INVALIDSTATUS:
-                      return VELOREDO;
-                      break;
-            default:
-                      return VELOFAIL;
-                      break;                       
-        }
-        return VELOFAIL;
-  }
-/*--------------------------------------------------------------------------*/
-  static int DornierStat(pVelSelDriv self, int *iCode, float *fCur)
-  {
-        pDornier pDorn = NULL;
-        int iRet, iErrStat;
-        DornierStatus sStatus;
-        char pCommand[80];
-        char pAnswer[80];
-        float fDelta;
-        static int iCount = 0;
-        
-        assert(self);
-        pDorn = (pDornier)self->pPrivate;
-
-        /* if busy, return VSACCEL */
-        if(pDorn->iBusy)
-        {
-           *fCur = pDorn->fLastRPM;
-           return VSACCEL;
-        }
-
-        *iCode = ROTMOVE;
-        /* get the status */
-        pDorn->iBusy = 1;
-        iRet =  GetDornierStatus(&pDorn->pData,&sStatus);
-        pDorn->iBusy = 0;
-        if( iRet < 0)
-        {
-           iErrStat = DornierFixIt(self,iRet);
-           *iCode = 9384; /* ignore this one */
-           if(iErrStat == VELOREDO)
-           {
-             /* the velcocity selector will not respond when busy.
-                Therefore such cases are interpreted as busy!
-             */   
-             return VSACCEL;
-           }
-           else
-           {
-             /* this is what we got if there is network trouble */
-             return VELOFAIL;
-           }
-        }
-        
-             
-        /* some serious logic because of multi - modes */ 
-        switch(pDorn->eVelo)
-        {
-           case eStart:
-                       *iCode = ROTSTART;
-                       *fCur = 0.;
-                       if(sStatus.cur_rpm >= RPMALIFE)
-                       {
-                          sprintf(pCommand,"SDR %5u",(int)pDorn->fTarget);
-                          pDorn->iBusy = 1;
-                          iRet = SerialWriteRead(&pDorn->pData,pCommand,pAnswer,49);
-
-/*                          iRet = SerialSicsExecute(&pDorn->pData,pCommand,pAnswer,49);
-*/
-                          pDorn->iBusy = 0;
-                          pDorn->eVelo = eRegel;
-                          iCount = 0;
-                          if(iRet != 1)
-                          {
-                            pDorn->iLastError = iRet;
-                            return VELOFAIL;
-                          }
-                          return VSACCEL;
-                        }
-                        else
-                        {
-                          if(time(NULL) > pDorn->t_End)
-                          {
-                            pDorn->iLastError = STARTTIMEOUT;
-                            return VELOFAIL;
-                          }
-                          return VSACCEL;
-                        }
-                        break;
-           case eRegel:
-                       *iCode = ROTMOVE;
-                       *fCur  = (float)sStatus.cur_rpm;
-                       pDorn->fLastRPM = *fCur;
-                       fDelta = sStatus.cur_rpm - sStatus.nom_rpm;
-                       if(fDelta < 0)
-                       { 
-                         fDelta = - fDelta;
-                       }
-                       if(fDelta > self->fTolerance)
-                       {
-                         iCount = 0;
-                         return VSACCEL;
-                       }
-                       else
-                       {
-                         iCount++;
-                         if(iCount > 4)
-                         {
-                           return VSOK;
-                         }
-                         else
-                         {
-                            return VSACCEL;
-                         }   
-                       }
-                       
-           case eHalted:
-                       if(sStatus.iHz > 5)
-                       {
-                         *iCode = ROTMOVE;
-                         *fCur = (float)sStatus.cur_rpm;
-                         pDorn->fLastRPM = *fCur;
-                         return VSACCEL;
-                       }
-                       else
-                       {
-                         return VSOK;
-                       }
-                       break;             
-        }
-        return VELOOK;
-  }
-/*-------------------------------------------------------------------------*/
-  static int DornierText(pVelSelDriv self, char *pText, int iTextLen)
-  {
-        pDornier pDorn = NULL;
-        int iRet, iErrStat;
-        DornierStatus sStatus;
-        char pBueffel[1024];
-        char pHelp[80];
-        
-        assert(self);
-        pDorn = (pDornier)self->pPrivate;
-
-        /* get the status */
-        iRet =  GetDornierStatus(&pDorn->pData,&sStatus);
-        if(iRet < 0)
-        {
-           pDorn->iLastError = iRet;
-           return 0;
-        }
-
-         /* format it to a string */
-         sprintf(pHelp,"RPM: %d , should %d\n",sStatus.cur_rpm,sStatus.nom_rpm);
-         strcpy(pBueffel,pHelp);
-         sprintf(pHelp,"State:  %s\n",sStatus.rm);
-         strcat(pBueffel,pHelp);
-         sprintf(pHelp,"Current: %d\n",sStatus.pwr);
-         strcat(pBueffel,pHelp);
-         sprintf(pHelp,"Rotor T: %d, Housing T: %d\n",sStatus.rot_temp,
-                 sStatus.cont_temp);
-         strcat(pBueffel,pHelp);
-         sprintf(pHelp,"Cooling: In-T: %d, Out-T: %d, Flow: %f\n",
-                 sStatus.inl_temp,sStatus.outl_temp,sStatus.cool_wat);
-         strcat(pBueffel,pHelp);
-         sprintf(pHelp,"Vaccum: %f, Accel: %f",sStatus.vacuum, sStatus.accel);
-         strcat(pBueffel,pHelp);
-         
-         strncpy(pText,pBueffel, iTextLen);
-         return 1;                
-  }
-/*------------------------------------------------------------------------*/
-  static int SimSetRot(pVelSelDriv self, float fNew)
-  {
-    return 1;
-  }  
-/*------------------------------------------------------------------------*/
-  static int DornierLoss(pVelSelDriv self, float *fLoss)
-  {
-        pDornier pDorn = NULL;
-        int iRet, iErrStat, iDelta;
-        DornierStatus DStatus;
-        char pCommand[] = {"BRE"};
-        char pAnswer[80];
-        static int iCount;
-        static int iError;
-        
-        assert(self);
-        pDorn = (pDornier)self->pPrivate;
-
-        /* wait until not busy, to do it */
-        while(pDorn->iBusy)
-        {
-          SicsWait(1);
-        }
-
-        /* send a command */
-        pDorn->iBusy = 1;
-        iRet = SerialWriteRead(&pDorn->pData,pCommand,pAnswer,79);
-        pDorn->iBusy = 0;
-        if(iRet != 1)
-        {
-          pDorn->iLastError = iRet;
-          return 0;
-        }
-  
-        /* wait 10 seconds before doing anything */
-        SicsWait(10);       
-
-        /* loop until back to speed again */
-        for( ; ; )
-        {
-           iRet = GetDornierStatus(&pDorn->pData, &DStatus);
-           if(iRet)
-           {
-             iError = 0;
-             iDelta = DStatus.cur_rpm - DStatus.nom_rpm;
-             if(iDelta < 0)
-             {
-               iDelta = -iDelta;
-             }
-             if(iDelta < 15)
-             {
-               iCount++;
-               if(iCount > 4)
-               {
-                 break;
-               }
-             }
-             else
-             {
-               iCount = 0;
-             }
-           }
-           else
-           {
-             iError++;
-             if(iError > 10)
-             {
-               break;
-             }
-           }
-        }
-       
-             
-        *fLoss = DStatus.pwr;
-        return 1;  
-  }
-/*-------------------------------------------------------------------------*/
-  static void DornierKill(void *pData)
-  {
-     pDornier pDorn = NULL;
-     
-     pDorn = (pDornier)pData;
-     assert(pDorn);
-     
-     SerialSend(&pDorn->pData,"TTY");
-     SerialClose(&pDorn->pData);
-     if(pDorn->pComputer)
-     {
-       free(pDorn->pComputer);
-     }
-     free(pDorn);
-  }
-/*------------------------------------------------------------------------*/
-  static int DornierInit(pVelSelDriv self, SConnection *pCon)
-  {
-      pDornier pDorn = NULL;
-      int iRet, iError;
-      char pError[80], pBueffel[256];
-      
-      assert(self);
-      pDorn = (pDornier)self->pPrivate;
-      assert(pDorn);
-      
-      /* if there is no connection, open it */
-      if(!pDorn->pData)
-      {
-         iRet = SerialForceOpen(&pDorn->pData, pDorn->pComputer, 
-                           pDorn->iPort, pDorn->iChannel);
-         if(iRet != 1)
-         {
-             SerialError(iRet,pError,79);
-             sprintf(pBueffel,"ERROR: %s when initialising Velocity selector",
-                     pError);
-             SCWrite(pCon,pBueffel,eError);
-             return 0;           
-         } 
-         SerialConfig(&pDorn->pData,pDorn->iTimeOut);           
-         SerialATerm(&pDorn->pData,"1\r");
-         SerialSendTerm(&pDorn->pData,"\n");
-      }
-
-      /* tell him that we want control */
-      iRet = DornierSend(&pDorn->pData,"REM",pError,79);
-      if(iRet != 1)
-      {
-        sprintf(pBueffel,"ERROR: %s while switching velocity selector to remote",
-                pError);
-        SCWrite(pCon,pBueffel,eError);
-        return 1;        
-      }
-      pDorn->eVelo = eHalted;
-      pDorn->iBusy = 0;
-      
-      return 1;   
-  }    
-/*-------------------------------------------------------------------------*/
-    pVelSelDriv  VSCreateDornierSINQ(char *name, Tcl_Interp *pTcl)
-    {
-      pVelSelDriv pNew = NULL;
-      pDornier pDorn = NULL;
-      char *pPtr = NULL;
-      int iVal, iRet;
-      
-      /* the most likely error is the parameters specified are wrong!
-         So check this first. We''ll use Tcl's result for error reporting.
-         name is the name of an Tcl array which should hold the info
-         necessary 
-      */       
-      
-      /* allocate a Dornier structure */
-      pDorn = (pDornier)malloc(sizeof(Dornier));
-      if(!pDorn)
-      {
-        return NULL;
-      }
-      memset(pDorn,0,sizeof(Dornier));
-      
-      /* host name */
-      pPtr = Tcl_GetVar2(pTcl,name,"Host",TCL_GLOBAL_ONLY);
-      if(!pPtr)
-      {
-        Tcl_AppendResult(pTcl,"ERROR: no hostname found in",name,NULL);
-        free(pDorn);
-        return NULL;
-      }
-      pDorn->pComputer = strdup(pPtr);
-      
-      /* port number */
-      pPtr = Tcl_GetVar2(pTcl,name,"Port",TCL_GLOBAL_ONLY);
-      if(!pPtr)
-      {
-        Tcl_AppendResult(pTcl,"ERROR: no port number found in",name,NULL);
-        free(pDorn);
-        return NULL;
-      }
-      iRet = Tcl_GetInt(pTcl,pPtr,&iVal);
-      if(iRet != TCL_OK)
-      {
-        free(pDorn->pComputer);
-        free(pDorn);
-        return NULL;
-      }
-      pDorn->iPort = iVal;
-      
-      /* channel number */
-      pPtr = Tcl_GetVar2(pTcl,name,"Channel",TCL_GLOBAL_ONLY);
-      if(!pPtr)
-      {
-        Tcl_AppendResult(pTcl,"ERROR: no channel number found in",name,NULL);
-        free(pDorn);
-        return NULL;
-      }
-      iRet = Tcl_GetInt(pTcl,pPtr,&iVal);
-      if(iRet != TCL_OK)
-      {
-        free(pDorn->pComputer);
-        free(pDorn);
-        return NULL;
-      }
-      pDorn->iChannel = iVal;
-      
-      /* time out. This one gets defaulted when not specified */
-      pPtr = Tcl_GetVar2(pTcl,name,"Timeout",TCL_GLOBAL_ONLY);
-      if(!pPtr)
-      {
-         pDorn->iTimeOut = 1000;
-      }
-      else
-      {
-         iRet = Tcl_GetInt(pTcl,pPtr,&iVal);
-         if(iRet != TCL_OK)
-         {
-           pDorn->iTimeOut = 1000;
-         }
-         pDorn->iTimeOut = iVal;
-       }
-      
-      /* business as usual: allocate memory */
-      pNew = (pVelSelDriv)malloc(sizeof(VelSelDriv));
-      if(!pNew)
-      {
-        return NULL;
-      }
-
-      /* zero the world */
-      memset(pNew,0,sizeof(VelSelDriv));
-      pNew->pPrivate = pDorn;
-      
-      /* initialise function pointers */
-      pNew->DeletePrivate = DornierKill;
-      pNew->Halt = DornierHalt;
-      pNew->GetError = DornierError;
-      pNew->TryAndFixIt = DornierFixIt;
-      pNew->GetRotation = GetDornierPos;
-      pNew->SetRotation = DornierRun;
-      pNew->GetStatus   = DornierStat;
-      pNew->GetDriverText = DornierText;
-      pNew->GetLossCurrent = DornierLoss;
-      pNew->Init           = DornierInit;
-      
-      /* done it */
-      return pNew;
-    }     
-
diff --git a/velodriv.h b/velodriv.h
index 9ca1a20e..00fde0d5 100644
--- a/velodriv.h
+++ b/velodriv.h
@@ -44,8 +44,6 @@
 
 /*-------------------- live & death ----------------------------------------*/
   pVelSelDriv VSCreateSim(void);
-  pVelSelDriv VSCreateDornierSINQ(char *name,Tcl_Interp *pTcl);
-
   void        VSDeleteDriver(pVelSelDriv self);
 
 #endif