Skip to content
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.

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

Rerunning CosmoDC2 with recent changes #369

Merged
merged 60 commits into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
2f35072
fix Neff calculation in calib for parallel systems
joezuntz Nov 6, 2023
a379da3
path and config updates for cosmodc2
joezuntz Nov 7, 2023
d17b25a
generate quantiles in a new stage
joezuntz Nov 16, 2023
9450e31
changes to make CosmoDC2 run work
joezuntz Nov 17, 2023
4f84d77
trying to switch selector
joezuntz Nov 17, 2023
79e5311
fix TXRandomForestLensSelector options
joezuntz Nov 17, 2023
3380ec2
Merge master into branch
joezuntz Jul 23, 2024
368aa20
update 20 deg^2 pipeline file
joezuntz Jul 23, 2024
d092e12
Merge branch 'master' into cosmodc2-rerun
joezuntz Sep 3, 2024
1865ff5
update yaml files for cosmodc2
joezuntz Sep 3, 2024
a70b7f1
image updates
joezuntz Sep 3, 2024
fa33ca6
Merge branch 'cosmodc2-rerun' of https://github.com/LSSTDESC/TXPipe i…
joezuntz Sep 3, 2024
aaf3059
run ceci update here too
joezuntz Sep 4, 2024
5611869
Merge master
joezuntz Sep 4, 2024
28aceb3
Update TXSourceTrueNumberDensity
joezuntz Sep 4, 2024
b70abfa
WIP
joezuntz Sep 4, 2024
3bfca09
Fix zero sized patches
joezuntz Sep 4, 2024
ecc5593
Merge branch 'cosmodc2-rerun' of https://github.com/LSSTDESC/TXPipe i…
joezuntz Sep 4, 2024
6a7d44c
Make min size 2
joezuntz Sep 4, 2024
cd16874
config and code fixes
joezuntz Sep 4, 2024
81703c4
add theory to plots
joezuntz Sep 4, 2024
e45e4ea
a few more tweaks
joezuntz Sep 4, 2024
d0ad811
diagnostic quantile update
joezuntz Sep 4, 2024
eac9a82
make quantiles of every column
joezuntz Sep 4, 2024
b1b9d21
add nersc installer
joezuntz Sep 5, 2024
e69947c
wtf
joezuntz Sep 5, 2024
7b0fde8
oh that
joezuntz Sep 5, 2024
29eeae2
fix = ==
joezuntz Sep 5, 2024
ac54843
new installer might even work
joezuntz Sep 5, 2024
c12c2e1
make installer executable
joezuntz Sep 5, 2024
2a748bd
add include flag maybe
joezuntz Sep 5, 2024
876c63c
fix path
joezuntz Sep 5, 2024
7eae204
new version based on working one
joezuntz Sep 6, 2024
399266c
move to scratch install
joezuntz Sep 6, 2024
ce41924
working installer
joezuntz Sep 6, 2024
7b34aeb
working installer
joezuntz Sep 6, 2024
9b3f5df
20deg2 update
joezuntz Sep 6, 2024
2ed6c8c
more error handling in line fit
joezuntz Sep 6, 2024
9a1719c
work in progress
joezuntz Sep 10, 2024
f3c3a93
go back to older diagnostics file
joezuntz Sep 10, 2024
a92ea88
fix source-only
joezuntz Sep 10, 2024
aa26c65
fix lensfit
joezuntz Sep 10, 2024
d43958b
fix dry runs
joezuntz Sep 10, 2024
000e434
fix return from rank>0 metadetectcalculator
joezuntz Sep 10, 2024
4174931
Fix parallelization bug in plot_psf_shear
joezuntz Sep 11, 2024
f3aeb27
restore options in 20 deg^2 config
joezuntz Sep 11, 2024
8455a01
print lens counts in selector
joezuntz Sep 13, 2024
597e26b
print out more progress
joezuntz Sep 13, 2024
fa2dfa2
update cosmodc2 config files
joezuntz Sep 13, 2024
9c6bec8
add option to smooth n(z) in theory
joezuntz Sep 13, 2024
1a069da
fix error message in theory_model
joezuntz Sep 13, 2024
cc5b97f
WIP covariance with MPI
joezuntz Sep 16, 2024
4840214
Switch to MPI for basic covariance
joezuntz Sep 16, 2024
8575e5a
Merge branch 'master' into cosmodc2-rerun-v2
joezuntz Sep 19, 2024
83a8ec2
remove new cov thing
joezuntz Sep 19, 2024
ad646a6
undo changes to twopoint_fourier
joezuntz Sep 19, 2024
d178388
undo changes to cov
joezuntz Sep 19, 2024
8ba76bc
minor fixes
joezuntz Sep 19, 2024
8df57ea
clear up the quantiles code a bit
joezuntz Sep 24, 2024
90dc12d
fix
joezuntz Sep 24, 2024
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
1 change: 1 addition & 0 deletions examples/2.2i/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ stages:
# nodes: 2
# threads_per_process: 32
- name: TXTwoPointPlots
- name: TXDiagnosticQuantiles
- name: TXSourceDiagnosticPlots
nprocess: 16
- name: TXLensDiagnosticPlots
Expand Down
104 changes: 66 additions & 38 deletions examples/cosmodc2/config-20deg2.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
global:
nside: 512
pixelization: healpix

