X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliESDCaloCluster.cxx;h=4c411ae4947a966844e701aaa118c195f622d97c;hb=58e1d4edca9e8b4255ce184ec1452e9d82668423;hp=78f6efa5ea3dbc6ccf6f9f55cf556bc97921cec0;hpb=e649177a7ba040c8e27382914e7378178e56de12;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliESDCaloCluster.cxx b/STEER/AliESDCaloCluster.cxx
index 78f6efa5ea3..4c411ae4947 100644
--- a/STEER/AliESDCaloCluster.cxx
+++ b/STEER/AliESDCaloCluster.cxx
@@ -45,12 +45,11 @@ AliESDCaloCluster::AliESDCaloCluster() :
   fChi2(0),
   fM20(0),
   fM02(0),
-  fM11(0),
   fEmcCpvDistance(1024),
   fDistToBadChannel(1024),
   fID(0),
   fNExMax(0),
-  fClusterType(kUndef)
+  fClusterType(kUndef), fTOF(0.)
 {
   //
   // The default ESD constructor 
@@ -75,12 +74,12 @@ AliESDCaloCluster::AliESDCaloCluster(const AliESDCaloCluster& clus) :
   fChi2(clus.fChi2),
   fM20(clus.fM20),
   fM02(clus.fM02),
-  fM11(clus.fM11),
   fEmcCpvDistance(clus.fEmcCpvDistance),
   fDistToBadChannel(clus.fDistToBadChannel),
   fID(clus.fID),
   fNExMax(clus.fNExMax),
-  fClusterType(clus.fClusterType)
+  fClusterType(clus.fClusterType),
+  fTOF(clus.fTOF)
 {
   //
   // The copy constructor 
@@ -116,75 +115,136 @@ AliESDCaloCluster &AliESDCaloCluster::operator=(const AliESDCaloCluster& source)
 
   if(&source == this) return *this;
   TObject::operator=(source);
-
   fGlobalPos[0] = source.fGlobalPos[0];
   fGlobalPos[1] = source.fGlobalPos[1];
   fGlobalPos[2] = source.fGlobalPos[2];
 
-
   fEnergy = source.fEnergy;
   fDispersion = source.fDispersion;
   fChi2 = source.fChi2;
   fM20 = source.fM20;
   fM02 = source.fM02;
-  fM11 = source.fM11;
   fEmcCpvDistance = source.fEmcCpvDistance;
   fDistToBadChannel = source.fDistToBadChannel ;
   for(Int_t i=0; i<AliPID::kSPECIESN; i++) fPID[i] = source.fPID[i];
   fID = source.fID;
 
-  fNCells= source. fNCells;
+  fNCells= source.fNCells;
+
   if (source.fNCells > 0) {
-    
     if(source.fCellsAbsId){
-      fCellsAbsId = new UShort_t[source.fNCells];
-      for (Int_t i=0; i<source.fNCells; i++)
+      if(fNCells != source.fNCells||!fCellsAbsId){
+	if(fCellsAbsId)delete [] fCellsAbsId;
+	fCellsAbsId = new UShort_t[source.fNCells];
+      }
+      for (Int_t i=0; i<source.fNCells; i++){
 	fCellsAbsId[i]=source.fCellsAbsId[i];
+      }
     }
     
     if(source.fCellsAmpFraction){
-      fCellsAmpFraction = new Double32_t[source.fNCells];
+      if(fNCells != source.fNCells||!fCellsAmpFraction){
+	if(fCellsAmpFraction) delete [] fCellsAmpFraction;
+	fCellsAmpFraction = new Double32_t[source.fNCells];
+      }
       for (Int_t i=0; i<source.fNCells; i++)
 	fCellsAmpFraction[i]=source.fCellsAmpFraction[i];
-    }
-    
+    }  
   }
 
   fNExMax = source.fNExMax;
   fClusterType = source.fClusterType;
+  fTOF = source.fTOF;
 
   //not in use
-  delete fTracksMatched;
-  fTracksMatched = source.fTracksMatched?new TArrayI(*source.fTracksMatched):0x0;
-  delete fLabels;
-  fLabels = source.fLabels?new TArrayI(*source.fLabels):0x0;
-  
-  delete fDigitAmplitude;
-  fDigitAmplitude = source.fDigitAmplitude?new TArrayS(*source.fDigitAmplitude):0x0;
-  
-  delete fDigitTime;
-  fDigitTime = source.fDigitTime?new TArrayS(*source.fDigitTime):0x0;
-  
-  delete fDigitIndex;
-  fDigitIndex = source.fDigitIndex?new TArrayS(*source.fDigitIndex):0x0;
+  if(source.fTracksMatched){
+    // assign or copy construct
+    if(fTracksMatched){
+      *fTracksMatched = *source.fTracksMatched;
+    }
+    else fTracksMatched = new TArrayI(*source.fTracksMatched);
+  }
+  else{
+    if(fTracksMatched)delete fTracksMatched;
+    fTracksMatched = 0;
+  }
+
+  if(source.fLabels){
+    // assign or copy construct
+    if(fLabels){ 
+      *fLabels = *source.fLabels;
+    }
+    else fLabels = new TArrayI(*source.fLabels);
+  }
+  else{
+    if(fLabels)delete fLabels;
+    fLabels = 0;
+  }
+
+
+  if(source.fDigitAmplitude){
+    // assign or copy construct
+    if(fDigitAmplitude) *fDigitAmplitude = *source.fDigitAmplitude;
+    else fDigitAmplitude = new TArrayS(*source.fDigitAmplitude);
+   }
+  else{
+    delete fDigitAmplitude;
+    fDigitAmplitude = 0;
+  }
+
+
+
+  if(source.fDigitTime){
+    // assign or copy construct
+    if(fDigitTime) *fDigitTime = *source.fDigitTime;
+    else fDigitTime = new TArrayS(*source.fDigitTime);
+  }
+  else{
+    delete fDigitTime;
+    fDigitTime = 0;
+  }
+
+
+
+  if(source.fDigitIndex){
+    // assign or copy construct
+    if(fDigitIndex) *fDigitIndex = *source.fDigitIndex;
+    else fDigitIndex = new TArrayS(*source.fDigitIndex);
+  }
+  else{
+    delete fDigitIndex;
+    fDigitIndex = 0;
+  }
   
   return *this;
 
 }
 
