Changeset 10623

Timestamp:

Dec 11, 2006, 10:59:49 AM (19 years ago)

Author:

Paul Price

Message:

Getting rid of WORKDIR completely.

Location:

trunk/psModules/src

Files:

• camera/pmFPAfileIO.c (modified) (1 diff)
• config/pmConfig.c (modified) (5 diffs)
• config/pmConfig.h (modified) (2 diffs)
• detrend/pmBias.c (modified) (2 diffs)

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -214 +214 @@
     }
 
-    // apply filename mangling rules (file://, path://, neb://, WORKDIR)
+    // apply filename mangling rules (file://, path://, neb://)
     psString tmpName = pmConfigConvertFilename (file->filename, config);
     psFree (file->filename);

trunk/psModules/src/config/pmConfig.c

@@ -4 +4 @@
  *  @author EAM (IfA)
  *
- *  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-12-08 23:47:04 $
+ *  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-12-11 20:59:48 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -42 +42 @@
     psFree(config->arguments);
     psFree(config->database);
-    psFree(config->workdir);
 }
 
@@ -62 +61 @@
     config->argv = argv;
     config->defaultRecipe = NULL;
-    config->workdir = NULL;
 
     // the file structure is used to carry pmFPAfiles
@@ -389 +387 @@
     }
 
-    // Get the working directory
-    config->workdir = psMemIncrRefCounter(psMetadataLookupStr(NULL, config->site, "WORKDIR"));
-    if (!config->workdir) {
-        psWarning("WORKDIR is not set in the site configuration\n");
-    } else {
-        config->workdir = resolveEnvVar(config->workdir);
-    }
-
     // define the config-file search path (configPath).  Ensure that
     // it contains the directory where we found the config file in
@@ -892 +882 @@
     // substitute neb://name with matched nebulous name
 
-    #if 0
-    // if we still have a relative path, prepend WORKDIR:
-    if (newName[0] != '/') {
-        char *workdir = psMetadataLookupStr (NULL, config->site, "WORKDIR");
-        if (workdir) {
-            psStringPrepend (&newName, "%s/", workdir);
-        }
-    }
-    #endif
-
     return newName;
 }

trunk/psModules/src/config/pmConfig.h

@@ -9 +9 @@
 /// @author Eugene Magnier, IfA
 ///
-/// @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2006-12-04 20:41:51 $
+/// @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2006-12-11 20:59:48 $
 ///
 /// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
@@ -46 +46 @@
     psMetadata *arguments;              ///< Processed command-line arguments
     psMetadata *files;                  ///< pmFPAfiles used for analysis
-    psString workdir;                   ///< Working directory
     psDB *database;                     ///< Database handle
     int *argc;                          ///< Number of command-line arguments

trunk/psModules/src/detrend/pmBias.c

@@ -373 +373 @@
             case PM_FIT_POLY_CHEBY: {
                     psString comment = NULL;    // Comment to add
-                    psStringAppend(&comment, "Overscan fit (chi^2: %.2f):", chi2);
+                    psStringAppend(&comment, "Overscan fit (chi2: %.2f): ", chi2);
                     psPolynomial1D *poly = overscanOpts->poly; // The polynomial
                     for (int i = 0; i < poly->nX; i++) {
@@ -385 +385 @@
                     psSpline1D *spline = overscanOpts->spline; // The spline
                     for (int i = 0; i < spline->n; i++) {
-                        psStringAppend(&comment, "Overscan fit (chi^2: %.2f) %d :", chi2, i);
+                        psStringAppend(&comment, "Overscan fit (chi2: %.2f) %d:", chi2, i);
                         psPolynomial1D *poly = spline->spline[i]; // i-th polynomial
                         for (int j = 0; j < poly->nX; j++) {