Skip to content

Add generator-only configurations for SV #516

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.

Sign up for GitHub

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
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Add generator-only configurations for SV #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
81b7d2b
Add generator-only configurations for SV
rhiannonlynne Sep 2, 2025
157d7c4
Add yaml for generator only config
rhiannonlynne Sep 2, 2025
1f836a7
Reduce nnights for all configs using per-visit dithers
rhiannonlynne Sep 5, 2025
dd52b86
Make nnights large enough for all visits in a night
rhiannonlynne Sep 5, 2025
6743171
Use better numbers for nnights
rhiannonlynne Sep 6, 2025
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
32 changes: 32 additions & 0 deletions Scheduler/feature_scheduler/maintel/ddf_sv_generator.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
ddf_name,season_length,season,u,g,r,i,z,y,n_sequences,flush_length,even_odd_None,g_depth_limit

# COSMOS Shallow season
#COSMOS, 225, 0, 6, 0, 0, 0, 0, 0, 20, 2, none, 23.5
#COSMOS, 225, 0, 0, 0, 0, 0, 0, 4, 30, 2, none, 23.5
#COSMOS, 225, 0, 0, 6, 0, 6, 0, 0, 40, 1.0, even, 22.8
#COSMOS, 225, 0, 0, 0, 6, 0, 6, 0, 40, 1.0, odd, 22.8

# XMM_LSS deep season
#XMM_LSS, 225, 0, 8, 0, 0, 0, 0, 0, 20, 2, none, 23.5
#XMM_LSS, 225, 0, 0, 0, 0, 0, 0, 20, 30, 2, none, 23.5
XMM_LSS, 225, 0, 0, 6, 0, 6, 0, 0, 40, 0.5, even, 22.8
XMM_LSS, 225, 0, 0, 0, 6, 0, 6, 0, 40, 0.5, odd, 22.8
XMM_LSS, 180, 0, 0, 10, 20, 35, 35, 0, 28, 2, none, 22.8

# ELAISS1 shallow seasons
#ELAISS1, 225, 0, 6, 0, 0, 0, 0, 0, 20, 2, none, 23.5
#ELAISS1, 225, 0, 0, 0, 0, 0, 0, 4, 30, 2, none, 23.5
ELAISS1, 225, 0, 0, 5, 0, 8, 0, 0, 50, 1.0, even, 22.8
ELAISS1, 225, 0, 0, 0, 8, 0, 6, 0, 50, 1.0, odd, 22.8

# ECDFS shallow seasons
#ECDFS, 225, 0, 6, 0, 0, 0, 0, 0, 20, 2, none, 23.5
#ECDFS, 225, 0, 0, 0, 0, 0, 0, 4, 30, 2, none, 23.5
ECDFS, 225, 0, 0, 6, 0, 6, 0, 0, 40, 1, even, 22.8
ECDFS, 225, 0, 0, 0, 6, 0, 6, 0, 40, 1, odd, 22.8

# EDFS_a shallow seasons
#EDFS_a, 225, 0, 6, 0, 0, 0, 0, 0, 20, 2, none, 23.5
#EDFS_a, 225, 0, 0, 0, 0, 0, 0, 4, 30, 2, none, 23.5
EDFS_a, 225, 0, 0, 6, 0, 6, 0, 0, 40, 1.0, even, 22.8
EDFS_a, 225, 0, 0, 0, 6, 0, 6, 0, 40, 1.0, odd, 22.8
20 changes: 11 additions & 9 deletions Scheduler/feature_scheduler/maintel/fbs_config_minimal_fieldsurvey.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ def get_scheduler():
"nexps": nexps,
}

nnights = 500

