Revert "Merge branch 'tube_calibration_1' into develop re #6344"

This reverts commit a00da7c, reversing
changes made to 804e126.

Code/Mantid/Framework/Algorithms/CMakeLists.txt

@@ -442,7 +442,6 @@ set ( TEST_FILES
 	AlphaCalcTest.h
 	AnyShapeAbsorptionTest.h
 	AppendSpectraTest.h
-	ApplyCalibrationTest.h
 	ApplyDeadTimeCorrTest.h
 	ApplyDetailedBalanceTest.h
 	ApplyTransmissionCorrectionTest.h

Code/Mantid/Framework/Algorithms/src/ApplyCalibration.cpp

@@ -12,7 +12,6 @@ The PositionTable must have columns ''Detector ID'' and ''Detector Position''. T
 #include "MantidGeometry/Instrument/Component.h"
 #include "MantidAPI/FileProperty.h"
 #include "MantidAPI/MatrixWorkspace.h"
-#include "MantidGeometry/Instrument/ComponentHelper.h"
 #include <boost/scoped_ptr.hpp>
 
 namespace Mantid
@@ -34,7 +33,7 @@ namespace Mantid
     using Geometry::Instrument;
     using Geometry::Instrument_sptr;
     using Geometry::IDetector_sptr;
-    using Geometry::IComponent_const_sptr;
+    using Kernel::V3D;
 
     /// Empty default constructor
     ApplyCalibration::ApplyCalibration()
@@ -92,14 +91,32 @@ namespace Mantid
     */
     void ApplyCalibration::setDetectorPosition(const Geometry::Instrument_const_sptr & instrument, int detID, V3D pos, bool /*sameParent*/ )
     {
-
-       IComponent_const_sptr det =instrument->getDetector(detID); ;
-       // Do the move
-       using namespace Geometry::ComponentHelper;
-       TransformType positionType = Absolute;
-       // TransformType positionType = Relative;
-       Geometry::ComponentHelper::moveComponent(*det, *m_pmap, pos, positionType);
-
+       Geometry::IDetector_const_sptr det = instrument->getDetector(detID);
+       // Then find the corresponding relative position
+       boost::shared_ptr<const Geometry::IComponent> parent = det->getParent();
+       if (parent)
+       {
+         pos -= parent->getPos();
+         Quat rot = parent->getRelativeRot();
+         rot.inverse();
+         rot.rotate(pos);
+       }
+       boost::shared_ptr<const Geometry::IComponent>grandparent = parent->getParent();
+       if (grandparent)
+       {
+         Quat rot = grandparent->getRelativeRot();
+         rot.inverse();
+         rot.rotate(pos);
+         boost::shared_ptr<const Geometry::IComponent>greatgrandparent = grandparent->getParent();
+         if (greatgrandparent) {
+           Quat rot2 = greatgrandparent->getRelativeRot();
+            rot2.inverse();
+            rot2.rotate(pos);
+         }
+       }
+
+       // Add a parameter for the new position
+       m_pmap->addV3D(det.get(), "pos", pos);
     }
 
   } // namespace Algorithms