segmentation added to harmonic noise canc.

akvo/gui/akvoGUI.py

@@ -694,7 +694,7 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         #    self.YamlNode.Processing["Saved"] = []
         #self.YamlNode.Processing["Saved"].append(datetime.datetime.now().isoformat()) 
         #self.Log()
- 
+        
         import pickle, os 
         try:
             with open('.akvo.last.path') as f: 
@@ -725,8 +725,10 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         INFO["deadTime"] = self.RAWDataProc.deadTime
         INFO["transFreq"] = self.RAWDataProc.transFreq
         INFO["headerstr"] = str(self.headerstr)
+        INFO["nDAQVersion"] = self.RAWDataProc.nDAQVersion
         INFO["log"] = yaml.dump( self.YamlNode )  #self.logText  #MAK 20170127
-    
+          
+
         self.RAWDataProc.DATADICT["INFO"] = INFO 
 
         pickle.dump(self.RAWDataProc.DATADICT, save)
@@ -779,6 +781,7 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         self.RAWDataProc.nPulseMoments = self.RAWDataProc.DATADICT["INFO"]["nPulseMoments"] 
         self.RAWDataProc.deadTime = self.RAWDataProc.DATADICT["INFO"]["deadTime"] 
         self.RAWDataProc.transFreq = self.RAWDataProc.DATADICT["INFO"]["transFreq"]
+        self.RAWDataProc.nDAQVersion = self.RAWDataProc.DATADICT["INFO"]["nDAQVersion"]
         self.RAWDataProc.dt = 1./self.RAWDataProc.samp 
 
 
@@ -1138,15 +1141,16 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         if "Harmonic modelling" not in self.YamlNode.Processing.keys():
             self.YamlNode.Processing["Harmonic modelling"] = {}
             self.YamlNode.Processing["Harmonic modelling"]["NF"] = str( self.ui.NHarmonicsFreqsSpin.value() ) 
+            self.YamlNode.Processing["Harmonic modelling"]["Segments"] = str( self.ui.NSegments.value() ) 
             self.YamlNode.Processing["Harmonic modelling"]["f0K1"] = str( self.ui.f0K1Spin.value() )
             self.YamlNode.Processing["Harmonic modelling"]["f0KN"] = str( self.ui.f0KNSpin.value() )
             self.YamlNode.Processing["Harmonic modelling"]["f0Ks"] = str( self.ui.f0KsSpin.value() )
             self.YamlNode.Processing["Harmonic modelling"]["f0"] = str( self.ui.f0Spin.value() )
-            self.YamlNode.Processing["Harmonic modelling"]["f1K1"] = str( self.ui.f0K1Spin.value() )
-            self.YamlNode.Processing["Harmonic modelling"]["f1KN"] = str( self.ui.f0KNSpin.value() )
-            self.YamlNode.Processing["Harmonic modelling"]["f1Ks"] = str( self.ui.f0KsSpin.value() )
-            self.YamlNode.Processing["Harmonic modelling"]["f1"] = str( self.ui.f0Spin.value() )
-            self.YamlNode.Processing["Harmonic modelling"]["Segments"] = str( 1 ) # Future 
+            if self.ui.NHarmonicsFreqsSpin.value() > 1:
+                self.YamlNode.Processing["Harmonic modelling"]["f1K1"] = str( self.ui.f1K1Spin.value() )
+                self.YamlNode.Processing["Harmonic modelling"]["f1KN"] = str( self.ui.f1KNSpin.value() )
+                self.YamlNode.Processing["Harmonic modelling"]["f1Ks"] = str( self.ui.f1KsSpin.value() )
+                self.YamlNode.Processing["Harmonic modelling"]["f1"] = str( self.ui.f1Spin.value() )
             self.Log()
         else:
             err_msg = "Harmonic modelling noise cancellation has already been applied!"
@@ -1163,6 +1167,7 @@ class ApplicationWindow(QtWidgets.QMainWindow):
                  self.ui.f0K1Spin.value(), \
                  self.ui.f0KNSpin.value(), \
                  self.ui.f0KsSpin.value(), \
+                 self.ui.NSegments.value(), \
                  self.ui.f1Spin.value(), \
                  self.ui.f1K1Spin.value(), \
                  self.ui.f1KNSpin.value(), \
@@ -1279,19 +1284,32 @@ class ApplicationWindow(QtWidgets.QMainWindow):
 
     def quadDet(self):
 
-        if "Quadrature detection" not in self.YamlNode.Processing.keys():
-            self.YamlNode.Processing["Quadrature detection"] = {}
-            self.YamlNode.Processing["Quadrature detection"]["trim"] = str( self.ui.trimSpin.value() )
-            self.Log()
-        else:
-            err_msg = "Quadrature detection has already been done!"
-            reply =QtWidgets.QMessageBox.critical(self, 'Error', 
-                err_msg) 
-            return 
+        method = ['trf','dogbox','lm'][int(self.ui.QDMethod.currentIndex())]
+        loss = ['linear','soft_l1','cauchy','huber'][int(self.ui.QDLoss.currentIndex())]         
 
