--- gpamela/gpcal/gpdcal.F	2002/07/11 16:02:14	3.1
+++ gpamela/gpcal/gpdcal.F	2003/12/17 11:32:48	3.2
@@ -1,7 +1,10 @@
 *
-* $Id$
+* $Id: gpdcal.F,v 3.1.1.1 2002/07/11 16:02:14 cafagna Exp $
+*
+* $Log: gpdcal.F,v $
+* Revision 3.1.1.1  2002/07/11 16:02:14  cafagna
+* First GPAMELA release on CVS
 *
-* $Log$
 *
 *CMZ :  2.03/00 31/10/2000  11.18.51  by  Francesco Cafagna
 *CMZ :  2.02/00 10/10/2000  14.09.00  by  Francesco Cafagna
@@ -28,6 +31,9 @@
 #include "gpsed.inc"
 #include "gpkey.inc"
 #include "gpgeo.inc"
+*ml:21/02/02
+#include "gpencal.inc"
+*end ml.
 *
       INTEGER IS,ID,NV,NVM,NNHM
       CHARACTER*4 CSET
@@ -45,10 +51,15 @@
       CALL VZERO(ERCASI,NHMCAL)
       CALL VZERO(NUMD  ,NVOL)
       CALL VZERO(NUMD1 ,NVOL1)
+c ml:16/4/2003
+      CALL VZERO(ICASTRIP,NHMCAL)
+      CALL VZERO(ICAPLANE,NHMCAL)
+      CALL VZERO(ICAMOD,NHMCAL)
+      CALL VZERO(ENESTRIP,NHMCAL)
+c end 16/4/2003
 *
       NV = NVOL
       NVM= NVMAX
-      NTHCAL = 0
 *
 * The tungsten plane case
 *
@@ -96,25 +107,34 @@
 *
 * 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=NTHCAL+1
+         ICASTRIP(NTHCAL)=VHITS(2,I)
+         ICAPLANE(NTHCAL)=VHITS(1,I)
+         ICAMOD(NTHCAL)=VHITS(3,I)
+         ENESTRIP(NTHCAL)=VHITS(4,I)
+      ENDDO
+cl      DO I=1,NHITS
+cl         NTHCAL = NTHCAL + 1
+cl         ICAPL(NTHCAL) = NUMBV((NVCAL-2),I)
+cl         ICASI(NTHCAL) = NUMBV((NVCAL-1),I)
+cl         ICAST(NTHCAL) = NUMBV((NVCAL),I)
+cl         XINCAL(NTHCAL) = VHITS(1,I)
+cl         YINCAL(NTHCAL) = VHITS(2,I)
+cl         ZINCAL(NTHCAL) = VHITS(3,I)
+cl         ERELCAL(NTHCAL) = VHITS(4,I)
 c         IPARCAL(NTHCAL) = VHITS(5,I)
 c         P0CAL(NTHCAL) = VHITS(6,I)
-      ENDDO
-10000  FORMAT(' GPDCAL: VOLUME level too big: SET=',A4,', DET=',A4,',
-     +        NVOL=',I3,', NVMAX=',I3,', RUN=',I5,', EVT=',I8)
-10100  FORMAT(' GPDCAL: MAX number of hits retrived: SET=',A4,
-     +        ', DET=',A4,',NHREAD=',I5,', NHMAX=',I5,
-     +        ', RUN=',I5,', EVT=',I8)
-10200  FORMAT(' GPDCAL: Error in GPRHIT: SET=',A4,
-     +        ', DET=',A4,',NHITS=',I5,', NHMAX=',I5,
-     +        ', RUN=',I5,', EVT=',I8)
-   10 RETURN
+cl      ENDDO
+c     
+10000 FORMAT(' GPDCAL: VOLUME level too big: SET=',A4,', DET=',A4,',
+     +     NVOL=',I3,', NVMAX=',I3,', RUN=',I5,', EVT=',I8)
+10100 FORMAT(' GPDCAL: MAX number of hits retrived: SET=',A4,
+     +     ', DET=',A4,',NHREAD=',I5,', NHMAX=',I5,
+     +     ', RUN=',I5,', EVT=',I8)
+10200 FORMAT(' GPDCAL: Error in GPRHIT: SET=',A4,
+     +     ', DET=',A4,',NHITS=',I5,', NHMAX=',I5,
+     +     ', RUN=',I5,', EVT=',I8)
+ 10   RETURN
       END