Changeset 7818 for trunk/ppImage/src

Timestamp:

Jul 5, 2006, 12:57:39 PM (20 years ago)

Author:

Paul Price

Message:

API change to pmConfigRead.

Location:

trunk/ppImage/src

Files:

• ppFocusArguments.c (modified) (3 diffs)
• ppImageArguments.c (modified) (3 diffs)
• ppTest.c (modified) (3 diffs)

trunk/ppImage/src/ppFocusArguments.c

@@ -14 +14 @@
 
     // load the site-wide configuration information
-    pmConfig *config = pmConfigRead(argc, argv);
+    pmConfig *config = pmConfigRead(&argc, argv);
     if (config == NULL) {
         psErrorStackPrint(stderr, "Can't find site configuration!\n");
@@ -30 +30 @@
 
     // recipe option: -usemask : override MASK setting in phase2.recipe
-    if ((N = psArgumentGet(config->argc, config->argv, "-usemask"))) {
-        psArgumentRemove (N, &config->argc, config->argv);
+    if ((N = psArgumentGet(argc, argv, "-usemask"))) {
+        psArgumentRemove (N, &argc, argv);
         psMetadataAddBool (options, PS_LIST_TAIL, "MASK", PS_META_REPLACE, "", true);
-        psArgumentRemove (N, &config->argc, config->argv);
+        psArgumentRemove (N, &argc, argv);
     }
 
@@ -54 +54 @@
 
     // chip selection is used to limit chips to be processed
-    if ((N = psArgumentGet (config->argc, config->argv, "-chip"))) {
-        psArgumentRemove (N, &config->argc, config->argv);
+    if ((N = psArgumentGet (argc, argv, "-chip"))) {
+        psArgumentRemove (N, &argc, argv);
         psMetadataAddStr (config->arguments, PS_LIST_TAIL, "CHIP_SELECTIONS", PS_DATA_STRING, "",
-                          config->argv[N]);
-        psArgumentRemove (N, &config->argc, config->argv);
+                          argv[N]);
+        psArgumentRemove (N, &argc, argv);
     }
 
-    if (config->argc != 2) usage ();
+    if (argc != 2) usage ();
 
     // Add the input and output images (which remain on the command-line) to the arguments list
     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "Name of the output image",
-                     config->argv[1]);
+                     argv[1]);
 
     return config;

trunk/ppImage/src/ppImageArguments.c

@@ -14 +14 @@
 
     // load the site-wide configuration information
-    pmConfig *config = pmConfigRead(argc, argv);
+    pmConfig *config = pmConfigRead(&argc, argv);
     if (config == NULL) {
         psErrorStackPrint(stderr, "Can't find site configuration!\n");
@@ -30 +30 @@
 
     // recipe option: -usemask : override MASK setting in phase2.recipe
-    if ((N = psArgumentGet(config->argc, config->argv, "-usemask"))) {
-        psArgumentRemove (N, &config->argc, config->argv);
+    if ((N = psArgumentGet(argc, argv, "-usemask"))) {
+        psArgumentRemove (N, &argc, argv);
         psMetadataAddBool (options, PS_LIST_TAIL, "MASK", PS_META_REPLACE, "", true);
-        psArgumentRemove (N, &config->argc, config->argv);
+        psArgumentRemove (N, &argc, argv);
     }
 
@@ -54 +54 @@
 
     // chip selection is used to limit chips to be processed
-    if ((N = psArgumentGet (config->argc, config->argv, "-chip"))) {
-        psArgumentRemove (N, &config->argc, config->argv);
+    if ((N = psArgumentGet (argc, argv, "-chip"))) {
+        psArgumentRemove (N, &argc, argv);
         psMetadataAddStr (config->arguments, PS_LIST_TAIL, "CHIP_SELECTIONS", PS_DATA_STRING, "",
-                          config->argv[N]);
-        psArgumentRemove (N, &config->argc, config->argv);
+                          argv[N]);
+        psArgumentRemove (N, &argc, argv);
     }
 
-    if (config->argc != 2) usage ();
+    if (argc != 2) usage ();
 
     // Add the input and output images (which remain on the command-line) to the arguments list
     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "Name of the output image",
-                     config->argv[1]);
+                     argv[1]);
 
     return config;

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, &config->argc, config->argv) || argc != 3) {
+    if (! psArgumentParse(config->arguments, &argc, argv) || argc != 3) {
         printf("\nPan-STARRS Phase 2 processing\n\n");
-        printf("Usage: %s INPUT.fits OUTPUT.fits\n\n", config->argv[0]);
+        printf("Usage: %s INPUT.fits OUTPUT.fits\n\n", 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",
-                     config->argv[1]);
-    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-output", 0, "Name of the output image",
-                     config->argv[2]);
+    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]);
 
     // Define database handle, if used