--- gpamela/gpspe/gpuspe.F	2002/07/11 16:02:14	3.1
+++ gpamela/gpspe/gpuspe.F	2006/02/05 22:13:44	3.2
@@ -1,7 +1,10 @@
 *
-* $Id$
+* $Id: gpuspe.F,v 3.1.1.1 2002/07/11 16:02:14 cafagna Exp $
+*
+* $Log: gpuspe.F,v $
+* Revision 3.1.1.1  2002/07/11 16:02:14  cafagna
+* First GPAMELA release on CVS
 *
-* $Log$
 *
 *CMZ :  2.01/00 06/03/2000  13.07.03  by  Francesco Cafagna
 *CMZ :  2.00/00 03/03/2000  15.39.06  by  Francesco Cafagna
@@ -38,7 +41,7 @@
 #include "gphit.inc"
 #include "gcunit.inc"
 *
-      INTEGER IACT,IS,ID,IPA,IT,NUMVOL(20),IMEC,IDHIT
+      INTEGER IACT,IS,ID,IPA,IT,NUMVOL(20),NVOLSPE(3),IMEC,IDHIT
       REAL DELOSS,PATH,TRAPAR(7),VHIT(NHSPE)
       REAL DELTA2,SIGMA2,SIGMA,GRNDM0,GPGAUS
       LOGICAL SAVE
@@ -68,6 +71,10 @@
          VHIT(9) = IPA
          VHIT(10)= TRAPAR(7)
          IDHIT = -1
+         NVOLSPE(1) = NUMVOL(1)
+         IF(NUMVOL(1).EQ.0) NVOLSPE(1)=6
+         NVOLSPE(2) = NUMVOL(2)
+         NVOLSPE(3) = NUMVOL(3)
       ENDIF
 *
 * Track is exiting current volume
@@ -107,7 +114,8 @@
 * Store the hit
 *
          IF(IDHIT.EQ.-1) THEN
-            IF(SAVE) CALL GSAHIT (IS,ID,IT,NUMVOL,VHIT,IDHIT)
+c$$$            IF(SAVE) CALL GSAHIT (IS,ID,IT,NUMVOL,VHIT,IDHIT)
+            IF(SAVE) CALL GSAHIT (IS,ID,IT,NVOLSPE,VHIT,IDHIT)
             IF (IDHIT.EQ.0) THEN
                WRITE(CHMAIL,10000) IS,ID,IT
                CALL GMAIL(1,0)
@@ -159,7 +167,8 @@
 * Store the hit
 *
             IF(IDHIT.EQ.-1) THEN
-               IF(SAVE) CALL GSAHIT (IS,ID,IT,NUMVOL,VHIT,IDHIT)
+c$$$               IF(SAVE) CALL GSAHIT (IS,ID,IT,NUMVOL,VHIT,IDHIT)
+               IF(SAVE) CALL GSAHIT (IS,ID,IT,NVOLSPE,VHIT,IDHIT)
                IF (IDHIT.EQ.0) THEN
                   WRITE(CHMAIL,10200) IS,ID,IT
                   CALL GMAIL(1,0)