+
+        # allow overwrite of Quad Det.    
+        self.YamlNode.Processing["Quadrature detection"] = {}
+        self.YamlNode.Processing["Quadrature detection"]["trim"] = str( self.ui.trimSpin.value() )
+        self.YamlNode.Processing["Quadrature detection"]["method"] = method 
+        self.YamlNode.Processing["Quadrature detection"]["loss"] = loss
+        self.Log()
+
+        #if "Quadrature detection" not in self.YamlNode.Processing.keys():
+        #    self.YamlNode.Processing["Quadrature detection"] = {}
+        #    self.YamlNode.Processing["Quadrature detection"]["trim"] = str( self.ui.trimSpin.value() )
+        #    self.Log()
+        #else:
+        #    self.YamlNode.Processing["Quadrature detection"] = {}
+        #    self.YamlNode.Processing["Quadrature detection"]["trim"] = str( self.ui.trimSpin.value() )
+        #    self.Log()
+            #err_msg = "Quadrature detection has already been done!"
+            #reply =QtWidgets.QMessageBox.critical(self, 'Error', 
+            #    err_msg) 
+            #return 
         self.lock("quadrature detection")
         thread.start_new_thread(self.RAWDataProc.quadDet, \
-                (self.ui.trimSpin.value(), int(self.ui.QDType.currentIndex()), self.ui.mplwidget))
+                (self.ui.trimSpin.value(), method, loss, self.ui.mplwidget))
 
         self.ui.plotQD.setEnabled(True)
     

akvo/gui/main.ui

@@ -519,7 +519,7 @@ background: dark grey;
                   <number>1</number>
                  </property>
                  <property name="maximum">
-                  <double>1000.000000000000000</double>
+                  <double>1200.000000000000000</double>
                  </property>
                  <property name="value">
                   <double>600.000000000000000</double>
@@ -702,7 +702,7 @@ background: dark grey;
                   <double>100.000000000000000</double>
                  </property>
                  <property name="maximum">
-                  <double>1000.000000000000000</double>
+                  <double>1600.000000000000000</double>
                  </property>
                  <property name="value">
                   <double>280.000000000000000</double>
@@ -722,7 +722,7 @@ background: dark grey;
                   <double>25.000000000000000</double>
                  </property>
                  <property name="maximum">
-                  <double>500.000000000000000</double>
+                  <double>600.000000000000000</double>
                  </property>
                  <property name="singleStep">
                   <double>5.000000000000000</double>
@@ -1021,38 +1021,6 @@ background: dark grey;
                <bool>true</bool>
               </property>
               <layout class="QGridLayout" name="gridLayout_9">
-               <item row="3" column="2">
-                <widget class="QLCDNumber" name="lcdH1F">
-                 <property name="styleSheet">
-                  <string notr="true">#lcdH1F {
-  color: green;
-  background: black;
-}
-
-#lcdH1F:disabled {
-  color: grey;
-  background: dark grey;
-}</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="13" column="1">
-                <widget class="QCheckBox" name="plotHarmonic">
-                 <property name="text">
-                  <string>Plot</string>
-                 </property>
-                 <property name="checked">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item row="6" column="1">
-                <widget class="Line" name="line_5">
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                </widget>
-               </item>
                <item row="0" column="0">
                 <widget class="QLabel" name="label_26">
                  <property name="text">
@@ -1060,104 +1028,83 @@ background: dark grey;
                  </property>
                 </widget>
                </item>
-               <item row="8" column="0">
-                <widget class="QLabel" name="label_34">
-                 <property name="text">
-                  <string>First harmonic 2</string>
+               <item row="0" column="1">
+                <widget class="QSpinBox" name="NHarmonicsFreqsSpin">
+                 <property name="minimum">
+                  <number>1</number>
                  </property>
-                </widget>
-               </item>
-               <item row="2" column="1">
-                <widget class="QDoubleSpinBox" name="f0Spin">
                  <property name="maximum">
-                  <double>25000.000000000000000</double>
-                 </property>
-                 <property name="singleStep">
-                  <double>0.100000000000000</double>
+                  <number>2</number>
                  </property>
                  <property name="value">
-                  <double>60.000000000000000</double>
+                  <number>1</number>
                  </property>
                 </widget>
                </item>
-               <item row="7" column="1">
-                <widget class="QDoubleSpinBox" name="f1Spin">
-                 <property name="maximum">
-                  <double>25000.000000000000000</double>
+               <item row="5" column="1">
+                <widget class="QSpinBox" name="f0KNSpin">
+                 <property name="minimum">
+                  <number>2</number>
                  </property>
                  <property name="value">
-                  <double>60.000000000000000</double>
+                  <number>40</number>
                  </property>
                 </widget>
                </item>
                <item row="4" column="1">
-                <widget class="QSpinBox" name="f0KNSpin">
+                <widget class="QSpinBox" name="f0K1Spin">
                  <property name="minimum">
-                  <number>2</number>
+                  <number>1</number>
+                 </property>
+                 <property name="maximum">
+                  <number>50</number>
                  </property>
                  <property name="value">
-                  <number>40</number>
+                  <number>1</number>
                  </property>
                 </widget>
                </item>
-               <item row="4" column="2">
-                <widget class="QLCDNumber" name="lcdHNF">
+               <item row="12" column="2">
+                <widget class="QLCDNumber" name="lcdf0NK2">
                  <property name="styleSheet">
-                  <string notr="true">#lcdHNF {
-  color: green;
-  background: black;
+                  <string notr="true">#lcdf0NK2 { 
+ color: green;
+ background: black;
 }
 
-#lcdHNF:disabled {
+#lcdf0NK2:disabled {
   color: grey;
   background: dark grey;
 }</string>
                  </property>
                 </widget>
                </item>
-               <item row="1" column="1">
-                <widget class="Line" name="line">
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                </widget>
-               </item>
-               <item row="11" column="2">
-                <widget class="Line" name="line_9">
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                </widget>
-               </item>
-               <item row="3" column="0">
-                <widget class="QLabel" name="label_11">
-                 <property name="text">
-                  <string>First harmonic 1</string>
-                 </property>
-                </widget>
-               </item>
                <item row="6" column="2">
