X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSreconstruction.cxx;h=aee2a3fcfa81d146684f1e4a3000b5b6f4a4abea;hb=813d0163dd3f14294fb4562374ac9dda56738c7d;hp=79b69e71c4a1e993cd83fd3a203153341e90cf26;hpb=6cae184e0a28e9a5727fa419f59cb6923c03ddb2;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSreconstruction.cxx b/ITS/AliITSreconstruction.cxx
index 79b69e71c4a..aee2a3fcfa8 100644
--- a/ITS/AliITSreconstruction.cxx
+++ b/ITS/AliITSreconstruction.cxx
@@ -93,7 +93,7 @@ AliITSreconstruction::AliITSreconstruction(const char* filename):
     fRunLoader = AliRunLoader::Open(filename);
     if (fRunLoader == 0x0)
      {
-       Error("AliITSreconstruction","Can not load the session",filename);
+       Error("AliITSreconstruction","Can not load the session %s \n",filename);
        return;
      }
 
@@ -141,7 +141,7 @@ Bool_t AliITSreconstruction::Init(){
     //   none.
     // Return:
     //    kTRUE if no errors initilizing this class occurse else kFALSE
-    Info("Init","");
+    Info("Init"," Init ITS reconstruction");
     if (fRunLoader == 0x0)
      {
        Error("Init","Run Loader is NULL");
@@ -167,7 +167,6 @@ Bool_t AliITSreconstruction::Init(){
     fDet[0] = fDet[1] = fDet[2] = kTRUE;
     fEnt0 = 0;
 
-    //fEnt  = gAlice->GetEventsPerRun();
     fEnt = Int_t(fRunLoader->GetNumberOfEvents());
 
     fLoader->LoadDigits("read");
@@ -193,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){
@@ -269,9 +228,9 @@ void AliITSreconstruction::Exec(const Option_t *opt){
     } // end if !fInit
     for(evnt=0;evnt<fEnt;evnt++)
      {
-      Info("Exec","");
+       //      Info("Exec","");
       Info("Exec","Processing Event %d",evnt);
-      Info("Exec","");
+      //      Info("Exec","");
 
       fRunLoader->GetEvent(evnt);
       if (fLoader->TreeR() == 0x0) fLoader->MakeTree("R");