Merge branch 'main' into schedtel-dev

macro-consortium · Nov 21, 2023 · 7fff80f · 7fff80f
2 parents 732b0f4 + af1382e
commit 7fff80f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -32,5 +32,9 @@
                 }
             }
         }
-    }
+
+    },
+    "features": {
+        "ghcr.io/devcontainers/features/github-cli:1": {}
+      }
 }
diff --git a/pyscope/observatory/simulator_server.py b/pyscope/observatory/simulator_server.py
@@ -60,6 +60,14 @@ def __init__(self):
                 stdout=subprocess.DEVNULL,
                 shell=True,
             )
+        elif platform.system() == "Linux":
+            self.process = subprocess.Popen(
+                ("sudo " + dirname + "/ascom.alpaca.simulators"),
+                start_new_session=True,
+                stderr=subprocess.DEVNULL,
+                stdout=subprocess.DEVNULL,
+                shell=True,
+            )
         else:
             self.process = subprocess.Popen(
                 (dirname + "/ascom.alpaca.simulators"),

diff --git a/pyscope/reduction/calib_images.py b/pyscope/reduction/calib_images.py
@@ -11,6 +11,7 @@
 from ..observatory import AstrometryNetWCS
 from .ccd_calib import ccd_calib
 
+
 logger = logging.getLogger(__name__)
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,5 +32,9 @@ @@
                     }
                 }
             }
-        }
+        },
+        "features": {
+            "ghcr.io/devcontainers/features/github-cli:1": {}
+          }
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,6 +11,7 @@
		from ..observatory import AstrometryNetWCS
		from .ccd_calib import ccd_calib


		logger = logging.getLogger(__name__)


Expand Down