Changeset 34085 for trunk/psModules/src/camera

Timestamp:

Jun 26, 2012, 11:31:38 AM (14 years ago)

Author:

eugene

Message:

re-enable MODEL_VAR option for linear photometry fit

Location:

trunk/psModules

Files:

• . (modified) (1 prop)
• src/camera/pmFPAMosaic.c (modified) (1 diff)
• src/camera/pmFPARead.c (modified) (1 diff)
• src/camera/pmFPAfileDefine.c (modified) (1 diff)
• src/camera/pmReadoutFake.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPAMosaic.c

@@ -661 +661 @@
             good = false;
         }
+    }
+    if (!good) {
+        // XXX do something to address this?
     }
 

trunk/psModules/src/camera/pmFPARead.c

@@ -957 +957 @@
         trimsec->y1 = naxis2 + trimsec->y1;
 
-    int maxSize;                        // Number of cols,rows in image
-    if (readdir == 1) {
-        maxSize = PS_MIN(naxis2, trimsec->y1 - trimsec->y0);
-    } else {
-        maxSize = PS_MIN(naxis1, trimsec->x1 - trimsec->x0);
-    }
+    // XX not used int maxSize;                        // Number of cols,rows in image
+    // XX not used if (readdir == 1) {
+    // XX not used     maxSize = PS_MIN(naxis2, trimsec->y1 - trimsec->y0);
+    // XX not used } else {
+    // XX not used     maxSize = PS_MIN(naxis1, trimsec->x1 - trimsec->x0);
+    // XX not used }
 
     int offset;                         // start of the segment

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -333 +333 @@
         psMetadataItem *fuzz = psMetadataLookup(scheme, "FUZZ"); // Quantisation fuzz?
         if (fuzz) {
-            if (fuzz->type != PS_TYPE_BOOL) {
+            if (fuzz->type != PS_DATA_BOOL) {
                 psWarning("FUZZ in compression scheme %s isn't boolean.", fitsType);
                 goto FITS_OPTIONS_DONE;

trunk/psModules/src/camera/pmReadoutFake.c

@@ -332 +332 @@
 #define CONCEPT_SET_S32(CONCEPTS, NAME, OLD, NEW) { \
         psMetadataItem *item = psMetadataLookup(CONCEPTS, NAME); \
-        psAssert(item->type == PS_TYPE_S32, "Incorrect type: %x", item->type); \
+        psAssert(item->type == PS_DATA_S32, "Incorrect type: %x", item->type); \
         if (item->data.S32 == OLD) { \
             item->data.S32 = NEW; \