Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DensityOfStates UI #164

Merged
merged 12 commits into from Feb 9, 2015
Expand Up @@ -7,7 +7,7 @@
import os.path
import math

class DensityOfStates(DataProcessorAlgorithm):
class DensityOfStates(PythonAlgorithm):

def summary(self):
return "Calculates phonon densities of states, Raman and IR spectrum."
Expand Down Expand Up @@ -35,7 +35,7 @@ def PyInit(self):
self.declareProperty(name='BinWidth', defaultValue=1.0,
doc='Set histogram resolution for binning (eV or cm**-1). Default is 1')

self.declareProperty(name='Temperature', defaultValue=300,
self.declareProperty(name='Temperature', defaultValue=300.0,
doc='Temperature to use (in raman spectrum modelling). Default is 300')

self.declareProperty(name='ZeroThreshold', defaultValue=3.0,
Expand Down
4 changes: 4 additions & 0 deletions Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
Expand Up @@ -5,6 +5,7 @@ set ( SRC_FILES
src/Indirect/ApplyCorr.cpp
src/Indirect/CalcCorr.cpp
src/Indirect/ConvFit.cpp
src/Indirect/DensityOfStates.cpp
src/Indirect/Elwin.cpp
src/Indirect/Fury.cpp
src/Indirect/FuryFit.cpp
Expand Down Expand Up @@ -84,6 +85,7 @@ set ( INC_FILES
inc/MantidQtCustomInterfaces/Indirect/ApplyCorr.h
inc/MantidQtCustomInterfaces/Indirect/CalcCorr.h
inc/MantidQtCustomInterfaces/Indirect/ConvFit.h
inc/MantidQtCustomInterfaces/Indirect/DensityOfStates.h
inc/MantidQtCustomInterfaces/Indirect/Elwin.h
inc/MantidQtCustomInterfaces/Indirect/Fury.h
inc/MantidQtCustomInterfaces/Indirect/FuryFit.h
Expand Down Expand Up @@ -170,6 +172,7 @@ set ( MOC_FILES inc/MantidQtCustomInterfaces/Background.h
inc/MantidQtCustomInterfaces/Indirect/ApplyCorr.h
inc/MantidQtCustomInterfaces/Indirect/CalcCorr.h
inc/MantidQtCustomInterfaces/Indirect/ConvFit.h
inc/MantidQtCustomInterfaces/Indirect/DensityOfStates.h
inc/MantidQtCustomInterfaces/Indirect/Elwin.h
inc/MantidQtCustomInterfaces/Indirect/Fury.h
inc/MantidQtCustomInterfaces/Indirect/FuryFit.h
Expand Down Expand Up @@ -235,6 +238,7 @@ set ( UI_FILES inc/MantidQtCustomInterfaces/AddWorkspace.ui
inc/MantidQtCustomInterfaces/Indirect/ApplyCorr.ui
inc/MantidQtCustomInterfaces/Indirect/CalcCorr.ui
inc/MantidQtCustomInterfaces/Indirect/ConvFit.ui
inc/MantidQtCustomInterfaces/Indirect/DensityOfStates.ui
inc/MantidQtCustomInterfaces/Indirect/Elwin.ui
inc/MantidQtCustomInterfaces/Indirect/Fury.ui
inc/MantidQtCustomInterfaces/Indirect/FuryFit.ui
Expand Down
@@ -0,0 +1,42 @@
#ifndef MANTIDQTCUSTOMINTERFACES_DENSITYOFSTATES_H_
#define MANTIDQTCUSTOMINTERFACES_DENSITYOFSTATES_H_

#include "ui_DensityOfStates.h"
#include "MantidQtCustomInterfaces/Indirect/IndirectSimulationTab.h"

namespace MantidQt
{
namespace CustomInterfaces
{
class DLLExport DensityOfStates : public IndirectSimulationTab
{
Q_OBJECT

public:
DensityOfStates(QWidget * parent = 0);

QString help() { return "DensityOfStates"; };

void setup();
bool validate();
void run();

/// Load default settings into the interface
void loadSettings(const QSettings& settings);

private slots:
void dosAlgoComplete(bool error);
void handleFileChange();
void ionLoadComplete(bool error);

private:
/// The ui form
Ui::DensityOfStates m_uiForm;
/// Name of output workspace
QString m_outputWsName;

};
} // namespace CustomInterfaces
} // namespace MantidQt

#endif //MANTIDQTCUSTOMINTERFACES_DENSITYOFSTATES_H_