TXGCRTwoCatalogInput:
metacal_dir: /global/cscratch1/sd/desc/DC2/data/Run2.2i/dpdd/Run2.2i-t3828/metacal_table_summary
Expand All @@ -9,65 +10,70 @@ TXMetacalGCRInput:
cat_name: dc2_object_run2.1i_dr1b_with_metacal_griz

TXExposureInfo:
dc2_name: '1.2p'
dc2_name: 1.2p


TXCosmoDC2Mock:
cat_name: cosmoDC2_v1.1.4_image
visits_per_band: 16
extra_cols: redshift_true size_true shear_1 shear_2 Mag_true_r_sdss_z0
flip_g2: True # to match metacal
extra_cols: redshift_true size_true shear_1 shear_2 Mag_true_r_sdss_z0
flip_g2: true # to match metacal
snr_limit: 4.0
Mag_r_limit: -19
unit_response: True
apply_mag_cut: False
unit_response: true
apply_mag_cut: false

TXIngestRedmagic:
lens_zbin_edges: [0.15, 0.3, 0.45, 0.6, 0.75, 0.9]

TXSourceTrueNumberDensity:
name: TXSourceTrueNumberDensity
nz: 601
zmax: 3.0
chunk_rows: 100000
weight_col: shear/00/weight
redshift_group: shear/00

TXLensTrueNumberDensity:
name: TXLensTrueNumberDensity
nz: 601
zmax: 3.0
chunk_rows: 100000
redshift_group: photometry

TXLensMaps:
chunk_rows: 100000
chunk_rows: 100000
pixelization: healpix
sparse: True
sparse: true

TXSourceMaps:
sparse: True
chunk_rows: 100000
sparse: true
chunk_rows: 100000
pixelization: healpix
true_shear: False
true_shear: false

TXExternalLensMaps:
sparse: True
chunk_rows: 100000
sparse: true
chunk_rows: 100000
pixelization: healpix

TXExternalLensNoiseMaps:
chunk_rows: 100000
chunk_rows: 100000
pixelization: healpix

TXAuxiliarySourceMaps:
chunk_rows: 100000
sparse: True
psf_prefix: psf_
chunk_rows: 100000
sparse: true
psf_prefix: psf_

TXAuxiliaryLensMaps:
chunk_rows: 100000
sparse: True
bright_obj_threshold: 22.0
chunk_rows: 100000
sparse: true
bright_obj_threshold: 22.0

TXSimpleMask:
depth_cut: 23.0
bright_object_max: 10.0
bright_object_max: 10.0


PZPDFMLZ:
Expand All @@ -85,31 +91,53 @@ TXTrueNumberDensity:
chunk_rows: 100000

