pmagpy 4.3.8__py3-none-any.whl → 4.3.10__py3-none-any.whl

pmagpy/ipmag.py

@@ -23,11 +23,6 @@ from matplotlib.pylab import polyfit
 import matplotlib.ticker as mtick
 from matplotlib import colors
 from matplotlib import cm
-try:
-    import requests
-except ImportError:
-    requests = None
-encoding = "ISO-8859-1"
 from .mapping import map_magic
 from pmagpy import contribution_builder as cb
 from pmagpy import spline
@@ -36,12 +31,16 @@ from pmag_env import set_env
 from . import pmag
 from . import pmagplotlib
 from . import data_model3 as data_model
-from .contribution_builder import Contribution
+#from .contribution_builder import Contribution appears redundant
 from . import validate_upload3 as val_up3
 from numpy.linalg import inv, eig
+try:
+    import requests
+except ImportError:
+    requests = None
+encoding = "ISO-8859-1"
 has_cartopy, cartopy = pmag.import_cartopy()
-
-if has_cartopy == True:
+if has_cartopy:
     import cartopy.crs as ccrs
 
 
@@ -781,7 +780,8 @@ def unsquish(incs, f):
             inc_new = np.rad2deg(np.arctan(inc_new_rad))
             incs_unsquished.append(inc_new)
         return incs_unsquished
-    except:
+    except TypeError as e:
+        print("TypeError caught: ", e) # to catch single values
         inc_rad = np.deg2rad(incs)  # convert to radians
         inc_new_rad = (1.0/f) * np.tan(inc_rad)
         inc_new = np.rad2deg(np.arctan(inc_new_rad))  # convert back to degrees
@@ -822,7 +822,8 @@ def squish(incs, f):
                 np.pi  # convert back to degrees
             incs_squished.append(inc_new)
         return incs_squished
-    except:
+    except TypeError as e: # to catch single values
+        print("TypeError caught: ", e)
         inc_rad = incs * np.pi / 180.  # convert to radians
         inc_new_rad = f * np.tan(inc_rad)
         inc_new = np.arctan(inc_new_rad) * 180. / \
@@ -904,9 +905,9 @@ def do_flip(dec=None, inc=None, di_block=None, unit_vector=True):
         dflip = []
         for rec in di_block:
             d, i = (rec[0] - 180.) % 360., -rec[1]
-            if unit_vector==True:
+            if unit_vector:
                 dflip.append([d, i, 1.0])
-            if unit_vector==False:
+            if not unit_vector:
                 dflip.append([d, i])
         return dflip
 
