From 00946a1ab519fe36b714095e79fb1a1d92602c1c Mon Sep 17 00:00:00 2001 From: markus Date: Fri, 23 Mar 2007 16:51:00 +0000 Subject: [PATCH] Compatibility changes due to recent changes in the underlying classes. --- STEER/CreateAODfromESD.C | 23 +++++++++++++++++------ STEER/CreateAODfromKineTree.C | 3 +++ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/STEER/CreateAODfromESD.C b/STEER/CreateAODfromESD.C index 9700ff29ea6..4f1e7521761 100644 --- a/STEER/CreateAODfromESD.C +++ b/STEER/CreateAODfromESD.C @@ -66,6 +66,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root", aod->AddHeader(new AliAODHeader(esd->GetRunNumber(), esd->GetBunchCrossNumber(), esd->GetOrbitNumber(), + esd->GetPeriodNumber(), nTracks, nPosTracks, nTracks-nPosTracks, @@ -125,7 +126,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root", vtx->GetCovMatrix(covVtx); //covariance matrix AliAODVertex * primary = new(vertices[jVertices++]) - AliAODVertex(pos, covVtx, vtx->GetChi2(), NULL, AliAODVertex::kPrimary); + AliAODVertex(pos, covVtx, vtx->GetChi2toNDF(), NULL, AliAODVertex::kPrimary); // Create vertices starting from the most complex objects @@ -139,7 +140,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root", // Add the cascade vertex AliAODVertex * vcascade = new(vertices[jVertices++]) AliAODVertex(pos, covVtx, - cascade->GetChi2Xi(), + cascade->GetChi2Xi(), // = chi2/NDF since NDF = 2*2-3 primary, AliAODVertex::kCascade); @@ -181,7 +182,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root", vV0FromCascade = new(vertices[jVertices++]) AliAODVertex(pos, covVtx, - v0->GetChi2V0(), + v0->GetChi2V0(), // = chi2/NDF since NDF = 2*2-3 vcascade, AliAODVertex::kV0); } else { @@ -196,7 +197,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root", vV0FromCascade = new(vertices[jVertices++]) AliAODVertex(pos, covVtx, - v0->GetChi2V0(), + v0->GetChi2V0(), // = chi2/NDF since NDF = 2*2-3 vcascade, AliAODVertex::kV0); vcascade->AddDaughter(vV0FromCascade); @@ -226,6 +227,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root", esdTrack->GetITSClusterMap(), pid, vV0FromCascade, + kTRUE, // check if this is right kFALSE, // check if this is right AliAODTrack::kSecondary) ); @@ -260,6 +262,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root", esdTrack->GetITSClusterMap(), pid, vV0FromCascade, + kTRUE, // check if this is right kFALSE, // check if this is right AliAODTrack::kSecondary) ); @@ -296,6 +299,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root", esdTrack->GetITSClusterMap(), pid, vcascade, + kTRUE, // check if this is right kFALSE, // check if this is right AliAODTrack::kSecondary) ); @@ -324,7 +328,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root", AliAODVertex * vV0 = new(vertices[jVertices++]) AliAODVertex(pos, covVtx, - v0->GetChi2V0(), + v0->GetChi2V0(), // = chi2/NDF since NDF = 2*2-3 primary, AliAODVertex::kV0); primary->AddDaughter(vV0); @@ -356,6 +360,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root", esdTrack->GetITSClusterMap(), pid, vV0, + kTRUE, // check if this is right kFALSE, // check if this is right AliAODTrack::kSecondary) ); @@ -390,6 +395,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root", esdTrack->GetITSClusterMap(), pid, vV0, + kTRUE, // check if this is right kFALSE, // check if this is right AliAODTrack::kSecondary) ); @@ -476,6 +482,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root", pid, primary, kTRUE, // check if this is right + kTRUE, // check if this is right AliAODTrack::kPrimary); primary->AddDaughter(mother); mother->ConvertAliPIDtoAODPID(); @@ -521,6 +528,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root", pid, vkink, kTRUE, // check if this is right + kTRUE, // check if this is right AliAODTrack::kPrimary); vkink->AddDaughter(daughter); daughter->ConvertAliPIDtoAODPID(); @@ -572,6 +580,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root", pid, primary, kTRUE, // check if this is right + kTRUE, // check if this is right AliAODTrack::kPrimary) ); aodTrack->ConvertAliPIDtoAODPID(); @@ -591,6 +600,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root", pid, NULL, kFALSE, // check if this is right + kFALSE, // check if this is right AliAODTrack::kOrphan); aodTrack->ConvertAliPIDtoAODPID(); } @@ -623,7 +633,8 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root", 0, // no ITSClusterMap pid, primary, - kFALSE, // not used for vertex fit + kTRUE, // check if this is right + kTRUE, // not used for vertex fit AliAODTrack::kPrimary) ); } diff --git a/STEER/CreateAODfromKineTree.C b/STEER/CreateAODfromKineTree.C index 95e3b31537b..0e2bb3f3d7f 100644 --- a/STEER/CreateAODfromKineTree.C +++ b/STEER/CreateAODfromKineTree.C @@ -125,6 +125,7 @@ void CreateAODfromKineTree(const char *inFileName, aod->AddHeader(new AliAODHeader(aliHeader->GetRun(), 0, // bunchX number 0, // orbit number + 0, // period number nTracks, nPos, nNeg, @@ -185,6 +186,7 @@ void CreateAODfromKineTree(const char *inFileName, 0, // no ITSClusterMap pid, primary, + kFALSE, // no fit performed kFALSE, // no fit preformed AliAODTrack::kPrimary)); currTrack = (AliAODTrack*)tracks.Last(); @@ -266,6 +268,7 @@ Int_t LoopOverSecondaries(TParticle *mother) { pid, secondary, kFALSE, // no fit performed + kFALSE, // no fit performed AliAODTrack::kSecondary)); currTrack = (AliAODTrack*)tracks.Last(); -- 2.39.3