From d6d398c05ccc870c92785834061eadde845bdf77 Mon Sep 17 00:00:00 2001
From: Max Voronkov <max.voronkov@gmail.com>
Date: Thu, 19 Jun 2025 18:08:52 +1000
Subject: [PATCH] relaxed criterion in various consistency cross-checks to
 avoid failures due to numerical precision

---
 components/ComponentModels/DiskShape.cc             | 2 +-
 components/ComponentModels/GaussianShape.cc         | 5 +++--
 components/ComponentModels/LimbDarkenedDiskShape.cc | 2 +-
 components/ComponentModels/TwoSidedShape.cc         | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/components/ComponentModels/DiskShape.cc b/components/ComponentModels/DiskShape.cc
index ca3664d..bf50f41 100644
--- a/components/ComponentModels/DiskShape.cc
+++ b/components/ComponentModels/DiskShape.cc
@@ -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"
diff --git a/components/ComponentModels/GaussianShape.cc b/components/ComponentModels/GaussianShape.cc
index d2b7913..b316b9c 100644
--- a/components/ComponentModels/GaussianShape.cc
+++ b/components/ComponentModels/GaussianShape.cc
@@ -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"
diff --git a/components/ComponentModels/LimbDarkenedDiskShape.cc b/components/ComponentModels/LimbDarkenedDiskShape.cc
index 59bd378..feca6a6 100644
--- a/components/ComponentModels/LimbDarkenedDiskShape.cc
+++ b/components/ComponentModels/LimbDarkenedDiskShape.cc
@@ -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"
diff --git a/components/ComponentModels/TwoSidedShape.cc b/components/ComponentModels/TwoSidedShape.cc
index 71281b3..c07fd08 100644
--- a/components/ComponentModels/TwoSidedShape.cc
+++ b/components/ComponentModels/TwoSidedShape.cc
@@ -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;
   }