Changeset 34772 for branches/czw_branch/20120906/psModules/src/objects/pmSourcePhotometry.c

Timestamp:

Dec 6, 2012, 6:32:19 PM (14 years ago)

Author:

watersc1

Message:

merge from trunk. Preliminary versions of stacktool/warptool updates and regenerate_background.pl script. The warp code is finished and tested, and I still need to get the stack version resolved.

Location:

branches/czw_branch/20120906/psModules

Files:

• . (modified) (1 prop)
• src/objects (modified) (1 prop)
• src/objects/pmSourcePhotometry.c (modified) (1 diff)

branches/czw_branch/20120906/psModules/src/objects

@@ -7 +7 @@
 pmSourceIO_CMF_PS1_V1.c
 pmSourceIO_CMF_PS1_V2.c
+pmSourceIO_CMF_PS1_V2.v1.c
 pmSourceIO_CMF_PS1_V3.c
+pmSourceIO_CMF_PS1_V3.v1.c
+pmSourceIO_CMF_PS1_V1.v1.c
 pmSourceIO_CMF_PS1_V4.c
 pmSourceIO_CMF_PS1_SV1.c
+pmSourceIO_CMF_PS1_SV2.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
+pmSourceIO_CMF_PS1_DV3.c
+

@@ -7 +7 @@
 pmSourceIO_CMF_PS1_V1.c
 pmSourceIO_CMF_PS1_V2.c
+pmSourceIO_CMF_PS1_V2.v1.c
 pmSourceIO_CMF_PS1_V3.c
+pmSourceIO_CMF_PS1_V3.v1.c
+pmSourceIO_CMF_PS1_V1.v1.c
 pmSourceIO_CMF_PS1_V4.c
 pmSourceIO_CMF_PS1_SV1.c
+pmSourceIO_CMF_PS1_SV2.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
+pmSourceIO_CMF_PS1_DV3.c
+

branches/czw_branch/20120906/psModules/src/objects/pmSourcePhotometry.c

@@ -165 +165 @@
             status = pmSourcePhotometryModel (&model->mag, NULL, model);
             if (model == source->modelEXT) foundEXT = true;
+            float SN = fabs(model->params->data.F32[PM_PAR_I0] / model->dparams->data.F32[PM_PAR_I0]);
+            model->magErr = 1.0 / SN;
         }
         if (foundEXT) {

@@ -7 +7 @@
 pmSourceIO_CMF_PS1_V1.c
 pmSourceIO_CMF_PS1_V2.c
+pmSourceIO_CMF_PS1_V2.v1.c
 pmSourceIO_CMF_PS1_V3.c
+pmSourceIO_CMF_PS1_V3.v1.c
+pmSourceIO_CMF_PS1_V1.v1.c
 pmSourceIO_CMF_PS1_V4.c
 pmSourceIO_CMF_PS1_SV1.c
+pmSourceIO_CMF_PS1_SV2.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
+pmSourceIO_CMF_PS1_DV3.c
+