--- DarthVader/CalorimeterLevel2/src/calol2tr.for	2007/01/22 10:02:27	1.10
+++ DarthVader/CalorimeterLevel2/src/calol2tr.for	2007/01/27 06:22:19	1.13
@@ -253,14 +253,16 @@
 C     
          DO M = 1,2
 C
+c            print *,' ax ',ax,' ay ',ay
+c            print *,' bx ',bx,' by ',by
             IF (NPCFIT(M).GE.2) THEN
                IF (M.EQ.1) THEN
                   VARCFIT(1) = CHI2X
-                  IMPX = 10. * ( AX + 12.1 )
+                  IMPX = AX ! PAMELA REF
                   TANX = BX
                ELSE
                   VARCFIT(2) = CHI2Y
-                  IMPY = 10. * ( AY + 12.1 )
+                  IMPY = AY ! PAMELA REF
                   TANY = BY
                ENDIF
 C
@@ -275,18 +277,18 @@
 C     
                   IF (M.EQ.1) THEN
                      DISTX = PIANO(I) - 5.81
-                     Y(I) = DISTX * TANX + IMPX
+                     Y(I) = (DISTX * TANX) +  AX - XALIG
 c                     CBAR(M,I) = Y(I)
                      BAR(M,I) = Y(I)
-                     CBAR(M,I) = (Y(I) - XALIG)/10.        
+                     CBAR(M,I) = (Y(I) + XALIG)/10. 
                      IF (I.EQ.22) MX=ABS(Y(1)-Y(22))/ABS(ZIN(1)-ZIN(22))
 C     
                   ELSE
                      DISTY = PIANO(I)                
-                     YY(I) = DISTY * TANY + IMPY
+                     YY(I) = (DISTY * TANY) + AY - YALIG
 c                     CBAR(M,I) = YY(I)
                      BAR(M,I) = YY(I)
-                     CBAR(M,I) = (-YALIG + YY(I))/10. 
+                     CBAR(M,I) = (YY(I) + YALIG)/10. 
                      IF (I.EQ.22) MY=ABS(Y(1)-Y(22))/ABS(ZIN(1)-ZIN(22))
 C     
                   ENDIF
@@ -614,13 +616,6 @@
          ENDIF
       ENDDO
 C
-      EINF = EMIN
-      ESUP = 150.
-C
-      IF (TRIGTY.GE.2.AND.HZN.NE.0) THEN
-         EINF = 50.
-         ESUP = 1500.
-      ENDIF
 C
 C     CALCULATE PLANETOT AND QMEAN
 C
@@ -631,8 +626,18 @@
       NPIANI = 5
       QMEAN = 0.
       INDEX = 0
-      CALL ELIO(RPIANO,NPIANI,QMEAN,NTOT,INDEX)
-      PLANETOT = RPIANO(1) + RPIANO(2)  
+C
+      IF (TRIGTY.GE.2.AND.HZN.NE.0) THEN
+         EINF = 50.
+         ESUP = 15000.
+         CALL NUCLEI(RPIANO,NPIANI,QMEAN,NTOT,INDEX)
+         PLANETOT = RPIANO(1) + RPIANO(2)  
+      ELSE
+         EINF = EMIN
+         ESUP = 15000.
+         CALL ELIO(RPIANO,NPIANI,QMEAN,NTOT,INDEX)
+         PLANETOT = RPIANO(1) + RPIANO(2)  
+      ENDIF
 C
  50   CONTINUE
 C