--- gpamela/gpcdes/gpgeo.inc 2002/07/11 16:01:59 3.1 +++ gpamela/gpcdes/gpgeo.inc 2005/07/25 11:53:21 3.4 @@ -1,11 +1,22 @@ * -* $Id$ +* $Id: gpgeo.inc,v 3.3 2005/06/21 02:42:13 cafagna Exp $ +* +* $Log: gpgeo.inc,v $ +* Revision 3.3 2005/06/21 02:42:13 cafagna +* Major modification to the geometry and to the random number chain +* +* Revision 3.2 2002/12/05 10:17:42 pamela +* Update CAS and CALO geometries and positions. Makefile updated as well +* +* Revision 3.1.1.1 2002/07/11 16:01:59 cafagna +* First GPAMELA release on CVS * -* $Log$ * * * gpgeo.inc * +* 16/07/2004 16.44.06 by Alexey Bakaldin +* 27/08/2002 15.28.12 by Jens Lund *CMZ : 3.00/00 14/11/2000 09.13.05 by Emiliano Mocchiutti *CMZ : 2.02/00 12/10/2000 17.59.14 by Francesco Cafagna *CMZ : 2.01/00 05/04/2000 14.35.17 by Marialuigia Ambriola @@ -16,57 +27,147 @@ C C Common with the volumes parameters for PAMELA C - REAL PAME,SHEL,TFLA,SHEI,TSPH,S11,S12,S21,S22,S31, - + S32,S4,S11X,SC11,S12Y,SC12,S21X,SC21,S22Y,SC22, +c ml: 28/10/04: +C REAL PAME,SHEL,TFLA,SHEI,TSPH,S11,S12,S21,S22,S31, + REAL PAME,SHEL,TFLA,SHEI,TSPH,S11,S12,S21,S22,TPLA,S31, +c end ml. +c ml: 27/10/04: +c + S32,S4,S11X,SC11,S12Y,SC12,S21X,SC21,S22Y,SC22, +c ml:20/12/04: +c da commentare: + + S32,S4,S11Y,SC11,S12X,SC12,S21X,SC21,S22Y,SC22, +C DA SCOMMENTARE: +C + S32,S4,STOF,SGLU,SPV1,SMYL,S11Y,S12X,SPV2,S21X,S22Y, +C OK: +c end ml. + S31Y,SC31,S32X,SC32,CATB,CATL,CATT,CASX,CASY, +*AB: + + MSHE,BSPH, +*END: AB. *EM: - + CSSX,CSSY,CASXD,CASYD,CATH,CATF,CATO,CATP + + CSSX,CSSY,CASXD,CASYD,CATH,CATF,CATO,CATP, *END: EM. - + TRDS,TRDT,TRDB,TRFR,TRFI,TRBS,TRSO,TRSI,TRRA, - + TRAN,TRAI,SPEB,MGPL,MGPI, - + TRPB,TRPL,TRSL,TSPA,TRCP,CALB,CALS,CAPL, +*JeL: + + CASA, CATA, +*END: JeL. +*ml: 10/11/04: +c + TRDS,TRDT,TRDB,TRFR,TRFI,TRBS,TRSO,TRSI,TRRA, +C + TRDS,TRDT,TRDB,TRFR,TRFI,TRBS,TRAL,TRSO,TRSI,TRRA, + + TRDS,TRDT,TRDB,TRFR,TRBS,TRAL,TRSO,TRSI,TRRA, + + TRFU,TRFD,TRFM,TRFL,TRR2,TRR0,TRI0,TRRF,TRRI, +*end ml. + + TRAN,TRAI,SPEB,MGPL,MGPI,MGFR, +*F.V.&ML: +C + TRPB,TRPL,TRSL,TSPA,TRCP,CALB,CALS,CAPL, +c ml: 26/11/04: +c + TRPB,TRPL,TRSL,TSPA,TRCP,CALB,CALS,CAPL,CANS, +c ml: 20/04/05: +c + TRPB,TRPL,TRSL,TSPA,THBP,TRCP,CALB,CALS,CAPL,CANS, + + TRPB,TPAI,TPAS,TRSL,TSPA,THBP,TRCP,CALB,CALS, + + CAPL,CANS, +c end ml. +*END F.V.&ML. + CASI,CG10,CAAB,XYZPOR,XYZSOR,ZSHEL, +*AB: + + ZMSHE,ZBSPH, +*END: AB. + ZTFLA,ZSHEI,ZTSPH,ZS11,ZS12,ZTRD,ZS21,ZS22, + ZCAT,ZCAS, - + ZSPEC,ZS31,ZS32,ZCAL,ZS4,DCASIX,DCASIY,DCASIZ, +c ml: 28/10/04: +C + ZSPEC,ZS31,ZS32,ZCAL,ZS4,DCASIX,DCASIY,DCASIZ, + + ZTPLA,ZSPEC,ZS31,ZS32,ZCAL,ZS4,DCASIX,DCASIY,DCASIZ, +c end ml. + SCTIC,GAPTOP, + GAPTRD,CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN, *EM: - + CAGL,CAKP,CAKA,C10C,CAAD,CAPD + + CAGL,CAKP,CAKA,C10C,CAAD,CAPD, *END EM. +* MA + + DZM0, DZST C C Some usefull quantities to calculate volumes dimentions C - INTEGER NTRSL,NCAPL,NCAPLD,NCASTR,NS11X, - + NS12Y,NS21X,NS22Y,NS31Y,NS32X -C - COMMON /GPCGEO/PAME( 3),SHEL( 3),TFLA( 3),SHEI( 3), - + TSPH( 6),S11( 3),S12( 3),S21( 3),S22( 3), - + S31( 3),S32( 3),S4( 3),S11X( 3),SC11( 3), - + S12Y( 3),SC12( 3),S21X( 3),SC21( 3),S22Y( 3), +c ml: 27/10/04: +c INTEGER NTRSL,NCAPL,NCAPLD,NCASTR,NS11X, +c + NS12Y,NS21X,NS22Y,NS31Y,NS32X + INTEGER NTRSL,NTHBP,NCAPL,NCAPLD,NCASTR,NS11Y, + + NS12X,NS21X,NS22Y,NS31Y,NS32X +C +*AB: + COMMON /GPCGEO/PAME( 3),SHEL( 5),TFLA( 3),SHEI( 3), + + MSHE( 3),BSPH(6),TSPH( 6),TPLA( 3), +*END: AB. +c ml: 28/10/04: + + S11( 3),S12( 3),S21( 3),S22( 3),S31( 3), +c end ml. +c ml: 27/10/04: +c + S32( 3),S4( 3),S11X( 3),SC11( 3), +C DA COMMENTARE: + + S32( 3),S4( 3),S11Y( 3),SC11( 3), +C DA SCOMMENTARE: +C + S32( 3),S4( 3),STOF( 3),SGLU( 3),SPV1( 3), +C + SMYL( 3),S11Y( 3),S12X( 3)SPV2( 3),S21X( 3), +C + S22Y( 3),S31Y( 3),SC31( 3),S32X( 3),SC32( 3), +C OK: +c + S12Y( 3),SC12( 3),S21X( 3),SC21( 3),S22Y( 3), +C DA COMMENTARE: + + S12X( 3),SC12( 3),S21X( 3),SC21( 3),S22Y( 3), + SC22( 3),S31Y( 3),SC31( 3),S32X( 3),SC32( 3), +C OK: + CATB( 3),CATL( 3),CATT( 3),CASX( 3),CASY( 3), +C end ml. *EM: + CSSX( 3),CSSY( 3),CATH( 3),CATF( 3), + CATO( 3),CATP( 3), *END: EM. - + TRDS( 3),TRDT( 3),TRDB( 3),TRFR( 3),TRFI( 3), - + TRBS( 3),TRSO( 3),TRSI( 3),TRRA( 3),TRAN( 3), +*JeL: + + CASA( 3),CATA( 3), +*END: JeL. +*ml: 10/11/04: +C + TRDS( 3),TRDT( 3),TRDB( 3),TRFR( 3),TRFI( 3), + + TRDS( 3),TRDT( 3),TRDB( 3),TRFR( 3), +c + TRBS( 3),TRSO( 3),TRSI( 3),TRRA( 3),TRAN( 3), +c + TRAI( 3), + + TRBS( 3),TRAL( 3),TRSO( 3),TRSI( 3),TRRA( 3), + + TRFU( 3),TRFD( 3),TRFM( 3),TRFL( 3),TRR2( 3), + + TRR0( 3),TRI0( 3),TRRF( 3),TRRI( 3),TRAN( 3), + TRAI( 3), - + SPEB( 3),MGPL( 3),MGPI( 3), - + TRPB( 3),TRPL( 3),TRSL( 3),TSPA( 3), +*end ml. + + SPEB( 3),MGPL( 3),MGPI( 3),MGFR(3), +c ml: 26/11/04: +c + TRPB( 3),TRPL( 3),TRSL( 3),TSPA( 3), +c ml:20/04/05: +c + TRPB( 3),TRPL( 3),TRSL( 3),TSPA( 3),THBP( 3), + + TRPB( 3),TPAI( 3),TPAS( 3),TRSL( 3), + + TSPA( 3),THBP( 3), +c end ml. + TRCP( 3),CALB( 3),CALS( 3), - + CAPL( 3),CASI( 3),CAAD( 3),CAPD( 3), +* F.C.&ML: +C + CAPL( 3),CASI( 3),CAAD( 3),CAPD( 3), + + CAPL( 3),CASI( 3),CAAD( 3),CAPD( 3),CANS( 3), +* END F.C.&ML. + CG10( 3),CAAB( 3),XYZPOR(3),XYZSOR(3), *EM: + CAGL( 3),CAKP( 3),CAKA( 3),C10C( 3), + CASXD,CASYD, *END EM. +*MA + + DZM0, DZST, +* end MA + SCTIC,ZSHEL,ZTFLA,ZSHEI,ZTSPH,ZS11,ZS12, - + ZTRD,ZS21,ZS22,ZCAT,ZCAS,ZSPEC, +*AB: + + ZMSHE,ZBSPH, +*END: AB. +c ml: 28/10/04 +c + ZTRD,ZS21,ZS22,ZCAT,ZCAS,ZSPEC, + + ZTRD,ZS21,ZS22,ZTPLA,ZCAT,ZCAS,ZSPEC, +c end ml. + ZS31,ZS32,ZCAL,ZS4,DCASIX,DCASIY,DCASIZ, + GAPTOP,GAPTRD, + CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN, - + NTRSL,NCAPL,NCAPLD, - + NCASTR,NS11X,NS12Y,NS21X,NS22Y,NS31Y,NS32X + + NTRSL,NTHBP,NCAPL,NCAPLD, +c ml: 27/10/04: +c + NCASTR,NS11X,NS12Y,NS21X,NS22Y,NS31Y,NS32X + + NCASTR,NS11Y,NS12X,NS21X,NS22Y,NS31Y,NS32X +c end ml. C