Reworking multiple frequency harmonic modelling

akvo/gui/akvoGUI.py

@@ -173,6 +173,13 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         self.ui.f0KNSpin.valueChanged.connect( self.LCDHarmonics )
         self.ui.f0KsSpin.valueChanged.connect( self.LCDHarmonics )
         self.ui.f0Spin.valueChanged.connect( self.LCDHarmonics )
+
+        self.ui.NHarmonicsFreqsSpin.valueChanged.connect( self.LCDHarmonics2 )
+        
+        self.ui.f1K1Spin.valueChanged.connect( self.LCDHarmonics2 )
+        self.ui.f1KNSpin.valueChanged.connect( self.LCDHarmonics2 )
+        self.ui.f1KsSpin.valueChanged.connect( self.LCDHarmonics2 )
+        self.ui.f1Spin.valueChanged.connect( self.LCDHarmonics2 )
  
         self.ui.plotQD.setEnabled(False) 
         self.ui.plotQD.pressed.connect( self.plotQD )
@@ -266,6 +273,19 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         self.ui.lcdHNF.display( self.ui.f0Spin.value() * self.ui.f0KNSpin.value() )
         self.ui.lcdf0NK.setEnabled(True)
         self.ui.lcdf0NK.display( (self.ui.f0KNSpin.value()+1-self.ui.f0K1Spin.value()) * self.ui.f0KsSpin.value() )
+    
+    def LCDHarmonics2(self):
+        if self.ui.NHarmonicsFreqsSpin.value() == 2:
+            self.ui.lcdH1F2.setEnabled(True)
+            self.ui.lcdH1F2.display( self.ui.f1Spin.value() * self.ui.f1K1Spin.value() )
+            self.ui.lcdHNF2.setEnabled(True)
+            self.ui.lcdHNF2.display( self.ui.f1Spin.value() * self.ui.f1KNSpin.value() )
+            self.ui.lcdf0NK2.setEnabled(True)
+            self.ui.lcdf0NK2.display( (self.ui.f1KNSpin.value()+1-self.ui.f1K1Spin.value()) * self.ui.f1KsSpin.value() )
+        else:
+            self.ui.lcdH1F2.setEnabled(False)
+            self.ui.lcdHNF2.setEnabled(False)
+            self.ui.lcdf0NK2.setEnabled(False)
 
     def closeTabs(self):
         #self.ui.ProcTabs.removeTab(idx)    
@@ -1103,7 +1123,11 @@ class ApplicationWindow(QtWidgets.QMainWindow):
             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"]["f1"] = str( self.ui.f1Spin.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 
             self.Log()
         else:
@@ -1122,6 +1146,9 @@ class ApplicationWindow(QtWidgets.QMainWindow):
                  self.ui.f0KNSpin.value(), \
                  self.ui.f0KsSpin.value(), \
                  self.ui.f1Spin.value(), \
+                 self.ui.f1K1Spin.value(), \
+                 self.ui.f1KNSpin.value(), \
+                 self.ui.f1KsSpin.value(), \
                  self.ui.plotHarmonic.isChecked(), \
                  self.ui.mplwidget \
                 ) \

akvo/gui/main.ui

@@ -1005,7 +1005,7 @@ background: dark grey;
               <property name="maximumSize">
                <size>
                 <width>16777215</width>
-                <height>350</height>
+                <height>430</height>
                </size>
               </property>
               <property name="toolTip">
@@ -1021,55 +1021,97 @@ background: dark grey;
                <bool>true</bool>
               </property>
               <layout class="QGridLayout" name="gridLayout_9">
-               <item row="1" column="2">
-                <widget class="Line" name="line_2">
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
+               <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="8" column="1">
-                <widget class="Line" name="line_8">
+               <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="5" column="0">
-                <widget class="QLabel" name="label_33">
+               <item row="0" column="0">
+                <widget class="QLabel" name="label_26">
                  <property name="text">
-                  <string>Sub-harmonics </string>
+                  <string>N freqs</string>
                  </property>
                 </widget>
                </item>
-               <item row="7" column="1">
-                <widget class="QDoubleSpinBox" name="f1Spin">
+               <item row="8" column="0">
+                <widget class="QLabel" name="label_34">
+                 <property name="text">
+                  <string>First harmonic 2</string>
+                 </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>
+                 </property>
                  <property name="value">
                   <double>60.000000000000000</double>
                  </property>
                 </widget>
                </item>
-               <item row="8" column="2">
-                <widget class="Line" name="line_9">
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
+               <item row="7" column="1">
+                <widget class="QDoubleSpinBox" name="f1Spin">
+                 <property name="maximum">
+                  <double>25000.000000000000000</double>
+                 </property>
+                 <property name="value">
+                  <double>60.000000000000000</double>
                  </property>
                 </widget>
                </item>
