From 3aae7d6c1d723328fac331137c3c8c5e483d313f Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Thu, 2 Oct 2014 00:54:55 -0700
Subject: [PATCH] .

---
 data.py    |  3 +++
 strings.py | 21 +++++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/data.py b/data.py
index 086e38b..94d96be 100644
--- a/data.py
+++ b/data.py
@@ -45,13 +45,16 @@ daddario_nickle_wound = ( # XL
     ('DANW032' , .00019347),
     ('DANW034' , .00021590),
     ('DANW036' , .00023964),
+    ('DANW037*', .00024872), # from the EXL115BT, an approximation
     ('DANW038' , .00026471),
     ('DANW039' , .00027932),
+    ('DANW040*', .00029570), # from the EXL120BT, an approximation
     ('DANW042' , .00032279),
     ('DANW044' , .00035182),
     ('DANW046' , .00038216),
     ('DANW048' , .00041382),
     ('DANW049' , .00043014),
+    ('DANW050*', .00044720), # from the EXL115BT, an approximation
     ('DANW052' , .00048109),
     ('DANW054' , .00053838),
     ('DANW056' , .00057598),
diff --git a/strings.py b/strings.py
index 8cfc3b3..69af7ac 100755
--- a/strings.py
+++ b/strings.py
@@ -112,16 +112,33 @@ def tension2uw(t, freq):
     return (t*uw_const)/(2*scale_length*freq)**2
 
 if False:
+    # DAd's data is all screwy so we use change scale lengths for a best-fit
     scale_length = 25.4825
     D3 = note2freq('D3')
+    A2 = note2freq('A2')
+    E2 = note2freq('E2')
     print('NW024  {:10.8f} == 0.00010857'.format(tension2uw(15.73, D3)))
     print('NW025* {:10.8f} == ?         '.format(tension2uw(17.21, D3)))
     print('NW026  {:10.8f} == 0.00012671'.format(tension2uw(18.38, D3)))
+    print()
+    print('NW036  {:10.8f} == 0.00023964'.format(tension2uw(19.04, A2)))
+    print('NW037* {:10.8f} == ?         '.format(tension2uw(20.23, A2)))
+    print('NW038  {:10.8f} == 0.00026471'.format(tension2uw(20.96, A2)))
+    print()
+    scale_length = 25.18
+    print('NW039  {:10.8f} == 0.00027932'.format(tension2uw(12.46, E2)))
+    print('NW040* {:10.8f} == ?         '.format(tension2uw(13.18, E2)))
+    print('NW042  {:10.8f} == 0.00032279'.format(tension2uw(14.37, E2)))
+    print()
+    scale_length = 25.02
+    print('NW049  {:10.8f} == 0.00043014'.format(tension2uw(18.97, E2)))
+    print('NW050* {:10.8f} == ?         '.format(tension2uw(19.68, E2)))
+    print('NW052  {:10.8f} == 0.00048109'.format(tension2uw(21.15, E2)))
     import sys
     sys.exit(0)
 
-outfmt = '{:<6} at {:> 5.2f} lbs ({:>+4.2f})'
-finalfmt = 'total:   {:>7.2f} lbs ({:>+5.2f})'
+outfmt = '{:<8} at {:> 5.2f} lbs ({:>+4.2f})'
+finalfmt = 'total:     {:>7.2f} lbs ({:>+5.2f})'
 def print_ideal_stock(strings):
     total_tension = 0
     total_desired_tension = 0