Changeset 40212 for branches/eam_branches/ohana.20170822/src/opihi

Timestamp:

Nov 22, 2017, 10:38:42 AM (9 years ago)

Author:

eugene

Message:

update names for consistency: secfilt.M -> secfilt.MpsfChp, etc

Location:

branches/eam_branches/ohana.20170822/src/opihi

Files:

• dvo/gimages.c (modified) (1 diff)
• dvo/gstar.c (modified) (11 diffs)
• dvo/imlist.c (modified) (1 diff)
• dvo/imphot.c (modified) (3 diffs)
• dvo/imstats.c (modified) (2 diffs)
• dvo/objectcoverage.c (modified) (1 diff)
• dvo/paverage.c (modified) (1 diff)
• dvo/skycoverage.c (modified) (1 diff)
• lib.shell/evaluate_stack.c (modified) (1 diff)

branches/eam_branches/ohana.20170822/src/opihi/dvo/gimages.c

@@ -214 +214 @@
     if (PixelCoords) {
       gprint (GP_LOG, "%3d %5d %s %6.1f %6.1f %20s %5d %2d %4.2f %6.3f %5.3f %5.3f %4x %7d\n", 
-              Nfound, (int) i, image[i].name, X, Y, date, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal, image[i].exptime, image[i].flags, image[i].imageID);
+              Nfound, (int) i, image[i].name, X, Y, date, image[i].nstar, image[i].photcode, image[i].secz, image[i].McalPSF, image[i].dMcal, image[i].exptime, image[i].flags, image[i].imageID);
     } else {
       XY_to_RD (&ra, &dec, 0.5*image[i].NX, 0.5*image[i].NY, &image[i].coords);
       gprint (GP_LOG, "%3d %5d %s %8.4f %8.4f %20s %5d %2d %4.2f %6.3f %5.3f %5.3f %4x %7d\n", 
-              Nfound, (int) i, image[i].name, ra, dec, date, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal, image[i].exptime, image[i].flags, image[i].imageID);
+              Nfound, (int) i, image[i].name, ra, dec, date, image[i].nstar, image[i].photcode, image[i].secz, image[i].McalPSF, image[i].dMcal, image[i].exptime, image[i].flags, image[i].imageID);
     }
     sprintf (name, "IMAGEx:%d", Nfound);

branches/eam_branches/ohana.20170822/src/opihi/dvo/gstar.c

@@ -960 +960 @@
         print_double (NAN);
       } else {
-        print_double_exp (secfilt[seq].Mstdev);
+        print_double_exp (secfilt[seq].sMpsfChp);
       }
       break;
@@ -1023 +1023 @@
         print_double (NAN);
       } else {
-        print_double (secfilt[seq].M);
+        print_double (secfilt[seq].MpsfChp);
       }
       break;
@@ -1031 +1031 @@
         print_double (NAN);
       } else {
-        print_double (secfilt[seq].dM);
+        print_double (secfilt[seq].dMpsfChp);
       }
       break;
@@ -1039 +1039 @@
         print_double (NAN);
       } else {
-        print_double (secfilt[seq].Map);
+        print_double (secfilt[seq].MapChp);
       }
       break;
@@ -1047 +1047 @@
         print_double (NAN);
       } else {
-        print_double (secfilt[seq].dMap);
+        print_double (secfilt[seq].dMapChp);
       }
       break;
@@ -1055 +1055 @@
         print_double (NAN);
       } else {
-        print_double_exp (secfilt[seq].sMap);
+        print_double_exp (secfilt[seq].sMapChp);
       }
       break;
@@ -1063 +1063 @@
         print_double (NAN);
       } else {
-        print_double_exp (secfilt[seq].dMap);
+        print_double_exp (secfilt[seq].dMapChp);
       }
       break;
@@ -1071 +1071 @@
         print_double (NAN);
       } else {
-        print_double (secfilt[seq].Mkron);
+        print_double (secfilt[seq].MkronChp);
       }
       break;
