Changeset 41856 for branches/eam_branches/ipp-dev-20210817/psModules/src/detrend/pmPatternIO.c

Timestamp:

Oct 23, 2021, 1:48:02 PM (5 years ago)

Author:

eugene

Message:

adding PATTERN.ROW.AMP I/O functions, clean up pmPatternRow code

File:

• branches/eam_branches/ipp-dev-20210817/psModules/src/detrend/pmPatternIO.c (modified) (6 diffs)

branches/eam_branches/ipp-dev-20210817/psModules/src/detrend/pmPatternIO.c

@@ -8 +8 @@
 #include "pmFPAview.h"
 #include "pmFPAfile.h"
+#include "pmFPAUtils.h"
 #include "pmFPAfileFitsIO.h"
 #include "pmFPAHeader.h"
@@ -455 +456 @@
 /**************** PatternRowAmp(litude) I/O *************************/
 
-# if (0)
-/********************* Read Data functions *****************************/
-
-bool pmPatternRowAmpReadForView (const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
+bool pmPatternRowAmpRead (const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
     {
         // read the full model in one pass: require the level to be FPA
@@ -499 +497 @@
     }
 
+    int nGood = 0;
+    int nTotal = 0;
     while (haveData) {
 
@@ -511 +511 @@
         // determine the chip:
         char *extname = psMetadataLookupStr (&status, header, "EXTNAME");
-        psLogMsg ("psModules.detrend", 4, "read %ld rows from Pattern Row Amplitude file, extname %s\n", model->n, extname);
+        psLogMsg ("psModules.detrend", 8, "read %ld rows from Pattern Row Amplitude file, extname %s\n", model->n, extname);
+        nTotal += model->n;
 
         // I expect to find a name of the form: chipName.ptn (eg, XY01.ptn)
         // where chipName like 'XY01'
-        psAssert (strlen(extname) == 10, "invalid extension %s", extname);
+        psAssert (strlen(extname) == 8, "invalid extension %s", extname);
         psAssert (extname[5] == 'p', "invalid extension %s", extname);
         psAssert (extname[6] == 't', "invalid extension %s", extname);
@@ -530 +531 @@
         for (int i = 0; i < model->n; i++) {
             psMetadata *row = model->data[i];
-            char *cellName = psMetadataLookupStr(&status, row, "cellname");
-            float *amplitude = psMetadataLookupF32(&status, row, "medianValue");
+
+            char *cellName = psMetadataLookupStr(&status, row, "CELL_NAME");
+            if (!cellName) continue;
+
+            float amplitude = psMetadataLookupF32(&status, row, "VALUE_MEDIAN");
 
             int cellNumber = pmChipFindCell (chip, cellName);
-            pmCell *cell = chip->data[cellNumber];
+            pmCell *cell = chip->cells->data[cellNumber];
+            if (!cell) continue;
 
             psMetadataAddF32 (cell->analysis, PS_LIST_TAIL, "PTN.ROW.AMP", PS_META_REPLACE, "", amplitude);
+            nGood ++;
         }
+
         psFree (model);
         psFree (header);
@@ -544 +551 @@
         haveData = psFitsMoveExtNum (file->fits, 1, true);
     }
-
-    return true;
-}
-# endif
+    psLogMsg ("psModules.detrend", 4, "read %d of %d rows from Pattern Row Amplitude file\n", nGood, nTotal);
+
+    return true;
+}