--- gpamela/gpcdes/gpgeo.inc	2006/11/16 18:45:29	3.18
+++ gpamela/gpcdes/gpgeo.inc	2006/12/17 14:53:13	3.21
@@ -1,7 +1,16 @@
 *
-* $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 $
 *
 * $Log: gpgeo.inc,v $
+* Revision 3.20  2006/11/30 12:29:14  cafagna
+* CARD geometry updated. New S1 "table", legs included, added. Top magnetic screen has been added as well.
+*
+* Revision 3.19  2006/11/28 10:26:14  pam-ba
+* S3 positioning completed
+*
+* Revision 3.18  2006/11/16 18:45:29  pam-ba
+* Simulated an aluminum container for S4
+*
 * Revision 3.17  2006/11/10 11:39:34  pam-ba
 * S2 and S1 z-positions corrected, He3 and plystyrene mixture added, Top Plate geometry simulated and titanium mixture added.
 *
@@ -82,7 +91,14 @@
 *JeL:
      +     CASA, CATA,
 *END: JeL.
-     +          CARDB,
+     +          CARDB,CAR,CARA,CARB,
+     +          ATY,ATZ,PT,
+     +          LEGB,LEG1,LEG2,LEG3,LEG4,LEG5,LEG6,
+     +          LEG7,LEG8,LEG9,TOHO,TOPT,
+     +          TPLT,TOPC,TH11,TH12,TH21,TH22,
+     +          MGSC,MGSH,LEGP,TOPP,
+     +          CAR1,CAR2,CR1P,CR2P,C1D1,C2D1,
+     +          VSN1,VSN2,VPN1,VPN2,VAN1,VAN2,
 *ml: 10/11/04:
      +     TRDS,TRDT,TRDB,TRFR,TRBS,TRAL,TRSO,TRSI,TRRA,
      +     TRFU,TRFD,TRFM,TRFL,TRR2,TRR0,TRI0,TRRF,TRRI,
@@ -102,8 +118,8 @@
      +     HPVCMIN,HALTOF,HAIRS3,HTABLE,DTABLEAL,XTPLA,YTPLA,ZTRD,
      +     ZCAT,ZCAS,
 c ml: 28/10/04:
-     +     ZCARDB,ZTPLA,ZSPEBP,ZSPEC,ZORMG,HORMG,XGLUE,ZPAMS31Y,
-     +     ZPAMS32X,ZCAL,
+     +     ZCARDB,ZTPLA,ZSPEBP,ZSPEC,ZORMG,HORMG,XGLUE,DTPS3,
+     +     ZCAL,
      +     ZS4,ZND,DCASIX,DCASIY,DCASIZ,
 c end ml.
      +          SCTIC,GAPTOP,
@@ -143,9 +159,19 @@
      +                CATO( 3),CATP( 3),
 *END: EM.
 *JeL:
-     +		      CASA( 3),CATA( 3),
+     +            CASA( 3),CATA( 3),
 *END: JeL.
-     +                CARDB( 3),
+     +            CARDB(3),CAR(8),CARA(7),CARB(7),!positioning parameters
+     +            ATY,ATZ,PT,            !aluminium and plastic thickness
+     +            CAR1(11),CR1P(11),C1D1(11),C2D1(11),
+     +            CAR2(11),CR2P(11),VSN1(11),VPN1(11),
+     +            VAN1(11),VSN2(11),VPN2(11),VAN2(11),
+     +            LEGB(3),LEG1(11),LEG2(3),LEG3(3),LEG4(3),
+     +            LEG5(3),LEG6(3),LEG7(3),LEG8(3),LEG9(3),
+     +            LEGP(8),TOPP(9),                !positioning parameters
+     +            MGSC(3),MGSH(3),TOHO(3),TOPT(11),
+     +            TPLT(3),TOPC(3),TH11(3),TH12(3),TH21(3),TH22(3),
+
 *ml: 10/11/04:
 C      +                TRDS( 3),TRDT( 3),TRDB( 3),TRFR( 3),TRFI( 3),
      +                TRDS( 3),TRDT( 3),TRDB( 3),TRFR( 3),  
@@ -191,7 +217,7 @@
      +                ZTRD,ZTPLA,ZCAT,ZCAS,ZCARDB,ZSPEBP,ZSPEC,
      +                ZORMG,HORMG,XGLUE,
 c end ml.
-     +                ZPAMS31,ZPAMS32,ZCAL,ZS4,ZND,DCASIX,
+     +                DTPS3,ZCAL,ZS4,ZND,DCASIX,
      +                DCASIY,DCASIZ,GAPTOP,GAPTRD,
      +                CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,
      +                ZDGEN,NTRSL,NTHBP,NCAPL,NCAPLD,