Merge branch 'master' of https://git.cern.ch/reps/AliRoot

[u/mrichter/AliRoot.git] / PWGHF / hfe / AliHFEreducedEvent.cxx

diff --git a/PWGHF/hfe/AliHFEreducedEvent.cxx b/PWGHF/hfe/AliHFEreducedEvent.cxx
index a01a827a6f2aae398c5c847dd6f08cdc7b8d828b..e40acf220f323ab54632332cc8c5888d3d09a87f 100644 (file)
--- a/PWGHF/hfe/AliHFEreducedEvent.cxx
+++ b/PWGHF/hfe/AliHFEreducedEvent.cxx
@@ -36,11 +36,8 @@ TObject(),
   fNmcparticles(0),
   fRunNumber(0),
   fTrigger(0),
-  fVX(0.),
-  fVY(0.),
-  fVZ(0.),
-  fNContrib(0),
-  fSPDMultiplicity(0)
+  fSPDMultiplicity(0),
+  fPileupFlag(kFALSE)
 {
   //
   // Default constructor
@@ -49,9 +46,18 @@ TObject(),
   fTracks->SetOwner();
   fMCparticles = new TObjArray;
   fMCparticles->SetOwner();
-  memset(fCentrality, 0, sizeof(Float_t) * 6);
+  memset(fCentrality, 0, sizeof(Float_t) * kCentBuff);
   memset(fV0Multiplicity, 0, sizeof(Float_t) * 2);
   memset(fZDCEnergy, 0, sizeof(Float_t) * 4);
+  memset(fVX, 0, sizeof(Float_t)*2);
+  memset(fVY, 0, sizeof(Float_t)*2);
+  memset(fVZ, 0, sizeof(Float_t)*2);
+  memset(fVMC, 0, sizeof(Double_t)*3);
+  memset(fNContrib, 0, sizeof(Int_t) * 2);
+  fVertexResolution[1] = 999.;
+  fVertexResolution[0] = fVertexResolution[1];
+  fVertexDispersion[0] = 999.;
+  fVertexDispersion[1] = fVertexDispersion[0];
 }
 
 //_______________________________________
@@ -63,11 +69,8 @@ AliHFEreducedEvent::AliHFEreducedEvent(const AliHFEreducedEvent &ref):
   fNmcparticles(ref.fNmcparticles),
   fRunNumber(ref.fRunNumber),
   fTrigger(ref.fTrigger),
-  fVX(ref.fVX),
-  fVY(ref.fVY),
-  fVZ(ref.fVZ),
-  fNContrib(ref.fNContrib),
-  fSPDMultiplicity(ref.fSPDMultiplicity)
+  fSPDMultiplicity(ref.fSPDMultiplicity),
+  fPileupFlag(ref.fPileupFlag)
 {
   //
   // Copy constructor
@@ -80,9 +83,16 @@ AliHFEreducedEvent::AliHFEreducedEvent(const AliHFEreducedEvent &ref):
   fMCparticles->SetOwner();
   for(int iprt = 0; iprt < ref.GetNumberOfMCParticles(); iprt++)
     fMCparticles->Add(new AliHFEreducedMCParticle(*(ref.GetMCParticle(iprt))));
-  memcpy(fCentrality, ref.fCentrality, sizeof(Float_t) * 6);
+  memcpy(fCentrality, ref.fCentrality, sizeof(Float_t) * kCentBuff);
   memcpy(fV0Multiplicity, ref.fV0Multiplicity, sizeof(Float_t) * 2);
   memcpy(fZDCEnergy, ref.fZDCEnergy, sizeof(Float_t) *4);
+  memcpy(fVX, ref.fVX, sizeof(Float_t)*2);
+  memcpy(fVY, ref.fVY, sizeof(Float_t)*2);
+  memcpy(fVZ, ref.fVZ, sizeof(Float_t)*2);
+  memcpy(fVMC, ref.fVMC, sizeof(Double_t)*3);
+  memcpy(fVertexResolution, ref.fVertexResolution, sizeof(Float_t)*2);
+  memcpy(fVertexDispersion, ref.fVertexDispersion, sizeof(Float_t)*2);
+  memcpy(fNContrib, ref.fNContrib, sizeof(Int_t) * 2);
 }
 
 //_______________________________________
@@ -104,11 +114,16 @@ AliHFEreducedEvent &AliHFEreducedEvent::operator=(const AliHFEreducedEvent &ref)
     fNmcparticles = ref.fNmcparticles;
     fRunNumber = ref.fRunNumber;
     fTrigger = ref.fTrigger;
-    fVX = ref.fVX;
-    fVY = ref.fVY;
-    fVZ = ref.fVZ;
+    memcpy(fVX, ref.fVX, sizeof(Float_t)*2);
+    memcpy(fVY, ref.fVY, sizeof(Float_t)*2);
+    memcpy(fVZ, ref.fVZ, sizeof(Float_t)*2);
+    memcpy(fVMC, ref.fVMC, sizeof(Double_t)*3);
+    memcpy(fNContrib, ref.fNContrib, sizeof(Int_t) * 2);
+    memcpy(fVertexResolution, ref.fVertexResolution, sizeof(Float_t)*2);
+    memcpy(fVertexDispersion, ref.fVertexDispersion, sizeof(Float_t)*2);
     fSPDMultiplicity = ref.fSPDMultiplicity;
-    memcpy(fCentrality, ref.fCentrality, sizeof(Float_t) * 6);
+    fPileupFlag = ref.fPileupFlag;
+    memcpy(fCentrality, ref.fCentrality, sizeof(Float_t) * kCentBuff);
     memcpy(fV0Multiplicity, ref.fV0Multiplicity, sizeof(Float_t) * 2);
     memcpy(fZDCEnergy, ref.fZDCEnergy, sizeof(Float_t) *4);
   }