/[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.7 by cafagna, Fri Dec 16 09:13:52 2005 UTC revision 3.9 by cafagna, Tue Dec 20 12:21:04 2005 UTC
# Line 1  Line 1 
1  *  *
2  * $Id: gpgeo.inc,v 3.6 2005/12/13 10:31:29 pam-ba Exp $  * $Id: gpgeo.inc,v 3.8 2005/12/16 10:20:14 cafagna Exp $
3    *
4    * $Log: gpgeo.inc,v $
5    * Revision 3.8  2005/12/16 10:20:14  cafagna
6    * Bug fixed in the new update
7    *
8    * Revision 3.7  2005/12/16 09:13:52  cafagna
9    * New small valume added to the tracker frame
10  *  *
 * $Log: gpgeo.inc,v $  
11  * Revision 3.6  2005/12/13 10:31:29  pam-ba  * Revision 3.6  2005/12/13 10:31:29  pam-ba
12  * added a new volume, TPGI, in the spectrometer  * added a new volume, TPGI, in the spectrometer
13  *  *
# Line 62  c end ml. Line 68  c end ml.
68  *ml: 10/11/04:  *ml: 10/11/04:
69  c     +          TRDS,TRDT,TRDB,TRFR,TRFI,TRBS,TRSO,TRSI,TRRA,  c     +          TRDS,TRDT,TRDB,TRFR,TRFI,TRBS,TRSO,TRSI,TRRA,
70  C     +           TRDS,TRDT,TRDB,TRFR,TRFI,TRBS,TRAL,TRSO,TRSI,TRRA,  C     +           TRDS,TRDT,TRDB,TRFR,TRFI,TRBS,TRAL,TRSO,TRSI,TRRA,
71       +           T RDS,TRDT,TRDB,TRFR,TRBS,TRAL,TRSO,TRSI,TRRA,       +           TRDS,TRDT,TRDB,TRFR,TRBS,TRAL,TRSO,TRSI,TRRA,
72       +           TRFU,TRFD,TRFM,TRFL,TRR2,TRR0,TRI0,TRRF,TRRI,       +           TRFU,TRFD,TRFM,TRFL,TRR2,TRR0,TRI0,TRRF,TRRI,
73  *end ml.  *end ml.
 <<<<<<< gpgeo.inc  
      +          TRAN,TRAI,SPEB,MGFR,MGPL,MGPA,MGPI,TPGA,TPGU,TPGD,TPGI,  
 =======  
74       +          TRAN,TRAI,SPEB,MGFR,MGPL,MGPA,MGPI,TPGA,TPGU,TPGD,TPGI       +          TRAN,TRAI,SPEB,MGFR,MGPL,MGPA,MGPI,TPGA,TPGU,TPGD,TPGI
 >>>>>>> 3.6  
75  c ml: 20/04/05:  c ml: 20/04/05:
76  c     +          TRPB,TRPL,TRSL,TSPA,THBP,TRCP,CALB,CALS,CAPL,CANS,  c     +          TRPB,TRPL,TRSL,TSPA,THBP,TRCP,CALB,CALS,CAPL,CANS,
77       +          TRPB,TPAS,TPAI,TRSL,TSPA,THBP,TRCP,TBAL,CALB,CALS,       +          TRPB,TPAS,TPAI,TRSL,TSPA,THBP,TRCP,TBAL,CALB,CALS,
# Line 93  c end ml. Line 95  c end ml.
95       +          CAGL,CAKP,CAKA,C10C,CAAD,CAPD,       +          CAGL,CAKP,CAKA,C10C,CAAD,CAPD,
96  *END EM.  *END EM.
97  * MA  * MA
98       +          DZM0, DZST       +          DZM0, DZST,
99    *** Neutron detector definition
100         *     NDBX, NDBI, NDTU, NDTI, NDPB, NDCD
101    
102  C  C
103  C Some usefull quantities to calculate volumes dimentions  C Some usefull quantities to calculate volumes dimentions
104  C  C
# Line 146  c     +                TRAI( 3), Line 151  c     +                TRAI( 3),
151       +                SPEB( 3),MGFR( 3),MGPL( 3),MGPA( 3),MGPI( 3),       +                SPEB( 3),MGFR( 3),MGPL( 3),MGPA( 3),MGPI( 3),
152  c ml:20/04/05:  c ml:20/04/05:
153  c     +                TRPB( 3),TRPL( 3),TRSL( 3),TSPA( 3),THBP( 3),  c     +                TRPB( 3),TRPL( 3),TRSL( 3),TSPA( 3),THBP( 3),
 <<<<<<< gpgeo.inc  
154       +                TPGA( 3),TPGU( 3),TPGD( 3),TPGI( 3),TRPB( 3),       +                TPGA( 3),TPGU( 3),TPGD( 3),TPGI( 3),TRPB( 3),
155       +                TPAS( 3),TPAI( 3),TRSL( 3),TSPA( 3),THBP( 3),       +                TPAS( 3),TPAI( 3),TRSL( 3),TSPA( 3),THBP( 3),
156       +                TRCP( 3),TBAL( 3),       +                TRCP( 3),TBAL( 3),
 =======  
      +                TPGA( 3),TPGU( 3),TPGD( 3),TPGI( 3),TRPB( 3),  
      +                TPAS( 3),  
      +                TPAI( 3),TRSL( 3),TSPA( 3),THBP( 3),TRCP( 3),  
 >>>>>>> 3.6  
157  c end ml.  c end ml.
158       +                CALB( 3),CALS( 3),       +                CALB( 3),CALS( 3),
159  * F.C.&ML:  * F.C.&ML:
# Line 169  C     +                CAPL( 3),CASI( 3) Line 168  C     +                CAPL( 3),CASI( 3)
168  *MA  *MA
169       +                DZM0, DZST,       +                DZM0, DZST,
170  * end MA  * end MA
171         +       NDBX(3),NDBI(3),NDTU(3),NDTI(3),NDPB(3),NDCD(3),
172    
173       +                SCTIC,ZSHEL,ZTFLA,ZSHEI,ZTSPH,ZS11,ZS12,       +                SCTIC,ZSHEL,ZTFLA,ZSHEI,ZTSPH,ZS11,ZS12,
174  *AB:  *AB:
175       +                ZMSHE,ZBSPH,       +                ZMSHE,ZBSPH,
Legend:
Removed from v.3.7  
changed lines
  Added in v.3.9
  ViewVC Help
Powered by ViewVC 1.1.23