--- gpamela/gpcdes/gpsed.inc	2006/04/09 23:29:00	3.3
+++ gpamela/gpcdes/gpsed.inc	2006/05/02 11:13:41	3.4
@@ -1,7 +1,10 @@
 *
-* $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 $
 *
 * $Log: gpsed.inc,v $
+* Revision 3.3  2006/04/09 23:29:00  cafagna
+* Several new things, among this: ND and CARD
+*
 * Revision 3.2  2005/06/21 02:42:17  cafagna
 * Major modification to the geometry and to the random number chain
 *
@@ -18,6 +21,13 @@
 *CMZ :  1.02/00 21/10/99  16.32.09  by  Francesco Cafagna
 *CMZ :  1.00/02 15/03/96  16.23.08  by  Francesco Cafagna
 *-- Author :    Francesco Cafagna   13/02/96
+<<<<<<< gpsed.inc
+      PARAMETER  (NSET=14, NSDET=3)
+      INTEGER    NVTOF,NVS4,NVTRD,NVCAT,NVCAS,NVCARD,
+     +           NVSPE ,NVCAL ,NVCALI,ISS1,IDS11Y,IDS12X,ISS2,
+     +           IDS21X,IDS22Y,ISS3A,IDS31Y,IDS32X,
+     +           ISS4,IDS4,ISTRD,IDTRSI,
+=======
       PARAMETER  (NSET=14, NSDET=3)
       INTEGER    NVTOF,NVS4,NVTRD,NVCAT,NVCAS,NVCARD,
 c ml: 27/10/04
@@ -27,6 +37,7 @@
 c end ml.
      +           IDS21X,ISS22,IDS22Y,ISS31,IDS31Y,ISS32,IDS32X,
      +           ISS4,IDS4,ISTRD ,
+>>>>>>> 3.3
      +           IDTRSO,ISCAT ,IDCATL,IDCATT,ISCAS ,
      +           IDCASX,IDCASY,ISCARD,IDCAR1,IDCAR2,ISSPE ,IDTSPA,
      +           ISCAL,IDCASI,IDCAST,ISND,IDNDTI
@@ -34,6 +45,11 @@
       CHARACTER*4 CNSED
 *
       COMMON /GPCSED/ NVTOF,NVS4,NVTRD,NVCAT,NVCAS,
+<<<<<<< gpsed.inc
+     +               NVSPE ,NVCAL,NVCALI,NVND,ISS1,IDS11Y,IDS12X,ISS2,
+     +               IDS21X,IDS22Y,ISS3A,IDS31Y,IDS32X,
+     +               ISS4,IDS4,ISTRD,IDTRSI,
+=======
 c ml: 27/10/04:
 c    +               NVSPE ,NVCAL ,ISS11,IDS11X,ISS12,IDS12Y,ISS21,
      +               NVSPE ,NVCAL,NVCALI,NVND,
@@ -41,6 +57,7 @@
 c ml.
      +               IDS21X,ISS22,IDS22Y,ISS31,IDS31Y,ISS32,IDS32X,
      +               ISS4,IDS4,ISTRD ,
+>>>>>>> 3.3
      +               IDTRSO,ISCAT ,IDCATL,IDCATT,ISCAS ,
      +               IDCASX,IDCASY,ISCARD,IDCAR1,IDCAR2,ISSPE ,IDTSPA,
      +               ISCAL,IDCASI,IDCAST,ISND,IDNDTI,