From 2ad98fc5f1353d6df405519c8cccca390829c82a Mon Sep 17 00:00:00 2001 From: hristov Date: Wed, 29 Aug 2012 12:41:16 +0000 Subject: [PATCH] Fixes for the trunk: compilation on Lion (Yves) --- ANALYSIS/AliAnalysisDataContainer.cxx | 4 ++-- ANALYSIS/AliAnalysisDataContainer.h | 2 +- ANALYSIS/AliAnalysisGoodies.cxx | 9 ++++++++- PWG/muon/AliAnalysisTaskFlowSingleMu.cxx | 2 +- .../AliAnalysisTaskMultiDielectronTG.cxx | 4 +--- .../AliAnalysisTaskMultiDielectronTG.h | 12 ++++++------ .../AliAnalysisTaskDStarCorrelations.cxx | 18 +++++++++--------- .../AliAnalysisTaskSED0Correlations.h | 6 +++--- PWGHF/correlationHF/AliHFCorrelator.cxx | 13 ++++++++++--- .../RESONANCES/AliRsnCutSetDaughterParticle.h | 2 +- STEER/STEER/AliQADataMakerRec.cxx | 6 +++++- STEER/STEER/AliReconstruction.cxx | 4 +++- VZERO/AliVZEROTriggerSimulator.cxx | 4 ++-- 13 files changed, 52 insertions(+), 34 deletions(-) diff --git a/ANALYSIS/AliAnalysisDataContainer.cxx b/ANALYSIS/AliAnalysisDataContainer.cxx index 09352f0f870..556ea0fd4ee 100644 --- a/ANALYSIS/AliAnalysisDataContainer.cxx +++ b/ANALYSIS/AliAnalysisDataContainer.cxx @@ -615,7 +615,7 @@ void AliAnalysisFileDescriptor::Print(Option_t*) const } //______________________________________________________________________________ -void AliAnalysisFileDescriptor::SavePrimitive(ostream &out, Option_t *) +void AliAnalysisFileDescriptor::SavePrimitive(std::ostream &out, Option_t *) { // Stream info to file const Double_t megabyte = 1048576.; @@ -626,7 +626,7 @@ void AliAnalysisFileDescriptor::SavePrimitive(ostream &out, Option_t *) out << "image " << fImage << endl; out << "nreplicas " << fNreplicas << endl; out << "openstamp " << fOpenedAt << endl; - out << setiosflags(ios::fixed) << setprecision(3); + out << setiosflags(std::ios::fixed) << std::setprecision(3); out << "opentime " << fOpenTime << endl; out << "runtime " << fProcessingTime << endl; out << "filesize " << fSize/megabyte << endl; diff --git a/ANALYSIS/AliAnalysisDataContainer.h b/ANALYSIS/AliAnalysisDataContainer.h index b7c2925f929..91be24ce2fe 100644 --- a/ANALYSIS/AliAnalysisDataContainer.h +++ b/ANALYSIS/AliAnalysisDataContainer.h @@ -178,7 +178,7 @@ public: const char *GetUrl() const {return fUrl;} Bool_t IsArchive() const {return fIsArchive;} virtual void Print(Option_t *option="") const; - virtual void SavePrimitive(ostream &out, Option_t *option = ""); + virtual void SavePrimitive(std::ostream &out, Option_t *option = ""); void SetOpenTime(Double_t time) {fOpenTime = time;} diff --git a/ANALYSIS/AliAnalysisGoodies.cxx b/ANALYSIS/AliAnalysisGoodies.cxx index f2ce7d0b75d..1bcc9e6be2c 100644 --- a/ANALYSIS/AliAnalysisGoodies.cxx +++ b/ANALYSIS/AliAnalysisGoodies.cxx @@ -48,6 +48,9 @@ AliAnalysisGoodies::AliAnalysisGoodies() : fESDTreeName("esdTree"), fAmgr(0) { + //ctor + // connects to alien and creates an analysis manager + fTimer.Reset() ; TString token = gSystem->Getenv("GRID_TOKEN") ; @@ -67,7 +70,9 @@ AliAnalysisGoodies::AliAnalysisGoodies(const AliAnalysisGoodies& ag) : fESDTreeName(""), fAmgr(0x0) { - + //copy ctor + // connects to alien and creates an analysis manager + fESDTreeName = ag.fESDTreeName ; TString token = gSystem->Getenv("GRID_TOKEN") ; @@ -93,6 +98,8 @@ AliAnalysisGoodies& AliAnalysisGoodies::operator=(const AliAnalysisGoodies& ag) //______________________________________________________________________________ void AliAnalysisGoodies::Help() const { + // helper + // display all available utilities AliInfo("Analysis utilities:\n") ; printf(" *** Alien2Local : copy files ESD files listed in an xml collection from AliEn catalog to local storage and creates a local xml collection \n") ; printf(" usage: Alien2Local(in, out)\n") ; diff --git a/PWG/muon/AliAnalysisTaskFlowSingleMu.cxx b/PWG/muon/AliAnalysisTaskFlowSingleMu.cxx index 6c03d42bf93..0a325a849d5 100644 --- a/PWG/muon/AliAnalysisTaskFlowSingleMu.cxx +++ b/PWG/muon/AliAnalysisTaskFlowSingleMu.cxx @@ -424,7 +424,7 @@ void AliAnalysisTaskFlowSingleMu::Terminate(Option_t *) { if ( externalReso ) { // If plane resolution file exists, fill resolution TString currLine = ""; - ifstream inFile(resoFilename.Data()); + std::ifstream inFile(resoFilename.Data()); if (inFile.is_open()) { ib = 0; while (! inFile.eof() ) { diff --git a/PWGDQ/dielectron/AliAnalysisTaskMultiDielectronTG.cxx b/PWGDQ/dielectron/AliAnalysisTaskMultiDielectronTG.cxx index fab9d87a0ad..f72970043d5 100644 --- a/PWGDQ/dielectron/AliAnalysisTaskMultiDielectronTG.cxx +++ b/PWGDQ/dielectron/AliAnalysisTaskMultiDielectronTG.cxx @@ -1066,9 +1066,7 @@ void AliAnalysisTaskMultiDielectronTG::CalcVars(AliDielectronSingleTG *iep, AliD + sqrt(me*me+iem->Px()*iem->Px()+iem->Py()*iem->Py()+iem->Pz()*iem->Pz()); mass = e*e-px*px-py*py-pz*pz; - if(mass<0){ - mass = mass; - }else{ + if(mass>=0){ mass = sqrt(mass); } diff --git a/PWGDQ/dielectron/AliAnalysisTaskMultiDielectronTG.h b/PWGDQ/dielectron/AliAnalysisTaskMultiDielectronTG.h index e4022d180bc..fe5f6a3b733 100644 --- a/PWGDQ/dielectron/AliAnalysisTaskMultiDielectronTG.h +++ b/PWGDQ/dielectron/AliAnalysisTaskMultiDielectronTG.h @@ -163,17 +163,17 @@ public: void RejectOP(double val){fdop = val;} ///To reject conversions void RejectConversion(double val, double mass){fdconvphiv = val; fdconvMee = mass;} ///To reject conversions void EnableV0mixing(Bool_t val){fdv0mixing = val;} ///Enable V0 mixing - void CheckGhostPairs(vector e1); ///identify ghost pairs in like sign pais - Bool_t CheckGhost(vector e1, vector e2); ///check ghost pairs for like sign and mixed like-sign pais - void RejectPairs(vector e1, vector e2, Int_t idie); ///identify conversions for the rejection + void CheckGhostPairs(std::vector e1); ///identify ghost pairs in like sign pais + Bool_t CheckGhost(std::vector e1, std::vector e2); ///check ghost pairs for like sign and mixed like-sign pais + void RejectPairs(std::vector e1, std::vector e2, Int_t idie); ///identify conversions for the rejection void FillPair(AliDielectronSingleTG* e1, AliDielectronSingleTG* e2, int type, AliDielectron *die, Int_t idie); /// Fill Pairs bool PairTrackcut(double var1, double var2, double var3, int idie); /// Pair cuts void CalcVars(AliDielectronSingleTG* e1, AliDielectronSingleTG* e2, double &mass, double &phiv, double &px, double &py, double&pz, double &pt, double &e, double &phi, double &eta, double &cos, double &psi); /// Calcualate kinematic variables - void CalcPair(vector e1, vector e2, AliDielectron *die, Int_t idie); ///Process Pairs - void RandomizePool(vector e1, vector e2); ///Randimize pairs - void ReshuffleBuffer(vector ve, deque pool); ///ReshuffleBuffer + void CalcPair(std::vector e1, std::vector e2, AliDielectron *die, Int_t idie); ///Process Pairs + void RandomizePool(std::vector e1, std::vector e2); ///Randimize pairs + void ReshuffleBuffer(std::vector ve, std::deque pool); ///ReshuffleBuffer Double_t GetPhiv(AliDielectronSingleTG* e1, AliDielectronSingleTG* e2); /// calculate phiv Double_t GetOpeningAngle(AliDielectronSingleTG* e1, AliDielectronSingleTG* e2); /// calculate opening angle diff --git a/PWGHF/correlationHF/AliAnalysisTaskDStarCorrelations.cxx b/PWGHF/correlationHF/AliAnalysisTaskDStarCorrelations.cxx index f6a61d4ad85..1f924e47f1b 100644 --- a/PWGHF/correlationHF/AliAnalysisTaskDStarCorrelations.cxx +++ b/PWGHF/correlationHF/AliAnalysisTaskDStarCorrelations.cxx @@ -187,17 +187,17 @@ void AliAnalysisTaskDStarCorrelations::UserExec(Option_t *){ - cout << " " << endl; - cout << "=================================================================================" << endl; + std::cout << " " << std::endl; + std::cout << "=================================================================================" << std::endl; if(!fmixing){ - if(fselect==1) cout << "TASK::Correlation with hadrons on SE "<< endl; - if(fselect==2) cout << "TASK::Correlation with kaons on SE "<< endl; - if(fselect==3) cout << "TASK::Correlation with kzeros on SE "<< endl; + if(fselect==1) std::cout << "TASK::Correlation with hadrons on SE "<< std::endl; + if(fselect==2) std::cout << "TASK::Correlation with kaons on SE "<< std::endl; + if(fselect==3) std::cout << "TASK::Correlation with kzeros on SE "<< std::endl; } if(fmixing){ - if(fselect==1) cout << "TASK::Correlation with hadrons on ME "<< endl; - if(fselect==2) cout << "TASK::Correlation with kaons on ME "<< endl; - if(fselect==3) cout << "TASK::Correlation with kzeros on ME "<< endl; + if(fselect==1) std::cout << "TASK::Correlation with hadrons on ME "<< std::endl; + if(fselect==2) std::cout << "TASK::Correlation with kaons on ME "<< std::endl; + if(fselect==3) std::cout << "TASK::Correlation with kzeros on ME "<< std::endl; } if (!fInputEvent) { Error("UserExec","NO EVENT FOUND!"); @@ -477,7 +477,7 @@ void AliAnalysisTaskDStarCorrelations::UserExec(Option_t *){ Bool_t updated = fCorrelator->PoolUpdate(); if(!updated) AliInfo("Pool was not updated"); - //cout << ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> END OF THE EVENT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<" << endl; + //std::cout << ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> END OF THE EVENT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<" << std::endl; diff --git a/PWGHF/correlationHF/AliAnalysisTaskSED0Correlations.h b/PWGHF/correlationHF/AliAnalysisTaskSED0Correlations.h index 951efd25c2d..1615f4bbed1 100644 --- a/PWGHF/correlationHF/AliAnalysisTaskSED0Correlations.h +++ b/PWGHF/correlationHF/AliAnalysisTaskSED0Correlations.h @@ -85,9 +85,9 @@ class AliAnalysisTaskSED0Correlations : public AliAnalysisTaskSE Bool_t SelectV0(AliAODv0* v0, AliAODVertex *vtx, Int_t option, Int_t idArrayV0[][2]) const; Int_t fNPtBinsCorr; // number of pt bins per correlations - vector fBinLimsCorr; // limits of pt bins per correlations - vector fPtThreshLow; // pT treshold of hadrons - low - vector fPtThreshUp; // pT treshold of hadrons - up + std::vector fBinLimsCorr; // limits of pt bins per correlations + std::vector fPtThreshLow; // pT treshold of hadrons - low + std::vector fPtThreshUp; // pT treshold of hadrons - up Int_t fEvents; // EventCounter Bool_t fAlreadyFilled; // D0 in an event already analyzed (for track distribution plots) diff --git a/PWGHF/correlationHF/AliHFCorrelator.cxx b/PWGHF/correlationHF/AliHFCorrelator.cxx index 72bead0eb36..4887272d7ba 100644 --- a/PWGHF/correlationHF/AliHFCorrelator.cxx +++ b/PWGHF/correlationHF/AliHFCorrelator.cxx @@ -178,8 +178,11 @@ Bool_t AliHFCorrelator::DefineEventPool(){ //_____________________________________________________ Bool_t AliHFCorrelator::Initialize(){ - cout << "AliHFCorrelator::Initialize"<< endl; - if(!fAODEvent) cout << "No AOD event" << endl; + // std::cout << "AliHFCorrelator::Initialize"<< std::endl; + AliInfo("AliHFCorrelator::Initialize") ; + if(!fAODEvent) + AliInfo("No AOD event") ; + //std::cout << "No AOD event" << std::endl; AliCentrality *centralityObj = 0; Int_t multiplicity = -1; @@ -374,7 +377,11 @@ TObjArray* AliHFCorrelator::AcceptAndReduceKZero(AliAODEvent* inputEvent){ Int_t prevposID[size]; for(Int_t iv0 =0; iv0< nOfVZeros; iv0++){// loop on all v0 candidates AliAODv0 *v0 = (static_cast (inputEvent))->GetV0(iv0); - if(!v0) {cout << "is not a v0 at step " << iv0 << endl; continue;} + if(!v0) { + AliInfo(Form("is not a v0 at step, %d", iv0)) ; + //cout << "is not a v0 at step " << iv0 << endl; + continue; + } if(!fhadcuts->IsKZeroSelected(v0,vertex1)) continue; // check if it is a k0 diff --git a/PWGLF/RESONANCES/AliRsnCutSetDaughterParticle.h b/PWGLF/RESONANCES/AliRsnCutSetDaughterParticle.h index c044baf44e2..8465eb4f14b 100644 --- a/PWGLF/RESONANCES/AliRsnCutSetDaughterParticle.h +++ b/PWGLF/RESONANCES/AliRsnCutSetDaughterParticle.h @@ -49,7 +49,7 @@ public: void SetAODTrackCutFilterBit(Int_t ibit){fAODTrkCutFilterBit=ibit; return;} //getters const char * GetAppliedDaughterCutSetName() { return GetName();} - const Int_t GetAppliedDaughterCutSetId() { return fAppliedCutSetID;} + Int_t GetAppliedDaughterCutSetId() { return fAppliedCutSetID;} const AliRsnCutTrackQuality * GetQualityCut() {return fCutQuality;}; private: diff --git a/STEER/STEER/AliQADataMakerRec.cxx b/STEER/STEER/AliQADataMakerRec.cxx index 1b0b764f2af..d2acbfbd6d0 100644 --- a/STEER/STEER/AliQADataMakerRec.cxx +++ b/STEER/STEER/AliQADataMakerRec.cxx @@ -422,8 +422,12 @@ void AliQADataMakerRec::StartOfCycle(AliQAv1::TASKINDEX_t task, Int_t run, const if (AliQAManager::QAManager(AliQAv1::kRECMODE)->IsSaveData()) fOutput = AliQAv1::GetQADataFile(GetName(), fRun) ; } - AliDebug(AliQAv1::GetQADebugLevel(), Form(" Run %d Cycle %d task %s file %s", + if (AliQAManager::QAManager(AliQAv1::kRECMODE)->IsSaveData()) + AliDebug(AliQAv1::GetQADebugLevel(), Form(" Run %d Cycle %d task %s file %s", fRun, fCurrentCycle, AliQAv1::GetTaskName(task).Data(), fOutput->GetName() )) ; + else + AliDebug(AliQAv1::GetQADebugLevel(), Form(" Run %d Cycle %d task %s not saved", + fRun, fCurrentCycle, AliQAv1::GetTaskName(task).Data() )) ; // fDetectorDir = fOutput->GetDirectory(GetDetectorDirName()) ; // if (!fDetectorDir) diff --git a/STEER/STEER/AliReconstruction.cxx b/STEER/STEER/AliReconstruction.cxx index ba33e014d34..aa8e049d76c 100644 --- a/STEER/STEER/AliReconstruction.cxx +++ b/STEER/STEER/AliReconstruction.cxx @@ -661,6 +661,8 @@ void AliReconstruction::InitQA() AliQAManager * qam = AliQAManager::QAManager(AliQAv1::kRECMODE) ; + qam->SetSaveData(kTRUE); + qam->SetCycleLength(AliQAv1::kITS, 5) ; if (fWriteQAExpertData) qam->SetWriteExpert() ; @@ -4474,7 +4476,7 @@ Bool_t AliReconstruction::HasEnoughResources(int ev) // unlink(Form("%s",fgkStopEvFName)); ofstream outfile(fgkStopEvFName); - outfile << ev << endl; + outfile << ev << std::endl; outfile.close(); fStopped = kTRUE; } diff --git a/VZERO/AliVZEROTriggerSimulator.cxx b/VZERO/AliVZEROTriggerSimulator.cxx index 4c9c703667b..b8ef3c85231 100644 --- a/VZERO/AliVZEROTriggerSimulator.cxx +++ b/VZERO/AliVZEROTriggerSimulator.cxx @@ -377,9 +377,9 @@ void AliVZEROTriggerSimulator::Print(Option_t* /* opt */) const // Prints the trigger windows as // initialized from the OCDB for (int i=0; iGetStartTime() << " -> " << fBBGate[i]->GetStopTime() << ") BG (" << fBGGate[i]->GetStartTime() << " -> " << fBGGate[i]->GetStopTime() << ")" << endl; + std::cout << "Board=" << i << " BB (" << fBBGate[i]->GetStartTime() << " -> " << fBBGate[i]->GetStopTime() << ") BG (" << fBGGate[i]->GetStartTime() << " -> " << fBGGate[i]->GetStopTime() << ")" << std::endl; } - cout << endl; + std::cout << std::endl; } -- 2.43.0