--- DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2006/11/14 16:28:42	1.18
+++ DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2006/11/15 15:19:34	1.19
@@ -21,42 +21,6 @@
 //
 //
 //--------------------------------------
-/**
- * Evaluates the trajectory in the apparatus associated to the track. 
- * It integrates the equations of motion in the magnetic field. The magnetic field should be previously loaded ( by calling  TrkLevel2::LoadField() ), otherwise an error message is returned.  
- * @param t pointer to an object of the class Trajectory, 
- * which z coordinates should be previously initialized by calling the proper constructor ( Trajectory::Trajectory(int n, float* zin) ).
- * @return error flag.
- */
-int Trajectory::DoTrack2(float* al){
-
-    double *dxout   = new double[npoint];
-    double *dyout   = new double[npoint];
-    double *dthxout = new double[npoint];
-    double *dthyout = new double[npoint];
-    double *dtlout  = new double[npoint];
-    double *dzin    = new double[npoint];
-    double dal[5];
-
-    int ifail = 0;
-
-    for (int i=0; i<5; i++)      dal[i]  = (double)al[i];
-    for (int i=0; i<npoint; i++) dzin[i] = (double)z[i];
-
-    dotrack2_(&(npoint),dzin,dxout,dyout,dthxout,dthyout,dtlout,dal,&ifail);
-    
-    for (int i=0; i<npoint; i++){
-	x[i]   = (float)*dxout++;
-	y[i]   = (float)*dyout++;
-	thx[i] = (float)*dthxout++;
-	thy[i] = (float)*dthyout++;
-	tl[i]  = (float)*dtlout++;
-    }
-
-    return ifail;
-};
-//---------------------------------------------
-//---------------------------------------------
 TrkTrack::TrkTrack(){
     seqno = -1; 
     image = -1; 
@@ -294,6 +258,70 @@
     readb_();
 
 };
+
+/**
+ * Method to fill minimization-routine common
+ */
+void TrkTrack::FillMiniStruct(cMini2track& track){
+
+    for(int i=0; i<6; i++){ 
+
+	track.xgood[i]=xgood[i];
+	track.ygood[i]=ygood[i];
+	
+	track.xm[i]=xm[i];
+	track.ym[i]=ym[i];
+	track.zm[i]=zm[i];
+	
+//      --- temporaneo ----------------------------
+//      andrebbe inserita la dimensione del sensore
+	float segment = 100.;
+	track.xm_a[i]=xm[i];
+	track.xm_b[i]=xm[i];
+	track.ym_a[i]=ym[i];
+	track.ym_b[i]=ym[i];
+	if(       xgood[i] && !ygood[i] ){
+	    track.ym_a[i] = track.ym_a[i]+segment;
+	    track.ym_b[i] = track.ym_b[i]-segment;
+	}else if( !xgood[i] && ygood[i]){
+	    track.xm_a[i] = track.xm_a[i]+segment;
+	    track.xm_b[i] = track.xm_b[i]-segment;
+	}
+//      --- temporaneo ----------------------------
+	
+	track.resx[i]=resx[i];
+	track.resy[i]=resy[i];
+    }
+
+    for(int i=0; i<5; i++) track.al[i]=al[i]; 
+    track.zini = 23.5; 
+// ZINI = 23.5 !!! it should be the same parameter in all codes
+    
+}
+/**
+ * Method to set values from  minimization-routine common
+ */
+void TrkTrack::SetFromMiniStruct(cMini2track *track){
+
+    for(int i=0; i<5; i++) {
+	al[i]=track->al[i];
+	for(int j=0; j<5; j++) coval[i][j]=track->cov[i][j];
+    }
+    chi2  = track->chi2;
+    nstep = track->nstep;
+    for(int i=0; i<6; i++){ 
+	xv[i]  = track->xv[i];
+	yv[i]  = track->yv[i];
+	zv[i]  = track->zv[i];
+	xm[i]  = track->xm[i];
+	ym[i]  = track->ym[i];
+	zm[i]  = track->zm[i];
+	axv[i] = track->axv[i];
+	ayv[i] = track->ayv[i];	
+    }
+
+    
+}
 /**
  * Tracking method. It calls F77 mini routine.
  */
