Changeset 19644

Timestamp:

09/15/19 18:32:35 (5 years ago)

Author:

tbretz

Message:

Added some comments and tried to adapt the geometry to what I would expect to be correct.

File:

• trunk/Mars/msimreflector/MFresnelLens.cc (modified) (3 diffs)

trunk/Mars/msimreflector/MFresnelLens.cc

@@ -352 +352 @@
 // on the curvature. See also PhD thesis, Tim Niggemann ch. 7.1.1.
 //
+// see also W.J.Smith, Modern Optical Engineering, 2.8 The "Thin Lens"
+// 1/f = (n-1)/radius   Eq. 2.36   with thickness t = 0
+// bfl = f              Eq. 2.37    and R2 = inf (c2 = 0)
+//
 // Parameters are:
 // The distance from the center r
@@ -367 +371 @@
 double MFresnelLens::SlopeAngleParabolic(double r, double F, double n0, double n1, double d)
 {
-    // PhD, Tim Niggemann, ch 7.1.1
+    // In the datasheet, it looks as if F is calculated
+    // towards the center of the lens. It seems things are more
+    // consistent if the thickness correction in caluating the
+    // slope angle is omitted and the focal distance is measured
+    // from the entrance of the lens => FIXME: To be checked
     const double rn = n1/n0;
-    const double c = (rn - 1) * (F + d/rn);
+    const double c = (rn - 1) * (F + d/rn); // FIXME
     return -atan(r/c);
 }
@@ -1431 +1439 @@
 
         // In the datasheet, it looks as if F is calculated
-        // towards the center of the lens
-        // (Propagating to F means not propagating a distance of F-H/2)
-        p.fVectorPart.SetZ(0);
+        // towards the center of the lens. It seems things are more
+        // consistent if the thickness correction in caluating the
+        // slope angle is omitted and the focal distance is measured
+        // from the entrance of the lens => FIXME: To be checked
+        // (Propagating to F means not propagating a distance of F-H from the exit)
+        p.fVectorPart.SetZ(fH/2);
 
         return cnt>=fMinHits && (fMaxHits==0 || cnt<=fMaxHits) ? cnt : -1;;