Changeset 4865 for trunk/Ohana/src/opihi/dvo/catalog.c

Timestamp:

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

Author:

eugene

Message:

adding internal vs external formats for average, measure, secfilt

File:

• trunk/Ohana/src/opihi/dvo/catalog.c (modified) (7 diffs)

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))