Loading noctua/devices/atik.py +5 −5 Original line number Diff line number Diff line Loading @@ -53,7 +53,7 @@ class Camera(BaseDevice): self._subframe = [0, 0, 0, 0] self._last_exptime = None self._last_frametype = None self._last_imagetype = None self._last_datetime = None try: Loading Loading @@ -123,13 +123,13 @@ class Camera(BaseDevice): if h: self._lib.ArtemisAbortExposure(h) def start(self, duration, frametype, datetime=None): def start(self, duration, imagetype, datetime=None): h = self._check_connection() if not h: return self._last_exptime = duration self._last_frametype = frametype self._last_imagetype = imagetype self._last_datetime = datetime is_dark = True if frametype in [0, 2, "Dark", "Bias"] else False is_dark = True if imagetype in [0, 2, "Dark", "Bias"] else False self._lib.ArtemisSetDarkMode(h, is_dark) self._lib.ArtemisStartExposure(h, ctypes.c_float(duration)) Loading Loading @@ -195,7 +195,7 @@ class Camera(BaseDevice): hdr['XORGSUBF'] = (self._subframe[0], "[px] Subframe X origin (unbinned)") hdr['YORGSUBF'] = (self._subframe[1], "[px] Subframe Y origin (unbinned)") ft = self._last_frametype ft = self._last_imagetype hdr['IMAGETYP'] = (_frame_type.get(ft, str(ft)) if ft is not None else "", "Image type") Loading noctua/devices/stx.py +3 −3 Original line number Diff line number Diff line Loading @@ -176,7 +176,7 @@ class Camera(STX): """Aborts the current exposure.""" self.put(f"{self.element}AbortExposure") def start(self, duration, frametype, datetime=None): def start(self, duration, imagetype, datetime=None): """ Starts an exposure if the camera is idle. Loading @@ -184,7 +184,7 @@ class Camera(STX): ---------- duration : float Exposure time in seconds. frametype : int imagetype : int The type of frame (0=Dark, 1=Light, 2=Bias, 3=Flat). datetime : str, optional ISO-formatted datetime string for the FITS header. Loading @@ -202,7 +202,7 @@ class Camera(STX): datetime = dt.utcnow().isoformat(timespec='milliseconds') params = {"Duration": duration, "FrameType": frametype, "FrameType": imagetype, "DateTime": datetime} self.put(f"{self.element}StartExposure", params=params) Loading noctua/templates/snapshot_imaging.py +10 −10 Original line number Diff line number Diff line Loading @@ -45,7 +45,7 @@ class Template(BaseTemplate): objname = params.get("object") or "test" repeat = params.get("repeat") or 1 frametype = params.get("frametype") or "Light" imagetype = params.get("imagetype") or "Light" binning = params.get("binning") or cam.binning filt = params.get("filter") or ( filter_name.get(cam.filter) if hasattr(cam, 'filter') else None) Loading @@ -66,13 +66,13 @@ class Template(BaseTemplate): ##### Switch off lamps if not Flat ##### ######################################### if frametype != "Flat": log.info("Not a 'Flat' frametype: switching off lamps") if imagetype != "Flat": log.info("Not a 'Flat' imagetype: switching off lamps") lao = LampsOff() lao.run({}) if frametype != "Light": log.info("Not a 'Light' frametype: switching off recentering") if imagetype != "Light": log.info("Not a 'Light' imagetype: switching off recentering") self.recenter = False ######################## Loading Loading @@ -150,7 +150,7 @@ class Template(BaseTemplate): ##### Exposure loop ##### ######################### log.info(f"Starting {repeat} {frametype} frames of {exptime}s") log.info(f"Starting {repeat} {imagetype} frames of {exptime}s") # Looping on the number of exposures for exposure in range(repeat): Loading @@ -171,7 +171,7 @@ class Template(BaseTemplate): # ######################## log.info(f"Dome slewing is {self.domeslewing}") if frametype == "Light": if imagetype == "Light": if self.domeslewing: log.info(f"Check Dome position") while (abs(tel.coordinates["altaz"][1] - dom.azimuth) > 3): Loading @@ -193,10 +193,10 @@ class Template(BaseTemplate): ##### Start exposure ##### ########################## log.debug(frame_number[frametype]) log.debug(frame_number[imagetype]) try: cam.start(exptime, frame_number[frametype], frame_number[imagetype], datetime=gps.isot) except Exception as e: msg = f"An error occurred : {e}" Loading Loading @@ -288,7 +288,7 @@ class Template(BaseTemplate): if self.recenter: log.info(f"... with box={self.box}px") if frametype == "Light": if imagetype == "Light": if self.recenter: try: apply_offset( Loading noctua/templates/snapshot_spectro.py +10 −10 Original line number Diff line number Diff line Loading @@ -38,7 +38,7 @@ class Template(BaseTemplate): objname = params.get("object") or "test" repeat = params.get("repeat") or 1 frametype = params.get("frametype") or "Light" imagetype = params.get("imagetype") or "Light" binning = params.get("binning") or cam.binning xystart = params.get("xystart") or cam.xystart xyend = params.get("xyend") or cam.xyend Loading @@ -57,13 +57,13 @@ class Template(BaseTemplate): ##### Switch off lamps if not Flat ##### ######################################### if frametype != "Flat": log.info("Not a 'Flat' frametype: switching off lamps") if imagetype != "Flat": log.info("Not a 'Flat' imagetype: switching off lamps") lao = LampsOff() lao.run({}) if frametype != "Light": log.info("Not a 'Light' frametype: switching off recentering") if imagetype != "Light": log.info("Not a 'Light' imagetype: switching off recentering") self.recenter = False ######################## Loading Loading @@ -105,7 +105,7 @@ class Template(BaseTemplate): ##### Exposure loop ##### ######################### log.info(f"Starting {repeat} {frametype} frames of {exptime}s") log.info(f"Starting {repeat} {imagetype} frames of {exptime}s") # Looping on the number of exposures for exposure in range(repeat): Loading @@ -123,7 +123,7 @@ class Template(BaseTemplate): # ######################## log.info(f"Dome slewing is {self.domeslewing}") if frametype == "Light": if imagetype == "Light": if self.domeslewing: log.info(f"Check Dome position") while (abs(tel.coordinates["altaz"][1] - dom.azimuth) > 3): Loading @@ -145,10 +145,10 @@ class Template(BaseTemplate): ##### Start exposure ##### ########################## log.debug(frame_number[frametype]) log.debug(frame_number[imagetype]) try: cam.start(exptime, frame_number[frametype], frame_number[imagetype], datetime=gps.isot) except Exception as e: msg = f"An error occurred : {e}" Loading Loading @@ -240,7 +240,7 @@ class Template(BaseTemplate): if self.recenter: log.info(f"... with box={self.box}px") if frametype == "Light": if imagetype == "Light": if self.recenter: try: apply_offset( Loading Loading
noctua/devices/atik.py +5 −5 Original line number Diff line number Diff line Loading @@ -53,7 +53,7 @@ class Camera(BaseDevice): self._subframe = [0, 0, 0, 0] self._last_exptime = None self._last_frametype = None self._last_imagetype = None self._last_datetime = None try: Loading Loading @@ -123,13 +123,13 @@ class Camera(BaseDevice): if h: self._lib.ArtemisAbortExposure(h) def start(self, duration, frametype, datetime=None): def start(self, duration, imagetype, datetime=None): h = self._check_connection() if not h: return self._last_exptime = duration self._last_frametype = frametype self._last_imagetype = imagetype self._last_datetime = datetime is_dark = True if frametype in [0, 2, "Dark", "Bias"] else False is_dark = True if imagetype in [0, 2, "Dark", "Bias"] else False self._lib.ArtemisSetDarkMode(h, is_dark) self._lib.ArtemisStartExposure(h, ctypes.c_float(duration)) Loading Loading @@ -195,7 +195,7 @@ class Camera(BaseDevice): hdr['XORGSUBF'] = (self._subframe[0], "[px] Subframe X origin (unbinned)") hdr['YORGSUBF'] = (self._subframe[1], "[px] Subframe Y origin (unbinned)") ft = self._last_frametype ft = self._last_imagetype hdr['IMAGETYP'] = (_frame_type.get(ft, str(ft)) if ft is not None else "", "Image type") Loading
noctua/devices/stx.py +3 −3 Original line number Diff line number Diff line Loading @@ -176,7 +176,7 @@ class Camera(STX): """Aborts the current exposure.""" self.put(f"{self.element}AbortExposure") def start(self, duration, frametype, datetime=None): def start(self, duration, imagetype, datetime=None): """ Starts an exposure if the camera is idle. Loading @@ -184,7 +184,7 @@ class Camera(STX): ---------- duration : float Exposure time in seconds. frametype : int imagetype : int The type of frame (0=Dark, 1=Light, 2=Bias, 3=Flat). datetime : str, optional ISO-formatted datetime string for the FITS header. Loading @@ -202,7 +202,7 @@ class Camera(STX): datetime = dt.utcnow().isoformat(timespec='milliseconds') params = {"Duration": duration, "FrameType": frametype, "FrameType": imagetype, "DateTime": datetime} self.put(f"{self.element}StartExposure", params=params) Loading
noctua/templates/snapshot_imaging.py +10 −10 Original line number Diff line number Diff line Loading @@ -45,7 +45,7 @@ class Template(BaseTemplate): objname = params.get("object") or "test" repeat = params.get("repeat") or 1 frametype = params.get("frametype") or "Light" imagetype = params.get("imagetype") or "Light" binning = params.get("binning") or cam.binning filt = params.get("filter") or ( filter_name.get(cam.filter) if hasattr(cam, 'filter') else None) Loading @@ -66,13 +66,13 @@ class Template(BaseTemplate): ##### Switch off lamps if not Flat ##### ######################################### if frametype != "Flat": log.info("Not a 'Flat' frametype: switching off lamps") if imagetype != "Flat": log.info("Not a 'Flat' imagetype: switching off lamps") lao = LampsOff() lao.run({}) if frametype != "Light": log.info("Not a 'Light' frametype: switching off recentering") if imagetype != "Light": log.info("Not a 'Light' imagetype: switching off recentering") self.recenter = False ######################## Loading Loading @@ -150,7 +150,7 @@ class Template(BaseTemplate): ##### Exposure loop ##### ######################### log.info(f"Starting {repeat} {frametype} frames of {exptime}s") log.info(f"Starting {repeat} {imagetype} frames of {exptime}s") # Looping on the number of exposures for exposure in range(repeat): Loading @@ -171,7 +171,7 @@ class Template(BaseTemplate): # ######################## log.info(f"Dome slewing is {self.domeslewing}") if frametype == "Light": if imagetype == "Light": if self.domeslewing: log.info(f"Check Dome position") while (abs(tel.coordinates["altaz"][1] - dom.azimuth) > 3): Loading @@ -193,10 +193,10 @@ class Template(BaseTemplate): ##### Start exposure ##### ########################## log.debug(frame_number[frametype]) log.debug(frame_number[imagetype]) try: cam.start(exptime, frame_number[frametype], frame_number[imagetype], datetime=gps.isot) except Exception as e: msg = f"An error occurred : {e}" Loading Loading @@ -288,7 +288,7 @@ class Template(BaseTemplate): if self.recenter: log.info(f"... with box={self.box}px") if frametype == "Light": if imagetype == "Light": if self.recenter: try: apply_offset( Loading
noctua/templates/snapshot_spectro.py +10 −10 Original line number Diff line number Diff line Loading @@ -38,7 +38,7 @@ class Template(BaseTemplate): objname = params.get("object") or "test" repeat = params.get("repeat") or 1 frametype = params.get("frametype") or "Light" imagetype = params.get("imagetype") or "Light" binning = params.get("binning") or cam.binning xystart = params.get("xystart") or cam.xystart xyend = params.get("xyend") or cam.xyend Loading @@ -57,13 +57,13 @@ class Template(BaseTemplate): ##### Switch off lamps if not Flat ##### ######################################### if frametype != "Flat": log.info("Not a 'Flat' frametype: switching off lamps") if imagetype != "Flat": log.info("Not a 'Flat' imagetype: switching off lamps") lao = LampsOff() lao.run({}) if frametype != "Light": log.info("Not a 'Light' frametype: switching off recentering") if imagetype != "Light": log.info("Not a 'Light' imagetype: switching off recentering") self.recenter = False ######################## Loading Loading @@ -105,7 +105,7 @@ class Template(BaseTemplate): ##### Exposure loop ##### ######################### log.info(f"Starting {repeat} {frametype} frames of {exptime}s") log.info(f"Starting {repeat} {imagetype} frames of {exptime}s") # Looping on the number of exposures for exposure in range(repeat): Loading @@ -123,7 +123,7 @@ class Template(BaseTemplate): # ######################## log.info(f"Dome slewing is {self.domeslewing}") if frametype == "Light": if imagetype == "Light": if self.domeslewing: log.info(f"Check Dome position") while (abs(tel.coordinates["altaz"][1] - dom.azimuth) > 3): Loading @@ -145,10 +145,10 @@ class Template(BaseTemplate): ##### Start exposure ##### ########################## log.debug(frame_number[frametype]) log.debug(frame_number[imagetype]) try: cam.start(exptime, frame_number[frametype], frame_number[imagetype], datetime=gps.isot) except Exception as e: msg = f"An error occurred : {e}" Loading Loading @@ -240,7 +240,7 @@ class Template(BaseTemplate): if self.recenter: log.info(f"... with box={self.box}px") if frametype == "Light": if imagetype == "Light": if self.recenter: try: apply_offset( Loading