--- DarthVader/CalorimeterLevel2/src/calol2tr.for	2006/05/19 13:15:50	1.1
+++ DarthVader/CalorimeterLevel2/src/calol2tr.for	2006/05/31 09:31:11	1.3
@@ -121,7 +121,7 @@
             al_p(m) = al_pp(t,m)
          enddo
          if (al_p(5).eq.0.) THEN
-       PRINT *,' CALORIMETER - WARNING F77: track with R = 0, discarded'
+            PRINT *,' CALORIMETER - WARNING F77: track with R = 0, discarded'
             GOOD2 = 0
             GOTO 969
          ENDIF
@@ -142,7 +142,7 @@
             call DOTRACK(NPLA,ZIN,XOUT,YOUT,AL_P,IFAIL)
             if(IFAIL.ne.0)then
                GOOD2 = 0
-               print *,' CALORIMETER - WARNING F77: tracking failed '
+c               print *,' CALORIMETER - WARNING F77: tracking failed '
                goto 969
             endif
             TX = TAN(ASIN(AL_P(3))) * COS(AL_P(4))
@@ -159,8 +159,8 @@
 C     CHECK IF XOUT OR YOUT ARE NaN
 C     
                IF (XOUT(I).NE.XOUT(I).OR.YOUT(I).NE.YOUT(I)) THEN
-                  print *,
-     &         ' CALORIMETER - WARNING F77: tracking error (NaN values)'                  
+c                  print *,
+c     &         ' CALORIMETER - WARNING F77: tracking error (NaN values)'                  
                   GOOD2 = 0
                   GOTO 969
                ENDIF
@@ -306,7 +306,7 @@
 C
       IF (CHTRACK.EQ.44) THEN 
          GOOD2 = 0
-         PRINT *,' CALORIMETER - WARNING F77: track outside calorimeter'
+c         PRINT *,' CALORIMETER - WARNING F77: track outside calorimeter'
          GOTO 50
       ELSE
          IF ( IWPL(1).LE.IWPL(2) ) THEN
@@ -559,10 +559,14 @@
       DO J = NPLA-4,NPLA
          NNX = IBAR(1,J)
          IF (NNX.NE.-1) THEN
-            IF (NNX.LT.9) NNX = 9
-            IF (NNX.GT.88) NNX = 88
-            INFX = NNX - 8
-            ISUPX = NNX + 8
+            IF (NNX.LT.5) NNX = 5
+            IF (NNX.GT.92) NNX = 92
+c            IF (NNX.LT.9) NNX = 9
+c            IF (NNX.GT.88) NNX = 88
+            INFX = NNX - 4
+            ISUPX = NNX + 4
+c            INFX = NNX - 8
+c            ISUPX = NNX + 8
             DO I = INFX,ISUPX
                IF (DEXY(1,J,I).GE.EMIN) THEN
                   NLAST = NLAST + 1
@@ -573,10 +577,14 @@
 C
          NNY = IBAR(2,J)
          IF (NNY.NE.-1) THEN
-            IF (NNY.LT.9) NNY = 9
-            IF (NNY.GT.88) NNY = 88
-            INFY = NNY - 8
-            ISUPY = NNY + 8
+            IF (NNY.LT.5) NNY = 5
+            IF (NNY.GT.92) NNY = 92
+c            IF (NNY.LT.9) NNY = 9
+c            IF (NNY.GT.88) NNY = 88
+            INFY = NNY - 4
+            ISUPY = NNY + 4
+c            INFY = NNY - 8
+c            ISUPY = NNY + 8
             DO I=INFY,ISUPY
                IF (DEXY(2,J,I).GE.EMIN) THEN
                   NLAST = NLAST + 1