@@ -1079 +1079 @@
         print_double (NAN);
       } else {
-        print_double (secfilt[seq].dMkron);
+        print_double (secfilt[seq].dMkronChp);
       }
       break;
@@ -1087 +1087 @@
         print_double (NAN);
       } else {
-        print_double_exp (secfilt[seq].sMkron);
+        print_double_exp (secfilt[seq].sMkronChp);
       }
       break;
@@ -1095 +1095 @@
         print_double (NAN);
       } else {
-        print_double_exp (secfilt[seq].dMkron);
+        print_double_exp (secfilt[seq].dMkronChp);
       }
       break;

branches/eam_branches/ohana.20170822/src/opihi/dvo/imlist.c

@@ -141 +141 @@
     if (VERBOSE) {
       gprint (GP_LOG, "%3lld %s %8lld %8.4f %8.4f %f %5d %2d %4.2f %5.3f %5.3f", 
-                         (long long) i, image[i].name, (long long) image[i].imageID, r, d, t, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal);
+                         (long long) i, image[i].name, (long long) image[i].imageID, r, d, t, image[i].nstar, image[i].photcode, image[i].secz, image[i].McalPSF, image[i].dMcal);
 
       if (showUR) {

branches/eam_branches/ohana.20170822/src/opihi/dvo/imphot.c

@@ -64 +64 @@
       for (x = 0; x < 100; x+=1.0, p++) {
         // *p = applyMcal (&image[subset[0]], (fx*x), (fy*y));
-        *p = image[subset[0]].Mcal;
+        *p = image[subset[0]].McalPSF;
       }
     }
