Merge branch 'master' of https://github.com/jdhenshaw/scousepy into f…

…lagspec
jdhenshaw · Apr 27, 2022 · 07ca8bc · 07ca8bc
2 parents e1388c2 + 444e572
commit 07ca8bc
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/scousepy/stage_1.py b/scousepy/stage_1.py
@@ -10,6 +10,7 @@
 
 import numpy as np
 import sys
+from astropy.stats import mad_std
 
 from .io import *
 from .parallel_map import *
@@ -62,9 +63,15 @@ def compute_noise(scouseobject):
             stopcount+=1
             specidx+=1
         else:
-            stuck+=1
-            if stuck==50:
-                stopcount=500.0
+            rmsVal = mad_std(_spectrum, ignore_nan=True)
+            if np.isfinite(rmsVal):
+                rmsList.append(rmsVal)
+                stopcount+=1
+                specidx+=1
+            else:
+                stuck+=1
+                if stuck==50:
+                    stopcount+=500.0
 
     rms = np.nanmedian(rmsList)
 
@@ -161,7 +168,7 @@ def generate_SAAs(scouseobject, coverageobject):
         if scouseobject.njobs > 1:
             # if __name__ == 'scousepy.stage_1':
             #     print(__name__)
-                results = parallel_map(create_saa, inputlist, numcores=scouseobject.njobs)
+                results = list(parallel_map(create_saa, inputlist, numcores=scouseobject.njobs))
         else:
             if scouseobject.verbose:
                 results=[create_saa(input) for input in tqdm(inputlist)]