Changeset 13704 for trunk/psModules/src/config/pmConfig.c

Timestamp:

Jun 7, 2007, 2:31:50 PM (19 years ago)

Author:

Paul Price

Message:

Adding automatically-generated skycell pseudo-cameras, constructed from the user-defined cameras. This gives a couple of benefits: (1) skycells inherit the recipes of their original camera; (2) skycells use the same FILERULES as their original camera.

File:

• trunk/psModules/src/config/pmConfig.c (modified) (3 diffs)

trunk/psModules/src/config/pmConfig.c

@@ -4 +4 @@
  *  @author EAM (IfA)
  *
- *  @version $Revision: 1.94 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-05-11 23:28:15 $
+ *  @version $Revision: 1.95 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-06-08 00:31:50 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -533 +533 @@
                                   "Camera specified on command line", config->camera);
 
+            if (!pmConfigCameraSkycellVersion(config->site, cameraFile)) {
+                psError(PS_ERR_UNKNOWN, false,
+                        "Unable to generate skycell versions of specified camera %s.\n",
+                        cameraFile);
+                psFree(config);
+                return NULL;
+            }
+
             if (!pmConfigCameraMosaickedVersions(config->site, cameraFile)) {
                 psError(PS_ERR_UNKNOWN, false,
@@ -570 +578 @@
         psFree(iter);
 
+        if (!pmConfigCameraSkycellVersionsAll(config->site)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to generate skycell versions of cameras.\n");
+            psFree(config);
+            return NULL;
+        }
         if (!pmConfigCameraMosaickedVersionsAll(config->site)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to generate mosaicked versions of cameras.\n");