Changeset 6717 for trunk/MagicSoft/Mars/mtemp/mifae/library

Timestamp:

03/03/05 12:47:58 (20 years ago)

Author:

domingo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mifae/library

Files:

• MDispCalc.cc (modified) (3 diffs)
• MDispParameters.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) 
@@ -323 +321 @@
     //                    *(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) );
+                        *( 1./(1.+width/length) );
 
     /*
@@ -334 +333 @@
                     + p[3]*pow(logsize,3) 
                     + p[4]*pow(logsize,4) )
-                        *( 1/(1+width/length) );
+                        *( 1./(1.+width/length) );
     */
 

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

@@ -70 +70 @@
     //  these are the default values
 
-    fParameters[0] =  1.0;
-    fParameters[1] =  0.6;
-    fParameters[2] = -0.8;
-    fParameters[3] = -0.8;
-    fParameters[4] = -1.2;
+    fParameters[0] =  0.93227;
+    fParameters[1] =  0.187132;
+    fParameters[2] = -0.192808;
+    fParameters[3] =  0.0350143;
+    fParameters[4] = -0.0110078;
 
 
@@ -83 +83 @@
 
     fStepsizes[0] = 0.010;
-    fStepsizes[1] = 0.006;
-    fStepsizes[2] = 0.008;
-    fStepsizes[3] = 0.008;
-    fStepsizes[4] = 0.012;
+    fStepsizes[1] = 0.002;
+    fStepsizes[2] = 0.002;
+    fStepsizes[3] = 0.0004;
+    fStepsizes[4] = 0.0001;
 }