--- DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2008/03/22 08:32:50	1.45
+++ DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2008/11/25 14:41:37	1.49
@@ -657,6 +657,9 @@
 
     TrkParams::Set(path,1);
     TrkParams::Load(1);
+    if( !TrkParams::IsLoaded(1) ){
+	cout << "void TrkTrack::LoadField(TString path) --- ERROR --- m.field not loaded"<<endl;
+    }
 
 };
 
@@ -678,22 +681,64 @@
 	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;
-	}
+// 	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 ----------------------------
+
+	if( XGood(i) || YGood(i) ){
+	    double segment = 2.;//cm
+	    // NB: i parametri di allineamento hanno una notazione particolare!!!
+	    // sensor = 0 (hybrid side), 1 
+	    // ladder = 0-2 (increasing x)
+	    // plane  = 0-5 (from bottom to top!!!) 
+	    int is = (int)GetSensor(i); if(i==5)is=1-is;
+	    int ip = 5-i;
+	    int il = (int)GetLadder(i);
+	    
+	    double omega   = 0.; 
+	    double beta    = 0.;
+	    double gamma   = 0.;
+	    if( 
+		(is < 0 || is > 1 || ip < 0 || ip > 5 || il < 0 || il > 2) &&
+		true){
+		// se il piano risulta colpito, ladder e sensore devono essere 
+		// assegnati correttamente
+		cout << " void TrkTrack::FillMiniStruct(cMini2track&) --- WARNING --- sensor not defined, cannot read alignment parameters "<<endl;
+		cout << " is ip il = "<<is<<" "<<ip<<" "<<il<<endl;
+	    }else{
+		omega   = alignparameters_.omega[is][il][ip];
+		beta    = alignparameters_.beta[is][il][ip];
+		gamma   = alignparameters_.gamma[is][il][ip];
+	    }
+	    
+	    if(       XGood(i) && !YGood(i) ){
+		track.xm_a[i] = xm[i] - omega * segment;
+		track.ym_a[i] = ym[i] + segment;
+		track.zm_a[i] = zm[i] + beta * segment;
+		track.xm_b[i] = xm[i] + omega * segment;
+		track.ym_b[i] = ym[i] - segment;
+		track.zm_b[i] = zm[i] - beta * segment;
+	    }else if( !XGood(i) && YGood(i) ){
+		track.xm_a[i] = xm[i] + segment;
+		track.ym_a[i] = ym[i] + omega * segment;
+		track.zm_a[i] = zm[i] - gamma * segment;
+		track.xm_b[i] = xm[i] - segment;
+		track.ym_b[i] = ym[i] - omega * segment;
+		track.zm_b[i] = zm[i] + gamma * segment;
+	    }
+	}
 	
-	track.resx[i]=resx[i];
+       	track.resx[i]=resx[i];
 	track.resy[i]=resy[i];
 	track.tailx[i]=tailx[i];
 	track.taily[i]=taily[i];
@@ -756,9 +801,12 @@
     
 //     cout << "void TrkTrack::GetClusterositions() "<<endl;
 
