]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - CORRFW/AliCFParticleGenCuts.cxx
Removal of warnings and compliance with ALICE coding conventions (Raphaƫl)
[u/mrichter/AliRoot.git] / CORRFW / AliCFParticleGenCuts.cxx
index abfbefeae70291338de499a6f042e7a79aca27e5..13f25c8165446d468dbb56675658d69245e86091 100644 (file)
 #include "TH2F.h"
 #include "TBits.h"
 #include "TList.h"
+#include "TArrayF.h"
+#include "TDecayChannel.h"
+#include "AliAODMCParticle.h"
+#include "AliAODEvent.h"
 
 ClassImp(AliCFParticleGenCuts)
 
 //______________________________
 AliCFParticleGenCuts::AliCFParticleGenCuts() : 
   AliCFCutBase(),
+  fIsAODMC(0),
   fMCInfo(0x0),
   fRequireIsCharged(0),
   fRequireIsNeutral(0),
   fRequireIsPrimary(0),
   fRequireIsSecondary(0),
   fRequirePdgCode(0),
+  fRequireAbsolutePdg(0),
   fPdgCode(0),
   fProdVtxXMin (-1.e+09),
   fProdVtxYMin (-1.e+09),
@@ -62,8 +68,10 @@ AliCFParticleGenCuts::AliCFParticleGenCuts() :
   fDecayLengthMax(1.e+09),
   fDecayRxyMin(-1),
   fDecayRxyMax(1.e+09),
+  fDecayChannel(0x0),
   fhCutStatistics(0x0),
   fhCutCorrelation(0x0),
