Warning corrected.

[u/mrichter/AliRoot.git] / TFluka / stuprf.cxx

diff --git a/TFluka/stuprf.cxx b/TFluka/stuprf.cxx
index 932486c759ee2cbab01749826a535dfefa4fee7b..8eb2cdd4fe963680267429d16173986e9c0387ed 100644 (file)
--- a/TFluka/stuprf.cxx
+++ b/TFluka/stuprf.cxx
@@ -1,7 +1,4 @@
 #include <Riostream.h>
-#include "AliRun.h"
-#include "AliStack.h"
-#include "TFluka.h"
 #ifndef WIN32
 # define stuprf stuprf_
 #else
@@ -14,12 +11,13 @@
 #include "Fdblprc.h"  //(DBLPRC) fluka common
 #include "Fevtflg.h"  //(EVTFLG) fluka common
 #include "Fpaprop.h"  //(PAPROP) fluka common
-#include "Fstack.h"   //(STACK)  fluka common
+#include "Fflkstk.h"  //(FLKSTK)  fluka common
 #include "Ftrackr.h"  //(TRACKR) fluka common
-#include "Ffinuc.h"   //(FINUC)  fluka common
+#include "Fgenstk.h"  //(GENSTK)  fluka common
 
 //Virtual MC
 #include "TFluka.h"
+
 #include "TVirtualMCStack.h"
 #include "TVirtualMCApplication.h"
 #include "TParticle.h"
@@ -36,27 +34,31 @@ extern "C" {
 //*                                                                      *
 //*----------------------------------------------------------------------*
 
-// STACK.lstack  = stack pointer
-// STACK.louse   = user flag
+// FLKSTK.npflka  = stack pointer
+// FLKSTK.louse   = user flag
 // TRACKR.llouse = user defined flag for the current particle
-  STACK.louse[STACK.lstack] = TRACKR.llouse;
+  FLKSTK.louse[FLKSTK.npflka] = TRACKR.llouse;
 
 // mkbmx1 = dimension for kwb real spare array in fluka stack in DIMPAR
 // mkbmx2 = dimension for kwb int. spare array in fluka stack in DIMPAR
-// STACK.sparek  = spare real variables available for k.w.burn
-// STACK.ispark  = spare integer variables available for k.w.burn
+// FLKSTK.sparek  = spare real variables available for k.w.burn
+// FLKSTK.ispark  = spare integer variables available for k.w.burn
 // TRACKR.spausr = user defined spare variables for the current particle
 // TRACKR.ispusr = user defined spare flags for the current particle
   Int_t ispr;
   for (ispr = 0; ispr <= mkbmx1 - 1; ispr++) {
-    STACK.sparek[STACK.lstack][ispr] = TRACKR.spausr[ispr];
+    FLKSTK.sparek[FLKSTK.npflka][ispr] = TRACKR.spausr[ispr];
   }  
   for (ispr = 0; ispr <= mkbmx2 - 1; ispr++) {
-    STACK.ispark[STACK.lstack][ispr] = TRACKR.ispusr[ispr];
+    FLKSTK.ispark[FLKSTK.npflka][ispr] = TRACKR.ispusr[ispr];
   }  
  
 // Get the pointer to the VMC
-  TVirtualMC* fluka = TFluka::GetMC();
+  TFluka* fluka =  (TFluka*) gMC;
+  Int_t verbosityLevel = fluka->GetVerbosityLevel();
+  Bool_t debug = (verbosityLevel>=3)?kTRUE:kFALSE;
+  fluka->SetTrackIsNew(kTRUE);
+//  TVirtualMC* fluka = TFluka::GetMC();
 // Get the stack produced from the generator
   TVirtualMCStack* cppstack = fluka->GetStack();
   
@@ -69,44 +71,49 @@ extern "C" {
     Int_t done = 0;
 
     Int_t parent =  TRACKR.ispusr[mkbmx2-1];
+    Int_t kpart  = GENSTK.kpart[numsec-1];
+    if (kpart < -6) return;
+
+    Int_t pdg = fluka->PDGFromId(kpart);
+
+    
+    Double_t px = GENSTK.plr[numsec-1] * GENSTK.cxr[numsec-1];
+    Double_t py = GENSTK.plr[numsec-1] * GENSTK.cyr[numsec-1];
+    Double_t pz = GENSTK.plr[numsec-1] * GENSTK.czr[numsec-1];
+    Double_t e  = GENSTK.tki[numsec-1] + PAPROP.am[GENSTK.kpart[numsec-1]+6];
 
-    Int_t pdg = fluka->PDGFromId(FINUC.kpart[numsec-1]);
-    Double_t px = FINUC.plr[numsec-1] * FINUC.cxr[numsec-1];
-    Double_t pz = FINUC.plr[numsec-1] * FINUC.cyr[numsec-1];
-    Double_t py = FINUC.plr[numsec-1] * FINUC.czr[numsec-1];
-    Double_t e  = FINUC.tki[numsec-1] + PAPROP.am[FINUC.kpart[numsec-1]+6];
     Double_t vx = xx;
     Double_t vy = yy;
     Double_t vz = zz;
     
     Double_t tof  = TRACKR.atrack;
-    Double_t polx = FINUC.cxrpol[numsec-1];
-    Double_t poly = FINUC.cyrpol[numsec-1];
-    Double_t polz = FINUC.czrpol[numsec-1];
+    Double_t polx = GENSTK.cxrpol[numsec-1];
+    Double_t poly = GENSTK.cyrpol[numsec-1];
+    Double_t polz = GENSTK.czrpol[numsec-1];
     
 
     TMCProcess mech = kPHadronic;
     
     if (EVTFLG.ldecay == 1) {
        mech = kPDecay;
-       cout << endl << "Decay" << endl;
+       if (debug) cout << endl << "Decay" << endl;
        
     } else if (EVTFLG.ldltry == 1) {
        mech = kPDeltaRay;
-       cout << endl << "Delta Ray" << endl;
+       if (debug) cout << endl << "Delta Ray" << endl;
        
     } else if (EVTFLG.lpairp == 1) {
        mech = kPPair;
-       cout << endl << "Pair Production" << endl;
+       if (debug) cout << endl << "Pair Production" << endl;
        
     } else if (EVTFLG.lbrmsp == 1) {
        mech = kPBrem;
-       cout << endl << "Bremsstrahlung" << endl;
+       if (debug) cout << endl << "Bremsstrahlung" << endl;
        
     }
     
 
-    Double_t weight = FINUC.wei[numsec-1];
+    Double_t weight = GENSTK.wei[numsec-1];
     Int_t is = 0;
     Int_t ntr;  
     // 
@@ -116,11 +123,12 @@ extern "C" {
                       vx, vy, vz, tof,
                       polx, poly, polz,
                       mech, ntr, weight, is);
-    cout << endl << " !!! stuprf: ntr=" << ntr << "pdg " << pdg << " parent=" << parent << "numsec " 
+    if (debug) cout << endl << " !!! stuprf: ntr=" << ntr << "pdg " << pdg << " parent=" << parent << "numsec " 
         << numsec << "npprmr " << npprmr << endl;
 //
 //  Save current track number
-    STACK.ispark[STACK.lstack][mkbmx2-1] = ntr;
+    FLKSTK.ispark[FLKSTK.npflka][mkbmx2-1] = ntr;
+    FLKSTK.ispark[FLKSTK.npflka][mkbmx2-2] = 0;
   } // end of if (numsec-1 > npprmr)
 } // end of stuprf
 } // end of extern "C"