-                <widget class="Line" name="line_6">
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
+                <widget class="QLCDNumber" name="lcdf0NK">
+                 <property name="styleSheet">
+                  <string notr="true">#lcdf0NK { 
+ color: green;
+ background: black;
+}
+
+#lcdf0NK:disabled {
+  color: grey;
+  background: dark grey;
+}</string>
                  </property>
-                </widget>
-               </item>
-               <item row="11" column="1">
-                <widget class="Line" name="line_8">
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
+                 <property name="intValue" stdset="0">
+                  <number>0</number>
                  </property>
                 </widget>
                </item>
-               <item row="8" column="1">
-                <widget class="QSpinBox" name="f1K1Spin">
-                 <property name="minimum">
-                  <number>1</number>
+               <item row="10" column="0">
+                <widget class="QLabel" name="label_34">
+                 <property name="text">
+                  <string>First harmonic 2</string>
                  </property>
                 </widget>
                </item>
-               <item row="10" column="1">
+               <item row="12" column="1">
                 <widget class="QSpinBox" name="f1KsSpin">
                  <property name="minimum">
                   <number>1</number>
@@ -1167,152 +1114,182 @@ background: dark grey;
                  </property>
                 </widget>
                </item>
-               <item row="4" column="0">
-                <widget class="QLabel" name="label_31">
+               <item row="13" column="2">
+                <widget class="Line" name="line_9">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                </widget>
+               </item>
+               <item row="11" column="0">
+                <widget class="QLabel" name="label_35">
                  <property name="text">
-                  <string>Last harmonic 1</string>
+                  <string>Last harmonic 2</string>
                  </property>
                 </widget>
                </item>
-               <item row="1" column="0">
-                <widget class="Line" name="line_3">
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
+               <item row="5" column="2">
+                <widget class="QLCDNumber" name="lcdHNF">
+                 <property name="styleSheet">
+                  <string notr="true">#lcdHNF {
+  color: green;
+  background: black;
+}
+
+#lcdHNF:disabled {
+  color: grey;
+  background: dark grey;
+}</string>
                  </property>
                 </widget>
                </item>
-               <item row="1" column="2">
-                <widget class="Line" name="line_2">
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
+               <item row="4" column="2">
+                <widget class="QLCDNumber" name="lcdH1F">
+                 <property name="styleSheet">
+                  <string notr="true">#lcdH1F {
+  color: green;
+  background: black;
+}
+
+#lcdH1F:disabled {
+  color: grey;
+  background: dark grey;
+}</string>
                  </property>
                 </widget>
                </item>
-               <item row="5" column="2">
-                <widget class="QLCDNumber" name="lcdf0NK">
+               <item row="10" column="2">
+                <widget class="QLCDNumber" name="lcdH1F2">
                  <property name="styleSheet">
-                  <string notr="true">#lcdf0NK { 
+                  <string notr="true">#lcdH1F2{ 
  color: green;
  background: black;
 }
 
-#lcdf0NK:disabled {
+#lcdH1F2:disabled {
   color: grey;
   background: dark grey;
 }</string>
                  </property>
-                 <property name="intValue" stdset="0">
-                  <number>0</number>
-                 </property>
                 </widget>
                </item>
-               <item row="7" column="0">
-                <widget class="QLabel" name="label_27">
+               <item row="12" column="0">
+                <widget class="QLabel" name="label_41">
                  <property name="text">
-                  <string>Base freq. 2 </string>
+                  <string>Sub-harmonics</string>
                  </property>
                 </widget>
                </item>
-               <item row="3" column="1">
-                <widget class="QSpinBox" name="f0K1Spin">
+               <item row="10" column="1">
+                <widget class="QSpinBox" name="f1K1Spin">
                  <property name="minimum">
                   <number>1</number>
                  </property>
-                 <property name="maximum">
-                  <number>50</number>
-                 </property>
-                 <property name="value">
-                  <number>1</number>
+                </widget>
+               </item>
+               <item row="9" column="0">
+                <widget class="QLabel" name="label_27">
+                 <property name="text">
+                  <string>Base freq. 2 </string>
                  </property>
                 </widget>
                </item>
-               <item row="11" column="0">
-                <widget class="Line" name="line_7">
+               <item row="8" column="1">
+                <widget class="Line" name="line_5">
                  <property name="orientation">
                   <enum>Qt::Horizontal</enum>
                  </property>
                 </widget>
                </item>
-               <item row="0" column="1">
-                <widget class="QSpinBox" name="NHarmonicsFreqsSpin">
-                 <property name="minimum">
-                  <number>1</number>
+               <item row="8" column="2">
+                <widget class="Line" name="line_6">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
                  </property>
+                </widget>
+               </item>
+               <item row="3" column="1">
+                <widget class="QDoubleSpinBox" name="f0Spin">
                  <property name="maximum">
-                  <number>2</number>
+                  <double>25000.000000000000000</double>
+                 </property>
+                 <property name="singleStep">
+                  <double>0.100000000000000</double>
                  </property>
                  <property name="value">
-                  <number>1</number>
+                  <double>60.000000000000000</double>
                  </property>
                 </widget>
                </item>
-               <item row="5" column="1">
-                <widget class="QSpinBox" name="f0KsSpin">
-                 <property name="toolTip">
-                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Would you like to calculate subharmonics? For instance, setting this to 1, will calculate only the exact harmonics, setting this to 2 will calculate 1/2 step subharmonics (i.e. if the baseline frequency is 60 Hz, this will result in calcualtion of 30 Hz subharmonics)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                 </property>
-                 <property name="minimum">
-                  <number>1</number>
-                 </property>
+               <item row="9" column="1">
+                <widget class="QDoubleSpinBox" name="f1Spin">
                  <property name="maximum">
