Changeset 4865 for trunk/Ohana/src/opihi

Timestamp:

Aug 24, 2005, 8:51:56 AM (21 years ago)

Author:

eugene

Message:

adding internal vs external formats for average, measure, secfilt

Location:

trunk/Ohana/src/opihi/dvo

Files:

• calextract.c (modified) (1 diff)
• calmextract.c (modified) (1 diff)
• catalog.c (modified) (7 diffs)
• compare.c (modified) (1 diff)
• dmt.c (modified) (1 diff)
• gstar.c (modified) (3 diffs)
• imdata.c (modified) (4 diffs)
• lcurve.c (modified) (1 diff)
• lightcurve.c (modified) (1 diff)
• photometry.c (modified) (6 diffs)

trunk/Ohana/src/opihi/dvo/calextract.c

@@ -94 +94 @@
         if (catalog.measure[m+j].source != code[1][0].code) continue;
         M2 = PhotCat  (&catalog.measure[m+j]);
-        dM2 = 0.001*catalog.measure[m+j].dM;
+        dM2 = catalog.measure[m+j].dM_PS;
       } 
       if (M2 == NO_MAG) continue;

trunk/Ohana/src/opihi/dvo/calmextract.c

@@ -107 +107 @@
         if (catalog.measure[m+j].source != code[1][0].code) continue;
         M2 = PhotCat  (&catalog.measure[m+j]); 
-        dM2 = 0.001*catalog.measure[m+j].dM;
+        dM2 = catalog.measure[m+j].dM_PS;
       } 
       if (M2 == NO_MAG) continue;

trunk/Ohana/src/opihi/dvo/catalog.c

