]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ITS/AliITS.cxx
The operator[] is replaced by At() or AddAt() in case of TObjArray.
[u/mrichter/AliRoot.git] / ITS / AliITS.cxx
index e2b001a195b1dda9287a71e20d16d935340ab661..39a2cc834f0c0916b96c614dd8fdf9e5ca83c630 100644 (file)
 
 /*
 $Log$
+Revision 1.58  2001/07/26 15:05:29  hristov
+Use global gRandom generator (M.Ivanov)
+
+Revision 1.57  2001/07/24 14:26:11  mariana
+Introduce the function Digits2Reco() and write the defaults for simulation and reconstruction
+
+Revision 1.56  2001/07/05 12:49:49  mariana
+Temporary patches required by root.v3.01.05
+
+Revision 1.55  2001/06/14 14:59:00  barbera
+Tracking V1 decoupled from AliITS
+
+Revision 1.54  2001/05/31 20:37:56  barbera
+Bari/Salerno model set as defaault SPD simulation
+
+Revision 1.53  2001/05/31 18:52:24 barbera 
+Bari model becomes the default
+
+Revision 1.53  2001/05/30 07:52:24  hristov
+TPC and CONTAINERS included in the search path
+
+Revision 1.52  2001/05/30 06:04:58  hristov
+Changes made to be consitant with changes in TPC tracking classes (B.Nilsen)
+
+Revision 1.51  2001/05/16 14:57:15  alibrary
+New files for folders and Stack
+
+Revision 1.50  2001/05/11 09:15:21  barbera
+Corrected to make fast point creation working with PPR geometry
+
+Revision 1.49  2001/05/11 07:37:49  hristov
+Legacy lines commented
+
+Revision 1.48  2001/05/10 18:14:25  barbera
+A typo corrected
+
+Revision 1.47  2001/05/10 17:55:59  barbera
+Modified to create rec points also for PPR geometries
+
+Revision 1.46  2001/05/10 00:05:28  nilsen
+Allowed for HitsToDigits function to work with versions 5, 7, 8, and 9. This
+should probably be cleaned up to only check to make sure that fITSgeom has
+been properly defined.
+
+Revision 1.45  2001/05/01 22:35:48  nilsen
+Remove/commented a number of cout<< statements. and made change needed by
+SSD code.
+
+Revision 1.44  2001/04/26 22:44:01  nilsen
+Removed dependence on layer 5/6 in AliITS::HitsToDigits. This will be
+done properly in AliITSv???.cxx via SetDefaults.
+
+Revision 1.43  2001/04/26 13:22:52  barbera
+TMatrix and TVector elimininated to speed up the code
+
+Revision 1.42  2001/04/25 21:55:12  barbera
+Updated version to be compatible with actual verion of STEER and TPC
+
+Revision 1.41  2001/04/21 15:16:51  barbera
+Updated with the new SSD reconstruction code
+
+Revision 1.40  2001/03/17 15:07:06  mariana
+Update SDD response parameters
+
+Revision 1.39  2001/03/12 17:45:32  hristov
+Changes needed on Sun with CC 5.0
+
+Revision 1.38  2001/03/07 14:04:51  barbera
+Some vector dimensions increased to cope with full events
+
+Revision 1.37  2001/03/07 12:36:35  barbera
+A change added in the tracking part to manage delta rays
+
+Revision 1.36  2001/03/02 19:44:11  barbera
+ modified to taking into account new version tracking v1
+
+Revision 1.35  2001/02/28 18:16:46  mariana
+Make the code compatible with the new AliRun
+
+Revision 1.34  2001/02/11 15:51:39  mariana
+Set protection in MakeBranch
+
+Revision 1.33  2001/02/10 22:26:39  mariana
+Move the initialization of the containers for raw clusters in MakeTreeC()
+
+Revision 1.32  2001/02/08 23:55:31  nilsen
+Removed fMajor/MinorVersion variables in favor of variables in derived classes.
+Set arrays char *det[3] = {"SPD","SDD","SSD"} as const.
+
+Revision 1.31  2001/02/02 23:57:28  nilsen
+Added include file that are no londer included in AliITSgeom.h
+
+Revision 1.30  2001/01/30 09:23:13  hristov
+Streamers removed (R.Brun)
+
+Revision 1.29  2001/01/26 20:01:09  hristov
+Major upgrade of AliRoot code
+
+Revision 1.28  2000/12/18 14:02:00  barbera
+new version of the ITS tracking to take into account the new TPC track parametrization
+
 Revision 1.27  2000/12/08 13:49:27  barbera
 Hidden declaration in a for loop removed to be compliant with HP-UX compiler
 
@@ -122,12 +223,15 @@ the AliITS class.
 // futher information.
 //
 ///////////////////////////////////////////////////////////////////////////////
+#include <iostream.h>
+#include <iomanip.h>
+#include <fstream.h>
 #include <stdlib.h>
 #include <TMath.h>
 #include <TRandom.h>
 #include <TBranch.h>
 #include <TVector.h>
-#include <TObjArray.h>
+#include <TClonesArray.h>
 #include <TROOT.h>
 #include <TObjectTable.h>
 #include <TFile.h>
@@ -136,36 +240,32 @@ the AliITS class.
 
 
 
+#include "AliMC.h"
 #include "AliRun.h"
+#include "AliHeader.h"
+
 #include "AliITS.h"
-#include "AliITSMap.h"
 #include "AliITSDetType.h"
-#include "AliITSClusterFinder.h"
-#include "AliITSsimulation.h"
-#include "AliITSresponse.h"
-#include "AliITSsegmentationSPD.h"
 #include "AliITSresponseSPD.h"
-#include "AliITSresponseSPDbari.h"
-#include "AliITSsegmentationSDD.h"
 #include "AliITSresponseSDD.h"
-#include "AliITSsegmentationSSD.h"
 #include "AliITSresponseSSD.h"
+#include "AliITSsegmentationSPD.h"
+#include "AliITSsegmentationSDD.h"
+#include "AliITSsegmentationSSD.h"
+#include "AliITSsimulationSPD.h"
+#include "AliITSsimulationSDD.h"
+#include "AliITSsimulationSSD.h"
+#include "AliITSClusterFinderSPD.h"
+#include "AliITSClusterFinderSDD.h"
+#include "AliITSClusterFinderSSD.h"
+
 #include "AliITShit.h"
 #include "AliITSgeom.h"
 #include "AliITSdigit.h"
 #include "AliITSmodule.h"
 #include "AliITSRecPoint.h"
 #include "AliITSRawCluster.h"
-#include "AliMC.h"
-#include "stdlib.h"
-
-#include "AliITStrack.h"
-#include "AliITSiotrack.h"
-#include "AliITStracking.h" 
-#include "../TPC/AliTPC.h"
-#include "../TPC/AliTPCParam.h"
 
-const Int_t AliITS::fgkNTYPES=3;
 
 ClassImp(AliITS)
  
@@ -184,7 +284,7 @@ AliITS::AliITS() : AliDetector() {
   fIshunt     = 0;
   fEuclidOut  = 0;
 
-  //fNDetTypes = fgkNTYPES;
+  fNDetTypes = kNTYPES;
   fIdN        = 0;
   fIdName     = 0;
   fIdSens     = 0;
@@ -222,16 +322,17 @@ AliITS::AliITS(const char *name, const char *title):AliDetector(name,title){
   fHits       = new TClonesArray("AliITShit", 1560);
   gAlice->AddHitList(fHits);
 
-  //fNDetTypes = fgkNTYPES;
+  fNDetTypes = kNTYPES;
 
-  fNdtype = new Int_t[fgkNTYPES];
-  fDtype = new TObjArray(fgkNTYPES);
+  fNdtype = new Int_t[kNTYPES];
+  fDtype = new TObjArray(kNTYPES);
 
-  fNctype = new Int_t[fgkNTYPES];
-  fCtype = new TObjArray(fgkNTYPES);
+  fNctype = new Int_t[kNTYPES];
+  fCtype = new TObjArray(kNTYPES);
 
 
-  fRecPoints = 0;
+
+  fRecPoints=new TClonesArray("AliITSRecPoint",1000);
   fNRecPoints = 0;
 
   fTreeC = 0;
@@ -244,11 +345,11 @@ AliITS::AliITS(const char *name, const char *title):AliDetector(name,title){
   fIdName     = 0;
   fIdSens     = 0;
  
-  fDetTypes = new TObjArray(fgkNTYPES);  
+  fDetTypes = new TObjArray(kNTYPES);  
 
   Int_t i;
-  for(i=0;i<fgkNTYPES;i++) {
-    (*fDetTypes)[i]=new AliITSDetType(); 
+  for(i=0;i<kNTYPES;i++) {
+    fDetTypes->AddAt(new AliITSDetType(),i); 
     fNdtype[i]=0;
     fNctype[i]=0;
    }
@@ -331,14 +432,16 @@ AliITS::~AliITS(){
 AliITSDetType* AliITS::DetType(Int_t id)
 {
   //return pointer to id detector type
-    return ((AliITSDetType*) (*fDetTypes)[id]);
+  //PH    return ((AliITSDetType*) (*fDetTypes)[id]);
+    return ((AliITSDetType*) fDetTypes->At(id));
 
 }
 //___________________________________________
 void AliITS::SetClasses(Int_t id, const char *digit, const char *cluster)
 {
   //set the digit and cluster classes to be used for the id detector type
-    ((AliITSDetType*) (*fDetTypes)[id])->ClassNames(digit,cluster);
+  //PH    ((AliITSDetType*) (*fDetTypes)[id])->ClassNames(digit,cluster);
+    ((AliITSDetType*) fDetTypes->At(id))->ClassNames(digit,cluster);
 
 }
 //___________________________________________
@@ -346,7 +449,8 @@ void AliITS::SetResponseModel(Int_t id, AliITSresponse *response)
 {
   //set the response model for the id detector type
 
-    ((AliITSDetType*) (*fDetTypes)[id])->ResponseModel(response);
+  //PH    ((AliITSDetType*) (*fDetTypes)[id])->ResponseModel(response);
+    ((AliITSDetType*) fDetTypes->At(id))->ResponseModel(response);
 
 }
 
@@ -355,7 +459,8 @@ void AliITS::SetSegmentationModel(Int_t id, AliITSsegmentation *seg)
 {
   //set the segmentation model for the id detector type
 
-    ((AliITSDetType*) (*fDetTypes)[id])->SegmentationModel(seg);
+  //PH    ((AliITSDetType*) (*fDetTypes)[id])->SegmentationModel(seg);
+    ((AliITSDetType*) fDetTypes->At(id))->SegmentationModel(seg);
 
 }
 
@@ -364,7 +469,8 @@ void AliITS::SetSimulationModel(Int_t id, AliITSsimulation *sim)
 {
   //set the simulation model for the id detector type
 
-   ((AliITSDetType*) (*fDetTypes)[id])->SimulationModel(sim);
+  //PH   ((AliITSDetType*) (*fDetTypes)[id])->SimulationModel(sim);
+   ((AliITSDetType*) fDetTypes->At(id))->SimulationModel(sim);
 
 }
 //___________________________________________
@@ -372,7 +478,8 @@ void AliITS::SetReconstructionModel(Int_t id, AliITSClusterFinder *reconst)
 {
   //set the cluster finder model for the id detector type
 
-   ((AliITSDetType*) (*fDetTypes)[id])->ReconstructionModel(reconst);
+  //PH   ((AliITSDetType*) (*fDetTypes)[id])->ReconstructionModel(reconst);
+   ((AliITSDetType*) fDetTypes->At(id))->ReconstructionModel(reconst);
 
 }
 
@@ -394,7 +501,8 @@ void AliITS::AddRealDigit(Int_t id, Int_t *digits)
 {
   // add a real digit - as coming from data
 
-  TClonesArray &ldigits = *((TClonesArray*)(*fDtype)[id]);
+  //PH  TClonesArray &ldigits = *((TClonesArray*)(*fDtype)[id]);
+  TClonesArray &ldigits = *((TClonesArray*)fDtype->At(id));
   new(ldigits[fNdtype[id]++]) AliITSdigit(digits);
 
 }
@@ -404,7 +512,8 @@ void AliITS::AddSimDigit(Int_t id, AliITSdigit *d)
 
   // add a simulated digit
 
-  TClonesArray &ldigits = *((TClonesArray*)(*fDtype)[id]);
+  //PH  TClonesArray &ldigits = *((TClonesArray*)(*fDtype)[id]);
+  TClonesArray &ldigits = *((TClonesArray*)fDtype->At(id));
 
   switch(id)
   {
@@ -426,7 +535,8 @@ void AliITS::AddSimDigit(Int_t id,Float_t phys,Int_t *digits,Int_t *tracks,Int_t
 
   // add a simulated digit to the list
 
-  TClonesArray &ldigits = *((TClonesArray*)(*fDtype)[id]);
+  //PH  TClonesArray &ldigits = *((TClonesArray*)(*fDtype)[id]);
+  TClonesArray &ldigits = *((TClonesArray*)fDtype->At(id));
   switch(id)
   {
   case 0:
@@ -448,7 +558,8 @@ void AliITS::AddCluster(Int_t id, AliITSRawCluster *c)
 
   // add a cluster to the list
 
-  TClonesArray &lcl = *((TClonesArray*)(*fCtype)[id]);
+  //PH  TClonesArray &lcl = *((TClonesArray*)(*fCtype)[id]);
+  TClonesArray &lcl = *((TClonesArray*)fCtype->At(id));
 
   switch(id)
   {
@@ -487,8 +598,9 @@ void AliITS::ResetDigits()
     if (!fDtype) return;
 
     Int_t i;
-    for (i=0;i<fgkNTYPES;i++ ) {
-       if ((*fDtype)[i])    ((TClonesArray*)(*fDtype)[i])->Clear();
+    for (i=0;i<kNTYPES;i++ ) {
+      //PH     if ((*fDtype)[i])    ((TClonesArray*)(*fDtype)[i])->Clear();
+       if (fDtype->At(i))    ((TClonesArray*)fDtype->At(i))->Clear();
        if (fNdtype)  fNdtype[i]=0;
     }
 }
@@ -499,7 +611,8 @@ void AliITS::ResetDigits(Int_t i)
     //
     // Reset number of digits and the digits array for this branch
     //
-  if ((*fDtype)[i])    ((TClonesArray*)(*fDtype)[i])->Clear();
+  //PH  if ((*fDtype)[i])    ((TClonesArray*)(*fDtype)[i])->Clear();
+  if (fDtype->At(i))    ((TClonesArray*)fDtype->At(i))->Clear();
   if (fNdtype)  fNdtype[i]=0;
 }
 
@@ -512,8 +625,9 @@ void AliITS::ResetClusters()
     //
 
     Int_t i;
-    for (i=0;i<fgkNTYPES;i++ ) {
-       if ((*fCtype)[i])    ((TClonesArray*)(*fCtype)[i])->Clear();
+    for (i=0;i<kNTYPES;i++ ) {
+      //PH     if ((*fCtype)[i])    ((TClonesArray*)(*fCtype)[i])->Clear();
+       if (fCtype->At(i))    ((TClonesArray*)fCtype->At(i))->Clear();
        if (fNctype)  fNctype[i]=0;
     }
 
@@ -525,7 +639,8 @@ void AliITS::ResetClusters(Int_t i)
     //
     // Reset number of clusters and the clusters array for this branch
     //
-       if ((*fCtype)[i])    ((TClonesArray*)(*fCtype)[i])->Clear();
+  //PH if ((*fCtype)[i])    ((TClonesArray*)(*fCtype)[i])->Clear();
+       if (fCtype->At(i))    ((TClonesArray*)fCtype->At(i))->Clear();
        if (fNctype)  fNctype[i]=0;
 
 }
@@ -566,18 +681,11 @@ void AliITS::Init(){
   //
   Int_t i;
 
-  cout << endl;
-  for(i=0;i<30;i++) cout << "*";cout << " ITS_INIT ";
-  for(i=0;i<30;i++) cout << "*";cout << endl;
 //
   SetDefaults();
-// TObjArray of TObjStrings
-//  for(i=0;i<fIdN;i++) fIdSens[i] = gMC->VolId((fIdName->At(i))->GetName());
 // Array of TStrings
   for(i=0;i<fIdN;i++) fIdSens[i] = gMC->VolId(fIdName[i]);
 //
-  for(i=0;i<70;i++) cout << "*";
-  cout << endl;
 }
 
 //_____________________________________________________________________________
@@ -585,7 +693,7 @@ void AliITS::SetDefaults()
 {
   // sets the default segmentation, response, digit and raw cluster classes
 
-  printf("SetDefaults\n");
+  if(fDebug) printf("%s: SetDefaults\n",ClassName());
 
   AliITSDetType *iDetType;
 
@@ -637,24 +745,82 @@ void AliITS::SetDefaults()
       iDetType->ClassNames("AliITSdigit","AliITSRawClusterSSD");
   } else iDetType->ClassNames("AliITSdigitSSD","AliITSRawClusterSSD");
 
-  if (fgkNTYPES>3) {
+  if (kNTYPES>3) {
     Warning("SetDefaults","Only the three basic detector types are initialised!");
   } 
 
 }
-
-
-
 //_____________________________________________________________________________
 void AliITS::SetDefaultSimulation()
 {
-  // to be written
+  // sets the default simulation
+
+
+  AliITSDetType *iDetType;
+  iDetType=DetType(0);
+  if (!iDetType->GetSimulationModel()) {
+      AliITSsegmentation *seg0=
+                    (AliITSsegmentation*)iDetType->GetSegmentationModel();
+      AliITSresponse *res0 = (AliITSresponse*)iDetType->GetResponseModel();
+      AliITSsimulationSPD *sim0=new AliITSsimulationSPD(seg0,res0);
+      SetSimulationModel(0,sim0);
+  }
+  iDetType=DetType(1);
+  if (!iDetType->GetSimulationModel()) {
+      AliITSsegmentation *seg1=
+                    (AliITSsegmentation*)iDetType->GetSegmentationModel();
+      AliITSresponse *res1 = (AliITSresponse*)iDetType->GetResponseModel();
+      AliITSsimulationSDD *sim1=new AliITSsimulationSDD(seg1,res1);
+      SetSimulationModel(1,sim1);
+  }
+  iDetType=DetType(2);
+  if (!iDetType->GetSimulationModel()) {
+      AliITSsegmentation *seg2=
+                    (AliITSsegmentation*)iDetType->GetSegmentationModel();
+      AliITSresponse *res2 = (AliITSresponse*)iDetType->GetResponseModel();
+      AliITSsimulationSSD *sim2=new AliITSsimulationSSD(seg2,res2);
+      SetSimulationModel(2,sim2);
+  }
+
 
 }
 //_____________________________________________________________________________
 void AliITS::SetDefaultClusterFinders()
 {
-  // to be written
+  // sets the default cluster finders
+
+  MakeTreeC();
+  AliITSDetType *iDetType;
+  iDetType=DetType(0);
+  if (!iDetType->GetReconstructionModel()) {
+      AliITSsegmentation *seg0=
+                   (AliITSsegmentation*)iDetType->GetSegmentationModel();
+      TClonesArray *dig0=DigitsAddress(0);
+      TClonesArray *recp0=ClustersAddress(0);
+      AliITSClusterFinderSPD *rec0=new AliITSClusterFinderSPD(seg0,dig0,recp0);
+      SetReconstructionModel(0,rec0);
+  }
+  iDetType=DetType(1);
+  if (!iDetType->GetReconstructionModel()) {
+      AliITSsegmentation *seg1=
+                     (AliITSsegmentation*)iDetType->GetSegmentationModel();
+      AliITSresponse *res1 = (AliITSresponse*)iDetType->GetResponseModel();
+      TClonesArray *dig1=DigitsAddress(1);
+      TClonesArray *recp1=ClustersAddress(1);
+      AliITSClusterFinderSDD *rec1=
+                           new AliITSClusterFinderSDD(seg1,res1,dig1,recp1);
+
+      SetReconstructionModel(1,rec1);
+  }
+  iDetType=DetType(2);
+  if (!iDetType->GetReconstructionModel()) {
+      AliITSsegmentation *seg2=
+                    (AliITSsegmentation*)iDetType->GetSegmentationModel();
+
+      TClonesArray *dig2=DigitsAddress(2);
+      AliITSClusterFinderSSD *rec2= new AliITSClusterFinderSSD(seg2,dig2);
+      SetReconstructionModel(2,rec2);
+  }
 
 }
 //_____________________________________________________________________________
@@ -663,26 +829,34 @@ void AliITS::MakeTreeC(Option_t *option)
 {
   // create a separate tree to store the clusters
 
-  cout << "AliITS::MakeTreeC" << endl;
+//  cout << "AliITS::MakeTreeC" << endl;
 
-     char *optC = strstr(option,"C");
+     const char *optC = strstr(option,"C");
      if (optC && !fTreeC) fTreeC = new TTree("TC","Clusters in ITS");
      else return;
 
+
      Int_t buffersize = 4000;
      char branchname[30];
 
-     char *det[3] = {"SPD","SDD","SSD"};
+     const char *det[3] = {"SPD","SDD","SSD"};
+
+     char digclass[40];
+     char clclass[40];
 
      // one branch for Clusters per type of detector
      Int_t i;
-     for (i=0; i<fgkNTYPES ;i++) {
-        if (fgkNTYPES==3) sprintf(branchname,"%sClusters%s",GetName(),det[i]);
+     for (i=0; i<kNTYPES ;i++) {
+        AliITSDetType *iDetType=DetType(i); 
+        iDetType->GetClassNames(digclass,clclass);
+       // clusters
+        fCtype->AddAt(new TClonesArray(clclass,1000),i);
+        if (kNTYPES==3) sprintf(branchname,"%sClusters%s",GetName(),det[i]);
        else  sprintf(branchname,"%sClusters%d",GetName(),i+1);
        if (fCtype   && fTreeC) {
           TreeC()->Branch(branchname,&((*fCtype)[i]), buffersize);
-          cout << "Making Branch " << branchname;
-          cout << " for Clusters of detector type " << i+1 << endl;
+//        cout << "Making Branch " << branchname;
+//        cout << " for Clusters of detector type " << i+1 << endl;
        }       
      }
 
@@ -692,13 +866,13 @@ void AliITS::MakeTreeC(Option_t *option)
 void AliITS::GetTreeC(Int_t event)
 {
 
-  cout << "AliITS::GetTreeC" << endl;
+//  cout << "AliITS::GetTreeC" << endl;
 
   // get the clusters tree for this event and set the branch address
     char treeName[20];
     char branchname[30];
 
-    char *det[3] = {"SPD","SDD","SSD"};
+    const char *det[3] = {"SPD","SDD","SSD"};
 
     ResetClusters();
     if (fTreeC) {
@@ -708,12 +882,20 @@ void AliITS::GetTreeC(Int_t event)
     sprintf(treeName,"TreeC%d",event);
     fTreeC = (TTree*)gDirectory->Get(treeName);
 
-
     TBranch *branch;
+
     if (fTreeC) {
         Int_t i;
-       for (i=0; i<fgkNTYPES; i++) {
-          if (fgkNTYPES==3) sprintf(branchname,"%sClusters%s",GetName(),det[i]);
+       char digclass[40];
+       char clclass[40];
+       for (i=0; i<kNTYPES; i++) {
+
+          AliITSDetType *iDetType=DetType(i); 
+          iDetType->GetClassNames(digclass,clclass);
+          // clusters
+       //PH       if(!(*fCtype)[i]) fCtype->AddAt(new TClonesArray(clclass,1000),i); 
+          if(!fCtype->At(i)) fCtype->AddAt(new TClonesArray(clclass,1000),i); 
+          if (kNTYPES==3) sprintf(branchname,"%sClusters%s",GetName(),det[i]);
           else  sprintf(branchname,"%sClusters%d",GetName(),i+1);
           if (fCtype) {
                branch = fTreeC->GetBranch(branchname);
@@ -727,61 +909,66 @@ void AliITS::GetTreeC(Int_t event)
 
 }
 //_____________________________________________________________________________
-void AliITS::MakeBranch(Option_t* option){
+void AliITS::MakeBranch(Option_t* option, const char *file)
+{
   //
   // Creates Tree branches for the ITS.
   //
-
-
+  //
   Int_t buffersize = 4000;
   char branchname[30];
   sprintf(branchname,"%s",GetName());
 
-  AliDetector::MakeBranch(option);
+  AliDetector::MakeBranch(option,file);
 
+  const char *cD = strstr(option,"D");
+  const char *cR = strstr(option,"R");
 
-// one branch for digits per type of detector
-  
-   char *det[3] = {"SPD","SDD","SSD"};
+  if (cD) {
+  //
+  // one branch for digits per type of detector
+  //
+   const char *det[3] = {"SPD","SDD","SSD"};
 
    char digclass[40];
    char clclass[40];
 
    Int_t i;
-   for (i=0; i<fgkNTYPES ;i++) {
-       AliITSDetType *iDetType=DetType(i); 
-       iDetType->GetClassNames(digclass,clclass);
-       //printf("i, digclass, recclass %d %s %s\n",i,digclass,clclass); 
+   for (i=0; i<kNTYPES ;i++) {
+       DetType(i)->GetClassNames(digclass,clclass);
        // digits
-       (*fDtype)[i] = new TClonesArray(digclass,10000); 
-       // clusters
-       (*fCtype)[i] = new TClonesArray(clclass,10000); 
+       //PH       if(!((*fDtype)[i])) fDtype->AddAt(new TClonesArray(digclass,1000),i);
+       if(!(fDtype->At(i))) fDtype->AddAt(new TClonesArray(digclass,1000),i);
+       else ResetDigits(i);
    }
 
-
-  for (i=0; i<fgkNTYPES ;i++) {
-      if (fgkNTYPES==3) sprintf(branchname,"%sDigits%s",GetName(),det[i]);
-      else  sprintf(branchname,"%sDigits%d",GetName(),i+1);
-      
-      if (fDtype   && gAlice->TreeD()) {
-         gAlice->TreeD()->Branch(branchname,&((*fDtype)[i]), buffersize);
-         cout << "Making Branch " << branchname;
-         cout << " for digits of type "<< i+1 << endl;
+   for (i=0; i<kNTYPES ;i++) {
+      if (kNTYPES==3) sprintf(branchname,"%sDigits%s",GetName(),det[i]);
+      else  sprintf(branchname,"%sDigits%d",GetName(),i+1);      
+      if (fDtype && gAlice->TreeD()) {
+        MakeBranchInTree(gAlice->TreeD(), 
+                         branchname, &((*fDtype)[i]), buffersize, file);
+//         cout << "Making Branch " << branchname;
+//         cout << " for digits of type "<< i+1 << endl;
       }        
+    }
   }
 
+  if (cR) {
+  //
   // only one branch for rec points for all detector types
-  sprintf(branchname,"%sRecPoints",GetName());
-
-  fRecPoints=new TClonesArray("AliITSRecPoint",10000);
+  //
+    sprintf(branchname,"%sRecPoints",GetName());
+    //if(!fRecPoints) fRecPoints=new TClonesArray("AliITSRecPoint",1000);
 
-  if (fRecPoints && gAlice->TreeR()) {
-    gAlice->TreeR()->Branch(branchname,&fRecPoints, buffersize);
-    cout << "Making Branch " << branchname;
-    cout << " for reconstructed space points" << endl;
+    if (fRecPoints && gAlice->TreeR()) {
+      MakeBranchInTree(gAlice->TreeR(), 
+                               branchname, &fRecPoints, buffersize, file) ;
+//      cout << "Making Branch " << branchname;
+//      cout << " for reconstructed space points" << endl;
+    }
   }    
-
-
 }
 
 //___________________________________________
@@ -790,34 +977,42 @@ void AliITS::SetTreeAddress()
 
   // Set branch address for the Trees.
 
+
   char branchname[30];
   AliDetector::SetTreeAddress();
 
-  char *det[3] = {"SPD","SDD","SSD"};
+  const char *det[3] = {"SPD","SDD","SSD"};
 
   TBranch *branch;
   TTree *treeD = gAlice->TreeD();
   TTree *treeR = gAlice->TreeR();
 
+  char digclass[40];
+  char clclass[40];
+
   Int_t i;
   if (treeD) {
-      for (i=0; i<fgkNTYPES; i++) {
-         if (fgkNTYPES==3) sprintf(branchname,"%sDigits%s",GetName(),det[i]);
-         else  sprintf(branchname,"%sDigits%d",GetName(),i+1);
-         if (fDtype) {
-             branch = treeD->GetBranch(branchname);
-             if (branch) branch->SetAddress(&((*fDtype)[i]));
-         }
+      for (i=0; i<kNTYPES; i++) {
+       DetType(i)->GetClassNames(digclass,clclass);
+         // digits
+    //PH        if(!((*fDtype)[i])) fDtype->AddAt(new TClonesArray(digclass,1000),i);
+        if(!(fDtype->At(i))) fDtype->AddAt(new TClonesArray(digclass,1000),i);
+       else ResetDigits(i);
+
+       if (kNTYPES==3) sprintf(branchname,"%sDigits%s",GetName(),det[i]);
+       else  sprintf(branchname,"%sDigits%d",GetName(),i+1);
+       if (fDtype) {
+          branch = treeD->GetBranch(branchname);
+          if (branch) branch->SetAddress(&((*fDtype)[i]));
+       }
       }
   }
 
  
   if (treeR) {
     sprintf(branchname,"%sRecPoints",GetName());
-    if (fRecPoints) {
       branch = treeR->GetBranch(branchname);
       if (branch) branch->SetAddress(&fRecPoints);
-    }
   }
   
 
@@ -871,14 +1066,14 @@ void AliITS::FillModules(Int_t evnt,Int_t bgrev,Int_t nmodules,Option_t *option,
 
     static Bool_t first=kTRUE;
     static TFile *file;
-    char *addBgr = strstr(option,"Add");
+    const char *addBgr = strstr(option,"Add");
 
 
     if (addBgr ) {
        if(first) {
-           cout<<"filename "<<filename<<endl;
+//         cout<<"filename "<<filename<<endl;
            file=new TFile(filename);
-           cout<<"I have opened "<<filename<<" file "<<endl;
+//         cout<<"I have opened "<<filename<<" file "<<endl;
            fHits2     = new TClonesArray("AliITShit",1000  );
        }           
        first=kFALSE;
@@ -912,8 +1107,8 @@ void AliITS::FillModules(Int_t evnt,Int_t bgrev,Int_t nmodules,Option_t *option,
        //printf("background - ntracks1 - %d\n",ntracks1);
    }
 
-    Int_t npart = gAlice->GetEvent(evnt);
-    if(npart<=0) return;
+    //Int_t npart = gAlice->GetEvent(evnt);
+    //if(npart<=0) return;
     TClonesArray *itsHits = this->Hits();
     Int_t lay,lad,det,index;
     AliITShit *itsHit=0;
@@ -980,6 +1175,21 @@ void AliITS::FillModules(Int_t evnt,Int_t bgrev,Int_t nmodules,Option_t *option,
 
 }
 
+//____________________________________________________________________________
+
+void AliITS::SDigits2Digits()
+{
+
+  cerr<<"Digitizing ITS...\n";
+
+  TStopwatch timer;
+  timer.Start();
+  AliHeader *header=gAlice->GetHeader();
+  HitsToDigits(header->GetEvent(),0,-1," ","All"," ");
+  timer.Stop(); timer.Print();
+
+}
+
 
 //____________________________________________________________________________
 void AliITS::HitsToDigits(Int_t evNumber,Int_t bgrev,Int_t size, Option_t *option, Option_t *opt,Text_t *filename)
@@ -991,14 +1201,22 @@ void AliITS::HitsToDigits(Int_t evNumber,Int_t bgrev,Int_t size, Option_t *optio
    // initialised for all versions - for the moment it is only for v5 !
    // 7 is the SDD beam test version  
    Int_t ver = this->IsVersion(); 
-   if(ver!=5 && ver!=7) return; 
+   if(ver!=5 && ver!=7 && ver!=8 && ver!=9) return; 
 
-   char *all = strstr(opt,"All");
-   char *det[3] = {strstr(opt,"SPD"),strstr(opt,"SDD"),strstr(opt,"SSD")};
+   const char *all = strstr(opt,"All");
+   const char *det[3] = {strstr(opt,"SPD"),strstr(opt,"SDD"),strstr(opt,"SSD")};
 
+   static Bool_t setDef=kTRUE;
+   if (setDef) SetDefaultSimulation();
+   setDef=kFALSE;
+
+
+//   cout<<" 1 AliITS "<<endl;
    Int_t nmodules;
    InitModules(size,nmodules); 
+//   cout<<" 2 AliITS "<<endl;
    FillModules(evNumber,bgrev,nmodules,option,filename);
+//   cout<<" 3 AliITS "<<endl;
 
    //TBranch *branch;
    AliITSsimulation* sim;
@@ -1006,22 +1224,18 @@ void AliITS::HitsToDigits(Int_t evNumber,Int_t bgrev,Int_t size, Option_t *optio
    AliITSgeom *geom = GetITSgeom();
 
    Int_t id,module;
+//   Int_t lay, lad, detect;
    Int_t first,last;
-   for (id=0;id<fgkNTYPES;id++) {
+   for (id=0;id<kNTYPES;id++) {
         if (!all && !det[id]) continue;
        //branch = (TBranch*)branches->UncheckedAt(id);
        AliITSDetType *iDetType=DetType(id); 
        sim = (AliITSsimulation*)iDetType->GetSimulationModel();
-       if (!sim) {
-           Error("HitsToDigits","The simulation class was not instantiated!");
-           exit(1);
-          // or SetDefaultSimulation();
-       }
        if(geom) {
          first = geom->GetStartDet(id);
          last = geom->GetLastDet(id);
        } else first=last=0;
-       cout << "det type " << id << " first, last "<< first << last << endl;
+       printf("first module - last module %d %d\n",first,last);
        for(module=first;module<=last;module++) {
            AliITSmodule *mod = (AliITSmodule *)fITSmodules->At(module);
            sim->DigitiseModule(mod,module,evNumber);
@@ -1036,18 +1250,29 @@ void AliITS::HitsToDigits(Int_t evNumber,Int_t bgrev,Int_t size, Option_t *optio
 
    ClearModules();
 
-   Int_t nentries=(Int_t)gAlice->TreeD()->GetEntries();
-   cout << "nentries in TreeD" << nentries << endl;
+//   Int_t nentries=(Int_t)
+   gAlice->TreeD()->GetEntries();
+//   cout << "nentries in TreeD" << nentries << endl;
 
    char hname[30];
    sprintf(hname,"TreeD%d",evNumber);
-   gAlice->TreeD()->Write(hname);
+   gAlice->TreeD()->Write(hname,TObject::kOverwrite);
    // reset tree
    gAlice->TreeD()->Reset();
 
 }
 
 
+//_____________________________________________________________________________
+void AliITS::Digits2Reco()
+{
+  // find clusters and reconstruct space points
+
+  AliHeader *header=gAlice->GetHeader();
+  printf("header->GetEvent() %d\n",header->GetEvent());
+  DigitsToRecPoints(header->GetEvent(),0,"All");
+
+}
 //____________________________________________________________________________
 void AliITS::DigitsToRecPoints(Int_t evNumber,Int_t lastentry,Option_t *opt)
 {
@@ -1057,18 +1282,18 @@ void AliITS::DigitsToRecPoints(Int_t evNumber,Int_t lastentry,Option_t *opt)
    // initialised for all versions - for the moment it is only for v5 !
    // 7 is the SDD beam test version  
    Int_t ver = this->IsVersion(); 
-   if(ver!=5 && ver!=7) return; 
+   if(ver!=5 && ver!=8 && ver!=9) return;
 
-   char *all = strstr(opt,"All");
-   char *det[3] = {strstr(opt,"SPD"),strstr(opt,"SDD"),strstr(opt,"SSD")};
+   const char *all = strstr(opt,"All");
+   const char *det[3] = {strstr(opt,"SPD"),strstr(opt,"SDD"),strstr(opt,"SSD")};
 
-   static Bool_t first=kTRUE;
-   if (first) {
-       MakeTreeC("C");
-       first=kFALSE;
-   }
+   static Bool_t setRec=kTRUE;
+   if (setRec) SetDefaultClusterFinders();
+   setRec=kFALSE;
+
+
+   TTree *treeC=TreeC();
  
-   TTree *iTC=TreeC();
 
    //TBranch *branch;
    AliITSClusterFinder* rec;
@@ -1077,33 +1302,27 @@ void AliITS::DigitsToRecPoints(Int_t evNumber,Int_t lastentry,Option_t *opt)
    AliITSgeom *geom = GetITSgeom();
 
    Int_t id,module;
-   for (id=0;id<fgkNTYPES;id++) {
+   for (id=0;id<kNTYPES;id++) {
         if (!all && !det[id]) continue;
        //branch = (TBranch*)branches->UncheckedAt(id);
        AliITSDetType *iDetType=DetType(id); 
        rec = (AliITSClusterFinder*)iDetType->GetReconstructionModel();
-       if (!rec) {
-           Error("DigitsToRecPoints","The cluster finder class was not instantiated!");
-           exit(1);
-          // or SetDefaultClusterFinders();
-       }
         TClonesArray *itsDigits  = this->DigitsAddress(id);
-
         Int_t first,last;
        if(geom) {
          first = geom->GetStartDet(id);
          last = geom->GetLastDet(id);
        } else first=last=0;
-       //printf("first last %d %d\n",first,last);
+       printf("first module - last module %d %d\n",first,last);
        for(module=first;module<=last;module++) {
               this->ResetDigits();
               if (all) gAlice->TreeD()->GetEvent(lastentry+module);
              else gAlice->TreeD()->GetEvent(lastentry+(module-first));
              Int_t ndigits = itsDigits->GetEntriesFast();
-             if (ndigits) rec->FindRawClusters();
+             if (ndigits) rec->FindRawClusters(module);
              gAlice->TreeR()->Fill(); 
              ResetRecPoints();
-             iTC->Fill();
+             treeC->Fill();
               ResetClusters();
              // try and fill only the branch 
              //branch->Fill();
@@ -1112,22 +1331,22 @@ void AliITS::DigitsToRecPoints(Int_t evNumber,Int_t lastentry,Option_t *opt)
    } // loop over detector types
 
 
-   Int_t nentries=(Int_t)gAlice->TreeR()->GetEntries();
-   Int_t ncentries=(Int_t)iTC->GetEntries();
-   cout << " nentries ncentries " << nentries << ncentries <<  endl;
+//   Int_t nentries=(Int_t)
+   gAlice->TreeR()->GetEntries();
+//   Int_t ncentries=(Int_t)
+   treeC->GetEntries();
+//   cout << " nentries ncentries " << nentries << ncentries <<  endl;
 
    char hname[30];
    sprintf(hname,"TreeR%d",evNumber);
-   gAlice->TreeR()->Write(hname);
+   gAlice->TreeR()->Write(hname,TObject::kOverwrite);
    // reset tree
    gAlice->TreeR()->Reset();
 
    sprintf(hname,"TreeC%d",evNumber);
-   iTC->Write(hname);
-   iTC->Reset();
+   treeC->Write(hname,TObject::kOverwrite);
+   treeC->Reset();
 }
-
-
 //____________________________________________________________________________
 void AliITS::HitsToFastRecPoints(Int_t evNumber,Int_t bgrev,Int_t size,
 Option_t *option,Option_t *opt,Text_t *filename)
@@ -1139,10 +1358,11 @@ Option_t *option,Option_t *opt,Text_t *filename)
    // the condition below will disappear when the geom class will be
    // initialised for all versions - for the moment it is only for v5 !  
    Int_t ver = this->IsVersion(); 
-   if(ver!=5) return; 
+   if(ver!=5 && ver!=8 && ver!=9) return;
 
-   char *all = strstr(opt,"All");
-   char *det[3] = {strstr(opt,"SPD"),strstr(opt,"SDD"),strstr(opt,"SSD")};
+
+   const char *all = strstr(opt,"All");
+   const char *det[3] ={strstr(opt,"SPD"),strstr(opt,"SDD"),strstr(opt,"SSD")};
 
    Int_t nmodules;
    InitModules(size,nmodules);
@@ -1151,7 +1371,7 @@ Option_t *option,Option_t *opt,Text_t *filename)
 
    AliITSsimulation* sim;
    AliITSgeom *geom = GetITSgeom();
-
+/* MI change 
    TRandom *random=new TRandom[9];
    random[0].SetSeed(111);
    random[1].SetSeed(222);
@@ -1162,23 +1382,31 @@ Option_t *option,Option_t *opt,Text_t *filename)
    random[6].SetSeed(777);
    random[7].SetSeed(888);
    random[8].SetSeed(999);             
-
+   */
 
    Int_t id,module;
