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.

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

Save results to a user given output directory #948

Open
wants to merge 43 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
ae820a3
added user given output directory
tdincer Jan 18, 2022
650a0f5
Update caiman/motion_correction.py
tdincer Jan 19, 2022
d367646
Update caiman/motion_correction.py
tdincer Jan 19, 2022
f2dbb57
Update cnmf.py
tdincer Jan 19, 2022
9c0c21f
Update cnmf.py
tdincer Jan 25, 2022
4ee1ff9
adjusted .npz file output directory
tdincer Jan 26, 2022
26b8271
Merge pull request #1 from tdincer/user_given_outputdir
Jan 26, 2022
576b6d7
Merge pull request #1 from datajoint-company/master
tdincer Jan 18, 2023
219dd04
conflict resolve
tdincer Jan 19, 2023
5c8b08b
Merge branch 'flatironinstitute-master'
tdincer Jan 19, 2023
7448cb5
Merge pull request #3 from tdincer/master
dimitri-yatsenko Jan 30, 2023
5904bc9
include `indices` argument to the motion correction step
Oct 3, 2023
aea9bc5
Merge pull request #5 from ttngu207/master
kushalbakshi Oct 4, 2023
6951f7e
Remove `indices` arg from `MotionCorrect`
kushalbakshi Oct 18, 2023
f98beb0
Merge pull request #6 from kushalbakshi/dj-version
sidhulyalkar Oct 18, 2023
c873b03
Merge pull request #1266 from flatironinstitute/dev
EricThomson Feb 2, 2024
8c237fb
Merge pull request #1292 from flatironinstitute/dev
pgunn Feb 23, 2024
a53973a
VERSION: 1.10.4 postrelease
pgunn Feb 23, 2024
e27ead4
Fix issue with dev release and last refactor of pathing
pgunn Mar 4, 2024
9f26fc6
Fix typo
pgunn Jan 31, 2024
83ce6ce
VERSION: post release to 1.10.5
pgunn Mar 5, 2024
6470495
Merge pull request #1318 from flatironinstitute/dev
pgunn Apr 2, 2024
9681c64
VERSION to 1.10.6 after release: main branch
pgunn Apr 2, 2024
a25dccb
Merge pull request #1320 from flatironinstitute/dev
pgunn Apr 3, 2024
3cf859e
VERSION to 1.10.7 after release
pgunn Apr 3, 2024
f6183bc
Merge pull request #1321 from flatironinstitute/dev
pgunn Apr 3, 2024
d5cc466
VERSION to 1.10.8 after release
pgunn Apr 3, 2024
1d6ee38
VERSION to 1.10.9 post release
pgunn Apr 3, 2024
b9c4a2a
Merge pull request #1322 from flatironinstitute/dev
pgunn Apr 3, 2024
9ea86c7
VERSION: 1.10.10 post-release
pgunn Apr 3, 2024
59708bd
VERSION: next release will be 1.11.0
pgunn May 3, 2024
a30d1b1
Merge pull request #1342 from flatironinstitute/dev
pgunn May 3, 2024
7174b3b
VERSION to 1.11.1 after release
pgunn May 3, 2024
7826015
Merge branch 'master' of https://github.com/datajoint/CaImAn
kushalbakshi May 31, 2024
9f95676
Merge branch 'main' of https://github.com/flatironinstitute/CaImAn
kushalbakshi May 31, 2024
97b1784
Update(motion_correction.py): Remove unused imports
kushalbakshi May 31, 2024
1ca3152
Fix(mmapping.py): Tuple -> tuple case-match
kushalbakshi May 31, 2024
e970637
Merge pull request #1358 from flatironinstitute/dev
pgunn May 31, 2024
e7e8641
VERSION to 1.11.2 after release
pgunn May 31, 2024
fb87e6b
Merge branch 'main' of https://github.com/flatironinstitute/CaImAn
kushalbakshi Jun 3, 2024
6ecc83a
Add `output_dir` argument to `motion_correct_batch_rigid()`
kushalbakshi Jun 3, 2024
4e9394a
Fix(motion_correction.py): update `old_div()` to division operator
kushalbakshi Jun 4, 2024
ff2858b
Merge pull request #7 from kushalbakshi/main
ttngu207 Jun 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.11.1
1.11.2
5 changes: 3 additions & 2 deletions caiman/mmapping.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def prepare_shape(mytuple:tuple) -> tuple:
raise Exception("Internal error: prepare_shape() passed a non-tuple")
return tuple(map(lambda x: np.uint64(x), mytuple))

def load_memmap(filename: str, mode: str = 'r') -> tuple[Any, tuple, int]:
def load_memmap(filename: str, mode: str = 'r', output_dir: str = '') -> tuple[Any, tuple, int]:
""" Load a memory mapped file created by the function save_memmap

Args:
Expand Down Expand Up @@ -218,7 +218,8 @@ def save_memmap_join(mmap_fnames:list[str], base_name: str = None, n_chunks: int
else:
list(map(save_portion, pars))

np.savez(caiman.paths.fn_relocated(base_name + '.npz'), mmap_fnames=mmap_fnames, fname_tot=fname_tot)
npz_file = pathlib.Path(fname_tot).parent / (base_name + '.npz')
np.savez(caiman.paths.fn_relocated(npz_file), mmap_fnames=mmap_fnames, fname_tot=fname_tot)

logging.info('Deleting big mov')
del big_mov
Expand Down
Loading
Loading