Changeset 7677 for trunk/psastro/src

Timestamp:

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

Author:

Paul Price

Message:

Fixing code after pushing argc,argv into pmConfig.

Location:

trunk/psastro/src

Files:

• psastro.c (modified) (2 diffs)
• psastro.h (modified) (1 diff)
• psastroArguments.c (modified) (3 diffs)

trunk/psastro/src/psastro.c

@@ -10 +10 @@
 
     // load configuration information
-    pmConfig *config = psastroArguments (&argc, argv);
+    pmConfig *config = psastroArguments (argc, argv);
 
     // load identify the data sources
@@ -26 +26 @@
     psArray *refs = psastroLoadReferences (config);
 
-    psastroMosaicGetRefstars (config, refs); 
+    psastroMosaicGetRefstars (config, refs);
 
     char *mosastro = psMetadataLookupStr (NULL, config->arguments, "MOSASTRO");
     if (mosastro == NULL) {
-        psastroChipAstrom (config, refs);
+        psastroChipAstrom (config, refs);
     } else {
-        psastroMosaicAstrom (config, refs);
+        psastroMosaicAstrom (config, refs);
     }
 

trunk/psastro/src/psastro.h

@@ -14 +14 @@
 # define toSky projection
 
-pmConfig         *psastroArguments (int *argc, char **argv);
+pmConfig         *psastroArguments (int argc, char **argv);
 bool              psastroParseCamera (pmConfig *config);
 bool              psastroDataLoad (pmConfig *config);

trunk/psastro/src/psastroArguments.c

@@ -8 +8 @@
 }
 
-pmConfig *psastroArguments (int *argc, char **argv) {
+pmConfig *psastroArguments (int argc, char **argv) {
 
     bool status;
     int N;
 
-    if (*argc == 1) usage ();
+    if (argc == 1) usage ();
 
     // basic pslib options
@@ -22 +22 @@
 
     // photcode : used in output to supplement header data (argument or recipe?)
-    if ((N = psArgumentGet (*argc, argv, "-photcode"))) {
-        psArgumentRemove (N, argc, argv);
-        psMetadataAddStr (options, PS_LIST_TAIL, "PHOTCODE", PS_META_REPLACE, "", argv[N]);
-        psArgumentRemove (N, argc, argv);
+    if ((N = psArgumentGet (argc, argv, "-photcode"))) {
+        psArgumentRemove (N, &argc, argv);
+        psMetadataAddStr (options, PS_LIST_TAIL, "PHOTCODE", PS_META_REPLACE, "", argv[N]);
+        psArgumentRemove (N, &argc, argv);
     }
 
-    // load config data from default locations 
-    pmConfig *config = pmConfigRead (argc, argv);
+    // load config data from default locations
+    pmConfig *config = pmConfigRead (config->argc, config->argv);
 
     // Storage for other command-line arguments
@@ -39 +39 @@
 
     // chip selection is used to limit chips to be processed
-    if ((N = psArgumentGet (*argc, argv, "-chip"))) {
-        psArgumentRemove (N, argc, argv);
-        psMetadataAddStr (config->arguments, PS_LIST_TAIL, "CHIP_SELECTIONS", PS_DATA_STRING, "", psStringCopy(argv[N]));
-        psArgumentRemove (N, argc, argv);
+    if ((N = psArgumentGet (config->argc, config->argv, "-chip"))) {
+        psArgumentRemove (N, &config->argc, config->argv);
+        psMetadataAddStr (config->arguments, PS_LIST_TAIL, "CHIP_SELECTIONS", PS_DATA_STRING, "", psStringCopy(config->argv[N]));
+        psArgumentRemove (N, &config->argc, config->argv);
     }
 
     // mosastro mode also specifies output header file
-    if ((N = psArgumentGet (*argc, argv, "-mosastro"))) {
-        psArgumentRemove (N, argc, argv);
-        psMetadataAddStr (config->arguments, PS_LIST_TAIL, "MOSASTRO", PS_DATA_STRING, "", psStringCopy(argv[N]));
-        psArgumentRemove (N, argc, argv);
+    if ((N = psArgumentGet (config->argc, config->argv, "-mosastro"))) {
+        psArgumentRemove (N, &config->argc, config->argv);
+        psMetadataAddStr (config->arguments, PS_LIST_TAIL, "MOSASTRO", PS_DATA_STRING, "", psStringCopy(config->argv[N]));
+        psArgumentRemove (N, &config->argc, config->argv);
     }
 
-    status = pmConfigFileSetsMD (config->arguments, argc, argv, "INPUT", "-file", "-list");
+    status = pmConfigFileSetsMD (config->arguments, config, "INPUT", "-file", "-list");
     if (!status) { usage ();}
 
-    if (*argc != 2) usage ();
+    if (config->argc != 2) usage ();
 
     // output positions is fixed
-    psMetadataAddStr (config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "", argv[2]);
+    psMetadataAddStr (config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "", config->argv[2]);
 
     psTrace(__func__, 1, "Done with psastroArguments...\n");