--- gpamela/gpcdes/gpgeo.inc	2006/05/18 10:52:32	3.14
+++ gpamela/gpcdes/gpgeo.inc	2006/10/12 11:11:21	3.16
@@ -1,7 +1,13 @@
 *
-* $Id: gpgeo.inc,v 3.13 2006/05/02 15:23:14 cafagna Exp $
+* $Id: gpgeo.inc,v 3.15 2006/06/30 15:38:16 pam-ba Exp $
 *
 * $Log: gpgeo.inc,v $
+* 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)
+*
+* Revision 3.14  2006/05/18 10:52:32  pam-ba
+* TOF geometry completed and a new material, the polystyrene (density 35 g/l), added
+*
 * Revision 3.13  2006/05/02 15:23:14  cafagna
 * Few mispelled command in gpgeo.inc and gpgeo.F
 *
@@ -86,12 +92,12 @@
      +     ZMSHE,ZBSPH,
 *END: AB.
      +     ZTFLA,ZSHEI,ZTSPH,ZS1,ZS2A,ZS3,HMYLTOF,HGLUTOF,HPVCMAX,
-     +     HPVCMIN,HALTOF,HAIRS3,ZPAMS12X,ZTRD,
+     +     HPVCMIN,HALTOF,HAIRS3,ZPAMS12X,ZPAMS22Y,ZTRD,
      +     ZCAT,ZCAS,
 c ml: 28/10/04:
      +     ZCARDB,ZTPLA,ZSPEBP,ZSPEC,ZORMG,HORMG,XGLUE,ZPAMS31Y,
      +     ZPAMS32X,ZCAL,
-     +     ZS4,DCASIX,DCASIY,DCASIZ, 
+     +     ZS4,ZND,DCASIX,DCASIY,DCASIZ,
 c end ml.
      +          SCTIC,GAPTOP,
      +          GAPTRD,CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,
@@ -101,7 +107,8 @@
 * MA
      +          DZM0, DZST,
 *** Neutron detector definition
-     *     NDBX, NDBI, NDTU, NDTI, NDPB, NDCD
+     +     NDBO,NDBX, NDBI, NDTU, NDTI, NDPB, NDCD,NDCO,NDBS,NDSS,
+     +     NDCI,NDCM,NDCE,NDSI,NDSM,NDSE,TNDBX,TNDCD,GNDTU
 C
 C Some usefull quantities to calculate volumes dimentions
 C
@@ -161,10 +168,13 @@
 *MA
      +                DZM0, DZST,
 * end MA
-     +       NDBX(3),NDBI(3),NDTU(3),NDTI(3),NDPB(3),NDCD(3),
-     +                SCTIC,ZSHEL,ZTFLA,ZSHEI,ZTSPH,ZS1,ZS2,ZS3,
-     +                HMYLTOF,HGLUTOF,HPVCMAX,HPVCMIN,HALTOF,
-     +                HAIRS3,
+     +                NDBO(3),NDBX(3),NDBI(3),NDTU(3),NDTI(3),
+     +                NDPB(3),NDCD(3),NDCO(3),NDBS(3),NDSS(3),
+     +                NDCI(3),NDCM(3),
+     +                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,
 *AB:
      +                ZMSHE,ZBSPH,
 *END: AB.
@@ -173,7 +183,7 @@
      +                ZTRD,ZTPLA,ZCAT,ZCAS,ZCARDB,ZSPEBP,ZSPEC,
      +                ZORMG,HORMG,XGLUE,
 c end ml.
-     +                ZPAMS31,ZPAMS32,ZCAL,ZS4,DCASIX,
+     +                ZPAMS31,ZPAMS32,ZCAL,ZS4,ZND,DCASIX,
      +                DCASIY,DCASIZ,GAPTOP,GAPTRD,
      +                CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,
      +                ZDGEN,NTRSL,NTHBP,NCAPL,NCAPLD,