--- gpamela/gpcdes/gpgeo.inc	2006/04/10 11:07:43	3.11
+++ gpamela/gpcdes/gpgeo.inc	2006/05/02 15:23:14	3.13
@@ -1,7 +1,13 @@
 *
-* $Id: gpgeo.inc,v 3.10 2006/04/09 23:28:57 cafagna Exp $
+* $Id: gpgeo.inc,v 3.12 2006/05/02 10:58:35 pam-ba Exp $
 *
 * $Log: gpgeo.inc,v $
+* 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
 *
@@ -48,54 +54,48 @@
 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,
+      REAL PAME,SHEL,TFLA,SHEI,TSPH,S1,S2,S1A,S2A,S3A,S11M,
+     +     S12M,S21M,S22M,S31M,S32M,S11Y,S12X,S21X,S22Y,S31Y,
+     +     S32X,TPLA,S4,CATB,CATL,CATT,CASX,CASY,
 *AB:
-     +          MSHE,BSPH,
+     +     MSHE,BSPH,
 *END: AB.
 *EM:
-     +          CSSX,CSSY,CASXD,CASYD,CATH,CATF,CATO,CATP,
+     +     CSSX,CSSY,CASXD,CASYD,CATH,CATF,CATO,CATP,
 *END: EM.
 *JeL:
-     +          CASA, CATA,
+     +     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,
+     +     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
+     +     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,   
+     +     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,
+     +     CASI,CG10,CAAB,XYZPOR,XYZSOR,ZSHEL,
 *AB:
-     +          ZMSHE,ZBSPH,
+     +     ZMSHE,ZBSPH,
 *END: AB.
-     +          ZTFLA,ZSHEI,ZTSPH,ZS11,ZS12,ZTRD,ZS21,ZS22,
-     +          ZCAT,ZCAS,
+     +     ZTFLA,ZSHEI,ZTSPH,ZS1,ZS2A,ZS3A,HMYLTOF,HGLUTOF,HPVCMAX,
+     +     HPVCMIN,HALTOF,HAIRS3,ZTRD,
+     +     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$$$<<<<<<< gpgeo.inc
+     +     ZCARDB,ZTPLA,ZSPEBP,ZSPEC,ZORMG,HORMG,XGLUE,ZPAMS31Y,
+     +     ZPAMS32X,ZCAL,
+     +     ZS4,DCASIX,DCASIY,DCASIZ, 
+c$$$=======
+c$$$     +          ZCARDB,
+c$$$C     +          ZSPEC,ZS31,ZS32,ZCAL,ZS4,DCASIX,DCASIY,DCASIZ,
+c$$$     +          ZTPLA,ZSPEBP,ZSPEC,XGLUE,ZS31,ZS32,ZCAL,ZS4,DCASIX,
+c$$$     +          DCASIY,DCASIZ, 
+c$$$>>>>>>> 3.11
 c end ml.
      +          SCTIC,GAPTOP,
      +          GAPTRD,CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,
@@ -104,9 +104,9 @@
 *END EM.
 * MA
      +          DZM0, DZST,
-*** Neutron detector definition
-     *     NDBX, NDBI, NDTU, NDTI, NDPB, NDCD
-
+*** Neutron detector definition
+     *     NDBX, NDBI, NDTU, NDTI, NDPB, NDCD
+
 C
 C Some usefull quantities to calculate volumes dimentions
 C
@@ -121,12 +121,12 @@
      +                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),
+     +                S1( 3),S2( 3),S1A( 3),S2A( 3),S3A( 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),
+     +                S4( 3),S11M( 3),S12M( 3),S21M( 3),S22M( 3),
+     +                S31M( 3),S32M( 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),
@@ -134,8 +134,8 @@
 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),
+     +                S11Y( 3),S12X( 3),S21X( 3),S22Y( 3),S31Y(3),
+     +                S32X( 3),
 C OK:
      +                CATB( 3),CATL( 3),CATT( 3),CASX( 3),CASY( 3),
 C end ml.
@@ -177,20 +177,27 @@
 *MA
      +                DZM0, DZST,
 * end MA
-     +       NDBX(3),NDBI(3),NDTU(3),NDTI(3),NDPB(3),NDCD(3),
-
-     +                SCTIC,ZSHEL,ZTFLA,ZSHEI,ZTSPH,ZS11,ZS12,
+     +       NDBX(3),NDBI(3),NDTU(3),NDTI(3),NDPB(3),NDCD(3),
+
+     +                SCTIC,ZSHEL,ZTFLA,ZSHEI,ZTSPH,ZS1,ZS2,ZS3A,
+     +                HMYLTOF,HGLUTOF,HPVCMAX,HPVCMIN,HALTOF,
+     +                HAIRS3,
 *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$$$<<<<<<< gpgeo.inc
+     +                ZTRD,ZTPLA,ZCAT,ZCAS,ZCARDB,ZSPEBP,ZSPEC,
+     +                ZORMG,HORMG,XGLUE,
+c$$$=======
+c$$$     +                ZTRD,ZS21,ZS22,ZTPLA,ZCAT,ZCAS,ZCARDB,
+c$$$     +                ZSPEBP,ZSPEC,
+c$$$     +                XGLUE,
+c$$$>>>>>>> 3.11
 c end ml.
-     +                ZS31,ZS32,ZCAL,ZS4,DCASIX,DCASIY,DCASIZ,
-     +                GAPTOP,GAPTRD,
+     +                ZPAMS31,ZPAMS32,ZCAL,ZS4,DCASIX,
+     +                DCASIY,DCASIZ,GAPTOP,GAPTRD,
      +                CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,
      +                ZDGEN,NTRSL,NTHBP,NCAPL,NCAPLD,
 c ml: 27/10/04: