Merge branch 'release2.1' into cxs

OTSIncAMeasureApp/0-OTSModel/Measure/2-OTSCleanliness/SmplMeasureCleanliness.cs

@@ -266,17 +266,24 @@ namespace OTSModelSharp
         {
             try
             {
-
-                var quantifyparts = mergedParts;
-                int nSize = quantifyparts.Count();
-
-                // go through all analysis particles
-                for (int i = 0; i < nSize; ++i)
+                try
                 {
+                   
                     string libname = m_Sample.GetMsrParams().GetSTDName();
-                    ClassifyQuantifyParticles(quantifyparts, libname);
+                    if (libname != "NoSTDDB")
+                    {
+                        log.Info("Begin to classify big particles!Using " + libname);
+                        var bigparts = mergedParts;
+                        ClassifyQuantifyParticles(bigparts, libname);
+                       
+                     
+
+                    }
+                }
+                catch (Exception e)
+                {
+                    log.Info("calcu the particle image property or classify failed. " + e.Message);
                 }
-
 
             }
             catch (Exception e)