Changeset 39926 for trunk/psModules/src/objects

Timestamp:

Jan 6, 2017, 11:30:10 AM (10 years ago)

Author:

eugene

Message:

merging changes from czw dev branch (compare with r39924)

Location:

trunk

Files:

• . (modified) (1 prop)
• psModules/src/objects/pmPCM_MinimizeChisq.c (modified) (5 diffs)
• psModules/src/objects/pmSourceIO_MatchedRefs.c (modified) (1 diff)

trunk/psModules/src/objects/pmPCM_MinimizeChisq.c

@@ -480 +480 @@
 # if (TESTCOPY)
     psImageCopy (pcm->modelConvFlux, pcm->modelFlux, pcm->modelFlux->type.type);
-# else
+# else // TESTCOPY
     if (pcm->use1Dgauss) {
 
@@ -496 +496 @@
         psImageConvolveKernel (pcm->modelConvFlux, pcm->modelFlux, NULL, 0, pcm->psfFFT);
     }
-# endif
+# endif // TESTCOPY
 
     for (int n = 0; n < pcm->dmodelsFlux->n; n++) {
@@ -505 +505 @@
 # if (TESTCOPY)
         psImageCopy (dmodelConv, dmodel, dmodel->type.type);
-# else
+# else // TESTCOPY
         if (pcm->use1Dgauss) {
             if (USE_1D_CACHE) {
@@ -520 +520 @@
             psImageConvolveKernel (dmodelConv, dmodel, NULL, 0, pcm->psfFFT);
         }
-# endif
-    }
-# else
+# endif // TESTCOPY
+    }
+# else // PRE_CONVOLVE
     // convolve model image and derivative images with psf via FFT
     psImageConvolveFFT (pcm->modelConvFlux, pcm->modelFlux, NULL, 0, pcm->psf);
@@ -547 +547 @@
     }
 # endif // PRE-CONVOLVE
-# else
+# else // USE_FFT
     // convolve model image and derivative images with psf direct
     psImageConvolveDirect (pcm->modelConvFlux, pcm->modelFlux, pcm->psf);

trunk/psModules/src/objects/pmSourceIO_MatchedRefs.c

@@ -119 +119 @@
                         psMetadataAdd (row, PS_LIST_TAIL, "RA_REF",     PS_DATA_F64, "right ascension (deg, J2000)", PM_DEG_RAD*ref->sky->r);
                         psMetadataAdd (row, PS_LIST_TAIL, "DEC_REF",    PS_DATA_F64, "declination (deg, J2000)",     PM_DEG_RAD*ref->sky->d);
+                        psMetadataAdd (row, PS_LIST_TAIL, "RA_RAW",     PS_DATA_F64, "right ascension (deg, J2000)", PM_DEG_RAD*raw->sky->r);
+                        psMetadataAdd (row, PS_LIST_TAIL, "DEC_RAW",    PS_DATA_F64, "declination (deg, J2000)",     PM_DEG_RAD*raw->sky->d);
                         psMetadataAdd (row, PS_LIST_TAIL, "X_CHIP_REF", PS_DATA_F32, "x fitted coord on chip",       ref->chip->x);
                         psMetadataAdd (row, PS_LIST_TAIL, "Y_CHIP_REF", PS_DATA_F32, "y fitted coord on chip",       ref->chip->y);