--- DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2006/10/26 16:22:37	1.13
+++ DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2006/10/27 16:59:20	1.14
@@ -4,6 +4,7 @@
  */
 #include <TrkLevel2.h>
 #include <iostream>
+#include <math.h>
 using namespace std;
 //......................................
 // F77 routines
@@ -22,10 +23,10 @@
     seqno = -1; 
     image = -1; 
     chi2  = 0;
-	nstep = 0;
-	for(int it1=0;it1<5;it1++){
-		al[it1] = 0;
-		for(int it2=0;it2<5;it2++)coval[it1][it2] = 0;
+    nstep = 0;
+    for(int it1=0;it1<5;it1++){
+	al[it1] = 0;
+	for(int it2=0;it2<5;it2++)coval[it1][it2] = 0;
     };
     for(int ip=0;ip<6;ip++){
 		xgood[ip]  = 0;
@@ -56,10 +57,10 @@
     seqno = t.seqno; 
     image = t.image; 
     chi2  = t.chi2;
-	nstep = t.nstep;
-	for(int it1=0;it1<5;it1++){
-		al[it1] = t.al[it1];
-		for(int it2=0;it2<5;it2++)coval[it1][it2] = t.coval[it1][it2];
+    nstep = t.nstep;
+    for(int it1=0;it1<5;it1++){
+	al[it1] = t.al[it1];
+	for(int it2=0;it2<5;it2++)coval[it1][it2] = t.coval[it1][it2];
     };
     for(int ip=0;ip<6;ip++){
 		xgood[ip]  = t.xgood[ip];
@@ -219,6 +220,7 @@
     cout << endl << "           "; for(int i=0; i<5; i++)cout << coval[4][i]<<" ";
     cout << endl << "dedx_x   : "; for(int i=0; i<6; i++)cout << dedx_x[i] << " ";
     cout << endl << "dedx_y   : "; for(int i=0; i<6; i++)cout << dedx_y[i] << " ";
+    cout << endl;
 }
 /**
  * Set the TrkTrack position measurements 
@@ -294,11 +296,16 @@
 	al[4]=0.;
     }
 // end guess
-    for(int i=0; i<5; i++) track_.al[i]=al[i];
+    if(pfixed==0.) {
+	al[4]=0.;         // free momentum 
+	track_.pfixed=0.; //         "
+    }
     if(pfixed!=0.) {
 	al[4]=1./pfixed;      // to fix the momentum
 	track_.pfixed=pfixed; //         "
     }
+    track_.zini = 23.5; // ZINI = 23.5 !!! it should be the same parameter in all codes
+    for(int i=0; i<5; i++) track_.al[i]=al[i]; 
     int istep=0;
     int ifail=0;
     mini2_(&istep,&ifail, &iprint);