X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TFluka%2FFpaprop.h;h=dc2d809ed41bea2e335908cb08f39563612dc46e;hb=e44ab76e49db38ce1096dc1a5cd1b269b67d7118;hp=ad2801a3cc2767d5580b305d3fcb6bb3394899f5;hpb=71dd9297177fd2e7cd8b275289bf30c0ed4ced2e;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TFluka/Fpaprop.h b/TFluka/Fpaprop.h
index ad2801a3cc2..dc2d809ed41 100644
--- a/TFluka/Fpaprop.h
+++ b/TFluka/Fpaprop.h
@@ -32,9 +32,9 @@ extern "C" {
   //*        ichrge(i) = electric charge of the i_th particle              *
   //*        ibarch(i) = baryonic charge of the i_th particle              *
   //*        iscore(j) = id for the j_th scored distribution               *
-  //*        genpar(k) = name of the k_th generalized particle type        *
+  //*        gnname(k) = name of the k_th generalized particle type        * 2006.3
   //*        ijdisc(i) = flag for discarding the i_th particle type        *
-  //*        thalf (i) = mean (not half!) life of the i_th particle (s)    *
+  //*        tmnlf (i) = mean (not half!) life of the i_th particle (s)    *
   //*        biasdc(i) = decay biasing factor for the i_th particle        *
   //*        biasin(i) = inelastic interaction biasing factor for the i_th *
   //*                    particle                                          *
@@ -57,34 +57,36 @@ extern "C" {
   //*----------------------------------------------------------------------*
 
 
-const Int_t mxgnpr =  33;
-typedef struct {
-   Double_t am[nallwp+7];         //(-6:NALLWP)
-   Double_t amdisc[nallwp+7];     //(-6:NALLWP)
-   Double_t tmnlf[nallwp+7];      //(-6:NALLWP)
-   Double_t biasdc[nallwp+7];     //(-6:NALLWP)
-   Double_t biasin[nallwp+7];     //(-6:NALLWP)
-   Int_t    ichrge[nallwp+7];     //(-6:NALLWP)
-   Int_t    ibarch[nallwp+7];     //(-6:NALLWP)
-   Int_t    ijdisc[nallwp+7];     //(-6:NALLWP)
-   Int_t    jspinp[nallwp+7];     //(-6:NALLWP)
-   Int_t    iparty[nallwp+7];     //(-6:NALLWP)
-   Int_t    iparid[nallwp+7];     //(-6:NALLWP)
-   Int_t    lhadro[nallwp+7];     //(-6:NALLWP)
-   Int_t    lbsdcy[nallwp+7];     //(-6:NALLWP)
-   Int_t    iscore[12];
-   Int_t    lprbsd;
-   Int_t    lprbsi;
-   Int_t    lsclwf;
-   Int_t    lscnbl;
-} papropCommon;
+//    const Int_t mxgnpr =  33; // 2006.3
+    const Int_t mxgnpr =  35;
+    typedef struct {
+	Double_t am[nallwp+7];         //(-6:NALLWP)
+	Double_t amdisc[nallwp+7];     //(-6:NALLWP)
+	Double_t tmnlf[nallwp+7];      //(-6:NALLWP)
+	Double_t biasdc[nallwp+7];     //(-6:NALLWP)
+	Double_t biasin[nallwp+7];     //(-6:NALLWP)
+	Int_t    ichrge[nallwp+7];     //(-6:NALLWP)
+	Int_t    ibarch[nallwp+7];     //(-6:NALLWP)
+	Int_t    ijdisc[nallwp+7];     //(-6:NALLWP)
+	Int_t    jspinp[nallwp+7];     //(-6:NALLWP)
+	Int_t    iparty[nallwp+7];     //(-6:NALLWP)
+	Int_t    iparid[nallwp+7];     //(-6:NALLWP)
+	Int_t    lhadro[nallwp+7];     //(-6:NALLWP)
+	Int_t    lbsdcy[nallwp+7];     //(-6:NALLWP)
+	Int_t    iscore[12];
+	Int_t    lprbsd;
+	Int_t    lprbsi;
+	Int_t    lsclwf;
+	Int_t    lscnbl;
+    } papropCommon;
 #define PAPROP COMMON_BLOCK(PAPROP,paprop)
 COMMON_BLOCK_DEF(papropCommon,PAPROP);
 
-typedef struct {
-   Char_t   btype[nallwp+7][8];     //(-6:NALLWP)
-   Char_t   genpar[mxgnpr][8];          //(30)
-} chpprpCommon;
+    typedef struct {
+	Char_t   btype[nallwp+7][8];     //(-6:NALLWP)
+//	Char_t   genpar[mxgnpr][8];          // 2006.3 
+	Char_t   gnname[mxgnpr][8];          // 2006.3
+    } chpprpCommon;
 #define CHPPRP COMMON_BLOCK(CHPPRP,chpprp)
 COMMON_BLOCK_DEF(chpprpCommon,CHPPRP);
 }