-                  <number>3</number>
+                  <double>25000.000000000000000</double>
                  </property>
                  <property name="value">
-                  <number>1</number>
+                  <double>60.000000000000000</double>
                  </property>
                 </widget>
                </item>
-               <item row="2" column="0">
-                <widget class="QLabel" name="label_25">
-                 <property name="text">
-                  <string>Base freq. 1</string>
+               <item row="2" column="2">
+                <widget class="Line" name="line_2">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
                  </property>
                 </widget>
                </item>
-               <item row="13" column="2">
+               <item row="15" column="2">
                 <widget class="QPushButton" name="harmonicGO">
                  <property name="layoutDirection">
                   <enum>Qt::LeftToRight</enum>
                  </property>
-                 <property name="styleSheet">
-                  <string notr="true">#harmonicGO {background: green;}
-#harmonicGO:disabled{background: black;}</string>
+                 <property name="styleSheet">
+                  <string notr="true">#harmonicGO {background: green;}
+#harmonicGO:disabled{background: black;}</string>
+                 </property>
+                 <property name="text">
+                  <string>GO</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="6" column="1">
+                <widget class="QSpinBox" name="f0KsSpin">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Would you like to calculate subharmonics? For instance, setting this to 1, will calculate only the exact harmonics, setting this to 2 will calculate 1/2 step subharmonics (i.e. if the baseline frequency is 60 Hz, this will result in calcualtion of 30 Hz subharmonics)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="minimum">
+                  <number>1</number>
+                 </property>
+                 <property name="maximum">
+                  <number>3</number>
                  </property>
-                 <property name="text">
-                  <string>GO</string>
+                 <property name="value">
+                  <number>1</number>
                  </property>
                 </widget>
                </item>
-               <item row="5" column="0">
-                <widget class="QLabel" name="label_33">
-                 <property name="text">
-                  <string>Sub-harmonics </string>
+               <item row="2" column="1">
+                <widget class="Line" name="line">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
                  </property>
                 </widget>
                </item>
-               <item row="6" column="0">
-                <widget class="Line" name="line_4">
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
+               <item row="5" column="0">
+                <widget class="QLabel" name="label_31">
+                 <property name="text">
+                  <string>Last harmonic 1</string>
                  </property>
                 </widget>
                </item>
-               <item row="10" column="2">
-                <widget class="QLCDNumber" name="lcdf0NK2">
-                 <property name="styleSheet">
-                  <string notr="true">#lcdf0NK2 { 
- color: green;
- background: black;
-}
-
-#lcdf0NK2:disabled {
-  color: grey;
-  background: dark grey;
-}</string>
+               <item row="3" column="0">
+                <widget class="QLabel" name="label_25">
+                 <property name="text">
+                  <string>Base freq. 1</string>
                  </property>
                 </widget>
                </item>
-               <item row="9" column="2">
+               <item row="11" column="2">
                 <widget class="QLCDNumber" name="lcdHNF2">
                  <property name="styleSheet">
                   <string notr="true">#lcdHNF2 { 
@@ -1327,42 +1304,85 @@ background: dark grey;
                  </property>
                 </widget>
                </item>
-               <item row="8" column="2">
-                <widget class="QLCDNumber" name="lcdH1F2">
-                 <property name="styleSheet">
-                  <string notr="true">#lcdH1F2{ 
- color: green;
- background: black;
-}
-
-#lcdH1F2:disabled {
-  color: grey;
-  background: dark grey;
-}</string>
+               <item row="11" column="1">
+                <widget class="QSpinBox" name="f1KNSpin">
+                 <property name="minimum">
+                  <number>2</number>
+                 </property>
+                 <property name="value">
+                  <number>40</number>
                  </property>
                 </widget>
                </item>
-               <item row="9" column="0">
-                <widget class="QLabel" name="label_35">
+               <item row="15" column="1">
+                <widget class="QCheckBox" name="plotHarmonic">
                  <property name="text">
-                  <string>Last harmonic 2</string>
+                  <string>Plot</string>
+                 </property>
+                 <property name="checked">
+                  <bool>true</bool>
                  </property>
                 </widget>
                </item>
-               <item row="10" column="0">
-                <widget class="QLabel" name="label_41">
+               <item row="13" column="1">
+                <widget class="Line" name="line_8">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                </widget>
+               </item>
+               <item row="13" column="0">
+                <widget class="Line" name="line_7">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                </widget>
+               </item>
+               <item row="6" column="0">
+                <widget class="QLabel" name="label_33">
                  <property name="text">
-                  <string>Sub-harmonics</string>
+                  <string>Sub-harmonics </string>
                  </property>
                 </widget>
                </item>
-               <item row="9" column="1">
-                <widget class="QSpinBox" name="f1KNSpin">
+               <item row="4" column="0">
+                <widget class="QLabel" name="label_11">
+                 <property name="text">
+                  <string>First harmonic 1</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="0">
+                <widget class="Line" name="line_3">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                </widget>
+               </item>
+               <item row="8" column="0">
+                <widget class="Line" name="line_4">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="1">
+                <widget class="QSpinBox" name="NSegments">
                  <property name="minimum">
-                  <number>2</number>
+                  <number>1</number>
+                 </property>
+                 <property name="maximum">
+                  <number>10</number>
                  </property>
                  <property name="value">
-                  <number>40</number>
+                  <number>1</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="0">
+                <widget class="QLabel" name="label_49">
+                 <property name="text">
+                  <string>N segments</string>
                  </property>
                 </widget>
                </item>
@@ -1830,42 +1850,26 @@ background: dark grey;
                <bool>true</bool>
               </property>
               <layout class="QGridLayout" name="gridLayout_15">
