merge dks to master

2016-08-25 08:40:40 +02:00
parent 8f20d2fd4c e32d0e912c
commit 6aea6473ab
43 changed files with 745 additions and 261 deletions
--- a/src/musrfit.cpp
+++ b/src/musrfit.cpp
@@ -697,10 +697,15 @@ int main(int argc, char *argv[])
      }
    }
  }
-  startupHandler->SetStartupOptions(startup_options);
+  if (startupHandler)
+    startupHandler->SetStartupOptions(startup_options);

  // read msr-file
-  PMsrHandler *msrHandler = new PMsrHandler(filename, startupHandler->GetStartupOptions());
+  PMsrHandler *msrHandler = 0;
+  if (startupHandler)
+    msrHandler = new PMsrHandler(filename, startupHandler->GetStartupOptions());
+  else
+    msrHandler = new PMsrHandler(filename);
  status = msrHandler->ReadMsrFile();
  if (status != PMUSR_SUCCESS) {
    switch (status) {