--- gpamela/gpcdes/gpgeo.inc	2006/04/09 23:28:57	3.10
+++ gpamela/gpcdes/gpgeo.inc	2006/11/10 11:39:34	3.17
@@ -1,7 +1,28 @@
-*
-* $Id: gpgeo.inc,v 3.9 2005/12/20 12:21:04 cafagna Exp $
-*
+*
+* $Id: gpgeo.inc,v 3.16 2006/10/12 11:11:21 pam-ba Exp $
+*
 * $Log: gpgeo.inc,v $
+* 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)
+*
+* 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
+*
+* Revision 3.12  2006/05/02 10:58:35  pam-ba
+* TOF geometry and position updated and a new material, the mylar, added
+*
+* Revision 3.11  2006/04/10 11:07:43  cafagna
+* GEN data card updated, ZDGEN added
+*
+* Revision 3.10  2006/04/09 23:28:57  cafagna
+* Several new things, among this: ND and CARD
+*
 * Revision 3.9  2005/12/20 12:21:04  cafagna
 * gpnd directory added along with ND files
 *
@@ -10,188 +31,169 @@
 *
 * Revision 3.7  2005/12/16 09:13:52  cafagna
 * New small valume added to the tracker frame
-*
-* Revision 3.6  2005/12/13 10:31:29  pam-ba
-* added a new volume, TPGI, in the spectrometer
-*
-* Revision 3.5  2005/12/05 12:15:20  pam-ba
-* new spectrometer geometry and internal magnetic field
-*
-* Revision 3.4  2005/07/25 11:53:21  cafagna
-* Several updates. See history for details
-*
-* Revision 3.3  2005/06/21 02:42:13  cafagna
-* Major modification to the geometry and to the random number chain
-*
-* Revision 3.2  2002/12/05 10:17:42  pamela
-* Update CAS and CALO geometries and positions. Makefile updated as well
-*
-* Revision 3.1.1.1  2002/07/11 16:01:59  cafagna
-* First GPAMELA release on CVS
-*
-*
-*
-* gpgeo.inc
-*
-*               16/07/2004  16.44.06  by  Alexey Bakaldin
-*               27/08/2002  15.28.12  by  Jens Lund
-*CMZ :  3.00/00 14/11/2000  09.13.05  by  Emiliano Mocchiutti
-*CMZ :  2.02/00 12/10/2000  17.59.14  by  Francesco Cafagna
-*CMZ :  2.01/00 05/04/2000  14.35.17  by  Marialuigia Ambriola
-*CMZ :  2.00/00 03/03/2000  15.39.05  by  Francesco Cafagna
-*CMZ :  1.02/00 08/11/99  11.10.27  by  Francesco Cafagna
-*CMZ :  1.00/02 02/04/96  16.44.16  by  Francesco Cafagna
-*-- Author :
-C
-C Common with the volumes parameters for PAMELA
-C
-c ml: 28/10/04:
-C        REAL    PAME,SHEL,TFLA,SHEI,TSPH,S11,S12,S21,S22,S31,
-        REAL    PAME,SHEL,TFLA,SHEI,TSPH,S11,S12,S21,S22,TPLA,S31,
-c end ml.
-c ml: 27/10/04:
-c     +          S32,S4,S11X,SC11,S12Y,SC12,S21X,SC21,S22Y,SC22,
-c ml:20/12/04:
-c da commentare:
-     +           S32,S4,S11Y,SC11,S12X,SC12,S21X,SC21,S22Y,SC22, 
-C DA SCOMMENTARE:
-C     +          S32,S4,STOF,SGLU,SPV1,SMYL,S11Y,S12X,SPV2,S21X,S22Y,
-C OK:
-c end ml.
-     +          S31Y,SC31,S32X,SC32,CATB,CATL,CATT,CASX,CASY,
-*AB:
-     +          MSHE,BSPH,
-*END: AB.
-*EM:
-     +          CSSX,CSSY,CASXD,CASYD,CATH,CATF,CATO,CATP,
-*END: EM.
-*JeL:
-     +          CASA, CATA,
-*END: JeL.
+*
+* Revision 3.6  2005/12/13 10:31:29  pam-ba
+* added a new volume, TPGI, in the spectrometer
+*
+* Revision 3.5  2005/12/05 12:15:20  pam-ba
+* new spectrometer geometry and internal magnetic field
+*
+* Revision 3.4  2005/07/25 11:53:21  cafagna
+* Several updates. See history for details
+*
+* Revision 3.3  2005/06/21 02:42:13  cafagna
+* Major modification to the geometry and to the random number chain
+*
+* Revision 3.2  2002/12/05 10:17:42  pamela
+* Update CAS and CALO geometries and positions. Makefile updated as well
+*
+* Revision 3.1.1.1  2002/07/11 16:01:59  cafagna
+* First GPAMELA release on CVS
+*
+*
+*
+* gpgeo.inc
+*
+*               16/07/2004  16.44.06  by  Alexey Bakaldin
+*               27/08/2002  15.28.12  by  Jens Lund
+*CMZ :  3.00/00 14/11/2000  09.13.05  by  Emiliano Mocchiutti
+*CMZ :  2.02/00 12/10/2000  17.59.14  by  Francesco Cafagna
+*CMZ :  2.01/00 05/04/2000  14.35.17  by  Marialuigia Ambriola
+*CMZ :  2.00/00 03/03/2000  15.39.05  by  Francesco Cafagna
+*CMZ :  1.02/00 08/11/99  11.10.27  by  Francesco Cafagna
+*CMZ :  1.00/02 02/04/96  16.44.16  by  Francesco Cafagna
+*-- Author :
+C
+C Common with the volumes parameters for PAMELA
+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,TPTU,TPTM,TPTL,TPCV,S4,CATB,CATL,CATT,
+     +     CASX,CASY,
+*AB:
+     +     MSHE,BSPH,
+*END: AB.
+*EM:
+     +     CSSX,CSSY,CASXD,CASYD,CATH,CATF,CATO,CATP,
+*END: EM.
+*JeL:
+     +     CASA, CATA,
+*END: JeL.
      +          CARDB,
