From 6fd5d5f21684cdfe28fe4e7e6f2cd0d6864e4193 Mon Sep 17 00:00:00 2001 From: marian Date: Fri, 2 Nov 2007 17:43:18 +0000 Subject: [PATCH] Changes due to new PROOF (Marian) Main problem - Objects - components could not be initialized in SlaveBegin as fChain was not yet initialized --- TPC/TPCcalib/AliTPCSelectorTracks.cxx | 13 +++++++------ TPC/TPCcalib/AliTPCcalibTracks.cxx | 8 ++++---- TPC/TPCcalib/libTPCcalib.pkg2 | 4 +--- TPC/TPCcalib/make_TPCcalib_par.sh | 2 +- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/TPC/TPCcalib/AliTPCSelectorTracks.cxx b/TPC/TPCcalib/AliTPCSelectorTracks.cxx index 7d8c2676e04..390c29464a2 100644 --- a/TPC/TPCcalib/AliTPCSelectorTracks.cxx +++ b/TPC/TPCcalib/AliTPCSelectorTracks.cxx @@ -86,7 +86,11 @@ void AliTPCSelectorTracks::InitComponent(){ // chain->GetUserInfo()->AddLast(clusterParam); // chain->GetUserInfo()->AddLast(cuts); // - AliTPCClusterParam *clusterParam = (AliTPCClusterParam*)fChain->GetUserInfo()->FindObject("AliTPCClusterParam"); + if (!fChain){ + printf("EROOR - chain not initialized\n"); + } + + AliTPCClusterParam *clusterParam = (AliTPCClusterParam*)fChain->GetUserInfo()->FindObject("AliTPCClusterParam"); if (clusterParam != 0) printf("clusterParam found in fChain! \n"); AliTPCcalibTracksCuts *cuts = (AliTPCcalibTracksCuts*)fChain->GetUserInfo()->FindObject("calibTracksCuts"); if (cuts != 0) printf("cuts found in fChain! \n"); @@ -96,7 +100,7 @@ void AliTPCSelectorTracks::InitComponent(){ fCalibTracksGain = new AliTPCcalibTracksGain("calibTracksGain", "Gain calibration object for tracks"); fOutput->AddLast(fCalibTracksGain); - + fInit=kTRUE; } void AliTPCSelectorTracks::SlaveBegin(TTree * tree) @@ -106,10 +110,7 @@ void AliTPCSelectorTracks::SlaveBegin(TTree * tree) // The tree argument is deprecated (on PROOF 0 is passed). AliTPCSelectorESD::SlaveBegin(tree); - if (!fChain){ - printf("EROOR - chain not initialized\n"); - } - + printf(" ***** SlaveBegin ***** \n"); } diff --git a/TPC/TPCcalib/AliTPCcalibTracks.cxx b/TPC/TPCcalib/AliTPCcalibTracks.cxx index 2d639a0ea50..1abb9d106fd 100644 --- a/TPC/TPCcalib/AliTPCcalibTracks.cxx +++ b/TPC/TPCcalib/AliTPCcalibTracks.cxx @@ -188,10 +188,10 @@ AliTPCcalibTracks::~AliTPCcalibTracks() { delete fArrayQDY; delete fArrayQDZ; delete fArrayQRMSY; - delete fArrayQRMSZ; - - delete fHclus; - delete fDebugStream; + delete fArrayQRMSZ; + delete fHclus; + //delete fDebugStream; + //fDebugStream->Close();; } diff --git a/TPC/TPCcalib/libTPCcalib.pkg2 b/TPC/TPCcalib/libTPCcalib.pkg2 index 480fe71eb4f..c219ccb3c34 100644 --- a/TPC/TPCcalib/libTPCcalib.pkg2 +++ b/TPC/TPCcalib/libTPCcalib.pkg2 @@ -1,7 +1,5 @@ -SRCS = AliTPCcalibTracks.cxx AliTPCcalibTracksGain.cxx \ - AliTPCSelectorESD.cxx AliTPCSelectorTracks.cxx - +SRCS = AliTPCcalibTracks.cxx AliTPCcalibTracksGain.cxx AliTPCSelectorESD.cxx AliTPCSelectorTracks.cxx # AliTPCcalibV0.cxx HDRS:= $(SRCS:.cxx=.h) diff --git a/TPC/TPCcalib/make_TPCcalib_par.sh b/TPC/TPCcalib/make_TPCcalib_par.sh index 9d751b5343f..61524184d7d 100755 --- a/TPC/TPCcalib/make_TPCcalib_par.sh +++ b/TPC/TPCcalib/make_TPCcalib_par.sh @@ -28,9 +28,9 @@ cp $SRC/Ali*.h $EDIR cp $SRC/Ali*.cxx $EDIR cp $SRC/TPCcalibLinkDef.h $EDIR cp $SRC/Makefile* $EDIR -cp $SRC/libTPCcalib.pkg $EDIR cp $SRC/libTPCcalib.pkg2 $EDIR + mkdir $EDIR/PROOF-INF cd $EDIR/PROOF-INF -- 2.43.0