Changes for report #61429: PID: Separating response functions from ESD. The signature...

diff --git a/ANALYSIS/AliAnalysisCuts.h b/ANALYSIS/AliAnalysisCuts.h
index 828842797d97afcd219ff6f19179fe425f3c704f..b087e29a3f11a437b28a46d3a9c9e5b389fd1442 100644 (file)
--- 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 31c1d67864ccdc7cef7665016c216789388de5f4..af0841f68b6e79308f1a255f4379c78dce25d66e 100644 (file)
--- 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 8d613d85b0adda2d767983ea964bdf4f734e4d29..1bcc36065b413a4cf6dabc2337a81f5747c9e0c1 100644 (file)
--- 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 9f7526b3d1fc31ee251acc461a15dc04c9504b32..d8a72a1c2f8e131f69435e3a41201a86377fba3f 100644 (file)
--- a/ANALYSIS/AliAnalysisTaskESDfilter.cxx
+++ b/ANALYSIS/AliAnalysisTaskESDfilter.cxx
@@ -384,7 +384,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
 \r
            usedTrack[idxBachFromCascade] = kTRUE;\r
            UInt_t selectInfo = 0;\r
-           if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdCascadeBach,esd);\r
+           if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdCascadeBach);\r
            if(mcH)mcH->SelectParticle(esdCascadeBach->GetLabel());\r
            aodTrack = new(tracks[jTracks++]) AliAODTrack(esdCascadeBach->GetID(),\r
                                                          esdCascadeBach->GetLabel(), \r
@@ -465,7 +465,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
                usedTrack[idxPosFromV0Dghter] = kTRUE;\r
        \r
                UInt_t selectInfo = 0;\r
-               if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdCascadePos,esd);\r
+               if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdCascadePos);\r
                if(mcH) mcH->SelectParticle(esdCascadePos->GetLabel());\r
                aodTrack = new(tracks[jTracks++]) AliAODTrack(  esdCascadePos->GetID(),\r
                                                                esdCascadePos->GetLabel(), \r
@@ -509,7 +509,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
                usedTrack[idxNegFromV0Dghter] = kTRUE;\r
        \r
                UInt_t selectInfo = 0;\r
-               if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdCascadeNeg,esd);\r
+               if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdCascadeNeg);\r
                if(mcH)mcH->SelectParticle(esdCascadeNeg->GetLabel());\r
                aodTrack = new(tracks[jTracks++]) AliAODTrack(  esdCascadeNeg->GetID(),\r
                                                                esdCascadeNeg->GetLabel(),\r
@@ -680,7 +680,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
        v0objects.AddAt(esdVtx,                  3);\r
        UInt_t selectV0 = 0;\r
        if (fV0Filter) {\r
-         selectV0 = fV0Filter->IsSelected(&v0objects,esd);\r
+         selectV0 = fV0Filter->IsSelected(&v0objects);\r
          // this is a little awkward but otherwise the \r
          // list wants to access the pointer (delete it) \r
          // again when going out of scope\r
@@ -725,7 +725,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
        if (!usedTrack[posFromV0]) {\r
            usedTrack[posFromV0] = kTRUE;\r
            UInt_t selectInfo = 0;\r
-           if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdV0Pos,esd);\r
+           if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdV0Pos);\r
            if(mcH)mcH->SelectParticle(esdV0Pos->GetLabel());\r
            aodTrack = new(tracks[jTracks++]) AliAODTrack(esdV0Pos->GetID(),\r
                                                          esdV0Pos->GetLabel(), \r
@@ -768,7 +768,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
        if (!usedTrack[negFromV0]) {\r
            usedTrack[negFromV0] = kTRUE;\r
            UInt_t selectInfo = 0;\r
-           if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdV0Neg,esd);\r
+           if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdV0Neg);\r
            if(mcH)mcH->SelectParticle(esdV0Neg->GetLabel());\r
            aodTrack = new(tracks[jTracks++]) AliAODTrack(esdV0Neg->GetID(),\r
                                                          esdV0Neg->GetLabel(),\r
@@ -888,7 +888,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
                    \r
                    UInt_t selectInfo = 0;\r
                    if (fTrackFilter) {\r
-                       selectInfo = fTrackFilter->IsSelected(esd->GetTrack(imother),esd);\r
+                       selectInfo = fTrackFilter->IsSelected(esd->GetTrack(imother));\r
                        if (!selectInfo) continue;\r
                    }\r
                    \r
@@ -958,7 +958,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
                        esdTrackD->GetCovarianceXYZPxPyPz(covTr);\r
                        esdTrackD->GetESDpid(pid);\r
                        selectInfo = 0;\r
-                       if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdTrackD,esd);\r
+                       if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdTrackD);\r
                        if(mcH)mcH->SelectParticle(esdTrackD->GetLabel());\r
                        daughter = \r
                            new(tracks[jTracks++]) AliAODTrack(esdTrackD->GetID(),\r
@@ -1011,7 +1011,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
        //\r
        // Track selection\r
        if (fTrackFilter) {\r
-           selectInfo = fTrackFilter->IsSelected(esdTrack,esd);\r
+           selectInfo = fTrackFilter->IsSelected(esdTrack);\r
            if (!selectInfo && !vtx->UsesTrack(esdTrack->GetID())) continue;\r
        }\r
        \r

diff --git a/ANALYSIS/AliAnalysisTaskKineFilter.cxx b/ANALYSIS/AliAnalysisTaskKineFilter.cxx
index 8566e8daf779cc9e4ea37a4f40ebf15e5d430db0..332bc6de8d1259a273db07ca91949400e5d10f45 100644 (file)
--- 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 503c3266943663fc5ee9ef87fc35a28bce6c39bd..fdd5bb3bd3834703bfac6f80fa1028ba36a4fd06 100644 (file)
--- a/ANALYSIS/AliBackgroundSelection.cxx
+++ b/ANALYSIS/AliBackgroundSelection.cxx
@@ -54,7 +54,7 @@ AliBackgroundSelection::~AliBackgroundSelection() {
 \r
 }\r
 \r
-Bool_t AliBackgroundSelection::IsSelected(TObject* obj, TObject* /* event */){\r
+Bool_t AliBackgroundSelection::IsSelected(TObject* obj){\r
 \r
   // reset fSelected\r
   SetSelected(kFALSE);\r

diff --git a/ANALYSIS/AliBackgroundSelection.h b/ANALYSIS/AliBackgroundSelection.h
index da497422b8ab7028239c5d447f627a8216a3e939..a92c91a278ad055e2170a8599d689cc768739035 100644 (file)
--- 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 ea463694519ffd719af2f07c84fe9d889736dfbb..72b9aaf2c300f77d14d39e3e18cfb4c52fb68134 100644 (file)
--- a/ANALYSIS/AliESDpidCuts.cxx
+++ b/ANALYSIS/AliESDpidCuts.cxx
@@ -8,6 +8,7 @@
 #include <TMath.h>
 #include <TIterator.h>
 #include <TString.h>
+#include <TList.h>
 
 #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<AliESDtrack*>(lst->At(0));
+  if(!trk){
+    AliError("Provided object is not AliESDtrack!");
     return kFALSE;
   }
-  return AcceptTrack(const_cast<const AliESDtrack *>(dynamic_cast<AliESDtrack *>(track)),dynamic_cast<AliESDEvent *>(event));
+  AliESDEvent * evt = dynamic_cast<AliESDEvent*>(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 c88cb5bb6c10b438fad3c98285dce3600d7fc194..239ea7a9e50638b5181e0671954221731041ea86 100644 (file)
--- 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 c8494e87c71a6fd6b8ff39c92b165afe31653e47..3570d705ac530138b0bd6940cd30fc31c9e69be5 100644 (file)
--- 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 4dbd9afb777e87347823df074d2268d8e8c2fd3f..25bc86fe9fc25b7335ec2af5703fac6864bec380 100644 (file)
--- 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 2c734763a1d788d7fbd0c0100a4eb69170d1a372..60298ab4df912b0a31e6def8862cd7b4a0e5c167 100644 (file)
--- 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 c9dba136dffbcb4daa4476e1e6830852f39f1a3d..b3b3f6acb9fda9eab8d2647debb25437dd706b63 100644 (file)
--- 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 728047f4d949fcf6b9cb78cf829e8ab0b1c6dc50..2098de8305be402001fc3c87fb89930c4860ebcf 100644 (file)
--- 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 6345d4a65cd92746b198dd06ffcb4bd4d216678f..c9723667659f12e49e2c9ab5ef2e0fb3d08068bd 100644 (file)
--- 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 7d5d78a0f0b89038d8bf1e2df4e1ab48fca69a62..238d5a25f7eb7ff05d51b8fc5ab3b0e7b9532027 100644 (file)
--- 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 e8031d915c22bbc1073cc33e27781e2085e7d613..ed3ee23e4123d53548236727afa6c41351ecfc82 100644 (file)
--- 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 343550c96a8cca4628f4f0e0186942cc861c01f9..2e29b101e0ce264ba766fcdc1fd347e3568826a2 100644 (file)
--- 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 f813abb486b5d816f6b85468e6c85370a18221be..e26cae99828de5955c1370dae41238831fd68b38 100644 (file)
--- 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 eddd025ea6147f6f2330c6f783aec6aed3e9638b..d1dfa7ab11e682cea1e76fb30e69083549ff0ef2 100644 (file)
--- 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 c2eefc36c81e6ca3ebfebd7f20a0c83613aa66ff..25daa4bff088a8ece1cf03e15bbd8f624657c440 100644 (file)
--- 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 0866c8945363218ae1b7c9d6b65314ae99ebf9b0..6c696e37c5629398c2fbee962feed81060cf3ada 100644 (file)
--- 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 3fa4346d149d1aa9a304447fb5329c89e7eee368..6637965de0b9c492fbf6e8e45beaaa4d98afb974 100755 (executable)
--- 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 a7314275ec80e52e4bf95137d61d74572f2240df..eecec2f1a9fe1936ab7bbf409a07ba593ea3d103 100755 (executable)
--- 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 045423edecf1316169aef8cbe7259fe53870554f..d73a735a09718e4ad3c3a17d7618d6180b7df65c 100755 (executable)
--- 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 667d3b8dd944d931576b0c62e6bd79441b61b47f..4c7115f700b6a2f8173965441e97742655154883 100755 (executable)
--- 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 c0d89502d97b423d50a68578b8d836510d4196d1..d18bfd51f996e75ffeac1bca166c0812df40fed9 100755 (executable)
--- 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 8af42cff03b8d9386d94451d2e2112306c3ecb2c..74a1abc52007895b547985b9a48227a17707524e 100755 (executable)
--- 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 8a8c46b87e5b7af05e1d88289e84d1628533e7e5..dbc18bdfdebe3d9270d1ec6c95098d5fa7df22a8 100755 (executable)
--- 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 34e89548d57c65e1f934586124710074c5645307..d7fc4f61235c76543ad169614ef68937482fe23a 100755 (executable)
--- 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 d7004466d5b674df112d65beffea77748aa97311..8b6336bc2121b6cf3ad84bb2bc83fea0226e37b3 100644 (file)
--- 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 2a98a7f9409774ffa4ba91eace7f2d908b1f83d2..d19148f1e882eb74b84856eafbe56772a43a7bb2 100644 (file)
--- 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 682ca0b95fe7839b7e03d41d47e5fd693878bcb7..39607355edfe9d165f750c7294e87c819b7c3a67 100644 (file)
--- 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 3c1da62bd09e54fe46a4db207c89213d48488f7c..2b4df8dc07a6ca8ba08821c359267a11ec96d17b 100644 (file)
--- 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 36d6fe7b3ac6506ea743efcc10c5411bd66be494..d5375472cfbf15fb1bf97d3727c2ccfca2553112 100644 (file)
--- 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 33dc3580e9b9177282899368b33558dfeace7634..4aa46739d9043e69f32e899bbd423faa402e8319 100644 (file)
--- 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 808b571228b35f3740fe8b45bf27c3aa0012a4bb..254774314c199bcba9f41545d231223276e1e484 100644 (file)
--- 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 0dd7fb779b3ed877f4f03123e68f6af380f5fa74..3dd8a10df9294c0d4b06de3dcc020b86bb896ffa 100644 (file)
--- 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 5ffb8b8b457f0c56acc82b88e243aabae49d4949..fd6324bbac555c0f7f524780a06e1af67fcd9169 100644 (file)
--- 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 d7c8bf63246f956562728d1190bc8afa04381ac5..05e9ec629ec4e3d37d54bdef0ee29de408b9d1f1 100644 (file)
--- 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 5df04abb4af566596c716c5296cfceda3b928ec3..0214f9eaef42be41a05ef7a0700840e5164a0875 100755 (executable)
--- 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 0fbd7dc1b599eb7e3c14957fcf6e05ac4f89a5ce..72b944a22698a60f20ec60f8363f31b72a03dbd6 100755 (executable)
--- 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 05d91febfda812ab406be7a793219b41cacf2aa5..76d637f620313a7d9ea1c6a49493ec9b10a25bec 100644 (file)
--- 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 8f0c59724039db37778835ac735e81ead5e9921f..34497d17220c17ef3f2ef9e16970e7016a70296e 100644 (file)
--- 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 8f3dbe268cba1867e00c4f3d58f13666939e47a1..c5d4e72eedd46457f40b36a61a618d81a1e2d549 100644 (file)
--- 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 61a7770e2598a29e598a23fb77ee560903dd7cf7..6ce0493f79c7d7c8f83329697d8ce06946eff682 100644 (file)
--- 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 db2708e78d2c86b785d933e7d76790e6c1f02b17..76f371e725ae5ab16d006f392216d0e9dba57320 100644 (file)
--- 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 b5379ac5a56ae4f235ed85339eacbc1b8d3f0f47..1c17810183007f8a55ee8b11b4c1d1027bd0c771 100644 (file)
--- 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 221287237a47cd2de68b92bb9a3fa3dc2bb95d40..1f34f5981021f71f381697cb7ff779f18d53e378 100644 (file)
--- a/PWG0/dNdPt/AlidNdPtAcceptanceCuts.h
+++ b/PWG0/dNdPt/AlidNdPtAcceptanceCuts.h
@@ -42,8 +42,8 @@ public:
   void Init();\r
 \r
   // check MC tracks\r
-  virtual Bool_t IsSelected(TObject *, TObject * /* event */ = 0) {return kTRUE;}\r
-  //virtual Bool_t IsSelected(TList *) {return kTRUE;}\r
+  virtual Bool_t IsSelected(TObject *) {return kTRUE;}\r
+  virtual Bool_t IsSelected(TList *) {return kTRUE;}\r
 \r
   //\r
   Bool_t AcceptTrack(AliESDtrack *track);\r

diff --git a/PWG0/dNdPt/AlidNdPtEventCuts.h b/PWG0/dNdPt/AlidNdPtEventCuts.h
index b24bca919a70de139863171f0c18dfa1da2fa3f4..712525933378a881d00a6d3385c872b44b59465a 100644 (file)
--- a/PWG0/dNdPt/AlidNdPtEventCuts.h
+++ b/PWG0/dNdPt/AlidNdPtEventCuts.h
@@ -68,8 +68,8 @@ public:
   void Init();\r
 \r
   // check MC tracks\r
-  Bool_t IsSelected(TObject *, TObject * /*event */ = 0) {return kTRUE;}\r
-  //Bool_t IsSelected(TList *) {return kTRUE;}\r
+  Bool_t IsSelected(TObject *) {return kTRUE;}\r
+  Bool_t IsSelected(TList *) {return kTRUE;}\r
 \r
   // accept event\r
   Bool_t AcceptEvent(AliESDEvent *event=0, AliMCEvent *mcEvent=0, const AliESDVertex *vtx=0);\r

diff --git a/PWG2/AOD/AliAnalysisTaskPWG2ESDfilter.cxx b/PWG2/AOD/AliAnalysisTaskPWG2ESDfilter.cxx
index db26463d5418b8ba126fdf6d67a239f92f93f22d..c6c31e0feae955f74bece6d1cc9502164162b17a 100644 (file)
--- 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 b468edcd94b9827190a429fd70a121b891adab2d..14643d09d378dc4a0020cece8d4de6a32b8c5e33 100644 (file)
--- 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<AliESDtrack *>(obj);

diff --git a/PWG2/SPECTRA/AliAnalysisCentralCutESD.h b/PWG2/SPECTRA/AliAnalysisCentralCutESD.h
index cd0dc8a955b5f3ad7bac1eb7428069b55a538d28..5c49739c99f5f64d59738d339394333196be147f 100644 (file)
--- 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 e8ab37d31a43569df115382d17e8ee1dfc692457..49bc23e78582c3240503171679a61f430b1e696e 100644 (file)
--- 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<AliESDEvent *>(obj);
     if(!esdEvent){

diff --git a/PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.h b/PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.h
index 0643733df98d0a3c2c71d0d47cc09964fd64b861..b6b1c8a252a6d0f6864003bcec270e87f366182b 100644 (file)
--- 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 3293607b066f843e9dcca8ca964e5a28585104c8..e1929cb2a3fa407a327f85f908b73affbe742a76 100644 (file)
--- 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 773de54633a2b932c2f8e3415e438072071a73c2..6166387e88cc2965e6e09e0cdb42a43ffca26808 100644 (file)
--- 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 06daa2d83ca3f0153301e3285613add8021ddb7e..4a13d5ae9d070c87700a677689fa3a3b31d979c4 100644 (file)
--- 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<AliMCParticle *>(obj);

diff --git a/PWG2/SPECTRA/AliAnalysisCentralCutMC.h b/PWG2/SPECTRA/AliAnalysisCentralCutMC.h
index 8fe6a90ef79719842b4c1e1853318f524dcfc72a..05ad4e252e0ac0bfcc4c9de3b7aa892beb8898d8 100644 (file)
--- 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 213d578a243844fe9f1cf57a4433cc8e183413cc..54f522aa9dc67a2137a157db5c560955791050f2 100644 (file)
--- 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 ce7d578748257d7e0d2a539181d3343398931389..0688965150e96725399428c10ebc62d9d97037fe 100644 (file)
--- 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 6796092eed78a9d9f1f7bda8fcb9080c85644c28..a19196aaac69219066de74ef38893d1d68cfe4b6 100644 (file)
--- 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 d95271e56c3cca74c858a0e04c61e6db369ee1f9..da90db11bc9aeb0066d82a9050b775b0c694fb0a 100644 (file)
--- a/STEER/AliVCuts.h
+++ b/STEER/AliVCuts.h
@@ -11,7 +11,6 @@
 //-------------------------------------------------------------------------
 
 #include <TNamed.h>
-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);
 };