]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ITS/AliITS.cxx
Move the initialization of the containers for raw clusters in MakeTreeC()
[u/mrichter/AliRoot.git] / ITS / AliITS.cxx
index 724350fe3b908ce56feca5d0f0f9413a5a3acc1c..5e2087b5ac5fba2844960eefacb3a339486618bc 100644 (file)
 
 /*
 $Log$
-Revision 1.14  2000/06/15 09:27:52  barbera
-Problems with the HP compiler fixed
+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.13  2000/06/13 15:32:44  nilsen
-fix compilation error on HP and DEC unix.
+Revision 1.31  2001/02/02 23:57:28  nilsen
+Added include file that are no londer included in AliITSgeom.h
 
-Revision 1.12  2000/06/12 23:43:16  nilsen
-New ITS code replacing the old structure and simulations code.
+Revision 1.30  2001/01/30 09:23:13  hristov
+Streamers removed (R.Brun)
 
-Revision 1.9.2.8  2000/06/12 18:05:59  barbera
-fixed posible compilation errors on HP unix
+Revision 1.29  2001/01/26 20:01:09  hristov
+Major upgrade of AliRoot code
 
-Revision 1.9.2.7  2000/06/11 20:20:18  barbera
-New AliITS base clase  for the new structure.
+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
+
+Revision 1.26  2000/11/27 13:12:13  barbera
+New version containing the files for tracking
+
+Revision 1.25  2000/11/12 22:38:05  barbera
+Added header file for the SPD Bari model
+
+Revision 1.24  2000/10/09 22:18:12  barbera
+Bug fixes from MAriana to le AliITStest.C run correctly
+
+Revision 1.23  2000/10/05 20:47:42  nilsen
+fixed dependencies of include files. Tryed but failed to get a root automaticly
+generates streamer function to work. Modified SetDefaults.
+
+Revision 1.9.2.15  2000/10/04 16:56:40  nilsen
+Needed to include stdlib.h
+
+=======
+Revision 1.22  2000/10/04 19:45:52  barbera
+Corrected by F. Carminati for v3.04
+
+Revision 1.21  2000/10/02 21:28:08  fca
+Removal of useless dependecies via forward declarations
+
+Revision 1.20  2000/10/02 16:31:39  barbera
+General code clean-up
+
+Revision 1.9.2.14  2000/10/02 15:43:51  barbera
+General code clean-up (e.g., printf -> cout)
+
+Revision 1.19  2000/09/22 12:13:25  nilsen
+Patches and updates for fixes to this and other routines.
+
+Revision 1.18  2000/07/12 05:32:20  fca
+Correcting several syntax problem with static members
+
+Revision 1.17  2000/07/10 16:07:18  fca
+Release version of ITS code
 
 Revision 1.9.2.3  2000/02/02 13:42:09  barbera
 fixed AliITS.cxx for new AliRun structure. Added ITS hits list to list of hits which will have their track numbers updated
@@ -96,30 +138,54 @@ 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>
+#include <TTree.h>
+#include <TString.h>
 
 
 
 #include "AliRun.h"
 #include "AliITS.h"
 #include "AliITSMap.h"
+#include "AliITSDetType.h"
 #include "AliITSClusterFinder.h"
-#include "AliITSsimulation.h"
-#include "AliITSsimulationFastPoints.h"
+//#include "AliITSsimulation.h"
+#include "AliITSsimulationSPD.h"
+#include "AliITSsimulationSDD.h"
+#include "AliITSsimulationSSD.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 "AliITStrack.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"
 
 
 ClassImp(AliITS)
@@ -135,15 +201,17 @@ AliITS::AliITS() : AliDetector() {
   // is also called.
   //
 
+
   fIshunt     = 0;
   fEuclidOut  = 0;
+
+  fNDetTypes = kNTYPES;
   fIdN        = 0;
   fIdName     = 0;
   fIdSens     = 0;
   fITSmodules = 0;
   //
   fDetTypes   = 0;
-  SetNDetTypes();
   //
   fDtype  = 0;
   fNdtype = 0;
@@ -151,6 +219,7 @@ AliITS::AliITS() : AliDetector() {
   fNctype = 0;
   fRecPoints = 0;
   fNRecPoints = 0;
+  fTreeC = 0;
   //
   fITSgeom=0;
 }
@@ -170,19 +239,23 @@ AliITS::AliITS(const char *name, const char *title):AliDetector(name,title){
   // description of these parameters and its constructor functions.
   //
 
+
   fHits       = new TClonesArray("AliITShit", 1560);
   gAlice->AddHitList(fHits);
 
-  SetNDetTypes();
+  fNDetTypes = kNTYPES;
+
+  fNdtype = new Int_t[kNTYPES];
+  fDtype = new TObjArray(kNTYPES);
+
+  fNctype = new Int_t[kNTYPES];
+  fCtype = new TObjArray(kNTYPES);
 
-  fNdtype = 0;
-  fDtype = 0;
-  fCtype  = 0;
-  fNctype = 0;
 
   fRecPoints = 0;
   fNRecPoints = 0;
 
+  fTreeC = 0;
 
   fITSmodules = 0; 
 
@@ -192,55 +265,42 @@ AliITS::AliITS(const char *name, const char *title):AliDetector(name,title){
   fIdName     = 0;
   fIdSens     = 0;
  
-  fDetTypes = new TObjArray(fNDetTypes);  
+  fDetTypes = new TObjArray(kNTYPES);  
 
   Int_t i;
-  for(i=0;i<fNDetTypes;i++) {
+  for(i=0;i<kNTYPES;i++) {
     (*fDetTypes)[i]=new AliITSDetType(); 
+    fNdtype[i]=0;
+    fNctype[i]=0;
    }
   //
 
-   fNdtype = new Int_t[fNDetTypes];
-   fDtype = new TObjArray(fNDetTypes);
-
-   fNctype = new Int_t[fNDetTypes];
-   fCtype = new TObjArray(fNDetTypes);
-
   SetMarkerColor(kRed);
 
   fITSgeom=0;
 }
 //___________________________________________________________________________
 AliITS::AliITS(AliITS &source){
+  // copy constructor
   if(this==&source) return;
-  printf("Error: You are not allowed to make a copy of the AliITS\n");
+  Error("AliITS::Copy constructor",
+       "You are not allowed to make a copy of the AliITS");
   exit(1);
 }
 //____________________________________________________________________________
 AliITS& AliITS::operator=(AliITS &source){
+  // assignment operator
   if(this==&source) return *this;
-  printf("Error: You are not allowed to make a copy of the AliITS\n");
+  Error("AliITS::operator=",
+       "You are not allowed to make a copy of the AliITS");
   exit(1);
+  return *this; //fake return
 }
 //____________________________________________________________________________
 void AliITS::ClearModules(){
   //clear the modules TObjArray
-  Int_t i;
 
-  if(fITSmodules!=0) {
-       Int_t indSPD = fITSgeom->GetModuleIndex(2,fITSgeom->GetNladders(2),
-                                               fITSgeom->GetNdetectors(2));
-       Int_t indSDD = fITSgeom->GetModuleIndex(4,fITSgeom->GetNladders(4),
-                                               fITSgeom->GetNdetectors(4));
-      for(i=0;i<fITSmodules->GetEntriesFast();i++){
-           if(i<indSPD)
-               delete (AliITSmodule *) fITSmodules->At(i);
-           else if(i<indSDD)
-               delete (AliITSmodule *) fITSmodules->At(i);
-           else
-               delete (AliITSmodule *) fITSmodules->At(i);
-      } // end for i
-  }// end if fITSmodules!=0
+  if(fITSmodules) fITSmodules->Delete();
 
 }
 //_____________________________________________________________________________
@@ -256,7 +316,8 @@ AliITS::~AliITS(){
   delete fHits;
   delete fDigits;
   delete fRecPoints;
-  if(fIdName!=0) delete[] fIdName;
+//  delete fIdName;        // TObjArray of TObjStrings
+  if(fIdName!=0) delete[] fIdName;  // Array of TStrings
   if(fIdSens!=0) delete[] fIdSens;
   if(fITSmodules!=0) {
       this->ClearModules();
@@ -264,19 +325,16 @@ AliITS::~AliITS(){
   }// end if fITSmodules!=0
 
   //
-  Int_t i;
   if(fDtype) {
-    for(i=0;i<fNDetTypes;i++) {
-      delete (*fDtype)[i];
-      fNdtype[i]=0;
-    }
+    fDtype->Delete();
+    delete fDtype;
   }
-
-  for(i=0;i<fNDetTypes;i++) {
-      delete (*fCtype)[i];
-      fNctype[i]=0;
+  delete [] fNdtype;
+  if (fCtype) {
+    fCtype->Delete();
+    delete fCtype;
   }
-
+  delete [] fNctype;
   //
 
   if (fDetTypes) {
@@ -285,7 +343,9 @@ AliITS::~AliITS(){
   }
 
   if (fTreeC) delete fTreeC;
-  
+
+  if (fITSgeom) delete fITSgeom;
+
 }
 
 //___________________________________________
@@ -296,7 +356,7 @@ AliITSDetType* AliITS::DetType(Int_t id)
 
 }
 //___________________________________________
-void AliITS::SetClasses(Int_t id, char* digit, char* cluster)
+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);
@@ -360,13 +420,11 @@ void AliITS::AddRealDigit(Int_t id, Int_t *digits)
 
 }
 //_____________________________________________________________________________
-void AliITS::AddDigit(Int_t id, AliITSdigit *d) 
+void AliITS::AddSimDigit(Int_t id, AliITSdigit *d) 
 {
 
   // add a simulated digit
 
-  // should have ctors of type AliITSdigitSDD(const AliITSdigitSDD &)
-
   TClonesArray &ldigits = *((TClonesArray*)(*fDtype)[id]);
 
   switch(id)
@@ -385,7 +443,7 @@ void AliITS::AddDigit(Int_t id, AliITSdigit *d)
 }
 
 //_____________________________________________________________________________
-void AliITS::AddDigit(Int_t id,Float_t phys,Int_t *digits,Int_t *tracks,Float_t *charges){
+void AliITS::AddSimDigit(Int_t id,Float_t phys,Int_t *digits,Int_t *tracks,Int_t *hits,Float_t *charges){
 
   // add a simulated digit to the list
 
@@ -393,13 +451,13 @@ void AliITS::AddDigit(Int_t id,Float_t phys,Int_t *digits,Int_t *tracks,Float_t
   switch(id)
   {
   case 0:
-     new(ldigits[fNdtype[id]++]) AliITSdigitSPD(digits,tracks);
+     new(ldigits[fNdtype[id]++]) AliITSdigitSPD(digits,tracks,hits);
      break;
   case 1:
-     new(ldigits[fNdtype[id]++]) AliITSdigitSDD(phys,digits,tracks,charges);
+     new(ldigits[fNdtype[id]++]) AliITSdigitSDD(phys,digits,tracks,hits,charges);
      break;
   case 2:
-     new(ldigits[fNdtype[id]++]) AliITSdigitSSD(digits,tracks);
+     new(ldigits[fNdtype[id]++]) AliITSdigitSSD(digits,tracks,hits);
      break;
   }
  
@@ -411,8 +469,6 @@ void AliITS::AddCluster(Int_t id, AliITSRawCluster *c)
 
   // add a cluster to the list
 
-  // should have ctors of type AliITSRawClusterSDD(const AliITSRawClusterSDD &)
-
   TClonesArray &lcl = *((TClonesArray*)(*fCtype)[id]);
 
   switch(id)
@@ -446,13 +502,13 @@ void AliITS::AddRecPoint(const AliITSRecPoint &r)
 void AliITS::ResetDigits()
 {
     //
-    // Reset number of digits and the digits array for thE ITS detector
+    // Reset number of digits and the digits array for the ITS detector
     //
 
     if (!fDtype) return;
 
     Int_t i;
-    for(i=0;i<fNDetTypes;i++ ) {
+    for (i=0;i<kNTYPES;i++ ) {
        if ((*fDtype)[i])    ((TClonesArray*)(*fDtype)[i])->Clear();
        if (fNdtype)  fNdtype[i]=0;
     }
@@ -464,10 +520,11 @@ void AliITS::ResetDigits(Int_t i)
     //
     // Reset number of digits and the digits array for this branch
     //
-       if ((*fDtype)[i])    ((TClonesArray*)(*fDtype)[i])->Clear();
-       if (fNdtype)  fNdtype[i]=0;
-
+  if ((*fDtype)[i])    ((TClonesArray*)(*fDtype)[i])->Clear();
+  if (fNdtype)  fNdtype[i]=0;
 }
+
+
 //____________________________________________
 void AliITS::ResetClusters()
 {
@@ -476,12 +533,13 @@ void AliITS::ResetClusters()
     //
 
     Int_t i;
-    for(i=0;i<fNDetTypes;i++ ) {
+    for (i=0;i<kNTYPES;i++ ) {
        if ((*fCtype)[i])    ((TClonesArray*)(*fCtype)[i])->Clear();
        if (fNctype)  fNctype[i]=0;
     }
 
 }
+
 //____________________________________________
 void AliITS::ResetClusters(Int_t i)
 {
@@ -500,8 +558,8 @@ void AliITS::ResetRecPoints()
     //
     // Reset number of rec points and the rec points array 
     //
-    fNRecPoints = 0;
     if (fRecPoints) fRecPoints->Clear();
+    fNRecPoints = 0;
 
 }
 
@@ -527,23 +585,13 @@ void AliITS::Init(){
   // and sets the default segmentation, response, digit and raw cluster classes
   // Therefore it should be called after a call to CreateGeometry.
   //
-
-
-  SetDefaults();
-
   Int_t i;
 
-  printf("\n");
-  for(i=0;i<35;i++) printf("*");
-  printf(" ITS_INIT ");
-  for(i=0;i<35;i++) printf("*");
-  printf("\n");
-  //
-  //
+//
+  SetDefaults();
+// Array of TStrings
   for(i=0;i<fIdN;i++) fIdSens[i] = gMC->VolId(fIdName[i]);
-  //
-  for(i=0;i<80;i++) printf("*");
-  printf("\n");
+//
 }
 
 //_____________________________________________________________________________
@@ -551,74 +599,112 @@ void AliITS::SetDefaults()
 {
   // sets the default segmentation, response, digit and raw cluster classes
 
+  printf("SetDefaults\n");
 
   AliITSDetType *iDetType;
 
+
   //SPD 
 
-  AliITSsegmentationSPD *seg0=new AliITSsegmentationSPD(fITSgeom);
-  AliITSresponseSPD *resp0=new AliITSresponseSPD();
   iDetType=DetType(0); 
-  if (!iDetType->GetSegmentationModel()) SetSegmentationModel(0,seg0); 
-  if (!iDetType->GetResponseModel()) SetResponseModel(0,resp0); 
+  if (!iDetType->GetSegmentationModel()) {
+    AliITSsegmentationSPD *seg0=new AliITSsegmentationSPD(fITSgeom);
+    SetSegmentationModel(0,seg0); 
+  }
+  if (!iDetType->GetResponseModel()) {
+     SetResponseModel(0,new AliITSresponseSPD()); 
+  }
   // set digit and raw cluster classes to be used
-  const char *kData=resp0->DataType();
-  if (strstr(kData,"real")) {
+  
+  const char *kData0=(iDetType->GetResponseModel())->DataType();
+  if (strstr(kData0,"real")) {
       iDetType->ClassNames("AliITSdigit","AliITSRawClusterSPD");
   } else iDetType->ClassNames("AliITSdigitSPD","AliITSRawClusterSPD");
 
   // SDD                                         //
-  AliITSresponseSDD *resp1=new AliITSresponseSDD();
-  AliITSsegmentationSDD *seg1=new AliITSsegmentationSDD(fITSgeom,resp1);
   iDetType=DetType(1); 
-  if (!iDetType->GetSegmentationModel()) SetSegmentationModel(1,seg1); 
-  if (!iDetType->GetResponseModel()) SetResponseModel(1,resp1); 
-  kData=resp1->DataType();
-  Option_t *opt=resp1->ZeroSuppOption();
-  if ((!strstr(opt,"2D")) && (!strstr(opt,"1D")) || strstr(kData,"real") ) {
+  if (!iDetType->GetResponseModel()) {
+    SetResponseModel(1,new AliITSresponseSDD()); 
+  }
+  AliITSresponse *resp1=iDetType->GetResponseModel();
+  if (!iDetType->GetSegmentationModel()) {
+    AliITSsegmentationSDD *seg1=new AliITSsegmentationSDD(fITSgeom,resp1);
+    SetSegmentationModel(1,seg1); 
+  }
+  const char *kData1=(iDetType->GetResponseModel())->DataType();
+  const char *kopt=iDetType->GetResponseModel()->ZeroSuppOption();
+  if ((!strstr(kopt,"2D")) && (!strstr(kopt,"1D")) || strstr(kData1,"real") ) {
       iDetType->ClassNames("AliITSdigit","AliITSRawClusterSDD");
   } else iDetType->ClassNames("AliITSdigitSDD","AliITSRawClusterSDD");
 
   // SSD
-  AliITSsegmentationSSD *seg2=new AliITSsegmentationSSD(fITSgeom);
-  AliITSresponseSSD *resp2=new AliITSresponseSSD();
   iDetType=DetType(2); 
-  if (!iDetType->GetSegmentationModel()) SetSegmentationModel(2,seg2); 
-  if (!iDetType->GetResponseModel()) SetResponseModel(2,resp2); 
-  kData=resp2->DataType();
-  if (strstr(kData,"real")) {
+  if (!iDetType->GetSegmentationModel()) {
+    AliITSsegmentationSSD *seg2=new AliITSsegmentationSSD(fITSgeom);
+    SetSegmentationModel(2,seg2); 
+  }
+  if (!iDetType->GetResponseModel()) {
+    SetResponseModel(2,new AliITSresponseSSD()); 
+  }
+  const char *kData2=(iDetType->GetResponseModel())->DataType();
+  if (strstr(kData2,"real")) {
       iDetType->ClassNames("AliITSdigit","AliITSRawClusterSSD");
   } else iDetType->ClassNames("AliITSdigitSSD","AliITSRawClusterSSD");
 
-  if (fNDetTypes>3) {
+  if (kNTYPES>3) {
     Warning("SetDefaults","Only the three basic detector types are initialised!");
   } 
 
 }
 
 
+
+//_____________________________________________________________________________
+void AliITS::SetDefaultSimulation()
+{
+  // to be written
+
+}
+//_____________________________________________________________________________
+void AliITS::SetDefaultClusterFinders()
+{
+  // to be written
+
+}
 //_____________________________________________________________________________
 
 void AliITS::MakeTreeC(Option_t *option)
 {
   // create a separate tree to store the clusters
 
+  cout << "AliITS::MakeTreeC" << endl;
+
      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<fNDetTypes ;i++) {
-        if (fNDetTypes==3) sprintf(branchname,"%sClusters%s",GetName(),det[i]);
+     for (i=0; i<kNTYPES ;i++) {
+       AliITSDetType *iDetType=DetType(i); 
+       iDetType->GetClassNames(digclass,clclass);
+       //printf("i, digclass, recclass %d %s %s\n",i,digclass,clclass); 
+       // clusters
+       (*fCtype)[i] = new TClonesArray(clclass,10000); 
+        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);
-          printf("Making Branch %s for Clusters of detector type %d\n",branchname,i+1);
+          cout << "Making Branch " << branchname;
+          cout << " for Clusters of detector type " << i+1 << endl;
        }       
      }
 
@@ -628,11 +714,13 @@ void AliITS::MakeTreeC(Option_t *option)
 void AliITS::GetTreeC(Int_t event)
 {
 
+  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) {
@@ -642,79 +730,86 @@ 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<fNDetTypes; i++) {
-           if (fNDetTypes==3) sprintf(branchname,"%sClusters%s",GetName(),det[i]);
-           else  sprintf(branchname,"%sClusters%d",GetName(),i+1);
-           if (fCtype) {
+       for (i=0; i<kNTYPES; 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);
                 if (branch) branch->SetAddress(&((*fCtype)[i]));
            }
        }
     } else {
-       printf("ERROR: cannot find Clusters Tree for event:%d\n",event);
+       Error("AliITS::GetTreeC",
+               "cannot find Clusters Tree for event:%d\n",event);
     }
 
 }
 //_____________________________________________________________________________
-void AliITS::MakeBranch(Option_t* option){
+void AliITS::MakeBranch(Option_t* option, 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);
 
+  char *cD = strstr(option,"D");
+  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 *kDigclass;
-   char *kClclass;
+   char digclass[40];
+   char clclass[40];
 
    Int_t i;
-   for(i=0; i<fNDetTypes ;i++) {
+   for (i=0; i<kNTYPES ;i++) {
        AliITSDetType *iDetType=DetType(i); 
-       iDetType->GetClassNames(kDigclass,kClclass);
-       //printf("i, digclass, recclass %d %s %s\n",i,kDigclass,kClclass); 
+       iDetType->GetClassNames(digclass,clclass);
+       //printf("i, digclass, recclass %d %s %s\n",i,digclass,clclass); 
        // digits
-       (*fDtype)[i] = new TClonesArray(kDigclass,100); 
-       fNdtype[i]=0;
+       (*fDtype)[i] = new TClonesArray(digclass,10000); 
        // clusters
-       (*fCtype)[i] = new TClonesArray(kClclass,100); 
-       fNctype[i]=0;
+       //(*fCtype)[i] = new TClonesArray(clclass,10000); 
    }
 
-
-  for(i=0; i<fNDetTypes ;i++) {
-      if (fNDetTypes==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);
-         printf("Making Branch %s for digits of type %d\n",branchname,i+1);
+   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()) {
+        gAlice->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",1000);
+  //
+    sprintf(branchname,"%sRecPoints",GetName());
+    fRecPoints=new TClonesArray("AliITSRecPoint",10000);
 
-  if (fRecPoints && gAlice->TreeR()) {
-    gAlice->TreeR()->Branch(branchname,&fRecPoints, buffersize);
-    printf("Making Branch %s for reconstructed space points\n",branchname);
+    if (fRecPoints && gAlice->TreeR()) {
+      gAlice->MakeBranchInTree(gAlice->TreeR(), 
+                               branchname, &fRecPoints, buffersize, file) ;
+      cout << "Making Branch " << branchname;
+      cout << " for reconstructed space points" << endl;
+    }
   }    
-
-
 }
 
 //___________________________________________
@@ -726,7 +821,7 @@ void AliITS::SetTreeAddress()
   char branchname[30];
   AliDetector::SetTreeAddress();
 
-  char *det[3] = {"SPD","SDD","SSD"};
+  const char *det[3] = {"SPD","SDD","SSD"};
 
   TBranch *branch;
   TTree *treeD = gAlice->TreeD();
@@ -734,8 +829,8 @@ void AliITS::SetTreeAddress()
 
   Int_t i;
   if (treeD) {
-      for(i=0; i<fNDetTypes; i++) {
-         if (fNDetTypes==3) sprintf(branchname,"%sDigits%s",GetName(),det[i]);
+      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) {
              branch = treeD->GetBranch(branchname);
@@ -761,12 +856,17 @@ void AliITS::InitModules(Int_t size,Int_t &nmodules){
 
   //initialize the modules array
 
+  if(fITSmodules){ 
+      fITSmodules->Delete();
+      delete fITSmodules;
+  }
+
     Int_t nl,indexMAX,index;
-    Int_t indSPD,indSDD;
 
     if(size<=0){ // default to using data stored in AliITSgeom
        if(fITSgeom==0) {
-           printf("Error in AliITS::InitModule fITSgeom not defined\n");
+           Error("AliITS::InitModules",
+               "in AliITS::InitModule fITSgeom not defined\n");
            return;
        } // end if fITSgeom==0
        nl = fITSgeom->GetNlayers();
@@ -774,39 +874,35 @@ void AliITS::InitModules(Int_t size,Int_t &nmodules){
                                            fITSgeom->GetNdetectors(nl))+1;
        nmodules = indexMAX;
        fITSmodules = new TObjArray(indexMAX);
-       indSPD = fITSgeom->GetModuleIndex(2,fITSgeom->GetNladders(2),
-                                           fITSgeom->GetNdetectors(2));
-       indSDD = fITSgeom->GetModuleIndex(4,fITSgeom->GetNladders(4),
-                                           fITSgeom->GetNdetectors(4));
        for(index=0;index<indexMAX;index++){
-           if(index<=indSPD)
                fITSmodules->AddAt( new AliITSmodule(index),index);
-           else if(index<=indSDD)
-               fITSmodules->AddAt( new AliITSmodule(index),index);
-           else
-               fITSmodules->AddAt( new AliITSmodule(index),index);
        } // end for index
     }else{
        fITSmodules = new TObjArray(size);
+       for(index=0;index<size;index++) {
+           fITSmodules->AddAt( new AliITSmodule(index),index);
+       }
+
         nmodules = size;
     } // end i size<=0
 }
 
 //____________________________________________________________________________
-void AliITS::FillModules(Int_t evnt,Int_t bgrev,Int_t lastev,Int_t nmodules,Option_t *option,Text_t *filename){
+void AliITS::FillModules(Int_t evnt,Int_t bgrev,Int_t nmodules,Option_t *option,Text_t *filename){
 
   // fill the modules with the sorted by module hits; add hits from background
   // if option=Add
 
+
     static TTree *trH1;                 //Tree with background hits
     static TClonesArray *fHits2;        //List of hits for one track only
 
     static Bool_t first=kTRUE;
     static TFile *file;
-    char *add = strstr(option,"Add");
+    char *addBgr = strstr(option,"Add");
 
 
-    if (add ) {
+    if (addBgr ) {
        if(first) {
            cout<<"filename "<<filename<<endl;
            file=new TFile(filename);
@@ -827,7 +923,8 @@ void AliITS::FillModules(Int_t evnt,Int_t bgrev,Int_t lastev,Int_t nmodules,Opti
         //printf("TrH1 %p of treename %s for event %d \n",trH1,treeName,bgrev);
        
        if (!trH1) {
-           printf("ERROR: cannot find Hits Tree for event:%d\n",bgrev);
+           Error("AliITS::FillModules",
+           "cannot find Hits Tree for event:%d\n",bgrev);
        }
        // Set branch addresses
        TBranch *branch;
@@ -843,20 +940,8 @@ void AliITS::FillModules(Int_t evnt,Int_t bgrev,Int_t lastev,Int_t nmodules,Opti
        //printf("background - ntracks1 - %d\n",ntracks1);
    }
 
-    // store temporarily coordinates of signal particles - see where delete
-    static Int_t *signal;
-    Int_t i;
-    if(!signal) signal=new Int_t[nmodules];
-    memset(signal,0,sizeof(int)*nmodules);
-//    Float_t xhit[nmodules][4];
-    Float_t **xhit = new Float_t*[nmodules];
-    for(i=0;i<nmodules;i++) xhit[i] = new Float_t[4];
-//    Float_t yhit[nmodules][4];
-    Float_t **yhit = new Float_t*[nmodules];
-    for(i=0;i<nmodules;i++) yhit[i] = new Float_t[4];
-
-    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;
@@ -870,42 +955,30 @@ void AliITS::FillModules(Int_t evnt,Int_t bgrev,Int_t lastev,Int_t nmodules,Opti
        gAlice->ResetHits();
        iTH->GetEvent(t);
        Int_t nhits = itsHits->GetEntriesFast();
+       //printf("nhits %d\n",nhits);
         if (!nhits) continue;
-               // cout << nhits << " hits in track " << t << endl;
        for(h=0; h<nhits; h++){
            itsHit = (AliITShit *)itsHits->UncheckedAt(h);
            itsHit->GetDetectorID(lay,lad,det);
-           index = fITSgeom->GetModuleIndex(lay,lad,det);
+           // temporarily index=det-1 !!!
+           if(fITSgeom) index = fITSgeom->GetModuleIndex(lay,lad,det);
+           else index=det-1;
+           //
            mod = this->GetModule(index);
-           if (add) {
-               xhit[index][signal[index]]=itsHit->fX;
-               yhit[index][signal[index]]=itsHit->fY;
-               signal[index]++;
-                if (signal[index] >4) 
-                      printf("index,nsignal %d %d\n",index,signal[index]);
-           }
-           if(lay == 1 || lay == 2)
-               mod->AddHit((AliITShit *) itsHit,t,h);
-           else if(lay == 3 || lay == 4)
-                   mod->AddHit((AliITShit *) itsHit,t,h);
-           else if(lay == 5 || lay ==6)
-               mod->AddHit((AliITShit *)itsHit,t,h);
-           else
-               mod->AddHit(itsHit,t,h);
-
+           mod->AddHit(itsHit,t,h);
        } // end loop over hits 
     } // end loop over tracks
 
     // open the file with background
     
-    if (add ) {
-          Int_t track,i,isig;
+    if (addBgr ) {
+          Int_t track,i;
           ntracks =(Int_t)trH1->GetEntries();
            //printf("background - ntracks1 %d\n",ntracks);
            //printf("background - Start loop over tracks \n");     
             //   Loop over tracks
 
-           for(track=0; track<ntracks; track++) {
+           for (track=0; track<ntracks; track++) {
 
                if (fHits2)       fHits2->Clear();
                trH1->GetEvent(track);
@@ -914,31 +987,12 @@ void AliITS::FillModules(Int_t evnt,Int_t bgrev,Int_t lastev,Int_t nmodules,Opti
 
                    itsHit=(AliITShit*) (*fHits2)[i];
                    itsHit->GetDetectorID(lay,lad,det);
-                   index = fITSgeom->GetModuleIndex(lay,lad,det);
+                   // temporarily index=det-1 !!!
+                   if(fITSgeom) index = fITSgeom->GetModuleIndex(lay,lad,det);
+                   else index=det-1;
+                   //
                    mod = this->GetModule(index);
-
-                    Float_t xbgr=itsHit->fX;
-                   Float_t ybgr=itsHit->fY;
-                   Float_t ebgr=itsHit->GetIonization();
-                   Bool_t cond=kFALSE;
-                   
-                   for(isig =0; isig < signal[index]; isig++) {
-                       Float_t dist= 
-                            (xbgr-xhit[index][isig])*(xbgr-xhit[index][isig])
-                           +(ybgr-yhit[index][isig])*(ybgr-yhit[index][isig]);
-                       if (dist<0.2&& ebgr!=0) cond=kTRUE; // check this number for ITS!
-                   }
-                   if (!cond) continue;
-                   if(lay == 1 || lay == 2)
-                      mod->AddHit((AliITShit *) itsHit,track,i);
-                   else if(lay == 3 || lay == 4)
-                           mod->AddHit((AliITShit *) itsHit,track,i);
-                   else if(lay == 5 || lay ==6)
-                           mod->AddHit((AliITShit *)itsHit,track,i);
-                   else
-                      mod->AddHit(itsHit,track,i);
-
-
+                   mod->AddHit(itsHit,track,i);
               }  // end loop over hits
            } // end loop over tracks
 
@@ -946,60 +1000,136 @@ void AliITS::FillModules(Int_t evnt,Int_t bgrev,Int_t lastev,Int_t nmodules,Opti
             TFile *fileAli=0;
            
            if (fAli) fileAli =fAli->GetCurrentFile();
-            //printf("fAli, file %p %p\n",fAli,file);
-           file->cd();
+           fileAli->cd();
 
     } // end if add
 
+    //gObjectTable->Print();
 
-    for(i=0;i<nmodules;i++) delete[] xhit[i];
-    delete[] xhit;
-    for(i=0;i<nmodules;i++) delete[] yhit[i];
-    delete[] yhit;
-    //if (evnt==lastev) {delete [] signal; delete signal;}
+}
 
-    //gObjectTable->Print();
+//____________________________________________________________________________
+
+void AliITS::SDigits2Digits()
+{
+  
+  AliITSgeom *geom = GetITSgeom();
+  
+  // SPD
+  AliITSDetType *iDetType;
+  iDetType=DetType(0);
+  AliITSsegmentationSPD *seg0=(AliITSsegmentationSPD*)iDetType->GetSegmentationModel();
+  AliITSresponseSPD *res0 = (AliITSresponseSPD*)iDetType->GetResponseModel();
+  AliITSsimulationSPD *sim0=new AliITSsimulationSPD(seg0,res0);
+  SetSimulationModel(0,sim0);
+  // test
+  // printf("SPD dimensions %f %f \n",seg0->Dx(),seg0->Dz());
+  // printf("SPD npixels %d %d \n",seg0->Npz(),seg0->Npx());
+  // printf("SPD pitches %d %d \n",seg0->Dpz(0),seg0->Dpx(0));
+  // end test
+  // 
+  // SDD
+  //Set response functions
+  Float_t baseline = 10.;
+  Float_t noise = 1.75;
+  
+  // SDD compression param: 2 fDecrease, 2fTmin, 2fTmax or disable, 2 fTolerance
 
+  iDetType=DetType(1);
+  AliITSresponseSDD *res1 = (AliITSresponseSDD*)iDetType->GetResponseModel();
+  if (!res1) {
+    res1=new AliITSresponseSDD();
+    SetResponseModel(1,res1);
+  }
+   res1->SetMagicValue(900.);
+   Float_t maxadc = res1->MaxAdc();    
+   Float_t topValue = res1->MagicValue();
+   Float_t norm = maxadc/topValue;
+
+   Float_t fCutAmp = baseline + 2.*noise;
+   fCutAmp *= norm;
+   Int_t cp[8]={0,0,(int)fCutAmp,(int)fCutAmp,0,0,0,0}; //1D
+
+  //res1->SetZeroSupp("2D");
+  res1->SetZeroSupp("1D");
+  res1->SetNoiseParam(noise,baseline);
+  res1->SetDo10to8(kTRUE);
+  res1->SetCompressParam(cp);
+  res1->SetMinVal(4);
+  res1->SetDiffCoeff(3.6,40.);
+  //res1->SetMagicValue(96.95);
+  AliITSsegmentationSDD *seg1=(AliITSsegmentationSDD*)iDetType->GetSegmentationModel();
+  if (!seg1) {
+    seg1 = new AliITSsegmentationSDD(geom,res1);
+    SetSegmentationModel(1,seg1);
+  }
+  AliITSsimulationSDD *sim1=new AliITSsimulationSDD(seg1,res1);
+  sim1->SetDoFFT(1);
+  sim1->SetCheckNoise(kFALSE);
+  SetSimulationModel(1,sim1);
+
+  // SSD
+  iDetType=DetType(2);
+  AliITSsegmentationSSD *seg2=(AliITSsegmentationSSD*)iDetType->GetSegmentationModel();
+  AliITSresponseSSD *res2 = (AliITSresponseSSD*)iDetType->GetResponseModel();
+  res2->SetSigmaSpread(3.,2.);
+  AliITSsimulationSSD *sim2=new AliITSsimulationSSD(seg2,res2);
+  SetSimulationModel(2,sim2);
+  cerr<<"Digitizing ITS...\n";
+  TStopwatch timer;
+  timer.Start();
+  HitsToDigits(0,0,-1," ","All"," ");
+  timer.Stop(); timer.Print();
+
+  delete sim0;
+  delete sim1;
+  delete sim2;
 }
 
 
 //____________________________________________________________________________
-void AliITS::HitsToDigits(Int_t evNumber,Int_t bgrev,Int_t lastev,Int_t size,
-Option_t *option,Option_t *opt,Text_t *filename)
+void AliITS::HitsToDigits(Int_t evNumber,Int_t bgrev,Int_t size, Option_t *option, Option_t *opt,Text_t *filename)
 {
     // keep galice.root for signal and name differently the file for 
     // background when add! otherwise the track info for signal will be lost !
   
+   // the condition below will disappear when the geom class will be
+   // 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; 
+
    char *all = strstr(opt,"All");
    char *det[3] = {strstr(opt,"SPD"),strstr(opt,"SDD"),strstr(opt,"SSD")};
-   //printf("Det 1 2 3 %s %s %s \n",det[0],det[1],det[2]);
 
    Int_t nmodules;
    InitModules(size,nmodules); 
-   FillModules(evNumber,bgrev,lastev,nmodules,option,filename);
-   //printf("nmodules %d\n",nmodules);
+   FillModules(evNumber,bgrev,nmodules,option,filename);
 
-   TBranch *branch;
+   //TBranch *branch;
    AliITSsimulation* sim;
-
-   TObjArray *branches=gAlice->TreeD()->GetListOfBranches();
+   //TObjArray *branches=gAlice->TreeD()->GetListOfBranches();
    AliITSgeom *geom = GetITSgeom();
 
    Int_t id,module;
-   for(id=0;id<3;id++) {
-        //printf("id %d All %s  det[id] %s \n",id,all,det[id]);
+   Int_t first,last;
+   for (id=0;id<kNTYPES;id++) {
         if (!all && !det[id]) continue;
-       branch = (TBranch*)branches->UncheckedAt(id);
+       //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(id,iDetType*);
+          // or SetDefaultSimulation();
        }
-       Int_t first = geom->GetStartDet(id);
-       Int_t last = geom->GetLastDet(id);
-       //printf("det type %d first, last %d %d \n",id,first,last);
+       if(geom) {
+         first = geom->GetStartDet(id);
+         last = geom->GetLastDet(id);
+       } else first=last=0;
+       cout << "det type " << id << " first, last "<< first << last << endl;
        for(module=first;module<=last;module++) {
            AliITSmodule *mod = (AliITSmodule *)fITSmodules->At(module);
            sim->DigitiseModule(mod,module,evNumber);
@@ -1012,14 +1142,14 @@ Option_t *option,Option_t *opt,Text_t *filename)
        } // loop over modules
    } // loop over detector types
 
-
    ClearModules();
 
-   //Int_t nentries=(Int_t)gAlice->TreeD()->GetEntries();
+   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();
 
@@ -1029,41 +1159,52 @@ Option_t *option,Option_t *opt,Text_t *filename)
 //____________________________________________________________________________
 void AliITS::DigitsToRecPoints(Int_t evNumber,Int_t lastentry,Option_t *opt)
 {
+  // cluster finding and reconstruction of space points
   
+   // the condition below will disappear when the geom class will be
+   // 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; 
+
    char *all = strstr(opt,"All");
    char *det[3] = {strstr(opt,"SPD"),strstr(opt,"SDD"),strstr(opt,"SSD")};
 
    static Bool_t first=kTRUE;
-   if (first) {
+   if (!TreeC() && first) {
        MakeTreeC("C");
        first=kFALSE;
    }
-   TTree *iTC=TreeC();
+
+   TTree *treeC=TreeC();
  
-   TBranch *branch;
+
+   //TBranch *branch;
    AliITSClusterFinder* rec;
 
-   TObjArray *branches=gAlice->TreeR()->GetListOfBranches();
+   //TObjArray *branches=gAlice->TreeR()->GetListOfBranches();
    AliITSgeom *geom = GetITSgeom();
 
    Int_t id,module;
-   for(id=0;id<fNDetTypes;id++) {
+   for (id=0;id<kNTYPES;id++) {
         if (!all && !det[id]) continue;
-       branch = (TBranch*)branches->UncheckedAt(id);
+       //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 SetDefaultClusterFinder(id,iDetType*);
+          // or SetDefaultClusterFinders();
        }
         TClonesArray *itsDigits  = this->DigitsAddress(id);
 
-       Int_t first = geom->GetStartDet(id);
-       Int_t last = geom->GetLastDet(id);
-       //printf("det type %d first, last %d %d \n",id,first,last);
+        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);
        for(module=first;module<=last;module++) {
-             //printf("AliITS: module=%d\n",module);
               this->ResetDigits();
               if (all) gAlice->TreeD()->GetEvent(lastentry+module);
              else gAlice->TreeD()->GetEvent(lastentry+(module-first));
@@ -1071,7 +1212,7 @@ void AliITS::DigitsToRecPoints(Int_t evNumber,Int_t lastentry,Option_t *opt)
              if (ndigits) rec->FindRawClusters();
              gAlice->TreeR()->Fill(); 
              ResetRecPoints();
-             iTC->Fill();
+             treeC->Fill();
               ResetClusters();
              // try and fill only the branch 
              //branch->Fill();
@@ -1080,50 +1221,73 @@ 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)TC->GetEntries();
+   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 lastev,Int_t size,
+void AliITS::HitsToFastRecPoints(Int_t evNumber,Int_t bgrev,Int_t size,
 Option_t *option,Option_t *opt,Text_t *filename)
 {
     // keep galice.root for signal and name differently the file for 
     // background when add! otherwise the track info for signal will be lost !
   
+
+   // 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; 
+
    char *all = strstr(opt,"All");
    char *det[3] = {strstr(opt,"SPD"),strstr(opt,"SDD"),strstr(opt,"SSD")};
 
    Int_t nmodules;
-   InitModules(size,nmodules); 
-   FillModules(evNumber,bgrev,lastev,nmodules,option,filename);
-
-   static AliITSsimulationFastPoints* sim=0;
-   if (!sim) sim = new AliITSsimulationFastPoints(); 
+   InitModules(size,nmodules);
+   FillModules(evNumber,bgrev,nmodules,option,filename);
 
 
+   AliITSsimulation* sim;
    AliITSgeom *geom = GetITSgeom();
 
+   TRandom *random=new TRandom[9];
+   random[0].SetSeed(111);
+   random[1].SetSeed(222);
+   random[2].SetSeed(333);             
+   random[3].SetSeed(444);
+   random[4].SetSeed(555);
+   random[5].SetSeed(666);             
+   random[6].SetSeed(777);
+   random[7].SetSeed(888);
+   random[8].SetSeed(999);             
+
+
    Int_t id,module;
-   for(id=0;id<3;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!");
+           exit(1);
+          // or SetDefaultSimulation();
+       }
        Int_t first = geom->GetStartDet(id);
        Int_t last = geom->GetLastDet(id);
        for(module=first;module<=last;module++) {
            AliITSmodule *mod = (AliITSmodule *)fITSmodules->At(module);
-           sim->CreateFastRecPoints(mod);
+           sim->CreateFastRecPoints(mod,module,random);
            gAlice->TreeR()->Fill(); 
            ResetRecPoints();
        } // loop over modules
@@ -1136,85 +1300,439 @@ 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;
+
 }
 
-//______________________________________________________________________________
-void AliITS::Streamer(TBuffer &R__b)
-{
-   // Stream an object of class AliITS.
-
-  Int_t i, j, l;
-
-   if (R__b.IsReading()) {
-      Version_t R__v = R__b.ReadVersion(); if (R__v) { }
-      AliDetector::Streamer(R__b);
-      R__b >> fITSgeom;
-      R__b >> fITSmodules;
-      R__b >> fEuclidOut;
-      R__b >> fIdN;
-      delete []fIdSens; 
-      fIdSens = new Int_t[fIdN]; 
-      R__b.ReadFastArray(fIdSens,fIdN); 
-      for(i=0;i<fIdN;i++){
-       R__b >> l;
-       fIdName[i] = new char[l+1]; // add room for null character.
-       for(j=0;j<l;j++) R__b >> fIdName[i][j];
-       fIdName[i][l] = '\0'; // Null terminate this string.
-      } // end for i
-      //R__b.ReadArray(fIdName);
-      R__b >> fMajorVersion;
-      R__b >> fMinorVersion;
-      R__b >> fDetTypes;
-      R__b >> fNDetTypes;
-      R__b >> fDtype;
-      delete []fNdtype; 
-      fNdtype = new Int_t[fNDetTypes]; 
-      R__b.ReadFastArray(fNdtype,fNDetTypes); 
-      R__b >> fCtype;
-      delete []fNctype; 
-      fNctype = new Int_t[fNDetTypes]; 
-      R__b.ReadFastArray(fNctype,fNDetTypes); 
-      fRecPoints->Streamer(R__b);
-      R__b >> fNRecPoints;
-      fTracks->Streamer(R__b);
-      R__b >> fTreeC;
-   } else {
-      R__b.WriteVersion(AliITS::IsA());
-      AliDetector::Streamer(R__b);
-      R__b << fITSgeom;
-      R__b << fITSmodules;
-      R__b << fEuclidOut;
-      R__b << fIdN;
-      R__b.WriteFastArray(fIdSens,fIdN); 
-      for(i=0;i<fIdN;i++){
-         l = strlen(fIdName[i]);
-         R__b << l;
-         for(j=0;j<l;j++) R__b << fIdName[i][j];
-      } // end for i
-      //R__b.WriteArray(fIdName, __COUNTER__);
-      R__b << fMajorVersion;
-      R__b << fMinorVersion;
-      R__b << fDetTypes;
-      R__b << fNDetTypes;
-      R__b << fDtype;
-      R__b.WriteFastArray(fNdtype,fNDetTypes); 
-      R__b << fCtype;
-      R__b.WriteFastArray(fNctype,fNDetTypes); 
-      R__b << fRecPoints;
-      // fRecPoints->Streamer(R__b);
-      R__b << fNRecPoints;
-      R__b << fTracks;
-      //      fTracks->Streamer(R__b);
-      R__b << fTreeC;
-   }
+//________________________________________________________________
+
+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; 
+
 }
 
-ClassImp(AliITSRecPoint)
-ClassImp(AliITSsegmentation)
-ClassImp(AliITSresponse)       
-//ClassImp(AliITStrack)
 
+
+//________________________________________________________________
+
+
+
+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;
+  
+}