Changeset 19608


Ignore:
Timestamp:
Sep 2, 2019, 11:13:42 PM (2 weeks ago)
Author:
tbretz
Message:
Trying to be more consistent
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/msimreflector/MFresnelLens.cc

    r19607 r19608  
    103103
    104104   // Radius at distance z+dz from the tip and at distance r from the axis of the cone
    105    // r = (z-dz) * tan(theta)
     105   // r = (z+dz) * tan(theta)
    106106
    107107   // Defining
     
    124124   // (dz*u.x+p.x)^2 + (dz*u.y+p.y)^2 = (z-dz)^2 * tan(theta)^2
    125125   //
    126    // dz^2*ux^2 + px^2 + 2*dz*ux*px + dz^2*uy^2 + py^2 + 2*dz*uy*py = (z^2*tan(theta)^2 + dz^2*tan(theta)^2 - 2*z*dz*tan(theta)^2
     126   // dz^2*ux^2 + px^2 + 2*dz*ux*px + dz^2*uy^2 + py^2 + 2*dz*uy*py = (z^2*tan(theta)^2 + dz^2*tan(theta)^2 + 2*z*dz*tan(theta)^2
    127127   //
    128    // dz^2*(ux^2 + uy^2 - tan(theta)^2)  +  2*dz*(ux*px + uy*py + z*tan(theta)^2)  +  (px^2+py^2 - z^2*tan(theta)^2)  =  0
     128   // dz^2*(ux^2 + uy^2 - tan(theta)^2)  +  2*dz*(ux*px + uy*py - z*tan(theta)^2)  +  (px^2+py^2 - z^2*tan(theta)^2)  =  0
    129129
    130130   // t   := tan(theta)
     
    137137
    138138    const double a = u.R2()                    - g.fTanTheta2[0];
    139     const double B = u.XYvector()*p.XYvector() + g.fTanTheta2[1];
     139    const double B = u.XYvector()*p.XYvector() - g.fTanTheta2[1];
    140140    const double c = p.R2()                    - g.fTanTheta2[2];
    141141
     
    266266    const double theta = atan(so / (1-sqrt(n0*n0 - so*so)));
    267267
    268     //             theta                   peak_z (defined positive)
    269     const Groove g(TMath::Pi()/2 + theta, -r0*tan(theta));
     268    //             theta                   peak_z
     269    const Groove g(TMath::Pi()/2 + theta, r0*tan(theta));
    270270
    271271    // Calculate the insersection between the ray and the cone
Note: See TracChangeset for help on using the changeset viewer.