Changeset 42089 for trunk/psLib/src/fits

Timestamp:

Feb 28, 2022, 2:43:25 PM (4 years ago)

Author:

eugene

Message:

plug a leak in psFitsTableNew.c; fix implementation of FITS_SCALE_ASINH_MANUAL; add option to reweight the errors in LMM; compile-time option to activate a hard-coded random seed (only needed for psLib testing)

Location:

trunk/psLib/src/fits

Files:

• psFits.h (modified) (1 diff)
• psFitsImage.c (modified) (1 diff)
• psFitsScale.c (modified) (1 diff)
• psFitsTableNew.c (modified) (3 diffs)

trunk/psLib/src/fits/psFits.h

@@ -60 +60 @@
     PS_FITS_SCALE_ASINH_STDEV_NEGATIVE, ///< Do asinh scaling, auto-scale to sample stdev, place mean at upper limit
     PS_FITS_SCALE_ASINH_STDEV_BOTH,     ///< Do asinh scaling, auto-scale to sample stdev, place mean at middle
-    PS_FITS_SCALE_ASINH_MANUAL          ///< Manual scaling after doing asinh scaling.
+    PS_FITS_SCALE_ASINH_MANUAL          ///< Manual scaling after doing asinh scaling.(use specified BSCALE, BZERO, BOFFSET, BSOFTEN)
 } psFitsScaling;
 

trunk/psLib/src/fits/psFitsImage.c

@@ -744 +744 @@
       }
     }   
-    // Remove any BSOFTENvalues that exist in the header if we are not using that scaling anymore
+    // Remove any BSOFTEN values that exist in the header if we are not using that scaling anymore
     if (options && (!((options->scaling == PS_FITS_SCALE_ASINH_RANGE)||
                       (options->scaling == PS_FITS_SCALE_ASINH_MANUAL)||

trunk/psLib/src/fits/psFitsScale.c

@@ -963 +963 @@
         *bzero = options->bzero;
         *boffset = options->boffset;
+        break;
+      case PS_FITS_SCALE_ASINH_MANUAL:
+        *bscale = options->bscale;
+        *bzero = options->bzero;
+        *boffset = options->boffset;
+        *bsoften = options->bsoften;
         break;
       default:

trunk/psLib/src/fits/psFitsTableNew.c

@@ -97 +97 @@
 freeTable(psFitsTable *table)
 {
+    if (!table) return;
     for (int col = 0; col < table->numCols; col++) {
         psFitsTableColumn *column = &table->columns[col];
@@ -176 +177 @@
 {
     // add any element frees here
+    if (!column) return;
+
+    psFree (column->name);
     return;
 }
@@ -195 +199 @@
     psFitsTableColumn *column = psFitsTableColumnAlloc (name, type);
     psArrayAdd (tableColumns, 10, column);
+    psFree (column);
     return true;
 }