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

resolved merge conflicts with master

Browse Source
This commit is contained in:
suter_a
2016-12-23 14:16:22 +01:00
parent 605502386c c3c01e5de0
commit 38c4293d58
54 changed files with 2297 additions and 829 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/musrFT.cpp
+1 -3
View File
@@ -1042,7 +1042,6 @@ Int_t main(Int_t argc, Char_t *argv[])
PStartupOptions startup_options;
startup_options.writeExpectedChisq = false;
startup_options.estimateN0 = true;
startup_options.alphaEstimateN0 = 0.0;
TSAXParser *saxParser = new TSAXParser();
PStartupHandler *startupHandler = new PStartupHandler();
if (!startupHandler->StartupFileFound()) {
@@ -1079,7 +1078,6 @@ Int_t main(Int_t argc, Char_t *argv[])
}
}
}
startupHandler->SetStartupOptions(startup_options);
// filter out the use_dks flag
if (startupParam.useDKS == MFT_UNDEF) {
@@ -1096,7 +1094,7 @@ Int_t main(Int_t argc, Char_t *argv[])
vector<PMsrHandler*> msrHandler;
msrHandler.resize(startupParam.msrFln.size());
for (UInt_t i=0; i<startupParam.msrFln.size(); i++) {
msrHandler[i] = new PMsrHandler(startupParam.msrFln[i].Data(), startupHandler->GetStartupOptions(), true);
msrHandler[i] = new PMsrHandler(startupParam.msrFln[i].Data(), &startup_options, true);
status = msrHandler[i]->ReadMsrFile();
if (status != PMUSR_SUCCESS) {
switch (status) {