Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / PWGCF / EBYE / Fluctuations / AliHigherMomentsToyModel.cxx

diff --git a/PWGCF/EBYE/Fluctuations/AliHigherMomentsToyModel.cxx b/PWGCF/EBYE/Fluctuations/AliHigherMomentsToyModel.cxx
index d0fbffc3f703c87d4ac5e102edf5607ec365c7b5..eba0d0836dcd669b609bc4a9a0d6937369033a0e 100644 (file)
--- a/PWGCF/EBYE/Fluctuations/AliHigherMomentsToyModel.cxx
+++ b/PWGCF/EBYE/Fluctuations/AliHigherMomentsToyModel.cxx
@@ -356,7 +356,8 @@ void AliHigherMomentsToyModel::doAODEvent(){
   }  
   
   
-  AliAODHeader *aodHeader = fAOD->GetHeader();
+  AliAODHeader *aodHeader = dynamic_cast<AliAODHeader*>(fAOD->GetHeader());
+  if(!aodHeader) AliFatal("Not a standard AOD");
   
   fCentrality = (Int_t)aodHeader->GetCentralityP()->GetCentralityPercentile(fCentralityEstimator.Data());
   /* Int_t cent = -1;
@@ -414,7 +415,8 @@ void AliHigherMomentsToyModel::doAODEvent(){
       Int_t gID = aodTrack1->GetID();
       
       //if( aodTrack->GetID() != (-aodTrack1->GetID() -1) ) continue;
-      newAodTrack = gID >= 0 ? aodTrack1 : fAOD->GetTrack(trackMap->GetValue(-1-gID)); //Take those global track who corresponds to TPC only track
+      newAodTrack = gID >= 0 ? aodTrack1 : dynamic_cast<AliAODTrack*>(fAOD->GetTrack(trackMap->GetValue(-1-gID))); //Take those global track who corresponds to TPC only track
+      if(!newAodTrack) AliFatal("Not a standard AOD");
       
       Float_t dxy = 0., dz = 0.;
       
@@ -468,11 +470,11 @@ void AliHigherMomentsToyModel::doAODEvent(){
        fTPCSig->Fill(newAodTrack->GetTPCmomentum(),tpcSignal);
        
        Float_t nsigmaTPCPID = -999.;
-       Float_t nsigmaTOFPID = -999.;
+       //Float_t nsigmaTOFPID = -999.;
        //Float_t nsigmaTPCTOFPID = -999.;
        
        nsigmaTPCPID = TMath::Abs(fPIDResponse->NumberOfSigmasTPC(newAodTrack,fParticleSpecies));
-       nsigmaTOFPID = TMath::Abs(fPIDResponse->NumberOfSigmasTOF(newAodTrack,fParticleSpecies));
+       //nsigmaTOFPID = TMath::Abs(fPIDResponse->NumberOfSigmasTOF(newAodTrack,fParticleSpecies));
        
        if ( nsigmaTPCPID < fNSigmaCut  ){
          
@@ -573,7 +575,8 @@ void AliHigherMomentsToyModel::doMCAODEvent(){
     return;
   }
   
-  AliAODHeader *aodHeader = fAOD->GetHeader();
+  AliAODHeader *aodHeader = dynamic_cast<AliAODHeader*>(fAOD->GetHeader());
+  if(!aodHeader) AliFatal("Not a standard AOD");
   
   fCentrality = (Int_t)aodHeader->GetCentralityP()->GetCentralityPercentile(fCentralityEstimator.Data());
   
@@ -638,7 +641,8 @@ void AliHigherMomentsToyModel::doMCAODEvent(){
     
     //if( aodTrack->GetID() != (-aodTrack1->GetID() -1) ) continue;
     
-    newAodTrack = gID >= 0 ? aodTrack1 : fAOD->GetTrack(trackMap->GetValue(-1-gID)); //Take those global track who corresponds to TPC only track
+    newAodTrack = gID >= 0 ? aodTrack1 : dynamic_cast<AliAODTrack*>(fAOD->GetTrack(trackMap->GetValue(-1-gID))); //Take those global track who corresponds to TPC only track
+    if(!newAodTrack) AliFatal("Not a standard AOD");
     
   
     //cout << dxy << endl;
@@ -701,11 +705,11 @@ void AliHigherMomentsToyModel::doMCAODEvent(){
       fTPCSig->Fill(newAodTrack->GetTPCmomentum(),tpcSignal);
       
       Float_t nsigmaTPCPID = -999.;
-      Float_t nsigmaTOFPID = -999.;
+      //Float_t nsigmaTOFPID = -999.;
       //Float_t nsigmaTPCTOFPID = -999.;
       
       nsigmaTPCPID = TMath::Abs(fPIDResponse->NumberOfSigmasTPC(newAodTrack,fParticleSpecies));
-      nsigmaTOFPID = TMath::Abs(fPIDResponse->NumberOfSigmasTOF(newAodTrack,fParticleSpecies));
+      //nsigmaTOFPID = TMath::Abs(fPIDResponse->NumberOfSigmasTOF(newAodTrack,fParticleSpecies));
       
       if ( nsigmaTPCPID < fNSigmaCut  ){