/[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.1.1.1 by cafagna, Thu Jul 11 16:01:59 2002 UTC revision 3.21 by cafagna, Thu Nov 30 12:29:14 2006 UTC
# Line 1  Line 1 
1  *  *
2  * $Id$  * $Id: gpdgeo.inc,v 3.20 2006/11/28 10:26:14 pam-ba Exp $
3  *  *
4  * $Log$  * $Log: gpdgeo.inc,v $
5  *  * Revision 3.20  2006/11/28 10:26:14  pam-ba
6  *  * S3 positioning completed
7  * gpdgeo.inc  *
8  *  * Revision 3.19  2006/11/16 18:45:29  pam-ba
9  *CMZ :  3.00/00 14/11/2000  09.13.05  by  Emiliano Mocchiutti  * Simulated an aluminum container for S4
10  *CMZ :  2.02/00 12/10/2000  18.43.21  by  Francesco Cafagna  *
11  *CMZ :  2.01/00 05/04/2000  14.35.17  by  Marialuigia Ambriola  * Revision 3.18  2006/11/16 12:01:13  pam-ba
12  *CMZ :  2.00/00 03/03/2000  15.39.05  by  Francesco Cafagna  * S4 dimensions corrected.
13  *CMZ :  1.02/00 04/02/2000  18.40.04  by  Francesco Cafagna  *
14  *CMZ :  1.01/00 06/05/96  11.40.48  by  Francesco Cafagna  * Revision 3.17  2006/11/10 11:39:34  pam-ba
15  *CMZ :  1.00/02 02/04/96  16.44.16  by  Francesco Cafagna  * S2 and S1 z-positions corrected, He3 and plystyrene mixture added, Top Plate geometry simulated and titanium mixture added.
16  *-- Author :    Francesco Cafagna   05/12/95  *
17          DATA PAME/0.,75.,200./  * Revision 3.16  2006/10/12 11:11:21  pam-ba
18          DATA SHEL/69.8,70.,75./  * ND geometry updated.
19  C        DATA TFLA/126.8,127.,0.,33.45,0.,360./  *
20          DATA TFLA/0.,75.,.125/  * Revision 3.15  2006/06/30 15:38:16  pam-ba
21          DATA TSPH/0., 150.,0.,0.,0.,360./  * S22 and S12 heights positioned in GPAMELA at the nominal heights in PAMELA (see document: Main geometrical parameters of the PAMELA sub-detectors, 20 December 2005)
22          DATA GAPTOP/2./  *
23  C TOF data  * Revision 3.14  2006/05/18 10:52:31  pam-ba
24          DATA S11/22.,19.2,.45/  * TOF geometry completed and a new material, the polystyrene (density 35 g/l), added
25          DATA S12/22.,19.2,.45/  *
26          DATA S21/9.,7.2,.35/  * Revision 3.13  2006/05/09 12:01:16  cafagna
27          DATA S22/9.,7.2,.35/  * Calo geometry updated
28          DATA S31/9.,7.2,.35/  *
29          DATA S32/9.,7.2,.35/  * Revision 3.12  2006/05/02 12:30:02  bottai
30          DATA S4/18.,16.,.5/  *  change in trcp dimension in order to not overlap with its mother
31          DATA SCTIC/0.025/  *
32          DATA NS11X/9/  * Revision 3.11  2006/05/02 11:32:14  pam-ba
33          DATA NS12Y/9/  * TOF geometry and position updated and a new material, the mylar, added
34          DATA NS21X/4/  *
35          DATA NS22Y/4/  * Revision 3.10  2006/04/09 23:28:54  cafagna
36          DATA NS31Y/4/  * Several new things, among this: ND and CARD
37          DATA NS32X/4/  *
38          DATA ZS11,ZS12,ZS21,ZS22,ZS31,ZS32,ZS4  * Revision 3.9  2005/12/20 12:21:04  cafagna
39       +       /107.8,106.8,74.9,74.1,27.1,26.3,2.3/  * gpnd directory added along with ND files
40  C CAT data  *
41  *EM:  * Revision 3.8  2005/12/16 10:20:18  cafagna
42  c        DATA CATB/22.05,21.05,0.55/  * Bug fixed in the new update
43          DATA CATB/22.2,21.3,0.5/  *
44  c        DATA CATL/15.75,6.675,0.55/  * Revision 3.7  2005/12/16 09:13:55  cafagna
45  c        DATA CATT/6.3,14.375,0.55/  * New small valume added to the tracker frame
46          DATA CATL/2.6,14.9,0.4/  *
47          DATA CATT/8.45,21.2,0.4/  * Revision 3.6  2005/12/13 10:31:29  pam-ba
48          DATA CATH/9.4,7.7,0.5/  * added a new volume, TPGI, in the spectrometer
49          DATA CATF/2.6,3.15,0.4/  *
50          DATA CATO/9.3,0.05,0.5/  * Revision 3.5  2005/12/05 12:15:20  pam-ba
51          DATA CATP/0.05,7.7,0.5/  * new spectrometer geometry and internal magnetic field
52          DATA ZCAT/75.75/  *
53  C CAS data  * Revision 3.4  2005/07/25 11:53:21  cafagna
54  *EM:  * Several updates. See history for details
55  C        DATA CASX/15.25,0.55,23./  *
56  C        DATA CASY/0.55,14.75,23./  * Revision 3.3  2005/06/21 02:42:08  cafagna
57          DATA CSSX/15.7,0.5,21.6/  * Major modification to the geometry and to the random number chain
58          DATA CSSY/0.5,15.7,21.6/  *
59          DATA CASX/15.6,0.4,21.5/  * Revision 3.2  2002/12/05 10:17:42  pamela
60          DATA CASY/0.4,15.6,21.5/  * Update CAS and CALO geometries and positions. Makefile updated as well
61          DATA CASXD/2.4/  *
62          DATA CASYD/2.2/  * Revision 3.1.1.1  2002/07/11 16:01:59  cafagna
63          DATA ZCAS/51.25/  * First GPAMELA release on CVS
64  *END: EM.  *
65  C TRD data  *
66          DATA TRFR/19,17.5,.2/  *
67          DATA TRFI/15.5,14.,.2/  * gpdgeo.inc
68          DATA TRBS/3.3,18.5,1./  *
69          DATA TRDS/24.,24.5,13.5/  *                16/07/2004  16.44.06  by  Alexey Bakaldin
70          DATA TRDT/3.,3.,.25/  *                17/10/2002  22.31.45  by  Jens Lund
71          DATA TRDB/17.7,18.5,0/  *CMZ :  3.00/00 14/11/2000  09.13.05  by  Emiliano Mocchiutti
72          DATA TRSO/0.197,0.2,14./  *CMZ :  2.02/00 12/10/2000  18.43.21  by  Francesco Cafagna
73  C        DATA TRSI/0.,0.197,14./  *CMZ :  2.01/00 05/04/2000  14.35.17  by  Marialuigia Ambriola
74          DATA TRSI/0.,0.2,14./  *CMZ :  2.00/00 03/03/2000  15.39.05  by  Francesco Cafagna
75          DATA TRRA/13.2,14.,0/  *CMZ :  1.02/00 04/02/2000  18.40.04  by  Francesco Cafagna
76          DATA TRAN/1.75,1.75,1.0/  *CMZ :  1.01/00 06/05/96  11.40.48  by  Francesco Cafagna
77          DATA TRAI/1.75,1.65,0.9/  *CMZ :  1.00/02 02/04/96  16.44.16  by  Francesco Cafagna
78          DATA ZTRD/90.55/  *-- Author :    Francesco Cafagna   05/12/95
79          DATA GAPTRD/1.5/        DATA PAME/0.,53.,130./
80  C Spectrometer data  *     AB:
81          DATA SPEB/12.,11.4,0./  C     DATA SHEL/69.8,70.,75./
82          DATA MGPL/12.,11.4,4.05/  cml     DATA SHEL/40.6,52.35,52.5,43.62253,43.77253/
83          DATA MGPI/8.05,6.55,4.05/  cml     DATA MSHE/52.25,52.5,20./
84          DATA TRPB/12.,11.4,0.4/  cml     DATA BSPH/52.25,52.5,90.,180.,0.,360./
85          DATA TRPL/0.,7.,0.4/  cml:
86          DATA TRSL/0.,7.,0./          DATA SHEL/38.25,52.5,52.65,43.77,43.92/
87          DATA TSPA/2.6666,3.5,0.015/          DATA MSHE/52.5,52.75,20./
88          DATA TRCP/0.005,7.,0.3/          DATA BSPH/52.5,52.75,90.,180.,0.,360./
89          DATA ZSPEC/50.6/  c     end ml
90          DATA NTRSL/3/  *     END: AB.
91  C Calorimeter data  C     DATA TFLA/126.8,127.,0.,33.45,0.,360./
92  *EM:          DATA TFLA/0.,43.77253,0.125/
93  *        DATA CASI/3.9,3.9,0.019/  *     AB:
94          DATA CASI/3.904,3.904,0.019/  C     DATA TSPH/0., 150.,0.,0.,0.,360./
95          DATA CG10/12.1,12.1,0.0875/  cml     DATA TSPH/239.83,240.,0.,0.,0.,360./
96          DATA C10C/12.1,12.1,0.08/  cml:
97          DATA CAAB/12.1,12.1,0.133/          DATA TSPH/239.83,240.,0.,0.,0.,360./
98          DATA CAPL/12.1,12.1,0./  c     end ml.
99          DATA CAAD/12.1,12.1,0.133/  *     END: AB.
100          DATA CAPD/12.1,12.1,0./          DATA GAPTOP/2./
101          DATA CALB/19.7,19.7,10.2/  c ml:26/10/04        
102          DATA CALS/20.,20.,10.5/  c        DATA S1/20.4,16.5,.375/
103          DATA ZCAL/13.05/  c        DATA S2/20.4,16.5,.375/
104  *        DATA CALSTWID/0.36/  c        DATA S1A/9.,7.5,.375/
105          DATA CALSTWID/0.244/  c        DATA S2A/9.,7.5,.375/
106  *          DATA S3/0.,0.,0./
107  * NOTE: IF you change NCAPL, remember to modify the NCPL, NCSI, NOCAPL,  c        DATA S4/18.,16.,.5/
108  *     NOCASI array dimentions in $GPKEY, $GPDKEY common and data block.          DATA S4/24.1,24.1,0.5/
109  *     The corresponding FFKEY call in GPFFR must be changed as well.          DATA S4AL/24.2,24.2,0.6/
110  *     The GPDAT loop on these arrays should be checked too.          DATA S11M/0.,0.,0./
111  *          DATA S12M/0.,0.,0./
112          DATA NCAPL/22/          DATA S21M/0.,0.,0./
113          DATA NCAPLD/1/          DATA S22M/0.,0.,0./
114  C        DATA DCASIX/0.3/          DATA S31M/0.,0.,0./
115          DATA DCASIX/0.292/          DATA S32M/0.,0.,0./
116  C        DATA DCASIY/0.3/          DATA POL1/0.,0.,0./
117          DATA DCASIY/0.292/          DATA POL2/0.,0.,0./
118          DATA DCASIZ/0.15/          DATA POLY/0.,0.,0./
119          DATA NCASTR/32/          DATA S11Y/2.55,16.5,0.35/
120  *          DATA S12X/20.4,2.75,0.35/
121          DATA CAKA/12.,12.1,0.005/          DATA S21X/9.,3.75,0.25/
122          DATA CAGL/12.,12.1,0.005/          DATA S22Y/4.5,7.5,0.25/
123          DATA CAKP/12.,12.1,0.0025/          DATA S31Y/3.,7.5,0.35/
124  *END EM.          DATA S32X/9.,2.5,0.35/
125  C  c        DATA HMYLTOF/0.0025/
126            DATA HMYLTOF/0.0023/
127            DATA HGLUTOF/0.01/
128            DATA HPVCMAX/0.9/
129            DATA HPVCMIN/0.4/
130            DATA HALTOF/0.033/
131            DATA HAIRS3/0.15/
132            DATA HTABLE/24.7/
133            DATA DTABLEAL/1.7/
134            DATA XTPLA/23.2/
135            DATA YTPLA/22.1/
136    c ml: 28/10/04:
137    c dimensions of top plate. At the moment, it is a reduced version,
138    c i.e. a gap of gas with a surface equal to S21.
139    c        DATA TPLA/9.,7.5,.25/
140    c dimensions of top plate from CAD draws:
141    c        DATA TPLA/21.9,21.1,1.6/
142            DATA TPLA/28.,27.165,1.6/
143    C        DATA TPCA/18.1,18.2,0.6/
144    C        DATA TPS2/10.,8.1,0.75/
145            DATA TPCV/8.5,7.,0.25/
146            DATA TPTU/2.55,1.95,0.6/
147            DATA TPTM/3.45,3.3,0.75/
148            DATA TPTL/21.9,21.1,.25/
149    c end ml.
150    c        DATA SCTIC/0.025/
151    c ml:26/10/04:
152            DATA NS11Y/8/
153            DATA NS12X/6/
154            DATA NS21X/2/
155            DATA NS22Y/2/
156            DATA NS31Y/3/
157            DATA NS32X/3/
158    c end ml.
159    C ml 28/03/06: official z coordinates in the PAMELA reference system with
160    c origin in the centre of the central plane of the central magnetic module:
161    c        DATA ZPAMS31,ZPAMS32/-23.49,-24.34/
162            DATA DTPS3/0.845/
163    c        DATA ZS11,ZS12,ZS21,ZS22,ZS31,ZS32,ZS4
164    c ml 22/10/04:
165    c     +  /107.8,106.8,74.9,74.1,27.1,26.3,2.3/
166    c ml 28/10/04: introducing the top plate and calculating the zpos of S21, S22
167    c starting from the zpos of CATA:
168    c     +   /106.66,105.66,74.9,74.1,27.1,26.3,2.3/
169    c     +   /106.66,105.66,74.875,74.125,27.1,26.3,2.3/
170    c        DATA ZTPLA/73.5/
171    C HORMG is the distance beteween the bottom the tracker and the center of
172    c the third magnetic module.
173            DATA HORMG/22.57/
174    c end ml 28/10/04
175    c end ml 22/10/04:
176    C CAT data
177    *EM:
178    *JeL:
179            DATA CATA/28.0,0.6,27.165/
180    *END: JeL.
181    c        DATA CATB/22.05,21.05,0.55/
182            DATA CATB/22.2,21.3,0.5/
183    c        DATA CATL/15.75,6.675,0.55/
184    c        DATA CATT/6.3,14.375,0.55/
185            DATA CATL/2.6,14.9,0.4/
186            DATA CATT/8.45,21.2,0.4/
187            DATA CATH/9.4,7.7,0.5/
188            DATA CATF/2.6,3.15,0.4/
189            DATA CATO/9.3,0.05,0.5/
190            DATA CATP/0.05,7.7,0.5/
191    c        DATA ZCAT/75.85/
192    C CAS data
193    *EM:
194    *JeL:
195            DATA CASA/21.45,0.6,20.55/
196    *END: JeL.
197    C        DATA CASX/15.25,0.55,23./
198    C        DATA CASY/0.55,14.75,23./
199            DATA CSSX/15.7,0.5,21.6/
200            DATA CSSY/0.5,15.7,21.6/
201            DATA CASX/15.6,0.4,21.5/
202            DATA CASY/0.4,15.6,21.5/
203            DATA CASXD/2.4/
204            DATA CASYD/2.2/
205    C   DATA ZCAS/51.25/
206    *END: EM.
207    C CARD data
208          DATA CARDB/27.,22.8,12.35/,
209         +     CAR/18.15,4.8,1.8,3.6,5.8,0.4,76.,19.45/,
210         +     ATZ/1.1/,   ! aluminium box thickness
211         +     ATY/0.15/,  ! aluminium box thickness
212         +     PT/0.9/,    ! plastic box thickness
213         +     CARA/31.98273,17.45,20.,19.123,16.80,47.358,30.4/,
214         +     CARB/37.18273,20.95,17.,18.67,16.014,47.661,35.6/,
215         +     LEGB/2.15,3.575,11.85/,
216         +     LEG1/0.65,0.,0.,0.15,6.85,6.85,0.,0.15,10.85,10.85,0./,
217         +     LEG2/0.65,1.65,11.35/,
218         +     LEG3/0.1,1.3,0.325/,
219         +     LEG4/0.65,1.625,11.85/,
220         +     LEG5/1.125,2.575,11.85/,
221         +     LEG6/0.1,0.55,11.2/,
222         +     LEG7/1.1,0.75,3.25/,
223         +     LEG8/1.1,0.75,4.35/,
224         +     LEG9/1.1,0.75,3.25/,          
225         +     TPLT/27.,22.8,0.5/,
226         +     TOPC/20.4,16.,0.5/,
227         +     TOPT/0.5,0.,0.,2.25,2.25,0.,-26.565,2.25,2.25,0.,-26.565/,
228         +     TOHO/0.7,0.7,0.5/,
229         +     TH11/2.8,3.2,0.5/,
230         +     TH12/2.8,5.3,0.5/,
231         +     TH21/1.7,3.,0.5/,
232         +     TH22/4.9,3.,0.5/,  
233         +     MGSC/16.,15.4,0.12456/,
234         +     MGSH/9.8,8.,0.12456/
235    C TRD data
236    c ml: 11/11/04
237    c        DATA TRFR/19,17.5,.2/
238            DATA TRFR/21.1,19.0,.275/
239            DATA TRFD/19.75,13.9,.2425/
240            DATA TRFU/19.4,13.55,.2425/
241            DATA TRFM/21.1,19.0,0.1375/
242            DATA TRFL/20.175,14.325,1.13/
243    c        DATA TRFI/15.5,14.,.2/
244            DATA TRR0/21.1,38.5,.25/
245            DATA TRI0/10.65,8.85,.15/
246            DATA TRRF/16.0,15.4,0.1/
247            DATA TRRI/9.8,8.0,0.1/
248    c end ml.
249            DATA TRBS/3.3,18.3,1./
250    *ml: 10/11/66:
251            DATA TRAL/3.3,2.15,1./
252            DATA TRR2/19.025,13.175,1.51/
253    *end ml.
254            DATA TRDS/24.,24.5,13.5/
255            DATA TRDT/3.,3.,.25/
256            DATA TRDB/17.7,18.5,0/
257            DATA TRSO/0.197,0.2,14./
258    C        DATA TRSI/0.,0.197,14./
259            DATA TRSI/0.,0.2,14./
260    *ml: 12/11/04:
261    c        DATA TRRA/13.2,14.,0/
262            DATA TRRA/18.25,12.4,0.76/
263    *end ml.
264    *ml: 17/11/04:
265    c        DATA TRAN/1.75,1.75,1.0/
266    c        DATA TRAI/1.75,1.65,0.9/
267            DATA TRAN/1.8,1.8,1.0/
268            DATA TRAI/1.0,1.0,1.0/
269    *end ml.
270            DATA ZTRD/90.55/
271            DATA GAPTRD/1.5/
272    C Spectrometer data, mod by Caf on 20 Jul 2005
273            DATA SPEB/15.,14.4,22.615/
274    c ml: 31/10/05:
275    c        DATA MGFR/14.,13.4,4.0/
276            DATA MGFR/15.,14.4,4.45/
277    c end ml.
278    c ml: 26/10/04:
279    c     DATA MGPL/12.,11.4,4.05/
280            DATA MGPL/12.,11.4,4.0/
281            DATA MGPA/8.1,6.6,4.0/
282    c     DATA MGPI/8.05,6.55,4.05/
283    c ml: 31/10/05:
284    c        DATA MGPI/8.1,6.6,4.0/
285    C        DATA MGPI/8.07,6.57,4./
286    C        DATA MGPI/8.07,6.57,4.03/
287            DATA MGPI/8.07,6.57,4./
288    C end ml.
289    c ml:31/10/05:
290    c new volumes:
291    C        DATA TPGA/10.5,10.65,0.055/
292            DATA TPGA/10.29,10.65,0.04/
293            DATA TPGU/10.49,12.15,0.01/
294            DATA TPGD/12.,11.4,0.005/
295            DATA TPGI/8.07,6.57,0.015/
296    c end ml.
297    c ml:17/12/04:
298    c        DATA TRPB/12.,11.4,0.4/
299    c$$$ mod by Caf on 20 Jul 2005
300    c$$$        DATA TRPB/10.49,12.15,0.365/
301    c ml 31/10/05:
302    c       DATA TRPB/15.,14.4,0.365/
303            DATA TRPB/10.49,12.15,0.365/
304    c end ml.
305    ccc ml: 20/04/05:
306    cc        DATA TRPL/0.,7.,0.4/
307    C #         DATA TPAI/8.0995,8.5,0.055/
308    C #         DATA TPAS/8.0995,9.75,0.06/
309    C # Mod by CAF on 15 Jul 2005
310    c        DATA TPAI/8.0995,1.25,0.055/
311    c        DATA TPAS/8.0995,9.75,0.365/
312    c ml: 15/12/05:
313    c ml 19/9/05:
314    c        DATA TPAS/8.144,9.9,0.365/
315            DATA TPAS/8.2,9.9,0.365/
316            DATA TPAI/8.144,1.25,0.05/
317    C # End mod
318    c        DATA TRSL/0.,7.,0./
319    C #         DATA TRSL/2.6665,7.,0.015/
320            DATA TRSL/2.6665,3.5,0.015/
321    c        DATA TSPA/2.666,3.5,0.015/
322            DATA TSPA/2.596,3.413,0.015/
323            DATA THBP/2.6665,2.75,0.015/
324    c        DATA TRCP/0.005,7.,0.3/
325    c        DATA TRCP/0.025,10.125,0.25/
326    c ml: 19/9/05: (based on the measure of the final version of the tracker plane)
327    c        DATA TRCP/0.035,10.125,0.25/
328    c change TRCP in order to not overla with mother
329            DATA TRCP/0.035,9.9,0.25/
330            DATA TBAL/1.49,2.25,0.365/
331    c ml:16/11/05: distance between the bottom of the tracker and the bottom of
332    c the base plate.
333            DATA ZSPEBP/2.97/
334    c        DATA ZSPEC/50.6/
335    C ml: 15/12/05: xglue is the dimension along x of the glue between each carbon
336    c               fiber barrel and the TRSL volume
337            DATA XGLUE/0.0015/
338    C #         DATA NTRSL/3/
339            DATA NTRSL/6/
340            DATA NTHBP/3/
341    c     end ml.
342    C Calorimeter data
343    *EM:
344    *        DATA CASI/3.9,3.9,0.019/
345            DATA CASI/3.904,3.904,0.019/
346    *F.V.&ML:
347    C        DATA CG10/12.1,12.1,0.0875/
348    C        DATA C10C/12.1,12.1,0.08/
349    C        DATA CAAB/12.1,12.1,0.133/
350    C        DATA CAPL/12.1,12.1,0./
351    C        DATA CAAD/12.1,12.1,0.133/
352    C        DATA CAPD/12.1,12.1,0./
353    C        DATA CALB/19.7,19.7,10.2/
354    *MA
355            DATA DZM0/0.19/, DZST/0.390/
356            DATA CG10/12.3,12.3,0.0875/
357    C #         DATA C10C/12.3,12.3,0.08/
358    C #         DATA CAAB/12.3,12.3,0.1315/
359            DATA C10C/12.3,12.3,0.06/
360            DATA CAAB/12.3,12.3,0.1315/
361    * end MA
362            DATA CAPL/12.3,12.3,0./
363            DATA CANS/12.3,12.3,0./
364            DATA CAAD/12.3,12.3,0.133/
365            DATA CAPD/12.3,12.3,0./
366    *ML:
367    *   DATA CALB/19.7,19.7,10.45/
368            DATA CALB/23.2,23.2,10.589/
369    *END ML.
370    *END F.V.&ML.
371    *ML:
372    *        DATA CALS/20.,20.,10.5/
373            DATA CALS/24.2,24.2,10.639/
374            DATA ZCAL/13.05/
375    C with ZCAL=13.03 the distance between the bottom of the magnet and
376    C the top of the top silicon strips is about 44.24 mm, as it has to be
377    C if 37 mm is the height of the base plate and 7.24 mm is the distance
378    C between the bottom of the end of the base plate and the top silicium
379    C strips. Because of the difference is small and the height of the base
380    C plate could be approximate, I left ZCAL=13.05.  
381    C   DATA ZCAL/13.03/
382    *END ML.
383    *        DATA CALSTWID/0.36/
384            DATA CALSTWID/0.244/
385    *
386    * NOTE: IF you change NCAPL, remember to modify the NCPL, NCSI, NOCAPL,
387    *     NOCASI array dimentions in $GPKEY, $GPDKEY common and data block.
388    *     The corresponding FFKEY call in GPFFR must be changed as well.
389    *     The GPDAT loop on these arrays should be checked too.
390    *
391            DATA NCAPL/22/
392            DATA NCAPLD/1/
393            DATA DCASIX/0.242/
394            DATA DCASIY/0.242/
395            DATA DCASIZ/0.694/
396            DATA NCASTR/32/
397            DATA CAKA/12.3,12.3,0.0025/
398            DATA CAGL/12.3,12.3,0.005/
399            DATA CAKP/12.3,12.3,0.0025/
400    C
401    ***** Neutron detector
402          DATA NDBI/21.2,21.2,6.875/,NDTU/0.92,0.925,10./,NDTI/0.,0.92,10./,
403         +     NDPB/21.2,21.2,1.0/,NDCD/21.25,21.25,6.9/
404          DATA NDBX/21.45,21.45,7./
405          DATA NDCO/27.5,30.,0.5/
406          DATA NDBO/27.5,30.,7.5/
407          DATA NDBS/15.,4.275,7./
408          DATA NDSS/14.8,4.075,6.8/
409          DATA NDCI/21.2,11.3,0.325/
410          DATA NDCM/21.2,4.25,0.325/
411          DATA NDCE/14.6,2.875,0.325/
412          DATA NDSI/1.,7.26,0.325/
413          DATA NDSM/1.,5.8,0.325/
414          DATA NDSE/4.2,1.05,0.325/
415          DATA TNDBX/0.2/
416          DATA TNDCD/0.05/
417          DATA GNDTU/0.5/

Legend:
Removed from v.3.1.1.1  
changed lines
  Added in v.3.21

  ViewVC Help
Powered by ViewVC 1.1.23