From: mfloris Date: Thu, 23 Oct 2014 10:40:27 +0000 (+0200) Subject: Fixing compilation issues after merging X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=319e62396da8d3cc1b16a6b90c3ceed608266ac8 Fixing compilation issues after merging --- diff --git a/ANALYSIS/AliAnalysisTaskPIDqa.cxx b/ANALYSIS/AliAnalysisTaskPIDqa.cxx index 2e68503b4a8..7b8c04a8855 100644 --- a/ANALYSIS/AliAnalysisTaskPIDqa.cxx +++ b/ANALYSIS/AliAnalysisTaskPIDqa.cxx @@ -834,7 +834,9 @@ void AliAnalysisTaskPIDqa::FillTPCqa() // Get reference multiplicity for AODs if ( analysisType == "AOD" && fAODevent ) { - mult=fAODevent->GetHeader()->GetTPConlyRefMultiplicity(); + AliAODHeader * header=dynamic_cast(fAODevent->GetHeader()); + if(!header) AliFatal("Not a standard AOD"); + mult=header->GetTPConlyRefMultiplicity(); } /*if (mult < 0) { diff --git a/ANALYSIS/AliEPSelectionTask.cxx b/ANALYSIS/AliEPSelectionTask.cxx index 0281826df3f..df7e5914fd7 100644 --- a/ANALYSIS/AliEPSelectionTask.cxx +++ b/ANALYSIS/AliEPSelectionTask.cxx @@ -347,7 +347,8 @@ void AliEPSelectionTask::UserExec(Option_t */*option*/) if (aod){ // get centrality of the event - AliAODHeader *header=aod->GetHeader(); + AliAODHeader *header=dynamic_cast(aod->GetHeader()); + if(!header) AliFatal("Not a standard AOD"); AliCentrality *centrality=header->GetCentralityP(); if(!centrality) AliError(Form("No AliCentrality attached to AOD header")); fCentrality = centrality->GetCentralityPercentile("V0M"); @@ -365,8 +366,6 @@ void AliEPSelectionTask::UserExec(Option_t */*option*/) if (headerH) fRP = headerH->GetReactionPlaneAngle(); } - AliAODHeader * header = dynamic_cast(aod->GetHeader()); - if(!header) AliFatal("Not a standard AOD"); esdEP = header->GetEventplaneP(); if(!esdEP) return; // protection against missing EP branch (nanoAODs) esdEP->Reset(); diff --git a/ITS/UPGRADE/AliITSUTrackerCooked.cxx b/ITS/UPGRADE/AliITSUTrackerCooked.cxx index c3b63a280e2..68dbe80c042 100644 --- a/ITS/UPGRADE/AliITSUTrackerCooked.cxx +++ b/ITS/UPGRADE/AliITSUTrackerCooked.cxx @@ -326,7 +326,7 @@ Int_t AliITSUTrackerCooked::Clusters2Tracks(AliESDEvent *event) { const AliESDVertex *vtx=0; vtx=event->GetPrimaryVertexSPD(); if (vtx->GetStatus()) { - xyz[0]=vtx->GetXv(); xyz[1]=vtx->GetYv(); xyz[2]=vtx->GetZv(); + xyz[0]=vtx->GetX(); xyz[1]=vtx->GetY(); xyz[2]=vtx->GetZ(); SetVertex(xyz); MakeSeeds(); } @@ -336,7 +336,7 @@ Int_t AliITSUTrackerCooked::Clusters2Tracks(AliESDEvent *event) { for (Int_t v=0; vUncheckedAt(v); if (!vtx->GetStatus()) continue; - xyz[0]=vtx->GetXv(); xyz[1]=vtx->GetYv(); xyz[2]=vtx->GetZv(); + xyz[0]=vtx->GetX(); xyz[1]=vtx->GetY(); xyz[2]=vtx->GetZ(); SetVertex(xyz); MakeSeeds(); } diff --git a/PWGCF/Correlations/JCORRAN/AliJFilter.cxx b/PWGCF/Correlations/JCORRAN/AliJFilter.cxx index a22c77e502a..03a41e6a1bc 100644 --- a/PWGCF/Correlations/JCORRAN/AliJFilter.cxx +++ b/PWGCF/Correlations/JCORRAN/AliJFilter.cxx @@ -666,7 +666,8 @@ Bool_t AliJFilter::ReadAODTracks(const AliAODEvent * aod) //==== loop over tracks ====// for(Int_t it = 0; it < nt; it++) { - AliAODTrack *track = aod->GetTrack(it); + AliAODTrack *track = dynamic_cast(aod->GetTrack(it)); + if(!track) AliFatal("Not a standard AOD track"); //if(track->GetFilterMap() & (1 << 7) ) continue; //if(!AcceptAODTrack(track)) continue; //if(! fEsdTrackCuts->IsSelected(track)) continue; //apply loose selection criteria @@ -843,7 +844,8 @@ void AliJFilter::ReadAODHeader(AliAODEvent *aod) hdr->SetZVertexMC( aodMCheader->GetVtxZ() ); } - AliAODHeader * ah = aod->GetHeader(); + AliAODHeader * ah = dynamic_cast(aod->GetHeader()); + if(!ah) AliFatal("Not a standard AOD"); hdr->SetESDFileName( ah->GetESDFileName() ); hdr->SetEventNumberESDFile( ah->GetEventNumberESDFile() ); } diff --git a/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioHelper.cxx b/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioHelper.cxx index 09e5fb14cb9..477c27028d7 100644 --- a/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioHelper.cxx +++ b/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioHelper.cxx @@ -274,7 +274,7 @@ Int_t AliEbyEPidRatioHelper::SetupEvent(AliESDInputHandler *esdHandler, AliAODIn if(esdHandler) centrality = fESD->GetCentrality(); else if(aodHandler) - centrality = fAOD->GetHeader()->GetCentralityP(); + centrality = ((AliVAODHeader*)fAOD->GetHeader())->GetCentralityP(); if (!centrality) { AliError("Centrality not available"); @@ -373,7 +373,7 @@ Bool_t AliEbyEPidRatioHelper::IsEventRejected() { // -- 3 - Vertex z outside cut window ++iCut; if (vtxESD){ - if(TMath::Abs(vtxESD->GetZv()) > fVertexZMax) + if(TMath::Abs(vtxESD->GetZ()) > fVertexZMax) aEventCuts[iCut] = 1; } else if(vtxAOD){ diff --git a/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioTask.cxx b/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioTask.cxx index 00c829d6289..b083a9cd2db 100644 --- a/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioTask.cxx +++ b/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioTask.cxx @@ -537,7 +537,7 @@ Int_t AliEbyEPidRatioTask::SetupAODEvent() { // -- Check Centrality // ------------------------------------------------------------------ - if (!fAOD->GetHeader()->GetCentralityP()) { + if (!((AliVAODHeader*)fAOD->GetHeader())->GetCentralityP()) { AliError("Could not get centrality"); return -1; } diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskV0sInJetsEmcal.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskV0sInJetsEmcal.cxx index 5445a2d7b13..7d4b4822ce0 100644 --- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskV0sInJetsEmcal.cxx +++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskV0sInJetsEmcal.cxx @@ -1279,7 +1279,7 @@ Bool_t AliAnalysisTaskV0sInJetsEmcal::FillHistograms() } // fdCentrality = fAODIn->GetHeader()->GetCentrality(); // event centrality - fdCentrality = fAODIn->GetHeader()->GetCentralityP()->GetCentralityPercentile("V0M"); // event centrality + fdCentrality = ((AliVAODHeader*)fAODIn->GetHeader())->GetCentralityP()->GetCentralityPercentile("V0M"); // event centrality if(!fbIsPbPb) fdCentrality = 0.; Int_t iCentIndex = GetCentralityBinIndex(fdCentrality); // get index of centrality bin @@ -2967,7 +2967,7 @@ Bool_t AliAnalysisTaskV0sInJetsEmcal::IsSelectedForJets(AliAODEvent* fAOD, Doubl return kFALSE; Double_t centrality; // centrality = fAOD->GetHeader()->GetCentrality(); - centrality = fAOD->GetHeader()->GetCentralityP()->GetCentralityPercentile("V0M"); + centrality = ((AliVAODHeader*)fAOD->GetHeader())->GetCentralityP()->GetCentralityPercentile("V0M"); if(fbIsPbPb) { if(centrality < 0) diff --git a/PWGLF/SPECTRA/IdentifiedHighPt/train/AliAnalysisTaskHighPtDeDx.cxx b/PWGLF/SPECTRA/IdentifiedHighPt/train/AliAnalysisTaskHighPtDeDx.cxx index fd8b816fbe0..ab201e15668 100755 --- a/PWGLF/SPECTRA/IdentifiedHighPt/train/AliAnalysisTaskHighPtDeDx.cxx +++ b/PWGLF/SPECTRA/IdentifiedHighPt/train/AliAnalysisTaskHighPtDeDx.cxx @@ -1766,7 +1766,8 @@ void AliAnalysisTaskHighPtDeDx::ProduceArrayTrksAOD( AliAODEvent *AODevent, Anal const AliAODVertex* vertex = AODevent->GetPrimaryVertex(); for(Int_t iT = 0; iT < nAODTracks; iT++) { - AliAODTrack* aodTrack = AODevent->GetTrack(iT); + AliAODTrack* aodTrack = dynamic_cast(AODevent->GetTrack(iT)); + if(!aodTrack) AliFatal("Not a standard AOD"); //FOR AOD068, filterCut_Set2=KTRUE WHEN THE TRACK SATISFIES THE CUTS FROM JET ANALYSIS @@ -2016,8 +2017,8 @@ void AliAnalysisTaskHighPtDeDx::ProduceArrayTrksAOD( AliAODEvent *AODevent, Anal //const AliAODVertex* vertex = AODevent->GetPrimaryVertex(); for(Int_t iT = 0; iT < nAODTracks; iT++) { - AliAODTrack* aodTrack = AODevent->GetTrack(iT); - + AliAODTrack* aodTrack = dynamic_cast(AODevent->GetTrack(iT)); + if(!aodTrack) AliFatal("Not a standard AOD"); UShort_t filterFlag = 0; diff --git a/PWGLF/SPECTRA/XtAnalysis/AliXtAnalysis.cxx b/PWGLF/SPECTRA/XtAnalysis/AliXtAnalysis.cxx index 4d46de5d4eb..923d758c812 100644 --- a/PWGLF/SPECTRA/XtAnalysis/AliXtAnalysis.cxx +++ b/PWGLF/SPECTRA/XtAnalysis/AliXtAnalysis.cxx @@ -249,7 +249,7 @@ void AliXtAnalysis::UserExec(Option_t *) { // Get good tracks to the list for(Int_t it = 0; it < nt; it++) { - AliAODTrack *track = aodEvent->GetTrack(it); + AliAODTrack *track = dynamic_cast(aodEvent->GetTrack(it)); if( !track ) continue; if( !track->TestFilterBit(filterBit) ) continue; double eta = track->Eta();