Changeset 20839 for branches/eam_branch_20081124/Ohana/src/opihi/dvo/imextract.c

Timestamp:

Nov 25, 2008, 4:51:39 PM (18 years ago)

Author:

eugene

Message:

convert opihi vectors to double type, add option for int type as well

File:

• branches/eam_branch_20081124/Ohana/src/opihi/dvo/imextract.c (modified) (10 diffs)

branches/eam_branch_20081124/Ohana/src/opihi/dvo/imextract.c

@@ -165 +165 @@
 
   /* create storage vector */
-  REALLOCATE (vec[0].elements, float, Nimage);
+  REALLOCATE (vec[0].elements.Flt, opihi_flt, Nimage);
   vec[0].Nelements = Nimage;
   
@@ -186 +186 @@
         y = 0.5*image[j].NY;
         XY_to_RD (&ra, &dec, x, y, &image[j].coords);
-        vec[0].elements[N] = ra;
+        vec[0].elements.Flt[N] = ra;
         break;
       case DEC:
@@ -193 +193 @@
         y = 0.5*image[j].NY;
         XY_to_RD (&ra, &dec, x, y, &image[j].coords);
-        vec[0].elements[N] = dec;
+        vec[0].elements.Flt[N] = dec;
         break;
       case Xm:
-        vec[0].elements[N] = pow(10.0, 0.01*image[j].Xm);
+        vec[0].elements.Flt[N] = pow(10.0, 0.01*image[j].Xm);
         break;
       case AIRMASS:
-        vec[0].elements[N] = image[j].secz;
+        vec[0].elements.Flt[N] = image[j].secz;
         break;
       case MCAL:
-        vec[0].elements[N] = image[j].Mcal;
+        vec[0].elements.Flt[N] = image[j].Mcal;
         break;
       case dMCAL:
-        vec[0].elements[N] = image[j].dMcal;
+        vec[0].elements.Flt[N] = image[j].dMcal;
         break;
       case PHOTCODE:
-        vec[0].elements[N] = image[j].photcode;
+        vec[0].elements.Flt[N] = image[j].photcode;
         break;
       case TIME:
         t = image[j].tzero + 0.5*image[j].NY * image[j].trate / 10000;
-        vec[0].elements[N] = TimeValue (t, TimeReference, TimeFormat);
+        vec[0].elements.Flt[N] = TimeValue (t, TimeReference, TimeFormat);
         break;
       case FWHM:
-        vec[0].elements[N] = image[j].fwhm_x / 25.0;
+        vec[0].elements.Flt[N] = image[j].fwhm_x / 25.0;
         break;
       case EXPTIME:
-        vec[0].elements[N] = image[j].exptime;
+        vec[0].elements.Flt[N] = image[j].exptime;
         break;
       case NSTAR:
-        vec[0].elements[N] = image[j].nstar;
+        vec[0].elements.Flt[N] = image[j].nstar;
         break;
       case NCAL:
-        vec[0].elements[N] = image[j].Mxxxx;
+        vec[0].elements.Flt[N] = image[j].Mxxxx;
         break;
       case SKY:
-        vec[0].elements[N] = image[j].Myyyy + 0x8000;
+        vec[0].elements.Flt[N] = image[j].Myyyy + 0x8000;
         break;
       case FLAG:
-        vec[0].elements[N] = image[j].code;
+        vec[0].elements.Flt[N] = image[j].code;
         break;
       case NX_PIX:
-        vec[0].elements[N] = image[j].NX;
+        vec[0].elements.Flt[N] = image[j].NX;
         break;
       case NY_PIX:
-        vec[0].elements[N] = image[j].NY;
+        vec[0].elements.Flt[N] = image[j].NY;
         break;
       case IMAGE_ID:
-        vec[0].elements[N] = image[j].imageID;
+        vec[0].elements.Flt[N] = image[j].imageID;
         break;
       case THETA: {
@@ -247 +247 @@
         theta1 = DEG_RAD*atan2 (+s1*image[j].coords.pc1_2, s1*image[j].coords.pc1_1);
         theta2 = DEG_RAD*atan2 (-s2*image[j].coords.pc2_1, s2*image[j].coords.pc2_2);
-        vec[0].elements[N] = 0.5*(theta1+theta2);
+        vec[0].elements.Flt[N] = 0.5*(theta1+theta2);
         break; }
       case SKEW: {
@@ -255 +255 @@
         theta1 = DEG_RAD*atan2 (+s1*image[j].coords.pc1_2, s1*image[j].coords.pc1_1);
         theta2 = DEG_RAD*atan2 (-s2*image[j].coords.pc2_1, s2*image[j].coords.pc2_2);
-        vec[0].elements[N] = (theta1-theta2);
+        vec[0].elements.Flt[N] = (theta1-theta2);
         break; }
       case SCALE: {
@@ -261 +261 @@
         scale1 = fabs(image[j].coords.cdelt1);
         scale2 = fabs(image[j].coords.cdelt2);
-        vec[0].elements[N] = 0.5*(scale1+scale2);
+        vec[0].elements.Flt[N] = 0.5*(scale1+scale2);
         break; }
       case DSCALE: {
@@ -267 +267 @@
         scale1 = fabs(image[j].coords.cdelt1);
         scale2 = fabs(image[j].coords.cdelt2);
-        vec[0].elements[N] = (scale1-scale2);
+        vec[0].elements.Flt[N] = (scale1-scale2);
         break; }
 
@@ -275 +275 @@
     case Y_LR_CHIP:
     case X_UL_CHIP:
-      vec[0].elements[N] = 0.0;
+      vec[0].elements.Flt[N] = 0.0;
       break;
     case X_LR_CHIP:
     case X_UR_CHIP:
-      vec[0].elements[N] = image[j].NX;
+      vec[0].elements.Flt[N] = image[j].NX;
       break;
     case Y_UL_CHIP:
     case Y_UR_CHIP:
-      vec[0].elements[N] = image[j].NX;
+      vec[0].elements.Flt[N] = image[j].NX;
       break;
 
@@ -289 +289 @@
     case Y_LL_FP:
       XY_to_LM (&x, &y, 0.0, 0.0, &image[j].coords);
-      vec[0].elements[N] = (mode == X_LL_FP) ? x : y;
+      vec[0].elements.Flt[N] = (mode == X_LL_FP) ? x : y;
       break;
     case X_LR_FP:
     case Y_LR_FP:
       XY_to_LM (&x, &y, image[j].NX, 0.0, &image[j].coords);
-      vec[0].elements[N] = (mode == X_LR_FP) ? x : y;
+      vec[0].elements.Flt[N] = (mode == X_LR_FP) ? x : y;
       break;
     case X_UL_FP:
     case Y_UL_FP:
       XY_to_LM (&x, &y, 0.0, image[j].NY, &image[j].coords);
-      vec[0].elements[N] = (mode == X_UL_FP) ? x : y;
+      vec[0].elements.Flt[N] = (mode == X_UL_FP) ? x : y;
       break;
     case X_UR_FP:
     case Y_UR_FP:
       XY_to_LM (&x, &y, image[j].NX, image[j].NY, &image[j].coords);
-      vec[0].elements[N] = (mode == X_UR_FP) ? x : y;
+      vec[0].elements.Flt[N] = (mode == X_UR_FP) ? x : y;
       break;
     }
@@ -311 +311 @@
   
   vec[0].Nelements = N;
-  REALLOCATE (vec[0].elements, float, N);
+  REALLOCATE (vec[0].elements.Flt, opihi_flt, N);
 
   free (subset);