Changeset 27517 for branches/eam_branches/20100225/ppStack/src/ppStackOptions.c

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• ppStack/src/ppStackOptions.c (modified) (4 diffs)

branches/eam_branches/20100225/ppStack/src/ppStackOptions.c

@@ -21 +21 @@
     psFree(options->psf);
     psFree(options->inputSeeing);
+    psFree(options->exposures);
     psFree(options->inputMask);
     psFree(options->sourceLists);
@@ -32 +33 @@
     psFree(options->convCovars);
     psFree(options->outRO);
-    psFree(options->unconvRO);
+    psFree(options->expRO);
     psFree(options->inspect);
     psFree(options->rejected);
@@ -56 +57 @@
     options->convVariances = NULL;
     options->num = 0;
+    options->quality = 0;
     options->psf = NULL;
+    options->sumExposure = NAN;
+    options->zp = NAN;
     options->inputSeeing = NULL;
+    options->exposures = NULL;
     options->targetSeeing = NAN;
     options->inputMask = NULL;
@@ -72 +77 @@
     options->convCovars = NULL;
     options->outRO = NULL;
-    options->unconvRO = NULL;
+    options->expRO = NULL;
     options->inspect = NULL;
     options->rejected = NULL;