Changeset 7677 for trunk/ppImage/src/ppTest.c

Timestamp:

Jun 23, 2006, 5:33:37 PM (20 years ago)

Author:

Paul Price

Message:

Fixing code after pushing argc,argv into pmConfig.

File:

• trunk/ppImage/src/ppTest.c (modified) (6 diffs)

trunk/ppImage/src/ppTest.c

@@ -11 +11 @@
 // ppImageConfig.c
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    pmConfig *config = pmConfigRead(&argc, argv);
+    pmConfig *config = pmConfigRead(argc, argv);
     if (! config) {
         psErrorStackPrint(stderr, "Can't find site configuration!\n");
@@ -27 +27 @@
     psMetadataAddS32(config->arguments, PS_LIST_TAIL, "-chip", 0, "Chip number to process (if positive)", -1);
 
-    if (! psArgumentParse(config->arguments, &argc, argv) || argc != 3) {
+    if (! psArgumentParse(config->arguments, &config->argc, config->argv) || argc != 3) {
         printf("\nPan-STARRS Phase 2 processing\n\n");
-        printf("Usage: %s INPUT.fits OUTPUT.fits\n\n", argv[0]);
+        printf("Usage: %s INPUT.fits OUTPUT.fits\n\n", config->argv[0]);
         psArgumentHelp(config->arguments);
         psFree(config->arguments);
@@ -36 +36 @@
 
     // Add the input and output images (which remain on the command-line) to the arguments list
-    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-input",  0, "Name of the input image",  argv[1]);
-    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-output", 0, "Name of the output image", argv[2]);
+    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-input",  0, "Name of the input image",
+                     config->argv[1]);
+    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-output", 0, "Name of the output image",
+                     config->argv[2]);
 
     // Define database handle, if used
@@ -103 +105 @@
     pmFPAview *mosaicView = pmFPAviewAlloc(0);
     pmFPAAddSourceFromView(mosaicFPA, mosaicView, mosaicFormat);
+    psFree(mosaicView);
 #endif
 
@@ -110 +113 @@
 #if 0
     psArray *chips = fpa->chips;
-    //pmFPAWrite(fpa, outFile, NULL, false);
+    pmFPAWrite(fpa, outFile, NULL, false, false);
     for (int i = 0; i < chips->n; i++) {
+        printf("Chip %d\n", i);
         pmChip *chip = chips->data[i];
+        pmChipRead(chip, inFile, NULL);
+#if 0
         //pmChipRead(chip, inFile, NULL);
         //pmChipWrite(chip, outFile, NULL, false);
@@ -129 +135 @@
             psFree(readout);
         }
-        pmChipMosaic(mosaicFPA->chips->data[0], chip);
+#endif
+        pmChipMosaic(mosaicFPA->chips->data[i], chip);
+        pmChipWrite(mosaicFPA->chips->data[i], outFile, NULL, true, true);
+        pmChipFreeData(chip);
+        pmChipFreeData(mosaicFPA->chips->data[i]);
     }
 #endif
 
+#if 1
     pmFPAMosaic(mosaicFPA, fpa);
-
-#if 1
     pmFPAWrite(mosaicFPA, outFile, NULL, true, true);
-    pmFPAPrint(stdout, mosaicFPA, true, true);
+    //pmFPAPrint(stdout, mosaicFPA, true, true);
     psFree(mosaicCamera);
     psFree(mosaicFormat);
     psFree(mosaicView);
-    psFree(mosaicFPA);
+    //psFree(mosaicFPA);
 #endif