From 9da22127e3bc5b8f5f15e8b97bf6d93432450b18 Mon Sep 17 00:00:00 2001
From: Russell Taylor <taylorrj@ornl.gov>
Date: Fri, 16 Sep 2011 20:25:04 +0000
Subject: [PATCH] Tidy up. Re #3286.
---
.../Framework/Kernel/inc/MantidKernel/Unit.h | 19 -------------------
Code/Mantid/Framework/Kernel/src/Unit.cpp | 15 ---------------
2 files changed, 34 deletions(-)
diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/Unit.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/Unit.h
index 2485b0618a2..23c3628de69 100644
--- a/Code/Mantid/Framework/Kernel/inc/MantidKernel/Unit.h
+++ b/Code/Mantid/Framework/Kernel/inc/MantidKernel/Unit.h
@@ -331,25 +331,6 @@ public:
~DeltaE_inWavenumber() {}
};
-/// Atomic distance in Angstrom
-class MANTID_KERNEL_DLL AtomicDistance : public Unit
-{
-public:
- const std::string unitID() const; ///< "AtomicDistance"
- const std::string caption() const { return "Atomic Distance"; }
- const std::string label() const {return "Angstrom"; }
-
- void toTOF(std::vector<double>& xdata, std::vector<double>& ydata, const double& l1, const double& l2,
- const double& twoTheta, const int& emode, const double& efixed, const double& delta) const;
- void fromTOF(std::vector<double>& xdata, std::vector<double>& ydata, const double& l1, const double& l2,
- const double& twoTheta, const int& emode, const double& efixed, const double& delta) const;
-
- /// Constructor
- AtomicDistance() : Unit() {}
- /// Destructor
- ~AtomicDistance() {}
-};
-
} // namespace Units
} // namespace Kernel
diff --git a/Code/Mantid/Framework/Kernel/src/Unit.cpp b/Code/Mantid/Framework/Kernel/src/Unit.cpp
index 8fb713451ca..10027ee90e0 100644
--- a/Code/Mantid/Framework/Kernel/src/Unit.cpp
+++ b/Code/Mantid/Framework/Kernel/src/Unit.cpp
@@ -717,21 +717,6 @@ void DeltaE_inWavenumber::fromTOF(std::vector<double>& xdata, std::vector<double
}
}
-/* Atomic Distance
- * ===============
- */
-DECLARE_UNIT(AtomicDistance)
-
-void AtomicDistance::toTOF(std::vector<double>&, std::vector<double>&, const double&, const double&,
- const double&, const int&, const double&, const double&) const{
- throw Kernel::Exception::NotImplementedError("Cannot convert unit "+this->unitID()+" to time of flight");
-}
-void AtomicDistance::fromTOF(std::vector<double>&, std::vector<double>&, const double&, const double&,
- const double&, const int&, const double&, const double&) const{
- // g_log.error() << << std::endl;
- throw Kernel::Exception::NotImplementedError("Cannot convert unit "+this->unitID()+" from time of flight");
-}
-
} // namespace Units
} // namespace Kernel
--
GitLab