Import fix from dmp

akvo/gui/akvoGUI.py

@@ -794,8 +794,6 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         self.RAWDataProc.nDAQVersion = self.RAWDataProc.DATADICT["INFO"]["nDAQVersion"]
         self.RAWDataProc.dt = 1./self.RAWDataProc.samp 
 
-
-
         self.dataChan = self.RAWDataProc.DATADICT[ self.RAWDataProc.DATADICT["PULSES"][0] ]["chan"]
         # Keep backwards compatibility with prior saved pickles???
         #self.ui.logTextBrowser.clear() 
@@ -816,7 +814,7 @@ class ApplicationWindow(QtWidgets.QMainWindow):
             self.RAWDataProc.interpulseDelay = self.RAWDataProc.DATADICT["INFO"]["interpulseDelay"]
 
         self.YamlNode.Import = OrderedDict((yaml.load( self.logText, Loader=yaml.Loader )).Import)
-        self.YamlNode.Processing = OrderedDict((yaml.load( self.logText, Loader=yaml.Loader )).Processing)
+        self.YamlNode.Processing = list((yaml.load( self.logText, Loader=yaml.Loader )).Processing)
         self.YamlNode.Stacking = OrderedDict((yaml.load( self.logText, Loader=yaml.Loader )).Stacking)
         self.Log()
  

akvo/tressel/harmonic.py

@@ -112,13 +112,13 @@ def minHarmonic2(sN, fs, t, f0, f0k1, f0kN, f0ks, f1, f1k1, f1kN, f1ks, Bounds,
 
         # CG, BFGS, Newton-CG, L-BFGS-B, TNC, SLSQP, dogleg, trust-ncg, trust-krylov, trust-exact and trust-constr
         print("2 UNbounded ( +-", Bounds,") search length ", kNs0, kNs1 ,"for f0", f0, f1)
-        res = minimize(harmonic2Norm, np.array((f0, f1)), args=(sN, fs, t, f0k1, f0k1+kNs0, f0ks, f1k1, f1k1+kNs1, f1ks), jac='2-point', method='BFGS') # hess=None, bounds=None )
+        res = minimize(harmonic2Norm, np.array((f0, f1)), args=(sN, fs, t, f0k1, kNs0, f0ks, f1k1, kNs1, f1ks), jac='2-point', method='BFGS') # hess=None, bounds=None )
     else:
         # Bounded
         bnds = ( (f0-Bounds, f0+Bounds),(f1-Bounds, f1+Bounds) )
         print("2 bounded ( +-", Bounds,") search length ", kNs0, kNs1 ,"for f0", f0, f1)
         # L-BFGS-B hess=None, bounds=None )
-        res = minimize(harmonic2Norm, ((f0,f1)), args=(sN, fs, t, f0k1, f0k1+kNs0, f0ks, f1k1, f1k1+kNs1, f1ks), jac='2-point', method='L-BFGS-B', bounds=bnds ) 
+        res = minimize(harmonic2Norm, ((f0,f1)), args=(sN, fs, t, f0k1, kNs0, f0ks, f1k1, kNs1, f1ks), jac='2-point', method='L-BFGS-B', bounds=bnds ) 
 
     return harmonicEuler2(sN, fs, t, res.x[0], f0k1, f0kN, f0ks, res.x[1], f1k1, f1kN, f1ks), res.x[0], res.x[1]#[0]
 

akvo/tressel/mrsurvey.py

@@ -2126,7 +2126,7 @@ class GMRDataProcessor(SNMRDataProcessor):
         self.windead = 0.    
         for ift in np.arange(100,0,-1):
             #print( ift, fft1[ift] )
-            if fft1[ift] > .001:
+            if (abs(fft1[ift])/abs(fft1[0])) > 1e-2:
                 #print ("DEAD TIME", 1e3*self.DATADICT[pulse]["TIMES"][ift] - 1e3*self.DATADICT[pulse]["TIMES"][0] ) 
                 dead = 1e3*self.DATADICT[pulse]["TIMES"][ift] - 1e3*self.DATADICT[pulse]["TIMES"][0]
                 self.windead = self.DATADICT[pulse]["TIMES"][ift] - self.DATADICT[pulse]["TIMES"][0]
@@ -2167,8 +2167,9 @@ class GMRDataProcessor(SNMRDataProcessor):
                 iFID += 1
             if trunc:
                 self.DATADICT[pulse]["TIMES"] = self.DATADICT[pulse]["TIMES"][idead:-idead]
+                [WINDOWxx, ndxx, istart, iend, deadxx, ideadxx] = self.computeWindow(pulse, band, centre, ftype)
 
-        self.plotFT(canvas, istart, iend)
+            self.plotFT(canvas, istart, iend)
         self.doneTrigger.emit() 
 
     def bandpassFilter(self, canvas, blank, plot=True):