Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / CORRFW / AliCFEventGenCuts.cxx

diff --git a/CORRFW/AliCFEventGenCuts.cxx b/CORRFW/AliCFEventGenCuts.cxx
index c138db877cf01902fc8198ccbd0b683843635311..a6eb8a5d4417d4467870878dafa709bea0684128 100644 (file)
--- a/CORRFW/AliCFEventGenCuts.cxx
+++ b/CORRFW/AliCFEventGenCuts.cxx
@@ -127,19 +127,19 @@ Bool_t AliCFEventGenCuts::IsSelected(TObject* obj) {
   //Check if the requested cuts are passed
   //
 
-  TBits *bitmap = SelectionBitMap(obj);
+  SelectionBitMap(obj);
 
   Bool_t isSelected = kTRUE;
 
-  for (UInt_t icut=0; icut<bitmap->GetNbits();icut++)
-       if(!bitmap->TestBitNumber(icut)) isSelected = kFALSE;
+  for (UInt_t icut=0; icut<fBitMap->GetNbits();icut++)
+       if(!fBitMap->TestBitNumber(icut)) isSelected = kFALSE;
 
   return isSelected;
 
 }
 
 //____________________________________________________________________
-TBits * AliCFEventGenCuts::SelectionBitMap(TObject* obj){
+void AliCFEventGenCuts::SelectionBitMap(TObject* obj){
   //
   //cut on the MB process type, the number of charged and neutral 
   //tracks and on the event vertex. So far specific to AliMCEvents
@@ -148,7 +148,7 @@ TBits * AliCFEventGenCuts::SelectionBitMap(TObject* obj){
   //Check if the requested cuts are passed and return a bitmap
   for(Int_t j=0;j<kNCuts;j++)fBitMap->SetBitNumber(j,kFALSE);
   AliMCEvent* ev = dynamic_cast<AliMCEvent *>(obj);
-  if ( !ev ) return fBitMap ;
+  if ( !ev ) return;
   AliGenEventHeader*genHeader = ev->GenEventHeader();  
 
 
@@ -204,7 +204,7 @@ TBits * AliCFEventGenCuts::SelectionBitMap(TObject* obj){
     if (vtxPos[2]>fVtxZMax || vtxPos[2]<fVtxZMin)
       fBitMap->SetBitNumber(4,kFALSE); 
   }  
-  return fBitMap;
+  return;
 }
 
  //______________________________________________________________________
@@ -225,19 +225,23 @@ Bool_t AliCFEventGenCuts::IsMBProcType(AliMCEvent *ev, PrType iproc){
       if ( process!=92 && process!=93 && process!=94)
        return kTRUE;
     }
+    break;
   case kSD: //Single Diffractive
     {
       if ( process==92 || process==93)
        return kTRUE;
     }
+    break;
   case kDD: //Double Diffractive
     {
       if ( process==94)
        return kTRUE;
     }
+    break;
+  default: return kFALSE; break;
   }
-
-  return kFALSE;     
+  
+  return kFALSE;
 }
  //____________________________________________________________________________
 Int_t AliCFEventGenCuts::ProcType(AliGenEventHeader *genHeader) {
@@ -276,11 +280,3 @@ Int_t AliCFEventGenCuts::ProcType(AliGenEventHeader *genHeader) {
   return process;
 }
 
-//_____________________________________________________________________________
-void  AliCFEventGenCuts::GetBitMap(TObject* obj, TBits *bitmap){
-  //
-  // retrieve the pointer to the bitmap
-  //
-  bitmap=SelectionBitMap(obj);
-
-}