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

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.h (modified) (3 diffs)

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

@@ -18 +18 @@
 #include <libxml/tree.h>
 
-#define MAXDETECT 30000 //TODO limit ok?
+#define MAXDETECT 60000 //TODO limit ok?
 
 typedef struct {
 
-    uint32_t expId;             // the exposure ID to be used
+    uint32_t id;                 // ID: might be expId for detections, skycell ID etc
     psString expName;           // the exposure name
     psString surveyType;        // the survey type, eg 3PI, MD01, STS, SSS
+    int8_t surveyID;            // survey ID
     uint8_t batchType;          // PSPS batch type
     psString fitsInPath;        // path to FITS input
@@ -37 +38 @@
     dvoConfig* dvoConfig;       // dvo database
     IppToPspsConfig* config;    // config structure
+    char todaysDate[12];        // today's date
     int exitCode;               // ps exit code
 
@@ -45 +47 @@
 IppToPsps *ippToPsps_Constructor(int *argc, char **argv);
 void ippToPsps_VersionPrint(void);
+bool ippToPsps_getFlux(
+        const float exposureTime, 
+        const float magnitude, 
+        float* flux, 
+        const float magnitudeErr, 
+        float* fluxErr);
 
 # endif // IPPTOPSPS_H