diff --git a/TuningFork/draw.py b/TuningFork/draw.py index a3aafac9a6db00b2e43ad76f0f48ba7b8c42e90b..ae325a87a295600c5ddec7cb0bb45d669fa9c78f 100755 --- a/TuningFork/draw.py +++ b/TuningFork/draw.py @@ -10,4 +10,7 @@ quickmap.GetMap(x,y,smoothLine=True) x,y = quickmap.DataFileToXYArray('with_damping.dat') quickmap.GetMap(x,y,smoothLine=True) - +sq_T = '14.633 19.327 24.256 29.192 34.589 39.547'.split(' ') +sq_T = [float(e) for e in sq_T] +m = [0,10,20,30,40,50] +quickmap.GetMap(m,sq_T,polyLine=True) diff --git a/quickmap.py b/quickmap.py index 2ddf75a1e19f0110a5a02f511727048bce605e29..b42dc05c22902df9cb4d9082912396e7fb3bcf82 100644 --- a/quickmap.py +++ b/quickmap.py @@ -67,12 +67,9 @@ def GetMap(arrX, arrY, windowSizeX=12, windowSizeY=8, extendXRate=1, extendYRate kFinal, _ = leastsq(lossFunc, kInit, args=(X, Y)) print('Fitting line done. k=', kFinal) else: - print('Drawing map without fitting a line...') + print('Drawing map without fitting a line...\n') # Draw function map. - rcParams['grid.linestyle'] = '-' - rcParams['grid.color'] = 'blue' - rcParams['grid.linewidth'] = 0.2 plt.figure(figsize=(windowSizeX, windowSizeY)) plt.scatter(X, Y, color="red", label="Sample Point", linewidth=3) if polyLine: