--- gpamela/gptof/gptofv.F	2002/07/11 16:02:01	3.1.1.1
+++ gpamela/gptof/gptofv.F	2006/04/09 23:29:22	3.3
@@ -1,7 +1,13 @@
 *
-* $Id$
+* $Id: gptofv.F,v 3.2 2005/06/21 02:42:29 cafagna Exp $
+*
+* $Log: gptofv.F,v $
+* Revision 3.2  2005/06/21 02:42:29  cafagna
+* Major modification to the geometry and to the random number chain
+*
+* Revision 3.1.1.1  2002/07/11 16:02:01  cafagna
+* First GPAMELA release on CVS
 *
-* $Log$
 *
 *CMZ :  2.01/00 05/04/2000  14.35.18  by  Marialuigia Ambriola
 *CMZ :  2.00/00 03/03/2000  15.39.05  by  Francesco Cafagna
@@ -58,14 +64,20 @@
 *
 *  Start subvolume definition.
 *
+c ml: 27/10/04:
 *
-*  Define the S11X     volume
+c*  Define the S11X     volume
+*  Define the S11Y     volume
 *
-      CALL GSVOLU('S11X','BOX ',NMED,S11X, 3,IVOLU)
+c      CALL GSVOLU('S11X','BOX ',NMED,S11X, 3,IVOLU)
+      CALL GSVOLU('S11Y','BOX ',NMED,S11Y, 3,IVOLU)
 *
-*  Define the S12Y     volume
+c*  Define the S12Y     volume
+*  Define the S12X     volume
 *
-      CALL GSVOLU('S12Y','BOX ',NMED,S12Y, 3,IVOLU)
+c      CALL GSVOLU('S12Y','BOX ',NMED,S12Y, 3,IVOLU)
+      CALL GSVOLU('S12X','BOX ',NMED,S12X, 3,IVOLU)
+c end ml.
 *
 *  Define the S21X     volume
 *
@@ -83,7 +95,8 @@
 *
       CALL GSVOLU('S32X','BOX ',NMED,S32X, 3,IVOLU)
 
-      NMED=MCF
+c ml: 21/12/04:
+      NMED=MAL
 *
 *  Define the SC11     volume
 *
@@ -101,6 +114,33 @@
 *
       CALL GSVOLU('SC22','BOX ',NMED,SC22, 3,IVOLU)
 
+c*
+c*  Define the STOF volume
+c*      
+c      NMED=MAL
+c      CALL GSVOLU('STOF','BOX ',NMED,STOF, 3,IVOLU)
+c*
+c*  Define the SGLU volume
+c*
+cC COLLA ARALDITICA (DA VERIFICARNE LA COMPOSIZIONE)
+c      NMED=MSIC
+c      CALL GSVOLU('SGLU','BOX ',NMED,SGLU, 3,IVOLU)
+c*
+c*  Define the SPV1 volume
+c*
+c      NMED=? (PVC espanso)
+c      CALL GSVOLU('SPV1','BOX ',NMED,SPV1, 3,IVOLU)
+c*
+c*  Define the SMYL volume
+c*
+c      NMED=? (MYLAR)
+c      CALL GSVOLU('SMYL','BOX ',NMED,SMYL, 3,IVOLU)
+c*
+c*  Define the SPV2 volume
+c*
+c      NMED=? (PVC espanso)
+c      CALL GSVOLU('SPV2','BOX ',NMED,SPV2, 3,IVOLU)
+cc end ml.
 *
 *  Define the SC31     volume
 *
@@ -113,13 +153,19 @@
 *
 * Positioning volumes
 *
+c ml: 21/12/04:
       Y= 0
       Z= 0
-      DO I=1,NS11X
-         N= I
-         X= -S11(1) + (2*I-1)*S11X(1)
-         CALL GSPOS('S11X',N,'S11 ',X,Y,Z,0,'ONLY')
+c ml: 27/10/04:
+c      DO I=1,NS11X
+      DO I=1,NS11Y
+         N= I
+c         X= -S11(1) + (2*I-1)*S11X(1)
+         X= -S11(1) + (2*I-1)*S11Y(1)
+c         CALL GSPOS('S11X',N,'S11 ',X,Y,Z,0,'ONLY')
+         CALL GSPOS('S11Y',N,'S11 ',X,Y,Z,0,'ONLY')
       ENDDO
+c end ml.
       X= 0.
       Y= 0.
       DO I=1,2
@@ -130,11 +176,16 @@
 *
       X= 0
       Z= 0
