Browse Source

remove useless connect trying code.

GZ 2 years ago
parent
commit
31d194b147

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

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

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

@@ -108,14 +108,14 @@ namespace OTSModelSharp
            
            
             var pSEMCtrl = m_pMsrThread.GetSEMController();
             var pSEMCtrl = m_pMsrThread.GetSEMController();
          
          
-            if (!pSEMCtrl.IsConnected())
-            {
-                if (!pSEMCtrl.Connect())
-                {
-                    log.Error("SetSEMDataMrs: can't connect SEM.");
-                    return false;
-                }
-            }
+            //if (!pSEMCtrl.IsConnected())
+            //{
+            //    if (!pSEMCtrl.Connect())
+            //    {
+            //        log.Error("SetSEMDataMrs: can't connect SEM.");
+            //        return false;
+            //    }
+            //}
           
           
             pSEMCtrl.SetMagnification(dMag);
             pSEMCtrl.SetMagnification(dMag);
             pSEMCtrl.SetWorkingDistance(dWorkDis);
             pSEMCtrl.SetWorkingDistance(dWorkDis);
@@ -252,14 +252,14 @@ namespace OTSModelSharp
 
 
 
 
             // get SEM controller
             // get SEM controller
-            if (!pSEMController.IsConnected())
-            {
-                if (!pSEMController.Connect())
-                {
-                    log.Error("SetBSEParam: can't connect SEM.");
-                    return false;
-                }
-            }
+            //if (!pSEMController.IsConnected())
+            //{
+            //    if (!pSEMController.Connect())
+            //    {
+            //        log.Error("SetBSEParam: can't connect SEM.");
+            //        return false;
+            //    }
+            //}
 
 
             // get dwell time 
             // get dwell time 
             OTS_IMAGE_SCANSPEED_OPTIONS nDwellTime = pImgScanParam.GetScanImageSpeed();
             OTS_IMAGE_SCANSPEED_OPTIONS nDwellTime = pImgScanParam.GetScanImageSpeed();
@@ -464,14 +464,14 @@ namespace OTSModelSharp
             }
             }
 
 
 
 
-            if (!pSEMController.IsConnected())
-            {
-                if (!pSEMController.Connect())
-                {
-                    log.Error("MoveSEMToPoint: can't connect SEM.");
-                    return false;
-                }
-            }
+            //if (!pSEMController.IsConnected())
+            //{
+            //    if (!pSEMController.Connect())
+            //    {
+            //        log.Error("MoveSEMToPoint: can't connect SEM.");
+            //        return false;
+            //    }
+            //}
             log.Info("Begin to move SEM stage to " + a_SEMpt.X + "," + a_SEMpt.Y);
             log.Info("Begin to move SEM stage to " + a_SEMpt.X + "," + a_SEMpt.Y);
            
            
             // move SEM to the position (rotation 0)
             // move SEM to the position (rotation 0)