Changeset 958 in Sophya for trunk/SophyaLib/HiStats/histos2.cc
- Timestamp:
- Apr 18, 2000, 3:38:53 PM (25 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/SophyaLib/HiStats/histos2.cc
r943 r958 666 666 { 667 667 int i,j; 668 if(v.NRows()!= nx || v.NCol()!=ny) THROW(sizeMismatchErr);668 if(v.NRows()!=(uint_4)nx || v.NCol()!=(uint_4)ny) THROW(sizeMismatchErr); 669 669 for(i=0;i<nx;i++) for(j=0;j<ny;j++) { 670 670 (*this)(i,j) = v(i,j); … … 680 680 { 681 681 int i,j; 682 if(v.NRows()!= nx || v.NCol()!=ny) THROW(sizeMismatchErr);682 if(v.NRows()!=(uint_4)nx || v.NCol()!=(uint_4)ny) THROW(sizeMismatchErr); 683 683 for(i=0;i<nx;i++) for(j=0;j<ny;j++) { 684 684 (*this)(i,j) += v(i,j); … … 695 695 { 696 696 int i,j; 697 if(v.NRows()!= nx || v.NCol()!=ny) THROW(sizeMismatchErr);697 if(v.NRows()!=(uint_4)nx || v.NCol()!=(uint_4)ny) THROW(sizeMismatchErr); 698 698 if(!err2) Errors(); 699 699 for(i=0;i<nx;i++) for(j=0;j<ny;j++) Error2(i,j) = v(i,j); … … 708 708 { 709 709 int i,j; 710 if(v.NRows()!= nx || v.NCol()!=ny) THROW(sizeMismatchErr);710 if(v.NRows()!=(uint_4)nx || v.NCol()!=(uint_4)ny) THROW(sizeMismatchErr); 711 711 if(!err2) Errors(); 712 712 for(i=0;i<nx;i++) for(j=0;j<ny;j++) … … 721 721 { 722 722 int i,j; 723 if(v.NRows()!= nx || v.NCol()!=ny) THROW(sizeMismatchErr);723 if(v.NRows()!=(uint_4)nx || v.NCol()!=(uint_4)ny) THROW(sizeMismatchErr); 724 724 if(!err2) Errors(); 725 725 for(i=0;i<nx;i++) for(j=0;j<ny;j++) … … 1046 1046 double f = (double) (*this)(i,j); 1047 1047 double saf = sqrt(fabs(f)); if(saf<1.) saf=1.; 1048 double e ;1048 double e=0.; 1049 1049 if(typ_err==0) {if(HasErrors()) e=Error(i,j); else e=1.;} 1050 1050 else if(typ_err==1) {if(HasErrors()) e=Error(i,j); else e=saf;}
Note:
See TracChangeset
for help on using the changeset viewer.