From 9eeae5d5fe3da70c2cd59d3b416df275b4d6dab0 Mon Sep 17 00:00:00 2001 From: hristov Date: Wed, 20 Jan 2010 16:44:30 +0000 Subject: [PATCH] Changes for report #61429: PID: Separating response functions from ESD. The signature of IsSelected is reverted --- ANALYSIS/AliAnalysisCuts.h | 4 ++-- ANALYSIS/AliAnalysisFilter.cxx | 7 +++---- ANALYSIS/AliAnalysisFilter.h | 4 ++-- ANALYSIS/AliAnalysisTaskESDfilter.cxx | 18 +++++++++--------- ANALYSIS/AliAnalysisTaskKineFilter.cxx | 4 ++-- ANALYSIS/AliBackgroundSelection.cxx | 2 +- ANALYSIS/AliBackgroundSelection.h | 4 ++-- ANALYSIS/AliESDpidCuts.cxx | 17 +++++++++++------ ANALYSIS/AliESDpidCuts.h | 4 ++-- ANALYSIS/AliESDtrackCuts.h | 6 +++--- ANALYSIS/AliESDv0Cuts.h | 2 +- ANALYSIS/AliKineTrackCuts.cxx | 2 +- ANALYSIS/AliKineTrackCuts.h | 2 +- ANALYSIS/AliPhysicsSelection.h | 4 ++-- CORRFW/AliCFAcceptanceCuts.cxx | 2 +- CORRFW/AliCFAcceptanceCuts.h | 4 ++-- CORRFW/AliCFEventClassCuts.cxx | 2 +- CORRFW/AliCFEventClassCuts.h | 4 ++-- CORRFW/AliCFEventGenCuts.cxx | 2 +- CORRFW/AliCFEventGenCuts.h | 4 ++-- CORRFW/AliCFEventRecCuts.cxx | 2 +- CORRFW/AliCFEventRecCuts.h | 4 ++-- CORRFW/AliCFPairAcceptanceCuts.cxx | 2 +- CORRFW/AliCFPairAcceptanceCuts.h | 4 ++-- CORRFW/AliCFPairIsPrimaryCuts.cxx | 2 +- CORRFW/AliCFPairIsPrimaryCuts.h | 4 ++-- CORRFW/AliCFPairPidCut.cxx | 2 +- CORRFW/AliCFPairPidCut.h | 4 ++-- CORRFW/AliCFPairQualityCuts.cxx | 2 +- CORRFW/AliCFPairQualityCuts.h | 4 ++-- CORRFW/AliCFParticleGenCuts.cxx | 2 +- CORRFW/AliCFParticleGenCuts.h | 4 ++-- CORRFW/AliCFTrackCutPid.cxx | 2 +- CORRFW/AliCFTrackCutPid.h | 4 ++-- CORRFW/AliCFTrackIsPrimaryCuts.cxx | 2 +- CORRFW/AliCFTrackIsPrimaryCuts.h | 4 ++-- CORRFW/AliCFTrackKineCuts.cxx | 2 +- CORRFW/AliCFTrackKineCuts.h | 4 ++-- CORRFW/AliCFTrackQualityCuts.cxx | 2 +- CORRFW/AliCFTrackQualityCuts.h | 4 ++-- CORRFW/AliCFV0TopoCuts.cxx | 2 +- CORRFW/AliCFV0TopoCuts.h | 4 ++-- HLT/JET/AliHLTJETJetCuts.cxx | 2 +- HLT/JET/AliHLTJETJetCuts.h | 2 +- HLT/JET/AliHLTJETTrackCuts.cxx | 2 +- HLT/JET/AliHLTJETTrackCuts.h | 2 +- HLT/JET/cone/AliHLTJETConeSeedCuts.cxx | 2 +- HLT/JET/cone/AliHLTJETConeSeedCuts.h | 2 +- PWG0/dNdPt/AlidNdPtAcceptanceCuts.h | 4 ++-- PWG0/dNdPt/AlidNdPtEventCuts.h | 4 ++-- PWG2/AOD/AliAnalysisTaskPWG2ESDfilter.cxx | 2 +- PWG2/SPECTRA/AliAnalysisCentralCutESD.cxx | 2 +- PWG2/SPECTRA/AliAnalysisCentralCutESD.h | 4 ++-- PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.cxx | 2 +- PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.h | 4 ++-- PWG2/SPECTRA/AliAnalysisCentralCutEvtMC.cxx | 2 +- PWG2/SPECTRA/AliAnalysisCentralCutEvtMC.h | 4 ++-- PWG2/SPECTRA/AliAnalysisCentralCutMC.cxx | 2 +- PWG2/SPECTRA/AliAnalysisCentralCutMC.h | 4 ++-- PWG3/hfe/AliHFEextraCuts.cxx | 2 +- PWG3/hfe/AliHFEextraCuts.h | 4 ++-- PWG3/muon/AliESDMuonTrackCuts.h | 4 ++-- STEER/AliVCuts.h | 3 +-- 63 files changed, 113 insertions(+), 110 deletions(-) diff --git a/ANALYSIS/AliAnalysisCuts.h b/ANALYSIS/AliAnalysisCuts.h index 828842797d9..b087e29a3f1 100644 --- a/ANALYSIS/AliAnalysisCuts.h +++ b/ANALYSIS/AliAnalysisCuts.h @@ -22,8 +22,8 @@ class AliAnalysisCuts : public AliVCuts AliAnalysisCuts(const char* name, const char* title); AliAnalysisCuts(const AliAnalysisCuts& obj); virtual ~AliAnalysisCuts() {;} - virtual Bool_t IsSelected(TObject* track, TObject *event=0) = 0; - //virtual Bool_t IsSelected(TList* list) = 0; + virtual Bool_t IsSelected(TObject* /* obj */ ) {return kFALSE;} + virtual Bool_t IsSelected(TList* /* list */ ) = 0; virtual void Init() {;} virtual void SetFilterMask(UInt_t mask) {fFilterMask = mask;} virtual UInt_t GetFilterMask() const {return fFilterMask;} diff --git a/ANALYSIS/AliAnalysisFilter.cxx b/ANALYSIS/AliAnalysisFilter.cxx index 31c1d67864c..af0841f68b6 100644 --- a/ANALYSIS/AliAnalysisFilter.cxx +++ b/ANALYSIS/AliAnalysisFilter.cxx @@ -64,7 +64,7 @@ AliAnalysisFilter& AliAnalysisFilter::operator=(const AliAnalysisFilter& other) return *this; } -UInt_t AliAnalysisFilter::IsSelected(TObject* track, TObject* event) +UInt_t AliAnalysisFilter::IsSelected(TObject* obj) { // // Loop over all set of cuts @@ -77,7 +77,7 @@ UInt_t AliAnalysisFilter::IsSelected(TObject* track, TObject* event) Int_t iCutB = 1; while((cuts = (AliAnalysisCuts*)next())) { - Bool_t acc = cuts->IsSelected(track, event); + Bool_t acc = cuts->IsSelected(obj); if ((filterMask = cuts->GetFilterMask()) > 0) { acc = (acc && (filterMask == result)); } @@ -89,7 +89,6 @@ UInt_t AliAnalysisFilter::IsSelected(TObject* track, TObject* event) return result; } -/* UInt_t AliAnalysisFilter::IsSelected(TList* list) { // @@ -114,7 +113,7 @@ UInt_t AliAnalysisFilter::IsSelected(TList* list) return result; } -*/ + void AliAnalysisFilter::Init() { // diff --git a/ANALYSIS/AliAnalysisFilter.h b/ANALYSIS/AliAnalysisFilter.h index 8d613d85b0a..1bcc36065b4 100644 --- a/ANALYSIS/AliAnalysisFilter.h +++ b/ANALYSIS/AliAnalysisFilter.h @@ -24,8 +24,8 @@ class AliAnalysisFilter : public TNamed AliAnalysisFilter(const AliAnalysisFilter& obj); AliAnalysisFilter& operator=(const AliAnalysisFilter& other); virtual ~AliAnalysisFilter() {;} - virtual UInt_t IsSelected(TObject* track, TObject *event = 0); - //virtual UInt_t IsSelected(TList* obj); + virtual UInt_t IsSelected(TObject* obj); + virtual UInt_t IsSelected(TList* obj); virtual Bool_t IsSelected(char* name); virtual void AddCuts(AliAnalysisCuts* cuts); virtual void Init(); diff --git a/ANALYSIS/AliAnalysisTaskESDfilter.cxx b/ANALYSIS/AliAnalysisTaskESDfilter.cxx index 9f7526b3d1f..d8a72a1c2f8 100644 --- a/ANALYSIS/AliAnalysisTaskESDfilter.cxx +++ b/ANALYSIS/AliAnalysisTaskESDfilter.cxx @@ -384,7 +384,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() { usedTrack[idxBachFromCascade] = kTRUE; UInt_t selectInfo = 0; - if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdCascadeBach,esd); + if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdCascadeBach); if(mcH)mcH->SelectParticle(esdCascadeBach->GetLabel()); aodTrack = new(tracks[jTracks++]) AliAODTrack(esdCascadeBach->GetID(), esdCascadeBach->GetLabel(), @@ -465,7 +465,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() { usedTrack[idxPosFromV0Dghter] = kTRUE; UInt_t selectInfo = 0; - if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdCascadePos,esd); + if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdCascadePos); if(mcH) mcH->SelectParticle(esdCascadePos->GetLabel()); aodTrack = new(tracks[jTracks++]) AliAODTrack( esdCascadePos->GetID(), esdCascadePos->GetLabel(), @@ -509,7 +509,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() { usedTrack[idxNegFromV0Dghter] = kTRUE; UInt_t selectInfo = 0; - if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdCascadeNeg,esd); + if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdCascadeNeg); if(mcH)mcH->SelectParticle(esdCascadeNeg->GetLabel()); aodTrack = new(tracks[jTracks++]) AliAODTrack( esdCascadeNeg->GetID(), esdCascadeNeg->GetLabel(), @@ -680,7 +680,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() { v0objects.AddAt(esdVtx, 3); UInt_t selectV0 = 0; if (fV0Filter) { - selectV0 = fV0Filter->IsSelected(&v0objects,esd); + selectV0 = fV0Filter->IsSelected(&v0objects); // this is a little awkward but otherwise the // list wants to access the pointer (delete it) // again when going out of scope @@ -725,7 +725,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() { if (!usedTrack[posFromV0]) { usedTrack[posFromV0] = kTRUE; UInt_t selectInfo = 0; - if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdV0Pos,esd); + if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdV0Pos); if(mcH)mcH->SelectParticle(esdV0Pos->GetLabel()); aodTrack = new(tracks[jTracks++]) AliAODTrack(esdV0Pos->GetID(), esdV0Pos->GetLabel(), @@ -768,7 +768,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() { if (!usedTrack[negFromV0]) { usedTrack[negFromV0] = kTRUE; UInt_t selectInfo = 0; - if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdV0Neg,esd); + if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdV0Neg); if(mcH)mcH->SelectParticle(esdV0Neg->GetLabel()); aodTrack = new(tracks[jTracks++]) AliAODTrack(esdV0Neg->GetID(), esdV0Neg->GetLabel(), @@ -888,7 +888,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() { UInt_t selectInfo = 0; if (fTrackFilter) { - selectInfo = fTrackFilter->IsSelected(esd->GetTrack(imother),esd); + selectInfo = fTrackFilter->IsSelected(esd->GetTrack(imother)); if (!selectInfo) continue; } @@ -958,7 +958,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() { esdTrackD->GetCovarianceXYZPxPyPz(covTr); esdTrackD->GetESDpid(pid); selectInfo = 0; - if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdTrackD,esd); + if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdTrackD); if(mcH)mcH->SelectParticle(esdTrackD->GetLabel()); daughter = new(tracks[jTracks++]) AliAODTrack(esdTrackD->GetID(), @@ -1011,7 +1011,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() { // // Track selection if (fTrackFilter) { - selectInfo = fTrackFilter->IsSelected(esdTrack,esd); + selectInfo = fTrackFilter->IsSelected(esdTrack); if (!selectInfo && !vtx->UsesTrack(esdTrack->GetID())) continue; } diff --git a/ANALYSIS/AliAnalysisTaskKineFilter.cxx b/ANALYSIS/AliAnalysisTaskKineFilter.cxx index 8566e8daf77..332bc6de8d1 100644 --- a/ANALYSIS/AliAnalysisTaskKineFilter.cxx +++ b/ANALYSIS/AliAnalysisTaskKineFilter.cxx @@ -172,7 +172,7 @@ void AliAnalysisTaskKineFilter::UserExec(Option_t */*option*/) // Track selection UInt_t selectInfo = 0; if (fTrackFilter) { - selectInfo = fTrackFilter->IsSelected(part,0); + selectInfo = fTrackFilter->IsSelected(part); if (!selectInfo) continue; } @@ -257,7 +257,7 @@ Int_t AliAnalysisTaskKineFilter::LoopOverSecondaries(TParticle *mother, Int_t &j // // Track selection if (fTrackFilter) { - selectInfo = fTrackFilter->IsSelected(part,0); + selectInfo = fTrackFilter->IsSelected(part); if (!selectInfo) continue; } diff --git a/ANALYSIS/AliBackgroundSelection.cxx b/ANALYSIS/AliBackgroundSelection.cxx index 503c3266943..fdd5bb3bd38 100644 --- a/ANALYSIS/AliBackgroundSelection.cxx +++ b/ANALYSIS/AliBackgroundSelection.cxx @@ -54,7 +54,7 @@ AliBackgroundSelection::~AliBackgroundSelection() { } -Bool_t AliBackgroundSelection::IsSelected(TObject* obj, TObject* /* event */){ +Bool_t AliBackgroundSelection::IsSelected(TObject* obj){ // reset fSelected SetSelected(kFALSE); diff --git a/ANALYSIS/AliBackgroundSelection.h b/ANALYSIS/AliBackgroundSelection.h index da497422b8a..a92c91a278a 100644 --- a/ANALYSIS/AliBackgroundSelection.h +++ b/ANALYSIS/AliBackgroundSelection.h @@ -23,8 +23,8 @@ public: AliBackgroundSelection(const char* name, const char* title); AliBackgroundSelection(const AliBackgroundSelection& obj); virtual ~AliBackgroundSelection(); - virtual Bool_t IsSelected(TObject* obj, TObject * /*event*/ = 0); - //virtual Bool_t IsSelected(TList* ) {AliFatal("Not implemented");return 0;} + virtual Bool_t IsSelected(TObject* obj); + virtual Bool_t IsSelected(TList* ) {AliFatal("Not implemented");return 0;} virtual void Init(); virtual TList * GetOutput() {return fOutputHist;} diff --git a/ANALYSIS/AliESDpidCuts.cxx b/ANALYSIS/AliESDpidCuts.cxx index ea463694519..72b9aaf2c30 100644 --- a/ANALYSIS/AliESDpidCuts.cxx +++ b/ANALYSIS/AliESDpidCuts.cxx @@ -8,6 +8,7 @@ #include #include #include +#include #include "AliESDtrack.h" #include "AliESDEvent.h" @@ -102,17 +103,21 @@ AliESDpidCuts::~AliESDpidCuts(){ } //_____________________________________________________________________ -Bool_t AliESDpidCuts::IsSelected(TObject *track, TObject *event){ +Bool_t AliESDpidCuts::IsSelected(TList *lst){ // // Select Track // - if(TString(track->IsA()->GetName()).CompareTo("AliESDtrack")){ - Char_t errormessage[256]; - sprintf(errormessage, "Provided object not an AliESDtrack: Type %s", track->IsA()->GetName()); - AliError(errormessage); + AliESDtrack * trk = dynamic_cast(lst->At(0)); + if(!trk){ + AliError("Provided object is not AliESDtrack!"); return kFALSE; } - return AcceptTrack(const_cast(dynamic_cast(track)),dynamic_cast(event)); + AliESDEvent * evt = dynamic_cast(lst->At(1)); + if(!evt){ + AliError("No AliESDEvent!"); + return kFALSE; + } + return AcceptTrack(trk,evt); } //_____________________________________________________________________ diff --git a/ANALYSIS/AliESDpidCuts.h b/ANALYSIS/AliESDpidCuts.h index c88cb5bb6c1..239ea7a9e50 100644 --- a/ANALYSIS/AliESDpidCuts.h +++ b/ANALYSIS/AliESDpidCuts.h @@ -35,8 +35,8 @@ class AliESDpidCuts : public AliAnalysisCuts{ void DefineHistograms(Color_t color = kRed); void DrawHistograms(); void SaveHistograms(const Char_t *location = NULL); - virtual Bool_t IsSelected(TObject *track, TObject *event); - //virtual Bool_t IsSelected(TList *) { return kTRUE; } + virtual Bool_t IsSelected(TObject *){ return kTRUE; } + virtual Bool_t IsSelected(TList * lst); virtual Bool_t AcceptTrack(const AliESDtrack *track, const AliESDEvent *event); void SetTPCclusterRatioCut(Float_t clr) { fCutTPCclusterRatio = clr; } diff --git a/ANALYSIS/AliESDtrackCuts.h b/ANALYSIS/AliESDtrackCuts.h index c8494e87c71..3570d705ac5 100644 --- a/ANALYSIS/AliESDtrackCuts.h +++ b/ANALYSIS/AliESDtrackCuts.h @@ -42,9 +42,9 @@ public: AliESDtrackCuts(const Char_t* name = "AliESDtrackCuts", const Char_t* title = ""); virtual ~AliESDtrackCuts(); - Bool_t IsSelected(TObject* track, TObject * /*event*/=0) - {return AcceptTrack((AliESDtrack*)track);} - //Bool_t IsSelected(TList* /*list*/) {return kTRUE;} + Bool_t IsSelected(TObject* obj) + {return AcceptTrack((AliESDtrack*)obj);} + Bool_t IsSelected(TList* /*list*/) {return kTRUE;} Bool_t AcceptTrack(AliESDtrack* esdTrack); TObjArray* GetAcceptedTracks(AliESDEvent* esd, Bool_t bTPC = kFALSE); diff --git a/ANALYSIS/AliESDv0Cuts.h b/ANALYSIS/AliESDv0Cuts.h index 4dbd9afb777..25bc86fe9fc 100644 --- a/ANALYSIS/AliESDv0Cuts.h +++ b/ANALYSIS/AliESDv0Cuts.h @@ -24,7 +24,7 @@ public: AliESDv0Cuts(const Char_t* name = "AliESDv0Cuts", const Char_t* title = ""); virtual ~AliESDv0Cuts(); - Bool_t IsSelected(TObject* /*obj*/, TObject* /* event */ = 0) {return kTRUE;} + Bool_t IsSelected(TObject* /*obj*/) {return kTRUE;} Bool_t IsSelected(TList* listObj); Bool_t IsSelected(TObject* obj1, TObject* obj2, TObject* obj3, TObject* obj4) {return AcceptV0((AliESDv0*) obj1, (AliESDtrack*) obj2, (AliESDtrack*) obj3, (const AliESDVertex*) obj4);} diff --git a/ANALYSIS/AliKineTrackCuts.cxx b/ANALYSIS/AliKineTrackCuts.cxx index 2c734763a1d..60298ab4df9 100644 --- a/ANALYSIS/AliKineTrackCuts.cxx +++ b/ANALYSIS/AliKineTrackCuts.cxx @@ -65,7 +65,7 @@ AliKineTrackCuts::AliKineTrackCuts(const Char_t* name, const Char_t* title) : //____________________________________________________________________ -Bool_t AliKineTrackCuts::IsSelected(TObject* obj, TObject * /*event*/ ) +Bool_t AliKineTrackCuts::IsSelected(TObject* obj) { TParticle * part = (TParticle *)obj; diff --git a/ANALYSIS/AliKineTrackCuts.h b/ANALYSIS/AliKineTrackCuts.h index c9dba136dff..b3b3f6acb9f 100644 --- a/ANALYSIS/AliKineTrackCuts.h +++ b/ANALYSIS/AliKineTrackCuts.h @@ -16,7 +16,7 @@ public: AliKineTrackCuts(const Char_t* name = "AliKineTrackCuts", const Char_t* title = ""); virtual ~AliKineTrackCuts(){;} - Bool_t IsSelected(TObject* obj, TObject * /*event */ = 0); + Bool_t IsSelected(TObject* obj); Bool_t IsSelected(TList* /*list*/) {return kTRUE;} void SetFinalParticles( Bool_t val=kTRUE ) { fOnlyFinalParticles = val; } diff --git a/ANALYSIS/AliPhysicsSelection.h b/ANALYSIS/AliPhysicsSelection.h index 728047f4d94..2098de8305b 100644 --- a/ANALYSIS/AliPhysicsSelection.h +++ b/ANALYSIS/AliPhysicsSelection.h @@ -30,8 +30,8 @@ class AliPhysicsSelection : public AliAnalysisCuts virtual ~AliPhysicsSelection(); // AliAnalysisCuts interface - virtual Bool_t IsSelected(TObject* obj, TObject* /*event*/ = 0) { return IsCollisionCandidate((const AliESDEvent*) obj); } - //virtual Bool_t IsSelected(TList*) { return kFALSE; } + virtual Bool_t IsSelected(TObject* obj) { return IsCollisionCandidate((const AliESDEvent*) obj); } + virtual Bool_t IsSelected(TList*) { return kFALSE; } Bool_t IsCollisionCandidate(const AliESDEvent* aEsd); Bool_t Initialize(UInt_t runNumber); diff --git a/CORRFW/AliCFAcceptanceCuts.cxx b/CORRFW/AliCFAcceptanceCuts.cxx index 6345d4a65cd..c9723667659 100644 --- a/CORRFW/AliCFAcceptanceCuts.cxx +++ b/CORRFW/AliCFAcceptanceCuts.cxx @@ -112,7 +112,7 @@ AliCFAcceptanceCuts& AliCFAcceptanceCuts::operator=(const AliCFAcceptanceCuts& c } //______________________________________________________________ -Bool_t AliCFAcceptanceCuts::IsSelected(TObject *obj, TObject *obj2) { +Bool_t AliCFAcceptanceCuts::IsSelected(TObject *obj) { // // check if selections on 'obj' are passed // 'obj' must be an AliMCParticle diff --git a/CORRFW/AliCFAcceptanceCuts.h b/CORRFW/AliCFAcceptanceCuts.h index 7d5d78a0f0b..238d5a25f7e 100644 --- a/CORRFW/AliCFAcceptanceCuts.h +++ b/CORRFW/AliCFAcceptanceCuts.h @@ -42,8 +42,8 @@ class AliCFAcceptanceCuts : public AliCFCutBase AliCFAcceptanceCuts(const AliCFAcceptanceCuts& c) ; AliCFAcceptanceCuts& operator=(const AliCFAcceptanceCuts& c) ; virtual ~AliCFAcceptanceCuts() { }; - virtual Bool_t IsSelected(TObject* obj, TObject *obj2 = 0) ; - //virtual Bool_t IsSelected(TList* /*list*/) {return kTRUE;} + virtual Bool_t IsSelected(TObject* obj) ; + virtual Bool_t IsSelected(TList* /*list*/) {return kTRUE;} virtual void SetMCEventInfo(const TObject* mcInfo) ; void SetMinNHitITS (Int_t nhits) {fMinNHitITS=nhits;} void SetMinNHitTPC (Int_t nhits) {fMinNHitTPC=nhits;} diff --git a/CORRFW/AliCFEventClassCuts.cxx b/CORRFW/AliCFEventClassCuts.cxx index e8031d915c2..ed3ee23e412 100644 --- a/CORRFW/AliCFEventClassCuts.cxx +++ b/CORRFW/AliCFEventClassCuts.cxx @@ -172,7 +172,7 @@ void AliCFEventClassCuts::Initialise() } //____________________________________________________________________ -Bool_t AliCFEventClassCuts::IsSelected(TObject* obj, TObject * /* obj2 */) { +Bool_t AliCFEventClassCuts::IsSelected(TObject* obj) { // //Check if the requested cuts are passed // diff --git a/CORRFW/AliCFEventClassCuts.h b/CORRFW/AliCFEventClassCuts.h index 343550c96a8..2e29b101e0c 100644 --- a/CORRFW/AliCFEventClassCuts.h +++ b/CORRFW/AliCFEventClassCuts.h @@ -36,8 +36,8 @@ class AliCFEventClassCuts: public AliCFCutBase AliCFEventClassCuts(const AliCFEventClassCuts& c) ; AliCFEventClassCuts& operator=(const AliCFEventClassCuts& c) ; ~AliCFEventClassCuts(); - Bool_t IsSelected(TObject* obj, TObject *obj2 = 0); - //Bool_t IsSelected(TList* /*list*/) {return kTRUE;} + Bool_t IsSelected(TObject* obj); + Bool_t IsSelected(TList* /*list*/) {return kTRUE;} //Association to The Trigger bits in the mask. //They correspond to the PP running descriptor as in diff --git a/CORRFW/AliCFEventGenCuts.cxx b/CORRFW/AliCFEventGenCuts.cxx index f813abb486b..e26cae99828 100644 --- a/CORRFW/AliCFEventGenCuts.cxx +++ b/CORRFW/AliCFEventGenCuts.cxx @@ -122,7 +122,7 @@ AliCFEventGenCuts& AliCFEventGenCuts::operator=(const AliCFEventGenCuts& c) return *this ; } //____________________________________________________________________ -Bool_t AliCFEventGenCuts::IsSelected(TObject* obj, TObject * /* obj2 */) { +Bool_t AliCFEventGenCuts::IsSelected(TObject* obj) { // //Check if the requested cuts are passed // diff --git a/CORRFW/AliCFEventGenCuts.h b/CORRFW/AliCFEventGenCuts.h index eddd025ea61..d1dfa7ab11e 100644 --- a/CORRFW/AliCFEventGenCuts.h +++ b/CORRFW/AliCFEventGenCuts.h @@ -37,8 +37,8 @@ class AliCFEventGenCuts: public AliCFCutBase AliCFEventGenCuts(const AliCFEventGenCuts& c) ; AliCFEventGenCuts& operator=(const AliCFEventGenCuts& c) ; ~AliCFEventGenCuts(); - Bool_t IsSelected(TObject* obj, TObject *obj2 = 0); - //Bool_t IsSelected(TList* /*list*/) {return kTRUE;} + Bool_t IsSelected(TObject* obj); + Bool_t IsSelected(TList* /*list*/) {return kTRUE;} //number of embedded cuts enum{kNCuts=5}; diff --git a/CORRFW/AliCFEventRecCuts.cxx b/CORRFW/AliCFEventRecCuts.cxx index c2eefc36c81..25daa4bff08 100644 --- a/CORRFW/AliCFEventRecCuts.cxx +++ b/CORRFW/AliCFEventRecCuts.cxx @@ -190,7 +190,7 @@ AliCFEventRecCuts& AliCFEventRecCuts::operator=(const AliCFEventRecCuts& c) } //____________________________________________________________________ -Bool_t AliCFEventRecCuts::IsSelected(TObject* obj, TObject * /* obj2 */) { +Bool_t AliCFEventRecCuts::IsSelected(TObject* obj) { // //Check if the requested cuts are passed // diff --git a/CORRFW/AliCFEventRecCuts.h b/CORRFW/AliCFEventRecCuts.h index 0866c894536..6c696e37c56 100644 --- a/CORRFW/AliCFEventRecCuts.h +++ b/CORRFW/AliCFEventRecCuts.h @@ -36,8 +36,8 @@ class AliCFEventRecCuts: public AliCFCutBase AliCFEventRecCuts(const AliCFEventRecCuts& c) ; AliCFEventRecCuts& operator=(const AliCFEventRecCuts& c) ; ~AliCFEventRecCuts(); - Bool_t IsSelected(TObject* obj, TObject *obj2 = 0); - //Bool_t IsSelected(TList* /*list*/) {return kTRUE;} + Bool_t IsSelected(TObject* obj); + Bool_t IsSelected(TList* /*list*/) {return kTRUE;} void SetNTracksCut(Int_t xMin=-1, Int_t xMax=1000000) {fNTracksMin=xMin; fNTracksMax=xMax;} // cut values setter diff --git a/CORRFW/AliCFPairAcceptanceCuts.cxx b/CORRFW/AliCFPairAcceptanceCuts.cxx index 3fa4346d149..6637965de0b 100755 --- a/CORRFW/AliCFPairAcceptanceCuts.cxx +++ b/CORRFW/AliCFPairAcceptanceCuts.cxx @@ -85,7 +85,7 @@ AliCFPairAcceptanceCuts& AliCFPairAcceptanceCuts::operator=(const AliCFPairAccep } //__________________________________________________________ -Bool_t AliCFPairAcceptanceCuts::IsSelected(TObject* obj, TObject* /* obj2 */) { +Bool_t AliCFPairAcceptanceCuts::IsSelected(TObject* obj) { // // checks the number of track references associated to 'obj' // 'obj' must be an AliMCParticle diff --git a/CORRFW/AliCFPairAcceptanceCuts.h b/CORRFW/AliCFPairAcceptanceCuts.h index a7314275ec8..eecec2f1a9f 100755 --- a/CORRFW/AliCFPairAcceptanceCuts.h +++ b/CORRFW/AliCFPairAcceptanceCuts.h @@ -40,8 +40,8 @@ class AliCFPairAcceptanceCuts : public AliCFCutBase AliCFPairAcceptanceCuts(const AliCFPairAcceptanceCuts& c) ; AliCFPairAcceptanceCuts& operator=(const AliCFPairAcceptanceCuts& c) ; virtual ~AliCFPairAcceptanceCuts() {delete fCutNeg; delete fCutPos; } - Bool_t IsSelected(TObject* obj, TObject *obj2) ; -// Bool_t IsSelected(TList* /*list*/) {return kTRUE;} + Bool_t IsSelected(TObject* obj) ; + Bool_t IsSelected(TList* /*list*/) {return kTRUE;} virtual void SetMCEventInfo(const TObject *mcInfo) ; virtual AliCFAcceptanceCuts* GetNegCut() const {return fCutNeg;} virtual AliCFAcceptanceCuts* GetPosCut() const {return fCutPos;} diff --git a/CORRFW/AliCFPairIsPrimaryCuts.cxx b/CORRFW/AliCFPairIsPrimaryCuts.cxx index 045423edecf..d73a735a097 100755 --- a/CORRFW/AliCFPairIsPrimaryCuts.cxx +++ b/CORRFW/AliCFPairIsPrimaryCuts.cxx @@ -71,7 +71,7 @@ AliCFPairIsPrimaryCuts& AliCFPairIsPrimaryCuts::operator=(const AliCFPairIsPrima } //__________________________________________________________________________________ -Bool_t AliCFPairIsPrimaryCuts::IsSelected(TObject* obj, TObject * /* obj2 */ ) { +Bool_t AliCFPairIsPrimaryCuts::IsSelected(TObject* obj) { // // loops over decisions of single cuts and returns if the track is accepted // diff --git a/CORRFW/AliCFPairIsPrimaryCuts.h b/CORRFW/AliCFPairIsPrimaryCuts.h index 667d3b8dd94..4c7115f700b 100755 --- a/CORRFW/AliCFPairIsPrimaryCuts.h +++ b/CORRFW/AliCFPairIsPrimaryCuts.h @@ -36,8 +36,8 @@ class AliCFPairIsPrimaryCuts : public AliCFCutBase AliCFPairIsPrimaryCuts& operator=(const AliCFPairIsPrimaryCuts& c) ; virtual ~AliCFPairIsPrimaryCuts() {delete fCutNeg; delete fCutPos; } - Bool_t IsSelected(TObject* obj, TObject * /* obj2 */ = 0) ; - //Bool_t IsSelected(TList* /*list*/) {return kTRUE;} + Bool_t IsSelected(TObject* obj) ; + Bool_t IsSelected(TList* /*list*/) {return kTRUE;} virtual AliCFTrackIsPrimaryCuts* GetNegCut() const {return fCutNeg;} virtual AliCFTrackIsPrimaryCuts* GetPosCut() const {return fCutPos;} diff --git a/CORRFW/AliCFPairPidCut.cxx b/CORRFW/AliCFPairPidCut.cxx index c0d89502d97..d18bfd51f99 100755 --- a/CORRFW/AliCFPairPidCut.cxx +++ b/CORRFW/AliCFPairPidCut.cxx @@ -69,7 +69,7 @@ AliCFPairPidCut& AliCFPairPidCut::operator=(const AliCFPairPidCut& c) } //__________________________________________________________________________________ -Bool_t AliCFPairPidCut::IsSelected(TObject* obj, TObject* /* obj2 */) { +Bool_t AliCFPairPidCut::IsSelected(TObject* obj) { // // loops over decisions of single cuts and returns if the track is accepted // diff --git a/CORRFW/AliCFPairPidCut.h b/CORRFW/AliCFPairPidCut.h index 8af42cff03b..74a1abc5200 100755 --- a/CORRFW/AliCFPairPidCut.h +++ b/CORRFW/AliCFPairPidCut.h @@ -43,8 +43,8 @@ class AliCFPairPidCut : public AliCFCutBase virtual AliCFTrackCutPid* GetNegCut() const {return fCutNeg;} virtual AliCFTrackCutPid* GetPosCut() const {return fCutPos;} - Bool_t IsSelected(TObject *obj, TObject * /* obj2 */); //boolean for detectors - // Bool_t IsSelected(TList* /*list*/) {return kTRUE;} + Bool_t IsSelected(TObject *obj); //boolean for detectors + Bool_t IsSelected(TList* /*list*/) {return kTRUE;} private: AliCFTrackCutPid* fCutNeg; // PID cut on negative daughter AliCFTrackCutPid* fCutPos; // PID cut on positive daughter diff --git a/CORRFW/AliCFPairQualityCuts.cxx b/CORRFW/AliCFPairQualityCuts.cxx index 8a8c46b87e5..dbc18bdfdeb 100755 --- a/CORRFW/AliCFPairQualityCuts.cxx +++ b/CORRFW/AliCFPairQualityCuts.cxx @@ -70,7 +70,7 @@ AliCFPairQualityCuts& AliCFPairQualityCuts::operator=(const AliCFPairQualityCuts } //__________________________________________________________________________________ -Bool_t AliCFPairQualityCuts::IsSelected(TObject* obj, TObject* /* obj2 */) { +Bool_t AliCFPairQualityCuts::IsSelected(TObject* obj) { // // loops over decisions of single cuts and returns if the track is accepted // diff --git a/CORRFW/AliCFPairQualityCuts.h b/CORRFW/AliCFPairQualityCuts.h index 34e89548d57..d7fc4f61235 100755 --- a/CORRFW/AliCFPairQualityCuts.h +++ b/CORRFW/AliCFPairQualityCuts.h @@ -38,8 +38,8 @@ class AliCFPairQualityCuts : public AliCFCutBase AliCFPairQualityCuts& operator=(const AliCFPairQualityCuts& c) ; virtual ~AliCFPairQualityCuts() {delete fCutNeg; delete fCutPos; } - Bool_t IsSelected(TObject* obj, TObject* /* obj2 */ = 0) ; - //Bool_t IsSelected(TList* /*list*/) {return kTRUE;} + Bool_t IsSelected(TObject* obj) ; + Bool_t IsSelected(TList* /*list*/) {return kTRUE;} virtual AliCFTrackQualityCuts* GetNegCut() const {return fCutNeg;} virtual AliCFTrackQualityCuts* GetPosCut() const {return fCutPos;} diff --git a/CORRFW/AliCFParticleGenCuts.cxx b/CORRFW/AliCFParticleGenCuts.cxx index d7004466d5b..8b6336bc212 100644 --- a/CORRFW/AliCFParticleGenCuts.cxx +++ b/CORRFW/AliCFParticleGenCuts.cxx @@ -230,7 +230,7 @@ AliCFParticleGenCuts& AliCFParticleGenCuts::operator=(const AliCFParticleGenCuts } //______________________________ -Bool_t AliCFParticleGenCuts::IsSelected(TObject* obj, TObject * /* obj2 */ ) { +Bool_t AliCFParticleGenCuts::IsSelected(TObject* obj) { // // check if selections on 'obj' are passed // 'obj' must be an AliMCParticle diff --git a/CORRFW/AliCFParticleGenCuts.h b/CORRFW/AliCFParticleGenCuts.h index 2a98a7f9409..d19148f1e88 100644 --- a/CORRFW/AliCFParticleGenCuts.h +++ b/CORRFW/AliCFParticleGenCuts.h @@ -53,8 +53,8 @@ class AliCFParticleGenCuts : public AliCFCutBase AliCFParticleGenCuts (const AliCFParticleGenCuts& c) ; AliCFParticleGenCuts& operator=(const AliCFParticleGenCuts& c) ; virtual ~AliCFParticleGenCuts() { }; - virtual Bool_t IsSelected(TObject* obj, TObject *obj2 = 0) ; - //Bool_t IsSelected(TList* /*list*/) {return kTRUE;} + virtual Bool_t IsSelected(TObject* obj) ; + Bool_t IsSelected(TList* /*list*/) {return kTRUE;} virtual void SetMCEventInfo(const TObject* mcEvent) ; void SetAODMC(Bool_t flag) {fIsAODMC=flag;} diff --git a/CORRFW/AliCFTrackCutPid.cxx b/CORRFW/AliCFTrackCutPid.cxx index 682ca0b95fe..39607355edf 100644 --- a/CORRFW/AliCFTrackCutPid.cxx +++ b/CORRFW/AliCFTrackCutPid.cxx @@ -532,7 +532,7 @@ Int_t AliCFTrackCutPid::IdentifyQA(const Double_t pid[AliPID::kSPECIES], Int_t i return iPart; } //___________________________________________ -Bool_t AliCFTrackCutPid::IsSelected(TObject *track, TObject * /* event */){ +Bool_t AliCFTrackCutPid::IsSelected(TObject *track){ // // method for the pid-cut selction // diff --git a/CORRFW/AliCFTrackCutPid.h b/CORRFW/AliCFTrackCutPid.h index 3c1da62bd09..2b4df8dc07a 100644 --- a/CORRFW/AliCFTrackCutPid.h +++ b/CORRFW/AliCFTrackCutPid.h @@ -69,8 +69,8 @@ class AliCFTrackCutPid : public AliCFCutBase //main - virtual Bool_t IsSelected(TObject *track, TObject *event = 0); - //Bool_t IsSelected(TList* /*list*/) {return kTRUE;} + virtual Bool_t IsSelected(TObject *track); + Bool_t IsSelected(TList* /*list*/) {return kTRUE;} //histos are added to a list void AddQAHistograms(TList *qalist); diff --git a/CORRFW/AliCFTrackIsPrimaryCuts.cxx b/CORRFW/AliCFTrackIsPrimaryCuts.cxx index 36d6fe7b3ac..d5375472cfb 100644 --- a/CORRFW/AliCFTrackIsPrimaryCuts.cxx +++ b/CORRFW/AliCFTrackIsPrimaryCuts.cxx @@ -594,7 +594,7 @@ void AliCFTrackIsPrimaryCuts::SelectionBitMap(TObject* obj) return; } //__________________________________________________________________________________ -Bool_t AliCFTrackIsPrimaryCuts::IsSelected(TObject* obj, TObject *obj2) { +Bool_t AliCFTrackIsPrimaryCuts::IsSelected(TObject* obj) { // // loops over decisions of single cuts and returns if the track is accepted // diff --git a/CORRFW/AliCFTrackIsPrimaryCuts.h b/CORRFW/AliCFTrackIsPrimaryCuts.h index 33dc3580e9b..4aa46739d90 100644 --- a/CORRFW/AliCFTrackIsPrimaryCuts.h +++ b/CORRFW/AliCFTrackIsPrimaryCuts.h @@ -70,8 +70,8 @@ class AliCFTrackIsPrimaryCuts : public AliCFCutBase ~AliCFTrackIsPrimaryCuts(); void Copy(TObject &c) const; - Bool_t IsSelected(TObject* obj, TObject *obj2 = 0); - //Bool_t IsSelected(TList* /*list*/) {return kTRUE;} + Bool_t IsSelected(TObject* obj); + Bool_t IsSelected(TList* /*list*/) {return kTRUE;} // cut value setter void UseSPDvertex(Bool_t b=kFALSE); diff --git a/CORRFW/AliCFTrackKineCuts.cxx b/CORRFW/AliCFTrackKineCuts.cxx index 808b571228b..254774314c1 100644 --- a/CORRFW/AliCFTrackKineCuts.cxx +++ b/CORRFW/AliCFTrackKineCuts.cxx @@ -411,7 +411,7 @@ void AliCFTrackKineCuts::SelectionBitMap(TObject* obj) { return; } //__________________________________________________________________________________ -Bool_t AliCFTrackKineCuts::IsSelected(TObject* obj, TObject * /* obj2 */) { +Bool_t AliCFTrackKineCuts::IsSelected(TObject* obj) { // // loops over decisions of single cuts and returns if the track is accepted // diff --git a/CORRFW/AliCFTrackKineCuts.h b/CORRFW/AliCFTrackKineCuts.h index 0dd7fb779b3..3dd8a10df92 100644 --- a/CORRFW/AliCFTrackKineCuts.h +++ b/CORRFW/AliCFTrackKineCuts.h @@ -63,8 +63,8 @@ class AliCFTrackKineCuts : public AliCFCutBase ~AliCFTrackKineCuts(); void Copy(TObject &c) const; - Bool_t IsSelected(TObject* obj, TObject *obj2 = 0); - //Bool_t IsSelected(TList* /*list*/) {return kTRUE;} + Bool_t IsSelected(TObject* obj); + Bool_t IsSelected(TList* /*list*/) {return kTRUE;} // cut value setter void SetMomentumRange(Double_t momentumMin=0., Double_t momentumMax=1e99) {fMomentumMin=momentumMin; fMomentumMax=momentumMax;} diff --git a/CORRFW/AliCFTrackQualityCuts.cxx b/CORRFW/AliCFTrackQualityCuts.cxx index 5ffb8b8b457..fd6324bbac5 100644 --- a/CORRFW/AliCFTrackQualityCuts.cxx +++ b/CORRFW/AliCFTrackQualityCuts.cxx @@ -563,7 +563,7 @@ void AliCFTrackQualityCuts::SelectionBitMap(TObject* obj) return; } //__________________________________________________________________________________ -Bool_t AliCFTrackQualityCuts::IsSelected(TObject* obj, TObject *obj2) { +Bool_t AliCFTrackQualityCuts::IsSelected(TObject* obj) { // // loops over decisions of single cuts and returns if the track is accepted // diff --git a/CORRFW/AliCFTrackQualityCuts.h b/CORRFW/AliCFTrackQualityCuts.h index d7c8bf63246..05e9ec629ec 100644 --- a/CORRFW/AliCFTrackQualityCuts.h +++ b/CORRFW/AliCFTrackQualityCuts.h @@ -65,8 +65,8 @@ class AliCFTrackQualityCuts : public AliCFCutBase ~AliCFTrackQualityCuts(); void Copy(TObject &c) const; - Bool_t IsSelected(TObject* obj, TObject *obj2 = 0); - //Bool_t IsSelected(TList* /*list*/) {return kTRUE;} + Bool_t IsSelected(TObject* obj); + Bool_t IsSelected(TList* /*list*/) {return kTRUE;} // cut value setter void SetMinNClusterTPC(Int_t cluster=-1) {fMinNClusterTPC = cluster;} diff --git a/CORRFW/AliCFV0TopoCuts.cxx b/CORRFW/AliCFV0TopoCuts.cxx index 5df04abb4af..0214f9eaef4 100755 --- a/CORRFW/AliCFV0TopoCuts.cxx +++ b/CORRFW/AliCFV0TopoCuts.cxx @@ -95,7 +95,7 @@ AliCFV0TopoCuts& AliCFV0TopoCuts::operator=(const AliCFV0TopoCuts& c) } //______________________________________________________________ -Bool_t AliCFV0TopoCuts::IsSelected(TObject *obj, TObject * /* event */) { +Bool_t AliCFV0TopoCuts::IsSelected(TObject *obj) { // // computes V0 topological variables to cut on and return true // in case the V0 is accepted diff --git a/CORRFW/AliCFV0TopoCuts.h b/CORRFW/AliCFV0TopoCuts.h index 0fbd7dc1b59..72b944a2269 100755 --- a/CORRFW/AliCFV0TopoCuts.h +++ b/CORRFW/AliCFV0TopoCuts.h @@ -42,8 +42,8 @@ class AliCFV0TopoCuts : public AliCFCutBase AliCFV0TopoCuts (const AliCFV0TopoCuts& c) ; AliCFV0TopoCuts& operator=(const AliCFV0TopoCuts& c) ; virtual ~AliCFV0TopoCuts() { } ; - Bool_t IsSelected(TObject* v0, TObject * /*event*/ = 0) ; - //Bool_t IsSelected(TList* /*list*/) {return kTRUE;} + Bool_t IsSelected(TObject* v0) ; + Bool_t IsSelected(TList* /*list*/) {return kTRUE;} void SetRecEventInfo(const TObject* evt) {fEvent = (AliVEvent*)evt;} void SetMaxDcaDaughters (Double32_t dca) {fMaxDcaDaughters = dca;} void SetMinDcaNeg (Double32_t dca) {fMinDcaNeg = dca;} diff --git a/HLT/JET/AliHLTJETJetCuts.cxx b/HLT/JET/AliHLTJETJetCuts.cxx index 05d91febfda..76d637f6203 100644 --- a/HLT/JET/AliHLTJETJetCuts.cxx +++ b/HLT/JET/AliHLTJETJetCuts.cxx @@ -69,7 +69,7 @@ AliHLTJETJetCuts::~AliHLTJETJetCuts() { */ // ################################################################################# -Bool_t AliHLTJETJetCuts::IsSelected( TObject *obj, TObject *obj2 ) { +Bool_t AliHLTJETJetCuts::IsSelected( TObject *obj ) { // see header file for class documentation Bool_t bResult = kTRUE; diff --git a/HLT/JET/AliHLTJETJetCuts.h b/HLT/JET/AliHLTJETJetCuts.h index 8f0c5972403..34497d17220 100644 --- a/HLT/JET/AliHLTJETJetCuts.h +++ b/HLT/JET/AliHLTJETJetCuts.h @@ -56,7 +56,7 @@ public: @param obj AliHLTJETConeJetCandidate or AliAODJet @return kTRUE if selected, kFALSE otherwise */ - Bool_t IsSelected( TObject* obj, TObject *obj2= 0 ); + Bool_t IsSelected( TObject* obj ); /** Select jet @param jet AliHLTJETConeJetCandidate jet diff --git a/HLT/JET/AliHLTJETTrackCuts.cxx b/HLT/JET/AliHLTJETTrackCuts.cxx index 8f3dbe268cb..c5d4e72eedd 100644 --- a/HLT/JET/AliHLTJETTrackCuts.cxx +++ b/HLT/JET/AliHLTJETTrackCuts.cxx @@ -75,7 +75,7 @@ AliHLTJETTrackCuts::~AliHLTJETTrackCuts() { */ // ################################################################################# -Bool_t AliHLTJETTrackCuts::IsSelected( TObject *obj, TObject *obj2 ) { +Bool_t AliHLTJETTrackCuts::IsSelected( TObject *obj ) { // see header file for class documentation Bool_t bResult = kTRUE; diff --git a/HLT/JET/AliHLTJETTrackCuts.h b/HLT/JET/AliHLTJETTrackCuts.h index 61a7770e259..6ce0493f79c 100644 --- a/HLT/JET/AliHLTJETTrackCuts.h +++ b/HLT/JET/AliHLTJETTrackCuts.h @@ -54,7 +54,7 @@ public: @param obj esd track or particle @return kTRUE if selected, kFALSE otherwise */ - Bool_t IsSelected( TObject* obj, TObject *obj2 = 0 ); + Bool_t IsSelected( TObject* obj ); /** Select track @param particle particle diff --git a/HLT/JET/cone/AliHLTJETConeSeedCuts.cxx b/HLT/JET/cone/AliHLTJETConeSeedCuts.cxx index db2708e78d2..76f371e725a 100644 --- a/HLT/JET/cone/AliHLTJETConeSeedCuts.cxx +++ b/HLT/JET/cone/AliHLTJETConeSeedCuts.cxx @@ -73,7 +73,7 @@ AliHLTJETConeSeedCuts::~AliHLTJETConeSeedCuts() { */ // ################################################################################# -Bool_t AliHLTJETConeSeedCuts::IsSelected( TObject *obj, TObject *obj2 ) { +Bool_t AliHLTJETConeSeedCuts::IsSelected( TObject *obj ) { // see header file for class documentation Bool_t bResult = kTRUE; diff --git a/HLT/JET/cone/AliHLTJETConeSeedCuts.h b/HLT/JET/cone/AliHLTJETConeSeedCuts.h index b5379ac5a56..1c178101830 100644 --- a/HLT/JET/cone/AliHLTJETConeSeedCuts.h +++ b/HLT/JET/cone/AliHLTJETConeSeedCuts.h @@ -63,7 +63,7 @@ public: @param obj esd track or particle @return kTRUE if selected, kFALSE otherwise */ - Bool_t IsSelected( TObject* obj, TObject *obj2 = 0 ); + Bool_t IsSelected( TObject* obj ); /** Select track @param particle particle diff --git a/PWG0/dNdPt/AlidNdPtAcceptanceCuts.h b/PWG0/dNdPt/AlidNdPtAcceptanceCuts.h index 221287237a4..1f34f598102 100644 --- a/PWG0/dNdPt/AlidNdPtAcceptanceCuts.h +++ b/PWG0/dNdPt/AlidNdPtAcceptanceCuts.h @@ -42,8 +42,8 @@ public: void Init(); // check MC tracks - virtual Bool_t IsSelected(TObject *, TObject * /* event */ = 0) {return kTRUE;} - //virtual Bool_t IsSelected(TList *) {return kTRUE;} + virtual Bool_t IsSelected(TObject *) {return kTRUE;} + virtual Bool_t IsSelected(TList *) {return kTRUE;} // Bool_t AcceptTrack(AliESDtrack *track); diff --git a/PWG0/dNdPt/AlidNdPtEventCuts.h b/PWG0/dNdPt/AlidNdPtEventCuts.h index b24bca919a7..71252593337 100644 --- a/PWG0/dNdPt/AlidNdPtEventCuts.h +++ b/PWG0/dNdPt/AlidNdPtEventCuts.h @@ -68,8 +68,8 @@ public: void Init(); // check MC tracks - Bool_t IsSelected(TObject *, TObject * /*event */ = 0) {return kTRUE;} - //Bool_t IsSelected(TList *) {return kTRUE;} + Bool_t IsSelected(TObject *) {return kTRUE;} + Bool_t IsSelected(TList *) {return kTRUE;} // accept event Bool_t AcceptEvent(AliESDEvent *event=0, AliMCEvent *mcEvent=0, const AliESDVertex *vtx=0); diff --git a/PWG2/AOD/AliAnalysisTaskPWG2ESDfilter.cxx b/PWG2/AOD/AliAnalysisTaskPWG2ESDfilter.cxx index db26463d541..c6c31e0feae 100644 --- a/PWG2/AOD/AliAnalysisTaskPWG2ESDfilter.cxx +++ b/PWG2/AOD/AliAnalysisTaskPWG2ESDfilter.cxx @@ -737,7 +737,7 @@ void AliAnalysisTaskPWG2ESDfilter::Exec(Option_t */*option*/) // // Track selection if (fTrackFilter) { - selectInfo = fTrackFilter->IsSelected(esdTrack, fESD); + selectInfo = fTrackFilter->IsSelected(esdTrack); if (!selectInfo) continue; } diff --git a/PWG2/SPECTRA/AliAnalysisCentralCutESD.cxx b/PWG2/SPECTRA/AliAnalysisCentralCutESD.cxx index b468edcd94b..14643d09d37 100644 --- a/PWG2/SPECTRA/AliAnalysisCentralCutESD.cxx +++ b/PWG2/SPECTRA/AliAnalysisCentralCutESD.cxx @@ -87,7 +87,7 @@ AliAnalysisCentralCutESD::~AliAnalysisCentralCutESD() { } -Bool_t AliAnalysisCentralCutESD::IsSelected(TObject *obj, TObject * /* obj2 */ ){ +Bool_t AliAnalysisCentralCutESD::IsSelected(TObject *obj){ // Checks if a particle passes the cuts AliESDtrack *track = dynamic_cast(obj); diff --git a/PWG2/SPECTRA/AliAnalysisCentralCutESD.h b/PWG2/SPECTRA/AliAnalysisCentralCutESD.h index cd0dc8a955b..5c49739c99f 100644 --- a/PWG2/SPECTRA/AliAnalysisCentralCutESD.h +++ b/PWG2/SPECTRA/AliAnalysisCentralCutESD.h @@ -34,8 +34,8 @@ public: AliAnalysisCentralCutESD(const char *name="AliAnalysisCentralCutESD", const char *title="ESD_cuts"); virtual ~AliAnalysisCentralCutESD(); - Bool_t IsSelected(TObject* obj, TObject *obj2 = 0); - //Bool_t IsSelected(TList* /*list*/) {return kTRUE;} + Bool_t IsSelected(TObject* obj); + Bool_t IsSelected(TList* /*list*/) {return kTRUE;} void SetPartType(PDG_t type) {fReqPID = kTRUE; fPartType = type;} void SetPIDtype(TString type) {fPIDtype = type;} diff --git a/PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.cxx b/PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.cxx index e8ab37d31a4..49bc23e7858 100644 --- a/PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.cxx +++ b/PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.cxx @@ -78,7 +78,7 @@ AliAnalysisCentralCutEvtESD::~AliAnalysisCentralCutEvtESD() { -Bool_t AliAnalysisCentralCutEvtESD::IsSelected(TObject *obj, TObject * /* obj2 */){ +Bool_t AliAnalysisCentralCutEvtESD::IsSelected(TObject *obj){ // check whether the event passes the cuts AliESDEvent *esdEvent = dynamic_cast(obj); if(!esdEvent){ diff --git a/PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.h b/PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.h index 0643733df98..b6b1c8a252a 100644 --- a/PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.h +++ b/PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.h @@ -30,8 +30,8 @@ public: AliAnalysisCentralCutEvtESD(const char *name="AliAnalysisCentralCutEvtESD", const char *title="ESD_Event_cuts"); virtual ~AliAnalysisCentralCutEvtESD(); - Bool_t IsSelected(TObject* obj, TObject* obj2); - // Bool_t IsSelected(TList* /*list*/) {return kTRUE;} + Bool_t IsSelected(TObject* obj); + Bool_t IsSelected(TList* /*list*/) {return kTRUE;} void SetMultiplicityRange(Int_t r1 = 0, Int_t r2 = 1000000) {fReqMult = kTRUE; fMultMin = r1; fMultMax = r2;} void SetDirectivityRange(Double_t r1 = 0.0, Double_t r2 = 1e10) {fReqDir = kTRUE; fDirMin = r1; fDirMax = r2;} diff --git a/PWG2/SPECTRA/AliAnalysisCentralCutEvtMC.cxx b/PWG2/SPECTRA/AliAnalysisCentralCutEvtMC.cxx index 3293607b066..e1929cb2a3f 100644 --- a/PWG2/SPECTRA/AliAnalysisCentralCutEvtMC.cxx +++ b/PWG2/SPECTRA/AliAnalysisCentralCutEvtMC.cxx @@ -58,7 +58,7 @@ AliAnalysisCentralCutEvtMC::~AliAnalysisCentralCutEvtMC(){ } //___________________________________________________________________________ -Bool_t AliAnalysisCentralCutEvtMC::IsSelected(TObject *obj, TObject * /* obj2 */){ +Bool_t AliAnalysisCentralCutEvtMC::IsSelected(TObject *obj){ // Checks whether the event passes the cuts if (!obj){ diff --git a/PWG2/SPECTRA/AliAnalysisCentralCutEvtMC.h b/PWG2/SPECTRA/AliAnalysisCentralCutEvtMC.h index 773de54633a..6166387e88c 100644 --- a/PWG2/SPECTRA/AliAnalysisCentralCutEvtMC.h +++ b/PWG2/SPECTRA/AliAnalysisCentralCutEvtMC.h @@ -30,8 +30,8 @@ class AliAnalysisCentralCutEvtMC: public AliAnalysisCuts { AliAnalysisCentralCutEvtMC(const char *name="AliAnalysisCentralCutEvtMC", const char *title="MC_cuts"); virtual ~AliAnalysisCentralCutEvtMC(); - Bool_t IsSelected(TObject* obj, TObject *obj2 = 0); - //Bool_t IsSelected(TList* /*list*/) {return kTRUE;} + Bool_t IsSelected(TObject* obj); + Bool_t IsSelected(TList* /*list*/) {return kTRUE;} void SetMultiplicityRange(Int_t r1=0, Int_t r2=1000000){fReqMult = kTRUE; fMultMin=r1; fMultMax=r2;} void SetDirectivityRange(Float_t r1=-1e10, Float_t r2=1e10) {fReqDir = kTRUE; fDirMin=r1; fDirMax=r2;} diff --git a/PWG2/SPECTRA/AliAnalysisCentralCutMC.cxx b/PWG2/SPECTRA/AliAnalysisCentralCutMC.cxx index 06daa2d83ca..4a13d5ae9d0 100644 --- a/PWG2/SPECTRA/AliAnalysisCentralCutMC.cxx +++ b/PWG2/SPECTRA/AliAnalysisCentralCutMC.cxx @@ -63,7 +63,7 @@ AliAnalysisCentralCutMC::~AliAnalysisCentralCutMC(){ } //___________________________________________________________________________ -Bool_t AliAnalysisCentralCutMC::IsSelected(TObject* const obj, TObject * /* obj2 */){ +Bool_t AliAnalysisCentralCutMC::IsSelected(TObject* const obj){ // Check if the particle passes the cuts AliMCParticle *part = dynamic_cast(obj); diff --git a/PWG2/SPECTRA/AliAnalysisCentralCutMC.h b/PWG2/SPECTRA/AliAnalysisCentralCutMC.h index 8fe6a90ef79..05ad4e252e0 100644 --- a/PWG2/SPECTRA/AliAnalysisCentralCutMC.h +++ b/PWG2/SPECTRA/AliAnalysisCentralCutMC.h @@ -31,8 +31,8 @@ class AliAnalysisCentralCutMC: public AliAnalysisCuts{ AliAnalysisCentralCutMC(const char *name="AliAnalysisCentralCutMC", const char *title="MC_cuts"); virtual ~AliAnalysisCentralCutMC(); -Bool_t IsSelected(TObject* obj, TObject *obj2 = 0); -//Bool_t IsSelected(TList* const /*list*/) {return kTRUE;} +Bool_t IsSelected(TObject* const obj); +Bool_t IsSelected(TList* const /*list*/) {return kTRUE;} void SetOnlyPrimaries(Bool_t val = kFALSE) {fOnlyPrim = val;} diff --git a/PWG3/hfe/AliHFEextraCuts.cxx b/PWG3/hfe/AliHFEextraCuts.cxx index 213d578a243..54f522aa9dc 100644 --- a/PWG3/hfe/AliHFEextraCuts.cxx +++ b/PWG3/hfe/AliHFEextraCuts.cxx @@ -115,7 +115,7 @@ AliHFEextraCuts::~AliHFEextraCuts(){ } //______________________________________________________ -Bool_t AliHFEextraCuts::IsSelected(TObject *o, TObject * /* o2 */){ +Bool_t AliHFEextraCuts::IsSelected(TObject *o){ // // Steering function for the track selection // diff --git a/PWG3/hfe/AliHFEextraCuts.h b/PWG3/hfe/AliHFEextraCuts.h index ce7d5787482..0688965150e 100644 --- a/PWG3/hfe/AliHFEextraCuts.h +++ b/PWG3/hfe/AliHFEextraCuts.h @@ -43,8 +43,8 @@ class AliHFEextraCuts : public AliCFCutBase{ AliHFEextraCuts &operator=(const AliHFEextraCuts &c); virtual ~AliHFEextraCuts(); - virtual Bool_t IsSelected(TObject *o, TObject *o2 = 0); - //virtual Bool_t IsSelected(TList *) { return kTRUE; }; + virtual Bool_t IsSelected(TObject *o); + virtual Bool_t IsSelected(TList *) { return kTRUE; }; inline void SetClusterRatioTPC(Double_t ratio); inline void SetRequireITSpixel(ITSPixel_t pixel); diff --git a/PWG3/muon/AliESDMuonTrackCuts.h b/PWG3/muon/AliESDMuonTrackCuts.h index 6796092eed7..a19196aaac6 100644 --- a/PWG3/muon/AliESDMuonTrackCuts.h +++ b/PWG3/muon/AliESDMuonTrackCuts.h @@ -28,9 +28,9 @@ class AliESDMuonTrackCuts : public AliAnalysisCuts public: AliESDMuonTrackCuts(const Char_t* name = "AliESDMuonTrackCuts", const Char_t* title = ""); virtual ~AliESDMuonTrackCuts(); - Bool_t IsSelected(TObject* obj, TObject* /* obj2 */ = 0) + Bool_t IsSelected(TObject* obj) {return AcceptTrack((AliESDMuonTrack*)obj);} - // Bool_t IsSelected(TList* /*list*/) {return kTRUE;} + Bool_t IsSelected(TList* /*list*/) {return kTRUE;} Bool_t AcceptTrack(AliESDMuonTrack* esdMuTrack); TObjArray* GetAcceptedTracks(AliESD* esd); Int_t CountAcceptedTracks(AliESD* esd); diff --git a/STEER/AliVCuts.h b/STEER/AliVCuts.h index d95271e56c3..da90db11bc9 100644 --- a/STEER/AliVCuts.h +++ b/STEER/AliVCuts.h @@ -11,7 +11,6 @@ //------------------------------------------------------------------------- #include -class AliESDEvent; class AliVCuts : public TNamed { @@ -21,7 +20,7 @@ class AliVCuts : public TNamed { virtual ~AliVCuts() { }; AliVCuts(const AliVCuts& evt); AliVCuts& operator=(const AliVCuts& evt); - virtual Bool_t IsSelected(TObject* /* obj */, TObject * /*evt*/ = 0) = 0; + virtual Bool_t IsSelected(TObject* /* obj */) = 0; ClassDef(AliVCuts,1); }; -- 2.43.0