Changeset 28205 for trunk/ippToPsps/src

Timestamp:

Jun 3, 2010, 3:33:37 PM (16 years ago)

Author:

rhenders

Message:

Now pulling exposure name from the Db and passing it to ippToPsps to include in FITS files

Location:

trunk/ippToPsps/src

Files:

• ippToPsps.c (modified) (4 diffs)
• ippToPsps.h (modified) (1 diff)
• ippToPspsBatchDetection.c (modified) (2 diffs)

trunk/ippToPsps/src/ippToPsps.c

@@ -144 +144 @@
     psMetadata *arguments = psMetadataAlloc();
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-expid", 0, "Exposure ID", NULL);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-expname", 0, "Exposure name", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-input", 0, "Path to FITS inout", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-output", 0, "Path to FITS output", NULL);
@@ -161 +162 @@
         if (tmp) this->expId = atoi(tmp);
         //free(tmp); tmp = NULL;
+        this->expName = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-expname"));
         this->fitsInPath = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-input"));
         this->resultsPath = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-results"));
@@ -176 +178 @@
 
         if (
+                (this->batchType != BATCH_INIT && !this->expName) || 
                 (this->batchType != BATCH_INIT && !this->fitsInPath) || 
                 (this->batchType != BATCH_INIT && !this->resultsPath) || 
@@ -237 +240 @@
 
     this->expId = -1;
+    this->expName = NULL;
     this->fitsInPath = NULL;
     this->resultsPath = NULL;

trunk/ippToPsps/src/ippToPsps.h

@@ -21 +21 @@
 
     uint32_t expId;            // the exposure ID to be used
+    psString expName;          // the exposure name
     uint8_t batchType;         // PSPS batch type
     psString fitsInPath;       // path to FITS input

trunk/ippToPsps/src/ippToPspsBatchDetection.c

@@ -63 +63 @@
     // FrameMeta values
     fits_write_col(this->fitsOut, TLONG, FRAMEMETA_FRAMEID, 1, 1, 1, &this->expId, &status);
+    fits_write_col(this->fitsOut, TSTRING, FRAMEMETA_FRAMENAME, 1, 1, 1, &this->expName, &status);
 
     int8_t surveyID = 0; // TODO
@@ -199 +200 @@
             skylist = dvoSkyListByExternID(this->dvoConfig, sourceId, imageId, &pImage);
             if (skylist == NULL) {
-                psError(PS_ERR_IO, false, "DVO: can't find SkyList for sourceId='%d' imageId='%d' (CCD = XY%s): skipping\n", sourceId, imageId, ccdNumber);
+                psError(PS_ERR_IO, false, 
+                        "DVO: can't find SkyList for sourceId='%d' imageId='%d' (CCD = XY%s): skipping\n", 
+                        sourceId, imageId, ccdNumber);
                 continue;
             }