Default branch names set to Default

diff --git a/PHOS/AliPHOSReconstructioner.cxx b/PHOS/AliPHOSReconstructioner.cxx
index e73805d9bd30572225430a3e43b205578b774bcd..c2e7fc0ee0d36000a236b6375337fe5cea9b9e01 100644 (file)
--- a/PHOS/AliPHOSReconstructioner.cxx
+++ b/PHOS/AliPHOSReconstructioner.cxx
@@ -103,26 +103,26 @@ AliPHOSReconstructioner::AliPHOSReconstructioner(const char* headerFile):TTask("
   
   fHeaderFileName = headerFile ;
 
-  fSDigitsBranch="" ; 
+  fSDigitsBranch="Default" ; 
   fSDigitizer  = new AliPHOSSDigitizer(fHeaderFileName.Data(),fSDigitsBranch.Data()) ; 
   Add(fSDigitizer) ;
 
-  fDigitsBranch="" ; 
+  fDigitsBranch="Default" ; 
   fDigitizer   = new AliPHOSDigitizer(fHeaderFileName.Data(),fDigitsBranch.Data()) ; 
   Add(fDigitizer) ;
 
 
-  fRecPointBranch="" ; 
+  fRecPointBranch="Default" ; 
   fClusterizer = new AliPHOSClusterizerv1(fHeaderFileName.Data(),fRecPointBranch.Data()) ; 
   Add(fClusterizer) ;
   
 
-  fTSBranch="" ; 
+  fTSBranch="Default" ; 
   fTSMaker     = new AliPHOSTrackSegmentMakerv1(fHeaderFileName.Data(),fTSBranch.Data()) ;
   Add(fTSMaker) ;
   
   
-  fRecPartBranch="" ; 
+  fRecPartBranch="Default" ; 
   fPID         = new AliPHOSPIDv1(fHeaderFileName.Data(),fRecPartBranch.Data()) ;
   Add(fPID) ;
   
@@ -361,24 +361,24 @@ void AliPHOSReconstructioner::Exec(Option_t *option)
   if(!fIsInitialized){
     // Initialisation
 
-    fSDigitsBranch="" ; 
+    fSDigitsBranch="Default" ; 
     fSDigitizer  = new AliPHOSSDigitizer(fHeaderFileName.Data(),fSDigitsBranch.Data()) ; 
     Add(fSDigitizer) ;
 
-    fDigitsBranch="" ; 
+    fDigitsBranch="Default" ; 
     fDigitizer   = new AliPHOSDigitizer(fHeaderFileName.Data(),fDigitsBranch.Data()) ; 
     Add(fDigitizer) ;
 
-    fRecPointBranch="" ; 
+    fRecPointBranch="Default" ; 
     fClusterizer = new AliPHOSClusterizerv1(fHeaderFileName.Data(),fRecPointBranch.Data()) ; 
     Add(fClusterizer) ;
 
-    fTSBranch="" ; 
+    fTSBranch="Default" ; 
     fTSMaker     = new AliPHOSTrackSegmentMakerv1(fHeaderFileName.Data(),fTSBranch.Data()) ;
     Add(fTSMaker) ;
 
 
-    fRecPartBranch="" ; 
+    fRecPartBranch="Default" ; 
     fPID         = new AliPHOSPIDv1(fHeaderFileName.Data(),fRecPartBranch.Data()) ;
     Add(fPID) ;
     
@@ -390,20 +390,20 @@ AliPHOSReconstructioner::~AliPHOSReconstructioner()
 {
   // Delete data members if any
 
-  if(fSDigitizer)
-    delete fSDigitizer ;
+//   if(fSDigitizer)
+//     delete fSDigitizer ;
   
-  if(fDigitizer)
-    delete fDigitizer ;
+//   if(fDigitizer)
+//     delete fDigitizer ;
   
-  if(fClusterizer)
-    delete fClusterizer ;
+//   if(fClusterizer)
+//     delete fClusterizer ;
   
-  if(fTSMaker)
-    delete fTSMaker ;
+//   if(fTSMaker)
+//     delete fTSMaker ;
   
-  if(fPID)
-    delete fPID ;
+//   if(fPID)
+//     delete fPID ;
 
 //    TFile * file = (TFile*) gROOT->GetFile(fHeaderFileName.Data()) ;
     

diff --git a/PHOS/AliPHOSReconstructioner.h b/PHOS/AliPHOSReconstructioner.h
index 72f2ff02bc14c258ceb1f6f8d15f22da53cf149d..6af187eb7b99cace5a633eb6dfe585fb43f1f937 100644 (file)
--- a/PHOS/AliPHOSReconstructioner.h
+++ b/PHOS/AliPHOSReconstructioner.h
@@ -53,7 +53,7 @@ public:
   void SetBranchTitle(const char* branch,const char * title) ;
             // Sets the branch titles to separate different reconstruction flows 
 
-  void StartFrom(char * module = "SDigitizer",char * title = 0) ;
+  void StartFrom(char * module = "SDigitizer",char * title = "Default") ;
             // From wich step reconstruction begins, 
             // title to be set to all reconstructed branches
 
@@ -71,17 +71,17 @@ private:
   
   TString  fHeaderFileName ;    // File with headers and gAlice
   TString  fDigitsBranch ;      // Title of digits branch
-  TString  fRecPointBranch ;    // -"-      RecPoints     -"-
-  TString  fTSBranch  ;         // -"-      TrackSegments -"-
-  TString  fRecPartBranch ;     // -"-      RecParticles  -"-
-  TString  fSDigitsBranch ;     // -"-      SDigits       -"-
+  TString  fRecPointBranch ;    // Title of RecPoints branch   
+  TString  fTSBranch  ;         // Title of TrackSegments branch
+  TString  fRecPartBranch ;     // Title of RecParticles branch 
+  TString  fSDigitsBranch ;     // Title of SDigits branch      
 
 
-  AliPHOSDigitizer         * fDigitizer ;   // Pointer to AliPHOSDigitizer
-  AliPHOSClusterizer       * fClusterizer ; // Pointer to AliPHOSClusterizer
-  AliPHOSPID               * fPID ;         // Pointer to AliPHOSPID
-  AliPHOSTrackSegmentMaker * fTSMaker ;     // Pointer to AliPHOSTrackSegmentMaker
-  AliPHOSSDigitizer        * fSDigitizer ;  // Pointer to AliPHOSSDigitizer
+  AliPHOSDigitizer         * fDigitizer ;   //! Pointer to AliPHOSDigitizer
+  AliPHOSClusterizer       * fClusterizer ; //! Pointer to AliPHOSClusterizer
+  AliPHOSPID               * fPID ;         //! Pointer to AliPHOSPID
+  AliPHOSTrackSegmentMaker * fTSMaker ;     //! Pointer to AliPHOSTrackSegmentMaker
+  AliPHOSSDigitizer        * fSDigitizer ;  //! Pointer to AliPHOSSDigitizer
 
   Bool_t   fIsInitialized ; // kTRUE if reconstructioner is initialized