Changeset 25626 for branches/eam_branches/20090715/psModules/src/objects

Timestamp:

Sep 27, 2009, 11:36:17 AM (17 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/20090715/psModules/src/objects

Files:

• pmDetEff.c (modified) (1 diff)
• pmPetrosian.c (modified) (1 prop)
• pmPetrosian.h (modified) (1 prop)
• pmSourceIO.c (modified) (1 diff)

branches/eam_branches/20090715/psModules/src/objects/pmDetEff.c

@@ -164 +164 @@
     }
 
-    return psMetadataAddPtr(readout->analysis, PS_LIST_TAIL, PM_DETEFF_ANALYSIS,
-                            PS_META_REPLACE | PS_DATA_UNKNOWN, "Detection efficiency", de);
+    bool status = psMetadataAddPtr(readout->analysis, PS_LIST_TAIL, PM_DETEFF_ANALYSIS, PS_META_REPLACE | PS_DATA_UNKNOWN, "Detection efficiency", de);
+    psFree (de);
+    return status;
 }

branches/eam_branches/20090715/psModules/src/objects/pmSourceIO.c

@@ -986 +986 @@
 
             if (!pmReadoutReadDetEff(file->fits, readout, deteffname)) {
+#if 0
                 psError(PS_ERR_IO, false, "Unable to read detection efficiency");
                 return false;
+#else
+                // No great loss
+                psErrorClear();
+#endif
             }
         }