I believe this finishes the merge

desihub · Sep 25, 2023 · d0d8bc6 · d0d8bc6
1 parent e54890a
commit d0d8bc6
Showing 1 changed file with 0 additions and 15 deletions.
diff --git a/py/redrock/utils.py b/py/redrock/utils.py
@@ -15,11 +15,6 @@
 
 from . import constants
 
-<<<<<<< HEAD
-#IGM = Inoue14()
-
-=======
->>>>>>> f1eaa9b7bad3c5a397a4ed53bf5a215a01a9f787
 class Inoue14(object):
     def __init__(self, scale_tau=1.):
         """
@@ -608,14 +603,7 @@ def distribute_work(nproc, ids, weights=None, capacities=None):
     return dist
 
 
-<<<<<<< HEAD
 def transmission_IGM_old(zObj, lObs, use_gpu=False):
-=======
-
-
-
-def transmission_Lyman(zObj, lObs, use_gpu=False):
->>>>>>> f1eaa9b7bad3c5a397a4ed53bf5a215a01a9f787
     """Calculate the transmitted flux fraction from the Lyman series
     This returns the transmitted flux fraction:
     1 -> everything is transmitted (medium is transparent)
@@ -647,7 +635,6 @@ def transmission_Lyman(zObj, lObs, use_gpu=False):
         tile = np.tile
         asarray = np.asarray
 
-<<<<<<< HEAD
     #Lyman_series = constants.Lyman_series
     min_wave = 0
     if (np.isscalar(zObj)):
@@ -682,7 +669,6 @@ def transmission_Lyman(zObj, lObs, use_gpu=False):
             T[iz, :] = IGM.full_IGM_old(myz, lRF[iz, :]) # .get() hack
     if use_gpu:
         T = asarray(T) # hack
-=======
     ##Lyman_series = constants.Lyman_series
     #min_wave = 0
     #if np.isscalar(zObj):
@@ -712,7 +698,6 @@ def transmission_Lyman(zObj, lObs, use_gpu=False):
         for iz in W:
             T[iz, :] = asarray(IGM.full_IGM(zObj[iz], lObs))
 
->>>>>>> f1eaa9b7bad3c5a397a4ed53bf5a215a01a9f787
     #for l in list(Lyman_series.keys()):
     #    if (min_wave > Lyman_series[l]['line']):
     #        continue