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

Diff for /JSOC/proj/sharp/apps/update_sharp_keys.c between version 1.11 and 1.12

version 1.11, 2015/01/25 18:30:34 version 1.12, 2015/02/27 19:50:51
Line 259  int DoIt(void)
Line 259  int DoIt(void)
         float *jz_smooth = (float *) (malloc(nxny * sizeof(float)));         float *jz_smooth = (float *) (malloc(nxny * sizeof(float)));
         float *err_term1  = (float *) (malloc(nxny * sizeof(float)));         float *err_term1  = (float *) (malloc(nxny * sizeof(float)));
         float *err_term2  = (float *) (malloc(nxny * sizeof(float)));         float *err_term2  = (float *) (malloc(nxny * sizeof(float)));
           float *err_termA   = (float *) (calloc(nxny, sizeof(float)));
           float *err_termB   = (float *) (calloc(nxny, sizeof(float)));
           float *err_termAt  = (float *) (calloc(nxny, sizeof(float)));
           float *err_termBt  = (float *) (calloc(nxny, sizeof(float)));
           float *err_termAh  = (float *) (calloc(nxny, sizeof(float)));
           float *err_termBh  = (float *) (calloc(nxny, sizeof(float)));
  
         // ephemeris variables         // ephemeris variables
         float  cdelt1_orig, cdelt1, dsun_obs, imcrpix1, imcrpix2, crpix1, crpix2;         float  cdelt1_orig, cdelt1, dsun_obs, imcrpix1, imcrpix2, crpix1, crpix2;
Line 504  int DoIt(void)
Line 510  int DoIt(void)
  
               // Then take the derivative of Bt               // Then take the derivative of Bt
               if (computeBtotalderivative(bt, dims, &mean_derivative_btotal, mask, bitmask, derx_bt, dery_bt, bt_err,               if (computeBtotalderivative(bt, dims, &mean_derivative_btotal, mask, bitmask, derx_bt, dery_bt, bt_err,
                                           &mean_derivative_btotal_err))                                            &mean_derivative_btotal_err, err_termAt, err_termBt))
               {               {
                  mean_derivative_btotal     = DRMS_MISSING_FLOAT;                  mean_derivative_btotal     = DRMS_MISSING_FLOAT;
                  mean_derivative_btotal_err = DRMS_MISSING_FLOAT;                  mean_derivative_btotal_err = DRMS_MISSING_FLOAT;
Line 527  int DoIt(void)
Line 533  int DoIt(void)
               computeBh(bx_err, by_err, bh_err, bx, by, bz, bh, dims, &mean_hf, mask, bitmask);               computeBh(bx_err, by_err, bh_err, bx, by, bz, bh, dims, &mean_hf, mask, bitmask);
  
               // Then take the derivative of Bh               // Then take the derivative of Bh
               if (computeBhderivative(bh, bh_err, dims, &mean_derivative_bh, &mean_derivative_bh_err, mask, bitmask, derx_bh, dery_bh))                if (computeBhderivative(bh, bh_err, dims, &mean_derivative_bh, &mean_derivative_bh_err, mask, bitmask, derx_bh, dery_bh, err_termAh, err_termBh))
               {               {
                  mean_derivative_bh       = DRMS_MISSING_FLOAT;                  mean_derivative_bh       = DRMS_MISSING_FLOAT;
                  mean_derivative_bh_err   = DRMS_MISSING_FLOAT;                  mean_derivative_bh_err   = DRMS_MISSING_FLOAT;
Line 547  int DoIt(void)
Line 553  int DoIt(void)
            if (meangbzflag)            if (meangbzflag)
            {            {
               // Compute Bz derivative               // Compute Bz derivative
               if (computeBzderivative(bz, bz_err, dims, &mean_derivative_bz, &mean_derivative_bz_err, mask, bitmask, derx_bz, dery_bz))                if (computeBzderivative(bz, bz_err, dims, &mean_derivative_bz, &mean_derivative_bz_err, mask, bitmask, derx_bz, dery_bz, err_termA, err_termB))
               {               {
                  mean_derivative_bz     = DRMS_MISSING_FLOAT;                  mean_derivative_bz     = DRMS_MISSING_FLOAT;
                  mean_derivative_bz_err = DRMS_MISSING_FLOAT;                  mean_derivative_bz_err = DRMS_MISSING_FLOAT;
Line 786  int DoIt(void)
Line 792  int DoIt(void)
         free(pmap);         free(pmap);
         free(p1pad);         free(p1pad);
         free(pmapn);         free(pmapn);
   
           // free the arrays that are related to the numerical derivatives
         free(err_term2);         free(err_term2);
         free(err_term1);         free(err_term1);
           free(err_termB);
           free(err_termA);
           free(err_termBt);
           free(err_termAt);
           free(err_termBh);
           free(err_termAh);
  
         } //endfor         } //endfor
  

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