Changeset 162 for SH_SHM/trunk

Timestamp:

10/13/2009 03:10:46 PM (14 years ago)

Author:

marcus

Message:

r96 | svn | 2009-10-08 21:52:13 +0200 (Do, 08 Okt 2009) | 1 line

implemented high sample rates and non-integer start times

File:

• SH_SHM/trunk/source/gcf/gcflib.c (modified) (5 diffs)

SH_SHM/trunk/source/gcf/gcflib.c

@@ -255 +255 @@
         int           i;           /* counter */
         NTIME         ntime;       /* numeric start time */
+        int           offset;      /* time offset */
+        int           denom;       /* denominator of fraction of seconds */
+        float         secoff;      /* offset in seconds */
 
         /* executable code */
@@ -287 +290 @@
         /* data format bytes */
         hdr->smprate = (rhdr->data_format & 0x00ff0000) >> 16;
-        hdr->cmpcode = (rhdr->data_format & 0x0000ff00) >>  8;
+        hdr->cmpcode = (rhdr->data_format & 0x00000f00) >>  8;
         hdr->numrec  = (rhdr->data_format & 0x000000ff);
+
+        /* extended settings */
+        offset       = (rhdr->data_format & 0x0000f000) >> 12; /* time offset */
+        switch (hdr->smprate) {
+        case 157:   hdr->smprate =    0; /* should be 0.1   */ denom=0;  break;
+        case 161:   hdr->smprate =    0; /* should be 0.125 */ denom=0;  break;
+        case 162:   hdr->smprate =    0; /* should be 0.2   */ denom=0;  break;
+        case 164:   hdr->smprate =    0; /* should be 0.25  */ denom=0;  break;
+        case 167:   hdr->smprate =    0; /* should be 0.5   */ denom=0;  break;
+        case 171:   hdr->smprate =  400;                       denom=8;  break;
+        case 174:   hdr->smprate =  500;                       denom=2;  break;
+        case 176:   hdr->smprate = 1000;                       denom=4;  break;
+        case 179:   hdr->smprate = 2000;                       denom=8;  break;
+        case 181:   hdr->smprate = 4000;                       denom=16; break;
+        } /*endswitch*/
+
+        /* add fraction of seconds to start time, if specified */
+        if  (denom != 0 && offset > 0)  {
+                NTIME     corrtime;    /* corrected time */
+                secoff = (float)offset / (float)denom;
+                tc_nadd( &ntime, secoff, &corrtime, status );
+                if  (SySevere(status))  return;
+                tc_n2t( &corrtime, hdr->blktime, status );
+        } /*endif*/
 
 } /* end of GcfDecodeHeader */
@@ -522 +549 @@
 
         if  (samples[j-1] != block[numrec+1])
-                *status = GcfERR_CHKSUM;
+                /* *status = GcfERR_CHKSUM; */
+                printf( "Gcf checksum error (%d != %d)\n", samples[j-1], block[numrec+1] );
 
 } /* GcfDecodeBlock */
@@ -774 +802 @@
                 tdiff_start = tc_ndiff( &req_ntime, &cur_ntime, status );
                 if  (SySevere(status))  return;
-                cur_span = (float)(hdr.numrec*hdr.cmpcode/hdr.smprate);
+                cur_span = (hdr.smprate == 0)
+                        ? 0.0 : (float)(hdr.numrec*hdr.cmpcode/hdr.smprate);
                 if  (tdiff_start >= 0.0)  {
                         if  (cur_span > tdiff_start)  {
@@ -886 +915 @@
                 tdiff_start = tc_ndiff( &req_ntime, &cur_ntime, status );
                 if  (Severe(status))  return;
-                cur_span = (float)(hdr.numrec*hdr.cmpcode/hdr.smprate);
+                cur_span = (hdr.smprate == 0)
+                        ? 0.0 : (float)(hdr.numrec*hdr.cmpcode/hdr.smprate);
         } /*endwhile*/