Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop

QtPyLoT.py

@@ -250,6 +250,10 @@ class MainWindow(QMainWindow):
         prefIcon.addPixmap(QPixmap(':/icons/preferences.png'))
         paraIcon = QIcon()
         paraIcon.addPixmap(QPixmap(':/icons/parameter.png'))
+        self.inventoryIcon = QIcon()
+        self.inventoryIcon.addPixmap(QPixmap(':/icons/inventory.png'))
+        self.mapIcon = QIcon()
+        self.mapIcon.addPixmap(QPixmap(':/icons/map.png'))
         self.autopicksicon_small = QIcon()
         self.autopicksicon_small.addPixmap(QPixmap(':/icons/autopicksicon_small.png'))
         self.manupicksicon_small = QIcon()
@@ -370,12 +374,12 @@ class MainWindow(QMainWindow):
                                              """Adjust filter parameters.""")
         self.inventoryAction = self.createAction(self, "Select &Inventory ...",
                                               self.get_new_metadata,
-                                              "Ctrl+I", None,
+                                              "Ctrl+I", self.inventoryIcon,
                                               """Select metadata for current project""",
                                               False)
         self.initMapAction = self.createAction(self, "Init array map ...",
                                             self.init_array_map,
-                                            "Ctrl+M", None,
+                                            "Ctrl+M", self.mapIcon,
                                             """Initialize array map with current metadata""",
                                             False)
         self.initMapAction.setEnabled(False)
@@ -500,7 +504,7 @@ class MainWindow(QMainWindow):
 
         pickMenuActions = (self.parameterAction,)
         self.pickMenu = self.menuBar().addMenu('&Picking')
-        self.autoPickMenu = self.pickMenu.addMenu('Automatic picking')
+        self.autoPickMenu = self.pickMenu.addMenu(self.autopicksicon_small, 'Automatic picking')
         self.autoPickMenu.setEnabled(False)
 
         autoPickActions = (self.auto_pick, self.auto_pick_local, self.auto_pick_sge)
@@ -2159,9 +2163,11 @@ class MainWindow(QMainWindow):
         self.inventory_label = QLabel('No inventory set...')
         # init inventory button
         self.new_inv_button = QPushButton('Set inventory file')
+        self.new_inv_button.setIcon(self.inventoryIcon)
         self.new_inv_button.clicked.connect(self.inventoryAction.trigger)
 
         self.init_map_button = QPushButton('Init array map')
+        self.init_map_button.setIcon(self.mapIcon)
         self.init_map_button.clicked.connect(self.initMapAction.trigger)
         self.init_map_button.setEnabled(False)
 

autoPyLoT.py

@@ -132,7 +132,7 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, even
         datastructure.setExpandFields(exf)
 
         # check if default location routine NLLoc is available
-        if parameter['nllocbin'] and locflag:
+        if real_None(parameter['nllocbin']) and locflag:
             # get NLLoc-root path
             nllocroot = parameter.get('nllocroot')
             # get path to NLLoc executable
@@ -417,8 +417,10 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, even
             data.applyEVTData(picks)
             if savexml:
                 if savepath == 'None' or savepath == None:
-                    savepath = eventpath
-                fnqml = '%s/PyLoT_%s' % (savepath, evID)
+                    saveEvtPath = eventpath
+                else:
+                    saveEvtPath = savepath
+                fnqml = '%s/PyLoT_%s' % (saveEvtPath, evID)
                 data.exportEvent(fnqml, fnext='.xml', fcheck=['auto', 'magnitude', 'origin'])
             if locflag == 1:
                 # HYPO71

icons.qrc

@@ -23,6 +23,8 @@
         <file>icons/savepicks.png</file>
         <file>icons/preferences.png</file>
         <file>icons/parameter.png</file>
+        <file>icons/inventory.png</file>
+        <file>icons/map.png</file>
         <file>icons/openloc.png</file>
         <file>icons/compare_button.png</file>
         <file>icons/locate_button.png</file>

pylot/core/pick/autopick.py

@@ -63,6 +63,9 @@ def autopickevent(data, param, iplot=0, fig_dict=None, ncores=0, metadata=None,
         print('iPlot Flag active: NO MULTIPROCESSING possible.')
         return all_onsets
 
+    print('Autopickstation: Distribute autopicking for {} '
+          'stations on {} cores.'.format(len(input_tuples), ncores))
+
     pool = gen_Pool(ncores)
     result = pool.map(call_autopickstation, input_tuples)
     pool.close()

pylot/core/util/widgets.py

@@ -2949,7 +2949,12 @@ class Submit2Grid(QWidget):
     def genShellScript(self, pp_export):
         outfile = open(self.script_fn, 'w')
         outfile.write('#!/bin/sh\n\n')
-        outfile.write('python autoPyLoT.py -i {} \n'.format(pp_export))
+        try:
+            ncores = int(self.textedit.text().split()[-1])
+            ncores = '--ncores {}'.format(ncores)
+        except:
+            ncores = None
+        outfile.write('python autoPyLoT.py -i {} {}\n'.format(pp_export, ncores))
         outfile.close()
 
     def execute_script(self):