-    TrkParams::Load( );
-    if( !TrkParams::IsLoaded() )return false;
-    
+    bool OK=true;
+    TrkParams::Load(1); if( !TrkParams::IsLoaded(1) )cout << "Bool_t TrkTrack::EvaluateClusterPositions() ---ERROR--- m.field not loaded "<<endl;
+    TrkParams::Load(4); if( !TrkParams::IsLoaded(4) )cout << "Bool_t TrkTrack::EvaluateClusterPositions() ---ERROR--- p.f.a. par. not loaded "<<endl;
+    TrkParams::Load(5); if( !TrkParams::IsLoaded(5) )cout << "Bool_t TrkTrack::EvaluateClusterPositions() ---ERROR--- alignment par. not loaded "<<endl;
+    if(!OK)return false;
+
     for(int ip=0; ip<6; ip++){
 //	cout << ip<<" ** "<<xm[ip]<<" / "<<ym[ip]<<endl;;
 	int icx = GetClusterX_ID(ip)+1;
@@ -810,10 +858,11 @@
  */
 void TrkTrack::Fit(double pfixed, int& fail, int iprint, int froml1){
 
-    float al_ini[] = {0.,0.,0.,0.,0.};
+    bool OK=true;
+    TrkParams::Load(1); if( !TrkParams::IsLoaded(1) )cout << "void TrkTrack::Fit(double,int&,int,int) ---ERROR--- m.field not loaded "<<endl;
+    if(!OK)return;
 
-    TrkParams::Load( );
-    if( !TrkParams::IsLoaded() )return;
+    float al_ini[] = {0.,0.,0.,0.,0.};
 
     extern cMini2track track_;
     fail = 0;
@@ -849,11 +898,7 @@
 
     //  ------------------------------------------
     //  call mini routine
-//     TrkParams::Load(1);
-//     if( !TrkParams::IsLoaded(1) ){
-// 	cout << "void TrkTrack::Fit(double pfixed, int& fail, int iprint) --- ERROR --- m.field not loaded"<<endl;
-// 	return;
-//     }
+    //  ------------------------------------------
     int istep=0;
     int ifail=0;
     mini2_(&istep,&ifail, &iprint);
@@ -999,7 +1044,7 @@
 };
 
 /**
- * Method to retrieve the ladder (0-4, increasing x) traversed by the track on this plane.
+ * Method to retrieve the ladder (0-2, increasing x) traversed by the track on this plane.
  * If no ladder is traversed (dead area) the metod retuns -1.
  * @param ip Tracker plane (0-5)
  */
@@ -1022,27 +1067,35 @@
 /**
  * \brief Method to include a x-cluster to the track.
  * @param ip Tracker plane (0-5)
- * @param clid Cluster ID (0,1,...)
- * @param is Sensor (0-1, increasing y) 
+ * @param clid Cluster ID (0 = no-cluster, 1,2,... otherwise )
+ * @param il Ladder (0-2, increasing x, -1 if no sensitive area is hit) 
+ * @param is Sensor (0-1, increasing y, -1 if no sensitive area is hit) 
+ * @param bad True if the cluster contains bad strips  
  * @see Fit(double pfixed, int& fail, int iprint, int froml1)
  */
-void TrkTrack::SetXGood(int ip, int clid, int is){
-    int il=0;       //ladder (temporary)
-    bool bad=false; //ladder (temporary)
-    xgood[ip]=il*100000000+is*10000000+clid;
+void TrkTrack::SetXGood(int ip, int clid, int il, int is, bool bad){
+//    int il=0;       //ladder (temporary)
+//    bool bad=false; //ladder (temporary)
+    if(ip<0||ip>5||clid<0||il<-1||il>2||is<-1||is>1)
+	cout << " void TrkTrack::SetXGood(int,int,int,int,bool) --> MA SEI DI COCCIO?!?!"<<endl;
+    xgood[ip]=(il+1)*100000000+(is+1)*10000000+clid;
     if(bad)xgood[ip]=-xgood[ip];
 };
 /**
  * \brief Method to include a y-cluster to the track.
  * @param ip Tracker plane (0-5)
- * @param clid Cluster ID (0,1,...)
- * @param is Sensor (0-1)
+ * @param clid Cluster ID (0 = no-cluster, 1,2,... otherwise )
+ * @param il Ladder (0-2, increasing x, -1 if no sensitive area is hit) 
+ * @param is Sensor (0-1, increasing y, -1 if no sensitive area is hit) 
+ * @param bad True if the cluster contains bad strips  
  * @see Fit(double pfixed, int& fail, int iprint, int froml1)
  */
-void TrkTrack::SetYGood(int ip, int clid, int is){
-    int il=0;       //ladder (temporary)
-    bool bad=false; //ladder (temporary)
-    ygood[ip]=il*100000000+is*10000000+clid;
+void TrkTrack::SetYGood(int ip, int clid, int il, int is, bool bad){
+//    int il=0;       //ladder (temporary)
+//    bool bad=false; //ladder (temporary)
+    if(ip<0||ip>5||clid<0||il<-1||il>2||is<-1||is>1)
+	cout << " void TrkTrack::SetYGood(int,int,int,int,bool) --> MA SEI DI COCCIO?!?!"<<endl;
+    ygood[ip]=(il+1)*100000000+(is+1)*10000000+clid;
     if(bad)ygood[ip]=-ygood[ip];
 };
 
@@ -1145,9 +1198,10 @@
 	vto   = iv+1;
     }
     for(int i=pfrom; i<pto; i++)
-	for(int j=0; j<vto; j++)
-	    if(GetDEDX(i,j)>max)max=GetDEDX(i,j);
-
+	for(int j=vfrom; j<vto; j++){
+	    if(j==0 && XGood(i) && GetDEDX(i,j)>max)max=GetDEDX(i,j);
+	    if(j==1 && YGood(i) && GetDEDX(i,j)>max)max=GetDEDX(i,j);
+	}
     return max;
 
 };
@@ -1170,15 +1224,16 @@
 	vto   = iv+1;
     }
     for(int i=pfrom; i<pto; i++)
