IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 39634


Ignore:
Timestamp:
Jul 21, 2016, 10:49:58 AM (10 years ago)
Author:
eugene
Message:

do not add extra line with NAN values when reading from an ascii file; output Mflat in gstar

Location:
trunk/Ohana/src/opihi
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/opihi/cmd.data/read_vectors.c

    r39534 r39634  
    246246          c1 = c0 + Nstart;
    247247          bufferStatus = FALSE;
     248          if (Nstart == 0) continue; // if we have reached EOF and c0 points at the last valid character, we are done
    248249        } else {
    249250          // if we have not reached EOF, we need to shift the buffer to the start of this line and read more data

  • trunk/Ohana/src/opihi/cmd.data/test/read.sh

    r33662 r39634  
    11
    22list tests
    3  #test1
    4  #test2
    5  #test3
    6  #test4
     3 test1
     4 test2
     5 test3
     6 test4
    77 test5
    88 test6
    … …  
    3838 read t1:int 1 t2:int 2 t3:int 3
    3939
     40 vtype t1 -var type; if ("$type" != "INT") set PASS = 0
     41 vtype t2 -var type; if ("$type" != "INT") set PASS = 0
     42 vtype t3 -var type; if ("$type" != "INT") set PASS = 0
     43
    4044 # note: no way to verify the mode of a vector
    41  vectors
     45 if ($VERBOSE >= 2) vectors
    4246
    4347 if (t1[0] != 1) set PASS = 0
    … …  
    8387 read t1:int 1 t2:int 2 t3:int 3
    8488
    85  # note: no way to verify the mode of a vector
    86  vectors
     89 vtype t1 -var type; if ("$type" != "INT") set PASS = 0
     90 vtype t2 -var type; if ("$type" != "INT") set PASS = 0
     91 vtype t3 -var type; if ("$type" != "INT") set PASS = 0
     92
     93 if ($VERBOSE >= 2) vectors
    8794
    8895 if (t1[0] != 1) set PASS = 0
    … …  
    128135 read t1:int 1 t2:int 2 t3:int 3
    129136
    130  # note: no way to verify the mode of a vector
    131  vectors
     137 vtype t1 -var type; if ("$type" != "INT") set PASS = 0
     138 vtype t2 -var type; if ("$type" != "INT") set PASS = 0
     139 vtype t3 -var type; if ("$type" != "INT") set PASS = 0
     140
     141 if ($VERBOSE >= 2) vectors
    132142
    133143 if (t1[0] != 1) set PASS = 0

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

    r39604 r39634  
    761761            if (FULL_OUTPUT) {
    762762              gprint (GP_LOG, "%6.3f ", catalog.measure[Nv].Mcal);
     763              gprint (GP_LOG, "%6.3f ", catalog.measure[Nv].Mflat);
    763764              gprint (GP_LOG, "%6.3f ", catalog.measure[Nv].Map);
    764765              gprint (GP_LOG, "%6.3f ", catalog.measure[Nv].Mkron);
Note: See TracChangeset for help on using the changeset viewer.