--- gpamela/gpcdes/gpdhit.inc	2005/12/20 12:21:04	3.4
+++ gpamela/gpcdes/gpdhit.inc	2008/01/29 18:25:16	3.9
@@ -1,12 +1,29 @@
 *
-* $Id: gpdhit.inc,v 3.3 2005/06/21 02:42:09 cafagna Exp $
+* $Id: gpdhit.inc,v 3.8 2006/05/11 00:15:51 cafagna Exp $
 *
 * $Log: gpdhit.inc,v $
+* Revision 3.8  2006/05/11 00:15:51  cafagna
+* A bug in hits retrival for calorimeter
+*
+* Revision 3.7  2006/05/02 18:00:10  cafagna
+* Bugs fixed in TOF set definition, TOF hit back to the original naming scheme
+*
+* Revision 3.6  2006/04/10 00:07:21  cafagna
+* The P0 range in ND hit changed
+*
+* Revision 3.5  2006/04/09 23:28:55  cafagna
+* Several new things, among this: ND and CARD
+*
+* Revision 3.4  2005/12/20 12:21:04  cafagna
+* gpnd directory added along with ND files
+*
 * 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.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
@@ -28,7 +45,7 @@
 #if defined(GPAMELA_INTER)
 * Interactive case. The average position inside the set has been stored
       DATA CHTOF/'XAVE','YAVE','ZAVE','XOUT','YOUT','ZOUT',
-     +           'P0  ','TIME','PATH','IPAR','EREL'/
+     +           'EREL','TIME','PATH','IPAR','P0  '/
 C ML:
 C      DATA CHTRD/'XAVE','YAVE','ZAVE','XOUT','YOUT','ZOUT',
 C     +           'EREL','PATH','IPAR','P0  '/
@@ -42,11 +59,13 @@
       DATA CHSPE/'XAVE','YAVE','ZAVE','XOUT','YOUT','ZOUT',
      +           'EREL','PATH','IPAR','P0  '/
       DATA CHND/ 'XAVE','YAVE','ZAVE','XOUT','YOUT','ZOUT',
-     +           'EREL','TIME','IPAR','P0  '/
+     +           'EREL','TIME','PATH','IPAR','P0  '/
+      DATA CHCARD/'XAVE','YAVE','ZAVE','XOUT','YOUT','ZOUT',
+     +            'EREL','TIME','PATH','IPAR','P0  '/
 #endif
 #if !defined(GPAMELA_INTER)
       DATA CHTOF/'XIN ','YIN ','ZIN ','XOUT','YOUT','ZOUT',
-     +           'P0  ','TIME','PATH','IPAR','EREL'/
+     +           'EREL','TIME','PATH','IPAR','P0  '/
 C ML:
 C      DATA CHTRD/'XIN ','YIN ','ZIN ','XOUT','YOUT','ZOUT',
 C     +           'EREL','PATH','IPAR','P0  '/
@@ -61,7 +80,10 @@
      +           'EREL','PATH','IPAR','P0  '/
 C ML:
       DATA CHND/ 'XIN','YIN','ZIN','XOUT','YOUT','ZOUT',
-     +           'EREL','TIME','IPAR','P0  '/
+     +           'EREL','TIME','PATH','IPAR','P0  '/
+      DATA CHCARD/'XIN ','YIN ','ZIN ','XOUT','YOUT','ZOUT',
+     +            'EREL','TIME','PATH','IPAR','P0  '/
+
 C +SELF.
 #endif
 #if defined(GPAMELA_GARFIELD)
@@ -73,13 +95,14 @@
 * 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/,NBHND/NHND*32/
+     +     NBHCAL/NHCAL*32/,NBHCALI/NHCALI*32/,NBHND/NHND*32/,
+     +     NBHCARD/NHCARD*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./,
 *ML:
 *     +     FHTOF/6*10000.,1.E9,1.E12,10000.,1.,1.E3/
-     +     FHTOF/6*10000.,1.E3,1.E12,10000.,1.,1.E9/
+     +     FHTOF/6*10000.,1.E9,1.E12,10000.,1.,1.E3/
 *END ML.
 C ML:
 C      DATA OHTRD/6*100.,0.,0.,0.,0./,
@@ -97,6 +120,8 @@
      +     FHCAT/6*10000.,1.E9,1.E12,10000.,1.,1.E3/
       DATA OHCAS/6*100.,0.,0.,0.,0.,0./,
      +     FHCAS/6*10000.,1.E9,1.E12,10000.,1.,1.E3/
+      DATA OHCARD/6*100.,0.,0.,0.,0.,0./,
+     +     FHCARD/6*10000.,1.E9,1.E12,10000.,1.,1.E3/
       DATA OHSPE/6*100.,0.,0.,0.,0./,
      +     FHSPE/6*10000.,1.E9,10000.,1.,1.E3/
 *EM:
@@ -108,12 +133,5 @@
       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/
-
-
-
-
-
-
-
+      DATA OHND/6*100.,0.,0.,0.,0.,0./,
+     +     FHND/6*10000.,1.E9,1.E12,10000.,1.,1.E3/