/[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.18 by pam-ba, Thu Nov 16 18:45:29 2006 UTC revision 3.21 by cafagna, Sun Dec 17 14:53:13 2006 UTC
# Line 1  Line 1 
1  *  *
2  * $Id: gpgeo.inc,v 3.17 2006/11/10 11:39:34 pam-ba Exp $  * $Id: gpgeo.inc,v 3.20 2006/11/30 12:29:14 cafagna Exp $
3  *  *
4  * $Log: gpgeo.inc,v $  * $Log: gpgeo.inc,v $
5    * Revision 3.20  2006/11/30 12:29:14  cafagna
6    * CARD geometry updated. New S1 "table", legs included, added. Top magnetic screen has been added as well.
7    *
8    * Revision 3.19  2006/11/28 10:26:14  pam-ba
9    * S3 positioning completed
10    *
11    * Revision 3.18  2006/11/16 18:45:29  pam-ba
12    * Simulated an aluminum container for S4
13    *
14  * Revision 3.17  2006/11/10 11:39:34  pam-ba  * Revision 3.17  2006/11/10 11:39:34  pam-ba
15  * S2 and S1 z-positions corrected, He3 and plystyrene mixture added, Top Plate geometry simulated and titanium mixture added.  * S2 and S1 z-positions corrected, He3 and plystyrene mixture added, Top Plate geometry simulated and titanium mixture added.
16  *  *
# Line 82  C Line 91  C
91  *JeL:  *JeL:
92       +     CASA, CATA,       +     CASA, CATA,
93  *END: JeL.  *END: JeL.
94       +          CARDB,       +          CARDB,CAR,CARA,CARB,
95         +          ATY,ATZ,PT,
96         +          LEGB,LEG1,LEG2,LEG3,LEG4,LEG5,LEG6,
97         +          LEG7,LEG8,LEG9,TOHO,TOPT,
98         +          TPLT,TOPC,TH11,TH12,TH21,TH22,
99         +          MGSC,MGSH,LEGP,TOPP,
100         +          CAR1,CAR2,CR1P,CR2P,C1D1,C2D1,
101         +          VSN1,VSN2,VPN1,VPN2,VAN1,VAN2,
102  *ml: 10/11/04:  *ml: 10/11/04:
103       +     TRDS,TRDT,TRDB,TRFR,TRBS,TRAL,TRSO,TRSI,TRRA,       +     TRDS,TRDT,TRDB,TRFR,TRBS,TRAL,TRSO,TRSI,TRRA,
104       +     TRFU,TRFD,TRFM,TRFL,TRR2,TRR0,TRI0,TRRF,TRRI,       +     TRFU,TRFD,TRFM,TRFL,TRR2,TRR0,TRI0,TRRF,TRRI,
# Line 102  c end ml. Line 118  c end ml.
118       +     HPVCMIN,HALTOF,HAIRS3,HTABLE,DTABLEAL,XTPLA,YTPLA,ZTRD,       +     HPVCMIN,HALTOF,HAIRS3,HTABLE,DTABLEAL,XTPLA,YTPLA,ZTRD,
119       +     ZCAT,ZCAS,       +     ZCAT,ZCAS,
120  c ml: 28/10/04:  c ml: 28/10/04:
121       +     ZCARDB,ZTPLA,ZSPEBP,ZSPEC,ZORMG,HORMG,XGLUE,ZPAMS31Y,       +     ZCARDB,ZTPLA,ZSPEBP,ZSPEC,ZORMG,HORMG,XGLUE,DTPS3,
122       +     ZPAMS32X,ZCAL,       +     ZCAL,
123       +     ZS4,ZND,DCASIX,DCASIY,DCASIZ,       +     ZS4,ZND,DCASIX,DCASIY,DCASIZ,
124  c end ml.  c end ml.
125       +          SCTIC,GAPTOP,       +          SCTIC,GAPTOP,
# Line 143  c end ml. Line 159  c end ml.
159       +                CATO( 3),CATP( 3),       +                CATO( 3),CATP( 3),
160  *END: EM.  *END: EM.
161  *JeL:  *JeL:
162       +                CASA( 3),CATA( 3),       +            CASA( 3),CATA( 3),
163  *END: JeL.  *END: JeL.
164       +                CARDB( 3),       +            CARDB(3),CAR(8),CARA(7),CARB(7),!positioning parameters
165         +            ATY,ATZ,PT,            !aluminium and plastic thickness
166         +            CAR1(11),CR1P(11),C1D1(11),C2D1(11),
167         +            CAR2(11),CR2P(11),VSN1(11),VPN1(11),
168         +            VAN1(11),VSN2(11),VPN2(11),VAN2(11),
169         +            LEGB(3),LEG1(11),LEG2(3),LEG3(3),LEG4(3),
170         +            LEG5(3),LEG6(3),LEG7(3),LEG8(3),LEG9(3),
171         +            LEGP(8),TOPP(9),                !positioning parameters
172         +            MGSC(3),MGSH(3),TOHO(3),TOPT(11),
173         +            TPLT(3),TOPC(3),TH11(3),TH12(3),TH21(3),TH22(3),
174    
175  *ml: 10/11/04:  *ml: 10/11/04:
176  C      +                TRDS( 3),TRDT( 3),TRDB( 3),TRFR( 3),TRFI( 3),  C      +                TRDS( 3),TRDT( 3),TRDB( 3),TRFR( 3),TRFI( 3),
177       +                TRDS( 3),TRDT( 3),TRDB( 3),TRFR( 3),         +                TRDS( 3),TRDT( 3),TRDB( 3),TRFR( 3),  
# Line 191  c     +                ZTRD,ZS21,ZS22,ZC Line 217  c     +                ZTRD,ZS21,ZS22,ZC
217       +                ZTRD,ZTPLA,ZCAT,ZCAS,ZCARDB,ZSPEBP,ZSPEC,       +                ZTRD,ZTPLA,ZCAT,ZCAS,ZCARDB,ZSPEBP,ZSPEC,
218       +                ZORMG,HORMG,XGLUE,       +                ZORMG,HORMG,XGLUE,
219  c end ml.  c end ml.
220       +                ZPAMS31,ZPAMS32,ZCAL,ZS4,ZND,DCASIX,       +                DTPS3,ZCAL,ZS4,ZND,DCASIX,
221       +                DCASIY,DCASIZ,GAPTOP,GAPTRD,       +                DCASIY,DCASIZ,GAPTOP,GAPTRD,
222       +                CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,       +                CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,
223       +                ZDGEN,NTRSL,NTHBP,NCAPL,NCAPLD,       +                ZDGEN,NTRSL,NTHBP,NCAPL,NCAPLD,
Legend:
Removed from v.3.18  
changed lines
  Added in v.3.21
  ViewVC Help
Powered by ViewVC 1.1.23