@@ -101 +101 @@
   if ((Nm = get_argument (argc, argv, "-m"))) {
     remove_argument (Nm, &argc, argv);
-    Mr  = 1000*atof(argv[Nm]);
+    Mr  = atof(argv[Nm]);
     remove_argument (Nm, &argc, argv);
-    Mz = 1000*atof(argv[Nm]);
+    Mz = atof(argv[Nm]);
     Mr = Mr - Mz;
     remove_argument (Nm, &argc, argv);
@@ -200 +200 @@
         catalog.average[nstar].R_PS = R;
         catalog.average[nstar].D_PS = D;
-        catalog.average[nstar].M = M * 1000.0;
+        catalog.average[nstar].M_PS = M;
         nstar++;
         if (nstar == NSTARS - 1) {
@@ -242 +242 @@
           catalog.average[nstar].R_PS = R;
           catalog.average[nstar].D_PS = D;
-          catalog.average[nstar].M = M * 1000.0;
+          catalog.average[nstar].M_PS = M;
           nstar++;
           if (nstar == NSTARS - 1) {
@@ -292 +292 @@
           catalog.average[nstar].R_PS = R;
           catalog.average[nstar].D_PS = D;
-          catalog.average[nstar].M = M * 1000.0;
+          catalog.average[nstar].M_PS = M;
           nstar++;
           if (nstar == NSTARS - 1) {
@@ -346 +346 @@
         if (IDclip && (catalog.average[i].code != IDchoice))
           continue;
-        Zvec.elements[N] = MIN (1.0, MAX (0.01, (catalog.average[i].M - Mz) / Mr));
+        Zvec.elements[N] = MIN (1.0, MAX (0.01, (catalog.average[i].M_PS - Mz) / Mr));
         if (LimExclude && (Zvec.elements[N] > 0.99)) continue;
         if (Zvec.elements[N] < 0.011) continue;
@@ -356 +356 @@
     case (NUMSCALE):
       for (N = i = 0; i < catalog.Naverage; i++) {
-        if (clip && ((catalog.average[i].M > Mz) || (catalog.average[i].M < Mr+Mz))) 
+        if (clip && ((catalog.average[i].M_PS > Mz) || (catalog.average[i].M_PS < Mr+Mz))) 
           continue;
         if (IDclip && (catalog.average[i].code != IDchoice))
@@ -371 +371 @@
     case (MISSCALE):
       for (N = i = 0; i < catalog.Naverage; i++) {
-        if (clip && ((catalog.average[i].M > Mz) || (catalog.average[i].M < Mr+Mz))) 
+        if (clip && ((catalog.average[i].M_PS > Mz) || (catalog.average[i].M_PS < Mr+Mz))) 
           continue;
         if (IDclip && (catalog.average[i].code != IDchoice))

trunk/Ohana/src/opihi/dvo/compare.c

@@ -38 +38 @@
            rvec[0].elements[Nmatch] = catlog1[0].average[i].R_PS;
            dvec[0].elements[Nmatch] = catlog1[0].average[i].D_PS;
-           mvec[0].elements[Nmatch] = catlog1[0].average[i].M;
+           mvec[0].elements[Nmatch] = catlog1[0].average[i].M_PS;
           drvec[0].elements[Nmatch] = dX;
           ddvec[0].elements[Nmatch] = dY;
-          dmvec[0].elements[Nmatch] = catlog1[0].average[i].M - catlog2[0].average[j].M;
+          dmvec[0].elements[Nmatch] = catlog1[0].average[i].M_PS - catlog2[0].average[j].M_PS;
           Nmatch ++;
           if (Nmatch == NMATCH - 1) {

trunk/Ohana/src/opihi/dvo/dmt.c

@@ -88 +88 @@
       if (catalog.average[i].Nm != 3) continue;
       m = catalog.average[i].offset;
-      M0 = (Ns == -1) ? 0.001*catalog.average[i].M : 0.001*catalog.secfilt[i*Nsec+Ns].M;
+      M0 = (Ns == -1) ? catalog.average[i].M_PS : catalog.secfilt[i*Nsec+Ns].M_PS;
       M1 = PhotCat (&catalog.measure[m+0]);
       M2 = PhotCat (&catalog.measure[m+1]);

trunk/Ohana/src/opihi/dvo/gstar.c

@@ -142 +142 @@
 
       /* average mags */
-      print_value (GetOutfile(), 0.001*catalog.average[k].M, catalog.average[k].M);
-      for (j = 0; j < Nsec; j++) print_value (GetOutfile(), 0.001*catalog.secfilt[j + Nsec*k].M, catalog.secfilt[j + Nsec*k].M);
+      print_value (GetOutfile(), catalog.average[k].M_PS, catalog.average[k].M_PS);
+      for (j = 0; j < Nsec; j++) print_value (GetOutfile(), catalog.secfilt[j + Nsec*k].M_PS, catalog.secfilt[j + Nsec*k].M_PS);
       fprintf (GetOutfile(), "\n");
 
       /* average mag errors */
-      print_value (GetOutfile(), 0.001*catalog.average[k].dM, catalog.average[k].dM);
-      for (j = 0; j < Nsec; j++) print_value (GetOutfile(), 0.001*catalog.secfilt[j + Nsec*k].dM, catalog.secfilt[j + Nsec*k].dM);
+      print_value (GetOutfile(), catalog.average[k].dM_PS, catalog.average[k].dM_PS);
+      for (j = 0; j < Nsec; j++) print_value (GetOutfile(), catalog.secfilt[j + Nsec*k].dM_PS, catalog.secfilt[j + Nsec*k].dM_PS);
       fprintf (GetOutfile(), "\n");
 
@@ -166 +166 @@
             date = sec_to_date (catalog.measure[m].t);
             fprintf (GetOutfile(), "%6.3f %6.3f %5.3f  %20s  %5.2f %5.2f %2d %3x %3d %-20s\n", 
-                     Mcat, Mrel, 0.001*catalog.measure[m].dM,
+                     Mcat, Mrel, catalog.measure[m].dM_PS,
                      date, catalog.measure[m].dR_PS, catalog.measure[m].dD_PS,
                      catalog.measure[m].dophot, catalog.measure[m].flags,
@@ -176 +176 @@
             vec1[0].elements[N] = Mcat;
             vec2[0].elements[N] = catalog.measure[m].t;
-            vec3[0].elements[N] = 0.001*catalog.measure[m].airmass;
+            vec3[0].elements[N] = catalog.measure[m].airmass_PS;
             vec4[0].elements[N] = catalog.measure[m].source;
             N ++;

trunk/Ohana/src/opihi/dvo/imdata.c

@@ -154 +154 @@
       for (i = 0; i < catalog.Nmeasure; i++) {
         if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-        vec[0].elements[N] = catalog.measure[i].M / 1000.0;
+        vec[0].elements[N] = catalog.measure[i].M_PS;
         N++;
         CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
@@ -162 +162 @@
       for (i = 0; i < catalog.Nmeasure; i++) {
         if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-        vec[0].elements[N] = catalog.measure[i].dM / 1000.0;
+        vec[0].elements[N] = catalog.measure[i].dM_PS;
         N++;
         CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
@@ -170 +170 @@
       for (i = 0; i < catalog.Nmeasure; i++) {
         if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-        vec[0].elements[N] = catalog.measure[i].Mcal / 1000.0;
+        vec[0].elements[N] = catalog.measure[i].Mcal_PS;
         N++;
         CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
@@ -179 +179 @@
         if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
         n = catalog.measure[i].averef;
-        vec[0].elements[N] = catalog.average[n].M / 1000.0;
+        vec[0].elements[N] = catalog.average[n].M_PS;
         N++;
       }

trunk/Ohana/src/opihi/dvo/lcurve.c

@@ -134 +134 @@
       m = catalog.average[N1[i]].offset;
       for (j = 0; j < catalog.average[N1[i]].Nm; j++, m++) {
-        if (ErrorBars) dYvec.elements[N] = 0.001*catalog.measure[m].dM;
+        if (ErrorBars) dYvec.elements[N] = catalog.measure[m].dM_PS;
         Xvec.elements[N] = TimeValue (catalog.measure[m].t, TimeReference, TimeFormat);
         Yvec.elements[N] = PhotCat (&catalog.measure[m]);

trunk/Ohana/src/opihi/dvo/lightcurve.c

@@ -123 +123 @@
 
         tvec[0].elements[N] = TimeValue (catalog.measure[m].t, TimeReference, TimeFormat);
-        dmvec[0].elements[N] = 0.001*catalog.measure[m].dM;
+        dmvec[0].elements[N] = catalog.measure[m].dM_PS;
         if (RELPHOT) {
           mvec[0].elements[N] = PhotCat (&catalog.measure[m]);

trunk/Ohana/src/opihi/dvo/photometry.c

@@ -22 +22 @@
     if (TimeSelect && (M.t < tzero)) continue; \
     if (TimeSelect && (M.t > tend)) continue; \
-    if (ErrSelect  && (M.dM > ErrValue)) continue; \
+    if (ErrSelect  && (M.dM_PS > ErrValue)) continue; \
     if (TypeSelect && (TypeValue != GetMeasureTypeCode (&M))) continue; \
     if (iMagSelect && (PhotInst (&M) < iMagMin)) continue; \
@@ -432 +432 @@
   if ((N = get_argument (*argc, argv, "-errorlim"))) {
     remove_argument (N, argc, argv);
-    ErrValue = 1000*atof (argv[N]);
+    ErrValue = atof (argv[N]);
     remove_argument (N, argc, argv);
     ErrSelect = TRUE;
@@ -622 +622 @@
       for (i = 0; i < average[0].Nm; i++) {
         if ((code != NULL) && (code[0].code != GetPhotcodeEquivCodebyCode (measure[i].source))) continue;
-        if (ErrSelect && (measure[i].dM > ErrValue)) continue;
+        if (ErrSelect && (measure[i].dM_PS > ErrValue)) continue;
         if (FlagSelect && (measure[i].flags != FlagValue)) continue;
         if (TypeSelect && (TypeValue != GetMeasureTypeCode (&measure[i]))) continue;
@@ -789 +789 @@
   /* for ErrSelect, check average errors */
   if (ErrSelect) {
-    dM = iPhotdM (code, average, secfilt);
+    dM = PhotdM (code, average, secfilt);
     if (dM > ErrValue) return (NO_MAG);
   }
@@ -847 +847 @@
    average[].M is stored as 1000*mag where mag is PhotAbs
    measure[].M for PHOT_REL is the same 
+   XXX EAM : note that we are transitioning away from millimag internal storage 
 */ 
 
@@ -1063 +1064 @@
       break;
     case MEAS_dMAG: /* OK */
-      value = 0.001*measure[0].dM;
+      value = measure[0].dM_PS;
       break;
     case MEAS_AIRMASS: /* OK */
-      value = 0.001*measure[0].airmass;
+      value = measure[0].airmass_PS;
       break;
     case MEAS_EXPTIME: /* OK */
-      value = pow (10.0, measure[0].dt * 0.0004);
+      value = pow (10.0, measure[0].dt_PS * 0.4);
       break;
     case MEAS_PHOTCODE: /* OK */