-	for(int j=0; j<vto; j++)
-	    if(GetDEDX(i,j)<min)min=GetDEDX(i,j);
-
+	for(int j=vfrom; j<vto; j++){
+	    if(j==0 && XGood(i) && GetDEDX(i,j)<min)min=GetDEDX(i,j);
+	    if(j==1 && YGood(i) && GetDEDX(i,j)<min)min=GetDEDX(i,j);
+	}
     return min;
 
 };
 
 /**
- * \brief Give the maximum spatial residual release 
+ * \brief Give the maximum spatial residual  
  */
 Float_t TrkTrack::GetResidual_max(int ip, int iv){
     Float_t max=0;
@@ -1195,14 +1250,47 @@
 	vto   = iv+1;
     }
     for(int i=pfrom; i<pto; i++){
-	for(int j=0; j<vto; j++){
- 	    if(j==0 && XGood(i) && fabs(xm[i]-xv[i])>fabs(max))max=xv[i]-xm[i];
- 	    if(j==1 && YGood(i) && fabs(ym[i]-yv[i])>fabs(max))max=yv[i]-ym[i];
+	for(int j=vfrom; j<vto; j++){
+ 	    if(j==0 && XGood(i) && fabs(xm[i]-xv[i])>fabs(max))max=xm[i]-xv[i];
+ 	    if(j==1 && YGood(i) && fabs(ym[i]-yv[i])>fabs(max))max=ym[i]-yv[i];
 	}
     }
     return max;
 
 };
+/**
+ * \brief Give the average spatial residual 
+ */
+Float_t TrkTrack::GetResidual_av(int ip, int iv){
+    //
+//Sum$((xm>-50)*(xm-xv)/resx)/sqrt(TrkTrack.GetNX()*TrkTrack.GetChi2X())<0.3
+
+    Float_t av  = 0.;
+    int     nav = 0;
+    //
+    int pfrom = 0;
+    int pto   = 6;
+    int vfrom = 0;
+    int vto   = 2;
+    if(ip>=0&&ip<6){
+	pfrom = ip;
+	pto   = ip+1;
+    }
+    if(iv>=0&&iv<2){ 
+	vfrom = iv;
+	vto   = iv+1;
+    }
+    for(int i=pfrom; i<pto; i++){
+	for(int j=vfrom; j<vto; j++){
+	    nav++;
+ 	    if(j==0 && XGood(i)) av += (xm[i]-xv[i])/resx[i];
+ 	    if(j==1 && YGood(i)) av += (ym[i]-yv[i])/resy[i];
+	}
+    }
+    if(nav==0)return -100.;
+    return av/nav;
+
+};
 
 
 /**
@@ -1358,8 +1446,8 @@
     cout << endl << "plane        : " << plane;
     cout << endl << "coord[2]     : "; while( i<2 && cout << coord[i] << " ") i++;
     cout << endl << "sgnl         : " << sgnl;
-    cout << endl << "max.strip    : ";
-    cout << endl << "multiplicity : ";
+    cout << endl << "max.strip    : " << GetCluster_MaxStrip();
+    cout << endl << "multiplicity : " << GetCluster_Multiplicity();
 }
 //--------------------------------------
 //
@@ -1951,6 +2039,9 @@
 
     TrkParams::Set(path,1);
     TrkParams::Load(1);
+    if( !TrkParams::IsLoaded(1) ){
+	cout << "void TrkLevel2::LoadField(TString path) --- ERROR --- m.field not loaded"<<endl;
+    }
 
 //
 };