correct dEdx info propagation down the analysis chain

diff --git a/PWG1/TRD/AliTRDcheckPID.cxx b/PWG1/TRD/AliTRDcheckPID.cxx
index 99a0fd3a087d72f2bed0fcb4ba3919e1562efb07..952e9f1985224f4fe63be969f371f733e8ab3f0e 100644 (file)
--- a/PWG1/TRD/AliTRDcheckPID.cxx
+++ b/PWG1/TRD/AliTRDcheckPID.cxx
@@ -273,13 +273,13 @@ TH1 *AliTRDcheckPID::PlotLQ(const AliTRDtrackV1 *track)
   //
 
   if(!fkESD){
-    AliWarning("No ESD info available.");
+    AliDebug(2, "No ESD info available.");
     return NULL;
   }
 
   if(track) fkTrack = track;
   if(!fkTrack){
-    AliWarning("No Track defined.");
+    AliDebug(2, "No Track defined.");
     return NULL;
   }
 
@@ -338,13 +338,13 @@ TH1 *AliTRDcheckPID::PlotNN(const AliTRDtrackV1 *track)
   //
 
   if(!fkESD){
-    AliWarning("No ESD info available.");
+    AliDebug(2, "No ESD info available.");
     return NULL;
   }
 
   if(track) fkTrack = track;
   if(!fkTrack){
-    AliWarning("No Track defined.");
+    AliDebug(2, "No Track defined.");
     return NULL;
   }
   
@@ -403,13 +403,13 @@ TH1 *AliTRDcheckPID::PlotESD(const AliTRDtrackV1 *track)
   //
 
   if(!fkESD){
-    AliWarning("No ESD info available.");
+    AliDebug(2, "No ESD info available.");
     return NULL;
   }
 
   if(track) fkTrack = track;
   if(!fkTrack){
-    AliWarning("No Track defined.");
+    AliDebug(2, "No Track defined.");
     return NULL;
   }
   
@@ -467,7 +467,7 @@ TH1 *AliTRDcheckPID::PlotdEdx(const AliTRDtrackV1 *track)
 
   if(track) fkTrack = track;
   if(!fkTrack){
-    AliWarning("No Track defined.");
+    AliDebug(2, "No Track defined.");
     return NULL;
   }
   
@@ -523,7 +523,7 @@ TH1 *AliTRDcheckPID::PlotdEdxSlice(const AliTRDtrackV1 *track)
 
   if(track) fkTrack = track;
   if(!fkTrack){
-    AliWarning("No Track defined.");
+    AliDebug(2, "No Track defined.");
     return NULL;
   }
   
@@ -577,7 +577,7 @@ TH1 *AliTRDcheckPID::PlotPH(const AliTRDtrackV1 *track)
 
   if(track) fkTrack = track;
   if(!fkTrack){
-    AliWarning("No Track defined.");
+    AliDebug(2, "No Track defined.");
     return NULL;
   }
   
@@ -633,7 +633,7 @@ TH1 *AliTRDcheckPID::PlotNClus(const AliTRDtrackV1 *track)
 
   if(track) fkTrack = track;
   if(!fkTrack){
-    AliWarning("No Track defined.");
+    AliDebug(2, "No Track defined.");
     return NULL;
   }
   
@@ -681,7 +681,7 @@ TH1 *AliTRDcheckPID::PlotNTracklets(const AliTRDtrackV1 *track)
 
   if(track) fkTrack = track;
   if(!fkTrack){
-    AliWarning("No Track defined.");
+    AliDebug(2, "No Track defined.");
     return NULL;
   }
   
@@ -720,7 +720,7 @@ TH1 *AliTRDcheckPID::PlotMom(const AliTRDtrackV1 *track)
 
   if(track) fkTrack = track;
   if(!fkTrack){
-    AliWarning("No Track defined.");
+    AliDebug(2, "No Track defined.");
     return NULL;
   }
   
@@ -759,7 +759,7 @@ TH1 *AliTRDcheckPID::PlotMomBin(const AliTRDtrackV1 *track)
 
   if(track) fkTrack = track;
   if(!fkTrack){
-    AliWarning("No Track defined.");
+    AliDebug(2, "No Track defined.");
     return NULL;
   }
   

