updates pngs

3 files changed, 76 insertions, 52 deletions

diff --git a/data b/data
index 5b6c7ba..13f2988 100644
--- a/data
+++ b/data
@@ -1,50 +1,74 @@
-0.240
-0.002
+0.233
+0.001
 10
 10
-7.55
-7.59
-7.59 
-8.15
-8.18
-8.18 
+7.03
+6.91
+7.06
+7.66
+7.69
+7.69 
+8.31
+8.25
+8.21
 8.75
+8.79
 8.75 
-8.72
-9.34
-9.34 
-9.31
-9.85
-9.88
-9.84
-10.29
-10.25
+9.25
+9.21
+9.25 
+9.78
+9.75
+9.75 
 10.28
-10.78
+10.34
+10.34 
+10.75
 10.68
-10.77
-11.19
+10.72
+11.22
 11.28
-11.25
-11.53
-11.60
-11.72
-12.12
-12.03
-12.11
-0.3789
-0.4104
-0.4376
-0.4650
-0.4894 
-0.5125
-0.5347
-0.5575
-0.5811
-0.5997
-0.2473
-0.0965
-0.0609
-0.0452
-0.0360
-0.0289
+11.16
+11.56
+11.59
+11.54
+12.00
+11.97
+12.00
+0.362
+0.008
+0.390
+0.004
+0.417
+0.005
+0.444
+0.005 
+0.4691
+0.008 
+0.497
+0.005 
+0.5201
+0.006
+0.5398
+0.009
+0.5599
+0.014
+0.5809
+0.01 
+0.6014
+0.007
+0.2462 
+0.0002
+0.0895
+0.0001
+0.0572
+0.0001
+0.0419
+0.0001
+0.0335
+0.0001
+0.0281
+0.0001 
+
+
+
diff --git a/prak2.py b/prak2.py
index 8be1a5f..f812dc7 100755
--- a/prak2.py
+++ b/prak2.py
@@ -14,7 +14,7 @@ def avg(l):
 def stddev(l):
     s = len(l)
     a = avg(l)
-    return math.sqrt(sum(( (i - a)**2 for i in l )) / s / (s-1))
+    return math.sqrt(sum(( (i - a)**2 for i in l )) / (s * (s-1)))
 
 def sigsum(stddev, sig_sist):
     return math.sqrt(stddev**2 + sig_sist**2)
diff --git a/vtek2.py b/vtek2.py
index 4350159..055a52d 100755
--- a/vtek2.py
+++ b/vtek2.py
@@ -12,13 +12,13 @@ def main():
     Ns = [];
     Tsqs = [];
     STsqs = [];
-    H = float(input('Введите H и погрешность H'))
+    H = float(input('Введите H и погрешность H: '))
     H_err = float(input())
-    m0 = float(input('Введите m0 (количество измерений) '))
-    n = float(input('Введите n (количество колебаний на 1 измерение) '))
+    m0 = int(input('Введите m0 (количество измерений): '))
+    n = float(input('Введите n (количество колебаний на 1 измерение): '))
 
     print('\n', '-' * 35, "\nОБРАБОТКА С РУЧНЫМИ ЧАСАМИ\n", '-' * 35);
-    for i in range(10):
+    for i in range(m0 + 1):
         print("введите t_1, t_2, t_3 для N  = ", i);
         list = [float(input()) for _ in range(3)];
         mean = avg(list);
@@ -43,10 +43,11 @@ def main():
 
 
     print('\n', '-' * 35, "\nОБРАБОТКА С ФОТОДАТЧИКАМИ\n", '-' * 35);
-    for i in range(10):
+    for i in range(m0 + 1):
         print("Введите t, St для N = ", i);
         mean = float(input())
-        dev = 0.0001 #  НАГЛО ПОДОГНАТЬ!!!
+        dev = float(input())
+        print(mean, dev)
         mean_err = sqrt(dev * dev + pow(1e-3 * mean, 2));
         T = 2 * mean;
         T_err = 2 * mean_err;
@@ -72,8 +73,7 @@ def main():
     U_errs[0] -= 0.0015;
     for U, U_err in zip(Us, U_errs):
         tg = float(input('Введите t_д: '));
-        # tg_err = float(input('Введите погрешность t_д'));
-        tg_err = 0.0001
+        tg_err = float(input('Введите погрешность t_д'));
         omega = 2*PI / tg;
         omega_err = omega * tg_err / tg;
         omegas.append((U, omega, U_err, omega_err));