X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSreconstruction.cxx;h=6ba1d3e00de12d0e85a88b4b4ed0488e6d73728f;hb=b5a9f753d92077cec01150463deccec04904304a;hp=15d833aa99a07cade2cbbee84fdef63017d425f0;hpb=60b9526b17b122ac6fa693b3d8829dd111f7576c;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSreconstruction.cxx b/ITS/AliITSreconstruction.cxx
index 15d833aa99a..6ba1d3e00de 100644
--- a/ITS/AliITSreconstruction.cxx
+++ b/ITS/AliITSreconstruction.cxx
@@ -161,23 +161,20 @@ Bool_t AliITSreconstruction::Init(){
     //fRunLoader->CdGAFile();
     fITSgeom = fLoader->GetITSgeom();
 
-    fDetTypeRec = new AliITSDetTypeRec(fLoader);
+    fDetTypeRec = new AliITSDetTypeRec();
+    fDetTypeRec->SetITSgeom(fITSgeom);
     fDetTypeRec->SetDefaults();
     fDet[0] = fDet[1] = fDet[2] = kTRUE;
     fEnt0 = 0;
 
-    //fEnt  = gAlice->GetEventsPerRun();
     fEnt = Int_t(fRunLoader->GetNumberOfEvents());
 
     fLoader->LoadDigits("read");
     fLoader->LoadRecPoints("recreate");
-    fLoader->LoadRawClusters("recreate");
     if (fLoader->TreeR() == 0x0) fLoader->MakeTree("R");
-    if (fLoader->TreeC() == 0x0) fLoader->MakeTree("C");
  
-    fDetTypeRec->MakeBranchR(0);
-    fDetTypeRec->MakeBranchC();
-    fDetTypeRec->SetTreeAddress();
+    fDetTypeRec->SetTreeAddressD(fLoader->TreeD());
+    fDetTypeRec->MakeBranchR(fLoader->TreeR());
     fDetTypeRec->SetTreeAddressR(fLoader->TreeR());
 
     fInit = InitRec();
@@ -195,51 +192,11 @@ Bool_t AliITSreconstruction::InitRec(){
     //      none.
     // Return:
     //      none.
-  /*
-  //AliITSDetType *idt;
-  fDetTypeRec->SetLoader(fLoader);
-    // SPD
-  if(fDet[kSPD]){
-    Info("InitRec","SPD");
-    //idt = fITS->DetType(kSPD);
-    AliITSsegmentationSPD *segSPD = (AliITSsegmentationSPD*)fDetTypeRec->GetSegmentationModel(0);
-      TClonesArray *digSPD = fDetTypeRec->DigitsAddress(kSPD);
-      TClonesArray *recpSPD = fDetTypeRec->ClustersAddress(kSPD);
-      Info("InitRec","idt = %#x; digSPD = %#x; recpSPD = %#x",fDetTypeRec,digSPD,recpSPD);
-      AliITSClusterFinderSPD *recSPD = new AliITSClusterFinderSPD(segSPD,digSPD,recpSPD);
-      fDetTypeRec->SetReconstructionModel(kSPD,recSPD);
-    } // end if fDet[kSPD].
-  // SDD
-  if(fDet[kSDD]){
-    Info("InitRec","SDD");
-    //    idt = fITS->DetType(kSDD);
-    AliITSsegmentationSDD *segSDD = (AliITSsegmentationSDD*)
-      fDetTypeRec->GetSegmentationModel(1);
-    AliITSresponseSDD *resSDD = (AliITSresponseSDD*)
-      fDetTypeRec->GetCalibrationModel(fDetTypeRec->GetITSgeom()->GetStartSDD()); 
-    TClonesArray *digSDD = fDetTypeRec->DigitsAddress(kSDD);
-    TClonesArray *recpSDD = fDetTypeRec->ClustersAddress(kSDD);
-    AliITSClusterFinderSDD *recSDD =new AliITSClusterFinderSDD(segSDD,
-							       resSDD,
-							       digSDD,recpSDD);
-    fDetTypeRec->SetReconstructionModel(kSDD,recSDD);
-  } // end if fDet[kSDD]
-    // SSD
-  if(fDet[kSSD]){
-    Info("InitRec","SSD");
-    //idt = fITS->DetType(kSSD);
-    AliITSsegmentationSSD *segSSD = (AliITSsegmentationSSD*)
-                                       fDetTypeRec->GetSegmentationModel(2);
-      TClonesArray *digSSD = fDetTypeRec->DigitsAddress(kSSD);
-      AliITSClusterFinderSSD *recSSD =new AliITSClusterFinderSSD(segSSD,
-								 digSSD);
-      recSSD->SetITSgeom(fDetTypeRec->GetITSgeom());
-      fDetTypeRec->SetReconstructionModel(kSSD,recSSD);
-    } // end if fDet[kSSD]
-  */
-  fDetTypeRec->SetDefaultClusterFinders();
-    Info("InitRec","    Done\n");
-    return kTRUE;
+
+
+  fDetTypeRec->SetDefaultClusterFindersV2();
+  Info("InitRec","    Done\n");
+  return kTRUE;
 }
 //______________________________________________________________________ 
 void AliITSreconstruction::Exec(const Option_t *opt){
@@ -278,13 +235,9 @@ void AliITSreconstruction::Exec(const Option_t *opt){
       fRunLoader->GetEvent(evnt);
       if (fLoader->TreeR() == 0x0) fLoader->MakeTree("R");
       fDetTypeRec->MakeBranchR(0);
-      if (fLoader->TreeC() == 0x0){
-	fDetTypeRec->MakeTreeC();
-	fDetTypeRec->MakeBranchC();
-      }
       fDetTypeRec->SetTreeAddressR(fLoader->TreeR());
       fDetTypeRec->SetTreeAddressD(fLoader->TreeD());
-      fDetTypeRec->DigitsToRecPoints(evnt,0,lopt);
+      fDetTypeRec->DigitsToRecPoints(fLoader->TreeD(),fLoader->TreeR(),0,lopt);
     } // end for evnt
 }
 //______________________________________________________________________