Index: trunk/MagicSoft/Mars/mtemp/mifae/library/MDispCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mtemp/mifae/library/MDispCalc.cc	(revision 5962)
+++ trunk/MagicSoft/Mars/mtemp/mifae/library/MDispCalc.cc	(revision 5963)
@@ -300,6 +300,8 @@
     //      + (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,10 +316,4 @@
     //    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,4 +323,11 @@
     //                    *(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,4 +335,6 @@
 		    + p[4]*pow(logsize,4) )
                         *( 1/(1+width/length) );
+    */
+
     return disp;
 }