Mainly cosmetics.

diff --git a/TFluka/Fbeamcm.h b/TFluka/Fbeamcm.h
index e7d891dffb5875c424f219ce4931f343d65e2566..5882b20db05e44f5a64e7686aeeba8c60399e0fe 100644 (file)
--- a/TFluka/Fbeamcm.h
+++ b/TFluka/Fbeamcm.h
@@ -72,6 +72,7 @@ extern "C" {
 //*        Lvlcar = logical flag for using a cartesian   volume source   *
 //*        Lvlcyl = logical flag for using a cylindrical volume source   *
 //*        Lvlsph = logical flag for using a spherical   volume source   *
+//*        Lsourc = logical flag for a user written source routine       *    
 //*                                                                      *
 //*----------------------------------------------------------------------*
 
@@ -116,8 +117,7 @@ typedef struct {
    Int_t    lvlcar;
    Int_t    lvlcyl;
    Int_t    lvlsph;
-    Int_t   lsourc;
-    
+   Int_t    lsourc;
 } beamcmCommon;
 #define BEAMCM COMMON_BLOCK(BEAMCM,beamcm)
 COMMON_BLOCK_DEF(beamcmCommon,BEAMCM);

diff --git a/TFluka/Fdblprc.h b/TFluka/Fdblprc.h
index b1d1cf70bf6f0b173d5d1ca4cc9c58278f84fba7..fdbf3b5ea579313f1a96935f819328b6122b4923 100644 (file)
--- a/TFluka/Fdblprc.h
+++ b/TFluka/Fdblprc.h
@@ -181,6 +181,7 @@ const Double_t oneeig = oneone/eigeig;
 const Double_t twothi = twotwo/thrthr;
 const Double_t thrfou = thrthr/foufou;
 const Double_t thrtwo = thrthr/twotwo;
+const Double_t fouthr = foufou/thrthr;    
 const Double_t pipipi = 3.141592653589793238462643383279e+00;
 const Double_t twopip = 6.283185307179586476925286766559e+00;
 const Double_t pip5o2 = 7.853981633974483096156608458199e+00;
@@ -202,6 +203,7 @@ const Double_t sqrsix = 2.449489742783178098197284074706e+00;
 const Double_t sqrsev = 2.645751311064590590501615753639e+00;
 const Double_t sqrt12 = 3.464101615137754587054892683012e+00;
 const Double_t s2fwhm = 2.354820045030949e+00;
+const Double_t twolog = 0.693147180559945309417232121458e+00;
 //*
 //*======================================================================*
 //*======================================================================*

diff --git a/TFluka/Fdimpar.h b/TFluka/Fdimpar.h
index 975acef8668dddf054aeec055c21e6e012401c59..9891f33e4cf42988e84c6921ede3021385db65ca 100644 (file)
--- a/TFluka/Fdimpar.h
+++ b/TFluka/Fdimpar.h
@@ -47,6 +47,9 @@ extern "C" {
 //*          Ihypmx = maximum number of hyperons in a hypernucleus       *
 //*          Mkbmx1 = dimension for KWB real spare array in Fluka Stack  *
 //*          Mkbmx2 = dimension for KWB int. spare array in Fluka Stack  *
+//*          Mxirrd = maximum number of irradiation sub-intervals        *
+//*          Mxtrdc = maximum number of decay (cooling) times            *
+//*          Nktl   = overall dimension parameter for EMF bremsstrahlung *
 //*                                                                      *
 //*----------------------------------------------------------------------*   
 
@@ -67,8 +70,8 @@ const Int_t mxhttr = 260;
 const Int_t icomax = 1000;
 const Int_t ichmax = icomax+mxxmdf;
 const Int_t nstbis = 304;
-    const Int_t nqstis = 46;
-    const Int_t ntstis = nstbis + nqstis;
+const Int_t nqstis = 46;
+const Int_t ntstis = nstbis + nqstis;
     
 //* till 3-aug-99:
 //*     const Int_t mxpabl =  110;
@@ -82,9 +85,9 @@ const Int_t ihypmx = 4;
 //*     const Int_t mkbmx2 =    3;
 const Int_t mkbmx1 = 11;
 const Int_t mkbmx2 = 11;
-    const Int_t mxirrd = 20;
-    const Int_t mxtrdc = 50;
-    const Int_t nktl   = 17;
+const Int_t mxirrd = 20;
+const Int_t mxtrdc = 50;
+const Int_t nktl   = 17;
 }
 
 #endif

diff --git a/TFluka/Femfrgn.h b/TFluka/Femfrgn.h
index cbada694afe5b1fce93da5d6faccf58aa9705d58..4d7805ce2bd4355082ad9b880e828c5feb844d23 100644 (file)
--- a/TFluka/Femfrgn.h
+++ b/TFluka/Femfrgn.h
@@ -13,6 +13,11 @@ extern "C" {
   //*                                                                      *
   //*----------------------------------------------------------------------*
   //*
+  //    COMMON / EMFRGN / ELETHR (MXXRGN), PHOTHR (MXXRGN),
+  //   &                  EMREJE, EMSAMP, EMSNGL,
+  //   &                  MEDEMF (MXXRGN), IRAYLR (MXXRGN), NRGEMF,
+  //   &                  NOSCAT, NOLLDA
+  // OLD EFMRGN:
   //    COMMON / EFMRGN / RHOR   (MXXRGN), ECUT   (MXXRGN), PCUT (MXXRGN),
   //   &                  EMREJE, EMSAMP, EMSNGL, VACDST,
   //   &                  MEDEMF (MXXRGN), IRAYLR (MXXRGN), NRGEMF,

diff --git a/TFluka/Fevtflg.h b/TFluka/Fevtflg.h
index da206286b6d1bf41065ef94f30904ae45d537d2f..74c5aa5030d36fb1c7fb01411d34476aa14119c9 100644 (file)
--- a/TFluka/Fevtflg.h
+++ b/TFluka/Fevtflg.h
@@ -33,7 +33,7 @@ typedef struct {
    Int_t    llensc;
    Int_t    loppsc;
    Int_t    leldis;
-    Int_t    lrdcay;
+   Int_t    lrdcay;
    Int_t    ntrcks;
 } evtflgCommon;
 #define EVTFLG COMMON_BLOCK(EVTFLG,evtflg)

diff --git a/TFluka/Fflkstk.h b/TFluka/Fflkstk.h
index fd71e6b97ce563540f8c6c45a260db45ce7b7c1c..d0ad92e70be9ba3417cfff0ec311b711f22d5c9e 100644 (file)
--- a/TFluka/Fflkstk.h
+++ b/TFluka/Fflkstk.h
@@ -23,15 +23,15 @@ extern "C" {
 //*     description of the common block(s) and variable(s)               *
 //*                                                                      *
 //*     /Flkstk/ stack for the primaries                                  *
-//*        Wt     = particle statistical weight                          *
-//*        Pmom   = particle (laboratory) momentum (GeV/c)               *
-//*        Tke    = particle (laboratory) kinetic energy (GeV)           *
-//*        Xa     = particle position  x-coordinate                      *
-//*        Ya     = particle position  y-coordinate                      *
-//*        Za     = particle position  z-coordinate                      *
-//*        Tx     = particle direction x-coordinate                      *
-//*        Ty     = particle direction y-coordinate                      *
-//*        Tz     = particle direction z-coordinate                      *
+//*        Wtflk  = particle statistical weight                          *
+//*        Pmoflk = particle (laboratory) momentum (GeV/c)               *
+//*        Tkeflk = particle (laboratory) kinetic energy (GeV)           *
+//*        Xflk   = particle position  x-coordinate                      *
+//*        Yflk   = particle position  y-coordinate                      *
+//*        Zflk   = particle position  z-coordinate                      *
+//*        Txflk  = particle direction x-coordinate                      *
+//*        Tyflk  = particle direction y-coordinate                      *
+//*        Tzflk  = particle direction z-coordinate                      *
 //*        Txpol  = x direction cosine of the particle polarization      *
 //*        Typol  = y direction cosine of the particle polarization      *
 //*        Tzpol  = z direction cosine of the particle polarization      *
@@ -47,48 +47,49 @@ extern "C" {
 //*        Lfrphn = flag for forced photonuclear interaction             *
 //*        Raddly = delay (s) in production wrt the nominal primary "0"  *
 //*                 time for particle produced in radioactive decays     *
-//*                (i.e. those coming from decays of daughter isotopes)  *
+//*                (i.e. those coming from decays of daughter isotopes), *
+//*                 when in analogue mode, flag for position in the      *
+//*                 activr array when in non-analogue mode               *
 //*        Cmpath = cumulative path travelled by the particle since it   *
 //*                 was produced (cm)                                    *
 //*        Sparek = spare real variables available for K.W.Burn          *
 //*        Ispark = spare integer variables available for K.W.Burn       *
-//*        Ilo    = particle identity (Paprop numbering)                 *
+//*        Iloflk = particle identity (Paprop numbering)                 *
 //*        Igroup = energy group for low energy neutrons                 *
-//*        Lo     = particle generation                                  *
+//*        Loflk  = particle generation                                  *
 //*        Louse  = user flag                                            *
-//*        Nreg   = particle region number                               *
+//*        Nrgflk = particle region number                               *
 //*        Nlattc = particle lattice cell number                         *
 //*        Nhspnt = pointer to the history object (Geant4 geometry)      *
 //*        Nevent = number of the event which created the particle       *
 //*        Numpar = particle number                                      *
 //*        Lraddc = flag for particles generated in radioactive decays   *
 //*        Nparma = largest particle number ever reached                 *
-//*        Mstack = stack size                                           *
-//*        Lstmax = highest value of the stack pointer ever reached      *
+//*        Nstmax = highest value of the stack pointer ever reached      *
 //*                 in the run                                           *
-//*        Lstack = stack pointer                                        *
-//*        Lstaol = stack pointer of the last processed particle         *
+//*        Npflka = Fluka stack pointer                                  *
+//*        Nstaol = stack pointer of the last processed particle         *
 //*        Igroun = energy group number of the last processed particle   *
 //*                 if it is a low energy neutron                        *
 //*----------------------------------------------------------------------*
 //*
 
 typedef struct {
-   Double_t xflk[mfstck+1];             //(0:MFSTCK)
-   Double_t yflk[mfstck+1];             //(0:MFSTCK)
-   Double_t zflk[mfstck+1];             //(0:MFSTCK)
-   Double_t txflk[mfstck+1];             //(0:MFSTCK)
-   Double_t tyflk[mfstck+1];             //(0:MFSTCK)
-   Double_t tzflk[mfstck+1];             //(0:MFSTCK)
+   Double_t xflk[mfstck+1];           //(0:MFSTCK)
+   Double_t yflk[mfstck+1];           //(0:MFSTCK)
+   Double_t zflk[mfstck+1];           //(0:MFSTCK)
+   Double_t txflk[mfstck+1];          //(0:MFSTCK)
+   Double_t tyflk[mfstck+1];          //(0:MFSTCK)
+   Double_t tzflk[mfstck+1];          //(0:MFSTCK)
    Double_t txpol[mfstck+1];          //(0:MFSTCK)
    Double_t typol[mfstck+1];          //(0:MFSTCK)
    Double_t tzpol[mfstck+1];          //(0:MFSTCK)
    Double_t txnor[mfstck+1];          //(0:MFSTCK)
    Double_t tynor[mfstck+1];          //(0:MFSTCK)
    Double_t tznor[mfstck+1];          //(0:MFSTCK)
-   Double_t wtflk[mfstck+1];             //(0:MFSTCK)
-   Double_t pmoflk[mfstck+1];           //(0:MFSTCK)
-   Double_t tkeflk[mfstck+1];            //(0:MFSTCK)
+   Double_t wtflk[mfstck+1];          //(0:MFSTCK)
+   Double_t pmoflk[mfstck+1];         //(0:MFSTCK)
+   Double_t tkeflk[mfstck+1];         //(0:MFSTCK)
    Double_t dfnear[mfstck+1];         //(0:MFSTCK)
    Double_t agestk[mfstck+1];         //(0:MFSTCK)
    Double_t aknshr[mfstck+1];         //(0:MFSTCK)
@@ -97,11 +98,11 @@ typedef struct {
    Double_t frcphn[mfstck+1];         //(0:MFSTCK)
    Double_t sparek[mfstck+1][mkbmx1]; //(MKBMX1,0:MFSTCK)
    Int_t    ispark[mfstck+1][mkbmx2]; //(MKBMX2,0:MFSTCK)
-   Int_t    iloflk[mfstck+1];            //(0:MFSTCK)
+   Int_t    iloflk[mfstck+1];         //(0:MFSTCK)
    Int_t    igroup[mfstck+1];         //(0:MFSTCK)
-   Int_t    loflk[mfstck+1];             //(0:MFSTCK)
+   Int_t    loflk[mfstck+1];          //(0:MFSTCK)
    Int_t    louse[mfstck+1];          //(0:MFSTCK)
-   Int_t    nrgflk[mfstck+1];           //(0:MFSTCK)
+   Int_t    nrgflk[mfstck+1];         //(0:MFSTCK)
    Int_t    nlattc[mfstck+1];         //(0:MFSTCK)
    Int_t    nhspnt[mfstck+1];         //(0:MFSTCK)
    Int_t    nevent[mfstck+1];         //(0:MFSTCK)

diff --git a/TFluka/Fgenstk.h b/TFluka/Fgenstk.h
index 888231e387753ef7723b01578534744f6374eec6..3a253537dda220c34c4ecf61e6b9b4a6fe8472be 100644 (file)
--- a/TFluka/Fgenstk.h
+++ b/TFluka/Fgenstk.h
@@ -74,7 +74,7 @@ typedef struct {
    Double_t tvrecl;
    Double_t tvheav;
    Double_t tvbind;
-    Int_t    kpart[mxp];
+   Int_t    kpart[mxp];
    Int_t    np0;
    Int_t    np;
 } genstkCommon;

diff --git a/TFluka/Fpaprop.h b/TFluka/Fpaprop.h
index ad2801a3cc2767d5580b305d3fcb6bb3394899f5..16f189fa233382a5bbb90a6bc95ed6416a50785b 100644 (file)
--- a/TFluka/Fpaprop.h
+++ b/TFluka/Fpaprop.h
@@ -34,7 +34,7 @@ extern "C" {
   //*        iscore(j) = id for the j_th scored distribution               *
   //*        genpar(k) = name of the k_th generalized particle type        *
   //*        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                                          *

diff --git a/TFluka/Fsumcou.h b/TFluka/Fsumcou.h
index 238cab0699fc8fc7e64ae36da2e9a7a0adefa2dd..022d47fdadd1516cd6d60c5ce5af7db0398ad0f6 100644 (file)
--- a/TFluka/Fsumcou.h
+++ b/TFluka/Fsumcou.h
@@ -1,5 +1,5 @@
-#ifndef FSTARS_H
-#define FSTARS_H 1
+#ifndef FSUMCOU_H
+#define FSUMCOU_H 1
 
 #include "cfortran.h"
 #include "Rtypes.h"
@@ -7,72 +7,78 @@
 #include "Fdimpar.h"
 
 extern "C" {
-//*$ create stars.add
-//*copy stars
-//*
-//*=== stars ============================================================*
+//*=== Sumcou ===========================================================*
 //*
 //*----------------------------------------------------------------------*
 //*                                                                      *
-//*     stars common for fluka:                                          *
+//*     All additions wrt the original one are:                          *
+//*     Copyright (C) 2005-2005      by    Alfredo Ferrari & Paola Sala  *
+//*     All Rights Reserved.                                             *
+//*                                                                      *
+//*                                                                      *
+//*     SUMmary COUnters common for FLUKA9x/200x:                        *
 //*                                                                      *
-//*     version for fluka90/99/... of the original one of fluka86        *
+//*     (New version of the original STARS comon)                        *
 //*                                                                      *
 //*                                                                      *
-//*     created on    15 may 1990    by    alfredo ferrari & paola sala  *
-//*                                                   infn - milan       *
+//*     Created on    15 may 1990    by    Alfredo Ferrari & Paola Sala  *
+//*                                                   Infn - Milan       *
 //*                                                                      *
-//*     last change on  07-oct-99    by    alfredo ferrari               *
+//*     Last change on  09-jul-05    by    Alfredo Ferrari               *
 //*                                                                      *
 //*                                                                      *
-//*     description of the common variable(s):                           *
+//*     Variable description:                                            *
 //*                                                                      *
-//*        ntstar = total number of stars generated (modulo 1000000000)  *
-//*        neulow = total number of low energy neutron interactions      *
+//*        Ntstar = total number of stars generated (modulo 1000000000)  *
+//*        Neulow = total number of low energy neutron interactions      *
 //*                (modulo 1000000000)                                   *
-//*        numdec = total number of decays (modulo 1000000000)           *
-//*        mtstar = total number of stars generated / 100000000          *
-//*        meulow = total number of low energy neutron interactions      *
+//*        Numdec = total number of decays (modulo 1000000000)           *
+//*        Numoph = total number of optical photons generated            *
+//*                (modulo 1000000000)                                   *
+//*        Mtstar = total number of stars generated / 100000000          *
+//*        Meulow = total number of low energy neutron interactions      *
 //*               / 1000000000                                           *
-//*        mumdec = total number of decays (modulo 1000000000)           *
-//*        wstars = total weight of the stars generated                  *
-//*        wneulw = total weight of the low energy neutron interactions  *
-//*        westar = weight of the stars generated by                     *
+//*        Mumdec = total number of decays / 1000000000                  *
+//*        Mumoph = total number of optical photons generated /1000000000*
+//*   Wneulw(k,j) = total weight of the low energy neutron interactions  *
+//*   Woptph(k,j) = total weight of generated optical photons            *
+//*   Westar(k,j) = weight of the stars generated by                     *
 //*                 different particle types                             *
-//*        westop = total weight of the particles stopped                *
-//*        wstop  = weight of particles of different types stopped       *
-//*        weisec = total weight of the secondaries created              *
-//*        weifis = total weight of high energy fissions                 *
-//*        weipri = total weight of the primaries handled                *
-//*        edi    = deposited energy                                     *
-//*                 edi(1) = by ionisation                               *
-//*                 edi(2) = by pi-zeros and/or em cascade               *
-//*                 edi(3) = by nuclear excitation (or nuclear recoil    *
+//*   Westop(k,j) = weight of particles of different types stopped       *
+//*   Wedaug(k,j) = weight of the decay products                         *
+//*   Wekill(k,j) = weight of the time-killed particles                  *
+//*   Wedecy(k,j) = weight of the particles decayed                      *
+//*   Weifis(k,j) = weight of high energy fissions generated by particles*
+//*                 of different kind                                    *
+//*   Deccts(k,j) = decay c tau scoring                                  *
+//*   Wdecct(k,j) = weight of the particles decayed for which a c tau    *
+//*                 scoring is done                                      *
+//*   Weprdc(k,j) = weight of produced particles of different kind       *
+//*   Wlwnsc(k,j) = weight of the low energy neutrons interaction secon- *
+//*                 daries                                               *
+//*   Wophsc(k,j) = weight of optical photons production/interaction     *
+//*                 secondaries                                          *
+//*        Weipri = total weight of the primaries handled                *
+//*   Edpsco(i,j) = energy deposition scoring (j = 1: prompt particles,  *
+//*                                            j = 2: decay  particles)  *
+//*            Edpsco(1,j) = by ionisation                               *
+//*            Edpsco(2,j) = by pi-zeros and/or EM cascade               *
+//*            Edpsco(3,j) = by nuclear excitation (or nuclear recoil    *
 //*                          and heavies if the evaporation module is    *
 //*                          activated)                                  *
-//*                 edi(4) = by stopped particles                        *
-//*                 edi(5) = energy leaving the system                   *
-//*                 edi(6) = energy carried by discarded particles       *
-//*                 edi(7) = by residual excitation energy (only if the  *
+//*            Edpsco(4,j) = by stopped particles                        *
+//*            Edpsco(5,j) = energy leaving the system                   *
+//*            Edpsco(6,j) = energy carried by discarded particles       *
+//*            Edpsco(7,j) = by residual excitation energy (only if the  *
 //*                          evaporation module is activated)            *
-//*                 edi(8) = by low energy neutrons (kerma due to low    *
+//*            Edpsco(8,j) = by low energy neutrons (kerma due to low    *
 //*                          energy neutrons transport is in effect)     *
-//*                 edi(9) = energy carried by time killed particles     *
-//*                 edi(10)= energy wasted for nuclear binding energy    *
-//*                          effects for e > 50 mev                      *
-//*                 edi(11)= energy wasted for nuclear binding energy    *
+//*            Edpsco(9,j) = energy carried by time killed particles     *
+//*            Edpsco(10,j)= energy wasted for nuclear binding energy    *
+//*                          effects for (low energy neutrons excluded)  *
+//*            Edpsco(11,j)= energy wasted for nuclear binding energy    *
 //*                          effects for low energy neutrons             *
-//*        wdec   = weight of the particles decayed                      *
-//*        wdau   = weight of the decay-products                         *
-//*        wtkll  = weight of the time-killed particles                  *
-//*        wtdec  = total weight of the particles decayed                *
-//*        wtdau  = total weight of the decay products                   *
-//*        wttkll = total weight of the time killed particles            *
-//*        wlwnsc = weight of the low energy neutrons interaction secon- *
-//*                 daries                                               *
-//*        wdecct = weight of the particles decayed for which a c tau    *
-//*                 scoring is done                                      *
-//*        deccts = decay c tau scoring                                  *
+//*                                                                      *
 //*----------------------------------------------------------------------*
 //*
 
@@ -91,7 +97,7 @@ typedef struct {
    Double_t edpsco[2][11];
    Double_t woptph;
    Double_t wneulw;
-    Double_t weipri;
+   Double_t weipri;
    Int_t    numdec;
    Int_t    ntstar;
    Int_t    neulow;

diff --git a/TFluka/TFlukaMCGeometry.cxx b/TFluka/TFlukaMCGeometry.cxx
index fef8d90672f7341ba6645ec82db6b3bdbddcaada..e443cb639d3445e186209c1acea8b9e1927e0340 100644 (file)
--- a/TFluka/TFlukaMCGeometry.cxx
+++ b/TFluka/TFlukaMCGeometry.cxx
@@ -1450,7 +1450,6 @@ void g1wr(Double_t &pSx, Double_t &pSy, Double_t &pSz,
    snext += extra;
    saf = gGeoManager->GetSafeDistance();
    saf -= extra;
-   if (saf>snext) printf("ERROR: saf=%f .GT. snext=%f\n", saf,snext); 
    if (saf<0) saf=0.0;
    else       saf -= saf*3.0e-09;
 //   saf *= 0.3;

diff --git a/TFluka/source.cxx b/TFluka/source.cxx
index f66b562a3bf0100eb977ce69acaad64f86ce5a30..a9fb962a0e70df03da4b6a5ad3e8cc0b5e67c793 100644 (file)
--- a/TFluka/source.cxx
+++ b/TFluka/source.cxx
@@ -6,7 +6,7 @@
 #include "Fdimpar.h"  //(DIMPAR) fluka parameters
 #include "Fsourcm.h"  //(EPISOR) fluka common
 #include "Fflkstk.h"  //(FLKSTK)  fluka common
-#include "Fsumcou.h"   //(SUMCOU)  fluka common
+#include "Fsumcou.h"  //(SUMCOU)  fluka common
 #include "Fpaprop.h"  //(PAPROP) fluka common
 #include "Fltclcm.h"  //(LTCLCM) fluka common
 #include "Fopphst.h"  //(OPPHST) fluka common