/[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.12 by pam-ba, Tue May 2 10:58:35 2006 UTC revision 3.13 by cafagna, Tue May 2 15:23:14 2006 UTC
# Line 1  Line 1 
 <<<<<<< gpgeo.inc  
 *  
 * $Id: gpgeo.inc,v 3.9 2005/12/20 12:21:04 cafagna Exp $  
 *  
 * $Log: gpgeo.inc,v $  
 * Revision 3.9  2005/12/20 12:21:04  cafagna  
 * gpnd directory added along with ND files  
 *  
 * Revision 3.8  2005/12/16 10:20:14  cafagna  
 * Bug fixed in the new update  
 *  
 * Revision 3.7  2005/12/16 09:13:52  cafagna  
 * New small valume added to the tracker frame  
 *  
 * Revision 3.6  2005/12/13 10:31:29  pam-ba  
 * added a new volume, TPGI, in the spectrometer  
 *  
 * Revision 3.5  2005/12/05 12:15:20  pam-ba  
 * new spectrometer geometry and internal magnetic field  
 *  
 * Revision 3.4  2005/07/25 11:53:21  cafagna  
 * Several updates. See history for details  
 *  
 * Revision 3.3  2005/06/21 02:42:13  cafagna  
 =======  
1  *  *
2  * $Id: gpgeo.inc,v 3.11 2006/04/10 11:07:43 cafagna Exp $  * $Id: gpgeo.inc,v 3.12 2006/05/02 10:58:35 pam-ba Exp $
3  *  *
4  * $Log: gpgeo.inc,v $  * $Log: gpgeo.inc,v $
5    * Revision 3.12  2006/05/02 10:58:35  pam-ba
6    * TOF geometry and position updated and a new material, the mylar, added
7    *
8  * Revision 3.11  2006/04/10 11:07:43  cafagna  * Revision 3.11  2006/04/10 11:07:43  cafagna
9  * GEN data card updated, ZDGEN added  * GEN data card updated, ZDGEN added
10  *  *
# Line 52  Line 30 
30  * Several updates. See history for details  * Several updates. See history for details
31  *  *
32  * Revision 3.3  2005/06/21 02:42:13  cafagna  * Revision 3.3  2005/06/21 02:42:13  cafagna
 >>>>>>> 3.11  
33  * Major modification to the geometry and to the random number chain  * Major modification to the geometry and to the random number chain
34  *  *
35  * Revision 3.2  2002/12/05 10:17:42  pamela  * Revision 3.2  2002/12/05 10:17:42  pamela
# Line 109  c end ml. Line 86  c end ml.
86       +     HPVCMIN,HALTOF,HAIRS3,ZTRD,       +     HPVCMIN,HALTOF,HAIRS3,ZTRD,
87       +     ZCAT,ZCAS,       +     ZCAT,ZCAS,
88  c ml: 28/10/04:  c ml: 28/10/04:
89  <<<<<<< gpgeo.inc  c$$$<<<<<<< gpgeo.inc
90       +     ZCARDB,ZTPLA,ZSPEBP,ZSPEC,ZORMG,HORMG,XGLUE,ZPAMS31Y,       +     ZCARDB,ZTPLA,ZSPEBP,ZSPEC,ZORMG,HORMG,XGLUE,ZPAMS31Y,
91       +     ZPAMS32X,ZCAL,       +     ZPAMS32X,ZCAL,
92       +     ZS4,DCASIX,DCASIY,DCASIZ,       +     ZS4,DCASIX,DCASIY,DCASIZ,
93  =======  c$$$=======
94       +          ZCARDB,  c$$$     +          ZCARDB,
95  C     +          ZSPEC,ZS31,ZS32,ZCAL,ZS4,DCASIX,DCASIY,DCASIZ,  c$$$C     +          ZSPEC,ZS31,ZS32,ZCAL,ZS4,DCASIX,DCASIY,DCASIZ,
96       +          ZTPLA,ZSPEBP,ZSPEC,XGLUE,ZS31,ZS32,ZCAL,ZS4,DCASIX,  c$$$     +          ZTPLA,ZSPEBP,ZSPEC,XGLUE,ZS31,ZS32,ZCAL,ZS4,DCASIX,
97       +          DCASIY,DCASIZ,  c$$$     +          DCASIY,DCASIZ,
98  >>>>>>> 3.11  c$$$>>>>>>> 3.11
99  c end ml.  c end ml.
100       +          SCTIC,GAPTOP,       +          SCTIC,GAPTOP,
101       +          GAPTRD,CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,       +          GAPTRD,CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,
# Line 210  C     +                CAPL( 3),CASI( 3) Line 187  C     +                CAPL( 3),CASI( 3)
187  *END: AB.  *END: AB.
188  c ml: 28/10/04  c ml: 28/10/04
189  c     +                ZTRD,ZS21,ZS22,ZCAT,ZCAS,ZSPEC,  c     +                ZTRD,ZS21,ZS22,ZCAT,ZCAS,ZSPEC,
190  <<<<<<< gpgeo.inc  c$$$<<<<<<< gpgeo.inc
191       +                ZTRD,ZTPLA,ZCAT,ZCAS,ZCARDB,ZSPEBP,ZSPEC,       +                ZTRD,ZTPLA,ZCAT,ZCAS,ZCARDB,ZSPEBP,ZSPEC,
192       +                ZORMG,HORMG,XGLUE,       +                ZORMG,HORMG,XGLUE,
193  =======  c$$$=======
194       +                ZTRD,ZS21,ZS22,ZTPLA,ZCAT,ZCAS,ZCARDB,  c$$$     +                ZTRD,ZS21,ZS22,ZTPLA,ZCAT,ZCAS,ZCARDB,
195       +                ZSPEBP,ZSPEC,  c$$$     +                ZSPEBP,ZSPEC,
196       +                XGLUE,  c$$$     +                XGLUE,
197  >>>>>>> 3.11  c$$$>>>>>>> 3.11
198  c end ml.  c end ml.
199       +                ZPAMS31,ZPAMS32,ZCAL,ZS4,DCASIX,       +                ZPAMS31,ZPAMS32,ZCAL,ZS4,DCASIX,
200       +                DCASIY,DCASIZ,GAPTOP,GAPTRD,       +                DCASIY,DCASIZ,GAPTOP,GAPTRD,

Legend:
Removed from v.3.12  
changed lines
  Added in v.3.13

  ViewVC Help
Powered by ViewVC 1.1.23