2024.02.21

Author: user29A

JPFITS/AstraCarta.cs

@@ -69,7 +69,7 @@ public static void Help()
 		{
 			StringBuilder sb = new StringBuilder();
 			sb.AppendLine("\"-maglimit\" Magnitude limit below which to flag bright sources and save to output table. Default is 100, to pass all, given that there is no such low magnitude." + Environment.NewLine);
-			sb.AppendLine("\"-buffer\" Tolerance buffer around image field, in arcminutes. This field can be negative, if one wishes to mitigate image padding in the query." + Environment.NewLine);
+			sb.AppendLine("\"-buffer\" Tolerance buffer around image field, in arcminutes. This field can be negative, if one wishes to mitigate image padding." + Environment.NewLine);
 			sb.AppendLine("\"-offsetra\" Offset the center of the query region in right ascension. Units in arcminutes." + Environment.NewLine);
 			sb.AppendLine("\"-offsetdec\" Offset the center of the query region in declination. Units in arcminutes." + Environment.NewLine);
 			sb.AppendLine("\"-shape\" Shape of field to query: \"rectangle\" (default) or \"circle\". Circle may only be used if pixwidth and pixheight are equal. Rectangle query uses a polygon query with corners defined by an ad-hoc WCS given the supplied field parameters, whereas circle uses a radius." + Environment.NewLine);
@@ -99,8 +99,8 @@ public static void Help()
 		/// <summary>
 		/// Perform a query with no user interface dialog form. Will throw an informative exception if something goes wrong. Returns a string which is the filename of the catalogue data downloaded. If nothing was found the string will be empty.
 		/// </summary>
-		/// <param name="ra">The right acension of the field center.</param>
-		/// <param name="dec">The declination of the field center.</param>
+		/// <param name="ra">The right acension of the field center. Degrees.</param>
+		/// <param name="dec">The declination of the field center. Degrees.</param>
 		/// <param name="scale">The plate scale in arcseconds per pixel.</param>
 		/// <param name="pixwidth">The number of horizontal pixels of the image.</param>
 		/// <param name="pixheight">The number of vertical pixels of the image</param>
@@ -110,6 +110,9 @@ public static void Help()
 		/// <br />Boolean arguments do not require a value, and their presence indicates true. For example the presence of optArgs.Add("-fitsout") equates to true for writing the file as a FITS bintable.</param>
 		public static string Query(double ra, double dec, double scale, int pixwidth, int pixheight, ArrayList? optArgs = null)
 		{
+			double RAorig = ra;
+			double decorig = dec;
+
 			try
 			{
 				if (optArgs == null)
@@ -609,6 +612,11 @@ public static string Query(double ra, double dec, double scale, int pixwidth, in
 
 					FITSBinTable fbt = new FITSBinTable(catalogue);
 					fbt.SetTTYPEEntries(ttypes, null, table);
+					fbt.AddExtraHeaderKey("RADEG", RAorig.ToString(), "Right Ascension of query center");
+					fbt.AddExtraHeaderKey("DECDEG", decorig.ToString(), "Declination of query center");
+					WorldCoordinateSolution.DegreeElementstoSexagesimalElements(RAorig, decorig, out string rasex, out string decsex, ":", 4);
+					fbt.AddExtraHeaderKey("RASEX", rasex, "Right Ascension of query center");
+					fbt.AddExtraHeaderKey("DECSEX", decsex, "Declination of query center");
 					File.Delete(resultsfilename);
 					resultsfilename = resultsfilename.Split('.')[0];
 					resultsfilename += ".fit";

JPFITS/FITSBinTable.cs

@@ -34,7 +34,7 @@ public class FITSBinTable
 	{
 		#region CONSTRUCTORS
 		/// <summary>Create an empty FITSBinTable object. TTYPE entries may be added later via SetTTYPEEntries or AddTTYPEEntry.</summary>
-		/// <param name="extensionName">The EXTNAME keyword extension name of the table. Always name your BINTABLE's. Cannot be numeric string.</param>
+		/// <param name="extensionName">The EXTNAME keyword extension name of the table. Always name your BINTABLEs. Cannot be numeric string.</param>
 		public FITSBinTable(string extensionName)
 		{
 			if (extensionName == null || extensionName.Trim() == "")

JPFITS/FITSFILEOPS.cs

@@ -7451,7 +7451,7 @@ public static bool SeekExtension(FileStream fs, string extension_type, int exten
 			return SeekExtension(fs, extension_type, "_FINDEXTNUM_" + extension_number.ToString(), ref header_return, out extensionStartPosition, out extensionEndPosition, out tableEndPosition, out pcount, out theap);
 		}
 
-		/// <summary>Gets all extension names of a specified extension type in the FITS file. If no extensions of the type exist, returns and empty array.</summary>
+		/// <summary>Gets all extension names of a specified extension type in the FITS file. If no extensions of the type exist, returns an empty array.</summary>
 		/// <param name="FileName">The full file name to read from disk.</param>
 		/// <param name="extension_type">The XTENSION extension type, either: &quot;BINTABLE&quot;, &quot;TABLE&quot;, or &quot;IMAGE&quot;.</param>
 		public static string[] GetAllExtensionNames(string FileName, ExtensionType extension_type)

JPFITS/FITSImage.cs

@@ -64,7 +64,7 @@ public FITSImage(string fullFileName, bool mayContainExtensions)
 		/// <param name="imageArrayVectorData">The data array or vector to use for the FITS image data. The precision and rank of the underlying array will be automatically determined. Vectors will be converted to a 1D array.</param>
 		/// <param name="doStats">Optionally perform the statistics to determine min, max, mean, median, and standard deviation of the image data - saves time if you don't need those.</param>
 		/// <param name="doParallel">Populate the FITSImage object ImageData and perform stats (if true) with parallelization.</param>
-		public FITSImage(string fullFileName, Array imageArrayVectorData, bool doStats, bool doParallel)
+		public FITSImage(string fullFileName, Array imageArrayVectorData, bool doStats, bool doParallel = false)
 		{
 			int rank = imageArrayVectorData.Rank;
 
@@ -309,7 +309,7 @@ public FITSImage(string fullFileName, Array imageArrayVectorData, bool doStats,
 		/// <param name="populateData">Optionally populate the image data array - sometimes you just want the header and don't need the data.</param>
 		/// <param name="doStats">Optionally perform the statistics to determine min, max, mean, median, and standard deviation of the image data (if populated) - saves time if you don't need those.</param>
 		/// <param name="doParallel">Populate the FITSImage object ImageData and perform stats (if true) with parallelization.</param>
-		public FITSImage(string fullFileName, int[]? range, bool populateHeader, bool populateData, bool doStats, bool doParallel)
+		public FITSImage(string fullFileName, int[]? range, bool populateHeader, bool populateData, bool doStats, bool doParallel = false)
 		{
 			FULLFILENAME = fullFileName;
 			FILENAME = Path.GetFileName(FULLFILENAME);
@@ -359,7 +359,7 @@ public FITSImage(string fullFileName, int[]? range, bool populateHeader, bool po
 		/// <param name="populateData">Optionally populate the image data array - sometimes you just want the header and don't need the data.</param>
 		/// <param name="doStats">Optionally perform the statistics to determine min, max, mean, median, and standard deviation of the image data (if populated) - saves time if you don't need those.</param>
 		/// <param name="doParallel">Populate the FITSImage object ImageData and perform stats (if true) with parallelization.</param>
-		public FITSImage(string fullFileName, string extensionName, int[]? range, bool populateHeader, bool populateData, bool doStats, bool doParallel)
+		public FITSImage(string fullFileName, string extensionName, int[]? range, bool populateHeader, bool populateData, bool doStats, bool doParallel = false)
 		{
 			FULLFILENAME = fullFileName;
 			FILENAME = Path.GetFileName(FULLFILENAME);
@@ -428,7 +428,7 @@ public FITSImage(string fullFileName, string extensionName, int[]? range, bool p
 		/// <param name="populateData">Optionally populate the image data array - sometimes you just want the header and don't need the data.</param>
 		/// <param name="doStats">Optionally perform the statistics to determine min, max, mean, median, and standard deviation of the image data (if populated) - saves time if you don't need those.</param>
 		/// <param name="doParallel">Populate the FITSImage object ImageData and perform stats (if true) with parallelization.</param>
-		public FITSImage(string fullFileName, int extensionNumber, int[]? range, bool populateHeader, bool populateData, bool doStats, bool doParallel)
+		public FITSImage(string fullFileName, int extensionNumber, int[]? range, bool populateHeader, bool populateData, bool doStats, bool doParallel = false)
 		{
 			FULLFILENAME = fullFileName;
 			FILENAME = Path.GetFileName(FULLFILENAME);
@@ -751,7 +751,7 @@ public void StatsUpD(bool doParallel)
 		/// <summary>Use SetImage to replace the existing double array for the FITSImage object with a new double array.</summary>
 		/// <param name="imageArrayData">The 2-D double array to set for the FITSImage object.</param>
 		/// <param name="Do_Stats">Optionally update the stats for the new array.</param>
-		public void SetImage(double[,] imageArrayData, bool Do_Stats, bool doParallel)
+		public void SetImage(double[,] imageArrayData, bool Do_Stats, bool doParallel = false)
 		{
 			DIMAGE = imageArrayData;
 			NAXISN = new int[2] { imageArrayData.GetLength(0), imageArrayData.GetLength(1) };
@@ -935,7 +935,7 @@ public void FlipHorizontal()
 		/// <br />If the file name already exists on disk, the primary unit will be overwritten, and any existing extensions will be appended to conserve the data file.</summary>
 		/// <param name="precision">Byte precision at which to write the image data.</param>
 		/// <param name="doParallel">Populate the underlying byte arrays for writing with parallelization.</param>
-		public void WriteImage(DiskPrecision precision, bool doParallel)
+		public void WriteImage(DiskPrecision precision, bool doParallel = false)
 		{
 			ISEXTENSION = false;
 			EXTNAME = null;
@@ -948,7 +948,7 @@ public void WriteImage(DiskPrecision precision, bool doParallel)
 		/// <param name="fullFileName">File name.</param>
 		/// <param name="precision">Byte precision at which to write the image data.</param>
 		/// <param name="doParallel">Populate the underlying byte arrays for writing with parallelization.</param>
-		public void WriteImage(string fullFileName, DiskPrecision precision, bool doParallel)
+		public void WriteImage(string fullFileName, DiskPrecision precision, bool doParallel = false)
 		{
 			ISEXTENSION = false;
 			EXTNAME = null;
@@ -972,7 +972,7 @@ public void WriteImage(string fullFileName, DiskPrecision precision, bool doPara
 		/// <param name="overwriteExtensionIfExists">If the image extension already exists it can be overwritten. If it exists and the option is given to not overwrite it, then an exception will be thrown.</param>
 		/// <param name="precision">Byte precision at which to write the image data.</param>
 		/// <param name="doParallel">Populate the underlying byte arrays for writing with parallelization.</param>
-		public void WriteImage(string fullFileName, string extensionName, bool overwriteExtensionIfExists, DiskPrecision precision, bool doParallel)
+		public void WriteImage(string fullFileName, string extensionName, bool overwriteExtensionIfExists, DiskPrecision precision, bool doParallel = false)
 		{
 			ISEXTENSION = true;
 			EXTNAME = extensionName;
@@ -1178,7 +1178,7 @@ public static void RawDataToFITSImage(string diskRawDataFileName, string fitsFil
 		/// <summary>Return the primary image of the FITS file as a double 2-D array.</summary>
 		/// <param name="fullFileName">The full file name to read from disk.</param>
 		/// <param name="range">Range is ZERO based 1-D int array [xmin xmax ymin ymax]. Pass null or Range[0] = -1 to default to full image size.</param>
-		public static double[,] ReadImageArrayOnly(string fullFileName, int[]? range, bool doParallel)
+		public static double[,] ReadImageArrayOnly(string fullFileName, int[]? range, bool doParallel = false)
 		{
 			return new FITSImage(fullFileName, range, false, true, false, doParallel).Image;
 		}
@@ -1187,7 +1187,7 @@ public static void RawDataToFITSImage(string diskRawDataFileName, string fitsFil
 		/// <param name="fullFileName">The full file name to read from disk.</param>
 		/// <param name="range">Range is ZERO based 1-D int array [xmin xmax ymin ymax]. One of the axes ranges must be length equal to 1.
 		/// <br /> Pass null or Range[0] = -1 to default to full image size, assuming the image data is a vector.</param>
-		public static double[] ReadImageVectorOnly(string fullFileName, int[]? range, bool doParallel)
+		public static double[] ReadImageVectorOnly(string fullFileName, int[]? range, bool doParallel = false)
 		{
 			FileStream fs = new FileStream(fullFileName, FileMode.Open, FileAccess.Read, FileShare.Read);
 			ArrayList header = null;