/[PAMELA software]/gpamela/gpcdes/gpdgeo.inc
ViewVC logotype

Diff of /gpamela/gpcdes/gpdgeo.inc

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3.7 by cafagna, Fri Dec 16 09:13:55 2005 UTC revision 3.10 by cafagna, Sun Apr 9 23:28:54 2006 UTC
# Line 1  Line 1 
1  *  *
2  * $Id: gpdgeo.inc,v 3.6 2005/12/13 10:31:29 pam-ba Exp $  * $Id: gpdgeo.inc,v 3.9 2005/12/20 12:21:04 cafagna Exp $
3    *
4    * $Log: gpdgeo.inc,v $
5    * Revision 3.9  2005/12/20 12:21:04  cafagna
6    * gpnd directory added along with ND files
7    *
8    * Revision 3.8  2005/12/16 10:20:18  cafagna
9    * Bug fixed in the new update
10    *
11    * Revision 3.7  2005/12/16 09:13:55  cafagna
12    * New small valume added to the tracker frame
13  *  *
 * $Log: gpdgeo.inc,v $  
14  * Revision 3.6  2005/12/13 10:31:29  pam-ba  * Revision 3.6  2005/12/13 10:31:29  pam-ba
15  * added a new volume, TPGI, in the spectrometer  * added a new volume, TPGI, in the spectrometer
16  *  *
# Line 132  C        DATA CASY/0.55,14.75,23./ Line 141  C        DATA CASY/0.55,14.75,23./
141          DATA CASYD/2.2/          DATA CASYD/2.2/
142          DATA ZCAS/51.25/          DATA ZCAS/51.25/
143  *END: EM.  *END: EM.
144    C CARD data
145            DATA CARDB/10.,10.,10./
146  C TRD data  C TRD data
147  c ml: 11/11/04  c ml: 11/11/04
148  c        DATA TRFR/19,17.5,.2/  c        DATA TRFR/19,17.5,.2/
# Line 182  c     DATA MGPL/12.,11.4,4.05/ Line 193  c     DATA MGPL/12.,11.4,4.05/
193  c     DATA MGPI/8.05,6.55,4.05/  c     DATA MGPI/8.05,6.55,4.05/
194  c ml: 31/10/05:  c ml: 31/10/05:
195  c        DATA MGPI/8.1,6.6,4.0/  c        DATA MGPI/8.1,6.6,4.0/
 <<<<<<< gpdgeo.inc  
196  C        DATA MGPI/8.07,6.57,4./  C        DATA MGPI/8.07,6.57,4./
197  C        DATA MGPI/8.07,6.57,4.03/  C        DATA MGPI/8.07,6.57,4.03/
198          DATA MGPI/8.07,6.57,4./          DATA MGPI/8.07,6.57,4./
 =======  
         DATA MGPI/8.07,6.57,4./  
 C        DATA MGPI/8.07,6.57,4.03/  
 >>>>>>> 3.6  
199  C end ml.  C end ml.
200  c ml:31/10/05:  c ml:31/10/05:
201  c new volumes:  c new volumes:
# Line 325  C        DATA CAKP/12.,12.1,0.0025/ Line 331  C        DATA CAKP/12.,12.1,0.0025/
331  * END F.V.&ML.  * END F.V.&ML.
332  *END EM.  *END EM.
333  C  C
334    ***** Neutron detector
335          DATA NDBI/20.,20.,7.5/,NDTU/0.92,0.925,10./,NDTI/0.,0.92,10./,
336         +     NDPB/20.,20.,1./,NDCD/20.,20.,0.025/,NDBX/20.5,20.5,8./
337    

Legend:
Removed from v.3.7  
changed lines
  Added in v.3.10

  ViewVC Help
Powered by ViewVC 1.1.23