Changeset 21424

Timestamp:

Feb 9, 2009, 11:26:05 AM (17 years ago)

Author:

Paul Price

Message:

Merging cnb_branch_20090113. One major conflict (ppSubReadout, due to recent major reorg of this file) easily resolved. Compiles, but not tested.

Location:

trunk/ppSub/src

Files:

• ppSub.c (modified) (2 diffs)
• ppSubArguments.c (modified) (3 diffs)
• ppSubReadout.c (modified) (2 diffs)
• ppSubReadoutSubtract.c (modified) (2 diffs)

trunk/ppSub/src/ppSub.c

@@ -6 +6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-06 01:37:17 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-09 21:26:05 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
@@ -66 +66 @@
     psTimerStop();
 
+    pmSubtractionVisualClose(); //close plot windows, if -visual is set
     psFree(config);
     pmModelClassCleanup();

trunk/ppSub/src/ppSubArguments.c

@@ -6 +6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-07 00:15:00 $
+ *  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-09 21:26:05 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
@@ -252 +252 @@
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-bin2", 0, "Binning factor for second level", 0);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-dumpconfig", 0, "file to dump configuration to", NULL);
+    psMetadataAddBool(arguments, PS_LIST_TAIL, "-visual", 0, "Show diagnostic plots", NULL);
 
     if (argc == 1 || !psArgumentParse(arguments, &argc, argv) || argc != 4) {
@@ -365 +366 @@
     }
 
+    if (psMetadataLookupBool(NULL, arguments, "-visual")) {
+        pmSubtractionSetVisual(true);
+    }
+
     // Translate the kernel type
     psString type = psMetadataLookupStr(NULL, arguments, "-type"); // Name of kernel type

trunk/ppSub/src/ppSubReadout.c

@@ -6 +6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.111 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-06 01:37:17 $
+ *  @version $Revision: 1.112 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-09 21:26:05 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
@@ -52 +52 @@
         return false;
     }
- 
+
     if (!ppSubReadoutPhotometry (config, stats, view)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to subtract background.");

trunk/ppSub/src/ppSubReadoutSubtract.c

@@ -6 +6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-06 03:20:02 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-09 21:26:05 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
@@ -63 +63 @@
     outRO->parent->parent->data_exists = true;
 
+    pmSubtractionVisualShowSubtraction(minuend->image, subtrahend->image, outRO->image);
+
     // copy concepts from the input to the output (XXX should this always use minuend?)
     pmFPAfile *inFile = psMetadataLookupPtr (&mdok, config->files, "PPSUB.INPUT");