Changeset 21422 for trunk/psastro/src/psastroLoadRefstars.c

Timestamp:

Feb 9, 2009, 11:25:34 AM (17 years ago)

Author:

Paul Price

Message:

Merging cnb_branch_20090113. No major conflicts. Compiles, but not tested.

File:

• trunk/psastro/src/psastroLoadRefstars.c (modified) (6 diffs)

trunk/psastro/src/psastroLoadRefstars.c

@@ -6 +6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-07 02:03:34 $
+ *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-09 21:25:34 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
@@ -150 +150 @@
     }
 
-    psastroVisualPlotRefStars (refstars, recipe);
+    pmAstromVisualPlotRefStars (refstars, recipe);
 
     if (psTraceGetLevel("psastro.plot") > 0) {
@@ -251 +251 @@
     pmFPAfile *input = psMetadataLookupPtr (NULL, config->files, "PSASTRO.INPUT");
     if (!input) {
-        psLogMsg ("psastro", PS_LOG_DETAIL, "no supplied reference header data");
-        photcode = psStringCopy ("NONE");
-        return photcode;
+        psLogMsg ("psastro", PS_LOG_DETAIL, "no supplied reference header data");
+        photcode = psStringCopy ("NONE");
+        return photcode;
     }
     assert (input->fpa);
@@ -259 +259 @@
     *maxRho = psMetadataLookupF32(&status, recipe, "DVO.GETSTAR.MAX.RHO");
     if (!status) {
-        psError(PSASTRO_ERR_CONFIG, false, "DVO.GETSTAR.MAX.RHO missing from recipe");
-        return NULL;
+        psError(PSASTRO_ERR_CONFIG, false, "DVO.GETSTAR.MAX.RHO missing from recipe");
+        return NULL;
     }
 
@@ -278 +278 @@
     if (!status) ESCAPE ("missing DVO.GETSTAR.MIN.MAG.INST");
 
-    // PHOTCODE.DATA is a multi of metadata items 
+    // PHOTCODE.DATA is a multi of metadata items
     psListIterator *iter = psListIteratorAlloc(item->data.list, PS_LIST_HEAD, false);
 
     psMetadataItem *refItem = NULL;
     while ((refItem = psListGetAndIncrement (iter))) {
-        if (refItem->type != PS_DATA_METADATA) ESCAPE ("PHOTCODE.DATA entry is not a metadata folder");
-    
-        char *refFilter = psMetadataLookupStr (&status, refItem->data.md, "FILTER");
-        if (!status) {
-            psLogMsg ("psastro", PS_LOG_INFO, "a PHOTCODE.DATA recipe folder is missing FILTER");
-            continue;
-        }
-
-        // does this entry match the current filter?
-        if (strcmp (refFilter, filter)) continue;
-
-        psLogMsg ("psastro", PS_LOG_DETAIL, "PHOTCODE.DATA found for filter %s", filter);
-
-        float zeropt = psMetadataLookupF32 (&status, refItem->data.md, "ZEROPT");
-        if (!status) {
-            psLogMsg ("psastro", PS_LOG_INFO, "a PHOTCODE.DATA recipe folder is missing FILTER");
-            continue;
-        }
-        photcode = psMetadataLookupStr (&status, refItem->data.md, "PHOTCODE");
-        if (!status) {
-            psLogMsg ("psastro", PS_LOG_INFO, "a PHOTCODE.DATA recipe folder is missing FILTER");
-            continue;
-        }
-
-        // convert the minInst to a calibrated minimum magnitude
-        *minMag = minInst + 2.5*log10(exptime) + zeropt;
-
-        psFree (iter);
-        return photcode;
-    }   
+        if (refItem->type != PS_DATA_METADATA) ESCAPE ("PHOTCODE.DATA entry is not a metadata folder");
+
+        char *refFilter = psMetadataLookupStr (&status, refItem->data.md, "FILTER");
+        if (!status) {
+            psLogMsg ("psastro", PS_LOG_INFO, "a PHOTCODE.DATA recipe folder is missing FILTER");
+            continue;
+        }
+
+        // does this entry match the current filter?
+        if (strcmp (refFilter, filter)) continue;
+
+        psLogMsg ("psastro", PS_LOG_DETAIL, "PHOTCODE.DATA found for filter %s", filter);
+
+        float zeropt = psMetadataLookupF32 (&status, refItem->data.md, "ZEROPT");
+        if (!status) {
+            psLogMsg ("psastro", PS_LOG_INFO, "a PHOTCODE.DATA recipe folder is missing FILTER");
+            continue;
+        }
+        photcode = psMetadataLookupStr (&status, refItem->data.md, "PHOTCODE");
+        if (!status) {
+            psLogMsg ("psastro", PS_LOG_INFO, "a PHOTCODE.DATA recipe folder is missing FILTER");
+            continue;
+        }
+
+        // convert the minInst to a calibrated minimum magnitude
+        *minMag = minInst + 2.5*log10(exptime) + zeropt;
+
+        psFree (iter);
+        return photcode;
+    }
     psFree (iter);
 
@@ -318 +318 @@
     photcode = psMetadataLookupStr(NULL, recipe, "DVO.GETSTAR.PHOTCODE");
     PS_ASSERT (photcode, NULL);
-        
+
     // give up and use fixed value
     *minMag = psMetadataLookupF32(NULL, recipe, "DVO.GETSTAR.MIN.MAG");