Verified Commit 92681fb7 authored by Tobias WEBER's avatar Tobias WEBER
Browse files

magdyn: removed bragg peak

parent 266ae76c
......@@ -665,11 +665,6 @@ MagDynDlg::MagDynDlg(QWidget* pParent) : QDialog{pParent},
btn_rotate_ccw->setFocusPolicy(Qt::StrongFocus);
btn_rotate_cw->setFocusPolicy(Qt::StrongFocus);
// bragg peak
m_bragg[0] = new QDoubleSpinBox(m_samplepanel);
m_bragg[1] = new QDoubleSpinBox(m_samplepanel);
m_bragg[2] = new QDoubleSpinBox(m_samplepanel);
// temperature
m_temperature = new QDoubleSpinBox(m_samplepanel);
m_temperature->setDecimals(2);
......@@ -699,14 +694,6 @@ MagDynDlg::MagDynDlg(QWidget* pParent) : QDialog{pParent},
m_rot_axis[i]->setValue(i == 2 ? 1. : 0.);
m_rot_axis[i]->setSizePolicy(QSizePolicy{
QSizePolicy::Expanding, QSizePolicy::Fixed});
m_bragg[i]->setDecimals(2);
m_bragg[i]->setMinimum(-99);
m_bragg[i]->setMaximum(+99);
m_bragg[i]->setSingleStep(0.1);
m_bragg[i]->setValue(i == 0 ? 1. : 0.);
m_bragg[i]->setSizePolicy(QSizePolicy{
QSizePolicy::Expanding, QSizePolicy::Fixed});
}
m_field_dir[0]->setPrefix("Bh = ");
......@@ -730,7 +717,6 @@ MagDynDlg::MagDynDlg(QWidget* pParent) : QDialog{pParent},
auto sep1 = new QFrame(m_samplepanel); sep1->setFrameStyle(QFrame::HLine);
auto sep2 = new QFrame(m_samplepanel); sep2->setFrameStyle(QFrame::HLine);
auto sep3 = new QFrame(m_samplepanel); sep3->setFrameStyle(QFrame::HLine);
grid->addItem(new QSpacerItem(8, 8,
QSizePolicy::Minimum, QSizePolicy::Fixed),
......@@ -759,20 +745,6 @@ MagDynDlg::MagDynDlg(QWidget* pParent) : QDialog{pParent},
QSizePolicy::Minimum, QSizePolicy::Fixed),
y++,0, 1,1);
grid->addWidget(new QLabel(QString("Bragg Peak:"),
m_samplepanel), y,0,1,1);
grid->addWidget(m_bragg[0], y,1,1,1);
grid->addWidget(m_bragg[1], y,2,1,1);
grid->addWidget(m_bragg[2], y++,3,1,1);
grid->addItem(new QSpacerItem(16, 16,
QSizePolicy::Minimum, QSizePolicy::Fixed),
y++,0, 1,1);
grid->addWidget(sep3, y++,0, 1,4);
grid->addItem(new QSpacerItem(16, 16,
QSizePolicy::Minimum, QSizePolicy::Fixed),
y++,0, 1,1);
grid->addWidget(new QLabel(QString("Temperature:"),
m_samplepanel), y,0,1,1);
grid->addWidget(m_temperature, y++,1,1,1);
......@@ -800,14 +772,6 @@ MagDynDlg::MagDynDlg(QWidget* pParent) : QDialog{pParent},
if(this->m_autocalc->isChecked())
this->SyncSitesAndTerms();
});
connect(m_bragg[i],
static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
[this]()
{
if(this->m_autocalc->isChecked())
this->SyncSitesAndTerms();
});
}
connect(m_temperature,
......@@ -2030,18 +1994,6 @@ void MagDynDlg::SyncSitesAndTerms()
m_dyn.SetExternalField(field);
}
// get bragg peak
{
const t_real bragg[]
{
m_bragg[0]->value(),
m_bragg[1]->value(),
m_bragg[2]->value(),
};
m_dyn.SetBraggPeak(bragg[0], bragg[1], bragg[2]);
}
// get temperature
if(m_use_temperature->isChecked())
{
......
......@@ -144,9 +144,6 @@ protected:
QDoubleSpinBox *m_rot_axis[3]{nullptr, nullptr, nullptr};
QDoubleSpinBox *m_rot_angle{};
// bragg peak
QDoubleSpinBox *m_bragg[3]{nullptr, nullptr, nullptr};
// temperature
QDoubleSpinBox *m_temperature{};
......
......@@ -157,15 +157,6 @@ bool MagDynDlg::Load(const QString& filename)
if(!m_use_field->isChecked())
m_dyn.ClearExternalField();
// bragg peak
const t_vec& bragg = m_dyn.GetBraggPeak();
if(bragg.size() == 3)
{
m_bragg[0]->setValue(bragg[0].real());
m_bragg[1]->setValue(bragg[1].real());
m_bragg[2]->setValue(bragg[2].real());
}
// ordering vector
const t_vec_real& ordering = m_dyn.GetOrderingWavevector();
if(ordering.size() == 3)
......
......@@ -156,7 +156,7 @@ def get_prop_details(session_no, prop_no):
sched = row[4].strip()
if sched == "" and len(row_alt) > 0:
sched = row_alt[0].strip()
infos["allschedules"].append(sched)
......
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