mpi_analysis fix for global-fit multi-speed to associate correctly al…

…l timestate with runs
ehb54 · Apr 2, 2020 · efdf514 · efdf514
1 parent e21c8c0
commit efdf514
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/copypkg-win.sh b/copypkg-win.sh
@@ -31,6 +31,7 @@ QTDLLS=" \
  Qt5Sensors.dll  Qt5SerialBus.dll Qt5SerialPort.dll \
  Qt5Sql.dll Qt5Svg.dll Qt5WebChannel.dll Qt5WebSockets.dll \
  Qt5Widgets.dll Qt5WinExtras.dll Qt5Xml.dll Qt5XmlPatterns.dll \
+ assistant.exe \
 "
 
 echo "Copy lib DLLs to bin"

diff --git a/doc/manual/ultrascan3.txt b/doc/manual/ultrascan3.txt
@@ -1,9 +1,9 @@
 UltraScan III
 
-Copyright 1989 - 2017
+Copyright 1989 - 2020
 
-Copyright � 1989?2017 Borries Demeler, Ph.D.
-Copyright � 1997?2017 The University of Texas Health Science Center at San Antonio
+Copyright � 1989?2020 Borries Demeler, Ph.D.
+Copyright � 1997?2020 The University of Texas Health Science Center at San Antonio
 All rights reserved.
 
 UltraScan is free software; you can redistribute it and/or modify it under the

diff --git a/doc/manual/wrapped-images.lst b/doc/manual/wrapped-images.lst
@@ -2,6 +2,10 @@
 2dsa_resplot
 analyte_details
 buffer_info
+cfa_view-loadraw
+cfa_view-loadauc
+cfa_view-statsraw
+cfa_view-statsauc
 ddist_combine-selrun
 fit_men-editupd
 fit_men-load

diff --git a/makeall.sh b/makeall.sh
@@ -13,6 +13,9 @@ fi
 MKARGS="$@"
 if [ $# -eq 0 ]; then
   MKARGS="-j 7"
+  if [ `uname -s|grep -ci "mingw"` -ne 0 ]; then
+    MKARGS="-j 2"
+  fi
 fi
 export MAKE="make ${MKARGS}"
 

diff --git a/programs/us_mpi_analysis/us_mpi_parse.cpp b/programs/us_mpi_analysis/us_mpi_parse.cpp
@@ -18,6 +18,7 @@ void US_MPI_Analysis::parse( const QString& xmlfile )
       qApp->exit();
    }
 
+   QString tmst_fn;
    QXmlStreamReader xml( &file );
 
    while ( ! xml.atEnd() )
@@ -38,8 +39,9 @@ void US_MPI_Analysis::parse( const QString& xmlfile )
          if ( xml.name() == "dataset" )
          {
             US_SolveSim::DataSet* d = new US_SolveSim::DataSet;
-            d->tmst_file   = QString("");
+            d->tmst_file   = tmst_fn;       // Initialize to blank or previous
             parse_dataset( xml, d );
+            tmst_fn        = d->tmst_file;  // Init for subsequent dataset
 
             if ( parameters.contains( "CG_model" ) )
             {  // Flag Custom Grid model input

diff --git a/updsomo.sh b/updsomo.sh
@@ -1,9 +1,11 @@
 #!/bin/bash
 #  Do SVN update of us3_somo
 
-cd $us3/../us3_somo
+##cd $us3/../us3_somo
+cd $us3/us_somo
 pwd
-svn up
+##svn up
+git pull
 cat develop/include/us_revision.h
 
 exit 0