Changeset 36680 for branches/eam_branches/ps2-tc3-20130727/psModules/src/objects/pmSourceIO_SMPDATA.c

Timestamp:

Apr 21, 2014, 5:42:34 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

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

branches/eam_branches/ps2-tc3-20130727/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

@@ -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

branches/eam_branches/ps2-tc3-20130727/psModules/src/objects/pmSourceIO_SMPDATA.c

@@ -44 +44 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourceSatstar.h"
+#include "pmSourceLensing.h"
 #include "pmSource.h"
 #include "pmSourceFitModel.h"
@@ -225 +226 @@
     return true;
 } 
+
+bool pmSourcesWrite_SMPDATA_XGAL(psFits *fits, pmReadout *readout, psArray *sources, char *extname, psMetadata *recipe)
+{
+    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