-
Notifications
You must be signed in to change notification settings - Fork 280
Add a few containers for monitoring data #3063
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
2c852e4
Add a few containers for monitoring data
mexanick 9583452
Change default values to None
mexanick 58953d1
Remove TelescopeSkyPointing container and convert the final correctio…
mexanick 2dc7f50
add changelog
mexanick c07e20a
Revert "Change default values to None"
mexanick 001ca2e
Default nested pointing monitoring containers to None
mexanick 9e97b9f
Fix weather container
mexanick eddba74
Make field names uniform and update docstrings
mexanick 1156428
sigma_<coordinate> --> uncertainty_<coordinate>
mexanick 62d175e
Apply suggestions from code review
mexanick 31b42c0
Removing unnecessary containers from event-wise monitoring tree
mexanick 2b73ade
export "AuxiliaryPointingCorrectionContainer"
mexanick File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Add monitoring containers for pointing-related data |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -59,6 +59,11 @@ | |
| "TimingParametersContainer", | ||
| "TriggerContainer", | ||
| "TelescopePointingContainer", | ||
| "TelescopeStructurePointingContainer", | ||
| "TelescopeStructureDisplacementContainer", | ||
| "CameraDisplacementContainer", | ||
| "AuxiliaryPointingCorrectionContainer", | ||
| "TelescopePointingCorrectionContainer", | ||
| "ArrayPointingContainer", | ||
| "StatisticsContainer", | ||
| "ChunkContainer", | ||
|
|
@@ -71,6 +76,7 @@ | |
| "ObservationBlockContainer", | ||
| "ObservingMode", | ||
| "ObservationBlockState", | ||
| "WeatherMonitoringContainer", | ||
| ] | ||
|
|
||
|
|
||
|
|
@@ -1187,8 +1193,101 @@ class DL2Container(Container): | |
| ) | ||
|
|
||
|
|
||
| # Calibration containers | ||
| # Pointing containers | ||
| # Calibration and Monitoring containers | ||
|
|
||
|
|
||
| # Pointing-related containers | ||
| class TelescopeStructurePointingContainer(Container): | ||
| """ | ||
| Pointing of the telescope structure in local coordinates (Alt/Az) | ||
| as measured by the telescope hardware (e.g. drive encoders). | ||
| """ | ||
|
|
||
| default_prefix = "structure_pointing" | ||
| azimuth = Field( | ||
| nan * u.rad, "Raw azimuth measured by structure encoders", unit=u.rad | ||
| ) | ||
| altitude = Field( | ||
| nan * u.rad, "Raw altitude measured by structure encoders", unit=u.rad | ||
| ) | ||
|
|
||
|
|
||
| class TelescopeStructureDisplacementContainer(Container): | ||
| """ | ||
| Difference between ideal and real direction of the telescope axis for | ||
| a given elevation in local coordinates (e.g. structural bending model). | ||
| """ | ||
|
|
||
| default_prefix = "structure_displacement" | ||
| delta_azimuth = Field( | ||
| nan * u.rad, | ||
| "Azimuth offset due to structure bending/deformation", | ||
| unit=u.rad, | ||
| ) | ||
| delta_altitude = Field( | ||
| nan * u.rad, | ||
| "Altitude offset due to structure bending/deformation", | ||
| unit=u.rad, | ||
| ) | ||
|
|
||
|
|
||
| class CameraDisplacementContainer(Container): | ||
| """ | ||
| Displacement and tilt of the camera w.r.t. its nominal position in the | ||
| telescope structure. | ||
| """ | ||
|
|
||
| default_prefix = "camera_displacement" | ||
| delta_x = Field( | ||
| nan * u.m, "Camera displacement along X axis (horizontal)", unit=u.m | ||
| ) | ||
| delta_y = Field(nan * u.m, "Camera displacement along Y axis (vertical)", unit=u.m) | ||
| delta_z = Field( | ||
| nan * u.m, "Camera displacement along optical Z axis (focal offset)", unit=u.m | ||
| ) | ||
| tilt_x = Field(nan * u.rad, "Camera tilt angle around X axis (pitch)", unit=u.rad) | ||
| tilt_y = Field(nan * u.rad, "Camera tilt angle around Y axis (yaw)", unit=u.rad) | ||
| tilt_z = Field( | ||
| nan * u.rad, "Camera rotation angle around optical Z axis (roll)", unit=u.rad | ||
| ) | ||
|
|
||
|
|
||
| class AuxiliaryPointingCorrectionContainer(Container): | ||
| """ | ||
| Pointing correction in celestial coordinates derived using auxiliary hardware, such as e.g. StarGuider camera. | ||
| """ | ||
|
|
||
| default_prefix = "aux_pointing_correction" | ||
| delta_ra = Field( | ||
| nan * u.rad, "Residual Right Ascension offset correction", unit=u.rad | ||
| ) | ||
| delta_dec = Field(nan * u.rad, "Residual Declination offset correction", unit=u.rad) | ||
|
|
||
|
|
||
| class TelescopePointingCorrectionContainer(Container): | ||
| """ | ||
| Residual sky-pointing corrections in local coordinates (Alt/Az). | ||
|
|
||
| This container holds pointing offsets in local coordinates regardless of how they were | ||
| derived (e.g. analytical StarTracker, auxiliary hardware devices, | ||
| or a combination/fusion model). | ||
| """ | ||
|
|
||
| default_prefix = "pointing_correction" | ||
| delta_altitude = Field( | ||
| nan * u.rad, "Residual Altitude offset correction", unit=u.rad | ||
| ) | ||
| delta_azimuth = Field(nan * u.rad, "Residual Azimuth offset correction", unit=u.rad) | ||
|
|
||
| # Optional uncertainty tracking | ||
| altitude_uncertainty = Field( | ||
| nan * u.rad, "Uncertainty on Altitude offset correction", unit=u.rad | ||
| ) | ||
| azimuth_uncertainty = Field( | ||
| nan * u.rad, "Uncertainty on Azimuth offset correction", unit=u.rad | ||
| ) | ||
|
|
||
|
|
||
| class TelescopePointingContainer(Container): | ||
| """ | ||
| Container holding pointing information for a single telescope | ||
|
|
@@ -1214,6 +1313,29 @@ class ArrayPointingContainer(Container): | |
| array_dec = Field(nan * u.rad, "Array pointing declination", unit=u.rad) | ||
|
|
||
|
|
||
| # Environmental Monitoring containers | ||
| class WeatherMonitoringContainer(Container): | ||
| """ | ||
| Environmental parameters at the observatory site. | ||
|
|
||
| Note: Astronomical refraction derived from weather measurements SHALL ONLY | ||
| be used when fitting star positions during offline optical pointing calibration. | ||
| It SHALL NOT be applied during Cherenkov atmospheric shower direction reconstruction. | ||
| """ | ||
|
|
||
| default_prefix = "weather" | ||
| temperature = Field( | ||
| nan * u.K, "Ambient air temperature at observatory site", unit=u.K | ||
|
maxnoe marked this conversation as resolved.
|
||
| ) | ||
| pressure = Field( | ||
| nan * u.hPa, "Atmospheric pressure at observatory site", unit=u.hPa | ||
| ) | ||
| relative_humidity = Field( | ||
| nan, | ||
| "Relative humidity fraction (0.0 to 1.0)", | ||
|
maxnoe marked this conversation as resolved.
|
||
| ) | ||
|
|
||
|
|
||
| # Camera containers | ||
| class CameraCalibrationContainer(Container): | ||
| """ | ||
|
|
@@ -1347,8 +1469,16 @@ class TelescopeMonitoringContainer(Container): | |
| default_factory=CameraMonitoringContainer, | ||
| description="Container for monitoring data for camera", | ||
| ) | ||
|
|
||
| camera_displacement = Field( | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. How are dual-mirror telescopes supported by this? They need camera, and primary mirror corrections, I guess? |
||
| default=None, | ||
| type=CameraDisplacementContainer, | ||
| description="Displacement and tilt of the camera w.r.t. its nominal position in the telescope structure.", | ||
| ) | ||
|
|
||
| pointing = Field( | ||
| default_factory=TelescopePointingContainer, | ||
| default=None, | ||
| type=TelescopePointingContainer, | ||
| description="Telescope pointing positions", | ||
| ) | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Somewhere in the docs you should be specific about the order of applying these transforms: rotate then translate is not the same as translate then rotate.
Also maybe name them like that? E.g.
translation_x,rotation_zto be more standard? (tilt could mean a rotation or a shear, so it's not as clear)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Which brings up one more question: do we need to worry about camera or optics shear? Or is it negligible?