From 1510eee30f12955e88aefbec4bab5f5d9223dc21 Mon Sep 17 00:00:00 2001 From: gconesab Date: Thu, 17 Feb 2011 11:15:11 +0000 Subject: [PATCH] remove data member with name of currently analyzed file, it causes problems with QA train --- PWG4/PartCorrBase/AliCaloTrackMCReader.cxx | 4 ++-- PWG4/PartCorrBase/AliCaloTrackReader.cxx | 7 ++++--- PWG4/PartCorrBase/AliCaloTrackReader.h | 6 +++--- PWG4/PartCorrDep/AliAnaPhoton.cxx | 8 +++++--- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/PWG4/PartCorrBase/AliCaloTrackMCReader.cxx b/PWG4/PartCorrBase/AliCaloTrackMCReader.cxx index cdb4c0b3ac0..e56dfd973a2 100755 --- a/PWG4/PartCorrBase/AliCaloTrackMCReader.cxx +++ b/PWG4/PartCorrBase/AliCaloTrackMCReader.cxx @@ -212,11 +212,11 @@ void AliCaloTrackMCReader::FillCalorimeters(Int_t & iParticle, TParticle* parti } //____________________________________________________________________________ -Bool_t AliCaloTrackMCReader::FillInputEvent(const Int_t iEntry, const char * currentFileName){ +Bool_t AliCaloTrackMCReader::FillInputEvent(const Int_t iEntry, const char * /*currentFileName*/){ //Fill the event counter and input lists that are needed, called by the analysis maker. fEventNumber = iEntry; - fCurrentFileName = TString(currentFileName); + //fCurrentFileName = TString(currentFileName); fTrackMult = 0; //In case of analysis of events with jets, skip those with jet pt > 5 pt hard if(fComparePtHardAndJetPt && GetStack()) { diff --git a/PWG4/PartCorrBase/AliCaloTrackReader.cxx b/PWG4/PartCorrBase/AliCaloTrackReader.cxx index ae1e594ef87..d5af7a3ea57 100755 --- a/PWG4/PartCorrBase/AliCaloTrackReader.cxx +++ b/PWG4/PartCorrBase/AliCaloTrackReader.cxx @@ -55,7 +55,8 @@ ClassImp(AliCaloTrackReader) //____________________________________________________________________________ AliCaloTrackReader::AliCaloTrackReader() : - TObject(), fEventNumber(-1), fCurrentFileName(""),fDataType(0), fDebug(0), + TObject(), fEventNumber(-1), //fCurrentFileName(""), + fDataType(0), fDebug(0), fFiducialCut(0x0), fCheckFidCut(kFALSE), fComparePtHardAndJetPt(kFALSE), fPtHardAndJetPtFactor(7), fCTSPtMin(0), fEMCALPtMin(0),fPHOSPtMin(0), fAODBranchList(new TList ), fAODCTS(new TObjArray()), fAODEMCAL(new TObjArray()), fAODPHOS(new TObjArray()), @@ -389,11 +390,11 @@ void AliCaloTrackReader::Print(const Option_t * opt) const } //___________________________________________________ -Bool_t AliCaloTrackReader::FillInputEvent(const Int_t iEntry, const char * currentFileName) { +Bool_t AliCaloTrackReader::FillInputEvent(const Int_t iEntry, const char * /*currentFileName*/) { //Fill the event counter and input lists that are needed, called by the analysis maker. fEventNumber = iEntry; - fCurrentFileName = TString(currentFileName); + //fCurrentFileName = TString(currentFileName); if(!fInputEvent) { if(fDebug >= 0) printf("AliCaloTrackReader::FillInputEvent() - Input event not available, skip event analysis\n"); return kFALSE; diff --git a/PWG4/PartCorrBase/AliCaloTrackReader.h b/PWG4/PartCorrBase/AliCaloTrackReader.h index 5b137f57dba..388e30f34c2 100755 --- a/PWG4/PartCorrBase/AliCaloTrackReader.h +++ b/PWG4/PartCorrBase/AliCaloTrackReader.h @@ -70,7 +70,7 @@ public: virtual void SetDataType(Int_t data ) { fDataType = data ; } virtual Int_t GetEventNumber() const {return fEventNumber ; } - virtual TString GetCurrentFileName() const {return fCurrentFileName ; } + //virtual TString GetCurrentFileName() const {return fCurrentFileName ; } TString GetTaskName() const {return fTaskName ; } void SetTaskName(TString name) {fTaskName = name ; } @@ -316,7 +316,7 @@ public: protected: Int_t fEventNumber; // Event number - TString fCurrentFileName;// Current file name under analysis + //TString fCurrentFileName;// Current file name under analysis Int_t fDataType ; // Select MC:Kinematics, Data:ESD/AOD, MCData:Both Int_t fDebug; // Debugging level AliFiducialCut * fFiducialCut; //! Acceptance cuts @@ -398,7 +398,7 @@ public: Int_t fCentralityOpt; // Option for the returned value of the centrality, possible options 5, 10, 100 Int_t fCentralityBin[2]; // Minimum and maximum value of the centrality for the analysis - ClassDef(AliCaloTrackReader,25) + ClassDef(AliCaloTrackReader,26) } ; diff --git a/PWG4/PartCorrDep/AliAnaPhoton.cxx b/PWG4/PartCorrDep/AliAnaPhoton.cxx index 9f7810befe6..9f616287bab 100755 --- a/PWG4/PartCorrDep/AliAnaPhoton.cxx +++ b/PWG4/PartCorrDep/AliAnaPhoton.cxx @@ -743,8 +743,9 @@ void AliAnaPhoton::MakeAnalysisFillAOD() // Cluster selection //-------------------------------------- if(GetDebug() > 2) - printf("AliAnaPhoton::MakeAnalysisFillAOD() Current Event %d; Current File Name : %s, Before selection : E %2.2f, pT %2.2f, Ecl %2.2f, phi %2.2f, eta %2.2f\n",GetReader()->GetEventNumber(),(GetReader()->GetCurrentFileName()).Data(), - mom.E(), mom.Pt(),calo->E(),mom.Phi()*TMath::RadToDeg(),mom.Eta()); + printf("AliAnaPhoton::MakeAnalysisFillAOD() Current Event %d; Before selection : E %2.2f, pT %2.2f, Ecl %2.2f, phi %2.2f, eta %2.2f\n", + GetReader()->GetEventNumber(), + mom.E(), mom.Pt(),calo->E(),mom.Phi()*TMath::RadToDeg(),mom.Eta()); //....................................... //If too small or big pt, skip it @@ -790,7 +791,8 @@ void AliAnaPhoton::MakeAnalysisFillAOD() else if(GetDebug() > 2) printf("\t Bad channel cut passed %4.2f > %2.2f \n",distBad, fMinDist); if(GetDebug() > 0) - printf("AliAnaPhoton::MakeAnalysisFillAOD() Current Event %d; Current File Name : %s, After selection : E %2.2f, pT %2.2f, Ecl %2.2f, phi %2.2f, eta %2.2f\n",GetReader()->GetEventNumber(),(GetReader()->GetCurrentFileName()).Data(), + printf("AliAnaPhoton::MakeAnalysisFillAOD() Current Event %d; After selection : E %2.2f, pT %2.2f, Ecl %2.2f, phi %2.2f, eta %2.2f\n", + GetReader()->GetEventNumber(), mom.E(), mom.Pt(),calo->E(),mom.Phi()*TMath::RadToDeg(),mom.Eta()); -- 2.43.0