Changeset 37966 for trunk/ppSub/src/ppSubCamera.c

Timestamp:

Mar 11, 2015, 7:38:53 PM (11 years ago)

Author:

eugene

Message:

add checkFileruleFileSave to use the value of FILERULE:FILE.SAVE to set i/o option; set the warp-to-chip map info

File:

• trunk/ppSub/src/ppSubCamera.c (modified) (17 diffs)

trunk/ppSub/src/ppSubCamera.c

@@ -22 +22 @@
 #include "ppSub.h"
 
+bool checkFileruleFileSave (pmFPAfile *file, pmConfig *config) {
+
+  bool status;
+
+  psMetadata *filerule = pmConfigFileRule(config, file->camera, file->name); // File rule
+  if (!filerule) return false;
+
+  char *myString = psMetadataLookupStr(&status, filerule, "FILE.SAVE");
+  if (!myString) return false;
+
+  // do not change the value from the default unless TRUE or FALSE are found
+  if (!strcasecmp(myString, "TRUE")) {
+    file->save = true;
+    return true;
+  } 
+  if (!strcasecmp(myString, "FALSE")) {
+    file->save = false;
+    return true;
+  } 
+ 
+  return false;
+}
+
 // Define an input file
 static pmFPAfile *defineInputFile(bool *success,
@@ -131 +154 @@
         }
         if (file) {
-            // It's an output
-            file->save = true;
+            // It's an output (respect filerules)
+          checkFileruleFileSave(file, config); 
         }
     }
@@ -244 +267 @@
         return false;
     }
+    // these ->save values below are set by command-line arguments (in ppSubArguments.c) : -save-inconv, -save-refconv
     inConvImage->save = data->saveInConv;
     inConvMask->save = data->saveInConv;
@@ -283 +307 @@
         return false;
     }
-    output->save = true;
-    outMask->save = true;
+    checkFileruleFileSave (output, config);
+    checkFileruleFileSave (outMask, config);
     if (inVar && refVar) {
         pmFPAfile *outVar = defineOutputFile(config, output, false, "PPSUB.OUTPUT.VARIANCE",
@@ -292 +316 @@
             return false;
         }
-        outVar->save = true;
+        checkFileruleFileSave (outVar, config);
     }
 
@@ -305 +329 @@
             return false;
         }
-        inverse->save = true;
-        invMask->save = true;
+        checkFileruleFileSave (inverse, config);
+        checkFileruleFileSave (invMask, config);
         if (inVar && refVar) {
             pmFPAfile *invVar = defineOutputFile(config, inverse, false, "PPSUB.INVERSE.VARIANCE",
@@ -314 +338 @@
                 return false;
             }
-            invVar->save = true;
+            checkFileruleFileSave(invVar, config);
         }
     }
@@ -329 +353 @@
         return false;
     }
-    jpeg1->save = true;
+    checkFileruleFileSave(jpeg1, config);
     pmFPAfile *jpeg2 = pmFPAfileDefineOutput(config, NULL, "PPSUB.OUTPUT.JPEG2");
     if (!jpeg2) {
@@ -339 +363 @@
         return false;
     }
-    jpeg2->save = true;
+    checkFileruleFileSave(jpeg2, config);
 
     // Output residual JPEG
@@ -351 +375 @@
         return false;
     }
-    jpeg3->save = true;
+    checkFileruleFileSave(jpeg3, config);
 
     // Output subtraction kernel
@@ -395 +419 @@
         // Deactivate psphot output sources --- we want to define output source files of our own
         pmFPAfile *psphotOutput = pmFPAfileSelectSingle(config->files, "PSPHOT.OUTPUT", 0);
-        psphotOutput->save = false;
+        psphotOutput->save = false;  // this one should NOT be set
 
         pmFPAfile *outSources = defineOutputFile(config, output, false, "PPSUB.OUTPUT.SOURCES",
@@ -403 +427 @@
             return false;
         }
-        outSources->save = true;
+        checkFileruleFileSave(outSources, config);
 
         if (data->inverse) {
@@ -412 +436 @@
                 return false;
             }
-            invSources->save = true;
+            checkFileruleFileSave(invSources, config);
         }
 
@@ -423 +447 @@
                 return false;
             }
-            posSources1->save = true;
+            checkFileruleFileSave(posSources1, config);
 
             // this pmFPAfile is used to carry sources detected in the diff image @ the positions from positive image #1
@@ -431 +455 @@
                 return false;
             }
-            frcSources1->save = true;
+            checkFileruleFileSave(frcSources1, config);
         }
 
@@ -441 +465 @@
                 return false;
             }
-            posSources2->save = true;
+            checkFileruleFileSave(posSources2, config);
 
             // this pmFPAfile is used to carry sources detected in the diff image @ the positions from positive image #2
@@ -449 +473 @@
                 return false;
             }
-            frcSources2->save = true;
+            checkFileruleFileSave(frcSources2, config);
         }
     }