pyMapVBVD 0.5.7__tar.gz → 0.6.1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1}/CHANGELOG.md +11 -0
- {pyMapVBVD-0.5.7/pyMapVBVD.egg-info → pymapvbvd-0.6.1}/PKG-INFO +5 -5
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1}/mapvbvd/_version.py +3 -3
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1}/mapvbvd/mapVBVD.py +1 -3
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1}/mapvbvd/read_twix_hdr.py +2 -2
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1/pyMapVBVD.egg-info}/PKG-INFO +5 -5
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1}/pyMapVBVD.egg-info/requires.txt +2 -2
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1}/requirements.yml +2 -2
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1}/setup.py +2 -2
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1}/LICENSE +0 -0
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1}/MANIFEST.in +0 -0
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1}/README.md +0 -0
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1}/mapvbvd/__init__.py +0 -0
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1}/mapvbvd/_attrdict.py +0 -0
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1}/mapvbvd/twix_map_obj.py +0 -0
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1}/pyMapVBVD.egg-info/SOURCES.txt +0 -0
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1}/pyMapVBVD.egg-info/dependency_links.txt +0 -0
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1}/pyMapVBVD.egg-info/top_level.txt +0 -0
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1}/pyproject.toml +0 -0
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1}/setup.cfg +0 -0
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1}/tests/test_flags.py +0 -0
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1}/tests/test_read.py +0 -0
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1}/tests/test_slicing.py +0 -0
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1}/tests/test_svs.py +0 -0
- {pyMapVBVD-0.5.7 → pymapvbvd-0.6.1}/versioneer.py +0 -0
|
@@ -1,5 +1,16 @@
|
|
|
1
1
|
This document contains the pymapvbvd release history in reverse chronological order.
|
|
2
2
|
|
|
3
|
+
0.6.1 (Thursday 31st October 2024)
|
|
4
|
+
----------------------------------
|
|
5
|
+
- Testing on Python 3.13
|
|
6
|
+
- Changed scipy version requirements.
|
|
7
|
+
|
|
8
|
+
0.6.0 (Friday 28th June 2024)
|
|
9
|
+
-----------------------------
|
|
10
|
+
- Dropped support for Python 3.8
|
|
11
|
+
- Testing for Python 3.12
|
|
12
|
+
- Compatibility with Numpy version 2
|
|
13
|
+
|
|
3
14
|
0.5.7 (Wednesday 31st January 2024)
|
|
4
15
|
-----------------------------------
|
|
5
16
|
- Added flag to disable line reflection. Thanks to FrankZijlstra for contributing.
|
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: pyMapVBVD
|
|
3
|
-
Version: 0.
|
|
3
|
+
Version: 0.6.1
|
|
4
4
|
Summary: Python twix file reader
|
|
5
5
|
Home-page: https://github.com/wtclarke/pymapvbvd
|
|
6
6
|
Author: Will Clarke
|
|
7
7
|
Author-email: william.clarke@ndcn.ox.ac.uk
|
|
8
8
|
Classifier: Programming Language :: Python :: 3
|
|
9
|
-
Classifier: Programming Language :: Python :: 3.8
|
|
10
9
|
Classifier: Programming Language :: Python :: 3.9
|
|
11
10
|
Classifier: Programming Language :: Python :: 3.10
|
|
12
11
|
Classifier: Programming Language :: Python :: 3.11
|
|
12
|
+
Classifier: Programming Language :: Python :: 3.12
|
|
13
13
|
Classifier: License :: OSI Approved :: MIT License
|
|
14
14
|
Classifier: Operating System :: OS Independent
|
|
15
|
-
Requires-Python: >=3.
|
|
15
|
+
Requires-Python: >=3.9
|
|
16
16
|
Description-Content-Type: text/markdown
|
|
17
17
|
License-File: LICENSE
|
|
18
|
-
Requires-Dist: numpy
|
|
18
|
+
Requires-Dist: numpy>=1.26
|
|
19
19
|
Requires-Dist: tqdm
|
|
20
|
-
Requires-Dist: scipy
|
|
20
|
+
Requires-Dist: scipy>=1.13
|
|
21
21
|
Requires-Dist: matplotlib
|
|
22
22
|
Requires-Dist: h5py
|
|
23
23
|
Requires-Dist: six
|
|
@@ -8,11 +8,11 @@ import json
|
|
|
8
8
|
|
|
9
9
|
version_json = '''
|
|
10
10
|
{
|
|
11
|
-
"date": "2024-
|
|
11
|
+
"date": "2024-10-31T15:36:46+0000",
|
|
12
12
|
"dirty": false,
|
|
13
13
|
"error": null,
|
|
14
|
-
"full-revisionid": "
|
|
15
|
-
"version": "0.
|
|
14
|
+
"full-revisionid": "16303350b81bcb319ce3a99ecdba180ff49d98ff",
|
|
15
|
+
"version": "0.6.1"
|
|
16
16
|
}
|
|
17
17
|
''' # END VERSION_JSON
|
|
18
18
|
|
|
@@ -132,9 +132,7 @@ def loop_mdh_read(fid, version, Nscans, scan, measOffset, measLength, print_prog
|
|
|
132
132
|
# the "DMA length"
|
|
133
133
|
# if mdh.ulPackBit
|
|
134
134
|
# it seems that the packbit is not always set correctly
|
|
135
|
-
|
|
136
|
-
tmp.dtype = np.uint16
|
|
137
|
-
NCol_NCha = tmp # was float [ushSamplesInScan ushUsedChannels]
|
|
135
|
+
NCol_NCha = data_u8[dmaIdx].view(np.uint16).astype(int)
|
|
138
136
|
ulDMALength = dmaOff + (8 * NCol_NCha[0] + dmaSkip) * NCol_NCha[1]
|
|
139
137
|
|
|
140
138
|
n_acq = n_acq + 1
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import re
|
|
2
2
|
import numpy as np
|
|
3
|
-
from scipy.integrate import
|
|
3
|
+
from scipy.integrate import cumulative_trapezoid
|
|
4
4
|
|
|
5
5
|
from mapvbvd._attrdict import AttrDict
|
|
6
6
|
|
|
@@ -231,7 +231,7 @@ def read_twix_hdr(fid, prot):
|
|
|
231
231
|
|
|
232
232
|
# make sure that gr_adc is always positive (rstraj needs to be strictly monotonic)
|
|
233
233
|
gr_adc = np.maximum(gr_adc, 1e-4)
|
|
234
|
-
rstraj = (np.append(0,
|
|
234
|
+
rstraj = (np.append(0, cumulative_trapezoid(gr_adc)) - ncol / 2) / np.sum(gr_adc)
|
|
235
235
|
rstraj -= np.mean(rstraj[int(ncol / 2) - 1:int(ncol / 2) + 1])
|
|
236
236
|
# scale rstraj by kmax (only works if all slices have same FoV!!!)
|
|
237
237
|
# TODO: these are examples of the keys not arranged correctly
|
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: pyMapVBVD
|
|
3
|
-
Version: 0.
|
|
3
|
+
Version: 0.6.1
|
|
4
4
|
Summary: Python twix file reader
|
|
5
5
|
Home-page: https://github.com/wtclarke/pymapvbvd
|
|
6
6
|
Author: Will Clarke
|
|
7
7
|
Author-email: william.clarke@ndcn.ox.ac.uk
|
|
8
8
|
Classifier: Programming Language :: Python :: 3
|
|
9
|
-
Classifier: Programming Language :: Python :: 3.8
|
|
10
9
|
Classifier: Programming Language :: Python :: 3.9
|
|
11
10
|
Classifier: Programming Language :: Python :: 3.10
|
|
12
11
|
Classifier: Programming Language :: Python :: 3.11
|
|
12
|
+
Classifier: Programming Language :: Python :: 3.12
|
|
13
13
|
Classifier: License :: OSI Approved :: MIT License
|
|
14
14
|
Classifier: Operating System :: OS Independent
|
|
15
|
-
Requires-Python: >=3.
|
|
15
|
+
Requires-Python: >=3.9
|
|
16
16
|
Description-Content-Type: text/markdown
|
|
17
17
|
License-File: LICENSE
|
|
18
|
-
Requires-Dist: numpy
|
|
18
|
+
Requires-Dist: numpy>=1.26
|
|
19
19
|
Requires-Dist: tqdm
|
|
20
|
-
Requires-Dist: scipy
|
|
20
|
+
Requires-Dist: scipy>=1.13
|
|
21
21
|
Requires-Dist: matplotlib
|
|
22
22
|
Requires-Dist: h5py
|
|
23
23
|
Requires-Dist: six
|
|
@@ -31,10 +31,10 @@ setuptools.setup(
|
|
|
31
31
|
license_file='LICENSE',
|
|
32
32
|
classifiers=[
|
|
33
33
|
"Programming Language :: Python :: 3",
|
|
34
|
-
"Programming Language :: Python :: 3.8",
|
|
35
34
|
"Programming Language :: Python :: 3.9",
|
|
36
35
|
"Programming Language :: Python :: 3.10",
|
|
37
36
|
"Programming Language :: Python :: 3.11",
|
|
37
|
+
"Programming Language :: Python :: 3.12",
|
|
38
38
|
"License :: OSI Approved :: MIT License",
|
|
39
39
|
"Operating System :: OS Independent", ],
|
|
40
|
-
python_requires='>=3.
|
|
40
|
+
python_requires='>=3.9')
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|