fix for PIDCombined

diff --git a/PWG/Tools/AliHelperPID.cxx b/PWG/Tools/AliHelperPID.cxx
index 1f195b0bc57652910e64bbc6ba5d8ae68399a069..3409cce79846e3138c43e3567b0f05cce8f4644f 100644 (file)
--- a/PWG/Tools/AliHelperPID.cxx
+++ b/PWG/Tools/AliHelperPID.cxx
@@ -142,11 +142,6 @@ AliHelperPID::AliHelperPID() : TNamed("HelperPID", "PID object"),fisMC(0), fPIDT
     fHistoPID->GetYaxis()->SetTitle(Form("%s signal",kDetectorName[idet]));
     fOutputList->Add(fHistoPID);
   }
-
-  // ------- setup PIDCombined
-  fPIDCombined=new AliPIDCombined;
-  fPIDCombined->SetDefaultTPCPriors();
-  fPIDCombined->SetDetectorMask(AliPIDResponse::kDetTPC+AliPIDResponse::kDetTOF);  
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
@@ -181,7 +176,12 @@ Int_t AliHelperPID::GetParticleSpecies(AliVTrack * trk, Bool_t FIllQAHistos){
   if(fPIDType==kBayes){//use bayesianPID
     
     if(!fPIDCombined) {
-      //AliFatal("PIDCombined object has to be set in the steering macro");
+      // ------- setup PIDCombined
+      fPIDCombined=new AliPIDCombined;
+      fPIDCombined->SetDefaultTPCPriors();
+      fPIDCombined->SetDetectorMask(AliPIDResponse::kDetTPC+AliPIDResponse::kDetTOF);  
+    }
+    if(!fPIDCombined) {
       AliFatal("PIDCombined object not found");
     }
     

diff --git a/PWG/Tools/AliHelperPID.h b/PWG/Tools/AliHelperPID.h
index 5d1bb63f0840ccbc08afe9b9ba91550c57a1e819..fdc32bd8b2b03d20c650b9430dfbb1a4ab63b2f5 100644 (file)
--- a/PWG/Tools/AliHelperPID.h
+++ b/PWG/Tools/AliHelperPID.h
@@ -85,7 +85,7 @@ class AliHelperPID : public TNamed
   void SetfPtTOFPID(Double_t pttof){fPtTOFPID=pttof;}
   //set PID Combined
   //void SetPIDCombined(AliPIDCombined *obj){fPIDCombined=obj;}
-  void SetPIDCombined(AliPIDCombined *obj){Printf("void SetPIDCombined(AliPIDCombined *obj) not implemented");}  //FIXME Left for backward-compatibility, not the PIDCombined onject is created in the constructor as done in /ANALYSIS/AliAnalysisTaskPIDCombined.cxx (Jul 15th 2014)
+  void SetPIDCombined(AliPIDCombined *obj){Printf("void AliHelperPID::SetPIDCombined(AliPIDCombined *obj) not implemented");}  //FIXME Left for backward compatibility, not the PIDCombined onject is created in the constructor as done in /ANALYSIS/AliAnalysisTaskPIDCombined.cxx (Jul 15th 2014)
   AliPIDCombined *GetPIDCombined(){return fPIDCombined;}
   //set cut on beyesian probability
   void SetBayesCut(Double_t cut){fBayesCut=cut;}
@@ -121,8 +121,8 @@ class AliHelperPID : public TNamed
   PIDType_t fPIDType; // PID type
   Double_t fNSigmaPID; // number of sigma for PID cut
   Double_t fBayesCut; // Cut on Bayesian probability
-  AliPIDResponse   *fPIDResponse;     // ! PID response object
-  AliPIDCombined   *fPIDCombined;     // ! PIDCombined
+  AliPIDResponse   *fPIDResponse;     //! PID response object
+  AliPIDCombined   *fPIDCombined;     //! PIDCombined
   TList     *fOutputList;  // List Histo's
   Double_t fnsigmas[kNSpecies][kNSigmaPIDType+1]; //nsigma values
   Bool_t fHasDoubleCounting[kNSpecies];//array with compatible identities