diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/EventNexusReader/vtkEventNexusReader.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/EventNexusReader/vtkEventNexusReader.cxx index dd24b6ebecd52eb1bfe19b1387e0815d9a13ea9f..cf9708ae3b1843721482fbf74ae5ccc3348e11f8 100644 --- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/EventNexusReader/vtkEventNexusReader.cxx +++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/EventNexusReader/vtkEventNexusReader.cxx @@ -342,10 +342,10 @@ void vtkEventNexusReader::doRebinning() Mantid::Kernel::V3D ay(up.getX(), up.getY(), up.getZ()); Mantid::Kernel::V3D az = ax.cross_prod(ay); PerpendicularParameter perpendicular(az[0], az[1], az[2]); - if(ax.scalar_prod(ay) != 0) - { - throw std::logic_error("Normal and Up Vectors must be perpendicular"); - } + //if(ax.scalar_prod(ay) != 0) TODO: Fix + //{ + // throw std::logic_error("Normal and Up Vectors must be perpendicular"); + //} PlaneImplicitFunction func(normal, origin, m_width); hist_alg.setPropertyValue("ImplicitFunctionXML", func.toXMLString()); diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/SQWEventReader/vtkSQWEventReader.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/SQWEventReader/vtkSQWEventReader.cxx index 9c8364addae640aba5dd95aa46092bdd15229728..d24dea754469db4a72db3287c3148ea6c212eeb8 100644 --- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/SQWEventReader/vtkSQWEventReader.cxx +++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/SQWEventReader/vtkSQWEventReader.cxx @@ -340,10 +340,10 @@ void vtkSQWEventReader::doRebinning() Mantid::Kernel::V3D ay(up.getX(), up.getY(), up.getZ()); Mantid::Kernel::V3D az = ax.cross_prod(ay); PerpendicularParameter perpendicular(az[0], az[1], az[2]); - if(ax.scalar_prod(ay) != 0) - { - throw std::logic_error("Normal and Up Vectors must be perpendicular"); - } + //if(ax.scalar_prod(ay) != 0) //TODO fix. + //{ + // throw std::logic_error("Normal and Up Vectors must be perpendicular"); + //} PlaneImplicitFunction func(normal, origin, m_width); hist_alg.setPropertyValue("ImplicitFunctionXML", func.toXMLString()); @@ -358,6 +358,8 @@ void vtkSQWEventReader::doRebinning() int vtkSQWEventReader::RequestData(vtkInformation * vtkNotUsed(request), vtkInformationVector ** vtkNotUsed(inputVector), vtkInformationVector *outputVector) { + try + { //get the info objects vtkInformation *outInfo = outputVector->GetInformationObject(0); @@ -401,6 +403,11 @@ int vtkSQWEventReader::RequestData(vtkInformation * vtkNotUsed(request), vtkInfo // Reset the action manager fresh for next cycle. m_actionManager.reset(); return 1; + } + catch(std::exception& ex) + { + std::string msg = ex.what(); + } } int vtkSQWEventReader::RequestInformation(