diff --git a/PWG1/TRD/AliTRDinfoGen.cxx b/PWG1/TRD/AliTRDinfoGen.cxx
index b5d1b7a9e36655334dfe803999f6de5f7381fe34..57fef5a0b513f78bf30b266e3248c907207915de 100644 (file)
--- a/PWG1/TRD/AliTRDinfoGen.cxx
+++ b/PWG1/TRD/AliTRDinfoGen.cxx
@@ -211,7 +211,7 @@ void AliTRDinfoGen::Exec(Option_t *){
     memset(trackMap, 0, sizeof(Bool_t) * nTracksMC);
   }
   
-  Double32_t *dedx(NULL); Int_t nSlices(0);
+  Double32_t dedx[100]; Int_t nSlices(0);
   Int_t nTRDout(0), nTRDin(0), nTPC(0), nclsTrklt;
   AliDebug(2, Form("Entry[%3d] Tracks: ESD[%d] MC[%d]\n", (Int_t)AliAnalysisManager::GetAnalysisManager()->GetCurrentEntry(), nTracksESD, nTracksMC));
   AliESDtrack *esdTrack = NULL;
@@ -286,15 +286,14 @@ void AliTRDinfoGen::Exec(Option_t *){
     Double_t p[AliPID::kSPECIES]; esdTrack->GetTRDpid(p);
     fTrackInfo->SetESDpid(p);
     fTrackInfo->SetESDpidQuality(esdTrack->GetTRDntrackletsPID());
-    if(!dedx){ 
-      nSlices = esdTrack->GetNumberOfTRDslices();
-      dedx=new Double32_t[nSlices];
-    }
+    if(!nSlices) nSlices = esdTrack->GetNumberOfTRDslices();
+    memset(dedx, 0, 100*sizeof(Double32_t));
     Int_t in(0);
     for(Int_t il=0; il<AliTRDgeometry::kNlayer; il++)
       for(Int_t is=0; is<nSlices; is++) 
         dedx[in++]=esdTrack->GetTRDslice(il, is);
     for(Int_t il=0; il<AliTRDgeometry::kNlayer; il++) dedx[in++]=esdTrack->GetTRDmomentum(il);
+    printf("n[%d] slices[%d]\n", in, nSlices);
     fTrackInfo->SetSlices(in, dedx);
     fTrackInfo->SetLabel(label);
     fTrackInfo->SetNumberOfClustersRefit(esdTrack->GetNcls(2));

diff --git a/PWG1/TRD/info/AliTRDtrackInfo.cxx b/PWG1/TRD/info/AliTRDtrackInfo.cxx
index c33a8dfb330fd26f6541d19c80b66c5fd4beb116..7f02b8ae4f1cd8001f3df1b2e66b6a13c9867bd6 100644 (file)
--- a/PWG1/TRD/info/AliTRDtrackInfo.cxx
+++ b/PWG1/TRD/info/AliTRDtrackInfo.cxx
@@ -45,8 +45,8 @@ ClassImp(AliTRDtrackInfo::AliESDinfo)
 AliTRDtrackInfo::AliTRDtrackInfo():
   TObject()
   ,fNClusters(0)
-  ,fTRDtrack(0x0)
-  ,fMC(0x0)
+  ,fTRDtrack(NULL)
+  ,fMC(NULL)
   ,fESD()
 {
   //
@@ -59,7 +59,7 @@ AliTRDtrackInfo::AliTRDtrackInfo():
 AliTRDtrackInfo::AliTRDtrackInfo(const AliTRDtrackInfo &trdInfo):
   TObject((const TObject&)trdInfo)  
   ,fNClusters(trdInfo.fNClusters)
-  ,fTRDtrack(0x0)
+  ,fTRDtrack(NULL)
   ,fMC(new AliMCinfo(*trdInfo.fMC))
   ,fESD(trdInfo.fESD)
 {
@@ -110,8 +110,8 @@ AliTRDtrackInfo::AliESDinfo::AliESDinfo()
   ,fTPCncls(0)
   ,fTRDpidQuality(0)
   ,fTRDnSlices(0)
-  ,fTRDslices(0x0)
-  ,fOP(0x0)
+  ,fTRDslices(NULL)
+  ,fOP(NULL)
 {
   //
   // Constructor
@@ -128,8 +128,8 @@ AliTRDtrackInfo::AliESDinfo::AliESDinfo(const AliESDinfo &esd)
   ,fTPCncls(esd.fTPCncls)
   ,fTRDpidQuality(esd.fTRDpidQuality)
   ,fTRDnSlices(esd.fTRDnSlices)
-  ,fTRDslices(0x0)
-  ,fOP(0x0)
+  ,fTRDslices(NULL)
+  ,fOP(NULL)
 {
   //
   // Constructor
@@ -166,7 +166,7 @@ AliTRDtrackInfo::AliMCinfo::~AliMCinfo()
   fNTrackRefs = 0;
   for(Int_t ien = 0; ien < 12; ien++){
     if(fTrackRefs[ien]) delete fTrackRefs[ien];
-    fTrackRefs[ien] = 0x0;
+    fTrackRefs[ien] = NULL;
   }
 }
 
@@ -179,10 +179,10 @@ AliTRDtrackInfo::AliESDinfo::~AliESDinfo()
 
   if(fTRDnSlices){
     delete [] fTRDslices;
-    fTRDslices = 0x0;
+    fTRDslices = NULL;
     fTRDnSlices = 0;
   }
-  if(fOP) delete fOP; fOP = 0x0;
+  if(fOP) delete fOP; fOP = NULL;
 }
 
 
@@ -231,7 +231,7 @@ AliTRDtrackInfo::AliMCinfo& AliTRDtrackInfo::AliMCinfo::operator=(const AliMCinf
     if((*jtr)){
       if(!(*itr)) (*itr) = new AliTrackReference(*(*jtr));
       else new(&(*itr)) AliTrackReference(*(*jtr));
-    } else (*itr) = 0x0;
+    } else (*itr) = NULL;
   }
   return *this;
 }
@@ -247,7 +247,7 @@ AliTRDtrackInfo::AliESDinfo& AliTRDtrackInfo::AliESDinfo::operator=(const AliESD
   fStatus      = esd.fStatus; 
   fTRDpidQuality = esd.fTRDpidQuality;
   fTRDnSlices  = esd.fTRDnSlices;
-  fTRDslices   = 0x0;
+  fTRDslices   = NULL;
 
   memcpy(fTRDr, esd.fTRDr, AliPID::kSPECIES*sizeof(Double32_t));
 
@@ -258,7 +258,7 @@ AliTRDtrackInfo::AliESDinfo& AliTRDtrackInfo::AliESDinfo::operator=(const AliESD
   if(esd.fOP){
     if(fOP) new(fOP) AliExternalTrackParam(esd.fOP);
     else fOP = new AliExternalTrackParam(esd.fOP);
-  } else fOP = 0x0;
+  } else fOP = NULL;
 
   return *this;
 }
@@ -271,8 +271,8 @@ void AliTRDtrackInfo::Delete(const Option_t *)
   //
 
   fNClusters  = 0;
-  if(fMC) delete fMC; fMC = 0x0;
-  if(fTRDtrack) delete fTRDtrack; fTRDtrack = 0x0;
+  if(fMC) delete fMC; fMC = NULL;
+  if(fTRDtrack) delete fTRDtrack; fTRDtrack = NULL;
 }
 
 //___________________________________________________