-   for (id=0;id<fgkNTYPES;id++) {
+   for (id=0;id<kNTYPES;id++) {
         if (!all && !det[id]) continue;
        AliITSDetType *iDetType=DetType(id); 
        sim = (AliITSsimulation*)iDetType->GetSimulationModel();
        if (!sim) {
-           Error("HitsToFastPoints","The simulation class was not instantiated!");
+           Error("HitsToFastPoints",
+                "The simulation class was not instantiated!");
            exit(1);
           // or SetDefaultSimulation();
        }
-       Int_t first = geom->GetStartDet(id);
-       Int_t last = geom->GetLastDet(id);
+
+        Int_t first,last;
+        if(geom) {
+         first = geom->GetStartDet(id);
+         last = geom->GetLastDet(id);
+        } else first=last=0;
+        printf("first module - last module %d %d\n",first,last);
        for(module=first;module<=last;module++) {
            AliITSmodule *mod = (AliITSmodule *)fITSmodules->At(module);
-           sim->CreateFastRecPoints(mod,module,random);
+        // sim->CreateFastRecPoints(mod,module,random);
+        sim->CreateFastRecPoints(mod,module,gRandom); //MI change
+          
            gAlice->TreeR()->Fill(); 
            ResetRecPoints();
        } // loop over modules
@@ -1191,496 +1419,12 @@ Option_t *option,Option_t *opt,Text_t *filename)
 
    char hname[30];
    sprintf(hname,"TreeR%d",evNumber);
-   gAlice->TreeR()->Write(hname);
+   gAlice->TreeR()->Write(hname,TObject::kOverwrite);
    // reset tree
    gAlice->TreeR()->Reset();
 
-   delete [] random;
-
-}
-
+   //   delete [] random; //MI change 
 
