/[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.20 by cafagna, Thu Nov 30 12:29:14 2006 UTC revision 3.22 by pamela, Tue Jan 29 18:25:16 2008 UTC
# Line 1  Line 1 
1  *  *
2  * $Id: gpgeo.inc,v 3.19 2006/11/28 10:26:14 pam-ba Exp $  * $Id: gpgeo.inc,v 3.21 2006/12/17 14:53:13 cafagna Exp $
3  *  *
4  * $Log: gpgeo.inc,v $  * $Log: gpgeo.inc,v $
5    * Revision 3.21  2006/12/17 14:53:13  cafagna
6    * Full review of the CARD geometry. S1 table added
7    *
8    * Revision 3.20  2006/11/30 12:29:14  cafagna
9    * CARD geometry updated. New S1 "table", legs included, added. Top magnetic screen has been added as well.
10    *
11  * Revision 3.19  2006/11/28 10:26:14  pam-ba  * Revision 3.19  2006/11/28 10:26:14  pam-ba
12  * S3 positioning completed  * S3 positioning completed
13  *  *
# Line 78  C Line 84  C
84        REAL PAME,SHEL,TFLA,SHEI,TSPH,S1,S2,S1A,S2A,S3,S11M,        REAL PAME,SHEL,TFLA,SHEI,TSPH,S1,S2,S1A,S2A,S3,S11M,
85       +     S12M,S21M,S22M,S31M,S32M,POL1,POL2,POLY,S11Y,S12X,S21X,       +     S12M,S21M,S22M,S31M,S32M,POL1,POL2,POLY,S11Y,S12X,S21X,
86       +     S22Y,S31Y,S32X,TPLA,TPTU,TPTM,TPTL,TPCV,S4,S4AL,CATB,       +     S22Y,S31Y,S32X,TPLA,TPTU,TPTM,TPTL,TPCV,S4,S4AL,CATB,
87       +     CATL,CATT,CASX,CASY,       +     CATL,CATT,CASX,CASY,COV1,COV2,COV3,
88  *AB:  *AB:
89       +     MSHE,BSPH,       +     MSHE,BSPH,
90  *END: AB.  *END: AB.
# Line 93  C Line 99  C
99       +          LEGB,LEG1,LEG2,LEG3,LEG4,LEG5,LEG6,       +          LEGB,LEG1,LEG2,LEG3,LEG4,LEG5,LEG6,
100       +          LEG7,LEG8,LEG9,TOHO,TOPT,       +          LEG7,LEG8,LEG9,TOHO,TOPT,
101       +          TPLT,TOPC,TH11,TH12,TH21,TH22,       +          TPLT,TOPC,TH11,TH12,TH21,TH22,
102       +          MGSC,MGSH,       +          MGSC,MGSH,LEGP,TOPP,
103         +          CAR1,CAR2,CR1P,CR2P,C1D1,C2D1,
104         +          VSN1,VSN2,VPN1,VPN2,VAN1,VAN2,
105  *ml: 10/11/04:  *ml: 10/11/04:
106       +     TRDS,TRDT,TRDB,TRFR,TRBS,TRAL,TRSO,TRSI,TRRA,       +     TRDS,TRDT,TRDB,TRFR,TRBS,TRAL,TRSO,TRSI,TRRA,
107       +     TRFU,TRFD,TRFM,TRFL,TRR2,TRR0,TRI0,TRRF,TRRI,       +     TRFU,TRFD,TRFM,TRFL,TRR2,TRR0,TRI0,TRRF,TRRI,
# Line 151  c end ml. Line 159  c end ml.
159       +                CATB( 3),CATL( 3),CATT( 3),CASX( 3),CASY( 3),       +                CATB( 3),CATL( 3),CATT( 3),CASX( 3),CASY( 3),
160  *EM:  *EM:
161       +                CSSX( 3),CSSY( 3),CATH( 3),CATF( 3),       +                CSSX( 3),CSSY( 3),CATH( 3),CATF( 3),
162       +                CATO( 3),CATP( 3),       +                CATO( 3),CATP( 3),COV1(6),COV2(6),COV3(6),
163  *END: EM.  *END: EM.
164  *JeL:  *JeL:
165       +            CASA( 3),CATA( 3),       +            CASA( 3),CATA( 3),
166  *END: JeL.  *END: JeL.
167       +            CARDB(3),CAR(8),CARA(7),CARB(7),       +            CARDB(3),CAR(8),CARA(7),CARB(7),!positioning parameters
168       +            ATY,ATZ,PT,       +            ATY,ATZ,PT,            !aluminium and plastic thickness
169         +            CAR1(11),CR1P(11),C1D1(11),C2D1(11),
170         +            CAR2(11),CR2P(11),VSN1(11),VPN1(11),
171         +            VAN1(11),VSN2(11),VPN2(11),VAN2(11),
172       +            LEGB(3),LEG1(11),LEG2(3),LEG3(3),LEG4(3),       +            LEGB(3),LEG1(11),LEG2(3),LEG3(3),LEG4(3),
173       +            LEG5(3),LEG6(3),LEG7(3),LEG8(3),LEG9(3),       +            LEG5(3),LEG6(3),LEG7(3),LEG8(3),LEG9(3),
174         +            LEGP(8),TOPP(9),                !positioning parameters
175       +            MGSC(3),MGSH(3),TOHO(3),TOPT(11),       +            MGSC(3),MGSH(3),TOHO(3),TOPT(11),
176       +            TPLT(3),TOPC(3),TH11(3),TH12(3),TH21(3),TH22(3),       +            TPLT(3),TOPC(3),TH11(3),TH12(3),TH21(3),TH22(3),
177    
Legend:
Removed from v.3.20  
changed lines
  Added in v.3.22
  ViewVC Help
Powered by ViewVC 1.1.23