From 58af8e48804de12e122e9597c84f10c6bb8c0704 Mon Sep 17 00:00:00 2001 From: hristov Date: Sat, 21 Jan 2012 07:39:10 +0000 Subject: [PATCH] Compilation warnings --- EMCAL/AliEMCALTriggerBoard.cxx | 2 +- EVGEN/AliGenHaloProtvino.cxx | 13 ++++++++++--- HLT/ITS/AliHLTITStracker.cxx | 2 +- MFT/AliMFTClusterFinder.cxx | 2 +- MFT/AliMFTClusterFinder.h | 2 +- MFT/AliMuonForwardTrackFinder.cxx | 2 +- MFT/AliMuonForwardTrackFinder.h | 2 +- STEER/STEER/AliMC.cxx | 2 +- 8 files changed, 17 insertions(+), 10 deletions(-) diff --git a/EMCAL/AliEMCALTriggerBoard.cxx b/EMCAL/AliEMCALTriggerBoard.cxx index f52fa408075..3821eba031d 100644 --- a/EMCAL/AliEMCALTriggerBoard.cxx +++ b/EMCAL/AliEMCALTriggerBoard.cxx @@ -124,7 +124,7 @@ void AliEMCALTriggerBoard::ZeroRegion() } //_______________ -void AliEMCALTriggerBoard::SlidingWindow(TriggerType_t type, Int_t thres, Int_t time) +void AliEMCALTriggerBoard::SlidingWindow(TriggerType_t /*type*/, Int_t thres, Int_t time) { // Sliding window diff --git a/EVGEN/AliGenHaloProtvino.cxx b/EVGEN/AliGenHaloProtvino.cxx index 0a6041e4344..4466a194e37 100644 --- a/EVGEN/AliGenHaloProtvino.cxx +++ b/EVGEN/AliGenHaloProtvino.cxx @@ -139,6 +139,7 @@ void AliGenHaloProtvino::Init() const Float_t kFlux = 1.e11 / 25.e-9; // protons/s Float_t pFlux[5] = {0.2, 0.2, 0.3, 0.3, 1.0}; + Int_t ncols = 0; if (fRunPeriod < 5) { // // Ring 1 @@ -146,7 +147,9 @@ void AliGenHaloProtvino::Init() for (i = 0; i < fGPASize; i++) { - fscanf(file, "%f %f %f %f %f %f", &z, &p[0], &p[1], &p[2] , &p[3], &p[4]); + ncols = fscanf(file, "%f %f %f %f %f %f", &z, &p[0], &p[1], &p[2] , &p[3], &p[4]); + if (ncols<0) break; + fG1[i] = p[fRunPeriod]; if (i > 0) { @@ -160,7 +163,9 @@ void AliGenHaloProtvino::Init() // for (i = 0; i < fGPASize; i++) { - fscanf(file, "%f %f %f %f %f %f", &z, &p[0], &p[1], &p[2] , &p[3], &p[4]); + ncols = fscanf(file, "%f %f %f %f %f %f", &z, &p[0], &p[1], &p[2] , &p[3], &p[4]); + if (ncols<0) break; + fG2[i] = p[fRunPeriod]; if (i > 0) { fZ2[i] = fZ2[i-1] + z; @@ -180,7 +185,9 @@ void AliGenHaloProtvino::Init() } else { for (i = 0; i < fGPASize; i++) { - fscanf(file, "%f %e %e %e %e %e", &z, &p[0], &p[1], &p[2], &p[3], &p[4]); + ncols = fscanf(file, "%f %e %e %e %e %e", &z, &p[0], &p[1], &p[2], &p[3], &p[4]); + if (ncols<0) break; + z /= 1000.; fG1[i] = p[4] * kCrossSection * kFlux; // 1/m/s // 1/3 of nominal intensity at startup diff --git a/HLT/ITS/AliHLTITStracker.cxx b/HLT/ITS/AliHLTITStracker.cxx index 567a5f6bde6..54afc8f071b 100644 --- a/HLT/ITS/AliHLTITStracker.cxx +++ b/HLT/ITS/AliHLTITStracker.cxx @@ -81,7 +81,7 @@ Int_t AliHLTITStracker::Clusters2Tracks(AliESDEvent *event) { try { t=new AliHLTITStrack(*esd); } catch (const Char_t *msg) { - Warning("Clusters2Tracks",msg); + Warning("Clusters2Tracks","%s\n",msg); delete t; continue; } diff --git a/MFT/AliMFTClusterFinder.cxx b/MFT/AliMFTClusterFinder.cxx index 083401e1965..165ac720320 100644 --- a/MFT/AliMFTClusterFinder.cxx +++ b/MFT/AliMFTClusterFinder.cxx @@ -64,7 +64,7 @@ AliMFTClusterFinder::~AliMFTClusterFinder() { //==================================================================================================================================================== -void AliMFTClusterFinder::Init(Char_t *nameGeomFile) { +void AliMFTClusterFinder::Init(const Char_t *nameGeomFile) { fSegmentation = new AliMFTSegmentation(nameGeomFile); fNPlanes = fSegmentation -> GetNPlanes(); diff --git a/MFT/AliMFTClusterFinder.h b/MFT/AliMFTClusterFinder.h index 25d15320651..c464a9f472b 100644 --- a/MFT/AliMFTClusterFinder.h +++ b/MFT/AliMFTClusterFinder.h @@ -30,7 +30,7 @@ public: AliMFTClusterFinder(); ~AliMFTClusterFinder(); - void Init(Char_t *nameGeomFile); + void Init(const Char_t *nameGeomFile); void MakeClusterBranch(TTree *treeCluster); void SetClusterTreeAddress(TTree *treeCluster); diff --git a/MFT/AliMuonForwardTrackFinder.cxx b/MFT/AliMuonForwardTrackFinder.cxx index 17881e9c376..66fb665cf46 100644 --- a/MFT/AliMuonForwardTrackFinder.cxx +++ b/MFT/AliMuonForwardTrackFinder.cxx @@ -1235,7 +1235,7 @@ void AliMuonForwardTrackFinder::PrintParticleHistory() { //=========================================================================================================================================== -Bool_t AliMuonForwardTrackFinder::IsMother(Char_t *nameMother) { +Bool_t AliMuonForwardTrackFinder::IsMother(const Char_t *nameMother) { Bool_t result = kFALSE; diff --git a/MFT/AliMuonForwardTrackFinder.h b/MFT/AliMuonForwardTrackFinder.h index 708947932c6..3cc512c495d 100644 --- a/MFT/AliMuonForwardTrackFinder.h +++ b/MFT/AliMuonForwardTrackFinder.h @@ -129,7 +129,7 @@ public: Bool_t IsCorrectMatch(AliMFTCluster *cluster); void CheckCurrentMuonTrackable(); - Bool_t IsMother(Char_t *nameMother); + Bool_t IsMother(const Char_t *nameMother); void SetMatchingMode(Int_t matchingMode) { fMatchingMode = matchingMode; } void SetMinResearchRadiusAtLastPlane(Double_t minResearchRadius) { fMinResearchRadiusAtLastPlane = minResearchRadius; } diff --git a/STEER/STEER/AliMC.cxx b/STEER/STEER/AliMC.cxx index 69e6967b6ef..4f031adc872 100644 --- a/STEER/STEER/AliMC.cxx +++ b/STEER/STEER/AliMC.cxx @@ -854,7 +854,7 @@ void AliMC::ReadTransPar() return; } // Read the end of line - fscanf(lun,"%*c"); + iret=fscanf(lun,"%*c"); if(!iret) continue; if(line[0]=='*') continue; // Read the numbers -- 2.39.3