Changeset 36162 for branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceIO.c

Timestamp:

Sep 30, 2013, 5:42:28 AM (13 years ago)

Author:

eugene

Message:

adding CFF input for psphotFullForce; adding XGAL output element for psphotFullForce

File:

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

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

@@ -69 +69 @@
                         psString *xfitname,    // Extension name for extended fitted measurements
                         psString *xradname,    // Extension name for radial apertures
+                        psString *xgalname,    // Extension name for galaxy shapes
                         const pmFPAfile *file, // File of interest
                         const pmFPAview *view  // View to level of interest
@@ -140 +141 @@
         }
         *xradname = pmFPAfileNameFromRule (rule, file, view);
+    }
+
+    // EXTNAME for radial apertures
+    if (xgalname) {
+        const char *rule = psMetadataLookupStr(&status, menu, "CMF.XGAL");
+        if (!rule) {
+            psError(PS_ERR_UNKNOWN, true, "missing entry for CMF.XGAL in EXTNAME.RULES in camera.config");
+            return false;
+        }
+        *xgalname = pmFPAfileNameFromRule (rule, file, view);
     }
 
@@ -362 +373 @@
             status &= pmSourcesWrite_##TYPE##_XRAD (file->fits, readout, sources, file->header, xradname, recipe); \
         }                                                               \
+        if (xgalname) {                                                 \
+            status &= pmSourcesWrite_##TYPE##_XGAL (file->fits, sources, xgalname, recipe); \
+        }                                                               \
     }
 
@@ -468 +482 @@
         bool XFIT_OUTPUT = psMetadataLookupBool(&status, recipe, "EXTENDED_SOURCE_FITS");
         bool XRAD_OUTPUT = psMetadataLookupBool(&status, recipe, "RADIAL_APERTURES");
+        bool XGAL_OUTPUT = psMetadataLookupBool(&status, recipe, "GALAXY_SHAPE_ANALYSIS");
 
         // define the EXTNAME values for the different data segments:
@@ -476 +491 @@
         psString xfitname = NULL;
         psString xradname = NULL;
+        psString xgalname = NULL;
         if (!pmSourceIOextnames(&headname, &dataname, &deteffname, 
                                 XSRC_OUTPUT ? &xsrcname : NULL,
                                 XFIT_OUTPUT ? &xfitname : NULL, 
                                 XRAD_OUTPUT ? &xradname : NULL, 
+                                XGAL_OUTPUT ? &xgalname : NULL, 
                                 file, view)) {
             return false;
@@ -563 +580 @@
                 psMetadataAddStr (outhead, PS_LIST_TAIL, "XRADNAME", PS_META_REPLACE, "name of XRAD table extension", xradname);
             }
+            if (xgalname) {
+                psMetadataAddStr (outhead, PS_LIST_TAIL, "XGALNAME", PS_META_REPLACE, "name of XGAL table extension", xgalname);
+            }
 
             // these are case-sensitive since the EXTYPE is case-sensitive
@@ -609 +629 @@
         psFree (xfitname);
         psFree (xradname);
+        psFree (xgalname);
         psFree (deteffname);
 
@@ -620 +641 @@
         psFree (xfitname);
         psFree (xradname);
+        psFree (xgalname);
         psFree (deteffname);
         return false;
@@ -922 +944 @@
     psString xfitname = NULL;
     psString xradname = NULL;
+    psString xgalname = NULL;
 
     psMetadata *tableHeader = NULL;
@@ -988 +1011 @@
         bool XFIT_OUTPUT = psMetadataLookupBool(&status, recipe, "EXTENDED_SOURCE_FITS");
         bool XRAD_OUTPUT = psMetadataLookupBool(&status, recipe, "RADIAL_APERTURES");
+        bool XGAL_OUTPUT = false; // psMetadataLookupBool(&status, recipe, "GALAXY_SHAPES");
 
         if (!pmSourceIOextnames(&headname, &dataname, &deteffname, 
@@ -993 +1017 @@
                 XFIT_OUTPUT ? &xfitname : NULL, 
                 XRAD_OUTPUT ? &xradname : NULL,
+                XGAL_OUTPUT ? &xgalname : NULL,
                 file, view)) {
             return false;