merge conflicts solved
authorschutz <schutz@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 31 May 2001 23:11:51 +0000 (23:11 +0000)
committerschutz <schutz@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 31 May 2001 23:11:51 +0000 (23:11 +0000)
PHOS/AliPHOSClusterizerv1.cxx
PHOS/AliPHOSDigitizer.cxx
PHOS/AliPHOSPIDv1.cxx
PHOS/AliPHOSTrackSegmentMakerv1.cxx

index e83ecaf7c5d01d56624b57ceaf1256e92305eabc..13696b6e7f1adc38aa711b384ef11ab0fbad3286 100644 (file)
@@ -625,7 +625,7 @@ void AliPHOSClusterizerv1::WriteRecPoints()
   emcBranch->Fill() ;
   cpvBranch->Fill() ;
   clusterizerBranch->Fill() ;
-//    gAlice->TreeR()->Fill() ;    // YK 28.05.01  
+
   gAlice->TreeR()->Write(0,kOverwrite) ;  
   
 }
index d36be0a34013cba615d8c0ecd1274c942a829f63..2ee212c88ab510a83e162fa63bf09c792a39daea 100644 (file)
@@ -451,8 +451,7 @@ void AliPHOSDigitizer::WriteDigits()
 
   digitsBranch->Fill() ;      
   digitizerBranch->Fill() ;
-  
-//    gAlice->TreeD()->Fill() ;  // YK 28.05.2001
+
   gAlice->TreeD()->Write(0,kOverwrite) ;  
 
   //remove fSDigitizer before new event.  
index f0230f2234adbef1239a12443749dc808a61de3d..b6360741349d70d40d8ce90b7402153bd45d80d2 100644 (file)
@@ -526,7 +526,7 @@ void  AliPHOSPIDv1::WriteRecParticles()
   
   rpBranch->Fill() ;
   pidBranch->Fill() ;
-//    gAlice->TreeR()->Fill() ;    // YK 28.05.01  
+
   gAlice->TreeR()->Write(0,kOverwrite) ;  
   
 }
index bf7af53949e37ae868c04176c121b66b469213cb..3a2289b234af696d31e23b5bef7b131e73c6c827 100644 (file)
@@ -622,10 +622,9 @@ void AliPHOSTrackSegmentMakerv1::WriteTrackSegments()
     cwd->cd();
   } 
   
-
   tsBranch->Fill() ;  
   tsMakerBranch->Fill() ;
-//    gAlice->TreeR()->Fill() ;    // YK 28.05.01  
+
   gAlice->TreeR()->Write(0,kOverwrite) ;  
   
 }