--- gpamela/gpcal/gpcalv.F	2002/12/05 10:17:41	3.2
+++ gpamela/gpcal/gpcalv.F	2003/12/17 11:32:48	3.3
@@ -1,7 +1,10 @@
 *
-* $Id: gpcalv.F,v 3.1.1.1 2002/07/11 16:02:14 cafagna Exp $
+* $Id: gpcalv.F,v 3.2 2002/12/05 10:17:41 pamela Exp $
 *
 * $Log: gpcalv.F,v $
+* Revision 3.2  2002/12/05 10:17:41  pamela
+* Update CAS and CALO geometries and positions. Makefile updated as well
+*
 * Revision 3.1.1.1  2002/07/11 16:02:14  cafagna
 * First GPAMELA release on CVS
 *
@@ -107,7 +110,7 @@
       Y = 0.
 *EM:
 *F.V.&ML:
-      CALL GPVOLU(-2)
+c      CALL GPVOLU(-2)
 C      Z = -CAPL(3) + CAKA(3)
 C      CALL GSPOS('CAKA',N,'CAPL',X,Y,Z,0,'ONLY')
       Z = -CANS(3) + CAKA(3)
@@ -227,8 +230,8 @@
 *     
          CALL GSPOS('CANS',N,'CALB',X,Y,Z,3,'ONLY')
          Z= Z - CANS(3) - CAPL(3)
-         X=0.05
-         Y=-0.10
+         X=-0.05
+         Y=0.10
 *
 * Check if this detector is excluded
 *
@@ -255,8 +258,8 @@
          N= N + 1
 *
 * Check if this plane is excluded
-         X = -0.10
-         Y = -0.05
+         X= -0.10
+         Y= -0.05
 *
          IF(.NOT.NOCAPL(N))
      +        CALL GSPOS('CAPL',N,'CALB',X,Y,Z,0,'ONLY')
@@ -278,8 +281,8 @@
 *
          CALL GSPOS('CANS',N,'CALB',X,Y,Z,3,'ONLY')
          Z= Z - CANS(3) - CAPL(3)
-         X = -0.05
-         Y = -0.10
+         X= 0.05
+         Y= -0.10
 *
 *
 * Check if this detector is excluded