Coding rules

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

diff --git a/TRD/AliTRDclusterizer.cxx b/TRD/AliTRDclusterizer.cxx
index 07e6dd494e5009f48a790910c936dccc34f1b94d..21d121a48ce52099a6e6f3e0a51efd6c2e1d28ce 100644 (file)
--- a/TRD/AliTRDclusterizer.cxx
+++ b/TRD/AliTRDclusterizer.cxx
@@ -360,8 +360,16 @@ Bool_t AliTRDclusterizer::OpenOutput(TTree *clusterTree)
     fClusterTree = clusterTree;
     fClusterTree->Branch("TRDcluster", "TObjArray", &ioArray, 32000, 0);
   }
+  return kTRUE;
+}
+
+//_____________________________________________________________________________
+Bool_t AliTRDclusterizer::OpenTrackletOutput()
+{
+  //
+  // Tracklet writing
+  //
 
-  // tracklet writing
   if (fReconstructor->IsWritingTracklets()){
     TString evfoldname = AliConfig::GetDefaultEventFolderName();
     fRunLoader         = AliRunLoader::GetRunLoader(evfoldname);
@@ -381,21 +389,18 @@ Bool_t AliTRDclusterizer::OpenOutput(TTree *clusterTree)
       dl = new AliDataLoader("TRD.Tracklets.root","tracklets", "tracklets");
       fRunLoader->GetLoader("TRDLoader")->AddDataLoader(dl);
     }
-    else {
-      fTrackletTree = dl->Tree();
-      if (!fTrackletTree)
-        {
-        dl->MakeTree();
-        fTrackletTree = dl->Tree();
-        }
-      TBranch *trkbranch = fTrackletTree->GetBranch("trkbranch");
-      if (!trkbranch)
-        fTrackletTree->Branch("trkbranch",leaves[0],"det/i:side/i:tracklets[256]/i");
-    }
+    fTrackletTree = dl->Tree();
+    if (!fTrackletTree)
+      {
+       dl->MakeTree();
+       fTrackletTree = dl->Tree();
+      }
+    TBranch *trkbranch = fTrackletTree->GetBranch("trkbranch");
+    if (!trkbranch)
+      fTrackletTree->Branch("trkbranch",leaves[0],"det/i:side/i:tracklets[256]/i");
   }
 
   return kTRUE;
-
 }
 
 //_____________________________________________________________________________
@@ -1046,11 +1051,12 @@ void AliTRDclusterizer::AddTrackletsToArray()
     {
       Int_t trkl=0;
       trackletword=fTrackletContainer[side];
-      do{
+      while(trackletword[trkl]>0){
        Int_t n = TrackletsArray()->GetEntriesFast();
-       new((*TrackletsArray())[n]) AliTRDcluster(&AliTRDtrackletWord(trackletword[trkl]),fDet,fVolid);
+       AliTRDtrackletWord tmp(trackletword[trkl]);
+       new((*TrackletsArray())[n]) AliTRDcluster(&tmp,fDet,fVolid);
        trkl++;
-      }while(trackletword[trkl]>0);
+      }
     }
 }