update waeda pointers, change sch title blocks

diff --git a/.gitmodules b/.gitmodules
index d2951b8e097ab0a842be733bc6058743c76b0991..6386ca08893f9acc43f94e1ff711ff056876f3ce 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,8 @@
 [submodule "test-pcb/waeda-sym"]
        path = sch-pcb/waeda-sym
-       url = ssh://dan@twain.unl.edu/space/git/waeda-sym.git
+       ;url = ssh://dan@twain.unl.edu/space/git/waeda-sym.git
+       url = git@git.whiteaudio.com:waeda-sym.git
 [submodule "test-pcb/waeda-fp"]
        path = sch-pcb/waeda-fp
-       url = ssh://dan@twain.unl.edu/space/git/waeda-fp.git
+       ;url = ssh://dan@twain.unl.edu/space/git/waeda-fp.git
+       url = git@git.whiteaudio.com:waeda-fp.git

diff --git a/python-lib/test-data/chip02/stats.py b/python-lib/test-data/chip02/stats.py
index 929f9800dde6caa73ea14bd31e50ddcfffe0cd37..0df5159faac6b9093dcdc47b797233d4dda3f12a 100644 (file)
--- a/python-lib/test-data/chip02/stats.py
+++ b/python-lib/test-data/chip02/stats.py
@@ -11,15 +11,15 @@ cal_values = []
 cal_outs = []
 
 infiles = sorted(glob('*.npz'))
-#N_RUNS = min(len(infiles), 8)
-N_RUNS = 0
+N_RUNS = min(len(infiles), 8)
+#N_RUNS = 0
 sample_runs = sorted(rand_sample(range(len(infiles)), N_RUNS))
-#N_PLOTS = 4
-N_PLOTS = 0
-#sample_channels = sorted(rand_sample(range(48), N_PLOTS))
-sample_channels = range(N_PLOTS)
-#N_COLS = 4
-N_COLS = 0
+N_PLOTS = 4
+#N_PLOTS = 0
+sample_channels = sorted(rand_sample(range(48), N_PLOTS))
+#sample_channels = range(N_PLOTS)
+N_COLS = 4
+#N_COLS = 0
 nrun = 0
 for infile in infiles:
 #for infile in sorted(glob('*.npz')):
@@ -81,6 +81,7 @@ if 0:
         hist(data, bins=100, range=(-dm, dm), align='left')
         xlim((-dm, dm))
         #ylim((0, 50))
+        print i,k,data.std()
 
     subplot(N_PLOTS, N_COLS, 1)
     title('Offset DAC value')
@@ -108,7 +109,7 @@ if 0:
 
 interactive(False)
 
-if 1:
+if 0:
     figure()
     data = cv.flatten()
     hist(data, bins=range(128), align='left')
@@ -126,6 +127,23 @@ if 1:
             (len(infiles),))
     savefig('calout-hist.pdf')
 
-print sample_runs
-print [infiles[s] for s in sample_runs]
+
+if 1:
+    # stddev for each calibrated channel
+    means = []
+    stdds = []
+    c = 0
+    for k in range(co.shape[2]):
+        data = 1e3*(2.5/2/2**13)*co[:, 0, k]
+        m = data.mean()
+        s = data.std()
+        means.append(m)
+        stdds.append(s)
+        if abs(m) < 10.0 and abs(s) < 10.0:
+            c += 1
+            print '%02i: mean: %5.1f, std: %5.1f' % (k, m, s)
+
+    print 'good channels:', c
+#print sample_runs
+#print [infiles[s] for s in sample_runs]
 

diff --git a/sch-pcb/usbio/usbio-1.sch b/sch-pcb/usbio/usbio-1.sch
index 7084ff2beae8abbf3b00e3c18ab8ff5faa370002..ff533d5ddfb0ad590f54aa33e6887cf3dc741a5a 100644 (file)
--- a/sch-pcb/usbio/usbio-1.sch
+++ b/sch-pcb/usbio/usbio-1.sch
@@ -1,5 +1,5 @@
 v 20111231 2
-C 40000 40000 0 0 0 title-wa-85x110.sym
+C 40000 40000 0 0 0 title-phd-85x110.sym
 {
 T 49900 40600 5 10 1 1 0 0 1
 date=---

diff --git a/sch-pcb/usbio/usbio-2.sch b/sch-pcb/usbio/usbio-2.sch
index d2e2d27deaf012428c6cac6c6dcb94b9c3f30c76..f4522e0d8375b4d6ebf31a72dcf404ad1c2152a0 100644 (file)
--- a/sch-pcb/usbio/usbio-2.sch
+++ b/sch-pcb/usbio/usbio-2.sch
@@ -1,5 +1,5 @@
 v 20111231 2
-C 40000 40000 0 0 0 title-wa-85x110.sym
+C 40000 40000 0 0 0 title-phd-85x110.sym
 {
 T 49900 40600 5 10 1 1 0 0 1
 date=---

diff --git a/sch-pcb/usbio/usbio-3.sch b/sch-pcb/usbio/usbio-3.sch
index 6a649ca8f90bbddce5aa62ac47cbbec58df6cf14..e2ce61415c5c3b546e0d12767303b2cc0573f867 100644 (file)
--- a/sch-pcb/usbio/usbio-3.sch
+++ b/sch-pcb/usbio/usbio-3.sch
@@ -1,5 +1,5 @@
 v 20111231 2
-C 40000 40000 0 0 0 title-wa-85x110.sym
+C 40000 40000 0 0 0 title-phd-85x110.sym
 {
 T 50000 40600 5 10 1 1 0 0 1
 date=---

diff --git a/sch-pcb/usbio/usbio-4.sch b/sch-pcb/usbio/usbio-4.sch
index 195f627499ca09aa11c8bc3254e5b978badbc013..5c91f9e534113dad0c56395344ca1fbf3b441f22 100644 (file)
--- a/sch-pcb/usbio/usbio-4.sch
+++ b/sch-pcb/usbio/usbio-4.sch
@@ -1,5 +1,5 @@
 v 20111231 2
-C 40000 40000 0 0 0 title-wa-85x110.sym
+C 40000 40000 0 0 0 title-phd-85x110.sym
 {
 T 49900 40600 5 10 1 1 0 0 1
 date=---

diff --git a/sch-pcb/usbio/usbio-5.sch b/sch-pcb/usbio/usbio-5.sch
index dc8b5a17b9b97c8b0e6416e154ad2a4b21faf7cc..89dc798a7dbefd339f85a4324d33da351e71c900 100644 (file)
--- a/sch-pcb/usbio/usbio-5.sch
+++ b/sch-pcb/usbio/usbio-5.sch
@@ -1,5 +1,5 @@
 v 20111231 2
-C 40000 40000 0 0 0 title-wa-85x110.sym
+C 40000 40000 0 0 0 title-phd-85x110.sym
 {
 T 49900 40600 5 10 1 1 0 0 1
 date=---