Changeset 8321

Timestamp:

02/02/21 13:54:41 (2 months ago)

Author:

paulf

Message:

updated to sort arrivals...

File:

• trunk/src/reporting/ewhtmlemail/ewhtmlemail.c (modified) (5 diffs)

trunk/src/reporting/ewhtmlemail/ewhtmlemail.c

@@ -46 +46 @@
 /* 1.3.5 - 2020-12-22 - added OPTIONAL FromAddress setting for sendmail (UNIX only) */
 /* 1.3.6 - 2020-12-28 - added REGION name to ShowDetailedSubject, if part of a region decision */
-
-#define VERSION_STR "1.3.6 - 2021-01-02"
+/* 1.3.7 - 2021-02-02 - sorted phases by distance as some hypoinverse files from dbselect output were SCNL sorted */
+
+#define VERSION_STR "1.3.7 - 2021-02-02"
 
 #define MAX_GE_MARKERS 20
@@ -254 +255 @@
 static unsigned char      TypeTraceBuf2 = 0;
 
+/*-- this was in main, but now as a global variable --*/
+HypoArc          *arc;             // a hypoinverse ARC message currently being processed
+static int phase_dist_compare( const void* a, const void* b ) {
+    int ret_value = 0;
+    struct Hpck *a_pick = (struct Hpck *) a, *b_pick = (struct Hpck *) b;
+    if (a_pick->dist < b_pick->dist) {
+       ret_value=-1;
+    } else if (a_pick->dist > b_pick->dist) {
+       ret_value=1;
+    }
+    return ret_value;
+}
+
+
 
 /* Error messages used by ewhtmlemail
@@ -278 +293 @@
    unsigned char seq;
    int           i, j, res;
-   HypoArc               *arc;             // a hypoinverse ARC message
    MAG_INFO      mag_l;            // a magnitude message containing ML, after ARC
    MAG_INFO      mag_w;            // a magnitude message containing Mw
@@ -623 +637 @@
          arc = calloc(1, sizeof(HypoArc));
          parse_arc(msgbuf, arc);
+         qsort(arc->phases, arc->num_phases,  sizeof(struct Hpck *), phase_dist_compare);
          if (!UseML && !UseMW) {
              process_message(arc, NULL, NULL, reclogo);
@@ -1763 +1778 @@
         char            phases[MAX_STATIONS][3];                        /* Phase types of each trace */
         double          arrivalTimes[MAX_STATIONS];             /* Arrival times of each trace */
-    double              residual[MAX_STATIONS];                 /* phase residual */
+        double          residual[MAX_STATIONS];                 /* phase residual */
         int             coda_lengths[MAX_STATIONS];             /* Coda lengths of each trace */
         double          coda_mags[MAX_STATIONS];                /* station coda mags > 0 if used */