--- gpamela/gpcdes/gpgeo.inc 2006/12/17 14:53:13 3.21 +++ gpamela/gpcdes/gpgeo.inc 2008/01/29 18:25:16 3.22 @@ -1,7 +1,10 @@ * -* $Id: gpgeo.inc,v 3.20 2006/11/30 12:29:14 cafagna Exp $ +* $Id: gpgeo.inc,v 3.21 2006/12/17 14:53:13 cafagna Exp $ * * $Log: gpgeo.inc,v $ +* Revision 3.21 2006/12/17 14:53:13 cafagna +* Full review of the CARD geometry. S1 table added +* * 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. * @@ -81,7 +84,7 @@ REAL PAME,SHEL,TFLA,SHEI,TSPH,S1,S2,S1A,S2A,S3,S11M, + S12M,S21M,S22M,S31M,S32M,POL1,POL2,POLY,S11Y,S12X,S21X, + S22Y,S31Y,S32X,TPLA,TPTU,TPTM,TPTL,TPCV,S4,S4AL,CATB, - + CATL,CATT,CASX,CASY, + + CATL,CATT,CASX,CASY,COV1,COV2,COV3, *AB: + MSHE,BSPH, *END: AB. @@ -156,7 +159,7 @@ + CATB( 3),CATL( 3),CATT( 3),CASX( 3),CASY( 3), *EM: + CSSX( 3),CSSY( 3),CATH( 3),CATF( 3), - + CATO( 3),CATP( 3), + + CATO( 3),CATP( 3),COV1(6),COV2(6),COV3(6), *END: EM. *JeL: + CASA( 3),CATA( 3),