Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
eb36597
RF - remove some old functions tools
MrBago Oct 8, 2012
992b3ca
RF - small changes to euler_characteristic_check
MrBago Oct 8, 2012
e6ea909
Merge pull request #80 from MrBago/cleanup_sphere_stuff
Garyfallidis Oct 8, 2012
4c97172
BF: Fixed projection plots.
arokem Oct 4, 2012
e61d7a2
RF: Moved sph2latlon to core.geometry.
arokem Oct 5, 2012
7050c73
Resolved merge conflicts.
arokem Oct 8, 2012
2a5ac62
Resolved merge conflict.
arokem Oct 8, 2012
27a63e2
RF: get_sphere now returns a Sphere class instance.
arokem Oct 8, 2012
2708f47
Merge pull request #79 from arokem/basemap_projections
Garyfallidis Oct 8, 2012
caa17a9
BF: Failing tests fixed.
arokem Oct 9, 2012
9604228
BF: Failing doctest.
arokem Oct 9, 2012
5556e79
BF: Remove obsolete test.
arokem Oct 9, 2012
bf98efa
RF - fixup peaks_from_model to take use remove_similar_vertices and
MrBago Oct 8, 2012
2a691c7
DOCS - update some docs in odf.py
MrBago Oct 9, 2012
e2963c1
Merge pull request #81 from MrBago/peak_finding
Garyfallidis Oct 9, 2012
dc2ce35
Add fast ndindex.
stefanv Oct 11, 2012
00935fe
Fix ndindex import in example.
stefanv Oct 11, 2012
087ee59
Merge pull request #85 from stefanv/ndindex
Garyfallidis Oct 12, 2012
a59023d
DOCS - Open soure -> open source.
stefanv Oct 15, 2012
fab9334
DOC: Fix several typos, formatting, etc.
endolith Oct 16, 2012
cf385d0
DOC: rewrap paragraphs
endolith Oct 16, 2012
5385215
DOC: A few small formatting changes
endolith Oct 16, 2012
2a304ec
DOC: 'fnirth' -> 'fnirt' typo
endolith Oct 17, 2012
03fe1a0
RF - Provide shape as argument to ndindex.
stefanv Oct 17, 2012
e43ab50
NF - wrapper function for multi voxel models
MrBago Oct 17, 2012
552bbcf
DOC - Update ndindex docstring.
stefanv Oct 17, 2012
a3cc62a
Merge pull request #87 from stefanv/ndindex_v2
Garyfallidis Oct 17, 2012
0d39033
A simpler ndindex using generators.
stefanv Oct 19, 2012
ef4c21a
Merge pull request #90 from stefanv/ndindex_v3
Oct 20, 2012
df99b56
Merge pull request #86 from endolith/typo_fixes
Garyfallidis Oct 22, 2012
4fa0898
Merge pull request #88 from MrBago/multi_voxel_model
Garyfallidis Oct 23, 2012
b197130
ENH: Implemented new API for TensorModel and TensorFit
arokem Sep 26, 2012
11c0c87
RF: Moved ModelArray stuff into Tensor.
arokem Sep 26, 2012
603c593
Starting RF dti.py and tests
Garyfallidis Oct 2, 2012
f949403
RF added simple test for TensorModel
Garyfallidis Oct 3, 2012
a98bbd6
DOC moved big docstring back to the deprecated Tensor
Garyfallidis Oct 3, 2012
a17b669
BF - fixed a few bugs, TensorFit.shape, LinAlg error in odf
MrBago Oct 3, 2012
6388824
DOC: typo
arokem Oct 7, 2012
b632236
RF: Make FA and MD auto_attrs in the new implementation.
arokem Oct 8, 2012
91cae9d
TST: Testing of the new dti API.
arokem Oct 25, 2012
2971757
DOCS: Docstrings and comments.
arokem Oct 25, 2012
762acf4
RF: Moved the methods dict to the top, to avoid forward-referencing.
arokem Oct 25, 2012
f27b98a
RF: Obsolete code removed.
arokem Oct 25, 2012
d14baf4
RF: Revert previous thing, so that the dict is usable.
arokem Oct 25, 2012
51adb02
DOCS + TST: Clarify some of the intricacies. Test LoTri fit method.
arokem Oct 26, 2012
b54a354
RF - use einsum to do evec * eval * evec.T
MrBago Oct 26, 2012
fa49643
RF: Removed TriLo as a fit method to the FitModel class.
arokem Oct 31, 2012
558e31f
TST: Test the multi-voxel case of DTI.
arokem Oct 31, 2012
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 bin/fit_tensor
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ from dipy.io.utils import nifti1_symmat
from dipy.io.bvectxt import read_bvec_file, orientation_to_string
from nibabel.trackvis import empty_header, write

usage = """fit_tenor [options] dwi_images"""
usage = """fit_tensor [options] dwi_images"""
parser = OptionParser(usage)
parser.add_option("-b","--bvec",help="text file with gradient directions")
parser.add_option("-r","--root",help="root for files to be saved")
Expand Down
13 changes: 12 additions & 1 deletion dipy/core/geometry.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
_TUPLE2AXES = dict((v, k) for k, v in _AXES2TUPLE.items())



def sphere2cart(r, theta, phi):
''' Spherical to Cartesian coordinates

Expand Down Expand Up @@ -130,6 +129,18 @@ def cart2sphere(x, y, z):
return r, theta, phi


def sph2latlon(theta, phi):
"""Convert spherical coordinates to latitude and longitude.

Returns
-------
lat, lon : ndarray
Latitude and longitude.

"""
return np.rad2deg(theta - np.pi/2), np.rad2deg(phi - np.pi)


def normalized_vector(vec, axis=-1):
''' Return vector divided by its Euclidean (L2) norm

Expand Down
Loading