From: loizides <loizides@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Wed, 27 Mar 2013 11:32:50 +0000 (+0000)
Subject: from Salvatore
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=d1f2e0d912d16d8d409d29249dc53273296fca6e;p=u%2Fmrichter%2FAliRoot.git

from Salvatore
---

diff --git a/PWGJE/EMCALJetTasks/AliEmcalJetTask.cxx b/PWGJE/EMCALJetTasks/AliEmcalJetTask.cxx
index 48c397596bd..7924e86a6c3 100644
--- a/PWGJE/EMCALJetTasks/AliEmcalJetTask.cxx
+++ b/PWGJE/EMCALJetTasks/AliEmcalJetTask.cxx
@@ -34,8 +34,8 @@ AliEmcalJetTask::AliEmcalJetTask() :
   fCaloName("CaloClusters"),
   fJetsName("Jets"),
   fJetType(kNone),
-  fConstSel(kAllJets),
-  fMCConstSel(kAllJets),
+  fConstSel(0),
+  fMCConstSel(0),
   fMarkConst(kFALSE),
   fRadius(0.4),
   fMinJetTrackPt(0.15),
@@ -71,8 +71,8 @@ AliEmcalJetTask::AliEmcalJetTask(const char *name) :
   fCaloName("CaloClusters"),
   fJetsName("Jets"),
   fJetType(kAKT|kFullJet|kRX1Jet),
-  fConstSel(kAllJets),
-  fMCConstSel(kAllJets),
+  fConstSel(0),
+  fMCConstSel(0),
   fMarkConst(kFALSE),
   fRadius(0.4),
   fMinJetTrackPt(0.15),
