Changeset 42178 for branches/eam_branches/ipp-20220316/fpcamera/src/fpcameraLoadRefstars.c

Timestamp:

Apr 27, 2022, 10:14:37 AM (4 years ago)

Author:

eugene

Message:

fpcamera now builds, but does it run?

File:

• branches/eam_branches/ipp-20220316/fpcamera/src/fpcameraLoadRefstars.c (modified) (3 diffs)

branches/eam_branches/ipp-20220316/fpcamera/src/fpcameraLoadRefstars.c

@@ -2 +2 @@
 # define ELIXIR_MODE 1
 
-# define ESCAPE(ERROR,FORMAT,...) { psError(ERROR, false, FORMAT, __VA_ARGS__); return false; }
-
+# define ESCAPE(ERROR,...) { p_psError(__FILE__,__LINE__,__func__,ERROR,false,__VA_ARGS__); return false; }
+
+/* \brief this loop saves the photometry/astrometry data files */
 bool fpcameraLoadRefstars (pmFPAfile *input, pmConfig *config) {
 
@@ -42 +43 @@
     // substitute abstract name with concrete name, if present in FPCAMERA.CATDIRS
     psMetadata *catdirs = psMetadataLookupMetadata(&status, config->site, "FPCAMERA.CATDIRS"); // List of cameras
-    if (!catdir) ESCAPE(FPCAMERA_ERR_CONFIG, "Unable to find FPCAMERA.CATDIRS in the system configuration.\n");
+    if (!catdirs) ESCAPE(FPCAMERA_ERR_CONFIG, "Unable to find FPCAMERA.CATDIRS in the system configuration.\n");
 
     // the name in the recipe may be one of:
@@ -140 +141 @@
         ESCAPE(FPCAMERA_ERR_REFSTARS, "error reading reference data");
     }
-    if (refstars->n == 0) ESCAPE(PSASTRO_ERR_REFSTARS, "no reference stars found");
+    if (refstars->n == 0) ESCAPE(FPCAMERA_ERR_REFSTARS, "no reference stars found");
 
     psLogMsg ("fpcamera", 3, "loaded %ld reference stars : %f sec\n", refstars->n, psTimerMark ("fpcamera"));