--- gpamela/gpcdes/gpsed.inc	2006/04/09 23:29:00	3.3
+++ gpamela/gpcdes/gpsed.inc	2006/05/18 10:52:32	3.6
@@ -1,7 +1,16 @@
 *
-* $Id: gpsed.inc,v 3.2 2005/06/21 02:42:17 cafagna Exp $
+* $Id: gpsed.inc,v 3.5 2006/05/02 11:44:49 pam-ba Exp $
 *
 * $Log: gpsed.inc,v $
+* Revision 3.5  2006/05/02 11:44:49  pam-ba
+* TOF geometry and position updated and a new material, the mylar, added
+*
+* Revision 3.4  2006/05/02 11:13:41  pam-ba
+* TOF geometry and position updated and a new material, the mylar, added
+*
+* 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,15 +27,23 @@
 *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
-      PARAMETER  (NSET=14, NSDET=3)
+c$$$<<<<<<< gpsed.inc
+      PARAMETER  (NSET=11, NSDET=3)
       INTEGER    NVTOF,NVS4,NVTRD,NVCAT,NVCAS,NVCARD,
-c ml: 27/10/04
-c    +           NVSPE ,NVCAL ,ISS11,IDS11X,ISS12,IDS12Y,ISS21,
-     +           NVSPE ,NVCAL ,NVCALI,NVND,
-     +           ISS11,IDS11YISS12,IDS12X,ISS21,
-c end ml.
-     +           IDS21X,ISS22,IDS22Y,ISS31,IDS31Y,ISS32,IDS32X,
-     +           ISS4,IDS4,ISTRD ,
+     +           NVSPE ,NVCAL ,NVCALI,ISS1,IDS11Y,IDS12X,ISS2,
+     +           IDS21X,IDS22Y,ISS3,IDS31Y,IDS32X,
+     +           ISS4,IDS4,ISTRD,IDTRSI,
+c$$$ =======
+c$$$      PARAMETER  (NSET=14, NSDET=3)
+c$$$      INTEGER    NVTOF,NVS4,NVTRD,NVCAT,NVCAS,NVCARD,
+c$$$c ml: 27/10/04
+c$$$c    +           NVSPE ,NVCAL ,ISS11,IDS11X,ISS12,IDS12Y,ISS21,
+c$$$     +           NVSPE ,NVCAL ,NVCALI,NVND,
+c$$$     +           ISS11,IDS11YISS12,IDS12X,ISS21,
+c$$$c end ml.
+c$$$     +           IDS21X,ISS22,IDS22Y,ISS31,IDS31Y,ISS32,IDS32X,
+c$$$     +           ISS4,IDS4,ISTRD ,
+c$$$>>>>>>> 3.3
      +           IDTRSO,ISCAT ,IDCATL,IDCATT,ISCAS ,
      +           IDCASX,IDCASY,ISCARD,IDCAR1,IDCAR2,ISSPE ,IDTSPA,
      +           ISCAL,IDCASI,IDCAST,ISND,IDNDTI
@@ -34,13 +51,19 @@
       CHARACTER*4 CNSED
 *
       COMMON /GPCSED/ NVTOF,NVS4,NVTRD,NVCAT,NVCAS,
-c ml: 27/10/04:
-c    +               NVSPE ,NVCAL ,ISS11,IDS11X,ISS12,IDS12Y,ISS21,
-     +               NVSPE ,NVCAL,NVCALI,NVND,
-     +               ISS11,IDS11Y,ISS12,IDS12X,ISS21,
-c ml.
-     +               IDS21X,ISS22,IDS22Y,ISS31,IDS31Y,ISS32,IDS32X,
-     +               ISS4,IDS4,ISTRD ,
+c$$$<<<<<<< gpsed.inc
+     +               NVSPE ,NVCAL,NVCALI,NVND,ISS1,IDS11Y,IDS12X,ISS2,
+     +               IDS21X,IDS22Y,ISS3,IDS31Y,IDS32X,
+     +               ISS4,IDS4,ISTRD,IDTRSI,
+c$$$=======
+c$$$c ml: 27/10/04:
+c$$$c    +               NVSPE ,NVCAL ,ISS11,IDS11X,ISS12,IDS12Y,ISS21,
+c$$$     +               NVSPE ,NVCAL,NVCALI,NVND,
+c$$$     +               ISS11,IDS11Y,ISS12,IDS12X,ISS21,
+c$$$c ml.
+c$$$     +               IDS21X,ISS22,IDS22Y,ISS31,IDS31Y,ISS32,IDS32X,
+c$$$     +               ISS4,IDS4,ISTRD ,
+c$$$>>>>>>> 3.3
      +               IDTRSO,ISCAT ,IDCATL,IDCATT,ISCAS ,
      +               IDCASX,IDCASY,ISCARD,IDCAR1,IDCAR2,ISSPE ,IDTSPA,
      +               ISCAL,IDCASI,IDCAST,ISND,IDNDTI,