+  fCutValues(new TArrayF(kNCuts)),
   fBitmap(new TBits(0))
 {
   //
@@ -77,12 +85,14 @@ AliCFParticleGenCuts::AliCFParticleGenCuts() :
 //______________________________
 AliCFParticleGenCuts::AliCFParticleGenCuts(const Char_t* name, const Char_t* title) : 
   AliCFCutBase(name,title),
+  fIsAODMC(0),
   fMCInfo(0x0),
   fRequireIsCharged(0),
   fRequireIsNeutral(0),
   fRequireIsPrimary(0),
   fRequireIsSecondary(0),
   fRequirePdgCode(0),
+  fRequireAbsolutePdg(0),
   fPdgCode(0),
   fProdVtxXMin (-1.e+09),
   fProdVtxYMin (-1.e+09),
@@ -100,8 +110,10 @@ AliCFParticleGenCuts::AliCFParticleGenCuts(const Char_t* name, const Char_t* tit
   fDecayLengthMax(1.e+09),
   fDecayRxyMin(-1.),
   fDecayRxyMax(1.e+09),
+  fDecayChannel(0x0),
   fhCutStatistics(0x0),
   fhCutCorrelation(0x0),
+  fCutValues(new TArrayF(kNCuts)),
   fBitmap(new TBits(0))
 {
   //
@@ -115,12 +127,14 @@ AliCFParticleGenCuts::AliCFParticleGenCuts(const Char_t* name, const Char_t* tit
 //______________________________
 AliCFParticleGenCuts::AliCFParticleGenCuts(const AliCFParticleGenCuts& c) : 
   AliCFCutBase(c),
+  fIsAODMC(c.fIsAODMC),
   fMCInfo(c.fMCInfo),
   fRequireIsCharged(c.fRequireIsCharged),
   fRequireIsNeutral(c.fRequireIsNeutral),
   fRequireIsPrimary(c.fRequireIsPrimary),
   fRequireIsSecondary(c.fRequireIsSecondary),
   fRequirePdgCode(c.fRequirePdgCode),
+  fRequireAbsolutePdg(c.fRequireAbsolutePdg),
   fPdgCode(c.fPdgCode),
   fProdVtxXMin (c.fProdVtxXMin),
   fProdVtxYMin (c.fProdVtxYMin),
@@ -138,16 +152,15 @@ AliCFParticleGenCuts::AliCFParticleGenCuts(const AliCFParticleGenCuts& c) :
   fDecayLengthMax(c.fDecayLengthMin),
   fDecayRxyMin(c.fDecayLengthMin),
   fDecayRxyMax(c.fDecayLengthMin),
+  fDecayChannel(c.fDecayChannel),
   fhCutStatistics(new TH1F(*c.fhCutStatistics)),
   fhCutCorrelation(new TH2F(*c.fhCutCorrelation)),
+  fCutValues(new TArrayF(*c.fCutValues)),
   fBitmap(new TBits(*c.fBitmap))
 {
   //
   //copy ctor
   //
-  if (c.fhCutStatistics)  fhCutStatistics  = new TH1F(*c.fhCutStatistics)  ;
-  if (c.fhCutCorrelation) fhCutCorrelation = new TH2F(*c.fhCutCorrelation) ;
-
   for (int i=0; i<kNCuts; i++)
     for (int j=0; j<kNStepQA; j++)
       fhQA[i][j]=(TH1F*)c.fhQA[i][j]->Clone();
@@ -161,12 +174,14 @@ AliCFParticleGenCuts& AliCFParticleGenCuts::operator=(const AliCFParticleGenCuts
   //
   if (this != &c) {
     AliCFCutBase::operator=(c) ;
+    fIsAODMC=c.fIsAODMC;
     fMCInfo=c.fMCInfo;
     fRequireIsCharged=c.fRequireIsCharged;
     fRequireIsNeutral=c.fRequireIsNeutral;
     fRequireIsPrimary=c.fRequireIsPrimary;
     fRequireIsSecondary=c.fRequireIsSecondary;
     fRequirePdgCode=c.fRequirePdgCode;
+    fRequireAbsolutePdg=c.fRequireAbsolutePdg;
     fPdgCode=c.fPdgCode;
     fProdVtxXMin=c.fProdVtxXMin;
     fProdVtxYMin=c.fProdVtxYMin;
@@ -184,6 +199,8 @@ AliCFParticleGenCuts& AliCFParticleGenCuts::operator=(const AliCFParticleGenCuts
     fDecayLengthMax=c.fDecayLengthMax;
     fDecayRxyMin=c.fDecayRxyMin;
     fDecayRxyMax=c.fDecayRxyMax;
+    fDecayChannel=c.fDecayChannel;
+    fCutValues=new TArrayF(*c.fCutValues);
     fBitmap=new TBits(*c.fBitmap);
     
     if (fhCutStatistics)  fhCutStatistics =new TH1F(*c.fhCutStatistics) ;
@@ -203,7 +220,10 @@ Bool_t AliCFParticleGenCuts::IsSelected(TObject* obj) {
   // 'obj' must be an AliMCParticle
   //
   
-  SelectionBitMap(obj);
+  if (!obj) return kFALSE ;
+
+  if (!fIsAODMC) SelectionBitMap((AliMCParticle*)   obj);
+  else           SelectionBitMap((AliAODMCParticle*)obj);
 
   if (fIsQAOn) FillHistograms(obj,0);
 
@@ -213,39 +233,34 @@ Bool_t AliCFParticleGenCuts::IsSelected(TObject* obj) {
   if (fIsQAOn) FillHistograms(obj,1);
   return kTRUE;
 }
-
+            
 //__________________________________________________________________________________
-void AliCFParticleGenCuts::SelectionBitMap(TObject* obj)
+void AliCFParticleGenCuts::SelectionBitMap(AliMCParticle* mcPart)
 {
   //
   // test if the track passes the single cuts
   // and store the information in a bitmap
   //
 
-  for (UInt_t i=0; i<kNCuts; i++) fBitmap->SetBitNumber(i,kFALSE);
-
-  if (!obj) return  ;
-  TString className(obj->ClassName());
-  if (className.CompareTo("AliMCParticle") != 0) {
-    AliError("argument must point to an AliMCParticle !");
-    return ;
+  for (UInt_t i=0; i<kNCuts; i++) {
+    fBitmap->SetBitNumber(i,kFALSE);
+    fCutValues->SetAt((Double32_t)0,i) ;
   }
 
-  AliMCParticle* mcPart = (AliMCParticle*) obj ;
-  TParticle* part = mcPart->Particle();
-  AliStack*  stack = fMCInfo->Stack();
+  // fill the cut array
+  Double32_t partVx=(Double32_t)mcPart->Xv();
+  Double32_t partVy=(Double32_t)mcPart->Yv();
+  Double32_t partVz=(Double32_t)mcPart->Zv();
 
-  Double32_t partVx=(Double32_t)part->Vx();
-  Double32_t partVy=(Double32_t)part->Vy();
-  Double32_t partVz=(Double32_t)part->Vz();
-
-  TParticle* daughter=0x0;
   Double32_t decayVx=0.;
   Double32_t decayVy=0.;
   Double32_t decayVz=0.;
   Double32_t decayL=0.;
   Double32_t decayRxy=0.;
 
+  TParticle* part = mcPart->Particle();
+  AliStack*  stack = ((AliMCEvent*)fMCInfo)->Stack();
+  TParticle* daughter=0x0;
   if ( part->GetNDaughters() > 0 ) {
     daughter = stack->Particle(part->GetFirstDaughter()) ;
     decayVx=(Double32_t)daughter->Vx();
@@ -257,82 +272,251 @@ void AliCFParticleGenCuts::SelectionBitMap(TObject* obj)
     decayRxy = TMath::Sqrt(TMath::Power(decayVx,2) + TMath::Power(decayVy,2) ) ;
   }
 
+  fCutValues->SetAt(partVx  ,kCutProdVtxXMin) ;
+  fCutValues->SetAt(partVy  ,kCutProdVtxYMin) ;
+  fCutValues->SetAt(partVz  ,kCutProdVtxZMin) ;
+  fCutValues->SetAt(partVx  ,kCutProdVtxXMax) ;
+  fCutValues->SetAt(partVy  ,kCutProdVtxYMax) ;
+  fCutValues->SetAt(partVz  ,kCutProdVtxZMax) ;
+  fCutValues->SetAt(decayVx ,kCutDecVtxXMin)  ;
+  fCutValues->SetAt(decayVy ,kCutDecVtxYMin)  ;
+  fCutValues->SetAt(decayVz ,kCutDecVtxZMin)  ;
+  fCutValues->SetAt(decayVx ,kCutDecVtxXMax)  ;
+  fCutValues->SetAt(decayVy ,kCutDecVtxYMax)  ;
+  fCutValues->SetAt(decayVz ,kCutDecVtxZMax)  ;
+  fCutValues->SetAt(decayL  ,kCutDecLgthMin)  ;
+  fCutValues->SetAt(decayL  ,kCutDecLgthMax)  ;
+  fCutValues->SetAt(decayRxy,kCutDecRxyMin)   ;
+  fCutValues->SetAt(decayRxy,kCutDecRxyMax)   ;
+  
+  // cut on charge
+  if ( fRequireIsCharged || fRequireIsNeutral ) {
+    if (fRequireIsCharged &&  IsCharged(mcPart)) fCutValues->SetAt((Double32_t)kTRUE,kCutCharge) ;
+    if (fRequireIsNeutral && !IsCharged(mcPart)) fCutValues->SetAt((Double32_t)kTRUE,kCutCharge) ;
+  } 
+  else fCutValues->SetAt((Double32_t)kTRUE,kCutCharge) ;
+  
+  // cut on primary/secondary
+  if ( fRequireIsPrimary || fRequireIsSecondary) {
+    if (fRequireIsPrimary   &&  IsPrimary(mcPart)) fCutValues->SetAt((Double32_t)kTRUE,kCutPrimSec);
+    if (fRequireIsSecondary && !IsPrimary(mcPart)) fCutValues->SetAt((Double32_t)kTRUE,kCutPrimSec);
+  } 
+  else fCutValues->SetAt((Double32_t)kTRUE,kCutPrimSec);
+  
+  // cut on PDG code
+  if ( fRequirePdgCode ) {
+    if (IsA(mcPart,fPdgCode,fRequireAbsolutePdg)) fCutValues->SetAt((Double32_t)kTRUE,kCutPDGCode);
+  }
+  else fCutValues->SetAt((Double32_t)kTRUE,kCutPDGCode);
+  
+  // cut on decay channel
+  if ( fDecayChannel ) {
+    Bool_t goodDecay = kTRUE ;
+    Short_t nDaughters = mcPart->Particle()->GetNDaughters() ;
+    if (nDaughters != fDecayChannel->NDaughters()) goodDecay = kFALSE ;
+    //now number of daughters is OK
+    if (goodDecay) {
+      // now check if decay channel is respected
+      // first try
+      for (Int_t iDaughter = 0; iDaughter<nDaughters; iDaughter++) {
+       TParticle* daug = stack->Particle(mcPart->Particle()->GetDaughter(iDaughter)) ;
+       if (daug->GetPdgCode() != fDecayChannel->DaughterPdgCode(iDaughter)) {goodDecay = kFALSE; break;}
+      }
+      if (!goodDecay) {
+       //second try inverting the order of the daughters
+       goodDecay = kTRUE ;
+       for (Int_t iDaughter = 0; iDaughter<nDaughters; iDaughter++) {
+         TParticle* daug = stack->Particle(mcPart->Particle()->GetDaughter(nDaughters-(iDaughter+1))) ;
+         if (daug->GetPdgCode() != fDecayChannel->DaughterPdgCode(iDaughter)) {goodDecay = kFALSE; break;}
+       }
+      }
+      if (!goodDecay && fRequireAbsolutePdg) {
+       //now tries inverting the sign of the daughters in case the anti-particle is also looked at
+       // third try
+       goodDecay = kTRUE ;
+       for (Int_t iDaughter = 0; iDaughter<nDaughters; iDaughter++) {
+         TParticle* daug = stack->Particle(mcPart->Particle()->GetDaughter(iDaughter)) ;
+         if (daug->GetPdgCode() != -fDecayChannel->DaughterPdgCode(iDaughter)) {goodDecay = kFALSE; break;}
+       }
+       if (!goodDecay) {
+         //fourth try inverting the order of the daughters
+         goodDecay = kTRUE ;
+         for (Int_t iDaughter = 0; iDaughter<nDaughters; iDaughter++) {
+           TParticle* daug = stack->Particle(mcPart->Particle()->GetDaughter(nDaughters-(iDaughter+1))) ;
+           if (daug->GetPdgCode() != -fDecayChannel->DaughterPdgCode(iDaughter)) {goodDecay = kFALSE; break;}
+         }
+       }
+      } //end check anti-particle
+    } //end # daughters OK
+    fCutValues->SetAt((Double32_t)goodDecay,kCutDecayChannel) ;
+  } //end require decay channel
+  else fCutValues->SetAt((Double32_t)kTRUE,kCutDecayChannel);
+  
+  
+  // now array of cut is build, fill the bitmap consequently
+  Int_t iCutBit = -1;
+  if ( fCutValues->At(++iCutBit) !=0 )              fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) !=0 )              fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) !=0 )              fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) > fProdVtxXMin)    fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) < fProdVtxXMax)    fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) > fProdVtxYMin)    fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) < fProdVtxYMax)    fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) > fProdVtxZMin)    fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) < fProdVtxZMax)    fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) > fDecayVtxXMin)   fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) < fDecayVtxXMax)   fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) > fDecayVtxYMin)   fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) < fDecayVtxYMax)   fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) > fDecayVtxZMin)   fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) < fDecayVtxZMax)   fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) > fDecayLengthMin) fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) < fDecayLengthMax) fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) > fDecayRxyMin)    fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) < fDecayRxyMax)    fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) != 0 )             fBitmap->SetBitNumber(iCutBit,kTRUE);
+}
+
+//__________________________________________________________________________________
+void AliCFParticleGenCuts::SelectionBitMap(AliAODMCParticle* mcPart)
+{
+  //
+  // test if the track passes the single cuts
+  // and store the information in a bitmap
+  //
+  
+  for (UInt_t i=0; i<kNCuts; i++) {
+    fBitmap->SetBitNumber(i,kFALSE);
+    fCutValues->SetAt((Double32_t)0,i) ;
+  }
+
+  // fill the cut array
+  Double32_t partVx=(Double32_t)mcPart->Xv();
+  Double32_t partVy=(Double32_t)mcPart->Yv();
+  Double32_t partVz=(Double32_t)mcPart->Zv();
+
+  Double32_t decayVx=0.;
+  Double32_t decayVy=0.;
+  Double32_t decayVz=0.;
+  Double32_t decayL=0.;
+  Double32_t decayRxy=0.;
+
+  AliAODEvent* aod = dynamic_cast<AliAODEvent*>(fMCInfo);
+  TClonesArray* mcArray = dynamic_cast<TClonesArray*>(aod->FindListObject(AliAODMCParticle::StdBranchName()));
+  AliAODMCParticle* daughter = 0x0 ;
 
-  Int_t iCutBit = 0;
+  if (mcPart->GetDaughter(0)>0) {
+    daughter = dynamic_cast<AliAODMCParticle*>(mcArray->At(mcPart->GetDaughter(0)));
 
+    decayVx=(Double32_t)daughter->Xv();
+    decayVy=(Double32_t)daughter->Yv();
+    decayVz=(Double32_t)daughter->Zv();
+    decayL = TMath::Sqrt(TMath::Power(partVx-decayVx,2) + 
+                        TMath::Power(partVy-decayVy,2) + 
+                        TMath::Power(partVz-decayVz,2) ) ;
+    decayRxy = TMath::Sqrt(TMath::Power(decayVx,2) + TMath::Power(decayVy,2) ) ;
+    
+  }
+  
+  fCutValues->SetAt(partVx  ,kCutProdVtxXMin) ;
+  fCutValues->SetAt(partVy  ,kCutProdVtxYMin) ;
+  fCutValues->SetAt(partVz  ,kCutProdVtxZMin) ;
+  fCutValues->SetAt(partVx  ,kCutProdVtxXMax) ;
+  fCutValues->SetAt(partVy  ,kCutProdVtxYMax) ;
+  fCutValues->SetAt(partVz  ,kCutProdVtxZMax) ;
+  fCutValues->SetAt(decayVx ,kCutDecVtxXMin)  ;
+  fCutValues->SetAt(decayVy ,kCutDecVtxYMin)  ;
+  fCutValues->SetAt(decayVz ,kCutDecVtxZMin)  ;
+  fCutValues->SetAt(decayVx ,kCutDecVtxXMax)  ;
+  fCutValues->SetAt(decayVy ,kCutDecVtxYMax)  ;
+  fCutValues->SetAt(decayVz ,kCutDecVtxZMax)  ;
+  fCutValues->SetAt(decayL  ,kCutDecLgthMin)  ;
+  fCutValues->SetAt(decayL  ,kCutDecLgthMax)  ;
+  fCutValues->SetAt(decayRxy,kCutDecRxyMin)   ;
+  fCutValues->SetAt(decayRxy,kCutDecRxyMax)   ;
+  
   // cut on charge
   if ( fRequireIsCharged || fRequireIsNeutral ) {
-    if(fRequireIsCharged &&  IsCharged(mcPart)) fBitmap->SetBitNumber(iCutBit,kTRUE);
-    if(fRequireIsNeutral && !IsCharged(mcPart)) fBitmap->SetBitNumber(iCutBit,kTRUE);
+    if (fRequireIsCharged &&  IsCharged(mcPart)) fCutValues->SetAt((Double32_t)kTRUE,kCutCharge) ;
+    if (fRequireIsNeutral && !IsCharged(mcPart)) fCutValues->SetAt((Double32_t)kTRUE,kCutCharge) ;
   } 
-  else fBitmap->SetBitNumber(iCutBit,kTRUE);
-  iCutBit++;
+  else fCutValues->SetAt((Double32_t)kTRUE,kCutCharge) ;
   
   // cut on primary/secondary
   if ( fRequireIsPrimary || fRequireIsSecondary) {
-    if (fRequireIsPrimary   &&  IsPrimary(mcPart,stack)) fBitmap->SetBitNumber(iCutBit,kTRUE);
-    if (fRequireIsSecondary && !IsPrimary(mcPart,stack)) fBitmap->SetBitNumber(iCutBit,kTRUE);
+    if (fRequireIsPrimary   &&  IsPrimary(mcPart)) fCutValues->SetAt((Double32_t)kTRUE,kCutPrimSec);
+    if (fRequireIsSecondary && !IsPrimary(mcPart)) fCutValues->SetAt((Double32_t)kTRUE,kCutPrimSec);
   } 
-  else fBitmap->SetBitNumber(iCutBit,kTRUE);
-  iCutBit++;
-
+  else fCutValues->SetAt((Double32_t)kTRUE,kCutPrimSec);
+  
   // cut on PDG code
-  if ( fRequirePdgCode ){
-    if (IsA(mcPart,fPdgCode,kFALSE)) fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fRequirePdgCode ) {
+    if (IsA(mcPart,fPdgCode,fRequireAbsolutePdg)) fCutValues->SetAt((Double32_t)kTRUE,kCutPDGCode);
+  }
+  else fCutValues->SetAt((Double32_t)kTRUE,kCutPDGCode);
+  
+  // cut on decay channel
+  if ( fDecayChannel ) {
+    Bool_t goodDecay = kTRUE ;
+    Short_t nDaughters = 0 ;
+    if (mcPart->GetDaughter(0) >=0) nDaughters = 1 + mcPart->GetDaughter(1) - mcPart->GetDaughter(0);
+    
+    if (nDaughters != fDecayChannel->NDaughters()) goodDecay = kFALSE ;
+    if (goodDecay) {
+      // now check if decay channel is respected
+      // first try
+      for (Int_t iDaughter = 0 ; iDaughter<nDaughters; iDaughter++) {
+       AliAODMCParticle* daug = dynamic_cast<AliAODMCParticle*>(mcArray->At(mcPart->GetDaughter(0)+iDaughter));
+       if (daug->GetPdgCode() != fDecayChannel->DaughterPdgCode(iDaughter)) {goodDecay = kFALSE; break;}
+      }
+      if (!goodDecay) {
+       //second try inverting the order of the daughters
+       goodDecay = kTRUE ;
+       for (Int_t iDaughter = 0 ; iDaughter<nDaughters; iDaughter++) {
+         AliAODMCParticle* daug = dynamic_cast<AliAODMCParticle*>(mcArray->At(mcPart->GetDaughter(1)-iDaughter));
+         if (daug->GetPdgCode() != fDecayChannel->DaughterPdgCode(iDaughter)) {goodDecay = kFALSE; break;}
+       }
+      }
+    }
+    fCutValues->SetAt((Double32_t)goodDecay,kCutDecayChannel) ;
   }
-  else fBitmap->SetBitNumber(iCutBit,kTRUE);
-  iCutBit++;
-
-  // production vertex cuts
-  if ( partVx > fProdVtxXMin ) fBitmap->SetBitNumber(iCutBit,kTRUE);
-  iCutBit++;
-  if ( partVx < fProdVtxXMax ) fBitmap->SetBitNumber(iCutBit,kTRUE);
-  iCutBit++;
-  if ( partVy > fProdVtxYMin ) fBitmap->SetBitNumber(iCutBit,kTRUE);
-  iCutBit++;
-  if ( partVy < fProdVtxYMax ) fBitmap->SetBitNumber(iCutBit,kTRUE);
-  iCutBit++;
-  if ( partVz > fProdVtxZMin ) fBitmap->SetBitNumber(iCutBit,kTRUE);
-  iCutBit++;
-  if ( partVz < fProdVtxZMax ) fBitmap->SetBitNumber(iCutBit,kTRUE);
-  iCutBit++;
+  else fCutValues->SetAt((Double32_t)kTRUE,kCutDecayChannel);
   
-  // decay vertex cuts
-  if ( decayVx > fDecayVtxXMin ) fBitmap->SetBitNumber(iCutBit,kTRUE);
-  iCutBit++;
-  if ( decayVx < fDecayVtxXMax ) fBitmap->SetBitNumber(iCutBit,kTRUE);
-  iCutBit++;
-  if ( decayVy > fDecayVtxYMin ) fBitmap->SetBitNumber(iCutBit,kTRUE);
-  iCutBit++;
-  if ( decayVy < fDecayVtxYMax ) fBitmap->SetBitNumber(iCutBit,kTRUE);
-  iCutBit++;
-  if ( decayVz > fDecayVtxZMin ) fBitmap->SetBitNumber(iCutBit,kTRUE);
-  iCutBit++;
-  if ( decayVz < fDecayVtxZMax ) fBitmap->SetBitNumber(iCutBit,kTRUE);
-  iCutBit++;
-
-  // decay length cuts
-  if ( decayL > fDecayLengthMin ) fBitmap->SetBitNumber(iCutBit,kTRUE);
-  iCutBit++;
-  if ( decayL < fDecayLengthMax ) fBitmap->SetBitNumber(iCutBit,kTRUE);
-  iCutBit++;
   
-  // transverse decay length cuts
-  if ( decayRxy > fDecayRxyMin ) fBitmap->SetBitNumber(iCutBit,kTRUE);
-  iCutBit++;
-  if ( decayRxy < fDecayRxyMax ) fBitmap->SetBitNumber(iCutBit,kTRUE);
-
+  // now array of cut is build, fill the bitmap consequently
+  Int_t iCutBit = -1;
+  if ( fCutValues->At(++iCutBit) !=0 )              fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) !=0 )              fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) !=0 )              fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) > fProdVtxXMin)    fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) < fProdVtxXMax)    fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) > fProdVtxYMin)    fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) < fProdVtxYMax)    fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) > fProdVtxZMin)    fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) < fProdVtxZMax)    fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) > fDecayVtxXMin)   fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) < fDecayVtxXMax)   fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) > fDecayVtxYMin)   fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) < fDecayVtxYMax)   fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) > fDecayVtxZMin)   fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) < fDecayVtxZMax)   fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) > fDecayLengthMin) fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) < fDecayLengthMax) fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) > fDecayRxyMin)    fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) < fDecayRxyMax)    fBitmap->SetBitNumber(iCutBit,kTRUE);
+  if ( fCutValues->At(++iCutBit) != 0 )             fBitmap->SetBitNumber(iCutBit,kTRUE);
 }
 
