Changeset 12264

Timestamp:

Mar 5, 2007, 6:46:48 PM (19 years ago)

Author:

Paul Price

Message:

Putting metadata key names into #define in header file, so that other files can access as well.

Location:

trunk/psModules/src/detrend

Files:

• pmShifts.c (modified) (11 diffs)
• pmShifts.h (modified) (1 diff)

trunk/psModules/src/detrend/pmShifts.c

@@ -13 +13 @@
 
 #define SHIFTS_BUFFER 100               // Buffer size for shifts
-#define TABLE_NAME "SHIFTS.TABLE"       // Name for table on the analysis metadata
-#define KERNEL_NAME "SHIFTS.KERNEL"     // Name for kernel on the analysis metadata
 #define TRACE "psModules.detrend"       // Trace facility
 #define FFT_SIZE 25                     // Size at which we use FFT instead of direct convolution
@@ -74 +72 @@
 
     bool mdok;                          // Status of MD lookup
-    pmShifts *check = psMetadataLookupPtr(&mdok, cell->analysis, TABLE_NAME); // Table, or NULL
+    pmShifts *check = psMetadataLookupPtr(&mdok, cell->analysis, PM_SHIFTS_TABLE_NAME); // Table, or NULL
     if (check) {
         psTrace(TRACE, 2, "Cell already has OT kernel present.\n");
@@ -298 +296 @@
     if (phuLevel == PM_FPA_LEVEL_CELL) {
         // Only a single cell
-        psMetadataAddPtr(cell->analysis, PS_LIST_TAIL, TABLE_NAME, PS_DATA_KERNEL,
+        psMetadataAddPtr(cell->analysis, PS_LIST_TAIL, PM_SHIFTS_TABLE_NAME, PS_DATA_KERNEL,
                          "Orthogonal transfer shifts", singleShifts);
         psFree(singleShifts);
@@ -336 +334 @@
                       }
                       pmCell *cell = chip->cells->data[cellNum]; // Cell of interest
-                      if (psMetadataLookup(cell->analysis, TABLE_NAME)) {
+                      if (psMetadataLookup(cell->analysis, PM_SHIFTS_TABLE_NAME)) {
                           // Already has a shifts table, for some reason
                           psWarning("Chip %s, cell %s already has a shifts table --- overwriting\n",
@@ -343 +341 @@
 
                       pmShifts *vectors = psHashLookup(cells, cellName); // Shifts for the cell of interest
-                      psMetadataAddPtr(cell->analysis, PS_LIST_TAIL, TABLE_NAME,
+                      psMetadataAddPtr(cell->analysis, PS_LIST_TAIL, PM_SHIFTS_TABLE_NAME,
                                        PS_DATA_KERNEL | PS_META_REPLACE,
                                        "Orthogonal transfer shifts", vectors);
@@ -361 +359 @@
                   }
                   pmCell *cell = chip->cells->data[cellNum]; // Cell of interest
-                  if (psMetadataLookup(cell->analysis, TABLE_NAME)) {
+                  if (psMetadataLookup(cell->analysis, PM_SHIFTS_TABLE_NAME)) {
                       // Already has a shifts table, for some reason
                       psWarning("Cell %s already has a shifts table --- overwriting\n", name);
@@ -367 +365 @@
 
                   pmShifts *vectors = psHashLookup(multipleShifts, name); // Shifts for this cell
-                  psMetadataAddPtr(cell->analysis, PS_LIST_TAIL, TABLE_NAME,
+                  psMetadataAddPtr(cell->analysis, PS_LIST_TAIL, PM_SHIFTS_TABLE_NAME,
                                    PS_DATA_KERNEL | PS_META_REPLACE,
                                    "Orthogonal transfer shifts", vectors);
@@ -393 +391 @@
 
     bool mdok;                          // Status of MD lookup
-    pmShifts *shifts = psMetadataLookupPtr(&mdok, cell->analysis, TABLE_NAME);
+    pmShifts *shifts = psMetadataLookupPtr(&mdok, cell->analysis, PM_SHIFTS_TABLE_NAME);
     if (!shifts) {
         psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find shifts table for cell.\n");
@@ -405 +403 @@
         return false;
     }
-    psMetadataAddPtr(cell->analysis, PS_LIST_TAIL, KERNEL_NAME, PS_DATA_KERNEL,
+    psMetadataAddPtr(cell->analysis, PS_LIST_TAIL, PM_SHIFTS_KERNEL_NAME, PS_DATA_KERNEL,
                      "Orthogonal transfer kernel, calculated from shifts", kernel);
     psFree(kernel);
@@ -418 +416 @@
 
     bool mdok;                          // Status of MD lookup
-    psKernel *kernel = psMetadataLookupPtr(&mdok, source->analysis, KERNEL_NAME);
+    psKernel *kernel = psMetadataLookupPtr(&mdok, source->analysis, PM_SHIFTS_KERNEL_NAME);
     if (!kernel) {
         // Maybe they just forgot to generate the kernel with pmShiftsKernel
-        if (psMetadataLookup(source->analysis, TABLE_NAME)) {
+        if (psMetadataLookup(source->analysis, PM_SHIFTS_TABLE_NAME)) {
             if (!pmShiftsKernel(source)) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to generate shifts kernel.");
@@ -427 +425 @@
             }
             // Hopefully it's there now
-            kernel = psMetadataLookupPtr(&mdok, source->analysis, KERNEL_NAME);
+            kernel = psMetadataLookupPtr(&mdok, source->analysis, PM_SHIFTS_KERNEL_NAME);
             if (!kernel) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to find shifts kernel.");

trunk/psModules/src/detrend/pmShifts.h

@@ -4 +4 @@
 #include <pslib.h>
 #include "pmFPA.h"
+
+#define PM_SHIFTS_TABLE_NAME "SHIFTS.TABLE" ///< Name for table on the analysis metadata
+#define PM_SHIFTS_KERNEL_NAME "SHIFTS.KERNEL" ///< Name for kernel on the analysis metadata
 
 /// Shifts due to orthogonal transfer