Changeset 19646 for trunk/Mars

Timestamp:

09/15/19 22:20:35 (5 years ago)

Author:

tbretz

Message:

Replaces gLog by *fLog, try-and-error debugging (using d=10 and d=20) what the correct focal distance is, fixed a bug in FindPeak (accessing fGroove[-1] does not work)

File:

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

trunk/Mars/msimreflector/MFresnelLens.cc

@@ -244 +244 @@
 
         if (z<-fH)
-            gLog << warn << "Groove " << i << " deeper (" << z << ") than thickness of lens material (" << fH << ")." << endl;
+            *fLog << warn << "Groove " << i << " deeper (" << z << ") than thickness of lens material (" << fH << ")." << endl;
     }
 
@@ -292 +292 @@
         if (trans>1)
         {
-            gLog << err << "Transmission larger than 1." << endl;
+            *fLog << err << "Transmission larger than 1." << endl;
             return -1;
         }
@@ -310 +310 @@
             if (trans>1)
             {
-                gLog << warn << "Transmission at " << lambda << "nm (" << trans << ") after Fresnel correction larger than 1." << endl;
+                *fLog << warn << "Transmission at " << lambda << "nm (" << trans << ") after Fresnel correction larger than 1." << endl;
                 trans = 1;
             }
@@ -377 +377 @@
     // from the entrance of the lens => FIXME: To be checked
     const double rn = n1/n0;
-    const double c = (rn - 1) * (F + d/rn); // FIXME
+    const double c = (rn - 1) * (F + d/rn); // FIXME: try and error with a large d
     return -atan(r/c);
+
+    // F = 50.21
+    //       d= 10        d=20
+    // -:    47           43.7
+    // 0:    53.5         57.0
+    // +:    60.3         70.3
 }
 
@@ -693 +699 @@
         const int step = outgoing ^ !first ? 1 : -1;
         const int end  = outgoing ^ !first ? fGrooves.size() : 1;
-        const int beg  = j==0 ? ix : ix+(step);
+        const int beg  = j==0 ? ix : ix+step;
+
+        if (step==-1 && ix==1) // can not count downwards from here
+            continue;
 
         for (int i=beg; i!=end; i+=step)
@@ -1377 +1386 @@
         (lambda<fAbsorptionLength.GetXmin() || lambda>fAbsorptionLength.GetXmax()))
         {
-            gLog << err << "Wavelength " << lambda << "nm out of absorption range [" << fAbsorptionLength.GetXmin() << "nm;" << fAbsorptionLength.GetXmax() << "nm]" << endl;
+            *fLog << err << "Wavelength " << lambda << "nm out of absorption range [" << fAbsorptionLength.GetXmin() << "nm;" << fAbsorptionLength.GetXmax() << "nm]" << endl;
             return -1;
         }
@@ -1444 +1453 @@
         // 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);
+        //p.fVectorPart.SetZ(fH-fH/2/fN);//fH/2); Found by try-and-error
+
+        // We are already at -H, adding F and setting Z=0 means going to -(F+H)
+        p.fVectorPart.SetZ(0);//fH/2); Found by try-and-error
 
         return cnt>=fMinHits && (fMaxHits==0 || cnt<=fMaxHits) ? cnt : -1;;
@@ -1488 +1500 @@
         (lambda<fAbsorptionLength.GetXmin() || lambda>fAbsorptionLength.GetXmax()))
         {
-            gLog << err << "Wavelength " << lambda << "nm out of absorption range [" << fAbsorptionLength.GetXmin() << "nm;" << fAbsorptionLength.GetXmax() << "nm]" << endl;
+            *fLog << err << "Wavelength " << lambda << "nm out of absorption range [" << fAbsorptionLength.GetXmin() << "nm;" << fAbsorptionLength.GetXmax() << "nm]" << endl;
             return -1;
         }
@@ -1558 +1570 @@
     {
         if (verbose)
-            gLog << all << e.id() << ": " << e.what() << endl;
+            *fLog << all << e.id() << ": " << e.what() << endl;
 
         // Hit point at bottom surface beyond allowed range