(file) Return to jtsfiddle.c CVS log (file) (dir) Up to [Development] / JSOC / proj / globalhs / apps

Diff for /JSOC/proj/globalhs/apps/jtsfiddle.c between version 1.10 and 1.11

version 1.10, 2012/09/18 17:33:08 version 1.11, 2012/09/20 17:36:14
Line 16 
Line 16 
 #include <sys/resource.h> #include <sys/resource.h>
 #include <math.h> #include <math.h>
 #include <assert.h> #include <assert.h>
 //#include <complex.h>  
 #include <fftw3.h> #include <fftw3.h>
 #include "fahlman_ulrych_C99.h"  //#include "fahlman_ulrych_C99.h"
 #include "detrend_C99.h"  //#include "detrend_C99.h"
 //#include <xmem.h>  #include <complex.h>
   #include <string.h>
   #include <float.h>
   #include "detrendcode.c"
   #include "gapfillcode.c"
  
 #include "jsoc_main.h" #include "jsoc_main.h"
 #include "fitsio.h" #include "fitsio.h"
Line 295  int DoIt(void)
Line 298  int DoIt(void)
  // these must be present in the output dataseries and variable, not links or constants  // these must be present in the output dataseries and variable, not links or constants
  // the loop is only necessary if the output series don't all link to the same history series, which they usually will, but just in case...  // the loop is only necessary if the output series don't all link to the same history series, which they usually will, but just in case...
   char *outchecklist[] = {"T_START", "QUALITY", "LMIN", "LMAX", "NDT"};   char *outchecklist[] = {"T_START", "QUALITY", "LMIN", "LMAX", "NDT"};
   int is, itest, mflip;    int is, ishold, itest, mflip;
   char *holdseries="";   char *holdseries="";
   char *cvsinfo = strdup("$Header$");    char *cvsinfo;
     cvsinfo = (char *)malloc(1024);
     strcpy(cvsinfo,"$Header$");
     strcat(cvsinfo,"\n");
     strcat(cvsinfo,getdetrendversion());
     strcat(cvsinfo,"\n");
     strcat(cvsinfo,getgapfillversion());
   for (is=0;is<6;is++)   for (is=0;is<6;is++)
   {   {
  
Line 323  int DoIt(void)
Line 332  int DoIt(void)
     {     {
       if (strcmp(holdseries, histlink->info->target_series))       if (strcmp(holdseries, histlink->info->target_series))
       {       {
           ishold=is;
         holdseries=strdup(histlink->info->target_series);         holdseries=strdup(histlink->info->target_series);
         histrecnumarr[is]=set_history(histlink, cvsinfo);         histrecnumarr[is]=set_history(histlink, cvsinfo);
         if (histrecnumarr[is] < 0)         if (histrecnumarr[is] < 0)
Line 334  int DoIt(void)
Line 344  int DoIt(void)
       }       }
       else       else
       {       {
         histrecnumarr[is]=histrecnumarr[is-1];          histrecnumarr[is]=histrecnumarr[ishold];
       }       }
     }     }
     else     else


Legend:
Removed from v.1.10  
changed lines
  Added in v.1.11

Karen Tian
Powered by
ViewCVS 0.9.4