Changeset 36929

Timestamp:

Jun 20, 2014, 4:12:11 PM (12 years ago)

Author:

eugene

Message:

merging mods from ipp-pv3-20140616

Location:

tags/ipp-pv3-cr-20140614

Files:

• ippconfig/recipes (modified) (1 prop)
• ippconfig/recipes/ppSub.config (modified) (1 prop)
• ippconfig/recipes/psphot.config (modified) (1 diff)
• ippconfig/recipes/reductionClasses.mdc (modified) (1 prop)
• psModules/src/config (modified) (1 prop)
• psModules/src/objects (modified) (1 prop)
• psModules/src/objects/pmSourceIO.c (modified) (5 diffs)

tags/ipp-pv3-cr-20140614/ippconfig/recipes/psphot.config

@@ -730 +730 @@
     EXTENDED_SOURCE_PETROSIAN BOOL  TRUE    # To measure petrosian magnitudes
     EXTENDED_SOURCE_ANNULI  BOOL    TRUE
+    LENSING_PARAMETERS      BOOL    TRUE
     SAVE.PSF                BOOL    FALSE
     SAVE.BACKMDL            BOOL    FALSE
     SAVE.RESID              BOOL    FALSE
-    OUTPUT.FORMAT           STR     PS1_SV3
-END
+    OUTPUT.FORMAT           STR     PS1_V5
+END

tags/ipp-pv3-cr-20140614/psModules/src/objects/pmSourceIO.c

@@ -1129 +1129 @@
             PM_SOURCES_READ_PSF("PS1_DV4",   CMF_PS1_DV4);
 
+            if (!sources) {
+                psError(PS_ERR_IO, false, "reading CMF data from %s with format %s\n", file->filename, exttype);
+                return false;
+            }
+
             long *sourceIndex = NULL;
             if (XSRC_OUTPUT || XFIT_OUTPUT || XRAD_OUTPUT || XGAL_OUTPUT) {
@@ -1406 +1411 @@
         PM_SOURCES_READ_XSRC("PS1_SV1",   CMF_PS1_SV1);
         PM_SOURCES_READ_XSRC("PS1_SV2",   CMF_PS1_SV2);
+        PM_SOURCES_READ_XSRC("PS1_SV3",   CMF_PS1_SV3);
         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);
+        PM_SOURCES_READ_XSRC("PS1_DV4",   CMF_PS1_DV4);
     }
     psFree(tableHeader);
@@ -1446 +1453 @@
         PM_SOURCES_READ_XFIT("PS1_SV1",   CMF_PS1_SV1);
         PM_SOURCES_READ_XFIT("PS1_SV2",   CMF_PS1_SV2);
+        PM_SOURCES_READ_XFIT("PS1_SV3",   CMF_PS1_SV3);
         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);
+        PM_SOURCES_READ_XFIT("PS1_DV4",   CMF_PS1_DV4);
     }
     psFree(tableHeader);
@@ -1485 +1494 @@
         PM_SOURCES_READ_XRAD("PS1_SV1",   CMF_PS1_SV1);
         PM_SOURCES_READ_XRAD("PS1_SV2",   CMF_PS1_SV2);
+        PM_SOURCES_READ_XRAD("PS1_SV3",   CMF_PS1_SV3);
         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);
+        PM_SOURCES_READ_XRAD("PS1_DV4",   CMF_PS1_DV4);
     }
     psFree(tableHeader);
@@ -1524 +1535 @@
         PM_SOURCES_READ_XGAL("PS1_SV1",   CMF_PS1_SV1);
         PM_SOURCES_READ_XGAL("PS1_SV2",   CMF_PS1_SV2);
+        PM_SOURCES_READ_XGAL("PS1_SV3",   CMF_PS1_SV3);
         PM_SOURCES_READ_XGAL("PS1_DV1",   CMF_PS1_DV1);
         PM_SOURCES_READ_XGAL("PS1_DV2",   CMF_PS1_DV2);
         PM_SOURCES_READ_XGAL("PS1_DV3",   CMF_PS1_DV3);
+        PM_SOURCES_READ_XGAL("PS1_DV4",   CMF_PS1_DV4);
     }
     psFree(tableHeader);