From d3b9506ab19757e61ccd452665fdbec074f3931d Mon Sep 17 00:00:00 2001 From: Brendan Sullivan <sullivanbt@ornl.gov> Date: Thu, 13 Dec 2018 13:34:49 -0500 Subject: [PATCH] Re #24329 clang-format --- .../Crystal/inc/MantidCrystal/SetCrystalLocation.h | 4 +--- Framework/Crystal/src/SetCrystalLocation.cpp | 13 ++++++------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Framework/Crystal/inc/MantidCrystal/SetCrystalLocation.h b/Framework/Crystal/inc/MantidCrystal/SetCrystalLocation.h index 1b445f28426..310b218375c 100644 --- a/Framework/Crystal/inc/MantidCrystal/SetCrystalLocation.h +++ b/Framework/Crystal/inc/MantidCrystal/SetCrystalLocation.h @@ -33,9 +33,7 @@ orientation . */ class DLLExport SetCrystalLocation : public API::Algorithm { public: - const std::string name() const override { - return "SetCrystalLocation"; - }; + const std::string name() const override { return "SetCrystalLocation"; }; /// Summary of algorithms purpose const std::string summary() const override { return "This algorithm sets the sample location of the " diff --git a/Framework/Crystal/src/SetCrystalLocation.cpp b/Framework/Crystal/src/SetCrystalLocation.cpp index cbaefdaf7aa..e3ed093a869 100644 --- a/Framework/Crystal/src/SetCrystalLocation.cpp +++ b/Framework/Crystal/src/SetCrystalLocation.cpp @@ -13,20 +13,20 @@ */ #include "MantidCrystal/SetCrystalLocation.h" +#include "MantidAPI/IMDEventWorkspace.h" #include "MantidAPI/Run.h" #include "MantidAPI/Sample.h" #include "MantidAPI/WorkspaceFactory.h" #include "MantidCrystal/CalibrationHelpers.h" #include "MantidCrystal/PeakHKLErrors.h" #include "MantidCrystal/SCDCalibratePanels.h" +#include "MantidDataObjects/EventWorkspace.h" #include "MantidGeometry/Crystal/IPeak.h" #include "MantidGeometry/Crystal/IndexingUtils.h" #include "MantidGeometry/Instrument/ComponentInfo.h" #include "MantidGeometry/Instrument/Goniometer.h" #include "MantidKernel/ArrayProperty.h" #include "MantidKernel/EnabledWhenProperty.h" -#include "MantidAPI/IMDEventWorkspace.h" -#include "MantidDataObjects/EventWorkspace.h" #include <cstdarg> @@ -47,10 +47,9 @@ void SetCrystalLocation::init() { declareProperty(make_unique<WorkspaceProperty<EventWorkspace>>( "InputWorkspace", "", Direction::Input), "Original event workspace"); - declareProperty( - make_unique<WorkspaceProperty<EventWorkspace>>("OutputWorkspace", - "", Direction::Output), - "Output event workspace with a modified sample position"); + declareProperty(make_unique<WorkspaceProperty<EventWorkspace>>( + "OutputWorkspace", "", Direction::Output), + "Output event workspace with a modified sample position"); declareProperty("NewX", 0.0, "New Absolute X position of crystal."); declareProperty("NewY", 0.0, "New Absolute Y position of crystal."); declareProperty("NewZ", 0.0, "New Absolute Z position of crystal."); @@ -72,7 +71,7 @@ void SetCrystalLocation::exec() { auto &componentInfo = outEvents->mutableComponentInfo(); CalibrationHelpers::adjustUpSampleAndSourcePositions( componentInfo.l1(), newSamplePos, componentInfo); - + setProperty("OutputWorkspace", outEvents); } // exec -- GitLab