Commit 8e61a112 authored by vertighel's avatar vertighel
Browse files

fitler echelle

parent c6492c58

noctua/templates/snapshot.py

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ class Template(BaseTemplate): 
        ########################



        try:

            camera_name = params.get("camera") or "cam"

            camera_name = params.get("camera") or "cam1"

            cam = getattr(_dev, camera_name)

            fits_file = viewer_fits_path(getattr(cam, '_viewer_key', None))

noctua/templates/snapshot_echelle.py

+34 −34
Original line number Diff line number Diff line
@@ -90,40 +90,40 @@ class Template(BaseTemplate): 


        log.info(f"Camera is {camera_state[cam.state]}")



        # Changing filter if not the same as the current one (only if camera has a filter wheel)

        if filt and hasattr(cam, 'filter'):

            # On bad ctrl-c, filter can be 15 (?!)

            log.warning(f"Filter is number {cam.filter}")

            log.warning(

                f"Filter is {filter_name[cam.filter]}, we have selected {filt}")



            if filter_number[filt] != cam.filter:

                msg = f"Changing filter to {filt}, "

                msg += f"Which is number {filter_number[filt]}"

                log.info(msg)



                cam.filter = filter_number[filt]

                sleep(0.2)



                status = 1

                while status != 0:

                    self.check_pause_or_abort()



                    try:

                        status = int(cam.is_moving)

                    except ValueError as e:

                        msg = f"Error trying to contact the camera: {e}"

                        log.error(msg)

                        self.error.append(msg)



                    if status == 2:

                        msg = f"Filter {filter_state[status]}"

                        log.error(msg)

                        self.error.append(msg)

                        return

                    else:

                        log.warning(f"Filter {filter_state[status]}")

                        sleep(0.75)

        # # Changing filter if not the same as the current one (only if camera has a filter wheel)

        # if filt and hasattr(cam, 'filter'):

        #     # On bad ctrl-c, filter can be 15 (?!)

        #     log.warning(f"Filter is number {cam.filter}")

        #     log.warning(

        #         f"Filter is {filter_name[cam.filter]}, we have selected {filt}")



        #     if filter_number[filt] != cam.filter:

        #         msg = f"Changing filter to {filt}, "

        #         msg += f"Which is number {filter_number[filt]}"

        #         log.info(msg)



        #         cam.filter = filter_number[filt]

        #         sleep(0.2)



        #         status = 1

        #         while status != 0:

        #             self.check_pause_or_abort()



        #             try:

        #                 status = int(cam.is_moving)

        #             except ValueError as e:

        #                 msg = f"Error trying to contact the camera: {e}"

        #                 log.error(msg)

        #                 self.error.append(msg)



        #             if status == 2:

        #                 msg = f"Filter {filter_state[status]}"

        #                 log.error(msg)

        #                 self.error.append(msg)

        #                 return

        #             else:

        #                 log.warning(f"Filter {filter_state[status]}")

        #                 sleep(0.75)



        # Changing windowing (only when explicitly provided in params)

        if xystart is not None and xyend is not None: