Changeset 39356

Timestamp:

Feb 18, 2016, 5:07:35 PM (10 years ago)

Author:

eugene

Message:

init the galaxy model which calling setgalmodel

Location:

trunk/Ohana/src/uniphot

Files:

• include/setphot.h (modified) (1 diff)
• src/initialize_setphot.c (modified) (1 diff)
• src/initialize_setphot_client.c (modified) (1 diff)
• src/update_dvo_setphot.c (modified) (1 diff)

trunk/Ohana/src/uniphot/include/setphot.h

@@ -63 +63 @@
 int          CAM_RESET;
 
-int          SET_GAL_MODEL;
+char        *SET_GAL_MODEL;
 
 int          VERBOSE;

trunk/Ohana/src/uniphot/src/initialize_setphot.c

@@ -81 +81 @@
   }
 
-  SET_GAL_MODEL = FALSE;
+  SET_GAL_MODEL = NULL;
   if ((N = get_argument (argc, argv, "-setgalmodel"))) {
-    SET_GAL_MODEL = TRUE;
-    remove_argument (N, &argc, argv);
+    remove_argument (N, &argc, argv);
+    SET_GAL_MODEL = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+
+    if (!InitGalaxyModel (SET_GAL_MODEL)) {
+      fprintf (stderr, "failed to init galaxy model %s\n", SET_GAL_MODEL);
+      fprintf (stderr, "valid models: ROESER, FEAST-HIPPARCOS\n");
+      exit (2);
+    }
   }
 

trunk/Ohana/src/uniphot/src/initialize_setphot_client.c

@@ -71 +71 @@
   CAM_PHOTOM_FILE = NULL;
 
-  SET_GAL_MODEL = FALSE;
+  SET_GAL_MODEL = NULL;
   if ((N = get_argument (argc, argv, "-setgalmodel"))) {
-    SET_GAL_MODEL = TRUE;
     remove_argument (N, &argc, argv);
+    SET_GAL_MODEL = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+
+    if (!InitGalaxyModel (SET_GAL_MODEL)) {
+      fprintf (stderr, "failed to init galaxy model %s\n", SET_GAL_MODEL);
+      fprintf (stderr, "valid models: ROESER, FEAST-HIPPARCOS\n");
+      exit (2);
+    }
   }
 

trunk/Ohana/src/uniphot/src/update_dvo_setphot.c

@@ -174 +174 @@
     if (CAM_ASTROM_FILE)  { strextend (&command, "-CAM %s", CAM_ASTROM_FILE); }
 
-    if (SET_GAL_MODEL)    { strextend (&command, "-setgalmodel"); }
+    if (SET_GAL_MODEL)    { strextend (&command, "-setgalmodel %s", SET_GAL_MODEL); }
 
     if (KH_RESET)         { strextend (&command, "-KH-reset"); }