Merge branch 'feature/5421_IDA_bayes_interface' of github.com:mantidp…

…roject/mantid into feature/5421_IDA_bayes_interface
mantidproject · Sep 19, 2013 · 14c4d65 · 14c4d65
2 parents bf863df + ec24e65
commit 14c4d65
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Quasi.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Quasi.ui
@@ -62,7 +62,7 @@
         </sizepolicy>
        </property>
        <property name="autoLoad">
-        <bool>false</bool>
+        <bool>true</bool>
        </property>
        <property name="workspaceSuffixes" stdset="0">
         <stringlist>
@@ -75,7 +75,7 @@
         </stringlist>
        </property>
        <property name="showLoad">
-        <bool>false</bool>
+        <bool>true</bool>
        </property>
       </widget>
      </item>

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ResNorm.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ResNorm.ui
@@ -35,7 +35,7 @@
         </sizepolicy>
        </property>
        <property name="autoLoad">
-        <bool>false</bool>
+        <bool>true</bool>
        </property>
        <property name="loadLabelText" stdset="0">
         <string>Load</string>
@@ -51,7 +51,7 @@
         </stringlist>
        </property>
        <property name="showLoad">
-        <bool>false</bool>
+        <bool>true</bool>
        </property>
       </widget>
      </item>

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Stretch.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Stretch.ui
@@ -62,7 +62,7 @@
         </sizepolicy>
        </property>
        <property name="autoLoad">
-        <bool>false</bool>
+        <bool>true</bool>
        </property>
        <property name="workspaceSuffixes" stdset="0">
         <stringlist>
@@ -75,7 +75,7 @@
         </stringlist>
        </property>
        <property name="showLoad">
-        <bool>false</bool>
+        <bool>true</bool>
        </property>
       </widget>
      </item>

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/ResNorm.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/ResNorm.cpp
@@ -83,7 +83,7 @@ namespace MantidQt
 			if(m_uiForm.chkPlot->isChecked()){ plot = "True"; }
 			if(m_uiForm.chkSave->isChecked()){ save ="True"; }
 
-			pyInput += "ResNormRun("+VanName+", "+ResName+", "+ERange+", "+nBin+","
+			pyInput += "ResNormRun('"+VanName+"', '"+ResName+"', "+ERange+", "+nBin+","
 										" Save="+save+", Plot="+plot+", Verbose="+verbose+")\n";
 
 			runPythonScript(pyInput);

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Stretch.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Stretch.cpp
@@ -102,6 +102,7 @@ namespace MantidQt
 			QString betaSig = "[" + beta + ", " + sigma + "]";
 
 			QString nBins = m_properties["SampleBinning"]->valueText();
+			nBins = "[" + nBins + ", 1]";
 
 			//Output options
 			if(m_uiForm.chkVerbose->isChecked()) { verbose = "True"; }

diff --git a/Code/Mantid/scripts/Inelastic/IndirectBayes.py b/Code/Mantid/scripts/Inelastic/IndirectBayes.py
@@ -764,12 +764,11 @@ def QuestPlot(inputWS,Plot):
 
 # ResNorm programs
 
-def ResNormRun(vname,rname,erange,nbins,Verbose=False,Plot=False,Save=False):
+def ResNormRun(vname,rname,erange,nbin,Verbose=False,Plot=False,Save=False):
 	StartTime('ResNorm')
 	workdir = config['defaultsave.directory']
 	array_len = 4096                                    # length of Fortran array
 	CheckXrange(erange,'Energy')
-	nbin,nrbin = CheckBinning(nbins)
 	CheckAnalysers(vname,rname,Verbose)
 	nvan,ntc = CheckHistZero(vname)
 	theta,Q = GetThetaQ(vname)