/[PAMELA software]/gpamela/gpcdes/gpgeo.inc
ViewVC logotype

Diff of /gpamela/gpcdes/gpgeo.inc

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3.16 by pam-ba, Thu Oct 12 11:11:21 2006 UTC revision 3.18 by pam-ba, Thu Nov 16 18:45:29 2006 UTC
# Line 1  Line 1 
1  *  *
2  * $Id: gpgeo.inc,v 3.15 2006/06/30 15:38:16 pam-ba Exp $  * $Id: gpgeo.inc,v 3.17 2006/11/10 11:39:34 pam-ba Exp $
3  *  *
4  * $Log: gpgeo.inc,v $  * $Log: gpgeo.inc,v $
5    * Revision 3.17  2006/11/10 11:39:34  pam-ba
6    * S2 and S1 z-positions corrected, He3 and plystyrene mixture added, Top Plate geometry simulated and titanium mixture added.
7    *
8    * Revision 3.16  2006/10/12 11:11:21  pam-ba
9    * ND geometry updated.
10    *
11  * Revision 3.15  2006/06/30 15:38:16  pam-ba  * Revision 3.15  2006/06/30 15:38:16  pam-ba
12  * 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)  * 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)
13  *  *
# Line 65  C Common with the volumes parameters for Line 71  C Common with the volumes parameters for
71  C  C
72        REAL PAME,SHEL,TFLA,SHEI,TSPH,S1,S2,S1A,S2A,S3,S11M,        REAL PAME,SHEL,TFLA,SHEI,TSPH,S1,S2,S1A,S2A,S3,S11M,
73       +     S12M,S21M,S22M,S31M,S32M,POL1,POL2,POLY,S11Y,S12X,S21X,       +     S12M,S21M,S22M,S31M,S32M,POL1,POL2,POLY,S11Y,S12X,S21X,
74       +     S22Y,S31Y,S32X,TPLA,S4,CATB,CATL,CATT,CASX,CASY,       +     S22Y,S31Y,S32X,TPLA,TPTU,TPTM,TPTL,TPCV,S4,S4AL,CATB,
75         +     CATL,CATT,CASX,CASY,
76  *AB:  *AB:
77       +     MSHE,BSPH,       +     MSHE,BSPH,
78  *END: AB.  *END: AB.
# Line 92  c end ml. Line 99  c end ml.
99       +     ZMSHE,ZBSPH,       +     ZMSHE,ZBSPH,
100  *END: AB.  *END: AB.
101       +     ZTFLA,ZSHEI,ZTSPH,ZS1,ZS2A,ZS3,HMYLTOF,HGLUTOF,HPVCMAX,       +     ZTFLA,ZSHEI,ZTSPH,ZS1,ZS2A,ZS3,HMYLTOF,HGLUTOF,HPVCMAX,
102       +     HPVCMIN,HALTOF,HAIRS3,ZPAMS12X,ZPAMS22Y,ZTRD,       +     HPVCMIN,HALTOF,HAIRS3,HTABLE,DTABLEAL,XTPLA,YTPLA,ZTRD,
103       +     ZCAT,ZCAS,       +     ZCAT,ZCAS,
104  c ml: 28/10/04:  c ml: 28/10/04:
105       +     ZCARDB,ZTPLA,ZSPEBP,ZSPEC,ZORMG,HORMG,XGLUE,ZPAMS31Y,       +     ZCARDB,ZTPLA,ZSPEBP,ZSPEC,ZORMG,HORMG,XGLUE,ZPAMS31Y,
# Line 122  C Line 129  C
129          COMMON /GPCGEO/PAME( 3),SHEL( 5),TFLA( 3),SHEI( 3),          COMMON /GPCGEO/PAME( 3),SHEL( 5),TFLA( 3),SHEI( 3),
130       +                MSHE( 3),BSPH(6),TSPH( 6),TPLA( 3),       +                MSHE( 3),BSPH(6),TSPH( 6),TPLA( 3),
131  *END: AB.  *END: AB.
132         +                TPTU( 3),TPTM( 3),TPTL( 3),TPCV( 3),
133  c ml: 28/10/04:  c ml: 28/10/04:
134       +                S1( 3),S2( 3),S1A( 3),S2A( 3),S3( 3),       +                S1( 3),S2( 3),S1A( 3),S2A( 3),S3( 3),
135  c end ml.  c end ml.
136       +                S4( 3),S11M( 3),S12M( 3),S21M( 3),S22M( 3),       +                S4( 3),S4AL( 3),S11M( 3),S12M( 3),S21M( 3),
137       +                S31M( 3),S32M( 3),POL1(3),POL2(3),POLY(3),       +                S22M( 3),S31M( 3),S32M( 3),POL1(3),POL2(3),
138       +                S11Y( 3),S12X( 3),S21X( 3),S22Y( 3),S31Y(3),       +                POLY(3),S11Y( 3),S12X( 3),S21X( 3),S22Y( 3),
139       +                S32X( 3),       +                S31Y(3),S32X( 3),
140       +                CATB( 3),CATL( 3),CATT( 3),CASX( 3),CASY( 3),       +                CATB( 3),CATL( 3),CATT( 3),CASX( 3),CASY( 3),
141  *EM:  *EM:
142       +                CSSX( 3),CSSY( 3),CATH( 3),CATF( 3),       +                CSSX( 3),CSSY( 3),CATH( 3),CATF( 3),
# Line 174  C     +                CAPL( 3),CASI( 3) Line 182  C     +                CAPL( 3),CASI( 3)
182       +                NDCE(3),NDSI(3),NDSM(3),NDSE(3),TNDBX,TNDCD,       +                NDCE(3),NDSI(3),NDSM(3),NDSE(3),TNDBX,TNDCD,
183       +                GNDTU,SCTIC,ZSHEL,ZTFLA,ZSHEI,ZTSPH,ZS1,ZS2,       +                GNDTU,SCTIC,ZSHEL,ZTFLA,ZSHEI,ZTSPH,ZS1,ZS2,
184       +                ZS3,HMYLTOF,HGLUTOF,HPVCMAX,HPVCMIN,HALTOF,       +                ZS3,HMYLTOF,HGLUTOF,HPVCMAX,HPVCMIN,HALTOF,
185       +                HAIRS3,ZPAMS12X,ZPAMS22Y,       +                HAIRS3,HTABLE,DTABLEAL,XTPLA,YTPLA,
186  *AB:  *AB:
187       +                ZMSHE,ZBSPH,       +                ZMSHE,ZBSPH,
188  *END: AB.  *END: AB.
Legend:
Removed from v.3.16  
changed lines
  Added in v.3.18
  ViewVC Help
Powered by ViewVC 1.1.23