Changeset 29515 for branches/eam_branches/ipp-20100823/ippToPsps/src/ippToPsps.c

Timestamp:

Oct 21, 2010, 2:45:13 PM (16 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20100823/ippToPsps/src/ippToPsps.c (modified) (12 diffs)

branches/eam_branches/ipp-20100823/ippToPsps/src/ippToPsps.c

@@ -24 +24 @@
 extern int ippToPsps_batchDifference(IppToPsps *data);
 
+// Gets uncalibrated instrumental flux from magnitude
+__inline bool ippToPsps_getFlux(const float exposureTime, const float magnitude, float* flux, const float magnitudeErr, float* fluxErr) {
+
+    *flux = powf(10.0, -0.4*magnitude) / exposureTime;
+    if (!isfinite(*flux) || *flux < 0.000001) return false;
+    if (fluxErr) *fluxErr = fabsf((magnitudeErr * *flux)/1.085736);
+//      if (fluxErr)    printf("Mag = %03.03f, Flux = %03.03f, Mag err = %03.03f, Flux Err = %03.03f\n", magnitude, *flux, magnitudeErr, *fluxErr);
+
+    return true;
+}
+
 // Destructor
 static void ippToPsps_Destructor(IppToPsps* this) {
@@ -55 +66 @@
     // save XML document for results
     if (this->resultsXmlDoc) {
-    
+
         xmlSaveFormatFileEnc(this->resultsPath, this->resultsXmlDoc, "UTF-8", 1);
 
@@ -151 +162 @@
 
     psMetadata *arguments = psMetadataAlloc();
-    psMetadataAddStr(arguments, PS_LIST_TAIL, "-expid", 0, "Exposure ID", NULL);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-id", 0, "ID", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-expname", 0, "Exposure name", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-survey", 0, "Survey type", NULL);
@@ -158 +169 @@
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-results", 0, "Path to results output", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-config", 0, "Path to config dir", NULL);
-    psMetadataAddStr(arguments, PS_LIST_TAIL, "-batch", 0, "Product type: [det|stack|diff]", NULL);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-batch", 0, "Product type: [IN|P2|ST|TODO]", NULL);
 
     bool ret = true;
@@ -168 +179 @@
     else {
 
-        char *tmp = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-expid"));
-        if (tmp) this->expId = atoi(tmp);
+        char *tmp = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-id"));
+        if (tmp) this->id = atoi(tmp);
         //free(tmp); tmp = NULL;
         this->expName = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-expname"));
@@ -181 +192 @@
         if (!tmp) this->batchType = BATCH_UNDEFINED;
         else if (strcmp(tmp, "test") == 0) this->batchType = BATCH_TEST;
-        else if (strcmp(tmp, "init") == 0) this->batchType = BATCH_INIT;
-        else if (strcmp(tmp, "det") == 0) this->batchType = BATCH_DETECTION;
-        else if (strcmp(tmp, "stack") == 0) this->batchType = BATCH_STACK;
-        else if (strcmp(tmp, "diff") == 0) this->batchType = BATCH_DIFFERENCE;
+        else if (strcmp(tmp, "IN") == 0) this->batchType = BATCH_INIT;
+        else if (strcmp(tmp, "P2") == 0) this->batchType = BATCH_DETECTION;
+        else if (strcmp(tmp, "ST") == 0) this->batchType = BATCH_STACK;
+        else if (strcmp(tmp, "TODO") == 0) this->batchType = BATCH_DIFFERENCE;
         else this->batchType = BATCH_UNDEFINED;
 
@@ -192 +203 @@
                 (this->batchType != BATCH_INIT && !this->fitsInPath) || 
                 (this->batchType != BATCH_INIT && !this->resultsPath) || 
-                (this->batchType != BATCH_INIT && this->expId == -1) ||
+                (this->batchType != BATCH_INIT && this->id == -1) ||
                 !this->fitsOutPath || 
                 !this->configsDir || 
@@ -211 +222 @@
 static int ippToPsps_run(IppToPsps *this) {
 
+    // any files?
+    if (this->batchType == BATCH_DETECTION ||
+            this->batchType == BATCH_STACK ||
+            this->batchType == BATCH_DIFFERENCE ) {
+
+        if (this->numOfInputFiles < 1) {
+
+            this->exitCode = PS_EXIT_DATA_ERROR;
+            psError(PS_ERR_UNKNOWN, false, "No input files for this batch");
+        }
+
+    }
+
     if(this->exitCode == PS_EXIT_SUCCESS) {
 
@@ -250 +274 @@
     psMemSetDeallocator(this, (psFreeFunc)ippToPsps_Destructor);
 
-    this->expId = -1;
+    // deal with DVO database
+    bool haveDvo = false;
+    for (int i=0;i<*argc; i++) {
+
+        if (strcmp(argv[i], "CATDIR") == 0) {haveDvo = true; break;}
+    }
+    if (haveDvo) this->dvoConfig = dvoConfigRead(argc, argv);
+    else this->dvoConfig = NULL;
+
+    // remaining args
+    this->id = -1;
     this->expName = NULL;
     this->surveyType = NULL;
+    this->surveyID = -1;
     this->fitsInPath = NULL;
     this->resultsPath = NULL;
@@ -261 +296 @@
     this->fitsOut = NULL;
     this->configsDir = NULL;
-    this->dvoConfig = NULL;
     this->config = NULL;
-    this->dvoConfig = dvoConfigRead(argc, argv);
     this->pmconfig = pmConfigRead(argc, argv, NULL);
     this->exitCode = PS_EXIT_SUCCESS;
     this->run = ippToPsps_run;
+
+    // sort out current time
+    time_t now = time(NULL);;
+    struct tm *ts = gmtime(&now); // TODO should be UTC
+    strftime(this->todaysDate, sizeof(this->todaysDate), "%Y-%m-%d", ts);
 
     if (!this->pmconfig) {
@@ -299 +337 @@
         psStringAppend(&this->configsDir, "/stack");
 
-
+    // create filename
     char outputName[100];
-    sprintf(outputName, "%08d.FITS", this->expId);
+    sprintf(outputName, "%08d.FITS", this->id);
     psStringAppend(&this->fitsOutPath, "/%s", outputName);
 
@@ -321 +359 @@
     }
 
+    // get survey ID using config object
+    if (this->batchType != BATCH_INIT && 
+            !ippToPspsConfig_getSurveyId(this->config, this->surveyType, &this->surveyID)) {
+        
+        this->exitCode = PS_EXIT_CONFIG_ERROR;
+        return this;
+    }
+
     // create XML document for results 
     if (this->resultsPath) {