From 8ee26bfddff2689adc7ac9e6d35dc1cc876acef0 Mon Sep 17 00:00:00 2001 From: Meiji Nguyen Date: Wed, 8 May 2024 16:46:28 -0400 Subject: [PATCH 01/13] updated docs page for zwo camera --- docs/services/zwo_camera.rst | 131 +++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/docs/services/zwo_camera.rst b/docs/services/zwo_camera.rst index 7d90b7b27..6a688b659 100644 --- a/docs/services/zwo_camera.rst +++ b/docs/services/zwo_camera.rst @@ -1,14 +1,145 @@ ZWO Camera ========== +This service operates a ZWO camera. There are currently four different types of ZWO cameras being used on the testbed: +- ZWO ASI533MM (Science camera, https://www.zwoastro.com/product/asi533mm-mc/) +- ZWO ASI290MM (TA camera, https://agenaastro.com/zwo-asi290mm-cmos-monochrome-astronomy-imaging-camera.html) +- ZWO ASI178MM (MOWFS Camera and Pupil Camera, https://agenaastro.com/zwo-asi178mm-cmos-monochrome-astronomy-imaging-camera.html) +- ZWO ASI1600MM (Phase Retrieval Camera, https://agenaastro.com/zwo-asi1600mm-p-cmos-monochrome-astronomy-imaging-camera-pro.html) + +For camera specs, see the website links above. + Configuration ------------- +.. code-block:: YAML + + science_camera: + service_type: zwo_camera + simulated_service_type: camera_sim + interface: hicat_camera + requires_safety: false + + device_name: ZWO ASI533MM + offset_x: 1038 + offset_y: 1282 + width: 192 + height: 192 + well_depth_percentage_target: 0.65 + exposure_time: 1000 + gain: 100 + exposure_time_step_size: 33 + exposure_time_offset_correction: -79.2 + exposure_time_base_step: 50 + + ta_camera: + service_type: zwo_camera + simulated_service_type: camera_sim + interface: hicat_camera + requires_safety: false + + device_name: ZWO ASI290MM + device_id: 1 + offset_x: 496 + offset_y: 462 + width: 464 + height: 464 + well_depth_percentage_target: 0.65 + exposure_time: 100000 + gain: 0 + + mowfs_camera: + service_type: zwo_camera + simulated_service_type: camera_sim + interface: hicat_camera + requires_safety: false + + device_name: ZWO ASI178MM + device_id: 3 + offset_x: 1208 + offset_y: 1256 + width: 824 + height: 824 + well_depth_percentage_target: 0.65 + exposure_time: 1000 + gain: 0 + + pupil_camera: + service_type: zwo_camera + simulated_service_type: camera_sim + interface: hicat_camera + requires_safety: false + + device_name: ZWO ASI178MM + device_id: 4 + well_depth_percentage_target: 0.65 + exposure_time: 1000 + width: 1680 + height: 1680 + offset_x: 336 + offset_y: 204 + gain: 0 + + phase_retrieval_camera: + service_type: zwo_camera + simulated_service_type: camera_sim + interface: hicat_camera + requires_safety: false + + device_name: ZWO ASI1600MM + device_id: # This camera does not have device_id + offset_x: 1700 + offset_y: 1364 + width: 1024 + height: 1024 + well_depth_percentage_target: 0.65 + exposure_time: 10000 + gain: 0 + + + + Properties ---------- +``exposure_time``: Exposure time of the camera. + +``gain``: Gain of the camera. + +``brightness``: Brightness of the camera. + +``width``: The width of the camera. + +``height``: The height of the camera. + +``offset_x``: The x offset of the camera. + +``offset_y``: The y offset of the camera. + +``sensor_width``: The width of the sensor. + +``sensor_height``: The height of the sensor. + +``device_name``: The name of the camera. Commands -------- +``start_acquisition()``: This starts the acquisition of images from the camera. + +``end_acquisition()``: This ends the acquisition of images from the camera. + +``take_calibrated_exposures(num_exposures, only_use_cache=True)``: This takes a number of calibrated exposures. + +``get_exposure_calibration_function(only_use_cache=True)``: This gets a function to calibrate individual exposures. + +``take_calibrated_image(num_exposures, upsample_factor=None, alignment_window=None, only_use_cache=True)``: This takes a calibrated +image which is background subtracted, exposure time corrected, nd flux calibrated and sub-frame aligned using phase cross correlation method. + +``take_dark(num_exposures)``: This takes a dark image for the current exposure time by moving the beam dump. Datastreams ----------- +``temperature``: The temperature as measured by this sensor in Celsius. + +``images``: The images acquired by the camera. + +``is_acquiring``: Whether the camera is currently acquiring images. From 40c92051a6a32043a42f4e8f1d009d0453e803db Mon Sep 17 00:00:00 2001 From: Meiji Nguyen Date: Thu, 9 May 2024 15:02:51 -0400 Subject: [PATCH 02/13] address PR comments --- docs/services/zwo_camera.rst | 85 +++--------------------------------- 1 file changed, 7 insertions(+), 78 deletions(-) diff --git a/docs/services/zwo_camera.rst b/docs/services/zwo_camera.rst index 6a688b659..072d33e99 100644 --- a/docs/services/zwo_camera.rst +++ b/docs/services/zwo_camera.rst @@ -1,11 +1,11 @@ ZWO Camera ========== -This service operates a ZWO camera. There are currently four different types of ZWO cameras being used on the testbed: -- ZWO ASI533MM (Science camera, https://www.zwoastro.com/product/asi533mm-mc/) -- ZWO ASI290MM (TA camera, https://agenaastro.com/zwo-asi290mm-cmos-monochrome-astronomy-imaging-camera.html) -- ZWO ASI178MM (MOWFS Camera and Pupil Camera, https://agenaastro.com/zwo-asi178mm-cmos-monochrome-astronomy-imaging-camera.html) -- ZWO ASI1600MM (Phase Retrieval Camera, https://agenaastro.com/zwo-asi1600mm-p-cmos-monochrome-astronomy-imaging-camera-pro.html) +This service operates a ZWO camera. There are currently four different types of ZWO cameras that have been tested and used with catkit2 so far: +- ZWO ASI533MM (https://www.zwoastro.com/product/asi533mm-mc/) +- ZWO ASI290MM (https://agenaastro.com/zwo-asi290mm-cmos-monochrome-astronomy-imaging-camera.html) +- ZWO ASI178MM (https://agenaastro.com/zwo-asi178mm-cmos-monochrome-astronomy-imaging-camera.html) +- ZWO ASI1600MM (https://agenaastro.com/zwo-asi1600mm-p-cmos-monochrome-astronomy-imaging-camera-pro.html) For camera specs, see the website links above. @@ -14,10 +14,9 @@ Configuration .. code-block:: YAML - science_camera: + camera1: service_type: zwo_camera simulated_service_type: camera_sim - interface: hicat_camera requires_safety: false device_name: ZWO ASI533MM @@ -25,79 +24,8 @@ Configuration offset_y: 1282 width: 192 height: 192 - well_depth_percentage_target: 0.65 exposure_time: 1000 gain: 100 - exposure_time_step_size: 33 - exposure_time_offset_correction: -79.2 - exposure_time_base_step: 50 - - ta_camera: - service_type: zwo_camera - simulated_service_type: camera_sim - interface: hicat_camera - requires_safety: false - - device_name: ZWO ASI290MM - device_id: 1 - offset_x: 496 - offset_y: 462 - width: 464 - height: 464 - well_depth_percentage_target: 0.65 - exposure_time: 100000 - gain: 0 - - mowfs_camera: - service_type: zwo_camera - simulated_service_type: camera_sim - interface: hicat_camera - requires_safety: false - - device_name: ZWO ASI178MM - device_id: 3 - offset_x: 1208 - offset_y: 1256 - width: 824 - height: 824 - well_depth_percentage_target: 0.65 - exposure_time: 1000 - gain: 0 - - pupil_camera: - service_type: zwo_camera - simulated_service_type: camera_sim - interface: hicat_camera - requires_safety: false - - device_name: ZWO ASI178MM - device_id: 4 - well_depth_percentage_target: 0.65 - exposure_time: 1000 - width: 1680 - height: 1680 - offset_x: 336 - offset_y: 204 - gain: 0 - - phase_retrieval_camera: - service_type: zwo_camera - simulated_service_type: camera_sim - interface: hicat_camera - requires_safety: false - - device_name: ZWO ASI1600MM - device_id: # This camera does not have device_id - offset_x: 1700 - offset_y: 1364 - width: 1024 - height: 1024 - well_depth_percentage_target: 0.65 - exposure_time: 10000 - gain: 0 - - - Properties ---------- @@ -127,6 +55,7 @@ Commands ``end_acquisition()``: This ends the acquisition of images from the camera. +# Additional commands below inherited from the Service Proxy class ``take_calibrated_exposures(num_exposures, only_use_cache=True)``: This takes a number of calibrated exposures. ``get_exposure_calibration_function(only_use_cache=True)``: This gets a function to calibrate individual exposures. From e7037d3eddd64aab90e7d1be6f02c091c14d4aaf Mon Sep 17 00:00:00 2001 From: Meiji Nguyen Date: Tue, 14 May 2024 14:08:21 -0400 Subject: [PATCH 03/13] removed proxy commands --- docs/services/zwo_camera.rst | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/docs/services/zwo_camera.rst b/docs/services/zwo_camera.rst index 072d33e99..7251bdef0 100644 --- a/docs/services/zwo_camera.rst +++ b/docs/services/zwo_camera.rst @@ -55,16 +55,6 @@ Commands ``end_acquisition()``: This ends the acquisition of images from the camera. -# Additional commands below inherited from the Service Proxy class -``take_calibrated_exposures(num_exposures, only_use_cache=True)``: This takes a number of calibrated exposures. - -``get_exposure_calibration_function(only_use_cache=True)``: This gets a function to calibrate individual exposures. - -``take_calibrated_image(num_exposures, upsample_factor=None, alignment_window=None, only_use_cache=True)``: This takes a calibrated -image which is background subtracted, exposure time corrected, nd flux calibrated and sub-frame aligned using phase cross correlation method. - -``take_dark(num_exposures)``: This takes a dark image for the current exposure time by moving the beam dump. - Datastreams ----------- ``temperature``: The temperature as measured by this sensor in Celsius. From 32cd199e139c64dd434e004ed4308f785450e8e5 Mon Sep 17 00:00:00 2001 From: Meiji Nguyen Date: Thu, 23 May 2024 12:34:46 -0400 Subject: [PATCH 04/13] added documentation for newport picomotor and web power switch --- docs/services/newport_picomotor.rst | 31 ++++++++++++++++++++++++++ docs/services/web_power_switch.rst | 34 +++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/docs/services/newport_picomotor.rst b/docs/services/newport_picomotor.rst index f14672ef0..7f3e0542f 100644 --- a/docs/services/newport_picomotor.rst +++ b/docs/services/newport_picomotor.rst @@ -1,14 +1,45 @@ Newport Picomotor ================= +This service controls a Newport Picomotor Motion Controller. + +https://www.newport.com/f/open-loop-picomotor-motion-controller + +The bottom of the webpage linked above has resources for the user including software downloads, technical notes, and user manuals. + Configuration ------------- +.. code-block:: YAML + + picomotor1: + service_type: newport_picomotor + simulated_service_type: newport_picomotor_sim + interface: newport_picomotor + requires_safety: false + + ip_address: 000.000.000.000 + max_step: 2147483647 + timeout: 60 + atol: 1 + daisy: 0 # use this when daisy chaining multiple picomotor controllers + axes: + x: 1 + y: 2 + z: 3 + sleep_per_step: 0.0005 # sleep time (s) between every step + sleep_base: 0.1 # base sleep time (s) for every move command + Properties ---------- +None. Commands -------- +None. Datastreams ----------- +``{axis_name}_command``: A movement command along the axis corresponding to axis_name (where axis_name can be x, y, or z). + +``{axis_name}_current_position``: The current position of the picomotor along the axis corresponding to axis_name (where axis_name can be x, y, or z). diff --git a/docs/services/web_power_switch.rst b/docs/services/web_power_switch.rst index bf7dd2e32..032080672 100644 --- a/docs/services/web_power_switch.rst +++ b/docs/services/web_power_switch.rst @@ -1,14 +1,48 @@ Web Power Switch ================ +This service controls a power switch that is controllable over the internet. + +For some examples of commercially available web power switches: +https://controlbyweb.com/webswitch/ +https://dlidirect.com/products/new-pro-switch + + Configuration ------------- +.. code-block:: YAML + + web_power_switch1: + service_type: web_power_switch + simulated_service_type: web_power_switch_sim + interface: web_power_switch + requires_safety: false + + user: username + password: password + ip_address: 000.000.000.00 + dns: domain_name_system + + # Plugged-in devices with their outlet number: + outlets: + npoint_tiptilt_lc_400: 1 + iris_usb_hub: 2 + newport_xps_q8: 3 + iris_dm: 4 + quad_cell: 5 + air_valve: 6 + pupil_led: 7 + fpm_led: 8 + Properties ---------- +None. Commands -------- +None. Datastreams ----------- +``{outlet_name}``: The name of an outlet added by the user using the add_outlet() command. From be12f7daa16b6eca0d729bd57b934353151efd6b Mon Sep 17 00:00:00 2001 From: Meiji Nguyen Date: Thu, 23 May 2024 13:07:26 -0400 Subject: [PATCH 05/13] found the web power switch used by hicat --- docs/services/web_power_switch.rst | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/services/web_power_switch.rst b/docs/services/web_power_switch.rst index 032080672..712f9b42b 100644 --- a/docs/services/web_power_switch.rst +++ b/docs/services/web_power_switch.rst @@ -3,10 +3,8 @@ Web Power Switch This service controls a power switch that is controllable over the internet. -For some examples of commercially available web power switches: -https://controlbyweb.com/webswitch/ -https://dlidirect.com/products/new-pro-switch - +So far catkit2 has been tested on the LPC7-PRO web power switch from TeleDynamics: +https://www.teledynamics.com/#/productdetails/LPC7-PRO Configuration ------------- From 95c5f2e741b539b2d68b6797320b874d14baf6f6 Mon Sep 17 00:00:00 2001 From: Meiji Nguyen Date: Thu, 23 May 2024 13:11:19 -0400 Subject: [PATCH 06/13] added extra comment to picomotor docs --- docs/services/newport_picomotor.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/services/newport_picomotor.rst b/docs/services/newport_picomotor.rst index 7f3e0542f..8f1bee809 100644 --- a/docs/services/newport_picomotor.rst +++ b/docs/services/newport_picomotor.rst @@ -1,7 +1,7 @@ Newport Picomotor ================= -This service controls a Newport Picomotor Motion Controller. +This service controls a Newport Picomotor Motion Controller (see link below for an example of one that has been used with catkit2). https://www.newport.com/f/open-loop-picomotor-motion-controller From c3f94b912cb840ee64c3678d0708c85feda78d7e Mon Sep 17 00:00:00 2001 From: Meiji Nguyen Date: Thu, 23 May 2024 14:46:40 -0400 Subject: [PATCH 07/13] corrected description of outlet_name datastream --- docs/services/web_power_switch.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/services/web_power_switch.rst b/docs/services/web_power_switch.rst index 712f9b42b..0863ab59d 100644 --- a/docs/services/web_power_switch.rst +++ b/docs/services/web_power_switch.rst @@ -43,4 +43,5 @@ None. Datastreams ----------- -``{outlet_name}``: The name of an outlet added by the user using the add_outlet() command. +``{outlet_name}``: The name of an outlet. These are defined by the config file (see the sample Configuration + section above where the names of eight example outlets are given). From 5de1497a5a6810381ded50ed5c08f483deb09655 Mon Sep 17 00:00:00 2001 From: Meiji Nguyen Date: Fri, 24 May 2024 13:24:51 -0400 Subject: [PATCH 08/13] address PR comments to add proper hyperlinks and minor reformatting --- docs/services/newport_picomotor.rst | 10 +++++++--- docs/services/web_power_switch.rst | 4 ++-- docs/services/zwo_camera.rst | 11 ++++++----- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/docs/services/newport_picomotor.rst b/docs/services/newport_picomotor.rst index 8f1bee809..9b7709af1 100644 --- a/docs/services/newport_picomotor.rst +++ b/docs/services/newport_picomotor.rst @@ -1,9 +1,10 @@ Newport Picomotor ================= -This service controls a Newport Picomotor Motion Controller (see link below for an example of one that has been used with catkit2). +This service controls a Newport Picomotor Motion Controller. +The following Newport Picomotors have been tested and used with catkit2 so far: -https://www.newport.com/f/open-loop-picomotor-motion-controller +`Newport Picomotor `_ The bottom of the webpage linked above has resources for the user including software downloads, technical notes, and user manuals. @@ -40,6 +41,9 @@ None. Datastreams ----------- -``{axis_name}_command``: A movement command along the axis corresponding to axis_name (where axis_name can be x, y, or z). +``{axis_name}_command``: A movement command along the axis corresponding to axis_name (where axis_name can be x, y, or z). + The axis names are defined by the config file. ``{axis_name}_current_position``: The current position of the picomotor along the axis corresponding to axis_name (where axis_name can be x, y, or z). + The axis names are defined by the config file. + diff --git a/docs/services/web_power_switch.rst b/docs/services/web_power_switch.rst index 0863ab59d..42db58b75 100644 --- a/docs/services/web_power_switch.rst +++ b/docs/services/web_power_switch.rst @@ -3,8 +3,8 @@ Web Power Switch This service controls a power switch that is controllable over the internet. -So far catkit2 has been tested on the LPC7-PRO web power switch from TeleDynamics: -https://www.teledynamics.com/#/productdetails/LPC7-PRO +So far catkit2 has been tested on the following web power switches: +- `LPC7-PRO from TeleDynamics `_ Configuration ------------- diff --git a/docs/services/zwo_camera.rst b/docs/services/zwo_camera.rst index 7251bdef0..c171c553d 100644 --- a/docs/services/zwo_camera.rst +++ b/docs/services/zwo_camera.rst @@ -1,13 +1,14 @@ ZWO Camera ========== -This service operates a ZWO camera. There are currently four different types of ZWO cameras that have been tested and used with catkit2 so far: -- ZWO ASI533MM (https://www.zwoastro.com/product/asi533mm-mc/) -- ZWO ASI290MM (https://agenaastro.com/zwo-asi290mm-cmos-monochrome-astronomy-imaging-camera.html) -- ZWO ASI178MM (https://agenaastro.com/zwo-asi178mm-cmos-monochrome-astronomy-imaging-camera.html) -- ZWO ASI1600MM (https://agenaastro.com/zwo-asi1600mm-p-cmos-monochrome-astronomy-imaging-camera-pro.html) +This service operates a ZWO camera. The following are the different types of ZWO cameras that have been tested and used with catkit2 so far: +- `ZWO ASI533MM `_ +- `ZWO ASI290MM `_ +- `ZWO ASI178MM `_ +- `ZWO ASI1600MM `_ For camera specs, see the website links above. +Note that to use the ZWO cameras requires additional manual install of driver(s) from `_ Configuration ------------- From 7c4a8b870f781536c4ade45b9e791bf1e6aa4ed1 Mon Sep 17 00:00:00 2001 From: Meiji Nguyen Date: Fri, 24 May 2024 13:31:15 -0400 Subject: [PATCH 09/13] minor formatting edits --- docs/services/newport_picomotor.rst | 8 +++----- docs/services/web_power_switch.rst | 4 ++-- docs/services/zwo_camera.rst | 3 ++- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/services/newport_picomotor.rst b/docs/services/newport_picomotor.rst index 9b7709af1..3cd60eb84 100644 --- a/docs/services/newport_picomotor.rst +++ b/docs/services/newport_picomotor.rst @@ -4,7 +4,7 @@ Newport Picomotor This service controls a Newport Picomotor Motion Controller. The following Newport Picomotors have been tested and used with catkit2 so far: -`Newport Picomotor `_ +`Model 8742 Newport Picomotor `_ The bottom of the webpage linked above has resources for the user including software downloads, technical notes, and user manuals. @@ -41,9 +41,7 @@ None. Datastreams ----------- -``{axis_name}_command``: A movement command along the axis corresponding to axis_name (where axis_name can be x, y, or z). - The axis names are defined by the config file. +``{axis_name}_command``: A movement command along the axis corresponding to axis_name (where axis_name can be x, y, or z). The axis names are defined by the config file. -``{axis_name}_current_position``: The current position of the picomotor along the axis corresponding to axis_name (where axis_name can be x, y, or z). - The axis names are defined by the config file. +``{axis_name}_current_position``: The current position of the picomotor along the axis corresponding to axis_name (where axis_name can be x, y, or z). The axis names are defined by the config file. diff --git a/docs/services/web_power_switch.rst b/docs/services/web_power_switch.rst index 42db58b75..f2759c6f3 100644 --- a/docs/services/web_power_switch.rst +++ b/docs/services/web_power_switch.rst @@ -4,6 +4,7 @@ Web Power Switch This service controls a power switch that is controllable over the internet. So far catkit2 has been tested on the following web power switches: + - `LPC7-PRO from TeleDynamics `_ Configuration @@ -43,5 +44,4 @@ None. Datastreams ----------- -``{outlet_name}``: The name of an outlet. These are defined by the config file (see the sample Configuration - section above where the names of eight example outlets are given). +``{outlet_name}``: The name of an outlet. These are defined by the config file (see the sample Configuration section above where the names of eight example outlets are given). diff --git a/docs/services/zwo_camera.rst b/docs/services/zwo_camera.rst index c171c553d..b8205c046 100644 --- a/docs/services/zwo_camera.rst +++ b/docs/services/zwo_camera.rst @@ -2,13 +2,14 @@ ZWO Camera ========== This service operates a ZWO camera. The following are the different types of ZWO cameras that have been tested and used with catkit2 so far: + - `ZWO ASI533MM `_ - `ZWO ASI290MM `_ - `ZWO ASI178MM `_ - `ZWO ASI1600MM `_ For camera specs, see the website links above. -Note that to use the ZWO cameras requires additional manual install of driver(s) from `_ +Note that to use the ZWO cameras requires additional manual install of driver(s) from `zwoastro.com `_ Configuration ------------- From e8538cd881b941552a90c1fc67362dd61b91f95d Mon Sep 17 00:00:00 2001 From: Meiji Nguyen Date: Fri, 24 May 2024 13:50:59 -0400 Subject: [PATCH 10/13] added driver and user manual information and links --- docs/services/newport_picomotor.rst | 5 +++-- docs/services/web_power_switch.rst | 2 +- environment.yml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/services/newport_picomotor.rst b/docs/services/newport_picomotor.rst index 3cd60eb84..4f4a253a6 100644 --- a/docs/services/newport_picomotor.rst +++ b/docs/services/newport_picomotor.rst @@ -4,9 +4,10 @@ Newport Picomotor This service controls a Newport Picomotor Motion Controller. The following Newport Picomotors have been tested and used with catkit2 so far: -`Model 8742 Newport Picomotor `_ +- `Model 8742 `_ -The bottom of the webpage linked above has resources for the user including software downloads, technical notes, and user manuals. +The Newport Picomotor comes with a USB Flash Drive that contains communication drivers and software necessary for operating the controller +(see page 42 of the `user manual `_). Configuration ------------- diff --git a/docs/services/web_power_switch.rst b/docs/services/web_power_switch.rst index f2759c6f3..d5e03195a 100644 --- a/docs/services/web_power_switch.rst +++ b/docs/services/web_power_switch.rst @@ -5,7 +5,7 @@ This service controls a power switch that is controllable over the internet. So far catkit2 has been tested on the following web power switches: -- `LPC7-PRO from TeleDynamics `_ +- `LPC7-PRO from TeleDynamics `_ (for more information, see the `Spec Sheet `_ and `User Manual `_. Note: no software driver installation required) Configuration ------------- diff --git a/environment.yml b/environment.yml index 501fd7254..7947b6f79 100644 --- a/environment.yml +++ b/environment.yml @@ -38,5 +38,5 @@ dependencies: - flake8 - pip: - dcps - - zwoasi>=0.0.21 # Requires additional manual install of driver(s) from https://astronomy-imaging-camera.com/software-drivers + - zwoasi>=0.0.21 - git+https://github.com/alliedvision/VimbaPython.git@v1.2.1 From d006cd9eca7e7038de0b62f8a7dd027d9d828ecc Mon Sep 17 00:00:00 2001 From: Meiji Nguyen Date: Fri, 24 May 2024 13:57:59 -0400 Subject: [PATCH 11/13] minor formatting --- docs/services/newport_picomotor.rst | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/services/newport_picomotor.rst b/docs/services/newport_picomotor.rst index 4f4a253a6..5d53ba4d8 100644 --- a/docs/services/newport_picomotor.rst +++ b/docs/services/newport_picomotor.rst @@ -4,10 +4,8 @@ Newport Picomotor This service controls a Newport Picomotor Motion Controller. The following Newport Picomotors have been tested and used with catkit2 so far: -- `Model 8742 `_ - -The Newport Picomotor comes with a USB Flash Drive that contains communication drivers and software necessary for operating the controller -(see page 42 of the `user manual `_). +- `Model 8742 `_ (comes with a USB Flash Drive that contains communication drivers and software necessary for operating the controller, +see page 42 of the `user manual `_) Configuration ------------- From 3adc430b3f528faf163704ddd62f0f9bfba7281b Mon Sep 17 00:00:00 2001 From: Meiji Nguyen Date: Tue, 28 May 2024 11:26:31 -0400 Subject: [PATCH 12/13] minor language edits to three camera types --- docs/services/allied_vision_camera.rst | 10 +++++----- docs/services/hamamatsu_camera.rst | 10 +++++----- docs/services/zwo_camera.rst | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/services/allied_vision_camera.rst b/docs/services/allied_vision_camera.rst index cf2b32d3e..0ba2dbb5f 100644 --- a/docs/services/allied_vision_camera.rst +++ b/docs/services/allied_vision_camera.rst @@ -47,13 +47,13 @@ Properties ``brightness``: Brightness of the camera. -``width``: The width of the camera. +``width``: The width of the camera frames. -``height``: The height of the camera. +``height``: The height of the camera frames. -``offset_x``: The x offset of the camera. +``offset_x``: The x offset of the camera frames on the sensor. -``offset_y``: The y offset of the camera. +``offset_y``: The y offset of the camera frames on the sensor. ``sensor_width``: The width of the sensor. @@ -67,7 +67,7 @@ Commands Datastreams ----------- -``temperature``: The temperature as measured by this sensor in Celsius. +``temperature``: The temperature (in Celsius) as measured by the camera. ``images``: The images acquired by the camera. diff --git a/docs/services/hamamatsu_camera.rst b/docs/services/hamamatsu_camera.rst index 507535984..0b1fdacc3 100644 --- a/docs/services/hamamatsu_camera.rst +++ b/docs/services/hamamatsu_camera.rst @@ -42,13 +42,13 @@ Properties ``brightness``: Brightness of the camera. -``width``: The width of the camera. +``width``: The width of the camera frames. -``height``: The height of the camera. +``height``: The height of the camera frames. -``offset_x``: The x offset of the camera. +``offset_x``: The x offset of the camera frames on the sensor. -``offset_y``: The y offset of the camera. +``offset_y``: The y offset of the camera frames on the sensor. ``sensor_width``: The width of the sensor. @@ -62,7 +62,7 @@ Commands Datastreams ----------- -``temperature``: The temperature as measured by this sensor in Celsius. +``temperature``: The temperature (in Celsius) as measured by the camera. ``images``: The images acquired by the camera. diff --git a/docs/services/zwo_camera.rst b/docs/services/zwo_camera.rst index b8205c046..206712524 100644 --- a/docs/services/zwo_camera.rst +++ b/docs/services/zwo_camera.rst @@ -9,7 +9,7 @@ This service operates a ZWO camera. The following are the different types of ZWO - `ZWO ASI1600MM `_ For camera specs, see the website links above. -Note that to use the ZWO cameras requires additional manual install of driver(s) from `zwoastro.com `_ +Note that using ZWO cameras requires a manual installation of drivers from `zwoastro.com `_ Configuration ------------- @@ -37,13 +37,13 @@ Properties ``brightness``: Brightness of the camera. -``width``: The width of the camera. +``width``: The width of the camera frames. -``height``: The height of the camera. +``height``: The height of the camera frames. -``offset_x``: The x offset of the camera. +``offset_x``: The x offset of the camera frames on the sensor. -``offset_y``: The y offset of the camera. +``offset_y``: The y offset of the camera frames on the sensor. ``sensor_width``: The width of the sensor. @@ -59,7 +59,7 @@ Commands Datastreams ----------- -``temperature``: The temperature as measured by this sensor in Celsius. +``temperature``: The temperature (in Celsius) as measured by the camera. ``images``: The images acquired by the camera. From 8932bc29226dbf705b130256faa5ca26e012c279 Mon Sep 17 00:00:00 2001 From: Meiji Nguyen Date: Wed, 29 May 2024 12:35:53 -0400 Subject: [PATCH 13/13] added units for exposure time --- docs/services/zwo_camera.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/services/zwo_camera.rst b/docs/services/zwo_camera.rst index 206712524..ceb26a097 100644 --- a/docs/services/zwo_camera.rst +++ b/docs/services/zwo_camera.rst @@ -31,7 +31,7 @@ Configuration Properties ---------- -``exposure_time``: Exposure time of the camera. +``exposure_time``: Exposure time (in microseconds) of the camera. ``gain``: Gain of the camera.