--- gpamela/gpcdes/gpsed.inc 2002/07/11 16:02:00 3.1 +++ gpamela/gpcdes/gpsed.inc 2006/05/02 11:44:49 3.5 @@ -1,7 +1,19 @@ * -* $Id$ +* $Id: gpsed.inc,v 3.4 2006/05/02 11:13:41 pam-ba Exp $ +* +* $Log: gpsed.inc,v $ +* 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 +* +* Revision 3.1.1.1 2002/07/11 16:02:00 cafagna +* First GPAMELA release on CVS * -* $Log$ * * * gpsed.inc @@ -12,21 +24,45 @@ *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=12, NSDET=3) - INTEGER NVTOF,NVS4,NVTRD,NVCAT,NVCAS, - + NVSPE ,NVCAL ,ISS11,IDS11X,ISS12,IDS12Y,ISS21, - + IDS21X,ISS22,IDS22Y,ISS31,IDS31Y,ISS32,IDS32X, - + ISS4,IDS4,ISTRD , - + IDTRSI,IDTRSO,ISCAT ,IDCATL,IDCATT,ISCAS , - + IDCASX,IDCASY,ISSPE ,IDTSPA,ISCAL,IDCASI +c$$$<<<<<<< gpsed.inc + PARAMETER (NSET=11, 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, +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 * CHARACTER*4 CNSED * COMMON /GPCSED/ NVTOF,NVS4,NVTRD,NVCAT,NVCAS, - + NVSPE ,NVCAL ,ISS11,IDS11X,ISS12,IDS12Y,ISS21, - + IDS21X,ISS22,IDS22Y,ISS31,IDS31Y,ISS32,IDS32X, - + ISS4,IDS4,ISTRD , - + IDTRSI,IDTRSO,ISCAT ,IDCATL,IDCATT,ISCAS , - + IDCASX,IDCASY,ISSPE ,IDTSPA,ISCAL ,IDCASI, +c$$$<<<<<<< gpsed.inc + + NVSPE ,NVCAL,NVCALI,NVND,ISS1,IDS11Y,IDS12X,ISS2, + + IDS21X,IDS22Y,ISS3A,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, + CNSED(NSET,NSDET) *