/[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.3 by cafagna, Sun Apr 9 23:29:00 2006 UTC revision 3.4 by pam-ba, Tue May 2 11:13:41 2006 UTC
# Line 1  Line 1 
1  *  *
2  * $Id: gpsed.inc,v 3.2 2005/06/21 02:42:17 cafagna Exp $  * $Id: gpsed.inc,v 3.3 2006/04/09 23:29:00 cafagna Exp $
3  *  *
4  * $Log: gpsed.inc,v $  * $Log: gpsed.inc,v $
5    * Revision 3.3  2006/04/09 23:29:00  cafagna
6    * Several new things, among this: ND and CARD
7    *
8  * Revision 3.2  2005/06/21 02:42:17  cafagna  * Revision 3.2  2005/06/21 02:42:17  cafagna
9  * Major modification to the geometry and to the random number chain  * Major modification to the geometry and to the random number chain
10  *  *
# Line 18  Line 21 
21  *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
22  *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
23  *-- Author :    Francesco Cafagna   13/02/96  *-- Author :    Francesco Cafagna   13/02/96
24    <<<<<<< gpsed.inc
25          PARAMETER  (NSET=14, NSDET=3)
26          INTEGER    NVTOF,NVS4,NVTRD,NVCAT,NVCAS,NVCARD,
27         +           NVSPE ,NVCAL ,NVCALI,ISS1,IDS11Y,IDS12X,ISS2,
28         +           IDS21X,IDS22Y,ISS3A,IDS31Y,IDS32X,
29         +           ISS4,IDS4,ISTRD,IDTRSI,
30    =======
31        PARAMETER  (NSET=14, NSDET=3)        PARAMETER  (NSET=14, NSDET=3)
32        INTEGER    NVTOF,NVS4,NVTRD,NVCAT,NVCAS,NVCARD,        INTEGER    NVTOF,NVS4,NVTRD,NVCAT,NVCAS,NVCARD,
33  c ml: 27/10/04  c ml: 27/10/04
# Line 27  c    +           NVSPE ,NVCAL ,ISS11,IDS Line 37  c    +           NVSPE ,NVCAL ,ISS11,IDS
37  c end ml.  c end ml.
38       +           IDS21X,ISS22,IDS22Y,ISS31,IDS31Y,ISS32,IDS32X,       +           IDS21X,ISS22,IDS22Y,ISS31,IDS31Y,ISS32,IDS32X,
39       +           ISS4,IDS4,ISTRD ,       +           ISS4,IDS4,ISTRD ,
40    >>>>>>> 3.3
41       +           IDTRSO,ISCAT ,IDCATL,IDCATT,ISCAS ,       +           IDTRSO,ISCAT ,IDCATL,IDCATT,ISCAS ,
42       +           IDCASX,IDCASY,ISCARD,IDCAR1,IDCAR2,ISSPE ,IDTSPA,       +           IDCASX,IDCASY,ISCARD,IDCAR1,IDCAR2,ISSPE ,IDTSPA,
43       +           ISCAL,IDCASI,IDCAST,ISND,IDNDTI       +           ISCAL,IDCASI,IDCAST,ISND,IDNDTI
# Line 34  c end ml. Line 45  c end ml.
45        CHARACTER*4 CNSED        CHARACTER*4 CNSED
46  *  *
47        COMMON /GPCSED/ NVTOF,NVS4,NVTRD,NVCAT,NVCAS,        COMMON /GPCSED/ NVTOF,NVS4,NVTRD,NVCAT,NVCAS,
48    <<<<<<< gpsed.inc
49         +               NVSPE ,NVCAL,NVCALI,NVND,ISS1,IDS11Y,IDS12X,ISS2,
50         +               IDS21X,IDS22Y,ISS3A,IDS31Y,IDS32X,
51         +               ISS4,IDS4,ISTRD,IDTRSI,
52    =======
53  c ml: 27/10/04:  c ml: 27/10/04:
54  c    +               NVSPE ,NVCAL ,ISS11,IDS11X,ISS12,IDS12Y,ISS21,  c    +               NVSPE ,NVCAL ,ISS11,IDS11X,ISS12,IDS12Y,ISS21,
55       +               NVSPE ,NVCAL,NVCALI,NVND,       +               NVSPE ,NVCAL,NVCALI,NVND,
# Line 41  c    +               NVSPE ,NVCAL ,ISS11 Line 57  c    +               NVSPE ,NVCAL ,ISS11
57  c ml.  c ml.
58       +               IDS21X,ISS22,IDS22Y,ISS31,IDS31Y,ISS32,IDS32X,       +               IDS21X,ISS22,IDS22Y,ISS31,IDS31Y,ISS32,IDS32X,
59       +               ISS4,IDS4,ISTRD ,       +               ISS4,IDS4,ISTRD ,
60    >>>>>>> 3.3
61       +               IDTRSO,ISCAT ,IDCATL,IDCATT,ISCAS ,       +               IDTRSO,ISCAT ,IDCATL,IDCATT,ISCAS ,
62       +               IDCASX,IDCASY,ISCARD,IDCAR1,IDCAR2,ISSPE ,IDTSPA,       +               IDCASX,IDCASY,ISCARD,IDCAR1,IDCAR2,ISSPE ,IDTSPA,
63       +               ISCAL,IDCASI,IDCAST,ISND,IDNDTI,       +               ISCAL,IDCASI,IDCAST,ISND,IDNDTI,
Legend:
Removed from v.3.3  
changed lines
  Added in v.3.4
  ViewVC Help
Powered by ViewVC 1.1.23