Fixes for TH1/TH2 mismatch
authorhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 11 Jun 2012 15:21:22 +0000 (15:21 +0000)
committerhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 11 Jun 2012 15:21:22 +0000 (15:21 +0000)
HLT/global/physics/AliHLTMultiplicityCorrelations.cxx
PWGPP/Centrality/AliMultiplicityCorrelations.cxx
PWGPP/ITS/AliAnalysisTaskITSsaTracks.cxx
STEER/AOD/AliAODPid.h

index fc767c9..684c53f 100644 (file)
@@ -576,9 +576,9 @@ Int_t AliHLTMultiplicityCorrelations::ProcessZDC() {
 Int_t AliHLTMultiplicityCorrelations::ProcessSPD() {
   // see header file for class documentation
   
-  (static_cast<TH2F*>(fHistList->FindObject("fSpdNClusters")))->Fill(fSpdNClusters);
-  (static_cast<TH2F*>(fHistList->FindObject("fSpdNClustersInner")))->Fill(fSpdNClustersInner);
-  (static_cast<TH2F*>(fHistList->FindObject("fSpdNClustersOuter")))->Fill(fSpdNClustersOuter);
+  (static_cast<TH1F*>(fHistList->FindObject("fSpdNClusters")))->Fill(fSpdNClusters);
+  (static_cast<TH1F*>(fHistList->FindObject("fSpdNClustersInner")))->Fill(fSpdNClustersInner);
+  (static_cast<TH1F*>(fHistList->FindObject("fSpdNClustersOuter")))->Fill(fSpdNClustersOuter);
 
   
   // -- SPD vs TPC correlations
index 0cfc28d..584154f 100644 (file)
@@ -581,9 +581,9 @@ Int_t AliMultiplicityCorrelations::ProcessSPD() {
 
   fSpdNClusters      = fSpdNClustersOuter + fSpdNClustersInner;
 
-  (static_cast<TH2F*>(fHistList->FindObject("fSpdNClusters")))->Fill(fSpdNClusters);
-  (static_cast<TH2F*>(fHistList->FindObject("fSpdNClustersInner")))->Fill(fSpdNClustersInner);
-  (static_cast<TH2F*>(fHistList->FindObject("fSpdNClustersOuter")))->Fill(fSpdNClustersOuter);
+  (static_cast<TH1F*>(fHistList->FindObject("fSpdNClusters")))->Fill(fSpdNClusters);
+  (static_cast<TH1F*>(fHistList->FindObject("fSpdNClustersInner")))->Fill(fSpdNClustersInner);
+  (static_cast<TH1F*>(fHistList->FindObject("fSpdNClustersOuter")))->Fill(fSpdNClustersOuter);
   
   // -- SPD vs TPC correlations
   if (fProcessTPC) {
index 2480241..82f9fe5 100644 (file)
@@ -620,7 +620,7 @@ void AliAnalysisTaskITSsaTracks::UserExec(Option_t *)
       fHistPtTPCITS[hadronSpecie]->Fill(pttrack);
       fHistEtaPhiTPCITS[hadronSpecie]->Fill(track->Eta(),track->Phi());
       fHistNcluTPCITS[hadronSpecie]->Fill(pttrack,nITSclus);
-      fHistCluInLayTPCITS[hadronSpecie]->Fill(-1.);
+      fHistCluInLayTPCITS[hadronSpecie]->Fill(-1.,-1.);
       for(Int_t iBit=0; iBit<6; iBit++){
        if(clumap&(1<<iBit)) fHistCluInLayTPCITS[hadronSpecie]->Fill(pttrack,iBit);
       }
@@ -630,7 +630,7 @@ void AliAnalysisTaskITSsaTracks::UserExec(Option_t *)
       fHistNcluITSpureSA[hadronSpecie]->Fill(pttrack,nITSclus);
       fHistd0rphiITSpureSA[hadronSpecie]->Fill(pttrack,impactXY);
       fHistd0zITSpureSA[hadronSpecie]->Fill(pttrack,impactZ);
-      fHistCluInLayITSpureSA[hadronSpecie]->Fill(-1.);
+      fHistCluInLayITSpureSA[hadronSpecie]->Fill(-1.,-1.);
       Int_t outerLay=-1;
       for(Int_t iBit=0; iBit<6; iBit++){
        if(clumap&(1<<iBit)){
@@ -662,7 +662,7 @@ void AliAnalysisTaskITSsaTracks::UserExec(Option_t *)
       fHistPtITSsa[hadronSpecie]->Fill(pttrack);
       fHistEtaPhiITSsa[hadronSpecie]->Fill(track->Eta(),track->Phi());
       fHistNcluITSsa[hadronSpecie]->Fill(pttrack,nITSclus);
-      fHistCluInLayITSsa[hadronSpecie]->Fill(-1.);
+      fHistCluInLayITSsa[hadronSpecie]->Fill(-1.,-1.);
       for(Int_t iBit=0; iBit<6; iBit++){
        if(clumap&(1<<iBit)) fHistCluInLayITSsa[hadronSpecie]->Fill(pttrack,iBit);
       }
index 7fdf7b0..446daa2 100644 (file)
@@ -74,15 +74,15 @@ class AliAODPid : public TObject {
   Int_t       fTRDnSlices;       // N slices used for PID in the TRD
   UChar_t     fTRDntls;          // number of tracklets used for PID calculation
   UChar_t     fTRDncls[6];       // number of clusters used for dE/dx calculation
-  Double32_t* fTRDslices;        //[fTRDnSlices]
-  Float_t     fTRDmomentum[6];   // momentum at the TRD layers
+  Double32_t* fTRDslices;        //![fTRDnSlices]
+  Float_t     fTRDmomentum[6];   //! momentum at the TRD layers
   Double32_t  fTOFesdsignal;     // TOF signal - t0 (T0 interaction time)
-  Double32_t  fTOFpidResolution[5]; // TOF pid resolution for each mass hypotesys 
-  Double32_t  fIntTime[5];       // track time hypothesis
+  Double32_t  fTOFpidResolution[5]; //! TOF pid resolution for each mass hypotesys 
+  Double32_t  fIntTime[5];       //! track time hypothesis
   Double32_t  fHMPIDsignal;      // detector raw signal
-  Double32_t  fHMPIDprobs[5];    // detector pid probabilities
+  Double32_t  fHMPIDprobs[5];    //! detector pid probabilities
  
-  AliTPCdEdxInfo * fTPCdEdxInfo; // object containing dE/dx information for different pad regions
+  AliTPCdEdxInfo * fTPCdEdxInfo; //! object containing dE/dx information for different pad regions
 
   ClassDef(AliAODPid, 10);
 };