Changeset 5955 for trunk/MagicSoft/Mars/mtemp/mifae/library/MDispCalc.cc

Timestamp:

01/24/05 10:28:16 (20 years ago)

Author:

domingo

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mtemp/mifae/library/MDispCalc.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mtemp/mifae/library/MDispCalc.cc

@@ -300 +300 @@
     //      + (p[2] + p[3]*(logsize-fLogSize0))*width/length;
 
-    Double_t disp = p[0] + p[1]*(logsize-fLogSize0) + p[4]*(length-fLength0) 
-      + (p[2] + p[3]*(logsize-fLogSize0))*width/length;
+//    Double_t disp = p[0] + p[1]*(logsize-fLogSize0) + p[4]*(length-fLength0) 
+//      + (p[2] + p[3]*(logsize-fLogSize0))*width/length;
 
     //    Double_t disp = p[0] + p[1]*(logsize-fLogSize0) + p[4]*(length-fLength0) 
@@ -327 +327 @@
     //                    *(1-width/length);
 
+    Double_t disp = ( p[0] + p[1]*(logsize) 
+                    + p[2]*pow(logsize,2)
+                    + p[3]*pow(logsize,3) 
+                    + p[4]*pow(logsize,4) )
+                        *( 1/(1+width/length) );
     return disp;
 }