Index: trunk/psastro/src/psastroArguments.c
===================================================================
--- trunk/psastro/src/psastroArguments.c	(revision 7677)
+++ trunk/psastro/src/psastroArguments.c	(revision 7818)
@@ -29,5 +29,5 @@
 
     // load config data from default locations
-    pmConfig *config = pmConfigRead (config->argc, config->argv);
+    pmConfig *config = pmConfigRead(&argc, argv);
 
     // Storage for other command-line arguments
@@ -39,15 +39,15 @@
 
     // chip selection is used to limit chips to be processed
-    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);
+    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);
     }
 
     // mosastro mode also specifies output header file
-    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);
+    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);
     }
 
@@ -55,8 +55,8 @@
     if (!status) { usage ();}
 
-    if (config->argc != 2) usage ();
+    if (argc != 2) usage ();
 
     // output positions is fixed
-    psMetadataAddStr (config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "", config->argv[2]);
+    psMetadataAddStr (config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "", argv[2]);
 
     psTrace(__func__, 1, "Done with psastroArguments...\n");