LMU/musrfit
5
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 4 Activity

merged from root6. Compiles but has issues with DKS linking yet.

Browse Source
This commit is contained in:
suter_a
2017-05-15 21:30:42 +02:00
parent 13106a51c7 25685b8989
commit 1729055385
334 changed files with 27556 additions and 4414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/musrfit.cpp
View File

@@ -90,7 +90,7 @@ void* musrfit_timeout(void *args)
void musrfit_syntax()
{
cout << endl << "usage: musrfit [<msr-file> [-k, --keep-mn2-ouput] [-c, --chisq-only] [-t, --title-from-data-file]";
cout << endl << " [-e, --estimateN0 <flag>] [-p, --per-run-block-chisq <flag>]";
cout << endl << " [-e, --estimateN0] [-p, --per-run-block-chisq]";
cout << endl << " [--dump <type>] [--timeout <timeout_tag>] | --version | --help";
cout << endl << " <msr-file>: msr input file";
cout << endl << " 'musrfit <msr-file>' will execute musrfit";
@@ -540,9 +540,9 @@ int main(int argc, char *argv[])
if (argc == 2) {
if (!strcmp(argv[1], "--version")) {
#ifdef HAVE_CONFIG_H
cout << endl << "musrfit version: " << PACKAGE_VERSION << ", git-rev: " << GIT_REVISION << endl << endl;
cout << endl << "musrfit version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << endl << endl;
#else
cout << endl << "musrfit git-rev: " << GIT_REVISION << endl << endl;
cout << endl << "musrfit git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << endl << endl;
#endif
return PMUSR_SUCCESS;
}