Changes required by Effective C++

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

diff --git a/STEER/AliESD.cxx b/STEER/AliESD.cxx
index d0dde6b0b08bb1f9786176153889d899d798ecd7..246674900a2566ae5d25573d9bfdd3144a1d0312 100644 (file)
--- a/STEER/AliESD.cxx
+++ b/STEER/AliESD.cxx
@@ -31,7 +31,8 @@ ClassImp(AliESD)
 AliESD::AliESD():
   fEventNumber(0),
   fRunNumber(0),
-  fTrigger(0),
+  fTriggerMask(0),
+  fTriggerCluster(0),
   fRecoVersion(0),
   fMagneticField(0),
   fZDCN1Energy(0),
@@ -41,8 +42,10 @@ AliESD::AliESD():
   fZDCEMEnergy(0),
   fZDCParticipants(0),
   fT0zVertex(0),
-  fT0timeStart(0),
+  fSPDVertex(),
   fPrimaryVertex(),
+  fSPDMult(),
+  fT0timeStart(0),
   fTracks("AliESDtrack",15000),
   fHLTConfMapTracks("AliESDHLTtrack",25000),
   fHLTHoughTracks("AliESDHLTtrack",15000),
@@ -65,6 +68,99 @@ AliESD::AliESD():
     fT0amplitude[i] = 0;
   }
 }
+//______________________________________________________________________________
+AliESD::AliESD(const AliESD& esd):
+  TObject(esd),
+  fEventNumber(esd.fEventNumber),
+  fRunNumber(esd.fRunNumber),
+  fTriggerMask(esd.fTriggerMask),
+  fTriggerCluster(esd.fTriggerCluster),
+  fRecoVersion(esd.fRecoVersion),
+  fMagneticField(esd.fMagneticField),
+  fZDCN1Energy(esd.fZDCN1Energy),
+  fZDCP1Energy(esd.fZDCP1Energy),
+  fZDCN2Energy(esd.fZDCN2Energy),
+  fZDCP2Energy(esd.fZDCP2Energy),
+  fZDCEMEnergy(esd.fZDCEMEnergy),
+  fZDCParticipants(esd.fZDCParticipants),
+  fT0zVertex(esd.fT0zVertex),
+  fSPDVertex(esd.fSPDVertex),
+  fPrimaryVertex(esd.fPrimaryVertex),
+  fSPDMult(esd.fSPDMult),
+  fT0timeStart(esd.fT0timeStart),
+  fTracks(*((TClonesArray*)esd.fTracks.Clone())),
+  fHLTConfMapTracks(*((TClonesArray*)esd.fHLTConfMapTracks.Clone())),
+  fHLTHoughTracks(*((TClonesArray*)esd.fHLTHoughTracks.Clone())),
+  fMuonTracks(*((TClonesArray*)esd.fMuonTracks.Clone())),
+  fPmdTracks(*((TClonesArray*)esd.fPmdTracks.Clone())),
+  fTrdTracks(*((TClonesArray*)esd.fTrdTracks.Clone())),
+  fV0s(*((TClonesArray*)esd.fV0s.Clone())),  
+  fCascades(*((TClonesArray*)esd.fCascades.Clone())),
+  fKinks(*((TClonesArray*)esd.fKinks.Clone())),
+  fV0MIs(*((TClonesArray*)esd.fV0MIs.Clone())),
+  fCaloClusters(*((TClonesArray*)esd.fCaloClusters.Clone())),
+  fEMCALClusters(esd.fEMCALClusters), 
+  fFirstEMCALCluster(esd.fFirstEMCALCluster),
+  fPHOSClusters(esd.fPHOSClusters), 
+  fFirstPHOSCluster(esd.fFirstPHOSCluster),
+  fESDFMD(esd.fESDFMD)
+{
+  for (Int_t i=0; i<24; i++) {
+    fT0time[i] = esd.fT0time[i];
+    fT0amplitude[i] = esd.fT0amplitude[i];
+  }
+}
+
+//______________________________________________________________________________
+AliESD & AliESD::operator=(const AliESD& source) {
+
+  // Assignment operator
+
+  if(&source == this) return *this;
+
+  fEventNumber = source.fEventNumber;
+  fRunNumber = source.fRunNumber;
+  fTriggerMask = source.fTriggerMask;
+  fTriggerCluster = source.fTriggerCluster;
+  fRecoVersion = source.fRecoVersion;
+  fMagneticField = source.fMagneticField;
+  fZDCN1Energy = source.fZDCN1Energy;
+  fZDCP1Energy = source.fZDCP1Energy;
+  fZDCN2Energy = source.fZDCN2Energy;
+  fZDCP2Energy = source.fZDCP2Energy;
+  fZDCEMEnergy = source.fZDCEMEnergy;
+  fZDCParticipants = source.fZDCParticipants;
+  fT0zVertex = source.fT0zVertex;
+  fSPDVertex = source.fSPDVertex;
+  fPrimaryVertex = source.fPrimaryVertex;
+  fSPDMult = source.fSPDMult;
+  fT0timeStart = source.fT0timeStart;
+  fTracks = *((TClonesArray*)source.fTracks.Clone());
+  fHLTConfMapTracks = *((TClonesArray*)source.fHLTConfMapTracks.Clone());
+  fHLTHoughTracks = *((TClonesArray*)source.fHLTHoughTracks.Clone());
+  fMuonTracks = *((TClonesArray*)source.fMuonTracks.Clone());
+  fPmdTracks = *((TClonesArray*)source.fPmdTracks.Clone());
+  fTrdTracks = *((TClonesArray*)source.fTrdTracks.Clone());
+  fV0s = *((TClonesArray*)source.fV0s.Clone());
+  fCascades = *((TClonesArray*)source.fCascades.Clone());
+  fKinks = *((TClonesArray*)source.fKinks.Clone());
+  fV0MIs = *((TClonesArray*)source.fV0MIs.Clone());
+  fCaloClusters = *((TClonesArray*)source.fCaloClusters.Clone());
+  fEMCALClusters = source.fEMCALClusters;
+  fFirstEMCALCluster = source.fFirstEMCALCluster;
+  fPHOSClusters = source.fPHOSClusters;
+  fFirstPHOSCluster = source.fFirstPHOSCluster;
+  fESDFMD = source.fESDFMD;
+
+  for (Int_t i=0; i<24; i++) {
+    fT0time[i] = source.fT0time[i];
+    fT0amplitude[i] = source.fT0amplitude[i];
+  }
+
+  return *this;
+
+}
+
 
 //______________________________________________________________________________
 AliESD::~AliESD()
