Changeset 34383 for branches/eam_branches/ipp-20120805/psModules/src/objects/pmSourceIO.c

Timestamp:

Sep 4, 2012, 1:22:26 PM (14 years ago)

Author:

eugene

Message:

added cmf formats PS1_V4 and PS1_SV2 to both psModules and Ohana/libautocode; checked that they both work; checked that dvo schema PS1_V4 can be loaded and read

File:

• branches/eam_branches/ipp-20120805/psModules/src/objects/pmSourceIO.c (modified) (5 diffs)

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

@@ -575 +575 @@
             PM_SOURCES_WRITE("PS1_V4",    CMF_PS1_V4);
             PM_SOURCES_WRITE("PS1_SV1",   CMF_PS1_SV1);
+            PM_SOURCES_WRITE("PS1_SV2",   CMF_PS1_SV2);
             PM_SOURCES_WRITE("PS1_DV1",   CMF_PS1_DV1);
             PM_SOURCES_WRITE("PS1_DV2",   CMF_PS1_DV2);
+            PM_SOURCES_WRITE("PS1_DV3",   CMF_PS1_DV3);
 
             psFree (outhead);
@@ -1048 +1050 @@
             PM_SOURCES_READ_PSF("PS1_V4",    CMF_PS1_V4);
             PM_SOURCES_READ_PSF("PS1_SV1",   CMF_PS1_SV1);
+            PM_SOURCES_READ_PSF("PS1_SV2",   CMF_PS1_SV2);
             PM_SOURCES_READ_PSF("PS1_DV1",   CMF_PS1_DV1);
             PM_SOURCES_READ_PSF("PS1_DV2",   CMF_PS1_DV2);
+            PM_SOURCES_READ_PSF("PS1_DV3",   CMF_PS1_DV3);
 
             long *sourceIndex = NULL;
@@ -1254 +1258 @@
         PM_SOURCES_READ_XSRC("PS1_V4",    CMF_PS1_V4);
         PM_SOURCES_READ_XSRC("PS1_SV1",   CMF_PS1_SV1);
+        PM_SOURCES_READ_XSRC("PS1_SV2",   CMF_PS1_SV2);
         PM_SOURCES_READ_XSRC("PS1_DV1",   CMF_PS1_DV1);
         PM_SOURCES_READ_XSRC("PS1_DV2",   CMF_PS1_DV2);
+        PM_SOURCES_READ_XSRC("PS1_DV3",   CMF_PS1_DV3);
     }
     psFree(tableHeader);
@@ -1290 +1296 @@
         PM_SOURCES_READ_XFIT("PS1_V4",    CMF_PS1_V4);
         PM_SOURCES_READ_XFIT("PS1_SV1",   CMF_PS1_SV1);
+        PM_SOURCES_READ_XFIT("PS1_SV2",   CMF_PS1_SV2);
         PM_SOURCES_READ_XFIT("PS1_DV1",   CMF_PS1_DV1);
         PM_SOURCES_READ_XFIT("PS1_DV2",   CMF_PS1_DV2);
+        PM_SOURCES_READ_XFIT("PS1_DV3",   CMF_PS1_DV3);
     }
     psFree(tableHeader);
@@ -1325 +1333 @@
         PM_SOURCES_READ_XRAD("PS1_V4",    CMF_PS1_V4);
         PM_SOURCES_READ_XRAD("PS1_SV1",   CMF_PS1_SV1);
+        PM_SOURCES_READ_XRAD("PS1_SV2",   CMF_PS1_SV2);
         PM_SOURCES_READ_XRAD("PS1_DV1",   CMF_PS1_DV1);
         PM_SOURCES_READ_XRAD("PS1_DV2",   CMF_PS1_DV2);
+        PM_SOURCES_READ_XRAD("PS1_DV3",   CMF_PS1_DV3);
     }
     psFree(tableHeader);