Changeset 38058 for branches/eam_branches/ipp-20150112/psModules/src/objects/pmSourceIO.c

Timestamp:

Mar 29, 2015, 6:08:31 AM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20150112/psModules/src/objects

Files:

• . (modified) (2 props)
• pmSourceIO.c (modified) (6 diffs)

branches/eam_branches/ipp-20150112/psModules/src/objects

@@ -21 +21 @@
 pmSourceIO_CMF_PS1_DV3.c
 pmSourceIO_CMF_PS1_DV4.c
-
+pmSourceIO_CMF_PS1_DV5.c

@@ -21 +21 @@
 pmSourceIO_CMF_PS1_DV3.c
 pmSourceIO_CMF_PS1_DV4.c
-
+pmSourceIO_CMF_PS1_DV5.c

branches/eam_branches/ipp-20150112/psModules/src/objects/pmSourceIO.c

@@ -607 +607 @@
             PM_SOURCES_WRITE("PS1_DV3",   CMF_PS1_DV3);
             PM_SOURCES_WRITE("PS1_DV4",   CMF_PS1_DV4);
+            PM_SOURCES_WRITE("PS1_DV5",   CMF_PS1_DV5);
 
             psFree (outhead);
@@ -1130 +1131 @@
             PM_SOURCES_READ_PSF("PS1_DV3",   CMF_PS1_DV3);
             PM_SOURCES_READ_PSF("PS1_DV4",   CMF_PS1_DV4);
+            PM_SOURCES_READ_PSF("PS1_DV5",   CMF_PS1_DV5);
 
             if (!sources) {
@@ -1419 +1421 @@
         PM_SOURCES_READ_XSRC("PS1_DV3",   CMF_PS1_DV3);
         PM_SOURCES_READ_XSRC("PS1_DV4",   CMF_PS1_DV4);
+        PM_SOURCES_READ_XSRC("PS1_DV5",   CMF_PS1_DV5);
     }
     psFree(tableHeader);
@@ -1462 +1465 @@
         PM_SOURCES_READ_XFIT("PS1_DV3",   CMF_PS1_DV3);
         PM_SOURCES_READ_XFIT("PS1_DV4",   CMF_PS1_DV4);
+        PM_SOURCES_READ_XFIT("PS1_DV5",   CMF_PS1_DV5);
     }
     psFree(tableHeader);
@@ -1504 +1508 @@
         PM_SOURCES_READ_XRAD("PS1_DV3",   CMF_PS1_DV3);
         PM_SOURCES_READ_XRAD("PS1_DV4",   CMF_PS1_DV4);
+        PM_SOURCES_READ_XRAD("PS1_DV5",   CMF_PS1_DV5);
     }
     psFree(tableHeader);
@@ -1546 +1551 @@
         PM_SOURCES_READ_XGAL("PS1_DV3",   CMF_PS1_DV3);
         PM_SOURCES_READ_XGAL("PS1_DV4",   CMF_PS1_DV4);
+        PM_SOURCES_READ_XGAL("PS1_DV5",   CMF_PS1_DV5);
     }
     psFree(tableHeader);

@@ -21 +21 @@
 pmSourceIO_CMF_PS1_DV3.c
 pmSourceIO_CMF_PS1_DV4.c
-
+pmSourceIO_CMF_PS1_DV5.c