WIP: QOL upgrades and removal of ehtim dependency

generate_ringplot.py

@@ -2,7 +2,6 @@
 import numpy as np
 from kgeo.equatorial_images import Iobs
 from kgeo.equatorial_lensing import rho_of_req, critical_curve
-import ehtim as eh
 import matplotlib.pyplot as plt
 from kgeo.bfields import Bfield
 from kgeo.velocities import Velocity

kgeo/equatorial_lensing.py

@@ -10,7 +10,7 @@
 import matplotlib.pyplot as plt
 from kgeo.kerr_raytracing_utils import my_cbrt, radial_roots, mino_total, is_outside_crit, uplus_uminus, n_equatorial_crossings, n_poloidal_orbits
 from kgeo.kerr_raytracing_ana import r_integrate
-import ehtim.parloop as parloop
+from kgeo.partools import Counter
 import ehtim.observing.obs_helpers as obsh
 from multiprocessing import cpu_count, Pool
 import os
@@ -363,7 +363,7 @@ def generate_library(which='rh'):
     allspins = allspins.flatten()
     ntot = len(allincs)
 
-    counter = parloop.Counter(initval=0, maxval=ntot)
+    counter = Counter(initval=0, maxval=ntot)
     print("Using Multiprocessing with %d Processes" % processes)
     pool = Pool(processes=processes, initializer=init, initargs=(counter,))
 

kgeo/partools.py

@@ -0,0 +1,26 @@
+# partools.py
+# Wraps up some helper functions for parallel loops
+# Borrowed from ehtim to avoid dependency
+
+from builtins import str
+from builtins import range
+from builtins import object
+
+from multiprocessing import Value, Lock
+
+class Counter(object):
+    """Counter object for sharing among multiprocessing jobs
+    """
+
+    def __init__(self, initval=0, maxval=0):
+        self.val = Value('i', initval)
+        self.maxval = maxval
+        self.lock = Lock()
+
+    def increment(self):
+        with self.lock:
+            self.val.value += 1
+
+    def value(self):
+        with self.lock:
+            return self.val.value

kgeo/solver.py

@@ -4,18 +4,15 @@
 import numpy as np
 from kgeo.equatorial_images import Iobs
 from kgeo.equatorial_lensing import rho_of_req, critical_curve
-import ehtim as eh
 import matplotlib.pyplot as plt
 from kgeo.bfields import Bfield
 import kgeo.bfields as kb
 from kgeo.velocities import Velocity
 from kgeo.emissivities import Emissivity
-from scipy.interpolate import interp1d
 import numpy as np
 import scipy.special as sp
 import mpmath
 import matplotlib.pyplot as plt
-from mpl_toolkits.mplot3d import Axes3D
 from tqdm import tqdm
 import time
 from kgeo.kerr_raytracing_utils import *