Update MC pt shape syst

[u/mrichter/AliRoot.git] / STEER / AliAODMCParticle.cxx

diff --git a/STEER/AliAODMCParticle.cxx b/STEER/AliAODMCParticle.cxx
index 250747f3d529d52b7c8c91bfd8a8625c69124c65..dbdd480b590348df2fa00e0505e27062a15ad83b 100644 (file)
--- a/STEER/AliAODMCParticle.cxx
+++ b/STEER/AliAODMCParticle.cxx
@@ -46,31 +46,32 @@ AliVParticle(),
   fE(0),
   fVx(0),
   fVy(0),
-  fVz(0)
+  fVz(0),
+  fVt(0)
 {
   // Default Constructor
   fDaughter[0] =   fDaughter[1] = 0;
 }
 
     
-AliAODMCParticle::AliAODMCParticle(TParticle* part, Int_t label,Int_t flag):
+AliAODMCParticle::AliAODMCParticle(const AliMCParticle* mcpart, Int_t label,Int_t flag):
     AliVParticle(),
-    fPdgCode(part->GetPdgCode()),
+    fPdgCode(mcpart->Particle()->GetPdgCode()),
     fFlag(flag),
     fLabel(label),
-    fMother(part->GetMother(0)),
-    fPx(part->Px()),
-    fPy(part->Py()),
-    fPz(part->Pz()),
-    fE(part->Energy()),
-    fVx(part->Vx()),
-    fVy(part->Vy()),
-    fVz(part->Vz())
+    fMother(mcpart->GetMother()),
+    fPx(mcpart->Particle()->Px()),
+    fPy(mcpart->Particle()->Py()),
+    fPz(mcpart->Particle()->Pz()),
+    fE(mcpart->Particle()->Energy()),
+    fVx(mcpart->Particle()->Vx()),
+    fVy(mcpart->Particle()->Vy()),
+    fVz(mcpart->Particle()->Vz()),
+    fVt(mcpart->Particle()->T())
 {
-  fDaughter[0] =  part->GetDaughter(0); 
-  fDaughter[1] =  part->GetDaughter(1);
-  // Set unique id
-  TObject::SetUniqueID(part->GetUniqueID());
+    // Constructor
+  fDaughter[0] =  mcpart->GetFirstDaughter(); 
+  fDaughter[1] =  mcpart->GetLastDaughter();
 }
     
     
@@ -86,12 +87,12 @@ AliAODMCParticle::AliAODMCParticle(const AliAODMCParticle& mcPart) :
     fE(mcPart.fE),
     fVx(mcPart.fVx),
     fVy(mcPart.fVy),
-    fVz(mcPart.fVz)
+    fVz(mcPart.fVz),
+    fVt(mcPart.fVt)
 {
   // Copy constructor
   fDaughter[0] = mcPart.fDaughter[0]; 
   fDaughter[1] = mcPart.fDaughter[1]; 
-
 }
 
 AliAODMCParticle& AliAODMCParticle::operator=(const AliAODMCParticle& mcPart)
@@ -110,6 +111,7 @@ AliAODMCParticle& AliAODMCParticle::operator=(const AliAODMCParticle& mcPart)
     fVx         = mcPart.fVx;
     fVy         = mcPart.fVy;
     fVz         = mcPart.fVz;
+    fVt         = mcPart.fVt;
     fDaughter[0] = mcPart.fDaughter[0]; 
     fDaughter[1] = mcPart.fDaughter[1]; 
   }  
@@ -139,13 +141,16 @@ Short_t AliAODMCParticle::Charge()     const
     }
 }
 
-void AliAODMCParticle::Print(const Option_t *opt) const {
+void AliAODMCParticle::Print(const Option_t */*opt*/) const {
+// Print particle information
   if(TDatabasePDG::Instance()->GetParticle(fPdgCode)){
     Printf(">>> PDG (%d) : %s",fPdgCode,TDatabasePDG::Instance()->GetParticle(fPdgCode)->GetName());
   }
   else{
     Printf(">>> PDG (%d) : %s",fPdgCode,"Unknown");
   }
-  Printf(">>  P(%3.3f,%3.3f,%3.3f) V((%3.3f,%3.3f,%3.3f)",fPx,fPy,fPz,fVx,fVy,fVz);  
-  Printf(">   Mother %d, First Daughter %d Last Daughter %d Process %d",fMother,fDaughter[0],fDaughter[1],TObject::GetUniqueID());
+  Printf(">>  P(%3.3f,%3.3f,%3.3f) V((%3.3f,%3.3f,%3.3f,%3.3f)",fPx,fPy,fPz,fVx,fVy,fVz,fVt);  
+  Printf(">   Mother %d, First Daughter %d Last Daughter %d , Status %d, PhysicalPrimary %d",
+        fMother,fDaughter[0],fDaughter[1],GetStatus(),
+        IsPhysicalPrimary());
 }