New class AliESDEvent, backward compatibility with the old AliESD (Christian)

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

diff --git a/STEER/AliESD.cxx b/STEER/AliESD.cxx
index b24e1932d4a25d672517c66a8fa0a709dee3c59e..75280b02fd33371319c329357523d937eeda438c 100644 (file)
--- a/STEER/AliESD.cxx
+++ b/STEER/AliESD.cxx
@@ -29,8 +29,13 @@ ClassImp(AliESD)
 
 //______________________________________________________________________________
 AliESD::AliESD():
-  fEventNumber(0),
+  fEventNumberInFile(0),
+  fBunchCrossNumber(0),
+  fOrbitNumber(0),
+  fPeriodNumber(0),
   fRunNumber(0),
+  fTimeStamp(0),
+  fEventType(0),
   fTriggerMask(0),
   fTriggerCluster(0),
   fRecoVersion(0),
@@ -58,20 +63,34 @@ AliESD::AliESD():
   fCaloClusters("AliESDCaloCluster",10000),
   fEMCALClusters(0), 
   fFirstEMCALCluster(-1),
+  fEMCALTriggerPosition(0x0),
+  fEMCALTriggerAmplitudes(0x0),
   fPHOSClusters(0), 
   fFirstPHOSCluster(-1),
-  fESDFMD(0x0)
+  fPHOSTriggerPosition(0x0),
+  fPHOSTriggerAmplitudes(0x0),
+  fESDFMD(0x0),
+  fESDVZERO(0x0),
+  fErrorLogs("AliRawDataErrorLog",5)
+
 {
   for (Int_t i=0; i<24; i++) {
     fT0time[i] = 0;
     fT0amplitude[i] = 0;
   }
+  for (Int_t i=0; i<2; i++) fDiamondXY[i]=0.;
+  for (Int_t i=0; i<3; i++) fDiamondCovXY[i]=0.;
 }
 //______________________________________________________________________________
 AliESD::AliESD(const AliESD& esd):
   TObject(esd),
-  fEventNumber(esd.fEventNumber),
+  fEventNumberInFile(esd.fEventNumberInFile),
+  fBunchCrossNumber(esd.fBunchCrossNumber),
+  fOrbitNumber(esd.fOrbitNumber),
+  fPeriodNumber(esd.fPeriodNumber),
   fRunNumber(esd.fRunNumber),
+  fTimeStamp(esd.fTimeStamp),
+  fEventType(esd.fEventType),
   fTriggerMask(esd.fTriggerMask),
   fTriggerCluster(esd.fTriggerCluster),
   fRecoVersion(esd.fRecoVersion),
@@ -99,14 +118,22 @@ AliESD::AliESD(const AliESD& esd):
   fCaloClusters(*((TClonesArray*)esd.fCaloClusters.Clone())),
   fEMCALClusters(esd.fEMCALClusters), 
   fFirstEMCALCluster(esd.fFirstEMCALCluster),
+  fEMCALTriggerPosition(esd. fEMCALTriggerPosition),
+  fEMCALTriggerAmplitudes(esd.fEMCALTriggerAmplitudes),
   fPHOSClusters(esd.fPHOSClusters), 
   fFirstPHOSCluster(esd.fFirstPHOSCluster),
-  fESDFMD(esd.fESDFMD)
+  fPHOSTriggerPosition(esd.fPHOSTriggerPosition),
+  fPHOSTriggerAmplitudes(esd.fPHOSTriggerAmplitudes),
+  fESDFMD(esd.fESDFMD),
+  fESDVZERO(esd.fESDVZERO),
+  fErrorLogs(*((TClonesArray*)esd.fErrorLogs.Clone()))
 {
   for (Int_t i=0; i<24; i++) {
     fT0time[i] = esd.fT0time[i];
     fT0amplitude[i] = esd.fT0amplitude[i];
   }
+  for (Int_t i=0; i<2; i++) fDiamondXY[i]=esd.fDiamondXY[i];
+  for (Int_t i=0; i<3; i++) fDiamondCovXY[i]=esd.fDiamondCovXY[i];
 }
 
 //______________________________________________________________________________
