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

Diff of /gpamela/gpcdes/gpsed.inc

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

revision 3.4 by pam-ba, Tue May 2 11:13:41 2006 UTC revision 3.6 by pam-ba, Thu May 18 10:52:32 2006 UTC
# Line 1  Line 1 
1  *  *
2  * $Id: gpsed.inc,v 3.3 2006/04/09 23:29:00 cafagna Exp $  * $Id: gpsed.inc,v 3.5 2006/05/02 11:44:49 pam-ba Exp $
3  *  *
4  * $Log: gpsed.inc,v $  * $Log: gpsed.inc,v $
5    * Revision 3.5  2006/05/02 11:44:49  pam-ba
6    * TOF geometry and position updated and a new material, the mylar, added
7    *
8    * Revision 3.4  2006/05/02 11:13:41  pam-ba
9    * TOF geometry and position updated and a new material, the mylar, added
10    *
11  * Revision 3.3  2006/04/09 23:29:00  cafagna  * Revision 3.3  2006/04/09 23:29:00  cafagna
12  * Several new things, among this: ND and CARD  * Several new things, among this: ND and CARD
13  *  *
# Line 21  Line 27 
27  *CMZ :  1.02/00 21/10/99  16.32.09  by  Francesco Cafagna  *CMZ :  1.02/00 21/10/99  16.32.09  by  Francesco Cafagna
28  *CMZ :  1.00/02 15/03/96  16.23.08  by  Francesco Cafagna  *CMZ :  1.00/02 15/03/96  16.23.08  by  Francesco Cafagna
29  *-- Author :    Francesco Cafagna   13/02/96  *-- Author :    Francesco Cafagna   13/02/96
30  <<<<<<< gpsed.inc  c$$$<<<<<<< gpsed.inc
31        PARAMETER  (NSET=14, NSDET=3)        PARAMETER  (NSET=11, NSDET=3)
32        INTEGER    NVTOF,NVS4,NVTRD,NVCAT,NVCAS,NVCARD,        INTEGER    NVTOF,NVS4,NVTRD,NVCAT,NVCAS,NVCARD,
33       +           NVSPE ,NVCAL ,NVCALI,ISS1,IDS11Y,IDS12X,ISS2,       +           NVSPE ,NVCAL ,NVCALI,ISS1,IDS11Y,IDS12X,ISS2,
34       +           IDS21X,IDS22Y,ISS3A,IDS31Y,IDS32X,       +           IDS21X,IDS22Y,ISS3,IDS31Y,IDS32X,
35       +           ISS4,IDS4,ISTRD,IDTRSI,       +           ISS4,IDS4,ISTRD,IDTRSI,
36  =======  c$$$ =======
37        PARAMETER  (NSET=14, NSDET=3)  c$$$      PARAMETER  (NSET=14, NSDET=3)
38        INTEGER    NVTOF,NVS4,NVTRD,NVCAT,NVCAS,NVCARD,  c$$$      INTEGER    NVTOF,NVS4,NVTRD,NVCAT,NVCAS,NVCARD,
39  c ml: 27/10/04  c$$$c ml: 27/10/04
40  c    +           NVSPE ,NVCAL ,ISS11,IDS11X,ISS12,IDS12Y,ISS21,  c$$$c    +           NVSPE ,NVCAL ,ISS11,IDS11X,ISS12,IDS12Y,ISS21,
41       +           NVSPE ,NVCAL ,NVCALI,NVND,  c$$$     +           NVSPE ,NVCAL ,NVCALI,NVND,
42       +           ISS11,IDS11YISS12,IDS12X,ISS21,  c$$$     +           ISS11,IDS11YISS12,IDS12X,ISS21,
43  c end ml.  c$$$c end ml.
44       +           IDS21X,ISS22,IDS22Y,ISS31,IDS31Y,ISS32,IDS32X,  c$$$     +           IDS21X,ISS22,IDS22Y,ISS31,IDS31Y,ISS32,IDS32X,
45       +           ISS4,IDS4,ISTRD ,  c$$$     +           ISS4,IDS4,ISTRD ,
46  >>>>>>> 3.3  c$$$>>>>>>> 3.3
47       +           IDTRSO,ISCAT ,IDCATL,IDCATT,ISCAS ,       +           IDTRSO,ISCAT ,IDCATL,IDCATT,ISCAS ,
48       +           IDCASX,IDCASY,ISCARD,IDCAR1,IDCAR2,ISSPE ,IDTSPA,       +           IDCASX,IDCASY,ISCARD,IDCAR1,IDCAR2,ISSPE ,IDTSPA,
49       +           ISCAL,IDCASI,IDCAST,ISND,IDNDTI       +           ISCAL,IDCASI,IDCAST,ISND,IDNDTI
# Line 45  c end ml. Line 51  c end ml.
51        CHARACTER*4 CNSED        CHARACTER*4 CNSED
52  *  *
53        COMMON /GPCSED/ NVTOF,NVS4,NVTRD,NVCAT,NVCAS,        COMMON /GPCSED/ NVTOF,NVS4,NVTRD,NVCAT,NVCAS,
54  <<<<<<< gpsed.inc  c$$$<<<<<<< gpsed.inc
55       +               NVSPE ,NVCAL,NVCALI,NVND,ISS1,IDS11Y,IDS12X,ISS2,       +               NVSPE ,NVCAL,NVCALI,NVND,ISS1,IDS11Y,IDS12X,ISS2,
56       +               IDS21X,IDS22Y,ISS3A,IDS31Y,IDS32X,       +               IDS21X,IDS22Y,ISS3,IDS31Y,IDS32X,
57       +               ISS4,IDS4,ISTRD,IDTRSI,       +               ISS4,IDS4,ISTRD,IDTRSI,
58  =======  c$$$=======
59  c ml: 27/10/04:  c$$$c ml: 27/10/04:
60  c    +               NVSPE ,NVCAL ,ISS11,IDS11X,ISS12,IDS12Y,ISS21,  c$$$c    +               NVSPE ,NVCAL ,ISS11,IDS11X,ISS12,IDS12Y,ISS21,
61       +               NVSPE ,NVCAL,NVCALI,NVND,  c$$$     +               NVSPE ,NVCAL,NVCALI,NVND,
62       +               ISS11,IDS11Y,ISS12,IDS12X,ISS21,  c$$$     +               ISS11,IDS11Y,ISS12,IDS12X,ISS21,
63  c ml.  c$$$c ml.
64       +               IDS21X,ISS22,IDS22Y,ISS31,IDS31Y,ISS32,IDS32X,  c$$$     +               IDS21X,ISS22,IDS22Y,ISS31,IDS31Y,ISS32,IDS32X,
65       +               ISS4,IDS4,ISTRD ,  c$$$     +               ISS4,IDS4,ISTRD ,
66  >>>>>>> 3.3  c$$$>>>>>>> 3.3
67       +               IDTRSO,ISCAT ,IDCATL,IDCATT,ISCAS ,       +               IDTRSO,ISCAT ,IDCATL,IDCATT,ISCAS ,
68       +               IDCASX,IDCASY,ISCARD,IDCAR1,IDCAR2,ISSPE ,IDTSPA,       +               IDCASX,IDCASY,ISCARD,IDCAR1,IDCAR2,ISSPE ,IDTSPA,
69       +               ISCAL,IDCASI,IDCAST,ISND,IDNDTI,       +               ISCAL,IDCASI,IDCAST,ISND,IDNDTI,
Legend:
Removed from v.3.4  
changed lines
  Added in v.3.6
  ViewVC Help
Powered by ViewVC 1.1.23