updated dataflow pipeline

HERA-Team · Jun 12, 2018 · 3f86779 · 3f86779
1 parent f041860
commit 3f86779
Show file tree

Hide file tree

Showing 4 changed files with 214 additions and 95 deletions.
diff --git a/hera_pspec/pspecdata.py b/hera_pspec/pspecdata.py
@@ -2109,8 +2109,7 @@ def get_pspec_run_argparser():
     a.add_argument("--Jy2mK", default=False, action='store_true', help="Convert datasets from Jy to mK if a beam model is provided.")
     a.add_argument("--exclude_auto_bls", default=False, action='store_true', help='If blpairs is not provided, exclude all baselines paired with itself.')
     a.add_argument("--exclude_permutations", default=False, action='store_true', help='If blpairs is not provided, exclude a basline-pair permutations. Ex: if (A, B) exists, exclude (B, A).')
-    a.add_argument("--group", default=False, action='store_true', help="If blpairs is not provided, group baseline pairs together.")
-    a.add_argument("--Nblps_per_group", default=1, type=int, help="If blpairs is not provided and group == True, set the number of blpairs in each group.")
+    a.add_argument("--Nblps_per_group", default=None, type=int, help="If blpairs is not provided and group == True, set the number of blpairs in each group.")
     a.add_argument("--bl_len_range", default=(0, 1e10), type=tuple, help="If blpairs is not provided, limit the baselines used based on their minimum and maximum length in meters.")
     a.add_argument("--bl_error_tol", default=1.0, type=float, help="If blpairs is not provided, this is the error tolerance in forming redundant baseline groups in meters.")
     a.add_argument("--overwrite", default=False, action='store_true', help="Overwrite output if it exists.")

diff --git a/hera_pspec/utils.py b/hera_pspec/utils.py
@@ -15,7 +15,6 @@ def hash(w):
     DeprecationWarning("utils.hash is deprecated.")
     return md5.md5(w.copy(order='C')).digest()
 
-
 def cov(d1, w1, d2=None, w2=None):
     """
     Computes an empirical covariance matrix from data vectors. If d1 is of size 
@@ -74,7 +73,7 @@ def construct_blpairs(bls, exclude_auto_bls=False, exclude_permutations=False, g
         and exclude_permutations = False, then blpairs = [11, 12, 13, 21, 22, 23,, 31, 32, 33].
         If however exclude_permutations = True, then blpairs = [11, 12, 13, 22, 23, 33].
         Furthermore, if exclude_auto_bls = True then 11, 22, and 33 would additionally be excluded.   
-        
+
     group : boolean, optional
         if True, group each consecutive Nblps_per_group blpairs into sub-lists