--- gpamela/gpcal/gpdcal.F	2006/05/11 00:15:34	3.5
+++ gpamela/gpcal/gpdcal.F	2006/05/11 00:39:39	3.6
@@ -1,7 +1,10 @@
 *
-* $Id: gpdcal.F,v 3.4 2005/07/25 11:53:20 cafagna Exp $
+* $Id: gpdcal.F,v 3.5 2006/05/11 00:15:34 cafagna Exp $
 *
 * $Log: gpdcal.F,v $
+* Revision 3.5  2006/05/11 00:15:34  cafagna
+* A bug in hits retrival for calorimeter
+*
 * Revision 3.4  2005/07/25 11:53:20  cafagna
 * Several updates. See history for details
 *
@@ -111,27 +114,27 @@
          WRITE(CHMAIL,10200) CSET,CNSED(IS,ID),NHITS,NHM,
      +                        IDRUN,IDEVT
          CALL GMAIL(1,0)
-         GO TO 10
-      ENDIF
+      ELSE
 *
 * >>>>>>>>>>>>>>>>>>>>>> DIGI action
 *
 *
 * Fill the CWN common
 *
-      NTHCAL=0
-      DO I=1,NHITS
-         NTHCAL = NTHCAL + 1
-         ICAPL(NTHCAL) = NUMBV((NVCAL-2),I)
-         ICASI(NTHCAL) = NUMBV((NVCAL-1),I)
-         ICAST(NTHCAL) = NUMBV((NVCAL),I)
-         XINCAL(NTHCAL) = VHITS(1,I)
-         YINCAL(NTHCAL) = VHITS(2,I)
-         ZINCAL(NTHCAL) = VHITS(3,I)
-         ERELCAL(NTHCAL) = VHITS(4,I)
+         NTHCAL=0
+         DO I=1,NHITS
+            NTHCAL = NTHCAL + 1
+            ICAPL(NTHCAL) = NUMBV((NVCAL-2),I)
+            ICASI(NTHCAL) = NUMBV((NVCAL-1),I)
+            ICAST(NTHCAL) = NUMBV((NVCAL),I)
+            XINCAL(NTHCAL) = VHITS(1,I)
+            YINCAL(NTHCAL) = VHITS(2,I)
+            ZINCAL(NTHCAL) = VHITS(3,I)
+            ERELCAL(NTHCAL) = VHITS(4,I)
 c         IPARCAL(NTHCAL) = VHITS(5,I)
-c         P0CAL(NTHCAL) = VHITS(6,I)
-      ENDDO
+c     P0CAL(NTHCAL) = VHITS(6,I)
+         ENDDO
+      ENDIF
 C
 C The energy released per strip
 C
@@ -144,7 +147,7 @@
       ID   = IDCASI
       IT = -1
       CSET = 'CAL '
-*
+*     
 * Check on the volume level
 *
       IF (NV.GT.NVM) THEN