-*ml: 10/11/04:
-c     +          TRDS,TRDT,TRDB,TRFR,TRFI,TRBS,TRSO,TRSI,TRRA,
-C     +           TRDS,TRDT,TRDB,TRFR,TRFI,TRBS,TRAL,TRSO,TRSI,TRRA,
-     +           TRDS,TRDT,TRDB,TRFR,TRBS,TRAL,TRSO,TRSI,TRRA,
-     +           TRFU,TRFD,TRFM,TRFL,TRR2,TRR0,TRI0,TRRF,TRRI,
-*end ml.
-     +          TRAN,TRAI,SPEB,MGFR,MGPL,MGPA,MGPI,TPGA,TPGU,TPGD,TPGI
-c ml: 20/04/05:
-c     +          TRPB,TRPL,TRSL,TSPA,THBP,TRCP,CALB,CALS,CAPL,CANS,
-     +          TRPB,TPAS,TPAI,TRSL,TSPA,THBP,TRCP,TBAL,CALB,CALS,
-     +          CAPL,CANS,   
-c end ml.
-*END F.V.&ML.
-     +          CASI,CG10,CAAB,XYZPOR,XYZSOR,ZSHEL,
-*AB:
-     +          ZMSHE,ZBSPH,
-*END: AB.
-     +          ZTFLA,ZSHEI,ZTSPH,ZS11,ZS12,ZTRD,ZS21,ZS22,
-     +          ZCAT,ZCAS,
-c ml: 28/10/04:
-     +          ZCARDB,
-C     +          ZSPEC,ZS31,ZS32,ZCAL,ZS4,DCASIX,DCASIY,DCASIZ,
-     +          ZTPLA,ZSPEBP,ZSPEC,XGLUE,ZS31,ZS32,ZCAL,ZS4,DCASIX,
-     +          DCASIY,DCASIZ, 
-c end ml.
-     +          SCTIC,GAPTOP,
-     +          GAPTRD,CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,
-*EM:
-     +          CAGL,CAKP,CAKA,C10C,CAAD,CAPD,
-*END EM.
-* MA
-     +          DZM0, DZST,
+*ml: 10/11/04:
+     +     TRDS,TRDT,TRDB,TRFR,TRBS,TRAL,TRSO,TRSI,TRRA,
+     +     TRFU,TRFD,TRFM,TRFL,TRR2,TRR0,TRI0,TRRF,TRRI,
+*end ml.
+     +     TRAN,TRAI,SPEB,MGFR,MGPL,MGPA,MGPI,TPGA,TPGU,TPGD,TPGI
+c ml: 20/04/05:
+c     +          TRPB,TRPL,TRSL,TSPA,THBP,TRCP,CALB,CALS,CAPL,CANS,
+     +     TRPB,TPAS,TPAI,TRSL,TSPA,THBP,TRCP,TBAL,CALB,CALS,
+     +     CAPL,CANS,   
+c end ml.
+*END F.V.&ML.
+     +     CASI,CG10,CAAB,XYZPOR,XYZSOR,ZSHEL,
+*AB:
+     +     ZMSHE,ZBSPH,
+*END: AB.
+     +     ZTFLA,ZSHEI,ZTSPH,ZS1,ZS2A,ZS3,HMYLTOF,HGLUTOF,HPVCMAX,
+     +     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,
+     +     ZS4,ZND,DCASIX,DCASIY,DCASIZ,
+c end ml.
+     +          SCTIC,GAPTOP,
+     +          GAPTRD,CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,
+*EM:
+     +          ZDGEN,CAGL,CAKP,CAKA,C10C,CAAD,CAPD,
+*END EM.
+* MA
+     +          DZM0, DZST,
 *** Neutron detector definition
