Skip to content

relaxed criterion in consistency checks due to numerical precision #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VoronkovMA merged 1 commit into from
Jun 19, 2025
Merged

relaxed criterion in consistency checks due to numerical precision #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/ComponentModels/DiskShape.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ Bool DiskShape::ok() const {
<< LogIO::POST;
return False;
}
if (!near(itsHeight, 1.0/(C::pi*itsMajValue*itsMinValue), 2*C::dbl_epsilon)) {
if (!near(itsHeight, 1.0/(C::pi*itsMajValue*itsMinValue), 10*C::dbl_epsilon)) {
LogIO logErr(LogOrigin("DiskCompRep", "ok()"));
logErr << LogIO::SEVERE << "The disk shape does not have"
<< " unit area"
Expand Down
5 changes: 3 additions & 2 deletions components/ComponentModels/GaussianShape.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,14 +244,15 @@ Bool GaussianShape::ok() const {
// performance reasons. Both function static and file static variables
// where considered and rejected for this purpose.
if (!TwoSidedShape::ok()) return False;
if (!near(itsShape.flux(), Double(1.0), 2*C::dbl_epsilon)) {
if (!near(itsShape.flux(), Double(1.0), 10*C::dbl_epsilon)) {
LogIO logErr(LogOrigin("GaussianCompRep", "ok()"));
logErr << LogIO::SEVERE << "The internal Gaussian shape does not have"
<< " unit area"
<< " unit area: " << itsShape.flux() << " difference from 1: "<< itsShape.flux()-1.0
<< LogIO::POST;
return False;
}
if (!near(itsFT.height(), 1.0, 2*C::dbl_epsilon)) {
if (!near(itsFT.height(), 1.0, 10*C::dbl_epsilon)) {
LogIO logErr(LogOrigin("GaussianCompRep", "ok()"));
logErr << LogIO::SEVERE << "The cached Fourier Transform of"
<< " the internal Gaussian shape does not have"
Expand Down
2 changes: 1 addition & 1 deletion components/ComponentModels/LimbDarkenedDiskShape.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ Bool LimbDarkenedDiskShape::ok() const {
<< LogIO::POST;
return False;
}
if (!near(itsHeight, 1.0/(C::pi*itsMajValue*itsMinValue), 2*C::dbl_epsilon)) {
if (!near(itsHeight, 1.0/(C::pi*itsMajValue*itsMinValue), 10*C::dbl_epsilon)) {
LogIO logErr(LogOrigin("DiskCompRep", "ok()"));
logErr << LogIO::SEVERE << "The disk shape does not have"
<< " unit area"
Expand Down
2 changes: 1 addition & 1 deletion components/ComponentModels/TwoSidedShape.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ Bool TwoSidedShape::fromRecord(String& errorMessage,
// // near function was added here and in the setMinorAxis function to fix
// // defect AOCso00071
if (majorAxisInRad < minorAxisInRad &&
!near(minorAxisInRad, minorAxisInRad, 2*C::dbl_epsilon)) {
!near(minorAxisInRad, minorAxisInRad, 10*C::dbl_epsilon)) {
errorMessage += "The major axis cannot be smaller than the minor axis\n";
return False;
}
Expand Down
Loading