@@ -1204,63 +1205,79 @@ def common_mean_bootstrap(Data1, Data2, NumSims=1000,
 
     if is_block:
         if ((x_overlap != 0) and (y_overlap != 0) and (z_overlap != 0)):
-            if verbose: print('Pass')
+            if verbose:
+                print('Pass')
             result = 1
             return result
         elif ((x_overlap == 0) and (y_overlap != 0) and (z_overlap != 0)):
-            if verbose: print('Fail, distinct in x')
+            if verbose:
+                print('Fail, distinct in x')
             result = 0
             return result
         elif ((x_overlap != 0) and (y_overlap == 0) and (z_overlap != 0)):
-            if verbose: print('Fail, distinct in y')
+            if verbose:
+                print('Fail, distinct in y')
             result = 0
             return result
         elif ((x_overlap != 0) and (y_overlap != 0) and (z_overlap == 0)):
-            if verbose: print('Fail, distinct in z')
+            if verbose:
+                print('Fail, distinct in z')
             result = 0
             return result
         elif ((x_overlap == 0) and (y_overlap == 0) and (z_overlap != 0)):
-            if verbose: print('Fail, distinct in x and y')
+            if verbose:
+                print('Fail, distinct in x and y')
             result = 0
             return result
         elif ((x_overlap == 0) and (y_overlap != 0) and (z_overlap == 0)):
-            if verbose: print('Fail, distinct in x and z')
+            if verbose:
+                print('Fail, distinct in x and z')
             result = 0
             return result
         elif ((x_overlap != 0) and (y_overlap == 0) and (z_overlap == 0)):
-            if verbose: print('Fail, distinct in y and z')
+            if verbose:
+                print('Fail, distinct in y and z')
             result = 0
             return result
         elif ((x_overlap == 0) and (y_overlap == 0) and (z_overlap == 0)):
-            if verbose: print('Fail, distinct in x, y and z')
+            if verbose:
+                print('Fail, distinct in x, y and z')
             result = 0
             return result
 
     else:
         if x_in_bounds and y_in_bounds and z_in_bounds:
-            if verbose: print('Pass')
+            if verbose:
+                print('Pass')
             return 1
         elif (not x_in_bounds) and y_in_bounds and z_in_bounds:
-            if verbose: print('Fail, distinct in x')
+            if verbose:
+                print('Fail, distinct in x')
             return 0
         elif x_in_bounds and (not y_in_bounds) and z_in_bounds:
-            if verbose: print('Fail, distinct in y')
+            if verbose:
+                print('Fail, distinct in y')
             return 0
         elif x_in_bounds and y_in_bounds and (not z_in_bounds):
-            if verbose: print('Fail, distinct in z')
+            if verbose:
+                print('Fail, distinct in z')
             return 0
         elif (not x_in_bounds) and (not y_in_bounds) and z_in_bounds:
-            if verbose: print('Fail, distinct in x and y')
+            if verbose:
+                print('Fail, distinct in x and y')
             return 0
         elif (not x_in_bounds) and y_in_bounds and (not z_in_bounds):
-            if verbose: print('Fail, distinct in x and z')
+            if verbose:
+                print('Fail, distinct in x and z')
             return 0
         elif x_in_bounds and (not y_in_bounds) and (not z_in_bounds):
-            if verbose: print('Fail, distinct in y and z')
+            if verbose:
+                print('Fail, distinct in y and z')
             return 0
         else:
             # all three out of bounds
-            if verbose: print('Fail, distinct in x, y and z')
+            if verbose:
+                print('Fail, distinct in x, y and z')
             return 0
         
 
@@ -1376,25 +1393,31 @@ def common_mean_bootstrap_H23(Data1, Data2, num_sims=10000, alpha=0.05, plot=Tru
     Lmin_c = np.quantile(Lmin_b,1-alpha) #test critical value
     # (n.b., if Lmin > Lmin_c reject null of common means at alpha significance level)
 
-    if verbose: print("Heslop et al. (2023) test statistic value = {:.2f}".format(Lmin))
-    if verbose: print("Heslop et al. (2023) critical test statistic value = {:.2f}".format(Lmin_c))
-    if verbose: print("Estimated p-value = {:.2f}".format(p))
+    if verbose:
+        print("Heslop et al. (2023) test statistic value = {:.2f}".format(Lmin))
+    if verbose:
+        print("Heslop et al. (2023) critical test statistic value = {:.2f}".format(Lmin_c))
+    if verbose:
+        print("Estimated p-value = {:.2f}".format(p))
     if p < alpha:
-        if verbose:print("Reject null of common means at alpha = {:.2f} confidence level".format(alpha))
+        if verbose:
+            print("Reject null of common means at alpha = {:.2f} confidence level".format(alpha))
         result = 0
     else:
-        if verbose:print("Cannot reject null of common means at alpha = {:.2f} confidence level".format(alpha))
+        if verbose:
+            print("Cannot reject null of common means at alpha = {:.2f} confidence level".format(alpha))
         result = 1
         
-    if plot==True:
+    if plot:
         fig=plt.figure()
         ax1=fig.add_subplot(111)
-        plt.hist(Lmin_b,bins=int(np.sqrt(num_sims)),color = "0.6", ec="0.6");
+        plt.hist(Lmin_b,bins=int(np.sqrt(num_sims)),color = "0.6", ec="0.6")
         #axes = plt.gca()
         y_min, y_max = ax1.get_ylim()
         plt.plot([Lmin,Lmin],[y_min,y_max],'--r',label='Test statistic:')
         plt.plot([Lmin_c,Lmin_c],[y_min,y_max],'-k',label='Critical value')
-        if y_max<Lmin:y_max=Lmin+5
+        if y_max<Lmin:
+            y_max=Lmin+5
         plt.ylim([y_min,y_max])
         plt.xlim(np.min(Lmin_b),np.max(Lmin_b)+10)
         plt.xlabel(r'$\lambda_{\rm{min}}^{(b)}$')
@@ -1467,7 +1490,6 @@ def common_mean_watson(Data1, Data2, NumSims=5000, print_result=True, plot='no',
 
     # do monte carlo simulation of datasets with same kappas as data,
     # but a common mean
-    counter = 0
     Vp = []  # set of Vs from simulations
     for k in range(NumSims):
 
@@ -1604,7 +1626,7 @@ def common_mean_bayes(Data1, Data2, reversal_test=False):
     X1=pmag.dir2cart(Data1)
     X2=pmag.dir2cart(Data2) 
     
-    if reversal_test==True:
+    if reversal_test:
         X12=np.concatenate((X1,-X2), axis=0) #pool site directions
     else:
         X12=np.concatenate((X1,X2), axis=0) #pool site directions
@@ -1869,7 +1891,7 @@ def reversal_test_MM1990(dec=None, inc=None, di_block=None, plot_CDF=False,
         plot_di(di_block=directions1, color='b'),
         plot_di(di_block=do_flip(di_block=directions2), color='r')
 
-    if plot_CDF == False:
+    if not plot_CDF:
         result, angle, critical_angle, classification=common_mean_watson(directions1, directions2, 
                                                                          save=save, save_folder=save_folder, fmt=fmt)
     else:
@@ -2286,24 +2308,24 @@ def plot_di(dec=None, inc=None, di_block=None, color='k', marker='o', markersize
         if len(di_lists) == 2:
             dec, inc = di_lists
     try:
-        length = len(dec)
         for n in range(len(dec)):
             XY = pmag.dimap(dec[n], inc[n])
             if inc[n] >= 0:
                 X_down.append(XY[0])
                 Y_down.append(XY[1])
-                if type(color) == list:
+                if isinstance(color, list):
                     color_down.append(color[n])
                 else:
                     color_down.append(color)
             else:
                 X_up.append(XY[0])
                 Y_up.append(XY[1])
-                if type(color) == list:
+                if isinstance(color, list):
                     color_up.append(color[n])
                 else:
                     color_up.append(color)
-    except:
+    except TypeError as e:
+        print("TypeError caught:", e)
         XY = pmag.dimap(dec, inc)
         if inc >= 0:
             X_down.append(XY[0])
@@ -2327,7 +2349,7 @@ def plot_di(dec=None, inc=None, di_block=None, color='k', marker='o', markersize
     if legend == 'yes':
         plt.legend(loc=2)
     plt.tight_layout()
-    if title != None:
+    if title is not None:
         plt.title(title)
 
 
@@ -2615,9 +2637,9 @@ def plot_pole(map_axis, plon, plat, A95, label='', color='k', edgecolor='k',
     map_axis.scatter(plon, plat, marker=marker,
                      color=color, edgecolors=edgecolor, s=markersize,
                      label=label, zorder=zorder, transform=ccrs.PlateCarree(), alpha = mean_alpha)
-    if filled_pole==False:
+    if not filled_pole:
         equi(map_axis, plon, plat, A95_km, color, alpha=A95_alpha)
-    elif filled_pole==True:
+    elif filled_pole:
         equi(map_axis, plon, plat, A95_km, fill_color, alpha=fill_alpha, outline=outline,fill=True)
     if legend == 'yes':
         plt.legend(loc=2)
@@ -2671,8 +2693,8 @@ def plot_poles(map_axis, plon, plat, A95, label='', color='k', edgecolor='k',
     map_axis.scatter(plon, plat, marker=marker,
                      color=color, edgecolors=edgecolor, s=markersize,
                      label=label, zorder=zorder, transform=ccrs.PlateCarree(), alpha=alpha)
-    if filled_pole==False:
-        if isinstance(color,str)==True:
+    if not filled_pole:
+        if isinstance(color,str):
             for n in range(0,len(A95)):
                 A95_km = A95[n] * 111.32
                 equi(map_axis, plon[n], plat[n], A95_km, color, alpha=alpha, lw=lw)
@@ -2680,8 +2702,8 @@ def plot_poles(map_axis, plon, plat, A95, label='', color='k', edgecolor='k',
             for n in range(0,len(A95)):
                 A95_km = A95[n] * 111.32
                 equi(map_axis, plon[n], plat[n], A95_km, color[n], alpha=alpha, lw=lw)
-    elif filled_pole==True:
-        if isinstance(fill_color,str)==True:
+    elif filled_pole:
+        if isinstance(fill_color,str):
             for n in range(0,len(A95)):
                 A95_km = A95[n] * 111.32
                 equi(map_axis, plon[n], plat[n], A95_km, fill_color, alpha=fill_alpha, outline=outline, fill=True, lw=lw)
@@ -2944,7 +2966,7 @@ def plot_poles_colorbar(map_axis, plons, plats, A95s, colorvalues, vmin, vmax,
             cmap=colormap, norm=plt.Normalize(vmin=vmin, vmax=vmax))
         sm._A = []
         plt.colorbar(sm, orientation='horizontal', shrink=0.8,
-                     pad=0.05, label=colorbar_label)
+                     pad=0.05, label=colorbar_label, ax=map_axis)
 
 
 def plot_vgp(map_axis, vgp_lon=None, vgp_lat=None, di_block=None, label='', color='k', marker='o',
@@ -2978,13 +3000,13 @@ def plot_vgp(map_axis, vgp_lon=None, vgp_lat=None, di_block=None, label='', colo
     if not has_cartopy:
         print('-W- cartopy must be installed to run ipmag.plot_vgp')
         return
-    if di_block != None:
+    if di_block is not None:
         di_lists = unpack_di_block(di_block)
         if len(di_lists) == 3:
             vgp_lon, vgp_lat, intensity = di_lists
         if len(di_lists) == 2:
             vgp_lon, vgp_lat = di_lists
-    if edge==None:
+    if edge is None:
         map_axis.scatter(vgp_lon, vgp_lat, marker=marker, edgecolors=None,
                     s=markersize, color=color, label=label, zorder=zorder, 
                     alpha=alpha, transform=ccrs.PlateCarree())
@@ -3335,10 +3357,10 @@ def make_di_block(dec, inc, unit_vector=True):
         [[180.3, 12.1, 1.0], [179.2, 13.7, 1.0], [177.2, 11.9, 1.0]]
     """
     di_block = []
-    if unit_vector==True:
+    if unit_vector:
         for n in range(0, len(dec)):
             di_block.append([dec[n], inc[n], 1.0])
-    if unit_vector==False:
+    if not unit_vector:
         for n in range(0, len(dec)):
             di_block.append([dec[n], inc[n]])
     return di_block
@@ -3532,14 +3554,14 @@ def equi(map_axis, centerlon, centerlat, radius, color, alpha=1.0, outline=True,
     Y = Y[::-1]
 
     # for non-filled ellipses
-    if fill==False:
+    if not fill:
         plt.plot(X, Y, color=color,
                  transform=ccrs.Geodetic(), alpha=alpha, lw=lw)
 
     # for filled ellipses
     else:
         XY = np.stack([X,Y],axis=1)
-        if outline==True:
+        if outline:
             circle_edge = Polygon(XY,
                                   edgecolor=color,facecolor='none',
                                   transform=ccrs.Geodetic())
@@ -3573,7 +3595,7 @@ def ellipse(map_axis, centerlon, centerlat, major_axis, minor_axis, angle, n=360
         The map object with the ellipse plotted on it
 
     """
-    if transform == None:
+    if transform is None:
         transform=ccrs.PlateCarree()
     if not has_cartopy:
         print('-W- cartopy must be installed to run ipmag.ellipse')
@@ -3601,8 +3623,10 @@ def ellipse(map_axis, centerlon, centerlat, major_axis, minor_axis, angle, n=360
         map_axis.add_patch(poly)
     else:
         try:
-            if "facecolor" in kwargs: kwargs["color"] = kwargs.pop("facecolor")
-            if "edgecolor" in kwargs: kwargs["color"] = kwargs.pop("edgecolor")
+            if "facecolor" in kwargs:
+                kwargs["color"] = kwargs.pop("facecolor")
+            if "edgecolor" in kwargs:
+                kwargs["color"] = kwargs.pop("edgecolor")
             map_axis.plot(X, Y, transform=transform, **kwargs)
             return True
         except ValueError:
@@ -4182,8 +4206,10 @@ def ani_depthplot(spec_file='specimens.txt', samp_file='samples.txt',
             for depth in depths:
                 if depth >= dmin and depth < dmax:
                     plt.axhline(depth,color='blue',linestyle='dotted')
-        if tau_min>.3: tau_min=.3
-        if tau_max<.36: tau_max=.36
+        if tau_min>.3:
+            tau_min=.3
+        if tau_max<.36:
+            tau_max=.36
         ax.axis([tau_min, tau_max, dmax, dmin])
         ax.set_xlabel('Eigenvalues')
         if depth_scale == 'core_depth':
@@ -4369,7 +4395,8 @@ def core_depthplot(input_dir_path='.', meas_file='measurements.txt', spc_file=''
     if spc_size:
         spc_size = int(spc_size)
     title = ""
-    if location:title=location
+    if location:
+        title=location
 
     # file formats not supported for the moment
     ngr_file = ""  # nothing needed, not implemented fully in original script
@@ -5123,8 +5150,8 @@ def download_magic(infile=None, dir_path='.', input_dir_path='',
                     table_dicts=table.to_dict('records')
                     outfile = os.path.join(dir_path, sheet + '.txt')
                     pmag.magic_write(outfile,table_dicts,sheet)
-                except:
-                    print ('sheet not found ',sheet)
+                except Exception as ex:
+                    print (f'sheet not found {sheet}: {ex}')
             return
 
         # try to deal reasonably with unicode errors
@@ -5277,7 +5304,7 @@ def download_magic(infile=None, dir_path='.', input_dir_path='',
                 locnum += 1
                 try:
                     os.mkdir(lpath)
-                except:
+                except FileExistsError:
                     print('directory ', lpath,
                           ' already exists - overwriting everything: {}'.format(overwrite))
                     if not overwrite:
@@ -5326,7 +5353,7 @@ def download_magic_from_id(magic_id, directory='.', share_key=""):
     out_path = os.path.join(directory, file_name)
     
     # Define API endpoint
-    api = f'https://api.earthref.org/v1/MagIC/data'
+    api = 'https://api.earthref.org/v1/MagIC/data'
     params = {'id': magic_id, 'key': share_key} if share_key else {'id': magic_id}
 
     # Perform the request
@@ -5504,7 +5531,7 @@ def upload_magic2(concat=0, dir_path='.', data_model=None):
                 # (this causes validation errors, elsewise)
                 ignore = True
                 for rec in Data:
-                    if ignore == False:
+                    if not ignore:
                         break
                     keys = list(rec.keys())
                     exclude_keys = ['er_citation_names', 'er_site_name', 'er_sample_name',
@@ -5903,7 +5930,8 @@ def create_private_contribution(username="",password=""):
             response['url']=create_response.request.url
             response['id']='None'
             response['errors']=create_response.json()['errors'][0]['message']
-    except:
+    except Exception as e:
+        print("Error creating private contribution:", e)
         pass
     return response
 
@@ -5952,7 +5980,8 @@ def delete_private_contribution(contribution_id,username="",password=""):
             response['url']=delete_response.request.url
             response['id']='None'
             response['errors']=delete_response.json()['errors'][0]['message']
-    except:
+    except Exception as e:
+        print("Error deleting private contribution:", e)
         pass
     return response
 
@@ -6004,8 +6033,8 @@ def upload_to_private_contribution(contribution_id, upload_file,username="",pass
             response['status_code']=False
             response['url']=upload_response.request.url
             #response['errors']=upload_response.json()['errors'][0]['message']
-    except:
-        print ('trouble uploading:')
+    except Exception as e:
+        print ('trouble uploading:', e)
         print (upload_response.json()['errors'])
     return response
 
@@ -6054,7 +6083,8 @@ def validate_private_contribution(contribution_id,username="",password="",verbos
             response['errors']='None'
             errors_dict=json.loads(create_response.text)
             response['validation_results']=errors_dict['validation']['errors']
-            if verbose:print('Validated contribution with ID', contribution_id, ':\n', response['validation_results'])
+            if verbose:
+                print('Validated contribution with ID', contribution_id, ':\n', response['validation_results'])
         else:
             response['status_code']=False
             response['url']=create_response.request.url
@@ -6062,8 +6092,8 @@ def validate_private_contribution(contribution_id,username="",password="",verbos
             response['validation_results']='None'
             print('A private contribution with ID', contribution_id,
                   ' could not be found in your private workspace for validation\n')
-    except:
-        print ('trouble validating:')
+    except Exception as e:
+        print ('trouble validating:', e)
     return response
 
 
@@ -6122,7 +6152,7 @@ def specimens_results_magic(infile='pmag_specimens.txt', measfile='magic_measure
     else:
         nositeints = 1
 
-    # chagne these all to True/False instead of 1/0
+    # change these all to True/False instead of 1/0
 
     if not skip_intensities:
         # set model lat and
@@ -6147,7 +6177,7 @@ def specimens_results_magic(infile='pmag_specimens.txt', measfile='magic_measure
                     ModelLat["sample_lat"] = tmp[1]
                     ModelLats.append(ModelLat)
                 mlat.clos()
-            except:
+            except FileNotFoundError:
                 print("use_paleolatitude option requires a valid paleolatitude file")
         else:
             get_model_lat = 0  # skips VADM calculation entirely
@@ -7043,8 +7073,8 @@ def orientation_magic(or_con=1, dec_correction_con=1, dec_correction=0, bed_corr
                     ImageRecs.append(map_magic.mapping(
                         image_rec, map_magic.image_magic3_2_magic2_map))
             print('image data to be appended to: ', image_file)
-        except:
-            print('problem with existing file: ',
+        except Exception as e:
+            print('problem', e, ' with existing file: ',
                   image_file, ' will create new.')
     #
     # read in file to convert
@@ -7625,8 +7655,8 @@ def azdip_magic(orient_file='orient.txt', samp_file="samples.txt", samp_con="1",
         try:
             SampRecs, file_type = pmag.magic_read(samp_file)
             print("sample data to be appended to: ", samp_file)
-        except:
-            print('problem with existing samp file: ',
+        except Exception as e:
+            print('problem: ', e, ' with existing samp file',
                   samp_file, ' will create new')
     #
     # read in file to convert
@@ -7762,7 +7792,7 @@ class Site(object):
         os.path.join
         self.file_names = []
         for file_name in self.all_file_names:
-            if re.match('.*txt', file_name) != None:
+            if re.match('.*txt', file_name) is not None:
                 self.file_names.append(file_name)
         for i in self.file_names:
             path_to_open = os.path.join(dir_name, i)
@@ -7782,9 +7812,9 @@ class Site(object):
         #self.er_sites_path = er_sites_path
         if self.data_format == "MagIC":
             self.fits = pd.read_csv(self.data_path, sep="\t", skiprows=1)
-            if self.mean_path != None:
+            if self.mean_path is not None:
                 self.means = pd.read_csv(self.mean_path, sep="\t", skiprows=1)
-            if self.er_sites_path != None:
+            if self.er_sites_path is not None:
                 self.location = pd.read_csv(
                     self.er_sites_path, sep="\t", skiprows=1)
         else:
@@ -7794,7 +7824,7 @@ class Site(object):
         self.lon = float(self.location.site_lon)
         # the following exception won't be necessary if parse_all_fits is
         # working properly
-        if self.mean_path == None:
+        if self.mean_path is None:
             raise Exception(
                 'Make fisher means within the demag GUI - functionality for handling this is in progress')
 
@@ -7826,7 +7856,7 @@ class Site(object):
 
     def get_fisher_mean(self, fit_name):
         mean_name = str(fit_name) + "_mean"
-        if self.mean_path != None:
+        if self.mean_path is not None:
             self.fisher_dict = {'dec': float(getattr(self, mean_name).site_dec),
                                 'inc': float(getattr(self, mean_name).site_inc),
                                 'alpha95': float(getattr(self, mean_name).site_alpha95),
@@ -7888,7 +7918,7 @@ class Site(object):
                              float(getattr(self, mean_code).site_alpha95),
                              color=self.random_color, marker='s', label=fits + ' mean')
         plt.legend(**kwargs)
-        if title != None:
+        if title is not None:
             plt.title(title)
         plt.show()
 
@@ -7908,7 +7938,7 @@ class Site(object):
                      float(getattr(self, mean_code).site_inc),
                      float(getattr(self, mean_code).site_alpha95), marker='s', label=fit_name + ' mean')
         plt.legend(**kwargs)
-        if title != None:
+        if title is not None:
             plt.title(title)
         plt.show()
 
@@ -8157,7 +8187,7 @@ def smooth(x, window_len, window='bartlett'):
         return x
 
     # numpy available windows
-    if not window in ['flat', 'hanning', 'hamming', 'bartlett', 'blackman']:
+    if window not in ['flat', 'hanning', 'hamming', 'bartlett', 'blackman']:
         raise ValueError(
             "Window is on of 'flat', 'hanning', 'hamming', 'bartlett', 'blackman'")
 
@@ -8347,8 +8377,8 @@ def curie(path_to_file='.', file_name='', magic=False,
             try:
                 plt.figure(num=PLT[key])
                 plt.savefig(save_folder + '/' + files[key].replace('/', '-'))
-            except:
-                print('could not save: ', PLT[key], files[key])
+            except Exception as e:
+                print('could not save: ', PLT[key], files[key], ' because', e)
                 print("output file format not supported ")
     plt.show()
 
@@ -8386,8 +8416,8 @@ def chi_magic2(path_to_file='.', file_name='magic_measurements.txt',
     if EXP != "":
         try:
             k = experiment_names.index(EXP)
-        except:
-            print("Bad experiment name")
+        except Exception as e:
+            print("Bad experiment name:", e)
             sys.exit()
     while k < len(experiment_names):
         e = experiment_names[k]
@@ -8474,8 +8504,8 @@ def chi_magic2(path_to_file='.', file_name='magic_measurements.txt',
                         plt.figure(num=PLTS[key])
                         plt.savefig(save_folder + '/' +
                                     files[key].replace('/', '-'))
-                    except:
-                        print('could not save: ', PLTS[key], files[key])
+                    except Exception as e:
+                        print('could not save: ', PLTS[key], files[key], ' because', e)
                         print("output file format not supported ")
 
 
@@ -8895,7 +8925,7 @@ def demag_magic(path_to_file='.', file_name='magic_measurements.txt',
     elif plot_by == 'spc':
         plot_key = 'er_specimen_name'
 
-    if treat != None:
+    if treat is not None:
         LT = 'LT-' + treat + '-Z'  # get lab treatment for plotting
         if LT == 'LT-T-Z':
             units, dmag_key = 'K', 'treatment_temp'
@@ -8946,7 +8976,7 @@ def demag_magic(path_to_file='.', file_name='magic_measurements.txt',
     int_key = IntMeths[0]
     # print plotlist
     if individual is not None:
-        if type(individual) == list or type(individual) == tuple:
+        if isinstance(individual, (list, tuple)):
             plotlist = list(individual)
         else:
             plotlist = []
@@ -9110,7 +9140,8 @@ def iplot_hys(fignum, B, M, s):
         poly = polyfit(Baz, Maz, 1)
         Bac = -poly[1]/poly[0]  # x intercept
         hpars['hysteresis_bc'] = '%8.3e' % (0.5 * (abs(Bc) + abs(Bac)))
-    except:
+    except Exception as e:
+        print("cannot compute Bc:", e)
         hpars['hysteresis_bc'] = '0'
     return hpars, deltaM, Bdm, B, Mnorm, MadjN
 
@@ -9294,8 +9325,8 @@ def hysteresis_magic2(path_to_file='.', hyst_file="rmag_hysteresis.txt",
                 ax4.axvline(0, color='k')
                 ax4.set_xlabel('B (T)')
                 ax4.set_ylabel('M/Mr')
-        except:
-            print("not doing it")
+        except Exception as e:
+            print("Processing skipped because:", e)
             hpars['hysteresis_bcr'] = '0'
             hpars['magic_method_codes'] = ""
         plt.gcf()
@@ -9345,10 +9376,10 @@ def find_ei(data, nb=1000, save=False, save_folder='.', fmt='svg',
 
     Returns:
         - equal area plot of original directions
-        - Elongation/inclination pairs as a function of f,  data plus 25 bootstrap samples
+        - Elongation/inclination pairs as a function of f,  data plus num_resample_to_plot bootstrap samples
         - Cumulative distribution of bootstrapped optimal inclinations plus uncertainties.
             Estimate from original data set plotted as solid line
-        - Orientation of principle direction through unflattening
+        - Orientation of principal direction through unflattening
      
     NOTE: 
         If distribution does not have a solution, plot labeled: Pathological.  Some bootstrap samples may have
@@ -9358,7 +9389,6 @@ def find_ei(data, nb=1000, save=False, save_folder='.', fmt='svg',
     print("")
     sys.stdout.flush()
 
-    upper, lower = int(round(.975 * nb)), int(round(.025 * nb))
     E, I = [], []
     plt.figure(num=1, figsize=(4, 4))
     plot_net(1)
@@ -9409,19 +9439,19 @@ def find_ei(data, nb=1000, save=False, save_folder='.', fmt='svg',
     for i in I:
         Eexp.append(pmag.EI(i))
     plt.plot(I, Eexp, 'k')
+    
+    i_lo, i_hi = np.quantile(I, [0.025, 0.975])
     if Inc == 0:
-        title = 'Pathological Distribution: ' + \
-            '[%7.1f, %7.1f]' % (I[lower], I[upper])
         title = 'Pathological Distribution: ' 
     else:
-        title = '%7.1f [%7.1f, %7.1f]' % (Inc, I[lower], I[upper])
+        title = '%7.1f [%7.1f, %7.1f]' % (Inc, i_lo, i_hi)
     if save:
         plt.savefig(save_folder+'/'+figprefix+'_EI_bootstraps'+'.'+fmt, bbox_inches='tight', dpi=300)
 
     cdf_fig_num = 3
     plt.figure(num=cdf_fig_num, figsize=(4, 4))
     pmagplotlib.plot_cdf(cdf_fig_num, I, r'inclination ($^\circ$)', 'r', title)
-    pmagplotlib.plot_vs(cdf_fig_num, [I[lower], I[upper]], 'b', '--')
+    pmagplotlib.plot_vs(cdf_fig_num, [i_lo, i_hi], 'b', '--')
     pmagplotlib.plot_vs(cdf_fig_num, [Inc], 'g', '-')
     pmagplotlib.plot_vs(cdf_fig_num, [Io], 'k', '-')
     if save:
@@ -9454,11 +9484,11 @@ def find_ei(data, nb=1000, save=False, save_folder='.', fmt='svg',
     print("")
     print("The corrected inclination is: " + str(np.round(Inc,2)))
     print("with bootstrapped confidence bounds of: " +
-          str(np.round(I[lower],2)) + ' to ' + str(np.round(I[upper],2)))
+          str(np.round(i_lo,2)) + ' to ' + str(np.round(i_hi,2)))
     print("and elongation parameter of: " + str(np.round(Elong,2)))
     print("The flattening factor is: " + str(np.round(flat_f,2)))
-    f_lower = np.tan(np.deg2rad(Io))/np.tan(np.deg2rad(I[lower]))
-    f_upper = np.tan(np.deg2rad(Io))/np.tan(np.deg2rad(I[upper]))
+    f_lower = np.tan(np.deg2rad(Io))/np.tan(np.deg2rad(i_lo))
+    f_upper = np.tan(np.deg2rad(Io))/np.tan(np.deg2rad(i_hi))
     print("with bootstrapped confidence bounds of: " +
            str(np.round(f_lower,2)) + ' to ' + str(np.round(f_upper,2)))
     
@@ -9474,6 +9504,7 @@ def find_ei(data, nb=1000, save=False, save_folder='.', fmt='svg',
     else:
         return
 
+
 def find_ei_kent(data, site_latitude, site_longitude, kent_color='k', nb=1000, save=False, save_folder='.', fmt='svg',
                 return_new_dirs=False, return_values=False, figprefix='EI', 
                 num_resample_to_plot=1000, EI_color='r', resample_EI_color='grey', resample_EI_alpha=0.05, 
@@ -9530,7 +9561,6 @@ def find_ei_kent(data, site_latitude, site_longitude, kent_color='k', nb=1000, s
     print("")
     sys.stdout.flush()
 
-    upper, lower = int(round(.975 * nb)), int(round(.025 * nb))
     E, I = [], []
 
     ppars = pmag.doprinc(data)
@@ -9569,17 +9599,19 @@ def find_ei_kent(data, site_latitude, site_longitude, kent_color='k', nb=1000, s
     for i in I:
         Eexp.append(pmag.EI(i))
     plt.plot(I, Eexp, 'k')
+    
+    i_lo, i_hi = np.quantile(I, [0.025, 0.975])
     if Inc == 0:
         title = 'Pathological Distribution: ' + \
-            '[%7.1f, %7.1f]' % (I[lower], I[upper])
+            '[%7.1f, %7.1f]' % (i_lo, i_hi)
     else:
-        title = '%7.1f [%7.1f, %7.1f]' % (Inc, I[lower], I[upper])
+        title = '%7.1f [%7.1f, %7.1f]' % (Inc, i_lo, i_hi)
     if save:
         plt.savefig(save_folder+'/'+figprefix+'_bootstraps'+'.'+fmt, bbox_inches='tight', dpi=300)
 
     plt.figure(figsize=(4, 4))
     pmagplotlib.plot_cdf(2, I, r'inclination ($^\circ$)', 'r', title)
-    pmagplotlib.plot_vs(2, [I[lower], I[upper]], 'b', '--')
+    pmagplotlib.plot_vs(2, [i_lo, i_hi], 'b', '--')
     pmagplotlib.plot_vs(2, [Inc], 'g', '-')
     pmagplotlib.plot_vs(2, [Io], 'k', '-')
     if save:
@@ -9663,11 +9695,11 @@ def find_ei_kent(data, site_latitude, site_longitude, kent_color='k', nb=1000, s
     print("")
     print("The corrected inclination is: " + str(np.round(Inc,2)))
     print("with bootstrapped confidence bounds of: " +
-          str(np.round(I[lower],2)) + ' to ' + str(np.round(I[upper],2)))
+          str(np.round(i_lo,2)) + ' to ' + str(np.round(i_hi,2)))
     print("and elongation parameter of: " + str(np.round(Elong,2)))
     print("The flattening factor is: " + str(np.round(flat_f,2)))
-    f_lower = np.tan(np.deg2rad(Io))/np.tan(np.deg2rad(I[lower]))
-    f_upper = np.tan(np.deg2rad(Io))/np.tan(np.deg2rad(I[upper]))
+    f_lower = np.tan(np.deg2rad(Io))/np.tan(np.deg2rad(i_lo))
+    f_upper = np.tan(np.deg2rad(Io))/np.tan(np.deg2rad(i_hi))
     print("with bootstrapped confidence bounds of: " +
            str(np.round(f_lower,2)) + ' to ' + str(np.round(f_upper,2)))
     print("")
@@ -10118,7 +10150,7 @@ def plate_rate_mc(pole1_plon, pole1_plat, pole1_kappa, pole1_N, pole1_age, pole1
                     100000)/((pole1_age - pole2_age) * 1000000)
     print("The rate of paleolatitudinal change implied by the poles pairs in cm/yr is:" + str(rate))
 
-    if random_seed != None:
+    if random_seed is not None:
         np.random.seed(random_seed)
     pole1_MCages = np.random.normal(pole1_age, pole1_age_error, samplesize)
     pole2_MCages = np.random.normal(pole2_age, pole2_age_error, samplesize)
@@ -10320,9 +10352,9 @@ def zeq(path_to_file='.', file='', data="", units='U', calculation_type="DE-BFL"
     if make_plots:
         ZED = {}
         ZED['eqarea'], ZED['zijd'],  ZED['demag'] = 2, 1, 3
-        plt.figure(num=ZED['zijd'], figsize=(5, 5));
-        plt.figure(num=ZED['eqarea'], figsize=(5, 5));
-        plt.figure(num=ZED['demag'], figsize=(5, 5));
+        plt.figure(num=ZED['zijd'], figsize=(5, 5))
+        plt.figure(num=ZED['eqarea'], figsize=(5, 5))
+        plt.figure(num=ZED['demag'], figsize=(5, 5))
 #
 #
         pmagplotlib.plot_zed(ZED, datablock, angle, s, SIunits)  # plot the data
@@ -10345,12 +10377,13 @@ def zeq(path_to_file='.', file='', data="", units='U', calculation_type="DE-BFL"
             recnum += 1
         #pmagplotlib.draw_figs(ZED)
     if begin_pca != "" and end_pca != "" and calculation_type != "":
-        if make_plots:pmagplotlib.plot_zed(ZED, datablock, angle, s,
-                             SIunits)  # plot the data
+        if make_plots:
+            pmagplotlib.plot_zed(ZED, datablock, angle, s, SIunits)  # plot the data
         # get best-fit direction/great circle
         mpars = pmag.domean(datablock, begin_pca, end_pca, calculation_type)
         # plot the best-fit direction/great circle
-        if make_plots:pmagplotlib.plot_dir(ZED, mpars, datablock, angle)
+        if make_plots:
+            pmagplotlib.plot_dir(ZED, mpars, datablock, angle)
         print('Specimen, calc_type, N, min, max, MAD, dec, inc')
         if units == 'mT':
             print('%s %s %i  %6.2f %6.2f %6.1f %7.1f %7.1f' % (s, calculation_type,
@@ -10935,20 +10968,18 @@ def aniso_magic_old(infile='specimens.txt', samp_file='samples.txt', site_file='
                             PDir.append(float(di[0]))
                             PDir.append(float(di[1]))
                             con = 0
-                        except:
+                        except Exception as e:
                             cnt += 1
                             if cnt < 10:
                                 print(
                                     " enter the dec and inc of the pole on one line ")
                             else:
-                                print(
-                                    "ummm - you are doing something wrong - i give up")
+                                print("Error parsing input, please reconsider: ", e)
                                 sys.exit()
                     if set_env.IS_WIN:
                         # if windows, must re-draw everything
                         pmagplotlib.plot_anis(ANIS, Ss, iboot, ihext, ivec, ipar,
                                               title, iplot, comp, vec, Dir, num_bootstraps)
-
                     pmagplotlib.plot_circ(ANIS['data'], PDir, 90., 'g')
                     pmagplotlib.plot_circ(ANIS['conf'], PDir, 90., 'g')
                     if verbose and not plots:
@@ -10966,7 +10997,8 @@ def aniso_magic_old(infile='specimens.txt', samp_file='samples.txt', site_file='
                         try:
                             k = sitelist.index(site)
                             keepon = 0
-                        except:
+                        except Exception as e:
+                            print("Error finding site:", e)
                             tmplist = []
                             for qq in range(len(sitelist)):
                                 if site in sitelist[qq]:
@@ -11184,7 +11216,7 @@ def aniso_magic(infile='specimens.txt', samp_file='samples.txt', site_file='site
                           ivec=ivec, iboot=iboot, vec=vec, num_bootstraps=num_bootstraps)
         try:
             locs = cs_df['location'].unique()
-        except:
+        except KeyError:
             locs = [""]
         locs = "-".join(locs)
         files = {key:  locs + "_" + crd + "_aniso-" + key + ".png" for (key, value) in figs.items()}
@@ -11250,12 +11282,18 @@ def plot_dmag(data="", title="", fignum=1, norm=1,dmag_key='treat_ac_field',inte
     data = data[data[int_key].notnull()]  # fish out all data with this key
     units = "U"  # this  sets the units for plotting to undefined
     if not dmag_key:
-        if 'treat_temp' in data.columns: units = "K"  # kelvin
-        elif 'treat_ac_field' in data.columns: units = "T"  # tesla
-        elif 'treat_mw_energy' in data.columns: units = "J"  # joules
-    if dmag_key=='treat_temp': units='K'
-    if dmag_key=='treat_ac_field': units='T'
-    if dmag_key=='treat_mw_energy': units='J'
+        if 'treat_temp' in data.columns:
+            units = "K"  # kelvin
+        elif 'treat_ac_field' in data.columns:
+            units = "T"  # tesla
+        elif 'treat_mw_energy' in data.columns:
+            units = "J"  # joules
+    if dmag_key=='treat_temp':
+        units='K'
+    if dmag_key=='treat_ac_field':
+        units='T'
+    if dmag_key=='treat_mw_energy':
+        units='J'
     spcs = data.specimen.unique()  # get a list of all specimens in DataFrame data
     if len(spcs)==0:
         print('no data for plotting')
@@ -11642,7 +11680,7 @@ def aarm_magic_dm2(infile, dir_path=".", input_dir_path="",
             RmagSpecRec["er_location_name"] = data[0].get(
                 "er_location_name", "")
             RmagSpecRec["er_specimen_name"] = data[0]["er_specimen_name"]
-            if not "er_sample_name" in RmagSpecRec:
+            if "er_sample_name" not in RmagSpecRec:
                 RmagSpecRec["er_sample_name"] = data[0].get(
                     "er_sample_name", "")
             RmagSpecRec["er_site_name"] = data[0].get("er_site_name", "")
@@ -12026,7 +12064,8 @@ def aarm_magic(meas_file, dir_path=".", input_dir_path="",
         old_spec_df=pd.DataFrame.from_dict(old_spec_recs)
     # check format of output specimens table
     for col in aniso_spec_columns:
-        if col not in old_spec_df.columns:old_spec_df[col]=""
+        if col not in old_spec_df.columns:
+            old_spec_df[col]=""
     df=pd.DataFrame.from_dict(meas_data)
     df=df[df['method_codes'].str.contains('LP-AN-ARM')]
     if not len(df):
@@ -12083,13 +12122,13 @@ def aarm_magic(meas_file, dir_path=".", input_dir_path="",
                 new_spec_df['aniso_type']='AARM'
                 new_spec_df['software_packages']=pmag.get_version()
                 new_spec_df['citations']='This study'
-                if old_specs and 'aniso_s' in old_spec_df.columns and old_spec_df.loc[(old_spec_df['specimen']==spec)&
-                    (old_spec_df['aniso_type']=='AARM')].empty==False: # there is a previous record of AARM for this specimen
+                if old_specs and 'aniso_s' in old_spec_df.columns and not old_spec_df.loc[(old_spec_df['specimen']==spec)&
+                    (old_spec_df['aniso_type']=='AARM')].empty: # there is a previous record of AARM for this specimen
                         print ('replacing existing AARM data for ',spec)
                         for col in ['aniso_ftest','aniso_ftest12','aniso_ftest23','aniso_p','aniso_s','aniso_s_n_measurements','aniso_s_sigma','aniso_type','aniso_v1','aniso_v2','aniso_v3','aniso_ftest_quality','aniso_tilt_correction','description','software_packages','citations']:
                             old_spec_df.loc[(old_spec_df['specimen']==spec)&(old_spec_df['aniso_type']=='AARM')&
                                 (old_spec_df[col].notnull()),col]=new_spec_df[col].values[0] # replace existing AARM data for this specimen
-                elif old_specs and 'aniso_s' in old_spec_df.columns and old_spec_df.loc[old_spec_df['specimen']==spec].empty==False: # there is a no previous record of AARM for this specimen
+                elif old_specs and 'aniso_s' in old_spec_df.columns and not old_spec_df.loc[old_spec_df['specimen']==spec].empty: # there is a no previous record of AARM for this specimen
                     print ('adding AARM data for ',spec)
                     for col in ['aniso_ftest','aniso_ftest12','aniso_ftest23','aniso_p','aniso_s','aniso_s_n_measurements','aniso_s_sigma','aniso_type','aniso_v1','aniso_v2','aniso_v3','aniso_ftest_quality','aniso_tilt_correction','description','software_packages','citations']:
                         old_spec_df.loc[old_spec_df['specimen']==spec,col]=new_spec_df[col].values[0] # add AARM data for this specimen
@@ -12217,7 +12256,7 @@ def atrm_magic_dm2(meas_file, dir_path=".", input_dir_path="",
             RmagSpecRec["er_location_name"] = data[0].get(
                 "er_location_name", "")
             RmagSpecRec["er_specimen_name"] = data[0]["er_specimen_name"]
-            if not "er_sample_name" in RmagSpecRec:
+            if "er_sample_name" not in RmagSpecRec:
                 RmagSpecRec["er_sample_name"] = data[0].get(
                     "er_sample_name", "")
             RmagSpecRec["er_site_name"] = data[0].get("er_site_name", "")
@@ -12621,7 +12660,8 @@ def atrm_magic(meas_file, dir_path=".", input_dir_path="",
         old_spec_df=pd.DataFrame.from_dict(old_spec_recs)
     # check format of output specimens table
     for col in aniso_spec_columns:
-        if col not in old_spec_df.columns:old_spec_df[col]=""
+        if col not in old_spec_df.columns:
+            old_spec_df[col]=""
     df=pd.DataFrame.from_dict(meas_data)
     df=df[df['method_codes'].str.contains('LP-AN-TRM')]
     if not len(df):
@@ -12685,13 +12725,13 @@ def atrm_magic(meas_file, dir_path=".", input_dir_path="",
                 new_spec_df['software_packages']=pmag.get_version()
                 new_spec_df['citations']='This study'
                 new_spec_df['aniso_type']='ATRM'
-                if old_specs and 'aniso_s' in old_spec_df.columns and old_spec_df.loc[(old_spec_df['specimen']==spec)&
-                    (old_spec_df['aniso_type']=='ATRM')].empty==False: # there is a previous record of ATRM for this specimen
+                if old_specs and 'aniso_s' in old_spec_df.columns and not old_spec_df.loc[(old_spec_df['specimen']==spec)&
+                    (old_spec_df['aniso_type']=='ATRM')].empty: # there is a previous record of ATRM for this specimen
                         print ('replacing existing ATRM data for ',spec)
                         for col in ['aniso_alt','aniso_ftest','aniso_ftest12','aniso_ftest23','aniso_p','aniso_s','aniso_s_n_measurements','aniso_s_sigma','aniso_type','aniso_v1','aniso_v2','aniso_v3','aniso_ftest_quality','aniso_tilt_correction','description','method_codes','software_packages','citations']:
                             old_spec_df.loc[(old_spec_df['specimen']==spec)&(old_spec_df['aniso_type']=='ATRM')&
                                 (old_spec_df[col].notnull()),col]=new_spec_df[col].values[0] # replace existing ATRM data for this specimen
-                elif old_specs and 'aniso_s' in old_spec_df.columns and old_spec_df.loc[old_spec_df['specimen']==spec].empty==False: # there is a no previous record of ATRM for this specimen
+                elif old_specs and 'aniso_s' in old_spec_df.columns and not old_spec_df.loc[old_spec_df['specimen']==spec].empty: # there is a no previous record of ATRM for this specimen
                     print ('adding ATRM data for ',spec)
                     for col in ['aniso_alt','aniso_ftest','aniso_ftest12','aniso_ftest23','aniso_p','aniso_s','aniso_s_n_measurements','aniso_s_sigma','aniso_type','aniso_v1','aniso_v2','aniso_v3','aniso_ftest_quality','aniso_tilt_correction','description','method_codes','software_packages','citations']:
                         old_spec_df.loc[old_spec_df['specimen']==spec,col]=new_spec_df[col].values[0] # add ATRM data for this specimen
@@ -12920,7 +12960,7 @@ def zeq_magic(meas_file='measurements.txt', spec_file='',crd='s', dir_path = "."
             try:
                 this_spec_meas_df['magn_moment'] = this_spec_meas_df['magn_moment'].astype(float)
                 this_spec_meas_df['treat_temp'] = this_spec_meas_df['treat_temp'].astype(float)
-            except:
+            except (ValueError, KeyError):
                 print('-W- There are malformed or missing data for specimen {}, skipping'.format(spec))
                 return False, False
             datablock = this_spec_meas_df[['treat_temp', 'dir_dec', 'dir_inc',
@@ -12940,7 +12980,7 @@ def zeq_magic(meas_file='measurements.txt', spec_file='',crd='s', dir_path = "."
             try:
                 this_spec_meas_df['magn_moment'] = this_spec_meas_df['magn_moment'].astype(float)
                 this_spec_meas_df['treat_ac_field'] = this_spec_meas_df['treat_ac_field'].astype(float)
-            except:
+            except Exception:
                 print('-W- There are malformed or missing data for specimen {}, skipping'.format(spec))
                 return False, False
             datablock = this_spec_meas_df[['treat_ac_field', 'dir_dec', 'dir_inc',
@@ -13444,7 +13484,8 @@ def hysteresis_magic(output_dir_path=".", input_dir_path="", spec_file="specimen
     elif n_specs != "all":
         try:
             sids = sids[:n_specs]
-        except:
+        except Exception as e:
+            print("Error selecting n_specs:", e)
             pass
     cnt = 0
     while k < len(sids):
@@ -13617,7 +13658,8 @@ def hysteresis_magic(output_dir_path=".", input_dir_path="", spec_file="specimen
                     try:
                         k = sids.index(specimen)
                         keepon = 0
-                    except:
+                    except Exception as e:
+                        print("Error:", e)
                         tmplist = []
                         for qq in range(len(sids)):
                             if specimen in sids[qq]:
@@ -14664,7 +14706,8 @@ def polemap_magic(loc_file="locations.txt", dir_path=".", interactive=False, crd
     pmagplotlib.plot_map(FIG['map'], [90.], [0.], Opts)
 
     #Opts['pltgrid'] = -1
-    if proj=='merc':Opts['pltgrid']=1
+    if proj=='merc':
+        Opts['pltgrid']=1
     Opts['sym'] = sym
     Opts['symsize'] = symsize
     if len(dates) > 0:
@@ -16008,7 +16051,7 @@ def MADcrit(N,alpha,niter=int(1E8)):
     """
     
     df = N-1 #degrees of freedom of the Wishart distribution
-    X = wishart.rvs(df, scale=np.ones(3),size=niter) #Generate samples from the Wishart distribution
+    X = stats.wishart.rvs(df, scale=np.ones(3),size=niter) #Generate samples from the Wishart distribution
     X = np.sort(np.linalg.eig(X)[0],axis=1) #find and sort the eigenvalues of each case
     #find the MAD values and estimate critical values based on the percentiles corresponding to alpha
     MAD_prc = np.nanpercentile(np.arctan(np.sqrt((X[:,0]+X[:,1])/X[:,2])),alpha*100) 
@@ -16042,3 +16085,126 @@ def MADcrit_95_filter(N, MAD):
         return True
     else:
         return False
+
+def mad_to_a95(mad, n_steps, anchored=False):
+    """
+    Convert MAD (or aMAD) to α95 using the scaling factors of
+    Khokhlov & Hulot (2016), Table 8.
+
+    Parameters
+    ----------
+    mad : float or array-like
+        MAD (for standard PCA) or aMAD (for anchored PCA), in degrees.
+    n_steps : int or array-like of int
+        Number of vector measurements (demagnetization steps) used in the line
+        fit. Can be a scalar (applied to all MAD values) or an array with the
+        same shape as `mad` to allow different n_steps for different specimens.
+        Table 8 of Khokhlov & Hulot (2016) is defined for 3 <= n_steps <= 16.
+        For n_steps > 16, the large-N asymptotic scaling factor is applied.
+    anchored : bool, default False
+        If False, use CMAD factors for standard (unanchored) PCA MAD.
+        If True, use CaMAD factors for anchored PCA aMAD.
+        If an array of bool is provided, it must have the same shape as `mad`.
+
+    Returns
+    -------
+    a95 : float or array-like
+        Estimated α95 in degrees, with the same shape as `mad`.
+        
+    Notes
+    -----
+    For n_steps < 3, this function raises a ValueError because Table 8 is not
+    defined for fewer than three measurements. For n_steps > 16, the asymptotic
+    large-N scaling factor tabulated at n = 100 in Khokhlov & Hulot (2016) is used.
+    
+    Examples
+    --------
+    Convert a MAD value of 4.2 determined from an anchored line fit with 7 steps
+    to α95:
+    >>> ipmag.mad_to_a95(4.2, n_steps=7, anchored=True)
+    >>> 18.102
+    
+    Convert arrays of MAD values with different n_steps for each specimen:
+    >>> mads = np.array([2.0, 3.0, 4.0])
+    >>> steps = np.array([5, 7, 10])
+    >>> ipmag.mad_to_a95(mads, n_steps=steps, anchored=False)
+    array([ 6.36 ,  8.13 , 10.16 ])
+    """
+
+    # Table 8 from Khokhlov & Hulot (2016)
+    CMAD = {
+        3: 7.69,
+        4: 3.90,
+        5: 3.18,
+        6: 2.88,
+        7: 2.71,
+        8: 2.63,
+        9: 2.57,
+        10: 2.54,
+        11: 2.51,
+        12: 2.48,
+        13: 2.46,
+        14: 2.44,
+        15: 2.43,
+        16: 2.43,
+        100: 2.37,
+    }
+
+    CaMAD = {
+        3: 6.00,
+        4: 5.00,
+        5: 4.63,
+        6: 4.43,
+        7: 4.31,
+        8: 4.24,
+        9: 4.18,
+        10: 4.14,
+        11: 4.12,
+        12: 4.11,
+        13: 4.08,
+        14: 4.08,
+        15: 4.06,
+        16: 4.05,
+        100: 3.99,
+    }
+
+    if np.isscalar(n_steps):
+        table = CaMAD if anchored else CMAD
+
+        n = int(n_steps)
+        if n < 3:
+            raise ValueError(
+            f"n_steps={n} is too small; Table 8 is defined for n>=3.")
+        elif n > 16:
+            factor = table[100]  # large-N asymptotic factor
+        else:
+            factor = table[n]
+        # works for scalars, numpy arrays, pandas Series, etc.
+        return mad * factor
+
+    else:
+        # Array-like n_steps → elementwise mapping, same shape as mad
+        mad_arr = np.asarray(mad, dtype=float)
+        n_arr = np.asarray(n_steps)
+        anchored = np.asarray(anchored)
+
+        if mad_arr.shape != n_arr.shape:
+            raise ValueError(
+                "When n_steps is array-like, it must have the same shape as mad."
+            )
+
+        def _factor_for_n(n, anchored):
+            n = int(n)
+            table = CaMAD if anchored else CMAD
+            if n < 3:
+                raise ValueError(
+                    f"n_steps={n} is too small; Table 8 is defined for n>=3."
+                )
+            if n > 16:
+                return table[100]
+            return table[n]
+
+        vec_factor = np.vectorize(_factor_for_n, otypes=[float])
+        factors = vec_factor(n_arr, anchored)
+
+        return mad_arr * factors