-               <item row="1" column="3">
-                <widget class="QPushButton" name="qdGO">
-                 <property name="styleSheet">
-                  <string notr="true">#qdGO {
-    background: green;
-}
-
-#qdGO:disabled{
-    background: black;
-}</string>
-                 </property>
-                 <property name="text">
-                  <string>GO</string>
-                 </property>
-                </widget>
-               </item>
                <item row="2" column="2">
-                <widget class="QComboBox" name="QDType">
+                <widget class="QComboBox" name="QDMethod">
                  <item>
                   <property name="text">
-                   <string>Real/Imag</string>
+                   <string>Trust region reflective</string>
                   </property>
                  </item>
                  <item>
                   <property name="text">
-                   <string>Amp/Phase</string>
+                   <string>Dogbox</string>
                   </property>
                  </item>
                  <item>
                   <property name="text">
-                   <string>Phased</string>
+                   <string>Levenberg-Marquardt</string>
                   </property>
                  </item>
                 </widget>
                </item>
-               <item row="2" column="3">
+               <item row="5" column="3">
                 <widget class="QPushButton" name="plotQD">
                  <property name="enabled">
                   <bool>false</bool>
@@ -1887,16 +1891,58 @@ background: dark grey;
                  </property>
                 </widget>
                </item>
+               <item row="2" column="0">
+                <widget class="QLabel" name="label_42">
+                 <property name="text">
+                  <string>Method/loss</string>
+                 </property>
+                </widget>
+               </item>
                <item row="1" column="2">
                 <widget class="QSpinBox" name="trimSpin">
                  <property name="minimum">
                   <number>0</number>
                  </property>
                  <property name="value">
-                  <number>0</number>
+                  <number>2</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="3">
+                <widget class="QPushButton" name="qdGO">
+                 <property name="styleSheet">
+                  <string notr="true">#qdGO {
+    background: green;
+}
+
+#qdGO:disabled{
+    background: black;
+}</string>
+                 </property>
+                 <property name="text">
+                  <string>GO</string>
                  </property>
                 </widget>
                </item>
+               <item row="5" column="2">
+                <widget class="QComboBox" name="QDType">
+                 <item>
+                  <property name="text">
+                   <string>Real/Imag</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Amp/Phase</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Phased</string>
+                  </property>
+                 </item>
+                </widget>
+               </item>
                <item row="1" column="0">
                 <widget class="QLabel" name="label_38">
                  <property name="text">
@@ -1904,6 +1950,51 @@ background: dark grey;
                  </property>
                 </widget>
                </item>
+               <item row="2" column="3">
+                <widget class="QComboBox" name="QDLoss">
+                 <item>
+                  <property name="text">
+                   <string>linear</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>soft L1</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Cauchy</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Huber</string>
+                  </property>
+                 </item>
+                </widget>
+               </item>
+               <item row="4" column="2">
+                <widget class="Line" name="line_10">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                </widget>
+               </item>
+               <item row="4" column="0">
+                <widget class="Line" name="line_11">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                </widget>
+               </item>
+               <item row="4" column="3">
+                <widget class="Line" name="line_12">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                </widget>
+               </item>
               </layout>
              </widget>
             </item>
@@ -1937,16 +2028,10 @@ background: dark grey;
                <bool>true</bool>
               </property>
               <layout class="QGridLayout" name="gridLayout_16">
-               <item row="0" column="1">
-                <widget class="QSpinBox" name="GPDspinBox">
-                 <property name="minimum">
-                  <number>6</number>
-                 </property>
-                 <property name="maximum">
-                  <number>30</number>
-                 </property>
-                 <property name="value">
-                  <number>20</number>
+               <item row="0" column="0">
+                <widget class="QLabel" name="label_53">
+                 <property name="text">
+                  <string>Gates per decade </string>
                  </property>
                 </widget>
                </item>
@@ -1966,13 +2051,6 @@ background: dark grey;
                  </property>
                 </widget>
                </item>
-               <item row="0" column="0">
-                <widget class="QLabel" name="label_53">
-                 <property name="text">
-                  <string>Gates per decade </string>
-                 </property>
-                </widget>
-               </item>
                <item row="1" column="3">
                 <widget class="QPushButton" name="plotGI">
                  <property name="enabled">
@@ -1995,6 +2073,19 @@ background: dark grey;
                  </property>
                 </widget>
                </item>
+               <item row="0" column="1">
+                <widget class="QSpinBox" name="GPDspinBox">
+                 <property name="minimum">
+                  <number>6</number>
+                 </property>
+                 <property name="maximum">
+                  <number>30</number>
+                 </property>
+                 <property name="value">
+                  <number>20</number>
+                 </property>
+                </widget>
+               </item>
                <item row="1" column="2">
                 <widget class="QComboBox" name="QDType_2">
                  <item>

akvo/tressel/decay.py

@@ -60,9 +60,8 @@ def fun(x, t, y):
         x[3] = T2
     """
     # concatenated real and imaginary parts  
-    pre =  np.concatenate((-x[0]*np.sin(2.*np.pi*x[2]*t + x[1])*np.exp(-t/x[3]), \
-                           +x[0]*np.cos(2.*np.pi*x[2]*t + x[1])*np.exp(-t/x[3])))  
-    return y-pre
+    return y - np.concatenate((-x[0]*np.sin(2.*np.pi*x[2]*t + x[1])*np.exp(-t/x[3]), \
+                               +x[0]*np.cos(2.*np.pi*x[2]*t + x[1])*np.exp(-t/x[3])))  
 
 def fun2(x, t, y):
     """ Cost function for regression, single exponential, no DC term 
