Canfar new#283
Merged
martinkilbinger merged 83 commits intoCosmoStat:masterfrom Jun 9, 2020
martinkilbinger:canfar_new
Merged
Conversation
…into canfar_debug
…into canfar_debug
…into canfar_debug
…into canfar_debug
Canfar debug
…x, [pixel scale, PSF init guess, more output fields], make_catalogue [entire file copied].
martinkilbinger
commented
Jun 8, 2020
martinkilbinger
commented
Jun 8, 2020
martinkilbinger
commented
Jun 8, 2020
martinkilbinger
commented
Jun 8, 2020
martinkilbinger
commented
Jun 8, 2020
martinkilbinger
commented
Jun 8, 2020
martinkilbinger
commented
Jun 8, 2020
Contributor
Author
|
@aguinot should probably also review this merge... |
sfarrens
reviewed
Jun 8, 2020
Member
sfarrens
left a comment
sfarrens
left a comment
There was a problem hiding this comment.
Overall it looks fine to me. There are just a couple of points that I think need clarification.
Comment on lines
+332
to
+382
| # def save_galsim_shapes(final_cat_file, galsim_cat_path): | ||
| # """ Save ngmix data | ||
| # | ||
| # Save the ngmix catalog into the final one. | ||
| # | ||
| # Parameters | ||
| # ---------- | ||
| # final_cat_file : io.FITSCatalog | ||
| # Final catalog. | ||
| # ngmix_cat_path : str | ||
| # Path to ngmix catalog to save. | ||
| # | ||
| # """ | ||
| # | ||
| # final_cat_file.open() | ||
| # obj_id = np.copy(final_cat_file.get_data()['NUMBER']) | ||
| # | ||
| # galsim_cat_file = io.FITSCatalog(galsim_cat_path) | ||
| # galsim_cat_file.open() | ||
| # galsim_id = galsim_cat_file.get_data()['id'] | ||
| # # max_epoch = np.max(ngmix_n_epoch) | ||
| # | ||
| # output_dict = {'GALSIM_GAL_ELL': np.ones((len(obj_id), 2)) * -10., | ||
| # 'GALSIM_GAL_ELL_ERR': np.ones(len(obj_id)) * -1., | ||
| # 'GALSIM_GAL_SIGMA': np.zeros(len(obj_id)), | ||
| # 'GALSIM_GAL_FLAG': np.ones(len(obj_id), dtype='int16'), | ||
| # 'GALSIM_GAL_ELL_U': np.ones((len(obj_id), 2)) * -10., | ||
| # 'GALSIM_GAL_RES': np.ones(len(obj_id)) * -1., | ||
| # 'GALSIM_PSF_ELL': np.ones((len(obj_id), 2)) * -10., | ||
| # 'GALSIM_PSF_SIGMA': np.zeros(len(obj_id)), | ||
| # 'GALSIM_PSF_FLAG': np.ones(len(obj_id), dtype='int16')} | ||
| # for i, id_tmp in enumerate(obj_id): | ||
| # ind = np.where(id_tmp == galsim_id)[0] | ||
| # if len(ind) > 0: | ||
| # output_dict['GALSIM_GAL_ELL'][i][0] = galsim_cat_file.get_data()['gal_g1'][ind[0]] | ||
| # output_dict['GALSIM_GAL_ELL'][i][1] = galsim_cat_file.get_data()['gal_g2'][ind[0]] | ||
| # output_dict['GALSIM_GAL_ELL_ERR'][i] = galsim_cat_file.get_data()['gal_g1_err'][ind[0]] | ||
| # output_dict['GALSIM_GAL_SIGMA'][i] = galsim_cat_file.get_data()['gal_sigma'][ind[0]] | ||
| # output_dict['GALSIM_GAL_FLAG'][i] = galsim_cat_file.get_data()['gal_flag'][ind[0]] | ||
| # output_dict['GALSIM_GAL_RES'][i] = galsim_cat_file.get_data()['gal_resolution'][ind[0]] | ||
| # output_dict['GALSIM_GAL_ELL_U'][i][0] = galsim_cat_file.get_data()['gal_uncorr_g1'][ind[0]] | ||
| # output_dict['GALSIM_GAL_ELL_U'][i][1] = galsim_cat_file.get_data()['gal_uncorr_g2'][ind[0]] | ||
| # output_dict['GALSIM_PSF_ELL'][i][0] = galsim_cat_file.get_data()['psf_g1'][ind[0]] | ||
| # output_dict['GALSIM_PSF_ELL'][i][1] = galsim_cat_file.get_data()['psf_g2'][ind[0]] | ||
| # output_dict['GALSIM_PSF_SIGMA'][i] = galsim_cat_file.get_data()['psf_sigma'][ind[0]] | ||
| # | ||
| # for key in output_dict.keys(): | ||
| # final_cat_file.add_col(key, output_dict[key]) | ||
| # | ||
| # final_cat_file.close() | ||
| # galsim_cat_file.close() |
Member
There was a problem hiding this comment.
Is this function being saved for later?
Contributor
Author
There was a problem hiding this comment.
It looks like this is used when galsim instead of ngmix is used to measure shapes on the tiles. I think @aguinot should check whether this function is needed.
Contributor
There was a problem hiding this comment.
This function was there when I was running galsim without the metacal. I think you can remove it.
Member
|
Hi @martinkilbinger I think we can merge this after the following things have been resolved:
|
Contributor
Author
|
PEP errors and empty return are resolved. Is the commented function ok as it is? I don't know what Axel recommended. If yes, we can merge. |
Contributor
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This branch is running on canfar, and provides consistent results with Axel's previous runs on candide. This might be the one!