--- gpamela/gpcdes/gpgeo.inc 2006/10/12 11:11:21 3.16 +++ gpamela/gpcdes/gpgeo.inc 2006/11/10 11:39:34 3.17 @@ -1,7 +1,10 @@ * -* $Id: gpgeo.inc,v 3.15 2006/06/30 15:38:16 pam-ba Exp $ +* $Id: gpgeo.inc,v 3.16 2006/10/12 11:11:21 pam-ba Exp $ * * $Log: gpgeo.inc,v $ +* Revision 3.16 2006/10/12 11:11:21 pam-ba +* ND geometry updated. +* * Revision 3.15 2006/06/30 15:38:16 pam-ba * S22 and S12 heights positioned in GPAMELA at the nominal heights in PAMELA (see document: Main geometrical parameters of the PAMELA sub-detectors, 20 December 2005) * @@ -65,7 +68,8 @@ C 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,S4,CATB,CATL,CATT,CASX,CASY, + + S22Y,S31Y,S32X,TPLA,TPTU,TPTM,TPTL,TPCV,S4,CATB,CATL,CATT, + + CASX,CASY, *AB: + MSHE,BSPH, *END: AB. @@ -92,7 +96,7 @@ + ZMSHE,ZBSPH, *END: AB. + ZTFLA,ZSHEI,ZTSPH,ZS1,ZS2A,ZS3,HMYLTOF,HGLUTOF,HPVCMAX, - + HPVCMIN,HALTOF,HAIRS3,ZPAMS12X,ZPAMS22Y,ZTRD, + + HPVCMIN,HALTOF,HAIRS3,HTABLE,DTABLEAL,XTPLA,YTPLA,ZTRD, + ZCAT,ZCAS, c ml: 28/10/04: + ZCARDB,ZTPLA,ZSPEBP,ZSPEC,ZORMG,HORMG,XGLUE,ZPAMS31Y, @@ -122,6 +126,7 @@ COMMON /GPCGEO/PAME( 3),SHEL( 5),TFLA( 3),SHEI( 3), + MSHE( 3),BSPH(6),TSPH( 6),TPLA( 3), *END: AB. + + TPTU( 3),TPTM( 3),TPTL( 3),TPCV( 3), c ml: 28/10/04: + S1( 3),S2( 3),S1A( 3),S2A( 3),S3( 3), c end ml. @@ -174,7 +179,7 @@ + NDCE(3),NDSI(3),NDSM(3),NDSE(3),TNDBX,TNDCD, + GNDTU,SCTIC,ZSHEL,ZTFLA,ZSHEI,ZTSPH,ZS1,ZS2, + ZS3,HMYLTOF,HGLUTOF,HPVCMAX,HPVCMIN,HALTOF, - + HAIRS3,ZPAMS12X,ZPAMS22Y, + + HAIRS3,HTABLE,DTABLEAL,XTPLA,YTPLA, *AB: + ZMSHE,ZBSPH, *END: AB.