Merge pull request #237 from lsst/tickets/DM-46122

DM-46122: Replace verify metrics for Completeness and Count based on magnitudes
lsst · Sep 19, 2024 · 8818d04 · 8818d04
2 parents 2672fb0 + 8345e96
commit 8818d04
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 128 deletions.
diff --git a/pipelines/DECam/ApVerifyWithFakes.yaml b/pipelines/DECam/ApVerifyWithFakes.yaml
@@ -20,19 +20,3 @@ tasks:
     config:
       doPackageAlerts: True
       alertPackager.doWriteAlerts: True
-contracts:
-  # Contracts removed by excluding apPipe
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCompletenessMag20t22.connections.ConnectionsClass(config=apFakesCompletenessMag20t22).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCompletenessMag22t24.connections.ConnectionsClass(config=apFakesCompletenessMag22t24).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCompletenessMag24t26.connections.ConnectionsClass(config=apFakesCompletenessMag24t26).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCountMag20t22.connections.ConnectionsClass(config=apFakesCountMag20t22).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCountMag22t24.connections.ConnectionsClass(config=apFakesCountMag22t24).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCountMag24t26.connections.ConnectionsClass(config=apFakesCountMag24t26).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCount.connections.ConnectionsClass(config=apFakesCount).matchedFakes.name
diff --git a/pipelines/HSC/ApVerifyWithFakes.yaml b/pipelines/HSC/ApVerifyWithFakes.yaml
@@ -17,19 +17,3 @@ tasks:
     config:
       doPackageAlerts: True
       alertPackager.doWriteAlerts: True
-contracts:
-  # Contracts removed by excluding apPipe
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCompletenessMag20t22.connections.ConnectionsClass(config=apFakesCompletenessMag20t22).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCompletenessMag22t24.connections.ConnectionsClass(config=apFakesCompletenessMag22t24).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCompletenessMag24t26.connections.ConnectionsClass(config=apFakesCompletenessMag24t26).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCountMag20t22.connections.ConnectionsClass(config=apFakesCountMag20t22).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCountMag22t24.connections.ConnectionsClass(config=apFakesCountMag22t24).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCountMag24t26.connections.ConnectionsClass(config=apFakesCountMag24t26).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCount.connections.ConnectionsClass(config=apFakesCount).matchedFakes.name
diff --git a/pipelines/LSSTCam-imSim/ApVerifyWithFakes.yaml b/pipelines/LSSTCam-imSim/ApVerifyWithFakes.yaml
@@ -17,19 +17,3 @@ tasks:
     config:
       doPackageAlerts: True
       alertPackager.doWriteAlerts: True
-contracts:
-  # Contracts removed by excluding apPipe
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCompletenessMag20t22.connections.ConnectionsClass(config=apFakesCompletenessMag20t22).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCompletenessMag22t24.connections.ConnectionsClass(config=apFakesCompletenessMag22t24).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCompletenessMag24t26.connections.ConnectionsClass(config=apFakesCompletenessMag24t26).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCountMag20t22.connections.ConnectionsClass(config=apFakesCountMag20t22).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCountMag22t24.connections.ConnectionsClass(config=apFakesCountMag22t24).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCountMag24t26.connections.ConnectionsClass(config=apFakesCountMag24t26).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCount.connections.ConnectionsClass(config=apFakesCount).matchedFakes.name
diff --git a/pipelines/_ingredients/ApVerifyWithFakes.yaml b/pipelines/_ingredients/ApVerifyWithFakes.yaml
@@ -5,7 +5,6 @@ description: Fully instrumented AP pipeline with fakes
 imports:
   - location: $AP_PIPE_DIR/pipelines/_ingredients/ApPipeWithFakes.yaml
   # Most metrics should not be run with fakes, to avoid bias or contamination.
-  - location: $AP_VERIFY_DIR/pipelines/_ingredients/MetricsForFakes.yaml
   - location: $AP_VERIFY_DIR/pipelines/_ingredients/ConversionsForFakes.yaml
 tasks:
   diaPipe:
@@ -15,20 +14,3 @@ tasks:
       # we have an alternative.
       doPackageAlerts: True
       alertPackager.doWriteAlerts: True
-contracts:
-  # Metric inputs must match pipeline outputs
-  # Use of ConnectionsClass for templated fields is a workaround for DM-30210
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCompletenessMag20t22.connections.ConnectionsClass(config=apFakesCompletenessMag20t22).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCompletenessMag22t24.connections.ConnectionsClass(config=apFakesCompletenessMag22t24).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCompletenessMag24t26.connections.ConnectionsClass(config=apFakesCompletenessMag24t26).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCountMag20t22.connections.ConnectionsClass(config=apFakesCountMag20t22).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCountMag22t24.connections.ConnectionsClass(config=apFakesCountMag22t24).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCountMag24t26.connections.ConnectionsClass(config=apFakesCountMag24t26).matchedFakes.name
-  - injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
-      apFakesCount.connections.ConnectionsClass(config=apFakesCount).matchedFakes.name
diff --git a/pipelines/_ingredients/MetricsForFakes.yaml b/pipelines/_ingredients/MetricsForFakes.yaml