Changeset 21094 for branches/pap_branch_20090108/ppStack/src/ppStackSources.c

Timestamp:

Jan 8, 2009, 4:53:44 PM (17 years ago)

Author:

Paul Price

Message:

Merging changes that were supposed to go onto this branch, but went onto the mainline instead. Decided not to fix the mainline because of risk of conflicts.

File:

• branches/pap_branch_20090108/ppStack/src/ppStackSources.c (modified) (8 diffs)

branches/pap_branch_20090108/ppStack/src/ppStackSources.c

@@ -10 +10 @@
 
 
-bool ppStackSourcesTransparency(const psArray *sourceLists, const pmFPAview *view, const pmConfig *config)
+float ppStackSourcesTransparency(const psArray *sourceLists, const pmFPAview *view, const pmConfig *config)
 {
-    PS_ASSERT_ARRAY_NON_NULL(sourceLists, false);
-    PS_ASSERT_PTR_NON_NULL(view, false);
-    PS_ASSERT_PTR_NON_NULL(config, false);
+    PS_ASSERT_ARRAY_NON_NULL(sourceLists, NAN);
+    PS_ASSERT_PTR_NON_NULL(view, NAN);
+    PS_ASSERT_PTR_NON_NULL(config, NAN);
 
 #ifdef TESTING
@@ -46 +46 @@
     if (!airmassZP) {
         psError(PS_ERR_UNKNOWN, false, "Unable to find ZP.AIRMASS in recipe.");
-        return false;
+        return NAN;
     }
 
@@ -69 +69 @@
                     exptime, airmass, expFilter);
             psFree(zp);
-            return false;
+            return NAN;
         }
 
@@ -79 +79 @@
                         "Unable to find airmass term (ZP.AIRMASS) for filter %s", filter);
                 psFree(zp);
-                return false;
+                return NAN;
             }
         } else if (strcmp(filter, expFilter) != 0) {
             psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Filters don't match: %s vs %s", filter, expFilter);
             psFree(zp);
-            return false;
+            return NAN;
         }
 
@@ -95 +95 @@
         psError(PS_ERR_UNKNOWN, false, "Unable to match sources");
         psFree(zp);
-        return false;
+        return NAN;
     }
     psVector *trans = pmSourceMatchRelphot(matches, zp, iter, tol, starLimit, transIter, transRej,
@@ -128 +128 @@
     if (!trans) {
         psError(PS_ERR_UNKNOWN, false, "Unable to measure transparencies");
-        return false;
+        return NAN;
     }
 
@@ -158 +158 @@
             psError(PS_ERR_UNKNOWN, false, "Unable to match sources");
             psFree(zp);
-            return false;
+            return NAN;
         }
         psVector *trans = pmSourceMatchRelphot(matches, zp, iter, tol, starLimit, transIter, transRej,
@@ -165 +165 @@
     }
 #endif
-    return true;
+
+    return sumExpTime;
 }