diff --git a/examples/moench03_T1.config b/examples/moench03_T1.config
index a67fca6ce..e51643b29 100644
--- a/examples/moench03_T1.config
+++ b/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
 
diff --git a/settingsdir/mythen3/fast/11200eV/trim.sn0000 b/settingsdir/mythen3/fast/11200eV/trim.sn0000
deleted file mode 100644
index e82819eba..000000000
Binary files a/settingsdir/mythen3/fast/11200eV/trim.sn0000 and /dev/null differ
diff --git a/settingsdir/mythen3/fast/11200eV/trim.snxxxx b/settingsdir/mythen3/fast/11200eV/trim.snxxxx
deleted file mode 100644
index e82819eba..000000000
Binary files a/settingsdir/mythen3/fast/11200eV/trim.snxxxx and /dev/null differ
diff --git a/settingsdir/mythen3/fast/12000eV/trim.sn0000 b/settingsdir/mythen3/fast/12000eV/trim.sn0000
new file mode 100644
index 000000000..14c7074fc
Binary files /dev/null and b/settingsdir/mythen3/fast/12000eV/trim.sn0000 differ
diff --git a/settingsdir/mythen3/fast/4000eV/trim.sn0000 b/settingsdir/mythen3/fast/4000eV/trim.sn0000
new file mode 100644
index 000000000..de315dc1f
Binary files /dev/null and b/settingsdir/mythen3/fast/4000eV/trim.sn0000 differ
diff --git a/settingsdir/mythen3/fast/4500eV/trim.sn0000 b/settingsdir/mythen3/fast/4500eV/trim.sn0000
deleted file mode 100644
index 30f6400a2..000000000
Binary files a/settingsdir/mythen3/fast/4500eV/trim.sn0000 and /dev/null differ
diff --git a/settingsdir/mythen3/fast/4500eV/trim.snxxxx b/settingsdir/mythen3/fast/4500eV/trim.snxxxx
deleted file mode 100644
index 30f6400a2..000000000
Binary files a/settingsdir/mythen3/fast/4500eV/trim.snxxxx and /dev/null differ
diff --git a/settingsdir/mythen3/fast/5400eV/trim.sn0000 b/settingsdir/mythen3/fast/5400eV/trim.sn0000
deleted file mode 100644
index bd2169933..000000000
Binary files a/settingsdir/mythen3/fast/5400eV/trim.sn0000 and /dev/null differ
diff --git a/settingsdir/mythen3/fast/5400eV/trim.snxxxx b/settingsdir/mythen3/fast/5400eV/trim.snxxxx
deleted file mode 100644
index bd2169933..000000000
Binary files a/settingsdir/mythen3/fast/5400eV/trim.snxxxx and /dev/null differ
diff --git a/settingsdir/mythen3/fast/6000eV/trim.sn0000 b/settingsdir/mythen3/fast/6000eV/trim.sn0000
new file mode 100644
index 000000000..d18ae5013
Binary files /dev/null and b/settingsdir/mythen3/fast/6000eV/trim.sn0000 differ
diff --git a/settingsdir/mythen3/fast/6400eV/trim.sn0000 b/settingsdir/mythen3/fast/6400eV/trim.sn0000
deleted file mode 100644
index 3210033e2..000000000
Binary files a/settingsdir/mythen3/fast/6400eV/trim.sn0000 and /dev/null differ
diff --git a/settingsdir/mythen3/fast/6400eV/trim.snxxxx b/settingsdir/mythen3/fast/6400eV/trim.snxxxx
deleted file mode 100644
index 3210033e2..000000000
Binary files a/settingsdir/mythen3/fast/6400eV/trim.snxxxx and /dev/null differ
diff --git a/settingsdir/mythen3/fast/8000eV/trim.sn0000 b/settingsdir/mythen3/fast/8000eV/trim.sn0000
index b5bf94569..cc6a3c5f4 100644
Binary files a/settingsdir/mythen3/fast/8000eV/trim.sn0000 and b/settingsdir/mythen3/fast/8000eV/trim.sn0000 differ
diff --git a/settingsdir/mythen3/fast/8000eV/trim.snxxxx b/settingsdir/mythen3/fast/8000eV/trim.snxxxx
deleted file mode 100644
index b5bf94569..000000000
Binary files a/settingsdir/mythen3/fast/8000eV/trim.snxxxx and /dev/null differ
diff --git a/settingsdir/mythen3/fast/9900eV/trim.sn0000 b/settingsdir/mythen3/fast/9900eV/trim.sn0000
deleted file mode 100644
index cb986b6a7..000000000
Binary files a/settingsdir/mythen3/fast/9900eV/trim.sn0000 and /dev/null differ
diff --git a/settingsdir/mythen3/fast/9900eV/trim.snxxxx b/settingsdir/mythen3/fast/9900eV/trim.snxxxx
deleted file mode 100644
index cb986b6a7..000000000
Binary files a/settingsdir/mythen3/fast/9900eV/trim.snxxxx and /dev/null differ
diff --git a/settingsdir/mythen3/highgain/11200eV/trim.sn0000 b/settingsdir/mythen3/highgain/11200eV/trim.sn0000
deleted file mode 100644
index e82819eba..000000000
Binary files a/settingsdir/mythen3/highgain/11200eV/trim.sn0000 and /dev/null differ
diff --git a/settingsdir/mythen3/highgain/11200eV/trim.snxxxx b/settingsdir/mythen3/highgain/11200eV/trim.snxxxx
deleted file mode 100644
index e82819eba..000000000
Binary files a/settingsdir/mythen3/highgain/11200eV/trim.snxxxx and /dev/null differ
diff --git a/settingsdir/mythen3/highgain/12000eV/trim.sn0000 b/settingsdir/mythen3/highgain/12000eV/trim.sn0000
new file mode 100644
index 000000000..08ecc6cca
Binary files /dev/null and b/settingsdir/mythen3/highgain/12000eV/trim.sn0000 differ
diff --git a/settingsdir/mythen3/highgain/4000eV/trim.sn0000 b/settingsdir/mythen3/highgain/4000eV/trim.sn0000
new file mode 100644
index 000000000..440b0518a
Binary files /dev/null and b/settingsdir/mythen3/highgain/4000eV/trim.sn0000 differ
diff --git a/settingsdir/mythen3/highgain/4500eV/trim.sn0000 b/settingsdir/mythen3/highgain/4500eV/trim.sn0000
deleted file mode 100644
index 30f6400a2..000000000
Binary files a/settingsdir/mythen3/highgain/4500eV/trim.sn0000 and /dev/null differ
diff --git a/settingsdir/mythen3/highgain/4500eV/trim.snxxxx b/settingsdir/mythen3/highgain/4500eV/trim.snxxxx
deleted file mode 100644
index 30f6400a2..000000000
Binary files a/settingsdir/mythen3/highgain/4500eV/trim.snxxxx and /dev/null differ
diff --git a/settingsdir/mythen3/highgain/5400eV/trim.sn0000 b/settingsdir/mythen3/highgain/5400eV/trim.sn0000
deleted file mode 100644
index bd2169933..000000000
Binary files a/settingsdir/mythen3/highgain/5400eV/trim.sn0000 and /dev/null differ
diff --git a/settingsdir/mythen3/highgain/5400eV/trim.snxxxx b/settingsdir/mythen3/highgain/5400eV/trim.snxxxx
deleted file mode 100644
index bd2169933..000000000
Binary files a/settingsdir/mythen3/highgain/5400eV/trim.snxxxx and /dev/null differ
diff --git a/settingsdir/mythen3/highgain/6000eV/trim.sn0000 b/settingsdir/mythen3/highgain/6000eV/trim.sn0000
new file mode 100644
index 000000000..5a02d1ecc
Binary files /dev/null and b/settingsdir/mythen3/highgain/6000eV/trim.sn0000 differ
diff --git a/settingsdir/mythen3/highgain/6400eV/trim.sn0000 b/settingsdir/mythen3/highgain/6400eV/trim.sn0000
deleted file mode 100644
index 3210033e2..000000000
Binary files a/settingsdir/mythen3/highgain/6400eV/trim.sn0000 and /dev/null differ
diff --git a/settingsdir/mythen3/highgain/6400eV/trim.snxxxx b/settingsdir/mythen3/highgain/6400eV/trim.snxxxx
deleted file mode 100644
index 3210033e2..000000000
Binary files a/settingsdir/mythen3/highgain/6400eV/trim.snxxxx and /dev/null differ
diff --git a/settingsdir/mythen3/highgain/8000eV/trim.sn0000 b/settingsdir/mythen3/highgain/8000eV/trim.sn0000
index b5bf94569..09408f420 100644
Binary files a/settingsdir/mythen3/highgain/8000eV/trim.sn0000 and b/settingsdir/mythen3/highgain/8000eV/trim.sn0000 differ
diff --git a/settingsdir/mythen3/highgain/8000eV/trim.snxxxx b/settingsdir/mythen3/highgain/8000eV/trim.snxxxx
deleted file mode 100644
index b5bf94569..000000000
Binary files a/settingsdir/mythen3/highgain/8000eV/trim.snxxxx and /dev/null differ
diff --git a/settingsdir/mythen3/highgain/9900eV/trim.sn0000 b/settingsdir/mythen3/highgain/9900eV/trim.sn0000
deleted file mode 100644
index cb986b6a7..000000000
Binary files a/settingsdir/mythen3/highgain/9900eV/trim.sn0000 and /dev/null differ
diff --git a/settingsdir/mythen3/highgain/9900eV/trim.snxxxx b/settingsdir/mythen3/highgain/9900eV/trim.snxxxx
deleted file mode 100644
index cb986b6a7..000000000
Binary files a/settingsdir/mythen3/highgain/9900eV/trim.snxxxx and /dev/null differ
diff --git a/settingsdir/mythen3/standard/11200eV/trim.sn0000 b/settingsdir/mythen3/standard/11200eV/trim.sn0000
deleted file mode 100644
index e82819eba..000000000
Binary files a/settingsdir/mythen3/standard/11200eV/trim.sn0000 and /dev/null differ
diff --git a/settingsdir/mythen3/standard/11200eV/trim.snxxxx b/settingsdir/mythen3/standard/11200eV/trim.snxxxx
deleted file mode 100644
index e82819eba..000000000
Binary files a/settingsdir/mythen3/standard/11200eV/trim.snxxxx and /dev/null differ
diff --git a/settingsdir/mythen3/standard/12000eV/trim.sn0000 b/settingsdir/mythen3/standard/12000eV/trim.sn0000
new file mode 100644
index 000000000..47ef29619
Binary files /dev/null and b/settingsdir/mythen3/standard/12000eV/trim.sn0000 differ
diff --git a/settingsdir/mythen3/standard/4000eV/trim.sn0000 b/settingsdir/mythen3/standard/4000eV/trim.sn0000
new file mode 100644
index 000000000..69e9b0f57
Binary files /dev/null and b/settingsdir/mythen3/standard/4000eV/trim.sn0000 differ
diff --git a/settingsdir/mythen3/standard/4500eV/trim.sn0000 b/settingsdir/mythen3/standard/4500eV/trim.sn0000
deleted file mode 100644
index 30f6400a2..000000000
Binary files a/settingsdir/mythen3/standard/4500eV/trim.sn0000 and /dev/null differ
diff --git a/settingsdir/mythen3/standard/4500eV/trim.snxxxx b/settingsdir/mythen3/standard/4500eV/trim.snxxxx
deleted file mode 100644
index 30f6400a2..000000000
Binary files a/settingsdir/mythen3/standard/4500eV/trim.snxxxx and /dev/null differ
diff --git a/settingsdir/mythen3/standard/5400eV/trim.sn0000 b/settingsdir/mythen3/standard/5400eV/trim.sn0000
deleted file mode 100644
index bd2169933..000000000
Binary files a/settingsdir/mythen3/standard/5400eV/trim.sn0000 and /dev/null differ
diff --git a/settingsdir/mythen3/standard/5400eV/trim.snxxxx b/settingsdir/mythen3/standard/5400eV/trim.snxxxx
deleted file mode 100644
index bd2169933..000000000
Binary files a/settingsdir/mythen3/standard/5400eV/trim.snxxxx and /dev/null differ
diff --git a/settingsdir/mythen3/standard/6000eV/trim.sn0000 b/settingsdir/mythen3/standard/6000eV/trim.sn0000
new file mode 100644
index 000000000..103a0fb57
Binary files /dev/null and b/settingsdir/mythen3/standard/6000eV/trim.sn0000 differ
diff --git a/settingsdir/mythen3/standard/6400eV/trim.sn0000 b/settingsdir/mythen3/standard/6400eV/trim.sn0000
deleted file mode 100644
index 3210033e2..000000000
Binary files a/settingsdir/mythen3/standard/6400eV/trim.sn0000 and /dev/null differ
diff --git a/settingsdir/mythen3/standard/6400eV/trim.snxxxx b/settingsdir/mythen3/standard/6400eV/trim.snxxxx
deleted file mode 100644
index 3210033e2..000000000
Binary files a/settingsdir/mythen3/standard/6400eV/trim.snxxxx and /dev/null differ
diff --git a/settingsdir/mythen3/standard/8000eV/trim.sn0000 b/settingsdir/mythen3/standard/8000eV/trim.sn0000
index b5bf94569..37a770ed1 100644
Binary files a/settingsdir/mythen3/standard/8000eV/trim.sn0000 and b/settingsdir/mythen3/standard/8000eV/trim.sn0000 differ
diff --git a/settingsdir/mythen3/standard/8000eV/trim.snxxxx b/settingsdir/mythen3/standard/8000eV/trim.snxxxx
deleted file mode 100644
index b5bf94569..000000000
Binary files a/settingsdir/mythen3/standard/8000eV/trim.snxxxx and /dev/null differ
diff --git a/settingsdir/mythen3/standard/9900eV/trim.sn0000 b/settingsdir/mythen3/standard/9900eV/trim.sn0000
deleted file mode 100644
index cb986b6a7..000000000
Binary files a/settingsdir/mythen3/standard/9900eV/trim.sn0000 and /dev/null differ
diff --git a/settingsdir/mythen3/standard/9900eV/trim.snxxxx b/settingsdir/mythen3/standard/9900eV/trim.snxxxx
deleted file mode 100644
index cb986b6a7..000000000
Binary files a/settingsdir/mythen3/standard/9900eV/trim.snxxxx and /dev/null differ
diff --git a/slsDetectorCalibration/interpolations/slsInterpolation.h b/slsDetectorCalibration/interpolations/slsInterpolation.h
index 958f8ce0a..ed99160c0 100644
--- a/slsDetectorCalibration/interpolations/slsInterpolation.h
+++ b/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]; */
diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
index 3cd0150e5..b123f5607 100755
Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer differ