Changeset 5963 for trunk/MagicSoft/Mars/mtemp

Timestamp:

01/24/05 11:44:30 (20 years ago)

Author:

domingo

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mtemp/mifae/library/MDispCalc.cc (modified) (4 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) 
@@ -314 +316 @@
     //    Double_t disp = p[0] + p[1]*(logsize-fLogSize0) + p[4]*(conc-fConc0) 
     //      + (p[2] + p[3]*(logsize-fLogSize0))*width/length;   // + p[5]*(conc-fConc0))*width/length;
-
-    //    Double_t disp = ( p[0] + p[1]*(logsize-fLogSize0) 
-    //                + p[2]*pow(logsize-fLogSize0,2)
-    //                + p[3]*pow(logsize-fLogSize0,3) 
-    //                + p[4]*pow(logsize-fLogSize0,4) )
-    //                    *( 1/(1+width/length) );
 
     //    Double_t disp = ( p[0] + p[1]*(logsize-fLogSize0) 
@@ -327 +323 @@
     //                    *(1-width/length);
 
+    Double_t disp = ( p[0] + p[1]*(logsize-fLogSize0) 
+                    + p[2]*pow(logsize-fLogSize0,2)
+                    + p[3]*pow(logsize-fLogSize0,3) 
+                    + p[4]*pow(logsize-fLogSize0,4) )
+                        *( 1/(1+width/length) );
+
+    /*
     Double_t disp = ( p[0] + p[1]*(logsize) 
                     + p[2]*pow(logsize,2)
@@ -332 +335 @@
                     + p[4]*pow(logsize,4) )
                         *( 1/(1+width/length) );
+    */
+
     return disp;
 }