@@ -196,33 +196,21 @@ void AliEmcalJetTask::FindJets()
 	}
       }
       if (fIsMcPart || TMath::Abs(t->GetLabel()) > fMinMCLabel) {
-	if (fMCConstSel == kNone) {
-	  AliDebug(2,Form("Skipping track %d because bit mask is 0.", iTracks));
+	if (t->TestBits(fMCConstSel) != (Int_t)fMCConstSel) {
+	  AliDebug(2,Form("Skipping track %d because it does not match the bit mask (%d, %d)", iTracks, fMCConstSel, t->TestBits(TObject::kBitMask)));
 	  continue;
 	}
-	if (fMCConstSel != kAllJets) {
-	  if (t->TestBits(fMCConstSel) != (Int_t)fMCConstSel) {
-	    AliDebug(2,Form("Skipping track %d because it does not match the bit mask (%d, %d)", iTracks, fMCConstSel, t->TestBits(TObject::kBitMask)));
-	    continue;
-	  }
-	  else {
-	    AliDebug(2,Form("Track %d matches the bit mask (%d, %d)", iTracks, fMCConstSel, t->TestBits(TObject::kBitMask)));
-	  }
+	else {
+	  AliDebug(2,Form("Track %d matches the bit mask (%d, %d)", iTracks, fMCConstSel, t->TestBits(TObject::kBitMask)));
 	}
       }
       else {
-	if (fConstSel == kNone) {
-	  AliDebug(2,Form("Skipping track %d because bit mask is 0.", iTracks));
+	if (t->TestBits(fConstSel) != (Int_t)fConstSel) {
+	  AliDebug(2,Form("Skipping track %d because it does not match the bit mask (%d, %d)", iTracks, fConstSel, t->TestBits(TObject::kBitMask)));
 	  continue;
 	}
-	if (fConstSel != kAllJets) {
-	  if (t->TestBits(fConstSel) != (Int_t)fConstSel) {
-	    AliDebug(2,Form("Skipping track %d because it does not match the bit mask (%d, %d)", iTracks, fConstSel, t->TestBits(TObject::kBitMask)));
-	    continue;
-	  }
-	  else {
-	    AliDebug(2,Form("Track %d matches the bit mask (%d, %d)", iTracks, fConstSel, t->TestBits(TObject::kBitMask)));	    
-	  }
+	else {
+	  AliDebug(2,Form("Track %d matches the bit mask (%d, %d)", iTracks, fConstSel, t->TestBits(TObject::kBitMask)));	    
 	}
       }	    
       if (t->Pt() < fMinJetTrackPt) 
@@ -255,33 +243,21 @@ void AliEmcalJetTask::FindJets()
 	  continue;
 
 	if (c->GetLabel() > fMinMCLabel) {
-	  if (fMCConstSel == kNone) {
-	    AliDebug(2,Form("Skipping cluster %d because bit mask is 0.", iClus));
+	  if (ep->TestBits(fMCConstSel) != (Int_t)fMCConstSel) {
+	    AliDebug(2,Form("Skipping cluster %d because it does not match the bit mask (%d, %d)", iClus, fMCConstSel, ep->TestBits(TObject::kBitMask)));
 	    continue;
 	  }
-	  if (fMCConstSel != kAllJets) {
-	    if (ep->TestBits(fMCConstSel) != (Int_t)fMCConstSel) {
-	      AliDebug(2,Form("Skipping cluster %d because it does not match the bit mask (%d, %d)", iClus, fMCConstSel, ep->TestBits(TObject::kBitMask)));
-	      continue;
-	    }
-	    else {
-	      AliDebug(2,Form("Cluster %d matches the bit mask (%d, %d)", iClus, fMCConstSel, ep->TestBits(TObject::kBitMask)));
-	    }
+	  else {
+	    AliDebug(2,Form("Cluster %d matches the bit mask (%d, %d)", iClus, fMCConstSel, ep->TestBits(TObject::kBitMask)));
 	  }
 	}
 	else {
-	  if (fConstSel == kNone) {
-	    AliDebug(2,Form("Skipping cluster %d because bit mask is 0.", iClus));
+	  if (ep->TestBits(fConstSel) != (Int_t)fConstSel) {
+	    AliDebug(2,Form("Skipping cluster %d because it does not match the bit mask (%d, %d)", iClus, fConstSel, ep->TestBits(TObject::kBitMask)));
 	    continue;
 	  }
-	  if (fConstSel != kAllJets) {
-	    if (ep->TestBits(fConstSel) != (Int_t)fConstSel) {
-	      AliDebug(2,Form("Skipping cluster %d because it does not match the bit mask (%d, %d)", iClus, fConstSel, ep->TestBits(TObject::kBitMask)));
-	      continue;
-	    }
-	    else {
-	      AliDebug(2,Form("Cluster %d matches the bit mask (%d, %d)", iClus, fConstSel, ep->TestBits(TObject::kBitMask)));	    
-	    }
+	  else {
+	    AliDebug(2,Form("Cluster %d matches the bit mask (%d, %d)", iClus, fConstSel, ep->TestBits(TObject::kBitMask)));	    
 	  }
 	}
 
@@ -297,33 +273,21 @@ void AliEmcalJetTask::FindJets()
 	  continue;
 
 	if (c->GetLabel() > fMinMCLabel) {
-	  if (fMCConstSel == kNone) {
-	    AliDebug(2,Form("Skipping cluster %d because bit mask is 0.", iClus));
+	  if (c->TestBits(fMCConstSel) != (Int_t)fMCConstSel) {
+	    AliDebug(2,Form("Skipping cluster %d because it does not match the bit mask (%d, %d)", iClus, fMCConstSel, c->TestBits(TObject::kBitMask)));
 	    continue;
 	  }
-	  if (fMCConstSel != kAllJets) {
-	    if (c->TestBits(fMCConstSel) != (Int_t)fMCConstSel) {
-	      AliDebug(2,Form("Skipping cluster %d because it does not match the bit mask (%d, %d)", iClus, fMCConstSel, c->TestBits(TObject::kBitMask)));
-	      continue;
-	    }
-	    else {
-	      AliDebug(2,Form("Cluster %d matches the bit mask (%d, %d)", iClus, fMCConstSel, c->TestBits(TObject::kBitMask)));
-	    }
+	  else {
+	    AliDebug(2,Form("Cluster %d matches the bit mask (%d, %d)", iClus, fMCConstSel, c->TestBits(TObject::kBitMask)));
 	  }
 	}
 	else {
-	  if (fConstSel == kNone) {
-	    AliDebug(2,Form("Skipping cluster %d because bit mask is 0.", iClus));
+	  if (c->TestBits(fConstSel) != (Int_t)fConstSel) {
+	    AliDebug(2,Form("Skipping cluster %d because it does not match the bit mask (%d, %d)", iClus, fConstSel, c->TestBits(TObject::kBitMask)));
 	    continue;
 	  }
-	  if (fConstSel != kAllJets) {
-	    if (c->TestBits(fConstSel) != (Int_t)fConstSel) {
-	      AliDebug(2,Form("Skipping cluster %d because it does not match the bit mask (%d, %d)", iClus, fConstSel, c->TestBits(TObject::kBitMask)));
-	      continue;
-	    }
-	    else {
-	      AliDebug(2,Form("Cluster %d matches the bit mask (%d, %d)", iClus, fConstSel, c->TestBits(TObject::kBitMask)));	    
-	    }
+	  else {
+	    AliDebug(2,Form("Cluster %d matches the bit mask (%d, %d)", iClus, fConstSel, c->TestBits(TObject::kBitMask)));	    
 	  }
 	}
 
diff --git a/PWGJE/EMCALJetTasks/AliEmcalJetTask.h b/PWGJE/EMCALJetTasks/AliEmcalJetTask.h
index ff3525821bc..d5eee5e08d5 100644
--- a/PWGJE/EMCALJetTasks/AliEmcalJetTask.h
+++ b/PWGJE/EMCALJetTasks/AliEmcalJetTask.h
@@ -28,8 +28,7 @@ class AliEmcalJetTask : public AliAnalysisTaskSE {
     kR040Jet=1<<7,
     kRX1Jet=1<<8,  // user defined radii, use SetRadius(Double_t)
     kRX2Jet=1<<9,
-    kRX3Jet=1<<10,
-    kAllJets=kKT|kAKT|kFullJet|kChargedJet|kNeutralJet|kR020Jet|kR030Jet|kR040Jet|kRX1Jet|kRX2Jet|kRX3Jet
+    kRX3Jet=1<<10
   };
 
 
diff --git a/PWGJE/macros/CreateTrackCutsPWGJE.C b/PWGJE/macros/CreateTrackCutsPWGJE.C
index c4d6576a580..3addc8e9834 100644
--- a/PWGJE/macros/CreateTrackCutsPWGJE.C
+++ b/PWGJE/macros/CreateTrackCutsPWGJE.C
@@ -242,9 +242,6 @@ AliESDtrackCuts *CreateTrackCutsPWGJE(Int_t cutMode) {
     trackCuts->SetClusterRequirementITS(AliESDtrackCuts::kSPD, AliESDtrackCuts::kNone);
 
     trackCuts->SetMaxFractionSharedTPCClusters(0.4);
-
-    trackCuts->SetEtaRange(-0.9,0.9);
-    trackCuts->SetPtRange(0.15, 1E+15.);
  
     tag = "Global tracks 2011 with NCrossedRows cut";