/[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.8 by cafagna, Fri Dec 16 10:20:14 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.7 2005/12/16 09:13:52 cafagna Exp $
3    *
4    * $Log: gpgeo.inc,v $
5    * Revision 3.7  2005/12/16 09:13:52  cafagna
6    * New small valume added to the tracker frame
7  *  *
 * $Log: gpgeo.inc,v $  
8  * Revision 3.6  2005/12/13 10:31:29  pam-ba  * Revision 3.6  2005/12/13 10:31:29  pam-ba
9  * added a new volume, TPGI, in the spectrometer  * added a new volume, TPGI, in the spectrometer
10  *  *
# Line 62  c end ml. Line 65  c end ml.
65  *ml: 10/11/04:  *ml: 10/11/04:
66  c     +          TRDS,TRDT,TRDB,TRFR,TRFI,TRBS,TRSO,TRSI,TRRA,  c     +          TRDS,TRDT,TRDB,TRFR,TRFI,TRBS,TRSO,TRSI,TRRA,
67  C     +           TRDS,TRDT,TRDB,TRFR,TRFI,TRBS,TRAL,TRSO,TRSI,TRRA,  C     +           TRDS,TRDT,TRDB,TRFR,TRFI,TRBS,TRAL,TRSO,TRSI,TRRA,
68       +           T RDS,TRDT,TRDB,TRFR,TRBS,TRAL,TRSO,TRSI,TRRA,       +           TRDS,TRDT,TRDB,TRFR,TRBS,TRAL,TRSO,TRSI,TRRA,
69       +           TRFU,TRFD,TRFM,TRFL,TRR2,TRR0,TRI0,TRRF,TRRI,       +           TRFU,TRFD,TRFM,TRFL,TRR2,TRR0,TRI0,TRRF,TRRI,
70  *end ml.  *end ml.
 <<<<<<< gpgeo.inc  
      +          TRAN,TRAI,SPEB,MGFR,MGPL,MGPA,MGPI,TPGA,TPGU,TPGD,TPGI,  
 =======  
71       +          TRAN,TRAI,SPEB,MGFR,MGPL,MGPA,MGPI,TPGA,TPGU,TPGD,TPGI       +          TRAN,TRAI,SPEB,MGFR,MGPL,MGPA,MGPI,TPGA,TPGU,TPGD,TPGI
 >>>>>>> 3.6  
72  c ml: 20/04/05:  c ml: 20/04/05:
73  c     +          TRPB,TRPL,TRSL,TSPA,THBP,TRCP,CALB,CALS,CAPL,CANS,  c     +          TRPB,TRPL,TRSL,TSPA,THBP,TRCP,CALB,CALS,CAPL,CANS,
74       +          TRPB,TPAS,TPAI,TRSL,TSPA,THBP,TRCP,TBAL,CALB,CALS,       +          TRPB,TPAS,TPAI,TRSL,TSPA,THBP,TRCP,TBAL,CALB,CALS,
# Line 146  c     +                TRAI( 3), Line 145  c     +                TRAI( 3),
145       +                SPEB( 3),MGFR( 3),MGPL( 3),MGPA( 3),MGPI( 3),       +                SPEB( 3),MGFR( 3),MGPL( 3),MGPA( 3),MGPI( 3),
146  c ml:20/04/05:  c ml:20/04/05:
147  c     +                TRPB( 3),TRPL( 3),TRSL( 3),TSPA( 3),THBP( 3),  c     +                TRPB( 3),TRPL( 3),TRSL( 3),TSPA( 3),THBP( 3),
 <<<<<<< gpgeo.inc  
148       +                TPGA( 3),TPGU( 3),TPGD( 3),TPGI( 3),TRPB( 3),       +                TPGA( 3),TPGU( 3),TPGD( 3),TPGI( 3),TRPB( 3),
149       +                TPAS( 3),TPAI( 3),TRSL( 3),TSPA( 3),THBP( 3),       +                TPAS( 3),TPAI( 3),TRSL( 3),TSPA( 3),THBP( 3),
150       +                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  
151  c end ml.  c end ml.
152       +                CALB( 3),CALS( 3),       +                CALB( 3),CALS( 3),
153  * F.C.&ML:  * F.C.&ML:
Legend:
Removed from v.3.7  
changed lines
  Added in v.3.8
  ViewVC Help
Powered by ViewVC 1.1.23