X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSstatistics2.cxx;h=00391fa52c698e28fcada664a4ecdaf17b2a3a8f;hb=b82b47f906199a3e40bdd771d7637c99d8bd6c13;hp=4dbb867b84b7dbbc706c5d0ae96e7a6fd213551b;hpb=b0f5e3fcf84ecedb50df35ebe629b44bafc15bc0;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSstatistics2.cxx b/ITS/AliITSstatistics2.cxx
index 4dbb867b84b..00391fa52c6 100644
--- a/ITS/AliITSstatistics2.cxx
+++ b/ITS/AliITSstatistics2.cxx
@@ -18,10 +18,10 @@ AliITSstatistics2::AliITSstatistics2() : TObject(){
 //
 // default constructor
 //
-    fx  = 0;
-    fy  = 0;
-    fyx = 0;
-    fw  = 0;
+    fX  = 0;
+    fY  = 0;
+    fYx = 0;
+    fW  = 0;
     fN  = 0;
     fOrder = 0;
     return;
@@ -32,14 +32,13 @@ AliITSstatistics2::AliITSstatistics2(Int_t order) : TObject(){
 //
 // constructor to maximum moment/order order
 //
-    Int_t i;
     fOrder = order;
-    fx     = new Double_t[order];
-    fy     = new Double_t[order];
-    fyx    = new Double_t[order];
-    fw     = new Double_t[order];
-    for(i=0;i<order;i++) {fx[i] = 0.0;fy[i] = 0.0;
-                          fyx[i] = 0.0; fw[i] = 0.0;}
+    fX     = new Double_t[order];
+    fY     = new Double_t[order];
+    fYx    = new Double_t[order];
+    fW     = new Double_t[order];
+    for(Int_t i=0;i<order;i++) {fX[i] = 0.0;fY[i] = 0.0;
+                                fYx[i] = 0.0; fW[i] = 0.0;}
     fN = 0;
     return;
 }
@@ -48,14 +47,14 @@ AliITSstatistics2::~AliITSstatistics2(){
 //
 // destructor
 //
-    if(fx!=0)  delete[] fx;
-    if(fy!=0)  delete[] fy;
-    if(fyx!=0) delete[] fyx;
-    if(fw!=0)  delete[] fw;
-    fx  = 0;
-    fy  = 0;
-    fyx = 0;
-    fw  = 0;
+    if(fX!=0)  delete[] fX;
+    if(fY!=0)  delete[] fY;
+    if(fYx!=0) delete[] fYx;
+    if(fW!=0)  delete[] fW;
+    fX  = 0;
+    fY  = 0;
+    fYx = 0;
+    fW  = 0;
     fN  = 0;
     fOrder = 0;
 }
@@ -64,55 +63,52 @@ AliITSstatistics2::~AliITSstatistics2(){
 AliITSstatistics2& AliITSstatistics2::operator=(AliITSstatistics2 &source){
 // operator =
 
-  Int_t i;
-  if(this==&source) return *this;
-  if(source.fOrder!=0){
-    this->fOrder = source.fOrder;
-    this->fN = source.fN;
-    this->fx = new Double_t[this->fOrder];
-    this->fw = new Double_t[this->fOrder];
-    for(i=0;i<source.fOrder;i++){
-      this->fx[i] = source.fx[i];
-      this->fw[i] = source.fw[i];
-    } // end for i
-  }else{
-    this->fx = 0;
-    this->fw = 0;
-    this->fN = 0;
-    this->fOrder = 0;
-  }// end if source.fOrder!=0
-  return *this;
+     if(this==&source) return *this;
+	  if(source.fOrder!=0){
+	       this->fOrder = source.fOrder;
+			 this->fN = source.fN;
+			 this->fX = new Double_t[this->fOrder];
+			 this->fW = new Double_t[this->fOrder];
+			 for(Int_t i=0;i<source.fOrder;i++){
+			      this->fX[i] = source.fX[i];
+					this->fW[i] = source.fW[i];
+			 } // end for i
+	  }else{
+	       this->fX = 0;
+			 this->fW = 0;
+			 this->fN = 0;
+			 this->fOrder = 0;
+	  }// end if source.fOrder!=0
+	  return *this;
 }
 //_______________________________________________________________
 AliITSstatistics2::AliITSstatistics2(AliITSstatistics2 &source){
 // Copy constructor
 
-  Int_t i;
-  if(this==&source) return;
-  if(source.fOrder!=0){
-    this->fOrder = source.fOrder;
-    this->fN = source.fN;
-    this->fx = new Double_t[this->fOrder];
-    this->fw = new Double_t[this->fOrder];
-    for(i=0;i<source.fOrder;i++){
-      this->fx[i] = source.fx[i];
-      this->fw[i] = source.fw[i];
-    } // end for i
-  }else{
-    this->fx = 0;
-    this->fw = 0;
-    this->fN = 0;
-    this->fOrder = 0;
-  }// end if source.fOrder!=0
+     if(this==&source) return;
+	  if(source.fOrder!=0){
+	       this->fOrder = source.fOrder;
+			 this->fN = source.fN;
+			 this->fX = new Double_t[this->fOrder];
+			 this->fW = new Double_t[this->fOrder];
+			 for(Int_t i=0;i<source.fOrder;i++){
+			      this->fX[i] = source.fX[i];
+					this->fW[i] = source.fW[i];
+			 } // end for i
+	  }else{
+	       this->fX = 0;
+			 this->fW = 0;
+			 this->fN = 0;
+			 this->fOrder = 0;
+	  }// end if source.fOrder!=0
 }
 
 void AliITSstatistics2::Reset(){
 //
 // Reset/zero statistics
 //
-    Int_t i;
-    for(i=0;i<fOrder;i++) {fx[i] = 0.0;fy[i] = 0.0;
-                           fyx[i] = 0.0; fw[i] = 0.0;}
+    for(Int_t i=0;i<fOrder;i++) {fX[i] = 0.0;fY[i] = 0.0;
+                                fYx[i] = 0.0; fW[i] = 0.0;}
     fN = 0;
     return;
 }
@@ -124,18 +120,21 @@ void AliITSstatistics2::AddValue(Double_t y,Double_t x,Double_t w=1.0){
     Double_t xs=1.0,ys=1.0,yxs=1.0,ws=1.0;
     Int_t i;
 
-    if(isinf(y)!=0||isinf(x)!=0||isinf(w)!=0) return;
-    if(isnan(y)!=0||isnan(x)!=0||isnan(w)!=0) return;
+    const Double_t kBig=1.0e+38;
+
+    if(y>kBig || x>kBig || w>kBig) return;
+
+
     fN++;
     for(i=0;i<fOrder;i++){
 	xs  *= x;
 	ys  *= y;
 	yxs *= x*y;
 	ws  *= w;
-	fx[i]  += xs*w;
-	fy[i]  += ys*w;
-	fyx[i] += yxs*w;
-	fw[i]  += ws;
+	fX[i]  += xs*w;
+	fY[i]  += ys*w;
+	fYx[i] += yxs*w;
+	fW[i]  += ws;
     } // end for i
 }
 
@@ -146,11 +145,11 @@ Double_t AliITSstatistics2::GetXNth(Int_t order){
 
     Double_t s;
 
-    if(fw[0]!=0.0&&order<=fOrder) s = fx[order-1]/fw[0];
+    if(fW[0]!=0.0&&order<=fOrder) s = fX[order-1]/fW[0];
     else {
 	s = 0.0;
-	printf("AliITSstatistics2: error in GetNth: fOrder=%d fN=%d fw[0]=%f\n",
-	       fOrder,fN,fw[0]);
+	printf("AliITSstatistics2: error in GetNth: fOrder=%d fN=%d fW[0]=%f\n",
+	       fOrder,fN,fW[0]);
     } // end else
     return s;
 }
@@ -160,11 +159,11 @@ Double_t AliITSstatistics2::GetYNth(Int_t order){
 //
     Double_t s;
 
-    if(fw[0]!=0.0&&order<=fOrder) s = fy[order-1]/fw[0];
+    if(fW[0]!=0.0&&order<=fOrder) s = fY[order-1]/fW[0];
     else {
 	s = 0.0;
-	printf("AliITSstatistics2: error in GetNth: fOrder=%d fN=%d fw[0]=%f\n",
-	       fOrder,fN,fw[0]);
+	printf("AliITSstatistics2: error in GetNth: fOrder=%d fN=%d fW[0]=%f\n",
+	       fOrder,fN,fW[0]);
     } // end else
     return s;
 }
@@ -172,11 +171,11 @@ Double_t AliITSstatistics2::GetYXNth(Int_t order){
 // This give the unbiased estimator for the RMS.
     Double_t s;
 
-    if(fw[0]!=0.0&&order<=fOrder) s = fyx[order-1]/fw[0];
+    if(fW[0]!=0.0&&order<=fOrder) s = fYx[order-1]/fW[0];
     else {
 	s = 0.0;
-	printf("AliITSstatistics2: error in GetNth: fOrder=%d fN=%d fw[0]=%f\n",
-	       fOrder,fN,fw[0]);
+	printf("AliITSstatistics2: error in GetNth: fOrder=%d fN=%d fW[0]=%f\n",
+	       fOrder,fN,fW[0]);
     } // end else
     return s;
 }
@@ -186,8 +185,8 @@ Double_t AliITSstatistics2::GetRMSX(){
 
     x  = GetMeanX(); // first order
     x2 = GetXNth(2); // second order
-    w  = fw[0];     // first order - 1.
-    ww = fw[1];     // second order - 1.
+    w  = fW[0];     // first order - 1.
+    ww = fW[1];     // second order - 1.
 
     if(w*w==ww) return (-1.0);
     s = (x2-x*x)*w*w/(w*w-ww);
@@ -199,8 +198,8 @@ Double_t AliITSstatistics2::GetRMSY(){
 
     x  = GetMeanY(); // first order
     x2 = GetYNth(2); // second order
-    w  = fw[0];     // first order - 1.
-    ww = fw[1];     // second order - 1.
+    w  = fW[0];     // first order - 1.
+    ww = fW[1];     // second order - 1.
 
     if(w*w==ww) return (-1.0);
     s = (x2-x*x)*w*w/(w*w-ww);
@@ -212,8 +211,8 @@ Double_t AliITSstatistics2::GetRMSYX(){
 
     x  = GetMeanYX(); // first order
     x2 = GetYXNth(2); // second order
-    w  = fw[0];     // first order - 1.
-    ww = fw[1];     // second order - 1.
+    w  = fW[0];     // first order - 1.
+    ww = fW[1];     // second order - 1.
 
     if(w*w==ww) return (-1.0);
     s = (x2-x*x)*w*w/(w*w-ww);
@@ -224,8 +223,8 @@ Double_t AliITSstatistics2::GetErrorMeanY(){
     Double_t rms,w,ww,s;
 
     rms = GetRMSY();
-    w   = fw[0];
-    ww  = fw[1];
+    w   = fW[0];
+    ww  = fW[1];
     s   = rms*rms*ww/(w*w);
     return TMath::Sqrt(s);
 }
@@ -234,8 +233,8 @@ Double_t AliITSstatistics2::GetErrorMeanX(){
     Double_t rms,w,ww,s;
 
     rms = GetRMSX();
-    w   = fw[0];
-    ww  = fw[1];
+    w   = fW[0];
+    ww  = fW[1];
     s   = rms*rms*ww/(w*w);
     return TMath::Sqrt(s);
 }
@@ -244,8 +243,8 @@ Double_t AliITSstatistics2::GetErrorMeanYX(){
     Double_t rms,w,ww,s;
 
     rms = GetRMSYX();
-    w   = fw[0];
-    ww  = fw[1];
+    w   = fW[0];
+    ww  = fW[1];
     s   = rms*rms*ww/(w*w);
     return TMath::Sqrt(s);
 }
@@ -256,11 +255,11 @@ Double_t AliITSstatistics2::GetErrorRMSY(){
 // at this moment this routine is only defined for weights=1.
     Double_t x,x2,x3,x4,w,ww,m2,m4,n,s;
 
-    if(fw[0]!=(Double_t)fN||GetN()<4) return (-1.);
+    if(fW[0]!=(Double_t)fN||GetN()<4) return (-1.);
     x  = GetMeanY(); // first order
     x2 = GetYNth(2); // second order
-    w  = fw[0];     // first order - 1.
-    ww = fw[1];     // second order - 1.
+    w  = fW[0];     // first order - 1.
+    ww = fW[1];     // second order - 1.
     if(w*w==ww) return (-1.0);
     s = (x2-x*x)*w*w/(w*w-ww);
 
@@ -278,11 +277,11 @@ Double_t AliITSstatistics2::GetErrorRMSX(){
 // at this moment this routine is only defined for weights=1.
     Double_t x,x2,x3,x4,w,ww,m2,m4,n,s;
 
-    if(fw[0]!=(Double_t)fN||GetN()<4) return (-1.);
+    if(fW[0]!=(Double_t)fN||GetN()<4) return (-1.);
     x  = GetMeanX(); // first order
     x2 = GetXNth(2); // second order
-    w  = fw[0];     // first order - 1.
-    ww = fw[1];     // second order - 1.
+    w  = fW[0];     // first order - 1.
+    ww = fW[1];     // second order - 1.
     if(w*w==ww) return (-1.0);
     s = (x2-x*x)*w*w/(w*w-ww);
 
@@ -300,11 +299,11 @@ Double_t AliITSstatistics2::GetErrorRMSYX(){
 // at this moment this routine is only defined for weights=1.
     Double_t x,x2,x3,x4,w,ww,m2,m4,n,s;
 
-    if(fw[0]!=(Double_t)fN||GetN()<4) return (-1.);
+    if(fW[0]!=(Double_t)fN||GetN()<4) return (-1.);
     x  = GetMeanYX(); // first order
     x2 = GetYXNth(2); // second order
-    w  = fw[0];     // first order - 1.
-    ww = fw[1];     // second order - 1.
+    w  = fW[0];     // first order - 1.
+    ww = fW[1];     // second order - 1.
     if(w*w==ww) return (-1.0);
     s = (x2-x*x)*w*w/(w*w-ww);
 
@@ -343,27 +342,3 @@ Double_t AliITSstatistics2::FitToLine(Double_t &a,Double_t &b){
     h /= (Double_t)fN - 2.0;
     return h;
 }
-//_______________________________________________________________________
-void AliITSstatistics2::Streamer(TBuffer &R__b){
-   // Stream an object of class AliITSstatistics2.
-
-   if (R__b.IsReading()) {
-      Version_t R__v = R__b.ReadVersion(); if (R__v) { }
-      TObject::Streamer(R__b);
-      R__b >> fN;
-      R__b >> fOrder;
-      R__b.ReadArray(fy);
-      R__b.ReadArray(fx);
-      R__b.ReadArray(fyx);
-      R__b.ReadArray(fw);
-   } else {
-      R__b.WriteVersion(AliITSstatistics2::IsA());
-      TObject::Streamer(R__b);
-      R__b << fN;
-      R__b << fOrder;
-      R__b.WriteArray(fy,fOrder);
-      R__b.WriteArray(fx,fOrder);
-      R__b.WriteArray(fyx,fOrder);
-      R__b.WriteArray(fw,fOrder);
-   }
-}