Changeset 15985 for trunk/psModules/test/objects/tap_pmPSF_IO.c

Timestamp:

Jan 2, 2008, 10:45:23 AM (18 years ago)

Author:

gusciora

Message:

Significant changes and additions.

File:

• trunk/psModules/test/objects/tap_pmPSF_IO.c (modified) (18 diffs)

trunk/psModules/test/objects/tap_pmPSF_IO.c

@@ -5 +5 @@
 #include "tap.h"
 #include "pstap.h"
+/* STATUS
+    Uder construction.  Only lightly tested so far.
+*/
 
 #define TEST_FLOATS_EQUAL(X, Y) (abs(X - Y) < 0.0001)
@@ -76 +79 @@
     cell->hdu = pmHDUAlloc("cellExtName");
     for (int i = 0 ; i < NUM_READOUTS ; i++) {
-        cell->readouts->data[i] = generateSimpleReadout(cell);
+        cell->readouts->data[i] = psMemDecrRefCounter((psPtr) generateSimpleReadout(cell));
     }
 
@@ -123 +126 @@
     psArrayRealloc(chip->cells, NUM_CELLS);
     for (int i = 0 ; i < NUM_CELLS ; i++) {
-        chip->cells->data[i] = generateSimpleCell(chip);
+        chip->cells->data[i] = psMemDecrRefCounter((psPtr) generateSimpleCell(chip));
     }
 
@@ -139 +142 @@
 {
     pmFPA* fpa = pmFPAAlloc(camera);
+    fpa->hdu = pmHDUAlloc("cellExtName");
     fpa->fromTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
     fpa->toTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
@@ -147 +151 @@
     psArrayRealloc(fpa->chips, NUM_CHIPS);
     for (int i = 0 ; i < NUM_CHIPS ; i++) {
-        fpa->chips->data[i] = generateSimpleChip(fpa);
-    }
-
-    // XXX: Eventually, when you finish the pmConcepts tests, add full concept
-    // reading code from wherever.
+        fpa->chips->data[i] = psMemDecrRefCounter((psPtr) generateSimpleChip(fpa));
+    }
     pmConceptsBlankFPA(fpa);
-//    bool mdok;
-//    psMetadata *fileData = psMetadataLookupMetadata(&mdok, fpa->hdu->format, "FILE");
-//    char *fpaNameHdr = psMetadataLookupStr(&mdok, fileData, "FPA.NAME");
-//    psMetadataAddStr(fpa->concepts, PS_LIST_TAIL, "FPA.NAME", PS_META_REPLACE, NULL, fpaNameHdr);
-
     return(fpa);
 }
-
-// XXX: This should only be necessary until the psFree() functions for
-// FPA/chip/cell/readout correctly free all child chips/cells/readouts
-void myFreeCell(pmCell *cell)
-{
-    for (int k = 0 ; k < cell->readouts->n ; k++) {
-        psFree(cell->readouts->data[k]);
-    }
-    psFree(cell);
-}
-
-void myFreeChip(pmChip *chip) {
-    for (int j = 0 ; j < chip->cells->n ; j++) {
-        myFreeCell(chip->cells->data[j]);
-    }
-    psFree(chip);
-}
-
-void myFreeFPA(pmFPA *fpa)
-{
-    for (int i = 0 ; i < fpa->chips->n ; i++) {
-        myFreeChip(fpa->chips->data[i]);
-    }
-    psFree(fpa);
-}
-
-
-
 
 
@@ -195 +163 @@
     psLogSetLevel(PS_LOG_INFO);
     psTraceSetLevel("err", ERR_TRACE_LEVEL);
-    plan_tests(22);
+    plan_tests(28);
 
 
@@ -251 +219 @@
 
         psFree(view);
-        myFreeFPA(file->fpa);
+        psFree(file->fpa);
         file->fpa = NULL;
         psFree(file);
@@ -270 +238 @@
         bool rc = pmPSFmodelCheckDataStatusForFPA(NULL);
         ok(rc == false, "pmPSFmodelCheckDataStatusForFPA() returned FALSE with NULL pmFPA input parameter");