TXSourceSelectorMetacal:
input_pz: False
input_pz: false
bands: riz #used for selection
T_cut: 0.5
s2n_cut: 10.0
max_rows: 1000
delta_gamma: 0.02
source_zbin_edges: [0.19285902, 0.40831394, 0.65503818, 0.94499109, 1.2947086, 1.72779632, 2.27855242, 3. ] # 7 bins
source_zbin_edges: [0.19285902, 0.40831394, 0.65503818, 0.94499109, 1.2947086, 1.72779632, 2.27855242, 3.] # 7 bins
# source_zbin_edges: [0.25588604, 0.55455363, 0.91863365, 1.38232001, 2.] # 4 bins
chunk_rows: 100000
true_z: False
true_z: false
shear_prefix: mcal_

TXSourceSelectorMetadetect:
input_pz: False
input_pz: false
bands: riz #used for selection
T_cut: 0.5
s2n_cut: 10.0
max_rows: 1000
delta_gamma: 0.02
source_zbin_edges: [0.19285902, 0.40831394, 0.65503818, 0.94499109, 1.2947086, 1.72779632, 2.27855242, 3. ] # 7 bins
source_zbin_edges: [0.19285902, 0.40831394, 0.65503818, 0.94499109, 1.2947086, 1.72779632, 2.27855242, 3.] # 7 bins
# source_zbin_edges: [0.25588604, 0.55455363, 0.91863365, 1.38232001, 2.] # 4 bins
chunk_rows: 100000
true_z: False
true_z: false
shear_prefix: ''

TXDiagnosticQuantiles:
nbins: 20
psf_prefix: 00/mcal_psf_
shear_prefix: 00/




TXPhotozPlotLens:
name: TXPhotozPlotLens

TXPhotozPlotSource:
name: TXPhotozPlotSource

TXRandomForestLensSelector:
verbose: false
bands: ugrizy
lens_zbin_edges: [0.2, 0.4, 0.6, 0.8, 1.0, 1.2]
random_seed: 79521323
mag_i_limit: 24.1
selection_type: maglim


TXRandomCat:
chunk_rows: 100000
Expand All @@ -135,37 +163,37 @@ TXRealGaussianCovariance:
min_sep: 2.5
max_sep: 250.
nbins: 20
use_true_shear: False
use_true_shear: false
nprocess: 4
threads_per_process: 2
nodes: 4
galaxy_bias: [1.404, 1.458, 1.693, 1.922, 2.133] # Tinker bias values

TXTwoPointFourier:
chunk_rows: 100000
flip_g1: True
flip_g2: True
flip_g1: true
flip_g2: true
apodization_size: 0.0
cache_dir: ./cache_nmt/cosmodc2/nside512/
true_shear: False
true_shear: false
n_ell: 30
ell_max: 1536 # nside * 3 , since Namaster computes that anyway.
analytic_noise: True
analytic_noise: true

TXTwoPoint:
bin_slop: 0.01
delta_gamma: 0.02
do_pos_pos: True
do_shear_shear: True
do_shear_pos: True
flip_g2: True # use true when using metacal shears
do_pos_pos: true
do_shear_shear: true
do_shear_pos: true
flip_g2: true # use true when using metacal shears
min_sep: 2.5
max_sep: 250
nbins: 20
verbose: 0
var_method: jackknife


TXClusteringNoiseMaps:
n_realization: 30

Expand All @@ -175,7 +203,7 @@ TXLensingNoiseMaps:
TXTruthLensSelector:
# Mag cuts
chunk_rows: 100000
lens_zbin_edges: [0.0,0.2,0.4]
lens_zbin_edges: [0.0, 0.2, 0.4]
cperp_cut: 0.2
r_cpar_cut: 13.5
r_lo_cut: 16.0
Expand Down
45 changes: 28 additions & 17 deletions examples/cosmodc2/config.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
global:
pixelization: healpix
chunk_rows: 1000000

TXGCRTwoCatalogInput:
metacal_dir: /global/cscratch1/sd/desc/DC2/data/Run2.2i/dpdd/Run2.2i-t3828/metacal_table_summary
photo_dir: /global/cscratch1/sd/desc/DC2/data/Run2.2i/dpdd/Run2.2i-t3828/object_table_summary
Expand All @@ -8,6 +12,15 @@ TXMetacalGCRInput:
TXExposureInfo:
dc2_name: 1.2p

TXLSSWeightsUnit:
nside: 2048
pixelization: healpix

TXDiagnosticQuantiles:
psf_prefix: mcal_psf_
shear_prefix: mcal_
nbins: 20


