Support for transmitter (and receiver) arrays in kernel calculation

akvo/gui/akvoGUI.py

@@ -441,7 +441,20 @@ class ApplicationWindow(QtWidgets.QMainWindow):
 
         #self.K0akvoDataFile = QtWidgets.QFileDialog.getOpenFileName(self, 'Select Datafile File', fpath, r"Akvo datafiles (*.yaml)")[0]
         #akvoData = QtWidgets.QFileDialog.getOpenFileName(self, 'Open Datafile File', fpath, r"Akvo datafiles (*.yaml)")[0]
-        txCoil = self.ui.txListWidget.currentItem().text() 
+
+        txCoilList = self.ui.txListWidget.selectedItems() #currentItem().text() 
+        txCoils = []
+        for txCoil in txCoilList:
+            print("txCoil", txCoil.text())
+            txCoils.append(txCoil.text())
+        
+        rxCoilList = self.ui.txListWidget.selectedItems() #currentItem().text() 
+        rxCoils = []
+        for rxCoil in rxCoilList:
+            print("rxCoil", rxCoil.text())
+            rxCoils.append(rxCoil.text())
+
+
         saveStr = QtWidgets.QFileDialog.getSaveFileName(self, "Save kernel as", fpath, r"Merlin KernelV0 (*.yml)")[0] 
 
         intDict = dict()
@@ -459,6 +472,9 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         intDict["maxLevel"] = self.ui.maxLevel.value()
         intDict["branchTol"] = self.ui.branchTol.value()
 
+        intDict["txCoils"] = txCoils
+        intDict["rxCoils"] = rxCoils
+
         # conductivity model... 
         #tops = self.ui.layerTableWidget.col(0)
         #print("Tops", tops)
@@ -488,12 +504,11 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         kpo = open( "kparams.yml", 'w' )
         node.dump(intDict, kpo)
 
-
         callBox = callScript(  ) #QtWidgets.QDialog() 
         
         callBox.ui = Ui_callScript()
         callBox.ui.setupUi( callBox )
-        callBox.setupCB( self.K0akvoDataFile, txCoil, "kparams.yml", saveStr  )
+        callBox.setupCB( self.K0akvoDataFile, "kparams.yml", saveStr  )
         
         callBox.exec_()
         callBox.show()

akvo/gui/callScript.py

@@ -10,7 +10,7 @@ class callScript(QDialog):
     #def __init__(self):
     #    super().__init__()
     
-    def setupCB(self, akvoData, TxCoil, kernelParams, SaveStr):
+    def setupCB(self, akvoData, kernelParams, SaveStr):
 
         #QtGui.QWidget.__init__(self)
         #uic.loadUi('redirect.ui', self)
@@ -24,7 +24,7 @@ class callScript(QDialog):
 
         #print ('Starting process')
         #self.process.start('python', ['calcAkvoKernel.py', akvoData, TxCoil, SaveStr])
-        self.process.start('akvoK0', [ akvoData, TxCoil, kernelParams, SaveStr])
+        self.process.start('akvoK0', [ akvoData, kernelParams, SaveStr])
 
     def setupQTInv(self, params):
 

akvo/gui/main.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1142</width>
+    <width>1230</width>
     <height>875</height>
    </rect>
   </property>
@@ -638,7 +638,7 @@ background: dark grey;
                 <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Noto Sans'; font-size:12pt; font-weight:400; font-style:italic;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Noto Sans'; font-size:9pt; font-weight:400; font-style:italic;&quot;&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'DejaVu Serif'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                </property>
               </widget>
@@ -710,8 +710,8 @@ background: dark grey;
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>537</width>
-         <height>982</height>
+         <width>543</width>
+         <height>889</height>
         </rect>
        </property>
        <property name="sizePolicy">
@@ -3761,6 +3761,9 @@ background: dark grey;
                  <property name="alternatingRowColors">
                   <bool>true</bool>
                  </property>
+                 <property name="selectionMode">
+                  <enum>QAbstractItemView::MultiSelection</enum>
+                 </property>
                 </widget>
                </item>
                <item row="2" column="1" colspan="2">
@@ -3774,6 +3777,9 @@ background: dark grey;
                  <property name="alternatingRowColors">
                   <bool>true</bool>
                  </property>
+                 <property name="selectionMode">
+                  <enum>QAbstractItemView::MultiSelection</enum>
+                 </property>
                 </widget>
                </item>
               </layout>
