projects
/
mussa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make mupa file loading eol-style insensitive
[mussa.git]
/
alg
/
mussa.hpp
diff --git
a/alg/mussa.hpp
b/alg/mussa.hpp
index 83e08cba7f7e42e8a32c9d092d2a516020d6a700..152d8217349568755913e67c1a77fed6aaa6eaa6 100644
(file)
--- a/
alg/mussa.hpp
+++ b/
alg/mussa.hpp
@@
-72,8
+72,14
@@
public:
void clear();
//! set parameters from a file - 'mupa' ~ mussa parameters
void clear();
//! set parameters from a file - 'mupa' ~ mussa parameters
- void load_mupa_file(std::string para_file_path)
{ load_mupa_file(boost::filesystem::path(para_file_path));}
+ void load_mupa_file(std::string para_file_path)
;
void load_mupa_file(boost::filesystem::path para_file_path);
void load_mupa_file(boost::filesystem::path para_file_path);
+ //! load mussa parameters from a stream, specifing output location
+ void load_mupa_stream(
+ std::istream & para_file,
+ boost::filesystem::path& file_path_base
+ );
+
// set parameters individually (eg from user input into gui classes)
//! set analysis name
// set parameters individually (eg from user input into gui classes)
//! set analysis name