Changeset 37066 for branches/eam_branches/ipp-ops-20130712/psModules/src/objects/pmSourceVisual.c

Timestamp:

Jul 17, 2014, 12:30:45 PM (12 years ago)

Author:

eugene

Message:

merge changes (from past YEAR) into trunk

Location:

branches/eam_branches/ipp-ops-20130712/psModules

Files:

• . (modified) (1 prop)
• src/objects (modified) (1 prop)
• src/objects/pmSourceVisual.c (modified) (2 diffs)

branches/eam_branches/ipp-ops-20130712/psModules/src/objects

@@ -12 +12 @@
 pmSourceIO_CMF_PS1_V1.v1.c
 pmSourceIO_CMF_PS1_V4.c
+pmSourceIO_CMF_PS1_V5.c
 pmSourceIO_CMF_PS1_SV1.c
 pmSourceIO_CMF_PS1_SV2.c
+pmSourceIO_CMF_PS1_SV3.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
-
+pmSourceIO_CMF_PS1_DV4.c

@@ -12 +12 @@
 pmSourceIO_CMF_PS1_V1.v1.c
 pmSourceIO_CMF_PS1_V4.c
+pmSourceIO_CMF_PS1_V5.c
 pmSourceIO_CMF_PS1_SV1.c
 pmSourceIO_CMF_PS1_SV2.c
+pmSourceIO_CMF_PS1_SV3.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
-
+pmSourceIO_CMF_PS1_DV4.c

branches/eam_branches/ipp-ops-20130712/psModules/src/objects/pmSourceVisual.c

@@ -16 +16 @@
 #include "pmMoments.h"
 #include "pmModelFuncs.h"
+#include "pmModelClass.h"
 #include "pmModel.h"
 #include "pmModelUtils.h"
-#include "pmModelClass.h"
 #include "pmSourceMasks.h"
 #include "pmSourceExtendedPars.h"
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"
@@ -544 +545 @@
     psFree (model);
 
+    bool dumpData = false;
+
     // pause and wait for user input:
     // continue, save (provide name), ??
-    pmVisualAskUser(&plotPSF);
+retry:
+    pmVisualAskUserOrDump(&plotPSF, &dumpData);
+    if (dumpData) {
+      char name[128];
+      fprintf (stderr, "filename: ");
+      int status = fscanf (stdin, "%127s", name);
+      if (status != 1) {
+        fprintf (stderr, "odd response\n");
+        goto retry;
+      }
+
+      FILE *f = fopen (name, "w");
+      if (!f) {
+        fprintf (stderr, "cannot open %s for output\n", name);
+        goto retry;
+      }
+      for (int i = 0; i < x->n; i++) {
+        float vModel = pmTrend2DEval (trend, x->data.F32[i], y->data.F32[i]);
+        fprintf (f, "%f %f %f %f %d\n", x->data.F32[i], y->data.F32[i], param->data.F32[i], vModel, mask->data.PS_TYPE_VECTOR_MASK_DATA[i]);
+      }
+      fclose (f);
+      goto retry;
+    }
 
     return true;

@@ -12 +12 @@
 pmSourceIO_CMF_PS1_V1.v1.c
 pmSourceIO_CMF_PS1_V4.c
+pmSourceIO_CMF_PS1_V5.c
 pmSourceIO_CMF_PS1_SV1.c
 pmSourceIO_CMF_PS1_SV2.c
+pmSourceIO_CMF_PS1_SV3.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
-
+pmSourceIO_CMF_PS1_DV4.c