-//____________________________________________________________________________
-void AliITS::Streamer(TBuffer &R__b){
-   // Stream an object of class AliITS.
-
-   Int_t i;
-
-   if (R__b.IsReading()) {
-      Version_t R__v = R__b.ReadVersion();
-      if (R__v) {
-         AliDetector::Streamer(R__b);
-         R__b >> fIdN;
-         R__b.ReadArray(fIdSens); 
-         if(fIdName!=0) delete[] fIdName;  // Array of TStrings
-         fIdName    = new TString[fIdN];
-         for(i=0;i<fIdN;i++) fIdName[i].Streamer(R__b);
-         R__b >> fITSgeom;
-         R__b >> fITSmodules;
-         R__b >> fEuclidOut;
-         R__b >> fMajorVersion;
-         R__b >> fMinorVersion;
-         R__b >> fDetTypes;
-         R__b >> fDtype;
-         delete []fNdtype; 
-         fNdtype = new Int_t[fgkNTYPES];
-         R__b.ReadFastArray(fNdtype,fgkNTYPES);
-         R__b >> fCtype;
-         delete []fNctype; 
-         fNctype = new Int_t[fgkNTYPES];
-         R__b.ReadFastArray(fNctype,fgkNTYPES);
-         R__b >> fRecPoints;
-         R__b >> fNRecPoints;
-         R__b >> fTreeC;
-      } // end if R__v
-   } else { // writing
-      R__b.WriteVersion(AliITS::IsA());
-      AliDetector::Streamer(R__b);
-      R__b << fIdN;
-      R__b.WriteArray(fIdSens,fIdN); 
-      for(i=0;i<fIdN;i++) fIdName[i].Streamer(R__b);
-      R__b << fITSgeom;
-      R__b << fITSmodules;
-      R__b << fEuclidOut;
-      R__b << fMajorVersion;
-      R__b << fMinorVersion;
-      R__b << fDetTypes;
-      R__b << fDtype;
-      R__b.WriteFastArray(fNdtype,fgkNTYPES);
-      R__b << fCtype;
-      R__b.WriteFastArray(fNctype,fgkNTYPES);
-      R__b << fRecPoints;
-      R__b << fNRecPoints;
-      R__b << fTreeC;
-   } // end if
-
-}
-
-//________________________________________________________________
-
-AliITStrack  AliITS::Tracking(AliITStrack &track, AliITStrack *reference,TObjArray *fastpoints, Int_t
-**vettid, Bool_t flagvert ) { 
-                                                                               
-//Origin  A. Badala' and G.S. Pappalardo:  e-mail Angela.Badala@ct.infn.it, Giuseppe.S.Pappalardo@ct.infn.it 
-
-                                                                                   
-  TList *list= new TList();   
-
-  AliITStrack tr(track);
-  
-  list->AddLast(&tr);
-  
-  Double_t Pt=(tr).GetPt();
-  //cout << "\n Pt = " << Pt <<"\n";
-
-  AliITStracking obj(list, reference, this, fastpoints,TMath::Abs(Pt),vettid, flagvert);
-  list->Delete();
-  delete list;
-
-  Int_t itot=-1;
-  TVector VecTotLabref(18);
-  Int_t lay, k;
-  for(lay=5; lay>=0; lay--) {
-    TVector VecLabref(3); 
-    VecLabref=(*reference).GetLabTrack(lay);
-    for(k=0; k<3; k++) {itot++; VecTotLabref(itot)=VecLabref(k);}    
-  }
-  Long_t labref;
-  Int_t freq;  
-  (*reference).Search(VecTotLabref, labref, freq);
-    
-  if(freq < 5) labref=-labref;         
-  (*reference).SetLabel(labref);
-
-  return *reference; 
 
 }
 
