Cleaning the ESD: first step

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

diff --git a/TFluka/usdraw.cxx b/TFluka/usdraw.cxx
index ea9422db75e527818d2e712d0ef7a1e631c9d389..d8d68f06af66d5c37870b2ad87cacf625e39afa7 100644 (file)
--- a/TFluka/usdraw.cxx
+++ b/TFluka/usdraw.cxx
@@ -12,6 +12,9 @@
 #else
 # define usdraw USDRAW
 #endif
+
+#include "TGeoManager.h" // <- delete
+
 extern "C" {
 void usdraw(Int_t& icode, Int_t& mreg, 
             Double_t& xsco, Double_t& ysco, Double_t& zsco)
@@ -26,37 +29,58 @@ void usdraw(Int_t& icode, Int_t& mreg,
 
   if (icode/100 == kEMFSCO) {
       for (Int_t npnw = EMFSTK.npstrt-1; npnw <= EMFSTK.npemf-1; npnw++) {
-         if (EMFSTK.iespak[npnw][mkbmx2-1] ==  TRACKR.ispusr[mkbmx2 - 1] ) {
-             EMFSTK.iespak[npnw][mkbmx2 - 2] = 1;
+          if (EMFSTK.iespak[npnw][mkbmx2-1] ==  TRACKR.ispusr[mkbmx2 - 1] ) {
+              EMFSTK.iespak[npnw][mkbmx2 - 2] = 1;
 // Save properties at point where particle disappears in case this is only an interruption
-             TLorentzVector p;
-             gMC->TrackMomentum(p);
-             EMFSTK.espark[npnw][0] = xsco;               // x
-             EMFSTK.espark[npnw][1] = ysco;               // y
-             EMFSTK.espark[npnw][2] = zsco;               // z
-             EMFSTK.espark[npnw][3] = gMC->TrackTime();   // t
-             EMFSTK.espark[npnw][4] = p[0];               // px
-             EMFSTK.espark[npnw][5] = p[1];               // py
-             EMFSTK.espark[npnw][6] = p[2];               // pz
-             EMFSTK.espark[npnw][7] = p[3];               // e
-             EMFSTK.espark[npnw][8] = gMC->TrackLength(); // Length 
-         } // Track found in stack
+              TLorentzVector p;
+              gMC->TrackMomentum(p);
+              EMFSTK.espark[npnw][0] = xsco;               // x
+              EMFSTK.espark[npnw][1] = ysco;               // y
+              EMFSTK.espark[npnw][2] = zsco;               // z
+              EMFSTK.espark[npnw][3] = gMC->TrackTime();   // t
+              EMFSTK.espark[npnw][4] = p[0];               // px
+              EMFSTK.espark[npnw][5] = p[1];               // py
+              EMFSTK.espark[npnw][6] = p[2];               // pz
+              EMFSTK.espark[npnw][7] = p[3];               // e
+              EMFSTK.espark[npnw][8] = gMC->TrackLength(); // Length
+          } // Track found in stack
       } // Loop over emf stack 
   } // Electromagnetic process
-  
-
 
-  Int_t mlttc = LTCLCM.mlatm1;
+  Int_t mlttc = TRACKR.lt1trk; //LTCLCM.mlatm1;
   fluka->SetMreg(mreg, mlttc);
   fluka->SetXsco(xsco);
   fluka->SetYsco(ysco);
   fluka->SetZsco(zsco);
 
-  if (debug) printf("USDRAW: Number of track segments:%6d %6d %6d %10.3e\n", TRACKR.ntrack, TRACKR.mtrack, icode, TRACKR.atrack);
+    // check region lattice consistency (debug Ernesto)
+    // *****************************************************
+    Int_t nodeId;
+    Int_t volId = fluka->CurrentVolID(nodeId);
+    Int_t crtlttc = gGeoManager->GetCurrentNodeId()+1;
+    if(verbosityLevel>=3 && mreg != volId  && !gGeoManager->IsOutside() ) {
+       cout << "  usdraw:   track=" << TRACKR.ispusr[mkbmx2-1] << " 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;
+    }
+    // *****************************************************
+
+  if (debug) printf("USDRAW: Number of track segments:%6d %6d icode=%d tof=%10.3e track=%d pdg=%d mreg=%d\n",
+  TRACKR.ntrack, TRACKR.mtrack, icode, TRACKR.atrack, TRACKR.ispusr[mkbmx2-1], fluka->PDGFromId(TRACKR.jtrack), mreg );
+
+  TVirtualMCStack* cppstack = fluka->GetStack();
+  cppstack->SetCurrentTrack( TRACKR.ispusr[mkbmx2-1] );
 
   (TVirtualMCApplication::Instance())->Stepping();
   fluka->SetTrackIsNew(kFALSE);
-  
+
+ 
 } // end of usdraw
 } // end of extern "C"