fix in the performance tree output

[u/mrichter/AliRoot.git] / ITS / UPGRADE / KMCDetector.cxx

diff --git a/ITS/UPGRADE/KMCDetector.cxx b/ITS/UPGRADE/KMCDetector.cxx
index 88791411e40576dcd121386da6a69c047729f338..f2c63c1212eeeb2b4f480e6562da562b4e1f8b92 100755 (executable)
--- a/ITS/UPGRADE/KMCDetector.cxx
+++ b/ITS/UPGRADE/KMCDetector.cxx
@@ -1712,9 +1712,9 @@ void KMCDetector::MakeAliceCurrent(Bool_t flagTPC, Int_t AlignResiduals) {
             TMath::Sqrt(0.0130*0.0130+0.0050*0.0050));\r
     AddLayer((char*)"spd2_its", 7.6, 0.0114, 2.57e-01, TMath::Sqrt(0.0012*0.0012+0.0030*0.0030),\r
             TMath::Sqrt(0.0130*0.0130+0.0050*0.0050));\r
-    AddLayer((char*)"sdd1_its",15.0, 0.0113, 3.34e-01, TMath::Sqrt(0.0035*0.0035+0.0500*0.0500),\r
+    AddLayer((char*)"sdd1_its",15.0, 0.0113, 3.34e-01, TMath::Sqrt(0.0035*0.0035+0.0100*0.0100),\r
             TMath::Sqrt(0.0025*0.0025+0.0050*0.0050));\r
-    AddLayer((char*)"sdd2_its",23.9, 0.0126, 3.50e-01, TMath::Sqrt(0.0035*0.0035+0.0500*0.0500),\r
+    AddLayer((char*)"sdd2_its",23.9, 0.0126, 3.50e-01, TMath::Sqrt(0.0035*0.0035+0.0100*0.0100),\r
             TMath::Sqrt(0.0025*0.0025+0.0050*0.0050));\r
     AddLayer((char*)"ssd1_its",38.0, 0.0083, 2.38e-01, TMath::Sqrt(0.0020*0.0020+0.0020*0.0020), \r
             TMath::Sqrt(0.0830*0.0830+0.1000*0.1000));\r
@@ -1956,9 +1956,10 @@ Bool_t KMCDetector::SolveSingleTrack(Double_t mass, Double_t pt, Double_t eta, T
   TStopwatch sw;\r
   sw.Start();\r
   for (int it=0;it<nMC;it++) {\r
-    //    printf("ev: %d\n",it);\r
+    printf("ev: %d\n",it);\r
     SolveSingleTrackViaKalmanMC(offset);\r
     KMCProbe* trc = vtx->GetWinnerMCTrack();\r
+    vtx->GetMCTracks()->Print();\r
     if (progressP==1 || (progressP>0 &&  (it%progressP)==0)) {\r
       printf("%d%% done |",it*100/nMC); \r
       sw.Stop(); sw.Print(); sw.Start(kFALSE);\r
@@ -2543,14 +2544,21 @@ Bool_t KMCDetector::NeedToKill(KMCProbe* probe) const
     int il = probe->GetInnerLayerChecked();\r
     int nITS = probe->GetNITSHits();\r
     int nITSMax = nITS + il; // maximum it can have\r
-    if (nITSMax<fMinITSHits) {kill = kTRUE; break;}    // has no chance to collect enough ITS hits\r
+    if (nITSMax<fMinITSHits) {\r
+      kill = kTRUE; \r
+      break;\r
+    }    // has no chance to collect enough ITS hits\r
     //\r
     int ngr = fPattITS.GetSize();\r
     if (ngr>0) { // check pattern\r
       UInt_t patt = probe->GetHitsPatt();\r
       // complete the layers not checked yet\r
       for (int i=il;i--;) patt |= (0x1<<i);\r
-      for (int ig=ngr;ig--;) if (!(((UInt_t)fPattITS[ig]) & patt)) {kill = kTRUE; break;}\r
+      for (int ig=ngr;ig--;) \r
+       if (!(((UInt_t)fPattITS[ig]) & patt)) {\r
+         kill = kTRUE; \r
+         break;\r
+       }\r
       //\r
     }\r
     //\r
@@ -2561,7 +2569,10 @@ Bool_t KMCDetector::NeedToKill(KMCProbe* probe) const
        chi2min = nMiss*probe->GetMissingHitPenalty();\r
       }\r
       chi2min /= ((nITSMax<<1)-KMCProbe::kNDOF);\r
-      if (chi2min>fMaxNormChi2NDF) {kill = kTRUE; break;}\r
+      if (chi2min>fMaxNormChi2NDF) {\r
+       kill = kTRUE; \r
+       break;\r
+      }\r
     }\r
     //\r
     // loose vertex constraint\r
@@ -2569,12 +2580,18 @@ Bool_t KMCDetector::NeedToKill(KMCProbe* probe) const
     if (nITS>=2) {\r
       probe->GetZAt(0,fBFieldG,dst);\r
       //printf("Zd (F%d): %f\n",probe->GetNFakeITSHits(),dst);\r
-      if (TMath::Abs(dst)>10.) {kill = kTRUE; break;}\r
+      if (TMath::Abs(dst)>10.) {\r
+       kill = kTRUE; \r
+       break;\r
+      }\r
     }\r
     if (nITS>=3) {\r
       probe->GetYAt(0,fBFieldG,dst);\r
       //printf("Dd (F%d): %f\n",probe->GetNFakeITSHits(),dst);\r
-      if (TMath::Abs(dst)>10.) {kill = kTRUE; break;}\r
+      if (TMath::Abs(dst)>10.) {\r
+       kill = kTRUE; \r
+       break;\r
+      }\r
     }\r
     //\r
     break;\r