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

Merge develop back into main #302

Merged
merged 113 commits into from
Feb 14, 2025
Merged

Merge develop back into main #302

merged 113 commits into from
Feb 14, 2025

Conversation

semaphoreP
Copy link
Contributor

Describe your changes

Going back to developing on the main branch.

Type of change

  • New feature (non-breaking change which adds functionality)

Reference any relevant issues (don't forget the #)

Checklist before requesting a review

  • I have linted my code
  • I have verified that all unit tests pass in a clean environment and added new unit tests, as needed
  • I have verified that all docstrings are properly formatted and added new documentation, as needed
  • I have filled out the Unit Test Definition Table on confluence, as needed

LisaAltinier and others added 30 commits April 29, 2024 11:26
@LisaAltinier
Function that divides by the exposure time
5fbf6d8 
The function divides data and error by the exposure time. Header updated. Test to check that the function works.
@LisaAltinier
Changed the exposure time back to the previous value, skipped the dup…
0a0da88 
…licate test
@LisaAltinier
Removed the redundant test and the matrix needed for that test
7cdba12
@LisaAltinier
Changed quality flag to 0
33453a1
@LisaAltinier
Merge branch 'normalize_L3_by_exposure_time'
bee6651
Some doc string changes (in progress)
db7e7ab
Updated docstrings for kgain and non-linearity calibration
aeee234 
Common documentation. Run by Guillermo Gonzalez
Fixed condition on the number of frames used to csalibrate non-linearity
1d4803c
@semaphoreP
Merge pull request #216 from roman-corgi/hsergi_doc
cfea724 
Updated docstrings for k-gain and non-linearity calibration
@semaphoreP
auto run CI tests on develop branch
91aaeef
@semaphoreP
fix docstring issues
41f61a1
@JuergenSchreiber
removed the copy functions and use only image.copy by using copy module
8bf994a
@JuergenSchreiber
Merge branch 'main' of https://github.com/roman-corgi/corgidrp into c…
83213d4 
…opy_replace
@JuergenSchreiber
Merge branch 'main' of https://github.com/roman-corgi/corgidrp into c…
96f6bde 
…opy_replace
@JuergenSchreiber
Update README.md
2412205
@semaphoreP
Merge pull request #248 from roman-corgi/copy_replace
780ef1b 
Copy replace
@LisaAltinier
used the rescale_error function. Still have a dimensional error
c828021
photon counting, fixed an err estimation from converting with k gain,…
62a928b 
… fixed a minor error in combine.py

almost finished with unit tests for photon counting
unit tests done, a few other small improvements
f181cce
linting
7ef22a9
lint
01482b6
lint
0d9f6f8
eliminated potential division by 0
948ccd2
make a detectornoisemaps cal file for CI's sake
8cabe71 
so that I can leave the "OPTIONAL" out of the recipe in prescan subtraction since we do want the calibrated bias offset ideally
had to add nonlin calib as well
87f6d95
oops, forgot the dummy dataset
569ae0c
fewer full frames simulated in hopes that the CI will not cancel the …
e995bf3 
…tests when it runs
oops, forgot to actually change the number
3b1b969
@LisaAltinier
Error rescaling corrected
762cc12
@semaphoreP
Merge pull request #269 from roman-corgi/main
6be78a8 
Sync main back into develop
Ell Bogat and others added 29 commits January 27, 2025 15:52
small test updates
f49f9bd
@maxwellmb
Merge pull request #290 from roman-corgi/crop_bugfix
a52916f 
Bug Fix: Crop Function Checks for Correct Header Keyword
@JuergenSchreiber
adressing Max review comments
686d953
@JuergenSchreiber
forgot a bracket in the docstring
1c2fc06
@maxwellmb
Merge pull request #287 from roman-corgi/flux_cal
b962fd7 
Flux calibration
@JuergenSchreiber
new branch to subtract background from annulus
15cb7d6
@JuergenSchreiber
rename background header keyword to LOCBACK
2a50558
@JuergenSchreiber
now better background subtraction, the version before was completely …
3ad1d0b 
…wrong...
@JuergenSchreiber
docstring wrong
f793cc5
Updated documentation for installation and setup
8b74508
Updated documentation for installation and setup
6ee2238
@JuergenSchreiber
small updates of comments
ccfa325
@maxwellmb
Merge pull request #294 from roman-corgi/annulus_background
4905785 
Annulus background
Updated .gitignore to exclude build directory
0645db2
Updated index.rst
853eb46
Moved setup.py to the root directory
1b087ec
@LisaAltinier
Bunit
a9140f7 
Changed from UNITS to BUNIT
walker can guess PC templates
752a1ae
@kjl0025
Merge branch 'develop' into photon_counting
d877cde
fixed walker PC checks
8ce9586 
'ISPC' is not currently in any files; it will be added, though
Merge branch 'photon_counting' of https://github.com/roman-corgi/corg…
8b6e94e 
…idrp into photon_counting
fixed unit test
2641d5d 
With the addition of simulation of smearing, the tolerance needed to be increased slightly
@maxwellmb
Merge pull request #75 from roman-corgi/normalize_L3_by_exposure_time
c823392 
Function that divides by the exposure time
Updated docs and removed setup files
1f9e8a2
addressed Jason's comments
7a81d1c
addressed comments
9ed4ade 
also set the number of frames in photon_count_e2e.py back to what it should be.  (I set the number of frames to 2 for quick testing.)
changed logic of walker back
af86a28
@semaphoreP
Merge pull request #295 from roman-corgi/update-docs
9088894 
documentation
@semaphoreP
Merge pull request #277 from roman-corgi/photon_counting
07f4f4d 
Photon counting
@semaphoreP semaphoreP merged commit 0f575a0 into main Feb 14, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@semaphoreP @LisaAltinier @JuergenSchreiber @bensutlieff @kjl0025 @maxwellmb