# Carina
# Custom landscape dither
radius = np.sqrt(2.4)
Expand All @@ -125,7 +127,7 @@ def get_scheduler():
delta_ra = linear * np.cos(orientation)
delta_dec = linear * np.sin(orientation)
config_detailers = [
detailers.DitherDetailer(max_dither=0.7, per_night=False),
detailers.DitherDetailer(max_dither=0.7, per_night=False, nnights=nnights),
detailers.DeltaCoordDitherDetailer(delta_ra=delta_ra, delta_dec=delta_dec),
# Note: 5 centers * 4.5 deg per visit * 4 visits = 90 deg
detailers.CameraSmallRotPerObservationListDetailer(
Expand Down Expand Up @@ -157,7 +159,7 @@ def get_scheduler():
delta_ra = linear * np.cos(orientation)
delta_dec = linear * np.sin(orientation)
config_detailers = [
detailers.DitherDetailer(max_dither=0.7, per_night=False),
detailers.DitherDetailer(max_dither=0.7, per_night=False, nnights=nnights),
detailers.DeltaCoordDitherDetailer(delta_ra=delta_ra, delta_dec=delta_dec),
# Note: 5 centers * 4.5 deg per visit * 4 visits = 90 deg
detailers.CameraSmallRotPerObservationListDetailer(
Expand Down Expand Up @@ -189,7 +191,7 @@ def get_scheduler():
delta_ra = linear * np.cos(orientation)
delta_dec = linear * np.sin(orientation)
config_detailers = [
detailers.DitherDetailer(max_dither=0.4, per_night=False),
detailers.DitherDetailer(max_dither=0.4, per_night=False, nnights=nnights),
detailers.DeltaCoordDitherDetailer(delta_ra=delta_ra, delta_dec=delta_dec),
# Note: 5 centers * 4.5 deg per visit * 4 visits = 90 deg
detailers.CameraSmallRotPerObservationListDetailer(
Expand Down Expand Up @@ -221,7 +223,7 @@ def get_scheduler():
delta_ra = linear * np.cos(orientation)
delta_dec = linear * np.sin(orientation)
config_detailers = [
detailers.DitherDetailer(max_dither=0.7, per_night=False),
detailers.DitherDetailer(max_dither=0.7, per_night=False, nnights=nnights),
detailers.DeltaCoordDitherDetailer(delta_ra=delta_ra, delta_dec=delta_dec),
# Note: 5 centers * 4.5 deg per visit * 4 visits = 90 deg
detailers.CameraSmallRotPerObservationListDetailer(
Expand Down Expand Up @@ -253,7 +255,7 @@ def get_scheduler():
delta_ra = linear * np.cos(orientation)
delta_dec = linear * np.sin(orientation)
config_detailers = [
detailers.DitherDetailer(max_dither=0.7, per_night=False),
detailers.DitherDetailer(max_dither=0.7, per_night=False, nnights=nnights),
detailers.DeltaCoordDitherDetailer(delta_ra=delta_ra, delta_dec=delta_dec),
# Note: 5 centers * 4.5 deg per visit * 4 visits = 90 deg
detailers.CameraSmallRotPerObservationListDetailer(
Expand Down Expand Up @@ -297,7 +299,7 @@ def get_scheduler():
delta_ra = linear * np.cos(orientation)
delta_dec = linear * np.sin(orientation)
config_detailers = [
detailers.DitherDetailer(max_dither=0.7, per_night=False),
detailers.DitherDetailer(max_dither=0.7, per_night=False, nnights=nnights),
detailers.DeltaCoordDitherDetailer(delta_ra=delta_ra, delta_dec=delta_dec),
# Note: 3 centers * 1 deg per visit * 4 visits = 90 deg
detailers.CameraSmallRotPerObservationListDetailer(
Expand Down Expand Up @@ -356,7 +358,7 @@ def get_scheduler():
# Default for LSST DDFs
# detailers.DitherDetailer(max_dither=0.2, per_night=False),
# Experimental larger dither pattern
detailers.DitherDetailer(max_dither=1.4, per_night=False),
detailers.DitherDetailer(max_dither=1.4, per_night=False, nnights=nnights),
# Note: 1 center * 3 deg per visit * 30 visits = 90 deg
detailers.CameraSmallRotPerObservationListDetailer(
max_rot=45.0,
Expand Down Expand Up @@ -400,7 +402,7 @@ def get_scheduler():
delta_ra = linear * np.cos(orientation)
delta_dec = linear * np.sin(orientation)
config_detailers = [
detailers.DitherDetailer(max_dither=1.4, per_night=False),
detailers.DitherDetailer(max_dither=1.4, per_night=False, nnights=nnights),
detailers.DeltaCoordDitherDetailer(delta_ra=delta_ra, delta_dec=delta_dec),
# Note: 7 centers * 1 deg per visit * 5 visits = 35 deg
detailers.CameraSmallRotPerObservationListDetailer(
Expand Down Expand Up @@ -433,7 +435,7 @@ def get_scheduler():
# Default for other fields
# 2x raft scale dithers
config_detailers = [
detailers.DitherDetailer(max_dither=1.4, per_night=False),
detailers.DitherDetailer(max_dither=1.4, per_night=False, nnights=nnights),
# Note: 1 center * 3 deg per visit * 30 visits = 90 deg
detailers.CameraSmallRotPerObservationListDetailer(
max_rot=45.0,
Expand Down
4 changes: 3 additions & 1 deletion Scheduler/feature_scheduler/maintel/fbs_config_sv_survey.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@ def get_scheduler() -> tuple[int, CoreScheduler]:

# Set up the DDF surveys to dither
single_ddf_dither = detailers.DitherDetailer(
per_night=per_night, max_dither=max_dither
per_night=per_night,
max_dither=max_dither,
nnights=1000,
)
# per_night true requires an update of FBS for Euclid
# dither_detailer = detailers.SplitDetailer(
Expand Down
Loading