Changeset 4741 for trunk/MagicSoft/Mars/mstarcam

Timestamp:

08/26/04 14:13:36 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mstarcam/MStarCamTrans.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/mstarcam/MStarCamTrans.cc

@@ -829 +829 @@
     //gLog << "mmtodeg = " << mmtodeg << endl;
 
+    // aberr   is the ratio r_optaberr/r_ideal between 
+    //         the distance from the camera center with optical aberration and
+    //         the distance from the camera center with an ideal imaging
+    // the value 1.07 is valid if the expected position (with aberration)
+    // in the camera is calculated as the average of the positions obtained
+    // from the reflections at the individual mirrors
+    Double_t aberr = 1.07;
+
     //--------------------------------------------------------------------
 
@@ -937 +945 @@
         Loc0LocToCam(theta0, phi0, theta[j], phi[k],
                            xx, yy);
-        x[k] = xx * mmtodeg;
-        y[k] = yy * mmtodeg;
+        x[k] = xx * mmtodeg * aberr;
+        y[k] = yy * mmtodeg * aberr;
 
         //gLog << "theta0, phi0 = " << theta0 << ",  " << phi0 
@@ -1003 +1011 @@
         Loc0LocToCam(theta0, phi0, theta1[j], phi1[k],
                            xx, yy);
-        x1[count] = xx * mmtodeg;
-        y1[count] = yy * mmtodeg;
+        x1[count] = xx * mmtodeg * aberr;
+        y1[count] = yy * mmtodeg * aberr;
 
         //gLog << "theta0, phi0 = " << theta0 << ",  " << phi0 
@@ -1103 +1111 @@
         Cel0CelToCam(dec0, hh0, dec[j], hx,
                            xx, yy);
-        xh[k] = xx * mmtodeg;
-        yh[k] = yy * mmtodeg;
+        xh[k] = xx * mmtodeg * aberr;
+        yh[k] = yy * mmtodeg * aberr;
 
         //gLog << "dec0, h0 = " << dec0 << ",  " << h0 
@@ -1172 +1180 @@
         Cel0CelToCam(dec0, hh0, dec1[j], hhx,
                            xx, yy);
-        xd[count] = xx * mmtodeg;
-        yd[count] = yy * mmtodeg;
+        xd[count] = xx * mmtodeg * aberr;
+        yd[count] = yy * mmtodeg * aberr;
 
         //gLog << "dec0, h0 = " << dec0 << ",  " << h0 
@@ -1224 +1232 @@
     return kTRUE;
 }
+