consolidate zero-length arrays (aka struct hack)

[u/mrichter/AliRoot.git] / PWGPP / EvTrkSelection / AliAnalysisTrackingUncertainties.cxx

diff --git a/PWGPP/EvTrkSelection/AliAnalysisTrackingUncertainties.cxx b/PWGPP/EvTrkSelection/AliAnalysisTrackingUncertainties.cxx
index cc6fd2d3856f93a93579085c82519f610467737c..8f3017207b94781ef6336c85e37df974d2b6b309 100644 (file)
--- a/PWGPP/EvTrkSelection/AliAnalysisTrackingUncertainties.cxx
+++ b/PWGPP/EvTrkSelection/AliAnalysisTrackingUncertainties.cxx
@@ -350,6 +350,14 @@ void  AliAnalysisTrackingUncertainties::ProcessItsTpcMatching(){
       hdPtRel_ITSTPC->Fill(pt,(pt-fMatchTr[0]->Pt())/pt); 
       hdInvPtRel_ITSTPC->Fill(pt,pt*( 1/pt - (1/fMatchTr[0]->Pt()) )); 
     }
+    
+    if (nmatch>0 && fESDtrackCuts){
+      
+      if(fESDtrackCuts->AcceptTrack(fMatchTr[0])){
+       hBestMatch_cuts->Fill(pt,fMatchChi[0]);
+      }
+    }
+    
     //
     for (int imt=nmatch;imt--;) {
       hAllMatch->Fill(pt,fMatchChi[imt]);
@@ -522,7 +530,7 @@ void AliAnalysisTrackingUncertainties::ProcessTrackCutVariation() {
     fESDtrackCuts->SetMinNClustersTPC(0);
     if (fESDtrackCuts->AcceptTrack(track)) {
       for(Int_t iPid = 0; iPid < 6; iPid++) {
-       Double_t vecHistNcl[kNumberOfAxes] = {nclsTPC, pT, eta, phi, iPid};
+       Double_t vecHistNcl[kNumberOfAxes] = {static_cast<Double_t>(nclsTPC), pT, eta, phi, static_cast<Double_t>(iPid)};
        if (IsConsistentWithPid(iPid, track)) histNcl->Fill(vecHistNcl);
       }
     }
@@ -534,7 +542,7 @@ void AliAnalysisTrackingUncertainties::ProcessTrackCutVariation() {
     fESDtrackCuts->SetMaxChi2PerClusterTPC(999.);
     if (fESDtrackCuts->AcceptTrack(track)) {
       for(Int_t iPid = 0; iPid < 6; iPid++) {
-       Double_t vecHistChi2Tpc[kNumberOfAxes] = {chi2TPC, pT, eta, phi, iPid};
+       Double_t vecHistChi2Tpc[kNumberOfAxes] = {chi2TPC, pT, eta, phi, static_cast<Double_t>(iPid)};
        if (IsConsistentWithPid(iPid, track)) histChi2Tpc->Fill(vecHistChi2Tpc);
       }
     }
@@ -546,7 +554,7 @@ void AliAnalysisTrackingUncertainties::ProcessTrackCutVariation() {
     fESDtrackCuts->SetMaxDCAToVertexZ(999.);
     if (fESDtrackCuts->AcceptTrack(track)) {
       for(Int_t iPid = 0; iPid < 6; iPid++) {
-       Double_t vecHistDcaZ[kNumberOfAxes] = {TMath::Abs(dca[1]), pT, eta, phi, iPid};
+       Double_t vecHistDcaZ[kNumberOfAxes] = {TMath::Abs(dca[1]), pT, eta, phi, static_cast<Double_t>(iPid)};
        if (IsConsistentWithPid(iPid, track)) histDcaZ->Fill(vecHistDcaZ);
       }
     }
@@ -559,7 +567,7 @@ void AliAnalysisTrackingUncertainties::ProcessTrackCutVariation() {
       Int_t hasPoint = 0;
       if (track->HasPointOnITSLayer(0) || track->HasPointOnITSLayer(1)) hasPoint = 1;
       for(Int_t iPid = 0; iPid < 6; iPid++) {
-       Double_t vecHistSpd[kNumberOfAxes] = {hasPoint, pT, eta, phi, iPid};
+       Double_t vecHistSpd[kNumberOfAxes] = {static_cast<Double_t>(hasPoint), pT, eta, phi, static_cast<Double_t>(iPid)};
        if (IsConsistentWithPid(iPid, track)) histSpd->Fill(vecHistSpd);
       }
     }
@@ -572,7 +580,7 @@ void AliAnalysisTrackingUncertainties::ProcessTrackCutVariation() {
     fESDtrackCuts->SetMinNCrossedRowsTPC(0);
     if (fESDtrackCuts->AcceptTrack(track)) {
       for(Int_t iPid = 0; iPid < 6; iPid++) {
-       Double_t vecHistNcr[kNumberOfAxes] = {ncrTPC, pT, eta, phi, iPid};
+       Double_t vecHistNcr[kNumberOfAxes] = {static_cast<Double_t>(ncrTPC), pT, eta, phi, static_cast<Double_t>(iPid)};
        if (IsConsistentWithPid(iPid, track)) histNcr->Fill(vecHistNcr);
       }
     }
@@ -585,7 +593,7 @@ void AliAnalysisTrackingUncertainties::ProcessTrackCutVariation() {
     fESDtrackCuts->SetMinRatioCrossedRowsOverFindableClustersTPC(0.);
     if (fESDtrackCuts->AcceptTrack(track)) {
        for(Int_t iPid = 0; iPid < 6; iPid++) {
-        Double_t vecHistCRoverFC[kNumberOfAxes] = {nCRoverFC, pT, eta, phi, iPid};
+        Double_t vecHistCRoverFC[kNumberOfAxes] = {static_cast<Double_t>(nCRoverFC), pT, eta, phi, static_cast<Double_t>(iPid)};
         if (IsConsistentWithPid(iPid, track)) histCRoverFC->Fill(vecHistCRoverFC);
        }
     }
@@ -597,7 +605,7 @@ void AliAnalysisTrackingUncertainties::ProcessTrackCutVariation() {
     fESDtrackCuts->SetMaxChi2PerClusterITS(999.);
     if (fESDtrackCuts->AcceptTrack(track)) {
       for(Int_t iPid = 0; iPid < 6; iPid++) {
-       Double_t vecHistChi2ITS[kNumberOfAxes] = {chi2ITS, pT, eta, phi, iPid};
+       Double_t vecHistChi2ITS[kNumberOfAxes] = {chi2ITS, pT, eta, phi, static_cast<Double_t>(iPid)};
        if (IsConsistentWithPid(iPid, track)) histChi2Its->Fill(vecHistChi2ITS);
       }
     }
@@ -609,7 +617,7 @@ void AliAnalysisTrackingUncertainties::ProcessTrackCutVariation() {
     fESDtrackCuts->SetMinLengthActiveVolumeTPC(0);
     if (fESDtrackCuts->AcceptTrack(track)) {
       for(Int_t iPid = 0; iPid < 6; iPid++) {
-       Double_t vecHistTpcLength[kNumberOfAxes] = {tpcLength, pT, eta, phi, iPid};
+       Double_t vecHistTpcLength[kNumberOfAxes] = {tpcLength, pT, eta, phi, static_cast<Double_t>(iPid)};
        if (IsConsistentWithPid(iPid, track)) histTpcLength->Fill(vecHistTpcLength);
       }
     }
@@ -639,7 +647,7 @@ void AliAnalysisTrackingUncertainties::ProcessTrackCutVariation() {
     
     if (fESDtrackCuts->AcceptTrack(track)) {
       for(Int_t iPid = 0; iPid < 6; iPid++) {
-       Double_t vecHistTpcItsMatch[kNumberOfAxes] = {isMatched, pT, eta, phi, iPid};
+       Double_t vecHistTpcItsMatch[kNumberOfAxes] = {static_cast<Double_t>(isMatched), pT, eta, phi, static_cast<Double_t>(iPid)};
        if (IsConsistentWithPid(iPid, track)) histTpcItsMatch->Fill(vecHistTpcItsMatch); // fill with 1 here
       }
     }
@@ -653,7 +661,7 @@ void AliAnalysisTrackingUncertainties::ProcessTrackCutVariation() {
     isMatched=kTRUE;
     if (fESDtrackCuts->AcceptTrack(track)) {
       for(Int_t iPid = 0; iPid < 6; iPid++) {
-       Double_t vecHistTpcItsMatch[kNumberOfAxes] = {isMatched, pT, eta, phi, iPid};
+       Double_t vecHistTpcItsMatch[kNumberOfAxes] = {static_cast<Double_t>(isMatched), pT, eta, phi, static_cast<Double_t>(iPid)};
        if (IsConsistentWithPid(iPid, track)) histTpcItsMatch->Fill(vecHistTpcItsMatch); // fill with 0 here
       }
     }