Merge branch 'm3dacfix' of github.com:slsdetectorgroup/slsDetectorPackage into m3dacfix

examples/moench03_T1.config

@@ -1,7 +1,8 @@
-initialchecks 0
+#initialchecks 0
 #############################################
 ### edit with hostname or IP address of your detector 
 ############################################
+#hostname bchip181+
 hostname bchip181+
 
 #############################################
@@ -27,7 +28,7 @@ rx_zmqport 50003
 #############################################
 ### edit with 1 Gbs IP of PC where you will run the GUI
 ############################################
-zmqip 129.129.202.136
+zmqip 129.129.202.98
 zmqport 50001
 
 
@@ -39,11 +40,12 @@ rx_zmqstream 1
 
 frames 100000
 period 0.0006
+exptime 0.00035
 
 #############################################
 ### edit with directory you want to write to
 ############################################
-fpath /mnt/moench_data/scratch/
+fpath /mnt/moench_data/scratch1/
 
 fwrite 0
 

slsDetectorCalibration/interpolations/slsInterpolation.h

@@ -447,19 +447,6 @@ class slsInterpolation
       etax=(-l+r)/sum;
       etay=(-b+t)/sum;
     }
-    /* if (etax<-1 || etax>1 || etay<-1 || etay>1) { */
-    /*   cout << "**********" << etax << " " << etay << endl; */
-    /*    for (int ix=0; ix<3; ix++) { */
-    /*   for (int iy=0; iy<3; iy++) { */
-    /* 	cout << cl[iy+3*ix] << "\t" ; */
-
-    /*   } */
-    /*   cout << endl; */
-    /* } */
-    /*    cout << sum << " " << l << " " << r << " " << t << " " << b << endl; */
-
-    /* } */
-
 
     if (etax>=0 && etay>=0)
       return TOP_RIGHT;
@@ -479,6 +466,29 @@ class slsInterpolation
   }
 
 
+
+  static int calcEta3X(double *cl, double &etax, double &etay, double &sum) {
+    double l,r,t,b;
+    sum=cl[0]+cl[1]+cl[2]+cl[3]+cl[4]+cl[5]+cl[6]+cl[7]+cl[8];
+    if (sum>0) {
+      l=cl[3];
+      r=cl[5];
+      b=cl[1];
+      t=cl[7];
+      etax=(-l+r)/sum;
+      etay=(-b+t)/sum;
+    }
+    return -1;
+  }
+
+  static int calcEta3X(int *cl, double &etax, double &etay, double &sum) {
+    double cli[9];
+    for (int ix=0; ix<9; ix++) cli[ix]=cl[ix];
+    
+    return calcEta3X(cli, etax, etay, sum);
+  }
+
+
   /* static int calcMyEta(double totquad, int quad, double *cl, double &etax, double &etay) { */
   /*   double l,r,t,b, sum; */
   /*   int yoff; */
@@ -537,21 +547,6 @@ class slsInterpolation
 
 
 
-  /* static int calcEta3X(double *cl, double &etax, double &etay, double &sum) { */
-  /*   double l,r,t,b; */
-  /*   sum=cl[0]+cl[1]+cl[2]+cl[3]+cl[4]+cl[5]+cl[6]+cl[7]+cl[8]; */
-  /*   if (sum>0) { */
-  /*     l=cl[3]; */
-  /*     r=cl[5]; */
-  /*     b=cl[1]; */
-  /*     t=cl[7]; */
-  /*     etax=(-l+r)/sum; */
-  /*     etay=(-b+t)/sum; */
-  /*   } */
-  /*   return -1; */
-  /* } */
-
-
   /* static int calcEta3X(int *cl, double &etax, double &etay, double &sum) { */
   /*   double l,r,t,b; */
   /*   sum=cl[0]+cl[1]+cl[2]+cl[3]+cl[4]+cl[5]+cl[6]+cl[7]+cl[8]; */