Changeset 28013 for trunk/psphot/src/psphotAddNoise.c

Timestamp:

May 18, 2010, 4:11:53 PM (16 years ago)

Author:

eugene

Message:

merge changes from branches/eam_branches/psphot,psModules.20100506 (finish basic psphotStack)

Location:

trunk/psphot

Files:

• . (modified) (1 prop)
• src/psphotAddNoise.c (modified) (4 diffs)

trunk/psphot/src/psphotAddNoise.c

@@ -1 +1 @@
 # include "psphotInternal.h"
 
-bool psphotAddNoise (pmConfig *config, const pmFPAview *view) {
-    return psphotAddOrSubNoise (config, view, true);
+bool psphotAddNoise (pmConfig *config, const pmFPAview *view, const char *filerule) {
+    return psphotAddOrSubNoise (config, view, filerule, true);
 }
 
-bool psphotSubNoise (pmConfig *config, const pmFPAview *view) {
-    return psphotAddOrSubNoise (config, view, false);
+bool psphotSubNoise (pmConfig *config, const pmFPAview *view, const char *filerule) {
+    return psphotAddOrSubNoise (config, view, filerule, false);
 }
 
 // for now, let's store the detections on the readout->analysis for each readout
-bool psphotAddOrSubNoise (pmConfig *config, const pmFPAview *view, bool add)
+bool psphotAddOrSubNoise (pmConfig *config, const pmFPAview *view, const char *filerule, bool add)
 {
     bool status = true;
@@ -23 +23 @@
     // loop over the available readouts
     for (int i = 0; i < num; i++) {
-        if (!psphotAddOrSubNoiseReadout (config, view, "PSPHOT.INPUT", i, recipe, add)) {
-            psError (PSPHOT_ERR_CONFIG, false, "failed on to modify noise for PSPHOT.INPUT entry %d", i);
+        if (!psphotAddOrSubNoiseReadout (config, view, filerule, i, recipe, add)) {
+            psError (PSPHOT_ERR_CONFIG, false, "failed on to modify noise for %s entry %d", filerule, i);
             return false;
         }
@@ -31 +31 @@
 }
 
-bool psphotAddOrSubNoiseReadout (pmConfig *config, const pmFPAview *view, const char *filename, int index, psMetadata *recipe, bool add) {
+bool psphotAddOrSubNoiseReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index, psMetadata *recipe, bool add) {
 
     bool status = false;
@@ -39 +39 @@
 
     // find the currently selected readout
-    pmFPAfile *file = pmFPAfileSelectSingle(config->files, filename, index); // File of interest
+    pmFPAfile *file = pmFPAfileSelectSingle(config->files, filerule, index); // File of interest
     psAssert (file, "missing file?");