-        myFreeFPA(fpa);
+        psFree(fpa);
         psFree(camera);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -282 +250 @@
         pmFPA *fpa = generateSimpleFPA(camera);
         for (int i = 0 ; i < fpa->chips->n ; i++) {
-            myFreeChip(fpa->chips->data[i]);
+            psFree(fpa->chips->data[i]);
         }
         bool rc = pmPSFmodelCheckDataStatusForFPA(NULL);
         ok(rc == false, "pmPSFmodelCheckDataStatusForFPA() returned FALSE with NULL pmFPA->chips input parameter");
-        myFreeFPA(fpa);
+        psFree(fpa);
         psFree(camera);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -308 +276 @@
         ok(rc == true, "pmPSFmodelCheckDataStatusForFPA() returned TRUE with acceptable input parameters");
 
-        myFreeFPA(fpa);
+        psFree(fpa);
         psFree(camera);
         psFree(junk);
@@ -343 +311 @@
         ok(rc == true, "pmPSFmodelCheckDataStatusForChip() returned TRUE with acceptable input parameters");
     
-        myFreeFPA(fpa);
+        psFree(fpa);
         psFree(camera);
         psFree(junk);
@@ -368 +336 @@
 
         psFree(view);
-        myFreeFPA(file->fpa);
+        psFree(file->fpa);
         file->fpa = NULL;
         psFree(file);
@@ -392 +360 @@
 
         psFree(view);
-        myFreeFPA(file->fpa);
+        psFree(file->fpa);
         file->fpa = NULL;
         psFree(file);
@@ -422 +390 @@
 
     // Call pmPSFmodelWrite() with acceptable input parameters
-    if (1) {
+    // XXX: This is currently being coded.  It does not work.
+    if (0) {
         psMemId id = psMemGetId();
         pmFPAview *view = pmFPAviewAlloc(32);
@@ -428 +397 @@
         psMetadata *camera = psMetadataAlloc();
         file->fpa = generateSimpleFPA(camera);
+        pmConfigFileRead(&file->camera, "../dataFiles/camera0/camera.config", "CAMERA");
+        psMetadataPrint(stdout, file->camera, 0);
+        psMetadata *menu = psMetadataLookupMetadata(NULL, file->camera, "EXTNAME.RULES");
+        if (!menu) {
+            printf("NOTE: missing EXTNAME.RULES in camera.config\n");
+            exit(1);
+        }
+
+
         psMetadata *analysis = psMetadataAlloc();
         pmConfig *config = pmConfigAlloc();
@@ -442 +420 @@
         */
 
-        if (0) {
+        if (1) {
             psMetadata *junk = psMetadataAlloc();
             bool rc0 = pmConfigFileRead(&junk, "../dataFiles/recipes/psphot.config", "SAVE.PSF");
@@ -457 +435 @@
             psFree(junk);
         }
-        bool rc0 = pmConfigFileRead(&config->recipes, "../dataFiles/recipes/psphot.config", "SAVE.PSF");
+        if (config->recipes == NULL) printf("COOL: config->recipes is NULL");
+        bool rc0 = pmConfigFileRead(&config->recipes, "../dataFiles/camera0/recipes.config", "PSPHOT");
         if (!rc0) {
-            rc0 = pmConfigFileRead(&config->recipes, "dataFiles/recipes/psphot.config", "SAVE.PSF");
+            rc0 = pmConfigFileRead(&config->recipes, "dataFiles/camera0/recipes.config", "PSPHOT");
         }
         ok(rc0, "Successfully read the PSPHOT recipe file");
+psMetadataPrint(stdout, config->recipes, 0);
+
+        if (config->recipes == NULL) printf("FUCK: config->recipes is NULL");
+        psMetadata *recipe = psMetadataLookupPtr(NULL, config->recipes, "PSPHOT");
+        if (!recipe) {
+            printf("FUCK: missing recipe %s\n", "PSPHOT");
+            exit(1);
+        }
+
 
         bool rc = pmPSFmodelWrite(analysis, view, file, config);
@@ -467 +455 @@
 
         psFree(view);
-        myFreeFPA(file->fpa);
+        psFree(file->fpa);
         file->fpa = NULL;
         psFree(file);