Index: trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/amcmirrorpanel.cpp
===================================================================
--- trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/amcmirrorpanel.cpp	(revision 5282)
+++ trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/amcmirrorpanel.cpp	(revision 5283)
@@ -17,4 +17,6 @@
 #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,4 +68,6 @@
 																					// 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,5 +203,11 @@
    */
   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 );