Changeset 5283

Timestamp:

10/18/04 18:48:57 (20 years ago)

Author:

merck

Message:

MMerck: Added code to simulate infinity focusing by adding an
MMerck: extra correction to the location of the focal plane.

File:

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

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

@@ -17 +17 @@
 #include <math.h>
 #include <qstring.h>
+
+extern bool         g_zInfinityFocus;
 
 AMCMirrorPanel::AMCMirrorPanel( int i, int j, int iType, int iPort, int iBox, int iDriver)
@@ -66 +68 @@
                                                                                                                                                                         // paper or styropor surface) to the PMT camera
                                                                                                                                                                         // plane (front of winston cone surface)
+  const double kDistInfinityFocus = 30.0; // Difference in focal plane for
+                                                                                                                                                                        // 10 km and infinity focusing.
 
         /*
@@ -199 +203 @@
    */
   double dFocus = kDistMirror + kFocPlaneRoque;
-  double dCorrection2 = (dMirrorRadius / (dFocus - dHeightMirror - kDistWinstonCones) ) * kDistWinstonCones;
+  double dFocusShift;
+  if ( g_zInfinityFocus )
+          dFocusShift = kDistWinstonCones + kDistInfinityFocus;
+  else
+          dFocusShift = kDistWinstonCones;
+
+  double dCorrection2 = (dMirrorRadius / (dFocus - dHeightMirror - dFocusShift) ) * dFocusShift;
 
         return ( (dCorrection1 + dCorrection2) / 2.0 );