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


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/SophyaLib/HiStats/histos2.cc

    r2341 r2507  
    5454Zero();
    5555mB_s.H = NULL;
    56 END_CONSTRUCTOR
    5756}
    5857
     
    7372Zero();
    7473mB_s.H = NULL;
    75 END_CONSTRUCTOR
    7674}
    7775
     
    140138}
    141139
    142 END_CONSTRUCTOR
    143140}
    144141
     
    156153for(int_4 i=0;i<3;i++) for(int_4 j=0;j<3;j++) mOver[i][j]=0.;
    157154mB_s.H = NULL;
    158 END_CONSTRUCTOR
    159155}
    160156
     
    332328{
    333329int_4 i,j;
    334 if (b==0.) THROW(inconsistentErr);
     330if (b==0.) throw ParmError("Histo2D::operator / (0) ");
    335331r_8 b2 = b*b;
    336332for(i=0;i<mNxy;i++) {
     
    412408{
    413409int_4 i,j;
    414 if(mNx!=a.mNx || mNy!=a.mNy) THROW(sizeMismatchErr);
     410if(mNx!=a.mNx || mNy!=a.mNy) throw SzMismatchError("Histo2D::operator += ");
    415411for(i=0;i<mNxy;i++) {
    416412  mData[i] += a.mData[i];
     
    435431{
    436432int_4 i,j;
    437 if(mNx!=a.mNx || mNy!=a.mNy) THROW(sizeMismatchErr);
     433if(mNx!=a.mNx || mNy!=a.mNy) throw SzMismatchError("Histo2D::operator -= ");
    438434for(i=0;i<mNxy;i++) {
    439435  mData[i] -= a.mData[i];
     
    458454{
    459455int_4 i,j;
    460 if(mNx!=a.mNx || mNy!=a.mNy) THROW(sizeMismatchErr);
     456if(mNx!=a.mNx || mNy!=a.mNy) throw SzMismatchError("Histo2D::operator *= ");
    461457nHist = 0.;
    462458for(i=0;i<mNxy;i++) {
     
    483479{
    484480int_4 i,j;
    485 if(mNx!=a.mNx || mNy!=a.mNy) THROW(sizeMismatchErr);
     481if(mNx!=a.mNx || mNy!=a.mNy) throw SzMismatchError("Histo2D::operator /= ");
    486482nHist = 0.;
    487483for(i=0;i<mNxy;i++) {
     
    575571void Histo2D::PutValue(TMatrix<r_8> &v, int_4 ierr)
    576572{
    577 //if(v.NRows()!=(uint_4)mNx || v.NCol()!=(uint_4)mNy) THROW(sizeMismatchErr);
     573//if(v.NRows()!=(uint_4)mNx || v.NCol()!=(uint_4)mNy) throw SzMismatchError("Histo2D::PutValue()");
    578574uint_4 nnx = (v.NRows()<(uint_4)mNx)? v.NRows(): (uint_4)mNx;
    579575uint_4 nny = (v.NCol() <(uint_4)mNy)? v.NCol() : (uint_4)mNy;
     
    590586void Histo2D::PutValueAdd(TMatrix<r_8> &v, int_4 ierr)
    591587{
    592 //if(v.NRows()!=(uint_4)mNx || v.NCol()!=(uint_4)mNy) THROW(sizeMismatchErr);
     588//if(v.NRows()!=(uint_4)mNx || v.NCol()!=(uint_4)mNy) throw SzMismatchError("Histo2D::PutValueAdd ");
    593589uint_4 nnx = (v.NRows()<(uint_4)mNx)? v.NRows(): (uint_4)mNx;
    594590uint_4 nny = (v.NCol() <(uint_4)mNy)? v.NCol() : (uint_4)mNy;
     
    606602void Histo2D::PutError2(TMatrix<r_8> &v)
    607603{
    608 //if(v.NRows()!=(uint_4)mNx || v.NCol()!=(uint_4)mNy) THROW(sizeMismatchErr);
     604//if(v.NRows()!=(uint_4)mNx || v.NCol()!=(uint_4)mNy) throw SzMismatchError("Histo2D::PutError2 ");
    609605uint_4 nnx = (v.NRows()<(uint_4)mNx)? v.NRows(): (uint_4)mNx;
    610606uint_4 nny = (v.NCol() <(uint_4)mNy)? v.NCol() : (uint_4)mNy;
     
    622618void Histo2D::PutError2Add(TMatrix<r_8> &v)
    623619{
    624 //if(v.NRows()!=(uint_4)mNx || v.NCol()!=(uint_4)mNy) THROW(sizeMismatchErr);
     620//if(v.NRows()!=(uint_4)mNx || v.NCol()!=(uint_4)mNy) throw SzMismatchError("Histo2D::PutError2Add ");
    625621uint_4 nnx = (v.NRows()<(uint_4)mNx)? v.NRows(): (uint_4)mNx;
    626622uint_4 nny = (v.NCol() <(uint_4)mNy)? v.NCol() : (uint_4)mNy;
     
    638634void Histo2D::PutError(TMatrix<r_8> &v)
    639635{
    640 //if(v.NRows()!=(uint_4)mNx || v.NCol()!=(uint_4)mNy) THROW(sizeMismatchErr);
     636//if(v.NRows()!=(uint_4)mNx || v.NCol()!=(uint_4)mNy) throw SzMismatchError("Histo2D::PutError ");
    641637uint_4 nnx = (v.NRows()<(uint_4)mNx)? v.NRows(): (uint_4)mNx;
    642638uint_4 nny = (v.NCol() <(uint_4)mNy)? v.NCol() : (uint_4)mNy;
Note: See TracChangeset for help on using the changeset viewer.