- Removed support for slit5 from amorset

amorset.c

@@ -6,6 +6,10 @@
  copyright: see file COPYRIGHT
  
  Mark Koennecke, October 2005
+ 
+ Commented supprot for slit 5 away as this is gone now
+ 
+ Mark Koennecke, March 2009
 --------------------------------------------------------------------*/
 #include <stdlib.h>
 #include <assert.h>
@@ -50,11 +54,13 @@ static int readMotors(pamorSet self, SConnection * pCon)
     SCWrite(pCon, "ERROR: configuration error: d4t not found", eError);
     return -1;
   }
+  /*
   status = addMotorToList(result, "d5t", .0);
   if (status != 1) {
     SCWrite(pCon, "ERROR: configuration error: d5t not found", eError);
     return -1;
   }
+  */
   val = self->listDrive->GetValue(&result, pCon);
   if (val < -99999) {
     LLDdelete(result);
@@ -178,6 +184,7 @@ static int calcAmorSettings(pamorSet self, SConnection * pCon)
   /*
    * slit 5
    */
+  /*
   if (self->D5.activeFlag == 1) {
     dist = ABS(calcCompPosition(&self->D5) - calcCompPosition(&self->S));
     mot = getListMotorPosition(readList, "d5t");
@@ -189,7 +196,8 @@ static int calcAmorSettings(pamorSet self, SConnection * pCon)
       addMotorToList(self->driveList, "d5b", val);
     }
   }
-
+*/
+  
   /*
    * Analyzer
    */
@@ -413,7 +421,9 @@ 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, "slit5", &self->D5);
+  */
   saveAmorComp(fd, name, "ana", &self->A);
   saveAmorComp(fd, name, "detector", &self->D);
   return 1;
@@ -480,14 +490,15 @@ static int testRequiredMotors(SConnection * pCon)
     "d1t", "d1b",
     "d2b", "d2t",
     "d3b", "d3t", "d4b", "d4t",
-    "d5t", "d5b", "aoz", "aom"
+     "aoz", "aom"
-  };
+  }; /* removed d5b, d5t from this list */
+  
   int i = 0, status = 1;
   pMotor pMot = NULL;
   char pBueffel[132];
 
 
-  for (i = 0; i < 17; i++) {
+  for (i = 0; i < 15; i++) {
     pMot = NULL;
     pMot = FindMotor(pServ->pSics, motList[i]);
     if (pMot == NULL) {
@@ -576,8 +587,10 @@ static pamorComp locateComponent(pamorSet self, char *name)
     return &self->S;
   } else if (strcmp(name, "slit4") == 0) {
     return &self->D4;
+ /*
   } else if (strcmp(name, "slit5") == 0) {
     return &self->D5;
+ */
   } else if (strcmp(name, "detector") == 0) {
     return &self->D;
   } else if (strcmp(name, "ana") == 0) {

sinqhttp.c

@@ -428,7 +428,6 @@ static int SinqHttpStatus(pHistDriver self, SConnection * pCon)
     break;
   }
 
-
   status = readStatus(self);
   if (status != 1) {
     return HWFault;