Changeset 37828 for branches/eam_branches/ipp-pv3-20140717-merge/psModules/src/objects/pmPSFtryMakePSF.c

Timestamp:

Jan 12, 2015, 12:36:24 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-pv3-20140717-merge/psModules/src/objects

Files:

• . (modified) (1 prop)
• pmPSFtryMakePSF.c (modified) (2 diffs)

branches/eam_branches/ipp-pv3-20140717-merge/psModules/src/objects

@@ -16 +16 @@
 pmSourceIO_CMF_PS1_SV2.c
 pmSourceIO_CMF_PS1_SV3.c
+pmSourceIO_CMF_PS1_SV4.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
 pmSourceIO_CMF_PS1_DV4.c
+

@@ -16 +16 @@
 pmSourceIO_CMF_PS1_SV2.c
 pmSourceIO_CMF_PS1_SV3.c
+pmSourceIO_CMF_PS1_SV4.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-pv3-20140717-merge/psModules/src/objects/pmPSFtryMakePSF.c

@@ -45 +45 @@
 #include "pmSourceVisual.h"
 
+bool pmPSF_DataDump (char *filename, psVector *x, psVector *y, psVector *e0, psVector *e1, psVector *e2, psVector *mask);
+
 /*****************************************************************************
 pmPSFFromPSFtry (psfTry): build a PSF model from a collection of source->modelEXT entries
@@ -356 +358 @@
 }
 
+bool pmPSF_DataDump (char *filename, psVector *x, psVector *y, psVector *e0, psVector *e1, psVector *e2, psVector *mask) {
+
+
+  FILE *f = fopen (filename, "w");
+  if (!f) return false;
+
+  for (int i = 0; i < x->n; i++) {
+
+    fprintf (f, "%6.1f %6.1f : %5.2f %5.2f %5.2f : %2d\n", 
+             x->data.F32[i], 
+             y->data.F32[i], 
+             e0->data.F32[i], 
+             e1->data.F32[i], 
+             e2->data.F32[i], 
+             mask->data.U8[i]);
+  }
+  fclose (f);
+  return true;
+}

@@ -16 +16 @@
 pmSourceIO_CMF_PS1_SV2.c
 pmSourceIO_CMF_PS1_SV3.c
+pmSourceIO_CMF_PS1_SV4.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
 pmSourceIO_CMF_PS1_DV4.c
+