--- gpamela/gpcdes/gpgeo.inc	2005/12/16 10:20:14	3.8
+++ gpamela/gpcdes/gpgeo.inc	2006/04/10 11:07:43	3.11
@@ -1,20 +1,29 @@
-*
-* $Id: gpgeo.inc,v 3.7 2005/12/16 09:13:52 cafagna Exp $
-*
+*
+* $Id: gpgeo.inc,v 3.10 2006/04/09 23:28:57 cafagna Exp $
+*
 * $Log: gpgeo.inc,v $
+* Revision 3.10  2006/04/09 23:28:57  cafagna
+* Several new things, among this: ND and CARD
+*
+* Revision 3.9  2005/12/20 12:21:04  cafagna
+* gpnd directory added along with ND files
+*
+* Revision 3.8  2005/12/16 10:20:14  cafagna
+* Bug fixed in the new update
+*
 * Revision 3.7  2005/12/16 09:13:52  cafagna
 * New small valume added to the tracker frame
-*
-* Revision 3.6  2005/12/13 10:31:29  pam-ba
-* added a new volume, TPGI, in the spectrometer
-*
-* Revision 3.5  2005/12/05 12:15:20  pam-ba
-* new spectrometer geometry and internal magnetic field
-*
-* Revision 3.4  2005/07/25 11:53:21  cafagna
-* Several updates. See history for details
-*
-* Revision 3.3  2005/06/21 02:42:13  cafagna
+*
+* Revision 3.6  2005/12/13 10:31:29  pam-ba
+* added a new volume, TPGI, in the spectrometer
+*
+* Revision 3.5  2005/12/05 12:15:20  pam-ba
+* new spectrometer geometry and internal magnetic field
+*
+* Revision 3.4  2005/07/25 11:53:21  cafagna
+* Several updates. See history for details
+*
+* Revision 3.3  2005/06/21 02:42:13  cafagna
 * Major modification to the geometry and to the random number chain
 *
 * Revision 3.2  2002/12/05 10:17:42  pamela
@@ -62,6 +71,7 @@
 *JeL:
      +          CASA, CATA,
 *END: JeL.
+     +          CARDB,
 *ml: 10/11/04:
 c     +          TRDS,TRDT,TRDB,TRFR,TRFI,TRBS,TRSO,TRSI,TRRA,
 C     +           TRDS,TRDT,TRDB,TRFR,TRFI,TRBS,TRAL,TRSO,TRSI,TRRA,
@@ -82,6 +92,7 @@
      +          ZTFLA,ZSHEI,ZTSPH,ZS11,ZS12,ZTRD,ZS21,ZS22,
      +          ZCAT,ZCAS,
 c ml: 28/10/04:
+     +          ZCARDB,
 C     +          ZSPEC,ZS31,ZS32,ZCAL,ZS4,DCASIX,DCASIY,DCASIZ,
      +          ZTPLA,ZSPEBP,ZSPEC,XGLUE,ZS31,ZS32,ZCAL,ZS4,DCASIX,
      +          DCASIY,DCASIZ, 
@@ -89,10 +100,13 @@
      +          SCTIC,GAPTOP,
      +          GAPTRD,CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,
 *EM:
-     +          CAGL,CAKP,CAKA,C10C,CAAD,CAPD,
+     +          ZDGEN,CAGL,CAKP,CAKA,C10C,CAAD,CAPD,
 *END EM.
 * MA
-     +          DZM0, DZST
+     +          DZM0, DZST,
+*** Neutron detector definition
+     *     NDBX, NDBI, NDTU, NDTI, NDPB, NDCD
+
 C
 C Some usefull quantities to calculate volumes dimentions
 C
@@ -132,6 +146,7 @@
 *JeL:
      +		      CASA( 3),CATA( 3),
 *END: JeL.
+     +                CARDB( 3),
 *ml: 10/11/04:
 C      +                TRDS( 3),TRDT( 3),TRDB( 3),TRFR( 3),TRFI( 3),
      +                TRDS( 3),TRDT( 3),TRDB( 3),TRFR( 3),  
@@ -162,19 +177,22 @@
 *MA
      +                DZM0, DZST,
 * end MA
+     +       NDBX(3),NDBI(3),NDTU(3),NDTI(3),NDPB(3),NDCD(3),
+
      +                SCTIC,ZSHEL,ZTFLA,ZSHEI,ZTSPH,ZS11,ZS12,
 *AB:
      +                ZMSHE,ZBSPH,
 *END: AB.
 c ml: 28/10/04
 c     +                ZTRD,ZS21,ZS22,ZCAT,ZCAS,ZSPEC,
-     +                ZTRD,ZS21,ZS22,ZTPLA,ZCAT,ZCAS,ZSPEBP,ZSPEC,
+     +                ZTRD,ZS21,ZS22,ZTPLA,ZCAT,ZCAS,ZCARDB,
+     +                ZSPEBP,ZSPEC,
      +                XGLUE,
 c end ml.
      +                ZS31,ZS32,ZCAL,ZS4,DCASIX,DCASIY,DCASIZ,
      +                GAPTOP,GAPTRD,
      +                CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,
-     +                NTRSL,NTHBP,NCAPL,NCAPLD,
+     +                ZDGEN,NTRSL,NTHBP,NCAPL,NCAPLD,
 c ml: 27/10/04:
 c     +                NCASTR,NS11X,NS12Y,NS21X,NS22Y,NS31Y,NS32X
      +                NCASTR,NS11Y,NS12X,NS21X,NS22Y,NS31Y,NS32X