From d6080682f89d052b457a8971c1c814e0bf00b3a0 Mon Sep 17 00:00:00 2001 From: auras Date: Fri, 17 Feb 2012 13:18:59 +0000 Subject: [PATCH] coverity fixes --- MFT/AliMFTClusterFinder.cxx | 5 +- MFT/AliMuonForwardTrackFinder.cxx | 96 +++++++++++++++---------------- MFT/AliMuonForwardTrackFinder.h | 2 - 3 files changed, 50 insertions(+), 53 deletions(-) diff --git a/MFT/AliMFTClusterFinder.cxx b/MFT/AliMFTClusterFinder.cxx index ca22b2e87e1..be13cb451a9 100644 --- a/MFT/AliMFTClusterFinder.cxx +++ b/MFT/AliMFTClusterFinder.cxx @@ -179,10 +179,9 @@ void AliMFTClusterFinder::MakeClusterBranch(TTree *treeCluster) { if (treeCluster) { for(Int_t iPlane=0; iPlaneGetBranch(Form("Plane_%02d",iPlane)); - if (branch) continue; + if (treeCluster->GetBranch(Form("Plane_%02d",iPlane))) continue; AliDebug(1, Form("Branch Plane_%02d does not exist, creating!",iPlane)); - branch = treeCluster->Branch(Form("Plane_%02d",iPlane), &(fClustersPerPlane[iPlane])); + treeCluster->Branch(Form("Plane_%02d",iPlane), &(fClustersPerPlane[iPlane])); } } diff --git a/MFT/AliMuonForwardTrackFinder.cxx b/MFT/AliMuonForwardTrackFinder.cxx index f2172f9d077..10630841c5e 100644 --- a/MFT/AliMuonForwardTrackFinder.cxx +++ b/MFT/AliMuonForwardTrackFinder.cxx @@ -328,10 +328,10 @@ void AliMuonForwardTrackFinder::Init(Int_t nRun, Char_t gAliceName[300]; Char_t clusterName[300]; - sprintf(geoFileName , "%s/geometry.root", fReadDir.Data()); - sprintf(esdFileName , "%s/AliESDs.root" , fReadDir.Data()); - sprintf(gAliceName , "%s/galice.root" , fReadDir.Data()); - sprintf(clusterName , "%s/MFT.RecPoints.root", fReadDir.Data()); + snprintf(geoFileName , 300, "%s/geometry.root", fReadDir.Data()); + snprintf(esdFileName , 300, "%s/AliESDs.root" , fReadDir.Data()); + snprintf(gAliceName , 300, "%s/galice.root" , fReadDir.Data()); + snprintf(clusterName , 300, "%s/MFT.RecPoints.root", fReadDir.Data()); // Import TGeo geometry (needed by AliMUONTrackExtrap::ExtrapToVertex) if (!gGeoManager) { @@ -1595,50 +1595,50 @@ void AliMuonForwardTrackFinder::WriteHistos() { void AliMuonForwardTrackFinder::PDGNameConverter(const Char_t *nameIn, Char_t *nameOut) { - if (!strcmp(nameIn, "mu+")) sprintf(nameOut, "#mu^{+}"); - else if (!strcmp(nameIn, "mu-")) sprintf(nameOut, "#mu^{-}"); - else if (!strcmp(nameIn, "pi+")) sprintf(nameOut, "#pi^{+}"); - else if (!strcmp(nameIn, "pi-")) sprintf(nameOut, "#pi^{-}"); - else if (!strcmp(nameIn, "K+")) sprintf(nameOut, "K^{+}"); - else if (!strcmp(nameIn, "K-")) sprintf(nameOut, "K^{-}"); - else if (!strcmp(nameIn, "K*+")) sprintf(nameOut, "K^{*+}"); - else if (!strcmp(nameIn, "K*-")) sprintf(nameOut, "K^{*-}"); - else if (!strcmp(nameIn, "K_S0")) sprintf(nameOut, "K_{S}^{0}"); - else if (!strcmp(nameIn, "K_L0")) sprintf(nameOut, "K_{L}^{0}"); - else if (!strcmp(nameIn, "K0")) sprintf(nameOut, "K^{0}"); - else if (!strcmp(nameIn, "K0_bar")) sprintf(nameOut, "#bar{K}^{0}"); - else if (!strcmp(nameIn, "K*0")) sprintf(nameOut, "K^{*0}"); - else if (!strcmp(nameIn, "K*0_bar")) sprintf(nameOut, "#bar{K}^{*0}"); - else if (!strcmp(nameIn, "rho0")) sprintf(nameOut, "#rho^{0}"); - else if (!strcmp(nameIn, "rho+")) sprintf(nameOut, "#rho^{+}"); - else if (!strcmp(nameIn, "rho-")) sprintf(nameOut, "#rho^{-}"); - else if (!strcmp(nameIn, "omega")) sprintf(nameOut, "#omega"); - else if (!strcmp(nameIn, "eta'")) sprintf(nameOut, "#eta'"); - else if (!strcmp(nameIn, "phi")) sprintf(nameOut, "#phi"); - - else if (!strcmp(nameIn, "D-")) sprintf(nameOut, "D^{-}"); - else if (!strcmp(nameIn, "D+")) sprintf(nameOut, "D^{+}"); - else if (!strcmp(nameIn, "D0")) sprintf(nameOut, "D^{0}"); - else if (!strcmp(nameIn, "D0_bar")) sprintf(nameOut, "#bar{D}^{0}"); - else if (!strcmp(nameIn, "D*-")) sprintf(nameOut, "D^{*-}"); - else if (!strcmp(nameIn, "D*+")) sprintf(nameOut, "D^{*+}"); - else if (!strcmp(nameIn, "D_s+")) sprintf(nameOut, "D_{s}^{+}"); - else if (!strcmp(nameIn, "D*_s+")) sprintf(nameOut, "D_{s}^{*+}"); - - else if (!strcmp(nameIn, "B-")) sprintf(nameOut, "B^{-}"); - else if (!strcmp(nameIn, "B+")) sprintf(nameOut, "B^{+}"); - else if (!strcmp(nameIn, "B_s0_bar")) sprintf(nameOut, "#bar{B}_{s}^{0}"); - - else if (!strcmp(nameIn, "antiproton")) sprintf(nameOut, "#bar{p}"); - else if (!strcmp(nameIn, "proton")) sprintf(nameOut, "p"); - else if (!strcmp(nameIn, "neutron")) sprintf(nameOut, "n"); - else if (!strcmp(nameIn, "Sigma+")) sprintf(nameOut, "#Sigma^{+}"); - else if (!strcmp(nameIn, "Delta+")) sprintf(nameOut, "#Delta{+}"); - else if (!strcmp(nameIn, "Delta--")) sprintf(nameOut, "#Delta{--}"); - else if (!strcmp(nameIn, "Lambda0")) sprintf(nameOut, "#Lambda_0"); - else if (!strcmp(nameIn, "Lambda0_bar")) sprintf(nameOut, "#bar{Lambda}_0"); - - else sprintf(nameOut, "%s", nameIn); + if (!strcmp(nameIn, "mu+")) snprintf(nameOut, 50, "#mu^{+}"); + else if (!strcmp(nameIn, "mu-")) snprintf(nameOut, 50, "#mu^{-}"); + else if (!strcmp(nameIn, "pi+")) snprintf(nameOut, 50, "#pi^{+}"); + else if (!strcmp(nameIn, "pi-")) snprintf(nameOut, 50, "#pi^{-}"); + else if (!strcmp(nameIn, "K+")) snprintf(nameOut, 50, "K^{+}"); + else if (!strcmp(nameIn, "K-")) snprintf(nameOut, 50, "K^{-}"); + else if (!strcmp(nameIn, "K*+")) snprintf(nameOut, 50, "K^{*+}"); + else if (!strcmp(nameIn, "K*-")) snprintf(nameOut, 50, "K^{*-}"); + else if (!strcmp(nameIn, "K_S0")) snprintf(nameOut, 50, "K_{S}^{0}"); + else if (!strcmp(nameIn, "K_L0")) snprintf(nameOut, 50, "K_{L}^{0}"); + else if (!strcmp(nameIn, "K0")) snprintf(nameOut, 50, "K^{0}"); + else if (!strcmp(nameIn, "K0_bar")) snprintf(nameOut, 50, "#bar{K}^{0}"); + else if (!strcmp(nameIn, "K*0")) snprintf(nameOut, 50, "K^{*0}"); + else if (!strcmp(nameIn, "K*0_bar")) snprintf(nameOut, 50, "#bar{K}^{*0}"); + else if (!strcmp(nameIn, "rho0")) snprintf(nameOut, 50, "#rho^{0}"); + else if (!strcmp(nameIn, "rho+")) snprintf(nameOut, 50, "#rho^{+}"); + else if (!strcmp(nameIn, "rho-")) snprintf(nameOut, 50, "#rho^{-}"); + else if (!strcmp(nameIn, "omega")) snprintf(nameOut, 50, "#omega"); + else if (!strcmp(nameIn, "eta'")) snprintf(nameOut, 50, "#eta'"); + else if (!strcmp(nameIn, "phi")) snprintf(nameOut, 50, "#phi"); + + else if (!strcmp(nameIn, "D-")) snprintf(nameOut, 50, "D^{-}"); + else if (!strcmp(nameIn, "D+")) snprintf(nameOut, 50, "D^{+}"); + else if (!strcmp(nameIn, "D0")) snprintf(nameOut, 50, "D^{0}"); + else if (!strcmp(nameIn, "D0_bar")) snprintf(nameOut, 50, "#bar{D}^{0}"); + else if (!strcmp(nameIn, "D*-")) snprintf(nameOut, 50, "D^{*-}"); + else if (!strcmp(nameIn, "D*+")) snprintf(nameOut, 50, "D^{*+}"); + else if (!strcmp(nameIn, "D_s+")) snprintf(nameOut, 50, "D_{s}^{+}"); + else if (!strcmp(nameIn, "D*_s+")) snprintf(nameOut, 50, "D_{s}^{*+}"); + + else if (!strcmp(nameIn, "B-")) snprintf(nameOut, 50, "B^{-}"); + else if (!strcmp(nameIn, "B+")) snprintf(nameOut, 50, "B^{+}"); + else if (!strcmp(nameIn, "B_s0_bar")) snprintf(nameOut, 50, "#bar{B}_{s}^{0}"); + + else if (!strcmp(nameIn, "antiproton")) snprintf(nameOut, 50, "#bar{p}"); + else if (!strcmp(nameIn, "proton")) snprintf(nameOut, 50, "p"); + else if (!strcmp(nameIn, "neutron")) snprintf(nameOut, 50, "n"); + else if (!strcmp(nameIn, "Sigma+")) snprintf(nameOut, 50, "#Sigma^{+}"); + else if (!strcmp(nameIn, "Delta+")) snprintf(nameOut, 50, "#Delta{+}"); + else if (!strcmp(nameIn, "Delta--")) snprintf(nameOut, 50, "#Delta{--}"); + else if (!strcmp(nameIn, "Lambda0")) snprintf(nameOut, 50, "#Lambda_0"); + else if (!strcmp(nameIn, "Lambda0_bar")) snprintf(nameOut, 50, "#bar{Lambda}_0"); + + else snprintf(nameOut, 50, "%s", nameIn); } diff --git a/MFT/AliMuonForwardTrackFinder.h b/MFT/AliMuonForwardTrackFinder.h index 5c37fdd42e9..5dc1f20cfde 100644 --- a/MFT/AliMuonForwardTrackFinder.h +++ b/MFT/AliMuonForwardTrackFinder.h @@ -216,8 +216,6 @@ protected: Int_t fCountRealTracksAnalyzedOfEvent; Int_t fCountRealTracksAnalyzedWithFinalCandidates; - Int_t fNClustersGlobalTrack[fNMaxPlanes], fNDFGlobalTrack[fNMaxPlanes]; - TFile *fFileCluster; //! TFile *fFileESD; //! TFile *fFile_gAlice; //! -- 2.39.3