@@ -312,8 +312,8 @@ AliTrackReference* AliTRDtrackInfo::GetTrackRef(Int_t idx) const
 //
 // Returns a track reference
 //
-  if(!fMC) return 0x0;
-  return (idx>=0 && idx < 12) ? fMC->fTrackRefs[idx] : 0x0;
+  if(!fMC) return NULL;
+  return (idx>=0 && idx < 12) ? fMC->fTrackRefs[idx] : NULL;
 }
 
 //___________________________________________________
@@ -322,14 +322,14 @@ AliTrackReference* AliTRDtrackInfo::GetTrackRef(AliTRDseedV1* const tracklet) co
 //
 // Returns a track reference
 //
-  if(!fMC) return 0x0;
+  if(!fMC) return NULL;
   Double_t cw = AliTRDgeometry::CamHght() + AliTRDgeometry::CdrHght();
   AliTrackReference * const* jtr = &(fMC->fTrackRefs[0]);
   for(Int_t itr = 0; itr < fMC->fNTrackRefs; itr++, ++jtr){
     if(!(*jtr)) break;   
     if(TMath::Abs(tracklet->GetX0() - (*jtr)->LocalX()) < cw) return (*jtr);
   }
-  return 0x0;
+  return NULL;
 }
 
 //___________________________________________________
