Merge branch 'hotfix_fillcf' into 'main'

Bug fixes (in launch_fillcf.py and dale.cc)

See merge request ardg/libra!155

Author: frhmadsen

apps/src/Dale/dale.cc

@@ -244,7 +244,7 @@ namespace Dale
     //
     //---------------------------------------------------
     //
-    string type, subType, targetName, weightName, sumwtName, pbName;
+    string type="", subType="", targetName=imageName, weightName=wtImageName, sumwtName=sowImageName, pbName="";
 
     LogIO logio(LogOrigin("Dale","dale"));
 
@@ -300,7 +300,7 @@ namespace Dale
 	    // 	 << endl;
 	    if (computePB)
 	      {
-		pbName   = imageName + ".pb";
+		pbName = librautils::removeExtension(targetName) + ".pb";
 		compute_pb(pbName, *wImage, *swImage, pblimit, logio);
 	      }
 	  }

apps/src/tests/test_dale.cc

@@ -67,6 +67,64 @@ TEST(DaleTest, AppLevelPSF) {
 }
 
 
+TEST(DaleTest, AppLevelPSFWithAllNames) {
+  // Get the test name
+  string testName = ::testing::UnitTest::GetInstance()->current_test_info()->name();
+
+  // Create a unique directory for this test case
+  path testDir = current_path() / testName;
+  string testdir = testDir.string();
+
+  // create test dir 
+  std::filesystem::create_directory(testDir);
+
+  //copy over from gold_standard to test dir
+  std::filesystem::copy(goldDir/"refim_point_wterm_vlad.psf", testDir/"refim_point_wterm_vlad.psf", copy_options::recursive);
+  std::filesystem::copy(goldDir/"refim_point_wterm_vlad.weight", testDir/"refim_point_wterm_vlad.weight", copy_options::recursive);
+  std::filesystem::copy(goldDir/"refim_point_wterm_vlad.sumwt", testDir/"refim_point_wterm_vlad.sumwt", copy_options::recursive);
+
+  //Step into test dir 
+  std::filesystem::current_path(testDir);
+  
+  // note, workdir, psfcutoff and facets are actually not used un acme
+  string imageName="refim_point_wterm_vlad.psf", normtype="flatnoise", imType="psf";
+  string wtImageName="refim_point_wterm_vlad.weight", sowImageName="refim_point_wterm_vlad.sumwt";
+  float pblimit=0.005, psfcutoff=0.35;
+  bool computePB = true;
+  bool normalize_weight = true;
+
+  Dale::dale(imageName, 
+	     wtImageName, sowImageName,
+	     normtype, imType, pblimit, 
+	     //psfcutoff,
+	     computePB);// normalize_weight);
+  
+
+  // Check that the .psf is generated
+  path p1("refim_point_wterm_vlad.psf");
+  path p2("refim_point_wterm_vlad.pb");
+  bool ans = exists(p1) && exists(p2) ;
+   
+  EXPECT_TRUE( ans );
+
+  float tol = 0.05;
+  float goldValLoc0 = 1;
+  float goldValLoc1 = -0.0070736;
+
+  PagedImage<Float> psfimage("refim_point_wterm_vlad.psf");
+  EXPECT_NEAR(psfimage(IPosition(4,1024,1024,0,0)), goldValLoc0, tol);
+  EXPECT_NEAR(psfimage(IPosition(4,1050,1050,0,0)), goldValLoc1, tol);
+
+  PagedImage<Float> pbimage("refim_point_wterm_vlad.pb");
+  EXPECT_NEAR(pbimage(IPosition(4,1024,1024,0,0)), goldValLoc0, tol);
+
+  //move to parent directory
+  std::filesystem::current_path(testDir.parent_path());
+
+  remove_all(testDir);
+}  
+
+
 TEST(DaleTest, AppLevelResidual) {
   // Get the test name
   string testName = ::testing::UnitTest::GetInstance()->current_test_info()->name();

scripts/experimental/launch_fillcf.py

@@ -216,15 +216,15 @@ def check_coyote_app(self):
             self.logger.info(f"coyote_app path is now set to absolute path: {self.coyote_app}")
 
         checkfile = self.check_path(self.coyote_app)
-        if checkfile == "directory":
+        if "directory" in checkfile:
             self.logger.warning(f"{self.coyote_app} is a directory. Checking for binary in {self.coyote_app}/bin/coyote")
             checkfile = self.check_path(os.path.join(self.coyote_app, "bin/coyote"))
-            if checkfile == "file":
+            if "file" in checkfile:
                 self.coyote_app = os.path.join(self.coyote_app, "bin/coyote")
                 self.logger.info(f"coyote_app binary found at {self.coyote_app}")
         elif "file (executable)" in checkfile:
-                self.logger.warning(f"coyote_app binary not found in {self.coyote_app}. Please provide the correct path.")
-        elif checkfile == "file":
+                self.logger.info(f"coyote_app binary found in {self.coyote_app}.");
+        elif "file" in checkfile:
             self.logger.info(f"coyote_app binary found at {self.coyote_app}")
             return
         else: