Fixed some bugs. Refs #8096.

mantidproject · Oct 11, 2013 · 322aa1f · 322aa1f
1 parent c3a9e3d
commit 322aa1f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/Code/Mantid/Framework/DataHandling/src/SaveFullprofResolution.cpp b/Code/Mantid/Framework/DataHandling/src/SaveFullprofResolution.cpp
@@ -323,9 +323,9 @@ namespace DataHandling
     content << fixed;
 
     // Write header
-    if (m_append)
+    if (!m_append)
     {
-      content << "  Instrumental resolution function for POWGEN/SNS  J.P. Hodges  2011-09-02  ireso: 6" << "\n";
+      content << "  Instrumental resolution function for POWGEN/SNS  ireso: 6" << "\n";
       content << "! To be used with function NPROF=" << profindex << " in FullProf  (Res=6)" << "\n";
     }
 
@@ -458,7 +458,10 @@ namespace DataHandling
     if (has_key(m_profileParamMap, "CWL"))
     {
       double cwl = m_profileParamMap["CWL"];
-      content << "CWL =   " << setprecision(4) << cwl << "A" << "\n";
+      if (cwl > 0.)
+        content << "CWL =   " << setprecision(4) << cwl << "A" << "\n";
+      else
+        content << "\n";
     }
     else
     {

diff --git a/Code/Mantid/Framework/DataHandling/test/SaveFullprofResolutionTest.h b/Code/Mantid/Framework/DataHandling/test/SaveFullprofResolutionTest.h
@@ -170,7 +170,7 @@ class SaveFullprofResolutionTest : public CxxTest::TestSuite
   int getFileLines(std::string filename)
   {
     ifstream infile;
-    infile.open(filename);
+    infile.open(filename.c_str());
 
     int numlines = 0;
     if (infile.is_open())