Corrected bug in MakeBranch (was using a different version of STEER)
authorjbarbosa <jbarbosa@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 15 Mar 2001 10:35:00 +0000 (10:35 +0000)
committerjbarbosa <jbarbosa@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 15 Mar 2001 10:35:00 +0000 (10:35 +0000)
RICH/AliRICH.cxx

index 4c89201..4570488 100644 (file)
 
 /*
   $Log$
+  Revision 1.47  2001/03/14 18:13:56  jbarbosa
+  Several changes to adapt to new IO.
+  Removed digitising function, using AliRICHMerger::Digitise from now on.
+
   Revision 1.46  2001/03/12 17:46:33  hristov
   Changes needed on Sun with CC 5.0
 
@@ -1766,15 +1770,15 @@ void AliRICH::MakeBranch(Option_t* option, char *file)
     if (cH) {
       sprintf(branchname,"%sCerenkov",GetName());
       if (fCerenkovs   && gAlice->TreeH()) {
-       TBranch* branch = gAlice->MakeBranchInTree(gAlice->TreeH(), 
-                                                  branchname, &fCerenkovs, kBufferSize, file) ;
-       branch->SetAutoDelete(kFALSE);
+       //TBranch* branch = gAlice->MakeBranchInTree(gAlice->TreeH(),branchname, &fCerenkovs, kBufferSize, file) ;
+       gAlice->MakeBranchInTree(gAlice->TreeH(),branchname, &fCerenkovs, kBufferSize, file) ;
+       //branch->SetAutoDelete(kFALSE);
       } 
       sprintf(branchname,"%sSDigits",GetName());
       if (fSDigits   && gAlice->TreeH()) {
-       TBranch* branch = gAlice->MakeBranchInTree(gAlice->TreeH(), 
-                                                  branchname, &fSDigits, kBufferSize, file) ;
-       branch->SetAutoDelete(kFALSE);
+       //TBranch* branch = gAlice->MakeBranchInTree(gAlice->TreeH(),branchname, &fSDigits, kBufferSize, file) ;
+       gAlice->MakeBranchInTree(gAlice->TreeH(),branchname, &fSDigits, kBufferSize, file) ;
+       //branch->SetAutoDelete(kFALSE);
        //printf("Making branch %sSDigits in TreeH\n",GetName());
       }
     }   
@@ -1782,9 +1786,9 @@ void AliRICH::MakeBranch(Option_t* option, char *file)
     if (cS) {  
       sprintf(branchname,"%sSDigits",GetName());
       if (fSDigits   && gAlice->TreeS()) {
-       TBranch* branch = gAlice->MakeBranchInTree(gAlice->TreeS(), 
-                                 branchname, &fSDigits, kBufferSize, file) ;
-       branch->SetAutoDelete(kFALSE);
+       //TBranch* branch = gAlice->MakeBranchInTree(gAlice->TreeS(),branchname, &fSDigits, kBufferSize, file) ;
+       gAlice->MakeBranchInTree(gAlice->TreeS(),branchname, &fSDigits, kBufferSize, file) ;
+       //branch->SetAutoDelete(kFALSE);
        //printf("Making branch %sSDigits in TreeS\n",GetName());
       }
     }
@@ -1798,9 +1802,9 @@ void AliRICH::MakeBranch(Option_t* option, char *file)
       for (i=0; i<kNCH ;i++) {
        sprintf(branchname,"%sDigits%d",GetName(),i+1); 
        if (fDchambers   && gAlice->TreeD()) {
-          TBranch* branch = gAlice->MakeBranchInTree(gAlice->TreeD(), 
-                                  branchname, &((*fDchambers)[i]), kBufferSize, file) ;
-          branch->SetAutoDelete(kFALSE);
+          //TBranch* branch = gAlice->MakeBranchInTree(gAlice->TreeD(),branchname, &((*fDchambers)[i]), kBufferSize, file) ;
+          gAlice->MakeBranchInTree(gAlice->TreeD(),branchname, &((*fDchambers)[i]), kBufferSize, file) ;
+          //branch->SetAutoDelete(kFALSE);
          //printf("Making Branch %sDigits%d\n",GetName(),i+1);
        }       
       }
@@ -1818,9 +1822,9 @@ void AliRICH::MakeBranch(Option_t* option, char *file)
       for (i=0; i<kNCH ;i++) {
         sprintf(branchname,"%sRawClusters%d",GetName(),i+1);      
         if (fRawClusters && gAlice->TreeR()) {
-           TBranch* branch = gAlice->MakeBranchInTree(gAlice->TreeR(), 
-                                    branchname, &((*fRawClusters)[i]), kBufferSize, file) ;
-          branch->SetAutoDelete(kFALSE);       
+           //TBranch* branch = gAlice->MakeBranchInTree(gAlice->TreeR(),branchname, &((*fRawClusters)[i]), kBufferSize, file) ;
+         gAlice->MakeBranchInTree(gAlice->TreeR(),branchname, &((*fRawClusters)[i]), kBufferSize, file) ;
+          //branch->SetAutoDelete(kFALSE);     
         }        
       }
      //
@@ -1829,17 +1833,17 @@ void AliRICH::MakeBranch(Option_t* option, char *file)
      for (i=0; i<kNCH ;i++) {
        sprintf(branchname,"%sRecHits1D%d",GetName(),i+1);    
        if (fRecHits1D   && gAlice->TreeR()) {
-        TBranch* branch = gAlice->MakeBranchInTree(gAlice->TreeR(), 
-                                   branchname, &((*fRecHits1D)[i]), kBufferSize, file) ;
-        branch->SetAutoDelete(kFALSE);
+        //TBranch* branch = gAlice->MakeBranchInTree(gAlice->TreeR(),branchname, &((*fRecHits1D)[i]), kBufferSize, file) ;
+        gAlice->MakeBranchInTree(gAlice->TreeR(),branchname, &((*fRecHits1D)[i]), kBufferSize, file) ;
+        //branch->SetAutoDelete(kFALSE);
        }       
      }
      for (i=0; i<kNCH ;i++) {
        sprintf(branchname,"%sRecHits3D%d",GetName(),i+1);  
        if (fRecHits3D   && gAlice->TreeR()) {
-           TBranch* branch = gAlice->MakeBranchInTree(gAlice->TreeR(), 
-                                   branchname, &((*fRecHits3D)[i]), kBufferSize, file) ;
-          branch->SetAutoDelete(kFALSE);
+        //TBranch* branch = gAlice->MakeBranchInTree(gAlice->TreeR(),branchname, &((*fRecHits3D)[i]), kBufferSize, file) ;
+        gAlice->MakeBranchInTree(gAlice->TreeR(),branchname, &((*fRecHits1D)[i]), kBufferSize, file) ;
+        //branch->SetAutoDelete(kFALSE);
       }        
     }
   }