Changeset 20410

Timestamp:

Oct 26, 2008, 5:16:52 PM (18 years ago)

Author:

eugene

Message:

convert to new psphotInit function

Location:

trunk

Files:

• ppImage/src/ppImagePhotom.c (modified) (1 diff)
• ppSim/src/ppSimPhotom.c (modified) (1 diff)
• ppStack/src/ppStack.c (modified) (1 diff)
• ppSub/src/ppSub.c (modified) (1 diff)
• pswarp/src/pswarp.c (modified) (1 diff)

trunk/ppImage/src/ppImagePhotom.c

@@ -12 +12 @@
     pmReadout *readout;
 
-    psphotModelClassInit ();
+    psphotInit ();
 
     // find or define a pmFPAfile PSPHOT.INPUT

trunk/ppSim/src/ppSimPhotom.c

@@ -13 +13 @@
     if (!doPhotom) return true;
     
-    psphotModelClassInit ();
+    psphotInit ();
 
     int blankMask = 0;          // XXX not sure what this should be set to...

trunk/ppStack/src/ppStack.c

@@ -38 +38 @@
     }
 
+    if (!psphotInit()) {
+        psErrorStackPrint(stderr, "Error initialising psphot.\n");
+        exitValue = PS_EXIT_PROG_ERROR;
+        goto die;
+    }
+
     if (!ppStackCamera(config)) {
         psErrorStackPrint(stderr, "Error setting up input files.\n");

trunk/ppSub/src/ppSub.c

@@ -24 +24 @@
     if (!pmModelClassInit()) {
         psErrorStackPrint(stderr, "Error initialising model classes.\n");
+        exitValue = PS_EXIT_PROG_ERROR;
+        goto die;
+    }
+
+    if (!psphotInit()) {
+        psErrorStackPrint(stderr, "Error initialising psphot.\n");
         exitValue = PS_EXIT_PROG_ERROR;
         goto die;

trunk/pswarp/src/pswarp.c

@@ -20 +20 @@
     // models defined in psphot/src/models are not available in psastro
     pmModelClassInit();
+
+    // init various psphot pieces (errors, models, threads)
+    psphotInit();
 
     pmConfig *config = pswarpArguments(argc, argv);