/[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.17 by pam-ba, Fri Nov 10 11:39:34 2006 UTC revision 3.19 by pam-ba, Tue Nov 28 10:26:14 2006 UTC
# Line 1  Line 1 
1  *  *
2  * $Id: gpgeo.inc,v 3.16 2006/10/12 11:11:21 pam-ba Exp $  * $Id: gpgeo.inc,v 3.18 2006/11/16 18:45:29 pam-ba Exp $
3  *  *
4  * $Log: gpgeo.inc,v $  * $Log: gpgeo.inc,v $
5    * Revision 3.18  2006/11/16 18:45:29  pam-ba
6    * Simulated an aluminum container for S4
7    *
8    * Revision 3.17  2006/11/10 11:39:34  pam-ba
9    * S2 and S1 z-positions corrected, He3 and plystyrene mixture added, Top Plate geometry simulated and titanium mixture added.
10    *
11  * Revision 3.16  2006/10/12 11:11:21  pam-ba  * Revision 3.16  2006/10/12 11:11:21  pam-ba
12  * ND geometry updated.  * ND geometry updated.
13  *  *
# Line 68  C Common with the volumes parameters for Line 74  C Common with the volumes parameters for
74  C  C
75        REAL PAME,SHEL,TFLA,SHEI,TSPH,S1,S2,S1A,S2A,S3,S11M,        REAL PAME,SHEL,TFLA,SHEI,TSPH,S1,S2,S1A,S2A,S3,S11M,
76       +     S12M,S21M,S22M,S31M,S32M,POL1,POL2,POLY,S11Y,S12X,S21X,       +     S12M,S21M,S22M,S31M,S32M,POL1,POL2,POLY,S11Y,S12X,S21X,
77       +     S22Y,S31Y,S32X,TPLA,TPTU,TPTM,TPTL,TPCV,S4,CATB,CATL,CATT,       +     S22Y,S31Y,S32X,TPLA,TPTU,TPTM,TPTL,TPCV,S4,S4AL,CATB,
78       +     CASX,CASY,       +     CATL,CATT,CASX,CASY,
79  *AB:  *AB:
80       +     MSHE,BSPH,       +     MSHE,BSPH,
81  *END: AB.  *END: AB.
# Line 99  c end ml. Line 105  c end ml.
105       +     HPVCMIN,HALTOF,HAIRS3,HTABLE,DTABLEAL,XTPLA,YTPLA,ZTRD,       +     HPVCMIN,HALTOF,HAIRS3,HTABLE,DTABLEAL,XTPLA,YTPLA,ZTRD,
106       +     ZCAT,ZCAS,       +     ZCAT,ZCAS,
107  c ml: 28/10/04:  c ml: 28/10/04:
108       +     ZCARDB,ZTPLA,ZSPEBP,ZSPEC,ZORMG,HORMG,XGLUE,ZPAMS31Y,       +     ZCARDB,ZTPLA,ZSPEBP,ZSPEC,ZORMG,HORMG,XGLUE,DTPS3,
109       +     ZPAMS32X,ZCAL,       +     ZCAL,
110       +     ZS4,ZND,DCASIX,DCASIY,DCASIZ,       +     ZS4,ZND,DCASIX,DCASIY,DCASIZ,
111  c end ml.  c end ml.
112       +          SCTIC,GAPTOP,       +          SCTIC,GAPTOP,
# Line 130  C Line 136  C
136  c ml: 28/10/04:  c ml: 28/10/04:
137       +                S1( 3),S2( 3),S1A( 3),S2A( 3),S3( 3),       +                S1( 3),S2( 3),S1A( 3),S2A( 3),S3( 3),
138  c end ml.  c end ml.
139       +                S4( 3),S11M( 3),S12M( 3),S21M( 3),S22M( 3),       +                S4( 3),S4AL( 3),S11M( 3),S12M( 3),S21M( 3),
140       +                S31M( 3),S32M( 3),POL1(3),POL2(3),POLY(3),       +                S22M( 3),S31M( 3),S32M( 3),POL1(3),POL2(3),
141       +                S11Y( 3),S12X( 3),S21X( 3),S22Y( 3),S31Y(3),       +                POLY(3),S11Y( 3),S12X( 3),S21X( 3),S22Y( 3),
142       +                S32X( 3),       +                S31Y(3),S32X( 3),
143       +                CATB( 3),CATL( 3),CATT( 3),CASX( 3),CASY( 3),       +                CATB( 3),CATL( 3),CATT( 3),CASX( 3),CASY( 3),
144  *EM:  *EM:
145       +                CSSX( 3),CSSY( 3),CATH( 3),CATF( 3),       +                CSSX( 3),CSSY( 3),CATH( 3),CATF( 3),
# Line 188  c     +                ZTRD,ZS21,ZS22,ZC Line 194  c     +                ZTRD,ZS21,ZS22,ZC
194       +                ZTRD,ZTPLA,ZCAT,ZCAS,ZCARDB,ZSPEBP,ZSPEC,       +                ZTRD,ZTPLA,ZCAT,ZCAS,ZCARDB,ZSPEBP,ZSPEC,
195       +                ZORMG,HORMG,XGLUE,       +                ZORMG,HORMG,XGLUE,
196  c end ml.  c end ml.
197       +                ZPAMS31,ZPAMS32,ZCAL,ZS4,ZND,DCASIX,       +                DTPS3,ZCAL,ZS4,ZND,DCASIX,
198       +                DCASIY,DCASIZ,GAPTOP,GAPTRD,       +                DCASIY,DCASIZ,GAPTOP,GAPTRD,
199       +                CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,       +                CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,
200       +                ZDGEN,NTRSL,NTHBP,NCAPL,NCAPLD,       +                ZDGEN,NTRSL,NTHBP,NCAPL,NCAPLD,

Legend:
Removed from v.3.17  
changed lines
  Added in v.3.19

  ViewVC Help
Powered by ViewVC 1.1.23