@@ -71 +71 @@
   for (j = 0; j < Nsubset; j++) {
     i = subset[j];
-    gprint (GP_ERR, "%s: %f\n", image[i].name, image[i].Mcal);
+    gprint (GP_ERR, "%s: %f\n", image[i].name, image[i].McalPSF);
 
 // XXX old code when we had the option of a 2D zero point model
@@ -77 +77 @@
     switch (image[i].order) {
     case 0:
-      gprint (GP_ERR, "%s: %d - %f\n", image[i].name, image[i].order, image[i].Mcal);
+      gprint (GP_ERR, "%s: %d - %f\n", image[i].name, image[i].order, image[i].McalPSF);
       break;
     case 1:
-      gprint (GP_ERR, "%s: %d - %f, %d %d\n", image[i].name, image[i].order, image[i].Mcal, image[i].Mx, image[i].My);
+      gprint (GP_ERR, "%s: %d - %f, %d %d\n", image[i].name, image[i].order, image[i].McalPSF, image[i].Mx, image[i].My);
       break;
     case 2:
-      gprint (GP_ERR, "%s: %d - %f, %d %d, %d %d %d\n", image[i].name, image[i].order, image[i].Mcal, image[i].Mx, image[i].My, image[i].Mxx, image[i].Mxy, image[i].Myy);
+      gprint (GP_ERR, "%s: %d - %f, %d %d, %d %d %d\n", image[i].name, image[i].order, image[i].McalPSF, image[i].Mx, image[i].My, image[i].Mxx, image[i].Mxy, image[i].Myy);
       break;
     case 3:
-      gprint (GP_ERR, "%s: %d - %f, %d %d, %d %d %d, %d %d %d %d\n", image[i].name, image[i].order, image[i].Mcal, image[i].Mx, image[i].My, 
+      gprint (GP_ERR, "%s: %d - %f, %d %d, %d %d %d, %d %d %d %d\n", image[i].name, image[i].order, image[i].McalPSF, image[i].Mx, image[i].My, 
                image[i].Mxx, image[i].Mxy, image[i].Myy, image[i].Mxxx, image[i].Mxxy, image[i].Mxyy, image[i].Myyy);
       break;
     case 4:
-      gprint (GP_ERR, "%s: %d - %f, %d %d, %d %d %d, %d %d %d %d, %d %d %d %d %d\n", image[i].name, image[i].order, image[i].Mcal, image[i].Mx, image[i].My, 
+      gprint (GP_ERR, "%s: %d - %f, %d %d, %d %d %d, %d %d %d %d, %d %d %d %d %d\n", image[i].name, image[i].order, image[i].McalPSF, image[i].Mx, image[i].My, 
                image[i].Mxx, image[i].Mxy, image[i].Myy, image[i].Mxxx, image[i].Mxxy, image[i].Mxyy, image[i].Myyy,
                image[i].Mxxxx, image[i].Mxxxy, image[i].Mxxyy, image[i].Mxyyy, image[i].Myyyy);

branches/eam_branches/ohana.20170822/src/opihi/dvo/imstats.c

@@ -41 +41 @@
     Xvec.elements.Flt[i] = image[i].secz;
     if (Mcal) 
-      Yvec.elements.Flt[i] = image[i].Mcal;
+      Yvec.elements.Flt[i] = image[i].McalPSF;
     else 
       Yvec.elements.Flt[i] = image[i].dMcal;
@@ -47 +47 @@
     gprint (GP_ERR, "%d %8.4f %8.4f %10d %6d  %5.3f %6.3f %6.3f\n", 
              i, r, d, image[i].tzero, image[i].nstar, Xvec.elements.Flt[i], 
-             image[i].Mcal, image[i].dMcal);
+             image[i].McalPSF, image[i].dMcal);
   } 
   if (AutoLimits) SetLimits (&Xvec, &Yvec, &graphmode);

branches/eam_branches/ohana.20170822/src/opihi/dvo/objectcoverage.c

@@ -203 +203 @@
         if (catalog.secfilt[j*Nsecfilt+Nsec].Ncode < 2) { continue; }
 
-        invalid = ((catalog.secfilt[j*Nsecfilt + Nsec].M < 1.0) || (isnan(catalog.secfilt[j*Nsecfilt + Nsec].M)));
+        invalid = ((catalog.secfilt[j*Nsecfilt + Nsec].MpsfChp < 1.0) || (isnan(catalog.secfilt[j*Nsecfilt + Nsec].MpsfChp)));
         if (invalid) continue;
         

branches/eam_branches/ohana.20170822/src/opihi/dvo/paverage.c

@@ -125 +125 @@
       while (average[i].R > Rmax) average[i].R -= 360.0;
 
-      mag = secfilt[i*Nsecfilt+Nsec].M;
+      mag = secfilt[i*Nsecfilt+Nsec].MpsfChp;
       Zvec[Npts] = MIN (1.0, MAX (0.01, (mag - Mz) / Mr));
       if (LimExclude && (Zvec[Npts] > 0.99)) continue;

branches/eam_branches/ohana.20170822/src/opihi/dvo/skycoverage.c

@@ -330 +330 @@
               break;
             case MIN_MCAL:
-              V[ys*Nx + xs] = MIN(V[ys*Nx + xs], image[i].Mcal);
+              V[ys*Nx + xs] = MIN(V[ys*Nx + xs], image[i].McalPSF);
               break;
             case MAX_MCAL:
-              V[ys*Nx + xs] = MAX(V[ys*Nx + xs], image[i].Mcal);
+              V[ys*Nx + xs] = MAX(V[ys*Nx + xs], image[i].McalPSF);
               break;
             case MIN_TIME: {

branches/eam_branches/ohana.20170822/src/opihi/lib.shell/evaluate_stack.c

@@ -188 +188 @@
           snprintf (line, 512, "syntax error: invalid operand for binary operation: %s or %s\n", stack[i-1].name, stack[i-2].name);
           push_error (line);
+          if (strchr(stack[i-1].name, ':') || strchr(stack[i-2].name, ':')) {
+            snprintf (line, 512, "syntax error: invalid operand for binary operation: %s or %s\n(Note that the : in a trinary operation must be protected by spaces)\n", stack[i-1].name, stack[i-2].name);
+            push_error (line);
+          }
           clear_stack (&tmp_stack);
           return (FALSE);