Changeset 5963 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
01/24/05 11:44:30 (20 years ago)
Author:
domingo
Message:
*** empty log message ***
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/mtemp/mifae/library/MDispCalc.cc

    r5955 r5963  
    300300    //      + (p[2] + p[3]*(logsize-fLogSize0))*width/length;
    301301
    302 //    Double_t disp = p[0] + p[1]*(logsize-fLogSize0) + p[4]*(length-fLength0)
    303 //      + (p[2] + p[3]*(logsize-fLogSize0))*width/length;
     302    /*
     303    Double_t disp = p[0] + p[1]*(logsize-fLogSize0) + p[4]*(length-fLength0)
     304      + (p[2] + p[3]*(logsize-fLogSize0))*width/length;
     305    */
    304306
    305307    //    Double_t disp = p[0] + p[1]*(logsize-fLogSize0) + p[4]*(length-fLength0)
     
    314316    //    Double_t disp = p[0] + p[1]*(logsize-fLogSize0) + p[4]*(conc-fConc0)
    315317    //      + (p[2] + p[3]*(logsize-fLogSize0))*width/length;   // + p[5]*(conc-fConc0))*width/length;
    316 
    317     //    Double_t disp = ( p[0] + p[1]*(logsize-fLogSize0)
    318     //                + p[2]*pow(logsize-fLogSize0,2)
    319     //                + p[3]*pow(logsize-fLogSize0,3)
    320     //                + p[4]*pow(logsize-fLogSize0,4) )
    321     //                    *( 1/(1+width/length) );
    322318
    323319    //    Double_t disp = ( p[0] + p[1]*(logsize-fLogSize0)
     
    327323    //                    *(1-width/length);
    328324
     325    Double_t disp = ( p[0] + p[1]*(logsize-fLogSize0)
     326                    + p[2]*pow(logsize-fLogSize0,2)
     327                    + p[3]*pow(logsize-fLogSize0,3)
     328                    + p[4]*pow(logsize-fLogSize0,4) )
     329                        *( 1/(1+width/length) );
     330
     331    /*
    329332    Double_t disp = ( p[0] + p[1]*(logsize)
    330333                    + p[2]*pow(logsize,2)
     
    332335                    + p[4]*pow(logsize,4) )
    333336                        *( 1/(1+width/length) );
     337    */
     338
    334339    return disp;
    335340}
Note: See TracChangeset for help on using the changeset viewer.