-     *     NDBX, NDBI, NDTU, NDTI, NDPB, NDCD
-
-C
-C Some usefull quantities to calculate volumes dimentions
-C
-c ml: 27/10/04:
-c        INTEGER NTRSL,NCAPL,NCAPLD,NCASTR,NS11X,
-c     +          NS12Y,NS21X,NS22Y,NS31Y,NS32X
-        INTEGER NTRSL,NTHBP,NCAPL,NCAPLD,NCASTR,NS11Y,
-     +          NS12X,NS21X,NS22Y,NS31Y,NS32X
-C
-*AB:
-        COMMON /GPCGEO/PAME( 3),SHEL( 5),TFLA( 3),SHEI( 3),
-     +                MSHE( 3),BSPH(6),TSPH( 6),TPLA( 3),            
-*END: AB.
-c ml: 28/10/04:
-     +                S11( 3),S12( 3),S21( 3),S22( 3),S31( 3),
-c end ml.
-c ml: 27/10/04:
-c     +                S32( 3),S4( 3),S11X( 3),SC11( 3),
-C DA COMMENTARE:
-     +                S32( 3),S4( 3),S11Y( 3),SC11( 3),
-C DA SCOMMENTARE:
-C     +               S32( 3),S4( 3),STOF( 3),SGLU( 3),SPV1( 3),
-C     +               SMYL( 3),S11Y( 3),S12X( 3)SPV2( 3),S21X( 3),
-C     +               S22Y( 3),S31Y( 3),SC31( 3),S32X( 3),SC32( 3),
-C OK:
-c     +                S12Y( 3),SC12( 3),S21X( 3),SC21( 3),S22Y( 3),
-C DA COMMENTARE:
-     +                S12X( 3),SC12( 3),S21X( 3),SC21( 3),S22Y( 3),
-     +                SC22( 3),S31Y( 3),SC31( 3),S32X( 3),SC32( 3),
-C OK:
-     +                CATB( 3),CATL( 3),CATT( 3),CASX( 3),CASY( 3),
-C end ml.
-*EM:
-     +                CSSX( 3),CSSY( 3),CATH( 3),CATF( 3),
-     +                CATO( 3),CATP( 3),
-*END: EM.
-*JeL:
-     +		      CASA( 3),CATA( 3),
-*END: JeL.
+     +     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
+c ml: 27/10/04:
+c        INTEGER NTRSL,NCAPL,NCAPLD,NCASTR,NS11X,
+c     +          NS12Y,NS21X,NS22Y,NS31Y,NS32X
+        INTEGER NTRSL,NTHBP,NCAPL,NCAPLD,NCASTR,NS11Y,
+     +          NS12X,NS21X,NS22Y,NS31Y,NS32X
+C
+*AB:
+        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),
+     +                CATB( 3),CATL( 3),CATT( 3),CASX( 3),CASY( 3),
+*EM:
+     +                CSSX( 3),CSSY( 3),CATH( 3),CATF( 3),
+     +                CATO( 3),CATP( 3),
+*END: EM.
+*JeL:
+     +		      CASA( 3),CATA( 3),
+*END: JeL.
      +                CARDB( 3),
