Skip to content

swc issues and moogList #416

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

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

swc issues and moogList #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b4aac15
New python bindings using pybind11 (#410)
dilawar May 1, 2020
e66335b
moogList properly handled
analkumar2 Jul 10, 2020
616fb3f
swc loadModel issue resolved
analkumar2 Jul 10, 2020
8a687e4
Merge branch 'master' into master
dilawar Sep 7, 2020
bd3a171
Merge branch 'master' into master
hrani Sep 7, 2020
59e519c
Merge branch 'master' into master
dilawar Sep 8, 2020
21c4159
Merge branch 'master' into master
dilawar Sep 10, 2020
f6165d1
Merge branch 'BhallaLab:master' into master
analkumar2 Nov 14, 2021
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
1 change: 1 addition & 0 deletions pybind11/Finfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ py::cpp_function __Finfo__::getDestFinfoSetterFunc2(const ObjId& oid,
}
}


if(ftype1 == "Id") {
if(ftype2 == "Id") {
std::function<bool(Id, Id)> func = [oid, fname](Id a, Id b) {
Expand Down
6 changes: 3 additions & 3 deletions python/rdesigneur/moogul.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ def drawForTheFirstTime( self, ax ):
class MooNeuron( MooDrawable ):
''' Draws collection of line segments of defined dia and color'''
def __init__( self,
neuronId,
mooObj,
fieldInfo,
field = 'Vm',
relativeObj = '.',
Expand All @@ -235,12 +235,12 @@ def __init__( self,
colormap = colormap, lenScale = lenScale,
diaScale = diaScale, autoscale = autoscale,
valMin = valMin, valMax = valMax )
self.neuronId = neuronId
self.mooObj = mooObj
self.updateCoords()

def updateCoords( self ):
''' Obtains coords from the associated cell'''
self.compts_ = moose.wildcardFind( self.neuronId.path + "/#[ISA=CompartmentBase]" )
self.compts_ = self.mooObj
# Matplotlib3d isn't able to do full rotations about an y axis,
# which is what the NeuroMorpho models use, so
# here we shuffle the axes around. Should be an option.
Expand Down
4 changes: 2 additions & 2 deletions python/rdesigneur/rdesigneur.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,8 +769,8 @@ def _buildMoogli( self ):
pair = i.elecpath + " " + i.geom_expr
dendCompts = self.elecid.compartmentsFromExpression[ pair ]
spineCompts = self.elecid.spinesFromExpression[ pair ]
dendObj, mooField = self._parseComptField( dendCompts, i, knownFields )
spineObj, mooField2 = self._parseComptField( spineCompts, i, knownFields )
dendObj, mooField = self._MoogparseComptField( dendCompts, i, knownFields )
spineObj, mooField2 = self._MoogparseComptField( spineCompts, i, knownFields )
assert( mooField == mooField2 )
mooObj3 = dendObj + spineObj
numMoogli = len( mooObj3 )
Expand Down
2 changes: 1 addition & 1 deletion python/rdesigneur/rmoogli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def makeMoogli( rd, mooObj, args, fieldInfo ):
valMin = ymin, valMax = ymax )
viewer.addDrawable( reacSystem )
else:
neuron = moogul.MooNeuron( rd.elecid, fieldInfo,
neuron = moogul.MooNeuron( mooObj, fieldInfo,
field = mooField, relativeObj = relObjPath,
valMin = ymin, valMax = ymax )
print( "min = {}, max = {}".format(ymin, ymax) )
Expand Down