@@ -4106,8 +4112,8 @@ background: dark grey;
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>96</width>
-               <height>26</height>
+               <width>98</width>
+               <height>28</height>
               </rect>
              </property>
              <attribute name="label">
@@ -4119,8 +4125,8 @@ background: dark grey;
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>96</width>
-               <height>26</height>
+               <width>411</width>
+               <height>79</height>
               </rect>
              </property>
              <attribute name="label">
@@ -4416,8 +4422,8 @@ background: red;
              <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Noto Sans'; font-size:12pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:9pt;&quot;&gt;All processing steps are recorded here for your records&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Noto Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif';&quot;&gt;All processing steps are recorded here for your records&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
            </widget>
            <widget class="QLabel" name="label_74">
@@ -4447,8 +4453,8 @@ p, li { white-space: pre-wrap; }
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>1142</width>
-     <height>30</height>
+     <width>1230</width>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuOpen_GMR_RAW_Header">

akvo/tressel/calcAkvoKernel.py

@@ -62,7 +62,7 @@ def loadAkvoData(fnamein):
 
 def main():
 
-    if len(sys.argv) < 3:
+    if len(sys.argv) < 2:
         print ("usage  python calcAkvoKernel.py   AkvoDataset.yaml  Coil1.yaml kparams.yaml  SaveString.yaml " )
         exit()
 
@@ -75,14 +75,34 @@ def main():
     fT = AKVO.transFreq
     #gamma = 2.67518e8
     #B0 = (fL*2.*np.pi) /gamma * 1e9
+    
+    # read in kernel params
+    kparams = loadAkvoData( sys.argv[2] )
  
-    Coil1 = em1d.PolygonalWireAntenna.DeSerialize( sys.argv[2] )
-    Coil1.SetNumberOfFrequencies(1)
-    Coil1.SetFrequency(0, fT) 
-    Coil1.SetCurrent(1.)
+    Kern = mrln.KernelV0()
 
-    # read in kernel params
-    kparams = loadAkvoData( sys.argv[3] )
+    TX = []
+    for tx in kparams['txCoils']:
+        Coil1 = em1d.PolygonalWireAntenna.DeSerialize( tx )
+        Coil1.SetNumberOfFrequencies(1)
+        Coil1.SetFrequency(0, fT) 
+        Coil1.SetCurrent(1.)
+        Kern.PushCoil( tx.split('.yml')[0], Coil1 )
+        TX.append( tx.split('.yml')[0] )
+    
+    RX = []
+    for rx in kparams['rxCoils']:
+        if rx not in kparams['txCoils']:
+            print("new recv")
+            Coil1 = em1d.PolygonalWireAntenna.DeSerialize( rx )
+            Coil1.SetNumberOfFrequencies(1)
+            Coil1.SetFrequency(0, fT) 
+            Coil1.SetCurrent(1.)
+            Kern.PushCoil( rx.split('.yml')[0], Coil1 )
+        else:
+            print("reuse")
+        RX.append( rx.split('.yml')[0] )
+    
 
     ## TODO 
     # pass this in...
@@ -110,8 +130,7 @@ def main():
 
     lmod.SetMagneticFieldIncDecMag( B_inc, B_dec, B0, lc.NANOTESLA )
 
-    Kern = mrln.KernelV0()
-    Kern.PushCoil( "Coil 1", Coil1 )
+
     Kern.SetLayeredEarthEM( lmod );
     Kern.SetIntegrationSize( (kparams["size_n"], kparams["size_e"], kparams["size_d"]) )
     Kern.SetIntegrationOrigin( (kparams["origin_n"], kparams["origin_e"], kparams["origin_d"]) )
@@ -141,10 +160,11 @@ def main():
     # autAkvoDataNode = YAML::LoadFile(argv[4]);
     # Kern->AlignWithAkvoDataset( AkvoDataNode );
 
-    Kern.CalculateK0( ["Coil 1"], ["Coil 1"], False )
+    #Kern.CalculateK0( ["Coil 1"], ["Coil 1"], False )
+    Kern.CalculateK0( TX, RX, False )
 
     #yml = open( 'test' + str(Kern.GetTolerance()) + '.yaml', 'w')
-    yml = open( sys.argv[4], 'w' )
+    yml = open( sys.argv[3], 'w' )
     print(Kern, file=yml)
 
     #