diff --git a/GUI/Model/Beam/SourceItems.cpp b/GUI/Model/Beam/SourceItems.cpp index 11461d747f73e965ce96f73db7c63e41db7e59a6..927f8c4119ffadb64c4d63cc5ee3018c7389959a 100644 --- a/GUI/Model/Beam/SourceItems.cpp +++ b/GUI/Model/Beam/SourceItems.cpp @@ -350,11 +350,6 @@ void ScanItem::readFrom(QXmlStreamReader* r) } } -double ScanItem::getInclinationAngle() const -{ - return 0.0; -} - GrazingScanItem* ScanItem::grazingScanItem() const { return m_grazingScanItem.get(); @@ -375,12 +370,3 @@ void ScanItem::updateToData(const Scale& axis, QString units, const Frame& frame grazingScanItem()->selectListScan(); } } - -std::unique_ptr<Beam> ScanItem::createBeam() const -{ - double lambda = wavelength(); - double inclination_angle = Units::deg2rad(getInclinationAngle()); - double azimuthal_angle = Units::deg2rad(azimuthalAngle()); - - return std::make_unique<Beam>(Beam(intensity(), lambda, inclination_angle, azimuthal_angle)); -} diff --git a/GUI/Model/Beam/SourceItems.h b/GUI/Model/Beam/SourceItems.h index 7ea9415896860efdd8dadc2d72dea94945b240d4..4c37f950aa68552da00c73fd4e131b8e7bb29a57 100644 --- a/GUI/Model/Beam/SourceItems.h +++ b/GUI/Model/Beam/SourceItems.h @@ -102,15 +102,11 @@ public: void writeTo(QXmlStreamWriter* w) const; void readFrom(QXmlStreamReader* r); - double getInclinationAngle() const; - GrazingScanItem* grazingScanItem() const; BasicAxisItem* inclinationAxisItem() const; void updateToData(const Scale& axis, QString units, const Frame& frame); - std::unique_ptr<Beam> createBeam() const; - private: std::unique_ptr<GrazingScanItem> m_grazingScanItem; }; diff --git a/GUI/Model/Detector/FlatDetectorItem.cpp b/GUI/Model/Detector/FlatDetectorItem.cpp index 9261a722b52ea763f97169d72b2325ea90dde692..a804822d40f249c3646ba617a55a48390aeb9dfe 100644 --- a/GUI/Model/Detector/FlatDetectorItem.cpp +++ b/GUI/Model/Detector/FlatDetectorItem.cpp @@ -284,11 +284,9 @@ void FlatDetectorItem::updateTooltips() m_u0.setTooltip("u-coordinate of point where reflected beam hits the detector"); m_v0.setTooltip("v-coordinate of point where reflected beam hits the detector"); break; - case FlatDetector::T: // fall-through! + case FlatDetector::T: m_u0.setTooltip("u-coordinate of point where direct beam hits the detector"); m_v0.setTooltip("v-coordinate of point where direct beam hits the detector"); break; - default: - ASSERT(false); } }