|
|
@@ -479,7 +479,7 @@ namespace OTSClassifyEngine
|
|
|
a_nIncId = OTS_PARTICLE_TYPE::INVALID;
|
|
|
return TRUE;
|
|
|
}
|
|
|
- if (dPWeight > 0 || dNaWeight > 0 || dFWeight > 0)// contain any of P Na or F then set it as invalid.
|
|
|
+ if (dPWeight > 0 || dNaWeight > 0)// contain any of P Na then set it as invalid.
|
|
|
{
|
|
|
a_nIncId = OTS_PARTICLE_TYPE::INVALID;
|
|
|
return TRUE;
|
|
|
@@ -2378,13 +2378,13 @@ namespace OTSClassifyEngine
|
|
|
double dFirstElMolar = pKeyElChem->GetMolarPercentage();//Al
|
|
|
double dSecondElMolar = pKeyElChem2->GetMolarPercentage();//Ca
|
|
|
double dRatio = dFirstElMolar/dSecondElMolar ;// Al/Ca
|
|
|
- if (dRatio < 1.3 || dRatio > 0.9)//12CaO-7Al2O3 14/12
|
|
|
+ if (dRatio < 1.2 || dRatio > 1.0)//12CaO-7Al2O3 14/12
|
|
|
{
|
|
|
// not a Spinel, return FALSE
|
|
|
strName = ALUMINATE12CaO_7Al2O3_STR;
|
|
|
return TRUE;
|
|
|
}
|
|
|
- if (dRatio < 0.9 || dRatio > 0.4)//3CaO-Al2O3 2/3
|
|
|
+ if (dRatio < 0.9 || dRatio > 0.6)//3CaO-Al2O3 2/3
|
|
|
{
|
|
|
// not a Spinel, return FALSE
|
|
|
strName = ALUMINATE3CaO_Al2O3_STR;
|
