Changeset 1359


Ignore:
Timestamp:
06/12/02 17:27:13 (22 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/WuerzburgSoft/Thomas/mphys
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WuerzburgSoft/Thomas/mphys/Changelog

    r1357 r1359  
    55     - added a primitive theta dependancy to DoInvCompton
    66     - added DrawInteractionLength
     7     - changed algorithm in ZofR and RofZ
    78     
    89   * MParticle.[h,cc]:
  • trunk/WuerzburgSoft/Thomas/mphys/MParticle.cc

    r1357 r1359  
    2929Double_t MParticle::ZofR(Double_t *x, Double_t *k)
    3030{
     31    /*
     32     const Double_t c  = 299792458;        // [m/s]
     33     const Double_t H0 = 50./3.0857e19;    // [km / Mpc s] --> [s^-1]
     34
     35     const Double_t ly = 3600.*24.*365.*c; // [m/ly]
     36     const Double_t pc = 1./3.258;         // [pc/ly]
     37     const Double_t r  = x[0] /pc*ly*1e3;  // [m]
     38
     39     const Double_t R = r*H0/c;            // [1]
     40
     41     return (R+1+sqrt(R*2+1))/2 - 1;
     42    */
    3143    const Double_t c  = 299792458;        // [m/s]
    3244    const Double_t H0 = 50./3.0857e19;    // [km / Mpc s] --> [s^-1]
     
    3648    const Double_t r  = x[0] /pc*ly*1e3;  // [m]
    3749
    38     const Double_t R = r*H0/c;            // [1]
     50    const Double_t R = 1./(1-r*H0/c/2);   // [1]
    3951
    40     return (R+1+sqrt(R*2+1))/2 - 1;
     52
     53    return R*R - 1;
    4154}
    4255
    4356Double_t MParticle::RofZ(Double_t *x, Double_t *k)
    4457{
    45     Double_t z1 = x[0] + 1;
     58    /*
     59     Double_t z1 = x[0] + 1;
    4660
    47     const Double_t c  = 299792458;                 // [m/s]
    48     const Double_t H0 = 50./3.0857e19;             // [km / Mpc s] --> [s^-1]
     61     const Double_t c  = 299792458;                 // [m/s]
     62     const Double_t H0 = 50./3.0857e19;             // [km / Mpc s] --> [s^-1]
    4963
    50     const Double_t ly = 3600.*24.*365.*c;          // [m/ly]
    51     const Double_t pc = 1./3.258;                  // [pc/ly]
     64     const Double_t ly = 3600.*24.*365.*c;          // [m/ly]
     65     const Double_t pc = 1./3.258;                  // [pc/ly]
    5266
    53     const Double_t R = c/H0 * 2 * (z1 - sqrt(z1)); // [m]
     67     const Double_t R = c/H0 * 2 * (z1 - sqrt(z1)); // [m]
    5468
    55     return  R * pc/ly/1e3;                   // [kpc]
     69     return  R * pc/ly/1e3;                   // [kpc]
     70     */
     71     Double_t z1 = x[0] + 1;
     72
     73     const Double_t c  = 299792458;                 // [m/s]
     74     const Double_t H0 = 50./3.0857e19;             // [km / Mpc s] --> [s^-1]
     75
     76     const Double_t ly = 3600.*24.*365.*c;          // [m/ly]
     77     const Double_t pc = 1./3.258;                  // [pc/ly]
     78
     79     const Double_t R = c/H0 * 2 * (1 - 1./sqrt(z1)); // [m]
     80
     81     return  R * pc/ly/1e3;                   // [kpc]
    5682}
    5783
Note: See TracChangeset for help on using the changeset viewer.