X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TFluka%2Fmgdraw.cxx;h=2a35fd859628d00c9ed815972e26a9ba6cdc11ad;hb=e10611f07661d1ba4934514b6071c709bc178074;hp=acdec3fd8c2bb14596752cc20b17b73760db0462;hpb=a7bb59a2807d18623297d38deb794356a893a61a;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TFluka/mgdraw.cxx b/TFluka/mgdraw.cxx
index acdec3fd8c2..2a35fd85962 100644
--- a/TFluka/mgdraw.cxx
+++ b/TFluka/mgdraw.cxx
@@ -2,16 +2,17 @@
 #include "TVirtualMCApplication.h"
 #include "TVirtualMCStack.h"
 
-#ifndef WITH_ROOT
 #include "TFluka.h"
-#else
-#include "TFlukaGeo.h"
-#endif
-
+#include "TFlukaCodes.h"
 // Fluka include
 #include "Fdimpar.h"  //(DIMPAR) fluka include
 #include "Fdblprc.h"  //(DBLPRC) fluka common
 #include "Ftrackr.h"  //(TRACKR) fluka common
+#include "Fopphst.h"  //(OPPHST) fluka common
+#include "Fflkstk.h"  //(FLKSTK) fluka common
+#include "Fltclcm.h"  //(LTCLCM) fluka common
+#include "Fpaprop.h"  //(PAPROP) fluka common
+#include "Falldlt.h"  //(ALLDLT) fluka common
 
 #ifndef WIN32
 # define mgdraw mgdraw_
@@ -19,30 +20,124 @@
 # define mgdraw MGDRAW
 #endif
 
