Merging changes from v4-04-Release

diff --git a/STEER/AliESD.cxx b/STEER/AliESD.cxx
index 60beb8b8ae0125b1da7bfc660f00254118cb392c..a13cc0f5c4945f3970e328b4ae676ba3aa71ad5c 100644 (file)
--- a/STEER/AliESD.cxx
+++ b/STEER/AliESD.cxx
@@ -157,10 +157,11 @@ void AliESD::Print(Option_t *) const
         GetRunNumber(),
         GetTriggerMask(),
         GetMagneticField() );
-  printf("Vertex: (%.4f +- %.4f, %.4f +- %.4f, %.4f +- %.4f) cm\n",
-        fPrimaryVertex->GetXv(), fPrimaryVertex->GetXRes(),
-        fPrimaryVertex->GetYv(), fPrimaryVertex->GetYRes(),
-        fPrimaryVertex->GetZv(), fPrimaryVertex->GetZRes());
+  if (fPrimaryVertex)
+    printf("Vertex: (%.4f +- %.4f, %.4f +- %.4f, %.4f +- %.4f) cm\n",
+          fPrimaryVertex->GetXv(), fPrimaryVertex->GetXRes(),
+          fPrimaryVertex->GetYv(), fPrimaryVertex->GetYRes(),
+          fPrimaryVertex->GetZv(), fPrimaryVertex->GetZRes());
   printf("Event from reconstruction version %d \n",fRecoVersion);
   printf("Number of tracks: \n");
   printf("                 charged   %d\n", GetNumberOfTracks());

diff --git a/STEER/AliESDtrack.cxx b/STEER/AliESDtrack.cxx
index d23ca0e2d30dc135b01e29aa4f1a2f0b49258757..86b13657be89bd8008c32eefbecdfced6b279b4e 100644 (file)
--- a/STEER/AliESDtrack.cxx
+++ b/STEER/AliESDtrack.cxx
@@ -186,7 +186,7 @@ AliESDtrack::AliESDtrack(const AliESDtrack& track):
   fRICHmipX(track.fRICHmipX),
   fRICHmipY(track.fRICHmipY),
   fPoints(0),
-  fFriendTrack(new AliESDfriendTrack(*(track.fFriendTrack)))
+  fFriendTrack(0)
 {
   //
   //copy constructor
@@ -218,6 +218,7 @@ AliESDtrack::AliESDtrack(const AliESDtrack& track):
   if (track.fOp) fOp=new AliExternalTrackParam(*track.fOp);
 
   if (track.fPoints) fPoints=new AliTrackPointArray(*(track.fPoints));
+  if (track.fFriendTrack) fFriendTrack=new AliESDfriendTrack(*(track.fFriendTrack));
 }
 
 //_______________________________________________________________________
@@ -259,11 +260,7 @@ void AliESDtrack::MakeMiniESDtrack(){
   // fD: Impact parameter in XY-plane
   // fZ: Impact parameter in Z 
   // fR[AliPID::kSPECIES]: combined "detector response probability"
-  // Running track parameters
-  // fRalpha: track rotation angle
-  // fRx: X-coordinate of the track reference plane 
-  // fRp[5]: external track parameters  
-  // fRc[15]: external cov. matrix of the track parameters
+  // Running track parameters in the base class (AliExternalTrackParam)
   
   fTrackLength = 0;
   for (Int_t i=0;i<AliPID::kSPECIES;i++) fTrackTime[i] = 0;
@@ -337,6 +334,8 @@ void AliESDtrack::MakeMiniESDtrack(){
   fRICHphi = 0;      
   fRICHdx = 0;     
   fRICHdy = 0;      
+  fRICHmipX = 0;
+  fRICHmipY = 0;
 
   delete fFriendTrack; fFriendTrack = 0;
   delete fPoints; fPoints = 0;

diff --git a/macros/mcminiesd.C b/macros/mcminiesd.C
index a3fd5c841d41e3a514bd8824cc8fe0057536f4ca..41685b646d83c1787beca09b73ff6feb358d1a17 100644 (file)
--- a/macros/mcminiesd.C
+++ b/macros/mcminiesd.C
@@ -63,24 +63,29 @@ void copyGeneralESDInfo(AliESD* esdIn, AliESD* esdOut) {
   esdOut->SetRunNumber(esdIn->GetRunNumber());
   
   // Trigger
-  esdOut->SetTrigger(esdIn->GetTrigger());
+  esdOut->SetTriggerMask(esdIn->GetTriggerMask());
 
   // Magnetic field
   esdOut->SetMagneticField(esdIn->GetMagneticField());
 
   // Copy ESD vertex
   const AliESDVertex * vtxIn = esdIn->GetVertex();
-  Double_t pos[3];
-  vtxIn->GetXYZ(pos);
-  Double_t cov[6];
-  vtxIn->GetCovMatrix(cov);
+  AliESDVertex * vtxOut = 0x0;
+  if (vtxIn) {
+    Double_t pos[3];
+    vtxIn->GetXYZ(pos);
+    Double_t cov[6];
+    vtxIn->GetCovMatrix(cov);
   
-  AliESDVertex * vtxOut = new AliESDVertex(pos,cov,
-                                          vtxIn->GetChi2(),
-                                          vtxIn->GetNContributors());
-  Double_t tp[3];
-  vtxIn->GetTruePos(tp);
-  vtxOut->SetTruePos(tp);
+    vtxOut = new AliESDVertex(pos,cov,
+                                            vtxIn->GetChi2(),
+                                            vtxIn->GetNContributors());
+    Double_t tp[3];
+    vtxIn->GetTruePos(tp);
+    vtxOut->SetTruePos(tp);
+  }
+  else
+    vtxOut = new AliESDVertex();
   
   esdOut->SetVertex(vtxOut);
 }
@@ -101,7 +106,7 @@ void selectMiniESD(AliESD* esdIn, AliESD* &esdOut) {
 
   // Copy the general information
   copyGeneralESDInfo(esdIn, esdOut);
-     
+
   // Select tracks
   Int_t ntrk = esdIn->GetNumberOfTracks();