Fixed warnings (Markus)

diff --git a/PWG3/hfe/AliHFEcuts.cxx b/PWG3/hfe/AliHFEcuts.cxx
index 6561c76a0566b152486111dbc4a83cad0b49d5b6..5dfa40a66e620a059f4c9fccd982318840c52d55 100644 (file)
--- a/PWG3/hfe/AliHFEcuts.cxx
+++ b/PWG3/hfe/AliHFEcuts.cxx
@@ -53,8 +53,6 @@ AliHFEcuts::AliHFEcuts():
   fMaxChi2clusterTPC(0.),
   fMinClusterRatioTPC(0.),
   fSigmaToVtx(0.),
-  fMaxImpactParamR(0.),
-  fMaxImpactParamZ(0.),
   fHistQA(0x0),
   fCutList(0x0)
 {
@@ -78,8 +76,6 @@ AliHFEcuts::AliHFEcuts(const AliHFEcuts &c):
   fMaxChi2clusterTPC(c.fMaxChi2clusterTPC),
   fMinClusterRatioTPC(c.fMinClusterRatioTPC),
   fSigmaToVtx(c.fSigmaToVtx),
-  fMaxImpactParamR(c.fMaxImpactParamR),
-  fMaxImpactParamZ(c.fMaxImpactParamZ),
   fHistQA(0x0),
   fCutList(0x0)
 {
@@ -270,10 +266,10 @@ void AliHFEcuts::SetHFElectronCuts(){
   if(IsRequireITSpixel()){
     hfecuts->SetRequireITSpixel(AliHFEextraCuts::ITSPixel_t(fCutITSPixel));
   }
-  if(IsRequireMaxImpactParam()){
-    hfecuts->SetMaxImpactParamR(fMaxImpactParamR);
-    hfecuts->SetMaxImpactParamZ(fMaxImpactParamZ);
-  }
+/*  if(IsRequireDCAToVertex()){
+    hfecuts->SetMaxImpactParamR(fDCAtoVtx[0]);
+    hfecuts->SetMaxImpactParamZ(fDCAtoVtx[1]);
+  }*/
   if(fMinTrackletsTRD) hfecuts->SetMinTrackletsTRD(fMinTrackletsTRD);
   if(fMinClusterRatioTPC > 0.) hfecuts->SetClusterRatioTPC(fMinClusterRatioTPC);
   if(IsInDebugMode()) hfecuts->SetQAOn(fHistQA);

diff --git a/PWG3/hfe/AliHFEcuts.h b/PWG3/hfe/AliHFEcuts.h
index f49ba357ed94870b3603308ad63a10bc36754d73..b0bce923a8a308992a48e1a697c172aed8868f63 100644 (file)
--- a/PWG3/hfe/AliHFEcuts.h
+++ b/PWG3/hfe/AliHFEcuts.h
@@ -33,24 +33,24 @@ class TList;
 class AliHFEcuts : public TObject{
   enum{
     kDebugMode = BIT(14)
-      };
+  };
   typedef enum{
     kPrimary = 0,
-      kProductionVertex = 1,
-      kSigmaToVertex = 2,
-      kDCAToVertex = 3,
-      kITSPixel = 4,
-      kMaxImpactParam = 5
-      } Require_t;
+    kProductionVertex = 1,
+    kSigmaToVertex = 2,
+    kDCAToVertex = 3,
+    kITSPixel = 4,
+    kMaxImpactParam = 5
+  } Require_t;
  public:
 
   typedef enum{
     kStepMCGenerated = 0,
-      kStepMCInAcceptance = 1,
-      kStepRecKine = 2,
-      kStepRecPrim = 3,
-      kStepHFEcuts = 4
-      } CutStep_t;
+    kStepMCInAcceptance = 1,
+    kStepRecKine = 2,
+    kStepRecPrim = 3,
+    kStepHFEcuts = 4
+  } CutStep_t;
 
   static const Int_t kNcutSteps;
 
@@ -95,8 +95,7 @@ class AliHFEcuts : public TObject{
   void SetRequireDCAToVertex() { SETBIT(fRequirements, kDCAToVertex); };
   void SetRequireIsPrimary() { SETBIT(fRequirements, kPrimary); };
   void SetRequireITSPixel() { SETBIT(fRequirements, kITSPixel); }
-  void SetRequireMaxImpactParam() { SETBIT(fRequirements, kMaxImpactParam); };
-  void SetRequireProdVetrex() { SETBIT(fRequirements, kProductionVertex); };
+  void SetRequireProdVertex() { SETBIT(fRequirements, kProductionVertex); };
   void SetRequireSigmaToVertex() { SETBIT(fRequirements, kSigmaToVertex); };
     
  private:
@@ -116,8 +115,6 @@ class AliHFEcuts : public TObject{
   Double_t fMaxChi2clusterTPC; // Max Chi2 per TPC cluster
   Double_t fMinClusterRatioTPC;        // Min. Ratio findable / found TPC clusters
   Double_t fSigmaToVtx;        // Sigma To Vertex
-  Double_t fMaxImpactParamR;   // Max. Impact Parameter in Radial Direction
-  Double_t fMaxImpactParamZ;   // Max. Impact Parameter in Z Direction
     
   TList *fHistQA;              //! QA Histograms
   TObjArray *fCutList; //! List of cut objects(Correction Framework Manager)
@@ -128,7 +125,7 @@ class AliHFEcuts : public TObject{
     //__________________________________________________________________
     void AliHFEcuts::SetProductionVertex(Double_t xmin, Double_t xmax, Double_t ymin, Double_t ymax){
       // Set the production vertex constraint
-      SetRequireProdVetrex();
+      SetRequireProdVertex();
       fProdVtx[0] = xmin;
       fProdVtx[1] = xmax;
       fProdVtx[2] = ymin;
@@ -143,9 +140,9 @@ void AliHFEcuts::SetSigmaToVertex(Double_t sig){
 
 //__________________________________________________________________
 void AliHFEcuts::SetMaxImpactParam(Double_t radial, Double_t z){
-  SetRequireMaxImpactParam();
-  fMaxImpactParamR = radial;
-  fMaxImpactParamZ = z;
+  SetRequireDCAToVertex();
+  fDCAtoVtx[0] = radial;
+  fDCAtoVtx[1] = z;
 }
 
 //__________________________________________________________________
@@ -159,7 +156,7 @@ void AliHFEcuts::CreateStandardCuts(){
   //
   // Standard Cuts defined by the HFE Group
   //
-  SetRequireProdVetrex();
+  SetRequireProdVertex();
   fProdVtx[0] = -1;
   fProdVtx[1] = 1;
   fProdVtx[2] = -1;
@@ -174,9 +171,5 @@ void AliHFEcuts::CreateStandardCuts(){
   fMinClusterRatioTPC = 0.6;
   fPtRange[0] = 0.1;
   fPtRange[1] = 20.;
-  fSigmaToVtx = 4.;
-  SetRequireMaxImpactParam();
-  fMaxImpactParamR = 3.;
-  fMaxImpactParamZ = 12.;
 }
 #endif

diff --git a/PWG3/hfe/AliHFEpidTOF.cxx b/PWG3/hfe/AliHFEpidTOF.cxx
index ab4b5ccd1b1536711a47cb8a5393bae99656091a..a27579c7a10813cc476ecb0be0a521a5ebe9ac03 100644 (file)
--- a/PWG3/hfe/AliHFEpidTOF.cxx
+++ b/PWG3/hfe/AliHFEpidTOF.cxx
@@ -106,52 +106,53 @@ Int_t AliHFEpidTOF::IsSelected(AliVParticle *_track)
   //
 
   AliESDtrack *track = dynamic_cast<AliESDtrack*>(_track);
-  
-  if(!AliESDtrack::kTOFout) return AliPID::kUnknown;
+  Long_t status = 0;
+  status = track->GetStatus(); 
+
+  if(!(status & AliESDtrack::kTOFout)) return AliPID::kUnknown;
   
   (dynamic_cast<TH1F *>(fQAList->At(kHistTOFpidFlags)))->Fill(0.);
 
-  Double_t ItrackL = track->GetIntegratedLength();
-  Double_t TOFsignal = track->GetTOFsignal();
-  Double_t TOF = TOFsignal;
-
-  if(ItrackL > 0)
+  Double_t tItrackL = track->GetIntegratedLength();
+  Double_t tTOFsignal = track->GetTOFsignal();
+  
+  if(tItrackL > 0)
     (dynamic_cast<TH1F *>(fQAList->At(kHistTOFpidFlags)))->Fill(1.);
 
-  if(TOFsignal > 0)
+  if(tTOFsignal > 0)
     (dynamic_cast<TH1F *>(fQAList->At(kHistTOFpidFlags)))->Fill(2.);
   
 
-  if(ItrackL <=0 || TOFsignal <=0) return AliPID::kUnknown;
+  if(tItrackL <=0 || tTOFsignal <=0) return AliPID::kUnknown;
 
   (dynamic_cast<TH1F *>(fQAList->At(kHistTOFpidFlags)))->Fill(3.);
-  (dynamic_cast<TH1F *>(fQAList->At(kHistTOFsignal)))->Fill(TOFsignal/1000.);
-  (dynamic_cast<TH1F *>(fQAList->At(kHistTOFlength)))->Fill(ItrackL);
+  (dynamic_cast<TH1F *>(fQAList->At(kHistTOFsignal)))->Fill(tTOFsignal/1000.);
+  (dynamic_cast<TH1F *>(fQAList->At(kHistTOFlength)))->Fill(tItrackL);
   // get the TOF pid probabilities
-  Double_t ESDpid[5] = {0., 0., 0., 0., 0.};
-  Float_t TOFpid_sum = 0.;
+  Double_t tESDpid[5] = {0., 0., 0., 0., 0.};
+  Float_t tTOFpid_sum = 0.;
   // find the largest PID probability
-  track->GetTOFpid(ESDpid);
-  Double_t MAXpid = 0.;
-  Int_t MAXindex = -1;
+  track->GetTOFpid(tESDpid);
+  Double_t tMAXpid = 0.;
+  Int_t tMAXindex = -1;
   for(Int_t i=0; i<5; ++i){
-    TOFpid_sum += ESDpid[i];
-    if(ESDpid[i] > MAXpid){
-      MAXpid = ESDpid[i];
-      MAXindex = i;
+    tTOFpid_sum += tESDpid[i];
+    if(tESDpid[i] > tMAXpid){
+      tMAXpid = tESDpid[i];
+      tMAXindex = i;
     }
   }
   
-  Double_t P = track->GetOuterParam()->P();
-  Double_t beta = (ItrackL/100.)/(TMath::C()*(TOFsignal/1e12));
+  Double_t p = track->GetOuterParam()->P();
+  Double_t beta = (tItrackL/100.)/(TMath::C()*(tTOFsignal/1e12));
   
-  if(TMath::Abs(TOFpid_sum - 1) > 0.01) return AliPID::kUnknown;
+  if(TMath::Abs(tTOFpid_sum - 1) > 0.01) return AliPID::kUnknown;
   else{
     // should be the same as AliPID flags
     
-    (dynamic_cast<TH2F *>(fQAList->At(kHistTOFpid_0+MAXindex)))->Fill(beta, P);
-    (dynamic_cast<TH2F *>(fQAList->At(kHistTOFpid_beta_v_P)))->Fill(beta, P);
-    return MAXindex;
+    (dynamic_cast<TH2F *>(fQAList->At(kHistTOFpid_0+tMAXindex)))->Fill(beta, p);
+    (dynamic_cast<TH2F *>(fQAList->At(kHistTOFpid_beta_v_P)))->Fill(beta, p);
+    return tMAXindex;
   }
 }