fix normalization cycle selection, pandas selector

cgevans · Aug 11, 2023 · 80a2e19 · 80a2e19
1 parent 9db9741
commit 80a2e19
Showing 1 changed file with 45 additions and 42 deletions.
diff --git a/src/qslib/processors.py b/src/qslib/processors.py
@@ -181,21 +181,22 @@ def __init__(
                 raise ValueError("Selection already set, can't specify step.")
             if cycle is not None:
                 raise ValueError("Selection already set, can't specify cycle.")
+        else:
             self.selection = selection
-        if stage is None:
-            stage = slice(None)
-        elif isinstance(stage, int):
-            stage = [stage]
-        if step is None:
-            step = slice(None)
-        elif isinstance(step, int):
-            step = [step]
-        if cycle is None:
-            cycle = slice(None)
-        elif isinstance(cycle, int):
-            cycle = [cycle]
-
-        self.selection = (stage, step, cycle)
+            if stage is None:
+                stage = slice(None)
+            elif isinstance(stage, int):
+                stage = [stage]
+            if step is None:
+                step = slice(None)
+            elif isinstance(step, int):
+                step = [step]
+            if cycle is None:
+                cycle = slice(None)
+            elif isinstance(cycle, int):
+                cycle = [cycle]
+
+            self.selection = (stage, cycle, step)
 
     def process_scoped(self, data: pd.DataFrame, scope: ScopeType) -> pd.DataFrame:
         if scope == self.scope:
@@ -259,20 +260,21 @@ def __init__(
             if cycle is not None:
                 raise ValueError("Selection already set, can't specify cycle.")
             self.selection = selection
-        if stage is None:
-            stage = slice(None)
-        elif isinstance(stage, int):
-            stage = [stage]
-        if step is None:
-            step = slice(None)
-        elif isinstance(step, int):
-            step = [step]
-        if cycle is None:
-            cycle = slice(None)
-        elif isinstance(cycle, int):
-            cycle = [cycle]
-
-        self.selection = (stage, step, cycle)
+        else:
+            if stage is None:
+                stage = slice(None)
+            elif isinstance(stage, int):
+                stage = [stage]
+            if step is None:
+                step = slice(None)
+            elif isinstance(step, int):
+                step = [step]
+            if cycle is None:
+                cycle = slice(None)
+            elif isinstance(cycle, int):
+                cycle = [cycle]
+
+            self.selection = (stage, cycle, step)
 
     def process_scoped(self, data: pd.DataFrame, scope: ScopeType) -> pd.DataFrame:
         if scope == self.scope:
@@ -336,20 +338,21 @@ def __init__(
             if cycle is not None:
                 raise ValueError("Selection already set, can't specify cycle.")
             self.selection = selection
-        if stage is None:
-            stage = slice(None)
-        elif isinstance(stage, int):
-            stage = [stage]
-        if step is None:
-            step = slice(None)
-        elif isinstance(step, int):
-            step = [step]
-        if cycle is None:
-            cycle = slice(None)
-        elif isinstance(cycle, int):
-            cycle = [cycle]
-
-        self.selection = (stage, step, cycle)
+        else:
+            if stage is None:
+                stage = slice(None)
+            elif isinstance(stage, int):
+                stage = [stage]
+            if step is None:
+                step = slice(None)
+            elif isinstance(step, int):
+                step = [step]
+            if cycle is None:
+                cycle = slice(None)
+            elif isinstance(cycle, int):
+                cycle = [cycle]
+
+            self.selection = (stage, cycle, step)
 
     def process_scoped(self, data: pd.DataFrame, scope: ScopeType) -> pd.DataFrame:
         if scope == self.scope: