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.

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

Jump to bottom

Hos #18

Merged
merged 34 commits into from
Apr 23, 2024
Merged

Hos #18

merged 34 commits into from
Apr 23, 2024

Conversation

jstarck
Copy link
Contributor

@jstarck jstarck commented Nov 8, 2023

Creation of a class for multi-scale peaks count and wavelet-l1 norm statistics, taking into account the mask.
Fix the bug on mass mapping for non square images.
Write two test routines to show to use the class

  • test_hos_cfis()
  • test_hos_test1()

@AndreasTersenov
Copy link
Collaborator

AndreasTersenov commented Nov 14, 2023 •
edited
Loading

There are a couple of small issues:

  1. In hos_peaks_l1.py there is a semicolon (;) at the beginning of line 659 that should be removed (possibly this is what causes the check fail). Or probably this whole line should be removed.
  2. There are some instances in the repo where np.float is used (I found some in starlet.py but there may be some in other places as well). This is deprecated since NumPy 1.20 so those instances should be replaced with either just float or np.float64. Doing this will not modify any behavior and is safe. Exactly the same for np.int (there are a couple of cases in cosmostat_init.py) --> it should be changed to just int.
  3. In the test routine functions, in hos_peaks_l1.py, some directories paths are defined, but they use your local paths. If we want these test routines to be able to be ran by anyone who installs the package, this should be changed.

jstarck and others added 23 commits December 12, 2023 17:05
@jstarck
remove dependency
2906638
@jstarck
solve convolution pb + deprecated float function
3f30936
@AndreasTersenov
Fixed small bugs + added mono-scale peak counts
6e17b9d
@AndreasTersenov
ran autopep8 on the files that don't pass the checks
ffd7b2d
@AndreasTersenov
ran black on the files that don't pass the checks
af18325
@AndreasTersenov
added ProxMSE to mass_mapping.py + fixed bug in hos_peaks_l1
311310f
@AndreasTersenov
ran black on mass_mapping.py
a4ad638
@AndreasTersenov
added bin2d and radec2xy and removed all lenspack dependencies
d3c500e
@AndreasTersenov
ran black on mass_mapping.py
a420193
Replace for loops in numpy arrays by numpy operations
59ab1b3
Bugfix for argument PropagateNoise
9ce9c22
Deprecation: replace ndimage.filters.gaussian_filter by `ndimage.ga…
bd16504 
…ussian_filter`
Housekeeping: remove commented sections
d7ac4ef
Improvements:
be8a5a3 
- Remove for loops wherever possible
- Vectorize mass mapping functions to compute them on stack of images
- Remove redundancies
Improve kappa-to-gamma and gamma-to-kappa conversions (faster)
26fa399 
+ improve mask generation in _prepare_data
Bug correction in _prepare_data
40aca5a
Minor change
5ccc980
Bugfixes
6b235e0
Bugfix: specify axes for fftshift
eb18250
@hubert-leterme
Merge pull request #20 from hubert-leterme/hos
7818558 
Improvements for mass mapping methods and starlet transform
Ran black on modified files
79e3436
@hubert-leterme
Merge branch 'CosmoStat:hos' into hos
a962583
@hubert-leterme
Merge pull request #22 from hubert-leterme/hos
cd30e88 
Ran black on modified files
sfarrens
sfarrens requested changes Apr 5, 2024
View reviewed changes
pycs/misc/stats.py

return map_pixel


def mad(input_data, axis=None, keepdims=False):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The MAD is already implemented in ModOpt

pycs/astro/wl/mass_mapping.py Outdated Show resolved Hide resolved
pycs/astro/wl/mass_mapping.py Outdated Show resolved Hide resolved
pycs/astro/wl/hos_peaks_l1.py Outdated Show resolved Hide resolved
pycs/astro/wl/hos_peaks_l1.py Outdated Show resolved Hide resolved
@sfarrens sfarrens assigned sfarrens and jstarck and unassigned sfarrens Apr 5, 2024
@AndreasTersenov AndreasTersenov merged commit 2474c03 into master Apr 23, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sfarrens sfarrens sfarrens requested changes

@AndreasTersenov AndreasTersenov Awaiting requested review from AndreasTersenov

Assignees

@jstarck jstarck

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jstarck @AndreasTersenov @sfarrens @hubert-leterme