Merge branch 'master' into 'refactor-detectorassembler' (fab1f303) · Commits · calibration / calng · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

calng
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

fab1f303

Commit fab1f303 authored 1 year ago by David Hammer

Downloads
- Plain Diff

Merge branch 'master' into 'refactor-detectorassembler'

# Conflicts:
#   src/calng/DetectorAssembler.py
#   src/calng/ShmemTrainMatcher.py

parents 5932e709 cbf1c6b8

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

DEPENDS 2 additions, 2 deletions

DEPENDS
src/calng/base_condition.py 11 additions, 3 deletions

src/calng/base_condition.py
src/calng/base_correction.py 14 additions, 1 deletion

src/calng/base_correction.py
src/calng/base_kernel_runner.py 4 additions, 2 deletions

src/calng/base_kernel_runner.py
src/calng/corrections/JungfrauCorrection.py 88 additions, 28 deletions

src/calng/corrections/JungfrauCorrection.py
src/calng/kernels/jungfrau_cpu.pyx 0 additions, 30 deletions

src/calng/kernels/jungfrau_cpu.pyx
src/calng/kernels/jungfrau_gpu.cu 0 additions, 104 deletions

src/calng/kernels/jungfrau_gpu.cu
src/calng/kernels/strixel_cols_A0123-lut_mask.npz 0 additions, 0 deletions

src/calng/kernels/strixel_cols_A0123-lut_mask.npz
src/calng/kernels/strixel_rows_A1256-lut_mask.npz 0 additions, 0 deletions

src/calng/kernels/strixel_rows_A1256-lut_mask.npz
src/calng/utils.py 6 additions, 0 deletions

src/calng/utils.py
src/tests/test_strixel.py 101 additions, 0 deletions

src/tests/test_strixel.py

with 226 additions and 170 deletions

Loading

David Hammer @hammerd
mentioned in commit 209bb3f8
· 1 year ago

mentioned in commit 209bb3f8

mentioned in commit 209bb3f8766132fa7ceb70e0db9fa573e7b1a56b

Toggle commit list

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

Legal Notice | Contacts