|
@@ -532,7 +532,7 @@ namespace OTSClassifyEngine
|
|
|
}
|
|
|
|
|
|
// process mapping if sulfur amount enough
|
|
|
- CElementChemistriesList a_listChemistriesToAnalysis;
|
|
|
+ CElementChemistriesList listChemistriesToAnalysis;
|
|
|
CString strProMappingSulName = _T("");
|
|
|
BOOL bProMapped = FALSE;
|
|
|
if (dSulMolar100 > MIN_SUL_MOLAR)
|
|
@@ -546,14 +546,14 @@ namespace OTSClassifyEngine
|
|
|
{
|
|
|
//remove the Mg element first
|
|
|
CElementChemistryPtr pElChemMg = GetNamedElementChemistry(a_listElChemsIncNoFe, INC_SUL_SUB_ELEMENT_NAMES[2]);
|
|
|
- CElementChemistriesList a_listChemistriesToAnalysis;
|
|
|
+
|
|
|
if (pElChemMg)
|
|
|
{
|
|
|
for (auto el : a_listElChemsIncNoFe)
|
|
|
{
|
|
|
if (!el->GetName().CompareNoCase(INC_SUL_SUB_ELEMENT_NAMES[2]))
|
|
|
{
|
|
|
- a_listChemistriesToAnalysis.push_back(el);
|
|
|
+ listChemistriesToAnalysis.push_back(el);
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -561,7 +561,7 @@ namespace OTSClassifyEngine
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- a_listChemistriesToAnalysis = a_listElChemsIncNoFe;
|
|
|
+ listChemistriesToAnalysis = a_listElChemsIncNoFe;
|
|
|
}
|
|
|
// try to get Ca element chemistry
|
|
|
CElementChemistryPtr pElChemCa = GetNamedElementChemistry(a_listElChemsIncNoFe, INC_SUL_SUB_ELEMENT_NAMES[1]);
|
|
@@ -597,7 +597,7 @@ namespace OTSClassifyEngine
|
|
|
{
|
|
|
if (!el->GetName().CompareNoCase(INC_SUL_SUB_ELEMENT_NAMES[1]))
|
|
|
{
|
|
|
- a_listChemistriesToAnalysis.push_back(el);
|
|
|
+ listChemistriesToAnalysis.push_back(el);
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -605,7 +605,7 @@ namespace OTSClassifyEngine
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- a_listChemistriesToAnalysis = a_listElChemsIncNoFe;
|
|
|
+ listChemistriesToAnalysis = a_listElChemsIncNoFe;
|
|
|
}
|
|
|
// try to get Mg element chemistry
|
|
|
CElementChemistryPtr pElChemMg = GetNamedElementChemistry(a_listElChemsIncNoFe, INC_SUL_SUB_ELEMENT_NAMES[2]);
|
|
@@ -718,7 +718,7 @@ namespace OTSClassifyEngine
|
|
|
|
|
|
// check if the rest element chemistries map an oxide
|
|
|
int nIncId = (int)OTS_PARTICLE_TYPE::INVALID;
|
|
|
- if (!OxideClassify(a_pPartSTDData, a_listChemistriesToAnalysis, a_dMolarSumNoFe, nIncId))
|
|
|
+ if (!OxideClassify(a_pPartSTDData, listChemistriesToAnalysis, a_dMolarSumNoFe, nIncId))
|
|
|
{
|
|
|
// something wrong
|
|
|
LogErrorTrace(__FILE__, __LINE__, _T("COTSClassifyEng::SulClassify: failed to call OxideClassify method."));
|