Merge branch 'Release2.4' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.4

OTSIncAMeasureApp/0-OTSModel/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -859,6 +859,9 @@ namespace OTSModelSharp
             {
                 log.Info("Begin to collect particle's xray data!");
                 Thread.Sleep(100);
+
+                m_EDSHardwareMgr.SetResolution(a_pBSEImg.GetWidth(), a_pBSEImg.GetHeight());
+
                 CollectParticlesXrayData(curFldData);
 
                 Thread.Sleep(100);