--- DarthVader/CalorimeterLevel2/src/laterale.for	2006/05/19 13:15:50	1.1.1.1
+++ DarthVader/CalorimeterLevel2/src/laterale.for	2008/04/10 11:41:48	1.3
@@ -9,8 +9,8 @@
       INCLUDE 'INTEST.TXT'
 C
       INTEGER A,B, INPIA
-      INTEGER IBAR(2,NPLA)
-      REAL BAR(2,NPLA)
+      INTEGER IBAR(2,NPLAV)
+      REAL BAR(2,NPLAV)
       REAL RQT1, RQT2
       COMMON / ANGOLO / BAR, IBAR
       SAVE / ANGOLO /
@@ -29,21 +29,25 @@
 C     
 C     END EM
 C     
-         IF (A.LE.2) A = 3
-         IF (A.GE.(NCHA-1)) A = NCHA - 2
+         IF (A.LE.2) A = 2
+         IF (A.GE.NCHA) A = NCHA - 1
          DO J = A-1,A+1
             IF (DEXY(1,I,J).GE.EMIN) RQT1 = RQT1 + DEXY(1,I,J)
          ENDDO
 C
-         DO J=1,A-2
-            PXY = DEXY(1,I,J)
-            IF (PXY.GE.EMIN) RQT2 = RQT2 + PXY
-         ENDDO
-C
-         DO J=A+2,NCHA
-            PXY = DEXY(1,I,J)
-            IF (PXY.GE.EMIN) RQT2 = RQT2 + PXY
-         ENDDO
+         IF ((A-2).GE.1) THEN
+            DO J=1,A-2
+               PXY = DEXY(1,I,J)
+               IF (PXY.GE.EMIN) RQT2 = RQT2 + PXY
+            ENDDO
+         ENDIF
+C
+         IF ((A+2).LE.NCHA) THEN
+            DO J=A+2,NCHA
+               PXY = DEXY(1,I,J)
+               IF (PXY.GE.EMIN) RQT2 = RQT2 + PXY
+            ENDDO
+         ENDIF
 C
  600     CONTINUE
 C
@@ -55,21 +59,25 @@
 C
 C     END EM
 C
-         IF (B.LE.2) B = 3
-         IF (B.GE.(NCHA-1)) B = NCHA - 2
+         IF (B.LE.2) B = 2
+         IF (B.GE.NCHA) B = NCHA - 1
          DO J = B-1,B+1
             IF (DEXY(2,I,J).GE.EMIN) RQT1 = RQT1 + DEXY(2,I,J)
          ENDDO
 C     
-         DO J=1,B-2
-            PXY = DEXY(2,I,J)
-            IF (PXY.GE.EMIN) RQT2 = RQT2 + PXY
-         ENDDO
-C     
-         DO J=B+2,NCHA
-            PXY = DEXY(2,I,J)
-            IF (PXY.GE.EMIN) RQT2 = RQT2 + PXY
-         ENDDO
+         IF ((B-2).GE.1) THEN
+            DO J=1,B-2
+               PXY = DEXY(2,I,J)
+               IF (PXY.GE.EMIN) RQT2 = RQT2 + PXY
+            ENDDO
+         ENDIF
+C     
+         IF ((B+2).LE.NCHA) THEN
+            DO J=B+2,NCHA
+               PXY = DEXY(2,I,J)
+               IF (PXY.GE.EMIN) RQT2 = RQT2 + PXY
+            ENDDO
+         ENDIF
 C
  700     CONTINUE
       ENDDO