-               <item row="3" column="0">
-                <widget class="QLabel" name="label_11">
-                 <property name="text">
-                  <string>First harmonic 1</string>
+               <item row="4" column="1">
+                <widget class="QSpinBox" name="f0KNSpin">
+                 <property name="minimum">
+                  <number>2</number>
+                 </property>
+                 <property name="value">
+                  <number>40</number>
                  </property>
                 </widget>
                </item>
-               <item row="6" column="1">
-                <widget class="Line" name="line_5">
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
+               <item row="4" 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>
@@ -1080,20 +1122,17 @@ background: dark grey;
                  </property>
                 </widget>
                </item>
-               <item row="8" column="0">
-                <widget class="Line" name="line_7">
+               <item row="11" column="2">
+                <widget class="Line" name="line_9">
                  <property name="orientation">
                   <enum>Qt::Horizontal</enum>
                  </property>
                 </widget>
                </item>
-               <item row="10" column="1">
-                <widget class="QCheckBox" name="plotHarmonic">
+               <item row="3" column="0">
+                <widget class="QLabel" name="label_11">
                  <property name="text">
-                  <string>Plot</string>
-                 </property>
-                 <property name="checked">
-                  <bool>true</bool>
+                  <string>First harmonic 1</string>
                  </property>
                 </widget>
                </item>
@@ -1104,64 +1143,67 @@ background: dark grey;
                  </property>
                 </widget>
                </item>
-               <item row="4" 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>
+               <item row="11" column="1">
+                <widget class="Line" name="line_8">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
                  </property>
                 </widget>
                </item>
-               <item row="4" column="1">
-                <widget class="QSpinBox" name="f0KNSpin">
+               <item row="8" column="1">
+                <widget class="QSpinBox" name="f1K1Spin">
                  <property name="minimum">
-                  <number>2</number>
+                  <number>1</number>
                  </property>
-                 <property name="value">
-                  <number>40</number>
+                </widget>
+               </item>
+               <item row="10" column="1">
+                <widget class="QSpinBox" name="f1KsSpin">
+                 <property name="minimum">
+                  <number>1</number>
+                 </property>
+                 <property name="maximum">
+                  <number>3</number>
                  </property>
                 </widget>
                </item>
-               <item row="2" column="0">
-                <widget class="QLabel" name="label_25">
+               <item row="4" column="0">
+                <widget class="QLabel" name="label_31">
                  <property name="text">
-                  <string>Base freq. 1</string>
+                  <string>Last harmonic 1</string>
                  </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>
+               <item row="1" column="0">
+                <widget class="Line" name="line_3">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
                  </property>
-                 <property name="value">
-                  <double>60.000000000000000</double>
+                </widget>
+               </item>
+               <item row="1" column="2">
+                <widget class="Line" name="line_2">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
                  </property>
                 </widget>
                </item>
-               <item row="3" column="2">
-                <widget class="QLCDNumber" name="lcdH1F">
+               <item row="5" column="2">
+                <widget class="QLCDNumber" name="lcdf0NK">
                  <property name="styleSheet">
-                  <string notr="true">#lcdH1F {
-  color: green;
-  background: black;
+                  <string notr="true">#lcdf0NK { 
+ color: green;
+ background: black;
 }
 
-#lcdH1F:disabled {
+#lcdf0NK:disabled {
   color: grey;
   background: dark grey;
 }</string>
                  </property>
+                 <property name="intValue" stdset="0">
+                  <number>0</number>
+                 </property>
                 </widget>
                </item>
                <item row="7" column="0">
@@ -1171,30 +1213,36 @@ background: dark grey;
                  </property>
                 </widget>
                </item>
-               <item row="0" column="1">
-                <widget class="QSpinBox" name="NHarmonicsFreqsSpin">
+               <item row="3" column="1">
+                <widget class="QSpinBox" name="f0K1Spin">
                  <property name="minimum">
                   <number>1</number>
                  </property>
                  <property name="maximum">
-                  <number>1</number>
+                  <number>50</number>
                  </property>
                  <property name="value">
                   <number>1</number>
                  </property>
                 </widget>
                </item>
-               <item row="6" column="0">
-                <widget class="Line" name="line_4">
+               <item row="11" column="0">
+                <widget class="Line" name="line_7">
                  <property name="orientation">
                   <enum>Qt::Horizontal</enum>
                  </property>
                 </widget>
                </item>
-               <item row="4" column="0">
-                <widget class="QLabel" name="label_31">
-                 <property name="text">
-                  <string>Last harmonic 1</string>
+               <item row="0" column="1">
+                <widget class="QSpinBox" name="NHarmonicsFreqsSpin">
+                 <property name="minimum">
+                  <number>1</number>
+                 </property>
+                 <property name="maximum">
+                  <number>2</number>
+                 </property>
+                 <property name="value">
+                  <number>1</number>
                  </property>
                 </widget>
                </item>