@@ -116,8 +143,13 @@ AliESD & AliESD::operator=(const AliESD& source) {
 
   if(&source == this) return *this;
 
-  fEventNumber = source.fEventNumber;
+  fEventNumberInFile = source.fEventNumberInFile;
+  fBunchCrossNumber = source.fBunchCrossNumber;
+  fOrbitNumber = source.fOrbitNumber;
+  fPeriodNumber = source.fPeriodNumber;
   fRunNumber = source.fRunNumber;
+  fTimeStamp   = source.fTimeStamp;
+  fEventType   = source.fEventType;
   fTriggerMask = source.fTriggerMask;
   fTriggerCluster = source.fTriggerCluster;
   fRecoVersion = source.fRecoVersion;
@@ -148,11 +180,19 @@ AliESD & AliESD::operator=(const AliESD& source) {
   fPHOSClusters = source.fPHOSClusters;
   fFirstPHOSCluster = source.fFirstPHOSCluster;
   fESDFMD = source.fESDFMD;
+  fESDVZERO = source.fESDVZERO;
+  fEMCALTriggerPosition=source. fEMCALTriggerPosition;
+  fEMCALTriggerAmplitudes=source.fEMCALTriggerAmplitudes;
+  fPHOSTriggerPosition=source.fPHOSTriggerPosition;
+  fPHOSTriggerAmplitudes=source.fPHOSTriggerAmplitudes;
+  fErrorLogs = *((TClonesArray*)source.fErrorLogs.Clone());
 
   for (Int_t i=0; i<24; i++) {
     fT0time[i] = source.fT0time[i];
     fT0amplitude[i] = source.fT0amplitude[i];
   }
+  for (Int_t i=0; i<2; i++) fDiamondXY[i]=source.fDiamondXY[i];
+  for (Int_t i=0; i<3; i++) fDiamondCovXY[i]=source.fDiamondCovXY[i];
 
   return *this;
 
@@ -176,13 +216,29 @@ AliESD::~AliESD()
   fKinks.Delete();
   fCaloClusters.Delete();
   delete fESDFMD;
+  delete fESDVZERO;
+//   fEMCALTriggerPosition->Delete();
+//   fEMCALTriggerAmplitudes->Delete();
+//   fPHOSTriggerPosition->Delete();
+//   fPHOSTriggerAmplitudes->Delete();
+//   delete fEMCALTriggerPosition;
+//   delete fEMCALTriggerAmplitudes;
+//   delete fPHOSTriggerPosition;
+//   delete fPHOSTriggerAmplitudes;
+  fErrorLogs.Delete();
+
 }
 
 //______________________________________________________________________________
 void AliESD::Reset()
 {
-  fEventNumber=0;
+  fEventNumberInFile=0;
+  fBunchCrossNumber=0;
+  fOrbitNumber=0;
+  fPeriodNumber=0;
   fRunNumber=0;
+  fTimeStamp = 0;
+  fEventType = 0;
   fTriggerMask=0;
   fTriggerCluster=0;
   fRecoVersion=0;
@@ -212,6 +268,11 @@ void AliESD::Reset()
   fPHOSClusters=0; 
   fFirstPHOSCluster=-1; 
   if (fESDFMD) fESDFMD->Clear();
+//   fEMCALTriggerPosition->Clear();
+//   fEMCALTriggerAmplitudes->Clear();
+//   fPHOSTriggerPosition->Clear();
+//   fPHOSTriggerAmplitudes->Clear();
+  fErrorLogs.Clear();
 }
 
 Int_t AliESD::AddV0(const AliESDv0 *v) {
@@ -219,8 +280,7 @@ Int_t AliESD::AddV0(const AliESDv0 *v) {
   // Add V0
   //
     Int_t idx=fV0s.GetEntriesFast();
-    AliESDv0 *v0=new(fV0s[idx]) AliESDv0(*v);
-    v0->SetID(idx);
+    new(fV0s[idx]) AliESDv0(*v);
     return idx;
 }  
 
@@ -231,8 +291,11 @@ void AliESD::Print(Option_t *) const
   // Print header information of the event
   //
   printf("ESD run information\n");
-  printf("Event # %d Run # %d Trigger %lld Magnetic field %f \n",
-        GetEventNumber(),
+  printf("Event # in file %d Bunch crossing # %d Orbit # %d Period # %d Run # %d Trigger %lld Magnetic field %f \n",
+        GetEventNumberInFile(),
+        GetBunchCrossNumber(),
+        GetOrbitNumber(),
+        GetPeriodNumber(),
         GetRunNumber(),
         GetTriggerMask(),
         GetMagneticField() );
@@ -240,6 +303,8 @@ void AliESD::Print(Option_t *) const
           fPrimaryVertex.GetXv(), fPrimaryVertex.GetXRes(),
           fPrimaryVertex.GetYv(), fPrimaryVertex.GetYRes(),
           fPrimaryVertex.GetZv(), fPrimaryVertex.GetZRes());
+    printf("Mean vertex in RUN: X=%.4f Y=%.4f cm\n",
+          GetDiamondX(),GetDiamondY());
     printf("SPD Multiplicity. Number of tracklets %d \n",
            fSPDMult.GetNumberOfTracklets());
   printf("Event from reconstruction version %d \n",fRecoVersion);
@@ -257,6 +322,7 @@ void AliESD::Print(Option_t *) const
   printf("                 phos      %d\n", GetNumberOfPHOSClusters());
   printf("                 emcal     %d\n", GetNumberOfEMCALClusters());
   printf("                 FMD       %s\n", (fESDFMD ? "yes" : "no"));
+  printf("                 VZERO     %s\n", (fESDVZERO ? "yes" : "no"));
 }
 
 void AliESD::SetESDfriend(const AliESDfriend *ev) {