ESD dependence in copying the pid information removed. (A. Mastroserio)

diff --git a/ANALYSIS/AliAnalysisTaskESDfilter.cxx b/ANALYSIS/AliAnalysisTaskESDfilter.cxx
index 0556bbdf8c4bfe8cec96cd622e17578e99160d5a..132445432c55806bbfee2a8669316d159972a4b8 100644 (file)
--- a/ANALYSIS/AliAnalysisTaskESDfilter.cxx
+++ b/ANALYSIS/AliAnalysisTaskESDfilter.cxx
@@ -942,7 +942,7 @@ void AliAnalysisTaskESDfilter::SetAODPID(AliESDtrack *esdtrack, AliAODTrack *aod
 
   if(esdtrack->Pt()>fHighPthreshold) {
     detpid = new AliAODPid();
-    detpid->SetDetectorRawSignals(esdtrack,timezero);
+    SetDetectorRawSignals(detpid,esdtrack,timezero);
     aodtrack->SetDetPID(detpid);
   } else {
     if(fPtshape){
@@ -950,7 +950,7 @@ void AliAnalysisTaskESDfilter::SetAODPID(AliESDtrack *esdtrack, AliAODTrack *aod
        Double_t y = fPtshape->Eval(esdtrack->Pt())/fPtshape->Eval(fHighPthreshold);
        if(gRandom->Rndm(0)<1./y){
          detpid = new AliAODPid();
-         detpid->SetDetectorRawSignals(esdtrack,timezero);
+         SetDetectorRawSignals(detpid,esdtrack,timezero);
          aodtrack->SetDetPID(detpid);
        }//end rndm
       }//end if p < pmin
@@ -958,7 +958,35 @@ void AliAnalysisTaskESDfilter::SetAODPID(AliESDtrack *esdtrack, AliAODTrack *aod
   }// end else
 }
 
+void AliAnalysisTaskESDfilter::SetDetectorRawSignals(AliAODPid *aodpid, AliESDtrack *track, Double_t timezero)
+{
+//
+//assignment of the detector signals (AliXXXesdPID inspired)
+//
+ if(!track){
+ AliInfo("no ESD track found. .....exiting");
+ return;
+ }
+
+ aodpid->SetITSsignal(track->GetITSsignal());
+ aodpid->SetTPCsignal(track->GetTPCsignal());
+ //n TRD planes = 6
+
+ Int_t nslices = track->GetNumberOfTRDslices()*6;
+ Double_t *trdslices = new Double_t[nslices];
+ for(Int_t iSl =0; iSl < track->GetNumberOfTRDslices(); iSl++) {
+     for(Int_t iPl =0; iPl<6; iPl++) trdslices[iPl*track->GetNumberOfTRDslices()+iSl] = track->GetTRDslice(iPl,iSl);
+    }
 
+
+ aodpid->SetTRDsignal(track->GetNumberOfTRDslices()*6,trdslices);
+ Double_t times[AliAODPid::kSPECIES]; track->GetIntegratedTimes(times);
+ aodpid->SetIntegratedTimes(times);
+
+ aodpid->SetTOFsignal(track->GetTOFsignal()-timezero); // to be fixed
+ aodpid->SetHMPIDsignal(track->GetHMPIDsignal());
+
+}
 void AliAnalysisTaskESDfilter::Terminate(Option_t */*option*/)
 {
 // Terminate analysis

diff --git a/ANALYSIS/AliAnalysisTaskESDfilter.h b/ANALYSIS/AliAnalysisTaskESDfilter.h
index 7d419883dfbed3f8a21c8f5fb905ad4fdcc5ceec..a55f0edfe629440d072967cef8461b084f6814fe 100644 (file)
--- a/ANALYSIS/AliAnalysisTaskESDfilter.h
+++ b/ANALYSIS/AliAnalysisTaskESDfilter.h
@@ -37,7 +37,7 @@ class AliAnalysisTaskESDfilter : public AliAnalysisTaskSE
     virtual void SetPshape     (TF1 *func)             {fPtshape         =    func;}
 
     virtual void SetAODPID(AliESDtrack *esdtrack, AliAODTrack *aodtrack, AliAODPid *detpid, Double_t timezero);
-
+    void SetDetectorRawSignals(AliAODPid *aodpid, AliESDtrack *track, Double_t timezero);
 
  private:
     AliAnalysisTaskESDfilter(const AliAnalysisTaskESDfilter&);

diff --git a/STEER/AliAODPid.cxx b/STEER/AliAODPid.cxx
index bf1375a5e516ec6eaf5ac1cfd5960df673d1b1b2..f3e817c0c941d8a3949113592767beca91ca0ed4 100644 (file)
--- a/STEER/AliAODPid.cxx
+++ b/STEER/AliAODPid.cxx
@@ -38,6 +38,7 @@ AliAODPid::AliAODPid():
 {
   // default constructor
     for(Int_t i=0; i<kSPECIES; i++) fIntTime[i]=0; 
+  
 }
 
 //______________________________________________________________________________
@@ -81,31 +82,14 @@ AliAODPid& AliAODPid::operator=(const AliAODPid& pid)
   return *this;
 }
 //_______________________________________________________________________________
-void AliAODPid::SetDetectorRawSignals(AliESDtrack *track, Double_t timezero)
+void AliAODPid::GetIntegratedTimes(Double_t timeint[kSPECIES])
 {
-//
-//assignment of the detector signals (AliXXXesdPID inspired)
-//
- if(!track){
- AliInfo("no ESD track found. .....exiting");
- return;
- }
-
- fITSsignal=track->GetITSsignal();
- fTPCsignal=track->GetTPCsignal();
- fTRDnSlices=track->GetNumberOfTRDslices()*kTRDnPlanes;
- track->GetIntegratedTimes(fIntTime);
- fTOFesdsignal=track->GetTOFsignal()-timezero; //TO BE FIXED 
- fHMPIDsignal=track->GetHMPIDsignal();
-
- fTRDslices=new Double32_t[fTRDnSlices];  
- for(Int_t iSl =0; iSl < track->GetNumberOfTRDslices(); iSl++) {
-     for(Int_t iPl =0; iPl<kTRDnPlanes; iPl++) fTRDslices[iPl*track->GetNumberOfTRDslices()+iSl] = track->GetTRDslice(iPl,iSl);
-    } 
+ // Returns the array with integrated times for each particle hypothesis
+for(Int_t i=0; i<kSPECIES; i++) timeint[i]=fIntTime[i];
 }
-//________________________________________________________________________________
-void AliAODPid::GetIntegratedTimes(Double_t timeint[5])
+//_______________________________________________________________________________
+void AliAODPid::SetIntegratedTimes(Double_t timeint[kSPECIES])
 {
  // Returns the array with integrated times for each particle hypothesis
-for(Int_t i=0; i<kSPECIES; i++) timeint[i]=fIntTime[i];
+for(Int_t i=0; i<kSPECIES; i++) fIntTime[i]=timeint[i];
 }

diff --git a/STEER/AliAODPid.h b/STEER/AliAODPid.h
index ac420feb916df0bd8a24ad1c3e3b14dce27b46ce..9da0d34d8b801c53ba839be2e019213fb8d844bf 100644 (file)
--- a/STEER/AliAODPid.h
+++ b/STEER/AliAODPid.h
@@ -11,7 +11,6 @@
 //-------------------------------------------------------------------------
 
 #include <TObject.h>
-class AliESDtrack;
 
 class AliAODPid : public TObject {
 
@@ -23,7 +22,14 @@ class AliAODPid : public TObject {
   
   enum{kSPECIES=5, kTRDnPlanes=6};
 
-  void SetDetectorRawSignals(AliESDtrack *track, Double_t timezero); 
+ //setters
+  void      SetITSsignal(Double_t its)                         {fITSsignal=its;}
+  void      SetTPCsignal(Double_t tpc)                         {fTPCsignal=tpc;}
+  void      SetTRDsignal(Int_t nslices, Double_t* trdslices)   {fTRDnSlices = nslices; fTRDslices=trdslices;}
+  void      SetTOFsignal(Double_t tof)                         {fTOFesdsignal=tof;}
+  void      SetIntegratedTimes(Double_t timeint[5]);
+  void      SetHMPIDsignal(Double_t hmpid)                     {fHMPIDsignal=hmpid;}
+
 
   Double_t  GetITSsignal()       {return  fITSsignal;}
   Double_t  GetTPCsignal()       {return  fTPCsignal;}