Dead code bad. Fix bug when no julian day directory for EVT files.

seaflow-uw · Dec 8, 2016 · 22438e5 · 22438e5
1 parent 07a2ce1
commit 22438e5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/seaflowpy/evt.py b/seaflowpy/evt.py
@@ -219,11 +219,6 @@ def filter(self, notch1=None, notch2=None, offset=0.0,
             if origin is None:
                 origin = (df["D2"] - df["D1"]).median()
 
-            # Old method
-            #if origin is None:
-            #    origin = (self.df["D2"] - self.df["D1"]).median()
-            #df = self.filter_noise_old()
-
             # Filter aligned particles (D1 = D2), with correction for D1 D2
             # sensitivity difference
             alignedD1 = (df["D1"] + origin) < (df["D2"] + (width * 10**4))

diff --git a/seaflowpy/seaflowfile.py b/seaflowpy/seaflowfile.py
@@ -97,7 +97,7 @@ def sorted_files(files):
     for f in files:
         s = SeaflowFile(f)
         parts = parse_path(s.file_id)
-        if "julian" in parts:
+        if parts["julian"] is not None:
             year, day = [int(x) for x in parts["julian"].split("_")]
         else:
             year, day = 0, 0