Merge branch 'cfshape' into 'main'

roadrunner.cc: Print list of CF shape+fixed bug that created .tmp image

See merge request ardg/libra!138

Author: preshanth

.gitlab-ci.yml

@@ -150,13 +150,18 @@ test-job:
 
     # --- C++ GTest section ---
     cd ${base_path}/apps/src/tests/
-    # Run C++ gtest binary if it exists
-    if [ -x "${base_path}/install/bin/tests/LibRATests" ]; then
-      "${base_path}/install/bin/tests/LibRATests" --gtest_output=xml:"${base_path}/libra-python/reports/cpp_report.xml"
-    else
-      echo "C++ test binary not found: ${base_path}/install/bin/tests/LibRATests"
-    fi
+    # Run C++ gtest binaries if they exist
+    test_binaries=("LibRATests" "test_roadrunner_robustMinus2" "test_roadrunner_robustPlus2" "test_roadrunner_snrpsf" "test_roadrunner_weight")
 
+    for test_binary in "${test_binaries[@]}"; do
+        if [ -x "${base_path}/install/bin/tests/${test_binary}" ]; then
+            echo "Running ${test_binary}..."
+            "${base_path}/install/bin/tests/${test_binary}" --gtest_output=xml:"${base_path}/libra-python/reports/cpp_${test_binary}_report.xml"
+        else
+            echo "C++ test binary not found: ${base_path}/install/bin/tests/${test_binary}"
+        fi
+    done
+    
     # --- Python pytest section ---
     cd "${base_path}/apps/src/tests/"
     pytest ${base_path}/libra-python/tests --junitxml=pytest_report.xml -v || echo "Pytest failed, but continuing for CI artifact collection"

apps/src/Acme/acme_cl_interface.cc

