diff --git a/GUI/Model/Device/InstrumentItems.cpp b/GUI/Model/Device/InstrumentItems.cpp
index 459a2fe0529c83cf1052dd508df7391cbd1bac62..6666c10a05b72355c9ccdaf75ca9bd9a52f050be 100644
--- a/GUI/Model/Device/InstrumentItems.cpp
+++ b/GUI/Model/Device/InstrumentItems.cpp
@@ -55,7 +55,6 @@ const QString AlphaAxis("AlphaAxis");
const QString AnalyzerBlochVector("AnalyzerBlochVector");
const QString AnalyzerDirection("AnalyzerDirection"); // OBSOLETE since v21
const QString AnalyzerEfficiency("AnalyzerEfficiency"); // OBSOLETE since v21
-const QString AnalyzerTransmission("AnalyzerTransmission");
const QString Background("Background");
const QString BaseData("BaseData");
const QString Beam("Beam");
@@ -70,7 +69,6 @@ const QString Id("Id");
const QString Name("Name");
const QString Polarization("Polarization"); // OBSOLETE since c21
const QString PolarizerBlochVector("PolarizerBlochVector");
-const QString PolarizerTransmission("PolarizerTransmission");
const QString Scan("Scan");
const QString ScanParameters("ScanParameters");
const QString WithPolarizerAnalyzer("WithPolarizerAnalyzer");
@@ -100,15 +98,9 @@ InstrumentItem::InstrumentItem()
m_polarizerBlochVector.init("Polarizer Bloch vector",
"Beam polarizer direction times efficiency", Unit::unitless,
"polarizerBlochVector");
- m_polarizerTransmission.init("Polarizer transmission",
- "Mean transmission of the beam polarizer", 0.5, Unit::unitless,
- 4 /* decimals */, RealLimits::nonnegative(), "transmission");
m_analyzerBlochVector.init("Analyzer Bloch vector",
"Polarization analyzer direction times efficiency", Unit::unitless,
"analyzerBlochVector");
- m_analyzerTransmission.init(
- "Analyzer transmission", "Mean transmission of the polarization analyzer", 0.5,
- Unit::unitless, 4 /* decimals */, RealLimits::nonnegative(), "transmission");
m_background.init("Background", "");
}
@@ -164,19 +156,11 @@ void InstrumentItem::writeTo(QXmlStreamWriter* w) const
m_polarizerBlochVector.writeTo(w);
w->writeEndElement();
- w->writeStartElement(Tag::PolarizerTransmission);
- m_polarizerTransmission.writeTo(w);
- w->writeEndElement();
-
// polarization analyzer
w->writeStartElement(Tag::AnalyzerBlochVector);
m_analyzerBlochVector.writeTo(w);
w->writeEndElement();
- w->writeStartElement(Tag::AnalyzerTransmission);
- m_analyzerTransmission.writeTo(w);
- w->writeEndElement();
-
// background
w->writeStartElement(Tag::Background);
m_background.writeTo(w);
@@ -253,11 +237,6 @@ void InstrumentItem::readFrom(QXmlStreamReader* r)
XML::gotoEndElementOfTag(r, tag);
m_analyzerBlochVector.setR3(m_analyzerBlochVector.r3() * analyzerEfficiency.value());
- // analyzer transmission
- } else if (tag == Tag::AnalyzerTransmission) {
- m_analyzerTransmission.readFrom(r);
- XML::gotoEndElementOfTag(r, tag);
-
// background
} else if (tag == Tag::Background) {
m_background.readFrom(r);
@@ -452,7 +431,7 @@ ISimulation* SpecularInstrumentItem::createSimulation(const MultiLayer& sample)
std::unique_ptr<IBeamScan> scan = createScan(*axis);
if (withPolarizerAnalyzer()) {
scan->setPolarization(m_polarizerBlochVector);
- scan->setAnalyzer(m_analyzerBlochVector, m_analyzerTransmission);
+ scan->setAnalyzer(m_analyzerBlochVector);
}
auto* result = new SpecularSimulation(*scan, sample);
@@ -638,14 +617,14 @@ std::unique_ptr<const ICoordSystem> OffspecInstrumentItem::createCoordSystem() c
ISimulation* OffspecInstrumentItem::createSimulation(const MultiLayer& sample) const
{
const auto detector = detectorItem()->createOffspecDetector();
- detector->setAnalyzer(m_analyzerBlochVector, m_analyzerTransmission);
+ detector->setAnalyzer(m_analyzerBlochVector);
BasicAxisItem* const axis_item = scanItem()->inclinationAxisItem();
std::unique_ptr<Scale> axis = axis_item->itemToRegularAxis(Units::deg);
std::unique_ptr<IBeamScan> scan = createScan(*axis);
if (withPolarizerAnalyzer()) {
scan->setPolarization(m_polarizerBlochVector);
- scan->setAnalyzer(m_analyzerBlochVector, m_analyzerTransmission);
+ scan->setAnalyzer(m_analyzerBlochVector);
}
auto* result = new OffspecSimulation(*scan, sample, *detector);
@@ -745,7 +724,7 @@ ISimulation* GISASInstrumentItem::createSimulation(const MultiLayer& sample) con
const auto detector = detectorItem()->createDetector();
detector->setDetectorNormal(beam->ki());
if (withPolarizerAnalyzer())
- detector->setAnalyzer(m_analyzerBlochVector, m_analyzerTransmission);
+ detector->setAnalyzer(m_analyzerBlochVector);
auto* result = new ScatteringSimulation(*beam, sample, *detector);
setBeamDistribution(ParameterDistribution::BeamWavelength, beamItem()->wavelengthItem(),
diff --git a/GUI/Model/Device/InstrumentItems.h b/GUI/Model/Device/InstrumentItems.h
index 5e7b0f5dd4929e3c8aa2001a6708167727649ded..0691a0b8f088b2d62ffd9f4ab528159153a34c7e 100644
--- a/GUI/Model/Device/InstrumentItems.h
+++ b/GUI/Model/Device/InstrumentItems.h
@@ -94,18 +94,10 @@ public:
const VectorProperty& polarizerBlochVector() const { return m_polarizerBlochVector; }
void setPolarizerBlochVector(const R3& v) { m_polarizerBlochVector.setR3(v); }
- DoubleProperty& polarizerTransmission() { return m_polarizerTransmission; }
- const DoubleProperty& polarizerTransmission() const { return m_polarizerTransmission; }
- void setPolarizerTransmission(double v) { m_polarizerTransmission.setValue(v); }
-
VectorProperty& analyzerBlochVector() { return m_analyzerBlochVector; }
const VectorProperty& analyzerBlochVector() const { return m_analyzerBlochVector; }
void setAnalyzerBlochVector(const R3& v) { m_analyzerBlochVector.setR3(v); }
- DoubleProperty& analyzerTransmission() { return m_analyzerTransmission; }
- const DoubleProperty& analyzerTransmission() const { return m_analyzerTransmission; }
- void setAnalyzerTransmission(double v) { m_analyzerTransmission.setValue(v); }
-
bool isExpandInfo() const { return m_expandInfo; }
void setExpandInfo(bool b) { m_expandInfo = b; }
@@ -130,9 +122,6 @@ protected:
VectorProperty m_polarizerBlochVector;
VectorProperty m_analyzerBlochVector;
- DoubleProperty m_analyzerTransmission;
- DoubleProperty m_polarizerTransmission;
-
bool m_expandInfo = true;
bool m_expandPolarizerAlanyzer = true;
bool m_expandEnvironment = true;
diff --git a/GUI/Model/FromCore/ItemizeSimulation.cpp b/GUI/Model/FromCore/ItemizeSimulation.cpp
index 88f870b5c0279be74cf4d11ccdd95da046d14e7a..a89351fd4bf713abed4910a9d7212e711bd978f4 100644
--- a/GUI/Model/FromCore/ItemizeSimulation.cpp
+++ b/GUI/Model/FromCore/ItemizeSimulation.cpp
@@ -319,7 +319,6 @@ void setDetectorResolution(DetectorItem* detector_item, const IDetector& detecto
void setPolarizer2(InstrumentItem* instrument_item, const PolFilter& analyzer)
{
instrument_item->setAnalyzerBlochVector(analyzer.BlochVector());
- instrument_item->setAnalyzerTransmission(analyzer.transmission());
}
void updateDetector(GISASInstrumentItem* instrument_item, const IDetector& detector)
diff --git a/GUI/Model/Model/ParameterTreeUtil.cpp b/GUI/Model/Model/ParameterTreeUtil.cpp
index e75f714cc187c3caa39fcbde490a89a76ab4be2e..5fc9d8a481ba4e334be50f42dc732d7c5a65dbec 100644
--- a/GUI/Model/Model/ParameterTreeUtil.cpp
+++ b/GUI/Model/Model/ParameterTreeUtil.cpp
@@ -445,7 +445,5 @@ void ParameterTreeBuilder::addPolarization(ParameterLabelItem* instrumentLabel,
auto* label = new ParameterLabelItem("Polarization analysis", instrumentLabel);
addParameterItem(label, instrument->polarizerBlochVector());
- addParameterItem(label, instrument->polarizerTransmission());
addParameterItem(label, instrument->analyzerBlochVector());
- addParameterItem(label, instrument->analyzerTransmission());
}
diff --git a/GUI/View/Instrument/PolarizationAnalysisEditor.cpp b/GUI/View/Instrument/PolarizationAnalysisEditor.cpp
index 96d6e164cec3b72141562f4617446ce64c4a1121..e8b56bca05bd5707bca8e944ca1c20e7879a7953 100644
--- a/GUI/View/Instrument/PolarizationAnalysisEditor.cpp
+++ b/GUI/View/Instrument/PolarizationAnalysisEditor.cpp
@@ -35,10 +35,8 @@ PolarizationAnalysisEditor::PolarizationAnalysisEditor(QWidget* parent, Instrume
auto* formlayout = new QFormLayout(polarizerAnalyzerWidget);
formlayout->setFieldGrowthPolicy(QFormLayout::FieldsStayAtSizeHint);
- addPolarizerRow(formlayout, m_instrument->polarizerBlochVector(),
- m_instrument->polarizerTransmission());
- addPolarizerRow(formlayout, m_instrument->analyzerBlochVector(),
- m_instrument->analyzerTransmission());
+ addPolarizerRow(formlayout, m_instrument->polarizerBlochVector());
+ addPolarizerRow(formlayout, m_instrument->analyzerBlochVector());
layout->addWidget(polarizerAnalyzerWidget);
polarizerAnalyzerWidget->setVisible(m_instrument->withPolarizerAnalyzer());
@@ -67,8 +65,7 @@ DoubleSpinBox* PolarizationAnalysisEditor::createSpinBox(DoubleProperty& d)
return sb;
}
-void PolarizationAnalysisEditor::addPolarizerRow(QFormLayout* parentLayout, VectorProperty& d,
- DoubleProperty& t)
+void PolarizationAnalysisEditor::addPolarizerRow(QFormLayout* parentLayout, VectorProperty& d)
{
auto* layout = new QHBoxLayout;
@@ -81,9 +78,6 @@ void PolarizationAnalysisEditor::addPolarizerRow(QFormLayout* parentLayout, Vect
add(d.y());
add(d.z());
- layout->addWidget(new QLabel("transmission:"));
- layout->addWidget(createSpinBox(t));
-
layout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding));
parentLayout->addRow(d.label() + ":", layout);
diff --git a/GUI/View/Instrument/PolarizationAnalysisEditor.h b/GUI/View/Instrument/PolarizationAnalysisEditor.h
index 85fb12cdcdb9d8fb54458924e2ca737d429a6f45..3952ac52999dcdccb071f63fb4be1d5925e7eb22 100644
--- a/GUI/View/Instrument/PolarizationAnalysisEditor.h
+++ b/GUI/View/Instrument/PolarizationAnalysisEditor.h
@@ -37,7 +37,7 @@ signals:
private:
DoubleSpinBox* createSpinBox(DoubleProperty& d);
- void addPolarizerRow(QFormLayout* parentLayout, VectorProperty& d, DoubleProperty& t);
+ void addPolarizerRow(QFormLayout* parentLayout, VectorProperty& d);
InstrumentItem* m_instrument;
};