[FOLDER RESTURCTURING #22] designated datapath as new single path variable and changed variable assignments accordingly for Project() and Event() classes and partially in MainWindow().

pylot/core/util/array_map.py

@@ -172,9 +172,9 @@ class Array_map(QtWidgets.QWidget):
         self.canvas.fig.tight_layout()
 
     def add_merid_paral(self):
-        self.gridlines = self.canvas.axes.gridlines(draw_labels=False, alpha=0.8, color='gray', linewidth=self.linewidth/2, zorder=7)
+        self.gridlines = self.canvas.axes.gridlines(draw_labels=False, alpha=0.6, color='gray', linewidth=self.linewidth/2, zorder=7)
         # TODO: current cartopy version does not support label removal. Devs are working on it.
-        #  Should be fixed with next cartopy version
+        #  Should be fixed in coming cartopy versions
         # self.gridlines.xformatter = LONGITUDE_FORMATTER
         # self.gridlines.yformatter = LATITUDE_FORMATTER
 
@@ -511,7 +511,7 @@ class Array_map(QtWidgets.QWidget):
         levels = np.linspace(self.get_min_from_picks(), self.get_max_from_picks(), nlevel)
 
         self.contourf = self.canvas.axes.contourf(self.longrid, self.latgrid, self.picksgrid_active, levels,
-                                                  linewidths=self.linewidth*4, transform=ccrs.PlateCarree(),
+                                                  linewidths=self.linewidth*5, transform=ccrs.PlateCarree(),
                                                   alpha=0.4, zorder=8, cmap=self.get_colormap())
 
     def get_colormap(self):

pylot/core/util/event.py

@@ -21,12 +21,13 @@ class Event(ObsPyEvent):
         :param path: path to event directory
         :type path: str
         """
+        # TODO: remove rootpath and database
         self.pylot_id = path.split('/')[-1]
         # initialize super class
         super(Event, self).__init__(resource_id=ResourceIdentifier('smi:local/' + self.pylot_id))
         self.path = path
         self.database = path.split('/')[-2]
-        self.datapath = path.split('/')[-3]
+        self.datapath = os.path.split(path)[0]  # path.split('/')[-3]
         self.rootpath = '/' + os.path.join(*path.split('/')[:-3])
         self.pylot_autopicks = {}
         self.pylot_picks = {}

pylot/core/util/generate_array_maps.py

@@ -3,6 +3,14 @@
 # small script that creates array maps for each event within a previously generated PyLoT project
 
 import os
+num_thread = "16"
+os.environ["OMP_NUM_THREADS"] = num_thread
+os.environ["OPENBLAS_NUM_THREADS"] = num_thread
+os.environ["MKL_NUM_THREADS"] = num_thread
+os.environ["VECLIB_MAXIMUM_THREADS"] = num_thread
+os.environ["NUMEXPR_NUM_THREADS"] = num_thread
+os.environ["NUMEXPR_MAX_THREADS"] = num_thread
+
 import multiprocessing
 import sys
 import glob
@@ -61,7 +69,7 @@ def array_map_worker(input_dict):
             metadata = Metadata(inventory=metadata_path, verbosity=0)
 
         # create figure to plot on
-        fig, ax = plt.subplots(figsize=(16, 9))
+        fig, ax = plt.subplots(figsize=(15, 9))
         # create array map object
         map = Array_map(None, metadata, parameter=input_dict['project'].parameter, axes=ax,
                         width=2.13e6, height=1.2e6, pointsize=25., linewidth=1.0)