/[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.11 by cafagna, Mon Apr 10 11:07:43 2006 UTC revision 3.12 by pam-ba, Tue May 2 10:58:35 2006 UTC
# Line 1  Line 1 
1    <<<<<<< gpgeo.inc
2    *
3    * $Id: gpgeo.inc,v 3.9 2005/12/20 12:21:04 cafagna Exp $
4    *
5    * $Log: gpgeo.inc,v $
6    * Revision 3.9  2005/12/20 12:21:04  cafagna
7    * gpnd directory added along with ND files
8    *
9    * Revision 3.8  2005/12/16 10:20:14  cafagna
10    * Bug fixed in the new update
11    *
12    * Revision 3.7  2005/12/16 09:13:52  cafagna
13    * New small valume added to the tracker frame
14    *
15    * Revision 3.6  2005/12/13 10:31:29  pam-ba
16    * added a new volume, TPGI, in the spectrometer
17    *
18    * Revision 3.5  2005/12/05 12:15:20  pam-ba
19    * new spectrometer geometry and internal magnetic field
20    *
21    * Revision 3.4  2005/07/25 11:53:21  cafagna
22    * Several updates. See history for details
23    *
24    * Revision 3.3  2005/06/21 02:42:13  cafagna
25    =======
26  *  *
27  * $Id: gpgeo.inc,v 3.10 2006/04/09 23:28:57 cafagna Exp $  * $Id: gpgeo.inc,v 3.11 2006/04/10 11:07:43 cafagna Exp $
28  *  *
29  * $Log: gpgeo.inc,v $  * $Log: gpgeo.inc,v $
30    * Revision 3.11  2006/04/10 11:07:43  cafagna
31    * GEN data card updated, ZDGEN added
32    *
33  * Revision 3.10  2006/04/09 23:28:57  cafagna  * Revision 3.10  2006/04/09 23:28:57  cafagna
34  * Several new things, among this: ND and CARD  * Several new things, among this: ND and CARD
35  *  *
# Line 24  Line 52 
52  * Several updates. See history for details  * Several updates. See history for details
53  *  *
54  * Revision 3.3  2005/06/21 02:42:13  cafagna  * Revision 3.3  2005/06/21 02:42:13  cafagna
55    >>>>>>> 3.11
56  * Major modification to the geometry and to the random number chain  * Major modification to the geometry and to the random number chain
57  *  *
58  * Revision 3.2  2002/12/05 10:17:42  pamela  * Revision 3.2  2002/12/05 10:17:42  pamela
# Line 48  Line 77 
77  C  C
78  C Common with the volumes parameters for PAMELA  C Common with the volumes parameters for PAMELA
79  C  C
80  c ml: 28/10/04:        REAL PAME,SHEL,TFLA,SHEI,TSPH,S1,S2,S1A,S2A,S3A,S11M,
81  C        REAL    PAME,SHEL,TFLA,SHEI,TSPH,S11,S12,S21,S22,S31,       +     S12M,S21M,S22M,S31M,S32M,S11Y,S12X,S21X,S22Y,S31Y,
82          REAL    PAME,SHEL,TFLA,SHEI,TSPH,S11,S12,S21,S22,TPLA,S31,       +     S32X,TPLA,S4,CATB,CATL,CATT,CASX,CASY,
 c end ml.  
 c ml: 27/10/04:  
 c     +          S32,S4,S11X,SC11,S12Y,SC12,S21X,SC21,S22Y,SC22,  
 c ml:20/12/04:  
 c da commentare:  
      +           S32,S4,S11Y,SC11,S12X,SC12,S21X,SC21,S22Y,SC22,  
 C DA SCOMMENTARE:  
 C     +          S32,S4,STOF,SGLU,SPV1,SMYL,S11Y,S12X,SPV2,S21X,S22Y,  
 C OK:  
 c end ml.  
      +          S31Y,SC31,S32X,SC32,CATB,CATL,CATT,CASX,CASY,  
83  *AB:  *AB:
84       +          MSHE,BSPH,       +     MSHE,BSPH,
85  *END: AB.  *END: AB.
86  *EM:  *EM:
87       +          CSSX,CSSY,CASXD,CASYD,CATH,CATF,CATO,CATP,       +     CSSX,CSSY,CASXD,CASYD,CATH,CATF,CATO,CATP,
88  *END: EM.  *END: EM.
89  *JeL:  *JeL:
90       +          CASA, CATA,       +     CASA, CATA,
91  *END: JeL.  *END: JeL.
92       +          CARDB,       +          CARDB,
93  *ml: 10/11/04:  *ml: 10/11/04:
94  c     +          TRDS,TRDT,TRDB,TRFR,TRFI,TRBS,TRSO,TRSI,TRRA,       +     TRDS,TRDT,TRDB,TRFR,TRBS,TRAL,TRSO,TRSI,TRRA,
95  C     +           TRDS,TRDT,TRDB,TRFR,TRFI,TRBS,TRAL,TRSO,TRSI,TRRA,       +     TRFU,TRFD,TRFM,TRFL,TRR2,TRR0,TRI0,TRRF,TRRI,
      +           TRDS,TRDT,TRDB,TRFR,TRBS,TRAL,TRSO,TRSI,TRRA,  
      +           TRFU,TRFD,TRFM,TRFL,TRR2,TRR0,TRI0,TRRF,TRRI,  
96  *end ml.  *end ml.
97       +          TRAN,TRAI,SPEB,MGFR,MGPL,MGPA,MGPI,TPGA,TPGU,TPGD,TPGI       +     TRAN,TRAI,SPEB,MGFR,MGPL,MGPA,MGPI,TPGA,TPGU,TPGD,TPGI
98  c ml: 20/04/05:  c ml: 20/04/05:
99  c     +          TRPB,TRPL,TRSL,TSPA,THBP,TRCP,CALB,CALS,CAPL,CANS,  c     +          TRPB,TRPL,TRSL,TSPA,THBP,TRCP,CALB,CALS,CAPL,CANS,
100       +          TRPB,TPAS,TPAI,TRSL,TSPA,THBP,TRCP,TBAL,CALB,CALS,       +     TRPB,TPAS,TPAI,TRSL,TSPA,THBP,TRCP,TBAL,CALB,CALS,
101       +          CAPL,CANS,         +     CAPL,CANS,  
102  c end ml.  c end ml.
103  *END F.V.&ML.  *END F.V.&ML.
104       +          CASI,CG10,CAAB,XYZPOR,XYZSOR,ZSHEL,       +     CASI,CG10,CAAB,XYZPOR,XYZSOR,ZSHEL,
105  *AB:  *AB:
106       +          ZMSHE,ZBSPH,       +     ZMSHE,ZBSPH,
107  *END: AB.  *END: AB.
108       +          ZTFLA,ZSHEI,ZTSPH,ZS11,ZS12,ZTRD,ZS21,ZS22,       +     ZTFLA,ZSHEI,ZTSPH,ZS1,ZS2A,ZS3A,HMYLTOF,HGLUTOF,HPVCMAX,
109       +          ZCAT,ZCAS,       +     HPVCMIN,HALTOF,HAIRS3,ZTRD,
110         +     ZCAT,ZCAS,
111  c ml: 28/10/04:  c ml: 28/10/04:
112    <<<<<<< gpgeo.inc
113         +     ZCARDB,ZTPLA,ZSPEBP,ZSPEC,ZORMG,HORMG,XGLUE,ZPAMS31Y,
114         +     ZPAMS32X,ZCAL,
115         +     ZS4,DCASIX,DCASIY,DCASIZ,
116    =======
117       +          ZCARDB,       +          ZCARDB,
118  C     +          ZSPEC,ZS31,ZS32,ZCAL,ZS4,DCASIX,DCASIY,DCASIZ,  C     +          ZSPEC,ZS31,ZS32,ZCAL,ZS4,DCASIX,DCASIY,DCASIZ,
119       +          ZTPLA,ZSPEBP,ZSPEC,XGLUE,ZS31,ZS32,ZCAL,ZS4,DCASIX,       +          ZTPLA,ZSPEBP,ZSPEC,XGLUE,ZS31,ZS32,ZCAL,ZS4,DCASIX,
120       +          DCASIY,DCASIZ,       +          DCASIY,DCASIZ,
121    >>>>>>> 3.11
122  c end ml.  c end ml.
123       +          SCTIC,GAPTOP,       +          SCTIC,GAPTOP,
124       +          GAPTRD,CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,       +          GAPTRD,CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,
# Line 104  c end ml. Line 127  c end ml.
127  *END EM.  *END EM.
128  * MA  * MA
129       +          DZM0, DZST,       +          DZM0, DZST,
130  *** Neutron detector definition  *** Neutron detector definition
131       *     NDBX, NDBI, NDTU, NDTI, NDPB, NDCD       *     NDBX, NDBI, NDTU, NDTI, NDPB, NDCD
132    
133  C  C
134  C Some usefull quantities to calculate volumes dimentions  C Some usefull quantities to calculate volumes dimentions
135  C  C
# Line 121  C Line 144  C
144       +                MSHE( 3),BSPH(6),TSPH( 6),TPLA( 3),                   +                MSHE( 3),BSPH(6),TSPH( 6),TPLA( 3),            
145  *END: AB.  *END: AB.
146  c ml: 28/10/04:  c ml: 28/10/04:
147       +                S11( 3),S12( 3),S21( 3),S22( 3),S31( 3),       +                S1( 3),S2( 3),S1A( 3),S2A( 3),S3A( 3),
148  c end ml.  c end ml.
149  c ml: 27/10/04:  c ml: 27/10/04:
 c     +                S32( 3),S4( 3),S11X( 3),SC11( 3),  
150  C DA COMMENTARE:  C DA COMMENTARE:
151       +                S32( 3),S4( 3),S11Y( 3),SC11( 3),       +                S4( 3),S11M( 3),S12M( 3),S21M( 3),S22M( 3),
152         +                S31M( 3),S32M( 3),
153  C DA SCOMMENTARE:  C DA SCOMMENTARE:
154  C     +               S32( 3),S4( 3),STOF( 3),SGLU( 3),SPV1( 3),  C     +               S32( 3),S4( 3),STOF( 3),SGLU( 3),SPV1( 3),
155  C     +               SMYL( 3),S11Y( 3),S12X( 3)SPV2( 3),S21X( 3),  C     +               SMYL( 3),S11Y( 3),S12X( 3)SPV2( 3),S21X( 3),
# Line 134  C     +               S22Y( 3),S31Y( 3), Line 157  C     +               S22Y( 3),S31Y( 3),
157  C OK:  C OK:
158  c     +                S12Y( 3),SC12( 3),S21X( 3),SC21( 3),S22Y( 3),  c     +                S12Y( 3),SC12( 3),S21X( 3),SC21( 3),S22Y( 3),
159  C DA COMMENTARE:  C DA COMMENTARE:
160       +                S12X( 3),SC12( 3),S21X( 3),SC21( 3),S22Y( 3),       +                S11Y( 3),S12X( 3),S21X( 3),S22Y( 3),S31Y(3),
161       +                SC22( 3),S31Y( 3),SC31( 3),S32X( 3),SC32( 3),       +                S32X( 3),
162  C OK:  C OK:
163       +                CATB( 3),CATL( 3),CATT( 3),CASX( 3),CASY( 3),       +                CATB( 3),CATL( 3),CATT( 3),CASX( 3),CASY( 3),
164  C end ml.  C end ml.
# Line 177  C     +                CAPL( 3),CASI( 3) Line 200  C     +                CAPL( 3),CASI( 3)
200  *MA  *MA
201       +                DZM0, DZST,       +                DZM0, DZST,
202  * end MA  * end MA
203       +       NDBX(3),NDBI(3),NDTU(3),NDTI(3),NDPB(3),NDCD(3),       +       NDBX(3),NDBI(3),NDTU(3),NDTI(3),NDPB(3),NDCD(3),
204    
205       +                SCTIC,ZSHEL,ZTFLA,ZSHEI,ZTSPH,ZS11,ZS12,       +                SCTIC,ZSHEL,ZTFLA,ZSHEI,ZTSPH,ZS1,ZS2,ZS3A,
206         +                HMYLTOF,HGLUTOF,HPVCMAX,HPVCMIN,HALTOF,
207         +                HAIRS3,
208  *AB:  *AB:
209       +                ZMSHE,ZBSPH,       +                ZMSHE,ZBSPH,
210  *END: AB.  *END: AB.
211  c ml: 28/10/04  c ml: 28/10/04
212  c     +                ZTRD,ZS21,ZS22,ZCAT,ZCAS,ZSPEC,  c     +                ZTRD,ZS21,ZS22,ZCAT,ZCAS,ZSPEC,
213    <<<<<<< gpgeo.inc
214         +                ZTRD,ZTPLA,ZCAT,ZCAS,ZCARDB,ZSPEBP,ZSPEC,
215         +                ZORMG,HORMG,XGLUE,
216    =======
217       +                ZTRD,ZS21,ZS22,ZTPLA,ZCAT,ZCAS,ZCARDB,       +                ZTRD,ZS21,ZS22,ZTPLA,ZCAT,ZCAS,ZCARDB,
218       +                ZSPEBP,ZSPEC,       +                ZSPEBP,ZSPEC,
219       +                XGLUE,       +                XGLUE,
220    >>>>>>> 3.11
221  c end ml.  c end ml.
222       +                ZS31,ZS32,ZCAL,ZS4,DCASIX,DCASIY,DCASIZ,       +                ZPAMS31,ZPAMS32,ZCAL,ZS4,DCASIX,
223       +                GAPTOP,GAPTRD,       +                DCASIY,DCASIZ,GAPTOP,GAPTRD,
224       +                CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,       +                CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,
225       +                ZDGEN,NTRSL,NTHBP,NCAPL,NCAPLD,       +                ZDGEN,NTRSL,NTHBP,NCAPL,NCAPLD,
226  c ml: 27/10/04:  c ml: 27/10/04:
Legend:
Removed from v.3.11  
changed lines
  Added in v.3.12
  ViewVC Help
Powered by ViewVC 1.1.23