New versions to cope with the new version of tracking V1

diff --git a/ITS/ITSLinkDef.h b/ITS/ITSLinkDef.h
index 4dad32e6faf792766f3324d31c256d5237c1e2d6..883e9befc99eca91c368cb8e696a67e61296ad88 100644 (file)
--- a/ITS/ITSLinkDef.h
+++ b/ITS/ITSLinkDef.h
@@ -118,7 +118,8 @@
 //#pragma link C function GetFloatDialog;
 // This class will always be for ITS only
 #pragma link C++ class  AliITSvtest+;
-
+#pragma link C++ class AliITSTrackerV1+;
+#pragma link C++ class AliITSgeoinfo+;
 #pragma link C++ class AliITSclusterV2+;
 #pragma link C++ class AliITStrackV2+;
 #pragma link C++ class AliITStrackerV2+;

diff --git a/ITS/ITStracking.C b/ITS/ITStracking.C
index e256e974b1b4a683f9aa50932f7f7916c4205251..b6fc71d57c0eb5e2d3bdb2e28d78256b24947703 100644 (file)
--- a/ITS/ITStracking.C
+++ b/ITS/ITStracking.C
@@ -26,9 +26,9 @@ void ITStracking(Int_t evNumber1=0,Int_t evNumber2=0,int min_t=-1, int max_t=0,B
       if (!gAlice) gAlice = new AliRun("gAlice","Alice test program");
    }
 
-
-  AliITS* ITS =(AliITS *)gAlice->GetDetector("ITS");
-  if (!ITS) return;
+  AliITS* IITTSS =(AliITS *)gAlice->GetDetector("ITS");        // nuova modificata
+  if (!IITTSS) return;                                         // nuova modificata
+  AliITSTrackerV1* ITStracker = new AliITSTrackerV1(IITTSS);   // nuova
 
 //
 //   Loop over events 
@@ -50,7 +50,8 @@ void ITStracking(Int_t evNumber1=0,Int_t evNumber2=0,int min_t=-1, int max_t=0,B
      TStopwatch timer;
          
          timer.Start();
-     ITS->DoTracking(nev,min_t,max_t,file,flagvert);
+     //ITS->DoTracking(nev,min_t,max_t,file,flagvert);          // nuova eliminata
+     ITStracker->DoTracking(nev,min_t,max_t,file,flagvert);    // nuova
      timer.Stop(); timer.Print();
    }   // event loop 
    file->Close();   

diff --git a/ITS/ITStracks.C b/ITS/ITStracks.C
index 0dca69d75380496743512db59130f1ff7dba721a..bc14770bd35dffeb68108124c91c6d9f48981671 100644 (file)
--- a/ITS/ITStracks.C
+++ b/ITS/ITStracks.C
@@ -1,3 +1,4 @@
+#include "AliITSgeom.h"
 struct GoodTrack {
   Int_t lab;
   Int_t code;
@@ -61,7 +62,26 @@ Int_t ITStracks(Int_t evNumber1=0,Int_t evNumber2=0,Int_t nclust=5) {
   Int_t numbpoints=0;
   AliITSRecPoint *recp=0;
   Int_t track=-3;
-
+   // Int_t modmin[]={0,80,240,324,500,1282};
+   // Int_t modmax[]={79,239,323,499,1281,2269};
+        
+       
+        Int_t modmin[6], modmax[6];
+        Int_t Nladder[6], Ndetector[6];
+    AliITSgeom *g1 = ITS->GetITSgeom(); 
+        
+    for(Int_t i=0; i<6; i++) {
+    Nladder[i]=g1->GetNladders(i+1);
+    Ndetector[i]=g1->GetNdetectors(i+1);
+        //cout<<Nladder[i]<<"    "<<Ndetector[i]<<"\n";
+  }
+     for(Int_t i=0; i<6; i++) {
+    modmin[i]=g1->GetModuleIndex(i+1,1,1);
+    modmax[i]=g1->GetModuleIndex(i+1,Nladder[i],Ndetector[i]);    
+        //cout<<modmin[i]<<"    "<<modmax[i]<<"\n";
+  } 
+  
+        
 
   for (int nev=evNumber1; nev<= evNumber2; nev++) {
     Int_t nparticles = gAlice->GetEvent(nev);
@@ -75,11 +95,11 @@ Int_t ITStracks(Int_t evNumber1=0,Int_t evNumber2=0,Int_t nclust=5) {
    // Int_t np=particles->GetEntriesFast();
    Int_t np=gAlice->GetNtrack(); //FCA correction      
     TMatrix goodITS(np,6);
-    Int_t modmin[]={0,80,240,324,500,1282};
-    Int_t modmax[]={79,239,323,499,1281,2269};
-    for(Int_t j=0; j<np; j++){
-       for(Int_t j1=0; j1<6; j1++) goodITS(j,j1)=0; 
-    }
+    //Int_t modmin[]={0,80,240,324,500,1282};
+    //Int_t modmax[]={79,239,323,499,1281,2269};
+   // for(Int_t j=0; j<np; j++){
+   //    for(Int_t j1=0; j1<6; j1++) goodITS(j,j1)=0; 
+   // }
        
        
     Int_t nent=gAlice->TreeR()->GetEntries();

diff --git a/ITS/Makefile b/ITS/Makefile
index 921f5b6b54ef5444f0e24795209dac7dfcacdbc5..6676531e8e0c26dad928cc949c1ed62f33bef50e 100644 (file)
--- a/ITS/Makefile
+++ b/ITS/Makefile
@@ -40,6 +40,7 @@ SRCS          = AliITS.cxx AliITSv1.cxx AliITSv3.cxx AliITSv5.cxx \
                 AliITStrack.cxx AliITStracking.cxx AliITSiotrack.cxx \
                AliITSRad.cxx \
                AliITSvtest.cxx \
+                AliITSTrackerV1.cxx AliITSgeoinfo.cxx \
                 AliITSclusterV2.cxx AliITStrackV2.cxx AliITStrackerV2.cxx \
                AliITSVertex.cxx                
 #              AliITSAlignmentTrack.cxx AliITSAlignmentModule.cxx \