Parcourir la source

remove lowcounts judgement when in no xray mode.

gsp il y a 1 an
Parent
commit
fa63819323

+ 2 - 2
Bin/x64/Debug/Config/ProData/HardwareConfig.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData PathName="HardwareConfig.xml" ID="1">
-  <Member RegName="SemControllerName" Value="Oxford" ImageInputSources="SE" />
-  <Member RegName="EDSName" Value="Oxford" />
+  <Member RegName="SemControllerName" Value="OffLine" ImageInputSources="SE" />
+  <Member RegName="EDSName" Value="OffLine" />
   <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit64.dll" />
   <Member RegName="FEIIP" Value="192.168.0.1" />
   <Member RegName="FEIPORT" Value="7520" />

+ 7 - 12
OTSIncAMeasureApp/0-OTSModel/Measure/1-OTSInclution/SmplMeasureInclution.cs

@@ -41,7 +41,11 @@ namespace OTSModelSharp
                 for (int i = 0; i < nSize; ++i)
                 {
                     string libname = m_Sample.GetMsrParams().GetSTDName();
-                    ClassifyIncAParticle(anylysisparts[i], libname);
+                    if (!IsLowCounts(anylysisparts[i]))
+                    {
+                        ClassifyIncAParticle(anylysisparts[i], libname);
+                    }
+                   
                 }
 
 
@@ -75,19 +79,10 @@ namespace OTSModelSharp
             }
 
         }
+      
         public bool ClassifyIncAParticle(COTSParticleClr particle, string libname)// classify particles
         {
-            var thecount = particle.GetXray().GetTotalCount();
-            var expect = m_EDSController.GetExpectCount();
-
-
-            if (thecount <expect)
-            {
-                particle.SetType((int)OTS_PARTICLE_TYPE.LOW_COUNT);//4 represent "lowcount"
-                particle.SetTypeColor("#000000");
-                particle.SetTypeName("LowCounts");
-                return true;
-            }
+          
             int steelTech = (int)m_Sample.GetMsrParams().GetSteelTechnology();
             particle.SetType((int)OTS_PARTICLE_TYPE.UNCLASSIFY);
             if (m_Sample.GetMsrParams().GetSysSTDSwitch())

+ 1 - 7
OTSIncAMeasureApp/0-OTSModel/Measure/2-OTSCleanliness/SmplMeasureCleanliness.cs

@@ -93,13 +93,7 @@ namespace OTSModelSharp
            
                 IClassifyEngine engine = m_classifyEngine.GetExpressionClassifyEngine(libname);
  
-                if (pParticle.GetXray().GetTotalCount() < m_EDSController.GetExpectCount())
-                {
-                    pParticle.SetType((int)OTS_PARTICLE_TYPE.LOW_COUNT);//4 represent "lowcount"
-                    pParticle.SetTypeColor("#000000");
-                    pParticle.SetTypeName("LowCounts");
-                }
-                else 
+                if (!IsLowCounts(pParticle))               
                 {
                     if (engine.ClassifyByExpressionTemporarySpectrum(pParticle))
                     {

+ 21 - 1
OTSIncAMeasureApp/0-OTSModel/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -476,7 +476,27 @@ namespace OTSModelSharp
             return pBSEImage;
         }
 
-    
+        public bool IsLowCounts(COTSParticleClr particle)
+        {
+            COTSXRayParam pXRayParam = m_Sample.GetMsrParams().GetXRayParam();
+
+            if (pXRayParam.GetUsingXray() == true)
+            {
+                var thecount = particle.GetXray().GetTotalCount();
+                var expect = m_EDSController.GetExpectCount();
+
+
+                if (thecount < expect)
+                {
+
+                    particle.SetType((int)OTS_PARTICLE_TYPE.LOW_COUNT);//4 represent "lowcount"
+                    particle.SetTypeColor("#000000");
+                    particle.SetTypeName("LowCounts");
+                    return true;
+                }
+            }
+            return false;
+        }
         public virtual void ClassifyFieldParticles(COTSFieldData curFldData)
         {
             return;

+ 5 - 1
OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -373,10 +373,11 @@
     <Reference Include="SourceGrid, Version=4.40.7083.30975, Culture=neutral, PublicKeyToken=df6f5e538749e85d, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\OpenDll\WordApiDll\SourceGrid.dll</HintPath>
-      <Private>True</Private>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System">
       <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
@@ -401,13 +402,16 @@
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Runtime.Serialization" />