Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions bps/bps_PromptTemplate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,11 @@ site:
profile:
condor:
+Walltime: 43200

# Include BPS clustering to group compatible pipeline tasks for more efficient batch
# processing. Use QuickTemplate's clustering file.
includeConfigs:
- ${AP_PIPE_DIR}/bps/clustering/clustering_PromptTemplate.yaml
- ${AP_PIPE_DIR}/bps/clustering/clustering_QuickTemplate.yaml

# Memory allocated for each quantum, in MBs; can be overridden on a per-task basis.
# The bps default is 2048 MB, the same as this example, but it's kept here as a reminder.
Expand All @@ -37,12 +40,12 @@ payload:
# The operator variable is used at facilities beyond bps and it defaults to the value of USER.
output : 'u/{operator}/{payloadName}'
# UPDATE THIS to specify what data to process
dataQuery: "instrument='LSSTCam' AND skymap='lsst_cells_v1 AND band='g'"
dataQuery: "instrument='LSSTCam' AND skymap='lsst_cells_v2 AND band='g'"

# Various things for bps to customize about each pipeline task
pipetask:
# Option to list other pipeline tasks being run here with default overrides
makeWarp:
makeDirectWarp:
requestMemory: 8192

# Set the appropriate wms service class for the batch system
Expand Down
6 changes: 5 additions & 1 deletion bps/bps_QuickTemplate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@ site:
profile:
condor:
+Walltime: 43200

# Include BPS clustering to group compatible pipeline tasks for more efficient batch
# processing.
includeConfigs:
- ${AP_PIPE_DIR}/bps/clustering/clustering_QuickTemplate.yaml

# if you are running on data that needs skyCorr, such as HSC, comment out the previous line
# and use this one instead:
# - ${AP_PIPE_DIR}/bps/clustering/clustering_HSC_QuickTemplate.yaml
Expand All @@ -45,7 +49,7 @@ payload:
# Various things for bps to customize about each pipeline task
pipetask:
# Option to list other pipeline tasks being run here with default overrides
makeWarp:
makeDirectWarp:
requestMemory: 8192

# Set the appropriate wms service class for the batch system
Expand Down
31 changes: 0 additions & 31 deletions bps/clustering/clustering_PromptTemplate.yaml

This file was deleted.

12 changes: 6 additions & 6 deletions bps/clustering/clustering_QuickTemplate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ cluster:
pipetasks: makeDirectWarp,makePsfMatchedWarp
dimensions: patch,visit
selectAndAssemble:
pipetasks: selectTemplateCoaddVisits,assembleTemplateCoadd
pipetasks: selectTemplateCoaddVisits,assembleTemplateCoadd,assembleCellCoadd
dimensions: band,tract,patch
make_analysis_images:
pipetasks: makeBinnedTemplateCoaddNImage,makeBinnedTemplateCoaddImage
dimensions: tract,band
make_tract_analysis_images:
pipetasks: makeWholeTractTemplateCoaddNImage,makeWholeTractTemplateCoaddImage
tract_band_analysis:
pipetasks: makeTemplateCoaddInputSummaryTract,aggregateTemplateCoaddMaskFractions,makeBinnedTemplateCoaddNImage,makeBinnedTemplateCoaddImage,makeWholeTractTemplateCoaddNImage,makeWholeTractTemplateCoaddImage
dimensions: tract,band
mask_fraction_global:
pipetasks: makeAggregatedTemplateCoaddMaskFractionsTable,aggregatedTemplateCoaddMaskFractionsWholeSkyPlot
dimensions: band
make_metrics:
pipetasks: analyzeCoaddDepthCore,coaddDepthMetricTract
dimensions: tract
12 changes: 6 additions & 6 deletions pipelines/LSSTCam/PromptTemplate.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
description: The LSSTCam AP template building pipeline with preliminary_visit_images as inputs.
# Important Note: Use corresponding BPS clustering file when running with BPS.
# Important Note: Use QuickTemplate BPS clustering file when running with BPS.

instrument: lsst.obs.lsst.LsstCam

Expand All @@ -8,13 +8,13 @@ imports:
exclude:
- isr
- calibrateImage
- selectTemplateCoaddVisits
labeledSubsetModifyMode: EDIT

parameters:
image_type: future
use_cell_coadds: true

tasks:
consolidateVisitSummary:
class: lsst.pipe.tasks.postprocess.ConsolidateVisitSummaryTask
config:
full: True
selectTemplateCoaddVisits:
# Class changed from BestSeeingQuantileSelectVisitsTask due to different template
# expectations for incremental templates.
Expand Down
5 changes: 5 additions & 0 deletions pipelines/LSSTCam/QuickTemplate.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
description: The LSSTCam AP template building pipeline
# Important Note: Use QuickTemplate BPS clustering file when running with BPS.

instrument: lsst.obs.lsst.LsstCam

imports:
- location: $AP_PIPE_DIR/pipelines/_ingredients/QuickTemplate.yaml

parameters:
image_type: future
use_cell_coadds: true
13 changes: 13 additions & 0 deletions pipelines/_ingredients/QuickTemplate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ imports:
- makeDirectWarp
- makePsfMatchedWarp
- assembleTemplateCoadd
- assembleCellCoadd
- makeTemplateCoaddInputSummaryTract
- makeTemplateCoaddInputSummary
- makeBinnedTemplateCoaddImage
Expand Down Expand Up @@ -53,6 +54,17 @@ tasks:
maxFractionEpochsHigh: 0.2
badMaskPlanes: ["NO_DATA", "BAD", "SAT", "EDGE", "SPIKE"]
prefilterArtifactsMaskPlanes: ["NO_DATA", "BAD", "SUSPECT", "SPIKE"]
doWriteArtifactMasks: true
python: |
config.doInputMap = not parameters.use_cell_coadds
assembleCellCoadd:
class: lsst.drp.tasks.assemble_cell_coadd.AssembleCellCoaddTask
config:
connections.inputWarps: direct_warp
connections.maskedFractionWarps: direct_warp_masked_fraction
connections.visitSummaryList: preliminary_visit_summary
connections.multipleCellCoadd: template_coadd_cell
connections.inputMap: template_coadd_input_map

subsets:
singleFrame:
Expand All @@ -68,6 +80,7 @@ subsets:
- makeDirectWarp
- makePsfMatchedWarp
- assembleTemplateCoadd
- assembleCellCoadd
description: >
Tasks to run to build good seeing coadds for use as templates.
makeMetrics:
Expand Down
Loading