Merge develop into main

doc/versionHistory.rst

@@ -6,6 +6,33 @@
 Version History
 ##################
 
+.. _lsst.ts.wep-13.3.0:
+
+-------------
+13.3.0
+-------------
+
+* Add donut quality tables to outputs even when there are no donuts that pass so that we can match it up to the donut stamps and understand rejections.
+* Change default pipeline setting to false for rubinTV upload.
+
+.. _lsst.ts.wep-13.2.0:
+
+-------------
+13.2.0
+-------------
+
+* Implemented joint-fitting of donut pairs with Danish.
+
+.. _lsst.ts.wep-13.1.0:
+
+-------------
+13.1.0
+-------------
+
+* Set saveHistory=True and loosen convergence criteria in the Danish production pipeline
+* Upgrades to the forward modeling util, including specifying flux ratios for blends, miscentering donuts, and simulating "flat" donuts without intensity patterns
+* Fixed bug in forward modeling util when adding noise to large flux values
+
 .. _lsst.ts.wep-13.0.4:
 
 -------------
@@ -23,7 +50,7 @@ Version History
 
 * Task plotPsfFromZern added in comCamRapidAnalysisPipeline and comCamRapidAnalysisDanishPipeline.
 
-.. _lsst.ts.wep-13.0.3:
+.. _lsst.ts.wep-13.0.2:
 
 -------------
 13.0.2

pipelines/_ingredients/donutVizGroupPipeline.yaml

@@ -14,17 +14,17 @@ tasks:
   plotAOSTask:
     class: lsst.donut.viz.PlotAOSTask
     config:
-      doRubinTVUpload: true
+      doRubinTVUpload: false
   aggregateDonutStampsTask:
     class: lsst.donut.viz.AggregateDonutStampsTask
   plotDonutTask:
     class: lsst.donut.viz.PlotDonutTask
     config:
-      doRubinTVUpload: true
+      doRubinTVUpload: false
   plotPsfZernTask:
     class: lsst.donut.viz.PlotPsfZernTask
     config:
-      doRubinTVUpload: true
+      doRubinTVUpload: false
 
 subsets:
   donutVizGroups:

pipelines/_ingredients/wepDirectDetectScienceGroupPipeline.yaml

@@ -26,19 +26,6 @@ tasks:
       estimateZernikes.saveHistory: False
       estimateZernikes.maskKwargs: { "doMaskBlends": False }
       donutStampSelector.maxSelect: 5
-  isr:
-    class: lsst.ip.isr.IsrTaskLSST
-    config:
-      # Although we don't have to apply the amp offset corrections, we do want
-      # to compute them for analyzeAmpOffsetMetadata to report on as metrics.
-      doAmpOffset: true
-      ampOffset.doApplyAmpOffset: false
-      # Turn off slow steps in ISR
-      doBrighterFatter: false
-      # Mask saturated pixels,
-      # but turn off quadratic crosstalk because it's currently broken
-      doSaturation: True
-      crosstalk.doQuadraticCrosstalkCorrection: False
 
 subsets:
   wepDirectDetect:

pipelines/production/comCamDailyProcessing.yaml

@@ -9,22 +9,11 @@ tasks:
     class: lsst.ts.wep.task.generateDonutDirectDetectTask.GenerateDonutDirectDetectTask
     config:
       donutSelector.useCustomMagLimit: True
-  plotAOSTask:
-    class: lsst.donut.viz.PlotAOSTask
-    config:
-      doRubinTVUpload: false
-  aggregateDonutStampsTask:
-    class: lsst.donut.viz.AggregateDonutStampsTask
-  plotDonutTask:
-    class: lsst.donut.viz.PlotDonutTask
-    config:
-      doRubinTVUpload: false
 
 # Define pipeline steps
 subsets:
   step1:
     subset:
-      - isr
       - generateDonutDirectDetectTask
       - cutOutDonutsScienceSensorGroupTask
       - calcZernikesTask

pipelines/production/comCamRapidAnalysisDanishPipeline.yaml

@@ -5,6 +5,19 @@ imports:
   - $TS_WEP_DIR/pipelines/_ingredients/donutVizGroupPipeline.yaml
 
 tasks:
+  isr:
+    class: lsst.ip.isr.IsrTaskLSST
+    config:
+      # Although we don't have to apply the amp offset corrections, we do want
+      # to compute them for analyzeAmpOffsetMetadata to report on as metrics.
+      doAmpOffset: true
+      ampOffset.doApplyAmpOffset: false
+      # Turn off slow steps in ISR
+      doBrighterFatter: false
+      # Mask saturated pixels,
+      # but turn off quadratic crosstalk because it's currently broken
+      doSaturation: True
+      crosstalk.doQuadraticCrosstalkCorrection: False
   calcZernikesTask:
     class: lsst.ts.wep.task.calcZernikesTask.CalcZernikesTask
     config:
@@ -16,6 +29,23 @@ tasks:
       estimateZernikes.binning: 2
       estimateZernikes.nollIndices:
         [4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 20, 21, 22, 27, 28]
+      estimateZernikes.saveHistory: true
+      estimateZernikes.lstsqKwargs:
+        ftol: 1.0e-3
+        xtol: 1.0e-3
+        gtol: 1.0e-3
+  plotAOSTask:
+    class: lsst.donut.viz.PlotAOSTask
+    config:
+      doRubinTVUpload: true
+  plotDonutTask:
+    class: lsst.donut.viz.PlotDonutTask
+    config:
+      doRubinTVUpload: true
+  plotPsfZernTask:
+    class: lsst.donut.viz.PlotPsfZernTask
+    config:
+      doRubinTVUpload: true
 
 # Define pipeline steps
 subsets:

pipelines/production/comCamRapidAnalysisPipeline.yaml

@@ -5,6 +5,19 @@ imports:
   - $TS_WEP_DIR/pipelines/_ingredients/donutVizGroupPipeline.yaml
 
 tasks:
+  isr:
+    class: lsst.ip.isr.IsrTaskLSST
+    config:
+      # Although we don't have to apply the amp offset corrections, we do want
+      # to compute them for analyzeAmpOffsetMetadata to report on as metrics.
+      doAmpOffset: true
+      ampOffset.doApplyAmpOffset: false
+      # Turn off slow steps in ISR
+      doBrighterFatter: false
+      # Mask saturated pixels,
+      # but turn off quadratic crosstalk because it's currently broken
+      doSaturation: True
+      crosstalk.doQuadraticCrosstalkCorrection: False
   calcZernikesTask:
     class: lsst.ts.wep.task.calcZernikesTask.CalcZernikesTask
     config:
@@ -18,6 +31,18 @@ tasks:
       estimateZernikes.maskKwargs: { "doMaskBlends": False }
       donutStampSelector.maxSelect: 5
       donutStampSelector.maxFracBadPixels: 2.0e-4
+  plotAOSTask:
+    class: lsst.donut.viz.PlotAOSTask
+    config:
+      doRubinTVUpload: true
+  plotDonutTask:
+    class: lsst.donut.viz.PlotDonutTask
+    config:
+      doRubinTVUpload: true
+  plotPsfZernTask:
+    class: lsst.donut.viz.PlotPsfZernTask
+    config:
+      doRubinTVUpload: true
 
 # Define pipeline steps
 subsets: