Changeset 33415 for branches/meh_branches/ppstack_test/ppStack/src/ppStackSources.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ppStack/src/ppStackSources.c (modified) (6 diffs)

branches/meh_branches/ppstack_test/ppStack/src/ppStackSources.c

@@ -1 +1 @@
 #include "ppStack.h"
 
-//#define TESTING                         // Enable debugging output
+#define TESTING                         // Enable debugging output
 
 //#define ASTROMETRY                    // Correct astrometry?
@@ -7 +7 @@
 #ifdef TESTING
 // Size of fake image; set by hand because it's trouble to get it from other places
-#define FAKE_COLS 4861
-#define FAKE_ROWS 4913
+//#define FAKE_COLS 4861
+//#define FAKE_ROWS 4913
+#define FAKE_COLS 1000
+#define FAKE_ROWS 1000
 #endif
 
@@ -57 +59 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
+    //MEH - added for not matchZP option - need to fix logic
+    psLogMsg("ppStack", PS_LOG_WARN, "TESTING:options: %d : %d", options->matchZPs,options->photometry);
+    if (!options->matchZPs) {
+        options->norm = psVectorAlloc(options->num, PS_TYPE_F32);
+        psVectorInit(options->norm, 0.0);
+    }
+    // -----
+
     if (!options->matchZPs && !options->photometry) {
-        options->norm = psVectorAlloc(options->num, PS_TYPE_F32);
+        options->norm = psVectorAlloc(options->num, PS_TYPE_F32);
         psVectorInit(options->norm, 0.0);
         return true;
@@ -71 +81 @@
     PS_ASSERT_VECTOR_SIZE(inputMask, sourceLists->n, false);
 
-#if defined(TESTING) && 1
+//MEH 1->0 - dont want to add offsets until understand what it doing
+#if defined(TESTING) && 0
     {
         // Deliberately induce a major transparency difference
@@ -159 +170 @@
         pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPSTACK.INPUT", i); // File of interest
 
-#if defined(TESTING) && 0
+//MEH 0->1
+#if defined(TESTING) && 1
         pmReadout *fake = pmReadoutAlloc(NULL); // Fake readout
         pmPSF *psf = psMetadataLookupPtr(NULL, config->arguments, "PSF.TARGET"); // PSF for fake image
@@ -333 +345 @@
                 psArray *sources = sourceLists->data[i]; // Sources of interest
                 float magCorr = zp->data.F32[i] - trans->data.F32[i] - 2.5*log10(options->sumExposure) - airmassTerm * airmassTarget;
+                //MEH
+                psLogMsg("ppStack", PS_LOG_INFO,"TESTING:: %d: %f %f %f\n",i,magCorr,trans->data.F32[i],zp->data.F32[i]);
                 if (zpExpNum == numGoodImages) { // case (a)
                     // Using measured zero points, so attempt to set target zero point
                     // XXX see NOTE above regarding case (b) : this is wrong.  the code should load a nominal zero point and supply it above
                     // 
-                    magCorr -= zpTarget;
+                    magCorr -= zpTarget;
+                    //MEH
+                    psLogMsg("ppStack", PS_LOG_INFO,"TESTING:if: %d: %f %f %f\n",i,magCorr,trans->data.F32[i],zp->data.F32[i]);
                 }
                 options->norm->data.F32[i] = magCorr;