Added molecular system reader #92
Conversation
| size_t id; | ||
| size_t instances; | ||
| lineStream >> protein >> id >> instances; | ||
| if( protein == "" ) |
|
|
||
| proteins[id] = protein; | ||
|
|
||
| if( proteinFolder == "" ) |
| } | ||
| descriptorFile.close(); | ||
|
|
||
| // Load proteins according to specified positions |
There was a problem hiding this comment.
for readability you could move the comment-marked blocks to private methods. Would also 'solve' the file.close() at the end of each block.
There was a problem hiding this comment.
Sounds good, working on it
| if( proteins.find(id) != proteins.end( )) | ||
| { | ||
| // Scale to correct units | ||
| position *= 10.f; |
There was a problem hiding this comment.
where does that magic come from?
There was a problem hiding this comment.
Some files are in angstrom, others in nanometers... Ask the data providers ;-)
| * @return bounding box of the protein | ||
| * @param PDB file to import | ||
| * @param Position of protein in space | ||
| * @param Index of the protein when more than one is loaded |
There was a problem hiding this comment.
doxygen warns here for not finding those param names I suppose :)
| boost::filesystem::path fileExtension = | ||
| dirIter->path( ).extension( ); | ||
| if( fileExtension==".swc" || fileExtension==".h5" ) | ||
| boost::filesystem::path fileExtension = dirIter->path().extension(); |
There was a problem hiding this comment.
move inside the else{} as it is not used outside, can be const auto
| MorphologyLoader morphologyLoader( geometryParameters ); | ||
|
|
||
| strings filters = { ".swc", ".h5" }; | ||
| strings files = _parseFolder( folder, filters ); |
| std::cout << std::endl;\ | ||
| __logging_mtx.unlock();\ | ||
| } \ | ||
| __logging_mtx.lock();\ |
There was a problem hiding this comment.
Just a detail, but in general it's a good habit to use RAII style:
std::lock_guard<std::mutex> lock(__logging_mtx);
| public: | ||
|
|
||
| /** | ||
| * @brief Default constructor |
There was a problem hiding this comment.
not the default since it takes a parameter :-)
|
I know, I did something wrong again. I'll squash them and rebase accordingly |
The MolecularSystemReader class loads proteins and meshes according to parameters defined in a Molecular System Configuration file. This configuration is defined by the following entries: