Commit f108ae39 authored by Samuel Jackson's avatar Samuel Jackson
Browse files

Apply clang format patch

parent 850d4a1e
......@@ -714,7 +714,9 @@ double Peak::getFinalEnergy() const { return m_finalEnergy; }
double Peak::getInitialEnergy() const { return m_initialEnergy; }
/** Get the difference between the initial and final neutron energy */
double Peak::getEnergyTransfer() const { return getInitialEnergy() - getFinalEnergy(); }
double Peak::getEnergyTransfer() const {
return getInitialEnergy() - getFinalEnergy();
}
//----------------------------------------------------------------------------------------------
/** Get the H index of the peak */
......
......@@ -102,9 +102,10 @@ void export_IPeak() {
"supplied.") // two argument
// overload
.def("setQSampleFrame", setQSampleFrame1,
(arg("self"), arg("qsample_frame")), "Set the peak using the peak's "
"position in reciprocal space, "
"in the sample frame.")
(arg("self"), arg("qsample_frame")),
"Set the peak using the peak's "
"position in reciprocal space, "
"in the sample frame.")
.def("setQSampleFrame", setQSampleFrame2,
(arg("self"), arg("qsample_frame"), arg("distance")),
"Set the peak using the peak's position in reciprocal space, in the "
......
......@@ -34,8 +34,8 @@ void PeaksTableColumnsDialog::setVisibleColumns(const std::set<QString> &cols) {
m_origVisible.end());
ui->cb_wavelength->setChecked(isChecked);
isChecked =
bool(m_origVisible.find(QPeaksTableModel::ENERGY_TRANSFER) != m_origVisible.end());
isChecked = bool(m_origVisible.find(QPeaksTableModel::ENERGY_TRANSFER) !=
m_origVisible.end());
ui->cb_deltaE->setChecked(isChecked);
isChecked = bool(m_origVisible.find(QPeaksTableModel::INITIAL_ENERGY) !=
......@@ -110,7 +110,8 @@ std::set<QString> PeaksTableColumnsDialog::getVisibleColumns() {
updateChecked(result, QPeaksTableModel::DETID, ui->cb_detID->isChecked());
updateChecked(result, QPeaksTableModel::WAVELENGTH,
ui->cb_wavelength->isChecked());
updateChecked(result, QPeaksTableModel::ENERGY_TRANSFER, ui->cb_deltaE->isChecked());
updateChecked(result, QPeaksTableModel::ENERGY_TRANSFER,
ui->cb_deltaE->isChecked());
updateChecked(result, QPeaksTableModel::INITIAL_ENERGY,
ui->cb_ei->isChecked());
updateChecked(result, QPeaksTableModel::FINAL_ENERGY, ui->cb_ef->isChecked());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment