Revert wrong commit
authorprino <prino@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 10 May 2012 09:44:20 +0000 (09:44 +0000)
committerprino <prino@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 10 May 2012 09:44:20 +0000 (09:44 +0000)
PWGHF/vertexingHF/AliRDHFCuts.cxx
PWGHF/vertexingHF/AliRDHFCuts.h

index 0051430..2b92869 100644 (file)
@@ -90,9 +90,7 @@ fMinPtCand(-1.),
 fMaxPtCand(100000.),
 fKeepSignalMC(kFALSE),
 fIsCandTrackSPDFirst(kFALSE),
-fMaxPtCandTrackSPDFirst(0.),
-fApplySPDDeadPbPb2011(kFALSE),
-fRemoveTrackletOutliers(kFALSE)
+fMaxPtCandTrackSPDFirst(0.)
 {
   //
   // Default Constructor
@@ -142,9 +140,7 @@ AliRDHFCuts::AliRDHFCuts(const AliRDHFCuts &source) :
   fMaxPtCand(source.fMaxPtCand),
   fKeepSignalMC(source.fKeepSignalMC),
   fIsCandTrackSPDFirst(source.fIsCandTrackSPDFirst),
-  fMaxPtCandTrackSPDFirst(source.fMaxPtCandTrackSPDFirst),
-  fApplySPDDeadPbPb2011(source.fApplySPDDeadPbPb2011),
-  fRemoveTrackletOutliers(source.fRemoveTrackletOutliers)
+  fMaxPtCandTrackSPDFirst(source.fMaxPtCandTrackSPDFirst)
 {
   //
   // Copy constructor
@@ -206,8 +202,6 @@ AliRDHFCuts &AliRDHFCuts::operator=(const AliRDHFCuts &source)
   fKeepSignalMC=source.fKeepSignalMC;
   fIsCandTrackSPDFirst=source.fIsCandTrackSPDFirst;
   fMaxPtCandTrackSPDFirst=source.fMaxPtCandTrackSPDFirst;
-  fApplySPDDeadPbPb2011=source.fApplySPDDeadPbPb2011;
-  fRemoveTrackletOutliers=source.fRemoveTrackletOutliers;
 
   if(source.GetTrackCuts()) {delete fTrackCuts; fTrackCuts=new AliESDtrackCuts(*(source.GetTrackCuts()));}
   if(source.fPtBinLimits) SetPtBins(source.fnPtBinLimits,source.fPtBinLimits);
@@ -397,17 +391,6 @@ Bool_t AliRDHFCuts::IsEventSelected(AliVEvent *event) {
     }
   }
 
-  if(fRemoveTrackletOutliers){
-    Double_t v0cent=GetCentrality((AliAODEvent*)event,kCentV0M);
-    Double_t ntracklets=((AliAODEvent*)event)->GetTracklets()->GetNumberOfTracklets();
-    Double_t cutval=60.-0.08*ntracklets+1./50000.*ntracklets*ntracklets;
-    if(v0cent<cutval){
-      if(accept) fWhyRejection=2;      
-      fEvRejectionBits+=1<<kOutsideCentrality;
-      accept=kFALSE;
-    }
-  }
-
   return accept;
 }
 //---------------------------------------------------------------------------
@@ -467,94 +450,6 @@ Bool_t AliRDHFCuts::IsDaughterSelected(AliAODTrack *track,const AliESDVertex *pr
     // we need either to have here the AOD Event, 
     // or to have the pileup vertex object
   }
-
-  if(fApplySPDDeadPbPb2011){
-    Bool_t deadSPDLay1PbPb2011[20][4]={
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kFALSE,kFALSE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kFALSE,kFALSE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kFALSE,kFALSE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kFALSE,kFALSE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kFALSE,kFALSE,kFALSE,kFALSE},
-      {kFALSE,kFALSE,kTRUE,kTRUE},
-      {kFALSE,kFALSE,kFALSE,kFALSE},
-      {kFALSE,kFALSE,kFALSE,kFALSE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kFALSE,kFALSE},
-      {kFALSE,kFALSE,kFALSE,kFALSE},
-      {kFALSE,kFALSE,kFALSE,kFALSE}
-    };
-    Bool_t deadSPDLay2PbPb2011[40][4]={
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kFALSE,kFALSE,kFALSE,kFALSE},
-      {kFALSE,kFALSE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kFALSE,kFALSE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kFALSE,kFALSE,kFALSE,kFALSE},
-      {kFALSE,kFALSE,kFALSE,kFALSE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kFALSE,kFALSE,kFALSE,kFALSE},
-      {kFALSE,kFALSE,kFALSE,kFALSE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kFALSE,kFALSE,kFALSE,kFALSE},
-      {kFALSE,kFALSE,kFALSE,kFALSE},
-      {kFALSE,kFALSE,kFALSE,kFALSE},
-      {kFALSE,kFALSE,kFALSE,kFALSE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kTRUE,kTRUE,kFALSE,kFALSE},
-      {kTRUE,kTRUE,kTRUE,kTRUE},
-      {kFALSE,kFALSE,kFALSE,kFALSE},
-      {kFALSE,kFALSE,kFALSE,kFALSE},
-      {kFALSE,kFALSE,kFALSE,kFALSE},
-      {kFALSE,kFALSE,kFALSE,kFALSE}     
-    };
-    Double_t xyz1[3],xyz2[3];
-    esdTrack.GetXYZAt(3.9,0.,xyz1);
-    esdTrack.GetXYZAt(7.6,0.,xyz2);
-    Double_t phi1=TMath::ATan2(xyz1[1],xyz1[0]);
-    if(phi1<0) phi1+=2*TMath::Pi();
-    Int_t lad1=phi1/(2.*TMath::Pi()/20.);
-    Double_t phi2=TMath::ATan2(xyz2[1],xyz2[0]);
-    if(phi2<0) phi2+=2*TMath::Pi();
-    Int_t lad2=phi2/(2.*TMath::Pi()/40.);
-    Int_t mod1=(xyz1[2]+14)/7.;
-    Int_t mod2=(xyz2[2]+14)/7.;
-    Bool_t lay1ok=kFALSE;
-    if(mod1>=0 && mod1<4 && lad1<20){
-      lay1ok=deadSPDLay1PbPb2011[lad1][mod1];
-    }
-    Bool_t lay2ok=kFALSE;
-    if(mod2>=0 && mod2<4 && lad2<40){
-      lay2ok=deadSPDLay2PbPb2011[lad2][mod2];
-    }
-    if(!lay1ok && !lay2ok) retval=kFALSE;
-  }
-
   return retval; 
 }
 //---------------------------------------------------------------------------
index 123932d..d636c02 100644 (file)
@@ -100,9 +100,8 @@ class AliRDHFCuts : public AliAnalysisCuts
     fTriggerMask=(AliVEvent::kEMCEJE|AliVEvent::kEMCEGA);
     fUseOnlyOneTrigger=kTRUE;
   }
-  void SetRemoveTrackletOutliers(Bool_t opt) {fRemoveTrackletOutliers=opt;}
+
   void SetTriggerClass(TString trclass) {fTriggerClass=trclass;} 
-  void ApplySPDDeadPbPb2011(){fApplySPDDeadPbPb2011=kTRUE;}
   void SetVarsForOpt(Int_t nVars,Bool_t *forOpt);
   void SetGlobalIndex(){fGlobalIndex=fnVars*fnPtBins;}
   void SetGlobalIndex(Int_t nVars,Int_t nptBins){fnVars=nVars; fnPtBins=nptBins; SetGlobalIndex();}
@@ -294,10 +293,8 @@ class AliRDHFCuts : public AliAnalysisCuts
   Bool_t  fKeepSignalMC; // IsSelected returns always kTRUE for MC signal
   Bool_t fIsCandTrackSPDFirst; // flag to select the track kFirst criteria for pt < ptlimit
   Double_t fMaxPtCandTrackSPDFirst; // maximum pt of the candidate for which to check if the daughters fulfill kFirst criteria
-  Bool_t fApplySPDDeadPbPb2011;  // flag to apply SPD dead module map of PbPb2011
-  Bool_t fRemoveTrackletOutliers; // flag to apply cut on tracklets vs. centrality for 2011 data
 
-  ClassDef(AliRDHFCuts,23);  // base class for cuts on AOD reconstructed heavy-flavour decays
+  ClassDef(AliRDHFCuts,22);  // base class for cuts on AOD reconstructed heavy-flavour decays
 };
 
 #endif