@@ -342,7 +342,7 @@ Int_t AliTRDtrackInfo::GetNumberOfClusters() const
   Int_t n = 0;
   if(!fTRDtrack) return 0;
   if(fTRDtrack->GetNumberOfTracklets() == 0) return n;
-  AliTRDseedV1 *tracklet = 0x0;
+  AliTRDseedV1 *tracklet = NULL;
   for(Int_t ip=0; ip<6; ip++){
     if(!(tracklet = const_cast<AliTRDseedV1 *>(fTRDtrack->GetTracklet(ip)))) continue;
     n+=tracklet->GetN();
@@ -370,7 +370,7 @@ Int_t AliTRDtrackInfo::GetNTracklets() const
   // Return the number of tracklets
   //
 
-  if(!fTRDtrack) return 0x0;
+  if(!fTRDtrack) return NULL;
   return fTRDtrack->GetNumberOfTracklets();
 }
 
@@ -380,16 +380,15 @@ void AliTRDtrackInfo::SetSlices(Int_t n, Double32_t *s)
   //
   // Set the slices
   //
-
   if(fESD.fTRDnSlices != n){
     fESD.fTRDnSlices = 0;
     delete [] fESD.fTRDslices;
-    fESD.fTRDslices = 0x0;
+    fESD.fTRDslices = NULL;
   }
 
   if(!fESD.fTRDnSlices){
     fESD.fTRDnSlices = n;
-    fESD.fTRDslices = new Double32_t[n];
+    fESD.fTRDslices = new Double32_t[fESD.fTRDnSlices];
   }
 
   memcpy(fESD.fTRDslices, s, n*sizeof(Double32_t));
@@ -409,7 +408,7 @@ Bool_t AliTRDtrackInfo::AliMCinfo::GetDirections(Float_t &x0, Float_t &y0, Float
   status = 0;
   Double_t cw = AliTRDgeometry::CamHght() + AliTRDgeometry::CdrHght();
   Int_t nFound = 0;
-  AliTrackReference *tr[2] = {0x0, 0x0};
+  AliTrackReference *tr[2] = {NULL, NULL};
   AliTrackReference * const* jtr = &fTrackRefs[0];
   for(Int_t itr = 0; itr < fNTrackRefs; itr++, ++jtr){
     if(!(*jtr)) break;
@@ -420,7 +419,7 @@ Bool_t AliTRDtrackInfo::AliMCinfo::GetDirections(Float_t &x0, Float_t &y0, Float
     if(nFound == 2) break;
   } 
   if(nFound < 2){ 
-    AliWarningGeneral("AliTRDtrackInfo::AliMCinfo::GetDirections()", Form("Missing track ref x0[%6.3f] nref[%d]\n", x0, nFound));
+    AliWarningGeneral("AliTRDtrackInfo::AliMCinfo::GetDirections()", Form("Missing track ref x0[%6.3f] nref[%d]", x0, nFound));
     if(!nFound) SETBIT(status, 0);
     else SETBIT(status, 1);
     return kFALSE;
@@ -483,7 +482,7 @@ void AliTRDtrackInfo::AliMCinfo::PropagateKalman(Double_t dx[kNTrackRefs], Doubl
   tt.SetMass(pdg->Mass());
   
   Double_t x0 = tr->LocalX();
-  const Double_t *cc = 0x0;
+  const Double_t *cc = NULL;
   for(Int_t itr=1, ip=0; itr<fNTrackRefs; itr++){
     tr = fTrackRefs[itr];
     if(!AliTRDtrackerV1::PropagateToX(tt, tr->LocalX(), step)) continue;