Changeset 8776

Timestamp:

Sep 7, 2006, 4:33:23 PM (20 years ago)

Author:

jhoblitt

Message:

rename psMetadataConfigParse() -> psMetadataConfigRead()

Location:

trunk

Files:

• icd-demo/src/icd-demo.c (modified) (2 diffs)
• ppImage/src/ppTest.c (modified) (1 diff)
• ppNorm/src/ppNormCalc.c (modified) (1 diff)
• psLib/src/astro/psEarthOrientation.c (modified) (2 diffs)
• psLib/src/astro/psTime.c (modified) (2 diffs)
• psModules/src/config/pmConfig.c (modified) (2 diffs)
• psModules/src/objects/pmPSF_IO.c (modified) (2 diffs)
• psdemo/src/psdemoArgs.c (modified) (1 diff)
• psphot/src/psphotModelTest.c (modified) (1 diff)

trunk/icd-demo/src/icd-demo.c

@@ -16 +16 @@
 
     // construct a sample FITS table based on the given descriptive metadata file
-    psMetadata *fd      = psMetadataConfigParse (NULL, &nFail, argv[1], false);
+    psMetadata *fd      = psMetadataConfigRead(NULL, &nFail, argv[1], false);
 
     psFits *fits = psFitsOpen (argv[2], "w");
@@ -53 +53 @@
 
     // construct a sample FITS table based on the given descriptive metadata file
-    psMetadata *fd      = psMetadataConfigParse (NULL, &nFail, file, false);
+    psMetadata *fd      = psMetadataConfigRead(NULL, &nFail, file, false);
 
     psMetadata *blank  = psMetadataLookupPtr (NULL, fd, "BLANK");

trunk/ppImage/src/ppTest.c

@@ -101 +101 @@
 #if 1
     // A mosaic
-    psMetadata *mosaicCamera = psMetadataConfigParse(NULL, NULL, "/home/mithrandir/price/ipp/config/mcshort_mosaic/camera.config", true);
+    psMetadata *mosaicCamera = psMetadataConfigRead(NULL, NULL, "/home/mithrandir/price/ipp/config/mcshort_mosaic/camera.config", true);
     pmFPA *mosaicFPA = pmFPAConstruct(mosaicCamera);
-    psMetadata *mosaicFormat = psMetadataConfigParse(NULL, NULL, "/home/mithrandir/price/ipp/config/mcshort_mosaic/format_mosaic.config", true);
+    psMetadata *mosaicFormat = psMetadataConfigRead(NULL, NULL, "/home/mithrandir/price/ipp/config/mcshort_mosaic/format_mosaic.config", true);
     pmFPAview *mosaicView = pmFPAviewAlloc(0);
     pmFPAAddSourceFromView(mosaicFPA, mosaicView, mosaicFormat);

trunk/ppNorm/src/ppNormCalc.c

@@ -19 +19 @@
 
     int badLines = 0;                   // Number of bad lines
-    psMetadata *exposures = psMetadataConfigParse(NULL, &badLines, argv[1], false); // Exposure statistics
+    psMetadata *exposures = psMetadataConfigRead(NULL, &badLines, argv[1], false); // Exposure statistics
     if (badLines > 0) {
         psLogMsg("ppNormCalc", PS_LOG_WARN, "%d bad lines found when reading %s\n", badLines, argv[1]);

trunk/psLib/src/astro/psEarthOrientation.c

@@ -8 +8 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-08 23:32:22 $
+ *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-09-08 02:33:23 $
  *
  *  Copyright 2005 Maui High Performance Computing Center, University of Hawaii
@@ -87 +87 @@
 
     // Read config file
-    psMetadata* eocMetadata = psMetadataConfigParse(NULL,
+    psMetadata* eocMetadata = psMetadataConfigRead(NULL,
                               &nFail,
                               p_psGetConfigFileName(),

trunk/psLib/src/astro/psTime.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.96 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-09-08 00:58:35 $
+ *  @version $Revision: 1.97 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-09-08 02:33:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -271 +271 @@
 
     // Read config file
-    timeMetadata = psMetadataConfigParse(timeMetadata, &nFail, fileName, true);
+    timeMetadata = psMetadataConfigRead(timeMetadata, &nFail, fileName, true);
     if(timeMetadata == NULL) {
         return false;

trunk/psModules/src/config/pmConfig.c

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-29 21:39:44 $
+ *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-09-08 02:20:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -140 +140 @@
 
 found:
-    *config = psMetadataConfigParse(NULL, &numBadLines, realName, true);
+    *config = psMetadataConfigRead(NULL, &numBadLines, realName, true);
     if (numBadLines > 0) {
         psError(PS_ERR_IO, false, "%d bad lines in %s configuration file (%s)",

trunk/psModules/src/objects/pmPSF_IO.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-03 01:02:08 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-09-08 02:20:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -294 +294 @@
         filename = pmFPAfileNameFromRule (file->filerule, file, view);
 
-        psMetadata *psfData = psMetadataConfigParse (NULL, &Nfail, filename, FALSE);
+        psMetadata *psfData = psMetadataConfigRead(NULL, &Nfail, filename, FALSE);
         pmPSF *psf = pmPSFfromMD (psfData);
         psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.PSF", PS_DATA_UNKNOWN, "psphot psf", psf);

trunk/psdemo/src/psdemoArgs.c

@@ -44 +44 @@
   // load config file 
   // psMetadataAdd (config, PS_LIST_HEAD, "PSF_MODEL", PS_META_MULTI, "folder for psf model entries", NULL);
-  // config = psMetadataConfigParse (config, &Nfail, argv[3], FALSE);
+  // config = psMetadataConfigRead(config, &Nfail, argv[3], FALSE);
   // fprintf (stderr, "loaded config...\n");
 

trunk/psphot/src/psphotModelTest.c

@@ -34 +34 @@
         char *psfFile = psMetadataLookupStr (&status, recipe, "PSF_INPUT_FILE");
         if (!status) psAbort ("psphotModelTest", "PSF_INPUT_FILE not supplied");
-        psMetadata *psfData = psMetadataConfigParse (NULL, &Nfail, psfFile, FALSE);
+        psMetadata *psfData = psMetadataConfigRead(NULL, &Nfail, psfFile, FALSE);
         psf = pmPSFfromMD (psfData);
         modelType = psf->type;