Skip to content
Snippets Groups Projects
Commit ef10794b authored by Owen Arnold's avatar Owen Arnold
Browse files

Refs #3364, #3315. Disable feature. Address as part of pending 3315

parent fdbdebc2
No related branches found
No related tags found
No related merge requests found
...@@ -342,10 +342,10 @@ void vtkEventNexusReader::doRebinning() ...@@ -342,10 +342,10 @@ void vtkEventNexusReader::doRebinning()
Mantid::Kernel::V3D ay(up.getX(), up.getY(), up.getZ()); Mantid::Kernel::V3D ay(up.getX(), up.getY(), up.getZ());
Mantid::Kernel::V3D az = ax.cross_prod(ay); Mantid::Kernel::V3D az = ax.cross_prod(ay);
PerpendicularParameter perpendicular(az[0], az[1], az[2]); PerpendicularParameter perpendicular(az[0], az[1], az[2]);
if(ax.scalar_prod(ay) != 0) //if(ax.scalar_prod(ay) != 0) TODO: Fix
{ //{
throw std::logic_error("Normal and Up Vectors must be perpendicular"); // throw std::logic_error("Normal and Up Vectors must be perpendicular");
} //}
PlaneImplicitFunction func(normal, origin, m_width); PlaneImplicitFunction func(normal, origin, m_width);
hist_alg.setPropertyValue("ImplicitFunctionXML", func.toXMLString()); hist_alg.setPropertyValue("ImplicitFunctionXML", func.toXMLString());
......
...@@ -340,10 +340,10 @@ void vtkSQWEventReader::doRebinning() ...@@ -340,10 +340,10 @@ void vtkSQWEventReader::doRebinning()
Mantid::Kernel::V3D ay(up.getX(), up.getY(), up.getZ()); Mantid::Kernel::V3D ay(up.getX(), up.getY(), up.getZ());
Mantid::Kernel::V3D az = ax.cross_prod(ay); Mantid::Kernel::V3D az = ax.cross_prod(ay);
PerpendicularParameter perpendicular(az[0], az[1], az[2]); PerpendicularParameter perpendicular(az[0], az[1], az[2]);
if(ax.scalar_prod(ay) != 0) //if(ax.scalar_prod(ay) != 0) //TODO fix.
{ //{
throw std::logic_error("Normal and Up Vectors must be perpendicular"); // throw std::logic_error("Normal and Up Vectors must be perpendicular");
} //}
PlaneImplicitFunction func(normal, origin, m_width); PlaneImplicitFunction func(normal, origin, m_width);
hist_alg.setPropertyValue("ImplicitFunctionXML", func.toXMLString()); hist_alg.setPropertyValue("ImplicitFunctionXML", func.toXMLString());
...@@ -358,6 +358,8 @@ void vtkSQWEventReader::doRebinning() ...@@ -358,6 +358,8 @@ void vtkSQWEventReader::doRebinning()
int vtkSQWEventReader::RequestData(vtkInformation * vtkNotUsed(request), vtkInformationVector ** vtkNotUsed(inputVector), vtkInformationVector *outputVector) int vtkSQWEventReader::RequestData(vtkInformation * vtkNotUsed(request), vtkInformationVector ** vtkNotUsed(inputVector), vtkInformationVector *outputVector)
{ {
try
{
//get the info objects //get the info objects
vtkInformation *outInfo = outputVector->GetInformationObject(0); vtkInformation *outInfo = outputVector->GetInformationObject(0);
...@@ -401,6 +403,11 @@ int vtkSQWEventReader::RequestData(vtkInformation * vtkNotUsed(request), vtkInfo ...@@ -401,6 +403,11 @@ int vtkSQWEventReader::RequestData(vtkInformation * vtkNotUsed(request), vtkInfo
// Reset the action manager fresh for next cycle. // Reset the action manager fresh for next cycle.
m_actionManager.reset(); m_actionManager.reset();
return 1; return 1;
}
catch(std::exception& ex)
{
std::string msg = ex.what();
}
} }
int vtkSQWEventReader::RequestInformation( int vtkSQWEventReader::RequestInformation(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment