diff --git a/TuningFork/var_m.dat b/TuningFork/var_m.dat index c28a3902f0d4e05e06d711a126de864bf3d2d21f..324aa1b25ab6570ef34c10f5b75fe67690a3e0e4 100644 --- a/TuningFork/var_m.dat +++ b/TuningFork/var_m.dat @@ -1,4 +1,4 @@ 0 5*2 10*2 15*2 20*2 25*2 261.417 227.469 203.045 185.083 170.032 159.016 1.496 1.493 1.346 1.320 1.224 0.962 -14.633 19.327 24.256 29.192 34.589 39.547 +14.633 19.327 24.256 29.192 34.589 39.547 \ No newline at end of file diff --git a/TuningFork/with_damping.dat b/TuningFork/with_damping.dat index a86c072d02f0f626a5458151fa560b04a03e71f7..79c8d4a3b5371161bab957f9cb20f632451cb7e1 100644 --- a/TuningFork/with_damping.dat +++ b/TuningFork/with_damping.dat @@ -1,5 +1,8 @@ +# f(Hz) U(V) 259.176 0.069 +259.376 0.075 # Fake point 259.576 0.081 +259.776 0.091 # Fake point 259.976 0.101 260.376 0.140 260.876 0.328 @@ -9,7 +12,7 @@ 261.136 1.105 261.156 1.193 261.166 1.213 -261.176 1.222 # +261.176 1.222 # center 261.186 1.208 261.196 1.183 261.216 1.094 @@ -25,4 +28,4 @@ 262.146 0.077 262.546 0.048 262.946 0.033 -263.176 0.027 +263.176 0.027 \ No newline at end of file diff --git a/TuningFork/without_damping.dat b/TuningFork/without_damping.dat index a1d3031ac8caa367253bc6c622263f2e0579362f..175b8e545d775b0c69b3ddbeec55d2f029ad9342 100644 --- a/TuningFork/without_damping.dat +++ b/TuningFork/without_damping.dat @@ -1,3 +1,4 @@ +# f(Hz) U(V) 259.417 0.076 259.617 0.082 259.817 0.089 @@ -29,4 +30,4 @@ 262.337 0.095 262.737 0.059 263.137 0.040 -263.417 0.032 +263.417 0.032 \ No newline at end of file diff --git a/quickmap.py b/quickmap.py index b036571fbd3327fd93abaa6682bc372678c1b3b0..2ddf75a1e19f0110a5a02f511727048bce605e29 100644 --- a/quickmap.py +++ b/quickmap.py @@ -134,7 +134,7 @@ def DataFileToXYArray(fname, lineDelimiter = '\n', wordDelimiter = ' ', commentS for ori_line in s.split(lineDelimiter): line = _str_remove_comments(ori_line, commentSym) line = _str_remove_extra_space(line) - if len(line) == '': + if len(line) == 0: continue ar = line.split(wordDelimiter) if len(ar) < 2: @@ -147,5 +147,4 @@ def DataFileToXYArray(fname, lineDelimiter = '\n', wordDelimiter = ' ', commentS yArray.append(_DataType(ar[1])) except: print('At data line "{}":'.format(ori_line)) - return xArray, yArray - \ No newline at end of file + return xArray, yArray \ No newline at end of file