Changeset 4508 for trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/laseradjustthread.cpp

Timestamp:

08/05/04 06:01:46 (20 years ago)

Author:

merck

Message:

MMerck: Small bug fixes when testing.
MMerck: Version 2.03

File:

• trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/laseradjustthread.cpp (modified) (3 diffs)

trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/laseradjustthread.cpp

@@ -100 +100 @@
 
                 // check if the laser adjustment converged
-                double dX,dY;
                 getSpot();
-                getDistToRef(dX, dY);
                 int x,y;
                 calcSteps( x, y );
@@ -109 +107 @@
                 m_pPanel->setLaserOn( false );
 
+                double dRefX, dRefY;
+                m_pPanel->getCorrectedRef( dRefX, dRefY );
+                double dX, dY;
+                dX = dRefX - m_dSpotX;
+                dY = dRefY - m_dSpotY;
+                
                 if( (fabs(dX) > 1.5) || (fabs(dY) > 1.5) )
                 {
@@ -214 +218 @@
         double dRefX;
         double dRefY;
-//      dRefX = m_pPanel->getLaserX();
-//      dRefY = m_pPanel->getLaserY();
         m_pPanel->getCorrectedRef( dRefX, dRefY );