@@ -72,32 +71,37 @@ def fun2(x, t, y):
     """
     # concatenated real and imaginary parts  
     pre =  np.concatenate((x[0]*np.cos(x[1])*np.exp(-t/x[2]), \
-                       -1.*x[0]*np.sin(x[1])*np.exp(-t/x[2])))  
+                          -x[0]*np.sin(x[1])*np.exp(-t/x[2])))  
     return y-pre
 
 
-def quadratureDetect2(X, Y, tt, x0="None"): 
+def quadratureDetect2(X, Y, tt, method, loss, x0="None"): 
     """ Pure python quadrature detection using Scipy.  
         X = real part of NMR signal 
         Y = imaginary component of NMR signal 
         tt = time 
     """
-    print("Pure Python Quad Det", "TODO look at loss functions and method")
-    # Loss functions, linear, soft_l1, huber, cauchy, arctan 
-    # df
-    loss = 'cauchy'  #  'soft_l1'
-    method = 'trf'   # trf, dogbox, lm 
+
+    #method = ['trf','dogbox','lm'][method_int]
+    #loss = ['linear','soft_l1','cauchy','huber'][loss_int] 
+    print ("method", method, 'loss', loss) 
     if x0=="None":
-        x0 = np.array( [1., 0., 0., .2] ) # A0, zeta, df, T2 
-        res_lsq = least_squares(fun, x0, args=(tt, np.concatenate((X, Y))), loss=loss, f_scale=1.0,\
-            bounds=( [1., -np.pi, -5, .005] , [1000., np.pi, 5, .800] ),
-            method=method 
-            )
+        if method == 'lm':
+            x0 = np.array( [50., 0., 0., .200] ) # A0, zeta, df, T2 
+            res_lsq = least_squares(fun, x0, args=(tt, np.concatenate((X, Y))), loss=loss, f_scale=1.0,\
+                    method=method 
+                    )
+        else:
+            x0 = np.array( [50., 0., 0., .200] ) # A0, zeta, df, T2 
+            res_lsq = least_squares(fun, x0, args=(tt, np.concatenate((X, Y))), loss=loss, f_scale=1.0,\
+                    bounds=( [5, -np.pi, -5, .001] , [1000., np.pi, 5, .800] ),
+                    method=method 
+                    )
         x = res_lsq.x 
         print ("A0={} zeta={} df={} T2={}".format(x[0],x[1],x[2],x[3]))
     else:
         res_lsq = least_squares(fun, x0, args=(tt, np.concatenate((X, Y))), loss=loss, f_scale=1.0,\
-            bounds=( [1., -np.pi, -5, .005] , [1000., np.pi, 5, .800] ),
+            #bounds=( [1., -np.pi, -5, .005] , [1000., np.pi, 5, .800] ),
             method=method 
             )
 

akvo/tressel/harmonic.py

@@ -40,7 +40,7 @@ def harmonicNorm (f0, sN, fs, t, k1, kN, ks):
 def minHarmonic(sN, fs, t, f0, k1, kN, ks):
     # CG, BFGS, Newton-CG, L-BFGS-B, TNC, SLSQP, dogleg, trust-ncg, trust-krylov, trust-exact and trust-constr
     res = minimize(harmonicNorm, np.array((f0)), args=(sN, fs, t, k1, kN, ks), jac='2-point', method='BFGS') # hess=None, bounds=None )
-    print(res)
+    #print(res)
     return harmonicEuler(sN, fs, t, res.x[0], k1, kN, ks)#[0]
 
 def harmonicEuler2 ( sN, fs, t, f0, f0k1, f0kN, f0ks, f1, f1k1, f1kN, f1ks ): 

akvo/tressel/mrsurvey.py

@@ -540,7 +540,7 @@ class GMRDataProcessor(SNMRDataProcessor):
     #def harmonicModel(self, nF, nK, f0, f1, plot, canvas):
     
     def harmonicModel(self, nF, \
-        f0, f0K1, f0KN, f0Ks,  \
+        f0, f0K1, f0KN, f0Ks, f0ns, \
         f1, f1K1, f1KN, f1Ks,  \
         plot, canvas):
         """ nF = number of base frequencies, must be 1 or 2 
@@ -548,6 +548,7 @@ class GMRDataProcessor(SNMRDataProcessor):
             f0K1 = first harmonic to model for first base frequency 
             f0KN = last harmonic to model for the first base frequency 
             f0Ks = subharmonic spacing, set to 1 for no subharmonics.
+            f0Ns = number of segments for f0
             f1 = second base frequency  
             f1K1 = first harmonic to model for second base frequency 
             f1KN = last harmonic to model for the second base frequency 
@@ -566,28 +567,47 @@ class GMRDataProcessor(SNMRDataProcessor):
 
         # Data
         iFID = 0
+
         for pulse in self.DATADICT["PULSES"]:
             self.DATADICT[pulse]["TIMES"] =  self.DATADICT[pulse]["TIMES"]
+
             for ipm in range(self.DATADICT["nPulseMoments"]):
                 for istack in self.DATADICT["stacks"]:
                     canvas.ax1.clear()
                     canvas.ax2.clear()
                     #for ichan in np.append(self.DATADICT[pulse]["chan"], self.DATADICT[pulse]["rchan"]):
                     for ichan in self.DATADICT[pulse]["rchan"]:
-                        
                         if plot:
                             canvas.ax1.plot( self.DATADICT[pulse]["TIMES"], 1e9*self.DATADICT[pulse][ichan][ipm][istack], \
                                 label = "orig " +  pulse + " ipm=" + str(ipm) + " istack=" + str(istack) + " rchan="  + str(ichan))
 
                         if nF == 1:
                             #self.DATADICT[pulse][ichan][ipm][istack] = harmonic.minHarmonic( f0, self.DATADICT[pulse][ichan][ipm][istack], self.samp, nK, self.DATADICT[pulse]["TIMES"] ) 
