New header files.

diff --git a/TFluka/Femfstk.h b/TFluka/Femfstk.h
index 44a51af3e6490c29b0995bf3b67ec48053abd4f1..cbc6e1173e9636b0cd66d0c2b6849f55c059ec4a 100644 (file)
--- a/TFluka/Femfstk.h
+++ b/TFluka/Femfstk.h
@@ -19,37 +19,45 @@ extern "C" {
 //*                                                                      *
 //*----------------------------------------------------------------------*
 //*
 //*                                                                      *
 //*----------------------------------------------------------------------*
 //*

-const Int_t idmemf = mestck;

 
 typedef struct {
 
 typedef struct {

-   Double_t e[idmemf]; // total energy in MeV
-   Double_t x[idmemf]; // particle x-coordinate
-   Double_t y[idmemf]; // particle y-coordinate
-   Double_t z[idmemf]; // particle z-coordinate
-   Double_t u[idmemf]; // x direction cosine
-   Double_t v[idmemf]; // y direction cosine
-   Double_t w[idmemf]; // z direction cosine
-   Double_t dnear[idmemf]; // equivalent to GEANT "safety"
-   Double_t upol[idmemf]; // polarisation in x direction
-   Double_t vpol[idmemf]; // polarisation in y direction
-   Double_t wpol[idmemf]; // polarisation in z direction
-   Double_t usnrml[idmemf];
-   Double_t vsnrml[idmemf];
-   Double_t wsnrml[idmemf];
-   Double_t wt[idmemf]; // weight
-   Double_t agemf[idmemf]; // age
-   Double_t espark[idmemf][mkbmx1];
-   Int_t    iespak[idmemf][mkbmx2];
-   Int_t    iq[idmemf]; // charge
-   Int_t    ir[idmemf]; // region
-   Int_t    irlatt[idmemf]; // lattice cell
-   Int_t    nhpemf[idmemf];
-   Int_t    lloemf[idmemf]; // generation number
-   Int_t    louemf[idmemf];
-   Int_t    np; // number of particles in stack
+   Double_t etemf[mestck]; // total energy in MeV
+   Double_t pmemf[mestck];
+   Double_t x[mestck]; // particle x-coordinate
+   Double_t y[mestck]; // particle y-coordinate
+   Double_t z[mestck]; // particle z-coordinate
+   Double_t u[mestck]; // x direction cosine
+   Double_t v[mestck]; // y direction cosine
+   Double_t w[mestck]; // z direction cosine
+   Double_t dnear[mestck]; // equivalent to GEANT "safety"
+   Double_t upol[mestck]; // polarisation in x direction
+   Double_t vpol[mestck]; // polarisation in y direction
+   Double_t wpol[mestck]; // polarisation in z direction
+   Double_t usnrml[mestck];
+   Double_t vsnrml[mestck];
+   Double_t wsnrml[mestck];
+   Double_t wtemf[mestck]; // weight
+   Double_t agemf[mestck]; // age
+   Double_t espark[mestck][mkbmx1];
+   Int_t    iespak[mestck][mkbmx2];
+   Int_t    ichemf[mestck]; // charge
+   Int_t    iremf[mestck];  // region
+   Int_t    irlatt[mestck]; // lattice cell
+   Int_t    nhpemf[mestck];
+   Int_t    lloemf[mestck]; // generation number
+   Int_t    louemf[mestck];
+   Int_t    npemf;  // number of particles in stack

    Int_t    npstrt; // EMF stack index before the interaction (since
                     // the projectile disappears it is also the starting
                     // index of secondaries)
    Int_t    npstrt; // EMF stack index before the interaction (since
                     // the projectile disappears it is also the starting
                     // index of secondaries)

+//*d === obsolete variable names === *
+//*d     parameter ( idmemf = mestck )
+//*d     dimension e (idmemf), wt (idmemf), iq (idmemf), ir (idmemf)
+//*d     equivalence ( e   (1), etemf  (1) )
+//*d     equivalence ( wt  (1), wtemf  (1) )
+//*d     equivalence ( ir  (1), iremf  (1) )
+//*d     equivalence ( iq  (1), ichemf (1) )
+//*d     equivalence ( np, npemf )

 } emfstkCommon;
 #define EMFSTK COMMON_BLOCK(EMFSTK,emfstk)
 COMMON_BLOCK_DEF(emfstkCommon,EMFSTK);
 } emfstkCommon;
 #define EMFSTK COMMON_BLOCK(EMFSTK,emfstk)
 COMMON_BLOCK_DEF(emfstkCommon,EMFSTK);

diff --git a/TFluka/Fstars.h b/TFluka/Fstars.h
index 175090813eb2ccb871f9e2da6fb1ea79c651cd2d..7b9c91d7afcdcdfa5d2ee0f2e9133f9d9e37cdbd 100644 (file)
--- a/TFluka/Fstars.h
+++ b/TFluka/Fstars.h
@@ -87,7 +87,9 @@ typedef struct {
    Double_t wdecct[nallwp+7];
    Double_t weisec[nallwp+19];
    Double_t wlwnsc[4];
    Double_t wdecct[nallwp+7];
    Double_t weisec[nallwp+19];
    Double_t wlwnsc[4];

+   Double_t wophsc[4];

    Double_t edi[11];
    Double_t edi[11];

+   Double_t woptph;

    Double_t wneulw;
    Double_t westop;
    Double_t wstars;
    Double_t wneulw;
    Double_t westop;
    Double_t wstars;


@@ -98,9 +100,11 @@ typedef struct {
    Int_t    numdec;
    Int_t    ntstar;
    Int_t    neulow;
    Int_t    numdec;
    Int_t    ntstar;
    Int_t    neulow;

+   Int_t    numoph;

    Int_t    mumdec;
    Int_t    mtstar;
    Int_t    meulow;
    Int_t    mumdec;
    Int_t    mtstar;
    Int_t    meulow;

+   Int_t    mumoph;

 } starsCommon;
 #define STARS COMMON_BLOCK(STARS,stars)
 COMMON_BLOCK_DEF(starsCommon,STARS);
 } starsCommon;
 #define STARS COMMON_BLOCK(STARS,stars)
 COMMON_BLOCK_DEF(starsCommon,STARS);

diff --git a/TFluka/Ftrackr.h b/TFluka/Ftrackr.h
index 4b27e514c114e92dc5b40275c353fb955de319ea..24b575fe88e47ff32b3dc26fc0443ecf8b6b2f8c 100644 (file)
--- a/TFluka/Ftrackr.h
+++ b/TFluka/Ftrackr.h
@@ -122,6 +122,7 @@ typedef struct {
    Int_t    llouse;
    Int_t    ispusr[mkbmx2];
    Int_t    lfsssc;
    Int_t    llouse;
    Int_t    ispusr[mkbmx2];
    Int_t    lfsssc;

+   Int_t    lpkill;

 } trackrCommon;
 #define TRACKR COMMON_BLOCK(TRACKR,trackr)
 COMMON_BLOCK_DEF(trackrCommon,TRACKR);
 } trackrCommon;
 #define TRACKR COMMON_BLOCK(TRACKR,trackr)
 COMMON_BLOCK_DEF(trackrCommon,TRACKR);