@@ -303,95 +331,54 @@
 
     extern cMini2track track_;
     fail = 0;
+    FillMiniStruct(track_);
 
-    for(int i=0; i<6; i++) track_.xm[i]=xm[i];
-    for(int i=0; i<6; i++) track_.ym[i]=ym[i];
-    for(int i=0; i<6; i++) track_.zm[i]=zm[i];
-    for(int i=0; i<6; i++) track_.resx[i]=resx[i];
-    for(int i=0; i<6; i++) track_.resy[i]=resy[i];
-    for(int i=0; i<6; i++) track_.xgood[i]=xgood[i];
-    for(int i=0; i<6; i++) track_.ygood[i]=ygood[i];
-
-// initial guess of "al" with linear fit
-//     if(al[0]==-9999.&&al[1]==-9999.&&al[2]==-9999.&&al[3]==-9999.&&al[4]==-9999.){
-// 	cout << "initial guess "<<endl;
-// 	double szz=0., szx=0., szy=0., ssx=0., ssy=0., sz=0., s1=0.;
-// 	double det, ax, ay, bx, by;
-// 	for(int i=0; i<NPLANE; i++) {
-// 	    szz=szz+zm[i]*zm[i];
-// 	    szx=szx+zm[i]*xm[i];
-// 	    szy=szy+zm[i]*ym[i];
-// 	    ssx=ssx+xm[i];
-// 	    ssy=ssy+ym[i];
-// 	    sz=sz+zm[i];
-// 	    s1=s1+1.;
-// 	}
-// 	det=szz*s1-sz*sz;
-// 	ax=(szx*s1-sz*ssx)/det;
-// 	bx=(szz*ssx-szx*sz)/det;
-// 	ay=(szy*s1-sz*ssy)/det;
-// 	by=(szz*ssy-szy*sz)/det;
-// 	al[0]=ax*23.5+bx; // ZINI = 23.5 !!! it should be the same parameter in all codes
-// 	al[1]=ay*23.5+by; //  "   
-// 	al[2]= sqrt(pow(ax,2)+pow(ay,2))/ sqrt(pow(ax,2)+pow(ay,2)+1.);
-// 	al[3]=0.;
-// 	if( (ax!=0.)||(ay!=0.) ) {
-// 	    al[3]= asin(ay/ sqrt(pow(ax,2)+pow(ay,2)));
-// 	    if(ax<0.) al[3]=acos(-1.)-al[3];
-// 	}
-// 	al[4]=0.;
-//     }
-// end guess
-
-    for(int i=0; i<5; i++) track_.al[i]=al[i]; 
-    track_.zini = 23.5; 
-// ZINI = 23.5 !!! it should be the same parameter in all codes
-
+    // if fit variables have been reset, evaluate the initial guess
     if(al[0]==-9999.&&al[1]==-9999.&&al[2]==-9999.&&al[3]==-9999.&&al[4]==-9999.)guess_();
 
     // --------------------- free momentum 
     if(pfixed==0.) {
-//	al[4]=0.;         // free momentum 
-	track_.pfixed=0.; //         "
+	track_.pfixed=0.; 
     }
     // --------------------- fixed momentum 
     if(pfixed!=0.) {
-	al[4]=1./pfixed;      // to fix the momentum
-	track_.pfixed=pfixed; //         "
+	al[4]=1./pfixed;     
+	track_.pfixed=pfixed;
     }
 
-//  store temporarily the initial guess
+    //  store temporarily the initial guess
     for(int i=0; i<5; i++) al_ini[i]=track_.al[i]; 
 
