Browse Source

Fixed entry point for kernel calc

tags/1.6.1
Trevor Irons 5 years ago
parent
commit
8cc0d68195
2 changed files with 16 additions and 11 deletions
  1. 14
    10
      akvo/tressel/calcAkvoKernel.py
  2. 2
    1
      setup.py

+ 14
- 10
akvo/tressel/calcAkvoKernel.py View File

@@ -9,13 +9,13 @@ import pyLemma.FDEM1D as em1d
9 9
 
10 10
 import numpy as np
11 11
 
12
-import matplotlib.pyplot as plt 
13
-import seaborn as sns
14
-sns.set(style="ticks")
15
-import cmocean 
16
-from SEGPlot import *
17
-from matplotlib.ticker import FormatStrFormatter
18
-import matplotlib.ticker as plticker
12
+#import matplotlib.pyplot as plt 
13
+#import seaborn as sns
14
+#sns.set(style="ticks")
15
+#import cmocean 
16
+#from SEGPlot import *
17
+#from matplotlib.ticker import FormatStrFormatter
18
+#import matplotlib.ticker as plticker
19 19
 
20 20
 
21 21
 # Converts Lemma/Merlin/Akvo serialized Eigen arrays into numpy ones for use by Python 
@@ -56,8 +56,8 @@ def loadAkvoData(fnamein):
56 56
             print(exc)
57 57
     return AKVO 
58 58
 
59
-if __name__ == "__main__":
60 59
 
60
+def main():
61 61
     if len(sys.argv) < 3:
62 62
         print ("usage  python calcAkvoKernel.py   AkvoDataset.yaml  Coil1.yaml  " )
63 63
         exit()
@@ -123,5 +123,9 @@ if __name__ == "__main__":
123 123
     print(Kern, file=yml)
124 124
 
125 125
     K0 = Kern.GetKernel()
126
-    plt.matshow(np.abs(K0))
127
-    plt.show()
126
+    
127
+    #plt.matshow(np.abs(K0))
128
+    #plt.show()
129
+
130
+if __name__ == "__main__":
131
+    main()

+ 2
- 1
setup.py View File

@@ -21,7 +21,7 @@ with open("README.md", "r") as fh:
21 21
     long_description = fh.read()
22 22
 
23 23
 setup(name='Akvo',
24
-      version='1.3.4',
24
+      version='1.3.5',
25 25
       python_requires='>3.7.0', # due to pyLemma
26 26
       description='Surface nuclear magnetic resonance workbench',
27 27
       long_description=long_description,
@@ -45,6 +45,7 @@ setup(name='Akvo',
45 45
           'matplotlib',
46 46
           'scipy',
47 47
           'padasip',
48
+          'seaborn',
48 49
           'numpy',
49 50
           'pyqt5',
50 51
           'pyyaml',

Loading…
Cancel
Save