-                            self.DATADICT[pulse][ichan][ipm][istack] = harmonic.minHarmonic( self.DATADICT[pulse][ichan][ipm][istack], self.samp,  self.DATADICT[pulse]["TIMES"], \
-                                f0, f0K1, f0KN, f0Ks ) 
+                            for iseg in range(f0ns):
+                                if iseg < f0ns-2:
+                                    Nseg = int( np.floor(len( self.DATADICT[pulse]["TIMES"] ) / f0ns) )
+                                else:
+                                    Nseg = int( np.ceil(len( self.DATADICT[pulse]["TIMES"] ) / f0ns) )
+                                self.DATADICT[pulse][ichan][ipm][istack][iseg*Nseg:(iseg+1)*Nseg] = harmonic.minHarmonic( self.DATADICT[pulse][ichan][ipm][istack][iseg*Nseg:(iseg+1)*Nseg], \
+                                            self.samp,  self.DATADICT[pulse]["TIMES"][iseg*Nseg:(iseg+1)*Nseg], \
+                                            f0, f0K1, f0KN, f0Ks ) 
+
+                            #self.DATADICT[pulse][ichan][ipm][istack] = harmonic.minHarmonic( self.DATADICT[pulse][ichan][ipm][istack], self.samp,  self.DATADICT[pulse]["TIMES"], \
+                            #    f0, f0K1, f0KN, f0Ks ) 
                         elif nF == 2:
                             #self.DATADICT[pulse][ichan][ipm][istack] = harmonic.minHarmonic2( f0-1e-2, f1+1e-2, self.DATADICT[pulse][ichan][ipm][istack], self.samp, nK, self.DATADICT[pulse]["TIMES"] ) 
