--- gpamela/gpcdes/gpdhit.inc	2002/07/11 16:01:59	3.1
+++ gpamela/gpcdes/gpdhit.inc	2005/12/20 12:21:04	3.4
@@ -1,7 +1,16 @@
 *
-* $Id$
+* $Id: gpdhit.inc,v 3.3 2005/06/21 02:42:09 cafagna Exp $
+*
+* $Log: gpdhit.inc,v $
+* Revision 3.3  2005/06/21 02:42:09  cafagna
+* Major modification to the geometry and to the random number chain
+*
+* Revision 3.2  2003/12/17 11:32:49  pamela
+* CALO SIMULATION COMPLETED: geometry and special tracking parameters updated and simulation checked by a comparison with the Trieste's standalone Monte Carlo simulation
+*
+* Revision 3.1.1.1  2002/07/11 16:01:59  cafagna
+* First GPAMELA release on CVS
 *
-* $Log$
 *
 *
 * gpdhit.inc
@@ -32,6 +41,8 @@
      +           'EREL','TIME','PATH','IPAR','P0  '/
       DATA CHSPE/'XAVE','YAVE','ZAVE','XOUT','YOUT','ZOUT',
      +           'EREL','PATH','IPAR','P0  '/
+      DATA CHND/ 'XAVE','YAVE','ZAVE','XOUT','YOUT','ZOUT',
+     +           'EREL','TIME','IPAR','P0  '/
 #endif
 #if !defined(GPAMELA_INTER)
       DATA CHTOF/'XIN ','YIN ','ZIN ','XOUT','YOUT','ZOUT',
@@ -49,6 +60,8 @@
       DATA CHSPE/'XIN ','YIN ','ZIN ','XOUT','YOUT','ZOUT',
      +           'EREL','PATH','IPAR','P0  '/
 C ML:
+      DATA CHND/ 'XIN','YIN','ZIN','XOUT','YOUT','ZOUT',
+     +           'EREL','TIME','IPAR','P0  '/
 C +SELF.
 #endif
 #if defined(GPAMELA_GARFIELD)
@@ -56,10 +69,11 @@
 #endif
 C END ML.
       DATA CHCAL/'XAVE','YAVE','ZAVE','EREL'/
+      DATA CHCALI/'MAP ','ESTR'/
 * No packing required for the last CAL hit to use the GSCHIT routine
       DATA NBHTOF/NHTOF*32/,NBHTRD/NHTRD*32/,
      +     NBHCAT/NHCAT*32/,NBHCAS/NHCAS*32/,NBHSPE/NHSPE*32/,
-     +     NBHCAL/NHCAL*32/
+     +     NBHCAL/NHCAL*32/,NBHND/NHND*32/
 * The coordinates have to be always positive. We need microns for XYZ and eV.
 * Time is in second but we need psec.
       DATA OHTOF/6*100.,0.,0.,0.,0.,0./,
@@ -86,9 +100,16 @@
       DATA OHSPE/6*100.,0.,0.,0.,0./,
      +     FHSPE/6*10000.,1.E9,10000.,1.,1.E3/
 *EM:
+*ml: 21/03/2003:
+c       DATA OHCAL/3*100.,0./,FHCAL/3*10000.,1.E9/
+cml      DATA OHCAL/3*100.,0./,FHCAL/3*10000.,1.E5/
 c      DATA OHCAL/3*100.,0./,FHCAL/3*10000.,1.E9/
-      DATA OHCAL/3*100.,0./,FHCAL/3*10000.,1.E5/
+      DATA OHCAL/3*100.,0./,FHCAL/3*10000.,1.E9/
+      DATA OHCALI/0.,0./,FHCALI/1.,1.E9/
+*end ml.
 *END EM.
+      DATA OHND/6*100.,0.,0.,0.,0./,
+     +     FHND/6*10000.,1.E9,1.E12,1.,1.E9/