pmagpy-cli 4.2.109__tar.gz → 4.2.115__tar.gz

{pmagpy-cli-4.2.109 → pmagpy-cli-4.2.115}/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.1
 Name: pmagpy-cli
-Version: 4.2.109
+Version: 4.2.115
 Summary: Analysis tools for paleo/rock magnetic data
 Home-page: https://github.com/PmagPy/PmagPy
 Author: PmagPy team
 Author-email: ltauxe@ucsd.edu
 License: BSD-3
 Keywords: geology paleomagnetism
-Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 2
@@ -167,5 +166,3 @@ This code and the PmagPy cookbook (http://earthref.org/PmagPy/cookbook) are comp
 
 
 This code can be freely used, modified, and shared. It is licensed under a 3-clause BSD license. See [license.txt](https://github.com/ltauxe/PmagPy/blob/master/license.txt) for details.
-
-

{pmagpy-cli-4.2.109 → pmagpy-cli-4.2.115}/dialogs/pmag_gui_dialogs.py

@@ -2030,6 +2030,11 @@ class convert_PMD_files_to_MagIC(convert_files_to_MagIC):
         #---sizer 7 ---
         self.bSizer7 = pw.site_lat_lon(pnl)
 
+        #---sizer 8 ----
+        TEXT="Demagnetization Method: t for thermal, af for AF demag (optional):\nDemag type is automatically detected for files using the H or M labels\nfor AF demag or the T label for thermal demag in step names."
+        
+        self.bSizer8 = pw.labeled_text_field(pnl, TEXT)
+
         #---buttons ---
         hboxok = pw.btn_panel(self, pnl)
 
@@ -2044,6 +2049,7 @@ class convert_PMD_files_to_MagIC(convert_files_to_MagIC):
         vbox.Add(self.bSizer4, flag=wx.ALIGN_LEFT|wx.TOP, border=10)
         vbox.Add(self.bSizer5, flag=wx.ALIGN_LEFT|wx.TOP, border=10)
         vbox.Add(self.bSizer7, flag=wx.ALIGN_LEFT|wx.TOP, border=10)
+        vbox.Add(self.bSizer8, flag=wx.ALIGN_LEFT|wx.TOP, border=10)
         vbox.Add(self.bSizer6, flag=wx.ALIGN_LEFT|wx.TOP, border=10)
         vbox.Add(hboxok, flag=wx.ALIGN_CENTER)
         vbox.AddSpacer(20)
@@ -2068,7 +2074,7 @@ class convert_PMD_files_to_MagIC(convert_files_to_MagIC):
         directory = self.bSizer0.return_value() or '.'
         options['input_dir_path'] = directory
         files = os.listdir(directory)
-        files = [str(f) for f in files if str(f).endswith('.pmd')]
+        files = [str(f) for f in files if str(f).upper().endswith('.PMD')]
         if files:
             samp_outfile = files[0][:files[0].find('.')] + files[-1][:files[-1].find('.')] + "_samples.txt"
             options['samp_file'] = samp_outfile
@@ -2082,6 +2088,11 @@ class convert_PMD_files_to_MagIC(convert_files_to_MagIC):
         options['specnum'] = spc
         loc_name = self.bSizer4.return_value()
         options['location'] = loc_name
+        dmg = self.bSizer8.return_value().lower() #Make lower case because the dmg options are t or af
+        options['dmg'] = dmg
+        if dmg != "" and dmg != "t" and dmg != "af":
+            pw.simple_warning("The only valid demagnetization methods t and af, but program recieved: %s"%dmg)
+            return
         if loc_name:
             location = loc_name
             loc_name = "-loc " + loc_name
@@ -2113,7 +2124,7 @@ class convert_PMD_files_to_MagIC(convert_files_to_MagIC):
             options['site_file'] = site_outfile
             loc_outfile = f[:f.find('.')] + "_locations.txt"
             options['loc_file'] = loc_outfile
-            COMMAND = "pmd_magic.py -WD {} -f {} -F {} -Fsp {} -Fsa {} -Fsi {} -Flo {} -ncn {} {} -spc {} {} {} {} {} {}".format(WD, f, outfile, spec_outfile, samp_outfile, site_outfile, loc_outfile, ncn, particulars, spc, replicate, ID, loc_name, lat, lon)
+            COMMAND = "pmd_magic.py -WD {} -f {} -F {} -Fsp {} -Fsa {} -Fsi {} -Flo {} -dmg {} -ncn {} {} -spc {} {} {} {} {} {}".format(WD, f, outfile, spec_outfile, samp_outfile, site_outfile, loc_outfile, dmg, ncn, particulars, spc, replicate, ID, loc_name, lat, lon)
 
             program_ran, error_message = convert.pmd(**options)
             if not program_ran:

{pmagpy-cli-4.2.109 → pmagpy-cli-4.2.115}/dialogs/thellier_gui_dialogs.py

@@ -76,7 +76,7 @@ class PI_Statistics_Dialog(wx.Dialog):
         self.stat_by_category['Additivity Checks'] = [
             'specimen_ac_n', 'specimen_dac']
         self.DESC = {}
-        self.DESC['specimen_frac'] = 'The angle between the applied field direction and the ChRM direction of the NRM as determined from the free-floating PCA fit to the selected demagnetization steps of the paleointensity experiment'
+        self.DESC['specimen_frac'] = 'NRM fraction used for the best-fit on an Arai diagram determined entirely by vector difference sum calculation (Shaar and Tauxe, 2013).'
         self.DESC['specimen_int_n'] = 'Number of measurements included in field strength calculations'
         self.DESC['specimen_alpha_prime'] = 'Angular difference between the anchored best-fit direction from the paleointensity experiment and an independent measure of the paleomagnetic direction. NOT CURRENTLY AVAILABLE'
         self.DESC['specimen_alpha'] = 'Angular difference between the anchored and free-floating best-fit directions on a vector component diagram'
@@ -206,7 +206,7 @@ class PI_Statistics_Dialog(wx.Dialog):
         hbox = wx.BoxSizer(wx.HORIZONTAL)
         hbox.AddSpacer(10)
         for num in sorted(self.bSizers):
-            hbox.Add(self.bSizers[num], flag=wx.ALIGN_CENTER_HORIZONTAL)
+            hbox.Add(self.bSizers[num], flag=wx.ALIGN_CENTER_VERTICAL)
             hbox.AddSpacer(10)
         #hbox.Add(bSizer0, flag=wx.ALIGN_CENTER_HORIZONTAL)
         #hbox.AddSpacer(10)

pmagpy-cli-4.2.115/pmagpy/test/test_fisher_sample.py

@@ -0,0 +1,20 @@
+import numpy as np
+from numpy.testing import assert_allclose
+
+from pmagpy.ipmag import fishrot
+
+def test_fishrot_type_1():
+    res = fishrot(k=10, n=1, di_block=False)
+    assert len(res)==2 and res[0].shape == (1,)
+    
+def test_fishrot_type_1_diblock():
+    res = fishrot(k=10, n=1, di_block=True)
+    assert res.shape == (1,3)
+    
+def test_fishrot_type_n():
+    res = fishrot(k=10, n=5, di_block=False)
+    assert len(res)==2 and res[0].shape == (5,)
+    
+def test_fishrot_type_n_diblock():
+    res = fishrot(k=10, n=5, di_block=True)
+    assert res.shape == (5,3)

pmagpy-cli-4.2.115/pmagpy/test/test_igrf.py

@@ -0,0 +1,14 @@
+from pmagpy import ipmag
+from numpy.testing import assert_allclose
+
+
+def test_IGRF():
+    
+    result = ipmag.igrf([1999, 30, 20, 50])
+    reference = [1.20288657e+00, 2.82331112e+01, 3.9782338913649881e+04]
+
+    print(result, reference)
+    
+    assert_allclose(result, reference, rtol=.1)
+
+

pmagpy-cli-4.2.115/pmagpy/test/test_rotations.py

@@ -0,0 +1,21 @@
+import numpy as np
+from numpy.testing import assert_allclose
+
+from pmagpy.pmag import dodirot, dodirot_V
+
+def test_dodirot_type():
+    assert isinstance(dodirot(0,90,5,85), tuple)
+
+def test_dodirot_1():
+    assert_allclose(dodirot(0,90,5,85), (5.0, 85.0), rtol=10e-4)
+    
+def test_dodirot_V_type():
+    di_array = np.array([[0,90],[0,90],[0,90]])
+    assert isinstance(dodirot_V(di_array,5,15), np.ndarray)
+
+def test_dodirot_V_1():
+    di_array = np.array([[0,90],[0,90],[0,90]])
+    result = np.array([[ 5., 15.],
+                       [ 5., 15.],
+                       [ 5., 15.]])
+    assert_allclose(dodirot_V(di_array,5,15), result, rtol=10e-4)

{pmagpy-cli-4.2.109 → pmagpy-cli-4.2.115}/pmagpy_cli.egg-info/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.1
 Name: pmagpy-cli
-Version: 4.2.109
+Version: 4.2.115
 Summary: Analysis tools for paleo/rock magnetic data
 Home-page: https://github.com/PmagPy/PmagPy
 Author: PmagPy team
 Author-email: ltauxe@ucsd.edu
 License: BSD-3
 Keywords: geology paleomagnetism
-Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 2
@@ -167,5 +166,3 @@ This code and the PmagPy cookbook (http://earthref.org/PmagPy/cookbook) are comp
 
 
 This code can be freely used, modified, and shared. It is licensed under a 3-clause BSD license. See [license.txt](https://github.com/ltauxe/PmagPy/blob/master/license.txt) for details.
-
-

{pmagpy-cli-4.2.109 → pmagpy-cli-4.2.115}/pmagpy_cli.egg-info/SOURCES.txt

@@ -84,6 +84,10 @@ pmagpy/data_model/suggested_vocabularies_February_6_2017.json
 pmagpy/mapping/__init__.py
 pmagpy/mapping/map_magic.py
 pmagpy/mapping/maps.py
+pmagpy/test/__init__.py
+pmagpy/test/test_fisher_sample.py
+pmagpy/test/test_igrf.py
+pmagpy/test/test_rotations.py
 pmagpy_cli.egg-info/PKG-INFO
 pmagpy_cli.egg-info/SOURCES.txt
 pmagpy_cli.egg-info/dependency_links.txt
@@ -281,4 +285,5 @@ programs/conversion_scripts2/tdt_magic2.py
 programs/conversion_scripts2/utrecht_magic2.py
 programs/images/PmagPy.ico
 programs/images/PmagPy_16x16.ico
-programs/images/PmagPy_32x32.ico
+programs/images/PmagPy_32x32.ico
+programs/images/pmagpy_logo.ico

{pmagpy-cli-4.2.109 → pmagpy-cli-4.2.115}/pmagpy_cli.egg-info/entry_points.txt

@@ -167,4 +167,3 @@ magic_gui2.py = programs.magic_gui2:main
 pmag_gui = programs.pmag_gui:main
 pmag_gui.py = programs.pmag_gui:main
 thellier_gui.py = programs.thellier_gui:main
-

{pmagpy-cli-4.2.109 → pmagpy-cli-4.2.115}/programs/aniso_magic.py

@@ -177,7 +177,7 @@ def main():
         vec = int(args[ind+1])-1
         Dir = [float(args[ind+2]), float(args[ind+3])]
     ipmag.aniso_magic_nb(infile, samp_file, site_file, verbose,
-                         ipar, ihext, ivec, isite, False, iboot,
+                         ipar, ihext, ivec, isite, iboot,
                          vec, Dir, PDir, crd, num_bootstraps,
                          dir_path, save_plots=save_plots, interactive=interactive,
                          fmt=fmt)

{pmagpy-cli-4.2.109 → pmagpy-cli-4.2.115}/programs/conversion_scripts/irm_magic.py

@@ -22,18 +22,19 @@ OPTIONS
     -ID DIRECTORY: directory for input files, default = current directory
     -WD DIRECTORY: directory for output files, default = current directory
     -f FILE: the IRM Excel data file name, required 
-       (the file name flag may be ommited and just the file name used, if no other flags are present)
+       (the file name flag may be omitted and just the file name used, if no other flags are present)
     -cite CITATION: specify the citation, default = This study (use "This study" unless you already 
                     have the DOI for the paper the dataset is associated with.
     -M flag: the MPMSdc file type (default:0) 
              use 0 for IRM file type as of July 7th, 2021. Data has header with the specimen name on 4 columns
              use 1 for earlier type where the first two header columns are "specimen" and the specimen name
-             example IRM data file Sprain is of this type
+             example IRM data file Sprain et al. 2021 (earthref.org/MagIC/19216) is of this type.
 EXAMPLE
     Command line for the example dataset:
     irm_magic.py example.xlsx -   (example dataset yet to be choosen)
 
 
+
 """
 
 import sys

{pmagpy-cli-4.2.109 → pmagpy-cli-4.2.115}/programs/conversion_scripts/pmd_magic.py

@@ -22,8 +22,9 @@ OPTIONS
     -spc NUM : specify number of characters to designate a  specimen, default = 1
     -loc LOCNAME : specify location/study name
     -A: don't average replicate measurements
+    -dmg TYPE: set default demag type ('t' for thermal, 'af' for AF demag
     -ncn NCON: specify naming convention
-   Sample naming convention:
+    Sample naming convention:
         [1] XXXXY: where XXXX is an arbitrary length site designation and Y
             is the single character sample designation.  e.g., TG001a is the
             first sample from site TG001.    [default]
@@ -71,6 +72,7 @@ def main():
     specnum = pmag.get_named_arg('-spc', 0)
     samp_con = pmag.get_named_arg('-ncn', '1')
     location = pmag.get_named_arg('-loc', 'unknown')
+    dmg = pmag.get_named_arg('-dmg', '')
     noave = 0
     if "-A" in sys.argv:
         noave = 1
@@ -78,7 +80,7 @@ def main():
     convert.pmd(mag_file, dir_path, input_dir_path, meas_file,
                 spec_file, samp_file, site_file, loc_file,
                 lat, lon, specnum, samp_con, location, noave,
-                meth_code)
+                meth_code,dmg)
 
 
 if __name__ == "__main__":

{pmagpy-cli-4.2.109 → pmagpy-cli-4.2.115}/programs/conversion_scripts/squidm_magic.py

@@ -56,7 +56,7 @@ def main():
         ZirconRun3 -- (file hierarchy)
 
     SYNTAX
-        mit_squid_magic.py [command line options]
+        squid_magic.py [command line options]
 
     OPTIONS
         -h: prints the help message and quits.

{pmagpy-cli-4.2.109 → pmagpy-cli-4.2.115}/programs/demag_gui.py

@@ -1993,7 +1993,7 @@ class Demag_GUI(wx.Frame):
         means_to_plot = []
         for tm in toggleable_means:
             if not tm.IsChecked():
-                means_to_plot.append(tm.GetLabel())
+                means_to_plot.append(tm.GetItemLabel())
         return means_to_plot
 
     def calc_and_plot_sample_orient_check(self):
@@ -2924,7 +2924,6 @@ class Demag_GUI(wx.Frame):
         -------
         nested dictionary 2.5 formated criteria data
         """
-#        import pdb; pdb.set_trace()
         acceptance_criteria = pmag.initialize_acceptance_criteria()
         if self.data_model == 3:
             if criteria_file_name == None:
@@ -3007,7 +3006,10 @@ class Demag_GUI(wx.Frame):
             try:
                 # preformes regression
                 mpars = pmag.domean(block, beg_pca, end_pca, calculation_type)
+                mpars["measurement_step_min_unit"] = reduce(lambda x,y="": x+y, [c if not c.isnumeric() and c!="." and c!="-" else "" for c in tmin])
+                mpars["measurement_step_max_unit"] = reduce(lambda x,y="": x+y, [c if not c.isnumeric() and c!="." and c!="-" else "" for c in tmax])
             except:
+                print("Error: Could not do PCA recieved the following fit information")
                 print((block, beg_pca, end_pca, calculation_type,
                        specimen, fit.name, tmin, tmax, coordinate_system))
                 return
@@ -3088,6 +3090,8 @@ class Demag_GUI(wx.Frame):
                 return
             try:
                 mpars = pmag.domean(block, i, i+step_size, calculation_type)
+                mpars["measurement_step_min_unit"] = reduce(lambda x,y="": x+y, [c if not c.isnumeric() and c!="." else "" for c in self.T_list[i]])
+                mpars["measurement_step_max_unit"] = reduce(lambda x,y="": x+y, [c if not c.isnumeric() and c!="." else "" for c in self.T_list[i+step_size]])
             except (IndexError, TypeError) as e:
                 return
             if 'specimen_mad' in list(mpars.keys()):

{pmagpy-cli-4.2.109 → pmagpy-cli-4.2.115}/programs/irm_unmix.py

@@ -8,7 +8,6 @@ this is for IRM decompose, based on log gaussian,
 this is based on python3.6 and PyQt5
 
 author: Jiabo Liu
-GFZ Potsdam
 #====================================================================
 '''
 
@@ -92,22 +91,32 @@ def loadData(filePath=None):
     log10 interploted data
     #====================================================================
     '''
-    skip_from = '    Field       Remanence  '
+    skip_3900_form = '    Field       Remanence  '
+    skip_8600_form = '##DATA TABLE Moment (m)'
     with open(filePath,'rb') as fr:
         #f = fr.read()
         for i,line in enumerate(fr,1):
             #print(line)
-            if skip_from in str(line):
+            if skip_8600_form in str(line):
+                skiprows=i+1
+                coding='ISO-8859-15'
+                names=['Step','Iteration','Segment','field','remanance',
+                       'Time Stamp [s]','Field Status','Moment (m) Status']
+                break
+            elif skip_3900_form in str(line):
                 skiprows=i+2
+                coding='ISO-8859-15'
+                names=['field','remanance']
                 break
             else:
                 skiprows=None
+                coding='UTF-8'
+                names=['field','remanance']
+    #print('skiprows= ',skiprows)
     skiprows = skiprows if isinstance(skiprows,int) else 1
-    #rawDf = pd.read_csv(filePath, sep='\s+', delimiter=',', names=['field','remanance'],
-    #                    dtype=np.float64, skiprows=skiprows, skipfooter=1,engine='python')
-    rawDf = pd.read_csv(filePath, delimiter=',', names=['field','remanance'],
-                        dtype=np.float64, skiprows=skiprows, 
-                        skipfooter=1,engine='python', encoding='cp1252')
+    rawDf = pd.read_csv(filePath, delimiter=',', names=names,
+                        skiprows=skiprows, skipfooter=1,engine='python',
+                        encoding=coding)
     rawDf = rawDf[(rawDf['field']>0)]
     rawDf = rawDf.sort_values(by=['field'])
     rawDf['field'] = rawDf['field']*10**3 # mT to # T

{pmagpy-cli-4.2.109 → pmagpy-cli-4.2.115}/programs/pmag_gui.py

@@ -92,7 +92,6 @@ class MagMainFrame(wx.Frame):
         menubar = pmag_gui_menu.MagICMenu(self)
         self.SetMenuBar(menubar)
         self.menubar = menubar
-        self.refresh_btns()
 
 
     def get_wd_data(self):
@@ -134,9 +133,8 @@ class MagMainFrame(wx.Frame):
         in_bSizer0 = wx.BoxSizer(wx.HORIZONTAL)
 
         self.dir_path = wx.TextCtrl(self.panel, id=-1, size=(700,35), style=wx.TE_READONLY)
-        self.change_dir_button = buttons.GenButton(self.panel, id=-1, label="Change directory",size=(130, 35))
+        self.change_dir_button = wx.Button(self.panel, wx.ID_ANY, label="Change directory",size=(130, 35), style=wx.BORDER_NONE)
         self.change_dir_button.SetBackgroundColour("#F8F8FF")
-        self.change_dir_button.InitColours()
         self.change_dir_button.SetForegroundColour("#000000")
         self.Bind(wx.EVT_BUTTON, self.on_change_dir_button, self.change_dir_button)
 
@@ -177,33 +175,33 @@ class MagMainFrame(wx.Frame):
         sb.SetFont(sizer_font)
 
         text = "1. Convert magnetometer files to MagIC format"
-        self.btn1 = buttons.GenButton(self.panel, id=-1, label=text,
-                                      size=(450, 50), name='step 1')
+        self.btn1 = wx.Button(self.panel, id=-1, label=text,
+                                      size=(450, 50), name='step 1', style=wx.BORDER_NONE)
         self.btn1.SetBackgroundColour("#FDC68A")
         self.btn1.SetForegroundColour("#000000")
         self.Bind(wx.EVT_BUTTON, self.on_convert_file, self.btn1)
 
         text = "2. (optional) Calculate geographic/tilt-corrected directions"
-        self.btn2 = buttons.GenButton(self.panel, id=-1, label=text, size=(450, 50), name='step 2')
+        self.btn2 = wx.Button(self.panel, id=-1, label=text, size=(450, 50), name='step 2', style=wx.BORDER_NONE)
         self.btn2.SetBackgroundColour("#FDC68A")
         self.btn2.SetForegroundColour("#000000")
         self.Bind(wx.EVT_BUTTON, self.on_btn_orientation, self.btn2)
         text = "3. (optional) Add MagIC metadata for uploading data to MagIC "
-        self.btn3 = buttons.GenButton(self.panel, id=-1, label=text, size=(450, 50), name='step 3')
+        self.btn3 = wx.Button(self.panel, id=-1, label=text, size=(450, 50), name='step 3', style=wx.BORDER_NONE)
         self.btn3.SetBackgroundColour("#FDC68A")
         self.btn3.SetForegroundColour("#000000")
         self.Bind(wx.EVT_BUTTON, self.on_btn_metadata, self.btn3)
 
         text = "Download or unpack MagIC text file"
-        self.btn4 = buttons.GenButton(self.panel, id=-1, label=text, size=(330, 50))
+        self.btn4 = wx.Button(self.panel, id=-1, label=text, size=(330, 50), style=wx.BORDER_NONE)
         self.btn4.SetBackgroundColour("#FDC68A")
         self.btn4.SetForegroundColour("#000000")
         self.Bind(wx.EVT_BUTTON, self.on_btn_unpack, self.btn4)
 
 
         text = "Convert directory to 3.0. format (legacy data only)"
-        self.btn1a = buttons.GenButton(self.panel, id=-1, label=text,
-                                       size=(330, 50), name='step 1a')
+        self.btn1a = wx.Button(self.panel, id=-1, label=text,
+                                       size=(330, 50), name='step 1a', style=wx.BORDER_NONE)
         self.btn1a.SetBackgroundColour("#FDC68A")
         self.btn1a.SetForegroundColour("#000000")
         self.Bind(wx.EVT_BUTTON, self.on_btn_convert_3, self.btn1a)
@@ -251,13 +249,13 @@ class MagMainFrame(wx.Frame):
         sb.SetFont(sizer_font)
 
         text = "Demag GUI"
-        self.btn_demag_gui = buttons.GenButton(self.panel, id=-1, label=text, size=(300, 50), name='demag gui')
+        self.btn_demag_gui = wx.Button(self.panel, id=-1, label=text, size=(300, 50), name='demag gui', style=wx.BORDER_NONE)
         self.btn_demag_gui.SetBackgroundColour("#6ECFF6")
         self.btn_demag_gui.SetForegroundColour("#000000")
         self.Bind(wx.EVT_BUTTON, self.on_btn_demag_gui, self.btn_demag_gui)
 
         text = "Thellier GUI"
-        self.btn_thellier_gui = buttons.GenButton(self.panel, id=-1, label=text, size=(300, 50), name='thellier gui')
+        self.btn_thellier_gui = wx.Button(self.panel, id=-1, label=text, size=(300, 50), name='thellier gui', style=wx.BORDER_NONE)
         self.btn_thellier_gui.SetBackgroundColour("#6ECFF6")
         self.btn_thellier_gui.SetForegroundColour("#000000")
         self.Bind(wx.EVT_BUTTON, self.on_btn_thellier_gui, self.btn_thellier_gui)
@@ -279,7 +277,7 @@ class MagMainFrame(wx.Frame):
         sb.SetFont(sizer_font)
 
         text = "Create MagIC txt file for upload"
-        self.btn_upload = buttons.GenButton(self.panel, id=-1, label=text, size=(300, 50))
+        self.btn_upload = wx.Button(self.panel, id=-1, label=text, size=(300, 50), style=wx.BORDER_NONE)
         self.btn_upload.SetBackgroundColour("#C4DF9B")
         self.btn_upload.SetForegroundColour("#000000")
 
@@ -319,19 +317,6 @@ class MagMainFrame(wx.Frame):
 
     #----------------------------------------------------------------------
 
-    def refresh_btns(self):
-        self.change_dir_button.OnPaint(-1)
-        self.btn1.OnPaint(-1)
-        self.btn2.OnPaint(-1)
-        self.btn3.OnPaint(-1)
-        self.btn4.OnPaint(-1)
-        self.btn1a.OnPaint(-1)
-        self.btn_demag_gui.OnPaint(-1)
-        self.btn_thellier_gui.OnPaint(-1)
-        self.btn_upload.OnPaint(-1)
-
-    #----------------------------------------------------------------------
-
     def get_dir(self):
         """
         Choose a working directory dialog.
@@ -869,9 +854,9 @@ INFORMATION
     print('-I- Starting Pmag GUI - please be patient')
     # if redirect is true, wxpython makes its own output window for stdout/stderr
     if 'darwin' in sys.platform and (not set_env.IS_FROZEN):
-        app = wx.App(redirect=False)
+        app = wx.App(redirect=True)
     else:
-        app = wx.App(redirect=False) #SET TO TRUE BEFORE COMMIT
+        app = wx.App(redirect=True) #SET TO TRUE BEFORE COMMIT
     dir_path = pmag.get_named_arg("-WD", None)
     app.frame = MagMainFrame(WD=dir_path)
     app.frame.Show()