-*ml: 10/11/04:
-C      +                TRDS( 3),TRDT( 3),TRDB( 3),TRFR( 3),TRFI( 3),
-     +                TRDS( 3),TRDT( 3),TRDB( 3),TRFR( 3),  
-c     +                TRBS( 3),TRSO( 3),TRSI( 3),TRRA( 3),TRAN( 3),
-c     +                TRAI( 3),
-     +                TRBS( 3),TRAL( 3),TRSO( 3),TRSI( 3),TRRA( 3),
-     +                TRFU( 3),TRFD( 3),TRFM( 3),TRFL( 3),TRR2( 3),
-     +                TRR0( 3),TRI0( 3),TRRF( 3),TRRI( 3),TRAN( 3),
-     +                TRAI( 3),
-*end ml.
-     +                SPEB( 3),MGFR( 3),MGPL( 3),MGPA( 3),MGPI( 3),
-c ml:20/04/05:
-c     +                TRPB( 3),TRPL( 3),TRSL( 3),TSPA( 3),THBP( 3),
-     +                TPGA( 3),TPGU( 3),TPGD( 3),TPGI( 3),TRPB( 3),
-     +                TPAS( 3),TPAI( 3),TRSL( 3),TSPA( 3),THBP( 3),
-     +                TRCP( 3),TBAL( 3),
-c end ml.
-     +                CALB( 3),CALS( 3),
-* F.C.&ML:
-C     +                CAPL( 3),CASI( 3),CAAD( 3),CAPD( 3),
-     +                CAPL( 3),CASI( 3),CAAD( 3),CAPD( 3),CANS( 3),
-* END F.C.&ML.
-     +                CG10( 3),CAAB( 3),XYZPOR(3),XYZSOR(3),
-*EM:
-     +                CAGL( 3),CAKP( 3),CAKA( 3),C10C( 3),
-     +                CASXD,CASYD,
-*END EM.
-*MA
-     +                DZM0, DZST,
-* end MA
-     +       NDBX(3),NDBI(3),NDTU(3),NDTI(3),NDPB(3),NDCD(3),
-
-     +                SCTIC,ZSHEL,ZTFLA,ZSHEI,ZTSPH,ZS11,ZS12,
-*AB:
-     +                ZMSHE,ZBSPH,
-*END: AB.
-c ml: 28/10/04
-c     +                ZTRD,ZS21,ZS22,ZCAT,ZCAS,ZSPEC,
-     +                ZTRD,ZS21,ZS22,ZTPLA,ZCAT,ZCAS,ZCARDB,
-     +                ZSPEBP,ZSPEC,
-     +                XGLUE,
-c end ml.
-     +                ZS31,ZS32,ZCAL,ZS4,DCASIX,DCASIY,DCASIZ,
-     +                GAPTOP,GAPTRD,
-     +                CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,
-     +                NTRSL,NTHBP,NCAPL,NCAPLD,
-c ml: 27/10/04:
-c     +                NCASTR,NS11X,NS12Y,NS21X,NS22Y,NS31Y,NS32X
-     +                NCASTR,NS11Y,NS12X,NS21X,NS22Y,NS31Y,NS32X
-c end ml.
-C
+*ml: 10/11/04:
+C      +                TRDS( 3),TRDT( 3),TRDB( 3),TRFR( 3),TRFI( 3),
+     +                TRDS( 3),TRDT( 3),TRDB( 3),TRFR( 3),  
+c     +                TRBS( 3),TRSO( 3),TRSI( 3),TRRA( 3),TRAN( 3),
+c     +                TRAI( 3),
+     +                TRBS( 3),TRAL( 3),TRSO( 3),TRSI( 3),TRRA( 3),
+     +                TRFU( 3),TRFD( 3),TRFM( 3),TRFL( 3),TRR2( 3),
+     +                TRR0( 3),TRI0( 3),TRRF( 3),TRRI( 3),TRAN( 3),
+     +                TRAI( 3),
+*end ml.
+     +                SPEB( 3),MGFR( 3),MGPL( 3),MGPA( 3),MGPI( 3),
+c ml:20/04/05:
+c     +                TRPB( 3),TRPL( 3),TRSL( 3),TSPA( 3),THBP( 3),
+     +                TPGA( 3),TPGU( 3),TPGD( 3),TPGI( 3),TRPB( 3),
+     +                TPAS( 3),TPAI( 3),TRSL( 3),TSPA( 3),THBP( 3),
+     +                TRCP( 3),TBAL( 3),
+c end ml.
+     +                CALB( 3),CALS( 3),
+* F.C.&ML:
+C     +                CAPL( 3),CASI( 3),CAAD( 3),CAPD( 3),
+     +                CAPL( 3),CASI( 3),CAAD( 3),CAPD( 3),CANS( 3),
+* END F.C.&ML.
+     +                CG10( 3),CAAB( 3),XYZPOR(3),XYZSOR(3),
+*EM:
+     +                CAGL( 3),CAKP( 3),CAKA( 3),C10C( 3),
+     +                CASXD,CASYD,
+*END EM.
+*MA
+     +                DZM0, DZST,
+* end MA
+     +                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,HTABLE,DTABLEAL,XTPLA,YTPLA,
+*AB:
+     +                ZMSHE,ZBSPH,
+*END: AB.
+c ml: 28/10/04
+c     +                ZTRD,ZS21,ZS22,ZCAT,ZCAS,ZSPEC,
+     +                ZTRD,ZTPLA,ZCAT,ZCAS,ZCARDB,ZSPEBP,ZSPEC,
+     +                ZORMG,HORMG,XGLUE,
+c end ml.
+     +                ZPAMS31,ZPAMS32,ZCAL,ZS4,ZND,DCASIX,
+     +                DCASIY,DCASIZ,GAPTOP,GAPTRD,
+     +                CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,
+     +                ZDGEN,NTRSL,NTHBP,NCAPL,NCAPLD,
+c ml: 27/10/04:
+c     +                NCASTR,NS11X,NS12Y,NS21X,NS22Y,NS31Y,NS32X
+     +                NCASTR,NS11Y,NS12X,NS21X,NS22Y,NS31Y,NS32X
+c end ml.
+C