--- DarthVader/CalorimeterLevel2/src/calol2cm.for	2006/05/19 13:15:50	1.1.1.1
+++ DarthVader/CalorimeterLevel2/src/calol2cm.for	2007/01/22 09:17:00	1.5
@@ -17,7 +17,7 @@
       INTEGER gtr
       INTEGER j, m, nn, i
       INTEGER IBAR(2,NPLA), NPFIT(2)
-      INTEGER Iquest(100)    
+      INTEGER Iquest(100), IWPL(2),CHTRACK
 c
       COMMON / TAGLIOEN / EINF, ESUP, ENER(2)
       SAVE / TAGLIOEN /
@@ -37,7 +37,7 @@
       COMMON / CH / CHECK
       SAVE / CH /
 C
-      COMMON / CALOFIT / VARFIT, NPFIT
+      COMMON / CALOFIT / VARFIT, NPFIT, IWPL,CHTRACK
       SAVE / CALOFIT /
 C
       COMMON / pawcd / hmemor
@@ -86,6 +86,7 @@
       QX22 = 0.
       QMAX = 0.
       GTR = 0
+      CHTRACK = 0
 C     
       DISTX = 0.
       DISTY = 0.
@@ -167,16 +168,16 @@
             IF (NPCFIT(M).GE.2) THEN
                VARCFIT(M) = VARFIT(M)
                IF (M.EQ.1) THEN
-                  IMPX = CX 
+                  IMPX = (CX - XALIG)/10.
                   TANX = TG(1)
                ELSE
-                  IMPY = CY 
+                  IMPY =( CY - YALIG)/10. 
                   TANY = TG(2)
                ENDIF
 C               
                DO I = 1,NPLA     
                   NN = 0
-                  IF (M.EQ.2) NN = 1
+C????                  IF (M.EQ.2) NN = 1
                   IF (MOD(I,2).EQ.NN) THEN
                      SHIFT = +0.5
                   ELSE
@@ -193,11 +194,16 @@
                      DISTY = PIANO(I)                
                      YY(I) = DISTY * TG(2) + CY
                      BAR(M,I) = YY(I)
-                     CBAR(M,I) = (YALIG - YY(I))/10.
+                     CBAR(M,I) = (-YALIG + YY(I))/10.
 C     
                   ENDIF
                   CALL LASTRISCIA(BAR(M,I),IBAR(M,I))
                   CIBAR(M,I) = IBAR(M,I)
+                  IF (ibar(m,i).EQ.-1) THEN 
+                     CHTRACK = CHTRACK + 1
+                  ELSE
+                     IWPL(M) = IWPL(M) + 1
+                  ENDIF
                ENDDO            
             ENDIF
 C