-      DO I=1,NS12Y
-         N= I
-         Y= -S12(2) + (2*I-1)*S12Y(2)
-         CALL GSPOS('S12Y',N,'S12 ',X,Y,Z,0,'ONLY')
+c ml: 27/10/04
+c      DO I=1,NS12Y
+      DO I=1,NS12X
+         N= I
+c         Y= -S12(2) + (2*I-1)*S12Y(2)
+         Y= -S12(2) + (2*I-1)*S12X(2)
+c         CALL GSPOS('S12Y',N,'S12 ',X,Y,Z,0,'ONLY')
+         CALL GSPOS('S12X',N,'S12 ',X,Y,Z,0,'ONLY')
       ENDDO
+c end ml.
       X= 0.
       Y= 0.
       DO I=1,2
@@ -147,7 +198,9 @@
       Z= 0
       DO I=1,NS21X
          N= I
-         X= -S21(1) + (2*I-1)*S21X(1)
+c ml: 27/10/04         X= -S21(1) + (2*I-1)*S21X(1)
+         Y= -S21(2) + (2*I-1)*S21X(2)
+c end ml.
          CALL GSPOS('S21X',N,'S21 ',X,Y,Z,0,'ONLY')
       ENDDO
       X= 0.
@@ -162,7 +215,9 @@
       Z= 0
       DO I=1,NS22Y
          N= I
-         Y= -S22(2) + (2*I-1)*S22Y(2)
+c ml: 27/10/04         Y= -S22(2) + (2*I-1)*S22Y(2)
+         X= -S22(1) + (2*I-1)*S22Y(1)        
+c end ml.  
          CALL GSPOS('S22Y',N,'S22 ',X,Y,Z,0,'ONLY')
       ENDDO
       X= 0.
@@ -172,12 +227,49 @@
          Z= (-1.)**I*S22(3) + (-1.)**(I+1)*SC22(3)
          CALL GSPOS('SC22',N,'S22 ',X,Y,Z,0,'ONLY')
       ENDDO
-*
+c*
+c*  Positioning volumes into S11:
+c+
+c      X=0.
+c      Y=0.
+c      Z=-S11(3)+SMYL(3)
+c      N=1
+c      CALL GSPOS('SMYL',N,'SMYL',X,Y,Z,0,'ONLY')
+c      Z=Z+SMYL(3)+S11Y(3)
+c      DO I=1,NS11Y
+c         N= I
+c         X= -S11(1) + (2*I-1)*S11Y(1)
+c         CALL GSPOS('S11Y',N,'S11 ',X,Y,Z,0,'ONLY')
+c      ENDDO
+c      N=2
+c      Z=Z+S11Y(3)+SMYL(3)
+c      CALL GSPOS('SMYL',N,'SMYL',X,Y,Z,0,'ONLY')
+c      Z=Z+SMYL(3)+SPV1(3)
+c      N=1
+c      CALL GSPOS('SPV1',N,'SPV1',X,Y,Z,0,'ONLY')
+c      Z=Z+SPV1(3)+SGLU(3)
+c      N=1
+c      CALL GSPOS('SGLU',N,'SGLU',X,,Y,Z,0,'ONLY')
+c      Z=Z+SGLU(3)+STOF(3)
+c      N=1
+c      CALL GSPOS('STOF',N,'STOF',X,Y,Z,0,'ONLY')
+c*
+c* Positioning volumes into S12:
+c*
+c      Z=-S12(3)+STOF(3)
+c      N=2
+c      CALL GSPOS('STOF',N,'STOF',X,Y,Z,0,'ONLY')
+c      Z=Z+STOF(3)+SGLU(3)
+c      CALL GSPOS('SGLU',N,'SGLU',X,Y,Z,0,'ONLY')
+c      Z=Z+SGLU(3)+SPV2
       X= 0
       Z= 0
       DO I=1,NS31Y
          N= I
-         Y= -S31(2) + (2*I-1)*S31Y(2)
+c ml: 27/10/04:
+c         Y= -S31(2) + (2*I-1)*S31Y(2)
+         X= -S31(1) + (2*I-1)*S31Y(1)
+c end ml.
          CALL GSPOS('S31Y',N,'S31 ',X,Y,Z,0,'ONLY')
       ENDDO
       X= 0.
@@ -192,8 +284,12 @@
       Z= 0
       DO I=1,NS32X
          N= I
-         X= -S32(1) + (2*I-1)*S32X(1)
+c ml: 27/10/04:
+c         X= -S32(1) + (2*I-1)*S32X(1)
+         Y= -S32(2) + (2*I-1)*S32X(2)
+c end ml.
          CALL GSPOS('S32X',N,'S32 ',X,Y,Z,0,'ONLY')
+
       ENDDO
       X= 0.
       Y= 0.