Fixes to make tracking V2 working with the HEAD and with fast points. Waiting for...

diff --git a/ITS/AliITSDeleteOldFiles.sh b/ITS/AliITSDeleteOldFiles.sh
index 979073b9d8d6bd279ce75706a42625403b74b532..08e8475ca0418c415c55519c70fc75c84bc0248b 100755 (executable)
--- a/ITS/AliITSDeleteOldFiles.sh
+++ b/ITS/AliITSDeleteOldFiles.sh
@@ -2,6 +2,8 @@ rm galice.root
 rm AliTPCclusters.root
 rm AliTPCtracks.root
 rm AliTPCtracksSorted.root
+rm AliITSclustersV2.root
+rm AliITStracksV2.root
 rm itstracks.root
 rm good_tracks_tpc
 rm itsgood_tracks

diff --git a/ITS/AliITSFindClustersV2.C b/ITS/AliITSFindClustersV2.C
index 28424495d8455f66218d84d941b66fd44cff1338..385932678ade7a88f6c78f5c0e6e82a835867f61 100644 (file)
--- a/ITS/AliITSFindClustersV2.C
+++ b/ITS/AliITSFindClustersV2.C
@@ -12,7 +12,7 @@
   #include "TParticle.h"
 #endif
 
-Int_t AliITSFindClustersV2() {
+Int_t AliITSFindClustersV2(Char_t SlowOrFast='f') {
 /****************************************************************
  *  This macro converts AliITSRecPoint(s) to AliITSclusterV2(s) *
  ****************************************************************/
@@ -46,14 +46,20 @@ Int_t AliITSFindClustersV2() {
 
    TTree *pTree=gAlice->TreeR();
    if (!pTree) { cerr<<"Can't get TreeR !\n"; return 5; }
-   TBranch *branch=pTree->GetBranch("ITSRecPoints");
+   TBranch *branch = 0;
+   if (SlowOrFast=='f') {
+     branch = pTree->GetBranch("ITSRecPointsF");
+   }
+   else {
+     branch = pTree->GetBranch("ITSRecPoints");
+   }
    if (!branch) { cerr<<"Can't get ITSRecPoints branch !\n"; return 6; }
    TClonesArray *points=new TClonesArray("AliITSRecPoint",10000);
    branch->SetAddress(&points);
 
    TClonesArray &cl=*clusters;
    Int_t nclusters=0;
-   Int_t nentr=(Int_t)pTree->GetEntries();
+   Int_t nentr=(Int_t)branch->GetEntries();
 
    cerr<<"Number of entries: "<<nentr<<endl;
 
@@ -61,7 +67,7 @@ Int_t AliITSFindClustersV2() {
 
    for (Int_t i=0; i<nentr; i++) {
        points->Clear();
-       pTree->GetEvent(i);
+       branch->GetEvent(i);
        Int_t ncl=points->GetEntriesFast(); if (ncl==0){cTree->Fill();continue;}
        Int_t lay,lad,det; geom->GetModuleId(i,lay,lad,det);
        Float_t x,y,zshift; geom->GetTrans(lay,lad,det,x,y,zshift); 

diff --git a/ITS/AliITSsimulationFastPoints.cxx b/ITS/AliITSsimulationFastPoints.cxx
index 76efefc20d0238475d3e6d1ab71a60e47bb88f92..5c6f36125da63a1885e3d72464a26e54809a98d8 100644 (file)
--- a/ITS/AliITSsimulationFastPoints.cxx
+++ b/ITS/AliITSsimulationFastPoints.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.10  2002/06/10 17:30:24  nilsen
+A new CreateFastRecPoints has been made and the old one made compatible.
+
 Revision 1.9  2001/10/01 19:36:03  nilsen
 fixed a compilation warning about unused variable.
 
@@ -138,8 +141,8 @@ void AliITSsimulationFastPoints::CreateFastRecPoints(AliITSmodule *mod,
                    locals[0] += deltaXl;
                    locals[2] += deltaZl;
                    AliITSRecPoint rp;
-                   //     rp.fTracks[0]=hit->GetTrack();
-                   rp.fTracks[0]=mod->GetHitTrackIndex(ihit);
+                   rp.fTracks[0]=hit->GetTrack();
+                   //              rp.fTracks[0]=mod->GetHitTrackIndex(ihit);
                    rp.fTracks[1]=-3;
                    rp.fTracks[2]=-3;
                    rp.SetX(locals[0]);

diff --git a/ITS/AliITStestV2.C b/ITS/AliITStestV2.C
index 635e12e0f5b27d449f5375050789b47c734d84da..f4b56a7b356623674b3bebe7c862f4966dfd3685 100644 (file)
--- a/ITS/AliITStestV2.C
+++ b/ITS/AliITStestV2.C
@@ -1,4 +1,4 @@
-Int_t AliITStestV2(Char_t SlowOrFast='s') {
+Int_t AliITStestV2(Char_t SlowOrFast='f') {
    Int_t rc=0;
 
    if (gAlice) {delete gAlice; gAlice=0;}
@@ -25,12 +25,11 @@ Int_t AliITStestV2(Char_t SlowOrFast='s') {
       AliITSHits2SDigits();
       gROOT->LoadMacro("$(ALICE_ROOT)/ITS/AliITSSDigits2Digits.C");
       AliITSSDigits2Digits();
-      gROOT->LoadMacro("$(ALICE_ROOT)/ITS/AliITSDigits2Recpoints.C");
-      AliITSdigits2RecPoints();
+      gROOT->LoadMacro("$(ALICE_ROOT)/ITS/AliITSDigits2RecPoints.C");
+      AliITSDigits2RecPoints();
    }
-
    gROOT->LoadMacro("$(ALICE_ROOT)/ITS/AliITSFindClustersV2.C");
-   if (rc=AliITSFindClustersV2()) return rc;
+   if (rc=AliITSFindClustersV2(SlowOrFast)) return rc;
 
    gROOT->LoadMacro("$(ALICE_ROOT)/ITS/AliITSFindTracksV2.C");
    if (rc=AliITSFindTracksV2()) return rc;