Changeset 23195 for trunk/psastro/src

Timestamp:

Mar 5, 2009, 11:07:57 AM (17 years ago)

Author:

Paul Price

Message:

Adding function to print version information so it's captured in the log.

Location:

trunk/psastro/src

Files:

• Makefile.am (modified) (1 diff)
• psastro.c (modified) (2 diffs)
• psastro.h (modified) (1 diff)
• psastroVersion.c (modified) (1 diff)

trunk/psastro/src/Makefile.am

@@ -10 +10 @@
 FORCE: ;
 
-libpsastro_la_CFLAGS = $(PSASTRO_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPSASTRO_VERSION=\"$(PSASTRO_VERSION)\" -DPSASTRO_BRANCH=\"$(PSASTRO_BRANCH)\" -DPSASTRO_SOURCE=\"$(PSASTRO_SOURCE)\"
-libpsastro_la_LDFLAGS = $(PSASTRO_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
+libpsastro_la_CFLAGS = $(PSASTRO_CFLAGS) $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPSASTRO_VERSION=\"$(PSASTRO_VERSION)\" -DPSASTRO_BRANCH=\"$(PSASTRO_BRANCH)\" -DPSASTRO_SOURCE=\"$(PSASTRO_SOURCE)\"
+libpsastro_la_LDFLAGS = $(PSASTRO_LIBS) $(PPSTATS_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 
 bin_PROGRAMS = psastro psastroModel psastroModelFit gpcModel

trunk/psastro/src/psastro.c

@@ -34 +34 @@
     if (!config) usage ();
 
+    psastroVersionPrint();
+
     // load identify the data sources
     if (!psastroParseCamera (config)) {
-        psErrorStackPrint(stderr, "error setting up the camera\n");
-        exit (1);
+        psErrorStackPrint(stderr, "error setting up the camera\n");
+        exit (1);
     }
 
@@ -43 +45 @@
     // select subset of stars for astrometry
     if (!psastroDataLoad (config)) {
-        psErrorStackPrint(stderr, "error loading input data\n");
-        exit (1);
+        psErrorStackPrint(stderr, "error loading input data\n");
+        exit (1);
     }
 
     // run the full astrometry analysis (chip and/or mosaic)
     if (!psastroAnalysis (config)) {
-        psErrorStackPrint(stderr, "failure in psastro analysis\n");
-        exit (1);
+        psErrorStackPrint(stderr, "failure in psastro analysis\n");
+        exit (1);
     }
-    
+
     // write out the results
     if (!psastroDataSave (config)) {
-        psErrorStackPrint(stderr, "failed to write out data\n");
-        exit (1);
+        psErrorStackPrint(stderr, "failed to write out data\n");
+        exit (1);
     }
 

trunk/psastro/src/psastro.h

@@ -99 +99 @@
 bool              psastroVersionHeader(psMetadata *header);
 bool              psastroVersionHeaderFull(psMetadata *header);
+void              psastroVersionPrint(void);
 
 // demo plots

trunk/psastro/src/psastroVersion.c

@@ -80 +80 @@
     psLibVersionHeader(header);
     psModulesVersionHeader(header);
+    ppStatsVersionHeader(header);
     psastroVersionHeader(header);
 
     return true;
 }
+
+void psastroVersionPrint(void)
+{
+    psTime *time = psTimeGetNow(PS_TIME_TAI); // The time now
+    psString timeString = psTimeToISO(time); // The time in an ISO string
+    psFree(time);
+    psLogMsg("psastro", PS_LOG_INFO, "psastro at %s", timeString);
+    psFree(timeString);
+
+    psString pslib = psLibVersionLong();// psLib version
+    psString psmodules = psModulesVersionLong(); // psModules version
+    psString ppStats = ppStatsVersionLong(); // ppStats version
+    psString psastro = psastroVersionLong(); // psastro version
+
+    psLogMsg("psastro", PS_LOG_INFO, "%s", pslib);
+    psLogMsg("psastro", PS_LOG_INFO, "%s", psmodules);
+    psLogMsg("psastro", PS_LOG_INFO, "%s", ppStats);
+    psLogMsg("psastro", PS_LOG_INFO, "%s", psastro);
+
+    psFree(pslib);
+    psFree(psmodules);
+    psFree(ppStats);
+    psFree(psastro);
+
+    return;
+}