--- DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2008/03/22 08:32:50	1.45
+++ DarthVader/TrackerLevel2/src/TrkLevel2.cpp	2008/04/11 13:44:38	1.46
@@ -678,22 +678,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;//not used yet
+		track.xm_b[i] = xm[i] + omega * segment;
+		track.ym_b[i] = ym[i] - segment;
+//	    track.zm_b[i] = zm[i] - beta * segment;//not used yet
+	    }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;//not used yet
+		track.xm_b[i] = xm[i] - segment;
+		track.ym_b[i] = ym[i] - omega * segment;
+//	    track.zm_b[i] = zm[i] + gamma * segment;//not used yet
+	    }
+	}
 	
-	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];
@@ -999,7 +1041,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 +1064,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];
 };