+
 //__________________________________________________________________________________
-void AliCFParticleGenCuts::FillHistograms(TObject* obj, Bool_t afterCuts)
+void AliCFParticleGenCuts::FillHistograms(TObject* /*obj*/, Bool_t afterCuts)
 {
   //
   // fill the QA histograms
   //
 
   for (int iCutNumber = 0; iCutNumber < kNCuts; iCutNumber++) 
-    fhQA[iCutNumber][afterCuts]->Fill(fBitmap->TestBitNumber(iCutNumber));
+    fhQA[iCutNumber][afterCuts]->Fill(fCutValues->At(iCutNumber));
 
   // fill cut statistics and cut correlation histograms with information from the bitmap
   if (afterCuts) return;
@@ -340,7 +524,7 @@ void AliCFParticleGenCuts::FillHistograms(TObject* obj, Bool_t afterCuts)
   // Number of single cuts in this class
   UInt_t ncuts = fBitmap->GetNbits();
   for(UInt_t bit=0; bit<ncuts;bit++) {
-   if (!fBitmap->TestBitNumber(bit)) {
+    if (!fBitmap->TestBitNumber(bit)) {
       fhCutStatistics->Fill(bit+1);
       for (UInt_t bit2=bit; bit2<ncuts;bit2++) {
        if (!fBitmap->TestBitNumber(bit2)) 
@@ -397,6 +581,7 @@ void AliCFParticleGenCuts::DefineHistograms() {
   fhCutStatistics->GetXaxis()->SetBinLabel(k,"DecLgthMax") ; k++;
   fhCutStatistics->GetXaxis()->SetBinLabel(k,"DecRxyMin")  ; k++;
   fhCutStatistics->GetXaxis()->SetBinLabel(k,"DecRxyMax")  ; k++;
+  fhCutStatistics->GetXaxis()->SetBinLabel(k,"DecChannel") ; k++;
 
 
   fhCutCorrelation = new TH2F(Form("%s_cut_correlation",GetName()),"",kNCuts,0.5,kNCuts+0.5,kNCuts,0.5,kNCuts+0.5);
@@ -410,65 +595,97 @@ void AliCFParticleGenCuts::DefineHistograms() {
   for (int i=0; i<kNStepQA; i++) {
     if (i==0) sprintf(str," ");
     else sprintf(str,"_cut");
-    fhQA[kCutCharge]     [i] = new TH1F(Form("%s_charge%s"      ,GetName(),str),"",2,-0.5,1.5);
-    fhQA[kCutPrimSec]    [i] = new TH1F(Form("%s_primSec%s"     ,GetName(),str),"",2,-0.5,1.5);
-    fhQA[kCutPDGCode]    [i] = new TH1F(Form("%s_pdgCode%s"     ,GetName(),str),"",10000,-5000,5000);
-    fhQA[kCutProdVtxXMin][i] = new TH1F(Form("%s_prodVtxXMin%s" ,GetName(),str),"",100,0,10);
-    fhQA[kCutProdVtxXMax][i] = new TH1F(Form("%s_prodVtxXMax%s" ,GetName(),str),"",100,0,10);
-    fhQA[kCutProdVtxYMin][i] = new TH1F(Form("%s_prodVtxYMin%s" ,GetName(),str),"",100,0,10);
-    fhQA[kCutProdVtxYMax][i] = new TH1F(Form("%s_prodVtxYMax%s" ,GetName(),str),"",100,0,10);
-    fhQA[kCutProdVtxZMin][i] = new TH1F(Form("%s_prodVtxZMin%s" ,GetName(),str),"",100,0,10);
-    fhQA[kCutProdVtxZMax][i] = new TH1F(Form("%s_prodVtxZMax%s" ,GetName(),str),"",100,0,10);
-    fhQA[kCutDecVtxXMin] [i] = new TH1F(Form("%s_decVtxXMin%s"  ,GetName(),str),"",100,0,10);
-    fhQA[kCutDecVtxXMax] [i] = new TH1F(Form("%s_decVtxXMax%s"  ,GetName(),str),"",100,0,10);
-    fhQA[kCutDecVtxYMin] [i] = new TH1F(Form("%s_decVtxYMin%s"  ,GetName(),str),"",100,0,10);
-    fhQA[kCutDecVtxYMax] [i] = new TH1F(Form("%s_decVtxYMax%s"  ,GetName(),str),"",100,0,10);
-    fhQA[kCutDecVtxZMin] [i] = new TH1F(Form("%s_decVtxZMin%s"  ,GetName(),str),"",100,0,10);
-    fhQA[kCutDecVtxZMax] [i] = new TH1F(Form("%s_decVtxZMax%s"  ,GetName(),str),"",100,0,10);
-    fhQA[kCutDecLgthMin] [i] = new TH1F(Form("%s_decLengthMin%s",GetName(),str),"",100,0,10);
-    fhQA[kCutDecLgthMax] [i] = new TH1F(Form("%s_decLengthMax%s",GetName(),str),"",100,0,10);
-    fhQA[kCutDecRxyMin]  [i] = new TH1F(Form("%s_decRxyMin%s"   ,GetName(),str),"",100,0,10);
-    fhQA[kCutDecRxyMax]  [i] = new TH1F(Form("%s_decRxyMax%s"   ,GetName(),str),"",100,0,10);
+    fhQA[kCutCharge]      [i] = new TH1F(Form("%s_charge%s"      ,GetName(),str),"",2,0,2);
+    fhQA[kCutPrimSec]     [i] = new TH1F(Form("%s_primSec%s"     ,GetName(),str),"",2,0,2);
+    fhQA[kCutPDGCode]     [i] = new TH1F(Form("%s_pdgCode%s"     ,GetName(),str),"",2,0,2);
+    fhQA[kCutProdVtxXMin] [i] = new TH1F(Form("%s_prodVtxXMin%s" ,GetName(),str),"",100,0,10);
+    fhQA[kCutProdVtxXMax] [i] = new TH1F(Form("%s_prodVtxXMax%s" ,GetName(),str),"",100,0,10);
+    fhQA[kCutProdVtxYMin] [i] = new TH1F(Form("%s_prodVtxYMin%s" ,GetName(),str),"",100,0,10);
+    fhQA[kCutProdVtxYMax] [i] = new TH1F(Form("%s_prodVtxYMax%s" ,GetName(),str),"",100,0,10);
+    fhQA[kCutProdVtxZMin] [i] = new TH1F(Form("%s_prodVtxZMin%s" ,GetName(),str),"",100,0,10);
+    fhQA[kCutProdVtxZMax] [i] = new TH1F(Form("%s_prodVtxZMax%s" ,GetName(),str),"",100,0,10);
+    fhQA[kCutDecVtxXMin]  [i] = new TH1F(Form("%s_decVtxXMin%s"  ,GetName(),str),"",100,0,10);
+    fhQA[kCutDecVtxXMax]  [i] = new TH1F(Form("%s_decVtxXMax%s"  ,GetName(),str),"",100,0,10);
+    fhQA[kCutDecVtxYMin]  [i] = new TH1F(Form("%s_decVtxYMin%s"  ,GetName(),str),"",100,0,10);
+    fhQA[kCutDecVtxYMax]  [i] = new TH1F(Form("%s_decVtxYMax%s"  ,GetName(),str),"",100,0,10);
+    fhQA[kCutDecVtxZMin]  [i] = new TH1F(Form("%s_decVtxZMin%s"  ,GetName(),str),"",100,0,10);
+    fhQA[kCutDecVtxZMax]  [i] = new TH1F(Form("%s_decVtxZMax%s"  ,GetName(),str),"",100,0,10);
+    fhQA[kCutDecLgthMin]  [i] = new TH1F(Form("%s_decLengthMin%s",GetName(),str),"",100,0,10);
+    fhQA[kCutDecLgthMax]  [i] = new TH1F(Form("%s_decLengthMax%s",GetName(),str),"",100,0,10);
+    fhQA[kCutDecRxyMin]   [i] = new TH1F(Form("%s_decRxyMin%s"   ,GetName(),str),"",100,0,10);
+    fhQA[kCutDecRxyMax]   [i] = new TH1F(Form("%s_decRxyMax%s"   ,GetName(),str),"",100,0,10);
+    fhQA[kCutDecayChannel][i] = new TH1F(Form("%s_decayChannel%s",GetName(),str),"",2,0,2);
   }
   for(Int_t i=0; i<kNCuts; i++) fhQA[i][1]->SetLineColor(color);
 }
 
 
 //______________________________
-Bool_t AliCFParticleGenCuts::IsCharged(AliMCParticle *mcPart) {
+Bool_t AliCFParticleGenCuts::IsCharged(AliVParticle *mcPart) {
   //
   //check if particle is charged.
   //
-  TParticle* part = mcPart->Particle();
-  TParticlePDG* pdgPart = part->GetPDG();
-  if(!pdgPart)return kFALSE;
-  if (pdgPart->Charge() == 0) return kFALSE;
+  if (mcPart->Charge()==0) return kFALSE;
+  return kTRUE;
+}
+//______________________________
+Bool_t AliCFParticleGenCuts::IsPrimary(AliMCParticle *mcPart) {
+  //
+  //check if particle is primary (standard definition)
+  //
+  
+  AliStack* stack = ((AliMCEvent*)fMCInfo)->Stack();
+
+  if (!stack->IsPhysicalPrimary(mcPart->GetLabel())) return kFALSE;
   return kTRUE;
 }
 //______________________________
-Bool_t AliCFParticleGenCuts::IsPrimary(AliMCParticle *mcPart, AliStack *stack) {
+Bool_t AliCFParticleGenCuts::IsPrimary(AliAODMCParticle *mcPart) {
   //
   //check if particle is primary (standard definition)
   //
-  if (!stack->IsPhysicalPrimary(mcPart->Label())) return kFALSE ;
+  
+  if (!mcPart->IsPhysicalPrimary()) return kFALSE;
   return kTRUE;
 }
 //______________________________
-Bool_t AliCFParticleGenCuts::IsPrimaryCharged(AliMCParticle *mcPart, AliStack *stack) {
+Bool_t AliCFParticleGenCuts::IsPrimaryCharged(AliVParticle *mcPart) {
   //
   //check if a charged particle is primary (standard definition)
   //
-  if (!stack->IsPhysicalPrimary(mcPart->Label()) || !IsCharged(mcPart)) return kFALSE ;
+
+  if (!fIsAODMC) {
+    if (!IsPrimary((AliMCParticle*)mcPart) || !IsCharged(mcPart)) return kFALSE ;
+  }
+  else {
+    if (!IsPrimary((AliAODMCParticle*)mcPart) || !IsCharged(mcPart)) return kFALSE ;
+  }
   return kTRUE;
 }
 //______________________________
 Bool_t AliCFParticleGenCuts::IsA(AliMCParticle *mcPart, Int_t pdg, Bool_t abs) {
   //
   //Check on the pdg code of the MC particle. if abs=kTRUE then check on the 
-  //absolute value. By default is set to kFALSE.
+  //absolute value. 
   //
   TParticle* part = mcPart->Particle();
   Int_t pdgCode = part->GetPdgCode();
+
+  if (abs) {
+    pdgCode = TMath::Abs(pdgCode);
+    pdg = TMath::Abs(pdg);
+  }
+  if (pdgCode != pdg ) return kFALSE;
+  return kTRUE;
+}
+//______________________________
+Bool_t AliCFParticleGenCuts::IsA(AliAODMCParticle *mcPart, Int_t pdg, Bool_t abs) {
+  //
+  //Check on the pdg code of the MC particle. if abs=kTRUE then check on the 
+  //absolute value. 
+  //
+  Int_t pdgCode = mcPart->GetPdgCode();
+  
   if (abs) {
     pdgCode = TMath::Abs(pdgCode);
     pdg = TMath::Abs(pdg);
@@ -488,10 +705,11 @@ void AliCFParticleGenCuts::SetEvtInfo(TObject* mcEvent) {
   }
   
   TString className(mcEvent->ClassName());
-  if (className.CompareTo("AliMCEvent") != 0) {
-    AliError("argument must point to an AliMCEvent !");
+  if (className.CompareTo("AliMCEvent") != 0 && className.CompareTo("AliAODEvent") != 0) {
+    AliError("argument must point to an AliMCEvent or an AliAODEvent !");
     return ;
   }
   
-  fMCInfo = (AliMCEvent*) mcEvent ;
+  if (fIsAODMC) fMCInfo = dynamic_cast<AliAODEvent*>(mcEvent) ;
+  else          fMCInfo = dynamic_cast<AliMCEvent*> (mcEvent) ;
 }