Changeset 6336 for trunk/ippTools/src/pxframes.c

Timestamp:

Feb 7, 2006, 10:19:58 AM (20 years ago)

Author:

jhoblitt

Message:

remove p0CameraConfig tables
update database table formats

File:

• trunk/ippTools/src/pxframes.c (modified) (5 diffs)

trunk/ippTools/src/pxframes.c

@@ -53 +53 @@
         for (int j = 0; j < frame->images->n; j++) { \
             imfiletype##Row *image = frame->images->data[j]; \
-            fprintf (stream, "%s %s %s %s\n", \
-                image->exp_id, image->class, image->class_id, image->url); \
+            fprintf (stream, "%s %s %s\n", \
+                image->exp_id, image->class_id, image->url); \
             psMetadata *md = imfiletype##MetadataFromObject(image); \
             psMetadataAddMetadata(output, PS_LIST_TAIL, #imfiletype,  PS_META_DUPLICATE_OK, NULL, md); \
@@ -120 +120 @@
 rawScienceFrame *newToRawScienceFrame(newFrame *newFrame) 
 {
-    newExpRow       *newExp = NULL;
-
     PS_ASSERT_PTR_NON_NULL(newFrame, NULL);
 
-    newExp = newFrame->exposure;
+    newExpRow *newExp = newFrame->exposure;
     rawScienceExpRow *rawScienceExp = rawScienceExpRowAlloc(
         newExp->exp_id,
         newExp->camera,
+        newExp->telescope,
         newExp->exp_type,
-        newExp->filter,
         newExp->class,
-        newExp->nclass,
-        newExp->stats
+        newExp->imfiles,
+        "my filter",
+        "my stats"
     );
 
@@ -142 +141 @@
         psArrayAdd(rawImages, 0, rawImfileRowAlloc(
                 newImfile->exp_id,
-                newImfile->class,
                 newImfile->class_id,
-                newImfile->stats,
-                newImfile->url
+                newImfile->url,
+                "my stats"
             )
         );
@@ -187 +185 @@
         newExp->exp_id,
         newExp->camera,
+        newExp->telescope,
         newExp->exp_type,
-        newExp->filter,
         newExp->class,
-        newExp->nclass,
-        newExp->stats
+        newExp->imfiles,
+        "my filter",
+        "my stats"
     );
 
@@ -201 +200 @@
         psArrayAdd(rawImages, 0, rawImfileRowAlloc(
                 newImfile->exp_id,
-                newImfile->class,
                 newImfile->class_id,
-                newImfile->stats,
-                newImfile->url
+                newImfile->url,
+                "my stats"
             )
         );