Included also 3 and 4 prong decays; added variables to ntuple

[u/mrichter/AliRoot.git] / TRD / AliTRDReconstructor.cxx

diff --git a/TRD/AliTRDReconstructor.cxx b/TRD/AliTRDReconstructor.cxx
index 1bc19b48b588a904a7a9ce9fa756d66b0891c7e5..d54a2fa01adfbaa9fec95bb0a2bac479762a95c3 100644 (file)
--- a/TRD/AliTRDReconstructor.cxx
+++ b/TRD/AliTRDReconstructor.cxx
@@ -36,7 +36,6 @@
 #include "AliTRDclusterizer.h"
 #include "AliTRDtracker.h"
 #include "AliTRDpidESD.h"
-#include "AliTRDgtuTrack.h"
 #include "AliTRDrawData.h"
 #include "AliTRDdigitsManager.h"
 #include "AliTRDtrackerV1.h"
@@ -50,6 +49,7 @@
 ClassImp(AliTRDReconstructor)
 
 TClonesArray *AliTRDReconstructor::fgClusters = 0x0;
+TClonesArray *AliTRDReconstructor::fgTracklets = 0x0;
 Char_t* AliTRDReconstructor::fgSteerNames[kNsteer] = {
   "DigitsConversion       "
  ,"Tail Cancellation      "
@@ -66,6 +66,7 @@ Char_t* AliTRDReconstructor::fgSteerNames[kNsteer] = {
  ,"Tracklet Improve       "
  ,"HLT Mode              "
  ,"Cosmic Reconstruction "
+ ,"Process Online Tracklets"
 };
 Char_t* AliTRDReconstructor::fgSteerFlags[kNsteer] = {
   "dc"// digits conversion [false]
@@ -83,6 +84,7 @@ Char_t* AliTRDReconstructor::fgSteerFlags[kNsteer] = {
  ,"ti"// improve tracklets in stand alone track finder [true]
  ,"hlt"// HLT reconstruction [false]
  ,"cos"// Cosmic Reconstruction [false]
+ ,"tp"// also use online tracklets for reconstruction [false]
 };
 Char_t* AliTRDReconstructor::fgTaskNames[kNtasks] = {
   "RawReader"
@@ -154,6 +156,9 @@ AliTRDReconstructor::~AliTRDReconstructor()
   if(fgClusters) {
     fgClusters->Delete(); delete fgClusters;
   }
+  if(fgTracklets) {
+    fgTracklets->Delete(); delete fgTracklets;
+  }
   if(fSteerParam&kOwner){
     for(Int_t itask = 0; itask < kNtasks; itask++)
       if(fDebugStream[itask]) delete fDebugStream[itask];
@@ -177,9 +182,8 @@ void AliTRDReconstructor::ConvertDigits(AliRawReader *rawReader
   //
   // Convert raw data digits into digit objects in a root tree
   //
-  AliInfo("Feature not available for the moment."); return;
 
-  AliInfo("Convert raw data digits into digit objects [RawReader -> Digit TTree]");
+  //AliInfo("Convert raw data digits into digit objects [RawReader -> Digit TTree]");
 
   AliTRDrawData rawData;
   rawReader->Reset();
@@ -217,6 +221,10 @@ void AliTRDReconstructor::Reconstruct(AliRawReader *rawReader
   // take over ownership of clusters
   fgClusters = clusterer.RecPoints();
   clusterer.SetClustersOwner(kFALSE);
+
+  // take over ownership of online tracklets
+  fgTracklets = clusterer.TrackletsArray();
+  clusterer.SetTrackletsOwner(kFALSE);
 }
 
 //_____________________________________________________________________________
@@ -240,6 +248,10 @@ void AliTRDReconstructor::Reconstruct(TTree *digitsTree
   // take over ownership of clusters
   fgClusters = clusterer.RecPoints();
   clusterer.SetClustersOwner(kFALSE);
+
+  // take over ownership of online tracklets
+  fgTracklets = clusterer.TrackletsArray();
+  clusterer.SetTrackletsOwner(kFALSE);
 }
 
 //_____________________________________________________________________________
@@ -288,6 +300,11 @@ void AliTRDReconstructor::SetOption(Option_t *opt)
       PROCESSED = kTRUE;
       break;   
     }
+    // extra rules
+    if(sopt.Contains("gs") && !sopt.Contains("!")){
+      CLRFLG(fSteerParam, kLUT); PROCESSED = kTRUE;
+    }
+
     if(PROCESSED) continue;
 
     if(sopt.Contains("sl")){
@@ -332,10 +349,10 @@ void AliTRDReconstructor::SetStreamLevel(Int_t level, ETRDReconstructorTask task
 void AliTRDReconstructor::Options(UInt_t steer, UChar_t *stream)
 {
   for(Int_t iopt=0; iopt<kNsteer; iopt++){
-    AliInfoGeneral("AliTRDReconstructor", Form(" %s[%s]%s", fgSteerNames[iopt], fgSteerFlags[iopt], steer ?(((steer>>iopt)&1)?" : ON":" : OFF"):""));
+    AliDebugGeneral("AliTRDReconstructor", 1, Form(" %s[%s]%s", fgSteerNames[iopt], fgSteerFlags[iopt], steer ?(((steer>>iopt)&1)?" : ON":" : OFF"):""));
   }
-  AliInfoGeneral("AliTRDReconstructor", " Debug Streaming"); 
+  AliDebugGeneral("AliTRDReconstructor", 1, " Debug Streaming"); 
   for(Int_t it=0; it<kNtasks; it++) 
-    AliInfoGeneral("AliTRDReconstructor", Form(" %s [sl_%s] %d", fgTaskNames[it], fgTaskFlags[it], stream ? stream[it] : 0));
+    AliDebugGeneral("AliTRDReconstructor", 1, Form(" %s [sl_%s] %d", fgTaskNames[it], fgTaskFlags[it], stream ? stream[it] : 0));
 }