Conversation
@@ -24,6 +24,16 @@ set(FIVOX_PUBLIC_HEADERS | |||
vsdLoader.h | |||
) | |||
|
|||
# Try cloning lfpFivox into the 'fivox' folder | |||
set(FIVOXLFP_DIR ${PROJECT_SOURCE_DIR}/fivox/lfpFivox) | |||
git_external(${FIVOXLFP_DIR} ssh://bbpcode.epfl.ch/viz/lfpFivox master OPTIONAL) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Have you tested this? I hope it won't get stuck in a ssh password prompt?
4944f18
to
af74e7a
Compare
Updated |
@@ -22,6 +22,7 @@ | |||
#define FIVOX_FIELDFUNCTOR_H | |||
|
|||
#include <fivox/eventFunctor.h> // base class | |||
#include <brion/brion.h> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
types.h should be enough?
ae8f610
to
3bdecf4
Compare
Updated |
@@ -49,8 +49,6 @@ class CompartmentLoader::Impl | |||
, _report( _config.getReportSource( params.getReport( )), | |||
brion::MODE_READ, _target) | |||
{ | |||
_report.updateMapping( _target ); | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not needed anymore?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it was never needed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Even if the report target and _target don't match? Why does this function exist?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
updateMapping is implicitly called at construction time:
https://github.com/BlueBrain/Brion/blob/master/brion/plugin/compartmentReportHDF5.cpp#L195
https://github.com/BlueBrain/Brion/blob/master/brion/plugin/compartmentReportCommon.cpp#L37
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So updateMapping can be protected!? If no, doxygen of updateMapping needs an explanation.
(not for this PR, but I'm wondering what the point is)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's called update, hence you can change the GIDs you want reportables for w/o throwing away the already opened report file. RTNeuron for instance can update the GIDs at runtime which are requested by the user or could be automatically if the visible neurons change for instance. Always creating a new compartment report object for that would be the other option.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems to me the UNSET value needs to be set more. For example, in the spikeLoader unset is currently 0. |
Improve doxygen (BlueBrain/Fivox#4)
I missed some UNSET checks after the last rebase, I will put them back. Anyway, related to that, I found a couple of things that we need to discuss (easier in person). |
Done |
The result we get with the lfpFunctor at the moment is hard to validate though, at least with actual simulation data. I was discussing with @chevtche that we can probably add a validationLoader, that creates a simple set of events (e.g. a straight line) with easy-to-debug values, for cases like this. |
Move all the voltage-specific logic to the FieldFunctor, so CompartmentLoader can be used with other type of reports (e.g. currents in LFP). Add radius attribute in Event, used in the CompartmentLoader. Adapt tests and default values to latest TestData (370ebee). Change-Id: I2a4ae9b62bcb2a4cf825124fa801bd8b2efac67b
Updated |
Add LFP functor from separate repo
Move all the voltage-specific logic to the FieldFunctor,
so CompartmentLoader can be used with other type of reports
(e.g. currents in LFP).
Add radius attribute in Event, used in the CompartmentLoader.