IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Dec 13, 2017, 10:53:48 AM (9 years ago)
Author:
eugene
Message:

merge EAM development branch changes for DR2 into trunk (add PS1_V6 dvo format; change Mcal to McalPSF, McalAPER; change opihi int vectors to 64bit)

Location:
trunk/Ohana
Files:
10 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/Ohana

  • trunk/Ohana/src/opihi/cmd.data/Makefile

    r40165 r40291  
    155155$(SRC)/type.$(ARCH).o              \
    156156$(SRC)/uniq.$(ARCH).o              \
     157$(SRC)/uniqpair.$(ARCH).o                  \
    157158$(SRC)/unsign.$(ARCH).o            \
    158159$(SRC)/vbin.$(ARCH).o              \

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

    r40165 r40291  
    141141int tvcontour        PROTO((int, char **));
    142142int tvgrid           PROTO((int, char **));
    143 int opihi_type             PROTO((int, char **));
     143int opihi_type       PROTO((int, char **));
    144144int uniq             PROTO((int, char **));
     145int uniqpair         PROTO((int, char **));
    145146int unsign           PROTO((int, char **));
    146147int vbin             PROTO((int, char **));
    … …  
    325326  {1, "ungridify",    ungridify,        "convert image region to vector triplet"},
    326327  {1, "uniq",         uniq,             "create a uniq vector subset from a vector"},
     328  {1, "uniqpair",     uniqpair,         "create a uniq vector subset from a pair of vectors, saving duplicates if desired"},
    327329  {1, "unsign",       unsign,           "toggle the UNSIGN status"},
    328330  {1, "vbin",         vbin,             "rebin vector data by a factor of N"},

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

    r31160 r40291  
    33int limits (int argc, char **argv) {
    44
    5   int N, APPLY, dX, dY;
     5  int N, dX, dY;
    66  int kapa;
    7   char *name;
    87  Graphdata graphmode;
    98  Vector *xvec, *yvec;
    … …  
    1110  xvec = yvec = NULL;
    1211
    13   APPLY = FALSE;
     12  float minLimitX = NAN;
     13  float minLimitY = NAN;
     14  float maxLimitX = NAN;
     15  float maxLimitY = NAN;
     16  float delLimitX = NAN;
     17  float delLimitY = NAN;
     18
     19  if ((N = get_argument (argc, argv, "-minX"))) {
     20    remove_argument (N, &argc, argv);
     21    minLimitX = atof (argv[N]);
     22    remove_argument (N, &argc, argv);
     23  }
     24  if ((N = get_argument (argc, argv, "-maxX"))) {
     25    remove_argument (N, &argc, argv);
     26    maxLimitX = atof (argv[N]);
     27    remove_argument (N, &argc, argv);
     28  }
     29  if ((N = get_argument (argc, argv, "-delX"))) {
     30    if (!isnan(minLimitX) || !isnan(maxLimitX)) {
     31      gprint (GP_ERR, "-minX & -maxX cannot be mixed with -delX\n");
     32      return (FALSE);
     33    }
     34    remove_argument (N, &argc, argv);
     35    delLimitX = atof (argv[N]);
     36    remove_argument (N, &argc, argv);
     37  }
     38  if ((N = get_argument (argc, argv, "-minY"))) {
     39    remove_argument (N, &argc, argv);
     40    minLimitY = atof (argv[N]);
     41    remove_argument (N, &argc, argv);
     42  }
     43  if ((N = get_argument (argc, argv, "-maxY"))) {
     44    remove_argument (N, &argc, argv);
     45    maxLimitY = atof (argv[N]);
     46    remove_argument (N, &argc, argv);
     47  }
     48  if ((N = get_argument (argc, argv, "-delY"))) {
     49    if (!isnan(minLimitY) || !isnan(maxLimitY)) {
     50      gprint (GP_ERR, "-minY & -maxY cannot be mixed with -delY\n");
     51      return (FALSE);
     52    }
     53    remove_argument (N, &argc, argv);
     54    delLimitY = atof (argv[N]);
     55    remove_argument (N, &argc, argv);
     56  }
     57
     58  int APPLY = FALSE;
    1459  if ((N = get_argument (argc, argv, "-a"))) {
    1560    remove_argument (N, &argc, argv);
    1661    APPLY = TRUE;
    1762  }
    18   name = NULL;
     63  char *name = NULL;
    1964  if ((N = get_argument (argc, argv, "-n"))) {
    2065    remove_argument (N, &argc, argv);
    … …  
    2267    remove_argument (N, &argc, argv);
    2368  }
     69
    2470  if (!GetGraph (&graphmode, &kapa, name)) return (FALSE);
    2571  FREE (name);
    … …  
    97143 success:
    98144  SetLimits (xvec, yvec, &graphmode);
     145
     146  if (!isnan(minLimitX)) graphmode.xmin = MIN (minLimitX, graphmode.xmin);
     147  if (!isnan(maxLimitX)) graphmode.xmax = MAX (maxLimitX, graphmode.xmax);
     148  if (!isnan(minLimitY)) graphmode.ymin = MIN (minLimitY, graphmode.ymin);
     149  if (!isnan(maxLimitY)) graphmode.ymax = MAX (maxLimitY, graphmode.ymax);
     150
     151  if (!isnan(delLimitX)) {
     152    float delta = graphmode.xmax - graphmode.xmin;
     153    if (fabs(delLimitX) > fabs(delta)) {
     154      float midpt = 0.5*(graphmode.xmax + graphmode.xmin);
     155      graphmode.xmax = midpt + 0.5*delLimitX;
     156      graphmode.xmin = midpt - 0.5*delLimitX;
     157    }
     158  }
     159  if (!isnan(delLimitY)) {
     160    float delta = graphmode.ymax - graphmode.ymin;
     161    if (fabs(delLimitY) > fabs(delta)) {
     162      float midpt = 0.5*(graphmode.ymax + graphmode.ymin);
     163      graphmode.ymax = midpt + 0.5*delLimitY;
     164      graphmode.ymin = midpt - 0.5*delLimitY;
     165    }
     166  }
     167
    99168  if (APPLY) KapaSetLimits (kapa, &graphmode);
    100169  return (TRUE);

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

    r37049 r40291  
    44
    55  Vector **vec;
    6   int i, j;
     6  int i, j, N;
     7
     8  int START_VALUE = 0;
     9  if ((N = get_argument (argc, argv, "-s"))) {
     10    remove_argument (N, &argc, argv);
     11    START_VALUE = atoi (argv[N]);
     12    remove_argument (N, &argc, argv);
     13  }
     14
     15  int END_VALUE = -1;
     16  if ((N = get_argument (argc, argv, "-e"))) {
     17    remove_argument (N, &argc, argv);
     18    END_VALUE = atoi (argv[N]);
     19    remove_argument (N, &argc, argv);
     20  }
    721
    822  if (argc < 2) {
    … …  
    2741  }
    2842
    29   for (j = 0; j < MaxLen; j++) {
     43  // start and end may be 0 - N (truncated to N) or may be negative, in which case it refers to
     44  // distance from the end (just like vector[-5])
     45  START_VALUE = (START_VALUE < 0) ? MaxLen + START_VALUE + 1 : MIN (START_VALUE, MaxLen);
     46  START_VALUE = MAX (0, START_VALUE);
     47
     48  END_VALUE = (END_VALUE < 0) ? MaxLen + END_VALUE + 1 : MIN (END_VALUE, MaxLen);
     49  END_VALUE = MAX (0, END_VALUE);
     50
     51  for (j = START_VALUE; j < END_VALUE; j++) {
    3052    for (i = 0; i < Nvec; i++) {
    3153      if (j >= vec[i][0].Nelements) {
    … …  
    3557          gprint (GP_LOG, "%f ", vec[i][0].elements.Flt[j]);
    3658        } else {
    37           gprint (GP_LOG, "%d ", vec[i][0].elements.Int[j]);
     59          gprint (GP_LOG, OPIHI_INT_FMT" ", vec[i][0].elements.Int[j]);
    3860        }
    3961      }

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

    r39227 r40291  
    4747        continue;
    4848      }
    49       if (*vx > Nmax) ESCAPE("unexpected value in index: %d (%d)\n", *vx, i);
     49      if (*vx > Nmax) ESCAPE("unexpected value in index: "OPIHI_INT_FMT" (%d)\n", *vx, i);
    5050      ovec[0].elements.Flt[Npts] = vi[*vx];
    5151      Npts++;
    … …  
    6767        continue;
    6868      }
    69       if (*vx > Nmax) ESCAPE("unexpected value in index: %d (%d)\n", *vx, i);
     69      if (*vx > Nmax) ESCAPE("unexpected value in index: "OPIHI_INT_FMT" (%d)\n", *vx, i);
    7070      ovec[0].elements.Int[Npts] = vi[*vx];
    7171      Npts++;

  • trunk/Ohana/src/opihi/cmd.data/test/periodogram-fm.sh

    r40165 r40291  
    5555
    5656 periodogram_fm t f df 5 50 period power
    57 #periodogram t f 5 50 period power
    5857
    5958 # lim -n 0 t f; clear; box; plot -x 2 -pt 2 t f
    … …  
    8887
    8988 periodogram_fm t f df 1 10 period power
    90 #periodogram t f 1 10 period power
    9189
    9290 # lim -n 0 t f; clear; box; plot -x 2 -pt 2 t f
    … …  
    9795 if (abs ($peakpos - $P) > 0.05)
    9896   $PASS = 0
     97 end
     98
     99  if ($PLOT)
     100  lim period power; clear; box; line -c red70 -lw 3 $P 0 to $P $peakval; plot period power -x line
    99101 end
    100102end
    … …  
    117119
    118120 periodogram_fm t f df 2 30 period power
    119 #periodogram t f 2 30 period power
    120121
    121122#  lim -n 0 t f; clear; box; plot -x 2 -pt 2 t f
    … …  
    126127 if (abs ($peakpos - $P) > 0.05)
    127128   $PASS = 0
     129 end
     130
     131 if ($PLOT)
     132  lim period power; clear; box; line -c red70 -lw 3 $P 0 to $P $peakval; plot period power -x line
    128133 end
    129134end
    … …  
    145150 set df = 0.01 + zero(f)
    146151
    147  periodogram_fm t f 2 30 period power
     152 periodogram_fm t f df 2 30 period power
    148153
    149154#  lim -n 0 t f; clear; box; plot -x 2 -pt 2 t f
    … …  
    155160   $PASS = 0
    156161 end
    157 end
    158 
    159 # test using random samples, offset start, non-zero DC, some noise
     162
     163 if ($PLOT)
     164  lim period power; clear; box; line -c red70 -lw 3 $P 0 to $P $peakval; plot period power -x line
     165 end
     166end
     167
     168# test using 300 random samples, offset start, non-zero DC, some noise
    160169macro test6
    161170 $PASS = 1
    … …  
    178187 set df = 0.01 + zero(f)
    179188
    180  periodogram_fm t f 2 30 period power
     189 periodogram_fm t f df 2 30 period power
    181190
    182191#  lim -n 0 t f; clear; box; plot -x 2 -pt 2 t f
    … …  
    188197   $PASS = 0
    189198 end
    190 end
    191 
    192 # test using fewer random samples, offset start, non-zero DC, some noise
     199
     200 if ($PLOT)
     201  lim period power; clear; box; line -c red70 -lw 3 $P 0 to $P $peakval; plot period power -x line
     202 end
     203end
     204
     205# test using 100 fewer random samples, offset start, non-zero DC, some noise
    193206macro test7
    194207 $PASS = 1
    … …  
    211224 set df = 0.01 + zero(f)
    212225
    213  periodogram_fm t f 2 30 period power
     226 periodogram_fm t f df 2 30 period power
    214227
    215228#  lim -n 0 t f; clear; box; plot -x 2 -pt 2 t f
    … …  
    221234   $PASS = 0
    222235 end
    223 end
    224 
    225 # test using fewer random samples, high frequency, non-zero DC, some noise
     236
     237 if ($PLOT)
     238  lim period power; clear; box; line -c red70 -lw 3 $P 0 to $P $peakval; plot period power -x line
     239 end
     240end
     241
     242# test using Ndays random samples, RR Lyrae-sized light curves (0.7 mag),
     243# optional noise level
    226244macro test8
    227  if ($0 != 2)
    228    echo "USAGE: test8: Ndays")
     245 if ($0 != 4)
     246   echo "USAGE: test8: Period Ndays (df)"
    229247   break
    230248 end
    231249 
    232250 local Ndays
    233  $Ndays = $1
    234 
    235  $PASS = 1
    236  break -auto off
    237 
    238  local P PI
    239  $PI = 3.14159265359
    240  $P  = 0.8*rnd(0) + 0.2
     251 $P = $1
     252 $Ndays = $2
     253 $dM = $3
     254
     255 $PASS = 1
     256 break -auto off
     257
     258 local PI
     259 $PI = 3.14159265359
    241260 $trueP = $P
    242261
    … …  
    246265
    247266 # t is a time in days, but we always have 4 within 1 hour:
    248  set t0 = int(100 * rnd(x))
    249  set dtx = (3/24) * rnd(x)
    250  set t0 = t0 + dtx
     267 set tday = int(100 * rnd(x)); # choose Ndays random days between 0 and 100
     268 set dtx = (3/24) * rnd(x);  # choose a starting time within that night
     269 set t0 = tday + dtx
    251270
    252271 set dt1 = (15.0 / 1440) * rnd(x) + ( 0 + 7.5) / 1440
    … …  
    260279 set tmp = t0 + dt3; concat tmp t
    261280
    262  set fraw = sin(2*$PI*t/$P) + 0.5
     281 set fraw = 0.75*sin(2*$PI*t/$P)
    263282
    264283 # 0.05 : peakpos = 14.95
    265284 # 0.10 : peakpos = 15.04 (
    266  gaussdev df t[] 0.0 0.25
     285 gaussdev df t[] 0.0 $dM
    267286 set f = fraw + df
    268  set df = 0.01 + zero(f)
    269 
    270  periodogram_fm t f 0.1 2.0 period power
     287 set df = $dM + zero(f)
     288
     289 periodogram_fm t f df 0.1 20.0 period power
    271290
    272291#  lim -n 0 t f; clear; box; plot -x 2 -pt 2 t f
    … …  
    278297   $PASS = 0
    279298 end
    280 end
     299 if ($PLOT)
     300  lim period power; clear; box; line -c red70 -lw 3 $P 0 to $P $peakval; plot period power -x line
     301 end
     302end
     303
     304# test using Ndays random samples, RR Lyrae-sized light curves (0.7 mag),
     305# optional noise level
     306# compare periodogram and periodogram_fm
     307macro test9
     308 if ($0 != 4)
     309   echo "USAGE: test8: Period Ndays (df)"
     310   break
     311 end
     312 
     313 local Ndays
     314 $P = $1
     315 $Ndays = $2
     316 $dM = $3
     317
     318 $PASS = 1
     319 break -auto off
     320
     321 local PI
     322 $PI = 3.14159265359
     323 $trueP = $P
     324
     325 delete -q x t f period power
     326
     327 create x 0 $Ndays
     328
     329 # t is a time in days, but we always have 4 within 1 hour:
     330 set tday = int(100 * rnd(x)); # choose Ndays random days between 0 and 100
     331 set dtx = (3/24) * rnd(x);  # choose a starting time within that night
     332 set t0 = tday + dtx
     333
     334 set dt1 = (15.0 / 1440) * rnd(x) + ( 0 + 7.5) / 1440
     335 set dt2 = (15.0 / 1440) * rnd(x) + (15 + 7.5) / 1440
     336 set dt3 = (15.0 / 1440) * rnd(x) + (30 + 7.5) / 1440
     337
     338 delete -q t
     339 concat t0 t
     340 set tmp = t0 + dt1; concat tmp t
     341 set tmp = t0 + dt2; concat tmp t
     342 set tmp = t0 + dt3; concat tmp t
     343
     344 set fraw = 0.75*sin(2*$PI*t/$P)
     345
     346 # 0.05 : peakpos = 14.95
     347 # 0.10 : peakpos = 15.04 (
     348 gaussdev df t[] 0.0 $dM
     349 set f = fraw + df
     350 set df = $dM + zero(f)
     351
     352 periodogram_fm t f df 0.1 20.0 period_fm power_fm
     353 periodogram t f 0.1 20.0 period power
     354
     355#  lim -n 0 t f; clear; box; plot -x 2 -pt 2 t f
     356#  lim -n 1 period power; clear; box; plot period power
     357
     358 peak -q period_fm power_fm
     359 $peakval_fm = $peakval
     360
     361 peak -q period power
     362 vstat -q power
     363 set power = power / $MAX
     364
     365# if (abs ($peakpos - $P) > 0.05)
     366#   $PASS = 0
     367# end
     368
     369 set freq = 1 / period
     370 set freq_fm = 1 / period_fm
     371 $Freq = 1 / $P
     372
     373 if ($PLOT)
     374  if (1)
     375    lim period power; clear; box
     376    line -c red70 -lw 3 $P 0 to $P $peakval_fm;
     377    plot period power -x line -c grey70 -lw 2
     378    plot period_fm power_fm -x line -c black
     379  else
     380    lim freq power; clear; box
     381    line -c red70 -lw 3 $Freq 0 to $Freq 1.0
     382    plot freq power -x line -c grey70 -lw 2
     383    plot freq_fm power_fm -x line -c black
     384  end
     385 end
     386end
     387
     388
     389# test using Ndays random samples, RR Lyrae-sized light curves (0.7 mag),
     390# optional noise level
     391# compare periodogram and periodogram_fm
     392macro test10
     393 if ($0 != 4)
     394   echo "USAGE: test8: Period Ndays (df)"
     395   break
     396 end
     397 
     398 local Ndays
     399 $P = $1
     400 $Ndays = $2
     401 $dM = $3
     402
     403 $PASS = 1
     404 break -auto off
     405
     406 local PI
     407 $PI = 3.14159265359
     408 $trueP = $P
     409
     410 delete -q x t f period power
     411
     412 create x 0 $Ndays
     413
     414 # t is a time in days, but we always have 4 within 1 hour:
     415 set tday = int(100 * rnd(x)); # choose Ndays random days between 0 and 100
     416 set dtx = (3/24) * rnd(x);  # choose a starting time within that night
     417 set t0 = tday + dtx
     418
     419 set dt1 = (15.0 / 1440) * rnd(x) + ( 0 + 7.5) / 1440
     420 set dt2 = (15.0 / 1440) * rnd(x) + (15 + 7.5) / 1440
     421 set dt3 = (15.0 / 1440) * rnd(x) + (30 + 7.5) / 1440
     422
     423 delete -q t
     424 concat t0 t
     425 set tmp = t0 + dt1; concat tmp t
     426 set tmp = t0 + dt2; concat tmp t
     427 set tmp = t0 + dt3; concat tmp t
     428
     429 set fraw = 0.75*sin(2*$PI*t/$P)
     430
     431 # 0.05 : peakpos = 14.95
     432 # 0.10 : peakpos = 15.04 (
     433 gaussdev df t[] 0.0 $dM
     434 set f = fraw + df
     435 set df = $dM + zero(f)
     436
     437 periodogram_fm t f df 0.05 20.0 period_fm power_fm
     438
     439 gaussdev df t[] 0.0 $dM
     440 set Fo = df
     441 periodogram_fm t Fo df 0.05 20.0 period power
     442
     443#  lim -n 0 t f; clear; box; plot -x 2 -pt 2 t f
     444#  lim -n 1 period power; clear; box; plot period power
     445
     446 peak -q period_fm power_fm
     447 $peakval_fm = $peakval
     448
     449 peak -q period power
     450
     451# if (abs ($peakpos - $P) > 0.05)
     452#   $PASS = 0
     453# end
     454
     455 set freq = 1 / period
     456 set freq_fm = 1 / period_fm
     457 $Freq = 1 / $P
     458
     459 if ($PLOT)
     460  if (1)
     461    lim period_fm power_fm; clear; box
     462    line -c red70 -lw 3 $P 0 to $P $peakval_fm;
     463    plot period power -x line -c grey70 -lw 2
     464    plot period_fm power_fm -x line -c black
     465  else
     466    lim freq power; clear; box
     467    line -c red70 -lw 3 $Freq 0 to $Freq 1.0
     468    plot freq power -x line -c grey70 -lw 2
     469    plot freq_fm power_fm -x line -c black
     470  end
     471 end
     472end
     473
     474# we have time (MJD) and mag
     475# we generate the folded lightcure and measure sigma relative to the smoothed version (bins of 0.1 period)
     476macro fold.one.period
     477  if ($0 != 5)
     478    echo "USAGE: fold.one.period (time) (mag) (magErr) (period)"
     479    break
     480  end
     481
     482  local myTime myMag myMagErr myPeriod
     483  $myTime = $1
     484  $myMag  = $2
     485  $myMagErr  = $3
     486  $myPeriod = $4
     487
     488  set phi = $myTime / $myPeriod - int($myTime / $myPeriod)
     489
     490  if ($PLOT_FOLD)
     491    lim -n phi phi $myMag; clear; box;
     492  end
     493
     494  delete -q magResid
     495
     496  $dPhi = 0.05; # half of bin size
     497  create nphi $dPhi {1 + $dPhi} {2*$dPhi}
     498  set magR = zero(nphi)
     499  set magS = zero(nphi)
     500  for i 0 nphi[]
     501    subset tmp_mag_sub = $myMag where (phi >= nphi[$i] - $dPhi) && (phi < nphi[$i] + $dPhi)
     502    vstat -q tmp_mag_sub
     503    magR[$i] = $MEDIAN
     504    magS[$i] = $SIGMA
     505
     506    set magDelta = tmp_mag_sub - $MEDIAN
     507    concat magDelta magResid
     508
     509    if ($PLOT_FOLD)
     510      subset tmp_phi_sub = phi where (phi >= nphi[$i] - $dPhi) && (phi < nphi[$i] + $dPhi)
     511      if ($i % 2)
     512        plot tmp_phi_sub tmp_mag_sub -pt 7 -sz 3 -c blue -lw 2
     513      else
     514        plot tmp_phi_sub tmp_mag_sub -pt 7 -sz 3 -c red -lw 2
     515      end
     516    end 
     517  end
     518
     519  if ($PLOT_FOLD) 
     520    plot -pt 10 -sz 1.5 phi $myMag -dy $myMagErr
     521    plot -pt 2 -sz 2.0 -c red nphi magR -dy magS
     522  end
     523
     524  vstat -q magResid
     525end
     526
     527
    281528
    282529# Memory test
    … …  
    298545
    299546 for i 0 100
    300   periodogram_fm t f 2 30 period power
     547  periodogram_fm t f df 2 30 period power
    301548 end
    302549 

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

    r40165 r40291  
    209209# test using fewer random samples, high frequency, non-zero DC, some noise
    210210macro test8
    211  if ($0 != 2)
    212    echo "USAGE: test8: Ndays")
     211 if ($0 != 4)
     212   echo "USAGE: test8: Period Ndays df"
    213213   break
    214214 end
    215215 
    216216 local Ndays
    217  $Ndays = $1
    218 
    219  $PASS = 1
    220  break -auto off
    221 
    222  local P PI
    223  $PI = 3.14159265359
    224  $P  = 0.8*rnd(0) + 0.2
     217 $P = $1
     218 $Ndays = $2
     219 $dM = $3
     220
     221 $PASS = 1
     222 break -auto off
     223
     224 local PI
     225 $PI = 3.14159265359
    225226 $trueP = $P
    226227
    … …  
    230231
    231232 # t is a time in days, but we always have 4 within 1 hour:
    232  set t0 = int(100 * rnd(x))
    233  set dtx = (3/24) * rnd(x)
    234  set t0 = t0 + dtx
     233 set tday = int(100 * rnd(x)); # choose Ndays random days between 0 and 100
     234 set dtx = (3/24) * rnd(x);  # choose a starting time within that night
     235 set t0 = tday + dtx
    235236
    236237 set dt1 = (15.0 / 1440) * rnd(x) + ( 0 + 7.5) / 1440
    … …  
    244245 set tmp = t0 + dt3; concat tmp t
    245246
    246  set fraw = sin(2*$PI*t/$P) + 0.5
     247 set fraw = 0.75*sin(2*$PI*t/$P)
    247248
    248249 # 0.05 : peakpos = 14.95
    249250 # 0.10 : peakpos = 15.04 (
    250  gaussdev df t[] 0.0 0.25
     251 gaussdev df t[] 0.0 $dM
    251252 set f = fraw + df
    252253
    … …  
    260261 if (abs ($peakpos - $P) > 0.05)
    261262   $PASS = 0
     263 end
     264 if ($PLOT)
     265  lim period power; clear; box; line -c red70 -lw 3 $P 0 to $P $peakval; plot period power -x line
    262266 end
    263267end

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

    r39457 r40291  
    8080    memcpy (indata, ivec->elements.Int, ivec[0].Nelements*sizeof(opihi_int));
    8181
    82     isort (indata, ivec->Nelements);
     82    llsort (indata, ivec->Nelements);
    8383
    8484    Nnew = 0;

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

    r39360 r40291  
    165165        } else {
    166166          if (CSV) {
    167             fprintf (f, "%d,", vec[j][0].elements.Int[i]);
     167            fprintf (f, OPIHI_INT_FMT",", vec[j][0].elements.Int[i]);
    168168          } else {
    169             fprintf (f, "%d ", vec[j][0].elements.Int[i]);
     169            fprintf (f, OPIHI_INT_FMT" ", vec[j][0].elements.Int[i]);
    170170          }
    171171        }
Note: See TracChangeset for help on using the changeset viewer.