--- gpamela/gpcas/gpdcas.F	2002/07/11 16:02:14	3.1
+++ gpamela/gpcas/gpdcas.F	2005/08/25 11:13:18	3.3
@@ -1,8 +1,15 @@
 *
-* $Id$
+* $Id: gpdcas.F,v 3.2 2002/12/05 10:17:41 pamela Exp $
 *
-* $Log$
+* $Log: gpdcas.F,v $
+* Revision 3.2  2002/12/05 10:17:41  pamela
+* Update CAS and CALO geometries and positions. Makefile updated as well
 *
+* Revision 3.1.1.1  2002/07/11 16:02:14  cafagna
+* First GPAMELA release on CVS
+*
+*
+*                19/09/2002  11.35.11  by  Jens Lund
 *CMZ :  2.01/00 05/04/2000  14.35.18  by  Marialuigia Ambriola
 *CMZ :  2.00/00 03/03/2000  15.39.06  by  Francesco Cafagna
 *CMZ :  1.02/00 22/10/99  16.17.58  by  Francesco Cafagna
@@ -83,7 +90,9 @@
 *
       NTHCAS = NHITS
       DO I=1,NHITS
-         ICAS(I)  = NUMBV(NVCAS,I)
+*JoLu 05-08-25
+*         ICAS(I)  = NUMBV(NVCAS,I)
+         ICAS(I)  = NUMBV(1,I)
 #if defined(GPAMELA_INTER)
          XINCAS(I)  = 2*VHITS(1,I)-VHITS(4,I)
          YINCAS(I)  = 2*VHITS(2,I)-VHITS(5,I)
@@ -103,63 +112,65 @@
          IPARCAS(I) = VHITS(10,I)
          P0CAS(I) = VHITS(11,I)
       ENDDO
+*JeL:
 *
 * Next detector
 *
-      ID   = IDCASY
-      CALL VZERO(VHITS,NH*NHM)
-      CALL VZERO(ITRA ,NHM)
-      CALL VZERO(NUMBV,NVOL*NHM)
-      NHITS = -1
+C      ID   = IDCASY
+C      CALL VZERO(VHITS,NH*NHM)
+C      CALL VZERO(ITRA ,NHM)
+C      CALL VZERO(NUMBV,NVOL*NHM)
+C      NHITS = -1
 *
 * Update the max number of hits to be retrived
 *
-      NNHM = NHM - NTHCAS
-      IF(NNHM.LE.0) THEN
-         WRITE(CHMAIL,10100) CSET,CNSED(IS,ID),NTHCAS,NHM,
-     +                        IDRUN,IDEVT
-         CALL GMAIL(1,0)
-         GO TO 10
-      ENDIF
-      CALL GPRHIT(CSET,CNSED(IS,ID),IS,ID,NVOL,NH,NNHM,1,
-     +            IT,NUMD,ITRA,NUMBV,VHITS,NHITS)
+C      NNHM = NHM - NTHCAS
+C      IF(NNHM.LE.0) THEN
+C         WRITE(CHMAIL,10100) CSET,CNSED(IS,ID),NTHCAS,NHM,
+C     +                        IDRUN,IDEVT
+C         CALL GMAIL(1,0)
+C         GO TO 10
+C      ENDIF
+C      CALL GPRHIT(CSET,CNSED(IS,ID),IS,ID,NVOL,NH,NNHM,1,
+C     +            IT,NUMD,ITRA,NUMBV,VHITS,NHITS)
 *
 * If there was a problem in GPRHIT then exit
 *
-      IF(NHITS.LT.0) THEN
-         WRITE(CHMAIL,10200) CSET,CNSED(IS,ID),NHITS,NHM,
-     +                        IDRUN,IDEVT
-         CALL GMAIL(1,0)
-         GO TO 10
-      ENDIF
+C      IF(NHITS.LT.0) THEN
+C         WRITE(CHMAIL,10200) CSET,CNSED(IS,ID),NHITS,NHM,
+C     +                        IDRUN,IDEVT
+C         CALL GMAIL(1,0)
+C         GO TO 10
+C      ENDIF
 *
 * >>>>>>>>>>>>>>>>>>>>>> DIGI action
 *
 *
 * Fill the CWN common
 *
-      DO I=1,NHITS
-         NTHCAS = NTHCAS + 1
-         ICAS(NTHCAS)  = 2 + NUMBV(NVCAS,I)
-#if defined(GPAMELA_INTER)
-         XINCAS(NTHCAS)  = 2*VHITS(1,I)-VHITS(4,I)
-         YINCAS(NTHCAS)  = 2*VHITS(2,I)-VHITS(5,I)
-         ZINCAS(NTHCAS)  = 2*VHITS(3,I)-VHITS(6,I)
-#endif
-#if !defined(GPAMELA_INTER)
-         XINCAS(NTHCAS)  = VHITS(1,I)
-         YINCAS(NTHCAS)  = VHITS(2,I)
-         ZINCAS(NTHCAS)  = VHITS(3,I)
-#endif
-         XOUTCAS(NTHCAS) = VHITS(4,I)
-         YOUTCAS(NTHCAS) = VHITS(5,I)
-         ZOUTCAS(NTHCAS) = VHITS(6,I)
-         ERELCAS(NTHCAS) = VHITS(7,I)
-         TIMECAS(NTHCAS)=  VHITS(8,I)
-         PATHCAS(NTHCAS) = VHITS(9,I)
-         IPARCAS(NTHCAS) = VHITS(10,I)
-         P0CAS(NTHCAS) = VHITS(11,I)
-      ENDDO
+C      DO I=1,NHITS
+C         NTHCAS = NTHCAS + 1
+C         ICAS(NTHCAS)  = 2 + NUMBV(NVCAS,I)
+C#if defined(GPAMELA_INTER)
+C         XINCAS(NTHCAS)  = 2*VHITS(1,I)-VHITS(4,I)
+C         YINCAS(NTHCAS)  = 2*VHITS(2,I)-VHITS(5,I)
+C         ZINCAS(NTHCAS)  = 2*VHITS(3,I)-VHITS(6,I)
+C#endif
+C#if !defined(GPAMELA_INTER)
+C         XINCAS(NTHCAS)  = VHITS(1,I)
+C         YINCAS(NTHCAS)  = VHITS(2,I)
+C         ZINCAS(NTHCAS)  = VHITS(3,I)
+C#endif
+C         XOUTCAS(NTHCAS) = VHITS(4,I)
+C         YOUTCAS(NTHCAS) = VHITS(5,I)
+C         ZOUTCAS(NTHCAS) = VHITS(6,I)
+C         ERELCAS(NTHCAS) = VHITS(7,I)
+C         TIMECAS(NTHCAS)=  VHITS(8,I)
+C         PATHCAS(NTHCAS) = VHITS(9,I)
+C         IPARCAS(NTHCAS) = VHITS(10,I)
+C         P0CAS(NTHCAS) = VHITS(11,I)
+C      ENDDO
+*END: JeL.
 *
 10000  FORMAT(' GPDCAS: VOLUME level too big: SET=',A4,', DET=',A4,',
      +        NVOL=',I3,', NVMAX=',I3,', RUN=',I5,', EVT=',I8)