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

Diff for /JSOC/proj/sharp/apps/sharp.c between version 1.7 and 1.8

version 1.7, 2013/01/03 03:53:18 version 1.8, 2013/01/07 22:03:47
Line 749  int mapScaler(DRMS_Record_t *sharpRec, D
Line 749  int mapScaler(DRMS_Record_t *sharpRec, D
 //      drms_array_convert_inplace(outSeg->info->type, 0, 1, outArray);         // Jan 02 2013 //      drms_array_convert_inplace(outSeg->info->type, 0, 1, outArray);         // Jan 02 2013
  
         outSeg->axis[0] = outArray->axis[0]; outSeg->axis[1] = outArray->axis[1];         outSeg->axis[0] = outArray->axis[0]; outSeg->axis[1] = outArray->axis[1];
         outArray->parent_segment = outSeg;  //      outArray->parent_segment = outSeg;
 //      outArray->israw = 0;            // always compressed          outArray->israw = 0;            // always compressed
         outArray->bzero = outSeg->bzero;         outArray->bzero = outSeg->bzero;
         outArray->bscale = outSeg->bscale;         outArray->bscale = outSeg->bscale;
  
Line 825  int mapVectorB(DRMS_Record_t *sharpRec,
Line 825  int mapVectorB(DRMS_Record_t *sharpRec,
                 outSeg = drms_segment_lookup(sharpRec, segName[iSeg]);                 outSeg = drms_segment_lookup(sharpRec, segName[iSeg]);
                 outArray = drms_array_create(DRMS_TYPE_FLOAT, 2, dims, data_prt[iSeg], &status);                 outArray = drms_array_create(DRMS_TYPE_FLOAT, 2, dims, data_prt[iSeg], &status);
                 outSeg->axis[0] = outArray->axis[0]; outSeg->axis[1] = outArray->axis[1];                 outSeg->axis[0] = outArray->axis[0]; outSeg->axis[1] = outArray->axis[1];
                 outArray->parent_segment = outSeg;  //              outArray->parent_segment = outSeg;
 //              outArray->israw = 0;                  outArray->israw = 0;
                 outArray->bzero = outSeg->bzero;                 outArray->bzero = outSeg->bzero;
                 outArray->bscale = outSeg->bscale;                 outArray->bscale = outSeg->bscale;
                 status = drms_segment_write(outSeg, outArray, 0);                 status = drms_segment_write(outSeg, outArray, 0);
Line 877  int mapVectorBErr(DRMS_Record_t *sharpRe
Line 877  int mapVectorBErr(DRMS_Record_t *sharpRe
                 outSeg = drms_segment_lookup(sharpRec, segName[iSeg]);                 outSeg = drms_segment_lookup(sharpRec, segName[iSeg]);
                 outArray = drms_array_create(DRMS_TYPE_FLOAT, 2, dims, data_prt[iSeg], &status);                 outArray = drms_array_create(DRMS_TYPE_FLOAT, 2, dims, data_prt[iSeg], &status);
                 outSeg->axis[0] = outArray->axis[0]; outSeg->axis[1] = outArray->axis[1];                 outSeg->axis[0] = outArray->axis[0]; outSeg->axis[1] = outArray->axis[1];
                 outArray->parent_segment = outSeg;  //              outArray->parent_segment = outSeg;
 //              outArray->israw = 0;                  outArray->israw = 0;
                 outArray->bzero = outSeg->bzero;                 outArray->bzero = outSeg->bzero;
                 outArray->bscale = outSeg->bscale;                 outArray->bscale = outSeg->bscale;
                 status = drms_segment_write(outSeg, outArray, 0);                 status = drms_segment_write(outSeg, outArray, 0);
Line 1628  int writeCutout(DRMS_Record_t *outRec, D
Line 1628  int writeCutout(DRMS_Record_t *outRec, D
 //      drms_array_convert_inplace(outSeg->info->type, 0, 1, cutoutArray);      // Jan 02 2013 //      drms_array_convert_inplace(outSeg->info->type, 0, 1, cutoutArray);      // Jan 02 2013
         outSeg->axis[0] = cutoutArray->axis[0];         outSeg->axis[0] = cutoutArray->axis[0];
         outSeg->axis[1] = cutoutArray->axis[1];         outSeg->axis[1] = cutoutArray->axis[1];
         cutoutArray->parent_segment = outSeg;  //      cutoutArray->parent_segment = outSeg;
 //      cutoutArray->israw = 0;         // always compressed          cutoutArray->israw = 0;         // always compressed
     cutoutArray->bzero = outSeg->bzero;     cutoutArray->bzero = outSeg->bzero;
     cutoutArray->bscale = outSeg->bscale;               // Same as inArray's     cutoutArray->bscale = outSeg->bscale;               // Same as inArray's
         status = drms_segment_write(outSeg, cutoutArray, 0);         status = drms_segment_write(outSeg, cutoutArray, 0);

Legend:
Removed from v.1.7  
changed lines
  Added in v.1.8
Karen Tian
 Powered by
ViewCVS 0.9.4