From eec3ac528e47d839ed74e9051627ca1f927a917b Mon Sep 17 00:00:00 2001 From: schutz Date: Thu, 31 May 2001 23:11:51 +0000 Subject: [PATCH] merge conflicts solved --- PHOS/AliPHOSClusterizerv1.cxx | 2 +- PHOS/AliPHOSDigitizer.cxx | 3 +-- PHOS/AliPHOSPIDv1.cxx | 2 +- PHOS/AliPHOSTrackSegmentMakerv1.cxx | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/PHOS/AliPHOSClusterizerv1.cxx b/PHOS/AliPHOSClusterizerv1.cxx index e83ecaf7c5d..13696b6e7f1 100644 --- a/PHOS/AliPHOSClusterizerv1.cxx +++ b/PHOS/AliPHOSClusterizerv1.cxx @@ -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) ; } diff --git a/PHOS/AliPHOSDigitizer.cxx b/PHOS/AliPHOSDigitizer.cxx index d36be0a3401..2ee212c88ab 100644 --- a/PHOS/AliPHOSDigitizer.cxx +++ b/PHOS/AliPHOSDigitizer.cxx @@ -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. diff --git a/PHOS/AliPHOSPIDv1.cxx b/PHOS/AliPHOSPIDv1.cxx index f0230f2234a..b6360741349 100644 --- a/PHOS/AliPHOSPIDv1.cxx +++ b/PHOS/AliPHOSPIDv1.cxx @@ -526,7 +526,7 @@ void AliPHOSPIDv1::WriteRecParticles() rpBranch->Fill() ; pidBranch->Fill() ; -// gAlice->TreeR()->Fill() ; // YK 28.05.01 + gAlice->TreeR()->Write(0,kOverwrite) ; } diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.cxx b/PHOS/AliPHOSTrackSegmentMakerv1.cxx index bf7af53949e..3a2289b234a 100644 --- a/PHOS/AliPHOSTrackSegmentMakerv1.cxx +++ b/PHOS/AliPHOSTrackSegmentMakerv1.cxx @@ -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) ; } -- 2.39.3