--- gpamela/gpcdes/gpgeo.inc	2006/10/12 11:11:21	3.16
+++ gpamela/gpcdes/gpgeo.inc	2006/11/28 10:26:14	3.19
@@ -1,7 +1,16 @@
 *
-* $Id: gpgeo.inc,v 3.15 2006/06/30 15:38:16 pam-ba Exp $
+* $Id: gpgeo.inc,v 3.18 2006/11/16 18:45:29 pam-ba Exp $
 *
 * $Log: gpgeo.inc,v $
+* Revision 3.18  2006/11/16 18:45:29  pam-ba
+* Simulated an aluminum container for S4
+*
+* Revision 3.17  2006/11/10 11:39:34  pam-ba
+* S2 and S1 z-positions corrected, He3 and plystyrene mixture added, Top Plate geometry simulated and titanium mixture added.
+*
+* Revision 3.16  2006/10/12 11:11:21  pam-ba
+* ND geometry updated.
+*
 * Revision 3.15  2006/06/30 15:38:16  pam-ba
 * S22 and S12 heights positioned in GPAMELA at the nominal heights in PAMELA (see document: Main geometrical parameters of the PAMELA sub-detectors, 20 December 2005)
 *
@@ -65,7 +74,8 @@
 C
       REAL PAME,SHEL,TFLA,SHEI,TSPH,S1,S2,S1A,S2A,S3,S11M,
      +     S12M,S21M,S22M,S31M,S32M,POL1,POL2,POLY,S11Y,S12X,S21X,
-     +     S22Y,S31Y,S32X,TPLA,S4,CATB,CATL,CATT,CASX,CASY,
+     +     S22Y,S31Y,S32X,TPLA,TPTU,TPTM,TPTL,TPCV,S4,S4AL,CATB,
+     +     CATL,CATT,CASX,CASY,
 *AB:
      +     MSHE,BSPH,
 *END: AB.
@@ -92,11 +102,11 @@
      +     ZMSHE,ZBSPH,
 *END: AB.
      +     ZTFLA,ZSHEI,ZTSPH,ZS1,ZS2A,ZS3,HMYLTOF,HGLUTOF,HPVCMAX,
-     +     HPVCMIN,HALTOF,HAIRS3,ZPAMS12X,ZPAMS22Y,ZTRD,
+     +     HPVCMIN,HALTOF,HAIRS3,HTABLE,DTABLEAL,XTPLA,YTPLA,ZTRD,
      +     ZCAT,ZCAS,
 c ml: 28/10/04:
-     +     ZCARDB,ZTPLA,ZSPEBP,ZSPEC,ZORMG,HORMG,XGLUE,ZPAMS31Y,
-     +     ZPAMS32X,ZCAL,
+     +     ZCARDB,ZTPLA,ZSPEBP,ZSPEC,ZORMG,HORMG,XGLUE,DTPS3,
+     +     ZCAL,
      +     ZS4,ZND,DCASIX,DCASIY,DCASIZ,
 c end ml.
      +          SCTIC,GAPTOP,
@@ -122,13 +132,14 @@
         COMMON /GPCGEO/PAME( 3),SHEL( 5),TFLA( 3),SHEI( 3),
      +                MSHE( 3),BSPH(6),TSPH( 6),TPLA( 3),
 *END: AB.
+     +                TPTU( 3),TPTM( 3),TPTL( 3),TPCV( 3),
 c ml: 28/10/04:
      +                S1( 3),S2( 3),S1A( 3),S2A( 3),S3( 3),
 c end ml.
-     +                S4( 3),S11M( 3),S12M( 3),S21M( 3),S22M( 3),
-     +                S31M( 3),S32M( 3),POL1(3),POL2(3),POLY(3), 
-     +                S11Y( 3),S12X( 3),S21X( 3),S22Y( 3),S31Y(3),
-     +                S32X( 3),
+     +                S4( 3),S4AL( 3),S11M( 3),S12M( 3),S21M( 3),
+     +                S22M( 3),S31M( 3),S32M( 3),POL1(3),POL2(3),
+     +                POLY(3),S11Y( 3),S12X( 3),S21X( 3),S22Y( 3),
+     +                S31Y(3),S32X( 3),
      +                CATB( 3),CATL( 3),CATT( 3),CASX( 3),CASY( 3),
 *EM:
      +                CSSX( 3),CSSY( 3),CATH( 3),CATF( 3),
@@ -174,7 +185,7 @@
      +                NDCE(3),NDSI(3),NDSM(3),NDSE(3),TNDBX,TNDCD,
      +                GNDTU,SCTIC,ZSHEL,ZTFLA,ZSHEI,ZTSPH,ZS1,ZS2,
      +                ZS3,HMYLTOF,HGLUTOF,HPVCMAX,HPVCMIN,HALTOF,
-     +                HAIRS3,ZPAMS12X,ZPAMS22Y,
+     +                HAIRS3,HTABLE,DTABLEAL,XTPLA,YTPLA,
 *AB:
      +                ZMSHE,ZBSPH,
 *END: AB.
@@ -183,7 +194,7 @@
      +                ZTRD,ZTPLA,ZCAT,ZCAS,ZCARDB,ZSPEBP,ZSPEC,
      +                ZORMG,HORMG,XGLUE,
 c end ml.
-     +                ZPAMS31,ZPAMS32,ZCAL,ZS4,ZND,DCASIX,
+     +                DTPS3,ZCAL,ZS4,ZND,DCASIX,
      +                DCASIY,DCASIZ,GAPTOP,GAPTRD,
      +                CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,
      +                ZDGEN,NTRSL,NTHBP,NCAPL,NCAPLD,