Changeset 30631 for branches/czw_branch/20101203/Ohana/src/opihi/dvo/imphot.c

Timestamp:

Feb 14, 2011, 1:05:28 PM (15 years ago)

Author:

watersc1

Message:

Merge of trunk back into branch.

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• Ohana/src/opihi/dvo/imphot.c (modified) (4 diffs)

branches/czw_branch/20101203/Ohana/src/opihi/dvo/imphot.c

@@ -9 +9 @@
   char bufname[64];
   float *p;
-  double fx, fy, x, y, applyMcal();
+  double fx, fy, x, y;
   Image *image;
   Buffer *buf;
@@ -63 +63 @@
     for (y = 0; y < 200; y+=1.0) {
       for (x = 0; x < 100; x+=1.0, p++) {
-        *p = applyMcal (&image[subset[0]], (fx*x), (fy*y));
+        // *p = applyMcal (&image[subset[0]], (fx*x), (fy*y));
+        *p = image[subset[0]].Mcal;
       }
     }
@@ -70 +71 @@
   for (j = 0; j < Nsubset; j++) {
     i = subset[j];
+    gprint (GP_ERR, "%s: %f\n", image[i].name, image[i].Mcal);
+
+// XXX old code when we had the option of a 2D zero point model
+# if (0)      
     switch (image[i].order) {
     case 0:
@@ -90 +95 @@
       break;
     }
+# endif
   }