- First working version of the triple axis UB matrix code

tasub.w

@@ -17,9 +17,6 @@ This module handles the calculations typical for a triple axis spectrometer.
 A data structure:
 @d tasubdat @{
 /*------------------- defines for tasMode -----------------------------------*/
-#define KICONST 1
-#define KFCONST 2
-/*-----------------------------------------------------------------------------*/
 	typedef struct{
 		pObjectDescriptor pDes;
 		tasMachine machine;
@@ -56,16 +53,6 @@ A data structure:
 
 For the virtual motors, there must be a data structure, too:
 @d tasubmotdat @{
-/*----------------------- defines for virtual motors -----------------------------*/
-#define EI 1
-#define KI 2
-#define QH 3
-#define QK 4
-#define QL 5
-#define EF 6
-#define KF 7
-#define EN 8
-#define QM 9
 /*--------------------- the tas virtual motor data structure ---------------------*/
 typedef struct {
 	pObjectDescriptor pDes;
@@ -88,8 +75,6 @@ int TasUBFactory(SConnection *pCon,SicsInterp *pSics, void *pData,
                 int argc, char *argv[]);
 int TasUBWrapper(SConnection *pCon,SicsInterp *pSics, void *pData,                
                 int argc, char *argv[]);
-int TasMot(SConnection *pCon,SicsInterp *pSics, void *pData,                
-                int argc, char *argv[]);
 
 @}
 
@@ -113,4 +98,22 @@ int TasMot(SConnection *pCon,SicsInterp *pSics, void *pData,
 /*--------------------------------------------------------------------*/
 @<tasubint@>
 #endif 
-@}
+@}
+@o tasdrive.h @{
+/*---------------------------------------------------------------------
+ SICS interface to the triple axis drivable motors.
+
+ copyright: see file COPYRIGHT
+
+ Mark Koennecke, May 2005
+--------------------------------------------------------------------*/
+#ifndef TASDRIV
+#define TASDRIV
+#include "tasub.h"
+
+int InstallTasMotor(SicsInterp *pSics, ptasUB self, int tasVar, char *name);
+int InstallTasQMMotor(SicsInterp *pSics, ptasUB self);
+int TasMot(SConnection *pCon,SicsInterp *pSics, void *pData,                
+                int argc, char *argv[]);
+#endif
+@}