eigerServerMakefile

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@580 951219d9-93cf-4727-9268-0efd64621fa3

slsDetectorSoftware/eigerDetectorServer/Makefile

@@ -6,7 +6,7 @@ PROGS		= 	eigerDetectorServer
 DESTDIR		?= 	bin
 INSTMODE	= 	0777
 
-SRC_CLNT	=	slsDetectorServer.c slsDetectorServer_funcs.c communication_funcs.c slsDetector_firmware.c slsDetectorFunctionList.c 
+SRC_CLNT	=	slsDetectorServer.c slsDetectorServer_funcs.c communication_funcs.c #slsDetectorFunctionList.c 
 OBJS 		= 	$(SRC_CLNT:.cpp=.o) 
 
 

slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h

@@ -14,7 +14,7 @@
 #define GOODBYE 		-200
 
 
-/* examples
+/* examples*/
 #define NCHAN 			1
 #define NCHIP 			1
 #define NDAC 			1
@@ -24,7 +24,7 @@
 #define NMAXMOD 		NMAXMODX*NMAXMODY
 #define NCHANS 			NCHAN*NCHIP*NMAXMOD
 #define NDACS 			NDAC*NMAXMOD
-*/
+
 
 
 

slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp

@@ -163,19 +163,28 @@ int64_t slsDetectorUsers::setDelayAfterTrigger(int64_t t){
   return myDetector->setDelayAfterTrigger(t);
 }
 
-double slsDetectorUsers::setExposureTime(double t){
+double slsDetectorUsers::setExposureTime(double t, bool inseconds){
-  int64_t tms = t * 1E+9;
+	int64_t tms = t * (1E+9);
-  return  1E-9 * (double)myDetector->setExposureTime(tms);
+  if(inseconds)
+	  return myDetector->setExposureTime(t);
+  else
+	  return  ((1E-9) * (double)myDetector->setExposureTime(tms));
 }
 
-double slsDetectorUsers::setExposurePeriod(double t){
+double slsDetectorUsers::setExposurePeriod(double t, bool inseconds){
-  int64_t tms = t * 1E+9;
+	int64_t tms = t * (1E+9);
-  return  1E-9 * (double)myDetector->setExposurePeriod(tms);
+  if(inseconds)
+	  return myDetector->setExposureTime(t);
+  else
+	  return  ((1E-9) * (double)myDetector->setExposurePeriod(tms));
 }
 
-double slsDetectorUsers::setDelayAfterTrigger(double t){
+double slsDetectorUsers::setDelayAfterTrigger(double t, bool inseconds){
-  int64_t tms = t * 1E+9;
+  int64_t tms = t * (1E+9);
-  return 1E-9 * (double)(myDetector->setDelayAfterTrigger(tms));
+  if(inseconds)
+	  return myDetector->setExposureTime(t);
+  else
+	  return  ((1E-9) * (double)myDetector->setDelayAfterTrigger(tms));
 }
 
 int64_t slsDetectorUsers::setNumberOfGates(int64_t t){

slsDetectorSoftware/slsDetector/slsDetectorUsers.h

@@ -313,49 +313,30 @@ class slsDetectorUsers
   */
    int setBeamEnergy(int e_eV);
 
-  /** 
-           @short set/get exposure time value
-      \param t time in ns  (-1 gets)
-      \returns timer set value in ns
-  */
-
-   int64_t setExposureTime(int64_t t=-1);
-
-  /** 
-       @short set/get exposure period
-      \param t time in ns   (-1 gets)
-      \returns timer set value in ns
-  */
-   int64_t setExposurePeriod(int64_t t=-1);
-  
-  /** 
-       @short set/get delay after trigger
-      \param t time in ns   (-1 gets)
-      \returns timer set value in ns
-  */
-   int64_t setDelayAfterTrigger(int64_t t=-1);
-
    /**
         @short set/get exposure time value
-        \param t time in s  (-1 gets)
+        \param t time in sn  (-1 gets)
-        \returns timer set value in s
+        \param inseconds true if the value is in s, else ns
+        \returns timer set value in ns, or s if specified
     */
 
-   double setExposureTime(double t=-1);
+   double setExposureTime(double t=-1, bool inseconds=false);
 
     /**
          @short set/get exposure period
-        \param t time in s   (-1 gets)
+        \param t time in ns   (-1 gets)
-        \returns timer set value in s
+        \param inseconds true if the value is in s, else ns
+        \returns timer set value in ns, or s if specified
     */
-   double setExposurePeriod(double t=-1);
+   double setExposurePeriod(double t=-1, bool inseconds=false);
 
     /**
          @short set/get delay after trigger
-        \param t time in s   (-1 gets)
+        \param t time in ns   (-1 gets)
-        \returns timer set value in s
+        \param inseconds true if the value is in s, else ns
+        \returns timer set value in ns, or s if specified
     */
-   double setDelayAfterTrigger(double t=-1);
+   double setDelayAfterTrigger(double t=-1, bool inseconds=false);
 
   /** 
        @short set/get number of gates

slsDetectorSoftware/slsDetectorServer/slsDetectorServer.c

@@ -20,11 +20,10 @@ void error(char *msg){
 
 int main(int argc, char *argv[]){
 	int  portno, b;
-	char cmd[100];
 	int retval=OK;
 	int sd, fd;
-
 #ifdef STOP_SERVER
+	char cmd[100];
 	if (argc==1) {
 #endif
 		portno = DEFAULT_PORTNO;