--- gpamela/gpcdes/gpgeo.inc	2005/06/21 02:42:13	3.3
+++ gpamela/gpcdes/gpgeo.inc	2005/12/13 10:31:29	3.6
@@ -1,7 +1,16 @@
 *
-* $Id: gpgeo.inc,v 3.2 2002/12/05 10:17:42 pamela Exp $
+* $Id: gpgeo.inc,v 3.5 2005/12/05 12:15:20 pam-ba Exp $
 *
 * $Log: gpgeo.inc,v $
+* 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
 * Update CAS and CALO geometries and positions. Makefile updated as well
 *
@@ -50,17 +59,13 @@
 *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,
-     +           TRDS,TRDT,TRDB,TRFR,TRBS,TRAL,TRSO,TRSI,TRRA,
+     +           T RDS,TRDT,TRDB,TRFR,TRBS,TRAL,TRSO,TRSI,TRRA,
      +           TRFU,TRFD,TRFM,TRFL,TRR2,TRR0,TRI0,TRRF,TRRI,
 *end ml.
-     +          TRAN,TRAI,SPEB,MGPL,MGPI,
-*F.V.&ML:
-C     +          TRPB,TRPL,TRSL,TSPA,TRCP,CALB,CALS,CAPL,
-c ml: 26/11/04:
-c     +          TRPB,TRPL,TRSL,TSPA,TRCP,CALB,CALS,CAPL,CANS,
+     +          TRAN,TRAI,SPEB,MGFR,MGPL,MGPA,MGPI,TPGA,TPGU,TPGD,TPGI
 c ml: 20/04/05:
 c     +          TRPB,TRPL,TRSL,TSPA,THBP,TRCP,CALB,CALS,CAPL,CANS,
-     +          TRPB,TPAI,TPAS,TRSL,TSPA,THBP,TRCP,CALB,CALS,
+     +          TRPB,TPAS,TPAI,TRSL,TSPA,THBP,TRCP,CALB,CALS,
      +          CAPL,CANS,   
 c end ml.
 *END F.V.&ML.
@@ -72,13 +77,16 @@
      +          ZCAT,ZCAS,
 c ml: 28/10/04:
 C     +          ZSPEC,ZS31,ZS32,ZCAL,ZS4,DCASIX,DCASIY,DCASIZ,
-     +          ZTPLA,ZSPEC,ZS31,ZS32,ZCAL,ZS4,DCASIX,DCASIY,DCASIZ, 
+     +          ZTPLA,ZSPEBP,ZSPEC,ZS31,ZS32,ZCAL,ZS4,DCASIX,
+     +          DCASIY,DCASIZ, 
 c end ml.
      +          SCTIC,GAPTOP,
      +          GAPTRD,CASIOFF,CALSTWID,XGEN,YGEN,ZGEN,XDGEN,YDGEN,
 *EM:
-     +          CAGL,CAKP,CAKA,C10C,CAAD,CAPD
+     +          CAGL,CAKP,CAKA,C10C,CAAD,CAPD,
 *END EM.
+* MA
+     +          DZM0, DZST
 C
 C Some usefull quantities to calculate volumes dimentions
 C
@@ -128,15 +136,14 @@
      +                TRR0( 3),TRI0( 3),TRRF( 3),TRRI( 3),TRAN( 3),
      +                TRAI( 3),
 *end ml.
-     +                SPEB( 3),MGPL( 3),MGPI( 3),
-c ml: 26/11/04:
-c     +                TRPB( 3),TRPL( 3),TRSL( 3),TSPA( 3),
+     +                SPEB( 3),MGFR( 3),MGPL( 3),MGPA( 3),MGPI( 3),
 c ml:20/04/05:
 c     +                TRPB( 3),TRPL( 3),TRSL( 3),TSPA( 3),THBP( 3),
-     +                TRPB( 3),TPAI( 3),TPAS( 3),TRSL( 3),
-     +                TSPA( 3),THBP( 3),
+     +                TPGA( 3),TPGU( 3),TPGD( 3),TPGI( 3),TRPB( 3),
+     +                TPAS( 3),
+     +                TPAI( 3),TRSL( 3),TSPA( 3),THBP( 3),TRCP( 3),
 c end ml.
-     +                TRCP( 3),CALB( 3),CALS( 3),
+     +                CALB( 3),CALS( 3),
 * F.C.&ML:
 C     +                CAPL( 3),CASI( 3),CAAD( 3),CAPD( 3),
      +                CAPL( 3),CASI( 3),CAAD( 3),CAPD( 3),CANS( 3),
@@ -146,13 +153,16 @@
      +                CAGL( 3),CAKP( 3),CAKA( 3),C10C( 3),
      +                CASXD,CASYD,
 *END EM.
+*MA
+     +                DZM0, DZST,
+* end MA
      +                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,ZSPEC,   
+     +                ZTRD,ZS21,ZS22,ZTPLA,ZCAT,ZCAS,ZSPEBP,ZSPEC,   
 c end ml.
      +                ZS31,ZS32,ZCAL,ZS4,DCASIX,DCASIY,DCASIZ,
      +                GAPTOP,GAPTRD,