From 7eb9830d020def4f6d7fe744621b375e5f2bc34b Mon Sep 17 00:00:00 2001 From: panos Date: Thu, 12 Apr 2007 16:09:23 +0000 Subject: [PATCH 1/1] Removing eff c++ warnings --- PWG2/FLOW/AliFlowAnalyser.cxx | 253 ++++++++++++++++++++++++++++++---- PWG2/FLOW/AliFlowEvent.cxx | 11 +- 2 files changed, 232 insertions(+), 32 deletions(-) diff --git a/PWG2/FLOW/AliFlowAnalyser.cxx b/PWG2/FLOW/AliFlowAnalyser.cxx index 509f8bb1a6f..4c03ada4f8f 100644 --- a/PWG2/FLOW/AliFlowAnalyser.cxx +++ b/PWG2/FLOW/AliFlowAnalyser.cxx @@ -85,42 +85,235 @@ using namespace std; //required for resolving the 'cout' symbol ClassImp(AliFlowAnalyser) //----------------------------------------------------------------------- AliFlowAnalyser::AliFlowAnalyser(const AliFlowSelection* flowSelect): + fTrackLoop(kTRUE), + fV0loop(kTRUE), + fShuffle(kFALSE), + fV1Ep1Ep2(kFALSE), + fEtaSub(kFALSE), + fReadPhiWgt(kFALSE), + fBayWgt(kFALSE), + fRePid(kFALSE), + fCustomRespFunc(kFALSE), + fPtWgt(kFALSE), + fEtaWgt(kFALSE), + fOnePhiWgt(kTRUE), fHistFile(0x0), fPhiWgtFile(0x0), - fFlowEvent(0x0), fFlowTrack(0x0), fFlowV0(0x0), fFlowSelect(0x0), fFlowTracks(0x0), fFlowV0s(0x0), - fPhiWgtHistList(0x0), fVnResHistList(0x0) + fHistFileName("flowAnalysPlot.root"), + fEventNumber(0), + fTrackNumber(0), + fV0Number(0), + fNumberOfTracks(0), + fNumberOfV0s(0), + fPidId(0), + fSelParts(0), + fSelV0s(0), + fFlowEvent(0x0), + fFlowTrack(0x0), + fFlowV0(0x0), + fFlowSelect(0x0), + fFlowTracks(0x0), + fFlowV0s(0x0), + fPhiBins(AliFlowConstants::kPhiBins), + fPhiMin(0.), + fPhiMax(2*TMath::Pi()), + fLabel(0), + fEtaMin(0.), + fEtaMax(0.), + fPtMin(0.), + fPtMax(0.), + fPtMaxPart(0), + fEtaBins(0), + fPtBins(0), + fPtBinsPart(0), + fMaxLabel(0), + fPhiWgtHistList(0x0), + fVnResHistList(0x0), + fHistTrigger(0), + fHistMult(0), + fHistV0Mult(0), + fHistOrigMult(0), + fHistMultOverOrig(0), + fHistMultEta(0), + fHistCent(0), + fHistVertexZ(0), + fHistVertexXY2D(0), + fHistEnergyZDC(0), + fHistPartZDC(0), + fHistPidMult(0), + fHistBayPidMult(0), + fHistEtaSym(0), + fHistEtaSymPart(0), + fHistEtaSymVerZ2D(0), + fHistEtaSymVerZ2DPart(0), + fHistMultPart(0), + fHistV0MultPart(0), + fHistBayPidMultPart(0), + fHistMultPartUnit(0), + fHistPtot(0), + fHistPt(0), + fHistCharge(0), + fHistDcaGlobal(0), + fHistDca(0), + fHistTransDca(0), + fHistChi2(0), + fHistLenght(0), + fHistInvMass(0), + fHistFitOverMax(0), + fHistPhiPtCon(0), + fHistPhiPtUnc(0), + fHistPtPhiPos(0), + fHistPtPhiNeg(0), + fHistAllEtaPtPhi3D(0), + fHistCosPhi(0), + fHistPidPt(0), + fHistPhi(0), + fHistPhiCons(0), + fHistYieldAll2D(0), + fHistYieldCon2D(0), + fHistYieldUnc2D(0), + fHistConsEtaPtPhi3D(0), + fHistGlobEtaPtPhi3D(0), + fHistUncEtaPtPhi3D(0), + fHistChi2ITS(0), + fHistChi2normITS(0), + fHistFitPtsITS(0), + fHistMaxPtsITS(0), + fHistMeanDedxPos2DITS(0), + fHistMeanDedxNeg2DITS(0), + fHistChi2TPC(0), + fHistChi2normTPC(0), + fHistFitPtsTPC(0), + fHistMaxPtsTPC(0), + fHistFitOverMaxTPC(0), + fHistMeanDedxPos2D(0), + fHistMeanDedxNeg2D(0), + fHistChi2TRD(0), + fHistChi2normTRD(0), + fHistFitPtsTRD(0), + fHistMaxPtsTRD(0), + fHistMeanDedxPos2DTRD(0), + fHistMeanDedxNeg2DTRD(0), + fHistChi2TOF(0), + fHistChi2normTOF(0), + fHistFitPtsTOF(0), + fHistMaxPtsTOF(0), + fHistMeanDedxPos2DTOF(0), + fHistMeanDedxNeg2DTOF(0), + fHistMeanTPCPiPlus(0), + fHistMeanTPCPiMinus(0), + fHistMeanTPCProton(0), + fHistMeanTPCPbar(0), + fHistMeanTPCKplus(0), + fHistMeanTPCKminus(0), + fHistMeanTPCDeuteron(0), + fHistMeanTPCAntiDeuteron(0), + fHistMeanTPCPositron(0), + fHistMeanTPCElectron(0), + fHistMeanTPCMuonPlus(0), + fHistMeanTPCMuonMinus(0), + fHistMeanITSPiPlus(0), + fHistMeanITSPiMinus(0), + fHistMeanITSProton(0), + fHistMeanITSPbar(0), + fHistMeanITSKplus(0), + fHistMeanITSKminus(0), + fHistMeanITSDeuteron(0), + fHistMeanITSAntiDeuteron(0), + fHistMeanITSPositron(0), + fHistMeanITSElectron(0), + fHistMeanITSMuonPlus(0), + fHistMeanITSMuonMinus(0), + fHistMeanTOFPiPlus(0), + fHistMeanTOFPiMinus(0), + fHistMeanTOFProton(0), + fHistMeanTOFPbar(0), + fHistMeanTOFKplus(0), + fHistMeanTOFKminus(0), + fHistMeanTOFDeuteron(0), + fHistMeanTOFAntiDeuteron(0), + fHistMeanTOFPositron(0), + fHistMeanTOFElectron(0), + fHistMeanTOFMuonPlus(0), + fHistMeanTOFMuonMinus(0), + fHistMeanTRDPiPlus(0), + fHistMeanTRDPiMinus(0), + fHistMeanTRDProton(0), + fHistMeanTRDPbar(0), + fHistMeanTRDKplus(0), + fHistMeanTRDKminus(0), + fHistMeanTRDDeuteron(0), + fHistMeanTRDAntiDeuteron(0), + fHistMeanTRDPositron(0), + fHistMeanTRDElectron(0), + fHistMeanTRDMuonPlus(0), + fHistMeanTRDMuonMinus(0), + fHistPidPiPlus(0), + fHistPidPiMinus(0), + fHistPidProton(0), + fHistPidAntiProton(0), + fHistPidKplus(0), + fHistPidKminus(0), + fHistPidDeuteron(0), + fHistPidAntiDeuteron(0), + fHistPidElectron(0), + fHistPidPositron(0), + fHistPidMuonMinus(0), + fHistPidMuonPlus(0), + fHistPidPiPlusPart(0), + fHistPidPiMinusPart(0), + fHistPidProtonPart(0), + fHistPidAntiProtonPart(0), + fHistPidKplusPart(0), + fHistPidKminusPart(0), + fHistPidDeuteronPart(0), + fHistPidAntiDeuteronPart(0), + fHistPidElectronPart(0), + fHistPidPositronPart(0), + fHistPidMuonMinusPart(0), + fHistPidMuonPlusPart(0), + fHistBinEta(0), + fHistBinPt(0), + fHistEtaPtPhi3DPart(0), + fHistYieldPart2D(0), + fHistDcaGlobalPart(0), + fHistInvMassPart(0), + fHistEtaPtPhi3DOut(0), + fHistYieldOut2D(0), + fHistDcaGlobalOut(0), + fHistInvMassOut(0), + fHistMeanDedxPos3DPart(0), + fHistMeanDedxNeg3DPart(0), + fHistMeanDedxPos3DPartITS(0), + fHistMeanDedxNeg3DPartITS(0), + fHistV0Mass(0), + fHistV0EtaPtPhi3D(0), + fHistV0YieldAll2D(0), + fHistV0PYall2D(0), + fHistV0Dca(0), + fHistV0Chi2(0), + fHistV0Lenght(0), + fHistV0Sigma(0), + fHistV0CosPhi(0), + fHistV0MassPtSlices(0), + fHistV0BinEta(0), + fHistV0BinPt(0), + fHistV0sbBinEta(0), + fHistV0sbBinPt(0), + fHistV0MassWin(0), + fHistV0EtaPtPhi3DPart(0), + fHistV0YieldPart2D(0), + fHistV0DcaPart(0), + fHistV0LenghtPart(0), + fHistV0sbMassSide(0), + fHistV0sbEtaPtPhi3DPart(0), + fHistV0sbYieldPart2D(0), + fHistV0sbDcaPart(0), + fHistV0sbLenghtPart(0) { // default constructor (selection given or default selection) if(flowSelect) { fFlowSelect = new AliFlowSelection(*flowSelect) ; } else { fFlowSelect = new AliFlowSelection() ; } - - // output file (histograms) - fHistFileName = "flowAnalysPlot.root" ; - fHistFile = 0 ; - - // for phi weights - fPhiWgtFile = 0 ; - fPhiBins = AliFlowConstants::kPhiBins ; - fPhiMin = 0.; - fPhiMax = 2*TMath::Pi() ; - - // flags - fTrackLoop = kTRUE ; // main loop for charged tracks - fV0loop = kTRUE ; // correlation analysis is done also for neutral secundary vertex - fShuffle = kFALSE ; // randomly reshuffles tracks - fV1Ep1Ep2 = kFALSE ; // disabled by default - fEtaSub = kFALSE ; // eta subevents - fReadPhiWgt = kFALSE ; // if kTRUE & if flowPhiWgt file is there -> Phi Weights are used - fBayWgt = kFALSE ; // Bayesian Weights for P.Id. used - fRePid = kFALSE ; // recalculates the P.Id. (becomes kTRUE if new bayesian weights are plugged in) - fPtWgt = kFALSE ; // pT as a weight - fEtaWgt = kFALSE ; // eta as a weight - fOnePhiWgt = kTRUE ; // one/three phi-wgt histogram(s) - fCustomRespFunc = kFALSE ; // custom "detector response function" used for P.Id -// fMaxLabel = 1000 ; // for labels histogram - - fPhiWgtHistList = 0 ; - fVnResHistList = 0 ; } //----------------------------------------------------------------------- AliFlowAnalyser::~AliFlowAnalyser() diff --git a/PWG2/FLOW/AliFlowEvent.cxx b/PWG2/FLOW/AliFlowEvent.cxx index af3729fcfc6..52cecdce2aa 100644 --- a/PWG2/FLOW/AliFlowEvent.cxx +++ b/PWG2/FLOW/AliFlowEvent.cxx @@ -63,8 +63,15 @@ Bool_t AliFlowEvent::fgCustomRespFunc = kFALSE ; // custom "detector response ClassImp(AliFlowEvent) //----------------------------------------------------------- AliFlowEvent::AliFlowEvent(Int_t lenght): - fEventID(0), fRunID(0), fOrigMult(0), fL0Trigger(0), fZDCpart(0), fCentrality(-1), fDone(kFALSE), - fTrackCollection(0x0), fV0Collection(0x0) + fEventID(0), + fRunID(0), + fOrigMult(0), + fL0Trigger(0), + fZDCpart(0), + fCentrality(-1), + fTrackCollection(0x0), + fV0Collection(0x0), + fDone(kFALSE) { // Default constructor: initializes the ObjArray of FlowTracks and FlowV0s, // cleans the internal variables, sets all the weights to 1, sets default flags. -- 2.39.3