TXCosmoDC2Mock:
cat_name: cosmoDC2_v1.1.4_image
Expand All @@ -26,49 +39,43 @@ TXSourceTrueNumberDensity:
name: TXSourceTrueNumberDensity
nz: 601
zmax: 3.0
chunk_rows: 100000
weight_col: metacal/weight
redshift_group: metacal

TXLensTrueNumberDensity:
name: TXLensTrueNumberDensity
nz: 601
zmax: 3.0
chunk_rows: 100000
redshift_group: photometry

TXLensMaps:
chunk_rows: 100000
pixelization: healpix
nside: 2048
sparse: true

TXSourceMaps:
nside: 2048
sparse: true
chunk_rows: 100000
pixelization: healpix
true_shear: false

TXExternalLensMaps:
nside: 2048
sparse: true
chunk_rows: 100000
pixelization: healpix

TXExternalLensNoiseMaps:
nside: 2048
chunk_rows: 100000
pixelization: healpix

TXAuxiliarySourceMaps:
chunk_rows: 100000
sparse: true
psf_prefix: psf_

TXAuxiliaryLensMaps:
chunk_rows: 100000
sparse: true
nside: 2048
pixelization: healpix
bright_obj_threshold: 22.0

TXSimpleMask:
Expand All @@ -79,16 +86,14 @@ TXSimpleMask:
PZPDFMLZ:
nz: 301
zmax: 3.0
chunk_rows: 100000

TXPhotozStack:
chunk_rows: 100000


# Mock version of stacking:
TXTrueNumberDensity:
nz: 301
zmax: 3.0
chunk_rows: 100000


TXSourceSelectorMetacal:
input_pz: false
Expand All @@ -99,7 +104,6 @@ TXSourceSelectorMetacal:
delta_gamma: 0.02
source_zbin_edges: [0.19285902, 0.40831394, 0.65503818, 0.94499109, 1.2947086, 1.72779632, 2.27855242, 3.] # 7 bins
# source_zbin_edges: [0.25588604, 0.55455363, 0.91863365, 1.38232001, 2.] # 4 bins
chunk_rows: 100000
true_z: false
shear_prefix: mcal_

Expand All @@ -112,13 +116,11 @@ TXSourceSelectorMetadetect:
delta_gamma: 0.02
source_zbin_edges: [0.19285902, 0.40831394, 0.65503818, 0.94499109, 1.2947086, 1.72779632, 2.27855242, 3.] # 7 bins
# source_zbin_edges: [0.25588604, 0.55455363, 0.91863365, 1.38232001, 2.] # 4 bins
chunk_rows: 100000
true_z: false
shear_prefix: ''


TXRandomCat:
chunk_rows: 100000
density: 10 # gals per sq arcmin

TXJackknifeCenters:
Expand Down Expand Up @@ -147,7 +149,6 @@ TXRealGaussianCovariance:
galaxy_bias: [1.404, 1.458, 1.693, 1.922, 2.133] # Tinker bias values

TXTwoPointFourier:
chunk_rows: 100000
flip_g1: true
flip_g2: true
apodization_size: 0.0
Expand All @@ -159,6 +160,7 @@ TXTwoPointFourier:
analytic_noise: true

TXTwoPoint:
reduce_randoms_size: 0.5
bin_slop: 0.01
delta_gamma: 0.02
do_pos_pos: true
Expand All @@ -180,7 +182,6 @@ TXLensingNoiseMaps:

TXTruthLensSelector:
# Mag cuts
chunk_rows: 100000
lens_zbin_edges: [0.0, 0.2, 0.4]
cperp_cut: 0.2
r_cpar_cut: 13.5
Expand All @@ -190,6 +191,16 @@ TXTruthLensSelector:
i_hi_cut: 21.9
r_i_cut: 2.0


TXRandomForestLensSelector:
verbose: false
bands: ugrizy
lens_zbin_edges: [0.2, 0.4, 0.6, 0.8, 1.0, 1.2]
random_seed: 79521323
mag_i_limit: 24.1
selection_type: maglim


TXPhotozPlotLens:
name: TXPhotozPlotLens
TXPhotozPlotSource:
Expand Down
Loading
Loading