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

Timestamp:

Apr 27, 2022, 4:30:04 PM (4 years ago)

Author:

eugene

Message:

fpcamera now reads the astrometry and loads the refstars

File:

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

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

@@ -13 +13 @@
     psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, FPCAMERA_RECIPE);
 
-    // DVO APIs expect decimal degrees
-    float RAmin  = DEG_RAD*psMetadataLookupF32(NULL, recipe, "RA_MIN");
-    float RAmax  = DEG_RAD*psMetadataLookupF32(NULL, recipe, "RA_MAX");
-    float DECmin = DEG_RAD*psMetadataLookupF32(NULL, recipe, "DEC_MIN");
-    float DECmax = DEG_RAD*psMetadataLookupF32(NULL, recipe, "DEC_MAX");
+    // FPA FOV is determined by fpcameraReadAstrometry & save on fpa->analysis
+    float RAmin  = psMetadataLookupF32(NULL, input->fpa->analysis, "RA_MIN");
+    float RAmax  = psMetadataLookupF32(NULL, input->fpa->analysis, "RA_MAX");
+    float DECmin = psMetadataLookupF32(NULL, input->fpa->analysis, "DEC_MIN");
+    float DECmax = psMetadataLookupF32(NULL, input->fpa->analysis, "DEC_MAX");
 
     // extra field fraction to add
@@ -37 +37 @@
     DECmax += dDEC * fieldPadding;
 
+    // XXX: fpcameraArguments.c looks for this explicitly on the command line, but stores it in arguments.
+    // this could be a recipe value which can also be defined as a command-line option 
+
     // grab the FPCAMERA.CATDIR name from the FPCAMERA recipe
     char *catdir_recipe = psMetadataLookupStr(&status, recipe, "FPCAMERA.CATDIR");
@@ -43 +46 @@
     // substitute abstract name with concrete name, if present in FPCAMERA.CATDIRS
     psMetadata *catdirs = psMetadataLookupMetadata(&status, config->site, "FPCAMERA.CATDIRS"); // List of cameras
-    if (!catdirs) ESCAPE(FPCAMERA_ERR_CONFIG, "Unable to find FPCAMERA.CATDIRS in the system configuration.\n");
+
+    // XXX it is allowed that FPCAMERA.CATDIRS is not defined in site.config: the value must be a real path
+    // 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:
@@ -49 +54 @@
     // (B) a reference to the name in the FPCAMERA.CATDIRS folder in site.config
     // (C) a reference to a folder in the FPCAMERA.CATDIRS folder in site.config, containing multiple copy locations
-    char *catdir_virtual = psMetadataLookupStr(&status, catdirs, catdir_recipe);
-
-    psMetadata *catdir_folder = psMetadataLookupMetadata(&status, catdirs, catdir_recipe);
+
+    // can we find a plain string matching catdir_recipe in the catdirs folder?
+    char *catdir_virtual = catdirs ? psMetadataLookupStr(&status, catdirs, catdir_recipe) : NULL;
+
+    // OR, can we find a subfolder in the catdirs folder?
+    psMetadata *catdir_folder = catdirs ? psMetadataLookupMetadata(&status, catdirs, catdir_recipe) : NULL;
     if (catdir_folder) {
         // randomly choose one of the entries
@@ -69 +77 @@
     }
 
+    // if catdir_virtual is NULL, catdir_recipe must be a file name
     char *catdir = (catdir_virtual == NULL) ? catdir_recipe : catdir_virtual;
 
     // convert the uri to a real filename (ie, path://foobar)
     psString CATDIR = pmConfigConvertFilename(catdir, config, false, false); // Resolved filename
-    ESCAPE(FPCAMERA_ERR_CONFIG, "unable to determine filename for CATDIR %s", catdir);
+    if (!CATDIR) ESCAPE(FPCAMERA_ERR_CONFIG, "unable to determine filename for CATDIR %s", catdir);
 
     psLogMsg ("fpcamera", 3, "looking up reference objects in %s\n", CATDIR);
 
     char *getstarCommand = psStringCopy(psMetadataLookupStr(NULL, recipe, "DVO.GETSTAR"));
-    ESCAPE(FPCAMERA_ERR_CONFIG, "unable to find DVO.GETSTAR in recipe");
+    if (!getstarCommand) ESCAPE(FPCAMERA_ERR_CONFIG, "unable to find DVO.GETSTAR in recipe");
 
     char *outformat = psMetadataLookupStr(NULL, recipe, "DVO.GETSTAR.OUTFORMAT");
-    ESCAPE(FPCAMERA_ERR_CONFIG, "unable to find DVO.GETSTAR.OUTFORMAT in recipe");
+    if (!outformat) ESCAPE(FPCAMERA_ERR_CONFIG, "unable to find DVO.GETSTAR.OUTFORMAT in recipe");
 
     // issue the following command:
@@ -166 +175 @@
     
     psMetadataAdd (input->fpa->analysis, PS_LIST_TAIL, "FPCAMERA.REFSTARS", PS_DATA_ARRAY, "reference sources", refstars);
+    psFree (refstars);
+
     return true;
 }