--- gpamela/gptof/gptofv.F	2006/05/18 10:52:32	3.5
+++ gpamela/gptof/gptofv.F	2008/01/29 18:25:18	3.7
@@ -1,7 +1,13 @@
 *
-* $Id: gptofv.F,v 3.4 2006/05/02 10:40:13 pam-ba Exp $
+* $Id: gptofv.F,v 3.6 2006/11/16 18:45:29 pam-ba Exp $
 *
 * $Log: gptofv.F,v $
+* Revision 3.6  2006/11/16 18:45:29  pam-ba
+* Simulated an aluminum container for S4
+*
+* Revision 3.5  2006/05/18 10:52:32  pam-ba
+* TOF geometry completed and a new material, the polystyrene (density 35 g/l), added
+*
 * Revision 3.4  2006/05/02 10:40:13  pam-ba
 * TOF geometry and position updated and a new material, the mylar, added
 *
@@ -98,6 +104,12 @@
       CALL GSVOLU('POLY','BOX ',NMED,POLY, 3,IVOLU)
 *
 *
+*  S4 container volume.
+*
+      NMED=MAL
+      CALL GSVOLU('S4AL','BOX ',NMED,S4AL, 3,IVOLU)
+*
+*
 *  Change medium just for S4.
 *
       NMED=MSCIN
@@ -173,7 +185,8 @@
       Z=-S1A(3)+HGLUTOF+HPVCMIN+S12M(3)
       DO I=1,NS12X
          N= I
-         Y= -S1A(2) + HMYLTOF + (2*I-1)*S12M(2)
+c ab mod         Y= -S1A(2) + HMYLTOF + (2*I-1)*S12M(2)
+         Y= -S1A(2) + (2*I-1)*S12M(2)
          CALL GSPOS('S12M',N,'S1A ',X,Y,Z,0,'ONLY')
       ENDDO
 *
@@ -181,7 +194,8 @@
       Z=-S1A(3)+HGLUTOF+HPVCMIN+2*S12M(3)+S11M(3)
       DO I=1,NS11Y
          N= I
-         X= -S1A(1) + HMYLTOF + (2*I-1)*S11M(1)
+c ab mod         X= -S1A(1) + HMYLTOF + (2*I-1)*S11M(1)
+         X= -S1A(1) + (2*I-1)*S11M(1)
          CALL GSPOS('S11M',N,'S1A ',X,Y,Z,0,'ONLY')
       ENDDO
 *
@@ -191,20 +205,21 @@
       Z=-S1A(3)+HGLUTOF+HPVCMIN+2*S12M(3)+2.*S11M(3)+HPVCMAX/2.
       CALL GSPOS('POL1',N,'S1A ',X,Y,Z,0,'ONLY')
 C      Z=-S1A(3)+HGLUTOF+HPVCMAX+S12M(3)
-C      CALL GSPOS('S12M',N,'S1A ',X,Y,Z,0,'ONLY')    
+C      CALL GSPOS('S12M',N,'S1A ',X,Y,Z,0,'ONLY')
 C      Z=-S1A(3)+HGLUTOF+0.4+2*S12M(3)+S11M(3)
-C      CALL GSPOS('S11M',N,'S1A ',X,Y,Z,0,'ONLY')    
-*      
+C      CALL GSPOS('S11M',N,'S1A ',X,Y,Z,0,'ONLY')
+*
       X=0.
       Y=0.
       Z=0.
-      CALL GSPOS('S2A ',N,'S2  ',X,Y,Z,0,'ONLY')    
+      CALL GSPOS('S2A ',N,'S2  ',X,Y,Z,0,'ONLY')
 *
       Y= 0.
       Z=-S2A(3)+HGLUTOF+S22M(3)
       DO I=1,NS22Y
          N= I
-         X= -S2A(1) + HMYLTOF + (2*I-1)*S22M(1)        
+c ab mod         X= -S2A(1) + HMYLTOF + (2*I-1)*S22M(1)
+         X= -S2A(1) + (2*I-1)*S22M(1)
          CALL GSPOS('S22M',N,'S2A ',X,Y,Z,0,'ONLY')
       ENDDO
 *
@@ -212,7 +227,8 @@
       Z=-S2A(3)+HGLUTOF+2*S22M(3)+S21M(3)
       DO I=1,NS21X
          N= I
-         Y= -S2A(2) + HMYLTOF+ (2*I-1)*S21M(2)
+c ab mod         Y= -S2A(2) + HMYLTOF+ (2*I-1)*S21M(2)
+         Y= -S2A(2) + (2*I-1)*S21M(2)
          CALL GSPOS('S21M',N,'S2A ',X,Y,Z,0,'ONLY')
       ENDDO
 *
@@ -222,9 +238,9 @@
       Z=-S2A(3)+HGLUTOF+2*S22M(3)+2.*S21M(3)+HPVCMIN/2.
       CALL GSPOS('POLY',N,'S2A ',X,Y,Z,0,'ONLY')
 C      Z=-S2A(3)+HGLUTOF+S22M(3)
-C      CALL GSPOS('S22M',N,'S2A ',X,Y,Z,0,'ONLY')    
+C      CALL GSPOS('S22M',N,'S2A ',X,Y,Z,0,'ONLY')
 C      Z=-S2A(3)+HGLUTOF+2*S22M(3)+S21M(3)
-C      CALL GSPOS('S21M',N,'S2A ',X,Y,Z,0,'ONLY')    
+C      CALL GSPOS('S21M',N,'S2A ',X,Y,Z,0,'ONLY')
 *
       X= 0.
 ccC      Z=-S3(3)+HAIRS3+S32M(3)
@@ -246,9 +262,9 @@
 
 *
 C      Z=-S3(3)+HAIRS3+S32M(3)
-C      CALL GSPOS('S32M',N,'S3  ',X,Y,Z,0,'ONLY')    
+C      CALL GSPOS('S32M',N,'S3  ',X,Y,Z,0,'ONLY')
 C      Z=-S32(3)+HAIRS3+2*S32M(3)+HAIRS3+S31M(3)
-C      CALL GSPOS('S31M',N,'S3  ',X,Y,Z,0,'ONLY')    
+C      CALL GSPOS('S31M',N,'S3  ',X,Y,Z,0,'ONLY')
 ****************************************
 c ml: 21/12/04:
       X=0.
@@ -291,7 +307,7 @@
       N=1
 C      DO I=1,NS22Y
 C         N= I
-C      X= -S22M(1) + HMYLTOF + (2*I-1)*S22Y(1)        
+C      X= -S22M(1) + HMYLTOF + (2*I-1)*S22Y(1)
       CALL GSPOS('S22Y',N,'S22M',X,Y,Z,0,'ONLY')
 C      ENDDO
       Y= 0.
@@ -313,6 +329,10 @@
       Y= -S32M(2) + 2*(HMYLTOF/2)+ S32X(2)
       CALL GSPOS('S32X',N,'S32M',X,Y,Z,0,'ONLY')
 C      ENDDO
+      X=0.
+      Y=0.
+      Z=0.
+      CALL GSPOS('S4  ',N,'S4AL',X,Y,Z,0,'ONLY')
 *
       RETURN
       END