+void AliESDCaloCluster::Copy(TObject &obj) const {
+  
+  // this overwrites the virtual TOBject::Copy()
+  // to allow run time copying without casting
+  // in AliESDEvent
+
+  if(this==&obj)return;
+  AliESDCaloCluster *robj = dynamic_cast<AliESDCaloCluster*>(&obj);
+  if(!robj)return; // not an AliESDCluster
+  *robj = *this;
+
+}
 
 //_______________________________________________________________________
 AliESDCaloCluster::~AliESDCaloCluster(){ 
   //
   // This is destructor according Coding Conventions 
   //
-  delete fTracksMatched;
-  delete fLabels;
+  if(fTracksMatched)delete fTracksMatched;fTracksMatched = 0;
+  if(fLabels) delete fLabels; fLabels = 0;
   delete fDigitAmplitude;  //not in use
   delete fDigitTime;  //not in use
   delete fDigitIndex;  //not in use
-  if(fCellsAmpFraction) delete[] fCellsAmpFraction; fCellsAmpFraction=0;
-  if(fCellsAbsId) delete[] fCellsAbsId;  fCellsAbsId = 0;
+  if(fCellsAmpFraction){ delete[] fCellsAmpFraction; fCellsAmpFraction=0;}
+  if(fCellsAbsId){ delete[] fCellsAbsId;  fCellsAbsId = 0;}
 }
 
 //_______________________________________________________________________
@@ -239,3 +299,23 @@ void AliESDCaloCluster::GetMomentum(TLorentzVector& p, Double_t *vertex ) {
   p.SetPxPyPzE( fEnergy*fGlobalPos[0]/r,  fEnergy*fGlobalPos[1]/r,  fEnergy*fGlobalPos[2]/r,  fEnergy) ; 
   
 }
+
+//_______________________________________________________________________
+void  AliESDCaloCluster::SetCellsAbsId(UShort_t *array)
+{
+    //  Set the array of cell absId numbers 
+    if (fNCells) {
+	fCellsAbsId = new  UShort_t[fNCells];
+	for (Int_t i = 0; i < fNCells; i++) fCellsAbsId[i] = array[i];
+    }
+}
+
+//_______________________________________________________________________
+void  AliESDCaloCluster::SetCellsAmplitudeFraction(Double32_t *array)
+{
+    //  Set the array of cell amplitude fraction
+    if (fNCells) {
+	fCellsAmpFraction = new  Double32_t[fNCells];
+	for (Int_t i = 0; i < fNCells; i++) fCellsAmpFraction[i] = array[i];
+    }
+}