Changeset 29318

Timestamp:

Oct 4, 2010, 4:29:37 PM (16 years ago)

Author:

rhenders

Message:

Using id rather than expid

Location:

trunk/ippToPsps/src

Files:

• ippToPspsBatchDetection.c (modified) (5 diffs)
• ippToPspsBatchTest.c (modified) (2 diffs)

trunk/ippToPsps/src/ippToPspsBatchDetection.c

@@ -51 +51 @@
 
     // FrameMeta values
-    fits_write_col(this->fitsOut, TLONG, FRAMEMETA_FRAMEID, 1, 1, 1, &this->expId, &status);
+    fits_write_col(this->fitsOut, TLONG, FRAMEMETA_FRAMEID, 1, 1, 1, &this->id, &status);
     fits_write_col(this->fitsOut, TSTRING, FRAMEMETA_FRAMENAME, 1, 1, 1, &this->expName, &status);
 
-    int8_t surveyID = -1;
-    if (!ippToPspsConfig_getSurveyId(this->config, this->surveyType, &surveyID)) {return PS_EXIT_DATA_ERROR;}
-    fits_write_col(this->fitsOut, TBYTE, FRAMEMETA_SURVEYID, 1, 1, 1, &surveyID, &status);
+    fits_write_col(this->fitsOut, TBYTE, FRAMEMETA_SURVEYID, 1, 1, 1, &this->surveyID, &status);
 
     int8_t filterID = -1;
@@ -83 +81 @@
 
     // stuff for detections table
-    time_t now;
-    struct tm *ts;
-    char timeStr[12];
-    now = time(NULL);
-    ts = gmtime(&now); // TODO should be UTC
-    strftime(timeStr, sizeof(timeStr), "%Y-%m-%d", ts);
-
     uint32_t s,d, invalidDvoRows, smfJumps, unmatched, totalDetections = 0;
 
@@ -114 +105 @@
 
         filterIDs[s] = filterID;
-        surveyIDs[s] = surveyID;
-        strcpy(assocDate[s], timeStr);
+        surveyIDs[s] = this->surveyID;
+        strcpy(assocDate[s], this->todaysDate);
     }
 
@@ -178 +169 @@
 
             // create unique int from 'frameID' (aka exposure ID) and ccd number
-            pspsImageId = (this->expId*100) + image->ccdnum;
+            pspsImageId = (this->id*100) + image->ccdnum;
 
             // now get DVO detections
@@ -192 +183 @@
             imageFlags = (uint64_t)image->flags;
             fits_write_col(this->fitsOut, TLONGLONG, IMAGEMETA_IMAGEID, 1, 1, 1, &pspsImageId, &status);
-            fits_write_col(this->fitsOut, TLONG, IMAGEMETA_FRAMEID, 1, 1, 1, &this->expId, &status);
+            fits_write_col(this->fitsOut, TLONG, IMAGEMETA_FRAMEID, 1, 1, 1, &this->id, &status);
             fits_write_col(this->fitsOut, TSHORT, IMAGEMETA_CCDID, 1, 1, 1, &image->ccdnum, &status);
             fits_write_col(this->fitsOut, TLONG, IMAGEMETA_PHOTOCALID, 1, 1, 1, &image->photcode, &status);

trunk/ippToPsps/src/ippToPspsBatchTest.c

@@ -45 +45 @@
 
     // FrameMeta values
-//    fits_write_col(this->fitsOut, TLONG, FRAMEMETA_FRAMEID, 1, 1, 1, &this->expId, &status);
+//    fits_write_col(this->fitsOut, TLONG, FRAMEMETA_FRAMEID, 1, 1, 1, &this->id, &status);
 
     int8_t filterID = -1;
@@ -177 +177 @@
 
             // create unique int from 'frameID' (aka exposure ID) and ccd number
-            pspsImageId = (this->expId*100) + pImage->ccdnum;
+            pspsImageId = (this->id*100) + pImage->ccdnum;
 
             // now get DVO detections