Resolve conflict with develop#5
Merged
ckarwin merged 307 commits intockarwin:interfaces_continuum_bgfrom Mar 12, 2026
Merged
Conversation
works fine when it runs)
…including Band functions * minor cleanups to custom functions and flux integration
including Band spectra * assorted small cleanups related to flux integrals
all the divides in question have floating-point denominators and so will return the same result as regular /
attribute tests in eval. * don't reload file and rebuild interpolator on every call to evaluate in SpecFromDat; do so only if the filename changes * retire Wide_Asymmetric_Gaussian function, because we can get exactly the same behavior from Astromodels' Asymmetric_Gaussian (which has identical code) by changing the upper limit on one of its parameters * change notebooks that used Wide_Asymmetric_Gaussian to reflect the previous change
it is read from a file or created directly via __init__() * simplify sanity check in ExtendedResponse's get_expectation() (now also enforces unit agreement between first two axes of response and input) * remove some unneeded imports
* Gaussian normalization takes 3 arguments
…l_fit notebook * produce output for notebooks that were changed for Asymm_Gaussian fix
…tegrate_clean Improved integration for common Astromodels Functions, and custom function cleanup
…energy * make sure we use an empty norm parameter list, not [None], to describe a Mono norm without energy internally, so that we don't emit 'None' in the saved response headers
…rm_fix_clean Deal with undefined behavior around spectral norm in RspConverter
…leanups Warning cleanup and cleanups of spectral fitting notebooks
…f logger.info() The cosi_threemlfit function is a command-line executable and its output should go to stdout for user consumption, not to the logger. Addresses reviewer feedback on PR cositools#468.
source in one frame with data or orientations in a different frame
without conversion.
* performance patches to COSILike:
- make sure data and bg use same CDS order as response so we don't
have to possibly permute the expectation each time we compute it
- don't check for change in point source position via the .sky_coord
property of PointSource.position -- accessing this property creates a new
SkyCoord from the underlying sky direction each time, which is
an expensive operation. Instead, check the individual elements of
the sky direction to see if any have changed.
- do more nparray additions in place
* rewrite one line of FullDetectorResponse to clarify that it doesn't
matter which frame the HealpxiAxis is uing at that point, as we are
passing theta/phi instead of a SkyCoord.
* remove old, unneeded code from GalacticResponse
frame different from galactic
Signed-off-by: Israel Martinez <imc@umd.edu>
Fix Astropy-related performance issue with GCRS object comparison
Signed-off-by: Israel Martinez <imc@umd.edu>
Signed-off-by: Israel Martinez <imc@umd.edu>
…ood, apart from the last plot which might need some further review.
- Move get_lctutorial_data.py to speclc_grbdc3_prep.ipynb - Use fetch_wasabi with checksum instead of custom get_data (wasabipath,outpath,unzip) - No need for unzipping step Signed-off-by: Israel Martinez <imc@umd.edu>
Signed-off-by: Israel Martinez <imc@umd.edu>
# Conflicts: # cosipy/pipeline/src/io.py # cosipy/pipeline/task/task.py
… mistakes and missed some calculations while trying to refactor the GRB tutorial based off the Crab tutorial. Those issues are fixed now and the last plot looks better.
…al to work with interfaces
- Use .fits orientation file from develop instead of .ori from DC2 - Add missing poisson_conf_interval import - Use updated response file from develop instead of DC2 Signed-off-by: Israel Martinez <imc@umd.edu>
# Conflicts: # docs/tutorials/spectral_fits/continuum_fit/grb/SpectralFit_GRB.ipynb
- The source variable was not updated after the transform_to(self._gcrs) call (is not an inplace operation) - ez_cart was not normalized before taking the dot product to compare to the cos(angle) Signed-off-by: Israel Martinez <imc@umd.edu>
Signed-off-by: Israel Martinez <imc@umd.edu>
…11916 Signed-off-by: Israel Martinez <imc@umd.edu>
# Conflicts: # cosipy/source_injector/source_injector.py # docs/tutorials/source_injector/Point_source_injector.ipynb
Signed-off-by: Israel Martinez <imc@umd.edu>
# Conflicts: # docs/tutorials/background_estimation/continuum_estimation/BG_estimation_example.ipynb # docs/tutorials/run_tutorials.yml
Owner
|
Ok, I merged. |
Owner
|
@israelmcmc I'm not sure I understood. I merged this, but I don't see any change for cositools#498 |
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
11 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.
@ckarwin This merges the current develop branch into your branch, and resolve the conflicts. They were mostly trivial conflict in the tutorial, and I just accept your version and discarded what was in develop.
Once you merge this PR then the unit test in cositools#498 should run.