-                            self.DATADICT[pulse][ichan][ipm][istack] = harmonic.minHarmonic2( self.DATADICT[pulse][ichan][ipm][istack], self.samp,  self.DATADICT[pulse]["TIMES"], \
-                                f0-1e-2, f0K1, f0KN, f0Ks,  \
-                                f1+1e-2, f1K1, f1KN, f1Ks ) 
+                            #self.DATADICT[pulse][ichan][ipm][istack] = harmonic.minHarmonic2( self.DATADICT[pulse][ichan][ipm][istack], self.samp,  self.DATADICT[pulse]["TIMES"], \
+                            #    f0-1e-2, f0K1, f0KN, f0Ks,  \
+                            #    f1+1e-2, f1K1, f1KN, f1Ks ) 
+                            for iseg in range(f0ns):
+                                if iseg < f0ns-2:
+                                    Nseg = int( np.floor(len( self.DATADICT[pulse]["TIMES"] ) / f0ns) )
+                                else:
+                                    Nseg = int( np.ceil(len( self.DATADICT[pulse]["TIMES"] ) / f0ns) )
+                                self.DATADICT[pulse][ichan][ipm][istack][iseg*Nseg:(iseg+1)*Nseg] = harmonic.minHarmonic2( self.DATADICT[pulse][ichan][ipm][istack][iseg*Nseg:(iseg+1)*Nseg],\
+                                     self.samp,  self.DATADICT[pulse]["TIMES"][iseg*Nseg:(iseg+1)*Nseg], \
+                                     f0-1e-2, f0K1, f0KN, f0Ks,  \
+                                     f1+1e-2, f1K1, f1KN, f1Ks ) 
                         # plot
                         if plot:
                             canvas.ax1.plot( self.DATADICT[pulse]["TIMES"], 1e9*self.DATADICT[pulse][ichan][ipm][istack], \
@@ -601,14 +621,31 @@ class GMRDataProcessor(SNMRDataProcessor):
                         
                         if nF == 1:
                             #self.DATADICT[pulse][ichan][ipm][istack] = harmonic.minHarmonic( f0, self.DATADICT[pulse][ichan][ipm][istack], self.samp, nK, self.DATADICT[pulse]["TIMES"] ) 
-                            self.DATADICT[pulse][ichan][ipm][istack] = harmonic.minHarmonic( self.DATADICT[pulse][ichan][ipm][istack], self.samp,  self.DATADICT[pulse]["TIMES"], \
-                                f0, f0K1, f0KN, f0Ks ) 
+                            #self.DATADICT[pulse][ichan][ipm][istack] = harmonic.minHarmonic( self.DATADICT[pulse][ichan][ipm][istack], self.samp,  self.DATADICT[pulse]["TIMES"], \
+                            #    f0, f0K1, f0KN, f0Ks ) 
+                            for iseg in range(f0ns):
+                                if iseg < f0ns-2:
+                                    Nseg = int( np.floor(len( self.DATADICT[pulse]["TIMES"] ) / f0ns) )
+                                else:
+                                    Nseg = int( np.ceil(len( self.DATADICT[pulse]["TIMES"] ) / f0ns) )
+                                self.DATADICT[pulse][ichan][ipm][istack][iseg*Nseg:(iseg+1)*Nseg] = harmonic.minHarmonic( self.DATADICT[pulse][ichan][ipm][istack][iseg*Nseg:(iseg+1)*Nseg], 
+                                            self.samp,  self.DATADICT[pulse]["TIMES"][iseg*Nseg:(iseg+1)*Nseg], \
+                                            f0, f0K1, f0KN, f0Ks ) 
                         elif nF == 2:
                             #self.DATADICT[pulse][ichan][ipm][istack] = harmonic.minHarmonic2( f0-1e-2, f1+1e-2, self.DATADICT[pulse][ichan][ipm][istack], self.samp, nK, self.DATADICT[pulse]["TIMES"] ) 
-                        #self.DATADICT[pulse][ichan][ipm][istack] = harmonic.harmonicEuler( f0, self.DATADICT[pulse][ichan][ipm][istack], self.samp, 20, self.DATADICT[pulse]["TIMES"] ) 
-                            self.DATADICT[pulse][ichan][ipm][istack] = harmonic.minHarmonic2( self.DATADICT[pulse][ichan][ipm][istack], self.samp,  self.DATADICT[pulse]["TIMES"], \
-                                f0-1e-2, f0K1, f0KN, f0Ks,  \
-                                f1+1e-2, f1K1, f1KN, f1Ks ) 
+                            #self.DATADICT[pulse][ichan][ipm][istack] = harmonic.harmonicEuler( f0, self.DATADICT[pulse][ichan][ipm][istack], self.samp, 20, self.DATADICT[pulse]["TIMES"] ) 
+                            #self.DATADICT[pulse][ichan][ipm][istack] = harmonic.minHarmonic2( self.DATADICT[pulse][ichan][ipm][istack], self.samp,  self.DATADICT[pulse]["TIMES"], \
+                            #    f0-1e-2, f0K1, f0KN, f0Ks,  \
+                            #    f1+1e-2, f1K1, f1KN, f1Ks ) 
+                            for iseg in range(f0ns):
+                                if iseg < f0ns-2:
+                                    Nseg = int( np.floor(len( self.DATADICT[pulse]["TIMES"] ) / f0ns) )
+                                else:
+                                    Nseg = int( np.ceil(len( self.DATADICT[pulse]["TIMES"] ) / f0ns) )
+                                self.DATADICT[pulse][ichan][ipm][istack][iseg*Nseg:(iseg+1)*Nseg] = harmonic.minHarmonic2( self.DATADICT[pulse][ichan][ipm][istack][iseg*Nseg:(iseg+1)*Nseg],\
+                                     self.samp,  self.DATADICT[pulse]["TIMES"][iseg*Nseg:(iseg+1)*Nseg], \
+                                     f0-1e-2, f0K1, f0KN, f0Ks,  \
+                                     f1+1e-2, f1K1, f1KN, f1Ks ) 
                
                         # plot
                         if plot:
@@ -901,7 +938,7 @@ class GMRDataProcessor(SNMRDataProcessor):
 #                             self.DATADICT[pulse][chsum][ipm][istack] = self.DATADICT[pulse][chans[ich]][ipm][istack] + self.DATADICT[pulse][ch][ipm][istack] 
         self.doneTrigger.emit() 
 
-    def quadDet(self, clip, phase, canvas):
+    def quadDet(self, clip, method, loss, canvas):
 
         from scipy import signal
         self.RotatedAmplitude = True 
@@ -960,10 +997,10 @@ class GMRDataProcessor(SNMRDataProcessor):
                     #############################################################
                     # Rotated amplitude
                     #if ipm != 0:
-                    #[success, E0, df, phi, T2] = decay.quadratureDetect2( ht.real, ht.imag, self.DATADICT[pulse]["TIMES"], (E0,phi,df,T2))
+                    #    [success, E0, df, phi, T2] = decay.quadratureDetect2( ht.real, ht.imag, self.DATADICT[pulse]["TIMES"], (E0,phi,df,T2))
                     #[success, E0, df, phi, T2] = decay.quadratureDetect( ht.real, ht.imag, self.DATADICT[pulse]["TIMES"] )
                     #else:
-                    [success, E0, df, phi, T2] = decay.quadratureDetect2( ht.real, ht.imag, self.DATADICT[pulse]["TIMES"])
+                    [success, E0, df, phi, T2] = decay.quadratureDetect2( ht.real, ht.imag, self.DATADICT[pulse]["TIMES"], method, loss)
                     #[success, E0, df, phi, T2] = decay.quadratureDetect2( ht.real, ht.imag, self.DATADICT[pulse]["TIMES"], (E0,phi,df,T2))
                     #[success, E0, df, phi, T2] = decay.quadratureDetect( ht.real, ht.imag, self.DATADICT[pulse]["TIMES"] )
                     #print("success", success, "E0", E0, "phi", phi, "df", df, "T2", T2)
@@ -1591,7 +1628,6 @@ class GMRDataProcessor(SNMRDataProcessor):
         for pulse in self.DATADICT["PULSES"]:
             H[pulse] = {}
             for ichan in self.DATADICT[pulse]["chan"]:
-                print("setting H", pulse, ichan)
                 H[pulse][ichan] = np.zeros(M)
         
         iFID = 0 
@@ -2371,7 +2407,10 @@ class GMRDataProcessor(SNMRDataProcessor):
         fnames = []
         for istack in procStacks:
             if self.nDAQVersion <= 1.0:
-                self.loadGMRASCIIFID( base + "_" + str(istack) + ".lvm", istack )
+                try:
+                    self.loadGMRASCIIFID( base + "_" + str(istack), istack )
+                except:
+                    self.loadGMRASCIIFID( base + "_" + str(istack) + ".lvm", istack )
             elif self.nDAQVersion < 2.3:
                 #rawfname = base + "_" + str(istack) 
                 self.loadGMRASCIIFID( base + "_" + str(istack), istack )

setup.py

@@ -21,7 +21,7 @@ with open("README.md", "r") as fh:
     long_description = fh.read()
 
 setup(name='Akvo',
-      version='1.2.4',
+      version='1.2.5',
       description='Surface nuclear magnetic resonance workbench',
       long_description=long_description,
       long_description_content_type='text/markdown',