+
+#include "TGeoManager.h" // <- delete
+
 extern "C" {
 void mgdraw(Int_t& icode, Int_t& mreg)
 {
     TFluka* fluka =  (TFluka*) gMC;
-    Int_t verbosityLevel = fluka->GetVerbosityLevel();
+    if (mreg == fluka->GetDummyRegion()) return;
 //
 //  Make sure that stack has currrent track Id
-    Int_t trackId = TRACKR.ispusr[mkbmx2-1];
+//
+    Int_t trackId = -1;
     TVirtualMCStack* cppstack = fluka->GetStack();
+    
+    if (TRACKR.jtrack == -1) {
+        trackId = OPPHST.louopp[OPPHST.lstopp];
+        if (trackId == 0) {
+            trackId = FLKSTK.ispark[FLKSTK.npflka][mkbmx2-1];
+        }
+    } else {
+        trackId = TRACKR.ispusr[mkbmx2-1];
+    }
+    
+    Int_t verbosityLevel = fluka->GetVerbosityLevel();
+
+    if (TRACKR.jtrack < -6) {
+       // from -7 to -12 = "heavy" fragment
+       // assing parent id
+       // id < -6 was skipped in stuprf =>   if (kpart < -6) return;
+       if (verbosityLevel >= 3) {
+          cout << "mgdraw: (heavy fragment) jtrack < -6 =" << TRACKR.jtrack
+               << " assign parent pdg=" << fluka->PDGFromId(TRACKR.ispusr[mkbmx2 - 3]) << endl;
+       }
+       TRACKR.jtrack = TRACKR.ispusr[mkbmx2 - 3];
+    }
+    
     cppstack->SetCurrentTrack(trackId);
 //
 //    
-    fluka->SetMreg(mreg);
-    fluka->SetNewreg(mreg);
-    fluka->SetIcode(icode);
-    fluka->SetCaller(4);
-    
-    if (verbosityLevel >= 3) {
-	cout << endl << " !!! I am in mgdraw - calling Stepping()" << endl;
-	cout << endl << " Track Id =" << trackId << endl;
+    Int_t mlttc = TRACKR.lt1trk; // LTCLCM.mlatm1;
+    fluka->SetMreg(mreg, mlttc);
+    fluka->SetIcode((FlukaProcessCode_t) icode);
+    fluka->SetCaller(kMGDRAW);
+
+    Int_t nodeId;
+    Int_t volId   = fluka->CurrentVolID(nodeId);
+    Int_t crtlttc = gGeoManager->GetCurrentNodeId()+1;
+
+    // check region lattice consistency (debug Ernesto)
+    // *****************************************************
+    if( mreg != volId  && !gGeoManager->IsOutside() ) {
+       cout << "  mgdraw:   track=" << trackId << " pdg=" << fluka->PDGFromId(TRACKR.jtrack)
+            << " icode=" << icode << " gNstep=" << fluka->GetNstep() << endl
+            << "               fluka   mreg=" << mreg << " mlttc=" << mlttc << endl
+            << "               TGeo   volId=" << volId << " crtlttc=" << crtlttc << endl
+            << "     common TRACKR   lt1trk=" << TRACKR.lt1trk << " lt2trk=" << TRACKR.lt2trk << endl
+            << "     common LTCLCM   newlat=" << LTCLCM.newlat << " mlatld=" <<  LTCLCM.mlatld << endl
+            << "                     mlatm1=" << LTCLCM.mlatm1 << " mltsen=" <<  LTCLCM.mltsen << endl
+            << "                     mltsm1=" << LTCLCM.mltsm1 << " mlattc=" << LTCLCM.mlattc << endl;
+        if( mlttc == crtlttc ) cout << "   *************************************************************" << endl;
     }
+    // *****************************************************
 
-    (TVirtualMCApplication::Instance())->Stepping();
+    if (!TRACKR.ispusr[mkbmx2 - 2]) {
+	if (verbosityLevel >= 3) {
+	    cout << endl << "mgdraw: energy deposition for:" << trackId
+		 << " icode=" << icode
+		 << " pdg=" << fluka->PDGFromId(TRACKR.jtrack)
+		 << " flukaid="<< TRACKR.jtrack
+		 << " mreg=" << mreg
+		 << " np  =" << ALLDLT.nalldl
+		 << endl;
+	         
+	}
+	Int_t nprim = 0;
+//	printf("mgdraw %5d %5d \n", ALLDLT.nalldl, ALLDLT.lalldl );
+	
+	if ((nprim = ALLDLT.nalldl) > 0) {
+	    //
+	    // Multiple steps (primary ionisation)	   
+	    for (Int_t i = 0; i < nprim; i++) {
+		(TVirtualMCApplication::Instance())->Stepping();
+		fluka->SetCurrentPrimaryElectronIndex(i);
+		if (i == 0) fluka->SetTrackIsNew(kFALSE);
+	    }
+	    fluka->SetCurrentPrimaryElectronIndex(-1);
+	} else {
+	    // Single step
+	    (TVirtualMCApplication::Instance())->Stepping();
+	    fluka->SetTrackIsNew(kFALSE);
+	}
+	
+    } else {
+        //
+        // Tracking is being resumed after secondary tracking
+        //
+        if (verbosityLevel >= 3) {
+            cout << endl << "mgdraw: resuming Stepping(): " << trackId << endl;
+        }
 
+        fluka->SetTrackIsNew(kTRUE);
+        fluka->SetCaller(kMGResumedTrack);
+        (TVirtualMCApplication::Instance())->Stepping();
+
+        // Reset flag and stored values
+        TRACKR.ispusr[mkbmx2 - 2] = 0;
+        for (Int_t i = 0; i < 9; i++) TRACKR.spausr[i] = -1.;
+
+
+        if (verbosityLevel >= 3) {
+            cout << endl << " !!! I am in mgdraw - first Stepping() after resume: " << icode << endl;
+            cout << " Track= " << trackId << " region = " << mreg << endl;
+        }
+
+        fluka->SetTrackIsNew(kFALSE);
+        fluka->SetCaller(kMGDRAW);
+        (TVirtualMCApplication::Instance())->Stepping();
+    }
 } // end of mgdraw
 } // end of extern "C"