From 4b76695772685caf3058e28b19f19c6de31887dc Mon Sep 17 00:00:00 2001
From: ugyballoons <ugyballoons@gmail.com>
Date: Tue, 19 Nov 2024 15:37:57 +0000
Subject: [PATCH 1/2] Add AOS residual FWHM channel to AOS cameras

---
 python/lsst/ts/rubintv/models/models_data.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/python/lsst/ts/rubintv/models/models_data.yaml b/python/lsst/ts/rubintv/models/models_data.yaml
index d04bd51..108fd02 100644
--- a/python/lsst/ts/rubintv/models/models_data.yaml
+++ b/python/lsst/ts/rubintv/models/models_data.yaml
@@ -313,6 +313,9 @@ cameras:
       - name: focus_sweep
         title: Focus Sweep
         colour: "#967289"
+      - name: psf_zk_panel
+        title: AOS residual FWHM
+        colour: "#d27c54"
 
   - name: comcam_aos
     title: ComCamAOS
@@ -332,6 +335,9 @@ cameras:
       - name: focus_sweep
         title: Focus Sweep
         colour: "#965d82"
+      - name: psf_zk_panel
+        title: AOS residual FWHM
+        colour: "#d27549"
 
   - name: comcam_sim_prep
     title: ComCamSimPrep

From b005d8edb1e08d7ed4fc111ac01c75cb8bbb1bea Mon Sep 17 00:00:00 2001
From: ugyballoons <ugyballoons@gmail.com>
Date: Tue, 19 Nov 2024 15:55:46 +0000
Subject: [PATCH 2/2] Sort calendar months

---
 python/lsst/ts/rubintv/templates/camera_parts/calendar.jinja | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/lsst/ts/rubintv/templates/camera_parts/calendar.jinja b/python/lsst/ts/rubintv/templates/camera_parts/calendar.jinja
index 590a9b9..fcfa89c 100644
--- a/python/lsst/ts/rubintv/templates/camera_parts/calendar.jinja
+++ b/python/lsst/ts/rubintv/templates/camera_parts/calendar.jinja
@@ -29,7 +29,7 @@
     <div class="year" id="year-{{ year }}">
   {% endif %}
 
-    {% for month in calendar[year]|reverse %}
+    {% for month in calendar[year]|sort|reverse %}
       <div class="month">
         <h5 class="month-title">
           {{ month_names[month - 1] }}