@@ -67,7 +67,7 @@ void UI(Bool restart, int argc, char **argv, bool interactive,
   catch (clError x)
     {
       x << x << endl;
-      clRetry();
+      if (x.Severity() == CL_FATAL) {throw;} // Re-throw instead of exit - allows proper exception handling
     }
 
   if (imageName=="")

apps/src/Chip/chip_cl_interface.cc

@@ -72,7 +72,7 @@ void UI(Bool restart, int argc, char **argv, bool interactive,
   catch (clError x)
     {
       x << x << endl;
-      clRetry();
+      if (x.Severity() == CL_FATAL) {throw;} // Re-throw instead of exit - allows proper exception handling
     }
   if ((imageName.size()==0) || ((imageName.size()==1) && (imageName[0]=="")))
     throw(AipsError("Input image name not set."));

apps/src/Coyote/coyote.cc

@@ -30,79 +30,6 @@
 #include <libracore/MakeComponents.h>
 
 #include <coyote.h>
-
-//
-//--------------------------------------------------------------------------
-//
-PagedImage<Complex> makeEmptySkyImage4CF(VisibilityIterator2& vi2,
-					 const MeasurementSet& selectedMS,
-					 MSSelection& msSelection,
-					 const String& imageName,
-					 const Vector<Int>& imSize, const float& cellSize,
-					 const String& phaseCenter, const String& stokes,
-					 const String& refFreq)
-{
-  Vector<Quantity> qCellSize(2);
-  for (int i=0;i<2;i++)
-    {
-      String qUnit("arcsec");
-      qCellSize[i]=Quantity(cellSize, qUnit);
-    }
-  
-  int imStokes=1;
-  if (stokes=="I") imStokes=1;
-  else if (stokes=="IV") imStokes=2;
-  else if (stokes=="IQUV") imStokes=4;
-  
-  int imNChan=1;
-  
-  MDirection mphaseCenter;
-  mdFromString(mphaseCenter, phaseCenter);
-  
-  SynthesisParamsGrid gridParams;
-  SynthesisParamsImage imageParams;
-  imageParams.imageName=imageName;
-  imageParams.imsize=imSize;
-  imageParams.cellsize=qCellSize;
-  imageParams.phaseCenter = mphaseCenter;
-  imageParams.stokes=stokes;
-  imageParams.mode=String("mfs");
-  imageParams.frame=String("LSRK");
-  imageParams.veltype=String("radio");
-  
-  //
-  // There are two items related to ref. freq. "reffreq" (a String) and "refFreq" (a Quantity).
-  // Set them both.
-  //
-  if (refFreq != "")
-    {
-      imageParams.reffreq=refFreq;
-
-      // Parse the user string. It may be parse as a pure numerical
-      // value, or as a numerical value with units.
-      // If no units were provided, it is assumed to be Hz.
-      //
-      // refFreq element of the imageParams struct requires a Quantity
-      // in GHz units.  We provide it as such, without understanding
-      // why it is required in these units, or even why this element
-      // is required at all (given that imageParams.reffreq also
-      // exist which takes the frequency as a string).
-      try
-	{
-	  imageParams.refFreq=SynthesisUtils::makeFreqQuantity(refFreq,"GHz");
-	}
-      catch (AipsError& e)
-	{
-	  string msg("reffreq setting: "); msg+=e.what();
-	  throw(AipsError(msg));
-	}
-    }
-  
-  casacore::Block<const casacore::MeasurementSet *> msList(1); msList[0]=&selectedMS;
-  CoordinateSystem csys = imageParams.buildCoordinateSystem(vi2,makeTheChanSelMap(msSelection),msList);
-  IPosition imshape(4,imSize(0),imSize(1),imStokes,imNChan);
-  return PagedImage<Complex>(imshape, csys, imageParams.imageName);
-}
 //
 //--------------------------------------------------------------------------
 //
@@ -343,18 +270,22 @@ void Coyote(//bool &restartUI, int &argc, char **argv,
 	  // This is inherited from ImageInterface so should be able to pass
 	  // an image interface object from it.
 	  //
-	  PagedImage<Complex> cgrid =
-	    makeEmptySkyImage4CF(*(db.vi2_l), db.selectedMS, db.msSelection, 
-				 imageName, imSize, cellSize, phaseCenter, 
-				 stokes, refFreqStr);
+	  // PagedImage<Complex> cgrid =
+	  //   makeEmptySkyImage4CF(*(db.vi2_l), db.selectedMS, db.msSelection, 
+	  // 			 imageName, imSize, cellSize, phaseCenter, 
+	  // 			 stokes, refFreqStr);
+	  TempImage<Complex> cgrid =
+	    makeEmptySkyImage(*(db.vi2_l), db.selectedMS, db.msSelection, 
+			      imageName, String(""),imSize, cellSize, phaseCenter, 
+			      stokes, refFreqStr,String("mfs"));
 	  //
 	  // Save the coordinate system in a record and make it persistent in
 	  // the CFCache.
 	  //
 	  //	  String targetName=String(cfCacheName);
 	  ImageInformation<Complex> imInfo(cgrid,casacore::String(cfCacheName));
 	  imInfo.save();
-	  cgrid.table().markForDelete();
+	  //	  cgrid.table().markForDelete();
 
 	  //-------------------------------------------------------------------------------------------------
 

apps/src/Coyote/coyote_cl_interface.cc

@@ -144,10 +144,8 @@ void UI(bool restart, int argc, char **argv, bool interactive,
     }
   catch (clError& x)
     {
-      x << x << endl;
-      if (x.Severity() == CL_FATAL) exit(1);
-      //clRetry();
-      RestartUI(REENTER);
+       x << x << endl;
+      if (x.Severity() == CL_FATAL) {throw;} // Re-throw instead of exit - allows proper exception handling
     }
 }
 //

apps/src/Dale/dale_cl_interface.cc

@@ -89,7 +89,7 @@ void UI(bool restart, int argc, char **argv, bool interactive,
   catch (clError x)
     {
       x << x << endl;
-      clRetry();
+      if (x.Severity() == CL_FATAL) {throw;} // Re-throw instead of exit - allows proper exception handling
     }
   if (imageName=="")
     throw(AipsError("Input image name not set."));

apps/src/Hummbee/hummbee_cl_interface.cc

@@ -176,9 +176,7 @@ void UI(bool restart, int argc, char **argv, bool interactive,
   catch (clError& x)
     {
       x << x << endl;
-      if (x.Severity() == CL_FATAL) exit(1);
-      //clRetry();
-      RestartUI(REENTER);
+      if (x.Severity() == CL_FATAL) {throw;} // Re-throw instead of exit - allows proper exception handling
     }
 }
 

apps/src/MSSplit/mssplit_cl_interface.cc

@@ -66,10 +66,8 @@ void UI(Bool restart, int argc, char **argv, bool interactive, string& MSNBuf, s
     }
   catch (clError& x)
     {
-      x << x << endl;
-      if (x.Severity() == CL_FATAL) exit(1);
-      //clRetry();
-      RestartUI(REENTER);
+       x << x << endl;
+      if (x.Severity() == CL_FATAL) {throw;} // Re-throw instead of exit - allows proper exception handling
     }
 }
 

apps/src/RoadRunner/roadrunner.cc

@@ -62,6 +62,7 @@ prepCFEngine(casa::refim::MakeCFArray& mkCF,
 
   casacore::Vector<Int> wNdxList;
   casacore::Vector<Int> spwNdxList;
+  std::vector<int> cfShapeList;
   std::chrono::time_point<std::chrono::steady_clock>
     startMkCF=std::chrono::steady_clock::now();
   auto ret=
@@ -79,8 +80,11 @@ prepCFEngine(casa::refim::MakeCFArray& mkCF,
   if (newCF)
     {
       casa::refim::MyCFArray cfArray;
+      cfShapeList = std::get<4>(ret);
       cerr << "Make CF Array run time: " << runtimeMkCF.count() << " sec" << endl;
-      cerr << "CF W list: " << wNdxList << endl << "CF SPW List: " << spwNdxList << endl;
+      cerr << "CF W list: " << wNdxList << endl << "CF SPW List: " << spwNdxList << endl
+	   << "CF Shapes: ";
+      for(auto s : cfShapeList) cerr << s << " "; cerr << endl;
       cfsi_g = get<2>(ret);
 
       dcf_sptr = std::get<3>(ret);
@@ -433,16 +437,26 @@ auto Roadrunner(//bool& restartUI, int& argc, char** argv,
       // pc.print(oss);
       //      cerr << "PC = " << oss << endl;
 
-      PagedImage<Complex> cgrid=makeEmptySkyImage(*(db.vi2_l), db.selectedMS, db.msSelection,
+      TempImage<Complex> cgrid=makeEmptySkyImage(*(db.vi2_l), db.selectedMS, db.msSelection,
 						  cmplxGridName, startModelImageName,
 						  imSize, cellSize, phaseCenter,
 						  stokes, refFreqStr, mode);
       PagedImage<Float> skyImage(cgrid.shape(),cgrid.coordinates(), imageName);
 
-      cgrid.table().markForDelete();
-
+      // set the default of rmode to be "norm"
+      if (rmode =="")
+        rmode = "norm";
+      // put the guard here so in the UI() users don't need to correct `rmode` if they don't know how to
+      if (rmode != "norm")
+      {
+        log_l << "'rmode' parameter is not set to 'norm'. Please verify this is intentional." << LogIO::WARN;
+        log_l << "For Briggs weighting, `rmode` is automatically set to `norm` to ensure the robust parameter functions correctly." << LogIO::WARN;
+      }
       if (weighting == "briggs" && rmode !="norm")
-        throw(AipsError("Ensure `rmode` is set correctly. For Briggs weighting, use `rmode = norm` for the robust parameter to take effect."));
+        rmode = "norm";
+        
+
+      //      cgrid.table().markForDelete();
 
       // Setup the weighting scheme in the supplied VI2
       weightor(*(db.vi2_l),

apps/src/RoadRunner/roadrunner_cl_interface.cc

@@ -79,7 +79,7 @@ void UI(Bool restart, int argc, char **argv, bool interactive,
   // else
   //   clRetry();
  REENTER:
-  try
+  //  try
     {
       SMap watchPoints; VString exposedKeys;
       int i;
@@ -110,6 +110,8 @@ void UI(Bool restart, int argc, char **argv, bool interactive,
       clSetOptions("weighting",{"natural","uniform","briggs"});
 
       i=1;clgetSValp("rmode", rmode,i);
+      clSetOptions("rmode",{"abs","norm", "none"});
+
       i=1;clgetValp("robust", robust,i);
 
       i=1;clgetValp("wprojplanes", nW,i);
@@ -130,7 +132,8 @@ void UI(Bool restart, int argc, char **argv, bool interactive,
       // Expose the datacolumn parameter only for mode=residual
       // exposedKeys.push_back("datacolumn");
       // watchPoints["residual"]=exposedKeys;
-      i=1;clgetSValp("mode", imagingMode,i,watchPoints); clSetOptions("mode",{"weight","psf","snrpsf","residual","predict"});
+      std::vector<std::string> imagingModeOpts = {"weight","psf","snrpsf","residual","predict"};
+      i=1;clgetSValp("mode", imagingMode,i,watchPoints); clSetOptions("mode",imagingModeOpts);
 
       i=1;clgetValp("wbawp", WBAwp,i);
 
@@ -159,6 +162,11 @@ void UI(Bool restart, int argc, char **argv, bool interactive,
 
      // do some input parameter checking now.
      string mesgs;
+     auto si=std::find(imagingModeOpts.begin(), imagingModeOpts.end(),imagingMode);
+     if ((si != imagingModeOpts.end()) && (imagingMode != "predict"))
+       if (imageName == "")
+	 mesgs += "Imaging mode="+imagingMode+" needs imagename to be set.\n";
+     
      if (CFCache == "")
        mesgs += "The cfcache parameter needs to be set.\n";
 
@@ -176,27 +184,13 @@ void UI(Bool restart, int argc, char **argv, bool interactive,
 
      if (mesgs != "")
        clThrowUp(mesgs,"###Fatal", CL_FATAL);
+
     }
-  catch (clError& x)
-    {
-      x << x << endl;
-      //      if (x.Severity() == CL_FATAL)
-	    exit(1);
-      //clRetry();
-      //RestartUI(REENTER);
-    }
+  // catch (clError& x)
+  //   {
+  //     if (x.Severity() == CL_FATAL) {throw;} // Re-throw instead of exit - allows proper exception handling
+  //   }
 }
-//
-//-------------------------------------------------------------------------
-//
-// Moving the embedded MPI interfaces out of the (visual) way.  If
-// necessary in the future, MPI code should be implemented in a
-// separate class and this code appropriate re-factored to be used as
-// an API for MPI class.  Ideally, MPI code should not be part of the
-// roadrunner (application layer) code.
-//#include <synthesis/TransformMachines2/test/RR_MPI.h>
-//
-
 //
 //-------------------------------------------------------------------------
 // Experimantal code not yet working
@@ -229,9 +223,9 @@ int main(int argc, char **argv)
     imagingMode="residual",
     rmode="norm"; // set to "norm" to match rWeightor.h
 
-  float cellSize=0;//refFreq=3e09, freqBW=3e9;
+  float cellSize=0;
   float robust=0.0;
-  int NX=0, nW=1;//cfBufferSize=512, cfOversampling=20, nW=1;
+  int NX=0, nW=1;
   bool WBAwp=true;
   bool restartUI=false;
   bool doPointing=false;
@@ -270,6 +264,10 @@ int main(int argc, char **argv)
     {
       cerr << er.what() << endl;
     }
+  catch(std::exception& e)
+    {
+      cerr << e.what() << endl;
+    }
 
   // An example code below for extracting the info from RRRetrunType (a std::unordered_map).
   //  cerr << rrr[MAKEVB_TIME] << " " << rrr[NVIS] << " " << rrr[DATA_VOLUME] << " " << rrr[IMAGING_RATE] << " " << rrr[NVIS]/rrr[CUMULATIVE_GRIDDING_ENGINE_TIME] << " vis/sec" << endl;