--- gpamela/gpcal/gpucal.F	2003/12/17 11:32:48	3.2
+++ gpamela/gpcal/gpucal.F	2005/06/21 02:42:04	3.3
@@ -1,7 +1,10 @@
 *
-* $Id: gpucal.F,v 3.1.1.1 2002/07/11 16:02:14 cafagna Exp $
+* $Id: gpucal.F,v 3.2 2003/12/17 11:32:48 pamela Exp $
 *
 * $Log: gpucal.F,v $
+* 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
 *
@@ -52,8 +55,8 @@
       PARAMETER (CALIB=0.0001085200)
 *END EM.
       INTEGER IACT,IS,ID,IPA,IT,NUMVOL(20),IMEC,IDHIT
-CML17/04/03      REAL DELOSS,PATH,TRAPAR(7),VHIT(NHCAL),XYZM(3),XYZD(3)
-      REAL DELOSS,PATH,TRAPAR(7),XYZM(3),XYZD(3)
+      REAL DELOSS,PATH,TRAPAR(7),VHIT(NHCAL),XYZM(3),XYZD(3)
+*      REAL DELOSS,PATH,TRAPAR(7),XYZM(3),XYZD(3)
       REAL DELTA2,SIGMA2,SIGMA,GRNDM0,GPGAUS,PATHINI
       LOGICAL SAVE
 *
@@ -80,7 +83,7 @@
 cccc            VHIT(4) = (DELOSS/CALIB) + VHIT(4)
 * END EM
 C ML
-CML17/04/03            VHIT(4) = DELOSS + VHIT(4)
+            VHIT(4) = DELOSS + VHIT(4)
             ENEMAT(NUMVOL(1),NUMVOL(2),NUMVOL(3))=
      +           ENEMAT(NUMVOL(1),NUMVOL(2),NUMVOL(3))+DELOSS
 *END ML
@@ -91,16 +94,16 @@
 *
       IF(IACT.EQ.1) THEN
          SAVE = .FALSE.
-CML17/04/03         CALL VZERO(VHIT,NHCAL)
-CML17/04/03         DO I=1,3
-CML17/04/03            VHIT(I) = TRAPAR(I)
-CML17/04/03         ENDDO
+         CALL VZERO(VHIT,NHCAL)
+         DO I=1,3
+            VHIT(I) = TRAPAR(I)
+         ENDDO
          IF(IMEC.GT.0) THEN
             SAVE = .TRUE.
 *EM:
 c            VHIT(4) = DELOSS/CALIB
 *END EM.
-CML17/04/03            VHIT(4) = DELOSS
+            VHIT(4) = DELOSS
 C ML:
             ENEMAT(NUMVOL(1),NUMVOL(2),NUMVOL(3))=
      +           ENEMAT(NUMVOL(1),NUMVOL(2),NUMVOL(3))+DELOSS
@@ -123,7 +126,7 @@
 *EM:
 c            VHIT(4) = (DELOSS/CALIB) + VHIT(4)
 *END EM
-CML17/04/03            VHIT(4) = DELOSS + VHIT(4)
+            VHIT(4) = DELOSS + VHIT(4)
 *ML:
             ENEMAT(NUMVOL(1),NUMVOL(2),NUMVOL(3))=
      +           ENEMAT(NUMVOL(1),NUMVOL(2),NUMVOL(3))+DELOSS
@@ -156,7 +159,10 @@
          IF(IDHIT.EQ.-1) THEN
 *ML:
 *            IF(SAVE) CALL GSCHIT (IS,ID,1,NUMVOL,VHIT,4,IDHIT)
-CL            IF(SAVE) CALL GSCHIT (IS,ID,1,NUMVOL,VHIT,1,IDHIT)
+            IF(SAVE) THEN
+               CALL GSCHIT (IS,ID,1,NUMVOL,VHIT,1,IDHIT)
+c               CALL GSAHIT (IS,ID,IT,NUMVOL,VHIT,IDHIT)
+            ENDIF
 *END ML.
             IF (IDHIT.EQ.0) THEN
                WRITE(CHMAIL,10000) IS,ID,IT
@@ -180,7 +186,7 @@
 *EM:
 c               VHIT(4) = (DELOSS/CALIB) + VHIT(4)
 * END EM.
-CML17/04/03               VHIT(4) = DELOSS + VHIT(4)
+               VHIT(4) = DELOSS + VHIT(4)
 *ML:
                ENEMAT(NUMVOL(1),NUMVOL(2),NUMVOL(3))=
      +              ENEMAT(NUMVOL(1),NUMVOL(2),NUMVOL(3))+DELOSS
@@ -212,7 +218,10 @@
 *
             IF(IDHIT.EQ.-1) THEN
 *ML
-*               IF (SAVE) CALL GSCHIT (IS,ID,1,NUMVOL,VHIT,4,IDHIT)
+C               IF (SAVE) CALL GSCHIT (IS,ID,1,NUMVOL,VHIT,4,IDHIT)
+               IF (SAVE) THEN 
+                  CALL GSCHIT (IS,ID,1,NUMVOL,VHIT,1,IDHIT)
+               ENDIF
 CL               IF (SAVE) CALL GSCHIT (IS,ID,1,NUMVOL,VHIT,1,IDHIT)
 *END ML.
                IF (IDHIT.EQ.0) THEN