Pārlūkot izejas kodu

Fixed entry point for kernel calc

tags/1.6.1
Trevor Irons 4 gadus atpakaļ
vecāks
revīzija
8cc0d68195
2 mainītis faili ar 16 papildinājumiem un 11 dzēšanām
  1. 14
    10
      akvo/tressel/calcAkvoKernel.py
  2. 2
    1
      setup.py

+ 14
- 10
akvo/tressel/calcAkvoKernel.py Parādīt failu

9
 
9
 
10
 import numpy as np
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
 # Converts Lemma/Merlin/Akvo serialized Eigen arrays into numpy ones for use by Python 
21
 # Converts Lemma/Merlin/Akvo serialized Eigen arrays into numpy ones for use by Python 
56
             print(exc)
56
             print(exc)
57
     return AKVO 
57
     return AKVO 
58
 
58
 
59
-if __name__ == "__main__":
60
 
59
 
60
+def main():
61
     if len(sys.argv) < 3:
61
     if len(sys.argv) < 3:
62
         print ("usage  python calcAkvoKernel.py   AkvoDataset.yaml  Coil1.yaml  " )
62
         print ("usage  python calcAkvoKernel.py   AkvoDataset.yaml  Coil1.yaml  " )
63
         exit()
63
         exit()
123
     print(Kern, file=yml)
123
     print(Kern, file=yml)
124
 
124
 
125
     K0 = Kern.GetKernel()
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 Parādīt failu

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

Notiek ielāde…
Atcelt
Saglabāt