-
-
-//________________________________________________________________
-
-
-
-void AliITS::DoTracking(Int_t evNumber, Int_t min_t, Int_t max_t, TFile *file, Bool_t flagvert) {
-
-//   ex macro for tracking ITS
-
-  printf("begin DoTracking - file %p\n",file);
-
-  const char *pname="75x40_100x60";
-  
-  struct GoodTrack {
-    Int_t lab,code;
-    Float_t px,py,pz,x,y,z,pxg,pyg,pzg,ptg;
-    Bool_t flag;
-  };
-  
-
-  gAlice->GetEvent(0);
-
-  AliTPC *TPC=(AliTPC*)gAlice->GetDetector("TPC");
-  AliTPCParam *digp = (AliTPCParam*)file->Get(pname);
-  if (digp!=0) TPC->SetParam(digp);
-  
-  GoodTrack gt[7000];
-  Int_t ngood=0;
-  ifstream in("good_tracks");
-
-  cerr<<"Reading good tracks...\n";
-  while (in>>gt[ngood].lab>>gt[ngood].code
-         >>gt[ngood].px >>gt[ngood].py>>gt[ngood].pz
-         >>gt[ngood].x  >>gt[ngood].y >>gt[ngood].z
-         >>gt[ngood].pxg  >>gt[ngood].pyg >>gt[ngood].pzg
-         >>gt[ngood].ptg >>gt[ngood].flag) {
-    ngood++;
-    cerr<<ngood<<'\r';
-    if (ngood==7000) {
-      cerr<<"Too many good tracks !\n";
-      break;
-    }
-  }
-  if (!in.eof()) cerr<<"Read error (good_tracks) !\n";
-  
-  
-// Load tracks
-  TFile *tf=TFile::Open("tpctracks.root");
-  if (!tf->IsOpen()) {cerr<<"Can't open tpctracks.root !\n"; return ;}
-  TObjArray tracks(200000);
-  TTree *tracktree=(TTree*)tf->Get("TreeT");
-  TBranch *tbranch=tracktree->GetBranch("tracks");
-  Int_t nentr=(Int_t)tracktree->GetEntries();
-  Int_t kk;
-  for (kk=0; kk<nentr; kk++) {
-    AliTPCtrack *iotrack=new AliTPCtrack;
-    tbranch->SetAddress(&iotrack);
-    tracktree->GetEvent(kk);
-    tracks.AddLast(iotrack);
-  }   
-  tf->Close();
-
-
-  Int_t nt = tracks.GetEntriesFast();
-  cerr<<"Number of found tracks "<<nt<<endl;
-  
-  TVector DataOut(9);
-  Int_t kkk=0;
-  
-  Double_t ptg=0.,pxg=0.,pyg=0.,pzg=0.;
-
-  //////////////////////////////  good tracks definition in TPC  ////////////////////////////////
-      
-  ofstream out1 ("AliITSTrag.out");
-  Int_t i;
-  for (i=0; i<ngood; i++) out1 << gt[i].ptg << "\n";
-  out1.close();
-
-
-  TVector vec(5);
-  TTree *TR=gAlice->TreeR();
-  Int_t nent=(Int_t)TR->GetEntries();
-  TClonesArray  *recPoints = RecPoints();
-  Int_t numbpoints;
-  Int_t totalpoints=0;
-  Int_t *np = new Int_t[nent];
-  Int_t **vettid = new Int_t* [nent];
-  Int_t mod;
-  for (mod=0; mod<nent; mod++) {
-    vettid[mod]=0;
-    this->ResetRecPoints();
-    gAlice->TreeR()->GetEvent(mod+1); //first entry in TreeR is empty
-    numbpoints = recPoints->GetEntries();
-    totalpoints+=numbpoints;
-    np[mod] = numbpoints;
-  //cout<<" mod = "<<mod<<"   numbpoints = "<<numbpoints<<"\n"; getchar();
-    vettid[mod] = new Int_t[numbpoints];
-    Int_t ii;
-    for (ii=0;ii<numbpoints; ii++) *(vettid[mod]+ii)=0;
-  }
-
-  AliTPCtrack *track;
-
-     
-  if(min_t < 0) {min_t = 0; max_t = nt-1;}   
-
-/*
-  ///////////////////////////////// Definition of vertex end its error ////////////////////////////
-  ////////////////////////// In the future it will be given by a method ///////////////////////////
-  Double_t Vx=0.;
-  Double_t Vy=0.;
-  Double_t Vz=0.;
-  
-  Float_t sigmavx=0.0050;      // 50  microns
-  Float_t sigmavy=0.0050;      // 50  microns
-  Float_t sigmavz=0.010;       // 100 microns
-
-  //Vx+=gRandom->Gaus(0,sigmavx);  Vy+=gRandom->Gaus(0,sigmavy);  Vz+=gRandom->Gaus(0,sigmavz);
-  TVector vertex(3), ervertex(3)
-  vertex(0)=Vx; vertex(1)=Vy; vertex(2)=Vz;
-  ervertex(0)=sigmavx;  ervertex(1)=sigmavy;  ervertex(2)=sigmavz;
-  /////////////////////////////////////////////////////////////////////////////////////////////////
-*/      
-
-  //TDirectory *savedir=gDirectory; 
-
-  TTree tracktree1("TreeT","Tree with ITS tracks");
-  AliITSiotrack *iotrack=0;
-  tracktree1.Branch("ITStracks","AliITSiotrack",&iotrack,32000,0);
-
-  ofstream out ("AliITSTra.out");
-  
-  Int_t j;       
-  for (j=min_t; j<=max_t; j++) {     
-    track=(AliTPCtrack*)tracks.UncheckedAt(j);
-    Int_t flaglab=0;
-    if (!track) continue;
-    ////// elimination of not good tracks ////////////  
-    Int_t ilab=TMath::Abs(track->GetLabel());
-    Int_t iii;
-    for (iii=0;iii<ngood;iii++) {
-        //cout<<" ilab, gt[iii].lab = "<<ilab<<" "<<gt[iii].lab<<"\n"; getchar();
-      if (ilab==gt[iii].lab) { 
-       flaglab=1;
-       ptg=gt[iii].ptg; 
-       pxg=gt[iii].pxg;
-       pyg=gt[iii].pyg;
-       pzg=gt[iii].pzg;        
-       break;
-      }
-    }
-        //cout<<" j flaglab =  " <<j<<" "<<flaglab<<"\n";  getchar();
-    if (!flaglab) continue;
-        //cout<<" j =  " <<j<<"\n";  getchar();
-  /*           
-    ////// old propagation to the end of TPC //////////////       
-    Double_t xk=76.;
-    track->PropagateTo(xk);
-    xk-=0.11;
-    track->PropagateTo(xk,42.7,2.27); //C
-    xk-=2.6;
-    track->PropagateTo(xk,36.2,1.98e-3); //C02
-    xk-=0.051;
-    track->PropagateTo(xk,42.7,2.27); //C 
-    /////////////////////////////////////////////////// 
-        */
-                
-        ////// new propagation to the end of TPC //////////////
-    Double_t xk=77.415;
-    track->PropagateTo(xk, 28.94, 1.204e-3);    //Ne
-        xk -=0.01;
-    track->PropagateTo(xk, 44.77, 1.71);        //Tedlar
-        xk -=0.04;
-    track->PropagateTo(xk, 44.86, 1.45);        //Kevlar
-        xk -=2.0;
-    track->PropagateTo(xk, 41.28, 0.029);       //Nomex         
-    xk-=16;
-    track->PropagateTo(xk,36.2,1.98e-3); //C02
-        xk -=0.01;
-    track->PropagateTo(xk, 24.01, 2.7);         //Al    
-        xk -=0.01;
-    track->PropagateTo(xk, 44.77, 1.71);        //Tedlar
-        xk -=0.04;
-    track->PropagateTo(xk, 44.86, 1.45);        //Kevlar
-        xk -=0.5;
-    track->PropagateTo(xk, 41.28, 0.029);       //Nomex                                                 
-                    
-       ///////////////////////////////////////////////////////////////                          
-  
-   ///////////////////////////////////////////////////////////////
-    AliITStrack trackITS(*track);
-    AliITStrack result(*track);
-    AliITStrack primarytrack(*track); 
-    
-///////////////////////////////////////////////////////////////////////////////////////////////
-        TVector Vgeant(3);
-        Vgeant=result.GetVertex(); 
-                         
-  // Definition of Dv and Zv for vertex constraint     
-     Double_t sigmaDv=0.0050;  Double_t sigmaZv=0.010; 
-    //Double_t sigmaDv=0.0015;  Double_t sigmaZv=0.0015;                                 
-       Double_t uniform= gRandom->Uniform();
-       Double_t signdv;
-       if(uniform<=0.5) signdv=-1.;
-          else
-                signdv=1.;
-        
-       Double_t Vr=TMath::Sqrt(Vgeant(0)*Vgeant(0)+ Vgeant(1)*Vgeant(1));
-         Double_t Dv=gRandom->Gaus(signdv*Vr,(Float_t)sigmaDv); 
-    Double_t Zv=gRandom->Gaus(Vgeant(2),(Float_t)sigmaZv);
-                               
-  //cout<<" Dv e Zv = "<<Dv<<" "<<Zv<<"\n";                            
-    trackITS.SetDv(Dv);  trackITS.SetZv(Zv);
-    trackITS.SetsigmaDv(sigmaDv); trackITS.SetsigmaZv(sigmaZv); 
-    result.SetDv(Dv);  result.SetZv(Zv);
-    result.SetsigmaDv(sigmaDv); result.SetsigmaZv(sigmaZv);
-    primarytrack.SetDv(Dv);  primarytrack.SetZv(Zv);
-    primarytrack.SetsigmaDv(sigmaDv); primarytrack.SetsigmaZv(sigmaZv);                                                                
-
-/////////////////////////////////////////////////////////////////////////////////////////////////       
-               
-    primarytrack.PrimaryTrack();
-    TVector  d2=primarytrack.Getd2();
-    TVector  tgl2=primarytrack.Gettgl2();
-    TVector  dtgl=primarytrack.Getdtgl();
-    trackITS.Setd2(d2); trackITS.Settgl2(tgl2);  trackITS.Setdtgl(dtgl); 
-    result.Setd2(d2); result.Settgl2(tgl2);  result.Setdtgl(dtgl);        
-        /*                      
-    trackITS.SetVertex(vertex); trackITS.SetErrorVertex(ervertex);
-    result.SetVertex(vertex);   result.SetErrorVertex(ervertex);   
-    */                         
-    Tracking(trackITS,&result,recPoints,vettid, flagvert);  
-            
-     cout<<" progressive track number = "<<j<<"\r";
-   // cout<<j<<"\r";
-    //cout<<" progressive track number = "<<j<<"\n";
-    Long_t labITS=result.GetLabel();
-    //cout << " ITS track label = " << labITS << "\n";                     
-    int lab=track->GetLabel();             
-  //  cout << " TPC track label = " << lab <<"\n";
-    //result.GetClusters(); getchar();  //to print the cluster matrix
-        
-//propagation to vertex
-       
-    Double_t rbeam=3.;
-     
-    result.Propagation(rbeam);
-       
-    TMatrix *cov;
-        cov=&result.GetCMatrix();       
-    Double_t pt=TMath::Abs(result.GetPt());
-    Double_t Dr=result.GetD();
-    Double_t Z=result.GetZ();
-    Double_t tgl=result.GetTgl();
-    Double_t C=result.GetC();
-    Double_t Cy=C/2.;
-    Double_t Dz=Z-(tgl/Cy)*TMath::ASin(result.arga(rbeam));
-         Dz-=Vgeant(2);
-         
-        // cout<<" Dr e dz alla fine = "<<Dr<<" "<<Dz<<"\n"; getchar();
-    Double_t phi=result.Getphi();
-    Double_t phivertex = phi - TMath::ASin(result.argA(rbeam));
-    Double_t duepi=2.*TMath::Pi();      
-    if(phivertex>duepi) phivertex-=duepi;
-    if(phivertex<0.) phivertex+=duepi;
-    Double_t Dtot=TMath::Sqrt(Dr*Dr+Dz*Dz);
-        
-//////////////////////////////////////////////////////////////////////////////////////////     
-    Int_t NumofCluster, idmodule,idpoint;
-    NumofCluster=result.GetNumClust();
-    if(NumofCluster >=5)  {     
-
-
-      AliITSiotrack outtrack;
-
-      iotrack=&outtrack;
-
-      iotrack->SetStatePhi(phi);
-      iotrack->SetStateZ(Z);
-      iotrack->SetStateD(Dr);
-      iotrack->SetStateTgl(tgl);
-      iotrack->SetStateC(C);
-               Double_t radius=result.Getrtrack();
-               iotrack->SetRadius(radius);
-               Int_t charge;
-               if(C>0.) charge=-1;  else charge=1;
-               iotrack->SetCharge(charge);
-               
-               
-
-      iotrack->SetCovMatrix(cov);         
-
-      Double_t px=pt*TMath::Cos(phi);
-      Double_t py=pt*TMath::Sin(phi);
-      Double_t pz=pt*tgl;
-               
-      Double_t xtrack=Dr*TMath::Sin(phi);
-      Double_t ytrack=Dr*TMath::Cos(phi);
-      Double_t ztrack=Dz+Vgeant(2);
-
-
-      iotrack->SetPx(px);
-      iotrack->SetPy(py);
-      iotrack->SetPz(pz);
-      iotrack->SetX(xtrack);
-      iotrack->SetY(ytrack);
-      iotrack->SetZ(ztrack);
-      iotrack->SetLabel(labITS);
-               
-      Int_t il;                
-               for(il=0;il<6; il++){
-                 iotrack->SetIdPoint(il,result.GetIdPoint(il));
-                 iotrack->SetIdModule(il,result.GetIdModule(il));              
-               }
-      tracktree1.Fill();
-
-   //cout<<" labITS = "<<labITS<<"\n";
-       //cout<<" phi z Dr tgl C = "<<phi<<" "<<Z<<" "<<Dr<<" "<<tgl<<" "<<C<<"\n";  getchar();    
-
-     DataOut(kkk) = ptg; kkk++; DataOut(kkk)=labITS; kkk++; DataOut(kkk)=lab; kkk++;           
-
-      for (il=0;il<6;il++) {
-        idpoint=result.GetIdPoint(il);
-        idmodule=result.GetIdModule(il);
-       *(vettid[idmodule]+idpoint)=1; 
-       iotrack->SetIdPoint(il,idpoint);
-        iotrack->SetIdModule(il,idmodule);
-      }
-      
-    //  cout<<"  +++++++++++++  pt e ptg = "<<pt<<" "<<ptg<<"  ++++++++++\n";
-      Double_t difpt= (pt-ptg)/ptg*100.;                                       
-      DataOut(kkk)=difpt; kkk++;                                             
-      Double_t lambdag=TMath::ATan(pzg/ptg);
-      Double_t   lam=TMath::ATan(tgl);      
-      Double_t diflam = (lam - lambdag)*1000.;
-      DataOut(kkk) = diflam; kkk++;                                        
-      Double_t phig=TMath::ATan(pyg/pxg);
-      Double_t phi=phivertex;  
-      Double_t difphi = (phi - phig)*1000.;
-      DataOut(kkk)=difphi; kkk++;
-      DataOut(kkk)=Dtot*1.e4; kkk++;
-      DataOut(kkk)=Dr*1.e4; kkk++;
-      DataOut(kkk)=Dz*1.e4; kkk++;
-      Int_t r;
-      for (r=0; r<9; r++) { out<<DataOut(r)<<" ";}
-      out<<"\n";
-      kkk=0;  
-               
-           
-    } // end if on NumofCluster
-  //gObjectTable->Print();    // stampa memoria     
-  }  //  end for (int j=min_t; j<=max_t; j++)
-  
-  out.close();  
-  
-  static Bool_t first=kTRUE;
-  static TFile *tfile;
-
-       if(first) {
-           tfile=new TFile("itstracks.root","RECREATE");
-           //cout<<"I have opened itstracks.root file "<<endl;
-       }           
-       first=kFALSE;
-       tfile->cd();
-       tfile->ls();
-
-   char hname[30];
-   sprintf(hname,"TreeT%d",evNumber);
-
-  tracktree1.Write(hname);
-
-
-  
-           TTree *fAli=gAlice->TreeK();
-            TFile *fileAli=0;
-           
-           if (fAli) fileAli =fAli->GetCurrentFile();
-           fileAli->cd();
-     
-  ////////////////////////////////////////////////////////////////////////////////////////////////
-
-  printf("delete vectors\n");
-  if(np) delete [] np;
-  if(vettid) delete [] vettid;
-  
-}