added default settings for msr2data. Automatic opening of global fit files still missing

src/musredit/PAdmin.cpp

@@ -418,9 +418,9 @@ bool PAdminXMLParser::endDocument()
 
 //--------------------------------------------------------------------------
 /**
- * <p>
+ * <p>Report XML warnings.
  *
- * \param exception
+ * \param exception holds the information of the XML warning
  */
 bool PAdminXMLParser::warning( const QXmlParseException & exception )
 {
@@ -438,9 +438,9 @@ bool PAdminXMLParser::warning( const QXmlParseException & exception )
 
 //--------------------------------------------------------------------------
 /**
- * <p>
+ * <p>Report recoverable XML errors.
  *
- * \param exception
+ * \param exception holds the information of the XML recoverable errors.
  */
 bool PAdminXMLParser::error( const QXmlParseException & exception )
 {
@@ -458,9 +458,9 @@ bool PAdminXMLParser::error( const QXmlParseException & exception )
 
 //--------------------------------------------------------------------------
 /**
- * <p>
+ * <p>Report fatal XML errors.
  *
- * \param exception
+ * \param exception holds the information of the XML fatal errors.
  */
 bool PAdminXMLParser::fatalError( const QXmlParseException & exception )
 {

src/musredit/PTextEdit.cpp

@@ -1705,11 +1705,12 @@ void PTextEdit::musrMsr2Data()
   if (fMsr2DataParam == 0) {
     fMsr2DataParam = new PMsr2DataParam();
     *fMsr2DataParam = fAdmin->getMsr2DataParam();
-    // init fMsr2DataParam
-    fMsr2DataParam->keepMinuit2Output = fKeepMinuit2Output;
-    fMsr2DataParam->titleFromDataFile = fTitleFromDataFile;
   }
 
+  // init fMsr2DataParam
+  fMsr2DataParam->keepMinuit2Output = fKeepMinuit2Output;
+  fMsr2DataParam->titleFromDataFile = fTitleFromDataFile;
+
   PMsr2DataDialog *dlg = new PMsr2DataDialog(fMsr2DataParam, fAdmin->getHelpUrl("msr2data"));
 
   if (dlg == 0) {
@@ -1726,6 +1727,8 @@ void PTextEdit::musrMsr2Data()
     int i, end;
 
     fMsr2DataParam = dlg->getMsr2DataParam();
+    fKeepMinuit2Output = fMsr2DataParam->keepMinuit2Output;
+    fTitleFromDataFile = fMsr2DataParam->titleFromDataFile;
 
     // analyze parameters
     switch (dlg->getRunTag()) {

src/musredit/musredit_startup.xml

@@ -42,7 +42,6 @@
     <write_column_data>n</write_column_data>
     <recreate_data_file>n</recreate_data_file>
     <open_file_after_fitting>y</open_file_after_fitting>
-    <take_data_file_title>y</take_data_file_title>
     <create_msr_file_only>n</create_msr_file_only>
     <fit_only>n</fit_only>
     <global>n</global>