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

Timestamp:

Aug 8, 2006, 6:27:04 PM (20 years ago)

Author:

jhoblitt

Message:

major overhaul to p0search;

remove -pending
remove -update
add -pendingimfile
add -pendingexp (not yet working)
add -updateexp
add -updateimfile

move newToRawDetrendExp() from pxframes.c -> p0search.c

File:

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

trunk/ippTools/src/pxframes.c

@@ -6 +6 @@
 
 #include "pxtools.h"
-
-static rawDetrendExpRow *newToRawDetrendExp(pxConfig *config, newExpRow *exp);
 
 #define PX_FRAME_ALLOC(frametype, exptype) \
@@ -160 +158 @@
 }
 
+/*
 rawDetrendFrame *newToRawDetrendFrame(pxConfig *config, newFrame *newFrame) 
 {
@@ -189 +188 @@
     return rawDetrendFrame;
 }
+*/
 
 bool rawDetrendFrameInsert(pxConfig *config, rawDetrendFrame *frame)
@@ -213 +213 @@
     return true;
 }
-
-static rawDetrendExpRow *newToRawDetrendExp(pxConfig *config, newExpRow *exp)
-{
-    PS_ASSERT_PTR_NON_NULL(config, NULL);
-    PS_ASSERT_PTR_NON_NULL(exp, NULL);
-
-    bool status = false;
-    psString filter = psMetadataLookupStr(&status, config->args, "-filter");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -filter");
-        return false;
-    }
-    if (!filter) {
-        psError(PS_ERR_UNKNOWN, true, "-filter is required");
-        return false;
-    }
-    psF32 airmass = psMetadataLookupF32(&status, config->args, "-airmass");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -airmass");
-        return false;
-    }
-    if (isnan(airmass)) {
-        psError(PS_ERR_UNKNOWN, true, "-airmass is required");
-        return false;
-    }
-    psF64 ra = psMetadataLookupF64(&status, config->args, "-ra");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -ra");
-        return false;
-    }
-    if (isnan(ra)) {
-        psError(PS_ERR_UNKNOWN, true, "-airmass is required");
-        return false;
-    }
-    psF64 decl = psMetadataLookupF64(&status, config->args, "-decl");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -decl");
-        return false;
-    }
-    if (isnan(decl)) {
-        psError(PS_ERR_UNKNOWN, true, "-decl is required");
-        return false;
-    }
-    psF32 exp_time = psMetadataLookupF32(&status, config->args, "-exp_time");
-    if (isnan(exp_time)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_time");
-        return false;
-    }
-    if (!exp_time) {
-        psError(PS_ERR_UNKNOWN, true, "-exp_time is required");
-        return false;
-    }
-    psF64 background = psMetadataLookupF64(&status, config->args, "-background");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -background");
-        return false;
-    }
-    if (!exp_time) {
-        psError(PS_ERR_UNKNOWN, true, "-background is required");
-        return false;
-    }
-
-    return rawDetrendExpRowAlloc(
-        exp->exp_id,
-        exp->camera,
-        exp->telescope,
-        exp->exp_type,
-        exp->imfiles,
-        filter,
-        airmass,
-        ra,
-        decl,
-        exp_time,
-        background
-    );
-}