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

Diff for /JSOC/proj/globalhs/apps/jretile_manytofew.c between version 1.9 and 1.10

version 1.9, 2017/03/31 19:43:36 version 1.10, 2017/03/31 20:02:28
Line 199  int jretile_manytofew(void)
Line 199  int jretile_manytofew(void)
  
   float apinnerout=0.0;   float apinnerout=0.0;
   float apwidthout=0.0;   float apwidthout=0.0;
     float apinner=0.0;
     float apwidth=0.0;
   outkeytest = hcon_lookup_lower(&tempoutrec->keywords, "APINNER");   outkeytest = hcon_lookup_lower(&tempoutrec->keywords, "APINNER");
   if (outkeytest != NULL && outkeytest->info->recscope == 1)   if (outkeytest != NULL && outkeytest->info->recscope == 1)
     apinnerout=drms_getkey_float(tempoutrec, "APINNER", &status);     apinnerout=drms_getkey_float(tempoutrec, "APINNER", &status);
Line 280  int jretile_manytofew(void)
Line 282  int jretile_manytofew(void)
     return 1;     return 1;
   }   }
  
   float apinner=0.0;  
   float apwidth=0.0;  
   inkeytest = hcon_lookup_lower(&inrec->keywords, "APINNER");   inkeytest = hcon_lookup_lower(&inrec->keywords, "APINNER");
   if (inkeytest != NULL)   if (inkeytest != NULL)
     apinner=drms_getkey_float(inrec, "APINNER", &status);     apinner=drms_getkey_float(inrec, "APINNER", &status);
   if (apinnerout != 0.0 && (int)(10000*apinnerout) != (int)(10000*apinner))   if (apinnerout != 0.0 && (int)(10000*apinnerout) != (int)(10000*apinner))
   {   {
     fprintf(stderr, "ERROR: input APINNER does not equal output APINNER, in=%d, out=%d\n",apinner, apinnerout);      fprintf(stderr, "ERROR: input APINNER does not equal output APINNER, in=%f, out=%f\n",apinner, apinnerout);
     drms_close_records(inrecset, DRMS_FREE_RECORD);     drms_close_records(inrecset, DRMS_FREE_RECORD);
     return 1;     return 1;
   }   }
Line 297  int jretile_manytofew(void)
Line 297  int jretile_manytofew(void)
     apwidth=drms_getkey_float(inrec, "APWIDTH", &status);     apwidth=drms_getkey_float(inrec, "APWIDTH", &status);
   if (apinnerout != 0.0 && (int)(10000*apwidthout) != (int)(10000*apwidth))   if (apinnerout != 0.0 && (int)(10000*apwidthout) != (int)(10000*apwidth))
   {   {
     fprintf(stderr, "ERROR: input APWIDTH does not equal output APWIDTH, in=%d, out=%d\n", apwidth, apwidth);      fprintf(stderr, "ERROR: input APWIDTH does not equal output APWIDTH, in=%f, out=%f\n", apwidth, apwidth);
     drms_close_records(inrecset, DRMS_FREE_RECORD);     drms_close_records(inrecset, DRMS_FREE_RECORD);
     return 1;     return 1;
   }   }


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

Karen Tian
Powered by
ViewCVS 0.9.4