Bug fixes.

[u/mrichter/AliRoot.git] / PWG3 / vertexingHF / AliRDHFCuts.cxx

diff --git a/PWG3/vertexingHF/AliRDHFCuts.cxx b/PWG3/vertexingHF/AliRDHFCuts.cxx
index c7ac5dc9ecbc4bf3cf288f04db1ecdae8ce123b8..3485e353c45bb9b731ae75c24922a3bb30870659 100644 (file)
--- a/PWG3/vertexingHF/AliRDHFCuts.cxx
+++ b/PWG3/vertexingHF/AliRDHFCuts.cxx
@@ -41,6 +41,7 @@ AliAnalysisCuts(name,title),
 fMinVtxType(3),
 fMinVtxContr(1),
 fMaxVtxRedChi2(1e6),
+fMaxVtxZ(1e6),
 fMinSPDMultiplicity(0),
 fTriggerMask(0),
 fTrackCuts(0),
@@ -72,6 +73,7 @@ AliRDHFCuts::AliRDHFCuts(const AliRDHFCuts &source) :
   fMinVtxType(source.fMinVtxType),
   fMinVtxContr(source.fMinVtxContr),
   fMaxVtxRedChi2(source.fMaxVtxRedChi2),
+  fMaxVtxZ(source.fMaxVtxZ),
   fMinSPDMultiplicity(source.fMinSPDMultiplicity),
   fTriggerMask(source.fTriggerMask),
   fTrackCuts(0),
@@ -119,6 +121,7 @@ AliRDHFCuts &AliRDHFCuts::operator=(const AliRDHFCuts &source)
   fMinVtxType=source.fMinVtxType;
   fMinVtxContr=source.fMinVtxContr;
   fMaxVtxRedChi2=source.fMaxVtxRedChi2;
+  fMaxVtxZ=source.fMaxVtxZ;
   fMinSPDMultiplicity=source.fMinSPDMultiplicity;
   fTriggerMask=source.fTriggerMask;
   fnPtBins=source.fnPtBins;
@@ -183,9 +186,14 @@ Bool_t AliRDHFCuts::IsEventSelected(AliVEvent *event) {
 
   if(vertex->GetNContributors()<fMinVtxContr) return kFALSE; 
 
+  if(TMath::Abs(vertex->GetZ())>fMaxVtxZ) return kFALSE;
+
   // switch to settings for 1-pad cls in TPC
   if(fPidHF) {
-    if(event->GetRunNumber()>121693) fPidHF->SetOnePad(kTRUE);
+    if(event->GetRunNumber()>121693 && event->GetRunNumber()<136851) 
+      fPidHF->SetOnePad(kTRUE);
+    if(event->GetRunNumber()>=136851 && event->GetRunNumber()<=139517) 
+      fPidHF->SetPbPb(kTRUE);
   }
 
   if(fOptPileup==kRejectPileupEvent){
@@ -532,3 +540,39 @@ Bool_t AliRDHFCuts::CompareCuts(const AliRDHFCuts *obj) const {
 
   return areEqual;
 }
+//---------------------------------------------------------------------------
+void AliRDHFCuts::MakeTable() const {
+  //
+  // print cuts values in table format
+  // 
+
+       TString ptString = "pT range";
+       if(fVarNames && fPtBinLimits && fCutsRD){
+               TString firstLine(Form("*       %-15s",ptString.Data()));
+               for (Int_t ivar=0; ivar<fnVars; ivar++){
+                       firstLine+=Form("*    %-15s  ",fVarNames[ivar].Data());
+                       if (ivar == fnVars){
+                               firstLine+="*\n";
+                       }
+               }
+               Printf("%s",firstLine.Data());
+               
+               for (Int_t ipt=0; ipt<fnPtBins; ipt++){
+                       TString line;
+                       if (ipt==fnPtBins-1){
+                               line=Form("*  %5.1f < pt < inf    ",fPtBinLimits[ipt]);
+                       }
+                       else{
+                               line=Form("*  %5.1f < pt < %4.1f   ",fPtBinLimits[ipt],fPtBinLimits[ipt+1]);
+                       }
+                       for (Int_t ivar=0; ivar<fnVars; ivar++){
+                               line+=Form("*     %-15f ",fCutsRD[GetGlobalIndex(ivar,ipt)]);
+                       }
+                       Printf("%s",line.Data());
+               }
+
+       }
+
+
+  return;
+}