Refs #7432 fix first point zero

mantidproject · Jul 11, 2013 · bc7c199 · bc7c199
1 parent 4061933
commit bc7c199
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/IntegratePeaksMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/IntegratePeaksMD.cpp
@@ -484,11 +484,11 @@ namespace MDAlgorithms
 				fit_alg->setPropertyValue("Function", fun_str.str());
 				fit_alg->setProperty("InputWorkspace", wsProfile2D);
 				fit_alg->setProperty("WorkspaceIndex", i);
-				if (profileFunction.compare("ConvolutionExpGaussian") == 0)
+				/*if (profileFunction.compare("ConvolutionExpGaussian") == 0)
 				{
 			        fit_alg->setProperty("StartX", Centre - 4.0 * Sigma);
 			        fit_alg->setProperty("EndX", Centre + 4.0 * Sigma);
-				}
+				}*/
 				fit_alg->setProperty("CreateOutput", true);
 				fit_alg->setProperty("Output", plot_str.str());
 				fit_alg->executeAsChildAlg();

diff --git a/Code/Mantid/Framework/MDEvents/src/MDBox.cpp b/Code/Mantid/Framework/MDEvents/src/MDBox.cpp
@@ -634,8 +634,8 @@ namespace MDEvents
       {
         // add event to appropriate y channel
 		size_t xchannel;
-		if (out[1] < 0) xchannel = static_cast<int>(out[1] / deltaQ - 0.5) + static_cast<int>(numSteps / 2);
-		else xchannel = static_cast<int>(out[1] / deltaQ + 0.5) + static_cast<int>(numSteps / 2);
+		if (out[1] < 0) xchannel = static_cast<int>(out[1] / deltaQ - 0.5) + static_cast<int>(numSteps / 2)-1;
+		else xchannel = static_cast<int>(out[1] / deltaQ + 0.5) + static_cast<int>(numSteps / 2)-1;
         if (xchannel < numSteps ) signal_fit[xchannel] += static_cast<signal_t>(it->getSignal());
 
         signal += static_cast<signal_t>(it->getSignal());

diff --git a/Code/Mantid/Framework/MDEvents/src/MDGridBox.cpp b/Code/Mantid/Framework/MDEvents/src/MDGridBox.cpp
@@ -1433,9 +1433,9 @@ namespace MDEvents
             radiusTransform.apply(eventCenter, out);
             // add event to appropriate y channel
             size_t xchannel;
-            if (out[1] < 0) xchannel = static_cast<int>(out[1] / deltaQ - 0.5) + static_cast<int>(numSteps / 2);
-            else xchannel = static_cast<int>(out[1] / deltaQ + 0.5) + static_cast<int>(numSteps / 2);
-            if (xchannel >= 0 || xchannel < numSteps ) signal_fit[xchannel] += coordTable[k*nColumns];
+            if (out[1] < 0) xchannel = static_cast<int>(out[1] / deltaQ - 0.5) + static_cast<int>(numSteps / 2)-1;
+            else xchannel = static_cast<int>(out[1] / deltaQ + 0.5) + static_cast<int>(numSteps / 2)-1;
+            if (xchannel < numSteps ) signal_fit[xchannel] += coordTable[k*nColumns];
           }
         }
         //box->releaseEvents();