@@ -1214,14 +1262,14 @@ background: dark grey;
                  </property>
                 </widget>
                </item>
-               <item row="1" column="0">
-                <widget class="Line" name="line_3">
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
+               <item row="2" column="0">
+                <widget class="QLabel" name="label_25">
+                 <property name="text">
+                  <string>Base freq. 1</string>
                  </property>
                 </widget>
                </item>
-               <item row="10" column="2">
+               <item row="13" column="2">
                 <widget class="QPushButton" name="harmonicGO">
                  <property name="layoutDirection">
                   <enum>Qt::LeftToRight</enum>
@@ -1235,41 +1283,86 @@ background: dark grey;
                  </property>
                 </widget>
                </item>
-               <item row="3" column="1">
-                <widget class="QSpinBox" name="f0K1Spin">
-                 <property name="minimum">
-                  <number>1</number>
+               <item row="5" column="0">
+                <widget class="QLabel" name="label_33">
+                 <property name="text">
+                  <string>Sub-harmonics </string>
                  </property>
-                 <property name="maximum">
-                  <number>50</number>
+                </widget>
+               </item>
+               <item row="6" column="0">
+                <widget class="Line" name="line_4">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
                  </property>
-                 <property name="value">
-                  <number>1</number>
+                </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>
                  </property>
                 </widget>
                </item>
-               <item row="0" column="0">
-                <widget class="QLabel" name="label_26">
-                 <property name="text">
-                  <string>N freqs</string>
+               <item row="9" column="2">
+                <widget class="QLCDNumber" name="lcdHNF2">
+                 <property name="styleSheet">
+                  <string notr="true">#lcdHNF2 { 
+ color: green;
+ background: black;
+}
+
+#lcdHNF2:disabled {
+  color: grey;
+  background: dark grey;
+}</string>
                  </property>
                 </widget>
                </item>
-               <item row="5" column="2">
-                <widget class="QLCDNumber" name="lcdf0NK">
+               <item row="8" 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>
+                </widget>
+               </item>
+               <item row="9" column="0">
+                <widget class="QLabel" name="label_35">
+                 <property name="text">
+                  <string>Last harmonic 2</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="10" column="0">
+                <widget class="QLabel" name="label_41">
+                 <property name="text">
+                  <string>Sub-harmonics</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="9" column="1">
+                <widget class="QSpinBox" name="f1KNSpin">
+                 <property name="minimum">
+                  <number>2</number>
+                 </property>
+                 <property name="value">
+                  <number>40</number>
                  </property>
                 </widget>
                </item>
@@ -1592,8 +1685,8 @@ background: dark grey;
               <widget class="QPushButton" name="calcQGO">
                <property name="geometry">
                 <rect>
-                 <x>380</x>
-                 <y>80</y>
+                 <x>400</x>
+                 <y>100</y>
                  <width>84</width>
                  <height>30</height>
                 </rect>

akvo/tressel/harmonic.py

@@ -40,7 +40,10 @@ def harmonicEuler ( sN, fs, t, f0, k1, kN, ks ):
     res = sN-h # residual 
 
 def harmonicNorm (f0, sN, fs, t, k1, kN, ks): 
-    return np.linalg.norm( harmonicEuler(sN, fs, t, f0, k1, kN, ks)) 
+    #print ("norm diff")
+    #return np.linalg.norm( harmonicEuler(sN, fs, t, f0, k1, kN, ks)) 
+    ii =  sN < (3.* np.std(sN))
+    return np.linalg.norm( harmonicEuler(sN, fs, t, f0, k1, kN, ks)[ii] ) 
 
 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

akvo/tressel/mrsurvey.py

@@ -519,14 +519,20 @@ class GMRDataProcessor(SNMRDataProcessor):
 
     #def harmonicModel(self, nF, nK, f0, f1, plot, canvas):
     
-    def harmonicModel(self, nF, f0, f0K1, f0KN, f0Ks, f1, plot, canvas):
+    def harmonicModel(self, nF, \
+        f0, f0K1, f0KN, f0Ks,  \
+        f1, f1K1, f1KN, K1Ks,  \
+        plot, canvas):
         """ nF = number of base frequencies, must be 1 or 2 
             f0 = first base frequency  
             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.
-            plot = should Akvo plot the results 
             f1 = second base frequency  
+            f1K1 = first harmonic to model for second base frequency 
+            f1KN = last harmonic to model for the second base frequency 
+            f1Ks = subharmonic spacing for the second base frequency, set to 1 for no subharmonics.
+            plot = should Akvo plot the results 
             canvas = mpl plotting axis      
         """
         #print("harmonic modelling...", f0)