Skip to content

Commit

Permalink
Re #5414. Clear compiler warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
RussellTaylor committed Jun 5, 2012
1 parent 170c933 commit efb00c2
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Code/Mantid/Framework/Algorithms/src/ApplyCalibration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ namespace Mantid
throw std::runtime_error("Workspace to apply calibration to has no defined instrument");
}

int numDetector = PosTable->rowCount();
size_t numDetector = PosTable->rowCount();
//API::Column_const_sptr detID = PosTable->getColumn( 0 );
ColumnVector<int> detID = PosTable->getVector("Detector ID");
ColumnVector<V3D> detPos = PosTable->getVector("Detector Position");
// numDetector needs to be got as the number of rows in the table and the detID got from the (i)th row of table.
for (int i = 0; i < numDetector; ++i)
for (size_t i = 0; i < numDetector; ++i)
{
Geometry::IDetector_sptr det = boost::const_pointer_cast<Geometry::IDetector>(instrument->getDetector(detID[i]));
setDetectorPosition( Ws, instrument, detID[i], detPos[i], false );
Expand All @@ -95,9 +95,9 @@ namespace Mantid
* @param pos :: new position of Dectector
* @param sameParent :: true if detector has same parent as previous detector set here.
*/
void ApplyCalibration::setDetectorPosition(API::MatrixWorkspace_sptr Ws, boost::shared_ptr<Geometry::Instrument> instrument, int detID, V3D pos, bool sameParent )
void ApplyCalibration::setDetectorPosition(API::MatrixWorkspace_sptr Ws, boost::shared_ptr<Geometry::Instrument> instrument, int detID, V3D pos, bool /*sameParent*/ )
{
Geometry::IDetector_sptr det = boost::const_pointer_cast<Geometry::IDetector>(instrument->getDetector(detID));
Geometry::IDetector_sptr det = boost::const_pointer_cast<Geometry::IDetector>(instrument->getDetector(detID));

if (det == 0)
{
Expand Down

0 comments on commit efb00c2

Please sign in to comment.