Changeset 2507 in Sophya for trunk/SophyaLib/HiStats/histos2.cc

Timestamp:

Mar 15, 2004, 5:47:21 PM (22 years ago)

Author:

ansari

Message:

Remplacement THROW par throw et suppression END_CONSTRUCTOR - Reza 15/03/2004

File:

• trunk/SophyaLib/HiStats/histos2.cc (modified) (14 diffs)

trunk/SophyaLib/HiStats/histos2.cc

@@ -54 +54 @@
 Zero();
 mB_s.H = NULL;
-END_CONSTRUCTOR
 }
 
@@ -73 +72 @@
 Zero();
 mB_s.H = NULL;
-END_CONSTRUCTOR
 }
 
@@ -140 +138 @@
 }
 
-END_CONSTRUCTOR
 }
 
@@ -156 +153 @@
 for(int_4 i=0;i<3;i++) for(int_4 j=0;j<3;j++) mOver[i][j]=0.;
 mB_s.H = NULL;
-END_CONSTRUCTOR
 }
 
@@ -332 +328 @@
 {
 int_4 i,j;
-if (b==0.) THROW(inconsistentErr);
+if (b==0.) throw ParmError("Histo2D::operator / (0) ");
 r_8 b2 = b*b;
 for(i=0;i<mNxy;i++) {
@@ -412 +408 @@
 {
 int_4 i,j;
-if(mNx!=a.mNx || mNy!=a.mNy) THROW(sizeMismatchErr);
+if(mNx!=a.mNx || mNy!=a.mNy) throw SzMismatchError("Histo2D::operator += ");
 for(i=0;i<mNxy;i++) {
   mData[i] += a.mData[i];
@@ -435 +431 @@
 {
 int_4 i,j;
-if(mNx!=a.mNx || mNy!=a.mNy) THROW(sizeMismatchErr);
+if(mNx!=a.mNx || mNy!=a.mNy) throw SzMismatchError("Histo2D::operator -= ");
 for(i=0;i<mNxy;i++) {
   mData[i] -= a.mData[i];
@@ -458 +454 @@
 {
 int_4 i,j;
-if(mNx!=a.mNx || mNy!=a.mNy) THROW(sizeMismatchErr);
+if(mNx!=a.mNx || mNy!=a.mNy) throw SzMismatchError("Histo2D::operator *= ");
 nHist = 0.;
 for(i=0;i<mNxy;i++) {
@@ -483 +479 @@
 {
 int_4 i,j;
-if(mNx!=a.mNx || mNy!=a.mNy) THROW(sizeMismatchErr);
+if(mNx!=a.mNx || mNy!=a.mNy) throw SzMismatchError("Histo2D::operator /= ");
 nHist = 0.;
 for(i=0;i<mNxy;i++) {
@@ -575 +571 @@
 void Histo2D::PutValue(TMatrix<r_8> &v, int_4 ierr)
 {
-//if(v.NRows()!=(uint_4)mNx || v.NCol()!=(uint_4)mNy) THROW(sizeMismatchErr);
+//if(v.NRows()!=(uint_4)mNx || v.NCol()!=(uint_4)mNy) throw SzMismatchError("Histo2D::PutValue()");
 uint_4 nnx = (v.NRows()<(uint_4)mNx)? v.NRows(): (uint_4)mNx;
 uint_4 nny = (v.NCol() <(uint_4)mNy)? v.NCol() : (uint_4)mNy;
@@ -590 +586 @@
 void Histo2D::PutValueAdd(TMatrix<r_8> &v, int_4 ierr)
 {
-//if(v.NRows()!=(uint_4)mNx || v.NCol()!=(uint_4)mNy) THROW(sizeMismatchErr);
+//if(v.NRows()!=(uint_4)mNx || v.NCol()!=(uint_4)mNy) throw SzMismatchError("Histo2D::PutValueAdd ");
 uint_4 nnx = (v.NRows()<(uint_4)mNx)? v.NRows(): (uint_4)mNx;
 uint_4 nny = (v.NCol() <(uint_4)mNy)? v.NCol() : (uint_4)mNy;
@@ -606 +602 @@
 void Histo2D::PutError2(TMatrix<r_8> &v)
 {
-//if(v.NRows()!=(uint_4)mNx || v.NCol()!=(uint_4)mNy) THROW(sizeMismatchErr);
+//if(v.NRows()!=(uint_4)mNx || v.NCol()!=(uint_4)mNy) throw SzMismatchError("Histo2D::PutError2 ");
 uint_4 nnx = (v.NRows()<(uint_4)mNx)? v.NRows(): (uint_4)mNx;
 uint_4 nny = (v.NCol() <(uint_4)mNy)? v.NCol() : (uint_4)mNy;
@@ -622 +618 @@
 void Histo2D::PutError2Add(TMatrix<r_8> &v)
 {
-//if(v.NRows()!=(uint_4)mNx || v.NCol()!=(uint_4)mNy) THROW(sizeMismatchErr);
+//if(v.NRows()!=(uint_4)mNx || v.NCol()!=(uint_4)mNy) throw SzMismatchError("Histo2D::PutError2Add ");
 uint_4 nnx = (v.NRows()<(uint_4)mNx)? v.NRows(): (uint_4)mNx;
 uint_4 nny = (v.NCol() <(uint_4)mNy)? v.NCol() : (uint_4)mNy;
@@ -638 +634 @@
 void Histo2D::PutError(TMatrix<r_8> &v)
 {
-//if(v.NRows()!=(uint_4)mNx || v.NCol()!=(uint_4)mNy) THROW(sizeMismatchErr);
+//if(v.NRows()!=(uint_4)mNx || v.NCol()!=(uint_4)mNy) throw SzMismatchError("Histo2D::PutError ");
 uint_4 nnx = (v.NRows()<(uint_4)mNx)? v.NRows(): (uint_4)mNx;
 uint_4 nny = (v.NCol() <(uint_4)mNy)? v.NCol() : (uint_4)mNy;