-
+    //  ------------------------------------------
+    //  call mini routine
     int istep=0;
     int ifail=0;
     mini2_(&istep,&ifail, &iprint);
     if(ifail!=0) {
-	if(iprint==1)cout << "ERROR: ifail= " << ifail << endl;
+	if(iprint)cout << "ERROR: ifail= " << ifail << endl;
 	fail = 1;
-//	return;
     }
+    //  ------------------------------------------
     
-
+    SetFromMiniStruct(&track_);
 //    cout << endl << "eta ===> " << track_.al[4] << endl;
 
-    for(int i=0; i<5; i++) al[i]=track_.al[i];
-    chi2=track_.chi2;
-    nstep=track_.nstep;
-    for(int i=0; i<6; i++) xv[i]=track_.xv[i];
-    for(int i=0; i<6; i++) yv[i]=track_.yv[i];
-    for(int i=0; i<6; i++) zv[i]=track_.zv[i];
-    for(int i=0; i<6; i++) axv[i]=track_.axv[i];
-    for(int i=0; i<6; i++) ayv[i]=track_.ayv[i];
-    for(int i=0; i<5; i++) {
-	for(int j=0; j<5; j++) coval[i][j]=track_.cov[i][j];
-    }
+//     for(int i=0; i<5; i++) al[i]=track_.al[i];
+//     chi2=track_.chi2;
+//     nstep=track_.nstep;
+//     for(int i=0; i<6; i++) xv[i]=track_.xv[i];
+//     for(int i=0; i<6; i++) yv[i]=track_.yv[i];
+//     for(int i=0; i<6; i++) zv[i]=track_.zv[i];
+//     for(int i=0; i<6; i++) axv[i]=track_.axv[i];
+//     for(int i=0; i<6; i++) ayv[i]=track_.ayv[i];
+//     for(int i=0; i<5; i++) {
+// 	for(int j=0; j<5; j++) coval[i][j]=track_.cov[i][j];
+//     }
 
-    if(fail){
-	cout << " >>>> fit failed >>>> drawing initial par"<<endl;
-	for(int i=0; i<5; i++) al[i]=al_ini[i]; 
-    }
+//    if(fail && iprint){
+// 	cout << " >>>> fit failed >>>> drawing initial par"<<endl;
+// 	for(int i=0; i<5; i++) al[i]=al_ini[i]; 
+//    }
 
 };
 /*
@@ -1132,6 +1119,40 @@
 
 }
 
+/**
+ * Evaluates the trajectory in the apparatus associated to the track. 
+ * It integrates the equations of motion in the magnetic field. The magnetic field should be previously loaded ( by calling  TrkLevel2::LoadField() ), otherwise an error message is returned.  
+ * @param t pointer to an object of the class Trajectory, 
+ * which z coordinates should be previously initialized by calling the proper constructor ( Trajectory::Trajectory(int n, float* zin) ).
+ * @return error flag.
+ */
+int Trajectory::DoTrack2(float* al){
+
+    double *dxout   = new double[npoint];
+    double *dyout   = new double[npoint];
+    double *dthxout = new double[npoint];
+    double *dthyout = new double[npoint];
+    double *dtlout  = new double[npoint];
+    double *dzin    = new double[npoint];
+    double dal[5];
+
+    int ifail = 0;
+
+    for (int i=0; i<5; i++)      dal[i]  = (double)al[i];
+    for (int i=0; i<npoint; i++) dzin[i] = (double)z[i];
+
+    dotrack2_(&(npoint),dzin,dxout,dyout,dthxout,dthyout,dtlout,dal,&ifail);
+    
+    for (int i=0; i<npoint; i++){
+	x[i]   = (float)*dxout++;
+	y[i]   = (float)*dyout++;
+	thx[i] = (float)*dthxout++;
+	thy[i] = (float)*dthyout++;
+	tl[i]  = (float)*dtlout++;
+    }
+
+    return ifail;
+};
 
 ClassImp(TrkLevel2);
 ClassImp(TrkSinglet);