Changeset 4508

Timestamp:

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

Author:

merck

Message:

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

Location:

trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol

Files:

• activemirrorcontrol.cpp (modified) (1 diff)
• amccmdserversocket.cpp (modified) (1 diff)
• amcdefs.h (modified) (1 diff)
• amcmirrorpanel.cpp (modified) (5 diffs)
• laseradjustthread.cpp (modified) (3 diffs)

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

@@ -193 +193 @@
   int iStateCaCo, iStateCalib, iStateSentinel, iStateHVPS, iStateLid;
   int iStateLV, iStateCool, iStateHV, iStateDC, iStateCaosLEDs;
-  int iStateFADCFans, iStateCalCan, iStateCalIO, iStateCalLV, iStateAMCLEDs;
+  int iStateFADCFans, iStateCalCan, iStateCalIO, iStateCalLV;
   qts >> iStateCaCo >> iStateCalib >> iStateSentinel >> iStateHVPS >> iStateLid;
   qts >> iStateLV >> iStateCool >> iStateHV >> iStateDC >> iStateCaosLEDs;
-  qts >> iStateFADCFans >> iStateCalCan >> iStateCalIO >> iStateCalLV >> iStateAMCLEDs;
+  qts >> iStateFADCFans >> iStateCalCan >> iStateCalIO >> iStateCalLV;
   int iStateAMC, iStateHEAT;
   qts >> iStateAMC >> iStateHEAT;
   int iStateLIDAR, iStateOptical, iStateL2T, iStateAUX, iStateGRB;
   qts >> iStateLIDAR >> iStateOptical >> iStateL2T >> iStateAUX >> iStateGRB;
+  int iStateAMCLEDs;
+        qts >> iStateAMCLEDs;
         double dZd, dAz, dDec, dRA;
         qts >> dZd >> dAz >> dDec >> dRA;

trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/amccmdserversocket.cpp

@@ -59 +59 @@
                         m_qtTimer.stop();
                         m_qtTimer.start( CC_REPORT_TIMEOUT, true );
-//                      qDebug( msg );
+                        qDebug( msg );
                         emit reportFromCC( msg );
 //                      m_pParent->setAMCState( iStatus );

trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/amcdefs.h

@@ -16 +16 @@
  ***************************************************************************/
 
-#define AMC_VERSION             "2.01"
+#define AMC_VERSION             "2.03"
 
 #define CAMERA_X                344.0 //                        

trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/amcmirrorpanel.cpp

@@ -209 +209 @@
         double dX = p_dX;
         double dY = p_dY;
+        double dAlpha1 = atan( getSlopeX() );
+        double dAlpha2 = atan( getSlopeY() );
+
         if( m_zReversed )
         {
                 dX = p_dY;
                 dY = p_dX;
+//              dAlpha1 = atan( getSlopeY() );
+//              dAlpha2 = atan( getSlopeX() );
         }
-//      qDebug("Dx Dy: %4.0f %4.0f", dX, dY );  
-
-        double dAlpha1 = atan( getSlopeX() );
-        double dAlpha2 = atan( getSlopeY() );
-//      qDebug("alpha1, alpha2: %7.2f %7.2f", dAlpha1 * 180.0 / 3.1415, dAlpha2 * 180.0 / 3.1415 );     
+        qDebug("Dx Dy: %5.1f %5.1f", dX, dY );  
+        qDebug("SlopeX, SlopeY: %7.4f %7.4f", getSlopeY(), getSlopeX() );       
+        qDebug("alpha1, alpha2: %7.2f %7.2f", dAlpha1 * 180.0 / 3.1415, dAlpha2 * 180.0 / 3.1415 );     
 
         double dSinA1 = sin( dAlpha1 );
@@ -228 +231 @@
         dFacX /= ( dCosA1 - dSinA1 * dCosA2 / dSinA2 );
         double dFacY = ( dY - dFacX * dSinA1 ) / dSinA2;
-//      qDebug("Factor x,y: %8.2f %8.2f", dFacX, dFacY );       
-
+        qDebug("Factor x,y: %8.2f %8.2f", dFacX, dFacY );       
+
+        p_iStepsX = (int) ( dFacX * getConversionX() );
+        p_iStepsY = (int) ( dFacY * getConversionY() );
         if( m_zReversed )
         {
-                p_iStepsY = (int) ( dFacY * getConversionY() );
-                p_iStepsX = (int) ( dFacX * getConversionX() );
-        }
-        else
-        {
-                p_iStepsX = (int) ( dFacX * getConversionX() );
-                p_iStepsY = (int) ( dFacY * getConversionY() );
+                if(getSlopeX() < 0.0)
+                        p_iStepsX = (int) ( dFacX * -1.0 * getConversionX() );
+                if(getSlopeY() < 0.0)
+                        p_iStepsY = (int) ( dFacY * -1.0 * getConversionY() );
         }
 
@@ -253 +255 @@
 void AMCMirrorPanel::getCorrectedRef( double& p_dRefX, double& p_dRefY )
 {
-        const double  kPixelperMMX = 0.44;
+        const double  kPixelperMMX = -0.44;
         const double  kPixelperMMY = 0.44;
 
@@ -270 +272 @@
 
         /*      
-         * We assumethat the video camera is horizontally alligned with mirror dish.
+         * We assume that the video camera is horizontally alligned with mirror dish.
          * If we have a rotation of the video image in respect to the mirror frame we
          * must add an extra correction here.
-         * As the coordinate system of the video image has a reversed Y axis ( 0rign being
+         * As the coordinate system of the video image has a reversed Y axis ( origin being
          * the upper left corner) we have to multiply the Y correction with -1. to get the right
          * sign.
@@ -280 +282 @@
         double dCorrSpotY = -1.0 * cos( dZeta ) * dCorrection;
 
-        p_dRefX += dCorrSpotY * kPixelperMMX;
-        p_dRefY += dCorrSpotY * kPixelperMMY;
+  p_dRefX += dCorrSpotX * kPixelperMMX;
+  p_dRefY += dCorrSpotY * kPixelperMMY;
         qDebug( "Laser spot position after applying correction:   %f %f", p_dRefX, p_dRefY );
 }

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 );