--- gpamela/gpcdes/gpstripspe.inc	2006/05/02 11:58:02	3.1
+++ gpamela/gpcdes/gpstripspe.inc	2009/05/20 09:16:09	3.3
@@ -4,7 +4,7 @@
 
 	parameter (pitchx=0.00255)        ! X-side implantation pitch          
         parameter (pitchy=0.00665)         ! Y-side read-out pitch    
-	parameter (hallmob=310.)      ! Hall mobility (Peisert)
+	parameter (hallmob=304.5)      ! Hall mobility (Peisert)
 c	parameter (bfield=0.0)        ! no magnetic field 
 	parameter (ebias=67/0.03)    ! (effective) electric field in V/cm 
 	parameter (psy1=45.)          ! parabolic behaviour of sigmaY   
@@ -20,7 +20,7 @@
  
 
 ***********************def parametri di gpucollection.F*********************************
-
+        PARAMETER(F1=0.043,F2=0.018,F3=0.013,F4=0.011)
 	parameter (cdec=20.0)         ! decoupling capacitance (pF) -- FIXED
         parameter (cistrx=0.35)       ! X interstrip capacitance (pF) 
         parameter (cistrx2=0.6*cistrx)! 2nd neigh. interstrip cap. (X) (pF) 
@@ -28,22 +28,26 @@
 ccc       parameter (shiftmask=0.020)   ! shift of the intermediate strip (X side) 
         parameter (shiftmask=0.000)   ! shift of the intermediate strip (X side) 
         parameter (effcoupl=0.81)     ! eff. in charge sharing on X strips(*)
-        parameter (xcalib=2053.)      ! calib. factor (ADC/MeV) on X side
+        parameter (xcalib=2565.)      ! calib. factor (ADC/MeV) on X side
         parameter (ycalib=1840.)      ! calib. factor (ADC/MeV) on Y side
  
-	parameter (nviews=12)     !
-      	parameter (nplanes=nviews/2) !number of planes
-        parameter (nsensors=6) !number of sensors
+	parameter (nviews=12)          ! number of views
+      	parameter (nplanes=nviews/2)   ! number of planes
+	parameter (nladd=3)            ! number of ladders per view
+	parameter (nva1=8)             ! number of va1 per ladder
+	parameter (ntotva1=nva1*nladd*nviews) ! total number of va1
+        parameter (nsensors=6)         ! number of sensors
         parameter (nstrips_view=1024)  ! number of strip readed/view/sensor
 	parameter (nstripx=2048)       ! number of strip x
 	parameter (nstripy=1024)       ! number of strip y
 	
-	real proxtanti,proytanti,globstripx,globstripy
+	real proxtanti,proytanti,globstripx,globstripy	
         common/diffusione/proxtanti(nplanes,nsensors,nstripx),
      +                    proytanti(nplanes,nsensors,nstripy),
      +                    globstripx(nplanes,nsensors,nstripx),
-     +                    globstripy(nplanes,nsensors,nstripy)	
-
+     +                    globstripy(nplanes,nsensors,nstripy)
+        INTEGER BADVA1
+        COMMON/BAD/BADVA1(nviews,nladd,nva1)	
 
       INTEGER MAXSTR
       PARAMETER(MAXSTR=1000)