- Fixed a normalisation problem in diffscan when the first value

did not have enough counts
- Reduced polling frequency in emon
- Fixed a scriptcontext bug which would cause it to dump core in SctTransact
  on interrupts
- Fixed an issue with missing <nl> at the end of batch files
- Added a feature which does not call halt when counting stops in hmcontrol.c
  This is necessary for the BOA CCD
- Initalized doNotFree properly in hipadaba.c
- Added the travelling salesman reflection measurement algorithm
- Added another component to amorset
- Removed old SicsWait from nserver.c
- Added a means to nxscript to write 16 bit data for BOA
- Modified tasub to accept a drivabel as a motor and not only a motor.
  This became necessary to make EIGER work as A2 on EIGER is a virtual
  motor

amorset.c

@@ -10,6 +10,10 @@
  Commented support for slit 5 away as this is gone now
  
  Mark Koennecke, March 2009
+
+ Added elliptic guide,
+
+ Mark Koennecke, August 2011
 --------------------------------------------------------------------*/
 #include <stdlib.h>
 #include <assert.h>
@@ -152,9 +156,6 @@ static int calcAmorSettings(pamorSet self, SConnection * pCon)
     }
   }
 
-
-
-
   /*
    * slit 5
    */
@@ -227,6 +228,7 @@ static int calcAmorSettings(pamorSet self, SConnection * pCon)
       addMotorToList(self->driveList, "d4b", val);
     }
   }
+  printMotorList(self->driveList,pCon);
 
   LLDdelete(readList);
   self->mustDrive = 0;
@@ -452,6 +454,7 @@ static int amorSetSave(void *data, char *name, FILE * fd)
   saveAmorComp(fd, name, "slit3", &self->D3);
   saveAmorComp(fd, name, "sample", &self->S);
   saveAmorComp(fd, name, "slit4", &self->D4);
+  saveAmorComp(fd, name, "lens", &self->EL);
   /*
   saveAmorComp(fd, name, "slit5", &self->D5);
   */
@@ -513,7 +516,7 @@ static void killAmorSet(void *data)
   free(self);
 }
 
-/*-------------------------------------------------------------------*/
+/*---------------------------------------------------------------*/
 static int testRequiredMotors(SConnection * pCon)
 {
   char motList[][20] = { "soz", "com",
@@ -529,7 +532,7 @@ static int testRequiredMotors(SConnection * pCon)
   char pBueffel[132];
 
 
-  for (i = 0; i < 15; i++) {
+  for(i = 0; i < 15; i++) {
     pMot = NULL;
     pMot = FindMotor(pServ->pSics, motList[i]);
     if (pMot == NULL) {
@@ -614,6 +617,8 @@ static pamorComp locateComponent(pamorSet self, char *name)
     return &self->D2;
   } else if (strcmp(name, "slit3") == 0) {
     return &self->D3;
+  } else if (strcmp(name, "lens") == 0) {
+    return &self->EL;
   } else if (strcmp(name, "sample") == 0) {
     return &self->S;
   } else if (strcmp(name, "slit4") == 0) {