Use Cosmo_Conversions functions for unit conversion

HERA-Team · Apr 25, 2018 · 81436a8 · 81436a8
1 parent d89bcdc
commit 81436a8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/hera_pspec/conversions.py b/hera_pspec/conversions.py
@@ -142,8 +142,9 @@ def f2z(self, freq, ghz=False):
             freq = freq * 1e9
 
         return (units.f21 / freq - 1)
-
-    def z2f(self, z, ghz=False):
+
+    @staticmethod
+    def z2f(z, ghz=False):
         """
         convert redshift to frequency in Hz for 21cm line
 

diff --git a/hera_pspec/utils.py b/hera_pspec/utils.py
@@ -1,5 +1,6 @@
 import numpy as np
 import md5
+from conversions import Cosmo_Conversions
 
 def hash(w):
     """
@@ -178,11 +179,11 @@ def spw_range_from_redshifts(data, z_range, bounds_error=True):
         z_range = [z_range,]
 
     # Convert redshifts to frequencies (in Hz)
-    NU21CM = 1420405751.7667 # 21cm rest freq. in Hz
     freq_range = []
     for zrange in z_range:
         zmin, zmax = zrange
-        freq_range.append( (NU21CM/(1.+zmax), NU21CM/(1.+zmin)) )
+        freq_range.append( Cosmo_Conversions.z2f(zmax), 
+                           Cosmo_Conversions.z2f(zmin) )
 
     # Use freq. function to get spectral window
     spw_range = spw_range_from_freqs(data=data, freq_range=freq_range,