Fix for deleting array of AliMixInputHandlerInfo objects, causes crash at the end...

[u/mrichter/AliRoot.git] / TPC / AliTPCRF1D.cxx

diff --git a/TPC/AliTPCRF1D.cxx b/TPC/AliTPCRF1D.cxx
index 6e267a61e5396ed28dc48c5af9cc4efc41fc14c8..91828b17c80fbfe41906d92f2994591f7fa92811 100644 (file)
--- a/TPC/AliTPCRF1D.cxx
+++ b/TPC/AliTPCRF1D.cxx
@@ -108,49 +108,59 @@ AliTPCRF1D::AliTPCRF1D(Bool_t direct,Int_t np,Float_t step)
 
 AliTPCRF1D::AliTPCRF1D(const AliTPCRF1D &prf)
            :TObject(prf),
-           fNRF(0),
-            fDSTEPM1(0.),
+           fNRF(prf.fNRF),
+            fDSTEPM1(prf.fDSTEPM1),
             fcharge(0),
-            forigsigma(0.),
-            fpadWidth(3.5),
-            fkNorm(0.5),
-            fInteg(0.),
-            fGRF(0),
-            fSigma(0.),
-            fOffset(0.),
-            fDirect(kFALSE),
-            fPadDistance(0.)
+            forigsigma(prf.forigsigma),
+            fpadWidth(prf.fpadWidth),
+            fkNorm(prf.fkNorm),
+            fInteg(prf.fInteg),
+            fGRF(new TF1(*(prf.fGRF))),
+            fSigma(prf.fSigma),
+            fOffset(prf.fOffset),
+            fDirect(prf.fDirect),
+            fPadDistance(prf.fPadDistance)
 {
-  
   //
-  memcpy(this, &prf, sizeof(prf)); 
+  //
+  for(Int_t i=0;i<5;i++) {
+    funParam[i]=0.;
+    fType[i]=0;
+  }
   fcharge = new Float_t[fNRF];
-  memcpy(fcharge,prf.fcharge, fNRF);
-  fGRF = new TF1(*(prf.fGRF));
+  memcpy(fcharge,prf.fcharge, fNRF*sizeof(Float_t));
+
   //PH Change the name (add 0 to the end)
   TString s(fGRF->GetName());
   s+="0";
   fGRF->SetName(s.Data());
-  for(Int_t i=0;i<5;i++) {
-    funParam[i]=0.;
-    fType[i]=0;
-  }
 }
 
 AliTPCRF1D & AliTPCRF1D::operator = (const AliTPCRF1D &prf)
 {
-  //  
-  if (fcharge) delete fcharge;
-  if (fGRF) delete fGRF;
-  memcpy(this, &prf, sizeof(prf)); 
-  fcharge = new Float_t[fNRF];
-  memcpy(fcharge,prf.fcharge, fNRF);
-  fGRF = new TF1(*(prf.fGRF));
+  if(this!=&prf) {
+    TObject::operator=(prf);
+    fNRF=prf.fNRF;
+    fDSTEPM1=prf.fDSTEPM1;
+    delete [] fcharge;
+    fcharge = new Float_t[fNRF];
+    memcpy(fcharge,prf.fcharge, fNRF*sizeof(Float_t));
+    forigsigma=prf.forigsigma;
+    fpadWidth=prf.fpadWidth;
+    fkNorm=prf.fkNorm;
+    fInteg=prf.fInteg;
+    delete fGRF;
+    fGRF=new TF1(*(prf.fGRF));
    //PH Change the name (add 0 to the end)
-  TString s(fGRF->GetName());
-  s+="0";
-  fGRF->SetName(s.Data());
-  return (*this);
+    TString s(fGRF->GetName());
+    s+="0";
+    fGRF->SetName(s.Data());
+    fSigma=prf.fSigma;
+    fOffset=prf.fOffset;
+    fDirect=prf.fDirect;
+    fPadDistance=prf.fPadDistance;
+  }
+  return *this;
 }
 
 
@@ -158,8 +168,8 @@ AliTPCRF1D & AliTPCRF1D::operator = (const AliTPCRF1D &prf)
 AliTPCRF1D::~AliTPCRF1D()
 {
   //
-  if (fcharge!=0) delete [] fcharge;
-  if (fGRF !=0 ) fGRF->Delete();
+  delete [] fcharge;
+  delete fGRF;
 }
 
 Float_t AliTPCRF1D::GetRF(Float_t xin)
@@ -199,7 +209,7 @@ void AliTPCRF1D::SetParam( TF1 * GRF,Float_t padwidth,
    forigsigma=sigma;
    fDSTEPM1 = 10/TMath::Sqrt(sigma*sigma+fpadWidth*fpadWidth/12); 
    //sprintf(fType,"User");
-   snprintf(fType,6,"User");
+   snprintf(fType,5,"User");
    //   Update();   
 }
   
@@ -220,7 +230,7 @@ void AliTPCRF1D::SetGauss(Float_t sigma, Float_t padWidth,
    fDSTEPM1 = 10./TMath::Sqrt(sigma*sigma+fpadWidth*fpadWidth/12); 
   //by default I set the step as one tenth of sigma  
   //sprintf(fType,"Gauss");
-   snprintf(fType,6,"Gauss");
+   snprintf(fType,5,"Gauss");
 }
 
 void AliTPCRF1D::SetCosh(Float_t sigma, Float_t padWidth,
@@ -239,7 +249,7 @@ void AliTPCRF1D::SetCosh(Float_t sigma, Float_t padWidth,
   fDSTEPM1 = 10./TMath::Sqrt(sigma*sigma+fpadWidth*fpadWidth/12); 
   //by default I set the step as one tenth of sigma
   //sprintf(fType,"Cosh");
-  snprintf(fType,6,"Cosh");
+  snprintf(fType,5,"Cosh");
 }
 
 void AliTPCRF1D::SetGati(Float_t K3, Float_t padDistance, Float_t padWidth,
@@ -259,7 +269,7 @@ void AliTPCRF1D::SetGati(Float_t K3, Float_t padDistance, Float_t padWidth,
   fDSTEPM1 = 10./TMath::Sqrt(padDistance*padDistance+fpadWidth*fpadWidth/12); 
   //by default I set the step as one tenth of sigma
   //sprintf(fType,"Gati");
-  snprintf(fType,6,"Gati");
+  snprintf(fType,5,"Gati");
 }