@@ -111,7 +207,8 @@ void AliESD::Reset()
 {
   fEventNumber=0;
   fRunNumber=0;
-  fTrigger=0;
+  fTriggerMask=0;
+  fTriggerCluster=0;
   fRecoVersion=0;
   fMagneticField=0;
   fZDCN1Energy=0;
@@ -122,7 +219,9 @@ void AliESD::Reset()
   fZDCParticipants=0;
   fT0zVertex=0;
   fT0timeStart = 0;
-  fPrimaryVertex.Reset();
+  new (&fSPDVertex) AliESDVertex();
+  new (&fPrimaryVertex) AliESDVertex();
+  new (&fSPDMult) AliMultiplicity();
   fTracks.Clear();
   fHLTConfMapTracks.Clear();
   fHLTHoughTracks.Clear();
@@ -146,31 +245,33 @@ void AliESD::Print(Option_t *) const
   // Print header information of the event
   //
   printf("ESD run information\n");
-  printf("Event # %d Run # %d Trigger %ld Magnetic field %f \n",
+  printf("Event # %d Run # %d Trigger %lld Magnetic field %f \n",
         GetEventNumber(),
         GetRunNumber(),
-        GetTrigger(),
+        GetTriggerMask(),
         GetMagneticField() );
-  printf("Vertex: (%.4f +- %.4f, %.4f +- %.4f, %.4f +- %.4f) cm\n",
-        fPrimaryVertex.GetXv(), fPrimaryVertex.GetXRes(),
-        fPrimaryVertex.GetYv(), fPrimaryVertex.GetYRes(),
-        fPrimaryVertex.GetZv(), fPrimaryVertex.GetZRes());
+    printf("Vertex: (%.4f +- %.4f, %.4f +- %.4f, %.4f +- %.4f) cm\n",
+          fPrimaryVertex.GetXv(), fPrimaryVertex.GetXRes(),
+          fPrimaryVertex.GetYv(), fPrimaryVertex.GetYRes(),
+          fPrimaryVertex.GetZv(), fPrimaryVertex.GetZRes());
+    printf("SPD Multiplicity. Number of tracklets %d \n",
+           fSPDMult.GetNumberOfTracklets());
   printf("Event from reconstruction version %d \n",fRecoVersion);
   printf("Number of tracks: \n");
   printf("                 charged   %d\n", GetNumberOfTracks());
   printf("                 hlt CF    %d\n", GetNumberOfHLTConfMapTracks());
   printf("                 hlt HT    %d\n", GetNumberOfHLTHoughTracks());
-  printf("                 phos      %d\n", GetNumberOfPHOSClusters());
-  printf("                 emcal     %d\n", GetNumberOfEMCALClusters());
   printf("                 muon      %d\n", GetNumberOfMuonTracks());
   printf("                 pmd       %d\n", GetNumberOfPmdTracks());
   printf("                 trd       %d\n", GetNumberOfTrdTracks());
   printf("                 v0        %d\n", GetNumberOfV0s());
-  printf("                 cascades  %d\n)", GetNumberOfCascades());
-  printf("                 kinks     %d\n)", GetNumberOfKinks());
-  printf("                 V0MIs     %d\n)", GetNumberOfV0MIs());
-  printf("                 CaloClusters %d\n)", GetNumberOfCaloClusters());
-  printf("                 FMD       %s\n)", (fESDFMD ? "yes" : "no"));
+  printf("                 cascades  %d\n", GetNumberOfCascades());
+  printf("                 kinks     %d\n", GetNumberOfKinks());
+  printf("                 V0MIs     %d\n", GetNumberOfV0MIs());
+  printf("                 CaloClusters %d\n", GetNumberOfCaloClusters());
+  printf("                 phos      %d\n", GetNumberOfPHOSClusters());
+  printf("                 emcal     %d\n", GetNumberOfEMCALClusters());
+  printf("                 FMD       %s\n", (fESDFMD ? "yes" : "no"));
 }
 
 void AliESD::SetESDfriend(const AliESDfriend *ev) {