|
@@ -1477,7 +1477,7 @@ namespace Extender
|
|
private IEdSpectrumProcessing EdSpectrumProcessing = null;
|
|
private IEdSpectrumProcessing EdSpectrumProcessing = null;
|
|
// Use the autoIdSettings to define elements that are known or elements that you want to exclude. They also list elements that cannot be identified
|
|
// Use the autoIdSettings to define elements that are known or elements that you want to exclude. They also list elements that cannot be identified
|
|
private IAutoIdSettings autoIdSettings = null;
|
|
private IAutoIdSettings autoIdSettings = null;
|
|
- private ISEMQuantSettings settings = null;
|
|
|
|
|
|
+ private ISEMQuantSettings quantSettings = null;
|
|
|
|
|
|
private int XRayChannelLength = 2000;
|
|
private int XRayChannelLength = 2000;
|
|
private long[] m_XrayData = null;
|
|
private long[] m_XrayData = null;
|
|
@@ -1495,7 +1495,7 @@ namespace Extender
|
|
EdSpectrumProcessing = ProcessingFactory.CreateSpectrumProcessing();
|
|
EdSpectrumProcessing = ProcessingFactory.CreateSpectrumProcessing();
|
|
// Use the autoIdSettings to define elements that are known or elements that you want to exclude. They also list elements that cannot be identified
|
|
// Use the autoIdSettings to define elements that are known or elements that you want to exclude. They also list elements that cannot be identified
|
|
autoIdSettings = ProcessingFactory.CreateAutoIdSettings();
|
|
autoIdSettings = ProcessingFactory.CreateAutoIdSettings();
|
|
- settings = ProcessingFactory.CreateSEMQuantSettings();
|
|
|
|
|
|
+ quantSettings = ProcessingFactory.CreateSEMQuantSettings();
|
|
|
|
|
|
EdSpectrumAcquisitionController.ExperimentFinished += this.OnEdSpectrumExperimentFinished;
|
|
EdSpectrumAcquisitionController.ExperimentFinished += this.OnEdSpectrumExperimentFinished;
|
|
//EdSpectrumAcquisitionController.ExperimentStarted += this.OnEdSpectrumExperimentStarted;
|
|
//EdSpectrumAcquisitionController.ExperimentStarted += this.OnEdSpectrumExperimentStarted;
|
|
@@ -1522,7 +1522,7 @@ namespace Extender
|
|
EdSpectrumSettings.EdSettings.EnergyRange = 20;
|
|
EdSpectrumSettings.EdSettings.EnergyRange = 20;
|
|
EdSpectrumSettings.EdSettings.NumberOfChannels = 4096;
|
|
EdSpectrumSettings.EdSettings.NumberOfChannels = 4096;
|
|
|
|
|
|
- //EdSpectrumSettings.ScanSettings.AcquisitionRegion.CreateFullFieldRegion(1.0 / 1024.0);
|
|
|
|
|
|
+ // EdSpectrumSettings.ScanSettings.AcquisitionRegion.CreateFullFieldRegion(1.0 / 1024.0);
|
|
}
|
|
}
|
|
|
|
|
|
void SetPointAcquistionRegion(double a_nX, double a_nY)
|
|
void SetPointAcquistionRegion(double a_nX, double a_nY)
|
|
@@ -1601,9 +1601,9 @@ namespace Extender
|
|
|
|
|
|
EdSpectrumProcessing.IdentifyElements(e.Value, autoIdSettings);
|
|
EdSpectrumProcessing.IdentifyElements(e.Value, autoIdSettings);
|
|
// While it is possible to choose other elements, Oxygen is the only supported element by stoichiometry.
|
|
// While it is possible to choose other elements, Oxygen is the only supported element by stoichiometry.
|
|
- settings.CombinedElement = 8;
|
|
|
|
- settings.Normalised = true;
|
|
|
|
- ISEMQuantStatus quantStatus = EdSpectrumProcessing.SEMQuantifySpectrum(e.Value, settings);//(a_nChannelData, OIHelper::SEMQuantSettings);
|
|
|
|
|
|
+ quantSettings.CombinedElement = 8;
|
|
|
|
+ quantSettings.Normalised = true;
|
|
|
|
+ ISEMQuantStatus quantStatus = EdSpectrumProcessing.SEMQuantifySpectrum(e.Value, quantSettings);//(a_nChannelData, OIHelper::SEMQuantSettings);
|
|
IEnumerable < ISEMQuantResult > Results = quantStatus.Results;
|
|
IEnumerable < ISEMQuantResult > Results = quantStatus.Results;
|
|
|
|
|
|
//Get element result for single point
|
|
//Get element result for single point
|