Changeset 5963 for trunk/MagicSoft/Mars
- Timestamp:
- 01/24/05 11:44:30 (20 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/mtemp/mifae/library/MDispCalc.cc
r5955 r5963 300 300 // + (p[2] + p[3]*(logsize-fLogSize0))*width/length; 301 301 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 */ 304 306 305 307 // Double_t disp = p[0] + p[1]*(logsize-fLogSize0) + p[4]*(length-fLength0) … … 314 316 // Double_t disp = p[0] + p[1]*(logsize-fLogSize0) + p[4]*(conc-fConc0) 315 317 // + (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) );322 318 323 319 // Double_t disp = ( p[0] + p[1]*(logsize-fLogSize0) … … 327 323 // *(1-width/length); 328 324 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 /* 329 332 Double_t disp = ( p[0] + p[1]*(logsize) 330 333 + p[2]*pow(logsize,2) … … 332 335 + p[4]*pow(logsize,4) ) 333 336 *( 1/(1+width/length) ); 337 */ 338 334 339 return disp; 335 340 }
Note:
See TracChangeset
for help on using the changeset viewer.