diff --git a/Framework/DataHandling/inc/MantidDataHandling/CreatePolarizationEfficiencies.h b/Framework/DataHandling/inc/MantidDataHandling/CreatePolarizationEfficiencies.h index cca35b07d103b8f619d7869d458d11905febe866..866107fb77eeab024bb62d0cb44d198f1adae191 100644 --- a/Framework/DataHandling/inc/MantidDataHandling/CreatePolarizationEfficiencies.h +++ b/Framework/DataHandling/inc/MantidDataHandling/CreatePolarizationEfficiencies.h @@ -30,7 +30,8 @@ namespace DataHandling { File change history is stored at: <https://github.com/mantidproject/mantid> Code Documentation is available at: <http://doxygen.mantidproject.org> */ -class DLLExport CreatePolarizationEfficiencies : public CreatePolarizationEfficienciesBase { +class DLLExport CreatePolarizationEfficiencies + : public CreatePolarizationEfficienciesBase { public: const std::string name() const override; int version() const override; diff --git a/Framework/DataHandling/inc/MantidDataHandling/CreatePolarizationEfficienciesBase.h b/Framework/DataHandling/inc/MantidDataHandling/CreatePolarizationEfficienciesBase.h index 82ea8a2df466238b539c7606699becf3062c3815..946505d59fa86c0e767c975f294f46d45e70e8b0 100644 --- a/Framework/DataHandling/inc/MantidDataHandling/CreatePolarizationEfficienciesBase.h +++ b/Framework/DataHandling/inc/MantidDataHandling/CreatePolarizationEfficienciesBase.h @@ -61,7 +61,8 @@ private: void exec() override; /// Create the output workspace with efficiencies /// @param labels :: Names of the efficiencies to create - virtual API::MatrixWorkspace_sptr createEfficiencies(std::vector<std::string> const &labels) = 0; + virtual API::MatrixWorkspace_sptr + createEfficiencies(std::vector<std::string> const &labels) = 0; }; } // namespace DataHandling diff --git a/Framework/DataHandling/src/CreatePolarizationEfficiencies.cpp b/Framework/DataHandling/src/CreatePolarizationEfficiencies.cpp index a4d57bb83d979b24382a2fcecbe75c78c9925bdd..a6cce278dc695fc9a896e75773376b0c60fedbfe 100644 --- a/Framework/DataHandling/src/CreatePolarizationEfficiencies.cpp +++ b/Framework/DataHandling/src/CreatePolarizationEfficiencies.cpp @@ -49,7 +49,8 @@ const std::string CreatePolarizationEfficiencies::summary() const { } const std::vector<std::string> CreatePolarizationEfficiencies::seeAlso() const { - return {"JoinISISPolarizationEfficiencies", "LoadISISPolarizationEfficiencies", "PolarizationEfficiencyCor"}; + return {"JoinISISPolarizationEfficiencies", + "LoadISISPolarizationEfficiencies", "PolarizationEfficiencyCor"}; } void CreatePolarizationEfficiencies::init() { diff --git a/Framework/DataHandling/src/CreatePolarizationEfficienciesBase.cpp b/Framework/DataHandling/src/CreatePolarizationEfficienciesBase.cpp index 0ae123aedd2013a0a7c6feb3c6c0d1aa0f07fdcf..7a3747f42a619cabf1533d87ecda9813b636c812 100644 --- a/Framework/DataHandling/src/CreatePolarizationEfficienciesBase.cpp +++ b/Framework/DataHandling/src/CreatePolarizationEfficienciesBase.cpp @@ -40,13 +40,12 @@ void CreatePolarizationEfficienciesBase::initOutputWorkspace() { } void CreatePolarizationEfficienciesBase::exec() { - auto const labelsFredrikze = - getNonDefaultProperties({Pp, Ap, Rho, Alpha}); - auto const labelsWildes = - getNonDefaultProperties({P1, P2, F1, F2}); + auto const labelsFredrikze = getNonDefaultProperties({Pp, Ap, Rho, Alpha}); + auto const labelsWildes = getNonDefaultProperties({P1, P2, F1, F2}); if (labelsFredrikze.empty() && labelsWildes.empty()) { - throw std::invalid_argument("At least one of the efficiencies must be set."); + throw std::invalid_argument( + "At least one of the efficiencies must be set."); } if (!labelsFredrikze.empty() && !labelsWildes.empty()) { diff --git a/Framework/DataHandling/src/JoinISISPolarizationEfficiencies.cpp b/Framework/DataHandling/src/JoinISISPolarizationEfficiencies.cpp index 7d0f3ea3fc8d0f94d051244ebaff86dcf2419f4d..96b5825b8ae470e1c0ca5b10db48045bf14e324b 100644 --- a/Framework/DataHandling/src/JoinISISPolarizationEfficiencies.cpp +++ b/Framework/DataHandling/src/JoinISISPolarizationEfficiencies.cpp @@ -39,11 +39,12 @@ const std::string JoinISISPolarizationEfficiencies::summary() const { "PolarizationEfficiencyCor."; } -const std::vector<std::string> JoinISISPolarizationEfficiencies::seeAlso() const { - return {"CreatePolarizationEfficiencies", "LoadISISPolarizationEfficiencies", "PolarizationEfficiencyCor"}; +const std::vector<std::string> +JoinISISPolarizationEfficiencies::seeAlso() const { + return {"CreatePolarizationEfficiencies", "LoadISISPolarizationEfficiencies", + "PolarizationEfficiencyCor"}; } - //---------------------------------------------------------------------------------------------- /** Initialize the algorithm's properties. */ @@ -51,50 +52,42 @@ void JoinISISPolarizationEfficiencies::init() { declareProperty( Kernel::make_unique<WorkspaceProperty<MatrixWorkspace>>( - Pp, "", Kernel::Direction::Input, - PropertyMode::Optional), + Pp, "", Kernel::Direction::Input, PropertyMode::Optional), "A matrix workspaces containing the Pp polarization efficiency."); declareProperty( Kernel::make_unique<WorkspaceProperty<MatrixWorkspace>>( - Ap, "", Kernel::Direction::Input, - PropertyMode::Optional), + Ap, "", Kernel::Direction::Input, PropertyMode::Optional), "A matrix workspaces containing the Ap polarization efficiency."); declareProperty( Kernel::make_unique<WorkspaceProperty<MatrixWorkspace>>( - Rho, "", Kernel::Direction::Input, - PropertyMode::Optional), + Rho, "", Kernel::Direction::Input, PropertyMode::Optional), "A matrix workspaces containing the Rho polarization efficiency."); declareProperty( Kernel::make_unique<WorkspaceProperty<MatrixWorkspace>>( - Alpha, "", Kernel::Direction::Input, - PropertyMode::Optional), + Alpha, "", Kernel::Direction::Input, PropertyMode::Optional), "A matrix workspaces containing the Alpha polarization efficiency."); declareProperty( Kernel::make_unique<WorkspaceProperty<MatrixWorkspace>>( - P1, "", Kernel::Direction::Input, - PropertyMode::Optional), + P1, "", Kernel::Direction::Input, PropertyMode::Optional), "A matrix workspaces containing the P1 polarization efficiency."); declareProperty( Kernel::make_unique<WorkspaceProperty<MatrixWorkspace>>( - P2, "", Kernel::Direction::Input, - PropertyMode::Optional), + P2, "", Kernel::Direction::Input, PropertyMode::Optional), "A matrix workspaces containing the P2 polarization efficiency."); declareProperty( Kernel::make_unique<WorkspaceProperty<MatrixWorkspace>>( - F1, "", Kernel::Direction::Input, - PropertyMode::Optional), + F1, "", Kernel::Direction::Input, PropertyMode::Optional), "A matrix workspaces containing the F1 polarization efficiency."); declareProperty( Kernel::make_unique<WorkspaceProperty<MatrixWorkspace>>( - F2, "", Kernel::Direction::Input, - PropertyMode::Optional), + F2, "", Kernel::Direction::Input, PropertyMode::Optional), "A matrix workspaces containing the F2 polarization efficiency."); initOutputWorkspace(); @@ -128,7 +121,8 @@ MatrixWorkspace_sptr JoinISISPolarizationEfficiencies::createEfficiencies( auto interpolatedWorkspaces = interpolateWorkspaces(workspaces); auto const &inWS = interpolatedWorkspaces.front(); - MatrixWorkspace_sptr outWS = DataObjects::create<Workspace2D>(*inWS, labels.size(), inWS->histogram(0)); + MatrixWorkspace_sptr outWS = DataObjects::create<Workspace2D>( + *inWS, labels.size(), inWS->histogram(0)); auto axis1 = new TextAxis(labels.size()); outWS->replaceAxis(1, axis1); outWS->getAxis(0)->setUnit("Wavelength"); diff --git a/Framework/DataHandling/src/LoadISISPolarizationEfficiencies.cpp b/Framework/DataHandling/src/LoadISISPolarizationEfficiencies.cpp index 8cf9405dcfad5d26b6f4833c09d41e07ffa4fbd6..0d5e0b494693b8def90e49b702ebf410d93f0c34 100644 --- a/Framework/DataHandling/src/LoadISISPolarizationEfficiencies.cpp +++ b/Framework/DataHandling/src/LoadISISPolarizationEfficiencies.cpp @@ -35,8 +35,10 @@ const std::string LoadISISPolarizationEfficiencies::summary() const { "one factor per file."; } -const std::vector<std::string> LoadISISPolarizationEfficiencies::seeAlso() const { - return {"CreatePolarizationEfficiencies", "JoinISISPolarizationEfficiencies", "PolarizationEfficiencyCor"}; +const std::vector<std::string> +LoadISISPolarizationEfficiencies::seeAlso() const { + return {"CreatePolarizationEfficiencies", "JoinISISPolarizationEfficiencies", + "PolarizationEfficiencyCor"}; } //----------------------------------------------------------------------------------------------