/[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.4 by cafagna, Mon Jul 25 11:53:21 2005 UTC revision 3.6 by pam-ba, Tue Dec 13 10:31:29 2005 UTC
# Line 1  Line 1 
1  *  *
2  * $Id: gpgeo.inc,v 3.3 2005/06/21 02:42:13 cafagna Exp $  * $Id: gpgeo.inc,v 3.5 2005/12/05 12:15:20 pam-ba Exp $
3  *  *
4  * $Log: gpgeo.inc,v $  * $Log: gpgeo.inc,v $
5    * Revision 3.5  2005/12/05 12:15:20  pam-ba
6    * new spectrometer geometry and internal magnetic field
7    *
8    * Revision 3.4  2005/07/25 11:53:21  cafagna
9    * Several updates. See history for details
10    *
11  * Revision 3.3  2005/06/21 02:42:13  cafagna  * Revision 3.3  2005/06/21 02:42:13  cafagna
12  * Major modification to the geometry and to the random number chain  * Major modification to the geometry and to the random number chain
13  *  *
# Line 53  c end ml. Line 59  c end ml.
59  *ml: 10/11/04:  *ml: 10/11/04:
60  c     +          TRDS,TRDT,TRDB,TRFR,TRFI,TRBS,TRSO,TRSI,TRRA,  c     +          TRDS,TRDT,TRDB,TRFR,TRFI,TRBS,TRSO,TRSI,TRRA,
61  C     +           TRDS,TRDT,TRDB,TRFR,TRFI,TRBS,TRAL,TRSO,TRSI,TRRA,  C     +           TRDS,TRDT,TRDB,TRFR,TRFI,TRBS,TRAL,TRSO,TRSI,TRRA,
62       +           TRDS,TRDT,TRDB,TRFR,TRBS,TRAL,TRSO,TRSI,TRRA,       +           T RDS,TRDT,TRDB,TRFR,TRBS,TRAL,TRSO,TRSI,TRRA,
63       +           TRFU,TRFD,TRFM,TRFL,TRR2,TRR0,TRI0,TRRF,TRRI,       +           TRFU,TRFD,TRFM,TRFL,TRR2,TRR0,TRI0,TRRF,TRRI,
64  *end ml.  *end ml.
65       +          TRAN,TRAI,SPEB,MGPL,MGPI,MGFR,       +          TRAN,TRAI,SPEB,MGFR,MGPL,MGPA,MGPI,TPGA,TPGU,TPGD,TPGI
 *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,  
66  c ml: 20/04/05:  c ml: 20/04/05:
67  c     +          TRPB,TRPL,TRSL,TSPA,THBP,TRCP,CALB,CALS,CAPL,CANS,  c     +          TRPB,TRPL,TRSL,TSPA,THBP,TRCP,CALB,CALS,CAPL,CANS,
68       +          TRPB,TPAI,TPAS,TRSL,TSPA,THBP,TRCP,CALB,CALS,       +          TRPB,TPAS,TPAI,TRSL,TSPA,THBP,TRCP,CALB,CALS,
69       +          CAPL,CANS,         +          CAPL,CANS,  
70  c end ml.  c end ml.
71  *END F.V.&ML.  *END F.V.&ML.
# Line 75  c end ml. Line 77  c end ml.
77       +          ZCAT,ZCAS,       +          ZCAT,ZCAS,
78  c ml: 28/10/04:  c ml: 28/10/04:
79  C     +          ZSPEC,ZS31,ZS32,ZCAL,ZS4,DCASIX,DCASIY,DCASIZ,  C     +          ZSPEC,ZS31,ZS32,ZCAL,ZS4,DCASIX,DCASIY,DCASIZ,
80       +          ZTPLA,ZSPEC,ZS31,ZS32,ZCAL,ZS4,DCASIX,DCASIY,DCASIZ,       +          ZTPLA,ZSPEBP,ZSPEC,ZS31,ZS32,ZCAL,ZS4,DCASIX,
81         +          DCASIY,DCASIZ,
82  c end ml.  c end ml.
83       +          SCTIC,GAPTOP,       +          SCTIC,GAPTOP,
84       +          GAPTRD,CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,       +          GAPTRD,CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,
# Line 133  c     +                TRAI( 3), Line 136  c     +                TRAI( 3),
136       +                TRR0( 3),TRI0( 3),TRRF( 3),TRRI( 3),TRAN( 3),       +                TRR0( 3),TRI0( 3),TRRF( 3),TRRI( 3),TRAN( 3),
137       +                TRAI( 3),       +                TRAI( 3),
138  *end ml.  *end ml.
139       +                SPEB( 3),MGPL( 3),MGPI( 3),MGFR(3),       +                SPEB( 3),MGFR( 3),MGPL( 3),MGPA( 3),MGPI( 3),
 c ml: 26/11/04:  
 c     +                TRPB( 3),TRPL( 3),TRSL( 3),TSPA( 3),  
140  c ml:20/04/05:  c ml:20/04/05:
141  c     +                TRPB( 3),TRPL( 3),TRSL( 3),TSPA( 3),THBP( 3),  c     +                TRPB( 3),TRPL( 3),TRSL( 3),TSPA( 3),THBP( 3),
142       +                TRPB( 3),TPAI( 3),TPAS( 3),TRSL( 3),       +                TPGA( 3),TPGU( 3),TPGD( 3),TPGI( 3),TRPB( 3),
143       +                TSPA( 3),THBP( 3),       +                TPAS( 3),
144         +                TPAI( 3),TRSL( 3),TSPA( 3),THBP( 3),TRCP( 3),
145  c end ml.  c end ml.
146       +                TRCP( 3),CALB( 3),CALS( 3),       +                CALB( 3),CALS( 3),
147  * F.C.&ML:  * F.C.&ML:
148  C     +                CAPL( 3),CASI( 3),CAAD( 3),CAPD( 3),  C     +                CAPL( 3),CASI( 3),CAAD( 3),CAPD( 3),
149       +                CAPL( 3),CASI( 3),CAAD( 3),CAPD( 3),CANS( 3),       +                CAPL( 3),CASI( 3),CAAD( 3),CAPD( 3),CANS( 3),
# Line 160  C     +                CAPL( 3),CASI( 3) Line 162  C     +                CAPL( 3),CASI( 3)
162  *END: AB.  *END: AB.
163  c ml: 28/10/04  c ml: 28/10/04
164  c     +                ZTRD,ZS21,ZS22,ZCAT,ZCAS,ZSPEC,  c     +                ZTRD,ZS21,ZS22,ZCAT,ZCAS,ZSPEC,
165       +                ZTRD,ZS21,ZS22,ZTPLA,ZCAT,ZCAS,ZSPEC,         +                ZTRD,ZS21,ZS22,ZTPLA,ZCAT,ZCAS,ZSPEBP,ZSPEC,  
166  c end ml.  c end ml.
167       +                ZS31,ZS32,ZCAL,ZS4,DCASIX,DCASIY,DCASIZ,       +                ZS31,ZS32,ZCAL,ZS4,DCASIX,DCASIY,DCASIZ,
168       +                GAPTOP,GAPTRD,       +                GAPTOP,GAPTRD,
Legend:
Removed from v.3.4  
changed lines
  Added in v.3.6
  ViewVC Help
Powered by ViewVC 1.1.23