--- gpamela/gpcal/gpdcal.F	2006/05/11 00:39:39	3.6
+++ gpamela/gpcal/gpdcal.F	2006/05/11 23:52:55	3.7
@@ -1,7 +1,10 @@
 *
-* $Id: gpdcal.F,v 3.5 2006/05/11 00:15:34 cafagna Exp $
+* $Id: gpdcal.F,v 3.6 2006/05/11 00:39:39 cafagna Exp $
 *
 * $Log: gpdcal.F,v $
+* Revision 3.6  2006/05/11 00:39:39  cafagna
+* A bug in hits retrival for calorimeter
+*
 * Revision 3.5  2006/05/11 00:15:34  cafagna
 * A bug in hits retrival for calorimeter
 *
@@ -11,8 +14,10 @@
 * Revision 3.3  2005/06/21 02:42:03  cafagna
 * Major modification to the geometry and to the random number chain
 *
-* Revision 3.2  2003/12/17 11:32:48  pamela
-* CALO SIMULATION COMPLETED: geometry and special tracking parameters updated and simulation checked by a comparison with the Trieste's standalone Monte Carlo simulation
+*     Revision 3.2 2003/12/17 11:32:48 pamela CALO SIMULATION COMPLETED:
+*     geometry and special tracking parameters updated and simulation
+*     checked by a comparison with the Trieste's standalone Monte Carlo
+*     simulation
 *
 * Revision 3.1.1.1  2002/07/11 16:02:14  cafagna
 * First GPAMELA release on CVS
@@ -110,31 +115,29 @@
 *
 * If there was a problem in GPRHIT then exit
 *
+      NTHCAL=0
       IF(NHITS.LT.0) THEN
          WRITE(CHMAIL,10200) CSET,CNSED(IS,ID),NHITS,NHM,
      +                        IDRUN,IDEVT
          CALL GMAIL(1,0)
-      ELSE
+         NHITS = NNHM
+      ENDIF
 *
 * >>>>>>>>>>>>>>>>>>>>>> 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)
-c         IPARCAL(NTHCAL) = VHITS(5,I)
-c     P0CAL(NTHCAL) = VHITS(6,I)
-         ENDDO
-      ENDIF
+      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)
+      ENDDO
 C
 C The energy released per strip
 C
@@ -175,6 +178,7 @@
 *
 * If there was a problem in GPRHIT then exit
 *
+      NTHCALI=0
       IF(NHITS.LT.0) THEN
          WRITE(CHMAIL,10200) CSET,CNSED(IS,ID),NHITS,NHM,
      +                        IDRUN,IDEVT
@@ -188,7 +192,6 @@
 * Fill the CWN common
 *
 c     
-      NTHCALI=0
       DO I=1,NHITS
          NTHCALI=NTHCALI+1
          ICASTRIP(NTHCALI)=NUMBV1(NVCALI,I)